From e7573c5ce21a9eb2d12ae81b51cd2400ec4e45d5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 Aug 2009 12:48:25 +0200
Subject: [PATCH 0001/1628] lib/relocator

---
 conf/i386.rmk                  |   6 +
 include/grub/i386/multiboot.h  |  11 +-
 include/grub/i386/relocator.h  |  40 +++++
 lib/i386/relocator.c           | 148 ++++++++++++++++++
 lib/i386/relocator_asm.S       | 269 +++++++++++++++++++++++++++++++++
 lib/i386/relocator_backward.S  |   2 +
 loader/i386/multiboot.c        |  64 ++++----
 loader/i386/multiboot_elfxx.c  |  14 +-
 loader/i386/multiboot_helper.S |  75 ---------
 9 files changed, 509 insertions(+), 120 deletions(-)
 create mode 100644 include/grub/i386/relocator.h
 create mode 100644 lib/i386/relocator.c
 create mode 100644 lib/i386/relocator_asm.S
 create mode 100644 lib/i386/relocator_backward.S

diff --git a/conf/i386.rmk b/conf/i386.rmk
index 93f84ce39..33d49b53c 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -14,3 +14,9 @@ pkglib_MODULES += vga_text.mod
 vga_text_mod_SOURCES = term/i386/pc/vga_text.c term/i386/vga_common.c
 vga_text_mod_CFLAGS = $(COMMON_CFLAGS)
 vga_text_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+pkglib_MODULES += relocator.mod
+relocator_mod_SOURCES = lib/i386/relocator.c lib/i386/relocator_asm.S lib/i386/relocator_backward.S
+relocator_mod_CFLAGS = $(COMMON_CFLAGS)
+relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
+relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/include/grub/i386/multiboot.h b/include/grub/i386/multiboot.h
index 2dd7ec008..bd3c573fa 100644
--- a/include/grub/i386/multiboot.h
+++ b/include/grub/i386/multiboot.h
@@ -27,16 +27,11 @@ void grub_multiboot2_real_boot (grub_addr_t entry,
 				struct grub_multiboot_info *mbi)
      __attribute__ ((noreturn));
 
-extern grub_addr_t grub_multiboot_payload_orig;
+extern grub_uint32_t grub_multiboot_payload_eip;
+extern char *grub_multiboot_payload_orig;
 extern grub_addr_t grub_multiboot_payload_dest;
 extern grub_size_t grub_multiboot_payload_size;
-extern grub_uint32_t grub_multiboot_payload_entry_offset;
 
-extern grub_uint8_t grub_multiboot_forward_relocator;
-extern grub_uint8_t grub_multiboot_forward_relocator_end;
-extern grub_uint8_t grub_multiboot_backward_relocator;
-extern grub_uint8_t grub_multiboot_backward_relocator_end;
-
-#define RELOCATOR_SIZEOF(x)	(&grub_multiboot_##x##_relocator_end - &grub_multiboot_##x##_relocator)
+#define GRUB_MULTIBOOT_STACK_SIZE 4096
 
 #endif /* ! GRUB_MULTIBOOT_CPU_HEADER */
diff --git a/include/grub/i386/relocator.h b/include/grub/i386/relocator.h
new file mode 100644
index 000000000..cbc75ed0a
--- /dev/null
+++ b/include/grub/i386/relocator.h
@@ -0,0 +1,40 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/>.
+ */
+
+#ifndef GRUB_RELOCATOR_CPU_HEADER
+#define GRUB_RELOCATOR_CPU_HEADER	1
+
+struct grub_relocator32_state
+{
+  grub_uint32_t esp;
+  grub_uint32_t eax;
+  grub_uint32_t ebx;
+  grub_uint32_t ecx;
+  grub_uint32_t edx;
+  grub_uint32_t eip;
+};
+
+void *
+grub_relocator32_alloc (grub_size_t size);
+grub_err_t
+grub_relocator32_boot (void *relocator, grub_uint32_t dest,
+		       struct grub_relocator32_state state);
+void
+grub_relocator32_free (void *relocator);
+
+#endif /* ! GRUB_RELOCATOR_CPU_HEADER */
diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
new file mode 100644
index 000000000..7dbdd1597
--- /dev/null
+++ b/lib/i386/relocator.c
@@ -0,0 +1,148 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/mm.h>
+#include <grub/misc.h>
+
+#include <grub/types.h>
+#include <grub/types.h>
+#include <grub/err.h>
+
+#include <grub/i386/relocator.h>
+
+extern grub_uint8_t grub_relocator32_forward_start;
+extern grub_uint8_t grub_relocator32_forward_end;
+extern grub_uint8_t grub_relocator32_backward_start;
+extern grub_uint8_t grub_relocator32_backward_end;
+
+extern grub_uint32_t grub_relocator32_backward_dest;
+extern grub_uint32_t grub_relocator32_backward_size;
+#ifdef __x86_64__
+extern grub_uint64_t grub_relocator32_backward_src;
+#else
+extern grub_uint32_t grub_relocator32_backward_src;
+#endif
+
+extern grub_uint32_t grub_relocator32_forward_dest;
+extern grub_uint32_t grub_relocator32_forward_size;
+#ifdef __x86_64__
+extern grub_uint64_t grub_relocator32_forward_src;
+#else
+extern grub_uint32_t grub_relocator32_forward_src;
+#endif
+
+extern grub_uint32_t grub_relocator32_forward_eax;
+extern grub_uint32_t grub_relocator32_forward_ebx;
+extern grub_uint32_t grub_relocator32_forward_ecx;
+extern grub_uint32_t grub_relocator32_forward_edx;
+extern grub_uint32_t grub_relocator32_forward_eip;
+extern grub_uint32_t grub_relocator32_forward_esp;
+
+extern grub_uint32_t grub_relocator32_backward_eax;
+extern grub_uint32_t grub_relocator32_backward_ebx;
+extern grub_uint32_t grub_relocator32_backward_ecx;
+extern grub_uint32_t grub_relocator32_backward_edx;
+extern grub_uint32_t grub_relocator32_backward_eip;
+extern grub_uint32_t grub_relocator32_backward_esp;
+
+#define RELOCATOR_SIZEOF(x)	(&grub_relocator32_##x##_end - &grub_relocator32_##x##_start)
+#define RELOCATOR_ALIGN 16
+
+void *
+grub_relocator32_alloc (grub_size_t size)
+{
+  char *playground;
+
+  playground = grub_malloc ((RELOCATOR_SIZEOF(forward) + RELOCATOR_ALIGN)
+			    + size 
+			    + (RELOCATOR_SIZEOF(backward) + RELOCATOR_ALIGN));
+  if (! playground)
+    return 0;
+
+  *(grub_size_t *) playground = size;
+
+  return playground + RELOCATOR_SIZEOF(forward);
+}
+
+void
+grub_relocator32_free (void *relocator)
+{
+  if (relocator)
+    grub_free ((char *) relocator - RELOCATOR_SIZEOF(forward));
+}
+
+
+grub_err_t
+grub_relocator32_boot (void *relocator, grub_uint32_t dest,
+		       struct grub_relocator32_state state)
+{
+  grub_size_t size;
+  char *playground;
+  void (*entry) ();
+
+  playground = (char *) relocator - RELOCATOR_SIZEOF(forward);
+  size = *(grub_size_t *) playground;
+
+  if (UINT_TO_PTR (dest) >= relocator)
+    {
+      int overhead;
+
+      overhead = ALIGN_UP (dest - RELOCATOR_SIZEOF(backward) - RELOCATOR_ALIGN, RELOCATOR_ALIGN);
+      grub_relocator32_backward_dest = dest - overhead;
+      grub_relocator32_backward_src = PTR_TO_UINT64 (relocator - overhead);
+      grub_relocator32_backward_size = size + overhead;
+
+      grub_relocator32_backward_eax = state.eax;
+      grub_relocator32_backward_ebx = state.ebx;
+      grub_relocator32_backward_ecx = state.ecx;
+      grub_relocator32_backward_edx = state.edx;
+      grub_relocator32_backward_eip = state.eip;
+      grub_relocator32_backward_esp = state.esp;
+
+      grub_memmove (relocator - overhead,
+		    &grub_relocator32_backward_start,
+		    RELOCATOR_SIZEOF(backward));
+      entry = (void (*) ()) (relocator - overhead);
+    }
+  else
+    {
+      int overhead;
+
+      overhead = ALIGN_UP (dest + size, RELOCATOR_ALIGN) 
+	+ RELOCATOR_SIZEOF(forward) - (dest + size);
+
+      grub_relocator32_forward_dest = dest;
+      grub_relocator32_forward_src = PTR_TO_UINT64 (relocator);
+      grub_relocator32_forward_size = size + overhead;
+
+      grub_relocator32_forward_eax = state.eax;
+      grub_relocator32_forward_ebx = state.ebx;
+      grub_relocator32_forward_ecx = state.ecx;
+      grub_relocator32_forward_edx = state.edx;
+      grub_relocator32_forward_eip = state.eip;
+      grub_relocator32_forward_esp = state.esp;
+
+      grub_memmove (relocator + size + overhead - RELOCATOR_SIZEOF(forward),
+		    &grub_relocator32_forward_start, RELOCATOR_SIZEOF(forward));
+      entry = (void (*) ()) (relocator + size + overhead - RELOCATOR_SIZEOF(forward));
+    }
+  entry ();
+
+  /* Not reached.  */
+  return GRUB_ERR_NONE;
+}
diff --git a/lib/i386/relocator_asm.S b/lib/i386/relocator_asm.S
new file mode 100644
index 000000000..3ef1fa083
--- /dev/null
+++ b/lib/i386/relocator_asm.S
@@ -0,0 +1,269 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/symbol.h>
+	
+#ifdef BACKWARD
+#define RELOCATOR_VARIABLE(x) VARIABLE(grub_relocator32_backward_ ## x)
+#else
+#define RELOCATOR_VARIABLE(x) VARIABLE(grub_relocator32_forward_ ## x)
+#endif	
+	.p2align	4	/* force 16-byte alignment */
+
+RELOCATOR_VARIABLE(start)
+#ifdef BACKWARD
+base:
+#endif
+	cli
+
+#ifndef __x86_64__
+	/* mov imm32, %eax */
+	.byte	0xb8
+RELOCATOR_VARIABLE(dest)
+	.long 0
+	mov %eax, %edi
+
+	/* mov imm32, %eax */
+	.byte	0xb8
+RELOCATOR_VARIABLE(src)
+	.long 0
+	mov %eax, %esi
+
+	/* mov imm32, %ecx */
+	.byte	0xb9
+RELOCATOR_VARIABLE(size)
+	.long 0
+	mov %edi, %eax
+#ifndef BACKWARD
+	add %ecx, %eax
+#endif
+	add $0x3, %ecx
+	shr $2, %ecx
+
+#ifdef BACKWARD
+	/* Backward movsl is implicitly off-by-four.  compensate that.  */
+	subl	$4,	%esi
+	subl	$4,	%edi
+
+	/* Backward copy.  */
+	std
+	addl	%ecx, %esi
+	addl	%ecx, %edi
+
+	rep
+	movsl
+
+#else
+	/* Forward copy.  */
+	cld
+	rep
+	movsl
+#endif
+	/* %eax contains now our new base.  */
+	mov %eax, %esi
+	add $(cont0 - base), %eax
+	jmp *%eax
+cont0:
+#else
+	xorq %rax, %rax
+
+	/* mov imm32, %eax */
+	.byte	0xb8
+RELOCATOR_VARIABLE(dest)
+	.long 0
+	mov %eax, %edi
+
+	/* mov imm64, %rax */
+	.byte	0xb8
+RELOCATOR_VARIABLE(src)
+	.long 0, 0
+	mov %rax, %rsi
+
+	xorl %rcx, %rcx
+	/* mov imm32, %ecx */
+	.byte	0xb9
+RELOCATOR_VARIABLE(size)
+	.long 0
+
+	mov %rdi, %rax
+#ifndef BACKWARD
+	add %rcx, %rax
+#endif
+	add $0x3, %rcx
+	shr $2, %rcx
+
+#ifdef BACKWARD
+	/* Backward movsl is implicitly off-by-four.  compensate that.  */
+	subl	$4,	%rsi
+	subl	$4,	%rdi
+
+	/* Backward copy.  */
+	std
+	addl	%rcx, %rsi
+	addl	%rcx, %rdi
+
+	rep
+	movsl
+
+#else
+	/* Forward copy.  */
+	cld
+	rep
+	movsl
+#endif
+
+	/* %rax contains now our new 'base'.  */
+	mov %rax, %rsi
+#ifdef APPLE_CC
+	add $(cont0 - base), %eax
+#else
+	add $(cont0 - base), %rax
+#endif
+	jmp *%rax
+cont0:
+#ifdef APPLE_CC
+	lea (cont1 - base) (%esi, 1), %eax
+	mov %eax, (jump_vector - base) (%esi, 1)
+
+	lea (gdt - base) (%esi, 1), %eax
+	mov %eax, (gdt_addr - base) (%esi, 1)
+
+	/* Switch to compatibility mode. */
+
+	lgdt (gdtdesc - base) (%esi, 1)
+
+	/* Update %cs. Thanks to David Miller for pointing this mistake out. */
+	ljmp *(jump_vector - base) (%esi,1)
+#else
+	lea (cont1 - base) (%rsi, 1), %rax
+	mov %eax, (jump_vector - base) (%rsi, 1)
+
+	lea (gdt - base) (%rsi, 1), %rax
+	mov %rax, (gdt_addr - base) (%rsi, 1)
+
+	/* Switch to compatibility mode. */
+
+	lgdt (gdtdesc - base) (%rsi, 1)
+
+	/* Update %cs. Thanks to David Miller for pointing this mistake out. */
+	ljmp *(jump_vector - base) (%rsi, 1)
+#endif
+
+cont1:
+	.code32
+
+	/* Update other registers. */
+	mov $0x18, %eax
+	mov %eax, %ds
+	mov %eax, %es
+	mov %eax, %fs
+	mov %eax, %gs
+	mov %eax, %ss
+
+	/* Disable paging. */
+	mov %cr0, %eax
+	and $0x7fffffff, %eax
+	mov %eax, %cr0
+
+	/* Disable amd64. */
+	mov $0xc0000080, %ecx
+	rdmsr
+	and $0xfffffeff, %eax
+	wrmsr
+
+	/* Turn off PAE. */
+	movl %cr4, %eax
+	and $0xffffffcf, %eax
+	mov %eax, %cr4
+
+	jmp cont2
+cont2:
+#endif
+	.code32
+
+	/* mov imm32, %eax */
+	.byte	0xb8
+RELOCATOR_VARIABLE (esp)
+	.long 0
+	
+	movl %eax, %esp
+	
+	/* mov imm32, %eax */
+	.byte	0xb8
+RELOCATOR_VARIABLE (eax)
+	.long 0
+
+	/* mov imm32, %ebx */
+	.byte	0xbb
+RELOCATOR_VARIABLE (ebx)
+	.long 0
+
+	/* mov imm32, %ecx */
+	.byte	0xb9
+RELOCATOR_VARIABLE (ecx)
+	.long 0
+
+	/* mov imm32, %edx */
+	.byte	0xba
+RELOCATOR_VARIABLE (edx)
+	.long 0
+
+	/* Cleared direction flag is of no problem with any current
+	   payload and makes this implementation easier.  */
+	cld
+
+	.byte 0xea
+RELOCATOR_VARIABLE (eip)
+	.long 0
+	.word 0x08
+
+#ifdef __x86_64__
+	/* GDT. Copied from loader/i386/linux.c. */
+	.p2align 4
+gdt:
+	/* NULL.  */
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	/* Reserved.  */
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	/* Code segment.  */
+	.byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x9A, 0xCF, 0x00
+
+	/* Data segment.  */
+	.byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x92, 0xCF, 0x00
+
+gdtdesc:
+	.word 31
+gdt_addr:
+	/* Filled by the code. */
+	.quad 0
+
+	.p2align 4
+jump_vector:
+	/* Jump location. Is filled by the code */
+	.long 0
+	.long 0x10
+#endif
+
+#ifndef BACKWARD
+base:
+#endif
+
+	
+RELOCATOR_VARIABLE(end)
diff --git a/lib/i386/relocator_backward.S b/lib/i386/relocator_backward.S
new file mode 100644
index 000000000..06913470e
--- /dev/null
+++ b/lib/i386/relocator_backward.S
@@ -0,0 +1,2 @@
+#define BACKWARD
+#include "relocator_asm.S"
diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index 87ffcae8d..974395f63 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -48,18 +48,35 @@
 #include <grub/device.h>
 #include <grub/partition.h>
 #endif
+#include <grub/i386/relocator.h>
 
 extern grub_dl_t my_mod;
 static struct grub_multiboot_info *mbi, *mbi_dest;
-static grub_addr_t entry;
 
-static char *playground;
 static grub_size_t code_size;
 
+char *grub_multiboot_payload_orig;
+grub_addr_t grub_multiboot_payload_dest;
+grub_size_t grub_multiboot_payload_size;
+grub_uint32_t grub_multiboot_payload_eip;
+grub_uint32_t grub_multiboot_payload_esp;
+
 static grub_err_t
 grub_multiboot_boot (void)
 {
-  grub_multiboot_real_boot (entry, mbi_dest);
+  struct grub_relocator32_state state =
+    {
+      .eax = MULTIBOOT_MAGIC2,
+      .ebx = PTR_TO_UINT32 (mbi_dest),
+      .ecx = 0,
+      .edx = 0,
+      .eip = grub_multiboot_payload_eip,
+      .esp = grub_multiboot_payload_esp
+    };
+
+  grub_relocator32_boot (grub_multiboot_payload_orig,
+			 grub_multiboot_payload_dest,
+			 state);
 
   /* Not reached.  */
   return GRUB_ERR_NONE;
@@ -248,11 +265,8 @@ grub_multiboot (int argc, char *argv[])
       goto fail;
     }
 
-  if (playground)
-    {
-      grub_free (playground);
-      playground = NULL;
-    }
+  grub_relocator32_free (grub_multiboot_payload_orig);
+  grub_multiboot_payload_orig = NULL;
 
   mmap_length = grub_get_multiboot_mmap_len ();
 
@@ -267,11 +281,13 @@ grub_multiboot (int argc, char *argv[])
 				((void *) ((x) + code_size + cmdline_length))
 #define mbi_addr(x)		((void *) ((x) + code_size + cmdline_length + boot_loader_name_length))
 #define mmap_addr(x)		((void *) ((x) + code_size + cmdline_length + boot_loader_name_length + sizeof (struct grub_multiboot_info)))
+#define stack_addr(x)		((void *) ((x) + code_size + cmdline_length + boot_loader_name_length + sizeof (struct grub_multiboot_info) + mmap_length + GRUB_MULTIBOOT_STACK_SIZE))
 
   grub_multiboot_payload_size = cmdline_length
     /* boot_loader_name_length might need to grow for mbi,etc to be aligned (see below) */
     + boot_loader_name_length + 3
-    + sizeof (struct grub_multiboot_info) + mmap_length;
+    + sizeof (struct grub_multiboot_info) + mmap_length
+    + GRUB_MULTIBOOT_STACK_SIZE;
 
   if (header->flags & MULTIBOOT_AOUT_KLUDGE)
     {
@@ -287,11 +303,12 @@ grub_multiboot (int argc, char *argv[])
       grub_multiboot_payload_dest = header->load_addr;
 
       grub_multiboot_payload_size += code_size;
-      playground = grub_malloc (RELOCATOR_SIZEOF(forward) + grub_multiboot_payload_size + RELOCATOR_SIZEOF(backward));
-      if (! playground)
-	goto fail;
 
-      grub_multiboot_payload_orig = (long) playground + RELOCATOR_SIZEOF(forward);
+      grub_multiboot_payload_orig
+	= grub_relocator32_alloc (grub_multiboot_payload_size);
+
+      if (! grub_multiboot_payload_orig)
+	goto fail;
 
       if ((grub_file_seek (file, offset)) == (grub_off_t) - 1)
 	goto fail;
@@ -304,7 +321,7 @@ grub_multiboot (int argc, char *argv[])
 	grub_memset ((void *) (grub_multiboot_payload_orig + load_size), 0,
 		     header->bss_end_addr - header->load_addr - load_size);
 
-      grub_multiboot_payload_entry_offset = header->entry_addr - header->load_addr;
+      grub_multiboot_payload_eip = header->entry_addr;
 
     }
   else if (grub_multiboot_load_elf (file, buffer) != GRUB_ERR_NONE)
@@ -325,23 +342,6 @@ grub_multiboot (int argc, char *argv[])
   mbi->mmap_addr = (grub_uint32_t) mmap_addr (grub_multiboot_payload_dest);
   mbi->flags |= MULTIBOOT_INFO_MEM_MAP;
 
-  if (grub_multiboot_payload_dest >= grub_multiboot_payload_orig)
-    {
-      grub_memmove (playground, &grub_multiboot_forward_relocator, RELOCATOR_SIZEOF(forward));
-      entry = (grub_addr_t) playground;
-    }
-  else
-    {
-      grub_memmove ((char *) (grub_multiboot_payload_orig + grub_multiboot_payload_size),
-		    &grub_multiboot_backward_relocator, RELOCATOR_SIZEOF(backward));
-      entry = (grub_addr_t) grub_multiboot_payload_orig + grub_multiboot_payload_size;
-    }
-
-  grub_dprintf ("multiboot_loader", "dest=%p, size=0x%x, entry_offset=0x%x\n",
-		(void *) grub_multiboot_payload_dest,
-		grub_multiboot_payload_size,
-		grub_multiboot_payload_entry_offset);
-
   /* Convert from bytes to kilobytes.  */
   mbi->mem_lower = grub_mmap_get_lower () / 1024;
   mbi->mem_upper = grub_mmap_get_upper () / 1024;
@@ -371,6 +371,8 @@ grub_multiboot (int argc, char *argv[])
   if (grub_multiboot_get_bootdev (&mbi->boot_device))
     mbi->flags |= MULTIBOOT_INFO_BOOTDEV;
 
+  grub_multiboot_payload_esp = PTR_TO_UINT32 (stack_addr (grub_multiboot_payload_dest));
+
   grub_loader_set (grub_multiboot_boot, grub_multiboot_unload, 1);
 
  fail:
diff --git a/loader/i386/multiboot_elfxx.c b/loader/i386/multiboot_elfxx.c
index 77c47118c..0b9820dcc 100644
--- a/loader/i386/multiboot_elfxx.c
+++ b/loader/i386/multiboot_elfxx.c
@@ -32,6 +32,8 @@
 #error "I'm confused"
 #endif
 
+#include <grub/i386/relocator.h>
+
 #define CONCAT(a,b)	CONCAT_(a, b)
 #define CONCAT_(a,b)	a ## b
 
@@ -99,11 +101,12 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
   grub_multiboot_payload_dest = phdr(lowest_segment)->p_paddr;
 
   grub_multiboot_payload_size += code_size;
-  playground = grub_malloc (RELOCATOR_SIZEOF(forward) + grub_multiboot_payload_size + RELOCATOR_SIZEOF(backward));
-  if (! playground)
-    return grub_errno;
 
-  grub_multiboot_payload_orig = (long) playground + RELOCATOR_SIZEOF(forward);
+  grub_multiboot_payload_orig
+    = grub_relocator32_alloc (grub_multiboot_payload_size);
+
+  if (!grub_multiboot_payload_orig)
+    return grub_errno;
 
   /* Load every loadable segment in memory.  */
   for (i = 0; i < ehdr->e_phnum; i++)
@@ -135,8 +138,7 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
     if (phdr(i)->p_vaddr <= ehdr->e_entry
 	&& phdr(i)->p_vaddr + phdr(i)->p_memsz > ehdr->e_entry)
       {
-	grub_multiboot_payload_entry_offset = (ehdr->e_entry - phdr(i)->p_vaddr)
-	  + (phdr(i)->p_paddr  - phdr(lowest_segment)->p_paddr);
+	grub_multiboot_payload_eip = ehdr->e_entry;
 	break;
       }
 
diff --git a/loader/i386/multiboot_helper.S b/loader/i386/multiboot_helper.S
index d1094588b..2f9af778b 100644
--- a/loader/i386/multiboot_helper.S
+++ b/loader/i386/multiboot_helper.S
@@ -22,81 +22,6 @@
 
 	.p2align	2	/* force 4-byte alignment */
 
-/*
- * This starts the multiboot kernel.
- */
-
-VARIABLE(grub_multiboot_payload_size)
-	.long	0
-VARIABLE(grub_multiboot_payload_orig)
-	.long	0
-VARIABLE(grub_multiboot_payload_dest)
-	.long	0
-VARIABLE(grub_multiboot_payload_entry_offset)
-	.long	0
-
-/*
- * The relocators below understand the following parameters:
- * ecx:	Size of the block to be copied.
- * esi:	Where to copy from (always lowest address, even if we're relocating
- *      backwards).
- * edi:	Where to copy to (likewise).
- * edx:	Offset of the entry point (relative to the beginning of the block).
- */
-
-VARIABLE(grub_multiboot_forward_relocator)
-	/* Add entry offset.  */
-	addl	%edi, %edx
-
-	/* Forward copy.  */
-	cld
-	rep
-	movsb
-
-	jmp	*%edx
-VARIABLE(grub_multiboot_forward_relocator_end)
-
-VARIABLE(grub_multiboot_backward_relocator)
-	/* Add entry offset (before %edi is mangled).  */
-	addl	%edi, %edx
-
-	/* Backward movsb is implicitly off-by-one.  compensate that.  */
-	decl	%esi
-	decl	%edi
-
-	/* Backward copy.  */
-	std
-	addl	%ecx, %esi
-	addl	%ecx, %edi
-	rep
-	movsb
-
-	cld
-	jmp	*%edx
-VARIABLE(grub_multiboot_backward_relocator_end)
-
-FUNCTION(grub_multiboot_real_boot)
-	/* Push the entry address on the stack.  */
-	pushl	%eax
-	/* Move the address of the multiboot information structure to ebx.  */
-	movl	%edx,%ebx
-
-	/* Interrupts should be disabled.  */
-	cli
-
-	/* Where do we copy what from.  */
-	movl	EXT_C(grub_multiboot_payload_size), %ecx
-	movl	EXT_C(grub_multiboot_payload_orig), %esi
-	movl	EXT_C(grub_multiboot_payload_dest), %edi
-	movl	EXT_C(grub_multiboot_payload_entry_offset), %edx
-
-	/* Move the magic value into eax.  */
-	movl	$MULTIBOOT_MAGIC2, %eax
-
-	/* Jump to the relocator.  */
-	popl	%ebp
-	jmp 	*%ebp
-
 /*
  * This starts the multiboot 2 kernel.
  */

From c2a583ec38e29afa894a236c2bda65bf1e0bb83c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 Aug 2009 13:45:37 +0200
Subject: [PATCH 0002/1628] 64-bit bugfixes

---
 lib/i386/relocator_asm.S | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/i386/relocator_asm.S b/lib/i386/relocator_asm.S
index 3ef1fa083..f16d7f263 100644
--- a/lib/i386/relocator_asm.S
+++ b/lib/i386/relocator_asm.S
@@ -89,12 +89,13 @@ RELOCATOR_VARIABLE(dest)
 	mov %eax, %edi
 
 	/* mov imm64, %rax */
+	.byte	0x48
 	.byte	0xb8
 RELOCATOR_VARIABLE(src)
 	.long 0, 0
 	mov %rax, %rsi
 
-	xorl %rcx, %rcx
+	xorq %rcx, %rcx
 	/* mov imm32, %ecx */
 	.byte	0xb9
 RELOCATOR_VARIABLE(size)
@@ -109,13 +110,13 @@ RELOCATOR_VARIABLE(size)
 
 #ifdef BACKWARD
 	/* Backward movsl is implicitly off-by-four.  compensate that.  */
-	subl	$4,	%rsi
-	subl	$4,	%rdi
+	subq	$4,	%rsi
+	subq	$4,	%rdi
 
 	/* Backward copy.  */
 	std
-	addl	%rcx, %rsi
-	addl	%rcx, %rdi
+	addq	%rcx, %rsi
+	addq	%rcx, %rdi
 
 	rep
 	movsl
@@ -230,7 +231,11 @@ RELOCATOR_VARIABLE (edx)
 	.byte 0xea
 RELOCATOR_VARIABLE (eip)
 	.long 0
+#ifdef __x86_64__
+	.word 0x10
+#else
 	.word 0x08
+#endif
 
 #ifdef __x86_64__
 	/* GDT. Copied from loader/i386/linux.c. */

From fe7546f39a9aed99f6f92403db4e59a35af212c0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 Aug 2009 13:50:02 +0200
Subject: [PATCH 0003/1628] indent

---
 lib/i386/relocator.c | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index 7dbdd1597..6a9b3ce1b 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -68,22 +68,23 @@ grub_relocator32_alloc (grub_size_t size)
 {
   char *playground;
 
-  playground = grub_malloc ((RELOCATOR_SIZEOF(forward) + RELOCATOR_ALIGN)
-			    + size 
-			    + (RELOCATOR_SIZEOF(backward) + RELOCATOR_ALIGN));
-  if (! playground)
+  playground = grub_malloc ((RELOCATOR_SIZEOF (forward) + RELOCATOR_ALIGN)
+			    + size
+			    + (RELOCATOR_SIZEOF (backward) +
+			       RELOCATOR_ALIGN));
+  if (!playground)
     return 0;
 
   *(grub_size_t *) playground = size;
 
-  return playground + RELOCATOR_SIZEOF(forward);
+  return playground + RELOCATOR_SIZEOF (forward);
 }
 
 void
 grub_relocator32_free (void *relocator)
 {
   if (relocator)
-    grub_free ((char *) relocator - RELOCATOR_SIZEOF(forward));
+    grub_free ((char *) relocator - RELOCATOR_SIZEOF (forward));
 }
 
 
@@ -95,14 +96,16 @@ grub_relocator32_boot (void *relocator, grub_uint32_t dest,
   char *playground;
   void (*entry) ();
 
-  playground = (char *) relocator - RELOCATOR_SIZEOF(forward);
+  playground = (char *) relocator - RELOCATOR_SIZEOF (forward);
   size = *(grub_size_t *) playground;
 
   if (UINT_TO_PTR (dest) >= relocator)
     {
       int overhead;
 
-      overhead = ALIGN_UP (dest - RELOCATOR_SIZEOF(backward) - RELOCATOR_ALIGN, RELOCATOR_ALIGN);
+      overhead =
+	ALIGN_UP (dest - RELOCATOR_SIZEOF (backward) - RELOCATOR_ALIGN,
+		  RELOCATOR_ALIGN);
       grub_relocator32_backward_dest = dest - overhead;
       grub_relocator32_backward_src = PTR_TO_UINT64 (relocator - overhead);
       grub_relocator32_backward_size = size + overhead;
@@ -116,15 +119,15 @@ grub_relocator32_boot (void *relocator, grub_uint32_t dest,
 
       grub_memmove (relocator - overhead,
 		    &grub_relocator32_backward_start,
-		    RELOCATOR_SIZEOF(backward));
-      entry = (void (*) ()) (relocator - overhead);
+		    RELOCATOR_SIZEOF (backward));
+      entry = (void (*)()) (relocator - overhead);
     }
   else
     {
       int overhead;
 
-      overhead = ALIGN_UP (dest + size, RELOCATOR_ALIGN) 
-	+ RELOCATOR_SIZEOF(forward) - (dest + size);
+      overhead = ALIGN_UP (dest + size, RELOCATOR_ALIGN)
+	+ RELOCATOR_SIZEOF (forward) - (dest + size);
 
       grub_relocator32_forward_dest = dest;
       grub_relocator32_forward_src = PTR_TO_UINT64 (relocator);
@@ -137,9 +140,12 @@ grub_relocator32_boot (void *relocator, grub_uint32_t dest,
       grub_relocator32_forward_eip = state.eip;
       grub_relocator32_forward_esp = state.esp;
 
-      grub_memmove (relocator + size + overhead - RELOCATOR_SIZEOF(forward),
-		    &grub_relocator32_forward_start, RELOCATOR_SIZEOF(forward));
-      entry = (void (*) ()) (relocator + size + overhead - RELOCATOR_SIZEOF(forward));
+      grub_memmove (relocator + size + overhead - RELOCATOR_SIZEOF (forward),
+		    &grub_relocator32_forward_start,
+		    RELOCATOR_SIZEOF (forward));
+      entry =
+	(void (*)()) (relocator + size + overhead -
+		      RELOCATOR_SIZEOF (forward));
     }
   entry ();
 

From 23a2f35a0bcef47b68ab07310456643750d639af Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 Aug 2009 13:52:03 +0200
Subject: [PATCH 0004/1628] trailing whitespaces in asm

---
 lib/i386/relocator_asm.S | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/i386/relocator_asm.S b/lib/i386/relocator_asm.S
index f16d7f263..d022a6840 100644
--- a/lib/i386/relocator_asm.S
+++ b/lib/i386/relocator_asm.S
@@ -17,12 +17,12 @@
  */
 
 #include <grub/symbol.h>
-	
+
 #ifdef BACKWARD
 #define RELOCATOR_VARIABLE(x) VARIABLE(grub_relocator32_backward_ ## x)
 #else
 #define RELOCATOR_VARIABLE(x) VARIABLE(grub_relocator32_forward_ ## x)
-#endif	
+#endif
 	.p2align	4	/* force 16-byte alignment */
 
 RELOCATOR_VARIABLE(start)
@@ -201,9 +201,9 @@ cont2:
 	.byte	0xb8
 RELOCATOR_VARIABLE (esp)
 	.long 0
-	
+
 	movl %eax, %esp
-	
+
 	/* mov imm32, %eax */
 	.byte	0xb8
 RELOCATOR_VARIABLE (eax)
@@ -270,5 +270,4 @@ jump_vector:
 base:
 #endif
 
-	
 RELOCATOR_VARIABLE(end)

From 7c8f178d02c533be018a83db48429a08d4952a3a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 Aug 2009 14:30:51 +0200
Subject: [PATCH 0005/1628] realloc

---
 include/grub/i386/relocator.h | 15 ++++++++-------
 lib/i386/relocator.c          | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/include/grub/i386/relocator.h b/include/grub/i386/relocator.h
index cbc75ed0a..ef7fe23aa 100644
--- a/include/grub/i386/relocator.h
+++ b/include/grub/i386/relocator.h
@@ -19,6 +19,9 @@
 #ifndef GRUB_RELOCATOR_CPU_HEADER
 #define GRUB_RELOCATOR_CPU_HEADER	1
 
+#include <grub/types.h>
+#include <grub/err.h>
+
 struct grub_relocator32_state
 {
   grub_uint32_t esp;
@@ -29,12 +32,10 @@ struct grub_relocator32_state
   grub_uint32_t eip;
 };
 
-void *
-grub_relocator32_alloc (grub_size_t size);
-grub_err_t
-grub_relocator32_boot (void *relocator, grub_uint32_t dest,
-		       struct grub_relocator32_state state);
-void
-grub_relocator32_free (void *relocator);
+void *grub_relocator32_alloc (grub_size_t size);
+grub_err_t grub_relocator32_boot (void *relocator, grub_uint32_t dest,
+				  struct grub_relocator32_state state);
+void *grub_relocator32_realloc (void *relocator, grub_size_t size);
+void grub_relocator32_free (void *relocator);
 
 #endif /* ! GRUB_RELOCATOR_CPU_HEADER */
diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index 6a9b3ce1b..0205d8ef4 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -80,6 +80,25 @@ grub_relocator32_alloc (grub_size_t size)
   return playground + RELOCATOR_SIZEOF (forward);
 }
 
+void *
+grub_relocator32_realloc (void *relocator, grub_size_t size)
+{
+  char *playground;
+
+  playground = (char *) relocator - RELOCATOR_SIZEOF (forward);
+
+  playground = grub_realloc (playground,
+			     (RELOCATOR_SIZEOF (forward) + RELOCATOR_ALIGN)
+			     + size
+			     + (RELOCATOR_SIZEOF (backward) + RELOCATOR_ALIGN));
+  if (!playground)
+    return 0;
+
+  *(grub_size_t *) playground = size;
+
+  return playground + RELOCATOR_SIZEOF (forward);
+}
+
 void
 grub_relocator32_free (void *relocator)
 {

From 5c29f4d96291f88bd0529c4037dec4c1c72f646e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 Aug 2009 19:30:43 +0200
Subject: [PATCH 0006/1628] Improvements

---
 THANKS                        |   1 +
 include/grub/i386/pc/memory.h |  17 +--
 lib/i386/relocator.c          |  12 +-
 lib/i386/relocator_asm.S      | 252 +++++++++++++++++-----------------
 4 files changed, 130 insertions(+), 152 deletions(-)

diff --git a/THANKS b/THANKS
index 5ce190944..82b4bc838 100644
--- a/THANKS
+++ b/THANKS
@@ -8,6 +8,7 @@ generally assist in the GRUB 2 maintainership process:
 
 Andrey Shuvikov <mr_hyro@yahoo.com>
 Bibo Mao <bibo.mao@intel.com>
+David Miller <davem@davemloft.net>
 Guillem Jover <guillem@hadrons.org>
 Harley D. Eades III <hde@foobar-qux.org>
 Hitoshi Ozeki <h-ozeki@ck2.so-net.ne.jp>
diff --git a/include/grub/i386/pc/memory.h b/include/grub/i386/pc/memory.h
index d7910ab15..b1d75dbc9 100644
--- a/include/grub/i386/pc/memory.h
+++ b/include/grub/i386/pc/memory.h
@@ -28,6 +28,8 @@
 #include <grub/memory.h>
 #endif
 
+#include <grub/i386/memory.h>
+
 /* The scratch buffer used in real mode code.  */
 #define GRUB_MEMORY_MACHINE_SCRATCH_ADDR	0x68000
 #define GRUB_MEMORY_MACHINE_SCRATCH_SEG	(GRUB_MEMORY_MACHINE_SCRATCH_ADDR >> 4)
@@ -63,21 +65,6 @@
 /* The address where another boot loader is loaded.  */
 #define GRUB_MEMORY_MACHINE_BOOT_LOADER_ADDR	0x7c00
 
-/* The flag for protected mode.  */
-#define GRUB_MEMORY_MACHINE_CR0_PE_ON		0x1
-
-/* The code segment of the protected mode.  */
-#define GRUB_MEMORY_MACHINE_PROT_MODE_CSEG	0x8
-
-/* The data segment of the protected mode.  */
-#define GRUB_MEMORY_MACHINE_PROT_MODE_DSEG	0x10
-
-/* The code segment of the pseudo real mode.  */
-#define GRUB_MEMORY_MACHINE_PSEUDO_REAL_CSEG	0x18
-
-/* The data segment of the pseudo real mode.  */
-#define GRUB_MEMORY_MACHINE_PSEUDO_REAL_DSEG	0x20
-
 #ifndef ASM_FILE
 
 struct grub_machine_mmap_entry
diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index 0205d8ef4..3f0a40a27 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -32,19 +32,11 @@ extern grub_uint8_t grub_relocator32_backward_end;
 
 extern grub_uint32_t grub_relocator32_backward_dest;
 extern grub_uint32_t grub_relocator32_backward_size;
-#ifdef __x86_64__
-extern grub_uint64_t grub_relocator32_backward_src;
-#else
-extern grub_uint32_t grub_relocator32_backward_src;
-#endif
+extern grub_addr_t grub_relocator32_backward_src;
 
 extern grub_uint32_t grub_relocator32_forward_dest;
 extern grub_uint32_t grub_relocator32_forward_size;
-#ifdef __x86_64__
-extern grub_uint64_t grub_relocator32_forward_src;
-#else
-extern grub_uint32_t grub_relocator32_forward_src;
-#endif
+extern grub_addr_t grub_relocator32_forward_src;
 
 extern grub_uint32_t grub_relocator32_forward_eax;
 extern grub_uint32_t grub_relocator32_forward_ebx;
diff --git a/lib/i386/relocator_asm.S b/lib/i386/relocator_asm.S
index d022a6840..7d58c8e97 100644
--- a/lib/i386/relocator_asm.S
+++ b/lib/i386/relocator_asm.S
@@ -17,12 +17,35 @@
  */
 
 #include <grub/symbol.h>
+#include <grub/i386/memory.h>
 
 #ifdef BACKWARD
 #define RELOCATOR_VARIABLE(x) VARIABLE(grub_relocator32_backward_ ## x)
 #else
 #define RELOCATOR_VARIABLE(x) VARIABLE(grub_relocator32_forward_ ## x)
 #endif
+#ifdef __x86_64__
+#define RAX %rax
+#define RCX %rcx
+#define RDI %rdi
+#define RSI %rdi
+#else
+#define RAX %eax
+#define RCX %ecx
+#define RDI %edi	
+#define RSI %esi	
+#endif
+
+/* Apple's linker has a problem with 64-bit relocations.  */
+#if defined (__apple__) || ! defined (__x86_64__)
+#define RSIA %esi
+#define RAXA %eax
+#else
+#define RSIA %rsi
+#define RAXA %rax
+#endif
+
+	
 	.p2align	4	/* force 16-byte alignment */
 
 RELOCATOR_VARIABLE(start)
@@ -35,88 +58,64 @@ base:
 	/* mov imm32, %eax */
 	.byte	0xb8
 RELOCATOR_VARIABLE(dest)
-	.long 0
-	mov %eax, %edi
+	.long	0
+	movl	%eax, %edi
 
 	/* mov imm32, %eax */
 	.byte	0xb8
 RELOCATOR_VARIABLE(src)
-	.long 0
-	mov %eax, %esi
+	.long	0
+	movl	%eax, %esi
 
 	/* mov imm32, %ecx */
 	.byte	0xb9
 RELOCATOR_VARIABLE(size)
-	.long 0
-	mov %edi, %eax
-#ifndef BACKWARD
-	add %ecx, %eax
-#endif
-	add $0x3, %ecx
-	shr $2, %ecx
-
-#ifdef BACKWARD
-	/* Backward movsl is implicitly off-by-four.  compensate that.  */
-	subl	$4,	%esi
-	subl	$4,	%edi
-
-	/* Backward copy.  */
-	std
-	addl	%ecx, %esi
-	addl	%ecx, %edi
-
-	rep
-	movsl
-
+	.long	0
 #else
-	/* Forward copy.  */
-	cld
-	rep
-	movsl
-#endif
-	/* %eax contains now our new base.  */
-	mov %eax, %esi
-	add $(cont0 - base), %eax
-	jmp *%eax
-cont0:
-#else
-	xorq %rax, %rax
+	xorq	%rax, %rax
 
 	/* mov imm32, %eax */
 	.byte	0xb8
 RELOCATOR_VARIABLE(dest)
-	.long 0
-	mov %eax, %edi
+	.long	0
+	movq	%rax, %rdi
 
 	/* mov imm64, %rax */
 	.byte	0x48
 	.byte	0xb8
 RELOCATOR_VARIABLE(src)
-	.long 0, 0
-	mov %rax, %rsi
+	.long	0, 0
+	movq	%rax, %rsi
 
-	xorq %rcx, %rcx
+	xorq	%rcx, %rcx
 	/* mov imm32, %ecx */
 	.byte	0xb9
 RELOCATOR_VARIABLE(size)
-	.long 0
+	.long	0
 
-	mov %rdi, %rax
-#ifndef BACKWARD
-	add %rcx, %rax
 #endif
-	add $0x3, %rcx
-	shr $2, %rcx
 
+	mov	RDI, RAX
+	
+#ifdef BACKWARD
+	add	RCX, RSI
+	add	RDX, RDI
+#endif
+
+#ifndef BACKWARD
+	add	RCX, RAX
+#endif
+	addq	$0x3, RCX
+	shrq	$2, RCX
+
+	
 #ifdef BACKWARD
 	/* Backward movsl is implicitly off-by-four.  compensate that.  */
-	subq	$4,	%rsi
-	subq	$4,	%rdi
+	subq	$4,	RSI
+	subq	$4,	RDI
 
 	/* Backward copy.  */
 	std
-	addq	%rcx, %rsi
-	addq	%rcx, %rdi
 
 	rep
 	movsl
@@ -129,142 +128,141 @@ RELOCATOR_VARIABLE(size)
 #endif
 
 	/* %rax contains now our new 'base'.  */
-	mov %rax, %rsi
-#ifdef APPLE_CC
-	add $(cont0 - base), %eax
-#else
-	add $(cont0 - base), %rax
-#endif
-	jmp *%rax
+	mov	RAX, RSI
+	add	$(cont0 - base), RAXA
+	jmp	*RAX
 cont0:
-#ifdef APPLE_CC
-	lea (cont1 - base) (%esi, 1), %eax
-	mov %eax, (jump_vector - base) (%esi, 1)
+	lea	(cont1 - base) (RSIA, 1), RAXA
+	movl	%eax, (jump_vector - base) (RSIA, 1)
 
-	lea (gdt - base) (%esi, 1), %eax
-	mov %eax, (gdt_addr - base) (%esi, 1)
+	lea	(gdt - base) (RSIA, 1), RAXA
+	mov	RAXA, (gdt_addr - base) (RSIA, 1)
 
 	/* Switch to compatibility mode. */
 
-	lgdt (gdtdesc - base) (%esi, 1)
+	lgdt	(gdtdesc - base) (RSIA, 1)
 
 	/* Update %cs. Thanks to David Miller for pointing this mistake out. */
-	ljmp *(jump_vector - base) (%esi,1)
-#else
-	lea (cont1 - base) (%rsi, 1), %rax
-	mov %eax, (jump_vector - base) (%rsi, 1)
-
-	lea (gdt - base) (%rsi, 1), %rax
-	mov %rax, (gdt_addr - base) (%rsi, 1)
-
-	/* Switch to compatibility mode. */
-
-	lgdt (gdtdesc - base) (%rsi, 1)
-
-	/* Update %cs. Thanks to David Miller for pointing this mistake out. */
-	ljmp *(jump_vector - base) (%rsi, 1)
-#endif
+	ljmp	*(jump_vector - base) (RSIA, 1)
 
 cont1:
 	.code32
 
 	/* Update other registers. */
-	mov $0x18, %eax
-	mov %eax, %ds
-	mov %eax, %es
-	mov %eax, %fs
-	mov %eax, %gs
-	mov %eax, %ss
+	movl	$GRUB_MEMORY_MACHINE_PROT_MODE_DSEG, %eax
+	movl	%eax, %ds
+	movl	%eax, %es
+	movl	%eax, %fs
+	movl	%eax, %gs
+	movl	%eax, %ss
 
 	/* Disable paging. */
-	mov %cr0, %eax
-	and $0x7fffffff, %eax
-	mov %eax, %cr0
+	movl	%cr0, %eax
+	andl	$0x7fffffff, %eax
+	movl	%eax, %cr0
 
 	/* Disable amd64. */
-	mov $0xc0000080, %ecx
+	movl	$0xc0000080, %ecx
 	rdmsr
-	and $0xfffffeff, %eax
+	andl	$0xfffffeff, %eax
 	wrmsr
 
 	/* Turn off PAE. */
-	movl %cr4, %eax
-	and $0xffffffcf, %eax
-	mov %eax, %cr4
+	movl	%cr4, %eax
+	andl	$0xffffffcf, %eax
+	movl	%eax, %cr4
 
-	jmp cont2
+	jmp	cont2
 cont2:
-#endif
 	.code32
 
 	/* mov imm32, %eax */
 	.byte	0xb8
 RELOCATOR_VARIABLE (esp)
-	.long 0
+	.long	0
 
-	movl %eax, %esp
+	movl	%eax, %esp
 
 	/* mov imm32, %eax */
 	.byte	0xb8
 RELOCATOR_VARIABLE (eax)
-	.long 0
+	.long	0
 
 	/* mov imm32, %ebx */
 	.byte	0xbb
 RELOCATOR_VARIABLE (ebx)
-	.long 0
+	.long	0
 
 	/* mov imm32, %ecx */
 	.byte	0xb9
 RELOCATOR_VARIABLE (ecx)
-	.long 0
+	.long	0
 
 	/* mov imm32, %edx */
 	.byte	0xba
 RELOCATOR_VARIABLE (edx)
-	.long 0
+	.long	0
 
 	/* Cleared direction flag is of no problem with any current
 	   payload and makes this implementation easier.  */
 	cld
 
-	.byte 0xea
+	.byte	0xea
 RELOCATOR_VARIABLE (eip)
-	.long 0
-#ifdef __x86_64__
-	.word 0x10
-#else
-	.word 0x08
-#endif
+	.long	0
+	.word	0x08
 
-#ifdef __x86_64__
-	/* GDT. Copied from loader/i386/linux.c. */
-	.p2align 4
+	/* GDT. The same as is used in 32-bit GRUB. */
+	.p2align	4
 gdt:
-	/* NULL.  */
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.word	0, 0
+	.byte	0, 0, 0, 0
 
-	/* Reserved.  */
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	/* -- code segment --
+	 * base = 0x00000000, limit = 0xFFFFF (4 KiB Granularity), present
+	 * type = 32bit code execute/read, DPL = 0
+	 */
+	.word	0xFFFF, 0
+	.byte	0, 0x9A, 0xCF, 0
 
-	/* Code segment.  */
-	.byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x9A, 0xCF, 0x00
+	/* -- data segment --
+	 * base = 0x00000000, limit 0xFFFFF (4 KiB Granularity), present
+	 * type = 32 bit data read/write, DPL = 0
+	 */
+	.word	0xFFFF, 0
+	.byte	0, 0x92, 0xCF, 0
 
-	/* Data segment.  */
-	.byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x92, 0xCF, 0x00
+	/* -- 16 bit real mode CS --
+	 * base = 0x00000000, limit 0x0FFFF (1 B Granularity), present
+	 * type = 16 bit code execute/read only/conforming, DPL = 0
+	 */
+	.word	0xFFFF, 0
+	.byte	0, 0x9E, 0, 0
 
+	/* -- 16 bit real mode DS --
+	 * base = 0x00000000, limit 0x0FFFF (1 B Granularity), present
+	 * type = 16 bit data read/write, DPL = 0
+	 */
+	.word	0xFFFF, 0
+	.byte	0, 0x92, 0, 0
+
+	.p2align	4
 gdtdesc:
-	.word 31
+	.word	0x27
 gdt_addr:
+#ifdef __x86_64__
 	/* Filled by the code. */
-	.quad 0
-
-	.p2align 4
+	.quad	0
+#else
+	/* Filled by the code. */
+	.long	0
+#endif
+	
+	.p2align	4
 jump_vector:
 	/* Jump location. Is filled by the code */
-	.long 0
-	.long 0x10
-#endif
+	.long	0
+	.long	GRUB_MEMORY_MACHINE_PROT_MODE_CSEG
 
 #ifndef BACKWARD
 base:

From b131c45455556d58940b53071e1bb1a8ed8fd2bf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 Aug 2009 19:58:05 +0200
Subject: [PATCH 0007/1628] Improvements for Apple?

---
 include/grub/i386/memory.h    |  30 ++++++++++
 include/grub/i386/pc/memory.h |  12 ++++
 kern/i386/realmode.S          |   4 +-
 lib/i386/relocator_asm.S      | 107 ++++++++++++++--------------------
 4 files changed, 87 insertions(+), 66 deletions(-)
 create mode 100644 include/grub/i386/memory.h

diff --git a/include/grub/i386/memory.h b/include/grub/i386/memory.h
new file mode 100644
index 000000000..a0f3192b8
--- /dev/null
+++ b/include/grub/i386/memory.h
@@ -0,0 +1,30 @@
+/* memory.h - describe the memory map */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2007,2008  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/>.
+ */
+
+#ifndef GRUB_MEMORY_CPU_HEADER
+#define GRUB_MEMORY_CPU_HEADER	1
+
+/* The flag for protected mode.  */
+#define GRUB_MEMORY_CPU_CR0_PE_ON		0x1
+#define GRUB_MEMORY_CPU_CR4_PAE_ON		0x00000040
+#define GRUB_MEMORY_CPU_CR0_PAGING_ON       0x80000000
+#define GRUB_MEMORY_CPU_AMD64_MSR           0xc0000080
+#define GRUB_MEMORY_CPU_AMD64_MSR_ON        0x00000100
+
+#endif /* ! GRUB_MEMORY_CPU_HEADER */
diff --git a/include/grub/i386/pc/memory.h b/include/grub/i386/pc/memory.h
index b1d75dbc9..7a132fd24 100644
--- a/include/grub/i386/pc/memory.h
+++ b/include/grub/i386/pc/memory.h
@@ -65,6 +65,18 @@
 /* The address where another boot loader is loaded.  */
 #define GRUB_MEMORY_MACHINE_BOOT_LOADER_ADDR	0x7c00
 
+/* The code segment of the protected mode.  */
+#define GRUB_MEMORY_MACHINE_PROT_MODE_CSEG	0x8
+
+/* The data segment of the protected mode.  */
+#define GRUB_MEMORY_MACHINE_PROT_MODE_DSEG	0x10
+
+/* The code segment of the pseudo real mode.  */
+#define GRUB_MEMORY_MACHINE_PSEUDO_REAL_CSEG	0x18
+
+/* The data segment of the pseudo real mode.  */
+#define GRUB_MEMORY_MACHINE_PSEUDO_REAL_DSEG	0x20
+
 #ifndef ASM_FILE
 
 struct grub_machine_mmap_entry
diff --git a/kern/i386/realmode.S b/kern/i386/realmode.S
index 11f4d5347..5f28f9eb3 100644
--- a/kern/i386/realmode.S
+++ b/kern/i386/realmode.S
@@ -127,7 +127,7 @@ real_to_prot:
 
 	/* turn on protected mode */
 	movl	%cr0, %eax
-	orl	$GRUB_MEMORY_MACHINE_CR0_PE_ON, %eax
+	orl	$GRUB_MEMORY_CPU_CR0_PE_ON, %eax
 	movl	%eax, %cr0
 
 	/* jump to relocation, flush prefetch queue, and reload %cs */
@@ -196,7 +196,7 @@ tmpcseg:
 
 	/* clear the PE bit of CR0 */
 	movl	%cr0, %eax
-	andl 	$(~GRUB_MEMORY_MACHINE_CR0_PE_ON), %eax
+	andl 	$(~GRUB_MEMORY_CPU_CR0_PE_ON), %eax
 	movl	%eax, %cr0
 
 	/* flush prefetch queue, reload %cs */
diff --git a/lib/i386/relocator_asm.S b/lib/i386/relocator_asm.S
index 7d58c8e97..72c057ce2 100644
--- a/lib/i386/relocator_asm.S
+++ b/lib/i386/relocator_asm.S
@@ -27,30 +27,28 @@
 #ifdef __x86_64__
 #define RAX %rax
 #define RCX %rcx
+#define RDX %rdx
 #define RDI %rdi
 #define RSI %rdi
 #else
 #define RAX %eax
 #define RCX %ecx
+#define RDX %edx
 #define RDI %edi	
 #define RSI %esi	
 #endif
 
-/* Apple's linker has a problem with 64-bit relocations.  */
-#if defined (__apple__) || ! defined (__x86_64__)
-#define RSIA %esi
-#define RAXA %eax
-#else
-#define RSIA %rsi
-#define RAXA %rax
-#endif
+/* The code segment of the protected mode.  */
+#define CODE_SEGMENT	0x10
 
+/* The data segment of the protected mode.  */
+#define DATA_SEGMENT	0x18
 	
 	.p2align	4	/* force 16-byte alignment */
 
 RELOCATOR_VARIABLE(start)
 #ifdef BACKWARD
-base:
+L_base:
 #endif
 	cli
 
@@ -105,14 +103,14 @@ RELOCATOR_VARIABLE(size)
 #ifndef BACKWARD
 	add	RCX, RAX
 #endif
-	addq	$0x3, RCX
-	shrq	$2, RCX
+	add	$0x3, RCX
+	shr	$2, RCX
 
 	
 #ifdef BACKWARD
 	/* Backward movsl is implicitly off-by-four.  compensate that.  */
-	subq	$4,	RSI
-	subq	$4,	RDI
+	sub	$4,	RSI
+	sub	$4,	RDI
 
 	/* Backward copy.  */
 	std
@@ -129,27 +127,27 @@ RELOCATOR_VARIABLE(size)
 
 	/* %rax contains now our new 'base'.  */
 	mov	RAX, RSI
-	add	$(cont0 - base), RAXA
+	add	$(L_cont0 - L_base), RAX
 	jmp	*RAX
-cont0:
-	lea	(cont1 - base) (RSIA, 1), RAXA
-	movl	%eax, (jump_vector - base) (RSIA, 1)
+L_cont0:
+	lea	(L_cont1 - L_base) (RSI, 1), RAX
+	movl	%eax, (L_jump_vector - L_base) (RSI, 1)
 
-	lea	(gdt - base) (RSIA, 1), RAXA
-	mov	RAXA, (gdt_addr - base) (RSIA, 1)
+	lea	(L_gdt - L_base) (RSI, 1), RAX
+	mov	RAX, (L_gdt_addr - L_base) (RSI, 1)
 
 	/* Switch to compatibility mode. */
 
-	lgdt	(gdtdesc - base) (RSIA, 1)
+	lgdt	(L_gdtdesc - L_base) (RSI, 1)
 
 	/* Update %cs. Thanks to David Miller for pointing this mistake out. */
-	ljmp	*(jump_vector - base) (RSIA, 1)
+	ljmp	*(L_jump_vector - L_base) (RSI, 1)
 
-cont1:
+L_cont1:
 	.code32
 
 	/* Update other registers. */
-	movl	$GRUB_MEMORY_MACHINE_PROT_MODE_DSEG, %eax
+	movl	$DATA_SEGMENT, %eax
 	movl	%eax, %ds
 	movl	%eax, %es
 	movl	%eax, %fs
@@ -158,22 +156,22 @@ cont1:
 
 	/* Disable paging. */
 	movl	%cr0, %eax
-	andl	$0x7fffffff, %eax
+	andl	$(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax
 	movl	%eax, %cr0
 
 	/* Disable amd64. */
-	movl	$0xc0000080, %ecx
+	movl	$GRUB_MEMORY_CPU_AMD64_MSR, %ecx
 	rdmsr
-	andl	$0xfffffeff, %eax
+	andl	$(~GRUB_MEMORY_CPU_AMD64_MSR_ON), %eax
 	wrmsr
 
 	/* Turn off PAE. */
 	movl	%cr4, %eax
-	andl	$0xffffffcf, %eax
+	andl	$GRUB_MEMORY_CPU_CR4_PAE_ON, %eax
 	movl	%eax, %cr4
 
-	jmp	cont2
-cont2:
+	jmp	L_cont2
+L_cont2:
 	.code32
 
 	/* mov imm32, %eax */
@@ -212,44 +210,25 @@ RELOCATOR_VARIABLE (eip)
 	.long	0
 	.word	0x08
 
-	/* GDT. The same as is used in 32-bit GRUB. */
+	/* GDT. Copied from loader/i386/linux.c. */
 	.p2align	4
-gdt:
-	.word	0, 0
-	.byte	0, 0, 0, 0
+L_gdt:
+	/* NULL.  */
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	
+	/* Reserved.  */
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
-	/* -- code segment --
-	 * base = 0x00000000, limit = 0xFFFFF (4 KiB Granularity), present
-	 * type = 32bit code execute/read, DPL = 0
-	 */
-	.word	0xFFFF, 0
-	.byte	0, 0x9A, 0xCF, 0
+	/* Code segment.  */
+	.byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x9A, 0xCF, 0x00
 
-	/* -- data segment --
-	 * base = 0x00000000, limit 0xFFFFF (4 KiB Granularity), present
-	 * type = 32 bit data read/write, DPL = 0
-	 */
-	.word	0xFFFF, 0
-	.byte	0, 0x92, 0xCF, 0
-
-	/* -- 16 bit real mode CS --
-	 * base = 0x00000000, limit 0x0FFFF (1 B Granularity), present
-	 * type = 16 bit code execute/read only/conforming, DPL = 0
-	 */
-	.word	0xFFFF, 0
-	.byte	0, 0x9E, 0, 0
-
-	/* -- 16 bit real mode DS --
-	 * base = 0x00000000, limit 0x0FFFF (1 B Granularity), present
-	 * type = 16 bit data read/write, DPL = 0
-	 */
-	.word	0xFFFF, 0
-	.byte	0, 0x92, 0, 0
+	/* Data segment.  */
+	.byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x92, 0xCF, 0x00
 
 	.p2align	4
-gdtdesc:
+L_gdtdesc:
 	.word	0x27
-gdt_addr:
+L_gdt_addr:
 #ifdef __x86_64__
 	/* Filled by the code. */
 	.quad	0
@@ -259,13 +238,13 @@ gdt_addr:
 #endif
 	
 	.p2align	4
-jump_vector:
+L_jump_vector:
 	/* Jump location. Is filled by the code */
 	.long	0
-	.long	GRUB_MEMORY_MACHINE_PROT_MODE_CSEG
+	.long	CODE_SEGMENT
 
 #ifndef BACKWARD
-base:
+L_base:
 #endif
 
 RELOCATOR_VARIABLE(end)

From e27fbc80e4c7bbd6a75dd609446448c77915620b Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Fri, 9 Oct 2009 19:50:31 +0200
Subject: [PATCH 0008/1628] kernel.img compiles on mipsel-qemu-r4k

---
 conf/mips.rmk                          | 125 +++++++++++++++++++++++++
 conf/mipsel-qemu-r4k.rmk               |   4 +
 configure.ac                           |   1 +
 include/grub/mipsel/kernel.h           |  32 +++++++
 include/grub/mipsel/qemu-r4k/kernel.h  |  35 +++++++
 include/grub/mipsel/qemu-r4k/machine.h |  24 +++++
 include/grub/mipsel/qemu-r4k/memory.h  |  35 +++++++
 include/grub/mipsel/qemu-r4k/time.h    |  34 +++++++
 include/grub/mipsel/time.h             |   0
 include/grub/mipsel/types.h            |  31 ++++++
 kern/mipsel/cache.S                    |   5 +
 kern/mipsel/dl.c                       | 109 +++++++++++++++++++++
 kern/mipsel/qemu-r4k/init.c            |  58 ++++++++++++
 kern/mipsel/qemu-r4k/startup.S         |  55 +++++++++++
 lib/mipsel/setjmp.S                    |   0
 15 files changed, 548 insertions(+)
 create mode 100644 conf/mips.rmk
 create mode 100644 conf/mipsel-qemu-r4k.rmk
 create mode 100644 include/grub/mipsel/kernel.h
 create mode 100644 include/grub/mipsel/qemu-r4k/kernel.h
 create mode 100644 include/grub/mipsel/qemu-r4k/machine.h
 create mode 100644 include/grub/mipsel/qemu-r4k/memory.h
 create mode 100644 include/grub/mipsel/qemu-r4k/time.h
 create mode 100644 include/grub/mipsel/time.h
 create mode 100644 include/grub/mipsel/types.h
 create mode 100644 kern/mipsel/cache.S
 create mode 100644 kern/mipsel/dl.c
 create mode 100644 kern/mipsel/qemu-r4k/init.c
 create mode 100644 kern/mipsel/qemu-r4k/startup.S
 create mode 100644 lib/mipsel/setjmp.S

diff --git a/conf/mips.rmk b/conf/mips.rmk
new file mode 100644
index 000000000..6d8df9e4e
--- /dev/null
+++ b/conf/mips.rmk
@@ -0,0 +1,125 @@
+
+# -*- makefile -*-
+
+COMMON_ASFLAGS = -nostdinc
+COMMON_CFLAGS = 
+COMMON_LDFLAGS += -nostdlib
+
+# Used by various components.  These rules need to precede them.
+script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
+
+# Images.
+
+MOSTLYCLEANFILES += symlist.c kernel_syms.lst
+DEFSYMFILES += kernel_syms.lst
+
+kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
+	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
+	symbol.h term.h time.h types.h loader.h partition.h \
+	msdos_partition.h machine/kernel.h handler.h list.h \
+	command.h
+
+symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
+	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
+
+kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
+	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
+
+# Programs
+pkglib_PROGRAMS = kernel.img
+
+# Utilities.
+sbin_UTILITIES = grub-mkdevicemap
+ifeq ($(enable_grub_emu), yes)
+sbin_UTILITIES += grub-emu
+endif
+
+# For grub-mkdevicemap.
+grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/deviceiter.c \
+	util/devicemap.c util/misc.c
+
+# For grub-emu
+util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
+grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c 	\
+	commands/configfile.c commands/help.c				\
+	commands/search.c commands/handler.c commands/test.c 		\
+	commands/ls.c commands/blocklist.c commands/hexdump.c		\
+	lib/hexdump.c commands/reboot.c 		\
+	lib/envblk.c commands/loadenv.c					\
+	commands/gptsync.c commands/probe.c commands/xnu_uuid.c		\
+	commands/password.c commands/keystatus.c			\
+	disk/loopback.c							\
+	\
+	fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c			\
+	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c		\
+	fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c			\
+	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c		\
+	fs/befs.c fs/befs_be.c fs/tar.c				\
+	\
+	io/gzio.c							\
+	kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c	\
+	kern/err.c kern/file.c kern/fs.c commands/boot.c kern/main.c	\
+	kern/misc.c kern/parser.c kern/partition.c kern/reader.c	\
+	kern/rescue_reader.c kern/rescue_parser.c			\
+	kern/term.c kern/list.c kern/handler.c fs/fshelp.c		\
+	kern/command.c kern/corecmd.c commands/extcmd.c			\
+	lib/arg.c normal/cmdline.c normal/datetime.c 			\
+	normal/completion.c normal/misc.c		 		\
+	normal/handler.c normal/auth.c normal/autofs.c normal/main.c	\
+	normal/menu.c 							\
+	normal/menu_text.c						\
+	normal/menu_entry.c normal/menu_viewer.c 	 		\
+	normal/color.c							\
+	script/sh/main.c script/sh/execute.c script/sh/function.c	\
+	script/sh/lexer.c script/sh/script.c				\
+	partmap/amiga.c	partmap/apple.c partmap/msdos.c partmap/sun.c	\
+	partmap/acorn.c							\
+	util/console.c util/hostfs.c util/grub-emu.c util/misc.c	\
+	util/hostdisk.c util/getroot.c					\
+	\
+	disk/raid.c disk/raid5_recover.c disk/raid6_recover.c		\
+	disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c		\
+	commands/parttool.c parttool/msdospart.c				\
+	grub_script.tab.c grub_emu_init.c
+
+grub_emu_LDFLAGS = $(LIBCURSES)
+
+kernel_img_SOURCES = kern/mipsel/qemu-r4k/startup.S \
+	kern/main.c kern/device.c kern/$(target_cpu)/$(target_machine)/init.c 		\
+	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c 		\
+	kern/misc.c kern/mm.c kern/reader.c kern/term.c 	\
+	kern/rescue_parser.c kern/rescue_reader.c \
+	kern/list.c kern/handler.c kern/command.c kern/corecmd.c	\
+	kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c 	\
+	kern/generic/millisleep.c kern/time.c                            \
+	symlist.c kern/$(target_cpu)/cache.S
+kernel_img_CFLAGS = $(COMMON_CFLAGS)
+kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
+kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
+	-Wl,-N,-S,-Ttext,$(LINK_BASE),-Bstatic
+
+# Scripts.
+sbin_SCRIPTS = grub-install
+bin_SCRIPTS = grub-mkrescue
+
+# Modules.
+pkglib_MODULES = memdisk.mod \
+	lsmmap.mod
+
+# For boot.mod.
+pkglib_MODULES += boot.mod 
+boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
+boot_mod_CFLAGS = $(COMMON_CFLAGS)
+boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For memdisk.mod.
+memdisk_mod_SOURCES = disk/memdisk.c
+memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
+memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For lsmmap.mod
+lsmmap_mod_SOURCES = commands/lsmmap.c
+lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
+lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+include $(srcdir)/conf/common.mk
diff --git a/conf/mipsel-qemu-r4k.rmk b/conf/mipsel-qemu-r4k.rmk
new file mode 100644
index 000000000..3ff36c472
--- /dev/null
+++ b/conf/mipsel-qemu-r4k.rmk
@@ -0,0 +1,4 @@
+# -*- makefile -*-
+LINK_BASE = 0x80010000
+target_machine=qemu-r4k
+include $(srcdir)/conf/mips.mk
diff --git a/configure.ac b/configure.ac
index 3e4da66c8..74dcc5dd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,7 @@ case "$target_cpu"-"$platform" in
   i386-qemu) ;;
   powerpc-ieee1275) ;;
   sparc64-ieee1275) ;;
+  mipsel-qemu-r4k) ;;
   *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
 esac
 
diff --git a/include/grub/mipsel/kernel.h b/include/grub/mipsel/kernel.h
new file mode 100644
index 000000000..326f1244d
--- /dev/null
+++ b/include/grub/mipsel/kernel.h
@@ -0,0 +1,32 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2005,2006,2007,2008  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/>.
+ */
+
+#ifndef GRUB_KERNEL_CPU_HEADER
+#define GRUB_KERNEL_CPU_HEADER	1
+
+#define GRUB_MOD_ALIGN 0x1000
+
+/* Minimal gap between _end and the start of the modules.  It's a hack
+   for PowerMac to prevent "CLAIM failed" error.  The real fix is to
+   rewrite grub-mkimage to generate valid ELF files.  */
+#define GRUB_MOD_GAP 0x8000
+
+#define GRUB_KERNEL_CPU_PREFIX		0x8
+#define GRUB_KERNEL_CPU_DATA_END	0x48
+
+#endif
diff --git a/include/grub/mipsel/qemu-r4k/kernel.h b/include/grub/mipsel/qemu-r4k/kernel.h
new file mode 100644
index 000000000..6a10f2df1
--- /dev/null
+++ b/include/grub/mipsel/qemu-r4k/kernel.h
@@ -0,0 +1,35 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2005,2006,2007,2008,2009  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/>.
+ */
+
+#ifndef GRUB_KERNEL_MACHINE_HEADER
+#define GRUB_KERNEL_MACHINE_HEADER	1
+
+#include <grub/symbol.h>
+
+#ifndef ASM_FILE
+
+void EXPORT_FUNC (grub_reboot) (void);
+void EXPORT_FUNC (grub_halt) (void);
+
+/* The prefix which points to the directory where GRUB modules and its
+   configuration file are located.  */
+extern char grub_prefix[];
+
+#endif
+
+#endif /* ! GRUB_KERNEL_MACHINE_HEADER */
diff --git a/include/grub/mipsel/qemu-r4k/machine.h b/include/grub/mipsel/qemu-r4k/machine.h
new file mode 100644
index 000000000..9bad5dca9
--- /dev/null
+++ b/include/grub/mipsel/qemu-r4k/machine.h
@@ -0,0 +1,24 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2007  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/>.
+ */
+
+#ifndef GRUB_MACHINE_MACHINE_HEADER
+#define GRUB_MACHINE_MACHINE_HEADER	1
+
+#define GRUB_MACHINE_MIPS_QEMU	1
+
+#endif /* ! GRUB_MACHINE_MACHINE_HEADER */
diff --git a/include/grub/mipsel/qemu-r4k/memory.h b/include/grub/mipsel/qemu-r4k/memory.h
new file mode 100644
index 000000000..6021bab04
--- /dev/null
+++ b/include/grub/mipsel/qemu-r4k/memory.h
@@ -0,0 +1,35 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009 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/>.
+ */
+
+#ifndef GRUB_MEMORY_MACHINE_HEADER
+#define GRUB_MEMORY_MACHINE_HEADER	1
+
+#ifndef ASM_FILE
+#include <grub/symbol.h>
+#include <grub/err.h>
+#include <grub/types.h>
+#endif
+
+#define GRUB_MACHINE_MEMORY_STACK_HIGH       0x81000000
+
+#ifndef ASM_FILE
+grub_err_t EXPORT_FUNC (grub_machine_mmap_iterate)
+(int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
+#endif
+
+#endif
diff --git a/include/grub/mipsel/qemu-r4k/time.h b/include/grub/mipsel/qemu-r4k/time.h
new file mode 100644
index 000000000..a73f64dea
--- /dev/null
+++ b/include/grub/mipsel/qemu-r4k/time.h
@@ -0,0 +1,34 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2003,2004,2005,2007  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/>.
+ */
+
+#ifndef KERNEL_MACHINE_TIME_HEADER
+#define KERNEL_MACHINE_TIME_HEADER	1
+
+#include <grub/symbol.h>
+
+#define GRUB_TICKS_PER_SECOND	1000
+
+/* Return the real time in ticks.  */
+grub_uint32_t EXPORT_FUNC (grub_get_rtc) (void);
+
+static inline void
+grub_cpu_idle(void)
+{
+}
+
+#endif /* ! KERNEL_MACHINE_TIME_HEADER */
diff --git a/include/grub/mipsel/time.h b/include/grub/mipsel/time.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/include/grub/mipsel/types.h b/include/grub/mipsel/types.h
new file mode 100644
index 000000000..94a35be6e
--- /dev/null
+++ b/include/grub/mipsel/types.h
@@ -0,0 +1,31 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2006,2007,2009  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/>.
+ */
+
+#ifndef GRUB_TYPES_CPU_HEADER
+#define GRUB_TYPES_CPU_HEADER	1
+
+/* The size of void *.  */
+#define GRUB_TARGET_SIZEOF_VOID_P	4
+
+/* The size of long.  */
+#define GRUB_TARGET_SIZEOF_LONG		4
+
+/* mipsEL is little-endian.  */
+#undef GRUB_TARGET_WORDS_BIGENDIAN
+
+#endif /* ! GRUB_TYPES_CPU_HEADER */
diff --git a/kern/mipsel/cache.S b/kern/mipsel/cache.S
new file mode 100644
index 000000000..5341f07a2
--- /dev/null
+++ b/kern/mipsel/cache.S
@@ -0,0 +1,5 @@
+#include <grub/symbol.h>
+
+FUNCTION (grub_arch_sync_caches)
+FUNCTION (_flush_cache)
+	j $31
diff --git a/kern/mipsel/dl.c b/kern/mipsel/dl.c
new file mode 100644
index 000000000..57854964b
--- /dev/null
+++ b/kern/mipsel/dl.c
@@ -0,0 +1,109 @@
+/* dl-386.c - arch-dependent part of loadable module support */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2005,2007,2009  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/elf.h>
+#include <grub/misc.h>
+#include <grub/err.h>
+
+/* Check if EHDR is a valid ELF header.  */
+grub_err_t
+grub_arch_dl_check_header (void *ehdr)
+{
+  Elf_Ehdr *e = ehdr;
+
+  /* Check the magic numbers.  */
+  if (e->e_ident[EI_CLASS] != ELFCLASS32
+      || e->e_ident[EI_DATA] != ELFDATA2LSB
+      || e->e_machine != EM_386)
+    return grub_error (GRUB_ERR_BAD_OS, "invalid arch specific ELF magic");
+
+  return GRUB_ERR_NONE;
+}
+
+/* Relocate symbols.  */
+grub_err_t
+grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
+{
+  Elf_Ehdr *e = ehdr;
+  Elf_Shdr *s;
+  Elf_Word entsize;
+  unsigned i;
+
+  /* Find a symbol table.  */
+  for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
+       i < e->e_shnum;
+       i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
+    if (s->sh_type == SHT_SYMTAB)
+      break;
+
+  if (i == e->e_shnum)
+    return grub_error (GRUB_ERR_BAD_MODULE, "no symtab found");
+
+  entsize = s->sh_entsize;
+
+  for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
+       i < e->e_shnum;
+       i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
+    if (s->sh_type == SHT_REL)
+      {
+	grub_dl_segment_t seg;
+
+	/* Find the target segment.  */
+	for (seg = mod->segment; seg; seg = seg->next)
+	  if (seg->section == s->sh_info)
+	    break;
+
+	if (seg)
+	  {
+	    Elf_Rel *rel, *max;
+
+	    for (rel = (Elf_Rel *) ((char *) e + s->sh_offset),
+		   max = rel + s->sh_size / s->sh_entsize;
+		 rel < max;
+		 rel++)
+	      {
+		Elf_Word *addr;
+		Elf_Sym *sym;
+
+		if (seg->size < rel->r_offset)
+		  return grub_error (GRUB_ERR_BAD_MODULE,
+				     "reloc offset is out of the segment");
+
+		addr = (Elf_Word *) ((char *) seg->addr + rel->r_offset);
+		sym = (Elf_Sym *) ((char *) mod->symtab
+				     + entsize * ELF_R_SYM (rel->r_info));
+
+		switch (ELF_R_TYPE (rel->r_info))
+		  {
+		  case R_386_32:
+		    *addr += sym->st_value;
+		    break;
+
+		  case R_386_PC32:
+		    *addr += (sym->st_value - (Elf_Word) seg->addr
+			      - rel->r_offset);
+		    break;
+		  }
+	      }
+	  }
+      }
+
+  return GRUB_ERR_NONE;
+}
diff --git a/kern/mipsel/qemu-r4k/init.c b/kern/mipsel/qemu-r4k/init.c
new file mode 100644
index 000000000..0600a345f
--- /dev/null
+++ b/kern/mipsel/qemu-r4k/init.c
@@ -0,0 +1,58 @@
+#include <grub/kernel.h>
+#include <grub/misc.h>
+#include <grub/env.h>
+#include <grub/time.h>
+#include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/machine/kernel.h>
+#include <grub/cpu/kernel.h>
+
+grub_uint32_t
+grub_get_rtc (void)
+{
+  static int calln = 0;
+  return calln++;
+}
+
+void
+grub_machine_init (void)
+{
+}
+
+void
+grub_machine_fini (void)
+{
+}
+
+void
+grub_exit (void)
+{
+  while (1);
+}
+
+void
+grub_halt (void)
+{
+  while (1);
+}
+
+void
+grub_reboot (void)
+{
+  while (1);
+}
+
+void
+grub_machine_set_prefix (void)
+{
+  grub_env_set ("prefix", grub_prefix);
+}
+
+extern char _start[];
+extern char _end[];
+
+grub_addr_t
+grub_arch_modules_addr (void)
+{
+  return ALIGN_UP((grub_addr_t) _end + GRUB_MOD_GAP, GRUB_MOD_ALIGN);
+}
diff --git a/kern/mipsel/qemu-r4k/startup.S b/kern/mipsel/qemu-r4k/startup.S
new file mode 100644
index 000000000..19de4779d
--- /dev/null
+++ b/kern/mipsel/qemu-r4k/startup.S
@@ -0,0 +1,55 @@
+/* startup.S - Startup code for the MIPS.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/symbol.h>
+#include <grub/cpu/kernel.h>
+#include <grub/machine/memory.h>
+
+.extern __bss_start
+.extern _end
+	
+	.globl __start, _start, start
+__start:
+_start:
+start:	
+	b codestart
+	. = _start + GRUB_KERNEL_CPU_PREFIX
+
+VARIABLE(grub_prefix)
+	/* to be filled by grub-mkelfimage */
+
+	/*
+	 *  Leave some breathing room for the prefix.
+	 */
+
+	. = _start + GRUB_KERNEL_CPU_DATA_END
+codestart:
+	lui $t1, %hi(__bss_start)
+	addiu $t1, %lo(__bss_start)
+	lui $t2, %hi(_end)
+	addiu $t2, %lo(_end)
+
+bsscont:
+	sb $0,0($t1)
+	addiu $t1,$t1,1
+	sltu $t3,$t1,$t2
+	bne $3, $0, bsscont
+
+	li $sp, GRUB_MACHINE_MEMORY_STACK_HIGH
+	b grub_main
\ No newline at end of file
diff --git a/lib/mipsel/setjmp.S b/lib/mipsel/setjmp.S
new file mode 100644
index 000000000..e69de29bb

From de75aa3d67a83ce74cac4aa74e47f9affb1489a6 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 10 Oct 2009 13:30:14 +0200
Subject: [PATCH 0009/1628] Hello from mipsel

---
 conf/mips.rmk                         |  8 ++++----
 genmoddep.awk                         |  2 +-
 include/grub/mipsel/qemu-r4k/memory.h | 18 ++++++++++++++++++
 kern/main.c                           | 16 ++++++++++++++++
 kern/mipsel/cache.S                   |  2 +-
 kern/mipsel/qemu-r4k/init.c           | 16 ++++++++++++++++
 kern/misc.c                           |  2 +-
 kern/term.c                           | 14 +++++++++-----
 8 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/conf/mips.rmk b/conf/mips.rmk
index 6d8df9e4e..ad0219b06 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -2,7 +2,7 @@
 # -*- makefile -*-
 
 COMMON_ASFLAGS = -nostdinc
-COMMON_CFLAGS = 
+COMMON_CFLAGS = -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
 COMMON_LDFLAGS += -nostdlib
 
 # Used by various components.  These rules need to precede them.
@@ -17,7 +17,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
 	symbol.h term.h time.h types.h loader.h partition.h \
 	msdos_partition.h machine/kernel.h handler.h list.h \
-	command.h
+	command.h machine/memory.h cpu/libgcc.h cpu/cache.h
 
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
 	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
@@ -99,8 +99,8 @@ kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
 	-Wl,-N,-S,-Ttext,$(LINK_BASE),-Bstatic
 
 # Scripts.
-sbin_SCRIPTS = grub-install
-bin_SCRIPTS = grub-mkrescue
+sbin_SCRIPTS = 
+bin_SCRIPTS = 
 
 # Modules.
 pkglib_MODULES = memdisk.mod \
diff --git a/genmoddep.awk b/genmoddep.awk
index f7f085e99..af967ec07 100644
--- a/genmoddep.awk
+++ b/genmoddep.awk
@@ -29,7 +29,7 @@ FNR == 1 {
   if ($1 in symtab) {
     modtab[module] = modtab[module] " " symtab[$1];
   }
-  else {
+  else if ($1 != "__gnu_local_gp"){
     printf "%s in %s is not defined\n", $1, module >"/dev/stderr";
     error++;
     exit;
diff --git a/include/grub/mipsel/qemu-r4k/memory.h b/include/grub/mipsel/qemu-r4k/memory.h
index 6021bab04..21f295b67 100644
--- a/include/grub/mipsel/qemu-r4k/memory.h
+++ b/include/grub/mipsel/qemu-r4k/memory.h
@@ -27,9 +27,27 @@
 
 #define GRUB_MACHINE_MEMORY_STACK_HIGH       0x81000000
 
+#define GRUB_MACHINE_MEMORY_AVAILABLE        1
+
 #ifndef ASM_FILE
 grub_err_t EXPORT_FUNC (grub_machine_mmap_iterate)
 (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
+grub_err_t EXPORT_FUNC(grub_machine_mmap_iterate)
+     (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
+
+static inline grub_err_t
+grub_machine_mmap_register (grub_uint64_t start __attribute__ ((unused)),
+			    grub_uint64_t size __attribute__ ((unused)),
+			    int type __attribute__ ((unused)),
+			    int handle __attribute__ ((unused)))
+{
+  return GRUB_ERR_NONE;
+}
+static inline grub_err_t
+grub_machine_mmap_unregister (int handle  __attribute__ ((unused)))
+{
+  return GRUB_ERR_NONE;
+}
 #endif
 
 #endif
diff --git a/kern/main.c b/kern/main.c
index 9215d55e7..222897d7d 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -149,29 +149,45 @@ grub_load_normal_mode (void)
 void
 grub_main (void)
 {
+  *((grub_uint8_t *)0x140003f8) = '1';
+
   /* First of all, initialize the machine.  */
   grub_machine_init ();
 
+  *((grub_uint8_t *)0x140003f8) = '2';
+
   /* Hello.  */
   grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
+  *((grub_uint8_t *)0x140003f8) = 'a';
   grub_printf ("Welcome to GRUB!\n\n");
+  *((grub_uint8_t *)0x140003f8) = 'b';
   grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
 
+  *((grub_uint8_t *)0x140003f8) = '3';
+
   /* Load pre-loaded modules and free the space.  */
   grub_register_exported_symbols ();
   grub_load_modules ();
 
+  *((grub_uint8_t *)0x140003f8) = '4';
+
   /* It is better to set the root device as soon as possible,
      for convenience.  */
   grub_machine_set_prefix ();
   grub_env_export ("prefix");
   grub_set_root_dev ();
 
+  *((grub_uint8_t *)0x140003f8) = '5';
+
   grub_register_core_commands ();
   grub_register_rescue_parser ();
   grub_register_rescue_reader ();
 
+  *((grub_uint8_t *)0x140003f8) = '6';
+
   grub_load_config ();
+  *((grub_uint8_t *)0x140003f8) = '7';
   grub_load_normal_mode ();
+  *((grub_uint8_t *)0x140003f8) = '8';
   grub_reader_loop (0);
 }
diff --git a/kern/mipsel/cache.S b/kern/mipsel/cache.S
index 5341f07a2..f613f57f2 100644
--- a/kern/mipsel/cache.S
+++ b/kern/mipsel/cache.S
@@ -1,5 +1,5 @@
 #include <grub/symbol.h>
 
 FUNCTION (grub_arch_sync_caches)
-FUNCTION (_flush_cache)
+FUNCTION (grub_cpu_flush_cache)
 	j $31
diff --git a/kern/mipsel/qemu-r4k/init.c b/kern/mipsel/qemu-r4k/init.c
index 0600a345f..c4aec14ff 100644
--- a/kern/mipsel/qemu-r4k/init.c
+++ b/kern/mipsel/qemu-r4k/init.c
@@ -4,9 +4,13 @@
 #include <grub/time.h>
 #include <grub/types.h>
 #include <grub/misc.h>
+#include <grub/mm.h>
 #include <grub/machine/kernel.h>
+#include <grub/machine/memory.h>
 #include <grub/cpu/kernel.h>
 
+#define RAMSIZE (*(grub_uint32_t *) ((16 << 20) - 264))
+
 grub_uint32_t
 grub_get_rtc (void)
 {
@@ -17,6 +21,8 @@ grub_get_rtc (void)
 void
 grub_machine_init (void)
 {
+  grub_mm_init_region ((void *) GRUB_MACHINE_MEMORY_STACK_HIGH,
+		       RAMSIZE - GRUB_MACHINE_MEMORY_STACK_HIGH);
 }
 
 void
@@ -56,3 +62,13 @@ grub_arch_modules_addr (void)
 {
   return ALIGN_UP((grub_addr_t) _end + GRUB_MOD_GAP, GRUB_MOD_ALIGN);
 }
+
+grub_err_t 
+grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, 
+							 grub_uint64_t, 
+							 grub_uint32_t))
+{
+  hook (0, RAMSIZE,
+	GRUB_MACHINE_MEMORY_AVAILABLE);
+  return GRUB_ERR_NONE;
+}
diff --git a/kern/misc.c b/kern/misc.c
index 1c38fe661..ba19705f3 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -598,7 +598,7 @@ grub_vsprintf (char *str, const char *fmt, va_list args)
       if (str)
 	*str++ = ch;
       else
-	grub_putchar (ch);
+      	grub_putchar (ch);
 
       count++;
     }
diff --git a/kern/term.c b/kern/term.c
index 94d5a9e1d..22660c6a8 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -48,8 +48,9 @@ struct grub_handler_class grub_term_output_class =
 void
 grub_putcode (grub_uint32_t code)
 {
-  int height = grub_getwh () & 255;
+  //  int height = grub_getwh () & 255;
 
+#if 0
   if (code == '\t' && grub_cur_term_output->getxy)
     {
       int n;
@@ -60,13 +61,15 @@ grub_putcode (grub_uint32_t code)
 
       return;
     }
+#endif
 
-  (grub_cur_term_output->putchar) (code);
+  //  (grub_cur_term_output->putchar) (code);
+  *((grub_uint8_t *)0x140003f8) = code;
 
   if (code == '\n')
     {
       grub_putcode ('\r');
-
+#if 0
       grub_more_lines++;
 
       if (grub_more && grub_more_lines == height - 1)
@@ -93,6 +96,7 @@ grub_putcode (grub_uint32_t code)
 	  else
 	    grub_more_lines = 0;
 	}
+#endif
     }
 }
 
@@ -182,14 +186,14 @@ grub_cls (void)
 void
 grub_setcolorstate (grub_term_color_state state)
 {
-  if (grub_cur_term_output->setcolorstate)
+  if (grub_cur_term_output && grub_cur_term_output->setcolorstate)
     (grub_cur_term_output->setcolorstate) (state);
 }
 
 void
 grub_setcolor (grub_uint8_t normal_color, grub_uint8_t highlight_color)
 {
-  if (grub_cur_term_output->setcolor)
+  if (grub_cur_term_output && grub_cur_term_output->setcolor)
     (grub_cur_term_output->setcolor) (normal_color, highlight_color);
 }
 

From 7dc7e76a56d730f45c8d9e70d44e21e501fe0bb3 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 10 Oct 2009 13:50:10 +0200
Subject: [PATCH 0010/1628] cleanup and bugfix

---
 kern/main.c                 | 16 ----------------
 kern/mipsel/qemu-r4k/init.c |  5 ++++-
 kern/misc.c                 |  2 +-
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/kern/main.c b/kern/main.c
index 222897d7d..9215d55e7 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -149,45 +149,29 @@ grub_load_normal_mode (void)
 void
 grub_main (void)
 {
-  *((grub_uint8_t *)0x140003f8) = '1';
-
   /* First of all, initialize the machine.  */
   grub_machine_init ();
 
-  *((grub_uint8_t *)0x140003f8) = '2';
-
   /* Hello.  */
   grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
-  *((grub_uint8_t *)0x140003f8) = 'a';
   grub_printf ("Welcome to GRUB!\n\n");
-  *((grub_uint8_t *)0x140003f8) = 'b';
   grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
 
-  *((grub_uint8_t *)0x140003f8) = '3';
-
   /* Load pre-loaded modules and free the space.  */
   grub_register_exported_symbols ();
   grub_load_modules ();
 
-  *((grub_uint8_t *)0x140003f8) = '4';
-
   /* It is better to set the root device as soon as possible,
      for convenience.  */
   grub_machine_set_prefix ();
   grub_env_export ("prefix");
   grub_set_root_dev ();
 
-  *((grub_uint8_t *)0x140003f8) = '5';
-
   grub_register_core_commands ();
   grub_register_rescue_parser ();
   grub_register_rescue_reader ();
 
-  *((grub_uint8_t *)0x140003f8) = '6';
-
   grub_load_config ();
-  *((grub_uint8_t *)0x140003f8) = '7';
   grub_load_normal_mode ();
-  *((grub_uint8_t *)0x140003f8) = '8';
   grub_reader_loop (0);
 }
diff --git a/kern/mipsel/qemu-r4k/init.c b/kern/mipsel/qemu-r4k/init.c
index c4aec14ff..269e8b6e6 100644
--- a/kern/mipsel/qemu-r4k/init.c
+++ b/kern/mipsel/qemu-r4k/init.c
@@ -21,8 +21,11 @@ grub_get_rtc (void)
 void
 grub_machine_init (void)
 {
+  void *tst;
   grub_mm_init_region ((void *) GRUB_MACHINE_MEMORY_STACK_HIGH,
-		       RAMSIZE - GRUB_MACHINE_MEMORY_STACK_HIGH);
+		       RAMSIZE - (GRUB_MACHINE_MEMORY_STACK_HIGH & 0x7fffffff));
+  tst = grub_malloc (10);
+  grub_free (tst);
 }
 
 void
diff --git a/kern/misc.c b/kern/misc.c
index ba19705f3..1c38fe661 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -598,7 +598,7 @@ grub_vsprintf (char *str, const char *fmt, va_list args)
       if (str)
 	*str++ = ch;
       else
-      	grub_putchar (ch);
+	grub_putchar (ch);
 
       count++;
     }

From 33dc6f74d2f5d8d0a38f3c96f883c30e2f5b2aa5 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 10 Oct 2009 14:19:50 +0200
Subject: [PATCH 0011/1628] bugfixes. Merge MIPS and MIPSel

---
 conf/mips.rmk                                 |  2 +-
 configure.ac                                  |  3 +++
 include/grub/mips/cache.h                     | 27 +++++++++++++++++++
 include/grub/{mipsel => mips}/kernel.h        |  0
 include/grub/mips/libgcc.h                    | 26 ++++++++++++++++++
 .../grub/{mipsel => mips}/qemu-r4k/kernel.h   |  0
 .../grub/{mipsel => mips}/qemu-r4k/machine.h  |  0
 .../grub/{mipsel => mips}/qemu-r4k/memory.h   |  0
 include/grub/{mipsel => mips}/qemu-r4k/time.h |  0
 include/grub/{mipsel => mips}/time.h          |  0
 include/grub/{mipsel => mips}/types.h         |  7 +++++
 kern/{mipsel => mips}/cache.S                 |  0
 kern/{mipsel => mips}/dl.c                    |  6 +++++
 kern/{mipsel => mips}/qemu-r4k/init.c         |  0
 kern/{mipsel => mips}/qemu-r4k/startup.S      |  0
 kern/term.c                                   | 11 +++++---
 lib/mipsel/setjmp.S                           |  0
 17 files changed, 77 insertions(+), 5 deletions(-)
 create mode 100644 include/grub/mips/cache.h
 rename include/grub/{mipsel => mips}/kernel.h (100%)
 create mode 100644 include/grub/mips/libgcc.h
 rename include/grub/{mipsel => mips}/qemu-r4k/kernel.h (100%)
 rename include/grub/{mipsel => mips}/qemu-r4k/machine.h (100%)
 rename include/grub/{mipsel => mips}/qemu-r4k/memory.h (100%)
 rename include/grub/{mipsel => mips}/qemu-r4k/time.h (100%)
 rename include/grub/{mipsel => mips}/time.h (100%)
 rename include/grub/{mipsel => mips}/types.h (84%)
 rename kern/{mipsel => mips}/cache.S (100%)
 rename kern/{mipsel => mips}/dl.c (95%)
 rename kern/{mipsel => mips}/qemu-r4k/init.c (100%)
 rename kern/{mipsel => mips}/qemu-r4k/startup.S (100%)
 delete mode 100644 lib/mipsel/setjmp.S

diff --git a/conf/mips.rmk b/conf/mips.rmk
index ad0219b06..b0a078197 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -84,7 +84,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c 	\
 
 grub_emu_LDFLAGS = $(LIBCURSES)
 
-kernel_img_SOURCES = kern/mipsel/qemu-r4k/startup.S \
+kernel_img_SOURCES = kern/mips/qemu-r4k/startup.S \
 	kern/main.c kern/device.c kern/$(target_cpu)/$(target_machine)/init.c 		\
 	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c 		\
 	kern/misc.c kern/mm.c kern/reader.c kern/term.c 	\
diff --git a/configure.ac b/configure.ac
index 74dcc5dd4..fa85c29b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,12 +90,15 @@ case "$target_cpu"-"$platform" in
   powerpc-ieee1275) ;;
   sparc64-ieee1275) ;;
   mipsel-qemu-r4k) ;;
+  mips-qemu-r4k) ;;
   *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
 esac
 
 case "$target_cpu" in
   i386 | powerpc) target_m32=1 ;;
   x86_64 | sparc64) target_m64=1 ;;
+  mipsel) TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPSEL=1"; target_cpu=mips ;;
+  mips) TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPS=1" ;;
 esac
 
 case "$host_os" in
diff --git a/include/grub/mips/cache.h b/include/grub/mips/cache.h
new file mode 100644
index 000000000..c3470571e
--- /dev/null
+++ b/include/grub/mips/cache.h
@@ -0,0 +1,27 @@
+/* cache.h - Flush the processor's cache.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2004,2007  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/>.
+ */
+
+#ifndef GRUB_CPU_CACHE_H
+#define GRUB_CPU_CACHE_H	1
+
+#include <grub/symbol.h>
+#include <grub/types.h>
+
+void EXPORT_FUNC(grub_cpu_flush_cache) (void *start, grub_size_t size, int type);
+#endif 
diff --git a/include/grub/mipsel/kernel.h b/include/grub/mips/kernel.h
similarity index 100%
rename from include/grub/mipsel/kernel.h
rename to include/grub/mips/kernel.h
diff --git a/include/grub/mips/libgcc.h b/include/grub/mips/libgcc.h
new file mode 100644
index 000000000..a65842522
--- /dev/null
+++ b/include/grub/mips/libgcc.h
@@ -0,0 +1,26 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2004,2007  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/>.
+ */
+
+void *EXPORT_FUNC (memset) (void *s, int c, int n) __attribute__ ((weak));
+void EXPORT_FUNC (__ashldi3) (void) __attribute__ ((weak));
+void EXPORT_FUNC (__ashrdi3) (void) __attribute__ ((weak));
+void EXPORT_FUNC (__lshrdi3) (void) __attribute__ ((weak));
+void EXPORT_FUNC (__trampoline_setup) (void) __attribute__ ((weak));
+void EXPORT_FUNC (__ucmpdi2) (void) __attribute__ ((weak));
+void EXPORT_FUNC (__bswapsi2) (void) __attribute__ ((weak));
+void EXPORT_FUNC (__bswapdi2) (void) __attribute__ ((weak));
diff --git a/include/grub/mipsel/qemu-r4k/kernel.h b/include/grub/mips/qemu-r4k/kernel.h
similarity index 100%
rename from include/grub/mipsel/qemu-r4k/kernel.h
rename to include/grub/mips/qemu-r4k/kernel.h
diff --git a/include/grub/mipsel/qemu-r4k/machine.h b/include/grub/mips/qemu-r4k/machine.h
similarity index 100%
rename from include/grub/mipsel/qemu-r4k/machine.h
rename to include/grub/mips/qemu-r4k/machine.h
diff --git a/include/grub/mipsel/qemu-r4k/memory.h b/include/grub/mips/qemu-r4k/memory.h
similarity index 100%
rename from include/grub/mipsel/qemu-r4k/memory.h
rename to include/grub/mips/qemu-r4k/memory.h
diff --git a/include/grub/mipsel/qemu-r4k/time.h b/include/grub/mips/qemu-r4k/time.h
similarity index 100%
rename from include/grub/mipsel/qemu-r4k/time.h
rename to include/grub/mips/qemu-r4k/time.h
diff --git a/include/grub/mipsel/time.h b/include/grub/mips/time.h
similarity index 100%
rename from include/grub/mipsel/time.h
rename to include/grub/mips/time.h
diff --git a/include/grub/mipsel/types.h b/include/grub/mips/types.h
similarity index 84%
rename from include/grub/mipsel/types.h
rename to include/grub/mips/types.h
index 94a35be6e..f5f4602e4 100644
--- a/include/grub/mipsel/types.h
+++ b/include/grub/mips/types.h
@@ -25,7 +25,14 @@
 /* The size of long.  */
 #define GRUB_TARGET_SIZEOF_LONG		4
 
+#ifdef GRUB_CPU_MIPSEL
 /* mipsEL is little-endian.  */
 #undef GRUB_TARGET_WORDS_BIGENDIAN
+#elif defined (GRUB_CPU_MIPS)
+/* mips is big-endian.  */
+#define GRUB_TARGET_WORDS_BIGENDIAN
+#else
+#error Neither GRUB_CPU_MIPS nor GRUB_CPU_MIPSEL is defined
+#endif
 
 #endif /* ! GRUB_TYPES_CPU_HEADER */
diff --git a/kern/mipsel/cache.S b/kern/mips/cache.S
similarity index 100%
rename from kern/mipsel/cache.S
rename to kern/mips/cache.S
diff --git a/kern/mipsel/dl.c b/kern/mips/dl.c
similarity index 95%
rename from kern/mipsel/dl.c
rename to kern/mips/dl.c
index 57854964b..ca93893d2 100644
--- a/kern/mipsel/dl.c
+++ b/kern/mips/dl.c
@@ -92,6 +92,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 
 		switch (ELF_R_TYPE (rel->r_info))
 		  {
+#if 0
 		  case R_386_32:
 		    *addr += sym->st_value;
 		    break;
@@ -100,6 +101,11 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 		    *addr += (sym->st_value - (Elf_Word) seg->addr
 			      - rel->r_offset);
 		    break;
+#endif
+		  default:
+		    grub_printf ("Unknown relocation type %d\n",
+				 ELF_R_TYPE (rel->r_info));
+		    break
 		  }
 	      }
 	  }
diff --git a/kern/mipsel/qemu-r4k/init.c b/kern/mips/qemu-r4k/init.c
similarity index 100%
rename from kern/mipsel/qemu-r4k/init.c
rename to kern/mips/qemu-r4k/init.c
diff --git a/kern/mipsel/qemu-r4k/startup.S b/kern/mips/qemu-r4k/startup.S
similarity index 100%
rename from kern/mipsel/qemu-r4k/startup.S
rename to kern/mips/qemu-r4k/startup.S
diff --git a/kern/term.c b/kern/term.c
index 22660c6a8..0a99ff318 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -135,21 +135,24 @@ grub_getcharwidth (grub_uint32_t code)
 int
 grub_getkey (void)
 {
-  return (grub_cur_term_input->getkey) ();
+  while (!(*((grub_uint8_t *)0x140003f8+5) & 0x01));
+  return *((grub_uint8_t *)0x140003f8);
+  //  return (grub_cur_term_input->getkey) ();
 }
 
 int
 grub_checkkey (void)
 {
-  return (grub_cur_term_input->checkkey) ();
+  return !!(*((grub_uint8_t *)0x140003f8+5) & 0x01);
+  //return (grub_cur_term_input->checkkey) ();
 }
 
 int
 grub_getkeystatus (void)
 {
-  if (grub_cur_term_input->getkeystatus)
+  /*  if (grub_cur_term_input->getkeystatus)
     return (grub_cur_term_input->getkeystatus) ();
-  else
+    else*/
     return 0;
 }
 
diff --git a/lib/mipsel/setjmp.S b/lib/mipsel/setjmp.S
deleted file mode 100644
index e69de29bb..000000000

From c7f26cf640f5231b30f62d1c50e0b5e91c8492b9 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 10 Oct 2009 14:20:33 +0200
Subject: [PATCH 0012/1628] missing file

---
 lib/mips/setjmp.S | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 lib/mips/setjmp.S

diff --git a/lib/mips/setjmp.S b/lib/mips/setjmp.S
new file mode 100644
index 000000000..e69de29bb

From e8b458be456d537500d8d7b0641509f31a70bb74 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 10 Oct 2009 14:27:28 +0200
Subject: [PATCH 0013/1628] fixes

---
 conf/{mipsel-qemu-r4k.rmk => mips-qemu-r4k.rmk} |  0
 configure.ac                                    | 10 ++++++++--
 kern/mips/dl.c                                  |  2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
 rename conf/{mipsel-qemu-r4k.rmk => mips-qemu-r4k.rmk} (100%)

diff --git a/conf/mipsel-qemu-r4k.rmk b/conf/mips-qemu-r4k.rmk
similarity index 100%
rename from conf/mipsel-qemu-r4k.rmk
rename to conf/mips-qemu-r4k.rmk
diff --git a/configure.ac b/configure.ac
index fa85c29b4..97486e421 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,8 +97,14 @@ esac
 case "$target_cpu" in
   i386 | powerpc) target_m32=1 ;;
   x86_64 | sparc64) target_m64=1 ;;
-  mipsel) TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPSEL=1"; target_cpu=mips ;;
-  mips) TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPS=1" ;;
+  mipsel) 
+    TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPSEL=1"; 
+    CFLAGS="$CFLAGS -DGRUB_CPU_MIPSEL=1";
+    target_cpu=mips ;;
+  mips) 
+    TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPS=1"; 
+    CFLAGS="$CFLAGS -DGRUB_CPU_MIPS=1";
+    target_cpu=mips ;;
 esac
 
 case "$host_os" in
diff --git a/kern/mips/dl.c b/kern/mips/dl.c
index ca93893d2..504bb2ef5 100644
--- a/kern/mips/dl.c
+++ b/kern/mips/dl.c
@@ -105,7 +105,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 		  default:
 		    grub_printf ("Unknown relocation type %d\n",
 				 ELF_R_TYPE (rel->r_info));
-		    break
+		    break;
 		  }
 	      }
 	  }

From 6315da883109d22dcabd3493d9cad38547d780db Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 10 Oct 2009 14:54:18 +0200
Subject: [PATCH 0014/1628] fake __gnu_local_gp

---
 conf/mips.rmk  | 2 +-
 genmoddep.awk  | 2 +-
 kern/mips/dl.c | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/conf/mips.rmk b/conf/mips.rmk
index b0a078197..77eaa06cf 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -17,7 +17,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
 	symbol.h term.h time.h types.h loader.h partition.h \
 	msdos_partition.h machine/kernel.h handler.h list.h \
-	command.h machine/memory.h cpu/libgcc.h cpu/cache.h
+	command.h machine/memory.h cpu/libgcc.h cpu/cache.h cpu/dl.h
 
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
 	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
diff --git a/genmoddep.awk b/genmoddep.awk
index af967ec07..f7f085e99 100644
--- a/genmoddep.awk
+++ b/genmoddep.awk
@@ -29,7 +29,7 @@ FNR == 1 {
   if ($1 in symtab) {
     modtab[module] = modtab[module] " " symtab[$1];
   }
-  else if ($1 != "__gnu_local_gp"){
+  else {
     printf "%s in %s is not defined\n", $1, module >"/dev/stderr";
     error++;
     exit;
diff --git a/kern/mips/dl.c b/kern/mips/dl.c
index 504bb2ef5..f8b11a3eb 100644
--- a/kern/mips/dl.c
+++ b/kern/mips/dl.c
@@ -21,6 +21,7 @@
 #include <grub/elf.h>
 #include <grub/misc.h>
 #include <grub/err.h>
+#include <grub/cpu/types.h>
 
 /* Check if EHDR is a valid ELF header.  */
 grub_err_t
@@ -29,9 +30,15 @@ grub_arch_dl_check_header (void *ehdr)
   Elf_Ehdr *e = ehdr;
 
   /* Check the magic numbers.  */
+#ifdef WORDS_BIGENDIAN
+  if (e->e_ident[EI_CLASS] != ELFCLASS32
+      || e->e_ident[EI_DATA] != ELFDATA2MSB
+      || e->e_machine != EM_MIPS)
+#else
   if (e->e_ident[EI_CLASS] != ELFCLASS32
       || e->e_ident[EI_DATA] != ELFDATA2LSB
-      || e->e_machine != EM_386)
+      || e->e_machine != EM_MIPS)
+#endif
     return grub_error (GRUB_ERR_BAD_OS, "invalid arch specific ELF magic");
 
   return GRUB_ERR_NONE;

From 3f9f11b6d2e3ba8d6fac72223ba44c070c86908d Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 10 Oct 2009 20:52:15 +0200
Subject: [PATCH 0015/1628] time & reloc

---
 kern/disk.c               |   3 ++
 kern/mips/dl.c            | 103 +++++++++++++++++++++++++++++++++++---
 kern/mips/qemu-r4k/init.c |   3 +-
 3 files changed, 99 insertions(+), 10 deletions(-)

diff --git a/kern/disk.c b/kern/disk.c
index e463626fb..7fbe2e6a6 100644
--- a/kern/disk.c
+++ b/kern/disk.c
@@ -267,12 +267,15 @@ grub_disk_open (const char *name)
 
   for (dev = grub_disk_dev_list; dev; dev = dev->next)
     {
+      grub_printf ("open: %p\n", dev->open);
+      grub_getkey ();
       if ((dev->open) (raw, disk) == GRUB_ERR_NONE)
 	break;
       else if (grub_errno == GRUB_ERR_UNKNOWN_DEVICE)
 	grub_errno = GRUB_ERR_NONE;
       else
 	goto fail;
+      grub_printf ("survived\n");
     }
 
   if (! dev)
diff --git a/kern/mips/dl.c b/kern/mips/dl.c
index f8b11a3eb..83af37b75 100644
--- a/kern/mips/dl.c
+++ b/kern/mips/dl.c
@@ -22,6 +22,8 @@
 #include <grub/misc.h>
 #include <grub/err.h>
 #include <grub/cpu/types.h>
+#include <grub/mm.h>
+#include <grub/cpu/dl.h>
 
 /* Check if EHDR is a valid ELF header.  */
 grub_err_t
@@ -52,6 +54,9 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
   Elf_Shdr *s;
   Elf_Word entsize;
   unsigned i;
+  grub_size_t gp_size = 0;
+  /* FIXME: suboptimal.  */
+  grub_uint32_t *gp, *gpptr;
 
   /* Find a symbol table.  */
   for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
@@ -65,6 +70,45 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 
   entsize = s->sh_entsize;
 
+  for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
+       i < e->e_shnum;
+       i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
+    if (s->sh_type == SHT_REL)
+      {
+	grub_dl_segment_t seg;
+
+	/* Find the target segment.  */
+	for (seg = mod->segment; seg; seg = seg->next)
+	  if (seg->section == s->sh_info)
+	    break;
+
+	if (seg)
+	  {
+	    Elf_Rel *rel, *max;
+
+	    for (rel = (Elf_Rel *) ((char *) e + s->sh_offset),
+		   max = rel + s->sh_size / s->sh_entsize;
+		 rel < max;
+		 rel++)
+		switch (ELF_R_TYPE (rel->r_info))
+		  {
+		  case R_MIPS_GOT16:
+		  case R_MIPS_CALL16:
+		  case R_MIPS_GPREL32:
+		    gp_size += 4;
+		    break;
+		  }
+	  }
+      }
+
+  if (gp_size > 0x08000)
+    return grub_error (GRUB_ERR_OUT_OF_RANGE, "__gnu_local_gp is too big\n");
+
+  gpptr = gp = grub_malloc (gp_size);
+  if (!gp)
+    return grub_errno;
+  grub_printf ("gp=%p\n", gp);
+
   for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
        i < e->e_shnum;
        i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
@@ -96,19 +140,62 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 		addr = (Elf_Word *) ((char *) seg->addr + rel->r_offset);
 		sym = (Elf_Sym *) ((char *) mod->symtab
 				     + entsize * ELF_R_SYM (rel->r_info));
+		if (sym->st_value == (grub_addr_t) &__gnu_local_gp)
+		  sym->st_value = (grub_addr_t) gp;
 
 		switch (ELF_R_TYPE (rel->r_info))
 		  {
-#if 0
-		  case R_386_32:
-		    *addr += sym->st_value;
+		  case R_MIPS_HI16:
+		    {
+		      grub_uint32_t value;
+		      
+		      /* Handle partner lo16 relocation. Lower part is
+			 treated as signed. Hence add 0x8000 to compensate. 
+		       */
+		      value = (*(grub_uint16_t *) addr << 16)
+			+ sym->st_value + 0x8000;
+		      if (rel + 1 < max && ELF_R_SYM (rel[1].r_info) 
+			  == ELF_R_SYM (rel[0].r_info)
+			  && ELF_R_TYPE (rel[1].r_info) == R_MIPS_LO16)
+			value += *(grub_uint16_t *)
+			((char *) seg->addr + rel[1].r_offset);
+		      *(grub_uint16_t *) addr += (value >> 16) & 0xffff;
+		    }
 		    break;
-
-		  case R_386_PC32:
-		    *addr += (sym->st_value - (Elf_Word) seg->addr
-			      - rel->r_offset);
+		  case R_MIPS_LO16:
+		    *(grub_uint16_t *) addr += (sym->st_value) & 0xffff;
+		    break;
+		  case R_MIPS_32:
+		    *(grub_uint32_t *) addr = sym->st_value;
+		    break;
+		  case R_MIPS_26:
+		    {
+		      grub_uint32_t value;
+		      grub_uint32_t raw;
+		      raw = (*(grub_uint32_t *) addr) & 0x3ffffff;
+		      value = raw << 2;
+		      value += sym->st_value;
+		      raw = (value >> 2) & 0x3ffffff;
+			
+		      *(grub_uint32_t *) addr = 
+			raw | ((*(grub_uint32_t *) addr) & 0xfc000000);
+		    }
+		    break;
+		  case R_MIPS_GOT16:
+		  case R_MIPS_CALL16:
+		    /* FIXME: reuse*/
+		    *gpptr = sym->st_value + *(grub_uint16_t *) addr;
+		    *(grub_uint16_t *) addr
+		      = sizeof (grub_uint32_t) * (gpptr - gp);
+		    gpptr++;
+		    break;
+		  case R_MIPS_GPREL32:
+		    grub_printf ("gp32\n");
+		    *gpptr = sym->st_value + *(grub_uint16_t *) addr;
+		    *(grub_uint32_t *) addr
+		      = sizeof (grub_uint32_t) * (gpptr - gp);
+		    gpptr++;
 		    break;
-#endif
 		  default:
 		    grub_printf ("Unknown relocation type %d\n",
 				 ELF_R_TYPE (rel->r_info));
diff --git a/kern/mips/qemu-r4k/init.c b/kern/mips/qemu-r4k/init.c
index 269e8b6e6..f7d304313 100644
--- a/kern/mips/qemu-r4k/init.c
+++ b/kern/mips/qemu-r4k/init.c
@@ -24,8 +24,7 @@ grub_machine_init (void)
   void *tst;
   grub_mm_init_region ((void *) GRUB_MACHINE_MEMORY_STACK_HIGH,
 		       RAMSIZE - (GRUB_MACHINE_MEMORY_STACK_HIGH & 0x7fffffff));
-  tst = grub_malloc (10);
-  grub_free (tst);
+  grub_install_get_time_ms (grub_rtc_get_time_ms);
 }
 
 void

From f651d13a18ba734b2fa9cf4164217c826f52bf23 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 10 Oct 2009 20:59:18 +0200
Subject: [PATCH 0016/1628] split serial

---
 conf/i386-coreboot.rmk              | 2 +-
 conf/i386-ieee1275.rmk              | 2 +-
 conf/i386-pc.rmk                    | 2 +-
 include/grub/i386/io.h              | 2 ++
 include/grub/{i386/pc => }/serial.h | 4 ++--
 term/{i386/pc => }/serial.c         | 8 ++++----
 6 files changed, 11 insertions(+), 9 deletions(-)
 rename include/grub/{i386/pc => }/serial.h (96%)
 rename term/{i386/pc => }/serial.c (98%)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 09ec7787c..59a9ed607 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -187,7 +187,7 @@ halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For serial.mod.
-serial_mod_SOURCES = term/i386/pc/serial.c
+serial_mod_SOURCES = term/serial.c
 serial_mod_CFLAGS = $(COMMON_CFLAGS)
 serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 4b640de49..48c3ce9d9 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -156,7 +156,7 @@ halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For serial.mod.
-serial_mod_SOURCES = term/i386/pc/serial.c
+serial_mod_SOURCES = term/serial.c
 serial_mod_CFLAGS = $(COMMON_CFLAGS)
 serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index bf8fbfb9d..c4a4e7754 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -260,7 +260,7 @@ halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For serial.mod.
-serial_mod_SOURCES = term/i386/pc/serial.c
+serial_mod_SOURCES = term/serial.c
 serial_mod_CFLAGS = $(COMMON_CFLAGS)
 serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/include/grub/i386/io.h b/include/grub/i386/io.h
index 0e567766b..ae12a3e3d 100644
--- a/include/grub/i386/io.h
+++ b/include/grub/i386/io.h
@@ -21,6 +21,8 @@
 #ifndef	GRUB_IO_H
 #define	GRUB_IO_H	1
 
+typedef unsigned short int grub_port_t;
+
 static __inline unsigned char
 grub_inb (unsigned short int port)
 {
diff --git a/include/grub/i386/pc/serial.h b/include/grub/serial.h
similarity index 96%
rename from include/grub/i386/pc/serial.h
rename to include/grub/serial.h
index 0632ff79d..1c35b4093 100644
--- a/include/grub/i386/pc/serial.h
+++ b/include/grub/serial.h
@@ -17,8 +17,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GRUB_SERIAL_MACHINE_HEADER
-#define GRUB_SERIAL_MACHINE_HEADER	1
+#ifndef GRUB_SERIAL_HEADER
+#define GRUB_SERIAL_HEADER	1
 
 /* Macros.  */
 
diff --git a/term/i386/pc/serial.c b/term/serial.c
similarity index 98%
rename from term/i386/pc/serial.c
rename to term/serial.c
index 1d74dbbc8..eac43bf1b 100644
--- a/term/i386/pc/serial.c
+++ b/term/serial.c
@@ -54,7 +54,7 @@ static const struct grub_arg_option options[] =
 /* Serial port settings.  */
 struct serial_port
 {
-  unsigned short port;
+  grub_port_t port;
   unsigned short divisor;
   unsigned short word_len;
   unsigned int   parity;
@@ -68,12 +68,12 @@ static struct serial_port serial_settings;
 static const unsigned short *serial_hw_io_addr = (const unsigned short *) GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR;
 #define GRUB_SERIAL_PORT_NUM 4
 #else
-static const unsigned short serial_hw_io_addr[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
+static const grub_port_t serial_hw_io_addr[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
 #define GRUB_SERIAL_PORT_NUM (ARRAY_SIZE(serial_hw_io_addr))
 #endif
 
 /* Return the port number for the UNITth serial device.  */
-static inline unsigned short
+static inline grub_port_t
 serial_hw_get_port (const unsigned int unit)
 {
   if (unit < GRUB_SERIAL_PORT_NUM)
@@ -503,7 +503,7 @@ grub_cmd_serial (grub_extcmd_t cmd,
     }
 
   if (state[1].set)
-    serial_settings.port = (unsigned short) grub_strtoul (state[1].arg, 0, 0);
+    serial_settings.port = (grub_port_t) grub_strtoul (state[1].arg, 0, 0);
 
   if (state[2].set)
     {

From 65e64ea4b15c88c53f31d6d3e22a912ff7001174 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 10 Oct 2009 21:23:51 +0200
Subject: [PATCH 0017/1628] mkimage fix

---
 util/elf/grub-mkimage.c | 42 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/util/elf/grub-mkimage.c b/util/elf/grub-mkimage.c
index 535427208..ea5a1f64e 100644
--- a/util/elf/grub-mkimage.c
+++ b/util/elf/grub-mkimage.c
@@ -97,7 +97,7 @@ load_note (Elf32_Phdr *phdr, FILE *out)
 
 void
 load_modules (grub_addr_t modbase, Elf32_Phdr *phdr, const char *dir,
-	      char *mods[], FILE *out, char *memdisk_path)
+	      char *mods[], FILE *out, char *memdisk_path, char *config_path)
 {
   char *module_img;
   struct grub_util_path_list *path_list;
@@ -106,6 +106,7 @@ load_modules (grub_addr_t modbase, Elf32_Phdr *phdr, const char *dir,
   size_t offset;
   size_t total_module_size;
   size_t memdisk_size = 0;
+  size_t config_size = 0;
 
   path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods);
 
@@ -119,6 +120,13 @@ load_modules (grub_addr_t modbase, Elf32_Phdr *phdr, const char *dir,
       total_module_size += memdisk_size + sizeof (struct grub_module_header);
     }
 
+  if (config_path)
+    {
+      config_size = ALIGN_UP(grub_util_get_image_size (config_path), 512);
+      grub_util_info ("the size of memory disk is 0x%x", config_size);
+      total_module_size += config_size + sizeof (struct grub_module_header);
+    }
+
   for (p = path_list; p; p = p->next)
     {
       total_module_size += (grub_util_get_image_size (p->name)
@@ -165,6 +173,19 @@ load_modules (grub_addr_t modbase, Elf32_Phdr *phdr, const char *dir,
       offset += memdisk_size;
     }
 
+  if (config_path)
+    {
+      struct grub_module_header *header;
+
+      header = (struct grub_module_header *) (module_img + offset);
+      header->type = OBJ_TYPE_CONFIG;
+      header->size = grub_host_to_target32 (config_size + sizeof (*header));
+      offset += sizeof (*header);
+
+      grub_util_load_image (config_path, module_img + offset);
+      offset += config_size;
+    }
+
 
   /* Write the module data to the new segment.  */
   grub_util_write_image_at (module_img, total_module_size,
@@ -181,7 +202,7 @@ load_modules (grub_addr_t modbase, Elf32_Phdr *phdr, const char *dir,
 }
 
 void
-add_segments (char *dir, char *prefix, FILE *out, int chrp, char *mods[], char *memdisk_path)
+add_segments (char *dir, char *prefix, FILE *out, int chrp, char *mods[], char *memdisk_path, char *config_path)
 {
   Elf32_Ehdr ehdr;
   Elf32_Phdr *phdrs = NULL;
@@ -270,7 +291,7 @@ add_segments (char *dir, char *prefix, FILE *out, int chrp, char *mods[], char *
       phdr->p_offset = grub_host_to_target32 (ALIGN_UP (grub_util_get_fp_size (out),
 							GRUB_TARGET_SIZEOF_LONG));
 
-      load_modules (modbase, phdr, dir, mods, out, memdisk_path);
+      load_modules (modbase, phdr, dir, mods, out, memdisk_path, config_path);
     }
 
   if (chrp)
@@ -313,6 +334,7 @@ static struct option options[] =
     {"directory", required_argument, 0, 'd'},
     {"prefix", required_argument, 0, 'p'},
     {"memdisk", required_argument, 0, 'm'},
+    {"config", required_argument, 0, 'c'},
     {"output", required_argument, 0, 'o'},
     {"help", no_argument, 0, 'h'},
     {"note", no_argument, 0, 'n'},
@@ -335,6 +357,7 @@ Make a bootable image of GRUB.\n\
   -d, --directory=DIR     use images and modules under DIR [default=%s]\n\
   -p, --prefix=DIR        set grub_prefix directory\n\
   -m, --memdisk=FILE      embed FILE as a memdisk image\n\
+  -c, --config=FILE       embed FILE as boot config\n\
   -o, --output=FILE       output a generated image to FILE\n\
   -h, --help              display this message and exit\n\
   -n, --note              add NOTE segment for CHRP Open Firmware\n\
@@ -355,13 +378,14 @@ main (int argc, char *argv[])
   char *dir = NULL;
   char *prefix = NULL;
   char *memdisk = NULL;
+  char *config = NULL;
   int chrp = 0;
 
   progname = "grub-mkimage";
 
   while (1)
     {
-      int c = getopt_long (argc, argv, "d:p:m:o:hVvn", options, 0);
+      int c = getopt_long (argc, argv, "d:p:m:c:o:hVvn", options, 0);
       if (c == -1)
 	break;
 
@@ -387,6 +411,13 @@ main (int argc, char *argv[])
 	    prefix = xstrdup ("(memdisk)/boot/grub");
 
 	    break;
+	  case 'c':
+	    if (config)
+	      free (config);
+	    config = xstrdup (optarg);
+
+	    break;
+
 	  case 'h':
 	    usage (0);
 	    break;
@@ -417,7 +448,8 @@ main (int argc, char *argv[])
   if (! fp)
     grub_util_error ("cannot open %s", output);
 
-  add_segments (dir ? : GRUB_LIBDIR, prefix, fp, chrp, argv + optind, memdisk);
+  add_segments (dir ? : GRUB_LIBDIR, prefix, fp, chrp, argv + optind, memdisk,
+		config);
 
   fclose (fp);
 

From ffa9860a862294ddb821f4bcc74914771e1fa5ab Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 11 Oct 2009 02:07:52 +0200
Subject: [PATCH 0018/1628] various fixes

---
 conf/mips.rmk             |  8 ++++-
 fs/cpio.c                 |  9 ++++--
 genmk.rb                  |  2 ++
 include/grub/mips/dl.h    | 25 ++++++++++++++++
 include/grub/mips/io.h    | 62 +++++++++++++++++++++++++++++++++++++++
 kern/disk.c               |  3 --
 kern/mips/dl.c            | 36 ++++++++++++++++-------
 kern/mips/qemu-r4k/init.c |  1 +
 kern/term.c               | 58 ++++++++++++++++++++++++------------
 term/serial.c             | 12 ++++++--
 10 files changed, 177 insertions(+), 39 deletions(-)
 create mode 100644 include/grub/mips/dl.h
 create mode 100644 include/grub/mips/io.h

diff --git a/conf/mips.rmk b/conf/mips.rmk
index 77eaa06cf..d03b5d8f5 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -91,7 +91,7 @@ kernel_img_SOURCES = kern/mips/qemu-r4k/startup.S \
 	kern/rescue_parser.c kern/rescue_reader.c \
 	kern/list.c kern/handler.c kern/command.c kern/corecmd.c	\
 	kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c 	\
-	kern/generic/millisleep.c kern/time.c                            \
+	kern/generic/millisleep.c kern/generic/rtc_get_time_ms.c kern/time.c    \
 	symlist.c kern/$(target_cpu)/cache.S
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
@@ -122,4 +122,10 @@ lsmmap_mod_SOURCES = commands/lsmmap.c
 lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
 lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For serial.mod.
+pkglib_MODULES += serial.mod
+serial_mod_SOURCES = term/serial.c
+serial_mod_CFLAGS = $(COMMON_CFLAGS)
+serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 include $(srcdir)/conf/common.mk
diff --git a/fs/cpio.c b/fs/cpio.c
index 1ec4ebeaf..26218c310 100644
--- a/fs/cpio.c
+++ b/fs/cpio.c
@@ -280,8 +280,10 @@ grub_cpio_open (grub_file_t file, const char *name)
 
       /* Compare NAME and FN by hand in order to cope with duplicate
 	 slashes.  */
-      i = 1;
+      i = 0;
       j = 0;
+      while (name[i] == '/')
+	i++;
       while (1)
 	{
 	  if (name[i] != fn[j])
@@ -290,13 +292,16 @@ grub_cpio_open (grub_file_t file, const char *name)
 	  if (name[i] == '\0')
 	    break;
 
-	  if (name[i] == '/' && name[i+1] == '/')
+	  while (name[i] == '/' && name[i+1] == '/')
 	    i++;
 
 	  i++;
 	  j++;
 	}
 
+      if (name[i] != fn[j])
+	goto no_match;
+
       file->data = data;
       file->size = data->size;
       grub_free (fn);
diff --git a/genmk.rb b/genmk.rb
index 50bf88fe1..71b57816f 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -319,6 +319,7 @@ MOSTLYCLEANFILES += #{deps_str}
 
 #{@name}: $(#{prefix}_DEPENDENCIES) #{objs_str}
 	$(TARGET_CC) -o $@ #{objs_str} $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS)
+	$(STRIP) -R .rel.dyn -R .reginfo -R .note -R .comment $@
 
 " + objs.collect_with_index do |obj, i|
       src = sources[i]
@@ -330,6 +331,7 @@ MOSTLYCLEANFILES += #{deps_str}
 
       "#{obj}: #{src} $(#{src}_DEPENDENCIES)
 	$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -MD -c -o $@ $<
+
 -include #{dep}
 
 "
diff --git a/include/grub/mips/dl.h b/include/grub/mips/dl.h
new file mode 100644
index 000000000..4dbd97ca9
--- /dev/null
+++ b/include/grub/mips/dl.h
@@ -0,0 +1,25 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/>.
+ */
+
+#ifndef GRUB_CPU_DL_H
+#define GRUB_CPU_DL_H	1
+
+/* Dummy __gnu_local_gp. Resolved by linker.  */
+char EXPORT_VAR (__gnu_local_gp);
+
+#endif /* ! GRUB_CPU_DL_H */
diff --git a/include/grub/mips/io.h b/include/grub/mips/io.h
new file mode 100644
index 000000000..b86452c0a
--- /dev/null
+++ b/include/grub/mips/io.h
@@ -0,0 +1,62 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/>.
+ */
+
+#ifndef	GRUB_IO_H
+#define	GRUB_IO_H	1
+
+#include <grub/types.h>
+
+typedef grub_addr_t grub_port_t;
+
+static __inline unsigned char
+grub_inb (grub_port_t port)
+{
+  return *(grub_uint8_t *) port;
+}
+
+static __inline unsigned short int
+grub_inw (grub_port_t port)
+{
+  return *(grub_uint16_t *) port;
+}
+
+static __inline unsigned int
+grub_inl (grub_port_t port)
+{
+  return *(grub_uint32_t *) port;
+}
+
+static __inline void
+grub_outb (unsigned char value, grub_port_t port)
+{
+  *(grub_uint8_t *) port = value;
+}
+
+static __inline void
+grub_outw (unsigned short int value, grub_port_t port)
+{
+  *(grub_uint16_t *) port = value;
+}
+
+static __inline void
+grub_outl (unsigned int value, grub_port_t port)
+{
+  *(grub_uint32_t *) port = value;
+}
+
+#endif /* _SYS_IO_H */
diff --git a/kern/disk.c b/kern/disk.c
index 7fbe2e6a6..e463626fb 100644
--- a/kern/disk.c
+++ b/kern/disk.c
@@ -267,15 +267,12 @@ grub_disk_open (const char *name)
 
   for (dev = grub_disk_dev_list; dev; dev = dev->next)
     {
-      grub_printf ("open: %p\n", dev->open);
-      grub_getkey ();
       if ((dev->open) (raw, disk) == GRUB_ERR_NONE)
 	break;
       else if (grub_errno == GRUB_ERR_UNKNOWN_DEVICE)
 	grub_errno = GRUB_ERR_NONE;
       else
 	goto fail;
-      grub_printf ("survived\n");
     }
 
   if (! dev)
diff --git a/kern/mips/dl.c b/kern/mips/dl.c
index 83af37b75..e25ccce3a 100644
--- a/kern/mips/dl.c
+++ b/kern/mips/dl.c
@@ -57,6 +57,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
   grub_size_t gp_size = 0;
   /* FIXME: suboptimal.  */
   grub_uint32_t *gp, *gpptr;
+  grub_uint32_t gp0;
 
   /* Find a symbol table.  */
   for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
@@ -70,6 +71,18 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 
   entsize = s->sh_entsize;
 
+  /* Find reginfo. */
+  for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
+       i < e->e_shnum;
+       i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
+    if (s->sh_type == SHT_MIPS_REGINFO)
+      break;
+
+  if (i == e->e_shnum)
+    return grub_error (GRUB_ERR_BAD_MODULE, "no reginfo found");
+
+  gp0 = ((grub_uint32_t *)((char *) e + s->sh_offset))[5];
+
   for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
        i < e->e_shnum;
        i++, s = (Elf_Shdr *) ((char *) s + e->e_shentsize))
@@ -107,7 +120,6 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
   gpptr = gp = grub_malloc (gp_size);
   if (!gp)
     return grub_errno;
-  grub_printf ("gp=%p\n", gp);
 
   for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
        i < e->e_shnum;
@@ -166,8 +178,13 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 		    *(grub_uint16_t *) addr += (sym->st_value) & 0xffff;
 		    break;
 		  case R_MIPS_32:
-		    *(grub_uint32_t *) addr = sym->st_value;
+		    *(grub_uint32_t *) addr += sym->st_value;
 		    break;
+		  case R_MIPS_GPREL32:
+		    *(grub_uint32_t *) addr = sym->st_value
+		      + *(grub_uint32_t *) addr + gp0 - (grub_uint32_t)gp;
+		    break;
+
 		  case R_MIPS_26:
 		    {
 		      grub_uint32_t value;
@@ -189,16 +206,13 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 		      = sizeof (grub_uint32_t) * (gpptr - gp);
 		    gpptr++;
 		    break;
-		  case R_MIPS_GPREL32:
-		    grub_printf ("gp32\n");
-		    *gpptr = sym->st_value + *(grub_uint16_t *) addr;
-		    *(grub_uint32_t *) addr
-		      = sizeof (grub_uint32_t) * (gpptr - gp);
-		    gpptr++;
-		    break;
 		  default:
-		    grub_printf ("Unknown relocation type %d\n",
-				 ELF_R_TYPE (rel->r_info));
+		    {
+		      grub_free (gp);
+		      return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+					 "Unknown relocation type %d\n",
+					 ELF_R_TYPE (rel->r_info));
+		    }
 		    break;
 		  }
 	      }
diff --git a/kern/mips/qemu-r4k/init.c b/kern/mips/qemu-r4k/init.c
index f7d304313..085c60bf8 100644
--- a/kern/mips/qemu-r4k/init.c
+++ b/kern/mips/qemu-r4k/init.c
@@ -5,6 +5,7 @@
 #include <grub/types.h>
 #include <grub/misc.h>
 #include <grub/mm.h>
+#include <grub/time.h>
 #include <grub/machine/kernel.h>
 #include <grub/machine/memory.h>
 #include <grub/cpu/kernel.h>
diff --git a/kern/term.c b/kern/term.c
index 0a99ff318..789e4651b 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -48,9 +48,11 @@ struct grub_handler_class grub_term_output_class =
 void
 grub_putcode (grub_uint32_t code)
 {
-  //  int height = grub_getwh () & 255;
+  int height = grub_getwh () & 255;
+
+  if (!grub_cur_term_output)
+    return;
 
-#if 0
   if (code == '\t' && grub_cur_term_output->getxy)
     {
       int n;
@@ -61,15 +63,13 @@ grub_putcode (grub_uint32_t code)
 
       return;
     }
-#endif
 
-  //  (grub_cur_term_output->putchar) (code);
-  *((grub_uint8_t *)0x140003f8) = code;
+  (grub_cur_term_output->putchar) (code);
 
   if (code == '\n')
     {
       grub_putcode ('\r');
-#if 0
+
       grub_more_lines++;
 
       if (grub_more && grub_more_lines == height - 1)
@@ -96,7 +96,6 @@ grub_putcode (grub_uint32_t code)
 	  else
 	    grub_more_lines = 0;
 	}
-#endif
     }
 }
 
@@ -129,54 +128,66 @@ grub_putchar (int c)
 grub_ssize_t
 grub_getcharwidth (grub_uint32_t code)
 {
+  if (!grub_cur_term_output)
+    return 1;
   return (grub_cur_term_output->getcharwidth) (code);
 }
 
 int
 grub_getkey (void)
 {
-  while (!(*((grub_uint8_t *)0x140003f8+5) & 0x01));
-  return *((grub_uint8_t *)0x140003f8);
-  //  return (grub_cur_term_input->getkey) ();
+  int c;
+  if (!grub_cur_term_input)
+    return 0;
+  return (grub_cur_term_input->getkey) ();
 }
 
 int
 grub_checkkey (void)
 {
-  return !!(*((grub_uint8_t *)0x140003f8+5) & 0x01);
-  //return (grub_cur_term_input->checkkey) ();
+  if (!grub_cur_term_input)
+    return 0;
+  return (grub_cur_term_input->checkkey) ();
 }
 
 int
 grub_getkeystatus (void)
 {
-  /*  if (grub_cur_term_input->getkeystatus)
+  if (grub_cur_term_input && grub_cur_term_input->getkeystatus)
     return (grub_cur_term_input->getkeystatus) ();
-    else*/
+  else
     return 0;
 }
 
 grub_uint16_t
 grub_getxy (void)
 {
+  if (!grub_cur_term_output)
+    return 0;
   return (grub_cur_term_output->getxy) ();
 }
 
 grub_uint16_t
 grub_getwh (void)
 {
+  if (!grub_cur_term_output)
+    return (80 << 8) | 25;
   return (grub_cur_term_output->getwh) ();
 }
 
 void
 grub_gotoxy (grub_uint8_t x, grub_uint8_t y)
 {
-  (grub_cur_term_output->gotoxy) (x, y);
+  if (grub_cur_term_output && grub_cur_term_output->gotoxy)
+    (grub_cur_term_output->gotoxy) (x, y);
 }
 
 void
 grub_cls (void)
 {
+  if (!grub_cur_term_output)
+    return;
+
   if ((grub_cur_term_output->flags & GRUB_TERM_DUMB) || (grub_env_get ("debug")))
     {
       grub_putchar ('\n');
@@ -189,20 +200,29 @@ grub_cls (void)
 void
 grub_setcolorstate (grub_term_color_state state)
 {
-  if (grub_cur_term_output && grub_cur_term_output->setcolorstate)
+  if (!grub_cur_term_output)
+    return;
+
+  if (grub_cur_term_output->setcolorstate)
     (grub_cur_term_output->setcolorstate) (state);
 }
 
 void
 grub_setcolor (grub_uint8_t normal_color, grub_uint8_t highlight_color)
 {
-  if (grub_cur_term_output && grub_cur_term_output->setcolor)
+  if (!grub_cur_term_output)
+    return;
+
+  if (grub_cur_term_output->setcolor)
     (grub_cur_term_output->setcolor) (normal_color, highlight_color);
 }
 
 void
 grub_getcolor (grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
 {
+  if (!grub_cur_term_output)
+    return;
+
   if (grub_cur_term_output->getcolor)
     (grub_cur_term_output->getcolor) (normal_color, highlight_color);
 }
@@ -212,7 +232,7 @@ grub_setcursor (int on)
 {
   int ret = cursor_state;
 
-  if (grub_cur_term_output->setcursor)
+  if (grub_cur_term_output && grub_cur_term_output->setcursor)
     {
       (grub_cur_term_output->setcursor) (on);
       cursor_state = on;
@@ -230,7 +250,7 @@ grub_getcursor (void)
 void
 grub_refresh (void)
 {
-  if (grub_cur_term_output->refresh)
+  if (grub_cur_term_output && grub_cur_term_output->refresh)
     (grub_cur_term_output->refresh) ();
 }
 
diff --git a/term/serial.c b/term/serial.c
index eac43bf1b..6c2d8ac09 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -18,8 +18,8 @@
 
 #include <grub/machine/machine.h>
 #include <grub/machine/memory.h>
-#include <grub/machine/serial.h>
-#include <grub/machine/console.h>
+#include <grub/serial.h>
+//#include <grub/machine/console.h>
 #include <grub/term.h>
 #include <grub/types.h>
 #include <grub/dl.h>
@@ -67,6 +67,9 @@ static struct serial_port serial_settings;
 #ifdef GRUB_MACHINE_PCBIOS
 static const unsigned short *serial_hw_io_addr = (const unsigned short *) GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR;
 #define GRUB_SERIAL_PORT_NUM 4
+#elif defined (GRUB_MACHINE_MIPS_QEMU)
+static const grub_port_t serial_hw_io_addr[] = { 0x140003f8 };
+#define GRUB_SERIAL_PORT_NUM (ARRAY_SIZE(serial_hw_io_addr))
 #else
 static const grub_port_t serial_hw_io_addr[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
 #define GRUB_SERIAL_PORT_NUM (ARRAY_SIZE(serial_hw_io_addr))
@@ -149,7 +152,7 @@ serial_translate_key_sequence (void)
   if (input_buf[0] != '\e' || input_buf[1] != '[')
     return;
 
-  for (i = 0; ARRAY_SIZE (three_code_table); i++)
+  for (i = 0; i < ARRAY_SIZE (three_code_table); i++)
     if (three_code_table[i].key == input_buf[2])
       {
 	input_buf[0] = three_code_table[i].ascii;
@@ -254,6 +257,9 @@ grub_serial_getkey (void)
     ;
 
   c = input_buf[0];
+  if (c == 0x7f)
+    c = GRUB_TERM_BACKSPACE;
+
   grub_memmove (input_buf, input_buf + 1, --npending);
 
   return c;

From 50739170dbf9cef4df6d73ba4126e962073c7118 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 11 Oct 2009 14:18:58 +0200
Subject: [PATCH 0019/1628] seems to work now. A lot is still missing though

---
 include/grub/mips/qemu-r4k/memory.h |  3 ++-
 include/grub/mips/types.h           |  2 +-
 kern/dl.c                           | 17 ++++++++---------
 kern/mips/qemu-r4k/init.c           |  5 ++---
 kern/term.c                         |  1 -
 term/serial.c                       |  4 ++--
 6 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/include/grub/mips/qemu-r4k/memory.h b/include/grub/mips/qemu-r4k/memory.h
index 21f295b67..87e68674e 100644
--- a/include/grub/mips/qemu-r4k/memory.h
+++ b/include/grub/mips/qemu-r4k/memory.h
@@ -25,7 +25,8 @@
 #include <grub/types.h>
 #endif
 
-#define GRUB_MACHINE_MEMORY_STACK_HIGH       0x81000000
+#define GRUB_MACHINE_MEMORY_STACK_HIGH       0x80f00000
+#define GRUB_MACHINE_MEMORY_USABLE       0x81000000
 
 #define GRUB_MACHINE_MEMORY_AVAILABLE        1
 
diff --git a/include/grub/mips/types.h b/include/grub/mips/types.h
index f5f4602e4..fe09afa3e 100644
--- a/include/grub/mips/types.h
+++ b/include/grub/mips/types.h
@@ -31,7 +31,7 @@
 #elif defined (GRUB_CPU_MIPS)
 /* mips is big-endian.  */
 #define GRUB_TARGET_WORDS_BIGENDIAN
-#else
+#elif !defined (GRUB_SYMBOL_GENERATOR)
 #error Neither GRUB_CPU_MIPS nor GRUB_CPU_MIPSEL is defined
 #endif
 
diff --git a/kern/dl.c b/kern/dl.c
index 78ebc1e38..7cc5855bd 100644
--- a/kern/dl.c
+++ b/kern/dl.c
@@ -342,6 +342,7 @@ grub_dl_resolve_symbols (grub_dl_t mod, Elf_Ehdr *e)
       switch (type)
 	{
 	case STT_NOTYPE:
+	case STT_OBJECT:
 	  /* Resolve a global symbol.  */
 	  if (sym->st_name != 0 && sym->st_shndx == 0)
 	    {
@@ -351,15 +352,13 @@ grub_dl_resolve_symbols (grub_dl_t mod, Elf_Ehdr *e)
 				   "the symbol `%s' not found", name);
 	    }
 	  else
-	    sym->st_value = 0;
-	  break;
-
-	case STT_OBJECT:
-	  sym->st_value += (Elf_Addr) grub_dl_get_section_addr (mod,
-								sym->st_shndx);
-	  if (bind != STB_LOCAL)
-	    if (grub_dl_register_symbol (name, (void *) sym->st_value, mod))
-	      return grub_errno;
+	    {
+	      sym->st_value += (Elf_Addr) grub_dl_get_section_addr (mod,
+								    sym->st_shndx);
+	      if (bind != STB_LOCAL)
+		if (grub_dl_register_symbol (name, (void *) sym->st_value, mod))
+		  return grub_errno;
+	    }
 	  break;
 
 	case STT_FUNC:
diff --git a/kern/mips/qemu-r4k/init.c b/kern/mips/qemu-r4k/init.c
index 085c60bf8..8dfda57c2 100644
--- a/kern/mips/qemu-r4k/init.c
+++ b/kern/mips/qemu-r4k/init.c
@@ -22,9 +22,8 @@ grub_get_rtc (void)
 void
 grub_machine_init (void)
 {
-  void *tst;
-  grub_mm_init_region ((void *) GRUB_MACHINE_MEMORY_STACK_HIGH,
-		       RAMSIZE - (GRUB_MACHINE_MEMORY_STACK_HIGH & 0x7fffffff));
+  grub_mm_init_region ((void *) GRUB_MACHINE_MEMORY_USABLE,
+		       RAMSIZE - (GRUB_MACHINE_MEMORY_USABLE & 0x7fffffff));
   grub_install_get_time_ms (grub_rtc_get_time_ms);
 }
 
diff --git a/kern/term.c b/kern/term.c
index 789e4651b..0e3595df3 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -136,7 +136,6 @@ grub_getcharwidth (grub_uint32_t code)
 int
 grub_getkey (void)
 {
-  int c;
   if (!grub_cur_term_input)
     return 0;
   return (grub_cur_term_input->getkey) ();
diff --git a/term/serial.c b/term/serial.c
index 6c2d8ac09..4b6ac981d 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -29,7 +29,7 @@
 #include <grub/extcmd.h>
 
 #define TEXT_WIDTH	80
-#define TEXT_HEIGHT	25
+#define TEXT_HEIGHT	24
 
 static unsigned int xpos, ypos;
 static unsigned int keep_track = 1;
@@ -370,7 +370,7 @@ grub_serial_putchar (grub_uint32_t c)
 	  break;
 
 	case '\n':
-	  if (ypos < TEXT_HEIGHT)
+	  if (ypos < TEXT_HEIGHT - 1)
 	    ypos++;
 	  break;
 

From 1540a0840253fc2504ba4d3fb24e8b4882c2ab18 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 11 Oct 2009 18:18:18 +0200
Subject: [PATCH 0020/1628] various fixes. MIPSsim support

---
 conf/mips-qemu-mipssim.rmk               |  4 ++
 conf/mips.rmk                            | 14 ++++-
 configure.ac                             |  2 +
 disk/ata.c                               |  5 +-
 include/grub/ata.h                       |  4 +-
 include/grub/mips/libgcc.h               | 15 +++--
 include/grub/mips/pci.h                  | 70 ++++++++++++++++++++++
 include/grub/mips/qemu-mipssim/kernel.h  | 35 +++++++++++
 include/grub/mips/qemu-mipssim/machine.h | 24 ++++++++
 include/grub/mips/qemu-mipssim/memory.h  | 54 +++++++++++++++++
 include/grub/mips/qemu-mipssim/time.h    | 35 +++++++++++
 include/grub/mips/qemu-r4k/machine.h     |  2 +-
 kern/mips/qemu-mipssim/init.c            | 76 ++++++++++++++++++++++++
 kern/mips/qemu-mipssim/startup.S         | 55 +++++++++++++++++
 term/serial.c                            |  5 +-
 15 files changed, 385 insertions(+), 15 deletions(-)
 create mode 100644 conf/mips-qemu-mipssim.rmk
 create mode 100644 include/grub/mips/pci.h
 create mode 100644 include/grub/mips/qemu-mipssim/kernel.h
 create mode 100644 include/grub/mips/qemu-mipssim/machine.h
 create mode 100644 include/grub/mips/qemu-mipssim/memory.h
 create mode 100644 include/grub/mips/qemu-mipssim/time.h
 create mode 100644 kern/mips/qemu-mipssim/init.c
 create mode 100644 kern/mips/qemu-mipssim/startup.S

diff --git a/conf/mips-qemu-mipssim.rmk b/conf/mips-qemu-mipssim.rmk
new file mode 100644
index 000000000..9000ae296
--- /dev/null
+++ b/conf/mips-qemu-mipssim.rmk
@@ -0,0 +1,4 @@
+# -*- makefile -*-
+LINK_BASE = 0x80010000
+target_machine=qemu-mipssim
+include $(srcdir)/conf/mips.mk
diff --git a/conf/mips.rmk b/conf/mips.rmk
index d03b5d8f5..6ebd7d665 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -84,7 +84,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c 	\
 
 grub_emu_LDFLAGS = $(LIBCURSES)
 
-kernel_img_SOURCES = kern/mips/qemu-r4k/startup.S \
+kernel_img_SOURCES = kern/$(target_cpu)/$(target_machine)/startup.S \
 	kern/main.c kern/device.c kern/$(target_cpu)/$(target_machine)/init.c 		\
 	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c 		\
 	kern/misc.c kern/mm.c kern/reader.c kern/term.c 	\
@@ -128,4 +128,16 @@ serial_mod_SOURCES = term/serial.c
 serial_mod_CFLAGS = $(COMMON_CFLAGS)
 serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For ata.mod.
+pkglib_MODULES += ata.mod
+ata_mod_SOURCES = disk/ata.c
+ata_mod_CFLAGS = $(COMMON_CFLAGS)
+ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For pci.mod.
+pkglib_MODULES += pci.mod
+pci_mod_SOURCES = bus/pci.c
+pci_mod_CFLAGS = $(COMMON_CFLAGS)
+pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 include $(srcdir)/conf/common.mk
diff --git a/configure.ac b/configure.ac
index 97486e421..98750280e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,6 +91,8 @@ case "$target_cpu"-"$platform" in
   sparc64-ieee1275) ;;
   mipsel-qemu-r4k) ;;
   mips-qemu-r4k) ;;
+  mipsel-qemu-mipssim) ;;
+  mips-qemu-mipssim) ;;
   *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
 esac
 
diff --git a/disk/ata.c b/disk/ata.c
index 78d396526..b8ce88df3 100644
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -24,10 +24,11 @@
 #include <grub/time.h>
 #include <grub/pci.h>
 #include <grub/scsi.h>
+#include <grub/machine/machine.h>
 
 /* At the moment, only two IDE ports are supported.  */
-static const int grub_ata_ioaddress[] = { 0x1f0, 0x170 };
-static const int grub_ata_ioaddress2[] = { 0x3f6, 0x376 };
+static const grub_port_t grub_ata_ioaddress[] = { 0x1f0, 0x170 };
+static const grub_port_t grub_ata_ioaddress2[] = { 0x3f6, 0x376 };
 
 static struct grub_ata_device *grub_ata_devices;
 
diff --git a/include/grub/ata.h b/include/grub/ata.h
index aaa2e147a..940e67102 100644
--- a/include/grub/ata.h
+++ b/include/grub/ata.h
@@ -98,8 +98,8 @@ struct grub_ata_device
 
   /* IO addresses on which the registers for this device can be
      found.  */
-  int ioaddress;
-  int ioaddress2;
+  grub_port_t ioaddress;
+  grub_port_t ioaddress2;
 
   /* Two devices can be connected to a single cable.  Use this field
      to select device 0 (commonly known as "master") or device 1
diff --git a/include/grub/mips/libgcc.h b/include/grub/mips/libgcc.h
index a65842522..a04a8f140 100644
--- a/include/grub/mips/libgcc.h
+++ b/include/grub/mips/libgcc.h
@@ -16,11 +16,10 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-void *EXPORT_FUNC (memset) (void *s, int c, int n) __attribute__ ((weak));
-void EXPORT_FUNC (__ashldi3) (void) __attribute__ ((weak));
-void EXPORT_FUNC (__ashrdi3) (void) __attribute__ ((weak));
-void EXPORT_FUNC (__lshrdi3) (void) __attribute__ ((weak));
-void EXPORT_FUNC (__trampoline_setup) (void) __attribute__ ((weak));
-void EXPORT_FUNC (__ucmpdi2) (void) __attribute__ ((weak));
-void EXPORT_FUNC (__bswapsi2) (void) __attribute__ ((weak));
-void EXPORT_FUNC (__bswapdi2) (void) __attribute__ ((weak));
+void *EXPORT_FUNC (memset) (void *s, int c, int n);
+void EXPORT_FUNC (__ashldi3) (void);
+void EXPORT_FUNC (__ashrdi3) (void);
+void EXPORT_FUNC (__lshrdi3) (void);
+void EXPORT_FUNC (__ucmpdi2) (void);
+void EXPORT_FUNC (__bswapsi2) (void);
+void EXPORT_FUNC (__bswapdi2) (void);
diff --git a/include/grub/mips/pci.h b/include/grub/mips/pci.h
new file mode 100644
index 000000000..38a95a467
--- /dev/null
+++ b/include/grub/mips/pci.h
@@ -0,0 +1,70 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/>.
+ */
+
+#ifndef	GRUB_CPU_PCI_H
+#define	GRUB_CPU_PCI_H	1
+
+#include <grub/types.h>
+#include <grub/cpu/io.h>
+
+#define GRUB_PCI_ADDR_REG	0x14000cf8
+#define GRUB_PCI_DATA_REG	0x14000cfc
+
+static inline grub_uint32_t
+grub_pci_read (grub_pci_address_t addr)
+{
+  grub_outl (addr, GRUB_PCI_ADDR_REG);
+  return grub_inl (GRUB_PCI_DATA_REG);
+}
+
+static inline grub_uint16_t
+grub_pci_read_word (grub_pci_address_t addr)
+{
+  grub_outl (addr & ~3, GRUB_PCI_ADDR_REG);
+  return grub_inw (GRUB_PCI_DATA_REG + (addr & 3));
+}
+
+static inline grub_uint8_t
+grub_pci_read_byte (grub_pci_address_t addr)
+{
+  grub_outl (addr & ~3, GRUB_PCI_ADDR_REG);
+  return grub_inb (GRUB_PCI_DATA_REG + (addr & 3));
+}
+
+static inline void
+grub_pci_write (grub_pci_address_t addr, grub_uint32_t data)
+{
+  grub_outl (addr, GRUB_PCI_ADDR_REG);
+  grub_outl (data, GRUB_PCI_DATA_REG);
+}
+
+static inline void
+grub_pci_write_word (grub_pci_address_t addr, grub_uint16_t data)
+{
+  grub_outl (addr & ~3, GRUB_PCI_ADDR_REG);
+  grub_outw (data, GRUB_PCI_DATA_REG + (addr & 3));
+}
+
+static inline void
+grub_pci_write_byte (grub_pci_address_t addr, grub_uint8_t data)
+{
+  grub_outl (addr & ~3, GRUB_PCI_ADDR_REG);
+  grub_outb (data, GRUB_PCI_DATA_REG + (addr & 3));
+}
+
+#endif /* GRUB_CPU_PCI_H */
diff --git a/include/grub/mips/qemu-mipssim/kernel.h b/include/grub/mips/qemu-mipssim/kernel.h
new file mode 100644
index 000000000..6a10f2df1
--- /dev/null
+++ b/include/grub/mips/qemu-mipssim/kernel.h
@@ -0,0 +1,35 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2005,2006,2007,2008,2009  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/>.
+ */
+
+#ifndef GRUB_KERNEL_MACHINE_HEADER
+#define GRUB_KERNEL_MACHINE_HEADER	1
+
+#include <grub/symbol.h>
+
+#ifndef ASM_FILE
+
+void EXPORT_FUNC (grub_reboot) (void);
+void EXPORT_FUNC (grub_halt) (void);
+
+/* The prefix which points to the directory where GRUB modules and its
+   configuration file are located.  */
+extern char grub_prefix[];
+
+#endif
+
+#endif /* ! GRUB_KERNEL_MACHINE_HEADER */
diff --git a/include/grub/mips/qemu-mipssim/machine.h b/include/grub/mips/qemu-mipssim/machine.h
new file mode 100644
index 000000000..9062662bc
--- /dev/null
+++ b/include/grub/mips/qemu-mipssim/machine.h
@@ -0,0 +1,24 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2007  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/>.
+ */
+
+#ifndef GRUB_MACHINE_MACHINE_HEADER
+#define GRUB_MACHINE_MACHINE_HEADER	1
+
+#define GRUB_MACHINE_MIPS_QEMU_MIPSSIM	1
+
+#endif /* ! GRUB_MACHINE_MACHINE_HEADER */
diff --git a/include/grub/mips/qemu-mipssim/memory.h b/include/grub/mips/qemu-mipssim/memory.h
new file mode 100644
index 000000000..87e68674e
--- /dev/null
+++ b/include/grub/mips/qemu-mipssim/memory.h
@@ -0,0 +1,54 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009 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/>.
+ */
+
+#ifndef GRUB_MEMORY_MACHINE_HEADER
+#define GRUB_MEMORY_MACHINE_HEADER	1
+
+#ifndef ASM_FILE
+#include <grub/symbol.h>
+#include <grub/err.h>
+#include <grub/types.h>
+#endif
+
+#define GRUB_MACHINE_MEMORY_STACK_HIGH       0x80f00000
+#define GRUB_MACHINE_MEMORY_USABLE       0x81000000
+
+#define GRUB_MACHINE_MEMORY_AVAILABLE        1
+
+#ifndef ASM_FILE
+grub_err_t EXPORT_FUNC (grub_machine_mmap_iterate)
+(int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
+grub_err_t EXPORT_FUNC(grub_machine_mmap_iterate)
+     (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
+
+static inline grub_err_t
+grub_machine_mmap_register (grub_uint64_t start __attribute__ ((unused)),
+			    grub_uint64_t size __attribute__ ((unused)),
+			    int type __attribute__ ((unused)),
+			    int handle __attribute__ ((unused)))
+{
+  return GRUB_ERR_NONE;
+}
+static inline grub_err_t
+grub_machine_mmap_unregister (int handle  __attribute__ ((unused)))
+{
+  return GRUB_ERR_NONE;
+}
+#endif
+
+#endif
diff --git a/include/grub/mips/qemu-mipssim/time.h b/include/grub/mips/qemu-mipssim/time.h
new file mode 100644
index 000000000..5c8564e0d
--- /dev/null
+++ b/include/grub/mips/qemu-mipssim/time.h
@@ -0,0 +1,35 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2003,2004,2005,2007  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/>.
+ */
+
+#ifndef KERNEL_MACHINE_TIME_HEADER
+#define KERNEL_MACHINE_TIME_HEADER	1
+
+#include <grub/symbol.h>
+
+#define GRUB_TICKS_PER_SECOND	1000
+
+/* Return the real time in ticks.  */
+grub_uint32_t EXPORT_FUNC (grub_get_rtc) (void);
+
+static inline void
+grub_cpu_idle(void)
+{
+  /*  asm volatile ("wait");*/
+}
+
+#endif /* ! KERNEL_MACHINE_TIME_HEADER */
diff --git a/include/grub/mips/qemu-r4k/machine.h b/include/grub/mips/qemu-r4k/machine.h
index 9bad5dca9..386cad750 100644
--- a/include/grub/mips/qemu-r4k/machine.h
+++ b/include/grub/mips/qemu-r4k/machine.h
@@ -19,6 +19,6 @@
 #ifndef GRUB_MACHINE_MACHINE_HEADER
 #define GRUB_MACHINE_MACHINE_HEADER	1
 
-#define GRUB_MACHINE_MIPS_QEMU	1
+#define GRUB_MACHINE_MIPS_QEMU_R4K	1
 
 #endif /* ! GRUB_MACHINE_MACHINE_HEADER */
diff --git a/kern/mips/qemu-mipssim/init.c b/kern/mips/qemu-mipssim/init.c
new file mode 100644
index 000000000..d4001cf1c
--- /dev/null
+++ b/kern/mips/qemu-mipssim/init.c
@@ -0,0 +1,76 @@
+#include <grub/kernel.h>
+#include <grub/misc.h>
+#include <grub/env.h>
+#include <grub/time.h>
+#include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/time.h>
+#include <grub/machine/kernel.h>
+#include <grub/machine/memory.h>
+#include <grub/cpu/kernel.h>
+
+#define RAMSIZE (64 << 20)
+
+grub_uint32_t
+grub_get_rtc (void)
+{
+  static int calln = 0;
+  return calln++;
+}
+
+void
+grub_machine_init (void)
+{
+  grub_mm_init_region ((void *) GRUB_MACHINE_MEMORY_USABLE,
+		       RAMSIZE - (GRUB_MACHINE_MEMORY_USABLE & 0x7fffffff));
+  grub_install_get_time_ms (grub_rtc_get_time_ms);
+}
+
+void
+grub_machine_fini (void)
+{
+}
+
+void
+grub_exit (void)
+{
+  while (1);
+}
+
+void
+grub_halt (void)
+{
+  while (1);
+}
+
+void
+grub_reboot (void)
+{
+  while (1);
+}
+
+void
+grub_machine_set_prefix (void)
+{
+  grub_env_set ("prefix", grub_prefix);
+}
+
+extern char _start[];
+extern char _end[];
+
+grub_addr_t
+grub_arch_modules_addr (void)
+{
+  return ALIGN_UP((grub_addr_t) _end + GRUB_MOD_GAP, GRUB_MOD_ALIGN);
+}
+
+grub_err_t 
+grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, 
+							 grub_uint64_t, 
+							 grub_uint32_t))
+{
+  hook (0, RAMSIZE,
+	GRUB_MACHINE_MEMORY_AVAILABLE);
+  return GRUB_ERR_NONE;
+}
diff --git a/kern/mips/qemu-mipssim/startup.S b/kern/mips/qemu-mipssim/startup.S
new file mode 100644
index 000000000..19de4779d
--- /dev/null
+++ b/kern/mips/qemu-mipssim/startup.S
@@ -0,0 +1,55 @@
+/* startup.S - Startup code for the MIPS.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/symbol.h>
+#include <grub/cpu/kernel.h>
+#include <grub/machine/memory.h>
+
+.extern __bss_start
+.extern _end
+	
+	.globl __start, _start, start
+__start:
+_start:
+start:	
+	b codestart
+	. = _start + GRUB_KERNEL_CPU_PREFIX
+
+VARIABLE(grub_prefix)
+	/* to be filled by grub-mkelfimage */
+
+	/*
+	 *  Leave some breathing room for the prefix.
+	 */
+
+	. = _start + GRUB_KERNEL_CPU_DATA_END
+codestart:
+	lui $t1, %hi(__bss_start)
+	addiu $t1, %lo(__bss_start)
+	lui $t2, %hi(_end)
+	addiu $t2, %lo(_end)
+
+bsscont:
+	sb $0,0($t1)
+	addiu $t1,$t1,1
+	sltu $t3,$t1,$t2
+	bne $3, $0, bsscont
+
+	li $sp, GRUB_MACHINE_MEMORY_STACK_HIGH
+	b grub_main
\ No newline at end of file
diff --git a/term/serial.c b/term/serial.c
index 4b6ac981d..30f8bb91a 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -67,7 +67,10 @@ static struct serial_port serial_settings;
 #ifdef GRUB_MACHINE_PCBIOS
 static const unsigned short *serial_hw_io_addr = (const unsigned short *) GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR;
 #define GRUB_SERIAL_PORT_NUM 4
-#elif defined (GRUB_MACHINE_MIPS_QEMU)
+#elif defined (GRUB_MACHINE_MIPS_QEMU_MIPSSIM)
+static const grub_port_t serial_hw_io_addr[] = { 0x1fd003f8 };
+#define GRUB_SERIAL_PORT_NUM (ARRAY_SIZE(serial_hw_io_addr))
+#elif defined (GRUB_MACHINE_MIPS_QEMU_R4K)
 static const grub_port_t serial_hw_io_addr[] = { 0x140003f8 };
 #define GRUB_SERIAL_PORT_NUM (ARRAY_SIZE(serial_hw_io_addr))
 #else

From 9ed5ff3f6f03a145d2698d9b521ebebb6c3f2f6c Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 11 Oct 2009 22:20:55 +0200
Subject: [PATCH 0021/1628] made relocator more portable

---
 lib/i386/relocator.c | 141 ++++++++++++-------------------------------
 lib/relocator.c      |  97 +++++++++++++++++++++++++++++
 2 files changed, 137 insertions(+), 101 deletions(-)
 create mode 100644 lib/relocator.c

diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index 3f0a40a27..84832eb02 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -54,112 +54,51 @@ extern grub_uint32_t grub_relocator32_backward_esp;
 
 #define RELOCATOR_SIZEOF(x)	(&grub_relocator32_##x##_end - &grub_relocator32_##x##_start)
 #define RELOCATOR_ALIGN 16
+#define PREFIX(x) grub_relocator32_ ## x
 
-void *
-grub_relocator32_alloc (grub_size_t size)
+static void
+write_relocator_bw (void *ptr, void *src, grub_uint32_t dest,
+		    grub_size_t size, struct grub_relocator32_state state)
 {
-  char *playground;
-
-  playground = grub_malloc ((RELOCATOR_SIZEOF (forward) + RELOCATOR_ALIGN)
-			    + size
-			    + (RELOCATOR_SIZEOF (backward) +
-			       RELOCATOR_ALIGN));
-  if (!playground)
-    return 0;
-
-  *(grub_size_t *) playground = size;
-
-  return playground + RELOCATOR_SIZEOF (forward);
-}
-
-void *
-grub_relocator32_realloc (void *relocator, grub_size_t size)
-{
-  char *playground;
-
-  playground = (char *) relocator - RELOCATOR_SIZEOF (forward);
-
-  playground = grub_realloc (playground,
-			     (RELOCATOR_SIZEOF (forward) + RELOCATOR_ALIGN)
-			     + size
-			     + (RELOCATOR_SIZEOF (backward) + RELOCATOR_ALIGN));
-  if (!playground)
-    return 0;
-
-  *(grub_size_t *) playground = size;
-
-  return playground + RELOCATOR_SIZEOF (forward);
-}
-
-void
-grub_relocator32_free (void *relocator)
-{
-  if (relocator)
-    grub_free ((char *) relocator - RELOCATOR_SIZEOF (forward));
-}
-
-
-grub_err_t
-grub_relocator32_boot (void *relocator, grub_uint32_t dest,
-		       struct grub_relocator32_state state)
-{
-  grub_size_t size;
-  char *playground;
   void (*entry) ();
 
-  playground = (char *) relocator - RELOCATOR_SIZEOF (forward);
-  size = *(grub_size_t *) playground;
+  grub_relocator32_backward_dest = dest;
+  grub_relocator32_backward_src = PTR_TO_UINT64 (src);
+  grub_relocator32_backward_size = size;
 
-  if (UINT_TO_PTR (dest) >= relocator)
-    {
-      int overhead;
+  grub_relocator32_backward_eax = state.eax;
+  grub_relocator32_backward_ebx = state.ebx;
+  grub_relocator32_backward_ecx = state.ecx;
+  grub_relocator32_backward_edx = state.edx;
+  grub_relocator32_backward_eip = state.eip;
+  grub_relocator32_backward_esp = state.esp;
 
-      overhead =
-	ALIGN_UP (dest - RELOCATOR_SIZEOF (backward) - RELOCATOR_ALIGN,
-		  RELOCATOR_ALIGN);
-      grub_relocator32_backward_dest = dest - overhead;
-      grub_relocator32_backward_src = PTR_TO_UINT64 (relocator - overhead);
-      grub_relocator32_backward_size = size + overhead;
-
-      grub_relocator32_backward_eax = state.eax;
-      grub_relocator32_backward_ebx = state.ebx;
-      grub_relocator32_backward_ecx = state.ecx;
-      grub_relocator32_backward_edx = state.edx;
-      grub_relocator32_backward_eip = state.eip;
-      grub_relocator32_backward_esp = state.esp;
-
-      grub_memmove (relocator - overhead,
-		    &grub_relocator32_backward_start,
-		    RELOCATOR_SIZEOF (backward));
-      entry = (void (*)()) (relocator - overhead);
-    }
-  else
-    {
-      int overhead;
-
-      overhead = ALIGN_UP (dest + size, RELOCATOR_ALIGN)
-	+ RELOCATOR_SIZEOF (forward) - (dest + size);
-
-      grub_relocator32_forward_dest = dest;
-      grub_relocator32_forward_src = PTR_TO_UINT64 (relocator);
-      grub_relocator32_forward_size = size + overhead;
-
-      grub_relocator32_forward_eax = state.eax;
-      grub_relocator32_forward_ebx = state.ebx;
-      grub_relocator32_forward_ecx = state.ecx;
-      grub_relocator32_forward_edx = state.edx;
-      grub_relocator32_forward_eip = state.eip;
-      grub_relocator32_forward_esp = state.esp;
-
-      grub_memmove (relocator + size + overhead - RELOCATOR_SIZEOF (forward),
-		    &grub_relocator32_forward_start,
-		    RELOCATOR_SIZEOF (forward));
-      entry =
-	(void (*)()) (relocator + size + overhead -
-		      RELOCATOR_SIZEOF (forward));
-    }
+  grub_memmove (ptr,
+		&grub_relocator32_backward_start,
+		RELOCATOR_SIZEOF (backward));
+  entry = (void (*)()) (ptr);
+  entry ();
+}
+
+static void
+write_relocator_bw (void *ptr, void *src, grub_uint32_t dest,
+		    grub_size_t size, struct grub_relocator32_state state)
+{
+
+  grub_relocator32_forward_dest = dest;
+  grub_relocator32_forward_src = PTR_TO_UINT64 (src);
+  grub_relocator32_forward_size = size;
+  
+  grub_relocator32_forward_eax = state.eax;
+  grub_relocator32_forward_ebx = state.ebx;
+  grub_relocator32_forward_ecx = state.ecx;
+  grub_relocator32_forward_edx = state.edx;
+  grub_relocator32_forward_eip = state.eip;
+  grub_relocator32_forward_esp = state.esp;
+  
+  grub_memmove (ptr,
+		&grub_relocator32_forward_start,
+		RELOCATOR_SIZEOF (forward));
+  entry = (void (*)()) ptr;
   entry ();
-
-  /* Not reached.  */
-  return GRUB_ERR_NONE;
 }
diff --git a/lib/relocator.c b/lib/relocator.c
new file mode 100644
index 000000000..750753b6d
--- /dev/null
+++ b/lib/relocator.c
@@ -0,0 +1,97 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/>.
+ */
+
+void *
+PREFIX (alloc) (grub_size_t size)
+{
+  char *playground;
+
+  playground = grub_malloc ((RELOCATOR_SIZEOF (forward) + RELOCATOR_ALIGN)
+			    + size
+			    + (RELOCATOR_SIZEOF (backward) +
+			       RELOCATOR_ALIGN));
+  if (!playground)
+    return 0;
+
+  *(grub_size_t *) playground = size;
+
+  return playground + RELOCATOR_SIZEOF (forward);
+}
+
+void *
+PREFIX (realloc) (void *relocator, grub_size_t size)
+{
+  char *playground;
+
+  playground = (char *) relocator - RELOCATOR_SIZEOF (forward);
+
+  playground = grub_realloc (playground,
+			     (RELOCATOR_SIZEOF (forward) + RELOCATOR_ALIGN)
+			     + size
+			     + (RELOCATOR_SIZEOF (backward) + RELOCATOR_ALIGN));
+  if (!playground)
+    return 0;
+
+  *(grub_size_t *) playground = size;
+
+  return playground + RELOCATOR_SIZEOF (forward);
+}
+
+void
+PREFIX(free) (void *relocator)
+{
+  if (relocator)
+    grub_free ((char *) relocator - RELOCATOR_SIZEOF (forward));
+}
+
+grub_err_t
+PREFIX (boot) (void *relocator, grub_uint32_t dest,
+	       struct grub_relocator32_state state)
+{
+  grub_size_t size;
+  char *playground;
+
+  playground = (char *) relocator - RELOCATOR_SIZEOF (forward);
+  size = *(grub_size_t *) playground;
+
+  if (UINT_TO_PTR (dest) >= relocator)
+    {
+      int overhead;
+      void *reldest = relocator - overhead;
+      overhead =
+	ALIGN_UP (dest - RELOCATOR_SIZEOF (backward) - RELOCATOR_ALIGN,
+		  RELOCATOR_ALIGN);
+      write_call_relocator_bw (relocator - overhead,
+			       relocator - overhead,
+			       dest - overhead, size + overhead, state);
+    }
+  else
+    {
+      int overhead;
+
+      overhead = ALIGN_UP (dest + size, RELOCATOR_ALIGN)
+	+ RELOCATOR_SIZEOF (forward) - (dest + size);
+
+      write_call_relocator_fw (relocator + size + overhead
+			       - RELOCATOR_SIZEOF (forward),
+			       relocator, dest, size + overhead, state);
+    }
+
+  /* Not reached.  */
+  return GRUB_ERR_NONE;
+}

From 023593d766e6b3a05bf7e7c5118640bba4a1c659 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 11 Oct 2009 23:00:22 +0200
Subject: [PATCH 0022/1628] relocator dor mips

---
 conf/mips.rmk                    |   7 +++
 include/grub/mips/relocator.h    |  39 ++++++++++++
 kern/mips/qemu-mipssim/startup.S |   2 +-
 lib/mips/relocator.c             | 102 +++++++++++++++++++++++++++++++
 lib/mips/relocator_asm.S         |  50 +++++++++++++++
 5 files changed, 199 insertions(+), 1 deletion(-)
 create mode 100644 include/grub/mips/relocator.h
 create mode 100644 lib/mips/relocator.c
 create mode 100644 lib/mips/relocator_asm.S

diff --git a/conf/mips.rmk b/conf/mips.rmk
index 6ebd7d665..46b74d68f 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -140,4 +140,11 @@ pci_mod_SOURCES = bus/pci.c
 pci_mod_CFLAGS = $(COMMON_CFLAGS)
 pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For relocator.mod.
+pkglib_MODULES += relocator.mod
+relocator_mod_SOURCES = lib/$(target_cpu)/relocator.c lib/$(target_cpu)/relocator_asm.S
+relocator_mod_CFLAGS = $(COMMON_CFLAGS)
+relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
+relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 include $(srcdir)/conf/common.mk
diff --git a/include/grub/mips/relocator.h b/include/grub/mips/relocator.h
new file mode 100644
index 000000000..838ef832f
--- /dev/null
+++ b/include/grub/mips/relocator.h
@@ -0,0 +1,39 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/>.
+ */
+
+#ifndef GRUB_RELOCATOR_CPU_HEADER
+#define GRUB_RELOCATOR_CPU_HEADER	1
+
+#include <grub/types.h>
+#include <grub/err.h>
+
+struct grub_relocator32_state
+{
+  /* gpr[0] is ignored since it's hardwired to 0.  */
+  grub_uint32_t gpr[32];
+  /* Register holding target $pc.  */
+  int jumpreg;
+};
+
+void *grub_relocator32_alloc (grub_size_t size);
+grub_err_t grub_relocator32_boot (void *relocator, grub_uint32_t dest,
+				  struct grub_relocator32_state state);
+void *grub_relocator32_realloc (void *relocator, grub_size_t size);
+void grub_relocator32_free (void *relocator);
+
+#endif /* ! GRUB_RELOCATOR_CPU_HEADER */
diff --git a/kern/mips/qemu-mipssim/startup.S b/kern/mips/qemu-mipssim/startup.S
index 19de4779d..36c5fabd7 100644
--- a/kern/mips/qemu-mipssim/startup.S
+++ b/kern/mips/qemu-mipssim/startup.S
@@ -49,7 +49,7 @@ bsscont:
 	sb $0,0($t1)
 	addiu $t1,$t1,1
 	sltu $t3,$t1,$t2
-	bne $3, $0, bsscont
+	bne $t3, $t0, bsscont
 
 	li $sp, GRUB_MACHINE_MEMORY_STACK_HIGH
 	b grub_main
\ No newline at end of file
diff --git a/lib/mips/relocator.c b/lib/mips/relocator.c
new file mode 100644
index 000000000..4ec7f6c08
--- /dev/null
+++ b/lib/mips/relocator.c
@@ -0,0 +1,102 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/mm.h>
+#include <grub/misc.h>
+
+#include <grub/types.h>
+#include <grub/types.h>
+#include <grub/err.h>
+
+#include <grub/mips/relocator.h>
+
+/* Remark: doesn't work with source outside of 4G.
+   Use relocator64 in this case. 
+ */
+
+extern grub_uint8_t grub_relocator32_forward_start;
+extern grub_uint8_t grub_relocator32_forward_end;
+extern grub_uint8_t grub_relocator32_backward_start;
+extern grub_uint8_t grub_relocator32_backward_end;
+
+#define REGW_SIZEOF (2 * sizeof (grub_uint32_t))
+#define JUMP_SIZEOF (sizeof (grub_uint32_t))
+
+#define RELOCATOR_SRC_SIZEOF(x) (&grub_relocator32_##x##_end \
+				 - &grub_relocator32_##x##_start)
+#define RELOCATOR_SIZEOF(x)	(RELOCATOR_SRC_SIZEOF(x) \
+				 + REGW_SIZEOF * (31 + 3) + JUMP_SIZEOF)
+#define RELOCATOR_ALIGN 16
+
+#define PREFIX(x) grub_relocator32_ ## x
+
+static void
+write_reg (int regn, grub_uint32_t val, void **target)
+{
+  /* lui $r, (val+0x8000).  */
+  *(grub_uint32_t *) *target = ((0x3c00 | regn) << 16) | ((val + 0x8000) >> 16);
+  *target = ((grub_uint32_t *) *target) + 1;
+  /* addiu $r, $r, val. */
+  *(grub_uint32_t *) *target = (((0x2400 | regn << 5 | regn) << 16)
+				| ((val + 0x8000) >> 16));
+  *target = ((grub_uint32_t *) *target) + 1;
+}
+
+static void
+write_jump (int regn, void **target)
+{
+  /* j $r.  */
+  *(grub_uint32_t *) *target = (regn<<21) | 0x8;
+  *target = ((grub_uint32_t *) *target) + 1;
+}
+
+static void
+write_call_relocator_bw (void *ptr0, void *src, grub_uint32_t dest,
+			 grub_size_t size, struct grub_relocator32_state state)
+{
+  void *ptr = ptr0;
+  int i;
+  write_reg (1, (grub_uint32_t) src, &ptr);
+  write_reg (2, dest, &ptr);
+  write_reg (3, size, &ptr);
+  grub_memcpy (ptr, &grub_relocator32_backward_start,
+	       RELOCATOR_SRC_SIZEOF (backward));
+  for (i = 1; i < 32; i++)
+    write_reg (i, state.gpr[i], &ptr);
+  write_jump (state.jumpreg, &ptr);
+  ((void (*) ())ptr0) ();
+}
+
+static void
+write_call_relocator_fw (void *ptr0, void *src, grub_uint32_t dest,
+			 grub_size_t size, struct grub_relocator32_state state)
+{
+  void *ptr = ptr0;
+  int i;
+  write_reg (1, (grub_uint32_t) src, &ptr);
+  write_reg (2, dest, &ptr);
+  write_reg (3, size, &ptr);
+  grub_memcpy (ptr, &grub_relocator32_forward_start,
+	       RELOCATOR_SRC_SIZEOF (forward));
+  for (i = 1; i < 32; i++)
+    write_reg (i, state.gpr[i], &ptr);
+  write_jump (state.jumpreg, &ptr);
+  ((void (*) ())ptr0) ();
+}
+
+#include "../relocator.c"
diff --git a/lib/mips/relocator_asm.S b/lib/mips/relocator_asm.S
new file mode 100644
index 000000000..607a46303
--- /dev/null
+++ b/lib/mips/relocator_asm.S
@@ -0,0 +1,50 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/symbol.h>
+
+#ifdef BACKWARD
+#define RELOCATOR_VARIABLE(x) VARIABLE(grub_relocator32_backward_ ## x)
+#else
+#define RELOCATOR_VARIABLE(x) VARIABLE(grub_relocator32_forward_ ## x)
+#endif
+	
+	.p2align	4	/* force 16-byte alignment */
+
+VARIABLE (grub_relocator32_forward_start)
+copycont1:	
+	lb $4,0($1)
+	sb $4,0($2)
+	addiu $3, $3, 0xffff
+	subu $4,$3,$0
+	bne $4, $0, copycont1
+VARIABLE (grub_relocator32_forward_end)
+
+VARIABLE (grub_relocator32_backward_start)
+	addu $2, $2, $3
+	addu $1, $1, $3
+	/* Backward movsl is implicitly off-by-one.  compensate that.  */
+	addiu $2, $2, 0xffff
+	addiu $1, $1, 0xffff
+copycont2:	
+	lb $4,0($1)
+	sb $4,0($2)
+	addiu $3, 0xffff
+	subu $4,$3,$0
+	bne $4, $0, copycont2
+VARIABLE (grub_relocator32_backward_end)

From b07c261cfc645565126fd017209bde492a492247 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 11 Oct 2009 23:00:40 +0200
Subject: [PATCH 0023/1628] fix warning

---
 lib/relocator.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index 750753b6d..622adc517 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -72,7 +72,6 @@ PREFIX (boot) (void *relocator, grub_uint32_t dest,
   if (UINT_TO_PTR (dest) >= relocator)
     {
       int overhead;
-      void *reldest = relocator - overhead;
       overhead =
 	ALIGN_UP (dest - RELOCATOR_SIZEOF (backward) - RELOCATOR_ALIGN,
 		  RELOCATOR_ALIGN);

From 141278b5e065eea1074a5818a8083a61dffa73bd Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Mon, 12 Oct 2009 11:23:08 +0200
Subject: [PATCH 0024/1628] fix

---
 lib/i386/relocator.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index 84832eb02..94cbfba72 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -57,11 +57,9 @@ extern grub_uint32_t grub_relocator32_backward_esp;
 #define PREFIX(x) grub_relocator32_ ## x
 
 static void
-write_relocator_bw (void *ptr, void *src, grub_uint32_t dest,
-		    grub_size_t size, struct grub_relocator32_state state)
+write_call_relocator_bw (void *ptr, void *src, grub_uint32_t dest,
+			 grub_size_t size, struct grub_relocator32_state state)
 {
-  void (*entry) ();
-
   grub_relocator32_backward_dest = dest;
   grub_relocator32_backward_src = PTR_TO_UINT64 (src);
   grub_relocator32_backward_size = size;
@@ -76,13 +74,12 @@ write_relocator_bw (void *ptr, void *src, grub_uint32_t dest,
   grub_memmove (ptr,
 		&grub_relocator32_backward_start,
 		RELOCATOR_SIZEOF (backward));
-  entry = (void (*)()) (ptr);
-  entry ();
+  ((void (*)()) ptr) ();
 }
 
 static void
-write_relocator_bw (void *ptr, void *src, grub_uint32_t dest,
-		    grub_size_t size, struct grub_relocator32_state state)
+write_call_relocator_fw (void *ptr, void *src, grub_uint32_t dest,
+			 grub_size_t size, struct grub_relocator32_state state)
 {
 
   grub_relocator32_forward_dest = dest;
@@ -99,6 +96,7 @@ write_relocator_bw (void *ptr, void *src, grub_uint32_t dest,
   grub_memmove (ptr,
 		&grub_relocator32_forward_start,
 		RELOCATOR_SIZEOF (forward));
-  entry = (void (*)()) ptr;
-  entry ();
+  ((void (*)()) ptr) ();
 }
+
+#include "../relocator.c"

From 81a642e8e2c6fc8f070651e1f9b10fb563b39018 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Fri, 16 Oct 2009 17:40:59 +0200
Subject: [PATCH 0025/1628] linux.c

---
 include/grub/elfload.h   |  4 ++--
 kern/elf.c               | 17 ++++++++++++++---
 lib/mips/relocator.c     | 12 ++++++------
 lib/mips/relocator_asm.S | 26 +++++++++++++-------------
 4 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/include/grub/elfload.h b/include/grub/elfload.h
index 6e09e0d05..77ee41675 100644
--- a/include/grub/elfload.h
+++ b/include/grub/elfload.h
@@ -46,12 +46,12 @@ grub_elf_t grub_elf_file (grub_file_t);
 grub_err_t grub_elf_close (grub_elf_t);
 
 int grub_elf_is_elf32 (grub_elf_t);
-grub_size_t grub_elf32_size (grub_elf_t);
+grub_size_t grub_elf32_size (grub_elf_t, Elf32_Addr *);
 grub_err_t grub_elf32_load (grub_elf_t, grub_elf32_load_hook_t, grub_addr_t *,
 			    grub_size_t *);
 
 int grub_elf_is_elf64 (grub_elf_t);
-grub_size_t grub_elf64_size (grub_elf_t);
+grub_size_t grub_elf64_size (grub_elf_t, Elf64_Addr *);
 grub_err_t grub_elf64_load (grub_elf_t, grub_elf64_load_hook_t, grub_addr_t *,
 			    grub_size_t *);
 
diff --git a/kern/elf.c b/kern/elf.c
index f14161060..1e51839a0 100644
--- a/kern/elf.c
+++ b/kern/elf.c
@@ -172,7 +172,7 @@ grub_elf32_phdr_iterate (grub_elf_t elf,
 
 /* Calculate the amount of memory spanned by the segments.  */
 grub_size_t
-grub_elf32_size (grub_elf_t elf)
+grub_elf32_size (grub_elf_t elf, Elf32_Addr *base)
 {
   Elf32_Addr segments_start = (Elf32_Addr) -1;
   Elf32_Addr segments_end = 0;
@@ -196,6 +196,9 @@ grub_elf32_size (grub_elf_t elf)
 
   grub_elf32_phdr_iterate (elf, calcsize, 0);
 
+  if (base)
+    *base = 0;
+
   if (nr_phdrs == 0)
     {
       grub_error (GRUB_ERR_BAD_OS, "No program headers present");
@@ -209,10 +212,12 @@ grub_elf32_size (grub_elf_t elf)
       return 0;
     }
 
+  if (base)
+    *base = segments_start;
+
   return segments_end - segments_start;
 }
 
-
 /* Load every loadable segment into memory specified by `_load_hook'.  */
 grub_err_t
 grub_elf32_load (grub_elf_t _elf, grub_elf32_load_hook_t _load_hook,
@@ -351,7 +356,7 @@ grub_elf64_phdr_iterate (grub_elf_t elf,
 
 /* Calculate the amount of memory spanned by the segments.  */
 grub_size_t
-grub_elf64_size (grub_elf_t elf)
+grub_elf64_size (grub_elf_t elf, Elf64_Addr *base)
 {
   Elf64_Addr segments_start = (Elf64_Addr) -1;
   Elf64_Addr segments_end = 0;
@@ -375,6 +380,9 @@ grub_elf64_size (grub_elf_t elf)
 
   grub_elf64_phdr_iterate (elf, calcsize, 0);
 
+  if (base)
+    *base = 0;
+
   if (nr_phdrs == 0)
     {
       grub_error (GRUB_ERR_BAD_OS, "No program headers present");
@@ -388,6 +396,9 @@ grub_elf64_size (grub_elf_t elf)
       return 0;
     }
 
+  if (base)
+    *base = segments_start;
+
   return segments_end - segments_start;
 }
 
diff --git a/lib/mips/relocator.c b/lib/mips/relocator.c
index 4ec7f6c08..91e66893a 100644
--- a/lib/mips/relocator.c
+++ b/lib/mips/relocator.c
@@ -71,9 +71,9 @@ write_call_relocator_bw (void *ptr0, void *src, grub_uint32_t dest,
 {
   void *ptr = ptr0;
   int i;
-  write_reg (1, (grub_uint32_t) src, &ptr);
-  write_reg (2, dest, &ptr);
-  write_reg (3, size, &ptr);
+  write_reg (2, (grub_uint32_t) src, &ptr);
+  write_reg (3, dest, &ptr);
+  write_reg (4, size, &ptr);
   grub_memcpy (ptr, &grub_relocator32_backward_start,
 	       RELOCATOR_SRC_SIZEOF (backward));
   for (i = 1; i < 32; i++)
@@ -88,9 +88,9 @@ write_call_relocator_fw (void *ptr0, void *src, grub_uint32_t dest,
 {
   void *ptr = ptr0;
   int i;
-  write_reg (1, (grub_uint32_t) src, &ptr);
-  write_reg (2, dest, &ptr);
-  write_reg (3, size, &ptr);
+  write_reg (2, (grub_uint32_t) src, &ptr);
+  write_reg (3, dest, &ptr);
+  write_reg (4, size, &ptr);
   grub_memcpy (ptr, &grub_relocator32_forward_start,
 	       RELOCATOR_SRC_SIZEOF (forward));
   for (i = 1; i < 32; i++)
diff --git a/lib/mips/relocator_asm.S b/lib/mips/relocator_asm.S
index 607a46303..24541e2d0 100644
--- a/lib/mips/relocator_asm.S
+++ b/lib/mips/relocator_asm.S
@@ -28,23 +28,23 @@
 
 VARIABLE (grub_relocator32_forward_start)
 copycont1:	
-	lb $4,0($1)
-	sb $4,0($2)
-	addiu $3, $3, 0xffff
-	subu $4,$3,$0
-	bne $4, $0, copycont1
+	lb $5,0($2)
+	sb $5,0($3)
+	addiu $4, $4, 0xffff
+	subu $5,$4,$0
+	bne $5, $0, copycont1
 VARIABLE (grub_relocator32_forward_end)
 
 VARIABLE (grub_relocator32_backward_start)
-	addu $2, $2, $3
-	addu $1, $1, $3
+	addu $3, $3, $4
+	addu $2, $2, $4
 	/* Backward movsl is implicitly off-by-one.  compensate that.  */
+	addiu $3, $3, 0xffff
 	addiu $2, $2, 0xffff
-	addiu $1, $1, 0xffff
 copycont2:	
-	lb $4,0($1)
-	sb $4,0($2)
-	addiu $3, 0xffff
-	subu $4,$3,$0
-	bne $4, $0, copycont2
+	lb $5,0($2)
+	sb $5,0($3)
+	addiu $4, 0xffff
+	subu $5,$4,$0
+	bne $5, $0, copycont2
 VARIABLE (grub_relocator32_backward_end)

From ea818634b5c283698b28eb03c76c602a0048e4fd Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Fri, 16 Oct 2009 18:13:18 +0200
Subject: [PATCH 0026/1628] actual file

---
 loader/mips/linux.c | 317 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 317 insertions(+)
 create mode 100644 loader/mips/linux.c

diff --git a/loader/mips/linux.c b/loader/mips/linux.c
new file mode 100644
index 000000000..6b94304a5
--- /dev/null
+++ b/loader/mips/linux.c
@@ -0,0 +1,317 @@
+/* linux.c - boot Linux */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2003, 2004, 2005, 2007, 2009  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/elf.h>
+#include <grub/elfload.h>
+#include <grub/loader.h>
+#include <grub/dl.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/machine/loader.h>
+#include <grub/command.h>
+#include <grub/mips/relocator.h>
+
+#define ELF32_LOADMASK (0x00000000UL)
+#define ELF64_LOADMASK (0x0000000000000000ULL)
+
+static grub_dl_t my_mod;
+
+static int loaded;
+
+static grub_size_t initrd_size;
+static grub_size_t linux_size;
+
+static char *linux_args;
+
+static grub_uint8_t *playground;
+static grub_addr_t target_addr, entry_addr, initrd_addr, args_addr;
+
+static grub_err_t
+grub_linux_boot (void)
+{
+  grub_ssize_t actual;
+  struct grub_relocator32_state state;
+
+  /* Boot the kernel.  */
+  state.gpr[1] = entry_addr;
+  state.jumpreg = 1;
+  grub_relocator32_boot (playground, target_addr, state);
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_linux_release_mem (void)
+{
+  grub_relocator32_free (playground);
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_linux_unload (void)
+{
+  grub_err_t err;
+
+  err = grub_linux_release_mem ();
+  grub_dl_unref (my_mod);
+
+  loaded = 0;
+
+  return err;
+}
+
+static grub_err_t
+grub_linux_load32 (grub_elf_t elf, char *args)
+{
+  Elf32_Addr base;
+  int found_addr = 0;
+  int argsoff;
+
+  /* Linux's entry point incorrectly contains a virtual address.  */
+  entry_addr = elf->ehdr.ehdr32.e_entry & ~ELF32_LOADMASK;
+
+  linux_size = grub_elf32_size (elf, &base);
+  if (linux_size == 0)
+    return grub_errno;
+  target_addr = base;
+  /* Pad it; the kernel scribbles over memory beyond its load address.  */
+  linux_size += 0x100000;
+  argsoff = linux_size;
+  args_addr = target_addr + argsoff;
+  linux_size += grub_strlen (args) + 1;
+
+  playground = grub_relocator32_alloc (linux_size);
+  if (!playground)
+    return grub_errno;
+
+  grub_memcpy (playground + argsoff, args, grub_strlen (args) + 1);
+
+  /* Now load the segments into the area we claimed.  */
+  auto grub_err_t offset_phdr (Elf32_Phdr *phdr, grub_addr_t *addr, int *do_load);
+  grub_err_t offset_phdr (Elf32_Phdr *phdr, grub_addr_t *addr, int *do_load)
+    {
+      if (phdr->p_type != PT_LOAD)
+	{
+	  *do_load = 0;
+	  return 0;
+	}
+      *do_load = 1;
+
+      /* Linux's program headers incorrectly contain virtual addresses.
+       * Translate those to physical, and offset to the area we claimed.  */
+      *addr = phdr->p_paddr - base + playground;
+      return 0;
+    }
+  return grub_elf32_load (elf, offset_phdr, 0, 0);
+}
+
+static grub_err_t
+grub_linux_load64 (grub_elf_t elf)
+{
+  Elf64_Addr base;
+  int found_addr = 0;
+  int argsoff;
+
+  /* Linux's entry point incorrectly contains a virtual address.  */
+  entry_addr = elf->ehdr.ehdr64.e_entry & ~ELF64_LOADMASK;
+
+  linux_size = grub_elf64_size (elf, &base);
+  if (linux_size == 0)
+    return grub_errno;
+  target_addr = base;
+  /* Pad it; the kernel scribbles over memory beyond its load address.  */
+  linux_size += 0x100000;
+  argsoff = linux_size;
+  args_addr = target_addr + argsoff;
+  linux_size += grub_strlen (args) + 1;
+
+  playground = grub_relocator32_alloc (linux_size);
+  if (!playground)
+    return grub_errno;
+
+  grub_memcpy (playground + argsoff, args, grub_strlen (args) + 1);
+
+  /* Now load the segments into the area we claimed.  */
+  auto grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load);
+  grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load)
+    {
+      if (phdr->p_type != PT_LOAD)
+	{
+	  *do_load = 0;
+	  return 0;
+	}
+      *do_load = 1;
+      /* Linux's program headers incorrectly contain virtual addresses.
+       * Translate those to physical, and offset to the area we claimed.  */
+      *addr = phdr->p_paddr - base + playground;
+      return 0;
+    }
+  return grub_elf64_load (elf, offset_phdr, 0, 0);
+}
+
+static grub_err_t
+grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
+		int argc, char *argv[])
+{
+  grub_elf_t elf = 0;
+  int i;
+  int size;
+  char *dest;
+
+  grub_dl_ref (my_mod);
+
+  if (argc == 0)
+    {
+      grub_error (GRUB_ERR_BAD_ARGUMENT, "no kernel specified");
+      goto out;
+    }
+
+  elf = grub_elf_open (argv[0]);
+  if (! elf)
+    goto out;
+
+  if (elf->ehdr.ehdr32.e_type != ET_EXEC)
+    {
+      grub_error (GRUB_ERR_UNKNOWN_OS,
+		  "This ELF file is not of the right type\n");
+      goto out;
+    }
+
+  /* Release the previously used memory.  */
+  grub_loader_unset ();
+
+  size = sizeof ("BOOT_IMAGE=") + grub_strlen (argv[0]);
+  for (i = 0; i < argc; i++)
+    size += grub_strlen (argv[i]) + 1;
+
+  linux_args = grub_malloc (size);
+  if (! linux_args)
+    goto out;
+
+  /* Specify the boot file.  */
+  dest = grub_stpcpy (linux_args, "BOOT_IMAGE=");
+  dest = grub_stpcpy (dest, argv[0]);
+
+  for (i = 1; i < argc; i++)
+    {
+      *dest++ = ' ';
+      dest = grub_stpcpy (dest, argv[i]);
+    }
+
+  if (grub_elf_is_elf32 (elf))
+    grub_linux_load32 (elf, linux_args);
+  else
+  if (grub_elf_is_elf64 (elf))
+    grub_linux_load64 (elf, linux_args);
+  else
+    {
+      grub_error (GRUB_ERR_BAD_FILE_TYPE, "Unknown ELF class");
+      goto out;
+    }
+
+out:
+
+  if (elf)
+    grub_elf_close (elf);
+
+  if (grub_errno != GRUB_ERR_NONE)
+    {
+      grub_linux_release_mem ();
+      grub_dl_unref (my_mod);
+      loaded = 0;
+    }
+  else
+    {
+      grub_loader_set (grub_linux_boot, grub_linux_unload, 1);
+      initrd_addr = 0;
+      loaded = 1;
+    }
+
+  return grub_errno;
+}
+
+static grub_err_t
+grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
+		 int argc, char *argv[])
+{
+  grub_file_t file = 0;
+  grub_ssize_t size;
+  grub_addr_t addr;
+  int found_addr = 0;
+
+  if (argc == 0)
+    {
+      grub_error (GRUB_ERR_BAD_ARGUMENT, "no initrd specified");
+      goto fail;
+    }
+
+  if (!loaded)
+    {
+      grub_error (GRUB_ERR_BAD_ARGUMENT, "You need to load the kernel first.");
+      goto fail;
+    }
+
+  file = grub_file_open (argv[0]);
+  if (! file)
+    return grub_errno;
+
+  size = grub_file_size (file);
+
+  playground = grub_relocator32_realloc (playground, linux_size + size);
+  if (!playground)
+    {
+      grub_file_close (file);
+      return grub_errno;
+    }
+
+  grub_dprintf ("loader", "Loading initrd at 0x%x, size 0x%x\n", addr, size);
+
+  if (grub_file_read (file, playground + linux_size, size) != size)
+    {
+      grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file");
+      grub_file_close (file);
+
+      return grub_errno;
+    }
+
+  initrd_addr = target_addr + linux_size;
+  initrd_size = size;
+
+  grub_file_close (file);
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_command_t cmd_linux, cmd_initrd;
+
+GRUB_MOD_INIT(linux)
+{
+  cmd_linux = grub_register_command ("linux", grub_cmd_linux,
+				     0, "load a linux kernel");
+  cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
+				      0, "load an initrd");
+  my_mod = mod;
+}
+
+GRUB_MOD_FINI(linux)
+{
+  grub_unregister_command (cmd_linux);
+  grub_unregister_command (cmd_initrd);
+}

From a45337b5d7bf769b9e1533b349ed597932b90126 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 17 Oct 2009 12:18:39 +0200
Subject: [PATCH 0027/1628] first linux boot

---
 conf/mips.rmk            |  6 ++++++
 lib/mips/relocator.c     |  8 +++++---
 lib/mips/relocator_asm.S |  4 ++++
 loader/mips/linux.c      | 20 +++++---------------
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/conf/mips.rmk b/conf/mips.rmk
index 46b74d68f..9920f6878 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -147,4 +147,10 @@ relocator_mod_CFLAGS = $(COMMON_CFLAGS)
 relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
 relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += linux.mod
+linux_mod_SOURCES = loader/$(target_cpu)/linux.c
+linux_mod_CFLAGS = $(COMMON_CFLAGS)
+linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
+linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 include $(srcdir)/conf/common.mk
diff --git a/lib/mips/relocator.c b/lib/mips/relocator.c
index 91e66893a..cc9d23f39 100644
--- a/lib/mips/relocator.c
+++ b/lib/mips/relocator.c
@@ -53,7 +53,7 @@ write_reg (int regn, grub_uint32_t val, void **target)
   *target = ((grub_uint32_t *) *target) + 1;
   /* addiu $r, $r, val. */
   *(grub_uint32_t *) *target = (((0x2400 | regn << 5 | regn) << 16)
-				| ((val + 0x8000) >> 16));
+				| (val & 0xffff));
   *target = ((grub_uint32_t *) *target) + 1;
 }
 
@@ -76,10 +76,11 @@ write_call_relocator_bw (void *ptr0, void *src, grub_uint32_t dest,
   write_reg (4, size, &ptr);
   grub_memcpy (ptr, &grub_relocator32_backward_start,
 	       RELOCATOR_SRC_SIZEOF (backward));
+  ptr = (grub_uint8_t *) ptr + RELOCATOR_SRC_SIZEOF (backward);
   for (i = 1; i < 32; i++)
     write_reg (i, state.gpr[i], &ptr);
   write_jump (state.jumpreg, &ptr);
-  ((void (*) ())ptr0) ();
+  ((void (*) ()) ptr0) ();
 }
 
 static void
@@ -93,10 +94,11 @@ write_call_relocator_fw (void *ptr0, void *src, grub_uint32_t dest,
   write_reg (4, size, &ptr);
   grub_memcpy (ptr, &grub_relocator32_forward_start,
 	       RELOCATOR_SRC_SIZEOF (forward));
+  ptr = (grub_uint8_t *) ptr + RELOCATOR_SRC_SIZEOF (forward);
   for (i = 1; i < 32; i++)
     write_reg (i, state.gpr[i], &ptr);
   write_jump (state.jumpreg, &ptr);
-  ((void (*) ())ptr0) ();
+  ((void (*) ()) ptr0) ();
 }
 
 #include "../relocator.c"
diff --git a/lib/mips/relocator_asm.S b/lib/mips/relocator_asm.S
index 24541e2d0..8dea8a4e3 100644
--- a/lib/mips/relocator_asm.S
+++ b/lib/mips/relocator_asm.S
@@ -30,6 +30,8 @@ VARIABLE (grub_relocator32_forward_start)
 copycont1:	
 	lb $5,0($2)
 	sb $5,0($3)
+	addiu $2, $2, 0x1
+	addiu $3, $3, 0x1
 	addiu $4, $4, 0xffff
 	subu $5,$4,$0
 	bne $5, $0, copycont1
@@ -44,6 +46,8 @@ VARIABLE (grub_relocator32_backward_start)
 copycont2:	
 	lb $5,0($2)
 	sb $5,0($3)
+	addiu $2, $2, 0xffff
+	addiu $3, $3, 0xffff
 	addiu $4, 0xffff
 	subu $5,$4,$0
 	bne $5, $0, copycont2
diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index 6b94304a5..03e489bf7 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -45,7 +45,6 @@ static grub_addr_t target_addr, entry_addr, initrd_addr, args_addr;
 static grub_err_t
 grub_linux_boot (void)
 {
-  grub_ssize_t actual;
   struct grub_relocator32_state state;
 
   /* Boot the kernel.  */
@@ -81,7 +80,6 @@ static grub_err_t
 grub_linux_load32 (grub_elf_t elf, char *args)
 {
   Elf32_Addr base;
-  int found_addr = 0;
   int argsoff;
 
   /* Linux's entry point incorrectly contains a virtual address.  */
@@ -116,17 +114,16 @@ grub_linux_load32 (grub_elf_t elf, char *args)
 
       /* Linux's program headers incorrectly contain virtual addresses.
        * Translate those to physical, and offset to the area we claimed.  */
-      *addr = phdr->p_paddr - base + playground;
+      *addr = (grub_addr_t) (phdr->p_paddr - base + playground);
       return 0;
     }
   return grub_elf32_load (elf, offset_phdr, 0, 0);
 }
 
 static grub_err_t
-grub_linux_load64 (grub_elf_t elf)
+grub_linux_load64 (grub_elf_t elf, char *args)
 {
   Elf64_Addr base;
-  int found_addr = 0;
   int argsoff;
 
   /* Linux's entry point incorrectly contains a virtual address.  */
@@ -160,7 +157,7 @@ grub_linux_load64 (grub_elf_t elf)
       *do_load = 1;
       /* Linux's program headers incorrectly contain virtual addresses.
        * Translate those to physical, and offset to the area we claimed.  */
-      *addr = phdr->p_paddr - base + playground;
+      *addr = (grub_addr_t) (phdr->p_paddr - base + playground);
       return 0;
     }
   return grub_elf64_load (elf, offset_phdr, 0, 0);
@@ -254,19 +251,12 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   grub_file_t file = 0;
   grub_ssize_t size;
   grub_addr_t addr;
-  int found_addr = 0;
 
   if (argc == 0)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "no initrd specified");
-      goto fail;
-    }
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no initrd specified");
 
   if (!loaded)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "You need to load the kernel first.");
-      goto fail;
-    }
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "You need to load the kernel first.");
 
   file = grub_file_open (argv[0]);
   if (! file)

From fdb3c3acb095033527ca5c4d337857d559e15283 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 18 Oct 2009 00:22:15 +0200
Subject: [PATCH 0028/1628] simplify mipsel handling

---
 configure.ac              | 4 ----
 include/grub/mips/types.h | 6 ++----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 98750280e..f0aeb1aa8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,12 +100,8 @@ case "$target_cpu" in
   i386 | powerpc) target_m32=1 ;;
   x86_64 | sparc64) target_m64=1 ;;
   mipsel) 
-    TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPSEL=1"; 
-    CFLAGS="$CFLAGS -DGRUB_CPU_MIPSEL=1";
     target_cpu=mips ;;
   mips) 
-    TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPS=1"; 
-    CFLAGS="$CFLAGS -DGRUB_CPU_MIPS=1";
     target_cpu=mips ;;
 esac
 
diff --git a/include/grub/mips/types.h b/include/grub/mips/types.h
index fe09afa3e..aed597451 100644
--- a/include/grub/mips/types.h
+++ b/include/grub/mips/types.h
@@ -25,14 +25,12 @@
 /* The size of long.  */
 #define GRUB_TARGET_SIZEOF_LONG		4
 
-#ifdef GRUB_CPU_MIPSEL
+#ifdef __MIPSEL__
 /* mipsEL is little-endian.  */
 #undef GRUB_TARGET_WORDS_BIGENDIAN
-#elif defined (GRUB_CPU_MIPS)
+#else
 /* mips is big-endian.  */
 #define GRUB_TARGET_WORDS_BIGENDIAN
-#elif !defined (GRUB_SYMBOL_GENERATOR)
-#error Neither GRUB_CPU_MIPS nor GRUB_CPU_MIPSEL is defined
 #endif
 
 #endif /* ! GRUB_TYPES_CPU_HEADER */

From be320b471f23cdde2be971dd68c80c59a43579f9 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 18 Oct 2009 00:23:00 +0200
Subject: [PATCH 0029/1628] cache handling

---
 kern/mips/cache.S        | 6 +++++-
 lib/mips/relocator_asm.S | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/kern/mips/cache.S b/kern/mips/cache.S
index f613f57f2..ec13a9b95 100644
--- a/kern/mips/cache.S
+++ b/kern/mips/cache.S
@@ -1,5 +1,9 @@
 #include <grub/symbol.h>
 
-FUNCTION (grub_arch_sync_caches)
+	/* FIXME: This should invalidate only part of memory.  */
 FUNCTION (grub_cpu_flush_cache)
+FUNCTION (grub_arch_sync_caches)
+#if __mips >= 2
+	sync
+#endif
 	j $31
diff --git a/lib/mips/relocator_asm.S b/lib/mips/relocator_asm.S
index 8dea8a4e3..5503b4032 100644
--- a/lib/mips/relocator_asm.S
+++ b/lib/mips/relocator_asm.S
@@ -35,6 +35,9 @@ copycont1:
 	addiu $4, $4, 0xffff
 	subu $5,$4,$0
 	bne $5, $0, copycont1
+#if __mips >= 2
+	sync
+#endif
 VARIABLE (grub_relocator32_forward_end)
 
 VARIABLE (grub_relocator32_backward_start)
@@ -51,4 +54,7 @@ copycont2:
 	addiu $4, 0xffff
 	subu $5,$4,$0
 	bne $5, $0, copycont2
+#if __mips >= 2
+	sync
+#endif
 VARIABLE (grub_relocator32_backward_end)

From 4c7f8ce16d571bc86f6deef5b9eb4533cec71387 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 18 Oct 2009 00:23:45 +0200
Subject: [PATCH 0030/1628] warning fixes

---
 lib/mips/relocator.c | 4 ++--
 loader/mips/linux.c  | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/mips/relocator.c b/lib/mips/relocator.c
index cc9d23f39..b0fb4b2a5 100644
--- a/lib/mips/relocator.c
+++ b/lib/mips/relocator.c
@@ -80,7 +80,7 @@ write_call_relocator_bw (void *ptr0, void *src, grub_uint32_t dest,
   for (i = 1; i < 32; i++)
     write_reg (i, state.gpr[i], &ptr);
   write_jump (state.jumpreg, &ptr);
-  ((void (*) ()) ptr0) ();
+  ((void (*) (void)) ptr0) ();
 }
 
 static void
@@ -98,7 +98,7 @@ write_call_relocator_fw (void *ptr0, void *src, grub_uint32_t dest,
   for (i = 1; i < 32; i++)
     write_reg (i, state.gpr[i], &ptr);
   write_jump (state.jumpreg, &ptr);
-  ((void (*) ()) ptr0) ();
+  ((void (*) (void)) ptr0) ();
 }
 
 #include "../relocator.c"
diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index 03e489bf7..3e526c699 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -250,7 +250,6 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
 {
   grub_file_t file = 0;
   grub_ssize_t size;
-  grub_addr_t addr;
 
   if (argc == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "no initrd specified");
@@ -271,8 +270,6 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
       return grub_errno;
     }
 
-  grub_dprintf ("loader", "Loading initrd at 0x%x, size 0x%x\n", addr, size);
-
   if (grub_file_read (file, playground + linux_size, size) != size)
     {
       grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file");

From 9385e55bddb8f4008b3ac4a9c87fc0d3f4949f09 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 18 Oct 2009 00:24:17 +0200
Subject: [PATCH 0031/1628] warning fixes

---
 lib/relocator.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index 622adc517..e551f337f 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -75,8 +75,8 @@ PREFIX (boot) (void *relocator, grub_uint32_t dest,
       overhead =
 	ALIGN_UP (dest - RELOCATOR_SIZEOF (backward) - RELOCATOR_ALIGN,
 		  RELOCATOR_ALIGN);
-      write_call_relocator_bw (relocator - overhead,
-			       relocator - overhead,
+      write_call_relocator_bw ((char *) relocator - overhead,
+			       (char *) relocator - overhead,
 			       dest - overhead, size + overhead, state);
     }
   else
@@ -86,7 +86,7 @@ PREFIX (boot) (void *relocator, grub_uint32_t dest,
       overhead = ALIGN_UP (dest + size, RELOCATOR_ALIGN)
 	+ RELOCATOR_SIZEOF (forward) - (dest + size);
 
-      write_call_relocator_fw (relocator + size + overhead
+      write_call_relocator_fw ((char *) relocator + size + overhead
 			       - RELOCATOR_SIZEOF (forward),
 			       relocator, dest, size + overhead, state);
     }

From d71b572aeaa8fd53524d66cc1a5eba354affac3a Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 18 Oct 2009 00:25:22 +0200
Subject: [PATCH 0032/1628] empty loader.h added

---
 include/grub/mips/qemu-r4k/loader.h | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 include/grub/mips/qemu-r4k/loader.h

diff --git a/include/grub/mips/qemu-r4k/loader.h b/include/grub/mips/qemu-r4k/loader.h
new file mode 100644
index 000000000..e69de29bb

From cba2cae2f5abbe76b6733389cb36cd37ce1f50cf Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 18 Oct 2009 11:49:09 +0200
Subject: [PATCH 0033/1628] simplified serial

---
 include/grub/i386/coreboot/serial.h     | 24 ++++++++++++++++++++++++
 include/grub/i386/ieee1275/serial.h     |  2 +-
 include/grub/mips/qemu-mipssim/serial.h | 24 ++++++++++++++++++++++++
 include/grub/mips/qemu-r4k/serial.h     | 24 ++++++++++++++++++++++++
 term/serial.c                           | 10 ++--------
 5 files changed, 75 insertions(+), 9 deletions(-)
 create mode 100644 include/grub/i386/coreboot/serial.h
 create mode 100644 include/grub/mips/qemu-mipssim/serial.h
 create mode 100644 include/grub/mips/qemu-r4k/serial.h

diff --git a/include/grub/i386/coreboot/serial.h b/include/grub/i386/coreboot/serial.h
new file mode 100644
index 000000000..b6819d587
--- /dev/null
+++ b/include/grub/i386/coreboot/serial.h
@@ -0,0 +1,24 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/>.
+ */
+
+#ifndef GRUB_MACHINE_SERIAL_HEADER
+#define GRUB_MACHINE_SERIAL_HEADER	1
+
+#define GRUB_MACHINE_SERIAL_PORTS { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }
+
+#endif
diff --git a/include/grub/i386/ieee1275/serial.h b/include/grub/i386/ieee1275/serial.h
index 2c527f626..2d8563414 100644
--- a/include/grub/i386/ieee1275/serial.h
+++ b/include/grub/i386/ieee1275/serial.h
@@ -1 +1 @@
-#include <grub/i386/pc/serial.h>
+#include <grub/i386/coreboot/serial.h>
diff --git a/include/grub/mips/qemu-mipssim/serial.h b/include/grub/mips/qemu-mipssim/serial.h
new file mode 100644
index 000000000..55d64fec4
--- /dev/null
+++ b/include/grub/mips/qemu-mipssim/serial.h
@@ -0,0 +1,24 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/>.
+ */
+
+#ifndef GRUB_MACHINE_SERIAL_HEADER
+#define GRUB_MACHINE_SERIAL_HEADER	1
+
+#define GRUB_MACHINE_SERIAL_PORTS { 0x1fd003f8 }
+
+#endif 
diff --git a/include/grub/mips/qemu-r4k/serial.h b/include/grub/mips/qemu-r4k/serial.h
new file mode 100644
index 000000000..1f8ce0804
--- /dev/null
+++ b/include/grub/mips/qemu-r4k/serial.h
@@ -0,0 +1,24 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/>.
+ */
+
+#ifndef GRUB_MACHINE_SERIAL_HEADER
+#define GRUB_MACHINE_SERIAL_HEADER	1
+
+#define GRUB_MACHINE_SERIAL_PORTS { 0x140003f8 }
+
+#endif 
diff --git a/term/serial.c b/term/serial.c
index 30f8bb91a..648b5baf6 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -19,7 +19,6 @@
 #include <grub/machine/machine.h>
 #include <grub/machine/memory.h>
 #include <grub/serial.h>
-//#include <grub/machine/console.h>
 #include <grub/term.h>
 #include <grub/types.h>
 #include <grub/dl.h>
@@ -67,14 +66,9 @@ static struct serial_port serial_settings;
 #ifdef GRUB_MACHINE_PCBIOS
 static const unsigned short *serial_hw_io_addr = (const unsigned short *) GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR;
 #define GRUB_SERIAL_PORT_NUM 4
-#elif defined (GRUB_MACHINE_MIPS_QEMU_MIPSSIM)
-static const grub_port_t serial_hw_io_addr[] = { 0x1fd003f8 };
-#define GRUB_SERIAL_PORT_NUM (ARRAY_SIZE(serial_hw_io_addr))
-#elif defined (GRUB_MACHINE_MIPS_QEMU_R4K)
-static const grub_port_t serial_hw_io_addr[] = { 0x140003f8 };
-#define GRUB_SERIAL_PORT_NUM (ARRAY_SIZE(serial_hw_io_addr))
 #else
-static const grub_port_t serial_hw_io_addr[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
+#include <grub/machine/serial.h>
+static const grub_port_t serial_hw_io_addr[] = GRUB_MACHINE_SERIAL_PORTS;
 #define GRUB_SERIAL_PORT_NUM (ARRAY_SIZE(serial_hw_io_addr))
 #endif
 

From 686135601f3d48d9cd795392ae8016887f54c8f2 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 18 Oct 2009 11:50:40 +0200
Subject: [PATCH 0034/1628] simplified mips/mipsel

---
 configure.ac | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index f0aeb1aa8..c02b8c0c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,7 @@ AC_ARG_PROGRAM
 case "$target_cpu" in
   i[[3456]]86)	target_cpu=i386 ;;
   sparc)	target_cpu=sparc64 ;;
+  mipsel)	target_cpu=mips ;;
 esac
 
 # Specify the platform (such as firmware).
@@ -89,9 +90,7 @@ case "$target_cpu"-"$platform" in
   i386-qemu) ;;
   powerpc-ieee1275) ;;
   sparc64-ieee1275) ;;
-  mipsel-qemu-r4k) ;;
   mips-qemu-r4k) ;;
-  mipsel-qemu-mipssim) ;;
   mips-qemu-mipssim) ;;
   *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
 esac
@@ -99,10 +98,6 @@ esac
 case "$target_cpu" in
   i386 | powerpc) target_m32=1 ;;
   x86_64 | sparc64) target_m64=1 ;;
-  mipsel) 
-    target_cpu=mips ;;
-  mips) 
-    target_cpu=mips ;;
 esac
 
 case "$host_os" in

From 1c2cdb26d36c374fe218e45e3966cc4942ed992c Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 18 Oct 2009 12:04:20 +0200
Subject: [PATCH 0035/1628] yeeloong headers

---
 include/grub/mips/yeeloong/kernel.h  | 35 ++++++++++++++++++
 include/grub/mips/yeeloong/loader.h  |  0
 include/grub/mips/yeeloong/machine.h | 24 +++++++++++++
 include/grub/mips/yeeloong/memory.h  | 53 ++++++++++++++++++++++++++++
 include/grub/mips/yeeloong/serial.h  | 24 +++++++++++++
 include/grub/mips/yeeloong/time.h    | 34 ++++++++++++++++++
 6 files changed, 170 insertions(+)
 create mode 100644 include/grub/mips/yeeloong/kernel.h
 create mode 100644 include/grub/mips/yeeloong/loader.h
 create mode 100644 include/grub/mips/yeeloong/machine.h
 create mode 100644 include/grub/mips/yeeloong/memory.h
 create mode 100644 include/grub/mips/yeeloong/serial.h
 create mode 100644 include/grub/mips/yeeloong/time.h

diff --git a/include/grub/mips/yeeloong/kernel.h b/include/grub/mips/yeeloong/kernel.h
new file mode 100644
index 000000000..6a10f2df1
--- /dev/null
+++ b/include/grub/mips/yeeloong/kernel.h
@@ -0,0 +1,35 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2005,2006,2007,2008,2009  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/>.
+ */
+
+#ifndef GRUB_KERNEL_MACHINE_HEADER
+#define GRUB_KERNEL_MACHINE_HEADER	1
+
+#include <grub/symbol.h>
+
+#ifndef ASM_FILE
+
+void EXPORT_FUNC (grub_reboot) (void);
+void EXPORT_FUNC (grub_halt) (void);
+
+/* The prefix which points to the directory where GRUB modules and its
+   configuration file are located.  */
+extern char grub_prefix[];
+
+#endif
+
+#endif /* ! GRUB_KERNEL_MACHINE_HEADER */
diff --git a/include/grub/mips/yeeloong/loader.h b/include/grub/mips/yeeloong/loader.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/include/grub/mips/yeeloong/machine.h b/include/grub/mips/yeeloong/machine.h
new file mode 100644
index 000000000..9f29b4a46
--- /dev/null
+++ b/include/grub/mips/yeeloong/machine.h
@@ -0,0 +1,24 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2007  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/>.
+ */
+
+#ifndef GRUB_MACHINE_MACHINE_HEADER
+#define GRUB_MACHINE_MACHINE_HEADER	1
+
+#define GRUB_MACHINE_MIPS_YEELOONG	1
+
+#endif /* ! GRUB_MACHINE_MACHINE_HEADER */
diff --git a/include/grub/mips/yeeloong/memory.h b/include/grub/mips/yeeloong/memory.h
new file mode 100644
index 000000000..72ebcefa4
--- /dev/null
+++ b/include/grub/mips/yeeloong/memory.h
@@ -0,0 +1,53 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009 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/>.
+ */
+
+#ifndef GRUB_MEMORY_MACHINE_HEADER
+#define GRUB_MEMORY_MACHINE_HEADER	1
+
+#ifndef ASM_FILE
+#include <grub/symbol.h>
+#include <grub/err.h>
+#include <grub/types.h>
+#endif
+
+#define GRUB_MACHINE_MEMORY_STACK_HIGH       0x801ffff0
+
+#define GRUB_MACHINE_MEMORY_AVAILABLE        1
+
+#ifndef ASM_FILE
+grub_err_t EXPORT_FUNC (grub_machine_mmap_iterate)
+(int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
+grub_err_t EXPORT_FUNC(grub_machine_mmap_iterate)
+     (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
+
+static inline grub_err_t
+grub_machine_mmap_register (grub_uint64_t start __attribute__ ((unused)),
+			    grub_uint64_t size __attribute__ ((unused)),
+			    int type __attribute__ ((unused)),
+			    int handle __attribute__ ((unused)))
+{
+  return GRUB_ERR_NONE;
+}
+static inline grub_err_t
+grub_machine_mmap_unregister (int handle  __attribute__ ((unused)))
+{
+  return GRUB_ERR_NONE;
+}
+#endif
+
+#endif
diff --git a/include/grub/mips/yeeloong/serial.h b/include/grub/mips/yeeloong/serial.h
new file mode 100644
index 000000000..9390ea18a
--- /dev/null
+++ b/include/grub/mips/yeeloong/serial.h
@@ -0,0 +1,24 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/>.
+ */
+
+#ifndef GRUB_MACHINE_SERIAL_HEADER
+#define GRUB_MACHINE_SERIAL_HEADER	1
+
+#define GRUB_MACHINE_SERIAL_PORTS { 0xbff003f8 }
+
+#endif 
diff --git a/include/grub/mips/yeeloong/time.h b/include/grub/mips/yeeloong/time.h
new file mode 100644
index 000000000..a73f64dea
--- /dev/null
+++ b/include/grub/mips/yeeloong/time.h
@@ -0,0 +1,34 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2003,2004,2005,2007  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/>.
+ */
+
+#ifndef KERNEL_MACHINE_TIME_HEADER
+#define KERNEL_MACHINE_TIME_HEADER	1
+
+#include <grub/symbol.h>
+
+#define GRUB_TICKS_PER_SECOND	1000
+
+/* Return the real time in ticks.  */
+grub_uint32_t EXPORT_FUNC (grub_get_rtc) (void);
+
+static inline void
+grub_cpu_idle(void)
+{
+}
+
+#endif /* ! KERNEL_MACHINE_TIME_HEADER */

From 8adc0f006054961979de55e5a607b570398def09 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 18 Oct 2009 12:08:52 +0200
Subject: [PATCH 0036/1628] unified startup.S

---
 kern/mips/qemu-mipssim/startup.S   | 55 ------------------------------
 kern/mips/{qemu-r4k => }/startup.S |  0
 2 files changed, 55 deletions(-)
 delete mode 100644 kern/mips/qemu-mipssim/startup.S
 rename kern/mips/{qemu-r4k => }/startup.S (100%)

diff --git a/kern/mips/qemu-mipssim/startup.S b/kern/mips/qemu-mipssim/startup.S
deleted file mode 100644
index 36c5fabd7..000000000
--- a/kern/mips/qemu-mipssim/startup.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/* startup.S - Startup code for the MIPS.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  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/symbol.h>
-#include <grub/cpu/kernel.h>
-#include <grub/machine/memory.h>
-
-.extern __bss_start
-.extern _end
-	
-	.globl __start, _start, start
-__start:
-_start:
-start:	
-	b codestart
-	. = _start + GRUB_KERNEL_CPU_PREFIX
-
-VARIABLE(grub_prefix)
-	/* to be filled by grub-mkelfimage */
-
-	/*
-	 *  Leave some breathing room for the prefix.
-	 */
-
-	. = _start + GRUB_KERNEL_CPU_DATA_END
-codestart:
-	lui $t1, %hi(__bss_start)
-	addiu $t1, %lo(__bss_start)
-	lui $t2, %hi(_end)
-	addiu $t2, %lo(_end)
-
-bsscont:
-	sb $0,0($t1)
-	addiu $t1,$t1,1
-	sltu $t3,$t1,$t2
-	bne $t3, $t0, bsscont
-
-	li $sp, GRUB_MACHINE_MEMORY_STACK_HIGH
-	b grub_main
\ No newline at end of file
diff --git a/kern/mips/qemu-r4k/startup.S b/kern/mips/startup.S
similarity index 100%
rename from kern/mips/qemu-r4k/startup.S
rename to kern/mips/startup.S

From ad17a401d69c7971ac83e449d6dc7d3fbeb6acc8 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 18 Oct 2009 14:10:31 +0200
Subject: [PATCH 0037/1628] new image format for mips. Asm part

---
 conf/mips.rmk              |  5 +-
 configure.ac               |  2 +
 genmk.rb                   |  2 +-
 include/grub/mips/kernel.h | 12 +++--
 kern/mips/startup.S        | 98 +++++++++++++++++++++++++++++++-------
 5 files changed, 94 insertions(+), 25 deletions(-)

diff --git a/conf/mips.rmk b/conf/mips.rmk
index 9920f6878..a76ecac14 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -26,7 +26,7 @@ kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genke
 	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
 
 # Programs
-pkglib_PROGRAMS = kernel.img
+pkglib_IMAGES = kernel.img
 
 # Utilities.
 sbin_UTILITIES = grub-mkdevicemap
@@ -84,7 +84,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c 	\
 
 grub_emu_LDFLAGS = $(LIBCURSES)
 
-kernel_img_SOURCES = kern/$(target_cpu)/$(target_machine)/startup.S \
+kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
 	kern/main.c kern/device.c kern/$(target_cpu)/$(target_machine)/init.c 		\
 	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c 		\
 	kern/misc.c kern/mm.c kern/reader.c kern/term.c 	\
@@ -97,6 +97,7 @@ kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
 	-Wl,-N,-S,-Ttext,$(LINK_BASE),-Bstatic
+kernel_img_FORMAT = binary
 
 # Scripts.
 sbin_SCRIPTS = 
diff --git a/configure.ac b/configure.ac
index c02b8c0c9..f13cac52a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,7 @@ if test "x$with_platform" = x; then
     powerpc-*) platform=ieee1275 ;;
     powerpc64-*) platform=ieee1275 ;;
     sparc64-*) platform=ieee1275 ;;
+    mips-*) platform=yeeloong ;;
     *) AC_MSG_ERROR([unsupported CPU: "$target_cpu"]) ;;
   esac
 else
@@ -92,6 +93,7 @@ case "$target_cpu"-"$platform" in
   sparc64-ieee1275) ;;
   mips-qemu-r4k) ;;
   mips-qemu-mipssim) ;;
+  mips-yeeloong) ;;
   *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
 esac
 
diff --git a/genmk.rb b/genmk.rb
index 71b57816f..c608707b7 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -68,7 +68,7 @@ MOSTLYCLEAN_IMAGE_TARGETS += mostlyclean-image-#{@name}.#{@rule_count}
 
 ifneq ($(TARGET_APPLE_CC),1)
 #{@name}: #{exe}
-	$(OBJCOPY) -O $(#{prefix}_FORMAT) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id $< $@
+	$(OBJCOPY) -O $(#{prefix}_FORMAT) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< $@
 else
 ifneq (#{exe},kernel.exec)
 #{@name}: #{exe} ./grub-macho2img
diff --git a/include/grub/mips/kernel.h b/include/grub/mips/kernel.h
index 326f1244d..3b578ef05 100644
--- a/include/grub/mips/kernel.h
+++ b/include/grub/mips/kernel.h
@@ -20,13 +20,15 @@
 #define GRUB_KERNEL_CPU_HEADER	1
 
 #define GRUB_MOD_ALIGN 0x1000
+/* Non-zero value is only needed for PowerMacs.  */
+#define GRUB_MOD_GAP   0x0
 
-/* Minimal gap between _end and the start of the modules.  It's a hack
-   for PowerMac to prevent "CLAIM failed" error.  The real fix is to
-   rewrite grub-mkimage to generate valid ELF files.  */
-#define GRUB_MOD_GAP 0x8000
+#define GRUB_KERNEL_CPU_RAW_SIZE        0x100
+#define GRUB_KERNEL_CPU_COMPRESSED_SIZE        0x8
+#define GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE      0xc
+#define GRUB_KERNEL_CPU_KERNEL_IMAGE_SIZE      0x10
 
-#define GRUB_KERNEL_CPU_PREFIX		0x8
+#define GRUB_KERNEL_CPU_PREFIX		0x0
 #define GRUB_KERNEL_CPU_DATA_END	0x48
 
 #endif
diff --git a/kern/mips/startup.S b/kern/mips/startup.S
index 19de4779d..545aae32a 100644
--- a/kern/mips/startup.S
+++ b/kern/mips/startup.S
@@ -21,6 +21,8 @@
 #include <grub/cpu/kernel.h>
 #include <grub/machine/memory.h>
 
+#define BASE_ADDR 8
+	
 .extern __bss_start
 .extern _end
 	
@@ -28,8 +30,84 @@
 __start:
 _start:
 start:	
-	b codestart
-	. = _start + GRUB_KERNEL_CPU_PREFIX
+	bal codestart
+	. = _start + GRUB_KERNEL_CPU_COMPRESSED_SIZE
+compressed_size:
+	.long 0
+	. = _start + GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE
+total_module_size:
+	.long 0
+	. = _start + GRUB_KERNEL_CPU_KERNEL_IMAGE_SIZE
+kernel_image_size:	
+	.long	0
+codestart:
+	/* Decompress the payload. */
+	addiu $t2, $ra, GRUB_KERNEL_CPU_RAW_SIZE - BASE_ADDR
+	lui $t1, %hi(compressed)
+	addiu $t1, %lo(compressed)
+	lw $t3, (GRUB_KERNEL_CPU_COMPRESSED_SIZE - BASE_ADDR)($ra)
+
+	/* $t2 contains source compressed address, $t1 is destination,
+	   $t3 is compressed size. FIXME: put LZMA here. Don't clober $ra
+	*/
+reloccont:
+	lb $t4, 0($t2)
+	sb $t4, 0($t1)
+	addiu $t1,$t1,1
+	addiu $t2,$t2,1
+	addiu $t3, 0xffff
+	bne $t3, $0, reloccont
+
+	/* Move the modules out of BSS.  */
+	lui $t1, %hi(compressed)
+	addiu $t1, %lo(compressed)
+	lw $t2, (GRUB_KERNEL_CPU_KERNEL_IMAGE_SIZE - BASE_ADDR)($ra)
+	addu $t2, $t1, $t2
+	
+	lui $t1, %hi(_end)
+	addiu $t1, %lo(_end)
+	addiu $t1, (GRUB_MOD_ALIGN-1)
+	li $t3, (GRUB_MOD_ALIGN-1)
+	nor $t3, $t3, $0
+	and $t1, $t1, $t3
+	/* Pass modules address as first argument.  */
+	move $a0, $t1
+	
+	lw $t3, (GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE - BASE_ADDR)($ra)
+
+	/* $t2 is source. $t1 is destination. $t3 is size.  */
+modulesmovcont:
+	lb $t4, 0($t2)
+	sb $t4, 0($t1)
+	addiu $t1,$t1,1
+	addiu $t2,$t2,1
+	addiu $t3, 0xffff
+	bne $t3, $0, modulesmovcont
+
+	/* Clean BSS.  */
+	
+	lui $t1, %hi(__bss_start)
+	addiu $t1, %lo(__bss_start)
+	lui $t2, %hi(_end)
+	addiu $t2, %lo(_end)
+bsscont:
+	sb $0,0($t1)
+	addiu $t1,$t1,1
+	sltu $t3,$t1,$t2
+	bne $t3, $0, bsscont
+
+	li $sp, GRUB_MACHINE_MEMORY_STACK_HIGH
+	lui $t1, %hi(grub_main)
+	addiu $t1, %lo(grub_main)
+
+#if __mips >= 2
+	sync
+#endif
+	jr $t1
+
+	. = _start + GRUB_KERNEL_CPU_RAW_SIZE
+compressed:	
+	. = _start + GRUB_KERNEL_CPU_RAW_SIZE + GRUB_KERNEL_CPU_PREFIX
 
 VARIABLE(grub_prefix)
 	/* to be filled by grub-mkelfimage */
@@ -38,18 +116,4 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = _start + GRUB_KERNEL_CPU_DATA_END
-codestart:
-	lui $t1, %hi(__bss_start)
-	addiu $t1, %lo(__bss_start)
-	lui $t2, %hi(_end)
-	addiu $t2, %lo(_end)
-
-bsscont:
-	sb $0,0($t1)
-	addiu $t1,$t1,1
-	sltu $t3,$t1,$t2
-	bne $3, $0, bsscont
-
-	li $sp, GRUB_MACHINE_MEMORY_STACK_HIGH
-	b grub_main
\ No newline at end of file
+	. = _start + GRUB_KERNEL_CPU_RAW_SIZE + GRUB_KERNEL_CPU_DATA_END

From a9a6948ac34717504d719984d3d13c4755ea3c47 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 18 Oct 2009 15:04:14 +0200
Subject: [PATCH 0038/1628] grub as flash for qemu-gdium

---
 conf/i386-pc.rmk                              |  2 +-
 conf/mips.rmk                                 |  7 +++++++
 include/grub/mips/kernel.h                    | 20 +++++++++++++++++--
 include/grub/mips/qemu-r4k/kernel.h           |  1 +
 include/grub/mips/yeeloong/kernel.h           |  5 +----
 include/grub/mips/yeeloong/memory.h           |  1 +
 kern/main.c                                   |  1 +
 kern/mips/startup.S                           | 10 +++++-----
 kern/term.c                                   |  5 ++++-
 .../pc/grub-mkimage.c => grub-mkrawimage.c}   | 10 +++++++---
 10 files changed, 46 insertions(+), 16 deletions(-)
 rename util/{i386/pc/grub-mkimage.c => grub-mkrawimage.c} (98%)

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index c4a4e7754..74125eaa5 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -87,7 +87,7 @@ sbin_UTILITIES += grub-emu
 endif
 
 # For grub-mkimage.
-grub_mkimage_SOURCES = util/i386/pc/grub-mkimage.c util/misc.c \
+grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
 	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 util/i386/pc/grub-mkimage.c_DEPENDENCIES = Makefile
diff --git a/conf/mips.rmk b/conf/mips.rmk
index a76ecac14..553256a9b 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -103,6 +103,13 @@ kernel_img_FORMAT = binary
 sbin_SCRIPTS = 
 bin_SCRIPTS = 
 
+# For grub-mkimage.
+bin_UTILITIES += grub-mkimage
+grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
+	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
+grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
+util/i386/pc/grub-mkimage.c_DEPENDENCIES = Makefile
+
 # Modules.
 pkglib_MODULES = memdisk.mod \
 	lsmmap.mod
diff --git a/include/grub/mips/kernel.h b/include/grub/mips/kernel.h
index 3b578ef05..4a7c9293c 100644
--- a/include/grub/mips/kernel.h
+++ b/include/grub/mips/kernel.h
@@ -28,7 +28,23 @@
 #define GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE      0xc
 #define GRUB_KERNEL_CPU_KERNEL_IMAGE_SIZE      0x10
 
-#define GRUB_KERNEL_CPU_PREFIX		0x0
-#define GRUB_KERNEL_CPU_DATA_END	0x48
+#define GRUB_KERNEL_CPU_PREFIX	        GRUB_KERNEL_CPU_RAW_SIZE
+#define GRUB_KERNEL_CPU_DATA_END	GRUB_KERNEL_CPU_RAW_SIZE + 0x48
+
+#define GRUB_KERNEL_MACHINE_RAW_SIZE GRUB_KERNEL_CPU_RAW_SIZE
+
+#define GRUB_KERNEL_MACHINE_PREFIX	GRUB_KERNEL_CPU_PREFIX
+#define GRUB_KERNEL_MACHINE_DATA_END	GRUB_KERNEL_CPU_DATA_END
+#define GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE GRUB_KERNEL_CPU_KERNEL_IMAGE_SIZE
+#define GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE
+#define GRUB_KERNEL_MACHINE_COMPRESSED_SIZE GRUB_KERNEL_CPU_COMPRESSED_SIZE
+
+#ifndef ASM_FILE
+
+/* The prefix which points to the directory where GRUB modules and its
+   configuration file are located.  */
+extern char grub_prefix[];
+
+#endif
 
 #endif
diff --git a/include/grub/mips/qemu-r4k/kernel.h b/include/grub/mips/qemu-r4k/kernel.h
index 6a10f2df1..dbf74c1b2 100644
--- a/include/grub/mips/qemu-r4k/kernel.h
+++ b/include/grub/mips/qemu-r4k/kernel.h
@@ -20,6 +20,7 @@
 #define GRUB_KERNEL_MACHINE_HEADER	1
 
 #include <grub/symbol.h>
+#include <grub/cpu/kernel.h>
 
 #ifndef ASM_FILE
 
diff --git a/include/grub/mips/yeeloong/kernel.h b/include/grub/mips/yeeloong/kernel.h
index 6a10f2df1..230455dbf 100644
--- a/include/grub/mips/yeeloong/kernel.h
+++ b/include/grub/mips/yeeloong/kernel.h
@@ -20,16 +20,13 @@
 #define GRUB_KERNEL_MACHINE_HEADER	1
 
 #include <grub/symbol.h>
+#include <grub/cpu/kernel.h>
 
 #ifndef ASM_FILE
 
 void EXPORT_FUNC (grub_reboot) (void);
 void EXPORT_FUNC (grub_halt) (void);
 
-/* The prefix which points to the directory where GRUB modules and its
-   configuration file are located.  */
-extern char grub_prefix[];
-
 #endif
 
 #endif /* ! GRUB_KERNEL_MACHINE_HEADER */
diff --git a/include/grub/mips/yeeloong/memory.h b/include/grub/mips/yeeloong/memory.h
index 72ebcefa4..bc8f47b12 100644
--- a/include/grub/mips/yeeloong/memory.h
+++ b/include/grub/mips/yeeloong/memory.h
@@ -26,6 +26,7 @@
 #endif
 
 #define GRUB_MACHINE_MEMORY_STACK_HIGH       0x801ffff0
+#define GRUB_MACHINE_MEMORY_USABLE           0x81000000
 
 #define GRUB_MACHINE_MEMORY_AVAILABLE        1
 
diff --git a/kern/main.c b/kern/main.c
index 9215d55e7..31dc0a36a 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -48,6 +48,7 @@ grub_module_iterate (int (*hook) (struct grub_module_header *header))
        header < (struct grub_module_header *) (modbase + modinfo->size);
        header = (struct grub_module_header *) ((char *) header + header->size))
     {
+      grub_printf ("%p:", header);
       if (hook (header))
 	break;
     }
diff --git a/kern/mips/startup.S b/kern/mips/startup.S
index 545aae32a..b31b49331 100644
--- a/kern/mips/startup.S
+++ b/kern/mips/startup.S
@@ -59,8 +59,8 @@ reloccont:
 	bne $t3, $0, reloccont
 
 	/* Move the modules out of BSS.  */
-	lui $t1, %hi(compressed)
-	addiu $t1, %lo(compressed)
+	lui $t1, %hi(_start)
+	addiu $t1, %lo(_start)
 	lw $t2, (GRUB_KERNEL_CPU_KERNEL_IMAGE_SIZE - BASE_ADDR)($ra)
 	addu $t2, $t1, $t2
 	
@@ -71,7 +71,7 @@ reloccont:
 	nor $t3, $t3, $0
 	and $t1, $t1, $t3
 	/* Pass modules address as first argument.  */
-	move $a0, $t1
+//	move $a0, $t1
 	
 	lw $t3, (GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE - BASE_ADDR)($ra)
 
@@ -107,7 +107,7 @@ bsscont:
 
 	. = _start + GRUB_KERNEL_CPU_RAW_SIZE
 compressed:	
-	. = _start + GRUB_KERNEL_CPU_RAW_SIZE + GRUB_KERNEL_CPU_PREFIX
+	. = _start + GRUB_KERNEL_CPU_PREFIX
 
 VARIABLE(grub_prefix)
 	/* to be filled by grub-mkelfimage */
@@ -116,4 +116,4 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = _start + GRUB_KERNEL_CPU_RAW_SIZE + GRUB_KERNEL_CPU_DATA_END
+	. = _start + GRUB_KERNEL_CPU_DATA_END
diff --git a/kern/term.c b/kern/term.c
index 0e3595df3..271cf8d78 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -51,7 +51,10 @@ grub_putcode (grub_uint32_t code)
   int height = grub_getwh () & 255;
 
   if (!grub_cur_term_output)
-    return;
+    {
+      *(grub_uint8_t *)0xbff003f8 = code;
+      return;
+    }
 
   if (code == '\t' && grub_cur_term_output->getxy)
     {
diff --git a/util/i386/pc/grub-mkimage.c b/util/grub-mkrawimage.c
similarity index 98%
rename from util/i386/pc/grub-mkimage.c
rename to util/grub-mkrawimage.c
index 15168f8fa..0d26e3cf4 100644
--- a/util/i386/pc/grub-mkimage.c
+++ b/util/grub-mkrawimage.c
@@ -93,10 +93,10 @@ static void
 generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 		char *memdisk_path, char *config_path)
 {
-  char *kernel_img, *boot_img, *core_img;
-  size_t kernel_size, boot_size, total_module_size, core_size;
+  char *kernel_img, *core_img;
+  size_t kernel_size, total_module_size, core_size;
   size_t memdisk_size = 0, config_size = 0;
-  char *kernel_path, *boot_path;
+  char *kernel_path;
   size_t offset;
   struct grub_util_path_list *path_list, *p, *next;
   struct grub_module_info *modinfo;
@@ -198,6 +198,8 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 #if defined(GRUB_MACHINE_PCBIOS)
   {
     unsigned num;
+    char *boot_path, *boot_img;
+    size_t boot_size;
     num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
     if (num > 0xffff)
       grub_util_error ("the core image is too big");
@@ -222,6 +224,8 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
   {
     char *rom_img;
     size_t rom_size;
+    char *boot_path, *boot_img;
+    size_t boot_size;
 
     boot_path = grub_util_get_path (dir, "boot.img");
     boot_size = grub_util_get_image_size (boot_path);

From 4a1eefb623104fe61c88f17db2d2dbb13d44a038 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 18 Oct 2009 15:06:47 +0200
Subject: [PATCH 0039/1628] Revert "simplify mipsel handling"

This reverts commit 3451c43f4938a20aee5a2c0d0fa17c29e40b989b.

Conflicts:

	configure.ac
---
 configure.ac              | 11 ++++++++++-
 include/grub/mips/types.h |  6 ++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index f13cac52a..abfcf92e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,16 @@ AC_ARG_PROGRAM
 case "$target_cpu" in
   i[[3456]]86)	target_cpu=i386 ;;
   sparc)	target_cpu=sparc64 ;;
-  mipsel)	target_cpu=mips ;;
+  mipsel)
+                target_cpu=mips;    
+		TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPSEL=1"; 
+		CFLAGS="$CFLAGS -DGRUB_CPU_MIPSEL=1";
+		;;
+  mips)
+                target_cpu=mips;    
+		TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPS=1"; 
+		CFLAGS="$CFLAGS -DGRUB_CPU_MIPS=1";
+		;;
 esac
 
 # Specify the platform (such as firmware).
diff --git a/include/grub/mips/types.h b/include/grub/mips/types.h
index aed597451..fe09afa3e 100644
--- a/include/grub/mips/types.h
+++ b/include/grub/mips/types.h
@@ -25,12 +25,14 @@
 /* The size of long.  */
 #define GRUB_TARGET_SIZEOF_LONG		4
 
-#ifdef __MIPSEL__
+#ifdef GRUB_CPU_MIPSEL
 /* mipsEL is little-endian.  */
 #undef GRUB_TARGET_WORDS_BIGENDIAN
-#else
+#elif defined (GRUB_CPU_MIPS)
 /* mips is big-endian.  */
 #define GRUB_TARGET_WORDS_BIGENDIAN
+#elif !defined (GRUB_SYMBOL_GENERATOR)
+#error Neither GRUB_CPU_MIPS nor GRUB_CPU_MIPSEL is defined
 #endif
 
 #endif /* ! GRUB_TYPES_CPU_HEADER */

From 3dc648f724bde69f52249576c0189802d677a538 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 18 Oct 2009 15:07:22 +0200
Subject: [PATCH 0040/1628] missing file

---
 kern/mips/yeeloong/init.c | 75 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 kern/mips/yeeloong/init.c

diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
new file mode 100644
index 000000000..eece6076c
--- /dev/null
+++ b/kern/mips/yeeloong/init.c
@@ -0,0 +1,75 @@
+#include <grub/kernel.h>
+#include <grub/misc.h>
+#include <grub/env.h>
+#include <grub/time.h>
+#include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/time.h>
+#include <grub/machine/kernel.h>
+#include <grub/machine/memory.h>
+#include <grub/cpu/kernel.h>
+
+#define RAMSIZE (64 << 20)
+
+grub_uint32_t
+grub_get_rtc (void)
+{
+  static int calln = 0;
+  return calln++;
+}
+
+void
+grub_machine_init (void)
+{
+  grub_mm_init_region ((void *) GRUB_MACHINE_MEMORY_USABLE,
+		       RAMSIZE - (GRUB_MACHINE_MEMORY_USABLE & 0x7fffffff));
+  grub_install_get_time_ms (grub_rtc_get_time_ms);
+}
+
+void
+grub_machine_fini (void)
+{
+}
+
+void
+grub_exit (void)
+{
+  while (1);
+}
+
+void
+grub_halt (void)
+{
+  while (1);
+}
+
+void
+grub_reboot (void)
+{
+  while (1);
+}
+
+void
+grub_machine_set_prefix (void)
+{
+  grub_env_set ("prefix", grub_prefix);
+}
+
+extern char _end[];
+
+grub_addr_t
+grub_arch_modules_addr (void)
+{
+  return ALIGN_UP((grub_addr_t) _end + GRUB_MOD_GAP, GRUB_MOD_ALIGN);
+}
+
+grub_err_t 
+grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, 
+							 grub_uint64_t, 
+							 grub_uint32_t))
+{
+  hook (0, RAMSIZE,
+	GRUB_MACHINE_MEMORY_AVAILABLE);
+  return GRUB_ERR_NONE;
+}

From 877128fa4550b9ce69413bba2f9bd52e8080d91e Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 18 Oct 2009 16:10:42 +0200
Subject: [PATCH 0041/1628] copy modules backwards

---
 kern/mips/startup.S | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/kern/mips/startup.S b/kern/mips/startup.S
index b31b49331..fca319e22 100644
--- a/kern/mips/startup.S
+++ b/kern/mips/startup.S
@@ -75,12 +75,18 @@ reloccont:
 	
 	lw $t3, (GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE - BASE_ADDR)($ra)
 
+	/* Backward copy.  */
+	add $t1, $t1, $t3
+	add $t2, $t2, $t3
+	addiu $t1, $t1, 0xffff
+	addiu $t2, $t2, 0xffff
+
 	/* $t2 is source. $t1 is destination. $t3 is size.  */
 modulesmovcont:
 	lb $t4, 0($t2)
 	sb $t4, 0($t1)
-	addiu $t1,$t1,1
-	addiu $t2,$t2,1
+	addiu $t1,$t1,0xffff
+	addiu $t2,$t2,0xffff
 	addiu $t3, 0xffff
 	bne $t3, $0, modulesmovcont
 

From 19f9e339c31e080cbae35fe1b808414c2a2eb2f8 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sun, 18 Oct 2009 16:15:04 +0200
Subject: [PATCH 0042/1628] revert changes to kern/main.c

---
 kern/main.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kern/main.c b/kern/main.c
index 31dc0a36a..9215d55e7 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -48,7 +48,6 @@ grub_module_iterate (int (*hook) (struct grub_module_header *header))
        header < (struct grub_module_header *) (modbase + modinfo->size);
        header = (struct grub_module_header *) ((char *) header + header->size))
     {
-      grub_printf ("%p:", header);
       if (hook (header))
 	break;
     }

From 65aa1698d3bb704f9fa6cb33bfd96ed99beb0156 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Mon, 19 Oct 2009 12:58:52 +0200
Subject: [PATCH 0043/1628] use $t9 instead of $ra as a base register

---
 kern/mips/startup.S | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/kern/mips/startup.S b/kern/mips/startup.S
index fca319e22..afab3642e 100644
--- a/kern/mips/startup.S
+++ b/kern/mips/startup.S
@@ -42,13 +42,14 @@ kernel_image_size:
 	.long	0
 codestart:
 	/* Decompress the payload. */
-	addiu $t2, $ra, GRUB_KERNEL_CPU_RAW_SIZE - BASE_ADDR
+	move $t9, $ra
+	addiu $t2, $t9, GRUB_KERNEL_CPU_RAW_SIZE - BASE_ADDR
 	lui $t1, %hi(compressed)
 	addiu $t1, %lo(compressed)
-	lw $t3, (GRUB_KERNEL_CPU_COMPRESSED_SIZE - BASE_ADDR)($ra)
+	lw $t3, (GRUB_KERNEL_CPU_COMPRESSED_SIZE - BASE_ADDR)($t9)
 
 	/* $t2 contains source compressed address, $t1 is destination,
-	   $t3 is compressed size. FIXME: put LZMA here. Don't clober $ra
+	   $t3 is compressed size. FIXME: put LZMA here. Don't clober $t9
 	*/
 reloccont:
 	lb $t4, 0($t2)
@@ -61,7 +62,7 @@ reloccont:
 	/* Move the modules out of BSS.  */
 	lui $t1, %hi(_start)
 	addiu $t1, %lo(_start)
-	lw $t2, (GRUB_KERNEL_CPU_KERNEL_IMAGE_SIZE - BASE_ADDR)($ra)
+	lw $t2, (GRUB_KERNEL_CPU_KERNEL_IMAGE_SIZE - BASE_ADDR)($t9)
 	addu $t2, $t1, $t2
 	
 	lui $t1, %hi(_end)
@@ -73,7 +74,7 @@ reloccont:
 	/* Pass modules address as first argument.  */
 //	move $a0, $t1
 	
-	lw $t3, (GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE - BASE_ADDR)($ra)
+	lw $t3, (GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE - BASE_ADDR)($t9)
 
 	/* Backward copy.  */
 	add $t1, $t1, $t3

From 0fc89efd85045a99121df5003e4745086fea620c Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Mon, 19 Oct 2009 12:59:33 +0200
Subject: [PATCH 0044/1628] use $t0-$t3 as arguments for relocator

---
 lib/mips/relocator.c     | 12 ++++++------
 lib/mips/relocator_asm.S | 36 ++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lib/mips/relocator.c b/lib/mips/relocator.c
index b0fb4b2a5..4a67418c4 100644
--- a/lib/mips/relocator.c
+++ b/lib/mips/relocator.c
@@ -71,9 +71,9 @@ write_call_relocator_bw (void *ptr0, void *src, grub_uint32_t dest,
 {
   void *ptr = ptr0;
   int i;
-  write_reg (2, (grub_uint32_t) src, &ptr);
-  write_reg (3, dest, &ptr);
-  write_reg (4, size, &ptr);
+  write_reg (8, (grub_uint32_t) src, &ptr);
+  write_reg (9, dest, &ptr);
+  write_reg (10, size, &ptr);
   grub_memcpy (ptr, &grub_relocator32_backward_start,
 	       RELOCATOR_SRC_SIZEOF (backward));
   ptr = (grub_uint8_t *) ptr + RELOCATOR_SRC_SIZEOF (backward);
@@ -89,9 +89,9 @@ write_call_relocator_fw (void *ptr0, void *src, grub_uint32_t dest,
 {
   void *ptr = ptr0;
   int i;
-  write_reg (2, (grub_uint32_t) src, &ptr);
-  write_reg (3, dest, &ptr);
-  write_reg (4, size, &ptr);
+  write_reg (8, (grub_uint32_t) src, &ptr);
+  write_reg (9, dest, &ptr);
+  write_reg (10, size, &ptr);
   grub_memcpy (ptr, &grub_relocator32_forward_start,
 	       RELOCATOR_SRC_SIZEOF (forward));
   ptr = (grub_uint8_t *) ptr + RELOCATOR_SRC_SIZEOF (forward);
diff --git a/lib/mips/relocator_asm.S b/lib/mips/relocator_asm.S
index 5503b4032..6f6108edc 100644
--- a/lib/mips/relocator_asm.S
+++ b/lib/mips/relocator_asm.S
@@ -28,32 +28,32 @@
 
 VARIABLE (grub_relocator32_forward_start)
 copycont1:	
-	lb $5,0($2)
-	sb $5,0($3)
-	addiu $2, $2, 0x1
-	addiu $3, $3, 0x1
-	addiu $4, $4, 0xffff
-	subu $5,$4,$0
-	bne $5, $0, copycont1
+	lb $11,0($8)
+	sb $11,0($9)
+	addiu $8, $8, 0x1
+	addiu $9, $9, 0x1
+	addiu $10, $10, 0xffff
+	subu $11,$10,$0
+	bne $11, $0, copycont1
 #if __mips >= 2
 	sync
 #endif
 VARIABLE (grub_relocator32_forward_end)
 
 VARIABLE (grub_relocator32_backward_start)
-	addu $3, $3, $4
-	addu $2, $2, $4
+	addu $9, $9, $10
+	addu $8, $8, $10
 	/* Backward movsl is implicitly off-by-one.  compensate that.  */
-	addiu $3, $3, 0xffff
-	addiu $2, $2, 0xffff
+	addiu $9, $9, 0xffff
+	addiu $8, $8, 0xffff
 copycont2:	
-	lb $5,0($2)
-	sb $5,0($3)
-	addiu $2, $2, 0xffff
-	addiu $3, $3, 0xffff
-	addiu $4, 0xffff
-	subu $5,$4,$0
-	bne $5, $0, copycont2
+	lb $11,0($8)
+	sb $11,0($9)
+	addiu $8, $8, 0xffff
+	addiu $9, $9, 0xffff
+	addiu $10, 0xffff
+	subu $11,$10,$0
+	bne $11, $0, copycont2
 #if __mips >= 2
 	sync
 #endif

From bb272a0f5db4b2ec075f25588f48b50dfe9b8387 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Mon, 19 Oct 2009 13:00:34 +0200
Subject: [PATCH 0045/1628] add linux argument passing

---
 loader/mips/linux.c | 130 ++++++++++++++++++++++----------------------
 1 file changed, 64 insertions(+), 66 deletions(-)

diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index 3e526c699..b04249767 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -37,10 +37,8 @@ static int loaded;
 static grub_size_t initrd_size;
 static grub_size_t linux_size;
 
-static char *linux_args;
-
 static grub_uint8_t *playground;
-static grub_addr_t target_addr, entry_addr, initrd_addr, args_addr;
+static grub_addr_t target_addr, entry_addr, initrd_addr, argc_addr, argv_addr;
 
 static grub_err_t
 grub_linux_boot (void)
@@ -49,6 +47,8 @@ grub_linux_boot (void)
 
   /* Boot the kernel.  */
   state.gpr[1] = entry_addr;
+  state.gpr[4] = argc_addr;
+  state.gpr[5] = argv_addr;
   state.jumpreg = 1;
   grub_relocator32_boot (playground, target_addr, state);
 
@@ -77,10 +77,10 @@ grub_linux_unload (void)
 }
 
 static grub_err_t
-grub_linux_load32 (grub_elf_t elf, char *args)
+grub_linux_load32 (grub_elf_t elf, void **extra_mem, grub_size_t extra_size)
 {
   Elf32_Addr base;
-  int argsoff;
+  int extraoff;
 
   /* Linux's entry point incorrectly contains a virtual address.  */
   entry_addr = elf->ehdr.ehdr32.e_entry & ~ELF32_LOADMASK;
@@ -91,15 +91,15 @@ grub_linux_load32 (grub_elf_t elf, char *args)
   target_addr = base;
   /* Pad it; the kernel scribbles over memory beyond its load address.  */
   linux_size += 0x100000;
-  argsoff = linux_size;
-  args_addr = target_addr + argsoff;
-  linux_size += grub_strlen (args) + 1;
+  linux_size = ALIGN_UP (base + linux_size, 4) - base;
+  extraoff = linux_size;
+  linux_size += extra_size;
 
   playground = grub_relocator32_alloc (linux_size);
   if (!playground)
     return grub_errno;
 
-  grub_memcpy (playground + argsoff, args, grub_strlen (args) + 1);
+  *extra_mem = playground + extraoff;
 
   /* Now load the segments into the area we claimed.  */
   auto grub_err_t offset_phdr (Elf32_Phdr *phdr, grub_addr_t *addr, int *do_load);
@@ -121,10 +121,10 @@ grub_linux_load32 (grub_elf_t elf, char *args)
 }
 
 static grub_err_t
-grub_linux_load64 (grub_elf_t elf, char *args)
+grub_linux_load64 (grub_elf_t elf, void **extra_mem, grub_size_t extra_size)
 {
   Elf64_Addr base;
-  int argsoff;
+  int extraoff;
 
   /* Linux's entry point incorrectly contains a virtual address.  */
   entry_addr = elf->ehdr.ehdr64.e_entry & ~ELF64_LOADMASK;
@@ -135,15 +135,15 @@ grub_linux_load64 (grub_elf_t elf, char *args)
   target_addr = base;
   /* Pad it; the kernel scribbles over memory beyond its load address.  */
   linux_size += 0x100000;
-  argsoff = linux_size;
-  args_addr = target_addr + argsoff;
-  linux_size += grub_strlen (args) + 1;
+  linux_size = ALIGN_UP (base + linux_size, 4) - base;
+  extraoff = linux_size;
+  linux_size += extra_size;
 
   playground = grub_relocator32_alloc (linux_size);
   if (!playground)
     return grub_errno;
 
-  grub_memcpy (playground + argsoff, args, grub_strlen (args) + 1);
+  *extra_mem = playground + extraoff;
 
   /* Now load the segments into the area we claimed.  */
   auto grub_err_t offset_phdr (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load);
@@ -170,78 +170,76 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   grub_elf_t elf = 0;
   int i;
   int size;
-  char *dest;
-
-  grub_dl_ref (my_mod);
+  void *extra;
+  grub_uint32_t *linux_argv;
+  char *linux_args;
+  grub_err_t err;
 
   if (argc == 0)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "no kernel specified");
-      goto out;
-    }
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no kernel specified");
 
   elf = grub_elf_open (argv[0]);
   if (! elf)
-    goto out;
+    return grub_errno;
 
   if (elf->ehdr.ehdr32.e_type != ET_EXEC)
     {
-      grub_error (GRUB_ERR_UNKNOWN_OS,
-		  "This ELF file is not of the right type\n");
-      goto out;
+      grub_elf_close (elf);
+      return grub_error (GRUB_ERR_UNKNOWN_OS,
+			 "This ELF file is not of the right type\n");
     }
 
   /* Release the previously used memory.  */
   grub_loader_unset ();
+  loaded = 0;
 
-  size = sizeof ("BOOT_IMAGE=") + grub_strlen (argv[0]);
-  for (i = 0; i < argc; i++)
-    size += grub_strlen (argv[i]) + 1;
+  size = sizeof (grub_uint32_t) * argc + ALIGN_UP (sizeof ("g"), 4)
+    + sizeof (grub_uint32_t);
+  for (i = 1; i < argc; i++)
+    size += ALIGN_UP (grub_strlen (argv[i]) + 1, 4);
 
-  linux_args = grub_malloc (size);
-  if (! linux_args)
-    goto out;
+  if (grub_elf_is_elf32 (elf))
+    err = grub_linux_load32 (elf, &extra, size);
+  else
+  if (grub_elf_is_elf64 (elf))
+    err = grub_linux_load64 (elf, &extra, size);
+  else
+    err = grub_error (GRUB_ERR_BAD_FILE_TYPE, "Unknown ELF class");
 
-  /* Specify the boot file.  */
-  dest = grub_stpcpy (linux_args, "BOOT_IMAGE=");
-  dest = grub_stpcpy (dest, argv[0]);
+  grub_elf_close (elf);
+
+  if (err)
+    return err;
+  
+  *(grub_uint32_t *) extra = argc;
+  argc_addr = (grub_uint8_t *) extra - (grub_uint8_t *) playground
+    + target_addr;
+  extra = (grub_uint32_t *) extra + 1;
+  linux_argv = extra;
+  argv_addr = (grub_uint8_t *) linux_argv - (grub_uint8_t *) playground
+    + target_addr;
+  extra = linux_argv + argc;
+  linux_args = extra;
+
+  *linux_argv = (grub_uint32_t) linux_args;
+  grub_memcpy (linux_args, "g", sizeof ("g"));
+  linux_args += ALIGN_UP (sizeof ("g"), 4);
+  linux_argv++;
 
   for (i = 1; i < argc; i++)
     {
-      *dest++ = ' ';
-      dest = grub_stpcpy (dest, argv[i]);
+      *linux_argv = (grub_uint32_t) linux_args;
+      grub_memcpy (linux_args, argv[i], grub_strlen (argv[i]) + 1);
+      linux_args += ALIGN_UP (grub_strlen (argv[i]) + 1, 4);
+      linux_argv++;
     }
 
-  if (grub_elf_is_elf32 (elf))
-    grub_linux_load32 (elf, linux_args);
-  else
-  if (grub_elf_is_elf64 (elf))
-    grub_linux_load64 (elf, linux_args);
-  else
-    {
-      grub_error (GRUB_ERR_BAD_FILE_TYPE, "Unknown ELF class");
-      goto out;
-    }
+  grub_loader_set (grub_linux_boot, grub_linux_unload, 1);
+  initrd_addr = 0;
+  loaded = 1;
+  grub_dl_ref (my_mod);
 
-out:
-
-  if (elf)
-    grub_elf_close (elf);
-
-  if (grub_errno != GRUB_ERR_NONE)
-    {
-      grub_linux_release_mem ();
-      grub_dl_unref (my_mod);
-      loaded = 0;
-    }
-  else
-    {
-      grub_loader_set (grub_linux_boot, grub_linux_unload, 1);
-      initrd_addr = 0;
-      loaded = 1;
-    }
-
-  return grub_errno;
+  return GRUB_ERR_NONE;
 }
 
 static grub_err_t

From e145631831d8fb04dae96a4a106d8a1f901e90ac Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Mon, 19 Oct 2009 13:03:38 +0200
Subject: [PATCH 0046/1628] pci for yeeloong

---
 include/grub/mips/pci.h          | 71 +-------------------------------
 include/grub/mips/yeeloong/pci.h | 71 ++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 70 deletions(-)
 create mode 100644 include/grub/mips/yeeloong/pci.h

diff --git a/include/grub/mips/pci.h b/include/grub/mips/pci.h
index 38a95a467..8b49d8479 100644
--- a/include/grub/mips/pci.h
+++ b/include/grub/mips/pci.h
@@ -1,70 +1 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008  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/>.
- */
-
-#ifndef	GRUB_CPU_PCI_H
-#define	GRUB_CPU_PCI_H	1
-
-#include <grub/types.h>
-#include <grub/cpu/io.h>
-
-#define GRUB_PCI_ADDR_REG	0x14000cf8
-#define GRUB_PCI_DATA_REG	0x14000cfc
-
-static inline grub_uint32_t
-grub_pci_read (grub_pci_address_t addr)
-{
-  grub_outl (addr, GRUB_PCI_ADDR_REG);
-  return grub_inl (GRUB_PCI_DATA_REG);
-}
-
-static inline grub_uint16_t
-grub_pci_read_word (grub_pci_address_t addr)
-{
-  grub_outl (addr & ~3, GRUB_PCI_ADDR_REG);
-  return grub_inw (GRUB_PCI_DATA_REG + (addr & 3));
-}
-
-static inline grub_uint8_t
-grub_pci_read_byte (grub_pci_address_t addr)
-{
-  grub_outl (addr & ~3, GRUB_PCI_ADDR_REG);
-  return grub_inb (GRUB_PCI_DATA_REG + (addr & 3));
-}
-
-static inline void
-grub_pci_write (grub_pci_address_t addr, grub_uint32_t data)
-{
-  grub_outl (addr, GRUB_PCI_ADDR_REG);
-  grub_outl (data, GRUB_PCI_DATA_REG);
-}
-
-static inline void
-grub_pci_write_word (grub_pci_address_t addr, grub_uint16_t data)
-{
-  grub_outl (addr & ~3, GRUB_PCI_ADDR_REG);
-  grub_outw (data, GRUB_PCI_DATA_REG + (addr & 3));
-}
-
-static inline void
-grub_pci_write_byte (grub_pci_address_t addr, grub_uint8_t data)
-{
-  grub_outl (addr & ~3, GRUB_PCI_ADDR_REG);
-  grub_outb (data, GRUB_PCI_DATA_REG + (addr & 3));
-}
-
-#endif /* GRUB_CPU_PCI_H */
+#include <grub/machine/pci.h>
diff --git a/include/grub/mips/yeeloong/pci.h b/include/grub/mips/yeeloong/pci.h
new file mode 100644
index 000000000..f65d3bf38
--- /dev/null
+++ b/include/grub/mips/yeeloong/pci.h
@@ -0,0 +1,71 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/>.
+ */
+
+#ifndef	GRUB_MACHINE_PCI_H
+#define	GRUB_MACHINE_PCI_H	1
+
+#include <grub/types.h>
+#include <grub/cpu/io.h>
+
+#define GRUB_MACHINE_PCI_IOSPACE        0xbfe80000
+#define GRUB_MACHINE_PCI_CONTROL_REG    (*(grub_uint32_t *) 0x1fe00118)
+
+
+static inline grub_uint32_t
+grub_pci_read (grub_pci_address_t addr)
+{
+  GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
+  return *(grub_uint32_t *) (GRUB_PCI_IOSPACE | (addr & 0xffff));
+}
+
+static inline grub_uint16_t
+grub_pci_read_word (grub_pci_address_t addr)
+{
+  GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
+  return *(grub_uint16_t *) (GRUB_PCI_IOSPACE | (addr & 0xffff));
+}
+
+static inline grub_uint8_t
+grub_pci_read_byte (grub_pci_address_t addr)
+{
+  GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
+  return *(grub_uint8_t *) (GRUB_PCI_IOSPACE | (addr & 0xffff));
+}
+
+static inline void
+grub_pci_write (grub_pci_address_t addr, grub_uint32_t data)
+{
+  GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
+  *(grub_uint32_t *) (GRUB_PCI_IOSPACE | (addr & 0xffff)) = data;
+}
+
+static inline void
+grub_pci_write_word (grub_pci_address_t addr, grub_uint16_t data)
+{
+  GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
+  *(grub_uint16_t *) (GRUB_PCI_IOSPACE | (addr & 0xffff)) = data;
+}
+
+static inline void
+grub_pci_write_byte (grub_pci_address_t addr, grub_uint8_t data)
+{
+  GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
+  *(grub_uint8_t *) (GRUB_PCI_IOSPACE | (addr & 0xffff)) = data;
+}
+
+#endif /* GRUB_MACHINE_PCI_H */

From 82b1f15b6b41defc86f6800b7d3139323962b7fd Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Mon, 19 Oct 2009 13:06:16 +0200
Subject: [PATCH 0047/1628] declaration fix

---
 include/grub/mips/yeeloong/pci.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/grub/mips/yeeloong/pci.h b/include/grub/mips/yeeloong/pci.h
index f65d3bf38..bbe7bc202 100644
--- a/include/grub/mips/yeeloong/pci.h
+++ b/include/grub/mips/yeeloong/pci.h
@@ -30,42 +30,42 @@ static inline grub_uint32_t
 grub_pci_read (grub_pci_address_t addr)
 {
   GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
-  return *(grub_uint32_t *) (GRUB_PCI_IOSPACE | (addr & 0xffff));
+  return *(grub_uint32_t *) (GRUB_MACHINE_PCI_IOSPACE | (addr & 0xffff));
 }
 
 static inline grub_uint16_t
 grub_pci_read_word (grub_pci_address_t addr)
 {
   GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
-  return *(grub_uint16_t *) (GRUB_PCI_IOSPACE | (addr & 0xffff));
+  return *(grub_uint16_t *) (GRUB_MACHINE_PCI_IOSPACE | (addr & 0xffff));
 }
 
 static inline grub_uint8_t
 grub_pci_read_byte (grub_pci_address_t addr)
 {
   GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
-  return *(grub_uint8_t *) (GRUB_PCI_IOSPACE | (addr & 0xffff));
+  return *(grub_uint8_t *) (GRUB_MACHINE_PCI_IOSPACE | (addr & 0xffff));
 }
 
 static inline void
 grub_pci_write (grub_pci_address_t addr, grub_uint32_t data)
 {
   GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
-  *(grub_uint32_t *) (GRUB_PCI_IOSPACE | (addr & 0xffff)) = data;
+  *(grub_uint32_t *) (GRUB_MACHINE_PCI_IOSPACE | (addr & 0xffff)) = data;
 }
 
 static inline void
 grub_pci_write_word (grub_pci_address_t addr, grub_uint16_t data)
 {
   GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
-  *(grub_uint16_t *) (GRUB_PCI_IOSPACE | (addr & 0xffff)) = data;
+  *(grub_uint16_t *) (GRUB_MACHINE_PCI_IOSPACE | (addr & 0xffff)) = data;
 }
 
 static inline void
 grub_pci_write_byte (grub_pci_address_t addr, grub_uint8_t data)
 {
   GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
-  *(grub_uint8_t *) (GRUB_PCI_IOSPACE | (addr & 0xffff)) = data;
+  *(grub_uint8_t *) (GRUB_MACHINE_PCI_IOSPACE | (addr & 0xffff)) = data;
 }
 
 #endif /* GRUB_MACHINE_PCI_H */

From 6592e23a4e95ae82fc24ed34a033f2e11da4ab75 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Mon, 19 Oct 2009 16:38:07 +0200
Subject: [PATCH 0048/1628] usb on mipsel

---
 bus/usb/ohci.c      | 23 +++++++++++++----------
 conf/mips.rmk       | 37 +++++++++++++++++++++++++++++++++++++
 term/usb_keyboard.c |  1 -
 3 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 32fb7cf91..f13156455 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -27,6 +27,8 @@
 #include <grub/i386/io.h>
 #include <grub/time.h>
 
+#define vtop(x) ((x) & 0x7fffffff)
+
 struct grub_ohci_hcca
 {
   /* Pointers to Interrupt Endpoint Descriptors.  Not used by
@@ -178,7 +180,7 @@ grub_ohci_pci_iter (int bus, int device, int func,
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_FRAME_INTERVAL, frame_interval);
 
   /* Setup the HCCA.  */
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, (grub_uint32_t) o->hcca);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, vtop ((grub_uint32_t) o->hcca));
   grub_dprintf ("ohci", "OHCI HCCA\n");
 
   /* Enable the OHCI.  */
@@ -264,10 +266,10 @@ grub_ohci_transaction (grub_ohci_td_t td,
   buffer = (grub_uint32_t) data;
   buffer_end = buffer + size - 1;
 
-  td->token = grub_cpu_to_le32 (token);
-  td->buffer = grub_cpu_to_le32 (buffer);
+  td->token = grub_cpu_to_le32 (vtop (token));
+  td->buffer = grub_cpu_to_le32 (vtop (buffer));
   td->next_td = 0;
-  td->buffer_end = grub_cpu_to_le32 (buffer_end);
+  td->buffer_end = grub_cpu_to_le32 (vtop (buffer_end));
 }
 
 static grub_usb_err_t
@@ -307,7 +309,7 @@ grub_ohci_transfer (grub_usb_controller_t dev,
       grub_ohci_transaction (&td_list[i], tr->pid, tr->toggle,
 			     tr->size, tr->data);
 
-      td_list[i].next_td = grub_cpu_to_le32 (&td_list[i + 1]);
+      td_list[i].next_td = grub_cpu_to_le32 (vtop (&td_list[i + 1]));
     }
 
   /* Setup the Endpoint Descriptor.  */
@@ -324,9 +326,9 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   /* Set the maximum packet size.  */
   target |= transfer->max << 16;
 
-  td_head = (grub_uint32_t) td_list;
+  td_head = vtop ((grub_uint32_t) td_list);
 
-  td_tail = (grub_uint32_t) &td_list[transfer->transcnt];
+  td_tail = vtop ((grub_uint32_t) &td_list[transfer->transcnt]);
 
   ed->target = grub_cpu_to_le32 (target);
   ed->td_head = grub_cpu_to_le32 (td_head);
@@ -353,7 +355,8 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 	status &= ~(1 << 2);
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
 
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, (grub_uint32_t) ed);
+	grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD,
+			      vtop ((grub_uint32_t) ed));
 
 	/* Enable the Bulk list.  */
 	control |= 1 << 5;
@@ -381,9 +384,9 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
 
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD,
-			      (grub_uint32_t) ed);
+			      vtop ((grub_uint32_t) ed));
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD+1,
-			      (grub_uint32_t) ed);
+			      vtop ((grub_uint32_t) ed));
 
 	/* Enable the Control list.  */
 	control |= 1 << 4;
diff --git a/conf/mips.rmk b/conf/mips.rmk
index 553256a9b..f63e9bafc 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -148,6 +148,43 @@ pci_mod_SOURCES = bus/pci.c
 pci_mod_CFLAGS = $(COMMON_CFLAGS)
 pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For lspci.mod
+pkglib_MODULES += lspci.mod
+lspci_mod_SOURCES = commands/lspci.c
+lspci_mod_CFLAGS = $(COMMON_CFLAGS)
+lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ohci.mod
+pkglib_MODULES += ohci.mod
+ohci_mod_SOURCES = bus/usb/ohci.c
+ohci_mod_CFLAGS = $(COMMON_CFLAGS)
+ohci_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usb.mod
+pkglib_MODULES += usb.mod
+usb_mod_SOURCES = bus/usb/usb.c bus/usb/usbtrans.c bus/usb/usbhub.c
+usb_mod_CFLAGS = $(COMMON_CFLAGS)
+usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usbtest.mod
+pkglib_MODULES += usbtest.mod
+usbtest_mod_SOURCES = commands/usbtest.c
+usbtest_mod_CFLAGS = $(COMMON_CFLAGS)
+usbtest_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usbms.mod
+pkglib_MODULES += usbms.mod
+usbms_mod_SOURCES = disk/usbms.c
+usbms_mod_CFLAGS = $(COMMON_CFLAGS)
+usbms_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usb_keyboard.mod
+pkglib_MODULES += usb_keyboard.mod
+usb_keyboard_mod_SOURCES = term/usb_keyboard.c
+usb_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
+usb_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
 # For relocator.mod.
 pkglib_MODULES += relocator.mod
 relocator_mod_SOURCES = lib/$(target_cpu)/relocator.c lib/$(target_cpu)/relocator_asm.S
diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index 76b9bc3d4..e1842e995 100644
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -19,7 +19,6 @@
 
 #include <grub/term.h>
 #include <grub/machine/machine.h>
-#include <grub/machine/console.h>
 #include <grub/time.h>
 #include <grub/cpu/io.h>
 #include <grub/misc.h>

From 0b0b59d8d8d3e60060008624ec354b7a725dbeef Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Mon, 19 Oct 2009 16:39:13 +0200
Subject: [PATCH 0049/1628] add ptov for symetry

---
 bus/usb/ohci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index f13156455..4c844d089 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -28,6 +28,7 @@
 #include <grub/time.h>
 
 #define vtop(x) ((x) & 0x7fffffff)
+#define ptov(x) ((x) | 0x80000000)
 
 struct grub_ohci_hcca
 {
@@ -154,7 +155,7 @@ grub_ohci_pci_iter (int bus, int device, int func,
   if (! o)
     return 1;
 
-  o->iobase = (grub_uint32_t *) base;
+  o->iobase = (grub_uint32_t *) ptov (base);
 
   /* Reserve memory for the HCCA.  */
   o->hcca = (struct grub_ohci_hcca *) grub_memalign (256, 256);

From 7c8f6c181c420b1545a9783605dd78cccc1822b6 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Mon, 19 Oct 2009 18:07:58 +0200
Subject: [PATCH 0050/1628] initial envp support

---
 loader/mips/linux.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index b04249767..056eca793 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -38,7 +38,8 @@ static grub_size_t initrd_size;
 static grub_size_t linux_size;
 
 static grub_uint8_t *playground;
-static grub_addr_t target_addr, entry_addr, initrd_addr, argc_addr, argv_addr;
+static grub_addr_t target_addr, entry_addr, initrd_addr, argc_addr;
+static grub_addr_t argv_addr, envp_addr;
 
 static grub_err_t
 grub_linux_boot (void)
@@ -49,6 +50,7 @@ grub_linux_boot (void)
   state.gpr[1] = entry_addr;
   state.gpr[4] = argc_addr;
   state.gpr[5] = argv_addr;
+  state.gpr[6] = envp_addr;
   state.jumpreg = 1;
   grub_relocator32_boot (playground, target_addr, state);
 
@@ -171,7 +173,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   int i;
   int size;
   void *extra;
-  grub_uint32_t *linux_argv;
+  grub_uint32_t *linux_argv, *linux_envp;
   char *linux_args;
   grub_err_t err;
 
@@ -194,7 +196,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   loaded = 0;
 
   size = sizeof (grub_uint32_t) * argc + ALIGN_UP (sizeof ("g"), 4)
-    + sizeof (grub_uint32_t);
+    + sizeof (grub_uint32_t) + (0 + 1) * sizeof (grub_uint32_t);
   for (i = 1; i < argc; i++)
     size += ALIGN_UP (grub_strlen (argv[i]) + 1, 4);
 
@@ -221,19 +223,27 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   extra = linux_argv + argc;
   linux_args = extra;
 
-  *linux_argv = (grub_uint32_t) linux_args;
+  *linux_argv = (grub_uint8_t *) linux_args - (grub_uint8_t *) playground
+    + target_addr;
   grub_memcpy (linux_args, "g", sizeof ("g"));
   linux_args += ALIGN_UP (sizeof ("g"), 4);
   linux_argv++;
 
   for (i = 1; i < argc; i++)
     {
-      *linux_argv = (grub_uint32_t) linux_args;
+      *linux_argv = (grub_uint8_t *) linux_args - (grub_uint8_t *) playground
+	+ target_addr;
       grub_memcpy (linux_args, argv[i], grub_strlen (argv[i]) + 1);
       linux_args += ALIGN_UP (grub_strlen (argv[i]) + 1, 4);
       linux_argv++;
     }
 
+  extra = linux_args;
+  linux_envp = extra;
+  envp_addr = (grub_uint8_t *) linux_envp - (grub_uint8_t *) playground
+    + target_addr;
+  linux_envp[0] = 0;
+
   grub_loader_set (grub_linux_boot, grub_linux_unload, 1);
   initrd_addr = 0;
   loaded = 1;

From b0000ec899cd31f1777d9b976a5b0265d39ce339 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Mon, 19 Oct 2009 18:08:22 +0200
Subject: [PATCH 0051/1628] compile error fix

---
 bus/usb/ohci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 4c844d089..388f65928 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -310,7 +310,8 @@ grub_ohci_transfer (grub_usb_controller_t dev,
       grub_ohci_transaction (&td_list[i], tr->pid, tr->toggle,
 			     tr->size, tr->data);
 
-      td_list[i].next_td = grub_cpu_to_le32 (vtop (&td_list[i + 1]));
+      td_list[i].next_td = grub_cpu_to_le32 (vtop ((grub_addr_t)
+						   &td_list[i + 1]));
     }
 
   /* Setup the Endpoint Descriptor.  */

From 1e4f46c162ed5d9bb5b425927104788d7d93498b Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Mon, 19 Oct 2009 18:08:44 +0200
Subject: [PATCH 0052/1628] fixed pci base address

---
 include/grub/mips/yeeloong/pci.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/grub/mips/yeeloong/pci.h b/include/grub/mips/yeeloong/pci.h
index bbe7bc202..fd6718c63 100644
--- a/include/grub/mips/yeeloong/pci.h
+++ b/include/grub/mips/yeeloong/pci.h
@@ -23,7 +23,7 @@
 #include <grub/cpu/io.h>
 
 #define GRUB_MACHINE_PCI_IOSPACE        0xbfe80000
-#define GRUB_MACHINE_PCI_CONTROL_REG    (*(grub_uint32_t *) 0x1fe00118)
+#define GRUB_MACHINE_PCI_CONTROL_REG    (*(grub_uint32_t *) 0xbfe00118)
 
 
 static inline grub_uint32_t

From 81d1980198ce7c068d2ed6e32552c52d531dbf9e Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Mon, 19 Oct 2009 18:09:13 +0200
Subject: [PATCH 0053/1628] changed rate of pseudo-clockk to avoid USB stalls

---
 kern/mips/yeeloong/init.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index eece6076c..0b2bff051 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -15,8 +15,9 @@
 grub_uint32_t
 grub_get_rtc (void)
 {
-  static int calln = 0;
-  return calln++;
+  static grub_uint64_t calln = 0;
+
+  return (calln++) >> 8;
 }
 
 void

From 061282ed1107d411c90ca3a19bdb93327b5376ab Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Thu, 22 Oct 2009 17:10:54 +0200
Subject: [PATCH 0054/1628] bonito impl. I/O cleanup

---
 bus/bonito.c                     | 90 ++++++++++++++++++++++++++++++++
 conf/mips.rmk                    |  6 ---
 include/grub/mips/io.h           | 12 ++---
 include/grub/mips/yeeloong/pci.h | 58 +++++++++++++++-----
 4 files changed, 140 insertions(+), 26 deletions(-)
 create mode 100644 bus/bonito.c

diff --git a/bus/bonito.c b/bus/bonito.c
new file mode 100644
index 000000000..a7a530de1
--- /dev/null
+++ b/bus/bonito.c
@@ -0,0 +1,90 @@
+/* bonito.c - PCI bonito interface.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/pci.h>
+#include <grub/misc.h>
+
+static grub_uint32_t base_win[GRUB_MACHINE_PCI_NUM_WIN];
+static const grub_size_t sizes_win[GRUB_MACHINE_PCI_NUM_WIN] = 
+  {GRUB_MACHINE_PCI_WIN1_SIZE, GRUB_MACHINE_PCI_WIN_SIZE, 
+   GRUB_MACHINE_PCI_WIN_SIZE};
+/* Usage counters.  */
+static int usage_win[GRUB_MACHINE_PCI_NUM_WIN];
+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};
+
+static inline void
+write_bases (void)
+{
+  int i;
+  grub_uint32_t reg = 0;
+  for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++) 
+    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 = reg;
+}
+
+void *
+grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),
+			   grub_addr_t base, grub_size_t size)
+{
+  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 ();
+	return (void *) 
+	  (addr_win[i] | (base & GRUB_MACHINE_PCI_WIN_OFFSET_MASK));
+      }
+  grub_fatal ("Out of PCI windows.");
+}
+
+void
+grub_pci_device_unmap_range (grub_pci_device_t dev __attribute__ ((unused)),
+			     void *mem __attribute__ ((unused)),
+			     grub_size_t size __attribute__ ((unused)))
+{
+  int i;
+  for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
+    if (usage_win[i] && addr_win[i] 
+	== (((grub_addr_t) mem) & ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK))
+      {
+	usage_win[i]--;
+	return;
+      }
+  grub_fatal ("Tried to unmap not mapped region");
+}
diff --git a/conf/mips.rmk b/conf/mips.rmk
index f63e9bafc..19ed78237 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -142,12 +142,6 @@ ata_mod_SOURCES = disk/ata.c
 ata_mod_CFLAGS = $(COMMON_CFLAGS)
 ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For pci.mod.
-pkglib_MODULES += pci.mod
-pci_mod_SOURCES = bus/pci.c
-pci_mod_CFLAGS = $(COMMON_CFLAGS)
-pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For lspci.mod
 pkglib_MODULES += lspci.mod
 lspci_mod_SOURCES = commands/lspci.c
diff --git a/include/grub/mips/io.h b/include/grub/mips/io.h
index b86452c0a..dee76bde5 100644
--- a/include/grub/mips/io.h
+++ b/include/grub/mips/io.h
@@ -26,37 +26,37 @@ typedef grub_addr_t grub_port_t;
 static __inline unsigned char
 grub_inb (grub_port_t port)
 {
-  return *(grub_uint8_t *) port;
+  return *(volatile grub_uint8_t *) port;
 }
 
 static __inline unsigned short int
 grub_inw (grub_port_t port)
 {
-  return *(grub_uint16_t *) port;
+  return *(volatile grub_uint16_t *) port;
 }
 
 static __inline unsigned int
 grub_inl (grub_port_t port)
 {
-  return *(grub_uint32_t *) port;
+  return *(volatile grub_uint32_t *) port;
 }
 
 static __inline void
 grub_outb (unsigned char value, grub_port_t port)
 {
-  *(grub_uint8_t *) port = value;
+  *(volatile grub_uint8_t *) port = value;
 }
 
 static __inline void
 grub_outw (unsigned short int value, grub_port_t port)
 {
-  *(grub_uint16_t *) port = value;
+  *(volatile grub_uint16_t *) port = value;
 }
 
 static __inline void
 grub_outl (unsigned int value, grub_port_t port)
 {
-  *(grub_uint32_t *) port = value;
+  *(volatile grub_uint32_t *) port = value;
 }
 
 #endif /* _SYS_IO_H */
diff --git a/include/grub/mips/yeeloong/pci.h b/include/grub/mips/yeeloong/pci.h
index fd6718c63..9970d6ee0 100644
--- a/include/grub/mips/yeeloong/pci.h
+++ b/include/grub/mips/yeeloong/pci.h
@@ -22,50 +22,80 @@
 #include <grub/types.h>
 #include <grub/cpu/io.h>
 
-#define GRUB_MACHINE_PCI_IOSPACE        0xbfe80000
-#define GRUB_MACHINE_PCI_CONTROL_REG    (*(grub_uint32_t *) 0xbfe00118)
+#define GRUB_MACHINE_PCI_CONFSPACE        0xbfe80000
+#define GRUB_MACHINE_PCI_CONF_CTRL_REG    (*(volatile grub_uint32_t *) 0xbfe00118)
+#define GRUB_MACHINE_PCI_IO_CTRL_REG      (*(volatile grub_uint32_t *) 0xbfe00110)
+#define GRUB_MACHINE_PCI_WIN_MASK_SIZE    6
+#define GRUB_MACHINE_PCI_WIN_MASK         ((1 << GRUB_MACHINE_PCI_WIN_MASK_SIZE) - 1)
 
+/* We have 3 PCI windows.  */
+#define GRUB_MACHINE_PCI_NUM_WIN          3
+/* Each window is 64MiB.  */
+#define GRUB_MACHINE_PCI_WIN_SHIFT        26
+#define GRUB_MACHINE_PCI_WIN_OFFSET_MASK  ((1 << GRUB_MACHINE_PCI_WIN_SHIFT) - 1)
+
+#define GRUB_MACHINE_PCI_WIN_SIZE         0x04000000
+/* Graphical acceleration takes 1 MiB away.  */
+#define GRUB_MACHINE_PCI_WIN1_SIZE        0x03f00000
+
+#define GRUB_MACHINE_PCI_WIN1_ADDR        0xb0000000
+#define GRUB_MACHINE_PCI_WIN2_ADDR        0xb4000000
+#define GRUB_MACHINE_PCI_WIN3_ADDR        0xb8000000
 
 static inline grub_uint32_t
 grub_pci_read (grub_pci_address_t addr)
 {
-  GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
-  return *(grub_uint32_t *) (GRUB_MACHINE_PCI_IOSPACE | (addr & 0xffff));
+  GRUB_MACHINE_PCI_CONF_CTRL_REG = addr >> 16;
+  return *(volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONFSPACE
+				      | (addr & 0xffff));
 }
 
 static inline grub_uint16_t
 grub_pci_read_word (grub_pci_address_t addr)
 {
-  GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
-  return *(grub_uint16_t *) (GRUB_MACHINE_PCI_IOSPACE | (addr & 0xffff));
+  GRUB_MACHINE_PCI_CONF_CTRL_REG = addr >> 16;
+  return *(volatile grub_uint16_t *) (GRUB_MACHINE_PCI_CONFSPACE
+				      | (addr & 0xffff));
 }
 
 static inline grub_uint8_t
 grub_pci_read_byte (grub_pci_address_t addr)
 {
-  GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
-  return *(grub_uint8_t *) (GRUB_MACHINE_PCI_IOSPACE | (addr & 0xffff));
+  GRUB_MACHINE_PCI_CONF_CTRL_REG = addr >> 16;
+  return *(volatile grub_uint8_t *) (GRUB_MACHINE_PCI_CONFSPACE
+				     | (addr & 0xffff));
 }
 
 static inline void
 grub_pci_write (grub_pci_address_t addr, grub_uint32_t data)
 {
-  GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
-  *(grub_uint32_t *) (GRUB_MACHINE_PCI_IOSPACE | (addr & 0xffff)) = data;
+  GRUB_MACHINE_PCI_CONF_CTRL_REG = addr >> 16;
+  *(volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONFSPACE
+			       | (addr & 0xffff)) = data;
 }
 
 static inline void
 grub_pci_write_word (grub_pci_address_t addr, grub_uint16_t data)
 {
-  GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
-  *(grub_uint16_t *) (GRUB_MACHINE_PCI_IOSPACE | (addr & 0xffff)) = data;
+  GRUB_MACHINE_PCI_CONF_CTRL_REG = addr >> 16;
+  *(volatile grub_uint16_t *) (GRUB_MACHINE_PCI_CONFSPACE
+			       | (addr & 0xffff)) = data;
 }
 
 static inline void
 grub_pci_write_byte (grub_pci_address_t addr, grub_uint8_t data)
 {
-  GRUB_MACHINE_PCI_CONTROL_REG = addr >> 16;
-  *(grub_uint8_t *) (GRUB_MACHINE_PCI_IOSPACE | (addr & 0xffff)) = data;
+  GRUB_MACHINE_PCI_CONF_CTRL_REG = addr >> 16;
+  *(volatile grub_uint8_t *) (GRUB_MACHINE_PCI_CONFSPACE
+			      | (addr & 0xffff)) = data;
 }
 
+void *
+grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),
+			   grub_addr_t base, grub_size_t size);
+void
+grub_pci_device_unmap_range (grub_pci_device_t dev __attribute__ ((unused)),
+			     void *mem,
+			     grub_size_t size __attribute__ ((unused)));
+
 #endif /* GRUB_MACHINE_PCI_H */

From 5855d253f4f7bcb815eedfd083ff4a24a9f1a063 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Fri, 23 Oct 2009 18:20:04 +0200
Subject: [PATCH 0055/1628] elf format

---
 util/grub-mkrawimage.c | 133 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 119 insertions(+), 14 deletions(-)

diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 0d26e3cf4..2097cefeb 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -22,6 +22,8 @@
 #include <grub/machine/boot.h>
 #include <grub/machine/kernel.h>
 #include <grub/machine/memory.h>
+#include <grub/machine/machine.h>
+#include <grub/elf.h>
 #include <grub/kernel.h>
 #include <grub/disk.h>
 #include <grub/util/misc.h>
@@ -91,7 +93,14 @@ compress_kernel (char *kernel_img, size_t kernel_size,
 
 static void
 generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
-		char *memdisk_path, char *config_path)
+		char *memdisk_path, char *config_path,
+#ifdef GRUB_PLATFORM_IMAGE_DEFAULT
+		grub_platform_image_format_t format
+#else
+		int dummy __attribute__ ((unused))
+#endif
+
+)
 {
   char *kernel_img, *core_img;
   size_t kernel_size, total_module_size, core_size;
@@ -211,10 +220,9 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
     
     boot_img = grub_util_read_image (boot_path);
     
-    /* i386 is a little endian architecture.  */
     *((grub_uint16_t *) (boot_img + GRUB_DISK_SECTOR_SIZE
 			 - GRUB_BOOT_MACHINE_LIST_SIZE + 8))
-      = grub_cpu_to_le16 (num);
+      = grub_host_to_target16 (num);
     
     grub_util_write_image (boot_img, boot_size, out);
     free (boot_img);
@@ -238,12 +246,12 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
     memset (rom_img, 0, rom_size);
 
     *((grub_int32_t *) (core_img + GRUB_KERNEL_MACHINE_CORE_ENTRY_ADDR))
-      = grub_cpu_to_le32 ((grub_uint32_t) -rom_size);
+      = grub_host_to_target32 ((grub_uint32_t) -rom_size);
 
     memcpy (rom_img, core_img, core_size);
 
     *((grub_int32_t *) (boot_img + GRUB_BOOT_MACHINE_CORE_ENTRY_ADDR))
-      = grub_cpu_to_le32 ((grub_uint32_t) -rom_size);
+      = grub_host_to_target32 ((grub_uint32_t) -rom_size);
 
     memcpy (rom_img + rom_size - boot_size, boot_img, boot_size);
 
@@ -254,18 +262,17 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
     free (boot_img);
     free (boot_path);
   }
-
 #endif
 
 #ifdef GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
   *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE))
-    = grub_cpu_to_le32 (total_module_size);
+    = grub_host_to_target32 (total_module_size);
 #endif
   *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE))
-    = grub_cpu_to_le32 (kernel_size);
+    = grub_host_to_target32 (kernel_size);
 #ifdef GRUB_KERNEL_MACHINE_COMPRESSED_SIZE
   *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_COMPRESSED_SIZE))
-    = grub_cpu_to_le32 (core_size - GRUB_KERNEL_MACHINE_RAW_SIZE);
+    = grub_host_to_target32 (core_size - GRUB_KERNEL_MACHINE_RAW_SIZE);
 #endif
 
 #if defined(GRUB_KERNEL_MACHINE_INSTALL_DOS_PART) && defined(GRUB_KERNEL_MACHINE_INSTALL_BSD_PART)
@@ -274,9 +281,9 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
   if (prefix[0] == '(')
     {
       *((grub_int32_t *) (core_img + GRUB_KERNEL_MACHINE_INSTALL_DOS_PART))
-	= grub_cpu_to_le32 (-2);
+	= grub_host_to_target32 (-2);
       *((grub_int32_t *) (core_img + GRUB_KERNEL_MACHINE_INSTALL_BSD_PART))
-	= grub_cpu_to_le32 (-2);
+	= grub_host_to_target32 (-2);
     }
 #endif
 
@@ -286,6 +293,68 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
  		     GRUB_KERNEL_MACHINE_LINK_ADDR + core_size, GRUB_MEMORY_MACHINE_UPPER);
 #endif
 
+#if defined(GRUB_MACHINE_MIPS)
+  if (format == GRUB_PLATFORM_IMAGE_ELF)
+    {
+      char *elf_img;
+      size_t program_size;
+      Elf32_Ehdr *ehdr;
+      Elf32_Phdr *phdr;
+      grub_uint32_t target_addr;
+
+      program_size = ALIGN_UP (core_size, 4);
+
+      elf_img = xmalloc (program_size + sizeof (*ehdr) + sizeof (*phdr));
+      memset (elf_img, 0, program_size + sizeof (*ehdr) + sizeof (*phdr));
+      memcpy (elf_img  + sizeof (*ehdr) + sizeof (*phdr), core_img, core_size);
+      ehdr = (void *) elf_img;
+      phdr = (void *) (elf_img + sizeof (*ehdr));
+      memcpy (ehdr->e_ident, ELFMAG, SELFMAG);
+      ehdr->e_ident[EI_CLASS] = ELFCLASS32;
+#ifdef GRUB_CPU_MIPSEL
+      ehdr->e_ident[EI_DATA] = ELFDATA2LSB;
+#else
+      ehdr->e_ident[EI_DATA] = ELFDATA2MSB;
+#endif
+      ehdr->e_ident[EI_VERSION] = EV_CURRENT;
+      ehdr->e_ident[EI_OSABI] = ELFOSABI_NONE;
+      ehdr->e_type = grub_host_to_target16 (ET_EXEC);
+      ehdr->e_machine = grub_host_to_target16 (EM_MIPS);
+      ehdr->e_version = grub_host_to_target32 (EV_CURRENT);
+
+      ehdr->e_phoff = grub_host_to_target32 ((char *) phdr - (char *) ehdr);
+      ehdr->e_phentsize = grub_host_to_target16 (sizeof (*phdr));
+      ehdr->e_phnum = grub_host_to_target16 (1);
+
+      /* No section headers.  */
+      ehdr->e_shoff = grub_host_to_target32 (0);
+      ehdr->e_shentsize = grub_host_to_target16 (0);
+      ehdr->e_shnum = grub_host_to_target16 (0);
+      ehdr->e_shstrndx = grub_host_to_target16 (0);
+      
+      ehdr->e_ehsize = grub_host_to_target16 (sizeof (*ehdr));
+      
+      phdr->p_type = grub_host_to_target32 (PT_LOAD);
+      phdr->p_offset = grub_host_to_target32 (sizeof (*ehdr) + sizeof (*phdr));
+      phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
+      
+      target_addr = ALIGN_UP (GRUB_KERNEL_MACHINE_LINK_ADDR 
+			      + kernel_size + total_module_size, 32);
+      ehdr->e_entry = grub_host_to_target32 (target_addr);
+      phdr->p_vaddr = grub_host_to_target32 (target_addr);
+      phdr->p_paddr = grub_host_to_target32 (target_addr);
+      phdr->p_align = grub_host_to_target32 (GRUB_KERNEL_MACHINE_LINK_ALIGN);
+      ehdr->e_flags = grub_host_to_target32 (0x1000 | EF_MIPS_NOREORDER 
+					     | EF_MIPS_PIC | EF_MIPS_CPIC);
+      phdr->p_filesz = grub_host_to_target32 (core_size);
+      phdr->p_memsz = grub_host_to_target32 (core_size);
+
+      free (core_img);
+      core_img = elf_img;
+      core_size = program_size  + sizeof (*ehdr) + sizeof (*phdr);
+  }
+#endif
+
   grub_util_write_image (core_img, core_size, out);
   free (kernel_img);
   free (core_img);
@@ -309,6 +378,9 @@ static struct option options[] =
     {"memdisk", required_argument, 0, 'm'},
     {"config", required_argument, 0, 'c'},
     {"output", required_argument, 0, 'o'},
+#ifdef GRUB_PLATFORM_IMAGE_DEFAULT
+    {"format", required_argument, 0, 'f'},
+#endif
     {"help", no_argument, 0, 'h'},
     {"version", no_argument, 0, 'V'},
     {"verbose", no_argument, 0, 'v'},
@@ -330,7 +402,15 @@ Make a bootable image of GRUB.\n\
   -p, --prefix=DIR        set grub_prefix directory [default=%s]\n\
   -m, --memdisk=FILE      embed FILE as a memdisk image\n\
   -c, --config=FILE       embed FILE as boot config\n\
-  -o, --output=FILE       output a generated image to FILE [default=stdout]\n\
+  -o, --output=FILE       output a generated image to FILE [default=stdout]\n"
+#ifdef GRUB_PLATFORM_IMAGE_DEFAULT
+	    "\
+  -f, --format=FORMAT     generate an image in format [default=" 
+	    GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT "]\n	\
+	                available formats: "
+	    GRUB_PLATFORM_IMAGE_FORMATS "\n"
+#endif
+	    "\
   -h, --help              display this message and exit\n\
   -V, --version           print version information and exit\n\
   -v, --verbose           print verbose messages\n\
@@ -350,12 +430,15 @@ main (int argc, char *argv[])
   char *memdisk = NULL;
   char *config = NULL;
   FILE *fp = stdout;
+#ifdef GRUB_PLATFORM_IMAGE_DEFAULT
+  grub_platform_image_format_t format = GRUB_PLATFORM_IMAGE_DEFAULT;
+#endif
 
   progname = "grub-mkimage";
 
   while (1)
     {
-      int c = getopt_long (argc, argv, "d:p:m:c:o:hVv", options, 0);
+      int c = getopt_long (argc, argv, "d:p:m:c:o:f:hVv", options, 0);
 
       if (c == -1)
 	break;
@@ -369,6 +452,22 @@ main (int argc, char *argv[])
 	    output = xstrdup (optarg);
 	    break;
 
+#ifdef GRUB_PLATFORM_IMAGE_DEFAULT
+	  case 'f':
+#ifdef GRUB_PLATFORM_IMAGE_RAW
+	    if (strcmp (optarg, "raw") == 0)
+	      format = GRUB_PLATFORM_IMAGE_RAW;
+	    else 
+#endif
+#ifdef GRUB_PLATFORM_IMAGE_ELF
+	    if (strcmp (optarg, "elf") == 0)
+	      format = GRUB_PLATFORM_IMAGE_ELF;
+	    else 
+#endif
+	      usage (1);
+	    break;
+#endif
+
 	  case 'd':
 	    if (dir)
 	      free (dir);
@@ -429,7 +528,13 @@ main (int argc, char *argv[])
     }
 
   generate_image (dir ? : GRUB_LIBDIR, prefix ? : DEFAULT_DIRECTORY, fp,
-		  argv + optind, memdisk, config);
+		  argv + optind, memdisk, config,
+#ifdef GRUB_PLATFORM_IMAGE_DEFAULT
+		  format
+#else
+		  0
+#endif
+		  );
 
   fclose (fp);
 

From 270bd79ca79d2b2fa951ed0e3a2cd3409a5f5d50 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Fri, 23 Oct 2009 18:20:52 +0200
Subject: [PATCH 0056/1628] kernel constants updated

---
 include/grub/mips/kernel.h | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/include/grub/mips/kernel.h b/include/grub/mips/kernel.h
index 4a7c9293c..29f7e4d4e 100644
--- a/include/grub/mips/kernel.h
+++ b/include/grub/mips/kernel.h
@@ -19,10 +19,12 @@
 #ifndef GRUB_KERNEL_CPU_HEADER
 #define GRUB_KERNEL_CPU_HEADER	1
 
-#define GRUB_MOD_ALIGN 0x1000
+#define GRUB_MOD_ALIGN 0x1
 /* Non-zero value is only needed for PowerMacs.  */
 #define GRUB_MOD_GAP   0x0
 
+#define GRUB_KERNEL_MACHINE_LINK_ALIGN  32
+
 #define GRUB_KERNEL_CPU_RAW_SIZE        0x100
 #define GRUB_KERNEL_CPU_COMPRESSED_SIZE        0x8
 #define GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE      0xc
@@ -39,8 +41,21 @@
 #define GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE
 #define GRUB_KERNEL_MACHINE_COMPRESSED_SIZE GRUB_KERNEL_CPU_COMPRESSED_SIZE
 
+#define GRUB_PLATFORM_IMAGE_FORMATS     "raw, elf"
+#define GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT     "raw"
+
+#define GRUB_PLATFORM_IMAGE_DEFAULT GRUB_PLATFORM_IMAGE_RAW
+
 #ifndef ASM_FILE
 
+typedef enum {
+  GRUB_PLATFORM_IMAGE_RAW,
+  GRUB_PLATFORM_IMAGE_ELF
+}
+  grub_platform_image_format_t;
+#define GRUB_PLATFORM_IMAGE_RAW GRUB_PLATFORM_IMAGE_RAW
+#define GRUB_PLATFORM_IMAGE_ELF GRUB_PLATFORM_IMAGE_ELF
+
 /* The prefix which points to the directory where GRUB modules and its
    configuration file are located.  */
 extern char grub_prefix[];

From f0628ef04f3b2f3d043b76855ed2362a0e8fdd0e Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Fri, 23 Oct 2009 18:21:15 +0200
Subject: [PATCH 0057/1628] additional "machines"

---
 include/grub/mips/yeeloong/machine.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/grub/mips/yeeloong/machine.h b/include/grub/mips/yeeloong/machine.h
index 9f29b4a46..f20d9d210 100644
--- a/include/grub/mips/yeeloong/machine.h
+++ b/include/grub/mips/yeeloong/machine.h
@@ -20,5 +20,7 @@
 #define GRUB_MACHINE_MACHINE_HEADER	1
 
 #define GRUB_MACHINE_MIPS_YEELOONG	1
+#define GRUB_MACHINE_MIPS               1
+#define GRUB_MACHINE_MIPS_BONITO        1
 
 #endif /* ! GRUB_MACHINE_MACHINE_HEADER */

From e95fcb5379226014a7ca4d003d2ac5ab402a4305 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 24 Oct 2009 10:44:00 +0200
Subject: [PATCH 0058/1628] move common init function to kern/mips/init.c

---
 kern/mips/init.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 kern/mips/init.c

diff --git a/kern/mips/init.c b/kern/mips/init.c
new file mode 100644
index 000000000..5adcedcbb
--- /dev/null
+++ b/kern/mips/init.c
@@ -0,0 +1,35 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/kernel.h>
+#include <grub/env.h>
+#include <grub/mips/kernel.h>
+
+void
+grub_machine_set_prefix (void)
+{
+  grub_env_set ("prefix", grub_prefix);
+}
+
+extern char _end[];
+
+grub_addr_t
+grub_arch_modules_addr (void)
+{
+  return (grub_addr_t) _end;
+}

From 01e825cc4b2e8a227c13f7dfcf3ccfcffc1121d5 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 24 Oct 2009 10:44:32 +0200
Subject: [PATCH 0059/1628] basic framebuffer support

---
 video/sm712.c | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 197 insertions(+)
 create mode 100644 video/sm712.c

diff --git a/video/sm712.c b/video/sm712.c
new file mode 100644
index 000000000..5ebd865b7
--- /dev/null
+++ b/video/sm712.c
@@ -0,0 +1,197 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2005,2006,2007,2008,2009  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/>.
+ */
+
+#define grub_video_render_target grub_video_fbrender_target
+
+#include <grub/err.h>
+#include <grub/types.h>
+#include <grub/dl.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/video.h>
+#include <grub/video_fb.h>
+#include <grub/pci.h>
+
+static struct
+{
+  struct grub_video_mode_info mode_info;
+  struct grub_video_render_target *render_target;
+
+  unsigned int bytes_per_scan_line;
+  unsigned int bytes_per_pixel;
+  grub_uint8_t *ptr;
+  int index_color_mode;
+  int mapped;
+  grub_pci_device_t dev;
+} framebuffer;
+
+static grub_err_t
+grub_video_sm712_video_init (void)
+{
+  /* Reset frame buffer.  */
+  grub_memset (&framebuffer, 0, sizeof(framebuffer));
+
+  return grub_video_fb_init ();
+}
+
+static grub_err_t
+grub_video_sm712_video_fini (void)
+{
+  if (framebuffer.mapped)
+    grub_pci_device_unmap_range (framebuffer.dev, framebuffer.ptr,
+				 1024 * 600 * 2);
+
+  return grub_video_fb_fini ();
+}
+
+static grub_err_t
+grub_video_sm712_setup (unsigned int width, unsigned int height,
+			unsigned int mode_type)
+{
+  int depth;
+  grub_err_t err;
+
+  /* Decode depth from mode_type.  If it is zero, then autodetect.  */
+  depth = (mode_type & GRUB_VIDEO_MODE_TYPE_DEPTH_MASK)
+          >> GRUB_VIDEO_MODE_TYPE_DEPTH_POS;
+
+  if ((1024 != width && width != 0) || (600 != height && height != 0)
+      || (16 != depth && depth != 0))
+    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+		       "Only 1024x600x16 is supported");
+
+  /* Fill mode info details.  */
+  framebuffer.mode_info.width = 1024;
+  framebuffer.mode_info.height = 600;
+  framebuffer.mode_info.mode_type = GRUB_VIDEO_MODE_TYPE_RGB;
+  framebuffer.mode_info.bpp = 16;
+  framebuffer.mode_info.bytes_per_pixel = 2;
+  framebuffer.mode_info.pitch = 1024 * 2;
+  framebuffer.mode_info.number_of_colors = 256;
+  framebuffer.mode_info.red_mask_size = 5;
+  framebuffer.mode_info.red_field_pos = 11;
+  framebuffer.mode_info.green_mask_size = 6;
+  framebuffer.mode_info.green_field_pos = 5;
+  framebuffer.mode_info.blue_mask_size = 5;
+  framebuffer.mode_info.blue_field_pos = 0;
+  framebuffer.mode_info.reserved_mask_size = 0;
+  framebuffer.mode_info.reserved_field_pos = 0;
+  framebuffer.mode_info.blit_format = grub_video_get_blit_format (&framebuffer.mode_info);
+  *(volatile grub_uint32_t *) 0xbfe00110 = 1;
+  framebuffer.ptr = (void *) 0xb0000000;
+  //  framebuffer.ptr = grub_pci_device_map_range (framebuffer.dev, 1 << 26,
+  //					       1024 * 600 * 2);
+  framebuffer.mapped = 1;
+
+  err = grub_video_fb_create_render_target_from_pointer (&framebuffer.render_target, &framebuffer.mode_info, framebuffer.ptr);
+
+  if (err)
+    return err;
+
+  err = grub_video_fb_set_active_render_target (framebuffer.render_target);
+  
+  if (err)
+    return err;
+
+  /* Copy default palette to initialize emulated palette.  */
+  err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
+				   grub_video_fbstd_colors);
+  return err;
+}
+
+static grub_err_t
+grub_video_sm712_set_palette (unsigned int start, unsigned int count,
+                            struct grub_video_palette_data *palette_data)
+{
+  if (framebuffer.index_color_mode)
+    {
+      /* TODO: Implement setting indexed color mode palette to hardware.  */
+    }
+
+  /* Then set color to emulated palette.  */
+  return grub_video_fb_set_palette (start, count, palette_data);
+}
+
+static grub_err_t
+grub_video_sm712_swap_buffers (void)
+{
+  /* TODO: Implement buffer swapping.  */
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_video_sm712_set_active_render_target (struct grub_video_render_target *target)
+{
+  if (target == GRUB_VIDEO_RENDER_TARGET_DISPLAY)
+      target = framebuffer.render_target;
+
+  return grub_video_fb_set_active_render_target (target);
+}
+
+static grub_err_t
+grub_video_sm712_get_info_and_fini (struct grub_video_mode_info *mode_info,
+				    void **framebuf)
+{
+  grub_memcpy (mode_info, &(framebuffer.mode_info), sizeof (*mode_info));
+  *framebuf = (char *) framebuffer.ptr;
+
+  grub_video_fb_fini ();
+
+  return GRUB_ERR_NONE;
+}
+
+
+static struct grub_video_adapter grub_video_sm712_adapter =
+  {
+    .name = "SM712 Video Driver",
+
+    .init = grub_video_sm712_video_init,
+    .fini = grub_video_sm712_video_fini,
+    .setup = grub_video_sm712_setup,
+    .get_info = grub_video_fb_get_info,
+    .get_info_and_fini = grub_video_sm712_get_info_and_fini,
+    .set_palette = grub_video_sm712_set_palette,
+    .get_palette = grub_video_fb_get_palette,
+    .set_viewport = grub_video_fb_set_viewport,
+    .get_viewport = grub_video_fb_get_viewport,
+    .map_color = grub_video_fb_map_color,
+    .map_rgb = grub_video_fb_map_rgb,
+    .map_rgba = grub_video_fb_map_rgba,
+    .unmap_color = grub_video_fb_unmap_color,
+    .fill_rect = grub_video_fb_fill_rect,
+    .blit_bitmap = grub_video_fb_blit_bitmap,
+    .blit_render_target = grub_video_fb_blit_render_target,
+    .scroll = grub_video_fb_scroll,
+    .swap_buffers = grub_video_sm712_swap_buffers,
+    .create_render_target = grub_video_fb_create_render_target,
+    .delete_render_target = grub_video_fb_delete_render_target,
+    .set_active_render_target = grub_video_sm712_set_active_render_target,
+    .get_active_render_target = grub_video_fb_get_active_render_target,
+
+    .next = 0
+  };
+
+GRUB_MOD_INIT(video_sm712)
+{
+  grub_video_register (&grub_video_sm712_adapter);
+}
+
+GRUB_MOD_FINI(video_sm712)
+{
+  grub_video_unregister (&grub_video_sm712_adapter);
+}

From 8bf6643e526b112344fa80d906bdbbd662d8fd36 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 24 Oct 2009 10:45:54 +0200
Subject: [PATCH 0060/1628] untracked rmk file added

---
 conf/mips-yeeloong.rmk | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 conf/mips-yeeloong.rmk

diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
new file mode 100644
index 000000000..95ec26522
--- /dev/null
+++ b/conf/mips-yeeloong.rmk
@@ -0,0 +1,18 @@
+# -*- makefile -*-
+LINK_BASE = 0x80200000
+target_machine=yeeloong
+COMMON_CFLAGS += -march=mips3
+COMMON_ASFLAGS += -march=mips3
+include $(srcdir)/conf/mips.mk
+
+# For pci.mod.
+pkglib_MODULES += pci.mod
+pci_mod_SOURCES = bus/pci.c bus/bonito.c
+pci_mod_CFLAGS = $(COMMON_CFLAGS)
+pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For pci.mod.
+pkglib_MODULES += sm712.mod
+sm712_mod_SOURCES = video/sm712.c 
+sm712_mod_CFLAGS = $(COMMON_CFLAGS)
+sm712_mod_LDFLAGS = $(COMMON_LDFLAGS)

From 1e1ddb6cb924e1b8d260f6e5029766b2b02bf5d2 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 24 Oct 2009 10:56:21 +0200
Subject: [PATCH 0061/1628] init fixes

---
 kern/mips/yeeloong/init.c | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 0b2bff051..01acd4f1c 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -1,3 +1,21 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/kernel.h>
 #include <grub/misc.h>
 #include <grub/env.h>
@@ -51,26 +69,11 @@ grub_reboot (void)
   while (1);
 }
 
-void
-grub_machine_set_prefix (void)
-{
-  grub_env_set ("prefix", grub_prefix);
-}
-
-extern char _end[];
-
-grub_addr_t
-grub_arch_modules_addr (void)
-{
-  return ALIGN_UP((grub_addr_t) _end + GRUB_MOD_GAP, GRUB_MOD_ALIGN);
-}
-
 grub_err_t 
 grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, 
 							 grub_uint64_t, 
 							 grub_uint32_t))
 {
-  hook (0, RAMSIZE,
-	GRUB_MACHINE_MEMORY_AVAILABLE);
+  hook (0, RAMSIZE, GRUB_MACHINE_MEMORY_AVAILABLE);
   return GRUB_ERR_NONE;
 }

From e6efd24fa0f23115fe0c96dbd6cea87da61d03d7 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 24 Oct 2009 10:58:20 +0200
Subject: [PATCH 0062/1628] working but suboptimal cache flusher

---
 kern/mips/cache.S | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/kern/mips/cache.S b/kern/mips/cache.S
index ec13a9b95..e4436450f 100644
--- a/kern/mips/cache.S
+++ b/kern/mips/cache.S
@@ -3,7 +3,12 @@
 	/* FIXME: This should invalidate only part of memory.  */
 FUNCTION (grub_cpu_flush_cache)
 FUNCTION (grub_arch_sync_caches)
-#if __mips >= 2
-	sync
-#endif
+repeat:
+	cache 1, 0($a0)
+	cache 0, 0($a0)
+	cache 3, 0($a0)
+	cache 0, 0($a0)
+	addiu $a0, $a0, 1
+	addiu $a1, $a1, 0xffff
+	bne $a1, $zero, repeat
 	j $31

From 3c842eea9f9881f48866ed6a77536e4bd13a3ec6 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 24 Oct 2009 12:43:49 +0200
Subject: [PATCH 0063/1628] fixed rmk

---
 conf/mips.rmk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/conf/mips.rmk b/conf/mips.rmk
index 19ed78237..cba8281e8 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -1,8 +1,8 @@
 
 # -*- makefile -*-
 
-COMMON_ASFLAGS = -nostdinc
-COMMON_CFLAGS = -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
+COMMON_ASFLAGS += -nostdinc
+COMMON_CFLAGS += -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
 COMMON_LDFLAGS += -nostdlib
 
 # Used by various components.  These rules need to precede them.
@@ -85,7 +85,8 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c 	\
 grub_emu_LDFLAGS = $(LIBCURSES)
 
 kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
-	kern/main.c kern/device.c kern/$(target_cpu)/$(target_machine)/init.c 		\
+	kern/main.c kern/device.c kern/$(target_cpu)/init.c \
+	kern/$(target_cpu)/$(target_machine)/init.c 		\
 	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c 		\
 	kern/misc.c kern/mm.c kern/reader.c kern/term.c 	\
 	kern/rescue_parser.c kern/rescue_reader.c \
@@ -107,7 +108,7 @@ bin_SCRIPTS =
 bin_UTILITIES += grub-mkimage
 grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
 	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
-grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
+grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(LINK_BASE)
 util/i386/pc/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # Modules.
@@ -178,7 +179,6 @@ usb_keyboard_mod_SOURCES = term/usb_keyboard.c
 usb_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
 usb_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-
 # For relocator.mod.
 pkglib_MODULES += relocator.mod
 relocator_mod_SOURCES = lib/$(target_cpu)/relocator.c lib/$(target_cpu)/relocator_asm.S

From a9b7a540bd7214b31763ebe7d7dc8facb97438c3 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 24 Oct 2009 12:44:42 +0200
Subject: [PATCH 0064/1628] font preload

---
 font/font.c            | 16 +---------
 font/font_cmd.c        | 70 ++++++++++++++++++++++++++++++++++++++++--
 include/grub/font.h    |  3 +-
 include/grub/kernel.h  |  3 +-
 util/grub-mkrawimage.c | 49 ++++++++++++++++++++++++-----
 5 files changed, 114 insertions(+), 27 deletions(-)

diff --git a/font/font.c b/font/font.c
index a81291916..a6cdf3c93 100644
--- a/font/font.c
+++ b/font/font.c
@@ -17,7 +17,6 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <grub/bufio.h>
 #include <grub/dl.h>
 #include <grub/file.h>
 #include <grub/font.h>
@@ -374,25 +373,12 @@ read_section_as_short (struct font_file_section *section, grub_int16_t *value)
 /* Load a font and add it to the beginning of the global font list.
    Returns 0 upon success, nonzero upon failure.  */
 int
-grub_font_load (const char *filename)
+grub_font_load (grub_file_t file)
 {
-  grub_file_t file = 0;
   struct font_file_section section;
   char magic[4];
   grub_font_t font = 0;
 
-#if FONT_DEBUG >= 1
-  grub_printf("add_font(%s)\n", filename);
-#endif
-
-  file = grub_buffile_open (filename, 1024);
-  if (!file)
-    goto fail;
-
-#if FONT_DEBUG >= 3
-  grub_printf("file opened\n");
-#endif
-
   /* Read the FILE section.  It indicates the file format.  */
   if (open_section (file, &section) != 0)
     goto fail;
diff --git a/font/font_cmd.c b/font/font_cmd.c
index 0402b8d77..8b9817409 100644
--- a/font/font_cmd.c
+++ b/font/font_cmd.c
@@ -17,10 +17,13 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <grub/bufio.h>
 #include <grub/font.h>
 #include <grub/dl.h>
 #include <grub/misc.h>
 #include <grub/command.h>
+#include <grub/kernel.h>
+#include <grub/mm.h>
 
 static grub_err_t
 loadfont_command (grub_command_t cmd __attribute__ ((unused)),
@@ -31,8 +34,16 @@ loadfont_command (grub_command_t cmd __attribute__ ((unused)),
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "no font specified");
 
   while (argc--)
-    if (grub_font_load (*args++) != 0)
-      return GRUB_ERR_BAD_FONT;
+    {
+      grub_file_t file = 0;
+
+      file = grub_buffile_open (*args++, 1024);
+      if (!file)
+	return grub_errno;
+
+      if (grub_font_load (file) != 0)
+	return GRUB_ERR_BAD_FONT;
+    }
 
   return GRUB_ERR_NONE;
 }
@@ -54,12 +65,67 @@ lsfonts_command (grub_command_t cmd __attribute__ ((unused)),
   return GRUB_ERR_NONE;
 }
 
+static grub_ssize_t 
+pseudo_file_read (struct grub_file *file, char *buf, grub_size_t len)
+{
+  grub_memcpy (buf, (char *) file->data + file->offset, len);
+  return len;
+}
+
+static grub_err_t 
+pseudo_file_close (struct grub_file *file)
+{
+  grub_free (file->data);
+  file->data = 0;
+  return GRUB_ERR_NONE;
+}
+
+
+/* Filesystem descriptor.  */
+static struct grub_fs pseudo_fs =
+{
+  .name = "Font Loader",
+  .read = pseudo_file_read,
+  .close = pseudo_file_close
+};
+
+
+static int
+load_font_module (struct grub_module_header *header)
+{
+  grub_file_t file;
+  if (header->type != OBJ_TYPE_FONT)
+    return 0;
+
+  file = grub_malloc (sizeof (*file));
+
+  file->read_hook = 0;
+
+  file->offset = 0;
+  file->size = header->size - sizeof (struct grub_module_header);
+  file->data = grub_malloc (header->size - sizeof (struct grub_module_header));
+  if (!file->data)
+    return 0;
+  grub_memcpy (file->data, (char *) header + sizeof (struct grub_module_header),
+	       file->size);
+
+  file->device = 0;
+  file->fs = &pseudo_fs;
+
+  grub_font_load (file);
+
+  return 0;
+}
+
+
 static grub_command_t cmd_loadfont, cmd_lsfonts;
 
 GRUB_MOD_INIT(font_manager)
 {
   grub_font_loader_init ();
 
+  grub_module_iterate (load_font_module);
+
   cmd_loadfont =
     grub_register_command ("loadfont", loadfont_command,
 			 "loadfont FILE...",
diff --git a/include/grub/font.h b/include/grub/font.h
index 8a5f3ac7d..2129c30b3 100644
--- a/include/grub/font.h
+++ b/include/grub/font.h
@@ -21,6 +21,7 @@
 
 #include <grub/types.h>
 #include <grub/video.h>
+#include <grub/file.h>
 
 /* Forward declaration of opaque structure grub_font.
    Users only pass struct grub_font pointers to the font module functions,
@@ -74,7 +75,7 @@ void grub_font_loader_init (void);
 
 /* Load a font and add it to the beginning of the global font list.
    Returns: 0 upon success; nonzero upon failure.  */
-int grub_font_load (const char *filename);
+int grub_font_load (grub_file_t file);
 
 /* Get the font that has the specified name.  Font names are in the form
    "Family Name Bold Italic 14", where Bold and Italic are optional.
diff --git a/include/grub/kernel.h b/include/grub/kernel.h
index 75ec77c2a..9586a90b9 100644
--- a/include/grub/kernel.h
+++ b/include/grub/kernel.h
@@ -26,7 +26,8 @@ enum
 {
   OBJ_TYPE_ELF,
   OBJ_TYPE_MEMDISK,
-  OBJ_TYPE_CONFIG
+  OBJ_TYPE_CONFIG,
+  OBJ_TYPE_FONT
 };
 
 /* The module header.  */
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 2097cefeb..5005afd1f 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -93,7 +93,7 @@ compress_kernel (char *kernel_img, size_t kernel_size,
 
 static void
 generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
-		char *memdisk_path, char *config_path,
+		char *memdisk_path, char *font_path, char *config_path,
 #ifdef GRUB_PLATFORM_IMAGE_DEFAULT
 		grub_platform_image_format_t format
 #else
@@ -104,7 +104,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 {
   char *kernel_img, *core_img;
   size_t kernel_size, total_module_size, core_size;
-  size_t memdisk_size = 0, config_size = 0;
+  size_t memdisk_size = 0, font_size = 0, config_size = 0;
   char *kernel_path;
   size_t offset;
   struct grub_util_path_list *path_list, *p, *next;
@@ -124,6 +124,12 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       total_module_size += memdisk_size + sizeof (struct grub_module_header);
     }
 
+  if (font_path)
+    {
+      font_size = ALIGN_UP(grub_util_get_image_size (font_path), 4);
+      total_module_size += font_size + sizeof (struct grub_module_header);
+    }
+
   if (config_path)
     {
       config_size = grub_util_get_image_size (config_path) + 1;
@@ -183,6 +189,20 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       offset += memdisk_size;
     }
 
+  if (font_path)
+    {
+      struct grub_module_header *header;
+
+      header = (struct grub_module_header *) (kernel_img + offset);
+      memset (header, 0, sizeof (struct grub_module_header));
+      header->type = OBJ_TYPE_FONT;
+      header->size = grub_host_to_target32 (font_size + sizeof (*header));
+      offset += sizeof (*header);
+
+      grub_util_load_image (font_path, kernel_img + offset);
+      offset += font_size;
+    }
+
   if (config_path)
     {
       struct grub_module_header *header;
@@ -339,7 +359,10 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
       
       target_addr = ALIGN_UP (GRUB_KERNEL_MACHINE_LINK_ADDR 
-			      + kernel_size + total_module_size, 32);
+			      + kernel_size + total_module_size
+			      + 0x100000
+			      //			      + BSS_SIZE
+			      , 32);
       ehdr->e_entry = grub_host_to_target32 (target_addr);
       phdr->p_vaddr = grub_host_to_target32 (target_addr);
       phdr->p_paddr = grub_host_to_target32 (target_addr);
@@ -376,10 +399,11 @@ static struct option options[] =
     {"directory", required_argument, 0, 'd'},
     {"prefix", required_argument, 0, 'p'},
     {"memdisk", required_argument, 0, 'm'},
+    {"font", required_argument, 0, 'f'},
     {"config", required_argument, 0, 'c'},
     {"output", required_argument, 0, 'o'},
 #ifdef GRUB_PLATFORM_IMAGE_DEFAULT
-    {"format", required_argument, 0, 'f'},
+    {"format", required_argument, 0, 'O'},
 #endif
     {"help", no_argument, 0, 'h'},
     {"version", no_argument, 0, 'V'},
@@ -401,11 +425,12 @@ Make a bootable image of GRUB.\n\
   -d, --directory=DIR     use images and modules under DIR [default=%s]\n\
   -p, --prefix=DIR        set grub_prefix directory [default=%s]\n\
   -m, --memdisk=FILE      embed FILE as a memdisk image\n\
+  -f, --font=FILE         embed FILE as a boot font\n\
   -c, --config=FILE       embed FILE as boot config\n\
   -o, --output=FILE       output a generated image to FILE [default=stdout]\n"
 #ifdef GRUB_PLATFORM_IMAGE_DEFAULT
 	    "\
-  -f, --format=FORMAT     generate an image in format [default=" 
+  -O, --format=FORMAT     generate an image in format [default=" 
 	    GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT "]\n	\
 	                available formats: "
 	    GRUB_PLATFORM_IMAGE_FORMATS "\n"
@@ -428,6 +453,7 @@ main (int argc, char *argv[])
   char *dir = NULL;
   char *prefix = NULL;
   char *memdisk = NULL;
+  char *font = NULL;
   char *config = NULL;
   FILE *fp = stdout;
 #ifdef GRUB_PLATFORM_IMAGE_DEFAULT
@@ -438,7 +464,7 @@ main (int argc, char *argv[])
 
   while (1)
     {
-      int c = getopt_long (argc, argv, "d:p:m:c:o:f:hVv", options, 0);
+      int c = getopt_long (argc, argv, "d:p:m:c:o:O:f:hVv", options, 0);
 
       if (c == -1)
 	break;
@@ -453,7 +479,7 @@ main (int argc, char *argv[])
 	    break;
 
 #ifdef GRUB_PLATFORM_IMAGE_DEFAULT
-	  case 'f':
+	  case 'O':
 #ifdef GRUB_PLATFORM_IMAGE_RAW
 	    if (strcmp (optarg, "raw") == 0)
 	      format = GRUB_PLATFORM_IMAGE_RAW;
@@ -487,6 +513,13 @@ main (int argc, char *argv[])
 	    prefix = xstrdup ("(memdisk)/boot/grub");
 	    break;
 
+	  case 'f':
+	    if (font)
+	      free (font);
+
+	    font = xstrdup (optarg);
+	    break;
+
 	  case 'c':
 	    if (config)
 	      free (config);
@@ -528,7 +561,7 @@ main (int argc, char *argv[])
     }
 
   generate_image (dir ? : GRUB_LIBDIR, prefix ? : DEFAULT_DIRECTORY, fp,
-		  argv + optind, memdisk, config,
+		  argv + optind, memdisk, font, config,
 #ifdef GRUB_PLATFORM_IMAGE_DEFAULT
 		  format
 #else

From 1a5c44303c355c87b38088d981e46a75e35c0f32 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 24 Oct 2009 12:45:04 +0200
Subject: [PATCH 0065/1628] load modules before saying welcome

---
 kern/main.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/kern/main.c b/kern/main.c
index 9215d55e7..084ce621b 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -152,15 +152,16 @@ grub_main (void)
   /* First of all, initialize the machine.  */
   grub_machine_init ();
 
-  /* Hello.  */
-  grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
-  grub_printf ("Welcome to GRUB!\n\n");
-  grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
-
   /* Load pre-loaded modules and free the space.  */
   grub_register_exported_symbols ();
   grub_load_modules ();
 
+  /* Hello.  */
+  grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
+  grub_printf ("Welcome to GRUB!\n\n");
+  grub_refresh ();
+  grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
+
   /* It is better to set the root device as soon as possible,
      for convenience.  */
   grub_machine_set_prefix ();

From 1ec31f046e99d015fa36a5a1cfef9b80c3c2b74d Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 24 Oct 2009 12:45:47 +0200
Subject: [PATCH 0066/1628] change gfxterm resolution

---
 term/gfxterm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/term/gfxterm.c b/term/gfxterm.c
index f161499e6..277660016 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -27,7 +27,7 @@
 #include <grub/bitmap.h>
 #include <grub/command.h>
 
-#define DEFAULT_VIDEO_MODE "1024x768,800x600,640x480"
+#define DEFAULT_VIDEO_MODE "1024x600"
 #define DEFAULT_BORDER_WIDTH	10
 
 #define DEFAULT_STANDARD_COLOR  0x07

From 8c4c25fe739701a462daabffdc3dd04879ee3ddd Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 24 Oct 2009 15:16:38 +0200
Subject: [PATCH 0067/1628] use bonito for sm712

---
 video/sm712.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/video/sm712.c b/video/sm712.c
index 5ebd865b7..df4f50172 100644
--- a/video/sm712.c
+++ b/video/sm712.c
@@ -92,10 +92,8 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
   framebuffer.mode_info.reserved_mask_size = 0;
   framebuffer.mode_info.reserved_field_pos = 0;
   framebuffer.mode_info.blit_format = grub_video_get_blit_format (&framebuffer.mode_info);
-  *(volatile grub_uint32_t *) 0xbfe00110 = 1;
-  framebuffer.ptr = (void *) 0xb0000000;
-  //  framebuffer.ptr = grub_pci_device_map_range (framebuffer.dev, 1 << 26,
-  //					       1024 * 600 * 2);
+  framebuffer.ptr = grub_pci_device_map_range (framebuffer.dev, 1 << 26,
+					       1024 * 600 * 2);
   framebuffer.mapped = 1;
 
   err = grub_video_fb_create_render_target_from_pointer (&framebuffer.render_target, &framebuffer.mode_info, framebuffer.ptr);

From 072acffa2099300fa5e9741b84a9383d05d868d8 Mon Sep 17 00:00:00 2001
From: phcoder <phcoder@debian.bg45.phnet>
Date: Sat, 24 Oct 2009 21:01:27 +0200
Subject: [PATCH 0068/1628] gfxterm fix

---
 term/gfxterm.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/term/gfxterm.c b/term/gfxterm.c
index 277660016..20dc11c20 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -95,6 +95,7 @@ struct grub_virtual_screen
   /* Color settings.  */
   grub_video_color_t fg_color;
   grub_video_color_t bg_color;
+  grub_video_color_t bg_color_display;
 
   /* Text buffer for virtual screen.  Contains (columns * rows) number
      of entries.  */
@@ -237,6 +238,8 @@ grub_virtual_screen_setup (unsigned int x, unsigned int y,
 
   grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
 
+  virtual_screen.bg_color_display = grub_video_map_rgba(0, 0, 0, 0);
+
   /* Clear out text buffer. */
   for (i = 0; i < virtual_screen.columns * virtual_screen.rows; i++)
     clear_char (&(virtual_screen.text_buffer[i]));
@@ -345,7 +348,7 @@ redraw_screen_rect (unsigned int x, unsigned int y,
 
       /* If bitmap is smaller than requested blit area, use background
          color.  */
-      color = virtual_screen.bg_color;
+      color = virtual_screen.bg_color_display;
 
       /* Fill right side of the bitmap if needed.  */
       if ((x + width >= bitmap_width) && (y < bitmap_height))
@@ -392,7 +395,7 @@ redraw_screen_rect (unsigned int x, unsigned int y,
   else
     {
       /* Render background layer.  */
-      color = virtual_screen.bg_color;
+      color = virtual_screen.bg_color_display;
       grub_video_fill_rect (color, x, y, width, height);
 
       /* Render text layer as replaced (to get texts background color).  */
@@ -814,7 +817,8 @@ grub_gfxterm_cls (void)
   /* Clear text layer.  */
   grub_video_set_active_render_target (text_layer);
   color = virtual_screen.bg_color;
-  grub_video_fill_rect (color, 0, 0, mode_info.width, mode_info.height);
+  grub_video_fill_rect (color, 0, 0, virtual_screen.width,
+			virtual_screen.height);
   grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
 
   /* Mark virtual screen to be redrawn.  */

From 810d8224cd2d1f117a34e62d573bbe503a1b1b41 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 2 Nov 2009 23:42:07 +0100
Subject: [PATCH 0069/1628] PCI cleanup

---
 bus/bonito.c                     |  4 ++--
 bus/pci.c                        |  4 ++--
 include/grub/i386/pci.h          |  6 ++++--
 include/grub/mips/yeeloong/pci.h | 31 +++++++++++++++++--------------
 4 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/bus/bonito.c b/bus/bonito.c
index a7a530de1..3f794c45a 100644
--- a/bus/bonito.c
+++ b/bus/bonito.c
@@ -42,7 +42,7 @@ write_bases (void)
   GRUB_MACHINE_PCI_IO_CTRL_REG = reg;
 }
 
-void *
+volatile void *
 grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),
 			   grub_addr_t base, grub_size_t size)
 {
@@ -75,7 +75,7 @@ grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),
 
 void
 grub_pci_device_unmap_range (grub_pci_device_t dev __attribute__ ((unused)),
-			     void *mem __attribute__ ((unused)),
+			     volatile void *mem __attribute__ ((unused)),
 			     grub_size_t size __attribute__ ((unused)))
 {
   int i;
diff --git a/bus/pci.c b/bus/pci.c
index fe4cad181..08bc90ab2 100644
--- a/bus/pci.c
+++ b/bus/pci.c
@@ -35,9 +35,9 @@ grub_pci_iterate (grub_pci_iteratefunc_t hook)
   grub_pci_id_t id;
   grub_uint32_t hdr;
 
-  for (dev.bus = 0; dev.bus < 256; dev.bus++)
+  for (dev.bus = 0; dev.bus < GRUB_PCI_NUM_BUS; dev.bus++)
     {
-      for (dev.device = 0; dev.device < 32; dev.device++)
+      for (dev.device = 0; dev.device < GRUB_PCI_NUM_DEVICES; dev.device++)
 	{
 	  for (dev.function = 0; dev.function < 8; dev.function++)
 	    {
diff --git a/include/grub/i386/pci.h b/include/grub/i386/pci.h
index 5b5f5f0df..a62adf507 100644
--- a/include/grub/i386/pci.h
+++ b/include/grub/i386/pci.h
@@ -24,6 +24,8 @@
 
 #define GRUB_PCI_ADDR_REG	0xcf8
 #define GRUB_PCI_DATA_REG	0xcfc
+#define GRUB_PCI_NUM_BUS        256
+#define GRUB_PCI_NUM_DEVICES    32
 
 static inline grub_uint32_t
 grub_pci_read (grub_pci_address_t addr)
@@ -67,12 +69,12 @@ grub_pci_write_byte (grub_pci_address_t addr, grub_uint8_t data)
   grub_outb (data, GRUB_PCI_DATA_REG + (addr & 3));
 }
 
-static inline void *
+static inline volatile void *
 grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),
 			   grub_addr_t base,
 			   grub_size_t size __attribute__ ((unused)))
 {
-  return (void *) base;
+  return (volatile void *) base;
 }
 
 static inline void
diff --git a/include/grub/mips/yeeloong/pci.h b/include/grub/mips/yeeloong/pci.h
index 9970d6ee0..8ba9f39d8 100644
--- a/include/grub/mips/yeeloong/pci.h
+++ b/include/grub/mips/yeeloong/pci.h
@@ -22,6 +22,9 @@
 #include <grub/types.h>
 #include <grub/cpu/io.h>
 
+#define GRUB_PCI_NUM_BUS        1
+#define GRUB_PCI_NUM_DEVICES    16
+
 #define GRUB_MACHINE_PCI_CONFSPACE        0xbfe80000
 #define GRUB_MACHINE_PCI_CONF_CTRL_REG    (*(volatile grub_uint32_t *) 0xbfe00118)
 #define GRUB_MACHINE_PCI_IO_CTRL_REG      (*(volatile grub_uint32_t *) 0xbfe00110)
@@ -45,57 +48,57 @@
 static inline grub_uint32_t
 grub_pci_read (grub_pci_address_t addr)
 {
-  GRUB_MACHINE_PCI_CONF_CTRL_REG = addr >> 16;
+  GRUB_MACHINE_PCI_CONF_CTRL_REG = 1 << ((addr >> 11) & 0xf);
   return *(volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONFSPACE
-				      | (addr & 0xffff));
+				      | (addr & 0x03ff));
 }
 
 static inline grub_uint16_t
 grub_pci_read_word (grub_pci_address_t addr)
 {
-  GRUB_MACHINE_PCI_CONF_CTRL_REG = addr >> 16;
+  GRUB_MACHINE_PCI_CONF_CTRL_REG = 1 << ((addr >> 11) & 0xf);
   return *(volatile grub_uint16_t *) (GRUB_MACHINE_PCI_CONFSPACE
-				      | (addr & 0xffff));
+				      | (addr & 0x03ff));
 }
 
 static inline grub_uint8_t
 grub_pci_read_byte (grub_pci_address_t addr)
 {
-  GRUB_MACHINE_PCI_CONF_CTRL_REG = addr >> 16;
+  GRUB_MACHINE_PCI_CONF_CTRL_REG = 1 << ((addr >> 11) & 0xf);
   return *(volatile grub_uint8_t *) (GRUB_MACHINE_PCI_CONFSPACE
-				     | (addr & 0xffff));
+				     | (addr & 0x03ff));
 }
 
 static inline void
 grub_pci_write (grub_pci_address_t addr, grub_uint32_t data)
 {
-  GRUB_MACHINE_PCI_CONF_CTRL_REG = addr >> 16;
+  GRUB_MACHINE_PCI_CONF_CTRL_REG = 1 << ((addr >> 11) & 0xf);
   *(volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONFSPACE
-			       | (addr & 0xffff)) = data;
+			       | (addr & 0x03ff)) = data;
 }
 
 static inline void
 grub_pci_write_word (grub_pci_address_t addr, grub_uint16_t data)
 {
-  GRUB_MACHINE_PCI_CONF_CTRL_REG = addr >> 16;
+  GRUB_MACHINE_PCI_CONF_CTRL_REG = 1 << ((addr >> 11) & 0xf);
   *(volatile grub_uint16_t *) (GRUB_MACHINE_PCI_CONFSPACE
-			       | (addr & 0xffff)) = data;
+			       | (addr & 0x03ff)) = data;
 }
 
 static inline void
 grub_pci_write_byte (grub_pci_address_t addr, grub_uint8_t data)
 {
-  GRUB_MACHINE_PCI_CONF_CTRL_REG = addr >> 16;
+  GRUB_MACHINE_PCI_CONF_CTRL_REG = 1 << ((addr >> 11) & 0xf);
   *(volatile grub_uint8_t *) (GRUB_MACHINE_PCI_CONFSPACE
-			      | (addr & 0xffff)) = data;
+			      | (addr & 0x03ff)) = data;
 }
 
-void *
+volatile void *
 grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),
 			   grub_addr_t base, grub_size_t size);
 void
 grub_pci_device_unmap_range (grub_pci_device_t dev __attribute__ ((unused)),
-			     void *mem,
+			     volatile void *mem,
 			     grub_size_t size __attribute__ ((unused)));
 
 #endif /* GRUB_MACHINE_PCI_H */

From 1b4595cebf919f2497be93858a4ec61a4c14db22 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 2 Nov 2009 23:57:09 +0100
Subject: [PATCH 0070/1628] AT keyboard support for Yeeloong

---
 conf/i386.rmk                    |  2 +-
 conf/mips.rmk                    |  6 ++++++
 include/grub/i386/at_keyboard.h  | 32 --------------------------------
 term/{i386/pc => }/at_keyboard.c |  6 +++---
 4 files changed, 10 insertions(+), 36 deletions(-)
 rename term/{i386/pc => }/at_keyboard.c (98%)

diff --git a/conf/i386.rmk b/conf/i386.rmk
index 33d49b53c..15529a122 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -6,7 +6,7 @@ cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
 cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += at_keyboard.mod
-at_keyboard_mod_SOURCES = term/i386/pc/at_keyboard.c
+at_keyboard_mod_SOURCES = term/at_keyboard.c
 at_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
 at_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/conf/mips.rmk b/conf/mips.rmk
index cba8281e8..03765ad8e 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -192,4 +192,10 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For at_keyboard.mod.
+pkglib_MODULES += at_keyboard.mod
+at_keyboard_mod_SOURCES = term/at_keyboard.c
+at_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
+at_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 include $(srcdir)/conf/common.mk
diff --git a/include/grub/i386/at_keyboard.h b/include/grub/i386/at_keyboard.h
index 96b21627f..8769c2f11 100644
--- a/include/grub/i386/at_keyboard.h
+++ b/include/grub/i386/at_keyboard.h
@@ -19,39 +19,7 @@
 #ifndef GRUB_CPU_AT_KEYBOARD_HEADER
 #define GRUB_CPU_AT_KEYBOARD_HEADER	1
 
-#include <grub/machine/machine.h>
-
-#define SHIFT_L		0x2a
-#define SHIFT_R		0x36
-#define CTRL		0x1d
-#define ALT		0x38
-#define CAPS_LOCK	0x3a
-
 #define KEYBOARD_REG_DATA	0x60
 #define KEYBOARD_REG_STATUS	0x64
 
-/* Used for sending commands to the controller.  */
-#define KEYBOARD_COMMAND_ISREADY(x)	!((x) & 0x02)
-#define KEYBOARD_COMMAND_READ		0x20
-#define KEYBOARD_COMMAND_WRITE		0x60
-#define KEYBOARD_COMMAND_REBOOT		0xfe
-
-#define KEYBOARD_SCANCODE_SET1		0x40
-
-#define KEYBOARD_ISMAKE(x)	!((x) & 0x80)
-#define KEYBOARD_ISREADY(x)	((x) & 0x01)
-#define KEYBOARD_SCANCODE(x)	((x) & 0x7f)
-
-#ifdef GRUB_MACHINE_IEEE1275
-#define OLPC_UP		GRUB_TERM_UP
-#define OLPC_DOWN	GRUB_TERM_DOWN
-#define OLPC_LEFT	GRUB_TERM_LEFT
-#define OLPC_RIGHT	GRUB_TERM_RIGHT
-#else
-#define OLPC_UP		'\0'
-#define OLPC_DOWN	'\0'
-#define OLPC_LEFT	'\0'
-#define OLPC_RIGHT	'\0'
-#endif
-
 #endif
diff --git a/term/i386/pc/at_keyboard.c b/term/at_keyboard.c
similarity index 98%
rename from term/i386/pc/at_keyboard.c
rename to term/at_keyboard.c
index cf30e7242..5d8dc3d89 100644
--- a/term/i386/pc/at_keyboard.c
+++ b/term/at_keyboard.c
@@ -17,9 +17,9 @@
  */
 
 #include <grub/dl.h>
-#include <grub/i386/pc/console.h>
-#include <grub/i386/at_keyboard.h>
-#include <grub/i386/io.h>
+#include <grub/at_keyboard.h>
+#include <grub/cpu/at_keyboard.h>
+#include <grub/cpu/io.h>
 #include <grub/misc.h>
 #include <grub/term.h>
 

From 811c0d8b5c09a2c887dd1bb61b28f3fa466c63e9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 3 Nov 2009 00:00:59 +0100
Subject: [PATCH 0071/1628] missing kbd files

---
 include/grub/at_keyboard.h               | 54 ++++++++++++++++++++++++
 include/grub/mips/at_keyboard.h          |  1 +
 include/grub/mips/yeeloong/at_keyboard.h | 25 +++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 include/grub/at_keyboard.h
 create mode 100644 include/grub/mips/at_keyboard.h
 create mode 100644 include/grub/mips/yeeloong/at_keyboard.h

diff --git a/include/grub/at_keyboard.h b/include/grub/at_keyboard.h
new file mode 100644
index 000000000..e2436e0f6
--- /dev/null
+++ b/include/grub/at_keyboard.h
@@ -0,0 +1,54 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2007,2008  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/>.
+ */
+
+#ifndef GRUB_AT_KEYBOARD_HEADER
+#define GRUB_AT_KEYBOARD_HEADER	1
+
+#include <grub/machine/machine.h>
+
+#define SHIFT_L		0x2a
+#define SHIFT_R		0x36
+#define CTRL		0x1d
+#define ALT		0x38
+#define CAPS_LOCK	0x3a
+
+/* Used for sending commands to the controller.  */
+#define KEYBOARD_COMMAND_ISREADY(x)	!((x) & 0x02)
+#define KEYBOARD_COMMAND_READ		0x20
+#define KEYBOARD_COMMAND_WRITE		0x60
+#define KEYBOARD_COMMAND_REBOOT		0xfe
+
+#define KEYBOARD_SCANCODE_SET1		0x40
+
+#define KEYBOARD_ISMAKE(x)	!((x) & 0x80)
+#define KEYBOARD_ISREADY(x)	((x) & 0x01)
+#define KEYBOARD_SCANCODE(x)	((x) & 0x7f)
+
+#ifdef GRUB_MACHINE_IEEE1275
+#define OLPC_UP		GRUB_TERM_UP
+#define OLPC_DOWN	GRUB_TERM_DOWN
+#define OLPC_LEFT	GRUB_TERM_LEFT
+#define OLPC_RIGHT	GRUB_TERM_RIGHT
+#else
+#define OLPC_UP		'\0'
+#define OLPC_DOWN	'\0'
+#define OLPC_LEFT	'\0'
+#define OLPC_RIGHT	'\0'
+#endif
+
+#endif
diff --git a/include/grub/mips/at_keyboard.h b/include/grub/mips/at_keyboard.h
new file mode 100644
index 000000000..0c307537d
--- /dev/null
+++ b/include/grub/mips/at_keyboard.h
@@ -0,0 +1 @@
+#include <grub/machine/at_keyboard.h>
diff --git a/include/grub/mips/yeeloong/at_keyboard.h b/include/grub/mips/yeeloong/at_keyboard.h
new file mode 100644
index 000000000..f279ac86d
--- /dev/null
+++ b/include/grub/mips/yeeloong/at_keyboard.h
@@ -0,0 +1,25 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2007,2008,2009  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/>.
+ */
+
+#ifndef GRUB_MACHINE_AT_KEYBOARD_HEADER
+#define GRUB_MACHINE_AT_KEYBOARD_HEADER	1
+
+#define KEYBOARD_REG_DATA	0xbfd00060
+#define KEYBOARD_REG_STATUS	0xbfd00064
+
+#endif

From b4f4e1f733902404241b4afd1889f0deb2a3f696 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 3 Nov 2009 00:03:09 +0100
Subject: [PATCH 0072/1628] Initial dirty ATA support

---
 conf/mips.rmk |  6 ++++++
 disk/ata.c    | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/conf/mips.rmk b/conf/mips.rmk
index 03765ad8e..cd99cca75 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -198,4 +198,10 @@ at_keyboard_mod_SOURCES = term/at_keyboard.c
 at_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
 at_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For ata_pthru.mod.
+pkglib_MODULES += ata_pthru.mod
+ata_pthru_mod_SOURCES = disk/ata_pthru.c
+ata_pthru_mod_CFLAGS = $(COMMON_CFLAGS)
+ata_pthru_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 include $(srcdir)/conf/common.mk
diff --git a/disk/ata.c b/disk/ata.c
index 00e370960..5b74bb673 100644
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -27,8 +27,10 @@
 #include <grub/machine/machine.h>
 
 /* At the moment, only two IDE ports are supported.  */
-static const grub_port_t grub_ata_ioaddress[] = { 0x1f0, 0x170 };
-static const grub_port_t grub_ata_ioaddress2[] = { 0x3f6, 0x376 };
+static const grub_port_t grub_ata_ioaddress[] = { 0xbfd001f0};
+static const grub_port_t grub_ata_ioaddress2[] = { 0xbfd003f6};
+//static const grub_port_t grub_ata_ioaddress[] = { 0x1f0, 0x170 };
+//static const grub_port_t grub_ata_ioaddress2[] = { 0x3f6, 0x376 };
 
 static struct grub_ata_device *grub_ata_devices;
 
@@ -388,6 +390,7 @@ grub_ata_device_initialize (int port, int device, int addr, int addr2)
   return 0;
 }
 
+#if 0
 static int NESTED_FUNC_ATTR
 grub_ata_pciinit (grub_pci_device_t dev,
 		  grub_pci_id_t pciid __attribute__((unused)))
@@ -485,6 +488,48 @@ grub_ata_initialize (void)
   grub_pci_iterate (grub_ata_pciinit);
   return 0;
 }
+#endif
+
+static grub_err_t
+grub_ata_initialize (void)
+{
+  int rega;
+  int regb;
+
+  rega = grub_ata_ioaddress[0];
+  regb = grub_ata_ioaddress2[0];
+
+  grub_dprintf ("ata",
+		"rega=0x%x regb=0x%x\n",
+		rega, regb);
+
+  if (rega && regb)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      grub_ata_device_initialize (0, 0, rega, regb);
+      
+      /* Most errors raised by grub_ata_device_initialize() are harmless.
+	 They just indicate this particular drive is not responding, most
+	 likely because it doesn't exist.  We might want to ignore specific
+	 error types here, instead of printing them.  */
+      if (grub_errno)
+	{
+	  grub_print_error ();
+	  grub_errno = GRUB_ERR_NONE;
+	}
+      
+      grub_ata_device_initialize (0, 1, rega, regb);
+      
+	  /* Likewise.  */
+      if (grub_errno)
+	{
+	  grub_print_error ();
+	  grub_errno = GRUB_ERR_NONE;
+	}
+    }
+
+  return 0;
+}
 
 
 static void

From 36dba59c0792378a6fc829a58f3a70ac67458423 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 3 Nov 2009 00:04:15 +0100
Subject: [PATCH 0073/1628] Use PCI for sm712

---
 video/sm712.c | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/video/sm712.c b/video/sm712.c
index df4f50172..93156c9ae 100644
--- a/video/sm712.c
+++ b/video/sm712.c
@@ -37,6 +37,7 @@ static struct
   grub_uint8_t *ptr;
   int index_color_mode;
   int mapped;
+  grub_uint32_t base;
   grub_pci_device_t dev;
 } framebuffer;
 
@@ -65,6 +66,27 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
 {
   int depth;
   grub_err_t err;
+  int found = 0;
+
+  int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)))
+    {
+      grub_pci_address_t addr;
+      grub_uint32_t class;
+
+      addr = grub_pci_make_address (dev, 2);
+      class = grub_pci_read (addr);
+
+      if (((class >> 16) & 0xffff) != 0x0300 || pciid != 0x0712126f)
+	return 0;
+      
+      found = 1;
+
+      addr = grub_pci_make_address (dev, 4);
+      framebuffer.base = grub_pci_read (addr);
+      framebuffer.dev = dev;
+
+      return 1;
+    }
 
   /* Decode depth from mode_type.  If it is zero, then autodetect.  */
   depth = (mode_type & GRUB_VIDEO_MODE_TYPE_DEPTH_MASK)
@@ -75,6 +97,15 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
     return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
 		       "Only 1024x600x16 is supported");
 
+  grub_pci_iterate (find_card);
+  if (!found)
+    return grub_error (GRUB_ERR_IO, "Couldn't find graphics card");
+
+  if (found && framebuffer.base == 0)
+    {
+      /* FIXME: change framebuffer base */
+    }
+
   /* Fill mode info details.  */
   framebuffer.mode_info.width = 1024;
   framebuffer.mode_info.height = 600;
@@ -92,8 +123,10 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
   framebuffer.mode_info.reserved_mask_size = 0;
   framebuffer.mode_info.reserved_field_pos = 0;
   framebuffer.mode_info.blit_format = grub_video_get_blit_format (&framebuffer.mode_info);
-  framebuffer.ptr = grub_pci_device_map_range (framebuffer.dev, 1 << 26,
-					       1024 * 600 * 2);
+  /* We can safely discard volatile attribute.  */
+  framebuffer.ptr = (void *) grub_pci_device_map_range (framebuffer.dev,
+							framebuffer.base,
+							1024 * 600 * 2);
   framebuffer.mapped = 1;
 
   err = grub_video_fb_create_render_target_from_pointer (&framebuffer.render_target, &framebuffer.mode_info, framebuffer.ptr);

From cc32314161b55f2a9bd7f4a0897deae9d1b8f80f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 3 Nov 2009 00:05:41 +0100
Subject: [PATCH 0074/1628] Removed memset declaration

---
 include/grub/mips/libgcc.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/grub/mips/libgcc.h b/include/grub/mips/libgcc.h
index a04a8f140..3bea2f998 100644
--- a/include/grub/mips/libgcc.h
+++ b/include/grub/mips/libgcc.h
@@ -16,7 +16,6 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-void *EXPORT_FUNC (memset) (void *s, int c, int n);
 void EXPORT_FUNC (__ashldi3) (void);
 void EXPORT_FUNC (__ashrdi3) (void);
 void EXPORT_FUNC (__lshrdi3) (void);

From 02602a700270c3b661500c44cf6565b183d74a58 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 6 Nov 2009 17:37:31 +0100
Subject: [PATCH 0075/1628] Cleaned __gnu_local_gp handling

---
 include/grub/mips/dl.h | 2 +-
 kern/mips/dl.c         | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/grub/mips/dl.h b/include/grub/mips/dl.h
index 4dbd97ca9..9f8404e72 100644
--- a/include/grub/mips/dl.h
+++ b/include/grub/mips/dl.h
@@ -20,6 +20,6 @@
 #define GRUB_CPU_DL_H	1
 
 /* Dummy __gnu_local_gp. Resolved by linker.  */
-char EXPORT_VAR (__gnu_local_gp);
+extern char EXPORT_VAR (__gnu_local_gp);
 
 #endif /* ! GRUB_CPU_DL_H */
diff --git a/kern/mips/dl.c b/kern/mips/dl.c
index e25ccce3a..a937c79b4 100644
--- a/kern/mips/dl.c
+++ b/kern/mips/dl.c
@@ -25,6 +25,9 @@
 #include <grub/mm.h>
 #include <grub/cpu/dl.h>
 
+/* Dummy __gnu_local_gp. Resolved by linker.  */
+char __gnu_local_gp;
+
 /* Check if EHDR is a valid ELF header.  */
 grub_err_t
 grub_arch_dl_check_header (void *ehdr)

From b0979f119179bae381a52dd330a2d77a4056e049 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 6 Nov 2009 22:50:44 +0100
Subject: [PATCH 0076/1628] Cleaned up CS5536 ATA compat support

---
 disk/ata.c                       | 77 ++++++++++----------------------
 include/grub/i386/pci.h          |  1 +
 include/grub/mips/yeeloong/pci.h |  1 +
 3 files changed, 25 insertions(+), 54 deletions(-)

diff --git a/disk/ata.c b/disk/ata.c
index 5b74bb673..c6d2168f7 100644
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -27,10 +27,8 @@
 #include <grub/machine/machine.h>
 
 /* At the moment, only two IDE ports are supported.  */
-static const grub_port_t grub_ata_ioaddress[] = { 0xbfd001f0};
-static const grub_port_t grub_ata_ioaddress2[] = { 0xbfd003f6};
-//static const grub_port_t grub_ata_ioaddress[] = { 0x1f0, 0x170 };
-//static const grub_port_t grub_ata_ioaddress2[] = { 0x3f6, 0x376 };
+static const grub_port_t grub_ata_ioaddress[] = { 0x1f0, 0x170 };
+static const grub_port_t grub_ata_ioaddress2[] = { 0x3f6, 0x376 };
 
 static struct grub_ata_device *grub_ata_devices;
 
@@ -350,8 +348,8 @@ grub_ata_device_initialize (int port, int device, int addr, int addr2)
   /* Setup the device information.  */
   dev->port = port;
   dev->device = device;
-  dev->ioaddress = addr;
-  dev->ioaddress2 = addr2;
+  dev->ioaddress = addr + GRUB_MACHINE_PCI_IO_BASE;
+  dev->ioaddress2 = addr2 + GRUB_MACHINE_PCI_IO_BASE;
   dev->next = NULL;
 
   grub_ata_regset (dev, GRUB_ATA_REG_DISK, dev->device << 4);
@@ -390,10 +388,9 @@ grub_ata_device_initialize (int port, int device, int addr, int addr2)
   return 0;
 }
 
-#if 0
 static int NESTED_FUNC_ATTR
 grub_ata_pciinit (grub_pci_device_t dev,
-		  grub_pci_id_t pciid __attribute__((unused)))
+		  grub_pci_id_t pciid)
 {
   static int compat_use[2] = { 0 };
   grub_pci_address_t addr;
@@ -404,19 +401,34 @@ grub_ata_pciinit (grub_pci_device_t dev,
   int regb;
   int i;
   static int controller = 0;
+  int cs5536 = 0;
+  int nports = 2;
 
   /* Read class.  */
   addr = grub_pci_make_address (dev, 2);
   class = grub_pci_read (addr);
 
+  /* AMD CS5536 Southbridge.  */
+  if (pciid == 0x208f1022)
+    {
+      cs5536 = 1;
+      nports = 1;
+    }
+
   /* Check if this class ID matches that of a PCI IDE Controller.  */
-  if (class >> 16 != 0x0101)
+  if (!cs5536 && (class >> 16 != 0x0101))
     return 0;
 
-  for (i = 0; i < 2; i++)
+  for (i = 0; i < nports; i++)
     {
       /* Set to 0 when the channel operated in compatibility mode.  */
-      int compat = (class >> (8 + 2 * i)) & 1;
+      int compat;
+
+      /* We don't support non-compatibility mode for CS5536.  */
+      if (cs5536)
+	compat = 0;
+      else
+	compat = (class >> (8 + 2 * i)) & 1;
 
       rega = 0;
       regb = 0;
@@ -488,49 +500,6 @@ grub_ata_initialize (void)
   grub_pci_iterate (grub_ata_pciinit);
   return 0;
 }
-#endif
-
-static grub_err_t
-grub_ata_initialize (void)
-{
-  int rega;
-  int regb;
-
-  rega = grub_ata_ioaddress[0];
-  regb = grub_ata_ioaddress2[0];
-
-  grub_dprintf ("ata",
-		"rega=0x%x regb=0x%x\n",
-		rega, regb);
-
-  if (rega && regb)
-    {
-      grub_errno = GRUB_ERR_NONE;
-      grub_ata_device_initialize (0, 0, rega, regb);
-      
-      /* Most errors raised by grub_ata_device_initialize() are harmless.
-	 They just indicate this particular drive is not responding, most
-	 likely because it doesn't exist.  We might want to ignore specific
-	 error types here, instead of printing them.  */
-      if (grub_errno)
-	{
-	  grub_print_error ();
-	  grub_errno = GRUB_ERR_NONE;
-	}
-      
-      grub_ata_device_initialize (0, 1, rega, regb);
-      
-	  /* Likewise.  */
-      if (grub_errno)
-	{
-	  grub_print_error ();
-	  grub_errno = GRUB_ERR_NONE;
-	}
-    }
-
-  return 0;
-}
-
 
 static void
 grub_ata_setlba (struct grub_ata_device *dev, grub_disk_addr_t sector,
diff --git a/include/grub/i386/pci.h b/include/grub/i386/pci.h
index a62adf507..5ed93c28f 100644
--- a/include/grub/i386/pci.h
+++ b/include/grub/i386/pci.h
@@ -22,6 +22,7 @@
 #include <grub/types.h>
 #include <grub/i386/io.h>
 
+#define GRUB_MACHINE_PCI_IO_BASE          0
 #define GRUB_PCI_ADDR_REG	0xcf8
 #define GRUB_PCI_DATA_REG	0xcfc
 #define GRUB_PCI_NUM_BUS        256
diff --git a/include/grub/mips/yeeloong/pci.h b/include/grub/mips/yeeloong/pci.h
index 8ba9f39d8..c7bd31d4f 100644
--- a/include/grub/mips/yeeloong/pci.h
+++ b/include/grub/mips/yeeloong/pci.h
@@ -25,6 +25,7 @@
 #define GRUB_PCI_NUM_BUS        1
 #define GRUB_PCI_NUM_DEVICES    16
 
+#define GRUB_MACHINE_PCI_IO_BASE          0xbfd00000
 #define GRUB_MACHINE_PCI_CONFSPACE        0xbfe80000
 #define GRUB_MACHINE_PCI_CONF_CTRL_REG    (*(volatile grub_uint32_t *) 0xbfe00118)
 #define GRUB_MACHINE_PCI_IO_CTRL_REG      (*(volatile grub_uint32_t *) 0xbfe00110)

From c8ec30a0a4458c9ca53b603a78ac27b3f5ec69fa Mon Sep 17 00:00:00 2001
From: Felix Zielcke <fzielcke@z-51.de>
Date: Sun, 8 Nov 2009 01:57:17 +0100
Subject: [PATCH 0077/1628] 2009-11-06  Felix Zielcke  <fzielcke@z-51.de>

	* disk/dmraid_nvidia.c (grub_dmraid_nv_detect): Set array->name to NULL.
	* disk/mdraid_linux.c (grub_raid_super_1x): New structure.
	(WriteMostly1): New macro.
	Set array->name to NULL for metadata format 0.90.  Add support for
	metadata 1.x.  Fix some comments.
	* disk/raid.c (): Add support for name based RAID arrays.  Fix a
	few comments.
	* util/getroot.c (grub_util_get_grub_dev): Add support for
	/dev/md/name style devices.
---
 ChangeLog.raid       |  11 +++
 disk/dmraid_nvidia.c |   3 +-
 disk/mdraid_linux.c  | 193 +++++++++++++++++++++++++++++++++++++++++--
 disk/raid.c          |  74 +++++++++--------
 util/getroot.c       |  14 ++++
 5 files changed, 252 insertions(+), 43 deletions(-)
 create mode 100644 ChangeLog.raid

diff --git a/ChangeLog.raid b/ChangeLog.raid
new file mode 100644
index 000000000..090e1edc7
--- /dev/null
+++ b/ChangeLog.raid
@@ -0,0 +1,11 @@
+2009-11-06  Felix Zielcke  <fzielcke@z-51.de>
+
+	* disk/dmraid_nvidia.c (grub_dmraid_nv_detect): Set array->name to NULL.
+	* disk/mdraid_linux.c (grub_raid_super_1x): New structure.
+	(WriteMostly1): New macro.
+	Set array->name to NULL for metadata format 0.90.  Add support for
+	metadata 1.x.  Fix some comments.
+	* disk/raid.c (): Add support for name based RAID arrays.  Fix a
+	few comments.
+	* util/getroot.c (grub_util_get_grub_dev): Add support for
+	/dev/md/name style devices.
diff --git a/disk/dmraid_nvidia.c b/disk/dmraid_nvidia.c
index 84dfad8c4..ed89854b3 100644
--- a/disk/dmraid_nvidia.c
+++ b/disk/dmraid_nvidia.c
@@ -1,7 +1,7 @@
 /* dmraid_nvidia.c - module to handle Nvidia fakeraid.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2008  Free Software Foundation, Inc.
+ *  Copyright (C) 2006,2007,2008,2009  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
@@ -132,6 +132,7 @@ grub_dmraid_nv_detect (grub_disk_t disk, struct grub_raid_array *array)
                          "Unsupported RAID level: %d", sb.array.raid_level);
     }
 
+  array->name = NULL;
   array->number = 0;
   array->total_devs = sb.array.total_volumes;
   array->chunk_size = sb.array.stripe_block_size;
diff --git a/disk/mdraid_linux.c b/disk/mdraid_linux.c
index 29a21b4c7..275267f72 100644
--- a/disk/mdraid_linux.c
+++ b/disk/mdraid_linux.c
@@ -1,7 +1,7 @@
-/* mdraid_linux.c - module to handle linux softraid.  */
+/* mdraid_linux.c - module to handle Linux Software RAID.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008  Free Software Foundation, Inc.
+ *  Copyright (C) 2008,2009  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
@@ -159,32 +159,146 @@ struct grub_raid_super_09
   struct grub_raid_disk_09 this_disk;
 } __attribute__ ((packed));
 
+/*
+ * The version-1 superblock :
+ * All numeric fields are little-endian.
+ *
+ * Total size: 256 bytes plus 2 per device.
+ * 1K allows 384 devices.
+ */
+
+struct grub_raid_super_1x
+{
+  /* Constant array information - 128 bytes.  */
+  grub_uint32_t magic;		/* MD_SB_MAGIC: 0xa92b4efc - little endian.  */
+  grub_uint32_t major_version;	/* 1.  */
+  grub_uint32_t feature_map;	/* Bit 0 set if 'bitmap_offset' is meaningful.   */
+  grub_uint32_t pad0;		/* Always set to 0 when writing.  */
+
+  grub_uint8_t set_uuid[16];	/* User-space generated.  */
+  char set_name[32];		/* Set and interpreted by user-space.  */
+
+  grub_uint64_t ctime;		/* Lo 40 bits are seconds, top 24 are microseconds or 0.  */
+  grub_uint32_t level;		/* -4 (multipath), -1 (linear), 0,1,4,5.  */
+  grub_uint32_t layout;		/* only for raid5 and raid10 currently.  */
+  grub_uint64_t size;		/* Used size of component devices, in 512byte sectors.  */
+
+  grub_uint32_t chunksize;	/* In 512byte sectors.  */
+  grub_uint32_t raid_disks;
+  grub_uint32_t bitmap_offset;	/* Sectors after start of superblock that bitmap starts
+				 * NOTE: signed, so bitmap can be before superblock
+				 * only meaningful of feature_map[0] is set.
+				 */
+
+  /* These are only valid with feature bit '4'.  */
+  grub_uint32_t new_level;	/* New level we are reshaping to.  */
+  grub_uint64_t reshape_position;	/* Next address in array-space for reshape.  */
+  grub_uint32_t delta_disks;	/* Change in number of raid_disks.  */
+  grub_uint32_t new_layout;	/* New layout.  */
+  grub_uint32_t new_chunk;	/* New chunk size (512byte sectors).  */
+  grub_uint8_t pad1[128 - 124];	/* Set to 0 when written.  */
+
+  /* Constant this-device information - 64 bytes.  */
+  grub_uint64_t data_offset;	/* Sector start of data, often 0.  */
+  grub_uint64_t data_size;	/* Sectors in this device that can be used for data.  */
+  grub_uint64_t super_offset;	/* Sector start of this superblock.  */
+  grub_uint64_t recovery_offset;	/* Sectors before this offset (from data_offset) have been recovered.  */
+  grub_uint32_t dev_number;	/* Permanent identifier of this  device - not role in raid.  */
+  grub_uint32_t cnt_corrected_read;	/* Number of read errors that were corrected by re-writing.  */
+  grub_uint8_t device_uuid[16];	/* User-space setable, ignored by kernel.  */
+  grub_uint8_t devflags;	/* Per-device flags.  Only one defined...  */
+  grub_uint8_t pad2[64 - 57];	/* Set to 0 when writing.  */
+
+  /* Array state information - 64 bytes.  */
+  grub_uint64_t utime;		/* 40 bits second, 24 btes microseconds.  */
+  grub_uint64_t events;		/* Incremented when superblock updated.  */
+  grub_uint64_t resync_offset;	/* Data before this offset (from data_offset) known to be in sync.  */
+  grub_uint32_t sb_csum;	/* Checksum upto devs[max_dev].  */
+  grub_uint32_t max_dev;	/* Size of devs[] array to consider.  */
+  grub_uint8_t pad3[64 - 32];	/* Set to 0 when writing.  */
+
+  /* Device state information. Indexed by dev_number.
+   * 2 bytes per device.
+   * Note there are no per-device state flags. State information is rolled
+   * into the 'roles' value.  If a device is spare or faulty, then it doesn't
+   * have a meaningful role.
+   */
+  grub_uint16_t dev_roles[0];	/* Role in array, or 0xffff for a spare, or 0xfffe for faulty.  */
+} __attribute__ ((packed));
+
+#define WriteMostly1    1	/* Mask for writemostly flag in above devflags.  */
+
 static grub_err_t
 grub_mdraid_detect (grub_disk_t disk, struct grub_raid_array *array)
 {
   grub_disk_addr_t sector;
-  grub_uint64_t size;
+  grub_uint64_t size, sb_size;
   struct grub_raid_super_09 sb;
+  struct grub_raid_super_1x *sb_1x;
   grub_uint32_t *uuid;
+  grub_uint8_t minor_version;
 
-  /* The sector where the RAID superblock is stored, if available. */
+  /* The sector where the mdraid 0.90 superblock is stored, if available.  */
   size = grub_disk_get_size (disk);
   sector = NEW_SIZE_SECTORS (size);
 
   if (grub_disk_read (disk, sector, 0, SB_BYTES, &sb))
     return grub_errno;
 
-  /* Look whether there is a RAID superblock. */
-  if (sb.md_magic != SB_MAGIC)
+  /* Look whether there is a mdraid 0.90 superblock.  */
+  if (sb.md_magic == SB_MAGIC)
+    goto superblock_0_90;
+
+  /* Check for an 1.x superblock.
+   * It's always aligned to a 4K boundary
+   * and depending on the minor version it can be:
+   * 0: At least 8K, but less than 12K, from end of device
+   * 1: At start of device
+   * 2: 4K from start of device.
+   */
+
+  sb_1x = grub_malloc (sizeof (struct grub_raid_super_1x));
+  if (!sb_1x)
+    return grub_errno;
+
+  for (minor_version = 0; minor_version < 3; ++minor_version)
+    {
+      switch (minor_version)
+	{
+	case 0:
+	  sector = (size - 8 * 2) & ~(4 * 2 - 1);
+	  break;
+	case 1:
+	  sector = 0;
+	  break;
+	case 2:
+	  sector = 4 * 2;
+	  break;
+	}
+
+      if (grub_disk_read
+	  (disk, sector, 0, sizeof (struct grub_raid_super_1x), sb_1x))
+	{
+	  grub_free (sb_1x);
+	  return grub_errno;
+	}
+
+      if (sb_1x->magic == SB_MAGIC)
+	goto superblock_1_x;
+    }
+
+  /* Neither 0.90 nor 1.x.  */
+  if (grub_le_to_cpu32 (sb_1x->magic) != SB_MAGIC)
     return grub_error (GRUB_ERR_OUT_OF_RANGE, "not raid");
 
-  /* FIXME: Also support version 1.0. */
+superblock_0_90:
+
   if (sb.major_version != 0 || sb.minor_version != 90)
     return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
 		       "Unsupported RAID version: %d.%d",
 		       sb.major_version, sb.minor_version);
 
-  /* FIXME: Check the checksum. */
+  /* FIXME: Check the checksum.  */
 
   /* Multipath.  */
   if ((int) sb.level == -4)
@@ -195,6 +309,7 @@ grub_mdraid_detect (grub_disk_t disk, struct grub_raid_array *array)
     return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
 		       "Unsupported RAID level: %d", sb.level);
 
+  array->name = NULL;
   array->number = sb.md_minor;
   array->level = sb.level;
   array->layout = sb.layout;
@@ -205,7 +320,10 @@ grub_mdraid_detect (grub_disk_t disk, struct grub_raid_array *array)
   array->uuid_len = 16;
   array->uuid = grub_malloc (16);
   if (!array->uuid)
-    return grub_errno;
+    {
+      grub_free (sb_1x);
+      return grub_errno;
+    }
 
   uuid = (grub_uint32_t *) array->uuid;
   uuid[0] = sb.set_uuid0;
@@ -214,6 +332,63 @@ grub_mdraid_detect (grub_disk_t disk, struct grub_raid_array *array)
   uuid[3] = sb.set_uuid3;
 
   return 0;
+
+ superblock_1_x:
+
+  if (sb_1x->major_version != 1)
+    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+		       "Unsupported RAID version: %d",
+		       sb_1x->major_version);
+  /* Multipath.  */
+  if ((int) sb_1x->level == -4)
+    sb_1x->level = 1;
+
+  if (sb_1x->level != 0 && sb_1x->level != 1 && sb_1x->level != 4 &&
+      sb_1x->level != 5 && sb_1x->level != 6 && sb_1x->level != 10)
+    {
+      grub_free (sb_1x);
+      return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+			 "Unsupported RAID level: %d", sb.level);
+    }
+  /* 1.x superblocks don't have a fixed size on disk.  So we have to
+     read it again now that we now the max device count.  */
+  sb_size = sizeof (struct grub_raid_super_1x) + 2 * grub_le_to_cpu32 (sb_1x->max_dev);
+  sb_1x = grub_realloc (sb_1x, sb_size);
+  if (! sb_1x)
+    return grub_errno;
+
+  if (grub_disk_read (disk, sector, 0, sb_size, sb_1x))
+    {
+      grub_free (sb_1x);
+      return grub_errno;
+    }
+
+  array->name = grub_strdup (sb_1x->set_name);
+  if (! array->name)
+    {
+      grub_free (sb_1x);
+      return grub_errno;
+    }
+
+  array->number = 0;
+  array->level = grub_le_to_cpu32 (sb_1x->level);
+  array->layout = grub_le_to_cpu32 (sb_1x->layout);
+  array->total_devs = grub_le_to_cpu32 (sb_1x->raid_disks);
+  array->disk_size = grub_le_to_cpu64 (sb_1x->size) * 2;
+  array->chunk_size = grub_le_to_cpu32 (sb_1x->chunksize) >> 9;
+  array->index = grub_le_to_cpu32 (sb_1x->dev_number);
+  array->uuid_len = 16;
+  array->uuid = grub_malloc (16);
+  if (!array->uuid)
+    {
+      grub_free (sb_1x);
+      return grub_errno;
+    }
+
+  grub_memcpy (array->uuid, sb_1x->set_uuid, 16);
+
+  grub_free (sb_1x);
+  return 0;
 }
 
 static struct grub_raid grub_mdraid_dev = {
diff --git a/disk/raid.c b/disk/raid.c
index c720fb36c..b88741744 100644
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -1,7 +1,7 @@
 /* raid.c - module to read RAID arrays.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2008  Free Software Foundation, Inc.
+ *  Copyright (C) 2006,2007,2008,2009  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
@@ -480,7 +480,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
   struct grub_raid_array *array = 0, *p;
 
   /* See whether the device is part of an array we have already seen a
-     device from. */
+     device from.  */
   for (p = array_list; p != NULL; p = p->next)
     if ((p->uuid_len == new_array->uuid_len) &&
         (! grub_memcmp (p->uuid, new_array->uuid, p->uuid_len)))
@@ -491,7 +491,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
         /* Do some checks before adding the device to the array.  */
 
         /* FIXME: Check whether the update time of the superblocks are
-           the same. */
+           the same.  */
 
         if (array->total_devs == array->nr_devs)
           /* We found more members of the array than the array
@@ -502,7 +502,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
 
         if (array->device[new_array->index] != NULL)
           /* We found multiple devices with the same number. Again,
-             this shouldn't happen.*/
+             this shouldn't happen.  */
           grub_dprintf ("raid", "Found two disks with the number %d?!?",
 			new_array->number);
 
@@ -525,47 +525,55 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
       array->nr_devs = 0;
       grub_memset (&array->device, 0, sizeof (array->device));
 
-      /* Check whether we don't have multiple arrays with the same number. */
+      if (array->name)
+	goto skip_duplicate_check;
+      /* Check whether we don't have multiple arrays with the same number.  */
       for (p = array_list; p != NULL; p = p->next)
         {
-          if (p->number == array->number)
-            break;
+          if (p->number == array->number) 
+	    break;
         }
 
       if (p)
         {
-          /* The number is already in use, so we need to find an new number. */
+          /* The number is already in use, so we need to find a new one.  */
           int i = 0;
 
-          while (1)
-            {
-              for (p = array_list; p != NULL; p = p->next)
-                {
-                  if (p->number == i)
-                    break;
-                }
+	  while (1)
+	    {
+	      for (p = array_list; p != NULL; p = p->next)
+		{
+		  if (p->number == i)
+		    break;
+		}
 
-              if (!p)
-                {
-                  /* We found an unused number.  */
-                  array->number = i;
-                  break;
-                }
+	      if (! p)
+		{
+		  /* We found an unused number.  */
+		  array->number = i;
+		  break;
+		}
 
-              i++;
-            }
-        }
-
-      array->name = grub_malloc (13);
+	      i++;
+	    }
+	}
+    skip_duplicate_check:
+      /* mdraid 1.x superblocks have only a name stored not a number.
+	 Use it directly as GRUB device.  */
       if (! array->name)
-        {
-          grub_free (array->uuid);
-          grub_free (array);
+	{
+	array->name = grub_malloc (13);
+	if (! array->name)
+	  {
+	    grub_free (array->uuid);
+	    grub_free (array);
 
-          return grub_errno;
-        }
-
-      grub_sprintf (array->name, "md%d", array->number);
+	    return grub_errno;
+	  }
+	grub_sprintf (array->name, "md%d", array->number);
+      }
+      else
+	grub_sprintf (array->name, "%s", array->name);
 
       grub_dprintf ("raid", "Found array %s (%s)\n", array->name,
                     scanner_name);
diff --git a/util/getroot.c b/util/getroot.c
index 120ab13b1..618d76158 100644
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -498,6 +498,20 @@ grub_util_get_grub_dev (const char *os_dev)
 	  asprintf (&grub_dev, "md%s", p);
 	  free (p);
 	}
+      else if (os_dev[7] == '/')
+	{
+	  /* mdraid 1.x with a free name.  */
+	  char *p , *q;
+
+	  p = strdup (os_dev + sizeof ("/dev/md/") - 1);
+
+	  q = strchr (p, 'p');
+	  if (q)
+	    *q = ',';
+
+	  asprintf (&grub_dev, "%s", p);
+	  free (p);
+	}
       else
 	grub_util_error ("Unknown kind of RAID device `%s'", os_dev);
 

From 77546cfd8f761de380a74ed6c87ea8bffb07cb5a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 9 Nov 2009 22:07:57 +0100
Subject: [PATCH 0078/1628] Restored missing headers

---
 include/grub/mips/reboot.h        | 24 ++++++++++++++++++++++++
 include/grub/mips/yeeloong/boot.h |  0
 2 files changed, 24 insertions(+)
 create mode 100644 include/grub/mips/reboot.h
 create mode 100644 include/grub/mips/yeeloong/boot.h

diff --git a/include/grub/mips/reboot.h b/include/grub/mips/reboot.h
new file mode 100644
index 000000000..b28fca158
--- /dev/null
+++ b/include/grub/mips/reboot.h
@@ -0,0 +1,24 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/>.
+ */
+
+#ifndef GRUB_REBOOT_CPU_HEADER
+#define GRUB_REBOOT_CPU_HEADER	1
+
+extern void grub_reboot (void);
+
+#endif
diff --git a/include/grub/mips/yeeloong/boot.h b/include/grub/mips/yeeloong/boot.h
new file mode 100644
index 000000000..e69de29bb

From c6622adb31fc8666a2cfe07fc6f44cd82eec3585 Mon Sep 17 00:00:00 2001
From: Felix Zielcke <fzielcke@z-51.de>
Date: Wed, 11 Nov 2009 23:17:59 +0100
Subject: [PATCH 0079/1628] make autogen.sh and gendistlist.sh executable

---
 autogen.sh     | 0
 gendistlist.sh | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 autogen.sh
 mode change 100644 => 100755 gendistlist.sh

diff --git a/autogen.sh b/autogen.sh
old mode 100644
new mode 100755
diff --git a/gendistlist.sh b/gendistlist.sh
old mode 100644
new mode 100755

From df48e9e18d649f5305b701eb7c77c5a0bef9515d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 14 Nov 2009 16:25:50 +0100
Subject: [PATCH 0080/1628] REimport of videomask patch

---
 commands/videotest.c |  11 +-
 include/grub/video.h |  13 ++-
 loader/i386/linux.c  |   4 +-
 loader/i386/pc/xnu.c |  22 ++--
 term/gfxterm.c       |  14 +--
 video/i386/pc/vbe.c  |  36 ++++---
 video/video.c        | 244 +++++++++++++++++++------------------------
 7 files changed, 166 insertions(+), 178 deletions(-)

diff --git a/commands/videotest.c b/commands/videotest.c
index 6fe4b9bd1..fe504ee7b 100644
--- a/commands/videotest.c
+++ b/commands/videotest.c
@@ -30,9 +30,7 @@ grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),
                     int argc __attribute__ ((unused)),
                     char **args __attribute__ ((unused)))
 {
-  if (grub_video_set_mode ("1024x768;800x600;640x480", 0) != GRUB_ERR_NONE)
-    return grub_errno;
-
+  grub_err_t err;
   grub_video_color_t color;
   unsigned int x;
   unsigned int y;
@@ -49,6 +47,10 @@ grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),
   const char *str;
   int texty;
 
+  err = grub_video_set_mode ("auto", GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
+  if (err)
+    return err;
+
   grub_video_get_viewport (&x, &y, &width, &height);
 
   grub_video_create_render_target (&text_layer, width, height,
@@ -152,12 +154,13 @@ grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),
 
   grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
 
-  for (i = 0; i < 255; i++)
+  for (i = 0; i < 5; i++)
     {
       color = grub_video_map_rgb (i, 33, 77);
       grub_video_fill_rect (color, 0, 0, width, height);
       grub_video_blit_render_target (text_layer, GRUB_VIDEO_BLIT_BLEND, 0, 0,
                                      0, 0, width, height);
+      grub_video_swap_buffers ();
     }
 
   grub_getkey ();
diff --git a/include/grub/video.h b/include/grub/video.h
index 4145db465..53fe67c4e 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -171,7 +171,7 @@ struct grub_video_adapter
   grub_err_t (*fini) (void);
 
   grub_err_t (*setup) (unsigned int width,  unsigned int height,
-                       unsigned int mode_type);
+                       unsigned int mode_type, unsigned int mode_mask);
 
   grub_err_t (*get_info) (struct grub_video_mode_info *mode_info);
 
@@ -307,7 +307,14 @@ grub_err_t grub_video_set_active_render_target (struct grub_video_render_target
 grub_err_t grub_video_get_active_render_target (struct grub_video_render_target **target);
 
 grub_err_t grub_video_set_mode (const char *modestring,
-				int NESTED_FUNC_ATTR (*hook) (grub_video_adapter_t p,
-							      struct grub_video_mode_info *mode_info));
+				unsigned int modemask,
+				unsigned int modevalue);
+
+static inline int
+grub_video_check_mode_flag (unsigned int flags, unsigned int mask,
+			    unsigned int flag, int def)
+{
+  return (flag & mask) ? !! (flags & flag) : def;
+}
 
 #endif /* ! GRUB_VIDEO_HEADER */
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 4bdb09b24..8659e8245 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -523,11 +523,11 @@ grub_linux_boot (void)
       if (! tmp)
 	return grub_errno;
       grub_sprintf (tmp, "%s;text", modevar);
-      err = grub_video_set_mode (tmp, 0);
+      err = grub_video_set_mode (tmp, 0, 0);
       grub_free (tmp);
     }
   else
-    err = grub_video_set_mode ("text", 0);
+    err = grub_video_set_mode ("text", 0, 0);
 
   if (err)
     {
diff --git a/loader/i386/pc/xnu.c b/loader/i386/pc/xnu.c
index ebb176bb4..839d0ad44 100644
--- a/loader/i386/pc/xnu.c
+++ b/loader/i386/pc/xnu.c
@@ -26,16 +26,7 @@
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 #define max(a,b) (((a) > (b)) ? (a) : (b))
 
-#define DEFAULT_VIDEO_MODE "1024x768x32,800x600x32,640x480x32"
-
-static int NESTED_FUNC_ATTR video_hook (grub_video_adapter_t p __attribute__ ((unused)),
-					struct grub_video_mode_info *info)
-{
-  if (info->mode_type & GRUB_VIDEO_MODE_TYPE_PURE_TEXT)
-    return 0;
-
-  return 1;
-}
+#define DEFAULT_VIDEO_MODE "auto"
 
 /* Setup video for xnu. */
 grub_err_t
@@ -48,8 +39,12 @@ grub_xnu_set_video (struct grub_xnu_boot_params *params)
   grub_err_t err;
 
   modevar = grub_env_get ("gfxpayload");
+  /* Consider only graphical 32-bit deep modes.  */
   if (! modevar || *modevar == 0)
-    err = grub_video_set_mode (DEFAULT_VIDEO_MODE, video_hook);
+    err = grub_video_set_mode (DEFAULT_VIDEO_MODE,
+			       GRUB_VIDEO_MODE_TYPE_PURE_TEXT
+			       | GRUB_VIDEO_MODE_TYPE_DEPTH_MASK,
+			       32 << GRUB_VIDEO_MODE_TYPE_DEPTH_POS);
   else
     {
       tmp = grub_malloc (grub_strlen (modevar)
@@ -58,7 +53,10 @@ grub_xnu_set_video (struct grub_xnu_boot_params *params)
 	return grub_error (GRUB_ERR_OUT_OF_MEMORY,
 			   "couldn't allocate temporary storag");
       grub_sprintf (tmp, "%s;" DEFAULT_VIDEO_MODE, modevar);
-      err = grub_video_set_mode (tmp, video_hook);
+      err = grub_video_set_mode (tmp,
+				 GRUB_VIDEO_MODE_TYPE_PURE_TEXT
+				 | GRUB_VIDEO_MODE_TYPE_DEPTH_MASK,
+				 32 << GRUB_VIDEO_MODE_TYPE_DEPTH_POS);
       grub_free (tmp);
     }
 
diff --git a/term/gfxterm.c b/term/gfxterm.c
index f161499e6..57c51cffa 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -27,7 +27,7 @@
 #include <grub/bitmap.h>
 #include <grub/command.h>
 
-#define DEFAULT_VIDEO_MODE "1024x768,800x600,640x480"
+#define DEFAULT_VIDEO_MODE "auto"
 #define DEFAULT_BORDER_WIDTH	10
 
 #define DEFAULT_STANDARD_COLOR  0x07
@@ -244,12 +244,6 @@ grub_virtual_screen_setup (unsigned int x, unsigned int y,
   return grub_errno;
 }
 
-static int NESTED_FUNC_ATTR video_hook (grub_video_adapter_t p __attribute__ ((unused)),
-					struct grub_video_mode_info *info)
-{
-  return ! (info->mode_type & GRUB_VIDEO_MODE_TYPE_PURE_TEXT);
-}
-
 static grub_err_t
 grub_gfxterm_init (void)
 {
@@ -269,13 +263,15 @@ grub_gfxterm_init (void)
   /* Parse gfxmode environment variable if set.  */
   modevar = grub_env_get ("gfxmode");
   if (! modevar || *modevar == 0)
-    err = grub_video_set_mode (DEFAULT_VIDEO_MODE, video_hook);
+    err = grub_video_set_mode (DEFAULT_VIDEO_MODE,
+			       GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
   else
     {
       tmp = grub_malloc (grub_strlen (modevar)
 			 + sizeof (DEFAULT_VIDEO_MODE) + 1);
       grub_sprintf (tmp, "%s;" DEFAULT_VIDEO_MODE, modevar);
-      err = grub_video_set_mode (tmp, video_hook);
+      err = grub_video_set_mode (tmp,
+				 GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
       grub_free (tmp);
     }
 
diff --git a/video/i386/pc/vbe.c b/video/i386/pc/vbe.c
index a285b26ba..8759ba652 100644
--- a/video/i386/pc/vbe.c
+++ b/video/i386/pc/vbe.c
@@ -362,7 +362,7 @@ grub_video_vbe_fini (void)
 
 static grub_err_t
 grub_video_vbe_setup (unsigned int width, unsigned int height,
-                      unsigned int mode_type)
+                      unsigned int mode_type, unsigned int mode_mask)
 {
   grub_uint16_t *p;
   struct grub_vbe_mode_info_block vbe_mode_info;
@@ -412,32 +412,40 @@ grub_video_vbe_setup (unsigned int width, unsigned int height,
         /* Not compatible memory model.  */
         continue;
 
-      if ((vbe_mode_info.x_resolution != width)
-          || (vbe_mode_info.y_resolution != height))
+      if (((vbe_mode_info.x_resolution != width)
+	   || (vbe_mode_info.y_resolution != height)) && width != 0 && height != 0)
         /* Non matching resolution.  */
         continue;
 
       /* Check if user requested RGB or index color mode.  */
-      if ((mode_type & GRUB_VIDEO_MODE_TYPE_COLOR_MASK) != 0)
+      if ((mode_mask & GRUB_VIDEO_MODE_TYPE_COLOR_MASK) != 0)
         {
-          if (((mode_type & GRUB_VIDEO_MODE_TYPE_INDEX_COLOR) != 0)
-              && (vbe_mode_info.memory_model != GRUB_VBE_MEMORY_MODEL_PACKED_PIXEL))
-            /* Requested only index color modes.  */
-            continue;
+	  unsigned my_mode_type = 0;
 
-          if (((mode_type & GRUB_VIDEO_MODE_TYPE_RGB) != 0)
-              && (vbe_mode_info.memory_model != GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR))
-            /* Requested only RGB modes.  */
-            continue;
+	  if (vbe_mode_info.memory_model == GRUB_VBE_MEMORY_MODEL_PACKED_PIXEL)
+	    my_mode_type |= GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
+
+	  if (vbe_mode_info.memory_model == GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR)
+	    my_mode_type |= GRUB_VIDEO_MODE_TYPE_RGB;
+
+	  if ((my_mode_type & mode_mask
+	       & (GRUB_VIDEO_MODE_TYPE_RGB | GRUB_VIDEO_MODE_TYPE_INDEX_COLOR))
+	      != (mode_type & mode_mask
+		  & (GRUB_VIDEO_MODE_TYPE_RGB
+		     | GRUB_VIDEO_MODE_TYPE_INDEX_COLOR)))
+	    continue;
         }
 
       /* If there is a request for specific depth, ignore others.  */
       if ((depth != 0) && (vbe_mode_info.bits_per_pixel != depth))
         continue;
 
-      /* Select mode with most number of bits per pixel.  */
+      /* Select mode with most of "volume" (size of framebuffer in bits).  */
       if (best_vbe_mode != 0)
-        if (vbe_mode_info.bits_per_pixel < best_vbe_mode_info.bits_per_pixel)
+        if ((grub_uint64_t) vbe_mode_info.bits_per_pixel
+	    * vbe_mode_info.x_resolution * vbe_mode_info.y_resolution
+	    < (grub_uint64_t) best_vbe_mode_info.bits_per_pixel
+	    * best_vbe_mode_info.x_resolution * best_vbe_mode_info.y_resolution)
           continue;
 
       /* Save so far best mode information for later use.  */
diff --git a/video/video.c b/video/video.c
index c1d66bdd0..eff257122 100644
--- a/video/video.c
+++ b/video/video.c
@@ -399,21 +399,81 @@ grub_video_get_active_render_target (struct grub_video_render_target **target)
   return grub_video_adapter_active->get_active_render_target (target);
 }
 
+/* Parse <width>x<height>[x<depth>]*/
+static grub_err_t
+parse_modespec (const char *current_mode, int *width, int *height, int *depth)
+{
+  const char *value;
+  const char *param = current_mode;
+
+  *width = *height = *depth = -1;
+
+  if (grub_strcmp (param, "auto") == 0)
+    {
+      *width = *height = 0;
+      return GRUB_ERR_NONE;
+    }
+
+  /* Find width value.  */
+  value = param;
+  param = grub_strchr(param, 'x');
+  if (param == NULL)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+		       "Invalid mode: %s\n",
+		       current_mode);
+
+  param++;
+  
+  *width = grub_strtoul (value, 0, 0);
+  if (grub_errno != GRUB_ERR_NONE)
+      return grub_error (GRUB_ERR_BAD_ARGUMENT,
+			 "Invalid mode: %s\n",
+			 current_mode);
+  
+  /* Find height value.  */
+  value = param;
+  param = grub_strchr(param, 'x');
+  if (param == NULL)
+    {
+      *height = grub_strtoul (value, 0, 0);
+      if (grub_errno != GRUB_ERR_NONE)
+	return grub_error (GRUB_ERR_BAD_ARGUMENT,
+			   "Invalid mode: %s\n",
+			   current_mode);
+    }
+  else
+    {
+      /* We have optional color depth value.  */
+      param++;
+      
+      *height = grub_strtoul (value, 0, 0);
+      if (grub_errno != GRUB_ERR_NONE)
+	return grub_error (GRUB_ERR_BAD_ARGUMENT,
+			   "Invalid mode: %s\n",
+			   current_mode);
+      
+      /* Convert color depth value.  */
+      value = param;
+      *depth = grub_strtoul (value, 0, 0);
+      if (grub_errno != GRUB_ERR_NONE)
+	return grub_error (GRUB_ERR_BAD_ARGUMENT,
+			   "Invalid mode: %s\n",
+			   current_mode);
+    }
+  return GRUB_ERR_NONE;
+}
+
 grub_err_t
 grub_video_set_mode (const char *modestring,
-		     int NESTED_FUNC_ATTR (*hook) (grub_video_adapter_t p,
-						   struct grub_video_mode_info *mode_info))
+		     unsigned int modemask,
+		     unsigned int modevalue)
 {
   char *tmp;
   char *next_mode;
   char *current_mode;
-  char *param;
-  char *value;
   char *modevar;
-  int width = -1;
-  int height = -1;
-  int depth = -1;
-  int flags = 0;
+
+  modevalue &= modemask;
 
   /* Take copy of env.var. as we don't want to modify that.  */
   modevar = grub_strdup (modestring);
@@ -429,26 +489,26 @@ grub_video_set_mode (const char *modestring,
       || grub_memcmp (next_mode, "keep,", sizeof ("keep,") - 1) == 0
       || grub_memcmp (next_mode, "keep;", sizeof ("keep;") - 1) == 0)
     {
-      struct grub_video_mode_info mode_info;
       int suitable = 1;
       grub_err_t err;
 
-      grub_memset (&mode_info, 0, sizeof (mode_info));
-
       if (grub_video_adapter_active)
 	{
+	  struct grub_video_mode_info mode_info;
+	  grub_memset (&mode_info, 0, sizeof (mode_info));
 	  err = grub_video_get_info (&mode_info);
 	  if (err)
 	    {
 	      suitable = 0;
 	      grub_errno = GRUB_ERR_NONE;
 	    }
+	  if ((mode_info.mode_type & modemask) != modevalue)
+	    suitable = 0;
 	}
-      else
-	mode_info.mode_type = GRUB_VIDEO_MODE_TYPE_PURE_TEXT;
+      else if (((GRUB_VIDEO_MODE_TYPE_PURE_TEXT & modemask) != 0)
+	       && ((GRUB_VIDEO_MODE_TYPE_PURE_TEXT & modevalue) == 0))
+	suitable = 0;
 
-      if (suitable && hook)
-	suitable = hook (grub_video_adapter_active, &mode_info);
       if (suitable)
 	{
 	  grub_free (modevar);
@@ -482,15 +542,16 @@ grub_video_set_mode (const char *modestring,
   /* Loop until all modes has been tested out.  */
   while (next_mode != NULL)
     {
+      int width = -1;
+      int height = -1;
+      int depth = -1;
+      grub_err_t err;
+      unsigned int flags = modevalue;
+      unsigned int flagmask = modemask;
+
       /* Use last next_mode as current mode.  */
       tmp = next_mode;
 
-      /* Reset video mode settings.  */
-      width = -1;
-      height = -1;
-      depth = -1;
-      flags = 0;
-
       /* Save position of next mode and separate modes.  */
       for (; *next_mode; next_mode++)
 	if (*next_mode == ',' || *next_mode == ';')
@@ -509,19 +570,16 @@ grub_video_set_mode (const char *modestring,
 
       /* Initialize token holders.  */
       current_mode = tmp;
-      param = tmp;
-      value = NULL;
 
       /* XXX: we assume that we're in pure text mode if
 	 no video mode is initialized. Is it always true? */
-      if (grub_strcmp (param, "text") == 0)
+      if (grub_strcmp (current_mode, "text") == 0)
 	{
 	  struct grub_video_mode_info mode_info;
 
 	  grub_memset (&mode_info, 0, sizeof (mode_info));
-	  mode_info.mode_type = GRUB_VIDEO_MODE_TYPE_PURE_TEXT;
-
-	  if (! hook || hook (0, &mode_info))
+	  if (((GRUB_VIDEO_MODE_TYPE_PURE_TEXT & modemask) == 0)
+	      || ((GRUB_VIDEO_MODE_TYPE_PURE_TEXT & modevalue) != 0))
 	    {
 	      /* Valid mode found from adapter, and it has been activated.
 		 Specify it as active adapter.  */
@@ -534,121 +592,31 @@ grub_video_set_mode (const char *modestring,
 	    }
 	}
 
-      /* Parse <width>x<height>[x<depth>]*/
-
-      /* Find width value.  */
-      value = param;
-      param = grub_strchr(param, 'x');
-      if (param == NULL)
+      err = parse_modespec (current_mode, &width, &height, &depth);
+      if (err)
 	{
-	  grub_err_t rc;
-
-	  /* First setup error message.  */
-	  rc = grub_error (GRUB_ERR_BAD_ARGUMENT,
-			   "Invalid mode: %s\n",
-			   current_mode);
-
 	  /* Free memory before returning.  */
 	  grub_free (modevar);
 
-	  return rc;
-	}
-
-      *param = 0;
-      param++;
-
-      width = grub_strtoul (value, 0, 0);
-      if (grub_errno != GRUB_ERR_NONE)
-	{
-	  grub_err_t rc;
-
-	  /* First setup error message.  */
-	  rc = grub_error (GRUB_ERR_BAD_ARGUMENT,
-			   "Invalid mode: %s\n",
-			   current_mode);
-
-	  /* Free memory before returning.  */
-	  grub_free (modevar);
-
-	  return rc;
-	}
-
-      /* Find height value.  */
-      value = param;
-      param = grub_strchr(param, 'x');
-      if (param == NULL)
-	{
-	  height = grub_strtoul (value, 0, 0);
-	  if (grub_errno != GRUB_ERR_NONE)
-	    {
-	      grub_err_t rc;
-
-	      /* First setup error message.  */
-	      rc = grub_error (GRUB_ERR_BAD_ARGUMENT,
-			       "Invalid mode: %s\n",
-			       current_mode);
-
-	      /* Free memory before returning.  */
-	      grub_free (modevar);
-
-	      return rc;
-	    }
-	}
-      else
-	{
-	  /* We have optional color depth value.  */
-	  *param = 0;
-	  param++;
-
-	  height = grub_strtoul (value, 0, 0);
-	  if (grub_errno != GRUB_ERR_NONE)
-	    {
-	      grub_err_t rc;
-
-	      /* First setup error message.  */
-	      rc = grub_error (GRUB_ERR_BAD_ARGUMENT,
-			       "Invalid mode: %s\n",
-			       current_mode);
-
-	      /* Free memory before returning.  */
-	      grub_free (modevar);
-
-	      return rc;
-	    }
-
-	  /* Convert color depth value.  */
-	  value = param;
-	  depth = grub_strtoul (value, 0, 0);
-	  if (grub_errno != GRUB_ERR_NONE)
-	    {
-	      grub_err_t rc;
-
-	      /* First setup error message.  */
-	      rc = grub_error (GRUB_ERR_BAD_ARGUMENT,
-			       "Invalid mode: %s\n",
-			       current_mode);
-
-	      /* Free memory before returning.  */
-	      grub_free (modevar);
-
-	      return rc;
-	    }
+	  return err;
 	}
 
       /* Try out video mode.  */
 
-      /* If we have 8 or less bits, then assume that it is indexed color mode.  */
-      if ((depth <= 8) && (depth != -1))
-	flags |= GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
+      /* If user requested specific depth check if this depth is supported.  */
+      if (depth != -1 && (flagmask & GRUB_VIDEO_MODE_TYPE_DEPTH_MASK)
+	  &&
+	  (((flags & GRUB_VIDEO_MODE_TYPE_DEPTH_MASK)
+	    != ((depth << GRUB_VIDEO_MODE_TYPE_DEPTH_POS)
+		& GRUB_VIDEO_MODE_TYPE_DEPTH_MASK))))
+	continue;
 
-      /* We have more than 8 bits, then assume that it is RGB color mode.  */
-      if (depth > 8)
-	flags |= GRUB_VIDEO_MODE_TYPE_RGB;
-
-      /* If user requested specific depth, forward that information to driver.  */
       if (depth != -1)
-	flags |= (depth << GRUB_VIDEO_MODE_TYPE_DEPTH_POS)
-	  & GRUB_VIDEO_MODE_TYPE_DEPTH_MASK;
+	{
+	  flags |= (depth << GRUB_VIDEO_MODE_TYPE_DEPTH_POS)
+	    & GRUB_VIDEO_MODE_TYPE_DEPTH_MASK;
+	  flagmask |= GRUB_VIDEO_MODE_TYPE_DEPTH_MASK;
+	}
 
       /* Try to initialize requested mode.  Ignore any errors.  */
       grub_video_adapter_t p;
@@ -670,7 +638,7 @@ grub_video_set_mode (const char *modestring,
 	    }
 
 	  /* Try to initialize video mode.  */
-	  err = p->setup (width, height, flags);
+	  err = p->setup (width, height, flags, flagmask);
 	  if (err != GRUB_ERR_NONE)
 	    {
 	      p->fini ();
@@ -686,7 +654,15 @@ grub_video_set_mode (const char *modestring,
 	      continue;
 	    }
 
-	  if (hook && ! hook (p, &mode_info))
+	  flags = mode_info.mode_type & ~GRUB_VIDEO_MODE_TYPE_DEPTH_MASK;
+	  flags |= (mode_info.bpp << GRUB_VIDEO_MODE_TYPE_DEPTH_POS)
+	    & GRUB_VIDEO_MODE_TYPE_DEPTH_MASK;
+
+	  /* Check that mode is suitable for upper layer.  */
+	  if ((flags & GRUB_VIDEO_MODE_TYPE_PURE_TEXT)
+	      ? (((GRUB_VIDEO_MODE_TYPE_PURE_TEXT & modemask) != 0)
+		 && ((GRUB_VIDEO_MODE_TYPE_PURE_TEXT & modevalue) == 0))
+	      : ((flags & modemask) != modevalue))
 	    {
 	      p->fini ();
 	      grub_errno = GRUB_ERR_NONE;

From 1f56d837883e066a8791af4c297bc809934e7409 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 14 Nov 2009 17:00:39 +0100
Subject: [PATCH 0081/1628] Initial reimport of double buffering

---
 ChangeLog.video         |  31 ++++++
 commands/minicmd.c      |   1 -
 include/grub/video.h    |   5 +
 include/grub/video_fb.h |  11 ++
 kern/misc.c             |   4 -
 kern/term.c             |   1 +
 normal/cmdline.c        |  10 +-
 term/gfxterm.c          |   7 ++
 video/fb/video_fb.c     |  52 ++++++++++
 video/i386/pc/vbe.c     | 219 +++++++++++++++++++++++++++++++++++++---
 10 files changed, 318 insertions(+), 23 deletions(-)
 create mode 100644 ChangeLog.video

diff --git a/ChangeLog.video b/ChangeLog.video
new file mode 100644
index 000000000..c088b7f36
--- /dev/null
+++ b/ChangeLog.video
@@ -0,0 +1,31 @@
+2009-08-24  Colin D Bennett  <colin@gibibit.com>
+2009-08-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Double buffering support.
+
+	* commands/i386/pc/videotest.c (grub_cmd_videotest): Swap doublebuffers.
+	* include/grub/video.h: Update comment.
+	* include/grub/video_fb.h (grub_video_fb_doublebuf_update_screen_t):
+	New type.
+	(grub_video_fb_doublebuf_blit_init): New prototype.
+	* term/gfxterm.c (scroll_up): Support double buffering.
+	(grub_gfxterm_refresh): Likewise.
+	* video/fb/video_fb.c (doublebuf_blit_update_screen): New function.
+	(grub_video_fb_doublebuf_blit_init): Likewise.
+	* video/i386/pc/vbe.c (framebuffer): Remove 'render_target'. Add
+	'front_target', 'back_target', 'offscreen_buffer', 'page_size',
+	'displayed_page', 'render_page' and 'update_screen'.
+	(grub_video_vbe_fini): Free offscreen buffer.
+	(doublebuf_pageflipping_commit): New function.
+	(doublebuf_pageflipping_update_screen): Likewise.
+	(doublebuf_pageflipping_init): Likewise.
+	(double_buffering_init): Likewise.
+	(grub_video_vbe_setup): Enable doublebuffering.
+	(grub_video_vbe_swap_buffers): Implement.
+	(grub_video_vbe_set_active_render_target): Handle double buffering.
+	(grub_video_vbe_get_active_render_target): Likewise.
+	(grub_video_vbe_get_info_and_fini): Likewise. Free offscreen_buffer.
+	(grub_video_vbe_adapter): Use grub_video_vbe_get_active_render_target.
+	(grub_video_vbe_enable_double_buffering): Likewise.
+	(grub_video_vbe_swap_buffers): Use update_screen.
+	(grub_video_set_mode): Use double buffering.
diff --git a/commands/minicmd.c b/commands/minicmd.c
index 6c9c33a0e..7a1695838 100644
--- a/commands/minicmd.c
+++ b/commands/minicmd.c
@@ -315,7 +315,6 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
 	  grub_printf ("%s", dep->mod->name);
 	}
       grub_putchar ('\n');
-      grub_refresh ();
 
       return 0;
     }
diff --git a/include/grub/video.h b/include/grub/video.h
index 53fe67c4e..4f8b5cf7b 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -34,6 +34,9 @@ struct grub_video_render_target;
 struct grub_video_bitmap;
 
 /* Defines used to describe video mode or rendering target.  */
+/* If following is set render target contains previously displayed image
+   after swapping buffers (otherwise it contains newly displayedd image).
+ */
 #define GRUB_VIDEO_MODE_TYPE_PURE_TEXT		0x00000040
 #define GRUB_VIDEO_MODE_TYPE_ALPHA		0x00000020
 #define GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED	0x00000010
@@ -48,6 +51,8 @@ struct grub_video_bitmap;
 #define GRUB_VIDEO_MODE_TYPE_DEPTH_MASK		0x0000ff00
 #define GRUB_VIDEO_MODE_TYPE_DEPTH_POS		8
 
+/* The basic render target representing the whole display.  This always
+   renders to the back buffer when double-buffering is in use.  */
 #define GRUB_VIDEO_RENDER_TARGET_DISPLAY \
   ((struct grub_video_render_target *) 0)
 
diff --git a/include/grub/video_fb.h b/include/grub/video_fb.h
index 17debd69f..3046a597b 100644
--- a/include/grub/video_fb.h
+++ b/include/grub/video_fb.h
@@ -115,4 +115,15 @@ grub_video_fb_get_active_render_target (struct grub_video_fbrender_target **targ
 grub_err_t
 grub_video_fb_set_active_render_target (struct grub_video_fbrender_target *target);
 
+typedef grub_err_t
+(*grub_video_fb_doublebuf_update_screen_t) (struct grub_video_fbrender_target *front,
+					  struct grub_video_fbrender_target *back);
+
+grub_err_t
+grub_video_fb_doublebuf_blit_init (struct grub_video_fbrender_target **front,
+				   struct grub_video_fbrender_target **back,
+				   grub_video_fb_doublebuf_update_screen_t *update_screen,
+				   struct grub_video_mode_info mode_info,
+				   void *framebuf);
+
 #endif /* ! GRUB_VIDEO_FB_HEADER */
diff --git a/kern/misc.c b/kern/misc.c
index cacfbc753..38a5638b3 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -161,7 +161,6 @@ grub_vprintf (const char *fmt, va_list args)
   int ret;
 
   ret = grub_vsprintf (0, fmt, args);
-  grub_refresh ();
   return ret;
 }
 
@@ -818,9 +817,6 @@ grub_vsprintf (char *str, const char *fmt, va_list args)
   if (str)
     *str = '\0';
 
-  if (count && !str)
-    grub_refresh ();
-
   return count;
 }
 
diff --git a/kern/term.c b/kern/term.c
index 94d5a9e1d..8c4e1e339 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -131,6 +131,7 @@ grub_getcharwidth (grub_uint32_t code)
 int
 grub_getkey (void)
 {
+  grub_refresh ();
   return (grub_cur_term_input->getkey) ();
 }
 
diff --git a/normal/cmdline.c b/normal/cmdline.c
index 7a5b6ec84..3816ce9d6 100644
--- a/normal/cmdline.c
+++ b/normal/cmdline.c
@@ -199,8 +199,6 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
       xpos = (plen + lpos) % 79;
       ypos = ystart + (plen + lpos) / 79;
       grub_gotoxy (xpos, ypos);
-
-      grub_refresh ();
     }
 
   void cl_print (int pos, int c)
@@ -241,8 +239,6 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
 	  cl_print (lpos - len, echo_char);
 	  cl_set_pos ();
 	}
-
-      grub_refresh ();
     }
 
   void cl_delete (unsigned len)
@@ -262,8 +258,6 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
 	  cl_print (lpos, echo_char);
 	  cl_set_pos ();
 	}
-
-      grub_refresh ();
     }
 
   plen = grub_strlen (prompt);
@@ -283,6 +277,8 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
   if (history && hist_used == 0)
     grub_history_add (buf);
 
+  grub_refresh ();
+
   while ((key = GRUB_TERM_ASCII_CHAR (grub_getkey ())) != '\n' && key != '\r')
     {
       if (readline)
@@ -457,6 +453,8 @@ grub_cmdline_get (const char *prompt, char cmdline[], unsigned max_len,
 	    }
 	  break;
 	}
+
+      grub_refresh ();
     }
 
   grub_putchar ('\n');
diff --git a/term/gfxterm.c b/term/gfxterm.c
index 57c51cffa..1a46a867d 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -124,6 +124,8 @@ static unsigned int calculate_normal_character_width (grub_font_t font);
 
 static unsigned char calculate_character_width (struct grub_font_glyph *glyph);
 
+static void grub_gfxterm_refresh (void);
+
 static void
 set_term_color (grub_uint8_t term_color)
 {
@@ -815,6 +817,9 @@ grub_gfxterm_cls (void)
 
   /* Mark virtual screen to be redrawn.  */
   dirty_region_add_virtualscreen ();
+
+  dirty_region_redraw ();
+  grub_gfxterm_refresh ();
 }
 
 static void
@@ -877,6 +882,8 @@ grub_gfxterm_refresh (void)
 {
   /* Redraw only changed regions.  */
   dirty_region_redraw ();
+
+  grub_video_swap_buffers ();
 }
 
 static grub_err_t
diff --git a/video/fb/video_fb.c b/video/fb/video_fb.c
index 5f2917da6..b7323b5b7 100644
--- a/video/fb/video_fb.c
+++ b/video/fb/video_fb.c
@@ -66,6 +66,8 @@ grub_video_fb_init (void)
 grub_err_t
 grub_video_fb_fini (void)
 {
+  /* TODO: destroy render targets.  */
+
   grub_free (palette);
   render_target = 0;
   palette = 0;
@@ -1182,3 +1184,53 @@ grub_video_fb_get_active_render_target (struct grub_video_fbrender_target **targ
 
   return GRUB_ERR_NONE;
 }
+
+static grub_err_t
+doublebuf_blit_update_screen (struct grub_video_fbrender_target *front,
+			      struct grub_video_fbrender_target *back)
+{
+  grub_memcpy (front->data, back->data,
+	       front->mode_info.pitch * front->mode_info.height);
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_video_fb_doublebuf_blit_init (struct grub_video_fbrender_target **front,
+				   struct grub_video_fbrender_target **back,
+				   grub_video_fb_doublebuf_update_screen_t *update_screen,
+				   struct grub_video_mode_info mode_info,
+				   void *framebuf)
+{
+  grub_err_t err;
+  int page_size = mode_info.pitch * mode_info.height;
+  void *offscreen_buffer;
+
+  err = grub_video_fb_create_render_target_from_pointer (front, &mode_info,
+							 framebuf);
+  if (err)
+    return err;
+
+  offscreen_buffer = grub_malloc (page_size);
+  if (! offscreen_buffer)
+    {
+      grub_video_fb_delete_render_target (*front);
+      *front = 0;
+      return grub_errno;
+    }
+
+  err = grub_video_fb_create_render_target_from_pointer (back, &mode_info,
+							 offscreen_buffer);
+
+  if (err)
+    {
+      grub_video_fb_delete_render_target (*front);
+      grub_free (offscreen_buffer);
+      *front = 0;
+      return grub_errno;
+    }
+  (*back)->is_allocated = 1;
+
+  *update_screen = doublebuf_blit_update_screen;
+
+  return GRUB_ERR_NONE;
+}
diff --git a/video/i386/pc/vbe.c b/video/i386/pc/vbe.c
index 8759ba652..f2c414a99 100644
--- a/video/i386/pc/vbe.c
+++ b/video/i386/pc/vbe.c
@@ -36,13 +36,25 @@ static struct grub_vbe_mode_info_block active_vbe_mode_info;
 static struct
 {
   struct grub_video_mode_info mode_info;
-  struct grub_video_render_target *render_target;
+  struct grub_video_render_target *front_target;
+  struct grub_video_render_target *back_target;
 
   unsigned int bytes_per_scan_line;
   unsigned int bytes_per_pixel;
   grub_uint32_t active_vbe_mode;
   grub_uint8_t *ptr;
   int index_color_mode;
+
+  char *offscreen_buffer;
+
+  grub_size_t page_size;        /* The size of a page in bytes.  */
+
+  /* For page flipping strategy.  */
+  int displayed_page;           /* The page # that is the front buffer.  */
+  int render_page;              /* The page # that is the back buffer.  */
+
+  /* Virtual functions.  */
+  grub_video_fb_doublebuf_update_screen_t update_screen;
 } framebuffer;
 
 static grub_uint32_t initial_vbe_mode;
@@ -344,6 +356,7 @@ static grub_err_t
 grub_video_vbe_fini (void)
 {
   grub_vbe_status_t status;
+  grub_err_t err;
 
   /* Restore old video mode.  */
   status = grub_vbe_bios_set_mode (initial_vbe_mode, 0);
@@ -355,11 +368,170 @@ grub_video_vbe_fini (void)
   grub_free (vbe_mode_list);
   vbe_mode_list = NULL;
 
-  /* TODO: destroy render targets.  */
-
-  return grub_video_fb_fini ();
+  err = grub_video_fb_fini ();
+  grub_free (framebuffer.offscreen_buffer);
+  return err;
 }
 
+/*
+  Set framebuffer render target page and display the proper page, based on
+  `doublebuf_state.render_page' and `doublebuf_state.displayed_page',
+  respectively.
+*/
+static grub_err_t
+doublebuf_pageflipping_commit (void)
+{
+  /* Tell the video adapter to display the new front page.  */
+  int display_start_line
+    = framebuffer.mode_info.height * framebuffer.displayed_page;
+
+  grub_vbe_status_t vbe_err =
+    grub_vbe_bios_set_display_start (0, display_start_line);
+
+  if (vbe_err != GRUB_VBE_STATUS_OK)
+    return grub_error (GRUB_ERR_IO, "couldn't commit pageflip");
+
+  return 0;
+}
+
+static grub_err_t
+doublebuf_pageflipping_update_screen (struct grub_video_fbrender_target *front
+				      __attribute__ ((unused)),
+				      struct grub_video_fbrender_target *back
+				      __attribute__ ((unused)))
+{
+  int new_displayed_page;
+  struct grub_video_fbrender_target *target;
+  grub_err_t err;
+
+  /* Swap the page numbers in the framebuffer struct.  */
+  new_displayed_page = framebuffer.render_page;
+  framebuffer.render_page = framebuffer.displayed_page;
+  framebuffer.displayed_page = new_displayed_page;
+
+  err = doublebuf_pageflipping_commit ();
+  if (err)
+    {
+      /* Restore previous state.  */
+      framebuffer.render_page = framebuffer.displayed_page;
+      framebuffer.displayed_page = new_displayed_page;
+      return err;
+    }
+
+  grub_memcpy (framebuffer.ptr + framebuffer.render_page
+	       * framebuffer.page_size, framebuffer.ptr
+	       + framebuffer.displayed_page * framebuffer.page_size,
+	       framebuffer.page_size);
+
+  target = framebuffer.back_target;
+  framebuffer.back_target = framebuffer.front_target;
+  framebuffer.front_target = target;
+
+  err = grub_video_fb_get_active_render_target (&target);
+  if (err)
+    return err;
+
+  if (target == framebuffer.back_target)
+    err = grub_video_fb_set_active_render_target (framebuffer.front_target);
+  else if (target == framebuffer.front_target)
+    err = grub_video_fb_set_active_render_target (framebuffer.back_target);
+
+  return err;
+}
+
+static grub_err_t
+doublebuf_pageflipping_init (void)
+{
+  /* Get video RAM size in bytes.  */
+  grub_size_t vram_size = controller_info.total_memory << 16;
+  grub_err_t err;
+
+  framebuffer.page_size =
+    framebuffer.mode_info.pitch * framebuffer.mode_info.height;
+
+  if (2 * framebuffer.page_size > vram_size)
+    return grub_error (GRUB_ERR_OUT_OF_MEMORY,
+		       "Not enough video memory for double buffering.");
+
+  framebuffer.displayed_page = 0;
+  framebuffer.render_page = 1;
+
+  framebuffer.update_screen = doublebuf_pageflipping_update_screen;
+
+  err = grub_video_fb_create_render_target_from_pointer (&framebuffer.front_target, &framebuffer.mode_info, framebuffer.ptr);
+  if (err)
+    return err;
+
+  err = grub_video_fb_create_render_target_from_pointer (&framebuffer.back_target, &framebuffer.mode_info, framebuffer.ptr + framebuffer.page_size);
+  if (err)
+    {
+      grub_video_fb_delete_render_target (framebuffer.front_target);
+      return err;
+    }
+
+  /* Set the framebuffer memory data pointer and display the right page.  */
+  err = doublebuf_pageflipping_commit ();
+  if (err)
+    {
+      grub_video_fb_delete_render_target (framebuffer.front_target);
+      grub_video_fb_delete_render_target (framebuffer.back_target);
+      return err;
+    }
+
+  return GRUB_ERR_NONE;
+}
+
+/* Select the best double buffering mode available.  */
+static grub_err_t
+double_buffering_init (unsigned int mode_type, unsigned int mode_mask)
+{
+  grub_err_t err;
+
+  if (grub_video_check_mode_flag (mode_type, mode_mask,
+				  GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED, 1))
+    {
+      err = doublebuf_pageflipping_init ();
+      if (!err)
+	{
+	  framebuffer.mode_info.mode_type
+	    |= GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED;
+	  return GRUB_ERR_NONE;
+	}
+
+      grub_errno = GRUB_ERR_NONE;
+
+      err = grub_video_fb_doublebuf_blit_init (&framebuffer.front_target,
+					       &framebuffer.back_target,
+					       &framebuffer.update_screen,
+					       framebuffer.mode_info,
+					       framebuffer.ptr);
+
+      if (!err)
+	{
+	  framebuffer.mode_info.mode_type
+	    |= GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED;
+	  return GRUB_ERR_NONE;
+	}
+
+      grub_errno = GRUB_ERR_NONE;
+    }
+
+  /* Fall back to no double buffering.  */
+  err = grub_video_fb_create_render_target_from_pointer (&framebuffer.front_target, &framebuffer.mode_info, framebuffer.ptr);
+
+  if (err)
+    return err;
+
+  framebuffer.back_target = framebuffer.front_target;
+  framebuffer.update_screen = 0;
+
+  framebuffer.mode_info.mode_type &= ~GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED;
+
+  return GRUB_ERR_NONE;
+}
+
+
+
 static grub_err_t
 grub_video_vbe_setup (unsigned int width, unsigned int height,
                       unsigned int mode_type, unsigned int mode_mask)
@@ -488,12 +660,12 @@ grub_video_vbe_setup (unsigned int width, unsigned int height,
 
       framebuffer.mode_info.blit_format = grub_video_get_blit_format (&framebuffer.mode_info);
 
-      err = grub_video_fb_create_render_target_from_pointer (&framebuffer.render_target, &framebuffer.mode_info, framebuffer.ptr);
-
+      /* Set up double buffering and targets.  */
+      err = double_buffering_init (mode_type, mode_mask);
       if (err)
 	return err;
 
-      err = grub_video_fb_set_active_render_target (framebuffer.render_target);
+      err = grub_video_fb_set_active_render_target (framebuffer.back_target);
 
       if (err)
 	return err;
@@ -530,7 +702,15 @@ grub_video_vbe_set_palette (unsigned int start, unsigned int count,
 static grub_err_t
 grub_video_vbe_swap_buffers (void)
 {
-  /* TODO: Implement buffer swapping.  */
+  grub_err_t err;
+  if (!framebuffer.update_screen)
+    return GRUB_ERR_NONE;
+
+  err = framebuffer.update_screen (framebuffer.front_target,
+				   framebuffer.back_target);
+  if (err)
+    return err;
+
   return GRUB_ERR_NONE;
 }
 
@@ -538,27 +718,42 @@ static grub_err_t
 grub_video_vbe_set_active_render_target (struct grub_video_render_target *target)
 {
   if (target == GRUB_VIDEO_RENDER_TARGET_DISPLAY)
-      target = framebuffer.render_target;
+      target = framebuffer.back_target;
 
   return grub_video_fb_set_active_render_target (target);
 }
 
+static grub_err_t
+grub_video_vbe_get_active_render_target (struct grub_video_render_target **target)
+{
+  grub_err_t err;
+  err = grub_video_fb_get_active_render_target (target);
+  if (err)
+    return err;
+
+  if (*target == framebuffer.back_target)
+    *target = GRUB_VIDEO_RENDER_TARGET_DISPLAY;
+
+  return GRUB_ERR_NONE;
+}
+
 static grub_err_t
 grub_video_vbe_get_info_and_fini (struct grub_video_mode_info *mode_info,
 				  void **framebuf)
 {
   grub_memcpy (mode_info, &(framebuffer.mode_info), sizeof (*mode_info));
-  *framebuf = (char *) framebuffer.ptr;
+  *framebuf = (char *) framebuffer.ptr
+    + framebuffer.displayed_page * framebuffer.page_size;
 
   grub_free (vbe_mode_list);
   vbe_mode_list = NULL;
 
   grub_video_fb_fini ();
+  grub_free (framebuffer.offscreen_buffer);
 
   return GRUB_ERR_NONE;
 }
 
-
 static struct grub_video_adapter grub_video_vbe_adapter =
   {
     .name = "VESA BIOS Extension Video Driver",
@@ -584,7 +779,7 @@ static struct grub_video_adapter grub_video_vbe_adapter =
     .create_render_target = grub_video_fb_create_render_target,
     .delete_render_target = grub_video_fb_delete_render_target,
     .set_active_render_target = grub_video_vbe_set_active_render_target,
-    .get_active_render_target = grub_video_fb_get_active_render_target,
+    .get_active_render_target = grub_video_vbe_get_active_render_target,
 
     .next = 0
   };

From bbe73b09954b3d82a039c6a88bd5a58114354b13 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 14 Nov 2009 17:59:11 +0100
Subject: [PATCH 0082/1628] Improved performance by not requiring updating swap
 in gfxterm

---
 include/grub/video.h |  5 ++--
 term/gfxterm.c       | 55 +++++++++++++++++++++++++++++++-------------
 video/i386/pc/vbe.c  | 50 ++++++++++++++++++++++++++++------------
 3 files changed, 77 insertions(+), 33 deletions(-)

diff --git a/include/grub/video.h b/include/grub/video.h
index 4f8b5cf7b..a1882f57b 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -34,9 +34,10 @@ struct grub_video_render_target;
 struct grub_video_bitmap;
 
 /* Defines used to describe video mode or rendering target.  */
-/* If following is set render target contains previously displayed image
-   after swapping buffers (otherwise it contains newly displayedd image).
+/* If following is set render target contains currenly displayed image
+   after swapping buffers (otherwise it contains previously displayed image).
  */
+#define GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP	0x00000080
 #define GRUB_VIDEO_MODE_TYPE_PURE_TEXT		0x00000040
 #define GRUB_VIDEO_MODE_TYPE_ALPHA		0x00000020
 #define GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED	0x00000010
diff --git a/term/gfxterm.c b/term/gfxterm.c
index 1a46a867d..6906b77a1 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -474,8 +474,6 @@ dirty_region_redraw (void)
   height = dirty_region.bottom_right_y - y + 1;
 
   redraw_screen_rect (x, y, width, height);
-
-  dirty_region_reset ();
 }
 
 static void
@@ -566,9 +564,6 @@ scroll_up (void)
     {
       /* Remove cursor.  */
       draw_cursor (0);
-
-      /* Redraw only changed regions.  */
-      dirty_region_redraw ();
     }
 
   /* Scroll text buffer with one line to up.  */
@@ -584,28 +579,52 @@ scroll_up (void)
        i++)
     clear_char (&(virtual_screen.text_buffer[i]));
 
-  /* Scroll physical screen.  */
-  grub_video_set_active_render_target (text_layer);
-  color = virtual_screen.bg_color;
-  grub_video_scroll (color, 0, -virtual_screen.normal_char_height);
-  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
-
   /* If we have bitmap, re-draw screen, otherwise scroll physical screen too.  */
   if (bitmap)
     {
+      /* Scroll physical screen.  */
+      grub_video_set_active_render_target (text_layer);
+      color = virtual_screen.bg_color;
+      grub_video_scroll (color, 0, -virtual_screen.normal_char_height);
+
       /* Mark virtual screen to be redrawn.  */
       dirty_region_add_virtualscreen ();
     }
   else
     {
-      /* Clear new border area.  */
-      grub_video_fill_rect (color,
-                            virtual_screen.offset_x, virtual_screen.offset_y,
-                            virtual_screen.width, virtual_screen.normal_char_height);
+      int i = 1;
+      if (mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
+	  && !(mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP))
+	i++;
+
+      color = virtual_screen.bg_color;
+
+      while (i--)
+	{
+	  /* Clear new border area.  */
+	  grub_video_fill_rect (color,
+				virtual_screen.offset_x,
+				virtual_screen.offset_y,
+				virtual_screen.width,
+				virtual_screen.normal_char_height);
+
+	  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
+	  dirty_region_redraw ();
+
+	  /* Scroll physical screen.  */
+	  grub_video_scroll (color, 0, -virtual_screen.normal_char_height);
+
+	  if (i)
+	    grub_video_swap_buffers ();
+	}
+      dirty_region_reset ();
 
       /* Scroll physical screen.  */
+      grub_video_set_active_render_target (text_layer);
+      color = virtual_screen.bg_color;
       grub_video_scroll (color, 0, -virtual_screen.normal_char_height);
 
+
       /* Draw cursor if visible.  */
       if (virtual_screen.cursor_state)
 	draw_cursor (1);
@@ -818,7 +837,6 @@ grub_gfxterm_cls (void)
   /* Mark virtual screen to be redrawn.  */
   dirty_region_add_virtualscreen ();
 
-  dirty_region_redraw ();
   grub_gfxterm_refresh ();
 }
 
@@ -884,6 +902,11 @@ grub_gfxterm_refresh (void)
   dirty_region_redraw ();
 
   grub_video_swap_buffers ();
+
+  if (mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
+      && !(mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP))
+    dirty_region_redraw ();
+  dirty_region_reset ();
 }
 
 static grub_err_t
diff --git a/video/i386/pc/vbe.c b/video/i386/pc/vbe.c
index f2c414a99..a039710a2 100644
--- a/video/i386/pc/vbe.c
+++ b/video/i386/pc/vbe.c
@@ -418,10 +418,11 @@ doublebuf_pageflipping_update_screen (struct grub_video_fbrender_target *front
       return err;
     }
 
-  grub_memcpy (framebuffer.ptr + framebuffer.render_page
-	       * framebuffer.page_size, framebuffer.ptr
-	       + framebuffer.displayed_page * framebuffer.page_size,
-	       framebuffer.page_size);
+  if (framebuffer.mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP)
+    grub_memcpy (framebuffer.ptr + framebuffer.render_page
+		 * framebuffer.page_size, framebuffer.ptr
+		 + framebuffer.displayed_page * framebuffer.page_size,
+		 framebuffer.page_size);
 
   target = framebuffer.back_target;
   framebuffer.back_target = framebuffer.front_target;
@@ -486,19 +487,38 @@ static grub_err_t
 double_buffering_init (unsigned int mode_type, unsigned int mode_mask)
 {
   grub_err_t err;
+  int updating_swap_needed;
 
+  updating_swap_needed
+    = grub_video_check_mode_flag (mode_type, mode_mask,
+				  GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP, 0);
+
+  /* Do double buffering only if it's either requested or efficient.  */
   if (grub_video_check_mode_flag (mode_type, mode_mask,
-				  GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED, 1))
+				  GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED,
+				  !updating_swap_needed))
     {
+      framebuffer.mode_info.mode_type |= GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED;
+      if (updating_swap_needed)
+	framebuffer.mode_info.mode_type |= GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP;
       err = doublebuf_pageflipping_init ();
       if (!err)
-	{
-	  framebuffer.mode_info.mode_type
-	    |= GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED;
-	  return GRUB_ERR_NONE;
-	}
+	return GRUB_ERR_NONE;
+      
+      framebuffer.mode_info.mode_type
+	&= ~(GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
+	     | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
 
       grub_errno = GRUB_ERR_NONE;
+    }
+
+  if (grub_video_check_mode_flag (mode_type, mode_mask,
+				  GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED,
+				  0))
+    {
+      framebuffer.mode_info.mode_type 
+	|= (GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
+	    | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
 
       err = grub_video_fb_doublebuf_blit_init (&framebuffer.front_target,
 					       &framebuffer.back_target,
@@ -507,11 +527,11 @@ double_buffering_init (unsigned int mode_type, unsigned int mode_mask)
 					       framebuffer.ptr);
 
       if (!err)
-	{
-	  framebuffer.mode_info.mode_type
-	    |= GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED;
-	  return GRUB_ERR_NONE;
-	}
+	return GRUB_ERR_NONE;
+
+      framebuffer.mode_info.mode_type
+	&= ~(GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
+	     | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
 
       grub_errno = GRUB_ERR_NONE;
     }

From 85536ab717ff52e6d0b6e146811b923f367e1853 Mon Sep 17 00:00:00 2001
From: Colin D Bennet <colin@gibibit.com>
Date: Sat, 14 Nov 2009 23:11:55 +0100
Subject: [PATCH 0083/1628] 2009-11-14  Colin D Bennet <colin@gibibit.com>

	Trigonometry support.

	* include/grub/trig.h: New file.
	* lib/trig.c: Likewise.
	* maintainance/gentrigtables.py: Likewise.
	* conf/common.rmk (pkglib_MODULES): Add trig.mod.
	(trig_mod_SOURCES): New variable.
	(trig_mod_CFLAGS): Likewise.
	(trig_mod_LDFLAGS): Likewise.
---
 conf/common.rmk               |  6 +++
 include/grub/trig.h           | 44 +++++++++++++++++++
 lib/trig.c                    | 83 +++++++++++++++++++++++++++++++++++
 maintainance/gentrigtables.py | 58 ++++++++++++++++++++++++
 4 files changed, 191 insertions(+)
 create mode 100644 include/grub/trig.h
 create mode 100644 lib/trig.c
 create mode 100644 maintainance/gentrigtables.py

diff --git a/conf/common.rmk b/conf/common.rmk
index 3dddeb66d..4ec0dab1e 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -638,6 +638,12 @@ xnu_uuid_mod_SOURCES = commands/xnu_uuid.c
 xnu_uuid_mod_CFLAGS = $(COMMON_CFLAGS)
 xnu_uuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For trig.mod.
+pkglib_MODULES += trig.mod
+trig_mod_SOURCES = lib/trig.c
+trig_mod_CFLAGS = $(COMMON_CFLAGS)
+trig_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 pkglib_MODULES += setjmp.mod
 setjmp_mod_SOURCES = lib/$(target_cpu)/setjmp.S
 setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
diff --git a/include/grub/trig.h b/include/grub/trig.h
new file mode 100644
index 000000000..2512a5f07
--- /dev/null
+++ b/include/grub/trig.h
@@ -0,0 +1,44 @@
+/* trig.h - Trigonometric function support.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/>.
+ */
+
+#ifndef GRUB_TRIG_HEADER
+#define GRUB_TRIG_HEADER 1
+
+#define GRUB_TRIG_ANGLE_MAX 256
+#define GRUB_TRIG_ANGLE_MASK 255
+#define GRUB_TRIG_FRACTION_SCALE 16384
+
+extern short grub_trig_sintab[];
+extern short grub_trig_costab[];
+
+static __inline int
+grub_sin (int x)
+{
+  x &= GRUB_TRIG_ANGLE_MASK;
+  return grub_trig_sintab[x];
+}
+
+static __inline int
+grub_cos (int x)
+{
+  x &= GRUB_TRIG_ANGLE_MASK;
+  return grub_trig_costab[x];
+}
+
+#endif /* ! GRUB_TRIG_HEADER */
diff --git a/lib/trig.c b/lib/trig.c
new file mode 100644
index 000000000..e36aa38ef
--- /dev/null
+++ b/lib/trig.c
@@ -0,0 +1,83 @@
+/* trig.c - Trigonometric table definitions.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/trig.h>
+
+/* These tables were generated with `gentrigtables.py'.  */
+
+short grub_trig_sintab[] =
+{
+  0,402,804,1205,1606,2006,2404,2801,3196,3590,
+  3981,4370,4756,5139,5520,5897,6270,6639,7005,7366,
+  7723,8076,8423,8765,9102,9434,9760,10080,10394,10702,
+  11003,11297,11585,11866,12140,12406,12665,12916,13160,13395,
+  13623,13842,14053,14256,14449,14635,14811,14978,15137,15286,
+  15426,15557,15679,15791,15893,15986,16069,16143,16207,16261,
+  16305,16340,16364,16379,16384,16379,16364,16340,16305,16261,
+  16207,16143,16069,15986,15893,15791,15679,15557,15426,15286,
+  15137,14978,14811,14635,14449,14256,14053,13842,13623,13395,
+  13160,12916,12665,12406,12140,11866,11585,11297,11003,10702,
+  10394,10080,9760,9434,9102,8765,8423,8076,7723,7366,
+  7005,6639,6270,5897,5520,5139,4756,4370,3981,3590,
+  3196,2801,2404,2006,1606,1205,804,402,0,-402,
+  -804,-1205,-1606,-2006,-2404,-2801,-3196,-3590,-3981,-4370,
+  -4756,-5139,-5520,-5897,-6270,-6639,-7005,-7366,-7723,-8076,
+  -8423,-8765,-9102,-9434,-9760,-10080,-10394,-10702,-11003,-11297,
+  -11585,-11866,-12140,-12406,-12665,-12916,-13160,-13395,-13623,-13842,
+  -14053,-14256,-14449,-14635,-14811,-14978,-15137,-15286,-15426,-15557,
+  -15679,-15791,-15893,-15986,-16069,-16143,-16207,-16261,-16305,-16340,
+  -16364,-16379,-16384,-16379,-16364,-16340,-16305,-16261,-16207,-16143,
+  -16069,-15986,-15893,-15791,-15679,-15557,-15426,-15286,-15137,-14978,
+  -14811,-14635,-14449,-14256,-14053,-13842,-13623,-13395,-13160,-12916,
+  -12665,-12406,-12140,-11866,-11585,-11297,-11003,-10702,-10394,-10080,
+  -9760,-9434,-9102,-8765,-8423,-8076,-7723,-7366,-7005,-6639,
+  -6270,-5897,-5520,-5139,-4756,-4370,-3981,-3590,-3196,-2801,
+  -2404,-2006,-1606,-1205,-804,-402
+};
+
+short grub_trig_costab[] =
+{
+  16384,16379,16364,16340,16305,16261,16207,16143,16069,15986,
+  15893,15791,15679,15557,15426,15286,15137,14978,14811,14635,
+  14449,14256,14053,13842,13623,13395,13160,12916,12665,12406,
+  12140,11866,11585,11297,11003,10702,10394,10080,9760,9434,
+  9102,8765,8423,8076,7723,7366,7005,6639,6270,5897,
+  5520,5139,4756,4370,3981,3590,3196,2801,2404,2006,
+  1606,1205,804,402,0,-402,-804,-1205,-1606,-2006,
+  -2404,-2801,-3196,-3590,-3981,-4370,-4756,-5139,-5520,-5897,
+  -6270,-6639,-7005,-7366,-7723,-8076,-8423,-8765,-9102,-9434,
+  -9760,-10080,-10394,-10702,-11003,-11297,-11585,-11866,-12140,-12406,
+  -12665,-12916,-13160,-13395,-13623,-13842,-14053,-14256,-14449,-14635,
+  -14811,-14978,-15137,-15286,-15426,-15557,-15679,-15791,-15893,-15986,
+  -16069,-16143,-16207,-16261,-16305,-16340,-16364,-16379,-16384,-16379,
+  -16364,-16340,-16305,-16261,-16207,-16143,-16069,-15986,-15893,-15791,
+  -15679,-15557,-15426,-15286,-15137,-14978,-14811,-14635,-14449,-14256,
+  -14053,-13842,-13623,-13395,-13160,-12916,-12665,-12406,-12140,-11866,
+  -11585,-11297,-11003,-10702,-10394,-10080,-9760,-9434,-9102,-8765,
+  -8423,-8076,-7723,-7366,-7005,-6639,-6270,-5897,-5520,-5139,
+  -4756,-4370,-3981,-3590,-3196,-2801,-2404,-2006,-1606,-1205,
+  -804,-402,0,402,804,1205,1606,2006,2404,2801,
+  3196,3590,3981,4370,4756,5139,5520,5897,6270,6639,
+  7005,7366,7723,8076,8423,8765,9102,9434,9760,10080,
+  10394,10702,11003,11297,11585,11866,12140,12406,12665,12916,
+  13160,13395,13623,13842,14053,14256,14449,14635,14811,14978,
+  15137,15286,15426,15557,15679,15791,15893,15986,16069,16143,
+  16207,16261,16305,16340,16364,16379
+};
+
diff --git a/maintainance/gentrigtables.py b/maintainance/gentrigtables.py
new file mode 100644
index 000000000..7c069f833
--- /dev/null
+++ b/maintainance/gentrigtables.py
@@ -0,0 +1,58 @@
+#!/usr/bin/python
+# Script to generate trigonometric function tables.
+#
+#  GRUB  --  GRand Unified Bootloader
+#  Copyright (C) 2008  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/>.
+
+from math import *
+from sys import stdout
+
+def write(x):
+    stdout.write(x)
+
+def writeTable(arr, name):
+    indent = ' ' * 4
+    write("short ")
+    write(name)
+    write("[] =\n{\n")
+    write(indent)
+    for i in range(len(arr)):
+        if i != 0:
+            write(",")
+            if i % 10 == 0:
+                write("\n")
+                write(indent)
+        write("%d" % arr[i])
+    write("\n};\n")
+
+def main():
+    sintab = []
+    costab = []
+    for i in range(256):
+        # Convert to an angle in 1/256 of a circle.
+        x = i * 2 * pi / 256
+        sintab.append(int(round(sin(x) * 16384)))
+        costab.append(int(round(cos(x) * 16384)))
+
+    write("#define TRIG_ANGLE_MAX 256\n")
+    write("#define TRIG_FRACTION_SCALE 16384\n")
+    writeTable(sintab, "sintab")
+    writeTable(costab, "costab")
+
+if __name__ == "__main__":
+    main()
+
+# vim:ai et sw=4 ts=4

From c51a5caeab7dcbc9f9f49b923543bbb1645de70e Mon Sep 17 00:00:00 2001
From: Colin D Bennet <colin@gibibit.com>
Date: Sun, 15 Nov 2009 00:03:03 +0100
Subject: [PATCH 0084/1628] 2009-11-14  Colin D Bennet <colin@gibibit.com>
 2009-11-14  Vladimir Serbinenko  <phcoder@gmail.com>

	Support for gfxterm in a window.

	* include/grub/gfxterm.h: New file.
	* include/grub/video.h (struct grub_video_rect): New declaration.
	(grub_video_rect_t): Likewise.
	* term/gfxterm.c (struct grub_gfxterm_window): New type.
	(refcount): New variable.
	(render_target): Likewise.
	(window): Likewise.
	(repaint_callback): Likewise.
	(grub_virtual_screen_setup): Use 'render_target'.
	(init_window): New function.
	(grub_gfxterm_init_window): Likewise.
	(grub_gfxterm_init): Check reference counter.
	Use init_window.
	(destroy_window): New function.
	(grub_gfxterm_destroy_window): Likewise.
	(grub_gfxterm_fini): Check reference counter.
	Use destroy_window.
	(redraw_screen_rect): Restore viewport.
	Use 'render_target' and 'window'.
	Call 'repaint_callback'.
	(write_char): Use 'render_target'.
	(draw_cursor): Likewise.
	(scroll_up): Restore viewport.
	Use 'render_target' and 'window'.
	Call 'repaint_callback'.
	(grub_gfxterm_cls): Likewise.
	(grub_gfxterm_refresh): Use 'window'.
	(grub_gfxterm_set_repaint_callback): New function.
	(grub_gfxterm_background_image_cmd): Use 'window'.
	(grub_gfxterm_get_term): New function.
	(GRUB_MOD_INIT(term_gfxterm)): Set 'refcount' to 0.

	Also-By: Vladimir Serbinenko <phcoder@gmail.com>
---
 ChangeLog.gfxtermwindow |  36 +++++++
 include/grub/gfxterm.h  |  42 ++++++++
 include/grub/video.h    |  10 ++
 term/gfxterm.c          | 226 ++++++++++++++++++++++++++++++++--------
 4 files changed, 269 insertions(+), 45 deletions(-)
 create mode 100644 ChangeLog.gfxtermwindow
 create mode 100644 include/grub/gfxterm.h

diff --git a/ChangeLog.gfxtermwindow b/ChangeLog.gfxtermwindow
new file mode 100644
index 000000000..d23038ba7
--- /dev/null
+++ b/ChangeLog.gfxtermwindow
@@ -0,0 +1,36 @@
+2009-11-14  Colin D Bennet <colin@gibibit.com>
+2009-11-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Support for gfxterm in a window.
+
+	* include/grub/gfxterm.h: New file.
+	* include/grub/video.h (struct grub_video_rect): New declaration.
+	(grub_video_rect_t): Likewise.
+	* term/gfxterm.c (struct grub_gfxterm_window): New type.
+	(refcount): New variable.
+	(render_target): Likewise.
+	(window): Likewise.
+	(repaint_callback): Likewise.
+	(grub_virtual_screen_setup): Use 'render_target'.
+	(init_window): New function.
+	(grub_gfxterm_init_window): Likewise.
+	(grub_gfxterm_init): Check reference counter.
+	Use init_window.
+	(destroy_window): New function.
+	(grub_gfxterm_destroy_window): Likewise.
+	(grub_gfxterm_fini): Check reference counter.
+	Use destroy_window.
+	(redraw_screen_rect): Restore viewport.
+	Use 'render_target' and 'window'.
+	Call 'repaint_callback'.
+	(write_char): Use 'render_target'.
+	(draw_cursor): Likewise.
+	(scroll_up): Restore viewport.
+	Use 'render_target' and 'window'.
+	Call 'repaint_callback'.
+	(grub_gfxterm_cls): Likewise.
+	(grub_gfxterm_refresh): Use 'window'.
+	(grub_gfxterm_set_repaint_callback): New function.
+	(grub_gfxterm_background_image_cmd): Use 'window'.
+	(grub_gfxterm_get_term): New function.
+	(GRUB_MOD_INIT(term_gfxterm)): Set 'refcount' to 0.
diff --git a/include/grub/gfxterm.h b/include/grub/gfxterm.h
new file mode 100644
index 000000000..e607bd5e1
--- /dev/null
+++ b/include/grub/gfxterm.h
@@ -0,0 +1,42 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2006,2007,2008  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/>.
+ */
+
+#ifndef GRUB_GFXTERM_HEADER
+#define GRUB_GFXTERM_HEADER	1
+
+#include <grub/err.h>
+#include <grub/types.h>
+#include <grub/term.h>
+#include <grub/video.h>
+
+grub_err_t
+grub_gfxterm_init_window (struct grub_video_render_target *target,
+                          int x, int y, int width, int height,
+			  int double_repaint,
+                          const char *font_name, int border_width);
+
+void grub_gfxterm_destroy_window (void);
+
+const struct grub_term_output *grub_gfxterm_get_term (void);
+
+typedef void (*grub_gfxterm_repaint_callback_t)(int x, int y,
+                                                int width, int height);
+
+void grub_gfxterm_set_repaint_callback (grub_gfxterm_repaint_callback_t func);
+
+#endif /* ! GRUB_GFXTERM_HEADER */
diff --git a/include/grub/video.h b/include/grub/video.h
index a1882f57b..833df04c8 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -157,6 +157,16 @@ struct grub_video_mode_info
   grub_uint8_t fg_alpha;
 };
 
+/* A 2D rectangle type.  */
+struct grub_video_rect
+{
+  int x;
+  int y;
+  int width;
+  int height;
+};
+typedef struct grub_video_rect grub_video_rect_t;
+
 struct grub_video_palette_data
 {
   grub_uint8_t r; /* Red color value (0-255).  */
diff --git a/term/gfxterm.c b/term/gfxterm.c
index 62cf98416..3fc151c8b 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -24,6 +24,7 @@
 #include <grub/mm.h>
 #include <grub/env.h>
 #include <grub/video.h>
+#include <grub/gfxterm.h>
 #include <grub/bitmap.h>
 #include <grub/command.h>
 #include <grub/extcmd.h>
@@ -103,9 +104,28 @@ struct grub_virtual_screen
   struct grub_colored_char *text_buffer;
 };
 
-static struct grub_virtual_screen virtual_screen;
+struct grub_gfxterm_window
+{
+  unsigned x;
+  unsigned y;
+  unsigned width;
+  unsigned height;
+  int double_repaint;
+};
+
+static int refcount;
+static struct grub_video_render_target *render_target;
+static struct grub_gfxterm_window window;
+static struct grub_virtual_screen virtual_screen;
+static grub_gfxterm_repaint_callback_t repaint_callback;
+
+static grub_err_t init_window (struct grub_video_render_target *target,
+                               int x, int y, int width, int height, 
+			       int double_repaint,
+                               const char *font_name, int border_width);
+
+static void destroy_window (void);
 
-static struct grub_video_mode_info mode_info;
 
 static struct grub_video_render_target *text_layer;
 
@@ -239,7 +259,7 @@ grub_virtual_screen_setup (unsigned int x, unsigned int y,
 
   set_term_color (virtual_screen.term_color);
 
-  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
+  grub_video_set_active_render_target (render_target);
 
   /* Clear out text buffer. */
   for (i = 0; i < virtual_screen.columns * virtual_screen.rows; i++)
@@ -248,21 +268,71 @@ grub_virtual_screen_setup (unsigned int x, unsigned int y,
   return grub_errno;
 }
 
+static grub_err_t
+init_window (struct grub_video_render_target *target,
+             int x, int y, int width, int height, int double_repaint,
+             const char *font_name, int border_width)
+{
+  /* Clean up any prior instance.  */
+  destroy_window ();
+
+  /* Set the render target.  */
+  render_target = target;
+
+  /* Create virtual screen.  */
+  if (grub_virtual_screen_setup (border_width, border_width, 
+                                 width - 2 * border_width, 
+                                 height - 2 * border_width, 
+                                 font_name) 
+      != GRUB_ERR_NONE)
+    {
+      return grub_errno;
+    }
+
+  /* Set window bounds.  */
+  window.x = x;
+  window.y = y;
+  window.width = width;
+  window.height = height;
+  window.double_repaint = double_repaint;
+
+  /* Mark whole window as dirty.  */
+  dirty_region_reset ();
+  dirty_region_add (0, 0, width, height);
+
+  return grub_errno;
+}
+
+grub_err_t
+grub_gfxterm_init_window (struct grub_video_render_target *target,
+                          int x, int y, int width, int height,
+			  int double_repaint,
+                          const char *font_name, int border_width)
+{
+  if (refcount++ == 0)
+    init_window (target, x, y, width, height, double_repaint,
+		 font_name, border_width);
+  return grub_errno;
+}
+
 static grub_err_t
 grub_gfxterm_init (void)
 {
-  char *font_name;
-  char *modevar;
+  const char *font_name;
+  const char *modevar;
+  struct grub_video_mode_info mode_info;
   char *tmp;
-  grub_video_color_t color;
-  int width;
-  int height;
   grub_err_t err;
 
-  /* Select the font to use. */
+  /* If gfxterm has already been initialized by calling the init_window
+     function, then leave it alone when it is set as the current terminal.  */
+  if (refcount++ != 0)
+    return GRUB_ERR_NONE;
+
+  /* Select the font to use.  */
   font_name = grub_env_get ("gfxterm_font");
   if (! font_name)
-    font_name = "";   /* Allow fallback to any font. */
+    font_name = "";   /* Allow fallback to any font.  */
 
   /* Parse gfxmode environment variable if set.  */
   modevar = grub_env_get ("gfxmode");
@@ -273,6 +343,8 @@ grub_gfxterm_init (void)
     {
       tmp = grub_malloc (grub_strlen (modevar)
 			 + sizeof (DEFAULT_VIDEO_MODE) + 1);
+      if (! tmp)
+        return grub_errno;
       grub_sprintf (tmp, "%s;" DEFAULT_VIDEO_MODE, modevar);
       err = grub_video_set_mode (tmp,
 				 GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
@@ -292,27 +364,29 @@ grub_gfxterm_init (void)
   grub_video_fill_rect (color, 0, 0, mode_info.width, mode_info.height);
   bitmap = 0;
 
-  /* Leave borders for virtual screen.  */
-  width = mode_info.width - (2 * DEFAULT_BORDER_WIDTH);
-  height = mode_info.height - (2 * DEFAULT_BORDER_WIDTH);
+  /* Select the font to use.  */
+  font_name = grub_env_get ("gfxterm_font");
+  if (! font_name)
+    font_name = "";   /* Allow fallback to any font.  */
 
-  /* Create virtual screen.  */
-  if (grub_virtual_screen_setup (DEFAULT_BORDER_WIDTH, DEFAULT_BORDER_WIDTH,
-                                 width, height, font_name) != GRUB_ERR_NONE)
+  /* Leave borders for virtual screen.  */
+  if (init_window (GRUB_VIDEO_RENDER_TARGET_DISPLAY,
+                   0, 0, mode_info.width, mode_info.height,
+		   mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
+		   && !(mode_info.mode_type 
+			& GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP),
+                   font_name, 
+                   DEFAULT_BORDER_WIDTH) != GRUB_ERR_NONE)
     {
       grub_video_restore ();
       return grub_errno;
     }
 
-  /* Mark whole screen as dirty.  */
-  dirty_region_reset ();
-  dirty_region_add (0, 0, mode_info.width, mode_info.height);
-
-  return (grub_errno = GRUB_ERR_NONE);
+  return grub_errno;
 }
 
-static grub_err_t
-grub_gfxterm_fini (void)
+static void
+destroy_window (void)
 {
   if (bitmap)
     {
@@ -320,11 +394,30 @@ grub_gfxterm_fini (void)
       bitmap = 0;
     }
 
+  repaint_callback = 0;
   grub_virtual_screen_free ();
+}
 
-  grub_video_restore ();
+void
+grub_gfxterm_destroy_window (void)
+{
+  if (--refcount == 0)
+    destroy_window ();
+}
 
-  return GRUB_ERR_NONE;
+static grub_err_t
+grub_gfxterm_fini (void)
+{
+  /* Don't destroy an explicitly initialized terminal instance when it is
+     unset as the current terminal.  */
+  if (--refcount == 0)
+    {
+      destroy_window ();
+      grub_video_restore ();
+    }
+
+  /* Clear error state.  */
+  return (grub_errno = GRUB_ERR_NONE);
 }
 
 static void
@@ -332,9 +425,15 @@ redraw_screen_rect (unsigned int x, unsigned int y,
                     unsigned int width, unsigned int height)
 {
   grub_video_color_t color;
+  grub_video_rect_t saved_view;
 
-  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
-
+  grub_video_set_active_render_target (render_target);
+  /* Save viewport and set it to our window.  */
+  grub_video_get_viewport ((unsigned *) &saved_view.x, 
+                           (unsigned *) &saved_view.y, 
+                           (unsigned *) &saved_view.width, 
+                           (unsigned *) &saved_view.height);
+  grub_video_set_viewport (window.x, window.y, window.width, window.height);
 
   if (bitmap)
     {
@@ -401,6 +500,14 @@ redraw_screen_rect (unsigned int x, unsigned int y,
                                      y - virtual_screen.offset_y,
 				     width, height);
     }
+
+  /* Restore saved viewport.  */
+  grub_video_set_viewport (saved_view.x, saved_view.y,
+                           saved_view.width, saved_view.height);
+  grub_video_set_active_render_target (render_target);
+  
+  if (repaint_callback)
+    repaint_callback (x, y, width, height);
 }
 
 static void
@@ -515,7 +622,7 @@ write_char (void)
   grub_video_set_active_render_target (text_layer);
   grub_video_fill_rect (bgcolor, x, y, width, height);
   grub_font_draw_glyph (glyph, color, x, y + ascent);
-  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
+  grub_video_set_active_render_target (render_target);
 
   /* Mark character to be drawn.  */
   dirty_region_add (virtual_screen.offset_x + x, virtual_screen.offset_y + y,
@@ -546,7 +653,7 @@ draw_cursor (int show)
       /* Render cursor to text layer.  */
       grub_video_set_active_render_target (text_layer);
       grub_video_fill_rect (color, x, y, width, height);
-      grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
+      grub_video_set_active_render_target (render_target);
 
       /* Mark cursor to be redrawn.  */
       dirty_region_add (virtual_screen.offset_x + x,
@@ -594,10 +701,18 @@ scroll_up (void)
     }
   else
     {
-      int i = 1;
-      if (mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
-	  && !(mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP))
-	i++;
+      grub_video_rect_t saved_view;
+      int i;
+
+      grub_video_set_active_render_target (render_target);
+      /* Save viewport and set it to our window.  */
+      grub_video_get_viewport ((unsigned *) &saved_view.x, 
+                               (unsigned *) &saved_view.y, 
+                               (unsigned *) &saved_view.width, 
+                               (unsigned *) &saved_view.height);
+      grub_video_set_viewport (window.x, window.y, window.width, window.height);
+
+      i = window.double_repaint ? 2 : 1;
 
       color = virtual_screen.bg_color;
 
@@ -610,7 +725,7 @@ scroll_up (void)
 				virtual_screen.width,
 				virtual_screen.normal_char_height);
 
-	  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
+	  grub_video_set_active_render_target (render_target);
 	  dirty_region_redraw ();
 
 	  /* Scroll physical screen.  */
@@ -626,11 +741,18 @@ scroll_up (void)
       color = virtual_screen.bg_color;
       grub_video_scroll (color, 0, -virtual_screen.normal_char_height);
 
+      /* Restore saved viewport.  */
+      grub_video_set_viewport (saved_view.x, saved_view.y,
+                               saved_view.width, saved_view.height);
+      grub_video_set_active_render_target (render_target);
 
       /* Draw cursor if visible.  */
       if (virtual_screen.cursor_state)
 	draw_cursor (1);
     }
+
+  if (repaint_callback)
+    repaint_callback (window.x, window.y, window.width, window.height);
 }
 
 static void
@@ -833,8 +955,9 @@ grub_gfxterm_cls (void)
   /* Clear text layer.  */
   grub_video_set_active_render_target (text_layer);
   color = virtual_screen.bg_color;
-  grub_video_fill_rect (color, 0, 0, mode_info.width, mode_info.height);
-  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
+  grub_video_fill_rect (color, 0, 0,
+                        virtual_screen.width, virtual_screen.height);
+  grub_video_set_active_render_target (render_target);
 
   /* Mark virtual screen to be redrawn.  */
   dirty_region_add_virtualscreen ();
@@ -905,12 +1028,17 @@ grub_gfxterm_refresh (void)
 
   grub_video_swap_buffers ();
 
-  if (mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
-      && !(mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP))
+  if (window.double_repaint)
     dirty_region_redraw ();
   dirty_region_reset ();
 }
 
+void 
+grub_gfxterm_set_repaint_callback (grub_gfxterm_repaint_callback_t func)
+{
+  repaint_callback = func;
+}
+
 /* Option array indices.  */
 #define BACKGROUND_CMD_ARGINDEX_MODE 0
 
@@ -940,7 +1068,7 @@ grub_gfxterm_background_image_cmd (grub_extcmd_t cmd __attribute__ ((unused)),
 
       /* Mark whole screen as dirty.  */
       dirty_region_reset ();
-      dirty_region_add (0, 0, mode_info.width, mode_info.height);
+      dirty_region_add (0, 0, window.width, window.height);
     }
 
   /* If filename was provided, try to load that.  */
@@ -956,13 +1084,13 @@ grub_gfxterm_background_image_cmd (grub_extcmd_t cmd __attribute__ ((unused)),
         || grub_strcmp (state[BACKGROUND_CMD_ARGINDEX_MODE].arg,
                         "stretch") == 0)
         {
-          if (mode_info.width != grub_video_bitmap_get_width (bitmap)
-              || mode_info.height != grub_video_bitmap_get_height (bitmap))
+          if (window.width != grub_video_bitmap_get_width (bitmap)
+              || window.height != grub_video_bitmap_get_height (bitmap))
             {
               struct grub_video_bitmap *scaled_bitmap;
               grub_video_bitmap_create_scaled (&scaled_bitmap,
-                                               mode_info.width,
-                                               mode_info.height,
+                                               window.width, 
+                                               window.height,
                                                bitmap,
                                                GRUB_VIDEO_BITMAP_SCALE_METHOD_BEST);
               if (grub_errno == GRUB_ERR_NONE)
@@ -979,11 +1107,11 @@ grub_gfxterm_background_image_cmd (grub_extcmd_t cmd __attribute__ ((unused)),
       {
         /* Determine bitmap dimensions.  */
         bitmap_width = grub_video_bitmap_get_width (bitmap);
-        bitmap_height = grub_video_bitmap_get_width (bitmap);
+        bitmap_height = grub_video_bitmap_get_height (bitmap);
 
         /* Mark whole screen as dirty.  */
         dirty_region_reset ();
-        dirty_region_add (0, 0, mode_info.width, mode_info.height);
+        dirty_region_add (0, 0, window.width, window.height);
       }
     }
 
@@ -1012,10 +1140,18 @@ static struct grub_term_output grub_video_term =
     .next = 0
   };
 
+const struct grub_term_output *
+grub_gfxterm_get_term (void)
+{
+  return &grub_video_term;
+}
+
 static grub_extcmd_t background_image_cmd_handle;
 
 GRUB_MOD_INIT(term_gfxterm)
 {
+  refcount = 0;
+
   grub_term_register_output ("gfxterm", &grub_video_term);
   background_image_cmd_handle =
     grub_register_extcmd ("background_image",

From 4e962809b57b5018e00ca982d55a012c6e6674d7 Mon Sep 17 00:00:00 2001
From: Felix Zielcke <fzielcke@z-51.de>
Date: Mon, 16 Nov 2009 21:46:43 +0100
Subject: [PATCH 0085/1628] 2009-11-16  Felix Zielcke  <fzielcke@z-51.de>

	* disk/mdraid_linux.c: Fix the unsupported RAID version error
	with metadata 1.x.
---
 ChangeLog.raid      | 5 +++++
 disk/mdraid_linux.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.raid b/ChangeLog.raid
index 090e1edc7..645f7e7f1 100644
--- a/ChangeLog.raid
+++ b/ChangeLog.raid
@@ -1,3 +1,8 @@
+2009-11-16  Felix Zielcke  <fzielcke@z-51.de>
+
+	* disk/mdraid_linux.c: Fix the unsupported RAID version error
+	with metadata 1.x.
+
 2009-11-06  Felix Zielcke  <fzielcke@z-51.de>
 
 	* disk/dmraid_nvidia.c (grub_dmraid_nv_detect): Set array->name to NULL.
diff --git a/disk/mdraid_linux.c b/disk/mdraid_linux.c
index 275267f72..026adb380 100644
--- a/disk/mdraid_linux.c
+++ b/disk/mdraid_linux.c
@@ -346,9 +346,9 @@ superblock_0_90:
   if (sb_1x->level != 0 && sb_1x->level != 1 && sb_1x->level != 4 &&
       sb_1x->level != 5 && sb_1x->level != 6 && sb_1x->level != 10)
     {
-      grub_free (sb_1x);
       return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-			 "Unsupported RAID level: %d", sb.level);
+			 "Unsupported RAID level: %d", sb_1x->level);
+      grub_free (sb_1x);
     }
   /* 1.x superblocks don't have a fixed size on disk.  So we have to
      read it again now that we now the max device count.  */

From 8bcaed961a8e08081c22a511c70c1fdddfa297a3 Mon Sep 17 00:00:00 2001
From: Felix Zielcke <fzielcke@z-51.de>
Date: Mon, 16 Nov 2009 21:52:10 +0100
Subject: [PATCH 0086/1628] 2009-11-16  Felix Zielcke  <fzielcke@z-51.de>

	* disk/mdraid_linux.c (grub_mdraid_detect): Remove a wrong call
	of free().
---
 ChangeLog.raid      | 9 +++++++--
 disk/mdraid_linux.c | 3 ---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.raid b/ChangeLog.raid
index 645f7e7f1..854702f41 100644
--- a/ChangeLog.raid
+++ b/ChangeLog.raid
@@ -1,7 +1,12 @@
 2009-11-16  Felix Zielcke  <fzielcke@z-51.de>
 
-	* disk/mdraid_linux.c: Fix the unsupported RAID version error
-	with metadata 1.x.
+	* disk/mdraid_linux.c (grub_mdraid_detect): Remove a wrong call
+	of free().
+
+2009-11-16  Felix Zielcke  <fzielcke@z-51.de>
+
+	* disk/mdraid_linux.c (grub_mdraid_detect): Fix the unsupported
+	RAID version error with metadata 1.x.
 
 2009-11-06  Felix Zielcke  <fzielcke@z-51.de>
 
diff --git a/disk/mdraid_linux.c b/disk/mdraid_linux.c
index 026adb380..8670710b3 100644
--- a/disk/mdraid_linux.c
+++ b/disk/mdraid_linux.c
@@ -320,10 +320,7 @@ superblock_0_90:
   array->uuid_len = 16;
   array->uuid = grub_malloc (16);
   if (!array->uuid)
-    {
-      grub_free (sb_1x);
       return grub_errno;
-    }
 
   uuid = (grub_uint32_t *) array->uuid;
   uuid[0] = sb.set_uuid0;

From 927d0134c72432fd1cdff4591cc5eee6a509d60f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Nov 2009 10:28:42 +0100
Subject: [PATCH 0087/1628] SDL

---
 Makefile.in      |   2 +
 conf/i386-pc.rmk |   6 ++
 configure.ac     |  34 ++++++
 util/sdl.c       | 263 +++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 305 insertions(+)
 create mode 100644 util/sdl.c

diff --git a/Makefile.in b/Makefile.in
index 7706cd26b..f2b4e7fc0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,12 +107,14 @@ endif
 AWK = @AWK@
 LIBCURSES = @LIBCURSES@
 LIBUSB = @LIBUSB@
+LIBSDL = @LIBSDL@
 YACC = @YACC@
 UNIFONT_BDF = @UNIFONT_BDF@
 
 # Options.
 enable_grub_emu = @enable_grub_emu@
 enable_grub_emu_usb = @enable_grub_emu_usb@
+enable_grub_emu_sdl = @enable_grub_emu_sdl@
 enable_grub_fstest = @enable_grub_fstest@
 enable_grub_pe2elf = @enable_grub_pe2elf@
 enable_grub_mkfont = @enable_grub_mkfont@
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index e1688ccd5..382c45ca3 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -153,6 +153,12 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c		\
 	fs/befs.c fs/befs_be.c fs/tar.c				\
 	\
+	video/video.c video/fb/video_fb.c video/fb/fbblit.c             \
+        video/fb/fbfill.c video/fb/fbutil.c commands/videotest.c        \
+	video/bitmap.c video/readers/tga.c video/readers/jpeg.c         \
+	video/readers/png.c font/font_cmd.c font/font.c term/gfxterm.c  \
+	io/bufio.c							\
+	\
 	util/console.c util/hostfs.c util/grub-emu.c util/misc.c	\
 	util/hostdisk.c util/getroot.c					\
 	\
diff --git a/configure.ac b/configure.ac
index 587f2118d..d2b281639 100644
--- a/configure.ac
+++ b/configure.ac
@@ -519,6 +519,10 @@ if test x"$enable_grub_emu" = xno ; then
   grub_emu_excuse="explicitly disabled"
 fi
 
+AC_ARG_ENABLE([grub-emu-sdl],
+	      [AS_HELP_STRING([--enable-grub-emu-sdl],
+                             [build and install the `grub-emu' debugging utility with SDL support (default=guessed)])])
+
   [# Check for curses libraries.]
 [if [ x"$grub_emu_excuse" = x ]; then ]
   AC_CHECK_LIB([ncurses], [wgetch], [LIBCURSES="-lncurses"],
@@ -567,6 +571,31 @@ enable_grub_emu_usb=no
 fi
 
 AC_SUBST([enable_grub_emu])
+
+if test x"$enable_grub_emu_sdl" = xno ; then
+  grub_emu_sdl_excuse="explicitely disabled"
+fi
+[if [ x"$grub_emu_sdl_excuse" = x ]; then
+    # Check for libSDL libraries.]
+AC_CHECK_LIB([SDL], [SDL_Init], [LIBSDL="-lSDL"],
+    [grub_emu_sdl_excuse=["libSDL libraries are required to build \`grub-emu' with SDL support"]])
+    AC_SUBST([LIBSDL])
+[fi]
+[if [ x"$grub_emu_sdl_excuse" = x ]; then
+    # Check for headers.]
+    AC_CHECK_HEADERS([SDL/SDL.h], [],
+      [grub_emu_sdl_excuse=["libSDL header file is required to build \`grub-emu' with SDL support"]])
+[fi]
+if test x"enable_grub_emu_sdl" = xyes && test x"$grub_emu_sdl_excuse" != x ; then
+  AC_MSG_ERROR([SDL support for grub-emu was explicitely requested but can't be compiled])
+fi
+if test x"$grub_emu_sdl_excuse" = x ; then
+enable_grub_emu_sdl=yes
+else
+enable_grub_emu_sdl=no
+fi
+
+AC_SUBST([enable_grub_emu_sdl])
 AC_SUBST([enable_grub_emu_usb])
 
 AC_ARG_ENABLE([grub-fstest],
@@ -641,6 +670,11 @@ echo USB support for grub-emu: Yes
 else
 echo USB support for grub-emu: No "($grub_emu_usb_excuse)"
 fi
+if [ x"$grub_emu_sdl_excuse" = x ]; then
+echo SDL support for grub-emu: Yes
+else
+echo SDL support for grub-emu: No "($grub_emu_sdl_excuse)"
+fi
 if [ x"$enable_mm_debug" = xyes ]; then
 echo With memory debugging: Yes
 else
diff --git a/util/sdl.c b/util/sdl.c
new file mode 100644
index 000000000..a5a310518
--- /dev/null
+++ b/util/sdl.c
@@ -0,0 +1,263 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2005,2006,2007,2008,2009  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/>.
+ */
+
+#define grub_video_render_target grub_video_fbrender_target
+
+#include <grub/err.h>
+#include <grub/types.h>
+#include <grub/dl.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/video.h>
+#include <grub/video_fb.h>
+#include <SDL/SDL.h>
+
+static SDL_Surface *window = 0;
+static struct grub_video_render_target *sdl_render_target;
+static struct grub_video_mode_info mode_info;
+
+static grub_err_t
+grub_video_sdl_set_palette (unsigned int start, unsigned int count,
+                            struct grub_video_palette_data *palette_data);
+
+static grub_err_t
+grub_video_sdl_init (void)
+{
+  window = 0;
+
+  if (SDL_Init (SDL_INIT_VIDEO) < 0)
+    return grub_error (GRUB_ERR_BAD_DEVICE, "Couldn't init SDL: %s",
+		       SDL_GetError ());
+
+  grub_memset (&mode_info, 0, sizeof (mode_info));
+
+  return grub_video_fb_init ();
+}
+
+static grub_err_t
+grub_video_sdl_fini (void)
+{
+  SDL_Quit ();
+  window = 0;
+
+  grub_memset (&mode_info, 0, sizeof (mode_info));
+
+  return grub_video_fb_fini ();
+}
+
+static inline unsigned int
+get_mask_size (grub_uint32_t mask)
+{
+  unsigned i;
+  for (i = 0; mask > 1U << i; i++);
+  return i;
+}
+
+static grub_err_t
+grub_video_sdl_setup (unsigned int width, unsigned int height,
+                      unsigned int mode_type, unsigned int mode_mask)
+{
+  int depth;
+  int flags = 0;
+  grub_err_t err;
+
+  /* Decode depth from mode_type.  If it is zero, then autodetect.  */
+  depth = (mode_type & GRUB_VIDEO_MODE_TYPE_DEPTH_MASK)
+          >> GRUB_VIDEO_MODE_TYPE_DEPTH_POS;
+
+  if (depth == 0)
+    depth = 32;
+
+  if (width == 0 && height == 0)
+    {
+      width = 800;
+      height = 600;
+    }
+
+  if ((mode_type & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED)
+      || !(mode_mask & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED))
+    flags |= SDL_DOUBLEBUF;
+
+  window = SDL_SetVideoMode (width, height, depth, flags | SDL_HWSURFACE);
+  if (! window)
+    window = SDL_SetVideoMode (width, height, depth, flags | SDL_SWSURFACE);
+  if (! window)
+    return grub_error (GRUB_ERR_BAD_DEVICE, "Couldn't open window: %s",
+		       SDL_GetError ());
+
+  grub_memset (&sdl_render_target, 0, sizeof (sdl_render_target));
+
+  mode_info.width = window->w;
+  mode_info.height = window->h;
+  mode_info.mode_type = 0;
+  if (window->flags & SDL_DOUBLEBUF)
+    mode_info.mode_type
+      |= GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED;
+  if (window->format->palette)
+    mode_info.mode_type |= GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
+  else
+    mode_info.mode_type |= GRUB_VIDEO_MODE_TYPE_RGB;
+
+  mode_info.bpp = window->format->BitsPerPixel;
+  mode_info.bytes_per_pixel = window->format->BytesPerPixel;
+  mode_info.pitch = window->pitch;
+
+  /* In index color mode, number of colors.  In RGB mode this is 256.  */
+  if (window->format->palette)
+    mode_info.number_of_colors
+      = 1 << window->format->BitsPerPixel;
+  else
+    mode_info.number_of_colors = 256;
+
+  if (! window->format->palette)
+    {
+      mode_info.red_mask_size
+	= get_mask_size (window->format->Rmask >> window->format->Rshift);
+      mode_info.red_field_pos = window->format->Rshift;
+      mode_info.green_mask_size
+	= get_mask_size (window->format->Gmask >> window->format->Gshift);
+      mode_info.green_field_pos = window->format->Gshift;
+      mode_info.blue_mask_size
+	= get_mask_size (window->format->Bmask >> window->format->Bshift);
+      mode_info.blue_field_pos = window->format->Bshift;
+      mode_info.reserved_mask_size
+	= get_mask_size (window->format->Amask >> window->format->Ashift);
+      mode_info.reserved_field_pos = window->format->Ashift;
+      mode_info.blit_format
+	= grub_video_get_blit_format (&mode_info);
+    }
+
+  err = grub_video_fb_create_render_target_from_pointer (&sdl_render_target,
+							 &mode_info,
+							 window->pixels);
+  if (err)
+    return err;
+
+  /* Copy default palette to initialize emulated palette.  */
+  grub_video_sdl_set_palette (0, (sizeof (grub_video_fbstd_colors)
+				  / sizeof (grub_video_fbstd_colors[0])),
+			      grub_video_fbstd_colors);
+
+  /* Reset render target to SDL one.  */
+  return grub_video_fb_set_active_render_target (sdl_render_target);
+}
+
+static grub_err_t
+grub_video_sdl_set_palette (unsigned int start, unsigned int count,
+                            struct grub_video_palette_data *palette_data)
+{
+  unsigned i;
+  if (window->format->palette)
+    {
+      SDL_Color *tmp = grub_malloc (count * sizeof (tmp[0]));
+      for (i = 0; i < count; i++)
+	{
+	  tmp[i].r = palette_data[i].r;
+	  tmp[i].g = palette_data[i].g;
+	  tmp[i].b = palette_data[i].b;
+	  tmp[i].unused = palette_data[i].a;
+	}
+      SDL_SetColors (window, tmp, start, count);
+      grub_free (tmp);
+    }
+
+  return grub_video_fb_set_palette (start, count, palette_data);
+}
+
+grub_err_t
+grub_video_sdl_set_viewport (unsigned int x, unsigned int y,
+			     unsigned int width, unsigned int height)
+{
+  /* Make sure viewport is withing screen dimensions.  If viewport was set
+     to be out of the region, mark its size as zero.  */
+  if (x > (unsigned) window->w)
+    {
+      x = 0;
+      width = 0;
+    }
+
+  if (y > (unsigned) window->h)
+    {
+      y = 0;
+      height = 0;
+    }
+
+  if (x + width > (unsigned) window->w)
+    width = window->w - x;
+
+  if (y + height > (unsigned) window->h)
+    height = window->h - y;
+  return grub_video_fb_set_viewport (x, y, width, height);
+}
+
+static grub_err_t
+grub_video_sdl_swap_buffers (void)
+{
+  if (SDL_Flip (window) < 0)
+    return grub_error (GRUB_ERR_BAD_DEVICE, "couldn't swap buffers: %s",
+		       SDL_GetError ());
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_video_sdl_set_active_render_target (struct grub_video_render_target *target)
+{
+  if (target == GRUB_VIDEO_RENDER_TARGET_DISPLAY)
+    return grub_video_fb_set_active_render_target (sdl_render_target);
+
+  return grub_video_fb_set_active_render_target (target);
+}
+
+static struct grub_video_adapter grub_video_sdl_adapter =
+  {
+    .name = "SDL Video Driver",
+
+    .init = grub_video_sdl_init,
+    .fini = grub_video_sdl_fini,
+    .setup = grub_video_sdl_setup,
+    .get_info = grub_video_fb_get_info,
+    .set_palette = grub_video_sdl_set_palette,
+    .get_palette = grub_video_fb_get_palette,
+    .set_viewport = grub_video_fb_set_viewport,
+    .get_viewport = grub_video_fb_get_viewport,
+    .map_color = grub_video_fb_map_color,
+    .map_rgb = grub_video_fb_map_rgb,
+    .map_rgba = grub_video_fb_map_rgba,
+    .unmap_color = grub_video_fb_unmap_color,
+    .fill_rect = grub_video_fb_fill_rect,
+    .blit_bitmap = grub_video_fb_blit_bitmap,
+    .blit_render_target = grub_video_fb_blit_render_target,
+    .scroll = grub_video_fb_scroll,
+    .swap_buffers = grub_video_sdl_swap_buffers,
+    .create_render_target = grub_video_fb_create_render_target,
+    .delete_render_target = grub_video_fb_delete_render_target,
+    .set_active_render_target = grub_video_sdl_set_active_render_target,
+    .get_active_render_target = grub_video_fb_get_active_render_target,
+
+    .next = 0
+  };
+
+GRUB_MOD_INIT(sdl)
+{
+  grub_video_register (&grub_video_sdl_adapter);
+}
+
+GRUB_MOD_FINI(sdl)
+{
+  grub_video_unregister (&grub_video_sdl_adapter);
+}

From a9d407a81e6761a24f4816d43035e7accdc1ad4d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Nov 2009 10:46:30 +0100
Subject: [PATCH 0088/1628] Reimported scaling

---
 ChangeLog.scale             |  16 ++
 conf/common.rmk             |   6 +
 include/grub/bitmap_scale.h |  48 ++++++
 include/grub/xnu.h          |   3 +
 loader/i386/pc/xnu.c        |  45 ++++--
 loader/xnu.c                |  37 ++++-
 term/gfxterm.c              |  53 ++++++-
 video/bitmap_scale.c        | 308 ++++++++++++++++++++++++++++++++++++
 8 files changed, 490 insertions(+), 26 deletions(-)
 create mode 100644 ChangeLog.scale
 create mode 100644 include/grub/bitmap_scale.h
 create mode 100644 video/bitmap_scale.c

diff --git a/ChangeLog.scale b/ChangeLog.scale
new file mode 100644
index 000000000..eb12d3b21
--- /dev/null
+++ b/ChangeLog.scale
@@ -0,0 +1,16 @@
+2009-08-24  Colin D Bennett  <colin@gibibit.com>
+
+	Bitmap scaling support.
+
+	* conf/common.rmk (pkglib_MODULES): Add bitmap_scale.mod.
+	(bitmap_scale_mod_SOURCES): New variable.
+	(bitmap_scale_mod_CFLAGS): Likewise.
+	(bitmap_scale_mod_LDFLAGS): Likewise.
+	* include/grub/bitmap_scale.h: New file.
+	* term/gfxterm.c (BACKGROUND_CMD_ARGINDEX_MODE): New definiton.
+	(background_image_cmd_options): New variable.
+	(grub_gfxterm_background_image_cmd): Support bitmap stretching.
+	(cmd): Rename and change type to ...
+	(background_image_cmd_handle): ... this. All users updated.
+	(GRUB_MOD_INIT(term_gfxterm)): Make background_image extended command.
+	* video/bitmap_scale.c: New file.
diff --git a/conf/common.rmk b/conf/common.rmk
index 173f24b62..98681bc1c 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -567,6 +567,12 @@ bitmap_mod_SOURCES = video/bitmap.c
 bitmap_mod_CFLAGS = $(COMMON_CFLAGS)
 bitmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For bitmap_scale.mod
+pkglib_MODULES += bitmap_scale.mod
+bitmap_scale_mod_SOURCES = video/bitmap_scale.c
+bitmap_scale_mod_CFLAGS = $(COMMON_CFLAGS)
+bitmap_scale_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # For tga.mod
 tga_mod_SOURCES = video/readers/tga.c
 tga_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/include/grub/bitmap_scale.h b/include/grub/bitmap_scale.h
new file mode 100644
index 000000000..7ea9d7914
--- /dev/null
+++ b/include/grub/bitmap_scale.h
@@ -0,0 +1,48 @@
+/* bitmap_scale.h - Bitmap scaling functions. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/>.
+ */
+
+#ifndef GRUB_BITMAP_SCALE_HEADER
+#define GRUB_BITMAP_SCALE_HEADER 1
+
+#include <grub/err.h>
+#include <grub/types.h>
+#include <grub/bitmap_scale.h>
+
+enum grub_video_bitmap_scale_method
+{
+  /* Choose the fastest interpolation algorithm.  */
+  GRUB_VIDEO_BITMAP_SCALE_METHOD_FASTEST,
+  /* Choose the highest quality interpolation algorithm.  */
+  GRUB_VIDEO_BITMAP_SCALE_METHOD_BEST,
+
+  /* Specific algorithms:  */
+  /* Nearest neighbor interpolation.  */
+  GRUB_VIDEO_BITMAP_SCALE_METHOD_NEAREST,
+  /* Bilinear interpolation.  */
+  GRUB_VIDEO_BITMAP_SCALE_METHOD_BILINEAR
+};
+
+grub_err_t
+grub_video_bitmap_create_scaled (struct grub_video_bitmap **dst,
+                                 int dst_width, int dst_height,
+                                 struct grub_video_bitmap *src,
+                                 enum
+                                 grub_video_bitmap_scale_method scale_method);
+
+#endif /* ! GRUB_BITMAP_SCALE_HEADER */
diff --git a/include/grub/xnu.h b/include/grub/xnu.h
index c3902e670..b058bd1b9 100644
--- a/include/grub/xnu.h
+++ b/include/grub/xnu.h
@@ -104,4 +104,7 @@ extern grub_uint32_t grub_xnu_heap_real_start;
 extern grub_size_t grub_xnu_heap_size;
 extern char *grub_xnu_heap_start;
 extern struct grub_video_bitmap *grub_xnu_bitmap;
+typedef enum {GRUB_XNU_BITMAP_CENTER, GRUB_XNU_BITMAP_STRETCH}
+  grub_xnu_bitmap_mode_t;
+extern grub_xnu_bitmap_mode_t grub_xnu_bitmap_mode;
 #endif
diff --git a/loader/i386/pc/xnu.c b/loader/i386/pc/xnu.c
index 839d0ad44..1a222e6e5 100644
--- a/loader/i386/pc/xnu.c
+++ b/loader/i386/pc/xnu.c
@@ -22,6 +22,7 @@
 #include <grub/mm.h>
 #include <grub/cpu/xnu.h>
 #include <grub/video_fb.h>
+#include <grub/bitmap_scale.h>
 
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 #define max(a,b) (((a) > (b)) ? (a) : (b))
@@ -37,6 +38,7 @@ grub_xnu_set_video (struct grub_xnu_boot_params *params)
   char *tmp, *modevar;
   void *framebuffer;
   grub_err_t err;
+  struct grub_video_bitmap *bitmap = NULL;
 
   modevar = grub_env_get ("gfxpayload");
   /* Consider only graphical 32-bit deep modes.  */
@@ -63,31 +65,46 @@ grub_xnu_set_video (struct grub_xnu_boot_params *params)
   if (err)
     return err;
 
+  ret = grub_video_get_info (&mode_info);
+  if (ret)
+    return grub_error (GRUB_ERR_IO, "couldn't retrieve video parameters");
+
   if (grub_xnu_bitmap)
+    {
+      if (grub_xnu_bitmap_mode == GRUB_XNU_BITMAP_STRETCH)
+	err = grub_video_bitmap_create_scaled (&bitmap,
+					       mode_info.width,
+					       mode_info.height,
+					       grub_xnu_bitmap,
+					       GRUB_VIDEO_BITMAP_SCALE_METHOD_BEST);
+      else
+	bitmap = grub_xnu_bitmap;
+    }
+
+  if (bitmap)
     {
       int x, y;
 
-      x = mode_info.width - grub_xnu_bitmap->mode_info.width;
+      x = mode_info.width - bitmap->mode_info.width;
       x /= 2;
-      y = mode_info.height - grub_xnu_bitmap->mode_info.height;
+      y = mode_info.height - bitmap->mode_info.height;
       y /= 2;
-      err = grub_video_blit_bitmap (grub_xnu_bitmap,
+      err = grub_video_blit_bitmap (bitmap,
 				    GRUB_VIDEO_BLIT_REPLACE,
 				    x > 0 ? x : 0,
 				    y > 0 ? y : 0,
 				    x < 0 ? -x : 0,
 				    y < 0 ? -y : 0,
-				    min (grub_xnu_bitmap->mode_info.width,
+				    min (bitmap->mode_info.width,
 					 mode_info.width),
-				    min (grub_xnu_bitmap->mode_info.height,
+				    min (bitmap->mode_info.height,
 					 mode_info.height));
-      if (err)
-	{
-	  grub_print_error ();
-	  grub_errno = GRUB_ERR_NONE;
-	  grub_xnu_bitmap = 0;
-	}
-      err = GRUB_ERR_NONE;
+    }
+  if (err)
+    {
+      grub_print_error ();
+      grub_errno = GRUB_ERR_NONE;
+      bitmap = 0;
     }
 
   ret = grub_video_get_info_and_fini (&mode_info, &framebuffer);
@@ -100,8 +117,8 @@ grub_xnu_set_video (struct grub_xnu_boot_params *params)
   params->lfb_line_len = mode_info.pitch;
 
   params->lfb_base = PTR_TO_UINT32 (framebuffer);
-  params->lfb_mode = grub_xnu_bitmap
-    ? GRUB_XNU_VIDEO_SPLASH : GRUB_XNU_VIDEO_TEXT_IN_VIDEO;
+  params->lfb_mode = bitmap ? GRUB_XNU_VIDEO_SPLASH 
+    : GRUB_XNU_VIDEO_TEXT_IN_VIDEO;
 
   return GRUB_ERR_NONE;
 }
diff --git a/loader/xnu.c b/loader/xnu.c
index aac4ae372..e0ae9cefe 100644
--- a/loader/xnu.c
+++ b/loader/xnu.c
@@ -31,6 +31,7 @@
 #include <grub/gzio.h>
 #include <grub/command.h>
 #include <grub/misc.h>
+#include <grub/extcmd.h>
 
 struct grub_xnu_devtree_key *grub_xnu_devtree_root = 0;
 static int driverspackagenum = 0;
@@ -1272,18 +1273,37 @@ grub_cmd_xnu_kextdir (grub_command_t cmd __attribute__ ((unused)),
 }
 
 struct grub_video_bitmap *grub_xnu_bitmap = 0;
+grub_xnu_bitmap_mode_t grub_xnu_bitmap_mode;
+
+/* Option array indices.  */
+#define XNU_SPLASH_CMD_ARGINDEX_MODE 0
+
+static const struct grub_arg_option xnu_splash_cmd_options[] =
+  {
+    {"mode", 'm', 0, "Background image mode.", "stretch|normal",
+     ARG_TYPE_STRING},
+    {0, 0, 0, 0, 0, 0}
+  };
 
 static grub_err_t
-grub_cmd_xnu_splash (grub_command_t cmd __attribute__ ((unused)),
+grub_cmd_xnu_splash (grub_extcmd_t cmd,
 		     int argc, char *args[])
 {
   grub_err_t err;
   if (argc != 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
 
+  if (cmd->state[XNU_SPLASH_CMD_ARGINDEX_MODE].set &&
+      grub_strcmp (cmd->state[XNU_SPLASH_CMD_ARGINDEX_MODE].arg,
+		   "stretch") == 0)
+    grub_xnu_bitmap_mode = GRUB_XNU_BITMAP_STRETCH;
+  else
+    grub_xnu_bitmap_mode = GRUB_XNU_BITMAP_CENTER;
+
   err = grub_video_bitmap_load (&grub_xnu_bitmap, args[0]);
   if (err)
     grub_xnu_bitmap = 0;
+
   return err;
 }
 
@@ -1316,8 +1336,10 @@ grub_xnu_unlock ()
   locked = 0;
 }
 
-static grub_command_t cmd_kernel, cmd_mkext, cmd_kext, cmd_kextdir,
-  cmd_ramdisk, cmd_devtree, cmd_resume, cmd_splash;
+static grub_command_t cmd_kernel, cmd_mkext, cmd_kext, ;
+static grub_command_t cmd_devtree;
+static grub_command_t cmd_kextdir, cmd_ramdisk, cmd_resume;
+static grub_extcmd_t cmd_splash;
 
 GRUB_MOD_INIT(xnu)
 {
@@ -1335,8 +1357,11 @@ GRUB_MOD_INIT(xnu)
 				       "It will be seen as md0");
   cmd_devtree = grub_register_command ("xnu_devtree", grub_cmd_xnu_devtree, 0,
 				       "Load XNU devtree");
-  cmd_splash = grub_register_command ("xnu_splash", grub_cmd_xnu_splash, 0,
-				      "Load a splash image for XNU");
+  cmd_splash = grub_register_extcmd ("xnu_splash",
+				     grub_cmd_xnu_splash,
+				     GRUB_COMMAND_FLAG_BOTH, 0,
+				     "Load a splash image for XNU",
+				     xnu_splash_cmd_options);
 
 #ifndef GRUB_UTIL
   cmd_resume = grub_register_command ("xnu_resume", grub_cmd_xnu_resume,
@@ -1356,5 +1381,5 @@ GRUB_MOD_FINI(xnu)
   grub_unregister_command (cmd_devtree);
   grub_unregister_command (cmd_ramdisk);
   grub_unregister_command (cmd_kernel);
-  grub_unregister_command (cmd_splash);
+  grub_unregister_extcmd (cmd_splash);
 }
diff --git a/term/gfxterm.c b/term/gfxterm.c
index 6906b77a1..62cf98416 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -26,6 +26,8 @@
 #include <grub/video.h>
 #include <grub/bitmap.h>
 #include <grub/command.h>
+#include <grub/extcmd.h>
+#include <grub/bitmap_scale.h>
 
 #define DEFAULT_VIDEO_MODE "auto"
 #define DEFAULT_BORDER_WIDTH	10
@@ -909,11 +911,23 @@ grub_gfxterm_refresh (void)
   dirty_region_reset ();
 }
 
+/* Option array indices.  */
+#define BACKGROUND_CMD_ARGINDEX_MODE 0
+
+static const struct grub_arg_option background_image_cmd_options[] =
+  {
+    {"mode", 'm', 0, "Background image mode.", "stretch|normal",
+     ARG_TYPE_STRING},
+    {0, 0, 0, 0, 0, 0}
+  };
+
 static grub_err_t
-grub_gfxterm_background_image_cmd (grub_command_t cmd __attribute__ ((unused)),
+grub_gfxterm_background_image_cmd (grub_extcmd_t cmd __attribute__ ((unused)),
                                    int argc,
                                    char **args)
 {
+  struct grub_arg_list *state = cmd->state;
+
   /* Check that we have video adapter active.  */
   if (grub_video_get_info(NULL) != GRUB_ERR_NONE)
     return grub_errno;
@@ -937,6 +951,29 @@ grub_gfxterm_background_image_cmd (grub_command_t cmd __attribute__ ((unused)),
     if (grub_errno != GRUB_ERR_NONE)
       return grub_errno;
 
+    /* Determine if the bitmap should be scaled to fit the screen.  */
+    if (!state[BACKGROUND_CMD_ARGINDEX_MODE].set
+        || grub_strcmp (state[BACKGROUND_CMD_ARGINDEX_MODE].arg,
+                        "stretch") == 0)
+        {
+          if (mode_info.width != grub_video_bitmap_get_width (bitmap)
+              || mode_info.height != grub_video_bitmap_get_height (bitmap))
+            {
+              struct grub_video_bitmap *scaled_bitmap;
+              grub_video_bitmap_create_scaled (&scaled_bitmap,
+                                               mode_info.width,
+                                               mode_info.height,
+                                               bitmap,
+                                               GRUB_VIDEO_BITMAP_SCALE_METHOD_BEST);
+              if (grub_errno == GRUB_ERR_NONE)
+                {
+                  /* Replace the original bitmap with the scaled one.  */
+                  grub_video_bitmap_destroy (bitmap);
+                  bitmap = scaled_bitmap;
+                }
+            }
+        }
+
     /* If bitmap was loaded correctly, display it.  */
     if (bitmap)
       {
@@ -975,18 +1012,22 @@ static struct grub_term_output grub_video_term =
     .next = 0
   };
 
-static grub_command_t cmd;
+static grub_extcmd_t background_image_cmd_handle;
 
 GRUB_MOD_INIT(term_gfxterm)
 {
   grub_term_register_output ("gfxterm", &grub_video_term);
-  cmd = grub_register_command ("background_image",
-			       grub_gfxterm_background_image_cmd,
-			       0, "Load background image for active terminal");
+  background_image_cmd_handle =
+    grub_register_extcmd ("background_image",
+                          grub_gfxterm_background_image_cmd,
+                          GRUB_COMMAND_FLAG_BOTH,
+                          "background_image [-m (stretch|normal)] FILE",
+                          "Load background image for active terminal.",
+                          background_image_cmd_options);
 }
 
 GRUB_MOD_FINI(term_gfxterm)
 {
-  grub_unregister_command (cmd);
+  grub_unregister_extcmd (background_image_cmd_handle);
   grub_term_unregister_output (&grub_video_term);
 }
diff --git a/video/bitmap_scale.c b/video/bitmap_scale.c
new file mode 100644
index 000000000..6f8ff247e
--- /dev/null
+++ b/video/bitmap_scale.c
@@ -0,0 +1,308 @@
+/* bitmap_scale.c - Bitmap scaling. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2006,2007,2008,2009  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/mm.h>
+#include <grub/misc.h>
+#include <grub/video.h>
+#include <grub/bitmap.h>
+#include <grub/bitmap_scale.h>
+#include <grub/types.h>
+
+/* Prototypes for module-local functions.  */
+static grub_err_t scale_nn (struct grub_video_bitmap *dst,
+                            struct grub_video_bitmap *src);
+static grub_err_t scale_bilinear (struct grub_video_bitmap *dst,
+                                  struct grub_video_bitmap *src);
+
+/* This function creates a new scaled version of the bitmap SRC.  The new
+   bitmap has dimensions DST_WIDTH by DST_HEIGHT.  The scaling algorithm
+   is given by SCALE_METHOD.  If an error is encountered, the return code is
+   not equal to GRUB_ERR_NONE, and the bitmap DST is either not created, or
+   it is destroyed before this function returns.
+
+   Supports only direct color modes which have components separated
+   into bytes (e.g., RGBA 8:8:8:8 or BGR 8:8:8 true color).
+   But because of this simplifying assumption, the implementation is
+   greatly simplified.  */
+grub_err_t
+grub_video_bitmap_create_scaled (struct grub_video_bitmap **dst,
+                                 int dst_width, int dst_height,
+                                 struct grub_video_bitmap *src,
+                                 enum grub_video_bitmap_scale_method
+                                 scale_method)
+{
+  *dst = 0;
+
+  /* Verify the simplifying assumptions. */
+  if (src == 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                       "null src bitmap in grub_video_bitmap_create_scaled");
+  if (src->mode_info.red_field_pos % 8 != 0
+      || src->mode_info.green_field_pos % 8 != 0
+      || src->mode_info.blue_field_pos % 8 != 0
+      || src->mode_info.reserved_field_pos % 8 != 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                       "src format not supported for scale");
+  if (src->mode_info.width == 0 || src->mode_info.height == 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                       "source bitmap has a zero dimension");
+  if (dst_width <= 0 || dst_height <= 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                       "requested to scale to a size w/ a zero dimension");
+  if (src->mode_info.bytes_per_pixel * 8 != src->mode_info.bpp)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                       "bitmap to scale has inconsistent Bpp and bpp");
+
+  /* Create the new bitmap. */
+  grub_err_t ret;
+  ret = grub_video_bitmap_create (dst, dst_width, dst_height,
+                                  src->mode_info.blit_format);
+  if (ret != GRUB_ERR_NONE)
+    return ret;                 /* Error. */
+
+  switch (scale_method)
+    {
+    case GRUB_VIDEO_BITMAP_SCALE_METHOD_FASTEST:
+    case GRUB_VIDEO_BITMAP_SCALE_METHOD_NEAREST:
+      ret = scale_nn (*dst, src);
+      break;
+    case GRUB_VIDEO_BITMAP_SCALE_METHOD_BEST:
+    case GRUB_VIDEO_BITMAP_SCALE_METHOD_BILINEAR:
+      ret = scale_bilinear (*dst, src);
+      break;
+    default:
+      ret = grub_error (GRUB_ERR_BAD_ARGUMENT, "Invalid scale_method value");
+      break;
+    }
+
+  if (ret == GRUB_ERR_NONE)
+    {
+      /* Success:  *dst is now a pointer to the scaled bitmap. */
+      return GRUB_ERR_NONE;
+    }
+  else
+    {
+      /* Destroy the bitmap and return the error code. */
+      grub_video_bitmap_destroy (*dst);
+      *dst = 0;
+      return ret;
+    }
+}
+
+/* Nearest neighbor bitmap scaling algorithm.
+
+   Copy the bitmap SRC to the bitmap DST, scaling the bitmap to fit the
+   dimensions of DST.  This function uses the nearest neighbor algorithm to
+   interpolate the pixels.
+
+   Supports only direct color modes which have components separated
+   into bytes (e.g., RGBA 8:8:8:8 or BGR 8:8:8 true color).
+   But because of this simplifying assumption, the implementation is
+   greatly simplified.  */
+static grub_err_t
+scale_nn (struct grub_video_bitmap *dst, struct grub_video_bitmap *src)
+{
+  /* Verify the simplifying assumptions. */
+  if (dst == 0 || src == 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "null bitmap in scale_nn");
+  if (dst->mode_info.red_field_pos % 8 != 0
+      || dst->mode_info.green_field_pos % 8 != 0
+      || dst->mode_info.blue_field_pos % 8 != 0
+      || dst->mode_info.reserved_field_pos % 8 != 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "dst format not supported");
+  if (src->mode_info.red_field_pos % 8 != 0
+      || src->mode_info.green_field_pos % 8 != 0
+      || src->mode_info.blue_field_pos % 8 != 0
+      || src->mode_info.reserved_field_pos % 8 != 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "src format not supported");
+  if (dst->mode_info.red_field_pos != src->mode_info.red_field_pos
+      || dst->mode_info.red_mask_size != src->mode_info.red_mask_size
+      || dst->mode_info.green_field_pos != src->mode_info.green_field_pos
+      || dst->mode_info.green_mask_size != src->mode_info.green_mask_size
+      || dst->mode_info.blue_field_pos != src->mode_info.blue_field_pos
+      || dst->mode_info.blue_mask_size != src->mode_info.blue_mask_size
+      || dst->mode_info.reserved_field_pos !=
+      src->mode_info.reserved_field_pos
+      || dst->mode_info.reserved_mask_size !=
+      src->mode_info.reserved_mask_size)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "dst and src not compatible");
+  if (dst->mode_info.bytes_per_pixel != src->mode_info.bytes_per_pixel)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "dst and src not compatible");
+  if (dst->mode_info.width == 0 || dst->mode_info.height == 0
+      || src->mode_info.width == 0 || src->mode_info.height == 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "bitmap has a zero dimension");
+
+  grub_uint8_t *ddata = dst->data;
+  grub_uint8_t *sdata = src->data;
+  int dw = dst->mode_info.width;
+  int dh = dst->mode_info.height;
+  int sw = src->mode_info.width;
+  int sh = src->mode_info.height;
+  int dstride = dst->mode_info.pitch;
+  int sstride = src->mode_info.pitch;
+  /* bytes_per_pixel is the same for both src and dst. */
+  int bytes_per_pixel = dst->mode_info.bytes_per_pixel;
+
+  int dy;
+  for (dy = 0; dy < dh; dy++)
+    {
+      int dx;
+      for (dx = 0; dx < dw; dx++)
+        {
+          grub_uint8_t *dptr;
+          grub_uint8_t *sptr;
+          int sx;
+          int sy;
+          int comp;
+
+          /* Compute the source coordinate that the destination coordinate
+             maps to.  Note: sx/sw = dx/dw  =>  sx = sw*dx/dw. */
+          sx = sw * dx / dw;
+          sy = sh * dy / dh;
+
+          /* Get the address of the pixels in src and dst. */
+          dptr = ddata + dy * dstride + dx * bytes_per_pixel;
+          sptr = sdata + sy * sstride + sx * bytes_per_pixel;
+
+          /* Copy the pixel color value. */
+          for (comp = 0; comp < bytes_per_pixel; comp++)
+            dptr[comp] = sptr[comp];
+        }
+    }
+  return GRUB_ERR_NONE;
+}
+
+/* Bilinear interpolation image scaling algorithm.
+
+   Copy the bitmap SRC to the bitmap DST, scaling the bitmap to fit the
+   dimensions of DST.  This function uses the bilinear interpolation algorithm
+   to interpolate the pixels.
+
+   Supports only direct color modes which have components separated
+   into bytes (e.g., RGBA 8:8:8:8 or BGR 8:8:8 true color).
+   But because of this simplifying assumption, the implementation is
+   greatly simplified.  */
+static grub_err_t
+scale_bilinear (struct grub_video_bitmap *dst, struct grub_video_bitmap *src)
+{
+  /* Verify the simplifying assumptions. */
+  if (dst == 0 || src == 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "null bitmap in scale func");
+  if (dst->mode_info.red_field_pos % 8 != 0
+      || dst->mode_info.green_field_pos % 8 != 0
+      || dst->mode_info.blue_field_pos % 8 != 0
+      || dst->mode_info.reserved_field_pos % 8 != 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "dst format not supported");
+  if (src->mode_info.red_field_pos % 8 != 0
+      || src->mode_info.green_field_pos % 8 != 0
+      || src->mode_info.blue_field_pos % 8 != 0
+      || src->mode_info.reserved_field_pos % 8 != 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "src format not supported");
+  if (dst->mode_info.red_field_pos != src->mode_info.red_field_pos
+      || dst->mode_info.red_mask_size != src->mode_info.red_mask_size
+      || dst->mode_info.green_field_pos != src->mode_info.green_field_pos
+      || dst->mode_info.green_mask_size != src->mode_info.green_mask_size
+      || dst->mode_info.blue_field_pos != src->mode_info.blue_field_pos
+      || dst->mode_info.blue_mask_size != src->mode_info.blue_mask_size
+      || dst->mode_info.reserved_field_pos !=
+      src->mode_info.reserved_field_pos
+      || dst->mode_info.reserved_mask_size !=
+      src->mode_info.reserved_mask_size)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "dst and src not compatible");
+  if (dst->mode_info.bytes_per_pixel != src->mode_info.bytes_per_pixel)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "dst and src not compatible");
+  if (dst->mode_info.width == 0 || dst->mode_info.height == 0
+      || src->mode_info.width == 0 || src->mode_info.height == 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "bitmap has a zero dimension");
+
+  grub_uint8_t *ddata = dst->data;
+  grub_uint8_t *sdata = src->data;
+  int dw = dst->mode_info.width;
+  int dh = dst->mode_info.height;
+  int sw = src->mode_info.width;
+  int sh = src->mode_info.height;
+  int dstride = dst->mode_info.pitch;
+  int sstride = src->mode_info.pitch;
+  /* bytes_per_pixel is the same for both src and dst. */
+  int bytes_per_pixel = dst->mode_info.bytes_per_pixel;
+
+  int dy;
+  for (dy = 0; dy < dh; dy++)
+    {
+      int dx;
+      for (dx = 0; dx < dw; dx++)
+        {
+          grub_uint8_t *dptr;
+          grub_uint8_t *sptr;
+          int sx;
+          int sy;
+          int comp;
+
+          /* Compute the source coordinate that the destination coordinate
+             maps to.  Note: sx/sw = dx/dw  =>  sx = sw*dx/dw. */
+          sx = sw * dx / dw;
+          sy = sh * dy / dh;
+
+          /* Get the address of the pixels in src and dst. */
+          dptr = ddata + dy * dstride + dx * bytes_per_pixel;
+          sptr = sdata + sy * sstride + sx * bytes_per_pixel;
+
+          /* If we have enough space to do so, use bilinear interpolation.
+             Otherwise, fall back to nearest neighbor for this pixel. */
+          if (sx < sw - 1 && sy < sh - 1)
+            {
+              /* Do bilinear interpolation. */
+
+              /* Fixed-point .8 numbers representing the fraction of the
+                 distance in the x (u) and y (v) direction within the
+                 box of 4 pixels in the source. */
+              int u = (256 * sw * dx / dw) - (sx * 256);
+              int v = (256 * sh * dy / dh) - (sy * 256);
+
+              for (comp = 0; comp < bytes_per_pixel; comp++)
+                {
+                  /* Get the component's values for the
+                     four source corner pixels. */
+                  grub_uint8_t f00 = sptr[comp];
+                  grub_uint8_t f10 = sptr[comp + bytes_per_pixel];
+                  grub_uint8_t f01 = sptr[comp + sstride];
+                  grub_uint8_t f11 = sptr[comp + sstride + bytes_per_pixel];
+
+                  /* Do linear interpolations along the top and bottom
+                     rows of the box. */
+                  grub_uint8_t f0y = (256 - v) * f00 / 256 + v * f01 / 256;
+                  grub_uint8_t f1y = (256 - v) * f10 / 256 + v * f11 / 256;
+
+                  /* Interpolate vertically. */
+                  grub_uint8_t fxy = (256 - u) * f0y / 256 + u * f1y / 256;
+
+                  dptr[comp] = fxy;
+                }
+            }
+          else
+            {
+              /* Fall back to nearest neighbor interpolation. */
+              /* Copy the pixel color value. */
+              for (comp = 0; comp < bytes_per_pixel; comp++)
+                dptr[comp] = sptr[comp];
+            }
+        }
+    }
+  return GRUB_ERR_NONE;
+}

From 6e3ac954910d28d291b94c0fafb78337ba680bd1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Nov 2009 13:23:43 +0100
Subject: [PATCH 0089/1628] Fixed warning

---
 video/video.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/video/video.c b/video/video.c
index eff257122..2e17ee7dc 100644
--- a/video/video.c
+++ b/video/video.c
@@ -624,7 +624,6 @@ grub_video_set_mode (const char *modestring,
       /* Loop thru all possible video adapter trying to find requested mode.  */
       for (p = grub_video_adapter_list; p; p = p->next)
 	{
-	  grub_err_t err;
 	  struct grub_video_mode_info mode_info;
 
 	  grub_memset (&mode_info, 0, sizeof (mode_info));

From d3d0094e17c628523fa51e7a4dcaa3fb0b596298 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Nov 2009 13:29:17 +0100
Subject: [PATCH 0090/1628] ChangeLog

---
 ChangeLog.videomask | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 ChangeLog.videomask

diff --git a/ChangeLog.videomask b/ChangeLog.videomask
new file mode 100644
index 000000000..7c58d0b57
--- /dev/null
+++ b/ChangeLog.videomask
@@ -0,0 +1,10 @@
+2009-11-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Use flag-based instead of hook-based video mode selection and "auto"
+	keyword.
+
+	* include/grub/video.h (grub_video_adapter): Changed 'setup' member.
+	(grub_video_set_mode): Changed prototype. All users updated.
+	(grub_video_check_mode_flag): New inline function.
+	* video/video.c (parse_modespec): New function.
+	(grub_video_set_mode): Parse flags and keywords.

From 1488fac7ef235d579972822b1cbc6e2e2932fc8b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Nov 2009 13:53:36 +0100
Subject: [PATCH 0091/1628] Fixed missing make directives

---
 conf/i386-pc.rmk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 382c45ca3..4c2aec617 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -155,7 +155,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 	\
 	video/video.c video/fb/video_fb.c video/fb/fbblit.c             \
         video/fb/fbfill.c video/fb/fbutil.c commands/videotest.c        \
-	video/bitmap.c video/readers/tga.c video/readers/jpeg.c         \
+	video/bitmap.c video/bitmap_scale.c video/readers/tga.c video/readers/jpeg.c         \
 	video/readers/png.c font/font_cmd.c font/font.c term/gfxterm.c  \
 	io/bufio.c							\
 	\
@@ -175,6 +175,11 @@ grub_emu_SOURCES += disk/usbms.c util/usb.c bus/usb/usb.c	\
 grub_emu_LDFLAGS += $(LIBCURSES) $(LIBUSB)
 endif
 
+ifeq ($(enable_grub_emu_sdl), yes)
+grub_emu_SOURCES += util/sdl.c
+grub_emu_LDFLAGS += $(LIBSDL)
+endif
+
 sbin_SCRIPTS += grub-install
 grub_install_SOURCES = util/grub-install.in
 

From 71bc82683468a4c3bfd63aedbf0155bd5957eea2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Nov 2009 13:55:43 +0100
Subject: [PATCH 0092/1628] Fixed syntax error

---
 loader/xnu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/loader/xnu.c b/loader/xnu.c
index e0ae9cefe..ab88317d2 100644
--- a/loader/xnu.c
+++ b/loader/xnu.c
@@ -1336,7 +1336,7 @@ grub_xnu_unlock ()
   locked = 0;
 }
 
-static grub_command_t cmd_kernel, cmd_mkext, cmd_kext, ;
+static grub_command_t cmd_kernel, cmd_mkext, cmd_kext;
 static grub_command_t cmd_devtree;
 static grub_command_t cmd_kextdir, cmd_ramdisk, cmd_resume;
 static grub_extcmd_t cmd_splash;

From a8287184e360c8f198fc3174f99e8032df44881a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Nov 2009 14:19:20 +0100
Subject: [PATCH 0093/1628] renamed ChangeLog

---
 ChangeLog.video => ChangeLog.doublebuf | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename ChangeLog.video => ChangeLog.doublebuf (100%)

diff --git a/ChangeLog.video b/ChangeLog.doublebuf
similarity index 100%
rename from ChangeLog.video
rename to ChangeLog.doublebuf

From b49991d823c428b4daf69c877d15fcc31e99c950 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Nov 2009 14:27:52 +0100
Subject: [PATCH 0094/1628] ChangeLog

---
 ChangeLog.sdl | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 ChangeLog.sdl

diff --git a/ChangeLog.sdl b/ChangeLog.sdl
new file mode 100644
index 000000000..8bf8c082a
--- /dev/null
+++ b/ChangeLog.sdl
@@ -0,0 +1,11 @@
+2009-11-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	SDL support.
+
+	* Makefile.in (LIBSDL): New variable.
+	(enable_grub_emu_sdl): Likewise.
+	* conf/i386-pc.rmk (grub_emu_SOURCES): Add video files.
+	(grub_emu_SOURCES) [enable_grub_emu_sdl]: Add util/sdl.c.
+	(grub_emu_LDFLAGS) [enable_grub_emu_sdl]: Add $(LIBSDL).
+	* configure.ac: Detect SDL availability and add --enable-grub-emu-sdl
+	* util/sdl.c: New file.

From b4dae692eb6afc9aed7bd7d6ee47824086def7e4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Nov 2009 14:30:58 +0100
Subject: [PATCH 0095/1628] Fixed variable declarations

---
 term/gfxterm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/term/gfxterm.c b/term/gfxterm.c
index 3fc151c8b..5330c4ac4 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -323,6 +323,7 @@ grub_gfxterm_init (void)
   struct grub_video_mode_info mode_info;
   char *tmp;
   grub_err_t err;
+  grub_video_color_t color;
 
   /* If gfxterm has already been initialized by calling the init_window
      function, then leave it alone when it is set as the current terminal.  */
@@ -702,7 +703,6 @@ scroll_up (void)
   else
     {
       grub_video_rect_t saved_view;
-      int i;
 
       grub_video_set_active_render_target (render_target);
       /* Save viewport and set it to our window.  */

From ac3b7128d6d7e89fd103d6ad4054ce3db56195d6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Nov 2009 14:45:33 +0100
Subject: [PATCH 0096/1628] 2009-11-20  Colin D Bennett  <colin@gibibit.com>

	* normal/menu_text.c (get_entry_number): Move from here ...
	* normal/menu.c (get_entry_number): ... moved here.
	* include/grub/menu.h (grub_menu_get_default_entry_index):
	New prototype.
	* normal/menu.c (grub_menu_get_default_entry_index): New function.
	* normal/menu_text.c (run_menu): Use grub_menu_get_default_entry_index.
---
 ChangeLog.menu      |  9 ++++++++
 include/grub/menu.h |  1 +
 normal/menu.c       | 54 +++++++++++++++++++++++++++++++++++++++++++++
 normal/menu_text.c  | 50 +----------------------------------------
 4 files changed, 65 insertions(+), 49 deletions(-)
 create mode 100644 ChangeLog.menu

diff --git a/ChangeLog.menu b/ChangeLog.menu
new file mode 100644
index 000000000..cb048bc9f
--- /dev/null
+++ b/ChangeLog.menu
@@ -0,0 +1,9 @@
+2009-11-20  Colin D Bennett  <colin@gibibit.com>
+
+	* normal/menu_text.c (get_entry_number): Move from here ...
+	* normal/menu.c (get_entry_number): ... moved here.
+	* include/grub/menu.h (grub_menu_get_default_entry_index):
+	New prototype.
+	* normal/menu.c (grub_menu_get_default_entry_index): New function.
+	* normal/menu_text.c (run_menu): Use grub_menu_get_default_entry_index.
+
diff --git a/include/grub/menu.h b/include/grub/menu.h
index c7114a93b..cfe7e7cec 100644
--- a/include/grub/menu.h
+++ b/include/grub/menu.h
@@ -93,5 +93,6 @@ void grub_menu_execute_with_fallback (grub_menu_t menu,
 				      grub_menu_execute_callback_t callback,
 				      void *callback_data);
 void grub_menu_entry_run (grub_menu_entry_t entry);
+int grub_menu_get_default_entry_index (grub_menu_t menu);
 
 #endif /* GRUB_MENU_HEADER */
diff --git a/normal/menu.c b/normal/menu.c
index b9f74b7d7..282dddae5 100644
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -180,3 +180,57 @@ grub_menu_execute_with_fallback (grub_menu_t menu,
 
   callback->notify_failure (callback_data);
 }
+
+/* Get the entry number from the variable NAME.  */
+static int
+get_entry_number (grub_menu_t menu, const char *name)
+{
+  char *val;
+  int entry;
+
+  val = grub_env_get (name);
+  if (! val)
+    return -1;
+
+  grub_error_push ();
+
+  entry = (int) grub_strtoul (val, 0, 0);
+
+  if (grub_errno == GRUB_ERR_BAD_NUMBER)
+    {
+      /* See if the variable matches the title of a menu entry.  */
+      grub_menu_entry_t e = menu->entry_list;
+      int i;
+
+      grub_errno = GRUB_ERR_NONE;
+
+      for (i = 0; e; i++)
+	{
+	  if (grub_strcmp (e->title, val) == 0)
+	    {
+	      entry = i;
+	      break;
+	    }
+	  e = e->next;
+	}
+
+      if (! e)
+	entry = -1;
+    }
+
+  if (grub_errno != GRUB_ERR_NONE)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      entry = -1;
+    }
+
+  grub_error_pop ();
+
+  return entry;
+}
+
+int
+grub_menu_get_default_entry_index (grub_menu_t menu)
+{
+  return get_entry_number (menu, "default");
+}
diff --git a/normal/menu_text.c b/normal/menu_text.c
index 19f9cf756..d02230a8f 100644
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -235,54 +235,6 @@ grub_menu_init_page (int nested, int edit)
   print_message (nested, edit);
 }
 
-/* Get the entry number from the variable NAME.  */
-static int
-get_entry_number (grub_menu_t menu, const char *name)
-{
-  char *val;
-  int entry;
-
-  val = grub_env_get (name);
-  if (! val)
-    return -1;
-
-  grub_error_push ();
-
-  entry = (int) grub_strtoul (val, 0, 0);
-
-  if (grub_errno == GRUB_ERR_BAD_NUMBER)
-    {
-      /* See if the variable matches the title of a menu entry.  */
-      grub_menu_entry_t e = menu->entry_list;
-      int i;
-
-      grub_errno = GRUB_ERR_NONE;
-
-      for (i = 0; e; i++)
-	{
-	  if (grub_strcmp (e->title, val) == 0)
-	    {
-	      entry = i;
-	      break;
-	    }
-	  e = e->next;
-	}
-
-      if (! e)
-	entry = -1;
-    }
-
-  if (grub_errno != GRUB_ERR_NONE)
-    {
-      grub_errno = GRUB_ERR_NONE;
-      entry = -1;
-    }
-
-  grub_error_pop ();
-
-  return entry;
-}
-
 static void
 print_timeout (int timeout, int offset, int second_stage)
 {
@@ -313,7 +265,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
 
   first = 0;
 
-  default_entry = get_entry_number (menu, "default");
+  default_entry = grub_menu_get_default_entry_index (menu);
 
   /* If DEFAULT_ENTRY is not within the menu entries, fall back to
      the first entry.  */

From cbf97a87d9d63c46e8057f163238cec42fa4ec43 Mon Sep 17 00:00:00 2001
From: Colin D Bennett <colin@gibibit.com>
Date: Fri, 20 Nov 2009 14:51:01 +0100
Subject: [PATCH 0097/1628] 	* include/grub/menu_viewer.h
 (grub_menu_viewer_init): New prototype. 
 (grub_menu_viewer_should_return): Likewise. 	* normal/main.c (GRUB_MOD_INIT
 (normal)): Call grub_menu_viewer_init. 	* normal/menu_text.c
 (run_menu): Enable menu switching. 	* normal/menu_viewer.c
 (should_return): New variable. 	(menu_viewer_changed): Likewise. 
 (grub_menu_viewer_show_menu): Handle menu viewer changes. 
 (grub_menu_viewer_should_return): New function. 
 (menuviewer_write_hook): Likewise. 	(grub_menu_viewer_init): Likewise.

---
 ChangeLog.menu             | 10 ++++++++++
 include/grub/menu_viewer.h |  5 +++++
 normal/main.c              |  2 ++
 normal/menu_text.c         |  9 +++++++--
 normal/menu_viewer.c       | 37 ++++++++++++++++++++++++++++++++++---
 5 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.menu b/ChangeLog.menu
index cb048bc9f..32c0a85d5 100644
--- a/ChangeLog.menu
+++ b/ChangeLog.menu
@@ -6,4 +6,14 @@
 	New prototype.
 	* normal/menu.c (grub_menu_get_default_entry_index): New function.
 	* normal/menu_text.c (run_menu): Use grub_menu_get_default_entry_index.
+	* include/grub/menu_viewer.h (grub_menu_viewer_init): New prototype.
+	(grub_menu_viewer_should_return): Likewise.
+	* normal/main.c (GRUB_MOD_INIT (normal)): Call grub_menu_viewer_init.
+	* normal/menu_text.c (run_menu): Enable menu switching.
+	* normal/menu_viewer.c (should_return): New variable.
+	(menu_viewer_changed): Likewise.
+	(grub_menu_viewer_show_menu): Handle menu viewer changes.
+	(grub_menu_viewer_should_return): New function.
+	(menuviewer_write_hook): Likewise.
+	(grub_menu_viewer_init): Likewise.
 
diff --git a/include/grub/menu_viewer.h b/include/grub/menu_viewer.h
index 725c97548..211f6e3e9 100644
--- a/include/grub/menu_viewer.h
+++ b/include/grub/menu_viewer.h
@@ -36,8 +36,13 @@ struct grub_menu_viewer
 };
 typedef struct grub_menu_viewer *grub_menu_viewer_t;
 
+void grub_menu_viewer_init (void);
+
 void grub_menu_viewer_register (grub_menu_viewer_t viewer);
 
 grub_err_t grub_menu_viewer_show_menu (grub_menu_t menu, int nested);
 
+/* Return nonzero iff the menu viewer should clean up and return ASAP.  */
+int grub_menu_viewer_should_return (void);
+
 #endif /* GRUB_MENU_VIEWER_HEADER */
diff --git a/normal/main.c b/normal/main.c
index 748eef805..736c20e47 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -584,6 +584,8 @@ GRUB_MOD_INIT(normal)
   /* Preserve hooks after context changes.  */
   grub_env_export ("color_normal");
   grub_env_export ("color_highlight");
+
+  grub_menu_viewer_init ();
 }
 
 GRUB_MOD_FINI(normal)
diff --git a/normal/menu_text.c b/normal/menu_text.c
index d02230a8f..68c7afeee 100644
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -300,7 +300,7 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
   if (timeout > 0)
     print_timeout (timeout, offset, 0);
 
-  while (1)
+  while (! grub_menu_viewer_should_return ())
     {
       int c;
       timeout = grub_menu_get_timeout ();
@@ -473,6 +473,10 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
 		}
 	      goto refresh;
 
+	    case 't':
+	      grub_env_set ("menuviewer", "gfxmenu");
+	      goto refresh;
+
 	    default:
 	      break;
 	    }
@@ -481,7 +485,8 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
 	}
     }
 
-  /* Never reach here.  */
+  /* Exit menu without activating an item.  This occurs if the user presses
+   * 't', switching to the graphical menu viewer.  */
   return -1;
 }
 
diff --git a/normal/menu_viewer.c b/normal/menu_viewer.c
index 1bd271a21..7a547a764 100644
--- a/normal/menu_viewer.c
+++ b/normal/menu_viewer.c
@@ -26,6 +26,9 @@
 /* The list of menu viewers.  */
 static grub_menu_viewer_t menu_viewer_list;
 
+static int should_return;
+static int menu_viewer_changed;
+
 void
 grub_menu_viewer_register (grub_menu_viewer_t viewer)
 {
@@ -55,16 +58,23 @@ static grub_menu_viewer_t get_current_menu_viewer (void)
 grub_err_t
 grub_menu_viewer_show_menu (grub_menu_t menu, int nested)
 {
-  grub_menu_viewer_t cur = get_current_menu_viewer ();
   grub_err_t err1, err2;
-  if (!cur)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "No menu viewer available.");
 
   while (1)
     {
+      grub_menu_viewer_t cur = get_current_menu_viewer ();
+      if (!cur)
+	return grub_error (GRUB_ERR_BAD_ARGUMENT, "No menu viewer available.");
+
+      menu_viewer_changed = 0;
+      should_return = 0;
+
       err1 = cur->show_menu (menu, nested);
       grub_print_error ();
 
+      if (menu_viewer_changed)
+	continue;
+
       err2 = grub_auth_check_authentication (NULL);
       if (err2)
 	{
@@ -79,3 +89,24 @@ grub_menu_viewer_show_menu (grub_menu_t menu, int nested)
   return err1;
 }
 
+int
+grub_menu_viewer_should_return (void)
+{
+  return should_return;
+}
+
+static char *
+menuviewer_write_hook (struct grub_env_var *var __attribute__ ((unused)),
+                       const char *val)
+{
+  menu_viewer_changed = 1;
+  should_return = 1;
+  return grub_strdup (val);
+}
+
+void
+grub_menu_viewer_init (void)
+{
+  grub_register_variable_hook ("menuviewer", 0, menuviewer_write_hook);
+}
+

From bd86691a07c81cab2ba6f364cdfdedb34914ef37 Mon Sep 17 00:00:00 2001
From: Colin D Bennett <colin@gibibit.com>
Date: Fri, 20 Nov 2009 15:09:48 +0100
Subject: [PATCH 0098/1628] 2009-11-20  Colin D Bennett  <colin@gibibit.com>

	* include/grub/misc.h (grub_iscntrl): New inline function.
	(grub_isalnum): Likewise.
	(grub_strtol): Likewise.
---
 ChangeLog.gfxmenumisc |  6 ++++++
 include/grub/misc.h   | 49 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 ChangeLog.gfxmenumisc

diff --git a/ChangeLog.gfxmenumisc b/ChangeLog.gfxmenumisc
new file mode 100644
index 000000000..ace9862ba
--- /dev/null
+++ b/ChangeLog.gfxmenumisc
@@ -0,0 +1,6 @@
+2009-11-20  Colin D Bennett  <colin@gibibit.com>
+
+	* include/grub/misc.h (grub_iscntrl): New inline function.
+	(grub_isalnum): Likewise.
+	(grub_strtol): Likewise.
+
diff --git a/include/grub/misc.h b/include/grub/misc.h
index faa2d5c42..b843b9202 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -94,6 +94,12 @@ char *EXPORT_FUNC(grub_strstr) (const char *haystack, const char *needle);
 int EXPORT_FUNC(grub_isspace) (int c);
 int EXPORT_FUNC(grub_isprint) (int c);
 
+static inline int
+grub_iscntrl (int c)
+{
+  return (c >= 0x00 && c <= 0x1F) || c == 0x7F;
+}
+
 static inline int
 grub_isalpha (int c)
 {
@@ -112,6 +118,12 @@ grub_isdigit (int c)
   return (c >= '0' && c <= '9');
 }
 
+static inline int
+grub_isalnum (int c)
+{
+  return grub_isalpha (c) || grub_isdigit (c);
+}
+
 static inline int
 grub_tolower (int c)
 {
@@ -166,6 +178,43 @@ grub_strncasecmp (const char *s1, const char *s2, grub_size_t n)
 
 unsigned long EXPORT_FUNC(grub_strtoul) (const char *str, char **end, int base);
 unsigned long long EXPORT_FUNC(grub_strtoull) (const char *str, char **end, int base);
+
+static inline long
+grub_strtol (const char *str, char **end, int base)
+{
+  int negative = 0;
+  unsigned long magnitude;
+
+  while (*str && grub_isspace (*str))
+    str++;
+
+  if (*str == '-')
+    {
+      negative = 1;
+      str++;
+    }
+
+  magnitude = grub_strtoull (str, end, base);
+  if (negative)
+    {
+      if (magnitude > (unsigned long) GRUB_LONG_MAX + 1)
+        {
+          grub_error (GRUB_ERR_OUT_OF_RANGE, "negative overflow");
+          return GRUB_LONG_MIN;
+        }
+      return -((long) magnitude);
+    }
+  else
+    {
+      if (magnitude > GRUB_LONG_MAX)
+        {
+          grub_error (GRUB_ERR_OUT_OF_RANGE, "positive overflow");
+          return GRUB_LONG_MAX;
+        }
+      return (long) magnitude;
+    }
+}
+
 char *EXPORT_FUNC(grub_strdup) (const char *s);
 char *EXPORT_FUNC(grub_strndup) (const char *s, grub_size_t n);
 void *EXPORT_FUNC(grub_memset) (void *s, int c, grub_size_t n);

From 1f1551457faf627f0c310f514c597da93138f0c1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Nov 2009 16:00:13 +0100
Subject: [PATCH 0099/1628] ChangeLog

---
 ChangeLog.trig | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 ChangeLog.trig

diff --git a/ChangeLog.trig b/ChangeLog.trig
new file mode 100644
index 000000000..c3cd73594
--- /dev/null
+++ b/ChangeLog.trig
@@ -0,0 +1,11 @@
+2009-11-14  Colin D Bennet <colin@gibibit.com>
+
+	Trigonometry support.
+
+	* include/grub/trig.h: New file.
+	* lib/trig.c: Likewise.
+	* maintainance/gentrigtables.py: Likewise.
+	* conf/common.rmk (pkglib_MODULES): Add trig.mod.
+	(trig_mod_SOURCES): New variable.
+	(trig_mod_CFLAGS): Likewise.
+	(trig_mod_LDFLAGS): Likewise.

From d920a32ab688df7cce1667434cc6785ebc840386 Mon Sep 17 00:00:00 2001
From: Colin D Bennett <colin@gibibit.com>
Date: Fri, 20 Nov 2009 16:02:58 +0100
Subject: [PATCH 0100/1628] gfxmenu import

---
 conf/common.rmk                 |  22 +
 docs/gfxmenu-theme-example.txt  | 128 ++++++
 gfxmenu/gfxmenu.c               | 235 +++++++++++
 gfxmenu/gui_box.c               | 372 +++++++++++++++++
 gfxmenu/gui_canvas.c            | 268 ++++++++++++
 gfxmenu/gui_circular_progress.c | 339 +++++++++++++++
 gfxmenu/gui_image.c             | 270 ++++++++++++
 gfxmenu/gui_label.c             | 248 +++++++++++
 gfxmenu/gui_list.c              | 625 +++++++++++++++++++++++++++
 gfxmenu/gui_progress_bar.c      | 378 +++++++++++++++++
 gfxmenu/gui_string_util.c       | 358 ++++++++++++++++
 gfxmenu/gui_util.c              | 101 +++++
 gfxmenu/icon_manager.c          | 258 ++++++++++++
 gfxmenu/model.c                 | 191 +++++++++
 gfxmenu/named_colors.c          | 209 +++++++++
 gfxmenu/theme_loader.c          | 720 ++++++++++++++++++++++++++++++++
 gfxmenu/view.c                  | 497 ++++++++++++++++++++++
 gfxmenu/widget-box.c            | 313 ++++++++++++++
 include/grub/gfxmenu_model.h    |  59 +++
 include/grub/gfxmenu_view.h     |  91 ++++
 include/grub/gfxwidgets.h       |  49 +++
 include/grub/gui.h              | 165 ++++++++
 include/grub/gui_string_util.h  |  39 ++
 include/grub/icon_manager.h     |  41 ++
 include/grub/term.h             |   2 +-
 25 files changed, 5977 insertions(+), 1 deletion(-)
 create mode 100644 docs/gfxmenu-theme-example.txt
 create mode 100644 gfxmenu/gfxmenu.c
 create mode 100644 gfxmenu/gui_box.c
 create mode 100644 gfxmenu/gui_canvas.c
 create mode 100644 gfxmenu/gui_circular_progress.c
 create mode 100644 gfxmenu/gui_image.c
 create mode 100644 gfxmenu/gui_label.c
 create mode 100644 gfxmenu/gui_list.c
 create mode 100644 gfxmenu/gui_progress_bar.c
 create mode 100644 gfxmenu/gui_string_util.c
 create mode 100644 gfxmenu/gui_util.c
 create mode 100644 gfxmenu/icon_manager.c
 create mode 100644 gfxmenu/model.c
 create mode 100644 gfxmenu/named_colors.c
 create mode 100644 gfxmenu/theme_loader.c
 create mode 100644 gfxmenu/view.c
 create mode 100644 gfxmenu/widget-box.c
 create mode 100644 include/grub/gfxmenu_model.h
 create mode 100644 include/grub/gfxmenu_view.h
 create mode 100644 include/grub/gfxwidgets.h
 create mode 100644 include/grub/gui.h
 create mode 100644 include/grub/gui_string_util.h
 create mode 100644 include/grub/icon_manager.h

diff --git a/conf/common.rmk b/conf/common.rmk
index 3dddeb66d..4c1b845df 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -417,6 +417,28 @@ hello_mod_SOURCES = hello/hello.c
 hello_mod_CFLAGS = $(COMMON_CFLAGS)
 hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For gfxmenu.mod.
+pkglib_MODULES += gfxmenu.mod
+gfxmenu_mod_SOURCES = \
+	gfxmenu/gfxmenu.c \
+	gfxmenu/model.c \
+	gfxmenu/view.c \
+	gfxmenu/icon_manager.c \
+	gfxmenu/theme_loader.c \
+	gfxmenu/widget-box.c \
+	gfxmenu/gui_canvas.c \
+	gfxmenu/gui_circular_progress.c \
+	gfxmenu/gui_box.c \
+	gfxmenu/gui_label.c \
+	gfxmenu/gui_list.c \
+	gfxmenu/gui_image.c \
+	gfxmenu/gui_progress_bar.c \
+	gfxmenu/gui_util.c \
+	gfxmenu/gui_string_util.c \
+	gfxmenu/named_colors.c
+gfxmenu_mod_CFLAGS = $(COMMON_CFLAGS)
+gfxmenu_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # For parttool.mod.
 parttool_mod_SOURCES = commands/parttool.c
 parttool_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/docs/gfxmenu-theme-example.txt b/docs/gfxmenu-theme-example.txt
new file mode 100644
index 000000000..4363dc8df
--- /dev/null
+++ b/docs/gfxmenu-theme-example.txt
@@ -0,0 +1,128 @@
+# GRUB gfxmenu theme "winter".
+# Uses background image from:
+# http://www.cyberpunkcafe.com/e107_plugins/autogallery/autogallery.php?show=1.Open%20Source%20Wallpaper
+# "without-leaves.png" was called "Without Leafs in Winter.png"
+
+lua-script: "winter.lua"
+title-text: ""
+title-font: "Helvetica Bold 18"
+status-font: "Helvetica 8"
+terminal-font: "Fixed 9"
+title-color: "40, 40, 40"
+status-color: "#FFF"
+status-bg-color: "0, 166, 183, 128"
+desktop-image: "without-leaves.png"
+desktop-color: "0, 154, 183"
+terminal-box: "terminal_*.png"
+
++ boot_menu {
+   position = (120, 60)
+   preferred_size = (400, -1)
+   item_font = "Helvetica Bold 14"
+   selected_item_font = "Helvetica Bold 14"
+   item_color = "0, 0, 0"
+   selected_item_color = "203, 251, 255"
+   menu_pixmap_style = "menu_*.png"
+   selected_item_pixmap_style = "select_*.png"
+   icon_width = 44
+   icon_height = 44
+   item_height = 32
+   item_padding = 0
+   item_icon_space = 3
+   item_spacing = 11
+}
+
+# You can add text at arbitrary locations on the screen.
+# The specification within the "+label {...}" block is free-form,
+# so you can use as much or as little white space as you like.
+
++ label {
+   position = (170, 50)
+   font = "smoothansi 13"
+   color = "0,0,128"
+   text = "This is the Winter theme ... brought to you by GRUB!"
+}
+
+# Show the text alignment supported by labels.
++ vbox {
+   position = (220, 347)
+   preferred_size = (200, -1)     # A preferred size of -1 means automatic.
+   + label { text="Text alignment demo" align="center" font="aqui 11" }
+   + label { text="Left" align="left" font="cure 11" }
+   + label { text="Center" align="center" font="cure 11" }
+   + label { text="Right" align="right" font="cure 11" }
+}
+
++ vbox {
+   position = (580, 10)
+   + label { text="GNU" font="gelly 11" color="0, 0, 0" }
+   + label { text="GRUB" font="aqui 11" color="0, 0, 0" }
+   + label { text="boot loader" font="cure 11" color="0, 0, 0" }
+}
+
++ hbox {
+   position = (80, 10)
+   + label { text="GNU" font="gelly 11" color="0, 0, 0" }
+   + label { text="GRUB" font="aqui 11" color="0, 0, 0" }
+   + label { text="boot loader" font="cure 11" color="0, 0, 0" }
+}
+
+# Demonstration of a compound layout: boxes within boxes.
++ hbox
+{
+   position = (480, 3)
+
+   + vbox
+   {
+      # Note: We can't just use 'size' to set the image's size,
+      #       since the vbox will resize the component according to its
+      #       preferred size, which for images is the native image size.
+
+      + image { file="/boot/grub/themes/icons/ubuntu.png"
+                preferred_size = (20, 20) }
+      + image { file="/boot/grub/themes/icons/gentoo.png"
+                preferred_size = (20, 20) }
+   }
+
+   + vbox
+   {
+      + label { text="GRand" font="cure 11" color=#99F }
+      + label { text="Unified" font="cure 11" color=#BBF }
+      + label { text="Bootloader" font="cure 11" color=#DDF }
+   }
+}
+
+# By defining a 'progress_bar' type component with an ID of '__timeout__',
+# the progress bar will be used to display the time remaining before an
+# the default entry is automatically booted.
++ progress_bar
+{
+   id = "__timeout__"
+   position = (80, 393)
+   preferred_size = (500, 24)
+   font = "cure 11"
+   text_color = #000
+   fg_color = #CCF
+   bg_color = #66B
+   border_color = #006
+   show_text = false
+}
+
+# Although the progress_bar component is normally used to indicate the
+# time remaining, it's also possible to create other components with an ID
+# of '__timeout__'.  All components with and ID of 'timeout_bar' will have
+# the following properties set based on the timeout value:
+#   text, value, start, end, visible.
+# In this case, we have set 'show_text=false' on the progress bar, and use
+# the following label's 'text' property to display the message.
++ label
+{
+   id = "__timeout__"
+   position = (80, 420)
+   preferred_size = (500, 24)
+   font = "lime 11"
+   color = #117
+   align = "center"
+}
+
+
diff --git a/gfxmenu/gfxmenu.c b/gfxmenu/gfxmenu.c
new file mode 100644
index 000000000..85ce5879d
--- /dev/null
+++ b/gfxmenu/gfxmenu.c
@@ -0,0 +1,235 @@
+/* gfxmenu.c - Graphical menu interface controller. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/mm.h>
+#include <grub/err.h>
+#include <grub/dl.h>
+#include <grub/command.h>
+#include <grub/video.h>
+#include <grub/gfxterm.h>
+#include <grub/bitmap.h>
+#include <grub/bitmap_scale.h>
+#include <grub/term.h>
+#include <grub/env.h>
+#include <grub/normal.h>
+#include <grub/gfxwidgets.h>
+#include <grub/menu.h>
+#include <grub/menu_viewer.h>
+#include <grub/gfxmenu_model.h>
+#include <grub/gfxmenu_view.h>
+
+static void switch_to_text_menu (void)
+{
+  grub_env_set ("menuviewer", "text");
+}
+
+static void
+process_key_press (int c,
+                   grub_gfxmenu_model_t model,
+                   grub_gfxmenu_view_t view,
+                   int nested,
+                   int *should_exit)
+{
+  /* When a key is pressed, stop the timeout.  */
+  grub_gfxmenu_model_clear_timeout (model);
+
+  if (c == 'j' || c == GRUB_TERM_DOWN)
+    {
+      int i = grub_gfxmenu_model_get_selected_index (model);
+      int num_items = grub_gfxmenu_model_get_num_entries (model);
+      if (i < num_items - 1)
+        {
+          i++;
+          grub_gfxmenu_model_set_selected_index (model, i);
+        }
+    }
+  else if (c == 'k' || c == GRUB_TERM_UP)
+    {
+      int i = grub_gfxmenu_model_get_selected_index (model);
+      if (i > 0)
+        {
+          i--;
+          grub_gfxmenu_model_set_selected_index (model, i);
+        }
+    }
+  else if (c == '\r' || c == '\n' || c == GRUB_TERM_RIGHT)
+    {
+      int selected = grub_gfxmenu_model_get_selected_index (model);
+      int num_entries = grub_gfxmenu_model_get_num_entries (model);
+      if (selected >= 0 && selected < num_entries)
+        {
+          grub_menu_entry_t entry =
+            grub_gfxmenu_model_get_entry (model, selected);
+          grub_gfxmenu_view_execute_entry (view, entry);
+        }
+    }
+  else if (c == 'c')
+    {
+      grub_gfxmenu_view_run_terminal (view);
+    }
+  else if (c == 't')
+    {
+      /* The write hook for 'menuviewer' will cause
+       * grub_menu_viewer_should_return to return nonzero. */
+      switch_to_text_menu ();
+      *should_exit = 1;
+    }
+  else if (c == '1')
+    {
+      grub_gfxmenu_view_load_theme (view,
+                                    "/boot/grub/themes/proto/theme.txt");
+    }
+  else if (c == '2')
+    {
+      grub_gfxmenu_view_load_theme (view,
+                                    "/boot/grub/themes/winter/theme.txt");
+    }
+  else if (c == '3')
+    {
+      grub_gfxmenu_view_load_theme (view,
+                                    "/boot/grub/themes/ubuntu1/theme.txt");
+    }
+  else if (c == '4')
+    {
+      grub_gfxmenu_view_load_theme (view,
+                                    "/boot/grub/themes/ubuntu2/theme.txt");
+    }
+  else if (nested && c == GRUB_TERM_ESC)
+    {
+      *should_exit = 1;
+    }
+
+  if (grub_errno != GRUB_ERR_NONE)
+    *should_exit = 1;
+}
+
+static void
+handle_key_events (grub_gfxmenu_model_t model,
+                   grub_gfxmenu_view_t view,
+                   int nested,
+                   int *should_exit)
+{
+  while ((! *should_exit) && (grub_checkkey () != -1))
+    {
+      int key = grub_getkey ();
+      int c = GRUB_TERM_ASCII_CHAR (key);
+      process_key_press (c, model, view, nested, should_exit);
+    }
+}
+
+static grub_err_t
+show_menu (grub_menu_t menu, int nested)
+{
+  grub_gfxmenu_model_t model;
+
+  model = grub_gfxmenu_model_new (menu);
+  if (! model)
+    {
+      grub_print_error ();
+      grub_printf ("Initializing menu data for graphical menu failed;\n"
+                   "falling back to text based menu.\n");
+      grub_wait_after_message ();
+      switch_to_text_menu ();
+      return grub_errno;
+    }
+
+  grub_gfxmenu_view_t view;
+
+  /* Create the view.  */
+  const char *theme_path = grub_env_get ("theme");
+  if (! theme_path)
+    theme_path = "/boot/grub/themes/proto/theme.txt";
+
+  view = grub_gfxmenu_view_new (theme_path, model);
+  if (! view)
+    {
+      grub_print_error ();
+      grub_printf ("Starting graphical menu failed;\n"
+                   "falling back to text based menu.\n");
+      grub_wait_after_message ();
+      grub_gfxmenu_model_destroy (model);
+      switch_to_text_menu ();
+      return grub_errno;
+    }
+
+  /* Initially select the default menu entry.  */
+  int default_index = grub_menu_get_default_entry_index (menu);
+  grub_gfxmenu_model_set_selected_index (model, default_index);
+
+  /* Start the timer to execute the default entry.  */
+  grub_gfxmenu_model_set_timeout (model);
+
+  /* Main event loop.  */
+  int exit_requested = 0;
+  while ((! exit_requested) && (! grub_menu_viewer_should_return ()))
+    {
+      if (grub_gfxmenu_model_timeout_expired (model))
+        {
+          grub_gfxmenu_model_clear_timeout (model);
+          int i = grub_gfxmenu_model_get_selected_index (model);
+          grub_menu_entry_t e = grub_gfxmenu_model_get_entry (model, i);
+          grub_gfxmenu_view_execute_with_fallback (view, e);
+          continue;
+        }
+
+      grub_gfxmenu_view_draw (view);
+      grub_video_swap_buffers ();
+      handle_key_events (model, view, nested, &exit_requested);
+    }
+
+  grub_gfxmenu_view_destroy (view);
+  grub_gfxmenu_model_destroy (model);
+
+  return grub_errno;
+}
+
+static grub_err_t
+grub_cmd_gfxmenu (grub_command_t cmd UNUSED,
+                  int argc UNUSED, char **args UNUSED)
+{
+  grub_menu_t menu = grub_env_get_data_slot ("menu");
+  if (! menu)
+    return grub_error (GRUB_ERR_MENU, "no menu context");
+
+  return show_menu (menu, 1);
+}
+
+static struct grub_menu_viewer menu_viewer =
+{
+  .name = "gfxmenu",
+  .show_menu = show_menu
+};
+
+static grub_command_t cmd;
+
+GRUB_MOD_INIT (gfxmenu)
+{
+  (void) mod;                   /* To stop warning. */
+  grub_menu_viewer_register (&menu_viewer);
+  cmd = grub_register_command ("gfxmenu", grub_cmd_gfxmenu,
+                               "gfxmenu",
+                               "Show graphical menu interface");
+}
+
+GRUB_MOD_FINI (gfxmenu)
+{
+  grub_unregister_command (cmd);
+}
diff --git a/gfxmenu/gui_box.c b/gfxmenu/gui_box.c
new file mode 100644
index 000000000..876d0733f
--- /dev/null
+++ b/gfxmenu/gui_box.c
@@ -0,0 +1,372 @@
+/* gui_box.c - GUI container that stack components. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/mm.h>
+#include <grub/misc.h>
+#include <grub/gui.h>
+#include <grub/gui_string_util.h>
+
+struct component_node
+{
+  grub_gui_component_t component;
+  struct component_node *next;
+  struct component_node *prev;
+};
+
+typedef struct grub_gui_box *grub_gui_box_t;
+
+typedef void (*layout_func_t) (grub_gui_box_t self, int modify_layout,
+                               int *width, int *height);
+
+struct grub_gui_box
+{
+  struct grub_gui_container_ops *container;
+
+  grub_gui_container_t parent;
+  grub_video_rect_t bounds;
+  char *id;
+  int preferred_width;
+  int preferred_height;
+
+  /* Doubly linked list of components with dummy head & tail nodes.  */
+  struct component_node chead;
+  struct component_node ctail;
+
+  /* The layout function: differs for vertical and horizontal boxes.  */
+  layout_func_t layout_func;
+};
+
+static void
+box_destroy (void *vself)
+{
+  grub_gui_box_t self = vself;
+  struct component_node *cur;
+  struct component_node *next;
+  for (cur = self->chead.next; cur != &self->ctail; cur = next)
+    {
+      /* Copy the 'next' pointer, since we need it for the next iteration,
+         and we're going to free the memory it is stored in.  */
+      next = cur->next;
+      /* Destroy the child component.  */
+      cur->component->ops->destroy (cur->component);
+      /* Free the linked list node.  */
+      grub_free (cur);
+    }
+  grub_free (self);
+}
+
+static const char *
+box_get_id (void *vself)
+{
+  grub_gui_box_t self = vself;
+  return self->id;
+}
+
+static int
+box_is_instance (void *vself __attribute__((unused)), const char *type)
+{
+  return (grub_strcmp (type, "component") == 0
+          || grub_strcmp (type, "container") == 0);
+}
+
+static void
+layout_horizontally (grub_gui_box_t self, int modify_layout,
+                     int *width, int *height)
+{
+  /* Start at the left (chead) and set the x coordinates as we go right.  */
+  /* All components have their width set to the box's width.  */
+
+  struct component_node *cur;
+  int x = 0;
+  if (height)
+    *height = 0;
+  for (cur = self->chead.next; cur != &self->ctail; cur = cur->next)
+    {
+      grub_gui_component_t c = cur->component;
+      grub_video_rect_t r;
+
+      c->ops->get_preferred_size (c, &r.width, &r.height);
+
+      /* Check and possibly update the maximum width, if non-null.  */
+      if (height && r.height > *height)
+        *height = r.height;
+
+      /* Set the component's bounds, if the flag is set.  */
+      if (modify_layout)
+        {
+          r.x = x;
+          r.y = 0;
+          /* Width comes from the component's preferred size.  */
+          r.height = self->bounds.height;
+          c->ops->set_bounds (c, &r);
+        }
+
+      x += r.width;
+    }
+
+  /* Return the sum of the children's preferred widths.  */
+  if (width)
+    *width = x;
+}
+
+static void
+layout_vertically (grub_gui_box_t self, int modify_layout,
+                   int *width, int *height)
+{
+  /* Start at the top (chead) and set the y coordinates as we go down.  */
+  /* All components have their width set to the vbox's width.  */
+
+  struct component_node *cur;
+  int y = 0;
+  if (width)
+    *width = 0;
+  for (cur = self->chead.next; cur != &self->ctail; cur = cur->next)
+    {
+      grub_gui_component_t c = cur->component;
+      grub_video_rect_t r;
+
+      c->ops->get_preferred_size (c, &r.width, &r.height);
+
+      /* Check and possibly update the maximum width, if non-null.  */
+      if (width && r.width > *width)
+        *width = r.width;
+
+      /* Set the component's bounds, if the flag is set.  */
+      if (modify_layout)
+        {
+          r.x = 0;
+          r.y = y;
+          r.width = self->bounds.width;
+          /* Height comes from the component's preferred size.  */
+          c->ops->set_bounds (c, &r);
+        }
+
+      y += r.height;
+    }
+
+  /* Return the sum of the children's preferred heights.  */
+  if (height)
+    *height = y;
+}
+
+static void
+box_paint (void *vself)
+{
+  grub_gui_box_t self = vself;
+  struct component_node *cur;
+  grub_video_rect_t vpsave;
+
+  grub_gui_set_viewport (&self->bounds, &vpsave);
+  for (cur = self->chead.next; cur != &self->ctail; cur = cur->next)
+    {
+      grub_gui_component_t comp = cur->component;
+      comp->ops->paint (comp);
+    }
+  grub_gui_restore_viewport (&vpsave);
+}
+
+static void
+box_set_parent (void *vself, grub_gui_container_t parent)
+{
+  grub_gui_box_t self = vself;
+  self->parent = parent;
+}
+
+static grub_gui_container_t
+box_get_parent (void *vself)
+{
+  grub_gui_box_t self = vself;
+  return self->parent;
+}
+
+static void
+box_set_bounds (void *vself, const grub_video_rect_t *bounds)
+{
+  grub_gui_box_t self = vself;
+  self->bounds = *bounds;
+  self->layout_func (self, 1, 0, 0);   /* Relayout the children.  */
+}
+
+static void
+box_get_bounds (void *vself, grub_video_rect_t *bounds)
+{
+  grub_gui_box_t self = vself;
+  *bounds = self->bounds;
+}
+
+/* The box's preferred size is based on the preferred sizes
+   of its children.  */
+static void
+box_get_preferred_size (void *vself, int *width, int *height)
+{
+  grub_gui_box_t self = vself;
+  self->layout_func (self, 0, width, height);   /* Just calculate the size.  */
+
+  /* Allow preferred dimensions to override the computed dimensions.  */
+  if (self->preferred_width >= 0)
+    *width = self->preferred_width;
+  if (self->preferred_height >= 0)
+    *height = self->preferred_height;
+}
+
+static grub_err_t
+box_set_property (void *vself, const char *name, const char *value)
+{
+  grub_gui_box_t self = vself;
+  if (grub_strcmp (name, "id") == 0)
+    {
+      grub_free (self->id);
+      if (value)
+        {
+          self->id = grub_strdup (value);
+          if (! self->id)
+            return grub_errno;
+        }
+      else
+        self->id = 0;
+    }
+  else if (grub_strcmp (name, "preferred_size") == 0)
+    {
+      int w;
+      int h;
+      if (grub_gui_parse_2_tuple (value, &w, &h) != GRUB_ERR_NONE)
+        return grub_errno;
+      self->preferred_width = w;
+      self->preferred_height = h;
+    }
+
+  return grub_errno;
+}
+
+static void
+box_add (void *vself, grub_gui_component_t comp)
+{
+  grub_gui_box_t self = vself;
+  struct component_node *node;
+  node = grub_malloc (sizeof (*node));
+  if (! node)
+    return;   /* Note: probably should handle the error.  */
+  node->component = comp;
+  /* Insert the node before the tail.  */
+  node->prev = self->ctail.prev;
+  node->prev->next = node;
+  node->next = &self->ctail;
+  node->next->prev = node;
+
+  comp->ops->set_parent (comp, (grub_gui_container_t) self);
+  self->layout_func (self, 1, 0, 0);   /* Relayout the children.  */
+}
+
+static void
+box_remove (void *vself, grub_gui_component_t comp)
+{
+  grub_gui_box_t self = vself;
+  struct component_node *cur;
+  for (cur = self->chead.next; cur != &self->ctail; cur = cur->next)
+    {
+      if (cur->component == comp)
+        {
+          /* Unlink 'cur' from the list.  */
+          cur->prev->next = cur->next;
+          cur->next->prev = cur->prev;
+          /* Free the node's memory (but don't destroy the component).  */
+          grub_free (cur);
+          /* Must not loop again, since 'cur' would be dereferenced!  */
+          return;
+        }
+    }
+}
+
+static void
+box_iterate_children (void *vself,
+                      grub_gui_component_callback cb, void *userdata)
+{
+  grub_gui_box_t self = vself;
+  struct component_node *cur;
+  for (cur = self->chead.next; cur != &self->ctail; cur = cur->next)
+    cb (cur->component, userdata);
+}
+
+static struct grub_gui_container_ops box_ops =
+{
+  .component =
+    {
+      .destroy = box_destroy,
+      .get_id = box_get_id,
+      .is_instance = box_is_instance,
+      .paint = box_paint,
+      .set_parent = box_set_parent,
+      .get_parent = box_get_parent,
+      .set_bounds = box_set_bounds,
+      .get_bounds = box_get_bounds,
+      .get_preferred_size = box_get_preferred_size,
+      .set_property = box_set_property
+    },
+  .add = box_add,
+  .remove = box_remove,
+  .iterate_children = box_iterate_children
+};
+
+/* Box constructor.  Specify the appropriate layout function to create
+   a horizontal or vertical stacking box.  */
+static grub_gui_box_t
+box_new (layout_func_t layout_func)
+{
+  grub_gui_box_t box;
+  box = grub_malloc (sizeof (*box));
+  if (! box)
+    return 0;
+  box->container = &box_ops;
+  box->parent = 0;
+  box->bounds.x = 0;
+  box->bounds.y = 0;
+  box->bounds.width = 0;
+  box->bounds.height = 0;
+  box->id = 0;
+  box->preferred_width = -1;
+  box->preferred_height = -1;
+  box->chead.component = 0;
+  box->chead.prev = 0;
+  box->chead.next = &box->ctail;
+  box->ctail.component = 0;
+  box->ctail.prev = &box->chead;
+  box->ctail.next = 0;
+  box->layout_func = layout_func;
+  return box;
+}
+
+/* Create a new container that stacks its child components horizontally,
+   from left to right.  Each child get a width corresponding to its
+   preferred width.  The height of each child is set the maximum of the
+   preferred heights of all children.  */
+grub_gui_container_t
+grub_gui_hbox_new (void)
+{
+  return (grub_gui_container_t) box_new (layout_horizontally);
+}
+
+/* Create a new container that stacks its child components verticallyj,
+   from top to bottom.  Each child get a height corresponding to its
+   preferred height.  The width of each child is set the maximum of the
+   preferred widths of all children.  */
+grub_gui_container_t
+grub_gui_vbox_new (void)
+{
+  return (grub_gui_container_t) box_new (layout_vertically);
+}
diff --git a/gfxmenu/gui_canvas.c b/gfxmenu/gui_canvas.c
new file mode 100644
index 000000000..a2cd77df6
--- /dev/null
+++ b/gfxmenu/gui_canvas.c
@@ -0,0 +1,268 @@
+/* gui_canvas.c - GUI container allowing manually placed components. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/mm.h>
+#include <grub/misc.h>
+#include <grub/gui.h>
+#include <grub/gui_string_util.h>
+
+/* TODO Add layering so that components can be properly overlaid. */
+
+struct component_node
+{
+  grub_gui_component_t component;
+  struct component_node *next;
+};
+
+struct grub_gui_canvas
+{
+  struct grub_gui_container_ops *container;
+
+  grub_gui_container_t parent;
+  grub_video_rect_t bounds;
+  char *id;
+  int preferred_width;
+  int preferred_height;
+  /* Component list (dummy head node).  */
+  struct component_node components;
+};
+
+typedef struct grub_gui_canvas *grub_gui_canvas_t;
+
+static void
+canvas_destroy (void *vself)
+{
+  grub_gui_canvas_t self = vself;
+  struct component_node *cur;
+  struct component_node *next;
+  for (cur = self->components.next; cur; cur = next)
+    {
+      /* Copy the 'next' pointer, since we need it for the next iteration,
+         and we're going to free the memory it is stored in.  */
+      next = cur->next;
+      /* Destroy the child component.  */
+      cur->component->ops->destroy (cur->component);
+      /* Free the linked list node.  */
+      grub_free (cur);
+    }
+  grub_free (self);
+}
+
+static const char *
+canvas_get_id (void *vself)
+{
+  grub_gui_canvas_t self = vself;
+  return self->id;
+}
+
+static int
+canvas_is_instance (void *vself __attribute__((unused)), const char *type)
+{
+  return (grub_strcmp (type, "component") == 0
+          || grub_strcmp (type, "container") == 0);
+}
+
+static void
+canvas_paint (void *vself)
+{
+  grub_gui_canvas_t self = vself;
+  struct component_node *cur;
+  grub_video_rect_t vpsave;
+
+  grub_gui_set_viewport (&self->bounds, &vpsave);
+  for (cur = self->components.next; cur; cur = cur->next)
+    {
+      int pw;
+      int ph;
+      grub_video_rect_t r;
+      grub_gui_component_t comp;
+
+      comp = cur->component;
+
+      /* Give the child its preferred size.  */
+      comp->ops->get_preferred_size (comp, &pw, &ph);
+      comp->ops->get_bounds (comp, &r);
+      if (r.width != pw || r.height != ph)
+        {
+          r.width = pw;
+          r.height = ph;
+          comp->ops->set_bounds (comp, &r);
+        }
+
+      /* Paint the child.  */
+      comp->ops->paint (comp);
+    }
+  grub_gui_restore_viewport (&vpsave);
+}
+
+static void
+canvas_set_parent (void *vself, grub_gui_container_t parent)
+{
+  grub_gui_canvas_t self = vself;
+  self->parent = parent;
+}
+
+static grub_gui_container_t
+canvas_get_parent (void *vself)
+{
+  grub_gui_canvas_t self = vself;
+  return self->parent;
+}
+
+static void
+canvas_set_bounds (void *vself, const grub_video_rect_t *bounds)
+{
+  grub_gui_canvas_t self = vself;
+  self->bounds = *bounds;
+}
+
+static void
+canvas_get_bounds (void *vself, grub_video_rect_t *bounds)
+{
+  grub_gui_canvas_t self = vself;
+  *bounds = self->bounds;
+}
+
+static void
+canvas_get_preferred_size (void *vself, int *width, int *height)
+{
+  grub_gui_canvas_t self = vself;
+  *width = 0;
+  *height = 0;
+
+  /* Allow preferred dimensions to override the empty dimensions.  */
+  if (self->preferred_width >= 0)
+    *width = self->preferred_width;
+  if (self->preferred_height >= 0)
+    *height = self->preferred_height;
+}
+
+static grub_err_t
+canvas_set_property (void *vself, const char *name, const char *value)
+{
+  grub_gui_canvas_t self = vself;
+  if (grub_strcmp (name, "id") == 0)
+    {
+      grub_free (self->id);
+      if (value)
+        {
+          self->id = grub_strdup (value);
+          if (! self->id)
+            return grub_errno;
+        }
+      else
+        self->id = 0;
+    }
+  else if (grub_strcmp (name, "preferred_size") == 0)
+    {
+      int w;
+      int h;
+      if (grub_gui_parse_2_tuple (value, &w, &h) != GRUB_ERR_NONE)
+        return grub_errno;
+      self->preferred_width = w;
+      self->preferred_height = h;
+    }
+  return grub_errno;
+}
+
+static void
+canvas_add (void *vself, grub_gui_component_t comp)
+{
+  grub_gui_canvas_t self = vself;
+  struct component_node *node;
+  node = grub_malloc (sizeof (*node));
+  if (! node)
+    return;   /* Note: probably should handle the error.  */
+  node->component = comp;
+  node->next = self->components.next;
+  self->components.next = node;
+  comp->ops->set_parent (comp, (grub_gui_container_t) self);
+}
+
+static void
+canvas_remove (void *vself, grub_gui_component_t comp)
+{
+  grub_gui_canvas_t self = vself;
+  struct component_node *cur;
+  struct component_node *prev;
+  prev = &self->components;
+  for (cur = self->components.next; cur; prev = cur, cur = cur->next)
+    {
+      if (cur->component == comp)
+        {
+          /* Unlink 'cur' from the list.  */
+          prev->next = cur->next;
+          /* Free the node's memory (but don't destroy the component).  */
+          grub_free (cur);
+          /* Must not loop again, since 'cur' would be dereferenced!  */
+          return;
+        }
+    }
+}
+
+static void
+canvas_iterate_children (void *vself,
+                         grub_gui_component_callback cb, void *userdata)
+{
+  grub_gui_canvas_t self = vself;
+  struct component_node *cur;
+  for (cur = self->components.next; cur; cur = cur->next)
+    cb (cur->component, userdata);
+}
+
+static struct grub_gui_container_ops canvas_ops =
+{
+  .component =
+    {
+      .destroy = canvas_destroy,
+      .get_id = canvas_get_id,
+      .is_instance = canvas_is_instance,
+      .paint = canvas_paint,
+      .set_parent = canvas_set_parent,
+      .get_parent = canvas_get_parent,
+      .set_bounds = canvas_set_bounds,
+      .get_bounds = canvas_get_bounds,
+      .get_preferred_size = canvas_get_preferred_size,
+      .set_property = canvas_set_property
+    },
+  .add = canvas_add,
+  .remove = canvas_remove,
+  .iterate_children = canvas_iterate_children
+};
+
+grub_gui_container_t
+grub_gui_canvas_new (void)
+{
+  grub_gui_canvas_t canvas;
+  canvas = grub_malloc (sizeof (*canvas));
+  if (! canvas)
+    return 0;
+  canvas->container = &canvas_ops;
+  canvas->parent = 0;
+  canvas->bounds.x = 0;
+  canvas->bounds.y = 0;
+  canvas->bounds.width = 0;
+  canvas->bounds.height = 0;
+  canvas->id = 0;
+  canvas->preferred_width = -1;
+  canvas->preferred_height = -1;
+  canvas->components.component = 0;
+  canvas->components.next = 0;
+  return (grub_gui_container_t) canvas;
+}
diff --git a/gfxmenu/gui_circular_progress.c b/gfxmenu/gui_circular_progress.c
new file mode 100644
index 000000000..cd95c51f9
--- /dev/null
+++ b/gfxmenu/gui_circular_progress.c
@@ -0,0 +1,339 @@
+/* gui_circular_process.c - GUI circular progress indicator component.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/mm.h>
+#include <grub/misc.h>
+#include <grub/gui.h>
+#include <grub/font.h>
+#include <grub/gui_string_util.h>
+#include <grub/gfxmenu_view.h>
+#include <grub/gfxwidgets.h>
+#include <grub/trig.h>
+
+struct grub_gui_circular_progress
+{
+  struct grub_gui_component_ops *circprog_ops;
+
+  grub_gui_container_t parent;
+  grub_video_rect_t bounds;
+  char *id;
+  int preferred_width;
+  int preferred_height;
+  int visible;
+  int start;
+  int end;
+  int value;
+  int num_ticks;
+  int start_angle;
+  int ticks_disappear;
+  char *theme_dir;
+  int need_to_load_pixmaps;
+  char *center_file;
+  char *tick_file;
+  struct grub_video_bitmap *center_bitmap;
+  struct grub_video_bitmap *tick_bitmap;
+};
+
+typedef struct grub_gui_circular_progress *circular_progress_t;
+
+static void
+circprog_destroy (void *vself)
+{
+  circular_progress_t self = vself;
+  grub_free (self);
+}
+
+static const char *
+circprog_get_id (void *vself)
+{
+  circular_progress_t self = vself;
+  return self->id;
+}
+
+static int
+circprog_is_instance (void *vself __attribute__((unused)), const char *type)
+{
+  return grub_strcmp (type, "component") == 0;
+}
+
+static struct grub_video_bitmap *
+load_bitmap (const char *dir, const char *file)
+{
+  struct grub_video_bitmap *bitmap;
+  char *abspath;
+
+  /* Check arguments.  */
+  if (! dir || ! file)
+    return 0;
+
+  /* Resolve to an absolute path.  */
+  abspath = grub_resolve_relative_path (dir, file);
+  if (! abspath)
+    return 0;
+
+  /* Load the image.  */
+  grub_errno = GRUB_ERR_NONE;
+  grub_video_bitmap_load (&bitmap, abspath);
+  grub_errno = GRUB_ERR_NONE;
+
+  grub_free (abspath);
+  return bitmap;
+}
+
+static int
+check_pixmaps (circular_progress_t self)
+{
+  if (self->need_to_load_pixmaps)
+    {
+      if (self->center_bitmap)
+        grub_video_bitmap_destroy (self->center_bitmap);
+      self->center_bitmap = load_bitmap (self->theme_dir, self->center_file);
+      self->tick_bitmap = load_bitmap (self->theme_dir, self->tick_file);
+      self->need_to_load_pixmaps = 0;
+    }
+
+  return (self->center_bitmap != 0 && self->tick_bitmap != 0);
+}
+
+static void
+circprog_paint (void *vself)
+{
+  circular_progress_t self = vself;
+
+  if (! self->visible)
+    return;
+  if (! check_pixmaps (self))
+    return;
+
+  grub_video_rect_t vpsave;
+  grub_gui_set_viewport (&self->bounds, &vpsave);
+
+  int width = self->bounds.width;
+  int height = self->bounds.height;
+  int center_width = grub_video_bitmap_get_width (self->center_bitmap);
+  int center_height = grub_video_bitmap_get_height (self->center_bitmap);
+  int tick_width = grub_video_bitmap_get_width (self->tick_bitmap);
+  int tick_height = grub_video_bitmap_get_height (self->tick_bitmap);
+  grub_video_blit_bitmap (self->center_bitmap, GRUB_VIDEO_BLIT_BLEND,
+                          (width - center_width) / 2,
+                          (height - center_height) / 2, 0, 0,
+                          center_width, center_height);
+
+  int radius = width / 2 - tick_width / 2 - 1;
+  int nticks = (self->num_ticks
+                * (self->value - self->start)
+                / (self->end - self->start));
+  int tick_begin;
+  int tick_end;
+  /* Do ticks appear or disappear as the value approached the end?  */
+  if (self->ticks_disappear)
+    {
+      tick_begin = nticks;
+      tick_end = self->num_ticks - 1;
+    }
+  else
+    {
+      tick_begin = 0;
+      tick_end = nticks - 1;
+    }
+
+  int i;
+  for (i = tick_begin; i < tick_end; i++)
+    {
+       int x;
+       int y;
+       int angle;
+
+       /* Calculate the location of the tick.  */
+       angle = self->start_angle + i * GRUB_TRIG_ANGLE_MAX / self->num_ticks;
+       x = width / 2 + (grub_cos (angle) * radius / GRUB_TRIG_FRACTION_SCALE);
+       y = height / 2 + (grub_sin (angle) * radius / GRUB_TRIG_FRACTION_SCALE);
+
+       /* Adjust (x,y) so the tick is centered.  */
+       x -= tick_width / 2;
+       y -= tick_height / 2;
+
+       /* Draw the tick.  */
+       grub_video_blit_bitmap (self->tick_bitmap, GRUB_VIDEO_BLIT_BLEND,
+                               x, y, 0, 0, tick_width, tick_height);
+    }
+
+  grub_gui_restore_viewport (&vpsave);
+}
+
+static void
+circprog_set_parent (void *vself, grub_gui_container_t parent)
+{
+  circular_progress_t self = vself;
+  self->parent = parent;
+}
+
+static grub_gui_container_t
+circprog_get_parent (void *vself)
+{
+  circular_progress_t self = vself;
+  return self->parent;
+}
+
+static void
+circprog_set_bounds (void *vself, const grub_video_rect_t *bounds)
+{
+  circular_progress_t self = vself;
+  self->bounds = *bounds;
+}
+
+static void
+circprog_get_bounds (void *vself, grub_video_rect_t *bounds)
+{
+  circular_progress_t self = vself;
+  *bounds = self->bounds;
+}
+
+static void
+circprog_get_preferred_size (void *vself, int *width, int *height)
+{
+  circular_progress_t self = vself;
+
+  *width = 0;
+  *height = 0;
+
+  /* Allow preferred dimensions to override the circprog dimensions.  */
+  if (self->preferred_width >= 0)
+    *width = self->preferred_width;
+  if (self->preferred_height >= 0)
+    *height = self->preferred_height;
+}
+
+static grub_err_t
+circprog_set_property (void *vself, const char *name, const char *value)
+{
+  circular_progress_t self = vself;
+  if (grub_strcmp (name, "value") == 0)
+    {
+      self->value = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "start") == 0)
+    {
+      self->start = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "end") == 0)
+    {
+      self->end = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "num_ticks") == 0)
+    {
+      self->num_ticks = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "start_angle") == 0)
+    {
+      self->start_angle = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "ticks_disappear") == 0)
+    {
+      self->ticks_disappear = grub_strcmp (value, "false") != 0;
+    }
+  else if (grub_strcmp (name, "center_bitmap") == 0)
+    {
+      self->need_to_load_pixmaps = 1;
+      grub_free (self->center_file);
+      self->center_file = value ? grub_strdup (value) : 0;
+    }
+  else if (grub_strcmp (name, "tick_bitmap") == 0)
+    {
+      self->need_to_load_pixmaps = 1;
+      grub_free (self->tick_file);
+      self->tick_file = value ? grub_strdup (value) : 0;
+    }
+  else if (grub_strcmp (name, "theme_dir") == 0)
+    {
+      self->need_to_load_pixmaps = 1;
+      grub_free (self->theme_dir);
+      self->theme_dir = value ? grub_strdup (value) : 0;
+    }
+  else if (grub_strcmp (name, "preferred_size") == 0)
+    {
+      int w;
+      int h;
+      if (grub_gui_parse_2_tuple (value, &w, &h) != GRUB_ERR_NONE)
+        return grub_errno;
+      self->preferred_width = w;
+      self->preferred_height = h;
+    }
+  else if (grub_strcmp (name, "visible") == 0)
+    {
+      self->visible = grub_strcmp (value, "false") != 0;
+    }
+  else if (grub_strcmp (name, "id") == 0)
+    {
+      grub_free (self->id);
+      if (value)
+        self->id = grub_strdup (value);
+      else
+        self->id = 0;
+    }
+  return grub_errno;
+}
+
+static struct grub_gui_component_ops circprog_ops =
+{
+  .destroy = circprog_destroy,
+  .get_id = circprog_get_id,
+  .is_instance = circprog_is_instance,
+  .paint = circprog_paint,
+  .set_parent = circprog_set_parent,
+  .get_parent = circprog_get_parent,
+  .set_bounds = circprog_set_bounds,
+  .get_bounds = circprog_get_bounds,
+  .get_preferred_size = circprog_get_preferred_size,
+  .set_property = circprog_set_property
+};
+
+grub_gui_component_t
+grub_gui_circular_progress_new (void)
+{
+  circular_progress_t self;
+  self = grub_malloc (sizeof (*self));
+  if (! self)
+    return 0;
+  self->circprog_ops = &circprog_ops;
+  self->parent = 0;
+  self->bounds.x = 0;
+  self->bounds.y = 0;
+  self->bounds.width = 0;
+  self->bounds.height = 0;
+  self->id = 0;
+  self->preferred_width = -1;
+  self->preferred_height = -1;
+  self->visible = 1;
+  self->start = 0;
+  self->end = 0;
+  self->value = 0;
+  self->num_ticks = 64;
+  self->start_angle = -64;
+  self->ticks_disappear = 0;
+
+  self->theme_dir = 0;
+  self->need_to_load_pixmaps = 0;
+  self->center_file = 0;
+  self->tick_file = 0;
+  self->center_bitmap = 0;
+  self->tick_bitmap = 0;
+
+  return (grub_gui_component_t) self;
+}
diff --git a/gfxmenu/gui_image.c b/gfxmenu/gui_image.c
new file mode 100644
index 000000000..1c58a535b
--- /dev/null
+++ b/gfxmenu/gui_image.c
@@ -0,0 +1,270 @@
+/* gui_image.c - GUI component to display an image.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/mm.h>
+#include <grub/misc.h>
+#include <grub/gui.h>
+#include <grub/gui_string_util.h>
+#include <grub/bitmap.h>
+#include <grub/bitmap_scale.h>
+
+struct grub_gui_image
+{
+  struct grub_gui_component_ops *image;
+
+  grub_gui_container_t parent;
+  grub_video_rect_t bounds;
+  char *id;
+  int preferred_width;
+  int preferred_height;
+  struct grub_video_bitmap *raw_bitmap;
+  struct grub_video_bitmap *bitmap;
+};
+
+typedef struct grub_gui_image *grub_gui_image_t;
+
+static void
+image_destroy (void *vself)
+{
+  grub_gui_image_t self = vself;
+
+  /* Free the scaled bitmap, unless it's a reference to the raw bitmap.  */
+  if (self->bitmap && (self->bitmap != self->raw_bitmap))
+    grub_video_bitmap_destroy (self->bitmap);
+  if (self->raw_bitmap)
+    grub_video_bitmap_destroy (self->raw_bitmap);
+
+  grub_free (self);
+}
+
+static const char *
+image_get_id (void *vself)
+{
+  grub_gui_image_t self = vself;
+  return self->id;
+}
+
+static int
+image_is_instance (void *vself __attribute__((unused)), const char *type)
+{
+  return grub_strcmp (type, "component") == 0;
+}
+
+static void
+image_paint (void *vself)
+{
+  grub_gui_image_t self = vself;
+  if (! self->bitmap)
+    return;
+  grub_video_rect_t vpsave;
+  grub_gui_set_viewport (&self->bounds, &vpsave);
+  grub_video_blit_bitmap (self->bitmap, GRUB_VIDEO_BLIT_BLEND,
+                          0, 0, 0, 0,
+                          grub_video_bitmap_get_width (self->bitmap),
+                          grub_video_bitmap_get_height (self->bitmap));
+  grub_gui_restore_viewport (&vpsave);
+}
+
+static void
+image_set_parent (void *vself, grub_gui_container_t parent)
+{
+  grub_gui_image_t self = vself;
+  self->parent = parent;
+}
+
+static grub_gui_container_t
+image_get_parent (void *vself)
+{
+  grub_gui_image_t self = vself;
+  return self->parent;
+}
+
+static grub_err_t
+rescale_image (grub_gui_image_t self)
+{
+  if (! self->raw_bitmap)
+    {
+      if (self->bitmap)
+        {
+          grub_video_bitmap_destroy (self->bitmap);
+          self->bitmap = 0;
+        }
+      return grub_errno;
+    }
+
+  unsigned width = self->bounds.width;
+  unsigned height = self->bounds.height;
+
+  if (self->bitmap
+      && (grub_video_bitmap_get_width (self->bitmap) == width)
+      && (grub_video_bitmap_get_height (self->bitmap) == height))
+    {
+      /* Nothing to do; already the right size.  */
+      return grub_errno;
+    }
+
+  /* Free any old scaled bitmap,
+     *unless* it's a reference to the raw bitmap.  */
+  if (self->bitmap && (self->bitmap != self->raw_bitmap))
+    grub_video_bitmap_destroy (self->bitmap);
+
+  self->bitmap = 0;
+
+  /* Create a scaled bitmap, unless the requested size is the same
+     as the raw size -- in that case a reference is made.  */
+  if (grub_video_bitmap_get_width (self->raw_bitmap) == width
+      && grub_video_bitmap_get_height (self->raw_bitmap) == height)
+    {
+      self->bitmap = self->raw_bitmap;
+      return grub_errno;
+    }
+
+  /* Don't scale to an invalid size.  */
+  if (width == 0 || height == 0)
+    return grub_errno;
+
+  /* Create the scaled bitmap.  */
+  grub_video_bitmap_create_scaled (&self->bitmap,
+                                   width,
+                                   height,
+                                   self->raw_bitmap,
+                                   GRUB_VIDEO_BITMAP_SCALE_METHOD_BEST);
+  if (grub_errno != GRUB_ERR_NONE)
+    {
+      grub_error_push ();
+      grub_error (grub_errno, "failed to scale bitmap for image component");
+    }
+  return grub_errno;
+}
+
+static void
+image_set_bounds (void *vself, const grub_video_rect_t *bounds)
+{
+  grub_gui_image_t self = vself;
+  self->bounds = *bounds;
+  rescale_image (self);
+}
+
+static void
+image_get_bounds (void *vself, grub_video_rect_t *bounds)
+{
+  grub_gui_image_t self = vself;
+  *bounds = self->bounds;
+}
+
+static void
+image_get_preferred_size (void *vself, int *width, int *height)
+{
+  grub_gui_image_t self = vself;
+
+  if (self->raw_bitmap)
+    {
+      *width = grub_video_bitmap_get_width (self->raw_bitmap);
+      *height = grub_video_bitmap_get_height (self->raw_bitmap);
+    }
+  else
+    {
+      *width = 0;
+      *height = 0;
+    }
+
+  /* Allow preferred dimensions to override the image dimensions.  */
+  if (self->preferred_width >= 0)
+    *width = self->preferred_width;
+  if (self->preferred_height >= 0)
+    *height = self->preferred_height;
+}
+
+static grub_err_t
+load_image (grub_gui_image_t self, const char *path)
+{
+  struct grub_video_bitmap *bitmap;
+  if (grub_video_bitmap_load (&bitmap, path) != GRUB_ERR_NONE)
+    return grub_errno;
+
+  if (self->bitmap && (self->bitmap != self->raw_bitmap))
+    grub_video_bitmap_destroy (self->bitmap);
+  if (self->raw_bitmap)
+    grub_video_bitmap_destroy (self->raw_bitmap);
+
+  self->raw_bitmap = bitmap;
+  return rescale_image (self);
+}
+
+static grub_err_t
+image_set_property (void *vself, const char *name, const char *value)
+{
+  grub_gui_image_t self = vself;
+  if (grub_strcmp (name, "file") == 0)
+    return load_image (self, value);
+  else if (grub_strcmp (name, "preferred_size") == 0)
+    {
+      int w;
+      int h;
+      if (grub_gui_parse_2_tuple (value, &w, &h) != GRUB_ERR_NONE)
+        return grub_errno;
+      self->preferred_width = w;
+      self->preferred_height = h;
+    }
+  else if (grub_strcmp (name, "id") == 0)
+    {
+      grub_free (self->id);
+      if (value)
+        self->id = grub_strdup (value);
+      else
+        self->id = 0;
+    }
+  return grub_errno;
+}
+
+static struct grub_gui_component_ops image_ops =
+{
+  .destroy = image_destroy,
+  .get_id = image_get_id,
+  .is_instance = image_is_instance,
+  .paint = image_paint,
+  .set_parent = image_set_parent,
+  .get_parent = image_get_parent,
+  .set_bounds = image_set_bounds,
+  .get_bounds = image_get_bounds,
+  .get_preferred_size = image_get_preferred_size,
+  .set_property = image_set_property
+};
+
+grub_gui_component_t
+grub_gui_image_new (void)
+{
+  grub_gui_image_t image;
+  image = grub_malloc (sizeof (*image));
+  if (! image)
+    return 0;
+  image->image = &image_ops;
+  image->parent = 0;
+  image->bounds.x = 0;
+  image->bounds.y = 0;
+  image->bounds.width = 0;
+  image->bounds.height = 0;
+  image->id = 0;
+  image->preferred_width = -1;
+  image->preferred_height = -1;
+  image->raw_bitmap = 0;
+  image->bitmap = 0;
+  return (grub_gui_component_t) image;
+}
+
diff --git a/gfxmenu/gui_label.c b/gfxmenu/gui_label.c
new file mode 100644
index 000000000..2e49c787e
--- /dev/null
+++ b/gfxmenu/gui_label.c
@@ -0,0 +1,248 @@
+/* gui_label.c - GUI component to display a line of text.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/mm.h>
+#include <grub/misc.h>
+#include <grub/gui.h>
+#include <grub/font.h>
+#include <grub/gui_string_util.h>
+
+static const char *align_options[] =
+{
+  "left",
+  "center",
+  "right",
+  0
+};
+
+enum align_mode {
+  align_left,
+  align_center,
+  align_right
+};
+
+struct grub_gui_label
+{
+  struct grub_gui_component_ops *label;
+
+  grub_gui_container_t parent;
+  grub_video_rect_t bounds;
+  char *id;
+  int preferred_width;
+  int preferred_height;
+  int visible;
+  char *text;
+  grub_font_t font;
+  grub_gui_color_t color;
+  enum align_mode align;
+};
+
+typedef struct grub_gui_label *grub_gui_label_t;
+
+static void
+label_destroy (void *vself)
+{
+  grub_gui_label_t self = vself;
+  grub_free (self->text);
+  grub_free (self);
+}
+
+static const char *
+label_get_id (void *vself)
+{
+  grub_gui_label_t self = vself;
+  return self->id;
+}
+
+static int
+label_is_instance (void *vself __attribute__((unused)), const char *type)
+{
+  return grub_strcmp (type, "component") == 0;
+}
+
+static void
+label_paint (void *vself)
+{
+  grub_gui_label_t self = vself;
+
+  if (! self->visible)
+    return;
+
+  /* Calculate the starting x coordinate.  */
+  int left_x;
+  if (self->align == align_left)
+    left_x = 0;
+  else if (self->align == align_center)
+    left_x = ((self->bounds.width
+               - grub_font_get_string_width (self->font, self->text))
+             ) / 2;
+  else if (self->align == align_right)
+    left_x = (self->bounds.width
+              - grub_font_get_string_width (self->font, self->text));
+  else
+    return;   /* Invalid alignment.  */
+
+  grub_video_rect_t vpsave;
+  grub_gui_set_viewport (&self->bounds, &vpsave);
+  grub_font_draw_string (self->text,
+                         self->font,
+                         grub_gui_map_color (self->color),
+                         left_x,
+                         grub_font_get_ascent (self->font));
+  grub_gui_restore_viewport (&vpsave);
+}
+
+static void
+label_set_parent (void *vself, grub_gui_container_t parent)
+{
+  grub_gui_label_t self = vself;
+  self->parent = parent;
+}
+
+static grub_gui_container_t
+label_get_parent (void *vself)
+{
+  grub_gui_label_t self = vself;
+  return self->parent;
+}
+
+static void
+label_set_bounds (void *vself, const grub_video_rect_t *bounds)
+{
+  grub_gui_label_t self = vself;
+  self->bounds = *bounds;
+}
+
+static void
+label_get_bounds (void *vself, grub_video_rect_t *bounds)
+{
+  grub_gui_label_t self = vself;
+  *bounds = self->bounds;
+}
+
+static void
+label_get_preferred_size (void *vself, int *width, int *height)
+{
+  grub_gui_label_t self = vself;
+  *width = grub_font_get_string_width (self->font, self->text);
+  *height = (grub_font_get_ascent (self->font)
+             + grub_font_get_descent (self->font));
+
+  /* Allow preferred dimensions to override the computed dimensions.  */
+  if (self->preferred_width >= 0)
+    *width = self->preferred_width;
+  if (self->preferred_height >= 0)
+    *height = self->preferred_height;
+}
+
+static void
+label_set_property (void *vself, const char *name, const char *value)
+{
+  grub_gui_label_t self = vself;
+  if (grub_strcmp (name, "text") == 0)
+    {
+      grub_free (self->text);
+      if (! value)
+        value = "";
+      self->text = grub_strdup (value);
+    }
+  else if (grub_strcmp (name, "font") == 0)
+    {
+      self->font = grub_font_get (value);
+    }
+  else if (grub_strcmp (name, "color") == 0)
+    {
+      grub_gui_parse_color (value, &self->color);
+    }
+  else if (grub_strcmp (name, "align") == 0)
+    {
+      int i;
+      for (i = 0; align_options[i]; i++)
+        {
+          if (grub_strcmp (align_options[i], value) == 0)
+            {
+              self->align = i;   /* Set the alignment mode.  */
+              break;
+            }
+        }
+    }
+  else if (grub_strcmp (name, "visible") == 0)
+    {
+      self->visible = grub_strcmp (value, "false") != 0;
+    }
+  else if (grub_strcmp (name, "preferred_size") == 0)
+    {
+      int w;
+      int h;
+      if (grub_gui_parse_2_tuple (value, &w, &h) == GRUB_ERR_NONE)
+        {
+          self->preferred_width = w;
+          self->preferred_height = h;
+        }
+    }
+  else if (grub_strcmp (name, "id") == 0)
+    {
+      grub_free (self->id);
+      if (value)
+        self->id = grub_strdup (value);
+      else
+        self->id = 0;
+    }
+}
+
+static struct grub_gui_component_ops label_ops =
+{
+  .destroy = label_destroy,
+  .get_id = label_get_id,
+  .is_instance = label_is_instance,
+  .paint = label_paint,
+  .set_parent = label_set_parent,
+  .get_parent = label_get_parent,
+  .set_bounds = label_set_bounds,
+  .get_bounds = label_get_bounds,
+  .get_preferred_size = label_get_preferred_size,
+  .set_property = label_set_property
+};
+
+grub_gui_component_t
+grub_gui_label_new (void)
+{
+  grub_gui_label_t label;
+  label = grub_malloc (sizeof (*label));
+  if (! label)
+    return 0;
+  label->label = &label_ops;
+  label->parent = 0;
+  label->bounds.x = 0;
+  label->bounds.y = 0;
+  label->bounds.width = 0;
+  label->bounds.height = 0;
+  label->id = 0;
+  label->preferred_width = -1;
+  label->preferred_height = -1;
+  label->visible = 1;
+  label->text = grub_strdup ("");
+  label->font = grub_font_get ("Helvetica 10");
+  label->color.red = 0;
+  label->color.green = 0;
+  label->color.blue = 0;
+  label->color.alpha = 255;
+  label->align = align_left;
+  return (grub_gui_component_t) label;
+}
diff --git a/gfxmenu/gui_list.c b/gfxmenu/gui_list.c
new file mode 100644
index 000000000..aa9655b45
--- /dev/null
+++ b/gfxmenu/gui_list.c
@@ -0,0 +1,625 @@
+/* gui_list.c - GUI component to display a selectable list of items.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/mm.h>
+#include <grub/misc.h>
+#include <grub/gui.h>
+#include <grub/gui_string_util.h>
+#include <grub/gfxmenu_view.h>
+#include <grub/gfxwidgets.h>
+
+struct grub_gui_list_impl
+{
+  struct grub_gui_list_ops *list_ops;
+
+  grub_gui_container_t parent;
+  grub_video_rect_t bounds;
+  char *id;
+  int preferred_width;
+  int preferred_height;
+  int visible;
+
+  int icon_width;
+  int icon_height;
+  int item_height;
+  int item_padding;
+  int item_icon_space;
+  int item_spacing;
+  grub_font_t item_font;
+  grub_font_t selected_item_font;
+  grub_gui_color_t item_color;
+  int selected_item_color_set;
+  grub_gui_color_t selected_item_color;
+
+  int draw_scrollbar;
+  int need_to_recreate_scrollbar;
+  char *scrollbar_frame_pattern;
+  char *scrollbar_thumb_pattern;
+  grub_gfxmenu_box_t scrollbar_frame;
+  grub_gfxmenu_box_t scrollbar_thumb;
+  int scrollbar_width;
+
+  int min_items_shown;
+  int max_items_shown;
+  int first_shown_index;
+
+  int need_to_recreate_boxes;
+  char *theme_dir;
+  char *menu_box_pattern;
+  char *selected_item_box_pattern;
+  grub_gfxmenu_box_t menu_box;
+  grub_gfxmenu_box_t selected_item_box;
+
+  grub_gfxmenu_icon_manager_t icon_manager;
+  grub_gfxmenu_model_t menu;
+};
+
+typedef struct grub_gui_list_impl *list_impl_t;
+
+static void
+list_destroy (void *vself)
+{
+  list_impl_t self = vself;
+
+  grub_free (self->theme_dir);
+  grub_free (self->menu_box_pattern);
+  grub_free (self->selected_item_box_pattern);
+  if (self->menu_box)
+    self->menu_box->destroy (self->menu_box);
+  if (self->selected_item_box)
+    self->selected_item_box->destroy (self->selected_item_box);
+  if (self->icon_manager)
+    grub_gfxmenu_icon_manager_destroy (self->icon_manager);
+
+  grub_free (self);
+}
+
+static int
+get_num_shown_items (list_impl_t self)
+{
+  int n = grub_gfxmenu_model_get_num_entries (self->menu);
+  if (self->min_items_shown != -1 && n < self->min_items_shown)
+    n = self->min_items_shown;
+  if (self->max_items_shown != -1 && n > self->max_items_shown)
+    n = self->max_items_shown;
+  return n;
+}
+
+static int
+check_boxes (list_impl_t self)
+{
+  if (self->need_to_recreate_boxes)
+    {
+      grub_gui_recreate_box (&self->menu_box,
+                             self->menu_box_pattern,
+                             self->theme_dir);
+
+      grub_gui_recreate_box (&self->selected_item_box,
+                             self->selected_item_box_pattern,
+                             self->theme_dir);
+
+      self->need_to_recreate_boxes = 0;
+    }
+
+  return (self->menu_box != 0 && self->selected_item_box != 0);
+}
+
+static int
+check_scrollbar (list_impl_t self)
+{
+  if (self->need_to_recreate_scrollbar)
+    {
+      grub_gui_recreate_box (&self->scrollbar_frame,
+                             self->scrollbar_frame_pattern,
+                             self->theme_dir);
+
+      grub_gui_recreate_box (&self->scrollbar_thumb,
+                             self->scrollbar_thumb_pattern,
+                             self->theme_dir);
+
+      self->need_to_recreate_scrollbar = 0;
+    }
+
+  return (self->scrollbar_frame != 0 && self->scrollbar_thumb != 0);
+}
+
+static const char *
+list_get_id (void *vself)
+{
+  list_impl_t self = vself;
+  return self->id;
+}
+
+static int
+list_is_instance (void *vself __attribute__((unused)), const char *type)
+{
+  return (grub_strcmp (type, "component") == 0
+          || grub_strcmp (type, "list") == 0);
+}
+
+static struct grub_video_bitmap *
+get_item_icon (list_impl_t self, int item_index)
+{
+  grub_menu_entry_t entry;
+  entry = grub_gfxmenu_model_get_entry (self->menu, item_index);
+  if (! entry)
+    return 0;
+
+  return grub_gfxmenu_icon_manager_get_icon (self->icon_manager, entry);
+}
+
+static void
+make_selected_item_visible (list_impl_t self)
+{
+  int selected_index = grub_gfxmenu_model_get_selected_index (self->menu);
+  if (selected_index < 0)
+    return;   /* No item is selected.  */
+  int num_shown_items = get_num_shown_items (self);
+  int last_shown_index = self->first_shown_index + (num_shown_items - 1);
+  if (selected_index < self->first_shown_index)
+    self->first_shown_index = selected_index;
+  else if (selected_index > last_shown_index)
+    self->first_shown_index = selected_index - (num_shown_items - 1);
+}
+
+/* Draw a scrollbar on the menu.  */
+static void
+draw_scrollbar (list_impl_t self,
+                int value, int extent, int min, int max,
+                int rightx, int topy, int height)
+{
+  grub_gfxmenu_box_t frame = self->scrollbar_frame;
+  grub_gfxmenu_box_t thumb = self->scrollbar_thumb;
+  int frame_vertical_pad = (frame->get_top_pad (frame)
+                            + frame->get_bottom_pad (frame));
+  int frame_horizontal_pad = (frame->get_left_pad (frame)
+                              + frame->get_right_pad (frame));
+  int tracktop = topy + frame->get_top_pad (frame);
+  int tracklen = height - frame_vertical_pad;
+  frame->set_content_size (frame, self->scrollbar_width, tracklen);
+  int thumby = tracktop + tracklen * (value - min) / (max - min);
+  int thumbheight = tracklen * extent / (max - min) + 1;
+  thumb->set_content_size (thumb,
+                           self->scrollbar_width - frame_horizontal_pad,
+                           thumbheight - (thumb->get_top_pad (thumb)
+                                          + thumb->get_bottom_pad (thumb)));
+  frame->draw (frame,
+               rightx - (self->scrollbar_width + frame_horizontal_pad),
+               topy);
+  thumb->draw (thumb,
+               rightx - (self->scrollbar_width - frame->get_right_pad (frame)),
+               thumby);
+}
+
+/* Draw the list of items.  */
+static void
+draw_menu (list_impl_t self)
+{
+  if (! self->menu_box || ! self->selected_item_box)
+    return;
+
+  int boxpad = self->item_padding;
+  int icon_text_space = self->item_icon_space;
+  int item_vspace = self->item_spacing;
+
+  int ascent = grub_font_get_ascent (self->item_font);
+  int descent = grub_font_get_descent (self->item_font);
+  int item_height = self->item_height;
+
+  int total_num_items = grub_gfxmenu_model_get_num_entries (self->menu);
+  int num_shown_items = get_num_shown_items (self);
+  grub_gfxmenu_box_t box = self->menu_box;
+  int width = self->bounds.width;
+  int height = self->bounds.height;
+
+  int box_left_pad = box->get_left_pad (box);
+  int box_top_pad = box->get_top_pad (box);
+  int box_right_pad = box->get_right_pad (box);
+  int box_bottom_pad = box->get_bottom_pad (box);
+
+  box->set_content_size (box,
+                         width - box_left_pad - box_right_pad,
+                         height - box_top_pad - box_bottom_pad);
+
+  box->draw (box, 0, 0);
+
+  make_selected_item_visible (self);
+
+  int drawing_scrollbar = (self->draw_scrollbar
+                           && (num_shown_items < total_num_items)
+                           && check_scrollbar (self));
+
+  int scrollbar_h_space = drawing_scrollbar ? self->scrollbar_width : 0;
+
+  int item_top = box_top_pad + boxpad;
+  int item_left = box_left_pad + boxpad;
+  int menu_index;
+  int visible_index;
+
+  for (visible_index = 0, menu_index = self->first_shown_index;
+       visible_index < num_shown_items && menu_index < total_num_items;
+       visible_index++, menu_index++)
+    {
+      int is_selected =
+        (menu_index == grub_gfxmenu_model_get_selected_index (self->menu));
+
+      if (is_selected)
+        {
+          grub_gfxmenu_box_t selbox = self->selected_item_box;
+          int sel_leftpad = selbox->get_left_pad (selbox);
+          int sel_toppad = selbox->get_top_pad (selbox);
+          selbox->set_content_size (selbox,
+                                    (width - 2 * boxpad
+                                     - box_left_pad - box_right_pad
+                                     - scrollbar_h_space),
+                                    item_height);
+          selbox->draw (selbox,
+                        item_left - sel_leftpad,
+                        item_top - sel_toppad);
+        }
+
+      struct grub_video_bitmap *icon;
+      if ((icon = get_item_icon (self, menu_index)) != 0)
+        grub_video_blit_bitmap (icon, GRUB_VIDEO_BLIT_BLEND,
+                                item_left,
+                                item_top + (item_height - self->icon_height) / 2,
+                                0, 0, self->icon_width, self->icon_height);
+
+      const char *item_title =
+        grub_gfxmenu_model_get_entry_title (self->menu, menu_index);
+      grub_font_t font =
+        (is_selected && self->selected_item_font
+         ? self->selected_item_font
+         : self->item_font);
+      grub_gui_color_t text_color =
+        ((is_selected && self->selected_item_color_set)
+         ? self->selected_item_color
+         : self->item_color);
+      grub_font_draw_string (item_title,
+                             font,
+                             grub_gui_map_color (text_color),
+                             item_left + self->icon_width + icon_text_space,
+                             (item_top + (item_height - (ascent + descent))
+                              / 2 + ascent));
+
+      item_top += item_height + item_vspace;
+    }
+
+  if (drawing_scrollbar)
+    draw_scrollbar (self,
+                    self->first_shown_index, num_shown_items,
+                    0, total_num_items,
+                    width - box_right_pad + self->scrollbar_width,
+                    box_top_pad + boxpad,
+                    height - box_top_pad - box_bottom_pad);
+}
+
+static void
+list_paint (void *vself)
+{
+  list_impl_t self = vself;
+
+  if (! self->visible)
+    return;
+
+  check_boxes (self);
+
+  grub_video_rect_t vpsave;
+  grub_gui_set_viewport (&self->bounds, &vpsave);
+  draw_menu (self);
+  grub_gui_restore_viewport (&vpsave);
+}
+
+static void
+list_set_parent (void *vself, grub_gui_container_t parent)
+{
+  list_impl_t self = vself;
+  self->parent = parent;
+}
+
+static grub_gui_container_t
+list_get_parent (void *vself)
+{
+  list_impl_t self = vself;
+  return self->parent;
+}
+
+static void
+list_set_bounds (void *vself, const grub_video_rect_t *bounds)
+{
+  list_impl_t self = vself;
+  self->bounds = *bounds;
+}
+
+static void
+list_get_bounds (void *vself, grub_video_rect_t *bounds)
+{
+  list_impl_t self = vself;
+  *bounds = self->bounds;
+}
+
+static void
+list_get_preferred_size (void *vself, int *width, int *height)
+{
+  list_impl_t self = vself;
+
+  if (check_boxes (self))
+    {
+      int boxpad = self->item_padding;
+      int item_vspace = self->item_spacing;
+      int item_height = self->item_height;
+      int num_items = get_num_shown_items (self);
+
+      grub_gfxmenu_box_t box = self->menu_box;
+      int box_left_pad = box->get_left_pad (box);
+      int box_top_pad = box->get_top_pad (box);
+      int box_right_pad = box->get_right_pad (box);
+      int box_bottom_pad = box->get_bottom_pad (box);
+
+      *width = 400 + 2 * boxpad + box_left_pad + box_right_pad;
+
+      /* Set the menu box height to fit the items.  */
+      *height = (item_height * num_items
+                 + item_vspace * (num_items - 1)
+                 + 2 * boxpad
+                 + box_top_pad + box_bottom_pad);
+    }
+  else
+    {
+      *width = 0;
+      *height = 0;
+    }
+
+  /* Allow preferred dimensions to override the computed dimensions.  */
+  if (self->preferred_width >= 0)
+    *width = self->preferred_width;
+  if (self->preferred_height >= 0)
+    *height = self->preferred_height;
+}
+
+static grub_err_t
+list_set_property (void *vself, const char *name, const char *value)
+{
+  list_impl_t self = vself;
+  if (grub_strcmp (name, "item_font") == 0)
+    {
+      self->item_font = grub_font_get (value);
+    }
+  else if (grub_strcmp (name, "selected_item_font") == 0)
+    {
+      if (! value || grub_strcmp (value, "inherit") == 0)
+        self->selected_item_font = 0;
+      else
+        self->selected_item_font = grub_font_get (value);
+    }
+  else if (grub_strcmp (name, "item_color") == 0)
+    {
+      grub_gui_parse_color (value, &self->item_color);
+    }
+  else if (grub_strcmp (name, "selected_item_color") == 0)
+    {
+      if (! value || grub_strcmp (value, "inherit") == 0)
+        {
+          self->selected_item_color_set = 0;
+        }
+      else
+        {
+          if (grub_gui_parse_color (value, &self->selected_item_color)
+              == GRUB_ERR_NONE)
+            self->selected_item_color_set = 1;
+        }
+    }
+  else if (grub_strcmp (name, "icon_width") == 0)
+    {
+      self->icon_width = grub_strtol (value, 0, 10);
+      grub_gfxmenu_icon_manager_set_icon_size (self->icon_manager,
+                                               self->icon_width,
+                                               self->icon_height);
+    }
+  else if (grub_strcmp (name, "icon_height") == 0)
+    {
+      self->icon_height = grub_strtol (value, 0, 10);
+      grub_gfxmenu_icon_manager_set_icon_size (self->icon_manager,
+                                               self->icon_width,
+                                               self->icon_height);
+    }
+  else if (grub_strcmp (name, "item_height") == 0)
+    {
+      self->item_height = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "item_padding") == 0)
+    {
+      self->item_padding = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "item_icon_space") == 0)
+    {
+      self->item_icon_space = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "item_spacing") == 0)
+    {
+      self->item_spacing = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "visible") == 0)
+    {
+      self->visible = grub_strcmp (value, "false") != 0;
+    }
+  else if (grub_strcmp (name, "menu_pixmap_style") == 0)
+    {
+      self->need_to_recreate_boxes = 1;
+      grub_free (self->menu_box_pattern);
+      self->menu_box_pattern = value ? grub_strdup (value) : 0;
+    }
+  else if (grub_strcmp (name, "selected_item_pixmap_style") == 0)
+    {
+      self->need_to_recreate_boxes = 1;
+      grub_free (self->selected_item_box_pattern);
+      self->selected_item_box_pattern = value ? grub_strdup (value) : 0;
+    }
+  else if (grub_strcmp (name, "scrollbar_frame") == 0)
+    {
+      self->need_to_recreate_scrollbar = 1;
+      grub_free (self->scrollbar_frame_pattern);
+      self->scrollbar_frame_pattern = value ? grub_strdup (value) : 0;
+    }
+  else if (grub_strcmp (name, "scrollbar_thumb") == 0)
+    {
+      self->need_to_recreate_scrollbar = 1;
+      grub_free (self->scrollbar_thumb_pattern);
+      self->scrollbar_thumb_pattern = value ? grub_strdup (value) : 0;
+    }
+  else if (grub_strcmp (name, "scrollbar_width") == 0)
+    {
+      self->scrollbar_width = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "scrollbar") == 0)
+    {
+      self->draw_scrollbar = grub_strcmp (value, "false") != 0;
+    }
+  else if (grub_strcmp (name, "min_items_shown") == 0)
+    {
+      self->min_items_shown = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "max_items_shown") == 0)
+    {
+      self->max_items_shown = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "theme_dir") == 0)
+    {
+      self->need_to_recreate_boxes = 1;
+      grub_free (self->theme_dir);
+      self->theme_dir = value ? grub_strdup (value) : 0;
+    }
+  else if (grub_strcmp (name, "preferred_size") == 0)
+    {
+      int w;
+      int h;
+      if (grub_gui_parse_2_tuple (value, &w, &h) != GRUB_ERR_NONE)
+        return grub_errno;
+      self->preferred_width = w;
+      self->preferred_height = h;
+    }
+  else if (grub_strcmp (name, "id") == 0)
+    {
+      grub_free (self->id);
+      if (value)
+        self->id = grub_strdup (value);
+      else
+        self->id = 0;
+    }
+  return grub_errno;
+}
+
+/* Set necessary information that the gfxmenu view provides.  */
+static void
+list_set_view_info (void *vself,
+                    const char *theme_path,
+                    grub_gfxmenu_model_t menu)
+{
+  list_impl_t self = vself;
+  grub_gfxmenu_icon_manager_set_theme_path (self->icon_manager, theme_path);
+  self->menu = menu;
+}
+
+static struct grub_gui_list_ops list_ops =
+{
+  .component_ops =
+    {
+      .destroy = list_destroy,
+      .get_id = list_get_id,
+      .is_instance = list_is_instance,
+      .paint = list_paint,
+      .set_parent = list_set_parent,
+      .get_parent = list_get_parent,
+      .set_bounds = list_set_bounds,
+      .get_bounds = list_get_bounds,
+      .get_preferred_size = list_get_preferred_size,
+      .set_property = list_set_property
+    },
+  .set_view_info = list_set_view_info
+};
+
+grub_gui_component_t
+grub_gui_list_new (void)
+{
+  list_impl_t self;
+  grub_font_t default_font;
+  grub_gui_color_t default_fg_color;
+  grub_gui_color_t default_bg_color;
+
+  self = grub_malloc (sizeof (*self));
+  if (! self)
+    return 0;
+
+  self->list_ops = &list_ops;
+  self->parent = 0;
+  self->bounds.x = 0;
+  self->bounds.y = 0;
+  self->bounds.width = 0;
+  self->bounds.height = 0;
+  self->id = 0;
+  self->preferred_width = -1;
+  self->preferred_height = -1;
+  self->visible = 1;
+
+  default_font = grub_font_get ("Helvetica 12");
+  default_fg_color = grub_gui_color_rgb (0, 0, 0);
+  default_bg_color = grub_gui_color_rgb (255, 255, 255);
+
+  self->icon_width = 32;
+  self->icon_height = 32;
+  self->item_height = 42;
+  self->item_padding = 14;
+  self->item_icon_space = 4;
+  self->item_spacing = 16;
+  self->item_font = default_font;
+  self->selected_item_font = 0;    /* Default to using the item_font.  */
+  self->item_color = default_fg_color;
+  self->selected_item_color_set = 0;  /* Default to using the item_color.  */
+  self->selected_item_color = default_fg_color;
+
+  self->draw_scrollbar = 1;
+  self->need_to_recreate_scrollbar = 1;
+  self->scrollbar_frame = 0;
+  self->scrollbar_thumb = 0;
+  self->scrollbar_frame_pattern = 0;
+  self->scrollbar_thumb_pattern = 0;
+  self->scrollbar_width = 16;
+
+  self->min_items_shown = -1;
+  self->max_items_shown = -1;
+  self->first_shown_index = 0;
+
+  self->need_to_recreate_boxes = 0;
+  self->theme_dir = 0;
+  self->menu_box_pattern = 0;
+  self->selected_item_box_pattern = 0;
+  self->menu_box = grub_gfxmenu_create_box (0, 0);
+  self->selected_item_box = grub_gfxmenu_create_box (0, 0);
+
+  self->icon_manager = grub_gfxmenu_icon_manager_new ();
+  if (! self->icon_manager)
+    {
+      self->list_ops->component_ops.destroy (self);
+      return 0;
+    }
+  grub_gfxmenu_icon_manager_set_icon_size (self->icon_manager,
+                                           self->icon_width,
+                                           self->icon_height);
+  return (grub_gui_component_t) self;
+}
diff --git a/gfxmenu/gui_progress_bar.c b/gfxmenu/gui_progress_bar.c
new file mode 100644
index 000000000..440d4b2fc
--- /dev/null
+++ b/gfxmenu/gui_progress_bar.c
@@ -0,0 +1,378 @@
+/* gui_progress_bar.c - GUI progress bar component.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/mm.h>
+#include <grub/misc.h>
+#include <grub/gui.h>
+#include <grub/font.h>
+#include <grub/gui_string_util.h>
+#include <grub/gfxmenu_view.h>
+#include <grub/gfxwidgets.h>
+
+struct grub_gui_progress_bar
+{
+  struct grub_gui_component_ops *progress_bar;
+
+  grub_gui_container_t parent;
+  grub_video_rect_t bounds;
+  char *id;
+  int preferred_width;
+  int preferred_height;
+  int visible;
+  int start;
+  int end;
+  int value;
+  int show_text;
+  char *text;
+  grub_font_t font;
+  grub_gui_color_t text_color;
+  grub_gui_color_t border_color;
+  grub_gui_color_t bg_color;
+  grub_gui_color_t fg_color;
+
+  char *theme_dir;
+  int need_to_recreate_pixmaps;
+  char *bar_pattern;
+  char *highlight_pattern;
+  grub_gfxmenu_box_t bar_box;
+  grub_gfxmenu_box_t highlight_box;
+};
+
+typedef struct grub_gui_progress_bar *grub_gui_progress_bar_t;
+
+static void
+progress_bar_destroy (void *vself)
+{
+  grub_gui_progress_bar_t self = vself;
+  grub_free (self);
+}
+
+static const char *
+progress_bar_get_id (void *vself)
+{
+  grub_gui_progress_bar_t self = vself;
+  return self->id;
+}
+
+static int
+progress_bar_is_instance (void *vself __attribute__((unused)), const char *type)
+{
+  return grub_strcmp (type, "component") == 0;
+}
+
+static int
+check_pixmaps (grub_gui_progress_bar_t self)
+{
+  if (self->need_to_recreate_pixmaps)
+    {
+      grub_gui_recreate_box (&self->bar_box,
+                             self->bar_pattern,
+                             self->theme_dir);
+
+      grub_gui_recreate_box (&self->highlight_box,
+                             self->highlight_pattern,
+                             self->theme_dir);
+
+      self->need_to_recreate_pixmaps = 0;
+    }
+
+  return (self->bar_box != 0 && self->highlight_box != 0);
+}
+
+static void
+draw_filled_rect_bar (grub_gui_progress_bar_t self)
+{
+  /* Set the progress bar's frame.  */
+  grub_video_rect_t f;
+  f.x = 1;
+  f.y = 1;
+  f.width = self->bounds.width - 2;
+  f.height = self->bounds.height - 2;
+
+  /* Border.  */
+  grub_video_fill_rect (grub_gui_map_color (self->border_color),
+                        f.x - 1, f.y - 1,
+                        f.width + 2, f.height + 2);
+
+  /* Bar background.  */
+  int barwidth = (f.width
+                  * (self->value - self->start)
+                  / (self->end - self->start));
+  grub_video_fill_rect (grub_gui_map_color (self->bg_color),
+                        f.x + barwidth, f.y,
+                        f.width - barwidth, f.height);
+
+  /* Bar foreground.  */
+  grub_video_fill_rect (grub_gui_map_color (self->fg_color),
+                        f.x, f.y,
+                        barwidth, f.height);
+}
+
+static void
+draw_pixmap_bar (grub_gui_progress_bar_t self)
+{
+  grub_gfxmenu_box_t bar = self->bar_box;
+  grub_gfxmenu_box_t hl = self->highlight_box;
+  int w = self->bounds.width;
+  int h = self->bounds.height;
+  int bar_l_pad = bar->get_left_pad (bar);
+  int bar_r_pad = bar->get_right_pad (bar);
+  int bar_t_pad = bar->get_top_pad (bar);
+  int bar_b_pad = bar->get_bottom_pad (bar);
+  int bar_h_pad = bar_l_pad + bar_r_pad;
+  int bar_v_pad = bar_t_pad + bar_b_pad;
+  int tracklen = w - bar_h_pad;
+  int trackheight = h - bar_v_pad;
+  bar->set_content_size (bar, tracklen, trackheight);
+
+  int barwidth = (tracklen
+                  * (self->value - self->start)
+                  / (self->end - self->start));
+  hl->set_content_size (hl, barwidth, h - bar_v_pad);
+
+  bar->draw (bar, 0, 0);
+  hl->draw (hl, bar_l_pad, bar_t_pad);
+}
+
+static void
+draw_text (grub_gui_progress_bar_t self)
+{
+  const char *text = self->text;
+  if (text && self->show_text)
+    {
+      grub_font_t font = self->font;
+      grub_video_color_t text_color = grub_gui_map_color (self->text_color);
+      int width = self->bounds.width;
+      int height = self->bounds.height;
+
+      /* Center the text. */
+      int text_width = grub_font_get_string_width (font, text);
+      int x = (width - text_width) / 2;
+      int y = ((height - grub_font_get_descent (font)) / 2
+               + grub_font_get_ascent (font) / 2);
+      grub_font_draw_string (text, font, text_color, x, y);
+    }
+}
+
+static void
+progress_bar_paint (void *vself)
+{
+  grub_gui_progress_bar_t self = vself;
+  if (! self->visible)
+    return;
+
+  grub_video_rect_t vpsave;
+  grub_gui_set_viewport (&self->bounds, &vpsave);
+
+  if (check_pixmaps (self))
+    draw_pixmap_bar (self);
+  else
+    draw_filled_rect_bar (self);
+
+  draw_text (self);
+
+  grub_gui_restore_viewport (&vpsave);
+}
+
+static void
+progress_bar_set_parent (void *vself, grub_gui_container_t parent)
+{
+  grub_gui_progress_bar_t self = vself;
+  self->parent = parent;
+}
+
+static grub_gui_container_t
+progress_bar_get_parent (void *vself)
+{
+  grub_gui_progress_bar_t self = vself;
+  return self->parent;
+}
+
+static void
+progress_bar_set_bounds (void *vself, const grub_video_rect_t *bounds)
+{
+  grub_gui_progress_bar_t self = vself;
+  self->bounds = *bounds;
+}
+
+static void
+progress_bar_get_bounds (void *vself, grub_video_rect_t *bounds)
+{
+  grub_gui_progress_bar_t self = vself;
+  *bounds = self->bounds;
+}
+
+static void
+progress_bar_get_preferred_size (void *vself, int *width, int *height)
+{
+  grub_gui_progress_bar_t self = vself;
+
+  *width = 200;
+  *height = 28;
+
+  /* Allow preferred dimensions to override the progress_bar dimensions.  */
+  if (self->preferred_width >= 0)
+    *width = self->preferred_width;
+  if (self->preferred_height >= 0)
+    *height = self->preferred_height;
+}
+
+static grub_err_t
+progress_bar_set_property (void *vself, const char *name, const char *value)
+{
+  grub_gui_progress_bar_t self = vself;
+  if (grub_strcmp (name, "value") == 0)
+    {
+      self->value = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "start") == 0)
+    {
+      self->start = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "end") == 0)
+    {
+      self->end = grub_strtol (value, 0, 10);
+    }
+  else if (grub_strcmp (name, "text") == 0)
+    {
+      grub_free (self->text);
+      if (! value)
+        value = "";
+      self->text = grub_strdup (value);
+    }
+  else if (grub_strcmp (name, "font") == 0)
+    {
+      self->font = grub_font_get (value);
+    }
+  else if (grub_strcmp (name, "text_color") == 0)
+    {
+      grub_gui_parse_color (value, &self->text_color);
+    }
+  else if (grub_strcmp (name, "border_color") == 0)
+    {
+       grub_gui_parse_color (value, &self->border_color);
+    }
+  else if (grub_strcmp (name, "bg_color") == 0)
+    {
+       grub_gui_parse_color (value, &self->bg_color);
+    }
+  else if (grub_strcmp (name, "fg_color") == 0)
+    {
+      grub_gui_parse_color (value, &self->fg_color);
+    }
+  else if (grub_strcmp (name, "bar_style") == 0)
+    {
+      self->need_to_recreate_pixmaps = 1;
+      grub_free (self->bar_pattern);
+      self->bar_pattern = value ? grub_strdup (value) : 0;
+    }
+  else if (grub_strcmp (name, "highlight_style") == 0)
+    {
+      self->need_to_recreate_pixmaps = 1;
+      grub_free (self->highlight_pattern);
+      self->highlight_pattern = value ? grub_strdup (value) : 0;
+    }
+  else if (grub_strcmp (name, "theme_dir") == 0)
+    {
+      self->need_to_recreate_pixmaps = 1;
+      grub_free (self->theme_dir);
+      self->theme_dir = value ? grub_strdup (value) : 0;
+    }
+  else if (grub_strcmp (name, "preferred_size") == 0)
+    {
+      int w;
+      int h;
+      if (grub_gui_parse_2_tuple (value, &w, &h) != GRUB_ERR_NONE)
+        return grub_errno;
+      self->preferred_width = w;
+      self->preferred_height = h;
+    }
+  else if (grub_strcmp (name, "visible") == 0)
+    {
+      self->visible = grub_strcmp (value, "false") != 0;
+    }
+  else if (grub_strcmp (name, "show_text") == 0)
+    {
+      self->show_text = grub_strcmp (value, "false") != 0;
+    }
+  else if (grub_strcmp (name, "id") == 0)
+    {
+      grub_free (self->id);
+      if (value)
+        self->id = grub_strdup (value);
+      else
+        self->id = 0;
+    }
+  return grub_errno;
+}
+
+static struct grub_gui_component_ops progress_bar_ops =
+{
+  .destroy = progress_bar_destroy,
+  .get_id = progress_bar_get_id,
+  .is_instance = progress_bar_is_instance,
+  .paint = progress_bar_paint,
+  .set_parent = progress_bar_set_parent,
+  .get_parent = progress_bar_get_parent,
+  .set_bounds = progress_bar_set_bounds,
+  .get_bounds = progress_bar_get_bounds,
+  .get_preferred_size = progress_bar_get_preferred_size,
+  .set_property = progress_bar_set_property
+};
+
+grub_gui_component_t
+grub_gui_progress_bar_new (void)
+{
+  grub_gui_progress_bar_t self;
+  self = grub_malloc (sizeof (*self));
+  if (! self)
+    return 0;
+  self->progress_bar = &progress_bar_ops;
+  self->parent = 0;
+  self->bounds.x = 0;
+  self->bounds.y = 0;
+  self->bounds.width = 0;
+  self->bounds.height = 0;
+  self->id = 0;
+  self->preferred_width = -1;
+  self->preferred_height = -1;
+  self->visible = 1;
+  self->start = 0;
+  self->end = 0;
+  self->value = 0;
+  self->show_text = 1;
+  self->text = grub_strdup ("");
+  self->font = grub_font_get ("Helvetica 10");
+  grub_gui_color_t black = { .red = 0, .green = 0, .blue = 0, .alpha = 255 };
+  grub_gui_color_t gray = { .red = 128, .green = 128, .blue = 128, .alpha = 255 };
+  grub_gui_color_t lightgray = { .red = 200, .green = 200, .blue = 200, .alpha = 255 };
+  self->text_color = black;
+  self->border_color = black;
+  self->bg_color = gray;
+  self->fg_color = lightgray;
+
+  self->theme_dir = 0;
+  self->need_to_recreate_pixmaps = 0;
+  self->bar_pattern = 0;
+  self->highlight_pattern = 0;
+  self->bar_box = 0;
+  self->highlight_box = 0;
+
+  return (grub_gui_component_t) self;
+}
diff --git a/gfxmenu/gui_string_util.c b/gfxmenu/gui_string_util.c
new file mode 100644
index 000000000..41170d724
--- /dev/null
+++ b/gfxmenu/gui_string_util.c
@@ -0,0 +1,358 @@
+/* gui_string_util.c - String utilities used by the GUI system.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/gui_string_util.h>
+#include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+
+/* Create a new NUL-terminated string on the heap as a substring of BUF.
+   The range of buf included is the half-open interval [START,END).
+   The index START is inclusive, END is exclusive.  */
+char *
+grub_new_substring (const char *buf,
+                    grub_size_t start, grub_size_t end)
+{
+  if (end < start)
+    return 0;
+  grub_size_t len = end - start;
+  char *s = grub_malloc (len + 1);
+  if (! s)
+    return 0;
+  grub_memcpy (s, buf + start, len);
+  s[len] = '\0';
+  return s;
+}
+
+/* Eliminate "." and ".." path elements from PATH.  A new heap-allocated
+   string is returned.  */
+static char *
+canonicalize_path (const char *path)
+{
+  int i;
+  const char *p;
+  char *newpath = 0;
+
+  /* Count the path components in path.  */
+  int components = 1;
+  for (p = path; *p; p++)
+    if (*p == '/')
+      components++;
+
+  char **path_array = grub_malloc (components * sizeof (*path_array));
+  if (! path_array)
+    return 0;
+
+  /* Initialize array elements to NULL pointers; in case once of the
+     allocations fails, the cleanup code can just call grub_free() for all
+     pointers in the array.  */
+  for (i = 0; i < components; i++)
+    path_array[i] = 0;
+
+  /* Parse the path into path_array.  */
+  p = path;
+  for (i = 0; i < components && p; i++)
+    {
+      /* Find the end of the path element.  */
+      const char *end = grub_strchr (p, '/');
+      if (!end)
+        end = p + grub_strlen (p);
+
+      /* Copy the element.  */
+      path_array[i] = grub_new_substring (p, 0, end - p);
+      if (! path_array[i])
+        goto cleanup;
+
+      /* Advance p to point to the start of the next element, or NULL.  */
+      if (*end)
+        p = end + 1;
+      else
+        p = 0;
+    }
+
+  /* Eliminate '.' and '..' elements from the path array.  */
+  int newpath_length = 0;
+  for (i = components - 1; i >= 0; --i)
+    {
+      if (! grub_strcmp (path_array[i], "."))
+        {
+          grub_free (path_array[i]);
+          path_array[i] = 0;
+        }
+      else if (! grub_strcmp (path_array[i], "..")
+               && i > 0)
+        {
+          /* Delete the '..' and the prior path element.  */
+          grub_free (path_array[i]);
+          path_array[i] = 0;
+          --i;
+          grub_free (path_array[i]);
+          path_array[i] = 0;
+        }
+      else
+        {
+          newpath_length += grub_strlen (path_array[i]) + 1;
+        }
+    }
+
+  /* Construct a new path string.  */
+  newpath = grub_malloc (newpath_length + 1);
+  if (! newpath)
+    goto cleanup;
+
+  newpath[0] = '\0';
+  char *newpath_end = newpath;
+  int first = 1;
+  for (i = 0; i < components; i++)
+    {
+      char *element = path_array[i];
+      if (element)
+        {
+          /* For all components but the first, prefix with a slash.  */
+          if (! first)
+            newpath_end = grub_stpcpy (newpath_end, "/");
+          newpath_end = grub_stpcpy (newpath_end, element);
+          first = 0;
+        }
+    }
+
+cleanup:
+  for (i = 0; i < components; i++)
+    grub_free (path_array[i]);
+  grub_free (path_array);
+
+  return newpath;
+}
+
+/* Return a new heap-allocated string representing to absolute path
+   to the file referred to by PATH.  If PATH is an absolute path, then
+   the returned path is a copy of PATH.  If PATH is a relative path, then
+   BASE is with PATH used to construct the absolute path.  */
+char *
+grub_resolve_relative_path (const char *base, const char *path)
+{
+  char *abspath;
+  char *canonpath;
+  char *p;
+
+  /* If PATH is an absolute path, then just use it as is.  */
+  if (path[0] == '/' || path[0] == '(')
+    return canonicalize_path (path);
+
+  abspath = grub_malloc (grub_strlen (base) + grub_strlen (path) + 1);
+  if (! abspath)
+    return 0;
+
+  /* Concatenate BASE and PATH.
+     Note that BASE is expected to have a trailing slash.  */
+  p = grub_stpcpy (abspath, base);
+  grub_stpcpy (p, path);
+
+  canonpath = canonicalize_path (abspath);
+  if (! canonpath)
+    return abspath;
+
+  grub_free (abspath);
+  return canonpath;
+}
+
+/* Get the path of the directory where the file at FILE_PATH is located.
+   FILE_PATH should refer to a file, not a directory.  The returned path
+   includes a trailing slash.
+   This does not handle GRUB "(hd0,0)" paths properly yet since it only
+   looks at slashes.  */
+char *
+grub_get_dirname (const char *file_path)
+{
+  int i;
+  int last_slash;
+
+  last_slash = -1;
+  for (i = grub_strlen (file_path) - 1; i >= 0; --i)
+    {
+      if (file_path[i] == '/')
+        {
+          last_slash = i;
+          break;
+        }
+    }
+  if (last_slash == -1)
+    return grub_strdup ("/");
+
+  return grub_new_substring (file_path, 0, last_slash + 1);
+}
+
+static __inline int
+isxdigit (char c)
+{
+  return ((c >= '0' && c <= '9')
+          || (c >= 'a' && c <= 'f')
+          || (c >= 'A' && c <= 'F'));
+}
+
+static int
+parse_hex_color_component (const char *s, unsigned start, unsigned end)
+{
+  unsigned len;
+  char buf[3];
+
+  len = end - start;
+  /* Check the limits so we don't overrun the buffer.  */
+  if (len < 1 || len > 2)
+    return 0;
+
+  if (len == 1)
+    {
+      buf[0] = s[start];   /* Get the first and only hex digit.  */
+      buf[1] = buf[0];     /* Duplicate the hex digit.  */
+    }
+  else if (len == 2)
+    {
+      buf[0] = s[start];
+      buf[1] = s[start + 1];
+    }
+
+  buf[2] = '\0';
+
+  return grub_strtoul (buf, 0, 16);
+}
+
+/* Parse a color string of the form "r, g, b", "#RGB", "#RGBA",
+   "#RRGGBB", or "#RRGGBBAA".  */
+grub_err_t
+grub_gui_parse_color (const char *s, grub_gui_color_t *color)
+{
+  grub_gui_color_t c;
+
+  /* Skip whitespace.  */
+  while (*s && grub_isspace (*s))
+    s++;
+
+  if (*s == '#')
+    {
+      /* HTML-style.  Number if hex digits:
+         [6] #RRGGBB     [3] #RGB
+         [8] #RRGGBBAA   [4] #RGBA  */
+
+      s++;  /* Skip the '#'.  */
+      /* Count the hexits to determine the format.  */
+      int hexits = 0;
+      const char *end = s;
+      while (isxdigit (*end))
+        {
+          end++;
+          hexits++;
+        }
+
+      /* Parse the color components based on the format.  */
+      if (hexits == 3 || hexits == 4)
+        {
+          c.red = parse_hex_color_component (s, 0, 1);
+          c.green = parse_hex_color_component (s, 1, 2);
+          c.blue = parse_hex_color_component (s, 2, 3);
+          if (hexits == 4)
+            c.alpha = parse_hex_color_component (s, 3, 4);
+          else
+            c.alpha = 255;
+        }
+      else if (hexits == 6 || hexits == 8)
+        {
+          c.red = parse_hex_color_component (s, 0, 2);
+          c.green = parse_hex_color_component (s, 2, 4);
+          c.blue = parse_hex_color_component (s, 4, 6);
+          if (hexits == 8)
+            c.alpha = parse_hex_color_component (s, 6, 8);
+          else
+            c.alpha = 255;
+        }
+      else
+        return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                           "invalid HTML-type color string `%s'", s);
+    }
+  else if (grub_isdigit (*s))
+    {
+      /* Comma separated decimal values.  */
+      c.red = grub_strtoul (s, 0, 0);
+      if ((s = grub_strchr (s, ',')) == 0)
+        return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                           "missing 1st comma separator in color `%s'", s);
+      s++;
+      c.green = grub_strtoul (s, 0, 0);
+      if ((s = grub_strchr (s, ',')) == 0)
+        return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                           "missing 2nd comma separator in color `%s'", s);
+      s++;
+      c.blue = grub_strtoul (s, 0, 0);
+      if ((s = grub_strchr (s, ',')) == 0)
+        c.alpha = 255;
+      else
+        {
+          s++;
+          c.alpha = grub_strtoul (s, 0, 0);
+        }
+    }
+  else
+    {
+      if (! grub_gui_get_named_color (s, &c))
+        return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                           "invalid named color `%s'", s);
+    }
+
+  if (grub_errno == GRUB_ERR_NONE)
+    *color = c;
+  return grub_errno;
+}
+
+/* Parse a value in the form "(x, y)", storing the first element (x) into
+   *PX and the second element (y) into *PY.
+   Returns GRUB_ERR_NONE if successfully parsed.  */
+grub_err_t
+grub_gui_parse_2_tuple (const char *s, int *px, int *py)
+{
+  int x;
+  int y;
+
+  while (*s && grub_isspace (*s))
+    s++;
+  if (*s != '(')
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                       "missing `(' in 2-tuple `%s'", s);
+
+  /* Skip the opening parentheses.  */
+  s++;
+  if (*s == 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                       "unexpected end of 2-tuple after `(' in `%s'", s);
+
+  /* Parse the first element.  */
+  x = grub_strtol (s, 0, 10);
+  if ((s = grub_strchr (s, ',')) == 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                       "missing comma in 2-tuple `%s'", s);
+
+  /* Skip the element separator (the comma).  */
+  s++;
+  /* Parse the second element.  */
+  y = grub_strtol (s, 0, 10);
+
+  *px = x;
+  *py = y;
+
+  return grub_errno;
+}
diff --git a/gfxmenu/gui_util.c b/gfxmenu/gui_util.c
new file mode 100644
index 000000000..eba7bb39e
--- /dev/null
+++ b/gfxmenu/gui_util.c
@@ -0,0 +1,101 @@
+/* gui_util.c - GUI utility functions.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/mm.h>
+#include <grub/misc.h>
+#include <grub/gui.h>
+#include <grub/gui_string_util.h>
+
+
+struct find_by_id_state
+{
+  const char *match_id;
+  grub_gui_component_callback match_callback;
+  void *match_userdata;
+};
+
+static void
+find_by_id_recursively (grub_gui_component_t component, void *userdata)
+{
+  struct find_by_id_state *state;
+  const char *id;
+
+  state = (struct find_by_id_state *) userdata;
+  id = component->ops->get_id (component);
+  if (id && grub_strcmp (id, state->match_id) == 0)
+    state->match_callback (component, state->match_userdata);
+
+  if (component->ops->is_instance (component, "container"))
+    {
+      grub_gui_container_t container;
+      container = (grub_gui_container_t) component;
+      container->ops->iterate_children (container,
+                                        find_by_id_recursively,
+                                        state);
+    }
+}
+
+void
+grub_gui_find_by_id (grub_gui_component_t root,
+                     const char *id,
+                     grub_gui_component_callback cb,
+                     void *userdata)
+{
+  struct find_by_id_state state;
+  state.match_id = id;
+  state.match_callback = cb;
+  state.match_userdata = userdata;
+  find_by_id_recursively (root, &state);
+}
+
+
+struct iterate_recursively_state
+{
+  grub_gui_component_callback callback;
+  void *userdata;
+};
+
+static
+void iterate_recursively_cb (grub_gui_component_t component, void *userdata)
+{
+  struct iterate_recursively_state *state;
+
+  state = (struct iterate_recursively_state *) userdata;
+  state->callback (component, state->userdata);
+
+  if (component->ops->is_instance (component, "container"))
+    {
+      grub_gui_container_t container;
+      container = (grub_gui_container_t) component;
+      container->ops->iterate_children (container,
+                                        iterate_recursively_cb,
+                                        state);
+    }
+}
+
+void
+grub_gui_iterate_recursively (grub_gui_component_t root,
+                              grub_gui_component_callback cb,
+                              void *userdata)
+{
+  struct iterate_recursively_state state;
+  state.callback = cb;
+  state.userdata = userdata;
+  iterate_recursively_cb (root, &state);
+}
diff --git a/gfxmenu/icon_manager.c b/gfxmenu/icon_manager.c
new file mode 100644
index 000000000..a362882e1
--- /dev/null
+++ b/gfxmenu/icon_manager.c
@@ -0,0 +1,258 @@
+/* icon_manager.c - gfxmenu icon manager.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/mm.h>
+#include <grub/err.h>
+#include <grub/gui_string_util.h>
+#include <grub/bitmap.h>
+#include <grub/bitmap_scale.h>
+#include <grub/menu.h>
+#include <grub/icon_manager.h>
+
+/* Currently hard coded to '.png' extension.  */
+static const char icon_extension[] = ".png";
+
+typedef struct icon_entry
+{
+  char *class_name;
+  struct grub_video_bitmap *bitmap;
+  struct icon_entry *next;
+} *icon_entry_t;
+
+struct grub_gfxmenu_icon_manager
+{
+  char *theme_path;
+  int icon_width;
+  int icon_height;
+
+  /* Icon cache: linked list w/ dummy head node.  */
+  struct icon_entry cache;
+};
+
+
+/* Create a new icon manager and return a point to it.  */
+grub_gfxmenu_icon_manager_t
+grub_gfxmenu_icon_manager_new (void)
+{
+  grub_gfxmenu_icon_manager_t mgr;
+  mgr = grub_malloc (sizeof (*mgr));
+  if (! mgr)
+    return 0;
+
+  mgr->theme_path = 0;
+  mgr->icon_width = 0;
+  mgr->icon_height = 0;
+
+  /* Initialize the dummy head node.  */
+  mgr->cache.class_name = 0;
+  mgr->cache.bitmap = 0;
+  mgr->cache.next = 0;
+
+  return mgr;
+}
+
+/* Destroy the icon manager MGR, freeing all resources used by it.
+
+Note: Any bitmaps returned by grub_gfxmenu_icon_manager_get_icon()
+are destroyed and must not be used by the caller after this function
+is called.  */
+void
+grub_gfxmenu_icon_manager_destroy (grub_gfxmenu_icon_manager_t mgr)
+{
+  grub_gfxmenu_icon_manager_clear_cache (mgr);
+  grub_free (mgr->theme_path);
+  grub_free (mgr);
+}
+
+/* Clear the icon cache.  */
+void
+grub_gfxmenu_icon_manager_clear_cache (grub_gfxmenu_icon_manager_t mgr)
+{
+  icon_entry_t cur;
+  icon_entry_t next;
+  for (cur = mgr->cache.next; cur; cur = next)
+    {
+      next = cur->next;
+      grub_free (cur->class_name);
+      grub_video_bitmap_destroy (cur->bitmap);
+      grub_free (cur);
+    }
+  mgr->cache.next = 0;
+}
+
+/* Set the theme path.  If the theme path is changed, the icon cache
+   is cleared.  */
+void
+grub_gfxmenu_icon_manager_set_theme_path (grub_gfxmenu_icon_manager_t mgr,
+                                          const char *path)
+{
+  /* Clear the cache if the theme path has changed.  */
+  if (((mgr->theme_path == 0) != (path == 0))
+      || (grub_strcmp (mgr->theme_path, path) != 0))
+    grub_gfxmenu_icon_manager_clear_cache (mgr);
+
+  grub_free (mgr->theme_path);
+  mgr->theme_path = path ? grub_strdup (path) : 0;
+}
+
+/* Set the icon size.  When icons are requested from the icon manager,
+   they are scaled to this size before being returned.  If the size is
+   changed, the icon cache is cleared.  */
+void
+grub_gfxmenu_icon_manager_set_icon_size (grub_gfxmenu_icon_manager_t mgr,
+                                         int width, int height)
+{
+  /* If the width or height is changed, we must clear the cache, since the
+     scaled bitmaps are stored in the cache.  */
+  if (width != mgr->icon_width || height != mgr->icon_height)
+    grub_gfxmenu_icon_manager_clear_cache (mgr);
+
+  mgr->icon_width = width;
+  mgr->icon_height = height;
+}
+
+/* Try to load an icon for the specified CLASS_NAME in the directory DIR.
+   Returns 0 if the icon could not be loaded, or returns a pointer to a new
+   bitmap if it was successful.  */
+static struct grub_video_bitmap *
+try_loading_icon (grub_gfxmenu_icon_manager_t mgr,
+                  const char *dir, const char *class_name)
+{
+  char *path = grub_malloc (grub_strlen (dir)
+                            + grub_strlen (class_name)
+                            + grub_strlen (icon_extension)
+                            + 1);
+  if (! path)
+    return 0;
+
+  grub_strcpy (path, dir);
+  grub_strcat (path, class_name);
+  grub_strcat (path, icon_extension);
+
+  struct grub_video_bitmap *raw_bitmap;
+  grub_video_bitmap_load (&raw_bitmap, path);
+  grub_free (path);
+  grub_errno = GRUB_ERR_NONE;  /* Critical to clear the error!!  */
+  if (! raw_bitmap)
+    return 0;
+
+  struct grub_video_bitmap *scaled_bitmap;
+  grub_video_bitmap_create_scaled (&scaled_bitmap,
+                                   mgr->icon_width, mgr->icon_height,
+                                   raw_bitmap,
+                                   GRUB_VIDEO_BITMAP_SCALE_METHOD_BEST);
+  grub_video_bitmap_destroy (raw_bitmap);
+  if (! scaled_bitmap)
+    {
+      grub_error_push ();
+      grub_error (grub_errno, "failed to scale icon");
+      return 0;
+    }
+
+  return scaled_bitmap;
+}
+
+/* Get the icon for the specified class CLASS_NAME.  If an icon for
+   CLASS_NAME already exists in the cache, then a reference to the cached
+   bitmap is returned.  If it is not cached, then it is loaded and cached.
+   If no icon could be could for CLASS_NAME, then 0 is returned.  */
+static struct grub_video_bitmap *
+get_icon_by_class (grub_gfxmenu_icon_manager_t mgr, const char *class_name)
+{
+  /* First check the icon cache.  */
+  icon_entry_t entry;
+  for (entry = mgr->cache.next; entry; entry = entry->next)
+    {
+      if (grub_strcmp (entry->class_name, class_name) == 0)
+        return entry->bitmap;
+    }
+
+  if (! mgr->theme_path)
+    return 0;
+
+  /* Otherwise, we search for an icon to load.  */
+  char *theme_dir = grub_get_dirname (mgr->theme_path);
+  char *icons_dir;
+  struct grub_video_bitmap *icon;
+  icon = 0;
+  /* First try the theme's own icons, from "grub/themes/NAME/icons/"  */
+  icons_dir = grub_resolve_relative_path (theme_dir, "icons/");
+  if (icons_dir)
+    {
+      icon = try_loading_icon (mgr, icons_dir, class_name);
+      grub_free (icons_dir);
+    }
+  if (! icon)
+    {
+      /* If the theme doesn't have an appropriate icon, check in
+         "grub/themes/icons".  */
+      /* TODO use GRUB prefix "/icons" */
+      icons_dir = grub_resolve_relative_path (theme_dir, "../icons/");
+      if (icons_dir)
+        {
+          icon = try_loading_icon (mgr, icons_dir, class_name);
+          grub_free (icons_dir);
+        }
+    }
+  grub_free (theme_dir);
+
+  /* No icon was found.  */
+  /* This should probably be noted in the cache, so that a search is not
+     performed each time an icon for CLASS_NAME is requested.  */
+  if (! icon)
+    return 0;
+
+  /* Insert a new cache entry for this icon.  */
+  entry = grub_malloc (sizeof (*entry));
+  if (! entry)
+    {
+      grub_video_bitmap_destroy (icon);
+      return 0;
+    }
+  entry->class_name = grub_strdup (class_name);
+  entry->bitmap = icon;
+  entry->next = mgr->cache.next;
+  mgr->cache.next = entry;   /* Link it into the cache.  */
+  return entry->bitmap;
+}
+
+/* Get the best available icon for ENTRY.  Beginning with the first class
+   listed in the menu entry and proceeding forward, an icon for each class
+   is searched for.  The first icon found is returned.  The returned icon
+   is scaled to the size specified by
+   grub_gfxmenu_icon_manager_set_icon_size().
+
+     Note:  Bitmaps returned by this function are destroyed when the
+            icon manager is destroyed.
+ */
+struct grub_video_bitmap *
+grub_gfxmenu_icon_manager_get_icon (grub_gfxmenu_icon_manager_t mgr,
+                                    grub_menu_entry_t entry)
+{
+  struct grub_menu_entry_class *c;
+  struct grub_video_bitmap *icon;
+
+  /* Try each class in succession.  */
+  icon = 0;
+  for (c = entry->classes->next; c && ! icon; c = c->next)
+    icon = get_icon_by_class (mgr, c->name);
+  return icon;
+}
diff --git a/gfxmenu/model.c b/gfxmenu/model.c
new file mode 100644
index 000000000..26490ea1f
--- /dev/null
+++ b/gfxmenu/model.c
@@ -0,0 +1,191 @@
+/* model.c - Graphical menu interface MVC model. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/mm.h>
+#include <grub/err.h>
+#include <grub/normal.h>
+#include <grub/menu.h>
+#include <grub/time.h>
+#include <grub/gfxmenu_model.h>
+
+/* Model type definition.  */
+struct grub_gfxmenu_model
+{
+  grub_menu_t menu;
+  int num_entries;
+  grub_menu_entry_t *entries;
+  int selected_entry_index;
+  int timeout_set;
+  grub_uint64_t timeout_start;
+  grub_uint64_t timeout_at;
+};
+
+
+grub_gfxmenu_model_t
+grub_gfxmenu_model_new (grub_menu_t menu)
+{
+  grub_gfxmenu_model_t model;
+
+  model = grub_malloc (sizeof (*model));
+  if (! model)
+    return 0;
+
+  model->menu = menu;
+  model->num_entries = menu->size;
+  model->entries = 0;
+  model->selected_entry_index = 0;
+  model->timeout_set = 0;
+  model->timeout_at = 0;
+  if (model->num_entries > 0)
+    {
+      model->entries = grub_malloc (model->num_entries
+                                    * sizeof (*model->entries));
+      if (! model->entries)
+        goto fail_and_free;
+
+      int i;
+      grub_menu_entry_t cur;
+      for (i = 0, cur = menu->entry_list;
+           i < model->num_entries;
+           i++, cur = cur->next)
+        {
+          model->entries[i] = cur;
+        }
+    }
+
+  return model;
+
+fail_and_free:
+  grub_free (model->entries);
+  grub_free (model);
+  return 0;
+}
+
+void
+grub_gfxmenu_model_destroy (grub_gfxmenu_model_t model)
+{
+  if (! model)
+    return;
+
+  grub_free (model->entries);
+  model->entries = 0;
+
+  grub_free (model);
+}
+
+grub_menu_t
+grub_gfxmenu_model_get_menu (grub_gfxmenu_model_t model)
+{
+  return model->menu;
+}
+
+void
+grub_gfxmenu_model_set_timeout (grub_gfxmenu_model_t model)
+{
+  int timeout_sec = grub_menu_get_timeout ();
+  if (timeout_sec >= 0)
+    {
+      model->timeout_start = grub_get_time_ms ();
+      model->timeout_at = model->timeout_start + timeout_sec * 1000;
+      model->timeout_set = 1;
+    }
+  else
+    {
+      model->timeout_set = 0;
+    }
+}
+
+void
+grub_gfxmenu_model_clear_timeout (grub_gfxmenu_model_t model)
+{
+  model->timeout_set = 0;
+  grub_menu_set_timeout (-1);
+}
+
+int
+grub_gfxmenu_model_get_timeout_ms (grub_gfxmenu_model_t model)
+{
+  if (!model->timeout_set)
+    return -1;
+
+  return model->timeout_at - model->timeout_start;
+}
+
+int
+grub_gfxmenu_model_get_timeout_remaining_ms (grub_gfxmenu_model_t model)
+{
+  if (!model->timeout_set)
+    return -1;
+
+  return model->timeout_at - grub_get_time_ms ();
+}
+
+int
+grub_gfxmenu_model_timeout_expired (grub_gfxmenu_model_t model)
+{
+  if (model->timeout_set
+      && grub_get_time_ms () >= model->timeout_at)
+    return 1;
+
+  return 0;
+}
+
+int
+grub_gfxmenu_model_get_num_entries (grub_gfxmenu_model_t model)
+{
+  return model->num_entries;
+}
+
+int
+grub_gfxmenu_model_get_selected_index (grub_gfxmenu_model_t model)
+{
+  return model->selected_entry_index;
+}
+
+void
+grub_gfxmenu_model_set_selected_index (grub_gfxmenu_model_t model, int index)
+{
+  model->selected_entry_index = index;
+}
+
+const char *
+grub_gfxmenu_model_get_entry_title (grub_gfxmenu_model_t model, int index)
+{
+  if (index < 0 || index >= model->num_entries)
+    {
+      grub_error (GRUB_ERR_OUT_OF_RANGE, "invalid menu index");
+      return 0;
+    }
+
+  return model->entries[index]->title;
+}
+
+grub_menu_entry_t
+grub_gfxmenu_model_get_entry (grub_gfxmenu_model_t model, int index)
+{
+  if (index < 0 || index >= model->num_entries)
+    {
+      grub_error (GRUB_ERR_OUT_OF_RANGE, "invalid menu index");
+      return 0;
+    }
+
+  return model->entries[index];
+}
diff --git a/gfxmenu/named_colors.c b/gfxmenu/named_colors.c
new file mode 100644
index 000000000..eedbc47fb
--- /dev/null
+++ b/gfxmenu/named_colors.c
@@ -0,0 +1,209 @@
+/* named_colors.c - Named color values.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/gui.h>
+#include <grub/gui_string_util.h>
+#include <grub/misc.h>
+
+struct named_color
+{
+  const char *name;
+  grub_gui_color_t color;
+};
+
+/*
+   Named color list generated from the list of SVG color keywords from
+   <http://www.w3.org/TR/css3-color/#svg-color>,
+   processed through the following Perl command:
+   perl -ne 'chomp;split;print "{ \"$_[0]\", RGB_COLOR($_[2]) },\n"'
+ */
+
+#define RGB_COLOR(r,g,b) {.red = r, .green = g, .blue = b, .alpha = 255}
+
+static struct named_color named_colors[] =
+{
+    { "aliceblue", RGB_COLOR(240,248,255) },
+    { "antiquewhite", RGB_COLOR(250,235,215) },
+    { "aqua", RGB_COLOR(0,255,255) },
+    { "aquamarine", RGB_COLOR(127,255,212) },
+    { "azure", RGB_COLOR(240,255,255) },
+    { "beige", RGB_COLOR(245,245,220) },
+    { "bisque", RGB_COLOR(255,228,196) },
+    { "black", RGB_COLOR(0,0,0) },
+    { "blanchedalmond", RGB_COLOR(255,235,205) },
+    { "blue", RGB_COLOR(0,0,255) },
+    { "blueviolet", RGB_COLOR(138,43,226) },
+    { "brown", RGB_COLOR(165,42,42) },
+    { "burlywood", RGB_COLOR(222,184,135) },
+    { "cadetblue", RGB_COLOR(95,158,160) },
+    { "chartreuse", RGB_COLOR(127,255,0) },
+    { "chocolate", RGB_COLOR(210,105,30) },
+    { "coral", RGB_COLOR(255,127,80) },
+    { "cornflowerblue", RGB_COLOR(100,149,237) },
+    { "cornsilk", RGB_COLOR(255,248,220) },
+    { "crimson", RGB_COLOR(220,20,60) },
+    { "cyan", RGB_COLOR(0,255,255) },
+    { "darkblue", RGB_COLOR(0,0,139) },
+    { "darkcyan", RGB_COLOR(0,139,139) },
+    { "darkgoldenrod", RGB_COLOR(184,134,11) },
+    { "darkgray", RGB_COLOR(169,169,169) },
+    { "darkgreen", RGB_COLOR(0,100,0) },
+    { "darkgrey", RGB_COLOR(169,169,169) },
+    { "darkkhaki", RGB_COLOR(189,183,107) },
+    { "darkmagenta", RGB_COLOR(139,0,139) },
+    { "darkolivegreen", RGB_COLOR(85,107,47) },
+    { "darkorange", RGB_COLOR(255,140,0) },
+    { "darkorchid", RGB_COLOR(153,50,204) },
+    { "darkred", RGB_COLOR(139,0,0) },
+    { "darksalmon", RGB_COLOR(233,150,122) },
+    { "darkseagreen", RGB_COLOR(143,188,143) },
+    { "darkslateblue", RGB_COLOR(72,61,139) },
+    { "darkslategray", RGB_COLOR(47,79,79) },
+    { "darkslategrey", RGB_COLOR(47,79,79) },
+    { "darkturquoise", RGB_COLOR(0,206,209) },
+    { "darkviolet", RGB_COLOR(148,0,211) },
+    { "deeppink", RGB_COLOR(255,20,147) },
+    { "deepskyblue", RGB_COLOR(0,191,255) },
+    { "dimgray", RGB_COLOR(105,105,105) },
+    { "dimgrey", RGB_COLOR(105,105,105) },
+    { "dodgerblue", RGB_COLOR(30,144,255) },
+    { "firebrick", RGB_COLOR(178,34,34) },
+    { "floralwhite", RGB_COLOR(255,250,240) },
+    { "forestgreen", RGB_COLOR(34,139,34) },
+    { "fuchsia", RGB_COLOR(255,0,255) },
+    { "gainsboro", RGB_COLOR(220,220,220) },
+    { "ghostwhite", RGB_COLOR(248,248,255) },
+    { "gold", RGB_COLOR(255,215,0) },
+    { "goldenrod", RGB_COLOR(218,165,32) },
+    { "gray", RGB_COLOR(128,128,128) },
+    { "green", RGB_COLOR(0,128,0) },
+    { "greenyellow", RGB_COLOR(173,255,47) },
+    { "grey", RGB_COLOR(128,128,128) },
+    { "honeydew", RGB_COLOR(240,255,240) },
+    { "hotpink", RGB_COLOR(255,105,180) },
+    { "indianred", RGB_COLOR(205,92,92) },
+    { "indigo", RGB_COLOR(75,0,130) },
+    { "ivory", RGB_COLOR(255,255,240) },
+    { "khaki", RGB_COLOR(240,230,140) },
+    { "lavender", RGB_COLOR(230,230,250) },
+    { "lavenderblush", RGB_COLOR(255,240,245) },
+    { "lawngreen", RGB_COLOR(124,252,0) },
+    { "lemonchiffon", RGB_COLOR(255,250,205) },
+    { "lightblue", RGB_COLOR(173,216,230) },
+    { "lightcoral", RGB_COLOR(240,128,128) },
+    { "lightcyan", RGB_COLOR(224,255,255) },
+    { "lightgoldenrodyellow", RGB_COLOR(250,250,210) },
+    { "lightgray", RGB_COLOR(211,211,211) },
+    { "lightgreen", RGB_COLOR(144,238,144) },
+    { "lightgrey", RGB_COLOR(211,211,211) },
+    { "lightpink", RGB_COLOR(255,182,193) },
+    { "lightsalmon", RGB_COLOR(255,160,122) },
+    { "lightseagreen", RGB_COLOR(32,178,170) },
+    { "lightskyblue", RGB_COLOR(135,206,250) },
+    { "lightslategray", RGB_COLOR(119,136,153) },
+    { "lightslategrey", RGB_COLOR(119,136,153) },
+    { "lightsteelblue", RGB_COLOR(176,196,222) },
+    { "lightyellow", RGB_COLOR(255,255,224) },
+    { "lime", RGB_COLOR(0,255,0) },
+    { "limegreen", RGB_COLOR(50,205,50) },
+    { "linen", RGB_COLOR(250,240,230) },
+    { "magenta", RGB_COLOR(255,0,255) },
+    { "maroon", RGB_COLOR(128,0,0) },
+    { "mediumaquamarine", RGB_COLOR(102,205,170) },
+    { "mediumblue", RGB_COLOR(0,0,205) },
+    { "mediumorchid", RGB_COLOR(186,85,211) },
+    { "mediumpurple", RGB_COLOR(147,112,219) },
+    { "mediumseagreen", RGB_COLOR(60,179,113) },
+    { "mediumslateblue", RGB_COLOR(123,104,238) },
+    { "mediumspringgreen", RGB_COLOR(0,250,154) },
+    { "mediumturquoise", RGB_COLOR(72,209,204) },
+    { "mediumvioletred", RGB_COLOR(199,21,133) },
+    { "midnightblue", RGB_COLOR(25,25,112) },
+    { "mintcream", RGB_COLOR(245,255,250) },
+    { "mistyrose", RGB_COLOR(255,228,225) },
+    { "moccasin", RGB_COLOR(255,228,181) },
+    { "navajowhite", RGB_COLOR(255,222,173) },
+    { "navy", RGB_COLOR(0,0,128) },
+    { "oldlace", RGB_COLOR(253,245,230) },
+    { "olive", RGB_COLOR(128,128,0) },
+    { "olivedrab", RGB_COLOR(107,142,35) },
+    { "orange", RGB_COLOR(255,165,0) },
+    { "orangered", RGB_COLOR(255,69,0) },
+    { "orchid", RGB_COLOR(218,112,214) },
+    { "palegoldenrod", RGB_COLOR(238,232,170) },
+    { "palegreen", RGB_COLOR(152,251,152) },
+    { "paleturquoise", RGB_COLOR(175,238,238) },
+    { "palevioletred", RGB_COLOR(219,112,147) },
+    { "papayawhip", RGB_COLOR(255,239,213) },
+    { "peachpuff", RGB_COLOR(255,218,185) },
+    { "peru", RGB_COLOR(205,133,63) },
+    { "pink", RGB_COLOR(255,192,203) },
+    { "plum", RGB_COLOR(221,160,221) },
+    { "powderblue", RGB_COLOR(176,224,230) },
+    { "purple", RGB_COLOR(128,0,128) },
+    { "red", RGB_COLOR(255,0,0) },
+    { "rosybrown", RGB_COLOR(188,143,143) },
+    { "royalblue", RGB_COLOR(65,105,225) },
+    { "saddlebrown", RGB_COLOR(139,69,19) },
+    { "salmon", RGB_COLOR(250,128,114) },
+    { "sandybrown", RGB_COLOR(244,164,96) },
+    { "seagreen", RGB_COLOR(46,139,87) },
+    { "seashell", RGB_COLOR(255,245,238) },
+    { "sienna", RGB_COLOR(160,82,45) },
+    { "silver", RGB_COLOR(192,192,192) },
+    { "skyblue", RGB_COLOR(135,206,235) },
+    { "slateblue", RGB_COLOR(106,90,205) },
+    { "slategray", RGB_COLOR(112,128,144) },
+    { "slategrey", RGB_COLOR(112,128,144) },
+    { "snow", RGB_COLOR(255,250,250) },
+    { "springgreen", RGB_COLOR(0,255,127) },
+    { "steelblue", RGB_COLOR(70,130,180) },
+    { "tan", RGB_COLOR(210,180,140) },
+    { "teal", RGB_COLOR(0,128,128) },
+    { "thistle", RGB_COLOR(216,191,216) },
+    { "tomato", RGB_COLOR(255,99,71) },
+    { "turquoise", RGB_COLOR(64,224,208) },
+    { "violet", RGB_COLOR(238,130,238) },
+    { "wheat", RGB_COLOR(245,222,179) },
+    { "white", RGB_COLOR(255,255,255) },
+    { "whitesmoke", RGB_COLOR(245,245,245) },
+    { "yellow", RGB_COLOR(255,255,0) },
+    { "yellowgreen", RGB_COLOR(154,205,50) },
+    { 0, { 0, 0, 0, 0 } }  /* Terminator.  */
+};
+
+/* Get the color named NAME.  If the color was found, returns 1 and
+   stores the color into *COLOR.  If the color was not found, returns 0 and
+   does not modify *COLOR.  */
+int
+grub_gui_get_named_color (const char *name,
+                          grub_gui_color_t *color)
+{
+  int i;
+  for (i = 0; named_colors[i].name; i++)
+    {
+      if (grub_strcmp (named_colors[i].name, name) == 0)
+        {
+          *color = named_colors[i].color;
+          return 1;
+        }
+    }
+  return 0;
+}
diff --git a/gfxmenu/theme_loader.c b/gfxmenu/theme_loader.c
new file mode 100644
index 000000000..3512c7bf1
--- /dev/null
+++ b/gfxmenu/theme_loader.c
@@ -0,0 +1,720 @@
+/* theme_loader.c - Theme file loader for gfxmenu.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/file.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/err.h>
+#include <grub/dl.h>
+#include <grub/video.h>
+#include <grub/gui_string_util.h>
+#include <grub/bitmap.h>
+#include <grub/bitmap_scale.h>
+#include <grub/gfxwidgets.h>
+#include <grub/gfxmenu_view.h>
+#include <grub/gui.h>
+
+/* Construct a new box widget using ABSPATTERN to find the pixmap files for
+   it, storing the new box instance at *BOXPTR.
+   PATTERN should be of the form: "(hd0,0)/somewhere/style*.png".
+   The '*' then gets substituted with the various pixmap names that the
+   box uses.  */
+static grub_err_t
+recreate_box_absolute (grub_gfxmenu_box_t *boxptr, const char *abspattern)
+{
+  char *prefix;
+  char *suffix;
+  char *star;
+  grub_gfxmenu_box_t box;
+
+  star = grub_strchr (abspattern, '*');
+  if (! star)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                       "missing `*' in box pixmap pattern `%s'", abspattern);
+
+  /* Prefix:  Get the part before the '*'.  */
+  prefix = grub_malloc (star - abspattern + 1);
+  if (! prefix)
+    return grub_errno;
+
+  grub_memcpy (prefix, abspattern, star - abspattern);
+  prefix[star - abspattern] = '\0';
+
+  /* Suffix:  Everything after the '*' is the suffix.  */
+  suffix = star + 1;
+
+  box = grub_gfxmenu_create_box (prefix, suffix);
+  grub_free (prefix);
+  if (! box)
+    return grub_errno;
+
+  if (*boxptr)
+    (*boxptr)->destroy (*boxptr);
+  *boxptr = box;
+  return grub_errno;
+}
+
+
+/* Construct a new box widget using PATTERN to find the pixmap files for it,
+   storing the new widget at *BOXPTR.  PATTERN should be of the form:
+   "somewhere/style*.png".  The '*' then gets substituted with the various
+   pixmap names that the widget uses.
+
+   Important!  The value of *BOXPTR must be initialized!  It must either
+   (1) Be 0 (a NULL pointer), or
+   (2) Be a pointer to a valid 'grub_gfxmenu_box_t' instance.
+   In this case, the previous instance is destroyed.  */
+grub_err_t
+grub_gui_recreate_box (grub_gfxmenu_box_t *boxptr,
+                       const char *pattern, const char *theme_dir)
+{
+  char *abspattern;
+
+  /* Check arguments.  */
+  if (! pattern)
+    {
+      /* If no pixmap pattern is given, then just create an empty box.  */
+      if (*boxptr)
+        (*boxptr)->destroy (*boxptr);
+      *boxptr = grub_gfxmenu_create_box (0, 0);
+      return grub_errno;
+    }
+
+  if (! theme_dir)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                       "styled box missing theme directory");
+
+  /* Resolve to an absolute path.  */
+  abspattern = grub_resolve_relative_path (theme_dir, pattern);
+  if (! abspattern)
+    return grub_errno;
+
+  /* Create the box.  */
+  recreate_box_absolute (boxptr, abspattern);
+  grub_free (abspattern);
+  return grub_errno;
+}
+
+/* Set the specified property NAME on the view to the given string VALUE.
+   The caller is responsible for the lifetimes of NAME and VALUE.  */
+static grub_err_t
+theme_set_string (grub_gfxmenu_view_t view,
+                  const char *name,
+                  const char *value,
+                  const char *theme_dir,
+                  const char *filename,
+                  int line_num,
+                  int col_num)
+{
+  if (! grub_strcmp ("title-font", name))
+    view->title_font = grub_font_get (value);
+  else if (! grub_strcmp ("message-font", name))
+    view->message_font = grub_font_get (value);
+  else if (! grub_strcmp ("terminal-font", name))
+    {
+      grub_free (view->terminal_font_name);
+      view->terminal_font_name = grub_strdup (value);
+      if (! view->terminal_font_name)
+        return grub_errno;
+    }
+  else if (! grub_strcmp ("title-color", name))
+    grub_gui_parse_color (value, &view->title_color);
+  else if (! grub_strcmp ("message-color", name))
+    grub_gui_parse_color (value, &view->message_color);
+  else if (! grub_strcmp ("message-bg-color", name))
+    grub_gui_parse_color (value, &view->message_bg_color);
+  else if (! grub_strcmp ("desktop-image", name))
+    {
+      struct grub_video_bitmap *raw_bitmap;
+      struct grub_video_bitmap *scaled_bitmap;
+      char *path;
+      path = grub_resolve_relative_path (theme_dir, value);
+      if (! path)
+        return grub_errno;
+      if (grub_video_bitmap_load (&raw_bitmap, path) != GRUB_ERR_NONE)
+        {
+          grub_free (path);
+          return grub_errno;
+        }
+      grub_free(path);
+      grub_video_bitmap_create_scaled (&scaled_bitmap,
+                                       view->screen.width,
+                                       view->screen.height,
+                                       raw_bitmap,
+                                       GRUB_VIDEO_BITMAP_SCALE_METHOD_BEST);
+      grub_video_bitmap_destroy (raw_bitmap);
+      if (! scaled_bitmap)
+        {
+          grub_error_push ();
+          return grub_error (grub_errno, "error scaling desktop image");
+        }
+
+      grub_video_bitmap_destroy (view->desktop_image);
+      view->desktop_image = scaled_bitmap;
+    }
+  else if (! grub_strcmp ("desktop-color", name))
+     grub_gui_parse_color (value, &view->desktop_color);
+  else if (! grub_strcmp ("terminal-box", name))
+    {
+        grub_err_t err;
+        err = grub_gui_recreate_box (&view->terminal_box, value, theme_dir);
+        if (err != GRUB_ERR_NONE)
+          return err;
+    }
+  else if (! grub_strcmp ("title-text", name))
+    {
+      grub_free (view->title_text);
+      view->title_text = grub_strdup (value);
+      if (! view->title_text)
+        return grub_errno;
+    }
+  else
+    {
+      return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                         "%s:%d:%d unknown property `%s'",
+                         filename, line_num, col_num, name);
+    }
+  return grub_errno;
+}
+
+struct parsebuf
+{
+  char *buf;
+  int pos;
+  int len;
+  int line_num;
+  int col_num;
+  const char *filename;
+  char *theme_dir;
+  grub_gfxmenu_view_t view;
+};
+
+static int
+has_more (struct parsebuf *p)
+{
+  return p->pos < p->len;
+}
+
+static int
+read_char (struct parsebuf *p)
+{
+  if (has_more (p))
+    {
+      char c;
+      c = p->buf[p->pos++];
+      if (c == '\n')
+        {
+          p->line_num++;
+          p->col_num = 1;
+        }
+      else
+        {
+          p->col_num++;
+        }
+      return c;
+    }
+  else
+    return -1;
+}
+
+static int
+peek_char (struct parsebuf *p)
+{
+  if (has_more (p))
+    return p->buf[p->pos];
+  else
+    return -1;
+}
+
+static int
+is_whitespace (char c)
+{
+  return (c == ' '
+          || c == '\t'
+          || c == '\r'
+          || c == '\n'
+          || c == '\f');
+}
+
+static void
+skip_whitespace (struct parsebuf *p)
+{
+  while (has_more (p) && is_whitespace(peek_char (p)))
+    read_char (p);
+}
+
+static void
+advance_to_next_line (struct parsebuf *p)
+{
+  int c;
+
+  /* Eat characters up to the newline.  */
+  do
+    {
+      c = read_char (p);
+    }
+  while (c != -1 && c != '\n');
+}
+
+static int
+is_identifier_char (int c)
+{
+  return (c != -1
+          && (grub_isalpha(c)
+              || grub_isdigit(c)
+              || c == '_'
+              || c == '-'));
+}
+
+static char *
+read_identifier (struct parsebuf *p)
+{
+  /* Index of the first character of the identifier in p->buf.  */
+  int start;
+  /* Next index after the last character of the identifer in p->buf.  */
+  int end;
+
+  skip_whitespace (p);
+
+  /* Capture the start of the identifier.  */
+  start = p->pos;
+
+  /* Scan for the end.  */
+  while (is_identifier_char (peek_char (p)))
+    read_char (p);
+  end = p->pos;
+
+  if (end - start < 1)
+    return 0;
+
+  return grub_new_substring (p->buf, start, end);
+}
+
+static char *
+read_expression (struct parsebuf *p)
+{
+  int start;
+  int end;
+
+  skip_whitespace (p);
+  if (peek_char (p) == '"')
+    {
+      /* Read as a quoted string.  
+         The quotation marks are not included in the expression value.  */
+      /* Skip opening quotation mark.  */
+      read_char (p);
+      start = p->pos;
+      while (has_more (p) && peek_char (p) != '"')
+        read_char (p);
+      end = p->pos;
+      /* Skip the terminating quotation mark.  */
+      read_char (p);
+    }
+  else if (peek_char (p) == '(')
+    {
+      /* Read as a parenthesized string -- for tuples/coordinates.  */
+      /* The parentheses are included in the expression value.  */
+      int c;
+
+      start = p->pos;
+      do
+        {
+          c = read_char (p);
+        }
+      while (c != -1 && c != ')');
+      end = p->pos;
+    }
+  else if (has_more (p))
+    {
+      /* Read as a single word -- for numeric values or words without
+         whitespace.  */
+      start = p->pos;
+      while (has_more (p) && ! is_whitespace (peek_char (p)))
+        read_char (p);
+      end = p->pos;
+    }
+  else
+    {
+      /* The end of the theme file has been reached.  */
+      grub_error (GRUB_ERR_IO, "%s:%d:%d expression expected in theme file",
+                  p->filename, p->line_num, p->col_num);
+      return 0;
+    }
+
+  return grub_new_substring (p->buf, start, end);
+}
+
+/* Read a GUI object specification from the theme file.
+   Any components created will be added to the GUI container PARENT.  */
+static grub_err_t
+read_object (struct parsebuf *p, grub_gui_container_t parent)
+{
+  grub_video_rect_t bounds;
+
+  char *name;
+  name = read_identifier (p);
+  if (! name)
+    goto cleanup;
+
+  grub_gui_component_t component = 0;
+  if (grub_strcmp (name, "label") == 0)
+    {
+      component = grub_gui_label_new ();
+    }
+  else if (grub_strcmp (name, "image") == 0)
+    {
+      component = grub_gui_image_new ();
+    }
+  else if (grub_strcmp (name, "vbox") == 0)
+    {
+      component = (grub_gui_component_t) grub_gui_vbox_new ();
+    }
+  else if (grub_strcmp (name, "hbox") == 0)
+    {
+      component = (grub_gui_component_t) grub_gui_hbox_new ();
+    }
+  else if (grub_strcmp (name, "canvas") == 0)
+    {
+      component = (grub_gui_component_t) grub_gui_canvas_new ();
+    }
+  else if (grub_strcmp (name, "progress_bar") == 0)
+    {
+      component = grub_gui_progress_bar_new ();
+    }
+  else if (grub_strcmp (name, "circular_progress") == 0)
+    {
+      component = grub_gui_circular_progress_new ();
+    }
+  else if (grub_strcmp (name, "boot_menu") == 0)
+    {
+      component = grub_gui_list_new ();
+    }
+  else
+    {
+      /* Unknown type.  */
+      grub_error (GRUB_ERR_IO, "%s:%d:%d unknown object type `%s'",
+                  p->filename, p->line_num, p->col_num, name);
+      goto cleanup;
+    }
+
+  if (! component)
+    goto cleanup;
+
+  /* Inform the component about the theme so it can find its resources.  */
+  component->ops->set_property (component, "theme_dir", p->theme_dir);
+  component->ops->set_property (component, "theme_path", p->filename);
+
+  /* Add the component as a child of PARENT.  */
+  bounds.x = 0;
+  bounds.y = 0;
+  bounds.width = -1;
+  bounds.height = -1;
+  component->ops->set_bounds (component, &bounds);
+  parent->ops->add (parent, component);
+
+  skip_whitespace (p);
+  if (read_char (p) != '{')
+    {
+      grub_error (GRUB_ERR_IO,
+                  "%s:%d:%d expected `{' after object type name `%s'",
+                  p->filename, p->line_num, p->col_num, name);
+      goto cleanup;
+    }
+
+  while (has_more (p))
+    {
+      skip_whitespace (p);
+
+      /* Check whether the end has been encountered.  */
+      if (peek_char (p) == '}')
+        {
+          /* Skip the closing brace.  */
+          read_char (p);
+          break;
+        }
+
+      if (peek_char (p) == '#')
+        {
+          /* Skip comments.  */
+          advance_to_next_line (p);
+          continue;
+        }
+
+      if (peek_char (p) == '+')
+        {
+          /* Skip the '+'.  */
+          read_char (p);
+
+          /* Check whether this component is a container.  */
+          if (component->ops->is_instance (component, "container"))
+            {
+              /* Read the sub-object recursively and add it as a child.  */
+              if (read_object (p, (grub_gui_container_t) component) != 0)
+                goto cleanup;
+              /* After reading the sub-object, resume parsing, expecting
+                 another property assignment or sub-object definition.  */
+              continue;
+            }
+          else
+            {
+              grub_error (GRUB_ERR_IO,
+                          "%s:%d:%d attempted to add object to non-container",
+                          p->filename, p->line_num, p->col_num);
+              goto cleanup;
+            }
+        }
+
+      char *property;
+      property = read_identifier (p);
+      if (! property)
+        {
+          grub_error (GRUB_ERR_IO, "%s:%d:%d identifier expected in theme file",
+                      p->filename, p->line_num, p->col_num);
+          goto cleanup;
+        }
+
+      skip_whitespace (p);
+      if (read_char (p) != '=')
+        {
+          grub_error (GRUB_ERR_IO,
+                      "%s:%d:%d expected `=' after property name `%s'",
+                      p->filename, p->line_num, p->col_num, property);
+          grub_free (property);
+          goto cleanup;
+        }
+      skip_whitespace (p);
+
+      char *value;
+      value = read_expression (p);
+      if (! value)
+        {
+          grub_free (property);
+          goto cleanup;
+        }
+
+      /* Handle the property value.  */
+      if (grub_strcmp (property, "position") == 0)
+        {
+          /* Special case for position value.  */
+          int x;
+          int y;
+
+          if (grub_gui_parse_2_tuple (value, &x, &y) == GRUB_ERR_NONE)
+            {
+              grub_video_rect_t r;
+              component->ops->get_bounds (component, &r);
+              r.x = x;
+              r.y = y;
+              component->ops->set_bounds (component, &r);
+            }
+        }
+      else if (grub_strcmp (property, "size") == 0)
+        {
+          /* Special case for size value.  */
+          int w;
+          int h;
+
+          if (grub_gui_parse_2_tuple (value, &w, &h) == GRUB_ERR_NONE)
+            {
+              grub_video_rect_t r;
+              component->ops->get_bounds (component, &r);
+              r.width = w;
+              r.height = h;
+              component->ops->set_bounds (component, &r);
+            }
+        }
+      else
+        {
+          /* General property handling.  */
+          component->ops->set_property (component, property, value);
+        }
+
+      grub_free (value);
+      grub_free (property);
+      if (grub_errno != GRUB_ERR_NONE)
+        goto cleanup;
+    }
+
+  /* Set the object's size to its preferred size unless the user has
+     explicitly specified the size.  */
+  component->ops->get_bounds (component, &bounds);
+  if (bounds.width == -1 || bounds.height == -1)
+    {
+      component->ops->get_preferred_size (component,
+                                          &bounds.width, &bounds.height);
+      component->ops->set_bounds (component, &bounds);
+    }
+
+cleanup:
+  grub_free (name);
+  return grub_errno;
+}
+
+static grub_err_t
+read_property (struct parsebuf *p)
+{
+  char *name;
+
+  /* Read the property name.  */
+  name = read_identifier (p);
+  if (! name)
+    {
+      advance_to_next_line (p);
+      return grub_errno;
+    }
+
+  /* Skip whitespace before separator.  */
+  skip_whitespace (p);
+
+  /* Read separator.  */
+  if (read_char (p) != ':')
+    {
+      grub_error (GRUB_ERR_IO,
+                  "%s:%d:%d missing separator after property name `%s'",
+                  p->filename, p->line_num, p->col_num, name);
+      goto done;
+    }
+
+  /* Skip whitespace after separator.  */
+  skip_whitespace (p);
+
+  /* Get the value based on its type.  */
+  if (peek_char (p) == '"')
+    {
+      /* String value (e.g., '"My string"').  */
+      char *value = read_expression (p);
+      if (! value)
+        {
+          grub_error (GRUB_ERR_IO, "%s:%d:%d missing property value",
+                      p->filename, p->line_num, p->col_num);
+          goto done;
+        }
+      /* If theme_set_string results in an error, grub_errno will be returned
+         below.  */
+      theme_set_string (p->view, name, value, p->theme_dir,
+                        p->filename, p->line_num, p->col_num);
+      grub_free (value);
+    }
+  else
+    {
+      grub_error (GRUB_ERR_IO,
+                  "%s:%d:%d property value invalid; "
+                  "enclose literal values in quotes (\")",
+                  p->filename, p->line_num, p->col_num);
+      goto done;
+    }
+
+done:
+  grub_free (name);
+  return grub_errno;
+}
+
+/* Set properties on the view based on settings from the specified
+   theme file.  */
+grub_err_t
+grub_gfxmenu_view_load_theme (grub_gfxmenu_view_t view, const char *theme_path)
+{
+  grub_file_t file;
+  struct parsebuf p;
+
+  p.view = view;
+  p.theme_dir = grub_get_dirname (theme_path);
+
+  file = grub_file_open (theme_path);
+  if (! file)
+    {
+      grub_free (p.theme_dir);
+      return grub_errno;
+    }
+
+  p.len = grub_file_size (file);
+  p.buf = grub_malloc (p.len);
+  p.pos = 0;
+  p.line_num = 1;
+  p.col_num = 1;
+  p.filename = theme_path;
+  if (! p.buf)
+    {
+      grub_file_close (file);
+      grub_free (p.theme_dir);
+      return grub_errno;
+    }
+  if (grub_file_read (file, p.buf, p.len) != p.len)
+    {
+      grub_free (p.buf);
+      grub_file_close (file);
+      grub_free (p.theme_dir);
+      return grub_errno;
+    }
+
+  if (view->canvas)
+    view->canvas->ops->component.destroy (view->canvas);
+
+  view->canvas = grub_gui_canvas_new ();
+  ((grub_gui_component_t) view->canvas)
+    ->ops->set_bounds ((grub_gui_component_t) view->canvas,
+                       &view->screen);
+
+  while (has_more (&p))
+    {
+      /* Skip comments (lines beginning with #).  */
+      if (peek_char (&p) == '#')
+        {
+          advance_to_next_line (&p);
+          continue;
+        }
+
+      /* Find the first non-whitespace character.  */
+      skip_whitespace (&p);
+
+      /* Handle the content.  */
+      if (peek_char (&p) == '+')
+        {
+          /* Skip the '+'.  */
+          read_char (&p);
+          read_object (&p, view->canvas);
+        }
+      else
+        {
+          read_property (&p);
+        }
+
+      if (grub_errno != GRUB_ERR_NONE)
+        goto fail;
+    }
+
+  /* Set the new theme path.  */
+  grub_free (view->theme_path);
+  view->theme_path = grub_strdup (theme_path);
+  goto cleanup;
+
+fail:
+  if (view->canvas)
+    {
+      view->canvas->ops->component.destroy (view->canvas);
+      view->canvas = 0;
+    }
+
+cleanup:
+  grub_free (p.buf);
+  grub_file_close (file);
+  grub_free (p.theme_dir);
+  return grub_errno;
+}
diff --git a/gfxmenu/view.c b/gfxmenu/view.c
new file mode 100644
index 000000000..56edc86cf
--- /dev/null
+++ b/gfxmenu/view.c
@@ -0,0 +1,497 @@
+/* view.c - Graphical menu interface MVC view. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/file.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/err.h>
+#include <grub/dl.h>
+#include <grub/normal.h>
+#include <grub/video.h>
+#include <grub/gui_string_util.h>
+#include <grub/gfxterm.h>
+#include <grub/bitmap.h>
+#include <grub/bitmap_scale.h>
+#include <grub/term.h>
+#include <grub/gfxwidgets.h>
+#include <grub/time.h>
+#include <grub/menu.h>
+#include <grub/menu_viewer.h>
+#include <grub/gfxmenu_view.h>
+#include <grub/gui.h>
+#include <grub/icon_manager.h>
+
+/* The component ID identifying GUI components to be updated as the timeout
+   status changes.  */
+#define TIMEOUT_COMPONENT_ID "__timeout__"
+
+static void init_terminal (grub_gfxmenu_view_t view);
+static void destroy_terminal (void);
+static grub_err_t set_graphics_mode (void);
+static grub_err_t set_text_mode (void);
+
+/* Create a new view object, loading the theme specified by THEME_PATH and
+   associating MODEL with the view.  */
+grub_gfxmenu_view_t
+grub_gfxmenu_view_new (const char *theme_path, grub_gfxmenu_model_t model)
+{
+  grub_gfxmenu_view_t view;
+
+  view = grub_malloc (sizeof (*view));
+  if (! view)
+    return 0;
+
+  set_graphics_mode ();
+  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
+  grub_video_get_viewport ((unsigned *) &view->screen.x,
+                           (unsigned *) &view->screen.y,
+                           (unsigned *) &view->screen.width,
+                           (unsigned *) &view->screen.height);
+
+  /* Clear the screen; there may be garbage left over in video memory, and
+     loading the menu style (particularly the background) can take a while. */
+  grub_video_fill_rect (grub_video_map_rgb (0, 0, 0),
+                        view->screen.x, view->screen.y,
+                        view->screen.width, view->screen.height);
+  grub_video_swap_buffers ();
+
+  grub_font_t default_font;
+  grub_gui_color_t default_fg_color;
+  grub_gui_color_t default_bg_color;
+
+  default_font = grub_font_get ("Helvetica 12");
+  default_fg_color = grub_gui_color_rgb (0, 0, 0);
+  default_bg_color = grub_gui_color_rgb (255, 255, 255);
+
+  view->model = model;
+  view->canvas = 0;
+
+  view->title_font = default_font;
+  view->message_font = default_font;
+  view->terminal_font_name = grub_strdup ("Fixed 10");
+  view->title_color = default_fg_color;
+  view->message_color = default_bg_color;
+  view->message_bg_color = default_fg_color;
+  view->desktop_image = 0;
+  view->desktop_color = default_bg_color;
+  view->terminal_box = grub_gfxmenu_create_box (0, 0);
+  view->title_text = grub_strdup ("GRUB Boot Menu");
+  view->progress_message_text = 0;
+  view->theme_path = 0;
+
+  if (grub_gfxmenu_view_load_theme (view, theme_path) != 0)
+    {
+      grub_gfxmenu_view_destroy (view);
+      return 0;
+    }
+
+  init_terminal (view);
+
+  return view;
+}
+
+/* Destroy the view object.  All used memory is freed.  */
+void
+grub_gfxmenu_view_destroy (grub_gfxmenu_view_t view)
+{
+  grub_video_bitmap_destroy (view->desktop_image);
+  if (view->terminal_box)
+    view->terminal_box->destroy (view->terminal_box);
+  grub_free (view->terminal_font_name);
+  grub_free (view->title_text);
+  grub_free (view->progress_message_text);
+  grub_free (view->theme_path);
+  if (view->canvas)
+    view->canvas->ops->component.destroy (view->canvas);
+  grub_free (view);
+
+  set_text_mode ();
+  destroy_terminal ();
+}
+
+/* Sets MESSAGE as the progress message for the view.
+   MESSAGE can be 0, in which case no message is displayed.  */
+static void
+set_progress_message (grub_gfxmenu_view_t view, const char *message)
+{
+  grub_free (view->progress_message_text);
+  if (message)
+    view->progress_message_text = grub_strdup (message);
+  else
+    view->progress_message_text = 0;
+}
+
+static void
+draw_background (grub_gfxmenu_view_t view)
+{
+  if (view->desktop_image)
+    {
+      struct grub_video_bitmap *img = view->desktop_image;
+      grub_video_blit_bitmap (img, GRUB_VIDEO_BLIT_REPLACE,
+                              view->screen.x, view->screen.y, 0, 0,
+                              grub_video_bitmap_get_width (img),
+                              grub_video_bitmap_get_height (img));
+    }
+  else
+    {
+      grub_video_fill_rect (grub_gui_map_color (view->desktop_color),
+                            view->screen.x, view->screen.y,
+                            view->screen.width, view->screen.height);
+    }
+}
+
+static void
+draw_title (grub_gfxmenu_view_t view)
+{
+  if (! view->title_text)
+    return;
+
+  /* Center the title. */
+  int title_width = grub_font_get_string_width (view->title_font,
+                                                view->title_text);
+  int x = (view->screen.width - title_width) / 2;
+  int y = 40 + grub_font_get_ascent (view->title_font);
+  grub_font_draw_string (view->title_text,
+                         view->title_font,
+                         grub_gui_map_color (view->title_color),
+                         x, y);
+}
+
+struct progress_value_data
+{
+  const char *visible;
+  const char *start;
+  const char *end;
+  const char *value;
+  const char *text;
+};
+
+static void
+update_timeout_visit (grub_gui_component_t component,
+                      void *userdata)
+{
+  struct progress_value_data *pv;
+  pv = (struct progress_value_data *) userdata;
+  component->ops->set_property (component, "visible", pv->visible);
+  component->ops->set_property (component, "start", pv->start);
+  component->ops->set_property (component, "end", pv->end);
+  component->ops->set_property (component, "value", pv->value);
+  component->ops->set_property (component, "text", pv->text);
+}
+
+static void
+update_timeout (grub_gfxmenu_view_t view)
+{
+  char startbuf[20];
+  char valuebuf[20];
+  char msgbuf[120];
+
+  int timeout = grub_gfxmenu_model_get_timeout_ms (view->model);
+  int remaining = grub_gfxmenu_model_get_timeout_remaining_ms (view->model);
+  struct progress_value_data pv;
+
+  pv.visible = timeout > 0 ? "true" : "false";
+  grub_sprintf (startbuf, "%d", -timeout);
+  pv.start = startbuf;
+  pv.end = "0";
+  grub_sprintf (valuebuf, "%d", remaining > 0 ? -remaining : 0);
+  pv.value = valuebuf;
+
+  int seconds_remaining_rounded_up = (remaining + 999) / 1000;
+  grub_sprintf (msgbuf,
+                "The highlighted entry will be booted automatically in %d s.",
+                seconds_remaining_rounded_up);
+  pv.text = msgbuf;
+
+  grub_gui_find_by_id ((grub_gui_component_t) view->canvas,
+                       TIMEOUT_COMPONENT_ID, update_timeout_visit, &pv);
+}
+
+static void
+update_menu_visit (grub_gui_component_t component,
+                   void *userdata)
+{
+  grub_gfxmenu_view_t view;
+  view = userdata;
+  if (component->ops->is_instance (component, "list"))
+    {
+      grub_gui_list_t list = (grub_gui_list_t) component;
+      list->ops->set_view_info (list, view->theme_path, view->model);
+    }
+}
+
+/* Update any boot menu components with the current menu model and
+   theme path.  */
+static void
+update_menu_components (grub_gfxmenu_view_t view)
+{
+  grub_gui_iterate_recursively ((grub_gui_component_t) view->canvas,
+                                update_menu_visit, view);
+}
+
+static void
+draw_message (grub_gfxmenu_view_t view)
+{
+  char *text = view->progress_message_text;
+  if (! text)
+    return;
+
+  grub_font_t font = view->message_font;
+  grub_video_color_t color = grub_gui_map_color (view->message_color);
+
+  /* Set the timeout bar's frame.  */
+  grub_video_rect_t f;
+  f.width = view->screen.width * 4 / 5;
+  f.height = 50;
+  f.x = view->screen.x + (view->screen.width - f.width) / 2;
+  f.y = view->screen.y + view->screen.height - 90 - 20 - f.height;
+
+  /* Border.  */
+  grub_video_fill_rect (color,
+                        f.x-1, f.y-1, f.width+2, f.height+2);
+  /* Fill.  */
+  grub_video_fill_rect (grub_gui_map_color (view->message_bg_color),
+                        f.x, f.y, f.width, f.height);
+
+  /* Center the text. */
+  int text_width = grub_font_get_string_width (font, text);
+  int x = f.x + (f.width - text_width) / 2;
+  int y = (f.y + (f.height - grub_font_get_descent (font)) / 2
+           + grub_font_get_ascent (font) / 2);
+  grub_font_draw_string (text, font, color, x, y);
+}
+
+
+void
+grub_gfxmenu_view_draw (grub_gfxmenu_view_t view)
+{
+  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
+  update_timeout (view);
+  update_menu_components (view);
+
+  draw_background (view);
+  if (view->canvas)
+    view->canvas->ops->component.paint (view->canvas);
+  draw_title (view);
+  draw_message (view);
+}
+
+static grub_err_t
+set_graphics_mode (void)
+{
+  const char *modestr = grub_env_get ("gfxmode");
+  if (!modestr || !modestr[0])
+    modestr = "auto";
+  return grub_video_set_mode (modestr, GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
+}
+
+static grub_err_t
+set_text_mode (void)
+{
+  return grub_video_restore ();
+}
+
+static int term_target_width;
+static int term_target_height;
+static struct grub_video_render_target *term_target;
+static int term_initialized;
+static grub_term_output_t term_original;
+static grub_gfxmenu_view_t term_view;
+
+static void
+repaint_terminal (int x __attribute ((unused)),
+                  int y __attribute ((unused)),
+                  int width __attribute ((unused)),
+                  int height __attribute ((unused)))
+{
+  if (! term_view)
+    return;
+
+  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
+  grub_gfxmenu_view_draw (term_view);
+  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
+
+  int termx = term_view->screen.x
+    + term_view->screen.width * (10 - 7) / 10 / 2;
+  int termy = term_view->screen.y
+    + term_view->screen.height * (10 - 7) / 10 / 2;
+
+  grub_gfxmenu_box_t term_box = term_view->terminal_box;
+  if (term_box)
+    {
+      term_box->set_content_size (term_box,
+                                  term_target_width, term_target_height);
+
+      term_box->draw (term_box,
+                      termx - term_box->get_left_pad (term_box),
+                      termy - term_box->get_top_pad (term_box));
+    }
+
+  grub_video_blit_render_target (term_target, GRUB_VIDEO_BLIT_REPLACE,
+                                 termx, termy,
+                                 0, 0, term_target_width, term_target_height);
+  grub_video_swap_buffers ();
+}
+
+static void
+init_terminal (grub_gfxmenu_view_t view)
+{
+  term_original = grub_term_get_current_output ();
+
+  term_target_width = view->screen.width * 7 / 10;
+  term_target_height = view->screen.height * 7 / 10;
+
+  grub_video_create_render_target (&term_target,
+                                   term_target_width,
+                                   term_target_height,
+                                   GRUB_VIDEO_MODE_TYPE_RGB
+                                   | GRUB_VIDEO_MODE_TYPE_ALPHA);
+  if (grub_errno != GRUB_ERR_NONE)
+    return;
+
+  /* Note: currently there is no API for changing the gfxterm font
+     on the fly, so whatever font the initially loaded theme specifies
+     will be permanent.  */
+  grub_gfxterm_init_window (term_target, 0, 0,
+                            term_target_width, term_target_height, 0,
+                            view->terminal_font_name, 3);
+  if (grub_errno != GRUB_ERR_NONE)
+    return;
+  term_initialized = 1;
+
+  /* XXX: store static pointer to the 'view' object so the repaint callback can access it.  */
+  term_view = view;
+  grub_gfxterm_set_repaint_callback (repaint_terminal);
+  grub_term_set_current_output (grub_gfxterm_get_term ());
+}
+
+static void destroy_terminal (void)
+{
+  term_view = 0;
+  if (term_initialized)
+    grub_gfxterm_destroy_window ();
+  grub_gfxterm_set_repaint_callback (0);
+  if (term_target)
+    grub_video_delete_render_target (term_target);
+  if (term_original)
+    grub_term_set_current_output (term_original);
+}
+
+
+static void
+notify_booting (grub_menu_entry_t entry, void *userdata)
+{
+  grub_gfxmenu_view_t view = (grub_gfxmenu_view_t) userdata;
+
+  char *s = grub_malloc (100 + grub_strlen (entry->title));
+  if (!s)
+    return;
+
+  grub_sprintf (s, "Booting '%s'", entry->title);
+  set_progress_message (view, s);
+  grub_free (s);
+  grub_gfxmenu_view_draw (view);
+  grub_video_swap_buffers ();
+}
+
+static void
+notify_fallback (grub_menu_entry_t entry, void *userdata)
+{
+  grub_gfxmenu_view_t view = (grub_gfxmenu_view_t) userdata;
+
+  char *s = grub_malloc (100 + grub_strlen (entry->title));
+  if (!s)
+    return;
+
+  grub_sprintf (s, "Falling back to '%s'", entry->title);
+  set_progress_message (view, s);
+  grub_free (s);
+  grub_gfxmenu_view_draw (view);
+  grub_video_swap_buffers ();
+}
+
+static void
+notify_execution_failure (void *userdata __attribute__ ((unused)))
+{
+}
+
+
+static struct grub_menu_execute_callback execute_callback =
+{
+  .notify_booting = notify_booting,
+  .notify_fallback = notify_fallback,
+  .notify_failure = notify_execution_failure
+};
+
+int
+grub_gfxmenu_view_execute_with_fallback (grub_gfxmenu_view_t view,
+                                         grub_menu_entry_t entry)
+{
+  grub_menu_execute_with_fallback (grub_gfxmenu_model_get_menu (view->model),
+                                   entry, &execute_callback, (void *) view);
+
+  if (set_graphics_mode () != GRUB_ERR_NONE)
+    return 0;  /* Failure.  */
+
+  /* If we returned, there was a failure.  */
+  set_progress_message (view,
+                        "Unable to automatically boot.  "
+                        "Press SPACE to continue.");
+  grub_gfxmenu_view_draw (view);
+  grub_video_swap_buffers ();
+  while (GRUB_TERM_ASCII_CHAR(grub_getkey ()) != ' ')
+    {
+      /* Wait for SPACE to be pressed.  */
+    }
+
+  set_progress_message (view, 0);   /* Clear the message.  */
+
+  return 1;   /* Ok.  */
+}
+
+int
+grub_gfxmenu_view_execute_entry (grub_gfxmenu_view_t view,
+                                 grub_menu_entry_t entry)
+{
+  /* Currently we switch back to text mode by restoring
+     the original terminal before executing the menu entry.
+     It is hard to make it work when executing a menu entry
+     that switches video modes -- it using gfxterm in a
+     window, the repaint callback seems to crash GRUB. */
+  /* TODO: Determine if this works when 'gfxterm' was set as
+     the current terminal before invoking the gfxmenu. */
+  destroy_terminal ();
+
+  grub_menu_execute_entry (entry);
+  if (grub_errno != GRUB_ERR_NONE)
+    grub_wait_after_message ();
+
+  if (set_graphics_mode () != GRUB_ERR_NONE)
+    return 0;  /* Failure.  */
+
+  init_terminal (view);
+  return 1;   /* Ok.  */
+}
+
+void
+grub_gfxmenu_view_run_terminal (grub_gfxmenu_view_t view __attribute__((unused)))
+{
+  grub_cmdline_run (1);
+}
diff --git a/gfxmenu/widget-box.c b/gfxmenu/widget-box.c
new file mode 100644
index 000000000..079fd66d4
--- /dev/null
+++ b/gfxmenu/widget-box.c
@@ -0,0 +1,313 @@
+/* widget_box.c - Pixmap-stylized box widget. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/mm.h>
+#include <grub/err.h>
+#include <grub/video.h>
+#include <grub/bitmap.h>
+#include <grub/bitmap_scale.h>
+#include <grub/gfxwidgets.h>
+
+enum box_pixmaps
+{
+  BOX_PIXMAP_NW, BOX_PIXMAP_NE, BOX_PIXMAP_SE, BOX_PIXMAP_SW,
+  BOX_PIXMAP_N, BOX_PIXMAP_E, BOX_PIXMAP_S, BOX_PIXMAP_W,
+  BOX_PIXMAP_CENTER
+};
+
+static const char *box_pixmap_names[] = {
+  /* Corners: */
+  "nw", "ne", "se", "sw",
+  /* Sides: */
+  "n", "e", "s", "w",
+  /* Center: */
+  "c"
+};
+
+#define BOX_NUM_PIXMAPS (sizeof(box_pixmap_names)/sizeof(*box_pixmap_names))
+
+static int
+get_height (struct grub_video_bitmap *bitmap)
+{
+  if (bitmap)
+    return grub_video_bitmap_get_height (bitmap);
+  else
+    return 0;
+}
+
+static int
+get_width (struct grub_video_bitmap *bitmap)
+{
+  if (bitmap)
+    return grub_video_bitmap_get_width (bitmap);
+  else
+    return 0;
+}
+
+static void
+blit (grub_gfxmenu_box_t self, int pixmap_index, int x, int y)
+{
+  struct grub_video_bitmap *bitmap;
+  bitmap = self->scaled_pixmaps[pixmap_index];
+  if (! bitmap)
+    return;
+  grub_video_blit_bitmap (bitmap, GRUB_VIDEO_BLIT_BLEND,
+                          x, y, 0, 0,
+                          grub_video_bitmap_get_width (bitmap),
+                          grub_video_bitmap_get_height (bitmap));
+}
+
+static void
+draw (grub_gfxmenu_box_t self, int x, int y)
+{
+  int height_n;
+  int height_s;
+  int height_e;
+  int height_w;
+  int width_n;
+  int width_s;
+  int width_e;
+  int width_w;
+
+  height_n = get_height (self->scaled_pixmaps[BOX_PIXMAP_N]);
+  height_s = get_height (self->scaled_pixmaps[BOX_PIXMAP_S]);
+  height_e = get_height (self->scaled_pixmaps[BOX_PIXMAP_E]);
+  height_w = get_height (self->scaled_pixmaps[BOX_PIXMAP_W]);
+  width_n = get_width (self->scaled_pixmaps[BOX_PIXMAP_N]);
+  width_s = get_width (self->scaled_pixmaps[BOX_PIXMAP_S]);
+  width_e = get_width (self->scaled_pixmaps[BOX_PIXMAP_E]);
+  width_w = get_width (self->scaled_pixmaps[BOX_PIXMAP_W]);
+
+  /* Draw sides.  */
+  blit (self, BOX_PIXMAP_N, x + width_w, y);
+  blit (self, BOX_PIXMAP_S, x + width_w, y + height_n + self->content_height);
+  blit (self, BOX_PIXMAP_E, x + width_w + self->content_width, y + height_n);
+  blit (self, BOX_PIXMAP_W, x, y + height_n);
+
+  /* Draw corners.  */
+  blit (self, BOX_PIXMAP_NW, x, y);
+  blit (self, BOX_PIXMAP_NE, x + width_w + self->content_width, y);
+  blit (self, BOX_PIXMAP_SE,
+        x + width_w + self->content_width,
+        y + height_n + self->content_height);
+  blit (self, BOX_PIXMAP_SW, x, y + height_n + self->content_height);
+
+  /* Draw center.  */
+  blit (self, BOX_PIXMAP_CENTER, x + width_w, y + height_n);
+}
+
+static grub_err_t
+scale_pixmap (grub_gfxmenu_box_t self, int i, int w, int h)
+{
+  struct grub_video_bitmap **scaled = &self->scaled_pixmaps[i];
+  struct grub_video_bitmap *raw = self->raw_pixmaps[i];
+
+  if (raw == 0)
+    return grub_errno;
+
+  if (w == -1)
+    w = grub_video_bitmap_get_width (raw);
+  if (h == -1)
+    h = grub_video_bitmap_get_height (raw);
+
+  if (*scaled == 0
+      || ((int) grub_video_bitmap_get_width (*scaled) != w)
+      || ((int) grub_video_bitmap_get_height (*scaled) != h))
+    {
+      if (*scaled)
+        {
+          grub_video_bitmap_destroy (*scaled);
+          *scaled = 0;
+        }
+
+      /* Don't try to create a bitmap with a zero dimension.  */
+      if (w != 0 && h != 0)
+        grub_video_bitmap_create_scaled (scaled, w, h, raw,
+                                         GRUB_VIDEO_BITMAP_SCALE_METHOD_BEST);
+      if (grub_errno != GRUB_ERR_NONE)
+        {
+          grub_error_push ();
+          grub_error (grub_errno,
+                      "failed to scale bitmap for styled box pixmap #%d", i);
+        }
+    }
+
+  return grub_errno;
+}
+
+static void
+set_content_size (grub_gfxmenu_box_t self,
+                  int width, int height)
+{
+  self->content_width = width;
+  self->content_height = height;
+
+  /* Resize sides to match the width and height.  */
+  /* It is assumed that the corners width/height match the adjacent sides.  */
+
+  /* Resize N and S sides to match width.  */
+  if (scale_pixmap(self, BOX_PIXMAP_N, width, -1) != GRUB_ERR_NONE)
+    return;
+  if (scale_pixmap(self, BOX_PIXMAP_S, width, -1) != GRUB_ERR_NONE)
+    return;
+
+  /* Resize E and W sides to match height.  */
+  if (scale_pixmap(self, BOX_PIXMAP_E, -1, height) != GRUB_ERR_NONE)
+      return;
+  if (scale_pixmap(self, BOX_PIXMAP_W, -1, height) != GRUB_ERR_NONE)
+    return;
+
+  /* Don't scale the corners--they are assumed to match the sides. */
+  if (scale_pixmap(self, BOX_PIXMAP_NW, -1, -1) != GRUB_ERR_NONE)
+    return;
+  if (scale_pixmap(self, BOX_PIXMAP_SW, -1, -1) != GRUB_ERR_NONE)
+    return;
+  if (scale_pixmap(self, BOX_PIXMAP_NE, -1, -1) != GRUB_ERR_NONE)
+    return;
+  if (scale_pixmap(self, BOX_PIXMAP_SE, -1, -1) != GRUB_ERR_NONE)
+    return;
+
+  /* Scale the center area. */
+  if (scale_pixmap(self, BOX_PIXMAP_CENTER, width, height) != GRUB_ERR_NONE)
+    return;
+}
+
+static int
+get_left_pad (grub_gfxmenu_box_t self)
+{
+  return get_width (self->raw_pixmaps[BOX_PIXMAP_W]);
+}
+
+static int
+get_top_pad (grub_gfxmenu_box_t self)
+{
+  return get_height (self->raw_pixmaps[BOX_PIXMAP_N]);
+}
+
+static int
+get_right_pad (grub_gfxmenu_box_t self)
+{
+  return get_width (self->raw_pixmaps[BOX_PIXMAP_E]);
+}
+
+static int
+get_bottom_pad (grub_gfxmenu_box_t self)
+{
+  return get_height (self->raw_pixmaps[BOX_PIXMAP_S]);
+}
+
+static void
+destroy (grub_gfxmenu_box_t self)
+{
+  unsigned i;
+  for (i = 0; i < BOX_NUM_PIXMAPS; i++)
+    {
+      if (self->raw_pixmaps[i])
+        grub_video_bitmap_destroy(self->raw_pixmaps[i]);
+      self->raw_pixmaps[i] = 0;
+
+      if (self->scaled_pixmaps[i])
+        grub_video_bitmap_destroy(self->scaled_pixmaps[i]);
+      self->scaled_pixmaps[i] = 0;
+    }
+  grub_free (self->raw_pixmaps);
+  self->raw_pixmaps = 0;
+  grub_free (self->scaled_pixmaps);
+  self->scaled_pixmaps = 0;
+
+  /* Free self:  must be the last step!  */
+  grub_free (self);
+}
+
+
+/* Create a new box.  If PIXMAPS_PREFIX and PIXMAPS_SUFFIX are both non-null,
+   then an attempt is made to load the north, south, east, west, northwest,
+   northeast, southeast, southwest, and center pixmaps.
+   If either PIXMAPS_PREFIX or PIXMAPS_SUFFIX is 0, then no pixmaps are
+   loaded, and the box has zero-width borders and is drawn transparent.  */
+grub_gfxmenu_box_t
+grub_gfxmenu_create_box (const char *pixmaps_prefix,
+                         const char *pixmaps_suffix)
+{
+  unsigned i;
+  grub_gfxmenu_box_t box;
+
+  box = (grub_gfxmenu_box_t) grub_malloc (sizeof (*box));
+  if (! box)
+    return 0;
+
+  box->content_width = 0;
+  box->content_height = 0;
+  box->raw_pixmaps =
+    (struct grub_video_bitmap **)
+    grub_malloc (BOX_NUM_PIXMAPS * sizeof (struct grub_video_bitmap *));
+  box->scaled_pixmaps =
+    (struct grub_video_bitmap **)
+    grub_malloc (BOX_NUM_PIXMAPS * sizeof (struct grub_video_bitmap *));
+
+  /* Initialize all pixmap pointers to NULL so that proper destruction can
+     be performed if an error is encountered partway through construction.  */
+  for (i = 0; i < BOX_NUM_PIXMAPS; i++)
+      box->raw_pixmaps[i] = 0;
+  for (i = 0; i < BOX_NUM_PIXMAPS; i++)
+      box->scaled_pixmaps[i] = 0;
+
+  /* Load the pixmaps.  */
+  for (i = 0; i < BOX_NUM_PIXMAPS; i++)
+    {
+      if (pixmaps_prefix && pixmaps_suffix)
+        {
+          char *path;
+          char *path_end;
+
+          path = grub_malloc (grub_strlen (pixmaps_prefix)
+                              + grub_strlen (box_pixmap_names[i])
+                              + grub_strlen (pixmaps_suffix)
+                              + 1);
+          if (! path)
+            goto fail_and_destroy;
+
+          /* Construct the specific path for this pixmap.  */
+          path_end = grub_stpcpy (path, pixmaps_prefix);
+          path_end = grub_stpcpy (path_end, box_pixmap_names[i]);
+          path_end = grub_stpcpy (path_end, pixmaps_suffix);
+
+          grub_video_bitmap_load (&box->raw_pixmaps[i], path);
+          grub_free (path);
+
+          /* Ignore missing pixmaps.  */
+          grub_errno = GRUB_ERR_NONE;
+        }
+    }
+
+  box->draw = draw;
+  box->set_content_size = set_content_size;
+  box->get_left_pad = get_left_pad;
+  box->get_top_pad = get_top_pad;
+  box->get_right_pad = get_right_pad;
+  box->get_bottom_pad = get_bottom_pad;
+  box->destroy = destroy;
+  return box;
+
+fail_and_destroy:
+  destroy (box);
+  return 0;
+}
diff --git a/include/grub/gfxmenu_model.h b/include/grub/gfxmenu_model.h
new file mode 100644
index 000000000..e5c7da3ac
--- /dev/null
+++ b/include/grub/gfxmenu_model.h
@@ -0,0 +1,59 @@
+/* gfxmenu_model.h - gfxmenu model interface. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/>.
+ */
+
+#ifndef GRUB_GFXMENU_MODEL_HEADER
+#define GRUB_GFXMENU_MODEL_HEADER 1
+
+#include <grub/menu.h>
+
+struct grub_gfxmenu_model;   /* Forward declaration of opaque type.  */
+typedef struct grub_gfxmenu_model *grub_gfxmenu_model_t;
+
+
+grub_gfxmenu_model_t grub_gfxmenu_model_new (grub_menu_t menu);
+
+void grub_gfxmenu_model_destroy (grub_gfxmenu_model_t model);
+
+grub_menu_t grub_gfxmenu_model_get_menu (grub_gfxmenu_model_t model);
+
+void grub_gfxmenu_model_set_timeout (grub_gfxmenu_model_t model);
+
+void grub_gfxmenu_model_clear_timeout (grub_gfxmenu_model_t model);
+
+int grub_gfxmenu_model_get_timeout_ms (grub_gfxmenu_model_t model);
+
+int grub_gfxmenu_model_get_timeout_remaining_ms (grub_gfxmenu_model_t model);
+
+int grub_gfxmenu_model_timeout_expired (grub_gfxmenu_model_t model);
+
+int grub_gfxmenu_model_get_num_entries (grub_gfxmenu_model_t model);
+
+int grub_gfxmenu_model_get_selected_index (grub_gfxmenu_model_t model);
+
+void grub_gfxmenu_model_set_selected_index (grub_gfxmenu_model_t model,
+                                            int index);
+
+const char *grub_gfxmenu_model_get_entry_title (grub_gfxmenu_model_t model,
+                                                int index);
+
+grub_menu_entry_t grub_gfxmenu_model_get_entry (grub_gfxmenu_model_t model,
+                                                int index);
+
+#endif /* GRUB_GFXMENU_MODEL_HEADER */
+
diff --git a/include/grub/gfxmenu_view.h b/include/grub/gfxmenu_view.h
new file mode 100644
index 000000000..1144382f2
--- /dev/null
+++ b/include/grub/gfxmenu_view.h
@@ -0,0 +1,91 @@
+/* gfxmenu_view.h - gfxmenu view interface. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/>.
+ */
+
+#ifndef GRUB_GFXMENU_VIEW_HEADER
+#define GRUB_GFXMENU_VIEW_HEADER 1
+
+#include <grub/types.h>
+#include <grub/err.h>
+#include <grub/menu.h>
+#include <grub/font.h>
+#include <grub/gfxmenu_model.h>
+#include <grub/gfxwidgets.h>
+
+struct grub_gfxmenu_view;   /* Forward declaration of opaque type.  */
+typedef struct grub_gfxmenu_view *grub_gfxmenu_view_t;
+
+
+grub_gfxmenu_view_t grub_gfxmenu_view_new (const char *theme_path,
+                                           grub_gfxmenu_model_t model);
+
+void grub_gfxmenu_view_destroy (grub_gfxmenu_view_t view);
+
+/* Set properties on the view based on settings from the specified
+   theme file.  */
+grub_err_t grub_gfxmenu_view_load_theme (grub_gfxmenu_view_t view,
+                                         const char *theme_path);
+
+grub_err_t grub_gui_recreate_box (grub_gfxmenu_box_t *boxptr,
+                                  const char *pattern, const char *theme_dir);
+
+void grub_gfxmenu_view_draw (grub_gfxmenu_view_t view);
+
+int grub_gfxmenu_view_execute_with_fallback (grub_gfxmenu_view_t view,
+                                             grub_menu_entry_t entry);
+
+int grub_gfxmenu_view_execute_entry (grub_gfxmenu_view_t view,
+                                     grub_menu_entry_t entry);
+
+void grub_gfxmenu_view_run_terminal (grub_gfxmenu_view_t view);
+
+
+
+/* Implementation details -- this should not be used outside of the
+   view itself.  */
+
+#include <grub/video.h>
+#include <grub/bitmap.h>
+#include <grub/gui.h>
+#include <grub/gfxwidgets.h>
+#include <grub/icon_manager.h>
+
+/* Definition of the private representation of the view.  */
+struct grub_gfxmenu_view
+{
+  grub_video_rect_t screen;
+
+  grub_font_t title_font;
+  grub_font_t message_font;
+  char *terminal_font_name;
+  grub_gui_color_t title_color;
+  grub_gui_color_t message_color;
+  grub_gui_color_t message_bg_color;
+  struct grub_video_bitmap *desktop_image;
+  grub_gui_color_t desktop_color;
+  grub_gfxmenu_box_t terminal_box;
+  char *title_text;
+  char *progress_message_text;
+  char *theme_path;
+
+  grub_gui_container_t canvas;
+
+  grub_gfxmenu_model_t model;
+};
+
+#endif /* ! GRUB_GFXMENU_VIEW_HEADER */
diff --git a/include/grub/gfxwidgets.h b/include/grub/gfxwidgets.h
new file mode 100644
index 000000000..f9678bf9e
--- /dev/null
+++ b/include/grub/gfxwidgets.h
@@ -0,0 +1,49 @@
+/* gfxwidgets.h - Widgets for the graphical menu (gfxmenu).  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/>.
+ */
+
+#ifndef GRUB_GFXWIDGETS_HEADER
+#define GRUB_GFXWIDGETS_HEADER 1
+
+#include <grub/video.h>
+
+typedef struct grub_gfxmenu_box *grub_gfxmenu_box_t;
+
+struct grub_gfxmenu_box
+{
+  /* The size of the content.  */
+  int content_width;
+  int content_height;
+
+  struct grub_video_bitmap **raw_pixmaps;
+  struct grub_video_bitmap **scaled_pixmaps;
+
+  void (*draw) (grub_gfxmenu_box_t self, int x, int y);
+  void (*set_content_size) (grub_gfxmenu_box_t self,
+                            int width, int height);
+  int (*get_left_pad) (grub_gfxmenu_box_t self);
+  int (*get_top_pad) (grub_gfxmenu_box_t self);
+  int (*get_right_pad) (grub_gfxmenu_box_t self);
+  int (*get_bottom_pad) (grub_gfxmenu_box_t self);
+  void (*destroy) (grub_gfxmenu_box_t self);
+};
+
+grub_gfxmenu_box_t grub_gfxmenu_create_box (const char *pixmaps_prefix,
+                                            const char *pixmaps_suffix);
+
+#endif /* ! GRUB_GFXWIDGETS_HEADER */
diff --git a/include/grub/gui.h b/include/grub/gui.h
new file mode 100644
index 000000000..5b785dbb5
--- /dev/null
+++ b/include/grub/gui.h
@@ -0,0 +1,165 @@
+/* gui.h - GUI components header file. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/err.h>
+#include <grub/video.h>
+#include <grub/bitmap.h>
+#include <grub/gfxmenu_model.h>
+
+#ifndef GRUB_GUI_H
+#define GRUB_GUI_H 1
+
+/* A representation of a color.  Unlike grub_video_color_t, this
+   representation is independent of any video mode specifics.  */
+typedef struct grub_gui_color
+{
+  grub_uint8_t red;
+  grub_uint8_t green;
+  grub_uint8_t blue;
+  grub_uint8_t alpha;
+} grub_gui_color_t;
+
+typedef struct grub_gui_component *grub_gui_component_t;
+typedef struct grub_gui_container *grub_gui_container_t;
+typedef struct grub_gui_list *grub_gui_list_t;
+
+typedef void (*grub_gui_component_callback) (grub_gui_component_t component,
+                                             void *userdata);
+
+/* Component interface.  */
+
+struct grub_gui_component_ops
+{
+  void (*destroy) (void *self);
+  const char * (*get_id) (void *self);
+  int (*is_instance) (void *self, const char *type);
+  void (*paint) (void *self);
+  void (*set_parent) (void *self, grub_gui_container_t parent);
+  grub_gui_container_t (*get_parent) (void *self);
+  void (*set_bounds) (void *self, const grub_video_rect_t *bounds);
+  void (*get_bounds) (void *self, grub_video_rect_t *bounds);
+  void (*get_preferred_size) (void *self, int *width, int *height);
+  grub_err_t (*set_property) (void *self, const char *name, const char *value);
+};
+
+struct grub_gui_container_ops
+{
+  struct grub_gui_component_ops component;
+  void (*add) (void *self, grub_gui_component_t comp);
+  void (*remove) (void *self, grub_gui_component_t comp);
+  void (*iterate_children) (void *self,
+                            grub_gui_component_callback cb, void *userdata);
+};
+
+struct grub_gui_list_ops
+{
+  struct grub_gui_component_ops component_ops;
+  void (*set_view_info) (void *self,
+                         const char *theme_path,
+                         grub_gfxmenu_model_t menu);
+};
+
+struct grub_gui_component
+{
+  struct grub_gui_component_ops *ops;
+};
+
+struct grub_gui_container
+{
+  struct grub_gui_container_ops *ops;
+};
+
+struct grub_gui_list
+{
+  struct grub_gui_list_ops *ops;
+};
+
+
+/* Interfaces to concrete component classes.  */
+
+grub_gui_container_t grub_gui_canvas_new (void);
+grub_gui_container_t grub_gui_vbox_new (void);
+grub_gui_container_t grub_gui_hbox_new (void);
+grub_gui_component_t grub_gui_label_new (void);
+grub_gui_component_t grub_gui_image_new (void);
+grub_gui_component_t grub_gui_progress_bar_new (void);
+grub_gui_component_t grub_gui_list_new (void);
+grub_gui_component_t grub_gui_circular_progress_new (void);
+
+/* Manipulation functions.  */
+
+/* Visit all components with the specified ID.  */
+void grub_gui_find_by_id (grub_gui_component_t root,
+                          const char *id,
+                          grub_gui_component_callback cb,
+                          void *userdata);
+
+/* Visit all components.  */
+void grub_gui_iterate_recursively (grub_gui_component_t root,
+                                   grub_gui_component_callback cb,
+                                   void *userdata);
+
+/* Helper functions.  */
+
+static __inline void
+grub_gui_save_viewport (grub_video_rect_t *r)
+{
+  grub_video_get_viewport ((unsigned *) &r->x,
+                           (unsigned *) &r->y,
+                           (unsigned *) &r->width,
+                           (unsigned *) &r->height);
+}
+
+static __inline void
+grub_gui_restore_viewport (const grub_video_rect_t *r)
+{
+  grub_video_set_viewport (r->x, r->y, r->width, r->height);
+}
+
+/* Set a new viewport relative the the current one, saving the current
+   viewport in OLD so it can be later restored.  */
+static __inline void
+grub_gui_set_viewport (const grub_video_rect_t *r, grub_video_rect_t *old)
+{
+  grub_gui_save_viewport (old);
+  grub_video_set_viewport (old->x + r->x,
+                           old->y + r->y,
+                           r->width,
+                           r->height);
+}
+
+static __inline grub_gui_color_t
+grub_gui_color_rgb (int r, int g, int b)
+{
+  grub_gui_color_t c;
+  c.red = r;
+  c.green = g;
+  c.blue = b;
+  c.alpha = 255;
+  return c;
+}
+
+static __inline grub_video_color_t
+grub_gui_map_color (grub_gui_color_t c)
+{
+  return grub_video_map_rgba (c.red, c.green, c.blue, c.alpha);
+}
+
+#endif /* ! GRUB_GUI_H */
diff --git a/include/grub/gui_string_util.h b/include/grub/gui_string_util.h
new file mode 100644
index 000000000..7b5fbb3ea
--- /dev/null
+++ b/include/grub/gui_string_util.h
@@ -0,0 +1,39 @@
+/* gui_string_util.h - String utilities for the graphical menu interface. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/>.
+ */
+
+#ifndef GRUB_GUI_STRING_UTIL_HEADER
+#define GRUB_GUI_STRING_UTIL_HEADER 1
+
+#include <grub/types.h>
+#include <grub/gui.h>
+
+char *grub_new_substring (const char *buf,
+                          grub_size_t start, grub_size_t end);
+
+char *grub_resolve_relative_path (const char *base, const char *path);
+
+char *grub_get_dirname (const char *file_path);
+
+int grub_gui_get_named_color (const char *name, grub_gui_color_t *color);
+
+grub_err_t grub_gui_parse_color (const char *s, grub_gui_color_t *color);
+
+grub_err_t grub_gui_parse_2_tuple (const char *s, int *px, int *py);
+
+#endif /* GRUB_GUI_STRING_UTIL_HEADER */
diff --git a/include/grub/icon_manager.h b/include/grub/icon_manager.h
new file mode 100644
index 000000000..81c488416
--- /dev/null
+++ b/include/grub/icon_manager.h
@@ -0,0 +1,41 @@
+/* icon_manager.h - gfxmenu icon manager. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/>.
+ */
+
+#ifndef GRUB_ICON_MANAGER_HEADER
+#define GRUB_ICON_MANAGER_HEADER 1
+
+#include <grub/menu.h>
+#include <grub/bitmap.h>
+
+/* Forward declaration of opaque structure handle type.  */
+typedef struct grub_gfxmenu_icon_manager *grub_gfxmenu_icon_manager_t;
+
+grub_gfxmenu_icon_manager_t grub_gfxmenu_icon_manager_new (void);
+void grub_gfxmenu_icon_manager_destroy (grub_gfxmenu_icon_manager_t mgr);
+void grub_gfxmenu_icon_manager_clear_cache (grub_gfxmenu_icon_manager_t mgr);
+void grub_gfxmenu_icon_manager_set_theme_path (grub_gfxmenu_icon_manager_t mgr,
+                                               const char *path);
+void grub_gfxmenu_icon_manager_set_icon_size (grub_gfxmenu_icon_manager_t mgr,
+                                              int width, int height);
+struct grub_video_bitmap *
+grub_gfxmenu_icon_manager_get_icon (grub_gfxmenu_icon_manager_t mgr,
+                                    grub_menu_entry_t entry);
+
+#endif /* GRUB_ICON_MANAGER_HEADER */
+
diff --git a/include/grub/term.h b/include/grub/term.h
index 316d75390..20b85d1cd 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -261,7 +261,7 @@ grub_term_set_current_input (grub_term_input_t term)
 }
 
 static inline grub_err_t
-grub_term_set_current_output (grub_term_output_t term)
+grub_term_set_current_output (const struct grub_term_output *term)
 {
   return grub_handler_set_current (&grub_term_output_class,
 				   GRUB_AS_HANDLER (term));

From 704e21180ed65e96111383a8b780eff614e0e035 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Nov 2009 16:07:16 +0100
Subject: [PATCH 0101/1628] At least it compiles now

---
 gfxmenu/gui_label.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gfxmenu/gui_label.c b/gfxmenu/gui_label.c
index 2e49c787e..eb2a495ff 100644
--- a/gfxmenu/gui_label.c
+++ b/gfxmenu/gui_label.c
@@ -151,7 +151,7 @@ label_get_preferred_size (void *vself, int *width, int *height)
     *height = self->preferred_height;
 }
 
-static void
+static grub_err_t
 label_set_property (void *vself, const char *name, const char *value)
 {
   grub_gui_label_t self = vself;
@@ -204,6 +204,7 @@ label_set_property (void *vself, const char *name, const char *value)
       else
         self->id = 0;
     }
+  return GRUB_ERR_NONE;
 }
 
 static struct grub_gui_component_ops label_ops =

From 8dec533a1cdeafd13c239121d36ffd507575bc47 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Nov 2009 22:26:08 +0100
Subject: [PATCH 0102/1628] ChangeLog

---
 ChangeLog.gfxmenu | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 ChangeLog.gfxmenu

diff --git a/ChangeLog.gfxmenu b/ChangeLog.gfxmenu
new file mode 100644
index 000000000..bc9db7170
--- /dev/null
+++ b/ChangeLog.gfxmenu
@@ -0,0 +1,31 @@
+2009-11-20  Colin D Bennett  <colin@gibibit.com>
+
+	* conf/common.rmk (pkglib_MODULES): Add gfxmenu.mod.
+	(gfxmenu_mod_SOURCES): New variable.
+	(gfxmenu_mod_CFLAGS): Likewise.
+	(gfxmenu_mod_LDFLAGS): Likewise.
+	* include/grub/term.h (grub_term_set_current_output): Declare
+	argument as const.
+	* docs/gfxmenu-theme-example.txt: New file.
+	* gfxmenu/gfxmenu.c: Likewise.
+	* gfxmenu/gui_box.c: Likewise.
+	* gfxmenu/gui_canvas.c: Likewise.
+	* gfxmenu/gui_circular_progress.c: Likewise.
+	* gfxmenu/gui_image.c: Likewise.
+	* gfxmenu/gui_label.c: Likewise.
+	* gfxmenu/gui_list.c: Likewise.
+	* gfxmenu/gui_progress_bar.c: Likewise.
+	* gfxmenu/gui_string_util.c: Likewise.
+	* gfxmenu/gui_util.c: Likewise.
+	* gfxmenu/icon_manager.c: Likewise.
+	* gfxmenu/model.c: Likewise.
+	* gfxmenu/named_colors.c: Likewise.
+	* gfxmenu/theme_loader.c: Likewise.
+	* gfxmenu/view.c: Likewise.
+	* gfxmenu/widget-box.c: Likewise.
+	* include/grub/gfxmenu_model.h: Likewise.
+	* include/grub/gfxmenu_view.h: Likewise.
+	* include/grub/gfxwidgets.h: Likewise.
+	* include/grub/gui.h: Likewise.
+	* include/grub/gui_string_util.h: Likewise.
+	* include/grub/icon_manager.h: Likewise.

From aff798d6f4ae597c6b887abc8977d63bc434aa10 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 21 Nov 2009 15:29:12 +0100
Subject: [PATCH 0103/1628] icondir support

---
 gfxmenu/gui_string_util.c | 13 ++++++++++---
 gfxmenu/icon_manager.c    | 18 ++++++++----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/gfxmenu/gui_string_util.c b/gfxmenu/gui_string_util.c
index 41170d724..31b2f0aca 100644
--- a/gfxmenu/gui_string_util.c
+++ b/gfxmenu/gui_string_util.c
@@ -150,18 +150,25 @@ grub_resolve_relative_path (const char *base, const char *path)
   char *abspath;
   char *canonpath;
   char *p;
+  grub_size_t l;
 
   /* If PATH is an absolute path, then just use it as is.  */
   if (path[0] == '/' || path[0] == '(')
     return canonicalize_path (path);
 
-  abspath = grub_malloc (grub_strlen (base) + grub_strlen (path) + 1);
+  abspath = grub_malloc (grub_strlen (base) + grub_strlen (path) + 3);
   if (! abspath)
     return 0;
 
-  /* Concatenate BASE and PATH.
-     Note that BASE is expected to have a trailing slash.  */
+  /* Concatenate BASE and PATH.  */
   p = grub_stpcpy (abspath, base);
+  l = grub_strlen (abspath);
+  if (l == 0 || abspath[l-1] != '/')
+    {
+      *p = '/';
+      p++;
+      *p = 0;
+    }
   grub_stpcpy (p, path);
 
   canonpath = canonicalize_path (abspath);
diff --git a/gfxmenu/icon_manager.c b/gfxmenu/icon_manager.c
index a362882e1..b7b891991 100644
--- a/gfxmenu/icon_manager.c
+++ b/gfxmenu/icon_manager.c
@@ -26,6 +26,7 @@
 #include <grub/bitmap_scale.h>
 #include <grub/menu.h>
 #include <grub/icon_manager.h>
+#include <grub/env.h>
 
 /* Currently hard coded to '.png' extension.  */
 static const char icon_extension[] = ".png";
@@ -200,19 +201,16 @@ get_icon_by_class (grub_gfxmenu_icon_manager_t mgr, const char *class_name)
       icon = try_loading_icon (mgr, icons_dir, class_name);
       grub_free (icons_dir);
     }
+
+  grub_free (theme_dir);
   if (! icon)
     {
-      /* If the theme doesn't have an appropriate icon, check in
-         "grub/themes/icons".  */
-      /* TODO use GRUB prefix "/icons" */
-      icons_dir = grub_resolve_relative_path (theme_dir, "../icons/");
-      if (icons_dir)
-        {
-          icon = try_loading_icon (mgr, icons_dir, class_name);
-          grub_free (icons_dir);
-        }
+      const char *icondir;
+
+      icondir = grub_env_get ("icondir");
+      if (icondir)
+	icon = try_loading_icon (mgr, icondir, class_name);
     }
-  grub_free (theme_dir);
 
   /* No icon was found.  */
   /* This should probably be noted in the cache, so that a search is not

From ade85305f87463be23b8c67c38cf670ab6f9dfff Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 21 Nov 2009 17:33:23 +0100
Subject: [PATCH 0104/1628] recognise mips64(el) targets

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 96aae837e..ed41cc232 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,12 +46,12 @@ AC_ARG_PROGRAM
 case "$target_cpu" in
   i[[3456]]86)	target_cpu=i386 ;;
   sparc)	target_cpu=sparc64 ;;
-  mipsel)
+  mipsel|mips64el)
                 target_cpu=mips;    
 		TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPSEL=1"; 
 		CFLAGS="$CFLAGS -DGRUB_CPU_MIPSEL=1";
 		;;
-  mips)
+  mips|mips64)
                 target_cpu=mips;    
 		TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPS=1"; 
 		CFLAGS="$CFLAGS -DGRUB_CPU_MIPS=1";

From 6abdf8e20d872d2aa991360c394479461fe3125b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 21 Nov 2009 17:33:52 +0100
Subject: [PATCH 0105/1628] Fix for native miscompilation

---
 conf/mips.rmk          |  2 +-
 genmoddep.awk          |  2 +-
 include/grub/dl.h      |  7 +++++++
 include/grub/mips/dl.h | 25 -------------------------
 kern/main.c            |  3 +++
 kern/mips/dl.c         | 12 +++++++++---
 6 files changed, 21 insertions(+), 30 deletions(-)
 delete mode 100644 include/grub/mips/dl.h

diff --git a/conf/mips.rmk b/conf/mips.rmk
index cd99cca75..233e21180 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -17,7 +17,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
 	symbol.h term.h time.h types.h loader.h partition.h \
 	msdos_partition.h machine/kernel.h handler.h list.h \
-	command.h machine/memory.h cpu/libgcc.h cpu/cache.h cpu/dl.h
+	command.h machine/memory.h cpu/libgcc.h cpu/cache.h
 
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
 	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
diff --git a/genmoddep.awk b/genmoddep.awk
index f7f085e99..19ac80c71 100644
--- a/genmoddep.awk
+++ b/genmoddep.awk
@@ -29,7 +29,7 @@ FNR == 1 {
   if ($1 in symtab) {
     modtab[module] = modtab[module] " " symtab[$1];
   }
-  else {
+  else if ($1 != "__gnu_local_gp") {
     printf "%s in %s is not defined\n", $1, module >"/dev/stderr";
     error++;
     exit;
diff --git a/include/grub/dl.h b/include/grub/dl.h
index 3f8b328da..5bfcb0cf7 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -116,4 +116,11 @@ grub_err_t EXPORT_FUNC(grub_dl_register_symbol) (const char *name, void *addr,
 grub_err_t grub_arch_dl_check_header (void *ehdr);
 grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
 
+grub_err_t grub_arch_dl_check_header (void *ehdr);
+
+#if defined (_mips) && ! defined (GRUB_UTIL)
+#define GRUB_LINKER_HAVE_INIT 1
+void grub_arch_dl_init_linker (void);
+#endif
+
 #endif /* ! GRUB_DL_H */
diff --git a/include/grub/mips/dl.h b/include/grub/mips/dl.h
deleted file mode 100644
index 9f8404e72..000000000
--- a/include/grub/mips/dl.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  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/>.
- */
-
-#ifndef GRUB_CPU_DL_H
-#define GRUB_CPU_DL_H	1
-
-/* Dummy __gnu_local_gp. Resolved by linker.  */
-extern char EXPORT_VAR (__gnu_local_gp);
-
-#endif /* ! GRUB_CPU_DL_H */
diff --git a/kern/main.c b/kern/main.c
index 084ce621b..fa6fba42a 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -154,6 +154,9 @@ grub_main (void)
 
   /* Load pre-loaded modules and free the space.  */
   grub_register_exported_symbols ();
+#ifdef GRUB_LINKER_HAVE_INIT
+  grub_arch_dl_init_linker ();
+#endif  
   grub_load_modules ();
 
   /* Hello.  */
diff --git a/kern/mips/dl.c b/kern/mips/dl.c
index a937c79b4..f2a0af0d5 100644
--- a/kern/mips/dl.c
+++ b/kern/mips/dl.c
@@ -23,10 +23,9 @@
 #include <grub/err.h>
 #include <grub/cpu/types.h>
 #include <grub/mm.h>
-#include <grub/cpu/dl.h>
 
 /* Dummy __gnu_local_gp. Resolved by linker.  */
-char __gnu_local_gp;
+static char __gnu_local_gp_dummy;
 
 /* Check if EHDR is a valid ELF header.  */
 grub_err_t
@@ -155,7 +154,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 		addr = (Elf_Word *) ((char *) seg->addr + rel->r_offset);
 		sym = (Elf_Sym *) ((char *) mod->symtab
 				     + entsize * ELF_R_SYM (rel->r_info));
-		if (sym->st_value == (grub_addr_t) &__gnu_local_gp)
+		if (sym->st_value == (grub_addr_t) &__gnu_local_gp_dummy)
 		  sym->st_value = (grub_addr_t) gp;
 
 		switch (ELF_R_TYPE (rel->r_info))
@@ -224,3 +223,10 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 
   return GRUB_ERR_NONE;
 }
+
+void 
+grub_arch_dl_init_linker (void)
+{
+  grub_dl_register_symbol ("__gnu_local_gp", &__gnu_local_gp_dummy, 0);
+}
+

From 87efa251d5ff7474bc5827d6aa1957a12880e3a4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 21 Nov 2009 17:48:05 +0100
Subject: [PATCH 0106/1628] Fix a bug in icondir handling

---
 gfxmenu/icon_manager.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/gfxmenu/icon_manager.c b/gfxmenu/icon_manager.c
index b7b891991..0c304ede0 100644
--- a/gfxmenu/icon_manager.c
+++ b/gfxmenu/icon_manager.c
@@ -137,14 +137,21 @@ static struct grub_video_bitmap *
 try_loading_icon (grub_gfxmenu_icon_manager_t mgr,
                   const char *dir, const char *class_name)
 {
-  char *path = grub_malloc (grub_strlen (dir)
-                            + grub_strlen (class_name)
-                            + grub_strlen (icon_extension)
-                            + 1);
+  char *path;
+  int l;
+
+  path = grub_malloc (grub_strlen (dir) + grub_strlen (class_name)
+		      + grub_strlen (icon_extension) + 3);
   if (! path)
     return 0;
 
   grub_strcpy (path, dir);
+  l = grub_strlen (path);
+  if (path[l-1] != '/')
+    {
+      path[l] = '/';
+      path[l+1] = 0;
+    }
   grub_strcat (path, class_name);
   grub_strcat (path, icon_extension);
 

From f5b23252e2f071650bce4cb9e39ef18f211e95a2 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sat, 21 Nov 2009 20:59:48 +0000
Subject: [PATCH 0107/1628] 2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>

        * maintainance/gentrigtables.py: Avoid duplicate hardcoding of
        integer constants.
---
 ChangeLog.trig                |  5 +++++
 maintainance/gentrigtables.py | 16 +++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog.trig b/ChangeLog.trig
index c3cd73594..725e67859 100644
--- a/ChangeLog.trig
+++ b/ChangeLog.trig
@@ -1,3 +1,8 @@
+2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* maintainance/gentrigtables.py: Avoid duplicate hardcoding of
+	integer constants.
+
 2009-11-14  Colin D Bennet <colin@gibibit.com>
 
 	Trigonometry support.
diff --git a/maintainance/gentrigtables.py b/maintainance/gentrigtables.py
index 7c069f833..81b7bd058 100644
--- a/maintainance/gentrigtables.py
+++ b/maintainance/gentrigtables.py
@@ -2,7 +2,7 @@
 # Script to generate trigonometric function tables.
 #
 #  GRUB  --  GRand Unified Bootloader
-#  Copyright (C) 2008  Free Software Foundation, Inc.
+#  Copyright (C) 2008, 2009  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
@@ -41,14 +41,16 @@ def writeTable(arr, name):
 def main():
     sintab = []
     costab = []
-    for i in range(256):
+    angle_max = 256
+    fraction_scale = 16384
+    for i in range(angle_max):
         # Convert to an angle in 1/256 of a circle.
-        x = i * 2 * pi / 256
-        sintab.append(int(round(sin(x) * 16384)))
-        costab.append(int(round(cos(x) * 16384)))
+        x = i * 2 * pi / angle_max
+        sintab.append(int(round(sin(x) * fraction_scale)))
+        costab.append(int(round(cos(x) * fraction_scale)))
 
-    write("#define TRIG_ANGLE_MAX 256\n")
-    write("#define TRIG_FRACTION_SCALE 16384\n")
+    write("#define TRIG_ANGLE_MAX " + str (angle_max) + "\n")
+    write("#define TRIG_FRACTION_SCALE " + str (fraction_scale) + "\n")
     writeTable(sintab, "sintab")
     writeTable(costab, "costab")
 

From d2be7481856e8c8296a230ed91c410dac81fb207 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sat, 21 Nov 2009 21:44:08 +0000
Subject: [PATCH 0108/1628] 2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>

        * maintainance/gentrigtables.py: Remove.
        * lib/trig.c: Likewise.

        * gentrigtables.c: New file.  C rewrite of gentrigtables.py.

        * conf/common.rmk (trig_mod_SOURCES): Replace `lib/trig.c' with
        `trigtables.c'.
        (trigtables.c): New rule.
        (gentrigtables): Likewise.
        (DISTCLEANFILES): Add `trigtables.c' and `gentrigtables'.
---
 ChangeLog.trig                | 13 ++++++
 conf/common.rmk               | 10 ++++-
 gentrigtables.c               | 48 ++++++++++++++++++++
 lib/trig.c                    | 83 -----------------------------------
 maintainance/gentrigtables.py | 60 -------------------------
 5 files changed, 69 insertions(+), 145 deletions(-)
 create mode 100644 gentrigtables.c
 delete mode 100644 lib/trig.c
 delete mode 100644 maintainance/gentrigtables.py

diff --git a/ChangeLog.trig b/ChangeLog.trig
index 725e67859..6aef8f894 100644
--- a/ChangeLog.trig
+++ b/ChangeLog.trig
@@ -1,3 +1,16 @@
+2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* maintainance/gentrigtables.py: Remove.
+	* lib/trig.c: Likewise.
+
+	* gentrigtables.c: New file.  C rewrite of gentrigtables.py.
+
+	* conf/common.rmk (trig_mod_SOURCES): Replace `lib/trig.c' with
+	`trigtables.c'.
+	(trigtables.c): New rule.
+	(gentrigtables): Likewise.
+	(DISTCLEANFILES): Add `trigtables.c' and `gentrigtables'.
+
 2009-11-21  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* maintainance/gentrigtables.py: Avoid duplicate hardcoding of
diff --git a/conf/common.rmk b/conf/common.rmk
index 439f468dd..e841d5608 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -660,12 +660,18 @@ xnu_uuid_mod_SOURCES = commands/xnu_uuid.c
 xnu_uuid_mod_CFLAGS = $(COMMON_CFLAGS)
 xnu_uuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For trig.mod.
 pkglib_MODULES += trig.mod
-trig_mod_SOURCES = lib/trig.c
+trig_mod_SOURCES = trigtables.c
 trig_mod_CFLAGS = $(COMMON_CFLAGS)
 trig_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+trigtables.c: gentrigtables
+	./gentrigtables > $@
+DISTCLEANFILES += trigtables.c
+gentrigtables: gentrigtables.c
+	$(CC) -o $@ $^ $(CPPFLAGS) -lm
+DISTCLEANFILES += gentrigtables
+
 pkglib_MODULES += setjmp.mod
 setjmp_mod_SOURCES = lib/$(target_cpu)/setjmp.S
 setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
diff --git a/gentrigtables.c b/gentrigtables.c
new file mode 100644
index 000000000..3ef6d08f7
--- /dev/null
+++ b/gentrigtables.c
@@ -0,0 +1,48 @@
+/* Generate trigonometric function tables. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008, 2009  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/>.
+ */
+
+#define _GNU_SOURCE 1
+
+#include <grub/trig.h>
+#include <math.h>
+#include <stdio.h>
+
+int
+main ()
+{
+  int i;
+
+  printf ("#include <grub/types.h>\n");
+
+#define TAB(op) \
+  printf ("grub_int16_t grub_trig_" #op "tab[] =\n{"); \
+  for (i = 0; i < GRUB_TRIG_ANGLE_MAX; i++) \
+    { \
+      double x = i * 2 * M_PI / GRUB_TRIG_ANGLE_MAX; \
+      if (i % 10 == 0) \
+	printf ("\n    "); \
+      printf ("%d,", (int) (round (op (x) * GRUB_TRIG_FRACTION_SCALE))); \
+    } \
+  printf ("\n};\n")
+
+  TAB(sin);
+  TAB(cos);
+
+  exit (0);
+}
diff --git a/lib/trig.c b/lib/trig.c
deleted file mode 100644
index e36aa38ef..000000000
--- a/lib/trig.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* trig.c - Trigonometric table definitions.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008  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/trig.h>
-
-/* These tables were generated with `gentrigtables.py'.  */
-
-short grub_trig_sintab[] =
-{
-  0,402,804,1205,1606,2006,2404,2801,3196,3590,
-  3981,4370,4756,5139,5520,5897,6270,6639,7005,7366,
-  7723,8076,8423,8765,9102,9434,9760,10080,10394,10702,
-  11003,11297,11585,11866,12140,12406,12665,12916,13160,13395,
-  13623,13842,14053,14256,14449,14635,14811,14978,15137,15286,
-  15426,15557,15679,15791,15893,15986,16069,16143,16207,16261,
-  16305,16340,16364,16379,16384,16379,16364,16340,16305,16261,
-  16207,16143,16069,15986,15893,15791,15679,15557,15426,15286,
-  15137,14978,14811,14635,14449,14256,14053,13842,13623,13395,
-  13160,12916,12665,12406,12140,11866,11585,11297,11003,10702,
-  10394,10080,9760,9434,9102,8765,8423,8076,7723,7366,
-  7005,6639,6270,5897,5520,5139,4756,4370,3981,3590,
-  3196,2801,2404,2006,1606,1205,804,402,0,-402,
-  -804,-1205,-1606,-2006,-2404,-2801,-3196,-3590,-3981,-4370,
-  -4756,-5139,-5520,-5897,-6270,-6639,-7005,-7366,-7723,-8076,
-  -8423,-8765,-9102,-9434,-9760,-10080,-10394,-10702,-11003,-11297,
-  -11585,-11866,-12140,-12406,-12665,-12916,-13160,-13395,-13623,-13842,
-  -14053,-14256,-14449,-14635,-14811,-14978,-15137,-15286,-15426,-15557,
-  -15679,-15791,-15893,-15986,-16069,-16143,-16207,-16261,-16305,-16340,
-  -16364,-16379,-16384,-16379,-16364,-16340,-16305,-16261,-16207,-16143,
-  -16069,-15986,-15893,-15791,-15679,-15557,-15426,-15286,-15137,-14978,
-  -14811,-14635,-14449,-14256,-14053,-13842,-13623,-13395,-13160,-12916,
-  -12665,-12406,-12140,-11866,-11585,-11297,-11003,-10702,-10394,-10080,
-  -9760,-9434,-9102,-8765,-8423,-8076,-7723,-7366,-7005,-6639,
-  -6270,-5897,-5520,-5139,-4756,-4370,-3981,-3590,-3196,-2801,
-  -2404,-2006,-1606,-1205,-804,-402
-};
-
-short grub_trig_costab[] =
-{
-  16384,16379,16364,16340,16305,16261,16207,16143,16069,15986,
-  15893,15791,15679,15557,15426,15286,15137,14978,14811,14635,
-  14449,14256,14053,13842,13623,13395,13160,12916,12665,12406,
-  12140,11866,11585,11297,11003,10702,10394,10080,9760,9434,
-  9102,8765,8423,8076,7723,7366,7005,6639,6270,5897,
-  5520,5139,4756,4370,3981,3590,3196,2801,2404,2006,
-  1606,1205,804,402,0,-402,-804,-1205,-1606,-2006,
-  -2404,-2801,-3196,-3590,-3981,-4370,-4756,-5139,-5520,-5897,
-  -6270,-6639,-7005,-7366,-7723,-8076,-8423,-8765,-9102,-9434,
-  -9760,-10080,-10394,-10702,-11003,-11297,-11585,-11866,-12140,-12406,
-  -12665,-12916,-13160,-13395,-13623,-13842,-14053,-14256,-14449,-14635,
-  -14811,-14978,-15137,-15286,-15426,-15557,-15679,-15791,-15893,-15986,
-  -16069,-16143,-16207,-16261,-16305,-16340,-16364,-16379,-16384,-16379,
-  -16364,-16340,-16305,-16261,-16207,-16143,-16069,-15986,-15893,-15791,
-  -15679,-15557,-15426,-15286,-15137,-14978,-14811,-14635,-14449,-14256,
-  -14053,-13842,-13623,-13395,-13160,-12916,-12665,-12406,-12140,-11866,
-  -11585,-11297,-11003,-10702,-10394,-10080,-9760,-9434,-9102,-8765,
-  -8423,-8076,-7723,-7366,-7005,-6639,-6270,-5897,-5520,-5139,
-  -4756,-4370,-3981,-3590,-3196,-2801,-2404,-2006,-1606,-1205,
-  -804,-402,0,402,804,1205,1606,2006,2404,2801,
-  3196,3590,3981,4370,4756,5139,5520,5897,6270,6639,
-  7005,7366,7723,8076,8423,8765,9102,9434,9760,10080,
-  10394,10702,11003,11297,11585,11866,12140,12406,12665,12916,
-  13160,13395,13623,13842,14053,14256,14449,14635,14811,14978,
-  15137,15286,15426,15557,15679,15791,15893,15986,16069,16143,
-  16207,16261,16305,16340,16364,16379
-};
-
diff --git a/maintainance/gentrigtables.py b/maintainance/gentrigtables.py
deleted file mode 100644
index 81b7bd058..000000000
--- a/maintainance/gentrigtables.py
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/python
-# Script to generate trigonometric function tables.
-#
-#  GRUB  --  GRand Unified Bootloader
-#  Copyright (C) 2008, 2009  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/>.
-
-from math import *
-from sys import stdout
-
-def write(x):
-    stdout.write(x)
-
-def writeTable(arr, name):
-    indent = ' ' * 4
-    write("short ")
-    write(name)
-    write("[] =\n{\n")
-    write(indent)
-    for i in range(len(arr)):
-        if i != 0:
-            write(",")
-            if i % 10 == 0:
-                write("\n")
-                write(indent)
-        write("%d" % arr[i])
-    write("\n};\n")
-
-def main():
-    sintab = []
-    costab = []
-    angle_max = 256
-    fraction_scale = 16384
-    for i in range(angle_max):
-        # Convert to an angle in 1/256 of a circle.
-        x = i * 2 * pi / angle_max
-        sintab.append(int(round(sin(x) * fraction_scale)))
-        costab.append(int(round(cos(x) * fraction_scale)))
-
-    write("#define TRIG_ANGLE_MAX " + str (angle_max) + "\n")
-    write("#define TRIG_FRACTION_SCALE " + str (fraction_scale) + "\n")
-    writeTable(sintab, "sintab")
-    writeTable(costab, "costab")
-
-if __name__ == "__main__":
-    main()
-
-# vim:ai et sw=4 ts=4

From befd7fb24a66b5bcfb22a48afff5fe92b6cebf98 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 22 Nov 2009 02:54:03 +0100
Subject: [PATCH 0109/1628] Fixed path to grub-mkrawimage.c

---
 po/POTFILES | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/POTFILES b/po/POTFILES
index 5b1239a5e..241b192d8 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1,5 +1,5 @@
 # List of files which contain translatable strings.
-util/i386/pc/grub-mkimage.c
+util/grub-mkrawimage.c
 util/i386/pc/grub-setup.c
 
 util/mkisofs/eltorito.c

From 6755a5c359ff0cca213e338269524005b56a9486 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 22 Nov 2009 02:55:07 +0100
Subject: [PATCH 0110/1628] Fixed grub-mkimage source list

---
 conf/mips.rmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/mips.rmk b/conf/mips.rmk
index 233e21180..02c96d2eb 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -106,7 +106,7 @@ bin_SCRIPTS =
 
 # For grub-mkimage.
 bin_UTILITIES += grub-mkimage
-grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
+grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
 	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(LINK_BASE)
 util/i386/pc/grub-mkimage.c_DEPENDENCIES = Makefile

From 42810eb1a0c7c789a177a19a15d76cf2db42a99b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 22 Nov 2009 02:56:49 +0100
Subject: [PATCH 0111/1628] Improved cache handling

---
 kern/mips/cache.S        |  2 --
 lib/mips/relocator_asm.S | 10 ++++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/kern/mips/cache.S b/kern/mips/cache.S
index e4436450f..a226069fd 100644
--- a/kern/mips/cache.S
+++ b/kern/mips/cache.S
@@ -6,8 +6,6 @@ FUNCTION (grub_arch_sync_caches)
 repeat:
 	cache 1, 0($a0)
 	cache 0, 0($a0)
-	cache 3, 0($a0)
-	cache 0, 0($a0)
 	addiu $a0, $a0, 1
 	addiu $a1, $a1, 0xffff
 	bne $a1, $zero, repeat
diff --git a/lib/mips/relocator_asm.S b/lib/mips/relocator_asm.S
index 6f6108edc..f901fbe89 100644
--- a/lib/mips/relocator_asm.S
+++ b/lib/mips/relocator_asm.S
@@ -30,14 +30,13 @@ VARIABLE (grub_relocator32_forward_start)
 copycont1:	
 	lb $11,0($8)
 	sb $11,0($9)
+	cache 1, 0($9)
+	cache 0, 0($9)
 	addiu $8, $8, 0x1
 	addiu $9, $9, 0x1
 	addiu $10, $10, 0xffff
 	subu $11,$10,$0
 	bne $11, $0, copycont1
-#if __mips >= 2
-	sync
-#endif
 VARIABLE (grub_relocator32_forward_end)
 
 VARIABLE (grub_relocator32_backward_start)
@@ -49,12 +48,11 @@ VARIABLE (grub_relocator32_backward_start)
 copycont2:	
 	lb $11,0($8)
 	sb $11,0($9)
+	cache 1, 0($9)
+	cache 0, 0($9)
 	addiu $8, $8, 0xffff
 	addiu $9, $9, 0xffff
 	addiu $10, 0xffff
 	subu $11,$10,$0
 	bne $11, $0, copycont2
-#if __mips >= 2
-	sync
-#endif
 VARIABLE (grub_relocator32_backward_end)

From 8719095cc8942b5b8d23fc48ebf90e1bcda3d0a5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 22 Nov 2009 15:05:20 +0100
Subject: [PATCH 0112/1628] Hopefully fixed cache problems in relocator

---
 lib/mips/relocator.c     |  5 +++++
 lib/mips/relocator_asm.S | 29 +++++++++++++++++++++--------
 lib/relocator.c          | 17 +++++++++++++++++
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/lib/mips/relocator.c b/lib/mips/relocator.c
index 4a67418c4..61c93e39f 100644
--- a/lib/mips/relocator.c
+++ b/lib/mips/relocator.c
@@ -22,6 +22,7 @@
 #include <grub/types.h>
 #include <grub/types.h>
 #include <grub/err.h>
+#include <grub/cache.h>
 
 #include <grub/mips/relocator.h>
 
@@ -80,6 +81,8 @@ write_call_relocator_bw (void *ptr0, void *src, grub_uint32_t dest,
   for (i = 1; i < 32; i++)
     write_reg (i, state.gpr[i], &ptr);
   write_jump (state.jumpreg, &ptr);
+  grub_arch_sync_caches (ptr0, ptr - ptr0);
+  grub_dprintf ("relocator", "Backward relocator: about to jump to %p\n", ptr0);
   ((void (*) (void)) ptr0) ();
 }
 
@@ -98,6 +101,8 @@ write_call_relocator_fw (void *ptr0, void *src, grub_uint32_t dest,
   for (i = 1; i < 32; i++)
     write_reg (i, state.gpr[i], &ptr);
   write_jump (state.jumpreg, &ptr);
+  grub_arch_sync_caches (ptr0, ptr - ptr0);
+  grub_dprintf ("relocator", "Forward relocator: about to jump to %p\n", ptr0);
   ((void (*) (void)) ptr0) ();
 }
 
diff --git a/lib/mips/relocator_asm.S b/lib/mips/relocator_asm.S
index f901fbe89..f9cdf1470 100644
--- a/lib/mips/relocator_asm.S
+++ b/lib/mips/relocator_asm.S
@@ -17,29 +17,35 @@
  */
 
 #include <grub/symbol.h>
-
-#ifdef BACKWARD
-#define RELOCATOR_VARIABLE(x) VARIABLE(grub_relocator32_backward_ ## x)
-#else
-#define RELOCATOR_VARIABLE(x) VARIABLE(grub_relocator32_forward_ ## x)
-#endif
 	
 	.p2align	4	/* force 16-byte alignment */
 
 VARIABLE (grub_relocator32_forward_start)
+	move $12, $9
+	move $13, $10
+
 copycont1:	
 	lb $11,0($8)
 	sb $11,0($9)
-	cache 1, 0($9)
-	cache 0, 0($9)
 	addiu $8, $8, 0x1
 	addiu $9, $9, 0x1
 	addiu $10, $10, 0xffff
 	subu $11,$10,$0
 	bne $11, $0, copycont1
+
+cachecont1:	
+	cache 1,0($12)
+	cache 0,0($12)
+	addiu $12, $12, 0x1
+	addiu $13, $13, 0xffff
+	subu $11,$13,$0
+	bne $11, $0, cachecont1
 VARIABLE (grub_relocator32_forward_end)
 
 VARIABLE (grub_relocator32_backward_start)
+	move $12, $9
+	move $13, $10
+
 	addu $9, $9, $10
 	addu $8, $8, $10
 	/* Backward movsl is implicitly off-by-one.  compensate that.  */
@@ -55,4 +61,11 @@ copycont2:
 	addiu $10, 0xffff
 	subu $11,$10,$0
 	bne $11, $0, copycont2
+cachecont2:
+	cache 1,0($12)
+	cache 0,0($12)
+	addiu $12, $12, 0x1
+	addiu $13, $13, 0xffff
+	subu $11,$13,$0
+	bne $11, $0, cachecont2
 VARIABLE (grub_relocator32_backward_end)
diff --git a/lib/relocator.c b/lib/relocator.c
index e551f337f..bebf7ada9 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -69,12 +69,23 @@ PREFIX (boot) (void *relocator, grub_uint32_t dest,
   playground = (char *) relocator - RELOCATOR_SIZEOF (forward);
   size = *(grub_size_t *) playground;
 
+  grub_dprintf ("relocator",
+		"Relocator: source: %p, destination: 0x%x, size: 0x%x\n",
+		relocator, dest, size);
+
   if (UINT_TO_PTR (dest) >= relocator)
     {
       int overhead;
       overhead =
 	ALIGN_UP (dest - RELOCATOR_SIZEOF (backward) - RELOCATOR_ALIGN,
 		  RELOCATOR_ALIGN);
+      grub_dprintf ("relocator",
+		    "Backward relocator: code %p, source: %p, "
+		    "destination: 0x%x, size: 0x%x\n",
+		    (char *) relocator - overhead,
+		    (char *) relocator - overhead, 
+		    dest - overhead, size + overhead);
+
       write_call_relocator_bw ((char *) relocator - overhead,
 			       (char *) relocator - overhead,
 			       dest - overhead, size + overhead, state);
@@ -85,6 +96,12 @@ PREFIX (boot) (void *relocator, grub_uint32_t dest,
 
       overhead = ALIGN_UP (dest + size, RELOCATOR_ALIGN)
 	+ RELOCATOR_SIZEOF (forward) - (dest + size);
+      grub_dprintf ("relocator",
+		    "Forward relocator: code %p, source: %p, "
+		    "destination: 0x%x, size: 0x%x\n",
+		    (char *) relocator + size + overhead
+		    - RELOCATOR_SIZEOF (forward),
+		    relocator, dest, size + overhead);
 
       write_call_relocator_fw ((char *) relocator + size + overhead
 			       - RELOCATOR_SIZEOF (forward),

From 1c805a5a3ec6de0f2ef1a0bae67625b199fbf6c1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 23 Nov 2009 00:16:49 +0100
Subject: [PATCH 0113/1628] Fixed cache invalidating

---
 kern/mips/cache.S    | 31 ++++++++++++++++++++++++-------
 lib/mips/relocator.c |  4 ++--
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/kern/mips/cache.S b/kern/mips/cache.S
index a226069fd..8353e1b04 100644
--- a/kern/mips/cache.S
+++ b/kern/mips/cache.S
@@ -3,10 +3,27 @@
 	/* FIXME: This should invalidate only part of memory.  */
 FUNCTION (grub_cpu_flush_cache)
 FUNCTION (grub_arch_sync_caches)
-repeat:
-	cache 1, 0($a0)
-	cache 0, 0($a0)
-	addiu $a0, $a0, 1
-	addiu $a1, $a1, 0xffff
-	bne $a1, $zero, repeat
-	j $31
+	move $t2, $a0
+	addu $t3, $a0, $a1
+	srl $t2, $t2, 5
+	sll $t2, $t2, 5
+	addu $t3, $t3, 0x1f
+	srl $t3, $t3, 5
+	sll $t3, $t3, 5
+	move $t0, $t2
+	subu $t1, $t3, $t2
+r1:
+	cache 1, 0($t0)
+	addiu $t0, $t0, 0x1
+	addiu $t1, $t1, 0xffff
+	bne $t1, $zero, r1
+	sync
+	move $t0, $t2
+	subu $t1, $t3, $t2
+r2:
+	cache 0, 0($t0)
+	addiu $t0, $t0, 0x1
+	addiu $t1, $t1, 0xffff
+	bne $t1, $zero, r2
+	sync
+	j $ra
diff --git a/lib/mips/relocator.c b/lib/mips/relocator.c
index 61c93e39f..796473bf7 100644
--- a/lib/mips/relocator.c
+++ b/lib/mips/relocator.c
@@ -81,7 +81,7 @@ write_call_relocator_bw (void *ptr0, void *src, grub_uint32_t dest,
   for (i = 1; i < 32; i++)
     write_reg (i, state.gpr[i], &ptr);
   write_jump (state.jumpreg, &ptr);
-  grub_arch_sync_caches (ptr0, ptr - ptr0);
+  grub_arch_sync_caches (ptr0, (grub_uint8_t *) ptr -  (grub_uint8_t *) ptr0);
   grub_dprintf ("relocator", "Backward relocator: about to jump to %p\n", ptr0);
   ((void (*) (void)) ptr0) ();
 }
@@ -101,7 +101,7 @@ write_call_relocator_fw (void *ptr0, void *src, grub_uint32_t dest,
   for (i = 1; i < 32; i++)
     write_reg (i, state.gpr[i], &ptr);
   write_jump (state.jumpreg, &ptr);
-  grub_arch_sync_caches (ptr0, ptr - ptr0);
+  grub_arch_sync_caches (ptr0, (grub_uint8_t *) ptr -  (grub_uint8_t *) ptr0);
   grub_dprintf ("relocator", "Forward relocator: about to jump to %p\n", ptr0);
   ((void (*) (void)) ptr0) ();
 }

From 8eea9034f874cece57c42bc2ce447128bb914cba Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 23 Nov 2009 20:18:10 +0100
Subject: [PATCH 0114/1628] Use LOCAL in relocator

---
 lib/i386/relocator_asm.S | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/i386/relocator_asm.S b/lib/i386/relocator_asm.S
index 72c057ce2..343991d3d 100644
--- a/lib/i386/relocator_asm.S
+++ b/lib/i386/relocator_asm.S
@@ -48,7 +48,7 @@
 
 RELOCATOR_VARIABLE(start)
 #ifdef BACKWARD
-L_base:
+LOCAL(base):
 #endif
 	cli
 
@@ -127,23 +127,23 @@ RELOCATOR_VARIABLE(size)
 
 	/* %rax contains now our new 'base'.  */
 	mov	RAX, RSI
-	add	$(L_cont0 - L_base), RAX
+	add	$(LOCAL(cont0) - LOCAL(base)), RAX
 	jmp	*RAX
-L_cont0:
-	lea	(L_cont1 - L_base) (RSI, 1), RAX
-	movl	%eax, (L_jump_vector - L_base) (RSI, 1)
+LOCAL(cont0):
+	lea	(LOCAL(cont1) - LOCAL(base)) (RSI, 1), RAX
+	movl	%eax, (LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
 
-	lea	(L_gdt - L_base) (RSI, 1), RAX
-	mov	RAX, (L_gdt_addr - L_base) (RSI, 1)
+	lea	(LOCAL(gdt) - LOCAL(base)) (RSI, 1), RAX
+	mov	RAX, (LOCAL(gdt_addr) - LOCAL(base)) (RSI, 1)
 
 	/* Switch to compatibility mode. */
 
-	lgdt	(L_gdtdesc - L_base) (RSI, 1)
+	lgdt	(LOCAL(gdtdesc) - LOCAL(base)) (RSI, 1)
 
 	/* Update %cs. Thanks to David Miller for pointing this mistake out. */
-	ljmp	*(L_jump_vector - L_base) (RSI, 1)
+	ljmp	*(LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
 
-L_cont1:
+LOCAL(cont1):
 	.code32
 
 	/* Update other registers. */
@@ -170,8 +170,8 @@ L_cont1:
 	andl	$GRUB_MEMORY_CPU_CR4_PAE_ON, %eax
 	movl	%eax, %cr4
 
-	jmp	L_cont2
-L_cont2:
+	jmp	LOCAL(cont2)
+LOCAL(cont2):
 	.code32
 
 	/* mov imm32, %eax */
@@ -212,7 +212,7 @@ RELOCATOR_VARIABLE (eip)
 
 	/* GDT. Copied from loader/i386/linux.c. */
 	.p2align	4
-L_gdt:
+LOCAL(gdt):
 	/* NULL.  */
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	
@@ -226,9 +226,9 @@ L_gdt:
 	.byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x92, 0xCF, 0x00
 
 	.p2align	4
-L_gdtdesc:
+LOCAL(gdtdesc):
 	.word	0x27
-L_gdt_addr:
+LOCAL(gdt_addr):
 #ifdef __x86_64__
 	/* Filled by the code. */
 	.quad	0
@@ -238,13 +238,13 @@ L_gdt_addr:
 #endif
 	
 	.p2align	4
-L_jump_vector:
+LOCAL(jump_vector):
 	/* Jump location. Is filled by the code */
 	.long	0
 	.long	CODE_SEGMENT
 
 #ifndef BACKWARD
-L_base:
+LOCAL(base):
 #endif
 
 RELOCATOR_VARIABLE(end)

From a5c894bcd986b2ad3bba9d17d732d5542b39e168 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 24 Nov 2009 04:19:33 +0100
Subject: [PATCH 0115/1628] Enable gfxmenu on grub-emu

---
 conf/any-emu.rmk | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 82e297986..d79ec542b 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -45,6 +45,14 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 	video/readers/jpeg.c video/readers/png.c font/font_cmd.c 	\
 	font/font.c term/gfxterm.c io/bufio.c				\
 	\
+	gfxmenu/gfxmenu.c gfxmenu/model.c gfxmenu/view.c 		\
+	gfxmenu/icon_manager.c gfxmenu/theme_loader.c 			\
+	gfxmenu/widget-box.c gfxmenu/gui_canvas.c 			\
+	gfxmenu/gui_circular_progress.c gfxmenu/gui_box.c 		\
+	gfxmenu/gui_label.c gfxmenu/gui_list.c gfxmenu/gui_image.c 	\
+	gfxmenu/gui_progress_bar.c gfxmenu/gui_util.c 			\
+	gfxmenu/gui_string_util.c gfxmenu/named_colors.c trigtables.c   \
+	\
 	util/console.c util/hostfs.c util/grub-emu.c util/misc.c	\
 	util/hostdisk.c util/getroot.c					\
 	\
@@ -87,6 +95,13 @@ DISTCLEANFILES += grub_emu_init.c
 
 # FIXME: this could be shared with common.rmk
 
+trigtables.c: gentrigtables
+	./gentrigtables > $@
+DISTCLEANFILES += trigtables.c
+gentrigtables: gentrigtables.c
+	$(CC) -o $@ $^ $(CPPFLAGS) -lm
+DISTCLEANFILES += gentrigtables
+
 # For grub-mkfont.
 ifeq ($(enable_grub_mkfont), yes)
 bin_UTILITIES += grub-mkfont

From a9c12f853332e801a4a300ace7fadfc8d9d5738f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 24 Nov 2009 04:20:18 +0100
Subject: [PATCH 0116/1628] Remove hardcoded hotkeys

---
 gfxmenu/gfxmenu.c | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/gfxmenu/gfxmenu.c b/gfxmenu/gfxmenu.c
index 85ce5879d..c854c68da 100644
--- a/gfxmenu/gfxmenu.c
+++ b/gfxmenu/gfxmenu.c
@@ -92,26 +92,6 @@ process_key_press (int c,
       switch_to_text_menu ();
       *should_exit = 1;
     }
-  else if (c == '1')
-    {
-      grub_gfxmenu_view_load_theme (view,
-                                    "/boot/grub/themes/proto/theme.txt");
-    }
-  else if (c == '2')
-    {
-      grub_gfxmenu_view_load_theme (view,
-                                    "/boot/grub/themes/winter/theme.txt");
-    }
-  else if (c == '3')
-    {
-      grub_gfxmenu_view_load_theme (view,
-                                    "/boot/grub/themes/ubuntu1/theme.txt");
-    }
-  else if (c == '4')
-    {
-      grub_gfxmenu_view_load_theme (view,
-                                    "/boot/grub/themes/ubuntu2/theme.txt");
-    }
   else if (nested && c == GRUB_TERM_ESC)
     {
       *should_exit = 1;

From 8f41eb558284ffca53d8e80a98a6924b286f09ab Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 24 Nov 2009 04:21:07 +0100
Subject: [PATCH 0117/1628] Use return instead of exit () in gentrigtables.c

---
 gentrigtables.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gentrigtables.c b/gentrigtables.c
index 3ef6d08f7..772cd6224 100644
--- a/gentrigtables.c
+++ b/gentrigtables.c
@@ -44,5 +44,5 @@ main ()
   TAB(sin);
   TAB(cos);
 
-  exit (0);
+  return 0;
 }

From 93fd2dd8095288fd823b746a30a3f8430d9c11fd Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 24 Nov 2009 04:22:22 +0100
Subject: [PATCH 0118/1628] Optimise gfxterm in gfxmenu by avoiding indirect
 repainting

---
 gfxmenu/view.c | 93 +++++++++++++++++++++++++-------------------------
 1 file changed, 46 insertions(+), 47 deletions(-)

diff --git a/gfxmenu/view.c b/gfxmenu/view.c
index 56edc86cf..e807d3838 100644
--- a/gfxmenu/view.c
+++ b/gfxmenu/view.c
@@ -42,6 +42,8 @@
    status changes.  */
 #define TIMEOUT_COMPONENT_ID "__timeout__"
 
+static grub_gfxmenu_view_t term_view;
+
 static void init_terminal (grub_gfxmenu_view_t view);
 static void destroy_terminal (void);
 static grub_err_t set_graphics_mode (void);
@@ -310,86 +312,82 @@ set_text_mode (void)
 
 static int term_target_width;
 static int term_target_height;
-static struct grub_video_render_target *term_target;
 static int term_initialized;
 static grub_term_output_t term_original;
-static grub_gfxmenu_view_t term_view;
 
 static void
-repaint_terminal (int x __attribute ((unused)),
-                  int y __attribute ((unused)),
-                  int width __attribute ((unused)),
-                  int height __attribute ((unused)))
+draw_terminal_box (void)
 {
-  if (! term_view)
+  grub_gfxmenu_box_t term_box;
+  int termx;
+  int termy;
+
+  term_box = term_view->terminal_box;
+  if (!term_box)
     return;
 
-  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
-  grub_gfxmenu_view_draw (term_view);
-  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
-
-  int termx = term_view->screen.x
-    + term_view->screen.width * (10 - 7) / 10 / 2;
-  int termy = term_view->screen.y
-    + term_view->screen.height * (10 - 7) / 10 / 2;
-
-  grub_gfxmenu_box_t term_box = term_view->terminal_box;
-  if (term_box)
-    {
-      term_box->set_content_size (term_box,
-                                  term_target_width, term_target_height);
-
-      term_box->draw (term_box,
-                      termx - term_box->get_left_pad (term_box),
-                      termy - term_box->get_top_pad (term_box));
-    }
-
-  grub_video_blit_render_target (term_target, GRUB_VIDEO_BLIT_REPLACE,
-                                 termx, termy,
-                                 0, 0, term_target_width, term_target_height);
-  grub_video_swap_buffers ();
+  termx = term_view->screen.x + term_view->screen.width * (10 - 7) / 10 / 2;
+  termy = term_view->screen.y + term_view->screen.height * (10 - 7) / 10 / 2;
+  
+  term_box->set_content_size (term_box, term_target_width,
+			      term_target_height);
+  
+  term_box->draw (term_box,
+		  termx - term_box->get_left_pad (term_box),
+		  termy - term_box->get_top_pad (term_box));
 }
 
 static void
 init_terminal (grub_gfxmenu_view_t view)
 {
+  int termx;
+  int termy;
+  struct grub_video_mode_info mode_info;
+  grub_err_t err;
+  int double_repaint;
+
   term_original = grub_term_get_current_output ();
 
   term_target_width = view->screen.width * 7 / 10;
   term_target_height = view->screen.height * 7 / 10;
 
-  grub_video_create_render_target (&term_target,
-                                   term_target_width,
-                                   term_target_height,
-                                   GRUB_VIDEO_MODE_TYPE_RGB
-                                   | GRUB_VIDEO_MODE_TYPE_ALPHA);
-  if (grub_errno != GRUB_ERR_NONE)
-    return;
+  termx = view->screen.x + view->screen.width * (10 - 7) / 10 / 2;
+  termy = view->screen.y + view->screen.height * (10 - 7) / 10 / 2;
+
+  err = grub_video_get_info (&mode_info);
+  if (err)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      double_repaint = 1;
+    }
+  else
+    double_repaint = (mode_info.mode_type
+		      & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED)
+      && !(mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
 
   /* Note: currently there is no API for changing the gfxterm font
      on the fly, so whatever font the initially loaded theme specifies
      will be permanent.  */
-  grub_gfxterm_init_window (term_target, 0, 0,
-                            term_target_width, term_target_height, 0,
-                            view->terminal_font_name, 3);
+  grub_gfxterm_init_window (GRUB_VIDEO_RENDER_TARGET_DISPLAY, termx, termy,
+                            term_target_width, term_target_height,
+			    double_repaint, view->terminal_font_name, 3);
   if (grub_errno != GRUB_ERR_NONE)
     return;
   term_initialized = 1;
 
-  /* XXX: store static pointer to the 'view' object so the repaint callback can access it.  */
+  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
+  grub_gfxmenu_view_draw (view);
+  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
+
   term_view = view;
-  grub_gfxterm_set_repaint_callback (repaint_terminal);
+
   grub_term_set_current_output (grub_gfxterm_get_term ());
 }
 
 static void destroy_terminal (void)
 {
-  term_view = 0;
   if (term_initialized)
     grub_gfxterm_destroy_window ();
-  grub_gfxterm_set_repaint_callback (0);
-  if (term_target)
-    grub_video_delete_render_target (term_target);
   if (term_original)
     grub_term_set_current_output (term_original);
 }
@@ -493,5 +491,6 @@ grub_gfxmenu_view_execute_entry (grub_gfxmenu_view_t view,
 void
 grub_gfxmenu_view_run_terminal (grub_gfxmenu_view_t view __attribute__((unused)))
 {
+  draw_terminal_box ();
   grub_cmdline_run (1);
 }

From 4545f150f38e536b38d54f2a578671f578918fcf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 24 Nov 2009 05:02:30 +0100
Subject: [PATCH 0119/1628] Various cleanups

---
 gfxmenu/gfxmenu.c | 113 +++++++++++++++++++++++++---------------------
 1 file changed, 62 insertions(+), 51 deletions(-)

diff --git a/gfxmenu/gfxmenu.c b/gfxmenu/gfxmenu.c
index c854c68da..6f7382c18 100644
--- a/gfxmenu/gfxmenu.c
+++ b/gfxmenu/gfxmenu.c
@@ -51,50 +51,63 @@ process_key_press (int c,
   /* When a key is pressed, stop the timeout.  */
   grub_gfxmenu_model_clear_timeout (model);
 
-  if (c == 'j' || c == GRUB_TERM_DOWN)
-    {
-      int i = grub_gfxmenu_model_get_selected_index (model);
-      int num_items = grub_gfxmenu_model_get_num_entries (model);
-      if (i < num_items - 1)
-        {
-          i++;
-          grub_gfxmenu_model_set_selected_index (model, i);
-        }
-    }
-  else if (c == 'k' || c == GRUB_TERM_UP)
-    {
-      int i = grub_gfxmenu_model_get_selected_index (model);
-      if (i > 0)
-        {
-          i--;
-          grub_gfxmenu_model_set_selected_index (model, i);
-        }
-    }
-  else if (c == '\r' || c == '\n' || c == GRUB_TERM_RIGHT)
-    {
-      int selected = grub_gfxmenu_model_get_selected_index (model);
-      int num_entries = grub_gfxmenu_model_get_num_entries (model);
-      if (selected >= 0 && selected < num_entries)
-        {
-          grub_menu_entry_t entry =
-            grub_gfxmenu_model_get_entry (model, selected);
-          grub_gfxmenu_view_execute_entry (view, entry);
-        }
-    }
-  else if (c == 'c')
+  switch (c)
     {
+    case 'j':
+    case GRUB_TERM_DOWN:
+      {
+	int i = grub_gfxmenu_model_get_selected_index (model);
+	int num_items = grub_gfxmenu_model_get_num_entries (model);
+	if (i < num_items - 1)
+	  {
+	    i++;
+	    grub_gfxmenu_model_set_selected_index (model, i);
+	  }
+      }
+    break;
+
+    case 'k':
+    case GRUB_TERM_UP:
+      {
+	int i = grub_gfxmenu_model_get_selected_index (model);
+	if (i > 0)
+	  {
+	    i--;
+	    grub_gfxmenu_model_set_selected_index (model, i);
+	  }
+      }
+    break;
+
+    case '\r':
+    case '\n':
+    case GRUB_TERM_RIGHT:
+      {
+	int selected = grub_gfxmenu_model_get_selected_index (model);
+	int num_entries = grub_gfxmenu_model_get_num_entries (model);
+	if (selected >= 0 && selected < num_entries)
+	  {
+	    grub_menu_entry_t entry =
+	      grub_gfxmenu_model_get_entry (model, selected);
+	    grub_gfxmenu_view_execute_entry (view, entry);
+	  }
+      }
+    break;
+
+    case 'c':
       grub_gfxmenu_view_run_terminal (view);
-    }
-  else if (c == 't')
-    {
+      break;
+
+    case 't':
       /* The write hook for 'menuviewer' will cause
        * grub_menu_viewer_should_return to return nonzero. */
       switch_to_text_menu ();
       *should_exit = 1;
-    }
-  else if (nested && c == GRUB_TERM_ESC)
-    {
-      *should_exit = 1;
+      break;
+
+    case GRUB_TERM_ESC:
+      if (nested)
+	*should_exit = 1;
+      break;
     }
 
   if (grub_errno != GRUB_ERR_NONE)
@@ -119,32 +132,29 @@ static grub_err_t
 show_menu (grub_menu_t menu, int nested)
 {
   grub_gfxmenu_model_t model;
+  grub_gfxmenu_view_t view;
+  const char *theme_path;
+
+  theme_path = grub_env_get ("theme");
+  if (! theme_path)
+    {
+      switch_to_text_menu ();
+      return grub_error (GRUB_ERR_FILE_NOT_FOUND, "no theme specified");
+    }
 
   model = grub_gfxmenu_model_new (menu);
   if (! model)
     {
-      grub_print_error ();
-      grub_printf ("Initializing menu data for graphical menu failed;\n"
-                   "falling back to text based menu.\n");
-      grub_wait_after_message ();
       switch_to_text_menu ();
       return grub_errno;
     }
 
-  grub_gfxmenu_view_t view;
-
   /* Create the view.  */
-  const char *theme_path = grub_env_get ("theme");
-  if (! theme_path)
-    theme_path = "/boot/grub/themes/proto/theme.txt";
-
   view = grub_gfxmenu_view_new (theme_path, model);
+
   if (! view)
     {
       grub_print_error ();
-      grub_printf ("Starting graphical menu failed;\n"
-                   "falling back to text based menu.\n");
-      grub_wait_after_message ();
       grub_gfxmenu_model_destroy (model);
       switch_to_text_menu ();
       return grub_errno;
@@ -159,6 +169,7 @@ show_menu (grub_menu_t menu, int nested)
 
   /* Main event loop.  */
   int exit_requested = 0;
+
   while ((! exit_requested) && (! grub_menu_viewer_should_return ()))
     {
       if (grub_gfxmenu_model_timeout_expired (model))

From 947fa16c8b8bf6a0f91ca7b01da8c47f8cc9361c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 24 Nov 2009 07:17:18 +0100
Subject: [PATCH 0120/1628] Important speedup by not redrawing too much

---
 gfxmenu/gfxmenu.c               |  12 +-
 gfxmenu/gui_box.c               |   4 +-
 gfxmenu/gui_canvas.c            |   5 +-
 gfxmenu/gui_circular_progress.c |   6 +-
 gfxmenu/gui_image.c             |   8 +-
 gfxmenu/gui_label.c             |   5 +-
 gfxmenu/gui_list.c              |   6 +-
 gfxmenu/gui_progress_bar.c      |   4 +-
 gfxmenu/view.c                  | 214 +++++++++++++++++++++++---------
 include/grub/gfxmenu_view.h     |  14 +++
 include/grub/gui.h              |  16 ++-
 11 files changed, 221 insertions(+), 73 deletions(-)

diff --git a/gfxmenu/gfxmenu.c b/gfxmenu/gfxmenu.c
index 6f7382c18..ab1c8befb 100644
--- a/gfxmenu/gfxmenu.c
+++ b/gfxmenu/gfxmenu.c
@@ -35,6 +35,7 @@
 #include <grub/menu_viewer.h>
 #include <grub/gfxmenu_model.h>
 #include <grub/gfxmenu_view.h>
+#include <grub/time.h>
 
 static void switch_to_text_menu (void)
 {
@@ -62,6 +63,7 @@ process_key_press (int c,
 	  {
 	    i++;
 	    grub_gfxmenu_model_set_selected_index (model, i);
+	    grub_gfxmenu_redraw_menu (view);
 	  }
       }
     break;
@@ -74,6 +76,7 @@ process_key_press (int c,
 	  {
 	    i--;
 	    grub_gfxmenu_model_set_selected_index (model, i);
+	    grub_gfxmenu_redraw_menu (view);
 	  }
       }
     break;
@@ -170,8 +173,14 @@ show_menu (grub_menu_t menu, int nested)
   /* Main event loop.  */
   int exit_requested = 0;
 
+  grub_gfxmenu_view_draw (view);
+  grub_video_swap_buffers ();
+  if (view->double_repaint)
+    grub_gfxmenu_view_draw (view);
+
   while ((! exit_requested) && (! grub_menu_viewer_should_return ()))
     {
+      grub_gfxmenu_redraw_timeout (view);
       if (grub_gfxmenu_model_timeout_expired (model))
         {
           grub_gfxmenu_model_clear_timeout (model);
@@ -181,9 +190,8 @@ show_menu (grub_menu_t menu, int nested)
           continue;
         }
 
-      grub_gfxmenu_view_draw (view);
-      grub_video_swap_buffers ();
       handle_key_events (model, view, nested, &exit_requested);
+      grub_cpu_idle ();
     }
 
   grub_gfxmenu_view_destroy (view);
diff --git a/gfxmenu/gui_box.c b/gfxmenu/gui_box.c
index 876d0733f..4fe131f98 100644
--- a/gfxmenu/gui_box.c
+++ b/gfxmenu/gui_box.c
@@ -166,7 +166,7 @@ layout_vertically (grub_gui_box_t self, int modify_layout,
 }
 
 static void
-box_paint (void *vself)
+box_paint (void *vself, const grub_video_rect_t *region)
 {
   grub_gui_box_t self = vself;
   struct component_node *cur;
@@ -176,7 +176,7 @@ box_paint (void *vself)
   for (cur = self->chead.next; cur != &self->ctail; cur = cur->next)
     {
       grub_gui_component_t comp = cur->component;
-      comp->ops->paint (comp);
+      comp->ops->paint (comp, region);
     }
   grub_gui_restore_viewport (&vpsave);
 }
diff --git a/gfxmenu/gui_canvas.c b/gfxmenu/gui_canvas.c
index a2cd77df6..d155364d7 100644
--- a/gfxmenu/gui_canvas.c
+++ b/gfxmenu/gui_canvas.c
@@ -79,7 +79,7 @@ canvas_is_instance (void *vself __attribute__((unused)), const char *type)
 }
 
 static void
-canvas_paint (void *vself)
+canvas_paint (void *vself, const grub_video_rect_t *region)
 {
   grub_gui_canvas_t self = vself;
   struct component_node *cur;
@@ -106,7 +106,8 @@ canvas_paint (void *vself)
         }
 
       /* Paint the child.  */
-      comp->ops->paint (comp);
+      if (grub_video_have_common_points (region, &r))
+	comp->ops->paint (comp, region);
     }
   grub_gui_restore_viewport (&vpsave);
 }
diff --git a/gfxmenu/gui_circular_progress.c b/gfxmenu/gui_circular_progress.c
index cd95c51f9..f3c8bc3af 100644
--- a/gfxmenu/gui_circular_progress.c
+++ b/gfxmenu/gui_circular_progress.c
@@ -112,12 +112,16 @@ check_pixmaps (circular_progress_t self)
 }
 
 static void
-circprog_paint (void *vself)
+circprog_paint (void *vself, const grub_video_rect_t *region)
 {
   circular_progress_t self = vself;
 
   if (! self->visible)
     return;
+
+  if (!grub_video_have_common_points (region, &self->bounds))
+    return;
+
   if (! check_pixmaps (self))
     return;
 
diff --git a/gfxmenu/gui_image.c b/gfxmenu/gui_image.c
index 1c58a535b..eb2ff1ee0 100644
--- a/gfxmenu/gui_image.c
+++ b/gfxmenu/gui_image.c
@@ -67,12 +67,16 @@ image_is_instance (void *vself __attribute__((unused)), const char *type)
 }
 
 static void
-image_paint (void *vself)
+image_paint (void *vself, const grub_video_rect_t *region)
 {
   grub_gui_image_t self = vself;
+  grub_video_rect_t vpsave;
+
   if (! self->bitmap)
     return;
-  grub_video_rect_t vpsave;
+  if (!grub_video_have_common_points (region, &self->bounds))
+    return;
+
   grub_gui_set_viewport (&self->bounds, &vpsave);
   grub_video_blit_bitmap (self->bitmap, GRUB_VIDEO_BLIT_BLEND,
                           0, 0, 0, 0,
diff --git a/gfxmenu/gui_label.c b/gfxmenu/gui_label.c
index eb2a495ff..30474f52f 100644
--- a/gfxmenu/gui_label.c
+++ b/gfxmenu/gui_label.c
@@ -77,13 +77,16 @@ label_is_instance (void *vself __attribute__((unused)), const char *type)
 }
 
 static void
-label_paint (void *vself)
+label_paint (void *vself, const grub_video_rect_t *region)
 {
   grub_gui_label_t self = vself;
 
   if (! self->visible)
     return;
 
+  if (!grub_video_have_common_points (region, &self->bounds))
+    return;
+
   /* Calculate the starting x coordinate.  */
   int left_x;
   if (self->align == align_left)
diff --git a/gfxmenu/gui_list.c b/gfxmenu/gui_list.c
index aa9655b45..bf6d94657 100644
--- a/gfxmenu/gui_list.c
+++ b/gfxmenu/gui_list.c
@@ -311,16 +311,18 @@ draw_menu (list_impl_t self)
 }
 
 static void
-list_paint (void *vself)
+list_paint (void *vself, const grub_video_rect_t *region)
 {
   list_impl_t self = vself;
+  grub_video_rect_t vpsave;
 
   if (! self->visible)
     return;
+  if (!grub_video_have_common_points (region, &self->bounds))
+    return;
 
   check_boxes (self);
 
-  grub_video_rect_t vpsave;
   grub_gui_set_viewport (&self->bounds, &vpsave);
   draw_menu (self);
   grub_gui_restore_viewport (&vpsave);
diff --git a/gfxmenu/gui_progress_bar.c b/gfxmenu/gui_progress_bar.c
index 440d4b2fc..498711169 100644
--- a/gfxmenu/gui_progress_bar.c
+++ b/gfxmenu/gui_progress_bar.c
@@ -171,11 +171,13 @@ draw_text (grub_gui_progress_bar_t self)
 }
 
 static void
-progress_bar_paint (void *vself)
+progress_bar_paint (void *vself, const grub_video_rect_t *region)
 {
   grub_gui_progress_bar_t self = vself;
   if (! self->visible)
     return;
+  if (!grub_video_have_common_points (region, &self->bounds))
+    return;
 
   grub_video_rect_t vpsave;
   grub_gui_set_viewport (&self->bounds, &vpsave);
diff --git a/gfxmenu/view.c b/gfxmenu/view.c
index e807d3838..1c512fee1 100644
--- a/gfxmenu/view.c
+++ b/gfxmenu/view.c
@@ -55,6 +55,8 @@ grub_gfxmenu_view_t
 grub_gfxmenu_view_new (const char *theme_path, grub_gfxmenu_model_t model)
 {
   grub_gfxmenu_view_t view;
+  grub_err_t err;
+  struct grub_video_mode_info mode_info;
 
   view = grub_malloc (sizeof (*view));
   if (! view)
@@ -67,6 +69,18 @@ grub_gfxmenu_view_new (const char *theme_path, grub_gfxmenu_model_t model)
                            (unsigned *) &view->screen.width,
                            (unsigned *) &view->screen.height);
 
+  err = grub_video_get_info (&mode_info);
+  if (err)
+    {
+      grub_free (view);
+      return 0;
+    }
+  else
+    view->double_repaint = (mode_info.mode_type
+			    & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED)
+      && !(mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
+
+
   /* Clear the screen; there may be garbage left over in video memory, and
      loading the menu style (particularly the background) can take a while. */
   grub_video_fill_rect (grub_video_map_rgb (0, 0, 0),
@@ -97,6 +111,15 @@ grub_gfxmenu_view_new (const char *theme_path, grub_gfxmenu_model_t model)
   view->title_text = grub_strdup ("GRUB Boot Menu");
   view->progress_message_text = 0;
   view->theme_path = 0;
+  view->last_seconds_remaining = -2;
+
+  /* Set the timeout bar's frame.  */
+  view->progress_message_frame.width = view->screen.width * 4 / 5;
+  view->progress_message_frame.height = 50;
+  view->progress_message_frame.x = view->screen.x
+    + (view->screen.width - view->progress_message_frame.width) / 2;
+  view->progress_message_frame.y = view->screen.y
+    + view->screen.height - 90 - 20 - view->progress_message_frame.height;
 
   if (grub_gfxmenu_view_load_theme (view, theme_path) != 0)
     {
@@ -141,21 +164,23 @@ set_progress_message (grub_gfxmenu_view_t view, const char *message)
 }
 
 static void
-draw_background (grub_gfxmenu_view_t view)
+redraw_background (grub_gfxmenu_view_t view,
+		   const grub_video_rect_t *bounds)
 {
   if (view->desktop_image)
     {
       struct grub_video_bitmap *img = view->desktop_image;
       grub_video_blit_bitmap (img, GRUB_VIDEO_BLIT_REPLACE,
-                              view->screen.x, view->screen.y, 0, 0,
-                              grub_video_bitmap_get_width (img),
-                              grub_video_bitmap_get_height (img));
+                              bounds->x, bounds->y,
+			      bounds->x - view->screen.x,
+			      bounds->y - view->screen.y,
+			      bounds->width, bounds->height);
     }
   else
     {
       grub_video_fill_rect (grub_gui_map_color (view->desktop_color),
-                            view->screen.x, view->screen.y,
-                            view->screen.width, view->screen.height);
+                            bounds->x, bounds->y,
+                            bounds->width, bounds->height);
     }
 }
 
@@ -191,6 +216,7 @@ update_timeout_visit (grub_gui_component_t component,
 {
   struct progress_value_data *pv;
   pv = (struct progress_value_data *) userdata;
+
   component->ops->set_property (component, "visible", pv->visible);
   component->ops->set_property (component, "start", pv->start);
   component->ops->set_property (component, "end", pv->end);
@@ -198,16 +224,43 @@ update_timeout_visit (grub_gui_component_t component,
   component->ops->set_property (component, "text", pv->text);
 }
 
-static void
-update_timeout (grub_gfxmenu_view_t view)
+
+static inline void
+update_timeout (grub_gfxmenu_view_t view, int is_init)
 {
   char startbuf[20];
   char valuebuf[20];
   char msgbuf[120];
 
-  int timeout = grub_gfxmenu_model_get_timeout_ms (view->model);
-  int remaining = grub_gfxmenu_model_get_timeout_remaining_ms (view->model);
+  int timeout;
+  int remaining;
   struct progress_value_data pv;
+  int seconds_remaining_rounded_up;
+
+  auto void redraw_timeout_visit (grub_gui_component_t component,
+				  void *userdata __attribute__ ((unused)));
+
+  auto void redraw_timeout_visit (grub_gui_component_t component,
+				  void *userdata __attribute__ ((unused)))
+  {
+    grub_video_rect_t bounds;
+    component->ops->get_bounds (component, &bounds);
+    grub_gfxmenu_view_redraw (view, &bounds);
+  }
+
+  timeout = grub_gfxmenu_model_get_timeout_ms (view->model);
+  if (timeout > 0)
+    {
+      remaining = grub_gfxmenu_model_get_timeout_remaining_ms (view->model);
+      seconds_remaining_rounded_up = (remaining + 999) / 1000;
+    }
+  else
+    seconds_remaining_rounded_up = -1;
+
+  if (view->last_seconds_remaining == seconds_remaining_rounded_up && !is_init)
+    return;
+
+  view->last_seconds_remaining = seconds_remaining_rounded_up;
 
   pv.visible = timeout > 0 ? "true" : "false";
   grub_sprintf (startbuf, "%d", -timeout);
@@ -216,7 +269,6 @@ update_timeout (grub_gfxmenu_view_t view)
   grub_sprintf (valuebuf, "%d", remaining > 0 ? -remaining : 0);
   pv.value = valuebuf;
 
-  int seconds_remaining_rounded_up = (remaining + 999) / 1000;
   grub_sprintf (msgbuf,
                 "The highlighted entry will be booted automatically in %d s.",
                 seconds_remaining_rounded_up);
@@ -224,6 +276,21 @@ update_timeout (grub_gfxmenu_view_t view)
 
   grub_gui_find_by_id ((grub_gui_component_t) view->canvas,
                        TIMEOUT_COMPONENT_ID, update_timeout_visit, &pv);
+  if (!is_init)
+    {
+      grub_gui_find_by_id ((grub_gui_component_t) view->canvas,
+			   TIMEOUT_COMPONENT_ID, redraw_timeout_visit, &pv);
+      grub_video_swap_buffers ();
+      if (view->double_repaint)
+	grub_gui_find_by_id ((grub_gui_component_t) view->canvas,
+			     TIMEOUT_COMPONENT_ID, redraw_timeout_visit, &pv);
+    }
+}
+
+void
+grub_gfxmenu_redraw_timeout (grub_gfxmenu_view_t view)
+{
+  update_timeout (view, 0);
 }
 
 static void
@@ -252,19 +319,13 @@ static void
 draw_message (grub_gfxmenu_view_t view)
 {
   char *text = view->progress_message_text;
+  grub_video_rect_t f = view->progress_message_frame;
   if (! text)
     return;
 
   grub_font_t font = view->message_font;
   grub_video_color_t color = grub_gui_map_color (view->message_color);
 
-  /* Set the timeout bar's frame.  */
-  grub_video_rect_t f;
-  f.width = view->screen.width * 4 / 5;
-  f.height = 50;
-  f.x = view->screen.x + (view->screen.width - f.width) / 2;
-  f.y = view->screen.y + view->screen.height - 90 - 20 - f.height;
-
   /* Border.  */
   grub_video_fill_rect (color,
                         f.x-1, f.y-1, f.width+2, f.height+2);
@@ -280,19 +341,62 @@ draw_message (grub_gfxmenu_view_t view)
   grub_font_draw_string (text, font, color, x, y);
 }
 
+void
+grub_gfxmenu_view_redraw (grub_gfxmenu_view_t view,
+			  const grub_video_rect_t *region)
+{
+  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
+
+  redraw_background (view, region);
+  if (view->canvas)
+    view->canvas->ops->component.paint (view->canvas, region);
+  draw_title (view);
+  if (grub_video_have_common_points (&view->progress_message_frame, region))
+    draw_message (view);
+}
 
 void
 grub_gfxmenu_view_draw (grub_gfxmenu_view_t view)
 {
-  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
-  update_timeout (view);
+  update_timeout (view, 1);
   update_menu_components (view);
 
-  draw_background (view);
-  if (view->canvas)
-    view->canvas->ops->component.paint (view->canvas);
-  draw_title (view);
-  draw_message (view);
+  grub_gfxmenu_view_redraw (view, &view->screen);
+  grub_video_swap_buffers ();
+  if (view->double_repaint)
+    grub_gfxmenu_view_redraw (view, &view->screen);
+}
+
+static void
+redraw_menu_visit (grub_gui_component_t component,
+                   void *userdata)
+{
+  grub_gfxmenu_view_t view;
+  view = userdata;
+  if (component->ops->is_instance (component, "list"))
+    {
+      grub_gui_list_t list;
+      grub_video_rect_t bounds;
+
+      list = (grub_gui_list_t) component;
+      component->ops->get_bounds (component, &bounds);
+      grub_gfxmenu_view_redraw (view, &bounds);
+    }
+}
+
+void
+grub_gfxmenu_redraw_menu (grub_gfxmenu_view_t view)
+{
+  update_menu_components (view);
+
+  grub_gui_iterate_recursively ((grub_gui_component_t) view->canvas,
+                                redraw_menu_visit, view);
+  grub_video_swap_buffers ();
+  if (view->double_repaint)
+    {
+      grub_gui_iterate_recursively ((grub_gui_component_t) view->canvas,
+				    redraw_menu_visit, view);
+    }
 }
 
 static grub_err_t
@@ -316,7 +420,7 @@ static int term_initialized;
 static grub_term_output_t term_original;
 
 static void
-draw_terminal_box (void)
+draw_terminal_box (grub_gfxmenu_view_t view)
 {
   grub_gfxmenu_box_t term_box;
   int termx;
@@ -335,6 +439,11 @@ draw_terminal_box (void)
   term_box->draw (term_box,
 		  termx - term_box->get_left_pad (term_box),
 		  termy - term_box->get_top_pad (term_box));
+  grub_video_swap_buffers ();
+  if (view->double_repaint)
+    term_box->draw (term_box,
+		    termx - term_box->get_left_pad (term_box),
+		    termy - term_box->get_top_pad (term_box));
 }
 
 static void
@@ -342,9 +451,6 @@ init_terminal (grub_gfxmenu_view_t view)
 {
   int termx;
   int termy;
-  struct grub_video_mode_info mode_info;
-  grub_err_t err;
-  int double_repaint;
 
   term_original = grub_term_get_current_output ();
 
@@ -354,34 +460,20 @@ init_terminal (grub_gfxmenu_view_t view)
   termx = view->screen.x + view->screen.width * (10 - 7) / 10 / 2;
   termy = view->screen.y + view->screen.height * (10 - 7) / 10 / 2;
 
-  err = grub_video_get_info (&mode_info);
-  if (err)
-    {
-      grub_errno = GRUB_ERR_NONE;
-      double_repaint = 1;
-    }
-  else
-    double_repaint = (mode_info.mode_type
-		      & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED)
-      && !(mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
-
   /* Note: currently there is no API for changing the gfxterm font
      on the fly, so whatever font the initially loaded theme specifies
      will be permanent.  */
   grub_gfxterm_init_window (GRUB_VIDEO_RENDER_TARGET_DISPLAY, termx, termy,
                             term_target_width, term_target_height,
-			    double_repaint, view->terminal_font_name, 3);
+			    view->double_repaint, view->terminal_font_name, 3);
   if (grub_errno != GRUB_ERR_NONE)
     return;
   term_initialized = 1;
 
-  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
-  grub_gfxmenu_view_draw (view);
-  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
-
   term_view = view;
 
   grub_term_set_current_output (grub_gfxterm_get_term ());
+  grub_refresh ();
 }
 
 static void destroy_terminal (void)
@@ -405,8 +497,10 @@ notify_booting (grub_menu_entry_t entry, void *userdata)
   grub_sprintf (s, "Booting '%s'", entry->title);
   set_progress_message (view, s);
   grub_free (s);
-  grub_gfxmenu_view_draw (view);
+  grub_gfxmenu_view_redraw (view, &view->progress_message_frame);
   grub_video_swap_buffers ();
+  if (view->double_repaint)
+    grub_gfxmenu_view_redraw (view, &view->progress_message_frame);
 }
 
 static void
@@ -421,8 +515,10 @@ notify_fallback (grub_menu_entry_t entry, void *userdata)
   grub_sprintf (s, "Falling back to '%s'", entry->title);
   set_progress_message (view, s);
   grub_free (s);
-  grub_gfxmenu_view_draw (view);
+  grub_gfxmenu_view_redraw (view, &view->progress_message_frame);
   grub_video_swap_buffers ();
+  if (view->double_repaint)
+    grub_gfxmenu_view_redraw (view, &view->progress_message_frame);
 }
 
 static void
@@ -442,6 +538,8 @@ int
 grub_gfxmenu_view_execute_with_fallback (grub_gfxmenu_view_t view,
                                          grub_menu_entry_t entry)
 {
+  draw_terminal_box (view);
+
   grub_menu_execute_with_fallback (grub_gfxmenu_model_get_menu (view->model),
                                    entry, &execute_callback, (void *) view);
 
@@ -453,7 +551,6 @@ grub_gfxmenu_view_execute_with_fallback (grub_gfxmenu_view_t view,
                         "Unable to automatically boot.  "
                         "Press SPACE to continue.");
   grub_gfxmenu_view_draw (view);
-  grub_video_swap_buffers ();
   while (GRUB_TERM_ASCII_CHAR(grub_getkey ()) != ' ')
     {
       /* Wait for SPACE to be pressed.  */
@@ -461,6 +558,11 @@ grub_gfxmenu_view_execute_with_fallback (grub_gfxmenu_view_t view,
 
   set_progress_message (view, 0);   /* Clear the message.  */
 
+  grub_gfxmenu_view_redraw (view, &view->progress_message_frame);
+  grub_video_swap_buffers ();
+  if (view->double_repaint)
+    grub_gfxmenu_view_redraw (view, &view->progress_message_frame);
+
   return 1;   /* Ok.  */
 }
 
@@ -468,14 +570,7 @@ int
 grub_gfxmenu_view_execute_entry (grub_gfxmenu_view_t view,
                                  grub_menu_entry_t entry)
 {
-  /* Currently we switch back to text mode by restoring
-     the original terminal before executing the menu entry.
-     It is hard to make it work when executing a menu entry
-     that switches video modes -- it using gfxterm in a
-     window, the repaint callback seems to crash GRUB. */
-  /* TODO: Determine if this works when 'gfxterm' was set as
-     the current terminal before invoking the gfxmenu. */
-  destroy_terminal ();
+  draw_terminal_box (view);
 
   grub_menu_execute_entry (entry);
   if (grub_errno != GRUB_ERR_NONE)
@@ -484,13 +579,14 @@ grub_gfxmenu_view_execute_entry (grub_gfxmenu_view_t view,
   if (set_graphics_mode () != GRUB_ERR_NONE)
     return 0;  /* Failure.  */
 
-  init_terminal (view);
+  grub_gfxmenu_view_draw (view);
   return 1;   /* Ok.  */
 }
 
 void
-grub_gfxmenu_view_run_terminal (grub_gfxmenu_view_t view __attribute__((unused)))
+grub_gfxmenu_view_run_terminal (grub_gfxmenu_view_t view)
 {
-  draw_terminal_box ();
+  draw_terminal_box (view);
   grub_cmdline_run (1);
+  grub_gfxmenu_view_draw (view);
 }
diff --git a/include/grub/gfxmenu_view.h b/include/grub/gfxmenu_view.h
index 1144382f2..c86334400 100644
--- a/include/grub/gfxmenu_view.h
+++ b/include/grub/gfxmenu_view.h
@@ -54,7 +54,15 @@ int grub_gfxmenu_view_execute_entry (grub_gfxmenu_view_t view,
 
 void grub_gfxmenu_view_run_terminal (grub_gfxmenu_view_t view);
 
+void
+grub_gfxmenu_redraw_menu (grub_gfxmenu_view_t view);
 
+void
+grub_gfxmenu_redraw_timeout (grub_gfxmenu_view_t view);
+
+void
+grub_gfxmenu_view_redraw (grub_gfxmenu_view_t view,
+			  const grub_video_rect_t *region);
 
 /* Implementation details -- this should not be used outside of the
    view itself.  */
@@ -86,6 +94,12 @@ struct grub_gfxmenu_view
   grub_gui_container_t canvas;
 
   grub_gfxmenu_model_t model;
+
+  int last_seconds_remaining;
+
+  int double_repaint;
+
+  grub_video_rect_t progress_message_frame;
 };
 
 #endif /* ! GRUB_GFXMENU_VIEW_HEADER */
diff --git a/include/grub/gui.h b/include/grub/gui.h
index 5b785dbb5..385c0962b 100644
--- a/include/grub/gui.h
+++ b/include/grub/gui.h
@@ -50,13 +50,14 @@ struct grub_gui_component_ops
   void (*destroy) (void *self);
   const char * (*get_id) (void *self);
   int (*is_instance) (void *self, const char *type);
-  void (*paint) (void *self);
+  void (*paint) (void *self, const grub_video_rect_t *bounds);
   void (*set_parent) (void *self, grub_gui_container_t parent);
   grub_gui_container_t (*get_parent) (void *self);
   void (*set_bounds) (void *self, const grub_video_rect_t *bounds);
   void (*get_bounds) (void *self, grub_video_rect_t *bounds);
   void (*get_preferred_size) (void *self, int *width, int *height);
   grub_err_t (*set_property) (void *self, const char *name, const char *value);
+  void (*repaint) (void *self, int second_pass);
 };
 
 struct grub_gui_container_ops
@@ -162,4 +163,17 @@ grub_gui_map_color (grub_gui_color_t c)
   return grub_video_map_rgba (c.red, c.green, c.blue, c.alpha);
 }
 
+static inline int
+grub_video_have_common_points (const grub_video_rect_t *a,
+			       const grub_video_rect_t *b)
+{
+  if (!((a->x <= b->x && b->x <= a->x + a->width)
+	|| (b->x <= a->x && a->x <= b->x + b->width)))
+    return 0;
+  if (!((a->y <= b->y && b->y <= a->y + a->height)
+	|| (b->y <= a->y && a->y <= b->y + b->height)))
+    return 0;
+  return 1;
+}
+
 #endif /* ! GRUB_GUI_H */

From f788bf3cd4a3ae22d25d305f42652651ccc962f5 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Thu, 26 Nov 2009 23:54:26 +0000
Subject: [PATCH 0121/1628] Add (unused) mode_mask parameter (implicitly
 documented in ChangeLog.videomask)

---
 video/efi_fb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/video/efi_fb.c b/video/efi_fb.c
index 2faff12f9..a4a9950b1 100644
--- a/video/efi_fb.c
+++ b/video/efi_fb.c
@@ -197,7 +197,7 @@ grub_video_efi_fini (void)
 
 static grub_err_t
 grub_video_efi_setup (unsigned int width, unsigned int height,
-		      unsigned int mode_type)
+		      unsigned int mode_type, unsigned int mode_mask __attribute__ ((unused)))
 {
   unsigned int depth;
   int found = 0;

From 2fac00e6687eb0b55e7102c2d6c64a389084bc77 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 27 Nov 2009 10:20:24 +0100
Subject: [PATCH 0122/1628] Fixed a warning

---
 gfxmenu/view.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfxmenu/view.c b/gfxmenu/view.c
index 1c512fee1..7d9bb1cd0 100644
--- a/gfxmenu/view.c
+++ b/gfxmenu/view.c
@@ -255,7 +255,10 @@ update_timeout (grub_gfxmenu_view_t view, int is_init)
       seconds_remaining_rounded_up = (remaining + 999) / 1000;
     }
   else
-    seconds_remaining_rounded_up = -1;
+    {
+      seconds_remaining_rounded_up = -1;
+      remaining = -1;
+    }
 
   if (view->last_seconds_remaining == seconds_remaining_rounded_up && !is_init)
     return;

From 3c68ed3d804353ec94d3b5154e3f6e0016ba22f9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Nov 2009 23:34:48 +0100
Subject: [PATCH 0123/1628] Deduplicated cache handling. Fixed jump hatch being
 filled with random stuff

---
 kern/mips/cache.S        | 26 ++--------------------
 kern/mips/cache_flush.S  | 23 ++++++++++++++++++++
 lib/mips/relocator.c     |  3 +++
 lib/mips/relocator_asm.S | 47 +++++-----------------------------------
 4 files changed, 34 insertions(+), 65 deletions(-)
 create mode 100644 kern/mips/cache_flush.S

diff --git a/kern/mips/cache.S b/kern/mips/cache.S
index 8353e1b04..2c35b6da2 100644
--- a/kern/mips/cache.S
+++ b/kern/mips/cache.S
@@ -1,29 +1,7 @@
+
 #include <grub/symbol.h>
 
-	/* FIXME: This should invalidate only part of memory.  */
 FUNCTION (grub_cpu_flush_cache)
 FUNCTION (grub_arch_sync_caches)
-	move $t2, $a0
-	addu $t3, $a0, $a1
-	srl $t2, $t2, 5
-	sll $t2, $t2, 5
-	addu $t3, $t3, 0x1f
-	srl $t3, $t3, 5
-	sll $t3, $t3, 5
-	move $t0, $t2
-	subu $t1, $t3, $t2
-r1:
-	cache 1, 0($t0)
-	addiu $t0, $t0, 0x1
-	addiu $t1, $t1, 0xffff
-	bne $t1, $zero, r1
-	sync
-	move $t0, $t2
-	subu $t1, $t3, $t2
-r2:
-	cache 0, 0($t0)
-	addiu $t0, $t0, 0x1
-	addiu $t1, $t1, 0xffff
-	bne $t1, $zero, r2
-	sync
+#include "cache_flush.S"
 	j $ra
diff --git a/kern/mips/cache_flush.S b/kern/mips/cache_flush.S
new file mode 100644
index 000000000..5667ee7b4
--- /dev/null
+++ b/kern/mips/cache_flush.S
@@ -0,0 +1,23 @@
+	move $t2, $a0
+	addu $t3, $a0, $a1
+	srl $t2, $t2, 5
+	sll $t2, $t2, 5
+	addu $t3, $t3, 0x1f
+	srl $t3, $t3, 5
+	sll $t3, $t3, 5
+	move $t0, $t2
+	subu $t1, $t3, $t2
+1:
+	cache 1, 0($t0)
+	addiu $t0, $t0, 0x1
+	addiu $t1, $t1, 0xffff
+	bne $t1, $zero, 1b
+	sync
+	move $t0, $t2
+	subu $t1, $t3, $t2
+2:
+	cache 0, 0($t0)
+	addiu $t0, $t0, 0x1
+	addiu $t1, $t1, 0xffff
+	bne $t1, $zero, 2b
+	sync
diff --git a/lib/mips/relocator.c b/lib/mips/relocator.c
index 796473bf7..40be263c7 100644
--- a/lib/mips/relocator.c
+++ b/lib/mips/relocator.c
@@ -64,6 +64,9 @@ write_jump (int regn, void **target)
   /* j $r.  */
   *(grub_uint32_t *) *target = (regn<<21) | 0x8;
   *target = ((grub_uint32_t *) *target) + 1;
+  /* nop.  */
+  *(grub_uint32_t *) *target = 0;
+  *target = ((grub_uint32_t *) *target) + 1;
 }
 
 static void
diff --git a/lib/mips/relocator_asm.S b/lib/mips/relocator_asm.S
index 9daf0d32f..ff4fa31e0 100644
--- a/lib/mips/relocator_asm.S
+++ b/lib/mips/relocator_asm.S
@@ -21,8 +21,8 @@
 	.p2align	4	/* force 16-byte alignment */
 
 VARIABLE (grub_relocator32_forward_start)
-	move $12, $9
-	move $13, $10
+	move $a0, $9
+	move $a1, $10
 
 copycont1:	
 	lb $11,0($8)
@@ -32,31 +32,13 @@ copycont1:
 	addiu $10, $10, 0xffff
 	bne $10, $0, copycont1
 
-	move $9, $12
-	move $10, $13
-cachecont1a:	
-	cache 1,0($12)
-	addiu $12, $12, 0x1
-	addiu $13, $13, 0xffff
-	bne $13, $0, cachecont1a
-
-	sync
-
-	move $12, $9
-	move $13, $10
-cachecont1b:	
-	cache 0,0($12)
-	addiu $12, $12, 0x1
-	addiu $13, $13, 0xffff
-	bne $13, $0, cachecont1b
-
-	sync
+#include "../../kern/mips/cache_flush.S"
 
 VARIABLE (grub_relocator32_forward_end)
 
 VARIABLE (grub_relocator32_backward_start)
-	move $12, $9
-	move $13, $10
+	move $a0, $9
+	move $a1, $10
 
 	addu $9, $9, $10
 	addu $8, $8, $10
@@ -71,23 +53,6 @@ copycont2:
 	addiu $10, 0xffff
 	bne $10, $0, copycont2
 
-	move $9, $12
-	move $10, $13
-cachecont2a:	
-	cache 1,0($12)
-	addiu $12, $12, 0x1
-	addiu $13, $13, 0xffff
-	bne $13, $0, cachecont2a
+#include "../../kern/mips/cache_flush.S"
 
-	sync
-
-	move $12, $9
-	move $13, $10
-cachecont2b:	
-	cache 0,0($12)
-	addiu $12, $12, 0x1
-	addiu $13, $13, 0xffff
-	bne $13, $0, cachecont2b
-
-	sync
 VARIABLE (grub_relocator32_backward_end)

From 368a0c61fd2f05347dd88a154f49aba39204317e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Nov 2009 01:09:30 +0100
Subject: [PATCH 0124/1628] Made linux command line work

---
 loader/mips/linux.c | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index 056eca793..26a31034c 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -38,7 +38,8 @@ static grub_size_t initrd_size;
 static grub_size_t linux_size;
 
 static grub_uint8_t *playground;
-static grub_addr_t target_addr, entry_addr, initrd_addr, argc_addr;
+static grub_addr_t target_addr, entry_addr, initrd_addr;
+static int linux_argc;
 static grub_addr_t argv_addr, envp_addr;
 
 static grub_err_t
@@ -48,7 +49,7 @@ grub_linux_boot (void)
 
   /* Boot the kernel.  */
   state.gpr[1] = entry_addr;
-  state.gpr[4] = argc_addr;
+  state.gpr[4] = linux_argc;
   state.gpr[5] = argv_addr;
   state.gpr[6] = envp_addr;
   state.jumpreg = 1;
@@ -195,11 +196,16 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   grub_loader_unset ();
   loaded = 0;
 
-  size = sizeof (grub_uint32_t) * argc + ALIGN_UP (sizeof ("g"), 4)
-    + sizeof (grub_uint32_t) + (0 + 1) * sizeof (grub_uint32_t);
+  /* For arguments.  */
+  linux_argc = argc;
+  size = (linux_argc + 1) * sizeof (grub_uint32_t); 
+  size += ALIGN_UP (sizeof ("g"), 4);
   for (i = 1; i < argc; i++)
     size += ALIGN_UP (grub_strlen (argv[i]) + 1, 4);
 
+  /* For the environment.  */
+  size += sizeof (grub_uint32_t); 
+
   if (grub_elf_is_elf32 (elf))
     err = grub_linux_load32 (elf, &extra, size);
   else
@@ -212,33 +218,29 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
   if (err)
     return err;
-  
-  *(grub_uint32_t *) extra = argc;
-  argc_addr = (grub_uint8_t *) extra - (grub_uint8_t *) playground
-    + target_addr;
-  extra = (grub_uint32_t *) extra + 1;
+
   linux_argv = extra;
   argv_addr = (grub_uint8_t *) linux_argv - (grub_uint8_t *) playground
     + target_addr;
-  extra = linux_argv + argc;
+  extra = linux_argv + (linux_argc + 1);
   linux_args = extra;
-
+  grub_memcpy (linux_args, "g", sizeof ("g"));
   *linux_argv = (grub_uint8_t *) linux_args - (grub_uint8_t *) playground
     + target_addr;
-  grub_memcpy (linux_args, "g", sizeof ("g"));
-  linux_args += ALIGN_UP (sizeof ("g"), 4);
   linux_argv++;
+  linux_args += ALIGN_UP (sizeof ("g"), 4);
 
   for (i = 1; i < argc; i++)
     {
+      grub_memcpy (linux_args, argv[i], grub_strlen (argv[i]) + 1);
       *linux_argv = (grub_uint8_t *) linux_args - (grub_uint8_t *) playground
 	+ target_addr;
-      grub_memcpy (linux_args, argv[i], grub_strlen (argv[i]) + 1);
-      linux_args += ALIGN_UP (grub_strlen (argv[i]) + 1, 4);
       linux_argv++;
+      linux_args += ALIGN_UP (grub_strlen (argv[i]) + 1, 4);
     }
-
+  *linux_argv = 0;
   extra = linux_args;
+
   linux_envp = extra;
   envp_addr = (grub_uint8_t *) linux_envp - (grub_uint8_t *) playground
     + target_addr;

From 96c210daa3b29022e23e0fb8824d1d4297cb9239 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Nov 2009 03:24:11 +0100
Subject: [PATCH 0125/1628] Initrd support

---
 loader/mips/linux.c | 88 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 70 insertions(+), 18 deletions(-)

diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index 26a31034c..86f4201b0 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -34,13 +34,14 @@ static grub_dl_t my_mod;
 
 static int loaded;
 
-static grub_size_t initrd_size;
 static grub_size_t linux_size;
 
 static grub_uint8_t *playground;
-static grub_addr_t target_addr, entry_addr, initrd_addr;
+static grub_addr_t target_addr, entry_addr;
 static int linux_argc;
-static grub_addr_t argv_addr, envp_addr;
+static grub_off_t argv_off, envp_off;
+static grub_off_t rd_addr_arg_off, rd_size_arg_off;
+static int initrd_loaded = 0;
 
 static grub_err_t
 grub_linux_boot (void)
@@ -50,8 +51,8 @@ grub_linux_boot (void)
   /* Boot the kernel.  */
   state.gpr[1] = entry_addr;
   state.gpr[4] = linux_argc;
-  state.gpr[5] = argv_addr;
-  state.gpr[6] = envp_addr;
+  state.gpr[5] = target_addr + argv_off;
+  state.gpr[6] = target_addr + envp_off;
   state.jumpreg = 1;
   grub_relocator32_boot (playground, target_addr, state);
 
@@ -198,10 +199,23 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
   /* For arguments.  */
   linux_argc = argc;
+  /* Main arguments.  */
   size = (linux_argc + 1) * sizeof (grub_uint32_t); 
-  size += ALIGN_UP (sizeof ("g"), 4);
+  /* Initrd address and size.  */
+  size += 2 * sizeof (grub_uint32_t); 
+  /* NULL terminator.  */
+  size += sizeof (grub_uint32_t); 
+
+  /* First arguments are always "a0" and "a1".  */
+  size += ALIGN_UP (sizeof ("a0"), 4);
+  size += ALIGN_UP (sizeof ("a1"), 4);
+  /* Normal arguments.  */
   for (i = 1; i < argc; i++)
     size += ALIGN_UP (grub_strlen (argv[i]) + 1, 4);
+  
+  /* rd arguments.  */
+  size += ALIGN_UP (sizeof ("rd_start=0xXXXXXXXXXXXXXXXX"), 4);
+  size += ALIGN_UP (sizeof ("rd_size=0xXXXXXXXXXXXXXXXX"), 4);
 
   /* For the environment.  */
   size += sizeof (grub_uint32_t); 
@@ -220,15 +234,21 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
     return err;
 
   linux_argv = extra;
-  argv_addr = (grub_uint8_t *) linux_argv - (grub_uint8_t *) playground
-    + target_addr;
-  extra = linux_argv + (linux_argc + 1);
+  argv_off = (grub_uint8_t *) linux_argv - (grub_uint8_t *) playground;
+  extra = linux_argv + (linux_argc + 1 + 1 + 2);
   linux_args = extra;
-  grub_memcpy (linux_args, "g", sizeof ("g"));
+
+  grub_memcpy (linux_args, "a0", sizeof ("a0"));
   *linux_argv = (grub_uint8_t *) linux_args - (grub_uint8_t *) playground
     + target_addr;
   linux_argv++;
-  linux_args += ALIGN_UP (sizeof ("g"), 4);
+  linux_args += ALIGN_UP (sizeof ("a0"), 4);
+
+  grub_memcpy (linux_args, "a1", sizeof ("a1"));
+  *linux_argv = (grub_uint8_t *) linux_args - (grub_uint8_t *) playground
+    + target_addr;
+  linux_argv++;
+  linux_args += ALIGN_UP (sizeof ("a1"), 4);
 
   for (i = 1; i < argc; i++)
     {
@@ -238,16 +258,28 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
       linux_argv++;
       linux_args += ALIGN_UP (grub_strlen (argv[i]) + 1, 4);
     }
+
+  /* Reserve space for rd arguments.  */
+  rd_addr_arg_off = (grub_uint8_t *) linux_args - (grub_uint8_t *) playground;
+  linux_args += ALIGN_UP (sizeof ("rd_start=0xXXXXXXXXXXXXXXXX"), 4);
   *linux_argv = 0;
+  linux_argv++;
+
+  rd_size_arg_off = (grub_uint8_t *) linux_args - (grub_uint8_t *) playground;
+  linux_args += ALIGN_UP (sizeof ("rd_size=0xXXXXXXXXXXXXXXXX"), 4);
+  *linux_argv = 0;
+  linux_argv++;
+
+  *linux_argv = 0;
+
   extra = linux_args;
 
   linux_envp = extra;
-  envp_addr = (grub_uint8_t *) linux_envp - (grub_uint8_t *) playground
-    + target_addr;
+  envp_off = (grub_uint8_t *) linux_envp - (grub_uint8_t *) playground;
   linux_envp[0] = 0;
 
   grub_loader_set (grub_linux_boot, grub_linux_unload, 1);
-  initrd_addr = 0;
+  initrd_loaded = 0;
   loaded = 1;
   grub_dl_ref (my_mod);
 
@@ -260,6 +292,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
 {
   grub_file_t file = 0;
   grub_ssize_t size;
+  grub_size_t overhead;
 
   if (argc == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "no initrd specified");
@@ -267,20 +300,28 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   if (!loaded)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "You need to load the kernel first.");
 
+  if (initrd_loaded)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "Only one initrd can be loaded.");
+
   file = grub_file_open (argv[0]);
   if (! file)
     return grub_errno;
 
   size = grub_file_size (file);
 
-  playground = grub_relocator32_realloc (playground, linux_size + size);
+  overhead = ALIGN_UP (target_addr + linux_size + 0x10000, 0x10000)
+    - (target_addr + linux_size);
+
+  playground = grub_relocator32_realloc (playground,
+					 linux_size + overhead + size);
+
   if (!playground)
     {
       grub_file_close (file);
       return grub_errno;
     }
 
-  if (grub_file_read (file, playground + linux_size, size) != size)
+  if (grub_file_read (file, playground + linux_size + overhead, size) != size)
     {
       grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file");
       grub_file_close (file);
@@ -288,8 +329,19 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
       return grub_errno;
     }
 
-  initrd_addr = target_addr + linux_size;
-  initrd_size = size;
+  grub_sprintf ((char *) playground + rd_addr_arg_off, "rd_start=0x%llx",
+		(unsigned long long) target_addr + linux_size  + overhead);
+  ((grub_uint32_t *) (playground + argv_off))[linux_argc]
+    = target_addr + rd_addr_arg_off;
+  linux_argc++;
+
+  grub_sprintf ((char *) playground + rd_size_arg_off, "rd_size=0x%llx",
+		(unsigned long long) size);
+  ((grub_uint32_t *) (playground + argv_off))[linux_argc]
+    = target_addr + rd_size_arg_off;
+  linux_argc++;
+
+  initrd_loaded = 1;
 
   grub_file_close (file);
 

From badcfeeac0680962b4e0b8018b328abf21cf7ff4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Nov 2009 12:26:15 +0100
Subject: [PATCH 0126/1628] Fix JUMP_SIZEOF

---
 lib/mips/relocator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mips/relocator.c b/lib/mips/relocator.c
index 40be263c7..118ddbd6f 100644
--- a/lib/mips/relocator.c
+++ b/lib/mips/relocator.c
@@ -36,7 +36,7 @@ extern grub_uint8_t grub_relocator32_backward_start;
 extern grub_uint8_t grub_relocator32_backward_end;
 
 #define REGW_SIZEOF (2 * sizeof (grub_uint32_t))
-#define JUMP_SIZEOF (sizeof (grub_uint32_t))
+#define JUMP_SIZEOF (2 * sizeof (grub_uint32_t))
 
 #define RELOCATOR_SRC_SIZEOF(x) (&grub_relocator32_##x##_end \
 				 - &grub_relocator32_##x##_start)

From f9e4ed6a45f73a3bbc4b1201db16c3f3ba1e4e8b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Nov 2009 14:26:07 +0100
Subject: [PATCH 0127/1628] Index of BMP for faster font lookup

---
 font/font.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/font/font.c b/font/font.c
index a81291916..82e0d88e7 100644
--- a/font/font.c
+++ b/font/font.c
@@ -58,6 +58,7 @@ struct grub_font
   short leading;
   grub_uint32_t num_chars;
   struct char_index_entry *char_index;
+  grub_uint16_t *bmp_idx;
 };
 
 /* Definition of font registry.  */
@@ -180,6 +181,7 @@ font_init (grub_font_t font)
   font->descent = 0;
   font->num_chars = 0;
   font->char_index = 0;
+  font->bmp_idx = 0;
 }
 
 /* Open the next section in the file.
@@ -273,6 +275,14 @@ load_font_index (grub_file_t file, grub_uint32_t sect_length, struct
                                   * sizeof (struct char_index_entry));
   if (! font->char_index)
     return 1;
+  font->bmp_idx = grub_malloc (0x10000 * sizeof (grub_uint16_t));
+  if (! font->bmp_idx)
+    {
+      grub_free (font->char_index);
+      return 1;
+    }
+  grub_memset (font->bmp_idx, 0xff, 0x10000 * sizeof (grub_uint16_t));
+
 
 #if FONT_DEBUG >= 2
   grub_printf("num_chars=%d)\n", font->num_chars);
@@ -299,6 +309,9 @@ load_font_index (grub_file_t file, grub_uint32_t sect_length, struct
           return 1;
         }
 
+      if (entry->code < 0x10000)
+	font->bmp_idx[entry->code] = i;
+
       last_code = entry->code;
 
       /* Read storage flags byte.  */
@@ -594,7 +607,7 @@ read_be_int16 (grub_file_t file, grub_int16_t * value)
 
 /* Return a pointer to the character index entry for the glyph corresponding to
    the codepoint CODE in the font FONT.  If not found, return zero.  */
-static struct char_index_entry *
+static inline struct char_index_entry *
 find_glyph (const grub_font_t font, grub_uint32_t code)
 {
   struct char_index_entry *table;
@@ -602,8 +615,17 @@ find_glyph (const grub_font_t font, grub_uint32_t code)
   grub_size_t hi;
   grub_size_t mid;
 
-  /* Do a binary search in `char_index', which is ordered by code point.  */
   table = font->char_index;
+
+  /* Use BMP index if possible.  */
+  if (code < 0x10000)
+    {
+      if (font->bmp_idx[code] == 0xffff)
+	return 0;
+      return &table[font->bmp_idx[code]];
+    }
+
+  /* Do a binary search in `char_index', which is ordered by code point.  */
   lo = 0;
   hi = font->num_chars - 1;
 

From 26625973e14613858d9fef3afe9913b065935800 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Nov 2009 15:17:18 +0100
Subject: [PATCH 0128/1628] ChangeLog

---
 ChangeLog.bmpidx | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 ChangeLog.bmpidx

diff --git a/ChangeLog.bmpidx b/ChangeLog.bmpidx
new file mode 100644
index 000000000..bae879596
--- /dev/null
+++ b/ChangeLog.bmpidx
@@ -0,0 +1,9 @@
+2009-11-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Optimise glyph lookup by Basic Multilingual Plane lookup array.
+
+	* font/font.c (struct grub_font): New member 'bmp_idx'.
+	(font_init): Initialise 'bmp_idx'.
+	(load_font_index): Fill 'bmp_idx'.
+	(find_glyph): Make inline. Use bmp_idx for BMP characters.
+

From 3e29c69a8ddf5e5641d35a55a01def964fd89f72 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Nov 2009 10:58:06 +0100
Subject: [PATCH 0129/1628] 2009-11-30  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* video/fb/video_fb.c (grub_video_fb_scroll): Optimise by avoiding
	unnecessary calls.
---
 ChangeLog.scrollopt |  4 ++
 video/fb/video_fb.c | 93 +++++++++++++++++++++++++++++++++++----------
 2 files changed, 76 insertions(+), 21 deletions(-)
 create mode 100644 ChangeLog.scrollopt

diff --git a/ChangeLog.scrollopt b/ChangeLog.scrollopt
new file mode 100644
index 000000000..c677a2372
--- /dev/null
+++ b/ChangeLog.scrollopt
@@ -0,0 +1,4 @@
+2009-11-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* video/fb/video_fb.c (grub_video_fb_scroll): Optimise by avoiding
+	unnecessary calls.
diff --git a/video/fb/video_fb.c b/video/fb/video_fb.c
index 5f2917da6..15c30c23b 100644
--- a/video/fb/video_fb.c
+++ b/video/fb/video_fb.c
@@ -974,32 +974,83 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy)
     {
       /* 3. Move data in render target.  */
       struct grub_video_fbblit_info target;
-      grub_uint8_t *src;
-      grub_uint8_t *dst;
-      int j;
+      int i, j;
+      int linedelta, linelen;
 
       target.mode_info = &render_target->mode_info;
       target.data = render_target->data;
 
-      /* Check vertical direction of the move.  */
-      if (dy <= 0)
-	/* 3a. Move data upwards.  */
-	for (j = 0; j < height; j++)
-	  {
-	    dst = grub_video_fb_get_video_ptr (&target, dst_x, dst_y + j);
-	    src = grub_video_fb_get_video_ptr (&target, src_x, src_y + j);
-	    grub_memmove (dst, src,
-			  width * target.mode_info->bytes_per_pixel);
-	  }
+      linedelta = target.mode_info->pitch
+	- width * target.mode_info->bytes_per_pixel;
+      linelen = width * target.mode_info->bytes_per_pixel;
+#define DO_SCROLL                                                    \
+      /* Check vertical direction of the move.  */                   \
+      if (dy < 0 || (dy == 0 && dx < 0))                             \
+	{                                                            \
+	  dst = (void *) grub_video_fb_get_video_ptr (&target,       \
+						      dst_x, dst_y); \
+	  src = (void *) grub_video_fb_get_video_ptr (&target,	     \
+						      src_x, src_y); \
+	  /* 3a. Move data upwards.  */                              \
+	  for (j = 0; j < height; j++)                               \
+	    {                                                        \
+	      for (i = 0; i < linelen; i++)                          \
+		*(dst++) = *(src++);	                             \
+	      dst += linedelta;                                      \
+	      src += linedelta;                                      \
+	    }							     \
+	}                                                            \
+      else                                                           \
+	{                                                            \
+	  /* 3b. Move data downwards.  */                            \
+	  dst = (void *) grub_video_fb_get_video_ptr (&target,	     \
+					     dst_x + width - 1,      \
+					     dst_y + height - 1);    \
+	  src = (void *) grub_video_fb_get_video_ptr (&target,	     \
+					     src_x + width - 1,      \
+					     src_y + height - 1);    \
+	  for (j = 0; j < height; j++)                               \
+	    {                                                        \
+	      for (i = 0; i < linelen; i++)                          \
+		*(dst--) = *(src--);                                 \
+	      dst -= linedelta;                                      \
+	      src -= linedelta;                                      \
+	    }                                                        \
+	}
+
+      /* If everything is aligned on 32-bit use 32-bit copy.  */
+      if ((grub_addr_t) grub_video_fb_get_video_ptr (&target, src_x, src_y)
+	  % sizeof (grub_uint32_t) == 0
+	  && (grub_addr_t) grub_video_fb_get_video_ptr (&target, dst_x, dst_y) 
+	  % sizeof (grub_uint32_t) == 0
+	  && linelen % sizeof (grub_uint32_t) == 0
+	  && linedelta % sizeof (grub_uint32_t) == 0)
+	{
+	  grub_uint32_t *src, *dst;
+	  linelen /= sizeof (grub_uint32_t);
+	  linedelta /= sizeof (grub_uint32_t);
+	  DO_SCROLL
+	}
+      /* If everything is aligned on 16-bit use 16-bit copy.  */
+      else if ((grub_addr_t) grub_video_fb_get_video_ptr (&target, src_x, src_y)
+	       % sizeof (grub_uint16_t) == 0
+	       && (grub_addr_t) grub_video_fb_get_video_ptr (&target,
+							     dst_x, dst_y) 
+	       % sizeof (grub_uint16_t) == 0
+	       && linelen % sizeof (grub_uint16_t) == 0
+	       && linedelta % sizeof (grub_uint16_t) == 0)
+	{
+	  grub_uint16_t *src, *dst;
+	  linelen /= sizeof (grub_uint16_t);
+	  linedelta /= sizeof (grub_uint16_t);
+	  DO_SCROLL
+	}
+      /* If not aligned at all use 8-bit copy.  */
       else
-	/* 3b. Move data downwards.  */
-	for (j = (height - 1); j >= 0; j--)
-	  {
-	    dst = grub_video_fb_get_video_ptr (&target, dst_x, dst_y + j);
-	    src = grub_video_fb_get_video_ptr (&target, src_x, src_y + j);
-	    grub_memmove (dst, src,
-			  width * target.mode_info->bytes_per_pixel);
-	  }
+	{
+	  grub_uint8_t *src, *dst;
+	  DO_SCROLL
+	}	
     }
 
   /* 4. Fill empty space with specified color.  In this implementation

From af20edb21d83d413e9721948f71e8ca2035e7d1b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Nov 2009 12:51:20 +0100
Subject: [PATCH 0130/1628] 2009-11-30  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Agglomerate scrolling in gfxterm.

	* term/gfxterm.c (grub_virtual_screen): New member 'total_screen'.
	(grub_virtual_screen_setup): Initialise 'total_screen'.
	(write_char): Split to ...
	(paint_char): ... this ...
	(write_char): ... and this.
	(paint_char): Handle delayed scrolling.
	(draw_cursor): Likewise.
	(scroll_up): Split to ...
	(real_scroll): ... this ...
	(scroll_up): ... and this.
	(real_scroll): Handle multi-line scroll and draw below-the-bottom
	characters.
	(grub_gfxterm_refresh): Call real_scroll.
---
 term/gfxterm.c | 157 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 98 insertions(+), 59 deletions(-)

diff --git a/term/gfxterm.c b/term/gfxterm.c
index 5330c4ac4..be0487830 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -102,6 +102,8 @@ struct grub_virtual_screen
   /* Text buffer for virtual screen.  Contains (columns * rows) number
      of entries.  */
   struct grub_colored_char *text_buffer;
+
+  int total_scroll;
 };
 
 struct grub_gfxterm_window
@@ -225,6 +227,7 @@ grub_virtual_screen_setup (unsigned int x, unsigned int y,
   virtual_screen.cursor_x = 0;
   virtual_screen.cursor_y = 0;
   virtual_screen.cursor_state = 1;
+  virtual_screen.total_scroll = 0;
 
   /* Calculate size of text buffer.  */
   virtual_screen.columns = virtual_screen.width / virtual_screen.normal_char_width;
@@ -586,8 +589,8 @@ dirty_region_redraw (void)
   redraw_screen_rect (x, y, width, height);
 }
 
-static void
-write_char (void)
+static inline void
+paint_char (unsigned cx, unsigned cy)
 {
   struct grub_colored_char *p;
   struct grub_font_glyph *glyph;
@@ -599,10 +602,12 @@ write_char (void)
   unsigned int height;
   unsigned int width;
 
+  if (cy + virtual_screen.total_scroll >= virtual_screen.rows)
+    return;
+
   /* Find out active character.  */
   p = (virtual_screen.text_buffer
-       + virtual_screen.cursor_x
-       + (virtual_screen.cursor_y * virtual_screen.columns));
+       + cx + (cy * virtual_screen.columns));
 
   p -= p->index;
 
@@ -616,8 +621,8 @@ write_char (void)
   color = p->fg_color;
   bgcolor = p->bg_color;
 
-  x = virtual_screen.cursor_x * virtual_screen.normal_char_width;
-  y = virtual_screen.cursor_y * virtual_screen.normal_char_height;
+  x = cx * virtual_screen.normal_char_width;
+  y = (cy + virtual_screen.total_scroll) * virtual_screen.normal_char_height;
 
   /* Render glyph to text layer.  */
   grub_video_set_active_render_target (text_layer);
@@ -630,64 +635,58 @@ write_char (void)
                     width, height);
 }
 
-static void
+static inline void
+write_char (void)
+{
+  paint_char (virtual_screen.cursor_x, virtual_screen.cursor_y);
+}
+
+static inline void
 draw_cursor (int show)
 {
+  unsigned int x;
+  unsigned int y;
+  unsigned int width;
+  unsigned int height;
+  grub_video_color_t color;
+  
   write_char ();
 
-  if (show)
-    {
-      unsigned int x;
-      unsigned int y;
-      unsigned int width;
-      unsigned int height;
-      grub_video_color_t color;
+  if (!show)
+    return;
 
-      /* Determine cursor properties and position on text layer. */
-      x = virtual_screen.cursor_x * virtual_screen.normal_char_width;
-      width = virtual_screen.normal_char_width;
-      color = virtual_screen.fg_color;
-      y = (virtual_screen.cursor_y * virtual_screen.normal_char_height
-           + grub_font_get_ascent (virtual_screen.font));
-      height = 2;
+  if (virtual_screen.cursor_y + virtual_screen.total_scroll
+      >= virtual_screen.rows)
+    return;
 
-      /* Render cursor to text layer.  */
-      grub_video_set_active_render_target (text_layer);
-      grub_video_fill_rect (color, x, y, width, height);
-      grub_video_set_active_render_target (render_target);
-
-      /* Mark cursor to be redrawn.  */
-      dirty_region_add (virtual_screen.offset_x + x,
-                        virtual_screen.offset_y + y,
-                        width, height);
-    }
+  /* Determine cursor properties and position on text layer. */
+  x = virtual_screen.cursor_x * virtual_screen.normal_char_width;
+  width = virtual_screen.normal_char_width;
+  color = virtual_screen.fg_color;
+  y = ((virtual_screen.cursor_y + virtual_screen.total_scroll)
+       * virtual_screen.normal_char_height
+       + grub_font_get_ascent (virtual_screen.font));
+  height = 2;
+  
+  /* Render cursor to text layer.  */
+  grub_video_set_active_render_target (text_layer);
+  grub_video_fill_rect (color, x, y, width, height);
+  grub_video_set_active_render_target (render_target);
+  
+  /* Mark cursor to be redrawn.  */
+  dirty_region_add (virtual_screen.offset_x + x,
+		    virtual_screen.offset_y + y,
+		    width, height);
 }
 
 static void
-scroll_up (void)
+real_scroll (void)
 {
-  unsigned int i;
+  unsigned int i, j, was_scroll;
   grub_video_color_t color;
 
-  /* If we don't have background bitmap, remove cursor. */
-  if (!bitmap)
-    {
-      /* Remove cursor.  */
-      draw_cursor (0);
-    }
-
-  /* Scroll text buffer with one line to up.  */
-  grub_memmove (virtual_screen.text_buffer,
-                virtual_screen.text_buffer + virtual_screen.columns,
-                sizeof (*virtual_screen.text_buffer)
-                * virtual_screen.columns
-                * (virtual_screen.rows - 1));
-
-  /* Clear last line in text buffer.  */
-  for (i = virtual_screen.columns * (virtual_screen.rows - 1);
-       i < virtual_screen.columns * virtual_screen.rows;
-       i++)
-    clear_char (&(virtual_screen.text_buffer[i]));
+  if (!virtual_screen.total_scroll)
+    return;
 
   /* If we have bitmap, re-draw screen, otherwise scroll physical screen too.  */
   if (bitmap)
@@ -695,7 +694,8 @@ scroll_up (void)
       /* Scroll physical screen.  */
       grub_video_set_active_render_target (text_layer);
       color = virtual_screen.bg_color;
-      grub_video_scroll (color, 0, -virtual_screen.normal_char_height);
+      grub_video_scroll (color, 0, -virtual_screen.normal_char_height
+			 * virtual_screen.total_scroll);
 
       /* Mark virtual screen to be redrawn.  */
       dirty_region_add_virtualscreen ();
@@ -704,6 +704,9 @@ scroll_up (void)
     {
       grub_video_rect_t saved_view;
 
+      /* Remove cursor.  */
+      draw_cursor (0);
+
       grub_video_set_active_render_target (render_target);
       /* Save viewport and set it to our window.  */
       grub_video_get_viewport ((unsigned *) &saved_view.x, 
@@ -723,13 +726,15 @@ scroll_up (void)
 				virtual_screen.offset_x,
 				virtual_screen.offset_y,
 				virtual_screen.width,
-				virtual_screen.normal_char_height);
+				virtual_screen.normal_char_height
+				* virtual_screen.total_scroll);
 
 	  grub_video_set_active_render_target (render_target);
 	  dirty_region_redraw ();
 
 	  /* Scroll physical screen.  */
-	  grub_video_scroll (color, 0, -virtual_screen.normal_char_height);
+	  grub_video_scroll (color, 0, -virtual_screen.normal_char_height
+			     * virtual_screen.total_scroll);
 
 	  if (i)
 	    grub_video_swap_buffers ();
@@ -739,22 +744,54 @@ scroll_up (void)
       /* Scroll physical screen.  */
       grub_video_set_active_render_target (text_layer);
       color = virtual_screen.bg_color;
-      grub_video_scroll (color, 0, -virtual_screen.normal_char_height);
+      grub_video_scroll (color, 0, -virtual_screen.normal_char_height
+			 * virtual_screen.total_scroll);
 
       /* Restore saved viewport.  */
       grub_video_set_viewport (saved_view.x, saved_view.y,
                                saved_view.width, saved_view.height);
       grub_video_set_active_render_target (render_target);
 
-      /* Draw cursor if visible.  */
-      if (virtual_screen.cursor_state)
-	draw_cursor (1);
     }
 
+  /* Draw cursor if visible.  */
+  if (virtual_screen.cursor_state)
+    draw_cursor (1);
+
+  was_scroll = virtual_screen.total_scroll;
+  virtual_screen.total_scroll = 0;
+
+  /* Draw shadow part.  */
+  for (i = virtual_screen.rows - was_scroll;
+       i < virtual_screen.rows; i++)
+    for (j = 0; j < virtual_screen.columns; j++)
+      paint_char (j, i);
+
   if (repaint_callback)
     repaint_callback (window.x, window.y, window.width, window.height);
 }
 
+static void
+scroll_up (void)
+{
+  unsigned int i;
+
+  /* Scroll text buffer with one line to up.  */
+  grub_memmove (virtual_screen.text_buffer,
+                virtual_screen.text_buffer + virtual_screen.columns,
+                sizeof (*virtual_screen.text_buffer)
+                * virtual_screen.columns
+                * (virtual_screen.rows - 1));
+
+  /* Clear last line in text buffer.  */
+  for (i = virtual_screen.columns * (virtual_screen.rows - 1);
+       i < virtual_screen.columns * virtual_screen.rows;
+       i++)
+    clear_char (&(virtual_screen.text_buffer[i]));
+
+  virtual_screen.total_scroll++;
+}
+
 static void
 grub_gfxterm_putchar (grub_uint32_t c)
 {
@@ -1023,6 +1060,8 @@ grub_gfxterm_setcursor (int on)
 static void
 grub_gfxterm_refresh (void)
 {
+  real_scroll ();
+
   /* Redraw only changed regions.  */
   dirty_region_redraw ();
 

From e59e3e59caa3d3f7dbe54812f7b97964f03aa3aa Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Nov 2009 12:52:39 +0100
Subject: [PATCH 0131/1628] Changelog

---
 ChangeLog.gfxtermscroll | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 ChangeLog.gfxtermscroll

diff --git a/ChangeLog.gfxtermscroll b/ChangeLog.gfxtermscroll
new file mode 100644
index 000000000..b0733116f
--- /dev/null
+++ b/ChangeLog.gfxtermscroll
@@ -0,0 +1,18 @@
+2009-11-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Agglomerate scrolling in gfxterm.
+
+	* term/gfxterm.c (grub_virtual_screen): New member 'total_screen'.
+	(grub_virtual_screen_setup): Initialise 'total_screen'.
+	(write_char): Split to ...
+	(paint_char): ... this ...
+	(write_char): ... and this.
+	(paint_char): Handle delayed scrolling.
+	(draw_cursor): Likewise.
+	(scroll_up): Split to ...
+	(real_scroll): ... this ...
+	(scroll_up): ... and this.
+	(real_scroll): Handle multi-line scroll and draw below-the-bottom
+	characters.
+	(grub_gfxterm_refresh): Call real_scroll.
+

From adbba2a4ef44ccb309dfbf89b5321ff2794d3c46 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Dec 2009 08:37:43 +0100
Subject: [PATCH 0132/1628] Remove debug serial console with hardcoded address

---
 kern/term.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/kern/term.c b/kern/term.c
index 271cf8d78..0e3595df3 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -51,10 +51,7 @@ grub_putcode (grub_uint32_t code)
   int height = grub_getwh () & 255;
 
   if (!grub_cur_term_output)
-    {
-      *(grub_uint8_t *)0xbff003f8 = code;
-      return;
-    }
+    return;
 
   if (code == '\t' && grub_cur_term_output->getxy)
     {

From 3e5c7dc3d8a6c4e5cf2d958951a8c6fc08fc2ea1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Dec 2009 08:39:17 +0100
Subject: [PATCH 0133/1628] Fix qemu-r4k

---
 conf/mips-qemu-r4k.rmk            |  2 ++
 conf/mips-yeeloong.rmk            | 54 +++++++++++++++++++++++++++++++
 conf/mips.rmk                     | 54 -------------------------------
 configure.ac                      |  1 +
 include/grub/mips/qemu-r4k/boot.h |  0
 kern/mips/qemu-r4k/init.c         | 15 ---------
 6 files changed, 57 insertions(+), 69 deletions(-)
 create mode 100644 include/grub/mips/qemu-r4k/boot.h

diff --git a/conf/mips-qemu-r4k.rmk b/conf/mips-qemu-r4k.rmk
index 3ff36c472..ec14d9336 100644
--- a/conf/mips-qemu-r4k.rmk
+++ b/conf/mips-qemu-r4k.rmk
@@ -1,4 +1,6 @@
 # -*- makefile -*-
 LINK_BASE = 0x80010000
 target_machine=qemu-r4k
+COMMON_CFLAGS += -march=mips3
+COMMON_ASFLAGS += -march=mips3
 include $(srcdir)/conf/mips.mk
diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 95ec26522..68c426e1b 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -11,8 +11,62 @@ pci_mod_SOURCES = bus/pci.c bus/bonito.c
 pci_mod_CFLAGS = $(COMMON_CFLAGS)
 pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For ata.mod.
+pkglib_MODULES += ata.mod
+ata_mod_SOURCES = disk/ata.c
+ata_mod_CFLAGS = $(COMMON_CFLAGS)
+ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # For pci.mod.
 pkglib_MODULES += sm712.mod
 sm712_mod_SOURCES = video/sm712.c 
 sm712_mod_CFLAGS = $(COMMON_CFLAGS)
 sm712_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For lspci.mod
+pkglib_MODULES += lspci.mod
+lspci_mod_SOURCES = commands/lspci.c
+lspci_mod_CFLAGS = $(COMMON_CFLAGS)
+lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ohci.mod
+pkglib_MODULES += ohci.mod
+ohci_mod_SOURCES = bus/usb/ohci.c
+ohci_mod_CFLAGS = $(COMMON_CFLAGS)
+ohci_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usb.mod
+pkglib_MODULES += usb.mod
+usb_mod_SOURCES = bus/usb/usb.c bus/usb/usbtrans.c bus/usb/usbhub.c
+usb_mod_CFLAGS = $(COMMON_CFLAGS)
+usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usbtest.mod
+pkglib_MODULES += usbtest.mod
+usbtest_mod_SOURCES = commands/usbtest.c
+usbtest_mod_CFLAGS = $(COMMON_CFLAGS)
+usbtest_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usbms.mod
+pkglib_MODULES += usbms.mod
+usbms_mod_SOURCES = disk/usbms.c
+usbms_mod_CFLAGS = $(COMMON_CFLAGS)
+usbms_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usb_keyboard.mod
+pkglib_MODULES += usb_keyboard.mod
+usb_keyboard_mod_SOURCES = term/usb_keyboard.c
+usb_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
+usb_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For at_keyboard.mod.
+pkglib_MODULES += at_keyboard.mod
+at_keyboard_mod_SOURCES = term/at_keyboard.c
+at_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
+at_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ata_pthru.mod.
+pkglib_MODULES += ata_pthru.mod
+ata_pthru_mod_SOURCES = disk/ata_pthru.c
+ata_pthru_mod_CFLAGS = $(COMMON_CFLAGS)
+ata_pthru_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/conf/mips.rmk b/conf/mips.rmk
index fd51cfb00..8c99d9813 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -137,48 +137,6 @@ serial_mod_SOURCES = term/serial.c
 serial_mod_CFLAGS = $(COMMON_CFLAGS)
 serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For ata.mod.
-pkglib_MODULES += ata.mod
-ata_mod_SOURCES = disk/ata.c
-ata_mod_CFLAGS = $(COMMON_CFLAGS)
-ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lspci.mod
-pkglib_MODULES += lspci.mod
-lspci_mod_SOURCES = commands/lspci.c
-lspci_mod_CFLAGS = $(COMMON_CFLAGS)
-lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ohci.mod
-pkglib_MODULES += ohci.mod
-ohci_mod_SOURCES = bus/usb/ohci.c
-ohci_mod_CFLAGS = $(COMMON_CFLAGS)
-ohci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usb.mod
-pkglib_MODULES += usb.mod
-usb_mod_SOURCES = bus/usb/usb.c bus/usb/usbtrans.c bus/usb/usbhub.c
-usb_mod_CFLAGS = $(COMMON_CFLAGS)
-usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usbtest.mod
-pkglib_MODULES += usbtest.mod
-usbtest_mod_SOURCES = commands/usbtest.c
-usbtest_mod_CFLAGS = $(COMMON_CFLAGS)
-usbtest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usbms.mod
-pkglib_MODULES += usbms.mod
-usbms_mod_SOURCES = disk/usbms.c
-usbms_mod_CFLAGS = $(COMMON_CFLAGS)
-usbms_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usb_keyboard.mod
-pkglib_MODULES += usb_keyboard.mod
-usb_keyboard_mod_SOURCES = term/usb_keyboard.c
-usb_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
-usb_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For relocator.mod.
 pkglib_MODULES += relocator.mod
 relocator_mod_SOURCES = lib/$(target_cpu)/relocator.c lib/$(target_cpu)/relocator_asm.S
@@ -192,16 +150,4 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For at_keyboard.mod.
-pkglib_MODULES += at_keyboard.mod
-at_keyboard_mod_SOURCES = term/at_keyboard.c
-at_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
-at_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ata_pthru.mod.
-pkglib_MODULES += ata_pthru.mod
-ata_pthru_mod_SOURCES = disk/ata_pthru.c
-ata_pthru_mod_CFLAGS = $(COMMON_CFLAGS)
-ata_pthru_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 include $(srcdir)/conf/common.mk
diff --git a/configure.ac b/configure.ac
index 88ef06970..62ad58a5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,6 +135,7 @@ case "$platform" in
   pc)		machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
   emu)		machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
   yeeloong)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  qemu-r4k)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
 esac
 CFLAGS="$CFLAGS $machine_CFLAGS"
 TARGET_CFLAGS="$TARGET_CFLAGS $machine_CFLAGS"
diff --git a/include/grub/mips/qemu-r4k/boot.h b/include/grub/mips/qemu-r4k/boot.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/kern/mips/qemu-r4k/init.c b/kern/mips/qemu-r4k/init.c
index 8dfda57c2..866c7a82a 100644
--- a/kern/mips/qemu-r4k/init.c
+++ b/kern/mips/qemu-r4k/init.c
@@ -50,21 +50,6 @@ grub_reboot (void)
   while (1);
 }
 
-void
-grub_machine_set_prefix (void)
-{
-  grub_env_set ("prefix", grub_prefix);
-}
-
-extern char _start[];
-extern char _end[];
-
-grub_addr_t
-grub_arch_modules_addr (void)
-{
-  return ALIGN_UP((grub_addr_t) _end + GRUB_MOD_GAP, GRUB_MOD_ALIGN);
-}
-
 grub_err_t 
 grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, 
 							 grub_uint64_t, 

From e6b9873356fc31bc226d52f65a7526e3b9838fc7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Dec 2009 08:40:51 +0100
Subject: [PATCH 0134/1628] Remove qemu-mipssim

---
 conf/mips-qemu-mipssim.rmk               |  4 --
 configure.ac                             |  1 -
 include/grub/mips/qemu-mipssim/kernel.h  | 35 -----------
 include/grub/mips/qemu-mipssim/machine.h | 24 --------
 include/grub/mips/qemu-mipssim/memory.h  | 54 -----------------
 include/grub/mips/qemu-mipssim/serial.h  | 24 --------
 include/grub/mips/qemu-mipssim/time.h    | 35 -----------
 kern/mips/qemu-mipssim/init.c            | 76 ------------------------
 8 files changed, 253 deletions(-)
 delete mode 100644 conf/mips-qemu-mipssim.rmk
 delete mode 100644 include/grub/mips/qemu-mipssim/kernel.h
 delete mode 100644 include/grub/mips/qemu-mipssim/machine.h
 delete mode 100644 include/grub/mips/qemu-mipssim/memory.h
 delete mode 100644 include/grub/mips/qemu-mipssim/serial.h
 delete mode 100644 include/grub/mips/qemu-mipssim/time.h
 delete mode 100644 kern/mips/qemu-mipssim/init.c

diff --git a/conf/mips-qemu-mipssim.rmk b/conf/mips-qemu-mipssim.rmk
deleted file mode 100644
index 9000ae296..000000000
--- a/conf/mips-qemu-mipssim.rmk
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- makefile -*-
-LINK_BASE = 0x80010000
-target_machine=qemu-mipssim
-include $(srcdir)/conf/mips.mk
diff --git a/configure.ac b/configure.ac
index 62ad58a5d..f08195c37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,7 +102,6 @@ case "$target_cpu"-"$platform" in
   powerpc-ieee1275) ;;
   sparc64-ieee1275) ;;
   mips-qemu-r4k) ;;
-  mips-qemu-mipssim) ;;
   mips-yeeloong) ;;
   *-emu) ;;
   *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
diff --git a/include/grub/mips/qemu-mipssim/kernel.h b/include/grub/mips/qemu-mipssim/kernel.h
deleted file mode 100644
index 6a10f2df1..000000000
--- a/include/grub/mips/qemu-mipssim/kernel.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2006,2007,2008,2009  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/>.
- */
-
-#ifndef GRUB_KERNEL_MACHINE_HEADER
-#define GRUB_KERNEL_MACHINE_HEADER	1
-
-#include <grub/symbol.h>
-
-#ifndef ASM_FILE
-
-void EXPORT_FUNC (grub_reboot) (void);
-void EXPORT_FUNC (grub_halt) (void);
-
-/* The prefix which points to the directory where GRUB modules and its
-   configuration file are located.  */
-extern char grub_prefix[];
-
-#endif
-
-#endif /* ! GRUB_KERNEL_MACHINE_HEADER */
diff --git a/include/grub/mips/qemu-mipssim/machine.h b/include/grub/mips/qemu-mipssim/machine.h
deleted file mode 100644
index 9062662bc..000000000
--- a/include/grub/mips/qemu-mipssim/machine.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2007  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/>.
- */
-
-#ifndef GRUB_MACHINE_MACHINE_HEADER
-#define GRUB_MACHINE_MACHINE_HEADER	1
-
-#define GRUB_MACHINE_MIPS_QEMU_MIPSSIM	1
-
-#endif /* ! GRUB_MACHINE_MACHINE_HEADER */
diff --git a/include/grub/mips/qemu-mipssim/memory.h b/include/grub/mips/qemu-mipssim/memory.h
deleted file mode 100644
index 87e68674e..000000000
--- a/include/grub/mips/qemu-mipssim/memory.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009 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/>.
- */
-
-#ifndef GRUB_MEMORY_MACHINE_HEADER
-#define GRUB_MEMORY_MACHINE_HEADER	1
-
-#ifndef ASM_FILE
-#include <grub/symbol.h>
-#include <grub/err.h>
-#include <grub/types.h>
-#endif
-
-#define GRUB_MACHINE_MEMORY_STACK_HIGH       0x80f00000
-#define GRUB_MACHINE_MEMORY_USABLE       0x81000000
-
-#define GRUB_MACHINE_MEMORY_AVAILABLE        1
-
-#ifndef ASM_FILE
-grub_err_t EXPORT_FUNC (grub_machine_mmap_iterate)
-(int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
-grub_err_t EXPORT_FUNC(grub_machine_mmap_iterate)
-     (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
-
-static inline grub_err_t
-grub_machine_mmap_register (grub_uint64_t start __attribute__ ((unused)),
-			    grub_uint64_t size __attribute__ ((unused)),
-			    int type __attribute__ ((unused)),
-			    int handle __attribute__ ((unused)))
-{
-  return GRUB_ERR_NONE;
-}
-static inline grub_err_t
-grub_machine_mmap_unregister (int handle  __attribute__ ((unused)))
-{
-  return GRUB_ERR_NONE;
-}
-#endif
-
-#endif
diff --git a/include/grub/mips/qemu-mipssim/serial.h b/include/grub/mips/qemu-mipssim/serial.h
deleted file mode 100644
index 55d64fec4..000000000
--- a/include/grub/mips/qemu-mipssim/serial.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  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/>.
- */
-
-#ifndef GRUB_MACHINE_SERIAL_HEADER
-#define GRUB_MACHINE_SERIAL_HEADER	1
-
-#define GRUB_MACHINE_SERIAL_PORTS { 0x1fd003f8 }
-
-#endif 
diff --git a/include/grub/mips/qemu-mipssim/time.h b/include/grub/mips/qemu-mipssim/time.h
deleted file mode 100644
index 5c8564e0d..000000000
--- a/include/grub/mips/qemu-mipssim/time.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003,2004,2005,2007  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/>.
- */
-
-#ifndef KERNEL_MACHINE_TIME_HEADER
-#define KERNEL_MACHINE_TIME_HEADER	1
-
-#include <grub/symbol.h>
-
-#define GRUB_TICKS_PER_SECOND	1000
-
-/* Return the real time in ticks.  */
-grub_uint32_t EXPORT_FUNC (grub_get_rtc) (void);
-
-static inline void
-grub_cpu_idle(void)
-{
-  /*  asm volatile ("wait");*/
-}
-
-#endif /* ! KERNEL_MACHINE_TIME_HEADER */
diff --git a/kern/mips/qemu-mipssim/init.c b/kern/mips/qemu-mipssim/init.c
deleted file mode 100644
index d4001cf1c..000000000
--- a/kern/mips/qemu-mipssim/init.c
+++ /dev/null
@@ -1,76 +0,0 @@
-#include <grub/kernel.h>
-#include <grub/misc.h>
-#include <grub/env.h>
-#include <grub/time.h>
-#include <grub/types.h>
-#include <grub/misc.h>
-#include <grub/mm.h>
-#include <grub/time.h>
-#include <grub/machine/kernel.h>
-#include <grub/machine/memory.h>
-#include <grub/cpu/kernel.h>
-
-#define RAMSIZE (64 << 20)
-
-grub_uint32_t
-grub_get_rtc (void)
-{
-  static int calln = 0;
-  return calln++;
-}
-
-void
-grub_machine_init (void)
-{
-  grub_mm_init_region ((void *) GRUB_MACHINE_MEMORY_USABLE,
-		       RAMSIZE - (GRUB_MACHINE_MEMORY_USABLE & 0x7fffffff));
-  grub_install_get_time_ms (grub_rtc_get_time_ms);
-}
-
-void
-grub_machine_fini (void)
-{
-}
-
-void
-grub_exit (void)
-{
-  while (1);
-}
-
-void
-grub_halt (void)
-{
-  while (1);
-}
-
-void
-grub_reboot (void)
-{
-  while (1);
-}
-
-void
-grub_machine_set_prefix (void)
-{
-  grub_env_set ("prefix", grub_prefix);
-}
-
-extern char _start[];
-extern char _end[];
-
-grub_addr_t
-grub_arch_modules_addr (void)
-{
-  return ALIGN_UP((grub_addr_t) _end + GRUB_MOD_GAP, GRUB_MOD_ALIGN);
-}
-
-grub_err_t 
-grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, 
-							 grub_uint64_t, 
-							 grub_uint32_t))
-{
-  hook (0, RAMSIZE,
-	GRUB_MACHINE_MEMORY_AVAILABLE);
-  return GRUB_ERR_NONE;
-}

From 7b5f334bc0840ce65fc681593c7d98336c3e3f57 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Dec 2009 08:49:36 +0100
Subject: [PATCH 0135/1628] Rename qemu-r4k to qemu-mips

---
 conf/{mips-qemu-r4k.rmk => mips-qemu-mips.rmk}      | 2 +-
 configure.ac                                        | 4 ++--
 include/grub/mips/{qemu-r4k => qemu-mips}/boot.h    | 0
 include/grub/mips/{qemu-r4k => qemu-mips}/kernel.h  | 0
 include/grub/mips/{qemu-r4k => qemu-mips}/loader.h  | 0
 include/grub/mips/{qemu-r4k => qemu-mips}/machine.h | 0
 include/grub/mips/{qemu-r4k => qemu-mips}/memory.h  | 0
 include/grub/mips/{qemu-r4k => qemu-mips}/serial.h  | 0
 include/grub/mips/{qemu-r4k => qemu-mips}/time.h    | 0
 kern/mips/{qemu-r4k => qemu-mips}/init.c            | 0
 10 files changed, 3 insertions(+), 3 deletions(-)
 rename conf/{mips-qemu-r4k.rmk => mips-qemu-mips.rmk} (84%)
 rename include/grub/mips/{qemu-r4k => qemu-mips}/boot.h (100%)
 rename include/grub/mips/{qemu-r4k => qemu-mips}/kernel.h (100%)
 rename include/grub/mips/{qemu-r4k => qemu-mips}/loader.h (100%)
 rename include/grub/mips/{qemu-r4k => qemu-mips}/machine.h (100%)
 rename include/grub/mips/{qemu-r4k => qemu-mips}/memory.h (100%)
 rename include/grub/mips/{qemu-r4k => qemu-mips}/serial.h (100%)
 rename include/grub/mips/{qemu-r4k => qemu-mips}/time.h (100%)
 rename kern/mips/{qemu-r4k => qemu-mips}/init.c (100%)

diff --git a/conf/mips-qemu-r4k.rmk b/conf/mips-qemu-mips.rmk
similarity index 84%
rename from conf/mips-qemu-r4k.rmk
rename to conf/mips-qemu-mips.rmk
index ec14d9336..d5a985a13 100644
--- a/conf/mips-qemu-r4k.rmk
+++ b/conf/mips-qemu-mips.rmk
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 LINK_BASE = 0x80010000
-target_machine=qemu-r4k
+target_machine=qemu-mips
 COMMON_CFLAGS += -march=mips3
 COMMON_ASFLAGS += -march=mips3
 include $(srcdir)/conf/mips.mk
diff --git a/configure.ac b/configure.ac
index f08195c37..8b089ee58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,7 +101,7 @@ case "$target_cpu"-"$platform" in
   i386-qemu) ;;
   powerpc-ieee1275) ;;
   sparc64-ieee1275) ;;
-  mips-qemu-r4k) ;;
+  mips-qemu-mips) ;;
   mips-yeeloong) ;;
   *-emu) ;;
   *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
@@ -134,7 +134,7 @@ case "$platform" in
   pc)		machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
   emu)		machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
   yeeloong)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
-  qemu-r4k)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  qemu-mips)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
 esac
 CFLAGS="$CFLAGS $machine_CFLAGS"
 TARGET_CFLAGS="$TARGET_CFLAGS $machine_CFLAGS"
diff --git a/include/grub/mips/qemu-r4k/boot.h b/include/grub/mips/qemu-mips/boot.h
similarity index 100%
rename from include/grub/mips/qemu-r4k/boot.h
rename to include/grub/mips/qemu-mips/boot.h
diff --git a/include/grub/mips/qemu-r4k/kernel.h b/include/grub/mips/qemu-mips/kernel.h
similarity index 100%
rename from include/grub/mips/qemu-r4k/kernel.h
rename to include/grub/mips/qemu-mips/kernel.h
diff --git a/include/grub/mips/qemu-r4k/loader.h b/include/grub/mips/qemu-mips/loader.h
similarity index 100%
rename from include/grub/mips/qemu-r4k/loader.h
rename to include/grub/mips/qemu-mips/loader.h
diff --git a/include/grub/mips/qemu-r4k/machine.h b/include/grub/mips/qemu-mips/machine.h
similarity index 100%
rename from include/grub/mips/qemu-r4k/machine.h
rename to include/grub/mips/qemu-mips/machine.h
diff --git a/include/grub/mips/qemu-r4k/memory.h b/include/grub/mips/qemu-mips/memory.h
similarity index 100%
rename from include/grub/mips/qemu-r4k/memory.h
rename to include/grub/mips/qemu-mips/memory.h
diff --git a/include/grub/mips/qemu-r4k/serial.h b/include/grub/mips/qemu-mips/serial.h
similarity index 100%
rename from include/grub/mips/qemu-r4k/serial.h
rename to include/grub/mips/qemu-mips/serial.h
diff --git a/include/grub/mips/qemu-r4k/time.h b/include/grub/mips/qemu-mips/time.h
similarity index 100%
rename from include/grub/mips/qemu-r4k/time.h
rename to include/grub/mips/qemu-mips/time.h
diff --git a/kern/mips/qemu-r4k/init.c b/kern/mips/qemu-mips/init.c
similarity index 100%
rename from kern/mips/qemu-r4k/init.c
rename to kern/mips/qemu-mips/init.c

From 0ee6924f69ed278d19764705ac1acdbc92216c2b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Dec 2009 10:00:54 +0100
Subject: [PATCH 0136/1628] Revert USB-related MIPS changes

---
 bus/usb/ohci.c         | 27 +++++++++++----------------
 conf/mips-yeeloong.rmk | 30 ------------------------------
 term/usb_keyboard.c    |  1 +
 3 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 163cee2eb..5fe9c9507 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -27,9 +27,6 @@
 #include <grub/i386/io.h>
 #include <grub/time.h>
 
-#define vtop(x) ((x) & 0x7fffffff)
-#define ptov(x) ((x) | 0x80000000)
-
 struct grub_ohci_hcca
 {
   /* Pointers to Interrupt Endpoint Descriptors.  Not used by
@@ -155,7 +152,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   if (! o)
     return 1;
 
-  o->iobase = (grub_uint32_t *) ptov (base);
+  o->iobase = (grub_uint32_t *) base;
 
   /* Reserve memory for the HCCA.  */
   o->hcca = (struct grub_ohci_hcca *) grub_memalign (256, 256);
@@ -181,7 +178,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_FRAME_INTERVAL, frame_interval);
 
   /* Setup the HCCA.  */
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, vtop ((grub_uint32_t) o->hcca));
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, (grub_uint32_t) o->hcca);
   grub_dprintf ("ohci", "OHCI HCCA\n");
 
   /* Enable the OHCI.  */
@@ -267,10 +264,10 @@ grub_ohci_transaction (grub_ohci_td_t td,
   buffer = (grub_uint32_t) data;
   buffer_end = buffer + size - 1;
 
-  td->token = grub_cpu_to_le32 (vtop (token));
-  td->buffer = grub_cpu_to_le32 (vtop (buffer));
+  td->token = grub_cpu_to_le32 (token);
+  td->buffer = grub_cpu_to_le32 (buffer);
   td->next_td = 0;
-  td->buffer_end = grub_cpu_to_le32 (vtop (buffer_end));
+  td->buffer_end = grub_cpu_to_le32 (buffer_end);
 }
 
 static grub_usb_err_t
@@ -310,8 +307,7 @@ grub_ohci_transfer (grub_usb_controller_t dev,
       grub_ohci_transaction (&td_list[i], tr->pid, tr->toggle,
 			     tr->size, tr->data);
 
-      td_list[i].next_td = grub_cpu_to_le32 (vtop ((grub_addr_t)
-						   &td_list[i + 1]));
+      td_list[i].next_td = grub_cpu_to_le32 (&td_list[i + 1]);
     }
 
   /* Setup the Endpoint Descriptor.  */
@@ -328,9 +324,9 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   /* Set the maximum packet size.  */
   target |= transfer->max << 16;
 
-  td_head = vtop ((grub_uint32_t) td_list);
+  td_head = (grub_uint32_t) td_list;
 
-  td_tail = vtop ((grub_uint32_t) &td_list[transfer->transcnt]);
+  td_tail = (grub_uint32_t) &td_list[transfer->transcnt];
 
   ed->target = grub_cpu_to_le32 (target);
   ed->td_head = grub_cpu_to_le32 (td_head);
@@ -357,8 +353,7 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 	status &= ~(1 << 2);
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
 
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD,
-			      vtop ((grub_uint32_t) ed));
+	grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, (grub_uint32_t) ed);
 
 	/* Enable the Bulk list.  */
 	control |= 1 << 5;
@@ -386,9 +381,9 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
 
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD,
-			      vtop ((grub_uint32_t) ed));
+			      (grub_uint32_t) ed);
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD+1,
-			      vtop ((grub_uint32_t) ed));
+			      (grub_uint32_t) ed);
 
 	/* Enable the Control list.  */
 	control |= 1 << 4;
diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 68c426e1b..16909487d 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -29,36 +29,6 @@ lspci_mod_SOURCES = commands/lspci.c
 lspci_mod_CFLAGS = $(COMMON_CFLAGS)
 lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For ohci.mod
-pkglib_MODULES += ohci.mod
-ohci_mod_SOURCES = bus/usb/ohci.c
-ohci_mod_CFLAGS = $(COMMON_CFLAGS)
-ohci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usb.mod
-pkglib_MODULES += usb.mod
-usb_mod_SOURCES = bus/usb/usb.c bus/usb/usbtrans.c bus/usb/usbhub.c
-usb_mod_CFLAGS = $(COMMON_CFLAGS)
-usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usbtest.mod
-pkglib_MODULES += usbtest.mod
-usbtest_mod_SOURCES = commands/usbtest.c
-usbtest_mod_CFLAGS = $(COMMON_CFLAGS)
-usbtest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usbms.mod
-pkglib_MODULES += usbms.mod
-usbms_mod_SOURCES = disk/usbms.c
-usbms_mod_CFLAGS = $(COMMON_CFLAGS)
-usbms_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usb_keyboard.mod
-pkglib_MODULES += usb_keyboard.mod
-usb_keyboard_mod_SOURCES = term/usb_keyboard.c
-usb_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
-usb_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For at_keyboard.mod.
 pkglib_MODULES += at_keyboard.mod
 at_keyboard_mod_SOURCES = term/at_keyboard.c
diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index 69d5709b6..5d76c5e02 100644
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -18,6 +18,7 @@
  */
 
 #include <grub/term.h>
+#include <grub/machine/console.h>
 #include <grub/time.h>
 #include <grub/cpu/io.h>
 #include <grub/misc.h>

From 035a008c137592a0a0ae2125cfda8d946a1436e3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Dec 2009 11:44:29 +0100
Subject: [PATCH 0137/1628] Remove leftover

---
 include/grub/dl.h                     |   2 -
 include/grub/i386/memory.h.moved      |  30 --------
 include/grub/i386/relocator.h.moved   |  41 -----------
 include/grub/mips/qemu-mips/machine.h |  24 ------
 kern/mips/startup.S                   |   2 -
 lib/i386/relocator.c.moved            | 102 --------------------------
 lib/i386/relocator_backward.S.moved   |   2 -
 7 files changed, 203 deletions(-)
 delete mode 100644 include/grub/i386/memory.h.moved
 delete mode 100644 include/grub/i386/relocator.h.moved
 delete mode 100644 include/grub/mips/qemu-mips/machine.h
 delete mode 100644 lib/i386/relocator.c.moved
 delete mode 100644 lib/i386/relocator_backward.S.moved

diff --git a/include/grub/dl.h b/include/grub/dl.h
index 5bfcb0cf7..9340b6ce4 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -116,8 +116,6 @@ grub_err_t EXPORT_FUNC(grub_dl_register_symbol) (const char *name, void *addr,
 grub_err_t grub_arch_dl_check_header (void *ehdr);
 grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
 
-grub_err_t grub_arch_dl_check_header (void *ehdr);
-
 #if defined (_mips) && ! defined (GRUB_UTIL)
 #define GRUB_LINKER_HAVE_INIT 1
 void grub_arch_dl_init_linker (void);
diff --git a/include/grub/i386/memory.h.moved b/include/grub/i386/memory.h.moved
deleted file mode 100644
index a0f3192b8..000000000
--- a/include/grub/i386/memory.h.moved
+++ /dev/null
@@ -1,30 +0,0 @@
-/* memory.h - describe the memory map */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2007,2008  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/>.
- */
-
-#ifndef GRUB_MEMORY_CPU_HEADER
-#define GRUB_MEMORY_CPU_HEADER	1
-
-/* The flag for protected mode.  */
-#define GRUB_MEMORY_CPU_CR0_PE_ON		0x1
-#define GRUB_MEMORY_CPU_CR4_PAE_ON		0x00000040
-#define GRUB_MEMORY_CPU_CR0_PAGING_ON       0x80000000
-#define GRUB_MEMORY_CPU_AMD64_MSR           0xc0000080
-#define GRUB_MEMORY_CPU_AMD64_MSR_ON        0x00000100
-
-#endif /* ! GRUB_MEMORY_CPU_HEADER */
diff --git a/include/grub/i386/relocator.h.moved b/include/grub/i386/relocator.h.moved
deleted file mode 100644
index ef7fe23aa..000000000
--- a/include/grub/i386/relocator.h.moved
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  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/>.
- */
-
-#ifndef GRUB_RELOCATOR_CPU_HEADER
-#define GRUB_RELOCATOR_CPU_HEADER	1
-
-#include <grub/types.h>
-#include <grub/err.h>
-
-struct grub_relocator32_state
-{
-  grub_uint32_t esp;
-  grub_uint32_t eax;
-  grub_uint32_t ebx;
-  grub_uint32_t ecx;
-  grub_uint32_t edx;
-  grub_uint32_t eip;
-};
-
-void *grub_relocator32_alloc (grub_size_t size);
-grub_err_t grub_relocator32_boot (void *relocator, grub_uint32_t dest,
-				  struct grub_relocator32_state state);
-void *grub_relocator32_realloc (void *relocator, grub_size_t size);
-void grub_relocator32_free (void *relocator);
-
-#endif /* ! GRUB_RELOCATOR_CPU_HEADER */
diff --git a/include/grub/mips/qemu-mips/machine.h b/include/grub/mips/qemu-mips/machine.h
deleted file mode 100644
index 386cad750..000000000
--- a/include/grub/mips/qemu-mips/machine.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2007  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/>.
- */
-
-#ifndef GRUB_MACHINE_MACHINE_HEADER
-#define GRUB_MACHINE_MACHINE_HEADER	1
-
-#define GRUB_MACHINE_MIPS_QEMU_R4K	1
-
-#endif /* ! GRUB_MACHINE_MACHINE_HEADER */
diff --git a/kern/mips/startup.S b/kern/mips/startup.S
index afab3642e..b27442102 100644
--- a/kern/mips/startup.S
+++ b/kern/mips/startup.S
@@ -71,8 +71,6 @@ reloccont:
 	li $t3, (GRUB_MOD_ALIGN-1)
 	nor $t3, $t3, $0
 	and $t1, $t1, $t3
-	/* Pass modules address as first argument.  */
-//	move $a0, $t1
 	
 	lw $t3, (GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE - BASE_ADDR)($t9)
 
diff --git a/lib/i386/relocator.c.moved b/lib/i386/relocator.c.moved
deleted file mode 100644
index ae7caf28b..000000000
--- a/lib/i386/relocator.c.moved
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  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/mm.h>
-#include <grub/misc.h>
-
-#include <grub/types.h>
-#include <grub/types.h>
-#include <grub/err.h>
-
-#include <grub/i386/relocator.h>
-
-extern grub_uint8_t grub_relocator32_forward_start;
-extern grub_uint8_t grub_relocator32_forward_end;
-extern grub_uint8_t grub_relocator32_backward_start;
-extern grub_uint8_t grub_relocator32_backward_end;
-
-extern grub_uint32_t grub_relocator32_backward_dest;
-extern grub_uint32_t grub_relocator32_backward_size;
-extern grub_addr_t grub_relocator32_backward_src;
-
-extern grub_uint32_t grub_relocator32_forward_dest;
-extern grub_uint32_t grub_relocator32_forward_size;
-extern grub_addr_t grub_relocator32_forward_src;
-
-extern grub_uint32_t grub_relocator32_forward_eax;
-extern grub_uint32_t grub_relocator32_forward_ebx;
-extern grub_uint32_t grub_relocator32_forward_ecx;
-extern grub_uint32_t grub_relocator32_forward_edx;
-extern grub_uint32_t grub_relocator32_forward_eip;
-extern grub_uint32_t grub_relocator32_forward_esp;
-
-extern grub_uint32_t grub_relocator32_backward_eax;
-extern grub_uint32_t grub_relocator32_backward_ebx;
-extern grub_uint32_t grub_relocator32_backward_ecx;
-extern grub_uint32_t grub_relocator32_backward_edx;
-extern grub_uint32_t grub_relocator32_backward_eip;
-extern grub_uint32_t grub_relocator32_backward_esp;
-
-#define RELOCATOR_SIZEOF(x)	(&grub_relocator32_##x##_end - &grub_relocator32_##x##_start)
-#define RELOCATOR_ALIGN 16
-#define PREFIX(x) grub_relocator32_ ## x
-
-static void
-write_call_relocator_bw (void *ptr, void *src, grub_uint32_t dest,
-			 grub_size_t size, struct grub_relocator32_state state)
-{
-  grub_relocator32_backward_dest = dest;
-  grub_relocator32_backward_src = PTR_TO_UINT64 (src);
-  grub_relocator32_backward_size = size;
-
-  grub_relocator32_backward_eax = state.eax;
-  grub_relocator32_backward_ebx = state.ebx;
-  grub_relocator32_backward_ecx = state.ecx;
-  grub_relocator32_backward_edx = state.edx;
-  grub_relocator32_backward_eip = state.eip;
-  grub_relocator32_backward_esp = state.esp;
-
-  grub_memmove (ptr,
-		&grub_relocator32_backward_start,
-		RELOCATOR_SIZEOF (backward));
-  ((void (*) (void)) ptr) ();
-}
-
-static void
-write_call_relocator_fw (void *ptr, void *src, grub_uint32_t dest,
-			 grub_size_t size, struct grub_relocator32_state state)
-{
-
-  grub_relocator32_forward_dest = dest;
-  grub_relocator32_forward_src = PTR_TO_UINT64 (src);
-  grub_relocator32_forward_size = size;
-  
-  grub_relocator32_forward_eax = state.eax;
-  grub_relocator32_forward_ebx = state.ebx;
-  grub_relocator32_forward_ecx = state.ecx;
-  grub_relocator32_forward_edx = state.edx;
-  grub_relocator32_forward_eip = state.eip;
-  grub_relocator32_forward_esp = state.esp;
-  
-  grub_memmove (ptr,
-		&grub_relocator32_forward_start,
-		RELOCATOR_SIZEOF (forward));
-  ((void (*) (void)) ptr) ();
-}
-
-#include "../relocator.c"
diff --git a/lib/i386/relocator_backward.S.moved b/lib/i386/relocator_backward.S.moved
deleted file mode 100644
index 06913470e..000000000
--- a/lib/i386/relocator_backward.S.moved
+++ /dev/null
@@ -1,2 +0,0 @@
-#define BACKWARD
-#include "relocator_asm.S"

From 3d87b0ea7ca77f7864ebcc79a7465c0d4f0fab39 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Dec 2009 11:48:10 +0100
Subject: [PATCH 0138/1628] Fix style

---
 video/sm712.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/video/sm712.c b/video/sm712.c
index 93156c9ae..52e43e9ae 100644
--- a/video/sm712.c
+++ b/video/sm712.c
@@ -92,8 +92,8 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
   depth = (mode_type & GRUB_VIDEO_MODE_TYPE_DEPTH_MASK)
           >> GRUB_VIDEO_MODE_TYPE_DEPTH_POS;
 
-  if ((1024 != width && width != 0) || (600 != height && height != 0)
-      || (16 != depth && depth != 0))
+  if ((width != 1024 && width != 0) || (height != 600 && height != 0)
+      || (depth != 16 && depth != 0))
     return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
 		       "Only 1024x600x16 is supported");
 

From ff684a8d7d4dcaf088ace651e3bb5a33226b0f0d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Dec 2009 13:31:10 +0100
Subject: [PATCH 0139/1628] Propagate gettext changes from trunk

---
 util/grub-mkrawimage.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 073ebd7ed..bbdbf9c8b 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -149,7 +149,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
   grub_util_load_image (kernel_path, kernel_img);
 
   if (GRUB_KERNEL_MACHINE_PREFIX + strlen (prefix) + 1 > GRUB_KERNEL_MACHINE_DATA_END)
-    grub_util_error (_("prefix too long"));
+    grub_util_error (_("prefix is too long"));
   strcpy (kernel_img + GRUB_KERNEL_MACHINE_PREFIX, prefix);
 
   /* Fill in the grub_module_info structure.  */
@@ -419,7 +419,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``grub-mkimage --help'' for more information.\n");
+    fprintf (stderr, _("Try ``%s --help'' for more information.\n"), program_name);
   else
     printf (_("\
 Usage: grub-mkimage [OPTION]... [MODULES]\n\

From b4c2d69bdea1b05aab5f692948ef91daaa21191d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Dec 2009 13:31:47 +0100
Subject: [PATCH 0140/1628] Changelog

---
 ChangeLog.mips | 140 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)
 create mode 100644 ChangeLog.mips

diff --git a/ChangeLog.mips b/ChangeLog.mips
new file mode 100644
index 000000000..cdfe05532
--- /dev/null
+++ b/ChangeLog.mips
@@ -0,0 +1,140 @@
+2009-12-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	MIPS support.
+
+	* bus/bonito.c: New file.
+	* bus/pci.c (grub_pci_iterate): Use GRUB_PCI_NUM_BUS and
+	GRUB_PCI_NUM_DEVICES.
+	* term/i386/pc/serial.c: Move to ...
+	* term/serial.c: ... here. All users updated.
+	* util/i386/pc/grub-mkimage.c: Move to ...
+	* util/grub-mkrawimage.c: ... here. All users updated.
+	* term/i386/pc/at_keyboard.c: Move to ...
+	* term/at_keyboard.c: ... here. All users updated.
+	* conf/mips-qemu-mips.rmk: New file.
+	* conf/mips-yeeloong.rmk: Likewise.
+	* conf/mips.rmk: Likewise.
+	* configure.ac: New platforms mipsel-yeeloong, mips-qemu-mips and
+	mipsel-qemu-mips.
+	* disk/ata.c (grub_ata_device_initialize): Add GRUB_MACHINE_PCI_IO_BASE
+	to port addresses.
+	(grub_ata_pciinit): Support CS5536.
+	* font/font.c (grub_font_load): Use grub_file_t instead of filename.
+	* font/font_cmd.c (loadfont_command): Open file before passing it to
+	grub_font_load.
+	(pseudo_file_read): New function.
+	(pseudo_file_close): Likewise.
+	(pseudo_fs): New structure.
+	(load_font_module): New function.
+	(GRUB_MOD_INIT(font_manager)): Load embedded font.
+	* fs/cpio.c (grub_cpio_open): Handle partial matches correctly.
+	* genmk.rb: Strip .rel.dyn, .reginfo, .note and .comment.
+	* genmoddep.awk: Ignore __gnu_local_gp. It's defined by linker.
+	* include/grub/i386/at_keyboard.h: Split into ...
+	* include/grub/at_keyboard.h: ... this ...
+	* include/grub/i386/at_keyboard.h: ... and this.
+	* include/grub/dl.h (grub_arch_dl_init_linker) [_mips && !GRUB_UTIL]:
+	New prototype.
+	* include/grub/elfload.h (grub_elf32_size): New parameter. All users
+	updated.
+	(grub_elf64_size): Likewise.
+	* include/grub/font.h (grub_font_load): Use grub_file_t instead of
+	filename.
+	* include/grub/i386/io.h (grub_port_t): New type. All users updated.
+	* include/grub/i386/coreboot/serial.h: Rewritten.
+	* include/grub/i386/ieee1275/serial.h: Include
+	grub/i386/coreboot/serial.h instead of grub/i386/pc/serial.h.
+	* include/grub/i386/pc/serial.h: Moved from here ...
+	* include/grub/serial.h: ... to here. All users updated.
+	* include/grub/i386/pci.h (GRUB_MACHINE_PCI_IO_BASE): New definition.
+	(GRUB_PCI_NUM_BUS): Likewise.
+	(GRUB_PCI_NUM_DEVICES): Likewise.
+	(grub_pci_device_map_range): Add missing volatile keyword.
+	* include/grub/kernel.h (OBJ_TYPE_FONT): New enum value.
+	* include/grub/mips/at_keyboard.h: New file.
+        * include/grub/mips/cache.h: Likewise.
+        * include/grub/mips/io.h: Likewise.
+        * include/grub/mips/kernel.h: Likewise.
+        * include/grub/mips/libgcc.h: Likewise.
+        * include/grub/mips/pci.h: Likewise.
+        * include/grub/mips/qemu-mips/boot.h: Likewise.
+        * include/grub/mips/qemu-mips/kernel.h: Likewise.
+        * include/grub/mips/qemu-mips/loader.h: Likewise.
+        * include/grub/mips/qemu-mips/memory.h: Likewise.
+        * include/grub/mips/qemu-mips/serial.h: Likewise.
+        * include/grub/mips/qemu-mips/time.h: Likewise.
+        * include/grub/mips/reboot.h: Likewise.
+        * include/grub/mips/relocator.h: Likewise.
+        * include/grub/mips/time.h: Likewise.
+        * include/grub/mips/types.h: Likewise.
+        * include/grub/mips/yeeloong/at_keyboard.h: Likewise.
+        * include/grub/mips/yeeloong/boot.h: Likewise.
+        * include/grub/mips/yeeloong/kernel.h: Likewise.
+        * include/grub/mips/yeeloong/loader.h: Likewise.
+        * include/grub/mips/yeeloong/memory.h: Likewise.
+        * include/grub/mips/yeeloong/pci.h: Likewise.
+        * include/grub/mips/yeeloong/serial.h: Likewise.
+        * include/grub/mips/yeeloong/time.h: Likewise.
+	* kern/dl.c (grub_dl_resolve_symbols): Handle STT_OBJECT correctly.
+	* kern/elf.c (grub_elf32_size): New parameter. All users
+	updated.
+	(grub_elf64_size): Likewise.
+	* kern/main.c (grub_main): Call grub_arch_dl_init_linker if necessary.
+	Load modules before saying "Welcome to GRUB!".
+	Call grub_refresh after saying "Welcome to GRUB!".
+        * kern/mips/cache.S: New file.
+        * kern/mips/cache_flush.S: Likewise.
+        * kern/mips/dl.c: Likewise.
+        * kern/mips/init.c: Likewise.
+        * kern/mips/qemu-mips/init.c: Likewise.
+        * kern/mips/startup.S: Likewise.
+        * kern/mips/yeeloong/init.c: Likewise.
+	* kern/term.c (grub_putcode): Handle NULL terminal.
+	(grub_getcharwidth): Likewise.
+	(grub_getkey): Likewise.
+	(grub_checkkey): Likewise.
+	(grub_getkeystatus): Likewise.
+	(grub_getxy): Likewise.
+	(grub_getwh): Likewise.
+	(grub_gotoxy): Likewise.
+	(grub_cls): Likewise.
+	(grub_setcolorstate): Likewise.
+	(grub_setcolor): Likewise.
+	(grub_getcolor): Likewise.
+	(grub_refresh): Likewise.
+	* lib/mips/relocator.c (JUMP_SIZEOF): Fix incorrect value.
+	(write_jump): Add hatch nop.
+	* lib/mips/relocator_asm.S: Use kern/mips/cache_flush.S.
+        * lib/mips/setjmp.S: New file.
+        * loader/mips/linux.c: Likewise.
+	* term/i386/pc/at_keyboard.c: Move from here ...
+	* term/at_keyboard.c: ... to here.
+	* term/i386/pc/serial.c: Moved from here ...
+	* term/serial.c: ... to here. All users updated.
+	(TEXT_HEIGHT): Set to 24 to fit linux terminal.
+	(serial_hw_io_addr): Use GRUB_MACHINE_SERIAL_PORTS.
+	(serial_translate_key_sequence): Avoid deadlock.
+	(grub_serial_getkey): Handle backspace.
+	(grub_serial_putchar): Fix newline handling.
+	* util/i386/pc/grub-mkimage.c: Move from here ...
+	* util/grub-mkrawimage.c: ... to here. All users updated.
+	(generate_image): New parameters 'font_path' and 'format'.
+	Support embedding font.
+	Use grub_host_to_target* instead of grub_cpu_to_le*.
+	(generate_image) [GRUB_MACHINE_MIPS]: Support ELF encapsulation.
+	(options) [GRUB_PLATFORM_IMAGE_DEFAULT]: New option "--format".
+	(options): New option "--font".
+	(usage): Likewise.
+	(main) [GRUB_PLATFORM_IMAGE_DEFAULT]: Handle "--format".
+	(main): Handle "--font".
+	* term/gfxterm.c (grub_virtual_screen): New member bg_color_display.
+	(grub_virtual_screen_setup): Set bg_color_display.
+	(redraw_screen_rect): Use bg_color_display instead of incorrect
+	bg_color.
+	(grub_gfxterm_cls): Likewise.
+	* util/elf/grub-mkimage.c (load_modules): New parameter 'config_path'.
+	Support embedding config file.
+	(add_segments): Likewise.
+	(options): New option "--config".
+	(main): Handle "--config".
+	* video/sm712.c: New file.

From 1c7926d8237bea29467f496369972ac4451d4e23 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Dec 2009 14:02:37 +0100
Subject: [PATCH 0141/1628] Remove leftover in mips.rmk

---
 conf/mips.rmk | 57 ---------------------------------------------------
 1 file changed, 57 deletions(-)

diff --git a/conf/mips.rmk b/conf/mips.rmk
index 8c99d9813..5c96a969f 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -27,63 +27,6 @@ kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genke
 
 # Programs
 pkglib_IMAGES = kernel.img
-
-# Utilities.
-sbin_UTILITIES = grub-mkdevicemap
-ifeq ($(enable_grub_emu), yes)
-sbin_UTILITIES += grub-emu
-endif
-
-# For grub-mkdevicemap.
-grub_mkdevicemap_SOURCES = util/grub-mkdevicemap.c util/deviceiter.c \
-	util/devicemap.c util/misc.c
-
-# For grub-emu
-util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
-grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c 	\
-	commands/configfile.c commands/help.c				\
-	commands/search.c commands/handler.c commands/test.c 		\
-	commands/ls.c commands/blocklist.c commands/hexdump.c		\
-	lib/hexdump.c commands/reboot.c 		\
-	lib/envblk.c commands/loadenv.c					\
-	commands/gptsync.c commands/probe.c commands/xnu_uuid.c		\
-	commands/password.c commands/keystatus.c			\
-	disk/loopback.c							\
-	\
-	fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c			\
-	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c		\
-	fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c			\
-	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c		\
-	fs/befs.c fs/befs_be.c fs/tar.c				\
-	\
-	io/gzio.c							\
-	kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c	\
-	kern/err.c kern/file.c kern/fs.c commands/boot.c kern/main.c	\
-	kern/misc.c kern/parser.c kern/partition.c kern/reader.c	\
-	kern/rescue_reader.c kern/rescue_parser.c			\
-	kern/term.c kern/list.c kern/handler.c fs/fshelp.c		\
-	kern/command.c kern/corecmd.c commands/extcmd.c			\
-	lib/arg.c normal/cmdline.c normal/datetime.c 			\
-	normal/completion.c normal/misc.c		 		\
-	normal/handler.c normal/auth.c normal/autofs.c normal/main.c	\
-	normal/menu.c 							\
-	normal/menu_text.c						\
-	normal/menu_entry.c normal/menu_viewer.c 	 		\
-	normal/color.c							\
-	script/sh/main.c script/sh/execute.c script/sh/function.c	\
-	script/sh/lexer.c script/sh/script.c				\
-	partmap/amiga.c	partmap/apple.c partmap/msdos.c partmap/sun.c	\
-	partmap/acorn.c							\
-	util/console.c util/hostfs.c util/grub-emu.c util/misc.c	\
-	util/hostdisk.c util/getroot.c					\
-	\
-	disk/raid.c disk/raid5_recover.c disk/raid6_recover.c		\
-	disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c		\
-	commands/parttool.c parttool/msdospart.c				\
-	grub_script.tab.c grub_emu_init.c
-
-grub_emu_LDFLAGS = $(LIBCURSES)
-
 kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
 	kern/main.c kern/device.c kern/$(target_cpu)/init.c \
 	kern/$(target_cpu)/$(target_machine)/init.c 		\

From 3478d0aa2e372fade831ab5f911eff22a68d98bf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Dec 2009 14:05:56 +0100
Subject: [PATCH 0142/1628] Fix warning

---
 loader/mips/linux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index 86f4201b0..4d9045a65 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -174,7 +174,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   grub_elf_t elf = 0;
   int i;
   int size;
-  void *extra;
+  void *extra = NULL;
   grub_uint32_t *linux_argv, *linux_envp;
   char *linux_args;
   grub_err_t err;

From d065a04ae4a9eddef91fc52be1e0deb7c9bd3902 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Dec 2009 14:28:11 +0100
Subject: [PATCH 0143/1628] Fix lexer.c name in mips.rmk

---
 conf/mips.rmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/mips.rmk b/conf/mips.rmk
index 5c96a969f..63c755c49 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -6,7 +6,7 @@ COMMON_CFLAGS += -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
 COMMON_LDFLAGS += -nostdlib
 
 # Used by various components.  These rules need to precede them.
-script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Images.
 

From f505738643d0c580026f63d28777eb5bef8ff4da Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Dec 2009 14:42:28 +0100
Subject: [PATCH 0144/1628] Fix warning

---
 gfxmenu/gui_string_util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gfxmenu/gui_string_util.c b/gfxmenu/gui_string_util.c
index 31b2f0aca..8ea7c497b 100644
--- a/gfxmenu/gui_string_util.c
+++ b/gfxmenu/gui_string_util.c
@@ -206,7 +206,7 @@ grub_get_dirname (const char *file_path)
 }
 
 static __inline int
-isxdigit (char c)
+my_isxdigit (char c)
 {
   return ((c >= '0' && c <= '9')
           || (c >= 'a' && c <= 'f')
@@ -261,7 +261,7 @@ grub_gui_parse_color (const char *s, grub_gui_color_t *color)
       /* Count the hexits to determine the format.  */
       int hexits = 0;
       const char *end = s;
-      while (isxdigit (*end))
+      while (my_isxdigit (*end))
         {
           end++;
           hexits++;

From f0299c60d477a90fa96c595b47ca06baec2b5ff8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Dec 2009 21:01:02 +0100
Subject: [PATCH 0145/1628] Fix handling of >32K relocations

---
 kern/mips/dl.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/kern/mips/dl.c b/kern/mips/dl.c
index f2a0af0d5..485955e7f 100644
--- a/kern/mips/dl.c
+++ b/kern/mips/dl.c
@@ -162,18 +162,23 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 		  case R_MIPS_HI16:
 		    {
 		      grub_uint32_t value;
+		      Elf_Rel *rel2;
 		      
 		      /* Handle partner lo16 relocation. Lower part is
 			 treated as signed. Hence add 0x8000 to compensate. 
 		       */
 		      value = (*(grub_uint16_t *) addr << 16)
 			+ sym->st_value + 0x8000;
-		      if (rel + 1 < max && ELF_R_SYM (rel[1].r_info) 
-			  == ELF_R_SYM (rel[0].r_info)
-			  && ELF_R_TYPE (rel[1].r_info) == R_MIPS_LO16)
-			value += *(grub_uint16_t *)
-			((char *) seg->addr + rel[1].r_offset);
-		      *(grub_uint16_t *) addr += (value >> 16) & 0xffff;
+		      for (rel2 = rel + 1; rel2 < max; rel2++)
+			if (ELF_R_SYM (rel2->r_info)
+			    == ELF_R_SYM (rel->r_info)
+			    && ELF_R_TYPE (rel2->r_info) == R_MIPS_LO16)
+			  {
+			    value += *(grub_int16_t *)
+			      ((char *) seg->addr + rel2->r_offset);
+			    break;
+			  }
+		      *(grub_uint16_t *) addr = (value >> 16) & 0xffff;
 		    }
 		    break;
 		  case R_MIPS_LO16:

From 17d1956f5c5bab387f544bdffa0c9041ae8d80c6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Dec 2009 21:03:41 +0100
Subject: [PATCH 0146/1628] Fix cursor drawing and whole screen scrolling

---
 term/gfxterm.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/term/gfxterm.c b/term/gfxterm.c
index be0487830..eb2c47c3d 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -754,19 +754,22 @@ real_scroll (void)
 
     }
 
-  /* Draw cursor if visible.  */
-  if (virtual_screen.cursor_state)
-    draw_cursor (1);
-
   was_scroll = virtual_screen.total_scroll;
   virtual_screen.total_scroll = 0;
 
+  if (was_scroll > virtual_screen.rows)
+    was_scroll = virtual_screen.rows;
+
   /* Draw shadow part.  */
   for (i = virtual_screen.rows - was_scroll;
        i < virtual_screen.rows; i++)
     for (j = 0; j < virtual_screen.columns; j++)
       paint_char (j, i);
 
+  /* Draw cursor if visible.  */
+  if (virtual_screen.cursor_state)
+    draw_cursor (1);
+
   if (repaint_callback)
     repaint_callback (window.x, window.y, window.width, window.height);
 }

From c4282e6cb3dfc4e2eaf6b7e8df89e0662e564b42 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Fri, 4 Dec 2009 00:05:48 +0000
Subject: [PATCH 0147/1628] Remove mips/reboot.h.

---
 ChangeLog.mips             |  1 -
 include/grub/mips/reboot.h | 24 ------------------------
 2 files changed, 25 deletions(-)
 delete mode 100644 include/grub/mips/reboot.h

diff --git a/ChangeLog.mips b/ChangeLog.mips
index cdfe05532..f5f048298 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -63,7 +63,6 @@
         * include/grub/mips/qemu-mips/memory.h: Likewise.
         * include/grub/mips/qemu-mips/serial.h: Likewise.
         * include/grub/mips/qemu-mips/time.h: Likewise.
-        * include/grub/mips/reboot.h: Likewise.
         * include/grub/mips/relocator.h: Likewise.
         * include/grub/mips/time.h: Likewise.
         * include/grub/mips/types.h: Likewise.
diff --git a/include/grub/mips/reboot.h b/include/grub/mips/reboot.h
deleted file mode 100644
index b28fca158..000000000
--- a/include/grub/mips/reboot.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008  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/>.
- */
-
-#ifndef GRUB_REBOOT_CPU_HEADER
-#define GRUB_REBOOT_CPU_HEADER	1
-
-extern void grub_reboot (void);
-
-#endif

From bef393d4b355926078aae8c952a972e01e2adc56 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 5 Dec 2009 18:46:28 +0100
Subject: [PATCH 0148/1628] fix qemu and coreboot ports

---
 conf/i386-coreboot.rmk | 4 +++-
 conf/i386-pc.rmk       | 2 +-
 conf/mips.rmk          | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index d0f953c8a..b6e810605 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -53,9 +53,11 @@ boot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_BOOT_MACHINE_LI
 boot_img_FORMAT = binary
 
 bin_UTILITIES += grub-mkimage
-grub_mkimage_SOURCES = util/i386/pc/grub-mkimage.c util/misc.c \
+grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
 	util/resolve.c gnulib/progname.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
+util/grub-mkrawimage.c_DEPENDENCIES = Makefile
+
 
 pkglib_IMAGES += kernel.img
 kernel_img_SOURCES = kern/i386/qemu/startup.S \
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index c1b1e596e..598e46043 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -87,7 +87,7 @@ sbin_UTILITIES = grub-setup
 grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
 	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-util/i386/pc/grub-mkimage.c_DEPENDENCIES = Makefile
+util/grub-mkrawimage.c_DEPENDENCIES = Makefile
 
 # For grub-setup.
 util/i386/pc/grub-setup.c_DEPENDENCIES = grub_setup_init.h
diff --git a/conf/mips.rmk b/conf/mips.rmk
index 63c755c49..a6fcaf88e 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -52,7 +52,7 @@ bin_UTILITIES += grub-mkimage
 grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
 	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(LINK_BASE)
-util/i386/pc/grub-mkimage.c_DEPENDENCIES = Makefile
+util/grub-mkrawimage.c_DEPENDENCIES = Makefile
 
 # Modules.
 pkglib_MODULES = memdisk.mod \

From a22078eb4fbdbb0e667b15c3d74a5b1ad192bcc9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 6 Dec 2009 15:32:32 +0100
Subject: [PATCH 0149/1628] Startup code cleanup

---
 kern/mips/startup.S    | 73 +++++++++++++++++++++++++-----------------
 util/grub-mkrawimage.c |  5 +--
 2 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/kern/mips/startup.S b/kern/mips/startup.S
index b27442102..7c59e761e 100644
--- a/kern/mips/startup.S
+++ b/kern/mips/startup.S
@@ -42,27 +42,55 @@ kernel_image_size:
 	.long	0
 codestart:
 	/* Decompress the payload. */
-	move $t9, $ra
-	addiu $t2, $t9, GRUB_KERNEL_CPU_RAW_SIZE - BASE_ADDR
-	lui $t1, %hi(compressed)
-	addiu $t1, %lo(compressed)
-	lw $t3, (GRUB_KERNEL_CPU_COMPRESSED_SIZE - BASE_ADDR)($t9)
+	move $s0, $ra
+	addiu $a0, $s0, GRUB_KERNEL_CPU_RAW_SIZE - BASE_ADDR
+	lui $a1, %hi(compressed)
+	addiu $a1, %lo(compressed)
+	lw $a2, (GRUB_KERNEL_CPU_COMPRESSED_SIZE - BASE_ADDR)($s0)
+	move $s1, $a1
 
-	/* $t2 contains source compressed address, $t1 is destination,
-	   $t3 is compressed size. FIXME: put LZMA here. Don't clober $t9
+	/* $a0 contains source compressed address, $a1 is destination,
+	   $a2 is compressed size. FIXME: put LZMA here. Don't clober $s0, $s1.
+	   On return $v0 contains uncompressed size.
 	*/
+	move $v0, $a2
 reloccont:
-	lb $t4, 0($t2)
-	sb $t4, 0($t1)
-	addiu $t1,$t1,1
-	addiu $t2,$t2,1
-	addiu $t3, 0xffff
-	bne $t3, $0, reloccont
+	lb $t4, 0($a0)
+	sb $t4, 0($a1)
+	addiu $a1,$a1,1
+	addiu $a0,$a0,1
+	addiu $a2, 0xffff
+	bne $a2, $0, reloccont
+
+	move $a0, $s1
+	move $a1, $v0
+
+#include "cache_flush.S"
+
+	lui $t1, %hi(cont)
+	addiu $t1, %lo(cont)
+
+	jr $t1
+	. = _start + GRUB_KERNEL_CPU_RAW_SIZE
+compressed:	
+	. = _start + GRUB_KERNEL_CPU_PREFIX
+
+VARIABLE(grub_prefix)
+
+	/* to be filled by grub-mkelfimage */
+
+	/*
+	 *  Leave some breathing room for the prefix.
+	 */
+
+	. = _start + GRUB_KERNEL_CPU_DATA_END
+
+cont:
 
 	/* Move the modules out of BSS.  */
 	lui $t1, %hi(_start)
 	addiu $t1, %lo(_start)
-	lw $t2, (GRUB_KERNEL_CPU_KERNEL_IMAGE_SIZE - BASE_ADDR)($t9)
+	lw $t2, (GRUB_KERNEL_CPU_KERNEL_IMAGE_SIZE - BASE_ADDR)($s0)
 	addu $t2, $t1, $t2
 	
 	lui $t1, %hi(_end)
@@ -72,7 +100,7 @@ reloccont:
 	nor $t3, $t3, $0
 	and $t1, $t1, $t3
 	
-	lw $t3, (GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE - BASE_ADDR)($t9)
+	lw $t3, (GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE - BASE_ADDR)($s0)
 
 	/* Backward copy.  */
 	add $t1, $t1, $t3
@@ -105,20 +133,5 @@ bsscont:
 	lui $t1, %hi(grub_main)
 	addiu $t1, %lo(grub_main)
 
-#if __mips >= 2
-	sync
-#endif
 	jr $t1
 
-	. = _start + GRUB_KERNEL_CPU_RAW_SIZE
-compressed:	
-	. = _start + GRUB_KERNEL_CPU_PREFIX
-
-VARIABLE(grub_prefix)
-	/* to be filled by grub-mkelfimage */
-
-	/*
-	 *  Leave some breathing room for the prefix.
-	 */
-
-	. = _start + GRUB_KERNEL_CPU_DATA_END
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index bbdbf9c8b..5399f4c42 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -363,10 +363,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
       
       target_addr = ALIGN_UP (GRUB_KERNEL_MACHINE_LINK_ADDR 
-			      + kernel_size + total_module_size
-			      + 0x100000
-			      //			      + BSS_SIZE
-			      , 32);
+			      + kernel_size + total_module_size, 32);
       ehdr->e_entry = grub_host_to_target32 (target_addr);
       phdr->p_vaddr = grub_host_to_target32 (target_addr);
       phdr->p_paddr = grub_host_to_target32 (target_addr);

From d5b44e501d227f7b687f895eaa66ae980cfc4902 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 7 Dec 2009 02:09:39 +0100
Subject: [PATCH 0150/1628] retrieve firmware arguments

---
 include/grub/mips/kernel.h |  2 +-
 kern/mips/startup.S        | 87 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 85 insertions(+), 4 deletions(-)

diff --git a/include/grub/mips/kernel.h b/include/grub/mips/kernel.h
index 29f7e4d4e..8b68f7b6b 100644
--- a/include/grub/mips/kernel.h
+++ b/include/grub/mips/kernel.h
@@ -25,7 +25,7 @@
 
 #define GRUB_KERNEL_MACHINE_LINK_ALIGN  32
 
-#define GRUB_KERNEL_CPU_RAW_SIZE        0x100
+#define GRUB_KERNEL_CPU_RAW_SIZE        0x200
 #define GRUB_KERNEL_CPU_COMPRESSED_SIZE        0x8
 #define GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE      0xc
 #define GRUB_KERNEL_CPU_KERNEL_IMAGE_SIZE      0x10
diff --git a/kern/mips/startup.S b/kern/mips/startup.S
index 7c59e761e..5e3fb7ad5 100644
--- a/kern/mips/startup.S
+++ b/kern/mips/startup.S
@@ -31,6 +31,7 @@ __start:
 _start:
 start:	
 	bal codestart
+base:	
 	. = _start + GRUB_KERNEL_CPU_COMPRESSED_SIZE
 compressed_size:
 	.long 0
@@ -41,8 +42,69 @@ total_module_size:
 kernel_image_size:	
 	.long	0
 codestart:
-	/* Decompress the payload. */
+	/* Save our base.  */
 	move $s0, $ra
+
+	/* Parse arguments. Has to be done before relocation.
+	So need to do it in asm.  */
+#ifdef GRUB_MACHINE_MIPS_YEELOONG
+	/* $a2 has the environment.  */
+	move $t0, $a2
+argcont:	
+	lw $t1, 0($t0)
+	beq $t1, $zero, argdone
+#define DO_PARSE(str, reg) \
+	addiu $t2, $s0, (str-base);\
+	bal parsestr;\
+	beq $v0, $zero, 1f;\
+	move reg, $v0;\
+	b 2f;\
+1:	
+	DO_PARSE (busclockstr, $s2)
+	DO_PARSE (cpuclockstr, $s3)
+	DO_PARSE (memsizestr, $s4)
+	DO_PARSE (highmemsizestr, $s5)
+2:	
+	addiu $t0, $t0, 4
+	b argcont
+parsestr:
+	move $v0, $zero
+	move $t3, $t1
+3:	
+	lb $t4, 0($t2)
+	lb $t5, 0($t3)
+	addiu $t2, $t2, 1
+	addiu $t3, $t3, 1
+	beq $t5, $zero, 1f
+	beq $t5, $t4, 3b
+	bne $t4, $zero, 1f
+
+	addiu $t3, $t3, 0xffff
+digcont:	
+	lb $t5, 0($t3)
+	/* Substract '0' from digit.  */
+	addiu $t5, $t5, 0xffd0
+	bltz $t5, 1f
+	addiu $t4, $t5, 0xfff7
+	bgtz $t4, 1f
+	/* Multiply $v0 by 10 with bitshifts. */
+	sll $v0, $v0, 1
+	sll $t4, $v0, 2
+	addu $v0, $v0, $t4
+	addu $v0, $v0, $t5
+	addiu $t3, $t3, 1
+	b digcont
+1:
+	jr $ra
+busclockstr:	.asciiz "busclock="
+cpuclockstr:	.asciiz "cpuclock="
+memsizestr:	.asciiz "memsize="
+highmemsizestr:	.asciiz "highmemsize="
+	.p2align 2
+argdone:
+#endif
+
+	/* Decompress the payload. */
 	addiu $a0, $s0, GRUB_KERNEL_CPU_RAW_SIZE - BASE_ADDR
 	lui $a1, %hi(compressed)
 	addiu $a1, %lo(compressed)
@@ -50,7 +112,8 @@ codestart:
 	move $s1, $a1
 
 	/* $a0 contains source compressed address, $a1 is destination,
-	   $a2 is compressed size. FIXME: put LZMA here. Don't clober $s0, $s1.
+	   $a2 is compressed size. FIXME: put LZMA here. Don't clober $s0,
+	   $s1, $s2, $s3, $s4 and $s5.
 	   On return $v0 contains uncompressed size.
 	*/
 	move $v0, $a2
@@ -84,9 +147,27 @@ VARIABLE(grub_prefix)
 	 */
 
 	. = _start + GRUB_KERNEL_CPU_DATA_END
-
+#ifdef GRUB_MACHINE_MIPS_YEELOONG
+VARIABLE (grub_arch_busclock)
+	.long 0
+VARIABLE (grub_arch_cpuclock)
+	.long 0
+VARIABLE (grub_arch_memsize)
+	.long 0
+VARIABLE (grub_arch_highmemsize)
+	.long 0
+#endif
 cont:
 
+#ifdef GRUB_MACHINE_MIPS_YEELOONG
+	lui $t1, %hi(grub_arch_busclock)
+	addiu $t1, %lo(grub_arch_busclock)
+	sw $s2, 0($t1)
+	sw $s3, 4($t1)
+	sw $s4, 8($t1)
+	sw $s5, 12($t1)
+#endif
+
 	/* Move the modules out of BSS.  */
 	lui $t1, %hi(_start)
 	addiu $t1, %lo(_start)

From 0f355bc6b321c2b8755de4facbd484145ddb4312 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 7 Dec 2009 16:16:10 +0100
Subject: [PATCH 0151/1628] add memory routines

---
 conf/mips-yeeloong.rmk              |  7 +++
 include/grub/mips/yeeloong/memory.h | 22 ++++++++--
 kern/mips/yeeloong/init.c           | 51 ++++++++++++++++------
 loader/mips/linux.c                 | 35 +++++++++++++--
 mmap/mips/yeeloong/uppermem.c       | 66 +++++++++++++++++++++++++++++
 mmap/mmap.c                         |  2 +-
 6 files changed, 164 insertions(+), 19 deletions(-)
 create mode 100644 mmap/mips/yeeloong/uppermem.c

diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 16909487d..a06b3fa5e 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -40,3 +40,10 @@ pkglib_MODULES += ata_pthru.mod
 ata_pthru_mod_SOURCES = disk/ata_pthru.c
 ata_pthru_mod_CFLAGS = $(COMMON_CFLAGS)
 ata_pthru_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For mmap.mod.
+pkglib_MODULES += mmap.mod
+mmap_mod_SOURCES = mmap/mmap.c mmap/mips/yeeloong/uppermem.c
+mmap_mod_CFLAGS = $(COMMON_CFLAGS)
+mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
+mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
diff --git a/include/grub/mips/yeeloong/memory.h b/include/grub/mips/yeeloong/memory.h
index bc8f47b12..c85db712a 100644
--- a/include/grub/mips/yeeloong/memory.h
+++ b/include/grub/mips/yeeloong/memory.h
@@ -26,15 +26,22 @@
 #endif
 
 #define GRUB_MACHINE_MEMORY_STACK_HIGH       0x801ffff0
-#define GRUB_MACHINE_MEMORY_USABLE           0x81000000
+#define GRUB_ARCH_LOWMEMVSTART 0x80000000
+#define GRUB_ARCH_LOWMEMPSTART 0x00000000
+#define GRUB_ARCH_LOWMEMMAXSIZE 0x10000000
+#define GRUB_ARCH_HIGHMEMPSTART 0x10000000
+
 
 #define GRUB_MACHINE_MEMORY_AVAILABLE        1
+#define GRUB_MACHINE_MEMORY_MAX_TYPE         1
+  /* This one is special: it's used internally but is never reported
+     by firmware. */
+#define GRUB_MACHINE_MEMORY_HOLE 	2
+#define GRUB_MACHINE_MEMORY_RESERVED GRUB_MACHINE_MEMORY_HOLE
 
 #ifndef ASM_FILE
 grub_err_t EXPORT_FUNC (grub_machine_mmap_iterate)
 (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
-grub_err_t EXPORT_FUNC(grub_machine_mmap_iterate)
-     (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
 
 static inline grub_err_t
 grub_machine_mmap_register (grub_uint64_t start __attribute__ ((unused)),
@@ -49,6 +56,15 @@ grub_machine_mmap_unregister (int handle  __attribute__ ((unused)))
 {
   return GRUB_ERR_NONE;
 }
+
+grub_uint64_t grub_mmap_get_lower (void);
+grub_uint64_t grub_mmap_get_upper (void);
+
+extern grub_uint32_t EXPORT_VAR (grub_arch_memsize);
+extern grub_uint32_t EXPORT_VAR (grub_arch_highmemsize);
+extern grub_uint32_t EXPORT_VAR (grub_arch_busclock);
+extern grub_uint32_t EXPORT_VAR (grub_arch_cpuclock);
+
 #endif
 
 #endif
diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 01acd4f1c..1bd9d2ed9 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -28,8 +28,6 @@
 #include <grub/machine/memory.h>
 #include <grub/cpu/kernel.h>
 
-#define RAMSIZE (64 << 20)
-
 grub_uint32_t
 grub_get_rtc (void)
 {
@@ -38,11 +36,48 @@ grub_get_rtc (void)
   return (calln++) >> 8;
 }
 
+grub_err_t
+grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
+							 grub_uint64_t,
+							 grub_uint32_t))
+{
+  hook (GRUB_ARCH_LOWMEMPSTART, grub_arch_memsize << 20,
+	GRUB_MACHINE_MEMORY_AVAILABLE);
+  hook (GRUB_ARCH_HIGHMEMPSTART, grub_arch_highmemsize << 20,
+	GRUB_MACHINE_MEMORY_AVAILABLE);
+  return GRUB_ERR_NONE;
+}
+
+
+static void *
+get_modules_end (void)
+{
+  struct grub_module_info *modinfo;
+  struct grub_module_header *header;
+  grub_addr_t modbase;
+
+  modbase = grub_arch_modules_addr ();
+  modinfo = (struct grub_module_info *) modbase;
+
+  /* Check if there are any modules.  */
+  if ((modinfo == 0) || modinfo->magic != GRUB_MODULE_MAGIC)
+    return modinfo;
+
+  for (header = (struct grub_module_header *) (modbase + modinfo->offset);
+       header < (struct grub_module_header *) (modbase + modinfo->size);
+       header = (struct grub_module_header *) ((char *) header + header->size));
+
+  return header;
+}
+
 void
 grub_machine_init (void)
 {
-  grub_mm_init_region ((void *) GRUB_MACHINE_MEMORY_USABLE,
-		       RAMSIZE - (GRUB_MACHINE_MEMORY_USABLE & 0x7fffffff));
+  void *modend;
+  modend = get_modules_end ();
+  grub_mm_init_region (modend, (grub_arch_memsize << 20)
+		       - (((grub_addr_t) modend) - GRUB_ARCH_LOWMEMVSTART));
+  /* FIXME: use upper memory as well.  */
   grub_install_get_time_ms (grub_rtc_get_time_ms);
 }
 
@@ -69,11 +104,3 @@ grub_reboot (void)
   while (1);
 }
 
-grub_err_t 
-grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, 
-							 grub_uint64_t, 
-							 grub_uint32_t))
-{
-  hook (0, RAMSIZE, GRUB_MACHINE_MEMORY_AVAILABLE);
-  return GRUB_ERR_NONE;
-}
diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index 4d9045a65..635f84a28 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -26,6 +26,10 @@
 #include <grub/machine/loader.h>
 #include <grub/command.h>
 #include <grub/mips/relocator.h>
+#include <grub/machine/memory.h>
+
+/* For frequencies.  */
+#include <grub/pci.h>
 
 #define ELF32_LOADMASK (0x00000000UL)
 #define ELF64_LOADMASK (0x0000000000000000ULL)
@@ -176,7 +180,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   int size;
   void *extra = NULL;
   grub_uint32_t *linux_argv, *linux_envp;
-  char *linux_args;
+  char *linux_args, *linux_envs;
   grub_err_t err;
 
   if (argc == 0)
@@ -218,7 +222,12 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   size += ALIGN_UP (sizeof ("rd_size=0xXXXXXXXXXXXXXXXX"), 4);
 
   /* For the environment.  */
-  size += sizeof (grub_uint32_t); 
+  size += sizeof (grub_uint32_t);
+  size += 4 * sizeof (grub_uint32_t);
+  size += ALIGN_UP (sizeof ("memsize=XXXXXXXXXXXXXXXXXXXX"), 4)
+    + ALIGN_UP (sizeof ("highmemsize=XXXXXXXXXXXXXXXXXXXX"), 4)
+    + ALIGN_UP (sizeof ("busclock=XXXXXXXXXX"), 4)
+    + ALIGN_UP (sizeof ("cpuclock=XXXXXXXXXX"), 4);
 
   if (grub_elf_is_elf32 (elf))
     err = grub_linux_load32 (elf, &extra, size);
@@ -276,7 +285,27 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
   linux_envp = extra;
   envp_off = (grub_uint8_t *) linux_envp - (grub_uint8_t *) playground;
-  linux_envp[0] = 0;
+  linux_envs = (char *) (linux_envp + 5);
+  grub_sprintf (linux_envs, "memsize=%lld", (unsigned long long) grub_mmap_get_lower () >> 20);
+  linux_envp[0] = (grub_uint8_t *) linux_envs - (grub_uint8_t *) playground
+    + target_addr;
+  linux_envs += ALIGN_UP (grub_strlen (linux_envs) + 1, 4);
+  grub_sprintf (linux_envs, "highmemsize=%lld", (unsigned long long) grub_mmap_get_upper () >> 20);
+  linux_envp[1] = (grub_uint8_t *) linux_envs - (grub_uint8_t *) playground
+    + target_addr;
+  linux_envs += ALIGN_UP (grub_strlen (linux_envs) + 1, 4);
+
+  grub_sprintf (linux_envs, "busclock=%d", grub_arch_busclock);
+  linux_envp[2] = (grub_uint8_t *) linux_envs - (grub_uint8_t *) playground
+    + target_addr;
+  linux_envs += ALIGN_UP (grub_strlen (linux_envs) + 1, 4);
+  grub_sprintf (linux_envs, "cpuclock=%d", grub_arch_cpuclock);
+  linux_envp[3] = (grub_uint8_t *) linux_envs - (grub_uint8_t *) playground
+    + target_addr;
+  linux_envs += ALIGN_UP (grub_strlen (linux_envs) + 1, 4);
+
+
+  linux_envp[4] = 0;
 
   grub_loader_set (grub_linux_boot, grub_linux_unload, 1);
   initrd_loaded = 0;
diff --git a/mmap/mips/yeeloong/uppermem.c b/mmap/mips/yeeloong/uppermem.c
new file mode 100644
index 000000000..3c5f814de
--- /dev/null
+++ b/mmap/mips/yeeloong/uppermem.c
@@ -0,0 +1,66 @@
+/* Compute amount of lower and upper memory till the first hole. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/memory.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/machine/memory.h>
+
+grub_uint64_t
+grub_mmap_get_lower (void)
+{
+  grub_uint64_t lower = 0;
+
+  auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
+  int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size,
+			     grub_uint32_t type)
+    {
+      if (type != GRUB_MACHINE_MEMORY_AVAILABLE)
+	return 0;
+      if (addr == 0)
+	lower = size;
+      return 0;
+    }
+
+  grub_mmap_iterate (hook);
+  if (lower > GRUB_ARCH_LOWMEMMAXSIZE)
+    lower = GRUB_ARCH_LOWMEMMAXSIZE;
+  return lower;
+}
+
+grub_uint64_t
+grub_mmap_get_upper (void)
+{
+  grub_uint64_t upper = 0;
+
+  auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
+  int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size,
+			     grub_uint32_t type)
+    {
+      if (type != GRUB_MACHINE_MEMORY_AVAILABLE)
+	return 0;
+      if (addr <= GRUB_ARCH_HIGHMEMPSTART && addr + size
+	  > GRUB_ARCH_HIGHMEMPSTART)
+	upper = addr + size - GRUB_ARCH_HIGHMEMPSTART;
+      return 0;
+    }
+
+  grub_mmap_iterate (hook);
+  return upper;
+}
diff --git a/mmap/mmap.c b/mmap/mmap.c
index 7598cf501..d379a99f9 100644
--- a/mmap/mmap.c
+++ b/mmap/mmap.c
@@ -52,7 +52,7 @@ grub_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
 #ifdef GRUB_MACHINE_MEMORY_AVAILABLE
       [GRUB_MACHINE_MEMORY_AVAILABLE] = 1,
 #endif
-#ifdef GRUB_MACHINE_MEMORY_RESERVED
+#if defined (GRUB_MACHINE_MEMORY_RESERVED) && GRUB_MACHINE_MEMORY_RESERVED != GRUB_MACHINE_MEMORY_HOLE
       [GRUB_MACHINE_MEMORY_RESERVED] = 3,
 #endif
 #ifdef GRUB_MACHINE_MEMORY_ACPI

From 52d67f54e0236f9e0def0c48f4753d47991450ae Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 7 Dec 2009 16:51:21 +0100
Subject: [PATCH 0152/1628] fix linux parameter passing on mips

---
 loader/mips/linux.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index 635f84a28..bb71d63e9 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -204,15 +204,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   /* For arguments.  */
   linux_argc = argc;
   /* Main arguments.  */
-  size = (linux_argc + 1) * sizeof (grub_uint32_t); 
+  size = (linux_argc) * sizeof (grub_uint32_t); 
   /* Initrd address and size.  */
   size += 2 * sizeof (grub_uint32_t); 
   /* NULL terminator.  */
   size += sizeof (grub_uint32_t); 
 
-  /* First arguments are always "a0" and "a1".  */
+  /* First argument is always "a0".  */
   size += ALIGN_UP (sizeof ("a0"), 4);
-  size += ALIGN_UP (sizeof ("a1"), 4);
   /* Normal arguments.  */
   for (i = 1; i < argc; i++)
     size += ALIGN_UP (grub_strlen (argv[i]) + 1, 4);
@@ -244,7 +243,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
   linux_argv = extra;
   argv_off = (grub_uint8_t *) linux_argv - (grub_uint8_t *) playground;
-  extra = linux_argv + (linux_argc + 1 + 1 + 2);
+  extra = linux_argv + (linux_argc + 1 + 2);
   linux_args = extra;
 
   grub_memcpy (linux_args, "a0", sizeof ("a0"));
@@ -253,12 +252,6 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   linux_argv++;
   linux_args += ALIGN_UP (sizeof ("a0"), 4);
 
-  grub_memcpy (linux_args, "a1", sizeof ("a1"));
-  *linux_argv = (grub_uint8_t *) linux_args - (grub_uint8_t *) playground
-    + target_addr;
-  linux_argv++;
-  linux_args += ALIGN_UP (sizeof ("a1"), 4);
-
   for (i = 1; i < argc; i++)
     {
       grub_memcpy (linux_args, argv[i], grub_strlen (argv[i]) + 1);

From d114e89ca8223fc37118cfc47768be87b64f1e99 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 9 Dec 2009 17:58:48 +0100
Subject: [PATCH 0153/1628] Add clock

---
 include/grub/mips/yeeloong/memory.h |  2 --
 include/grub/mips/yeeloong/time.h   |  7 +++++--
 include/grub/time.h                 |  2 +-
 kern/mips/yeeloong/init.c           | 14 +++++++++++---
 loader/mips/linux.c                 |  1 +
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/include/grub/mips/yeeloong/memory.h b/include/grub/mips/yeeloong/memory.h
index c85db712a..922db2404 100644
--- a/include/grub/mips/yeeloong/memory.h
+++ b/include/grub/mips/yeeloong/memory.h
@@ -62,8 +62,6 @@ grub_uint64_t grub_mmap_get_upper (void);
 
 extern grub_uint32_t EXPORT_VAR (grub_arch_memsize);
 extern grub_uint32_t EXPORT_VAR (grub_arch_highmemsize);
-extern grub_uint32_t EXPORT_VAR (grub_arch_busclock);
-extern grub_uint32_t EXPORT_VAR (grub_arch_cpuclock);
 
 #endif
 
diff --git a/include/grub/mips/yeeloong/time.h b/include/grub/mips/yeeloong/time.h
index a73f64dea..7f468bf12 100644
--- a/include/grub/mips/yeeloong/time.h
+++ b/include/grub/mips/yeeloong/time.h
@@ -21,10 +21,13 @@
 
 #include <grub/symbol.h>
 
-#define GRUB_TICKS_PER_SECOND	1000
+#define GRUB_TICKS_PER_SECOND	(grub_arch_cpuclock / 2)
 
 /* Return the real time in ticks.  */
-grub_uint32_t EXPORT_FUNC (grub_get_rtc) (void);
+grub_uint64_t EXPORT_FUNC (grub_get_rtc) (void);
+
+extern grub_uint32_t EXPORT_VAR (grub_arch_busclock);
+extern grub_uint32_t EXPORT_VAR (grub_arch_cpuclock);
 
 static inline void
 grub_cpu_idle(void)
diff --git a/include/grub/time.h b/include/grub/time.h
index 115fbd95e..5aafdc9ed 100644
--- a/include/grub/time.h
+++ b/include/grub/time.h
@@ -23,7 +23,7 @@
 #include <grub/symbol.h>
 #include <grub/cpu/time.h>
 
-#ifdef GRUB_MACHINE_EMU
+#if defined (GRUB_MACHINE_EMU) || defined (GRUB_UTIL)
 #define GRUB_TICKS_PER_SECOND 100000
 #else
 #include <grub/machine/time.h>
diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 1bd9d2ed9..8b93ac18f 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -28,12 +28,20 @@
 #include <grub/machine/memory.h>
 #include <grub/cpu/kernel.h>
 
-grub_uint32_t
+/* FIXME: use interrupt to count high.  */
+grub_uint64_t
 grub_get_rtc (void)
 {
-  static grub_uint64_t calln = 0;
+  static grub_uint32_t high = 0;
+  static grub_uint32_t last = 0;
+  grub_uint32_t low;
 
-  return (calln++) >> 8;
+  asm volatile ("mfc0 %0, $9": "=r" (low));
+  if (low < last)
+    high++;
+  last = low;
+
+  return (((grub_uint64_t) high) << 32) | low;
 }
 
 grub_err_t
diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index bb71d63e9..8d7cda0ed 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -30,6 +30,7 @@
 
 /* For frequencies.  */
 #include <grub/pci.h>
+#include <grub/machine/time.h>
 
 #define ELF32_LOADMASK (0x00000000UL)
 #define ELF64_LOADMASK (0x0000000000000000ULL)

From 546d06078308974936c686040dc24287fcabc681 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 9 Dec 2009 19:39:21 +0100
Subject: [PATCH 0154/1628] grub-install for yeeloong

---
 conf/mips-yeeloong.rmk |  4 ++++
 util/grub-install.in   | 30 +++++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index a06b3fa5e..d28194ebc 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -47,3 +47,7 @@ mmap_mod_SOURCES = mmap/mmap.c mmap/mips/yeeloong/uppermem.c
 mmap_mod_CFLAGS = $(COMMON_CFLAGS)
 mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
+
+sbin_SCRIPTS += grub-install
+grub_install_SOURCES = util/grub-install.in
+
diff --git a/util/grub-install.in b/util/grub-install.in
index 4df620812..494ac6bc3 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -29,10 +29,11 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 target_cpu=@target_cpu@
 platform=@platform@
+font=@datadir@/@PACKAGE_TARNAME@/ascii.pf2
 pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
 
 grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
-if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
+if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
     grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
 else
     grub_mkimage=${bindir}/`echo grub-mkelfimage | sed ${transform}`
@@ -79,6 +80,11 @@ if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
     cat <<EOF
   --disk-module=MODULE    disk module to use
 EOF
+fi
+if [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
+    cat <<EOF
+  --font=FILE             font file to use
+EOF
 fi
     cat <<EOF
 
@@ -103,6 +109,8 @@ for option in "$@"; do
 	exit 0 ;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
+    --font=*)
+	font=`echo "$option" | sed 's/--font=//'` ;;
     --root-directory=*)
 	rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
     --grub-setup=*)
@@ -144,7 +152,7 @@ done
 # for make_system_path_relative_to_its_root()
 . ${libdir}/grub/grub-mkconfig_lib
 
-if test "x$install_device" = x; then
+if test "x$install_device" = x && test "${target_cpu}-${platform}" != "mips-yeeloong"; then
     echo "install_device not specified." 1>&2
     usage
     exit 1
@@ -274,21 +282,27 @@ partmap_module=`$grub_probe --target=partmap --device ${grub_device} 2> /dev/nul
 # Device abstraction module, if any (lvm, raid).
 devabstraction_module=`$grub_probe --target=abstraction --device ${grub_device}`
 
+if [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
+    modules="sm712 gfxterm at_keyboard $modules"
+fi
+
 # The order in this list is critical.  Be careful when modifying it.
 modules="$modules $disk_module"
 modules="$modules $fs_module $partmap_module $devabstraction_module"
 
 prefix_drive=
 if [ "x${devabstraction_module}" = "x" ] ; then
-    if echo "${install_device}" | grep -qx "(.*)" ; then
-      install_drive="${install_device}"
-    else
-      install_drive="`$grub_probe --target=drive --device ${install_device}`"
+    if [ x"${install_device}" != x ]; then
+      if echo "${install_device}" | grep -qx "(.*)" ; then
+        install_drive="${install_device}"
+      else
+        install_drive="`$grub_probe --target=drive --device ${install_device}`"
+      fi
+      install_drive="`echo ${install_drive} | sed -e s/,[0-9]*[a-z]*//g`"
     fi
     grub_drive="`$grub_probe --target=drive --device ${grub_device}`"
 
     # Strip partition number
-    install_drive="`echo ${install_drive} | sed -e s/,[0-9]*[a-z]*//g`"
     grub_drive="`echo ${grub_drive} | sed -e s/,[0-9]*[a-z]*//g`"
     if [ "$disk_module" = ata ] ; then
         # generic method (used on coreboot and ata mod)
@@ -323,6 +337,8 @@ if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
     # Now perform the installation.
     $grub_setup ${setup_verbose} ${setup_force} --directory=${grubdir} --device-map=${device_map} \
         ${install_device} || exit 1
+elif [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
+    $grub_mkimage -f ${font} -d ${pkglibdir} -O elf --output=/boot/grub.elf --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 else
     $grub_mkimage -d ${pkglibdir} --output=/boot/multiboot.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 fi

From 02772f981b413ff6bbd13744570737ec2fc6bae6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 9 Dec 2009 20:34:14 +0100
Subject: [PATCH 0155/1628] correct return value of checkkey for null-terminal

---
 kern/term.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kern/term.c b/kern/term.c
index 0e3595df3..52a265a6d 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -145,7 +145,7 @@ int
 grub_checkkey (void)
 {
   if (!grub_cur_term_input)
-    return 0;
+    return -1;
   return (grub_cur_term_input->checkkey) ();
 }
 

From 8f44a91ea999abd9b5ce2821c82f4f9f2981bc71 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 9 Dec 2009 21:47:58 +0100
Subject: [PATCH 0156/1628] Fix bug in at_keyboard which blocked the menu
 countdown.

---
 term/at_keyboard.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/term/at_keyboard.c b/term/at_keyboard.c
index 5d8dc3d89..9171430f4 100644
--- a/term/at_keyboard.c
+++ b/term/at_keyboard.c
@@ -24,6 +24,7 @@
 #include <grub/term.h>
 
 static short at_keyboard_status = 0;
+static int pending_key = -1;
 
 #define KEYBOARD_STATUS_SHIFT_L		(1 << 0)
 #define KEYBOARD_STATUS_SHIFT_R		(1 << 1)
@@ -192,14 +193,27 @@ grub_at_keyboard_getkey_noblock (void)
 static int
 grub_at_keyboard_checkkey (void)
 {
-  /* FIXME: this will be triggered by BREAK events.  */
-  return KEYBOARD_ISREADY (grub_inb (KEYBOARD_REG_STATUS)) ? 1 : -1;
+  if (pending_key != -1)
+    return 1;
+
+  pending_key = grub_at_keyboard_getkey_noblock ();
+
+  if (pending_key != -1)
+    return 1;
+
+  return -1;
 }
 
 static int
 grub_at_keyboard_getkey (void)
 {
   int key;
+  if (pending_key != -1)
+    {
+      key = pending_key;
+      pending_key = -1;
+      return key;
+    }
   do
     {
       key = grub_at_keyboard_getkey_noblock ();
@@ -210,6 +224,8 @@ grub_at_keyboard_getkey (void)
 static grub_err_t
 grub_keyboard_controller_init (void)
 {
+  pending_key = -1;
+  at_keyboard_status = 0;
   grub_keyboard_controller_orig = grub_keyboard_controller_read ();
   grub_keyboard_controller_write (grub_keyboard_controller_orig | KEYBOARD_SCANCODE_SET1);
   return GRUB_ERR_NONE;

From febfc12c6ee6b04d5a02320b8741a098738f8057 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Thu, 10 Dec 2009 22:38:54 +0000
Subject: [PATCH 0157/1628] 2009-12-10  Robert Millan  <rmh.grub@aybabtu.com>

        * include/grub/mips/libgcc.h: Only export symbols for functions
        that libgcc provides.
---
 ChangeLog.mips             |  5 +++++
 include/grub/mips/libgcc.h | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.mips b/ChangeLog.mips
index f5f048298..d12b0d180 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,8 @@
+2009-12-10  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* include/grub/mips/libgcc.h: Only export symbols for functions
+	that libgcc provides.
+
 2009-12-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	MIPS support.
diff --git a/include/grub/mips/libgcc.h b/include/grub/mips/libgcc.h
index 3bea2f998..f06ea1c1c 100644
--- a/include/grub/mips/libgcc.h
+++ b/include/grub/mips/libgcc.h
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2004,2007  Free Software Foundation, Inc.
+ *  Copyright (C) 2004,2007,2009  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
@@ -16,9 +16,23 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
+
+#ifdef HAVE___ASHLDI3
 void EXPORT_FUNC (__ashldi3) (void);
+#endif
+#ifdef HAVE___ASHRDI3
 void EXPORT_FUNC (__ashrdi3) (void);
+#endif
+#ifdef HAVE___LSHRDI3
 void EXPORT_FUNC (__lshrdi3) (void);
+#endif
+#ifdef HAVE___UCMPDI2
 void EXPORT_FUNC (__ucmpdi2) (void);
+#endif
+#ifdef HAVE___BSWAPSI2
 void EXPORT_FUNC (__bswapsi2) (void);
+#endif
+#ifdef HAVE___BSWAPDI2
 void EXPORT_FUNC (__bswapdi2) (void);
+#endif

From acdf01cd1b5780152ce79f4dcce28dbe94fe2a8a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 11 Dec 2009 21:28:27 +0100
Subject: [PATCH 0158/1628] cmostest command

---
 commands/i386/cmostest.c | 59 ++++++++++++++++++++++++++++++++++++++++
 conf/i386-coreboot.rmk   |  6 ++++
 conf/i386-pc.rmk         |  6 ++++
 3 files changed, 71 insertions(+)
 create mode 100644 commands/i386/cmostest.c

diff --git a/commands/i386/cmostest.c b/commands/i386/cmostest.c
new file mode 100644
index 000000000..7171766cd
--- /dev/null
+++ b/commands/i386/cmostest.c
@@ -0,0 +1,59 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/command.h>
+#include <grub/misc.h>
+#include <grub/i386/cmos.h>
+
+static grub_err_t
+grub_cmd_cmostest (struct grub_command *cmd __attribute__ ((unused)),
+		   int argc, char *argv[])
+{
+  int byte, bit;
+  char *rest;
+
+  if (argc != 1)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "Address required.");
+
+  byte = grub_strtoul (argv[0], &rest, 0);
+  if (*rest != ':')
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "Address required.");
+
+  bit = grub_strtoul (rest + 1, 0, 0);
+
+  if (grub_cmos_read (byte) & (1 << bit))
+    return GRUB_ERR_NONE;
+
+  return grub_error (GRUB_ERR_TEST_FAILURE, "false");
+}
+
+static grub_command_t cmd;
+
+
+GRUB_MOD_INIT(cmostest)
+{
+  cmd = grub_register_command ("cmostest", grub_cmd_cmostest,
+			       "cmostest BYTE:BIT",
+			       "Test bit at BYTE:BIT in CMOS.");
+}
+
+GRUB_MOD_FINI(cmostest)
+{
+  grub_unregister_command (cmd);
+}
diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index e597328e7..b49af84ce 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -202,5 +202,11 @@ lsmmap_mod_SOURCES = commands/lsmmap.c
 lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
 lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For cmostest.mod
+pkglib_MODULES += cmostest.mod
+cmostest_mod_SOURCES = commands/i386/cmostest.c
+cmostest_mod_CFLAGS = $(COMMON_CFLAGS)
+cmostest_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 7e54b3b67..8d373e30b 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -335,6 +335,12 @@ hdparm_mod_SOURCES = commands/hdparm.c lib/hexdump.c
 hdparm_mod_CFLAGS = $(COMMON_CFLAGS)
 hdparm_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For cmostest.mod
+pkglib_MODULES += cmostest.mod
+cmostest_mod_SOURCES = commands/i386/cmostest.c
+cmostest_mod_CFLAGS = $(COMMON_CFLAGS)
+cmostest_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 ifeq ($(enable_efiemu), yes)
 
 efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)

From d4af2a73dc93ff2febf98924e22fc802e5d115db Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 11 Dec 2009 22:14:09 +0100
Subject: [PATCH 0159/1628] datetime for yeeloong

---
 conf/i386-coreboot.rmk                   |  2 +-
 conf/i386-ieee1275.rmk                   |  2 +-
 conf/i386-pc.rmk                         |  2 +-
 conf/mips-yeeloong.rmk                   | 19 +++++++
 include/grub/cmos.h                      | 72 ++++++++++++++++++++++++
 include/grub/i386/cmos.h                 | 48 +---------------
 include/grub/mips/cmos.h                 |  1 +
 include/grub/mips/yeeloong/cmos.h        | 28 +++++++++
 lib/{i386/datetime.c => cmos_datetime.c} |  6 +-
 9 files changed, 127 insertions(+), 53 deletions(-)
 create mode 100644 include/grub/cmos.h
 create mode 100644 include/grub/mips/cmos.h
 create mode 100644 include/grub/mips/yeeloong/cmos.h
 rename lib/{i386/datetime.c => cmos_datetime.c} (95%)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index b6e810605..794e9a993 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -185,7 +185,7 @@ lspci_mod_CFLAGS = $(COMMON_CFLAGS)
 lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For datetime.mod
-datetime_mod_SOURCES = lib/i386/datetime.c
+datetime_mod_SOURCES = lib/cmos_datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 4ee334325..5481cf1f7 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -122,7 +122,7 @@ lspci_mod_CFLAGS = $(COMMON_CFLAGS)
 lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For datetime.mod
-datetime_mod_SOURCES = lib/i386/datetime.c
+datetime_mod_SOURCES = lib/cmos_datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 598e46043..baba84939 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -306,7 +306,7 @@ pxecmd_mod_CFLAGS = $(COMMON_CFLAGS)
 pxecmd_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For datetime.mod
-datetime_mod_SOURCES = lib/i386/datetime.c
+datetime_mod_SOURCES = lib/cmos_datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index d28194ebc..4257bba74 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -48,6 +48,25 @@ mmap_mod_CFLAGS = $(COMMON_CFLAGS)
 mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
+# For datetime.mod
+pkglib_MODULES += datetime.mod
+datetime_mod_SOURCES = lib/cmos_datetime.c
+datetime_mod_CFLAGS = $(COMMON_CFLAGS)
+datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For date.mod
+pkglib_MODULES += date.mod
+date_mod_SOURCES = commands/date.c
+date_mod_CFLAGS = $(COMMON_CFLAGS)
+date_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For datehook.mod
+pkglib_MODULES += datehook.mod
+datehook_mod_SOURCES = hook/datehook.c
+datehook_mod_CFLAGS = $(COMMON_CFLAGS)
+datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
 sbin_SCRIPTS += grub-install
 grub_install_SOURCES = util/grub-install.in
 
diff --git a/include/grub/cmos.h b/include/grub/cmos.h
new file mode 100644
index 000000000..f508e3bf6
--- /dev/null
+++ b/include/grub/cmos.h
@@ -0,0 +1,72 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008, 2009  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/>.
+ */
+
+#ifndef	GRUB_CMOS_H
+#define	GRUB_CMOS_H	1
+
+#include <grub/types.h>
+#include <grub/cpu/io.h>
+#include <grub/cpu/cmos.h>
+
+#define GRUB_CMOS_INDEX_SECOND		0
+#define GRUB_CMOS_INDEX_SECOND_ALARM	1
+#define GRUB_CMOS_INDEX_MINUTE		2
+#define GRUB_CMOS_INDEX_MINUTE_ALARM	3
+#define GRUB_CMOS_INDEX_HOUR		4
+#define GRUB_CMOS_INDEX_HOUR_ALARM	5
+#define GRUB_CMOS_INDEX_DAY_OF_WEEK	6
+#define GRUB_CMOS_INDEX_DAY_OF_MONTH	7
+#define GRUB_CMOS_INDEX_MONTH		8
+#define GRUB_CMOS_INDEX_YEAR		9
+
+#define GRUB_CMOS_INDEX_STATUS_A	0xA
+#define GRUB_CMOS_INDEX_STATUS_B	0xB
+#define GRUB_CMOS_INDEX_STATUS_C	0xC
+#define GRUB_CMOS_INDEX_STATUS_D	0xD
+
+#define GRUB_CMOS_STATUS_B_DAYLIGHT	1
+#define GRUB_CMOS_STATUS_B_24HOUR	2
+#define GRUB_CMOS_STATUS_B_BINARY	4
+
+static inline grub_uint8_t
+grub_bcd_to_num (grub_uint8_t a)
+{
+  return ((a >> 4) * 10 + (a & 0xF));
+}
+
+static inline grub_uint8_t
+grub_num_to_bcd (grub_uint8_t a)
+{
+  return (((a / 10) << 4) + (a % 10));
+}
+
+static inline grub_uint8_t
+grub_cmos_read (grub_uint8_t index)
+{
+  grub_outb (index, GRUB_CMOS_ADDR_REG);
+  return grub_inb (GRUB_CMOS_DATA_REG);
+}
+
+static inline void
+grub_cmos_write (grub_uint8_t index, grub_uint8_t value)
+{
+  grub_outb (index, GRUB_CMOS_ADDR_REG);
+  grub_outb (value, GRUB_CMOS_DATA_REG);
+}
+
+#endif /* GRUB_CMOS_H */
diff --git a/include/grub/i386/cmos.h b/include/grub/i386/cmos.h
index 1c0530dba..8b1fa3586 100644
--- a/include/grub/i386/cmos.h
+++ b/include/grub/i386/cmos.h
@@ -20,55 +20,9 @@
 #define	GRUB_CPU_CMOS_H	1
 
 #include <grub/types.h>
-#include <grub/i386/io.h>
+#include <grub/cpu/io.h>
 
 #define GRUB_CMOS_ADDR_REG	0x70
 #define GRUB_CMOS_DATA_REG	0x71
 
-#define GRUB_CMOS_INDEX_SECOND		0
-#define GRUB_CMOS_INDEX_SECOND_ALARM	1
-#define GRUB_CMOS_INDEX_MINUTE		2
-#define GRUB_CMOS_INDEX_MINUTE_ALARM	3
-#define GRUB_CMOS_INDEX_HOUR		4
-#define GRUB_CMOS_INDEX_HOUR_ALARM	5
-#define GRUB_CMOS_INDEX_DAY_OF_WEEK	6
-#define GRUB_CMOS_INDEX_DAY_OF_MONTH	7
-#define GRUB_CMOS_INDEX_MONTH		8
-#define GRUB_CMOS_INDEX_YEAR		9
-
-#define GRUB_CMOS_INDEX_STATUS_A	0xA
-#define GRUB_CMOS_INDEX_STATUS_B	0xB
-#define GRUB_CMOS_INDEX_STATUS_C	0xC
-#define GRUB_CMOS_INDEX_STATUS_D	0xD
-
-#define GRUB_CMOS_STATUS_B_DAYLIGHT	1
-#define GRUB_CMOS_STATUS_B_24HOUR	2
-#define GRUB_CMOS_STATUS_B_BINARY	4
-
-static inline grub_uint8_t
-grub_bcd_to_num (grub_uint8_t a)
-{
-  return ((a >> 4) * 10 + (a & 0xF));
-}
-
-static inline grub_uint8_t
-grub_num_to_bcd (grub_uint8_t a)
-{
-  return (((a / 10) << 4) + (a % 10));
-}
-
-static inline grub_uint8_t
-grub_cmos_read (grub_uint8_t index)
-{
-  grub_outb (index, GRUB_CMOS_ADDR_REG);
-  return grub_inb (GRUB_CMOS_DATA_REG);
-}
-
-static inline void
-grub_cmos_write (grub_uint8_t index, grub_uint8_t value)
-{
-  grub_outb (index, GRUB_CMOS_ADDR_REG);
-  grub_outb (value, GRUB_CMOS_DATA_REG);
-}
-
 #endif /* GRUB_CPU_CMOS_H */
diff --git a/include/grub/mips/cmos.h b/include/grub/mips/cmos.h
new file mode 100644
index 000000000..79a7a4c1b
--- /dev/null
+++ b/include/grub/mips/cmos.h
@@ -0,0 +1 @@
+#include <grub/machine/cmos.h>
diff --git a/include/grub/mips/yeeloong/cmos.h b/include/grub/mips/yeeloong/cmos.h
new file mode 100644
index 000000000..f2a32d736
--- /dev/null
+++ b/include/grub/mips/yeeloong/cmos.h
@@ -0,0 +1,28 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/>.
+ */
+
+#ifndef	GRUB_CPU_CMOS_H
+#define	GRUB_CPU_CMOS_H	1
+
+#include <grub/types.h>
+#include <grub/cpu/io.h>
+
+#define GRUB_CMOS_ADDR_REG	0xbfd00070
+#define GRUB_CMOS_DATA_REG	0xbfd00071
+
+#endif /* GRUB_CPU_CMOS_H */
diff --git a/lib/i386/datetime.c b/lib/cmos_datetime.c
similarity index 95%
rename from lib/i386/datetime.c
rename to lib/cmos_datetime.c
index 63858ed03..8db60b48c 100644
--- a/lib/i386/datetime.c
+++ b/lib/cmos_datetime.c
@@ -1,7 +1,7 @@
-/* kern/i386/datetime.c - x86 CMOS datetime function.
+/* kern/cmos_datetime.c - CMOS datetime function.
  *
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008  Free Software Foundation, Inc.
+ *  Copyright (C) 2008,2009  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
@@ -18,7 +18,7 @@
  */
 
 #include <grub/datetime.h>
-#include <grub/i386/cmos.h>
+#include <grub/cmos.h>
 
 grub_err_t
 grub_get_datetime (struct grub_datetime *datetime)

From 5417641c666b64feb035c9b893a45e8987071390 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 12 Dec 2009 02:33:15 +0100
Subject: [PATCH 0160/1628] Fix loading of modules of size not divisible by 4

---
 util/grub-mkrawimage.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 5399f4c42..58b30f5be 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -134,7 +134,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
   if (config_path)
     {
-      config_size = grub_util_get_image_size (config_path) + 1;
+      config_size = ALIGN_UP(grub_util_get_image_size (config_path) + 1, 4);
       grub_util_info ("the size of config file is 0x%x", config_size);
       total_module_size += config_size + sizeof (struct grub_module_header);
     }
@@ -163,15 +163,17 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
   for (p = path_list; p; p = p->next)
     {
       struct grub_module_header *header;
-      size_t mod_size;
+      size_t mod_size, orig_size;
 
-      mod_size = grub_util_get_image_size (p->name);
+      orig_size = grub_util_get_image_size (p->name);
+      mod_size = ALIGN_UP(orig_size, 4);
 
       header = (struct grub_module_header *) (kernel_img + offset);
       memset (header, 0, sizeof (struct grub_module_header));
       header->type = OBJ_TYPE_ELF;
       header->size = grub_host_to_target32 (mod_size + sizeof (*header));
       offset += sizeof (*header);
+      memset (kernel_img + offset + orig_size, 0, mod_size - orig_size);
 
       grub_util_load_image (p->name, kernel_img + offset);
       offset += mod_size;

From b66948bd8852092def61b4e7c07e680dc10e2680 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 12 Dec 2009 02:33:41 +0100
Subject: [PATCH 0161/1628] setjmp on mips

---
 include/grub/mips/setjmp.h | 27 ++++++++++++++++
 lib/mips/setjmp.S          | 65 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)
 create mode 100644 include/grub/mips/setjmp.h

diff --git a/include/grub/mips/setjmp.h b/include/grub/mips/setjmp.h
new file mode 100644
index 000000000..5e5985586
--- /dev/null
+++ b/include/grub/mips/setjmp.h
@@ -0,0 +1,27 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2004,2006,2007,2009  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/>.
+ */
+
+#ifndef GRUB_SETJMP_CPU_HEADER
+#define GRUB_SETJMP_CPU_HEADER	1
+
+typedef unsigned long grub_jmp_buf[11];
+
+int grub_setjmp (grub_jmp_buf env) __attribute__ ((returns_twice));
+void grub_longjmp (grub_jmp_buf env, int val) __attribute__ ((noreturn));
+
+#endif /* ! GRUB_SETJMP_CPU_HEADER */
diff --git a/lib/mips/setjmp.S b/lib/mips/setjmp.S
index e69de29bb..8ab6222c4 100644
--- a/lib/mips/setjmp.S
+++ b/lib/mips/setjmp.S
@@ -0,0 +1,65 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2003,2007,2009  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/symbol.h>
+
+	.file	"setjmp.S"
+
+	.text
+
+/*
+ * int grub_setjmp (grub_jmp_buf env)
+ */
+FUNCTION(grub_setjmp)
+	sw $s0, 0($a0)
+	sw $s1, 4($a0)
+	sw $s2, 8($a0)
+	sw $s3, 12($a0)
+	sw $s4, 16($a0)
+	sw $s5, 20($a0)
+	sw $s6, 24($a0)
+	sw $s7, 28($a0)
+	sw $s8, 32($a0)
+	sw $gp, 36($a0)
+	sw $sp, 40($a0)
+	sw $ra, 44($a0)
+	move $v0, $zero
+	move $v1, $zero
+	jr $ra
+/*
+ * int grub_longjmp (grub_jmp_buf env, int val)
+ */
+FUNCTION(grub_longjmp)
+	lw $s0, 0($a0)
+	lw $s1, 4($a0)
+	lw $s2, 8($a0)
+	lw $s3, 12($a0)
+	lw $s4, 16($a0)
+	lw $s5, 20($a0)
+	lw $s6, 24($a0)
+	lw $s7, 28($a0)
+	lw $s8, 32($a0)
+	lw $gp, 36($a0)
+	lw $sp, 40($a0)
+	lw $ra, 44($a0)
+	move $v0, $a1
+	bne  $v0, $zero, 1f
+	addiu $v0, $v0, 1
+1:	
+	move $v1, $zero
+	jr $ra

From 7cba88bbde9f37089f4bce8eaefec1e77f0c9903 Mon Sep 17 00:00:00 2001
From: Felix Zielcke <fzielcke@z-51.de>
Date: Sun, 13 Dec 2009 21:03:47 +0100
Subject: [PATCH 0162/1628] Include <grub/cmos.h> instead of <grub/i386/cmos.h>
 in kern/i386/qemu/mmap.c to fix a compiler warning

---
 kern/i386/qemu/mmap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kern/i386/qemu/mmap.c b/kern/i386/qemu/mmap.c
index 4ccae023a..c7fc4f45e 100644
--- a/kern/i386/qemu/mmap.c
+++ b/kern/i386/qemu/mmap.c
@@ -22,7 +22,7 @@
 #include <grub/types.h>
 #include <grub/err.h>
 #include <grub/misc.h>
-#include <grub/i386/cmos.h>
+#include <grub/cmos.h>
 
 #define QEMU_CMOS_MEMSIZE_HIGH		0x35
 #define QEMU_CMOS_MEMSIZE_LOW		0x34

From ffb2403f5fadfd83cd8abaf716078f4f93cb24ed Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Tue, 15 Dec 2009 21:06:04 +0000
Subject: [PATCH 0163/1628] Undo DEFAULT_VIDEO_MODE kludge (correct solution is
 in gfxmenu branch)

---
 term/gfxterm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/term/gfxterm.c b/term/gfxterm.c
index 20dc11c20..972c7236d 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -27,7 +27,7 @@
 #include <grub/bitmap.h>
 #include <grub/command.h>
 
-#define DEFAULT_VIDEO_MODE "1024x600"
+#define DEFAULT_VIDEO_MODE	"1024x768,800x600,640x480"
 #define DEFAULT_BORDER_WIDTH	10
 
 #define DEFAULT_STANDARD_COLOR  0x07

From e6d8d32a946e7d8fefda8b3e55a8810b5b1039ae Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 16 Dec 2009 19:03:56 +0100
Subject: [PATCH 0164/1628] fix efi video drivers for video API change

---
 video/efi_gop.c | 2 +-
 video/efi_uga.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/video/efi_gop.c b/video/efi_gop.c
index e2eb2f7ae..3143135d6 100644
--- a/video/efi_gop.c
+++ b/video/efi_gop.c
@@ -185,7 +185,7 @@ grub_video_gop_fill_mode_info (struct grub_efi_gop_mode_info *in,
 
 static grub_err_t
 grub_video_gop_setup (unsigned int width, unsigned int height,
-		      unsigned int mode_type)
+		      unsigned int mode_type, unsigned int mode_mask __attribute__ ((unused)))
 {
   unsigned int depth;
   struct grub_efi_gop_mode_info *info = NULL;
diff --git a/video/efi_uga.c b/video/efi_uga.c
index 9bca64306..1fe0aa500 100644
--- a/video/efi_uga.c
+++ b/video/efi_uga.c
@@ -198,7 +198,7 @@ grub_video_uga_fini (void)
 
 static grub_err_t
 grub_video_uga_setup (unsigned int width, unsigned int height,
-		      unsigned int mode_type)
+		      unsigned int mode_type, unsigned int mode_mask __attribute__ ((unused)))
 {
   unsigned int depth;
   int found = 0;

From b044bf0351fe2dda87e6072133d41c339715452c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 16 Dec 2009 19:04:58 +0100
Subject: [PATCH 0165/1628] use video subsystem on EFI

---
 conf/i386-efi.rmk       |   2 +-
 conf/i386-pc.rmk        |   2 +-
 conf/x86_64-efi.rmk     |   2 +-
 include/grub/i386/xnu.h |   1 -
 loader/i386/efi/linux.c | 277 +++++++++++++++-------------------------
 loader/i386/efi/xnu.c   | 178 --------------------------
 loader/i386/pc/xnu.c    | 108 ----------------
 loader/i386/xnu.c       |  83 ++++++++++++
 8 files changed, 190 insertions(+), 463 deletions(-)
 delete mode 100644 loader/i386/efi/xnu.c
 delete mode 100644 loader/i386/pc/xnu.c

diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index 629b83999..a037ed383 100644
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -154,7 +154,7 @@ efi_gop_mod_CFLAGS = $(COMMON_CFLAGS)
 efi_gop_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += xnu.mod
-xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c\
+xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c \
 	 loader/macho.c loader/xnu.c
 xnu_mod_CFLAGS = $(COMMON_CFLAGS)
 xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 031c24adf..b71a7edc0 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -183,7 +183,7 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += xnu.mod
-xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/pc/xnu.c\
+xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c \
 	 loader/macho.c loader/xnu.c
 xnu_mod_CFLAGS = $(COMMON_CFLAGS)
 xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index ee511e1bd..6db52f480 100644
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -160,7 +160,7 @@ efi_gop_mod_CFLAGS = $(COMMON_CFLAGS)
 efi_gop_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += xnu.mod
-xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c\
+xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c \
 	 loader/macho.c loader/xnu.c
 xnu_mod_CFLAGS = $(COMMON_CFLAGS)
 xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/include/grub/i386/xnu.h b/include/grub/i386/xnu.h
index 306dc7b65..ea2767a79 100644
--- a/include/grub/i386/xnu.h
+++ b/include/grub/i386/xnu.h
@@ -76,6 +76,5 @@ extern grub_uint32_t grub_xnu_arg1;
 extern char grub_xnu_cmdline[1024];
 grub_err_t grub_xnu_boot (void);
 grub_err_t grub_cpu_xnu_fill_devicetree (void);
-grub_err_t grub_xnu_set_video (struct grub_xnu_boot_params *bootparams_relloc);
 extern grub_uint32_t grub_xnu_heap_will_be_at;
 #endif
diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c
index 8cd4d23f2..3b066d589 100644
--- a/loader/i386/efi/linux.c
+++ b/loader/i386/efi/linux.c
@@ -29,10 +29,11 @@
 #include <grub/cpu/linux.h>
 #include <grub/efi/api.h>
 #include <grub/efi/efi.h>
-#include <grub/efi/uga_draw.h>
-#include <grub/pci.h>
 #include <grub/command.h>
 #include <grub/memory.h>
+#include <grub/env.h>
+#include <grub/video.h>
+#include <grub/time.h>
 
 #define GRUB_LINUX_CL_OFFSET		0x1000
 #define GRUB_LINUX_CL_END_OFFSET	0x2000
@@ -285,6 +286,66 @@ grub_e820_add_region (struct grub_e820_mmap *e820_map, int *e820_num,
     }
 }
 
+static grub_err_t
+grub_linux_setup_video (struct linux_kernel_params *params)
+{
+  struct grub_video_mode_info mode_info;
+  void *framebuffer;
+  grub_err_t err;
+
+  err = grub_video_get_info_and_fini (&mode_info, &framebuffer);
+
+  if (err)
+    return err;
+
+  params->lfb_width = mode_info.width;
+  params->lfb_height = mode_info.height;
+  params->lfb_depth = mode_info.bpp;
+  params->lfb_line_len = mode_info.pitch;
+
+  params->lfb_base = (grub_size_t) framebuffer;
+  params->lfb_size = (params->lfb_line_len * params->lfb_height + 65535) >> 16;
+
+  params->red_mask_size = mode_info.red_mask_size;
+  params->red_field_pos = mode_info.red_field_pos;
+  params->green_mask_size = mode_info.green_mask_size;
+  params->green_field_pos = mode_info.green_field_pos;
+  params->blue_mask_size = mode_info.blue_mask_size;
+  params->blue_field_pos = mode_info.blue_field_pos;
+  params->reserved_mask_size = mode_info.reserved_mask_size;
+  params->reserved_field_pos = mode_info.reserved_field_pos;
+
+  params->have_vga = GRUB_VIDEO_TYPE_EFI;
+
+#ifdef GRUB_MACHINE_PCBIOS
+  /* VESA packed modes may come with zeroed mask sizes, which need
+     to be set here according to DAC Palette width.  If we don't,
+     this results in Linux displaying a black screen.  */
+  if (mode_info.bpp <= 8)
+    {
+      struct grub_vbe_info_block controller_info;
+      int status;
+      int width = 8;
+
+      status = grub_vbe_bios_get_controller_info (&controller_info);
+
+      if (status == GRUB_VBE_STATUS_OK &&
+	  (controller_info.capabilities & GRUB_VBE_CAPABILITY_DACWIDTH))
+	status = grub_vbe_bios_set_dac_palette_width (&width);
+
+      if (status != GRUB_VBE_STATUS_OK)
+	/* 6 is default after mode reset.  */
+	width = 6;
+
+      params->red_mask_size = params->green_mask_size
+	= params->blue_mask_size = width;
+      params->reserved_mask_size = 0;
+    }
+#endif
+
+  return 0;
+}
+
 #ifdef __x86_64__
 extern grub_uint8_t grub_linux_trampoline_start[];
 extern grub_uint8_t grub_linux_trampoline_end[];
@@ -299,9 +360,14 @@ grub_linux_boot (void)
   grub_efi_uintn_t desc_size;
   grub_efi_uint32_t desc_version;
   int e820_num;
+  const char *modevar;
+  char *tmp;
+  grub_err_t err;
 
   params = real_mode_mem;
 
+  grub_printf ("%d\n", __LINE__);
+
   grub_dprintf ("linux", "code32_start = %x, idt_desc = %lx, gdt_desc = %lx\n",
 		(unsigned) params->code32_start,
 		(unsigned long) &(idt_desc.limit),
@@ -310,6 +376,8 @@ grub_linux_boot (void)
 		(unsigned) idt_desc.limit, (unsigned long) idt_desc.base,
 		(unsigned) gdt_desc.limit, (unsigned long) gdt_desc.base);
 
+  grub_printf ("%d\n", __LINE__);
+
   auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
   int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
     {
@@ -348,10 +416,43 @@ grub_linux_boot (void)
       return 0;
     }
 
+  grub_printf ("%d\n", __LINE__);
+
   e820_num = 0;
   grub_mmap_iterate (hook);
   params->mmap_size = e820_num;
 
+  modevar = grub_env_get ("gfxpayload");
+
+  /* Now all graphical modes are acceptable.
+     May change in future if we have modes without framebuffer.  */
+  if (modevar && *modevar != 0)
+    {
+      tmp = grub_malloc (grub_strlen (modevar)
+			 + sizeof (";auto"));
+      if (! tmp)
+	return grub_errno;
+      grub_sprintf (tmp, "%s;auto", modevar);
+      err = grub_video_set_mode (tmp, GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
+      grub_free (tmp);
+    }
+  else
+    err = grub_video_set_mode ("auto", GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
+
+  grub_printf ("Trampoline at %p. code32=%x, real_mode_mem=%p\n",
+	       ((char *) prot_mode_mem + (prot_mode_pages << 12)),
+	       (unsigned) params->code32_start, real_mode_mem);
+
+  if (!err)
+    err = grub_linux_setup_video (params);
+
+  if (err)
+    {
+      grub_print_error ();
+      grub_printf ("Booting however\n");
+      grub_errno = GRUB_ERR_NONE;
+    }
+
   mmap_size = find_mmap_size ();
   if (grub_efi_get_memory_map (&mmap_size, mmap_buf, &map_key,
 			       &desc_size, &desc_version) <= 0)
@@ -424,174 +525,6 @@ grub_linux_unload (void)
   return GRUB_ERR_NONE;
 }
 
-static grub_efi_guid_t uga_draw_guid = GRUB_EFI_UGA_DRAW_GUID;
-
-
-#define RGB_MASK	0xffffff
-#define RGB_MAGIC	0x121314
-#define LINE_MIN	800
-#define LINE_MAX	4096
-#define FBTEST_STEP	(0x10000 >> 2)
-#define FBTEST_COUNT	8
-
-static int
-find_line_len (grub_uint32_t *fb_base, grub_uint32_t *line_len)
-{
-  grub_uint32_t *base = (grub_uint32_t *) (grub_target_addr_t) *fb_base;
-  int i;
-
-  for (i = 0; i < FBTEST_COUNT; i++, base += FBTEST_STEP)
-    {
-      if ((*base & RGB_MASK) == RGB_MAGIC)
-	{
-	  int j;
-
-	  for (j = LINE_MIN; j <= LINE_MAX; j++)
-	    {
-	      if ((base[j] & RGB_MASK) == RGB_MAGIC)
-		{
-		  *fb_base = (grub_uint32_t) (grub_target_addr_t) base;
-		  *line_len = j << 2;
-
-		  return 1;
-		}
-	    }
-
-	  break;
-	}
-    }
-
-  return 0;
-}
-
-static int
-find_framebuf (grub_uint32_t *fb_base, grub_uint32_t *line_len)
-{
-  int found = 0;
-
-  auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev,
-				       grub_pci_id_t pciid);
-
-  int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev,
-				  grub_pci_id_t pciid)
-    {
-      grub_pci_address_t addr;
-
-      addr = grub_pci_make_address (dev, 2);
-      if (grub_pci_read (addr) >> 24 == 0x3)
-	{
-	  int i;
-
-	  grub_printf ("Display controller: %d:%d.%d\nDevice id: %x\n",
-		       grub_pci_get_bus (dev), grub_pci_get_device (dev),
-		       grub_pci_get_function (dev), pciid);
-	  addr += 8;
-	  for (i = 0; i < 6; i++, addr += 4)
-	    {
-	      grub_uint32_t old_bar1, old_bar2, type;
-	      grub_uint64_t base64;
-
-	      old_bar1 = grub_pci_read (addr);
-	      if ((! old_bar1) || (old_bar1 & GRUB_PCI_ADDR_SPACE_IO))
-		continue;
-
-	      type = old_bar1 & GRUB_PCI_ADDR_MEM_TYPE_MASK;
-	      if (type == GRUB_PCI_ADDR_MEM_TYPE_64)
-		{
-		  if (i == 5)
-		    break;
-
-		  old_bar2 = grub_pci_read (addr + 4);
-		}
-	      else
-		old_bar2 = 0;
-
-	      base64 = old_bar2;
-	      base64 <<= 32;
-	      base64 |= (old_bar1 & GRUB_PCI_ADDR_MEM_MASK);
-
-	      grub_printf ("%s(%d): 0x%llx\n",
-			   ((old_bar1 & GRUB_PCI_ADDR_MEM_PREFETCH) ?
-			    "VMEM" : "MMIO"), i,
-			   (unsigned long long) base64);
-
-	      if ((old_bar1 & GRUB_PCI_ADDR_MEM_PREFETCH) && (! found))
-		{
-		  *fb_base = base64;
-		  if (find_line_len (fb_base, line_len))
-		    found++;
-		}
-
-	      if (type == GRUB_PCI_ADDR_MEM_TYPE_64)
-		{
-		  i++;
-		  addr += 4;
-		}
-	    }
-	}
-
-      return found;
-    }
-
-  grub_pci_iterate (find_card);
-  return found;
-}
-
-static int
-grub_linux_setup_video (struct linux_kernel_params *params)
-{
-  grub_efi_uga_draw_protocol_t *c;
-  grub_uint32_t width, height, depth, rate, pixel, fb_base, line_len;
-  int ret;
-
-  c = grub_efi_locate_protocol (&uga_draw_guid, 0);
-  if (! c)
-    return 1;
-
-  if (efi_call_5 (c->get_mode, c, &width, &height, &depth, &rate))
-    return 1;
-
-  grub_printf ("Video mode: %ux%u-%u@%u\n", width, height, depth, rate);
-
-  grub_efi_set_text_mode (0);
-  pixel = RGB_MAGIC;
-  efi_call_10 (c->blt, c, (struct grub_efi_uga_pixel *) &pixel,
-	       GRUB_EFI_UGA_VIDEO_FILL, 0, 0, 0, 0, 1, height, 0);
-  ret = find_framebuf (&fb_base, &line_len);
-  grub_efi_set_text_mode (1);
-
-  if (! ret)
-    {
-      grub_printf ("Can\'t find frame buffer address\n");
-      return 1;
-    }
-
-  grub_printf ("Frame buffer base: 0x%x\n", fb_base);
-  grub_printf ("Video line length: %d\n", line_len);
-
-  params->lfb_width = width;
-  params->lfb_height = height;
-  params->lfb_depth = depth;
-  params->lfb_line_len = line_len;
-
-  params->lfb_base = fb_base;
-  params->lfb_size = (line_len * params->lfb_height + 65535) >> 16;
-
-  params->red_mask_size = 8;
-  params->red_field_pos = 16;
-  params->green_mask_size = 8;
-  params->green_field_pos = 8;
-  params->blue_mask_size = 8;
-  params->blue_field_pos = 0;
-  params->reserved_mask_size = 8;
-  params->reserved_field_pos = 24;
-
-  params->have_vga = GRUB_VIDEO_TYPE_VLFB;
-  params->vid_mode = 0x338;  /* 1024x768x32  */
-
-  return 0;
-}
-
 static grub_err_t
 grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 		int argc, char *argv[])
@@ -790,8 +723,6 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   grub_printf ("   [Linux-bzImage, setup=0x%x, size=0x%x]\n",
 	       (unsigned) real_size, (unsigned) prot_size);
 
-  grub_linux_setup_video (params);
-
   /* Detect explicitly specified memory size, if any.  */
   linux_mem_size = 0;
   for (i = 1; i < argc; i++)
@@ -857,7 +788,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
   if (grub_errno == GRUB_ERR_NONE)
     {
-      grub_loader_set (grub_linux_boot, grub_linux_unload, 1);
+      grub_loader_set (grub_linux_boot, grub_linux_unload, 0);
       loaded = 1;
     }
 
diff --git a/loader/i386/efi/xnu.c b/loader/i386/efi/xnu.c
deleted file mode 100644
index 236732804..000000000
--- a/loader/i386/efi/xnu.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  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/env.h>
-#include <grub/xnu.h>
-#include <grub/cpu/xnu.h>
-#include <grub/efi/api.h>
-#include <grub/efi/efi.h>
-#include <grub/efi/uga_draw.h>
-#include <grub/pci.h>
-#include <grub/misc.h>
-
-/* Setup video for xnu. Big parts are copied from linux.c. */
-
-static grub_efi_guid_t uga_draw_guid = GRUB_EFI_UGA_DRAW_GUID;
-
-#define RGB_MASK	0xffffff
-#define RGB_MAGIC	0x121314
-#define LINE_MIN	800
-#define LINE_MAX	4096
-#define FBTEST_STEP	(0x10000 >> 2)
-#define FBTEST_COUNT	8
-
-static int
-find_line_len (grub_uint32_t *fb_base, grub_uint32_t *line_len)
-{
-  grub_uint32_t *base = (grub_uint32_t *) (grub_target_addr_t) *fb_base;
-  int i;
-
-  for (i = 0; i < FBTEST_COUNT; i++, base += FBTEST_STEP)
-    {
-      if ((*base & RGB_MASK) == RGB_MAGIC)
-	{
-	  int j;
-
-	  for (j = LINE_MIN; j <= LINE_MAX; j++)
-	    {
-	      if ((base[j] & RGB_MASK) == RGB_MAGIC)
-		{
-		  *fb_base = (grub_uint32_t) (grub_target_addr_t) base;
-		  *line_len = j << 2;
-
-		  return 1;
-		}
-	    }
-
-	  break;
-	}
-    }
-
-  return 0;
-}
-
-static int
-find_framebuf (grub_uint32_t *fb_base, grub_uint32_t *line_len)
-{
-  int found = 0;
-
-  auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev,
-				       grub_pci_id_t pciid);
-
-  int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev,
-				  grub_pci_id_t pciid)
-    {
-      grub_pci_address_t addr;
-
-      addr = grub_pci_make_address (dev, 2);
-      if (grub_pci_read (addr) >> 24 == 0x3)
-	{
-	  int i;
-
-	  grub_printf ("Display controller: %d:%d.%d\nDevice id: %x\n",
-		       grub_pci_get_bus (dev), grub_pci_get_device (dev),
-		       grub_pci_get_function (dev), pciid);
-	  addr += 8;
-	  for (i = 0; i < 6; i++, addr += 4)
-	    {
-	      grub_uint32_t old_bar1, old_bar2, type;
-	      grub_uint64_t base64;
-
-	      old_bar1 = grub_pci_read (addr);
-	      if ((! old_bar1) || (old_bar1 & GRUB_PCI_ADDR_SPACE_IO))
-		continue;
-
-	      type = old_bar1 & GRUB_PCI_ADDR_MEM_TYPE_MASK;
-	      if (type == GRUB_PCI_ADDR_MEM_TYPE_64)
-		{
-		  if (i == 5)
-		    break;
-
-		  old_bar2 = grub_pci_read (addr + 4);
-		}
-	      else
-		old_bar2 = 0;
-
-	      base64 = old_bar2;
-	      base64 <<= 32;
-	      base64 |= (old_bar1 & GRUB_PCI_ADDR_MEM_MASK);
-
-	      grub_printf ("%s(%d): 0x%llx\n",
-			   ((old_bar1 & GRUB_PCI_ADDR_MEM_PREFETCH) ?
-			    "VMEM" : "MMIO"), i,
-			   (unsigned long long) base64);
-
-	      if ((old_bar1 & GRUB_PCI_ADDR_MEM_PREFETCH) && (! found))
-		{
-		  *fb_base = base64;
-		  if (find_line_len (fb_base, line_len))
-		    found++;
-		}
-
-	      if (type == GRUB_PCI_ADDR_MEM_TYPE_64)
-		{
-		  i++;
-		  addr += 4;
-		}
-	    }
-	}
-
-      return found;
-    }
-
-  grub_pci_iterate (find_card);
-  return found;
-}
-
-grub_err_t
-grub_xnu_set_video (struct grub_xnu_boot_params *params)
-{
-  grub_efi_uga_draw_protocol_t *c;
-  grub_uint32_t width, height, depth, rate, pixel, fb_base, line_len;
-  int ret;
-
-  c = grub_efi_locate_protocol (&uga_draw_guid, 0);
-  if (! c)
-    return grub_error (GRUB_ERR_IO, "Couldn't find UGADraw");
-
-  if (efi_call_5 (c->get_mode, c, &width, &height, &depth, &rate))
-    return grub_error (GRUB_ERR_IO, "Couldn't retrieve video mode");
-
-  grub_printf ("Video mode: %ux%u-%u@%u\n", width, height, depth, rate);
-
-  grub_efi_set_text_mode (0);
-  pixel = RGB_MAGIC;
-  efi_call_10 (c->blt, c, (struct grub_efi_uga_pixel *) &pixel,
-	       GRUB_EFI_UGA_VIDEO_FILL, 0, 0, 0, 0, 1, height, 0);
-  ret = find_framebuf (&fb_base, &line_len);
-  grub_efi_set_text_mode (1);
-
-  if (! ret)
-    return grub_error (GRUB_ERR_IO, "Can\'t find frame buffer address\n");
-
-  grub_printf ("Frame buffer base: 0x%x\n", fb_base);
-  grub_printf ("Video line length: %d\n", line_len);
-
-  params->lfb_width = width;
-  params->lfb_height = height;
-  params->lfb_depth = depth;
-  params->lfb_line_len = line_len;
-  params->lfb_mode = GRUB_XNU_VIDEO_TEXT_IN_VIDEO;
-  params->lfb_base = fb_base;
-  return GRUB_ERR_NONE;
-}
diff --git a/loader/i386/pc/xnu.c b/loader/i386/pc/xnu.c
deleted file mode 100644
index 839d0ad44..000000000
--- a/loader/i386/pc/xnu.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  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/env.h>
-#include <grub/misc.h>
-#include <grub/xnu.h>
-#include <grub/mm.h>
-#include <grub/cpu/xnu.h>
-#include <grub/video_fb.h>
-
-#define min(a,b) (((a) < (b)) ? (a) : (b))
-#define max(a,b) (((a) > (b)) ? (a) : (b))
-
-#define DEFAULT_VIDEO_MODE "auto"
-
-/* Setup video for xnu. */
-grub_err_t
-grub_xnu_set_video (struct grub_xnu_boot_params *params)
-{
-  struct grub_video_mode_info mode_info;
-  int ret;
-  char *tmp, *modevar;
-  void *framebuffer;
-  grub_err_t err;
-
-  modevar = grub_env_get ("gfxpayload");
-  /* Consider only graphical 32-bit deep modes.  */
-  if (! modevar || *modevar == 0)
-    err = grub_video_set_mode (DEFAULT_VIDEO_MODE,
-			       GRUB_VIDEO_MODE_TYPE_PURE_TEXT
-			       | GRUB_VIDEO_MODE_TYPE_DEPTH_MASK,
-			       32 << GRUB_VIDEO_MODE_TYPE_DEPTH_POS);
-  else
-    {
-      tmp = grub_malloc (grub_strlen (modevar)
-			 + sizeof (DEFAULT_VIDEO_MODE) + 1);
-      if (! tmp)
-	return grub_error (GRUB_ERR_OUT_OF_MEMORY,
-			   "couldn't allocate temporary storag");
-      grub_sprintf (tmp, "%s;" DEFAULT_VIDEO_MODE, modevar);
-      err = grub_video_set_mode (tmp,
-				 GRUB_VIDEO_MODE_TYPE_PURE_TEXT
-				 | GRUB_VIDEO_MODE_TYPE_DEPTH_MASK,
-				 32 << GRUB_VIDEO_MODE_TYPE_DEPTH_POS);
-      grub_free (tmp);
-    }
-
-  if (err)
-    return err;
-
-  if (grub_xnu_bitmap)
-    {
-      int x, y;
-
-      x = mode_info.width - grub_xnu_bitmap->mode_info.width;
-      x /= 2;
-      y = mode_info.height - grub_xnu_bitmap->mode_info.height;
-      y /= 2;
-      err = grub_video_blit_bitmap (grub_xnu_bitmap,
-				    GRUB_VIDEO_BLIT_REPLACE,
-				    x > 0 ? x : 0,
-				    y > 0 ? y : 0,
-				    x < 0 ? -x : 0,
-				    y < 0 ? -y : 0,
-				    min (grub_xnu_bitmap->mode_info.width,
-					 mode_info.width),
-				    min (grub_xnu_bitmap->mode_info.height,
-					 mode_info.height));
-      if (err)
-	{
-	  grub_print_error ();
-	  grub_errno = GRUB_ERR_NONE;
-	  grub_xnu_bitmap = 0;
-	}
-      err = GRUB_ERR_NONE;
-    }
-
-  ret = grub_video_get_info_and_fini (&mode_info, &framebuffer);
-  if (ret)
-    return grub_error (GRUB_ERR_IO, "couldn't retrieve video parameters");
-
-  params->lfb_width = mode_info.width;
-  params->lfb_height = mode_info.height;
-  params->lfb_depth = mode_info.bpp;
-  params->lfb_line_len = mode_info.pitch;
-
-  params->lfb_base = PTR_TO_UINT32 (framebuffer);
-  params->lfb_mode = grub_xnu_bitmap
-    ? GRUB_XNU_VIDEO_SPLASH : GRUB_XNU_VIDEO_TEXT_IN_VIDEO;
-
-  return GRUB_ERR_NONE;
-}
-
diff --git a/loader/i386/xnu.c b/loader/i386/xnu.c
index 6a3535950..23fbbe7e0 100644
--- a/loader/i386/xnu.c
+++ b/loader/i386/xnu.c
@@ -29,6 +29,11 @@
 #include <grub/misc.h>
 #include <grub/term.h>
 
+#define min(a,b) (((a) < (b)) ? (a) : (b))
+#define max(a,b) (((a) > (b)) ? (a) : (b))
+
+#define DEFAULT_VIDEO_MODE "auto"
+
 char grub_xnu_cmdline[1024];
 grub_uint32_t grub_xnu_heap_will_be_at;
 grub_uint32_t grub_xnu_entry_point, grub_xnu_arg1, grub_xnu_stack;
@@ -417,6 +422,84 @@ grub_xnu_boot_resume (void)
 				state);  
 }
 
+/* Setup video for xnu. */
+static grub_err_t
+grub_xnu_set_video (struct grub_xnu_boot_params *params)
+{
+  struct grub_video_mode_info mode_info;
+  int ret;
+  char *tmp, *modevar;
+  void *framebuffer;
+  grub_err_t err;
+
+  modevar = grub_env_get ("gfxpayload");
+  /* Consider only graphical 32-bit deep modes.  */
+  if (! modevar || *modevar == 0)
+    err = grub_video_set_mode (DEFAULT_VIDEO_MODE,
+			       GRUB_VIDEO_MODE_TYPE_PURE_TEXT
+			       | GRUB_VIDEO_MODE_TYPE_DEPTH_MASK,
+			       32 << GRUB_VIDEO_MODE_TYPE_DEPTH_POS);
+  else
+    {
+      tmp = grub_malloc (grub_strlen (modevar)
+			 + sizeof (DEFAULT_VIDEO_MODE) + 1);
+      if (! tmp)
+	return grub_error (GRUB_ERR_OUT_OF_MEMORY,
+			   "couldn't allocate temporary storag");
+      grub_sprintf (tmp, "%s;" DEFAULT_VIDEO_MODE, modevar);
+      err = grub_video_set_mode (tmp,
+				 GRUB_VIDEO_MODE_TYPE_PURE_TEXT
+				 | GRUB_VIDEO_MODE_TYPE_DEPTH_MASK,
+				 32 << GRUB_VIDEO_MODE_TYPE_DEPTH_POS);
+      grub_free (tmp);
+    }
+
+  if (err)
+    return err;
+
+  if (grub_xnu_bitmap)
+    {
+      int x, y;
+
+      x = mode_info.width - grub_xnu_bitmap->mode_info.width;
+      x /= 2;
+      y = mode_info.height - grub_xnu_bitmap->mode_info.height;
+      y /= 2;
+      err = grub_video_blit_bitmap (grub_xnu_bitmap,
+				    GRUB_VIDEO_BLIT_REPLACE,
+				    x > 0 ? x : 0,
+				    y > 0 ? y : 0,
+				    x < 0 ? -x : 0,
+				    y < 0 ? -y : 0,
+				    min (grub_xnu_bitmap->mode_info.width,
+					 mode_info.width),
+				    min (grub_xnu_bitmap->mode_info.height,
+					 mode_info.height));
+      if (err)
+	{
+	  grub_print_error ();
+	  grub_errno = GRUB_ERR_NONE;
+	  grub_xnu_bitmap = 0;
+	}
+      err = GRUB_ERR_NONE;
+    }
+
+  ret = grub_video_get_info_and_fini (&mode_info, &framebuffer);
+  if (ret)
+    return grub_error (GRUB_ERR_IO, "couldn't retrieve video parameters");
+
+  params->lfb_width = mode_info.width;
+  params->lfb_height = mode_info.height;
+  params->lfb_depth = mode_info.bpp;
+  params->lfb_line_len = mode_info.pitch;
+
+  params->lfb_base = PTR_TO_UINT32 (framebuffer);
+  params->lfb_mode = grub_xnu_bitmap
+    ? GRUB_XNU_VIDEO_SPLASH : GRUB_XNU_VIDEO_TEXT_IN_VIDEO;
+
+  return GRUB_ERR_NONE;
+}
+
 /* Boot xnu. */
 grub_err_t
 grub_xnu_boot (void)

From 289634b1fa937dd5011d2513d05b9b065090b3c6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 18 Dec 2009 11:15:46 +0100
Subject: [PATCH 0166/1628] Report trampoline information before going to video
 mode

---
 loader/i386/efi/linux.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c
index 3b066d589..5870edb4b 100644
--- a/loader/i386/efi/linux.c
+++ b/loader/i386/efi/linux.c
@@ -422,6 +422,10 @@ grub_linux_boot (void)
   grub_mmap_iterate (hook);
   params->mmap_size = e820_num;
 
+  grub_printf ("Trampoline at %p. code32=%x, real_mode_mem=%p\n",
+	       ((char *) prot_mode_mem + (prot_mode_pages << 12)),
+	       (unsigned) params->code32_start, real_mode_mem);
+
   modevar = grub_env_get ("gfxpayload");
 
   /* Now all graphical modes are acceptable.
@@ -439,10 +443,6 @@ grub_linux_boot (void)
   else
     err = grub_video_set_mode ("auto", GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
 
-  grub_printf ("Trampoline at %p. code32=%x, real_mode_mem=%p\n",
-	       ((char *) prot_mode_mem + (prot_mode_pages << 12)),
-	       (unsigned) params->code32_start, real_mode_mem);
-
   if (!err)
     err = grub_linux_setup_video (params);
 

From 51bd7ea32acf7349d72ce61cfa9f93f7486f9723 Mon Sep 17 00:00:00 2001
From: Felix Zielcke <fzielcke@z-51.de>
Date: Fri, 18 Dec 2009 20:57:22 +0100
Subject: [PATCH 0167/1628] Set correct chunksize with metadata 1.x

---
 disk/mdraid_linux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/disk/mdraid_linux.c b/disk/mdraid_linux.c
index 8670710b3..79363d143 100644
--- a/disk/mdraid_linux.c
+++ b/disk/mdraid_linux.c
@@ -372,7 +372,7 @@ superblock_0_90:
   array->layout = grub_le_to_cpu32 (sb_1x->layout);
   array->total_devs = grub_le_to_cpu32 (sb_1x->raid_disks);
   array->disk_size = grub_le_to_cpu64 (sb_1x->size) * 2;
-  array->chunk_size = grub_le_to_cpu32 (sb_1x->chunksize) >> 9;
+  array->chunk_size = grub_le_to_cpu32 (sb_1x->chunksize);
   array->index = grub_le_to_cpu32 (sb_1x->dev_number);
   array->uuid_len = 16;
   array->uuid = grub_malloc (16);

From 0d48a435a0370bd30920bb507c301b67e218145e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 19 Dec 2009 21:30:00 +0100
Subject: [PATCH 0168/1628] 2009-12-19  Vladimir Serbinenko 
 <phcoder@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* include/grub/types.h (UNUSED): Removed since it conflicts with
	NetBSD headers. All users changed to direct __attribute__ ((unused)).
	Reported by Grégoire Sutre.
---
 ChangeLog                    |  6 ++++++
 commands/read.c              |  2 +-
 fs/i386/pc/pxe.c             |  6 ++++--
 include/grub/types.h         |  2 --
 kern/elf.c                   |  8 ++++++--
 loader/i386/pc/multiboot2.c  |  9 ++++++---
 loader/ieee1275/multiboot2.c |  6 ++++--
 loader/machoXX.c             | 19 ++++++++++---------
 loader/multiboot2.c          |  3 ++-
 util/getroot.c               |  2 +-
 util/ieee1275/devicemap.c    |  6 ++++--
 util/ieee1275/ofpath.c       | 17 ++++++++++-------
 12 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cc616c078..d386f7b71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/types.h (UNUSED): Removed since it conflicts with
+	NetBSD headers. All users changed to direct __attribute__ ((unused)).
+	Reported by Grégoire Sutre.
+
 2009-12-19  Carles Pina i Estany  <carles@pina.cat>
 
 	* normal/menu_text.c (STANDARD_MARGIN): New macro.
diff --git a/commands/read.c b/commands/read.c
index 82b30b461..aa6af37b5 100644
--- a/commands/read.c
+++ b/commands/read.c
@@ -62,7 +62,7 @@ grub_getline (void)
 }
 
 static grub_err_t
-grub_cmd_read (grub_command_t cmd UNUSED, int argc, char **args)
+grub_cmd_read (grub_command_t cmd __attribute__ ((unused)), int argc, char **args)
 {
   char *line = grub_getline ();
   if (! line)
diff --git a/fs/i386/pc/pxe.c b/fs/i386/pc/pxe.c
index 6c41d4298..dec3b91bf 100644
--- a/fs/i386/pc/pxe.c
+++ b/fs/i386/pc/pxe.c
@@ -107,9 +107,11 @@ static struct grub_disk_dev grub_pxe_dev =
   };
 
 static grub_err_t
-grub_pxefs_dir (grub_device_t device UNUSED, const char *path UNUSED,
+grub_pxefs_dir (grub_device_t device __attribute__ ((unused)),
+		const char *path  __attribute__ ((unused)),
 		int (*hook) (const char *filename,
-			     const struct grub_dirhook_info *info) UNUSED)
+			     const struct grub_dirhook_info *info) 
+		__attribute__ ((unused)))
 {
   return GRUB_ERR_NONE;
 }
diff --git a/include/grub/types.h b/include/grub/types.h
index 8e2ad15ef..5f6b7ec62 100644
--- a/include/grub/types.h
+++ b/include/grub/types.h
@@ -22,8 +22,6 @@
 #include <config.h>
 #include <grub/cpu/types.h>
 
-#define UNUSED __attribute__ ((unused))
-
 #ifdef GRUB_UTIL
 # define GRUB_CPU_SIZEOF_VOID_P	SIZEOF_VOID_P
 # define GRUB_CPU_SIZEOF_LONG	SIZEOF_LONG
diff --git a/kern/elf.c b/kern/elf.c
index f14161060..951049e73 100644
--- a/kern/elf.c
+++ b/kern/elf.c
@@ -181,7 +181,9 @@ grub_elf32_size (grub_elf_t elf)
   /* Run through the program headers to calculate the total memory size we
    * should claim.  */
   auto int NESTED_FUNC_ATTR calcsize (grub_elf_t _elf, Elf32_Phdr *phdr, void *_arg);
-  int NESTED_FUNC_ATTR calcsize (grub_elf_t UNUSED _elf, Elf32_Phdr *phdr, void UNUSED *_arg)
+  int NESTED_FUNC_ATTR calcsize (grub_elf_t _elf  __attribute__ ((unused)),
+				 Elf32_Phdr *phdr,
+				 void *_arg __attribute__ ((unused)))
     {
       /* Only consider loadable segments.  */
       if (phdr->p_type != PT_LOAD)
@@ -360,7 +362,9 @@ grub_elf64_size (grub_elf_t elf)
   /* Run through the program headers to calculate the total memory size we
    * should claim.  */
   auto int NESTED_FUNC_ATTR calcsize (grub_elf_t _elf, Elf64_Phdr *phdr, void *_arg);
-  int NESTED_FUNC_ATTR calcsize (grub_elf_t UNUSED _elf, Elf64_Phdr *phdr, void UNUSED *_arg)
+  int NESTED_FUNC_ATTR calcsize (grub_elf_t _elf __attribute__ ((unused)),
+				 Elf64_Phdr *phdr,
+				 void *_arg __attribute__ ((unused)))
     {
       /* Only consider loadable segments.  */
       if (phdr->p_type != PT_LOAD)
diff --git a/loader/i386/pc/multiboot2.c b/loader/i386/pc/multiboot2.c
index e2d649613..6ef8c70ca 100644
--- a/loader/i386/pc/multiboot2.c
+++ b/loader/i386/pc/multiboot2.c
@@ -27,7 +27,8 @@
 #include <grub/cpu/multiboot.h>
 
 grub_err_t
-grub_mb2_arch_elf32_hook (Elf32_Phdr *phdr, UNUSED grub_addr_t *addr,
+grub_mb2_arch_elf32_hook (Elf32_Phdr *phdr,
+			  grub_addr_t *addr __attribute__ ((unused)),
 			  int *do_load)
 {
   Elf32_Addr paddr = phdr->p_paddr;
@@ -48,7 +49,8 @@ grub_mb2_arch_elf32_hook (Elf32_Phdr *phdr, UNUSED grub_addr_t *addr,
 }
 
 grub_err_t
-grub_mb2_arch_elf64_hook (Elf64_Phdr *phdr, UNUSED grub_addr_t *addr,
+grub_mb2_arch_elf64_hook (Elf64_Phdr *phdr,
+			  grub_addr_t *addr __attribute__ ((unused)),
 			  int *do_load)
 {
   Elf64_Addr paddr = phdr->p_paddr;
@@ -82,7 +84,8 @@ grub_mb2_arch_module_alloc (grub_size_t size, grub_addr_t *addr)
 }
 
 grub_err_t
-grub_mb2_arch_module_free (grub_addr_t addr, UNUSED grub_size_t size)
+grub_mb2_arch_module_free (grub_addr_t addr,
+			   grub_size_t size __attribute__ ((unused)))
 {
   grub_free((void *) addr);
   return GRUB_ERR_NONE;
diff --git a/loader/ieee1275/multiboot2.c b/loader/ieee1275/multiboot2.c
index 3646e8091..3b0ab758e 100644
--- a/loader/ieee1275/multiboot2.c
+++ b/loader/ieee1275/multiboot2.c
@@ -36,7 +36,8 @@ typedef void (*kernel_entry_t) (unsigned long, void *, int (void *),
 
 /* Claim the memory occupied by the multiboot kernel.  */
 grub_err_t
-grub_mb2_arch_elf32_hook (Elf32_Phdr *phdr, UNUSED grub_addr_t *addr,
+grub_mb2_arch_elf32_hook (Elf32_Phdr *phdr,
+			  grub_addr_t *addr __attribute__((unused)),
 			  int *do_load)
 {
   int rc;
@@ -61,7 +62,8 @@ grub_mb2_arch_elf32_hook (Elf32_Phdr *phdr, UNUSED grub_addr_t *addr,
 
 /* Claim the memory occupied by the multiboot kernel.  */
 grub_err_t
-grub_mb2_arch_elf64_hook (Elf64_Phdr *phdr, UNUSED grub_addr_t *addr,
+grub_mb2_arch_elf64_hook (Elf64_Phdr *phdr,
+			  grub_addr_t *addr __attribute__((unused)),
 			  int *do_load)
 {
   int rc;
diff --git a/loader/machoXX.c b/loader/machoXX.c
index d42dd8b55..8441e0128 100644
--- a/loader/machoXX.c
+++ b/loader/machoXX.c
@@ -123,8 +123,9 @@ SUFFIX (grub_macho_size) (grub_macho_t macho, grub_macho_addr_t *segments_start,
      should claim.  */
   auto int NESTED_FUNC_ATTR calcsize (grub_macho_t _macho,
 				      struct grub_macho_cmd *phdr, void *_arg);
-  int NESTED_FUNC_ATTR calcsize (grub_macho_t UNUSED _macho,
-				 struct grub_macho_cmd *hdr0, void UNUSED *_arg)
+  int NESTED_FUNC_ATTR calcsize (grub_macho_t _macho __attribute__ ((unused)),
+				 struct grub_macho_cmd *hdr0,
+				 void *_arg __attribute__ ((unused)))
     {
       grub_macho_segment_t *hdr = (grub_macho_segment_t *) hdr0;
       if (hdr->cmd != GRUB_MACHO_CMD_SEGMENT)
@@ -166,10 +167,10 @@ SUFFIX (grub_macho_load) (grub_macho_t macho, char *offset, int flags)
   grub_err_t err = 0;
   auto int NESTED_FUNC_ATTR do_load(grub_macho_t _macho,
 			       struct grub_macho_cmd *hdr0,
-			       void UNUSED *_arg);
+			       void *_arg __attribute__ ((unused)));
   int NESTED_FUNC_ATTR do_load(grub_macho_t _macho,
 			       struct grub_macho_cmd *hdr0,
-			       void UNUSED *_arg)
+			       void *_arg __attribute__ ((unused)))
   {
     grub_macho_segment_t *hdr = (grub_macho_segment_t *) hdr0;
 
@@ -223,11 +224,11 @@ SUFFIX (grub_macho_get_entry_point) (grub_macho_t macho)
 {
   grub_macho_addr_t entry_point = 0;
   auto int NESTED_FUNC_ATTR hook(grub_macho_t _macho,
-			       struct grub_macho_cmd *hdr,
-			       void UNUSED *_arg);
-  int NESTED_FUNC_ATTR hook(grub_macho_t UNUSED _macho,
-			       struct grub_macho_cmd *hdr,
-			       void UNUSED *_arg)
+				 struct grub_macho_cmd *hdr,
+				 void *_arg __attribute__ ((unused)));
+  int NESTED_FUNC_ATTR hook(grub_macho_t _macho __attribute__ ((unused)),
+			    struct grub_macho_cmd *hdr,
+			    void *_arg __attribute__ ((unused)))
   {
     if (hdr->cmd == GRUB_MACHO_CMD_THREAD)
       entry_point = ((grub_macho_thread_t *) hdr)->entry_point;
diff --git a/loader/multiboot2.c b/loader/multiboot2.c
index 976285b85..4c73a2f17 100644
--- a/loader/multiboot2.c
+++ b/loader/multiboot2.c
@@ -222,7 +222,8 @@ grub_mb2_unload (void)
 }
 
 static grub_err_t
-grub_mb2_load_other (UNUSED grub_file_t file, UNUSED void *buffer)
+grub_mb2_load_other (grub_file_t file __attribute__ ((unused)),
+		     void *buffer __attribute__ ((unused)))
 {
   /* XXX Create module tag here.  */
   return grub_error (GRUB_ERR_UNKNOWN_OS, "currently only ELF is supported");
diff --git a/util/getroot.c b/util/getroot.c
index c6c229967..db772b968 100644
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -488,7 +488,7 @@ grub_util_is_dmraid (const char *os_dev)
 }
 
 int
-grub_util_get_dev_abstraction (const char *os_dev UNUSED)
+grub_util_get_dev_abstraction (const char *os_dev __attribute__((unused)))
 {
 #ifdef __linux__
   /* Check for LVM.  */
diff --git a/util/ieee1275/devicemap.c b/util/ieee1275/devicemap.c
index bddfc17e7..19ab746ef 100644
--- a/util/ieee1275/devicemap.c
+++ b/util/ieee1275/devicemap.c
@@ -35,8 +35,10 @@ escape_of_path (const char *orig_path)
 }
 
 void
-grub_util_emit_devicemap_entry (FILE *fp, char *name, int is_floppy UNUSED,
-				int *num_fd UNUSED, int *num_hd UNUSED)
+grub_util_emit_devicemap_entry (FILE *fp, char *name,
+				int is_floppy __attribute__((unused)),
+				int *num_fd __attribute__((unused)),
+				int *num_hd __attribute__((unused)))
 {
   const char *orig_path = grub_util_devname_to_ofpath (name);
   char *ofpath = escape_of_path (orig_path);
diff --git a/util/ieee1275/ofpath.c b/util/ieee1275/ofpath.c
index 7b464bf09..e90488fc3 100644
--- a/util/ieee1275/ofpath.c
+++ b/util/ieee1275/ofpath.c
@@ -39,7 +39,6 @@
 #include <ctype.h>
 
 #ifdef OFPATH_STANDALONE
-#define UNUSED __attribute__((unused))
 #define xmalloc malloc
 void
 grub_util_error (const char *fmt, ...)
@@ -199,8 +198,10 @@ get_basename(char *p)
 
 static void
 of_path_of_vdisk(char *of_path,
-		 const char *devname UNUSED, const char *device,
-		 const char *devnode UNUSED, const char *devicenode)
+		 const char *devname __attribute__((unused)),
+		 const char *device,
+		 const char *devnode __attribute__((unused)),
+		 const char *devicenode)
 {
   char *sysfs_path, *p;
   int devno, junk;
@@ -217,8 +218,9 @@ of_path_of_vdisk(char *of_path,
 
 static void
 of_path_of_ide(char *of_path,
-	       const char *devname UNUSED, const char *device,
-	       const char *devnode UNUSED, const char *devicenode)
+	       const char *devname __attribute__((unused)), const char *device,
+	       const char *devnode __attribute__((unused)),
+	       const char *devicenode)
 {
   char *sysfs_path, *p;
   int chan, devno;
@@ -299,8 +301,9 @@ check_sas (char *sysfs_path, int *tgt)
 
 static void
 of_path_of_scsi(char *of_path,
-		const char *devname UNUSED, const char *device,
-		const char *devnode UNUSED, const char *devicenode)
+		const char *devname __attribute__((unused)), const char *device,
+		const char *devnode __attribute__((unused)),
+		const char *devicenode)
 {
   const char *p, *digit_string, *disk_name;
   int host, bus, tgt, lun;

From 3d79d70fe4d78302b6c0a116278e490193154dc6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 20 Dec 2009 01:51:38 +0100
Subject: [PATCH 0169/1628] Don't use UNUSED

---
 gfxmenu/gfxmenu.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gfxmenu/gfxmenu.c b/gfxmenu/gfxmenu.c
index ab1c8befb..62ee34234 100644
--- a/gfxmenu/gfxmenu.c
+++ b/gfxmenu/gfxmenu.c
@@ -201,8 +201,9 @@ show_menu (grub_menu_t menu, int nested)
 }
 
 static grub_err_t
-grub_cmd_gfxmenu (grub_command_t cmd UNUSED,
-                  int argc UNUSED, char **args UNUSED)
+grub_cmd_gfxmenu (grub_command_t cmd __attribute__ ((unused)),
+                  int argc __attribute__ ((unused)),
+		  char **args __attribute__ ((unused)))
 {
   grub_menu_t menu = grub_env_get_data_slot ("menu");
   if (! menu)

From 2fbcbbc3895142f5ddc17518eacc7a5b7fbeb575 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 20 Dec 2009 02:52:39 +0100
Subject: [PATCH 0170/1628] Save 314 bytes on not handling contexts in core

---
 conf/any-emu.rmk           |   2 +-
 conf/common.rmk            |   2 +-
 conf/i386-coreboot.rmk     |   3 +-
 conf/i386-efi.rmk          |   3 +-
 conf/i386-ieee1275.rmk     |   2 +-
 conf/i386-pc.rmk           |   3 +-
 conf/powerpc-ieee1275.rmk  |   2 +-
 conf/sparc64-ieee1275.rmk  |   2 +-
 conf/x86_64-efi.rmk        |   2 +-
 include/grub/env.h         |  30 ++----
 include/grub/env_private.h |  46 +++++++++
 include/grub/normal.h      |   2 +
 kern/corecmd.c             |  14 ---
 kern/env.c                 | 203 ++-----------------------------------
 kern/main.c                |   2 -
 normal/context.c           | 172 +++++++++++++++++++++++++++++++
 normal/main.c              |  12 ++-
 17 files changed, 259 insertions(+), 243 deletions(-)
 create mode 100644 include/grub/env_private.h
 create mode 100644 normal/context.c

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index fb97de0a0..066bb52ba 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -27,7 +27,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 	normal/handler.c normal/auth.c normal/autofs.c			\
 	normal/completion.c normal/main.c normal/color.c		\
 	normal/menu.c normal/menu_entry.c normal/menu_viewer.c		\
-	normal/menu_text.c						\
+	normal/menu_text.c normal/context.c				\
 	script/main.c script/execute.c script/function.c		\
 	script/lexer.c script/script.c grub_script.tab.c		\
 	partmap/amiga.c	partmap/apple.c partmap/msdos.c partmap/sun.c	\
diff --git a/conf/common.rmk b/conf/common.rmk
index 1ed30a404..74e2b5bc4 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -543,7 +543,7 @@ normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
 	normal/auth.c normal/autofs.c normal/handler.c \
 	normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
 	normal/menu_entry.c normal/menu_text.c normal/menu_viewer.c \
-	normal/misc.c
+	normal/misc.c normal/context.c
 normal_mod_CFLAGS = $(COMMON_CFLAGS)
 normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index e597328e7..1efea8afb 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -35,7 +35,8 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
 	machine/boot.h machine/console.h machine/init.h \
-	machine/memory.h machine/loader.h list.h handler.h command.h i18n.h
+	machine/memory.h machine/loader.h list.h handler.h command.h i18n.h \
+	env_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR),-Bstatic
diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index 261fe4092..2de0e9304 100644
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -51,7 +51,8 @@ kernel_img_SOURCES = kern/i386/efi/startup.S kern/main.c kern/device.c \
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	efi/efi.h efi/time.h efi/disk.h i386/pit.h list.h handler.h command.h i18n.h
+	efi/efi.h efi/time.h efi/disk.h i386/pit.h list.h handler.h command.h \
+	i18n.h env_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 8d9577844..08c6c8f37 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -33,7 +33,7 @@ kernel_img_HEADERS = cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
 	ieee1275/ieee1275.h machine/kernel.h machine/loader.h machine/memory.h \
-	list.h handler.h command.h i18n.h
+	list.h handler.h command.h i18n.h env_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x10000,-Bstatic
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 046c71641..8cec19f19 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -64,7 +64,8 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
 	machine/biosdisk.h machine/boot.h machine/console.h machine/init.h \
 	machine/memory.h machine/loader.h machine/vga.h machine/vbe.h \
-	machine/kernel.h machine/pxe.h i386/pit.h list.h handler.h command.h i18n.h
+	machine/kernel.h machine/pxe.h i386/pit.h list.h handler.h command.h \
+	i18n.h env_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 85b1fa211..9c16299d1 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -17,7 +17,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
 	symbol.h term.h time.h types.h powerpc/libgcc.h loader.h partition.h \
 	msdos_partition.h ieee1275/ieee1275.h machine/kernel.h handler.h list.h \
-	command.h i18n.h
+	command.h i18n.h env_private.h
 
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
 	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index d19e927a5..d34adeb3c 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -31,7 +31,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
 	list.h handler.h command.h i18n.h \
 	sparc64/libgcc.h ieee1275/ieee1275.h machine/kernel.h \
-	sparc64/ieee1275/ieee1275.h
+	sparc64/ieee1275/ieee1275.h env_private.h
 kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c	\
 	kern/ieee1275/ieee1275.c kern/main.c kern/device.c		\
 	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c		\
diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 0d1289c6f..f5f0db25e 100644
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -51,7 +51,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
 	efi/efi.h efi/time.h efi/disk.h machine/loader.h i386/pit.h list.h \
-	handler.h command.h i18n.h
+	handler.h command.h i18n.h env_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/include/grub/env.h b/include/grub/env.h
index 440185a59..ae4fd8745 100644
--- a/include/grub/env.h
+++ b/include/grub/env.h
@@ -22,6 +22,7 @@
 #include <grub/symbol.h>
 #include <grub/err.h>
 #include <grub/types.h>
+#include <grub/menu.h>
 
 struct grub_env_var;
 
@@ -30,18 +31,6 @@ typedef char *(*grub_env_read_hook_t) (struct grub_env_var *var,
 typedef char *(*grub_env_write_hook_t) (struct grub_env_var *var,
 					const char *val);
 
-enum grub_env_var_type
-  {
-    /* The default variable type which is local in current context.  */
-    GRUB_ENV_VAR_LOCAL,
-
-    /* The exported type, which is passed to new contexts.  */
-    GRUB_ENV_VAR_GLOBAL,
-
-    /* The data slot type, which is used to store arbitrary data.  */
-    GRUB_ENV_VAR_DATA
-  };
-
 struct grub_env_var
 {
   char *name;
@@ -50,23 +39,24 @@ struct grub_env_var
   grub_env_write_hook_t write_hook;
   struct grub_env_var *next;
   struct grub_env_var **prevp;
-  enum grub_env_var_type type;
+  int global;
 };
 
 grub_err_t EXPORT_FUNC(grub_env_set) (const char *name, const char *val);
 char *EXPORT_FUNC(grub_env_get) (const char *name);
 void EXPORT_FUNC(grub_env_unset) (const char *name);
 void EXPORT_FUNC(grub_env_iterate) (int (*func) (struct grub_env_var *var));
+struct grub_env_var *EXPORT_FUNC(grub_env_find) (const char *name);
 grub_err_t EXPORT_FUNC(grub_register_variable_hook) (const char *name,
 						     grub_env_read_hook_t read_hook,
 						     grub_env_write_hook_t write_hook);
-grub_err_t EXPORT_FUNC(grub_env_context_open) (int export);
-grub_err_t EXPORT_FUNC(grub_env_context_close) (void);
-grub_err_t EXPORT_FUNC(grub_env_export) (const char *name);
 
-grub_err_t EXPORT_FUNC(grub_env_set_data_slot) (const char *name,
-						const void *ptr);
-void *EXPORT_FUNC(grub_env_get_data_slot) (const char *name);
-void EXPORT_FUNC(grub_env_unset_data_slot) (const char *name);
+grub_err_t grub_env_context_open (int export);
+grub_err_t grub_env_context_close (void);
+grub_err_t grub_env_export (const char *name);
+
+void grub_env_unset_menu (void);
+grub_menu_t grub_env_get_menu (void);
+void grub_env_set_menu (grub_menu_t nmenu);
 
 #endif /* ! GRUB_ENV_HEADER */
diff --git a/include/grub/env_private.h b/include/grub/env_private.h
new file mode 100644
index 000000000..bb001533f
--- /dev/null
+++ b/include/grub/env_private.h
@@ -0,0 +1,46 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2003,2005,2006,2007,2009  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/>.
+ */
+
+#ifndef GRUB_ENV_PRIVATE_HEADER
+#define GRUB_ENV_PRIVATE_HEADER	1
+
+#include <grub/env.h>
+
+/* The size of the hash table.  */
+#define	HASHSZ	13
+
+/* A hashtable for quick lookup of variables.  */
+struct grub_env_context
+{
+  /* A hash table for variables.  */
+  struct grub_env_var *vars[HASHSZ];
+
+  /* One level deeper on the stack.  */
+  struct grub_env_context *prev;
+};
+
+/* This is used for sorting only.  */
+struct grub_env_sorted_var
+{
+  struct grub_env_var *var;
+  struct grub_env_sorted_var *next;
+};
+
+extern struct grub_env_context *EXPORT_VAR(grub_current_context);
+
+#endif /* ! GRUB_ENV_PRIVATE_HEADER */
diff --git a/include/grub/normal.h b/include/grub/normal.h
index feebc85b1..15f4671d2 100644
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -84,6 +84,8 @@ void read_command_list (void);
 /* Defined in `autofs.c'.  */
 void read_fs_list (void);
 
+void grub_context_init (void);
+void grub_context_fini (void);
 
 #ifdef GRUB_UTIL
 void grub_normal_init (void);
diff --git a/kern/corecmd.c b/kern/corecmd.c
index 03944f2df..7e8a3b4f6 100644
--- a/kern/corecmd.c
+++ b/kern/corecmd.c
@@ -73,18 +73,6 @@ grub_core_cmd_unset (struct grub_command *cmd __attribute__ ((unused)),
   return 0;
 }
 
-static grub_err_t
-grub_core_cmd_export (struct grub_command *cmd __attribute__ ((unused)),
-		      int argc, char **args)
-{
-  if (argc < 1)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT,
-		       "no environment variable specified");
-
-  grub_env_export (args[0]);
-  return 0;
-}
-
 /* insmod MODULE */
 static grub_err_t
 grub_core_cmd_insmod (struct grub_command *cmd __attribute__ ((unused)),
@@ -193,8 +181,6 @@ grub_register_core_commands (void)
 			 "set [ENVVAR=VALUE]", "set an environment variable");
   grub_register_command ("unset", grub_core_cmd_unset,
 			 "unset ENVVAR", "remove an environment variable");
-  grub_register_command ("export", grub_core_cmd_export,
-			 "export ENVVAR", "Export a variable.");
   grub_register_command ("ls", grub_core_cmd_ls,
 			 "ls [ARG]", "list devices or files");
   grub_register_command ("insmod", grub_core_cmd_insmod,
diff --git a/kern/env.c b/kern/env.c
index 750902af8..fdb3c9a34 100644
--- a/kern/env.c
+++ b/kern/env.c
@@ -18,34 +18,15 @@
  */
 
 #include <grub/env.h>
+#include <grub/env_private.h>
 #include <grub/misc.h>
 #include <grub/mm.h>
 
-/* The size of the hash table.  */
-#define	HASHSZ	13
-
-/* A hashtable for quick lookup of variables.  */
-struct grub_env_context
-{
-  /* A hash table for variables.  */
-  struct grub_env_var *vars[HASHSZ];
-
-  /* One level deeper on the stack.  */
-  struct grub_env_context *prev;
-};
-
-/* This is used for sorting only.  */
-struct grub_env_sorted_var
-{
-  struct grub_env_var *var;
-  struct grub_env_sorted_var *next;
-};
-
 /* The initial context.  */
 static struct grub_env_context initial_context;
 
 /* The current context.  */
-static struct grub_env_context *current_context = &initial_context;
+struct grub_env_context *grub_current_context = &initial_context;
 
 /* Return the hash representation of the string S.  */
 static unsigned int
@@ -60,87 +41,20 @@ grub_env_hashval (const char *s)
   return i % HASHSZ;
 }
 
-static struct grub_env_var *
+struct grub_env_var *
 grub_env_find (const char *name)
 {
   struct grub_env_var *var;
   int idx = grub_env_hashval (name);
 
   /* Look for the variable in the current context.  */
-  for (var = current_context->vars[idx]; var; var = var->next)
+  for (var = grub_current_context->vars[idx]; var; var = var->next)
     if (grub_strcmp (var->name, name) == 0)
       return var;
 
   return 0;
 }
 
-grub_err_t
-grub_env_context_open (int export)
-{
-  struct grub_env_context *context;
-  int i;
-
-  context = grub_zalloc (sizeof (*context));
-  if (! context)
-    return grub_errno;
-
-  context->prev = current_context;
-  current_context = context;
-
-  /* Copy exported variables.  */
-  for (i = 0; i < HASHSZ; i++)
-    {
-      struct grub_env_var *var;
-
-      for (var = context->prev->vars[i]; var; var = var->next)
-	{
-	  if (export && var->type == GRUB_ENV_VAR_GLOBAL)
-	    {
-	      if (grub_env_set (var->name, var->value) != GRUB_ERR_NONE)
-		{
-		  grub_env_context_close ();
-		  return grub_errno;
-		}
-	      grub_register_variable_hook (var->name, var->read_hook, var->write_hook);
-	    }
-	}
-    }
-
-  return GRUB_ERR_NONE;
-}
-
-grub_err_t
-grub_env_context_close (void)
-{
-  struct grub_env_context *context;
-  int i;
-
-  if (! current_context->prev)
-    grub_fatal ("cannot close the initial context");
-
-  /* Free the variables associated with this context.  */
-  for (i = 0; i < HASHSZ; i++)
-    {
-      struct grub_env_var *p, *q;
-
-      for (p = current_context->vars[i]; p; p = q)
-	{
-	  q = p->next;
-          grub_free (p->name);
-          if (p->type != GRUB_ENV_VAR_DATA)
-            grub_free (p->value);
-	  grub_free (p);
-	}
-    }
-
-  /* Restore the previous context.  */
-  context = current_context->prev;
-  grub_free (current_context);
-  current_context = context;
-
-  return GRUB_ERR_NONE;
-}
-
 static void
 grub_env_insert (struct grub_env_context *context,
 		 struct grub_env_var *var)
@@ -164,18 +78,6 @@ grub_env_remove (struct grub_env_var *var)
     var->next->prevp = var->prevp;
 }
 
-grub_err_t
-grub_env_export (const char *name)
-{
-  struct grub_env_var *var;
-
-  var = grub_env_find (name);
-  if (var)
-    var->type = GRUB_ENV_VAR_GLOBAL;
-
-  return GRUB_ERR_NONE;
-}
-
 grub_err_t
 grub_env_set (const char *name, const char *val)
 {
@@ -207,9 +109,8 @@ grub_env_set (const char *name, const char *val)
   if (! var)
     return grub_errno;
 
-  /* This is not necessary, because GRUB_ENV_VAR_LOCAL == 0. But leave
-     this for readability.  */
-  var->type = GRUB_ENV_VAR_LOCAL;
+  /* This is not necessary. But leave this for readability.  */
+  var->global = 0;
 
   var->name = grub_strdup (name);
   if (! var->name)
@@ -219,7 +120,7 @@ grub_env_set (const char *name, const char *val)
   if (! var->value)
     goto fail;
 
-  grub_env_insert (current_context, var);
+  grub_env_insert (grub_current_context, var);
 
   return GRUB_ERR_NONE;
 
@@ -263,8 +164,7 @@ grub_env_unset (const char *name)
   grub_env_remove (var);
 
   grub_free (var->name);
-  if (var->type != GRUB_ENV_VAR_DATA)
-    grub_free (var->value);
+  grub_free (var->value);
   grub_free (var);
 }
 
@@ -280,14 +180,10 @@ grub_env_iterate (int (*func) (struct grub_env_var *var))
     {
       struct grub_env_var *var;
 
-      for (var = current_context->vars[i]; var; var = var->next)
+      for (var = grub_current_context->vars[i]; var; var = var->next)
 	{
 	  struct grub_env_sorted_var *p, **q;
 
-	  /* Ignore data slots.  */
-	  if (var->type == GRUB_ENV_VAR_DATA)
-	    continue;
-
 	  sorted_var = grub_malloc (sizeof (*sorted_var));
 	  if (! sorted_var)
 	    goto fail;
@@ -343,84 +239,3 @@ grub_register_variable_hook (const char *name,
 
   return GRUB_ERR_NONE;
 }
-
-static char *
-mangle_data_slot_name (const char *name)
-{
-  char *mangled_name;
-
-  mangled_name = grub_malloc (grub_strlen (name) + 2);
-  if (! mangled_name)
-    return 0;
-
-  grub_sprintf (mangled_name, "\e%s", name);
-  return mangled_name;
-}
-
-grub_err_t
-grub_env_set_data_slot (const char *name, const void *ptr)
-{
-  char *mangled_name;
-  struct grub_env_var *var;
-
-  mangled_name = mangle_data_slot_name (name);
-  if (! mangled_name)
-    goto fail;
-
-  /* If the variable does already exist, just update the variable.  */
-  var = grub_env_find (mangled_name);
-  if (var)
-    {
-      var->value = (char *) ptr;
-      return GRUB_ERR_NONE;
-    }
-
-  /* The variable does not exist, so create a new one.  */
-  var = grub_zalloc (sizeof (*var));
-  if (! var)
-    goto fail;
-
-  var->type = GRUB_ENV_VAR_DATA;
-  var->name = mangled_name;
-  var->value = (char *) ptr;
-
-  grub_env_insert (current_context, var);
-
-  return GRUB_ERR_NONE;
-
- fail:
-
-  grub_free (mangled_name);
-  return grub_errno;
-}
-
-void *
-grub_env_get_data_slot (const char *name)
-{
-  char *mangled_name;
-  void *ptr = 0;
-
-  mangled_name = mangle_data_slot_name (name);
-  if (! mangled_name)
-    goto fail;
-
-  ptr = grub_env_get (mangled_name);
-  grub_free (mangled_name);
-
- fail:
-
-  return ptr;
-}
-
-void
-grub_env_unset_data_slot (const char *name)
-{
-  char *mangled_name;
-
-  mangled_name = mangle_data_slot_name (name);
-  if (! mangled_name)
-    return;
-
-  grub_env_unset (mangled_name);
-  grub_free (mangled_name);
-}
diff --git a/kern/main.c b/kern/main.c
index 9215d55e7..b76d2d20e 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -114,7 +114,6 @@ grub_set_root_dev (void)
   const char *prefix;
 
   grub_register_variable_hook ("root", 0, grub_env_write_root);
-  grub_env_export ("root");
 
   prefix = grub_env_get ("prefix");
 
@@ -164,7 +163,6 @@ grub_main (void)
   /* It is better to set the root device as soon as possible,
      for convenience.  */
   grub_machine_set_prefix ();
-  grub_env_export ("prefix");
   grub_set_root_dev ();
 
   grub_register_core_commands ();
diff --git a/normal/context.c b/normal/context.c
new file mode 100644
index 000000000..d9ad3b61d
--- /dev/null
+++ b/normal/context.c
@@ -0,0 +1,172 @@
+/* env.c - Environment variables */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2003,2005,2006,2007,2008,2009  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/env.h>
+#include <grub/env_private.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/command.h>
+
+struct menu_pointer
+{
+  grub_menu_t menu;
+  struct menu_pointer *prev;
+};
+
+struct menu_pointer initial_menu;
+struct menu_pointer *current_menu = &initial_menu;
+
+void
+grub_env_unset_menu (void)
+{
+  current_menu->menu = NULL;
+}
+
+grub_menu_t
+grub_env_get_menu (void)
+{
+  return current_menu->menu;
+}
+
+void
+grub_env_set_menu (grub_menu_t nmenu)
+{
+  current_menu->menu = nmenu;
+}
+
+grub_err_t
+grub_env_context_open (int export)
+{
+  struct grub_env_context *context;
+  int i;
+  struct menu_pointer *menu;
+
+  context = grub_zalloc (sizeof (*context));
+  if (! context)
+    return grub_errno;
+  menu = grub_zalloc (sizeof (*menu));
+  if (! menu)
+    return grub_errno;
+
+  context->prev = grub_current_context;
+  grub_current_context = context;
+
+  menu->prev = current_menu;
+  current_menu = menu;
+
+  /* Copy exported variables.  */
+  for (i = 0; i < HASHSZ; i++)
+    {
+      struct grub_env_var *var;
+
+      for (var = context->prev->vars[i]; var; var = var->next)
+	{
+	  if (export && var->global)
+	    {
+	      if (grub_env_set (var->name, var->value) != GRUB_ERR_NONE)
+		{
+		  grub_env_context_close ();
+		  return grub_errno;
+		}
+	      grub_register_variable_hook (var->name, var->read_hook, var->write_hook);
+	    }
+	}
+    }
+
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_env_context_close (void)
+{
+  struct grub_env_context *context;
+  int i;
+  struct menu_pointer *menu;
+
+  if (! grub_current_context->prev)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+		       "cannot close the initial context");
+
+  /* Free the variables associated with this context.  */
+  for (i = 0; i < HASHSZ; i++)
+    {
+      struct grub_env_var *p, *q;
+
+      for (p = grub_current_context->vars[i]; p; p = q)
+	{
+	  q = p->next;
+          grub_free (p->name);
+	  grub_free (p->value);
+	  grub_free (p);
+	}
+    }
+
+  /* Restore the previous context.  */
+  context = grub_current_context->prev;
+  grub_free (grub_current_context);
+  grub_current_context = context;
+
+  menu = current_menu->prev;
+  grub_free (current_menu);
+  current_menu = menu;
+
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_env_export (const char *name)
+{
+  struct grub_env_var *var;
+
+  var = grub_env_find (name);
+  if (var)
+    var->global = 1;
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_command_t export_cmd;
+
+static grub_err_t
+grub_cmd_export (struct grub_command *cmd __attribute__ ((unused)),
+		 int argc, char **args)
+{
+  if (argc < 1)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+		       "no environment variable specified");
+
+  grub_env_export (args[0]);
+  return 0;
+}
+
+void
+grub_context_init (void)
+{
+  grub_env_export ("root");
+  grub_env_export ("prefix");
+
+  export_cmd = grub_register_command ("export", grub_cmd_export,
+				      "export ENVVAR", "Export a variable.");
+}
+
+void
+grub_context_fini (void)
+{
+  grub_unregister_command (export_cmd);
+}
diff --git a/normal/main.c b/normal/main.c
index f080a6971..52581613a 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -133,7 +133,7 @@ free_menu (grub_menu_t menu)
     }
 
   grub_free (menu);
-  grub_env_unset_data_slot ("menu");
+  grub_env_unset_menu ();
 }
 
 static void
@@ -174,7 +174,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
     return grub_errno;
   classes_tail = classes_head;
 
-  menu = grub_env_get_data_slot ("menu");
+  menu = grub_env_get_menu ();
   if (! menu)
     return grub_error (GRUB_ERR_MENU, "no menu context");
 
@@ -357,14 +357,14 @@ read_config_file (const char *config)
 
   grub_menu_t newmenu;
 
-  newmenu = grub_env_get_data_slot ("menu");
+  newmenu = grub_env_get_menu ();
   if (! newmenu)
     {
       newmenu = grub_zalloc (sizeof (*newmenu));
       if (! newmenu)
 	return 0;
 
-      grub_env_set_data_slot ("menu", newmenu);
+      grub_env_set_menu (newmenu);
     }
 
   /* Try to open the config file.  */
@@ -562,6 +562,8 @@ grub_env_write_pager (struct grub_env_var *var __attribute__ ((unused)),
 
 GRUB_MOD_INIT(normal)
 {
+  grub_context_init ();
+
   /* Normal mode shouldn't be unloaded.  */
   if (mod)
     grub_dl_ref (mod);
@@ -589,6 +591,8 @@ GRUB_MOD_INIT(normal)
 
 GRUB_MOD_FINI(normal)
 {
+  grub_context_fini ();
+
   grub_set_history (0);
   grub_reader_unregister (&grub_normal_reader);
   grub_register_variable_hook ("pager", 0, 0);

From 4011be3b1a647596572e2c79349bd70adcaecc42 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 20 Dec 2009 14:21:04 +0100
Subject: [PATCH 0171/1628] ChangeLog

---
 ChangeLog.newenv | 55 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 ChangeLog.newenv

diff --git a/ChangeLog.newenv b/ChangeLog.newenv
new file mode 100644
index 000000000..3c1b09cfc
--- /dev/null
+++ b/ChangeLog.newenv
@@ -0,0 +1,55 @@
+2009-12-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Move context handling out of the kernel.
+
+	* conf/any-emu.rmk (grub_emu_SOURCES): Add normal/context.c.
+	* conf/common.rmk (normal_mod_SOURCES): Add normal/context.c.
+	* conf/i386-coreboot.rmk (kernel_img_HEADERS): Add env_private.h.
+	* conf/i386-efi.rmk: Likewise.
+	* conf/i386-ieee1275.rmk: Likewise.
+	* conf/i386-pc.rmk: Likewise.
+	* conf/powerpc-ieee1275.rmk: Likewise.
+	* conf/sparc64-ieee1275.rmk: Likewise.
+	* conf/x86_64-efi.rmk: Likewise.
+	* include/grub/env.h: Include grub/menu.h.
+	(grub_env_var_type): Removed.
+	(grub_env_var): Replaced field 'type' with 'global'.
+	(grub_env_find): New prototype.
+	(grub_env_context_open): Remove EXPORT_FUNC.
+	(grub_env_context_close): Likewise.
+	(grub_env_export): Likewise.
+	(grub_env_set_data_slot): Removed.
+	(grub_env_get_data_slot): Likewise.
+	(grub_env_unset_data_slot): Likewise.
+	(grub_env_unset_menu): New prototype.
+	(grub_env_set_menu): Likewise.
+	(grub_env_get_menu): Likewise.
+	* include/grub/env_private.h: New file.
+	* include/grub/normal.h (grub_context_init): New prototype.
+	(grub_context_fini): Likewise.
+	* kern/corecmd.c (grub_core_cmd_export): Moved from here ...
+	* normal/context.c (grub_cmd_export): ... to here.
+	* kern/env.c: Include env_private.h.
+	(HASHSZ): Moved to include/grub/env_private.h.
+	(grub_env_context): Likewise.
+	(grub_env_sorted_var): Likewise.
+	(current_context): Renamed from this ...
+	(grub_current_context): ...to this. 'static' removed. All users updated.
+	(grub_env_find): Removed 'static'.
+	(grub_env_context_open): Moved to normal/context.c.
+	(grub_env_context_close): Likewise.
+	(grub_env_export): Likewise.
+	(mangle_data_slot_name): Removed.
+	(grub_env_set_data_slot): Likewise.
+	(grub_env_get_data_slot): Likewise.
+	(grub_env_unset_data_slot): Likewise.
+	* kern/main.c (grub_set_root_dev): Don't export root.
+	It will be done later.
+	(grub_main): Don't export prefix.
+	It will be done later.
+	* normal/context.c: New file.
+	* normal/main.c (free_menu): Use grub_env_unset_menu.
+	(grub_normal_add_menu_entry): Use grub_env_get_menu.
+	(read_config_file): Use grub_env_get_menu and grub_env_set_menu.
+	(GRUB_MOD_INIT(normal)): Call grub_context_init.
+	(GRUB_MOD_FINI(normal)): Call grub_context_fini.

From b617a75beff8af749ee5f35183f37c27472f4a37 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 21 Dec 2009 22:38:51 +0100
Subject: [PATCH 0172/1628] Fix compilation on ppc

---
 loader/powerpc/ieee1275/linux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/loader/powerpc/ieee1275/linux.c b/loader/powerpc/ieee1275/linux.c
index 79fbf0b02..1056ab9eb 100644
--- a/loader/powerpc/ieee1275/linux.c
+++ b/loader/powerpc/ieee1275/linux.c
@@ -110,7 +110,7 @@ grub_linux_load32 (grub_elf_t elf)
   if (entry == 0)
     entry = 0x01400000;
 
-  linux_size = grub_elf32_size (elf);
+  linux_size = grub_elf32_size (elf, 0);
   if (linux_size == 0)
     return grub_errno;
   /* Pad it; the kernel scribbles over memory beyond its load address.  */
@@ -160,7 +160,7 @@ grub_linux_load64 (grub_elf_t elf)
   if (entry == 0)
     entry = 0x01400000;
 
-  linux_size = grub_elf64_size (elf);
+  linux_size = grub_elf64_size (elf, 0);
   if (linux_size == 0)
     return grub_errno;
   /* Pad it; the kernel scribbles over memory beyond its load address.  */

From fbb8a88714844a34b9a817e2af8960bda6e4ce58 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 22 Dec 2009 15:09:25 +0100
Subject: [PATCH 0173/1628] Byte-addressable PCI config space

---
 ChangeLog.pciclean      | 52 +++++++++++++++++++++++++++++++++++++++++
 bus/pci.c               |  6 ++---
 bus/usb/ohci.c          |  4 ++--
 bus/usb/uhci.c          |  4 ++--
 commands/efi/fixvideo.c |  2 +-
 commands/efi/loadbios.c |  4 ++--
 commands/lspci.c        | 22 ++++++++++-------
 disk/ata.c              |  9 ++++---
 include/grub/pci.h      | 31 ++++++++++++++++++++++++
 loader/i386/efi/linux.c |  2 +-
 loader/i386/efi/xnu.c   |  2 +-
 util/pci.c              |  2 +-
 video/efi_uga.c         |  2 +-
 13 files changed, 117 insertions(+), 25 deletions(-)
 create mode 100644 ChangeLog.pciclean

diff --git a/ChangeLog.pciclean b/ChangeLog.pciclean
new file mode 100644
index 000000000..f50a48875
--- /dev/null
+++ b/ChangeLog.pciclean
@@ -0,0 +1,52 @@
+2009-12-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Byte-addressable PCI configuration space.
+
+	* bus/pci.c (grub_pci_make_address): Use byte address instead of
+	dword address.
+	(grub_pci_iterate): Use macroses GRUB_PCI_REG_PCI_ID and
+	GRUB_PCI_REG_CACHELINE.
+	* bus/usb/ohci.c (grub_ohci_pci_iter): Use macroses
+	GRUB_PCI_REG_CLASS and GRUB_PCI_REG_ADDRESS_REG0.
+	* bus/usb/uhci.c (grub_ohci_pci_iter): Use macroses
+	GRUB_PCI_REG_CLASS and GRUB_PCI_REG_ADDRESS_REG4.
+	* commands/efi/fixvideo.c (scan_card): Use macros GRUB_PCI_REG_CLASS.
+	* commands/efi/loadbios.c (enable_rom_area): Pass byte-address to
+	grub_pci_make_address.
+	(lock_rom_area): Likewise.
+	* commands/lspci.c (grub_lspci_iter): Use macroses
+	GRUB_PCI_REG_CLASS and GRUB_PCI_REG_ADDRESSES. Handle byte-addressing
+	of grub_pci_make_address.
+	* disk/ata.c (grub_ata_pciinit): Likewise.
+	* include/grub/pci.h (GRUB_PCI_REG_PCI_ID): New macro.
+	(GRUB_PCI_REG_VENDOR): Likewise.
+	(GRUB_PCI_REG_DEVICE): Likewise.
+	(GRUB_PCI_REG_COMMAND): Likewise.
+	(GRUB_PCI_REG_STATUS): Likewise.
+	(GRUB_PCI_REG_REVISION): Likewise.
+	(GRUB_PCI_REG_CLASS): Likewise.
+	(GRUB_PCI_REG_CACHELINE): Likewise.
+	(GRUB_PCI_REG_LAT_TIMER): Likewise.
+	(GRUB_PCI_REG_HEADER_TYPE): Likewise.
+	(GRUB_PCI_REG_BIST): Likewise.
+	(GRUB_PCI_REG_ADDRESSES): Likewise.
+	(GRUB_PCI_REG_ADDRESS_REG): Likewise.
+	(GRUB_PCI_REG_ADDRESS_REG): Likewise.
+	(GRUB_PCI_REG_ADDRESS_REG): Likewise.
+	(GRUB_PCI_REG_ADDRESS_REG): Likewise.
+	(GRUB_PCI_REG_ADDRESS_REG): Likewise.
+	(GRUB_PCI_REG_ADDRESS_REG): Likewise.
+	(GRUB_PCI_REG_CIS_POINTER): Likewise.
+	(GRUB_PCI_REG_SUBVENDOR): Likewise.
+	(GRUB_PCI_REG_SUBSYSTEM): Likewise.
+	(GRUB_PCI_REG_ROM_ADDRESS): Likewise.
+	(GRUB_PCI_REG_CAP_POINTER): Likewise.
+	(GRUB_PCI_REG_IRQ_LINE): Likewise.
+	(GRUB_PCI_REG_IRQ_PIN): Likewise.
+	(GRUB_PCI_REG_MIN_GNT): Likewise.
+	(GRUB_PCI_REG_MAX_LAT): Likewise.
+	* loader/i386/efi/linux.c (find_framebuf): Use GRUB_PCI_REG_CLASS.
+	* loader/i386/efi/xnu.c (find_framebuf): Likewise.
+	* video/efi_uga.c (find_framebuf): Likewise.
+	* util/pci.c (grub_pci_make_address): Use byte-addressed configuration
+	space.
diff --git a/bus/pci.c b/bus/pci.c
index fe4cad181..13b67c908 100644
--- a/bus/pci.c
+++ b/bus/pci.c
@@ -24,7 +24,7 @@ grub_pci_address_t
 grub_pci_make_address (grub_pci_device_t dev, int reg)
 {
   return (1 << 31) | (dev.bus << 16) | (dev.device << 11)
-    | (dev.function << 8) | (reg << 2);
+    | (dev.function << 8) | reg;
 }
 
 void
@@ -41,7 +41,7 @@ grub_pci_iterate (grub_pci_iteratefunc_t hook)
 	{
 	  for (dev.function = 0; dev.function < 8; dev.function++)
 	    {
-	      addr = grub_pci_make_address (dev, 0);
+	      addr = grub_pci_make_address (dev, GRUB_PCI_REG_PCI_ID);
 	      id = grub_pci_read (addr);
 
 	      /* Check if there is a device present.  */
@@ -54,7 +54,7 @@ grub_pci_iterate (grub_pci_iteratefunc_t hook)
 	      /* Probe only func = 0 if the device if not multifunction */
 	      if (dev.function == 0)
 		{
-		  addr = grub_pci_make_address (dev, 3);
+		  addr = grub_pci_make_address (dev, GRUB_PCI_REG_CACHELINE);
 		  hdr = grub_pci_read (addr);
 		  if (!(hdr & 0x800000))
 		    break;
diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 5fe9c9507..6d185bc7f 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -126,7 +126,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   grub_uint32_t revision;
   grub_uint32_t frame_interval;
 
-  addr = grub_pci_make_address (dev, 2);
+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
   class_code = grub_pci_read (addr) >> 8;
 
   interf = class_code & 0xFF;
@@ -138,7 +138,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
     return 0;
 
   /* Determine IO base address.  */
-  addr = grub_pci_make_address (dev, 4);
+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
   base = grub_pci_read (addr);
 
 #if 0
diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index e83fccc1d..947f2367b 100644
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -150,7 +150,7 @@ grub_uhci_pci_iter (grub_pci_device_t dev,
   struct grub_uhci *u;
   int i;
 
-  addr = grub_pci_make_address (dev, 2);
+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
   class_code = grub_pci_read (addr) >> 8;
 
   interf = class_code & 0xFF;
@@ -162,7 +162,7 @@ grub_uhci_pci_iter (grub_pci_device_t dev,
     return 0;
 
   /* Determine IO base address.  */
-  addr = grub_pci_make_address (dev, 8);
+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG4);
   base = grub_pci_read (addr);
   /* Stop if there is no IO space base address defined.  */
   if (! (base & 1))
diff --git a/commands/efi/fixvideo.c b/commands/efi/fixvideo.c
index 685662237..dea69c8b1 100644
--- a/commands/efi/fixvideo.c
+++ b/commands/efi/fixvideo.c
@@ -42,7 +42,7 @@ scan_card (grub_pci_device_t dev, grub_pci_id_t pciid)
 {
   grub_pci_address_t addr;
 
-  addr = grub_pci_make_address (dev, 2);
+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
   if (grub_pci_read_byte (addr + 3) == 0x3)
     {
       struct grub_video_patch *p = video_patches;
diff --git a/commands/efi/loadbios.c b/commands/efi/loadbios.c
index d7ad42690..183ba7e85 100644
--- a/commands/efi/loadbios.c
+++ b/commands/efi/loadbios.c
@@ -50,7 +50,7 @@ enable_rom_area (void)
       return 0;
     }
 
-  addr = grub_pci_make_address (dev, 36);
+  addr = grub_pci_make_address (dev, 144);
   grub_pci_write_byte (addr++, 0x30);
   grub_pci_write_byte (addr++, 0x33);
   grub_pci_write_byte (addr++, 0x33);
@@ -76,7 +76,7 @@ lock_rom_area (void)
   grub_pci_address_t addr;
   grub_pci_device_t dev = { .bus = 0, .device = 0, .function = 0};
 
-  addr = grub_pci_make_address (dev, 36);
+  addr = grub_pci_make_address (dev, 144);
   grub_pci_write_byte (addr++, 0x10);
   grub_pci_write_byte (addr++, 0x11);
   grub_pci_write_byte (addr++, 0x11);
diff --git a/commands/lspci.c b/commands/lspci.c
index 559bb8242..c515da762 100644
--- a/commands/lspci.c
+++ b/commands/lspci.c
@@ -134,7 +134,7 @@ grub_lspci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)
   grub_printf ("%02x:%02x.%x %04x:%04x", grub_pci_get_bus (dev),
 	       grub_pci_get_device (dev), grub_pci_get_function (dev),
 	       pciid & 0xFFFF, pciid >> 16);
-  addr = grub_pci_make_address (dev, 2);
+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
   class = grub_pci_read (addr);
 
   /* Lookup the class name, if there isn't a specific one,
@@ -155,14 +155,14 @@ grub_lspci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)
 
   if (iospace)
     {
-      reg = 4;
-      while (reg < 10)
+      reg = GRUB_PCI_REG_ADDRESSES;
+      while (reg < GRUB_PCI_REG_CIS_POINTER)
 	{
 	  grub_uint64_t space;
 	  addr = grub_pci_make_address (dev, reg);
 	  space = grub_pci_read (addr);
 
-	  reg++;
+	  reg += sizeof (grub_uint32_t);
 	  
 	  if (space == 0)
 	    continue;
@@ -170,7 +170,9 @@ grub_lspci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)
 	  switch (space & GRUB_PCI_ADDR_SPACE_MASK)
 	    {
 	    case GRUB_PCI_ADDR_SPACE_IO:
-	      grub_printf ("\tIO space %d at 0x%llx\n", (reg - 1) - 4,
+	      grub_printf ("\tIO space %d at 0x%llx\n",
+			   ((reg - GRUB_PCI_REG_ADDRESSES)
+			    / sizeof (grub_uint32_t)) - 1,
 			   (unsigned long long)
 			   (space & GRUB_PCI_ADDR_IO_MASK));
 	      break;
@@ -180,9 +182,11 @@ grub_lspci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)
 		{
 		  addr = grub_pci_make_address (dev, reg);
 		  space |= ((grub_uint64_t) grub_pci_read (addr)) << 32;
-		  reg++;
+		  reg += sizeof (grub_uint32_t);
 		  grub_printf ("\t64-bit memory space %d at 0x%016llx [%s]\n",
-			       (reg - 2) - 4, (unsigned long long)
+			       ((reg - GRUB_PCI_REG_ADDRESSES)
+				/ sizeof (grub_uint32_t)) - 2,
+			       (unsigned long long)
 			       (space & GRUB_PCI_ADDR_MEM_MASK),
 			       space & GRUB_PCI_ADDR_MEM_PREFETCH
 			       ? "prefetchable" : "non-prefetchable");
@@ -190,7 +194,9 @@ grub_lspci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)
 		}
 	      else
 		grub_printf ("\t32-bit memory space %d at 0x%016llx [%s]\n",
-			     (reg - 1) - 4, (unsigned long long) 
+			     ((reg - GRUB_PCI_REG_ADDRESSES)
+			      / sizeof (grub_uint32_t)) - 1,
+			     (unsigned long long) 
 			     (space & GRUB_PCI_ADDR_MEM_MASK),
 			     space & GRUB_PCI_ADDR_MEM_PREFETCH
 			     ? "prefetchable" : "non-prefetchable");
diff --git a/disk/ata.c b/disk/ata.c
index af8c87180..bc8383d4e 100644
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -402,7 +402,7 @@ grub_ata_pciinit (grub_pci_device_t dev,
   static int controller = 0;
 
   /* Read class.  */
-  addr = grub_pci_make_address (dev, 2);
+  addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
   class = grub_pci_read (addr);
 
   /* Check if this class ID matches that of a PCI IDE Controller.  */
@@ -429,9 +429,12 @@ grub_ata_pciinit (grub_pci_device_t dev,
 	{
 	  /* Read the BARs, which either contain a mmapped IO address
 	     or the IO port address.  */
-	  addr = grub_pci_make_address (dev, 4 + 2 * i);
+	  addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESSES
+					+ sizeof (grub_uint64_t) * i);
 	  bar1 = grub_pci_read (addr);
-	  addr = grub_pci_make_address (dev, 5 + 2 * i);
+	  addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESSES
+					+ sizeof (grub_uint64_t) * i
+					+ sizeof (grub_uint32_t));
 	  bar2 = grub_pci_read (addr);
 
 	  /* Check if the BARs describe an IO region.  */
diff --git a/include/grub/pci.h b/include/grub/pci.h
index 2bea05410..1f3ac7fc7 100644
--- a/include/grub/pci.h
+++ b/include/grub/pci.h
@@ -35,6 +35,37 @@
 #define  GRUB_PCI_ADDR_MEM_MASK		~0xf
 #define  GRUB_PCI_ADDR_IO_MASK		~0x03
 
+#define  GRUB_PCI_REG_PCI_ID       0x00
+#define  GRUB_PCI_REG_VENDOR       0x00
+#define  GRUB_PCI_REG_DEVICE       0x02
+#define  GRUB_PCI_REG_COMMAND      0x04
+#define  GRUB_PCI_REG_STATUS       0x06
+#define  GRUB_PCI_REG_REVISION     0x08
+#define  GRUB_PCI_REG_CLASS        0x08
+#define  GRUB_PCI_REG_CACHELINE    0x0c
+#define  GRUB_PCI_REG_LAT_TIMER    0x0d
+#define  GRUB_PCI_REG_HEADER_TYPE  0x0e
+#define  GRUB_PCI_REG_BIST         0x0f
+#define  GRUB_PCI_REG_ADDRESSES    0x10
+
+/* Beware that 64-bit address takes 2 registers.  */
+#define  GRUB_PCI_REG_ADDRESS_REG0 0x10
+#define  GRUB_PCI_REG_ADDRESS_REG1 0x14
+#define  GRUB_PCI_REG_ADDRESS_REG2 0x18
+#define  GRUB_PCI_REG_ADDRESS_REG3 0x1c
+#define  GRUB_PCI_REG_ADDRESS_REG4 0x20
+#define  GRUB_PCI_REG_ADDRESS_REG5 0x24
+
+#define  GRUB_PCI_REG_CIS_POINTER  0x28
+#define  GRUB_PCI_REG_SUBVENDOR    0x2c
+#define  GRUB_PCI_REG_SUBSYSTEM    0x2e
+#define  GRUB_PCI_REG_ROM_ADDRESS  0x30
+#define  GRUB_PCI_REG_CAP_POINTER  0x34
+#define  GRUB_PCI_REG_IRQ_LINE     0x3c
+#define  GRUB_PCI_REG_IRQ_PIN      0x3d
+#define  GRUB_PCI_REG_MIN_GNT      0x3e
+#define  GRUB_PCI_REG_MAX_LAT      0x3f
+
 typedef grub_uint32_t grub_pci_id_t;
 
 #ifdef GRUB_UTIL
diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c
index 8cd4d23f2..ad09f7c36 100644
--- a/loader/i386/efi/linux.c
+++ b/loader/i386/efi/linux.c
@@ -477,7 +477,7 @@ find_framebuf (grub_uint32_t *fb_base, grub_uint32_t *line_len)
     {
       grub_pci_address_t addr;
 
-      addr = grub_pci_make_address (dev, 2);
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
       if (grub_pci_read (addr) >> 24 == 0x3)
 	{
 	  int i;
diff --git a/loader/i386/efi/xnu.c b/loader/i386/efi/xnu.c
index 236732804..af54ac5c1 100644
--- a/loader/i386/efi/xnu.c
+++ b/loader/i386/efi/xnu.c
@@ -79,7 +79,7 @@ find_framebuf (grub_uint32_t *fb_base, grub_uint32_t *line_len)
     {
       grub_pci_address_t addr;
 
-      addr = grub_pci_make_address (dev, 2);
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
       if (grub_pci_read (addr) >> 24 == 0x3)
 	{
 	  int i;
diff --git a/util/pci.c b/util/pci.c
index a0c1867be..420ae320b 100644
--- a/util/pci.c
+++ b/util/pci.c
@@ -26,7 +26,7 @@ grub_pci_make_address (grub_pci_device_t dev, int reg)
 {
   grub_pci_address_t ret;
   ret.dev = dev;
-  ret.pos = reg << 2;
+  ret.pos = reg;
   return ret;
 }
 
diff --git a/video/efi_uga.c b/video/efi_uga.c
index 9bca64306..959b266a9 100644
--- a/video/efi_uga.c
+++ b/video/efi_uga.c
@@ -92,7 +92,7 @@ find_framebuf (grub_uint32_t *fb_base, grub_uint32_t *line_len)
     {
       grub_pci_address_t addr;
 
-      addr = grub_pci_make_address (dev, 2);
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
       if (grub_pci_read (addr) >> 24 == 0x3)
 	{
 	  int i;

From adc89895e05a4cdd5cd69bfc313fd09633f900f9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 22 Dec 2009 16:42:45 +0100
Subject: [PATCH 0174/1628] setpci implementation

---
 commands/setpci.c | 340 ++++++++++++++++++++++++++++++++++++++++++++++
 conf/i386.rmk     |   6 +
 2 files changed, 346 insertions(+)
 create mode 100644 commands/setpci.c

diff --git a/commands/setpci.c b/commands/setpci.c
new file mode 100644
index 000000000..aa5e51de9
--- /dev/null
+++ b/commands/setpci.c
@@ -0,0 +1,340 @@
+/* lspci.c - List PCI devices.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008, 2009  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/pci.h>
+#include <grub/dl.h>
+#include <grub/misc.h>
+#include <grub/extcmd.h>
+#include <grub/env.h>
+#include <grub/mm.h>
+
+struct pci_register
+{
+  const char *name;
+  grub_uint16_t addr;
+  unsigned size;
+};
+
+struct pci_register pci_registers[] =
+  {
+    {"VENDOR_ID",       GRUB_PCI_REG_VENDOR      , 2},
+    {"DEVICE_ID",       GRUB_PCI_REG_DEVICE      , 2},
+    {"COMMAND",         GRUB_PCI_REG_COMMAND     , 2},
+    {"STATUS",          GRUB_PCI_REG_STATUS      , 2},
+    {"REVISION",        GRUB_PCI_REG_REVISION    , 1},
+    {"CLASS_PROG",      GRUB_PCI_REG_CLASS + 1   , 1},
+    {"CLASS_DEVICE",    GRUB_PCI_REG_CLASS + 2   , 2},
+    {"CACHE_LINE_SIZE", GRUB_PCI_REG_CACHELINE   , 1},
+    {"LATENCY_TIMER",   GRUB_PCI_REG_LAT_TIMER   , 1},
+    {"HEADER_TYPE",     GRUB_PCI_REG_HEADER_TYPE , 1},
+    {"BIST",            GRUB_PCI_REG_BIST        , 1},
+    {"BASE_ADDRESS_0",  GRUB_PCI_REG_ADDRESS_REG0, 4},
+    {"BASE_ADDRESS_1",  GRUB_PCI_REG_ADDRESS_REG1, 4},
+    {"BASE_ADDRESS_2",  GRUB_PCI_REG_ADDRESS_REG2, 4},
+    {"BASE_ADDRESS_3",  GRUB_PCI_REG_ADDRESS_REG3, 4},
+    {"BASE_ADDRESS_4",  GRUB_PCI_REG_ADDRESS_REG4, 4},
+    {"BASE_ADDRESS_5",  GRUB_PCI_REG_ADDRESS_REG5, 4},
+    {"CARDBUS_CIS",     GRUB_PCI_REG_CIS_POINTER , 4},
+    {"SUBVENDOR_ID",    GRUB_PCI_REG_SUBVENDOR   , 2},
+    {"SUBSYSTEM_ID",    GRUB_PCI_REG_SUBSYSTEM   , 2},
+    {"ROM_ADDRESS",     GRUB_PCI_REG_ROM_ADDRESS , 4},
+    {"CAP_POINTER",     GRUB_PCI_REG_CAP_POINTER , 1},
+    {"INTERRUPT_LINE",  GRUB_PCI_REG_IRQ_LINE    , 1},
+    {"INTERRUPT_PIN",   GRUB_PCI_REG_IRQ_PIN     , 1},
+    {"MIN_GNT",         GRUB_PCI_REG_MIN_GNT     , 1},
+    {"MAX_LAT",         GRUB_PCI_REG_MIN_GNT     , 1},
+  };
+
+static const struct grub_arg_option options[] =
+  {
+    {0, 'd', 0, "Select device by vendor and device IDs.",
+     "[vendor]:[device]", ARG_TYPE_STRING},
+    {0, 's', 0, "Select device by its position on the bus.",
+     "[bus]:[slot][.func]", ARG_TYPE_STRING},
+    {0, 'v', 0, "Save read value into variable VARNAME.",
+     "VARNAME", ARG_TYPE_STRING},
+    {0, 0, 0, 0, 0, 0}
+  };
+
+static grub_uint32_t pciid_check_mask, pciid_check_value;
+static int bus, device, function;
+static int check_bus, check_device, check_function;
+static grub_uint32_t write_mask, regwrite;
+static int regsize;
+static grub_uint16_t regaddr;
+static const char *varname;
+
+static int NESTED_FUNC_ATTR
+grub_setpci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)
+{
+  grub_uint32_t regval = 0;
+  grub_pci_address_t addr;
+
+  if ((pciid & pciid_check_mask) != pciid_check_value)
+    return 0;
+
+  if (check_bus && grub_pci_get_bus (dev) != bus)
+    return 0;
+
+  if (check_device && grub_pci_get_device (dev) != device)
+    return 0;
+
+  if (check_function && grub_pci_get_function (dev) != device)
+    return 0;
+
+  addr = grub_pci_make_address (dev, regaddr);
+
+  switch (regsize)
+    {
+    case 1:
+      regval = grub_pci_read_byte (addr);
+      break;
+
+    case 2:
+      regval = grub_pci_read_word (addr);
+      break;
+
+    case 4:
+      regval = grub_pci_read (addr);
+      break;
+    }
+
+  if (varname)
+    {
+      char buf[sizeof ("XXXXXXXX")];
+      grub_sprintf (buf, "%x", regval);
+      grub_env_set (varname, buf);
+      return 1;
+    }
+
+  if (!write_mask)
+    {
+      grub_printf ("Register %x of %d:%d.%d is %x\n", regaddr,
+		   grub_pci_get_bus (dev),
+		   grub_pci_get_device (dev),
+		   grub_pci_get_function (dev),
+		   regval);
+      return 0;
+    }
+
+  regval = (regval & ~write_mask) | regwrite;
+
+  switch (regsize)
+    {
+    case 1:
+      grub_pci_write_byte (addr, regval);
+      break;
+
+    case 2:
+      grub_pci_write_word (addr, regval);
+      break;
+
+    case 4:
+      grub_pci_write (addr, regval);
+      break;
+    }
+
+  return 0;
+}
+
+static grub_err_t
+grub_cmd_setpci (grub_extcmd_t cmd, int argc, char **argv)
+{
+  const char *ptr;
+  unsigned i;
+
+  pciid_check_value = 0;
+  pciid_check_mask = 0;
+
+  if (cmd->state[0].set)
+    {
+      ptr = cmd->state[0].arg;
+      pciid_check_value |= (grub_strtoul (ptr, (char **) &ptr, 16) & 0xffff);
+      if (grub_errno == GRUB_ERR_BAD_NUMBER)
+	{
+	  grub_errno = GRUB_ERR_NONE;
+	  ptr = cmd->state[0].arg;
+	}
+      else
+	pciid_check_mask |= 0xffff;
+      if (grub_errno)
+	return grub_errno;
+      if (*ptr != ':')
+	return grub_error (GRUB_ERR_BAD_ARGUMENT, "Colon expected.");
+      ptr++;
+      pciid_check_value |= (grub_strtoul (ptr, (char **) &ptr, 16) & 0xffff)
+	<< 16;
+      if (grub_errno == GRUB_ERR_BAD_NUMBER)
+	grub_errno = GRUB_ERR_NONE;
+      else
+	pciid_check_mask |= 0xffff0000;
+    }
+
+  pciid_check_value &= pciid_check_mask;
+
+  check_bus = check_device = check_function = 0;
+
+  if (cmd->state[1].set)
+    {
+      const char *optr;
+      
+      ptr = cmd->state[1].arg;
+      optr = ptr;
+      bus = grub_strtoul (ptr, (char **) &ptr, 16);
+      if (grub_errno == GRUB_ERR_BAD_NUMBER)
+	{
+	  grub_errno = GRUB_ERR_NONE;
+	  ptr = optr;
+	}
+      else
+	check_bus = 1;
+      if (grub_errno)
+	return grub_errno;
+      if (*ptr != ':')
+	return grub_error (GRUB_ERR_BAD_ARGUMENT, "Colon expected.");
+      ptr++;
+      optr = ptr;
+      device = grub_strtoul (ptr, (char **) &ptr, 16);
+      if (grub_errno == GRUB_ERR_BAD_NUMBER)
+	{
+	  grub_errno = GRUB_ERR_NONE;
+	  ptr = optr;
+	}
+      else
+	check_device = 1;
+      if (*ptr == '.')
+	{
+	  ptr++;
+	  function = grub_strtoul (ptr, (char **) &ptr, 16);
+	  if (grub_errno)
+	    return grub_errno;
+	  check_function = 1;
+	}
+    }
+
+  if (cmd->state[2].set)
+    varname = cmd->state[2].arg;
+  else
+    varname = NULL;
+
+  write_mask = 0;
+
+  if (argc == 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "Command expected.");
+
+  if (argc > 1)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "Only one command is supported.");
+
+  ptr = argv[0];
+
+  for (i = 0; i < ARRAY_SIZE (pci_registers); i++)
+    {
+      if (grub_strncmp (ptr, pci_registers[i].name,
+			grub_strlen (pci_registers[i].name)) == 0)
+	break;
+    }
+  if (i == ARRAY_SIZE (pci_registers))
+    {
+      regsize = 0;
+      regaddr = grub_strtoul (ptr, (char **) &ptr, 16);
+      if (grub_errno)
+	return grub_error (GRUB_ERR_BAD_ARGUMENT, "Unknown register");
+    }
+  else
+    {
+      regaddr = pci_registers[i].addr;
+      regsize = pci_registers[i].size;
+      ptr += grub_strlen (pci_registers[i].name);
+    }
+
+  if (grub_errno)
+    return grub_errno;
+
+  if (*ptr == '+')
+    {
+      ptr++;
+      regaddr += grub_strtoul (ptr, (char **) &ptr, 16);
+      if (grub_errno)
+	return grub_errno;
+    }
+
+  if (grub_memcmp (ptr, ".L", sizeof (".L") - 1) == 0
+      || grub_memcmp (ptr, ".l", sizeof (".l") - 1) == 0)
+    {
+      regsize = 4;
+      ptr += sizeof (".l") - 1;
+    }
+  else if (grub_memcmp (ptr, ".W", sizeof (".W") - 1) == 0
+      || grub_memcmp (ptr, ".w", sizeof (".w") - 1) == 0)
+    {
+      regsize = 2;
+      ptr += sizeof (".w") - 1;
+    }
+  else if (grub_memcmp (ptr, ".B", sizeof (".B") - 1) == 0
+      || grub_memcmp (ptr, ".b", sizeof (".b") - 1) == 0)
+    {
+      regsize = 1;
+      ptr += sizeof (".b") - 1;
+    }
+
+  if (!regsize)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+		       "Unknown register size.");
+
+  write_mask = 0;
+  if (*ptr == '=')
+    {
+      ptr++;
+      regwrite = grub_strtoul (ptr, (char **) &ptr, 16);
+      if (grub_errno)
+	return grub_errno;
+      write_mask = 0xffffffff;
+      if (*ptr == ':')
+	{
+	  ptr++;
+	  write_mask = grub_strtoul (ptr, (char **) &ptr, 16);
+	  if (grub_errno)
+	    return grub_errno;
+	  write_mask = 0xffffffff;
+	}
+      regwrite &= write_mask;
+    }
+
+  if (write_mask && varname)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+		       "Option -v isn't valid for writes.");
+
+  grub_pci_iterate (grub_setpci_iter);
+  return GRUB_ERR_NONE;
+}
+
+static grub_extcmd_t cmd;
+
+GRUB_MOD_INIT(setpci)
+{
+  cmd = grub_register_extcmd ("setpci", grub_cmd_setpci, GRUB_COMMAND_FLAG_BOTH,
+			      "setpci [-s POSITION] [-d DEVICE] [-v VAR] "
+			      "[REGISTER][=VALUE[:MASK]]",
+			      "Manipulate PCI devices.", options);
+}
+
+GRUB_MOD_FINI(setpci)
+{
+  grub_unregister_extcmd (cmd);
+}
diff --git a/conf/i386.rmk b/conf/i386.rmk
index c3f036d0f..2c1edf62f 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -25,3 +25,9 @@ pkglib_MODULES += ata.mod
 ata_mod_SOURCES = disk/ata.c
 ata_mod_CFLAGS = $(COMMON_CFLAGS)
 ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For setpci.mod
+pkglib_MODULES += setpci.mod
+setpci_mod_SOURCES = commands/setpci.c
+setpci_mod_CFLAGS = $(COMMON_CFLAGS)
+setpci_mod_LDFLAGS = $(COMMON_LDFLAGS)

From e2a101ab76764f80afc62141f56520cfdeed65e8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 22 Dec 2009 17:18:48 +0100
Subject: [PATCH 0175/1628] I/O rw support

---
 commands/iorw.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++++
 conf/i386.rmk   |   6 ++
 2 files changed, 152 insertions(+)
 create mode 100644 commands/iorw.c

diff --git a/commands/iorw.c b/commands/iorw.c
new file mode 100644
index 000000000..5e685a264
--- /dev/null
+++ b/commands/iorw.c
@@ -0,0 +1,146 @@
+/* memrw.c - command to read / write physical memory  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/extcmd.h>
+#include <grub/env.h>
+#include <grub/cpu/io.h>
+
+static grub_extcmd_t cmd_read_byte, cmd_read_word, cmd_read_dword;
+static grub_command_t cmd_write_byte, cmd_write_word, cmd_write_dword;
+
+static const struct grub_arg_option options[] =
+  {
+    {0, 'v', 0, "Save read value into variable VARNAME.",
+     "VARNAME", ARG_TYPE_STRING},
+    {0, 0, 0, 0, 0, 0}
+  };
+
+
+static grub_err_t
+grub_cmd_read (grub_extcmd_t cmd, int argc, char **argv)
+{
+  grub_target_addr_t addr;
+  grub_uint32_t value = 0;
+  char buf[sizeof ("XXXXXXXX")];
+
+  if (argc != 1)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "Invalid number of arguments");
+
+  addr = grub_strtoul (argv[0], 0, 0);
+  switch (cmd->cmd->name[sizeof ("grub_in") - 1])
+    {
+    case 'l':
+      value = grub_inl (addr);
+      break;
+
+    case 'w':
+      value = grub_inw (addr);
+      break;
+
+    case 'b':
+      value = grub_inb (addr);
+      break;
+    }
+
+  if (cmd->state[0].set)
+    {
+      grub_sprintf (buf, "%x", value);
+      grub_env_set (cmd->state[0].arg, buf);
+    }
+  else
+    grub_printf ("0x%x\n", value);
+
+  return 0;
+}
+
+static grub_err_t
+grub_cmd_write (grub_command_t cmd, int argc, char **argv)
+{
+  grub_target_addr_t addr;
+  grub_uint32_t value;
+  grub_uint32_t mask = 0xffffffff;
+
+  if (argc != 2 && argc != 3)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "Invalid number of arguments");
+
+  addr = grub_strtoul (argv[0], 0, 0);
+  value = grub_strtoul (argv[1], 0, 0);
+  if (argc == 3)
+    mask = grub_strtoul (argv[2], 0, 0);
+  value &= mask;
+  switch (cmd->name[sizeof ("grub_out") - 1])
+    {
+    case 'l':
+      if (mask != 0xffffffff)
+	grub_outl ((grub_inl (addr) & ~mask) | value, addr);
+      else
+	grub_outl (value, addr);
+      break;
+
+    case 'w':
+      if ((mask & 0xffff) != 0xffff)
+	grub_outw ((grub_inw (addr) & ~mask) | value, addr);
+      else
+	grub_outw (value, addr);
+      break;
+
+    case 'b':
+      if ((mask & 0xff) != 0xff)
+	grub_outb ((grub_inb (addr) & ~mask) | value, addr);
+      else
+	grub_outb (value, addr);
+      break;
+    }
+
+  return 0;
+}
+
+GRUB_MOD_INIT(memrw)
+{
+  cmd_read_byte =
+    grub_register_extcmd ("grub_inb", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
+			  "grub_inb PORT", "Read byte from PORT.", options);
+  cmd_read_word =
+    grub_register_extcmd ("grub_inw", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
+			  "grub_inw PORT", "Read word from PORT.", options);
+  cmd_read_dword =
+    grub_register_extcmd ("grub_inl", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
+			  "grub_inl PORT", "Read dword from PORT.", options);
+  cmd_write_byte =
+    grub_register_command ("grub_outb", grub_cmd_write,
+			   "grub_outb PORT VALUE [MASK]", "Write byte VALUE to PORT.");
+  cmd_write_word =
+    grub_register_command ("grub_outw", grub_cmd_write,
+			   "grub_outw PORT VALUE [MASK]", "Write word VALUE to PORT.");
+  cmd_write_dword =
+    grub_register_command ("grub_outl", grub_cmd_write,
+			   "grub_outl ADDR VALUE [MASK]", "Write dword VALUE to PORT.");
+}
+
+GRUB_MOD_FINI(memrw)
+{
+  grub_unregister_extcmd (cmd_read_byte);
+  grub_unregister_extcmd (cmd_read_word);
+  grub_unregister_extcmd (cmd_read_dword);
+  grub_unregister_command (cmd_write_byte);
+  grub_unregister_command (cmd_write_word);
+  grub_unregister_command (cmd_write_dword);
+}
diff --git a/conf/i386.rmk b/conf/i386.rmk
index c3f036d0f..45d2c0818 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -25,3 +25,9 @@ pkglib_MODULES += ata.mod
 ata_mod_SOURCES = disk/ata.c
 ata_mod_CFLAGS = $(COMMON_CFLAGS)
 ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For iorw.mod.
+pkglib_MODULES += iorw.mod
+iorw_mod_SOURCES = commands/iorw.c
+iorw_mod_CFLAGS = $(COMMON_CFLAGS)
+iorw_mod_LDFLAGS = $(COMMON_LDFLAGS)

From 9b1209ba15cc0cddaf965f98777eb6cbd1213129 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 26 Dec 2009 02:37:01 +0100
Subject: [PATCH 0176/1628] Cache loaded theme

---
 gfxmenu/gfxmenu.c           | 63 +++++++++++++++++++++++++++-----
 gfxmenu/view.c              | 71 ++++++++-----------------------------
 include/grub/gfxmenu_view.h |  3 +-
 3 files changed, 70 insertions(+), 67 deletions(-)

diff --git a/gfxmenu/gfxmenu.c b/gfxmenu/gfxmenu.c
index 0d807914b..f39cdbbfe 100644
--- a/gfxmenu/gfxmenu.c
+++ b/gfxmenu/gfxmenu.c
@@ -37,21 +37,39 @@
 #include <grub/gfxmenu_view.h>
 #include <grub/time.h>
 
-void 
-grub_gfxmenu_viewer_fini (void *data)
-{
-  grub_gfxmenu_view_t view = data;
+grub_gfxmenu_view_t cached_view;
 
-  grub_gfxmenu_view_destroy (view);
+static grub_err_t
+set_graphics_mode (void)
+{
+  const char *modestr = grub_env_get ("gfxmode");
+  if (!modestr || !modestr[0])
+    modestr = "auto";
+  return grub_video_set_mode (modestr, GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
+}
+
+/* FIXME: conflicts with gfxterm.  */
+static grub_err_t
+set_text_mode (void)
+{
+  return grub_video_restore ();
+}
+
+void 
+grub_gfxmenu_viewer_fini (void *data __attribute__ ((unused)))
+{
+  set_text_mode ();
 }
 
 /* FIXME: 't' and 'c'.  */
 grub_err_t
 grub_gfxmenu_try (int entry, grub_menu_t menu, int nested)
 {
-  grub_gfxmenu_view_t view;
+  grub_gfxmenu_view_t view = NULL;
   const char *theme_path;
   struct grub_menu_viewer *instance;
+  grub_err_t err;
+  struct grub_video_mode_info mode_info;
 
   theme_path = grub_env_get ("theme");
   if (! theme_path)
@@ -61,15 +79,41 @@ grub_gfxmenu_try (int entry, grub_menu_t menu, int nested)
   if (!instance)
     return grub_errno;
 
-  /* Create the view.  */
-  view = grub_gfxmenu_view_new (theme_path, menu, entry, nested);
+  set_graphics_mode ();
+  err = grub_video_get_info (&mode_info);
+  if (err)
+    {
+      set_text_mode ();
+      return 0;
+    }
 
-  if (! view)
+  if (!cached_view || grub_strcmp (cached_view->theme_path, theme_path) != 0
+      || cached_view->screen.width != (int) mode_info.width
+      || cached_view->screen.height != (int) mode_info.height)
+    {
+      grub_free (cached_view);
+      /* Create the view.  */
+      cached_view = grub_gfxmenu_view_new (theme_path, mode_info.width,
+					   mode_info.height);
+    }
+
+  if (! cached_view)
     {
       grub_free (instance);
+      set_text_mode ();
       return grub_errno;
     }
 
+  view = cached_view;
+
+  view->double_repaint = (mode_info.mode_type
+			  & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED)
+    && !(mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
+  view->selected = entry;
+  view->menu = menu;
+  view->nested = nested;
+  view->first_timeout = -1;
+
   grub_gfxmenu_view_draw (view);
 
   instance->data = view;
@@ -90,5 +134,6 @@ GRUB_MOD_INIT (gfxmenu)
 
 GRUB_MOD_FINI (gfxmenu)
 {
+  grub_gfxmenu_view_destroy (cached_view);
   grub_gfxmenu_try_hook = NULL;
 }
diff --git a/gfxmenu/view.c b/gfxmenu/view.c
index 882469447..8c460ff88 100644
--- a/gfxmenu/view.c
+++ b/gfxmenu/view.c
@@ -45,62 +45,31 @@
 static grub_gfxmenu_view_t term_view;
 #endif
 
-static grub_err_t set_graphics_mode (void);
-static grub_err_t set_text_mode (void);
-
 /* Create a new view object, loading the theme specified by THEME_PATH and
    associating MODEL with the view.  */
 grub_gfxmenu_view_t
-grub_gfxmenu_view_new (const char *theme_path, grub_menu_t menu, int entry,
-		       int nested)
+grub_gfxmenu_view_new (const char *theme_path,
+		       int width, int height)
 {
   grub_gfxmenu_view_t view;
-  grub_err_t err;
-  struct grub_video_mode_info mode_info;
+  grub_font_t default_font;
+  grub_gui_color_t default_fg_color;
+  grub_gui_color_t default_bg_color;
 
   view = grub_malloc (sizeof (*view));
   if (! view)
     return 0;
 
-  set_graphics_mode ();
-  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
-  grub_video_get_viewport ((unsigned *) &view->screen.x,
-                           (unsigned *) &view->screen.y,
-                           (unsigned *) &view->screen.width,
-                           (unsigned *) &view->screen.height);
-
-  err = grub_video_get_info (&mode_info);
-  if (err)
-    {
-      grub_free (view);
-      return 0;
-    }
-  else
-    view->double_repaint = (mode_info.mode_type
-			    & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED)
-      && !(mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
-
-
-  /* Clear the screen; there may be garbage left over in video memory, and
-     loading the menu style (particularly the background) can take a while. */
-  grub_video_fill_rect (grub_video_map_rgb (0, 0, 0),
-                        view->screen.x, view->screen.y,
-                        view->screen.width, view->screen.height);
-  grub_video_swap_buffers ();
-
-  grub_font_t default_font;
-  grub_gui_color_t default_fg_color;
-  grub_gui_color_t default_bg_color;
+  view->screen.x = 0;
+  view->screen.y = 0;
+  view->screen.width = width;
+  view->screen.height = height;
 
   default_font = grub_font_get ("Helvetica 12");
   default_fg_color = grub_gui_color_rgb (0, 0, 0);
   default_bg_color = grub_gui_color_rgb (255, 255, 255);
 
   view->canvas = 0;
-  view->selected = entry;
-  view->menu = menu;
-  view->nested = nested;
-  view->first_timeout = -1;
 
   view->title_font = default_font;
   view->message_font = default_font;
@@ -151,7 +120,6 @@ grub_gfxmenu_view_destroy (grub_gfxmenu_view_t view)
     view->canvas->ops->component.destroy (view->canvas);
   grub_free (view);
 
-  set_text_mode ();
 #if 0
   destroy_terminal ();
 #endif
@@ -376,6 +344,12 @@ grub_gfxmenu_view_redraw (grub_gfxmenu_view_t view,
 void
 grub_gfxmenu_view_draw (grub_gfxmenu_view_t view)
 {
+  /* Clear the screen; there may be garbage left over in video memory. */
+  grub_video_fill_rect (grub_video_map_rgb (0, 0, 0),
+                        view->screen.x, view->screen.y,
+                        view->screen.width, view->screen.height);
+  grub_video_swap_buffers ();
+
   update_menu_components (view);
 
   grub_gfxmenu_view_redraw (view, &view->screen);
@@ -426,21 +400,6 @@ grub_gfxmenu_set_chosen_entry (int entry, void *data)
 }
 
 
-static grub_err_t
-set_graphics_mode (void)
-{
-  const char *modestr = grub_env_get ("gfxmode");
-  if (!modestr || !modestr[0])
-    modestr = "auto";
-  return grub_video_set_mode (modestr, GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
-}
-
-static grub_err_t
-set_text_mode (void)
-{
-  return grub_video_restore ();
-}
-
 /* FIXME */
 #if 0
 static int term_target_width;
diff --git a/include/grub/gfxmenu_view.h b/include/grub/gfxmenu_view.h
index 92cedc6a7..1b83cc5a3 100644
--- a/include/grub/gfxmenu_view.h
+++ b/include/grub/gfxmenu_view.h
@@ -31,8 +31,7 @@ typedef struct grub_gfxmenu_view *grub_gfxmenu_view_t;
 
 
 grub_gfxmenu_view_t grub_gfxmenu_view_new (const char *theme_path,
-                                           grub_menu_t menu, int entry,
-					   int nested);
+					   int width, int height);
 
 void grub_gfxmenu_view_destroy (grub_gfxmenu_view_t view);
 

From d3ee2d201e3a241ee1f39e9a2a2e3e6580579186 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 26 Dec 2009 16:41:54 +0100
Subject: [PATCH 0177/1628] Various fixes to make gfxmenu work smoothly in
 multioutput environment

---
 gfxmenu/gfxmenu.c           |  43 +++++-----
 gfxmenu/view.c              | 109 ++++++++++----------------
 include/grub/gfxmenu_view.h |   8 --
 include/grub/gfxterm.h      |  18 +++--
 include/grub/menu.h         |   4 -
 term/gfxterm.c              | 152 ++++++++++++++++--------------------
 6 files changed, 137 insertions(+), 197 deletions(-)

diff --git a/gfxmenu/gfxmenu.c b/gfxmenu/gfxmenu.c
index f39cdbbfe..b093ec49e 100644
--- a/gfxmenu/gfxmenu.c
+++ b/gfxmenu/gfxmenu.c
@@ -39,26 +39,9 @@
 
 grub_gfxmenu_view_t cached_view;
 
-static grub_err_t
-set_graphics_mode (void)
-{
-  const char *modestr = grub_env_get ("gfxmode");
-  if (!modestr || !modestr[0])
-    modestr = "auto";
-  return grub_video_set_mode (modestr, GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
-}
-
-/* FIXME: conflicts with gfxterm.  */
-static grub_err_t
-set_text_mode (void)
-{
-  return grub_video_restore ();
-}
-
 void 
 grub_gfxmenu_viewer_fini (void *data __attribute__ ((unused)))
 {
-  set_text_mode ();
 }
 
 /* FIXME: 't' and 'c'.  */
@@ -73,18 +56,23 @@ grub_gfxmenu_try (int entry, grub_menu_t menu, int nested)
 
   theme_path = grub_env_get ("theme");
   if (! theme_path)
-    return grub_error (GRUB_ERR_FILE_NOT_FOUND, "no theme specified");
+    {
+      grub_gfxterm_fullscreen ();
+      return grub_error (GRUB_ERR_FILE_NOT_FOUND, "no theme specified");
+    }
 
   instance = grub_zalloc (sizeof (*instance));
   if (!instance)
-    return grub_errno;
+    {
+      grub_gfxterm_fullscreen ();
+      return grub_errno;
+    }
 
-  set_graphics_mode ();
   err = grub_video_get_info (&mode_info);
   if (err)
     {
-      set_text_mode ();
-      return 0;
+      grub_gfxterm_fullscreen ();
+      return err;
     }
 
   if (!cached_view || grub_strcmp (cached_view->theme_path, theme_path) != 0
@@ -100,7 +88,7 @@ grub_gfxmenu_try (int entry, grub_menu_t menu, int nested)
   if (! cached_view)
     {
       grub_free (instance);
-      set_text_mode ();
+      grub_gfxterm_fullscreen ();
       return grub_errno;
     }
 
@@ -129,6 +117,15 @@ grub_gfxmenu_try (int entry, grub_menu_t menu, int nested)
 
 GRUB_MOD_INIT (gfxmenu)
 {
+  struct grub_term_output *term;
+
+  FOR_ACTIVE_TERM_OUTPUTS(term)
+    if (grub_gfxmenu_try_hook && grub_strcmp (term->name, "gfxterm") == 0)
+      {
+	grub_gfxterm_fullscreen ();
+	break;
+      }
+
   grub_gfxmenu_try_hook = grub_gfxmenu_try;
 }
 
diff --git a/gfxmenu/view.c b/gfxmenu/view.c
index 8c460ff88..a7ca14530 100644
--- a/gfxmenu/view.c
+++ b/gfxmenu/view.c
@@ -41,9 +41,10 @@
    status changes.  */
 #define TIMEOUT_COMPONENT_ID "__timeout__"
 
-#if 0
+static void
+init_terminal (grub_gfxmenu_view_t view);
+static grub_video_rect_t term_rect;
 static grub_gfxmenu_view_t term_view;
-#endif
 
 /* Create a new view object, loading the theme specified by THEME_PATH and
    associating MODEL with the view.  */
@@ -98,10 +99,6 @@ grub_gfxmenu_view_new (const char *theme_path,
       return 0;
     }
 
-#if 0
-  init_terminal (view);
-#endif
-
   return view;
 }
 
@@ -119,26 +116,8 @@ grub_gfxmenu_view_destroy (grub_gfxmenu_view_t view)
   if (view->canvas)
     view->canvas->ops->component.destroy (view->canvas);
   grub_free (view);
-
-#if 0
-  destroy_terminal ();
-#endif
 }
 
-#if 0
-/* Sets MESSAGE as the progress message for the view.
-   MESSAGE can be 0, in which case no message is displayed.  */
-static void
-set_progress_message (grub_gfxmenu_view_t view, const char *message)
-{
-  grub_free (view->progress_message_text);
-  if (message)
-    view->progress_message_text = grub_strdup (message);
-  else
-    view->progress_message_text = 0;
-}
-#endif
-
 static void
 redraw_background (grub_gfxmenu_view_t view,
 		   const grub_video_rect_t *bounds)
@@ -331,6 +310,9 @@ void
 grub_gfxmenu_view_redraw (grub_gfxmenu_view_t view,
 			  const grub_video_rect_t *region)
 {
+  if (grub_video_have_common_points (&term_rect, region))
+    grub_gfxterm_schedule_repaint ();
+
   grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
 
   redraw_background (view, region);
@@ -344,11 +326,17 @@ grub_gfxmenu_view_redraw (grub_gfxmenu_view_t view,
 void
 grub_gfxmenu_view_draw (grub_gfxmenu_view_t view)
 {
+  init_terminal (view);
+
   /* Clear the screen; there may be garbage left over in video memory. */
   grub_video_fill_rect (grub_video_map_rgb (0, 0, 0),
                         view->screen.x, view->screen.y,
                         view->screen.width, view->screen.height);
   grub_video_swap_buffers ();
+  if (view->double_repaint)
+    grub_video_fill_rect (grub_video_map_rgb (0, 0, 0),
+			  view->screen.x, view->screen.y,
+			  view->screen.width, view->screen.height);
 
   update_menu_components (view);
 
@@ -399,77 +387,60 @@ grub_gfxmenu_set_chosen_entry (int entry, void *data)
   grub_gfxmenu_redraw_menu (view);
 }
 
-
-/* FIXME */
-#if 0
-static int term_target_width;
-static int term_target_height;
-static int term_initialized;
-static grub_term_output_t term_original;
-
 static void
-draw_terminal_box (grub_gfxmenu_view_t view)
+grub_gfxmenu_draw_terminal_box (void)
 {
   grub_gfxmenu_box_t term_box;
-  int termx;
-  int termy;
 
   term_box = term_view->terminal_box;
   if (!term_box)
     return;
-
-  termx = term_view->screen.x + term_view->screen.width * (10 - 7) / 10 / 2;
-  termy = term_view->screen.y + term_view->screen.height * (10 - 7) / 10 / 2;
   
-  term_box->set_content_size (term_box, term_target_width,
-			      term_target_height);
+  term_box->set_content_size (term_box, term_rect.width,
+			      term_rect.height);
   
   term_box->draw (term_box,
-		  termx - term_box->get_left_pad (term_box),
-		  termy - term_box->get_top_pad (term_box));
+		  term_rect.x - term_box->get_left_pad (term_box),
+		  term_rect.y - term_box->get_top_pad (term_box));
   grub_video_swap_buffers ();
-  if (view->double_repaint)
+  if (term_view->double_repaint)
     term_box->draw (term_box,
-		    termx - term_box->get_left_pad (term_box),
-		    termy - term_box->get_top_pad (term_box));
+		    term_rect.x - term_box->get_left_pad (term_box),
+		    term_rect.y - term_box->get_top_pad (term_box));
 }
 
 static void
 init_terminal (grub_gfxmenu_view_t view)
 {
-  int termx;
-  int termy;
+  term_rect.width = view->screen.width * 7 / 10;
+  term_rect.height = view->screen.height * 7 / 10;
 
-  term_original = grub_term_get_current_output ();
+  term_rect.x = view->screen.x + view->screen.width * (10 - 7) / 10 / 2;
+  term_rect.y = view->screen.y + view->screen.height * (10 - 7) / 10 / 2;
 
-  term_target_width = view->screen.width * 7 / 10;
-  term_target_height = view->screen.height * 7 / 10;
-
-  termx = view->screen.x + view->screen.width * (10 - 7) / 10 / 2;
-  termy = view->screen.y + view->screen.height * (10 - 7) / 10 / 2;
+  term_view = view;
 
   /* Note: currently there is no API for changing the gfxterm font
      on the fly, so whatever font the initially loaded theme specifies
      will be permanent.  */
-  grub_gfxterm_init_window (GRUB_VIDEO_RENDER_TARGET_DISPLAY, termx, termy,
-                            term_target_width, term_target_height,
-			    view->double_repaint, view->terminal_font_name, 3);
-  if (grub_errno != GRUB_ERR_NONE)
-    return;
-  term_initialized = 1;
-
-  term_view = view;
-
-  grub_term_set_current_output (grub_gfxterm_get_term ());
-  grub_refresh ();
+  grub_gfxterm_set_window (GRUB_VIDEO_RENDER_TARGET_DISPLAY, term_rect.x,
+			   term_rect.y,
+			   term_rect.width, term_rect.height,
+			   view->double_repaint, view->terminal_font_name, 3);
+  grub_gfxterm_decorator_hook = grub_gfxmenu_draw_terminal_box;
 }
 
-static void destroy_terminal (void)
+#if 0
+/* Sets MESSAGE as the progress message for the view.
+   MESSAGE can be 0, in which case no message is displayed.  */
+static void
+set_progress_message (grub_gfxmenu_view_t view, const char *message)
 {
-  if (term_initialized)
-    grub_gfxterm_destroy_window ();
-  if (term_original)
-    grub_term_set_current_output (term_original);
+  grub_free (view->progress_message_text);
+  if (message)
+    view->progress_message_text = grub_strdup (message);
+  else
+    view->progress_message_text = 0;
 }
 
 static void
diff --git a/include/grub/gfxmenu_view.h b/include/grub/gfxmenu_view.h
index 1b83cc5a3..7cbfa89d3 100644
--- a/include/grub/gfxmenu_view.h
+++ b/include/grub/gfxmenu_view.h
@@ -45,14 +45,6 @@ grub_err_t grub_gui_recreate_box (grub_gfxmenu_box_t *boxptr,
 
 void grub_gfxmenu_view_draw (grub_gfxmenu_view_t view);
 
-int grub_gfxmenu_view_execute_with_fallback (grub_gfxmenu_view_t view,
-                                             grub_menu_entry_t entry);
-
-int grub_gfxmenu_view_execute_entry (grub_gfxmenu_view_t view,
-                                     grub_menu_entry_t entry);
-
-void grub_gfxmenu_view_run_terminal (grub_gfxmenu_view_t view);
-
 void
 grub_gfxmenu_redraw_menu (grub_gfxmenu_view_t view);
 
diff --git a/include/grub/gfxterm.h b/include/grub/gfxterm.h
index e607bd5e1..fe3da7409 100644
--- a/include/grub/gfxterm.h
+++ b/include/grub/gfxterm.h
@@ -25,18 +25,20 @@
 #include <grub/video.h>
 
 grub_err_t
-grub_gfxterm_init_window (struct grub_video_render_target *target,
-                          int x, int y, int width, int height,
-			  int double_repaint,
-                          const char *font_name, int border_width);
-
-void grub_gfxterm_destroy_window (void);
-
-const struct grub_term_output *grub_gfxterm_get_term (void);
+grub_gfxterm_set_window (struct grub_video_render_target *target,
+			 int x, int y, int width, int height,
+			 int double_repaint,
+			 const char *font_name, int border_width);
 
 typedef void (*grub_gfxterm_repaint_callback_t)(int x, int y,
                                                 int width, int height);
 
 void grub_gfxterm_set_repaint_callback (grub_gfxterm_repaint_callback_t func);
 
+void grub_gfxterm_schedule_repaint (void);
+
+grub_err_t grub_gfxterm_fullscreen (void);
+
+extern void (*grub_gfxterm_decorator_hook) (void);
+
 #endif /* ! GRUB_GFXTERM_HEADER */
diff --git a/include/grub/menu.h b/include/grub/menu.h
index 20a1fc47f..78f461b92 100644
--- a/include/grub/menu.h
+++ b/include/grub/menu.h
@@ -83,10 +83,6 @@ typedef struct grub_menu_execute_callback
 }
 *grub_menu_execute_callback_t;
 
-extern grub_err_t (*grub_gfxmenu_try_hook) (int entry, grub_menu_t menu,
-					    int nested);
-
-
 grub_menu_entry_t grub_menu_get_entry (grub_menu_t menu, int no);
 int grub_menu_get_timeout (void);
 void grub_menu_set_timeout (int timeout);
diff --git a/term/gfxterm.c b/term/gfxterm.c
index eb2c47c3d..8ef7d848b 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -115,20 +115,16 @@ struct grub_gfxterm_window
   int double_repaint;
 };
 
-static int refcount;
 static struct grub_video_render_target *render_target;
+void (*grub_gfxterm_decorator_hook) (void) = NULL;
 static struct grub_gfxterm_window window;
 static struct grub_virtual_screen virtual_screen;
 static grub_gfxterm_repaint_callback_t repaint_callback;
-
-static grub_err_t init_window (struct grub_video_render_target *target,
-                               int x, int y, int width, int height, 
-			       int double_repaint,
-                               const char *font_name, int border_width);
+static int repaint_schedulded = 0;
+static int repaint_was_schedulded = 0;
 
 static void destroy_window (void);
 
-
 static struct grub_video_render_target *text_layer;
 
 static unsigned int bitmap_width;
@@ -271,10 +267,17 @@ grub_virtual_screen_setup (unsigned int x, unsigned int y,
   return grub_errno;
 }
 
-static grub_err_t
-init_window (struct grub_video_render_target *target,
-             int x, int y, int width, int height, int double_repaint,
-             const char *font_name, int border_width)
+void
+grub_gfxterm_schedule_repaint (void)
+{
+  repaint_schedulded = 1;
+}
+
+grub_err_t
+grub_gfxterm_set_window (struct grub_video_render_target *target,
+			 int x, int y, int width, int height,
+			 int double_repaint,
+			 const char *font_name, int border_width)
 {
   /* Clean up any prior instance.  */
   destroy_window ();
@@ -299,45 +302,55 @@ init_window (struct grub_video_render_target *target,
   window.height = height;
   window.double_repaint = double_repaint;
 
-  /* Mark whole window as dirty.  */
   dirty_region_reset ();
-  dirty_region_add (0, 0, width, height);
+  grub_gfxterm_schedule_repaint ();
 
   return grub_errno;
 }
 
 grub_err_t
-grub_gfxterm_init_window (struct grub_video_render_target *target,
-                          int x, int y, int width, int height,
-			  int double_repaint,
-                          const char *font_name, int border_width)
-{
-  if (refcount++ == 0)
-    init_window (target, x, y, width, height, double_repaint,
-		 font_name, border_width);
-  return grub_errno;
-}
-
-static grub_err_t
-grub_gfxterm_init (void)
+grub_gfxterm_fullscreen (void)
 {
   const char *font_name;
-  const char *modevar;
   struct grub_video_mode_info mode_info;
-  char *tmp;
-  grub_err_t err;
   grub_video_color_t color;
+  grub_err_t err;
 
-  /* If gfxterm has already been initialized by calling the init_window
-     function, then leave it alone when it is set as the current terminal.  */
-  if (refcount++ != 0)
-    return GRUB_ERR_NONE;
+  err = grub_video_get_info (&mode_info);
+  /* Figure out what mode we ended up.  */
+  if (err)
+    return err;
+
+  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
+
+  /* Make sure screen is black.  */
+  color = grub_video_map_rgb (0, 0, 0);
+  grub_video_fill_rect (color, 0, 0, mode_info.width, mode_info.height);
+  bitmap = 0;
 
   /* Select the font to use.  */
   font_name = grub_env_get ("gfxterm_font");
   if (! font_name)
     font_name = "";   /* Allow fallback to any font.  */
 
+  grub_gfxterm_decorator_hook = NULL;
+
+  return grub_gfxterm_set_window (GRUB_VIDEO_RENDER_TARGET_DISPLAY,
+				  0, 0, mode_info.width, mode_info.height,
+				  mode_info.mode_type
+				  & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
+				  && !(mode_info.mode_type 
+				       & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP),
+				  font_name, DEFAULT_BORDER_WIDTH);
+}
+
+static grub_err_t
+grub_gfxterm_init (void)
+{
+  char *tmp;
+  grub_err_t err;
+  const char *modevar;
+
   /* Parse gfxmode environment variable if set.  */
   modevar = grub_env_get ("gfxmode");
   if (! modevar || *modevar == 0)
@@ -358,35 +371,11 @@ grub_gfxterm_init (void)
   if (err)
     return err;
 
-  err = grub_video_get_info (&mode_info);
-  /* Figure out what mode we ended up.  */
+  err = grub_gfxterm_fullscreen ();
   if (err)
-    return err;
+    grub_video_restore ();
 
-  /* Make sure screen is black.  */
-  color = grub_video_map_rgb (0, 0, 0);
-  grub_video_fill_rect (color, 0, 0, mode_info.width, mode_info.height);
-  bitmap = 0;
-
-  /* Select the font to use.  */
-  font_name = grub_env_get ("gfxterm_font");
-  if (! font_name)
-    font_name = "";   /* Allow fallback to any font.  */
-
-  /* Leave borders for virtual screen.  */
-  if (init_window (GRUB_VIDEO_RENDER_TARGET_DISPLAY,
-                   0, 0, mode_info.width, mode_info.height,
-		   mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
-		   && !(mode_info.mode_type 
-			& GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP),
-                   font_name, 
-                   DEFAULT_BORDER_WIDTH) != GRUB_ERR_NONE)
-    {
-      grub_video_restore ();
-      return grub_errno;
-    }
-
-  return grub_errno;
+  return err;
 }
 
 static void
@@ -402,26 +391,15 @@ destroy_window (void)
   grub_virtual_screen_free ();
 }
 
-void
-grub_gfxterm_destroy_window (void)
-{
-  if (--refcount == 0)
-    destroy_window ();
-}
-
 static grub_err_t
 grub_gfxterm_fini (void)
 {
-  /* Don't destroy an explicitly initialized terminal instance when it is
-     unset as the current terminal.  */
-  if (--refcount == 0)
-    {
-      destroy_window ();
-      grub_video_restore ();
-    }
+  destroy_window ();
+  grub_video_restore ();
 
   /* Clear error state.  */
-  return (grub_errno = GRUB_ERR_NONE);
+  grub_errno = GRUB_ERR_NONE;
+  return GRUB_ERR_NONE;
 }
 
 static void
@@ -521,6 +499,7 @@ dirty_region_reset (void)
   dirty_region.top_left_y = -1;
   dirty_region.bottom_right_x = -1;
   dirty_region.bottom_right_y = -1;
+  repaint_was_schedulded = 0;
 }
 
 static int
@@ -540,6 +519,16 @@ dirty_region_add (int x, int y, unsigned int width, unsigned int height)
   if ((width == 0) || (height == 0))
     return;
 
+  if (repaint_schedulded)
+    {
+      x = virtual_screen.offset_x;
+      y = virtual_screen.offset_y;
+      width = virtual_screen.width;
+      height = virtual_screen.height;
+      repaint_schedulded = 0;
+      repaint_was_schedulded = 1;
+    }
+
   if (dirty_region_is_empty ())
     {
       dirty_region.top_left_x = x;
@@ -586,6 +575,9 @@ dirty_region_redraw (void)
   width = dirty_region.bottom_right_x - x + 1;
   height = dirty_region.bottom_right_y - y + 1;
 
+  if (repaint_was_schedulded && grub_gfxterm_decorator_hook)
+    grub_gfxterm_decorator_hook ();
+
   redraw_screen_rect (x, y, width, height);
 }
 
@@ -1109,7 +1101,6 @@ grub_gfxterm_background_image_cmd (grub_extcmd_t cmd __attribute__ ((unused)),
       bitmap = 0;
 
       /* Mark whole screen as dirty.  */
-      dirty_region_reset ();
       dirty_region_add (0, 0, window.width, window.height);
     }
 
@@ -1152,7 +1143,6 @@ grub_gfxterm_background_image_cmd (grub_extcmd_t cmd __attribute__ ((unused)),
         bitmap_height = grub_video_bitmap_get_height (bitmap);
 
         /* Mark whole screen as dirty.  */
-        dirty_region_reset ();
         dirty_region_add (0, 0, window.width, window.height);
       }
     }
@@ -1182,18 +1172,10 @@ static struct grub_term_output grub_video_term =
     .next = 0
   };
 
-const struct grub_term_output *
-grub_gfxterm_get_term (void)
-{
-  return &grub_video_term;
-}
-
 static grub_extcmd_t background_image_cmd_handle;
 
 GRUB_MOD_INIT(term_gfxterm)
 {
-  refcount = 0;
-
   grub_term_register_output ("gfxterm", &grub_video_term);
   background_image_cmd_handle =
     grub_register_extcmd ("background_image",

From 4cc972be91c947f12a9edcd10946ae1119494fe7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 26 Dec 2009 16:58:01 +0100
Subject: [PATCH 0178/1628] Clarify FIXME comments.

---
 gfxmenu/gfxmenu.c | 2 +-
 gfxmenu/view.c    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfxmenu/gfxmenu.c b/gfxmenu/gfxmenu.c
index b093ec49e..1fe6e7297 100644
--- a/gfxmenu/gfxmenu.c
+++ b/gfxmenu/gfxmenu.c
@@ -44,7 +44,7 @@ grub_gfxmenu_viewer_fini (void *data __attribute__ ((unused)))
 {
 }
 
-/* FIXME: 't' and 'c'.  */
+/* FIXME: Previously 't' changed to text menu is it necessary?  */
 grub_err_t
 grub_gfxmenu_try (int entry, grub_menu_t menu, int nested)
 {
diff --git a/gfxmenu/view.c b/gfxmenu/view.c
index a7ca14530..c32211261 100644
--- a/gfxmenu/view.c
+++ b/gfxmenu/view.c
@@ -430,6 +430,9 @@ init_terminal (grub_gfxmenu_view_t view)
   grub_gfxterm_decorator_hook = grub_gfxmenu_draw_terminal_box;
 }
 
+/* FIXME: previously notifications were displayed in special case.
+   Is it necessary?
+ */
 #if 0
 /* Sets MESSAGE as the progress message for the view.
    MESSAGE can be 0, in which case no message is displayed.  */

From 3251f0f88be2499e889c7b8634b9d12d253af28b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 27 Dec 2009 16:37:18 +0100
Subject: [PATCH 0179/1628] Regexp support

---
 ChangeLog.regexp           |   17 +
 commands/regexp.c          |   79 +
 conf/common.rmk            |    5 +
 gnulib/regcomp.c           | 3851 +++++++++++++++++++++++++++++++
 gnulib/regex.c             |   26 +
 gnulib/regex_internal.c    | 1737 ++++++++++++++
 gnulib/regex_internal.h    |  828 +++++++
 gnulib/regexec.c           | 4407 ++++++++++++++++++++++++++++++++++++
 include/grub/gnulib-wrap.h |  181 ++
 include/grub/regex.h       |  675 ++++++
 10 files changed, 11806 insertions(+)
 create mode 100644 ChangeLog.regexp
 create mode 100644 commands/regexp.c
 create mode 100644 gnulib/regcomp.c
 create mode 100644 gnulib/regex.c
 create mode 100644 gnulib/regex_internal.c
 create mode 100644 gnulib/regex_internal.h
 create mode 100644 gnulib/regexec.c
 create mode 100644 include/grub/gnulib-wrap.h
 create mode 100644 include/grub/regex.h

diff --git a/ChangeLog.regexp b/ChangeLog.regexp
new file mode 100644
index 000000000..c5329964c
--- /dev/null
+++ b/ChangeLog.regexp
@@ -0,0 +1,17 @@
+2009-12-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Regexp support.
+
+	* conf/common.rmk (pkglib_MODULES): Add regexp.mod.
+	(regexp_mod_SOURCES): New variable.
+	(regexp_mod_CFLAGS): Likewise.
+	(regexp_mod_LDFLAGS): Likewise.
+	* commands/regexp.c: New file.
+	* include/grub/gnulib-wrap.h: Likewise.
+	* gnulib/regcomp.c: New file. Imported from gnulib.
+	* gnulib/regex.c: Likewise.
+	* gnulib/regex_internal.c: Likewise.
+	* gnulib/regex_internal.h: Likewise.
+	* gnulib/regexec.c: Likewise.
+	* include/grub/regex.h: Likewise.
+
diff --git a/commands/regexp.c b/commands/regexp.c
new file mode 100644
index 000000000..6ceb78f0f
--- /dev/null
+++ b/commands/regexp.c
@@ -0,0 +1,79 @@
+/* regexp.c -- The regexp command.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2005,2007  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/command.h>
+#include <grub/regex.h>
+
+static grub_err_t
+grub_cmd_regexp (grub_command_t cmd __attribute__ ((unused)),
+		 int argc, char **args)
+{
+  int argn = 0;
+  int matches = 0;
+  regex_t regex;
+  int ret;
+  grub_size_t s;
+  char *comperr;
+  grub_err_t err;
+
+  if (argc != 2)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "2 arguments expected");
+
+  ret = regcomp (&regex, args[0], RE_SYNTAX_GNU_AWK);
+  if (ret)
+    goto fail;
+
+  ret = regexec (&regex, args[1], 0, 0, 0);
+  if (!ret)
+    {
+      regfree (&regex);
+      return GRUB_ERR_NONE;
+    }
+
+ fail:
+  s = regerror (ret, &regex, 0, 0);
+  comperr = grub_malloc (s);
+  if (!comperr)
+    {
+      regfree (&regex);
+      return grub_errno;
+    }
+  regerror (ret, &regex, comperr, s);
+  err = grub_error (GRUB_ERR_TEST_FAILURE, "%s", comperr);
+  regfree (&regex);
+  grub_free (comperr);
+  return err;
+}
+
+static grub_command_t cmd;
+
+GRUB_MOD_INIT(regexp)
+{
+  cmd = grub_register_command ("regexp", grub_cmd_regexp,
+			       "REGEXP STRING",
+			       "Test if REGEXP matches STRING.");
+}
+
+GRUB_MOD_FINI(regexp)
+{
+  grub_unregister_command (cmd);
+}
diff --git a/conf/common.rmk b/conf/common.rmk
index 4fd005777..73fb4d0e4 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -650,3 +650,8 @@ pkglib_MODULES += charset.mod
 charset_mod_SOURCES = lib/charset.c
 charset_mod_CFLAGS = $(COMMON_CFLAGS)
 charset_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+pkglib_MODULES += regexp.mod
+regexp_mod_SOURCES = gnulib/regex.c commands/regexp.c
+regexp_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-sign-compare -Wno-unused
+regexp_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/gnulib/regcomp.c b/gnulib/regcomp.c
new file mode 100644
index 000000000..6472ff6b2
--- /dev/null
+++ b/gnulib/regcomp.c
@@ -0,0 +1,3851 @@
+/* Extended regular expression matching and search library.
+   Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,
+					  size_t length, reg_syntax_t syntax);
+static void re_compile_fastmap_iter (regex_t *bufp,
+				     const re_dfastate_t *init_state,
+				     char *fastmap);
+static reg_errcode_t init_dfa (re_dfa_t *dfa, size_t pat_len);
+#ifdef RE_ENABLE_I18N
+static void free_charset (re_charset_t *cset);
+#endif /* RE_ENABLE_I18N */
+static void free_workarea_compile (regex_t *preg);
+static reg_errcode_t create_initial_state (re_dfa_t *dfa);
+#ifdef RE_ENABLE_I18N
+static void optimize_utf8 (re_dfa_t *dfa);
+#endif
+static reg_errcode_t analyze (regex_t *preg);
+static reg_errcode_t preorder (bin_tree_t *root,
+			       reg_errcode_t (fn (void *, bin_tree_t *)),
+			       void *extra);
+static reg_errcode_t postorder (bin_tree_t *root,
+				reg_errcode_t (fn (void *, bin_tree_t *)),
+				void *extra);
+static reg_errcode_t optimize_subexps (void *extra, bin_tree_t *node);
+static reg_errcode_t lower_subexps (void *extra, bin_tree_t *node);
+static bin_tree_t *lower_subexp (reg_errcode_t *err, regex_t *preg,
+				 bin_tree_t *node);
+static reg_errcode_t calc_first (void *extra, bin_tree_t *node);
+static reg_errcode_t calc_next (void *extra, bin_tree_t *node);
+static reg_errcode_t link_nfa_nodes (void *extra, bin_tree_t *node);
+static Idx duplicate_node (re_dfa_t *dfa, Idx org_idx, unsigned int constraint);
+static Idx search_duplicated_node (const re_dfa_t *dfa, Idx org_node,
+				   unsigned int constraint);
+static reg_errcode_t calc_eclosure (re_dfa_t *dfa);
+static reg_errcode_t calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa,
+					 Idx node, bool root);
+static reg_errcode_t calc_inveclosure (re_dfa_t *dfa);
+static Idx fetch_number (re_string_t *input, re_token_t *token,
+			 reg_syntax_t syntax);
+static int peek_token (re_token_t *token, re_string_t *input,
+			reg_syntax_t syntax) internal_function;
+static bin_tree_t *parse (re_string_t *regexp, regex_t *preg,
+			  reg_syntax_t syntax, reg_errcode_t *err);
+static bin_tree_t *parse_reg_exp (re_string_t *regexp, regex_t *preg,
+				  re_token_t *token, reg_syntax_t syntax,
+				  Idx nest, reg_errcode_t *err);
+static bin_tree_t *parse_branch (re_string_t *regexp, regex_t *preg,
+				 re_token_t *token, reg_syntax_t syntax,
+				 Idx nest, reg_errcode_t *err);
+static bin_tree_t *parse_expression (re_string_t *regexp, regex_t *preg,
+				     re_token_t *token, reg_syntax_t syntax,
+				     Idx nest, reg_errcode_t *err);
+static bin_tree_t *parse_sub_exp (re_string_t *regexp, regex_t *preg,
+				  re_token_t *token, reg_syntax_t syntax,
+				  Idx nest, reg_errcode_t *err);
+static bin_tree_t *parse_dup_op (bin_tree_t *dup_elem, re_string_t *regexp,
+				 re_dfa_t *dfa, re_token_t *token,
+				 reg_syntax_t syntax, reg_errcode_t *err);
+static bin_tree_t *parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa,
+				      re_token_t *token, reg_syntax_t syntax,
+				      reg_errcode_t *err);
+static reg_errcode_t parse_bracket_element (bracket_elem_t *elem,
+					    re_string_t *regexp,
+					    re_token_t *token, int token_len,
+					    re_dfa_t *dfa,
+					    reg_syntax_t syntax,
+					    bool accept_hyphen);
+static reg_errcode_t parse_bracket_symbol (bracket_elem_t *elem,
+					  re_string_t *regexp,
+					  re_token_t *token);
+#ifdef RE_ENABLE_I18N
+static reg_errcode_t build_equiv_class (bitset_t sbcset,
+					re_charset_t *mbcset,
+					Idx *equiv_class_alloc,
+					const unsigned char *name);
+static reg_errcode_t build_charclass (RE_TRANSLATE_TYPE trans,
+				      bitset_t sbcset,
+				      re_charset_t *mbcset,
+				      Idx *char_class_alloc,
+				      const unsigned char *class_name,
+				      reg_syntax_t syntax);
+#else  /* not RE_ENABLE_I18N */
+static reg_errcode_t build_equiv_class (bitset_t sbcset,
+					const unsigned char *name);
+static reg_errcode_t build_charclass (RE_TRANSLATE_TYPE trans,
+				      bitset_t sbcset,
+				      const unsigned char *class_name,
+				      reg_syntax_t syntax);
+#endif /* not RE_ENABLE_I18N */
+static bin_tree_t *build_charclass_op (re_dfa_t *dfa,
+				       RE_TRANSLATE_TYPE trans,
+				       const unsigned char *class_name,
+				       const unsigned char *extra,
+				       bool non_match, reg_errcode_t *err);
+static bin_tree_t *create_tree (re_dfa_t *dfa,
+				bin_tree_t *left, bin_tree_t *right,
+				re_token_type_t type);
+static bin_tree_t *create_token_tree (re_dfa_t *dfa,
+				      bin_tree_t *left, bin_tree_t *right,
+				      const re_token_t *token);
+static bin_tree_t *duplicate_tree (const bin_tree_t *src, re_dfa_t *dfa);
+static void free_token (re_token_t *node);
+static reg_errcode_t free_tree (void *extra, bin_tree_t *node);
+static reg_errcode_t mark_opt_subexp (void *extra, bin_tree_t *node);
+
+/* This table gives an error message for each of the error codes listed
+   in regex.h.  Obviously the order here has to be same as there.
+   POSIX doesn't require that we do anything for REG_NOERROR,
+   but why not be nice?  */
+
+static const char __re_error_msgid[] =
+  {
+#define REG_NOERROR_IDX	0
+    gettext_noop ("Success")	/* REG_NOERROR */
+    "\0"
+#define REG_NOMATCH_IDX (REG_NOERROR_IDX + sizeof "Success")
+    gettext_noop ("No match")	/* REG_NOMATCH */
+    "\0"
+#define REG_BADPAT_IDX	(REG_NOMATCH_IDX + sizeof "No match")
+    gettext_noop ("Invalid regular expression") /* REG_BADPAT */
+    "\0"
+#define REG_ECOLLATE_IDX (REG_BADPAT_IDX + sizeof "Invalid regular expression")
+    gettext_noop ("Invalid collation character") /* REG_ECOLLATE */
+    "\0"
+#define REG_ECTYPE_IDX	(REG_ECOLLATE_IDX + sizeof "Invalid collation character")
+    gettext_noop ("Invalid character class name") /* REG_ECTYPE */
+    "\0"
+#define REG_EESCAPE_IDX	(REG_ECTYPE_IDX + sizeof "Invalid character class name")
+    gettext_noop ("Trailing backslash") /* REG_EESCAPE */
+    "\0"
+#define REG_ESUBREG_IDX	(REG_EESCAPE_IDX + sizeof "Trailing backslash")
+    gettext_noop ("Invalid back reference") /* REG_ESUBREG */
+    "\0"
+#define REG_EBRACK_IDX	(REG_ESUBREG_IDX + sizeof "Invalid back reference")
+    gettext_noop ("Unmatched [ or [^")	/* REG_EBRACK */
+    "\0"
+#define REG_EPAREN_IDX	(REG_EBRACK_IDX + sizeof "Unmatched [ or [^")
+    gettext_noop ("Unmatched ( or \\(") /* REG_EPAREN */
+    "\0"
+#define REG_EBRACE_IDX	(REG_EPAREN_IDX + sizeof "Unmatched ( or \\(")
+    gettext_noop ("Unmatched \\{") /* REG_EBRACE */
+    "\0"
+#define REG_BADBR_IDX	(REG_EBRACE_IDX + sizeof "Unmatched \\{")
+    gettext_noop ("Invalid content of \\{\\}") /* REG_BADBR */
+    "\0"
+#define REG_ERANGE_IDX	(REG_BADBR_IDX + sizeof "Invalid content of \\{\\}")
+    gettext_noop ("Invalid range end")	/* REG_ERANGE */
+    "\0"
+#define REG_ESPACE_IDX	(REG_ERANGE_IDX + sizeof "Invalid range end")
+    gettext_noop ("Memory exhausted") /* REG_ESPACE */
+    "\0"
+#define REG_BADRPT_IDX	(REG_ESPACE_IDX + sizeof "Memory exhausted")
+    gettext_noop ("Invalid preceding regular expression") /* REG_BADRPT */
+    "\0"
+#define REG_EEND_IDX	(REG_BADRPT_IDX + sizeof "Invalid preceding regular expression")
+    gettext_noop ("Premature end of regular expression") /* REG_EEND */
+    "\0"
+#define REG_ESIZE_IDX	(REG_EEND_IDX + sizeof "Premature end of regular expression")
+    gettext_noop ("Regular expression too big") /* REG_ESIZE */
+    "\0"
+#define REG_ERPAREN_IDX	(REG_ESIZE_IDX + sizeof "Regular expression too big")
+    gettext_noop ("Unmatched ) or \\)") /* REG_ERPAREN */
+  };
+
+static const size_t __re_error_msgid_idx[] =
+  {
+    REG_NOERROR_IDX,
+    REG_NOMATCH_IDX,
+    REG_BADPAT_IDX,
+    REG_ECOLLATE_IDX,
+    REG_ECTYPE_IDX,
+    REG_EESCAPE_IDX,
+    REG_ESUBREG_IDX,
+    REG_EBRACK_IDX,
+    REG_EPAREN_IDX,
+    REG_EBRACE_IDX,
+    REG_BADBR_IDX,
+    REG_ERANGE_IDX,
+    REG_ESPACE_IDX,
+    REG_BADRPT_IDX,
+    REG_EEND_IDX,
+    REG_ESIZE_IDX,
+    REG_ERPAREN_IDX
+  };
+
+/* Entry points for GNU code.  */
+
+/* re_compile_pattern is the GNU regular expression compiler: it
+   compiles PATTERN (of length LENGTH) and puts the result in BUFP.
+   Returns 0 if the pattern was valid, otherwise an error string.
+
+   Assumes the `allocated' (and perhaps `buffer') and `translate' fields
+   are set in BUFP on entry.  */
+
+#ifdef _LIBC
+const char *
+re_compile_pattern (pattern, length, bufp)
+    const char *pattern;
+    size_t length;
+    struct re_pattern_buffer *bufp;
+#else /* size_t might promote */
+const char *
+re_compile_pattern (const char *pattern, size_t length,
+		    struct re_pattern_buffer *bufp)
+#endif
+{
+  reg_errcode_t ret;
+
+  /* And GNU code determines whether or not to get register information
+     by passing null for the REGS argument to re_match, etc., not by
+     setting no_sub, unless RE_NO_SUB is set.  */
+  bufp->no_sub = !!(re_syntax_options & RE_NO_SUB);
+
+  /* Match anchors at newline.  */
+  bufp->newline_anchor = 1;
+
+  ret = re_compile_internal (bufp, pattern, length, re_syntax_options);
+
+  if (!ret)
+    return NULL;
+  return gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
+}
+#ifdef _LIBC
+weak_alias (__re_compile_pattern, re_compile_pattern)
+#endif
+
+/* Set by `re_set_syntax' to the current regexp syntax to recognize.  Can
+   also be assigned to arbitrarily: each pattern buffer stores its own
+   syntax, so it can be changed between regex compilations.  */
+/* This has no initializer because initialized variables in Emacs
+   become read-only after dumping.  */
+reg_syntax_t re_syntax_options;
+
+
+/* Specify the precise syntax of regexps for compilation.  This provides
+   for compatibility for various utilities which historically have
+   different, incompatible syntaxes.
+
+   The argument SYNTAX is a bit mask comprised of the various bits
+   defined in regex.h.  We return the old syntax.  */
+
+reg_syntax_t
+re_set_syntax (syntax)
+    reg_syntax_t syntax;
+{
+  reg_syntax_t ret = re_syntax_options;
+
+  re_syntax_options = syntax;
+  return ret;
+}
+#ifdef _LIBC
+weak_alias (__re_set_syntax, re_set_syntax)
+#endif
+
+int
+re_compile_fastmap (bufp)
+    struct re_pattern_buffer *bufp;
+{
+  re_dfa_t *dfa = (re_dfa_t *) bufp->buffer;
+  char *fastmap = bufp->fastmap;
+
+  memset (fastmap, '\0', sizeof (char) * SBC_MAX);
+  re_compile_fastmap_iter (bufp, dfa->init_state, fastmap);
+  if (dfa->init_state != dfa->init_state_word)
+    re_compile_fastmap_iter (bufp, dfa->init_state_word, fastmap);
+  if (dfa->init_state != dfa->init_state_nl)
+    re_compile_fastmap_iter (bufp, dfa->init_state_nl, fastmap);
+  if (dfa->init_state != dfa->init_state_begbuf)
+    re_compile_fastmap_iter (bufp, dfa->init_state_begbuf, fastmap);
+  bufp->fastmap_accurate = 1;
+  return 0;
+}
+#ifdef _LIBC
+weak_alias (__re_compile_fastmap, re_compile_fastmap)
+#endif
+
+static inline void
+__attribute ((always_inline))
+re_set_fastmap (char *fastmap, bool icase, int ch)
+{
+  fastmap[ch] = 1;
+  if (icase)
+    fastmap[tolower (ch)] = 1;
+}
+
+/* Helper function for re_compile_fastmap.
+   Compile fastmap for the initial_state INIT_STATE.  */
+
+static void
+re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,
+			 char *fastmap)
+{
+  re_dfa_t *dfa = (re_dfa_t *) bufp->buffer;
+  Idx node_cnt;
+  bool icase = (dfa->mb_cur_max == 1 && (bufp->syntax & RE_ICASE));
+  for (node_cnt = 0; node_cnt < init_state->nodes.nelem; ++node_cnt)
+    {
+      Idx node = init_state->nodes.elems[node_cnt];
+      re_token_type_t type = dfa->nodes[node].type;
+
+      if (type == CHARACTER)
+	{
+	  re_set_fastmap (fastmap, icase, dfa->nodes[node].opr.c);
+#ifdef RE_ENABLE_I18N
+	  if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1)
+	    {
+	      unsigned char buf[MB_LEN_MAX];
+	      unsigned char *p;
+	      wchar_t wc;
+	      mbstate_t state;
+
+	      p = buf;
+	      *p++ = dfa->nodes[node].opr.c;
+	      while (++node < dfa->nodes_len
+		     &&	dfa->nodes[node].type == CHARACTER
+		     && dfa->nodes[node].mb_partial)
+		*p++ = dfa->nodes[node].opr.c;
+	      memset (&state, '\0', sizeof (state));
+	      if (__mbrtowc (&wc, (const char *) buf, p - buf,
+			     &state) == p - buf
+		  && (__wcrtomb ((char *) buf, towlower (wc), &state)
+		      != (size_t) -1))
+		re_set_fastmap (fastmap, false, buf[0]);
+	    }
+#endif
+	}
+      else if (type == SIMPLE_BRACKET)
+	{
+	  int i, ch;
+	  for (i = 0, ch = 0; i < BITSET_WORDS; ++i)
+	    {
+	      int j;
+	      bitset_word_t w = dfa->nodes[node].opr.sbcset[i];
+	      for (j = 0; j < BITSET_WORD_BITS; ++j, ++ch)
+		if (w & ((bitset_word_t) 1 << j))
+		  re_set_fastmap (fastmap, icase, ch);
+	    }
+	}
+#ifdef RE_ENABLE_I18N
+      else if (type == COMPLEX_BRACKET)
+	{
+	  re_charset_t *cset = dfa->nodes[node].opr.mbcset;
+	  Idx i;
+
+# ifdef _LIBC
+	  /* See if we have to try all bytes which start multiple collation
+	     elements.
+	     e.g. In da_DK, we want to catch 'a' since "aa" is a valid
+		  collation element, and don't catch 'b' since 'b' is
+		  the only collation element which starts from 'b' (and
+		  it is caught by SIMPLE_BRACKET).  */
+	      if (_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES) != 0
+		  && (cset->ncoll_syms || cset->nranges))
+		{
+		  const int32_t *table = (const int32_t *)
+		    _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
+		  for (i = 0; i < SBC_MAX; ++i)
+		    if (table[i] < 0)
+		      re_set_fastmap (fastmap, icase, i);
+		}
+# endif /* _LIBC */
+
+	  /* See if we have to start the match at all multibyte characters,
+	     i.e. where we would not find an invalid sequence.  This only
+	     applies to multibyte character sets; for single byte character
+	     sets, the SIMPLE_BRACKET again suffices.  */
+	  if (dfa->mb_cur_max > 1
+	      && (cset->nchar_classes || cset->non_match
+# ifdef _LIBC
+		  || cset->nequiv_classes
+# endif /* _LIBC */
+		 ))
+	    {
+	      unsigned char c = 0;
+	      do
+		{
+		  mbstate_t mbs;
+		  memset (&mbs, 0, sizeof (mbs));
+		  if (__mbrtowc (NULL, (char *) &c, 1, &mbs) == (size_t) -2)
+		    re_set_fastmap (fastmap, false, (int) c);
+		}
+	      while (++c != 0);
+	    }
+
+	  else
+	    {
+	      /* ... Else catch all bytes which can start the mbchars.  */
+	      for (i = 0; i < cset->nmbchars; ++i)
+		{
+		  char buf[256];
+		  mbstate_t state;
+		  memset (&state, '\0', sizeof (state));
+		  if (__wcrtomb (buf, cset->mbchars[i], &state) != (size_t) -1)
+		    re_set_fastmap (fastmap, icase, *(unsigned char *) buf);
+		  if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1)
+		    {
+		      if (__wcrtomb (buf, towlower (cset->mbchars[i]), &state)
+			  != (size_t) -1)
+			re_set_fastmap (fastmap, false, *(unsigned char *) buf);
+		    }
+		}
+	    }
+	}
+#endif /* RE_ENABLE_I18N */
+      else if (type == OP_PERIOD
+#ifdef RE_ENABLE_I18N
+	       || type == OP_UTF8_PERIOD
+#endif /* RE_ENABLE_I18N */
+	       || type == END_OF_RE)
+	{
+	  memset (fastmap, '\1', sizeof (char) * SBC_MAX);
+	  if (type == END_OF_RE)
+	    bufp->can_be_null = 1;
+	  return;
+	}
+    }
+}
+
+/* Entry point for POSIX code.  */
+/* regcomp takes a regular expression as a string and compiles it.
+
+   PREG is a regex_t *.  We do not expect any fields to be initialized,
+   since POSIX says we shouldn't.  Thus, we set
+
+     `buffer' to the compiled pattern;
+     `used' to the length of the compiled pattern;
+     `syntax' to RE_SYNTAX_POSIX_EXTENDED if the
+       REG_EXTENDED bit in CFLAGS is set; otherwise, to
+       RE_SYNTAX_POSIX_BASIC;
+     `newline_anchor' to REG_NEWLINE being set in CFLAGS;
+     `fastmap' to an allocated space for the fastmap;
+     `fastmap_accurate' to zero;
+     `re_nsub' to the number of subexpressions in PATTERN.
+
+   PATTERN is the address of the pattern string.
+
+   CFLAGS is a series of bits which affect compilation.
+
+     If REG_EXTENDED is set, we use POSIX extended syntax; otherwise, we
+     use POSIX basic syntax.
+
+     If REG_NEWLINE is set, then . and [^...] don't match newline.
+     Also, regexec will try a match beginning after every newline.
+
+     If REG_ICASE is set, then we considers upper- and lowercase
+     versions of letters to be equivalent when matching.
+
+     If REG_NOSUB is set, then when PREG is passed to regexec, that
+     routine will report only success or failure, and nothing about the
+     registers.
+
+   It returns 0 if it succeeds, nonzero if it doesn't.  (See regex.h for
+   the return codes and their meanings.)  */
+
+int
+regcomp (preg, pattern, cflags)
+    regex_t *_Restrict_ preg;
+    const char *_Restrict_ pattern;
+    int cflags;
+{
+  reg_errcode_t ret;
+  reg_syntax_t syntax = ((cflags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED
+			 : RE_SYNTAX_POSIX_BASIC);
+
+  preg->buffer = NULL;
+  preg->allocated = 0;
+  preg->used = 0;
+
+  /* Try to allocate space for the fastmap.  */
+  preg->fastmap = re_malloc (char, SBC_MAX);
+  if (BE (preg->fastmap == NULL, 0))
+    return REG_ESPACE;
+
+  syntax |= (cflags & REG_ICASE) ? RE_ICASE : 0;
+
+  /* If REG_NEWLINE is set, newlines are treated differently.  */
+  if (cflags & REG_NEWLINE)
+    { /* REG_NEWLINE implies neither . nor [^...] match newline.  */
+      syntax &= ~RE_DOT_NEWLINE;
+      syntax |= RE_HAT_LISTS_NOT_NEWLINE;
+      /* It also changes the matching behavior.  */
+      preg->newline_anchor = 1;
+    }
+  else
+    preg->newline_anchor = 0;
+  preg->no_sub = !!(cflags & REG_NOSUB);
+  preg->translate = NULL;
+
+  ret = re_compile_internal (preg, pattern, strlen (pattern), syntax);
+
+  /* POSIX doesn't distinguish between an unmatched open-group and an
+     unmatched close-group: both are REG_EPAREN.  */
+  if (ret == REG_ERPAREN)
+    ret = REG_EPAREN;
+
+  /* We have already checked preg->fastmap != NULL.  */
+  if (BE (ret == REG_NOERROR, 1))
+    /* Compute the fastmap now, since regexec cannot modify the pattern
+       buffer.  This function never fails in this implementation.  */
+    (void) re_compile_fastmap (preg);
+  else
+    {
+      /* Some error occurred while compiling the expression.  */
+      re_free (preg->fastmap);
+      preg->fastmap = NULL;
+    }
+
+  return (int) ret;
+}
+#ifdef _LIBC
+weak_alias (__regcomp, regcomp)
+#endif
+
+/* Returns a message corresponding to an error code, ERRCODE, returned
+   from either regcomp or regexec.   We don't use PREG here.  */
+
+#ifdef _LIBC
+size_t
+regerror (errcode, preg, errbuf, errbuf_size)
+    int errcode;
+    const regex_t *_Restrict_ preg;
+    char *_Restrict_ errbuf;
+    size_t errbuf_size;
+#else /* size_t might promote */
+size_t
+regerror (int errcode, const regex_t *_Restrict_ preg,
+	  char *_Restrict_ errbuf, size_t errbuf_size)
+#endif
+{
+  const char *msg;
+  size_t msg_size;
+
+  if (BE (errcode < 0
+	  || errcode >= (int) (sizeof (__re_error_msgid_idx)
+			       / sizeof (__re_error_msgid_idx[0])), 0))
+    /* Only error codes returned by the rest of the code should be passed
+       to this routine.  If we are given anything else, or if other regex
+       code generates an invalid error code, then the program has a bug.
+       Dump core so we can fix it.  */
+    abort ();
+
+  msg = gettext (__re_error_msgid + __re_error_msgid_idx[errcode]);
+
+  msg_size = strlen (msg) + 1; /* Includes the null.  */
+
+  if (BE (errbuf_size != 0, 1))
+    {
+      size_t cpy_size = msg_size;
+      if (BE (msg_size > errbuf_size, 0))
+	{
+	  cpy_size = errbuf_size - 1;
+	  errbuf[cpy_size] = '\0';
+	}
+      memcpy (errbuf, msg, cpy_size);
+    }
+
+  return msg_size;
+}
+#ifdef _LIBC
+weak_alias (__regerror, regerror)
+#endif
+
+
+#ifdef RE_ENABLE_I18N
+/* This static array is used for the map to single-byte characters when
+   UTF-8 is used.  Otherwise we would allocate memory just to initialize
+   it the same all the time.  UTF-8 is the preferred encoding so this is
+   a worthwhile optimization.  */
+static const bitset_t utf8_sb_map =
+{
+  /* Set the first 128 bits.  */
+# if 4 * BITSET_WORD_BITS < ASCII_CHARS
+#  error "bitset_word_t is narrower than 32 bits"
+# elif 3 * BITSET_WORD_BITS < ASCII_CHARS
+  BITSET_WORD_MAX, BITSET_WORD_MAX, BITSET_WORD_MAX,
+# elif 2 * BITSET_WORD_BITS < ASCII_CHARS
+  BITSET_WORD_MAX, BITSET_WORD_MAX,
+# elif 1 * BITSET_WORD_BITS < ASCII_CHARS
+  BITSET_WORD_MAX,
+# endif
+  (BITSET_WORD_MAX
+   >> (SBC_MAX % BITSET_WORD_BITS == 0
+       ? 0
+       : BITSET_WORD_BITS - SBC_MAX % BITSET_WORD_BITS))
+};
+#endif
+
+
+static void
+free_dfa_content (re_dfa_t *dfa)
+{
+  Idx i, j;
+
+  if (dfa->nodes)
+    for (i = 0; i < dfa->nodes_len; ++i)
+      free_token (dfa->nodes + i);
+  re_free (dfa->nexts);
+  for (i = 0; i < dfa->nodes_len; ++i)
+    {
+      if (dfa->eclosures != NULL)
+	re_node_set_free (dfa->eclosures + i);
+      if (dfa->inveclosures != NULL)
+	re_node_set_free (dfa->inveclosures + i);
+      if (dfa->edests != NULL)
+	re_node_set_free (dfa->edests + i);
+    }
+  re_free (dfa->edests);
+  re_free (dfa->eclosures);
+  re_free (dfa->inveclosures);
+  re_free (dfa->nodes);
+
+  if (dfa->state_table)
+    for (i = 0; i <= dfa->state_hash_mask; ++i)
+      {
+	struct re_state_table_entry *entry = dfa->state_table + i;
+	for (j = 0; j < entry->num; ++j)
+	  {
+	    re_dfastate_t *state = entry->array[j];
+	    free_state (state);
+	  }
+        re_free (entry->array);
+      }
+  re_free (dfa->state_table);
+#ifdef RE_ENABLE_I18N
+  if (dfa->sb_char != utf8_sb_map)
+    re_free (dfa->sb_char);
+#endif
+  re_free (dfa->subexp_map);
+#ifdef DEBUG
+  re_free (dfa->re_str);
+#endif
+
+  re_free (dfa);
+}
+
+
+/* Free dynamically allocated space used by PREG.  */
+
+void
+regfree (preg)
+    regex_t *preg;
+{
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
+  if (BE (dfa != NULL, 1))
+    free_dfa_content (dfa);
+  preg->buffer = NULL;
+  preg->allocated = 0;
+
+  re_free (preg->fastmap);
+  preg->fastmap = NULL;
+
+  re_free (preg->translate);
+  preg->translate = NULL;
+}
+#ifdef _LIBC
+weak_alias (__regfree, regfree)
+#endif
+
+/* Entry points compatible with 4.2 BSD regex library.  We don't define
+   them unless specifically requested.  */
+
+#if defined _REGEX_RE_COMP || defined _LIBC
+
+/* BSD has one and only one pattern buffer.  */
+static struct re_pattern_buffer re_comp_buf;
+
+char *
+# ifdef _LIBC
+/* Make these definitions weak in libc, so POSIX programs can redefine
+   these names if they don't use our functions, and still use
+   regcomp/regexec above without link errors.  */
+weak_function
+# endif
+re_comp (s)
+     const char *s;
+{
+  reg_errcode_t ret;
+  char *fastmap;
+
+  if (!s)
+    {
+      if (!re_comp_buf.buffer)
+	return gettext ("No previous regular expression");
+      return 0;
+    }
+
+  if (re_comp_buf.buffer)
+    {
+      fastmap = re_comp_buf.fastmap;
+      re_comp_buf.fastmap = NULL;
+      __regfree (&re_comp_buf);
+      memset (&re_comp_buf, '\0', sizeof (re_comp_buf));
+      re_comp_buf.fastmap = fastmap;
+    }
+
+  if (re_comp_buf.fastmap == NULL)
+    {
+      re_comp_buf.fastmap = (char *) malloc (SBC_MAX);
+      if (re_comp_buf.fastmap == NULL)
+	return (char *) gettext (__re_error_msgid
+				 + __re_error_msgid_idx[(int) REG_ESPACE]);
+    }
+
+  /* Since `re_exec' always passes NULL for the `regs' argument, we
+     don't need to initialize the pattern buffer fields which affect it.  */
+
+  /* Match anchors at newlines.  */
+  re_comp_buf.newline_anchor = 1;
+
+  ret = re_compile_internal (&re_comp_buf, s, strlen (s), re_syntax_options);
+
+  if (!ret)
+    return NULL;
+
+  /* Yes, we're discarding `const' here if !HAVE_LIBINTL.  */
+  return (char *) gettext (__re_error_msgid + __re_error_msgid_idx[(int) ret]);
+}
+
+#ifdef _LIBC
+libc_freeres_fn (free_mem)
+{
+  __regfree (&re_comp_buf);
+}
+#endif
+
+#endif /* _REGEX_RE_COMP */
+
+/* Internal entry point.
+   Compile the regular expression PATTERN, whose length is LENGTH.
+   SYNTAX indicate regular expression's syntax.  */
+
+static reg_errcode_t
+re_compile_internal (regex_t *preg, const char * pattern, size_t length,
+		     reg_syntax_t syntax)
+{
+  reg_errcode_t err = REG_NOERROR;
+  re_dfa_t *dfa;
+  re_string_t regexp;
+
+  /* Initialize the pattern buffer.  */
+  preg->fastmap_accurate = 0;
+  preg->syntax = syntax;
+  preg->not_bol = preg->not_eol = 0;
+  preg->used = 0;
+  preg->re_nsub = 0;
+  preg->can_be_null = 0;
+  preg->regs_allocated = REGS_UNALLOCATED;
+
+  /* Initialize the dfa.  */
+  dfa = (re_dfa_t *) preg->buffer;
+  if (BE (preg->allocated < sizeof (re_dfa_t), 0))
+    {
+      /* If zero allocated, but buffer is non-null, try to realloc
+	 enough space.  This loses if buffer's address is bogus, but
+	 that is the user's responsibility.  If ->buffer is NULL this
+	 is a simple allocation.  */
+      dfa = re_realloc (preg->buffer, re_dfa_t, 1);
+      if (dfa == NULL)
+	return REG_ESPACE;
+      preg->allocated = sizeof (re_dfa_t);
+      preg->buffer = (unsigned char *) dfa;
+    }
+  preg->used = sizeof (re_dfa_t);
+
+  err = init_dfa (dfa, length);
+  if (BE (err != REG_NOERROR, 0))
+    {
+      free_dfa_content (dfa);
+      preg->buffer = NULL;
+      preg->allocated = 0;
+      return err;
+    }
+#ifdef DEBUG
+  /* Note: length+1 will not overflow since it is checked in init_dfa.  */
+  dfa->re_str = re_malloc (char, length + 1);
+  strncpy (dfa->re_str, pattern, length + 1);
+#endif
+
+  __libc_lock_init (dfa->lock);
+
+  err = re_string_construct (&regexp, pattern, length, preg->translate,
+			     (syntax & RE_ICASE) != 0, dfa);
+  if (BE (err != REG_NOERROR, 0))
+    {
+    re_compile_internal_free_return:
+      free_workarea_compile (preg);
+      re_string_destruct (&regexp);
+      free_dfa_content (dfa);
+      preg->buffer = NULL;
+      preg->allocated = 0;
+      return err;
+    }
+
+  /* Parse the regular expression, and build a structure tree.  */
+  preg->re_nsub = 0;
+  dfa->str_tree = parse (&regexp, preg, syntax, &err);
+  if (BE (dfa->str_tree == NULL, 0))
+    goto re_compile_internal_free_return;
+
+  /* Analyze the tree and create the nfa.  */
+  err = analyze (preg);
+  if (BE (err != REG_NOERROR, 0))
+    goto re_compile_internal_free_return;
+
+#ifdef RE_ENABLE_I18N
+  /* If possible, do searching in single byte encoding to speed things up.  */
+  if (dfa->is_utf8 && !(syntax & RE_ICASE) && preg->translate == NULL)
+    optimize_utf8 (dfa);
+#endif
+
+  /* Then create the initial state of the dfa.  */
+  err = create_initial_state (dfa);
+
+  /* Release work areas.  */
+  free_workarea_compile (preg);
+  re_string_destruct (&regexp);
+
+  if (BE (err != REG_NOERROR, 0))
+    {
+      free_dfa_content (dfa);
+      preg->buffer = NULL;
+      preg->allocated = 0;
+    }
+
+  return err;
+}
+
+/* Initialize DFA.  We use the length of the regular expression PAT_LEN
+   as the initial length of some arrays.  */
+
+static reg_errcode_t
+init_dfa (re_dfa_t *dfa, size_t pat_len)
+{
+  __re_size_t table_size;
+#ifdef RE_ENABLE_I18N
+  size_t max_i18n_object_size = MAX (sizeof (wchar_t), sizeof (wctype_t));
+#else
+  size_t max_i18n_object_size = 0;
+#endif
+  size_t max_object_size =
+    MAX (sizeof (struct re_state_table_entry),
+	 MAX (sizeof (re_token_t),
+	      MAX (sizeof (re_node_set),
+		   MAX (sizeof (regmatch_t),
+			max_i18n_object_size))));
+
+  memset (dfa, '\0', sizeof (re_dfa_t));
+
+  /* Force allocation of str_tree_storage the first time.  */
+  dfa->str_tree_storage_idx = BIN_TREE_STORAGE_SIZE;
+
+  /* Avoid overflows.  The extra "/ 2" is for the table_size doubling
+     calculation below, and for similar doubling calculations
+     elsewhere.  And it's <= rather than <, because some of the
+     doubling calculations add 1 afterwards.  */
+  if (BE (SIZE_MAX / max_object_size / 2 <= pat_len, 0))
+    return REG_ESPACE;
+
+  dfa->nodes_alloc = pat_len + 1;
+  dfa->nodes = re_malloc (re_token_t, dfa->nodes_alloc);
+
+  /*  table_size = 2 ^ ceil(log pat_len) */
+  for (table_size = 1; ; table_size <<= 1)
+    if (table_size > pat_len)
+      break;
+
+  dfa->state_table = calloc (sizeof (struct re_state_table_entry), table_size);
+  dfa->state_hash_mask = table_size - 1;
+
+  dfa->mb_cur_max = MB_CUR_MAX;
+#ifdef _LIBC
+  if (dfa->mb_cur_max == 6
+      && strcmp (_NL_CURRENT (LC_CTYPE, _NL_CTYPE_CODESET_NAME), "UTF-8") == 0)
+    dfa->is_utf8 = 1;
+  dfa->map_notascii = (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MAP_TO_NONASCII)
+		       != 0);
+#else
+  if (strcmp (locale_charset (), "UTF-8") == 0)
+    dfa->is_utf8 = 1;
+
+  /* We check exhaustively in the loop below if this charset is a
+     superset of ASCII.  */
+  dfa->map_notascii = 0;
+#endif
+
+#ifdef RE_ENABLE_I18N
+  if (dfa->mb_cur_max > 1)
+    {
+      if (dfa->is_utf8)
+	dfa->sb_char = (re_bitset_ptr_t) utf8_sb_map;
+      else
+	{
+	  int i, j, ch;
+
+	  dfa->sb_char = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
+	  if (BE (dfa->sb_char == NULL, 0))
+	    return REG_ESPACE;
+
+	  /* Set the bits corresponding to single byte chars.  */
+	  for (i = 0, ch = 0; i < BITSET_WORDS; ++i)
+	    for (j = 0; j < BITSET_WORD_BITS; ++j, ++ch)
+	      {
+		wint_t wch = __btowc (ch);
+		if (wch != WEOF)
+		  dfa->sb_char[i] |= (bitset_word_t) 1 << j;
+# ifndef _LIBC
+		if (isascii (ch) && wch != ch)
+		  dfa->map_notascii = 1;
+# endif
+	      }
+	}
+    }
+#endif
+
+  if (BE (dfa->nodes == NULL || dfa->state_table == NULL, 0))
+    return REG_ESPACE;
+  return REG_NOERROR;
+}
+
+/* Initialize WORD_CHAR table, which indicate which character is
+   "word".  In this case "word" means that it is the word construction
+   character used by some operators like "\<", "\>", etc.  */
+
+static void
+internal_function
+init_word_char (re_dfa_t *dfa)
+{
+  int i, j, ch;
+  dfa->word_ops_used = 1;
+  for (i = 0, ch = 0; i < BITSET_WORDS; ++i)
+    for (j = 0; j < BITSET_WORD_BITS; ++j, ++ch)
+      if (isalnum (ch) || ch == '_')
+	dfa->word_char[i] |= (bitset_word_t) 1 << j;
+}
+
+/* Free the work area which are only used while compiling.  */
+
+static void
+free_workarea_compile (regex_t *preg)
+{
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
+  bin_tree_storage_t *storage, *next;
+  for (storage = dfa->str_tree_storage; storage; storage = next)
+    {
+      next = storage->next;
+      re_free (storage);
+    }
+  dfa->str_tree_storage = NULL;
+  dfa->str_tree_storage_idx = BIN_TREE_STORAGE_SIZE;
+  dfa->str_tree = NULL;
+  re_free (dfa->org_indices);
+  dfa->org_indices = NULL;
+}
+
+/* Create initial states for all contexts.  */
+
+static reg_errcode_t
+create_initial_state (re_dfa_t *dfa)
+{
+  Idx first, i;
+  reg_errcode_t err;
+  re_node_set init_nodes;
+
+  /* Initial states have the epsilon closure of the node which is
+     the first node of the regular expression.  */
+  first = dfa->str_tree->first->node_idx;
+  dfa->init_node = first;
+  err = re_node_set_init_copy (&init_nodes, dfa->eclosures + first);
+  if (BE (err != REG_NOERROR, 0))
+    return err;
+
+  /* The back-references which are in initial states can epsilon transit,
+     since in this case all of the subexpressions can be null.
+     Then we add epsilon closures of the nodes which are the next nodes of
+     the back-references.  */
+  if (dfa->nbackref > 0)
+    for (i = 0; i < init_nodes.nelem; ++i)
+      {
+	Idx node_idx = init_nodes.elems[i];
+	re_token_type_t type = dfa->nodes[node_idx].type;
+
+	Idx clexp_idx;
+	if (type != OP_BACK_REF)
+	  continue;
+	for (clexp_idx = 0; clexp_idx < init_nodes.nelem; ++clexp_idx)
+	  {
+	    re_token_t *clexp_node;
+	    clexp_node = dfa->nodes + init_nodes.elems[clexp_idx];
+	    if (clexp_node->type == OP_CLOSE_SUBEXP
+		&& clexp_node->opr.idx == dfa->nodes[node_idx].opr.idx)
+	      break;
+	  }
+	if (clexp_idx == init_nodes.nelem)
+	  continue;
+
+	if (type == OP_BACK_REF)
+	  {
+	    Idx dest_idx = dfa->edests[node_idx].elems[0];
+	    if (!re_node_set_contains (&init_nodes, dest_idx))
+	      {
+		re_node_set_merge (&init_nodes, dfa->eclosures + dest_idx);
+		i = 0;
+	      }
+	  }
+      }
+
+  /* It must be the first time to invoke acquire_state.  */
+  dfa->init_state = re_acquire_state_context (&err, dfa, &init_nodes, 0);
+  /* We don't check ERR here, since the initial state must not be NULL.  */
+  if (BE (dfa->init_state == NULL, 0))
+    return err;
+  if (dfa->init_state->has_constraint)
+    {
+      dfa->init_state_word = re_acquire_state_context (&err, dfa, &init_nodes,
+						       CONTEXT_WORD);
+      dfa->init_state_nl = re_acquire_state_context (&err, dfa, &init_nodes,
+						     CONTEXT_NEWLINE);
+      dfa->init_state_begbuf = re_acquire_state_context (&err, dfa,
+							 &init_nodes,
+							 CONTEXT_NEWLINE
+							 | CONTEXT_BEGBUF);
+      if (BE (dfa->init_state_word == NULL || dfa->init_state_nl == NULL
+	      || dfa->init_state_begbuf == NULL, 0))
+	return err;
+    }
+  else
+    dfa->init_state_word = dfa->init_state_nl
+      = dfa->init_state_begbuf = dfa->init_state;
+
+  re_node_set_free (&init_nodes);
+  return REG_NOERROR;
+}
+
+#ifdef RE_ENABLE_I18N
+/* If it is possible to do searching in single byte encoding instead of UTF-8
+   to speed things up, set dfa->mb_cur_max to 1, clear is_utf8 and change
+   DFA nodes where needed.  */
+
+static void
+optimize_utf8 (re_dfa_t *dfa)
+{
+  Idx node;
+  int i;
+  bool mb_chars = false;
+  bool has_period = false;
+
+  for (node = 0; node < dfa->nodes_len; ++node)
+    switch (dfa->nodes[node].type)
+      {
+      case CHARACTER:
+	if (dfa->nodes[node].opr.c >= ASCII_CHARS)
+	  mb_chars = true;
+	break;
+      case ANCHOR:
+	switch (dfa->nodes[node].opr.ctx_type)
+	  {
+	  case LINE_FIRST:
+	  case LINE_LAST:
+	  case BUF_FIRST:
+	  case BUF_LAST:
+	    break;
+	  default:
+	    /* Word anchors etc. cannot be handled.  It's okay to test
+	       opr.ctx_type since constraints (for all DFA nodes) are
+	       created by ORing one or more opr.ctx_type values.  */
+	    return;
+	  }
+	break;
+      case OP_PERIOD:
+        has_period = true;
+        break;
+      case OP_BACK_REF:
+      case OP_ALT:
+      case END_OF_RE:
+      case OP_DUP_ASTERISK:
+      case OP_OPEN_SUBEXP:
+      case OP_CLOSE_SUBEXP:
+	break;
+      case COMPLEX_BRACKET:
+	return;
+      case SIMPLE_BRACKET:
+	/* Just double check.  */
+	{
+	  int rshift = (ASCII_CHARS % BITSET_WORD_BITS == 0
+			? 0
+			: BITSET_WORD_BITS - ASCII_CHARS % BITSET_WORD_BITS);
+	  for (i = ASCII_CHARS / BITSET_WORD_BITS; i < BITSET_WORDS; ++i)
+	    {
+	      if (dfa->nodes[node].opr.sbcset[i] >> rshift != 0)
+		return;
+	      rshift = 0;
+	    }
+	}
+	break;
+      default:
+	abort ();
+      }
+
+  if (mb_chars || has_period)
+    for (node = 0; node < dfa->nodes_len; ++node)
+      {
+	if (dfa->nodes[node].type == CHARACTER
+	    && dfa->nodes[node].opr.c >= ASCII_CHARS)
+	  dfa->nodes[node].mb_partial = 0;
+	else if (dfa->nodes[node].type == OP_PERIOD)
+	  dfa->nodes[node].type = OP_UTF8_PERIOD;
+      }
+
+  /* The search can be in single byte locale.  */
+  dfa->mb_cur_max = 1;
+  dfa->is_utf8 = 0;
+  dfa->has_mb_node = dfa->nbackref > 0 || has_period;
+}
+#endif
+
+/* Analyze the structure tree, and calculate "first", "next", "edest",
+   "eclosure", and "inveclosure".  */
+
+static reg_errcode_t
+analyze (regex_t *preg)
+{
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
+  reg_errcode_t ret;
+
+  /* Allocate arrays.  */
+  dfa->nexts = re_malloc (Idx, dfa->nodes_alloc);
+  dfa->org_indices = re_malloc (Idx, dfa->nodes_alloc);
+  dfa->edests = re_malloc (re_node_set, dfa->nodes_alloc);
+  dfa->eclosures = re_malloc (re_node_set, dfa->nodes_alloc);
+  if (BE (dfa->nexts == NULL || dfa->org_indices == NULL || dfa->edests == NULL
+	  || dfa->eclosures == NULL, 0))
+    return REG_ESPACE;
+
+  dfa->subexp_map = re_malloc (Idx, preg->re_nsub);
+  if (dfa->subexp_map != NULL)
+    {
+      Idx i;
+      for (i = 0; i < preg->re_nsub; i++)
+	dfa->subexp_map[i] = i;
+      preorder (dfa->str_tree, optimize_subexps, dfa);
+      for (i = 0; i < preg->re_nsub; i++)
+	if (dfa->subexp_map[i] != i)
+	  break;
+      if (i == preg->re_nsub)
+	{
+	  free (dfa->subexp_map);
+	  dfa->subexp_map = NULL;
+	}
+    }
+
+  ret = postorder (dfa->str_tree, lower_subexps, preg);
+  if (BE (ret != REG_NOERROR, 0))
+    return ret;
+  ret = postorder (dfa->str_tree, calc_first, dfa);
+  if (BE (ret != REG_NOERROR, 0))
+    return ret;
+  preorder (dfa->str_tree, calc_next, dfa);
+  ret = preorder (dfa->str_tree, link_nfa_nodes, dfa);
+  if (BE (ret != REG_NOERROR, 0))
+    return ret;
+  ret = calc_eclosure (dfa);
+  if (BE (ret != REG_NOERROR, 0))
+    return ret;
+
+  /* We only need this during the prune_impossible_nodes pass in regexec.c;
+     skip it if p_i_n will not run, as calc_inveclosure can be quadratic.  */
+  if ((!preg->no_sub && preg->re_nsub > 0 && dfa->has_plural_match)
+      || dfa->nbackref)
+    {
+      dfa->inveclosures = re_malloc (re_node_set, dfa->nodes_len);
+      if (BE (dfa->inveclosures == NULL, 0))
+        return REG_ESPACE;
+      ret = calc_inveclosure (dfa);
+    }
+
+  return ret;
+}
+
+/* Our parse trees are very unbalanced, so we cannot use a stack to
+   implement parse tree visits.  Instead, we use parent pointers and
+   some hairy code in these two functions.  */
+static reg_errcode_t
+postorder (bin_tree_t *root, reg_errcode_t (fn (void *, bin_tree_t *)),
+	   void *extra)
+{
+  bin_tree_t *node, *prev;
+
+  for (node = root; ; )
+    {
+      /* Descend down the tree, preferably to the left (or to the right
+	 if that's the only child).  */
+      while (node->left || node->right)
+	if (node->left)
+          node = node->left;
+        else
+          node = node->right;
+
+      do
+	{
+	  reg_errcode_t err = fn (extra, node);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+          if (node->parent == NULL)
+	    return REG_NOERROR;
+	  prev = node;
+	  node = node->parent;
+	}
+      /* Go up while we have a node that is reached from the right.  */
+      while (node->right == prev || node->right == NULL);
+      node = node->right;
+    }
+}
+
+static reg_errcode_t
+preorder (bin_tree_t *root, reg_errcode_t (fn (void *, bin_tree_t *)),
+	  void *extra)
+{
+  bin_tree_t *node;
+
+  for (node = root; ; )
+    {
+      reg_errcode_t err = fn (extra, node);
+      if (BE (err != REG_NOERROR, 0))
+	return err;
+
+      /* Go to the left node, or up and to the right.  */
+      if (node->left)
+	node = node->left;
+      else
+	{
+	  bin_tree_t *prev = NULL;
+	  while (node->right == prev || node->right == NULL)
+	    {
+	      prev = node;
+	      node = node->parent;
+	      if (!node)
+	        return REG_NOERROR;
+	    }
+	  node = node->right;
+	}
+    }
+}
+
+/* Optimization pass: if a SUBEXP is entirely contained, strip it and tell
+   re_search_internal to map the inner one's opr.idx to this one's.  Adjust
+   backreferences as well.  Requires a preorder visit.  */
+static reg_errcode_t
+optimize_subexps (void *extra, bin_tree_t *node)
+{
+  re_dfa_t *dfa = (re_dfa_t *) extra;
+
+  if (node->token.type == OP_BACK_REF && dfa->subexp_map)
+    {
+      int idx = node->token.opr.idx;
+      node->token.opr.idx = dfa->subexp_map[idx];
+      dfa->used_bkref_map |= 1 << node->token.opr.idx;
+    }
+
+  else if (node->token.type == SUBEXP
+           && node->left && node->left->token.type == SUBEXP)
+    {
+      Idx other_idx = node->left->token.opr.idx;
+
+      node->left = node->left->left;
+      if (node->left)
+        node->left->parent = node;
+
+      dfa->subexp_map[other_idx] = dfa->subexp_map[node->token.opr.idx];
+      if (other_idx < BITSET_WORD_BITS)
+	dfa->used_bkref_map &= ~((bitset_word_t) 1 << other_idx);
+    }
+
+  return REG_NOERROR;
+}
+
+/* Lowering pass: Turn each SUBEXP node into the appropriate concatenation
+   of OP_OPEN_SUBEXP, the body of the SUBEXP (if any) and OP_CLOSE_SUBEXP.  */
+static reg_errcode_t
+lower_subexps (void *extra, bin_tree_t *node)
+{
+  regex_t *preg = (regex_t *) extra;
+  reg_errcode_t err = REG_NOERROR;
+
+  if (node->left && node->left->token.type == SUBEXP)
+    {
+      node->left = lower_subexp (&err, preg, node->left);
+      if (node->left)
+	node->left->parent = node;
+    }
+  if (node->right && node->right->token.type == SUBEXP)
+    {
+      node->right = lower_subexp (&err, preg, node->right);
+      if (node->right)
+	node->right->parent = node;
+    }
+
+  return err;
+}
+
+static bin_tree_t *
+lower_subexp (reg_errcode_t *err, regex_t *preg, bin_tree_t *node)
+{
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
+  bin_tree_t *body = node->left;
+  bin_tree_t *op, *cls, *tree1, *tree;
+
+  if (preg->no_sub
+      /* We do not optimize empty subexpressions, because otherwise we may
+	 have bad CONCAT nodes with NULL children.  This is obviously not
+	 very common, so we do not lose much.  An example that triggers
+	 this case is the sed "script" /\(\)/x.  */
+      && node->left != NULL
+      && (node->token.opr.idx >= BITSET_WORD_BITS
+	  || !(dfa->used_bkref_map
+	       & ((bitset_word_t) 1 << node->token.opr.idx))))
+    return node->left;
+
+  /* Convert the SUBEXP node to the concatenation of an
+     OP_OPEN_SUBEXP, the contents, and an OP_CLOSE_SUBEXP.  */
+  op = create_tree (dfa, NULL, NULL, OP_OPEN_SUBEXP);
+  cls = create_tree (dfa, NULL, NULL, OP_CLOSE_SUBEXP);
+  tree1 = body ? create_tree (dfa, body, cls, CONCAT) : cls;
+  tree = create_tree (dfa, op, tree1, CONCAT);
+  if (BE (tree == NULL || tree1 == NULL || op == NULL || cls == NULL, 0))
+    {
+      *err = REG_ESPACE;
+      return NULL;
+    }
+
+  op->token.opr.idx = cls->token.opr.idx = node->token.opr.idx;
+  op->token.opt_subexp = cls->token.opt_subexp = node->token.opt_subexp;
+  return tree;
+}
+
+/* Pass 1 in building the NFA: compute FIRST and create unlinked automaton
+   nodes.  Requires a postorder visit.  */
+static reg_errcode_t
+calc_first (void *extra, bin_tree_t *node)
+{
+  re_dfa_t *dfa = (re_dfa_t *) extra;
+  if (node->token.type == CONCAT)
+    {
+      node->first = node->left->first;
+      node->node_idx = node->left->node_idx;
+    }
+  else
+    {
+      node->first = node;
+      node->node_idx = re_dfa_add_node (dfa, node->token);
+      if (BE (node->node_idx == REG_MISSING, 0))
+        return REG_ESPACE;
+      if (node->token.type == ANCHOR)
+        dfa->nodes[node->node_idx].constraint = node->token.opr.ctx_type;
+    }
+  return REG_NOERROR;
+}
+
+/* Pass 2: compute NEXT on the tree.  Preorder visit.  */
+static reg_errcode_t
+calc_next (void *extra, bin_tree_t *node)
+{
+  switch (node->token.type)
+    {
+    case OP_DUP_ASTERISK:
+      node->left->next = node;
+      break;
+    case CONCAT:
+      node->left->next = node->right->first;
+      node->right->next = node->next;
+      break;
+    default:
+      if (node->left)
+	node->left->next = node->next;
+      if (node->right)
+        node->right->next = node->next;
+      break;
+    }
+  return REG_NOERROR;
+}
+
+/* Pass 3: link all DFA nodes to their NEXT node (any order will do).  */
+static reg_errcode_t
+link_nfa_nodes (void *extra, bin_tree_t *node)
+{
+  re_dfa_t *dfa = (re_dfa_t *) extra;
+  Idx idx = node->node_idx;
+  reg_errcode_t err = REG_NOERROR;
+
+  switch (node->token.type)
+    {
+    case CONCAT:
+      break;
+
+    case END_OF_RE:
+      assert (node->next == NULL);
+      break;
+
+    case OP_DUP_ASTERISK:
+    case OP_ALT:
+      {
+	Idx left, right;
+	dfa->has_plural_match = 1;
+	if (node->left != NULL)
+	  left = node->left->first->node_idx;
+	else
+	  left = node->next->node_idx;
+	if (node->right != NULL)
+	  right = node->right->first->node_idx;
+	else
+	  right = node->next->node_idx;
+	assert (REG_VALID_INDEX (left));
+	assert (REG_VALID_INDEX (right));
+	err = re_node_set_init_2 (dfa->edests + idx, left, right);
+      }
+      break;
+
+    case ANCHOR:
+    case OP_OPEN_SUBEXP:
+    case OP_CLOSE_SUBEXP:
+      err = re_node_set_init_1 (dfa->edests + idx, node->next->node_idx);
+      break;
+
+    case OP_BACK_REF:
+      dfa->nexts[idx] = node->next->node_idx;
+      if (node->token.type == OP_BACK_REF)
+	re_node_set_init_1 (dfa->edests + idx, dfa->nexts[idx]);
+      break;
+
+    default:
+      assert (!IS_EPSILON_NODE (node->token.type));
+      dfa->nexts[idx] = node->next->node_idx;
+      break;
+    }
+
+  return err;
+}
+
+/* Duplicate the epsilon closure of the node ROOT_NODE.
+   Note that duplicated nodes have constraint INIT_CONSTRAINT in addition
+   to their own constraint.  */
+
+static reg_errcode_t
+internal_function
+duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node,
+			Idx root_node, unsigned int init_constraint)
+{
+  Idx org_node, clone_node;
+  bool ok;
+  unsigned int constraint = init_constraint;
+  for (org_node = top_org_node, clone_node = top_clone_node;;)
+    {
+      Idx org_dest, clone_dest;
+      if (dfa->nodes[org_node].type == OP_BACK_REF)
+	{
+	  /* If the back reference epsilon-transit, its destination must
+	     also have the constraint.  Then duplicate the epsilon closure
+	     of the destination of the back reference, and store it in
+	     edests of the back reference.  */
+	  org_dest = dfa->nexts[org_node];
+	  re_node_set_empty (dfa->edests + clone_node);
+	  clone_dest = duplicate_node (dfa, org_dest, constraint);
+	  if (BE (clone_dest == REG_MISSING, 0))
+	    return REG_ESPACE;
+	  dfa->nexts[clone_node] = dfa->nexts[org_node];
+	  ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
+	  if (BE (! ok, 0))
+	    return REG_ESPACE;
+	}
+      else if (dfa->edests[org_node].nelem == 0)
+	{
+	  /* In case of the node can't epsilon-transit, don't duplicate the
+	     destination and store the original destination as the
+	     destination of the node.  */
+	  dfa->nexts[clone_node] = dfa->nexts[org_node];
+	  break;
+	}
+      else if (dfa->edests[org_node].nelem == 1)
+	{
+	  /* In case of the node can epsilon-transit, and it has only one
+	     destination.  */
+	  org_dest = dfa->edests[org_node].elems[0];
+	  re_node_set_empty (dfa->edests + clone_node);
+	  clone_dest = search_duplicated_node (dfa, org_dest, constraint);
+	  /* If the node is root_node itself, it means the epsilon closure
+	     has a loop.  Then tie it to the destination of the root_node.  */
+	  if (org_node == root_node && clone_node != org_node)
+	    {
+	      ok = re_node_set_insert (dfa->edests + clone_node, org_dest);
+	      if (BE (! ok, 0))
+	        return REG_ESPACE;
+	      break;
+	    }
+	  /* In case the node has another constraint, append it.  */
+	  constraint |= dfa->nodes[org_node].constraint;
+	  clone_dest = duplicate_node (dfa, org_dest, constraint);
+	  if (BE (clone_dest == REG_MISSING, 0))
+	    return REG_ESPACE;
+	  ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
+	  if (BE (! ok, 0))
+	    return REG_ESPACE;
+	}
+      else /* dfa->edests[org_node].nelem == 2 */
+	{
+	  /* In case of the node can epsilon-transit, and it has two
+	     destinations. In the bin_tree_t and DFA, that's '|' and '*'.   */
+	  org_dest = dfa->edests[org_node].elems[0];
+	  re_node_set_empty (dfa->edests + clone_node);
+	  /* Search for a duplicated node which satisfies the constraint.  */
+	  clone_dest = search_duplicated_node (dfa, org_dest, constraint);
+	  if (clone_dest == REG_MISSING)
+	    {
+	      /* There is no such duplicated node, create a new one.  */
+	      reg_errcode_t err;
+	      clone_dest = duplicate_node (dfa, org_dest, constraint);
+	      if (BE (clone_dest == REG_MISSING, 0))
+		return REG_ESPACE;
+	      ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
+	      if (BE (! ok, 0))
+		return REG_ESPACE;
+	      err = duplicate_node_closure (dfa, org_dest, clone_dest,
+					    root_node, constraint);
+	      if (BE (err != REG_NOERROR, 0))
+		return err;
+	    }
+	  else
+	    {
+	      /* There is a duplicated node which satisfy the constraint,
+		 use it to avoid infinite loop.  */
+	      ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
+	      if (BE (! ok, 0))
+		return REG_ESPACE;
+	    }
+
+	  org_dest = dfa->edests[org_node].elems[1];
+	  clone_dest = duplicate_node (dfa, org_dest, constraint);
+	  if (BE (clone_dest == REG_MISSING, 0))
+	    return REG_ESPACE;
+	  ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
+	  if (BE (! ok, 0))
+	    return REG_ESPACE;
+	}
+      org_node = org_dest;
+      clone_node = clone_dest;
+    }
+  return REG_NOERROR;
+}
+
+/* Search for a node which is duplicated from the node ORG_NODE, and
+   satisfies the constraint CONSTRAINT.  */
+
+static Idx
+search_duplicated_node (const re_dfa_t *dfa, Idx org_node,
+			unsigned int constraint)
+{
+  Idx idx;
+  for (idx = dfa->nodes_len - 1; dfa->nodes[idx].duplicated && idx > 0; --idx)
+    {
+      if (org_node == dfa->org_indices[idx]
+	  && constraint == dfa->nodes[idx].constraint)
+	return idx; /* Found.  */
+    }
+  return REG_MISSING; /* Not found.  */
+}
+
+/* Duplicate the node whose index is ORG_IDX and set the constraint CONSTRAINT.
+   Return the index of the new node, or REG_MISSING if insufficient storage is
+   available.  */
+
+static Idx
+duplicate_node (re_dfa_t *dfa, Idx org_idx, unsigned int constraint)
+{
+  Idx dup_idx = re_dfa_add_node (dfa, dfa->nodes[org_idx]);
+  if (BE (dup_idx != REG_MISSING, 1))
+    {
+      dfa->nodes[dup_idx].constraint = constraint;
+      dfa->nodes[dup_idx].constraint |= dfa->nodes[org_idx].constraint;
+      dfa->nodes[dup_idx].duplicated = 1;
+
+      /* Store the index of the original node.  */
+      dfa->org_indices[dup_idx] = org_idx;
+    }
+  return dup_idx;
+}
+
+static reg_errcode_t
+calc_inveclosure (re_dfa_t *dfa)
+{
+  Idx src, idx;
+  bool ok;
+  for (idx = 0; idx < dfa->nodes_len; ++idx)
+    re_node_set_init_empty (dfa->inveclosures + idx);
+
+  for (src = 0; src < dfa->nodes_len; ++src)
+    {
+      Idx *elems = dfa->eclosures[src].elems;
+      for (idx = 0; idx < dfa->eclosures[src].nelem; ++idx)
+	{
+	  ok = re_node_set_insert_last (dfa->inveclosures + elems[idx], src);
+	  if (BE (! ok, 0))
+	    return REG_ESPACE;
+	}
+    }
+
+  return REG_NOERROR;
+}
+
+/* Calculate "eclosure" for all the node in DFA.  */
+
+static reg_errcode_t
+calc_eclosure (re_dfa_t *dfa)
+{
+  Idx node_idx;
+  bool incomplete;
+#ifdef DEBUG
+  assert (dfa->nodes_len > 0);
+#endif
+  incomplete = false;
+  /* For each nodes, calculate epsilon closure.  */
+  for (node_idx = 0; ; ++node_idx)
+    {
+      reg_errcode_t err;
+      re_node_set eclosure_elem;
+      if (node_idx == dfa->nodes_len)
+	{
+	  if (!incomplete)
+	    break;
+	  incomplete = false;
+	  node_idx = 0;
+	}
+
+#ifdef DEBUG
+      assert (dfa->eclosures[node_idx].nelem != REG_MISSING);
+#endif
+
+      /* If we have already calculated, skip it.  */
+      if (dfa->eclosures[node_idx].nelem != 0)
+	continue;
+      /* Calculate epsilon closure of `node_idx'.  */
+      err = calc_eclosure_iter (&eclosure_elem, dfa, node_idx, true);
+      if (BE (err != REG_NOERROR, 0))
+	return err;
+
+      if (dfa->eclosures[node_idx].nelem == 0)
+	{
+	  incomplete = true;
+	  re_node_set_free (&eclosure_elem);
+	}
+    }
+  return REG_NOERROR;
+}
+
+/* Calculate epsilon closure of NODE.  */
+
+static reg_errcode_t
+calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root)
+{
+  reg_errcode_t err;
+  Idx i;
+  bool incomplete;
+  bool ok;
+  re_node_set eclosure;
+  incomplete = false;
+  err = re_node_set_alloc (&eclosure, dfa->edests[node].nelem + 1);
+  if (BE (err != REG_NOERROR, 0))
+    return err;
+
+  /* This indicates that we are calculating this node now.
+     We reference this value to avoid infinite loop.  */
+  dfa->eclosures[node].nelem = REG_MISSING;
+
+  /* If the current node has constraints, duplicate all nodes
+     since they must inherit the constraints.  */
+  if (dfa->nodes[node].constraint
+      && dfa->edests[node].nelem
+      && !dfa->nodes[dfa->edests[node].elems[0]].duplicated)
+    {
+      err = duplicate_node_closure (dfa, node, node, node,
+				    dfa->nodes[node].constraint);
+      if (BE (err != REG_NOERROR, 0))
+	return err;
+    }
+
+  /* Expand each epsilon destination nodes.  */
+  if (IS_EPSILON_NODE(dfa->nodes[node].type))
+    for (i = 0; i < dfa->edests[node].nelem; ++i)
+      {
+	re_node_set eclosure_elem;
+	Idx edest = dfa->edests[node].elems[i];
+	/* If calculating the epsilon closure of `edest' is in progress,
+	   return intermediate result.  */
+	if (dfa->eclosures[edest].nelem == REG_MISSING)
+	  {
+	    incomplete = true;
+	    continue;
+	  }
+	/* If we haven't calculated the epsilon closure of `edest' yet,
+	   calculate now. Otherwise use calculated epsilon closure.  */
+	if (dfa->eclosures[edest].nelem == 0)
+	  {
+	    err = calc_eclosure_iter (&eclosure_elem, dfa, edest, false);
+	    if (BE (err != REG_NOERROR, 0))
+	      return err;
+	  }
+	else
+	  eclosure_elem = dfa->eclosures[edest];
+	/* Merge the epsilon closure of `edest'.  */
+	re_node_set_merge (&eclosure, &eclosure_elem);
+	/* If the epsilon closure of `edest' is incomplete,
+	   the epsilon closure of this node is also incomplete.  */
+	if (dfa->eclosures[edest].nelem == 0)
+	  {
+	    incomplete = true;
+	    re_node_set_free (&eclosure_elem);
+	  }
+      }
+
+  /* Epsilon closures include itself.  */
+  ok = re_node_set_insert (&eclosure, node);
+  if (BE (! ok, 0))
+    return REG_ESPACE;
+  if (incomplete && !root)
+    dfa->eclosures[node].nelem = 0;
+  else
+    dfa->eclosures[node] = eclosure;
+  *new_set = eclosure;
+  return REG_NOERROR;
+}
+
+/* Functions for token which are used in the parser.  */
+
+/* Fetch a token from INPUT.
+   We must not use this function inside bracket expressions.  */
+
+static void
+internal_function
+fetch_token (re_token_t *result, re_string_t *input, reg_syntax_t syntax)
+{
+  re_string_skip_bytes (input, peek_token (result, input, syntax));
+}
+
+/* Peek a token from INPUT, and return the length of the token.
+   We must not use this function inside bracket expressions.  */
+
+static int
+internal_function
+peek_token (re_token_t *token, re_string_t *input, reg_syntax_t syntax)
+{
+  unsigned char c;
+
+  if (re_string_eoi (input))
+    {
+      token->type = END_OF_RE;
+      return 0;
+    }
+
+  c = re_string_peek_byte (input, 0);
+  token->opr.c = c;
+
+  token->word_char = 0;
+#ifdef RE_ENABLE_I18N
+  token->mb_partial = 0;
+  if (input->mb_cur_max > 1 &&
+      !re_string_first_byte (input, re_string_cur_idx (input)))
+    {
+      token->type = CHARACTER;
+      token->mb_partial = 1;
+      return 1;
+    }
+#endif
+  if (c == '\\')
+    {
+      unsigned char c2;
+      if (re_string_cur_idx (input) + 1 >= re_string_length (input))
+	{
+	  token->type = BACK_SLASH;
+	  return 1;
+	}
+
+      c2 = re_string_peek_byte_case (input, 1);
+      token->opr.c = c2;
+      token->type = CHARACTER;
+#ifdef RE_ENABLE_I18N
+      if (input->mb_cur_max > 1)
+	{
+	  wint_t wc = re_string_wchar_at (input,
+					  re_string_cur_idx (input) + 1);
+	  token->word_char = IS_WIDE_WORD_CHAR (wc) != 0;
+	}
+      else
+#endif
+	token->word_char = IS_WORD_CHAR (c2) != 0;
+
+      switch (c2)
+	{
+	case '|':
+	  if (!(syntax & RE_LIMITED_OPS) && !(syntax & RE_NO_BK_VBAR))
+	    token->type = OP_ALT;
+	  break;
+	case '1': case '2': case '3': case '4': case '5':
+	case '6': case '7': case '8': case '9':
+	  if (!(syntax & RE_NO_BK_REFS))
+	    {
+	      token->type = OP_BACK_REF;
+	      token->opr.idx = c2 - '1';
+	    }
+	  break;
+	case '<':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    {
+	      token->type = ANCHOR;
+	      token->opr.ctx_type = WORD_FIRST;
+	    }
+	  break;
+	case '>':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    {
+	      token->type = ANCHOR;
+	      token->opr.ctx_type = WORD_LAST;
+	    }
+	  break;
+	case 'b':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    {
+	      token->type = ANCHOR;
+	      token->opr.ctx_type = WORD_DELIM;
+	    }
+	  break;
+	case 'B':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    {
+	      token->type = ANCHOR;
+	      token->opr.ctx_type = NOT_WORD_DELIM;
+	    }
+	  break;
+	case 'w':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    token->type = OP_WORD;
+	  break;
+	case 'W':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    token->type = OP_NOTWORD;
+	  break;
+	case 's':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    token->type = OP_SPACE;
+	  break;
+	case 'S':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    token->type = OP_NOTSPACE;
+	  break;
+	case '`':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    {
+	      token->type = ANCHOR;
+	      token->opr.ctx_type = BUF_FIRST;
+	    }
+	  break;
+	case '\'':
+	  if (!(syntax & RE_NO_GNU_OPS))
+	    {
+	      token->type = ANCHOR;
+	      token->opr.ctx_type = BUF_LAST;
+	    }
+	  break;
+	case '(':
+	  if (!(syntax & RE_NO_BK_PARENS))
+	    token->type = OP_OPEN_SUBEXP;
+	  break;
+	case ')':
+	  if (!(syntax & RE_NO_BK_PARENS))
+	    token->type = OP_CLOSE_SUBEXP;
+	  break;
+	case '+':
+	  if (!(syntax & RE_LIMITED_OPS) && (syntax & RE_BK_PLUS_QM))
+	    token->type = OP_DUP_PLUS;
+	  break;
+	case '?':
+	  if (!(syntax & RE_LIMITED_OPS) && (syntax & RE_BK_PLUS_QM))
+	    token->type = OP_DUP_QUESTION;
+	  break;
+	case '{':
+	  if ((syntax & RE_INTERVALS) && (!(syntax & RE_NO_BK_BRACES)))
+	    token->type = OP_OPEN_DUP_NUM;
+	  break;
+	case '}':
+	  if ((syntax & RE_INTERVALS) && (!(syntax & RE_NO_BK_BRACES)))
+	    token->type = OP_CLOSE_DUP_NUM;
+	  break;
+	default:
+	  break;
+	}
+      return 2;
+    }
+
+  token->type = CHARACTER;
+#ifdef RE_ENABLE_I18N
+  if (input->mb_cur_max > 1)
+    {
+      wint_t wc = re_string_wchar_at (input, re_string_cur_idx (input));
+      token->word_char = IS_WIDE_WORD_CHAR (wc) != 0;
+    }
+  else
+#endif
+    token->word_char = IS_WORD_CHAR (token->opr.c);
+
+  switch (c)
+    {
+    case '\n':
+      if (syntax & RE_NEWLINE_ALT)
+	token->type = OP_ALT;
+      break;
+    case '|':
+      if (!(syntax & RE_LIMITED_OPS) && (syntax & RE_NO_BK_VBAR))
+	token->type = OP_ALT;
+      break;
+    case '*':
+      token->type = OP_DUP_ASTERISK;
+      break;
+    case '+':
+      if (!(syntax & RE_LIMITED_OPS) && !(syntax & RE_BK_PLUS_QM))
+	token->type = OP_DUP_PLUS;
+      break;
+    case '?':
+      if (!(syntax & RE_LIMITED_OPS) && !(syntax & RE_BK_PLUS_QM))
+	token->type = OP_DUP_QUESTION;
+      break;
+    case '{':
+      if ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES))
+	token->type = OP_OPEN_DUP_NUM;
+      break;
+    case '}':
+      if ((syntax & RE_INTERVALS) && (syntax & RE_NO_BK_BRACES))
+	token->type = OP_CLOSE_DUP_NUM;
+      break;
+    case '(':
+      if (syntax & RE_NO_BK_PARENS)
+	token->type = OP_OPEN_SUBEXP;
+      break;
+    case ')':
+      if (syntax & RE_NO_BK_PARENS)
+	token->type = OP_CLOSE_SUBEXP;
+      break;
+    case '[':
+      token->type = OP_OPEN_BRACKET;
+      break;
+    case '.':
+      token->type = OP_PERIOD;
+      break;
+    case '^':
+      if (!(syntax & (RE_CONTEXT_INDEP_ANCHORS | RE_CARET_ANCHORS_HERE)) &&
+	  re_string_cur_idx (input) != 0)
+	{
+	  char prev = re_string_peek_byte (input, -1);
+	  if (!(syntax & RE_NEWLINE_ALT) || prev != '\n')
+	    break;
+	}
+      token->type = ANCHOR;
+      token->opr.ctx_type = LINE_FIRST;
+      break;
+    case '$':
+      if (!(syntax & RE_CONTEXT_INDEP_ANCHORS) &&
+	  re_string_cur_idx (input) + 1 != re_string_length (input))
+	{
+	  re_token_t next;
+	  re_string_skip_bytes (input, 1);
+	  peek_token (&next, input, syntax);
+	  re_string_skip_bytes (input, -1);
+	  if (next.type != OP_ALT && next.type != OP_CLOSE_SUBEXP)
+	    break;
+	}
+      token->type = ANCHOR;
+      token->opr.ctx_type = LINE_LAST;
+      break;
+    default:
+      break;
+    }
+  return 1;
+}
+
+/* Peek a token from INPUT, and return the length of the token.
+   We must not use this function out of bracket expressions.  */
+
+static int
+internal_function
+peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax)
+{
+  unsigned char c;
+  if (re_string_eoi (input))
+    {
+      token->type = END_OF_RE;
+      return 0;
+    }
+  c = re_string_peek_byte (input, 0);
+  token->opr.c = c;
+
+#ifdef RE_ENABLE_I18N
+  if (input->mb_cur_max > 1 &&
+      !re_string_first_byte (input, re_string_cur_idx (input)))
+    {
+      token->type = CHARACTER;
+      return 1;
+    }
+#endif /* RE_ENABLE_I18N */
+
+  if (c == '\\' && (syntax & RE_BACKSLASH_ESCAPE_IN_LISTS)
+      && re_string_cur_idx (input) + 1 < re_string_length (input))
+    {
+      /* In this case, '\' escape a character.  */
+      unsigned char c2;
+      re_string_skip_bytes (input, 1);
+      c2 = re_string_peek_byte (input, 0);
+      token->opr.c = c2;
+      token->type = CHARACTER;
+      return 1;
+    }
+  if (c == '[') /* '[' is a special char in a bracket exps.  */
+    {
+      unsigned char c2;
+      int token_len;
+      if (re_string_cur_idx (input) + 1 < re_string_length (input))
+	c2 = re_string_peek_byte (input, 1);
+      else
+	c2 = 0;
+      token->opr.c = c2;
+      token_len = 2;
+      switch (c2)
+	{
+	case '.':
+	  token->type = OP_OPEN_COLL_ELEM;
+	  break;
+	case '=':
+	  token->type = OP_OPEN_EQUIV_CLASS;
+	  break;
+	case ':':
+	  if (syntax & RE_CHAR_CLASSES)
+	    {
+	      token->type = OP_OPEN_CHAR_CLASS;
+	      break;
+	    }
+	  /* else fall through.  */
+	default:
+	  token->type = CHARACTER;
+	  token->opr.c = c;
+	  token_len = 1;
+	  break;
+	}
+      return token_len;
+    }
+  switch (c)
+    {
+    case '-':
+      token->type = OP_CHARSET_RANGE;
+      break;
+    case ']':
+      token->type = OP_CLOSE_BRACKET;
+      break;
+    case '^':
+      token->type = OP_NON_MATCH_LIST;
+      break;
+    default:
+      token->type = CHARACTER;
+    }
+  return 1;
+}
+
+/* Functions for parser.  */
+
+/* Entry point of the parser.
+   Parse the regular expression REGEXP and return the structure tree.
+   If an error is occured, ERR is set by error code, and return NULL.
+   This function build the following tree, from regular expression <reg_exp>:
+	   CAT
+	   / \
+	  /   \
+   <reg_exp>  EOR
+
+   CAT means concatenation.
+   EOR means end of regular expression.  */
+
+static bin_tree_t *
+parse (re_string_t *regexp, regex_t *preg, reg_syntax_t syntax,
+       reg_errcode_t *err)
+{
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
+  bin_tree_t *tree, *eor, *root;
+  re_token_t current_token;
+  dfa->syntax = syntax;
+  fetch_token (&current_token, regexp, syntax | RE_CARET_ANCHORS_HERE);
+  tree = parse_reg_exp (regexp, preg, &current_token, syntax, 0, err);
+  if (BE (*err != REG_NOERROR && tree == NULL, 0))
+    return NULL;
+  eor = create_tree (dfa, NULL, NULL, END_OF_RE);
+  if (tree != NULL)
+    root = create_tree (dfa, tree, eor, CONCAT);
+  else
+    root = eor;
+  if (BE (eor == NULL || root == NULL, 0))
+    {
+      *err = REG_ESPACE;
+      return NULL;
+    }
+  return root;
+}
+
+/* This function build the following tree, from regular expression
+   <branch1>|<branch2>:
+	   ALT
+	   / \
+	  /   \
+   <branch1> <branch2>
+
+   ALT means alternative, which represents the operator `|'.  */
+
+static bin_tree_t *
+parse_reg_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
+	       reg_syntax_t syntax, Idx nest, reg_errcode_t *err)
+{
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
+  bin_tree_t *tree, *branch = NULL;
+  tree = parse_branch (regexp, preg, token, syntax, nest, err);
+  if (BE (*err != REG_NOERROR && tree == NULL, 0))
+    return NULL;
+
+  while (token->type == OP_ALT)
+    {
+      fetch_token (token, regexp, syntax | RE_CARET_ANCHORS_HERE);
+      if (token->type != OP_ALT && token->type != END_OF_RE
+	  && (nest == 0 || token->type != OP_CLOSE_SUBEXP))
+	{
+	  branch = parse_branch (regexp, preg, token, syntax, nest, err);
+	  if (BE (*err != REG_NOERROR && branch == NULL, 0))
+	    return NULL;
+	}
+      else
+	branch = NULL;
+      tree = create_tree (dfa, tree, branch, OP_ALT);
+      if (BE (tree == NULL, 0))
+	{
+	  *err = REG_ESPACE;
+	  return NULL;
+	}
+    }
+  return tree;
+}
+
+/* This function build the following tree, from regular expression
+   <exp1><exp2>:
+	CAT
+	/ \
+       /   \
+   <exp1> <exp2>
+
+   CAT means concatenation.  */
+
+static bin_tree_t *
+parse_branch (re_string_t *regexp, regex_t *preg, re_token_t *token,
+	      reg_syntax_t syntax, Idx nest, reg_errcode_t *err)
+{
+  bin_tree_t *tree, *expr;
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
+  tree = parse_expression (regexp, preg, token, syntax, nest, err);
+  if (BE (*err != REG_NOERROR && tree == NULL, 0))
+    return NULL;
+
+  while (token->type != OP_ALT && token->type != END_OF_RE
+	 && (nest == 0 || token->type != OP_CLOSE_SUBEXP))
+    {
+      expr = parse_expression (regexp, preg, token, syntax, nest, err);
+      if (BE (*err != REG_NOERROR && expr == NULL, 0))
+	{
+	  return NULL;
+	}
+      if (tree != NULL && expr != NULL)
+	{
+	  tree = create_tree (dfa, tree, expr, CONCAT);
+	  if (tree == NULL)
+	    {
+	      *err = REG_ESPACE;
+	      return NULL;
+	    }
+	}
+      else if (tree == NULL)
+	tree = expr;
+      /* Otherwise expr == NULL, we don't need to create new tree.  */
+    }
+  return tree;
+}
+
+/* This function build the following tree, from regular expression a*:
+	 *
+	 |
+	 a
+*/
+
+static bin_tree_t *
+parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
+		  reg_syntax_t syntax, Idx nest, reg_errcode_t *err)
+{
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
+  bin_tree_t *tree;
+  switch (token->type)
+    {
+    case CHARACTER:
+      tree = create_token_tree (dfa, NULL, NULL, token);
+      if (BE (tree == NULL, 0))
+	{
+	  *err = REG_ESPACE;
+	  return NULL;
+	}
+#ifdef RE_ENABLE_I18N
+      if (dfa->mb_cur_max > 1)
+	{
+	  while (!re_string_eoi (regexp)
+		 && !re_string_first_byte (regexp, re_string_cur_idx (regexp)))
+	    {
+	      bin_tree_t *mbc_remain;
+	      fetch_token (token, regexp, syntax);
+	      mbc_remain = create_token_tree (dfa, NULL, NULL, token);
+	      tree = create_tree (dfa, tree, mbc_remain, CONCAT);
+	      if (BE (mbc_remain == NULL || tree == NULL, 0))
+		{
+		  *err = REG_ESPACE;
+		  return NULL;
+		}
+	    }
+	}
+#endif
+      break;
+    case OP_OPEN_SUBEXP:
+      tree = parse_sub_exp (regexp, preg, token, syntax, nest + 1, err);
+      if (BE (*err != REG_NOERROR && tree == NULL, 0))
+	return NULL;
+      break;
+    case OP_OPEN_BRACKET:
+      tree = parse_bracket_exp (regexp, dfa, token, syntax, err);
+      if (BE (*err != REG_NOERROR && tree == NULL, 0))
+	return NULL;
+      break;
+    case OP_BACK_REF:
+      if (!BE (dfa->completed_bkref_map & (1 << token->opr.idx), 1))
+	{
+	  *err = REG_ESUBREG;
+	  return NULL;
+	}
+      dfa->used_bkref_map |= 1 << token->opr.idx;
+      tree = create_token_tree (dfa, NULL, NULL, token);
+      if (BE (tree == NULL, 0))
+	{
+	  *err = REG_ESPACE;
+	  return NULL;
+	}
+      ++dfa->nbackref;
+      dfa->has_mb_node = 1;
+      break;
+    case OP_OPEN_DUP_NUM:
+      if (syntax & RE_CONTEXT_INVALID_DUP)
+	{
+	  *err = REG_BADRPT;
+	  return NULL;
+	}
+      /* FALLTHROUGH */
+    case OP_DUP_ASTERISK:
+    case OP_DUP_PLUS:
+    case OP_DUP_QUESTION:
+      if (syntax & RE_CONTEXT_INVALID_OPS)
+	{
+	  *err = REG_BADRPT;
+	  return NULL;
+	}
+      else if (syntax & RE_CONTEXT_INDEP_OPS)
+	{
+	  fetch_token (token, regexp, syntax);
+	  return parse_expression (regexp, preg, token, syntax, nest, err);
+	}
+      /* else fall through  */
+    case OP_CLOSE_SUBEXP:
+      if ((token->type == OP_CLOSE_SUBEXP) &&
+	  !(syntax & RE_UNMATCHED_RIGHT_PAREN_ORD))
+	{
+	  *err = REG_ERPAREN;
+	  return NULL;
+	}
+      /* else fall through  */
+    case OP_CLOSE_DUP_NUM:
+      /* We treat it as a normal character.  */
+
+      /* Then we can these characters as normal characters.  */
+      token->type = CHARACTER;
+      /* mb_partial and word_char bits should be initialized already
+	 by peek_token.  */
+      tree = create_token_tree (dfa, NULL, NULL, token);
+      if (BE (tree == NULL, 0))
+	{
+	  *err = REG_ESPACE;
+	  return NULL;
+	}
+      break;
+    case ANCHOR:
+      if ((token->opr.ctx_type
+	   & (WORD_DELIM | NOT_WORD_DELIM | WORD_FIRST | WORD_LAST))
+	  && dfa->word_ops_used == 0)
+	init_word_char (dfa);
+      if (token->opr.ctx_type == WORD_DELIM
+          || token->opr.ctx_type == NOT_WORD_DELIM)
+	{
+	  bin_tree_t *tree_first, *tree_last;
+	  if (token->opr.ctx_type == WORD_DELIM)
+	    {
+	      token->opr.ctx_type = WORD_FIRST;
+	      tree_first = create_token_tree (dfa, NULL, NULL, token);
+	      token->opr.ctx_type = WORD_LAST;
+            }
+          else
+            {
+	      token->opr.ctx_type = INSIDE_WORD;
+	      tree_first = create_token_tree (dfa, NULL, NULL, token);
+	      token->opr.ctx_type = INSIDE_NOTWORD;
+            }
+	  tree_last = create_token_tree (dfa, NULL, NULL, token);
+	  tree = create_tree (dfa, tree_first, tree_last, OP_ALT);
+	  if (BE (tree_first == NULL || tree_last == NULL || tree == NULL, 0))
+	    {
+	      *err = REG_ESPACE;
+	      return NULL;
+	    }
+	}
+      else
+	{
+	  tree = create_token_tree (dfa, NULL, NULL, token);
+	  if (BE (tree == NULL, 0))
+	    {
+	      *err = REG_ESPACE;
+	      return NULL;
+	    }
+	}
+      /* We must return here, since ANCHORs can't be followed
+	 by repetition operators.
+	 eg. RE"^*" is invalid or "<ANCHOR(^)><CHAR(*)>",
+	     it must not be "<ANCHOR(^)><REPEAT(*)>".  */
+      fetch_token (token, regexp, syntax);
+      return tree;
+    case OP_PERIOD:
+      tree = create_token_tree (dfa, NULL, NULL, token);
+      if (BE (tree == NULL, 0))
+	{
+	  *err = REG_ESPACE;
+	  return NULL;
+	}
+      if (dfa->mb_cur_max > 1)
+	dfa->has_mb_node = 1;
+      break;
+    case OP_WORD:
+    case OP_NOTWORD:
+      tree = build_charclass_op (dfa, regexp->trans,
+				 (const unsigned char *) "alnum",
+				 (const unsigned char *) "_",
+				 token->type == OP_NOTWORD, err);
+      if (BE (*err != REG_NOERROR && tree == NULL, 0))
+	return NULL;
+      break;
+    case OP_SPACE:
+    case OP_NOTSPACE:
+      tree = build_charclass_op (dfa, regexp->trans,
+				 (const unsigned char *) "space",
+				 (const unsigned char *) "",
+				 token->type == OP_NOTSPACE, err);
+      if (BE (*err != REG_NOERROR && tree == NULL, 0))
+	return NULL;
+      break;
+    case OP_ALT:
+    case END_OF_RE:
+      return NULL;
+    case BACK_SLASH:
+      *err = REG_EESCAPE;
+      return NULL;
+    default:
+      /* Must not happen?  */
+#ifdef DEBUG
+      assert (0);
+#endif
+      return NULL;
+    }
+  fetch_token (token, regexp, syntax);
+
+  while (token->type == OP_DUP_ASTERISK || token->type == OP_DUP_PLUS
+	 || token->type == OP_DUP_QUESTION || token->type == OP_OPEN_DUP_NUM)
+    {
+      tree = parse_dup_op (tree, regexp, dfa, token, syntax, err);
+      if (BE (*err != REG_NOERROR && tree == NULL, 0))
+	return NULL;
+      /* In BRE consecutive duplications are not allowed.  */
+      if ((syntax & RE_CONTEXT_INVALID_DUP)
+	  && (token->type == OP_DUP_ASTERISK
+	      || token->type == OP_OPEN_DUP_NUM))
+	{
+	  *err = REG_BADRPT;
+	  return NULL;
+	}
+    }
+
+  return tree;
+}
+
+/* This function build the following tree, from regular expression
+   (<reg_exp>):
+	 SUBEXP
+	    |
+	<reg_exp>
+*/
+
+static bin_tree_t *
+parse_sub_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
+	       reg_syntax_t syntax, Idx nest, reg_errcode_t *err)
+{
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
+  bin_tree_t *tree;
+  size_t cur_nsub;
+  cur_nsub = preg->re_nsub++;
+
+  fetch_token (token, regexp, syntax | RE_CARET_ANCHORS_HERE);
+
+  /* The subexpression may be a null string.  */
+  if (token->type == OP_CLOSE_SUBEXP)
+    tree = NULL;
+  else
+    {
+      tree = parse_reg_exp (regexp, preg, token, syntax, nest, err);
+      if (BE (*err == REG_NOERROR && token->type != OP_CLOSE_SUBEXP, 0))
+        *err = REG_EPAREN;
+      if (BE (*err != REG_NOERROR, 0))
+	return NULL;
+    }
+
+  if (cur_nsub <= '9' - '1')
+    dfa->completed_bkref_map |= 1 << cur_nsub;
+
+  tree = create_tree (dfa, tree, NULL, SUBEXP);
+  if (BE (tree == NULL, 0))
+    {
+      *err = REG_ESPACE;
+      return NULL;
+    }
+  tree->token.opr.idx = cur_nsub;
+  return tree;
+}
+
+/* This function parse repetition operators like "*", "+", "{1,3}" etc.  */
+
+static bin_tree_t *
+parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
+	      re_token_t *token, reg_syntax_t syntax, reg_errcode_t *err)
+{
+  bin_tree_t *tree = NULL, *old_tree = NULL;
+  Idx i, start, end, start_idx = re_string_cur_idx (regexp);
+  re_token_t start_token = *token;
+
+  if (token->type == OP_OPEN_DUP_NUM)
+    {
+      end = 0;
+      start = fetch_number (regexp, token, syntax);
+      if (start == REG_MISSING)
+	{
+	  if (token->type == CHARACTER && token->opr.c == ',')
+	    start = 0; /* We treat "{,m}" as "{0,m}".  */
+	  else
+	    {
+	      *err = REG_BADBR; /* <re>{} is invalid.  */
+	      return NULL;
+	    }
+	}
+      if (BE (start != REG_ERROR, 1))
+	{
+	  /* We treat "{n}" as "{n,n}".  */
+	  end = ((token->type == OP_CLOSE_DUP_NUM) ? start
+		 : ((token->type == CHARACTER && token->opr.c == ',')
+		    ? fetch_number (regexp, token, syntax) : REG_ERROR));
+	}
+      if (BE (start == REG_ERROR || end == REG_ERROR, 0))
+	{
+	  /* Invalid sequence.  */
+	  if (BE (!(syntax & RE_INVALID_INTERVAL_ORD), 0))
+	    {
+	      if (token->type == END_OF_RE)
+		*err = REG_EBRACE;
+	      else
+		*err = REG_BADBR;
+
+	      return NULL;
+	    }
+
+	  /* If the syntax bit is set, rollback.  */
+	  re_string_set_index (regexp, start_idx);
+	  *token = start_token;
+	  token->type = CHARACTER;
+	  /* mb_partial and word_char bits should be already initialized by
+	     peek_token.  */
+	  return elem;
+	}
+
+      if (BE (end != REG_MISSING && start > end, 0))
+	{
+	  /* First number greater than second.  */
+	  *err = REG_BADBR;
+	  return NULL;
+	}
+    }
+  else
+    {
+      start = (token->type == OP_DUP_PLUS) ? 1 : 0;
+      end = (token->type == OP_DUP_QUESTION) ? 1 : REG_MISSING;
+    }
+
+  fetch_token (token, regexp, syntax);
+
+  if (BE (elem == NULL, 0))
+    return NULL;
+  if (BE (start == 0 && end == 0, 0))
+    {
+      postorder (elem, free_tree, NULL);
+      return NULL;
+    }
+
+  /* Extract "<re>{n,m}" to "<re><re>...<re><re>{0,<m-n>}".  */
+  if (BE (start > 0, 0))
+    {
+      tree = elem;
+      for (i = 2; i <= start; ++i)
+	{
+	  elem = duplicate_tree (elem, dfa);
+	  tree = create_tree (dfa, tree, elem, CONCAT);
+	  if (BE (elem == NULL || tree == NULL, 0))
+	    goto parse_dup_op_espace;
+	}
+
+      if (start == end)
+	return tree;
+
+      /* Duplicate ELEM before it is marked optional.  */
+      elem = duplicate_tree (elem, dfa);
+      old_tree = tree;
+    }
+  else
+    old_tree = NULL;
+
+  if (elem->token.type == SUBEXP)
+    postorder (elem, mark_opt_subexp, (void *) (long) elem->token.opr.idx);
+
+  tree = create_tree (dfa, elem, NULL,
+		      (end == REG_MISSING ? OP_DUP_ASTERISK : OP_ALT));
+  if (BE (tree == NULL, 0))
+    goto parse_dup_op_espace;
+
+  /* This loop is actually executed only when end != REG_MISSING,
+     to rewrite <re>{0,n} as (<re>(<re>...<re>?)?)?...  We have
+     already created the start+1-th copy.  */
+  if ((Idx) -1 < 0 || end != REG_MISSING)
+    for (i = start + 2; i <= end; ++i)
+      {
+	elem = duplicate_tree (elem, dfa);
+	tree = create_tree (dfa, tree, elem, CONCAT);
+	if (BE (elem == NULL || tree == NULL, 0))
+	  goto parse_dup_op_espace;
+
+	tree = create_tree (dfa, tree, NULL, OP_ALT);
+	if (BE (tree == NULL, 0))
+	  goto parse_dup_op_espace;
+      }
+
+  if (old_tree)
+    tree = create_tree (dfa, old_tree, tree, CONCAT);
+
+  return tree;
+
+ parse_dup_op_espace:
+  *err = REG_ESPACE;
+  return NULL;
+}
+
+/* Size of the names for collating symbol/equivalence_class/character_class.
+   I'm not sure, but maybe enough.  */
+#define BRACKET_NAME_BUF_SIZE 32
+
+#ifndef _LIBC
+  /* Local function for parse_bracket_exp only used in case of NOT _LIBC.
+     Build the range expression which starts from START_ELEM, and ends
+     at END_ELEM.  The result are written to MBCSET and SBCSET.
+     RANGE_ALLOC is the allocated size of mbcset->range_starts, and
+     mbcset->range_ends, is a pointer argument sinse we may
+     update it.  */
+
+static reg_errcode_t
+internal_function
+# ifdef RE_ENABLE_I18N
+build_range_exp (bitset_t sbcset, re_charset_t *mbcset, Idx *range_alloc,
+		 bracket_elem_t *start_elem, bracket_elem_t *end_elem)
+# else /* not RE_ENABLE_I18N */
+build_range_exp (bitset_t sbcset, bracket_elem_t *start_elem,
+		 bracket_elem_t *end_elem)
+# endif /* not RE_ENABLE_I18N */
+{
+  unsigned int start_ch, end_ch;
+  /* Equivalence Classes and Character Classes can't be a range start/end.  */
+  if (BE (start_elem->type == EQUIV_CLASS || start_elem->type == CHAR_CLASS
+	  || end_elem->type == EQUIV_CLASS || end_elem->type == CHAR_CLASS,
+	  0))
+    return REG_ERANGE;
+
+  /* We can handle no multi character collating elements without libc
+     support.  */
+  if (BE ((start_elem->type == COLL_SYM
+	   && strlen ((char *) start_elem->opr.name) > 1)
+	  || (end_elem->type == COLL_SYM
+	      && strlen ((char *) end_elem->opr.name) > 1), 0))
+    return REG_ECOLLATE;
+
+# ifdef RE_ENABLE_I18N
+  {
+    wchar_t wc;
+    wint_t start_wc;
+    wint_t end_wc;
+    wchar_t cmp_buf[6] = {L'\0', L'\0', L'\0', L'\0', L'\0', L'\0'};
+
+    start_ch = ((start_elem->type == SB_CHAR) ? start_elem->opr.ch
+		: ((start_elem->type == COLL_SYM) ? start_elem->opr.name[0]
+		   : 0));
+    end_ch = ((end_elem->type == SB_CHAR) ? end_elem->opr.ch
+	      : ((end_elem->type == COLL_SYM) ? end_elem->opr.name[0]
+		 : 0));
+    start_wc = ((start_elem->type == SB_CHAR || start_elem->type == COLL_SYM)
+		? __btowc (start_ch) : start_elem->opr.wch);
+    end_wc = ((end_elem->type == SB_CHAR || end_elem->type == COLL_SYM)
+	      ? __btowc (end_ch) : end_elem->opr.wch);
+    if (start_wc == WEOF || end_wc == WEOF)
+      return REG_ECOLLATE;
+    cmp_buf[0] = start_wc;
+    cmp_buf[4] = end_wc;
+    if (wcscoll (cmp_buf, cmp_buf + 4) > 0)
+      return REG_ERANGE;
+
+    /* Got valid collation sequence values, add them as a new entry.
+       However, for !_LIBC we have no collation elements: if the
+       character set is single byte, the single byte character set
+       that we build below suffices.  parse_bracket_exp passes
+       no MBCSET if dfa->mb_cur_max == 1.  */
+    if (mbcset)
+      {
+        /* Check the space of the arrays.  */
+        if (BE (*range_alloc == mbcset->nranges, 0))
+          {
+	    /* There is not enough space, need realloc.  */
+	    wchar_t *new_array_start, *new_array_end;
+	    Idx new_nranges;
+
+	    /* +1 in case of mbcset->nranges is 0.  */
+	    new_nranges = 2 * mbcset->nranges + 1;
+	    /* Use realloc since mbcset->range_starts and mbcset->range_ends
+	       are NULL if *range_alloc == 0.  */
+	    new_array_start = re_realloc (mbcset->range_starts, wchar_t,
+				          new_nranges);
+	    new_array_end = re_realloc (mbcset->range_ends, wchar_t,
+				        new_nranges);
+
+	    if (BE (new_array_start == NULL || new_array_end == NULL, 0))
+	      return REG_ESPACE;
+
+	    mbcset->range_starts = new_array_start;
+	    mbcset->range_ends = new_array_end;
+	    *range_alloc = new_nranges;
+          }
+
+        mbcset->range_starts[mbcset->nranges] = start_wc;
+        mbcset->range_ends[mbcset->nranges++] = end_wc;
+      }
+
+    /* Build the table for single byte characters.  */
+    for (wc = 0; wc < SBC_MAX; ++wc)
+      {
+	cmp_buf[2] = wc;
+	if (wcscoll (cmp_buf, cmp_buf + 2) <= 0
+	    && wcscoll (cmp_buf + 2, cmp_buf + 4) <= 0)
+	  bitset_set (sbcset, wc);
+      }
+  }
+# else /* not RE_ENABLE_I18N */
+  {
+    unsigned int ch;
+    start_ch = ((start_elem->type == SB_CHAR ) ? start_elem->opr.ch
+		: ((start_elem->type == COLL_SYM) ? start_elem->opr.name[0]
+		   : 0));
+    end_ch = ((end_elem->type == SB_CHAR ) ? end_elem->opr.ch
+	      : ((end_elem->type == COLL_SYM) ? end_elem->opr.name[0]
+		 : 0));
+    if (start_ch > end_ch)
+      return REG_ERANGE;
+    /* Build the table for single byte characters.  */
+    for (ch = 0; ch < SBC_MAX; ++ch)
+      if (start_ch <= ch  && ch <= end_ch)
+	bitset_set (sbcset, ch);
+  }
+# endif /* not RE_ENABLE_I18N */
+  return REG_NOERROR;
+}
+#endif /* not _LIBC */
+
+#ifndef _LIBC
+/* Helper function for parse_bracket_exp only used in case of NOT _LIBC..
+   Build the collating element which is represented by NAME.
+   The result are written to MBCSET and SBCSET.
+   COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a
+   pointer argument since we may update it.  */
+
+static reg_errcode_t
+internal_function
+build_collating_symbol (bitset_t sbcset,
+# ifdef RE_ENABLE_I18N
+			re_charset_t *mbcset, Idx *coll_sym_alloc,
+# endif
+			const unsigned char *name)
+{
+  size_t name_len = strlen ((const char *) name);
+  if (BE (name_len != 1, 0))
+    return REG_ECOLLATE;
+  else
+    {
+      bitset_set (sbcset, name[0]);
+      return REG_NOERROR;
+    }
+}
+#endif /* not _LIBC */
+
+/* This function parse bracket expression like "[abc]", "[a-c]",
+   "[[.a-a.]]" etc.  */
+
+static bin_tree_t *
+parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
+		   reg_syntax_t syntax, reg_errcode_t *err)
+{
+#ifdef _LIBC
+  const unsigned char *collseqmb;
+  const char *collseqwc;
+  uint32_t nrules;
+  int32_t table_size;
+  const int32_t *symb_table;
+  const unsigned char *extra;
+
+  /* Local function for parse_bracket_exp used in _LIBC environement.
+     Seek the collating symbol entry correspondings to NAME.
+     Return the index of the symbol in the SYMB_TABLE.  */
+
+  auto inline int32_t
+  __attribute ((always_inline))
+  seek_collating_symbol_entry (name, name_len)
+	 const unsigned char *name;
+	 size_t name_len;
+    {
+      int32_t hash = elem_hash ((const char *) name, name_len);
+      int32_t elem = hash % table_size;
+      if (symb_table[2 * elem] != 0)
+	{
+	  int32_t second = hash % (table_size - 2) + 1;
+
+	  do
+	    {
+	      /* First compare the hashing value.  */
+	      if (symb_table[2 * elem] == hash
+		  /* Compare the length of the name.  */
+		  && name_len == extra[symb_table[2 * elem + 1]]
+		  /* Compare the name.  */
+		  && memcmp (name, &extra[symb_table[2 * elem + 1] + 1],
+			     name_len) == 0)
+		{
+		  /* Yep, this is the entry.  */
+		  break;
+		}
+
+	      /* Next entry.  */
+	      elem += second;
+	    }
+	  while (symb_table[2 * elem] != 0);
+	}
+      return elem;
+    }
+
+  /* Local function for parse_bracket_exp used in _LIBC environement.
+     Look up the collation sequence value of BR_ELEM.
+     Return the value if succeeded, UINT_MAX otherwise.  */
+
+  auto inline unsigned int
+  __attribute ((always_inline))
+  lookup_collation_sequence_value (br_elem)
+	 bracket_elem_t *br_elem;
+    {
+      if (br_elem->type == SB_CHAR)
+	{
+	  /*
+	  if (MB_CUR_MAX == 1)
+	  */
+	  if (nrules == 0)
+	    return collseqmb[br_elem->opr.ch];
+	  else
+	    {
+	      wint_t wc = __btowc (br_elem->opr.ch);
+	      return __collseq_table_lookup (collseqwc, wc);
+	    }
+	}
+      else if (br_elem->type == MB_CHAR)
+	{
+	  return __collseq_table_lookup (collseqwc, br_elem->opr.wch);
+	}
+      else if (br_elem->type == COLL_SYM)
+	{
+	  size_t sym_name_len = strlen ((char *) br_elem->opr.name);
+	  if (nrules != 0)
+	    {
+	      int32_t elem, idx;
+	      elem = seek_collating_symbol_entry (br_elem->opr.name,
+						  sym_name_len);
+	      if (symb_table[2 * elem] != 0)
+		{
+		  /* We found the entry.  */
+		  idx = symb_table[2 * elem + 1];
+		  /* Skip the name of collating element name.  */
+		  idx += 1 + extra[idx];
+		  /* Skip the byte sequence of the collating element.  */
+		  idx += 1 + extra[idx];
+		  /* Adjust for the alignment.  */
+		  idx = (idx + 3) & ~3;
+		  /* Skip the multibyte collation sequence value.  */
+		  idx += sizeof (unsigned int);
+		  /* Skip the wide char sequence of the collating element.  */
+		  idx += sizeof (unsigned int) *
+		    (1 + *(unsigned int *) (extra + idx));
+		  /* Return the collation sequence value.  */
+		  return *(unsigned int *) (extra + idx);
+		}
+	      else if (symb_table[2 * elem] == 0 && sym_name_len == 1)
+		{
+		  /* No valid character.  Match it as a single byte
+		     character.  */
+		  return collseqmb[br_elem->opr.name[0]];
+		}
+	    }
+	  else if (sym_name_len == 1)
+	    return collseqmb[br_elem->opr.name[0]];
+	}
+      return UINT_MAX;
+    }
+
+  /* Local function for parse_bracket_exp used in _LIBC environement.
+     Build the range expression which starts from START_ELEM, and ends
+     at END_ELEM.  The result are written to MBCSET and SBCSET.
+     RANGE_ALLOC is the allocated size of mbcset->range_starts, and
+     mbcset->range_ends, is a pointer argument sinse we may
+     update it.  */
+
+  auto inline reg_errcode_t
+  __attribute ((always_inline))
+  build_range_exp (sbcset, mbcset, range_alloc, start_elem, end_elem)
+	 re_charset_t *mbcset;
+	 Idx *range_alloc;
+	 bitset_t sbcset;
+	 bracket_elem_t *start_elem, *end_elem;
+    {
+      unsigned int ch;
+      uint32_t start_collseq;
+      uint32_t end_collseq;
+
+      /* Equivalence Classes and Character Classes can't be a range
+	 start/end.  */
+      if (BE (start_elem->type == EQUIV_CLASS || start_elem->type == CHAR_CLASS
+	      || end_elem->type == EQUIV_CLASS || end_elem->type == CHAR_CLASS,
+	      0))
+	return REG_ERANGE;
+
+      start_collseq = lookup_collation_sequence_value (start_elem);
+      end_collseq = lookup_collation_sequence_value (end_elem);
+      /* Check start/end collation sequence values.  */
+      if (BE (start_collseq == UINT_MAX || end_collseq == UINT_MAX, 0))
+	return REG_ECOLLATE;
+      if (BE ((syntax & RE_NO_EMPTY_RANGES) && start_collseq > end_collseq, 0))
+	return REG_ERANGE;
+
+      /* Got valid collation sequence values, add them as a new entry.
+	 However, if we have no collation elements, and the character set
+	 is single byte, the single byte character set that we
+	 build below suffices. */
+      if (nrules > 0 || dfa->mb_cur_max > 1)
+	{
+          /* Check the space of the arrays.  */
+          if (BE (*range_alloc == mbcset->nranges, 0))
+	    {
+	      /* There is not enough space, need realloc.  */
+	      uint32_t *new_array_start;
+	      uint32_t *new_array_end;
+	      Idx new_nranges;
+
+	      /* +1 in case of mbcset->nranges is 0.  */
+	      new_nranges = 2 * mbcset->nranges + 1;
+	      new_array_start = re_realloc (mbcset->range_starts, uint32_t,
+					    new_nranges);
+	      new_array_end = re_realloc (mbcset->range_ends, uint32_t,
+				          new_nranges);
+
+	      if (BE (new_array_start == NULL || new_array_end == NULL, 0))
+	        return REG_ESPACE;
+
+	      mbcset->range_starts = new_array_start;
+	      mbcset->range_ends = new_array_end;
+	      *range_alloc = new_nranges;
+	    }
+
+          mbcset->range_starts[mbcset->nranges] = start_collseq;
+          mbcset->range_ends[mbcset->nranges++] = end_collseq;
+	}
+
+      /* Build the table for single byte characters.  */
+      for (ch = 0; ch < SBC_MAX; ch++)
+	{
+	  uint32_t ch_collseq;
+	  /*
+	  if (MB_CUR_MAX == 1)
+	  */
+	  if (nrules == 0)
+	    ch_collseq = collseqmb[ch];
+	  else
+	    ch_collseq = __collseq_table_lookup (collseqwc, __btowc (ch));
+	  if (start_collseq <= ch_collseq && ch_collseq <= end_collseq)
+	    bitset_set (sbcset, ch);
+	}
+      return REG_NOERROR;
+    }
+
+  /* Local function for parse_bracket_exp used in _LIBC environement.
+     Build the collating element which is represented by NAME.
+     The result are written to MBCSET and SBCSET.
+     COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a
+     pointer argument sinse we may update it.  */
+
+  auto inline reg_errcode_t
+  __attribute ((always_inline))
+  build_collating_symbol (sbcset, mbcset, coll_sym_alloc, name)
+	 re_charset_t *mbcset;
+	 Idx *coll_sym_alloc;
+	 bitset_t sbcset;
+	 const unsigned char *name;
+    {
+      int32_t elem, idx;
+      size_t name_len = strlen ((const char *) name);
+      if (nrules != 0)
+	{
+	  elem = seek_collating_symbol_entry (name, name_len);
+	  if (symb_table[2 * elem] != 0)
+	    {
+	      /* We found the entry.  */
+	      idx = symb_table[2 * elem + 1];
+	      /* Skip the name of collating element name.  */
+	      idx += 1 + extra[idx];
+	    }
+	  else if (symb_table[2 * elem] == 0 && name_len == 1)
+	    {
+	      /* No valid character, treat it as a normal
+		 character.  */
+	      bitset_set (sbcset, name[0]);
+	      return REG_NOERROR;
+	    }
+	  else
+	    return REG_ECOLLATE;
+
+	  /* Got valid collation sequence, add it as a new entry.  */
+	  /* Check the space of the arrays.  */
+	  if (BE (*coll_sym_alloc == mbcset->ncoll_syms, 0))
+	    {
+	      /* Not enough, realloc it.  */
+	      /* +1 in case of mbcset->ncoll_syms is 0.  */
+	      Idx new_coll_sym_alloc = 2 * mbcset->ncoll_syms + 1;
+	      /* Use realloc since mbcset->coll_syms is NULL
+		 if *alloc == 0.  */
+	      int32_t *new_coll_syms = re_realloc (mbcset->coll_syms, int32_t,
+						   new_coll_sym_alloc);
+	      if (BE (new_coll_syms == NULL, 0))
+		return REG_ESPACE;
+	      mbcset->coll_syms = new_coll_syms;
+	      *coll_sym_alloc = new_coll_sym_alloc;
+	    }
+	  mbcset->coll_syms[mbcset->ncoll_syms++] = idx;
+	  return REG_NOERROR;
+	}
+      else
+	{
+	  if (BE (name_len != 1, 0))
+	    return REG_ECOLLATE;
+	  else
+	    {
+	      bitset_set (sbcset, name[0]);
+	      return REG_NOERROR;
+	    }
+	}
+    }
+#endif
+
+  re_token_t br_token;
+  re_bitset_ptr_t sbcset;
+#ifdef RE_ENABLE_I18N
+  re_charset_t *mbcset;
+  Idx coll_sym_alloc = 0, range_alloc = 0, mbchar_alloc = 0;
+  Idx equiv_class_alloc = 0, char_class_alloc = 0;
+#endif /* not RE_ENABLE_I18N */
+  bool non_match = false;
+  bin_tree_t *work_tree;
+  int token_len;
+  bool first_round = true;
+#ifdef _LIBC
+  collseqmb = (const unsigned char *)
+    _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQMB);
+  nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+  if (nrules)
+    {
+      /*
+      if (MB_CUR_MAX > 1)
+      */
+      collseqwc = _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQWC);
+      table_size = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_SYMB_HASH_SIZEMB);
+      symb_table = (const int32_t *) _NL_CURRENT (LC_COLLATE,
+						  _NL_COLLATE_SYMB_TABLEMB);
+      extra = (const unsigned char *) _NL_CURRENT (LC_COLLATE,
+						   _NL_COLLATE_SYMB_EXTRAMB);
+    }
+#endif
+  sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
+#ifdef RE_ENABLE_I18N
+  mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
+#endif /* RE_ENABLE_I18N */
+#ifdef RE_ENABLE_I18N
+  if (BE (sbcset == NULL || mbcset == NULL, 0))
+#else
+  if (BE (sbcset == NULL, 0))
+#endif /* RE_ENABLE_I18N */
+    {
+      *err = REG_ESPACE;
+      return NULL;
+    }
+
+  token_len = peek_token_bracket (token, regexp, syntax);
+  if (BE (token->type == END_OF_RE, 0))
+    {
+      *err = REG_BADPAT;
+      goto parse_bracket_exp_free_return;
+    }
+  if (token->type == OP_NON_MATCH_LIST)
+    {
+#ifdef RE_ENABLE_I18N
+      mbcset->non_match = 1;
+#endif /* not RE_ENABLE_I18N */
+      non_match = true;
+      if (syntax & RE_HAT_LISTS_NOT_NEWLINE)
+	bitset_set (sbcset, '\n');
+      re_string_skip_bytes (regexp, token_len); /* Skip a token.  */
+      token_len = peek_token_bracket (token, regexp, syntax);
+      if (BE (token->type == END_OF_RE, 0))
+	{
+	  *err = REG_BADPAT;
+	  goto parse_bracket_exp_free_return;
+	}
+    }
+
+  /* We treat the first ']' as a normal character.  */
+  if (token->type == OP_CLOSE_BRACKET)
+    token->type = CHARACTER;
+
+  while (1)
+    {
+      bracket_elem_t start_elem, end_elem;
+      unsigned char start_name_buf[BRACKET_NAME_BUF_SIZE];
+      unsigned char end_name_buf[BRACKET_NAME_BUF_SIZE];
+      reg_errcode_t ret;
+      int token_len2 = 0;
+      bool is_range_exp = false;
+      re_token_t token2;
+
+      start_elem.opr.name = start_name_buf;
+      ret = parse_bracket_element (&start_elem, regexp, token, token_len, dfa,
+				   syntax, first_round);
+      if (BE (ret != REG_NOERROR, 0))
+	{
+	  *err = ret;
+	  goto parse_bracket_exp_free_return;
+	}
+      first_round = false;
+
+      /* Get information about the next token.  We need it in any case.  */
+      token_len = peek_token_bracket (token, regexp, syntax);
+
+      /* Do not check for ranges if we know they are not allowed.  */
+      if (start_elem.type != CHAR_CLASS && start_elem.type != EQUIV_CLASS)
+	{
+	  if (BE (token->type == END_OF_RE, 0))
+	    {
+	      *err = REG_EBRACK;
+	      goto parse_bracket_exp_free_return;
+	    }
+	  if (token->type == OP_CHARSET_RANGE)
+	    {
+	      re_string_skip_bytes (regexp, token_len); /* Skip '-'.  */
+	      token_len2 = peek_token_bracket (&token2, regexp, syntax);
+	      if (BE (token2.type == END_OF_RE, 0))
+		{
+		  *err = REG_EBRACK;
+		  goto parse_bracket_exp_free_return;
+		}
+	      if (token2.type == OP_CLOSE_BRACKET)
+		{
+		  /* We treat the last '-' as a normal character.  */
+		  re_string_skip_bytes (regexp, -token_len);
+		  token->type = CHARACTER;
+		}
+	      else
+		is_range_exp = true;
+	    }
+	}
+
+      if (is_range_exp == true)
+	{
+	  end_elem.opr.name = end_name_buf;
+	  ret = parse_bracket_element (&end_elem, regexp, &token2, token_len2,
+				       dfa, syntax, true);
+	  if (BE (ret != REG_NOERROR, 0))
+	    {
+	      *err = ret;
+	      goto parse_bracket_exp_free_return;
+	    }
+
+	  token_len = peek_token_bracket (token, regexp, syntax);
+
+#ifdef _LIBC
+	  *err = build_range_exp (sbcset, mbcset, &range_alloc,
+				  &start_elem, &end_elem);
+#else
+# ifdef RE_ENABLE_I18N
+	  *err = build_range_exp (sbcset,
+				  dfa->mb_cur_max > 1 ? mbcset : NULL,
+				  &range_alloc, &start_elem, &end_elem);
+# else
+	  *err = build_range_exp (sbcset, &start_elem, &end_elem);
+# endif
+#endif /* RE_ENABLE_I18N */
+	  if (BE (*err != REG_NOERROR, 0))
+	    goto parse_bracket_exp_free_return;
+	}
+      else
+	{
+	  switch (start_elem.type)
+	    {
+	    case SB_CHAR:
+	      bitset_set (sbcset, start_elem.opr.ch);
+	      break;
+#ifdef RE_ENABLE_I18N
+	    case MB_CHAR:
+	      /* Check whether the array has enough space.  */
+	      if (BE (mbchar_alloc == mbcset->nmbchars, 0))
+		{
+		  wchar_t *new_mbchars;
+		  /* Not enough, realloc it.  */
+		  /* +1 in case of mbcset->nmbchars is 0.  */
+		  mbchar_alloc = 2 * mbcset->nmbchars + 1;
+		  /* Use realloc since array is NULL if *alloc == 0.  */
+		  new_mbchars = re_realloc (mbcset->mbchars, wchar_t,
+					    mbchar_alloc);
+		  if (BE (new_mbchars == NULL, 0))
+		    goto parse_bracket_exp_espace;
+		  mbcset->mbchars = new_mbchars;
+		}
+	      mbcset->mbchars[mbcset->nmbchars++] = start_elem.opr.wch;
+	      break;
+#endif /* RE_ENABLE_I18N */
+	    case EQUIV_CLASS:
+	      *err = build_equiv_class (sbcset,
+#ifdef RE_ENABLE_I18N
+					mbcset, &equiv_class_alloc,
+#endif /* RE_ENABLE_I18N */
+					start_elem.opr.name);
+	      if (BE (*err != REG_NOERROR, 0))
+		goto parse_bracket_exp_free_return;
+	      break;
+	    case COLL_SYM:
+	      *err = build_collating_symbol (sbcset,
+#ifdef RE_ENABLE_I18N
+					     mbcset, &coll_sym_alloc,
+#endif /* RE_ENABLE_I18N */
+					     start_elem.opr.name);
+	      if (BE (*err != REG_NOERROR, 0))
+		goto parse_bracket_exp_free_return;
+	      break;
+	    case CHAR_CLASS:
+	      *err = build_charclass (regexp->trans, sbcset,
+#ifdef RE_ENABLE_I18N
+				      mbcset, &char_class_alloc,
+#endif /* RE_ENABLE_I18N */
+				      start_elem.opr.name, syntax);
+	      if (BE (*err != REG_NOERROR, 0))
+	       goto parse_bracket_exp_free_return;
+	      break;
+	    default:
+	      assert (0);
+	      break;
+	    }
+	}
+      if (BE (token->type == END_OF_RE, 0))
+	{
+	  *err = REG_EBRACK;
+	  goto parse_bracket_exp_free_return;
+	}
+      if (token->type == OP_CLOSE_BRACKET)
+	break;
+    }
+
+  re_string_skip_bytes (regexp, token_len); /* Skip a token.  */
+
+  /* If it is non-matching list.  */
+  if (non_match)
+    bitset_not (sbcset);
+
+#ifdef RE_ENABLE_I18N
+  /* Ensure only single byte characters are set.  */
+  if (dfa->mb_cur_max > 1)
+    bitset_mask (sbcset, dfa->sb_char);
+
+  if (mbcset->nmbchars || mbcset->ncoll_syms || mbcset->nequiv_classes
+      || mbcset->nranges || (dfa->mb_cur_max > 1 && (mbcset->nchar_classes
+						     || mbcset->non_match)))
+    {
+      bin_tree_t *mbc_tree;
+      int sbc_idx;
+      /* Build a tree for complex bracket.  */
+      dfa->has_mb_node = 1;
+      br_token.type = COMPLEX_BRACKET;
+      br_token.opr.mbcset = mbcset;
+      mbc_tree = create_token_tree (dfa, NULL, NULL, &br_token);
+      if (BE (mbc_tree == NULL, 0))
+	goto parse_bracket_exp_espace;
+      for (sbc_idx = 0; sbc_idx < BITSET_WORDS; ++sbc_idx)
+	if (sbcset[sbc_idx])
+	  break;
+      /* If there are no bits set in sbcset, there is no point
+	 of having both SIMPLE_BRACKET and COMPLEX_BRACKET.  */
+      if (sbc_idx < BITSET_WORDS)
+	{
+          /* Build a tree for simple bracket.  */
+          br_token.type = SIMPLE_BRACKET;
+          br_token.opr.sbcset = sbcset;
+          work_tree = create_token_tree (dfa, NULL, NULL, &br_token);
+          if (BE (work_tree == NULL, 0))
+            goto parse_bracket_exp_espace;
+
+          /* Then join them by ALT node.  */
+          work_tree = create_tree (dfa, work_tree, mbc_tree, OP_ALT);
+          if (BE (work_tree == NULL, 0))
+            goto parse_bracket_exp_espace;
+	}
+      else
+	{
+	  re_free (sbcset);
+	  work_tree = mbc_tree;
+	}
+    }
+  else
+#endif /* not RE_ENABLE_I18N */
+    {
+#ifdef RE_ENABLE_I18N
+      free_charset (mbcset);
+#endif
+      /* Build a tree for simple bracket.  */
+      br_token.type = SIMPLE_BRACKET;
+      br_token.opr.sbcset = sbcset;
+      work_tree = create_token_tree (dfa, NULL, NULL, &br_token);
+      if (BE (work_tree == NULL, 0))
+        goto parse_bracket_exp_espace;
+    }
+  return work_tree;
+
+ parse_bracket_exp_espace:
+  *err = REG_ESPACE;
+ parse_bracket_exp_free_return:
+  re_free (sbcset);
+#ifdef RE_ENABLE_I18N
+  free_charset (mbcset);
+#endif /* RE_ENABLE_I18N */
+  return NULL;
+}
+
+/* Parse an element in the bracket expression.  */
+
+static reg_errcode_t
+parse_bracket_element (bracket_elem_t *elem, re_string_t *regexp,
+		       re_token_t *token, int token_len, re_dfa_t *dfa,
+		       reg_syntax_t syntax, bool accept_hyphen)
+{
+#ifdef RE_ENABLE_I18N
+  int cur_char_size;
+  cur_char_size = re_string_char_size_at (regexp, re_string_cur_idx (regexp));
+  if (cur_char_size > 1)
+    {
+      elem->type = MB_CHAR;
+      elem->opr.wch = re_string_wchar_at (regexp, re_string_cur_idx (regexp));
+      re_string_skip_bytes (regexp, cur_char_size);
+      return REG_NOERROR;
+    }
+#endif /* RE_ENABLE_I18N */
+  re_string_skip_bytes (regexp, token_len); /* Skip a token.  */
+  if (token->type == OP_OPEN_COLL_ELEM || token->type == OP_OPEN_CHAR_CLASS
+      || token->type == OP_OPEN_EQUIV_CLASS)
+    return parse_bracket_symbol (elem, regexp, token);
+  if (BE (token->type == OP_CHARSET_RANGE, 0) && !accept_hyphen)
+    {
+      /* A '-' must only appear as anything but a range indicator before
+	 the closing bracket.  Everything else is an error.  */
+      re_token_t token2;
+      (void) peek_token_bracket (&token2, regexp, syntax);
+      if (token2.type != OP_CLOSE_BRACKET)
+	/* The actual error value is not standardized since this whole
+	   case is undefined.  But ERANGE makes good sense.  */
+	return REG_ERANGE;
+    }
+  elem->type = SB_CHAR;
+  elem->opr.ch = token->opr.c;
+  return REG_NOERROR;
+}
+
+/* Parse a bracket symbol in the bracket expression.  Bracket symbols are
+   such as [:<character_class>:], [.<collating_element>.], and
+   [=<equivalent_class>=].  */
+
+static reg_errcode_t
+parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp,
+		      re_token_t *token)
+{
+  unsigned char ch, delim = token->opr.c;
+  int i = 0;
+  if (re_string_eoi(regexp))
+    return REG_EBRACK;
+  for (;; ++i)
+    {
+      if (i >= BRACKET_NAME_BUF_SIZE)
+	return REG_EBRACK;
+      if (token->type == OP_OPEN_CHAR_CLASS)
+	ch = re_string_fetch_byte_case (regexp);
+      else
+	ch = re_string_fetch_byte (regexp);
+      if (re_string_eoi(regexp))
+	return REG_EBRACK;
+      if (ch == delim && re_string_peek_byte (regexp, 0) == ']')
+	break;
+      elem->opr.name[i] = ch;
+    }
+  re_string_skip_bytes (regexp, 1);
+  elem->opr.name[i] = '\0';
+  switch (token->type)
+    {
+    case OP_OPEN_COLL_ELEM:
+      elem->type = COLL_SYM;
+      break;
+    case OP_OPEN_EQUIV_CLASS:
+      elem->type = EQUIV_CLASS;
+      break;
+    case OP_OPEN_CHAR_CLASS:
+      elem->type = CHAR_CLASS;
+      break;
+    default:
+      break;
+    }
+  return REG_NOERROR;
+}
+
+  /* Helper function for parse_bracket_exp.
+     Build the equivalence class which is represented by NAME.
+     The result are written to MBCSET and SBCSET.
+     EQUIV_CLASS_ALLOC is the allocated size of mbcset->equiv_classes,
+     is a pointer argument sinse we may update it.  */
+
+static reg_errcode_t
+#ifdef RE_ENABLE_I18N
+build_equiv_class (bitset_t sbcset, re_charset_t *mbcset,
+		   Idx *equiv_class_alloc, const unsigned char *name)
+#else /* not RE_ENABLE_I18N */
+build_equiv_class (bitset_t sbcset, const unsigned char *name)
+#endif /* not RE_ENABLE_I18N */
+{
+#ifdef _LIBC
+  uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+  if (nrules != 0)
+    {
+      const int32_t *table, *indirect;
+      const unsigned char *weights, *extra, *cp;
+      unsigned char char_buf[2];
+      int32_t idx1, idx2;
+      unsigned int ch;
+      size_t len;
+      /* This #include defines a local function!  */
+# include <locale/weight.h>
+      /* Calculate the index for equivalence class.  */
+      cp = name;
+      table = (const int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
+      weights = (const unsigned char *) _NL_CURRENT (LC_COLLATE,
+					       _NL_COLLATE_WEIGHTMB);
+      extra = (const unsigned char *) _NL_CURRENT (LC_COLLATE,
+						   _NL_COLLATE_EXTRAMB);
+      indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE,
+						_NL_COLLATE_INDIRECTMB);
+      idx1 = findidx (&cp);
+      if (BE (idx1 == 0 || cp < name + strlen ((const char *) name), 0))
+	/* This isn't a valid character.  */
+	return REG_ECOLLATE;
+
+      /* Build single byte matcing table for this equivalence class.  */
+      char_buf[1] = (unsigned char) '\0';
+      len = weights[idx1];
+      for (ch = 0; ch < SBC_MAX; ++ch)
+	{
+	  char_buf[0] = ch;
+	  cp = char_buf;
+	  idx2 = findidx (&cp);
+/*
+	  idx2 = table[ch];
+*/
+	  if (idx2 == 0)
+	    /* This isn't a valid character.  */
+	    continue;
+	  if (len == weights[idx2])
+	    {
+	      int cnt = 0;
+	      while (cnt <= len &&
+		     weights[idx1 + 1 + cnt] == weights[idx2 + 1 + cnt])
+		++cnt;
+
+	      if (cnt > len)
+		bitset_set (sbcset, ch);
+	    }
+	}
+      /* Check whether the array has enough space.  */
+      if (BE (*equiv_class_alloc == mbcset->nequiv_classes, 0))
+	{
+	  /* Not enough, realloc it.  */
+	  /* +1 in case of mbcset->nequiv_classes is 0.  */
+	  Idx new_equiv_class_alloc = 2 * mbcset->nequiv_classes + 1;
+	  /* Use realloc since the array is NULL if *alloc == 0.  */
+	  int32_t *new_equiv_classes = re_realloc (mbcset->equiv_classes,
+						   int32_t,
+						   new_equiv_class_alloc);
+	  if (BE (new_equiv_classes == NULL, 0))
+	    return REG_ESPACE;
+	  mbcset->equiv_classes = new_equiv_classes;
+	  *equiv_class_alloc = new_equiv_class_alloc;
+	}
+      mbcset->equiv_classes[mbcset->nequiv_classes++] = idx1;
+    }
+  else
+#endif /* _LIBC */
+    {
+      if (BE (strlen ((const char *) name) != 1, 0))
+	return REG_ECOLLATE;
+      bitset_set (sbcset, *name);
+    }
+  return REG_NOERROR;
+}
+
+  /* Helper function for parse_bracket_exp.
+     Build the character class which is represented by NAME.
+     The result are written to MBCSET and SBCSET.
+     CHAR_CLASS_ALLOC is the allocated size of mbcset->char_classes,
+     is a pointer argument sinse we may update it.  */
+
+static reg_errcode_t
+#ifdef RE_ENABLE_I18N
+build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset,
+		 re_charset_t *mbcset, Idx *char_class_alloc,
+		 const unsigned char *class_name, reg_syntax_t syntax)
+#else /* not RE_ENABLE_I18N */
+build_charclass (RE_TRANSLATE_TYPE trans, bitset_t sbcset,
+		 const unsigned char *class_name, reg_syntax_t syntax)
+#endif /* not RE_ENABLE_I18N */
+{
+  int i;
+  const char *name = (const char *) class_name;
+
+  /* In case of REG_ICASE "upper" and "lower" match the both of
+     upper and lower cases.  */
+  if ((syntax & RE_ICASE)
+      && (strcmp (name, "upper") == 0 || strcmp (name, "lower") == 0))
+    name = "alpha";
+
+#ifdef RE_ENABLE_I18N
+  /* Check the space of the arrays.  */
+  if (BE (*char_class_alloc == mbcset->nchar_classes, 0))
+    {
+      /* Not enough, realloc it.  */
+      /* +1 in case of mbcset->nchar_classes is 0.  */
+      Idx new_char_class_alloc = 2 * mbcset->nchar_classes + 1;
+      /* Use realloc since array is NULL if *alloc == 0.  */
+      wctype_t *new_char_classes = re_realloc (mbcset->char_classes, wctype_t,
+					       new_char_class_alloc);
+      if (BE (new_char_classes == NULL, 0))
+	return REG_ESPACE;
+      mbcset->char_classes = new_char_classes;
+      *char_class_alloc = new_char_class_alloc;
+    }
+  mbcset->char_classes[mbcset->nchar_classes++] = __wctype (name);
+#endif /* RE_ENABLE_I18N */
+
+#define BUILD_CHARCLASS_LOOP(ctype_func)	\
+  do {						\
+    if (BE (trans != NULL, 0))			\
+      {						\
+	for (i = 0; i < SBC_MAX; ++i)		\
+	  if (ctype_func (i))			\
+	    bitset_set (sbcset, trans[i]);	\
+      }						\
+    else					\
+      {						\
+	for (i = 0; i < SBC_MAX; ++i)		\
+	  if (ctype_func (i))			\
+	    bitset_set (sbcset, i);		\
+      }						\
+  } while (0)
+
+  if (strcmp (name, "alnum") == 0)
+    BUILD_CHARCLASS_LOOP (isalnum);
+  else if (strcmp (name, "cntrl") == 0)
+    BUILD_CHARCLASS_LOOP (iscntrl);
+  else if (strcmp (name, "lower") == 0)
+    BUILD_CHARCLASS_LOOP (islower);
+  else if (strcmp (name, "space") == 0)
+    BUILD_CHARCLASS_LOOP (isspace);
+  else if (strcmp (name, "alpha") == 0)
+    BUILD_CHARCLASS_LOOP (isalpha);
+  else if (strcmp (name, "digit") == 0)
+    BUILD_CHARCLASS_LOOP (isdigit);
+  else if (strcmp (name, "print") == 0)
+    BUILD_CHARCLASS_LOOP (isprint);
+  else if (strcmp (name, "upper") == 0)
+    BUILD_CHARCLASS_LOOP (isupper);
+  else if (strcmp (name, "blank") == 0)
+    BUILD_CHARCLASS_LOOP (isblank);
+  else if (strcmp (name, "graph") == 0)
+    BUILD_CHARCLASS_LOOP (isgraph);
+  else if (strcmp (name, "punct") == 0)
+    BUILD_CHARCLASS_LOOP (ispunct);
+  else if (strcmp (name, "xdigit") == 0)
+    BUILD_CHARCLASS_LOOP (isxdigit);
+  else
+    return REG_ECTYPE;
+
+  return REG_NOERROR;
+}
+
+static bin_tree_t *
+build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
+		    const unsigned char *class_name,
+		    const unsigned char *extra, bool non_match,
+		    reg_errcode_t *err)
+{
+  re_bitset_ptr_t sbcset;
+#ifdef RE_ENABLE_I18N
+  re_charset_t *mbcset;
+  Idx alloc = 0;
+#endif /* not RE_ENABLE_I18N */
+  reg_errcode_t ret;
+  re_token_t br_token;
+  bin_tree_t *tree;
+
+  sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
+#ifdef RE_ENABLE_I18N
+  mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
+#endif /* RE_ENABLE_I18N */
+
+#ifdef RE_ENABLE_I18N
+  if (BE (sbcset == NULL || mbcset == NULL, 0))
+#else /* not RE_ENABLE_I18N */
+  if (BE (sbcset == NULL, 0))
+#endif /* not RE_ENABLE_I18N */
+    {
+      *err = REG_ESPACE;
+      return NULL;
+    }
+
+  if (non_match)
+    {
+#ifdef RE_ENABLE_I18N
+      mbcset->non_match = 1;
+#endif /* not RE_ENABLE_I18N */
+    }
+
+  /* We don't care the syntax in this case.  */
+  ret = build_charclass (trans, sbcset,
+#ifdef RE_ENABLE_I18N
+			 mbcset, &alloc,
+#endif /* RE_ENABLE_I18N */
+			 class_name, 0);
+
+  if (BE (ret != REG_NOERROR, 0))
+    {
+      re_free (sbcset);
+#ifdef RE_ENABLE_I18N
+      free_charset (mbcset);
+#endif /* RE_ENABLE_I18N */
+      *err = ret;
+      return NULL;
+    }
+  /* \w match '_' also.  */
+  for (; *extra; extra++)
+    bitset_set (sbcset, *extra);
+
+  /* If it is non-matching list.  */
+  if (non_match)
+    bitset_not (sbcset);
+
+#ifdef RE_ENABLE_I18N
+  /* Ensure only single byte characters are set.  */
+  if (dfa->mb_cur_max > 1)
+    bitset_mask (sbcset, dfa->sb_char);
+#endif
+
+  /* Build a tree for simple bracket.  */
+  br_token.type = SIMPLE_BRACKET;
+  br_token.opr.sbcset = sbcset;
+  tree = create_token_tree (dfa, NULL, NULL, &br_token);
+  if (BE (tree == NULL, 0))
+    goto build_word_op_espace;
+
+#ifdef RE_ENABLE_I18N
+  if (dfa->mb_cur_max > 1)
+    {
+      bin_tree_t *mbc_tree;
+      /* Build a tree for complex bracket.  */
+      br_token.type = COMPLEX_BRACKET;
+      br_token.opr.mbcset = mbcset;
+      dfa->has_mb_node = 1;
+      mbc_tree = create_token_tree (dfa, NULL, NULL, &br_token);
+      if (BE (mbc_tree == NULL, 0))
+	goto build_word_op_espace;
+      /* Then join them by ALT node.  */
+      tree = create_tree (dfa, tree, mbc_tree, OP_ALT);
+      if (BE (mbc_tree != NULL, 1))
+	return tree;
+    }
+  else
+    {
+      free_charset (mbcset);
+      return tree;
+    }
+#else /* not RE_ENABLE_I18N */
+  return tree;
+#endif /* not RE_ENABLE_I18N */
+
+ build_word_op_espace:
+  re_free (sbcset);
+#ifdef RE_ENABLE_I18N
+  free_charset (mbcset);
+#endif /* RE_ENABLE_I18N */
+  *err = REG_ESPACE;
+  return NULL;
+}
+
+/* This is intended for the expressions like "a{1,3}".
+   Fetch a number from `input', and return the number.
+   Return REG_MISSING if the number field is empty like "{,1}".
+   Return REG_ERROR if an error occurred.  */
+
+static Idx
+fetch_number (re_string_t *input, re_token_t *token, reg_syntax_t syntax)
+{
+  Idx num = REG_MISSING;
+  unsigned char c;
+  while (1)
+    {
+      fetch_token (token, input, syntax);
+      c = token->opr.c;
+      if (BE (token->type == END_OF_RE, 0))
+	return REG_ERROR;
+      if (token->type == OP_CLOSE_DUP_NUM || c == ',')
+	break;
+      num = ((token->type != CHARACTER || c < '0' || '9' < c
+	      || num == REG_ERROR)
+	     ? REG_ERROR
+	     : ((num == REG_MISSING) ? c - '0' : num * 10 + c - '0'));
+      num = (num > RE_DUP_MAX) ? REG_ERROR : num;
+    }
+  return num;
+}
+
+#ifdef RE_ENABLE_I18N
+static void
+free_charset (re_charset_t *cset)
+{
+  re_free (cset->mbchars);
+# ifdef _LIBC
+  re_free (cset->coll_syms);
+  re_free (cset->equiv_classes);
+  re_free (cset->range_starts);
+  re_free (cset->range_ends);
+# endif
+  re_free (cset->char_classes);
+  re_free (cset);
+}
+#endif /* RE_ENABLE_I18N */
+
+/* Functions for binary tree operation.  */
+
+/* Create a tree node.  */
+
+static bin_tree_t *
+create_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right,
+	     re_token_type_t type)
+{
+  re_token_t t;
+  t.type = type;
+  return create_token_tree (dfa, left, right, &t);
+}
+
+static bin_tree_t *
+create_token_tree (re_dfa_t *dfa, bin_tree_t *left, bin_tree_t *right,
+		   const re_token_t *token)
+{
+  bin_tree_t *tree;
+  if (BE (dfa->str_tree_storage_idx == BIN_TREE_STORAGE_SIZE, 0))
+    {
+      bin_tree_storage_t *storage = re_malloc (bin_tree_storage_t, 1);
+
+      if (storage == NULL)
+	return NULL;
+      storage->next = dfa->str_tree_storage;
+      dfa->str_tree_storage = storage;
+      dfa->str_tree_storage_idx = 0;
+    }
+  tree = &dfa->str_tree_storage->data[dfa->str_tree_storage_idx++];
+
+  tree->parent = NULL;
+  tree->left = left;
+  tree->right = right;
+  tree->token = *token;
+  tree->token.duplicated = 0;
+  tree->token.opt_subexp = 0;
+  tree->first = NULL;
+  tree->next = NULL;
+  tree->node_idx = REG_MISSING;
+
+  if (left != NULL)
+    left->parent = tree;
+  if (right != NULL)
+    right->parent = tree;
+  return tree;
+}
+
+/* Mark the tree SRC as an optional subexpression.
+   To be called from preorder or postorder.  */
+
+static reg_errcode_t
+mark_opt_subexp (void *extra, bin_tree_t *node)
+{
+  Idx idx = (Idx) (long) extra;
+  if (node->token.type == SUBEXP && node->token.opr.idx == idx)
+    node->token.opt_subexp = 1;
+
+  return REG_NOERROR;
+}
+
+/* Free the allocated memory inside NODE. */
+
+static void
+free_token (re_token_t *node)
+{
+#ifdef RE_ENABLE_I18N
+  if (node->type == COMPLEX_BRACKET && node->duplicated == 0)
+    free_charset (node->opr.mbcset);
+  else
+#endif /* RE_ENABLE_I18N */
+    if (node->type == SIMPLE_BRACKET && node->duplicated == 0)
+      re_free (node->opr.sbcset);
+}
+
+/* Worker function for tree walking.  Free the allocated memory inside NODE
+   and its children. */
+
+static reg_errcode_t
+free_tree (void *extra, bin_tree_t *node)
+{
+  free_token (&node->token);
+  return REG_NOERROR;
+}
+
+
+/* Duplicate the node SRC, and return new node.  This is a preorder
+   visit similar to the one implemented by the generic visitor, but
+   we need more infrastructure to maintain two parallel trees --- so,
+   it's easier to duplicate.  */
+
+static bin_tree_t *
+duplicate_tree (const bin_tree_t *root, re_dfa_t *dfa)
+{
+  const bin_tree_t *node;
+  bin_tree_t *dup_root;
+  bin_tree_t **p_new = &dup_root, *dup_node = root->parent;
+
+  for (node = root; ; )
+    {
+      /* Create a new tree and link it back to the current parent.  */
+      *p_new = create_token_tree (dfa, NULL, NULL, &node->token);
+      if (*p_new == NULL)
+	return NULL;
+      (*p_new)->parent = dup_node;
+      (*p_new)->token.duplicated = 1;
+      dup_node = *p_new;
+
+      /* Go to the left node, or up and to the right.  */
+      if (node->left)
+	{
+	  node = node->left;
+	  p_new = &dup_node->left;
+	}
+      else
+	{
+	  const bin_tree_t *prev = NULL;
+	  while (node->right == prev || node->right == NULL)
+	    {
+	      prev = node;
+	      node = node->parent;
+	      dup_node = dup_node->parent;
+	      if (!node)
+	        return dup_root;
+	    }
+	  node = node->right;
+	  p_new = &dup_node->right;
+	}
+    }
+}
diff --git a/gnulib/regex.c b/gnulib/regex.c
new file mode 100644
index 000000000..76998f8d3
--- /dev/null
+++ b/gnulib/regex.c
@@ -0,0 +1,26 @@
+/* Extended regular expression matching and search library.
+   Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+#include <grub/regex.h>
+
+#include "regex_internal.h"
+
+#include "regex_internal.c"
+#include "regcomp.c"
+#include "regexec.c"
diff --git a/gnulib/regex_internal.c b/gnulib/regex_internal.c
new file mode 100644
index 000000000..904b88ed9
--- /dev/null
+++ b/gnulib/regex_internal.c
@@ -0,0 +1,1737 @@
+/* Extended regular expression matching and search library.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+static void re_string_construct_common (const char *str, Idx len,
+					re_string_t *pstr,
+					RE_TRANSLATE_TYPE trans, bool icase,
+					const re_dfa_t *dfa) internal_function;
+static re_dfastate_t *create_ci_newstate (const re_dfa_t *dfa,
+					  const re_node_set *nodes,
+					  re_hashval_t hash) internal_function;
+static re_dfastate_t *create_cd_newstate (const re_dfa_t *dfa,
+					  const re_node_set *nodes,
+					  unsigned int context,
+					  re_hashval_t hash) internal_function;
+
+/* Functions for string operation.  */
+
+/* This function allocate the buffers.  It is necessary to call
+   re_string_reconstruct before using the object.  */
+
+static reg_errcode_t
+internal_function
+re_string_allocate (re_string_t *pstr, const char *str, Idx len, Idx init_len,
+		    RE_TRANSLATE_TYPE trans, bool icase, const re_dfa_t *dfa)
+{
+  reg_errcode_t ret;
+  Idx init_buf_len;
+
+  /* Ensure at least one character fits into the buffers.  */
+  if (init_len < dfa->mb_cur_max)
+    init_len = dfa->mb_cur_max;
+  init_buf_len = (len + 1 < init_len) ? len + 1: init_len;
+  re_string_construct_common (str, len, pstr, trans, icase, dfa);
+
+  ret = re_string_realloc_buffers (pstr, init_buf_len);
+  if (BE (ret != REG_NOERROR, 0))
+    return ret;
+
+  pstr->word_char = dfa->word_char;
+  pstr->word_ops_used = dfa->word_ops_used;
+  pstr->mbs = pstr->mbs_allocated ? pstr->mbs : (unsigned char *) str;
+  pstr->valid_len = (pstr->mbs_allocated || dfa->mb_cur_max > 1) ? 0 : len;
+  pstr->valid_raw_len = pstr->valid_len;
+  return REG_NOERROR;
+}
+
+/* This function allocate the buffers, and initialize them.  */
+
+static reg_errcode_t
+internal_function
+re_string_construct (re_string_t *pstr, const char *str, Idx len,
+		     RE_TRANSLATE_TYPE trans, bool icase, const re_dfa_t *dfa)
+{
+  reg_errcode_t ret;
+  memset (pstr, '\0', sizeof (re_string_t));
+  re_string_construct_common (str, len, pstr, trans, icase, dfa);
+
+  if (len > 0)
+    {
+      ret = re_string_realloc_buffers (pstr, len + 1);
+      if (BE (ret != REG_NOERROR, 0))
+	return ret;
+    }
+  pstr->mbs = pstr->mbs_allocated ? pstr->mbs : (unsigned char *) str;
+
+  if (icase)
+    {
+#ifdef RE_ENABLE_I18N
+      if (dfa->mb_cur_max > 1)
+	{
+	  while (1)
+	    {
+	      ret = build_wcs_upper_buffer (pstr);
+	      if (BE (ret != REG_NOERROR, 0))
+		return ret;
+	      if (pstr->valid_raw_len >= len)
+		break;
+	      if (pstr->bufs_len > pstr->valid_len + dfa->mb_cur_max)
+		break;
+	      ret = re_string_realloc_buffers (pstr, pstr->bufs_len * 2);
+	      if (BE (ret != REG_NOERROR, 0))
+		return ret;
+	    }
+	}
+      else
+#endif /* RE_ENABLE_I18N  */
+	build_upper_buffer (pstr);
+    }
+  else
+    {
+#ifdef RE_ENABLE_I18N
+      if (dfa->mb_cur_max > 1)
+	build_wcs_buffer (pstr);
+      else
+#endif /* RE_ENABLE_I18N  */
+	{
+	  if (trans != NULL)
+	    re_string_translate_buffer (pstr);
+	  else
+	    {
+	      pstr->valid_len = pstr->bufs_len;
+	      pstr->valid_raw_len = pstr->bufs_len;
+	    }
+	}
+    }
+
+  return REG_NOERROR;
+}
+
+/* Helper functions for re_string_allocate, and re_string_construct.  */
+
+static reg_errcode_t
+internal_function
+re_string_realloc_buffers (re_string_t *pstr, Idx new_buf_len)
+{
+#ifdef RE_ENABLE_I18N
+  if (pstr->mb_cur_max > 1)
+    {
+      wint_t *new_wcs;
+
+      /* Avoid overflow.  */
+      size_t max_object_size = MAX (sizeof (wint_t), sizeof (Idx));
+      if (BE (SIZE_MAX / max_object_size < new_buf_len, 0))
+	return REG_ESPACE;
+
+      new_wcs = re_realloc (pstr->wcs, wint_t, new_buf_len);
+      if (BE (new_wcs == NULL, 0))
+	return REG_ESPACE;
+      pstr->wcs = new_wcs;
+      if (pstr->offsets != NULL)
+	{
+	  Idx *new_offsets = re_realloc (pstr->offsets, Idx, new_buf_len);
+	  if (BE (new_offsets == NULL, 0))
+	    return REG_ESPACE;
+	  pstr->offsets = new_offsets;
+	}
+    }
+#endif /* RE_ENABLE_I18N  */
+  if (pstr->mbs_allocated)
+    {
+      unsigned char *new_mbs = re_realloc (pstr->mbs, unsigned char,
+					   new_buf_len);
+      if (BE (new_mbs == NULL, 0))
+	return REG_ESPACE;
+      pstr->mbs = new_mbs;
+    }
+  pstr->bufs_len = new_buf_len;
+  return REG_NOERROR;
+}
+
+
+static void
+internal_function
+re_string_construct_common (const char *str, Idx len, re_string_t *pstr,
+			    RE_TRANSLATE_TYPE trans, bool icase,
+			    const re_dfa_t *dfa)
+{
+  pstr->raw_mbs = (const unsigned char *) str;
+  pstr->len = len;
+  pstr->raw_len = len;
+  pstr->trans = trans;
+  pstr->icase = icase;
+  pstr->mbs_allocated = (trans != NULL || icase);
+  pstr->mb_cur_max = dfa->mb_cur_max;
+  pstr->is_utf8 = dfa->is_utf8;
+  pstr->map_notascii = dfa->map_notascii;
+  pstr->stop = pstr->len;
+  pstr->raw_stop = pstr->stop;
+}
+
+#ifdef RE_ENABLE_I18N
+
+/* Build wide character buffer PSTR->WCS.
+   If the byte sequence of the string are:
+     <mb1>(0), <mb1>(1), <mb2>(0), <mb2>(1), <sb3>
+   Then wide character buffer will be:
+     <wc1>   , WEOF    , <wc2>   , WEOF    , <wc3>
+   We use WEOF for padding, they indicate that the position isn't
+   a first byte of a multibyte character.
+
+   Note that this function assumes PSTR->VALID_LEN elements are already
+   built and starts from PSTR->VALID_LEN.  */
+
+static void
+internal_function
+build_wcs_buffer (re_string_t *pstr)
+{
+#ifdef _LIBC
+  unsigned char buf[MB_LEN_MAX];
+  assert (MB_LEN_MAX >= pstr->mb_cur_max);
+#else
+  unsigned char buf[64];
+#endif
+  mbstate_t prev_st;
+  Idx byte_idx, end_idx, remain_len;
+  size_t mbclen;
+
+  /* Build the buffers from pstr->valid_len to either pstr->len or
+     pstr->bufs_len.  */
+  end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len;
+  for (byte_idx = pstr->valid_len; byte_idx < end_idx;)
+    {
+      wchar_t wc;
+      const char *p;
+
+      remain_len = end_idx - byte_idx;
+      prev_st = pstr->cur_state;
+      /* Apply the translation if we need.  */
+      if (BE (pstr->trans != NULL, 0))
+	{
+	  int i, ch;
+
+	  for (i = 0; i < pstr->mb_cur_max && i < remain_len; ++i)
+	    {
+	      ch = pstr->raw_mbs [pstr->raw_mbs_idx + byte_idx + i];
+	      buf[i] = pstr->mbs[byte_idx + i] = pstr->trans[ch];
+	    }
+	  p = (const char *) buf;
+	}
+      else
+	p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + byte_idx;
+      mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state);
+      if (BE (mbclen == (size_t) -2, 0))
+	{
+	  /* The buffer doesn't have enough space, finish to build.  */
+	  pstr->cur_state = prev_st;
+	  break;
+	}
+      else if (BE (mbclen == (size_t) -1 || mbclen == 0, 0))
+	{
+	  /* We treat these cases as a singlebyte character.  */
+	  mbclen = 1;
+	  wc = (wchar_t) pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx];
+	  if (BE (pstr->trans != NULL, 0))
+	    wc = pstr->trans[wc];
+	  pstr->cur_state = prev_st;
+	}
+
+      /* Write wide character and padding.  */
+      pstr->wcs[byte_idx++] = wc;
+      /* Write paddings.  */
+      for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;)
+	pstr->wcs[byte_idx++] = WEOF;
+    }
+  pstr->valid_len = byte_idx;
+  pstr->valid_raw_len = byte_idx;
+}
+
+/* Build wide character buffer PSTR->WCS like build_wcs_buffer,
+   but for REG_ICASE.  */
+
+static reg_errcode_t
+internal_function
+build_wcs_upper_buffer (re_string_t *pstr)
+{
+  mbstate_t prev_st;
+  Idx src_idx, byte_idx, end_idx, remain_len;
+  size_t mbclen;
+#ifdef _LIBC
+  char buf[MB_LEN_MAX];
+  assert (MB_LEN_MAX >= pstr->mb_cur_max);
+#else
+  char buf[64];
+#endif
+
+  byte_idx = pstr->valid_len;
+  end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len;
+
+  /* The following optimization assumes that ASCII characters can be
+     mapped to wide characters with a simple cast.  */
+  if (! pstr->map_notascii && pstr->trans == NULL && !pstr->offsets_needed)
+    {
+      while (byte_idx < end_idx)
+	{
+	  wchar_t wc;
+
+	  if (isascii (pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx])
+	      && mbsinit (&pstr->cur_state))
+	    {
+	      /* In case of a singlebyte character.  */
+	      pstr->mbs[byte_idx]
+		= toupper (pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]);
+	      /* The next step uses the assumption that wchar_t is encoded
+		 ASCII-safe: all ASCII values can be converted like this.  */
+	      pstr->wcs[byte_idx] = (wchar_t) pstr->mbs[byte_idx];
+	      ++byte_idx;
+	      continue;
+	    }
+
+	  remain_len = end_idx - byte_idx;
+	  prev_st = pstr->cur_state;
+	  mbclen = __mbrtowc (&wc,
+			      ((const char *) pstr->raw_mbs + pstr->raw_mbs_idx
+			       + byte_idx), remain_len, &pstr->cur_state);
+	  if (BE (mbclen < (size_t) -2, 1))
+	    {
+	      wchar_t wcu = wc;
+	      if (iswlower (wc))
+		{
+		  size_t mbcdlen;
+
+		  wcu = towupper (wc);
+		  mbcdlen = wcrtomb (buf, wcu, &prev_st);
+		  if (BE (mbclen == mbcdlen, 1))
+		    memcpy (pstr->mbs + byte_idx, buf, mbclen);
+		  else
+		    {
+		      src_idx = byte_idx;
+		      goto offsets_needed;
+		    }
+		}
+	      else
+		memcpy (pstr->mbs + byte_idx,
+			pstr->raw_mbs + pstr->raw_mbs_idx + byte_idx, mbclen);
+	      pstr->wcs[byte_idx++] = wcu;
+	      /* Write paddings.  */
+	      for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;)
+		pstr->wcs[byte_idx++] = WEOF;
+	    }
+	  else if (mbclen == (size_t) -1 || mbclen == 0)
+	    {
+	      /* It is an invalid character or '\0'.  Just use the byte.  */
+	      int ch = pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx];
+	      pstr->mbs[byte_idx] = ch;
+	      /* And also cast it to wide char.  */
+	      pstr->wcs[byte_idx++] = (wchar_t) ch;
+	      if (BE (mbclen == (size_t) -1, 0))
+		pstr->cur_state = prev_st;
+	    }
+	  else
+	    {
+	      /* The buffer doesn't have enough space, finish to build.  */
+	      pstr->cur_state = prev_st;
+	      break;
+	    }
+	}
+      pstr->valid_len = byte_idx;
+      pstr->valid_raw_len = byte_idx;
+      return REG_NOERROR;
+    }
+  else
+    for (src_idx = pstr->valid_raw_len; byte_idx < end_idx;)
+      {
+	wchar_t wc;
+	const char *p;
+      offsets_needed:
+	remain_len = end_idx - byte_idx;
+	prev_st = pstr->cur_state;
+	if (BE (pstr->trans != NULL, 0))
+	  {
+	    int i, ch;
+
+	    for (i = 0; i < pstr->mb_cur_max && i < remain_len; ++i)
+	      {
+		ch = pstr->raw_mbs [pstr->raw_mbs_idx + src_idx + i];
+		buf[i] = pstr->trans[ch];
+	      }
+	    p = (const char *) buf;
+	  }
+	else
+	  p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + src_idx;
+	mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state);
+	if (BE (mbclen < (size_t) -2, 1))
+	  {
+	    wchar_t wcu = wc;
+	    if (iswlower (wc))
+	      {
+		size_t mbcdlen;
+
+		wcu = towupper (wc);
+		mbcdlen = wcrtomb ((char *) buf, wcu, &prev_st);
+		if (BE (mbclen == mbcdlen, 1))
+		  memcpy (pstr->mbs + byte_idx, buf, mbclen);
+		else if (mbcdlen != (size_t) -1)
+		  {
+		    size_t i;
+
+		    if (byte_idx + mbcdlen > pstr->bufs_len)
+		      {
+			pstr->cur_state = prev_st;
+			break;
+		      }
+
+		    if (pstr->offsets == NULL)
+		      {
+			pstr->offsets = re_malloc (Idx, pstr->bufs_len);
+
+			if (pstr->offsets == NULL)
+			  return REG_ESPACE;
+		      }
+		    if (!pstr->offsets_needed)
+		      {
+			for (i = 0; i < (size_t) byte_idx; ++i)
+			  pstr->offsets[i] = i;
+			pstr->offsets_needed = 1;
+		      }
+
+		    memcpy (pstr->mbs + byte_idx, buf, mbcdlen);
+		    pstr->wcs[byte_idx] = wcu;
+		    pstr->offsets[byte_idx] = src_idx;
+		    for (i = 1; i < mbcdlen; ++i)
+		      {
+			pstr->offsets[byte_idx + i]
+			  = src_idx + (i < mbclen ? i : mbclen - 1);
+			pstr->wcs[byte_idx + i] = WEOF;
+		      }
+		    pstr->len += mbcdlen - mbclen;
+		    if (pstr->raw_stop > src_idx)
+		      pstr->stop += mbcdlen - mbclen;
+		    end_idx = (pstr->bufs_len > pstr->len)
+			      ? pstr->len : pstr->bufs_len;
+		    byte_idx += mbcdlen;
+		    src_idx += mbclen;
+		    continue;
+		  }
+                else
+                  memcpy (pstr->mbs + byte_idx, p, mbclen);
+	      }
+	    else
+	      memcpy (pstr->mbs + byte_idx, p, mbclen);
+
+	    if (BE (pstr->offsets_needed != 0, 0))
+	      {
+		size_t i;
+		for (i = 0; i < mbclen; ++i)
+		  pstr->offsets[byte_idx + i] = src_idx + i;
+	      }
+	    src_idx += mbclen;
+
+	    pstr->wcs[byte_idx++] = wcu;
+	    /* Write paddings.  */
+	    for (remain_len = byte_idx + mbclen - 1; byte_idx < remain_len ;)
+	      pstr->wcs[byte_idx++] = WEOF;
+	  }
+	else if (mbclen == (size_t) -1 || mbclen == 0)
+	  {
+	    /* It is an invalid character or '\0'.  Just use the byte.  */
+	    int ch = pstr->raw_mbs[pstr->raw_mbs_idx + src_idx];
+
+	    if (BE (pstr->trans != NULL, 0))
+	      ch = pstr->trans [ch];
+	    pstr->mbs[byte_idx] = ch;
+
+	    if (BE (pstr->offsets_needed != 0, 0))
+	      pstr->offsets[byte_idx] = src_idx;
+	    ++src_idx;
+
+	    /* And also cast it to wide char.  */
+	    pstr->wcs[byte_idx++] = (wchar_t) ch;
+	    if (BE (mbclen == (size_t) -1, 0))
+	      pstr->cur_state = prev_st;
+	  }
+	else
+	  {
+	    /* The buffer doesn't have enough space, finish to build.  */
+	    pstr->cur_state = prev_st;
+	    break;
+	  }
+      }
+  pstr->valid_len = byte_idx;
+  pstr->valid_raw_len = src_idx;
+  return REG_NOERROR;
+}
+
+/* Skip characters until the index becomes greater than NEW_RAW_IDX.
+   Return the index.  */
+
+static Idx
+internal_function
+re_string_skip_chars (re_string_t *pstr, Idx new_raw_idx, wint_t *last_wc)
+{
+  mbstate_t prev_st;
+  Idx rawbuf_idx;
+  size_t mbclen;
+  wint_t wc = WEOF;
+
+  /* Skip the characters which are not necessary to check.  */
+  for (rawbuf_idx = pstr->raw_mbs_idx + pstr->valid_raw_len;
+       rawbuf_idx < new_raw_idx;)
+    {
+      wchar_t wc2;
+      Idx remain_len;
+      remain_len = pstr->len - rawbuf_idx;
+      prev_st = pstr->cur_state;
+      mbclen = __mbrtowc (&wc2, (const char *) pstr->raw_mbs + rawbuf_idx,
+			  remain_len, &pstr->cur_state);
+      if (BE (mbclen == (size_t) -2 || mbclen == (size_t) -1 || mbclen == 0, 0))
+	{
+	  /* We treat these cases as a single byte character.  */
+	  if (mbclen == 0 || remain_len == 0)
+	    wc = L'\0';
+	  else
+	    wc = *(unsigned char *) (pstr->raw_mbs + rawbuf_idx);
+	  mbclen = 1;
+	  pstr->cur_state = prev_st;
+	}
+      else
+	wc = wc2;
+      /* Then proceed the next character.  */
+      rawbuf_idx += mbclen;
+    }
+  *last_wc = wc;
+  return rawbuf_idx;
+}
+#endif /* RE_ENABLE_I18N  */
+
+/* Build the buffer PSTR->MBS, and apply the translation if we need.
+   This function is used in case of REG_ICASE.  */
+
+static void
+internal_function
+build_upper_buffer (re_string_t *pstr)
+{
+  Idx char_idx, end_idx;
+  end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len;
+
+  for (char_idx = pstr->valid_len; char_idx < end_idx; ++char_idx)
+    {
+      int ch = pstr->raw_mbs[pstr->raw_mbs_idx + char_idx];
+      if (BE (pstr->trans != NULL, 0))
+	ch = pstr->trans[ch];
+      if (islower (ch))
+	pstr->mbs[char_idx] = toupper (ch);
+      else
+	pstr->mbs[char_idx] = ch;
+    }
+  pstr->valid_len = char_idx;
+  pstr->valid_raw_len = char_idx;
+}
+
+/* Apply TRANS to the buffer in PSTR.  */
+
+static void
+internal_function
+re_string_translate_buffer (re_string_t *pstr)
+{
+  Idx buf_idx, end_idx;
+  end_idx = (pstr->bufs_len > pstr->len) ? pstr->len : pstr->bufs_len;
+
+  for (buf_idx = pstr->valid_len; buf_idx < end_idx; ++buf_idx)
+    {
+      int ch = pstr->raw_mbs[pstr->raw_mbs_idx + buf_idx];
+      pstr->mbs[buf_idx] = pstr->trans[ch];
+    }
+
+  pstr->valid_len = buf_idx;
+  pstr->valid_raw_len = buf_idx;
+}
+
+/* This function re-construct the buffers.
+   Concretely, convert to wide character in case of pstr->mb_cur_max > 1,
+   convert to upper case in case of REG_ICASE, apply translation.  */
+
+static reg_errcode_t
+internal_function
+re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
+{
+  Idx offset;
+
+  if (BE (pstr->raw_mbs_idx <= idx, 0))
+    offset = idx - pstr->raw_mbs_idx;
+  else
+    {
+      /* Reset buffer.  */
+#ifdef RE_ENABLE_I18N
+      if (pstr->mb_cur_max > 1)
+	memset (&pstr->cur_state, '\0', sizeof (mbstate_t));
+#endif /* RE_ENABLE_I18N */
+      pstr->len = pstr->raw_len;
+      pstr->stop = pstr->raw_stop;
+      pstr->valid_len = 0;
+      pstr->raw_mbs_idx = 0;
+      pstr->valid_raw_len = 0;
+      pstr->offsets_needed = 0;
+      pstr->tip_context = ((eflags & REG_NOTBOL) ? CONTEXT_BEGBUF
+			   : CONTEXT_NEWLINE | CONTEXT_BEGBUF);
+      if (!pstr->mbs_allocated)
+	pstr->mbs = (unsigned char *) pstr->raw_mbs;
+      offset = idx;
+    }
+
+  if (BE (offset != 0, 1))
+    {
+      /* Should the already checked characters be kept?  */
+      if (BE (offset < pstr->valid_raw_len, 1))
+	{
+	  /* Yes, move them to the front of the buffer.  */
+#ifdef RE_ENABLE_I18N
+	  if (BE (pstr->offsets_needed, 0))
+	    {
+	      Idx low = 0, high = pstr->valid_len, mid;
+	      do
+		{
+		  mid = (high + low) / 2;
+		  if (pstr->offsets[mid] > offset)
+		    high = mid;
+		  else if (pstr->offsets[mid] < offset)
+		    low = mid + 1;
+		  else
+		    break;
+		}
+	      while (low < high);
+	      if (pstr->offsets[mid] < offset)
+		++mid;
+	      pstr->tip_context = re_string_context_at (pstr, mid - 1,
+							eflags);
+	      /* This can be quite complicated, so handle specially
+		 only the common and easy case where the character with
+		 different length representation of lower and upper
+		 case is present at or after offset.  */
+	      if (pstr->valid_len > offset
+		  && mid == offset && pstr->offsets[mid] == offset)
+		{
+		  memmove (pstr->wcs, pstr->wcs + offset,
+			   (pstr->valid_len - offset) * sizeof (wint_t));
+		  memmove (pstr->mbs, pstr->mbs + offset, pstr->valid_len - offset);
+		  pstr->valid_len -= offset;
+		  pstr->valid_raw_len -= offset;
+		  for (low = 0; low < pstr->valid_len; low++)
+		    pstr->offsets[low] = pstr->offsets[low + offset] - offset;
+		}
+	      else
+		{
+		  /* Otherwise, just find out how long the partial multibyte
+		     character at offset is and fill it with WEOF/255.  */
+		  pstr->len = pstr->raw_len - idx + offset;
+		  pstr->stop = pstr->raw_stop - idx + offset;
+		  pstr->offsets_needed = 0;
+		  while (mid > 0 && pstr->offsets[mid - 1] == offset)
+		    --mid;
+		  while (mid < pstr->valid_len)
+		    if (pstr->wcs[mid] != WEOF)
+		      break;
+		    else
+		      ++mid;
+		  if (mid == pstr->valid_len)
+		    pstr->valid_len = 0;
+		  else
+		    {
+		      pstr->valid_len = pstr->offsets[mid] - offset;
+		      if (pstr->valid_len)
+			{
+			  for (low = 0; low < pstr->valid_len; ++low)
+			    pstr->wcs[low] = WEOF;
+			  memset (pstr->mbs, 255, pstr->valid_len);
+			}
+		    }
+		  pstr->valid_raw_len = pstr->valid_len;
+		}
+	    }
+	  else
+#endif
+	    {
+	      pstr->tip_context = re_string_context_at (pstr, offset - 1,
+							eflags);
+#ifdef RE_ENABLE_I18N
+	      if (pstr->mb_cur_max > 1)
+		memmove (pstr->wcs, pstr->wcs + offset,
+			 (pstr->valid_len - offset) * sizeof (wint_t));
+#endif /* RE_ENABLE_I18N */
+	      if (BE (pstr->mbs_allocated, 0))
+		memmove (pstr->mbs, pstr->mbs + offset,
+			 pstr->valid_len - offset);
+	      pstr->valid_len -= offset;
+	      pstr->valid_raw_len -= offset;
+#if DEBUG
+	      assert (pstr->valid_len > 0);
+#endif
+	    }
+	}
+      else
+	{
+#ifdef RE_ENABLE_I18N
+	  /* No, skip all characters until IDX.  */
+	  Idx prev_valid_len = pstr->valid_len;
+
+	  if (BE (pstr->offsets_needed, 0))
+	    {
+	      pstr->len = pstr->raw_len - idx + offset;
+	      pstr->stop = pstr->raw_stop - idx + offset;
+	      pstr->offsets_needed = 0;
+	    }
+#endif
+	  pstr->valid_len = 0;
+#ifdef RE_ENABLE_I18N
+	  if (pstr->mb_cur_max > 1)
+	    {
+	      Idx wcs_idx;
+	      wint_t wc = WEOF;
+
+	      if (pstr->is_utf8)
+		{
+		  const unsigned char *raw, *p, *end;
+
+		  /* Special case UTF-8.  Multi-byte chars start with any
+		     byte other than 0x80 - 0xbf.  */
+		  raw = pstr->raw_mbs + pstr->raw_mbs_idx;
+		  end = raw + (offset - pstr->mb_cur_max);
+		  if (end < pstr->raw_mbs)
+		    end = pstr->raw_mbs;
+		  p = raw + offset - 1;
+#ifdef _LIBC
+		  /* We know the wchar_t encoding is UCS4, so for the simple
+		     case, ASCII characters, skip the conversion step.  */
+		  if (isascii (*p) && BE (pstr->trans == NULL, 1))
+		    {
+		      memset (&pstr->cur_state, '\0', sizeof (mbstate_t));
+		      /* pstr->valid_len = 0; */
+		      wc = (wchar_t) *p;
+		    }
+		  else
+#endif
+		    for (; p >= end; --p)
+		      if ((*p & 0xc0) != 0x80)
+			{
+			  mbstate_t cur_state;
+			  wchar_t wc2;
+			  Idx mlen = raw + pstr->len - p;
+			  unsigned char buf[6];
+			  size_t mbclen;
+
+			  if (BE (pstr->trans != NULL, 0))
+			    {
+			      int i = mlen < 6 ? mlen : 6;
+			      while (--i >= 0)
+				buf[i] = pstr->trans[p[i]];
+			    }
+			  /* XXX Don't use mbrtowc, we know which conversion
+			     to use (UTF-8 -> UCS4).  */
+			  memset (&cur_state, 0, sizeof (cur_state));
+			  mbclen = __mbrtowc (&wc2, (const char *) p, mlen,
+					      &cur_state);
+			  if (raw + offset - p <= mbclen
+			      && mbclen < (size_t) -2)
+			    {
+			      memset (&pstr->cur_state, '\0',
+				      sizeof (mbstate_t));
+			      pstr->valid_len = mbclen - (raw + offset - p);
+			      wc = wc2;
+			    }
+			  break;
+			}
+		}
+
+	      if (wc == WEOF)
+		pstr->valid_len = re_string_skip_chars (pstr, idx, &wc) - idx;
+	      if (wc == WEOF)
+		pstr->tip_context
+		  = re_string_context_at (pstr, prev_valid_len - 1, eflags);
+	      else
+		pstr->tip_context = ((BE (pstr->word_ops_used != 0, 0)
+				      && IS_WIDE_WORD_CHAR (wc))
+				     ? CONTEXT_WORD
+				     : ((IS_WIDE_NEWLINE (wc)
+					 && pstr->newline_anchor)
+					? CONTEXT_NEWLINE : 0));
+	      if (BE (pstr->valid_len, 0))
+		{
+		  for (wcs_idx = 0; wcs_idx < pstr->valid_len; ++wcs_idx)
+		    pstr->wcs[wcs_idx] = WEOF;
+		  if (pstr->mbs_allocated)
+		    memset (pstr->mbs, 255, pstr->valid_len);
+		}
+	      pstr->valid_raw_len = pstr->valid_len;
+	    }
+	  else
+#endif /* RE_ENABLE_I18N */
+	    {
+	      int c = pstr->raw_mbs[pstr->raw_mbs_idx + offset - 1];
+	      pstr->valid_raw_len = 0;
+	      if (pstr->trans)
+		c = pstr->trans[c];
+	      pstr->tip_context = (bitset_contain (pstr->word_char, c)
+				   ? CONTEXT_WORD
+				   : ((IS_NEWLINE (c) && pstr->newline_anchor)
+				      ? CONTEXT_NEWLINE : 0));
+	    }
+	}
+      if (!BE (pstr->mbs_allocated, 0))
+	pstr->mbs += offset;
+    }
+  pstr->raw_mbs_idx = idx;
+  pstr->len -= offset;
+  pstr->stop -= offset;
+
+  /* Then build the buffers.  */
+#ifdef RE_ENABLE_I18N
+  if (pstr->mb_cur_max > 1)
+    {
+      if (pstr->icase)
+	{
+	  reg_errcode_t ret = build_wcs_upper_buffer (pstr);
+	  if (BE (ret != REG_NOERROR, 0))
+	    return ret;
+	}
+      else
+	build_wcs_buffer (pstr);
+    }
+  else
+#endif /* RE_ENABLE_I18N */
+    if (BE (pstr->mbs_allocated, 0))
+      {
+	if (pstr->icase)
+	  build_upper_buffer (pstr);
+	else if (pstr->trans != NULL)
+	  re_string_translate_buffer (pstr);
+      }
+    else
+      pstr->valid_len = pstr->len;
+
+  pstr->cur_idx = 0;
+  return REG_NOERROR;
+}
+
+static unsigned char
+internal_function __attribute ((pure))
+re_string_peek_byte_case (const re_string_t *pstr, Idx idx)
+{
+  int ch;
+  Idx off;
+
+  /* Handle the common (easiest) cases first.  */
+  if (BE (!pstr->mbs_allocated, 1))
+    return re_string_peek_byte (pstr, idx);
+
+#ifdef RE_ENABLE_I18N
+  if (pstr->mb_cur_max > 1
+      && ! re_string_is_single_byte_char (pstr, pstr->cur_idx + idx))
+    return re_string_peek_byte (pstr, idx);
+#endif
+
+  off = pstr->cur_idx + idx;
+#ifdef RE_ENABLE_I18N
+  if (pstr->offsets_needed)
+    off = pstr->offsets[off];
+#endif
+
+  ch = pstr->raw_mbs[pstr->raw_mbs_idx + off];
+
+#ifdef RE_ENABLE_I18N
+  /* Ensure that e.g. for tr_TR.UTF-8 BACKSLASH DOTLESS SMALL LETTER I
+     this function returns CAPITAL LETTER I instead of first byte of
+     DOTLESS SMALL LETTER I.  The latter would confuse the parser,
+     since peek_byte_case doesn't advance cur_idx in any way.  */
+  if (pstr->offsets_needed && !isascii (ch))
+    return re_string_peek_byte (pstr, idx);
+#endif
+
+  return ch;
+}
+
+static unsigned char
+internal_function __attribute ((pure))
+re_string_fetch_byte_case (re_string_t *pstr)
+{
+  if (BE (!pstr->mbs_allocated, 1))
+    return re_string_fetch_byte (pstr);
+
+#ifdef RE_ENABLE_I18N
+  if (pstr->offsets_needed)
+    {
+      Idx off;
+      int ch;
+
+      /* For tr_TR.UTF-8 [[:islower:]] there is
+	 [[: CAPITAL LETTER I WITH DOT lower:]] in mbs.  Skip
+	 in that case the whole multi-byte character and return
+	 the original letter.  On the other side, with
+	 [[: DOTLESS SMALL LETTER I return [[:I, as doing
+	 anything else would complicate things too much.  */
+
+      if (!re_string_first_byte (pstr, pstr->cur_idx))
+	return re_string_fetch_byte (pstr);
+
+      off = pstr->offsets[pstr->cur_idx];
+      ch = pstr->raw_mbs[pstr->raw_mbs_idx + off];
+
+      if (! isascii (ch))
+	return re_string_fetch_byte (pstr);
+
+      re_string_skip_bytes (pstr,
+			    re_string_char_size_at (pstr, pstr->cur_idx));
+      return ch;
+    }
+#endif
+
+  return pstr->raw_mbs[pstr->raw_mbs_idx + pstr->cur_idx++];
+}
+
+static void
+internal_function
+re_string_destruct (re_string_t *pstr)
+{
+#ifdef RE_ENABLE_I18N
+  re_free (pstr->wcs);
+  re_free (pstr->offsets);
+#endif /* RE_ENABLE_I18N  */
+  if (pstr->mbs_allocated)
+    re_free (pstr->mbs);
+}
+
+/* Return the context at IDX in INPUT.  */
+
+static unsigned int
+internal_function
+re_string_context_at (const re_string_t *input, Idx idx, int eflags)
+{
+  int c;
+  if (BE (! REG_VALID_INDEX (idx), 0))
+    /* In this case, we use the value stored in input->tip_context,
+       since we can't know the character in input->mbs[-1] here.  */
+    return input->tip_context;
+  if (BE (idx == input->len, 0))
+    return ((eflags & REG_NOTEOL) ? CONTEXT_ENDBUF
+	    : CONTEXT_NEWLINE | CONTEXT_ENDBUF);
+#ifdef RE_ENABLE_I18N
+  if (input->mb_cur_max > 1)
+    {
+      wint_t wc;
+      Idx wc_idx = idx;
+      while(input->wcs[wc_idx] == WEOF)
+	{
+#ifdef DEBUG
+	  /* It must not happen.  */
+	  assert (REG_VALID_INDEX (wc_idx));
+#endif
+	  --wc_idx;
+	  if (! REG_VALID_INDEX (wc_idx))
+	    return input->tip_context;
+	}
+      wc = input->wcs[wc_idx];
+      if (BE (input->word_ops_used != 0, 0) && IS_WIDE_WORD_CHAR (wc))
+	return CONTEXT_WORD;
+      return (IS_WIDE_NEWLINE (wc) && input->newline_anchor
+	      ? CONTEXT_NEWLINE : 0);
+    }
+  else
+#endif
+    {
+      c = re_string_byte_at (input, idx);
+      if (bitset_contain (input->word_char, c))
+	return CONTEXT_WORD;
+      return IS_NEWLINE (c) && input->newline_anchor ? CONTEXT_NEWLINE : 0;
+    }
+}
+
+/* Functions for set operation.  */
+
+static reg_errcode_t
+internal_function
+re_node_set_alloc (re_node_set *set, Idx size)
+{
+  set->alloc = size;
+  set->nelem = 0;
+  set->elems = re_malloc (Idx, size);
+  if (BE (set->elems == NULL, 0))
+    return REG_ESPACE;
+  return REG_NOERROR;
+}
+
+static reg_errcode_t
+internal_function
+re_node_set_init_1 (re_node_set *set, Idx elem)
+{
+  set->alloc = 1;
+  set->nelem = 1;
+  set->elems = re_malloc (Idx, 1);
+  if (BE (set->elems == NULL, 0))
+    {
+      set->alloc = set->nelem = 0;
+      return REG_ESPACE;
+    }
+  set->elems[0] = elem;
+  return REG_NOERROR;
+}
+
+static reg_errcode_t
+internal_function
+re_node_set_init_2 (re_node_set *set, Idx elem1, Idx elem2)
+{
+  set->alloc = 2;
+  set->elems = re_malloc (Idx, 2);
+  if (BE (set->elems == NULL, 0))
+    return REG_ESPACE;
+  if (elem1 == elem2)
+    {
+      set->nelem = 1;
+      set->elems[0] = elem1;
+    }
+  else
+    {
+      set->nelem = 2;
+      if (elem1 < elem2)
+	{
+	  set->elems[0] = elem1;
+	  set->elems[1] = elem2;
+	}
+      else
+	{
+	  set->elems[0] = elem2;
+	  set->elems[1] = elem1;
+	}
+    }
+  return REG_NOERROR;
+}
+
+static reg_errcode_t
+internal_function
+re_node_set_init_copy (re_node_set *dest, const re_node_set *src)
+{
+  dest->nelem = src->nelem;
+  if (src->nelem > 0)
+    {
+      dest->alloc = dest->nelem;
+      dest->elems = re_malloc (Idx, dest->alloc);
+      if (BE (dest->elems == NULL, 0))
+	{
+	  dest->alloc = dest->nelem = 0;
+	  return REG_ESPACE;
+	}
+      memcpy (dest->elems, src->elems, src->nelem * sizeof (Idx));
+    }
+  else
+    re_node_set_init_empty (dest);
+  return REG_NOERROR;
+}
+
+/* Calculate the intersection of the sets SRC1 and SRC2. And merge it to
+   DEST. Return value indicate the error code or REG_NOERROR if succeeded.
+   Note: We assume dest->elems is NULL, when dest->alloc is 0.  */
+
+static reg_errcode_t
+internal_function
+re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1,
+			   const re_node_set *src2)
+{
+  Idx i1, i2, is, id, delta, sbase;
+  if (src1->nelem == 0 || src2->nelem == 0)
+    return REG_NOERROR;
+
+  /* We need dest->nelem + 2 * elems_in_intersection; this is a
+     conservative estimate.  */
+  if (src1->nelem + src2->nelem + dest->nelem > dest->alloc)
+    {
+      Idx new_alloc = src1->nelem + src2->nelem + dest->alloc;
+      Idx *new_elems = re_realloc (dest->elems, Idx, new_alloc);
+      if (BE (new_elems == NULL, 0))
+        return REG_ESPACE;
+      dest->elems = new_elems;
+      dest->alloc = new_alloc;
+    }
+
+  /* Find the items in the intersection of SRC1 and SRC2, and copy
+     into the top of DEST those that are not already in DEST itself.  */
+  sbase = dest->nelem + src1->nelem + src2->nelem;
+  i1 = src1->nelem - 1;
+  i2 = src2->nelem - 1;
+  id = dest->nelem - 1;
+  for (;;)
+    {
+      if (src1->elems[i1] == src2->elems[i2])
+	{
+	  /* Try to find the item in DEST.  Maybe we could binary search?  */
+	  while (REG_VALID_INDEX (id) && dest->elems[id] > src1->elems[i1])
+	    --id;
+
+          if (! REG_VALID_INDEX (id) || dest->elems[id] != src1->elems[i1])
+            dest->elems[--sbase] = src1->elems[i1];
+
+	  if (! REG_VALID_INDEX (--i1) || ! REG_VALID_INDEX (--i2))
+	    break;
+	}
+
+      /* Lower the highest of the two items.  */
+      else if (src1->elems[i1] < src2->elems[i2])
+	{
+	  if (! REG_VALID_INDEX (--i2))
+	    break;
+	}
+      else
+	{
+	  if (! REG_VALID_INDEX (--i1))
+	    break;
+	}
+    }
+
+  id = dest->nelem - 1;
+  is = dest->nelem + src1->nelem + src2->nelem - 1;
+  delta = is - sbase + 1;
+
+  /* Now copy.  When DELTA becomes zero, the remaining
+     DEST elements are already in place; this is more or
+     less the same loop that is in re_node_set_merge.  */
+  dest->nelem += delta;
+  if (delta > 0 && REG_VALID_INDEX (id))
+    for (;;)
+      {
+        if (dest->elems[is] > dest->elems[id])
+          {
+            /* Copy from the top.  */
+            dest->elems[id + delta--] = dest->elems[is--];
+            if (delta == 0)
+              break;
+          }
+        else
+          {
+            /* Slide from the bottom.  */
+            dest->elems[id + delta] = dest->elems[id];
+            if (! REG_VALID_INDEX (--id))
+              break;
+          }
+      }
+
+  /* Copy remaining SRC elements.  */
+  memcpy (dest->elems, dest->elems + sbase, delta * sizeof (Idx));
+
+  return REG_NOERROR;
+}
+
+/* Calculate the union set of the sets SRC1 and SRC2. And store it to
+   DEST. Return value indicate the error code or REG_NOERROR if succeeded.  */
+
+static reg_errcode_t
+internal_function
+re_node_set_init_union (re_node_set *dest, const re_node_set *src1,
+			const re_node_set *src2)
+{
+  Idx i1, i2, id;
+  if (src1 != NULL && src1->nelem > 0 && src2 != NULL && src2->nelem > 0)
+    {
+      dest->alloc = src1->nelem + src2->nelem;
+      dest->elems = re_malloc (Idx, dest->alloc);
+      if (BE (dest->elems == NULL, 0))
+	return REG_ESPACE;
+    }
+  else
+    {
+      if (src1 != NULL && src1->nelem > 0)
+	return re_node_set_init_copy (dest, src1);
+      else if (src2 != NULL && src2->nelem > 0)
+	return re_node_set_init_copy (dest, src2);
+      else
+	re_node_set_init_empty (dest);
+      return REG_NOERROR;
+    }
+  for (i1 = i2 = id = 0 ; i1 < src1->nelem && i2 < src2->nelem ;)
+    {
+      if (src1->elems[i1] > src2->elems[i2])
+	{
+	  dest->elems[id++] = src2->elems[i2++];
+	  continue;
+	}
+      if (src1->elems[i1] == src2->elems[i2])
+	++i2;
+      dest->elems[id++] = src1->elems[i1++];
+    }
+  if (i1 < src1->nelem)
+    {
+      memcpy (dest->elems + id, src1->elems + i1,
+	     (src1->nelem - i1) * sizeof (Idx));
+      id += src1->nelem - i1;
+    }
+  else if (i2 < src2->nelem)
+    {
+      memcpy (dest->elems + id, src2->elems + i2,
+	     (src2->nelem - i2) * sizeof (Idx));
+      id += src2->nelem - i2;
+    }
+  dest->nelem = id;
+  return REG_NOERROR;
+}
+
+/* Calculate the union set of the sets DEST and SRC. And store it to
+   DEST. Return value indicate the error code or REG_NOERROR if succeeded.  */
+
+static reg_errcode_t
+internal_function
+re_node_set_merge (re_node_set *dest, const re_node_set *src)
+{
+  Idx is, id, sbase, delta;
+  if (src == NULL || src->nelem == 0)
+    return REG_NOERROR;
+  if (dest->alloc < 2 * src->nelem + dest->nelem)
+    {
+      Idx new_alloc = 2 * (src->nelem + dest->alloc);
+      Idx *new_buffer = re_realloc (dest->elems, Idx, new_alloc);
+      if (BE (new_buffer == NULL, 0))
+	return REG_ESPACE;
+      dest->elems = new_buffer;
+      dest->alloc = new_alloc;
+    }
+
+  if (BE (dest->nelem == 0, 0))
+    {
+      dest->nelem = src->nelem;
+      memcpy (dest->elems, src->elems, src->nelem * sizeof (Idx));
+      return REG_NOERROR;
+    }
+
+  /* Copy into the top of DEST the items of SRC that are not
+     found in DEST.  Maybe we could binary search in DEST?  */
+  for (sbase = dest->nelem + 2 * src->nelem,
+       is = src->nelem - 1, id = dest->nelem - 1;
+       REG_VALID_INDEX (is) && REG_VALID_INDEX (id); )
+    {
+      if (dest->elems[id] == src->elems[is])
+        is--, id--;
+      else if (dest->elems[id] < src->elems[is])
+        dest->elems[--sbase] = src->elems[is--];
+      else /* if (dest->elems[id] > src->elems[is]) */
+        --id;
+    }
+
+  if (REG_VALID_INDEX (is))
+    {
+      /* If DEST is exhausted, the remaining items of SRC must be unique.  */
+      sbase -= is + 1;
+      memcpy (dest->elems + sbase, src->elems, (is + 1) * sizeof (Idx));
+    }
+
+  id = dest->nelem - 1;
+  is = dest->nelem + 2 * src->nelem - 1;
+  delta = is - sbase + 1;
+  if (delta == 0)
+    return REG_NOERROR;
+
+  /* Now copy.  When DELTA becomes zero, the remaining
+     DEST elements are already in place.  */
+  dest->nelem += delta;
+  for (;;)
+    {
+      if (dest->elems[is] > dest->elems[id])
+        {
+	  /* Copy from the top.  */
+          dest->elems[id + delta--] = dest->elems[is--];
+	  if (delta == 0)
+	    break;
+	}
+      else
+        {
+          /* Slide from the bottom.  */
+          dest->elems[id + delta] = dest->elems[id];
+	  if (! REG_VALID_INDEX (--id))
+	    {
+	      /* Copy remaining SRC elements.  */
+	      memcpy (dest->elems, dest->elems + sbase,
+	              delta * sizeof (Idx));
+	      break;
+	    }
+	}
+    }
+
+  return REG_NOERROR;
+}
+
+/* Insert the new element ELEM to the re_node_set* SET.
+   SET should not already have ELEM.
+   Return true if successful.  */
+
+static bool
+internal_function
+re_node_set_insert (re_node_set *set, Idx elem)
+{
+  Idx idx;
+  /* In case the set is empty.  */
+  if (set->alloc == 0)
+    return BE (re_node_set_init_1 (set, elem) == REG_NOERROR, 1);
+
+  if (BE (set->nelem, 0) == 0)
+    {
+      /* We already guaranteed above that set->alloc != 0.  */
+      set->elems[0] = elem;
+      ++set->nelem;
+      return true;
+    }
+
+  /* Realloc if we need.  */
+  if (set->alloc == set->nelem)
+    {
+      Idx *new_elems;
+      set->alloc = set->alloc * 2;
+      new_elems = re_realloc (set->elems, Idx, set->alloc);
+      if (BE (new_elems == NULL, 0))
+	return false;
+      set->elems = new_elems;
+    }
+
+  /* Move the elements which follows the new element.  Test the
+     first element separately to skip a check in the inner loop.  */
+  if (elem < set->elems[0])
+    {
+      idx = 0;
+      for (idx = set->nelem; idx > 0; idx--)
+        set->elems[idx] = set->elems[idx - 1];
+    }
+  else
+    {
+      for (idx = set->nelem; set->elems[idx - 1] > elem; idx--)
+        set->elems[idx] = set->elems[idx - 1];
+    }
+
+  /* Insert the new element.  */
+  set->elems[idx] = elem;
+  ++set->nelem;
+  return true;
+}
+
+/* Insert the new element ELEM to the re_node_set* SET.
+   SET should not already have any element greater than or equal to ELEM.
+   Return true if successful.  */
+
+static bool
+internal_function
+re_node_set_insert_last (re_node_set *set, Idx elem)
+{
+  /* Realloc if we need.  */
+  if (set->alloc == set->nelem)
+    {
+      Idx *new_elems;
+      set->alloc = (set->alloc + 1) * 2;
+      new_elems = re_realloc (set->elems, Idx, set->alloc);
+      if (BE (new_elems == NULL, 0))
+	return false;
+      set->elems = new_elems;
+    }
+
+  /* Insert the new element.  */
+  set->elems[set->nelem++] = elem;
+  return true;
+}
+
+/* Compare two node sets SET1 and SET2.
+   Return true if SET1 and SET2 are equivalent.  */
+
+static bool
+internal_function __attribute ((pure))
+re_node_set_compare (const re_node_set *set1, const re_node_set *set2)
+{
+  Idx i;
+  if (set1 == NULL || set2 == NULL || set1->nelem != set2->nelem)
+    return false;
+  for (i = set1->nelem ; REG_VALID_INDEX (--i) ; )
+    if (set1->elems[i] != set2->elems[i])
+      return false;
+  return true;
+}
+
+/* Return (idx + 1) if SET contains the element ELEM, return 0 otherwise.  */
+
+static Idx
+internal_function __attribute ((pure))
+re_node_set_contains (const re_node_set *set, Idx elem)
+{
+  __re_size_t idx, right, mid;
+  if (! REG_VALID_NONZERO_INDEX (set->nelem))
+    return 0;
+
+  /* Binary search the element.  */
+  idx = 0;
+  right = set->nelem - 1;
+  while (idx < right)
+    {
+      mid = (idx + right) / 2;
+      if (set->elems[mid] < elem)
+	idx = mid + 1;
+      else
+	right = mid;
+    }
+  return set->elems[idx] == elem ? idx + 1 : 0;
+}
+
+static void
+internal_function
+re_node_set_remove_at (re_node_set *set, Idx idx)
+{
+  if (idx < 0 || idx >= set->nelem)
+    return;
+  --set->nelem;
+  for (; idx < set->nelem; idx++)
+    set->elems[idx] = set->elems[idx + 1];
+}
+
+
+/* Add the token TOKEN to dfa->nodes, and return the index of the token.
+   Or return REG_MISSING if an error occurred.  */
+
+static Idx
+internal_function
+re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
+{
+  if (BE (dfa->nodes_len >= dfa->nodes_alloc, 0))
+    {
+      size_t new_nodes_alloc = dfa->nodes_alloc * 2;
+      Idx *new_nexts, *new_indices;
+      re_node_set *new_edests, *new_eclosures;
+      re_token_t *new_nodes;
+      size_t max_object_size =
+	MAX (sizeof (re_token_t),
+	     MAX (sizeof (re_node_set),
+		  sizeof (Idx)));
+
+      /* Avoid overflows.  */
+      if (BE (SIZE_MAX / 2 / max_object_size < dfa->nodes_alloc, 0))
+	return REG_MISSING;
+
+      new_nodes = re_realloc (dfa->nodes, re_token_t, new_nodes_alloc);
+      if (BE (new_nodes == NULL, 0))
+	return REG_MISSING;
+      dfa->nodes = new_nodes;
+      new_nexts = re_realloc (dfa->nexts, Idx, new_nodes_alloc);
+      new_indices = re_realloc (dfa->org_indices, Idx, new_nodes_alloc);
+      new_edests = re_realloc (dfa->edests, re_node_set, new_nodes_alloc);
+      new_eclosures = re_realloc (dfa->eclosures, re_node_set, new_nodes_alloc);
+      if (BE (new_nexts == NULL || new_indices == NULL
+	      || new_edests == NULL || new_eclosures == NULL, 0))
+	return REG_MISSING;
+      dfa->nexts = new_nexts;
+      dfa->org_indices = new_indices;
+      dfa->edests = new_edests;
+      dfa->eclosures = new_eclosures;
+      dfa->nodes_alloc = new_nodes_alloc;
+    }
+  dfa->nodes[dfa->nodes_len] = token;
+  dfa->nodes[dfa->nodes_len].constraint = 0;
+#ifdef RE_ENABLE_I18N
+  {
+  int type = token.type;
+  dfa->nodes[dfa->nodes_len].accept_mb =
+    (type == OP_PERIOD && dfa->mb_cur_max > 1) || type == COMPLEX_BRACKET;
+  }
+#endif
+  dfa->nexts[dfa->nodes_len] = REG_MISSING;
+  re_node_set_init_empty (dfa->edests + dfa->nodes_len);
+  re_node_set_init_empty (dfa->eclosures + dfa->nodes_len);
+  return dfa->nodes_len++;
+}
+
+static inline re_hashval_t
+internal_function
+calc_state_hash (const re_node_set *nodes, unsigned int context)
+{
+  re_hashval_t hash = nodes->nelem + context;
+  Idx i;
+  for (i = 0 ; i < nodes->nelem ; i++)
+    hash += nodes->elems[i];
+  return hash;
+}
+
+/* Search for the state whose node_set is equivalent to NODES.
+   Return the pointer to the state, if we found it in the DFA.
+   Otherwise create the new one and return it.  In case of an error
+   return NULL and set the error code in ERR.
+   Note: - We assume NULL as the invalid state, then it is possible that
+	   return value is NULL and ERR is REG_NOERROR.
+	 - We never return non-NULL value in case of any errors, it is for
+	   optimization.  */
+
+static re_dfastate_t *
+internal_function
+re_acquire_state (reg_errcode_t *err, const re_dfa_t *dfa,
+		  const re_node_set *nodes)
+{
+  re_hashval_t hash;
+  re_dfastate_t *new_state;
+  struct re_state_table_entry *spot;
+  Idx i;
+#ifdef lint
+  /* Suppress bogus uninitialized-variable warnings.  */
+  *err = REG_NOERROR;
+#endif
+  if (BE (nodes->nelem == 0, 0))
+    {
+      *err = REG_NOERROR;
+      return NULL;
+    }
+  hash = calc_state_hash (nodes, 0);
+  spot = dfa->state_table + (hash & dfa->state_hash_mask);
+
+  for (i = 0 ; i < spot->num ; i++)
+    {
+      re_dfastate_t *state = spot->array[i];
+      if (hash != state->hash)
+	continue;
+      if (re_node_set_compare (&state->nodes, nodes))
+	return state;
+    }
+
+  /* There are no appropriate state in the dfa, create the new one.  */
+  new_state = create_ci_newstate (dfa, nodes, hash);
+  if (BE (new_state == NULL, 0))
+    *err = REG_ESPACE;
+
+  return new_state;
+}
+
+/* Search for the state whose node_set is equivalent to NODES and
+   whose context is equivalent to CONTEXT.
+   Return the pointer to the state, if we found it in the DFA.
+   Otherwise create the new one and return it.  In case of an error
+   return NULL and set the error code in ERR.
+   Note: - We assume NULL as the invalid state, then it is possible that
+	   return value is NULL and ERR is REG_NOERROR.
+	 - We never return non-NULL value in case of any errors, it is for
+	   optimization.  */
+
+static re_dfastate_t *
+internal_function
+re_acquire_state_context (reg_errcode_t *err, const re_dfa_t *dfa,
+			  const re_node_set *nodes, unsigned int context)
+{
+  re_hashval_t hash;
+  re_dfastate_t *new_state;
+  struct re_state_table_entry *spot;
+  Idx i;
+#ifdef lint
+  /* Suppress bogus uninitialized-variable warnings.  */
+  *err = REG_NOERROR;
+#endif
+  if (nodes->nelem == 0)
+    {
+      *err = REG_NOERROR;
+      return NULL;
+    }
+  hash = calc_state_hash (nodes, context);
+  spot = dfa->state_table + (hash & dfa->state_hash_mask);
+
+  for (i = 0 ; i < spot->num ; i++)
+    {
+      re_dfastate_t *state = spot->array[i];
+      if (state->hash == hash
+	  && state->context == context
+	  && re_node_set_compare (state->entrance_nodes, nodes))
+	return state;
+    }
+  /* There are no appropriate state in `dfa', create the new one.  */
+  new_state = create_cd_newstate (dfa, nodes, context, hash);
+  if (BE (new_state == NULL, 0))
+    *err = REG_ESPACE;
+
+  return new_state;
+}
+
+/* Finish initialization of the new state NEWSTATE, and using its hash value
+   HASH put in the appropriate bucket of DFA's state table.  Return value
+   indicates the error code if failed.  */
+
+static reg_errcode_t
+register_state (const re_dfa_t *dfa, re_dfastate_t *newstate,
+		re_hashval_t hash)
+{
+  struct re_state_table_entry *spot;
+  reg_errcode_t err;
+  Idx i;
+
+  newstate->hash = hash;
+  err = re_node_set_alloc (&newstate->non_eps_nodes, newstate->nodes.nelem);
+  if (BE (err != REG_NOERROR, 0))
+    return REG_ESPACE;
+  for (i = 0; i < newstate->nodes.nelem; i++)
+    {
+      Idx elem = newstate->nodes.elems[i];
+      if (!IS_EPSILON_NODE (dfa->nodes[elem].type))
+	if (BE (! re_node_set_insert_last (&newstate->non_eps_nodes, elem), 0))
+	  return REG_ESPACE;
+    }
+
+  spot = dfa->state_table + (hash & dfa->state_hash_mask);
+  if (BE (spot->alloc <= spot->num, 0))
+    {
+      Idx new_alloc = 2 * spot->num + 2;
+      re_dfastate_t **new_array = re_realloc (spot->array, re_dfastate_t *,
+					      new_alloc);
+      if (BE (new_array == NULL, 0))
+	return REG_ESPACE;
+      spot->array = new_array;
+      spot->alloc = new_alloc;
+    }
+  spot->array[spot->num++] = newstate;
+  return REG_NOERROR;
+}
+
+static void
+free_state (re_dfastate_t *state)
+{
+  re_node_set_free (&state->non_eps_nodes);
+  re_node_set_free (&state->inveclosure);
+  if (state->entrance_nodes != &state->nodes)
+    {
+      re_node_set_free (state->entrance_nodes);
+      re_free (state->entrance_nodes);
+    }
+  re_node_set_free (&state->nodes);
+  re_free (state->word_trtable);
+  re_free (state->trtable);
+  re_free (state);
+}
+
+/* Create the new state which is independ of contexts.
+   Return the new state if succeeded, otherwise return NULL.  */
+
+static re_dfastate_t *
+internal_function
+create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
+		    re_hashval_t hash)
+{
+  Idx i;
+  reg_errcode_t err;
+  re_dfastate_t *newstate;
+
+  newstate = (re_dfastate_t *) calloc (sizeof (re_dfastate_t), 1);
+  if (BE (newstate == NULL, 0))
+    return NULL;
+  err = re_node_set_init_copy (&newstate->nodes, nodes);
+  if (BE (err != REG_NOERROR, 0))
+    {
+      re_free (newstate);
+      return NULL;
+    }
+
+  newstate->entrance_nodes = &newstate->nodes;
+  for (i = 0 ; i < nodes->nelem ; i++)
+    {
+      re_token_t *node = dfa->nodes + nodes->elems[i];
+      re_token_type_t type = node->type;
+      if (type == CHARACTER && !node->constraint)
+	continue;
+#ifdef RE_ENABLE_I18N
+      newstate->accept_mb |= node->accept_mb;
+#endif /* RE_ENABLE_I18N */
+
+      /* If the state has the halt node, the state is a halt state.  */
+      if (type == END_OF_RE)
+	newstate->halt = 1;
+      else if (type == OP_BACK_REF)
+	newstate->has_backref = 1;
+      else if (type == ANCHOR || node->constraint)
+	newstate->has_constraint = 1;
+    }
+  err = register_state (dfa, newstate, hash);
+  if (BE (err != REG_NOERROR, 0))
+    {
+      free_state (newstate);
+      newstate = NULL;
+    }
+  return newstate;
+}
+
+/* Create the new state which is depend on the context CONTEXT.
+   Return the new state if succeeded, otherwise return NULL.  */
+
+static re_dfastate_t *
+internal_function
+create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
+		    unsigned int context, re_hashval_t hash)
+{
+  Idx i, nctx_nodes = 0;
+  reg_errcode_t err;
+  re_dfastate_t *newstate;
+
+  newstate = (re_dfastate_t *) calloc (sizeof (re_dfastate_t), 1);
+  if (BE (newstate == NULL, 0))
+    return NULL;
+  err = re_node_set_init_copy (&newstate->nodes, nodes);
+  if (BE (err != REG_NOERROR, 0))
+    {
+      re_free (newstate);
+      return NULL;
+    }
+
+  newstate->context = context;
+  newstate->entrance_nodes = &newstate->nodes;
+
+  for (i = 0 ; i < nodes->nelem ; i++)
+    {
+      re_token_t *node = dfa->nodes + nodes->elems[i];
+      re_token_type_t type = node->type;
+      unsigned int constraint = node->constraint;
+
+      if (type == CHARACTER && !constraint)
+	continue;
+#ifdef RE_ENABLE_I18N
+      newstate->accept_mb |= node->accept_mb;
+#endif /* RE_ENABLE_I18N */
+
+      /* If the state has the halt node, the state is a halt state.  */
+      if (type == END_OF_RE)
+	newstate->halt = 1;
+      else if (type == OP_BACK_REF)
+	newstate->has_backref = 1;
+
+      if (constraint)
+	{
+	  if (newstate->entrance_nodes == &newstate->nodes)
+	    {
+	      newstate->entrance_nodes = re_malloc (re_node_set, 1);
+	      if (BE (newstate->entrance_nodes == NULL, 0))
+		{
+		  free_state (newstate);
+		  return NULL;
+		}
+	      re_node_set_init_copy (newstate->entrance_nodes, nodes);
+	      nctx_nodes = 0;
+	      newstate->has_constraint = 1;
+	    }
+
+	  if (NOT_SATISFY_PREV_CONSTRAINT (constraint,context))
+	    {
+	      re_node_set_remove_at (&newstate->nodes, i - nctx_nodes);
+	      ++nctx_nodes;
+	    }
+	}
+    }
+  err = register_state (dfa, newstate, hash);
+  if (BE (err != REG_NOERROR, 0))
+    {
+      free_state (newstate);
+      newstate = NULL;
+    }
+  return  newstate;
+}
diff --git a/gnulib/regex_internal.h b/gnulib/regex_internal.h
new file mode 100644
index 000000000..977f8b02c
--- /dev/null
+++ b/gnulib/regex_internal.h
@@ -0,0 +1,828 @@
+/* Extended regular expression matching and search library.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+#ifndef _REGEX_INTERNAL_H
+#define _REGEX_INTERNAL_H 1
+
+/* In case that the system doesn't have isblank().  */
+#if !defined _LIBC && ! (defined isblank || (HAVE_ISBLANK && HAVE_DECL_ISBLANK))
+# define isblank(ch) ((ch) == ' ' || (ch) == '\t')
+#endif
+
+#ifdef _LIBC
+# ifndef _RE_DEFINE_LOCALE_FUNCTIONS
+#  define _RE_DEFINE_LOCALE_FUNCTIONS 1
+#   include <locale/localeinfo.h>
+#   include <locale/elem-hash.h>
+#   include <locale/coll-lookup.h>
+# endif
+#endif
+
+/* This is for other GNU distributions with internationalized messages.  */
+#if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
+# include <libintl.h>
+# ifdef _LIBC
+#  undef gettext
+#  define gettext(msgid) \
+  INTUSE(__dcgettext) (_libc_intl_domainname, msgid, LC_MESSAGES)
+# endif
+#else
+# define gettext(msgid) (msgid)
+#endif
+
+#ifndef gettext_noop
+/* This define is so xgettext can find the internationalizable
+   strings.  */
+# define gettext_noop(String) String
+#endif
+
+/* For loser systems without the definition.  */
+#ifndef SIZE_MAX
+# define SIZE_MAX ((size_t) -1)
+#endif
+
+#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCSCOLL) || _LIBC
+# define RE_ENABLE_I18N
+#endif
+
+#if __GNUC__ >= 3
+# define BE(expr, val) __builtin_expect (expr, val)
+#else
+# define BE(expr, val) (expr)
+# ifdef _LIBC
+#  define inline
+# endif
+#endif
+
+/* Number of ASCII characters.  */
+#define ASCII_CHARS 0x80
+
+/* Number of single byte characters.  */
+#define SBC_MAX (UCHAR_MAX + 1)
+
+#define COLL_ELEM_LEN_MAX 8
+
+/* The character which represents newline.  */
+#define NEWLINE_CHAR '\n'
+#define WIDE_NEWLINE_CHAR L'\n'
+
+/* Rename to standard API for using out of glibc.  */
+#ifndef _LIBC
+# define __wctype wctype
+# define __iswctype iswctype
+# define __btowc btowc
+# define __wcrtomb wcrtomb
+# define __mbrtowc mbrtowc
+# define __regfree regfree
+# define attribute_hidden
+#endif /* not _LIBC */
+
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+# define __attribute(arg) __attribute__ (arg)
+#else
+# define __attribute(arg)
+#endif
+
+typedef __re_idx_t Idx;
+
+/* Special return value for failure to match.  */
+#define REG_MISSING ((Idx) -1)
+
+/* Special return value for internal error.  */
+#define REG_ERROR ((Idx) -2)
+
+/* Test whether N is a valid index, and is not one of the above.  */
+#ifdef _REGEX_LARGE_OFFSETS
+# define REG_VALID_INDEX(n) ((Idx) (n) < REG_ERROR)
+#else
+# define REG_VALID_INDEX(n) (0 <= (n))
+#endif
+
+/* Test whether N is a valid nonzero index.  */
+#ifdef _REGEX_LARGE_OFFSETS
+# define REG_VALID_NONZERO_INDEX(n) ((Idx) ((n) - 1) < (Idx) (REG_ERROR - 1))
+#else
+# define REG_VALID_NONZERO_INDEX(n) (0 < (n))
+#endif
+
+/* A hash value, suitable for computing hash tables.  */
+typedef __re_size_t re_hashval_t;
+
+/* An integer used to represent a set of bits.  It must be unsigned,
+   and must be at least as wide as unsigned int.  */
+typedef unsigned long int bitset_word_t;
+/* All bits set in a bitset_word_t.  */
+#define BITSET_WORD_MAX ULONG_MAX
+
+/* Number of bits in a bitset_word_t.  For portability to hosts with
+   padding bits, do not use '(sizeof (bitset_word_t) * CHAR_BIT)';
+   instead, deduce it directly from BITSET_WORD_MAX.  Avoid
+   greater-than-32-bit integers and unconditional shifts by more than
+   31 bits, as they're not portable.  */
+#if BITSET_WORD_MAX == 0xffffffffUL
+# define BITSET_WORD_BITS 32
+#elif BITSET_WORD_MAX >> 31 >> 4 == 1
+# define BITSET_WORD_BITS 36
+#elif BITSET_WORD_MAX >> 31 >> 16 == 1
+# define BITSET_WORD_BITS 48
+#elif BITSET_WORD_MAX >> 31 >> 28 == 1
+# define BITSET_WORD_BITS 60
+#elif BITSET_WORD_MAX >> 31 >> 31 >> 1 == 1
+# define BITSET_WORD_BITS 64
+#elif BITSET_WORD_MAX >> 31 >> 31 >> 9 == 1
+# define BITSET_WORD_BITS 72
+#elif BITSET_WORD_MAX >> 31 >> 31 >> 31 >> 31 >> 3 == 1
+# define BITSET_WORD_BITS 128
+#elif BITSET_WORD_MAX >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 7 == 1
+# define BITSET_WORD_BITS 256
+#elif BITSET_WORD_MAX >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 31 >> 7 > 1
+# define BITSET_WORD_BITS 257 /* any value > SBC_MAX will do here */
+# if BITSET_WORD_BITS <= SBC_MAX
+#  error "Invalid SBC_MAX"
+# endif
+#else
+# error "Add case for new bitset_word_t size"
+#endif
+
+/* Number of bitset_word_t values in a bitset_t.  */
+#define BITSET_WORDS ((SBC_MAX + BITSET_WORD_BITS - 1) / BITSET_WORD_BITS)
+
+typedef bitset_word_t bitset_t[BITSET_WORDS];
+typedef bitset_word_t *re_bitset_ptr_t;
+typedef const bitset_word_t *re_const_bitset_ptr_t;
+
+#define PREV_WORD_CONSTRAINT 0x0001
+#define PREV_NOTWORD_CONSTRAINT 0x0002
+#define NEXT_WORD_CONSTRAINT 0x0004
+#define NEXT_NOTWORD_CONSTRAINT 0x0008
+#define PREV_NEWLINE_CONSTRAINT 0x0010
+#define NEXT_NEWLINE_CONSTRAINT 0x0020
+#define PREV_BEGBUF_CONSTRAINT 0x0040
+#define NEXT_ENDBUF_CONSTRAINT 0x0080
+#define WORD_DELIM_CONSTRAINT 0x0100
+#define NOT_WORD_DELIM_CONSTRAINT 0x0200
+
+typedef enum
+{
+  INSIDE_WORD = PREV_WORD_CONSTRAINT | NEXT_WORD_CONSTRAINT,
+  WORD_FIRST = PREV_NOTWORD_CONSTRAINT | NEXT_WORD_CONSTRAINT,
+  WORD_LAST = PREV_WORD_CONSTRAINT | NEXT_NOTWORD_CONSTRAINT,
+  INSIDE_NOTWORD = PREV_NOTWORD_CONSTRAINT | NEXT_NOTWORD_CONSTRAINT,
+  LINE_FIRST = PREV_NEWLINE_CONSTRAINT,
+  LINE_LAST = NEXT_NEWLINE_CONSTRAINT,
+  BUF_FIRST = PREV_BEGBUF_CONSTRAINT,
+  BUF_LAST = NEXT_ENDBUF_CONSTRAINT,
+  WORD_DELIM = WORD_DELIM_CONSTRAINT,
+  NOT_WORD_DELIM = NOT_WORD_DELIM_CONSTRAINT
+} re_context_type;
+
+typedef struct
+{
+  Idx alloc;
+  Idx nelem;
+  Idx *elems;
+} re_node_set;
+
+typedef enum
+{
+  NON_TYPE = 0,
+
+  /* Node type, These are used by token, node, tree.  */
+  CHARACTER = 1,
+  END_OF_RE = 2,
+  SIMPLE_BRACKET = 3,
+  OP_BACK_REF = 4,
+  OP_PERIOD = 5,
+#ifdef RE_ENABLE_I18N
+  COMPLEX_BRACKET = 6,
+  OP_UTF8_PERIOD = 7,
+#endif /* RE_ENABLE_I18N */
+
+  /* We define EPSILON_BIT as a macro so that OP_OPEN_SUBEXP is used
+     when the debugger shows values of this enum type.  */
+#define EPSILON_BIT 8
+  OP_OPEN_SUBEXP = EPSILON_BIT | 0,
+  OP_CLOSE_SUBEXP = EPSILON_BIT | 1,
+  OP_ALT = EPSILON_BIT | 2,
+  OP_DUP_ASTERISK = EPSILON_BIT | 3,
+  ANCHOR = EPSILON_BIT | 4,
+
+  /* Tree type, these are used only by tree. */
+  CONCAT = 16,
+  SUBEXP = 17,
+
+  /* Token type, these are used only by token.  */
+  OP_DUP_PLUS = 18,
+  OP_DUP_QUESTION,
+  OP_OPEN_BRACKET,
+  OP_CLOSE_BRACKET,
+  OP_CHARSET_RANGE,
+  OP_OPEN_DUP_NUM,
+  OP_CLOSE_DUP_NUM,
+  OP_NON_MATCH_LIST,
+  OP_OPEN_COLL_ELEM,
+  OP_CLOSE_COLL_ELEM,
+  OP_OPEN_EQUIV_CLASS,
+  OP_CLOSE_EQUIV_CLASS,
+  OP_OPEN_CHAR_CLASS,
+  OP_CLOSE_CHAR_CLASS,
+  OP_WORD,
+  OP_NOTWORD,
+  OP_SPACE,
+  OP_NOTSPACE,
+  BACK_SLASH
+
+} re_token_type_t;
+
+#ifdef RE_ENABLE_I18N
+typedef struct
+{
+  /* Multibyte characters.  */
+  wchar_t *mbchars;
+
+  /* Collating symbols.  */
+# ifdef _LIBC
+  int32_t *coll_syms;
+# endif
+
+  /* Equivalence classes. */
+# ifdef _LIBC
+  int32_t *equiv_classes;
+# endif
+
+  /* Range expressions. */
+# ifdef _LIBC
+  uint32_t *range_starts;
+  uint32_t *range_ends;
+# else /* not _LIBC */
+  wchar_t *range_starts;
+  wchar_t *range_ends;
+# endif /* not _LIBC */
+
+  /* Character classes. */
+  wctype_t *char_classes;
+
+  /* If this character set is the non-matching list.  */
+  unsigned int non_match : 1;
+
+  /* # of multibyte characters.  */
+  Idx nmbchars;
+
+  /* # of collating symbols.  */
+  Idx ncoll_syms;
+
+  /* # of equivalence classes. */
+  Idx nequiv_classes;
+
+  /* # of range expressions. */
+  Idx nranges;
+
+  /* # of character classes. */
+  Idx nchar_classes;
+} re_charset_t;
+#endif /* RE_ENABLE_I18N */
+
+typedef struct
+{
+  union
+  {
+    unsigned char c;		/* for CHARACTER */
+    re_bitset_ptr_t sbcset;	/* for SIMPLE_BRACKET */
+#ifdef RE_ENABLE_I18N
+    re_charset_t *mbcset;	/* for COMPLEX_BRACKET */
+#endif /* RE_ENABLE_I18N */
+    Idx idx;			/* for BACK_REF */
+    re_context_type ctx_type;	/* for ANCHOR */
+  } opr;
+#if __GNUC__ >= 2 && !__STRICT_ANSI__
+  re_token_type_t type : 8;
+#else
+  re_token_type_t type;
+#endif
+  unsigned int constraint : 10;	/* context constraint */
+  unsigned int duplicated : 1;
+  unsigned int opt_subexp : 1;
+#ifdef RE_ENABLE_I18N
+  unsigned int accept_mb : 1;
+  /* These 2 bits can be moved into the union if needed (e.g. if running out
+     of bits; move opr.c to opr.c.c and move the flags to opr.c.flags).  */
+  unsigned int mb_partial : 1;
+#endif
+  unsigned int word_char : 1;
+} re_token_t;
+
+#define IS_EPSILON_NODE(type) ((type) & EPSILON_BIT)
+
+struct re_string_t
+{
+  /* Indicate the raw buffer which is the original string passed as an
+     argument of regexec(), re_search(), etc..  */
+  const unsigned char *raw_mbs;
+  /* Store the multibyte string.  In case of "case insensitive mode" like
+     REG_ICASE, upper cases of the string are stored, otherwise MBS points
+     the same address that RAW_MBS points.  */
+  unsigned char *mbs;
+#ifdef RE_ENABLE_I18N
+  /* Store the wide character string which is corresponding to MBS.  */
+  wint_t *wcs;
+  Idx *offsets;
+  mbstate_t cur_state;
+#endif
+  /* Index in RAW_MBS.  Each character mbs[i] corresponds to
+     raw_mbs[raw_mbs_idx + i].  */
+  Idx raw_mbs_idx;
+  /* The length of the valid characters in the buffers.  */
+  Idx valid_len;
+  /* The corresponding number of bytes in raw_mbs array.  */
+  Idx valid_raw_len;
+  /* The length of the buffers MBS and WCS.  */
+  Idx bufs_len;
+  /* The index in MBS, which is updated by re_string_fetch_byte.  */
+  Idx cur_idx;
+  /* length of RAW_MBS array.  */
+  Idx raw_len;
+  /* This is RAW_LEN - RAW_MBS_IDX + VALID_LEN - VALID_RAW_LEN.  */
+  Idx len;
+  /* End of the buffer may be shorter than its length in the cases such
+     as re_match_2, re_search_2.  Then, we use STOP for end of the buffer
+     instead of LEN.  */
+  Idx raw_stop;
+  /* This is RAW_STOP - RAW_MBS_IDX adjusted through OFFSETS.  */
+  Idx stop;
+
+  /* The context of mbs[0].  We store the context independently, since
+     the context of mbs[0] may be different from raw_mbs[0], which is
+     the beginning of the input string.  */
+  unsigned int tip_context;
+  /* The translation passed as a part of an argument of re_compile_pattern.  */
+  RE_TRANSLATE_TYPE trans;
+  /* Copy of re_dfa_t's word_char.  */
+  re_const_bitset_ptr_t word_char;
+  /* true if REG_ICASE.  */
+  unsigned char icase;
+  unsigned char is_utf8;
+  unsigned char map_notascii;
+  unsigned char mbs_allocated;
+  unsigned char offsets_needed;
+  unsigned char newline_anchor;
+  unsigned char word_ops_used;
+  int mb_cur_max;
+};
+typedef struct re_string_t re_string_t;
+
+
+struct re_dfa_t;
+typedef struct re_dfa_t re_dfa_t;
+
+#ifndef _LIBC
+# if defined __i386__ && !defined __EMX__
+#  define internal_function   __attribute ((regparm (3), stdcall))
+# else
+#  define internal_function
+# endif
+#endif
+
+static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr,
+						Idx new_buf_len)
+     internal_function;
+#ifdef RE_ENABLE_I18N
+static void build_wcs_buffer (re_string_t *pstr) internal_function;
+static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr)
+     internal_function;
+#endif /* RE_ENABLE_I18N */
+static void build_upper_buffer (re_string_t *pstr) internal_function;
+static void re_string_translate_buffer (re_string_t *pstr) internal_function;
+static unsigned int re_string_context_at (const re_string_t *input, Idx idx,
+					  int eflags)
+     internal_function __attribute ((pure));
+#define re_string_peek_byte(pstr, offset) \
+  ((pstr)->mbs[(pstr)->cur_idx + offset])
+#define re_string_fetch_byte(pstr) \
+  ((pstr)->mbs[(pstr)->cur_idx++])
+#define re_string_first_byte(pstr, idx) \
+  ((idx) == (pstr)->valid_len || (pstr)->wcs[idx] != WEOF)
+#define re_string_is_single_byte_char(pstr, idx) \
+  ((pstr)->wcs[idx] != WEOF && ((pstr)->valid_len == (idx) + 1 \
+				|| (pstr)->wcs[(idx) + 1] != WEOF))
+#define re_string_eoi(pstr) ((pstr)->stop <= (pstr)->cur_idx)
+#define re_string_cur_idx(pstr) ((pstr)->cur_idx)
+#define re_string_get_buffer(pstr) ((pstr)->mbs)
+#define re_string_length(pstr) ((pstr)->len)
+#define re_string_byte_at(pstr,idx) ((pstr)->mbs[idx])
+#define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
+#define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
+
+#include <alloca.h>
+
+#ifndef _LIBC
+# if HAVE_ALLOCA
+/* The OS usually guarantees only one guard page at the bottom of the stack,
+   and a page size can be as small as 4096 bytes.  So we cannot safely
+   allocate anything larger than 4096 bytes.  Also care for the possibility
+   of a few compiler-allocated temporary stack slots.  */
+#  define __libc_use_alloca(n) ((n) < 4032)
+# else
+/* alloca is implemented with malloc, so just use malloc.  */
+#  define __libc_use_alloca(n) 0
+# endif
+#endif
+
+#ifndef MAX
+# define MAX(a,b) ((a) < (b) ? (b) : (a))
+#endif
+
+#define re_malloc(t,n) ((t *) malloc ((n) * sizeof (t)))
+#define re_realloc(p,t,n) ((t *) realloc (p, (n) * sizeof (t)))
+#define re_free(p) free (p)
+
+struct bin_tree_t
+{
+  struct bin_tree_t *parent;
+  struct bin_tree_t *left;
+  struct bin_tree_t *right;
+  struct bin_tree_t *first;
+  struct bin_tree_t *next;
+
+  re_token_t token;
+
+  /* `node_idx' is the index in dfa->nodes, if `type' == 0.
+     Otherwise `type' indicate the type of this node.  */
+  Idx node_idx;
+};
+typedef struct bin_tree_t bin_tree_t;
+
+#define BIN_TREE_STORAGE_SIZE \
+  ((1024 - sizeof (void *)) / sizeof (bin_tree_t))
+
+struct bin_tree_storage_t
+{
+  struct bin_tree_storage_t *next;
+  bin_tree_t data[BIN_TREE_STORAGE_SIZE];
+};
+typedef struct bin_tree_storage_t bin_tree_storage_t;
+
+#define CONTEXT_WORD 1
+#define CONTEXT_NEWLINE (CONTEXT_WORD << 1)
+#define CONTEXT_BEGBUF (CONTEXT_NEWLINE << 1)
+#define CONTEXT_ENDBUF (CONTEXT_BEGBUF << 1)
+
+#define IS_WORD_CONTEXT(c) ((c) & CONTEXT_WORD)
+#define IS_NEWLINE_CONTEXT(c) ((c) & CONTEXT_NEWLINE)
+#define IS_BEGBUF_CONTEXT(c) ((c) & CONTEXT_BEGBUF)
+#define IS_ENDBUF_CONTEXT(c) ((c) & CONTEXT_ENDBUF)
+#define IS_ORDINARY_CONTEXT(c) ((c) == 0)
+
+#define IS_WORD_CHAR(ch) (isalnum (ch) || (ch) == '_')
+#define IS_NEWLINE(ch) ((ch) == NEWLINE_CHAR)
+#define IS_WIDE_WORD_CHAR(ch) (iswalnum (ch) || (ch) == L'_')
+#define IS_WIDE_NEWLINE(ch) ((ch) == WIDE_NEWLINE_CHAR)
+
+#define NOT_SATISFY_PREV_CONSTRAINT(constraint,context) \
+ ((((constraint) & PREV_WORD_CONSTRAINT) && !IS_WORD_CONTEXT (context)) \
+  || ((constraint & PREV_NOTWORD_CONSTRAINT) && IS_WORD_CONTEXT (context)) \
+  || ((constraint & PREV_NEWLINE_CONSTRAINT) && !IS_NEWLINE_CONTEXT (context))\
+  || ((constraint & PREV_BEGBUF_CONSTRAINT) && !IS_BEGBUF_CONTEXT (context)))
+
+#define NOT_SATISFY_NEXT_CONSTRAINT(constraint,context) \
+ ((((constraint) & NEXT_WORD_CONSTRAINT) && !IS_WORD_CONTEXT (context)) \
+  || (((constraint) & NEXT_NOTWORD_CONSTRAINT) && IS_WORD_CONTEXT (context)) \
+  || (((constraint) & NEXT_NEWLINE_CONSTRAINT) && !IS_NEWLINE_CONTEXT (context)) \
+  || (((constraint) & NEXT_ENDBUF_CONSTRAINT) && !IS_ENDBUF_CONTEXT (context)))
+
+struct re_dfastate_t
+{
+  re_hashval_t hash;
+  re_node_set nodes;
+  re_node_set non_eps_nodes;
+  re_node_set inveclosure;
+  re_node_set *entrance_nodes;
+  struct re_dfastate_t **trtable, **word_trtable;
+  unsigned int context : 4;
+  unsigned int halt : 1;
+  /* If this state can accept `multi byte'.
+     Note that we refer to multibyte characters, and multi character
+     collating elements as `multi byte'.  */
+  unsigned int accept_mb : 1;
+  /* If this state has backreference node(s).  */
+  unsigned int has_backref : 1;
+  unsigned int has_constraint : 1;
+};
+typedef struct re_dfastate_t re_dfastate_t;
+
+struct re_state_table_entry
+{
+  Idx num;
+  Idx alloc;
+  re_dfastate_t **array;
+};
+
+/* Array type used in re_sub_match_last_t and re_sub_match_top_t.  */
+
+typedef struct
+{
+  Idx next_idx;
+  Idx alloc;
+  re_dfastate_t **array;
+} state_array_t;
+
+/* Store information about the node NODE whose type is OP_CLOSE_SUBEXP.  */
+
+typedef struct
+{
+  Idx node;
+  Idx str_idx; /* The position NODE match at.  */
+  state_array_t path;
+} re_sub_match_last_t;
+
+/* Store information about the node NODE whose type is OP_OPEN_SUBEXP.
+   And information about the node, whose type is OP_CLOSE_SUBEXP,
+   corresponding to NODE is stored in LASTS.  */
+
+typedef struct
+{
+  Idx str_idx;
+  Idx node;
+  state_array_t *path;
+  Idx alasts; /* Allocation size of LASTS.  */
+  Idx nlasts; /* The number of LASTS.  */
+  re_sub_match_last_t **lasts;
+} re_sub_match_top_t;
+
+struct re_backref_cache_entry
+{
+  Idx node;
+  Idx str_idx;
+  Idx subexp_from;
+  Idx subexp_to;
+  char more;
+  char unused;
+  unsigned short int eps_reachable_subexps_map;
+};
+
+typedef struct
+{
+  /* The string object corresponding to the input string.  */
+  re_string_t input;
+#if defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+  const re_dfa_t *const dfa;
+#else
+  const re_dfa_t *dfa;
+#endif
+  /* EFLAGS of the argument of regexec.  */
+  int eflags;
+  /* Where the matching ends.  */
+  Idx match_last;
+  Idx last_node;
+  /* The state log used by the matcher.  */
+  re_dfastate_t **state_log;
+  Idx state_log_top;
+  /* Back reference cache.  */
+  Idx nbkref_ents;
+  Idx abkref_ents;
+  struct re_backref_cache_entry *bkref_ents;
+  int max_mb_elem_len;
+  Idx nsub_tops;
+  Idx asub_tops;
+  re_sub_match_top_t **sub_tops;
+} re_match_context_t;
+
+typedef struct
+{
+  re_dfastate_t **sifted_states;
+  re_dfastate_t **limited_states;
+  Idx last_node;
+  Idx last_str_idx;
+  re_node_set limits;
+} re_sift_context_t;
+
+struct re_fail_stack_ent_t
+{
+  Idx idx;
+  Idx node;
+  regmatch_t *regs;
+  re_node_set eps_via_nodes;
+};
+
+struct re_fail_stack_t
+{
+  Idx num;
+  Idx alloc;
+  struct re_fail_stack_ent_t *stack;
+};
+
+struct re_dfa_t
+{
+  re_token_t *nodes;
+  size_t nodes_alloc;
+  size_t nodes_len;
+  Idx *nexts;
+  Idx *org_indices;
+  re_node_set *edests;
+  re_node_set *eclosures;
+  re_node_set *inveclosures;
+  struct re_state_table_entry *state_table;
+  re_dfastate_t *init_state;
+  re_dfastate_t *init_state_word;
+  re_dfastate_t *init_state_nl;
+  re_dfastate_t *init_state_begbuf;
+  bin_tree_t *str_tree;
+  bin_tree_storage_t *str_tree_storage;
+  re_bitset_ptr_t sb_char;
+  int str_tree_storage_idx;
+
+  /* number of subexpressions `re_nsub' is in regex_t.  */
+  re_hashval_t state_hash_mask;
+  Idx init_node;
+  Idx nbackref; /* The number of backreference in this dfa.  */
+
+  /* Bitmap expressing which backreference is used.  */
+  bitset_word_t used_bkref_map;
+  bitset_word_t completed_bkref_map;
+
+  unsigned int has_plural_match : 1;
+  /* If this dfa has "multibyte node", which is a backreference or
+     a node which can accept multibyte character or multi character
+     collating element.  */
+  unsigned int has_mb_node : 1;
+  unsigned int is_utf8 : 1;
+  unsigned int map_notascii : 1;
+  unsigned int word_ops_used : 1;
+  int mb_cur_max;
+  bitset_t word_char;
+  reg_syntax_t syntax;
+  Idx *subexp_map;
+#ifdef DEBUG
+  char* re_str;
+#endif
+#ifdef _LIBC
+  __libc_lock_define (, lock)
+#endif
+};
+
+#define re_node_set_init_empty(set) memset (set, '\0', sizeof (re_node_set))
+#define re_node_set_remove(set,id) \
+  (re_node_set_remove_at (set, re_node_set_contains (set, id) - 1))
+#define re_node_set_empty(p) ((p)->nelem = 0)
+#define re_node_set_free(set) re_free ((set)->elems)
+
+
+typedef enum
+{
+  SB_CHAR,
+  MB_CHAR,
+  EQUIV_CLASS,
+  COLL_SYM,
+  CHAR_CLASS
+} bracket_elem_type;
+
+typedef struct
+{
+  bracket_elem_type type;
+  union
+  {
+    unsigned char ch;
+    unsigned char *name;
+    wchar_t wch;
+  } opr;
+} bracket_elem_t;
+
+
+/* Inline functions for bitset_t operation.  */
+
+static inline void
+bitset_set (bitset_t set, Idx i)
+{
+  set[i / BITSET_WORD_BITS] |= (bitset_word_t) 1 << i % BITSET_WORD_BITS;
+}
+
+static inline void
+bitset_clear (bitset_t set, Idx i)
+{
+  set[i / BITSET_WORD_BITS] &= ~ ((bitset_word_t) 1 << i % BITSET_WORD_BITS);
+}
+
+static inline bool
+bitset_contain (const bitset_t set, Idx i)
+{
+  return (set[i / BITSET_WORD_BITS] >> i % BITSET_WORD_BITS) & 1;
+}
+
+static inline void
+bitset_empty (bitset_t set)
+{
+  memset (set, '\0', sizeof (bitset_t));
+}
+
+static inline void
+bitset_set_all (bitset_t set)
+{
+  memset (set, -1, sizeof (bitset_word_t) * (SBC_MAX / BITSET_WORD_BITS));
+  if (SBC_MAX % BITSET_WORD_BITS != 0)
+    set[BITSET_WORDS - 1] =
+      ((bitset_word_t) 1 << SBC_MAX % BITSET_WORD_BITS) - 1;
+}
+
+static inline void
+bitset_copy (bitset_t dest, const bitset_t src)
+{
+  memcpy (dest, src, sizeof (bitset_t));
+}
+
+static inline void
+bitset_not (bitset_t set)
+{
+  int bitset_i;
+  for (bitset_i = 0; bitset_i < SBC_MAX / BITSET_WORD_BITS; ++bitset_i)
+    set[bitset_i] = ~set[bitset_i];
+  if (SBC_MAX % BITSET_WORD_BITS != 0)
+    set[BITSET_WORDS - 1] =
+      ((((bitset_word_t) 1 << SBC_MAX % BITSET_WORD_BITS) - 1)
+       & ~set[BITSET_WORDS - 1]);
+}
+
+static inline void
+bitset_merge (bitset_t dest, const bitset_t src)
+{
+  int bitset_i;
+  for (bitset_i = 0; bitset_i < BITSET_WORDS; ++bitset_i)
+    dest[bitset_i] |= src[bitset_i];
+}
+
+static inline void
+bitset_mask (bitset_t dest, const bitset_t src)
+{
+  int bitset_i;
+  for (bitset_i = 0; bitset_i < BITSET_WORDS; ++bitset_i)
+    dest[bitset_i] &= src[bitset_i];
+}
+
+#ifdef RE_ENABLE_I18N
+/* Inline functions for re_string.  */
+static inline int
+internal_function __attribute ((pure))
+re_string_char_size_at (const re_string_t *pstr, Idx idx)
+{
+  int byte_idx;
+  if (pstr->mb_cur_max == 1)
+    return 1;
+  for (byte_idx = 1; idx + byte_idx < pstr->valid_len; ++byte_idx)
+    if (pstr->wcs[idx + byte_idx] != WEOF)
+      break;
+  return byte_idx;
+}
+
+static inline wint_t
+internal_function __attribute ((pure))
+re_string_wchar_at (const re_string_t *pstr, Idx idx)
+{
+  if (pstr->mb_cur_max == 1)
+    return (wint_t) pstr->mbs[idx];
+  return (wint_t) pstr->wcs[idx];
+}
+
+static int
+internal_function __attribute ((pure))
+re_string_elem_size_at (const re_string_t *pstr, Idx idx)
+{
+# ifdef _LIBC
+  const unsigned char *p, *extra;
+  const int32_t *table, *indirect;
+  int32_t tmp;
+#  include <locale/weight.h>
+  uint_fast32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+
+  if (nrules != 0)
+    {
+      table = (const int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
+      extra = (const unsigned char *)
+	_NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB);
+      indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE,
+						_NL_COLLATE_INDIRECTMB);
+      p = pstr->mbs + idx;
+      tmp = findidx (&p);
+      return p - pstr->mbs - idx;
+    }
+  else
+# endif /* _LIBC */
+    return 1;
+}
+#endif /* RE_ENABLE_I18N */
+
+#endif /*  _REGEX_INTERNAL_H */
diff --git a/gnulib/regexec.c b/gnulib/regexec.c
new file mode 100644
index 000000000..21a81669f
--- /dev/null
+++ b/gnulib/regexec.c
@@ -0,0 +1,4407 @@
+/* Extended regular expression matching and search library.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags,
+				     Idx n) internal_function;
+static void match_ctx_clean (re_match_context_t *mctx) internal_function;
+static void match_ctx_free (re_match_context_t *cache) internal_function;
+static reg_errcode_t match_ctx_add_entry (re_match_context_t *cache, Idx node,
+					  Idx str_idx, Idx from, Idx to)
+     internal_function;
+static Idx search_cur_bkref_entry (const re_match_context_t *mctx, Idx str_idx)
+     internal_function;
+static reg_errcode_t match_ctx_add_subtop (re_match_context_t *mctx, Idx node,
+					   Idx str_idx) internal_function;
+static re_sub_match_last_t * match_ctx_add_sublast (re_sub_match_top_t *subtop,
+						    Idx node, Idx str_idx)
+     internal_function;
+static void sift_ctx_init (re_sift_context_t *sctx, re_dfastate_t **sifted_sts,
+			   re_dfastate_t **limited_sts, Idx last_node,
+			   Idx last_str_idx)
+     internal_function;
+static reg_errcode_t re_search_internal (const regex_t *preg,
+					 const char *string, Idx length,
+					 Idx start, Idx last_start, Idx stop,
+					 size_t nmatch, regmatch_t pmatch[],
+					 int eflags) internal_function;
+static regoff_t re_search_2_stub (struct re_pattern_buffer *bufp,
+				  const char *string1, Idx length1,
+				  const char *string2, Idx length2,
+				  Idx start, regoff_t range,
+				  struct re_registers *regs,
+				  Idx stop, bool ret_len) internal_function;
+static regoff_t re_search_stub (struct re_pattern_buffer *bufp,
+				const char *string, Idx length, Idx start,
+				regoff_t range, Idx stop,
+				struct re_registers *regs,
+				bool ret_len) internal_function;
+static unsigned int re_copy_regs (struct re_registers *regs, regmatch_t *pmatch,
+				  Idx nregs, int regs_allocated)
+     internal_function;
+static reg_errcode_t prune_impossible_nodes (re_match_context_t *mctx)
+     internal_function;
+static Idx check_matching (re_match_context_t *mctx, bool fl_longest_match,
+			   Idx *p_match_first) internal_function;
+static Idx check_halt_state_context (const re_match_context_t *mctx,
+				     const re_dfastate_t *state, Idx idx)
+     internal_function;
+static void update_regs (const re_dfa_t *dfa, regmatch_t *pmatch,
+			 regmatch_t *prev_idx_match, Idx cur_node,
+			 Idx cur_idx, Idx nmatch) internal_function;
+static reg_errcode_t push_fail_stack (struct re_fail_stack_t *fs,
+				      Idx str_idx, Idx dest_node, Idx nregs,
+				      regmatch_t *regs,
+				      re_node_set *eps_via_nodes)
+     internal_function;
+static reg_errcode_t set_regs (const regex_t *preg,
+			       const re_match_context_t *mctx,
+			       size_t nmatch, regmatch_t *pmatch,
+			       bool fl_backtrack) internal_function;
+static reg_errcode_t free_fail_stack_return (struct re_fail_stack_t *fs)
+     internal_function;
+
+#ifdef RE_ENABLE_I18N
+static int sift_states_iter_mb (const re_match_context_t *mctx,
+				re_sift_context_t *sctx,
+				Idx node_idx, Idx str_idx, Idx max_str_idx)
+     internal_function;
+#endif /* RE_ENABLE_I18N */
+static reg_errcode_t sift_states_backward (const re_match_context_t *mctx,
+					   re_sift_context_t *sctx)
+     internal_function;
+static reg_errcode_t build_sifted_states (const re_match_context_t *mctx,
+					  re_sift_context_t *sctx, Idx str_idx,
+					  re_node_set *cur_dest)
+     internal_function;
+static reg_errcode_t update_cur_sifted_state (const re_match_context_t *mctx,
+					      re_sift_context_t *sctx,
+					      Idx str_idx,
+					      re_node_set *dest_nodes)
+     internal_function;
+static reg_errcode_t add_epsilon_src_nodes (const re_dfa_t *dfa,
+					    re_node_set *dest_nodes,
+					    const re_node_set *candidates)
+     internal_function;
+static bool check_dst_limits (const re_match_context_t *mctx,
+			      const re_node_set *limits,
+			      Idx dst_node, Idx dst_idx, Idx src_node,
+			      Idx src_idx) internal_function;
+static int check_dst_limits_calc_pos_1 (const re_match_context_t *mctx,
+					int boundaries, Idx subexp_idx,
+					Idx from_node, Idx bkref_idx)
+     internal_function;
+static int check_dst_limits_calc_pos (const re_match_context_t *mctx,
+				      Idx limit, Idx subexp_idx,
+				      Idx node, Idx str_idx,
+				      Idx bkref_idx) internal_function;
+static reg_errcode_t check_subexp_limits (const re_dfa_t *dfa,
+					  re_node_set *dest_nodes,
+					  const re_node_set *candidates,
+					  re_node_set *limits,
+					  struct re_backref_cache_entry *bkref_ents,
+					  Idx str_idx) internal_function;
+static reg_errcode_t sift_states_bkref (const re_match_context_t *mctx,
+					re_sift_context_t *sctx,
+					Idx str_idx, const re_node_set *candidates)
+     internal_function;
+static reg_errcode_t merge_state_array (const re_dfa_t *dfa,
+					re_dfastate_t **dst,
+					re_dfastate_t **src, Idx num)
+     internal_function;
+static re_dfastate_t *find_recover_state (reg_errcode_t *err,
+					 re_match_context_t *mctx) internal_function;
+static re_dfastate_t *transit_state (reg_errcode_t *err,
+				     re_match_context_t *mctx,
+				     re_dfastate_t *state) internal_function;
+static re_dfastate_t *merge_state_with_log (reg_errcode_t *err,
+					    re_match_context_t *mctx,
+					    re_dfastate_t *next_state)
+     internal_function;
+static reg_errcode_t check_subexp_matching_top (re_match_context_t *mctx,
+						re_node_set *cur_nodes,
+						Idx str_idx) internal_function;
+#if 0
+static re_dfastate_t *transit_state_sb (reg_errcode_t *err,
+					re_match_context_t *mctx,
+					re_dfastate_t *pstate)
+     internal_function;
+#endif
+#ifdef RE_ENABLE_I18N
+static reg_errcode_t transit_state_mb (re_match_context_t *mctx,
+				       re_dfastate_t *pstate)
+     internal_function;
+#endif /* RE_ENABLE_I18N */
+static reg_errcode_t transit_state_bkref (re_match_context_t *mctx,
+					  const re_node_set *nodes)
+     internal_function;
+static reg_errcode_t get_subexp (re_match_context_t *mctx,
+				 Idx bkref_node, Idx bkref_str_idx)
+     internal_function;
+static reg_errcode_t get_subexp_sub (re_match_context_t *mctx,
+				     const re_sub_match_top_t *sub_top,
+				     re_sub_match_last_t *sub_last,
+				     Idx bkref_node, Idx bkref_str)
+     internal_function;
+static Idx find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes,
+			     Idx subexp_idx, int type) internal_function;
+static reg_errcode_t check_arrival (re_match_context_t *mctx,
+				    state_array_t *path, Idx top_node,
+				    Idx top_str, Idx last_node, Idx last_str,
+				    int type) internal_function;
+static reg_errcode_t check_arrival_add_next_nodes (re_match_context_t *mctx,
+						   Idx str_idx,
+						   re_node_set *cur_nodes,
+						   re_node_set *next_nodes)
+     internal_function;
+static reg_errcode_t check_arrival_expand_ecl (const re_dfa_t *dfa,
+					       re_node_set *cur_nodes,
+					       Idx ex_subexp, int type)
+     internal_function;
+static reg_errcode_t check_arrival_expand_ecl_sub (const re_dfa_t *dfa,
+						   re_node_set *dst_nodes,
+						   Idx target, Idx ex_subexp,
+						   int type) internal_function;
+static reg_errcode_t expand_bkref_cache (re_match_context_t *mctx,
+					 re_node_set *cur_nodes, Idx cur_str,
+					 Idx subexp_num, int type)
+     internal_function;
+static bool build_trtable (const re_dfa_t *dfa,
+			   re_dfastate_t *state) internal_function;
+#ifdef RE_ENABLE_I18N
+static int check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
+				    const re_string_t *input, Idx idx)
+     internal_function;
+# ifdef _LIBC
+static unsigned int find_collation_sequence_value (const unsigned char *mbs,
+						   size_t name_len)
+     internal_function;
+# endif /* _LIBC */
+#endif /* RE_ENABLE_I18N */
+static Idx group_nodes_into_DFAstates (const re_dfa_t *dfa,
+				       const re_dfastate_t *state,
+				       re_node_set *states_node,
+				       bitset_t *states_ch) internal_function;
+static bool check_node_accept (const re_match_context_t *mctx,
+			       const re_token_t *node, Idx idx)
+     internal_function;
+static reg_errcode_t extend_buffers (re_match_context_t *mctx)
+     internal_function;
+
+/* Entry point for POSIX code.  */
+
+/* regexec searches for a given pattern, specified by PREG, in the
+   string STRING.
+
+   If NMATCH is zero or REG_NOSUB was set in the cflags argument to
+   `regcomp', we ignore PMATCH.  Otherwise, we assume PMATCH has at
+   least NMATCH elements, and we set them to the offsets of the
+   corresponding matched substrings.
+
+   EFLAGS specifies `execution flags' which affect matching: if
+   REG_NOTBOL is set, then ^ does not match at the beginning of the
+   string; if REG_NOTEOL is set, then $ does not match at the end.
+
+   We return 0 if we find a match and REG_NOMATCH if not.  */
+
+int
+regexec (preg, string, nmatch, pmatch, eflags)
+    const regex_t *_Restrict_ preg;
+    const char *_Restrict_ string;
+    size_t nmatch;
+    regmatch_t pmatch[_Restrict_arr_];
+    int eflags;
+{
+  reg_errcode_t err;
+  Idx start, length;
+#ifdef _LIBC
+  re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
+#endif
+
+  if (eflags & ~(REG_NOTBOL | REG_NOTEOL | REG_STARTEND))
+    return REG_BADPAT;
+
+  if (eflags & REG_STARTEND)
+    {
+      start = pmatch[0].rm_so;
+      length = pmatch[0].rm_eo;
+    }
+  else
+    {
+      start = 0;
+      length = strlen (string);
+    }
+
+  __libc_lock_lock (dfa->lock);
+  if (preg->no_sub)
+    err = re_search_internal (preg, string, length, start, length,
+			      length, 0, NULL, eflags);
+  else
+    err = re_search_internal (preg, string, length, start, length,
+			      length, nmatch, pmatch, eflags);
+  __libc_lock_unlock (dfa->lock);
+  return err != REG_NOERROR;
+}
+
+#ifdef _LIBC
+# include <shlib-compat.h>
+versioned_symbol (libc, __regexec, regexec, GLIBC_2_3_4);
+
+# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)
+__typeof__ (__regexec) __compat_regexec;
+
+int
+attribute_compat_text_section
+__compat_regexec (const regex_t *_Restrict_ preg,
+		  const char *_Restrict_ string, size_t nmatch,
+		  regmatch_t pmatch[], int eflags)
+{
+  return regexec (preg, string, nmatch, pmatch,
+		  eflags & (REG_NOTBOL | REG_NOTEOL));
+}
+compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0);
+# endif
+#endif
+
+/* Entry points for GNU code.  */
+
+/* re_match, re_search, re_match_2, re_search_2
+
+   The former two functions operate on STRING with length LENGTH,
+   while the later two operate on concatenation of STRING1 and STRING2
+   with lengths LENGTH1 and LENGTH2, respectively.
+
+   re_match() matches the compiled pattern in BUFP against the string,
+   starting at index START.
+
+   re_search() first tries matching at index START, then it tries to match
+   starting from index START + 1, and so on.  The last start position tried
+   is START + RANGE.  (Thus RANGE = 0 forces re_search to operate the same
+   way as re_match().)
+
+   The parameter STOP of re_{match,search}_2 specifies that no match exceeding
+   the first STOP characters of the concatenation of the strings should be
+   concerned.
+
+   If REGS is not NULL, and BUFP->no_sub is not set, the offsets of the match
+   and all groups is stored in REGS.  (For the "_2" variants, the offsets are
+   computed relative to the concatenation, not relative to the individual
+   strings.)
+
+   On success, re_match* functions return the length of the match, re_search*
+   return the position of the start of the match.  Return value -1 means no
+   match was found and -2 indicates an internal error.  */
+
+regoff_t
+re_match (bufp, string, length, start, regs)
+    struct re_pattern_buffer *bufp;
+    const char *string;
+    Idx length, start;
+    struct re_registers *regs;
+{
+  return re_search_stub (bufp, string, length, start, 0, length, regs, true);
+}
+#ifdef _LIBC
+weak_alias (__re_match, re_match)
+#endif
+
+regoff_t
+re_search (bufp, string, length, start, range, regs)
+    struct re_pattern_buffer *bufp;
+    const char *string;
+    Idx length, start;
+    regoff_t range;
+    struct re_registers *regs;
+{
+  return re_search_stub (bufp, string, length, start, range, length, regs,
+			 false);
+}
+#ifdef _LIBC
+weak_alias (__re_search, re_search)
+#endif
+
+regoff_t
+re_match_2 (bufp, string1, length1, string2, length2, start, regs, stop)
+    struct re_pattern_buffer *bufp;
+    const char *string1, *string2;
+    Idx length1, length2, start, stop;
+    struct re_registers *regs;
+{
+  return re_search_2_stub (bufp, string1, length1, string2, length2,
+			   start, 0, regs, stop, true);
+}
+#ifdef _LIBC
+weak_alias (__re_match_2, re_match_2)
+#endif
+
+regoff_t
+re_search_2 (bufp, string1, length1, string2, length2, start, range, regs, stop)
+    struct re_pattern_buffer *bufp;
+    const char *string1, *string2;
+    Idx length1, length2, start, stop;
+    regoff_t range;
+    struct re_registers *regs;
+{
+  return re_search_2_stub (bufp, string1, length1, string2, length2,
+			   start, range, regs, stop, false);
+}
+#ifdef _LIBC
+weak_alias (__re_search_2, re_search_2)
+#endif
+
+static regoff_t
+internal_function
+re_search_2_stub (struct re_pattern_buffer *bufp,
+		  const char *string1, Idx length1,
+		  const char *string2, Idx length2,
+		  Idx start, regoff_t range, struct re_registers *regs,
+		  Idx stop, bool ret_len)
+{
+  const char *str;
+  regoff_t rval;
+  Idx len = length1 + length2;
+  char *s = NULL;
+
+  if (BE (length1 < 0 || length2 < 0 || stop < 0 || len < length1, 0))
+    return -2;
+
+  /* Concatenate the strings.  */
+  if (length2 > 0)
+    if (length1 > 0)
+      {
+	s = re_malloc (char, len);
+
+	if (BE (s == NULL, 0))
+	  return -2;
+#ifdef _LIBC
+	memcpy (__mempcpy (s, string1, length1), string2, length2);
+#else
+	memcpy (s, string1, length1);
+	memcpy (s + length1, string2, length2);
+#endif
+	str = s;
+      }
+    else
+      str = string2;
+  else
+    str = string1;
+
+  rval = re_search_stub (bufp, str, len, start, range, stop, regs,
+			 ret_len);
+  re_free (s);
+  return rval;
+}
+
+/* The parameters have the same meaning as those of re_search.
+   Additional parameters:
+   If RET_LEN is true the length of the match is returned (re_match style);
+   otherwise the position of the match is returned.  */
+
+static regoff_t
+internal_function
+re_search_stub (struct re_pattern_buffer *bufp,
+		const char *string, Idx length,
+		Idx start, regoff_t range, Idx stop, struct re_registers *regs,
+		bool ret_len)
+{
+  reg_errcode_t result;
+  regmatch_t *pmatch;
+  Idx nregs;
+  regoff_t rval;
+  int eflags = 0;
+#ifdef _LIBC
+  re_dfa_t *dfa = (re_dfa_t *) bufp->buffer;
+#endif
+  Idx last_start = start + range;
+
+  /* Check for out-of-range.  */
+  if (BE (start < 0 || start > length, 0))
+    return -1;
+  if (BE (length < last_start || (0 <= range && last_start < start), 0))
+    last_start = length;
+  else if (BE (last_start < 0 || (range < 0 && start <= last_start), 0))
+    last_start = 0;
+
+  __libc_lock_lock (dfa->lock);
+
+  eflags |= (bufp->not_bol) ? REG_NOTBOL : 0;
+  eflags |= (bufp->not_eol) ? REG_NOTEOL : 0;
+
+  /* Compile fastmap if we haven't yet.  */
+  if (start < last_start && bufp->fastmap != NULL && !bufp->fastmap_accurate)
+    re_compile_fastmap (bufp);
+
+  if (BE (bufp->no_sub, 0))
+    regs = NULL;
+
+  /* We need at least 1 register.  */
+  if (regs == NULL)
+    nregs = 1;
+  else if (BE (bufp->regs_allocated == REGS_FIXED
+	       && regs->num_regs <= bufp->re_nsub, 0))
+    {
+      nregs = regs->num_regs;
+      if (BE (nregs < 1, 0))
+	{
+	  /* Nothing can be copied to regs.  */
+	  regs = NULL;
+	  nregs = 1;
+	}
+    }
+  else
+    nregs = bufp->re_nsub + 1;
+  pmatch = re_malloc (regmatch_t, nregs);
+  if (BE (pmatch == NULL, 0))
+    {
+      rval = -2;
+      goto out;
+    }
+
+  result = re_search_internal (bufp, string, length, start, last_start, stop,
+			       nregs, pmatch, eflags);
+
+  rval = 0;
+
+  /* I hope we needn't fill ther regs with -1's when no match was found.  */
+  if (result != REG_NOERROR)
+    rval = -1;
+  else if (regs != NULL)
+    {
+      /* If caller wants register contents data back, copy them.  */
+      bufp->regs_allocated = re_copy_regs (regs, pmatch, nregs,
+					   bufp->regs_allocated);
+      if (BE (bufp->regs_allocated == REGS_UNALLOCATED, 0))
+	rval = -2;
+    }
+
+  if (BE (rval == 0, 1))
+    {
+      if (ret_len)
+	{
+	  assert (pmatch[0].rm_so == start);
+	  rval = pmatch[0].rm_eo - start;
+	}
+      else
+	rval = pmatch[0].rm_so;
+    }
+  re_free (pmatch);
+ out:
+  __libc_lock_unlock (dfa->lock);
+  return rval;
+}
+
+static unsigned int
+internal_function
+re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, Idx nregs,
+	      int regs_allocated)
+{
+  int rval = REGS_REALLOCATE;
+  Idx i;
+  Idx need_regs = nregs + 1;
+  /* We need one extra element beyond `num_regs' for the `-1' marker GNU code
+     uses.  */
+
+  /* Have the register data arrays been allocated?  */
+  if (regs_allocated == REGS_UNALLOCATED)
+    { /* No.  So allocate them with malloc.  */
+      regs->start = re_malloc (regoff_t, need_regs);
+      if (BE (regs->start == NULL, 0))
+	return REGS_UNALLOCATED;
+      regs->end = re_malloc (regoff_t, need_regs);
+      if (BE (regs->end == NULL, 0))
+	{
+	  re_free (regs->start);
+	  return REGS_UNALLOCATED;
+	}
+      regs->num_regs = need_regs;
+    }
+  else if (regs_allocated == REGS_REALLOCATE)
+    { /* Yes.  If we need more elements than were already
+	 allocated, reallocate them.  If we need fewer, just
+	 leave it alone.  */
+      if (BE (need_regs > regs->num_regs, 0))
+	{
+	  regoff_t *new_start = re_realloc (regs->start, regoff_t, need_regs);
+	  regoff_t *new_end;
+	  if (BE (new_start == NULL, 0))
+	    return REGS_UNALLOCATED;
+	  new_end = re_realloc (regs->end, regoff_t, need_regs);
+	  if (BE (new_end == NULL, 0))
+	    {
+	      re_free (new_start);
+	      return REGS_UNALLOCATED;
+	    }
+	  regs->start = new_start;
+	  regs->end = new_end;
+	  regs->num_regs = need_regs;
+	}
+    }
+  else
+    {
+      assert (regs_allocated == REGS_FIXED);
+      /* This function may not be called with REGS_FIXED and nregs too big.  */
+      assert (regs->num_regs >= nregs);
+      rval = REGS_FIXED;
+    }
+
+  /* Copy the regs.  */
+  for (i = 0; i < nregs; ++i)
+    {
+      regs->start[i] = pmatch[i].rm_so;
+      regs->end[i] = pmatch[i].rm_eo;
+    }
+  for ( ; i < regs->num_regs; ++i)
+    regs->start[i] = regs->end[i] = -1;
+
+  return rval;
+}
+
+/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
+   ENDS.  Subsequent matches using PATTERN_BUFFER and REGS will use
+   this memory for recording register information.  STARTS and ENDS
+   must be allocated using the malloc library routine, and must each
+   be at least NUM_REGS * sizeof (regoff_t) bytes long.
+
+   If NUM_REGS == 0, then subsequent matches should allocate their own
+   register data.
+
+   Unless this function is called, the first search or match using
+   PATTERN_BUFFER will allocate its own register data, without
+   freeing the old data.  */
+
+void
+re_set_registers (bufp, regs, num_regs, starts, ends)
+    struct re_pattern_buffer *bufp;
+    struct re_registers *regs;
+    __re_size_t num_regs;
+    regoff_t *starts, *ends;
+{
+  if (num_regs)
+    {
+      bufp->regs_allocated = REGS_REALLOCATE;
+      regs->num_regs = num_regs;
+      regs->start = starts;
+      regs->end = ends;
+    }
+  else
+    {
+      bufp->regs_allocated = REGS_UNALLOCATED;
+      regs->num_regs = 0;
+      regs->start = regs->end = NULL;
+    }
+}
+#ifdef _LIBC
+weak_alias (__re_set_registers, re_set_registers)
+#endif
+
+/* Entry points compatible with 4.2 BSD regex library.  We don't define
+   them unless specifically requested.  */
+
+#if defined _REGEX_RE_COMP || defined _LIBC
+int
+# ifdef _LIBC
+weak_function
+# endif
+re_exec (s)
+     const char *s;
+{
+  return 0 == regexec (&re_comp_buf, s, 0, NULL, 0);
+}
+#endif /* _REGEX_RE_COMP */
+
+/* Internal entry point.  */
+
+/* Searches for a compiled pattern PREG in the string STRING, whose
+   length is LENGTH.  NMATCH, PMATCH, and EFLAGS have the same
+   meaning as with regexec.  LAST_START is START + RANGE, where
+   START and RANGE have the same meaning as with re_search.
+   Return REG_NOERROR if we find a match, and REG_NOMATCH if not,
+   otherwise return the error code.
+   Note: We assume front end functions already check ranges.
+   (0 <= LAST_START && LAST_START <= LENGTH)  */
+
+static reg_errcode_t
+internal_function
+re_search_internal (const regex_t *preg,
+		    const char *string, Idx length,
+		    Idx start, Idx last_start, Idx stop,
+		    size_t nmatch, regmatch_t pmatch[],
+		    int eflags)
+{
+  reg_errcode_t err;
+  const re_dfa_t *dfa = (const re_dfa_t *) preg->buffer;
+  Idx left_lim, right_lim;
+  int incr;
+  bool fl_longest_match;
+  int match_kind;
+  Idx match_first;
+  Idx match_last = REG_MISSING;
+  Idx extra_nmatch;
+  bool sb;
+  int ch;
+#if defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
+  re_match_context_t mctx = { .dfa = dfa };
+#else
+  re_match_context_t mctx;
+#endif
+  char *fastmap = ((preg->fastmap != NULL && preg->fastmap_accurate
+		    && start != last_start && !preg->can_be_null)
+		   ? preg->fastmap : NULL);
+  RE_TRANSLATE_TYPE t = preg->translate;
+
+#if !(defined _LIBC || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L))
+  memset (&mctx, '\0', sizeof (re_match_context_t));
+  mctx.dfa = dfa;
+#endif
+
+  extra_nmatch = (nmatch > preg->re_nsub) ? nmatch - (preg->re_nsub + 1) : 0;
+  nmatch -= extra_nmatch;
+
+  /* Check if the DFA haven't been compiled.  */
+  if (BE (preg->used == 0 || dfa->init_state == NULL
+	  || dfa->init_state_word == NULL || dfa->init_state_nl == NULL
+	  || dfa->init_state_begbuf == NULL, 0))
+    return REG_NOMATCH;
+
+#ifdef DEBUG
+  /* We assume front-end functions already check them.  */
+  assert (0 <= last_start && last_start <= length);
+#endif
+
+  /* If initial states with non-begbuf contexts have no elements,
+     the regex must be anchored.  If preg->newline_anchor is set,
+     we'll never use init_state_nl, so do not check it.  */
+  if (dfa->init_state->nodes.nelem == 0
+      && dfa->init_state_word->nodes.nelem == 0
+      && (dfa->init_state_nl->nodes.nelem == 0
+	  || !preg->newline_anchor))
+    {
+      if (start != 0 && last_start != 0)
+        return REG_NOMATCH;
+      start = last_start = 0;
+    }
+
+  /* We must check the longest matching, if nmatch > 0.  */
+  fl_longest_match = (nmatch != 0 || dfa->nbackref);
+
+  err = re_string_allocate (&mctx.input, string, length, dfa->nodes_len + 1,
+			    preg->translate, (preg->syntax & RE_ICASE) != 0,
+			    dfa);
+  if (BE (err != REG_NOERROR, 0))
+    goto free_return;
+  mctx.input.stop = stop;
+  mctx.input.raw_stop = stop;
+  mctx.input.newline_anchor = preg->newline_anchor;
+
+  err = match_ctx_init (&mctx, eflags, dfa->nbackref * 2);
+  if (BE (err != REG_NOERROR, 0))
+    goto free_return;
+
+  /* We will log all the DFA states through which the dfa pass,
+     if nmatch > 1, or this dfa has "multibyte node", which is a
+     back-reference or a node which can accept multibyte character or
+     multi character collating element.  */
+  if (nmatch > 1 || dfa->has_mb_node)
+    {
+      /* Avoid overflow.  */
+      if (BE (SIZE_MAX / sizeof (re_dfastate_t *) <= mctx.input.bufs_len, 0))
+	{
+	  err = REG_ESPACE;
+	  goto free_return;
+	}
+
+      mctx.state_log = re_malloc (re_dfastate_t *, mctx.input.bufs_len + 1);
+      if (BE (mctx.state_log == NULL, 0))
+	{
+	  err = REG_ESPACE;
+	  goto free_return;
+	}
+    }
+  else
+    mctx.state_log = NULL;
+
+  match_first = start;
+  mctx.input.tip_context = (eflags & REG_NOTBOL) ? CONTEXT_BEGBUF
+			   : CONTEXT_NEWLINE | CONTEXT_BEGBUF;
+
+  /* Check incrementally whether of not the input string match.  */
+  incr = (last_start < start) ? -1 : 1;
+  left_lim = (last_start < start) ? last_start : start;
+  right_lim = (last_start < start) ? start : last_start;
+  sb = dfa->mb_cur_max == 1;
+  match_kind =
+    (fastmap
+     ? ((sb || !(preg->syntax & RE_ICASE || t) ? 4 : 0)
+	| (start <= last_start ? 2 : 0)
+	| (t != NULL ? 1 : 0))
+     : 8);
+
+  for (;; match_first += incr)
+    {
+      err = REG_NOMATCH;
+      if (match_first < left_lim || right_lim < match_first)
+	goto free_return;
+
+      /* Advance as rapidly as possible through the string, until we
+	 find a plausible place to start matching.  This may be done
+	 with varying efficiency, so there are various possibilities:
+	 only the most common of them are specialized, in order to
+	 save on code size.  We use a switch statement for speed.  */
+      switch (match_kind)
+	{
+	case 8:
+	  /* No fastmap.  */
+	  break;
+
+	case 7:
+	  /* Fastmap with single-byte translation, match forward.  */
+	  while (BE (match_first < right_lim, 1)
+		 && !fastmap[t[(unsigned char) string[match_first]]])
+	    ++match_first;
+	  goto forward_match_found_start_or_reached_end;
+
+	case 6:
+	  /* Fastmap without translation, match forward.  */
+	  while (BE (match_first < right_lim, 1)
+		 && !fastmap[(unsigned char) string[match_first]])
+	    ++match_first;
+
+	forward_match_found_start_or_reached_end:
+	  if (BE (match_first == right_lim, 0))
+	    {
+	      ch = match_first >= length
+		       ? 0 : (unsigned char) string[match_first];
+	      if (!fastmap[t ? t[ch] : ch])
+		goto free_return;
+	    }
+	  break;
+
+	case 4:
+	case 5:
+	  /* Fastmap without multi-byte translation, match backwards.  */
+	  while (match_first >= left_lim)
+	    {
+	      ch = match_first >= length
+		       ? 0 : (unsigned char) string[match_first];
+	      if (fastmap[t ? t[ch] : ch])
+		break;
+	      --match_first;
+	    }
+	  if (match_first < left_lim)
+	    goto free_return;
+	  break;
+
+	default:
+	  /* In this case, we can't determine easily the current byte,
+	     since it might be a component byte of a multibyte
+	     character.  Then we use the constructed buffer instead.  */
+	  for (;;)
+	    {
+	      /* If MATCH_FIRST is out of the valid range, reconstruct the
+		 buffers.  */
+	      __re_size_t offset = match_first - mctx.input.raw_mbs_idx;
+	      if (BE (offset >= (__re_size_t) mctx.input.valid_raw_len, 0))
+		{
+		  err = re_string_reconstruct (&mctx.input, match_first,
+					       eflags);
+		  if (BE (err != REG_NOERROR, 0))
+		    goto free_return;
+
+		  offset = match_first - mctx.input.raw_mbs_idx;
+		}
+	      /* If MATCH_FIRST is out of the buffer, leave it as '\0'.
+		 Note that MATCH_FIRST must not be smaller than 0.  */
+	      ch = (match_first >= length
+		    ? 0 : re_string_byte_at (&mctx.input, offset));
+	      if (fastmap[ch])
+		break;
+	      match_first += incr;
+	      if (match_first < left_lim || match_first > right_lim)
+	        {
+	          err = REG_NOMATCH;
+	          goto free_return;
+	        }
+	    }
+	  break;
+	}
+
+      /* Reconstruct the buffers so that the matcher can assume that
+	 the matching starts from the beginning of the buffer.  */
+      err = re_string_reconstruct (&mctx.input, match_first, eflags);
+      if (BE (err != REG_NOERROR, 0))
+	goto free_return;
+
+#ifdef RE_ENABLE_I18N
+     /* Don't consider this char as a possible match start if it part,
+	yet isn't the head, of a multibyte character.  */
+      if (!sb && !re_string_first_byte (&mctx.input, 0))
+	continue;
+#endif
+
+      /* It seems to be appropriate one, then use the matcher.  */
+      /* We assume that the matching starts from 0.  */
+      mctx.state_log_top = mctx.nbkref_ents = mctx.max_mb_elem_len = 0;
+      match_last = check_matching (&mctx, fl_longest_match,
+				   start <= last_start ? &match_first : NULL);
+      if (match_last != REG_MISSING)
+	{
+	  if (BE (match_last == REG_ERROR, 0))
+	    {
+	      err = REG_ESPACE;
+	      goto free_return;
+	    }
+	  else
+	    {
+	      mctx.match_last = match_last;
+	      if ((!preg->no_sub && nmatch > 1) || dfa->nbackref)
+		{
+		  re_dfastate_t *pstate = mctx.state_log[match_last];
+		  mctx.last_node = check_halt_state_context (&mctx, pstate,
+							     match_last);
+		}
+	      if ((!preg->no_sub && nmatch > 1 && dfa->has_plural_match)
+		  || dfa->nbackref)
+		{
+		  err = prune_impossible_nodes (&mctx);
+		  if (err == REG_NOERROR)
+		    break;
+		  if (BE (err != REG_NOMATCH, 0))
+		    goto free_return;
+		  match_last = REG_MISSING;
+		}
+	      else
+		break; /* We found a match.  */
+	    }
+	}
+
+      match_ctx_clean (&mctx);
+    }
+
+#ifdef DEBUG
+  assert (match_last != REG_MISSING);
+  assert (err == REG_NOERROR);
+#endif
+
+  /* Set pmatch[] if we need.  */
+  if (nmatch > 0)
+    {
+      Idx reg_idx;
+
+      /* Initialize registers.  */
+      for (reg_idx = 1; reg_idx < nmatch; ++reg_idx)
+	pmatch[reg_idx].rm_so = pmatch[reg_idx].rm_eo = -1;
+
+      /* Set the points where matching start/end.  */
+      pmatch[0].rm_so = 0;
+      pmatch[0].rm_eo = mctx.match_last;
+      /* FIXME: This function should fail if mctx.match_last exceeds
+	 the maximum possible regoff_t value.  We need a new error
+	 code REG_OVERFLOW.  */
+
+      if (!preg->no_sub && nmatch > 1)
+	{
+	  err = set_regs (preg, &mctx, nmatch, pmatch,
+			  dfa->has_plural_match && dfa->nbackref > 0);
+	  if (BE (err != REG_NOERROR, 0))
+	    goto free_return;
+	}
+
+      /* At last, add the offset to the each registers, since we slided
+	 the buffers so that we could assume that the matching starts
+	 from 0.  */
+      for (reg_idx = 0; reg_idx < nmatch; ++reg_idx)
+	if (pmatch[reg_idx].rm_so != -1)
+	  {
+#ifdef RE_ENABLE_I18N
+	    if (BE (mctx.input.offsets_needed != 0, 0))
+	      {
+		pmatch[reg_idx].rm_so =
+		  (pmatch[reg_idx].rm_so == mctx.input.valid_len
+		   ? mctx.input.valid_raw_len
+		   : mctx.input.offsets[pmatch[reg_idx].rm_so]);
+		pmatch[reg_idx].rm_eo =
+		  (pmatch[reg_idx].rm_eo == mctx.input.valid_len
+		   ? mctx.input.valid_raw_len
+		   : mctx.input.offsets[pmatch[reg_idx].rm_eo]);
+	      }
+#else
+	    assert (mctx.input.offsets_needed == 0);
+#endif
+	    pmatch[reg_idx].rm_so += match_first;
+	    pmatch[reg_idx].rm_eo += match_first;
+	  }
+      for (reg_idx = 0; reg_idx < extra_nmatch; ++reg_idx)
+	{
+	  pmatch[nmatch + reg_idx].rm_so = -1;
+	  pmatch[nmatch + reg_idx].rm_eo = -1;
+	}
+
+      if (dfa->subexp_map)
+        for (reg_idx = 0; reg_idx + 1 < nmatch; reg_idx++)
+          if (dfa->subexp_map[reg_idx] != reg_idx)
+            {
+              pmatch[reg_idx + 1].rm_so
+                = pmatch[dfa->subexp_map[reg_idx] + 1].rm_so;
+              pmatch[reg_idx + 1].rm_eo
+                = pmatch[dfa->subexp_map[reg_idx] + 1].rm_eo;
+            }
+    }
+
+ free_return:
+  re_free (mctx.state_log);
+  if (dfa->nbackref)
+    match_ctx_free (&mctx);
+  re_string_destruct (&mctx.input);
+  return err;
+}
+
+static reg_errcode_t
+internal_function
+prune_impossible_nodes (re_match_context_t *mctx)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  Idx halt_node, match_last;
+  reg_errcode_t ret;
+  re_dfastate_t **sifted_states;
+  re_dfastate_t **lim_states = NULL;
+  re_sift_context_t sctx;
+#ifdef DEBUG
+  assert (mctx->state_log != NULL);
+#endif
+  match_last = mctx->match_last;
+  halt_node = mctx->last_node;
+
+  /* Avoid overflow.  */
+  if (BE (SIZE_MAX / sizeof (re_dfastate_t *) <= match_last, 0))
+    return REG_ESPACE;
+
+  sifted_states = re_malloc (re_dfastate_t *, match_last + 1);
+  if (BE (sifted_states == NULL, 0))
+    {
+      ret = REG_ESPACE;
+      goto free_return;
+    }
+  if (dfa->nbackref)
+    {
+      lim_states = re_malloc (re_dfastate_t *, match_last + 1);
+      if (BE (lim_states == NULL, 0))
+	{
+	  ret = REG_ESPACE;
+	  goto free_return;
+	}
+      while (1)
+	{
+	  memset (lim_states, '\0',
+		  sizeof (re_dfastate_t *) * (match_last + 1));
+	  sift_ctx_init (&sctx, sifted_states, lim_states, halt_node,
+			 match_last);
+	  ret = sift_states_backward (mctx, &sctx);
+	  re_node_set_free (&sctx.limits);
+	  if (BE (ret != REG_NOERROR, 0))
+	      goto free_return;
+	  if (sifted_states[0] != NULL || lim_states[0] != NULL)
+	    break;
+	  do
+	    {
+	      --match_last;
+	      if (! REG_VALID_INDEX (match_last))
+		{
+		  ret = REG_NOMATCH;
+		  goto free_return;
+		}
+	    } while (mctx->state_log[match_last] == NULL
+		     || !mctx->state_log[match_last]->halt);
+	  halt_node = check_halt_state_context (mctx,
+						mctx->state_log[match_last],
+						match_last);
+	}
+      ret = merge_state_array (dfa, sifted_states, lim_states,
+			       match_last + 1);
+      re_free (lim_states);
+      lim_states = NULL;
+      if (BE (ret != REG_NOERROR, 0))
+	goto free_return;
+    }
+  else
+    {
+      sift_ctx_init (&sctx, sifted_states, lim_states, halt_node, match_last);
+      ret = sift_states_backward (mctx, &sctx);
+      re_node_set_free (&sctx.limits);
+      if (BE (ret != REG_NOERROR, 0))
+	goto free_return;
+      if (sifted_states[0] == NULL)
+	{
+	  ret = REG_NOMATCH;
+	  goto free_return;
+	}
+    }
+  re_free (mctx->state_log);
+  mctx->state_log = sifted_states;
+  sifted_states = NULL;
+  mctx->last_node = halt_node;
+  mctx->match_last = match_last;
+  ret = REG_NOERROR;
+ free_return:
+  re_free (sifted_states);
+  re_free (lim_states);
+  return ret;
+}
+
+/* Acquire an initial state and return it.
+   We must select appropriate initial state depending on the context,
+   since initial states may have constraints like "\<", "^", etc..  */
+
+static inline re_dfastate_t *
+__attribute ((always_inline)) internal_function
+acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx,
+			    Idx idx)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  if (dfa->init_state->has_constraint)
+    {
+      unsigned int context;
+      context = re_string_context_at (&mctx->input, idx - 1, mctx->eflags);
+      if (IS_WORD_CONTEXT (context))
+	return dfa->init_state_word;
+      else if (IS_ORDINARY_CONTEXT (context))
+	return dfa->init_state;
+      else if (IS_BEGBUF_CONTEXT (context) && IS_NEWLINE_CONTEXT (context))
+	return dfa->init_state_begbuf;
+      else if (IS_NEWLINE_CONTEXT (context))
+	return dfa->init_state_nl;
+      else if (IS_BEGBUF_CONTEXT (context))
+	{
+	  /* It is relatively rare case, then calculate on demand.  */
+	  return re_acquire_state_context (err, dfa,
+					   dfa->init_state->entrance_nodes,
+					   context);
+	}
+      else
+	/* Must not happen?  */
+	return dfa->init_state;
+    }
+  else
+    return dfa->init_state;
+}
+
+/* Check whether the regular expression match input string INPUT or not,
+   and return the index where the matching end.  Return REG_MISSING if
+   there is no match, and return REG_ERROR in case of an error.
+   FL_LONGEST_MATCH means we want the POSIX longest matching.
+   If P_MATCH_FIRST is not NULL, and the match fails, it is set to the
+   next place where we may want to try matching.
+   Note that the matcher assume that the maching starts from the current
+   index of the buffer.  */
+
+static Idx
+internal_function
+check_matching (re_match_context_t *mctx, bool fl_longest_match,
+		Idx *p_match_first)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  reg_errcode_t err;
+  Idx match = 0;
+  Idx match_last = REG_MISSING;
+  Idx cur_str_idx = re_string_cur_idx (&mctx->input);
+  re_dfastate_t *cur_state;
+  bool at_init_state = p_match_first != NULL;
+  Idx next_start_idx = cur_str_idx;
+
+  err = REG_NOERROR;
+  cur_state = acquire_init_state_context (&err, mctx, cur_str_idx);
+  /* An initial state must not be NULL (invalid).  */
+  if (BE (cur_state == NULL, 0))
+    {
+      assert (err == REG_ESPACE);
+      return REG_ERROR;
+    }
+
+  if (mctx->state_log != NULL)
+    {
+      mctx->state_log[cur_str_idx] = cur_state;
+
+      /* Check OP_OPEN_SUBEXP in the initial state in case that we use them
+	 later.  E.g. Processing back references.  */
+      if (BE (dfa->nbackref, 0))
+	{
+	  at_init_state = false;
+	  err = check_subexp_matching_top (mctx, &cur_state->nodes, 0);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+
+	  if (cur_state->has_backref)
+	    {
+	      err = transit_state_bkref (mctx, &cur_state->nodes);
+	      if (BE (err != REG_NOERROR, 0))
+	        return err;
+	    }
+	}
+    }
+
+  /* If the RE accepts NULL string.  */
+  if (BE (cur_state->halt, 0))
+    {
+      if (!cur_state->has_constraint
+	  || check_halt_state_context (mctx, cur_state, cur_str_idx))
+	{
+	  if (!fl_longest_match)
+	    return cur_str_idx;
+	  else
+	    {
+	      match_last = cur_str_idx;
+	      match = 1;
+	    }
+	}
+    }
+
+  while (!re_string_eoi (&mctx->input))
+    {
+      re_dfastate_t *old_state = cur_state;
+      Idx next_char_idx = re_string_cur_idx (&mctx->input) + 1;
+
+      if (BE (next_char_idx >= mctx->input.bufs_len, 0)
+          || (BE (next_char_idx >= mctx->input.valid_len, 0)
+              && mctx->input.valid_len < mctx->input.len))
+        {
+          err = extend_buffers (mctx);
+          if (BE (err != REG_NOERROR, 0))
+	    {
+	      assert (err == REG_ESPACE);
+	      return REG_ERROR;
+	    }
+        }
+
+      cur_state = transit_state (&err, mctx, cur_state);
+      if (mctx->state_log != NULL)
+	cur_state = merge_state_with_log (&err, mctx, cur_state);
+
+      if (cur_state == NULL)
+	{
+	  /* Reached the invalid state or an error.  Try to recover a valid
+	     state using the state log, if available and if we have not
+	     already found a valid (even if not the longest) match.  */
+	  if (BE (err != REG_NOERROR, 0))
+	    return REG_ERROR;
+
+	  if (mctx->state_log == NULL
+	      || (match && !fl_longest_match)
+	      || (cur_state = find_recover_state (&err, mctx)) == NULL)
+	    break;
+	}
+
+      if (BE (at_init_state, 0))
+	{
+	  if (old_state == cur_state)
+	    next_start_idx = next_char_idx;
+	  else
+	    at_init_state = false;
+	}
+
+      if (cur_state->halt)
+	{
+	  /* Reached a halt state.
+	     Check the halt state can satisfy the current context.  */
+	  if (!cur_state->has_constraint
+	      || check_halt_state_context (mctx, cur_state,
+					   re_string_cur_idx (&mctx->input)))
+	    {
+	      /* We found an appropriate halt state.  */
+	      match_last = re_string_cur_idx (&mctx->input);
+	      match = 1;
+
+	      /* We found a match, do not modify match_first below.  */
+	      p_match_first = NULL;
+	      if (!fl_longest_match)
+		break;
+	    }
+	}
+    }
+
+  if (p_match_first)
+    *p_match_first += next_start_idx;
+
+  return match_last;
+}
+
+/* Check NODE match the current context.  */
+
+static bool
+internal_function
+check_halt_node_context (const re_dfa_t *dfa, Idx node, unsigned int context)
+{
+  re_token_type_t type = dfa->nodes[node].type;
+  unsigned int constraint = dfa->nodes[node].constraint;
+  if (type != END_OF_RE)
+    return false;
+  if (!constraint)
+    return true;
+  if (NOT_SATISFY_NEXT_CONSTRAINT (constraint, context))
+    return false;
+  return true;
+}
+
+/* Check the halt state STATE match the current context.
+   Return 0 if not match, if the node, STATE has, is a halt node and
+   match the context, return the node.  */
+
+static Idx
+internal_function
+check_halt_state_context (const re_match_context_t *mctx,
+			  const re_dfastate_t *state, Idx idx)
+{
+  Idx i;
+  unsigned int context;
+#ifdef DEBUG
+  assert (state->halt);
+#endif
+  context = re_string_context_at (&mctx->input, idx, mctx->eflags);
+  for (i = 0; i < state->nodes.nelem; ++i)
+    if (check_halt_node_context (mctx->dfa, state->nodes.elems[i], context))
+      return state->nodes.elems[i];
+  return 0;
+}
+
+/* Compute the next node to which "NFA" transit from NODE("NFA" is a NFA
+   corresponding to the DFA).
+   Return the destination node, and update EPS_VIA_NODES;
+   return REG_MISSING in case of errors.  */
+
+static Idx
+internal_function
+proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
+		   Idx *pidx, Idx node, re_node_set *eps_via_nodes,
+		   struct re_fail_stack_t *fs)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  Idx i;
+  bool ok;
+  if (IS_EPSILON_NODE (dfa->nodes[node].type))
+    {
+      re_node_set *cur_nodes = &mctx->state_log[*pidx]->nodes;
+      re_node_set *edests = &dfa->edests[node];
+      Idx dest_node;
+      ok = re_node_set_insert (eps_via_nodes, node);
+      if (BE (! ok, 0))
+	return REG_ERROR;
+      /* Pick up a valid destination, or return REG_MISSING if none
+	 is found.  */
+      for (dest_node = REG_MISSING, i = 0; i < edests->nelem; ++i)
+	{
+	  Idx candidate = edests->elems[i];
+	  if (!re_node_set_contains (cur_nodes, candidate))
+	    continue;
+          if (dest_node == REG_MISSING)
+	    dest_node = candidate;
+
+          else
+	    {
+	      /* In order to avoid infinite loop like "(a*)*", return the second
+	         epsilon-transition if the first was already considered.  */
+	      if (re_node_set_contains (eps_via_nodes, dest_node))
+	        return candidate;
+
+	      /* Otherwise, push the second epsilon-transition on the fail stack.  */
+	      else if (fs != NULL
+		       && push_fail_stack (fs, *pidx, candidate, nregs, regs,
+				           eps_via_nodes))
+		return REG_ERROR;
+
+	      /* We know we are going to exit.  */
+	      break;
+	    }
+	}
+      return dest_node;
+    }
+  else
+    {
+      Idx naccepted = 0;
+      re_token_type_t type = dfa->nodes[node].type;
+
+#ifdef RE_ENABLE_I18N
+      if (dfa->nodes[node].accept_mb)
+	naccepted = check_node_accept_bytes (dfa, node, &mctx->input, *pidx);
+      else
+#endif /* RE_ENABLE_I18N */
+      if (type == OP_BACK_REF)
+	{
+	  Idx subexp_idx = dfa->nodes[node].opr.idx + 1;
+	  naccepted = regs[subexp_idx].rm_eo - regs[subexp_idx].rm_so;
+	  if (fs != NULL)
+	    {
+	      if (regs[subexp_idx].rm_so == -1 || regs[subexp_idx].rm_eo == -1)
+		return REG_MISSING;
+	      else if (naccepted)
+		{
+		  char *buf = (char *) re_string_get_buffer (&mctx->input);
+		  if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx,
+			      naccepted) != 0)
+		    return REG_MISSING;
+		}
+	    }
+
+	  if (naccepted == 0)
+	    {
+	      Idx dest_node;
+	      ok = re_node_set_insert (eps_via_nodes, node);
+	      if (BE (! ok, 0))
+		return REG_ERROR;
+	      dest_node = dfa->edests[node].elems[0];
+	      if (re_node_set_contains (&mctx->state_log[*pidx]->nodes,
+					dest_node))
+		return dest_node;
+	    }
+	}
+
+      if (naccepted != 0
+	  || check_node_accept (mctx, dfa->nodes + node, *pidx))
+	{
+	  Idx dest_node = dfa->nexts[node];
+	  *pidx = (naccepted == 0) ? *pidx + 1 : *pidx + naccepted;
+	  if (fs && (*pidx > mctx->match_last || mctx->state_log[*pidx] == NULL
+		     || !re_node_set_contains (&mctx->state_log[*pidx]->nodes,
+					       dest_node)))
+	    return REG_MISSING;
+	  re_node_set_empty (eps_via_nodes);
+	  return dest_node;
+	}
+    }
+  return REG_MISSING;
+}
+
+static reg_errcode_t
+internal_function
+push_fail_stack (struct re_fail_stack_t *fs, Idx str_idx, Idx dest_node,
+		 Idx nregs, regmatch_t *regs, re_node_set *eps_via_nodes)
+{
+  reg_errcode_t err;
+  Idx num = fs->num++;
+  if (fs->num == fs->alloc)
+    {
+      struct re_fail_stack_ent_t *new_array;
+      new_array = realloc (fs->stack, (sizeof (struct re_fail_stack_ent_t)
+				       * fs->alloc * 2));
+      if (new_array == NULL)
+	return REG_ESPACE;
+      fs->alloc *= 2;
+      fs->stack = new_array;
+    }
+  fs->stack[num].idx = str_idx;
+  fs->stack[num].node = dest_node;
+  fs->stack[num].regs = re_malloc (regmatch_t, nregs);
+  if (fs->stack[num].regs == NULL)
+    return REG_ESPACE;
+  memcpy (fs->stack[num].regs, regs, sizeof (regmatch_t) * nregs);
+  err = re_node_set_init_copy (&fs->stack[num].eps_via_nodes, eps_via_nodes);
+  return err;
+}
+
+static Idx
+internal_function
+pop_fail_stack (struct re_fail_stack_t *fs, Idx *pidx, Idx nregs,
+		regmatch_t *regs, re_node_set *eps_via_nodes)
+{
+  Idx num = --fs->num;
+  assert (REG_VALID_INDEX (num));
+  *pidx = fs->stack[num].idx;
+  memcpy (regs, fs->stack[num].regs, sizeof (regmatch_t) * nregs);
+  re_node_set_free (eps_via_nodes);
+  re_free (fs->stack[num].regs);
+  *eps_via_nodes = fs->stack[num].eps_via_nodes;
+  return fs->stack[num].node;
+}
+
+/* Set the positions where the subexpressions are starts/ends to registers
+   PMATCH.
+   Note: We assume that pmatch[0] is already set, and
+   pmatch[i].rm_so == pmatch[i].rm_eo == -1 for 0 < i < nmatch.  */
+
+static reg_errcode_t
+internal_function
+set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch,
+	  regmatch_t *pmatch, bool fl_backtrack)
+{
+  const re_dfa_t *dfa = (const re_dfa_t *) preg->buffer;
+  Idx idx, cur_node;
+  re_node_set eps_via_nodes;
+  struct re_fail_stack_t *fs;
+  struct re_fail_stack_t fs_body = { 0, 2, NULL };
+  regmatch_t *prev_idx_match;
+  bool prev_idx_match_malloced = false;
+
+#ifdef DEBUG
+  assert (nmatch > 1);
+  assert (mctx->state_log != NULL);
+#endif
+  if (fl_backtrack)
+    {
+      fs = &fs_body;
+      fs->stack = re_malloc (struct re_fail_stack_ent_t, fs->alloc);
+      if (fs->stack == NULL)
+	return REG_ESPACE;
+    }
+  else
+    fs = NULL;
+
+  cur_node = dfa->init_node;
+  re_node_set_init_empty (&eps_via_nodes);
+
+  if (__libc_use_alloca (nmatch * sizeof (regmatch_t)))
+    prev_idx_match = (regmatch_t *) alloca (nmatch * sizeof (regmatch_t));
+  else
+    {
+      prev_idx_match = re_malloc (regmatch_t, nmatch);
+      if (prev_idx_match == NULL)
+	{
+	  free_fail_stack_return (fs);
+	  return REG_ESPACE;
+	}
+      prev_idx_match_malloced = true;
+    }
+  memcpy (prev_idx_match, pmatch, sizeof (regmatch_t) * nmatch);
+
+  for (idx = pmatch[0].rm_so; idx <= pmatch[0].rm_eo ;)
+    {
+      update_regs (dfa, pmatch, prev_idx_match, cur_node, idx, nmatch);
+
+      if (idx == pmatch[0].rm_eo && cur_node == mctx->last_node)
+	{
+	  Idx reg_idx;
+	  if (fs)
+	    {
+	      for (reg_idx = 0; reg_idx < nmatch; ++reg_idx)
+		if (pmatch[reg_idx].rm_so > -1 && pmatch[reg_idx].rm_eo == -1)
+		  break;
+	      if (reg_idx == nmatch)
+		{
+		  re_node_set_free (&eps_via_nodes);
+		  if (prev_idx_match_malloced)
+		    re_free (prev_idx_match);
+		  return free_fail_stack_return (fs);
+		}
+	      cur_node = pop_fail_stack (fs, &idx, nmatch, pmatch,
+					 &eps_via_nodes);
+	    }
+	  else
+	    {
+	      re_node_set_free (&eps_via_nodes);
+	      if (prev_idx_match_malloced)
+		re_free (prev_idx_match);
+	      return REG_NOERROR;
+	    }
+	}
+
+      /* Proceed to next node.  */
+      cur_node = proceed_next_node (mctx, nmatch, pmatch, &idx, cur_node,
+				    &eps_via_nodes, fs);
+
+      if (BE (! REG_VALID_INDEX (cur_node), 0))
+	{
+	  if (BE (cur_node == REG_ERROR, 0))
+	    {
+	      re_node_set_free (&eps_via_nodes);
+	      if (prev_idx_match_malloced)
+		re_free (prev_idx_match);
+	      free_fail_stack_return (fs);
+	      return REG_ESPACE;
+	    }
+	  if (fs)
+	    cur_node = pop_fail_stack (fs, &idx, nmatch, pmatch,
+				       &eps_via_nodes);
+	  else
+	    {
+	      re_node_set_free (&eps_via_nodes);
+	      if (prev_idx_match_malloced)
+		re_free (prev_idx_match);
+	      return REG_NOMATCH;
+	    }
+	}
+    }
+  re_node_set_free (&eps_via_nodes);
+  if (prev_idx_match_malloced)
+    re_free (prev_idx_match);
+  return free_fail_stack_return (fs);
+}
+
+static reg_errcode_t
+internal_function
+free_fail_stack_return (struct re_fail_stack_t *fs)
+{
+  if (fs)
+    {
+      Idx fs_idx;
+      for (fs_idx = 0; fs_idx < fs->num; ++fs_idx)
+	{
+	  re_node_set_free (&fs->stack[fs_idx].eps_via_nodes);
+	  re_free (fs->stack[fs_idx].regs);
+	}
+      re_free (fs->stack);
+    }
+  return REG_NOERROR;
+}
+
+static void
+internal_function
+update_regs (const re_dfa_t *dfa, regmatch_t *pmatch,
+	     regmatch_t *prev_idx_match, Idx cur_node, Idx cur_idx, Idx nmatch)
+{
+  int type = dfa->nodes[cur_node].type;
+  if (type == OP_OPEN_SUBEXP)
+    {
+      Idx reg_num = dfa->nodes[cur_node].opr.idx + 1;
+
+      /* We are at the first node of this sub expression.  */
+      if (reg_num < nmatch)
+	{
+	  pmatch[reg_num].rm_so = cur_idx;
+	  pmatch[reg_num].rm_eo = -1;
+	}
+    }
+  else if (type == OP_CLOSE_SUBEXP)
+    {
+      Idx reg_num = dfa->nodes[cur_node].opr.idx + 1;
+      if (reg_num < nmatch)
+	{
+	  /* We are at the last node of this sub expression.  */
+	  if (pmatch[reg_num].rm_so < cur_idx)
+	    {
+	      pmatch[reg_num].rm_eo = cur_idx;
+	      /* This is a non-empty match or we are not inside an optional
+		 subexpression.  Accept this right away.  */
+	      memcpy (prev_idx_match, pmatch, sizeof (regmatch_t) * nmatch);
+	    }
+	  else
+	    {
+	      if (dfa->nodes[cur_node].opt_subexp
+		  && prev_idx_match[reg_num].rm_so != -1)
+		/* We transited through an empty match for an optional
+		   subexpression, like (a?)*, and this is not the subexp's
+		   first match.  Copy back the old content of the registers
+		   so that matches of an inner subexpression are undone as
+		   well, like in ((a?))*.  */
+		memcpy (pmatch, prev_idx_match, sizeof (regmatch_t) * nmatch);
+	      else
+		/* We completed a subexpression, but it may be part of
+		   an optional one, so do not update PREV_IDX_MATCH.  */
+		pmatch[reg_num].rm_eo = cur_idx;
+	    }
+	}
+    }
+}
+
+/* This function checks the STATE_LOG from the SCTX->last_str_idx to 0
+   and sift the nodes in each states according to the following rules.
+   Updated state_log will be wrote to STATE_LOG.
+
+   Rules: We throw away the Node `a' in the STATE_LOG[STR_IDX] if...
+     1. When STR_IDX == MATCH_LAST(the last index in the state_log):
+	If `a' isn't the LAST_NODE and `a' can't epsilon transit to
+	the LAST_NODE, we throw away the node `a'.
+     2. When 0 <= STR_IDX < MATCH_LAST and `a' accepts
+	string `s' and transit to `b':
+	i. If 'b' isn't in the STATE_LOG[STR_IDX+strlen('s')], we throw
+	   away the node `a'.
+	ii. If 'b' is in the STATE_LOG[STR_IDX+strlen('s')] but 'b' is
+	    thrown away, we throw away the node `a'.
+     3. When 0 <= STR_IDX < MATCH_LAST and 'a' epsilon transit to 'b':
+	i. If 'b' isn't in the STATE_LOG[STR_IDX], we throw away the
+	   node `a'.
+	ii. If 'b' is in the STATE_LOG[STR_IDX] but 'b' is thrown away,
+	    we throw away the node `a'.  */
+
+#define STATE_NODE_CONTAINS(state,node) \
+  ((state) != NULL && re_node_set_contains (&(state)->nodes, node))
+
+static reg_errcode_t
+internal_function
+sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx)
+{
+  reg_errcode_t err;
+  int null_cnt = 0;
+  Idx str_idx = sctx->last_str_idx;
+  re_node_set cur_dest;
+
+#ifdef DEBUG
+  assert (mctx->state_log != NULL && mctx->state_log[str_idx] != NULL);
+#endif
+
+  /* Build sifted state_log[str_idx].  It has the nodes which can epsilon
+     transit to the last_node and the last_node itself.  */
+  err = re_node_set_init_1 (&cur_dest, sctx->last_node);
+  if (BE (err != REG_NOERROR, 0))
+    return err;
+  err = update_cur_sifted_state (mctx, sctx, str_idx, &cur_dest);
+  if (BE (err != REG_NOERROR, 0))
+    goto free_return;
+
+  /* Then check each states in the state_log.  */
+  while (str_idx > 0)
+    {
+      /* Update counters.  */
+      null_cnt = (sctx->sifted_states[str_idx] == NULL) ? null_cnt + 1 : 0;
+      if (null_cnt > mctx->max_mb_elem_len)
+	{
+	  memset (sctx->sifted_states, '\0',
+		  sizeof (re_dfastate_t *) * str_idx);
+	  re_node_set_free (&cur_dest);
+	  return REG_NOERROR;
+	}
+      re_node_set_empty (&cur_dest);
+      --str_idx;
+
+      if (mctx->state_log[str_idx])
+	{
+	  err = build_sifted_states (mctx, sctx, str_idx, &cur_dest);
+          if (BE (err != REG_NOERROR, 0))
+	    goto free_return;
+	}
+
+      /* Add all the nodes which satisfy the following conditions:
+	 - It can epsilon transit to a node in CUR_DEST.
+	 - It is in CUR_SRC.
+	 And update state_log.  */
+      err = update_cur_sifted_state (mctx, sctx, str_idx, &cur_dest);
+      if (BE (err != REG_NOERROR, 0))
+	goto free_return;
+    }
+  err = REG_NOERROR;
+ free_return:
+  re_node_set_free (&cur_dest);
+  return err;
+}
+
+static reg_errcode_t
+internal_function
+build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx,
+		     Idx str_idx, re_node_set *cur_dest)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  const re_node_set *cur_src = &mctx->state_log[str_idx]->non_eps_nodes;
+  Idx i;
+
+  /* Then build the next sifted state.
+     We build the next sifted state on `cur_dest', and update
+     `sifted_states[str_idx]' with `cur_dest'.
+     Note:
+     `cur_dest' is the sifted state from `state_log[str_idx + 1]'.
+     `cur_src' points the node_set of the old `state_log[str_idx]'
+     (with the epsilon nodes pre-filtered out).  */
+  for (i = 0; i < cur_src->nelem; i++)
+    {
+      Idx prev_node = cur_src->elems[i];
+      int naccepted = 0;
+      bool ok;
+
+#ifdef DEBUG
+      re_token_type_t type = dfa->nodes[prev_node].type;
+      assert (!IS_EPSILON_NODE (type));
+#endif
+#ifdef RE_ENABLE_I18N
+      /* If the node may accept `multi byte'.  */
+      if (dfa->nodes[prev_node].accept_mb)
+	naccepted = sift_states_iter_mb (mctx, sctx, prev_node,
+					 str_idx, sctx->last_str_idx);
+#endif /* RE_ENABLE_I18N */
+
+      /* We don't check backreferences here.
+	 See update_cur_sifted_state().  */
+      if (!naccepted
+	  && check_node_accept (mctx, dfa->nodes + prev_node, str_idx)
+	  && STATE_NODE_CONTAINS (sctx->sifted_states[str_idx + 1],
+				  dfa->nexts[prev_node]))
+	naccepted = 1;
+
+      if (naccepted == 0)
+	continue;
+
+      if (sctx->limits.nelem)
+	{
+	  Idx to_idx = str_idx + naccepted;
+	  if (check_dst_limits (mctx, &sctx->limits,
+				dfa->nexts[prev_node], to_idx,
+				prev_node, str_idx))
+	    continue;
+	}
+      ok = re_node_set_insert (cur_dest, prev_node);
+      if (BE (! ok, 0))
+	return REG_ESPACE;
+    }
+
+  return REG_NOERROR;
+}
+
+/* Helper functions.  */
+
+static reg_errcode_t
+internal_function
+clean_state_log_if_needed (re_match_context_t *mctx, Idx next_state_log_idx)
+{
+  Idx top = mctx->state_log_top;
+
+  if (next_state_log_idx >= mctx->input.bufs_len
+      || (next_state_log_idx >= mctx->input.valid_len
+	  && mctx->input.valid_len < mctx->input.len))
+    {
+      reg_errcode_t err;
+      err = extend_buffers (mctx);
+      if (BE (err != REG_NOERROR, 0))
+	return err;
+    }
+
+  if (top < next_state_log_idx)
+    {
+      memset (mctx->state_log + top + 1, '\0',
+	      sizeof (re_dfastate_t *) * (next_state_log_idx - top));
+      mctx->state_log_top = next_state_log_idx;
+    }
+  return REG_NOERROR;
+}
+
+static reg_errcode_t
+internal_function
+merge_state_array (const re_dfa_t *dfa, re_dfastate_t **dst,
+		   re_dfastate_t **src, Idx num)
+{
+  Idx st_idx;
+  reg_errcode_t err;
+  for (st_idx = 0; st_idx < num; ++st_idx)
+    {
+      if (dst[st_idx] == NULL)
+	dst[st_idx] = src[st_idx];
+      else if (src[st_idx] != NULL)
+	{
+	  re_node_set merged_set;
+	  err = re_node_set_init_union (&merged_set, &dst[st_idx]->nodes,
+					&src[st_idx]->nodes);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+	  dst[st_idx] = re_acquire_state (&err, dfa, &merged_set);
+	  re_node_set_free (&merged_set);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+	}
+    }
+  return REG_NOERROR;
+}
+
+static reg_errcode_t
+internal_function
+update_cur_sifted_state (const re_match_context_t *mctx,
+			 re_sift_context_t *sctx, Idx str_idx,
+			 re_node_set *dest_nodes)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  reg_errcode_t err = REG_NOERROR;
+  const re_node_set *candidates;
+  candidates = ((mctx->state_log[str_idx] == NULL) ? NULL
+		: &mctx->state_log[str_idx]->nodes);
+
+  if (dest_nodes->nelem == 0)
+    sctx->sifted_states[str_idx] = NULL;
+  else
+    {
+      if (candidates)
+	{
+	  /* At first, add the nodes which can epsilon transit to a node in
+	     DEST_NODE.  */
+	  err = add_epsilon_src_nodes (dfa, dest_nodes, candidates);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+
+	  /* Then, check the limitations in the current sift_context.  */
+	  if (sctx->limits.nelem)
+	    {
+	      err = check_subexp_limits (dfa, dest_nodes, candidates, &sctx->limits,
+					 mctx->bkref_ents, str_idx);
+	      if (BE (err != REG_NOERROR, 0))
+		return err;
+	    }
+	}
+
+      sctx->sifted_states[str_idx] = re_acquire_state (&err, dfa, dest_nodes);
+      if (BE (err != REG_NOERROR, 0))
+	return err;
+    }
+
+  if (candidates && mctx->state_log[str_idx]->has_backref)
+    {
+      err = sift_states_bkref (mctx, sctx, str_idx, candidates);
+      if (BE (err != REG_NOERROR, 0))
+	return err;
+    }
+  return REG_NOERROR;
+}
+
+static reg_errcode_t
+internal_function
+add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes,
+		       const re_node_set *candidates)
+{
+  reg_errcode_t err = REG_NOERROR;
+  Idx i;
+
+  re_dfastate_t *state = re_acquire_state (&err, dfa, dest_nodes);
+  if (BE (err != REG_NOERROR, 0))
+    return err;
+
+  if (!state->inveclosure.alloc)
+    {
+      err = re_node_set_alloc (&state->inveclosure, dest_nodes->nelem);
+      if (BE (err != REG_NOERROR, 0))
+        return REG_ESPACE;
+      for (i = 0; i < dest_nodes->nelem; i++)
+        re_node_set_merge (&state->inveclosure,
+			   dfa->inveclosures + dest_nodes->elems[i]);
+    }
+  return re_node_set_add_intersect (dest_nodes, candidates,
+				    &state->inveclosure);
+}
+
+static reg_errcode_t
+internal_function
+sub_epsilon_src_nodes (const re_dfa_t *dfa, Idx node, re_node_set *dest_nodes,
+		       const re_node_set *candidates)
+{
+    Idx ecl_idx;
+    reg_errcode_t err;
+    re_node_set *inv_eclosure = dfa->inveclosures + node;
+    re_node_set except_nodes;
+    re_node_set_init_empty (&except_nodes);
+    for (ecl_idx = 0; ecl_idx < inv_eclosure->nelem; ++ecl_idx)
+      {
+	Idx cur_node = inv_eclosure->elems[ecl_idx];
+	if (cur_node == node)
+	  continue;
+	if (IS_EPSILON_NODE (dfa->nodes[cur_node].type))
+	  {
+	    Idx edst1 = dfa->edests[cur_node].elems[0];
+	    Idx edst2 = ((dfa->edests[cur_node].nelem > 1)
+			 ? dfa->edests[cur_node].elems[1] : REG_MISSING);
+	    if ((!re_node_set_contains (inv_eclosure, edst1)
+		 && re_node_set_contains (dest_nodes, edst1))
+		|| (REG_VALID_NONZERO_INDEX (edst2)
+		    && !re_node_set_contains (inv_eclosure, edst2)
+		    && re_node_set_contains (dest_nodes, edst2)))
+	      {
+		err = re_node_set_add_intersect (&except_nodes, candidates,
+						 dfa->inveclosures + cur_node);
+		if (BE (err != REG_NOERROR, 0))
+		  {
+		    re_node_set_free (&except_nodes);
+		    return err;
+		  }
+	      }
+	  }
+      }
+    for (ecl_idx = 0; ecl_idx < inv_eclosure->nelem; ++ecl_idx)
+      {
+	Idx cur_node = inv_eclosure->elems[ecl_idx];
+	if (!re_node_set_contains (&except_nodes, cur_node))
+	  {
+	    Idx idx = re_node_set_contains (dest_nodes, cur_node) - 1;
+	    re_node_set_remove_at (dest_nodes, idx);
+	  }
+      }
+    re_node_set_free (&except_nodes);
+    return REG_NOERROR;
+}
+
+static bool
+internal_function
+check_dst_limits (const re_match_context_t *mctx, const re_node_set *limits,
+		  Idx dst_node, Idx dst_idx, Idx src_node, Idx src_idx)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  Idx lim_idx, src_pos, dst_pos;
+
+  Idx dst_bkref_idx = search_cur_bkref_entry (mctx, dst_idx);
+  Idx src_bkref_idx = search_cur_bkref_entry (mctx, src_idx);
+  for (lim_idx = 0; lim_idx < limits->nelem; ++lim_idx)
+    {
+      Idx subexp_idx;
+      struct re_backref_cache_entry *ent;
+      ent = mctx->bkref_ents + limits->elems[lim_idx];
+      subexp_idx = dfa->nodes[ent->node].opr.idx;
+
+      dst_pos = check_dst_limits_calc_pos (mctx, limits->elems[lim_idx],
+					   subexp_idx, dst_node, dst_idx,
+					   dst_bkref_idx);
+      src_pos = check_dst_limits_calc_pos (mctx, limits->elems[lim_idx],
+					   subexp_idx, src_node, src_idx,
+					   src_bkref_idx);
+
+      /* In case of:
+	 <src> <dst> ( <subexp> )
+	 ( <subexp> ) <src> <dst>
+	 ( <subexp1> <src> <subexp2> <dst> <subexp3> )  */
+      if (src_pos == dst_pos)
+	continue; /* This is unrelated limitation.  */
+      else
+	return true;
+    }
+  return false;
+}
+
+static int
+internal_function
+check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries,
+			     Idx subexp_idx, Idx from_node, Idx bkref_idx)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  const re_node_set *eclosures = dfa->eclosures + from_node;
+  Idx node_idx;
+
+  /* Else, we are on the boundary: examine the nodes on the epsilon
+     closure.  */
+  for (node_idx = 0; node_idx < eclosures->nelem; ++node_idx)
+    {
+      Idx node = eclosures->elems[node_idx];
+      switch (dfa->nodes[node].type)
+	{
+	case OP_BACK_REF:
+	  if (bkref_idx != REG_MISSING)
+	    {
+	      struct re_backref_cache_entry *ent = mctx->bkref_ents + bkref_idx;
+	      do
+	        {
+		  Idx dst;
+		  int cpos;
+
+		  if (ent->node != node)
+		    continue;
+
+		  if (subexp_idx < BITSET_WORD_BITS
+		      && !(ent->eps_reachable_subexps_map
+			   & ((bitset_word_t) 1 << subexp_idx)))
+		    continue;
+
+		  /* Recurse trying to reach the OP_OPEN_SUBEXP and
+		     OP_CLOSE_SUBEXP cases below.  But, if the
+		     destination node is the same node as the source
+		     node, don't recurse because it would cause an
+		     infinite loop: a regex that exhibits this behavior
+		     is ()\1*\1*  */
+		  dst = dfa->edests[node].elems[0];
+		  if (dst == from_node)
+		    {
+		      if (boundaries & 1)
+		        return -1;
+		      else /* if (boundaries & 2) */
+		        return 0;
+		    }
+
+		  cpos =
+		    check_dst_limits_calc_pos_1 (mctx, boundaries, subexp_idx,
+						 dst, bkref_idx);
+		  if (cpos == -1 /* && (boundaries & 1) */)
+		    return -1;
+		  if (cpos == 0 && (boundaries & 2))
+		    return 0;
+
+		  if (subexp_idx < BITSET_WORD_BITS)
+		    ent->eps_reachable_subexps_map
+		      &= ~((bitset_word_t) 1 << subexp_idx);
+	        }
+	      while (ent++->more);
+	    }
+	  break;
+
+	case OP_OPEN_SUBEXP:
+	  if ((boundaries & 1) && subexp_idx == dfa->nodes[node].opr.idx)
+	    return -1;
+	  break;
+
+	case OP_CLOSE_SUBEXP:
+	  if ((boundaries & 2) && subexp_idx == dfa->nodes[node].opr.idx)
+	    return 0;
+	  break;
+
+	default:
+	    break;
+	}
+    }
+
+  return (boundaries & 2) ? 1 : 0;
+}
+
+static int
+internal_function
+check_dst_limits_calc_pos (const re_match_context_t *mctx, Idx limit,
+			   Idx subexp_idx, Idx from_node, Idx str_idx,
+			   Idx bkref_idx)
+{
+  struct re_backref_cache_entry *lim = mctx->bkref_ents + limit;
+  int boundaries;
+
+  /* If we are outside the range of the subexpression, return -1 or 1.  */
+  if (str_idx < lim->subexp_from)
+    return -1;
+
+  if (lim->subexp_to < str_idx)
+    return 1;
+
+  /* If we are within the subexpression, return 0.  */
+  boundaries = (str_idx == lim->subexp_from);
+  boundaries |= (str_idx == lim->subexp_to) << 1;
+  if (boundaries == 0)
+    return 0;
+
+  /* Else, examine epsilon closure.  */
+  return check_dst_limits_calc_pos_1 (mctx, boundaries, subexp_idx,
+				      from_node, bkref_idx);
+}
+
+/* Check the limitations of sub expressions LIMITS, and remove the nodes
+   which are against limitations from DEST_NODES. */
+
+static reg_errcode_t
+internal_function
+check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes,
+		     const re_node_set *candidates, re_node_set *limits,
+		     struct re_backref_cache_entry *bkref_ents, Idx str_idx)
+{
+  reg_errcode_t err;
+  Idx node_idx, lim_idx;
+
+  for (lim_idx = 0; lim_idx < limits->nelem; ++lim_idx)
+    {
+      Idx subexp_idx;
+      struct re_backref_cache_entry *ent;
+      ent = bkref_ents + limits->elems[lim_idx];
+
+      if (str_idx <= ent->subexp_from || ent->str_idx < str_idx)
+	continue; /* This is unrelated limitation.  */
+
+      subexp_idx = dfa->nodes[ent->node].opr.idx;
+      if (ent->subexp_to == str_idx)
+	{
+	  Idx ops_node = REG_MISSING;
+	  Idx cls_node = REG_MISSING;
+	  for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
+	    {
+	      Idx node = dest_nodes->elems[node_idx];
+	      re_token_type_t type = dfa->nodes[node].type;
+	      if (type == OP_OPEN_SUBEXP
+		  && subexp_idx == dfa->nodes[node].opr.idx)
+		ops_node = node;
+	      else if (type == OP_CLOSE_SUBEXP
+		       && subexp_idx == dfa->nodes[node].opr.idx)
+		cls_node = node;
+	    }
+
+	  /* Check the limitation of the open subexpression.  */
+	  /* Note that (ent->subexp_to = str_idx != ent->subexp_from).  */
+	  if (REG_VALID_INDEX (ops_node))
+	    {
+	      err = sub_epsilon_src_nodes (dfa, ops_node, dest_nodes,
+					   candidates);
+	      if (BE (err != REG_NOERROR, 0))
+		return err;
+	    }
+
+	  /* Check the limitation of the close subexpression.  */
+	  if (REG_VALID_INDEX (cls_node))
+	    for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
+	      {
+		Idx node = dest_nodes->elems[node_idx];
+		if (!re_node_set_contains (dfa->inveclosures + node,
+					   cls_node)
+		    && !re_node_set_contains (dfa->eclosures + node,
+					      cls_node))
+		  {
+		    /* It is against this limitation.
+		       Remove it form the current sifted state.  */
+		    err = sub_epsilon_src_nodes (dfa, node, dest_nodes,
+						 candidates);
+		    if (BE (err != REG_NOERROR, 0))
+		      return err;
+		    --node_idx;
+		  }
+	      }
+	}
+      else /* (ent->subexp_to != str_idx)  */
+	{
+	  for (node_idx = 0; node_idx < dest_nodes->nelem; ++node_idx)
+	    {
+	      Idx node = dest_nodes->elems[node_idx];
+	      re_token_type_t type = dfa->nodes[node].type;
+	      if (type == OP_CLOSE_SUBEXP || type == OP_OPEN_SUBEXP)
+		{
+		  if (subexp_idx != dfa->nodes[node].opr.idx)
+		    continue;
+		  /* It is against this limitation.
+		     Remove it form the current sifted state.  */
+		  err = sub_epsilon_src_nodes (dfa, node, dest_nodes,
+					       candidates);
+		  if (BE (err != REG_NOERROR, 0))
+		    return err;
+		}
+	    }
+	}
+    }
+  return REG_NOERROR;
+}
+
+static reg_errcode_t
+internal_function
+sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx,
+		   Idx str_idx, const re_node_set *candidates)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  reg_errcode_t err;
+  Idx node_idx, node;
+  re_sift_context_t local_sctx;
+  Idx first_idx = search_cur_bkref_entry (mctx, str_idx);
+
+  if (first_idx == REG_MISSING)
+    return REG_NOERROR;
+
+  local_sctx.sifted_states = NULL; /* Mark that it hasn't been initialized.  */
+
+  for (node_idx = 0; node_idx < candidates->nelem; ++node_idx)
+    {
+      Idx enabled_idx;
+      re_token_type_t type;
+      struct re_backref_cache_entry *entry;
+      node = candidates->elems[node_idx];
+      type = dfa->nodes[node].type;
+      /* Avoid infinite loop for the REs like "()\1+".  */
+      if (node == sctx->last_node && str_idx == sctx->last_str_idx)
+	continue;
+      if (type != OP_BACK_REF)
+	continue;
+
+      entry = mctx->bkref_ents + first_idx;
+      enabled_idx = first_idx;
+      do
+	{
+	  Idx subexp_len;
+	  Idx to_idx;
+	  Idx dst_node;
+	  bool ok;
+	  re_dfastate_t *cur_state;
+
+	  if (entry->node != node)
+	    continue;
+	  subexp_len = entry->subexp_to - entry->subexp_from;
+	  to_idx = str_idx + subexp_len;
+	  dst_node = (subexp_len ? dfa->nexts[node]
+		      : dfa->edests[node].elems[0]);
+
+	  if (to_idx > sctx->last_str_idx
+	      || sctx->sifted_states[to_idx] == NULL
+	      || !STATE_NODE_CONTAINS (sctx->sifted_states[to_idx], dst_node)
+	      || check_dst_limits (mctx, &sctx->limits, node,
+				   str_idx, dst_node, to_idx))
+	    continue;
+
+	  if (local_sctx.sifted_states == NULL)
+	    {
+	      local_sctx = *sctx;
+	      err = re_node_set_init_copy (&local_sctx.limits, &sctx->limits);
+	      if (BE (err != REG_NOERROR, 0))
+		goto free_return;
+	    }
+	  local_sctx.last_node = node;
+	  local_sctx.last_str_idx = str_idx;
+	  ok = re_node_set_insert (&local_sctx.limits, enabled_idx);
+	  if (BE (! ok, 0))
+	    {
+	      err = REG_ESPACE;
+	      goto free_return;
+	    }
+	  cur_state = local_sctx.sifted_states[str_idx];
+	  err = sift_states_backward (mctx, &local_sctx);
+	  if (BE (err != REG_NOERROR, 0))
+	    goto free_return;
+	  if (sctx->limited_states != NULL)
+	    {
+	      err = merge_state_array (dfa, sctx->limited_states,
+				       local_sctx.sifted_states,
+				       str_idx + 1);
+	      if (BE (err != REG_NOERROR, 0))
+		goto free_return;
+	    }
+	  local_sctx.sifted_states[str_idx] = cur_state;
+	  re_node_set_remove (&local_sctx.limits, enabled_idx);
+
+	  /* mctx->bkref_ents may have changed, reload the pointer.  */
+          entry = mctx->bkref_ents + enabled_idx;
+	}
+      while (enabled_idx++, entry++->more);
+    }
+  err = REG_NOERROR;
+ free_return:
+  if (local_sctx.sifted_states != NULL)
+    {
+      re_node_set_free (&local_sctx.limits);
+    }
+
+  return err;
+}
+
+
+#ifdef RE_ENABLE_I18N
+static int
+internal_function
+sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx,
+		     Idx node_idx, Idx str_idx, Idx max_str_idx)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  int naccepted;
+  /* Check the node can accept `multi byte'.  */
+  naccepted = check_node_accept_bytes (dfa, node_idx, &mctx->input, str_idx);
+  if (naccepted > 0 && str_idx + naccepted <= max_str_idx &&
+      !STATE_NODE_CONTAINS (sctx->sifted_states[str_idx + naccepted],
+			    dfa->nexts[node_idx]))
+    /* The node can't accept the `multi byte', or the
+       destination was already thrown away, then the node
+       could't accept the current input `multi byte'.   */
+    naccepted = 0;
+  /* Otherwise, it is sure that the node could accept
+     `naccepted' bytes input.  */
+  return naccepted;
+}
+#endif /* RE_ENABLE_I18N */
+
+
+/* Functions for state transition.  */
+
+/* Return the next state to which the current state STATE will transit by
+   accepting the current input byte, and update STATE_LOG if necessary.
+   If STATE can accept a multibyte char/collating element/back reference
+   update the destination of STATE_LOG.  */
+
+static re_dfastate_t *
+internal_function
+transit_state (reg_errcode_t *err, re_match_context_t *mctx,
+	       re_dfastate_t *state)
+{
+  re_dfastate_t **trtable;
+  unsigned char ch;
+
+#ifdef RE_ENABLE_I18N
+  /* If the current state can accept multibyte.  */
+  if (BE (state->accept_mb, 0))
+    {
+      *err = transit_state_mb (mctx, state);
+      if (BE (*err != REG_NOERROR, 0))
+	return NULL;
+    }
+#endif /* RE_ENABLE_I18N */
+
+  /* Then decide the next state with the single byte.  */
+#if 0
+  if (0)
+    /* don't use transition table  */
+    return transit_state_sb (err, mctx, state);
+#endif
+
+  /* Use transition table  */
+  ch = re_string_fetch_byte (&mctx->input);
+  for (;;)
+    {
+      trtable = state->trtable;
+      if (BE (trtable != NULL, 1))
+	return trtable[ch];
+
+      trtable = state->word_trtable;
+      if (BE (trtable != NULL, 1))
+        {
+	  unsigned int context;
+	  context
+	    = re_string_context_at (&mctx->input,
+				    re_string_cur_idx (&mctx->input) - 1,
+				    mctx->eflags);
+	  if (IS_WORD_CONTEXT (context))
+	    return trtable[ch + SBC_MAX];
+	  else
+	    return trtable[ch];
+	}
+
+      if (!build_trtable (mctx->dfa, state))
+	{
+	  *err = REG_ESPACE;
+	  return NULL;
+	}
+
+      /* Retry, we now have a transition table.  */
+    }
+}
+
+/* Update the state_log if we need */
+static re_dfastate_t *
+internal_function
+merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx,
+		      re_dfastate_t *next_state)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  Idx cur_idx = re_string_cur_idx (&mctx->input);
+
+  if (cur_idx > mctx->state_log_top)
+    {
+      mctx->state_log[cur_idx] = next_state;
+      mctx->state_log_top = cur_idx;
+    }
+  else if (mctx->state_log[cur_idx] == 0)
+    {
+      mctx->state_log[cur_idx] = next_state;
+    }
+  else
+    {
+      re_dfastate_t *pstate;
+      unsigned int context;
+      re_node_set next_nodes, *log_nodes, *table_nodes = NULL;
+      /* If (state_log[cur_idx] != 0), it implies that cur_idx is
+         the destination of a multibyte char/collating element/
+         back reference.  Then the next state is the union set of
+         these destinations and the results of the transition table.  */
+      pstate = mctx->state_log[cur_idx];
+      log_nodes = pstate->entrance_nodes;
+      if (next_state != NULL)
+        {
+          table_nodes = next_state->entrance_nodes;
+          *err = re_node_set_init_union (&next_nodes, table_nodes,
+					     log_nodes);
+          if (BE (*err != REG_NOERROR, 0))
+	    return NULL;
+        }
+      else
+        next_nodes = *log_nodes;
+      /* Note: We already add the nodes of the initial state,
+	 then we don't need to add them here.  */
+
+      context = re_string_context_at (&mctx->input,
+				      re_string_cur_idx (&mctx->input) - 1,
+				      mctx->eflags);
+      next_state = mctx->state_log[cur_idx]
+        = re_acquire_state_context (err, dfa, &next_nodes, context);
+      /* We don't need to check errors here, since the return value of
+         this function is next_state and ERR is already set.  */
+
+      if (table_nodes != NULL)
+        re_node_set_free (&next_nodes);
+    }
+
+  if (BE (dfa->nbackref, 0) && next_state != NULL)
+    {
+      /* Check OP_OPEN_SUBEXP in the current state in case that we use them
+	 later.  We must check them here, since the back references in the
+	 next state might use them.  */
+      *err = check_subexp_matching_top (mctx, &next_state->nodes,
+					cur_idx);
+      if (BE (*err != REG_NOERROR, 0))
+	return NULL;
+
+      /* If the next state has back references.  */
+      if (next_state->has_backref)
+	{
+	  *err = transit_state_bkref (mctx, &next_state->nodes);
+	  if (BE (*err != REG_NOERROR, 0))
+	    return NULL;
+	  next_state = mctx->state_log[cur_idx];
+	}
+    }
+
+  return next_state;
+}
+
+/* Skip bytes in the input that correspond to part of a
+   multi-byte match, then look in the log for a state
+   from which to restart matching.  */
+static re_dfastate_t *
+internal_function
+find_recover_state (reg_errcode_t *err, re_match_context_t *mctx)
+{
+  re_dfastate_t *cur_state;
+  do
+    {
+      Idx max = mctx->state_log_top;
+      Idx cur_str_idx = re_string_cur_idx (&mctx->input);
+
+      do
+	{
+          if (++cur_str_idx > max)
+            return NULL;
+          re_string_skip_bytes (&mctx->input, 1);
+	}
+      while (mctx->state_log[cur_str_idx] == NULL);
+
+      cur_state = merge_state_with_log (err, mctx, NULL);
+    }
+  while (*err == REG_NOERROR && cur_state == NULL);
+  return cur_state;
+}
+
+/* Helper functions for transit_state.  */
+
+/* From the node set CUR_NODES, pick up the nodes whose types are
+   OP_OPEN_SUBEXP and which have corresponding back references in the regular
+   expression. And register them to use them later for evaluating the
+   correspoding back references.  */
+
+static reg_errcode_t
+internal_function
+check_subexp_matching_top (re_match_context_t *mctx, re_node_set *cur_nodes,
+			   Idx str_idx)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  Idx node_idx;
+  reg_errcode_t err;
+
+  /* TODO: This isn't efficient.
+	   Because there might be more than one nodes whose types are
+	   OP_OPEN_SUBEXP and whose index is SUBEXP_IDX, we must check all
+	   nodes.
+	   E.g. RE: (a){2}  */
+  for (node_idx = 0; node_idx < cur_nodes->nelem; ++node_idx)
+    {
+      Idx node = cur_nodes->elems[node_idx];
+      if (dfa->nodes[node].type == OP_OPEN_SUBEXP
+	  && dfa->nodes[node].opr.idx < BITSET_WORD_BITS
+	  && (dfa->used_bkref_map
+	      & ((bitset_word_t) 1 << dfa->nodes[node].opr.idx)))
+	{
+	  err = match_ctx_add_subtop (mctx, node, str_idx);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+	}
+    }
+  return REG_NOERROR;
+}
+
+#if 0
+/* Return the next state to which the current state STATE will transit by
+   accepting the current input byte.  */
+
+static re_dfastate_t *
+transit_state_sb (reg_errcode_t *err, re_match_context_t *mctx,
+		  re_dfastate_t *state)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  re_node_set next_nodes;
+  re_dfastate_t *next_state;
+  Idx node_cnt, cur_str_idx = re_string_cur_idx (&mctx->input);
+  unsigned int context;
+
+  *err = re_node_set_alloc (&next_nodes, state->nodes.nelem + 1);
+  if (BE (*err != REG_NOERROR, 0))
+    return NULL;
+  for (node_cnt = 0; node_cnt < state->nodes.nelem; ++node_cnt)
+    {
+      Idx cur_node = state->nodes.elems[node_cnt];
+      if (check_node_accept (mctx, dfa->nodes + cur_node, cur_str_idx))
+	{
+	  *err = re_node_set_merge (&next_nodes,
+				    dfa->eclosures + dfa->nexts[cur_node]);
+	  if (BE (*err != REG_NOERROR, 0))
+	    {
+	      re_node_set_free (&next_nodes);
+	      return NULL;
+	    }
+	}
+    }
+  context = re_string_context_at (&mctx->input, cur_str_idx, mctx->eflags);
+  next_state = re_acquire_state_context (err, dfa, &next_nodes, context);
+  /* We don't need to check errors here, since the return value of
+     this function is next_state and ERR is already set.  */
+
+  re_node_set_free (&next_nodes);
+  re_string_skip_bytes (&mctx->input, 1);
+  return next_state;
+}
+#endif
+
+#ifdef RE_ENABLE_I18N
+static reg_errcode_t
+internal_function
+transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  reg_errcode_t err;
+  Idx i;
+
+  for (i = 0; i < pstate->nodes.nelem; ++i)
+    {
+      re_node_set dest_nodes, *new_nodes;
+      Idx cur_node_idx = pstate->nodes.elems[i];
+      int naccepted;
+      Idx dest_idx;
+      unsigned int context;
+      re_dfastate_t *dest_state;
+
+      if (!dfa->nodes[cur_node_idx].accept_mb)
+        continue;
+
+      if (dfa->nodes[cur_node_idx].constraint)
+	{
+	  context = re_string_context_at (&mctx->input,
+					  re_string_cur_idx (&mctx->input),
+					  mctx->eflags);
+	  if (NOT_SATISFY_NEXT_CONSTRAINT (dfa->nodes[cur_node_idx].constraint,
+					   context))
+	    continue;
+	}
+
+      /* How many bytes the node can accept?  */
+      naccepted = check_node_accept_bytes (dfa, cur_node_idx, &mctx->input,
+					   re_string_cur_idx (&mctx->input));
+      if (naccepted == 0)
+	continue;
+
+      /* The node can accepts `naccepted' bytes.  */
+      dest_idx = re_string_cur_idx (&mctx->input) + naccepted;
+      mctx->max_mb_elem_len = ((mctx->max_mb_elem_len < naccepted) ? naccepted
+			       : mctx->max_mb_elem_len);
+      err = clean_state_log_if_needed (mctx, dest_idx);
+      if (BE (err != REG_NOERROR, 0))
+	return err;
+#ifdef DEBUG
+      assert (dfa->nexts[cur_node_idx] != REG_MISSING);
+#endif
+      new_nodes = dfa->eclosures + dfa->nexts[cur_node_idx];
+
+      dest_state = mctx->state_log[dest_idx];
+      if (dest_state == NULL)
+	dest_nodes = *new_nodes;
+      else
+	{
+	  err = re_node_set_init_union (&dest_nodes,
+					dest_state->entrance_nodes, new_nodes);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+	}
+      context = re_string_context_at (&mctx->input, dest_idx - 1,
+				      mctx->eflags);
+      mctx->state_log[dest_idx]
+	= re_acquire_state_context (&err, dfa, &dest_nodes, context);
+      if (dest_state != NULL)
+	re_node_set_free (&dest_nodes);
+      if (BE (mctx->state_log[dest_idx] == NULL && err != REG_NOERROR, 0))
+	return err;
+    }
+  return REG_NOERROR;
+}
+#endif /* RE_ENABLE_I18N */
+
+static reg_errcode_t
+internal_function
+transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  reg_errcode_t err;
+  Idx i;
+  Idx cur_str_idx = re_string_cur_idx (&mctx->input);
+
+  for (i = 0; i < nodes->nelem; ++i)
+    {
+      Idx dest_str_idx, prev_nelem, bkc_idx;
+      Idx node_idx = nodes->elems[i];
+      unsigned int context;
+      const re_token_t *node = dfa->nodes + node_idx;
+      re_node_set *new_dest_nodes;
+
+      /* Check whether `node' is a backreference or not.  */
+      if (node->type != OP_BACK_REF)
+	continue;
+
+      if (node->constraint)
+	{
+	  context = re_string_context_at (&mctx->input, cur_str_idx,
+					  mctx->eflags);
+	  if (NOT_SATISFY_NEXT_CONSTRAINT (node->constraint, context))
+	    continue;
+	}
+
+      /* `node' is a backreference.
+	 Check the substring which the substring matched.  */
+      bkc_idx = mctx->nbkref_ents;
+      err = get_subexp (mctx, node_idx, cur_str_idx);
+      if (BE (err != REG_NOERROR, 0))
+	goto free_return;
+
+      /* And add the epsilon closures (which is `new_dest_nodes') of
+	 the backreference to appropriate state_log.  */
+#ifdef DEBUG
+      assert (dfa->nexts[node_idx] != REG_MISSING);
+#endif
+      for (; bkc_idx < mctx->nbkref_ents; ++bkc_idx)
+	{
+	  Idx subexp_len;
+	  re_dfastate_t *dest_state;
+	  struct re_backref_cache_entry *bkref_ent;
+	  bkref_ent = mctx->bkref_ents + bkc_idx;
+	  if (bkref_ent->node != node_idx || bkref_ent->str_idx != cur_str_idx)
+	    continue;
+	  subexp_len = bkref_ent->subexp_to - bkref_ent->subexp_from;
+	  new_dest_nodes = (subexp_len == 0
+			    ? dfa->eclosures + dfa->edests[node_idx].elems[0]
+			    : dfa->eclosures + dfa->nexts[node_idx]);
+	  dest_str_idx = (cur_str_idx + bkref_ent->subexp_to
+			  - bkref_ent->subexp_from);
+	  context = re_string_context_at (&mctx->input, dest_str_idx - 1,
+					  mctx->eflags);
+	  dest_state = mctx->state_log[dest_str_idx];
+	  prev_nelem = ((mctx->state_log[cur_str_idx] == NULL) ? 0
+			: mctx->state_log[cur_str_idx]->nodes.nelem);
+	  /* Add `new_dest_node' to state_log.  */
+	  if (dest_state == NULL)
+	    {
+	      mctx->state_log[dest_str_idx]
+		= re_acquire_state_context (&err, dfa, new_dest_nodes,
+					    context);
+	      if (BE (mctx->state_log[dest_str_idx] == NULL
+		      && err != REG_NOERROR, 0))
+		goto free_return;
+	    }
+	  else
+	    {
+	      re_node_set dest_nodes;
+	      err = re_node_set_init_union (&dest_nodes,
+					    dest_state->entrance_nodes,
+					    new_dest_nodes);
+	      if (BE (err != REG_NOERROR, 0))
+		{
+		  re_node_set_free (&dest_nodes);
+		  goto free_return;
+		}
+	      mctx->state_log[dest_str_idx]
+		= re_acquire_state_context (&err, dfa, &dest_nodes, context);
+	      re_node_set_free (&dest_nodes);
+	      if (BE (mctx->state_log[dest_str_idx] == NULL
+		      && err != REG_NOERROR, 0))
+		goto free_return;
+	    }
+	  /* We need to check recursively if the backreference can epsilon
+	     transit.  */
+	  if (subexp_len == 0
+	      && mctx->state_log[cur_str_idx]->nodes.nelem > prev_nelem)
+	    {
+	      err = check_subexp_matching_top (mctx, new_dest_nodes,
+					       cur_str_idx);
+	      if (BE (err != REG_NOERROR, 0))
+		goto free_return;
+	      err = transit_state_bkref (mctx, new_dest_nodes);
+	      if (BE (err != REG_NOERROR, 0))
+		goto free_return;
+	    }
+	}
+    }
+  err = REG_NOERROR;
+ free_return:
+  return err;
+}
+
+/* Enumerate all the candidates which the backreference BKREF_NODE can match
+   at BKREF_STR_IDX, and register them by match_ctx_add_entry().
+   Note that we might collect inappropriate candidates here.
+   However, the cost of checking them strictly here is too high, then we
+   delay these checking for prune_impossible_nodes().  */
+
+static reg_errcode_t
+internal_function
+get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  Idx subexp_num, sub_top_idx;
+  const char *buf = (const char *) re_string_get_buffer (&mctx->input);
+  /* Return if we have already checked BKREF_NODE at BKREF_STR_IDX.  */
+  Idx cache_idx = search_cur_bkref_entry (mctx, bkref_str_idx);
+  if (cache_idx != REG_MISSING)
+    {
+      const struct re_backref_cache_entry *entry
+	= mctx->bkref_ents + cache_idx;
+      do
+        if (entry->node == bkref_node)
+	  return REG_NOERROR; /* We already checked it.  */
+      while (entry++->more);
+    }
+
+  subexp_num = dfa->nodes[bkref_node].opr.idx;
+
+  /* For each sub expression  */
+  for (sub_top_idx = 0; sub_top_idx < mctx->nsub_tops; ++sub_top_idx)
+    {
+      reg_errcode_t err;
+      re_sub_match_top_t *sub_top = mctx->sub_tops[sub_top_idx];
+      re_sub_match_last_t *sub_last;
+      Idx sub_last_idx, sl_str, bkref_str_off;
+
+      if (dfa->nodes[sub_top->node].opr.idx != subexp_num)
+	continue; /* It isn't related.  */
+
+      sl_str = sub_top->str_idx;
+      bkref_str_off = bkref_str_idx;
+      /* At first, check the last node of sub expressions we already
+	 evaluated.  */
+      for (sub_last_idx = 0; sub_last_idx < sub_top->nlasts; ++sub_last_idx)
+	{
+	  regoff_t sl_str_diff;
+	  sub_last = sub_top->lasts[sub_last_idx];
+	  sl_str_diff = sub_last->str_idx - sl_str;
+	  /* The matched string by the sub expression match with the substring
+	     at the back reference?  */
+	  if (sl_str_diff > 0)
+	    {
+	      if (BE (bkref_str_off + sl_str_diff > mctx->input.valid_len, 0))
+		{
+		  /* Not enough chars for a successful match.  */
+		  if (bkref_str_off + sl_str_diff > mctx->input.len)
+		    break;
+
+		  err = clean_state_log_if_needed (mctx,
+						   bkref_str_off
+						   + sl_str_diff);
+		  if (BE (err != REG_NOERROR, 0))
+		    return err;
+		  buf = (const char *) re_string_get_buffer (&mctx->input);
+		}
+	      if (memcmp (buf + bkref_str_off, buf + sl_str, sl_str_diff) != 0)
+		/* We don't need to search this sub expression any more.  */
+		break;
+	    }
+	  bkref_str_off += sl_str_diff;
+	  sl_str += sl_str_diff;
+	  err = get_subexp_sub (mctx, sub_top, sub_last, bkref_node,
+				bkref_str_idx);
+
+	  /* Reload buf, since the preceding call might have reallocated
+	     the buffer.  */
+	  buf = (const char *) re_string_get_buffer (&mctx->input);
+
+	  if (err == REG_NOMATCH)
+	    continue;
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+	}
+
+      if (sub_last_idx < sub_top->nlasts)
+	continue;
+      if (sub_last_idx > 0)
+	++sl_str;
+      /* Then, search for the other last nodes of the sub expression.  */
+      for (; sl_str <= bkref_str_idx; ++sl_str)
+	{
+	  Idx cls_node;
+	  regoff_t sl_str_off;
+	  const re_node_set *nodes;
+	  sl_str_off = sl_str - sub_top->str_idx;
+	  /* The matched string by the sub expression match with the substring
+	     at the back reference?  */
+	  if (sl_str_off > 0)
+	    {
+	      if (BE (bkref_str_off >= mctx->input.valid_len, 0))
+		{
+		  /* If we are at the end of the input, we cannot match.  */
+		  if (bkref_str_off >= mctx->input.len)
+		    break;
+
+		  err = extend_buffers (mctx);
+		  if (BE (err != REG_NOERROR, 0))
+		    return err;
+
+		  buf = (const char *) re_string_get_buffer (&mctx->input);
+		}
+	      if (buf [bkref_str_off++] != buf[sl_str - 1])
+		break; /* We don't need to search this sub expression
+			  any more.  */
+	    }
+	  if (mctx->state_log[sl_str] == NULL)
+	    continue;
+	  /* Does this state have a ')' of the sub expression?  */
+	  nodes = &mctx->state_log[sl_str]->nodes;
+	  cls_node = find_subexp_node (dfa, nodes, subexp_num,
+				       OP_CLOSE_SUBEXP);
+	  if (cls_node == REG_MISSING)
+	    continue; /* No.  */
+	  if (sub_top->path == NULL)
+	    {
+	      sub_top->path = calloc (sizeof (state_array_t),
+				      sl_str - sub_top->str_idx + 1);
+	      if (sub_top->path == NULL)
+		return REG_ESPACE;
+	    }
+	  /* Can the OP_OPEN_SUBEXP node arrive the OP_CLOSE_SUBEXP node
+	     in the current context?  */
+	  err = check_arrival (mctx, sub_top->path, sub_top->node,
+			       sub_top->str_idx, cls_node, sl_str,
+			       OP_CLOSE_SUBEXP);
+	  if (err == REG_NOMATCH)
+	      continue;
+	  if (BE (err != REG_NOERROR, 0))
+	      return err;
+	  sub_last = match_ctx_add_sublast (sub_top, cls_node, sl_str);
+	  if (BE (sub_last == NULL, 0))
+	    return REG_ESPACE;
+	  err = get_subexp_sub (mctx, sub_top, sub_last, bkref_node,
+				bkref_str_idx);
+	  if (err == REG_NOMATCH)
+	    continue;
+	}
+    }
+  return REG_NOERROR;
+}
+
+/* Helper functions for get_subexp().  */
+
+/* Check SUB_LAST can arrive to the back reference BKREF_NODE at BKREF_STR.
+   If it can arrive, register the sub expression expressed with SUB_TOP
+   and SUB_LAST.  */
+
+static reg_errcode_t
+internal_function
+get_subexp_sub (re_match_context_t *mctx, const re_sub_match_top_t *sub_top,
+		re_sub_match_last_t *sub_last, Idx bkref_node, Idx bkref_str)
+{
+  reg_errcode_t err;
+  Idx to_idx;
+  /* Can the subexpression arrive the back reference?  */
+  err = check_arrival (mctx, &sub_last->path, sub_last->node,
+		       sub_last->str_idx, bkref_node, bkref_str,
+		       OP_OPEN_SUBEXP);
+  if (err != REG_NOERROR)
+    return err;
+  err = match_ctx_add_entry (mctx, bkref_node, bkref_str, sub_top->str_idx,
+			     sub_last->str_idx);
+  if (BE (err != REG_NOERROR, 0))
+    return err;
+  to_idx = bkref_str + sub_last->str_idx - sub_top->str_idx;
+  return clean_state_log_if_needed (mctx, to_idx);
+}
+
+/* Find the first node which is '(' or ')' and whose index is SUBEXP_IDX.
+   Search '(' if FL_OPEN, or search ')' otherwise.
+   TODO: This function isn't efficient...
+	 Because there might be more than one nodes whose types are
+	 OP_OPEN_SUBEXP and whose index is SUBEXP_IDX, we must check all
+	 nodes.
+	 E.g. RE: (a){2}  */
+
+static Idx
+internal_function
+find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes,
+		  Idx subexp_idx, int type)
+{
+  Idx cls_idx;
+  for (cls_idx = 0; cls_idx < nodes->nelem; ++cls_idx)
+    {
+      Idx cls_node = nodes->elems[cls_idx];
+      const re_token_t *node = dfa->nodes + cls_node;
+      if (node->type == type
+	  && node->opr.idx == subexp_idx)
+	return cls_node;
+    }
+  return REG_MISSING;
+}
+
+/* Check whether the node TOP_NODE at TOP_STR can arrive to the node
+   LAST_NODE at LAST_STR.  We record the path onto PATH since it will be
+   heavily reused.
+   Return REG_NOERROR if it can arrive, or REG_NOMATCH otherwise.  */
+
+static reg_errcode_t
+internal_function
+check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node,
+	       Idx top_str, Idx last_node, Idx last_str, int type)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  reg_errcode_t err = REG_NOERROR;
+  Idx subexp_num, backup_cur_idx, str_idx, null_cnt;
+  re_dfastate_t *cur_state = NULL;
+  re_node_set *cur_nodes, next_nodes;
+  re_dfastate_t **backup_state_log;
+  unsigned int context;
+
+  subexp_num = dfa->nodes[top_node].opr.idx;
+  /* Extend the buffer if we need.  */
+  if (BE (path->alloc < last_str + mctx->max_mb_elem_len + 1, 0))
+    {
+      re_dfastate_t **new_array;
+      Idx old_alloc = path->alloc;
+      Idx new_alloc = old_alloc + last_str + mctx->max_mb_elem_len + 1;
+      if (BE (new_alloc < old_alloc, 0)
+	  || BE (SIZE_MAX / sizeof (re_dfastate_t *) < new_alloc, 0))
+	return REG_ESPACE;
+      new_array = re_realloc (path->array, re_dfastate_t *, new_alloc);
+      if (BE (new_array == NULL, 0))
+	return REG_ESPACE;
+      path->array = new_array;
+      path->alloc = new_alloc;
+      memset (new_array + old_alloc, '\0',
+	      sizeof (re_dfastate_t *) * (path->alloc - old_alloc));
+    }
+
+  str_idx = path->next_idx ? path->next_idx : top_str;
+
+  /* Temporary modify MCTX.  */
+  backup_state_log = mctx->state_log;
+  backup_cur_idx = mctx->input.cur_idx;
+  mctx->state_log = path->array;
+  mctx->input.cur_idx = str_idx;
+
+  /* Setup initial node set.  */
+  context = re_string_context_at (&mctx->input, str_idx - 1, mctx->eflags);
+  if (str_idx == top_str)
+    {
+      err = re_node_set_init_1 (&next_nodes, top_node);
+      if (BE (err != REG_NOERROR, 0))
+	return err;
+      err = check_arrival_expand_ecl (dfa, &next_nodes, subexp_num, type);
+      if (BE (err != REG_NOERROR, 0))
+	{
+	  re_node_set_free (&next_nodes);
+	  return err;
+	}
+    }
+  else
+    {
+      cur_state = mctx->state_log[str_idx];
+      if (cur_state && cur_state->has_backref)
+	{
+	  err = re_node_set_init_copy (&next_nodes, &cur_state->nodes);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+	}
+      else
+	re_node_set_init_empty (&next_nodes);
+    }
+  if (str_idx == top_str || (cur_state && cur_state->has_backref))
+    {
+      if (next_nodes.nelem)
+	{
+	  err = expand_bkref_cache (mctx, &next_nodes, str_idx,
+				    subexp_num, type);
+	  if (BE (err != REG_NOERROR, 0))
+	    {
+	      re_node_set_free (&next_nodes);
+	      return err;
+	    }
+	}
+      cur_state = re_acquire_state_context (&err, dfa, &next_nodes, context);
+      if (BE (cur_state == NULL && err != REG_NOERROR, 0))
+	{
+	  re_node_set_free (&next_nodes);
+	  return err;
+	}
+      mctx->state_log[str_idx] = cur_state;
+    }
+
+  for (null_cnt = 0; str_idx < last_str && null_cnt <= mctx->max_mb_elem_len;)
+    {
+      re_node_set_empty (&next_nodes);
+      if (mctx->state_log[str_idx + 1])
+	{
+	  err = re_node_set_merge (&next_nodes,
+				   &mctx->state_log[str_idx + 1]->nodes);
+	  if (BE (err != REG_NOERROR, 0))
+	    {
+	      re_node_set_free (&next_nodes);
+	      return err;
+	    }
+	}
+      if (cur_state)
+	{
+	  err = check_arrival_add_next_nodes (mctx, str_idx,
+					      &cur_state->non_eps_nodes,
+					      &next_nodes);
+	  if (BE (err != REG_NOERROR, 0))
+	    {
+	      re_node_set_free (&next_nodes);
+	      return err;
+	    }
+	}
+      ++str_idx;
+      if (next_nodes.nelem)
+	{
+	  err = check_arrival_expand_ecl (dfa, &next_nodes, subexp_num, type);
+	  if (BE (err != REG_NOERROR, 0))
+	    {
+	      re_node_set_free (&next_nodes);
+	      return err;
+	    }
+	  err = expand_bkref_cache (mctx, &next_nodes, str_idx,
+				    subexp_num, type);
+	  if (BE (err != REG_NOERROR, 0))
+	    {
+	      re_node_set_free (&next_nodes);
+	      return err;
+	    }
+	}
+      context = re_string_context_at (&mctx->input, str_idx - 1, mctx->eflags);
+      cur_state = re_acquire_state_context (&err, dfa, &next_nodes, context);
+      if (BE (cur_state == NULL && err != REG_NOERROR, 0))
+	{
+	  re_node_set_free (&next_nodes);
+	  return err;
+	}
+      mctx->state_log[str_idx] = cur_state;
+      null_cnt = cur_state == NULL ? null_cnt + 1 : 0;
+    }
+  re_node_set_free (&next_nodes);
+  cur_nodes = (mctx->state_log[last_str] == NULL ? NULL
+	       : &mctx->state_log[last_str]->nodes);
+  path->next_idx = str_idx;
+
+  /* Fix MCTX.  */
+  mctx->state_log = backup_state_log;
+  mctx->input.cur_idx = backup_cur_idx;
+
+  /* Then check the current node set has the node LAST_NODE.  */
+  if (cur_nodes != NULL && re_node_set_contains (cur_nodes, last_node))
+    return REG_NOERROR;
+
+  return REG_NOMATCH;
+}
+
+/* Helper functions for check_arrival.  */
+
+/* Calculate the destination nodes of CUR_NODES at STR_IDX, and append them
+   to NEXT_NODES.
+   TODO: This function is similar to the functions transit_state*(),
+	 however this function has many additional works.
+	 Can't we unify them?  */
+
+static reg_errcode_t
+internal_function
+check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx,
+			      re_node_set *cur_nodes, re_node_set *next_nodes)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  bool ok;
+  Idx cur_idx;
+#ifdef RE_ENABLE_I18N
+  reg_errcode_t err = REG_NOERROR;
+#endif
+  re_node_set union_set;
+  re_node_set_init_empty (&union_set);
+  for (cur_idx = 0; cur_idx < cur_nodes->nelem; ++cur_idx)
+    {
+      int naccepted = 0;
+      Idx cur_node = cur_nodes->elems[cur_idx];
+#ifdef DEBUG
+      re_token_type_t type = dfa->nodes[cur_node].type;
+      assert (!IS_EPSILON_NODE (type));
+#endif
+#ifdef RE_ENABLE_I18N
+      /* If the node may accept `multi byte'.  */
+      if (dfa->nodes[cur_node].accept_mb)
+	{
+	  naccepted = check_node_accept_bytes (dfa, cur_node, &mctx->input,
+					       str_idx);
+	  if (naccepted > 1)
+	    {
+	      re_dfastate_t *dest_state;
+	      Idx next_node = dfa->nexts[cur_node];
+	      Idx next_idx = str_idx + naccepted;
+	      dest_state = mctx->state_log[next_idx];
+	      re_node_set_empty (&union_set);
+	      if (dest_state)
+		{
+		  err = re_node_set_merge (&union_set, &dest_state->nodes);
+		  if (BE (err != REG_NOERROR, 0))
+		    {
+		      re_node_set_free (&union_set);
+		      return err;
+		    }
+		}
+	      ok = re_node_set_insert (&union_set, next_node);
+	      if (BE (! ok, 0))
+		{
+		  re_node_set_free (&union_set);
+		  return REG_ESPACE;
+		}
+	      mctx->state_log[next_idx] = re_acquire_state (&err, dfa,
+							    &union_set);
+	      if (BE (mctx->state_log[next_idx] == NULL
+		      && err != REG_NOERROR, 0))
+		{
+		  re_node_set_free (&union_set);
+		  return err;
+		}
+	    }
+	}
+#endif /* RE_ENABLE_I18N */
+      if (naccepted
+	  || check_node_accept (mctx, dfa->nodes + cur_node, str_idx))
+	{
+	  ok = re_node_set_insert (next_nodes, dfa->nexts[cur_node]);
+	  if (BE (! ok, 0))
+	    {
+	      re_node_set_free (&union_set);
+	      return REG_ESPACE;
+	    }
+	}
+    }
+  re_node_set_free (&union_set);
+  return REG_NOERROR;
+}
+
+/* For all the nodes in CUR_NODES, add the epsilon closures of them to
+   CUR_NODES, however exclude the nodes which are:
+    - inside the sub expression whose number is EX_SUBEXP, if FL_OPEN.
+    - out of the sub expression whose number is EX_SUBEXP, if !FL_OPEN.
+*/
+
+static reg_errcode_t
+internal_function
+check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes,
+			  Idx ex_subexp, int type)
+{
+  reg_errcode_t err;
+  Idx idx, outside_node;
+  re_node_set new_nodes;
+#ifdef DEBUG
+  assert (cur_nodes->nelem);
+#endif
+  err = re_node_set_alloc (&new_nodes, cur_nodes->nelem);
+  if (BE (err != REG_NOERROR, 0))
+    return err;
+  /* Create a new node set NEW_NODES with the nodes which are epsilon
+     closures of the node in CUR_NODES.  */
+
+  for (idx = 0; idx < cur_nodes->nelem; ++idx)
+    {
+      Idx cur_node = cur_nodes->elems[idx];
+      const re_node_set *eclosure = dfa->eclosures + cur_node;
+      outside_node = find_subexp_node (dfa, eclosure, ex_subexp, type);
+      if (outside_node == REG_MISSING)
+	{
+	  /* There are no problematic nodes, just merge them.  */
+	  err = re_node_set_merge (&new_nodes, eclosure);
+	  if (BE (err != REG_NOERROR, 0))
+	    {
+	      re_node_set_free (&new_nodes);
+	      return err;
+	    }
+	}
+      else
+	{
+	  /* There are problematic nodes, re-calculate incrementally.  */
+	  err = check_arrival_expand_ecl_sub (dfa, &new_nodes, cur_node,
+					      ex_subexp, type);
+	  if (BE (err != REG_NOERROR, 0))
+	    {
+	      re_node_set_free (&new_nodes);
+	      return err;
+	    }
+	}
+    }
+  re_node_set_free (cur_nodes);
+  *cur_nodes = new_nodes;
+  return REG_NOERROR;
+}
+
+/* Helper function for check_arrival_expand_ecl.
+   Check incrementally the epsilon closure of TARGET, and if it isn't
+   problematic append it to DST_NODES.  */
+
+static reg_errcode_t
+internal_function
+check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes,
+			      Idx target, Idx ex_subexp, int type)
+{
+  Idx cur_node;
+  for (cur_node = target; !re_node_set_contains (dst_nodes, cur_node);)
+    {
+      bool ok;
+
+      if (dfa->nodes[cur_node].type == type
+	  && dfa->nodes[cur_node].opr.idx == ex_subexp)
+	{
+	  if (type == OP_CLOSE_SUBEXP)
+	    {
+	      ok = re_node_set_insert (dst_nodes, cur_node);
+	      if (BE (! ok, 0))
+		return REG_ESPACE;
+	    }
+	  break;
+	}
+      ok = re_node_set_insert (dst_nodes, cur_node);
+      if (BE (! ok, 0))
+	return REG_ESPACE;
+      if (dfa->edests[cur_node].nelem == 0)
+	break;
+      if (dfa->edests[cur_node].nelem == 2)
+	{
+	  reg_errcode_t err;
+	  err = check_arrival_expand_ecl_sub (dfa, dst_nodes,
+					      dfa->edests[cur_node].elems[1],
+					      ex_subexp, type);
+	  if (BE (err != REG_NOERROR, 0))
+	    return err;
+	}
+      cur_node = dfa->edests[cur_node].elems[0];
+    }
+  return REG_NOERROR;
+}
+
+
+/* For all the back references in the current state, calculate the
+   destination of the back references by the appropriate entry
+   in MCTX->BKREF_ENTS.  */
+
+static reg_errcode_t
+internal_function
+expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes,
+		    Idx cur_str, Idx subexp_num, int type)
+{
+  const re_dfa_t *const dfa = mctx->dfa;
+  reg_errcode_t err;
+  Idx cache_idx_start = search_cur_bkref_entry (mctx, cur_str);
+  struct re_backref_cache_entry *ent;
+
+  if (cache_idx_start == REG_MISSING)
+    return REG_NOERROR;
+
+ restart:
+  ent = mctx->bkref_ents + cache_idx_start;
+  do
+    {
+      Idx to_idx, next_node;
+
+      /* Is this entry ENT is appropriate?  */
+      if (!re_node_set_contains (cur_nodes, ent->node))
+	continue; /* No.  */
+
+      to_idx = cur_str + ent->subexp_to - ent->subexp_from;
+      /* Calculate the destination of the back reference, and append it
+	 to MCTX->STATE_LOG.  */
+      if (to_idx == cur_str)
+	{
+	  /* The backreference did epsilon transit, we must re-check all the
+	     node in the current state.  */
+	  re_node_set new_dests;
+	  reg_errcode_t err2, err3;
+	  next_node = dfa->edests[ent->node].elems[0];
+	  if (re_node_set_contains (cur_nodes, next_node))
+	    continue;
+	  err = re_node_set_init_1 (&new_dests, next_node);
+	  err2 = check_arrival_expand_ecl (dfa, &new_dests, subexp_num, type);
+	  err3 = re_node_set_merge (cur_nodes, &new_dests);
+	  re_node_set_free (&new_dests);
+	  if (BE (err != REG_NOERROR || err2 != REG_NOERROR
+		  || err3 != REG_NOERROR, 0))
+	    {
+	      err = (err != REG_NOERROR ? err
+		     : (err2 != REG_NOERROR ? err2 : err3));
+	      return err;
+	    }
+	  /* TODO: It is still inefficient...  */
+	  goto restart;
+	}
+      else
+	{
+	  re_node_set union_set;
+	  next_node = dfa->nexts[ent->node];
+	  if (mctx->state_log[to_idx])
+	    {
+	      bool ok;
+	      if (re_node_set_contains (&mctx->state_log[to_idx]->nodes,
+					next_node))
+		continue;
+	      err = re_node_set_init_copy (&union_set,
+					   &mctx->state_log[to_idx]->nodes);
+	      ok = re_node_set_insert (&union_set, next_node);
+	      if (BE (err != REG_NOERROR || ! ok, 0))
+		{
+		  re_node_set_free (&union_set);
+		  err = err != REG_NOERROR ? err : REG_ESPACE;
+		  return err;
+		}
+	    }
+	  else
+	    {
+	      err = re_node_set_init_1 (&union_set, next_node);
+	      if (BE (err != REG_NOERROR, 0))
+		return err;
+	    }
+	  mctx->state_log[to_idx] = re_acquire_state (&err, dfa, &union_set);
+	  re_node_set_free (&union_set);
+	  if (BE (mctx->state_log[to_idx] == NULL
+		  && err != REG_NOERROR, 0))
+	    return err;
+	}
+    }
+  while (ent++->more);
+  return REG_NOERROR;
+}
+
+/* Build transition table for the state.
+   Return true if successful.  */
+
+static bool
+internal_function
+build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
+{
+  reg_errcode_t err;
+  Idx i, j;
+  int ch;
+  bool need_word_trtable = false;
+  bitset_word_t elem, mask;
+  bool dests_node_malloced = false;
+  bool dest_states_malloced = false;
+  Idx ndests; /* Number of the destination states from `state'.  */
+  re_dfastate_t **trtable;
+  re_dfastate_t **dest_states = NULL, **dest_states_word, **dest_states_nl;
+  re_node_set follows, *dests_node;
+  bitset_t *dests_ch;
+  bitset_t acceptable;
+
+  struct dests_alloc
+  {
+    re_node_set dests_node[SBC_MAX];
+    bitset_t dests_ch[SBC_MAX];
+  } *dests_alloc;
+
+  /* We build DFA states which corresponds to the destination nodes
+     from `state'.  `dests_node[i]' represents the nodes which i-th
+     destination state contains, and `dests_ch[i]' represents the
+     characters which i-th destination state accepts.  */
+  if (__libc_use_alloca (sizeof (struct dests_alloc)))
+    dests_alloc = (struct dests_alloc *) alloca (sizeof (struct dests_alloc));
+  else
+    {
+      dests_alloc = re_malloc (struct dests_alloc, 1);
+      if (BE (dests_alloc == NULL, 0))
+	return false;
+      dests_node_malloced = true;
+    }
+  dests_node = dests_alloc->dests_node;
+  dests_ch = dests_alloc->dests_ch;
+
+  /* Initialize transiton table.  */
+  state->word_trtable = state->trtable = NULL;
+
+  /* At first, group all nodes belonging to `state' into several
+     destinations.  */
+  ndests = group_nodes_into_DFAstates (dfa, state, dests_node, dests_ch);
+  if (BE (! REG_VALID_NONZERO_INDEX (ndests), 0))
+    {
+      if (dests_node_malloced)
+	free (dests_alloc);
+      if (ndests == 0)
+	{
+	  state->trtable = (re_dfastate_t **)
+	    calloc (sizeof (re_dfastate_t *), SBC_MAX);
+	  return true;
+	}
+      return false;
+    }
+
+  err = re_node_set_alloc (&follows, ndests + 1);
+  if (BE (err != REG_NOERROR, 0))
+    goto out_free;
+
+  /* Avoid arithmetic overflow in size calculation.  */
+  if (BE ((((SIZE_MAX - (sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX)
+	    / (3 * sizeof (re_dfastate_t *)))
+	   < ndests),
+	  0))
+    goto out_free;
+
+  if (__libc_use_alloca ((sizeof (re_node_set) + sizeof (bitset_t)) * SBC_MAX
+			 + ndests * 3 * sizeof (re_dfastate_t *)))
+    dest_states = (re_dfastate_t **)
+      alloca (ndests * 3 * sizeof (re_dfastate_t *));
+  else
+    {
+      dest_states = (re_dfastate_t **)
+	malloc (ndests * 3 * sizeof (re_dfastate_t *));
+      if (BE (dest_states == NULL, 0))
+	{
+out_free:
+	  if (dest_states_malloced)
+	    free (dest_states);
+	  re_node_set_free (&follows);
+	  for (i = 0; i < ndests; ++i)
+	    re_node_set_free (dests_node + i);
+	  if (dests_node_malloced)
+	    free (dests_alloc);
+	  return false;
+	}
+      dest_states_malloced = true;
+    }
+  dest_states_word = dest_states + ndests;
+  dest_states_nl = dest_states_word + ndests;
+  bitset_empty (acceptable);
+
+  /* Then build the states for all destinations.  */
+  for (i = 0; i < ndests; ++i)
+    {
+      Idx next_node;
+      re_node_set_empty (&follows);
+      /* Merge the follows of this destination states.  */
+      for (j = 0; j < dests_node[i].nelem; ++j)
+	{
+	  next_node = dfa->nexts[dests_node[i].elems[j]];
+	  if (next_node != REG_MISSING)
+	    {
+	      err = re_node_set_merge (&follows, dfa->eclosures + next_node);
+	      if (BE (err != REG_NOERROR, 0))
+		goto out_free;
+	    }
+	}
+      dest_states[i] = re_acquire_state_context (&err, dfa, &follows, 0);
+      if (BE (dest_states[i] == NULL && err != REG_NOERROR, 0))
+	goto out_free;
+      /* If the new state has context constraint,
+	 build appropriate states for these contexts.  */
+      if (dest_states[i]->has_constraint)
+	{
+	  dest_states_word[i] = re_acquire_state_context (&err, dfa, &follows,
+							  CONTEXT_WORD);
+	  if (BE (dest_states_word[i] == NULL && err != REG_NOERROR, 0))
+	    goto out_free;
+
+	  if (dest_states[i] != dest_states_word[i] && dfa->mb_cur_max > 1)
+	    need_word_trtable = true;
+
+	  dest_states_nl[i] = re_acquire_state_context (&err, dfa, &follows,
+							CONTEXT_NEWLINE);
+	  if (BE (dest_states_nl[i] == NULL && err != REG_NOERROR, 0))
+	    goto out_free;
+	}
+      else
+	{
+	  dest_states_word[i] = dest_states[i];
+	  dest_states_nl[i] = dest_states[i];
+	}
+      bitset_merge (acceptable, dests_ch[i]);
+    }
+
+  if (!BE (need_word_trtable, 0))
+    {
+      /* We don't care about whether the following character is a word
+	 character, or we are in a single-byte character set so we can
+	 discern by looking at the character code: allocate a
+	 256-entry transition table.  */
+      trtable = state->trtable =
+	(re_dfastate_t **) calloc (sizeof (re_dfastate_t *), SBC_MAX);
+      if (BE (trtable == NULL, 0))
+	goto out_free;
+
+      /* For all characters ch...:  */
+      for (i = 0; i < BITSET_WORDS; ++i)
+	for (ch = i * BITSET_WORD_BITS, elem = acceptable[i], mask = 1;
+	     elem;
+	     mask <<= 1, elem >>= 1, ++ch)
+	  if (BE (elem & 1, 0))
+	    {
+	      /* There must be exactly one destination which accepts
+		 character ch.  See group_nodes_into_DFAstates.  */
+	      for (j = 0; (dests_ch[j][i] & mask) == 0; ++j)
+		;
+
+	      /* j-th destination accepts the word character ch.  */
+	      if (dfa->word_char[i] & mask)
+		trtable[ch] = dest_states_word[j];
+	      else
+		trtable[ch] = dest_states[j];
+	    }
+    }
+  else
+    {
+      /* We care about whether the following character is a word
+	 character, and we are in a multi-byte character set: discern
+	 by looking at the character code: build two 256-entry
+	 transition tables, one starting at trtable[0] and one
+	 starting at trtable[SBC_MAX].  */
+      trtable = state->word_trtable =
+	(re_dfastate_t **) calloc (sizeof (re_dfastate_t *), 2 * SBC_MAX);
+      if (BE (trtable == NULL, 0))
+	goto out_free;
+
+      /* For all characters ch...:  */
+      for (i = 0; i < BITSET_WORDS; ++i)
+	for (ch = i * BITSET_WORD_BITS, elem = acceptable[i], mask = 1;
+	     elem;
+	     mask <<= 1, elem >>= 1, ++ch)
+	  if (BE (elem & 1, 0))
+	    {
+	      /* There must be exactly one destination which accepts
+		 character ch.  See group_nodes_into_DFAstates.  */
+	      for (j = 0; (dests_ch[j][i] & mask) == 0; ++j)
+		;
+
+	      /* j-th destination accepts the word character ch.  */
+	      trtable[ch] = dest_states[j];
+	      trtable[ch + SBC_MAX] = dest_states_word[j];
+	    }
+    }
+
+  /* new line */
+  if (bitset_contain (acceptable, NEWLINE_CHAR))
+    {
+      /* The current state accepts newline character.  */
+      for (j = 0; j < ndests; ++j)
+	if (bitset_contain (dests_ch[j], NEWLINE_CHAR))
+	  {
+	    /* k-th destination accepts newline character.  */
+	    trtable[NEWLINE_CHAR] = dest_states_nl[j];
+	    if (need_word_trtable)
+	      trtable[NEWLINE_CHAR + SBC_MAX] = dest_states_nl[j];
+	    /* There must be only one destination which accepts
+	       newline.  See group_nodes_into_DFAstates.  */
+	    break;
+	  }
+    }
+
+  if (dest_states_malloced)
+    free (dest_states);
+
+  re_node_set_free (&follows);
+  for (i = 0; i < ndests; ++i)
+    re_node_set_free (dests_node + i);
+
+  if (dests_node_malloced)
+    free (dests_alloc);
+
+  return true;
+}
+
+/* Group all nodes belonging to STATE into several destinations.
+   Then for all destinations, set the nodes belonging to the destination
+   to DESTS_NODE[i] and set the characters accepted by the destination
+   to DEST_CH[i].  This function return the number of destinations.  */
+
+static Idx
+internal_function
+group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
+			    re_node_set *dests_node, bitset_t *dests_ch)
+{
+  reg_errcode_t err;
+  bool ok;
+  Idx i, j, k;
+  Idx ndests; /* Number of the destinations from `state'.  */
+  bitset_t accepts; /* Characters a node can accept.  */
+  const re_node_set *cur_nodes = &state->nodes;
+  bitset_empty (accepts);
+  ndests = 0;
+
+  /* For all the nodes belonging to `state',  */
+  for (i = 0; i < cur_nodes->nelem; ++i)
+    {
+      re_token_t *node = &dfa->nodes[cur_nodes->elems[i]];
+      re_token_type_t type = node->type;
+      unsigned int constraint = node->constraint;
+
+      /* Enumerate all single byte character this node can accept.  */
+      if (type == CHARACTER)
+	bitset_set (accepts, node->opr.c);
+      else if (type == SIMPLE_BRACKET)
+	{
+	  bitset_merge (accepts, node->opr.sbcset);
+	}
+      else if (type == OP_PERIOD)
+	{
+#ifdef RE_ENABLE_I18N
+	  if (dfa->mb_cur_max > 1)
+	    bitset_merge (accepts, dfa->sb_char);
+	  else
+#endif
+	    bitset_set_all (accepts);
+	  if (!(dfa->syntax & RE_DOT_NEWLINE))
+	    bitset_clear (accepts, '\n');
+	  if (dfa->syntax & RE_DOT_NOT_NULL)
+	    bitset_clear (accepts, '\0');
+	}
+#ifdef RE_ENABLE_I18N
+      else if (type == OP_UTF8_PERIOD)
+        {
+	  if (ASCII_CHARS % BITSET_WORD_BITS == 0)
+	    memset (accepts, -1, ASCII_CHARS / CHAR_BIT);
+	  else
+	    bitset_merge (accepts, utf8_sb_map);
+	  if (!(dfa->syntax & RE_DOT_NEWLINE))
+	    bitset_clear (accepts, '\n');
+	  if (dfa->syntax & RE_DOT_NOT_NULL)
+	    bitset_clear (accepts, '\0');
+        }
+#endif
+      else
+	continue;
+
+      /* Check the `accepts' and sift the characters which are not
+	 match it the context.  */
+      if (constraint)
+	{
+	  if (constraint & NEXT_NEWLINE_CONSTRAINT)
+	    {
+	      bool accepts_newline = bitset_contain (accepts, NEWLINE_CHAR);
+	      bitset_empty (accepts);
+	      if (accepts_newline)
+		bitset_set (accepts, NEWLINE_CHAR);
+	      else
+		continue;
+	    }
+	  if (constraint & NEXT_ENDBUF_CONSTRAINT)
+	    {
+	      bitset_empty (accepts);
+	      continue;
+	    }
+
+	  if (constraint & NEXT_WORD_CONSTRAINT)
+	    {
+	      bitset_word_t any_set = 0;
+	      if (type == CHARACTER && !node->word_char)
+		{
+		  bitset_empty (accepts);
+		  continue;
+		}
+#ifdef RE_ENABLE_I18N
+	      if (dfa->mb_cur_max > 1)
+		for (j = 0; j < BITSET_WORDS; ++j)
+		  any_set |= (accepts[j] &= (dfa->word_char[j] | ~dfa->sb_char[j]));
+	      else
+#endif
+		for (j = 0; j < BITSET_WORDS; ++j)
+		  any_set |= (accepts[j] &= dfa->word_char[j]);
+	      if (!any_set)
+		continue;
+	    }
+	  if (constraint & NEXT_NOTWORD_CONSTRAINT)
+	    {
+	      bitset_word_t any_set = 0;
+	      if (type == CHARACTER && node->word_char)
+		{
+		  bitset_empty (accepts);
+		  continue;
+		}
+#ifdef RE_ENABLE_I18N
+	      if (dfa->mb_cur_max > 1)
+		for (j = 0; j < BITSET_WORDS; ++j)
+		  any_set |= (accepts[j] &= ~(dfa->word_char[j] & dfa->sb_char[j]));
+	      else
+#endif
+		for (j = 0; j < BITSET_WORDS; ++j)
+		  any_set |= (accepts[j] &= ~dfa->word_char[j]);
+	      if (!any_set)
+		continue;
+	    }
+	}
+
+      /* Then divide `accepts' into DFA states, or create a new
+	 state.  Above, we make sure that accepts is not empty.  */
+      for (j = 0; j < ndests; ++j)
+	{
+	  bitset_t intersec; /* Intersection sets, see below.  */
+	  bitset_t remains;
+	  /* Flags, see below.  */
+	  bitset_word_t has_intersec, not_subset, not_consumed;
+
+	  /* Optimization, skip if this state doesn't accept the character.  */
+	  if (type == CHARACTER && !bitset_contain (dests_ch[j], node->opr.c))
+	    continue;
+
+	  /* Enumerate the intersection set of this state and `accepts'.  */
+	  has_intersec = 0;
+	  for (k = 0; k < BITSET_WORDS; ++k)
+	    has_intersec |= intersec[k] = accepts[k] & dests_ch[j][k];
+	  /* And skip if the intersection set is empty.  */
+	  if (!has_intersec)
+	    continue;
+
+	  /* Then check if this state is a subset of `accepts'.  */
+	  not_subset = not_consumed = 0;
+	  for (k = 0; k < BITSET_WORDS; ++k)
+	    {
+	      not_subset |= remains[k] = ~accepts[k] & dests_ch[j][k];
+	      not_consumed |= accepts[k] = accepts[k] & ~dests_ch[j][k];
+	    }
+
+	  /* If this state isn't a subset of `accepts', create a
+	     new group state, which has the `remains'. */
+	  if (not_subset)
+	    {
+	      bitset_copy (dests_ch[ndests], remains);
+	      bitset_copy (dests_ch[j], intersec);
+	      err = re_node_set_init_copy (dests_node + ndests, &dests_node[j]);
+	      if (BE (err != REG_NOERROR, 0))
+		goto error_return;
+	      ++ndests;
+	    }
+
+	  /* Put the position in the current group. */
+	  ok = re_node_set_insert (&dests_node[j], cur_nodes->elems[i]);
+	  if (BE (! ok, 0))
+	    goto error_return;
+
+	  /* If all characters are consumed, go to next node. */
+	  if (!not_consumed)
+	    break;
+	}
+      /* Some characters remain, create a new group. */
+      if (j == ndests)
+	{
+	  bitset_copy (dests_ch[ndests], accepts);
+	  err = re_node_set_init_1 (dests_node + ndests, cur_nodes->elems[i]);
+	  if (BE (err != REG_NOERROR, 0))
+	    goto error_return;
+	  ++ndests;
+	  bitset_empty (accepts);
+	}
+    }
+  return ndests;
+ error_return:
+  for (j = 0; j < ndests; ++j)
+    re_node_set_free (dests_node + j);
+  return REG_MISSING;
+}
+
+#ifdef RE_ENABLE_I18N
+/* Check how many bytes the node `dfa->nodes[node_idx]' accepts.
+   Return the number of the bytes the node accepts.
+   STR_IDX is the current index of the input string.
+
+   This function handles the nodes which can accept one character, or
+   one collating element like '.', '[a-z]', opposite to the other nodes
+   can only accept one byte.  */
+
+static int
+internal_function
+check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
+			 const re_string_t *input, Idx str_idx)
+{
+  const re_token_t *node = dfa->nodes + node_idx;
+  int char_len, elem_len;
+  Idx i;
+
+  if (BE (node->type == OP_UTF8_PERIOD, 0))
+    {
+      unsigned char c = re_string_byte_at (input, str_idx), d;
+      if (BE (c < 0xc2, 1))
+	return 0;
+
+      if (str_idx + 2 > input->len)
+	return 0;
+
+      d = re_string_byte_at (input, str_idx + 1);
+      if (c < 0xe0)
+	return (d < 0x80 || d > 0xbf) ? 0 : 2;
+      else if (c < 0xf0)
+	{
+	  char_len = 3;
+	  if (c == 0xe0 && d < 0xa0)
+	    return 0;
+	}
+      else if (c < 0xf8)
+	{
+	  char_len = 4;
+	  if (c == 0xf0 && d < 0x90)
+	    return 0;
+	}
+      else if (c < 0xfc)
+	{
+	  char_len = 5;
+	  if (c == 0xf8 && d < 0x88)
+	    return 0;
+	}
+      else if (c < 0xfe)
+	{
+	  char_len = 6;
+	  if (c == 0xfc && d < 0x84)
+	    return 0;
+	}
+      else
+	return 0;
+
+      if (str_idx + char_len > input->len)
+	return 0;
+
+      for (i = 1; i < char_len; ++i)
+	{
+	  d = re_string_byte_at (input, str_idx + i);
+	  if (d < 0x80 || d > 0xbf)
+	    return 0;
+	}
+      return char_len;
+    }
+
+  char_len = re_string_char_size_at (input, str_idx);
+  if (node->type == OP_PERIOD)
+    {
+      if (char_len <= 1)
+        return 0;
+      /* FIXME: I don't think this if is needed, as both '\n'
+	 and '\0' are char_len == 1.  */
+      /* '.' accepts any one character except the following two cases.  */
+      if ((!(dfa->syntax & RE_DOT_NEWLINE) &&
+	   re_string_byte_at (input, str_idx) == '\n') ||
+	  ((dfa->syntax & RE_DOT_NOT_NULL) &&
+	   re_string_byte_at (input, str_idx) == '\0'))
+	return 0;
+      return char_len;
+    }
+
+  elem_len = re_string_elem_size_at (input, str_idx);
+  if ((elem_len <= 1 && char_len <= 1) || char_len == 0)
+    return 0;
+
+  if (node->type == COMPLEX_BRACKET)
+    {
+      const re_charset_t *cset = node->opr.mbcset;
+# ifdef _LIBC
+      const unsigned char *pin
+	= ((const unsigned char *) re_string_get_buffer (input) + str_idx);
+      Idx j;
+      uint32_t nrules;
+# endif /* _LIBC */
+      int match_len = 0;
+      wchar_t wc = ((cset->nranges || cset->nchar_classes || cset->nmbchars)
+		    ? re_string_wchar_at (input, str_idx) : 0);
+
+      /* match with multibyte character?  */
+      for (i = 0; i < cset->nmbchars; ++i)
+	if (wc == cset->mbchars[i])
+	  {
+	    match_len = char_len;
+	    goto check_node_accept_bytes_match;
+	  }
+      /* match with character_class?  */
+      for (i = 0; i < cset->nchar_classes; ++i)
+	{
+	  wctype_t wt = cset->char_classes[i];
+	  if (__iswctype (wc, wt))
+	    {
+	      match_len = char_len;
+	      goto check_node_accept_bytes_match;
+	    }
+	}
+
+# ifdef _LIBC
+      nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+      if (nrules != 0)
+	{
+	  unsigned int in_collseq = 0;
+	  const int32_t *table, *indirect;
+	  const unsigned char *weights, *extra;
+	  const char *collseqwc;
+	  int32_t idx;
+	  /* This #include defines a local function!  */
+#  include <locale/weight.h>
+
+	  /* match with collating_symbol?  */
+	  if (cset->ncoll_syms)
+	    extra = (const unsigned char *)
+	      _NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_EXTRAMB);
+	  for (i = 0; i < cset->ncoll_syms; ++i)
+	    {
+	      const unsigned char *coll_sym = extra + cset->coll_syms[i];
+	      /* Compare the length of input collating element and
+		 the length of current collating element.  */
+	      if (*coll_sym != elem_len)
+		continue;
+	      /* Compare each bytes.  */
+	      for (j = 0; j < *coll_sym; j++)
+		if (pin[j] != coll_sym[1 + j])
+		  break;
+	      if (j == *coll_sym)
+		{
+		  /* Match if every bytes is equal.  */
+		  match_len = j;
+		  goto check_node_accept_bytes_match;
+		}
+	    }
+
+	  if (cset->nranges)
+	    {
+	      if (elem_len <= char_len)
+		{
+		  collseqwc = _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQWC);
+		  in_collseq = __collseq_table_lookup (collseqwc, wc);
+		}
+	      else
+		in_collseq = find_collation_sequence_value (pin, elem_len);
+	    }
+	  /* match with range expression?  */
+	  for (i = 0; i < cset->nranges; ++i)
+	    if (cset->range_starts[i] <= in_collseq
+		&& in_collseq <= cset->range_ends[i])
+	      {
+		match_len = elem_len;
+		goto check_node_accept_bytes_match;
+	      }
+
+	  /* match with equivalence_class?  */
+	  if (cset->nequiv_classes)
+	    {
+	      const unsigned char *cp = pin;
+	      table = (const int32_t *)
+		_NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
+	      weights = (const unsigned char *)
+		_NL_CURRENT (LC_COLLATE, _NL_COLLATE_WEIGHTMB);
+	      extra = (const unsigned char *)
+		_NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB);
+	      indirect = (const int32_t *)
+		_NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
+	      idx = findidx (&cp);
+	      if (idx > 0)
+		for (i = 0; i < cset->nequiv_classes; ++i)
+		  {
+		    int32_t equiv_class_idx = cset->equiv_classes[i];
+		    size_t weight_len = weights[idx];
+		    if (weight_len == weights[equiv_class_idx])
+		      {
+			Idx cnt = 0;
+			while (cnt <= weight_len
+			       && (weights[equiv_class_idx + 1 + cnt]
+				   == weights[idx + 1 + cnt]))
+			  ++cnt;
+			if (cnt > weight_len)
+			  {
+			    match_len = elem_len;
+			    goto check_node_accept_bytes_match;
+			  }
+		      }
+		  }
+	    }
+	}
+      else
+# endif /* _LIBC */
+	{
+	  /* match with range expression?  */
+#if __GNUC__ >= 2 && ! (__STDC_VERSION__ < 199901L && __STRICT_ANSI__)
+	  wchar_t cmp_buf[] = {L'\0', L'\0', wc, L'\0', L'\0', L'\0'};
+#else
+	  wchar_t cmp_buf[] = {L'\0', L'\0', L'\0', L'\0', L'\0', L'\0'};
+	  cmp_buf[2] = wc;
+#endif
+	  for (i = 0; i < cset->nranges; ++i)
+	    {
+	      cmp_buf[0] = cset->range_starts[i];
+	      cmp_buf[4] = cset->range_ends[i];
+	      if (wcscoll (cmp_buf, cmp_buf + 2) <= 0
+		  && wcscoll (cmp_buf + 2, cmp_buf + 4) <= 0)
+		{
+		  match_len = char_len;
+		  goto check_node_accept_bytes_match;
+		}
+	    }
+	}
+    check_node_accept_bytes_match:
+      if (!cset->non_match)
+	return match_len;
+      else
+	{
+	  if (match_len > 0)
+	    return 0;
+	  else
+	    return (elem_len > char_len) ? elem_len : char_len;
+	}
+    }
+  return 0;
+}
+
+# ifdef _LIBC
+static unsigned int
+internal_function
+find_collation_sequence_value (const unsigned char *mbs, size_t mbs_len)
+{
+  uint32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+  if (nrules == 0)
+    {
+      if (mbs_len == 1)
+	{
+	  /* No valid character.  Match it as a single byte character.  */
+	  const unsigned char *collseq = (const unsigned char *)
+	    _NL_CURRENT (LC_COLLATE, _NL_COLLATE_COLLSEQMB);
+	  return collseq[mbs[0]];
+	}
+      return UINT_MAX;
+    }
+  else
+    {
+      int32_t idx;
+      const unsigned char *extra = (const unsigned char *)
+	_NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_EXTRAMB);
+      int32_t extrasize = (const unsigned char *)
+	_NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_EXTRAMB + 1) - extra;
+
+      for (idx = 0; idx < extrasize;)
+	{
+	  int mbs_cnt;
+	  bool found = false;
+	  int32_t elem_mbs_len;
+	  /* Skip the name of collating element name.  */
+	  idx = idx + extra[idx] + 1;
+	  elem_mbs_len = extra[idx++];
+	  if (mbs_len == elem_mbs_len)
+	    {
+	      for (mbs_cnt = 0; mbs_cnt < elem_mbs_len; ++mbs_cnt)
+		if (extra[idx + mbs_cnt] != mbs[mbs_cnt])
+		  break;
+	      if (mbs_cnt == elem_mbs_len)
+		/* Found the entry.  */
+		found = true;
+	    }
+	  /* Skip the byte sequence of the collating element.  */
+	  idx += elem_mbs_len;
+	  /* Adjust for the alignment.  */
+	  idx = (idx + 3) & ~3;
+	  /* Skip the collation sequence value.  */
+	  idx += sizeof (uint32_t);
+	  /* Skip the wide char sequence of the collating element.  */
+	  idx = idx + sizeof (uint32_t) * (extra[idx] + 1);
+	  /* If we found the entry, return the sequence value.  */
+	  if (found)
+	    return *(uint32_t *) (extra + idx);
+	  /* Skip the collation sequence value.  */
+	  idx += sizeof (uint32_t);
+	}
+      return UINT_MAX;
+    }
+}
+# endif /* _LIBC */
+#endif /* RE_ENABLE_I18N */
+
+/* Check whether the node accepts the byte which is IDX-th
+   byte of the INPUT.  */
+
+static bool
+internal_function
+check_node_accept (const re_match_context_t *mctx, const re_token_t *node,
+		   Idx idx)
+{
+  unsigned char ch;
+  ch = re_string_byte_at (&mctx->input, idx);
+  switch (node->type)
+    {
+    case CHARACTER:
+      if (node->opr.c != ch)
+        return false;
+      break;
+
+    case SIMPLE_BRACKET:
+      if (!bitset_contain (node->opr.sbcset, ch))
+        return false;
+      break;
+
+#ifdef RE_ENABLE_I18N
+    case OP_UTF8_PERIOD:
+      if (ch >= ASCII_CHARS)
+        return false;
+      /* FALLTHROUGH */
+#endif
+    case OP_PERIOD:
+      if ((ch == '\n' && !(mctx->dfa->syntax & RE_DOT_NEWLINE))
+	  || (ch == '\0' && (mctx->dfa->syntax & RE_DOT_NOT_NULL)))
+	return false;
+      break;
+
+    default:
+      return false;
+    }
+
+  if (node->constraint)
+    {
+      /* The node has constraints.  Check whether the current context
+	 satisfies the constraints.  */
+      unsigned int context = re_string_context_at (&mctx->input, idx,
+						   mctx->eflags);
+      if (NOT_SATISFY_NEXT_CONSTRAINT (node->constraint, context))
+	return false;
+    }
+
+  return true;
+}
+
+/* Extend the buffers, if the buffers have run out.  */
+
+static reg_errcode_t
+internal_function
+extend_buffers (re_match_context_t *mctx)
+{
+  reg_errcode_t ret;
+  re_string_t *pstr = &mctx->input;
+
+  /* Avoid overflow.  */
+  if (BE (SIZE_MAX / 2 / sizeof (re_dfastate_t *) <= pstr->bufs_len, 0))
+    return REG_ESPACE;
+
+  /* Double the lengthes of the buffers.  */
+  ret = re_string_realloc_buffers (pstr, pstr->bufs_len * 2);
+  if (BE (ret != REG_NOERROR, 0))
+    return ret;
+
+  if (mctx->state_log != NULL)
+    {
+      /* And double the length of state_log.  */
+      /* XXX We have no indication of the size of this buffer.  If this
+	 allocation fail we have no indication that the state_log array
+	 does not have the right size.  */
+      re_dfastate_t **new_array = re_realloc (mctx->state_log, re_dfastate_t *,
+					      pstr->bufs_len + 1);
+      if (BE (new_array == NULL, 0))
+	return REG_ESPACE;
+      mctx->state_log = new_array;
+    }
+
+  /* Then reconstruct the buffers.  */
+  if (pstr->icase)
+    {
+#ifdef RE_ENABLE_I18N
+      if (pstr->mb_cur_max > 1)
+	{
+	  ret = build_wcs_upper_buffer (pstr);
+	  if (BE (ret != REG_NOERROR, 0))
+	    return ret;
+	}
+      else
+#endif /* RE_ENABLE_I18N  */
+	build_upper_buffer (pstr);
+    }
+  else
+    {
+#ifdef RE_ENABLE_I18N
+      if (pstr->mb_cur_max > 1)
+	build_wcs_buffer (pstr);
+      else
+#endif /* RE_ENABLE_I18N  */
+	{
+	  if (pstr->trans != NULL)
+	    re_string_translate_buffer (pstr);
+	}
+    }
+  return REG_NOERROR;
+}
+
+
+/* Functions for matching context.  */
+
+/* Initialize MCTX.  */
+
+static reg_errcode_t
+internal_function
+match_ctx_init (re_match_context_t *mctx, int eflags, Idx n)
+{
+  mctx->eflags = eflags;
+  mctx->match_last = REG_MISSING;
+  if (n > 0)
+    {
+      /* Avoid overflow.  */
+      size_t max_object_size =
+	MAX (sizeof (struct re_backref_cache_entry),
+	     sizeof (re_sub_match_top_t *));
+      if (BE (SIZE_MAX / max_object_size < n, 0))
+	return REG_ESPACE;
+
+      mctx->bkref_ents = re_malloc (struct re_backref_cache_entry, n);
+      mctx->sub_tops = re_malloc (re_sub_match_top_t *, n);
+      if (BE (mctx->bkref_ents == NULL || mctx->sub_tops == NULL, 0))
+	return REG_ESPACE;
+    }
+  /* Already zero-ed by the caller.
+     else
+       mctx->bkref_ents = NULL;
+     mctx->nbkref_ents = 0;
+     mctx->nsub_tops = 0;  */
+  mctx->abkref_ents = n;
+  mctx->max_mb_elem_len = 1;
+  mctx->asub_tops = n;
+  return REG_NOERROR;
+}
+
+/* Clean the entries which depend on the current input in MCTX.
+   This function must be invoked when the matcher changes the start index
+   of the input, or changes the input string.  */
+
+static void
+internal_function
+match_ctx_clean (re_match_context_t *mctx)
+{
+  Idx st_idx;
+  for (st_idx = 0; st_idx < mctx->nsub_tops; ++st_idx)
+    {
+      Idx sl_idx;
+      re_sub_match_top_t *top = mctx->sub_tops[st_idx];
+      for (sl_idx = 0; sl_idx < top->nlasts; ++sl_idx)
+	{
+	  re_sub_match_last_t *last = top->lasts[sl_idx];
+	  re_free (last->path.array);
+	  re_free (last);
+	}
+      re_free (top->lasts);
+      if (top->path)
+	{
+	  re_free (top->path->array);
+	  re_free (top->path);
+	}
+      free (top);
+    }
+
+  mctx->nsub_tops = 0;
+  mctx->nbkref_ents = 0;
+}
+
+/* Free all the memory associated with MCTX.  */
+
+static void
+internal_function
+match_ctx_free (re_match_context_t *mctx)
+{
+  /* First, free all the memory associated with MCTX->SUB_TOPS.  */
+  match_ctx_clean (mctx);
+  re_free (mctx->sub_tops);
+  re_free (mctx->bkref_ents);
+}
+
+/* Add a new backreference entry to MCTX.
+   Note that we assume that caller never call this function with duplicate
+   entry, and call with STR_IDX which isn't smaller than any existing entry.
+*/
+
+static reg_errcode_t
+internal_function
+match_ctx_add_entry (re_match_context_t *mctx, Idx node, Idx str_idx, Idx from,
+		     Idx to)
+{
+  if (mctx->nbkref_ents >= mctx->abkref_ents)
+    {
+      struct re_backref_cache_entry* new_entry;
+      new_entry = re_realloc (mctx->bkref_ents, struct re_backref_cache_entry,
+			      mctx->abkref_ents * 2);
+      if (BE (new_entry == NULL, 0))
+	{
+	  re_free (mctx->bkref_ents);
+	  return REG_ESPACE;
+	}
+      mctx->bkref_ents = new_entry;
+      memset (mctx->bkref_ents + mctx->nbkref_ents, '\0',
+	      sizeof (struct re_backref_cache_entry) * mctx->abkref_ents);
+      mctx->abkref_ents *= 2;
+    }
+  if (mctx->nbkref_ents > 0
+      && mctx->bkref_ents[mctx->nbkref_ents - 1].str_idx == str_idx)
+    mctx->bkref_ents[mctx->nbkref_ents - 1].more = 1;
+
+  mctx->bkref_ents[mctx->nbkref_ents].node = node;
+  mctx->bkref_ents[mctx->nbkref_ents].str_idx = str_idx;
+  mctx->bkref_ents[mctx->nbkref_ents].subexp_from = from;
+  mctx->bkref_ents[mctx->nbkref_ents].subexp_to = to;
+
+  /* This is a cache that saves negative results of check_dst_limits_calc_pos.
+     If bit N is clear, means that this entry won't epsilon-transition to
+     an OP_OPEN_SUBEXP or OP_CLOSE_SUBEXP for the N+1-th subexpression.  If
+     it is set, check_dst_limits_calc_pos_1 will recurse and try to find one
+     such node.
+
+     A backreference does not epsilon-transition unless it is empty, so set
+     to all zeros if FROM != TO.  */
+  mctx->bkref_ents[mctx->nbkref_ents].eps_reachable_subexps_map
+    = (from == to ? -1 : 0);
+
+  mctx->bkref_ents[mctx->nbkref_ents++].more = 0;
+  if (mctx->max_mb_elem_len < to - from)
+    mctx->max_mb_elem_len = to - from;
+  return REG_NOERROR;
+}
+
+/* Return the first entry with the same str_idx, or REG_MISSING if none is
+   found.  Note that MCTX->BKREF_ENTS is already sorted by MCTX->STR_IDX.  */
+
+static Idx
+internal_function
+search_cur_bkref_entry (const re_match_context_t *mctx, Idx str_idx)
+{
+  Idx left, right, mid, last;
+  last = right = mctx->nbkref_ents;
+  for (left = 0; left < right;)
+    {
+      mid = (left + right) / 2;
+      if (mctx->bkref_ents[mid].str_idx < str_idx)
+	left = mid + 1;
+      else
+	right = mid;
+    }
+  if (left < last && mctx->bkref_ents[left].str_idx == str_idx)
+    return left;
+  else
+    return REG_MISSING;
+}
+
+/* Register the node NODE, whose type is OP_OPEN_SUBEXP, and which matches
+   at STR_IDX.  */
+
+static reg_errcode_t
+internal_function
+match_ctx_add_subtop (re_match_context_t *mctx, Idx node, Idx str_idx)
+{
+#ifdef DEBUG
+  assert (mctx->sub_tops != NULL);
+  assert (mctx->asub_tops > 0);
+#endif
+  if (BE (mctx->nsub_tops == mctx->asub_tops, 0))
+    {
+      Idx new_asub_tops = mctx->asub_tops * 2;
+      re_sub_match_top_t **new_array = re_realloc (mctx->sub_tops,
+						   re_sub_match_top_t *,
+						   new_asub_tops);
+      if (BE (new_array == NULL, 0))
+	return REG_ESPACE;
+      mctx->sub_tops = new_array;
+      mctx->asub_tops = new_asub_tops;
+    }
+  mctx->sub_tops[mctx->nsub_tops] = calloc (1, sizeof (re_sub_match_top_t));
+  if (BE (mctx->sub_tops[mctx->nsub_tops] == NULL, 0))
+    return REG_ESPACE;
+  mctx->sub_tops[mctx->nsub_tops]->node = node;
+  mctx->sub_tops[mctx->nsub_tops++]->str_idx = str_idx;
+  return REG_NOERROR;
+}
+
+/* Register the node NODE, whose type is OP_CLOSE_SUBEXP, and which matches
+   at STR_IDX, whose corresponding OP_OPEN_SUBEXP is SUB_TOP.  */
+
+static re_sub_match_last_t *
+internal_function
+match_ctx_add_sublast (re_sub_match_top_t *subtop, Idx node, Idx str_idx)
+{
+  re_sub_match_last_t *new_entry;
+  if (BE (subtop->nlasts == subtop->alasts, 0))
+    {
+      Idx new_alasts = 2 * subtop->alasts + 1;
+      re_sub_match_last_t **new_array = re_realloc (subtop->lasts,
+						    re_sub_match_last_t *,
+						    new_alasts);
+      if (BE (new_array == NULL, 0))
+	return NULL;
+      subtop->lasts = new_array;
+      subtop->alasts = new_alasts;
+    }
+  new_entry = calloc (1, sizeof (re_sub_match_last_t));
+  if (BE (new_entry != NULL, 1))
+    {
+      subtop->lasts[subtop->nlasts] = new_entry;
+      new_entry->node = node;
+      new_entry->str_idx = str_idx;
+      ++subtop->nlasts;
+    }
+  return new_entry;
+}
+
+static void
+internal_function
+sift_ctx_init (re_sift_context_t *sctx, re_dfastate_t **sifted_sts,
+	       re_dfastate_t **limited_sts, Idx last_node, Idx last_str_idx)
+{
+  sctx->sifted_states = sifted_sts;
+  sctx->limited_states = limited_sts;
+  sctx->last_node = last_node;
+  sctx->last_str_idx = last_str_idx;
+  re_node_set_init_empty (&sctx->limits);
+}
diff --git a/include/grub/gnulib-wrap.h b/include/grub/gnulib-wrap.h
new file mode 100644
index 000000000..0e9235c18
--- /dev/null
+++ b/include/grub/gnulib-wrap.h
@@ -0,0 +1,181 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/>.
+ */
+
+#ifndef GRUB_GNULIB_WRAP_H
+#define GRUB_GNULIB_WRAP_H	1
+
+#include <grub/mm.h>
+#include <grub/misc.h>
+
+typedef grub_size_t size_t;
+typedef int bool;
+static const bool true = 1;
+static const bool false = 0;
+
+#define assert(x) assert_real(__FILE__, __LINE__, x)
+
+static inline void
+assert_real (const char *file, int line, int cond)
+{
+  if (!cond)
+    grub_fatal ("Assertion failed at %s:%d\n", file, line);
+}
+
+static inline char *
+locale_charset (void)
+{
+  return "UTF-8";
+}
+
+#define MB_CUR_MAX 6
+
+static inline void *
+realloc (void *ptr, grub_size_t size)
+{
+  return grub_realloc (ptr, size);
+}
+
+static inline int
+toupper (int c)
+{
+  return grub_toupper (c);
+}
+
+static inline int 
+isspace (int c)
+{
+  return grub_isspace (c);
+}
+
+static inline int 
+isdigit (int c)
+{
+  return grub_isdigit (c);
+}
+
+static inline int
+islower (int c)
+{
+  return (c >= 'a' && c <= 'z');
+}
+
+static inline int
+isupper (int c)
+{
+  return (c >= 'A' && c <= 'Z');
+}
+
+static inline int
+isxdigit (int c)
+{
+  return (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')
+    || (c >= '0' && c <= '9');
+}
+
+static inline int 
+isprint (int c)
+{
+  return grub_isprint (c);
+}
+
+static inline int 
+iscntrl (int c)
+{
+  return !grub_isprint (c);
+}
+
+static inline int 
+isgraph (int c)
+{
+  return grub_isprint (c) && !grub_isspace (c);
+}
+
+static inline int
+isalnum (int c)
+{
+  return grub_isalpha (c) || grub_isdigit (c);
+}
+
+static inline int 
+ispunct (int c)
+{
+  return grub_isprint (c) && !grub_isspace (c) && !isalnum (c);
+}
+
+static inline int 
+isalpha (int c)
+{
+  return grub_isalpha (c);
+}
+
+static inline int
+tolower (int c)
+{
+  return grub_tolower (c);
+}
+
+static inline grub_size_t
+strlen (const char *s)
+{
+  return grub_strlen (s);
+}
+
+static inline int 
+strcmp (const char *s1, const char *s2)
+{
+  return grub_strcmp (s1, s2);
+}
+
+static inline void
+abort (void)
+{
+  grub_abort ();
+}
+
+static inline void 
+free (void *ptr)
+{
+  grub_free (ptr);
+}
+
+static inline void *
+malloc (grub_size_t size)
+{
+  return grub_malloc (size);
+}
+
+static inline void *
+calloc (grub_size_t size, grub_size_t nelem)
+{
+  return grub_zalloc (size * nelem);
+}
+
+#define ULONG_MAX GRUB_ULONG_MAX
+#define UCHAR_MAX 0xff
+
+/* UCS-4.  */
+typedef grub_uint32_t wchar_t;
+
+#undef __libc_lock_init
+#define __libc_lock_init(x)
+#undef __libc_lock_lock
+#define __libc_lock_lock(x)
+#undef __libc_lock_unlock
+#define __libc_lock_unlock(x)
+
+#endif
diff --git a/include/grub/regex.h b/include/grub/regex.h
new file mode 100644
index 000000000..091342d0b
--- /dev/null
+++ b/include/grub/regex.h
@@ -0,0 +1,675 @@
+/* Definitions for data structures and routines for the regular
+   expression library.
+   Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003,2005,2006
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along
+   with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+#ifndef _REGEX_H
+#define _REGEX_H 1
+
+#include <grub/gnulib-wrap.h>
+
+/* Allow the use in C++ code.  */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Define __USE_GNU_REGEX to declare GNU extensions that violate the
+   POSIX name space rules.  */
+#undef __USE_GNU_REGEX
+#if (defined _GNU_SOURCE					\
+     || (!defined _POSIX_C_SOURCE && !defined _POSIX_SOURCE	\
+	 && !defined _XOPEN_SOURCE))
+# define __USE_GNU_REGEX 1
+#endif
+
+#ifdef _REGEX_LARGE_OFFSETS
+
+/* Use types and values that are wide enough to represent signed and
+   unsigned byte offsets in memory.  This currently works only when
+   the regex code is used outside of the GNU C library; it is not yet
+   supported within glibc itself, and glibc users should not define
+   _REGEX_LARGE_OFFSETS.  */
+
+/* The type of the offset of a byte within a string.
+   For historical reasons POSIX 1003.1-2004 requires that regoff_t be
+   at least as wide as off_t.  However, many common POSIX platforms set
+   regoff_t to the more-sensible ssize_t and the Open Group has
+   signalled its intention to change the requirement to be that
+   regoff_t be at least as wide as ptrdiff_t and ssize_t; see XBD ERN
+   60 (2005-08-25).  We don't know of any hosts where ssize_t or
+   ptrdiff_t is wider than ssize_t, so ssize_t is safe.  */
+typedef ssize_t regoff_t;
+
+/* The type of nonnegative object indexes.  Traditionally, GNU regex
+   uses 'int' for these.  Code that uses __re_idx_t should work
+   regardless of whether the type is signed.  */
+typedef size_t __re_idx_t;
+
+/* The type of object sizes.  */
+typedef size_t __re_size_t;
+
+/* The type of object sizes, in places where the traditional code
+   uses unsigned long int.  */
+typedef size_t __re_long_size_t;
+
+#else
+
+/* Use types that are binary-compatible with the traditional GNU regex
+   implementation, which mishandles strings longer than INT_MAX.  */
+
+typedef int regoff_t;
+typedef int __re_idx_t;
+typedef unsigned int __re_size_t;
+typedef unsigned long int __re_long_size_t;
+
+#endif
+
+/* The following two types have to be signed and unsigned integer type
+   wide enough to hold a value of a pointer.  For most ANSI compilers
+   ptrdiff_t and size_t should be likely OK.  Still size of these two
+   types is 2 for Microsoft C.  Ugh... */
+typedef long int s_reg_t;
+typedef unsigned long int active_reg_t;
+
+/* The following bits are used to determine the regexp syntax we
+   recognize.  The set/not-set meanings are chosen so that Emacs syntax
+   remains the value 0.  The bits are given in alphabetical order, and
+   the definitions shifted by one from the previous bit; thus, when we
+   add or remove a bit, only one other definition need change.  */
+typedef unsigned long int reg_syntax_t;
+
+#ifdef __USE_GNU_REGEX
+
+/* If this bit is not set, then \ inside a bracket expression is literal.
+   If set, then such a \ quotes the following character.  */
+# define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1)
+
+/* If this bit is not set, then + and ? are operators, and \+ and \? are
+     literals.
+   If set, then \+ and \? are operators and + and ? are literals.  */
+# define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)
+
+/* If this bit is set, then character classes are supported.  They are:
+     [:alpha:], [:upper:], [:lower:],  [:digit:], [:alnum:], [:xdigit:],
+     [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:].
+   If not set, then character classes are not supported.  */
+# define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1)
+
+/* If this bit is set, then ^ and $ are always anchors (outside bracket
+     expressions, of course).
+   If this bit is not set, then it depends:
+        ^  is an anchor if it is at the beginning of a regular
+           expression or after an open-group or an alternation operator;
+        $  is an anchor if it is at the end of a regular expression, or
+           before a close-group or an alternation operator.
+
+   This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
+   POSIX draft 11.2 says that * etc. in leading positions is undefined.
+   We already implemented a previous draft which made those constructs
+   invalid, though, so we haven't changed the code back.  */
+# define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1)
+
+/* If this bit is set, then special characters are always special
+     regardless of where they are in the pattern.
+   If this bit is not set, then special characters are special only in
+     some contexts; otherwise they are ordinary.  Specifically,
+     * + ? and intervals are only special when not after the beginning,
+     open-group, or alternation operator.  */
+# define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
+
+/* If this bit is set, then *, +, ?, and { cannot be first in an re or
+     immediately after an alternation or begin-group operator.  */
+# define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1)
+
+/* If this bit is set, then . matches newline.
+   If not set, then it doesn't.  */
+# define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1)
+
+/* If this bit is set, then . doesn't match NUL.
+   If not set, then it does.  */
+# define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1)
+
+/* If this bit is set, nonmatching lists [^...] do not match newline.
+   If not set, they do.  */
+# define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)
+
+/* If this bit is set, either \{...\} or {...} defines an
+     interval, depending on RE_NO_BK_BRACES.
+   If not set, \{, \}, {, and } are literals.  */
+# define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
+
+/* If this bit is set, +, ? and | aren't recognized as operators.
+   If not set, they are.  */
+# define RE_LIMITED_OPS (RE_INTERVALS << 1)
+
+/* If this bit is set, newline is an alternation operator.
+   If not set, newline is literal.  */
+# define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1)
+
+/* If this bit is set, then `{...}' defines an interval, and \{ and \}
+     are literals.
+  If not set, then `\{...\}' defines an interval.  */
+# define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1)
+
+/* If this bit is set, (...) defines a group, and \( and \) are literals.
+   If not set, \(...\) defines a group, and ( and ) are literals.  */
+# define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1)
+
+/* If this bit is set, then \<digit> matches <digit>.
+   If not set, then \<digit> is a back-reference.  */
+# define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)
+
+/* If this bit is set, then | is an alternation operator, and \| is literal.
+   If not set, then \| is an alternation operator, and | is literal.  */
+# define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)
+
+/* If this bit is set, then an ending range point collating higher
+     than the starting range point, as in [z-a], is invalid.
+   If not set, then when ending range point collates higher than the
+     starting range point, the range is ignored.  */
+# define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1)
+
+/* If this bit is set, then an unmatched ) is ordinary.
+   If not set, then an unmatched ) is invalid.  */
+# define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1)
+
+/* If this bit is set, succeed as soon as we match the whole pattern,
+   without further backtracking.  */
+# define RE_NO_POSIX_BACKTRACKING (RE_UNMATCHED_RIGHT_PAREN_ORD << 1)
+
+/* If this bit is set, do not process the GNU regex operators.
+   If not set, then the GNU regex operators are recognized. */
+# define RE_NO_GNU_OPS (RE_NO_POSIX_BACKTRACKING << 1)
+
+/* If this bit is set, turn on internal regex debugging.
+   If not set, and debugging was on, turn it off.
+   This only works if regex.c is compiled -DDEBUG.
+   We define this bit always, so that all that's needed to turn on
+   debugging is to recompile regex.c; the calling code can always have
+   this bit set, and it won't affect anything in the normal case. */
+# define RE_DEBUG (RE_NO_GNU_OPS << 1)
+
+/* If this bit is set, a syntactically invalid interval is treated as
+   a string of ordinary characters.  For example, the ERE 'a{1' is
+   treated as 'a\{1'.  */
+# define RE_INVALID_INTERVAL_ORD (RE_DEBUG << 1)
+
+/* If this bit is set, then ignore case when matching.
+   If not set, then case is significant.  */
+# define RE_ICASE (RE_INVALID_INTERVAL_ORD << 1)
+
+/* This bit is used internally like RE_CONTEXT_INDEP_ANCHORS but only
+   for ^, because it is difficult to scan the regex backwards to find
+   whether ^ should be special.  */
+# define RE_CARET_ANCHORS_HERE (RE_ICASE << 1)
+
+/* If this bit is set, then \{ cannot be first in an bre or
+   immediately after an alternation or begin-group operator.  */
+# define RE_CONTEXT_INVALID_DUP (RE_CARET_ANCHORS_HERE << 1)
+
+/* If this bit is set, then no_sub will be set to 1 during
+   re_compile_pattern.  */
+# define RE_NO_SUB (RE_CONTEXT_INVALID_DUP << 1)
+
+#endif /* defined __USE_GNU_REGEX */
+
+/* This global variable defines the particular regexp syntax to use (for
+   some interfaces).  When a regexp is compiled, the syntax used is
+   stored in the pattern buffer, so changing this does not affect
+   already-compiled regexps.  */
+extern reg_syntax_t re_syntax_options;
+
+#ifdef __USE_GNU_REGEX
+/* Define combinations of the above bits for the standard possibilities.
+   (The [[[ comments delimit what gets put into the Texinfo file, so
+   don't delete them!)  */
+/* [[[begin syntaxes]]] */
+# define RE_SYNTAX_EMACS 0
+
+# define RE_SYNTAX_AWK							\
+  (RE_BACKSLASH_ESCAPE_IN_LISTS   | RE_DOT_NOT_NULL			\
+   | RE_NO_BK_PARENS              | RE_NO_BK_REFS			\
+   | RE_NO_BK_VBAR                | RE_NO_EMPTY_RANGES			\
+   | RE_DOT_NEWLINE		  | RE_CONTEXT_INDEP_ANCHORS		\
+   | RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS)
+
+# define RE_SYNTAX_GNU_AWK						\
+  ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG)	\
+   & ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS		\
+       | RE_CONTEXT_INVALID_OPS ))
+
+# define RE_SYNTAX_POSIX_AWK						\
+  (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS		\
+   | RE_INTERVALS	    | RE_NO_GNU_OPS)
+
+# define RE_SYNTAX_GREP							\
+  (RE_BK_PLUS_QM              | RE_CHAR_CLASSES				\
+   | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS				\
+   | RE_NEWLINE_ALT)
+
+# define RE_SYNTAX_EGREP						\
+  (RE_CHAR_CLASSES        | RE_CONTEXT_INDEP_ANCHORS			\
+   | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE			\
+   | RE_NEWLINE_ALT       | RE_NO_BK_PARENS				\
+   | RE_NO_BK_VBAR)
+
+# define RE_SYNTAX_POSIX_EGREP						\
+  (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES			\
+   | RE_INVALID_INTERVAL_ORD)
+
+/* P1003.2/D11.2, section 4.20.7.1, lines 5078ff.  */
+# define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC
+
+# define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC
+
+/* Syntax bits common to both basic and extended POSIX regex syntax.  */
+# define _RE_SYNTAX_POSIX_COMMON					\
+  (RE_CHAR_CLASSES | RE_DOT_NEWLINE      | RE_DOT_NOT_NULL		\
+   | RE_INTERVALS  | RE_NO_EMPTY_RANGES)
+
+# define RE_SYNTAX_POSIX_BASIC						\
+  (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM | RE_CONTEXT_INVALID_DUP)
+
+/* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes
+   RE_LIMITED_OPS, i.e., \? \+ \| are not recognized.  Actually, this
+   isn't minimal, since other operators, such as \`, aren't disabled.  */
+# define RE_SYNTAX_POSIX_MINIMAL_BASIC					\
+  (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS)
+
+# define RE_SYNTAX_POSIX_EXTENDED					\
+  (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS			\
+   | RE_CONTEXT_INDEP_OPS   | RE_NO_BK_BRACES				\
+   | RE_NO_BK_PARENS        | RE_NO_BK_VBAR				\
+   | RE_CONTEXT_INVALID_OPS | RE_UNMATCHED_RIGHT_PAREN_ORD)
+
+/* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INDEP_OPS is
+   removed and RE_NO_BK_REFS is added.  */
+# define RE_SYNTAX_POSIX_MINIMAL_EXTENDED				\
+  (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS			\
+   | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES				\
+   | RE_NO_BK_PARENS        | RE_NO_BK_REFS				\
+   | RE_NO_BK_VBAR	    | RE_UNMATCHED_RIGHT_PAREN_ORD)
+/* [[[end syntaxes]]] */
+
+#endif /* defined __USE_GNU_REGEX */
+
+#ifdef __USE_GNU_REGEX
+
+/* Maximum number of duplicates an interval can allow.  POSIX-conforming
+   systems might define this in <limits.h>, but we want our
+   value, so remove any previous define.  */
+# ifdef RE_DUP_MAX
+#  undef RE_DUP_MAX
+# endif
+
+/* RE_DUP_MAX is 2**15 - 1 because an earlier implementation stored
+   the counter as a 2-byte signed integer.  This is no longer true, so
+   RE_DUP_MAX could be increased to (INT_MAX / 10 - 1), or to
+   ((SIZE_MAX - 2) / 10 - 1) if _REGEX_LARGE_OFFSETS is defined.
+   However, there would be a huge performance problem if someone
+   actually used a pattern like a\{214748363\}, so RE_DUP_MAX retains
+   its historical value.  */
+# define RE_DUP_MAX (0x7fff)
+
+#endif /* defined __USE_GNU_REGEX */
+
+
+/* POSIX `cflags' bits (i.e., information for `regcomp').  */
+
+/* If this bit is set, then use extended regular expression syntax.
+   If not set, then use basic regular expression syntax.  */
+#define REG_EXTENDED 1
+
+/* If this bit is set, then ignore case when matching.
+   If not set, then case is significant.  */
+#define REG_ICASE (1 << 1)
+
+/* If this bit is set, then anchors do not match at newline
+     characters in the string.
+   If not set, then anchors do match at newlines.  */
+#define REG_NEWLINE (1 << 2)
+
+/* If this bit is set, then report only success or fail in regexec.
+   If not set, then returns differ between not matching and errors.  */
+#define REG_NOSUB (1 << 3)
+
+
+/* POSIX `eflags' bits (i.e., information for regexec).  */
+
+/* If this bit is set, then the beginning-of-line operator doesn't match
+     the beginning of the string (presumably because it's not the
+     beginning of a line).
+   If not set, then the beginning-of-line operator does match the
+     beginning of the string.  */
+#define REG_NOTBOL 1
+
+/* Like REG_NOTBOL, except for the end-of-line.  */
+#define REG_NOTEOL (1 << 1)
+
+/* Use PMATCH[0] to delimit the start and end of the search in the
+   buffer.  */
+#define REG_STARTEND (1 << 2)
+
+
+/* If any error codes are removed, changed, or added, update the
+   `__re_error_msgid' table in regcomp.c.  */
+
+typedef enum
+{
+  _REG_ENOSYS = -1,	/* This will never happen for this implementation.  */
+  _REG_NOERROR = 0,	/* Success.  */
+  _REG_NOMATCH,		/* Didn't find a match (for regexec).  */
+
+  /* POSIX regcomp return error codes.  (In the order listed in the
+     standard.)  */
+  _REG_BADPAT,		/* Invalid pattern.  */
+  _REG_ECOLLATE,	/* Invalid collating element.  */
+  _REG_ECTYPE,		/* Invalid character class name.  */
+  _REG_EESCAPE,		/* Trailing backslash.  */
+  _REG_ESUBREG,		/* Invalid back reference.  */
+  _REG_EBRACK,		/* Unmatched left bracket.  */
+  _REG_EPAREN,		/* Parenthesis imbalance.  */
+  _REG_EBRACE,		/* Unmatched \{.  */
+  _REG_BADBR,		/* Invalid contents of \{\}.  */
+  _REG_ERANGE,		/* Invalid range end.  */
+  _REG_ESPACE,		/* Ran out of memory.  */
+  _REG_BADRPT,		/* No preceding re for repetition op.  */
+
+  /* Error codes we've added.  */
+  _REG_EEND,		/* Premature end.  */
+  _REG_ESIZE,		/* Compiled pattern bigger than 2^16 bytes.  */
+  _REG_ERPAREN		/* Unmatched ) or \); not returned from regcomp.  */
+} reg_errcode_t;
+
+#ifdef _XOPEN_SOURCE
+# define REG_ENOSYS	_REG_ENOSYS
+#endif
+#define REG_NOERROR	_REG_NOERROR
+#define REG_NOMATCH	_REG_NOMATCH
+#define REG_BADPAT	_REG_BADPAT
+#define REG_ECOLLATE	_REG_ECOLLATE
+#define REG_ECTYPE	_REG_ECTYPE
+#define REG_EESCAPE	_REG_EESCAPE
+#define REG_ESUBREG	_REG_ESUBREG
+#define REG_EBRACK	_REG_EBRACK
+#define REG_EPAREN	_REG_EPAREN
+#define REG_EBRACE	_REG_EBRACE
+#define REG_BADBR	_REG_BADBR
+#define REG_ERANGE	_REG_ERANGE
+#define REG_ESPACE	_REG_ESPACE
+#define REG_BADRPT	_REG_BADRPT
+#define REG_EEND	_REG_EEND
+#define REG_ESIZE	_REG_ESIZE
+#define REG_ERPAREN	_REG_ERPAREN
+
+/* struct re_pattern_buffer normally uses member names like `buffer'
+   that POSIX does not allow.  In POSIX mode these members have names
+   with leading `re_' (e.g., `re_buffer').  */
+#ifdef __USE_GNU_REGEX
+# define _REG_RE_NAME(id) id
+# define _REG_RM_NAME(id) id
+#else
+# define _REG_RE_NAME(id) re_##id
+# define _REG_RM_NAME(id) rm_##id
+#endif
+
+/* The user can specify the type of the re_translate member by
+   defining the macro RE_TRANSLATE_TYPE, which defaults to unsigned
+   char *.  This pollutes the POSIX name space, so in POSIX mode just
+   use unsigned char *.  */
+#ifdef __USE_GNU_REGEX
+# ifndef RE_TRANSLATE_TYPE
+#  define RE_TRANSLATE_TYPE unsigned char *
+# endif
+# define REG_TRANSLATE_TYPE RE_TRANSLATE_TYPE
+#else
+# define REG_TRANSLATE_TYPE unsigned char *
+#endif
+
+/* This data structure represents a compiled pattern.  Before calling
+   the pattern compiler, the fields `buffer', `allocated', `fastmap',
+   `translate', and `no_sub' can be set.  After the pattern has been
+   compiled, the `re_nsub' field is available.  All other fields are
+   private to the regex routines.  */
+
+struct re_pattern_buffer
+{
+  /* Space that holds the compiled pattern.  It is declared as
+     `unsigned char *' because its elements are sometimes used as
+     array indexes.  */
+  unsigned char *_REG_RE_NAME (buffer);
+
+  /* Number of bytes to which `buffer' points.  */
+  __re_long_size_t _REG_RE_NAME (allocated);
+
+  /* Number of bytes actually used in `buffer'.  */
+  __re_long_size_t _REG_RE_NAME (used);
+
+  /* Syntax setting with which the pattern was compiled.  */
+  reg_syntax_t _REG_RE_NAME (syntax);
+
+  /* Pointer to a fastmap, if any, otherwise zero.  re_search uses the
+     fastmap, if there is one, to skip over impossible starting points
+     for matches.  */
+  char *_REG_RE_NAME (fastmap);
+
+  /* Either a translate table to apply to all characters before
+     comparing them, or zero for no translation.  The translation is
+     applied to a pattern when it is compiled and to a string when it
+     is matched.  */
+  REG_TRANSLATE_TYPE _REG_RE_NAME (translate);
+
+  /* Number of subexpressions found by the compiler.  */
+  size_t re_nsub;
+
+  /* Zero if this pattern cannot match the empty string, one else.
+     Well, in truth it's used only in `re_search_2', to see whether or
+     not we should use the fastmap, so we don't set this absolutely
+     perfectly; see `re_compile_fastmap' (the `duplicate' case).  */
+  unsigned int _REG_RE_NAME (can_be_null) : 1;
+
+  /* If REGS_UNALLOCATED, allocate space in the `regs' structure
+     for `max (RE_NREGS, re_nsub + 1)' groups.
+     If REGS_REALLOCATE, reallocate space if necessary.
+     If REGS_FIXED, use what's there.  */
+#ifdef __USE_GNU_REGEX
+# define REGS_UNALLOCATED 0
+# define REGS_REALLOCATE 1
+# define REGS_FIXED 2
+#endif
+  unsigned int _REG_RE_NAME (regs_allocated) : 2;
+
+  /* Set to zero when `regex_compile' compiles a pattern; set to one
+     by `re_compile_fastmap' if it updates the fastmap.  */
+  unsigned int _REG_RE_NAME (fastmap_accurate) : 1;
+
+  /* If set, `re_match_2' does not return information about
+     subexpressions.  */
+  unsigned int _REG_RE_NAME (no_sub) : 1;
+
+  /* If set, a beginning-of-line anchor doesn't match at the beginning
+     of the string.  */
+  unsigned int _REG_RE_NAME (not_bol) : 1;
+
+  /* Similarly for an end-of-line anchor.  */
+  unsigned int _REG_RE_NAME (not_eol) : 1;
+
+  /* If true, an anchor at a newline matches.  */
+  unsigned int _REG_RE_NAME (newline_anchor) : 1;
+
+/* [[[end pattern_buffer]]] */
+};
+
+typedef struct re_pattern_buffer regex_t;
+
+/* This is the structure we store register match data in.  See
+   regex.texinfo for a full description of what registers match.  */
+struct re_registers
+{
+  __re_size_t _REG_RM_NAME (num_regs);
+  regoff_t *_REG_RM_NAME (start);
+  regoff_t *_REG_RM_NAME (end);
+};
+
+
+/* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer,
+   `re_match_2' returns information about at least this many registers
+   the first time a `regs' structure is passed.  */
+#if !defined RE_NREGS && defined __USE_GNU_REGEX
+# define RE_NREGS 30
+#endif
+
+
+/* POSIX specification for registers.  Aside from the different names than
+   `re_registers', POSIX uses an array of structures, instead of a
+   structure of arrays.  */
+typedef struct
+{
+  regoff_t rm_so;  /* Byte offset from string's start to substring's start.  */
+  regoff_t rm_eo;  /* Byte offset from string's start to substring's end.  */
+} regmatch_t;
+
+/* Declarations for routines.  */
+
+/* Sets the current default syntax to SYNTAX, and return the old syntax.
+   You can also simply assign to the `re_syntax_options' variable.  */
+extern reg_syntax_t re_set_syntax (reg_syntax_t __syntax);
+
+/* Compile the regular expression PATTERN, with length LENGTH
+   and syntax given by the global `re_syntax_options', into the buffer
+   BUFFER.  Return NULL if successful, and an error string if not.  */
+extern const char *re_compile_pattern (const char *__pattern, size_t __length,
+				       struct re_pattern_buffer *__buffer);
+
+
+/* Compile a fastmap for the compiled pattern in BUFFER; used to
+   accelerate searches.  Return 0 if successful and -2 if was an
+   internal error.  */
+extern int re_compile_fastmap (struct re_pattern_buffer *__buffer);
+
+
+/* Search in the string STRING (with length LENGTH) for the pattern
+   compiled into BUFFER.  Start searching at position START, for RANGE
+   characters.  Return the starting position of the match, -1 for no
+   match, or -2 for an internal error.  Also return register
+   information in REGS (if REGS and BUFFER->no_sub are nonzero).  */
+extern regoff_t re_search (struct re_pattern_buffer *__buffer,
+			   const char *__string, __re_idx_t __length,
+			   __re_idx_t __start, regoff_t __range,
+			   struct re_registers *__regs);
+
+
+/* Like `re_search', but search in the concatenation of STRING1 and
+   STRING2.  Also, stop searching at index START + STOP.  */
+extern regoff_t re_search_2 (struct re_pattern_buffer *__buffer,
+			     const char *__string1, __re_idx_t __length1,
+			     const char *__string2, __re_idx_t __length2,
+			     __re_idx_t __start, regoff_t __range,
+			     struct re_registers *__regs,
+			     __re_idx_t __stop);
+
+
+/* Like `re_search', but return how many characters in STRING the regexp
+   in BUFFER matched, starting at position START.  */
+extern regoff_t re_match (struct re_pattern_buffer *__buffer,
+			  const char *__string, __re_idx_t __length,
+			  __re_idx_t __start, struct re_registers *__regs);
+
+
+/* Relates to `re_match' as `re_search_2' relates to `re_search'.  */
+extern regoff_t re_match_2 (struct re_pattern_buffer *__buffer,
+			    const char *__string1, __re_idx_t __length1,
+			    const char *__string2, __re_idx_t __length2,
+			    __re_idx_t __start, struct re_registers *__regs,
+			    __re_idx_t __stop);
+
+
+/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
+   ENDS.  Subsequent matches using BUFFER and REGS will use this memory
+   for recording register information.  STARTS and ENDS must be
+   allocated with malloc, and must each be at least `NUM_REGS * sizeof
+   (regoff_t)' bytes long.
+
+   If NUM_REGS == 0, then subsequent matches should allocate their own
+   register data.
+
+   Unless this function is called, the first search or match using
+   PATTERN_BUFFER will allocate its own register data, without
+   freeing the old data.  */
+extern void re_set_registers (struct re_pattern_buffer *__buffer,
+			      struct re_registers *__regs,
+			      __re_size_t __num_regs,
+			      regoff_t *__starts, regoff_t *__ends);
+
+#if defined _REGEX_RE_COMP || defined _LIBC
+# ifndef _CRAY
+/* 4.2 bsd compatibility.  */
+extern char *re_comp (const char *);
+extern int re_exec (const char *);
+# endif
+#endif
+
+/* GCC 2.95 and later have "__restrict"; C99 compilers have
+   "restrict", and "configure" may have defined "restrict".
+   Other compilers use __restrict, __restrict__, and _Restrict, and
+   'configure' might #define 'restrict' to those words, so pick a
+   different name.  */
+#ifndef _Restrict_
+# if 199901L <= __STDC_VERSION__
+#  define _Restrict_ restrict
+# elif 2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__)
+#  define _Restrict_ __restrict
+# else
+#  define _Restrict_
+# endif
+#endif
+/* gcc 3.1 and up support the [restrict] syntax.  Don't trust
+   sys/cdefs.h's definition of __restrict_arr, though, as it
+   mishandles gcc -ansi -pedantic.  */
+#ifndef _Restrict_arr_
+# if ((199901L <= __STDC_VERSION__					\
+       || ((3 < __GNUC__ || (3 == __GNUC__ && 1 <= __GNUC_MINOR__))	\
+	   && !__STRICT_ANSI__))					\
+      && !defined __GNUG__)
+#  define _Restrict_arr_ _Restrict_
+# else
+#  define _Restrict_arr_
+# endif
+#endif
+
+/* POSIX compatibility.  */
+extern int regcomp (regex_t *_Restrict_ __preg,
+		    const char *_Restrict_ __pattern,
+		    int __cflags);
+
+extern int regexec (const regex_t *_Restrict_ __preg,
+		    const char *_Restrict_ __string, size_t __nmatch,
+		    regmatch_t __pmatch[_Restrict_arr_],
+		    int __eflags);
+
+extern size_t regerror (int __errcode, const regex_t *_Restrict_ __preg,
+			char *_Restrict_ __errbuf, size_t __errbuf_size);
+
+extern void regfree (regex_t *__preg);
+
+
+#ifdef __cplusplus
+}
+#endif	/* C++ */
+
+#endif /* regex.h */

From 6392d412a0cf04ea8db9f3d91dfc3b97d22ec853 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 27 Dec 2009 16:53:39 +0100
Subject: [PATCH 0180/1628] Changelog

---
 ChangeLog.io | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 ChangeLog.io

diff --git a/ChangeLog.io b/ChangeLog.io
new file mode 100644
index 000000000..59af361c8
--- /dev/null
+++ b/ChangeLog.io
@@ -0,0 +1,7 @@
+2009-12-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* commands/iorw.c: New file.
+	* conf/i386.rmk (pkglib_MODULES): Add iorw.mod.
+	(iorw_mod_SOURCES): New variable.
+	(iorw_mod_CFLAGS): Likewise.
+	(iorw_mod_LDFLAGS): Likewise.

From 281d82347e4c6fdfe31e5c3a18196f373651af4d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 27 Dec 2009 17:02:03 +0100
Subject: [PATCH 0181/1628] ChangeLog

---
 ChangeLog.setpci | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 ChangeLog.setpci

diff --git a/ChangeLog.setpci b/ChangeLog.setpci
new file mode 100644
index 000000000..e488379ce
--- /dev/null
+++ b/ChangeLog.setpci
@@ -0,0 +1,9 @@
+2009-12-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	setpci support.
+
+	* commands/setpci.c: New file.
+	* conf/i386.rmk (pkglib_MODULES): Add setpci.mod.
+	(setpci_mod_SOURCES): New variable.
+	(setpci_mod_CFLAGS): Likewise.
+	(setpci_mod_LDFLAGS): Likewise.

From a2b4c09b1c48c5e3b8958291a06c2ee651b5a57d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 27 Dec 2009 22:24:46 +0100
Subject: [PATCH 0182/1628] Don't destroy NULL view

---
 gfxmenu/view.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gfxmenu/view.c b/gfxmenu/view.c
index 7d9bb1cd0..e2348b6ef 100644
--- a/gfxmenu/view.c
+++ b/gfxmenu/view.c
@@ -136,6 +136,8 @@ grub_gfxmenu_view_new (const char *theme_path, grub_gfxmenu_model_t model)
 void
 grub_gfxmenu_view_destroy (grub_gfxmenu_view_t view)
 {
+  if (!view)
+    return;
   grub_video_bitmap_destroy (view->desktop_image);
   if (view->terminal_box)
     view->terminal_box->destroy (view->terminal_box);

From 45a8e94c9ceb0a29f9c4b8e0cb1356af9fd5aa4d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 28 Dec 2009 01:06:48 +0100
Subject: [PATCH 0183/1628] Ensure embeded config finishes with \0

---
 util/grub-mkrawimage.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 8186c8601..c5af6ad82 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -106,7 +106,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 {
   char *kernel_img, *core_img;
   size_t kernel_size, total_module_size, core_size;
-  size_t memdisk_size = 0, font_size = 0, config_size = 0;
+  size_t memdisk_size = 0, font_size = 0, config_size = 0, config_size_pure = 0;
   char *kernel_path;
   size_t offset;
   struct grub_util_path_list *path_list, *p, *next;
@@ -134,7 +134,8 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
   if (config_path)
     {
-      config_size = ALIGN_UP(grub_util_get_image_size (config_path) + 1, 4);
+      config_size_pure = grub_util_get_image_size (config_path) + 1;
+      config_size = ALIGN_UP(config_size_pure, 4);
       grub_util_info ("the size of config file is 0x%x", config_size);
       total_module_size += config_size + sizeof (struct grub_module_header);
     }
@@ -218,8 +219,8 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       offset += sizeof (*header);
 
       grub_util_load_image (config_path, kernel_img + offset);
+      *(kernel_img + offset + config_size_pure - 1) = 0;
       offset += config_size;
-      *(kernel_img + offset - 1) = 0;
     }
 
   grub_util_info ("kernel_img=%p, kernel_size=0x%x", kernel_img, kernel_size);

From 94c201f71436ecfc131ca2cbac9a4497ffb6822c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 28 Dec 2009 01:07:18 +0100
Subject: [PATCH 0184/1628] Add forgotten config_opt parameter

---
 util/grub-install.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/grub-install.in b/util/grub-install.in
index c59065072..ad01ff6fc 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -347,7 +347,7 @@ if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}"
     $grub_setup ${setup_verbose} ${setup_force} --directory=${grubdir} --device-map=${device_map} \
         ${install_device} || exit 1
 elif [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
-    $grub_mkimage -f ${font} -d ${pkglibdir} -O elf --output=/boot/grub.elf --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
+    $grub_mkimage ${config_opt} -f ${font} -d ${pkglibdir} -O elf --output=/boot/grub.elf --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 else
     $grub_mkimage ${config_opt} -d ${pkglibdir} --output=/boot/multiboot.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 fi

From 7b74857658250b261fa7b89e27c405ceaf95f16e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 28 Dec 2009 14:02:23 +0100
Subject: [PATCH 0185/1628] Search hinting support

---
 commands/search.c      | 24 ++++++++++++++++++------
 commands/search_wrap.c | 11 +++++++----
 include/grub/search.h  |  9 ++++++---
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/commands/search.c b/commands/search.c
index 01e83739b..c3626d352 100644
--- a/commands/search.c
+++ b/commands/search.c
@@ -30,7 +30,8 @@
 #include <grub/i18n.h>
 
 void
-FUNC_NAME (const char *key, const char *var, int no_floppy)
+FUNC_NAME (const char *key, const char *var, int no_floppy,
+	   const char **hints, unsigned nhints)
 {
   int count = 0;
   char *buf = NULL;
@@ -118,22 +119,32 @@ FUNC_NAME (const char *key, const char *var, int no_floppy)
     return (found && var);
   }
 
+  auto void try (void);
+  void try (void)    
+  {
+    unsigned i;
+    for (i = 0; i < nhints; i++)
+      if (iterate_device (hints[i]))
+	return;
+    grub_device_iterate (iterate_device);
+  }
+
   /* First try without autoloading if we're setting variable. */
   if (var)
     {
       saved_autoload = grub_fs_autoload_hook;
       grub_fs_autoload_hook = 0;
-      grub_device_iterate (iterate_device);
+      try ();
 
       /* Restore autoload hook.  */
       grub_fs_autoload_hook = saved_autoload;
 
       /* Retry with autoload if nothing found.  */
       if (grub_errno == GRUB_ERR_NONE && count == 0)
-	grub_device_iterate (iterate_device);
+	try ();
     }
   else
-    grub_device_iterate (iterate_device);
+    try ();
 
   grub_free (buf);
 
@@ -148,7 +159,8 @@ grub_cmd_do_search (grub_command_t cmd __attribute__ ((unused)), int argc,
   if (argc == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "no argument specified");
 
-  FUNC_NAME (args[0], argc == 1 ? 0 : args[1], 0);
+  FUNC_NAME (args[0], argc == 1 ? 0 : args[1], 0, (const char **) (args + 2),
+	     argc > 2 ? argc - 2 : 0);
 
   return grub_errno;
 }
@@ -165,7 +177,7 @@ GRUB_MOD_INIT(search_fs_label)
 {
   cmd =
     grub_register_command (COMMAND_NAME, grub_cmd_do_search,
-			   "NAME [VARIABLE]",
+			   "NAME [VARIABLE] [HINTS]",
 			   "Search devices by " SEARCH_TARGET "."
 			   " If VARIABLE is specified, "
 			   "the first device found is set to a variable.");
diff --git a/commands/search_wrap.c b/commands/search_wrap.c
index 2891d85d7..eb9279e87 100644
--- a/commands/search_wrap.c
+++ b/commands/search_wrap.c
@@ -62,11 +62,14 @@ grub_cmd_search (grub_extcmd_t cmd, int argc, char **args)
     var = state[SEARCH_SET].arg ? state[SEARCH_SET].arg : "root";
 
   if (state[SEARCH_LABEL].set)
-    grub_search_label (args[0], var, state[SEARCH_NO_FLOPPY].set);
+    grub_search_label (args[0], var, state[SEARCH_NO_FLOPPY].set, 
+		       (const char **) (args + 1), argc - 1);
   else if (state[SEARCH_FS_UUID].set)
-    grub_search_fs_uuid (args[0], var, state[SEARCH_NO_FLOPPY].set);
+    grub_search_fs_uuid (args[0], var, state[SEARCH_NO_FLOPPY].set,
+			 (const char **) (args + 1), argc - 1);
   else if (state[SEARCH_FILE].set)
-    grub_search_fs_file (args[0], var, state[SEARCH_NO_FLOPPY].set);
+    grub_search_fs_file (args[0], var, state[SEARCH_NO_FLOPPY].set, 
+			 (const char **) (args + 1), argc - 1);
   else
     return grub_error (GRUB_ERR_INVALID_COMMAND, "unspecified search type");
 
@@ -80,7 +83,7 @@ GRUB_MOD_INIT(search)
   cmd =
     grub_register_extcmd ("search", grub_cmd_search,
 			  GRUB_COMMAND_FLAG_BOTH,
-			  N_("search [-f|-l|-u|-s|-n] NAME"),
+			  N_("[-f|-l|-u|-s|-n] NAME [HINTS]"),
 			  N_("Search devices by file, filesystem label"
 			     " or filesystem UUID."
 			     " If --set is specified, the first device found is"
diff --git a/include/grub/search.h b/include/grub/search.h
index e8f9db285..3c56f0305 100644
--- a/include/grub/search.h
+++ b/include/grub/search.h
@@ -19,8 +19,11 @@
 #ifndef GRUB_SEARCH_HEADER
 #define GRUB_SEARCH_HEADER 1
 
-void grub_search_fs_file (const char *key, const char *var, int no_floppy);
-void grub_search_fs_uuid (const char *key, const char *var, int no_floppy);
-void grub_search_label (const char *key, const char *var, int no_floppy);
+void grub_search_fs_file (const char *key, const char *var, int no_floppy,
+			  const char **hints, unsigned nhints);
+void grub_search_fs_uuid (const char *key, const char *var, int no_floppy,
+			  const char **hints, unsigned nhints);
+void grub_search_label (const char *key, const char *var, int no_floppy,
+			const char **hints, unsigned nhints);
 
 #endif

From aa2209101c1f140c562a83449e9c443c2e6c448f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 28 Dec 2009 22:23:28 +0100
Subject: [PATCH 0186/1628] Fix i386-qemu compilation

---
 conf/i386-coreboot.rmk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 1efea8afb..6f078a256 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -80,7 +80,8 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
 	machine/boot.h machine/console.h machine/init.h \
-	machine/memory.h machine/loader.h list.h handler.h command.h i18n.h
+	machine/memory.h machine/loader.h list.h handler.h command.h i18n.h \
+	env_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR)

From dccad19408df39cdde9a4c9422bc25dfacfa303c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 28 Dec 2009 22:37:36 +0100
Subject: [PATCH 0187/1628] Fix compilation on x86_64-efi

---
 commands/lspci.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/commands/lspci.c b/commands/lspci.c
index c515da762..ab756616a 100644
--- a/commands/lspci.c
+++ b/commands/lspci.c
@@ -171,7 +171,7 @@ grub_lspci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)
 	    {
 	    case GRUB_PCI_ADDR_SPACE_IO:
 	      grub_printf ("\tIO space %d at 0x%llx\n",
-			   ((reg - GRUB_PCI_REG_ADDRESSES)
+			   (unsigned) ((reg - GRUB_PCI_REG_ADDRESSES)
 			    / sizeof (grub_uint32_t)) - 1,
 			   (unsigned long long)
 			   (space & GRUB_PCI_ADDR_IO_MASK));
@@ -184,7 +184,7 @@ grub_lspci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)
 		  space |= ((grub_uint64_t) grub_pci_read (addr)) << 32;
 		  reg += sizeof (grub_uint32_t);
 		  grub_printf ("\t64-bit memory space %d at 0x%016llx [%s]\n",
-			       ((reg - GRUB_PCI_REG_ADDRESSES)
+			       (unsigned) ((reg - GRUB_PCI_REG_ADDRESSES)
 				/ sizeof (grub_uint32_t)) - 2,
 			       (unsigned long long)
 			       (space & GRUB_PCI_ADDR_MEM_MASK),
@@ -194,7 +194,7 @@ grub_lspci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)
 		}
 	      else
 		grub_printf ("\t32-bit memory space %d at 0x%016llx [%s]\n",
-			     ((reg - GRUB_PCI_REG_ADDRESSES)
+			     (unsigned) ((reg - GRUB_PCI_REG_ADDRESSES)
 			      / sizeof (grub_uint32_t)) - 1,
 			     (unsigned long long) 
 			     (space & GRUB_PCI_ADDR_MEM_MASK),

From 8b442f3f4c57caa5244e52f609fc3f6484ff274b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 29 Dec 2009 10:04:06 +0100
Subject: [PATCH 0188/1628] asprintf and snprintf support

---
 commands/ls.c                | 14 ++++---
 commands/memrw.c             |  2 +-
 commands/parttool.c          |  3 +-
 commands/search.c            | 15 ++------
 commands/xnu_uuid.c          | 24 ++++++------
 disk/ata.c                   | 21 +++++++----
 disk/efi/efidisk.c           | 18 +++------
 disk/i386/pc/biosdisk.c      |  3 +-
 disk/raid.c                  |  4 +-
 disk/scsi.c                  |  7 +++-
 disk/usbms.c                 | 10 +++--
 efiemu/main.c                |  3 +-
 fs/ext2.c                    | 15 +++++---
 fs/fat.c                     |  6 +--
 fs/hfs.c                     |  7 ++--
 fs/hfsplus.c                 |  7 ++--
 fs/i386/pc/pxe.c             | 24 +++++-------
 fs/iso9660.c                 | 27 +++++++++-----
 fs/jfs.c                     | 21 +++++------
 fs/ntfs.c                    |  3 +-
 fs/reiserfs.c                | 15 +++++---
 fs/ufs.c                     |  9 ++---
 fs/xfs.c                     | 15 +++++---
 gettext/gettext.c            |  9 ++++-
 hook/datehook.c              |  2 +-
 include/grub/misc.h          |  9 ++++-
 kern/device.c                | 14 +++++--
 kern/dl.c                    |  4 +-
 kern/efi/init.c              |  5 +--
 kern/env.c                   |  9 +----
 kern/err.c                   |  2 +-
 kern/i386/pc/init.c          | 18 ++++++---
 kern/ieee1275/init.c         | 11 +++---
 kern/ieee1275/openfw.c       | 36 ++++++++----------
 kern/misc.c                  | 71 ++++++++++++++++++++++++++++++++----
 kern/sparc64/ieee1275/init.c |  5 +--
 lib/hexdump.c                |  7 ++--
 loader/i386/bsd.c            | 12 ++++--
 loader/i386/linux.c          | 23 +++++-------
 loader/i386/pc/xnu.c         |  4 +-
 loader/i386/xnu.c            | 10 +++--
 loader/xnu.c                 |  3 +-
 normal/autofs.c              |  3 +-
 normal/completion.c          | 28 +++++++-------
 normal/dyncmd.c              |  3 +-
 normal/handler.c             |  3 +-
 normal/main.c                | 29 ++++++++-------
 normal/menu.c                |  2 +-
 normal/menu_text.c           | 21 ++++++-----
 partmap/acorn.c              |  9 +----
 partmap/amiga.c              |  9 +----
 partmap/apple.c              |  9 +----
 partmap/gpt.c                |  9 +----
 partmap/msdos.c              | 14 ++-----
 partmap/sun.c                |  8 +---
 script/execute.c             |  6 +--
 term/gfxterm.c               |  6 +--
 term/ieee1275/ofconsole.c    | 17 +++++----
 term/tparm.c                 |  4 +-
 util/grub-fstest.c           | 34 +++++++++++++----
 60 files changed, 396 insertions(+), 345 deletions(-)

diff --git a/commands/ls.c b/commands/ls.c
index 4b1500398..3b5fe450d 100644
--- a/commands/ls.c
+++ b/commands/ls.c
@@ -86,7 +86,7 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
   int print_files_long (const char *filename,
 			const struct grub_dirhook_info *info)
     {
-      char pathname[grub_strlen (dirname) + grub_strlen (filename) + 1];
+      char *pathname;
 
       if ((! all) && (filename[0] == '.'))
 	return 0;
@@ -96,9 +96,12 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
 	  grub_file_t file;
 
 	  if (dirname[grub_strlen (dirname) - 1] == '/')
-	    grub_sprintf (pathname, "%s%s", dirname, filename);
+	    pathname = grub_asprintf ("%s%s", dirname, filename);
 	  else
-	    grub_sprintf (pathname, "%s/%s", dirname, filename);
+	    pathname = grub_asprintf ("%s/%s", dirname, filename);
+
+	  if (!pathname)
+	    return 1;
 
 	  /* XXX: For ext2fs symlinks are detected as files while they
 	     should be reported as directories.  */
@@ -130,8 +133,9 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
 		  grub_uint32_t whole, fraction;
 
 		  whole = grub_divmod64 (fsize, 100, &fraction);
-		  grub_sprintf (buf, "%u.%02u%c", whole, fraction,
-				grub_human_sizes[units]);
+		  grub_snprintf (buf, sizeof (buf),
+				 "%u.%02u%c", whole, fraction,
+				 grub_human_sizes[units]);
 		  grub_printf ("%-12s", buf);
 		}
 	      else
diff --git a/commands/memrw.c b/commands/memrw.c
index 8e9c3db11..2a34ce8f6 100644
--- a/commands/memrw.c
+++ b/commands/memrw.c
@@ -61,7 +61,7 @@ grub_cmd_read (grub_extcmd_t cmd, int argc, char **argv)
 
   if (cmd->state[0].set)
     {
-      grub_sprintf (buf, "%x", value);
+      grub_snprintf (buf, sizeof (buf), "%x", value);
       grub_env_set (cmd->state[0].arg, buf);
     }
   else
diff --git a/commands/parttool.c b/commands/parttool.c
index 62fe5ad2b..f2eb58927 100644
--- a/commands/parttool.c
+++ b/commands/parttool.c
@@ -182,12 +182,11 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
       {
 	char *filename;
 
-	filename = grub_malloc (grub_strlen (prefix) + sizeof ("/parttool.lst"));
+	filename = grub_asprintf ("%s/parttool.lst", prefix);
 	if (filename)
 	  {
 	    grub_file_t file;
 
-	    grub_sprintf (filename, "%s/parttool.lst", prefix);
 	    file = grub_file_open (filename);
 	    if (file)
 	      {
diff --git a/commands/search.c b/commands/search.c
index 01e83739b..78d73ba6a 100644
--- a/commands/search.c
+++ b/commands/search.c
@@ -33,7 +33,6 @@ void
 FUNC_NAME (const char *key, const char *var, int no_floppy)
 {
   int count = 0;
-  char *buf = NULL;
   grub_fs_autoload_hook_t saved_autoload;
 
   auto int iterate_device (const char *name);
@@ -48,24 +47,20 @@ FUNC_NAME (const char *key, const char *var, int no_floppy)
 
 #ifdef DO_SEARCH_FILE
       {
-	grub_size_t len;
-	char *p;
+	char *buf;
 	grub_file_t file;
 
-	len = grub_strlen (name) + 2 + grub_strlen (key) + 1;
-	p = grub_realloc (buf, len);
-	if (! p)
+	buf = grub_asprintf ("(%s)%s", name, key);
+	if (! buf)
 	  return 1;
 
-	buf = p;
-	grub_sprintf (buf, "(%s)%s", name, key);
-
 	file = grub_file_open (buf);
 	if (file)
 	  {
 	    found = 1;
 	    grub_file_close (file);
 	  }
+	grub_free (buf);
       }
 #else
       {
@@ -135,8 +130,6 @@ FUNC_NAME (const char *key, const char *var, int no_floppy)
   else
     grub_device_iterate (iterate_device);
 
-  grub_free (buf);
-
   if (grub_errno == GRUB_ERR_NONE && count == 0)
     grub_error (GRUB_ERR_FILE_NOT_FOUND, "no such device: %s", key);
 }
diff --git a/commands/xnu_uuid.c b/commands/xnu_uuid.c
index 31e69ad13..735d999a2 100644
--- a/commands/xnu_uuid.c
+++ b/commands/xnu_uuid.c
@@ -349,18 +349,18 @@ grub_cmd_xnu_uuid (grub_command_t cmd __attribute__ ((unused)),
   grub_memcpy (hashme.prefix, hash_prefix, sizeof (hashme.prefix));
 
   md5 ((char *) &hashme, sizeof (hashme), (char *) xnu_uuid);
-  grub_sprintf (uuid_string,
-		"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-		(unsigned int) xnu_uuid[0], (unsigned int) xnu_uuid[1],
-		(unsigned int) xnu_uuid[2], (unsigned int) xnu_uuid[3],
-		(unsigned int) xnu_uuid[4], (unsigned int) xnu_uuid[5],
-		(unsigned int) ((xnu_uuid[6] & 0xf) | 0x30),
-		(unsigned int) xnu_uuid[7],
-		(unsigned int) ((xnu_uuid[8] & 0x3f) | 0x80),
-		(unsigned int) xnu_uuid[9],
-		(unsigned int) xnu_uuid[10], (unsigned int) xnu_uuid[11],
-		(unsigned int) xnu_uuid[12], (unsigned int) xnu_uuid[13],
-		(unsigned int) xnu_uuid[14], (unsigned int) xnu_uuid[15]);
+  grub_snprintf (uuid_string, sizeof (uuid_string),
+		 "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+		 (unsigned int) xnu_uuid[0], (unsigned int) xnu_uuid[1],
+		 (unsigned int) xnu_uuid[2], (unsigned int) xnu_uuid[3],
+		 (unsigned int) xnu_uuid[4], (unsigned int) xnu_uuid[5],
+		 (unsigned int) ((xnu_uuid[6] & 0xf) | 0x30),
+		 (unsigned int) xnu_uuid[7],
+		 (unsigned int) ((xnu_uuid[8] & 0x3f) | 0x80),
+		 (unsigned int) xnu_uuid[9],
+		 (unsigned int) xnu_uuid[10], (unsigned int) xnu_uuid[11],
+		 (unsigned int) xnu_uuid[12], (unsigned int) xnu_uuid[13],
+		 (unsigned int) xnu_uuid[14], (unsigned int) xnu_uuid[15]);
   for (ptr = uuid_string; *ptr; ptr++)
     *ptr = grub_toupper (*ptr);
   if (argc == 1)
diff --git a/disk/ata.c b/disk/ata.c
index 864ae9488..79d436222 100644
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -648,12 +648,14 @@ grub_ata_iterate (int (*hook) (const char *name))
 
   for (dev = grub_ata_devices; dev; dev = dev->next)
     {
-      char devname[5];
-      grub_sprintf (devname, "ata%d", dev->port * 2 + dev->device);
+      char devname[10];
 
       if (dev->atapi)
 	continue;
 
+      grub_snprintf (devname, sizeof (devname), 
+		     "ata%d", dev->port * 2 + dev->device);
+
       if (hook (devname))
 	return 1;
     }
@@ -668,8 +670,9 @@ grub_ata_open (const char *name, grub_disk_t disk)
 
   for (dev = grub_ata_devices; dev; dev = dev->next)
     {
-      char devname[5];
-      grub_sprintf (devname, "ata%d", dev->port * 2 + dev->device);
+      char devname[10];
+      grub_snprintf (devname, sizeof (devname),
+		     "ata%d", dev->port * 2 + dev->device);
       if (grub_strcmp (name, devname) == 0)
 	break;
     }
@@ -735,8 +738,9 @@ grub_atapi_iterate (int (*hook) (const char *name, int luns))
 
   for (dev = grub_ata_devices; dev; dev = dev->next)
     {
-      char devname[7];
-      grub_sprintf (devname, "ata%d", dev->port * 2 + dev->device);
+      char devname[10];
+      grub_snprintf (devname, sizeof (devname),
+		     "ata%d", dev->port * 2 + dev->device);
 
       if (! dev->atapi)
 	continue;
@@ -808,8 +812,9 @@ grub_atapi_open (const char *name, struct grub_scsi *scsi)
 
   for (dev = grub_ata_devices; dev; dev = dev->next)
     {
-      char devname[7];
-      grub_sprintf (devname, "ata%d", dev->port * 2 + dev->device);
+      char devname[10];
+      grub_snprintf (devname, sizeof (devname),
+		     "ata%d", dev->port * 2 + dev->device);
 
       if (!grub_strcmp (devname, name))
 	{
diff --git a/disk/efi/efidisk.c b/disk/efi/efidisk.c
index de848594a..0b5731c0f 100644
--- a/disk/efi/efidisk.c
+++ b/disk/efi/efidisk.c
@@ -440,7 +440,7 @@ grub_efidisk_iterate (int (*hook) (const char *name))
 
   for (d = fd_devices, count = 0; d; d = d->next, count++)
     {
-      grub_sprintf (buf, "fd%d", count);
+      grub_snprintf (buf, sizeof (buf), "fd%d", count);
       grub_dprintf ("efidisk", "iterating %s\n", buf);
       if (hook (buf))
 	return 1;
@@ -448,7 +448,7 @@ grub_efidisk_iterate (int (*hook) (const char *name))
 
   for (d = hd_devices, count = 0; d; d = d->next, count++)
     {
-      grub_sprintf (buf, "hd%d", count);
+      grub_snprintf (buf, sizeof (buf), "hd%d", count);
       grub_dprintf ("efidisk", "iterating %s\n", buf);
       if (hook (buf))
 	return 1;
@@ -456,7 +456,7 @@ grub_efidisk_iterate (int (*hook) (const char *name))
 
   for (d = cd_devices, count = 0; d; d = d->next, count++)
     {
-      grub_sprintf (buf, "cd%d", count);
+      grub_snprintf (buf, sizeof (buf), "cd%d", count);
       grub_dprintf ("efidisk", "iterating %s\n", buf);
       if (hook (buf))
 	return 1;
@@ -805,18 +805,10 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
 	  return 0;
 	}
 
-      device_name = grub_malloc (grub_strlen (parent->name) + 1
-				 + grub_strlen (partition_name) + 1);
-      if (! device_name)
-	{
-	  grub_free (partition_name);
-	  grub_disk_close (parent);
-	  return 0;
-	}
-
-      grub_sprintf (device_name, "%s,%s", parent->name, partition_name);
+      device_name = grub_asprintf ("%s,%s", parent->name, partition_name);
       grub_free (partition_name);
       grub_disk_close (parent);
+
       return device_name;
     }
   else
diff --git a/disk/i386/pc/biosdisk.c b/disk/i386/pc/biosdisk.c
index af184b1ba..cc3da48d0 100644
--- a/disk/i386/pc/biosdisk.c
+++ b/disk/i386/pc/biosdisk.c
@@ -56,7 +56,8 @@ grub_biosdisk_call_hook (int (*hook) (const char *name), int drive)
 {
   char name[10];
 
-    grub_sprintf (name, (drive & 0x80) ? "hd%d" : "fd%d", drive & (~0x80));
+  grub_snprintf (name, sizeof (name),
+		 (drive & 0x80) ? "hd%d" : "fd%d", drive & (~0x80));
   return hook (name);
 }
 
diff --git a/disk/raid.c b/disk/raid.c
index c48a41d8d..5d4456e93 100644
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -556,7 +556,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
             }
         }
 
-      array->name = grub_malloc (13);
+      array->name = grub_asprintf ("md%d", array->number);
       if (! array->name)
         {
           grub_free (array->uuid);
@@ -565,8 +565,6 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
           return grub_errno;
         }
 
-      grub_sprintf (array->name, "md%d", array->number);
-
       grub_dprintf ("raid", "Found array %s (%s)\n", array->name,
                     scanner_name);
 
diff --git a/disk/scsi.c b/disk/scsi.c
index 21b888559..6717bc351 100644
--- a/disk/scsi.c
+++ b/disk/scsi.c
@@ -197,7 +197,6 @@ grub_scsi_iterate (int (*hook) (const char *name))
 
   int scsi_iterate (const char *name, int luns)
     {
-      char sname[40];
       int i;
 
       /* In case of a single LUN, just return `usbX'.  */
@@ -208,9 +207,13 @@ grub_scsi_iterate (int (*hook) (const char *name))
 	 distinguish it.  */
       for (i = 0; i < luns; i++)
 	{
-	  grub_sprintf (sname, "%s%c", name, 'a' + i);
+	  char *sname;
+	  sname = grub_asprintf ("%s%c", name, 'a' + i);
+	  if (!sname)
+	    return 1;
 	  if (hook (sname))
 	    return 1;
+	  grub_free (sname);
 	}
       return 0;
     }
diff --git a/disk/usbms.c b/disk/usbms.c
index 51e886520..708168e81 100644
--- a/disk/usbms.c
+++ b/disk/usbms.c
@@ -200,11 +200,15 @@ grub_usbms_iterate (int (*hook) (const char *name, int luns))
 
   for (p = grub_usbms_dev_list; p; p = p->next)
     {
-      char devname[20];
-      grub_sprintf (devname, "usb%d", cnt);
+      char *devname;
+      devname = grub_asprintf ("usb%d", cnt);
 
       if (hook (devname, p->luns))
-	return 1;
+	{
+	  grub_free (devname);
+	  return 1;
+	}
+      grub_free (devname);
       cnt++;
     }
 
diff --git a/efiemu/main.c b/efiemu/main.c
index a3cfdb5b5..70a12080f 100644
--- a/efiemu/main.c
+++ b/efiemu/main.c
@@ -255,12 +255,11 @@ grub_efiemu_autocore (void)
 
   suffix = grub_efiemu_get_default_core_name ();
 
-  filename = grub_malloc (grub_strlen (prefix) + grub_strlen (suffix) + 2);
+  filename = grub_asprintf ("%s/%s", prefix, suffix);
   if (! filename)
     return grub_error (GRUB_ERR_OUT_OF_MEMORY,
 		       "couldn't allocate temporary space");
 
-  grub_sprintf (filename, "%s/%s", prefix, suffix);
 
   err = grub_efiemu_load_file (filename);
   grub_free (filename);
diff --git a/fs/ext2.c b/fs/ext2.c
index e7a20a43b..d00b79b22 100644
--- a/fs/ext2.c
+++ b/fs/ext2.c
@@ -875,12 +875,15 @@ grub_ext2_uuid (grub_device_t device, char **uuid)
   data = grub_ext2_mount (disk);
   if (data)
     {
-      *uuid = grub_malloc (40 + sizeof ('\0'));
-      grub_sprintf (*uuid, "%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
-		    grub_be_to_cpu16 (data->sblock.uuid[0]), grub_be_to_cpu16 (data->sblock.uuid[1]),
-		    grub_be_to_cpu16 (data->sblock.uuid[2]), grub_be_to_cpu16 (data->sblock.uuid[3]),
-		    grub_be_to_cpu16 (data->sblock.uuid[4]), grub_be_to_cpu16 (data->sblock.uuid[5]),
-		    grub_be_to_cpu16 (data->sblock.uuid[6]), grub_be_to_cpu16 (data->sblock.uuid[7]));
+      *uuid = grub_asprintf ("%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
+			     grub_be_to_cpu16 (data->sblock.uuid[0]),
+			     grub_be_to_cpu16 (data->sblock.uuid[1]),
+			     grub_be_to_cpu16 (data->sblock.uuid[2]),
+			     grub_be_to_cpu16 (data->sblock.uuid[3]),
+			     grub_be_to_cpu16 (data->sblock.uuid[4]),
+			     grub_be_to_cpu16 (data->sblock.uuid[5]),
+			     grub_be_to_cpu16 (data->sblock.uuid[6]),
+			     grub_be_to_cpu16 (data->sblock.uuid[7]));
     }
   else
     *uuid = NULL;
diff --git a/fs/fat.c b/fs/fat.c
index 8a0fc0292..a0a40cfab 100644
--- a/fs/fat.c
+++ b/fs/fat.c
@@ -833,9 +833,9 @@ grub_fat_uuid (grub_device_t device, char **uuid)
   data = grub_fat_mount (disk);
   if (data)
     {
-      *uuid = grub_malloc (sizeof ("xxxx-xxxx"));
-      grub_sprintf (*uuid, "%04x-%04x", (grub_uint16_t) (data->uuid >> 16),
-		    (grub_uint16_t) data->uuid);
+      *uuid = grub_asprintf ("%04x-%04x",
+			     (grub_uint16_t) (data->uuid >> 16),
+			     (grub_uint16_t) data->uuid);
     }
   else
     *uuid = NULL;
diff --git a/fs/hfs.c b/fs/hfs.c
index 4dd1e3131..676d7a680 100644
--- a/fs/hfs.c
+++ b/fs/hfs.c
@@ -1082,10 +1082,9 @@ grub_hfs_uuid (grub_device_t device, char **uuid)
   data = grub_hfs_mount (device->disk);
   if (data && data->sblock.num_serial != 0)
     {
-      *uuid = grub_malloc (16 + sizeof ('\0'));
-      grub_sprintf (*uuid, "%016llx",
-		    (unsigned long long)
-		    grub_be_to_cpu64 (data->sblock.num_serial));
+      *uuid = grub_asprintf ("%016llx",
+			     (unsigned long long)
+			     grub_be_to_cpu64 (data->sblock.num_serial));
     }
   else
     *uuid = NULL;
diff --git a/fs/hfsplus.c b/fs/hfsplus.c
index 9310b6502..6556bedaa 100644
--- a/fs/hfsplus.c
+++ b/fs/hfsplus.c
@@ -995,10 +995,9 @@ grub_hfsplus_uuid (grub_device_t device, char **uuid)
   data = grub_hfsplus_mount (disk);
   if (data)
     {
-      *uuid = grub_malloc (16 + sizeof ('\0'));
-      grub_sprintf (*uuid, "%016llx",
-		    (unsigned long long)
-		    grub_be_to_cpu64 (data->volheader.num_serial));
+      *uuid = grub_asprintf ("%016llx",
+			     (unsigned long long)
+			     grub_be_to_cpu64 (data->volheader.num_serial));
     }
   else
     *uuid = NULL;
diff --git a/fs/i386/pc/pxe.c b/fs/i386/pc/pxe.c
index 03385b3e3..60a49fc53 100644
--- a/fs/i386/pc/pxe.c
+++ b/fs/i386/pc/pxe.c
@@ -356,7 +356,8 @@ set_mac_env (grub_uint8_t *mac_addr, grub_size_t mac_len)
 
   for (i = 0; i < mac_len; i++)
     {
-      grub_sprintf (ptr, "%02x:", mac_addr[i] & 0xff);
+      grub_snprintf (ptr, sizeof (buf) - (ptr - buf),
+		     "%02x:", mac_addr[i] & 0xff);
       ptr += (sizeof ("XX:") - 1);
     }
   if (mac_len)
@@ -483,8 +484,8 @@ set_ip_env (char *varname, grub_uint32_t ip)
 {
   char buf[sizeof ("XXX.XXX.XXX.XXX")];
 
-  grub_sprintf (buf, "%d.%d.%d.%d", (ip & 0xff),
-		(ip >> 8) & 0xff, (ip >> 16) & 0xff, (ip >> 24) & 0xff);
+  grub_snprintf (buf, sizeof (buf), "%d.%d.%d.%d", (ip & 0xff),
+		 (ip >> 8) & 0xff, (ip >> 16) & 0xff, (ip >> 24) & 0xff);
   grub_env_set (varname, buf);
 }
 
@@ -500,15 +501,13 @@ write_ip_env (grub_uint32_t *ip, const char *val)
     return 0;
 
   /* Normalize the IP.  */
-  buf = grub_malloc (sizeof ("XXX.XXX.XXX.XXX"));
+  buf = grub_asprintf ("%d.%d.%d.%d", (newip & 0xff), (newip >> 8) & 0xff,
+		       (newip >> 16) & 0xff, (newip >> 24) & 0xff);
   if (!buf)
     return 0;
 
   *ip = newip;
 
-  grub_sprintf (buf, "%d.%d.%d.%d", (newip & 0xff), (newip >> 8) & 0xff,
-		(newip >> 16) & 0xff, (newip >> 24) & 0xff);
-
   return buf; 
 }
 
@@ -544,11 +543,10 @@ grub_env_write_pxe_blocksize (struct grub_env_var *var __attribute__ ((unused)),
   else if (size > GRUB_PXE_MAX_BLKSIZE)
     size = GRUB_PXE_MAX_BLKSIZE;
   
-  buf = grub_malloc (sizeof ("XXXXXX XXXXXX"));
+  buf = grub_asprintf ("%d", size);
   if (!buf)
     return 0;
 
-  grub_sprintf (buf, "%d", size);
   grub_pxe_blksize = size;
   
   return buf;
@@ -562,12 +560,10 @@ GRUB_MOD_INIT(pxe)
     {
       char *buf;
 
-      buf = grub_malloc (sizeof ("XXXXXX XXXXXX"));
+      buf = grub_asprintf ("%d", grub_pxe_blksize);
       if (buf)
-	{
-	  grub_sprintf (buf, "%d", grub_pxe_blksize);
-	  grub_env_set ("net_pxe_blksize", buf);
-	}
+	grub_env_set ("net_pxe_blksize", buf);
+      grub_free (buf);
 
       set_ip_env ("pxe_default_server", grub_pxe_default_server_ip);
       set_ip_env ("pxe_default_gateway", grub_pxe_default_gateway_ip);
diff --git a/fs/iso9660.c b/fs/iso9660.c
index 2fb0ffb63..576badf63 100644
--- a/fs/iso9660.c
+++ b/fs/iso9660.c
@@ -837,16 +837,23 @@ grub_iso9660_uuid (grub_device_t device, char **uuid)
 	}
       else
 	{
-	  *uuid = grub_malloc (sizeof ("YYYY-MM-DD-HH-mm-ss-hh"));
-	  grub_sprintf (*uuid, "%c%c%c%c-%c%c-%c%c-%c%c-%c%c-%c%c-%c%c",
-			data->voldesc.modified.year[0], data->voldesc.modified.year[1],
-			data->voldesc.modified.year[2], data->voldesc.modified.year[3],
-			data->voldesc.modified.month[0], data->voldesc.modified.month[1],
-			data->voldesc.modified.day[0], data->voldesc.modified.day[1],
-			data->voldesc.modified.hour[0], data->voldesc.modified.hour[1],
-			data->voldesc.modified.minute[0], data->voldesc.modified.minute[1],
-			data->voldesc.modified.second[0], data->voldesc.modified.second[1],
-			data->voldesc.modified.hundredth[0], data->voldesc.modified.hundredth[1]);
+	  *uuid = grub_asprintf ("%c%c%c%c-%c%c-%c%c-%c%c-%c%c-%c%c-%c%c",
+				 data->voldesc.modified.year[0],
+				 data->voldesc.modified.year[1],
+				 data->voldesc.modified.year[2],
+				 data->voldesc.modified.year[3],
+				 data->voldesc.modified.month[0],
+				 data->voldesc.modified.month[1],
+				 data->voldesc.modified.day[0],
+				 data->voldesc.modified.day[1],
+				 data->voldesc.modified.hour[0],
+				 data->voldesc.modified.hour[1],
+				 data->voldesc.modified.minute[0],
+				 data->voldesc.modified.minute[1],
+				 data->voldesc.modified.second[0],
+				 data->voldesc.modified.second[1],
+				 data->voldesc.modified.hundredth[0],
+				 data->voldesc.modified.hundredth[1]);
 	}
     }
   else
diff --git a/fs/jfs.c b/fs/jfs.c
index dc5eaed67..1bc3c7758 100644
--- a/fs/jfs.c
+++ b/fs/jfs.c
@@ -842,17 +842,16 @@ grub_jfs_uuid (grub_device_t device, char **uuid)
   data = grub_jfs_mount (disk);
   if (data)
     {
-      *uuid = grub_malloc (40 + sizeof ('\0'));
-
-      grub_sprintf (*uuid, "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-		    data->sblock.uuid[0], data->sblock.uuid[1],
-		    data->sblock.uuid[2], data->sblock.uuid[3],
-		    data->sblock.uuid[4], data->sblock.uuid[5],
-		    data->sblock.uuid[6], data->sblock.uuid[7],
-		    data->sblock.uuid[8], data->sblock.uuid[9],
-		    data->sblock.uuid[10], data->sblock.uuid[11],
-		    data->sblock.uuid[12], data->sblock.uuid[13],
-		    data->sblock.uuid[14], data->sblock.uuid[15]);
+      *uuid = grub_asprintf ("%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-"
+			     "%02x%02x%02x%02x%02x%02x",
+			     data->sblock.uuid[0], data->sblock.uuid[1],
+			     data->sblock.uuid[2], data->sblock.uuid[3],
+			     data->sblock.uuid[4], data->sblock.uuid[5],
+			     data->sblock.uuid[6], data->sblock.uuid[7],
+			     data->sblock.uuid[8], data->sblock.uuid[9],
+			     data->sblock.uuid[10], data->sblock.uuid[11],
+			     data->sblock.uuid[12], data->sblock.uuid[13],
+			     data->sblock.uuid[14], data->sblock.uuid[15]);
     }
   else
     *uuid = NULL;
diff --git a/fs/ntfs.c b/fs/ntfs.c
index 87db1a561..eadf9d6a2 100644
--- a/fs/ntfs.c
+++ b/fs/ntfs.c
@@ -1072,8 +1072,7 @@ grub_ntfs_uuid (grub_device_t device, char **uuid)
   data = grub_ntfs_mount (disk);
   if (data)
     {
-      *uuid = grub_malloc (16 + sizeof ('\0'));
-      grub_sprintf (*uuid, "%016llx", (unsigned long long) data->uuid);
+      *uuid = grub_asprintf ("%016llx", (unsigned long long) data->uuid);
     }
   else
     *uuid = NULL;
diff --git a/fs/reiserfs.c b/fs/reiserfs.c
index a8ba75910..d5a20ee6c 100644
--- a/fs/reiserfs.c
+++ b/fs/reiserfs.c
@@ -1335,12 +1335,15 @@ grub_reiserfs_uuid (grub_device_t device, char **uuid)
   data = grub_reiserfs_mount (disk);
   if (data)
     {
-      *uuid = grub_malloc (sizeof ("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"));
-      grub_sprintf (*uuid, "%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
-		    grub_be_to_cpu16 (data->superblock.uuid[0]), grub_be_to_cpu16 (data->superblock.uuid[1]),
-		    grub_be_to_cpu16 (data->superblock.uuid[2]), grub_be_to_cpu16 (data->superblock.uuid[3]),
-		    grub_be_to_cpu16 (data->superblock.uuid[4]), grub_be_to_cpu16 (data->superblock.uuid[5]),
-		    grub_be_to_cpu16 (data->superblock.uuid[6]), grub_be_to_cpu16 (data->superblock.uuid[7]));
+      *uuid = grub_asprintf ("%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
+			     grub_be_to_cpu16 (data->superblock.uuid[0]),
+			     grub_be_to_cpu16 (data->superblock.uuid[1]),
+			     grub_be_to_cpu16 (data->superblock.uuid[2]),
+			     grub_be_to_cpu16 (data->superblock.uuid[3]),
+			     grub_be_to_cpu16 (data->superblock.uuid[4]),
+			     grub_be_to_cpu16 (data->superblock.uuid[5]),
+			     grub_be_to_cpu16 (data->superblock.uuid[6]),
+			     grub_be_to_cpu16 (data->superblock.uuid[7]));
     }
   else
     *uuid = NULL;
diff --git a/fs/ufs.c b/fs/ufs.c
index f95a6e12e..575c9f449 100644
--- a/fs/ufs.c
+++ b/fs/ufs.c
@@ -732,12 +732,9 @@ grub_ufs_uuid (grub_device_t device, char **uuid)
 
   data = grub_ufs_mount (disk);
   if (data && (data->sblock.uuidhi != 0 || data->sblock.uuidlow != 0))
-    {
-      *uuid = grub_malloc (16 + sizeof ('\0'));
-      grub_sprintf (*uuid, "%08x%08x",
-		    (unsigned) grub_le_to_cpu32 (data->sblock.uuidhi),
-		    (unsigned) grub_le_to_cpu32 (data->sblock.uuidlow));
-    }
+    *uuid = grub_asprintf ("%08x%08x",
+			   (unsigned) grub_le_to_cpu32 (data->sblock.uuidhi),
+			   (unsigned) grub_le_to_cpu32 (data->sblock.uuidlow));
   else
     *uuid = NULL;
 
diff --git a/fs/xfs.c b/fs/xfs.c
index c15ec7341..e3f58c9de 100644
--- a/fs/xfs.c
+++ b/fs/xfs.c
@@ -777,12 +777,15 @@ grub_xfs_uuid (grub_device_t device, char **uuid)
   data = grub_xfs_mount (disk);
   if (data)
     {
-      *uuid = grub_malloc (sizeof ("xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"));
-      grub_sprintf (*uuid, "%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
-		    grub_be_to_cpu16 (data->sblock.uuid[0]), grub_be_to_cpu16 (data->sblock.uuid[1]),
-		    grub_be_to_cpu16 (data->sblock.uuid[2]), grub_be_to_cpu16 (data->sblock.uuid[3]),
-		    grub_be_to_cpu16 (data->sblock.uuid[4]), grub_be_to_cpu16 (data->sblock.uuid[5]),
-		    grub_be_to_cpu16 (data->sblock.uuid[6]), grub_be_to_cpu16 (data->sblock.uuid[7]));
+      *uuid = grub_asprintf ("%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
+			     grub_be_to_cpu16 (data->sblock.uuid[0]),
+			     grub_be_to_cpu16 (data->sblock.uuid[1]),
+			     grub_be_to_cpu16 (data->sblock.uuid[2]),
+			     grub_be_to_cpu16 (data->sblock.uuid[3]),
+			     grub_be_to_cpu16 (data->sblock.uuid[4]),
+			     grub_be_to_cpu16 (data->sblock.uuid[5]),
+			     grub_be_to_cpu16 (data->sblock.uuid[6]),
+			     grub_be_to_cpu16 (data->sblock.uuid[7]));
     }
   else
     *uuid = NULL;
diff --git a/gettext/gettext.c b/gettext/gettext.c
index 3472b2fb8..f271f24ab 100644
--- a/gettext/gettext.c
+++ b/gettext/gettext.c
@@ -275,14 +275,19 @@ grub_gettext_init_ext (const char *lang)
   /* Warning: if changing some paths in the below line, change the grub_malloc
      contents below.  */
 
-  grub_sprintf (mo_file, "%s/%s.mo", locale_dir, lang);
+  mo_file = grub_asprintf ("%s/%s.mo", locale_dir, lang);
+  if (!mo_file)
+    return;
 
   fd_mo = grub_mofile_open (mo_file);
 
   /* Will try adding .gz as well.  */
   if (fd_mo == NULL)
     {
-      grub_sprintf (mo_file, "%s.gz", mo_file);
+      grub_free (mo_file);
+      mo_file = grub_asprintf ("%s.gz", mo_file);
+      if (!mo_file)
+	return;
       fd_mo = grub_mofile_open (mo_file);
     }
 
diff --git a/hook/datehook.c b/hook/datehook.c
index b7663cc21..4876e1198 100644
--- a/hook/datehook.c
+++ b/hook/datehook.c
@@ -76,7 +76,7 @@ grub_read_hook_datetime (struct grub_env_var *var,
                 return grub_get_weekday_name (&datetime);
               }
 
-            grub_sprintf (buf, "%d", n);
+            grub_snprintf (buf, sizeof (buf), "%d", n);
             break;
           }
     }
diff --git a/include/grub/misc.h b/include/grub/misc.h
index 92fb460cf..f4d722081 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -179,8 +179,13 @@ void EXPORT_FUNC(grub_real_dprintf) (const char *file,
                                      const char *condition,
                                      const char *fmt, ...) __attribute__ ((format (printf, 4, 5)));
 int EXPORT_FUNC(grub_vprintf) (const char *fmt, va_list args);
-int EXPORT_FUNC(grub_sprintf) (char *str, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
-int EXPORT_FUNC(grub_vsprintf) (char *str, const char *fmt, va_list args);
+int EXPORT_FUNC(grub_snprintf) (char *str, grub_size_t n, const char *fmt, ...)
+     __attribute__ ((format (printf, 3, 4)));
+int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt,
+				 va_list args);
+char *EXPORT_FUNC(grub_asprintf) (const char *fmt, ...)
+     __attribute__ ((format (printf, 1, 2)));
+char *EXPORT_FUNC(grub_avsprintf) (const char *fmt, va_list args);
 void EXPORT_FUNC(grub_exit) (void) __attribute__ ((noreturn));
 void EXPORT_FUNC(grub_abort) (void) __attribute__ ((noreturn));
 grub_ssize_t EXPORT_FUNC(grub_utf8_to_ucs4) (grub_uint32_t *dest,
diff --git a/kern/device.c b/kern/device.c
index 9f219949b..d1692baa0 100644
--- a/kern/device.c
+++ b/kern/device.c
@@ -86,7 +86,7 @@ grub_device_iterate (int (*hook) (const char *name))
   struct part_ent
   {
     struct part_ent *next;
-    char name[0];
+    char *name;
   } *ents;
 
   int iterate_disk (const char *disk_name)
@@ -118,6 +118,7 @@ grub_device_iterate (int (*hook) (const char *name))
 
 	      if (!ret)
 		ret = hook (p->name);
+	      grub_free (p->name);
 	      grub_free (p);
 	      p = next;
 	    }
@@ -138,15 +139,20 @@ grub_device_iterate (int (*hook) (const char *name))
       if (! partition_name)
 	return 1;
 
-      p = grub_malloc (sizeof (p->next) + grub_strlen (disk->name) + 1 +
-		       grub_strlen (partition_name) + 1);
+      p = grub_malloc (sizeof (p->next));
       if (!p)
 	{
 	  grub_free (partition_name);
 	  return 1;
 	}
 
-      grub_sprintf (p->name, "%s,%s", disk->name, partition_name);
+      p->name = grub_asprintf ("%s,%s", disk->name, partition_name);
+      if (!p->name)
+	{
+	  grub_free (partition_name);
+	  grub_free (p);
+	  return 1;
+	}      
       grub_free (partition_name);
 
       p->next = ents;
diff --git a/kern/dl.c b/kern/dl.c
index 20ab1c5c2..36bbd882c 100644
--- a/kern/dl.c
+++ b/kern/dl.c
@@ -628,12 +628,10 @@ grub_dl_load (const char *name)
     return 0;
   }
 
-  filename = (char *) grub_malloc (grub_strlen (grub_dl_dir) + 1
-				   + grub_strlen (name) + 4 + 1);
+  filename = grub_asprintf ("%s/%s.mod", grub_dl_dir, name);
   if (! filename)
     return 0;
 
-  grub_sprintf (filename, "%s/%s.mod", grub_dl_dir, name);
   mod = grub_dl_load_file (filename);
   grub_free (filename);
 
diff --git a/kern/efi/init.c b/kern/efi/init.c
index f9ba03852..443684000 100644
--- a/kern/efi/init.c
+++ b/kern/efi/init.c
@@ -63,11 +63,10 @@ grub_efi_set_prefix (void)
 	  if (p)
 	    *p = '\0';
 
-	  prefix = grub_malloc (1 + grub_strlen (device) + 1
-				+ grub_strlen (file) + 1);
+	  prefix = grub_asprintf ("(%s)%s", device, file);
 	  if (prefix)
 	    {
-	      grub_sprintf (prefix, "(%s)%s", device, file);
+	      
 	      grub_env_set ("prefix", prefix);
 	      grub_free (prefix);
 	    }
diff --git a/kern/env.c b/kern/env.c
index 969227dec..dd167a709 100644
--- a/kern/env.c
+++ b/kern/env.c
@@ -356,14 +356,7 @@ grub_register_variable_hook (const char *name,
 static char *
 mangle_data_slot_name (const char *name)
 {
-  char *mangled_name;
-
-  mangled_name = grub_malloc (grub_strlen (name) + 2);
-  if (! mangled_name)
-    return 0;
-
-  grub_sprintf (mangled_name, "\e%s", name);
-  return mangled_name;
+  return grub_asprintf ("\e%s", name);
 }
 
 grub_err_t
diff --git a/kern/err.c b/kern/err.c
index 311130154..5a63b4187 100644
--- a/kern/err.c
+++ b/kern/err.c
@@ -44,7 +44,7 @@ grub_error (grub_err_t n, const char *fmt, ...)
   grub_errno = n;
 
   va_start (ap, fmt);
-  grub_vsprintf (grub_errmsg, fmt, ap);
+  grub_vsnprintf (grub_errmsg, sizeof (grub_errmsg), fmt, ap);
   va_end (ap);
 
   return n;
diff --git a/kern/i386/pc/init.c b/kern/i386/pc/init.c
index ebe4bb6ea..029ec4c6b 100644
--- a/kern/i386/pc/init.c
+++ b/kern/i386/pc/init.c
@@ -56,22 +56,30 @@ static char *
 make_install_device (void)
 {
   /* XXX: This should be enough.  */
-  char dev[100];
+  char dev[100], *ptr = dev;
 
   if (grub_prefix[0] != '(')
     {
       /* No hardcoded root partition - make it from the boot drive and the
 	 partition number encoded at the install time.  */
-      grub_sprintf (dev, "(%cd%u", (grub_boot_drive & 0x80) ? 'h' : 'f',
+      grub_snprintf (dev, sizeof (dev),
+		    "(%cd%u", (grub_boot_drive & 0x80) ? 'h' : 'f',
 		    grub_boot_drive & 0x7f);
+      ptr += grub_strlen (ptr);
 
       if (grub_install_dos_part >= 0)
-	grub_sprintf (dev + grub_strlen (dev), ",%u", grub_install_dos_part + 1);
+	grub_snprintf (ptr, sizeof (dev) - (ptr - dev),
+		       ",%u", grub_install_dos_part + 1);
+
+      ptr += grub_strlen (ptr);
 
       if (grub_install_bsd_part >= 0)
-	grub_sprintf (dev + grub_strlen (dev), ",%c", grub_install_bsd_part + 'a');
+	grub_snprintf (ptr, sizeof (dev) - (ptr - dev), ",%c",
+		       grub_install_bsd_part + 'a');
 
-      grub_sprintf (dev + grub_strlen (dev), ")%s", grub_prefix);
+      ptr += grub_strlen (ptr);
+
+      grub_snprintf (ptr, sizeof (dev) - (ptr - dev), ")%s", grub_prefix);
       grub_strcpy (grub_prefix, dev);
     }
 
diff --git a/kern/ieee1275/init.c b/kern/ieee1275/init.c
index f3305d71c..7ef628397 100644
--- a/kern/ieee1275/init.c
+++ b/kern/ieee1275/init.c
@@ -111,11 +111,12 @@ grub_machine_set_prefix (void)
 	  *lastslash = '\0';
 	  grub_translate_ieee1275_path (filename);
 
-	  newprefix = grub_malloc (grub_strlen (prefix)
-				   + grub_strlen (filename));
-	  grub_sprintf (newprefix, "%s%s", prefix, filename);
-	  grub_free (prefix);
-	  prefix = newprefix;
+	  newprefix = grub_asprintf ("%s%s", prefix, filename);
+	  if (newprefix)
+	    {
+	      grub_free (prefix);
+	      prefix = newprefix;
+	    }
 	}
     }
 
diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index c38eb450f..50bd9557a 100644
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -38,7 +38,7 @@ grub_children_iterate (char *devpath,
   grub_ieee1275_phandle_t dev;
   grub_ieee1275_phandle_t child;
   char *childtype, *childpath;
-  char *childname, *fullname;
+  char *childname;
   int ret = 0;
 
   if (grub_ieee1275_finddevice (devpath, &dev))
@@ -63,19 +63,12 @@ grub_children_iterate (char *devpath,
       grub_free (childtype);
       return 0;
     }
-  fullname = grub_malloc (IEEE1275_MAX_PATH_LEN);
-  if (!fullname)
-    {
-      grub_free (childname);
-      grub_free (childpath);
-      grub_free (childtype);
-      return 0;
-    }
 
   do
     {
       struct grub_ieee1275_devalias alias;
       grub_ssize_t actual;
+      char *fullname;
 
       if (grub_ieee1275_get_property (child, "device_type", childtype,
 				      IEEE1275_MAX_PROP_LEN, &actual))
@@ -89,18 +82,25 @@ grub_children_iterate (char *devpath,
 				      IEEE1275_MAX_PROP_LEN, &actual))
 	continue;
 
-      grub_sprintf (fullname, "%s/%s", devpath, childname);
+      fullname = grub_asprintf ("%s/%s", devpath, childname);
+      if (!fullname)
+	{
+	  grub_free (childname);
+	  grub_free (childpath);
+	  grub_free (childtype);
+	  return 0;
+	}
 
       alias.type = childtype;
       alias.path = childpath;
       alias.name = fullname;
       ret = hook (&alias);
+      grub_free (fullname);
       if (ret)
 	break;
     }
   while (grub_ieee1275_peer (child, &child));
 
-  grub_free (fullname);
   grub_free (childname);
   grub_free (childpath);
   grub_free (childtype);
@@ -330,12 +330,11 @@ grub_ieee1275_parse_args (const char *path, enum grub_ieee1275_parse_type ptype)
 	    {
 	      char *filepath = comma + 1;
 
-	      ret = grub_malloc (grub_strlen (filepath) + 1);
 	      /* Make sure filepath has leading backslash.  */
 	      if (filepath[0] != '\\')
-		grub_sprintf (ret, "\\%s", filepath);
+		ret = grub_asprintf ("\\%s", filepath);
 	      else
-		grub_strcpy (ret, filepath);
+		ret = grub_strdup (filepath);
 	    }
 	}
       else if (ptype == GRUB_PARSE_PARTITION)
@@ -383,15 +382,10 @@ grub_ieee1275_encode_devname (const char *path)
 	/* GRUB partition 1 is OF partition 0.  */
 	partno++;
 
-      /* Assume partno will require less than five bytes to encode.  */
-      encoding = grub_malloc (grub_strlen (device) + 3 + 5);
-      grub_sprintf (encoding, "(%s,%d)", device, partno);
+      encoding = grub_asprintf ("(%s,%d)", device, partno);
     }
   else
-    {
-      encoding = grub_malloc (grub_strlen (device) + 2);
-      grub_sprintf (encoding, "(%s)", device);
-    }
+    encoding = grub_asprintf ("(%s)", device);
 
   grub_free (partition);
   grub_free (device);
diff --git a/kern/misc.c b/kern/misc.c
index f6d189e94..087bef7fe 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -25,6 +25,9 @@
 #include <grub/env.h>
 #include <grub/i18n.h>
 
+static int
+grub_vsnprintf_real (char *str, grub_size_t n, const char *fmt, va_list args);
+
 static int
 grub_iswordseparator (int c)
 {
@@ -202,7 +205,7 @@ grub_vprintf (const char *fmt, va_list args)
 {
   int ret;
 
-  ret = grub_vsprintf (0, fmt, args);
+  ret = grub_vsnprintf_real (0, 0, fmt, args);
   grub_refresh ();
   return ret;
 }
@@ -626,11 +629,11 @@ grub_lltoa (char *str, int c, unsigned long long n)
   return p;
 }
 
-int
-grub_vsprintf (char *str, const char *fmt, va_list args)
+static int
+grub_vsnprintf_real (char *str, grub_size_t n, const char *fmt, va_list args)
 {
   char c;
-  int count = 0;
+  grub_size_t count = 0;
   auto void write_char (unsigned char ch);
   auto void write_str (const char *s);
   auto void write_fill (const char ch, int n);
@@ -638,7 +641,10 @@ grub_vsprintf (char *str, const char *fmt, va_list args)
   void write_char (unsigned char ch)
     {
       if (str)
-	*str++ = ch;
+	{
+	  if (count < n)
+	    *str++ = ch;
+	}
       else
 	grub_putchar (ch);
 
@@ -867,13 +873,64 @@ grub_vsprintf (char *str, const char *fmt, va_list args)
 }
 
 int
-grub_sprintf (char *str, const char *fmt, ...)
+grub_vsnprintf (char *str, grub_size_t n, const char *fmt, va_list ap)
+{
+  grub_size_t ret;
+
+  if (!n)
+    return 0;
+
+  n--;
+
+  ret = grub_vsnprintf_real (str, n, fmt, ap);
+
+  return ret < n ? ret : n;
+}
+
+int
+grub_snprintf (char *str, grub_size_t n, const char *fmt, ...)
 {
   va_list ap;
   int ret;
 
   va_start (ap, fmt);
-  ret = grub_vsprintf (str, fmt, ap);
+  ret = grub_vsnprintf (str, n, fmt, ap);
+  va_end (ap);
+
+  return ret;
+}
+
+#define PREALLOC_SIZE 255
+
+char *
+grub_avsprintf (const char *fmt, va_list ap)
+{
+  grub_size_t s, as = PREALLOC_SIZE;
+  char *ret;
+
+  while (1)
+    {
+      ret = grub_malloc (as + 1);
+      if (!ret)
+	return NULL;
+
+      s = grub_vsnprintf (ret, as, fmt, ap);
+      if (s <= as)
+	return ret;
+
+      grub_free (ret);
+      as = s;
+    }
+}
+
+char *
+grub_asprintf (const char *fmt, ...)
+{
+  va_list ap;
+  char *ret;
+
+  va_start (ap, fmt);
+  ret = grub_avsprintf (fmt, ap);
   va_end (ap);
 
   return ret;
diff --git a/kern/sparc64/ieee1275/init.c b/kern/sparc64/ieee1275/init.c
index 699f9631b..339d836a3 100644
--- a/kern/sparc64/ieee1275/init.c
+++ b/kern/sparc64/ieee1275/init.c
@@ -90,10 +90,7 @@ grub_machine_set_prefix (void)
 	}
       prefix = grub_ieee1275_encode_devname (bootpath);
 
-      path = grub_malloc (grub_strlen (grub_prefix)
-			  + grub_strlen (prefix)
-			  + 2);
-      grub_sprintf(path, "%s%s", prefix, grub_prefix);
+      path = grub_asprintf("%s%s", prefix, grub_prefix);
 
       grub_strcpy (grub_prefix, path);
 
diff --git a/lib/hexdump.c b/lib/hexdump.c
index c69cb093b..db16f6926 100644
--- a/lib/hexdump.c
+++ b/lib/hexdump.c
@@ -31,21 +31,22 @@ hexdump (unsigned long bse, char *buf, int len)
     {
       int cnt, i;
 
-      pos = grub_sprintf (line, "%08lx  ", bse);
+      pos = grub_snprintf (line, sizeof (line), "%08lx  ", bse);
       cnt = 16;
       if (cnt > len)
 	cnt = len;
 
       for (i = 0; i < cnt; i++)
 	{
-	  pos += grub_sprintf (&line[pos], "%02x ", (unsigned char) buf[i]);
+	  pos += grub_snprintf (&line[pos], sizeof (line) - pos,
+				"%02x ", (unsigned char) buf[i]);
 	  if ((i & 7) == 7)
 	    line[pos++] = ' ';
 	}
 
       for (; i < 16; i++)
 	{
-	  pos += grub_sprintf (&line[pos], "   ");
+	  pos += grub_snprintf (&line[pos], sizeof (line) - pos, "   ");
 	  if ((i & 7) == 7)
 	    line[pos++] = ' ';
 	}
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index ca60b0be9..06eb5bfd9 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -1138,14 +1138,20 @@ grub_cmd_freebsd_loadenv (grub_command_t cmd __attribute__ ((unused)),
 
       if (*curr)
 	{
-	  char name[grub_strlen (curr) + sizeof("kFreeBSD.")];
+	  char *name;
 
 	  if (*p == '"')
 	    p++;
 
-	  grub_sprintf (name, "kFreeBSD.%s", curr);
-	  if (grub_env_set (name, p))
+	  name = grub_asprintf ("kFreeBSD.%s", curr);
+	  if (!name)
 	    goto fail;
+	  if (grub_env_set (name, p))
+	    {
+	      grub_free (name);
+	      goto fail;
+	    }
+	  grub_free (name);
 	}
     }
 
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 899216783..93f3da058 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -517,11 +517,9 @@ grub_linux_boot (void)
      May change in future if we have modes without framebuffer.  */
   if (modevar && *modevar != 0)
     {
-      tmp = grub_malloc (grub_strlen (modevar)
-			 + sizeof (";text"));
+      tmp = grub_asprintf ("%s;text", modevar);
       if (! tmp)
 	return grub_errno;
-      grub_sprintf (tmp, "%s;text", modevar);
       err = grub_video_set_mode (tmp, 0);
       grub_free (tmp);
     }
@@ -779,19 +777,18 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 		break;
 	      }
 
-	    buf = grub_malloc (sizeof ("WWWWxHHHHxDD;WWWWxHHHH"));
-	    if (! buf)
-	      goto fail;
-
 	    linux_mode
 	      = &linux_vesafb_modes[vid_mode - GRUB_LINUX_VID_MODE_VESA_START];
 
-	    grub_sprintf (buf, "%ux%ux%u,%ux%u",
-			  linux_vesafb_res[linux_mode->res_index].width,
-			  linux_vesafb_res[linux_mode->res_index].height,
-			  linux_mode->depth,
-			  linux_vesafb_res[linux_mode->res_index].width,
-			  linux_vesafb_res[linux_mode->res_index].height);
+	    buf = grub_asprintf ("%ux%ux%u,%ux%u",
+				 linux_vesafb_res[linux_mode->res_index].width,
+				 linux_vesafb_res[linux_mode->res_index].height,
+				 linux_mode->depth,
+				 linux_vesafb_res[linux_mode->res_index].width,
+				 linux_vesafb_res[linux_mode->res_index].height);
+	    if (! buf)
+	      goto fail;
+
 	    grub_printf ("%s is deprecated. "
 			 "Use set gfxpayload=%s before "
 			 "linux command instead.\n",
diff --git a/loader/i386/pc/xnu.c b/loader/i386/pc/xnu.c
index ebb176bb4..07c1ee37e 100644
--- a/loader/i386/pc/xnu.c
+++ b/loader/i386/pc/xnu.c
@@ -52,12 +52,10 @@ grub_xnu_set_video (struct grub_xnu_boot_params *params)
     err = grub_video_set_mode (DEFAULT_VIDEO_MODE, video_hook);
   else
     {
-      tmp = grub_malloc (grub_strlen (modevar)
-			 + sizeof (DEFAULT_VIDEO_MODE) + 1);
+      tmp = grub_asprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
       if (! tmp)
 	return grub_error (GRUB_ERR_OUT_OF_MEMORY,
 			   "couldn't allocate temporary storag");
-      grub_sprintf (tmp, "%s;" DEFAULT_VIDEO_MODE, modevar);
       err = grub_video_set_mode (tmp, video_hook);
       grub_free (tmp);
     }
diff --git a/loader/i386/xnu.c b/loader/i386/xnu.c
index f71e2c306..ef3e90538 100644
--- a/loader/i386/xnu.c
+++ b/loader/i386/xnu.c
@@ -748,11 +748,13 @@ grub_cpu_xnu_fill_devicetree (void)
 #endif
 
       /* The name of key for new table. */
-      grub_sprintf (guidbuf, "%08x-%04x-%04x-%02x%02x-",
-		    guid.data1, guid.data2, guid.data3, guid.data4[0],
-		    guid.data4[1]);
+      grub_snprintf (guidbuf, sizeof (guidbuf), "%08x-%04x-%04x-%02x%02x-",
+		     guid.data1, guid.data2, guid.data3, guid.data4[0],
+		     guid.data4[1]);
       for (j = 2; j < 8; j++)
-	grub_sprintf (guidbuf + grub_strlen (guidbuf), "%02x", guid.data4[j]);
+	grub_snprintf (guidbuf + grub_strlen (guidbuf),
+		       sizeof (guidbuf) - grub_strlen (guidbuf),
+		       "%02x", guid.data4[j]);
       /* For some reason GUID has to be in uppercase. */
       for (j = 0; guidbuf[j] ; j++)
 	if (guidbuf[j] >= 'a' && guidbuf[j] <= 'f')
diff --git a/loader/xnu.c b/loader/xnu.c
index f3ae3888a..bb1178e17 100644
--- a/loader/xnu.c
+++ b/loader/xnu.c
@@ -568,10 +568,9 @@ grub_xnu_register_memory (char *prefix, int *suffix,
     return grub_error (GRUB_ERR_OUT_OF_MEMORY, "can't register memory");
   if (suffix)
     {
-      driverkey->name = grub_malloc (grub_strlen (prefix) + 10);
+      driverkey->name = grub_asprintf ("%s%d", prefix, (*suffix)++);
       if (!driverkey->name)
 	return grub_error (GRUB_ERR_OUT_OF_MEMORY, "can't register memory");
-      grub_sprintf (driverkey->name, "%s%d", prefix, (*suffix)++);
     }
   else
     driverkey->name = grub_strdup (prefix);
diff --git a/normal/autofs.c b/normal/autofs.c
index ce354a22c..d1a6d2110 100644
--- a/normal/autofs.c
+++ b/normal/autofs.c
@@ -63,12 +63,11 @@ read_fs_list (void)
     {
       char *filename;
 
-      filename = grub_malloc (grub_strlen (prefix) + sizeof ("/fs.lst"));
+      filename = grub_asprintf ("%s/fs.lst", prefix);
       if (filename)
 	{
 	  grub_file_t file;
 
-	  grub_sprintf (filename, "%s/fs.lst", prefix);
 	  file = grub_file_open (filename);
 	  if (file)
 	    {
diff --git a/normal/completion.c b/normal/completion.c
index d264028cc..81972636d 100644
--- a/normal/completion.c
+++ b/normal/completion.c
@@ -107,17 +107,12 @@ iterate_partition (grub_disk_t disk, const grub_partition_t p)
   if (! partition_name)
     return 1;
 
-  name = grub_malloc (grub_strlen (disk_name) + 1
-		      + grub_strlen (partition_name) + 1);
-  if (! name)
-    {
-      grub_free (partition_name);
-      return 1;
-    }
-
-  grub_sprintf (name, "%s,%s", disk_name, partition_name);
+  name = grub_asprintf ("%s,%s", disk_name, partition_name);
   grub_free (partition_name);
 
+  if (! name)
+    return 1;
+
   ret = add_completion (name, ")", GRUB_COMPLETION_TYPE_PARTITION);
   grub_free (name);
   return ret;
@@ -141,11 +136,15 @@ iterate_dir (const char *filename, const struct grub_dirhook_info *info)
     }
   else if (grub_strcmp (filename, ".") && grub_strcmp (filename, ".."))
     {
-      char fname[grub_strlen (filename) + 2];
+      char *fname;
 
-      grub_sprintf (fname, "%s/", filename);
+      fname = grub_asprintf ("%s/", filename);
       if (add_completion (fname, "", GRUB_COMPLETION_TYPE_FILE))
-	return 1;
+	{
+	  grub_free (fname);
+	  return 1;
+	}
+      grub_free (fname);
     }
 
   return 0;
@@ -360,8 +359,9 @@ complete_arguments (char *command)
       if (!option->longarg)
 	continue;
 
-      longarg = grub_malloc (grub_strlen (option->longarg));
-      grub_sprintf (longarg, "--%s", option->longarg);
+      longarg = grub_asprintf ("--%s", option->longarg);
+      if (!longarg)
+	return 1;
 
       if (add_completion (longarg, " ", GRUB_COMPLETION_TYPE_ARGUMENT))
 	{
diff --git a/normal/dyncmd.c b/normal/dyncmd.c
index 04f1945dc..0a9bb347a 100644
--- a/normal/dyncmd.c
+++ b/normal/dyncmd.c
@@ -75,12 +75,11 @@ read_command_list (void)
     {
       char *filename;
 
-      filename = grub_malloc (grub_strlen (prefix) + sizeof ("/command.lst"));
+      filename = grub_asprintf ("%s/command.lst", prefix);
       if (filename)
 	{
 	  grub_file_t file;
 
-	  grub_sprintf (filename, "%s/command.lst", prefix);
 	  file = grub_file_open (filename);
 	  if (file)
 	    {
diff --git a/normal/handler.c b/normal/handler.c
index b44dc7a68..034be77d1 100644
--- a/normal/handler.c
+++ b/normal/handler.c
@@ -172,12 +172,11 @@ read_handler_list (void)
     {
       char *filename;
 
-      filename = grub_malloc (grub_strlen (prefix) + sizeof ("/handler.lst"));
+      filename = grub_asprintf ("%s/handler.lst", prefix);
       if (filename)
 	{
 	  grub_file_t file;
 
-	  grub_sprintf (filename, "%s/handler.lst", prefix);
 	  file = grub_file_open (filename);
 	  if (file)
 	    {
diff --git a/normal/main.c b/normal/main.c
index 23de7e238..7aeba37ca 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -389,16 +389,17 @@ grub_normal_init_page (void)
   int posx;
   const char *msg = _("GNU GRUB  version %s");
 
-  char *msg_formatted = grub_malloc (grub_strlen(msg) +
-  				     grub_strlen(PACKAGE_VERSION));
- 
-  grub_cls ();
-
-  grub_sprintf (msg_formatted, msg, PACKAGE_VERSION);
+  char *msg_formatted;
 
   grub_uint32_t *unicode_msg;
   grub_uint32_t *last_position;
  
+  grub_cls ();
+
+  msg_formatted = grub_asprintf (msg, PACKAGE_VERSION);
+  if (!msg_formatted)
+    return;
+ 
   msg_len = grub_utf8_to_ucs4_alloc (msg_formatted,
   				     &unicode_msg, &last_position);
  
@@ -475,11 +476,10 @@ grub_cmd_normal (struct grub_command *cmd,
       prefix = grub_env_get ("prefix");
       if (prefix)
 	{
-	  config = grub_malloc (grub_strlen (prefix) + sizeof ("/grub.cfg"));
+	  config = grub_asprintf ("%s/grub.cfg", prefix);
 	  if (! config)
 	    goto quit;
 
-	  grub_sprintf (config, "%s/grub.cfg", prefix);
 	  grub_enter_normal_mode (config);
 	  grub_free (config);
 	}
@@ -528,10 +528,11 @@ grub_normal_reader_init (void)
 
   const char *msg_esc = _("ESC at any time exits.");
 
-  char *msg_formatted = grub_malloc (sizeof (char) * (grub_strlen (msg) +
-                grub_strlen(msg_esc) + 1));
+  char *msg_formatted;
 
-  grub_sprintf (msg_formatted, msg, reader_nested ? msg_esc : "");
+  msg_formatted = grub_asprintf (msg, reader_nested ? msg_esc : "");
+  if (!msg_formatted)
+    return grub_errno;
   grub_print_message_indented (msg_formatted, 3, STANDARD_MARGIN);
   grub_puts ("\n");
 
@@ -546,9 +547,11 @@ static grub_err_t
 grub_normal_read_line (char **line, int cont)
 {
   grub_parser_t parser = grub_parser_get_current ();
-  char prompt[sizeof(">") + grub_strlen (parser->name)];
+  char *prompt;
 
-  grub_sprintf (prompt, "%s>", parser->name);
+  prompt = grub_asprintf ("%s>", parser->name);
+  if (!prompt)
+    return grub_errno;
 
   while (1)
     {
diff --git a/normal/menu.c b/normal/menu.c
index 8ee7d1c22..99ffc67dd 100644
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -78,7 +78,7 @@ grub_menu_set_timeout (int timeout)
     {
       char buf[16];
 
-      grub_sprintf (buf, "%d", timeout);
+      grub_snprintf (buf, sizeof (buf), "%d", timeout);
       grub_env_set ("timeout", buf);
     }
 }
diff --git a/normal/menu_text.c b/normal/menu_text.c
index bac15f32b..3bcf35a93 100644
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -210,13 +210,14 @@ command-line or ESC to return menu."), STANDARD_MARGIN, STANDARD_MARGIN);
     }
   else
     {
-      const char *msg = _("Use the %C and %C keys to select which \
-entry is highlighted.\n");
-      char *msg_translated =
-       grub_malloc (sizeof (char) * grub_strlen (msg) + 1);
+      const char *msg = _("Use the %C and %C keys to select which "
+			  "entry is highlighted.\n");
+      char *msg_translated;
 
-      grub_sprintf (msg_translated, msg, (grub_uint32_t) GRUB_TERM_DISP_UP,
-                   (grub_uint32_t) GRUB_TERM_DISP_DOWN);
+      msg_translated = grub_asprintf (msg, (grub_uint32_t) GRUB_TERM_DISP_UP,
+				     (grub_uint32_t) GRUB_TERM_DISP_DOWN);
+      if (!msg_translated)
+	return;
       grub_putchar ('\n');
       grub_print_message_indented (msg_translated, STANDARD_MARGIN, STANDARD_MARGIN);
 
@@ -394,13 +395,13 @@ print_timeout (int timeout, int offset)
 {
   const char *msg =
     _("The highlighted entry will be booted automatically in %ds.");
+  char *msg_translated;
 
   grub_gotoxy (0, GRUB_TERM_HEIGHT - 3);
 
-  char *msg_translated =
-    grub_malloc (sizeof (char) * grub_strlen (msg) + 5);
-
-  grub_sprintf (msg_translated, msg, timeout);
+  msg_translated = grub_asprintf (msg, timeout);
+  if (!msg_translated)
+    return;
   grub_print_message_indented (msg_translated, 3, 0);
  
   int posx;
diff --git a/partmap/acorn.c b/partmap/acorn.c
index 076d998f8..aead5ff85 100644
--- a/partmap/acorn.c
+++ b/partmap/acorn.c
@@ -175,14 +175,7 @@ fail:
 static char *
 acorn_partition_map_get_name (const grub_partition_t p)
 {
-  char *name;
-
-  name = grub_malloc (13);
-  if (! name)
-    return 0;
-
-  grub_sprintf (name, "%d", p->index + 1);
-  return name;
+  return grub_asprintf ("%d", p->index + 1);
 }
 
 
diff --git a/partmap/amiga.c b/partmap/amiga.c
index e8ba9181c..691bd4c3e 100644
--- a/partmap/amiga.c
+++ b/partmap/amiga.c
@@ -184,14 +184,7 @@ amiga_partition_map_probe (grub_disk_t disk, const char *str)
 static char *
 amiga_partition_map_get_name (const grub_partition_t p)
 {
-  char *name;
-
-  name = grub_malloc (13);
-  if (! name)
-    return 0;
-
-  grub_sprintf (name, "%d", p->index + 1);
-  return name;
+  return grub_asprintf ("%d", p->index + 1);
 }
 
 
diff --git a/partmap/apple.c b/partmap/apple.c
index 765912672..a5f7fdd8a 100644
--- a/partmap/apple.c
+++ b/partmap/apple.c
@@ -227,14 +227,7 @@ apple_partition_map_probe (grub_disk_t disk, const char *str)
 static char *
 apple_partition_map_get_name (const grub_partition_t p)
 {
-  char *name;
-
-  name = grub_malloc (13);
-  if (! name)
-    return 0;
-
-  grub_sprintf (name, "%d", p->index + 1);
-  return name;
+  return grub_asprintf ("%d", p->index + 1);
 }
 
 
diff --git a/partmap/gpt.c b/partmap/gpt.c
index 4a4957437..ed583e0a3 100644
--- a/partmap/gpt.c
+++ b/partmap/gpt.c
@@ -162,14 +162,7 @@ gpt_partition_map_probe (grub_disk_t disk, const char *str)
 static char *
 gpt_partition_map_get_name (const grub_partition_t p)
 {
-  char *name;
-
-  name = grub_malloc (13);
-  if (! name)
-    return 0;
-
-  grub_sprintf (name, "%d", p->index + 1);
-  return name;
+  return grub_asprintf ("%d", p->index + 1);
 }
 
 
diff --git a/partmap/msdos.c b/partmap/msdos.c
index 6ba7fb927..ea3266605 100644
--- a/partmap/msdos.c
+++ b/partmap/msdos.c
@@ -300,21 +300,15 @@ pc_partition_map_probe (grub_disk_t disk, const char *str)
 static char *
 pc_partition_map_get_name (const grub_partition_t p)
 {
-  char *name;
   struct grub_msdos_partition *pcdata = p->data;
 
-  name = grub_malloc (13);
-  if (! name)
-    return 0;
-
   if (pcdata->bsd_part < 0)
-    grub_sprintf (name, "%d", pcdata->dos_part + 1);
+    return grub_asprintf ("%d", pcdata->dos_part + 1);
   else if (pcdata->dos_part < 0)
-    grub_sprintf (name, "%c", pcdata->bsd_part + 'a');
+    return grub_asprintf ("%c", pcdata->bsd_part + 'a');
   else
-    grub_sprintf (name, "%d,%c", pcdata->dos_part + 1, pcdata->bsd_part + 'a');
-
-  return name;
+    return grub_asprintf ("%d,%c", pcdata->dos_part + 1,
+			  pcdata->bsd_part + 'a');
 }
 
 
diff --git a/partmap/sun.c b/partmap/sun.c
index e816ec17a..89d0c5303 100644
--- a/partmap/sun.c
+++ b/partmap/sun.c
@@ -184,13 +184,7 @@ sun_partition_map_probe (grub_disk_t disk, const char *str)
 static char *
 sun_partition_map_get_name (const grub_partition_t p)
 {
-  char *name;
-
-  name = grub_malloc (13);
-  if (name)
-    grub_sprintf (name, "%d", p->index + 1);
-
-  return name;
+  return grub_asprintf ("%d", p->index + 1);
 }
 
 /* Partition map type.  */
diff --git a/script/execute.c b/script/execute.c
index 08224fc7d..ee7e099bc 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -92,7 +92,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
   grub_err_t ret = 0;
   int argcount = 0;
   grub_script_function_t func = 0;
-  char errnobuf[6];
+  char errnobuf[18];
   char *cmdname;
 
   /* Lookup the command.  */
@@ -123,7 +123,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 	    }
 	  grub_free (assign);
 
-	  grub_sprintf (errnobuf, "%d", grub_errno);
+	  grub_snprintf (errnobuf, sizeof (errnobuf), "%d", grub_errno);
 	  grub_env_set ("?", errnobuf);
 
 	  return 0;
@@ -156,7 +156,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
     grub_free (args[i]);
   grub_free (args);
 
-  grub_sprintf (errnobuf, "%d", ret);
+  grub_snprintf (errnobuf, sizeof (errnobuf), "%d", ret);
   grub_env_set ("?", errnobuf);
 
   return ret;
diff --git a/term/gfxterm.c b/term/gfxterm.c
index fa19a5d85..7c99ae053 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -272,9 +272,9 @@ grub_gfxterm_init (void)
     err = grub_video_set_mode (DEFAULT_VIDEO_MODE, video_hook);
   else
     {
-      tmp = grub_malloc (grub_strlen (modevar)
-			 + sizeof (DEFAULT_VIDEO_MODE) + 1);
-      grub_sprintf (tmp, "%s;" DEFAULT_VIDEO_MODE, modevar);
+      tmp = grub_asprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
+      if (!tmp)
+	return grub_errno;
       err = grub_video_set_mode (tmp, video_hook);
       grub_free (tmp);
     }
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index fbed9eca1..88606a4bc 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -104,7 +104,7 @@ grub_ofconsole_getcharwidth (grub_uint32_t c __attribute__((unused)))
 static void
 grub_ofconsole_setcolorstate (grub_term_color_state state)
 {
-  char setcol[20];
+  char *setcol;
   int fg;
   int bg;
 
@@ -123,8 +123,10 @@ grub_ofconsole_setcolorstate (grub_term_color_state state)
       return;
     }
 
-  grub_sprintf (setcol, "\e[3%dm\e[4%dm", fg, bg);
-  grub_ofconsole_writeesc (setcol);
+  setcol = grub_asprintf ("\e[3%dm\e[4%dm", fg, bg);
+  if (setcol)
+    grub_ofconsole_writeesc (setcol);
+  grub_free (setcol);
 }
 
 static void
@@ -287,15 +289,16 @@ grub_ofconsole_getwh (void)
 static void
 grub_ofconsole_gotoxy (grub_uint8_t x, grub_uint8_t y)
 {
-  char s[11]; /* 5 + 3 + 3.  */
-
   if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_ANSI))
     {
+      char *s;
       grub_curr_x = x;
       grub_curr_y = y;
 
-      grub_sprintf (s, "\e[%d;%dH", y + 1, x + 1);
-      grub_ofconsole_writeesc (s);
+      s = grub_asprintf ("\e[%d;%dH", y + 1, x + 1);
+      if (s)
+	grub_ofconsole_writeesc (s);
+      grub_free (s);
     }
   else
     {
diff --git a/term/tparm.c b/term/tparm.c
index fa25bd32c..adf0b3a7c 100644
--- a/term/tparm.c
+++ b/term/tparm.c
@@ -167,7 +167,7 @@ save_text(const char *fmt, const char *s, int len)
 
     get_space(s_len + 1);
 
-    (void) grub_sprintf(out_buff + out_used, fmt, s);
+    (void) grub_snprintf(out_buff + out_used, s_len + 1, fmt, s);
     out_used += grub_strlen(out_buff + out_used);
 }
 
@@ -179,7 +179,7 @@ save_number(const char *fmt, int number, int len)
 
     get_space((unsigned) len + 1);
 
-    (void) grub_sprintf(out_buff + out_used, fmt, number);
+    (void) grub_snprintf(out_buff + out_used, len + 1, fmt, number);
     out_used += grub_strlen(out_buff + out_used);
 }
 
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index fa54fe414..d33ecb764 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -278,18 +278,26 @@ cmd_crc (char *pathname)
 static void
 fstest (char **images, int num_disks, int cmd, int n, char **args)
 {
-  char host_file[128];
-  char loop_name[8];
-  char *argv[3] = { "-p", loop_name, host_file};
+  char *host_file;
+  char *loop_name;
+  char *argv[3] = { "-p" };
   int i;
 
   for (i = 0; i < num_disks; i++)
     {
-      if (grub_strlen (images[i]) + 7 > sizeof (host_file))
-        grub_util_error ("Pathname %s too long.", images[i]);
+      loop_name = grub_asprintf ("loop%d", i);
+      host_file = grub_asprintf ("(host)%s", images[i]);
 
-      grub_sprintf (loop_name, "loop%d", i);
-      grub_sprintf (host_file, "(host)%s", images[i]);
+      if (!loop_name || !host_file)
+	{
+	  grub_free (loop_name);
+	  grub_free (host_file);
+	  grub_util_error (grub_errmsg);
+	  return;
+	}
+
+      argv[1] = loop_name;
+      argv[2] = host_file;
 
       if (execute_command ("loopback", 3, argv))
         grub_util_error ("loopback command fails.");
@@ -328,9 +336,19 @@ fstest (char **images, int num_disks, int cmd, int n, char **args)
 
   for (i = 0; i < num_disks; i++)
     {
-      grub_sprintf (loop_name, "loop%d", i);
+      grub_free (loop_name);
+      loop_name = grub_asprintf ("loop%d", i);
+      if (!loop_name)
+	{
+	  grub_free (host_file);
+	  grub_util_error (grub_errmsg);
+	  return;
+	}
       execute_command ("loopback", 2, argv);
     }
+
+  grub_free (loop_name);
+  grub_free (host_file);
 }
 
 static struct option options[] = {

From ac0289ba9269f9acc776b0ba7b4ad38134dfcedc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 29 Dec 2009 11:24:13 +0100
Subject: [PATCH 0189/1628] grub-mkrescue for EFI (untested)

---
 conf/common.rmk           |  6 ++++++
 conf/i386-coreboot.rmk    |  7 +------
 conf/i386-efi.rmk         |  3 +++
 conf/i386-ieee1275.rmk    |  7 +------
 conf/i386-pc.rmk          |  7 +------
 conf/powerpc-ieee1275.rmk |  6 ------
 conf/sparc64-ieee1275.rmk |  6 ------
 conf/x86_64-efi.rmk       |  3 +++
 util/grub-mkrescue.in     | 35 ++++++++++++++++++++++++++++++++---
 9 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index 896705526..a961e502a 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -632,3 +632,9 @@ pkglib_MODULES += setjmp.mod
 setjmp_mod_SOURCES = lib/$(target_cpu)/setjmp.S
 setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
 setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For memdisk.mod.
+pkglib_MODULES += memdisk.mod
+memdisk_mod_SOURCES = disk/memdisk.c
+memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
+memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index ccc326f5c..439e462c5 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -102,7 +102,7 @@ grub_mkrescue_SOURCES = util/grub-mkrescue.in
 # Modules.
 pkglib_MODULES = linux.mod multiboot.mod 		\
 	aout.mod play.mod serial.mod 			\
-	memdisk.mod pci.mod lspci.mod reboot.mod	\
+	pci.mod lspci.mod reboot.mod	\
 	halt.mod datetime.mod date.mod datehook.mod	\
 	lsmmap.mod mmap.mod
 
@@ -165,11 +165,6 @@ play_mod_SOURCES = commands/i386/pc/play.c
 play_mod_CFLAGS = $(COMMON_CFLAGS)
 play_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For pci.mod
 pci_mod_SOURCES = bus/pci.c
 pci_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index c135ded4e..e55d7c95a 100644
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -15,6 +15,9 @@ grub_mkimage_SOURCES = gnulib/progname.c util/i386/efi/grub-mkimage.c \
 	util/misc.c util/resolve.c
 util/i386/efi/grub-mkimage.c_DEPENDENCIES = Makefile
 
+bin_SCRIPTS += grub-mkrescue
+grub_mkrescue_SOURCES = util/grub-mkrescue.in
+
 # For grub-setup.
 #grub_setup_SOURCES = util/i386/pc/grub-setup.c util/hostdisk.c	\
 #	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 8d9577844..78a100c1a 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -56,7 +56,7 @@ grub_install_SOURCES = util/ieee1275/grub-install.in
 # Modules.
 pkglib_MODULES = halt.mod reboot.mod suspend.mod		\
 	aout.mod serial.mod linux.mod		\
-	nand.mod memdisk.mod pci.mod lspci.mod datetime.mod	\
+	nand.mod pci.mod lspci.mod datetime.mod	\
 	date.mod datehook.mod lsmmap.mod mmap.mod
 
 # For boot.mod.
@@ -106,11 +106,6 @@ nand_mod_SOURCES = disk/ieee1275/nand.c
 nand_mod_CFLAGS = $(COMMON_CFLAGS)
 nand_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For pci.mod
 pci_mod_SOURCES = bus/pci.c
 pci_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 7e54b3b67..b682aad94 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -121,7 +121,7 @@ grub_mkfloppy_SOURCES = util/i386/pc/grub-mkfloppy.in
 pkglib_MODULES = biosdisk.mod chain.mod 				\
 	multiboot.mod reboot.mod halt.mod				\
 	vbe.mod vbetest.mod vbeinfo.mod play.mod serial.mod		\
-	vga.mod memdisk.mod pci.mod lspci.mod				\
+	vga.mod pci.mod lspci.mod				\
 	aout.mod bsd.mod pxe.mod pxecmd.mod datetime.mod date.mod 	\
 	datehook.mod lsmmap.mod ata_pthru.mod hdparm.mod 		\
 	usb.mod uhci.mod ohci.mod usbtest.mod usbms.mod usb_keyboard.mod \
@@ -239,11 +239,6 @@ vga_mod_SOURCES = term/i386/pc/vga.c
 vga_mod_CFLAGS = $(COMMON_CFLAGS)
 vga_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For pci.mod
 pci_mod_SOURCES = bus/pci.c
 pci_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 85b1fa211..0b5b03c5d 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -62,7 +62,6 @@ pkglib_MODULES = halt.mod \
 	reboot.mod \
 	suspend.mod \
         multiboot.mod \
-	memdisk.mod \
 	lsmmap.mod
 
 # For boot.mod.
@@ -98,11 +97,6 @@ multiboot_mod_SOURCES = loader/ieee1275/multiboot2.c \
 multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
 multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For lsmmap.mod
 lsmmap_mod_SOURCES = commands/lsmmap.c
 lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 8c8bf27e6..dc845e1a5 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -99,7 +99,6 @@ grub_install_SOURCES = util/sparc64/ieee1275/grub-install.in
 pkglib_MODULES = halt.mod \
 	linux.mod \
 	reboot.mod \
-	memdisk.mod \
 	lsmmap.mod
 
 # For boot.mod.
@@ -123,11 +122,6 @@ halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For lsmmap.mod
 lsmmap_mod_SOURCES = commands/lsmmap.c
 lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 22ed2d639..2de6ab443 100644
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -14,6 +14,9 @@ bin_UTILITIES = grub-mkimage
 grub_mkimage_SOURCES = gnulib/progname.c util/i386/efi/grub-mkimage.c \
 	util/misc.c util/resolve.c
 
+bin_SCRIPTS += grub-mkrescue
+grub_mkrescue_SOURCES = util/grub-mkrescue.in
+
 # For grub-setup.
 #grub_setup_SOURCES = util/i386/pc/grub-setup.c util/hostdisk.c	\
 #	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 51639ccb1..30f319dc3 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -31,6 +31,8 @@ native_platform=@platform@
 
 coreboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-coreboot
 pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-pc
+efi32_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-efi
+efi64_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi
 
 # Usage: usage
 # Print the usage.
@@ -109,13 +111,23 @@ if [ "${override_dir}" = "" ] ; then
     if test -e "${pc_dir}" ; then
         process_input_dir ${pc_dir} pc
     fi
+    if test -e "${efi32_dir}" ; then
+        process_input_dir ${efi32_dir} efi32
+    fi
+    if test -e "${efi64_dir}" ; then
+        process_input_dir ${efi64_dir} efi64
+    fi
 else
     process_input_dir ${override_dir} ${native_platform}
     coreboot_dir=
     pc_dir=
-    case "${native_platform}" in
-        coreboot) coreboot_dir=${override_dir} ;;
-        pc) pc_dir=${override_dir} ;;
+    efi32_dir=
+    efi64_dir=
+    case "${target_cpu}-${native_platform}" in
+        i386-coreboot) coreboot_dir=${override_dir} ;;
+        i386-pc) pc_dir=${override_dir} ;;
+	i386-efi) efi32_dir=${override_dir} ;;
+	x86_64-efi) efi64_dir=${override_dir} ;;
     esac
 fi
 
@@ -168,6 +180,23 @@ if test -e "${pc_dir}" ; then
     grub_mkisofs_arguments="${grub_mkisofs_arguments} -b boot/grub/i386-pc/eltorito.img -boot-info-table"
 fi
 
+# build bootx64.efi
+if test -e "${efi64_dir}" ; then
+    echo "Generates bootx64.efi"
+    mkdir -p ${iso9660_dir}/efi/boot
+    grub-mkimage -d ${efi64_dir}/ -o ${iso9660_dir}/efi/boot/bootx64.efi --prefix=/boot/grub/x86_64-efi \
+        search iso9660 configfile sh 
+
+    modules="$(cat ${efi64_dir}/partmap.lst) ${modules}"
+    (for i in ${modules} ; do
+	if [ "x$i" != xkernel.mod ]; then
+            echo "insmod $i"
+	fi
+    done ; \
+    echo "source /boot/grub/grub.cfg") \
+    > ${iso9660_dir}/boot/grub/x86_64-efi/grub.cfg
+fi
+
 # build iso image
 grub-mkisofs ${grub_mkisofs_arguments} -o ${output_image} -r ${iso9660_dir} ${source}
 rm -rf ${iso9660_dir}

From 9a17588459f2bc876c7b3f4c9d86b0489ca1bc5b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 29 Dec 2009 17:31:02 +0100
Subject: [PATCH 0190/1628] Initial support for scalable gfxmenu

---
 gfxmenu/gui_box.c               | 232 +++++++++++++++++++-------------
 gfxmenu/gui_canvas.c            | 120 ++++++++---------
 gfxmenu/gui_circular_progress.c |  52 +------
 gfxmenu/gui_image.c             |  38 +-----
 gfxmenu/gui_label.c             |  36 +----
 gfxmenu/gui_list.c              |  64 +++------
 gfxmenu/gui_progress_bar.c      |  48 +------
 gfxmenu/gui_string_util.c       |  38 ------
 gfxmenu/theme_loader.c          | 104 ++++++++------
 gfxmenu/view.c                  |   4 +-
 include/grub/gui.h              |  59 +++++++-
 include/grub/gui_string_util.h  |   2 -
 include/grub/video.h            |   8 +-
 13 files changed, 368 insertions(+), 437 deletions(-)

diff --git a/gfxmenu/gui_box.c b/gfxmenu/gui_box.c
index 4fe131f98..45028e5b1 100644
--- a/gfxmenu/gui_box.c
+++ b/gfxmenu/gui_box.c
@@ -32,17 +32,16 @@ struct component_node
 typedef struct grub_gui_box *grub_gui_box_t;
 
 typedef void (*layout_func_t) (grub_gui_box_t self, int modify_layout,
-                               int *width, int *height);
+                               unsigned *minimal_width,
+			       unsigned *minimal_height);
 
 struct grub_gui_box
 {
-  struct grub_gui_container_ops *container;
+  struct grub_gui_container container;
 
   grub_gui_container_t parent;
   grub_video_rect_t bounds;
   char *id;
-  int preferred_width;
-  int preferred_height;
 
   /* Doubly linked list of components with dummy head & tail nodes.  */
   struct component_node chead;
@@ -87,82 +86,158 @@ box_is_instance (void *vself __attribute__((unused)), const char *type)
 
 static void
 layout_horizontally (grub_gui_box_t self, int modify_layout,
-                     int *width, int *height)
+                     unsigned *min_width, unsigned *min_height)
 {
   /* Start at the left (chead) and set the x coordinates as we go right.  */
   /* All components have their width set to the box's width.  */
 
   struct component_node *cur;
-  int x = 0;
-  if (height)
-    *height = 0;
+  unsigned w = 0, mwfrac = 0, h = 0, x = 0;
+  grub_fixed_unsigned_t wfrac = 0;
+  int bogus_frac = 0;
+
   for (cur = self->chead.next; cur != &self->ctail; cur = cur->next)
     {
       grub_gui_component_t c = cur->component;
+      unsigned mw = 0, mh = 0;
+
+      if (c->ops->get_minimal_size)
+	c->ops->get_minimal_size (c, &mw, &mh);
+
+      if (!c->ishfrac && c->h > h)
+	h = c->h;
+      if (mh > h)
+	h = mh;
+      if (!c->iswfrac)
+	w += mw > c->w ? mw : c->w;
+      if (c->iswfrac)
+	{
+	  wfrac += c->wfrac;
+	  mwfrac += mw;
+	}
+    }
+  if (wfrac > GRUB_FIXED_1 || (w > 0 && wfrac == GRUB_FIXED_1))
+    bogus_frac = 1;
+
+  if (min_width)
+    {
+      if (wfrac < GRUB_FIXED_1)
+	*min_width = grub_fixed_ufu_divide (w, GRUB_FIXED_1 - wfrac);
+      else
+	*min_width = w;
+      if (*min_width < w + mwfrac)
+	*min_width = w + mwfrac;
+    }
+  if (min_height)
+    *min_height = h;
+
+  if (!modify_layout)
+    return;
+
+  for (cur = self->chead.next; cur != &self->ctail; cur = cur->next)
+    {
       grub_video_rect_t r;
+      grub_gui_component_t c = cur->component;
+      unsigned mw = 0, mh = 0;
 
-      c->ops->get_preferred_size (c, &r.width, &r.height);
+      r.x = x;
+      r.y = 0;
+      r.width = 32;
+      r.height = h;
 
-      /* Check and possibly update the maximum width, if non-null.  */
-      if (height && r.height > *height)
-        *height = r.height;
+      if (c->ops->get_minimal_size)
+	c->ops->get_minimal_size (c, &mw, &mh);
 
-      /* Set the component's bounds, if the flag is set.  */
-      if (modify_layout)
-        {
-          r.x = x;
-          r.y = 0;
-          /* Width comes from the component's preferred size.  */
-          r.height = self->bounds.height;
-          c->ops->set_bounds (c, &r);
-        }
+      if (!c->iswfrac)
+	r.width = c->w;
+      if (c->iswfrac && !bogus_frac)
+	r.width = grub_fixed_ufu_multiply (self->bounds.width, c->wfrac);
+
+      if (r.width < mw)
+	r.width = mw;
+
+      c->ops->set_bounds (c, &r);
 
       x += r.width;
     }
-
-  /* Return the sum of the children's preferred widths.  */
-  if (width)
-    *width = x;
 }
 
 static void
 layout_vertically (grub_gui_box_t self, int modify_layout,
-                   int *width, int *height)
+                     unsigned *min_width, unsigned *min_height)
 {
-  /* Start at the top (chead) and set the y coordinates as we go down.  */
-  /* All components have their width set to the vbox's width.  */
+  /* Start at the top (chead) and set the y coordinates as we go rdown.  */
+  /* All components have their height set to the box's height.  */
 
   struct component_node *cur;
-  int y = 0;
-  if (width)
-    *width = 0;
+  unsigned h = 0, mhfrac = 0, w = 0, y = 0;
+  grub_fixed_unsigned_t hfrac = 0;
+  int bogus_frac = 0;
+
   for (cur = self->chead.next; cur != &self->ctail; cur = cur->next)
     {
       grub_gui_component_t c = cur->component;
+      unsigned mw = 0, mh = 0;
+
+      if (c->ops->get_minimal_size)
+	c->ops->get_minimal_size (c, &mw, &mh);
+
+      if (!c->iswfrac && c->w > w)
+	w = c->w;
+      if (mw > w)
+	w = mw;
+      if (!c->ishfrac)
+	h += mh > c->h ? mh : c->h;
+      if (c->ishfrac)
+	{
+	  hfrac += c->hfrac;
+	  mhfrac += mh;
+	}
+    }
+  if (hfrac > GRUB_FIXED_1 || (h > 0 && hfrac == GRUB_FIXED_1))
+    bogus_frac = 1;
+
+  if (min_height)
+    {
+      if (hfrac < GRUB_FIXED_1)
+	*min_height = grub_fixed_ufu_divide (h, GRUB_FIXED_1 - hfrac);
+      else
+	*min_height = h;
+      if (*min_height < h + mhfrac)
+	*min_height = h + mhfrac;
+    }
+  if (min_width)
+    *min_width = w;
+
+  if (!modify_layout)
+    return;
+
+  for (cur = self->chead.next; cur != &self->ctail; cur = cur->next)
+    {
       grub_video_rect_t r;
+      grub_gui_component_t c = cur->component;
+      unsigned mw = 0, mh = 0;
 
-      c->ops->get_preferred_size (c, &r.width, &r.height);
+      r.x = 0;
+      r.y = y;
+      r.width = w;
+      r.height = 32;
 
-      /* Check and possibly update the maximum width, if non-null.  */
-      if (width && r.width > *width)
-        *width = r.width;
+      if (c->ops->get_minimal_size)
+	c->ops->get_minimal_size (c, &mw, &mh);
 
-      /* Set the component's bounds, if the flag is set.  */
-      if (modify_layout)
-        {
-          r.x = 0;
-          r.y = y;
-          r.width = self->bounds.width;
-          /* Height comes from the component's preferred size.  */
-          c->ops->set_bounds (c, &r);
-        }
+      if (!c->ishfrac)
+	r.height = c->h;
+      if (c->ishfrac)
+	r.height = grub_fixed_ufu_multiply (self->bounds.height, c->hfrac);
+
+      if (r.height < mh)
+	r.height = mh;
+
+      c->ops->set_bounds (c, &r);
 
       y += r.height;
     }
-
-  /* Return the sum of the children's preferred heights.  */
-  if (height)
-    *height = y;
 }
 
 static void
@@ -213,16 +288,10 @@ box_get_bounds (void *vself, grub_video_rect_t *bounds)
 /* The box's preferred size is based on the preferred sizes
    of its children.  */
 static void
-box_get_preferred_size (void *vself, int *width, int *height)
+box_get_minimal_size (void *vself, unsigned *width, unsigned *height)
 {
   grub_gui_box_t self = vself;
   self->layout_func (self, 0, width, height);   /* Just calculate the size.  */
-
-  /* Allow preferred dimensions to override the computed dimensions.  */
-  if (self->preferred_width >= 0)
-    *width = self->preferred_width;
-  if (self->preferred_height >= 0)
-    *height = self->preferred_height;
 }
 
 static grub_err_t
@@ -241,15 +310,6 @@ box_set_property (void *vself, const char *name, const char *value)
       else
         self->id = 0;
     }
-  else if (grub_strcmp (name, "preferred_size") == 0)
-    {
-      int w;
-      int h;
-      if (grub_gui_parse_2_tuple (value, &w, &h) != GRUB_ERR_NONE)
-        return grub_errno;
-      self->preferred_width = w;
-      self->preferred_height = h;
-    }
 
   return grub_errno;
 }
@@ -303,21 +363,22 @@ box_iterate_children (void *vself,
     cb (cur->component, userdata);
 }
 
+static struct grub_gui_component_ops box_comp_ops =
+  {
+    .destroy = box_destroy,
+    .get_id = box_get_id,
+    .is_instance = box_is_instance,
+    .paint = box_paint,
+    .set_parent = box_set_parent,
+    .get_parent = box_get_parent,
+    .set_bounds = box_set_bounds,
+    .get_bounds = box_get_bounds,
+    .get_minimal_size = box_get_minimal_size,
+    .set_property = box_set_property
+  };
+
 static struct grub_gui_container_ops box_ops =
 {
-  .component =
-    {
-      .destroy = box_destroy,
-      .get_id = box_get_id,
-      .is_instance = box_is_instance,
-      .paint = box_paint,
-      .set_parent = box_set_parent,
-      .get_parent = box_get_parent,
-      .set_bounds = box_set_bounds,
-      .get_bounds = box_get_bounds,
-      .get_preferred_size = box_get_preferred_size,
-      .set_property = box_set_property
-    },
   .add = box_add,
   .remove = box_remove,
   .iterate_children = box_iterate_children
@@ -329,24 +390,13 @@ static grub_gui_box_t
 box_new (layout_func_t layout_func)
 {
   grub_gui_box_t box;
-  box = grub_malloc (sizeof (*box));
+  box = grub_zalloc (sizeof (*box));
   if (! box)
     return 0;
-  box->container = &box_ops;
-  box->parent = 0;
-  box->bounds.x = 0;
-  box->bounds.y = 0;
-  box->bounds.width = 0;
-  box->bounds.height = 0;
-  box->id = 0;
-  box->preferred_width = -1;
-  box->preferred_height = -1;
-  box->chead.component = 0;
-  box->chead.prev = 0;
+  box->container.ops = &box_ops;
+  box->container.component.ops = &box_comp_ops;
   box->chead.next = &box->ctail;
-  box->ctail.component = 0;
   box->ctail.prev = &box->chead;
-  box->ctail.next = 0;
   box->layout_func = layout_func;
   return box;
 }
diff --git a/gfxmenu/gui_canvas.c b/gfxmenu/gui_canvas.c
index d155364d7..8b55b2a73 100644
--- a/gfxmenu/gui_canvas.c
+++ b/gfxmenu/gui_canvas.c
@@ -32,13 +32,11 @@ struct component_node
 
 struct grub_gui_canvas
 {
-  struct grub_gui_container_ops *container;
+  struct grub_gui_container container;
 
   grub_gui_container_t parent;
   grub_video_rect_t bounds;
   char *id;
-  int preferred_width;
-  int preferred_height;
   /* Component list (dummy head node).  */
   struct component_node components;
 };
@@ -88,22 +86,52 @@ canvas_paint (void *vself, const grub_video_rect_t *region)
   grub_gui_set_viewport (&self->bounds, &vpsave);
   for (cur = self->components.next; cur; cur = cur->next)
     {
-      int pw;
-      int ph;
       grub_video_rect_t r;
       grub_gui_component_t comp;
 
       comp = cur->component;
 
-      /* Give the child its preferred size.  */
-      comp->ops->get_preferred_size (comp, &pw, &ph);
-      comp->ops->get_bounds (comp, &r);
-      if (r.width != pw || r.height != ph)
-        {
-          r.width = pw;
-          r.height = ph;
-          comp->ops->set_bounds (comp, &r);
-        }
+      r.x = 0;
+      r.y = 0;
+      r.width = 32;
+      r.height = 32;
+
+      if (!comp->iswfrac && comp->w)
+	r.width = comp->w;
+
+      if (!comp->ishfrac && comp->h)
+	r.height = comp->h;
+
+      if (!comp->isxfrac && comp->x)
+	r.x = comp->x;
+
+      if (!comp->isyfrac && comp->y)
+	r.y = comp->y;
+
+      if (comp->ishfrac && comp->hfrac)
+	r.height = grub_fixed_ufu_multiply (self->bounds.height, comp->hfrac);
+
+      if (comp->iswfrac && comp->wfrac)
+	r.width = grub_fixed_ufu_multiply (self->bounds.width, comp->wfrac);
+
+      if (comp->isxfrac && comp->xfrac)
+	r.x = grub_fixed_ufu_multiply (self->bounds.width, comp->xfrac);
+
+      if (comp->isyfrac && comp->yfrac)
+	r.y = grub_fixed_ufu_multiply (self->bounds.height, comp->yfrac);
+
+      if (comp->ops->get_minimal_size)
+	{
+	  unsigned mw;
+	  unsigned mh;
+	  comp->ops->get_minimal_size (comp, &mw, &mh);
+	  if (r.width < mw)
+	    r.width = mw;
+	  if (r.height < mh)
+	    r.height = mh;
+	}
+
+      comp->ops->set_bounds (comp, &r);
 
       /* Paint the child.  */
       if (grub_video_have_common_points (region, &r))
@@ -140,20 +168,6 @@ canvas_get_bounds (void *vself, grub_video_rect_t *bounds)
   *bounds = self->bounds;
 }
 
-static void
-canvas_get_preferred_size (void *vself, int *width, int *height)
-{
-  grub_gui_canvas_t self = vself;
-  *width = 0;
-  *height = 0;
-
-  /* Allow preferred dimensions to override the empty dimensions.  */
-  if (self->preferred_width >= 0)
-    *width = self->preferred_width;
-  if (self->preferred_height >= 0)
-    *height = self->preferred_height;
-}
-
 static grub_err_t
 canvas_set_property (void *vself, const char *name, const char *value)
 {
@@ -170,15 +184,6 @@ canvas_set_property (void *vself, const char *name, const char *value)
       else
         self->id = 0;
     }
-  else if (grub_strcmp (name, "preferred_size") == 0)
-    {
-      int w;
-      int h;
-      if (grub_gui_parse_2_tuple (value, &w, &h) != GRUB_ERR_NONE)
-        return grub_errno;
-      self->preferred_width = w;
-      self->preferred_height = h;
-    }
   return grub_errno;
 }
 
@@ -227,21 +232,21 @@ canvas_iterate_children (void *vself,
     cb (cur->component, userdata);
 }
 
+static struct grub_gui_component_ops canvas_comp_ops =
+{
+  .destroy = canvas_destroy,
+  .get_id = canvas_get_id,
+  .is_instance = canvas_is_instance,
+  .paint = canvas_paint,
+  .set_parent = canvas_set_parent,
+  .get_parent = canvas_get_parent,
+  .set_bounds = canvas_set_bounds,
+  .get_bounds = canvas_get_bounds,
+  .set_property = canvas_set_property
+};
+
 static struct grub_gui_container_ops canvas_ops =
 {
-  .component =
-    {
-      .destroy = canvas_destroy,
-      .get_id = canvas_get_id,
-      .is_instance = canvas_is_instance,
-      .paint = canvas_paint,
-      .set_parent = canvas_set_parent,
-      .get_parent = canvas_get_parent,
-      .set_bounds = canvas_set_bounds,
-      .get_bounds = canvas_get_bounds,
-      .get_preferred_size = canvas_get_preferred_size,
-      .set_property = canvas_set_property
-    },
   .add = canvas_add,
   .remove = canvas_remove,
   .iterate_children = canvas_iterate_children
@@ -251,19 +256,10 @@ grub_gui_container_t
 grub_gui_canvas_new (void)
 {
   grub_gui_canvas_t canvas;
-  canvas = grub_malloc (sizeof (*canvas));
+  canvas = grub_zalloc (sizeof (*canvas));
   if (! canvas)
     return 0;
-  canvas->container = &canvas_ops;
-  canvas->parent = 0;
-  canvas->bounds.x = 0;
-  canvas->bounds.y = 0;
-  canvas->bounds.width = 0;
-  canvas->bounds.height = 0;
-  canvas->id = 0;
-  canvas->preferred_width = -1;
-  canvas->preferred_height = -1;
-  canvas->components.component = 0;
-  canvas->components.next = 0;
+  canvas->container.ops = &canvas_ops;
+  canvas->container.component.ops = &canvas_comp_ops;
   return (grub_gui_container_t) canvas;
 }
diff --git a/gfxmenu/gui_circular_progress.c b/gfxmenu/gui_circular_progress.c
index f3c8bc3af..e57d1c236 100644
--- a/gfxmenu/gui_circular_progress.c
+++ b/gfxmenu/gui_circular_progress.c
@@ -28,13 +28,11 @@
 
 struct grub_gui_circular_progress
 {
-  struct grub_gui_component_ops *circprog_ops;
+  struct grub_gui_component comp;
 
   grub_gui_container_t parent;
   grub_video_rect_t bounds;
   char *id;
-  int preferred_width;
-  int preferred_height;
   int visible;
   int start;
   int end;
@@ -209,21 +207,6 @@ circprog_get_bounds (void *vself, grub_video_rect_t *bounds)
   *bounds = self->bounds;
 }
 
-static void
-circprog_get_preferred_size (void *vself, int *width, int *height)
-{
-  circular_progress_t self = vself;
-
-  *width = 0;
-  *height = 0;
-
-  /* Allow preferred dimensions to override the circprog dimensions.  */
-  if (self->preferred_width >= 0)
-    *width = self->preferred_width;
-  if (self->preferred_height >= 0)
-    *height = self->preferred_height;
-}
-
 static grub_err_t
 circprog_set_property (void *vself, const char *name, const char *value)
 {
@@ -270,15 +253,6 @@ circprog_set_property (void *vself, const char *name, const char *value)
       grub_free (self->theme_dir);
       self->theme_dir = value ? grub_strdup (value) : 0;
     }
-  else if (grub_strcmp (name, "preferred_size") == 0)
-    {
-      int w;
-      int h;
-      if (grub_gui_parse_2_tuple (value, &w, &h) != GRUB_ERR_NONE)
-        return grub_errno;
-      self->preferred_width = w;
-      self->preferred_height = h;
-    }
   else if (grub_strcmp (name, "visible") == 0)
     {
       self->visible = grub_strcmp (value, "false") != 0;
@@ -304,7 +278,6 @@ static struct grub_gui_component_ops circprog_ops =
   .get_parent = circprog_get_parent,
   .set_bounds = circprog_set_bounds,
   .get_bounds = circprog_get_bounds,
-  .get_preferred_size = circprog_get_preferred_size,
   .set_property = circprog_set_property
 };
 
@@ -312,32 +285,13 @@ grub_gui_component_t
 grub_gui_circular_progress_new (void)
 {
   circular_progress_t self;
-  self = grub_malloc (sizeof (*self));
+  self = grub_zalloc (sizeof (*self));
   if (! self)
     return 0;
-  self->circprog_ops = &circprog_ops;
-  self->parent = 0;
-  self->bounds.x = 0;
-  self->bounds.y = 0;
-  self->bounds.width = 0;
-  self->bounds.height = 0;
-  self->id = 0;
-  self->preferred_width = -1;
-  self->preferred_height = -1;
+  self->comp.ops = &circprog_ops;
   self->visible = 1;
-  self->start = 0;
-  self->end = 0;
-  self->value = 0;
   self->num_ticks = 64;
   self->start_angle = -64;
-  self->ticks_disappear = 0;
-
-  self->theme_dir = 0;
-  self->need_to_load_pixmaps = 0;
-  self->center_file = 0;
-  self->tick_file = 0;
-  self->center_bitmap = 0;
-  self->tick_bitmap = 0;
 
   return (grub_gui_component_t) self;
 }
diff --git a/gfxmenu/gui_image.c b/gfxmenu/gui_image.c
index eb2ff1ee0..ef8bcbe9a 100644
--- a/gfxmenu/gui_image.c
+++ b/gfxmenu/gui_image.c
@@ -26,13 +26,11 @@
 
 struct grub_gui_image
 {
-  struct grub_gui_component_ops *image;
+  struct grub_gui_component component;
 
   grub_gui_container_t parent;
   grub_video_rect_t bounds;
   char *id;
-  int preferred_width;
-  int preferred_height;
   struct grub_video_bitmap *raw_bitmap;
   struct grub_video_bitmap *bitmap;
 };
@@ -172,8 +170,9 @@ image_get_bounds (void *vself, grub_video_rect_t *bounds)
   *bounds = self->bounds;
 }
 
+/* FIXME: inform rendering system it's not forced minimum.  */
 static void
-image_get_preferred_size (void *vself, int *width, int *height)
+image_get_minimal_size (void *vself, unsigned *width, unsigned *height)
 {
   grub_gui_image_t self = vself;
 
@@ -187,12 +186,6 @@ image_get_preferred_size (void *vself, int *width, int *height)
       *width = 0;
       *height = 0;
     }
-
-  /* Allow preferred dimensions to override the image dimensions.  */
-  if (self->preferred_width >= 0)
-    *width = self->preferred_width;
-  if (self->preferred_height >= 0)
-    *height = self->preferred_height;
 }
 
 static grub_err_t
@@ -217,15 +210,6 @@ image_set_property (void *vself, const char *name, const char *value)
   grub_gui_image_t self = vself;
   if (grub_strcmp (name, "file") == 0)
     return load_image (self, value);
-  else if (grub_strcmp (name, "preferred_size") == 0)
-    {
-      int w;
-      int h;
-      if (grub_gui_parse_2_tuple (value, &w, &h) != GRUB_ERR_NONE)
-        return grub_errno;
-      self->preferred_width = w;
-      self->preferred_height = h;
-    }
   else if (grub_strcmp (name, "id") == 0)
     {
       grub_free (self->id);
@@ -247,7 +231,7 @@ static struct grub_gui_component_ops image_ops =
   .get_parent = image_get_parent,
   .set_bounds = image_set_bounds,
   .get_bounds = image_get_bounds,
-  .get_preferred_size = image_get_preferred_size,
+  .get_minimal_size = image_get_minimal_size,
   .set_property = image_set_property
 };
 
@@ -255,20 +239,10 @@ grub_gui_component_t
 grub_gui_image_new (void)
 {
   grub_gui_image_t image;
-  image = grub_malloc (sizeof (*image));
+  image = grub_zalloc (sizeof (*image));
   if (! image)
     return 0;
-  image->image = &image_ops;
-  image->parent = 0;
-  image->bounds.x = 0;
-  image->bounds.y = 0;
-  image->bounds.width = 0;
-  image->bounds.height = 0;
-  image->id = 0;
-  image->preferred_width = -1;
-  image->preferred_height = -1;
-  image->raw_bitmap = 0;
-  image->bitmap = 0;
+  image->component.ops = &image_ops;
   return (grub_gui_component_t) image;
 }
 
diff --git a/gfxmenu/gui_label.c b/gfxmenu/gui_label.c
index 30474f52f..b2835ea1a 100644
--- a/gfxmenu/gui_label.c
+++ b/gfxmenu/gui_label.c
@@ -39,13 +39,11 @@ enum align_mode {
 
 struct grub_gui_label
 {
-  struct grub_gui_component_ops *label;
+  struct grub_gui_component comp;
 
   grub_gui_container_t parent;
   grub_video_rect_t bounds;
   char *id;
-  int preferred_width;
-  int preferred_height;
   int visible;
   char *text;
   grub_font_t font;
@@ -140,18 +138,12 @@ label_get_bounds (void *vself, grub_video_rect_t *bounds)
 }
 
 static void
-label_get_preferred_size (void *vself, int *width, int *height)
+label_get_minimal_size (void *vself, unsigned *width, unsigned *height)
 {
   grub_gui_label_t self = vself;
   *width = grub_font_get_string_width (self->font, self->text);
   *height = (grub_font_get_ascent (self->font)
              + grub_font_get_descent (self->font));
-
-  /* Allow preferred dimensions to override the computed dimensions.  */
-  if (self->preferred_width >= 0)
-    *width = self->preferred_width;
-  if (self->preferred_height >= 0)
-    *height = self->preferred_height;
 }
 
 static grub_err_t
@@ -189,16 +181,6 @@ label_set_property (void *vself, const char *name, const char *value)
     {
       self->visible = grub_strcmp (value, "false") != 0;
     }
-  else if (grub_strcmp (name, "preferred_size") == 0)
-    {
-      int w;
-      int h;
-      if (grub_gui_parse_2_tuple (value, &w, &h) == GRUB_ERR_NONE)
-        {
-          self->preferred_width = w;
-          self->preferred_height = h;
-        }
-    }
   else if (grub_strcmp (name, "id") == 0)
     {
       grub_free (self->id);
@@ -220,7 +202,7 @@ static struct grub_gui_component_ops label_ops =
   .get_parent = label_get_parent,
   .set_bounds = label_set_bounds,
   .get_bounds = label_get_bounds,
-  .get_preferred_size = label_get_preferred_size,
+  .get_minimal_size = label_get_minimal_size,
   .set_property = label_set_property
 };
 
@@ -228,18 +210,10 @@ grub_gui_component_t
 grub_gui_label_new (void)
 {
   grub_gui_label_t label;
-  label = grub_malloc (sizeof (*label));
+  label = grub_zalloc (sizeof (*label));
   if (! label)
     return 0;
-  label->label = &label_ops;
-  label->parent = 0;
-  label->bounds.x = 0;
-  label->bounds.y = 0;
-  label->bounds.width = 0;
-  label->bounds.height = 0;
-  label->id = 0;
-  label->preferred_width = -1;
-  label->preferred_height = -1;
+  label->comp.ops = &label_ops;
   label->visible = 1;
   label->text = grub_strdup ("");
   label->font = grub_font_get ("Helvetica 10");
diff --git a/gfxmenu/gui_list.c b/gfxmenu/gui_list.c
index bf6d94657..c55cfd85c 100644
--- a/gfxmenu/gui_list.c
+++ b/gfxmenu/gui_list.c
@@ -26,13 +26,11 @@
 
 struct grub_gui_list_impl
 {
-  struct grub_gui_list_ops *list_ops;
+  struct grub_gui_list list;
 
   grub_gui_container_t parent;
   grub_video_rect_t bounds;
   char *id;
-  int preferred_width;
-  int preferred_height;
   int visible;
 
   int icon_width;
@@ -357,7 +355,7 @@ list_get_bounds (void *vself, grub_video_rect_t *bounds)
 }
 
 static void
-list_get_preferred_size (void *vself, int *width, int *height)
+list_get_minimal_size (void *vself, unsigned *width, unsigned *height)
 {
   list_impl_t self = vself;
 
@@ -387,12 +385,6 @@ list_get_preferred_size (void *vself, int *width, int *height)
       *width = 0;
       *height = 0;
     }
-
-  /* Allow preferred dimensions to override the computed dimensions.  */
-  if (self->preferred_width >= 0)
-    *width = self->preferred_width;
-  if (self->preferred_height >= 0)
-    *height = self->preferred_height;
 }
 
 static grub_err_t
@@ -507,15 +499,6 @@ list_set_property (void *vself, const char *name, const char *value)
       grub_free (self->theme_dir);
       self->theme_dir = value ? grub_strdup (value) : 0;
     }
-  else if (grub_strcmp (name, "preferred_size") == 0)
-    {
-      int w;
-      int h;
-      if (grub_gui_parse_2_tuple (value, &w, &h) != GRUB_ERR_NONE)
-        return grub_errno;
-      self->preferred_width = w;
-      self->preferred_height = h;
-    }
   else if (grub_strcmp (name, "id") == 0)
     {
       grub_free (self->id);
@@ -538,21 +521,22 @@ list_set_view_info (void *vself,
   self->menu = menu;
 }
 
+static struct grub_gui_component_ops list_comp_ops =
+  {
+    .destroy = list_destroy,
+    .get_id = list_get_id,
+    .is_instance = list_is_instance,
+    .paint = list_paint,
+    .set_parent = list_set_parent,
+    .get_parent = list_get_parent,
+    .set_bounds = list_set_bounds,
+    .get_bounds = list_get_bounds,
+    .get_minimal_size = list_get_minimal_size,
+    .set_property = list_set_property
+  };
+
 static struct grub_gui_list_ops list_ops =
 {
-  .component_ops =
-    {
-      .destroy = list_destroy,
-      .get_id = list_get_id,
-      .is_instance = list_is_instance,
-      .paint = list_paint,
-      .set_parent = list_set_parent,
-      .get_parent = list_get_parent,
-      .set_bounds = list_set_bounds,
-      .get_bounds = list_get_bounds,
-      .get_preferred_size = list_get_preferred_size,
-      .set_property = list_set_property
-    },
   .set_view_info = list_set_view_info
 };
 
@@ -564,19 +548,13 @@ grub_gui_list_new (void)
   grub_gui_color_t default_fg_color;
   grub_gui_color_t default_bg_color;
 
-  self = grub_malloc (sizeof (*self));
+  self = grub_zalloc (sizeof (*self));
   if (! self)
     return 0;
 
-  self->list_ops = &list_ops;
-  self->parent = 0;
-  self->bounds.x = 0;
-  self->bounds.y = 0;
-  self->bounds.width = 0;
-  self->bounds.height = 0;
-  self->id = 0;
-  self->preferred_width = -1;
-  self->preferred_height = -1;
+  self->list.ops = &list_ops;
+  self->list.component.ops = &list_comp_ops;
+
   self->visible = 1;
 
   default_font = grub_font_get ("Helvetica 12");
@@ -617,7 +595,7 @@ grub_gui_list_new (void)
   self->icon_manager = grub_gfxmenu_icon_manager_new ();
   if (! self->icon_manager)
     {
-      self->list_ops->component_ops.destroy (self);
+      self->list.component.ops->destroy (self);
       return 0;
     }
   grub_gfxmenu_icon_manager_set_icon_size (self->icon_manager,
diff --git a/gfxmenu/gui_progress_bar.c b/gfxmenu/gui_progress_bar.c
index 498711169..9af93cff5 100644
--- a/gfxmenu/gui_progress_bar.c
+++ b/gfxmenu/gui_progress_bar.c
@@ -27,13 +27,11 @@
 
 struct grub_gui_progress_bar
 {
-  struct grub_gui_component_ops *progress_bar;
+  struct grub_gui_component component;
 
   grub_gui_container_t parent;
   grub_video_rect_t bounds;
   char *id;
-  int preferred_width;
-  int preferred_height;
   int visible;
   int start;
   int end;
@@ -221,18 +219,11 @@ progress_bar_get_bounds (void *vself, grub_video_rect_t *bounds)
 }
 
 static void
-progress_bar_get_preferred_size (void *vself, int *width, int *height)
+progress_bar_get_minimal_size (void *vself __attribute__ ((unused)),
+			       unsigned *width, unsigned *height)
 {
-  grub_gui_progress_bar_t self = vself;
-
   *width = 200;
   *height = 28;
-
-  /* Allow preferred dimensions to override the progress_bar dimensions.  */
-  if (self->preferred_width >= 0)
-    *width = self->preferred_width;
-  if (self->preferred_height >= 0)
-    *height = self->preferred_height;
 }
 
 static grub_err_t
@@ -296,15 +287,6 @@ progress_bar_set_property (void *vself, const char *name, const char *value)
       grub_free (self->theme_dir);
       self->theme_dir = value ? grub_strdup (value) : 0;
     }
-  else if (grub_strcmp (name, "preferred_size") == 0)
-    {
-      int w;
-      int h;
-      if (grub_gui_parse_2_tuple (value, &w, &h) != GRUB_ERR_NONE)
-        return grub_errno;
-      self->preferred_width = w;
-      self->preferred_height = h;
-    }
   else if (grub_strcmp (name, "visible") == 0)
     {
       self->visible = grub_strcmp (value, "false") != 0;
@@ -334,7 +316,7 @@ static struct grub_gui_component_ops progress_bar_ops =
   .get_parent = progress_bar_get_parent,
   .set_bounds = progress_bar_set_bounds,
   .get_bounds = progress_bar_get_bounds,
-  .get_preferred_size = progress_bar_get_preferred_size,
+  .get_minimal_size = progress_bar_get_minimal_size,
   .set_property = progress_bar_set_property
 };
 
@@ -342,22 +324,11 @@ grub_gui_component_t
 grub_gui_progress_bar_new (void)
 {
   grub_gui_progress_bar_t self;
-  self = grub_malloc (sizeof (*self));
+  self = grub_zalloc (sizeof (*self));
   if (! self)
     return 0;
-  self->progress_bar = &progress_bar_ops;
-  self->parent = 0;
-  self->bounds.x = 0;
-  self->bounds.y = 0;
-  self->bounds.width = 0;
-  self->bounds.height = 0;
-  self->id = 0;
-  self->preferred_width = -1;
-  self->preferred_height = -1;
+  self->component.ops = &progress_bar_ops;
   self->visible = 1;
-  self->start = 0;
-  self->end = 0;
-  self->value = 0;
   self->show_text = 1;
   self->text = grub_strdup ("");
   self->font = grub_font_get ("Helvetica 10");
@@ -369,12 +340,5 @@ grub_gui_progress_bar_new (void)
   self->bg_color = gray;
   self->fg_color = lightgray;
 
-  self->theme_dir = 0;
-  self->need_to_recreate_pixmaps = 0;
-  self->bar_pattern = 0;
-  self->highlight_pattern = 0;
-  self->bar_box = 0;
-  self->highlight_box = 0;
-
   return (grub_gui_component_t) self;
 }
diff --git a/gfxmenu/gui_string_util.c b/gfxmenu/gui_string_util.c
index 8ea7c497b..8c51e396a 100644
--- a/gfxmenu/gui_string_util.c
+++ b/gfxmenu/gui_string_util.c
@@ -325,41 +325,3 @@ grub_gui_parse_color (const char *s, grub_gui_color_t *color)
     *color = c;
   return grub_errno;
 }
-
-/* Parse a value in the form "(x, y)", storing the first element (x) into
-   *PX and the second element (y) into *PY.
-   Returns GRUB_ERR_NONE if successfully parsed.  */
-grub_err_t
-grub_gui_parse_2_tuple (const char *s, int *px, int *py)
-{
-  int x;
-  int y;
-
-  while (*s && grub_isspace (*s))
-    s++;
-  if (*s != '(')
-    return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                       "missing `(' in 2-tuple `%s'", s);
-
-  /* Skip the opening parentheses.  */
-  s++;
-  if (*s == 0)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                       "unexpected end of 2-tuple after `(' in `%s'", s);
-
-  /* Parse the first element.  */
-  x = grub_strtol (s, 0, 10);
-  if ((s = grub_strchr (s, ',')) == 0)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                       "missing comma in 2-tuple `%s'", s);
-
-  /* Skip the element separator (the comma).  */
-  s++;
-  /* Parse the second element.  */
-  y = grub_strtol (s, 0, 10);
-
-  *px = x;
-  *py = y;
-
-  return grub_errno;
-}
diff --git a/gfxmenu/theme_loader.c b/gfxmenu/theme_loader.c
index 3512c7bf1..29bc1d2a6 100644
--- a/gfxmenu/theme_loader.c
+++ b/gfxmenu/theme_loader.c
@@ -510,35 +510,73 @@ read_object (struct parsebuf *p, grub_gui_container_t parent)
         }
 
       /* Handle the property value.  */
-      if (grub_strcmp (property, "position") == 0)
+      if (grub_strcmp (property, "left") == 0)
         {
-          /* Special case for position value.  */
-          int x;
-          int y;
-
-          if (grub_gui_parse_2_tuple (value, &x, &y) == GRUB_ERR_NONE)
-            {
-              grub_video_rect_t r;
-              component->ops->get_bounds (component, &r);
-              r.x = x;
-              r.y = y;
-              component->ops->set_bounds (component, &r);
-            }
+	  unsigned num;
+	  char *ptr;
+	  num = grub_strtoul (value, &ptr, 0);
+	  if (*ptr == '%')
+	    {
+	      component->isxfrac = 1;
+	      component->xfrac
+		= grub_fixed_fuf_divide (grub_unsigned_to_fixed (num), 100);
+	    }
+	  else
+	    {
+	      component->isxfrac = 0;
+	      component->x = num;
+	    }
         }
-      else if (grub_strcmp (property, "size") == 0)
+      else if (grub_strcmp (property, "top") == 0)
         {
-          /* Special case for size value.  */
-          int w;
-          int h;
-
-          if (grub_gui_parse_2_tuple (value, &w, &h) == GRUB_ERR_NONE)
-            {
-              grub_video_rect_t r;
-              component->ops->get_bounds (component, &r);
-              r.width = w;
-              r.height = h;
-              component->ops->set_bounds (component, &r);
-            }
+	  unsigned num;
+	  char *ptr;
+	  num = grub_strtoul (value, &ptr, 0);
+	  if (*ptr == '%')
+	    {
+	      component->isyfrac = 1;
+	      component->yfrac
+		= grub_fixed_fuf_divide (grub_unsigned_to_fixed (num), 100);
+	    }
+	  else
+	    {
+	      component->isyfrac = 0;
+	      component->y = num;
+	    }
+        }
+      else if (grub_strcmp (property, "width") == 0)
+        {
+	  unsigned num;
+	  char *ptr;
+	  num = grub_strtoul (value, &ptr, 0);
+	  if (*ptr == '%')
+	    {
+	      component->iswfrac = 1;
+	      component->wfrac
+		= grub_fixed_fuf_divide (grub_unsigned_to_fixed (num), 100);
+	    }
+	  else
+	    {
+	      component->iswfrac = 0;
+	      component->w = num;
+	    }
+        }
+      else if (grub_strcmp (property, "height") == 0)
+        {
+	  unsigned num;
+	  char *ptr;
+	  num = grub_strtoul (value, &ptr, 0);
+	  if (*ptr == '%')
+	    {
+	      component->ishfrac = 1;
+	      component->hfrac
+		= grub_fixed_fuf_divide (grub_unsigned_to_fixed (num), 100);
+	    }
+	  else
+	    {
+	      component->ishfrac = 0;
+	      component->h = num;
+	    }
         }
       else
         {
@@ -552,16 +590,6 @@ read_object (struct parsebuf *p, grub_gui_container_t parent)
         goto cleanup;
     }
 
-  /* Set the object's size to its preferred size unless the user has
-     explicitly specified the size.  */
-  component->ops->get_bounds (component, &bounds);
-  if (bounds.width == -1 || bounds.height == -1)
-    {
-      component->ops->get_preferred_size (component,
-                                          &bounds.width, &bounds.height);
-      component->ops->set_bounds (component, &bounds);
-    }
-
 cleanup:
   grub_free (name);
   return grub_errno;
@@ -665,7 +693,7 @@ grub_gfxmenu_view_load_theme (grub_gfxmenu_view_t view, const char *theme_path)
     }
 
   if (view->canvas)
-    view->canvas->ops->component.destroy (view->canvas);
+    view->canvas->component.ops->destroy (view->canvas);
 
   view->canvas = grub_gui_canvas_new ();
   ((grub_gui_component_t) view->canvas)
@@ -708,7 +736,7 @@ grub_gfxmenu_view_load_theme (grub_gfxmenu_view_t view, const char *theme_path)
 fail:
   if (view->canvas)
     {
-      view->canvas->ops->component.destroy (view->canvas);
+      view->canvas->component.ops->destroy (view->canvas);
       view->canvas = 0;
     }
 
diff --git a/gfxmenu/view.c b/gfxmenu/view.c
index e2348b6ef..414541dda 100644
--- a/gfxmenu/view.c
+++ b/gfxmenu/view.c
@@ -146,7 +146,7 @@ grub_gfxmenu_view_destroy (grub_gfxmenu_view_t view)
   grub_free (view->progress_message_text);
   grub_free (view->theme_path);
   if (view->canvas)
-    view->canvas->ops->component.destroy (view->canvas);
+    view->canvas->component.ops->destroy (view->canvas);
   grub_free (view);
 
   set_text_mode ();
@@ -354,7 +354,7 @@ grub_gfxmenu_view_redraw (grub_gfxmenu_view_t view,
 
   redraw_background (view, region);
   if (view->canvas)
-    view->canvas->ops->component.paint (view->canvas, region);
+    view->canvas->component.ops->paint (view->canvas, region);
   draw_title (view);
   if (grub_video_have_common_points (&view->progress_message_frame, region))
     draw_message (view);
diff --git a/include/grub/gui.h b/include/grub/gui.h
index 385c0962b..873d29e76 100644
--- a/include/grub/gui.h
+++ b/include/grub/gui.h
@@ -55,14 +55,13 @@ struct grub_gui_component_ops
   grub_gui_container_t (*get_parent) (void *self);
   void (*set_bounds) (void *self, const grub_video_rect_t *bounds);
   void (*get_bounds) (void *self, grub_video_rect_t *bounds);
-  void (*get_preferred_size) (void *self, int *width, int *height);
+  void (*get_minimal_size) (void *self, unsigned *width, unsigned *height);
   grub_err_t (*set_property) (void *self, const char *name, const char *value);
   void (*repaint) (void *self, int second_pass);
 };
 
 struct grub_gui_container_ops
 {
-  struct grub_gui_component_ops component;
   void (*add) (void *self, grub_gui_component_t comp);
   void (*remove) (void *self, grub_gui_component_t comp);
   void (*iterate_children) (void *self,
@@ -71,24 +70,78 @@ struct grub_gui_container_ops
 
 struct grub_gui_list_ops
 {
-  struct grub_gui_component_ops component_ops;
   void (*set_view_info) (void *self,
                          const char *theme_path,
                          grub_gfxmenu_model_t menu);
 };
 
+typedef grub_uint32_t grub_fixed_unsigned_t;
+#define GRUB_FIXED_1 0x10000
+
+static inline unsigned
+grub_fixed_ufu_divide (grub_uint32_t a, grub_fixed_unsigned_t b)
+{
+  return (a << 16) / b;
+}
+
+static inline grub_fixed_unsigned_t
+grub_fixed_fuf_divide (grub_fixed_unsigned_t a, grub_uint32_t b)
+{
+  return a / b;
+}
+
+static inline unsigned
+grub_fixed_ufu_multiply (grub_uint32_t a, grub_fixed_unsigned_t b)
+{
+  return (a * b) >> 16;
+}
+
+static inline unsigned
+grub_fixed_to_unsigned (grub_fixed_unsigned_t in)
+{
+  return in >> 16;
+}
+
+static inline grub_fixed_unsigned_t
+grub_unsigned_to_fixed (unsigned in)
+{
+  return in << 16;
+}
+
 struct grub_gui_component
 {
   struct grub_gui_component_ops *ops;
+  int isxfrac:1;
+  int isyfrac:1;
+  int iswfrac:1;
+  int ishfrac:1;
+  union {
+    unsigned x;
+    grub_fixed_unsigned_t xfrac;
+  };
+  union {
+    unsigned y;
+    grub_fixed_unsigned_t yfrac;
+  };
+  union {
+    unsigned w;
+    grub_fixed_unsigned_t wfrac;
+  };
+  union {
+    unsigned h;
+    grub_fixed_unsigned_t hfrac;
+  };
 };
 
 struct grub_gui_container
 {
+  struct grub_gui_component component;
   struct grub_gui_container_ops *ops;
 };
 
 struct grub_gui_list
 {
+  struct grub_gui_component component;
   struct grub_gui_list_ops *ops;
 };
 
diff --git a/include/grub/gui_string_util.h b/include/grub/gui_string_util.h
index 7b5fbb3ea..1baa2eede 100644
--- a/include/grub/gui_string_util.h
+++ b/include/grub/gui_string_util.h
@@ -34,6 +34,4 @@ int grub_gui_get_named_color (const char *name, grub_gui_color_t *color);
 
 grub_err_t grub_gui_parse_color (const char *s, grub_gui_color_t *color);
 
-grub_err_t grub_gui_parse_2_tuple (const char *s, int *px, int *py);
-
 #endif /* GRUB_GUI_STRING_UTIL_HEADER */
diff --git a/include/grub/video.h b/include/grub/video.h
index 833df04c8..868e87871 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -160,10 +160,10 @@ struct grub_video_mode_info
 /* A 2D rectangle type.  */
 struct grub_video_rect
 {
-  int x;
-  int y;
-  int width;
-  int height;
+  unsigned x;
+  unsigned y;
+  unsigned width;
+  unsigned height;
 };
 typedef struct grub_video_rect grub_video_rect_t;
 

From 07e727f751028b3f9cdfa2c0ab892b8307e41d2b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 29 Dec 2009 17:53:10 +0100
Subject: [PATCH 0191/1628] Add missing include

---
 normal/context.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/normal/context.c b/normal/context.c
index 412dbd84c..08a841699 100644
--- a/normal/context.c
+++ b/normal/context.c
@@ -22,6 +22,7 @@
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/command.h>
+#include <grub/normal.h>
 
 struct menu_pointer
 {

From 7a68c375f36455f16d5aeae14d9055bb164537aa Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 29 Dec 2009 17:57:20 +0100
Subject: [PATCH 0192/1628] Fix warnings

---
 gfxmenu/gfxmenu.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gfxmenu/gfxmenu.c b/gfxmenu/gfxmenu.c
index 1fe6e7297..1db96a80f 100644
--- a/gfxmenu/gfxmenu.c
+++ b/gfxmenu/gfxmenu.c
@@ -39,13 +39,13 @@
 
 grub_gfxmenu_view_t cached_view;
 
-void 
+static void 
 grub_gfxmenu_viewer_fini (void *data __attribute__ ((unused)))
 {
 }
 
 /* FIXME: Previously 't' changed to text menu is it necessary?  */
-grub_err_t
+static grub_err_t
 grub_gfxmenu_try (int entry, grub_menu_t menu, int nested)
 {
   grub_gfxmenu_view_t view = NULL;
@@ -76,8 +76,8 @@ grub_gfxmenu_try (int entry, grub_menu_t menu, int nested)
     }
 
   if (!cached_view || grub_strcmp (cached_view->theme_path, theme_path) != 0
-      || cached_view->screen.width != (int) mode_info.width
-      || cached_view->screen.height != (int) mode_info.height)
+      || cached_view->screen.width != mode_info.width
+      || cached_view->screen.height != mode_info.height)
     {
       grub_free (cached_view);
       /* Create the view.  */

From 8291c2a3c929359652cf115dae40e40110018f6a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 29 Dec 2009 18:40:52 +0100
Subject: [PATCH 0193/1628] Fix a missing declaration

---
 video/sm712.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/video/sm712.c b/video/sm712.c
index 52e43e9ae..5383b695e 100644
--- a/video/sm712.c
+++ b/video/sm712.c
@@ -68,6 +68,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
   grub_err_t err;
   int found = 0;
 
+  auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)));
   int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)))
     {
       grub_pci_address_t addr;

From 0997ea7a43b941074c370b631dbf0012ce35471d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 29 Dec 2009 22:19:00 +0100
Subject: [PATCH 0194/1628] Fix compilation on sparc64

---
 loader/sparc64/ieee1275/linux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/loader/sparc64/ieee1275/linux.c b/loader/sparc64/ieee1275/linux.c
index 3af93df7d..6513626d4 100644
--- a/loader/sparc64/ieee1275/linux.c
+++ b/loader/sparc64/ieee1275/linux.c
@@ -246,7 +246,7 @@ grub_linux_load64 (grub_elf_t elf)
   linux_entry = elf->ehdr.ehdr64.e_entry;
   linux_addr = 0x40004000;
   off = 0x4000;
-  linux_size = grub_elf64_size (elf);
+  linux_size = grub_elf64_size (elf, 0);
   if (linux_size == 0)
     return grub_errno;
 

From f8882fe8f92af456ebd629038d931276bdb0a1ff Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 29 Dec 2009 22:50:38 +0100
Subject: [PATCH 0195/1628] Fix mismerge

---
 normal/menu.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/normal/menu.c b/normal/menu.c
index 850350edd..17730eff3 100644
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -232,9 +232,6 @@ menu_fini (void)
   viewers = NULL;
 }
 
-/* FIXME: allow text menu in parallel with gfxmenu.  */
-grub_err_t (*grub_gfxmenu_try_hook) (int entry, grub_menu_t menu,
-				     int nested) = NULL;
 static void
 menu_init (int entry, grub_menu_t menu, int nested)
 {

From 16c8e9fd6618ab15d9d6743f68c1021961870775 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 29 Dec 2009 23:01:12 +0100
Subject: [PATCH 0196/1628] Reimport hotkey support

---
 ChangeLog.hotkey    |  9 +++++++++
 include/grub/menu.h |  2 ++
 normal/main.c       | 39 +++++++++++++++++++++++++++++++++++++++
 normal/menu.c       | 15 ++++++++++++---
 4 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 ChangeLog.hotkey

diff --git a/ChangeLog.hotkey b/ChangeLog.hotkey
new file mode 100644
index 000000000..1117b975c
--- /dev/null
+++ b/ChangeLog.hotkey
@@ -0,0 +1,9 @@
+2009-08-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Hotkey support
+
+	* include/grub/menu.h (grub_menu_entry): New field 'hotkey'.
+	* normal/main.c (hotkey_aliases): New variable.
+	(grub_normal_add_menu_entry): Parse "--hotkey".
+	* normal/menu_text.c (run_menu): Handle hotkeys.
+
diff --git a/include/grub/menu.h b/include/grub/menu.h
index 78f461b92..e5e5fb110 100644
--- a/include/grub/menu.h
+++ b/include/grub/menu.h
@@ -47,6 +47,8 @@ struct grub_menu_entry
   /* The sourcecode of the menu entry, used by the editor.  */
   const char *sourcecode;
 
+  int hotkey;
+
   /* The next element.  */
   struct grub_menu_entry *next;
 };
diff --git a/normal/main.c b/normal/main.c
index 6d7a558f3..fd1088a10 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -155,6 +155,17 @@ free_menu_entry_classes (struct grub_menu_entry_class *head)
     }
 }
 
+static struct
+{
+  char *name;
+  int key;
+} hotkey_aliases[] =
+  {
+    {"backspace", '\b'},
+    {"tab", '\t'},
+    {"delete", GRUB_TERM_DC}
+  };
+
 /* Add a menu entry to the current menu context (as given by the environment
    variable data slot `menu').  As the configuration file is read, the script
    parser calls this when a menu entry is to be created.  */
@@ -171,6 +182,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
   struct grub_menu_entry_class *classes_head;  /* Dummy head node for list.  */
   struct grub_menu_entry_class *classes_tail;
   char *users = NULL;
+  int hotkey = 0;
 
   /* Allocate dummy head node for class list.  */
   classes_head = grub_zalloc (sizeof (struct grub_menu_entry_class));
@@ -237,6 +249,32 @@ grub_normal_add_menu_entry (int argc, const char **args,
 
 	      continue;
 	    }
+	  else if (grub_strcmp(arg, "hotkey") == 0)
+	    {
+	      unsigned j;
+
+	      i++;
+	      if (args[i][1] == 0)
+		{
+		  hotkey = args[i][0];
+		  continue;
+		}
+
+	      for (j = 0; j < ARRAY_SIZE (hotkey_aliases); j++)
+		if (grub_strcmp (args[i], hotkey_aliases[j].name) == 0)
+		  {
+		    hotkey = hotkey_aliases[j].key;
+		    break;
+		  }
+
+	      if (j < ARRAY_SIZE (hotkey_aliases))
+		continue;
+
+	      failed = 1;
+	      grub_error (GRUB_ERR_MENU,
+			  "Invalid hotkey: '%s'.", args[i]);
+	      break;
+	    }
 	  else
 	    {
 	      /* Handle invalid argument.  */
@@ -293,6 +331,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
     }
 
   (*last)->title = menutitle;
+  (*last)->hotkey = hotkey;
   (*last)->classes = classes_head;
   if (users)
     (*last)->restricted = 1;
diff --git a/normal/menu.c b/normal/menu.c
index 850350edd..19e83831d 100644
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -232,9 +232,6 @@ menu_fini (void)
   viewers = NULL;
 }
 
-/* FIXME: allow text menu in parallel with gfxmenu.  */
-grub_err_t (*grub_gfxmenu_try_hook) (int entry, grub_menu_t menu,
-				     int nested) = NULL;
 static void
 menu_init (int entry, grub_menu_t menu, int nested)
 {
@@ -479,6 +476,18 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
 	      goto refresh;
 
 	    default:
+	      {
+		grub_menu_entry_t entry;
+		int i;
+		for (i = 0, entry = menu->entry_list; i < menu->size;
+		     i++, entry = entry->next)
+		  if (entry->hotkey == c)
+		    {
+		      menu_fini ();
+		      *auto_boot = 0;
+		      return i;
+		    }
+	      }
 	      break;
 	    }
 	}

From 1ad5c7f8446edf88765b9e48313228b43c23ad7e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 29 Dec 2009 23:32:31 +0100
Subject: [PATCH 0197/1628] Fix compilation warning

---
 gnulib/regex_internal.h    |  2 +-
 include/grub/gnulib-wrap.h | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnulib/regex_internal.h b/gnulib/regex_internal.h
index 977f8b02c..3cdc548d3 100644
--- a/gnulib/regex_internal.h
+++ b/gnulib/regex_internal.h
@@ -58,7 +58,7 @@
 # define SIZE_MAX ((size_t) -1)
 #endif
 
-#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCSCOLL) || _LIBC
+#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCSCOLL) || defined (_LIBC)
 # define RE_ENABLE_I18N
 #endif
 
diff --git a/include/grub/gnulib-wrap.h b/include/grub/gnulib-wrap.h
index 0e9235c18..e3f7b23b0 100644
--- a/include/grub/gnulib-wrap.h
+++ b/include/grub/gnulib-wrap.h
@@ -22,6 +22,14 @@
 #include <grub/mm.h>
 #include <grub/misc.h>
 
+#define HAVE_ISBLANK 0
+#define HAVE_LIBINTL_H 0
+#define HAVE_LOCALE_H 0
+#define __STRICT_ANSI__ 0
+#define DEBUG 0
+#define _Restrict_ __restrict
+#define _Restrict_arr_ __restrict
+
 typedef grub_size_t size_t;
 typedef int bool;
 static const bool true = 1;
@@ -165,6 +173,12 @@ calloc (grub_size_t size, grub_size_t nelem)
   return grub_zalloc (size * nelem);
 }
 
+static inline char *strncpy (char *dest, const char *src, int c)
+{
+  return grub_strncpy (dest, src, c);
+}
+
+
 #define ULONG_MAX GRUB_ULONG_MAX
 #define UCHAR_MAX 0xff
 

From 11c22894af0bd5d82be12740424befc75e67451a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 30 Dec 2009 14:24:10 +0100
Subject: [PATCH 0198/1628] Fix warning in kern/misc.c

---
 kern/misc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kern/misc.c b/kern/misc.c
index 087bef7fe..2b0db8518 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -630,7 +630,7 @@ grub_lltoa (char *str, int c, unsigned long long n)
 }
 
 static int
-grub_vsnprintf_real (char *str, grub_size_t n, const char *fmt, va_list args)
+grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt, va_list args)
 {
   char c;
   grub_size_t count = 0;
@@ -642,7 +642,7 @@ grub_vsnprintf_real (char *str, grub_size_t n, const char *fmt, va_list args)
     {
       if (str)
 	{
-	  if (count < n)
+	  if (count < max_len)
 	    *str++ = ch;
 	}
       else

From ba2d24dc113d5c2634797860ede3de57904ee700 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 30 Dec 2009 15:31:45 +0100
Subject: [PATCH 0199/1628] Add missing -ffreestanding on mips

---
 conf/mips.rmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/mips.rmk b/conf/mips.rmk
index a6fcaf88e..1ef9579e8 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -2,7 +2,7 @@
 # -*- makefile -*-
 
 COMMON_ASFLAGS += -nostdinc
-COMMON_CFLAGS += -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
+COMMON_CFLAGS += -ffreestanding -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
 COMMON_LDFLAGS += -nostdlib
 
 # Used by various components.  These rules need to precede them.

From eb3f57d3c4d74327badc321c21a9c6eb81d396a6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 31 Dec 2009 13:07:51 +0100
Subject: [PATCH 0200/1628] proof of concept interrupt wrapping

---
 conf/i386-pc.rmk                |   2 +-
 disk/i386/pc/biosdisk.c         |  54 ++++++++++++
 include/grub/i386/pc/biosdisk.h |   2 -
 include/grub/i386/pc/int.h      |  50 +++++++++++
 kern/i386/pc/startup.S          | 146 ++++++++++++++++----------------
 5 files changed, 176 insertions(+), 78 deletions(-)
 create mode 100644 include/grub/i386/pc/int.h

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 4ae753776..45020819a 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -64,7 +64,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
 	machine/biosdisk.h machine/boot.h machine/console.h machine/init.h \
 	machine/memory.h machine/loader.h machine/vga.h machine/vbe.h \
-	machine/kernel.h machine/pxe.h i386/pit.h list.h handler.h command.h i18n.h
+	machine/kernel.h machine/pxe.h i386/pit.h list.h handler.h command.h i18n.h machine/int.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
diff --git a/disk/i386/pc/biosdisk.c b/disk/i386/pc/biosdisk.c
index af184b1ba..0f75dba5f 100644
--- a/disk/i386/pc/biosdisk.c
+++ b/disk/i386/pc/biosdisk.c
@@ -19,6 +19,7 @@
 #include <grub/machine/biosdisk.h>
 #include <grub/machine/memory.h>
 #include <grub/machine/kernel.h>
+#include <grub/machine/int.h>
 #include <grub/disk.h>
 #include <grub/dl.h>
 #include <grub/mm.h>
@@ -28,6 +29,59 @@
 #include <grub/term.h>
 
 static int cd_drive = 0;
+static int grub_biosdisk_rw_int13_extensions (int ah, int drive, void *dap);
+
+static int grub_biosdisk_get_num_floppies (void)
+{
+  struct grub_cpu_int_registers regs;
+  int drive;
+
+  /* reset the disk system first */
+  regs.ax = 0;
+  regs.dx = 0;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+
+  grub_cpu_interrupt (0x13, &regs);
+
+  for (drive = 0; drive < 2; drive++)
+    {
+      regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT | GRUB_CPU_INT_FLAGS_CARRY;
+      regs.dx = drive;
+
+      /* call GET DISK TYPE */
+      regs.ax = 0x1500;
+      grub_cpu_interrupt (0x13, &regs);
+      if (regs.flags & GRUB_CPU_INT_FLAGS_CARRY)
+	break;
+
+      /* check if this drive exists */
+      if (!(regs.ax & 0x300))
+	break;
+    }
+
+  return drive;
+}
+
+/*
+ *   Call IBM/MS INT13 Extensions (int 13 %ah=AH) for DRIVE. DAP
+ *   is passed for disk address packet. If an error occurs, return
+ *   non-zero, otherwise zero.
+ */
+
+static int 
+grub_biosdisk_rw_int13_extensions (int ah, int drive, void *dap)
+{
+  struct grub_cpu_int_registers regs;
+  regs.ax = ah << 8;
+  /* compute the address of disk_address_packet */
+  regs.ds = (((grub_addr_t) dap) & 0xffff0000) >> 4;
+  regs.si = (((grub_addr_t) dap) & 0xffff);
+  regs.dx = drive;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+
+  grub_cpu_interrupt (0x13, &regs);
+  return regs.ax >> 8;
+}
 
 static int
 grub_biosdisk_get_drive (const char *name)
diff --git a/include/grub/i386/pc/biosdisk.h b/include/grub/i386/pc/biosdisk.h
index b87e0e433..83d833cad 100644
--- a/include/grub/i386/pc/biosdisk.h
+++ b/include/grub/i386/pc/biosdisk.h
@@ -106,7 +106,6 @@ struct grub_biosdisk_dap
   grub_uint64_t block;
 } __attribute__ ((packed));
 
-int EXPORT_FUNC(grub_biosdisk_rw_int13_extensions) (int ah, int drive, void *dap);
 int EXPORT_FUNC(grub_biosdisk_rw_standard) (int ah, int drive, int coff, int hoff,
 			       int soff, int nsec, int segment);
 int EXPORT_FUNC(grub_biosdisk_check_int13_extensions) (int drive);
@@ -118,7 +117,6 @@ int EXPORT_FUNC(grub_biosdisk_get_diskinfo_standard) (int drive,
 					 unsigned long *cylinders,
 					 unsigned long *heads,
 					 unsigned long *sectors);
-int EXPORT_FUNC(grub_biosdisk_get_num_floppies) (void);
 
 void grub_biosdisk_init (void);
 void grub_biosdisk_fini (void);
diff --git a/include/grub/i386/pc/int.h b/include/grub/i386/pc/int.h
new file mode 100644
index 000000000..b8cbe3260
--- /dev/null
+++ b/include/grub/i386/pc/int.h
@@ -0,0 +1,50 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/>.
+ */
+
+#ifndef GRUB_INTERRUPT_MACHINE_HEADER
+#define GRUB_INTERRUPT_MACHINE_HEADER	1
+
+#include <grub/symbol.h>
+
+struct grub_cpu_int_registers
+{
+  grub_uint16_t bx;
+  grub_uint16_t es;
+  grub_uint16_t cx;
+  grub_uint16_t ax;
+  grub_uint16_t dx;
+  grub_uint16_t ds;
+  grub_uint16_t di;
+  grub_uint16_t flags;
+  grub_uint16_t si;
+};
+
+#define  GRUB_CPU_INT_FLAGS_CARRY     0x1
+#define  GRUB_CPU_INT_FLAGS_PARITY    0x4
+#define  GRUB_CPU_INT_FLAGS_ADJUST    0x10
+#define  GRUB_CPU_INT_FLAGS_ZERO      0x40
+#define  GRUB_CPU_INT_FLAGS_SIGN      0x80
+#define  GRUB_CPU_INT_FLAGS_TRAP      0x100
+#define  GRUB_CPU_INT_FLAGS_INTERRUPT 0x200
+#define  GRUB_CPU_INT_FLAGS_DIRECTION 0x400
+#define  GRUB_CPU_INT_FLAGS_OVERFLOW  0x800
+#define  GRUB_CPU_INT_FLAGS_DEFAULT   GRUB_CPU_INT_FLAGS_INTERRUPT
+
+void EXPORT_FUNC (grub_cpu_interrupt) (grub_uint8_t intno, struct grub_cpu_int_registers *regs);
+
+#endif
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index 06e26dea3..815686502 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -566,44 +566,6 @@ FUNCTION(grub_chainloader_real_boot)
 
 #include "../loader.S"
 
-/*
- *   int grub_biosdisk_rw_int13_extensions (int ah, int drive, void *dap)
- *
- *   Call IBM/MS INT13 Extensions (int 13 %ah=AH) for DRIVE. DAP
- *   is passed for disk address packet. If an error occurs, return
- *   non-zero, otherwise zero.
- */
-
-FUNCTION(grub_biosdisk_rw_int13_extensions)
-	pushl	%ebp
-	pushl	%esi
-
-	/* compute the address of disk_address_packet */
-	movw	%cx, %si
-	xorw	%cx, %cx
-	shrl	$4, %ecx	/* save the segment to cx */
-
-	/* ah */
-	movb	%al, %dh
-	/* enter real mode */
-	call	prot_to_real
-
-	.code16
-	movb	%dh, %ah
-	movw	%cx, %ds
-	int	$0x13		/* do the operation */
-	movb	%ah, %dl	/* save return value */
-	/* back to protected mode */
-	DATA32	call	real_to_prot
-	.code32
-
-	movb	%dl, %al	/* return value in %eax */
-
-	popl	%esi
-	popl	%ebp
-
-	ret
-
 /*
  *   int grub_biosdisk_rw_standard (int ah, int drive, int coff, int hoff,
  *                                  int soff, int nsec, int segment)
@@ -861,43 +823,6 @@ noclean2:
 	ret	$4
 
 
-/*
- * int grub_biosdisk_get_num_floppies (void)
- */
-FUNCTION(grub_biosdisk_get_num_floppies)
-	pushl	%ebp
-
-	xorl	%edx, %edx
-	call	prot_to_real
-
-	.code16
-	/* reset the disk system first */
-	int	$0x13
-1:
-	stc
-
-	/* call GET DISK TYPE */
-	movb	$0x15, %ah
-	int	$0x13
-
-	jc	2f
-
-	/* check if this drive exists */
-	testb	$0x3, %ah
-	jz	2f
-
-	incb	%dl
-	cmpb	$2, %dl
-	jne	1b
-2:
-	DATA32	call	real_to_prot
-	.code32
-
-	movl	%edx, %eax
-	popl	%ebp
-	ret
-
-
 /*
  *
  * grub_get_memsize(i) :  return the memory size in KB. i == 0 for conventional
@@ -2142,3 +2067,74 @@ FUNCTION(grub_pxe_call)
 	popl	%esi
 	popl	%ebp
 	ret
+
+FUNCTION(grub_cpu_interrupt)
+	pushl    %ebp
+	pushl    %esi
+	pushl    %edi
+	pushl    %ebx
+	pushl    %edx
+	movb     %al, intno
+	movl     %edx, %esi
+
+	movl     0(%esi), %ebx
+	movl	 4(%esi), %ecx
+	movl     8(%esi), %edx
+	movl     12(%esi), %edi
+	movw     16(%esi), %si
+
+	call    prot_to_real
+	.code16
+	movl    %edi, %eax
+	shrl    $16, %eax
+	push    %ax
+
+	movl    %ebx, %eax
+	shrl    $16, %eax
+	movw    %ax, %es
+	
+	movl    %edx, %eax
+	shrl    $16, %eax
+	movw    %ax, %ds
+
+	movl    %ecx, %eax
+	shrl    $16, %eax
+
+	popf
+	.byte   0xcd
+intno:	
+	.byte   0
+
+	pushf
+	andl    $0xffff, %ebx
+	andl    $0xffff, %ecx
+	andl    $0xffff, %edx
+	andl    $0xffff, %edi
+
+	shll    $16, %eax
+	orl     %eax, %ecx
+
+	movw    %ds, %ax
+	shll    $16, %eax
+	orl     %eax, %edx
+
+	pop     %ax
+	shll    $16, %eax
+	orl     %eax, %edi
+
+	DATA32  call	real_to_prot
+	.code32
+	pushl    %esi
+	movl     4(%esp), %esi
+	movl     %ebx, 0(%esi)
+	movl     %ecx, 4(%esi)
+	movl     %edx, 8(%esi)
+	movl     %edi, 12(%esi)
+	popl     %eax
+	movw     %ax, 16(%esi)
+	popl     %eax
+	popl	 %ebx
+	popl	 %edi
+	popl	 %esi
+	popl     %ebp
+	ret

From 18277ec1f74e10d0f2d1fc0798e4e020810e15e5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 31 Dec 2009 14:03:45 +0100
Subject: [PATCH 0201/1628] Fix typo

---
 kern/misc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kern/misc.c b/kern/misc.c
index 2b0db8518..047b1e845 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -914,7 +914,7 @@ grub_avsprintf (const char *fmt, va_list ap)
       if (!ret)
 	return NULL;
 
-      s = grub_vsnprintf (ret, as, fmt, ap);
+      s = grub_vsnprintf_real (ret, as, fmt, ap);
       if (s <= as)
 	return ret;
 

From b9da1700808ea5d8492aaf7c9daa0dcc048e5271 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 5 Jan 2010 19:38:11 +0100
Subject: [PATCH 0202/1628] Preliminary support for mixed percent and linear
 declarations

---
 gfxmenu/gui_box.c      |  50 ++++++++-----------
 gfxmenu/gui_canvas.c   |  66 +++++++++++++------------
 gfxmenu/theme_loader.c | 108 +++++++++++++++--------------------------
 include/grub/gui.h     |  58 +++++++++-------------
 4 files changed, 117 insertions(+), 165 deletions(-)

diff --git a/gfxmenu/gui_box.c b/gfxmenu/gui_box.c
index 45028e5b1..38b15f96d 100644
--- a/gfxmenu/gui_box.c
+++ b/gfxmenu/gui_box.c
@@ -93,7 +93,7 @@ layout_horizontally (grub_gui_box_t self, int modify_layout,
 
   struct component_node *cur;
   unsigned w = 0, mwfrac = 0, h = 0, x = 0;
-  grub_fixed_unsigned_t wfrac = 0;
+  grub_fixed_signed_t wfrac = 0;
   int bogus_frac = 0;
 
   for (cur = self->chead.next; cur != &self->ctail; cur = cur->next)
@@ -104,17 +104,14 @@ layout_horizontally (grub_gui_box_t self, int modify_layout,
       if (c->ops->get_minimal_size)
 	c->ops->get_minimal_size (c, &mw, &mh);
 
-      if (!c->ishfrac && c->h > h)
+      if (c->h > (signed) h)
 	h = c->h;
       if (mh > h)
 	h = mh;
-      if (!c->iswfrac)
-	w += mw > c->w ? mw : c->w;
-      if (c->iswfrac)
-	{
-	  wfrac += c->wfrac;
-	  mwfrac += mw;
-	}
+      wfrac += c->wfrac;
+      w += c->w;
+      if (mw - c->w > 0)
+	mwfrac += mw - c->w;
     }
   if (wfrac > GRUB_FIXED_1 || (w > 0 && wfrac == GRUB_FIXED_1))
     bogus_frac = 1;
@@ -122,7 +119,7 @@ layout_horizontally (grub_gui_box_t self, int modify_layout,
   if (min_width)
     {
       if (wfrac < GRUB_FIXED_1)
-	*min_width = grub_fixed_ufu_divide (w, GRUB_FIXED_1 - wfrac);
+	*min_width = grub_fixed_sfs_divide (w, GRUB_FIXED_1 - wfrac);
       else
 	*min_width = w;
       if (*min_width < w + mwfrac)
@@ -142,16 +139,14 @@ layout_horizontally (grub_gui_box_t self, int modify_layout,
 
       r.x = x;
       r.y = 0;
-      r.width = 32;
       r.height = h;
 
       if (c->ops->get_minimal_size)
 	c->ops->get_minimal_size (c, &mw, &mh);
 
-      if (!c->iswfrac)
-	r.width = c->w;
-      if (c->iswfrac && !bogus_frac)
-	r.width = grub_fixed_ufu_multiply (self->bounds.width, c->wfrac);
+      r.width = c->w;
+      if (!bogus_frac)
+	r.width += grub_fixed_sfs_multiply (self->bounds.width, c->wfrac);
 
       if (r.width < mw)
 	r.width = mw;
@@ -171,7 +166,7 @@ layout_vertically (grub_gui_box_t self, int modify_layout,
 
   struct component_node *cur;
   unsigned h = 0, mhfrac = 0, w = 0, y = 0;
-  grub_fixed_unsigned_t hfrac = 0;
+  grub_fixed_signed_t hfrac = 0;
   int bogus_frac = 0;
 
   for (cur = self->chead.next; cur != &self->ctail; cur = cur->next)
@@ -182,17 +177,14 @@ layout_vertically (grub_gui_box_t self, int modify_layout,
       if (c->ops->get_minimal_size)
 	c->ops->get_minimal_size (c, &mw, &mh);
 
-      if (!c->iswfrac && c->w > w)
+      if (c->w > (signed) w)
 	w = c->w;
       if (mw > w)
 	w = mw;
-      if (!c->ishfrac)
-	h += mh > c->h ? mh : c->h;
-      if (c->ishfrac)
-	{
-	  hfrac += c->hfrac;
-	  mhfrac += mh;
-	}
+      hfrac += c->hfrac;
+      h += c->h;
+      if (mh - c->h > 0)
+	mhfrac += mh - c->h;
     }
   if (hfrac > GRUB_FIXED_1 || (h > 0 && hfrac == GRUB_FIXED_1))
     bogus_frac = 1;
@@ -200,7 +192,7 @@ layout_vertically (grub_gui_box_t self, int modify_layout,
   if (min_height)
     {
       if (hfrac < GRUB_FIXED_1)
-	*min_height = grub_fixed_ufu_divide (h, GRUB_FIXED_1 - hfrac);
+	*min_height = grub_fixed_sfs_divide (h, GRUB_FIXED_1 - hfrac);
       else
 	*min_height = h;
       if (*min_height < h + mhfrac)
@@ -221,15 +213,13 @@ layout_vertically (grub_gui_box_t self, int modify_layout,
       r.x = 0;
       r.y = y;
       r.width = w;
-      r.height = 32;
 
       if (c->ops->get_minimal_size)
 	c->ops->get_minimal_size (c, &mw, &mh);
 
-      if (!c->ishfrac)
-	r.height = c->h;
-      if (c->ishfrac)
-	r.height = grub_fixed_ufu_multiply (self->bounds.height, c->hfrac);
+      r.height = c->h;
+      if (!bogus_frac)
+	r.height += grub_fixed_sfs_multiply (self->bounds.height, c->hfrac);
 
       if (r.height < mh)
 	r.height = mh;
diff --git a/gfxmenu/gui_canvas.c b/gfxmenu/gui_canvas.c
index 8b55b2a73..b3919c2d3 100644
--- a/gfxmenu/gui_canvas.c
+++ b/gfxmenu/gui_canvas.c
@@ -88,49 +88,51 @@ canvas_paint (void *vself, const grub_video_rect_t *region)
     {
       grub_video_rect_t r;
       grub_gui_component_t comp;
+      signed x, y, w, h;
 
       comp = cur->component;
 
-      r.x = 0;
-      r.y = 0;
-      r.width = 32;
-      r.height = 32;
-
-      if (!comp->iswfrac && comp->w)
-	r.width = comp->w;
-
-      if (!comp->ishfrac && comp->h)
-	r.height = comp->h;
-
-      if (!comp->isxfrac && comp->x)
-	r.x = comp->x;
-
-      if (!comp->isyfrac && comp->y)
-	r.y = comp->y;
-
-      if (comp->ishfrac && comp->hfrac)
-	r.height = grub_fixed_ufu_multiply (self->bounds.height, comp->hfrac);
-
-      if (comp->iswfrac && comp->wfrac)
-	r.width = grub_fixed_ufu_multiply (self->bounds.width, comp->wfrac);
-
-      if (comp->isxfrac && comp->xfrac)
-	r.x = grub_fixed_ufu_multiply (self->bounds.width, comp->xfrac);
-
-      if (comp->isyfrac && comp->yfrac)
-	r.y = grub_fixed_ufu_multiply (self->bounds.height, comp->yfrac);
+      w = grub_fixed_sfs_multiply (self->bounds.width, comp->wfrac) + comp->w;
+      h = grub_fixed_sfs_multiply (self->bounds.height, comp->hfrac) + comp->h;
+      x = grub_fixed_sfs_multiply (self->bounds.width, comp->xfrac) + comp->x;
+      y = grub_fixed_sfs_multiply (self->bounds.height, comp->yfrac) + comp->y;
 
       if (comp->ops->get_minimal_size)
 	{
 	  unsigned mw;
 	  unsigned mh;
 	  comp->ops->get_minimal_size (comp, &mw, &mh);
-	  if (r.width < mw)
-	    r.width = mw;
-	  if (r.height < mh)
-	    r.height = mh;
+	  if (w < (signed) mw)
+	    w = mw;
+	  if (h < (signed) mh)
+	    h = mh;
 	}
 
+      /* Sanity checks.  */
+      if (w <= 0)
+	w = 32;
+      if (h <= 0)
+	h = 32;
+
+      if (x >= (signed) self->bounds.width)
+	x = self->bounds.width - 32;
+      if (y >= (signed) self->bounds.height)
+	y = self->bounds.height - 32;
+
+      if (x < 0)
+	x = 0;
+      if (y < 0)
+	y = 0;
+
+      if (x + w >= (signed) self->bounds.width)
+	w = self->bounds.width - x;
+      if (y + h >= (signed) self->bounds.height)
+	h = self->bounds.height - y;
+
+      r.x = x;
+      r.y = y;
+      r.width = w;
+      r.height = h;
       comp->ops->set_bounds (comp, &r);
 
       /* Paint the child.  */
diff --git a/gfxmenu/theme_loader.c b/gfxmenu/theme_loader.c
index 29bc1d2a6..09637d6b4 100644
--- a/gfxmenu/theme_loader.c
+++ b/gfxmenu/theme_loader.c
@@ -361,6 +361,40 @@ read_expression (struct parsebuf *p)
   return grub_new_substring (p->buf, start, end);
 }
 
+static grub_err_t
+parse_proportional_spec (char *value, signed *abs, grub_fixed_signed_t *prop)
+{
+  signed num;
+  char *ptr;
+  int sig = 0;
+  *abs = 0;
+  *prop = 0;
+  ptr = value;
+  while (*ptr)
+    {
+      sig = 0;
+
+      while (*ptr == '-' || *ptr == '+')
+	{
+	  if (*ptr == '-')
+	    sig = !sig;
+	  ptr++;
+	}
+
+      num = grub_strtoul (ptr, &ptr, 0);
+      if (grub_errno)
+	return grub_errno;
+      if (sig)
+	num = -num;
+      if (*ptr == '%')
+	*prop += grub_fixed_fsf_divide (grub_signed_to_fixed (num), 100);
+      else
+	*abs += num;
+    }
+  return GRUB_ERR_NONE;
+}
+
+
 /* Read a GUI object specification from the theme file.
    Any components created will be added to the GUI container PARENT.  */
 static grub_err_t
@@ -511,78 +545,16 @@ read_object (struct parsebuf *p, grub_gui_container_t parent)
 
       /* Handle the property value.  */
       if (grub_strcmp (property, "left") == 0)
-        {
-	  unsigned num;
-	  char *ptr;
-	  num = grub_strtoul (value, &ptr, 0);
-	  if (*ptr == '%')
-	    {
-	      component->isxfrac = 1;
-	      component->xfrac
-		= grub_fixed_fuf_divide (grub_unsigned_to_fixed (num), 100);
-	    }
-	  else
-	    {
-	      component->isxfrac = 0;
-	      component->x = num;
-	    }
-        }
+	parse_proportional_spec (value, &component->x, &component->xfrac);
       else if (grub_strcmp (property, "top") == 0)
-        {
-	  unsigned num;
-	  char *ptr;
-	  num = grub_strtoul (value, &ptr, 0);
-	  if (*ptr == '%')
-	    {
-	      component->isyfrac = 1;
-	      component->yfrac
-		= grub_fixed_fuf_divide (grub_unsigned_to_fixed (num), 100);
-	    }
-	  else
-	    {
-	      component->isyfrac = 0;
-	      component->y = num;
-	    }
-        }
+	parse_proportional_spec (value, &component->y, &component->yfrac);
       else if (grub_strcmp (property, "width") == 0)
-        {
-	  unsigned num;
-	  char *ptr;
-	  num = grub_strtoul (value, &ptr, 0);
-	  if (*ptr == '%')
-	    {
-	      component->iswfrac = 1;
-	      component->wfrac
-		= grub_fixed_fuf_divide (grub_unsigned_to_fixed (num), 100);
-	    }
-	  else
-	    {
-	      component->iswfrac = 0;
-	      component->w = num;
-	    }
-        }
+	parse_proportional_spec (value, &component->w, &component->wfrac);
       else if (grub_strcmp (property, "height") == 0)
-        {
-	  unsigned num;
-	  char *ptr;
-	  num = grub_strtoul (value, &ptr, 0);
-	  if (*ptr == '%')
-	    {
-	      component->ishfrac = 1;
-	      component->hfrac
-		= grub_fixed_fuf_divide (grub_unsigned_to_fixed (num), 100);
-	    }
-	  else
-	    {
-	      component->ishfrac = 0;
-	      component->h = num;
-	    }
-        }
+	parse_proportional_spec (value, &component->h, &component->hfrac);
       else
-        {
-          /* General property handling.  */
-          component->ops->set_property (component, property, value);
-        }
+	/* General property handling.  */
+	component->ops->set_property (component, property, value);
 
       grub_free (value);
       grub_free (property);
diff --git a/include/grub/gui.h b/include/grub/gui.h
index 873d29e76..7c4774838 100644
--- a/include/grub/gui.h
+++ b/include/grub/gui.h
@@ -75,62 +75,50 @@ struct grub_gui_list_ops
                          grub_gfxmenu_model_t menu);
 };
 
-typedef grub_uint32_t grub_fixed_unsigned_t;
+typedef signed grub_fixed_signed_t;
 #define GRUB_FIXED_1 0x10000
 
-static inline unsigned
-grub_fixed_ufu_divide (grub_uint32_t a, grub_fixed_unsigned_t b)
+static inline signed
+grub_fixed_sfs_divide (signed a, grub_fixed_signed_t b)
 {
-  return (a << 16) / b;
+  return (a * GRUB_FIXED_1) / b;
 }
 
-static inline grub_fixed_unsigned_t
-grub_fixed_fuf_divide (grub_fixed_unsigned_t a, grub_uint32_t b)
+static inline grub_fixed_signed_t
+grub_fixed_fsf_divide (grub_fixed_signed_t a, signed b)
 {
   return a / b;
 }
 
-static inline unsigned
-grub_fixed_ufu_multiply (grub_uint32_t a, grub_fixed_unsigned_t b)
+static inline signed
+grub_fixed_sfs_multiply (signed a, grub_fixed_signed_t b)
 {
-  return (a * b) >> 16;
+  return (a * b) / GRUB_FIXED_1;
 }
 
-static inline unsigned
-grub_fixed_to_unsigned (grub_fixed_unsigned_t in)
+static inline signed
+grub_fixed_to_signed (grub_fixed_signed_t in)
 {
-  return in >> 16;
+  return in / GRUB_FIXED_1;
 }
 
-static inline grub_fixed_unsigned_t
-grub_unsigned_to_fixed (unsigned in)
+static inline grub_fixed_signed_t
+grub_signed_to_fixed (signed in)
 {
-  return in << 16;
+  return in * GRUB_FIXED_1;
 }
 
 struct grub_gui_component
 {
   struct grub_gui_component_ops *ops;
-  int isxfrac:1;
-  int isyfrac:1;
-  int iswfrac:1;
-  int ishfrac:1;
-  union {
-    unsigned x;
-    grub_fixed_unsigned_t xfrac;
-  };
-  union {
-    unsigned y;
-    grub_fixed_unsigned_t yfrac;
-  };
-  union {
-    unsigned w;
-    grub_fixed_unsigned_t wfrac;
-  };
-  union {
-    unsigned h;
-    grub_fixed_unsigned_t hfrac;
-  };
+  signed x;
+  grub_fixed_signed_t xfrac;
+  signed y;
+  grub_fixed_signed_t yfrac;
+  signed w;
+  grub_fixed_signed_t wfrac;
+  signed h;
+  grub_fixed_signed_t hfrac;
 };
 
 struct grub_gui_container

From 6812d2e72d05e88645c8daabf72c3848170a5b91 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 5 Jan 2010 21:06:27 +0100
Subject: [PATCH 0203/1628] Fix non-skipping of percent sign

---
 gfxmenu/theme_loader.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfxmenu/theme_loader.c b/gfxmenu/theme_loader.c
index 09637d6b4..3854c6c53 100644
--- a/gfxmenu/theme_loader.c
+++ b/gfxmenu/theme_loader.c
@@ -387,7 +387,10 @@ parse_proportional_spec (char *value, signed *abs, grub_fixed_signed_t *prop)
       if (sig)
 	num = -num;
       if (*ptr == '%')
-	*prop += grub_fixed_fsf_divide (grub_signed_to_fixed (num), 100);
+	{
+	  *prop += grub_fixed_fsf_divide (grub_signed_to_fixed (num), 100);
+	  ptr++;
+	}
       else
 	*abs += num;
     }

From be42af388421dcb922fb8b55388f2b852df4d275 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 5 Jan 2010 21:07:06 +0100
Subject: [PATCH 0204/1628] Compute list size automatically

---
 gfxmenu/gui_list.c | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/gfxmenu/gui_list.c b/gfxmenu/gui_list.c
index c55cfd85c..b4886a2cc 100644
--- a/gfxmenu/gui_list.c
+++ b/gfxmenu/gui_list.c
@@ -53,8 +53,6 @@ struct grub_gui_list_impl
   grub_gfxmenu_box_t scrollbar_thumb;
   int scrollbar_width;
 
-  int min_items_shown;
-  int max_items_shown;
   int first_shown_index;
 
   int need_to_recreate_boxes;
@@ -91,12 +89,16 @@ list_destroy (void *vself)
 static int
 get_num_shown_items (list_impl_t self)
 {
-  int n = grub_gfxmenu_model_get_num_entries (self->menu);
-  if (self->min_items_shown != -1 && n < self->min_items_shown)
-    n = self->min_items_shown;
-  if (self->max_items_shown != -1 && n > self->max_items_shown)
-    n = self->max_items_shown;
-  return n;
+  int boxpad = self->item_padding;
+  int item_vspace = self->item_spacing;
+  int item_height = self->item_height;
+  
+  grub_gfxmenu_box_t box = self->menu_box;
+  int box_top_pad = box->get_top_pad (box);
+  int box_bottom_pad = box->get_bottom_pad (box);
+      
+  return (self->bounds.height + item_vspace - 2 * boxpad
+	  - box_top_pad - box_bottom_pad) / (item_height + item_vspace);
 }
 
 static int
@@ -364,15 +366,22 @@ list_get_minimal_size (void *vself, unsigned *width, unsigned *height)
       int boxpad = self->item_padding;
       int item_vspace = self->item_spacing;
       int item_height = self->item_height;
-      int num_items = get_num_shown_items (self);
+      int num_items = 3;
 
       grub_gfxmenu_box_t box = self->menu_box;
       int box_left_pad = box->get_left_pad (box);
       int box_top_pad = box->get_top_pad (box);
       int box_right_pad = box->get_right_pad (box);
       int box_bottom_pad = box->get_bottom_pad (box);
+      unsigned width_s;
+      
+      *width = grub_font_get_string_width (self->item_font, "Typical OS");
+      width_s = grub_font_get_string_width (self->selected_item_font,
+					    "Typical OS");
+      if (*width < width_s)
+	*width = width_s;
 
-      *width = 400 + 2 * boxpad + box_left_pad + box_right_pad;
+      *width += 2 * boxpad + box_left_pad + box_right_pad;
 
       /* Set the menu box height to fit the items.  */
       *height = (item_height * num_items
@@ -485,14 +494,6 @@ list_set_property (void *vself, const char *name, const char *value)
     {
       self->draw_scrollbar = grub_strcmp (value, "false") != 0;
     }
-  else if (grub_strcmp (name, "min_items_shown") == 0)
-    {
-      self->min_items_shown = grub_strtol (value, 0, 10);
-    }
-  else if (grub_strcmp (name, "max_items_shown") == 0)
-    {
-      self->max_items_shown = grub_strtol (value, 0, 10);
-    }
   else if (grub_strcmp (name, "theme_dir") == 0)
     {
       self->need_to_recreate_boxes = 1;
@@ -581,8 +582,6 @@ grub_gui_list_new (void)
   self->scrollbar_thumb_pattern = 0;
   self->scrollbar_width = 16;
 
-  self->min_items_shown = -1;
-  self->max_items_shown = -1;
   self->first_shown_index = 0;
 
   self->need_to_recreate_boxes = 0;

From eb1c959440899c2bfd7dbc514b5ec11b17a2a283 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 5 Jan 2010 21:24:33 +0100
Subject: [PATCH 0205/1628] grub-mkconfig support for themes

---
 util/grub-mkconfig.in    | 1 +
 util/grub.d/00_header.in | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 49e52b313..7e667fb3e 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -220,6 +220,7 @@ export GRUB_DEFAULT \
   GRUB_DISABLE_LINUX_UUID \
   GRUB_DISABLE_LINUX_RECOVERY \
   GRUB_GFXMODE \
+  GRUB_THEME \
   GRUB_DISABLE_OS_PROBER
 
 if test "x${grub_cfg}" != "x"; then
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 0adfe6b76..da394783a 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -93,6 +93,15 @@ if loadfont `make_system_path_relative_to_its_root ${GRUB_FONT_PATH}` ; then
     # understand terminal_output
     terminal gfxterm
   fi
+EOF
+if [ x$GRUB_THEME != x ] && [ -f $GRUB_THEME ] \
+	&& is_path_readable_by_grub $GRUB_THEME; then
+    echo "Found theme: $GRUB_THEME" >&2
+    prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME`
+    echo "insmod gfxmenu"
+    echo "set theme=(\$root)/`make_system_path_relative_to_its_root $GRUB_THEME`"
+fi
+    cat << EOF
 fi
 EOF
   ;;

From b9d28aa05fdd761074189b0acb1f3fd666f3894e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 5 Jan 2010 23:22:02 +0100
Subject: [PATCH 0206/1628] Fix missing viewport in gui_list

---
 gfxmenu/gui_list.c | 82 +++++++++++++++++++++++++---------------------
 1 file changed, 45 insertions(+), 37 deletions(-)

diff --git a/gfxmenu/gui_list.c b/gfxmenu/gui_list.c
index b4886a2cc..fd0f11635 100644
--- a/gfxmenu/gui_list.c
+++ b/gfxmenu/gui_list.c
@@ -209,7 +209,8 @@ draw_scrollbar (list_impl_t self,
 
 /* Draw the list of items.  */
 static void
-draw_menu (list_impl_t self)
+draw_menu (list_impl_t self, int width, int drawing_scrollbar,
+	   int num_shown_items)
 {
   if (! self->menu_box || ! self->selected_item_box)
     return;
@@ -222,38 +223,19 @@ draw_menu (list_impl_t self)
   int descent = grub_font_get_descent (self->item_font);
   int item_height = self->item_height;
 
-  int total_num_items = grub_gfxmenu_model_get_num_entries (self->menu);
-  int num_shown_items = get_num_shown_items (self);
-  grub_gfxmenu_box_t box = self->menu_box;
-  int width = self->bounds.width;
-  int height = self->bounds.height;
-
-  int box_left_pad = box->get_left_pad (box);
-  int box_top_pad = box->get_top_pad (box);
-  int box_right_pad = box->get_right_pad (box);
-  int box_bottom_pad = box->get_bottom_pad (box);
-
-  box->set_content_size (box,
-                         width - box_left_pad - box_right_pad,
-                         height - box_top_pad - box_bottom_pad);
-
-  box->draw (box, 0, 0);
-
   make_selected_item_visible (self);
 
-  int drawing_scrollbar = (self->draw_scrollbar
-                           && (num_shown_items < total_num_items)
-                           && check_scrollbar (self));
-
   int scrollbar_h_space = drawing_scrollbar ? self->scrollbar_width : 0;
 
-  int item_top = box_top_pad + boxpad;
-  int item_left = box_left_pad + boxpad;
+  grub_gfxmenu_box_t selbox = self->selected_item_box;
+  int sel_leftpad = selbox->get_left_pad (selbox);
+  int item_top = boxpad;
+  int item_left = boxpad + sel_leftpad;
   int menu_index;
   int visible_index;
 
   for (visible_index = 0, menu_index = self->first_shown_index;
-       visible_index < num_shown_items && menu_index < total_num_items;
+       visible_index < num_shown_items && menu_index < self->menu->size;
        visible_index++, menu_index++)
     {
       int is_selected =
@@ -261,12 +243,9 @@ draw_menu (list_impl_t self)
 
       if (is_selected)
         {
-          grub_gfxmenu_box_t selbox = self->selected_item_box;
-          int sel_leftpad = selbox->get_left_pad (selbox);
           int sel_toppad = selbox->get_top_pad (selbox);
           selbox->set_content_size (selbox,
                                     (width - 2 * boxpad
-                                     - box_left_pad - box_right_pad
                                      - scrollbar_h_space),
                                     item_height);
           selbox->draw (selbox,
@@ -300,14 +279,6 @@ draw_menu (list_impl_t self)
 
       item_top += item_height + item_vspace;
     }
-
-  if (drawing_scrollbar)
-    draw_scrollbar (self,
-                    self->first_shown_index, num_shown_items,
-                    0, total_num_items,
-                    width - box_right_pad + self->scrollbar_width,
-                    box_top_pad + boxpad,
-                    height - box_top_pad - box_bottom_pad);
 }
 
 static void
@@ -323,8 +294,45 @@ list_paint (void *vself, const grub_video_rect_t *region)
 
   check_boxes (self);
 
+  if (! self->menu_box || ! self->selected_item_box)
+    return;
+
   grub_gui_set_viewport (&self->bounds, &vpsave);
-  draw_menu (self);
+  {
+    grub_gfxmenu_box_t box = self->menu_box;
+    int box_left_pad = box->get_left_pad (box);
+    int box_top_pad = box->get_top_pad (box);
+    int box_right_pad = box->get_right_pad (box);
+    int box_bottom_pad = box->get_bottom_pad (box);
+    grub_video_rect_t vpsave2, content_rect;
+    int num_shown_items = get_num_shown_items (self);
+    int drawing_scrollbar = (self->draw_scrollbar
+			     && (num_shown_items < self->menu->size)
+			     && check_scrollbar (self));
+
+    content_rect.x = box_left_pad;
+    content_rect.y = box_top_pad;
+    content_rect.width = self->bounds.width - box_left_pad - box_right_pad;
+    content_rect.height = self->bounds.height - box_top_pad - box_bottom_pad;
+
+    box->set_content_size (box, content_rect.width, content_rect.height);
+
+    box->draw (box, 0, 0);
+
+    grub_gui_set_viewport (&content_rect, &vpsave2);
+    draw_menu (self, content_rect.width, drawing_scrollbar, num_shown_items);
+    grub_gui_restore_viewport (&vpsave2);
+
+    if (drawing_scrollbar)
+      draw_scrollbar (self,
+		      self->first_shown_index, num_shown_items,
+		      0, self->menu->size,
+		      content_rect.width - box_right_pad
+		      + self->scrollbar_width,
+		      box_top_pad + self->item_padding,
+		      content_rect.height - box_top_pad - box_bottom_pad);
+  }
+
   grub_gui_restore_viewport (&vpsave);
 }
 

From ea51afb099a6a88288f6b4f0800b16e0ca76d9dc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 5 Jan 2010 23:49:40 +0100
Subject: [PATCH 0207/1628] Use pixmapbar only when images available

---
 gfxmenu/gui_progress_bar.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gfxmenu/gui_progress_bar.c b/gfxmenu/gui_progress_bar.c
index 9af93cff5..95be91e2a 100644
--- a/gfxmenu/gui_progress_bar.c
+++ b/gfxmenu/gui_progress_bar.c
@@ -46,6 +46,7 @@ struct grub_gui_progress_bar
 
   char *theme_dir;
   int need_to_recreate_pixmaps;
+  int pixmapbar_available;
   char *bar_pattern;
   char *highlight_pattern;
   grub_gfxmenu_box_t bar_box;
@@ -77,6 +78,8 @@ progress_bar_is_instance (void *vself __attribute__((unused)), const char *type)
 static int
 check_pixmaps (grub_gui_progress_bar_t self)
 {
+  if (!self->pixmapbar_available)
+    return 0;
   if (self->need_to_recreate_pixmaps)
     {
       grub_gui_recreate_box (&self->bar_box,
@@ -137,6 +140,7 @@ draw_pixmap_bar (grub_gui_progress_bar_t self)
   int bar_v_pad = bar_t_pad + bar_b_pad;
   int tracklen = w - bar_h_pad;
   int trackheight = h - bar_v_pad;
+
   bar->set_content_size (bar, tracklen, trackheight);
 
   int barwidth = (tracklen
@@ -172,12 +176,16 @@ static void
 progress_bar_paint (void *vself, const grub_video_rect_t *region)
 {
   grub_gui_progress_bar_t self = vself;
+  grub_video_rect_t vpsave;
+
   if (! self->visible)
     return;
   if (!grub_video_have_common_points (region, &self->bounds))
     return;
 
-  grub_video_rect_t vpsave;
+  if (self->end == self->start)
+    return;
+
   grub_gui_set_viewport (&self->bounds, &vpsave);
 
   if (check_pixmaps (self))
@@ -272,12 +280,14 @@ progress_bar_set_property (void *vself, const char *name, const char *value)
   else if (grub_strcmp (name, "bar_style") == 0)
     {
       self->need_to_recreate_pixmaps = 1;
+      self->pixmapbar_available = 1;
       grub_free (self->bar_pattern);
       self->bar_pattern = value ? grub_strdup (value) : 0;
     }
   else if (grub_strcmp (name, "highlight_style") == 0)
     {
       self->need_to_recreate_pixmaps = 1;
+      self->pixmapbar_available = 1;
       grub_free (self->highlight_pattern);
       self->highlight_pattern = value ? grub_strdup (value) : 0;
     }

From 4d253049d5139b34e35154e74850d3c68e4d0b8b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 6 Jan 2010 01:42:21 +0100
Subject: [PATCH 0208/1628] Fix non-clearing of timeout. Template support for
 timeout text.

---
 gfxmenu/gui_circular_progress.c | 39 +++++++-------
 gfxmenu/gui_progress_bar.c      | 96 +++++++++++++++++++++------------
 gfxmenu/view.c                  | 44 ++++++---------
 include/grub/gui.h              | 11 ++++
 normal/menu.c                   |  2 +
 5 files changed, 110 insertions(+), 82 deletions(-)

diff --git a/gfxmenu/gui_circular_progress.c b/gfxmenu/gui_circular_progress.c
index 7634c368d..9a859ee2e 100644
--- a/gfxmenu/gui_circular_progress.c
+++ b/gfxmenu/gui_circular_progress.c
@@ -28,7 +28,7 @@
 
 struct grub_gui_circular_progress
 {
-  struct grub_gui_component comp;
+  struct grub_gui_progress progress;
 
   grub_gui_container_t parent;
   grub_video_rect_t bounds;
@@ -215,19 +215,7 @@ static grub_err_t
 circprog_set_property (void *vself, const char *name, const char *value)
 {
   circular_progress_t self = vself;
-  if (grub_strcmp (name, "value") == 0)
-    {
-      self->value = grub_strtol (value, 0, 10);
-    }
-  else if (grub_strcmp (name, "start") == 0)
-    {
-      self->start = grub_strtol (value, 0, 10);
-    }
-  else if (grub_strcmp (name, "end") == 0)
-    {
-      self->end = grub_strtol (value, 0, 10);
-    }
-  else if (grub_strcmp (name, "num_ticks") == 0)
+  if (grub_strcmp (name, "num_ticks") == 0)
     {
       self->num_ticks = grub_strtol (value, 0, 10);
     }
@@ -257,10 +245,6 @@ circprog_set_property (void *vself, const char *name, const char *value)
       grub_free (self->theme_dir);
       self->theme_dir = value ? grub_strdup (value) : 0;
     }
-  else if (grub_strcmp (name, "visible") == 0)
-    {
-      self->visible = grub_strcmp (value, "false") != 0;
-    }
   else if (grub_strcmp (name, "id") == 0)
     {
       grub_free (self->id);
@@ -272,6 +256,17 @@ circprog_set_property (void *vself, const char *name, const char *value)
   return grub_errno;
 }
 
+static void
+circprog_set_state (void *vself, int visible, int start,
+		    int current, int end)
+{
+  circular_progress_t self = vself;  
+  self->visible = visible;
+  self->start = start;
+  self->value = current;
+  self->end = end;
+}
+
 static struct grub_gui_component_ops circprog_ops =
 {
   .destroy = circprog_destroy,
@@ -285,6 +280,11 @@ static struct grub_gui_component_ops circprog_ops =
   .set_property = circprog_set_property
 };
 
+static struct grub_gui_progress_ops circprog_prog_ops =
+  {
+    .set_state = circprog_set_state
+  };
+
 grub_gui_component_t
 grub_gui_circular_progress_new (void)
 {
@@ -292,7 +292,8 @@ grub_gui_circular_progress_new (void)
   self = grub_zalloc (sizeof (*self));
   if (! self)
     return 0;
-  self->comp.ops = &circprog_ops;
+  self->progress.ops = &circprog_prog_ops;
+  self->progress.component.ops = &circprog_ops;
   self->visible = 1;
   self->num_ticks = 64;
   self->start_angle = -64;
diff --git a/gfxmenu/gui_progress_bar.c b/gfxmenu/gui_progress_bar.c
index d982924cb..6a7f43962 100644
--- a/gfxmenu/gui_progress_bar.c
+++ b/gfxmenu/gui_progress_bar.c
@@ -24,10 +24,11 @@
 #include <grub/gui_string_util.h>
 #include <grub/gfxmenu_view.h>
 #include <grub/gfxwidgets.h>
+#include <grub/i18n.h>
 
 struct grub_gui_progress_bar
 {
-  struct grub_gui_component component;
+  struct grub_gui_progress progress;
 
   grub_gui_container_t parent;
   grub_video_rect_t bounds;
@@ -37,7 +38,7 @@ struct grub_gui_progress_bar
   int end;
   int value;
   int show_text;
-  char *text;
+  char *template;
   grub_font_t font;
   grub_gui_color_t text_color;
   grub_gui_color_t border_color;
@@ -156,14 +157,20 @@ draw_pixmap_bar (grub_gui_progress_bar_t self)
 static void
 draw_text (grub_gui_progress_bar_t self)
 {
-  const char *text = self->text;
-  if (text && self->show_text)
+  if (self->template)
     {
       grub_font_t font = self->font;
       grub_video_color_t text_color = grub_gui_map_color (self->text_color);
       int width = self->bounds.width;
       int height = self->bounds.height;
-
+      char *text = grub_asprintf (self->template,
+				  self->value > 0 ? self->value : -self->value);
+      if (!text)
+	{
+	  grub_print_error ();
+	  grub_errno = GRUB_ERR_NONE;
+	  return;
+	}
       /* Center the text. */
       int text_width = grub_font_get_string_width (font, text);
       int x = (width - text_width) / 2;
@@ -228,35 +235,60 @@ progress_bar_get_bounds (void *vself, grub_video_rect_t *bounds)
 }
 
 static void
-progress_bar_get_minimal_size (void *vself __attribute__ ((unused)),
+progress_bar_get_minimal_size (void *vself,
 			       unsigned *width, unsigned *height)
 {
+  unsigned text_width = 0, text_height = 0;
+  grub_gui_progress_bar_t self = vself;
+
+  if (self->template)
+    {
+      text_width = grub_font_get_string_width (self->font, self->template);
+      text_width += grub_font_get_string_width (self->font, "XXXXXXXXXX");
+      text_height = grub_font_get_descent (self->font)
+	+ grub_font_get_ascent (self->font);
+    }
   *width = 200;
+  if (*width < text_width)
+    *width = text_width;
   *height = 28;
+  if (*height < text_height)
+    *height = text_height;
+}
+
+static void
+progress_bar_set_state (void *vself, int visible, int start,
+			int current, int end)
+{
+  grub_gui_progress_bar_t self = vself;  
+  self->visible = visible;
+  self->start = start;
+  self->value = current;
+  self->end = end;
 }
 
 static grub_err_t
 progress_bar_set_property (void *vself, const char *name, const char *value)
 {
   grub_gui_progress_bar_t self = vself;
-  if (grub_strcmp (name, "value") == 0)
+  if (grub_strcmp (name, "text") == 0)
     {
-      self->value = grub_strtol (value, 0, 10);
-    }
-  else if (grub_strcmp (name, "start") == 0)
-    {
-      self->start = grub_strtol (value, 0, 10);
-    }
-  else if (grub_strcmp (name, "end") == 0)
-    {
-      self->end = grub_strtol (value, 0, 10);
-    }
-  else if (grub_strcmp (name, "text") == 0)
-    {
-      grub_free (self->text);
-      if (! value)
-        value = "";
-      self->text = grub_strdup (value);
+      grub_free (self->template);
+      if (grub_strcmp (value, "@TIMEOUT_NOTIFICATION_LONG@") == 0)
+	value 
+	  = _("The highlighted entry will be executed automatically in %ds.");
+      else if (grub_strcmp (value, "@TIMEOUT_NOTIFICATION_MIDDLE@") == 0)
+	/* TRANSLATORS:  's' stands for seconds.
+	   It's a standalone timeout notification.
+	   Please use the short form in your language.  */
+	value = _("%ds remaining.");
+      else if (grub_strcmp (value, "@TIMEOUT_NOTIFICATION_SHORT@") == 0)
+	/* TRANSLATORS:  's' stands for seconds.
+	   It's a standalone timeout notification.
+	   Please use the shortest form available in you language.  */
+	value = _("%ds");
+
+      self->template = grub_strdup (value);
     }
   else if (grub_strcmp (name, "font") == 0)
     {
@@ -298,14 +330,6 @@ progress_bar_set_property (void *vself, const char *name, const char *value)
       grub_free (self->theme_dir);
       self->theme_dir = value ? grub_strdup (value) : 0;
     }
-  else if (grub_strcmp (name, "visible") == 0)
-    {
-      self->visible = grub_strcmp (value, "false") != 0;
-    }
-  else if (grub_strcmp (name, "show_text") == 0)
-    {
-      self->show_text = grub_strcmp (value, "false") != 0;
-    }
   else if (grub_strcmp (name, "id") == 0)
     {
       grub_free (self->id);
@@ -331,6 +355,11 @@ static struct grub_gui_component_ops progress_bar_ops =
   .set_property = progress_bar_set_property
 };
 
+static struct grub_gui_progress_ops progress_bar_pb_ops =
+  {
+    .set_state = progress_bar_set_state
+  };
+
 grub_gui_component_t
 grub_gui_progress_bar_new (void)
 {
@@ -338,10 +367,9 @@ grub_gui_progress_bar_new (void)
   self = grub_zalloc (sizeof (*self));
   if (! self)
     return 0;
-  self->component.ops = &progress_bar_ops;
+  self->progress.ops = &progress_bar_pb_ops;
+  self->progress.component.ops = &progress_bar_ops;
   self->visible = 1;
-  self->show_text = 1;
-  self->text = grub_strdup ("");
   self->font = grub_font_get ("Helvetica 10");
   grub_gui_color_t black = { .red = 0, .green = 0, .blue = 0, .alpha = 255 };
   grub_gui_color_t gray = { .red = 128, .green = 128, .blue = 128, .alpha = 255 };
diff --git a/gfxmenu/view.c b/gfxmenu/view.c
index 5008b105b..611c01e1b 100644
--- a/gfxmenu/view.c
+++ b/gfxmenu/view.c
@@ -160,11 +160,10 @@ draw_title (grub_gfxmenu_view_t view)
 
 struct progress_value_data
 {
-  const char *visible;
-  const char *start;
-  const char *end;
-  const char *value;
-  const char *text;
+  int visible;
+  int start;
+  int end;
+  int value;
 };
 
 static void
@@ -174,19 +173,14 @@ update_timeout_visit (grub_gui_component_t component,
   struct progress_value_data *pv;
   pv = (struct progress_value_data *) userdata;
 
-  component->ops->set_property (component, "visible", pv->visible);
-  component->ops->set_property (component, "start", pv->start);
-  component->ops->set_property (component, "end", pv->end);
-  component->ops->set_property (component, "value", pv->value);
-  component->ops->set_property (component, "text", pv->text);
+  ((struct grub_gui_progress *) component)->ops
+    ->set_state ((struct grub_gui_progress *) component,
+		 pv->visible, pv->start, pv->value, pv->end);
 }
 
 void 
 grub_gfxmenu_print_timeout (int timeout, void *data)
 {
-  char valuebuf[sizeof ("-XXXXXXXXXXX")];
-  char startbuf[sizeof ("-XXXXXXXXXXX")];
-  char msgbuf[120];
   struct grub_gfxmenu_view *view = data;
 
   struct progress_value_data pv;
@@ -205,17 +199,10 @@ grub_gfxmenu_print_timeout (int timeout, void *data)
   if (view->first_timeout == -1)
     view->first_timeout = timeout;
 
-  pv.visible = "true";
-  grub_sprintf (startbuf, "%d", -(view->first_timeout + 1));
-  pv.start = startbuf;
-  pv.end = "0";
-  grub_sprintf (valuebuf, "%d", -timeout);
-  pv.value = valuebuf;
-
-  grub_sprintf (msgbuf,
-                "The highlighted entry will be booted automatically in %d s.",
-		timeout);
-  pv.text = msgbuf;
+  pv.visible = 1;
+  pv.start = -(view->first_timeout + 1);
+  pv.end = 0;
+  pv.value = -timeout;
 
   grub_gui_find_by_id ((grub_gui_component_t) view->canvas,
                        TIMEOUT_COMPONENT_ID, update_timeout_visit, &pv);
@@ -244,11 +231,10 @@ grub_gfxmenu_clear_timeout (void *data)
     grub_gfxmenu_view_redraw (view, &bounds);
   }
 
-  pv.visible = "false";
-  pv.start = "1";
-  pv.end = "0";
-  pv.value = "0";
-  pv.text = "";
+  pv.visible = 0;
+  pv.start = 1;
+  pv.end = 0;
+  pv.value = 0;
 
   grub_gui_find_by_id ((grub_gui_component_t) view->canvas,
                        TIMEOUT_COMPONENT_ID, update_timeout_visit, &pv);
diff --git a/include/grub/gui.h b/include/grub/gui.h
index 6f8f44805..7bd71acd3 100644
--- a/include/grub/gui.h
+++ b/include/grub/gui.h
@@ -74,6 +74,11 @@ struct grub_gui_list_ops
                          grub_gfxmenu_view_t view);
 };
 
+struct grub_gui_progress_ops
+{
+  void (*set_state) (void *self, int visible, int start, int current, int end);
+};
+
 typedef signed grub_fixed_signed_t;
 #define GRUB_FIXED_1 0x10000
 
@@ -120,6 +125,12 @@ struct grub_gui_component
   grub_fixed_signed_t hfrac;
 };
 
+struct grub_gui_progress
+{
+  struct grub_gui_component component;
+  struct grub_gui_progress_ops *ops;
+};
+
 struct grub_gui_container
 {
   struct grub_gui_component component;
diff --git a/normal/menu.c b/normal/menu.c
index 17730eff3..bbd1049e4 100644
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -362,6 +362,8 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
 
   if (timeout > 0)
     menu_print_timeout (timeout);
+  else
+    clear_timeout ();
 
   while (1)
     {

From 2ab45155287b5a6088fab6b65a95069f83904ce9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 6 Jan 2010 10:50:50 +0100
Subject: [PATCH 0209/1628] Push error before calling grub_gfxterm_fullscreen

---
 gfxmenu/gfxmenu.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gfxmenu/gfxmenu.c b/gfxmenu/gfxmenu.c
index 1db96a80f..a2e765156 100644
--- a/gfxmenu/gfxmenu.c
+++ b/gfxmenu/gfxmenu.c
@@ -57,21 +57,27 @@ grub_gfxmenu_try (int entry, grub_menu_t menu, int nested)
   theme_path = grub_env_get ("theme");
   if (! theme_path)
     {
+      grub_error_push ();
       grub_gfxterm_fullscreen ();
+      grub_error_pop ();
       return grub_error (GRUB_ERR_FILE_NOT_FOUND, "no theme specified");
     }
 
   instance = grub_zalloc (sizeof (*instance));
   if (!instance)
     {
+      grub_error_push ();
       grub_gfxterm_fullscreen ();
+      grub_error_pop ();
       return grub_errno;
     }
 
   err = grub_video_get_info (&mode_info);
   if (err)
     {
+      grub_error_push ();
       grub_gfxterm_fullscreen ();
+      grub_error_pop ();
       return err;
     }
 
@@ -88,7 +94,9 @@ grub_gfxmenu_try (int entry, grub_menu_t menu, int nested)
   if (! cached_view)
     {
       grub_free (instance);
+      grub_error_push ();
       grub_gfxterm_fullscreen ();
+      grub_error_pop ();
       return grub_errno;
     }
 

From cd622720c84608c9ab561f41a689ed58e3804bb4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 6 Jan 2010 10:51:23 +0100
Subject: [PATCH 0210/1628] Clear both buffers on gfxterm init

---
 term/gfxterm.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/term/gfxterm.c b/term/gfxterm.c
index 0abe0f07d..26e94e474 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -315,6 +315,7 @@ grub_gfxterm_fullscreen (void)
   struct grub_video_mode_info mode_info;
   grub_video_color_t color;
   grub_err_t err;
+  int double_redraw;
 
   err = grub_video_get_info (&mode_info);
   /* Figure out what mode we ended up.  */
@@ -323,9 +324,17 @@ grub_gfxterm_fullscreen (void)
 
   grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
 
+  double_redraw = mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
+    && !(mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
+
   /* Make sure screen is black.  */
   color = grub_video_map_rgb (0, 0, 0);
   grub_video_fill_rect (color, 0, 0, mode_info.width, mode_info.height);
+  if (double_redraw)
+    {
+      grub_video_swap_buffers ();
+      grub_video_fill_rect (color, 0, 0, mode_info.width, mode_info.height);
+    }
   bitmap = 0;
 
   /* Select the font to use.  */
@@ -337,10 +346,7 @@ grub_gfxterm_fullscreen (void)
 
   return grub_gfxterm_set_window (GRUB_VIDEO_RENDER_TARGET_DISPLAY,
 				  0, 0, mode_info.width, mode_info.height,
-				  mode_info.mode_type
-				  & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
-				  && !(mode_info.mode_type 
-				       & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP),
+				  double_redraw,
 				  font_name, DEFAULT_BORDER_WIDTH);
 }
 

From f0cfb703b8b1f5312cb5700a0b9b3c293f76f9d0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 6 Jan 2010 20:37:16 +0100
Subject: [PATCH 0211/1628] Initial bidi support for gfxmenu

---
 autogen.sh           |     2 +
 conf/common.rmk      |     2 +-
 font/font.c          |   375 +-
 include/grub/bidi.h  |    60 +
 unidata.c            |   458 +
 util/UnicodeData.txt | 19336 +++++++++++++++++++++++++++++++++++++++++
 util/import_bidi.py  |    52 +
 7 files changed, 20279 insertions(+), 6 deletions(-)
 create mode 100644 include/grub/bidi.h
 create mode 100644 unidata.c
 create mode 100644 util/UnicodeData.txt
 create mode 100644 util/import_bidi.py

diff --git a/autogen.sh b/autogen.sh
index eb251f9f0..7aac1c534 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,6 +13,8 @@ echo timestamp > stamp-h.in
 
 python util/import_gcry.py lib/libgcrypt/ .
 
+python util/import_bidi.py util/UnicodeData.txt unidata.c
+
 for rmk in conf/*.rmk ${GRUB_CONTRIB}/*/conf/*.rmk; do
   if test -e $rmk ; then
     ruby genmk.rb < $rmk > `echo $rmk | sed 's/\.rmk$/.mk/'`
diff --git a/conf/common.rmk b/conf/common.rmk
index 93b138eee..512288614 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -642,7 +642,7 @@ png_mod_CFLAGS = $(COMMON_CFLAGS)
 png_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For font.mod.
-font_mod_SOURCES = font/font_cmd.c font/font.c
+font_mod_SOURCES = font/font_cmd.c font/font.c unidata.c
 font_mod_CFLAGS = $(COMMON_CFLAGS)
 font_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/font/font.c b/font/font.c
index 12f80847f..8823bc6d3 100644
--- a/font/font.c
+++ b/font/font.c
@@ -26,6 +26,8 @@
 #include <grub/types.h>
 #include <grub/video.h>
 #include <grub/bitmap.h>
+#include <grub/charset.h>
+#include <grub/bidi.h>
 
 #ifndef FONT_DEBUG
 #define FONT_DEBUG 0
@@ -1045,6 +1047,359 @@ grub_font_draw_glyph (struct grub_font_glyph *glyph,
                                  glyph->width, glyph->height);
 }
 
+static inline enum grub_bidi_type
+get_bidi_type (grub_uint32_t c)
+{
+  static grub_uint8_t *bidi_types = NULL;
+  struct grub_bidi_compact_range *cur;
+
+  if (!bidi_types)
+    {
+      unsigned i;
+      bidi_types = grub_zalloc (GRUB_BIDI_MAX_CACHED_UNICODE_CHAR);
+      if (bidi_types)
+	for (cur = grub_bidi_compact; cur->end; cur++)
+	  for (i = cur->start; i <= cur->end
+		 && i < GRUB_BIDI_MAX_CACHED_UNICODE_CHAR; i++)
+	    bidi_types[i] = cur->type;
+      else
+	grub_errno = GRUB_ERR_NONE;
+    }
+
+  if (bidi_types && c < GRUB_BIDI_MAX_CACHED_UNICODE_CHAR)
+    return bidi_types[c];
+
+  for (cur = grub_bidi_compact; cur->end; cur++)
+    if (cur->start <= c && c <= cur->end)
+      return cur->type;
+
+  return GRUB_BIDI_TYPE_L;
+}
+
+static grub_ssize_t
+grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
+				 grub_size_t logical_len,
+				 grub_uint32_t **visual)
+{
+  enum grub_bidi_type type = GRUB_BIDI_TYPE_L;
+  enum override_status {OVERRIDE_NEUTRAL = 0, OVERRIDE_R, OVERRIDE_L};
+  unsigned *levels;
+  enum grub_bidi_type *resolved_types;
+  unsigned base_level;
+  enum override_status cur_override;
+  unsigned i;
+  unsigned stack_level[GRUB_BIDI_MAX_EXPLICIT_LEVEL + 3];
+  enum override_status stack_override[GRUB_BIDI_MAX_EXPLICIT_LEVEL + 3];
+  unsigned stack_depth = 0;
+  unsigned invalid_pushes = 0;
+  unsigned no_markers_len = 0;
+  unsigned run_start, run_end;
+  grub_uint32_t *no_markers;
+  unsigned cur_level;
+
+  auto void push_stack (unsigned new_override, unsigned new_level);
+  void push_stack (unsigned new_override, unsigned new_level)
+  {
+    if (new_level > GRUB_BIDI_MAX_EXPLICIT_LEVEL)
+      {
+	invalid_pushes++;
+	return;
+      }
+    stack_level[stack_depth] = cur_level;
+    stack_override[stack_depth] = cur_override;
+    stack_depth++;
+    cur_level = new_level;
+    cur_override = new_override;
+  }
+
+  auto void pop_stack (void);
+  void pop_stack (void)
+  {
+    if (invalid_pushes)
+      {
+	invalid_pushes--;
+	return;
+      }
+    if (!stack_depth)
+      return;
+    stack_depth--;
+    cur_level = stack_level[stack_depth];
+    cur_override = stack_override[stack_depth];
+  }
+
+  auto void revert (unsigned start, unsigned end);
+  void revert (unsigned start, unsigned end)
+  {
+    grub_uint32_t t;
+    unsigned k;
+    for (k = 0; k <= (end - start) / 2; k++)
+      {
+	t = no_markers[start+k];
+	no_markers[start+k] = no_markers[end-k];
+	no_markers[end-k] = t;
+      }
+  }
+
+  levels = grub_malloc (sizeof (levels[0]) * logical_len);
+  if (!levels)
+    return -1;
+
+  resolved_types = grub_malloc (sizeof (resolved_types[0]) * logical_len);
+  if (!resolved_types)
+    {
+      grub_free (levels);
+      return -1;
+    }
+
+  no_markers = grub_malloc (sizeof (resolved_types[0]) * logical_len);
+  if (!no_markers)
+    {
+      grub_free (resolved_types);
+      grub_free (levels);
+      return -1;
+    }
+
+  for (i = 0; i < logical_len; i++)
+    {
+      type = get_bidi_type (logical[i]);
+      if (type == GRUB_BIDI_TYPE_L || type == GRUB_BIDI_TYPE_AL
+	  || type == GRUB_BIDI_TYPE_R)
+	break;
+    }
+  if (type == GRUB_BIDI_TYPE_R || type == GRUB_BIDI_TYPE_AL)
+    base_level = 1;
+  else
+    base_level = 0;
+  
+  cur_level = base_level;
+  cur_override = OVERRIDE_NEUTRAL;
+  for (i = 0; i < logical_len; i++)
+    {
+      type = get_bidi_type (logical[i]);
+      switch (type)
+	{
+	case GRUB_BIDI_TYPE_RLE:
+	  push_stack (cur_override, (cur_level | 1) + 1);
+	  break;
+	case GRUB_BIDI_TYPE_RLO:
+	  push_stack (OVERRIDE_R, (cur_level | 1) + 1);
+	  break;
+	case GRUB_BIDI_TYPE_LRE:
+	  push_stack (cur_override, (cur_level & ~1) + 2);
+	  break;
+	case GRUB_BIDI_TYPE_LRO:
+	  push_stack (OVERRIDE_L, (cur_level & ~1) + 2);
+	  break;
+	case GRUB_BIDI_TYPE_PDF:
+	  pop_stack ();
+	  break;
+	case GRUB_BIDI_TYPE_BN:
+	  break;
+	default:
+	  levels[no_markers_len] = cur_level;
+	  if (cur_override != OVERRIDE_NEUTRAL)
+	    resolved_types[no_markers_len] = 
+	      (cur_override == OVERRIDE_L) ? GRUB_BIDI_TYPE_L : GRUB_BIDI_TYPE_R;
+	  else
+	    resolved_types[no_markers_len] = type;
+	  no_markers[no_markers_len] = logical[i];
+	  no_markers_len++;
+	}
+    }
+
+  for (run_start = 0; run_start < no_markers_len; run_start = run_end)
+    {
+      unsigned prev_level, next_level, cur_run_level;
+      unsigned last_type, last_strong_type;
+      for (run_end = run_start; run_end < no_markers_len &&
+	     levels[run_end] == levels[run_start]; run_end++);
+      if (run_start == 0)
+	prev_level = base_level;
+      else
+	prev_level = levels[run_start - 1];
+      if (run_end == no_markers_len)
+	next_level = base_level;
+      else
+	next_level = levels[run_end];
+      cur_run_level = levels[run_start];
+      if (prev_level & 1)
+	last_type = GRUB_BIDI_TYPE_R;
+      else
+	last_type = GRUB_BIDI_TYPE_L;
+      last_strong_type = last_type;
+      for (i = run_start; i < run_end; i++)
+	{
+	  switch (resolved_types[i])
+	    {
+	    case GRUB_BIDI_TYPE_NSM:
+	      resolved_types[i] = last_type;
+	      break;
+	    case GRUB_BIDI_TYPE_EN:
+	      if (last_strong_type == GRUB_BIDI_TYPE_AL)
+		resolved_types[i] = GRUB_BIDI_TYPE_AN;
+	      break;
+	    case GRUB_BIDI_TYPE_L:
+	    case GRUB_BIDI_TYPE_R:
+	      last_strong_type = resolved_types[i];
+	      break;
+	    case GRUB_BIDI_TYPE_ES:
+	      if (last_type == GRUB_BIDI_TYPE_EN
+		  && i + 1 < run_end 
+		  && resolved_types[i + 1] == GRUB_BIDI_TYPE_EN)
+		resolved_types[i] = GRUB_BIDI_TYPE_EN;
+	      else
+		resolved_types[i] = GRUB_BIDI_TYPE_ON;
+	      break;
+	    case GRUB_BIDI_TYPE_ET:
+	      {
+		unsigned j;
+		if (last_type == GRUB_BIDI_TYPE_EN)
+		  {
+		    resolved_types[i] = GRUB_BIDI_TYPE_EN;
+		    break;
+		  }
+		for (j = i; j < run_end
+		       && resolved_types[j] == GRUB_BIDI_TYPE_ET; j++);
+		if (j != run_end && resolved_types[j] == GRUB_BIDI_TYPE_EN)
+		  {
+		    for (; i < run_end
+			   && resolved_types[i] == GRUB_BIDI_TYPE_ET; i++)
+		      resolved_types[i] = GRUB_BIDI_TYPE_EN;
+		    i--;
+		    break;
+		  }
+		for (; i < run_end
+		       && resolved_types[i] == GRUB_BIDI_TYPE_ET; i++)
+		  resolved_types[i] = GRUB_BIDI_TYPE_ON;
+		i--;
+		break;		
+	      }
+	      break;
+	    case GRUB_BIDI_TYPE_CS:
+	      if (last_type == GRUB_BIDI_TYPE_EN
+		  && i + 1 < run_end 
+		  && resolved_types[i + 1] == GRUB_BIDI_TYPE_EN)
+		{
+		  resolved_types[i] = GRUB_BIDI_TYPE_EN;
+		  break;
+		}
+	      if (last_type == GRUB_BIDI_TYPE_AN
+		  && i + 1 < run_end 
+		  && (resolved_types[i + 1] == GRUB_BIDI_TYPE_AN
+		      || (resolved_types[i + 1] == GRUB_BIDI_TYPE_EN
+			  && last_strong_type == GRUB_BIDI_TYPE_AL)))
+		{
+		  resolved_types[i] = GRUB_BIDI_TYPE_EN;
+		  break;
+		}
+	      resolved_types[i] = GRUB_BIDI_TYPE_ON;
+	      break;
+	    case GRUB_BIDI_TYPE_AL:
+	      last_strong_type = resolved_types[i];
+	      resolved_types[i] = GRUB_BIDI_TYPE_R;
+	      break;
+	    default: /* Make GCC happy.  */
+	      break;
+	    }
+	  last_type = resolved_types[i];
+	  if (resolved_types[i] == GRUB_BIDI_TYPE_EN
+	      && last_strong_type == GRUB_BIDI_TYPE_L)
+	    resolved_types[i] = GRUB_BIDI_TYPE_L;
+	}
+      if (prev_level & 1)
+	last_type = GRUB_BIDI_TYPE_R;
+      else
+	last_type = GRUB_BIDI_TYPE_L;
+      for (i = run_start; i < run_end; )
+	{
+	  unsigned j;
+	  unsigned next_type;
+	  for (j = i; j < run_end &&
+	  	 (resolved_types[j] == GRUB_BIDI_TYPE_B
+	  	  || resolved_types[j] == GRUB_BIDI_TYPE_S
+	  	  || resolved_types[j] == GRUB_BIDI_TYPE_WS
+	  	  || resolved_types[j] == GRUB_BIDI_TYPE_ON); j++);
+	  if (j == i)
+	    {
+	      if (resolved_types[i] == GRUB_BIDI_TYPE_L)
+		last_type = GRUB_BIDI_TYPE_L;
+	      else
+		last_type = GRUB_BIDI_TYPE_R;
+	      i++;
+	      continue;
+	    }
+	  if (j == run_end)
+	    next_type = (next_level & 1) ? GRUB_BIDI_TYPE_R : GRUB_BIDI_TYPE_L;
+	  else
+	    {
+	      if (resolved_types[j] == GRUB_BIDI_TYPE_L)
+		next_type = GRUB_BIDI_TYPE_L;
+	      else
+		next_type = GRUB_BIDI_TYPE_R;
+	    }
+	  if (next_type == last_type)
+	    for (; i < j; i++)
+	      resolved_types[i] = last_type;
+	  else
+	    for (; i < j; i++)
+	      resolved_types[i] = (cur_run_level & 1) ? GRUB_BIDI_TYPE_R
+		: GRUB_BIDI_TYPE_L;
+	}
+    }
+
+  for (i = 0; i < no_markers_len; i++)
+    {
+      if (!(levels[i] & 1) && resolved_types[i] == GRUB_BIDI_TYPE_R)
+	{
+	  levels[i]++;
+	  continue;
+	}
+      if (!(levels[i] & 1) && (resolved_types[i] == GRUB_BIDI_TYPE_AN
+			       || resolved_types[i] == GRUB_BIDI_TYPE_EN))
+	{
+	  levels[i] += 2;
+	  continue;
+	}
+      if ((levels[i] & 1) && (resolved_types[i] == GRUB_BIDI_TYPE_L
+			      || resolved_types[i] == GRUB_BIDI_TYPE_AN
+			      || resolved_types[i] == GRUB_BIDI_TYPE_EN))
+	{
+	  levels[i]++;
+	  continue;
+	}
+    }
+  grub_free (resolved_types);
+  /* TODO: put line-wrapping here.  */
+  {
+    unsigned min_odd_level = 0xffffffff;
+    unsigned max_level = 0;
+    unsigned j;
+    for (i = 0; i < no_markers_len; i++)
+      {
+	if (levels[i] > max_level)
+	  max_level = levels[i];
+	if (levels[i] < min_odd_level && (levels[i] & 1))
+	  min_odd_level = levels[i];	
+      }
+    for (j = max_level; j >= min_odd_level; j--)
+      {
+	unsigned in = 0;
+	for (i = 0; i < no_markers_len; i++)
+	  {
+	    if (i != 0 && levels[i] >= j && levels[i-1] < j)
+	      in = i;
+	    if (levels[i] >= j && (i + 1 == no_markers_len || levels[i+1] < j))
+	      revert (in, i);
+	  }
+      }
+  }
+
+  grub_free (levels);
+
+  *visual = no_markers;
+  return no_markers_len;
+}
+
 /* Draw a UTF-8 string of text on the current video render target.
    The x coordinate specifies the starting x position for the first character,
    while the y coordinate specifies the baseline position.
@@ -1057,19 +1412,29 @@ grub_font_draw_string (const char *str, grub_font_t font,
 {
   int x;
   struct grub_font_glyph *glyph;
-  grub_uint32_t code;
-  const grub_uint8_t *ptr;
+  grub_uint32_t *logical, *visual, *ptr;
+  grub_ssize_t logical_len, visual_len;
 
-  for (ptr = (const grub_uint8_t *) str, x = left_x;
-       grub_utf8_to_ucs4 (&code, 1, ptr, -1, &ptr) > 0; )
+  logical_len = grub_utf8_to_ucs4_alloc (str, &logical, 0);
+  if (logical_len < 0)
+    return grub_errno;
+
+  visual_len = grub_err_bidi_logical_to_visual (logical, logical_len, &visual);
+  grub_free (logical);
+  if (visual_len < 0)
+    return grub_errno;
+
+  for (ptr = visual, x = left_x; ptr < visual + visual_len; ptr++)
     {
-      glyph = grub_font_get_glyph_with_fallback (font, code);
+      glyph = grub_font_get_glyph_with_fallback (font, *ptr);
       if (grub_font_draw_glyph (glyph, color, x, baseline_y)
           != GRUB_ERR_NONE)
         return grub_errno;
       x += glyph->device_width;
     }
 
+  grub_free (visual);
+
   return GRUB_ERR_NONE;
 }
 
diff --git a/include/grub/bidi.h b/include/grub/bidi.h
new file mode 100644
index 000000000..8612d6e24
--- /dev/null
+++ b/include/grub/bidi.h
@@ -0,0 +1,60 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#ifndef GRUB_BIDI_HEADER
+#define GRUB_BIDI_HEADER	1
+
+#include <grub/types.h>
+
+struct grub_bidi_compact_range
+{
+  grub_uint32_t start:24;
+  grub_uint32_t end:24;
+  grub_uint8_t type;
+} __attribute__ ((packed));
+
+enum grub_bidi_type
+  {
+    GRUB_BIDI_TYPE_L = 0,
+    GRUB_BIDI_TYPE_LRE,
+    GRUB_BIDI_TYPE_LRO,
+    GRUB_BIDI_TYPE_R,
+    GRUB_BIDI_TYPE_AL,
+    GRUB_BIDI_TYPE_RLE,
+    GRUB_BIDI_TYPE_RLO,
+    GRUB_BIDI_TYPE_PDF,
+    GRUB_BIDI_TYPE_EN,
+    GRUB_BIDI_TYPE_ES,
+    GRUB_BIDI_TYPE_ET,
+    GRUB_BIDI_TYPE_AN,
+    GRUB_BIDI_TYPE_CS,
+    GRUB_BIDI_TYPE_NSM,
+    GRUB_BIDI_TYPE_BN,
+    GRUB_BIDI_TYPE_B,
+    GRUB_BIDI_TYPE_S,
+    GRUB_BIDI_TYPE_WS,
+    GRUB_BIDI_TYPE_ON
+  };
+
+extern struct grub_bidi_compact_range grub_bidi_compact[];
+
+#define GRUB_BIDI_MAX_CACHED_UNICODE_CHAR 0x20000
+/*  Unicode mandates an arbitrary limit.  */
+#define GRUB_BIDI_MAX_EXPLICIT_LEVEL 61
+
+#endif
diff --git a/unidata.c b/unidata.c
new file mode 100644
index 000000000..f4467c920
--- /dev/null
+++ b/unidata.c
@@ -0,0 +1,458 @@
+#include <grub/bidi.h>
+
+struct grub_bidi_compact_range grub_bidi_compact[] = {
+{0x0, 0x8, GRUB_BIDI_TYPE_BN},
+{0x9, 0x9, GRUB_BIDI_TYPE_S},
+{0xa, 0xa, GRUB_BIDI_TYPE_B},
+{0xb, 0xb, GRUB_BIDI_TYPE_S},
+{0xc, 0xc, GRUB_BIDI_TYPE_WS},
+{0xd, 0xd, GRUB_BIDI_TYPE_B},
+{0xe, 0x1b, GRUB_BIDI_TYPE_BN},
+{0x1c, 0x1e, GRUB_BIDI_TYPE_B},
+{0x1f, 0x1f, GRUB_BIDI_TYPE_S},
+{0x20, 0x20, GRUB_BIDI_TYPE_WS},
+{0x21, 0x22, GRUB_BIDI_TYPE_ON},
+{0x23, 0x25, GRUB_BIDI_TYPE_ET},
+{0x26, 0x2a, GRUB_BIDI_TYPE_ON},
+{0x2b, 0x2b, GRUB_BIDI_TYPE_ES},
+{0x2c, 0x2c, GRUB_BIDI_TYPE_CS},
+{0x2d, 0x2d, GRUB_BIDI_TYPE_ES},
+{0x2e, 0x2f, GRUB_BIDI_TYPE_CS},
+{0x30, 0x39, GRUB_BIDI_TYPE_EN},
+{0x3a, 0x3a, GRUB_BIDI_TYPE_CS},
+{0x3b, 0x40, GRUB_BIDI_TYPE_ON},
+{0x5b, 0x60, GRUB_BIDI_TYPE_ON},
+{0x7b, 0x7e, GRUB_BIDI_TYPE_ON},
+{0x7f, 0x84, GRUB_BIDI_TYPE_BN},
+{0x85, 0x85, GRUB_BIDI_TYPE_B},
+{0x86, 0x9f, GRUB_BIDI_TYPE_BN},
+{0xa0, 0xa0, GRUB_BIDI_TYPE_CS},
+{0xa1, 0xa1, GRUB_BIDI_TYPE_ON},
+{0xa2, 0xa5, GRUB_BIDI_TYPE_ET},
+{0xa6, 0xa9, GRUB_BIDI_TYPE_ON},
+{0xab, 0xac, GRUB_BIDI_TYPE_ON},
+{0xad, 0xad, GRUB_BIDI_TYPE_BN},
+{0xae, 0xaf, GRUB_BIDI_TYPE_ON},
+{0xb0, 0xb1, GRUB_BIDI_TYPE_ET},
+{0xb2, 0xb3, GRUB_BIDI_TYPE_EN},
+{0xb4, 0xb4, GRUB_BIDI_TYPE_ON},
+{0xb6, 0xb8, GRUB_BIDI_TYPE_ON},
+{0xb9, 0xb9, GRUB_BIDI_TYPE_EN},
+{0xbb, 0xbf, GRUB_BIDI_TYPE_ON},
+{0xd7, 0xd7, GRUB_BIDI_TYPE_ON},
+{0xf7, 0xf7, GRUB_BIDI_TYPE_ON},
+{0x2b9, 0x2ba, GRUB_BIDI_TYPE_ON},
+{0x2c2, 0x2cf, GRUB_BIDI_TYPE_ON},
+{0x2d2, 0x2df, GRUB_BIDI_TYPE_ON},
+{0x2e5, 0x2ed, GRUB_BIDI_TYPE_ON},
+{0x2ef, 0x2ff, GRUB_BIDI_TYPE_ON},
+{0x300, 0x36f, GRUB_BIDI_TYPE_NSM},
+{0x374, 0x375, GRUB_BIDI_TYPE_ON},
+{0x37e, 0x37e, GRUB_BIDI_TYPE_ON},
+{0x384, 0x385, GRUB_BIDI_TYPE_ON},
+{0x387, 0x387, GRUB_BIDI_TYPE_ON},
+{0x3f6, 0x3f6, GRUB_BIDI_TYPE_ON},
+{0x483, 0x489, GRUB_BIDI_TYPE_NSM},
+{0x58a, 0x58a, GRUB_BIDI_TYPE_ON},
+{0x591, 0x5bd, GRUB_BIDI_TYPE_NSM},
+{0x5be, 0x5be, GRUB_BIDI_TYPE_R},
+{0x5bf, 0x5bf, GRUB_BIDI_TYPE_NSM},
+{0x5c0, 0x5c0, GRUB_BIDI_TYPE_R},
+{0x5c1, 0x5c2, GRUB_BIDI_TYPE_NSM},
+{0x5c3, 0x5c3, GRUB_BIDI_TYPE_R},
+{0x5c4, 0x5c5, GRUB_BIDI_TYPE_NSM},
+{0x5c6, 0x5c6, GRUB_BIDI_TYPE_R},
+{0x5c7, 0x5c7, GRUB_BIDI_TYPE_NSM},
+{0x5d0, 0x5ea, GRUB_BIDI_TYPE_R},
+{0x5f0, 0x5f4, GRUB_BIDI_TYPE_R},
+{0x600, 0x603, GRUB_BIDI_TYPE_AN},
+{0x606, 0x607, GRUB_BIDI_TYPE_ON},
+{0x608, 0x608, GRUB_BIDI_TYPE_AL},
+{0x609, 0x60a, GRUB_BIDI_TYPE_ET},
+{0x60b, 0x60b, GRUB_BIDI_TYPE_AL},
+{0x60c, 0x60c, GRUB_BIDI_TYPE_CS},
+{0x60d, 0x60d, GRUB_BIDI_TYPE_AL},
+{0x60e, 0x60f, GRUB_BIDI_TYPE_ON},
+{0x610, 0x61a, GRUB_BIDI_TYPE_NSM},
+{0x61b, 0x61b, GRUB_BIDI_TYPE_AL},
+{0x61e, 0x61f, GRUB_BIDI_TYPE_AL},
+{0x621, 0x64a, GRUB_BIDI_TYPE_AL},
+{0x64b, 0x65e, GRUB_BIDI_TYPE_NSM},
+{0x660, 0x669, GRUB_BIDI_TYPE_AN},
+{0x66a, 0x66a, GRUB_BIDI_TYPE_ET},
+{0x66b, 0x66c, GRUB_BIDI_TYPE_AN},
+{0x66d, 0x66f, GRUB_BIDI_TYPE_AL},
+{0x670, 0x670, GRUB_BIDI_TYPE_NSM},
+{0x671, 0x6d5, GRUB_BIDI_TYPE_AL},
+{0x6d6, 0x6dc, GRUB_BIDI_TYPE_NSM},
+{0x6dd, 0x6dd, GRUB_BIDI_TYPE_AN},
+{0x6de, 0x6e4, GRUB_BIDI_TYPE_NSM},
+{0x6e5, 0x6e6, GRUB_BIDI_TYPE_AL},
+{0x6e7, 0x6e8, GRUB_BIDI_TYPE_NSM},
+{0x6e9, 0x6e9, GRUB_BIDI_TYPE_ON},
+{0x6ea, 0x6ed, GRUB_BIDI_TYPE_NSM},
+{0x6ee, 0x6ef, GRUB_BIDI_TYPE_AL},
+{0x6f0, 0x6f9, GRUB_BIDI_TYPE_EN},
+{0x6fa, 0x70d, GRUB_BIDI_TYPE_AL},
+{0x70f, 0x70f, GRUB_BIDI_TYPE_BN},
+{0x710, 0x710, GRUB_BIDI_TYPE_AL},
+{0x711, 0x711, GRUB_BIDI_TYPE_NSM},
+{0x712, 0x72f, GRUB_BIDI_TYPE_AL},
+{0x730, 0x74a, GRUB_BIDI_TYPE_NSM},
+{0x74d, 0x7a5, GRUB_BIDI_TYPE_AL},
+{0x7a6, 0x7b0, GRUB_BIDI_TYPE_NSM},
+{0x7b1, 0x7b1, GRUB_BIDI_TYPE_AL},
+{0x7c0, 0x7ea, GRUB_BIDI_TYPE_R},
+{0x7eb, 0x7f3, GRUB_BIDI_TYPE_NSM},
+{0x7f4, 0x7f5, GRUB_BIDI_TYPE_R},
+{0x7f6, 0x7f9, GRUB_BIDI_TYPE_ON},
+{0x7fa, 0x7fa, GRUB_BIDI_TYPE_R},
+{0x901, 0x902, GRUB_BIDI_TYPE_NSM},
+{0x93c, 0x93c, GRUB_BIDI_TYPE_NSM},
+{0x941, 0x948, GRUB_BIDI_TYPE_NSM},
+{0x94d, 0x94d, GRUB_BIDI_TYPE_NSM},
+{0x951, 0x954, GRUB_BIDI_TYPE_NSM},
+{0x962, 0x963, GRUB_BIDI_TYPE_NSM},
+{0x981, 0x981, GRUB_BIDI_TYPE_NSM},
+{0x9bc, 0x9bc, GRUB_BIDI_TYPE_NSM},
+{0x9c1, 0x9c4, GRUB_BIDI_TYPE_NSM},
+{0x9cd, 0x9cd, GRUB_BIDI_TYPE_NSM},
+{0x9e2, 0x9e3, GRUB_BIDI_TYPE_NSM},
+{0x9f2, 0x9f3, GRUB_BIDI_TYPE_ET},
+{0xa01, 0xa02, GRUB_BIDI_TYPE_NSM},
+{0xa3c, 0xa3c, GRUB_BIDI_TYPE_NSM},
+{0xa41, 0xa42, GRUB_BIDI_TYPE_NSM},
+{0xa47, 0xa48, GRUB_BIDI_TYPE_NSM},
+{0xa4b, 0xa4d, GRUB_BIDI_TYPE_NSM},
+{0xa51, 0xa51, GRUB_BIDI_TYPE_NSM},
+{0xa70, 0xa71, GRUB_BIDI_TYPE_NSM},
+{0xa75, 0xa75, GRUB_BIDI_TYPE_NSM},
+{0xa81, 0xa82, GRUB_BIDI_TYPE_NSM},
+{0xabc, 0xabc, GRUB_BIDI_TYPE_NSM},
+{0xac1, 0xac5, GRUB_BIDI_TYPE_NSM},
+{0xac7, 0xac8, GRUB_BIDI_TYPE_NSM},
+{0xacd, 0xacd, GRUB_BIDI_TYPE_NSM},
+{0xae2, 0xae3, GRUB_BIDI_TYPE_NSM},
+{0xaf1, 0xaf1, GRUB_BIDI_TYPE_ET},
+{0xb01, 0xb01, GRUB_BIDI_TYPE_NSM},
+{0xb3c, 0xb3c, GRUB_BIDI_TYPE_NSM},
+{0xb3f, 0xb3f, GRUB_BIDI_TYPE_NSM},
+{0xb41, 0xb44, GRUB_BIDI_TYPE_NSM},
+{0xb4d, 0xb4d, GRUB_BIDI_TYPE_NSM},
+{0xb56, 0xb56, GRUB_BIDI_TYPE_NSM},
+{0xb62, 0xb63, GRUB_BIDI_TYPE_NSM},
+{0xb82, 0xb82, GRUB_BIDI_TYPE_NSM},
+{0xbc0, 0xbc0, GRUB_BIDI_TYPE_NSM},
+{0xbcd, 0xbcd, GRUB_BIDI_TYPE_NSM},
+{0xbf3, 0xbf8, GRUB_BIDI_TYPE_ON},
+{0xbf9, 0xbf9, GRUB_BIDI_TYPE_ET},
+{0xbfa, 0xbfa, GRUB_BIDI_TYPE_ON},
+{0xc3e, 0xc40, GRUB_BIDI_TYPE_NSM},
+{0xc46, 0xc48, GRUB_BIDI_TYPE_NSM},
+{0xc4a, 0xc4d, GRUB_BIDI_TYPE_NSM},
+{0xc55, 0xc56, GRUB_BIDI_TYPE_NSM},
+{0xc62, 0xc63, GRUB_BIDI_TYPE_NSM},
+{0xc78, 0xc7e, GRUB_BIDI_TYPE_ON},
+{0xcbc, 0xcbc, GRUB_BIDI_TYPE_NSM},
+{0xccc, 0xccd, GRUB_BIDI_TYPE_NSM},
+{0xce2, 0xce3, GRUB_BIDI_TYPE_NSM},
+{0xcf1, 0xcf2, GRUB_BIDI_TYPE_ON},
+{0xd41, 0xd44, GRUB_BIDI_TYPE_NSM},
+{0xd4d, 0xd4d, GRUB_BIDI_TYPE_NSM},
+{0xd62, 0xd63, GRUB_BIDI_TYPE_NSM},
+{0xdca, 0xdca, GRUB_BIDI_TYPE_NSM},
+{0xdd2, 0xdd4, GRUB_BIDI_TYPE_NSM},
+{0xdd6, 0xdd6, GRUB_BIDI_TYPE_NSM},
+{0xe31, 0xe31, GRUB_BIDI_TYPE_NSM},
+{0xe34, 0xe3a, GRUB_BIDI_TYPE_NSM},
+{0xe3f, 0xe3f, GRUB_BIDI_TYPE_ET},
+{0xe47, 0xe4e, GRUB_BIDI_TYPE_NSM},
+{0xeb1, 0xeb1, GRUB_BIDI_TYPE_NSM},
+{0xeb4, 0xeb9, GRUB_BIDI_TYPE_NSM},
+{0xebb, 0xebc, GRUB_BIDI_TYPE_NSM},
+{0xec8, 0xecd, GRUB_BIDI_TYPE_NSM},
+{0xf18, 0xf19, GRUB_BIDI_TYPE_NSM},
+{0xf35, 0xf35, GRUB_BIDI_TYPE_NSM},
+{0xf37, 0xf37, GRUB_BIDI_TYPE_NSM},
+{0xf39, 0xf39, GRUB_BIDI_TYPE_NSM},
+{0xf3a, 0xf3d, GRUB_BIDI_TYPE_ON},
+{0xf71, 0xf7e, GRUB_BIDI_TYPE_NSM},
+{0xf80, 0xf84, GRUB_BIDI_TYPE_NSM},
+{0xf86, 0xf87, GRUB_BIDI_TYPE_NSM},
+{0xf90, 0xf97, GRUB_BIDI_TYPE_NSM},
+{0xf99, 0xfbc, GRUB_BIDI_TYPE_NSM},
+{0xfc6, 0xfc6, GRUB_BIDI_TYPE_NSM},
+{0x102d, 0x1030, GRUB_BIDI_TYPE_NSM},
+{0x1032, 0x1037, GRUB_BIDI_TYPE_NSM},
+{0x1039, 0x103a, GRUB_BIDI_TYPE_NSM},
+{0x103d, 0x103e, GRUB_BIDI_TYPE_NSM},
+{0x1058, 0x1059, GRUB_BIDI_TYPE_NSM},
+{0x105e, 0x1060, GRUB_BIDI_TYPE_NSM},
+{0x1071, 0x1074, GRUB_BIDI_TYPE_NSM},
+{0x1082, 0x1082, GRUB_BIDI_TYPE_NSM},
+{0x1085, 0x1086, GRUB_BIDI_TYPE_NSM},
+{0x108d, 0x108d, GRUB_BIDI_TYPE_NSM},
+{0x135f, 0x135f, GRUB_BIDI_TYPE_NSM},
+{0x1390, 0x1399, GRUB_BIDI_TYPE_ON},
+{0x1680, 0x1680, GRUB_BIDI_TYPE_WS},
+{0x169b, 0x169c, GRUB_BIDI_TYPE_ON},
+{0x1712, 0x1714, GRUB_BIDI_TYPE_NSM},
+{0x1732, 0x1734, GRUB_BIDI_TYPE_NSM},
+{0x1752, 0x1753, GRUB_BIDI_TYPE_NSM},
+{0x1772, 0x1773, GRUB_BIDI_TYPE_NSM},
+{0x17b7, 0x17bd, GRUB_BIDI_TYPE_NSM},
+{0x17c6, 0x17c6, GRUB_BIDI_TYPE_NSM},
+{0x17c9, 0x17d3, GRUB_BIDI_TYPE_NSM},
+{0x17db, 0x17db, GRUB_BIDI_TYPE_ET},
+{0x17dd, 0x17dd, GRUB_BIDI_TYPE_NSM},
+{0x17f0, 0x17f9, GRUB_BIDI_TYPE_ON},
+{0x1800, 0x180a, GRUB_BIDI_TYPE_ON},
+{0x180b, 0x180d, GRUB_BIDI_TYPE_NSM},
+{0x180e, 0x180e, GRUB_BIDI_TYPE_WS},
+{0x18a9, 0x18a9, GRUB_BIDI_TYPE_NSM},
+{0x1920, 0x1922, GRUB_BIDI_TYPE_NSM},
+{0x1927, 0x1928, GRUB_BIDI_TYPE_NSM},
+{0x1932, 0x1932, GRUB_BIDI_TYPE_NSM},
+{0x1939, 0x193b, GRUB_BIDI_TYPE_NSM},
+{0x1940, 0x1940, GRUB_BIDI_TYPE_ON},
+{0x1944, 0x1945, GRUB_BIDI_TYPE_ON},
+{0x19de, 0x19ff, GRUB_BIDI_TYPE_ON},
+{0x1a17, 0x1a18, GRUB_BIDI_TYPE_NSM},
+{0x1b00, 0x1b03, GRUB_BIDI_TYPE_NSM},
+{0x1b34, 0x1b34, GRUB_BIDI_TYPE_NSM},
+{0x1b36, 0x1b3a, GRUB_BIDI_TYPE_NSM},
+{0x1b3c, 0x1b3c, GRUB_BIDI_TYPE_NSM},
+{0x1b42, 0x1b42, GRUB_BIDI_TYPE_NSM},
+{0x1b6b, 0x1b73, GRUB_BIDI_TYPE_NSM},
+{0x1b80, 0x1b81, GRUB_BIDI_TYPE_NSM},
+{0x1ba2, 0x1ba5, GRUB_BIDI_TYPE_NSM},
+{0x1ba8, 0x1ba9, GRUB_BIDI_TYPE_NSM},
+{0x1c2c, 0x1c33, GRUB_BIDI_TYPE_NSM},
+{0x1c36, 0x1c37, GRUB_BIDI_TYPE_NSM},
+{0x1dc0, 0x1de6, GRUB_BIDI_TYPE_NSM},
+{0x1dfe, 0x1dff, GRUB_BIDI_TYPE_NSM},
+{0x1fbd, 0x1fbd, GRUB_BIDI_TYPE_ON},
+{0x1fbf, 0x1fc1, GRUB_BIDI_TYPE_ON},
+{0x1fcd, 0x1fcf, GRUB_BIDI_TYPE_ON},
+{0x1fdd, 0x1fdf, GRUB_BIDI_TYPE_ON},
+{0x1fed, 0x1fef, GRUB_BIDI_TYPE_ON},
+{0x1ffd, 0x1ffe, GRUB_BIDI_TYPE_ON},
+{0x2000, 0x200a, GRUB_BIDI_TYPE_WS},
+{0x200b, 0x200d, GRUB_BIDI_TYPE_BN},
+{0x200f, 0x200f, GRUB_BIDI_TYPE_R},
+{0x2010, 0x2027, GRUB_BIDI_TYPE_ON},
+{0x2028, 0x2028, GRUB_BIDI_TYPE_WS},
+{0x2029, 0x2029, GRUB_BIDI_TYPE_B},
+{0x202a, 0x202a, GRUB_BIDI_TYPE_LRE},
+{0x202b, 0x202b, GRUB_BIDI_TYPE_RLE},
+{0x202c, 0x202c, GRUB_BIDI_TYPE_PDF},
+{0x202d, 0x202d, GRUB_BIDI_TYPE_LRO},
+{0x202e, 0x202e, GRUB_BIDI_TYPE_RLO},
+{0x202f, 0x202f, GRUB_BIDI_TYPE_CS},
+{0x2030, 0x2034, GRUB_BIDI_TYPE_ET},
+{0x2035, 0x2043, GRUB_BIDI_TYPE_ON},
+{0x2044, 0x2044, GRUB_BIDI_TYPE_CS},
+{0x2045, 0x205e, GRUB_BIDI_TYPE_ON},
+{0x205f, 0x205f, GRUB_BIDI_TYPE_WS},
+{0x2060, 0x2064, GRUB_BIDI_TYPE_BN},
+{0x206a, 0x206f, GRUB_BIDI_TYPE_BN},
+{0x2070, 0x2070, GRUB_BIDI_TYPE_EN},
+{0x2074, 0x2079, GRUB_BIDI_TYPE_EN},
+{0x207a, 0x207b, GRUB_BIDI_TYPE_ES},
+{0x207c, 0x207e, GRUB_BIDI_TYPE_ON},
+{0x2080, 0x2089, GRUB_BIDI_TYPE_EN},
+{0x208a, 0x208b, GRUB_BIDI_TYPE_ES},
+{0x208c, 0x208e, GRUB_BIDI_TYPE_ON},
+{0x20a0, 0x20b5, GRUB_BIDI_TYPE_ET},
+{0x20d0, 0x20f0, GRUB_BIDI_TYPE_NSM},
+{0x2100, 0x2101, GRUB_BIDI_TYPE_ON},
+{0x2103, 0x2106, GRUB_BIDI_TYPE_ON},
+{0x2108, 0x2109, GRUB_BIDI_TYPE_ON},
+{0x2114, 0x2114, GRUB_BIDI_TYPE_ON},
+{0x2116, 0x2118, GRUB_BIDI_TYPE_ON},
+{0x211e, 0x2123, GRUB_BIDI_TYPE_ON},
+{0x2125, 0x2125, GRUB_BIDI_TYPE_ON},
+{0x2127, 0x2127, GRUB_BIDI_TYPE_ON},
+{0x2129, 0x2129, GRUB_BIDI_TYPE_ON},
+{0x212e, 0x212e, GRUB_BIDI_TYPE_ET},
+{0x213a, 0x213b, GRUB_BIDI_TYPE_ON},
+{0x2140, 0x2144, GRUB_BIDI_TYPE_ON},
+{0x214a, 0x214d, GRUB_BIDI_TYPE_ON},
+{0x2153, 0x215f, GRUB_BIDI_TYPE_ON},
+{0x2190, 0x2211, GRUB_BIDI_TYPE_ON},
+{0x2212, 0x2212, GRUB_BIDI_TYPE_ES},
+{0x2213, 0x2213, GRUB_BIDI_TYPE_ET},
+{0x2214, 0x2335, GRUB_BIDI_TYPE_ON},
+{0x237b, 0x2394, GRUB_BIDI_TYPE_ON},
+{0x2396, 0x23e7, GRUB_BIDI_TYPE_ON},
+{0x2400, 0x2426, GRUB_BIDI_TYPE_ON},
+{0x2440, 0x244a, GRUB_BIDI_TYPE_ON},
+{0x2460, 0x2487, GRUB_BIDI_TYPE_ON},
+{0x2488, 0x249b, GRUB_BIDI_TYPE_EN},
+{0x24ea, 0x269d, GRUB_BIDI_TYPE_ON},
+{0x26a0, 0x26ab, GRUB_BIDI_TYPE_ON},
+{0x26ad, 0x26bc, GRUB_BIDI_TYPE_ON},
+{0x26c0, 0x26c3, GRUB_BIDI_TYPE_ON},
+{0x2701, 0x2704, GRUB_BIDI_TYPE_ON},
+{0x2706, 0x2709, GRUB_BIDI_TYPE_ON},
+{0x270c, 0x2727, GRUB_BIDI_TYPE_ON},
+{0x2729, 0x274b, GRUB_BIDI_TYPE_ON},
+{0x274d, 0x274d, GRUB_BIDI_TYPE_ON},
+{0x274f, 0x2752, GRUB_BIDI_TYPE_ON},
+{0x2756, 0x2756, GRUB_BIDI_TYPE_ON},
+{0x2758, 0x275e, GRUB_BIDI_TYPE_ON},
+{0x2761, 0x2794, GRUB_BIDI_TYPE_ON},
+{0x2798, 0x27af, GRUB_BIDI_TYPE_ON},
+{0x27b1, 0x27be, GRUB_BIDI_TYPE_ON},
+{0x27c0, 0x27ca, GRUB_BIDI_TYPE_ON},
+{0x27cc, 0x27cc, GRUB_BIDI_TYPE_ON},
+{0x27d0, 0x27ff, GRUB_BIDI_TYPE_ON},
+{0x2900, 0x2b4c, GRUB_BIDI_TYPE_ON},
+{0x2b50, 0x2b54, GRUB_BIDI_TYPE_ON},
+{0x2ce5, 0x2cea, GRUB_BIDI_TYPE_ON},
+{0x2cf9, 0x2cff, GRUB_BIDI_TYPE_ON},
+{0x2de0, 0x2dff, GRUB_BIDI_TYPE_NSM},
+{0x2e00, 0x2e30, GRUB_BIDI_TYPE_ON},
+{0x2e80, 0x2e99, GRUB_BIDI_TYPE_ON},
+{0x2e9b, 0x2ef3, GRUB_BIDI_TYPE_ON},
+{0x2f00, 0x2fd5, GRUB_BIDI_TYPE_ON},
+{0x2ff0, 0x2ffb, GRUB_BIDI_TYPE_ON},
+{0x3000, 0x3000, GRUB_BIDI_TYPE_WS},
+{0x3001, 0x3004, GRUB_BIDI_TYPE_ON},
+{0x3008, 0x3020, GRUB_BIDI_TYPE_ON},
+{0x302a, 0x302f, GRUB_BIDI_TYPE_NSM},
+{0x3030, 0x3030, GRUB_BIDI_TYPE_ON},
+{0x3036, 0x3037, GRUB_BIDI_TYPE_ON},
+{0x303d, 0x303f, GRUB_BIDI_TYPE_ON},
+{0x3099, 0x309a, GRUB_BIDI_TYPE_NSM},
+{0x309b, 0x309c, GRUB_BIDI_TYPE_ON},
+{0x30a0, 0x30a0, GRUB_BIDI_TYPE_ON},
+{0x30fb, 0x30fb, GRUB_BIDI_TYPE_ON},
+{0x31c0, 0x31e3, GRUB_BIDI_TYPE_ON},
+{0x321d, 0x321e, GRUB_BIDI_TYPE_ON},
+{0x3250, 0x325f, GRUB_BIDI_TYPE_ON},
+{0x327c, 0x327e, GRUB_BIDI_TYPE_ON},
+{0x32b1, 0x32bf, GRUB_BIDI_TYPE_ON},
+{0x32cc, 0x32cf, GRUB_BIDI_TYPE_ON},
+{0x3377, 0x337a, GRUB_BIDI_TYPE_ON},
+{0x33de, 0x33df, GRUB_BIDI_TYPE_ON},
+{0x33ff, 0x33ff, GRUB_BIDI_TYPE_ON},
+{0x4dc0, 0x4dff, GRUB_BIDI_TYPE_ON},
+{0xa490, 0xa4c6, GRUB_BIDI_TYPE_ON},
+{0xa60d, 0xa60f, GRUB_BIDI_TYPE_ON},
+{0xa66f, 0xa672, GRUB_BIDI_TYPE_NSM},
+{0xa673, 0xa673, GRUB_BIDI_TYPE_ON},
+{0xa67c, 0xa67d, GRUB_BIDI_TYPE_NSM},
+{0xa67e, 0xa67f, GRUB_BIDI_TYPE_ON},
+{0xa700, 0xa721, GRUB_BIDI_TYPE_ON},
+{0xa788, 0xa788, GRUB_BIDI_TYPE_ON},
+{0xa802, 0xa802, GRUB_BIDI_TYPE_NSM},
+{0xa806, 0xa806, GRUB_BIDI_TYPE_NSM},
+{0xa80b, 0xa80b, GRUB_BIDI_TYPE_NSM},
+{0xa825, 0xa826, GRUB_BIDI_TYPE_NSM},
+{0xa828, 0xa82b, GRUB_BIDI_TYPE_ON},
+{0xa874, 0xa877, GRUB_BIDI_TYPE_ON},
+{0xa8c4, 0xa8c4, GRUB_BIDI_TYPE_NSM},
+{0xa926, 0xa92d, GRUB_BIDI_TYPE_NSM},
+{0xa947, 0xa951, GRUB_BIDI_TYPE_NSM},
+{0xaa29, 0xaa2e, GRUB_BIDI_TYPE_NSM},
+{0xaa31, 0xaa32, GRUB_BIDI_TYPE_NSM},
+{0xaa35, 0xaa36, GRUB_BIDI_TYPE_NSM},
+{0xaa43, 0xaa43, GRUB_BIDI_TYPE_NSM},
+{0xaa4c, 0xaa4c, GRUB_BIDI_TYPE_NSM},
+{0xfb1d, 0xfb1d, GRUB_BIDI_TYPE_R},
+{0xfb1e, 0xfb1e, GRUB_BIDI_TYPE_NSM},
+{0xfb1f, 0xfb28, GRUB_BIDI_TYPE_R},
+{0xfb29, 0xfb29, GRUB_BIDI_TYPE_ES},
+{0xfb2a, 0xfb36, GRUB_BIDI_TYPE_R},
+{0xfb38, 0xfb3c, GRUB_BIDI_TYPE_R},
+{0xfb3e, 0xfb3e, GRUB_BIDI_TYPE_R},
+{0xfb40, 0xfb41, GRUB_BIDI_TYPE_R},
+{0xfb43, 0xfb44, GRUB_BIDI_TYPE_R},
+{0xfb46, 0xfb4f, GRUB_BIDI_TYPE_R},
+{0xfb50, 0xfbb1, GRUB_BIDI_TYPE_AL},
+{0xfbd3, 0xfd3d, GRUB_BIDI_TYPE_AL},
+{0xfd3e, 0xfd3f, GRUB_BIDI_TYPE_ON},
+{0xfd50, 0xfd8f, GRUB_BIDI_TYPE_AL},
+{0xfd92, 0xfdc7, GRUB_BIDI_TYPE_AL},
+{0xfdf0, 0xfdfc, GRUB_BIDI_TYPE_AL},
+{0xfdfd, 0xfdfd, GRUB_BIDI_TYPE_ON},
+{0xfe00, 0xfe0f, GRUB_BIDI_TYPE_NSM},
+{0xfe10, 0xfe19, GRUB_BIDI_TYPE_ON},
+{0xfe20, 0xfe26, GRUB_BIDI_TYPE_NSM},
+{0xfe30, 0xfe4f, GRUB_BIDI_TYPE_ON},
+{0xfe50, 0xfe50, GRUB_BIDI_TYPE_CS},
+{0xfe51, 0xfe51, GRUB_BIDI_TYPE_ON},
+{0xfe52, 0xfe52, GRUB_BIDI_TYPE_CS},
+{0xfe54, 0xfe54, GRUB_BIDI_TYPE_ON},
+{0xfe55, 0xfe55, GRUB_BIDI_TYPE_CS},
+{0xfe56, 0xfe5e, GRUB_BIDI_TYPE_ON},
+{0xfe5f, 0xfe5f, GRUB_BIDI_TYPE_ET},
+{0xfe60, 0xfe61, GRUB_BIDI_TYPE_ON},
+{0xfe62, 0xfe63, GRUB_BIDI_TYPE_ES},
+{0xfe64, 0xfe66, GRUB_BIDI_TYPE_ON},
+{0xfe68, 0xfe68, GRUB_BIDI_TYPE_ON},
+{0xfe69, 0xfe6a, GRUB_BIDI_TYPE_ET},
+{0xfe6b, 0xfe6b, GRUB_BIDI_TYPE_ON},
+{0xfe70, 0xfe74, GRUB_BIDI_TYPE_AL},
+{0xfe76, 0xfefc, GRUB_BIDI_TYPE_AL},
+{0xfeff, 0xfeff, GRUB_BIDI_TYPE_BN},
+{0xff01, 0xff02, GRUB_BIDI_TYPE_ON},
+{0xff03, 0xff05, GRUB_BIDI_TYPE_ET},
+{0xff06, 0xff0a, GRUB_BIDI_TYPE_ON},
+{0xff0b, 0xff0b, GRUB_BIDI_TYPE_ES},
+{0xff0c, 0xff0c, GRUB_BIDI_TYPE_CS},
+{0xff0d, 0xff0d, GRUB_BIDI_TYPE_ES},
+{0xff0e, 0xff0f, GRUB_BIDI_TYPE_CS},
+{0xff10, 0xff19, GRUB_BIDI_TYPE_EN},
+{0xff1a, 0xff1a, GRUB_BIDI_TYPE_CS},
+{0xff1b, 0xff20, GRUB_BIDI_TYPE_ON},
+{0xff3b, 0xff40, GRUB_BIDI_TYPE_ON},
+{0xff5b, 0xff65, GRUB_BIDI_TYPE_ON},
+{0xffe0, 0xffe1, GRUB_BIDI_TYPE_ET},
+{0xffe2, 0xffe4, GRUB_BIDI_TYPE_ON},
+{0xffe5, 0xffe6, GRUB_BIDI_TYPE_ET},
+{0xffe8, 0xffee, GRUB_BIDI_TYPE_ON},
+{0xfff9, 0xfffd, GRUB_BIDI_TYPE_ON},
+{0x10101, 0x10101, GRUB_BIDI_TYPE_ON},
+{0x10140, 0x1018a, GRUB_BIDI_TYPE_ON},
+{0x10190, 0x1019b, GRUB_BIDI_TYPE_ON},
+{0x101fd, 0x101fd, GRUB_BIDI_TYPE_NSM},
+{0x10800, 0x10805, GRUB_BIDI_TYPE_R},
+{0x10808, 0x10808, GRUB_BIDI_TYPE_R},
+{0x1080a, 0x10835, GRUB_BIDI_TYPE_R},
+{0x10837, 0x10838, GRUB_BIDI_TYPE_R},
+{0x1083c, 0x1083c, GRUB_BIDI_TYPE_R},
+{0x1083f, 0x1083f, GRUB_BIDI_TYPE_R},
+{0x10900, 0x10919, GRUB_BIDI_TYPE_R},
+{0x1091f, 0x1091f, GRUB_BIDI_TYPE_ON},
+{0x10920, 0x10939, GRUB_BIDI_TYPE_R},
+{0x1093f, 0x1093f, GRUB_BIDI_TYPE_R},
+{0x10a00, 0x10a00, GRUB_BIDI_TYPE_R},
+{0x10a01, 0x10a03, GRUB_BIDI_TYPE_NSM},
+{0x10a05, 0x10a06, GRUB_BIDI_TYPE_NSM},
+{0x10a0c, 0x10a0f, GRUB_BIDI_TYPE_NSM},
+{0x10a10, 0x10a13, GRUB_BIDI_TYPE_R},
+{0x10a15, 0x10a17, GRUB_BIDI_TYPE_R},
+{0x10a19, 0x10a33, GRUB_BIDI_TYPE_R},
+{0x10a38, 0x10a3a, GRUB_BIDI_TYPE_NSM},
+{0x10a3f, 0x10a3f, GRUB_BIDI_TYPE_NSM},
+{0x10a40, 0x10a47, GRUB_BIDI_TYPE_R},
+{0x10a50, 0x10a58, GRUB_BIDI_TYPE_R},
+{0x1d167, 0x1d169, GRUB_BIDI_TYPE_NSM},
+{0x1d173, 0x1d17a, GRUB_BIDI_TYPE_BN},
+{0x1d17b, 0x1d182, GRUB_BIDI_TYPE_NSM},
+{0x1d185, 0x1d18b, GRUB_BIDI_TYPE_NSM},
+{0x1d1aa, 0x1d1ad, GRUB_BIDI_TYPE_NSM},
+{0x1d200, 0x1d241, GRUB_BIDI_TYPE_ON},
+{0x1d242, 0x1d244, GRUB_BIDI_TYPE_NSM},
+{0x1d245, 0x1d245, GRUB_BIDI_TYPE_ON},
+{0x1d300, 0x1d356, GRUB_BIDI_TYPE_ON},
+{0x1d7ce, 0x1d7ff, GRUB_BIDI_TYPE_EN},
+{0x1f000, 0x1f02b, GRUB_BIDI_TYPE_ON},
+{0x1f030, 0x1f093, GRUB_BIDI_TYPE_ON},
+{0xe0001, 0xe0001, GRUB_BIDI_TYPE_BN},
+{0xe0020, 0xe007f, GRUB_BIDI_TYPE_BN},
+{0xe0100, 0xe01ef, GRUB_BIDI_TYPE_NSM},
+{0, 0, 0},
+};
\ No newline at end of file
diff --git a/util/UnicodeData.txt b/util/UnicodeData.txt
new file mode 100644
index 000000000..77db788cf
--- /dev/null
+++ b/util/UnicodeData.txt
@@ -0,0 +1,19336 @@
+0000;<control>;Cc;0;BN;;;;;N;NULL;;;;
+0001;<control>;Cc;0;BN;;;;;N;START OF HEADING;;;;
+0002;<control>;Cc;0;BN;;;;;N;START OF TEXT;;;;
+0003;<control>;Cc;0;BN;;;;;N;END OF TEXT;;;;
+0004;<control>;Cc;0;BN;;;;;N;END OF TRANSMISSION;;;;
+0005;<control>;Cc;0;BN;;;;;N;ENQUIRY;;;;
+0006;<control>;Cc;0;BN;;;;;N;ACKNOWLEDGE;;;;
+0007;<control>;Cc;0;BN;;;;;N;BELL;;;;
+0008;<control>;Cc;0;BN;;;;;N;BACKSPACE;;;;
+0009;<control>;Cc;0;S;;;;;N;CHARACTER TABULATION;;;;
+000A;<control>;Cc;0;B;;;;;N;LINE FEED (LF);;;;
+000B;<control>;Cc;0;S;;;;;N;LINE TABULATION;;;;
+000C;<control>;Cc;0;WS;;;;;N;FORM FEED (FF);;;;
+000D;<control>;Cc;0;B;;;;;N;CARRIAGE RETURN (CR);;;;
+000E;<control>;Cc;0;BN;;;;;N;SHIFT OUT;;;;
+000F;<control>;Cc;0;BN;;;;;N;SHIFT IN;;;;
+0010;<control>;Cc;0;BN;;;;;N;DATA LINK ESCAPE;;;;
+0011;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL ONE;;;;
+0012;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL TWO;;;;
+0013;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL THREE;;;;
+0014;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL FOUR;;;;
+0015;<control>;Cc;0;BN;;;;;N;NEGATIVE ACKNOWLEDGE;;;;
+0016;<control>;Cc;0;BN;;;;;N;SYNCHRONOUS IDLE;;;;
+0017;<control>;Cc;0;BN;;;;;N;END OF TRANSMISSION BLOCK;;;;
+0018;<control>;Cc;0;BN;;;;;N;CANCEL;;;;
+0019;<control>;Cc;0;BN;;;;;N;END OF MEDIUM;;;;
+001A;<control>;Cc;0;BN;;;;;N;SUBSTITUTE;;;;
+001B;<control>;Cc;0;BN;;;;;N;ESCAPE;;;;
+001C;<control>;Cc;0;B;;;;;N;INFORMATION SEPARATOR FOUR;;;;
+001D;<control>;Cc;0;B;;;;;N;INFORMATION SEPARATOR THREE;;;;
+001E;<control>;Cc;0;B;;;;;N;INFORMATION SEPARATOR TWO;;;;
+001F;<control>;Cc;0;S;;;;;N;INFORMATION SEPARATOR ONE;;;;
+0020;SPACE;Zs;0;WS;;;;;N;;;;;
+0021;EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
+0022;QUOTATION MARK;Po;0;ON;;;;;N;;;;;
+0023;NUMBER SIGN;Po;0;ET;;;;;N;;;;;
+0024;DOLLAR SIGN;Sc;0;ET;;;;;N;;;;;
+0025;PERCENT SIGN;Po;0;ET;;;;;N;;;;;
+0026;AMPERSAND;Po;0;ON;;;;;N;;;;;
+0027;APOSTROPHE;Po;0;ON;;;;;N;APOSTROPHE-QUOTE;;;;
+0028;LEFT PARENTHESIS;Ps;0;ON;;;;;Y;OPENING PARENTHESIS;;;;
+0029;RIGHT PARENTHESIS;Pe;0;ON;;;;;Y;CLOSING PARENTHESIS;;;;
+002A;ASTERISK;Po;0;ON;;;;;N;;;;;
+002B;PLUS SIGN;Sm;0;ES;;;;;N;;;;;
+002C;COMMA;Po;0;CS;;;;;N;;;;;
+002D;HYPHEN-MINUS;Pd;0;ES;;;;;N;;;;;
+002E;FULL STOP;Po;0;CS;;;;;N;PERIOD;;;;
+002F;SOLIDUS;Po;0;CS;;;;;N;SLASH;;;;
+0030;DIGIT ZERO;Nd;0;EN;;0;0;0;N;;;;;
+0031;DIGIT ONE;Nd;0;EN;;1;1;1;N;;;;;
+0032;DIGIT TWO;Nd;0;EN;;2;2;2;N;;;;;
+0033;DIGIT THREE;Nd;0;EN;;3;3;3;N;;;;;
+0034;DIGIT FOUR;Nd;0;EN;;4;4;4;N;;;;;
+0035;DIGIT FIVE;Nd;0;EN;;5;5;5;N;;;;;
+0036;DIGIT SIX;Nd;0;EN;;6;6;6;N;;;;;
+0037;DIGIT SEVEN;Nd;0;EN;;7;7;7;N;;;;;
+0038;DIGIT EIGHT;Nd;0;EN;;8;8;8;N;;;;;
+0039;DIGIT NINE;Nd;0;EN;;9;9;9;N;;;;;
+003A;COLON;Po;0;CS;;;;;N;;;;;
+003B;SEMICOLON;Po;0;ON;;;;;N;;;;;
+003C;LESS-THAN SIGN;Sm;0;ON;;;;;Y;;;;;
+003D;EQUALS SIGN;Sm;0;ON;;;;;N;;;;;
+003E;GREATER-THAN SIGN;Sm;0;ON;;;;;Y;;;;;
+003F;QUESTION MARK;Po;0;ON;;;;;N;;;;;
+0040;COMMERCIAL AT;Po;0;ON;;;;;N;;;;;
+0041;LATIN CAPITAL LETTER A;Lu;0;L;;;;;N;;;;0061;
+0042;LATIN CAPITAL LETTER B;Lu;0;L;;;;;N;;;;0062;
+0043;LATIN CAPITAL LETTER C;Lu;0;L;;;;;N;;;;0063;
+0044;LATIN CAPITAL LETTER D;Lu;0;L;;;;;N;;;;0064;
+0045;LATIN CAPITAL LETTER E;Lu;0;L;;;;;N;;;;0065;
+0046;LATIN CAPITAL LETTER F;Lu;0;L;;;;;N;;;;0066;
+0047;LATIN CAPITAL LETTER G;Lu;0;L;;;;;N;;;;0067;
+0048;LATIN CAPITAL LETTER H;Lu;0;L;;;;;N;;;;0068;
+0049;LATIN CAPITAL LETTER I;Lu;0;L;;;;;N;;;;0069;
+004A;LATIN CAPITAL LETTER J;Lu;0;L;;;;;N;;;;006A;
+004B;LATIN CAPITAL LETTER K;Lu;0;L;;;;;N;;;;006B;
+004C;LATIN CAPITAL LETTER L;Lu;0;L;;;;;N;;;;006C;
+004D;LATIN CAPITAL LETTER M;Lu;0;L;;;;;N;;;;006D;
+004E;LATIN CAPITAL LETTER N;Lu;0;L;;;;;N;;;;006E;
+004F;LATIN CAPITAL LETTER O;Lu;0;L;;;;;N;;;;006F;
+0050;LATIN CAPITAL LETTER P;Lu;0;L;;;;;N;;;;0070;
+0051;LATIN CAPITAL LETTER Q;Lu;0;L;;;;;N;;;;0071;
+0052;LATIN CAPITAL LETTER R;Lu;0;L;;;;;N;;;;0072;
+0053;LATIN CAPITAL LETTER S;Lu;0;L;;;;;N;;;;0073;
+0054;LATIN CAPITAL LETTER T;Lu;0;L;;;;;N;;;;0074;
+0055;LATIN CAPITAL LETTER U;Lu;0;L;;;;;N;;;;0075;
+0056;LATIN CAPITAL LETTER V;Lu;0;L;;;;;N;;;;0076;
+0057;LATIN CAPITAL LETTER W;Lu;0;L;;;;;N;;;;0077;
+0058;LATIN CAPITAL LETTER X;Lu;0;L;;;;;N;;;;0078;
+0059;LATIN CAPITAL LETTER Y;Lu;0;L;;;;;N;;;;0079;
+005A;LATIN CAPITAL LETTER Z;Lu;0;L;;;;;N;;;;007A;
+005B;LEFT SQUARE BRACKET;Ps;0;ON;;;;;Y;OPENING SQUARE BRACKET;;;;
+005C;REVERSE SOLIDUS;Po;0;ON;;;;;N;BACKSLASH;;;;
+005D;RIGHT SQUARE BRACKET;Pe;0;ON;;;;;Y;CLOSING SQUARE BRACKET;;;;
+005E;CIRCUMFLEX ACCENT;Sk;0;ON;;;;;N;SPACING CIRCUMFLEX;;;;
+005F;LOW LINE;Pc;0;ON;;;;;N;SPACING UNDERSCORE;;;;
+0060;GRAVE ACCENT;Sk;0;ON;;;;;N;SPACING GRAVE;;;;
+0061;LATIN SMALL LETTER A;Ll;0;L;;;;;N;;;0041;;0041
+0062;LATIN SMALL LETTER B;Ll;0;L;;;;;N;;;0042;;0042
+0063;LATIN SMALL LETTER C;Ll;0;L;;;;;N;;;0043;;0043
+0064;LATIN SMALL LETTER D;Ll;0;L;;;;;N;;;0044;;0044
+0065;LATIN SMALL LETTER E;Ll;0;L;;;;;N;;;0045;;0045
+0066;LATIN SMALL LETTER F;Ll;0;L;;;;;N;;;0046;;0046
+0067;LATIN SMALL LETTER G;Ll;0;L;;;;;N;;;0047;;0047
+0068;LATIN SMALL LETTER H;Ll;0;L;;;;;N;;;0048;;0048
+0069;LATIN SMALL LETTER I;Ll;0;L;;;;;N;;;0049;;0049
+006A;LATIN SMALL LETTER J;Ll;0;L;;;;;N;;;004A;;004A
+006B;LATIN SMALL LETTER K;Ll;0;L;;;;;N;;;004B;;004B
+006C;LATIN SMALL LETTER L;Ll;0;L;;;;;N;;;004C;;004C
+006D;LATIN SMALL LETTER M;Ll;0;L;;;;;N;;;004D;;004D
+006E;LATIN SMALL LETTER N;Ll;0;L;;;;;N;;;004E;;004E
+006F;LATIN SMALL LETTER O;Ll;0;L;;;;;N;;;004F;;004F
+0070;LATIN SMALL LETTER P;Ll;0;L;;;;;N;;;0050;;0050
+0071;LATIN SMALL LETTER Q;Ll;0;L;;;;;N;;;0051;;0051
+0072;LATIN SMALL LETTER R;Ll;0;L;;;;;N;;;0052;;0052
+0073;LATIN SMALL LETTER S;Ll;0;L;;;;;N;;;0053;;0053
+0074;LATIN SMALL LETTER T;Ll;0;L;;;;;N;;;0054;;0054
+0075;LATIN SMALL LETTER U;Ll;0;L;;;;;N;;;0055;;0055
+0076;LATIN SMALL LETTER V;Ll;0;L;;;;;N;;;0056;;0056
+0077;LATIN SMALL LETTER W;Ll;0;L;;;;;N;;;0057;;0057
+0078;LATIN SMALL LETTER X;Ll;0;L;;;;;N;;;0058;;0058
+0079;LATIN SMALL LETTER Y;Ll;0;L;;;;;N;;;0059;;0059
+007A;LATIN SMALL LETTER Z;Ll;0;L;;;;;N;;;005A;;005A
+007B;LEFT CURLY BRACKET;Ps;0;ON;;;;;Y;OPENING CURLY BRACKET;;;;
+007C;VERTICAL LINE;Sm;0;ON;;;;;N;VERTICAL BAR;;;;
+007D;RIGHT CURLY BRACKET;Pe;0;ON;;;;;Y;CLOSING CURLY BRACKET;;;;
+007E;TILDE;Sm;0;ON;;;;;N;;;;;
+007F;<control>;Cc;0;BN;;;;;N;DELETE;;;;
+0080;<control>;Cc;0;BN;;;;;N;;;;;
+0081;<control>;Cc;0;BN;;;;;N;;;;;
+0082;<control>;Cc;0;BN;;;;;N;BREAK PERMITTED HERE;;;;
+0083;<control>;Cc;0;BN;;;;;N;NO BREAK HERE;;;;
+0084;<control>;Cc;0;BN;;;;;N;;;;;
+0085;<control>;Cc;0;B;;;;;N;NEXT LINE (NEL);;;;
+0086;<control>;Cc;0;BN;;;;;N;START OF SELECTED AREA;;;;
+0087;<control>;Cc;0;BN;;;;;N;END OF SELECTED AREA;;;;
+0088;<control>;Cc;0;BN;;;;;N;CHARACTER TABULATION SET;;;;
+0089;<control>;Cc;0;BN;;;;;N;CHARACTER TABULATION WITH JUSTIFICATION;;;;
+008A;<control>;Cc;0;BN;;;;;N;LINE TABULATION SET;;;;
+008B;<control>;Cc;0;BN;;;;;N;PARTIAL LINE FORWARD;;;;
+008C;<control>;Cc;0;BN;;;;;N;PARTIAL LINE BACKWARD;;;;
+008D;<control>;Cc;0;BN;;;;;N;REVERSE LINE FEED;;;;
+008E;<control>;Cc;0;BN;;;;;N;SINGLE SHIFT TWO;;;;
+008F;<control>;Cc;0;BN;;;;;N;SINGLE SHIFT THREE;;;;
+0090;<control>;Cc;0;BN;;;;;N;DEVICE CONTROL STRING;;;;
+0091;<control>;Cc;0;BN;;;;;N;PRIVATE USE ONE;;;;
+0092;<control>;Cc;0;BN;;;;;N;PRIVATE USE TWO;;;;
+0093;<control>;Cc;0;BN;;;;;N;SET TRANSMIT STATE;;;;
+0094;<control>;Cc;0;BN;;;;;N;CANCEL CHARACTER;;;;
+0095;<control>;Cc;0;BN;;;;;N;MESSAGE WAITING;;;;
+0096;<control>;Cc;0;BN;;;;;N;START OF GUARDED AREA;;;;
+0097;<control>;Cc;0;BN;;;;;N;END OF GUARDED AREA;;;;
+0098;<control>;Cc;0;BN;;;;;N;START OF STRING;;;;
+0099;<control>;Cc;0;BN;;;;;N;;;;;
+009A;<control>;Cc;0;BN;;;;;N;SINGLE CHARACTER INTRODUCER;;;;
+009B;<control>;Cc;0;BN;;;;;N;CONTROL SEQUENCE INTRODUCER;;;;
+009C;<control>;Cc;0;BN;;;;;N;STRING TERMINATOR;;;;
+009D;<control>;Cc;0;BN;;;;;N;OPERATING SYSTEM COMMAND;;;;
+009E;<control>;Cc;0;BN;;;;;N;PRIVACY MESSAGE;;;;
+009F;<control>;Cc;0;BN;;;;;N;APPLICATION PROGRAM COMMAND;;;;
+00A0;NO-BREAK SPACE;Zs;0;CS;<noBreak> 0020;;;;N;NON-BREAKING SPACE;;;;
+00A1;INVERTED EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
+00A2;CENT SIGN;Sc;0;ET;;;;;N;;;;;
+00A3;POUND SIGN;Sc;0;ET;;;;;N;;;;;
+00A4;CURRENCY SIGN;Sc;0;ET;;;;;N;;;;;
+00A5;YEN SIGN;Sc;0;ET;;;;;N;;;;;
+00A6;BROKEN BAR;So;0;ON;;;;;N;BROKEN VERTICAL BAR;;;;
+00A7;SECTION SIGN;So;0;ON;;;;;N;;;;;
+00A8;DIAERESIS;Sk;0;ON;<compat> 0020 0308;;;;N;SPACING DIAERESIS;;;;
+00A9;COPYRIGHT SIGN;So;0;ON;;;;;N;;;;;
+00AA;FEMININE ORDINAL INDICATOR;Ll;0;L;<super> 0061;;;;N;;;;;
+00AB;LEFT-POINTING DOUBLE ANGLE QUOTATION MARK;Pi;0;ON;;;;;Y;LEFT POINTING GUILLEMET;*;;;
+00AC;NOT SIGN;Sm;0;ON;;;;;N;;;;;
+00AD;SOFT HYPHEN;Cf;0;BN;;;;;N;;;;;
+00AE;REGISTERED SIGN;So;0;ON;;;;;N;REGISTERED TRADE MARK SIGN;;;;
+00AF;MACRON;Sk;0;ON;<compat> 0020 0304;;;;N;SPACING MACRON;;;;
+00B0;DEGREE SIGN;So;0;ET;;;;;N;;;;;
+00B1;PLUS-MINUS SIGN;Sm;0;ET;;;;;N;PLUS-OR-MINUS SIGN;;;;
+00B2;SUPERSCRIPT TWO;No;0;EN;<super> 0032;;2;2;N;SUPERSCRIPT DIGIT TWO;;;;
+00B3;SUPERSCRIPT THREE;No;0;EN;<super> 0033;;3;3;N;SUPERSCRIPT DIGIT THREE;;;;
+00B4;ACUTE ACCENT;Sk;0;ON;<compat> 0020 0301;;;;N;SPACING ACUTE;;;;
+00B5;MICRO SIGN;Ll;0;L;<compat> 03BC;;;;N;;;039C;;039C
+00B6;PILCROW SIGN;So;0;ON;;;;;N;PARAGRAPH SIGN;;;;
+00B7;MIDDLE DOT;Po;0;ON;;;;;N;;;;;
+00B8;CEDILLA;Sk;0;ON;<compat> 0020 0327;;;;N;SPACING CEDILLA;;;;
+00B9;SUPERSCRIPT ONE;No;0;EN;<super> 0031;;1;1;N;SUPERSCRIPT DIGIT ONE;;;;
+00BA;MASCULINE ORDINAL INDICATOR;Ll;0;L;<super> 006F;;;;N;;;;;
+00BB;RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK;Pf;0;ON;;;;;Y;RIGHT POINTING GUILLEMET;*;;;
+00BC;VULGAR FRACTION ONE QUARTER;No;0;ON;<fraction> 0031 2044 0034;;;1/4;N;FRACTION ONE QUARTER;;;;
+00BD;VULGAR FRACTION ONE HALF;No;0;ON;<fraction> 0031 2044 0032;;;1/2;N;FRACTION ONE HALF;;;;
+00BE;VULGAR FRACTION THREE QUARTERS;No;0;ON;<fraction> 0033 2044 0034;;;3/4;N;FRACTION THREE QUARTERS;;;;
+00BF;INVERTED QUESTION MARK;Po;0;ON;;;;;N;;;;;
+00C0;LATIN CAPITAL LETTER A WITH GRAVE;Lu;0;L;0041 0300;;;;N;LATIN CAPITAL LETTER A GRAVE;;;00E0;
+00C1;LATIN CAPITAL LETTER A WITH ACUTE;Lu;0;L;0041 0301;;;;N;LATIN CAPITAL LETTER A ACUTE;;;00E1;
+00C2;LATIN CAPITAL LETTER A WITH CIRCUMFLEX;Lu;0;L;0041 0302;;;;N;LATIN CAPITAL LETTER A CIRCUMFLEX;;;00E2;
+00C3;LATIN CAPITAL LETTER A WITH TILDE;Lu;0;L;0041 0303;;;;N;LATIN CAPITAL LETTER A TILDE;;;00E3;
+00C4;LATIN CAPITAL LETTER A WITH DIAERESIS;Lu;0;L;0041 0308;;;;N;LATIN CAPITAL LETTER A DIAERESIS;;;00E4;
+00C5;LATIN CAPITAL LETTER A WITH RING ABOVE;Lu;0;L;0041 030A;;;;N;LATIN CAPITAL LETTER A RING;;;00E5;
+00C6;LATIN CAPITAL LETTER AE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER A E;ash *;;00E6;
+00C7;LATIN CAPITAL LETTER C WITH CEDILLA;Lu;0;L;0043 0327;;;;N;LATIN CAPITAL LETTER C CEDILLA;;;00E7;
+00C8;LATIN CAPITAL LETTER E WITH GRAVE;Lu;0;L;0045 0300;;;;N;LATIN CAPITAL LETTER E GRAVE;;;00E8;
+00C9;LATIN CAPITAL LETTER E WITH ACUTE;Lu;0;L;0045 0301;;;;N;LATIN CAPITAL LETTER E ACUTE;;;00E9;
+00CA;LATIN CAPITAL LETTER E WITH CIRCUMFLEX;Lu;0;L;0045 0302;;;;N;LATIN CAPITAL LETTER E CIRCUMFLEX;;;00EA;
+00CB;LATIN CAPITAL LETTER E WITH DIAERESIS;Lu;0;L;0045 0308;;;;N;LATIN CAPITAL LETTER E DIAERESIS;;;00EB;
+00CC;LATIN CAPITAL LETTER I WITH GRAVE;Lu;0;L;0049 0300;;;;N;LATIN CAPITAL LETTER I GRAVE;;;00EC;
+00CD;LATIN CAPITAL LETTER I WITH ACUTE;Lu;0;L;0049 0301;;;;N;LATIN CAPITAL LETTER I ACUTE;;;00ED;
+00CE;LATIN CAPITAL LETTER I WITH CIRCUMFLEX;Lu;0;L;0049 0302;;;;N;LATIN CAPITAL LETTER I CIRCUMFLEX;;;00EE;
+00CF;LATIN CAPITAL LETTER I WITH DIAERESIS;Lu;0;L;0049 0308;;;;N;LATIN CAPITAL LETTER I DIAERESIS;;;00EF;
+00D0;LATIN CAPITAL LETTER ETH;Lu;0;L;;;;;N;;Icelandic;;00F0;
+00D1;LATIN CAPITAL LETTER N WITH TILDE;Lu;0;L;004E 0303;;;;N;LATIN CAPITAL LETTER N TILDE;;;00F1;
+00D2;LATIN CAPITAL LETTER O WITH GRAVE;Lu;0;L;004F 0300;;;;N;LATIN CAPITAL LETTER O GRAVE;;;00F2;
+00D3;LATIN CAPITAL LETTER O WITH ACUTE;Lu;0;L;004F 0301;;;;N;LATIN CAPITAL LETTER O ACUTE;;;00F3;
+00D4;LATIN CAPITAL LETTER O WITH CIRCUMFLEX;Lu;0;L;004F 0302;;;;N;LATIN CAPITAL LETTER O CIRCUMFLEX;;;00F4;
+00D5;LATIN CAPITAL LETTER O WITH TILDE;Lu;0;L;004F 0303;;;;N;LATIN CAPITAL LETTER O TILDE;;;00F5;
+00D6;LATIN CAPITAL LETTER O WITH DIAERESIS;Lu;0;L;004F 0308;;;;N;LATIN CAPITAL LETTER O DIAERESIS;;;00F6;
+00D7;MULTIPLICATION SIGN;Sm;0;ON;;;;;N;;;;;
+00D8;LATIN CAPITAL LETTER O WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O SLASH;;;00F8;
+00D9;LATIN CAPITAL LETTER U WITH GRAVE;Lu;0;L;0055 0300;;;;N;LATIN CAPITAL LETTER U GRAVE;;;00F9;
+00DA;LATIN CAPITAL LETTER U WITH ACUTE;Lu;0;L;0055 0301;;;;N;LATIN CAPITAL LETTER U ACUTE;;;00FA;
+00DB;LATIN CAPITAL LETTER U WITH CIRCUMFLEX;Lu;0;L;0055 0302;;;;N;LATIN CAPITAL LETTER U CIRCUMFLEX;;;00FB;
+00DC;LATIN CAPITAL LETTER U WITH DIAERESIS;Lu;0;L;0055 0308;;;;N;LATIN CAPITAL LETTER U DIAERESIS;;;00FC;
+00DD;LATIN CAPITAL LETTER Y WITH ACUTE;Lu;0;L;0059 0301;;;;N;LATIN CAPITAL LETTER Y ACUTE;;;00FD;
+00DE;LATIN CAPITAL LETTER THORN;Lu;0;L;;;;;N;;Icelandic;;00FE;
+00DF;LATIN SMALL LETTER SHARP S;Ll;0;L;;;;;N;;German;;;
+00E0;LATIN SMALL LETTER A WITH GRAVE;Ll;0;L;0061 0300;;;;N;LATIN SMALL LETTER A GRAVE;;00C0;;00C0
+00E1;LATIN SMALL LETTER A WITH ACUTE;Ll;0;L;0061 0301;;;;N;LATIN SMALL LETTER A ACUTE;;00C1;;00C1
+00E2;LATIN SMALL LETTER A WITH CIRCUMFLEX;Ll;0;L;0061 0302;;;;N;LATIN SMALL LETTER A CIRCUMFLEX;;00C2;;00C2
+00E3;LATIN SMALL LETTER A WITH TILDE;Ll;0;L;0061 0303;;;;N;LATIN SMALL LETTER A TILDE;;00C3;;00C3
+00E4;LATIN SMALL LETTER A WITH DIAERESIS;Ll;0;L;0061 0308;;;;N;LATIN SMALL LETTER A DIAERESIS;;00C4;;00C4
+00E5;LATIN SMALL LETTER A WITH RING ABOVE;Ll;0;L;0061 030A;;;;N;LATIN SMALL LETTER A RING;;00C5;;00C5
+00E6;LATIN SMALL LETTER AE;Ll;0;L;;;;;N;LATIN SMALL LETTER A E;ash *;00C6;;00C6
+00E7;LATIN SMALL LETTER C WITH CEDILLA;Ll;0;L;0063 0327;;;;N;LATIN SMALL LETTER C CEDILLA;;00C7;;00C7
+00E8;LATIN SMALL LETTER E WITH GRAVE;Ll;0;L;0065 0300;;;;N;LATIN SMALL LETTER E GRAVE;;00C8;;00C8
+00E9;LATIN SMALL LETTER E WITH ACUTE;Ll;0;L;0065 0301;;;;N;LATIN SMALL LETTER E ACUTE;;00C9;;00C9
+00EA;LATIN SMALL LETTER E WITH CIRCUMFLEX;Ll;0;L;0065 0302;;;;N;LATIN SMALL LETTER E CIRCUMFLEX;;00CA;;00CA
+00EB;LATIN SMALL LETTER E WITH DIAERESIS;Ll;0;L;0065 0308;;;;N;LATIN SMALL LETTER E DIAERESIS;;00CB;;00CB
+00EC;LATIN SMALL LETTER I WITH GRAVE;Ll;0;L;0069 0300;;;;N;LATIN SMALL LETTER I GRAVE;;00CC;;00CC
+00ED;LATIN SMALL LETTER I WITH ACUTE;Ll;0;L;0069 0301;;;;N;LATIN SMALL LETTER I ACUTE;;00CD;;00CD
+00EE;LATIN SMALL LETTER I WITH CIRCUMFLEX;Ll;0;L;0069 0302;;;;N;LATIN SMALL LETTER I CIRCUMFLEX;;00CE;;00CE
+00EF;LATIN SMALL LETTER I WITH DIAERESIS;Ll;0;L;0069 0308;;;;N;LATIN SMALL LETTER I DIAERESIS;;00CF;;00CF
+00F0;LATIN SMALL LETTER ETH;Ll;0;L;;;;;N;;Icelandic;00D0;;00D0
+00F1;LATIN SMALL LETTER N WITH TILDE;Ll;0;L;006E 0303;;;;N;LATIN SMALL LETTER N TILDE;;00D1;;00D1
+00F2;LATIN SMALL LETTER O WITH GRAVE;Ll;0;L;006F 0300;;;;N;LATIN SMALL LETTER O GRAVE;;00D2;;00D2
+00F3;LATIN SMALL LETTER O WITH ACUTE;Ll;0;L;006F 0301;;;;N;LATIN SMALL LETTER O ACUTE;;00D3;;00D3
+00F4;LATIN SMALL LETTER O WITH CIRCUMFLEX;Ll;0;L;006F 0302;;;;N;LATIN SMALL LETTER O CIRCUMFLEX;;00D4;;00D4
+00F5;LATIN SMALL LETTER O WITH TILDE;Ll;0;L;006F 0303;;;;N;LATIN SMALL LETTER O TILDE;;00D5;;00D5
+00F6;LATIN SMALL LETTER O WITH DIAERESIS;Ll;0;L;006F 0308;;;;N;LATIN SMALL LETTER O DIAERESIS;;00D6;;00D6
+00F7;DIVISION SIGN;Sm;0;ON;;;;;N;;;;;
+00F8;LATIN SMALL LETTER O WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER O SLASH;;00D8;;00D8
+00F9;LATIN SMALL LETTER U WITH GRAVE;Ll;0;L;0075 0300;;;;N;LATIN SMALL LETTER U GRAVE;;00D9;;00D9
+00FA;LATIN SMALL LETTER U WITH ACUTE;Ll;0;L;0075 0301;;;;N;LATIN SMALL LETTER U ACUTE;;00DA;;00DA
+00FB;LATIN SMALL LETTER U WITH CIRCUMFLEX;Ll;0;L;0075 0302;;;;N;LATIN SMALL LETTER U CIRCUMFLEX;;00DB;;00DB
+00FC;LATIN SMALL LETTER U WITH DIAERESIS;Ll;0;L;0075 0308;;;;N;LATIN SMALL LETTER U DIAERESIS;;00DC;;00DC
+00FD;LATIN SMALL LETTER Y WITH ACUTE;Ll;0;L;0079 0301;;;;N;LATIN SMALL LETTER Y ACUTE;;00DD;;00DD
+00FE;LATIN SMALL LETTER THORN;Ll;0;L;;;;;N;;Icelandic;00DE;;00DE
+00FF;LATIN SMALL LETTER Y WITH DIAERESIS;Ll;0;L;0079 0308;;;;N;LATIN SMALL LETTER Y DIAERESIS;;0178;;0178
+0100;LATIN CAPITAL LETTER A WITH MACRON;Lu;0;L;0041 0304;;;;N;LATIN CAPITAL LETTER A MACRON;;;0101;
+0101;LATIN SMALL LETTER A WITH MACRON;Ll;0;L;0061 0304;;;;N;LATIN SMALL LETTER A MACRON;;0100;;0100
+0102;LATIN CAPITAL LETTER A WITH BREVE;Lu;0;L;0041 0306;;;;N;LATIN CAPITAL LETTER A BREVE;;;0103;
+0103;LATIN SMALL LETTER A WITH BREVE;Ll;0;L;0061 0306;;;;N;LATIN SMALL LETTER A BREVE;;0102;;0102
+0104;LATIN CAPITAL LETTER A WITH OGONEK;Lu;0;L;0041 0328;;;;N;LATIN CAPITAL LETTER A OGONEK;;;0105;
+0105;LATIN SMALL LETTER A WITH OGONEK;Ll;0;L;0061 0328;;;;N;LATIN SMALL LETTER A OGONEK;;0104;;0104
+0106;LATIN CAPITAL LETTER C WITH ACUTE;Lu;0;L;0043 0301;;;;N;LATIN CAPITAL LETTER C ACUTE;;;0107;
+0107;LATIN SMALL LETTER C WITH ACUTE;Ll;0;L;0063 0301;;;;N;LATIN SMALL LETTER C ACUTE;;0106;;0106
+0108;LATIN CAPITAL LETTER C WITH CIRCUMFLEX;Lu;0;L;0043 0302;;;;N;LATIN CAPITAL LETTER C CIRCUMFLEX;;;0109;
+0109;LATIN SMALL LETTER C WITH CIRCUMFLEX;Ll;0;L;0063 0302;;;;N;LATIN SMALL LETTER C CIRCUMFLEX;;0108;;0108
+010A;LATIN CAPITAL LETTER C WITH DOT ABOVE;Lu;0;L;0043 0307;;;;N;LATIN CAPITAL LETTER C DOT;;;010B;
+010B;LATIN SMALL LETTER C WITH DOT ABOVE;Ll;0;L;0063 0307;;;;N;LATIN SMALL LETTER C DOT;;010A;;010A
+010C;LATIN CAPITAL LETTER C WITH CARON;Lu;0;L;0043 030C;;;;N;LATIN CAPITAL LETTER C HACEK;;;010D;
+010D;LATIN SMALL LETTER C WITH CARON;Ll;0;L;0063 030C;;;;N;LATIN SMALL LETTER C HACEK;;010C;;010C
+010E;LATIN CAPITAL LETTER D WITH CARON;Lu;0;L;0044 030C;;;;N;LATIN CAPITAL LETTER D HACEK;;;010F;
+010F;LATIN SMALL LETTER D WITH CARON;Ll;0;L;0064 030C;;;;N;LATIN SMALL LETTER D HACEK;;010E;;010E
+0110;LATIN CAPITAL LETTER D WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D BAR;;;0111;
+0111;LATIN SMALL LETTER D WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER D BAR;;0110;;0110
+0112;LATIN CAPITAL LETTER E WITH MACRON;Lu;0;L;0045 0304;;;;N;LATIN CAPITAL LETTER E MACRON;;;0113;
+0113;LATIN SMALL LETTER E WITH MACRON;Ll;0;L;0065 0304;;;;N;LATIN SMALL LETTER E MACRON;;0112;;0112
+0114;LATIN CAPITAL LETTER E WITH BREVE;Lu;0;L;0045 0306;;;;N;LATIN CAPITAL LETTER E BREVE;;;0115;
+0115;LATIN SMALL LETTER E WITH BREVE;Ll;0;L;0065 0306;;;;N;LATIN SMALL LETTER E BREVE;;0114;;0114
+0116;LATIN CAPITAL LETTER E WITH DOT ABOVE;Lu;0;L;0045 0307;;;;N;LATIN CAPITAL LETTER E DOT;;;0117;
+0117;LATIN SMALL LETTER E WITH DOT ABOVE;Ll;0;L;0065 0307;;;;N;LATIN SMALL LETTER E DOT;;0116;;0116
+0118;LATIN CAPITAL LETTER E WITH OGONEK;Lu;0;L;0045 0328;;;;N;LATIN CAPITAL LETTER E OGONEK;;;0119;
+0119;LATIN SMALL LETTER E WITH OGONEK;Ll;0;L;0065 0328;;;;N;LATIN SMALL LETTER E OGONEK;;0118;;0118
+011A;LATIN CAPITAL LETTER E WITH CARON;Lu;0;L;0045 030C;;;;N;LATIN CAPITAL LETTER E HACEK;;;011B;
+011B;LATIN SMALL LETTER E WITH CARON;Ll;0;L;0065 030C;;;;N;LATIN SMALL LETTER E HACEK;;011A;;011A
+011C;LATIN CAPITAL LETTER G WITH CIRCUMFLEX;Lu;0;L;0047 0302;;;;N;LATIN CAPITAL LETTER G CIRCUMFLEX;;;011D;
+011D;LATIN SMALL LETTER G WITH CIRCUMFLEX;Ll;0;L;0067 0302;;;;N;LATIN SMALL LETTER G CIRCUMFLEX;;011C;;011C
+011E;LATIN CAPITAL LETTER G WITH BREVE;Lu;0;L;0047 0306;;;;N;LATIN CAPITAL LETTER G BREVE;;;011F;
+011F;LATIN SMALL LETTER G WITH BREVE;Ll;0;L;0067 0306;;;;N;LATIN SMALL LETTER G BREVE;;011E;;011E
+0120;LATIN CAPITAL LETTER G WITH DOT ABOVE;Lu;0;L;0047 0307;;;;N;LATIN CAPITAL LETTER G DOT;;;0121;
+0121;LATIN SMALL LETTER G WITH DOT ABOVE;Ll;0;L;0067 0307;;;;N;LATIN SMALL LETTER G DOT;;0120;;0120
+0122;LATIN CAPITAL LETTER G WITH CEDILLA;Lu;0;L;0047 0327;;;;N;LATIN CAPITAL LETTER G CEDILLA;;;0123;
+0123;LATIN SMALL LETTER G WITH CEDILLA;Ll;0;L;0067 0327;;;;N;LATIN SMALL LETTER G CEDILLA;;0122;;0122
+0124;LATIN CAPITAL LETTER H WITH CIRCUMFLEX;Lu;0;L;0048 0302;;;;N;LATIN CAPITAL LETTER H CIRCUMFLEX;;;0125;
+0125;LATIN SMALL LETTER H WITH CIRCUMFLEX;Ll;0;L;0068 0302;;;;N;LATIN SMALL LETTER H CIRCUMFLEX;;0124;;0124
+0126;LATIN CAPITAL LETTER H WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER H BAR;;;0127;
+0127;LATIN SMALL LETTER H WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER H BAR;;0126;;0126
+0128;LATIN CAPITAL LETTER I WITH TILDE;Lu;0;L;0049 0303;;;;N;LATIN CAPITAL LETTER I TILDE;;;0129;
+0129;LATIN SMALL LETTER I WITH TILDE;Ll;0;L;0069 0303;;;;N;LATIN SMALL LETTER I TILDE;;0128;;0128
+012A;LATIN CAPITAL LETTER I WITH MACRON;Lu;0;L;0049 0304;;;;N;LATIN CAPITAL LETTER I MACRON;;;012B;
+012B;LATIN SMALL LETTER I WITH MACRON;Ll;0;L;0069 0304;;;;N;LATIN SMALL LETTER I MACRON;;012A;;012A
+012C;LATIN CAPITAL LETTER I WITH BREVE;Lu;0;L;0049 0306;;;;N;LATIN CAPITAL LETTER I BREVE;;;012D;
+012D;LATIN SMALL LETTER I WITH BREVE;Ll;0;L;0069 0306;;;;N;LATIN SMALL LETTER I BREVE;;012C;;012C
+012E;LATIN CAPITAL LETTER I WITH OGONEK;Lu;0;L;0049 0328;;;;N;LATIN CAPITAL LETTER I OGONEK;;;012F;
+012F;LATIN SMALL LETTER I WITH OGONEK;Ll;0;L;0069 0328;;;;N;LATIN SMALL LETTER I OGONEK;;012E;;012E
+0130;LATIN CAPITAL LETTER I WITH DOT ABOVE;Lu;0;L;0049 0307;;;;N;LATIN CAPITAL LETTER I DOT;;;0069;
+0131;LATIN SMALL LETTER DOTLESS I;Ll;0;L;;;;;N;;;0049;;0049
+0132;LATIN CAPITAL LIGATURE IJ;Lu;0;L;<compat> 0049 004A;;;;N;LATIN CAPITAL LETTER I J;;;0133;
+0133;LATIN SMALL LIGATURE IJ;Ll;0;L;<compat> 0069 006A;;;;N;LATIN SMALL LETTER I J;;0132;;0132
+0134;LATIN CAPITAL LETTER J WITH CIRCUMFLEX;Lu;0;L;004A 0302;;;;N;LATIN CAPITAL LETTER J CIRCUMFLEX;;;0135;
+0135;LATIN SMALL LETTER J WITH CIRCUMFLEX;Ll;0;L;006A 0302;;;;N;LATIN SMALL LETTER J CIRCUMFLEX;;0134;;0134
+0136;LATIN CAPITAL LETTER K WITH CEDILLA;Lu;0;L;004B 0327;;;;N;LATIN CAPITAL LETTER K CEDILLA;;;0137;
+0137;LATIN SMALL LETTER K WITH CEDILLA;Ll;0;L;006B 0327;;;;N;LATIN SMALL LETTER K CEDILLA;;0136;;0136
+0138;LATIN SMALL LETTER KRA;Ll;0;L;;;;;N;;Greenlandic;;;
+0139;LATIN CAPITAL LETTER L WITH ACUTE;Lu;0;L;004C 0301;;;;N;LATIN CAPITAL LETTER L ACUTE;;;013A;
+013A;LATIN SMALL LETTER L WITH ACUTE;Ll;0;L;006C 0301;;;;N;LATIN SMALL LETTER L ACUTE;;0139;;0139
+013B;LATIN CAPITAL LETTER L WITH CEDILLA;Lu;0;L;004C 0327;;;;N;LATIN CAPITAL LETTER L CEDILLA;;;013C;
+013C;LATIN SMALL LETTER L WITH CEDILLA;Ll;0;L;006C 0327;;;;N;LATIN SMALL LETTER L CEDILLA;;013B;;013B
+013D;LATIN CAPITAL LETTER L WITH CARON;Lu;0;L;004C 030C;;;;N;LATIN CAPITAL LETTER L HACEK;;;013E;
+013E;LATIN SMALL LETTER L WITH CARON;Ll;0;L;006C 030C;;;;N;LATIN SMALL LETTER L HACEK;;013D;;013D
+013F;LATIN CAPITAL LETTER L WITH MIDDLE DOT;Lu;0;L;<compat> 004C 00B7;;;;N;;;;0140;
+0140;LATIN SMALL LETTER L WITH MIDDLE DOT;Ll;0;L;<compat> 006C 00B7;;;;N;;;013F;;013F
+0141;LATIN CAPITAL LETTER L WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER L SLASH;;;0142;
+0142;LATIN SMALL LETTER L WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER L SLASH;;0141;;0141
+0143;LATIN CAPITAL LETTER N WITH ACUTE;Lu;0;L;004E 0301;;;;N;LATIN CAPITAL LETTER N ACUTE;;;0144;
+0144;LATIN SMALL LETTER N WITH ACUTE;Ll;0;L;006E 0301;;;;N;LATIN SMALL LETTER N ACUTE;;0143;;0143
+0145;LATIN CAPITAL LETTER N WITH CEDILLA;Lu;0;L;004E 0327;;;;N;LATIN CAPITAL LETTER N CEDILLA;;;0146;
+0146;LATIN SMALL LETTER N WITH CEDILLA;Ll;0;L;006E 0327;;;;N;LATIN SMALL LETTER N CEDILLA;;0145;;0145
+0147;LATIN CAPITAL LETTER N WITH CARON;Lu;0;L;004E 030C;;;;N;LATIN CAPITAL LETTER N HACEK;;;0148;
+0148;LATIN SMALL LETTER N WITH CARON;Ll;0;L;006E 030C;;;;N;LATIN SMALL LETTER N HACEK;;0147;;0147
+0149;LATIN SMALL LETTER N PRECEDED BY APOSTROPHE;Ll;0;L;<compat> 02BC 006E;;;;N;LATIN SMALL LETTER APOSTROPHE N;;;;
+014A;LATIN CAPITAL LETTER ENG;Lu;0;L;;;;;N;;Sami;;014B;
+014B;LATIN SMALL LETTER ENG;Ll;0;L;;;;;N;;Sami;014A;;014A
+014C;LATIN CAPITAL LETTER O WITH MACRON;Lu;0;L;004F 0304;;;;N;LATIN CAPITAL LETTER O MACRON;;;014D;
+014D;LATIN SMALL LETTER O WITH MACRON;Ll;0;L;006F 0304;;;;N;LATIN SMALL LETTER O MACRON;;014C;;014C
+014E;LATIN CAPITAL LETTER O WITH BREVE;Lu;0;L;004F 0306;;;;N;LATIN CAPITAL LETTER O BREVE;;;014F;
+014F;LATIN SMALL LETTER O WITH BREVE;Ll;0;L;006F 0306;;;;N;LATIN SMALL LETTER O BREVE;;014E;;014E
+0150;LATIN CAPITAL LETTER O WITH DOUBLE ACUTE;Lu;0;L;004F 030B;;;;N;LATIN CAPITAL LETTER O DOUBLE ACUTE;;;0151;
+0151;LATIN SMALL LETTER O WITH DOUBLE ACUTE;Ll;0;L;006F 030B;;;;N;LATIN SMALL LETTER O DOUBLE ACUTE;;0150;;0150
+0152;LATIN CAPITAL LIGATURE OE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O E;;;0153;
+0153;LATIN SMALL LIGATURE OE;Ll;0;L;;;;;N;LATIN SMALL LETTER O E;;0152;;0152
+0154;LATIN CAPITAL LETTER R WITH ACUTE;Lu;0;L;0052 0301;;;;N;LATIN CAPITAL LETTER R ACUTE;;;0155;
+0155;LATIN SMALL LETTER R WITH ACUTE;Ll;0;L;0072 0301;;;;N;LATIN SMALL LETTER R ACUTE;;0154;;0154
+0156;LATIN CAPITAL LETTER R WITH CEDILLA;Lu;0;L;0052 0327;;;;N;LATIN CAPITAL LETTER R CEDILLA;;;0157;
+0157;LATIN SMALL LETTER R WITH CEDILLA;Ll;0;L;0072 0327;;;;N;LATIN SMALL LETTER R CEDILLA;;0156;;0156
+0158;LATIN CAPITAL LETTER R WITH CARON;Lu;0;L;0052 030C;;;;N;LATIN CAPITAL LETTER R HACEK;;;0159;
+0159;LATIN SMALL LETTER R WITH CARON;Ll;0;L;0072 030C;;;;N;LATIN SMALL LETTER R HACEK;;0158;;0158
+015A;LATIN CAPITAL LETTER S WITH ACUTE;Lu;0;L;0053 0301;;;;N;LATIN CAPITAL LETTER S ACUTE;;;015B;
+015B;LATIN SMALL LETTER S WITH ACUTE;Ll;0;L;0073 0301;;;;N;LATIN SMALL LETTER S ACUTE;;015A;;015A
+015C;LATIN CAPITAL LETTER S WITH CIRCUMFLEX;Lu;0;L;0053 0302;;;;N;LATIN CAPITAL LETTER S CIRCUMFLEX;;;015D;
+015D;LATIN SMALL LETTER S WITH CIRCUMFLEX;Ll;0;L;0073 0302;;;;N;LATIN SMALL LETTER S CIRCUMFLEX;;015C;;015C
+015E;LATIN CAPITAL LETTER S WITH CEDILLA;Lu;0;L;0053 0327;;;;N;LATIN CAPITAL LETTER S CEDILLA;*;;015F;
+015F;LATIN SMALL LETTER S WITH CEDILLA;Ll;0;L;0073 0327;;;;N;LATIN SMALL LETTER S CEDILLA;*;015E;;015E
+0160;LATIN CAPITAL LETTER S WITH CARON;Lu;0;L;0053 030C;;;;N;LATIN CAPITAL LETTER S HACEK;;;0161;
+0161;LATIN SMALL LETTER S WITH CARON;Ll;0;L;0073 030C;;;;N;LATIN SMALL LETTER S HACEK;;0160;;0160
+0162;LATIN CAPITAL LETTER T WITH CEDILLA;Lu;0;L;0054 0327;;;;N;LATIN CAPITAL LETTER T CEDILLA;*;;0163;
+0163;LATIN SMALL LETTER T WITH CEDILLA;Ll;0;L;0074 0327;;;;N;LATIN SMALL LETTER T CEDILLA;*;0162;;0162
+0164;LATIN CAPITAL LETTER T WITH CARON;Lu;0;L;0054 030C;;;;N;LATIN CAPITAL LETTER T HACEK;;;0165;
+0165;LATIN SMALL LETTER T WITH CARON;Ll;0;L;0074 030C;;;;N;LATIN SMALL LETTER T HACEK;;0164;;0164
+0166;LATIN CAPITAL LETTER T WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER T BAR;;;0167;
+0167;LATIN SMALL LETTER T WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER T BAR;;0166;;0166
+0168;LATIN CAPITAL LETTER U WITH TILDE;Lu;0;L;0055 0303;;;;N;LATIN CAPITAL LETTER U TILDE;;;0169;
+0169;LATIN SMALL LETTER U WITH TILDE;Ll;0;L;0075 0303;;;;N;LATIN SMALL LETTER U TILDE;;0168;;0168
+016A;LATIN CAPITAL LETTER U WITH MACRON;Lu;0;L;0055 0304;;;;N;LATIN CAPITAL LETTER U MACRON;;;016B;
+016B;LATIN SMALL LETTER U WITH MACRON;Ll;0;L;0075 0304;;;;N;LATIN SMALL LETTER U MACRON;;016A;;016A
+016C;LATIN CAPITAL LETTER U WITH BREVE;Lu;0;L;0055 0306;;;;N;LATIN CAPITAL LETTER U BREVE;;;016D;
+016D;LATIN SMALL LETTER U WITH BREVE;Ll;0;L;0075 0306;;;;N;LATIN SMALL LETTER U BREVE;;016C;;016C
+016E;LATIN CAPITAL LETTER U WITH RING ABOVE;Lu;0;L;0055 030A;;;;N;LATIN CAPITAL LETTER U RING;;;016F;
+016F;LATIN SMALL LETTER U WITH RING ABOVE;Ll;0;L;0075 030A;;;;N;LATIN SMALL LETTER U RING;;016E;;016E
+0170;LATIN CAPITAL LETTER U WITH DOUBLE ACUTE;Lu;0;L;0055 030B;;;;N;LATIN CAPITAL LETTER U DOUBLE ACUTE;;;0171;
+0171;LATIN SMALL LETTER U WITH DOUBLE ACUTE;Ll;0;L;0075 030B;;;;N;LATIN SMALL LETTER U DOUBLE ACUTE;;0170;;0170
+0172;LATIN CAPITAL LETTER U WITH OGONEK;Lu;0;L;0055 0328;;;;N;LATIN CAPITAL LETTER U OGONEK;;;0173;
+0173;LATIN SMALL LETTER U WITH OGONEK;Ll;0;L;0075 0328;;;;N;LATIN SMALL LETTER U OGONEK;;0172;;0172
+0174;LATIN CAPITAL LETTER W WITH CIRCUMFLEX;Lu;0;L;0057 0302;;;;N;LATIN CAPITAL LETTER W CIRCUMFLEX;;;0175;
+0175;LATIN SMALL LETTER W WITH CIRCUMFLEX;Ll;0;L;0077 0302;;;;N;LATIN SMALL LETTER W CIRCUMFLEX;;0174;;0174
+0176;LATIN CAPITAL LETTER Y WITH CIRCUMFLEX;Lu;0;L;0059 0302;;;;N;LATIN CAPITAL LETTER Y CIRCUMFLEX;;;0177;
+0177;LATIN SMALL LETTER Y WITH CIRCUMFLEX;Ll;0;L;0079 0302;;;;N;LATIN SMALL LETTER Y CIRCUMFLEX;;0176;;0176
+0178;LATIN CAPITAL LETTER Y WITH DIAERESIS;Lu;0;L;0059 0308;;;;N;LATIN CAPITAL LETTER Y DIAERESIS;;;00FF;
+0179;LATIN CAPITAL LETTER Z WITH ACUTE;Lu;0;L;005A 0301;;;;N;LATIN CAPITAL LETTER Z ACUTE;;;017A;
+017A;LATIN SMALL LETTER Z WITH ACUTE;Ll;0;L;007A 0301;;;;N;LATIN SMALL LETTER Z ACUTE;;0179;;0179
+017B;LATIN CAPITAL LETTER Z WITH DOT ABOVE;Lu;0;L;005A 0307;;;;N;LATIN CAPITAL LETTER Z DOT;;;017C;
+017C;LATIN SMALL LETTER Z WITH DOT ABOVE;Ll;0;L;007A 0307;;;;N;LATIN SMALL LETTER Z DOT;;017B;;017B
+017D;LATIN CAPITAL LETTER Z WITH CARON;Lu;0;L;005A 030C;;;;N;LATIN CAPITAL LETTER Z HACEK;;;017E;
+017E;LATIN SMALL LETTER Z WITH CARON;Ll;0;L;007A 030C;;;;N;LATIN SMALL LETTER Z HACEK;;017D;;017D
+017F;LATIN SMALL LETTER LONG S;Ll;0;L;<compat> 0073;;;;N;;;0053;;0053
+0180;LATIN SMALL LETTER B WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER B BAR;;0243;;0243
+0181;LATIN CAPITAL LETTER B WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER B HOOK;;;0253;
+0182;LATIN CAPITAL LETTER B WITH TOPBAR;Lu;0;L;;;;;N;LATIN CAPITAL LETTER B TOPBAR;;;0183;
+0183;LATIN SMALL LETTER B WITH TOPBAR;Ll;0;L;;;;;N;LATIN SMALL LETTER B TOPBAR;;0182;;0182
+0184;LATIN CAPITAL LETTER TONE SIX;Lu;0;L;;;;;N;;;;0185;
+0185;LATIN SMALL LETTER TONE SIX;Ll;0;L;;;;;N;;;0184;;0184
+0186;LATIN CAPITAL LETTER OPEN O;Lu;0;L;;;;;N;;;;0254;
+0187;LATIN CAPITAL LETTER C WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER C HOOK;;;0188;
+0188;LATIN SMALL LETTER C WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER C HOOK;;0187;;0187
+0189;LATIN CAPITAL LETTER AFRICAN D;Lu;0;L;;;;;N;;*;;0256;
+018A;LATIN CAPITAL LETTER D WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D HOOK;;;0257;
+018B;LATIN CAPITAL LETTER D WITH TOPBAR;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D TOPBAR;;;018C;
+018C;LATIN SMALL LETTER D WITH TOPBAR;Ll;0;L;;;;;N;LATIN SMALL LETTER D TOPBAR;;018B;;018B
+018D;LATIN SMALL LETTER TURNED DELTA;Ll;0;L;;;;;N;;;;;
+018E;LATIN CAPITAL LETTER REVERSED E;Lu;0;L;;;;;N;LATIN CAPITAL LETTER TURNED E;;;01DD;
+018F;LATIN CAPITAL LETTER SCHWA;Lu;0;L;;;;;N;;;;0259;
+0190;LATIN CAPITAL LETTER OPEN E;Lu;0;L;;;;;N;LATIN CAPITAL LETTER EPSILON;;;025B;
+0191;LATIN CAPITAL LETTER F WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER F HOOK;;;0192;
+0192;LATIN SMALL LETTER F WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT F;;0191;;0191
+0193;LATIN CAPITAL LETTER G WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER G HOOK;;;0260;
+0194;LATIN CAPITAL LETTER GAMMA;Lu;0;L;;;;;N;;;;0263;
+0195;LATIN SMALL LETTER HV;Ll;0;L;;;;;N;LATIN SMALL LETTER H V;hwair;01F6;;01F6
+0196;LATIN CAPITAL LETTER IOTA;Lu;0;L;;;;;N;;;;0269;
+0197;LATIN CAPITAL LETTER I WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER BARRED I;;;0268;
+0198;LATIN CAPITAL LETTER K WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER K HOOK;;;0199;
+0199;LATIN SMALL LETTER K WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER K HOOK;;0198;;0198
+019A;LATIN SMALL LETTER L WITH BAR;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED L;;023D;;023D
+019B;LATIN SMALL LETTER LAMBDA WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED LAMBDA;;;;
+019C;LATIN CAPITAL LETTER TURNED M;Lu;0;L;;;;;N;;;;026F;
+019D;LATIN CAPITAL LETTER N WITH LEFT HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER N HOOK;;;0272;
+019E;LATIN SMALL LETTER N WITH LONG RIGHT LEG;Ll;0;L;;;;;N;;;0220;;0220
+019F;LATIN CAPITAL LETTER O WITH MIDDLE TILDE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER BARRED O;*;;0275;
+01A0;LATIN CAPITAL LETTER O WITH HORN;Lu;0;L;004F 031B;;;;N;LATIN CAPITAL LETTER O HORN;;;01A1;
+01A1;LATIN SMALL LETTER O WITH HORN;Ll;0;L;006F 031B;;;;N;LATIN SMALL LETTER O HORN;;01A0;;01A0
+01A2;LATIN CAPITAL LETTER OI;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O I;gha;;01A3;
+01A3;LATIN SMALL LETTER OI;Ll;0;L;;;;;N;LATIN SMALL LETTER O I;gha;01A2;;01A2
+01A4;LATIN CAPITAL LETTER P WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER P HOOK;;;01A5;
+01A5;LATIN SMALL LETTER P WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER P HOOK;;01A4;;01A4
+01A6;LATIN LETTER YR;Lu;0;L;;;;;N;LATIN LETTER Y R;*;;0280;
+01A7;LATIN CAPITAL LETTER TONE TWO;Lu;0;L;;;;;N;;;;01A8;
+01A8;LATIN SMALL LETTER TONE TWO;Ll;0;L;;;;;N;;;01A7;;01A7
+01A9;LATIN CAPITAL LETTER ESH;Lu;0;L;;;;;N;;;;0283;
+01AA;LATIN LETTER REVERSED ESH LOOP;Ll;0;L;;;;;N;;;;;
+01AB;LATIN SMALL LETTER T WITH PALATAL HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER T PALATAL HOOK;;;;
+01AC;LATIN CAPITAL LETTER T WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER T HOOK;;;01AD;
+01AD;LATIN SMALL LETTER T WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER T HOOK;;01AC;;01AC
+01AE;LATIN CAPITAL LETTER T WITH RETROFLEX HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER T RETROFLEX HOOK;;;0288;
+01AF;LATIN CAPITAL LETTER U WITH HORN;Lu;0;L;0055 031B;;;;N;LATIN CAPITAL LETTER U HORN;;;01B0;
+01B0;LATIN SMALL LETTER U WITH HORN;Ll;0;L;0075 031B;;;;N;LATIN SMALL LETTER U HORN;;01AF;;01AF
+01B1;LATIN CAPITAL LETTER UPSILON;Lu;0;L;;;;;N;;;;028A;
+01B2;LATIN CAPITAL LETTER V WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER SCRIPT V;;;028B;
+01B3;LATIN CAPITAL LETTER Y WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER Y HOOK;;;01B4;
+01B4;LATIN SMALL LETTER Y WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER Y HOOK;;01B3;;01B3
+01B5;LATIN CAPITAL LETTER Z WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER Z BAR;;;01B6;
+01B6;LATIN SMALL LETTER Z WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER Z BAR;;01B5;;01B5
+01B7;LATIN CAPITAL LETTER EZH;Lu;0;L;;;;;N;LATIN CAPITAL LETTER YOGH;;;0292;
+01B8;LATIN CAPITAL LETTER EZH REVERSED;Lu;0;L;;;;;N;LATIN CAPITAL LETTER REVERSED YOGH;;;01B9;
+01B9;LATIN SMALL LETTER EZH REVERSED;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED YOGH;;01B8;;01B8
+01BA;LATIN SMALL LETTER EZH WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH WITH TAIL;;;;
+01BB;LATIN LETTER TWO WITH STROKE;Lo;0;L;;;;;N;LATIN LETTER TWO BAR;;;;
+01BC;LATIN CAPITAL LETTER TONE FIVE;Lu;0;L;;;;;N;;;;01BD;
+01BD;LATIN SMALL LETTER TONE FIVE;Ll;0;L;;;;;N;;;01BC;;01BC
+01BE;LATIN LETTER INVERTED GLOTTAL STOP WITH STROKE;Ll;0;L;;;;;N;LATIN LETTER INVERTED GLOTTAL STOP BAR;;;;
+01BF;LATIN LETTER WYNN;Ll;0;L;;;;;N;;;01F7;;01F7
+01C0;LATIN LETTER DENTAL CLICK;Lo;0;L;;;;;N;LATIN LETTER PIPE;;;;
+01C1;LATIN LETTER LATERAL CLICK;Lo;0;L;;;;;N;LATIN LETTER DOUBLE PIPE;;;;
+01C2;LATIN LETTER ALVEOLAR CLICK;Lo;0;L;;;;;N;LATIN LETTER PIPE DOUBLE BAR;;;;
+01C3;LATIN LETTER RETROFLEX CLICK;Lo;0;L;;;;;N;LATIN LETTER EXCLAMATION MARK;;;;
+01C4;LATIN CAPITAL LETTER DZ WITH CARON;Lu;0;L;<compat> 0044 017D;;;;N;LATIN CAPITAL LETTER D Z HACEK;;;01C6;01C5
+01C5;LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON;Lt;0;L;<compat> 0044 017E;;;;N;LATIN LETTER CAPITAL D SMALL Z HACEK;;01C4;01C6;01C5
+01C6;LATIN SMALL LETTER DZ WITH CARON;Ll;0;L;<compat> 0064 017E;;;;N;LATIN SMALL LETTER D Z HACEK;;01C4;;01C5
+01C7;LATIN CAPITAL LETTER LJ;Lu;0;L;<compat> 004C 004A;;;;N;LATIN CAPITAL LETTER L J;;;01C9;01C8
+01C8;LATIN CAPITAL LETTER L WITH SMALL LETTER J;Lt;0;L;<compat> 004C 006A;;;;N;LATIN LETTER CAPITAL L SMALL J;;01C7;01C9;01C8
+01C9;LATIN SMALL LETTER LJ;Ll;0;L;<compat> 006C 006A;;;;N;LATIN SMALL LETTER L J;;01C7;;01C8
+01CA;LATIN CAPITAL LETTER NJ;Lu;0;L;<compat> 004E 004A;;;;N;LATIN CAPITAL LETTER N J;;;01CC;01CB
+01CB;LATIN CAPITAL LETTER N WITH SMALL LETTER J;Lt;0;L;<compat> 004E 006A;;;;N;LATIN LETTER CAPITAL N SMALL J;;01CA;01CC;01CB
+01CC;LATIN SMALL LETTER NJ;Ll;0;L;<compat> 006E 006A;;;;N;LATIN SMALL LETTER N J;;01CA;;01CB
+01CD;LATIN CAPITAL LETTER A WITH CARON;Lu;0;L;0041 030C;;;;N;LATIN CAPITAL LETTER A HACEK;;;01CE;
+01CE;LATIN SMALL LETTER A WITH CARON;Ll;0;L;0061 030C;;;;N;LATIN SMALL LETTER A HACEK;;01CD;;01CD
+01CF;LATIN CAPITAL LETTER I WITH CARON;Lu;0;L;0049 030C;;;;N;LATIN CAPITAL LETTER I HACEK;;;01D0;
+01D0;LATIN SMALL LETTER I WITH CARON;Ll;0;L;0069 030C;;;;N;LATIN SMALL LETTER I HACEK;;01CF;;01CF
+01D1;LATIN CAPITAL LETTER O WITH CARON;Lu;0;L;004F 030C;;;;N;LATIN CAPITAL LETTER O HACEK;;;01D2;
+01D2;LATIN SMALL LETTER O WITH CARON;Ll;0;L;006F 030C;;;;N;LATIN SMALL LETTER O HACEK;;01D1;;01D1
+01D3;LATIN CAPITAL LETTER U WITH CARON;Lu;0;L;0055 030C;;;;N;LATIN CAPITAL LETTER U HACEK;;;01D4;
+01D4;LATIN SMALL LETTER U WITH CARON;Ll;0;L;0075 030C;;;;N;LATIN SMALL LETTER U HACEK;;01D3;;01D3
+01D5;LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON;Lu;0;L;00DC 0304;;;;N;LATIN CAPITAL LETTER U DIAERESIS MACRON;;;01D6;
+01D6;LATIN SMALL LETTER U WITH DIAERESIS AND MACRON;Ll;0;L;00FC 0304;;;;N;LATIN SMALL LETTER U DIAERESIS MACRON;;01D5;;01D5
+01D7;LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE;Lu;0;L;00DC 0301;;;;N;LATIN CAPITAL LETTER U DIAERESIS ACUTE;;;01D8;
+01D8;LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE;Ll;0;L;00FC 0301;;;;N;LATIN SMALL LETTER U DIAERESIS ACUTE;;01D7;;01D7
+01D9;LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON;Lu;0;L;00DC 030C;;;;N;LATIN CAPITAL LETTER U DIAERESIS HACEK;;;01DA;
+01DA;LATIN SMALL LETTER U WITH DIAERESIS AND CARON;Ll;0;L;00FC 030C;;;;N;LATIN SMALL LETTER U DIAERESIS HACEK;;01D9;;01D9
+01DB;LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE;Lu;0;L;00DC 0300;;;;N;LATIN CAPITAL LETTER U DIAERESIS GRAVE;;;01DC;
+01DC;LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE;Ll;0;L;00FC 0300;;;;N;LATIN SMALL LETTER U DIAERESIS GRAVE;;01DB;;01DB
+01DD;LATIN SMALL LETTER TURNED E;Ll;0;L;;;;;N;;;018E;;018E
+01DE;LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON;Lu;0;L;00C4 0304;;;;N;LATIN CAPITAL LETTER A DIAERESIS MACRON;;;01DF;
+01DF;LATIN SMALL LETTER A WITH DIAERESIS AND MACRON;Ll;0;L;00E4 0304;;;;N;LATIN SMALL LETTER A DIAERESIS MACRON;;01DE;;01DE
+01E0;LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON;Lu;0;L;0226 0304;;;;N;LATIN CAPITAL LETTER A DOT MACRON;;;01E1;
+01E1;LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON;Ll;0;L;0227 0304;;;;N;LATIN SMALL LETTER A DOT MACRON;;01E0;;01E0
+01E2;LATIN CAPITAL LETTER AE WITH MACRON;Lu;0;L;00C6 0304;;;;N;LATIN CAPITAL LETTER A E MACRON;ash *;;01E3;
+01E3;LATIN SMALL LETTER AE WITH MACRON;Ll;0;L;00E6 0304;;;;N;LATIN SMALL LETTER A E MACRON;ash *;01E2;;01E2
+01E4;LATIN CAPITAL LETTER G WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER G BAR;;;01E5;
+01E5;LATIN SMALL LETTER G WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER G BAR;;01E4;;01E4
+01E6;LATIN CAPITAL LETTER G WITH CARON;Lu;0;L;0047 030C;;;;N;LATIN CAPITAL LETTER G HACEK;;;01E7;
+01E7;LATIN SMALL LETTER G WITH CARON;Ll;0;L;0067 030C;;;;N;LATIN SMALL LETTER G HACEK;;01E6;;01E6
+01E8;LATIN CAPITAL LETTER K WITH CARON;Lu;0;L;004B 030C;;;;N;LATIN CAPITAL LETTER K HACEK;;;01E9;
+01E9;LATIN SMALL LETTER K WITH CARON;Ll;0;L;006B 030C;;;;N;LATIN SMALL LETTER K HACEK;;01E8;;01E8
+01EA;LATIN CAPITAL LETTER O WITH OGONEK;Lu;0;L;004F 0328;;;;N;LATIN CAPITAL LETTER O OGONEK;;;01EB;
+01EB;LATIN SMALL LETTER O WITH OGONEK;Ll;0;L;006F 0328;;;;N;LATIN SMALL LETTER O OGONEK;;01EA;;01EA
+01EC;LATIN CAPITAL LETTER O WITH OGONEK AND MACRON;Lu;0;L;01EA 0304;;;;N;LATIN CAPITAL LETTER O OGONEK MACRON;;;01ED;
+01ED;LATIN SMALL LETTER O WITH OGONEK AND MACRON;Ll;0;L;01EB 0304;;;;N;LATIN SMALL LETTER O OGONEK MACRON;;01EC;;01EC
+01EE;LATIN CAPITAL LETTER EZH WITH CARON;Lu;0;L;01B7 030C;;;;N;LATIN CAPITAL LETTER YOGH HACEK;;;01EF;
+01EF;LATIN SMALL LETTER EZH WITH CARON;Ll;0;L;0292 030C;;;;N;LATIN SMALL LETTER YOGH HACEK;;01EE;;01EE
+01F0;LATIN SMALL LETTER J WITH CARON;Ll;0;L;006A 030C;;;;N;LATIN SMALL LETTER J HACEK;;;;
+01F1;LATIN CAPITAL LETTER DZ;Lu;0;L;<compat> 0044 005A;;;;N;;;;01F3;01F2
+01F2;LATIN CAPITAL LETTER D WITH SMALL LETTER Z;Lt;0;L;<compat> 0044 007A;;;;N;;;01F1;01F3;01F2
+01F3;LATIN SMALL LETTER DZ;Ll;0;L;<compat> 0064 007A;;;;N;;;01F1;;01F2
+01F4;LATIN CAPITAL LETTER G WITH ACUTE;Lu;0;L;0047 0301;;;;N;;;;01F5;
+01F5;LATIN SMALL LETTER G WITH ACUTE;Ll;0;L;0067 0301;;;;N;;;01F4;;01F4
+01F6;LATIN CAPITAL LETTER HWAIR;Lu;0;L;;;;;N;;;;0195;
+01F7;LATIN CAPITAL LETTER WYNN;Lu;0;L;;;;;N;;;;01BF;
+01F8;LATIN CAPITAL LETTER N WITH GRAVE;Lu;0;L;004E 0300;;;;N;;;;01F9;
+01F9;LATIN SMALL LETTER N WITH GRAVE;Ll;0;L;006E 0300;;;;N;;;01F8;;01F8
+01FA;LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE;Lu;0;L;00C5 0301;;;;N;;;;01FB;
+01FB;LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE;Ll;0;L;00E5 0301;;;;N;;;01FA;;01FA
+01FC;LATIN CAPITAL LETTER AE WITH ACUTE;Lu;0;L;00C6 0301;;;;N;;ash *;;01FD;
+01FD;LATIN SMALL LETTER AE WITH ACUTE;Ll;0;L;00E6 0301;;;;N;;ash *;01FC;;01FC
+01FE;LATIN CAPITAL LETTER O WITH STROKE AND ACUTE;Lu;0;L;00D8 0301;;;;N;;;;01FF;
+01FF;LATIN SMALL LETTER O WITH STROKE AND ACUTE;Ll;0;L;00F8 0301;;;;N;;;01FE;;01FE
+0200;LATIN CAPITAL LETTER A WITH DOUBLE GRAVE;Lu;0;L;0041 030F;;;;N;;;;0201;
+0201;LATIN SMALL LETTER A WITH DOUBLE GRAVE;Ll;0;L;0061 030F;;;;N;;;0200;;0200
+0202;LATIN CAPITAL LETTER A WITH INVERTED BREVE;Lu;0;L;0041 0311;;;;N;;;;0203;
+0203;LATIN SMALL LETTER A WITH INVERTED BREVE;Ll;0;L;0061 0311;;;;N;;;0202;;0202
+0204;LATIN CAPITAL LETTER E WITH DOUBLE GRAVE;Lu;0;L;0045 030F;;;;N;;;;0205;
+0205;LATIN SMALL LETTER E WITH DOUBLE GRAVE;Ll;0;L;0065 030F;;;;N;;;0204;;0204
+0206;LATIN CAPITAL LETTER E WITH INVERTED BREVE;Lu;0;L;0045 0311;;;;N;;;;0207;
+0207;LATIN SMALL LETTER E WITH INVERTED BREVE;Ll;0;L;0065 0311;;;;N;;;0206;;0206
+0208;LATIN CAPITAL LETTER I WITH DOUBLE GRAVE;Lu;0;L;0049 030F;;;;N;;;;0209;
+0209;LATIN SMALL LETTER I WITH DOUBLE GRAVE;Ll;0;L;0069 030F;;;;N;;;0208;;0208
+020A;LATIN CAPITAL LETTER I WITH INVERTED BREVE;Lu;0;L;0049 0311;;;;N;;;;020B;
+020B;LATIN SMALL LETTER I WITH INVERTED BREVE;Ll;0;L;0069 0311;;;;N;;;020A;;020A
+020C;LATIN CAPITAL LETTER O WITH DOUBLE GRAVE;Lu;0;L;004F 030F;;;;N;;;;020D;
+020D;LATIN SMALL LETTER O WITH DOUBLE GRAVE;Ll;0;L;006F 030F;;;;N;;;020C;;020C
+020E;LATIN CAPITAL LETTER O WITH INVERTED BREVE;Lu;0;L;004F 0311;;;;N;;;;020F;
+020F;LATIN SMALL LETTER O WITH INVERTED BREVE;Ll;0;L;006F 0311;;;;N;;;020E;;020E
+0210;LATIN CAPITAL LETTER R WITH DOUBLE GRAVE;Lu;0;L;0052 030F;;;;N;;;;0211;
+0211;LATIN SMALL LETTER R WITH DOUBLE GRAVE;Ll;0;L;0072 030F;;;;N;;;0210;;0210
+0212;LATIN CAPITAL LETTER R WITH INVERTED BREVE;Lu;0;L;0052 0311;;;;N;;;;0213;
+0213;LATIN SMALL LETTER R WITH INVERTED BREVE;Ll;0;L;0072 0311;;;;N;;;0212;;0212
+0214;LATIN CAPITAL LETTER U WITH DOUBLE GRAVE;Lu;0;L;0055 030F;;;;N;;;;0215;
+0215;LATIN SMALL LETTER U WITH DOUBLE GRAVE;Ll;0;L;0075 030F;;;;N;;;0214;;0214
+0216;LATIN CAPITAL LETTER U WITH INVERTED BREVE;Lu;0;L;0055 0311;;;;N;;;;0217;
+0217;LATIN SMALL LETTER U WITH INVERTED BREVE;Ll;0;L;0075 0311;;;;N;;;0216;;0216
+0218;LATIN CAPITAL LETTER S WITH COMMA BELOW;Lu;0;L;0053 0326;;;;N;;*;;0219;
+0219;LATIN SMALL LETTER S WITH COMMA BELOW;Ll;0;L;0073 0326;;;;N;;*;0218;;0218
+021A;LATIN CAPITAL LETTER T WITH COMMA BELOW;Lu;0;L;0054 0326;;;;N;;*;;021B;
+021B;LATIN SMALL LETTER T WITH COMMA BELOW;Ll;0;L;0074 0326;;;;N;;*;021A;;021A
+021C;LATIN CAPITAL LETTER YOGH;Lu;0;L;;;;;N;;;;021D;
+021D;LATIN SMALL LETTER YOGH;Ll;0;L;;;;;N;;;021C;;021C
+021E;LATIN CAPITAL LETTER H WITH CARON;Lu;0;L;0048 030C;;;;N;;;;021F;
+021F;LATIN SMALL LETTER H WITH CARON;Ll;0;L;0068 030C;;;;N;;;021E;;021E
+0220;LATIN CAPITAL LETTER N WITH LONG RIGHT LEG;Lu;0;L;;;;;N;;;;019E;
+0221;LATIN SMALL LETTER D WITH CURL;Ll;0;L;;;;;N;;;;;
+0222;LATIN CAPITAL LETTER OU;Lu;0;L;;;;;N;;;;0223;
+0223;LATIN SMALL LETTER OU;Ll;0;L;;;;;N;;;0222;;0222
+0224;LATIN CAPITAL LETTER Z WITH HOOK;Lu;0;L;;;;;N;;;;0225;
+0225;LATIN SMALL LETTER Z WITH HOOK;Ll;0;L;;;;;N;;;0224;;0224
+0226;LATIN CAPITAL LETTER A WITH DOT ABOVE;Lu;0;L;0041 0307;;;;N;;;;0227;
+0227;LATIN SMALL LETTER A WITH DOT ABOVE;Ll;0;L;0061 0307;;;;N;;;0226;;0226
+0228;LATIN CAPITAL LETTER E WITH CEDILLA;Lu;0;L;0045 0327;;;;N;;;;0229;
+0229;LATIN SMALL LETTER E WITH CEDILLA;Ll;0;L;0065 0327;;;;N;;;0228;;0228
+022A;LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON;Lu;0;L;00D6 0304;;;;N;;;;022B;
+022B;LATIN SMALL LETTER O WITH DIAERESIS AND MACRON;Ll;0;L;00F6 0304;;;;N;;;022A;;022A
+022C;LATIN CAPITAL LETTER O WITH TILDE AND MACRON;Lu;0;L;00D5 0304;;;;N;;;;022D;
+022D;LATIN SMALL LETTER O WITH TILDE AND MACRON;Ll;0;L;00F5 0304;;;;N;;;022C;;022C
+022E;LATIN CAPITAL LETTER O WITH DOT ABOVE;Lu;0;L;004F 0307;;;;N;;;;022F;
+022F;LATIN SMALL LETTER O WITH DOT ABOVE;Ll;0;L;006F 0307;;;;N;;;022E;;022E
+0230;LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON;Lu;0;L;022E 0304;;;;N;;;;0231;
+0231;LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON;Ll;0;L;022F 0304;;;;N;;;0230;;0230
+0232;LATIN CAPITAL LETTER Y WITH MACRON;Lu;0;L;0059 0304;;;;N;;;;0233;
+0233;LATIN SMALL LETTER Y WITH MACRON;Ll;0;L;0079 0304;;;;N;;;0232;;0232
+0234;LATIN SMALL LETTER L WITH CURL;Ll;0;L;;;;;N;;;;;
+0235;LATIN SMALL LETTER N WITH CURL;Ll;0;L;;;;;N;;;;;
+0236;LATIN SMALL LETTER T WITH CURL;Ll;0;L;;;;;N;;;;;
+0237;LATIN SMALL LETTER DOTLESS J;Ll;0;L;;;;;N;;;;;
+0238;LATIN SMALL LETTER DB DIGRAPH;Ll;0;L;;;;;N;;;;;
+0239;LATIN SMALL LETTER QP DIGRAPH;Ll;0;L;;;;;N;;;;;
+023A;LATIN CAPITAL LETTER A WITH STROKE;Lu;0;L;;;;;N;;;;2C65;
+023B;LATIN CAPITAL LETTER C WITH STROKE;Lu;0;L;;;;;N;;;;023C;
+023C;LATIN SMALL LETTER C WITH STROKE;Ll;0;L;;;;;N;;;023B;;023B
+023D;LATIN CAPITAL LETTER L WITH BAR;Lu;0;L;;;;;N;;;;019A;
+023E;LATIN CAPITAL LETTER T WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;2C66;
+023F;LATIN SMALL LETTER S WITH SWASH TAIL;Ll;0;L;;;;;N;;;;;
+0240;LATIN SMALL LETTER Z WITH SWASH TAIL;Ll;0;L;;;;;N;;;;;
+0241;LATIN CAPITAL LETTER GLOTTAL STOP;Lu;0;L;;;;;N;;;;0242;
+0242;LATIN SMALL LETTER GLOTTAL STOP;Ll;0;L;;;;;N;;;0241;;0241
+0243;LATIN CAPITAL LETTER B WITH STROKE;Lu;0;L;;;;;N;;;;0180;
+0244;LATIN CAPITAL LETTER U BAR;Lu;0;L;;;;;N;;;;0289;
+0245;LATIN CAPITAL LETTER TURNED V;Lu;0;L;;;;;N;;;;028C;
+0246;LATIN CAPITAL LETTER E WITH STROKE;Lu;0;L;;;;;N;;;;0247;
+0247;LATIN SMALL LETTER E WITH STROKE;Ll;0;L;;;;;N;;;0246;;0246
+0248;LATIN CAPITAL LETTER J WITH STROKE;Lu;0;L;;;;;N;;;;0249;
+0249;LATIN SMALL LETTER J WITH STROKE;Ll;0;L;;;;;N;;;0248;;0248
+024A;LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL;Lu;0;L;;;;;N;;;;024B;
+024B;LATIN SMALL LETTER Q WITH HOOK TAIL;Ll;0;L;;;;;N;;;024A;;024A
+024C;LATIN CAPITAL LETTER R WITH STROKE;Lu;0;L;;;;;N;;;;024D;
+024D;LATIN SMALL LETTER R WITH STROKE;Ll;0;L;;;;;N;;;024C;;024C
+024E;LATIN CAPITAL LETTER Y WITH STROKE;Lu;0;L;;;;;N;;;;024F;
+024F;LATIN SMALL LETTER Y WITH STROKE;Ll;0;L;;;;;N;;;024E;;024E
+0250;LATIN SMALL LETTER TURNED A;Ll;0;L;;;;;N;;;2C6F;;2C6F
+0251;LATIN SMALL LETTER ALPHA;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT A;;2C6D;;2C6D
+0252;LATIN SMALL LETTER TURNED ALPHA;Ll;0;L;;;;;N;LATIN SMALL LETTER TURNED SCRIPT A;;;;
+0253;LATIN SMALL LETTER B WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER B HOOK;;0181;;0181
+0254;LATIN SMALL LETTER OPEN O;Ll;0;L;;;;;N;;;0186;;0186
+0255;LATIN SMALL LETTER C WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER C CURL;;;;
+0256;LATIN SMALL LETTER D WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER D RETROFLEX HOOK;;0189;;0189
+0257;LATIN SMALL LETTER D WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER D HOOK;;018A;;018A
+0258;LATIN SMALL LETTER REVERSED E;Ll;0;L;;;;;N;;;;;
+0259;LATIN SMALL LETTER SCHWA;Ll;0;L;;;;;N;;;018F;;018F
+025A;LATIN SMALL LETTER SCHWA WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER SCHWA HOOK;;;;
+025B;LATIN SMALL LETTER OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER EPSILON;;0190;;0190
+025C;LATIN SMALL LETTER REVERSED OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED EPSILON;;;;
+025D;LATIN SMALL LETTER REVERSED OPEN E WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED EPSILON HOOK;;;;
+025E;LATIN SMALL LETTER CLOSED REVERSED OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER CLOSED REVERSED EPSILON;;;;
+025F;LATIN SMALL LETTER DOTLESS J WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER DOTLESS J BAR;;;;
+0260;LATIN SMALL LETTER G WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER G HOOK;;0193;;0193
+0261;LATIN SMALL LETTER SCRIPT G;Ll;0;L;;;;;N;;;;;
+0262;LATIN LETTER SMALL CAPITAL G;Ll;0;L;;;;;N;;;;;
+0263;LATIN SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;0194;;0194
+0264;LATIN SMALL LETTER RAMS HORN;Ll;0;L;;;;;N;LATIN SMALL LETTER BABY GAMMA;;;;
+0265;LATIN SMALL LETTER TURNED H;Ll;0;L;;;;;N;;;;;
+0266;LATIN SMALL LETTER H WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER H HOOK;;;;
+0267;LATIN SMALL LETTER HENG WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER HENG HOOK;;;;
+0268;LATIN SMALL LETTER I WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER BARRED I;;0197;;0197
+0269;LATIN SMALL LETTER IOTA;Ll;0;L;;;;;N;;;0196;;0196
+026A;LATIN LETTER SMALL CAPITAL I;Ll;0;L;;;;;N;;;;;
+026B;LATIN SMALL LETTER L WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;2C62;;2C62
+026C;LATIN SMALL LETTER L WITH BELT;Ll;0;L;;;;;N;LATIN SMALL LETTER L BELT;;;;
+026D;LATIN SMALL LETTER L WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER L RETROFLEX HOOK;;;;
+026E;LATIN SMALL LETTER LEZH;Ll;0;L;;;;;N;LATIN SMALL LETTER L YOGH;;;;
+026F;LATIN SMALL LETTER TURNED M;Ll;0;L;;;;;N;;;019C;;019C
+0270;LATIN SMALL LETTER TURNED M WITH LONG LEG;Ll;0;L;;;;;N;;;;;
+0271;LATIN SMALL LETTER M WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER M HOOK;;2C6E;;2C6E
+0272;LATIN SMALL LETTER N WITH LEFT HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER N HOOK;;019D;;019D
+0273;LATIN SMALL LETTER N WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER N RETROFLEX HOOK;;;;
+0274;LATIN LETTER SMALL CAPITAL N;Ll;0;L;;;;;N;;;;;
+0275;LATIN SMALL LETTER BARRED O;Ll;0;L;;;;;N;;;019F;;019F
+0276;LATIN LETTER SMALL CAPITAL OE;Ll;0;L;;;;;N;LATIN LETTER SMALL CAPITAL O E;;;;
+0277;LATIN SMALL LETTER CLOSED OMEGA;Ll;0;L;;;;;N;;;;;
+0278;LATIN SMALL LETTER PHI;Ll;0;L;;;;;N;;;;;
+0279;LATIN SMALL LETTER TURNED R;Ll;0;L;;;;;N;;;;;
+027A;LATIN SMALL LETTER TURNED R WITH LONG LEG;Ll;0;L;;;;;N;;;;;
+027B;LATIN SMALL LETTER TURNED R WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER TURNED R HOOK;;;;
+027C;LATIN SMALL LETTER R WITH LONG LEG;Ll;0;L;;;;;N;;;;;
+027D;LATIN SMALL LETTER R WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER R HOOK;;2C64;;2C64
+027E;LATIN SMALL LETTER R WITH FISHHOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER FISHHOOK R;;;;
+027F;LATIN SMALL LETTER REVERSED R WITH FISHHOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED FISHHOOK R;;;;
+0280;LATIN LETTER SMALL CAPITAL R;Ll;0;L;;;;;N;;*;01A6;;01A6
+0281;LATIN LETTER SMALL CAPITAL INVERTED R;Ll;0;L;;;;;N;;;;;
+0282;LATIN SMALL LETTER S WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER S HOOK;;;;
+0283;LATIN SMALL LETTER ESH;Ll;0;L;;;;;N;;;01A9;;01A9
+0284;LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER DOTLESS J BAR HOOK;;;;
+0285;LATIN SMALL LETTER SQUAT REVERSED ESH;Ll;0;L;;;;;N;;;;;
+0286;LATIN SMALL LETTER ESH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER ESH CURL;;;;
+0287;LATIN SMALL LETTER TURNED T;Ll;0;L;;;;;N;;;;;
+0288;LATIN SMALL LETTER T WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER T RETROFLEX HOOK;;01AE;;01AE
+0289;LATIN SMALL LETTER U BAR;Ll;0;L;;;;;N;;;0244;;0244
+028A;LATIN SMALL LETTER UPSILON;Ll;0;L;;;;;N;;;01B1;;01B1
+028B;LATIN SMALL LETTER V WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT V;;01B2;;01B2
+028C;LATIN SMALL LETTER TURNED V;Ll;0;L;;;;;N;;;0245;;0245
+028D;LATIN SMALL LETTER TURNED W;Ll;0;L;;;;;N;;;;;
+028E;LATIN SMALL LETTER TURNED Y;Ll;0;L;;;;;N;;;;;
+028F;LATIN LETTER SMALL CAPITAL Y;Ll;0;L;;;;;N;;;;;
+0290;LATIN SMALL LETTER Z WITH RETROFLEX HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER Z RETROFLEX HOOK;;;;
+0291;LATIN SMALL LETTER Z WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER Z CURL;;;;
+0292;LATIN SMALL LETTER EZH;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH;;01B7;;01B7
+0293;LATIN SMALL LETTER EZH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER YOGH CURL;;;;
+0294;LATIN LETTER GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
+0295;LATIN LETTER PHARYNGEAL VOICED FRICATIVE;Ll;0;L;;;;;N;LATIN LETTER REVERSED GLOTTAL STOP;;;;
+0296;LATIN LETTER INVERTED GLOTTAL STOP;Ll;0;L;;;;;N;;;;;
+0297;LATIN LETTER STRETCHED C;Ll;0;L;;;;;N;;;;;
+0298;LATIN LETTER BILABIAL CLICK;Ll;0;L;;;;;N;LATIN LETTER BULLSEYE;;;;
+0299;LATIN LETTER SMALL CAPITAL B;Ll;0;L;;;;;N;;;;;
+029A;LATIN SMALL LETTER CLOSED OPEN E;Ll;0;L;;;;;N;LATIN SMALL LETTER CLOSED EPSILON;;;;
+029B;LATIN LETTER SMALL CAPITAL G WITH HOOK;Ll;0;L;;;;;N;LATIN LETTER SMALL CAPITAL G HOOK;;;;
+029C;LATIN LETTER SMALL CAPITAL H;Ll;0;L;;;;;N;;;;;
+029D;LATIN SMALL LETTER J WITH CROSSED-TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER CROSSED-TAIL J;;;;
+029E;LATIN SMALL LETTER TURNED K;Ll;0;L;;;;;N;;;;;
+029F;LATIN LETTER SMALL CAPITAL L;Ll;0;L;;;;;N;;;;;
+02A0;LATIN SMALL LETTER Q WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER Q HOOK;;;;
+02A1;LATIN LETTER GLOTTAL STOP WITH STROKE;Ll;0;L;;;;;N;LATIN LETTER GLOTTAL STOP BAR;;;;
+02A2;LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE;Ll;0;L;;;;;N;LATIN LETTER REVERSED GLOTTAL STOP BAR;;;;
+02A3;LATIN SMALL LETTER DZ DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER D Z;;;;
+02A4;LATIN SMALL LETTER DEZH DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER D YOGH;;;;
+02A5;LATIN SMALL LETTER DZ DIGRAPH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER D Z CURL;;;;
+02A6;LATIN SMALL LETTER TS DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER T S;;;;
+02A7;LATIN SMALL LETTER TESH DIGRAPH;Ll;0;L;;;;;N;LATIN SMALL LETTER T ESH;;;;
+02A8;LATIN SMALL LETTER TC DIGRAPH WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER T C CURL;;;;
+02A9;LATIN SMALL LETTER FENG DIGRAPH;Ll;0;L;;;;;N;;;;;
+02AA;LATIN SMALL LETTER LS DIGRAPH;Ll;0;L;;;;;N;;;;;
+02AB;LATIN SMALL LETTER LZ DIGRAPH;Ll;0;L;;;;;N;;;;;
+02AC;LATIN LETTER BILABIAL PERCUSSIVE;Ll;0;L;;;;;N;;;;;
+02AD;LATIN LETTER BIDENTAL PERCUSSIVE;Ll;0;L;;;;;N;;;;;
+02AE;LATIN SMALL LETTER TURNED H WITH FISHHOOK;Ll;0;L;;;;;N;;;;;
+02AF;LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL;Ll;0;L;;;;;N;;;;;
+02B0;MODIFIER LETTER SMALL H;Lm;0;L;<super> 0068;;;;N;;;;;
+02B1;MODIFIER LETTER SMALL H WITH HOOK;Lm;0;L;<super> 0266;;;;N;MODIFIER LETTER SMALL H HOOK;;;;
+02B2;MODIFIER LETTER SMALL J;Lm;0;L;<super> 006A;;;;N;;;;;
+02B3;MODIFIER LETTER SMALL R;Lm;0;L;<super> 0072;;;;N;;;;;
+02B4;MODIFIER LETTER SMALL TURNED R;Lm;0;L;<super> 0279;;;;N;;;;;
+02B5;MODIFIER LETTER SMALL TURNED R WITH HOOK;Lm;0;L;<super> 027B;;;;N;MODIFIER LETTER SMALL TURNED R HOOK;;;;
+02B6;MODIFIER LETTER SMALL CAPITAL INVERTED R;Lm;0;L;<super> 0281;;;;N;;;;;
+02B7;MODIFIER LETTER SMALL W;Lm;0;L;<super> 0077;;;;N;;;;;
+02B8;MODIFIER LETTER SMALL Y;Lm;0;L;<super> 0079;;;;N;;;;;
+02B9;MODIFIER LETTER PRIME;Lm;0;ON;;;;;N;;;;;
+02BA;MODIFIER LETTER DOUBLE PRIME;Lm;0;ON;;;;;N;;;;;
+02BB;MODIFIER LETTER TURNED COMMA;Lm;0;L;;;;;N;;;;;
+02BC;MODIFIER LETTER APOSTROPHE;Lm;0;L;;;;;N;;;;;
+02BD;MODIFIER LETTER REVERSED COMMA;Lm;0;L;;;;;N;;;;;
+02BE;MODIFIER LETTER RIGHT HALF RING;Lm;0;L;;;;;N;;;;;
+02BF;MODIFIER LETTER LEFT HALF RING;Lm;0;L;;;;;N;;;;;
+02C0;MODIFIER LETTER GLOTTAL STOP;Lm;0;L;;;;;N;;;;;
+02C1;MODIFIER LETTER REVERSED GLOTTAL STOP;Lm;0;L;;;;;N;;;;;
+02C2;MODIFIER LETTER LEFT ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02C3;MODIFIER LETTER RIGHT ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02C4;MODIFIER LETTER UP ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02C5;MODIFIER LETTER DOWN ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02C6;MODIFIER LETTER CIRCUMFLEX ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER CIRCUMFLEX;;;;
+02C7;CARON;Lm;0;ON;;;;;N;MODIFIER LETTER HACEK;Mandarin Chinese third tone;;;
+02C8;MODIFIER LETTER VERTICAL LINE;Lm;0;ON;;;;;N;;;;;
+02C9;MODIFIER LETTER MACRON;Lm;0;ON;;;;;N;;Mandarin Chinese first tone;;;
+02CA;MODIFIER LETTER ACUTE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER ACUTE;Mandarin Chinese second tone;;;
+02CB;MODIFIER LETTER GRAVE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER GRAVE;Mandarin Chinese fourth tone;;;
+02CC;MODIFIER LETTER LOW VERTICAL LINE;Lm;0;ON;;;;;N;;;;;
+02CD;MODIFIER LETTER LOW MACRON;Lm;0;ON;;;;;N;;;;;
+02CE;MODIFIER LETTER LOW GRAVE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER LOW GRAVE;;;;
+02CF;MODIFIER LETTER LOW ACUTE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER LOW ACUTE;;;;
+02D0;MODIFIER LETTER TRIANGULAR COLON;Lm;0;L;;;;;N;;;;;
+02D1;MODIFIER LETTER HALF TRIANGULAR COLON;Lm;0;L;;;;;N;;;;;
+02D2;MODIFIER LETTER CENTRED RIGHT HALF RING;Sk;0;ON;;;;;N;MODIFIER LETTER CENTERED RIGHT HALF RING;;;;
+02D3;MODIFIER LETTER CENTRED LEFT HALF RING;Sk;0;ON;;;;;N;MODIFIER LETTER CENTERED LEFT HALF RING;;;;
+02D4;MODIFIER LETTER UP TACK;Sk;0;ON;;;;;N;;;;;
+02D5;MODIFIER LETTER DOWN TACK;Sk;0;ON;;;;;N;;;;;
+02D6;MODIFIER LETTER PLUS SIGN;Sk;0;ON;;;;;N;;;;;
+02D7;MODIFIER LETTER MINUS SIGN;Sk;0;ON;;;;;N;;;;;
+02D8;BREVE;Sk;0;ON;<compat> 0020 0306;;;;N;SPACING BREVE;;;;
+02D9;DOT ABOVE;Sk;0;ON;<compat> 0020 0307;;;;N;SPACING DOT ABOVE;Mandarin Chinese light tone;;;
+02DA;RING ABOVE;Sk;0;ON;<compat> 0020 030A;;;;N;SPACING RING ABOVE;;;;
+02DB;OGONEK;Sk;0;ON;<compat> 0020 0328;;;;N;SPACING OGONEK;;;;
+02DC;SMALL TILDE;Sk;0;ON;<compat> 0020 0303;;;;N;SPACING TILDE;;;;
+02DD;DOUBLE ACUTE ACCENT;Sk;0;ON;<compat> 0020 030B;;;;N;SPACING DOUBLE ACUTE;;;;
+02DE;MODIFIER LETTER RHOTIC HOOK;Sk;0;ON;;;;;N;;;;;
+02DF;MODIFIER LETTER CROSS ACCENT;Sk;0;ON;;;;;N;;;;;
+02E0;MODIFIER LETTER SMALL GAMMA;Lm;0;L;<super> 0263;;;;N;;;;;
+02E1;MODIFIER LETTER SMALL L;Lm;0;L;<super> 006C;;;;N;;;;;
+02E2;MODIFIER LETTER SMALL S;Lm;0;L;<super> 0073;;;;N;;;;;
+02E3;MODIFIER LETTER SMALL X;Lm;0;L;<super> 0078;;;;N;;;;;
+02E4;MODIFIER LETTER SMALL REVERSED GLOTTAL STOP;Lm;0;L;<super> 0295;;;;N;;;;;
+02E5;MODIFIER LETTER EXTRA-HIGH TONE BAR;Sk;0;ON;;;;;N;;;;;
+02E6;MODIFIER LETTER HIGH TONE BAR;Sk;0;ON;;;;;N;;;;;
+02E7;MODIFIER LETTER MID TONE BAR;Sk;0;ON;;;;;N;;;;;
+02E8;MODIFIER LETTER LOW TONE BAR;Sk;0;ON;;;;;N;;;;;
+02E9;MODIFIER LETTER EXTRA-LOW TONE BAR;Sk;0;ON;;;;;N;;;;;
+02EA;MODIFIER LETTER YIN DEPARTING TONE MARK;Sk;0;ON;;;;;N;;;;;
+02EB;MODIFIER LETTER YANG DEPARTING TONE MARK;Sk;0;ON;;;;;N;;;;;
+02EC;MODIFIER LETTER VOICING;Lm;0;ON;;;;;N;;;;;
+02ED;MODIFIER LETTER UNASPIRATED;Sk;0;ON;;;;;N;;;;;
+02EE;MODIFIER LETTER DOUBLE APOSTROPHE;Lm;0;L;;;;;N;;;;;
+02EF;MODIFIER LETTER LOW DOWN ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02F0;MODIFIER LETTER LOW UP ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02F1;MODIFIER LETTER LOW LEFT ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02F2;MODIFIER LETTER LOW RIGHT ARROWHEAD;Sk;0;ON;;;;;N;;;;;
+02F3;MODIFIER LETTER LOW RING;Sk;0;ON;;;;;N;;;;;
+02F4;MODIFIER LETTER MIDDLE GRAVE ACCENT;Sk;0;ON;;;;;N;;;;;
+02F5;MODIFIER LETTER MIDDLE DOUBLE GRAVE ACCENT;Sk;0;ON;;;;;N;;;;;
+02F6;MODIFIER LETTER MIDDLE DOUBLE ACUTE ACCENT;Sk;0;ON;;;;;N;;;;;
+02F7;MODIFIER LETTER LOW TILDE;Sk;0;ON;;;;;N;;;;;
+02F8;MODIFIER LETTER RAISED COLON;Sk;0;ON;;;;;N;;;;;
+02F9;MODIFIER LETTER BEGIN HIGH TONE;Sk;0;ON;;;;;N;;;;;
+02FA;MODIFIER LETTER END HIGH TONE;Sk;0;ON;;;;;N;;;;;
+02FB;MODIFIER LETTER BEGIN LOW TONE;Sk;0;ON;;;;;N;;;;;
+02FC;MODIFIER LETTER END LOW TONE;Sk;0;ON;;;;;N;;;;;
+02FD;MODIFIER LETTER SHELF;Sk;0;ON;;;;;N;;;;;
+02FE;MODIFIER LETTER OPEN SHELF;Sk;0;ON;;;;;N;;;;;
+02FF;MODIFIER LETTER LOW LEFT ARROW;Sk;0;ON;;;;;N;;;;;
+0300;COMBINING GRAVE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING GRAVE;Varia;;;
+0301;COMBINING ACUTE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING ACUTE;Oxia, Tonos;;;
+0302;COMBINING CIRCUMFLEX ACCENT;Mn;230;NSM;;;;;N;NON-SPACING CIRCUMFLEX;;;;
+0303;COMBINING TILDE;Mn;230;NSM;;;;;N;NON-SPACING TILDE;;;;
+0304;COMBINING MACRON;Mn;230;NSM;;;;;N;NON-SPACING MACRON;;;;
+0305;COMBINING OVERLINE;Mn;230;NSM;;;;;N;NON-SPACING OVERSCORE;;;;
+0306;COMBINING BREVE;Mn;230;NSM;;;;;N;NON-SPACING BREVE;Vrachy;;;
+0307;COMBINING DOT ABOVE;Mn;230;NSM;;;;;N;NON-SPACING DOT ABOVE;;;;
+0308;COMBINING DIAERESIS;Mn;230;NSM;;;;;N;NON-SPACING DIAERESIS;Dialytika;;;
+0309;COMBINING HOOK ABOVE;Mn;230;NSM;;;;;N;NON-SPACING HOOK ABOVE;;;;
+030A;COMBINING RING ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RING ABOVE;;;;
+030B;COMBINING DOUBLE ACUTE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE ACUTE;;;;
+030C;COMBINING CARON;Mn;230;NSM;;;;;N;NON-SPACING HACEK;;;;
+030D;COMBINING VERTICAL LINE ABOVE;Mn;230;NSM;;;;;N;NON-SPACING VERTICAL LINE ABOVE;;;;
+030E;COMBINING DOUBLE VERTICAL LINE ABOVE;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE VERTICAL LINE ABOVE;;;;
+030F;COMBINING DOUBLE GRAVE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE GRAVE;;;;
+0310;COMBINING CANDRABINDU;Mn;230;NSM;;;;;N;NON-SPACING CANDRABINDU;;;;
+0311;COMBINING INVERTED BREVE;Mn;230;NSM;;;;;N;NON-SPACING INVERTED BREVE;;;;
+0312;COMBINING TURNED COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING TURNED COMMA ABOVE;;;;
+0313;COMBINING COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING COMMA ABOVE;Psili;;;
+0314;COMBINING REVERSED COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING REVERSED COMMA ABOVE;Dasia;;;
+0315;COMBINING COMMA ABOVE RIGHT;Mn;232;NSM;;;;;N;NON-SPACING COMMA ABOVE RIGHT;;;;
+0316;COMBINING GRAVE ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING GRAVE BELOW;;;;
+0317;COMBINING ACUTE ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING ACUTE BELOW;;;;
+0318;COMBINING LEFT TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING LEFT TACK BELOW;;;;
+0319;COMBINING RIGHT TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING RIGHT TACK BELOW;;;;
+031A;COMBINING LEFT ANGLE ABOVE;Mn;232;NSM;;;;;N;NON-SPACING LEFT ANGLE ABOVE;;;;
+031B;COMBINING HORN;Mn;216;NSM;;;;;N;NON-SPACING HORN;;;;
+031C;COMBINING LEFT HALF RING BELOW;Mn;220;NSM;;;;;N;NON-SPACING LEFT HALF RING BELOW;;;;
+031D;COMBINING UP TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING UP TACK BELOW;;;;
+031E;COMBINING DOWN TACK BELOW;Mn;220;NSM;;;;;N;NON-SPACING DOWN TACK BELOW;;;;
+031F;COMBINING PLUS SIGN BELOW;Mn;220;NSM;;;;;N;NON-SPACING PLUS SIGN BELOW;;;;
+0320;COMBINING MINUS SIGN BELOW;Mn;220;NSM;;;;;N;NON-SPACING MINUS SIGN BELOW;;;;
+0321;COMBINING PALATALIZED HOOK BELOW;Mn;202;NSM;;;;;N;NON-SPACING PALATALIZED HOOK BELOW;;;;
+0322;COMBINING RETROFLEX HOOK BELOW;Mn;202;NSM;;;;;N;NON-SPACING RETROFLEX HOOK BELOW;;;;
+0323;COMBINING DOT BELOW;Mn;220;NSM;;;;;N;NON-SPACING DOT BELOW;;;;
+0324;COMBINING DIAERESIS BELOW;Mn;220;NSM;;;;;N;NON-SPACING DOUBLE DOT BELOW;;;;
+0325;COMBINING RING BELOW;Mn;220;NSM;;;;;N;NON-SPACING RING BELOW;;;;
+0326;COMBINING COMMA BELOW;Mn;220;NSM;;;;;N;NON-SPACING COMMA BELOW;;;;
+0327;COMBINING CEDILLA;Mn;202;NSM;;;;;N;NON-SPACING CEDILLA;;;;
+0328;COMBINING OGONEK;Mn;202;NSM;;;;;N;NON-SPACING OGONEK;;;;
+0329;COMBINING VERTICAL LINE BELOW;Mn;220;NSM;;;;;N;NON-SPACING VERTICAL LINE BELOW;;;;
+032A;COMBINING BRIDGE BELOW;Mn;220;NSM;;;;;N;NON-SPACING BRIDGE BELOW;;;;
+032B;COMBINING INVERTED DOUBLE ARCH BELOW;Mn;220;NSM;;;;;N;NON-SPACING INVERTED DOUBLE ARCH BELOW;;;;
+032C;COMBINING CARON BELOW;Mn;220;NSM;;;;;N;NON-SPACING HACEK BELOW;;;;
+032D;COMBINING CIRCUMFLEX ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING CIRCUMFLEX BELOW;;;;
+032E;COMBINING BREVE BELOW;Mn;220;NSM;;;;;N;NON-SPACING BREVE BELOW;;;;
+032F;COMBINING INVERTED BREVE BELOW;Mn;220;NSM;;;;;N;NON-SPACING INVERTED BREVE BELOW;;;;
+0330;COMBINING TILDE BELOW;Mn;220;NSM;;;;;N;NON-SPACING TILDE BELOW;;;;
+0331;COMBINING MACRON BELOW;Mn;220;NSM;;;;;N;NON-SPACING MACRON BELOW;;;;
+0332;COMBINING LOW LINE;Mn;220;NSM;;;;;N;NON-SPACING UNDERSCORE;;;;
+0333;COMBINING DOUBLE LOW LINE;Mn;220;NSM;;;;;N;NON-SPACING DOUBLE UNDERSCORE;;;;
+0334;COMBINING TILDE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING TILDE OVERLAY;;;;
+0335;COMBINING SHORT STROKE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING SHORT BAR OVERLAY;;;;
+0336;COMBINING LONG STROKE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG BAR OVERLAY;;;;
+0337;COMBINING SHORT SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING SHORT SLASH OVERLAY;;;;
+0338;COMBINING LONG SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG SLASH OVERLAY;;;;
+0339;COMBINING RIGHT HALF RING BELOW;Mn;220;NSM;;;;;N;NON-SPACING RIGHT HALF RING BELOW;;;;
+033A;COMBINING INVERTED BRIDGE BELOW;Mn;220;NSM;;;;;N;NON-SPACING INVERTED BRIDGE BELOW;;;;
+033B;COMBINING SQUARE BELOW;Mn;220;NSM;;;;;N;NON-SPACING SQUARE BELOW;;;;
+033C;COMBINING SEAGULL BELOW;Mn;220;NSM;;;;;N;NON-SPACING SEAGULL BELOW;;;;
+033D;COMBINING X ABOVE;Mn;230;NSM;;;;;N;NON-SPACING X ABOVE;;;;
+033E;COMBINING VERTICAL TILDE;Mn;230;NSM;;;;;N;NON-SPACING VERTICAL TILDE;;;;
+033F;COMBINING DOUBLE OVERLINE;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE OVERSCORE;;;;
+0340;COMBINING GRAVE TONE MARK;Mn;230;NSM;0300;;;;N;NON-SPACING GRAVE TONE MARK;Vietnamese;;;
+0341;COMBINING ACUTE TONE MARK;Mn;230;NSM;0301;;;;N;NON-SPACING ACUTE TONE MARK;Vietnamese;;;
+0342;COMBINING GREEK PERISPOMENI;Mn;230;NSM;;;;;N;;;;;
+0343;COMBINING GREEK KORONIS;Mn;230;NSM;0313;;;;N;;;;;
+0344;COMBINING GREEK DIALYTIKA TONOS;Mn;230;NSM;0308 0301;;;;N;GREEK NON-SPACING DIAERESIS TONOS;;;;
+0345;COMBINING GREEK YPOGEGRAMMENI;Mn;240;NSM;;;;;N;GREEK NON-SPACING IOTA BELOW;;0399;;0399
+0346;COMBINING BRIDGE ABOVE;Mn;230;NSM;;;;;N;;;;;
+0347;COMBINING EQUALS SIGN BELOW;Mn;220;NSM;;;;;N;;;;;
+0348;COMBINING DOUBLE VERTICAL LINE BELOW;Mn;220;NSM;;;;;N;;;;;
+0349;COMBINING LEFT ANGLE BELOW;Mn;220;NSM;;;;;N;;;;;
+034A;COMBINING NOT TILDE ABOVE;Mn;230;NSM;;;;;N;;;;;
+034B;COMBINING HOMOTHETIC ABOVE;Mn;230;NSM;;;;;N;;;;;
+034C;COMBINING ALMOST EQUAL TO ABOVE;Mn;230;NSM;;;;;N;;;;;
+034D;COMBINING LEFT RIGHT ARROW BELOW;Mn;220;NSM;;;;;N;;;;;
+034E;COMBINING UPWARDS ARROW BELOW;Mn;220;NSM;;;;;N;;;;;
+034F;COMBINING GRAPHEME JOINER;Mn;0;NSM;;;;;N;;;;;
+0350;COMBINING RIGHT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;;
+0351;COMBINING LEFT HALF RING ABOVE;Mn;230;NSM;;;;;N;;;;;
+0352;COMBINING FERMATA;Mn;230;NSM;;;;;N;;;;;
+0353;COMBINING X BELOW;Mn;220;NSM;;;;;N;;;;;
+0354;COMBINING LEFT ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
+0355;COMBINING RIGHT ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
+0356;COMBINING RIGHT ARROWHEAD AND UP ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
+0357;COMBINING RIGHT HALF RING ABOVE;Mn;230;NSM;;;;;N;;;;;
+0358;COMBINING DOT ABOVE RIGHT;Mn;232;NSM;;;;;N;;;;;
+0359;COMBINING ASTERISK BELOW;Mn;220;NSM;;;;;N;;;;;
+035A;COMBINING DOUBLE RING BELOW;Mn;220;NSM;;;;;N;;;;;
+035B;COMBINING ZIGZAG ABOVE;Mn;230;NSM;;;;;N;;;;;
+035C;COMBINING DOUBLE BREVE BELOW;Mn;233;NSM;;;;;N;;;;;
+035D;COMBINING DOUBLE BREVE;Mn;234;NSM;;;;;N;;;;;
+035E;COMBINING DOUBLE MACRON;Mn;234;NSM;;;;;N;;;;;
+035F;COMBINING DOUBLE MACRON BELOW;Mn;233;NSM;;;;;N;;;;;
+0360;COMBINING DOUBLE TILDE;Mn;234;NSM;;;;;N;;;;;
+0361;COMBINING DOUBLE INVERTED BREVE;Mn;234;NSM;;;;;N;;;;;
+0362;COMBINING DOUBLE RIGHTWARDS ARROW BELOW;Mn;233;NSM;;;;;N;;;;;
+0363;COMBINING LATIN SMALL LETTER A;Mn;230;NSM;;;;;N;;;;;
+0364;COMBINING LATIN SMALL LETTER E;Mn;230;NSM;;;;;N;;;;;
+0365;COMBINING LATIN SMALL LETTER I;Mn;230;NSM;;;;;N;;;;;
+0366;COMBINING LATIN SMALL LETTER O;Mn;230;NSM;;;;;N;;;;;
+0367;COMBINING LATIN SMALL LETTER U;Mn;230;NSM;;;;;N;;;;;
+0368;COMBINING LATIN SMALL LETTER C;Mn;230;NSM;;;;;N;;;;;
+0369;COMBINING LATIN SMALL LETTER D;Mn;230;NSM;;;;;N;;;;;
+036A;COMBINING LATIN SMALL LETTER H;Mn;230;NSM;;;;;N;;;;;
+036B;COMBINING LATIN SMALL LETTER M;Mn;230;NSM;;;;;N;;;;;
+036C;COMBINING LATIN SMALL LETTER R;Mn;230;NSM;;;;;N;;;;;
+036D;COMBINING LATIN SMALL LETTER T;Mn;230;NSM;;;;;N;;;;;
+036E;COMBINING LATIN SMALL LETTER V;Mn;230;NSM;;;;;N;;;;;
+036F;COMBINING LATIN SMALL LETTER X;Mn;230;NSM;;;;;N;;;;;
+0370;GREEK CAPITAL LETTER HETA;Lu;0;L;;;;;N;;;;0371;
+0371;GREEK SMALL LETTER HETA;Ll;0;L;;;;;N;;;0370;;0370
+0372;GREEK CAPITAL LETTER ARCHAIC SAMPI;Lu;0;L;;;;;N;;;;0373;
+0373;GREEK SMALL LETTER ARCHAIC SAMPI;Ll;0;L;;;;;N;;;0372;;0372
+0374;GREEK NUMERAL SIGN;Lm;0;ON;02B9;;;;N;GREEK UPPER NUMERAL SIGN;Dexia keraia;;;
+0375;GREEK LOWER NUMERAL SIGN;Sk;0;ON;;;;;N;;Aristeri keraia;;;
+0376;GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA;Lu;0;L;;;;;N;;;;0377;
+0377;GREEK SMALL LETTER PAMPHYLIAN DIGAMMA;Ll;0;L;;;;;N;;;0376;;0376
+037A;GREEK YPOGEGRAMMENI;Lm;0;L;<compat> 0020 0345;;;;N;GREEK SPACING IOTA BELOW;;;;
+037B;GREEK SMALL REVERSED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FD;;03FD
+037C;GREEK SMALL DOTTED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FE;;03FE
+037D;GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FF;;03FF
+037E;GREEK QUESTION MARK;Po;0;ON;003B;;;;N;;Erotimatiko;;;
+0384;GREEK TONOS;Sk;0;ON;<compat> 0020 0301;;;;N;GREEK SPACING TONOS;;;;
+0385;GREEK DIALYTIKA TONOS;Sk;0;ON;00A8 0301;;;;N;GREEK SPACING DIAERESIS TONOS;;;;
+0386;GREEK CAPITAL LETTER ALPHA WITH TONOS;Lu;0;L;0391 0301;;;;N;GREEK CAPITAL LETTER ALPHA TONOS;;;03AC;
+0387;GREEK ANO TELEIA;Po;0;ON;00B7;;;;N;;;;;
+0388;GREEK CAPITAL LETTER EPSILON WITH TONOS;Lu;0;L;0395 0301;;;;N;GREEK CAPITAL LETTER EPSILON TONOS;;;03AD;
+0389;GREEK CAPITAL LETTER ETA WITH TONOS;Lu;0;L;0397 0301;;;;N;GREEK CAPITAL LETTER ETA TONOS;;;03AE;
+038A;GREEK CAPITAL LETTER IOTA WITH TONOS;Lu;0;L;0399 0301;;;;N;GREEK CAPITAL LETTER IOTA TONOS;;;03AF;
+038C;GREEK CAPITAL LETTER OMICRON WITH TONOS;Lu;0;L;039F 0301;;;;N;GREEK CAPITAL LETTER OMICRON TONOS;;;03CC;
+038E;GREEK CAPITAL LETTER UPSILON WITH TONOS;Lu;0;L;03A5 0301;;;;N;GREEK CAPITAL LETTER UPSILON TONOS;;;03CD;
+038F;GREEK CAPITAL LETTER OMEGA WITH TONOS;Lu;0;L;03A9 0301;;;;N;GREEK CAPITAL LETTER OMEGA TONOS;;;03CE;
+0390;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS;Ll;0;L;03CA 0301;;;;N;GREEK SMALL LETTER IOTA DIAERESIS TONOS;;;;
+0391;GREEK CAPITAL LETTER ALPHA;Lu;0;L;;;;;N;;;;03B1;
+0392;GREEK CAPITAL LETTER BETA;Lu;0;L;;;;;N;;;;03B2;
+0393;GREEK CAPITAL LETTER GAMMA;Lu;0;L;;;;;N;;;;03B3;
+0394;GREEK CAPITAL LETTER DELTA;Lu;0;L;;;;;N;;;;03B4;
+0395;GREEK CAPITAL LETTER EPSILON;Lu;0;L;;;;;N;;;;03B5;
+0396;GREEK CAPITAL LETTER ZETA;Lu;0;L;;;;;N;;;;03B6;
+0397;GREEK CAPITAL LETTER ETA;Lu;0;L;;;;;N;;;;03B7;
+0398;GREEK CAPITAL LETTER THETA;Lu;0;L;;;;;N;;;;03B8;
+0399;GREEK CAPITAL LETTER IOTA;Lu;0;L;;;;;N;;;;03B9;
+039A;GREEK CAPITAL LETTER KAPPA;Lu;0;L;;;;;N;;;;03BA;
+039B;GREEK CAPITAL LETTER LAMDA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER LAMBDA;;;03BB;
+039C;GREEK CAPITAL LETTER MU;Lu;0;L;;;;;N;;;;03BC;
+039D;GREEK CAPITAL LETTER NU;Lu;0;L;;;;;N;;;;03BD;
+039E;GREEK CAPITAL LETTER XI;Lu;0;L;;;;;N;;;;03BE;
+039F;GREEK CAPITAL LETTER OMICRON;Lu;0;L;;;;;N;;;;03BF;
+03A0;GREEK CAPITAL LETTER PI;Lu;0;L;;;;;N;;;;03C0;
+03A1;GREEK CAPITAL LETTER RHO;Lu;0;L;;;;;N;;;;03C1;
+03A3;GREEK CAPITAL LETTER SIGMA;Lu;0;L;;;;;N;;;;03C3;
+03A4;GREEK CAPITAL LETTER TAU;Lu;0;L;;;;;N;;;;03C4;
+03A5;GREEK CAPITAL LETTER UPSILON;Lu;0;L;;;;;N;;;;03C5;
+03A6;GREEK CAPITAL LETTER PHI;Lu;0;L;;;;;N;;;;03C6;
+03A7;GREEK CAPITAL LETTER CHI;Lu;0;L;;;;;N;;;;03C7;
+03A8;GREEK CAPITAL LETTER PSI;Lu;0;L;;;;;N;;;;03C8;
+03A9;GREEK CAPITAL LETTER OMEGA;Lu;0;L;;;;;N;;;;03C9;
+03AA;GREEK CAPITAL LETTER IOTA WITH DIALYTIKA;Lu;0;L;0399 0308;;;;N;GREEK CAPITAL LETTER IOTA DIAERESIS;;;03CA;
+03AB;GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA;Lu;0;L;03A5 0308;;;;N;GREEK CAPITAL LETTER UPSILON DIAERESIS;;;03CB;
+03AC;GREEK SMALL LETTER ALPHA WITH TONOS;Ll;0;L;03B1 0301;;;;N;GREEK SMALL LETTER ALPHA TONOS;;0386;;0386
+03AD;GREEK SMALL LETTER EPSILON WITH TONOS;Ll;0;L;03B5 0301;;;;N;GREEK SMALL LETTER EPSILON TONOS;;0388;;0388
+03AE;GREEK SMALL LETTER ETA WITH TONOS;Ll;0;L;03B7 0301;;;;N;GREEK SMALL LETTER ETA TONOS;;0389;;0389
+03AF;GREEK SMALL LETTER IOTA WITH TONOS;Ll;0;L;03B9 0301;;;;N;GREEK SMALL LETTER IOTA TONOS;;038A;;038A
+03B0;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS;Ll;0;L;03CB 0301;;;;N;GREEK SMALL LETTER UPSILON DIAERESIS TONOS;;;;
+03B1;GREEK SMALL LETTER ALPHA;Ll;0;L;;;;;N;;;0391;;0391
+03B2;GREEK SMALL LETTER BETA;Ll;0;L;;;;;N;;;0392;;0392
+03B3;GREEK SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;0393;;0393
+03B4;GREEK SMALL LETTER DELTA;Ll;0;L;;;;;N;;;0394;;0394
+03B5;GREEK SMALL LETTER EPSILON;Ll;0;L;;;;;N;;;0395;;0395
+03B6;GREEK SMALL LETTER ZETA;Ll;0;L;;;;;N;;;0396;;0396
+03B7;GREEK SMALL LETTER ETA;Ll;0;L;;;;;N;;;0397;;0397
+03B8;GREEK SMALL LETTER THETA;Ll;0;L;;;;;N;;;0398;;0398
+03B9;GREEK SMALL LETTER IOTA;Ll;0;L;;;;;N;;;0399;;0399
+03BA;GREEK SMALL LETTER KAPPA;Ll;0;L;;;;;N;;;039A;;039A
+03BB;GREEK SMALL LETTER LAMDA;Ll;0;L;;;;;N;GREEK SMALL LETTER LAMBDA;;039B;;039B
+03BC;GREEK SMALL LETTER MU;Ll;0;L;;;;;N;;;039C;;039C
+03BD;GREEK SMALL LETTER NU;Ll;0;L;;;;;N;;;039D;;039D
+03BE;GREEK SMALL LETTER XI;Ll;0;L;;;;;N;;;039E;;039E
+03BF;GREEK SMALL LETTER OMICRON;Ll;0;L;;;;;N;;;039F;;039F
+03C0;GREEK SMALL LETTER PI;Ll;0;L;;;;;N;;;03A0;;03A0
+03C1;GREEK SMALL LETTER RHO;Ll;0;L;;;;;N;;;03A1;;03A1
+03C2;GREEK SMALL LETTER FINAL SIGMA;Ll;0;L;;;;;N;;;03A3;;03A3
+03C3;GREEK SMALL LETTER SIGMA;Ll;0;L;;;;;N;;;03A3;;03A3
+03C4;GREEK SMALL LETTER TAU;Ll;0;L;;;;;N;;;03A4;;03A4
+03C5;GREEK SMALL LETTER UPSILON;Ll;0;L;;;;;N;;;03A5;;03A5
+03C6;GREEK SMALL LETTER PHI;Ll;0;L;;;;;N;;;03A6;;03A6
+03C7;GREEK SMALL LETTER CHI;Ll;0;L;;;;;N;;;03A7;;03A7
+03C8;GREEK SMALL LETTER PSI;Ll;0;L;;;;;N;;;03A8;;03A8
+03C9;GREEK SMALL LETTER OMEGA;Ll;0;L;;;;;N;;;03A9;;03A9
+03CA;GREEK SMALL LETTER IOTA WITH DIALYTIKA;Ll;0;L;03B9 0308;;;;N;GREEK SMALL LETTER IOTA DIAERESIS;;03AA;;03AA
+03CB;GREEK SMALL LETTER UPSILON WITH DIALYTIKA;Ll;0;L;03C5 0308;;;;N;GREEK SMALL LETTER UPSILON DIAERESIS;;03AB;;03AB
+03CC;GREEK SMALL LETTER OMICRON WITH TONOS;Ll;0;L;03BF 0301;;;;N;GREEK SMALL LETTER OMICRON TONOS;;038C;;038C
+03CD;GREEK SMALL LETTER UPSILON WITH TONOS;Ll;0;L;03C5 0301;;;;N;GREEK SMALL LETTER UPSILON TONOS;;038E;;038E
+03CE;GREEK SMALL LETTER OMEGA WITH TONOS;Ll;0;L;03C9 0301;;;;N;GREEK SMALL LETTER OMEGA TONOS;;038F;;038F
+03CF;GREEK CAPITAL KAI SYMBOL;Lu;0;L;;;;;N;;;;03D7;
+03D0;GREEK BETA SYMBOL;Ll;0;L;<compat> 03B2;;;;N;GREEK SMALL LETTER CURLED BETA;;0392;;0392
+03D1;GREEK THETA SYMBOL;Ll;0;L;<compat> 03B8;;;;N;GREEK SMALL LETTER SCRIPT THETA;;0398;;0398
+03D2;GREEK UPSILON WITH HOOK SYMBOL;Lu;0;L;<compat> 03A5;;;;N;GREEK CAPITAL LETTER UPSILON HOOK;;;;
+03D3;GREEK UPSILON WITH ACUTE AND HOOK SYMBOL;Lu;0;L;03D2 0301;;;;N;GREEK CAPITAL LETTER UPSILON HOOK TONOS;;;;
+03D4;GREEK UPSILON WITH DIAERESIS AND HOOK SYMBOL;Lu;0;L;03D2 0308;;;;N;GREEK CAPITAL LETTER UPSILON HOOK DIAERESIS;;;;
+03D5;GREEK PHI SYMBOL;Ll;0;L;<compat> 03C6;;;;N;GREEK SMALL LETTER SCRIPT PHI;;03A6;;03A6
+03D6;GREEK PI SYMBOL;Ll;0;L;<compat> 03C0;;;;N;GREEK SMALL LETTER OMEGA PI;;03A0;;03A0
+03D7;GREEK KAI SYMBOL;Ll;0;L;;;;;N;;;03CF;;03CF
+03D8;GREEK LETTER ARCHAIC KOPPA;Lu;0;L;;;;;N;;*;;03D9;
+03D9;GREEK SMALL LETTER ARCHAIC KOPPA;Ll;0;L;;;;;N;;*;03D8;;03D8
+03DA;GREEK LETTER STIGMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER STIGMA;;;03DB;
+03DB;GREEK SMALL LETTER STIGMA;Ll;0;L;;;;;N;;;03DA;;03DA
+03DC;GREEK LETTER DIGAMMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER DIGAMMA;;;03DD;
+03DD;GREEK SMALL LETTER DIGAMMA;Ll;0;L;;;;;N;;;03DC;;03DC
+03DE;GREEK LETTER KOPPA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER KOPPA;;;03DF;
+03DF;GREEK SMALL LETTER KOPPA;Ll;0;L;;;;;N;;;03DE;;03DE
+03E0;GREEK LETTER SAMPI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER SAMPI;;;03E1;
+03E1;GREEK SMALL LETTER SAMPI;Ll;0;L;;;;;N;;;03E0;;03E0
+03E2;COPTIC CAPITAL LETTER SHEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER SHEI;;;03E3;
+03E3;COPTIC SMALL LETTER SHEI;Ll;0;L;;;;;N;GREEK SMALL LETTER SHEI;;03E2;;03E2
+03E4;COPTIC CAPITAL LETTER FEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER FEI;;;03E5;
+03E5;COPTIC SMALL LETTER FEI;Ll;0;L;;;;;N;GREEK SMALL LETTER FEI;;03E4;;03E4
+03E6;COPTIC CAPITAL LETTER KHEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER KHEI;;;03E7;
+03E7;COPTIC SMALL LETTER KHEI;Ll;0;L;;;;;N;GREEK SMALL LETTER KHEI;;03E6;;03E6
+03E8;COPTIC CAPITAL LETTER HORI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER HORI;;;03E9;
+03E9;COPTIC SMALL LETTER HORI;Ll;0;L;;;;;N;GREEK SMALL LETTER HORI;;03E8;;03E8
+03EA;COPTIC CAPITAL LETTER GANGIA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER GANGIA;;;03EB;
+03EB;COPTIC SMALL LETTER GANGIA;Ll;0;L;;;;;N;GREEK SMALL LETTER GANGIA;;03EA;;03EA
+03EC;COPTIC CAPITAL LETTER SHIMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER SHIMA;;;03ED;
+03ED;COPTIC SMALL LETTER SHIMA;Ll;0;L;;;;;N;GREEK SMALL LETTER SHIMA;;03EC;;03EC
+03EE;COPTIC CAPITAL LETTER DEI;Lu;0;L;;;;;N;GREEK CAPITAL LETTER DEI;;;03EF;
+03EF;COPTIC SMALL LETTER DEI;Ll;0;L;;;;;N;GREEK SMALL LETTER DEI;;03EE;;03EE
+03F0;GREEK KAPPA SYMBOL;Ll;0;L;<compat> 03BA;;;;N;GREEK SMALL LETTER SCRIPT KAPPA;;039A;;039A
+03F1;GREEK RHO SYMBOL;Ll;0;L;<compat> 03C1;;;;N;GREEK SMALL LETTER TAILED RHO;;03A1;;03A1
+03F2;GREEK LUNATE SIGMA SYMBOL;Ll;0;L;<compat> 03C2;;;;N;GREEK SMALL LETTER LUNATE SIGMA;;03F9;;03F9
+03F3;GREEK LETTER YOT;Ll;0;L;;;;;N;;;;;
+03F4;GREEK CAPITAL THETA SYMBOL;Lu;0;L;<compat> 0398;;;;N;;;;03B8;
+03F5;GREEK LUNATE EPSILON SYMBOL;Ll;0;L;<compat> 03B5;;;;N;;;0395;;0395
+03F6;GREEK REVERSED LUNATE EPSILON SYMBOL;Sm;0;ON;;;;;N;;;;;
+03F7;GREEK CAPITAL LETTER SHO;Lu;0;L;;;;;N;;;;03F8;
+03F8;GREEK SMALL LETTER SHO;Ll;0;L;;;;;N;;;03F7;;03F7
+03F9;GREEK CAPITAL LUNATE SIGMA SYMBOL;Lu;0;L;<compat> 03A3;;;;N;;;;03F2;
+03FA;GREEK CAPITAL LETTER SAN;Lu;0;L;;;;;N;;;;03FB;
+03FB;GREEK SMALL LETTER SAN;Ll;0;L;;;;;N;;;03FA;;03FA
+03FC;GREEK RHO WITH STROKE SYMBOL;Ll;0;L;;;;;N;;;;;
+03FD;GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL;Lu;0;L;;;;;N;;;;037B;
+03FE;GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL;Lu;0;L;;;;;N;;;;037C;
+03FF;GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL;Lu;0;L;;;;;N;;;;037D;
+0400;CYRILLIC CAPITAL LETTER IE WITH GRAVE;Lu;0;L;0415 0300;;;;N;;;;0450;
+0401;CYRILLIC CAPITAL LETTER IO;Lu;0;L;0415 0308;;;;N;;;;0451;
+0402;CYRILLIC CAPITAL LETTER DJE;Lu;0;L;;;;;N;;Serbocroatian;;0452;
+0403;CYRILLIC CAPITAL LETTER GJE;Lu;0;L;0413 0301;;;;N;;;;0453;
+0404;CYRILLIC CAPITAL LETTER UKRAINIAN IE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER E;;;0454;
+0405;CYRILLIC CAPITAL LETTER DZE;Lu;0;L;;;;;N;;;;0455;
+0406;CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER I;;;0456;
+0407;CYRILLIC CAPITAL LETTER YI;Lu;0;L;0406 0308;;;;N;;Ukrainian;;0457;
+0408;CYRILLIC CAPITAL LETTER JE;Lu;0;L;;;;;N;;;;0458;
+0409;CYRILLIC CAPITAL LETTER LJE;Lu;0;L;;;;;N;;;;0459;
+040A;CYRILLIC CAPITAL LETTER NJE;Lu;0;L;;;;;N;;;;045A;
+040B;CYRILLIC CAPITAL LETTER TSHE;Lu;0;L;;;;;N;;Serbocroatian;;045B;
+040C;CYRILLIC CAPITAL LETTER KJE;Lu;0;L;041A 0301;;;;N;;;;045C;
+040D;CYRILLIC CAPITAL LETTER I WITH GRAVE;Lu;0;L;0418 0300;;;;N;;;;045D;
+040E;CYRILLIC CAPITAL LETTER SHORT U;Lu;0;L;0423 0306;;;;N;;Byelorussian;;045E;
+040F;CYRILLIC CAPITAL LETTER DZHE;Lu;0;L;;;;;N;;;;045F;
+0410;CYRILLIC CAPITAL LETTER A;Lu;0;L;;;;;N;;;;0430;
+0411;CYRILLIC CAPITAL LETTER BE;Lu;0;L;;;;;N;;;;0431;
+0412;CYRILLIC CAPITAL LETTER VE;Lu;0;L;;;;;N;;;;0432;
+0413;CYRILLIC CAPITAL LETTER GHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE;;;0433;
+0414;CYRILLIC CAPITAL LETTER DE;Lu;0;L;;;;;N;;;;0434;
+0415;CYRILLIC CAPITAL LETTER IE;Lu;0;L;;;;;N;;;;0435;
+0416;CYRILLIC CAPITAL LETTER ZHE;Lu;0;L;;;;;N;;;;0436;
+0417;CYRILLIC CAPITAL LETTER ZE;Lu;0;L;;;;;N;;;;0437;
+0418;CYRILLIC CAPITAL LETTER I;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER II;;;0438;
+0419;CYRILLIC CAPITAL LETTER SHORT I;Lu;0;L;0418 0306;;;;N;CYRILLIC CAPITAL LETTER SHORT II;;;0439;
+041A;CYRILLIC CAPITAL LETTER KA;Lu;0;L;;;;;N;;;;043A;
+041B;CYRILLIC CAPITAL LETTER EL;Lu;0;L;;;;;N;;;;043B;
+041C;CYRILLIC CAPITAL LETTER EM;Lu;0;L;;;;;N;;;;043C;
+041D;CYRILLIC CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;043D;
+041E;CYRILLIC CAPITAL LETTER O;Lu;0;L;;;;;N;;;;043E;
+041F;CYRILLIC CAPITAL LETTER PE;Lu;0;L;;;;;N;;;;043F;
+0420;CYRILLIC CAPITAL LETTER ER;Lu;0;L;;;;;N;;;;0440;
+0421;CYRILLIC CAPITAL LETTER ES;Lu;0;L;;;;;N;;;;0441;
+0422;CYRILLIC CAPITAL LETTER TE;Lu;0;L;;;;;N;;;;0442;
+0423;CYRILLIC CAPITAL LETTER U;Lu;0;L;;;;;N;;;;0443;
+0424;CYRILLIC CAPITAL LETTER EF;Lu;0;L;;;;;N;;;;0444;
+0425;CYRILLIC CAPITAL LETTER HA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KHA;;;0445;
+0426;CYRILLIC CAPITAL LETTER TSE;Lu;0;L;;;;;N;;;;0446;
+0427;CYRILLIC CAPITAL LETTER CHE;Lu;0;L;;;;;N;;;;0447;
+0428;CYRILLIC CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;0448;
+0429;CYRILLIC CAPITAL LETTER SHCHA;Lu;0;L;;;;;N;;;;0449;
+042A;CYRILLIC CAPITAL LETTER HARD SIGN;Lu;0;L;;;;;N;;;;044A;
+042B;CYRILLIC CAPITAL LETTER YERU;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER YERI;;;044B;
+042C;CYRILLIC CAPITAL LETTER SOFT SIGN;Lu;0;L;;;;;N;;;;044C;
+042D;CYRILLIC CAPITAL LETTER E;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER REVERSED E;;;044D;
+042E;CYRILLIC CAPITAL LETTER YU;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IU;;;044E;
+042F;CYRILLIC CAPITAL LETTER YA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IA;;;044F;
+0430;CYRILLIC SMALL LETTER A;Ll;0;L;;;;;N;;;0410;;0410
+0431;CYRILLIC SMALL LETTER BE;Ll;0;L;;;;;N;;;0411;;0411
+0432;CYRILLIC SMALL LETTER VE;Ll;0;L;;;;;N;;;0412;;0412
+0433;CYRILLIC SMALL LETTER GHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE;;0413;;0413
+0434;CYRILLIC SMALL LETTER DE;Ll;0;L;;;;;N;;;0414;;0414
+0435;CYRILLIC SMALL LETTER IE;Ll;0;L;;;;;N;;;0415;;0415
+0436;CYRILLIC SMALL LETTER ZHE;Ll;0;L;;;;;N;;;0416;;0416
+0437;CYRILLIC SMALL LETTER ZE;Ll;0;L;;;;;N;;;0417;;0417
+0438;CYRILLIC SMALL LETTER I;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER II;;0418;;0418
+0439;CYRILLIC SMALL LETTER SHORT I;Ll;0;L;0438 0306;;;;N;CYRILLIC SMALL LETTER SHORT II;;0419;;0419
+043A;CYRILLIC SMALL LETTER KA;Ll;0;L;;;;;N;;;041A;;041A
+043B;CYRILLIC SMALL LETTER EL;Ll;0;L;;;;;N;;;041B;;041B
+043C;CYRILLIC SMALL LETTER EM;Ll;0;L;;;;;N;;;041C;;041C
+043D;CYRILLIC SMALL LETTER EN;Ll;0;L;;;;;N;;;041D;;041D
+043E;CYRILLIC SMALL LETTER O;Ll;0;L;;;;;N;;;041E;;041E
+043F;CYRILLIC SMALL LETTER PE;Ll;0;L;;;;;N;;;041F;;041F
+0440;CYRILLIC SMALL LETTER ER;Ll;0;L;;;;;N;;;0420;;0420
+0441;CYRILLIC SMALL LETTER ES;Ll;0;L;;;;;N;;;0421;;0421
+0442;CYRILLIC SMALL LETTER TE;Ll;0;L;;;;;N;;;0422;;0422
+0443;CYRILLIC SMALL LETTER U;Ll;0;L;;;;;N;;;0423;;0423
+0444;CYRILLIC SMALL LETTER EF;Ll;0;L;;;;;N;;;0424;;0424
+0445;CYRILLIC SMALL LETTER HA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KHA;;0425;;0425
+0446;CYRILLIC SMALL LETTER TSE;Ll;0;L;;;;;N;;;0426;;0426
+0447;CYRILLIC SMALL LETTER CHE;Ll;0;L;;;;;N;;;0427;;0427
+0448;CYRILLIC SMALL LETTER SHA;Ll;0;L;;;;;N;;;0428;;0428
+0449;CYRILLIC SMALL LETTER SHCHA;Ll;0;L;;;;;N;;;0429;;0429
+044A;CYRILLIC SMALL LETTER HARD SIGN;Ll;0;L;;;;;N;;;042A;;042A
+044B;CYRILLIC SMALL LETTER YERU;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER YERI;;042B;;042B
+044C;CYRILLIC SMALL LETTER SOFT SIGN;Ll;0;L;;;;;N;;;042C;;042C
+044D;CYRILLIC SMALL LETTER E;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER REVERSED E;;042D;;042D
+044E;CYRILLIC SMALL LETTER YU;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IU;;042E;;042E
+044F;CYRILLIC SMALL LETTER YA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IA;;042F;;042F
+0450;CYRILLIC SMALL LETTER IE WITH GRAVE;Ll;0;L;0435 0300;;;;N;;;0400;;0400
+0451;CYRILLIC SMALL LETTER IO;Ll;0;L;0435 0308;;;;N;;;0401;;0401
+0452;CYRILLIC SMALL LETTER DJE;Ll;0;L;;;;;N;;Serbocroatian;0402;;0402
+0453;CYRILLIC SMALL LETTER GJE;Ll;0;L;0433 0301;;;;N;;;0403;;0403
+0454;CYRILLIC SMALL LETTER UKRAINIAN IE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER E;;0404;;0404
+0455;CYRILLIC SMALL LETTER DZE;Ll;0;L;;;;;N;;;0405;;0405
+0456;CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER I;;0406;;0406
+0457;CYRILLIC SMALL LETTER YI;Ll;0;L;0456 0308;;;;N;;Ukrainian;0407;;0407
+0458;CYRILLIC SMALL LETTER JE;Ll;0;L;;;;;N;;;0408;;0408
+0459;CYRILLIC SMALL LETTER LJE;Ll;0;L;;;;;N;;;0409;;0409
+045A;CYRILLIC SMALL LETTER NJE;Ll;0;L;;;;;N;;;040A;;040A
+045B;CYRILLIC SMALL LETTER TSHE;Ll;0;L;;;;;N;;Serbocroatian;040B;;040B
+045C;CYRILLIC SMALL LETTER KJE;Ll;0;L;043A 0301;;;;N;;;040C;;040C
+045D;CYRILLIC SMALL LETTER I WITH GRAVE;Ll;0;L;0438 0300;;;;N;;;040D;;040D
+045E;CYRILLIC SMALL LETTER SHORT U;Ll;0;L;0443 0306;;;;N;;Byelorussian;040E;;040E
+045F;CYRILLIC SMALL LETTER DZHE;Ll;0;L;;;;;N;;;040F;;040F
+0460;CYRILLIC CAPITAL LETTER OMEGA;Lu;0;L;;;;;N;;;;0461;
+0461;CYRILLIC SMALL LETTER OMEGA;Ll;0;L;;;;;N;;;0460;;0460
+0462;CYRILLIC CAPITAL LETTER YAT;Lu;0;L;;;;;N;;;;0463;
+0463;CYRILLIC SMALL LETTER YAT;Ll;0;L;;;;;N;;;0462;;0462
+0464;CYRILLIC CAPITAL LETTER IOTIFIED E;Lu;0;L;;;;;N;;;;0465;
+0465;CYRILLIC SMALL LETTER IOTIFIED E;Ll;0;L;;;;;N;;;0464;;0464
+0466;CYRILLIC CAPITAL LETTER LITTLE YUS;Lu;0;L;;;;;N;;;;0467;
+0467;CYRILLIC SMALL LETTER LITTLE YUS;Ll;0;L;;;;;N;;;0466;;0466
+0468;CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS;Lu;0;L;;;;;N;;;;0469;
+0469;CYRILLIC SMALL LETTER IOTIFIED LITTLE YUS;Ll;0;L;;;;;N;;;0468;;0468
+046A;CYRILLIC CAPITAL LETTER BIG YUS;Lu;0;L;;;;;N;;;;046B;
+046B;CYRILLIC SMALL LETTER BIG YUS;Ll;0;L;;;;;N;;;046A;;046A
+046C;CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS;Lu;0;L;;;;;N;;;;046D;
+046D;CYRILLIC SMALL LETTER IOTIFIED BIG YUS;Ll;0;L;;;;;N;;;046C;;046C
+046E;CYRILLIC CAPITAL LETTER KSI;Lu;0;L;;;;;N;;;;046F;
+046F;CYRILLIC SMALL LETTER KSI;Ll;0;L;;;;;N;;;046E;;046E
+0470;CYRILLIC CAPITAL LETTER PSI;Lu;0;L;;;;;N;;;;0471;
+0471;CYRILLIC SMALL LETTER PSI;Ll;0;L;;;;;N;;;0470;;0470
+0472;CYRILLIC CAPITAL LETTER FITA;Lu;0;L;;;;;N;;;;0473;
+0473;CYRILLIC SMALL LETTER FITA;Ll;0;L;;;;;N;;;0472;;0472
+0474;CYRILLIC CAPITAL LETTER IZHITSA;Lu;0;L;;;;;N;;;;0475;
+0475;CYRILLIC SMALL LETTER IZHITSA;Ll;0;L;;;;;N;;;0474;;0474
+0476;CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT;Lu;0;L;0474 030F;;;;N;CYRILLIC CAPITAL LETTER IZHITSA DOUBLE GRAVE;;;0477;
+0477;CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT;Ll;0;L;0475 030F;;;;N;CYRILLIC SMALL LETTER IZHITSA DOUBLE GRAVE;;0476;;0476
+0478;CYRILLIC CAPITAL LETTER UK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER UK DIGRAPH;;;0479;
+0479;CYRILLIC SMALL LETTER UK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER UK DIGRAPH;;0478;;0478
+047A;CYRILLIC CAPITAL LETTER ROUND OMEGA;Lu;0;L;;;;;N;;;;047B;
+047B;CYRILLIC SMALL LETTER ROUND OMEGA;Ll;0;L;;;;;N;;;047A;;047A
+047C;CYRILLIC CAPITAL LETTER OMEGA WITH TITLO;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER OMEGA TITLO;;;047D;
+047D;CYRILLIC SMALL LETTER OMEGA WITH TITLO;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER OMEGA TITLO;;047C;;047C
+047E;CYRILLIC CAPITAL LETTER OT;Lu;0;L;;;;;N;;;;047F;
+047F;CYRILLIC SMALL LETTER OT;Ll;0;L;;;;;N;;;047E;;047E
+0480;CYRILLIC CAPITAL LETTER KOPPA;Lu;0;L;;;;;N;;;;0481;
+0481;CYRILLIC SMALL LETTER KOPPA;Ll;0;L;;;;;N;;;0480;;0480
+0482;CYRILLIC THOUSANDS SIGN;So;0;L;;;;;N;;;;;
+0483;COMBINING CYRILLIC TITLO;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING TITLO;;;;
+0484;COMBINING CYRILLIC PALATALIZATION;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING PALATALIZATION;;;;
+0485;COMBINING CYRILLIC DASIA PNEUMATA;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING DASIA PNEUMATA;;;;
+0486;COMBINING CYRILLIC PSILI PNEUMATA;Mn;230;NSM;;;;;N;CYRILLIC NON-SPACING PSILI PNEUMATA;;;;
+0487;COMBINING CYRILLIC POKRYTIE;Mn;230;NSM;;;;;N;;;;;
+0488;COMBINING CYRILLIC HUNDRED THOUSANDS SIGN;Me;0;NSM;;;;;N;;;;;
+0489;COMBINING CYRILLIC MILLIONS SIGN;Me;0;NSM;;;;;N;;;;;
+048A;CYRILLIC CAPITAL LETTER SHORT I WITH TAIL;Lu;0;L;;;;;N;;;;048B;
+048B;CYRILLIC SMALL LETTER SHORT I WITH TAIL;Ll;0;L;;;;;N;;;048A;;048A
+048C;CYRILLIC CAPITAL LETTER SEMISOFT SIGN;Lu;0;L;;;;;N;;;;048D;
+048D;CYRILLIC SMALL LETTER SEMISOFT SIGN;Ll;0;L;;;;;N;;;048C;;048C
+048E;CYRILLIC CAPITAL LETTER ER WITH TICK;Lu;0;L;;;;;N;;;;048F;
+048F;CYRILLIC SMALL LETTER ER WITH TICK;Ll;0;L;;;;;N;;;048E;;048E
+0490;CYRILLIC CAPITAL LETTER GHE WITH UPTURN;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE WITH UPTURN;;;0491;
+0491;CYRILLIC SMALL LETTER GHE WITH UPTURN;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE WITH UPTURN;;0490;;0490
+0492;CYRILLIC CAPITAL LETTER GHE WITH STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE BAR;;;0493;
+0493;CYRILLIC SMALL LETTER GHE WITH STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE BAR;;0492;;0492
+0494;CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER GE HOOK;;;0495;
+0495;CYRILLIC SMALL LETTER GHE WITH MIDDLE HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER GE HOOK;;0494;;0494
+0496;CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER ZHE WITH RIGHT DESCENDER;;;0497;
+0497;CYRILLIC SMALL LETTER ZHE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER ZHE WITH RIGHT DESCENDER;;0496;;0496
+0498;CYRILLIC CAPITAL LETTER ZE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER ZE CEDILLA;;;0499;
+0499;CYRILLIC SMALL LETTER ZE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER ZE CEDILLA;;0498;;0498
+049A;CYRILLIC CAPITAL LETTER KA WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA WITH RIGHT DESCENDER;;;049B;
+049B;CYRILLIC SMALL LETTER KA WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA WITH RIGHT DESCENDER;;049A;;049A
+049C;CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA VERTICAL BAR;;;049D;
+049D;CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA VERTICAL BAR;;049C;;049C
+049E;CYRILLIC CAPITAL LETTER KA WITH STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA BAR;;;049F;
+049F;CYRILLIC SMALL LETTER KA WITH STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA BAR;;049E;;049E
+04A0;CYRILLIC CAPITAL LETTER BASHKIR KA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER REVERSED GE KA;;;04A1;
+04A1;CYRILLIC SMALL LETTER BASHKIR KA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER REVERSED GE KA;;04A0;;04A0
+04A2;CYRILLIC CAPITAL LETTER EN WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER EN WITH RIGHT DESCENDER;;;04A3;
+04A3;CYRILLIC SMALL LETTER EN WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN WITH RIGHT DESCENDER;;04A2;;04A2
+04A4;CYRILLIC CAPITAL LIGATURE EN GHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER EN GE;;;04A5;
+04A5;CYRILLIC SMALL LIGATURE EN GHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN GE;;04A4;;04A4
+04A6;CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER PE HOOK;Abkhasian;;04A7;
+04A7;CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER PE HOOK;Abkhasian;04A6;;04A6
+04A8;CYRILLIC CAPITAL LETTER ABKHASIAN HA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER O HOOK;;;04A9;
+04A9;CYRILLIC SMALL LETTER ABKHASIAN HA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER O HOOK;;04A8;;04A8
+04AA;CYRILLIC CAPITAL LETTER ES WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER ES CEDILLA;;;04AB;
+04AB;CYRILLIC SMALL LETTER ES WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER ES CEDILLA;;04AA;;04AA
+04AC;CYRILLIC CAPITAL LETTER TE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER TE WITH RIGHT DESCENDER;;;04AD;
+04AD;CYRILLIC SMALL LETTER TE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER TE WITH RIGHT DESCENDER;;04AC;;04AC
+04AE;CYRILLIC CAPITAL LETTER STRAIGHT U;Lu;0;L;;;;;N;;;;04AF;
+04AF;CYRILLIC SMALL LETTER STRAIGHT U;Ll;0;L;;;;;N;;;04AE;;04AE
+04B0;CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER STRAIGHT U BAR;;;04B1;
+04B1;CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER STRAIGHT U BAR;;04B0;;04B0
+04B2;CYRILLIC CAPITAL LETTER HA WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KHA WITH RIGHT DESCENDER;;;04B3;
+04B3;CYRILLIC SMALL LETTER HA WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KHA WITH RIGHT DESCENDER;;04B2;;04B2
+04B4;CYRILLIC CAPITAL LIGATURE TE TSE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER TE TSE;Abkhasian;;04B5;
+04B5;CYRILLIC SMALL LIGATURE TE TSE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER TE TSE;Abkhasian;04B4;;04B4
+04B6;CYRILLIC CAPITAL LETTER CHE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE WITH RIGHT DESCENDER;;;04B7;
+04B7;CYRILLIC SMALL LETTER CHE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER CHE WITH RIGHT DESCENDER;;04B6;;04B6
+04B8;CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE VERTICAL BAR;;;04B9;
+04B9;CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER CHE VERTICAL BAR;;04B8;;04B8
+04BA;CYRILLIC CAPITAL LETTER SHHA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER H;;;04BB;
+04BB;CYRILLIC SMALL LETTER SHHA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER H;;04BA;;04BA
+04BC;CYRILLIC CAPITAL LETTER ABKHASIAN CHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IE HOOK;;;04BD;
+04BD;CYRILLIC SMALL LETTER ABKHASIAN CHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IE HOOK;;04BC;;04BC
+04BE;CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER IE HOOK OGONEK;;;04BF;
+04BF;CYRILLIC SMALL LETTER ABKHASIAN CHE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IE HOOK OGONEK;;04BE;;04BE
+04C0;CYRILLIC LETTER PALOCHKA;Lu;0;L;;;;;N;CYRILLIC LETTER I;;;04CF;
+04C1;CYRILLIC CAPITAL LETTER ZHE WITH BREVE;Lu;0;L;0416 0306;;;;N;CYRILLIC CAPITAL LETTER SHORT ZHE;;;04C2;
+04C2;CYRILLIC SMALL LETTER ZHE WITH BREVE;Ll;0;L;0436 0306;;;;N;CYRILLIC SMALL LETTER SHORT ZHE;;04C1;;04C1
+04C3;CYRILLIC CAPITAL LETTER KA WITH HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KA HOOK;;;04C4;
+04C4;CYRILLIC SMALL LETTER KA WITH HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KA HOOK;;04C3;;04C3
+04C5;CYRILLIC CAPITAL LETTER EL WITH TAIL;Lu;0;L;;;;;N;;;;04C6;
+04C6;CYRILLIC SMALL LETTER EL WITH TAIL;Ll;0;L;;;;;N;;;04C5;;04C5
+04C7;CYRILLIC CAPITAL LETTER EN WITH HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER EN HOOK;;;04C8;
+04C8;CYRILLIC SMALL LETTER EN WITH HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN HOOK;;04C7;;04C7
+04C9;CYRILLIC CAPITAL LETTER EN WITH TAIL;Lu;0;L;;;;;N;;;;04CA;
+04CA;CYRILLIC SMALL LETTER EN WITH TAIL;Ll;0;L;;;;;N;;;04C9;;04C9
+04CB;CYRILLIC CAPITAL LETTER KHAKASSIAN CHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE WITH LEFT DESCENDER;;;04CC;
+04CC;CYRILLIC SMALL LETTER KHAKASSIAN CHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER CHE WITH LEFT DESCENDER;;04CB;;04CB
+04CD;CYRILLIC CAPITAL LETTER EM WITH TAIL;Lu;0;L;;;;;N;;;;04CE;
+04CE;CYRILLIC SMALL LETTER EM WITH TAIL;Ll;0;L;;;;;N;;;04CD;;04CD
+04CF;CYRILLIC SMALL LETTER PALOCHKA;Ll;0;L;;;;;N;;;04C0;;04C0
+04D0;CYRILLIC CAPITAL LETTER A WITH BREVE;Lu;0;L;0410 0306;;;;N;;;;04D1;
+04D1;CYRILLIC SMALL LETTER A WITH BREVE;Ll;0;L;0430 0306;;;;N;;;04D0;;04D0
+04D2;CYRILLIC CAPITAL LETTER A WITH DIAERESIS;Lu;0;L;0410 0308;;;;N;;;;04D3;
+04D3;CYRILLIC SMALL LETTER A WITH DIAERESIS;Ll;0;L;0430 0308;;;;N;;;04D2;;04D2
+04D4;CYRILLIC CAPITAL LIGATURE A IE;Lu;0;L;;;;;N;;;;04D5;
+04D5;CYRILLIC SMALL LIGATURE A IE;Ll;0;L;;;;;N;;;04D4;;04D4
+04D6;CYRILLIC CAPITAL LETTER IE WITH BREVE;Lu;0;L;0415 0306;;;;N;;;;04D7;
+04D7;CYRILLIC SMALL LETTER IE WITH BREVE;Ll;0;L;0435 0306;;;;N;;;04D6;;04D6
+04D8;CYRILLIC CAPITAL LETTER SCHWA;Lu;0;L;;;;;N;;;;04D9;
+04D9;CYRILLIC SMALL LETTER SCHWA;Ll;0;L;;;;;N;;;04D8;;04D8
+04DA;CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS;Lu;0;L;04D8 0308;;;;N;;;;04DB;
+04DB;CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS;Ll;0;L;04D9 0308;;;;N;;;04DA;;04DA
+04DC;CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS;Lu;0;L;0416 0308;;;;N;;;;04DD;
+04DD;CYRILLIC SMALL LETTER ZHE WITH DIAERESIS;Ll;0;L;0436 0308;;;;N;;;04DC;;04DC
+04DE;CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS;Lu;0;L;0417 0308;;;;N;;;;04DF;
+04DF;CYRILLIC SMALL LETTER ZE WITH DIAERESIS;Ll;0;L;0437 0308;;;;N;;;04DE;;04DE
+04E0;CYRILLIC CAPITAL LETTER ABKHASIAN DZE;Lu;0;L;;;;;N;;;;04E1;
+04E1;CYRILLIC SMALL LETTER ABKHASIAN DZE;Ll;0;L;;;;;N;;;04E0;;04E0
+04E2;CYRILLIC CAPITAL LETTER I WITH MACRON;Lu;0;L;0418 0304;;;;N;;;;04E3;
+04E3;CYRILLIC SMALL LETTER I WITH MACRON;Ll;0;L;0438 0304;;;;N;;;04E2;;04E2
+04E4;CYRILLIC CAPITAL LETTER I WITH DIAERESIS;Lu;0;L;0418 0308;;;;N;;;;04E5;
+04E5;CYRILLIC SMALL LETTER I WITH DIAERESIS;Ll;0;L;0438 0308;;;;N;;;04E4;;04E4
+04E6;CYRILLIC CAPITAL LETTER O WITH DIAERESIS;Lu;0;L;041E 0308;;;;N;;;;04E7;
+04E7;CYRILLIC SMALL LETTER O WITH DIAERESIS;Ll;0;L;043E 0308;;;;N;;;04E6;;04E6
+04E8;CYRILLIC CAPITAL LETTER BARRED O;Lu;0;L;;;;;N;;;;04E9;
+04E9;CYRILLIC SMALL LETTER BARRED O;Ll;0;L;;;;;N;;;04E8;;04E8
+04EA;CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS;Lu;0;L;04E8 0308;;;;N;;;;04EB;
+04EB;CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS;Ll;0;L;04E9 0308;;;;N;;;04EA;;04EA
+04EC;CYRILLIC CAPITAL LETTER E WITH DIAERESIS;Lu;0;L;042D 0308;;;;N;;;;04ED;
+04ED;CYRILLIC SMALL LETTER E WITH DIAERESIS;Ll;0;L;044D 0308;;;;N;;;04EC;;04EC
+04EE;CYRILLIC CAPITAL LETTER U WITH MACRON;Lu;0;L;0423 0304;;;;N;;;;04EF;
+04EF;CYRILLIC SMALL LETTER U WITH MACRON;Ll;0;L;0443 0304;;;;N;;;04EE;;04EE
+04F0;CYRILLIC CAPITAL LETTER U WITH DIAERESIS;Lu;0;L;0423 0308;;;;N;;;;04F1;
+04F1;CYRILLIC SMALL LETTER U WITH DIAERESIS;Ll;0;L;0443 0308;;;;N;;;04F0;;04F0
+04F2;CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE;Lu;0;L;0423 030B;;;;N;;;;04F3;
+04F3;CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE;Ll;0;L;0443 030B;;;;N;;;04F2;;04F2
+04F4;CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS;Lu;0;L;0427 0308;;;;N;;;;04F5;
+04F5;CYRILLIC SMALL LETTER CHE WITH DIAERESIS;Ll;0;L;0447 0308;;;;N;;;04F4;;04F4
+04F6;CYRILLIC CAPITAL LETTER GHE WITH DESCENDER;Lu;0;L;;;;;N;;;;04F7;
+04F7;CYRILLIC SMALL LETTER GHE WITH DESCENDER;Ll;0;L;;;;;N;;;04F6;;04F6
+04F8;CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS;Lu;0;L;042B 0308;;;;N;;;;04F9;
+04F9;CYRILLIC SMALL LETTER YERU WITH DIAERESIS;Ll;0;L;044B 0308;;;;N;;;04F8;;04F8
+04FA;CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK;Lu;0;L;;;;;N;;;;04FB;
+04FB;CYRILLIC SMALL LETTER GHE WITH STROKE AND HOOK;Ll;0;L;;;;;N;;;04FA;;04FA
+04FC;CYRILLIC CAPITAL LETTER HA WITH HOOK;Lu;0;L;;;;;N;;;;04FD;
+04FD;CYRILLIC SMALL LETTER HA WITH HOOK;Ll;0;L;;;;;N;;;04FC;;04FC
+04FE;CYRILLIC CAPITAL LETTER HA WITH STROKE;Lu;0;L;;;;;N;;;;04FF;
+04FF;CYRILLIC SMALL LETTER HA WITH STROKE;Ll;0;L;;;;;N;;;04FE;;04FE
+0500;CYRILLIC CAPITAL LETTER KOMI DE;Lu;0;L;;;;;N;;;;0501;
+0501;CYRILLIC SMALL LETTER KOMI DE;Ll;0;L;;;;;N;;;0500;;0500
+0502;CYRILLIC CAPITAL LETTER KOMI DJE;Lu;0;L;;;;;N;;;;0503;
+0503;CYRILLIC SMALL LETTER KOMI DJE;Ll;0;L;;;;;N;;;0502;;0502
+0504;CYRILLIC CAPITAL LETTER KOMI ZJE;Lu;0;L;;;;;N;;;;0505;
+0505;CYRILLIC SMALL LETTER KOMI ZJE;Ll;0;L;;;;;N;;;0504;;0504
+0506;CYRILLIC CAPITAL LETTER KOMI DZJE;Lu;0;L;;;;;N;;;;0507;
+0507;CYRILLIC SMALL LETTER KOMI DZJE;Ll;0;L;;;;;N;;;0506;;0506
+0508;CYRILLIC CAPITAL LETTER KOMI LJE;Lu;0;L;;;;;N;;;;0509;
+0509;CYRILLIC SMALL LETTER KOMI LJE;Ll;0;L;;;;;N;;;0508;;0508
+050A;CYRILLIC CAPITAL LETTER KOMI NJE;Lu;0;L;;;;;N;;;;050B;
+050B;CYRILLIC SMALL LETTER KOMI NJE;Ll;0;L;;;;;N;;;050A;;050A
+050C;CYRILLIC CAPITAL LETTER KOMI SJE;Lu;0;L;;;;;N;;;;050D;
+050D;CYRILLIC SMALL LETTER KOMI SJE;Ll;0;L;;;;;N;;;050C;;050C
+050E;CYRILLIC CAPITAL LETTER KOMI TJE;Lu;0;L;;;;;N;;;;050F;
+050F;CYRILLIC SMALL LETTER KOMI TJE;Ll;0;L;;;;;N;;;050E;;050E
+0510;CYRILLIC CAPITAL LETTER REVERSED ZE;Lu;0;L;;;;;N;;;;0511;
+0511;CYRILLIC SMALL LETTER REVERSED ZE;Ll;0;L;;;;;N;;;0510;;0510
+0512;CYRILLIC CAPITAL LETTER EL WITH HOOK;Lu;0;L;;;;;N;;;;0513;
+0513;CYRILLIC SMALL LETTER EL WITH HOOK;Ll;0;L;;;;;N;;;0512;;0512
+0514;CYRILLIC CAPITAL LETTER LHA;Lu;0;L;;;;;N;;;;0515;
+0515;CYRILLIC SMALL LETTER LHA;Ll;0;L;;;;;N;;;0514;;0514
+0516;CYRILLIC CAPITAL LETTER RHA;Lu;0;L;;;;;N;;;;0517;
+0517;CYRILLIC SMALL LETTER RHA;Ll;0;L;;;;;N;;;0516;;0516
+0518;CYRILLIC CAPITAL LETTER YAE;Lu;0;L;;;;;N;;;;0519;
+0519;CYRILLIC SMALL LETTER YAE;Ll;0;L;;;;;N;;;0518;;0518
+051A;CYRILLIC CAPITAL LETTER QA;Lu;0;L;;;;;N;;;;051B;
+051B;CYRILLIC SMALL LETTER QA;Ll;0;L;;;;;N;;;051A;;051A
+051C;CYRILLIC CAPITAL LETTER WE;Lu;0;L;;;;;N;;;;051D;
+051D;CYRILLIC SMALL LETTER WE;Ll;0;L;;;;;N;;;051C;;051C
+051E;CYRILLIC CAPITAL LETTER ALEUT KA;Lu;0;L;;;;;N;;;;051F;
+051F;CYRILLIC SMALL LETTER ALEUT KA;Ll;0;L;;;;;N;;;051E;;051E
+0520;CYRILLIC CAPITAL LETTER EL WITH MIDDLE HOOK;Lu;0;L;;;;;N;;;;0521;
+0521;CYRILLIC SMALL LETTER EL WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;0520;;0520
+0522;CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK;Lu;0;L;;;;;N;;;;0523;
+0523;CYRILLIC SMALL LETTER EN WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;0522;;0522
+0531;ARMENIAN CAPITAL LETTER AYB;Lu;0;L;;;;;N;;;;0561;
+0532;ARMENIAN CAPITAL LETTER BEN;Lu;0;L;;;;;N;;;;0562;
+0533;ARMENIAN CAPITAL LETTER GIM;Lu;0;L;;;;;N;;;;0563;
+0534;ARMENIAN CAPITAL LETTER DA;Lu;0;L;;;;;N;;;;0564;
+0535;ARMENIAN CAPITAL LETTER ECH;Lu;0;L;;;;;N;;;;0565;
+0536;ARMENIAN CAPITAL LETTER ZA;Lu;0;L;;;;;N;;;;0566;
+0537;ARMENIAN CAPITAL LETTER EH;Lu;0;L;;;;;N;;;;0567;
+0538;ARMENIAN CAPITAL LETTER ET;Lu;0;L;;;;;N;;;;0568;
+0539;ARMENIAN CAPITAL LETTER TO;Lu;0;L;;;;;N;;;;0569;
+053A;ARMENIAN CAPITAL LETTER ZHE;Lu;0;L;;;;;N;;;;056A;
+053B;ARMENIAN CAPITAL LETTER INI;Lu;0;L;;;;;N;;;;056B;
+053C;ARMENIAN CAPITAL LETTER LIWN;Lu;0;L;;;;;N;;;;056C;
+053D;ARMENIAN CAPITAL LETTER XEH;Lu;0;L;;;;;N;;;;056D;
+053E;ARMENIAN CAPITAL LETTER CA;Lu;0;L;;;;;N;;;;056E;
+053F;ARMENIAN CAPITAL LETTER KEN;Lu;0;L;;;;;N;;;;056F;
+0540;ARMENIAN CAPITAL LETTER HO;Lu;0;L;;;;;N;;;;0570;
+0541;ARMENIAN CAPITAL LETTER JA;Lu;0;L;;;;;N;;;;0571;
+0542;ARMENIAN CAPITAL LETTER GHAD;Lu;0;L;;;;;N;ARMENIAN CAPITAL LETTER LAD;;;0572;
+0543;ARMENIAN CAPITAL LETTER CHEH;Lu;0;L;;;;;N;;;;0573;
+0544;ARMENIAN CAPITAL LETTER MEN;Lu;0;L;;;;;N;;;;0574;
+0545;ARMENIAN CAPITAL LETTER YI;Lu;0;L;;;;;N;;;;0575;
+0546;ARMENIAN CAPITAL LETTER NOW;Lu;0;L;;;;;N;;;;0576;
+0547;ARMENIAN CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;0577;
+0548;ARMENIAN CAPITAL LETTER VO;Lu;0;L;;;;;N;;;;0578;
+0549;ARMENIAN CAPITAL LETTER CHA;Lu;0;L;;;;;N;;;;0579;
+054A;ARMENIAN CAPITAL LETTER PEH;Lu;0;L;;;;;N;;;;057A;
+054B;ARMENIAN CAPITAL LETTER JHEH;Lu;0;L;;;;;N;;;;057B;
+054C;ARMENIAN CAPITAL LETTER RA;Lu;0;L;;;;;N;;;;057C;
+054D;ARMENIAN CAPITAL LETTER SEH;Lu;0;L;;;;;N;;;;057D;
+054E;ARMENIAN CAPITAL LETTER VEW;Lu;0;L;;;;;N;;;;057E;
+054F;ARMENIAN CAPITAL LETTER TIWN;Lu;0;L;;;;;N;;;;057F;
+0550;ARMENIAN CAPITAL LETTER REH;Lu;0;L;;;;;N;;;;0580;
+0551;ARMENIAN CAPITAL LETTER CO;Lu;0;L;;;;;N;;;;0581;
+0552;ARMENIAN CAPITAL LETTER YIWN;Lu;0;L;;;;;N;;;;0582;
+0553;ARMENIAN CAPITAL LETTER PIWR;Lu;0;L;;;;;N;;;;0583;
+0554;ARMENIAN CAPITAL LETTER KEH;Lu;0;L;;;;;N;;;;0584;
+0555;ARMENIAN CAPITAL LETTER OH;Lu;0;L;;;;;N;;;;0585;
+0556;ARMENIAN CAPITAL LETTER FEH;Lu;0;L;;;;;N;;;;0586;
+0559;ARMENIAN MODIFIER LETTER LEFT HALF RING;Lm;0;L;;;;;N;;;;;
+055A;ARMENIAN APOSTROPHE;Po;0;L;;;;;N;ARMENIAN MODIFIER LETTER RIGHT HALF RING;;;;
+055B;ARMENIAN EMPHASIS MARK;Po;0;L;;;;;N;;;;;
+055C;ARMENIAN EXCLAMATION MARK;Po;0;L;;;;;N;;;;;
+055D;ARMENIAN COMMA;Po;0;L;;;;;N;;;;;
+055E;ARMENIAN QUESTION MARK;Po;0;L;;;;;N;;;;;
+055F;ARMENIAN ABBREVIATION MARK;Po;0;L;;;;;N;;;;;
+0561;ARMENIAN SMALL LETTER AYB;Ll;0;L;;;;;N;;;0531;;0531
+0562;ARMENIAN SMALL LETTER BEN;Ll;0;L;;;;;N;;;0532;;0532
+0563;ARMENIAN SMALL LETTER GIM;Ll;0;L;;;;;N;;;0533;;0533
+0564;ARMENIAN SMALL LETTER DA;Ll;0;L;;;;;N;;;0534;;0534
+0565;ARMENIAN SMALL LETTER ECH;Ll;0;L;;;;;N;;;0535;;0535
+0566;ARMENIAN SMALL LETTER ZA;Ll;0;L;;;;;N;;;0536;;0536
+0567;ARMENIAN SMALL LETTER EH;Ll;0;L;;;;;N;;;0537;;0537
+0568;ARMENIAN SMALL LETTER ET;Ll;0;L;;;;;N;;;0538;;0538
+0569;ARMENIAN SMALL LETTER TO;Ll;0;L;;;;;N;;;0539;;0539
+056A;ARMENIAN SMALL LETTER ZHE;Ll;0;L;;;;;N;;;053A;;053A
+056B;ARMENIAN SMALL LETTER INI;Ll;0;L;;;;;N;;;053B;;053B
+056C;ARMENIAN SMALL LETTER LIWN;Ll;0;L;;;;;N;;;053C;;053C
+056D;ARMENIAN SMALL LETTER XEH;Ll;0;L;;;;;N;;;053D;;053D
+056E;ARMENIAN SMALL LETTER CA;Ll;0;L;;;;;N;;;053E;;053E
+056F;ARMENIAN SMALL LETTER KEN;Ll;0;L;;;;;N;;;053F;;053F
+0570;ARMENIAN SMALL LETTER HO;Ll;0;L;;;;;N;;;0540;;0540
+0571;ARMENIAN SMALL LETTER JA;Ll;0;L;;;;;N;;;0541;;0541
+0572;ARMENIAN SMALL LETTER GHAD;Ll;0;L;;;;;N;ARMENIAN SMALL LETTER LAD;;0542;;0542
+0573;ARMENIAN SMALL LETTER CHEH;Ll;0;L;;;;;N;;;0543;;0543
+0574;ARMENIAN SMALL LETTER MEN;Ll;0;L;;;;;N;;;0544;;0544
+0575;ARMENIAN SMALL LETTER YI;Ll;0;L;;;;;N;;;0545;;0545
+0576;ARMENIAN SMALL LETTER NOW;Ll;0;L;;;;;N;;;0546;;0546
+0577;ARMENIAN SMALL LETTER SHA;Ll;0;L;;;;;N;;;0547;;0547
+0578;ARMENIAN SMALL LETTER VO;Ll;0;L;;;;;N;;;0548;;0548
+0579;ARMENIAN SMALL LETTER CHA;Ll;0;L;;;;;N;;;0549;;0549
+057A;ARMENIAN SMALL LETTER PEH;Ll;0;L;;;;;N;;;054A;;054A
+057B;ARMENIAN SMALL LETTER JHEH;Ll;0;L;;;;;N;;;054B;;054B
+057C;ARMENIAN SMALL LETTER RA;Ll;0;L;;;;;N;;;054C;;054C
+057D;ARMENIAN SMALL LETTER SEH;Ll;0;L;;;;;N;;;054D;;054D
+057E;ARMENIAN SMALL LETTER VEW;Ll;0;L;;;;;N;;;054E;;054E
+057F;ARMENIAN SMALL LETTER TIWN;Ll;0;L;;;;;N;;;054F;;054F
+0580;ARMENIAN SMALL LETTER REH;Ll;0;L;;;;;N;;;0550;;0550
+0581;ARMENIAN SMALL LETTER CO;Ll;0;L;;;;;N;;;0551;;0551
+0582;ARMENIAN SMALL LETTER YIWN;Ll;0;L;;;;;N;;;0552;;0552
+0583;ARMENIAN SMALL LETTER PIWR;Ll;0;L;;;;;N;;;0553;;0553
+0584;ARMENIAN SMALL LETTER KEH;Ll;0;L;;;;;N;;;0554;;0554
+0585;ARMENIAN SMALL LETTER OH;Ll;0;L;;;;;N;;;0555;;0555
+0586;ARMENIAN SMALL LETTER FEH;Ll;0;L;;;;;N;;;0556;;0556
+0587;ARMENIAN SMALL LIGATURE ECH YIWN;Ll;0;L;<compat> 0565 0582;;;;N;;;;;
+0589;ARMENIAN FULL STOP;Po;0;L;;;;;N;ARMENIAN PERIOD;;;;
+058A;ARMENIAN HYPHEN;Pd;0;ON;;;;;N;;;;;
+0591;HEBREW ACCENT ETNAHTA;Mn;220;NSM;;;;;N;;;;;
+0592;HEBREW ACCENT SEGOL;Mn;230;NSM;;;;;N;;;;;
+0593;HEBREW ACCENT SHALSHELET;Mn;230;NSM;;;;;N;;;;;
+0594;HEBREW ACCENT ZAQEF QATAN;Mn;230;NSM;;;;;N;;;;;
+0595;HEBREW ACCENT ZAQEF GADOL;Mn;230;NSM;;;;;N;;;;;
+0596;HEBREW ACCENT TIPEHA;Mn;220;NSM;;;;;N;;*;;;
+0597;HEBREW ACCENT REVIA;Mn;230;NSM;;;;;N;;;;;
+0598;HEBREW ACCENT ZARQA;Mn;230;NSM;;;;;N;;*;;;
+0599;HEBREW ACCENT PASHTA;Mn;230;NSM;;;;;N;;;;;
+059A;HEBREW ACCENT YETIV;Mn;222;NSM;;;;;N;;;;;
+059B;HEBREW ACCENT TEVIR;Mn;220;NSM;;;;;N;;;;;
+059C;HEBREW ACCENT GERESH;Mn;230;NSM;;;;;N;;;;;
+059D;HEBREW ACCENT GERESH MUQDAM;Mn;230;NSM;;;;;N;;;;;
+059E;HEBREW ACCENT GERSHAYIM;Mn;230;NSM;;;;;N;;;;;
+059F;HEBREW ACCENT QARNEY PARA;Mn;230;NSM;;;;;N;;;;;
+05A0;HEBREW ACCENT TELISHA GEDOLA;Mn;230;NSM;;;;;N;;;;;
+05A1;HEBREW ACCENT PAZER;Mn;230;NSM;;;;;N;;;;;
+05A2;HEBREW ACCENT ATNAH HAFUKH;Mn;220;NSM;;;;;N;;;;;
+05A3;HEBREW ACCENT MUNAH;Mn;220;NSM;;;;;N;;;;;
+05A4;HEBREW ACCENT MAHAPAKH;Mn;220;NSM;;;;;N;;;;;
+05A5;HEBREW ACCENT MERKHA;Mn;220;NSM;;;;;N;;*;;;
+05A6;HEBREW ACCENT MERKHA KEFULA;Mn;220;NSM;;;;;N;;;;;
+05A7;HEBREW ACCENT DARGA;Mn;220;NSM;;;;;N;;;;;
+05A8;HEBREW ACCENT QADMA;Mn;230;NSM;;;;;N;;*;;;
+05A9;HEBREW ACCENT TELISHA QETANA;Mn;230;NSM;;;;;N;;;;;
+05AA;HEBREW ACCENT YERAH BEN YOMO;Mn;220;NSM;;;;;N;;*;;;
+05AB;HEBREW ACCENT OLE;Mn;230;NSM;;;;;N;;;;;
+05AC;HEBREW ACCENT ILUY;Mn;230;NSM;;;;;N;;;;;
+05AD;HEBREW ACCENT DEHI;Mn;222;NSM;;;;;N;;;;;
+05AE;HEBREW ACCENT ZINOR;Mn;228;NSM;;;;;N;;;;;
+05AF;HEBREW MARK MASORA CIRCLE;Mn;230;NSM;;;;;N;;;;;
+05B0;HEBREW POINT SHEVA;Mn;10;NSM;;;;;N;;;;;
+05B1;HEBREW POINT HATAF SEGOL;Mn;11;NSM;;;;;N;;;;;
+05B2;HEBREW POINT HATAF PATAH;Mn;12;NSM;;;;;N;;;;;
+05B3;HEBREW POINT HATAF QAMATS;Mn;13;NSM;;;;;N;;;;;
+05B4;HEBREW POINT HIRIQ;Mn;14;NSM;;;;;N;;;;;
+05B5;HEBREW POINT TSERE;Mn;15;NSM;;;;;N;;;;;
+05B6;HEBREW POINT SEGOL;Mn;16;NSM;;;;;N;;;;;
+05B7;HEBREW POINT PATAH;Mn;17;NSM;;;;;N;;;;;
+05B8;HEBREW POINT QAMATS;Mn;18;NSM;;;;;N;;;;;
+05B9;HEBREW POINT HOLAM;Mn;19;NSM;;;;;N;;;;;
+05BA;HEBREW POINT HOLAM HASER FOR VAV;Mn;19;NSM;;;;;N;;;;;
+05BB;HEBREW POINT QUBUTS;Mn;20;NSM;;;;;N;;;;;
+05BC;HEBREW POINT DAGESH OR MAPIQ;Mn;21;NSM;;;;;N;HEBREW POINT DAGESH;or shuruq;;;
+05BD;HEBREW POINT METEG;Mn;22;NSM;;;;;N;;*;;;
+05BE;HEBREW PUNCTUATION MAQAF;Pd;0;R;;;;;N;;;;;
+05BF;HEBREW POINT RAFE;Mn;23;NSM;;;;;N;;;;;
+05C0;HEBREW PUNCTUATION PASEQ;Po;0;R;;;;;N;HEBREW POINT PASEQ;*;;;
+05C1;HEBREW POINT SHIN DOT;Mn;24;NSM;;;;;N;;;;;
+05C2;HEBREW POINT SIN DOT;Mn;25;NSM;;;;;N;;;;;
+05C3;HEBREW PUNCTUATION SOF PASUQ;Po;0;R;;;;;N;;*;;;
+05C4;HEBREW MARK UPPER DOT;Mn;230;NSM;;;;;N;;;;;
+05C5;HEBREW MARK LOWER DOT;Mn;220;NSM;;;;;N;;;;;
+05C6;HEBREW PUNCTUATION NUN HAFUKHA;Po;0;R;;;;;N;;;;;
+05C7;HEBREW POINT QAMATS QATAN;Mn;18;NSM;;;;;N;;;;;
+05D0;HEBREW LETTER ALEF;Lo;0;R;;;;;N;;;;;
+05D1;HEBREW LETTER BET;Lo;0;R;;;;;N;;;;;
+05D2;HEBREW LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+05D3;HEBREW LETTER DALET;Lo;0;R;;;;;N;;;;;
+05D4;HEBREW LETTER HE;Lo;0;R;;;;;N;;;;;
+05D5;HEBREW LETTER VAV;Lo;0;R;;;;;N;;;;;
+05D6;HEBREW LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+05D7;HEBREW LETTER HET;Lo;0;R;;;;;N;;;;;
+05D8;HEBREW LETTER TET;Lo;0;R;;;;;N;;;;;
+05D9;HEBREW LETTER YOD;Lo;0;R;;;;;N;;;;;
+05DA;HEBREW LETTER FINAL KAF;Lo;0;R;;;;;N;;;;;
+05DB;HEBREW LETTER KAF;Lo;0;R;;;;;N;;;;;
+05DC;HEBREW LETTER LAMED;Lo;0;R;;;;;N;;;;;
+05DD;HEBREW LETTER FINAL MEM;Lo;0;R;;;;;N;;;;;
+05DE;HEBREW LETTER MEM;Lo;0;R;;;;;N;;;;;
+05DF;HEBREW LETTER FINAL NUN;Lo;0;R;;;;;N;;;;;
+05E0;HEBREW LETTER NUN;Lo;0;R;;;;;N;;;;;
+05E1;HEBREW LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+05E2;HEBREW LETTER AYIN;Lo;0;R;;;;;N;;;;;
+05E3;HEBREW LETTER FINAL PE;Lo;0;R;;;;;N;;;;;
+05E4;HEBREW LETTER PE;Lo;0;R;;;;;N;;;;;
+05E5;HEBREW LETTER FINAL TSADI;Lo;0;R;;;;;N;;;;;
+05E6;HEBREW LETTER TSADI;Lo;0;R;;;;;N;;;;;
+05E7;HEBREW LETTER QOF;Lo;0;R;;;;;N;;;;;
+05E8;HEBREW LETTER RESH;Lo;0;R;;;;;N;;;;;
+05E9;HEBREW LETTER SHIN;Lo;0;R;;;;;N;;;;;
+05EA;HEBREW LETTER TAV;Lo;0;R;;;;;N;;;;;
+05F0;HEBREW LIGATURE YIDDISH DOUBLE VAV;Lo;0;R;;;;;N;HEBREW LETTER DOUBLE VAV;;;;
+05F1;HEBREW LIGATURE YIDDISH VAV YOD;Lo;0;R;;;;;N;HEBREW LETTER VAV YOD;;;;
+05F2;HEBREW LIGATURE YIDDISH DOUBLE YOD;Lo;0;R;;;;;N;HEBREW LETTER DOUBLE YOD;;;;
+05F3;HEBREW PUNCTUATION GERESH;Po;0;R;;;;;N;;;;;
+05F4;HEBREW PUNCTUATION GERSHAYIM;Po;0;R;;;;;N;;;;;
+0600;ARABIC NUMBER SIGN;Cf;0;AN;;;;;N;;;;;
+0601;ARABIC SIGN SANAH;Cf;0;AN;;;;;N;;;;;
+0602;ARABIC FOOTNOTE MARKER;Cf;0;AN;;;;;N;;;;;
+0603;ARABIC SIGN SAFHA;Cf;0;AN;;;;;N;;;;;
+0606;ARABIC-INDIC CUBE ROOT;Sm;0;ON;;;;;N;;;;;
+0607;ARABIC-INDIC FOURTH ROOT;Sm;0;ON;;;;;N;;;;;
+0608;ARABIC RAY;Sm;0;AL;;;;;N;;;;;
+0609;ARABIC-INDIC PER MILLE SIGN;Po;0;ET;;;;;N;;;;;
+060A;ARABIC-INDIC PER TEN THOUSAND SIGN;Po;0;ET;;;;;N;;;;;
+060B;AFGHANI SIGN;Sc;0;AL;;;;;N;;;;;
+060C;ARABIC COMMA;Po;0;CS;;;;;N;;;;;
+060D;ARABIC DATE SEPARATOR;Po;0;AL;;;;;N;;;;;
+060E;ARABIC POETIC VERSE SIGN;So;0;ON;;;;;N;;;;;
+060F;ARABIC SIGN MISRA;So;0;ON;;;;;N;;;;;
+0610;ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM;Mn;230;NSM;;;;;N;;;;;
+0611;ARABIC SIGN ALAYHE ASSALLAM;Mn;230;NSM;;;;;N;;;;;
+0612;ARABIC SIGN RAHMATULLAH ALAYHE;Mn;230;NSM;;;;;N;;;;;
+0613;ARABIC SIGN RADI ALLAHOU ANHU;Mn;230;NSM;;;;;N;;;;;
+0614;ARABIC SIGN TAKHALLUS;Mn;230;NSM;;;;;N;;;;;
+0615;ARABIC SMALL HIGH TAH;Mn;230;NSM;;;;;N;;;;;
+0616;ARABIC SMALL HIGH LIGATURE ALEF WITH LAM WITH YEH;Mn;230;NSM;;;;;N;;;;;
+0617;ARABIC SMALL HIGH ZAIN;Mn;230;NSM;;;;;N;;;;;
+0618;ARABIC SMALL FATHA;Mn;30;NSM;;;;;N;;;;;
+0619;ARABIC SMALL DAMMA;Mn;31;NSM;;;;;N;;;;;
+061A;ARABIC SMALL KASRA;Mn;32;NSM;;;;;N;;;;;
+061B;ARABIC SEMICOLON;Po;0;AL;;;;;N;;;;;
+061E;ARABIC TRIPLE DOT PUNCTUATION MARK;Po;0;AL;;;;;N;;;;;
+061F;ARABIC QUESTION MARK;Po;0;AL;;;;;N;;;;;
+0621;ARABIC LETTER HAMZA;Lo;0;AL;;;;;N;ARABIC LETTER HAMZAH;;;;
+0622;ARABIC LETTER ALEF WITH MADDA ABOVE;Lo;0;AL;0627 0653;;;;N;ARABIC LETTER MADDAH ON ALEF;;;;
+0623;ARABIC LETTER ALEF WITH HAMZA ABOVE;Lo;0;AL;0627 0654;;;;N;ARABIC LETTER HAMZAH ON ALEF;;;;
+0624;ARABIC LETTER WAW WITH HAMZA ABOVE;Lo;0;AL;0648 0654;;;;N;ARABIC LETTER HAMZAH ON WAW;;;;
+0625;ARABIC LETTER ALEF WITH HAMZA BELOW;Lo;0;AL;0627 0655;;;;N;ARABIC LETTER HAMZAH UNDER ALEF;;;;
+0626;ARABIC LETTER YEH WITH HAMZA ABOVE;Lo;0;AL;064A 0654;;;;N;ARABIC LETTER HAMZAH ON YA;;;;
+0627;ARABIC LETTER ALEF;Lo;0;AL;;;;;N;;;;;
+0628;ARABIC LETTER BEH;Lo;0;AL;;;;;N;ARABIC LETTER BAA;;;;
+0629;ARABIC LETTER TEH MARBUTA;Lo;0;AL;;;;;N;ARABIC LETTER TAA MARBUTAH;;;;
+062A;ARABIC LETTER TEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA;;;;
+062B;ARABIC LETTER THEH;Lo;0;AL;;;;;N;ARABIC LETTER THAA;;;;
+062C;ARABIC LETTER JEEM;Lo;0;AL;;;;;N;;;;;
+062D;ARABIC LETTER HAH;Lo;0;AL;;;;;N;ARABIC LETTER HAA;;;;
+062E;ARABIC LETTER KHAH;Lo;0;AL;;;;;N;ARABIC LETTER KHAA;;;;
+062F;ARABIC LETTER DAL;Lo;0;AL;;;;;N;;;;;
+0630;ARABIC LETTER THAL;Lo;0;AL;;;;;N;;;;;
+0631;ARABIC LETTER REH;Lo;0;AL;;;;;N;ARABIC LETTER RA;;;;
+0632;ARABIC LETTER ZAIN;Lo;0;AL;;;;;N;;;;;
+0633;ARABIC LETTER SEEN;Lo;0;AL;;;;;N;;;;;
+0634;ARABIC LETTER SHEEN;Lo;0;AL;;;;;N;;;;;
+0635;ARABIC LETTER SAD;Lo;0;AL;;;;;N;;;;;
+0636;ARABIC LETTER DAD;Lo;0;AL;;;;;N;;;;;
+0637;ARABIC LETTER TAH;Lo;0;AL;;;;;N;;;;;
+0638;ARABIC LETTER ZAH;Lo;0;AL;;;;;N;ARABIC LETTER DHAH;;;;
+0639;ARABIC LETTER AIN;Lo;0;AL;;;;;N;;;;;
+063A;ARABIC LETTER GHAIN;Lo;0;AL;;;;;N;;;;;
+063B;ARABIC LETTER KEHEH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+063C;ARABIC LETTER KEHEH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+063D;ARABIC LETTER FARSI YEH WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
+063E;ARABIC LETTER FARSI YEH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+063F;ARABIC LETTER FARSI YEH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0640;ARABIC TATWEEL;Lm;0;AL;;;;;N;;;;;
+0641;ARABIC LETTER FEH;Lo;0;AL;;;;;N;ARABIC LETTER FA;;;;
+0642;ARABIC LETTER QAF;Lo;0;AL;;;;;N;;;;;
+0643;ARABIC LETTER KAF;Lo;0;AL;;;;;N;ARABIC LETTER CAF;;;;
+0644;ARABIC LETTER LAM;Lo;0;AL;;;;;N;;;;;
+0645;ARABIC LETTER MEEM;Lo;0;AL;;;;;N;;;;;
+0646;ARABIC LETTER NOON;Lo;0;AL;;;;;N;;;;;
+0647;ARABIC LETTER HEH;Lo;0;AL;;;;;N;ARABIC LETTER HA;;;;
+0648;ARABIC LETTER WAW;Lo;0;AL;;;;;N;;;;;
+0649;ARABIC LETTER ALEF MAKSURA;Lo;0;AL;;;;;N;ARABIC LETTER ALEF MAQSURAH;;;;
+064A;ARABIC LETTER YEH;Lo;0;AL;;;;;N;ARABIC LETTER YA;;;;
+064B;ARABIC FATHATAN;Mn;27;NSM;;;;;N;;;;;
+064C;ARABIC DAMMATAN;Mn;28;NSM;;;;;N;;;;;
+064D;ARABIC KASRATAN;Mn;29;NSM;;;;;N;;;;;
+064E;ARABIC FATHA;Mn;30;NSM;;;;;N;ARABIC FATHAH;;;;
+064F;ARABIC DAMMA;Mn;31;NSM;;;;;N;ARABIC DAMMAH;;;;
+0650;ARABIC KASRA;Mn;32;NSM;;;;;N;ARABIC KASRAH;;;;
+0651;ARABIC SHADDA;Mn;33;NSM;;;;;N;ARABIC SHADDAH;;;;
+0652;ARABIC SUKUN;Mn;34;NSM;;;;;N;;;;;
+0653;ARABIC MADDAH ABOVE;Mn;230;NSM;;;;;N;;;;;
+0654;ARABIC HAMZA ABOVE;Mn;230;NSM;;;;;N;;;;;
+0655;ARABIC HAMZA BELOW;Mn;220;NSM;;;;;N;;;;;
+0656;ARABIC SUBSCRIPT ALEF;Mn;220;NSM;;;;;N;;;;;
+0657;ARABIC INVERTED DAMMA;Mn;230;NSM;;;;;N;;;;;
+0658;ARABIC MARK NOON GHUNNA;Mn;230;NSM;;;;;N;;;;;
+0659;ARABIC ZWARAKAY;Mn;230;NSM;;;;;N;;;;;
+065A;ARABIC VOWEL SIGN SMALL V ABOVE;Mn;230;NSM;;;;;N;;;;;
+065B;ARABIC VOWEL SIGN INVERTED SMALL V ABOVE;Mn;230;NSM;;;;;N;;;;;
+065C;ARABIC VOWEL SIGN DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+065D;ARABIC REVERSED DAMMA;Mn;230;NSM;;;;;N;;;;;
+065E;ARABIC FATHA WITH TWO DOTS;Mn;230;NSM;;;;;N;;;;;
+0660;ARABIC-INDIC DIGIT ZERO;Nd;0;AN;;0;0;0;N;;;;;
+0661;ARABIC-INDIC DIGIT ONE;Nd;0;AN;;1;1;1;N;;;;;
+0662;ARABIC-INDIC DIGIT TWO;Nd;0;AN;;2;2;2;N;;;;;
+0663;ARABIC-INDIC DIGIT THREE;Nd;0;AN;;3;3;3;N;;;;;
+0664;ARABIC-INDIC DIGIT FOUR;Nd;0;AN;;4;4;4;N;;;;;
+0665;ARABIC-INDIC DIGIT FIVE;Nd;0;AN;;5;5;5;N;;;;;
+0666;ARABIC-INDIC DIGIT SIX;Nd;0;AN;;6;6;6;N;;;;;
+0667;ARABIC-INDIC DIGIT SEVEN;Nd;0;AN;;7;7;7;N;;;;;
+0668;ARABIC-INDIC DIGIT EIGHT;Nd;0;AN;;8;8;8;N;;;;;
+0669;ARABIC-INDIC DIGIT NINE;Nd;0;AN;;9;9;9;N;;;;;
+066A;ARABIC PERCENT SIGN;Po;0;ET;;;;;N;;;;;
+066B;ARABIC DECIMAL SEPARATOR;Po;0;AN;;;;;N;;;;;
+066C;ARABIC THOUSANDS SEPARATOR;Po;0;AN;;;;;N;;;;;
+066D;ARABIC FIVE POINTED STAR;Po;0;AL;;;;;N;;;;;
+066E;ARABIC LETTER DOTLESS BEH;Lo;0;AL;;;;;N;;;;;
+066F;ARABIC LETTER DOTLESS QAF;Lo;0;AL;;;;;N;;;;;
+0670;ARABIC LETTER SUPERSCRIPT ALEF;Mn;35;NSM;;;;;N;ARABIC ALEF ABOVE;;;;
+0671;ARABIC LETTER ALEF WASLA;Lo;0;AL;;;;;N;ARABIC LETTER HAMZAT WASL ON ALEF;;;;
+0672;ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER WAVY HAMZAH ON ALEF;;;;
+0673;ARABIC LETTER ALEF WITH WAVY HAMZA BELOW;Lo;0;AL;;;;;N;ARABIC LETTER WAVY HAMZAH UNDER ALEF;;;;
+0674;ARABIC LETTER HIGH HAMZA;Lo;0;AL;;;;;N;ARABIC LETTER HIGH HAMZAH;;;;
+0675;ARABIC LETTER HIGH HAMZA ALEF;Lo;0;AL;<compat> 0627 0674;;;;N;ARABIC LETTER HIGH HAMZAH ALEF;;;;
+0676;ARABIC LETTER HIGH HAMZA WAW;Lo;0;AL;<compat> 0648 0674;;;;N;ARABIC LETTER HIGH HAMZAH WAW;;;;
+0677;ARABIC LETTER U WITH HAMZA ABOVE;Lo;0;AL;<compat> 06C7 0674;;;;N;ARABIC LETTER HIGH HAMZAH WAW WITH DAMMAH;;;;
+0678;ARABIC LETTER HIGH HAMZA YEH;Lo;0;AL;<compat> 064A 0674;;;;N;ARABIC LETTER HIGH HAMZAH YA;;;;
+0679;ARABIC LETTER TTEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH SMALL TAH;;;;
+067A;ARABIC LETTER TTEHEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH TWO DOTS VERTICAL ABOVE;;;;
+067B;ARABIC LETTER BEEH;Lo;0;AL;;;;;N;ARABIC LETTER BAA WITH TWO DOTS VERTICAL BELOW;;;;
+067C;ARABIC LETTER TEH WITH RING;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH RING;;;;
+067D;ARABIC LETTER TEH WITH THREE DOTS ABOVE DOWNWARDS;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH THREE DOTS ABOVE DOWNWARD;;;;
+067E;ARABIC LETTER PEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH THREE DOTS BELOW;;;;
+067F;ARABIC LETTER TEHEH;Lo;0;AL;;;;;N;ARABIC LETTER TAA WITH FOUR DOTS ABOVE;;;;
+0680;ARABIC LETTER BEHEH;Lo;0;AL;;;;;N;ARABIC LETTER BAA WITH FOUR DOTS BELOW;;;;
+0681;ARABIC LETTER HAH WITH HAMZA ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER HAMZAH ON HAA;;;;
+0682;ARABIC LETTER HAH WITH TWO DOTS VERTICAL ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH TWO DOTS VERTICAL ABOVE;;;;
+0683;ARABIC LETTER NYEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE TWO DOTS;;;;
+0684;ARABIC LETTER DYEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE TWO DOTS VERTICAL;;;;
+0685;ARABIC LETTER HAH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH THREE DOTS ABOVE;;;;
+0686;ARABIC LETTER TCHEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE THREE DOTS DOWNWARD;;;;
+0687;ARABIC LETTER TCHEHEH;Lo;0;AL;;;;;N;ARABIC LETTER HAA WITH MIDDLE FOUR DOTS;;;;
+0688;ARABIC LETTER DDAL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH SMALL TAH;;;;
+0689;ARABIC LETTER DAL WITH RING;Lo;0;AL;;;;;N;;;;;
+068A;ARABIC LETTER DAL WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+068B;ARABIC LETTER DAL WITH DOT BELOW AND SMALL TAH;Lo;0;AL;;;;;N;;;;;
+068C;ARABIC LETTER DAHAL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH TWO DOTS ABOVE;;;;
+068D;ARABIC LETTER DDAHAL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH TWO DOTS BELOW;;;;
+068E;ARABIC LETTER DUL;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH THREE DOTS ABOVE;;;;
+068F;ARABIC LETTER DAL WITH THREE DOTS ABOVE DOWNWARDS;Lo;0;AL;;;;;N;ARABIC LETTER DAL WITH THREE DOTS ABOVE DOWNWARD;;;;
+0690;ARABIC LETTER DAL WITH FOUR DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0691;ARABIC LETTER RREH;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH SMALL TAH;;;;
+0692;ARABIC LETTER REH WITH SMALL V;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH SMALL V;;;;
+0693;ARABIC LETTER REH WITH RING;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH RING;;;;
+0694;ARABIC LETTER REH WITH DOT BELOW;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH DOT BELOW;;;;
+0695;ARABIC LETTER REH WITH SMALL V BELOW;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH SMALL V BELOW;;;;
+0696;ARABIC LETTER REH WITH DOT BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH DOT BELOW AND DOT ABOVE;;;;
+0697;ARABIC LETTER REH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH TWO DOTS ABOVE;;;;
+0698;ARABIC LETTER JEH;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH THREE DOTS ABOVE;;;;
+0699;ARABIC LETTER REH WITH FOUR DOTS ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER RA WITH FOUR DOTS ABOVE;;;;
+069A;ARABIC LETTER SEEN WITH DOT BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+069B;ARABIC LETTER SEEN WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+069C;ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+069D;ARABIC LETTER SAD WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+069E;ARABIC LETTER SAD WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+069F;ARABIC LETTER TAH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06A0;ARABIC LETTER AIN WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06A1;ARABIC LETTER DOTLESS FEH;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS FA;;;;
+06A2;ARABIC LETTER FEH WITH DOT MOVED BELOW;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH DOT MOVED BELOW;;;;
+06A3;ARABIC LETTER FEH WITH DOT BELOW;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH DOT BELOW;;;;
+06A4;ARABIC LETTER VEH;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH THREE DOTS ABOVE;;;;
+06A5;ARABIC LETTER FEH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH THREE DOTS BELOW;;;;
+06A6;ARABIC LETTER PEHEH;Lo;0;AL;;;;;N;ARABIC LETTER FA WITH FOUR DOTS ABOVE;;;;
+06A7;ARABIC LETTER QAF WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+06A8;ARABIC LETTER QAF WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06A9;ARABIC LETTER KEHEH;Lo;0;AL;;;;;N;ARABIC LETTER OPEN CAF;;;;
+06AA;ARABIC LETTER SWASH KAF;Lo;0;AL;;;;;N;ARABIC LETTER SWASH CAF;;;;
+06AB;ARABIC LETTER KAF WITH RING;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH RING;;;;
+06AC;ARABIC LETTER KAF WITH DOT ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH DOT ABOVE;;;;
+06AD;ARABIC LETTER NG;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH THREE DOTS ABOVE;;;;
+06AE;ARABIC LETTER KAF WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH THREE DOTS BELOW;;;;
+06AF;ARABIC LETTER GAF;Lo;0;AL;;;;;N;;*;;;
+06B0;ARABIC LETTER GAF WITH RING;Lo;0;AL;;;;;N;;;;;
+06B1;ARABIC LETTER NGOEH;Lo;0;AL;;;;;N;ARABIC LETTER GAF WITH TWO DOTS ABOVE;;;;
+06B2;ARABIC LETTER GAF WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+06B3;ARABIC LETTER GUEH;Lo;0;AL;;;;;N;ARABIC LETTER GAF WITH TWO DOTS VERTICAL BELOW;;;;
+06B4;ARABIC LETTER GAF WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06B5;ARABIC LETTER LAM WITH SMALL V;Lo;0;AL;;;;;N;;;;;
+06B6;ARABIC LETTER LAM WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+06B7;ARABIC LETTER LAM WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06B8;ARABIC LETTER LAM WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+06B9;ARABIC LETTER NOON WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+06BA;ARABIC LETTER NOON GHUNNA;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS NOON;;;;
+06BB;ARABIC LETTER RNOON;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS NOON WITH SMALL TAH;;;;
+06BC;ARABIC LETTER NOON WITH RING;Lo;0;AL;;;;;N;;;;;
+06BD;ARABIC LETTER NOON WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06BE;ARABIC LETTER HEH DOACHASHMEE;Lo;0;AL;;;;;N;ARABIC LETTER KNOTTED HA;;;;
+06BF;ARABIC LETTER TCHEH WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+06C0;ARABIC LETTER HEH WITH YEH ABOVE;Lo;0;AL;06D5 0654;;;;N;ARABIC LETTER HAMZAH ON HA;;;;
+06C1;ARABIC LETTER HEH GOAL;Lo;0;AL;;;;;N;ARABIC LETTER HA GOAL;;;;
+06C2;ARABIC LETTER HEH GOAL WITH HAMZA ABOVE;Lo;0;AL;06C1 0654;;;;N;ARABIC LETTER HAMZAH ON HA GOAL;;;;
+06C3;ARABIC LETTER TEH MARBUTA GOAL;Lo;0;AL;;;;;N;ARABIC LETTER TAA MARBUTAH GOAL;;;;
+06C4;ARABIC LETTER WAW WITH RING;Lo;0;AL;;;;;N;;;;;
+06C5;ARABIC LETTER KIRGHIZ OE;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH BAR;;;;
+06C6;ARABIC LETTER OE;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH SMALL V;;;;
+06C7;ARABIC LETTER U;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH DAMMAH;;;;
+06C8;ARABIC LETTER YU;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH ALEF ABOVE;;;;
+06C9;ARABIC LETTER KIRGHIZ YU;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH INVERTED SMALL V;;;;
+06CA;ARABIC LETTER WAW WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+06CB;ARABIC LETTER VE;Lo;0;AL;;;;;N;ARABIC LETTER WAW WITH THREE DOTS ABOVE;;;;
+06CC;ARABIC LETTER FARSI YEH;Lo;0;AL;;;;;N;ARABIC LETTER DOTLESS YA;;;;
+06CD;ARABIC LETTER YEH WITH TAIL;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH TAIL;;;;
+06CE;ARABIC LETTER YEH WITH SMALL V;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH SMALL V;;;;
+06CF;ARABIC LETTER WAW WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+06D0;ARABIC LETTER E;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH TWO DOTS VERTICAL BELOW;*;;;
+06D1;ARABIC LETTER YEH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH THREE DOTS BELOW;;;;
+06D2;ARABIC LETTER YEH BARREE;Lo;0;AL;;;;;N;ARABIC LETTER YA BARREE;;;;
+06D3;ARABIC LETTER YEH BARREE WITH HAMZA ABOVE;Lo;0;AL;06D2 0654;;;;N;ARABIC LETTER HAMZAH ON YA BARREE;;;;
+06D4;ARABIC FULL STOP;Po;0;AL;;;;;N;ARABIC PERIOD;;;;
+06D5;ARABIC LETTER AE;Lo;0;AL;;;;;N;;;;;
+06D6;ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA;Mn;230;NSM;;;;;N;;;;;
+06D7;ARABIC SMALL HIGH LIGATURE QAF WITH LAM WITH ALEF MAKSURA;Mn;230;NSM;;;;;N;;;;;
+06D8;ARABIC SMALL HIGH MEEM INITIAL FORM;Mn;230;NSM;;;;;N;;;;;
+06D9;ARABIC SMALL HIGH LAM ALEF;Mn;230;NSM;;;;;N;;;;;
+06DA;ARABIC SMALL HIGH JEEM;Mn;230;NSM;;;;;N;;;;;
+06DB;ARABIC SMALL HIGH THREE DOTS;Mn;230;NSM;;;;;N;;;;;
+06DC;ARABIC SMALL HIGH SEEN;Mn;230;NSM;;;;;N;;;;;
+06DD;ARABIC END OF AYAH;Cf;0;AN;;;;;N;;;;;
+06DE;ARABIC START OF RUB EL HIZB;Me;0;NSM;;;;;N;;;;;
+06DF;ARABIC SMALL HIGH ROUNDED ZERO;Mn;230;NSM;;;;;N;;;;;
+06E0;ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO;Mn;230;NSM;;;;;N;;;;;
+06E1;ARABIC SMALL HIGH DOTLESS HEAD OF KHAH;Mn;230;NSM;;;;;N;;;;;
+06E2;ARABIC SMALL HIGH MEEM ISOLATED FORM;Mn;230;NSM;;;;;N;;;;;
+06E3;ARABIC SMALL LOW SEEN;Mn;220;NSM;;;;;N;;;;;
+06E4;ARABIC SMALL HIGH MADDA;Mn;230;NSM;;;;;N;;;;;
+06E5;ARABIC SMALL WAW;Lm;0;AL;;;;;N;;;;;
+06E6;ARABIC SMALL YEH;Lm;0;AL;;;;;N;;;;;
+06E7;ARABIC SMALL HIGH YEH;Mn;230;NSM;;;;;N;;;;;
+06E8;ARABIC SMALL HIGH NOON;Mn;230;NSM;;;;;N;;;;;
+06E9;ARABIC PLACE OF SAJDAH;So;0;ON;;;;;N;;;;;
+06EA;ARABIC EMPTY CENTRE LOW STOP;Mn;220;NSM;;;;;N;;;;;
+06EB;ARABIC EMPTY CENTRE HIGH STOP;Mn;230;NSM;;;;;N;;;;;
+06EC;ARABIC ROUNDED HIGH STOP WITH FILLED CENTRE;Mn;230;NSM;;;;;N;;;;;
+06ED;ARABIC SMALL LOW MEEM;Mn;220;NSM;;;;;N;;;;;
+06EE;ARABIC LETTER DAL WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
+06EF;ARABIC LETTER REH WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
+06F0;EXTENDED ARABIC-INDIC DIGIT ZERO;Nd;0;EN;;0;0;0;N;EASTERN ARABIC-INDIC DIGIT ZERO;;;;
+06F1;EXTENDED ARABIC-INDIC DIGIT ONE;Nd;0;EN;;1;1;1;N;EASTERN ARABIC-INDIC DIGIT ONE;;;;
+06F2;EXTENDED ARABIC-INDIC DIGIT TWO;Nd;0;EN;;2;2;2;N;EASTERN ARABIC-INDIC DIGIT TWO;;;;
+06F3;EXTENDED ARABIC-INDIC DIGIT THREE;Nd;0;EN;;3;3;3;N;EASTERN ARABIC-INDIC DIGIT THREE;;;;
+06F4;EXTENDED ARABIC-INDIC DIGIT FOUR;Nd;0;EN;;4;4;4;N;EASTERN ARABIC-INDIC DIGIT FOUR;;;;
+06F5;EXTENDED ARABIC-INDIC DIGIT FIVE;Nd;0;EN;;5;5;5;N;EASTERN ARABIC-INDIC DIGIT FIVE;;;;
+06F6;EXTENDED ARABIC-INDIC DIGIT SIX;Nd;0;EN;;6;6;6;N;EASTERN ARABIC-INDIC DIGIT SIX;;;;
+06F7;EXTENDED ARABIC-INDIC DIGIT SEVEN;Nd;0;EN;;7;7;7;N;EASTERN ARABIC-INDIC DIGIT SEVEN;;;;
+06F8;EXTENDED ARABIC-INDIC DIGIT EIGHT;Nd;0;EN;;8;8;8;N;EASTERN ARABIC-INDIC DIGIT EIGHT;;;;
+06F9;EXTENDED ARABIC-INDIC DIGIT NINE;Nd;0;EN;;9;9;9;N;EASTERN ARABIC-INDIC DIGIT NINE;;;;
+06FA;ARABIC LETTER SHEEN WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+06FB;ARABIC LETTER DAD WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+06FC;ARABIC LETTER GHAIN WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+06FD;ARABIC SIGN SINDHI AMPERSAND;So;0;AL;;;;;N;;;;;
+06FE;ARABIC SIGN SINDHI POSTPOSITION MEN;So;0;AL;;;;;N;;;;;
+06FF;ARABIC LETTER HEH WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
+0700;SYRIAC END OF PARAGRAPH;Po;0;AL;;;;;N;;;;;
+0701;SYRIAC SUPRALINEAR FULL STOP;Po;0;AL;;;;;N;;;;;
+0702;SYRIAC SUBLINEAR FULL STOP;Po;0;AL;;;;;N;;;;;
+0703;SYRIAC SUPRALINEAR COLON;Po;0;AL;;;;;N;;;;;
+0704;SYRIAC SUBLINEAR COLON;Po;0;AL;;;;;N;;;;;
+0705;SYRIAC HORIZONTAL COLON;Po;0;AL;;;;;N;;;;;
+0706;SYRIAC COLON SKEWED LEFT;Po;0;AL;;;;;N;;;;;
+0707;SYRIAC COLON SKEWED RIGHT;Po;0;AL;;;;;N;;;;;
+0708;SYRIAC SUPRALINEAR COLON SKEWED LEFT;Po;0;AL;;;;;N;;;;;
+0709;SYRIAC SUBLINEAR COLON SKEWED RIGHT;Po;0;AL;;;;;N;;;;;
+070A;SYRIAC CONTRACTION;Po;0;AL;;;;;N;;;;;
+070B;SYRIAC HARKLEAN OBELUS;Po;0;AL;;;;;N;;;;;
+070C;SYRIAC HARKLEAN METOBELUS;Po;0;AL;;;;;N;;;;;
+070D;SYRIAC HARKLEAN ASTERISCUS;Po;0;AL;;;;;N;;;;;
+070F;SYRIAC ABBREVIATION MARK;Cf;0;BN;;;;;N;;;;;
+0710;SYRIAC LETTER ALAPH;Lo;0;AL;;;;;N;;;;;
+0711;SYRIAC LETTER SUPERSCRIPT ALAPH;Mn;36;NSM;;;;;N;;;;;
+0712;SYRIAC LETTER BETH;Lo;0;AL;;;;;N;;;;;
+0713;SYRIAC LETTER GAMAL;Lo;0;AL;;;;;N;;;;;
+0714;SYRIAC LETTER GAMAL GARSHUNI;Lo;0;AL;;;;;N;;;;;
+0715;SYRIAC LETTER DALATH;Lo;0;AL;;;;;N;;;;;
+0716;SYRIAC LETTER DOTLESS DALATH RISH;Lo;0;AL;;;;;N;;;;;
+0717;SYRIAC LETTER HE;Lo;0;AL;;;;;N;;;;;
+0718;SYRIAC LETTER WAW;Lo;0;AL;;;;;N;;;;;
+0719;SYRIAC LETTER ZAIN;Lo;0;AL;;;;;N;;;;;
+071A;SYRIAC LETTER HETH;Lo;0;AL;;;;;N;;;;;
+071B;SYRIAC LETTER TETH;Lo;0;AL;;;;;N;;;;;
+071C;SYRIAC LETTER TETH GARSHUNI;Lo;0;AL;;;;;N;;;;;
+071D;SYRIAC LETTER YUDH;Lo;0;AL;;;;;N;;;;;
+071E;SYRIAC LETTER YUDH HE;Lo;0;AL;;;;;N;;;;;
+071F;SYRIAC LETTER KAPH;Lo;0;AL;;;;;N;;;;;
+0720;SYRIAC LETTER LAMADH;Lo;0;AL;;;;;N;;;;;
+0721;SYRIAC LETTER MIM;Lo;0;AL;;;;;N;;;;;
+0722;SYRIAC LETTER NUN;Lo;0;AL;;;;;N;;;;;
+0723;SYRIAC LETTER SEMKATH;Lo;0;AL;;;;;N;;;;;
+0724;SYRIAC LETTER FINAL SEMKATH;Lo;0;AL;;;;;N;;;;;
+0725;SYRIAC LETTER E;Lo;0;AL;;;;;N;;;;;
+0726;SYRIAC LETTER PE;Lo;0;AL;;;;;N;;;;;
+0727;SYRIAC LETTER REVERSED PE;Lo;0;AL;;;;;N;;;;;
+0728;SYRIAC LETTER SADHE;Lo;0;AL;;;;;N;;;;;
+0729;SYRIAC LETTER QAPH;Lo;0;AL;;;;;N;;;;;
+072A;SYRIAC LETTER RISH;Lo;0;AL;;;;;N;;;;;
+072B;SYRIAC LETTER SHIN;Lo;0;AL;;;;;N;;;;;
+072C;SYRIAC LETTER TAW;Lo;0;AL;;;;;N;;;;;
+072D;SYRIAC LETTER PERSIAN BHETH;Lo;0;AL;;;;;N;;;;;
+072E;SYRIAC LETTER PERSIAN GHAMAL;Lo;0;AL;;;;;N;;;;;
+072F;SYRIAC LETTER PERSIAN DHALATH;Lo;0;AL;;;;;N;;;;;
+0730;SYRIAC PTHAHA ABOVE;Mn;230;NSM;;;;;N;;;;;
+0731;SYRIAC PTHAHA BELOW;Mn;220;NSM;;;;;N;;;;;
+0732;SYRIAC PTHAHA DOTTED;Mn;230;NSM;;;;;N;;;;;
+0733;SYRIAC ZQAPHA ABOVE;Mn;230;NSM;;;;;N;;;;;
+0734;SYRIAC ZQAPHA BELOW;Mn;220;NSM;;;;;N;;;;;
+0735;SYRIAC ZQAPHA DOTTED;Mn;230;NSM;;;;;N;;;;;
+0736;SYRIAC RBASA ABOVE;Mn;230;NSM;;;;;N;;;;;
+0737;SYRIAC RBASA BELOW;Mn;220;NSM;;;;;N;;;;;
+0738;SYRIAC DOTTED ZLAMA HORIZONTAL;Mn;220;NSM;;;;;N;;;;;
+0739;SYRIAC DOTTED ZLAMA ANGULAR;Mn;220;NSM;;;;;N;;;;;
+073A;SYRIAC HBASA ABOVE;Mn;230;NSM;;;;;N;;;;;
+073B;SYRIAC HBASA BELOW;Mn;220;NSM;;;;;N;;;;;
+073C;SYRIAC HBASA-ESASA DOTTED;Mn;220;NSM;;;;;N;;;;;
+073D;SYRIAC ESASA ABOVE;Mn;230;NSM;;;;;N;;;;;
+073E;SYRIAC ESASA BELOW;Mn;220;NSM;;;;;N;;;;;
+073F;SYRIAC RWAHA;Mn;230;NSM;;;;;N;;;;;
+0740;SYRIAC FEMININE DOT;Mn;230;NSM;;;;;N;;;;;
+0741;SYRIAC QUSHSHAYA;Mn;230;NSM;;;;;N;;;;;
+0742;SYRIAC RUKKAKHA;Mn;220;NSM;;;;;N;;;;;
+0743;SYRIAC TWO VERTICAL DOTS ABOVE;Mn;230;NSM;;;;;N;;;;;
+0744;SYRIAC TWO VERTICAL DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+0745;SYRIAC THREE DOTS ABOVE;Mn;230;NSM;;;;;N;;;;;
+0746;SYRIAC THREE DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+0747;SYRIAC OBLIQUE LINE ABOVE;Mn;230;NSM;;;;;N;;;;;
+0748;SYRIAC OBLIQUE LINE BELOW;Mn;220;NSM;;;;;N;;;;;
+0749;SYRIAC MUSIC;Mn;230;NSM;;;;;N;;;;;
+074A;SYRIAC BARREKH;Mn;230;NSM;;;;;N;;;;;
+074D;SYRIAC LETTER SOGDIAN ZHAIN;Lo;0;AL;;;;;N;;;;;
+074E;SYRIAC LETTER SOGDIAN KHAPH;Lo;0;AL;;;;;N;;;;;
+074F;SYRIAC LETTER SOGDIAN FE;Lo;0;AL;;;;;N;;;;;
+0750;ARABIC LETTER BEH WITH THREE DOTS HORIZONTALLY BELOW;Lo;0;AL;;;;;N;;;;;
+0751;ARABIC LETTER BEH WITH DOT BELOW AND THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0752;ARABIC LETTER BEH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;;
+0753;ARABIC LETTER BEH WITH THREE DOTS POINTING UPWARDS BELOW AND TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0754;ARABIC LETTER BEH WITH TWO DOTS BELOW AND DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+0755;ARABIC LETTER BEH WITH INVERTED SMALL V BELOW;Lo;0;AL;;;;;N;;;;;
+0756;ARABIC LETTER BEH WITH SMALL V;Lo;0;AL;;;;;N;;;;;
+0757;ARABIC LETTER HAH WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0758;ARABIC LETTER HAH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;;
+0759;ARABIC LETTER DAL WITH TWO DOTS VERTICALLY BELOW AND SMALL TAH;Lo;0;AL;;;;;N;;;;;
+075A;ARABIC LETTER DAL WITH INVERTED SMALL V BELOW;Lo;0;AL;;;;;N;;;;;
+075B;ARABIC LETTER REH WITH STROKE;Lo;0;AL;;;;;N;;;;;
+075C;ARABIC LETTER SEEN WITH FOUR DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+075D;ARABIC LETTER AIN WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+075E;ARABIC LETTER AIN WITH THREE DOTS POINTING DOWNWARDS ABOVE;Lo;0;AL;;;;;N;;;;;
+075F;ARABIC LETTER AIN WITH TWO DOTS VERTICALLY ABOVE;Lo;0;AL;;;;;N;;;;;
+0760;ARABIC LETTER FEH WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+0761;ARABIC LETTER FEH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;;
+0762;ARABIC LETTER KEHEH WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+0763;ARABIC LETTER KEHEH WITH THREE DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0764;ARABIC LETTER KEHEH WITH THREE DOTS POINTING UPWARDS BELOW;Lo;0;AL;;;;;N;;;;;
+0765;ARABIC LETTER MEEM WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
+0766;ARABIC LETTER MEEM WITH DOT BELOW;Lo;0;AL;;;;;N;;;;;
+0767;ARABIC LETTER NOON WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
+0768;ARABIC LETTER NOON WITH SMALL TAH;Lo;0;AL;;;;;N;;;;;
+0769;ARABIC LETTER NOON WITH SMALL V;Lo;0;AL;;;;;N;;;;;
+076A;ARABIC LETTER LAM WITH BAR;Lo;0;AL;;;;;N;;;;;
+076B;ARABIC LETTER REH WITH TWO DOTS VERTICALLY ABOVE;Lo;0;AL;;;;;N;;;;;
+076C;ARABIC LETTER REH WITH HAMZA ABOVE;Lo;0;AL;;;;;N;;;;;
+076D;ARABIC LETTER SEEN WITH TWO DOTS VERTICALLY ABOVE;Lo;0;AL;;;;;N;;;;;
+076E;ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH BELOW;Lo;0;AL;;;;;N;;;;;
+076F;ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH AND TWO DOTS;Lo;0;AL;;;;;N;;;;;
+0770;ARABIC LETTER SEEN WITH SMALL ARABIC LETTER TAH AND TWO DOTS;Lo;0;AL;;;;;N;;;;;
+0771;ARABIC LETTER REH WITH SMALL ARABIC LETTER TAH AND TWO DOTS;Lo;0;AL;;;;;N;;;;;
+0772;ARABIC LETTER HAH WITH SMALL ARABIC LETTER TAH ABOVE;Lo;0;AL;;;;;N;;;;;
+0773;ARABIC LETTER ALEF WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;;
+0774;ARABIC LETTER ALEF WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;;
+0775;ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;;
+0776;ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;;
+0777;ARABIC LETTER FARSI YEH WITH EXTENDED ARABIC-INDIC DIGIT FOUR BELOW;Lo;0;AL;;;;;N;;;;;
+0778;ARABIC LETTER WAW WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;;
+0779;ARABIC LETTER WAW WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;;
+077A;ARABIC LETTER YEH BARREE WITH EXTENDED ARABIC-INDIC DIGIT TWO ABOVE;Lo;0;AL;;;;;N;;;;;
+077B;ARABIC LETTER YEH BARREE WITH EXTENDED ARABIC-INDIC DIGIT THREE ABOVE;Lo;0;AL;;;;;N;;;;;
+077C;ARABIC LETTER HAH WITH EXTENDED ARABIC-INDIC DIGIT FOUR BELOW;Lo;0;AL;;;;;N;;;;;
+077D;ARABIC LETTER SEEN WITH EXTENDED ARABIC-INDIC DIGIT FOUR ABOVE;Lo;0;AL;;;;;N;;;;;
+077E;ARABIC LETTER SEEN WITH INVERTED V;Lo;0;AL;;;;;N;;;;;
+077F;ARABIC LETTER KAF WITH TWO DOTS ABOVE;Lo;0;AL;;;;;N;;;;;
+0780;THAANA LETTER HAA;Lo;0;AL;;;;;N;;;;;
+0781;THAANA LETTER SHAVIYANI;Lo;0;AL;;;;;N;;;;;
+0782;THAANA LETTER NOONU;Lo;0;AL;;;;;N;;;;;
+0783;THAANA LETTER RAA;Lo;0;AL;;;;;N;;;;;
+0784;THAANA LETTER BAA;Lo;0;AL;;;;;N;;;;;
+0785;THAANA LETTER LHAVIYANI;Lo;0;AL;;;;;N;;;;;
+0786;THAANA LETTER KAAFU;Lo;0;AL;;;;;N;;;;;
+0787;THAANA LETTER ALIFU;Lo;0;AL;;;;;N;;;;;
+0788;THAANA LETTER VAAVU;Lo;0;AL;;;;;N;;;;;
+0789;THAANA LETTER MEEMU;Lo;0;AL;;;;;N;;;;;
+078A;THAANA LETTER FAAFU;Lo;0;AL;;;;;N;;;;;
+078B;THAANA LETTER DHAALU;Lo;0;AL;;;;;N;;;;;
+078C;THAANA LETTER THAA;Lo;0;AL;;;;;N;;;;;
+078D;THAANA LETTER LAAMU;Lo;0;AL;;;;;N;;;;;
+078E;THAANA LETTER GAAFU;Lo;0;AL;;;;;N;;;;;
+078F;THAANA LETTER GNAVIYANI;Lo;0;AL;;;;;N;;;;;
+0790;THAANA LETTER SEENU;Lo;0;AL;;;;;N;;;;;
+0791;THAANA LETTER DAVIYANI;Lo;0;AL;;;;;N;;;;;
+0792;THAANA LETTER ZAVIYANI;Lo;0;AL;;;;;N;;;;;
+0793;THAANA LETTER TAVIYANI;Lo;0;AL;;;;;N;;;;;
+0794;THAANA LETTER YAA;Lo;0;AL;;;;;N;;;;;
+0795;THAANA LETTER PAVIYANI;Lo;0;AL;;;;;N;;;;;
+0796;THAANA LETTER JAVIYANI;Lo;0;AL;;;;;N;;;;;
+0797;THAANA LETTER CHAVIYANI;Lo;0;AL;;;;;N;;;;;
+0798;THAANA LETTER TTAA;Lo;0;AL;;;;;N;;;;;
+0799;THAANA LETTER HHAA;Lo;0;AL;;;;;N;;;;;
+079A;THAANA LETTER KHAA;Lo;0;AL;;;;;N;;;;;
+079B;THAANA LETTER THAALU;Lo;0;AL;;;;;N;;;;;
+079C;THAANA LETTER ZAA;Lo;0;AL;;;;;N;;;;;
+079D;THAANA LETTER SHEENU;Lo;0;AL;;;;;N;;;;;
+079E;THAANA LETTER SAADHU;Lo;0;AL;;;;;N;;;;;
+079F;THAANA LETTER DAADHU;Lo;0;AL;;;;;N;;;;;
+07A0;THAANA LETTER TO;Lo;0;AL;;;;;N;;;;;
+07A1;THAANA LETTER ZO;Lo;0;AL;;;;;N;;;;;
+07A2;THAANA LETTER AINU;Lo;0;AL;;;;;N;;;;;
+07A3;THAANA LETTER GHAINU;Lo;0;AL;;;;;N;;;;;
+07A4;THAANA LETTER QAAFU;Lo;0;AL;;;;;N;;;;;
+07A5;THAANA LETTER WAAVU;Lo;0;AL;;;;;N;;;;;
+07A6;THAANA ABAFILI;Mn;0;NSM;;;;;N;;;;;
+07A7;THAANA AABAAFILI;Mn;0;NSM;;;;;N;;;;;
+07A8;THAANA IBIFILI;Mn;0;NSM;;;;;N;;;;;
+07A9;THAANA EEBEEFILI;Mn;0;NSM;;;;;N;;;;;
+07AA;THAANA UBUFILI;Mn;0;NSM;;;;;N;;;;;
+07AB;THAANA OOBOOFILI;Mn;0;NSM;;;;;N;;;;;
+07AC;THAANA EBEFILI;Mn;0;NSM;;;;;N;;;;;
+07AD;THAANA EYBEYFILI;Mn;0;NSM;;;;;N;;;;;
+07AE;THAANA OBOFILI;Mn;0;NSM;;;;;N;;;;;
+07AF;THAANA OABOAFILI;Mn;0;NSM;;;;;N;;;;;
+07B0;THAANA SUKUN;Mn;0;NSM;;;;;N;;;;;
+07B1;THAANA LETTER NAA;Lo;0;AL;;;;;N;;;;;
+07C0;NKO DIGIT ZERO;Nd;0;R;;0;0;0;N;;;;;
+07C1;NKO DIGIT ONE;Nd;0;R;;1;1;1;N;;;;;
+07C2;NKO DIGIT TWO;Nd;0;R;;2;2;2;N;;;;;
+07C3;NKO DIGIT THREE;Nd;0;R;;3;3;3;N;;;;;
+07C4;NKO DIGIT FOUR;Nd;0;R;;4;4;4;N;;;;;
+07C5;NKO DIGIT FIVE;Nd;0;R;;5;5;5;N;;;;;
+07C6;NKO DIGIT SIX;Nd;0;R;;6;6;6;N;;;;;
+07C7;NKO DIGIT SEVEN;Nd;0;R;;7;7;7;N;;;;;
+07C8;NKO DIGIT EIGHT;Nd;0;R;;8;8;8;N;;;;;
+07C9;NKO DIGIT NINE;Nd;0;R;;9;9;9;N;;;;;
+07CA;NKO LETTER A;Lo;0;R;;;;;N;;;;;
+07CB;NKO LETTER EE;Lo;0;R;;;;;N;;;;;
+07CC;NKO LETTER I;Lo;0;R;;;;;N;;;;;
+07CD;NKO LETTER E;Lo;0;R;;;;;N;;;;;
+07CE;NKO LETTER U;Lo;0;R;;;;;N;;;;;
+07CF;NKO LETTER OO;Lo;0;R;;;;;N;;;;;
+07D0;NKO LETTER O;Lo;0;R;;;;;N;;;;;
+07D1;NKO LETTER DAGBASINNA;Lo;0;R;;;;;N;;;;;
+07D2;NKO LETTER N;Lo;0;R;;;;;N;;;;;
+07D3;NKO LETTER BA;Lo;0;R;;;;;N;;;;;
+07D4;NKO LETTER PA;Lo;0;R;;;;;N;;;;;
+07D5;NKO LETTER TA;Lo;0;R;;;;;N;;;;;
+07D6;NKO LETTER JA;Lo;0;R;;;;;N;;;;;
+07D7;NKO LETTER CHA;Lo;0;R;;;;;N;;;;;
+07D8;NKO LETTER DA;Lo;0;R;;;;;N;;;;;
+07D9;NKO LETTER RA;Lo;0;R;;;;;N;;;;;
+07DA;NKO LETTER RRA;Lo;0;R;;;;;N;;;;;
+07DB;NKO LETTER SA;Lo;0;R;;;;;N;;;;;
+07DC;NKO LETTER GBA;Lo;0;R;;;;;N;;;;;
+07DD;NKO LETTER FA;Lo;0;R;;;;;N;;;;;
+07DE;NKO LETTER KA;Lo;0;R;;;;;N;;;;;
+07DF;NKO LETTER LA;Lo;0;R;;;;;N;;;;;
+07E0;NKO LETTER NA WOLOSO;Lo;0;R;;;;;N;;;;;
+07E1;NKO LETTER MA;Lo;0;R;;;;;N;;;;;
+07E2;NKO LETTER NYA;Lo;0;R;;;;;N;;;;;
+07E3;NKO LETTER NA;Lo;0;R;;;;;N;;;;;
+07E4;NKO LETTER HA;Lo;0;R;;;;;N;;;;;
+07E5;NKO LETTER WA;Lo;0;R;;;;;N;;;;;
+07E6;NKO LETTER YA;Lo;0;R;;;;;N;;;;;
+07E7;NKO LETTER NYA WOLOSO;Lo;0;R;;;;;N;;;;;
+07E8;NKO LETTER JONA JA;Lo;0;R;;;;;N;;;;;
+07E9;NKO LETTER JONA CHA;Lo;0;R;;;;;N;;;;;
+07EA;NKO LETTER JONA RA;Lo;0;R;;;;;N;;;;;
+07EB;NKO COMBINING SHORT HIGH TONE;Mn;230;NSM;;;;;N;;;;;
+07EC;NKO COMBINING SHORT LOW TONE;Mn;230;NSM;;;;;N;;;;;
+07ED;NKO COMBINING SHORT RISING TONE;Mn;230;NSM;;;;;N;;;;;
+07EE;NKO COMBINING LONG DESCENDING TONE;Mn;230;NSM;;;;;N;;;;;
+07EF;NKO COMBINING LONG HIGH TONE;Mn;230;NSM;;;;;N;;;;;
+07F0;NKO COMBINING LONG LOW TONE;Mn;230;NSM;;;;;N;;;;;
+07F1;NKO COMBINING LONG RISING TONE;Mn;230;NSM;;;;;N;;;;;
+07F2;NKO COMBINING NASALIZATION MARK;Mn;220;NSM;;;;;N;;;;;
+07F3;NKO COMBINING DOUBLE DOT ABOVE;Mn;230;NSM;;;;;N;;;;;
+07F4;NKO HIGH TONE APOSTROPHE;Lm;0;R;;;;;N;;;;;
+07F5;NKO LOW TONE APOSTROPHE;Lm;0;R;;;;;N;;;;;
+07F6;NKO SYMBOL OO DENNEN;So;0;ON;;;;;N;;;;;
+07F7;NKO SYMBOL GBAKURUNEN;Po;0;ON;;;;;N;;;;;
+07F8;NKO COMMA;Po;0;ON;;;;;N;;;;;
+07F9;NKO EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
+07FA;NKO LAJANYALAN;Lm;0;R;;;;;N;;;;;
+0901;DEVANAGARI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0902;DEVANAGARI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+0903;DEVANAGARI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0904;DEVANAGARI LETTER SHORT A;Lo;0;L;;;;;N;;;;;
+0905;DEVANAGARI LETTER A;Lo;0;L;;;;;N;;;;;
+0906;DEVANAGARI LETTER AA;Lo;0;L;;;;;N;;;;;
+0907;DEVANAGARI LETTER I;Lo;0;L;;;;;N;;;;;
+0908;DEVANAGARI LETTER II;Lo;0;L;;;;;N;;;;;
+0909;DEVANAGARI LETTER U;Lo;0;L;;;;;N;;;;;
+090A;DEVANAGARI LETTER UU;Lo;0;L;;;;;N;;;;;
+090B;DEVANAGARI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+090C;DEVANAGARI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+090D;DEVANAGARI LETTER CANDRA E;Lo;0;L;;;;;N;;;;;
+090E;DEVANAGARI LETTER SHORT E;Lo;0;L;;;;;N;;;;;
+090F;DEVANAGARI LETTER E;Lo;0;L;;;;;N;;;;;
+0910;DEVANAGARI LETTER AI;Lo;0;L;;;;;N;;;;;
+0911;DEVANAGARI LETTER CANDRA O;Lo;0;L;;;;;N;;;;;
+0912;DEVANAGARI LETTER SHORT O;Lo;0;L;;;;;N;;;;;
+0913;DEVANAGARI LETTER O;Lo;0;L;;;;;N;;;;;
+0914;DEVANAGARI LETTER AU;Lo;0;L;;;;;N;;;;;
+0915;DEVANAGARI LETTER KA;Lo;0;L;;;;;N;;;;;
+0916;DEVANAGARI LETTER KHA;Lo;0;L;;;;;N;;;;;
+0917;DEVANAGARI LETTER GA;Lo;0;L;;;;;N;;;;;
+0918;DEVANAGARI LETTER GHA;Lo;0;L;;;;;N;;;;;
+0919;DEVANAGARI LETTER NGA;Lo;0;L;;;;;N;;;;;
+091A;DEVANAGARI LETTER CA;Lo;0;L;;;;;N;;;;;
+091B;DEVANAGARI LETTER CHA;Lo;0;L;;;;;N;;;;;
+091C;DEVANAGARI LETTER JA;Lo;0;L;;;;;N;;;;;
+091D;DEVANAGARI LETTER JHA;Lo;0;L;;;;;N;;;;;
+091E;DEVANAGARI LETTER NYA;Lo;0;L;;;;;N;;;;;
+091F;DEVANAGARI LETTER TTA;Lo;0;L;;;;;N;;;;;
+0920;DEVANAGARI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0921;DEVANAGARI LETTER DDA;Lo;0;L;;;;;N;;;;;
+0922;DEVANAGARI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0923;DEVANAGARI LETTER NNA;Lo;0;L;;;;;N;;;;;
+0924;DEVANAGARI LETTER TA;Lo;0;L;;;;;N;;;;;
+0925;DEVANAGARI LETTER THA;Lo;0;L;;;;;N;;;;;
+0926;DEVANAGARI LETTER DA;Lo;0;L;;;;;N;;;;;
+0927;DEVANAGARI LETTER DHA;Lo;0;L;;;;;N;;;;;
+0928;DEVANAGARI LETTER NA;Lo;0;L;;;;;N;;;;;
+0929;DEVANAGARI LETTER NNNA;Lo;0;L;0928 093C;;;;N;;;;;
+092A;DEVANAGARI LETTER PA;Lo;0;L;;;;;N;;;;;
+092B;DEVANAGARI LETTER PHA;Lo;0;L;;;;;N;;;;;
+092C;DEVANAGARI LETTER BA;Lo;0;L;;;;;N;;;;;
+092D;DEVANAGARI LETTER BHA;Lo;0;L;;;;;N;;;;;
+092E;DEVANAGARI LETTER MA;Lo;0;L;;;;;N;;;;;
+092F;DEVANAGARI LETTER YA;Lo;0;L;;;;;N;;;;;
+0930;DEVANAGARI LETTER RA;Lo;0;L;;;;;N;;;;;
+0931;DEVANAGARI LETTER RRA;Lo;0;L;0930 093C;;;;N;;;;;
+0932;DEVANAGARI LETTER LA;Lo;0;L;;;;;N;;;;;
+0933;DEVANAGARI LETTER LLA;Lo;0;L;;;;;N;;;;;
+0934;DEVANAGARI LETTER LLLA;Lo;0;L;0933 093C;;;;N;;;;;
+0935;DEVANAGARI LETTER VA;Lo;0;L;;;;;N;;;;;
+0936;DEVANAGARI LETTER SHA;Lo;0;L;;;;;N;;;;;
+0937;DEVANAGARI LETTER SSA;Lo;0;L;;;;;N;;;;;
+0938;DEVANAGARI LETTER SA;Lo;0;L;;;;;N;;;;;
+0939;DEVANAGARI LETTER HA;Lo;0;L;;;;;N;;;;;
+093C;DEVANAGARI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+093D;DEVANAGARI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+093E;DEVANAGARI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+093F;DEVANAGARI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+0940;DEVANAGARI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+0941;DEVANAGARI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+0942;DEVANAGARI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+0943;DEVANAGARI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+0944;DEVANAGARI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+0945;DEVANAGARI VOWEL SIGN CANDRA E;Mn;0;NSM;;;;;N;;;;;
+0946;DEVANAGARI VOWEL SIGN SHORT E;Mn;0;NSM;;;;;N;;;;;
+0947;DEVANAGARI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+0948;DEVANAGARI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+0949;DEVANAGARI VOWEL SIGN CANDRA O;Mc;0;L;;;;;N;;;;;
+094A;DEVANAGARI VOWEL SIGN SHORT O;Mc;0;L;;;;;N;;;;;
+094B;DEVANAGARI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+094C;DEVANAGARI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+094D;DEVANAGARI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0950;DEVANAGARI OM;Lo;0;L;;;;;N;;;;;
+0951;DEVANAGARI STRESS SIGN UDATTA;Mn;230;NSM;;;;;N;;;;;
+0952;DEVANAGARI STRESS SIGN ANUDATTA;Mn;220;NSM;;;;;N;;;;;
+0953;DEVANAGARI GRAVE ACCENT;Mn;230;NSM;;;;;N;;;;;
+0954;DEVANAGARI ACUTE ACCENT;Mn;230;NSM;;;;;N;;;;;
+0958;DEVANAGARI LETTER QA;Lo;0;L;0915 093C;;;;N;;;;;
+0959;DEVANAGARI LETTER KHHA;Lo;0;L;0916 093C;;;;N;;;;;
+095A;DEVANAGARI LETTER GHHA;Lo;0;L;0917 093C;;;;N;;;;;
+095B;DEVANAGARI LETTER ZA;Lo;0;L;091C 093C;;;;N;;;;;
+095C;DEVANAGARI LETTER DDDHA;Lo;0;L;0921 093C;;;;N;;;;;
+095D;DEVANAGARI LETTER RHA;Lo;0;L;0922 093C;;;;N;;;;;
+095E;DEVANAGARI LETTER FA;Lo;0;L;092B 093C;;;;N;;;;;
+095F;DEVANAGARI LETTER YYA;Lo;0;L;092F 093C;;;;N;;;;;
+0960;DEVANAGARI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0961;DEVANAGARI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0962;DEVANAGARI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0963;DEVANAGARI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0964;DEVANAGARI DANDA;Po;0;L;;;;;N;;;;;
+0965;DEVANAGARI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+0966;DEVANAGARI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0967;DEVANAGARI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0968;DEVANAGARI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0969;DEVANAGARI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+096A;DEVANAGARI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+096B;DEVANAGARI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+096C;DEVANAGARI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+096D;DEVANAGARI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+096E;DEVANAGARI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+096F;DEVANAGARI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0970;DEVANAGARI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+0971;DEVANAGARI SIGN HIGH SPACING DOT;Lm;0;L;;;;;N;;;;;
+0972;DEVANAGARI LETTER CANDRA A;Lo;0;L;;;;;N;;;;;
+097B;DEVANAGARI LETTER GGA;Lo;0;L;;;;;N;;;;;
+097C;DEVANAGARI LETTER JJA;Lo;0;L;;;;;N;;;;;
+097D;DEVANAGARI LETTER GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
+097E;DEVANAGARI LETTER DDDA;Lo;0;L;;;;;N;;;;;
+097F;DEVANAGARI LETTER BBA;Lo;0;L;;;;;N;;;;;
+0981;BENGALI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0982;BENGALI SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+0983;BENGALI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0985;BENGALI LETTER A;Lo;0;L;;;;;N;;;;;
+0986;BENGALI LETTER AA;Lo;0;L;;;;;N;;;;;
+0987;BENGALI LETTER I;Lo;0;L;;;;;N;;;;;
+0988;BENGALI LETTER II;Lo;0;L;;;;;N;;;;;
+0989;BENGALI LETTER U;Lo;0;L;;;;;N;;;;;
+098A;BENGALI LETTER UU;Lo;0;L;;;;;N;;;;;
+098B;BENGALI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+098C;BENGALI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+098F;BENGALI LETTER E;Lo;0;L;;;;;N;;;;;
+0990;BENGALI LETTER AI;Lo;0;L;;;;;N;;;;;
+0993;BENGALI LETTER O;Lo;0;L;;;;;N;;;;;
+0994;BENGALI LETTER AU;Lo;0;L;;;;;N;;;;;
+0995;BENGALI LETTER KA;Lo;0;L;;;;;N;;;;;
+0996;BENGALI LETTER KHA;Lo;0;L;;;;;N;;;;;
+0997;BENGALI LETTER GA;Lo;0;L;;;;;N;;;;;
+0998;BENGALI LETTER GHA;Lo;0;L;;;;;N;;;;;
+0999;BENGALI LETTER NGA;Lo;0;L;;;;;N;;;;;
+099A;BENGALI LETTER CA;Lo;0;L;;;;;N;;;;;
+099B;BENGALI LETTER CHA;Lo;0;L;;;;;N;;;;;
+099C;BENGALI LETTER JA;Lo;0;L;;;;;N;;;;;
+099D;BENGALI LETTER JHA;Lo;0;L;;;;;N;;;;;
+099E;BENGALI LETTER NYA;Lo;0;L;;;;;N;;;;;
+099F;BENGALI LETTER TTA;Lo;0;L;;;;;N;;;;;
+09A0;BENGALI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+09A1;BENGALI LETTER DDA;Lo;0;L;;;;;N;;;;;
+09A2;BENGALI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+09A3;BENGALI LETTER NNA;Lo;0;L;;;;;N;;;;;
+09A4;BENGALI LETTER TA;Lo;0;L;;;;;N;;;;;
+09A5;BENGALI LETTER THA;Lo;0;L;;;;;N;;;;;
+09A6;BENGALI LETTER DA;Lo;0;L;;;;;N;;;;;
+09A7;BENGALI LETTER DHA;Lo;0;L;;;;;N;;;;;
+09A8;BENGALI LETTER NA;Lo;0;L;;;;;N;;;;;
+09AA;BENGALI LETTER PA;Lo;0;L;;;;;N;;;;;
+09AB;BENGALI LETTER PHA;Lo;0;L;;;;;N;;;;;
+09AC;BENGALI LETTER BA;Lo;0;L;;;;;N;;;;;
+09AD;BENGALI LETTER BHA;Lo;0;L;;;;;N;;;;;
+09AE;BENGALI LETTER MA;Lo;0;L;;;;;N;;;;;
+09AF;BENGALI LETTER YA;Lo;0;L;;;;;N;;;;;
+09B0;BENGALI LETTER RA;Lo;0;L;;;;;N;;;;;
+09B2;BENGALI LETTER LA;Lo;0;L;;;;;N;;;;;
+09B6;BENGALI LETTER SHA;Lo;0;L;;;;;N;;;;;
+09B7;BENGALI LETTER SSA;Lo;0;L;;;;;N;;;;;
+09B8;BENGALI LETTER SA;Lo;0;L;;;;;N;;;;;
+09B9;BENGALI LETTER HA;Lo;0;L;;;;;N;;;;;
+09BC;BENGALI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+09BD;BENGALI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+09BE;BENGALI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+09BF;BENGALI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+09C0;BENGALI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+09C1;BENGALI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+09C2;BENGALI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+09C3;BENGALI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+09C4;BENGALI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+09C7;BENGALI VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+09C8;BENGALI VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+09CB;BENGALI VOWEL SIGN O;Mc;0;L;09C7 09BE;;;;N;;;;;
+09CC;BENGALI VOWEL SIGN AU;Mc;0;L;09C7 09D7;;;;N;;;;;
+09CD;BENGALI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+09CE;BENGALI LETTER KHANDA TA;Lo;0;L;;;;;N;;;;;
+09D7;BENGALI AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
+09DC;BENGALI LETTER RRA;Lo;0;L;09A1 09BC;;;;N;;;;;
+09DD;BENGALI LETTER RHA;Lo;0;L;09A2 09BC;;;;N;;;;;
+09DF;BENGALI LETTER YYA;Lo;0;L;09AF 09BC;;;;N;;;;;
+09E0;BENGALI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+09E1;BENGALI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+09E2;BENGALI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+09E3;BENGALI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+09E6;BENGALI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+09E7;BENGALI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+09E8;BENGALI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+09E9;BENGALI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+09EA;BENGALI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+09EB;BENGALI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+09EC;BENGALI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+09ED;BENGALI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+09EE;BENGALI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+09EF;BENGALI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+09F0;BENGALI LETTER RA WITH MIDDLE DIAGONAL;Lo;0;L;;;;;N;;Assamese;;;
+09F1;BENGALI LETTER RA WITH LOWER DIAGONAL;Lo;0;L;;;;;N;BENGALI LETTER VA WITH LOWER DIAGONAL;Assamese;;;
+09F2;BENGALI RUPEE MARK;Sc;0;ET;;;;;N;;;;;
+09F3;BENGALI RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
+09F4;BENGALI CURRENCY NUMERATOR ONE;No;0;L;;;;1;N;;;;;
+09F5;BENGALI CURRENCY NUMERATOR TWO;No;0;L;;;;2;N;;;;;
+09F6;BENGALI CURRENCY NUMERATOR THREE;No;0;L;;;;3;N;;;;;
+09F7;BENGALI CURRENCY NUMERATOR FOUR;No;0;L;;;;4;N;;;;;
+09F8;BENGALI CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR;No;0;L;;;;;N;;;;;
+09F9;BENGALI CURRENCY DENOMINATOR SIXTEEN;No;0;L;;;;16;N;;;;;
+09FA;BENGALI ISSHAR;So;0;L;;;;;N;;;;;
+0A01;GURMUKHI SIGN ADAK BINDI;Mn;0;NSM;;;;;N;;;;;
+0A02;GURMUKHI SIGN BINDI;Mn;0;NSM;;;;;N;;;;;
+0A03;GURMUKHI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0A05;GURMUKHI LETTER A;Lo;0;L;;;;;N;;;;;
+0A06;GURMUKHI LETTER AA;Lo;0;L;;;;;N;;;;;
+0A07;GURMUKHI LETTER I;Lo;0;L;;;;;N;;;;;
+0A08;GURMUKHI LETTER II;Lo;0;L;;;;;N;;;;;
+0A09;GURMUKHI LETTER U;Lo;0;L;;;;;N;;;;;
+0A0A;GURMUKHI LETTER UU;Lo;0;L;;;;;N;;;;;
+0A0F;GURMUKHI LETTER EE;Lo;0;L;;;;;N;;;;;
+0A10;GURMUKHI LETTER AI;Lo;0;L;;;;;N;;;;;
+0A13;GURMUKHI LETTER OO;Lo;0;L;;;;;N;;;;;
+0A14;GURMUKHI LETTER AU;Lo;0;L;;;;;N;;;;;
+0A15;GURMUKHI LETTER KA;Lo;0;L;;;;;N;;;;;
+0A16;GURMUKHI LETTER KHA;Lo;0;L;;;;;N;;;;;
+0A17;GURMUKHI LETTER GA;Lo;0;L;;;;;N;;;;;
+0A18;GURMUKHI LETTER GHA;Lo;0;L;;;;;N;;;;;
+0A19;GURMUKHI LETTER NGA;Lo;0;L;;;;;N;;;;;
+0A1A;GURMUKHI LETTER CA;Lo;0;L;;;;;N;;;;;
+0A1B;GURMUKHI LETTER CHA;Lo;0;L;;;;;N;;;;;
+0A1C;GURMUKHI LETTER JA;Lo;0;L;;;;;N;;;;;
+0A1D;GURMUKHI LETTER JHA;Lo;0;L;;;;;N;;;;;
+0A1E;GURMUKHI LETTER NYA;Lo;0;L;;;;;N;;;;;
+0A1F;GURMUKHI LETTER TTA;Lo;0;L;;;;;N;;;;;
+0A20;GURMUKHI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0A21;GURMUKHI LETTER DDA;Lo;0;L;;;;;N;;;;;
+0A22;GURMUKHI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0A23;GURMUKHI LETTER NNA;Lo;0;L;;;;;N;;;;;
+0A24;GURMUKHI LETTER TA;Lo;0;L;;;;;N;;;;;
+0A25;GURMUKHI LETTER THA;Lo;0;L;;;;;N;;;;;
+0A26;GURMUKHI LETTER DA;Lo;0;L;;;;;N;;;;;
+0A27;GURMUKHI LETTER DHA;Lo;0;L;;;;;N;;;;;
+0A28;GURMUKHI LETTER NA;Lo;0;L;;;;;N;;;;;
+0A2A;GURMUKHI LETTER PA;Lo;0;L;;;;;N;;;;;
+0A2B;GURMUKHI LETTER PHA;Lo;0;L;;;;;N;;;;;
+0A2C;GURMUKHI LETTER BA;Lo;0;L;;;;;N;;;;;
+0A2D;GURMUKHI LETTER BHA;Lo;0;L;;;;;N;;;;;
+0A2E;GURMUKHI LETTER MA;Lo;0;L;;;;;N;;;;;
+0A2F;GURMUKHI LETTER YA;Lo;0;L;;;;;N;;;;;
+0A30;GURMUKHI LETTER RA;Lo;0;L;;;;;N;;;;;
+0A32;GURMUKHI LETTER LA;Lo;0;L;;;;;N;;;;;
+0A33;GURMUKHI LETTER LLA;Lo;0;L;0A32 0A3C;;;;N;;;;;
+0A35;GURMUKHI LETTER VA;Lo;0;L;;;;;N;;;;;
+0A36;GURMUKHI LETTER SHA;Lo;0;L;0A38 0A3C;;;;N;;;;;
+0A38;GURMUKHI LETTER SA;Lo;0;L;;;;;N;;;;;
+0A39;GURMUKHI LETTER HA;Lo;0;L;;;;;N;;;;;
+0A3C;GURMUKHI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+0A3E;GURMUKHI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0A3F;GURMUKHI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+0A40;GURMUKHI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+0A41;GURMUKHI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+0A42;GURMUKHI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+0A47;GURMUKHI VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;;
+0A48;GURMUKHI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+0A4B;GURMUKHI VOWEL SIGN OO;Mn;0;NSM;;;;;N;;;;;
+0A4C;GURMUKHI VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+0A4D;GURMUKHI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0A51;GURMUKHI SIGN UDAAT;Mn;0;NSM;;;;;N;;;;;
+0A59;GURMUKHI LETTER KHHA;Lo;0;L;0A16 0A3C;;;;N;;;;;
+0A5A;GURMUKHI LETTER GHHA;Lo;0;L;0A17 0A3C;;;;N;;;;;
+0A5B;GURMUKHI LETTER ZA;Lo;0;L;0A1C 0A3C;;;;N;;;;;
+0A5C;GURMUKHI LETTER RRA;Lo;0;L;;;;;N;;;;;
+0A5E;GURMUKHI LETTER FA;Lo;0;L;0A2B 0A3C;;;;N;;;;;
+0A66;GURMUKHI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0A67;GURMUKHI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0A68;GURMUKHI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0A69;GURMUKHI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0A6A;GURMUKHI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0A6B;GURMUKHI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0A6C;GURMUKHI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0A6D;GURMUKHI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0A6E;GURMUKHI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0A6F;GURMUKHI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0A70;GURMUKHI TIPPI;Mn;0;NSM;;;;;N;;;;;
+0A71;GURMUKHI ADDAK;Mn;0;NSM;;;;;N;;;;;
+0A72;GURMUKHI IRI;Lo;0;L;;;;;N;;;;;
+0A73;GURMUKHI URA;Lo;0;L;;;;;N;;;;;
+0A74;GURMUKHI EK ONKAR;Lo;0;L;;;;;N;;;;;
+0A75;GURMUKHI SIGN YAKASH;Mn;0;NSM;;;;;N;;;;;
+0A81;GUJARATI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0A82;GUJARATI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+0A83;GUJARATI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0A85;GUJARATI LETTER A;Lo;0;L;;;;;N;;;;;
+0A86;GUJARATI LETTER AA;Lo;0;L;;;;;N;;;;;
+0A87;GUJARATI LETTER I;Lo;0;L;;;;;N;;;;;
+0A88;GUJARATI LETTER II;Lo;0;L;;;;;N;;;;;
+0A89;GUJARATI LETTER U;Lo;0;L;;;;;N;;;;;
+0A8A;GUJARATI LETTER UU;Lo;0;L;;;;;N;;;;;
+0A8B;GUJARATI LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+0A8C;GUJARATI LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+0A8D;GUJARATI VOWEL CANDRA E;Lo;0;L;;;;;N;;;;;
+0A8F;GUJARATI LETTER E;Lo;0;L;;;;;N;;;;;
+0A90;GUJARATI LETTER AI;Lo;0;L;;;;;N;;;;;
+0A91;GUJARATI VOWEL CANDRA O;Lo;0;L;;;;;N;;;;;
+0A93;GUJARATI LETTER O;Lo;0;L;;;;;N;;;;;
+0A94;GUJARATI LETTER AU;Lo;0;L;;;;;N;;;;;
+0A95;GUJARATI LETTER KA;Lo;0;L;;;;;N;;;;;
+0A96;GUJARATI LETTER KHA;Lo;0;L;;;;;N;;;;;
+0A97;GUJARATI LETTER GA;Lo;0;L;;;;;N;;;;;
+0A98;GUJARATI LETTER GHA;Lo;0;L;;;;;N;;;;;
+0A99;GUJARATI LETTER NGA;Lo;0;L;;;;;N;;;;;
+0A9A;GUJARATI LETTER CA;Lo;0;L;;;;;N;;;;;
+0A9B;GUJARATI LETTER CHA;Lo;0;L;;;;;N;;;;;
+0A9C;GUJARATI LETTER JA;Lo;0;L;;;;;N;;;;;
+0A9D;GUJARATI LETTER JHA;Lo;0;L;;;;;N;;;;;
+0A9E;GUJARATI LETTER NYA;Lo;0;L;;;;;N;;;;;
+0A9F;GUJARATI LETTER TTA;Lo;0;L;;;;;N;;;;;
+0AA0;GUJARATI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0AA1;GUJARATI LETTER DDA;Lo;0;L;;;;;N;;;;;
+0AA2;GUJARATI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0AA3;GUJARATI LETTER NNA;Lo;0;L;;;;;N;;;;;
+0AA4;GUJARATI LETTER TA;Lo;0;L;;;;;N;;;;;
+0AA5;GUJARATI LETTER THA;Lo;0;L;;;;;N;;;;;
+0AA6;GUJARATI LETTER DA;Lo;0;L;;;;;N;;;;;
+0AA7;GUJARATI LETTER DHA;Lo;0;L;;;;;N;;;;;
+0AA8;GUJARATI LETTER NA;Lo;0;L;;;;;N;;;;;
+0AAA;GUJARATI LETTER PA;Lo;0;L;;;;;N;;;;;
+0AAB;GUJARATI LETTER PHA;Lo;0;L;;;;;N;;;;;
+0AAC;GUJARATI LETTER BA;Lo;0;L;;;;;N;;;;;
+0AAD;GUJARATI LETTER BHA;Lo;0;L;;;;;N;;;;;
+0AAE;GUJARATI LETTER MA;Lo;0;L;;;;;N;;;;;
+0AAF;GUJARATI LETTER YA;Lo;0;L;;;;;N;;;;;
+0AB0;GUJARATI LETTER RA;Lo;0;L;;;;;N;;;;;
+0AB2;GUJARATI LETTER LA;Lo;0;L;;;;;N;;;;;
+0AB3;GUJARATI LETTER LLA;Lo;0;L;;;;;N;;;;;
+0AB5;GUJARATI LETTER VA;Lo;0;L;;;;;N;;;;;
+0AB6;GUJARATI LETTER SHA;Lo;0;L;;;;;N;;;;;
+0AB7;GUJARATI LETTER SSA;Lo;0;L;;;;;N;;;;;
+0AB8;GUJARATI LETTER SA;Lo;0;L;;;;;N;;;;;
+0AB9;GUJARATI LETTER HA;Lo;0;L;;;;;N;;;;;
+0ABC;GUJARATI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+0ABD;GUJARATI SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+0ABE;GUJARATI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0ABF;GUJARATI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+0AC0;GUJARATI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+0AC1;GUJARATI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+0AC2;GUJARATI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+0AC3;GUJARATI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+0AC4;GUJARATI VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+0AC5;GUJARATI VOWEL SIGN CANDRA E;Mn;0;NSM;;;;;N;;;;;
+0AC7;GUJARATI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+0AC8;GUJARATI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+0AC9;GUJARATI VOWEL SIGN CANDRA O;Mc;0;L;;;;;N;;;;;
+0ACB;GUJARATI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+0ACC;GUJARATI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+0ACD;GUJARATI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0AD0;GUJARATI OM;Lo;0;L;;;;;N;;;;;
+0AE0;GUJARATI LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0AE1;GUJARATI LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0AE2;GUJARATI VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0AE3;GUJARATI VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0AE6;GUJARATI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0AE7;GUJARATI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0AE8;GUJARATI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0AE9;GUJARATI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0AEA;GUJARATI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0AEB;GUJARATI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0AEC;GUJARATI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0AED;GUJARATI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0AEE;GUJARATI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0AEF;GUJARATI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0AF1;GUJARATI RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
+0B01;ORIYA SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+0B02;ORIYA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+0B03;ORIYA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0B05;ORIYA LETTER A;Lo;0;L;;;;;N;;;;;
+0B06;ORIYA LETTER AA;Lo;0;L;;;;;N;;;;;
+0B07;ORIYA LETTER I;Lo;0;L;;;;;N;;;;;
+0B08;ORIYA LETTER II;Lo;0;L;;;;;N;;;;;
+0B09;ORIYA LETTER U;Lo;0;L;;;;;N;;;;;
+0B0A;ORIYA LETTER UU;Lo;0;L;;;;;N;;;;;
+0B0B;ORIYA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+0B0C;ORIYA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+0B0F;ORIYA LETTER E;Lo;0;L;;;;;N;;;;;
+0B10;ORIYA LETTER AI;Lo;0;L;;;;;N;;;;;
+0B13;ORIYA LETTER O;Lo;0;L;;;;;N;;;;;
+0B14;ORIYA LETTER AU;Lo;0;L;;;;;N;;;;;
+0B15;ORIYA LETTER KA;Lo;0;L;;;;;N;;;;;
+0B16;ORIYA LETTER KHA;Lo;0;L;;;;;N;;;;;
+0B17;ORIYA LETTER GA;Lo;0;L;;;;;N;;;;;
+0B18;ORIYA LETTER GHA;Lo;0;L;;;;;N;;;;;
+0B19;ORIYA LETTER NGA;Lo;0;L;;;;;N;;;;;
+0B1A;ORIYA LETTER CA;Lo;0;L;;;;;N;;;;;
+0B1B;ORIYA LETTER CHA;Lo;0;L;;;;;N;;;;;
+0B1C;ORIYA LETTER JA;Lo;0;L;;;;;N;;;;;
+0B1D;ORIYA LETTER JHA;Lo;0;L;;;;;N;;;;;
+0B1E;ORIYA LETTER NYA;Lo;0;L;;;;;N;;;;;
+0B1F;ORIYA LETTER TTA;Lo;0;L;;;;;N;;;;;
+0B20;ORIYA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0B21;ORIYA LETTER DDA;Lo;0;L;;;;;N;;;;;
+0B22;ORIYA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0B23;ORIYA LETTER NNA;Lo;0;L;;;;;N;;;;;
+0B24;ORIYA LETTER TA;Lo;0;L;;;;;N;;;;;
+0B25;ORIYA LETTER THA;Lo;0;L;;;;;N;;;;;
+0B26;ORIYA LETTER DA;Lo;0;L;;;;;N;;;;;
+0B27;ORIYA LETTER DHA;Lo;0;L;;;;;N;;;;;
+0B28;ORIYA LETTER NA;Lo;0;L;;;;;N;;;;;
+0B2A;ORIYA LETTER PA;Lo;0;L;;;;;N;;;;;
+0B2B;ORIYA LETTER PHA;Lo;0;L;;;;;N;;;;;
+0B2C;ORIYA LETTER BA;Lo;0;L;;;;;N;;;;;
+0B2D;ORIYA LETTER BHA;Lo;0;L;;;;;N;;;;;
+0B2E;ORIYA LETTER MA;Lo;0;L;;;;;N;;;;;
+0B2F;ORIYA LETTER YA;Lo;0;L;;;;;N;;;;;
+0B30;ORIYA LETTER RA;Lo;0;L;;;;;N;;;;;
+0B32;ORIYA LETTER LA;Lo;0;L;;;;;N;;;;;
+0B33;ORIYA LETTER LLA;Lo;0;L;;;;;N;;;;;
+0B35;ORIYA LETTER VA;Lo;0;L;;;;;N;;;;;
+0B36;ORIYA LETTER SHA;Lo;0;L;;;;;N;;;;;
+0B37;ORIYA LETTER SSA;Lo;0;L;;;;;N;;;;;
+0B38;ORIYA LETTER SA;Lo;0;L;;;;;N;;;;;
+0B39;ORIYA LETTER HA;Lo;0;L;;;;;N;;;;;
+0B3C;ORIYA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+0B3D;ORIYA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+0B3E;ORIYA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0B3F;ORIYA VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+0B40;ORIYA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+0B41;ORIYA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+0B42;ORIYA VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+0B43;ORIYA VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+0B44;ORIYA VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+0B47;ORIYA VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+0B48;ORIYA VOWEL SIGN AI;Mc;0;L;0B47 0B56;;;;N;;;;;
+0B4B;ORIYA VOWEL SIGN O;Mc;0;L;0B47 0B3E;;;;N;;;;;
+0B4C;ORIYA VOWEL SIGN AU;Mc;0;L;0B47 0B57;;;;N;;;;;
+0B4D;ORIYA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0B56;ORIYA AI LENGTH MARK;Mn;0;NSM;;;;;N;;;;;
+0B57;ORIYA AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0B5C;ORIYA LETTER RRA;Lo;0;L;0B21 0B3C;;;;N;;;;;
+0B5D;ORIYA LETTER RHA;Lo;0;L;0B22 0B3C;;;;N;;;;;
+0B5F;ORIYA LETTER YYA;Lo;0;L;;;;;N;;;;;
+0B60;ORIYA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0B61;ORIYA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0B62;ORIYA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0B63;ORIYA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0B66;ORIYA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0B67;ORIYA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0B68;ORIYA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0B69;ORIYA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0B6A;ORIYA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0B6B;ORIYA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0B6C;ORIYA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0B6D;ORIYA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0B6E;ORIYA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0B6F;ORIYA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0B70;ORIYA ISSHAR;So;0;L;;;;;N;;;;;
+0B71;ORIYA LETTER WA;Lo;0;L;;;;;N;;;;;
+0B82;TAMIL SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+0B83;TAMIL SIGN VISARGA;Lo;0;L;;;;;N;;;;;
+0B85;TAMIL LETTER A;Lo;0;L;;;;;N;;;;;
+0B86;TAMIL LETTER AA;Lo;0;L;;;;;N;;;;;
+0B87;TAMIL LETTER I;Lo;0;L;;;;;N;;;;;
+0B88;TAMIL LETTER II;Lo;0;L;;;;;N;;;;;
+0B89;TAMIL LETTER U;Lo;0;L;;;;;N;;;;;
+0B8A;TAMIL LETTER UU;Lo;0;L;;;;;N;;;;;
+0B8E;TAMIL LETTER E;Lo;0;L;;;;;N;;;;;
+0B8F;TAMIL LETTER EE;Lo;0;L;;;;;N;;;;;
+0B90;TAMIL LETTER AI;Lo;0;L;;;;;N;;;;;
+0B92;TAMIL LETTER O;Lo;0;L;;;;;N;;;;;
+0B93;TAMIL LETTER OO;Lo;0;L;;;;;N;;;;;
+0B94;TAMIL LETTER AU;Lo;0;L;0B92 0BD7;;;;N;;;;;
+0B95;TAMIL LETTER KA;Lo;0;L;;;;;N;;;;;
+0B99;TAMIL LETTER NGA;Lo;0;L;;;;;N;;;;;
+0B9A;TAMIL LETTER CA;Lo;0;L;;;;;N;;;;;
+0B9C;TAMIL LETTER JA;Lo;0;L;;;;;N;;;;;
+0B9E;TAMIL LETTER NYA;Lo;0;L;;;;;N;;;;;
+0B9F;TAMIL LETTER TTA;Lo;0;L;;;;;N;;;;;
+0BA3;TAMIL LETTER NNA;Lo;0;L;;;;;N;;;;;
+0BA4;TAMIL LETTER TA;Lo;0;L;;;;;N;;;;;
+0BA8;TAMIL LETTER NA;Lo;0;L;;;;;N;;;;;
+0BA9;TAMIL LETTER NNNA;Lo;0;L;;;;;N;;;;;
+0BAA;TAMIL LETTER PA;Lo;0;L;;;;;N;;;;;
+0BAE;TAMIL LETTER MA;Lo;0;L;;;;;N;;;;;
+0BAF;TAMIL LETTER YA;Lo;0;L;;;;;N;;;;;
+0BB0;TAMIL LETTER RA;Lo;0;L;;;;;N;;;;;
+0BB1;TAMIL LETTER RRA;Lo;0;L;;;;;N;;;;;
+0BB2;TAMIL LETTER LA;Lo;0;L;;;;;N;;;;;
+0BB3;TAMIL LETTER LLA;Lo;0;L;;;;;N;;;;;
+0BB4;TAMIL LETTER LLLA;Lo;0;L;;;;;N;;;;;
+0BB5;TAMIL LETTER VA;Lo;0;L;;;;;N;;;;;
+0BB6;TAMIL LETTER SHA;Lo;0;L;;;;;N;;;;;
+0BB7;TAMIL LETTER SSA;Lo;0;L;;;;;N;;;;;
+0BB8;TAMIL LETTER SA;Lo;0;L;;;;;N;;;;;
+0BB9;TAMIL LETTER HA;Lo;0;L;;;;;N;;;;;
+0BBE;TAMIL VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0BBF;TAMIL VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+0BC0;TAMIL VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+0BC1;TAMIL VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+0BC2;TAMIL VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+0BC6;TAMIL VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+0BC7;TAMIL VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
+0BC8;TAMIL VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+0BCA;TAMIL VOWEL SIGN O;Mc;0;L;0BC6 0BBE;;;;N;;;;;
+0BCB;TAMIL VOWEL SIGN OO;Mc;0;L;0BC7 0BBE;;;;N;;;;;
+0BCC;TAMIL VOWEL SIGN AU;Mc;0;L;0BC6 0BD7;;;;N;;;;;
+0BCD;TAMIL SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0BD0;TAMIL OM;Lo;0;L;;;;;N;;;;;
+0BD7;TAMIL AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0BE6;TAMIL DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0BE7;TAMIL DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0BE8;TAMIL DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0BE9;TAMIL DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0BEA;TAMIL DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0BEB;TAMIL DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0BEC;TAMIL DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0BED;TAMIL DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0BEE;TAMIL DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0BEF;TAMIL DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0BF0;TAMIL NUMBER TEN;No;0;L;;;;10;N;;;;;
+0BF1;TAMIL NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;;
+0BF2;TAMIL NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;;
+0BF3;TAMIL DAY SIGN;So;0;ON;;;;;N;;Naal;;;
+0BF4;TAMIL MONTH SIGN;So;0;ON;;;;;N;;Maatham;;;
+0BF5;TAMIL YEAR SIGN;So;0;ON;;;;;N;;Varudam;;;
+0BF6;TAMIL DEBIT SIGN;So;0;ON;;;;;N;;Patru;;;
+0BF7;TAMIL CREDIT SIGN;So;0;ON;;;;;N;;Varavu;;;
+0BF8;TAMIL AS ABOVE SIGN;So;0;ON;;;;;N;;Merpadi;;;
+0BF9;TAMIL RUPEE SIGN;Sc;0;ET;;;;;N;;Rupai;;;
+0BFA;TAMIL NUMBER SIGN;So;0;ON;;;;;N;;Enn;;;
+0C01;TELUGU SIGN CANDRABINDU;Mc;0;L;;;;;N;;;;;
+0C02;TELUGU SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+0C03;TELUGU SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0C05;TELUGU LETTER A;Lo;0;L;;;;;N;;;;;
+0C06;TELUGU LETTER AA;Lo;0;L;;;;;N;;;;;
+0C07;TELUGU LETTER I;Lo;0;L;;;;;N;;;;;
+0C08;TELUGU LETTER II;Lo;0;L;;;;;N;;;;;
+0C09;TELUGU LETTER U;Lo;0;L;;;;;N;;;;;
+0C0A;TELUGU LETTER UU;Lo;0;L;;;;;N;;;;;
+0C0B;TELUGU LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+0C0C;TELUGU LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+0C0E;TELUGU LETTER E;Lo;0;L;;;;;N;;;;;
+0C0F;TELUGU LETTER EE;Lo;0;L;;;;;N;;;;;
+0C10;TELUGU LETTER AI;Lo;0;L;;;;;N;;;;;
+0C12;TELUGU LETTER O;Lo;0;L;;;;;N;;;;;
+0C13;TELUGU LETTER OO;Lo;0;L;;;;;N;;;;;
+0C14;TELUGU LETTER AU;Lo;0;L;;;;;N;;;;;
+0C15;TELUGU LETTER KA;Lo;0;L;;;;;N;;;;;
+0C16;TELUGU LETTER KHA;Lo;0;L;;;;;N;;;;;
+0C17;TELUGU LETTER GA;Lo;0;L;;;;;N;;;;;
+0C18;TELUGU LETTER GHA;Lo;0;L;;;;;N;;;;;
+0C19;TELUGU LETTER NGA;Lo;0;L;;;;;N;;;;;
+0C1A;TELUGU LETTER CA;Lo;0;L;;;;;N;;;;;
+0C1B;TELUGU LETTER CHA;Lo;0;L;;;;;N;;;;;
+0C1C;TELUGU LETTER JA;Lo;0;L;;;;;N;;;;;
+0C1D;TELUGU LETTER JHA;Lo;0;L;;;;;N;;;;;
+0C1E;TELUGU LETTER NYA;Lo;0;L;;;;;N;;;;;
+0C1F;TELUGU LETTER TTA;Lo;0;L;;;;;N;;;;;
+0C20;TELUGU LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0C21;TELUGU LETTER DDA;Lo;0;L;;;;;N;;;;;
+0C22;TELUGU LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0C23;TELUGU LETTER NNA;Lo;0;L;;;;;N;;;;;
+0C24;TELUGU LETTER TA;Lo;0;L;;;;;N;;;;;
+0C25;TELUGU LETTER THA;Lo;0;L;;;;;N;;;;;
+0C26;TELUGU LETTER DA;Lo;0;L;;;;;N;;;;;
+0C27;TELUGU LETTER DHA;Lo;0;L;;;;;N;;;;;
+0C28;TELUGU LETTER NA;Lo;0;L;;;;;N;;;;;
+0C2A;TELUGU LETTER PA;Lo;0;L;;;;;N;;;;;
+0C2B;TELUGU LETTER PHA;Lo;0;L;;;;;N;;;;;
+0C2C;TELUGU LETTER BA;Lo;0;L;;;;;N;;;;;
+0C2D;TELUGU LETTER BHA;Lo;0;L;;;;;N;;;;;
+0C2E;TELUGU LETTER MA;Lo;0;L;;;;;N;;;;;
+0C2F;TELUGU LETTER YA;Lo;0;L;;;;;N;;;;;
+0C30;TELUGU LETTER RA;Lo;0;L;;;;;N;;;;;
+0C31;TELUGU LETTER RRA;Lo;0;L;;;;;N;;;;;
+0C32;TELUGU LETTER LA;Lo;0;L;;;;;N;;;;;
+0C33;TELUGU LETTER LLA;Lo;0;L;;;;;N;;;;;
+0C35;TELUGU LETTER VA;Lo;0;L;;;;;N;;;;;
+0C36;TELUGU LETTER SHA;Lo;0;L;;;;;N;;;;;
+0C37;TELUGU LETTER SSA;Lo;0;L;;;;;N;;;;;
+0C38;TELUGU LETTER SA;Lo;0;L;;;;;N;;;;;
+0C39;TELUGU LETTER HA;Lo;0;L;;;;;N;;;;;
+0C3D;TELUGU SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+0C3E;TELUGU VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
+0C3F;TELUGU VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+0C40;TELUGU VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+0C41;TELUGU VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+0C42;TELUGU VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+0C43;TELUGU VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
+0C44;TELUGU VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
+0C46;TELUGU VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+0C47;TELUGU VOWEL SIGN EE;Mn;0;NSM;;;;;N;;;;;
+0C48;TELUGU VOWEL SIGN AI;Mn;0;NSM;0C46 0C56;;;;N;;;;;
+0C4A;TELUGU VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+0C4B;TELUGU VOWEL SIGN OO;Mn;0;NSM;;;;;N;;;;;
+0C4C;TELUGU VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+0C4D;TELUGU SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0C55;TELUGU LENGTH MARK;Mn;84;NSM;;;;;N;;;;;
+0C56;TELUGU AI LENGTH MARK;Mn;91;NSM;;;;;N;;;;;
+0C58;TELUGU LETTER TSA;Lo;0;L;;;;;N;;;;;
+0C59;TELUGU LETTER DZA;Lo;0;L;;;;;N;;;;;
+0C60;TELUGU LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0C61;TELUGU LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0C62;TELUGU VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0C63;TELUGU VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0C66;TELUGU DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0C67;TELUGU DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0C68;TELUGU DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0C69;TELUGU DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0C6A;TELUGU DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0C6B;TELUGU DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0C6C;TELUGU DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0C6D;TELUGU DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0C6E;TELUGU DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0C6F;TELUGU DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0C78;TELUGU FRACTION DIGIT ZERO FOR ODD POWERS OF FOUR;No;0;ON;;;;0;N;;;;;
+0C79;TELUGU FRACTION DIGIT ONE FOR ODD POWERS OF FOUR;No;0;ON;;;;1;N;;;;;
+0C7A;TELUGU FRACTION DIGIT TWO FOR ODD POWERS OF FOUR;No;0;ON;;;;2;N;;;;;
+0C7B;TELUGU FRACTION DIGIT THREE FOR ODD POWERS OF FOUR;No;0;ON;;;;3;N;;;;;
+0C7C;TELUGU FRACTION DIGIT ONE FOR EVEN POWERS OF FOUR;No;0;ON;;;;1;N;;;;;
+0C7D;TELUGU FRACTION DIGIT TWO FOR EVEN POWERS OF FOUR;No;0;ON;;;;2;N;;;;;
+0C7E;TELUGU FRACTION DIGIT THREE FOR EVEN POWERS OF FOUR;No;0;ON;;;;3;N;;;;;
+0C7F;TELUGU SIGN TUUMU;So;0;L;;;;;N;;;;;
+0C82;KANNADA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+0C83;KANNADA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0C85;KANNADA LETTER A;Lo;0;L;;;;;N;;;;;
+0C86;KANNADA LETTER AA;Lo;0;L;;;;;N;;;;;
+0C87;KANNADA LETTER I;Lo;0;L;;;;;N;;;;;
+0C88;KANNADA LETTER II;Lo;0;L;;;;;N;;;;;
+0C89;KANNADA LETTER U;Lo;0;L;;;;;N;;;;;
+0C8A;KANNADA LETTER UU;Lo;0;L;;;;;N;;;;;
+0C8B;KANNADA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+0C8C;KANNADA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+0C8E;KANNADA LETTER E;Lo;0;L;;;;;N;;;;;
+0C8F;KANNADA LETTER EE;Lo;0;L;;;;;N;;;;;
+0C90;KANNADA LETTER AI;Lo;0;L;;;;;N;;;;;
+0C92;KANNADA LETTER O;Lo;0;L;;;;;N;;;;;
+0C93;KANNADA LETTER OO;Lo;0;L;;;;;N;;;;;
+0C94;KANNADA LETTER AU;Lo;0;L;;;;;N;;;;;
+0C95;KANNADA LETTER KA;Lo;0;L;;;;;N;;;;;
+0C96;KANNADA LETTER KHA;Lo;0;L;;;;;N;;;;;
+0C97;KANNADA LETTER GA;Lo;0;L;;;;;N;;;;;
+0C98;KANNADA LETTER GHA;Lo;0;L;;;;;N;;;;;
+0C99;KANNADA LETTER NGA;Lo;0;L;;;;;N;;;;;
+0C9A;KANNADA LETTER CA;Lo;0;L;;;;;N;;;;;
+0C9B;KANNADA LETTER CHA;Lo;0;L;;;;;N;;;;;
+0C9C;KANNADA LETTER JA;Lo;0;L;;;;;N;;;;;
+0C9D;KANNADA LETTER JHA;Lo;0;L;;;;;N;;;;;
+0C9E;KANNADA LETTER NYA;Lo;0;L;;;;;N;;;;;
+0C9F;KANNADA LETTER TTA;Lo;0;L;;;;;N;;;;;
+0CA0;KANNADA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0CA1;KANNADA LETTER DDA;Lo;0;L;;;;;N;;;;;
+0CA2;KANNADA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0CA3;KANNADA LETTER NNA;Lo;0;L;;;;;N;;;;;
+0CA4;KANNADA LETTER TA;Lo;0;L;;;;;N;;;;;
+0CA5;KANNADA LETTER THA;Lo;0;L;;;;;N;;;;;
+0CA6;KANNADA LETTER DA;Lo;0;L;;;;;N;;;;;
+0CA7;KANNADA LETTER DHA;Lo;0;L;;;;;N;;;;;
+0CA8;KANNADA LETTER NA;Lo;0;L;;;;;N;;;;;
+0CAA;KANNADA LETTER PA;Lo;0;L;;;;;N;;;;;
+0CAB;KANNADA LETTER PHA;Lo;0;L;;;;;N;;;;;
+0CAC;KANNADA LETTER BA;Lo;0;L;;;;;N;;;;;
+0CAD;KANNADA LETTER BHA;Lo;0;L;;;;;N;;;;;
+0CAE;KANNADA LETTER MA;Lo;0;L;;;;;N;;;;;
+0CAF;KANNADA LETTER YA;Lo;0;L;;;;;N;;;;;
+0CB0;KANNADA LETTER RA;Lo;0;L;;;;;N;;;;;
+0CB1;KANNADA LETTER RRA;Lo;0;L;;;;;N;;;;;
+0CB2;KANNADA LETTER LA;Lo;0;L;;;;;N;;;;;
+0CB3;KANNADA LETTER LLA;Lo;0;L;;;;;N;;;;;
+0CB5;KANNADA LETTER VA;Lo;0;L;;;;;N;;;;;
+0CB6;KANNADA LETTER SHA;Lo;0;L;;;;;N;;;;;
+0CB7;KANNADA LETTER SSA;Lo;0;L;;;;;N;;;;;
+0CB8;KANNADA LETTER SA;Lo;0;L;;;;;N;;;;;
+0CB9;KANNADA LETTER HA;Lo;0;L;;;;;N;;;;;
+0CBC;KANNADA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+0CBD;KANNADA SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+0CBE;KANNADA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0CBF;KANNADA VOWEL SIGN I;Mn;0;L;;;;;N;;;;;
+0CC0;KANNADA VOWEL SIGN II;Mc;0;L;0CBF 0CD5;;;;N;;;;;
+0CC1;KANNADA VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+0CC2;KANNADA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+0CC3;KANNADA VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
+0CC4;KANNADA VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
+0CC6;KANNADA VOWEL SIGN E;Mn;0;L;;;;;N;;;;;
+0CC7;KANNADA VOWEL SIGN EE;Mc;0;L;0CC6 0CD5;;;;N;;;;;
+0CC8;KANNADA VOWEL SIGN AI;Mc;0;L;0CC6 0CD6;;;;N;;;;;
+0CCA;KANNADA VOWEL SIGN O;Mc;0;L;0CC6 0CC2;;;;N;;;;;
+0CCB;KANNADA VOWEL SIGN OO;Mc;0;L;0CCA 0CD5;;;;N;;;;;
+0CCC;KANNADA VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+0CCD;KANNADA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0CD5;KANNADA LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0CD6;KANNADA AI LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0CDE;KANNADA LETTER FA;Lo;0;L;;;;;N;;;;;
+0CE0;KANNADA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0CE1;KANNADA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0CE2;KANNADA VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0CE3;KANNADA VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0CE6;KANNADA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0CE7;KANNADA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0CE8;KANNADA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0CE9;KANNADA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0CEA;KANNADA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0CEB;KANNADA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0CEC;KANNADA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0CED;KANNADA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0CEE;KANNADA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0CEF;KANNADA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0CF1;KANNADA SIGN JIHVAMULIYA;So;0;ON;;;;;N;;;;;
+0CF2;KANNADA SIGN UPADHMANIYA;So;0;ON;;;;;N;;;;;
+0D02;MALAYALAM SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+0D03;MALAYALAM SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+0D05;MALAYALAM LETTER A;Lo;0;L;;;;;N;;;;;
+0D06;MALAYALAM LETTER AA;Lo;0;L;;;;;N;;;;;
+0D07;MALAYALAM LETTER I;Lo;0;L;;;;;N;;;;;
+0D08;MALAYALAM LETTER II;Lo;0;L;;;;;N;;;;;
+0D09;MALAYALAM LETTER U;Lo;0;L;;;;;N;;;;;
+0D0A;MALAYALAM LETTER UU;Lo;0;L;;;;;N;;;;;
+0D0B;MALAYALAM LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+0D0C;MALAYALAM LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+0D0E;MALAYALAM LETTER E;Lo;0;L;;;;;N;;;;;
+0D0F;MALAYALAM LETTER EE;Lo;0;L;;;;;N;;;;;
+0D10;MALAYALAM LETTER AI;Lo;0;L;;;;;N;;;;;
+0D12;MALAYALAM LETTER O;Lo;0;L;;;;;N;;;;;
+0D13;MALAYALAM LETTER OO;Lo;0;L;;;;;N;;;;;
+0D14;MALAYALAM LETTER AU;Lo;0;L;;;;;N;;;;;
+0D15;MALAYALAM LETTER KA;Lo;0;L;;;;;N;;;;;
+0D16;MALAYALAM LETTER KHA;Lo;0;L;;;;;N;;;;;
+0D17;MALAYALAM LETTER GA;Lo;0;L;;;;;N;;;;;
+0D18;MALAYALAM LETTER GHA;Lo;0;L;;;;;N;;;;;
+0D19;MALAYALAM LETTER NGA;Lo;0;L;;;;;N;;;;;
+0D1A;MALAYALAM LETTER CA;Lo;0;L;;;;;N;;;;;
+0D1B;MALAYALAM LETTER CHA;Lo;0;L;;;;;N;;;;;
+0D1C;MALAYALAM LETTER JA;Lo;0;L;;;;;N;;;;;
+0D1D;MALAYALAM LETTER JHA;Lo;0;L;;;;;N;;;;;
+0D1E;MALAYALAM LETTER NYA;Lo;0;L;;;;;N;;;;;
+0D1F;MALAYALAM LETTER TTA;Lo;0;L;;;;;N;;;;;
+0D20;MALAYALAM LETTER TTHA;Lo;0;L;;;;;N;;;;;
+0D21;MALAYALAM LETTER DDA;Lo;0;L;;;;;N;;;;;
+0D22;MALAYALAM LETTER DDHA;Lo;0;L;;;;;N;;;;;
+0D23;MALAYALAM LETTER NNA;Lo;0;L;;;;;N;;;;;
+0D24;MALAYALAM LETTER TA;Lo;0;L;;;;;N;;;;;
+0D25;MALAYALAM LETTER THA;Lo;0;L;;;;;N;;;;;
+0D26;MALAYALAM LETTER DA;Lo;0;L;;;;;N;;;;;
+0D27;MALAYALAM LETTER DHA;Lo;0;L;;;;;N;;;;;
+0D28;MALAYALAM LETTER NA;Lo;0;L;;;;;N;;;;;
+0D2A;MALAYALAM LETTER PA;Lo;0;L;;;;;N;;;;;
+0D2B;MALAYALAM LETTER PHA;Lo;0;L;;;;;N;;;;;
+0D2C;MALAYALAM LETTER BA;Lo;0;L;;;;;N;;;;;
+0D2D;MALAYALAM LETTER BHA;Lo;0;L;;;;;N;;;;;
+0D2E;MALAYALAM LETTER MA;Lo;0;L;;;;;N;;;;;
+0D2F;MALAYALAM LETTER YA;Lo;0;L;;;;;N;;;;;
+0D30;MALAYALAM LETTER RA;Lo;0;L;;;;;N;;;;;
+0D31;MALAYALAM LETTER RRA;Lo;0;L;;;;;N;;;;;
+0D32;MALAYALAM LETTER LA;Lo;0;L;;;;;N;;;;;
+0D33;MALAYALAM LETTER LLA;Lo;0;L;;;;;N;;;;;
+0D34;MALAYALAM LETTER LLLA;Lo;0;L;;;;;N;;;;;
+0D35;MALAYALAM LETTER VA;Lo;0;L;;;;;N;;;;;
+0D36;MALAYALAM LETTER SHA;Lo;0;L;;;;;N;;;;;
+0D37;MALAYALAM LETTER SSA;Lo;0;L;;;;;N;;;;;
+0D38;MALAYALAM LETTER SA;Lo;0;L;;;;;N;;;;;
+0D39;MALAYALAM LETTER HA;Lo;0;L;;;;;N;;;;;
+0D3D;MALAYALAM SIGN AVAGRAHA;Lo;0;L;;;;;N;;;;;
+0D3E;MALAYALAM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+0D3F;MALAYALAM VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+0D40;MALAYALAM VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+0D41;MALAYALAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+0D42;MALAYALAM VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+0D43;MALAYALAM VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+0D44;MALAYALAM VOWEL SIGN VOCALIC RR;Mn;0;NSM;;;;;N;;;;;
+0D46;MALAYALAM VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+0D47;MALAYALAM VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
+0D48;MALAYALAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+0D4A;MALAYALAM VOWEL SIGN O;Mc;0;L;0D46 0D3E;;;;N;;;;;
+0D4B;MALAYALAM VOWEL SIGN OO;Mc;0;L;0D47 0D3E;;;;N;;;;;
+0D4C;MALAYALAM VOWEL SIGN AU;Mc;0;L;0D46 0D57;;;;N;;;;;
+0D4D;MALAYALAM SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+0D57;MALAYALAM AU LENGTH MARK;Mc;0;L;;;;;N;;;;;
+0D60;MALAYALAM LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+0D61;MALAYALAM LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+0D62;MALAYALAM VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+0D63;MALAYALAM VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+0D66;MALAYALAM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0D67;MALAYALAM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0D68;MALAYALAM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0D69;MALAYALAM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0D6A;MALAYALAM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0D6B;MALAYALAM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0D6C;MALAYALAM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0D6D;MALAYALAM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0D6E;MALAYALAM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0D6F;MALAYALAM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0D70;MALAYALAM NUMBER TEN;No;0;L;;;;10;N;;;;;
+0D71;MALAYALAM NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;;
+0D72;MALAYALAM NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;;
+0D73;MALAYALAM FRACTION ONE QUARTER;No;0;L;;;;1/4;N;;;;;
+0D74;MALAYALAM FRACTION ONE HALF;No;0;L;;;;1/2;N;;;;;
+0D75;MALAYALAM FRACTION THREE QUARTERS;No;0;L;;;;3/4;N;;;;;
+0D79;MALAYALAM DATE MARK;So;0;L;;;;;N;;;;;
+0D7A;MALAYALAM LETTER CHILLU NN;Lo;0;L;;;;;N;;;;;
+0D7B;MALAYALAM LETTER CHILLU N;Lo;0;L;;;;;N;;;;;
+0D7C;MALAYALAM LETTER CHILLU RR;Lo;0;L;;;;;N;;;;;
+0D7D;MALAYALAM LETTER CHILLU L;Lo;0;L;;;;;N;;;;;
+0D7E;MALAYALAM LETTER CHILLU LL;Lo;0;L;;;;;N;;;;;
+0D7F;MALAYALAM LETTER CHILLU K;Lo;0;L;;;;;N;;;;;
+0D82;SINHALA SIGN ANUSVARAYA;Mc;0;L;;;;;N;;;;;
+0D83;SINHALA SIGN VISARGAYA;Mc;0;L;;;;;N;;;;;
+0D85;SINHALA LETTER AYANNA;Lo;0;L;;;;;N;;;;;
+0D86;SINHALA LETTER AAYANNA;Lo;0;L;;;;;N;;;;;
+0D87;SINHALA LETTER AEYANNA;Lo;0;L;;;;;N;;;;;
+0D88;SINHALA LETTER AEEYANNA;Lo;0;L;;;;;N;;;;;
+0D89;SINHALA LETTER IYANNA;Lo;0;L;;;;;N;;;;;
+0D8A;SINHALA LETTER IIYANNA;Lo;0;L;;;;;N;;;;;
+0D8B;SINHALA LETTER UYANNA;Lo;0;L;;;;;N;;;;;
+0D8C;SINHALA LETTER UUYANNA;Lo;0;L;;;;;N;;;;;
+0D8D;SINHALA LETTER IRUYANNA;Lo;0;L;;;;;N;;;;;
+0D8E;SINHALA LETTER IRUUYANNA;Lo;0;L;;;;;N;;;;;
+0D8F;SINHALA LETTER ILUYANNA;Lo;0;L;;;;;N;;;;;
+0D90;SINHALA LETTER ILUUYANNA;Lo;0;L;;;;;N;;;;;
+0D91;SINHALA LETTER EYANNA;Lo;0;L;;;;;N;;;;;
+0D92;SINHALA LETTER EEYANNA;Lo;0;L;;;;;N;;;;;
+0D93;SINHALA LETTER AIYANNA;Lo;0;L;;;;;N;;;;;
+0D94;SINHALA LETTER OYANNA;Lo;0;L;;;;;N;;;;;
+0D95;SINHALA LETTER OOYANNA;Lo;0;L;;;;;N;;;;;
+0D96;SINHALA LETTER AUYANNA;Lo;0;L;;;;;N;;;;;
+0D9A;SINHALA LETTER ALPAPRAANA KAYANNA;Lo;0;L;;;;;N;;;;;
+0D9B;SINHALA LETTER MAHAAPRAANA KAYANNA;Lo;0;L;;;;;N;;;;;
+0D9C;SINHALA LETTER ALPAPRAANA GAYANNA;Lo;0;L;;;;;N;;;;;
+0D9D;SINHALA LETTER MAHAAPRAANA GAYANNA;Lo;0;L;;;;;N;;;;;
+0D9E;SINHALA LETTER KANTAJA NAASIKYAYA;Lo;0;L;;;;;N;;;;;
+0D9F;SINHALA LETTER SANYAKA GAYANNA;Lo;0;L;;;;;N;;;;;
+0DA0;SINHALA LETTER ALPAPRAANA CAYANNA;Lo;0;L;;;;;N;;;;;
+0DA1;SINHALA LETTER MAHAAPRAANA CAYANNA;Lo;0;L;;;;;N;;;;;
+0DA2;SINHALA LETTER ALPAPRAANA JAYANNA;Lo;0;L;;;;;N;;;;;
+0DA3;SINHALA LETTER MAHAAPRAANA JAYANNA;Lo;0;L;;;;;N;;;;;
+0DA4;SINHALA LETTER TAALUJA NAASIKYAYA;Lo;0;L;;;;;N;;;;;
+0DA5;SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA;Lo;0;L;;;;;N;;;;;
+0DA6;SINHALA LETTER SANYAKA JAYANNA;Lo;0;L;;;;;N;;;;;
+0DA7;SINHALA LETTER ALPAPRAANA TTAYANNA;Lo;0;L;;;;;N;;;;;
+0DA8;SINHALA LETTER MAHAAPRAANA TTAYANNA;Lo;0;L;;;;;N;;;;;
+0DA9;SINHALA LETTER ALPAPRAANA DDAYANNA;Lo;0;L;;;;;N;;;;;
+0DAA;SINHALA LETTER MAHAAPRAANA DDAYANNA;Lo;0;L;;;;;N;;;;;
+0DAB;SINHALA LETTER MUURDHAJA NAYANNA;Lo;0;L;;;;;N;;;;;
+0DAC;SINHALA LETTER SANYAKA DDAYANNA;Lo;0;L;;;;;N;;;;;
+0DAD;SINHALA LETTER ALPAPRAANA TAYANNA;Lo;0;L;;;;;N;;;;;
+0DAE;SINHALA LETTER MAHAAPRAANA TAYANNA;Lo;0;L;;;;;N;;;;;
+0DAF;SINHALA LETTER ALPAPRAANA DAYANNA;Lo;0;L;;;;;N;;;;;
+0DB0;SINHALA LETTER MAHAAPRAANA DAYANNA;Lo;0;L;;;;;N;;;;;
+0DB1;SINHALA LETTER DANTAJA NAYANNA;Lo;0;L;;;;;N;;;;;
+0DB3;SINHALA LETTER SANYAKA DAYANNA;Lo;0;L;;;;;N;;;;;
+0DB4;SINHALA LETTER ALPAPRAANA PAYANNA;Lo;0;L;;;;;N;;;;;
+0DB5;SINHALA LETTER MAHAAPRAANA PAYANNA;Lo;0;L;;;;;N;;;;;
+0DB6;SINHALA LETTER ALPAPRAANA BAYANNA;Lo;0;L;;;;;N;;;;;
+0DB7;SINHALA LETTER MAHAAPRAANA BAYANNA;Lo;0;L;;;;;N;;;;;
+0DB8;SINHALA LETTER MAYANNA;Lo;0;L;;;;;N;;;;;
+0DB9;SINHALA LETTER AMBA BAYANNA;Lo;0;L;;;;;N;;;;;
+0DBA;SINHALA LETTER YAYANNA;Lo;0;L;;;;;N;;;;;
+0DBB;SINHALA LETTER RAYANNA;Lo;0;L;;;;;N;;;;;
+0DBD;SINHALA LETTER DANTAJA LAYANNA;Lo;0;L;;;;;N;;;;;
+0DC0;SINHALA LETTER VAYANNA;Lo;0;L;;;;;N;;;;;
+0DC1;SINHALA LETTER TAALUJA SAYANNA;Lo;0;L;;;;;N;;;;;
+0DC2;SINHALA LETTER MUURDHAJA SAYANNA;Lo;0;L;;;;;N;;;;;
+0DC3;SINHALA LETTER DANTAJA SAYANNA;Lo;0;L;;;;;N;;;;;
+0DC4;SINHALA LETTER HAYANNA;Lo;0;L;;;;;N;;;;;
+0DC5;SINHALA LETTER MUURDHAJA LAYANNA;Lo;0;L;;;;;N;;;;;
+0DC6;SINHALA LETTER FAYANNA;Lo;0;L;;;;;N;;;;;
+0DCA;SINHALA SIGN AL-LAKUNA;Mn;9;NSM;;;;;N;;;;;
+0DCF;SINHALA VOWEL SIGN AELA-PILLA;Mc;0;L;;;;;N;;;;;
+0DD0;SINHALA VOWEL SIGN KETTI AEDA-PILLA;Mc;0;L;;;;;N;;;;;
+0DD1;SINHALA VOWEL SIGN DIGA AEDA-PILLA;Mc;0;L;;;;;N;;;;;
+0DD2;SINHALA VOWEL SIGN KETTI IS-PILLA;Mn;0;NSM;;;;;N;;;;;
+0DD3;SINHALA VOWEL SIGN DIGA IS-PILLA;Mn;0;NSM;;;;;N;;;;;
+0DD4;SINHALA VOWEL SIGN KETTI PAA-PILLA;Mn;0;NSM;;;;;N;;;;;
+0DD6;SINHALA VOWEL SIGN DIGA PAA-PILLA;Mn;0;NSM;;;;;N;;;;;
+0DD8;SINHALA VOWEL SIGN GAETTA-PILLA;Mc;0;L;;;;;N;;;;;
+0DD9;SINHALA VOWEL SIGN KOMBUVA;Mc;0;L;;;;;N;;;;;
+0DDA;SINHALA VOWEL SIGN DIGA KOMBUVA;Mc;0;L;0DD9 0DCA;;;;N;;;;;
+0DDB;SINHALA VOWEL SIGN KOMBU DEKA;Mc;0;L;;;;;N;;;;;
+0DDC;SINHALA VOWEL SIGN KOMBUVA HAA AELA-PILLA;Mc;0;L;0DD9 0DCF;;;;N;;;;;
+0DDD;SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA;Mc;0;L;0DDC 0DCA;;;;N;;;;;
+0DDE;SINHALA VOWEL SIGN KOMBUVA HAA GAYANUKITTA;Mc;0;L;0DD9 0DDF;;;;N;;;;;
+0DDF;SINHALA VOWEL SIGN GAYANUKITTA;Mc;0;L;;;;;N;;;;;
+0DF2;SINHALA VOWEL SIGN DIGA GAETTA-PILLA;Mc;0;L;;;;;N;;;;;
+0DF3;SINHALA VOWEL SIGN DIGA GAYANUKITTA;Mc;0;L;;;;;N;;;;;
+0DF4;SINHALA PUNCTUATION KUNDDALIYA;Po;0;L;;;;;N;;;;;
+0E01;THAI CHARACTER KO KAI;Lo;0;L;;;;;N;THAI LETTER KO KAI;;;;
+0E02;THAI CHARACTER KHO KHAI;Lo;0;L;;;;;N;THAI LETTER KHO KHAI;;;;
+0E03;THAI CHARACTER KHO KHUAT;Lo;0;L;;;;;N;THAI LETTER KHO KHUAT;;;;
+0E04;THAI CHARACTER KHO KHWAI;Lo;0;L;;;;;N;THAI LETTER KHO KHWAI;;;;
+0E05;THAI CHARACTER KHO KHON;Lo;0;L;;;;;N;THAI LETTER KHO KHON;;;;
+0E06;THAI CHARACTER KHO RAKHANG;Lo;0;L;;;;;N;THAI LETTER KHO RAKHANG;;;;
+0E07;THAI CHARACTER NGO NGU;Lo;0;L;;;;;N;THAI LETTER NGO NGU;;;;
+0E08;THAI CHARACTER CHO CHAN;Lo;0;L;;;;;N;THAI LETTER CHO CHAN;;;;
+0E09;THAI CHARACTER CHO CHING;Lo;0;L;;;;;N;THAI LETTER CHO CHING;;;;
+0E0A;THAI CHARACTER CHO CHANG;Lo;0;L;;;;;N;THAI LETTER CHO CHANG;;;;
+0E0B;THAI CHARACTER SO SO;Lo;0;L;;;;;N;THAI LETTER SO SO;;;;
+0E0C;THAI CHARACTER CHO CHOE;Lo;0;L;;;;;N;THAI LETTER CHO CHOE;;;;
+0E0D;THAI CHARACTER YO YING;Lo;0;L;;;;;N;THAI LETTER YO YING;;;;
+0E0E;THAI CHARACTER DO CHADA;Lo;0;L;;;;;N;THAI LETTER DO CHADA;;;;
+0E0F;THAI CHARACTER TO PATAK;Lo;0;L;;;;;N;THAI LETTER TO PATAK;;;;
+0E10;THAI CHARACTER THO THAN;Lo;0;L;;;;;N;THAI LETTER THO THAN;;;;
+0E11;THAI CHARACTER THO NANGMONTHO;Lo;0;L;;;;;N;THAI LETTER THO NANGMONTHO;;;;
+0E12;THAI CHARACTER THO PHUTHAO;Lo;0;L;;;;;N;THAI LETTER THO PHUTHAO;;;;
+0E13;THAI CHARACTER NO NEN;Lo;0;L;;;;;N;THAI LETTER NO NEN;;;;
+0E14;THAI CHARACTER DO DEK;Lo;0;L;;;;;N;THAI LETTER DO DEK;;;;
+0E15;THAI CHARACTER TO TAO;Lo;0;L;;;;;N;THAI LETTER TO TAO;;;;
+0E16;THAI CHARACTER THO THUNG;Lo;0;L;;;;;N;THAI LETTER THO THUNG;;;;
+0E17;THAI CHARACTER THO THAHAN;Lo;0;L;;;;;N;THAI LETTER THO THAHAN;;;;
+0E18;THAI CHARACTER THO THONG;Lo;0;L;;;;;N;THAI LETTER THO THONG;;;;
+0E19;THAI CHARACTER NO NU;Lo;0;L;;;;;N;THAI LETTER NO NU;;;;
+0E1A;THAI CHARACTER BO BAIMAI;Lo;0;L;;;;;N;THAI LETTER BO BAIMAI;;;;
+0E1B;THAI CHARACTER PO PLA;Lo;0;L;;;;;N;THAI LETTER PO PLA;;;;
+0E1C;THAI CHARACTER PHO PHUNG;Lo;0;L;;;;;N;THAI LETTER PHO PHUNG;;;;
+0E1D;THAI CHARACTER FO FA;Lo;0;L;;;;;N;THAI LETTER FO FA;;;;
+0E1E;THAI CHARACTER PHO PHAN;Lo;0;L;;;;;N;THAI LETTER PHO PHAN;;;;
+0E1F;THAI CHARACTER FO FAN;Lo;0;L;;;;;N;THAI LETTER FO FAN;;;;
+0E20;THAI CHARACTER PHO SAMPHAO;Lo;0;L;;;;;N;THAI LETTER PHO SAMPHAO;;;;
+0E21;THAI CHARACTER MO MA;Lo;0;L;;;;;N;THAI LETTER MO MA;;;;
+0E22;THAI CHARACTER YO YAK;Lo;0;L;;;;;N;THAI LETTER YO YAK;;;;
+0E23;THAI CHARACTER RO RUA;Lo;0;L;;;;;N;THAI LETTER RO RUA;;;;
+0E24;THAI CHARACTER RU;Lo;0;L;;;;;N;THAI LETTER RU;;;;
+0E25;THAI CHARACTER LO LING;Lo;0;L;;;;;N;THAI LETTER LO LING;;;;
+0E26;THAI CHARACTER LU;Lo;0;L;;;;;N;THAI LETTER LU;;;;
+0E27;THAI CHARACTER WO WAEN;Lo;0;L;;;;;N;THAI LETTER WO WAEN;;;;
+0E28;THAI CHARACTER SO SALA;Lo;0;L;;;;;N;THAI LETTER SO SALA;;;;
+0E29;THAI CHARACTER SO RUSI;Lo;0;L;;;;;N;THAI LETTER SO RUSI;;;;
+0E2A;THAI CHARACTER SO SUA;Lo;0;L;;;;;N;THAI LETTER SO SUA;;;;
+0E2B;THAI CHARACTER HO HIP;Lo;0;L;;;;;N;THAI LETTER HO HIP;;;;
+0E2C;THAI CHARACTER LO CHULA;Lo;0;L;;;;;N;THAI LETTER LO CHULA;;;;
+0E2D;THAI CHARACTER O ANG;Lo;0;L;;;;;N;THAI LETTER O ANG;;;;
+0E2E;THAI CHARACTER HO NOKHUK;Lo;0;L;;;;;N;THAI LETTER HO NOK HUK;;;;
+0E2F;THAI CHARACTER PAIYANNOI;Lo;0;L;;;;;N;THAI PAI YAN NOI;paiyan noi;;;
+0E30;THAI CHARACTER SARA A;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA A;;;;
+0E31;THAI CHARACTER MAI HAN-AKAT;Mn;0;NSM;;;;;N;THAI VOWEL SIGN MAI HAN-AKAT;;;;
+0E32;THAI CHARACTER SARA AA;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA AA;;;;
+0E33;THAI CHARACTER SARA AM;Lo;0;L;<compat> 0E4D 0E32;;;;N;THAI VOWEL SIGN SARA AM;;;;
+0E34;THAI CHARACTER SARA I;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA I;;;;
+0E35;THAI CHARACTER SARA II;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA II;;;;
+0E36;THAI CHARACTER SARA UE;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA UE;;;;
+0E37;THAI CHARACTER SARA UEE;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA UEE;sara uue;;;
+0E38;THAI CHARACTER SARA U;Mn;103;NSM;;;;;N;THAI VOWEL SIGN SARA U;;;;
+0E39;THAI CHARACTER SARA UU;Mn;103;NSM;;;;;N;THAI VOWEL SIGN SARA UU;;;;
+0E3A;THAI CHARACTER PHINTHU;Mn;9;NSM;;;;;N;THAI VOWEL SIGN PHINTHU;;;;
+0E3F;THAI CURRENCY SYMBOL BAHT;Sc;0;ET;;;;;N;THAI BAHT SIGN;;;;
+0E40;THAI CHARACTER SARA E;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA E;;;;
+0E41;THAI CHARACTER SARA AE;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA AE;;;;
+0E42;THAI CHARACTER SARA O;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA O;;;;
+0E43;THAI CHARACTER SARA AI MAIMUAN;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA MAI MUAN;sara ai mai muan;;;
+0E44;THAI CHARACTER SARA AI MAIMALAI;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA MAI MALAI;sara ai mai malai;;;
+0E45;THAI CHARACTER LAKKHANGYAO;Lo;0;L;;;;;N;THAI LAK KHANG YAO;lakkhang yao;;;
+0E46;THAI CHARACTER MAIYAMOK;Lm;0;L;;;;;N;THAI MAI YAMOK;mai yamok;;;
+0E47;THAI CHARACTER MAITAIKHU;Mn;0;NSM;;;;;N;THAI VOWEL SIGN MAI TAI KHU;mai taikhu;;;
+0E48;THAI CHARACTER MAI EK;Mn;107;NSM;;;;;N;THAI TONE MAI EK;;;;
+0E49;THAI CHARACTER MAI THO;Mn;107;NSM;;;;;N;THAI TONE MAI THO;;;;
+0E4A;THAI CHARACTER MAI TRI;Mn;107;NSM;;;;;N;THAI TONE MAI TRI;;;;
+0E4B;THAI CHARACTER MAI CHATTAWA;Mn;107;NSM;;;;;N;THAI TONE MAI CHATTAWA;;;;
+0E4C;THAI CHARACTER THANTHAKHAT;Mn;0;NSM;;;;;N;THAI THANTHAKHAT;;;;
+0E4D;THAI CHARACTER NIKHAHIT;Mn;0;NSM;;;;;N;THAI NIKKHAHIT;nikkhahit;;;
+0E4E;THAI CHARACTER YAMAKKAN;Mn;0;NSM;;;;;N;THAI YAMAKKAN;;;;
+0E4F;THAI CHARACTER FONGMAN;Po;0;L;;;;;N;THAI FONGMAN;;;;
+0E50;THAI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0E51;THAI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0E52;THAI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0E53;THAI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0E54;THAI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0E55;THAI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0E56;THAI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0E57;THAI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0E58;THAI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0E59;THAI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0E5A;THAI CHARACTER ANGKHANKHU;Po;0;L;;;;;N;THAI ANGKHANKHU;;;;
+0E5B;THAI CHARACTER KHOMUT;Po;0;L;;;;;N;THAI KHOMUT;;;;
+0E81;LAO LETTER KO;Lo;0;L;;;;;N;;;;;
+0E82;LAO LETTER KHO SUNG;Lo;0;L;;;;;N;;;;;
+0E84;LAO LETTER KHO TAM;Lo;0;L;;;;;N;;;;;
+0E87;LAO LETTER NGO;Lo;0;L;;;;;N;;;;;
+0E88;LAO LETTER CO;Lo;0;L;;;;;N;;;;;
+0E8A;LAO LETTER SO TAM;Lo;0;L;;;;;N;;;;;
+0E8D;LAO LETTER NYO;Lo;0;L;;;;;N;;;;;
+0E94;LAO LETTER DO;Lo;0;L;;;;;N;;;;;
+0E95;LAO LETTER TO;Lo;0;L;;;;;N;;;;;
+0E96;LAO LETTER THO SUNG;Lo;0;L;;;;;N;;;;;
+0E97;LAO LETTER THO TAM;Lo;0;L;;;;;N;;;;;
+0E99;LAO LETTER NO;Lo;0;L;;;;;N;;;;;
+0E9A;LAO LETTER BO;Lo;0;L;;;;;N;;;;;
+0E9B;LAO LETTER PO;Lo;0;L;;;;;N;;;;;
+0E9C;LAO LETTER PHO SUNG;Lo;0;L;;;;;N;;;;;
+0E9D;LAO LETTER FO TAM;Lo;0;L;;;;;N;;;;;
+0E9E;LAO LETTER PHO TAM;Lo;0;L;;;;;N;;;;;
+0E9F;LAO LETTER FO SUNG;Lo;0;L;;;;;N;;;;;
+0EA1;LAO LETTER MO;Lo;0;L;;;;;N;;;;;
+0EA2;LAO LETTER YO;Lo;0;L;;;;;N;;;;;
+0EA3;LAO LETTER LO LING;Lo;0;L;;;;;N;;;;;
+0EA5;LAO LETTER LO LOOT;Lo;0;L;;;;;N;;;;;
+0EA7;LAO LETTER WO;Lo;0;L;;;;;N;;;;;
+0EAA;LAO LETTER SO SUNG;Lo;0;L;;;;;N;;;;;
+0EAB;LAO LETTER HO SUNG;Lo;0;L;;;;;N;;;;;
+0EAD;LAO LETTER O;Lo;0;L;;;;;N;;;;;
+0EAE;LAO LETTER HO TAM;Lo;0;L;;;;;N;;;;;
+0EAF;LAO ELLIPSIS;Lo;0;L;;;;;N;;;;;
+0EB0;LAO VOWEL SIGN A;Lo;0;L;;;;;N;;;;;
+0EB1;LAO VOWEL SIGN MAI KAN;Mn;0;NSM;;;;;N;;;;;
+0EB2;LAO VOWEL SIGN AA;Lo;0;L;;;;;N;;;;;
+0EB3;LAO VOWEL SIGN AM;Lo;0;L;<compat> 0ECD 0EB2;;;;N;;;;;
+0EB4;LAO VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+0EB5;LAO VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+0EB6;LAO VOWEL SIGN Y;Mn;0;NSM;;;;;N;;;;;
+0EB7;LAO VOWEL SIGN YY;Mn;0;NSM;;;;;N;;;;;
+0EB8;LAO VOWEL SIGN U;Mn;118;NSM;;;;;N;;;;;
+0EB9;LAO VOWEL SIGN UU;Mn;118;NSM;;;;;N;;;;;
+0EBB;LAO VOWEL SIGN MAI KON;Mn;0;NSM;;;;;N;;;;;
+0EBC;LAO SEMIVOWEL SIGN LO;Mn;0;NSM;;;;;N;;;;;
+0EBD;LAO SEMIVOWEL SIGN NYO;Lo;0;L;;;;;N;;;;;
+0EC0;LAO VOWEL SIGN E;Lo;0;L;;;;;N;;;;;
+0EC1;LAO VOWEL SIGN EI;Lo;0;L;;;;;N;;;;;
+0EC2;LAO VOWEL SIGN O;Lo;0;L;;;;;N;;;;;
+0EC3;LAO VOWEL SIGN AY;Lo;0;L;;;;;N;;;;;
+0EC4;LAO VOWEL SIGN AI;Lo;0;L;;;;;N;;;;;
+0EC6;LAO KO LA;Lm;0;L;;;;;N;;;;;
+0EC8;LAO TONE MAI EK;Mn;122;NSM;;;;;N;;;;;
+0EC9;LAO TONE MAI THO;Mn;122;NSM;;;;;N;;;;;
+0ECA;LAO TONE MAI TI;Mn;122;NSM;;;;;N;;;;;
+0ECB;LAO TONE MAI CATAWA;Mn;122;NSM;;;;;N;;;;;
+0ECC;LAO CANCELLATION MARK;Mn;0;NSM;;;;;N;;;;;
+0ECD;LAO NIGGAHITA;Mn;0;NSM;;;;;N;;;;;
+0ED0;LAO DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0ED1;LAO DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0ED2;LAO DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0ED3;LAO DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0ED4;LAO DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0ED5;LAO DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0ED6;LAO DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0ED7;LAO DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0ED8;LAO DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0ED9;LAO DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0EDC;LAO HO NO;Lo;0;L;<compat> 0EAB 0E99;;;;N;;;;;
+0EDD;LAO HO MO;Lo;0;L;<compat> 0EAB 0EA1;;;;N;;;;;
+0F00;TIBETAN SYLLABLE OM;Lo;0;L;;;;;N;;;;;
+0F01;TIBETAN MARK GTER YIG MGO TRUNCATED A;So;0;L;;;;;N;;ter yik go a thung;;;
+0F02;TIBETAN MARK GTER YIG MGO -UM RNAM BCAD MA;So;0;L;;;;;N;;ter yik go wum nam chey ma;;;
+0F03;TIBETAN MARK GTER YIG MGO -UM GTER TSHEG MA;So;0;L;;;;;N;;ter yik go wum ter tsek ma;;;
+0F04;TIBETAN MARK INITIAL YIG MGO MDUN MA;Po;0;L;;;;;N;TIBETAN SINGLE ORNAMENT;yik go dun ma;;;
+0F05;TIBETAN MARK CLOSING YIG MGO SGAB MA;Po;0;L;;;;;N;;yik go kab ma;;;
+0F06;TIBETAN MARK CARET YIG MGO PHUR SHAD MA;Po;0;L;;;;;N;;yik go pur shey ma;;;
+0F07;TIBETAN MARK YIG MGO TSHEG SHAD MA;Po;0;L;;;;;N;;yik go tsek shey ma;;;
+0F08;TIBETAN MARK SBRUL SHAD;Po;0;L;;;;;N;TIBETAN RGYANSHAD;drul shey;;;
+0F09;TIBETAN MARK BSKUR YIG MGO;Po;0;L;;;;;N;;kur yik go;;;
+0F0A;TIBETAN MARK BKA- SHOG YIG MGO;Po;0;L;;;;;N;;ka sho yik go;;;
+0F0B;TIBETAN MARK INTERSYLLABIC TSHEG;Po;0;L;;;;;N;TIBETAN TSEG;tsek;;;
+0F0C;TIBETAN MARK DELIMITER TSHEG BSTAR;Po;0;L;<noBreak> 0F0B;;;;N;;tsek tar;;;
+0F0D;TIBETAN MARK SHAD;Po;0;L;;;;;N;TIBETAN SHAD;shey;;;
+0F0E;TIBETAN MARK NYIS SHAD;Po;0;L;;;;;N;TIBETAN DOUBLE SHAD;nyi shey;;;
+0F0F;TIBETAN MARK TSHEG SHAD;Po;0;L;;;;;N;;tsek shey;;;
+0F10;TIBETAN MARK NYIS TSHEG SHAD;Po;0;L;;;;;N;;nyi tsek shey;;;
+0F11;TIBETAN MARK RIN CHEN SPUNGS SHAD;Po;0;L;;;;;N;TIBETAN RINCHANPHUNGSHAD;rinchen pung shey;;;
+0F12;TIBETAN MARK RGYA GRAM SHAD;Po;0;L;;;;;N;;gya tram shey;;;
+0F13;TIBETAN MARK CARET -DZUD RTAGS ME LONG CAN;So;0;L;;;;;N;;dzu ta me long chen;;;
+0F14;TIBETAN MARK GTER TSHEG;So;0;L;;;;;N;TIBETAN COMMA;ter tsek;;;
+0F15;TIBETAN LOGOTYPE SIGN CHAD RTAGS;So;0;L;;;;;N;;che ta;;;
+0F16;TIBETAN LOGOTYPE SIGN LHAG RTAGS;So;0;L;;;;;N;;hlak ta;;;
+0F17;TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS;So;0;L;;;;;N;;trachen char ta;;;
+0F18;TIBETAN ASTROLOGICAL SIGN -KHYUD PA;Mn;220;NSM;;;;;N;;kyu pa;;;
+0F19;TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS;Mn;220;NSM;;;;;N;;dong tsu;;;
+0F1A;TIBETAN SIGN RDEL DKAR GCIG;So;0;L;;;;;N;;deka chig;;;
+0F1B;TIBETAN SIGN RDEL DKAR GNYIS;So;0;L;;;;;N;;deka nyi;;;
+0F1C;TIBETAN SIGN RDEL DKAR GSUM;So;0;L;;;;;N;;deka sum;;;
+0F1D;TIBETAN SIGN RDEL NAG GCIG;So;0;L;;;;;N;;dena chig;;;
+0F1E;TIBETAN SIGN RDEL NAG GNYIS;So;0;L;;;;;N;;dena nyi;;;
+0F1F;TIBETAN SIGN RDEL DKAR RDEL NAG;So;0;L;;;;;N;;deka dena;;;
+0F20;TIBETAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+0F21;TIBETAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+0F22;TIBETAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+0F23;TIBETAN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+0F24;TIBETAN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+0F25;TIBETAN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+0F26;TIBETAN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+0F27;TIBETAN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+0F28;TIBETAN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+0F29;TIBETAN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+0F2A;TIBETAN DIGIT HALF ONE;No;0;L;;;;1/2;N;;;;;
+0F2B;TIBETAN DIGIT HALF TWO;No;0;L;;;;3/2;N;;;;;
+0F2C;TIBETAN DIGIT HALF THREE;No;0;L;;;;5/2;N;;;;;
+0F2D;TIBETAN DIGIT HALF FOUR;No;0;L;;;;7/2;N;;;;;
+0F2E;TIBETAN DIGIT HALF FIVE;No;0;L;;;;9/2;N;;;;;
+0F2F;TIBETAN DIGIT HALF SIX;No;0;L;;;;11/2;N;;;;;
+0F30;TIBETAN DIGIT HALF SEVEN;No;0;L;;;;13/2;N;;;;;
+0F31;TIBETAN DIGIT HALF EIGHT;No;0;L;;;;15/2;N;;;;;
+0F32;TIBETAN DIGIT HALF NINE;No;0;L;;;;17/2;N;;;;;
+0F33;TIBETAN DIGIT HALF ZERO;No;0;L;;;;-1/2;N;;;;;
+0F34;TIBETAN MARK BSDUS RTAGS;So;0;L;;;;;N;;du ta;;;
+0F35;TIBETAN MARK NGAS BZUNG NYI ZLA;Mn;220;NSM;;;;;N;TIBETAN HONORIFIC UNDER RING;nge zung nyi da;;;
+0F36;TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN;So;0;L;;;;;N;;dzu ta shi mig chen;;;
+0F37;TIBETAN MARK NGAS BZUNG SGOR RTAGS;Mn;220;NSM;;;;;N;TIBETAN UNDER RING;nge zung gor ta;;;
+0F38;TIBETAN MARK CHE MGO;So;0;L;;;;;N;;che go;;;
+0F39;TIBETAN MARK TSA -PHRU;Mn;216;NSM;;;;;N;TIBETAN LENITION MARK;tsa tru;;;
+0F3A;TIBETAN MARK GUG RTAGS GYON;Ps;0;ON;;;;;Y;;gug ta yun;;;
+0F3B;TIBETAN MARK GUG RTAGS GYAS;Pe;0;ON;;;;;Y;;gug ta ye;;;
+0F3C;TIBETAN MARK ANG KHANG GYON;Ps;0;ON;;;;;Y;TIBETAN LEFT BRACE;ang kang yun;;;
+0F3D;TIBETAN MARK ANG KHANG GYAS;Pe;0;ON;;;;;Y;TIBETAN RIGHT BRACE;ang kang ye;;;
+0F3E;TIBETAN SIGN YAR TSHES;Mc;0;L;;;;;N;;yar tse;;;
+0F3F;TIBETAN SIGN MAR TSHES;Mc;0;L;;;;;N;;mar tse;;;
+0F40;TIBETAN LETTER KA;Lo;0;L;;;;;N;;;;;
+0F41;TIBETAN LETTER KHA;Lo;0;L;;;;;N;;;;;
+0F42;TIBETAN LETTER GA;Lo;0;L;;;;;N;;;;;
+0F43;TIBETAN LETTER GHA;Lo;0;L;0F42 0FB7;;;;N;;;;;
+0F44;TIBETAN LETTER NGA;Lo;0;L;;;;;N;;;;;
+0F45;TIBETAN LETTER CA;Lo;0;L;;;;;N;;;;;
+0F46;TIBETAN LETTER CHA;Lo;0;L;;;;;N;;;;;
+0F47;TIBETAN LETTER JA;Lo;0;L;;;;;N;;;;;
+0F49;TIBETAN LETTER NYA;Lo;0;L;;;;;N;;;;;
+0F4A;TIBETAN LETTER TTA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED TA;;;;
+0F4B;TIBETAN LETTER TTHA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED THA;;;;
+0F4C;TIBETAN LETTER DDA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED DA;;;;
+0F4D;TIBETAN LETTER DDHA;Lo;0;L;0F4C 0FB7;;;;N;;;;;
+0F4E;TIBETAN LETTER NNA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED NA;;;;
+0F4F;TIBETAN LETTER TA;Lo;0;L;;;;;N;;;;;
+0F50;TIBETAN LETTER THA;Lo;0;L;;;;;N;;;;;
+0F51;TIBETAN LETTER DA;Lo;0;L;;;;;N;;;;;
+0F52;TIBETAN LETTER DHA;Lo;0;L;0F51 0FB7;;;;N;;;;;
+0F53;TIBETAN LETTER NA;Lo;0;L;;;;;N;;;;;
+0F54;TIBETAN LETTER PA;Lo;0;L;;;;;N;;;;;
+0F55;TIBETAN LETTER PHA;Lo;0;L;;;;;N;;;;;
+0F56;TIBETAN LETTER BA;Lo;0;L;;;;;N;;;;;
+0F57;TIBETAN LETTER BHA;Lo;0;L;0F56 0FB7;;;;N;;;;;
+0F58;TIBETAN LETTER MA;Lo;0;L;;;;;N;;;;;
+0F59;TIBETAN LETTER TSA;Lo;0;L;;;;;N;;;;;
+0F5A;TIBETAN LETTER TSHA;Lo;0;L;;;;;N;;;;;
+0F5B;TIBETAN LETTER DZA;Lo;0;L;;;;;N;;;;;
+0F5C;TIBETAN LETTER DZHA;Lo;0;L;0F5B 0FB7;;;;N;;;;;
+0F5D;TIBETAN LETTER WA;Lo;0;L;;;;;N;;;;;
+0F5E;TIBETAN LETTER ZHA;Lo;0;L;;;;;N;;;;;
+0F5F;TIBETAN LETTER ZA;Lo;0;L;;;;;N;;;;;
+0F60;TIBETAN LETTER -A;Lo;0;L;;;;;N;TIBETAN LETTER AA;;;;
+0F61;TIBETAN LETTER YA;Lo;0;L;;;;;N;;;;;
+0F62;TIBETAN LETTER RA;Lo;0;L;;;;;N;;*;;;
+0F63;TIBETAN LETTER LA;Lo;0;L;;;;;N;;;;;
+0F64;TIBETAN LETTER SHA;Lo;0;L;;;;;N;;;;;
+0F65;TIBETAN LETTER SSA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED SHA;;;;
+0F66;TIBETAN LETTER SA;Lo;0;L;;;;;N;;;;;
+0F67;TIBETAN LETTER HA;Lo;0;L;;;;;N;;;;;
+0F68;TIBETAN LETTER A;Lo;0;L;;;;;N;;;;;
+0F69;TIBETAN LETTER KSSA;Lo;0;L;0F40 0FB5;;;;N;;;;;
+0F6A;TIBETAN LETTER FIXED-FORM RA;Lo;0;L;;;;;N;;*;;;
+0F6B;TIBETAN LETTER KKA;Lo;0;L;;;;;N;;;;;
+0F6C;TIBETAN LETTER RRA;Lo;0;L;;;;;N;;;;;
+0F71;TIBETAN VOWEL SIGN AA;Mn;129;NSM;;;;;N;;;;;
+0F72;TIBETAN VOWEL SIGN I;Mn;130;NSM;;;;;N;;;;;
+0F73;TIBETAN VOWEL SIGN II;Mn;0;NSM;0F71 0F72;;;;N;;;;;
+0F74;TIBETAN VOWEL SIGN U;Mn;132;NSM;;;;;N;;;;;
+0F75;TIBETAN VOWEL SIGN UU;Mn;0;NSM;0F71 0F74;;;;N;;;;;
+0F76;TIBETAN VOWEL SIGN VOCALIC R;Mn;0;NSM;0FB2 0F80;;;;N;;;;;
+0F77;TIBETAN VOWEL SIGN VOCALIC RR;Mn;0;NSM;<compat> 0FB2 0F81;;;;N;;;;;
+0F78;TIBETAN VOWEL SIGN VOCALIC L;Mn;0;NSM;0FB3 0F80;;;;N;;;;;
+0F79;TIBETAN VOWEL SIGN VOCALIC LL;Mn;0;NSM;<compat> 0FB3 0F81;;;;N;;;;;
+0F7A;TIBETAN VOWEL SIGN E;Mn;130;NSM;;;;;N;;;;;
+0F7B;TIBETAN VOWEL SIGN EE;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN AI;;;;
+0F7C;TIBETAN VOWEL SIGN O;Mn;130;NSM;;;;;N;;;;;
+0F7D;TIBETAN VOWEL SIGN OO;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN AU;;;;
+0F7E;TIBETAN SIGN RJES SU NGA RO;Mn;0;NSM;;;;;N;TIBETAN ANUSVARA;je su nga ro;;;
+0F7F;TIBETAN SIGN RNAM BCAD;Mc;0;L;;;;;N;TIBETAN VISARGA;nam chey;;;
+0F80;TIBETAN VOWEL SIGN REVERSED I;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN SHORT I;;;;
+0F81;TIBETAN VOWEL SIGN REVERSED II;Mn;0;NSM;0F71 0F80;;;;N;;;;;
+0F82;TIBETAN SIGN NYI ZLA NAA DA;Mn;230;NSM;;;;;N;TIBETAN CANDRABINDU WITH ORNAMENT;nyi da na da;;;
+0F83;TIBETAN SIGN SNA LDAN;Mn;230;NSM;;;;;N;TIBETAN CANDRABINDU;nan de;;;
+0F84;TIBETAN MARK HALANTA;Mn;9;NSM;;;;;N;TIBETAN VIRAMA;;;;
+0F85;TIBETAN MARK PALUTA;Po;0;L;;;;;N;TIBETAN CHUCHENYIGE;;;;
+0F86;TIBETAN SIGN LCI RTAGS;Mn;230;NSM;;;;;N;;ji ta;;;
+0F87;TIBETAN SIGN YANG RTAGS;Mn;230;NSM;;;;;N;;yang ta;;;
+0F88;TIBETAN SIGN LCE TSA CAN;Lo;0;L;;;;;N;;che tsa chen;;;
+0F89;TIBETAN SIGN MCHU CAN;Lo;0;L;;;;;N;;chu chen;;;
+0F8A;TIBETAN SIGN GRU CAN RGYINGS;Lo;0;L;;;;;N;;tru chen ging;;;
+0F8B;TIBETAN SIGN GRU MED RGYINGS;Lo;0;L;;;;;N;;tru me ging;;;
+0F90;TIBETAN SUBJOINED LETTER KA;Mn;0;NSM;;;;;N;;;;;
+0F91;TIBETAN SUBJOINED LETTER KHA;Mn;0;NSM;;;;;N;;;;;
+0F92;TIBETAN SUBJOINED LETTER GA;Mn;0;NSM;;;;;N;;;;;
+0F93;TIBETAN SUBJOINED LETTER GHA;Mn;0;NSM;0F92 0FB7;;;;N;;;;;
+0F94;TIBETAN SUBJOINED LETTER NGA;Mn;0;NSM;;;;;N;;;;;
+0F95;TIBETAN SUBJOINED LETTER CA;Mn;0;NSM;;;;;N;;;;;
+0F96;TIBETAN SUBJOINED LETTER CHA;Mn;0;NSM;;;;;N;;;;;
+0F97;TIBETAN SUBJOINED LETTER JA;Mn;0;NSM;;;;;N;;;;;
+0F99;TIBETAN SUBJOINED LETTER NYA;Mn;0;NSM;;;;;N;;;;;
+0F9A;TIBETAN SUBJOINED LETTER TTA;Mn;0;NSM;;;;;N;;;;;
+0F9B;TIBETAN SUBJOINED LETTER TTHA;Mn;0;NSM;;;;;N;;;;;
+0F9C;TIBETAN SUBJOINED LETTER DDA;Mn;0;NSM;;;;;N;;;;;
+0F9D;TIBETAN SUBJOINED LETTER DDHA;Mn;0;NSM;0F9C 0FB7;;;;N;;;;;
+0F9E;TIBETAN SUBJOINED LETTER NNA;Mn;0;NSM;;;;;N;;;;;
+0F9F;TIBETAN SUBJOINED LETTER TA;Mn;0;NSM;;;;;N;;;;;
+0FA0;TIBETAN SUBJOINED LETTER THA;Mn;0;NSM;;;;;N;;;;;
+0FA1;TIBETAN SUBJOINED LETTER DA;Mn;0;NSM;;;;;N;;;;;
+0FA2;TIBETAN SUBJOINED LETTER DHA;Mn;0;NSM;0FA1 0FB7;;;;N;;;;;
+0FA3;TIBETAN SUBJOINED LETTER NA;Mn;0;NSM;;;;;N;;;;;
+0FA4;TIBETAN SUBJOINED LETTER PA;Mn;0;NSM;;;;;N;;;;;
+0FA5;TIBETAN SUBJOINED LETTER PHA;Mn;0;NSM;;;;;N;;;;;
+0FA6;TIBETAN SUBJOINED LETTER BA;Mn;0;NSM;;;;;N;;;;;
+0FA7;TIBETAN SUBJOINED LETTER BHA;Mn;0;NSM;0FA6 0FB7;;;;N;;;;;
+0FA8;TIBETAN SUBJOINED LETTER MA;Mn;0;NSM;;;;;N;;;;;
+0FA9;TIBETAN SUBJOINED LETTER TSA;Mn;0;NSM;;;;;N;;;;;
+0FAA;TIBETAN SUBJOINED LETTER TSHA;Mn;0;NSM;;;;;N;;;;;
+0FAB;TIBETAN SUBJOINED LETTER DZA;Mn;0;NSM;;;;;N;;;;;
+0FAC;TIBETAN SUBJOINED LETTER DZHA;Mn;0;NSM;0FAB 0FB7;;;;N;;;;;
+0FAD;TIBETAN SUBJOINED LETTER WA;Mn;0;NSM;;;;;N;;*;;;
+0FAE;TIBETAN SUBJOINED LETTER ZHA;Mn;0;NSM;;;;;N;;;;;
+0FAF;TIBETAN SUBJOINED LETTER ZA;Mn;0;NSM;;;;;N;;;;;
+0FB0;TIBETAN SUBJOINED LETTER -A;Mn;0;NSM;;;;;N;;;;;
+0FB1;TIBETAN SUBJOINED LETTER YA;Mn;0;NSM;;;;;N;;*;;;
+0FB2;TIBETAN SUBJOINED LETTER RA;Mn;0;NSM;;;;;N;;*;;;
+0FB3;TIBETAN SUBJOINED LETTER LA;Mn;0;NSM;;;;;N;;;;;
+0FB4;TIBETAN SUBJOINED LETTER SHA;Mn;0;NSM;;;;;N;;;;;
+0FB5;TIBETAN SUBJOINED LETTER SSA;Mn;0;NSM;;;;;N;;;;;
+0FB6;TIBETAN SUBJOINED LETTER SA;Mn;0;NSM;;;;;N;;;;;
+0FB7;TIBETAN SUBJOINED LETTER HA;Mn;0;NSM;;;;;N;;;;;
+0FB8;TIBETAN SUBJOINED LETTER A;Mn;0;NSM;;;;;N;;;;;
+0FB9;TIBETAN SUBJOINED LETTER KSSA;Mn;0;NSM;0F90 0FB5;;;;N;;;;;
+0FBA;TIBETAN SUBJOINED LETTER FIXED-FORM WA;Mn;0;NSM;;;;;N;;*;;;
+0FBB;TIBETAN SUBJOINED LETTER FIXED-FORM YA;Mn;0;NSM;;;;;N;;*;;;
+0FBC;TIBETAN SUBJOINED LETTER FIXED-FORM RA;Mn;0;NSM;;;;;N;;*;;;
+0FBE;TIBETAN KU RU KHA;So;0;L;;;;;N;;kuruka;;;
+0FBF;TIBETAN KU RU KHA BZHI MIG CAN;So;0;L;;;;;N;;kuruka shi mik chen;;;
+0FC0;TIBETAN CANTILLATION SIGN HEAVY BEAT;So;0;L;;;;;N;;;;;
+0FC1;TIBETAN CANTILLATION SIGN LIGHT BEAT;So;0;L;;;;;N;;;;;
+0FC2;TIBETAN CANTILLATION SIGN CANG TE-U;So;0;L;;;;;N;;chang tyu;;;
+0FC3;TIBETAN CANTILLATION SIGN SBUB -CHAL;So;0;L;;;;;N;;bub chey;;;
+0FC4;TIBETAN SYMBOL DRIL BU;So;0;L;;;;;N;;drilbu;;;
+0FC5;TIBETAN SYMBOL RDO RJE;So;0;L;;;;;N;;dorje;;;
+0FC6;TIBETAN SYMBOL PADMA GDAN;Mn;220;NSM;;;;;N;;pema den;;;
+0FC7;TIBETAN SYMBOL RDO RJE RGYA GRAM;So;0;L;;;;;N;;dorje gya dram;;;
+0FC8;TIBETAN SYMBOL PHUR PA;So;0;L;;;;;N;;phurba;;;
+0FC9;TIBETAN SYMBOL NOR BU;So;0;L;;;;;N;;norbu;;;
+0FCA;TIBETAN SYMBOL NOR BU NYIS -KHYIL;So;0;L;;;;;N;;norbu nyi khyi;;;
+0FCB;TIBETAN SYMBOL NOR BU GSUM -KHYIL;So;0;L;;;;;N;;norbu sum khyi;;;
+0FCC;TIBETAN SYMBOL NOR BU BZHI -KHYIL;So;0;L;;;;;N;;norbu shi khyi;;;
+0FCE;TIBETAN SIGN RDEL NAG RDEL DKAR;So;0;L;;;;;N;;dena deka;;;
+0FCF;TIBETAN SIGN RDEL NAG GSUM;So;0;L;;;;;N;;dena sum;;;
+0FD0;TIBETAN MARK BSKA- SHOG GI MGO RGYAN;Po;0;L;;;;;N;;ka shog gi go gyen;;;
+0FD1;TIBETAN MARK MNYAM YIG GI MGO RGYAN;Po;0;L;;;;;N;;nyam yig gi go gyen;;;
+0FD2;TIBETAN MARK NYIS TSHEG;Po;0;L;;;;;N;;nyi tsek;;;
+0FD3;TIBETAN MARK INITIAL BRDA RNYING YIG MGO MDUN MA;Po;0;L;;;;;N;;da nying yik go dun ma;;;
+0FD4;TIBETAN MARK CLOSING BRDA RNYING YIG MGO SGAB MA;Po;0;L;;;;;N;;da nying yik go kab ma;;;
+1000;MYANMAR LETTER KA;Lo;0;L;;;;;N;;;;;
+1001;MYANMAR LETTER KHA;Lo;0;L;;;;;N;;;;;
+1002;MYANMAR LETTER GA;Lo;0;L;;;;;N;;;;;
+1003;MYANMAR LETTER GHA;Lo;0;L;;;;;N;;;;;
+1004;MYANMAR LETTER NGA;Lo;0;L;;;;;N;;;;;
+1005;MYANMAR LETTER CA;Lo;0;L;;;;;N;;;;;
+1006;MYANMAR LETTER CHA;Lo;0;L;;;;;N;;;;;
+1007;MYANMAR LETTER JA;Lo;0;L;;;;;N;;;;;
+1008;MYANMAR LETTER JHA;Lo;0;L;;;;;N;;;;;
+1009;MYANMAR LETTER NYA;Lo;0;L;;;;;N;;;;;
+100A;MYANMAR LETTER NNYA;Lo;0;L;;;;;N;;;;;
+100B;MYANMAR LETTER TTA;Lo;0;L;;;;;N;;;;;
+100C;MYANMAR LETTER TTHA;Lo;0;L;;;;;N;;;;;
+100D;MYANMAR LETTER DDA;Lo;0;L;;;;;N;;;;;
+100E;MYANMAR LETTER DDHA;Lo;0;L;;;;;N;;;;;
+100F;MYANMAR LETTER NNA;Lo;0;L;;;;;N;;;;;
+1010;MYANMAR LETTER TA;Lo;0;L;;;;;N;;;;;
+1011;MYANMAR LETTER THA;Lo;0;L;;;;;N;;;;;
+1012;MYANMAR LETTER DA;Lo;0;L;;;;;N;;;;;
+1013;MYANMAR LETTER DHA;Lo;0;L;;;;;N;;;;;
+1014;MYANMAR LETTER NA;Lo;0;L;;;;;N;;;;;
+1015;MYANMAR LETTER PA;Lo;0;L;;;;;N;;;;;
+1016;MYANMAR LETTER PHA;Lo;0;L;;;;;N;;;;;
+1017;MYANMAR LETTER BA;Lo;0;L;;;;;N;;;;;
+1018;MYANMAR LETTER BHA;Lo;0;L;;;;;N;;;;;
+1019;MYANMAR LETTER MA;Lo;0;L;;;;;N;;;;;
+101A;MYANMAR LETTER YA;Lo;0;L;;;;;N;;;;;
+101B;MYANMAR LETTER RA;Lo;0;L;;;;;N;;;;;
+101C;MYANMAR LETTER LA;Lo;0;L;;;;;N;;;;;
+101D;MYANMAR LETTER WA;Lo;0;L;;;;;N;;;;;
+101E;MYANMAR LETTER SA;Lo;0;L;;;;;N;;;;;
+101F;MYANMAR LETTER HA;Lo;0;L;;;;;N;;;;;
+1020;MYANMAR LETTER LLA;Lo;0;L;;;;;N;;;;;
+1021;MYANMAR LETTER A;Lo;0;L;;;;;N;;;;;
+1022;MYANMAR LETTER SHAN A;Lo;0;L;;;;;N;;;;;
+1023;MYANMAR LETTER I;Lo;0;L;;;;;N;;;;;
+1024;MYANMAR LETTER II;Lo;0;L;;;;;N;;;;;
+1025;MYANMAR LETTER U;Lo;0;L;;;;;N;;;;;
+1026;MYANMAR LETTER UU;Lo;0;L;1025 102E;;;;N;;;;;
+1027;MYANMAR LETTER E;Lo;0;L;;;;;N;;;;;
+1028;MYANMAR LETTER MON E;Lo;0;L;;;;;N;;;;;
+1029;MYANMAR LETTER O;Lo;0;L;;;;;N;;;;;
+102A;MYANMAR LETTER AU;Lo;0;L;;;;;N;;;;;
+102B;MYANMAR VOWEL SIGN TALL AA;Mc;0;L;;;;;N;;;;;
+102C;MYANMAR VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+102D;MYANMAR VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+102E;MYANMAR VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+102F;MYANMAR VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1030;MYANMAR VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+1031;MYANMAR VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+1032;MYANMAR VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+1033;MYANMAR VOWEL SIGN MON II;Mn;0;NSM;;;;;N;;;;;
+1034;MYANMAR VOWEL SIGN MON O;Mn;0;NSM;;;;;N;;;;;
+1035;MYANMAR VOWEL SIGN E ABOVE;Mn;0;NSM;;;;;N;;;;;
+1036;MYANMAR SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+1037;MYANMAR SIGN DOT BELOW;Mn;7;NSM;;;;;N;;;;;
+1038;MYANMAR SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+1039;MYANMAR SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+103A;MYANMAR SIGN ASAT;Mn;9;NSM;;;;;N;;;;;
+103B;MYANMAR CONSONANT SIGN MEDIAL YA;Mc;0;L;;;;;N;;;;;
+103C;MYANMAR CONSONANT SIGN MEDIAL RA;Mc;0;L;;;;;N;;;;;
+103D;MYANMAR CONSONANT SIGN MEDIAL WA;Mn;0;NSM;;;;;N;;;;;
+103E;MYANMAR CONSONANT SIGN MEDIAL HA;Mn;0;NSM;;;;;N;;;;;
+103F;MYANMAR LETTER GREAT SA;Lo;0;L;;;;;N;;;;;
+1040;MYANMAR DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1041;MYANMAR DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1042;MYANMAR DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1043;MYANMAR DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1044;MYANMAR DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1045;MYANMAR DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1046;MYANMAR DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1047;MYANMAR DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1048;MYANMAR DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1049;MYANMAR DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+104A;MYANMAR SIGN LITTLE SECTION;Po;0;L;;;;;N;;;;;
+104B;MYANMAR SIGN SECTION;Po;0;L;;;;;N;;;;;
+104C;MYANMAR SYMBOL LOCATIVE;Po;0;L;;;;;N;;;;;
+104D;MYANMAR SYMBOL COMPLETED;Po;0;L;;;;;N;;;;;
+104E;MYANMAR SYMBOL AFOREMENTIONED;Po;0;L;;;;;N;;;;;
+104F;MYANMAR SYMBOL GENITIVE;Po;0;L;;;;;N;;;;;
+1050;MYANMAR LETTER SHA;Lo;0;L;;;;;N;;;;;
+1051;MYANMAR LETTER SSA;Lo;0;L;;;;;N;;;;;
+1052;MYANMAR LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+1053;MYANMAR LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+1054;MYANMAR LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+1055;MYANMAR LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+1056;MYANMAR VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
+1057;MYANMAR VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
+1058;MYANMAR VOWEL SIGN VOCALIC L;Mn;0;NSM;;;;;N;;;;;
+1059;MYANMAR VOWEL SIGN VOCALIC LL;Mn;0;NSM;;;;;N;;;;;
+105A;MYANMAR LETTER MON NGA;Lo;0;L;;;;;N;;;;;
+105B;MYANMAR LETTER MON JHA;Lo;0;L;;;;;N;;;;;
+105C;MYANMAR LETTER MON BBA;Lo;0;L;;;;;N;;;;;
+105D;MYANMAR LETTER MON BBE;Lo;0;L;;;;;N;;;;;
+105E;MYANMAR CONSONANT SIGN MON MEDIAL NA;Mn;0;NSM;;;;;N;;;;;
+105F;MYANMAR CONSONANT SIGN MON MEDIAL MA;Mn;0;NSM;;;;;N;;;;;
+1060;MYANMAR CONSONANT SIGN MON MEDIAL LA;Mn;0;NSM;;;;;N;;;;;
+1061;MYANMAR LETTER SGAW KAREN SHA;Lo;0;L;;;;;N;;;;;
+1062;MYANMAR VOWEL SIGN SGAW KAREN EU;Mc;0;L;;;;;N;;;;;
+1063;MYANMAR TONE MARK SGAW KAREN HATHI;Mc;0;L;;;;;N;;;;;
+1064;MYANMAR TONE MARK SGAW KAREN KE PHO;Mc;0;L;;;;;N;;;;;
+1065;MYANMAR LETTER WESTERN PWO KAREN THA;Lo;0;L;;;;;N;;;;;
+1066;MYANMAR LETTER WESTERN PWO KAREN PWA;Lo;0;L;;;;;N;;;;;
+1067;MYANMAR VOWEL SIGN WESTERN PWO KAREN EU;Mc;0;L;;;;;N;;;;;
+1068;MYANMAR VOWEL SIGN WESTERN PWO KAREN UE;Mc;0;L;;;;;N;;;;;
+1069;MYANMAR SIGN WESTERN PWO KAREN TONE-1;Mc;0;L;;;;;N;;;;;
+106A;MYANMAR SIGN WESTERN PWO KAREN TONE-2;Mc;0;L;;;;;N;;;;;
+106B;MYANMAR SIGN WESTERN PWO KAREN TONE-3;Mc;0;L;;;;;N;;;;;
+106C;MYANMAR SIGN WESTERN PWO KAREN TONE-4;Mc;0;L;;;;;N;;;;;
+106D;MYANMAR SIGN WESTERN PWO KAREN TONE-5;Mc;0;L;;;;;N;;;;;
+106E;MYANMAR LETTER EASTERN PWO KAREN NNA;Lo;0;L;;;;;N;;;;;
+106F;MYANMAR LETTER EASTERN PWO KAREN YWA;Lo;0;L;;;;;N;;;;;
+1070;MYANMAR LETTER EASTERN PWO KAREN GHWA;Lo;0;L;;;;;N;;;;;
+1071;MYANMAR VOWEL SIGN GEBA KAREN I;Mn;0;NSM;;;;;N;;;;;
+1072;MYANMAR VOWEL SIGN KAYAH OE;Mn;0;NSM;;;;;N;;;;;
+1073;MYANMAR VOWEL SIGN KAYAH U;Mn;0;NSM;;;;;N;;;;;
+1074;MYANMAR VOWEL SIGN KAYAH EE;Mn;0;NSM;;;;;N;;;;;
+1075;MYANMAR LETTER SHAN KA;Lo;0;L;;;;;N;;;;;
+1076;MYANMAR LETTER SHAN KHA;Lo;0;L;;;;;N;;;;;
+1077;MYANMAR LETTER SHAN GA;Lo;0;L;;;;;N;;;;;
+1078;MYANMAR LETTER SHAN CA;Lo;0;L;;;;;N;;;;;
+1079;MYANMAR LETTER SHAN ZA;Lo;0;L;;;;;N;;;;;
+107A;MYANMAR LETTER SHAN NYA;Lo;0;L;;;;;N;;;;;
+107B;MYANMAR LETTER SHAN DA;Lo;0;L;;;;;N;;;;;
+107C;MYANMAR LETTER SHAN NA;Lo;0;L;;;;;N;;;;;
+107D;MYANMAR LETTER SHAN PHA;Lo;0;L;;;;;N;;;;;
+107E;MYANMAR LETTER SHAN FA;Lo;0;L;;;;;N;;;;;
+107F;MYANMAR LETTER SHAN BA;Lo;0;L;;;;;N;;;;;
+1080;MYANMAR LETTER SHAN THA;Lo;0;L;;;;;N;;;;;
+1081;MYANMAR LETTER SHAN HA;Lo;0;L;;;;;N;;;;;
+1082;MYANMAR CONSONANT SIGN SHAN MEDIAL WA;Mn;0;NSM;;;;;N;;;;;
+1083;MYANMAR VOWEL SIGN SHAN AA;Mc;0;L;;;;;N;;;;;
+1084;MYANMAR VOWEL SIGN SHAN E;Mc;0;L;;;;;N;;;;;
+1085;MYANMAR VOWEL SIGN SHAN E ABOVE;Mn;0;NSM;;;;;N;;;;;
+1086;MYANMAR VOWEL SIGN SHAN FINAL Y;Mn;0;NSM;;;;;N;;;;;
+1087;MYANMAR SIGN SHAN TONE-2;Mc;0;L;;;;;N;;;;;
+1088;MYANMAR SIGN SHAN TONE-3;Mc;0;L;;;;;N;;;;;
+1089;MYANMAR SIGN SHAN TONE-5;Mc;0;L;;;;;N;;;;;
+108A;MYANMAR SIGN SHAN TONE-6;Mc;0;L;;;;;N;;;;;
+108B;MYANMAR SIGN SHAN COUNCIL TONE-2;Mc;0;L;;;;;N;;;;;
+108C;MYANMAR SIGN SHAN COUNCIL TONE-3;Mc;0;L;;;;;N;;;;;
+108D;MYANMAR SIGN SHAN COUNCIL EMPHATIC TONE;Mn;220;NSM;;;;;N;;;;;
+108E;MYANMAR LETTER RUMAI PALAUNG FA;Lo;0;L;;;;;N;;;;;
+108F;MYANMAR SIGN RUMAI PALAUNG TONE-5;Mc;0;L;;;;;N;;;;;
+1090;MYANMAR SHAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1091;MYANMAR SHAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1092;MYANMAR SHAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1093;MYANMAR SHAN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1094;MYANMAR SHAN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1095;MYANMAR SHAN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1096;MYANMAR SHAN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1097;MYANMAR SHAN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1098;MYANMAR SHAN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1099;MYANMAR SHAN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+109E;MYANMAR SYMBOL SHAN ONE;So;0;L;;;;;N;;;;;
+109F;MYANMAR SYMBOL SHAN EXCLAMATION;So;0;L;;;;;N;;;;;
+10A0;GEORGIAN CAPITAL LETTER AN;Lu;0;L;;;;;N;;Khutsuri;;2D00;
+10A1;GEORGIAN CAPITAL LETTER BAN;Lu;0;L;;;;;N;;Khutsuri;;2D01;
+10A2;GEORGIAN CAPITAL LETTER GAN;Lu;0;L;;;;;N;;Khutsuri;;2D02;
+10A3;GEORGIAN CAPITAL LETTER DON;Lu;0;L;;;;;N;;Khutsuri;;2D03;
+10A4;GEORGIAN CAPITAL LETTER EN;Lu;0;L;;;;;N;;Khutsuri;;2D04;
+10A5;GEORGIAN CAPITAL LETTER VIN;Lu;0;L;;;;;N;;Khutsuri;;2D05;
+10A6;GEORGIAN CAPITAL LETTER ZEN;Lu;0;L;;;;;N;;Khutsuri;;2D06;
+10A7;GEORGIAN CAPITAL LETTER TAN;Lu;0;L;;;;;N;;Khutsuri;;2D07;
+10A8;GEORGIAN CAPITAL LETTER IN;Lu;0;L;;;;;N;;Khutsuri;;2D08;
+10A9;GEORGIAN CAPITAL LETTER KAN;Lu;0;L;;;;;N;;Khutsuri;;2D09;
+10AA;GEORGIAN CAPITAL LETTER LAS;Lu;0;L;;;;;N;;Khutsuri;;2D0A;
+10AB;GEORGIAN CAPITAL LETTER MAN;Lu;0;L;;;;;N;;Khutsuri;;2D0B;
+10AC;GEORGIAN CAPITAL LETTER NAR;Lu;0;L;;;;;N;;Khutsuri;;2D0C;
+10AD;GEORGIAN CAPITAL LETTER ON;Lu;0;L;;;;;N;;Khutsuri;;2D0D;
+10AE;GEORGIAN CAPITAL LETTER PAR;Lu;0;L;;;;;N;;Khutsuri;;2D0E;
+10AF;GEORGIAN CAPITAL LETTER ZHAR;Lu;0;L;;;;;N;;Khutsuri;;2D0F;
+10B0;GEORGIAN CAPITAL LETTER RAE;Lu;0;L;;;;;N;;Khutsuri;;2D10;
+10B1;GEORGIAN CAPITAL LETTER SAN;Lu;0;L;;;;;N;;Khutsuri;;2D11;
+10B2;GEORGIAN CAPITAL LETTER TAR;Lu;0;L;;;;;N;;Khutsuri;;2D12;
+10B3;GEORGIAN CAPITAL LETTER UN;Lu;0;L;;;;;N;;Khutsuri;;2D13;
+10B4;GEORGIAN CAPITAL LETTER PHAR;Lu;0;L;;;;;N;;Khutsuri;;2D14;
+10B5;GEORGIAN CAPITAL LETTER KHAR;Lu;0;L;;;;;N;;Khutsuri;;2D15;
+10B6;GEORGIAN CAPITAL LETTER GHAN;Lu;0;L;;;;;N;;Khutsuri;;2D16;
+10B7;GEORGIAN CAPITAL LETTER QAR;Lu;0;L;;;;;N;;Khutsuri;;2D17;
+10B8;GEORGIAN CAPITAL LETTER SHIN;Lu;0;L;;;;;N;;Khutsuri;;2D18;
+10B9;GEORGIAN CAPITAL LETTER CHIN;Lu;0;L;;;;;N;;Khutsuri;;2D19;
+10BA;GEORGIAN CAPITAL LETTER CAN;Lu;0;L;;;;;N;;Khutsuri;;2D1A;
+10BB;GEORGIAN CAPITAL LETTER JIL;Lu;0;L;;;;;N;;Khutsuri;;2D1B;
+10BC;GEORGIAN CAPITAL LETTER CIL;Lu;0;L;;;;;N;;Khutsuri;;2D1C;
+10BD;GEORGIAN CAPITAL LETTER CHAR;Lu;0;L;;;;;N;;Khutsuri;;2D1D;
+10BE;GEORGIAN CAPITAL LETTER XAN;Lu;0;L;;;;;N;;Khutsuri;;2D1E;
+10BF;GEORGIAN CAPITAL LETTER JHAN;Lu;0;L;;;;;N;;Khutsuri;;2D1F;
+10C0;GEORGIAN CAPITAL LETTER HAE;Lu;0;L;;;;;N;;Khutsuri;;2D20;
+10C1;GEORGIAN CAPITAL LETTER HE;Lu;0;L;;;;;N;;Khutsuri;;2D21;
+10C2;GEORGIAN CAPITAL LETTER HIE;Lu;0;L;;;;;N;;Khutsuri;;2D22;
+10C3;GEORGIAN CAPITAL LETTER WE;Lu;0;L;;;;;N;;Khutsuri;;2D23;
+10C4;GEORGIAN CAPITAL LETTER HAR;Lu;0;L;;;;;N;;Khutsuri;;2D24;
+10C5;GEORGIAN CAPITAL LETTER HOE;Lu;0;L;;;;;N;;Khutsuri;;2D25;
+10D0;GEORGIAN LETTER AN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER AN;;;;
+10D1;GEORGIAN LETTER BAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER BAN;;;;
+10D2;GEORGIAN LETTER GAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER GAN;;;;
+10D3;GEORGIAN LETTER DON;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER DON;;;;
+10D4;GEORGIAN LETTER EN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER EN;;;;
+10D5;GEORGIAN LETTER VIN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER VIN;;;;
+10D6;GEORGIAN LETTER ZEN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER ZEN;;;;
+10D7;GEORGIAN LETTER TAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER TAN;;;;
+10D8;GEORGIAN LETTER IN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER IN;;;;
+10D9;GEORGIAN LETTER KAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER KAN;;;;
+10DA;GEORGIAN LETTER LAS;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER LAS;;;;
+10DB;GEORGIAN LETTER MAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER MAN;;;;
+10DC;GEORGIAN LETTER NAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER NAR;;;;
+10DD;GEORGIAN LETTER ON;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER ON;;;;
+10DE;GEORGIAN LETTER PAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER PAR;;;;
+10DF;GEORGIAN LETTER ZHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER ZHAR;;;;
+10E0;GEORGIAN LETTER RAE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER RAE;;;;
+10E1;GEORGIAN LETTER SAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER SAN;;;;
+10E2;GEORGIAN LETTER TAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER TAR;;;;
+10E3;GEORGIAN LETTER UN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER UN;;;;
+10E4;GEORGIAN LETTER PHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER PHAR;;;;
+10E5;GEORGIAN LETTER KHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER KHAR;;;;
+10E6;GEORGIAN LETTER GHAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER GHAN;;;;
+10E7;GEORGIAN LETTER QAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER QAR;;;;
+10E8;GEORGIAN LETTER SHIN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER SHIN;;;;
+10E9;GEORGIAN LETTER CHIN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CHIN;;;;
+10EA;GEORGIAN LETTER CAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CAN;;;;
+10EB;GEORGIAN LETTER JIL;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER JIL;;;;
+10EC;GEORGIAN LETTER CIL;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CIL;;;;
+10ED;GEORGIAN LETTER CHAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER CHAR;;;;
+10EE;GEORGIAN LETTER XAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER XAN;;;;
+10EF;GEORGIAN LETTER JHAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER JHAN;;;;
+10F0;GEORGIAN LETTER HAE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HAE;;;;
+10F1;GEORGIAN LETTER HE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HE;;;;
+10F2;GEORGIAN LETTER HIE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HIE;;;;
+10F3;GEORGIAN LETTER WE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER WE;;;;
+10F4;GEORGIAN LETTER HAR;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HAR;;;;
+10F5;GEORGIAN LETTER HOE;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER HOE;;;;
+10F6;GEORGIAN LETTER FI;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER FI;;;;
+10F7;GEORGIAN LETTER YN;Lo;0;L;;;;;N;;;;;
+10F8;GEORGIAN LETTER ELIFI;Lo;0;L;;;;;N;;;;;
+10F9;GEORGIAN LETTER TURNED GAN;Lo;0;L;;;;;N;;;;;
+10FA;GEORGIAN LETTER AIN;Lo;0;L;;;;;N;;;;;
+10FB;GEORGIAN PARAGRAPH SEPARATOR;Po;0;L;;;;;N;;;;;
+10FC;MODIFIER LETTER GEORGIAN NAR;Lm;0;L;<super> 10DC;;;;N;;;;;
+1100;HANGUL CHOSEONG KIYEOK;Lo;0;L;;;;;N;;g *;;;
+1101;HANGUL CHOSEONG SSANGKIYEOK;Lo;0;L;;;;;N;;gg *;;;
+1102;HANGUL CHOSEONG NIEUN;Lo;0;L;;;;;N;;n *;;;
+1103;HANGUL CHOSEONG TIKEUT;Lo;0;L;;;;;N;;d *;;;
+1104;HANGUL CHOSEONG SSANGTIKEUT;Lo;0;L;;;;;N;;dd *;;;
+1105;HANGUL CHOSEONG RIEUL;Lo;0;L;;;;;N;;r *;;;
+1106;HANGUL CHOSEONG MIEUM;Lo;0;L;;;;;N;;m *;;;
+1107;HANGUL CHOSEONG PIEUP;Lo;0;L;;;;;N;;b *;;;
+1108;HANGUL CHOSEONG SSANGPIEUP;Lo;0;L;;;;;N;;bb *;;;
+1109;HANGUL CHOSEONG SIOS;Lo;0;L;;;;;N;;s *;;;
+110A;HANGUL CHOSEONG SSANGSIOS;Lo;0;L;;;;;N;;ss *;;;
+110B;HANGUL CHOSEONG IEUNG;Lo;0;L;;;;;N;;;;;
+110C;HANGUL CHOSEONG CIEUC;Lo;0;L;;;;;N;;j *;;;
+110D;HANGUL CHOSEONG SSANGCIEUC;Lo;0;L;;;;;N;;jj *;;;
+110E;HANGUL CHOSEONG CHIEUCH;Lo;0;L;;;;;N;;c *;;;
+110F;HANGUL CHOSEONG KHIEUKH;Lo;0;L;;;;;N;;k *;;;
+1110;HANGUL CHOSEONG THIEUTH;Lo;0;L;;;;;N;;t *;;;
+1111;HANGUL CHOSEONG PHIEUPH;Lo;0;L;;;;;N;;p *;;;
+1112;HANGUL CHOSEONG HIEUH;Lo;0;L;;;;;N;;h *;;;
+1113;HANGUL CHOSEONG NIEUN-KIYEOK;Lo;0;L;;;;;N;;;;;
+1114;HANGUL CHOSEONG SSANGNIEUN;Lo;0;L;;;;;N;;;;;
+1115;HANGUL CHOSEONG NIEUN-TIKEUT;Lo;0;L;;;;;N;;;;;
+1116;HANGUL CHOSEONG NIEUN-PIEUP;Lo;0;L;;;;;N;;;;;
+1117;HANGUL CHOSEONG TIKEUT-KIYEOK;Lo;0;L;;;;;N;;;;;
+1118;HANGUL CHOSEONG RIEUL-NIEUN;Lo;0;L;;;;;N;;;;;
+1119;HANGUL CHOSEONG SSANGRIEUL;Lo;0;L;;;;;N;;;;;
+111A;HANGUL CHOSEONG RIEUL-HIEUH;Lo;0;L;;;;;N;;;;;
+111B;HANGUL CHOSEONG KAPYEOUNRIEUL;Lo;0;L;;;;;N;;;;;
+111C;HANGUL CHOSEONG MIEUM-PIEUP;Lo;0;L;;;;;N;;;;;
+111D;HANGUL CHOSEONG KAPYEOUNMIEUM;Lo;0;L;;;;;N;;;;;
+111E;HANGUL CHOSEONG PIEUP-KIYEOK;Lo;0;L;;;;;N;;;;;
+111F;HANGUL CHOSEONG PIEUP-NIEUN;Lo;0;L;;;;;N;;;;;
+1120;HANGUL CHOSEONG PIEUP-TIKEUT;Lo;0;L;;;;;N;;;;;
+1121;HANGUL CHOSEONG PIEUP-SIOS;Lo;0;L;;;;;N;;;;;
+1122;HANGUL CHOSEONG PIEUP-SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+1123;HANGUL CHOSEONG PIEUP-SIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
+1124;HANGUL CHOSEONG PIEUP-SIOS-PIEUP;Lo;0;L;;;;;N;;;;;
+1125;HANGUL CHOSEONG PIEUP-SSANGSIOS;Lo;0;L;;;;;N;;;;;
+1126;HANGUL CHOSEONG PIEUP-SIOS-CIEUC;Lo;0;L;;;;;N;;;;;
+1127;HANGUL CHOSEONG PIEUP-CIEUC;Lo;0;L;;;;;N;;;;;
+1128;HANGUL CHOSEONG PIEUP-CHIEUCH;Lo;0;L;;;;;N;;;;;
+1129;HANGUL CHOSEONG PIEUP-THIEUTH;Lo;0;L;;;;;N;;;;;
+112A;HANGUL CHOSEONG PIEUP-PHIEUPH;Lo;0;L;;;;;N;;;;;
+112B;HANGUL CHOSEONG KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+112C;HANGUL CHOSEONG KAPYEOUNSSANGPIEUP;Lo;0;L;;;;;N;;;;;
+112D;HANGUL CHOSEONG SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+112E;HANGUL CHOSEONG SIOS-NIEUN;Lo;0;L;;;;;N;;;;;
+112F;HANGUL CHOSEONG SIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
+1130;HANGUL CHOSEONG SIOS-RIEUL;Lo;0;L;;;;;N;;;;;
+1131;HANGUL CHOSEONG SIOS-MIEUM;Lo;0;L;;;;;N;;;;;
+1132;HANGUL CHOSEONG SIOS-PIEUP;Lo;0;L;;;;;N;;;;;
+1133;HANGUL CHOSEONG SIOS-PIEUP-KIYEOK;Lo;0;L;;;;;N;;;;;
+1134;HANGUL CHOSEONG SIOS-SSANGSIOS;Lo;0;L;;;;;N;;;;;
+1135;HANGUL CHOSEONG SIOS-IEUNG;Lo;0;L;;;;;N;;;;;
+1136;HANGUL CHOSEONG SIOS-CIEUC;Lo;0;L;;;;;N;;;;;
+1137;HANGUL CHOSEONG SIOS-CHIEUCH;Lo;0;L;;;;;N;;;;;
+1138;HANGUL CHOSEONG SIOS-KHIEUKH;Lo;0;L;;;;;N;;;;;
+1139;HANGUL CHOSEONG SIOS-THIEUTH;Lo;0;L;;;;;N;;;;;
+113A;HANGUL CHOSEONG SIOS-PHIEUPH;Lo;0;L;;;;;N;;;;;
+113B;HANGUL CHOSEONG SIOS-HIEUH;Lo;0;L;;;;;N;;;;;
+113C;HANGUL CHOSEONG CHITUEUMSIOS;Lo;0;L;;;;;N;;;;;
+113D;HANGUL CHOSEONG CHITUEUMSSANGSIOS;Lo;0;L;;;;;N;;;;;
+113E;HANGUL CHOSEONG CEONGCHIEUMSIOS;Lo;0;L;;;;;N;;;;;
+113F;HANGUL CHOSEONG CEONGCHIEUMSSANGSIOS;Lo;0;L;;;;;N;;;;;
+1140;HANGUL CHOSEONG PANSIOS;Lo;0;L;;;;;N;;;;;
+1141;HANGUL CHOSEONG IEUNG-KIYEOK;Lo;0;L;;;;;N;;;;;
+1142;HANGUL CHOSEONG IEUNG-TIKEUT;Lo;0;L;;;;;N;;;;;
+1143;HANGUL CHOSEONG IEUNG-MIEUM;Lo;0;L;;;;;N;;;;;
+1144;HANGUL CHOSEONG IEUNG-PIEUP;Lo;0;L;;;;;N;;;;;
+1145;HANGUL CHOSEONG IEUNG-SIOS;Lo;0;L;;;;;N;;;;;
+1146;HANGUL CHOSEONG IEUNG-PANSIOS;Lo;0;L;;;;;N;;;;;
+1147;HANGUL CHOSEONG SSANGIEUNG;Lo;0;L;;;;;N;;;;;
+1148;HANGUL CHOSEONG IEUNG-CIEUC;Lo;0;L;;;;;N;;;;;
+1149;HANGUL CHOSEONG IEUNG-CHIEUCH;Lo;0;L;;;;;N;;;;;
+114A;HANGUL CHOSEONG IEUNG-THIEUTH;Lo;0;L;;;;;N;;;;;
+114B;HANGUL CHOSEONG IEUNG-PHIEUPH;Lo;0;L;;;;;N;;;;;
+114C;HANGUL CHOSEONG YESIEUNG;Lo;0;L;;;;;N;;;;;
+114D;HANGUL CHOSEONG CIEUC-IEUNG;Lo;0;L;;;;;N;;;;;
+114E;HANGUL CHOSEONG CHITUEUMCIEUC;Lo;0;L;;;;;N;;;;;
+114F;HANGUL CHOSEONG CHITUEUMSSANGCIEUC;Lo;0;L;;;;;N;;;;;
+1150;HANGUL CHOSEONG CEONGCHIEUMCIEUC;Lo;0;L;;;;;N;;;;;
+1151;HANGUL CHOSEONG CEONGCHIEUMSSANGCIEUC;Lo;0;L;;;;;N;;;;;
+1152;HANGUL CHOSEONG CHIEUCH-KHIEUKH;Lo;0;L;;;;;N;;;;;
+1153;HANGUL CHOSEONG CHIEUCH-HIEUH;Lo;0;L;;;;;N;;;;;
+1154;HANGUL CHOSEONG CHITUEUMCHIEUCH;Lo;0;L;;;;;N;;;;;
+1155;HANGUL CHOSEONG CEONGCHIEUMCHIEUCH;Lo;0;L;;;;;N;;;;;
+1156;HANGUL CHOSEONG PHIEUPH-PIEUP;Lo;0;L;;;;;N;;;;;
+1157;HANGUL CHOSEONG KAPYEOUNPHIEUPH;Lo;0;L;;;;;N;;;;;
+1158;HANGUL CHOSEONG SSANGHIEUH;Lo;0;L;;;;;N;;;;;
+1159;HANGUL CHOSEONG YEORINHIEUH;Lo;0;L;;;;;N;;;;;
+115F;HANGUL CHOSEONG FILLER;Lo;0;L;;;;;N;;;;;
+1160;HANGUL JUNGSEONG FILLER;Lo;0;L;;;;;N;;;;;
+1161;HANGUL JUNGSEONG A;Lo;0;L;;;;;N;;;;;
+1162;HANGUL JUNGSEONG AE;Lo;0;L;;;;;N;;;;;
+1163;HANGUL JUNGSEONG YA;Lo;0;L;;;;;N;;;;;
+1164;HANGUL JUNGSEONG YAE;Lo;0;L;;;;;N;;;;;
+1165;HANGUL JUNGSEONG EO;Lo;0;L;;;;;N;;;;;
+1166;HANGUL JUNGSEONG E;Lo;0;L;;;;;N;;;;;
+1167;HANGUL JUNGSEONG YEO;Lo;0;L;;;;;N;;;;;
+1168;HANGUL JUNGSEONG YE;Lo;0;L;;;;;N;;;;;
+1169;HANGUL JUNGSEONG O;Lo;0;L;;;;;N;;;;;
+116A;HANGUL JUNGSEONG WA;Lo;0;L;;;;;N;;;;;
+116B;HANGUL JUNGSEONG WAE;Lo;0;L;;;;;N;;;;;
+116C;HANGUL JUNGSEONG OE;Lo;0;L;;;;;N;;;;;
+116D;HANGUL JUNGSEONG YO;Lo;0;L;;;;;N;;;;;
+116E;HANGUL JUNGSEONG U;Lo;0;L;;;;;N;;;;;
+116F;HANGUL JUNGSEONG WEO;Lo;0;L;;;;;N;;;;;
+1170;HANGUL JUNGSEONG WE;Lo;0;L;;;;;N;;;;;
+1171;HANGUL JUNGSEONG WI;Lo;0;L;;;;;N;;;;;
+1172;HANGUL JUNGSEONG YU;Lo;0;L;;;;;N;;;;;
+1173;HANGUL JUNGSEONG EU;Lo;0;L;;;;;N;;;;;
+1174;HANGUL JUNGSEONG YI;Lo;0;L;;;;;N;;;;;
+1175;HANGUL JUNGSEONG I;Lo;0;L;;;;;N;;;;;
+1176;HANGUL JUNGSEONG A-O;Lo;0;L;;;;;N;;;;;
+1177;HANGUL JUNGSEONG A-U;Lo;0;L;;;;;N;;;;;
+1178;HANGUL JUNGSEONG YA-O;Lo;0;L;;;;;N;;;;;
+1179;HANGUL JUNGSEONG YA-YO;Lo;0;L;;;;;N;;;;;
+117A;HANGUL JUNGSEONG EO-O;Lo;0;L;;;;;N;;;;;
+117B;HANGUL JUNGSEONG EO-U;Lo;0;L;;;;;N;;;;;
+117C;HANGUL JUNGSEONG EO-EU;Lo;0;L;;;;;N;;;;;
+117D;HANGUL JUNGSEONG YEO-O;Lo;0;L;;;;;N;;;;;
+117E;HANGUL JUNGSEONG YEO-U;Lo;0;L;;;;;N;;;;;
+117F;HANGUL JUNGSEONG O-EO;Lo;0;L;;;;;N;;;;;
+1180;HANGUL JUNGSEONG O-E;Lo;0;L;;;;;N;;;;;
+1181;HANGUL JUNGSEONG O-YE;Lo;0;L;;;;;N;;;;;
+1182;HANGUL JUNGSEONG O-O;Lo;0;L;;;;;N;;;;;
+1183;HANGUL JUNGSEONG O-U;Lo;0;L;;;;;N;;;;;
+1184;HANGUL JUNGSEONG YO-YA;Lo;0;L;;;;;N;;;;;
+1185;HANGUL JUNGSEONG YO-YAE;Lo;0;L;;;;;N;;;;;
+1186;HANGUL JUNGSEONG YO-YEO;Lo;0;L;;;;;N;;;;;
+1187;HANGUL JUNGSEONG YO-O;Lo;0;L;;;;;N;;;;;
+1188;HANGUL JUNGSEONG YO-I;Lo;0;L;;;;;N;;;;;
+1189;HANGUL JUNGSEONG U-A;Lo;0;L;;;;;N;;;;;
+118A;HANGUL JUNGSEONG U-AE;Lo;0;L;;;;;N;;;;;
+118B;HANGUL JUNGSEONG U-EO-EU;Lo;0;L;;;;;N;;;;;
+118C;HANGUL JUNGSEONG U-YE;Lo;0;L;;;;;N;;;;;
+118D;HANGUL JUNGSEONG U-U;Lo;0;L;;;;;N;;;;;
+118E;HANGUL JUNGSEONG YU-A;Lo;0;L;;;;;N;;;;;
+118F;HANGUL JUNGSEONG YU-EO;Lo;0;L;;;;;N;;;;;
+1190;HANGUL JUNGSEONG YU-E;Lo;0;L;;;;;N;;;;;
+1191;HANGUL JUNGSEONG YU-YEO;Lo;0;L;;;;;N;;;;;
+1192;HANGUL JUNGSEONG YU-YE;Lo;0;L;;;;;N;;;;;
+1193;HANGUL JUNGSEONG YU-U;Lo;0;L;;;;;N;;;;;
+1194;HANGUL JUNGSEONG YU-I;Lo;0;L;;;;;N;;;;;
+1195;HANGUL JUNGSEONG EU-U;Lo;0;L;;;;;N;;;;;
+1196;HANGUL JUNGSEONG EU-EU;Lo;0;L;;;;;N;;;;;
+1197;HANGUL JUNGSEONG YI-U;Lo;0;L;;;;;N;;;;;
+1198;HANGUL JUNGSEONG I-A;Lo;0;L;;;;;N;;;;;
+1199;HANGUL JUNGSEONG I-YA;Lo;0;L;;;;;N;;;;;
+119A;HANGUL JUNGSEONG I-O;Lo;0;L;;;;;N;;;;;
+119B;HANGUL JUNGSEONG I-U;Lo;0;L;;;;;N;;;;;
+119C;HANGUL JUNGSEONG I-EU;Lo;0;L;;;;;N;;;;;
+119D;HANGUL JUNGSEONG I-ARAEA;Lo;0;L;;;;;N;;;;;
+119E;HANGUL JUNGSEONG ARAEA;Lo;0;L;;;;;N;;;;;
+119F;HANGUL JUNGSEONG ARAEA-EO;Lo;0;L;;;;;N;;;;;
+11A0;HANGUL JUNGSEONG ARAEA-U;Lo;0;L;;;;;N;;;;;
+11A1;HANGUL JUNGSEONG ARAEA-I;Lo;0;L;;;;;N;;;;;
+11A2;HANGUL JUNGSEONG SSANGARAEA;Lo;0;L;;;;;N;;;;;
+11A8;HANGUL JONGSEONG KIYEOK;Lo;0;L;;;;;N;;g *;;;
+11A9;HANGUL JONGSEONG SSANGKIYEOK;Lo;0;L;;;;;N;;gg *;;;
+11AA;HANGUL JONGSEONG KIYEOK-SIOS;Lo;0;L;;;;;N;;gs *;;;
+11AB;HANGUL JONGSEONG NIEUN;Lo;0;L;;;;;N;;n *;;;
+11AC;HANGUL JONGSEONG NIEUN-CIEUC;Lo;0;L;;;;;N;;nj *;;;
+11AD;HANGUL JONGSEONG NIEUN-HIEUH;Lo;0;L;;;;;N;;nh *;;;
+11AE;HANGUL JONGSEONG TIKEUT;Lo;0;L;;;;;N;;d *;;;
+11AF;HANGUL JONGSEONG RIEUL;Lo;0;L;;;;;N;;l *;;;
+11B0;HANGUL JONGSEONG RIEUL-KIYEOK;Lo;0;L;;;;;N;;lg *;;;
+11B1;HANGUL JONGSEONG RIEUL-MIEUM;Lo;0;L;;;;;N;;lm *;;;
+11B2;HANGUL JONGSEONG RIEUL-PIEUP;Lo;0;L;;;;;N;;lb *;;;
+11B3;HANGUL JONGSEONG RIEUL-SIOS;Lo;0;L;;;;;N;;ls *;;;
+11B4;HANGUL JONGSEONG RIEUL-THIEUTH;Lo;0;L;;;;;N;;lt *;;;
+11B5;HANGUL JONGSEONG RIEUL-PHIEUPH;Lo;0;L;;;;;N;;lp *;;;
+11B6;HANGUL JONGSEONG RIEUL-HIEUH;Lo;0;L;;;;;N;;lh *;;;
+11B7;HANGUL JONGSEONG MIEUM;Lo;0;L;;;;;N;;m *;;;
+11B8;HANGUL JONGSEONG PIEUP;Lo;0;L;;;;;N;;b *;;;
+11B9;HANGUL JONGSEONG PIEUP-SIOS;Lo;0;L;;;;;N;;bs *;;;
+11BA;HANGUL JONGSEONG SIOS;Lo;0;L;;;;;N;;s *;;;
+11BB;HANGUL JONGSEONG SSANGSIOS;Lo;0;L;;;;;N;;ss *;;;
+11BC;HANGUL JONGSEONG IEUNG;Lo;0;L;;;;;N;;ng *;;;
+11BD;HANGUL JONGSEONG CIEUC;Lo;0;L;;;;;N;;j *;;;
+11BE;HANGUL JONGSEONG CHIEUCH;Lo;0;L;;;;;N;;c *;;;
+11BF;HANGUL JONGSEONG KHIEUKH;Lo;0;L;;;;;N;;k *;;;
+11C0;HANGUL JONGSEONG THIEUTH;Lo;0;L;;;;;N;;t *;;;
+11C1;HANGUL JONGSEONG PHIEUPH;Lo;0;L;;;;;N;;p *;;;
+11C2;HANGUL JONGSEONG HIEUH;Lo;0;L;;;;;N;;h *;;;
+11C3;HANGUL JONGSEONG KIYEOK-RIEUL;Lo;0;L;;;;;N;;;;;
+11C4;HANGUL JONGSEONG KIYEOK-SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+11C5;HANGUL JONGSEONG NIEUN-KIYEOK;Lo;0;L;;;;;N;;;;;
+11C6;HANGUL JONGSEONG NIEUN-TIKEUT;Lo;0;L;;;;;N;;;;;
+11C7;HANGUL JONGSEONG NIEUN-SIOS;Lo;0;L;;;;;N;;;;;
+11C8;HANGUL JONGSEONG NIEUN-PANSIOS;Lo;0;L;;;;;N;;;;;
+11C9;HANGUL JONGSEONG NIEUN-THIEUTH;Lo;0;L;;;;;N;;;;;
+11CA;HANGUL JONGSEONG TIKEUT-KIYEOK;Lo;0;L;;;;;N;;;;;
+11CB;HANGUL JONGSEONG TIKEUT-RIEUL;Lo;0;L;;;;;N;;;;;
+11CC;HANGUL JONGSEONG RIEUL-KIYEOK-SIOS;Lo;0;L;;;;;N;;;;;
+11CD;HANGUL JONGSEONG RIEUL-NIEUN;Lo;0;L;;;;;N;;;;;
+11CE;HANGUL JONGSEONG RIEUL-TIKEUT;Lo;0;L;;;;;N;;;;;
+11CF;HANGUL JONGSEONG RIEUL-TIKEUT-HIEUH;Lo;0;L;;;;;N;;;;;
+11D0;HANGUL JONGSEONG SSANGRIEUL;Lo;0;L;;;;;N;;;;;
+11D1;HANGUL JONGSEONG RIEUL-MIEUM-KIYEOK;Lo;0;L;;;;;N;;;;;
+11D2;HANGUL JONGSEONG RIEUL-MIEUM-SIOS;Lo;0;L;;;;;N;;;;;
+11D3;HANGUL JONGSEONG RIEUL-PIEUP-SIOS;Lo;0;L;;;;;N;;;;;
+11D4;HANGUL JONGSEONG RIEUL-PIEUP-HIEUH;Lo;0;L;;;;;N;;;;;
+11D5;HANGUL JONGSEONG RIEUL-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+11D6;HANGUL JONGSEONG RIEUL-SSANGSIOS;Lo;0;L;;;;;N;;;;;
+11D7;HANGUL JONGSEONG RIEUL-PANSIOS;Lo;0;L;;;;;N;;;;;
+11D8;HANGUL JONGSEONG RIEUL-KHIEUKH;Lo;0;L;;;;;N;;;;;
+11D9;HANGUL JONGSEONG RIEUL-YEORINHIEUH;Lo;0;L;;;;;N;;;;;
+11DA;HANGUL JONGSEONG MIEUM-KIYEOK;Lo;0;L;;;;;N;;;;;
+11DB;HANGUL JONGSEONG MIEUM-RIEUL;Lo;0;L;;;;;N;;;;;
+11DC;HANGUL JONGSEONG MIEUM-PIEUP;Lo;0;L;;;;;N;;;;;
+11DD;HANGUL JONGSEONG MIEUM-SIOS;Lo;0;L;;;;;N;;;;;
+11DE;HANGUL JONGSEONG MIEUM-SSANGSIOS;Lo;0;L;;;;;N;;;;;
+11DF;HANGUL JONGSEONG MIEUM-PANSIOS;Lo;0;L;;;;;N;;;;;
+11E0;HANGUL JONGSEONG MIEUM-CHIEUCH;Lo;0;L;;;;;N;;;;;
+11E1;HANGUL JONGSEONG MIEUM-HIEUH;Lo;0;L;;;;;N;;;;;
+11E2;HANGUL JONGSEONG KAPYEOUNMIEUM;Lo;0;L;;;;;N;;;;;
+11E3;HANGUL JONGSEONG PIEUP-RIEUL;Lo;0;L;;;;;N;;;;;
+11E4;HANGUL JONGSEONG PIEUP-PHIEUPH;Lo;0;L;;;;;N;;;;;
+11E5;HANGUL JONGSEONG PIEUP-HIEUH;Lo;0;L;;;;;N;;;;;
+11E6;HANGUL JONGSEONG KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+11E7;HANGUL JONGSEONG SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+11E8;HANGUL JONGSEONG SIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
+11E9;HANGUL JONGSEONG SIOS-RIEUL;Lo;0;L;;;;;N;;;;;
+11EA;HANGUL JONGSEONG SIOS-PIEUP;Lo;0;L;;;;;N;;;;;
+11EB;HANGUL JONGSEONG PANSIOS;Lo;0;L;;;;;N;;;;;
+11EC;HANGUL JONGSEONG IEUNG-KIYEOK;Lo;0;L;;;;;N;;;;;
+11ED;HANGUL JONGSEONG IEUNG-SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
+11EE;HANGUL JONGSEONG SSANGIEUNG;Lo;0;L;;;;;N;;;;;
+11EF;HANGUL JONGSEONG IEUNG-KHIEUKH;Lo;0;L;;;;;N;;;;;
+11F0;HANGUL JONGSEONG YESIEUNG;Lo;0;L;;;;;N;;;;;
+11F1;HANGUL JONGSEONG YESIEUNG-SIOS;Lo;0;L;;;;;N;;;;;
+11F2;HANGUL JONGSEONG YESIEUNG-PANSIOS;Lo;0;L;;;;;N;;;;;
+11F3;HANGUL JONGSEONG PHIEUPH-PIEUP;Lo;0;L;;;;;N;;;;;
+11F4;HANGUL JONGSEONG KAPYEOUNPHIEUPH;Lo;0;L;;;;;N;;;;;
+11F5;HANGUL JONGSEONG HIEUH-NIEUN;Lo;0;L;;;;;N;;;;;
+11F6;HANGUL JONGSEONG HIEUH-RIEUL;Lo;0;L;;;;;N;;;;;
+11F7;HANGUL JONGSEONG HIEUH-MIEUM;Lo;0;L;;;;;N;;;;;
+11F8;HANGUL JONGSEONG HIEUH-PIEUP;Lo;0;L;;;;;N;;;;;
+11F9;HANGUL JONGSEONG YEORINHIEUH;Lo;0;L;;;;;N;;;;;
+1200;ETHIOPIC SYLLABLE HA;Lo;0;L;;;;;N;;;;;
+1201;ETHIOPIC SYLLABLE HU;Lo;0;L;;;;;N;;;;;
+1202;ETHIOPIC SYLLABLE HI;Lo;0;L;;;;;N;;;;;
+1203;ETHIOPIC SYLLABLE HAA;Lo;0;L;;;;;N;;;;;
+1204;ETHIOPIC SYLLABLE HEE;Lo;0;L;;;;;N;;;;;
+1205;ETHIOPIC SYLLABLE HE;Lo;0;L;;;;;N;;;;;
+1206;ETHIOPIC SYLLABLE HO;Lo;0;L;;;;;N;;;;;
+1207;ETHIOPIC SYLLABLE HOA;Lo;0;L;;;;;N;;;;;
+1208;ETHIOPIC SYLLABLE LA;Lo;0;L;;;;;N;;;;;
+1209;ETHIOPIC SYLLABLE LU;Lo;0;L;;;;;N;;;;;
+120A;ETHIOPIC SYLLABLE LI;Lo;0;L;;;;;N;;;;;
+120B;ETHIOPIC SYLLABLE LAA;Lo;0;L;;;;;N;;;;;
+120C;ETHIOPIC SYLLABLE LEE;Lo;0;L;;;;;N;;;;;
+120D;ETHIOPIC SYLLABLE LE;Lo;0;L;;;;;N;;;;;
+120E;ETHIOPIC SYLLABLE LO;Lo;0;L;;;;;N;;;;;
+120F;ETHIOPIC SYLLABLE LWA;Lo;0;L;;;;;N;;;;;
+1210;ETHIOPIC SYLLABLE HHA;Lo;0;L;;;;;N;;;;;
+1211;ETHIOPIC SYLLABLE HHU;Lo;0;L;;;;;N;;;;;
+1212;ETHIOPIC SYLLABLE HHI;Lo;0;L;;;;;N;;;;;
+1213;ETHIOPIC SYLLABLE HHAA;Lo;0;L;;;;;N;;;;;
+1214;ETHIOPIC SYLLABLE HHEE;Lo;0;L;;;;;N;;;;;
+1215;ETHIOPIC SYLLABLE HHE;Lo;0;L;;;;;N;;;;;
+1216;ETHIOPIC SYLLABLE HHO;Lo;0;L;;;;;N;;;;;
+1217;ETHIOPIC SYLLABLE HHWA;Lo;0;L;;;;;N;;;;;
+1218;ETHIOPIC SYLLABLE MA;Lo;0;L;;;;;N;;;;;
+1219;ETHIOPIC SYLLABLE MU;Lo;0;L;;;;;N;;;;;
+121A;ETHIOPIC SYLLABLE MI;Lo;0;L;;;;;N;;;;;
+121B;ETHIOPIC SYLLABLE MAA;Lo;0;L;;;;;N;;;;;
+121C;ETHIOPIC SYLLABLE MEE;Lo;0;L;;;;;N;;;;;
+121D;ETHIOPIC SYLLABLE ME;Lo;0;L;;;;;N;;;;;
+121E;ETHIOPIC SYLLABLE MO;Lo;0;L;;;;;N;;;;;
+121F;ETHIOPIC SYLLABLE MWA;Lo;0;L;;;;;N;;;;;
+1220;ETHIOPIC SYLLABLE SZA;Lo;0;L;;;;;N;;;;;
+1221;ETHIOPIC SYLLABLE SZU;Lo;0;L;;;;;N;;;;;
+1222;ETHIOPIC SYLLABLE SZI;Lo;0;L;;;;;N;;;;;
+1223;ETHIOPIC SYLLABLE SZAA;Lo;0;L;;;;;N;;;;;
+1224;ETHIOPIC SYLLABLE SZEE;Lo;0;L;;;;;N;;;;;
+1225;ETHIOPIC SYLLABLE SZE;Lo;0;L;;;;;N;;;;;
+1226;ETHIOPIC SYLLABLE SZO;Lo;0;L;;;;;N;;;;;
+1227;ETHIOPIC SYLLABLE SZWA;Lo;0;L;;;;;N;;;;;
+1228;ETHIOPIC SYLLABLE RA;Lo;0;L;;;;;N;;;;;
+1229;ETHIOPIC SYLLABLE RU;Lo;0;L;;;;;N;;;;;
+122A;ETHIOPIC SYLLABLE RI;Lo;0;L;;;;;N;;;;;
+122B;ETHIOPIC SYLLABLE RAA;Lo;0;L;;;;;N;;;;;
+122C;ETHIOPIC SYLLABLE REE;Lo;0;L;;;;;N;;;;;
+122D;ETHIOPIC SYLLABLE RE;Lo;0;L;;;;;N;;;;;
+122E;ETHIOPIC SYLLABLE RO;Lo;0;L;;;;;N;;;;;
+122F;ETHIOPIC SYLLABLE RWA;Lo;0;L;;;;;N;;;;;
+1230;ETHIOPIC SYLLABLE SA;Lo;0;L;;;;;N;;;;;
+1231;ETHIOPIC SYLLABLE SU;Lo;0;L;;;;;N;;;;;
+1232;ETHIOPIC SYLLABLE SI;Lo;0;L;;;;;N;;;;;
+1233;ETHIOPIC SYLLABLE SAA;Lo;0;L;;;;;N;;;;;
+1234;ETHIOPIC SYLLABLE SEE;Lo;0;L;;;;;N;;;;;
+1235;ETHIOPIC SYLLABLE SE;Lo;0;L;;;;;N;;;;;
+1236;ETHIOPIC SYLLABLE SO;Lo;0;L;;;;;N;;;;;
+1237;ETHIOPIC SYLLABLE SWA;Lo;0;L;;;;;N;;;;;
+1238;ETHIOPIC SYLLABLE SHA;Lo;0;L;;;;;N;;;;;
+1239;ETHIOPIC SYLLABLE SHU;Lo;0;L;;;;;N;;;;;
+123A;ETHIOPIC SYLLABLE SHI;Lo;0;L;;;;;N;;;;;
+123B;ETHIOPIC SYLLABLE SHAA;Lo;0;L;;;;;N;;;;;
+123C;ETHIOPIC SYLLABLE SHEE;Lo;0;L;;;;;N;;;;;
+123D;ETHIOPIC SYLLABLE SHE;Lo;0;L;;;;;N;;;;;
+123E;ETHIOPIC SYLLABLE SHO;Lo;0;L;;;;;N;;;;;
+123F;ETHIOPIC SYLLABLE SHWA;Lo;0;L;;;;;N;;;;;
+1240;ETHIOPIC SYLLABLE QA;Lo;0;L;;;;;N;;;;;
+1241;ETHIOPIC SYLLABLE QU;Lo;0;L;;;;;N;;;;;
+1242;ETHIOPIC SYLLABLE QI;Lo;0;L;;;;;N;;;;;
+1243;ETHIOPIC SYLLABLE QAA;Lo;0;L;;;;;N;;;;;
+1244;ETHIOPIC SYLLABLE QEE;Lo;0;L;;;;;N;;;;;
+1245;ETHIOPIC SYLLABLE QE;Lo;0;L;;;;;N;;;;;
+1246;ETHIOPIC SYLLABLE QO;Lo;0;L;;;;;N;;;;;
+1247;ETHIOPIC SYLLABLE QOA;Lo;0;L;;;;;N;;;;;
+1248;ETHIOPIC SYLLABLE QWA;Lo;0;L;;;;;N;;;;;
+124A;ETHIOPIC SYLLABLE QWI;Lo;0;L;;;;;N;;;;;
+124B;ETHIOPIC SYLLABLE QWAA;Lo;0;L;;;;;N;;;;;
+124C;ETHIOPIC SYLLABLE QWEE;Lo;0;L;;;;;N;;;;;
+124D;ETHIOPIC SYLLABLE QWE;Lo;0;L;;;;;N;;;;;
+1250;ETHIOPIC SYLLABLE QHA;Lo;0;L;;;;;N;;;;;
+1251;ETHIOPIC SYLLABLE QHU;Lo;0;L;;;;;N;;;;;
+1252;ETHIOPIC SYLLABLE QHI;Lo;0;L;;;;;N;;;;;
+1253;ETHIOPIC SYLLABLE QHAA;Lo;0;L;;;;;N;;;;;
+1254;ETHIOPIC SYLLABLE QHEE;Lo;0;L;;;;;N;;;;;
+1255;ETHIOPIC SYLLABLE QHE;Lo;0;L;;;;;N;;;;;
+1256;ETHIOPIC SYLLABLE QHO;Lo;0;L;;;;;N;;;;;
+1258;ETHIOPIC SYLLABLE QHWA;Lo;0;L;;;;;N;;;;;
+125A;ETHIOPIC SYLLABLE QHWI;Lo;0;L;;;;;N;;;;;
+125B;ETHIOPIC SYLLABLE QHWAA;Lo;0;L;;;;;N;;;;;
+125C;ETHIOPIC SYLLABLE QHWEE;Lo;0;L;;;;;N;;;;;
+125D;ETHIOPIC SYLLABLE QHWE;Lo;0;L;;;;;N;;;;;
+1260;ETHIOPIC SYLLABLE BA;Lo;0;L;;;;;N;;;;;
+1261;ETHIOPIC SYLLABLE BU;Lo;0;L;;;;;N;;;;;
+1262;ETHIOPIC SYLLABLE BI;Lo;0;L;;;;;N;;;;;
+1263;ETHIOPIC SYLLABLE BAA;Lo;0;L;;;;;N;;;;;
+1264;ETHIOPIC SYLLABLE BEE;Lo;0;L;;;;;N;;;;;
+1265;ETHIOPIC SYLLABLE BE;Lo;0;L;;;;;N;;;;;
+1266;ETHIOPIC SYLLABLE BO;Lo;0;L;;;;;N;;;;;
+1267;ETHIOPIC SYLLABLE BWA;Lo;0;L;;;;;N;;;;;
+1268;ETHIOPIC SYLLABLE VA;Lo;0;L;;;;;N;;;;;
+1269;ETHIOPIC SYLLABLE VU;Lo;0;L;;;;;N;;;;;
+126A;ETHIOPIC SYLLABLE VI;Lo;0;L;;;;;N;;;;;
+126B;ETHIOPIC SYLLABLE VAA;Lo;0;L;;;;;N;;;;;
+126C;ETHIOPIC SYLLABLE VEE;Lo;0;L;;;;;N;;;;;
+126D;ETHIOPIC SYLLABLE VE;Lo;0;L;;;;;N;;;;;
+126E;ETHIOPIC SYLLABLE VO;Lo;0;L;;;;;N;;;;;
+126F;ETHIOPIC SYLLABLE VWA;Lo;0;L;;;;;N;;;;;
+1270;ETHIOPIC SYLLABLE TA;Lo;0;L;;;;;N;;;;;
+1271;ETHIOPIC SYLLABLE TU;Lo;0;L;;;;;N;;;;;
+1272;ETHIOPIC SYLLABLE TI;Lo;0;L;;;;;N;;;;;
+1273;ETHIOPIC SYLLABLE TAA;Lo;0;L;;;;;N;;;;;
+1274;ETHIOPIC SYLLABLE TEE;Lo;0;L;;;;;N;;;;;
+1275;ETHIOPIC SYLLABLE TE;Lo;0;L;;;;;N;;;;;
+1276;ETHIOPIC SYLLABLE TO;Lo;0;L;;;;;N;;;;;
+1277;ETHIOPIC SYLLABLE TWA;Lo;0;L;;;;;N;;;;;
+1278;ETHIOPIC SYLLABLE CA;Lo;0;L;;;;;N;;;;;
+1279;ETHIOPIC SYLLABLE CU;Lo;0;L;;;;;N;;;;;
+127A;ETHIOPIC SYLLABLE CI;Lo;0;L;;;;;N;;;;;
+127B;ETHIOPIC SYLLABLE CAA;Lo;0;L;;;;;N;;;;;
+127C;ETHIOPIC SYLLABLE CEE;Lo;0;L;;;;;N;;;;;
+127D;ETHIOPIC SYLLABLE CE;Lo;0;L;;;;;N;;;;;
+127E;ETHIOPIC SYLLABLE CO;Lo;0;L;;;;;N;;;;;
+127F;ETHIOPIC SYLLABLE CWA;Lo;0;L;;;;;N;;;;;
+1280;ETHIOPIC SYLLABLE XA;Lo;0;L;;;;;N;;;;;
+1281;ETHIOPIC SYLLABLE XU;Lo;0;L;;;;;N;;;;;
+1282;ETHIOPIC SYLLABLE XI;Lo;0;L;;;;;N;;;;;
+1283;ETHIOPIC SYLLABLE XAA;Lo;0;L;;;;;N;;;;;
+1284;ETHIOPIC SYLLABLE XEE;Lo;0;L;;;;;N;;;;;
+1285;ETHIOPIC SYLLABLE XE;Lo;0;L;;;;;N;;;;;
+1286;ETHIOPIC SYLLABLE XO;Lo;0;L;;;;;N;;;;;
+1287;ETHIOPIC SYLLABLE XOA;Lo;0;L;;;;;N;;;;;
+1288;ETHIOPIC SYLLABLE XWA;Lo;0;L;;;;;N;;;;;
+128A;ETHIOPIC SYLLABLE XWI;Lo;0;L;;;;;N;;;;;
+128B;ETHIOPIC SYLLABLE XWAA;Lo;0;L;;;;;N;;;;;
+128C;ETHIOPIC SYLLABLE XWEE;Lo;0;L;;;;;N;;;;;
+128D;ETHIOPIC SYLLABLE XWE;Lo;0;L;;;;;N;;;;;
+1290;ETHIOPIC SYLLABLE NA;Lo;0;L;;;;;N;;;;;
+1291;ETHIOPIC SYLLABLE NU;Lo;0;L;;;;;N;;;;;
+1292;ETHIOPIC SYLLABLE NI;Lo;0;L;;;;;N;;;;;
+1293;ETHIOPIC SYLLABLE NAA;Lo;0;L;;;;;N;;;;;
+1294;ETHIOPIC SYLLABLE NEE;Lo;0;L;;;;;N;;;;;
+1295;ETHIOPIC SYLLABLE NE;Lo;0;L;;;;;N;;;;;
+1296;ETHIOPIC SYLLABLE NO;Lo;0;L;;;;;N;;;;;
+1297;ETHIOPIC SYLLABLE NWA;Lo;0;L;;;;;N;;;;;
+1298;ETHIOPIC SYLLABLE NYA;Lo;0;L;;;;;N;;;;;
+1299;ETHIOPIC SYLLABLE NYU;Lo;0;L;;;;;N;;;;;
+129A;ETHIOPIC SYLLABLE NYI;Lo;0;L;;;;;N;;;;;
+129B;ETHIOPIC SYLLABLE NYAA;Lo;0;L;;;;;N;;;;;
+129C;ETHIOPIC SYLLABLE NYEE;Lo;0;L;;;;;N;;;;;
+129D;ETHIOPIC SYLLABLE NYE;Lo;0;L;;;;;N;;;;;
+129E;ETHIOPIC SYLLABLE NYO;Lo;0;L;;;;;N;;;;;
+129F;ETHIOPIC SYLLABLE NYWA;Lo;0;L;;;;;N;;;;;
+12A0;ETHIOPIC SYLLABLE GLOTTAL A;Lo;0;L;;;;;N;;;;;
+12A1;ETHIOPIC SYLLABLE GLOTTAL U;Lo;0;L;;;;;N;;;;;
+12A2;ETHIOPIC SYLLABLE GLOTTAL I;Lo;0;L;;;;;N;;;;;
+12A3;ETHIOPIC SYLLABLE GLOTTAL AA;Lo;0;L;;;;;N;;;;;
+12A4;ETHIOPIC SYLLABLE GLOTTAL EE;Lo;0;L;;;;;N;;;;;
+12A5;ETHIOPIC SYLLABLE GLOTTAL E;Lo;0;L;;;;;N;;;;;
+12A6;ETHIOPIC SYLLABLE GLOTTAL O;Lo;0;L;;;;;N;;;;;
+12A7;ETHIOPIC SYLLABLE GLOTTAL WA;Lo;0;L;;;;;N;;;;;
+12A8;ETHIOPIC SYLLABLE KA;Lo;0;L;;;;;N;;;;;
+12A9;ETHIOPIC SYLLABLE KU;Lo;0;L;;;;;N;;;;;
+12AA;ETHIOPIC SYLLABLE KI;Lo;0;L;;;;;N;;;;;
+12AB;ETHIOPIC SYLLABLE KAA;Lo;0;L;;;;;N;;;;;
+12AC;ETHIOPIC SYLLABLE KEE;Lo;0;L;;;;;N;;;;;
+12AD;ETHIOPIC SYLLABLE KE;Lo;0;L;;;;;N;;;;;
+12AE;ETHIOPIC SYLLABLE KO;Lo;0;L;;;;;N;;;;;
+12AF;ETHIOPIC SYLLABLE KOA;Lo;0;L;;;;;N;;;;;
+12B0;ETHIOPIC SYLLABLE KWA;Lo;0;L;;;;;N;;;;;
+12B2;ETHIOPIC SYLLABLE KWI;Lo;0;L;;;;;N;;;;;
+12B3;ETHIOPIC SYLLABLE KWAA;Lo;0;L;;;;;N;;;;;
+12B4;ETHIOPIC SYLLABLE KWEE;Lo;0;L;;;;;N;;;;;
+12B5;ETHIOPIC SYLLABLE KWE;Lo;0;L;;;;;N;;;;;
+12B8;ETHIOPIC SYLLABLE KXA;Lo;0;L;;;;;N;;;;;
+12B9;ETHIOPIC SYLLABLE KXU;Lo;0;L;;;;;N;;;;;
+12BA;ETHIOPIC SYLLABLE KXI;Lo;0;L;;;;;N;;;;;
+12BB;ETHIOPIC SYLLABLE KXAA;Lo;0;L;;;;;N;;;;;
+12BC;ETHIOPIC SYLLABLE KXEE;Lo;0;L;;;;;N;;;;;
+12BD;ETHIOPIC SYLLABLE KXE;Lo;0;L;;;;;N;;;;;
+12BE;ETHIOPIC SYLLABLE KXO;Lo;0;L;;;;;N;;;;;
+12C0;ETHIOPIC SYLLABLE KXWA;Lo;0;L;;;;;N;;;;;
+12C2;ETHIOPIC SYLLABLE KXWI;Lo;0;L;;;;;N;;;;;
+12C3;ETHIOPIC SYLLABLE KXWAA;Lo;0;L;;;;;N;;;;;
+12C4;ETHIOPIC SYLLABLE KXWEE;Lo;0;L;;;;;N;;;;;
+12C5;ETHIOPIC SYLLABLE KXWE;Lo;0;L;;;;;N;;;;;
+12C8;ETHIOPIC SYLLABLE WA;Lo;0;L;;;;;N;;;;;
+12C9;ETHIOPIC SYLLABLE WU;Lo;0;L;;;;;N;;;;;
+12CA;ETHIOPIC SYLLABLE WI;Lo;0;L;;;;;N;;;;;
+12CB;ETHIOPIC SYLLABLE WAA;Lo;0;L;;;;;N;;;;;
+12CC;ETHIOPIC SYLLABLE WEE;Lo;0;L;;;;;N;;;;;
+12CD;ETHIOPIC SYLLABLE WE;Lo;0;L;;;;;N;;;;;
+12CE;ETHIOPIC SYLLABLE WO;Lo;0;L;;;;;N;;;;;
+12CF;ETHIOPIC SYLLABLE WOA;Lo;0;L;;;;;N;;;;;
+12D0;ETHIOPIC SYLLABLE PHARYNGEAL A;Lo;0;L;;;;;N;;;;;
+12D1;ETHIOPIC SYLLABLE PHARYNGEAL U;Lo;0;L;;;;;N;;;;;
+12D2;ETHIOPIC SYLLABLE PHARYNGEAL I;Lo;0;L;;;;;N;;;;;
+12D3;ETHIOPIC SYLLABLE PHARYNGEAL AA;Lo;0;L;;;;;N;;;;;
+12D4;ETHIOPIC SYLLABLE PHARYNGEAL EE;Lo;0;L;;;;;N;;;;;
+12D5;ETHIOPIC SYLLABLE PHARYNGEAL E;Lo;0;L;;;;;N;;;;;
+12D6;ETHIOPIC SYLLABLE PHARYNGEAL O;Lo;0;L;;;;;N;;;;;
+12D8;ETHIOPIC SYLLABLE ZA;Lo;0;L;;;;;N;;;;;
+12D9;ETHIOPIC SYLLABLE ZU;Lo;0;L;;;;;N;;;;;
+12DA;ETHIOPIC SYLLABLE ZI;Lo;0;L;;;;;N;;;;;
+12DB;ETHIOPIC SYLLABLE ZAA;Lo;0;L;;;;;N;;;;;
+12DC;ETHIOPIC SYLLABLE ZEE;Lo;0;L;;;;;N;;;;;
+12DD;ETHIOPIC SYLLABLE ZE;Lo;0;L;;;;;N;;;;;
+12DE;ETHIOPIC SYLLABLE ZO;Lo;0;L;;;;;N;;;;;
+12DF;ETHIOPIC SYLLABLE ZWA;Lo;0;L;;;;;N;;;;;
+12E0;ETHIOPIC SYLLABLE ZHA;Lo;0;L;;;;;N;;;;;
+12E1;ETHIOPIC SYLLABLE ZHU;Lo;0;L;;;;;N;;;;;
+12E2;ETHIOPIC SYLLABLE ZHI;Lo;0;L;;;;;N;;;;;
+12E3;ETHIOPIC SYLLABLE ZHAA;Lo;0;L;;;;;N;;;;;
+12E4;ETHIOPIC SYLLABLE ZHEE;Lo;0;L;;;;;N;;;;;
+12E5;ETHIOPIC SYLLABLE ZHE;Lo;0;L;;;;;N;;;;;
+12E6;ETHIOPIC SYLLABLE ZHO;Lo;0;L;;;;;N;;;;;
+12E7;ETHIOPIC SYLLABLE ZHWA;Lo;0;L;;;;;N;;;;;
+12E8;ETHIOPIC SYLLABLE YA;Lo;0;L;;;;;N;;;;;
+12E9;ETHIOPIC SYLLABLE YU;Lo;0;L;;;;;N;;;;;
+12EA;ETHIOPIC SYLLABLE YI;Lo;0;L;;;;;N;;;;;
+12EB;ETHIOPIC SYLLABLE YAA;Lo;0;L;;;;;N;;;;;
+12EC;ETHIOPIC SYLLABLE YEE;Lo;0;L;;;;;N;;;;;
+12ED;ETHIOPIC SYLLABLE YE;Lo;0;L;;;;;N;;;;;
+12EE;ETHIOPIC SYLLABLE YO;Lo;0;L;;;;;N;;;;;
+12EF;ETHIOPIC SYLLABLE YOA;Lo;0;L;;;;;N;;;;;
+12F0;ETHIOPIC SYLLABLE DA;Lo;0;L;;;;;N;;;;;
+12F1;ETHIOPIC SYLLABLE DU;Lo;0;L;;;;;N;;;;;
+12F2;ETHIOPIC SYLLABLE DI;Lo;0;L;;;;;N;;;;;
+12F3;ETHIOPIC SYLLABLE DAA;Lo;0;L;;;;;N;;;;;
+12F4;ETHIOPIC SYLLABLE DEE;Lo;0;L;;;;;N;;;;;
+12F5;ETHIOPIC SYLLABLE DE;Lo;0;L;;;;;N;;;;;
+12F6;ETHIOPIC SYLLABLE DO;Lo;0;L;;;;;N;;;;;
+12F7;ETHIOPIC SYLLABLE DWA;Lo;0;L;;;;;N;;;;;
+12F8;ETHIOPIC SYLLABLE DDA;Lo;0;L;;;;;N;;;;;
+12F9;ETHIOPIC SYLLABLE DDU;Lo;0;L;;;;;N;;;;;
+12FA;ETHIOPIC SYLLABLE DDI;Lo;0;L;;;;;N;;;;;
+12FB;ETHIOPIC SYLLABLE DDAA;Lo;0;L;;;;;N;;;;;
+12FC;ETHIOPIC SYLLABLE DDEE;Lo;0;L;;;;;N;;;;;
+12FD;ETHIOPIC SYLLABLE DDE;Lo;0;L;;;;;N;;;;;
+12FE;ETHIOPIC SYLLABLE DDO;Lo;0;L;;;;;N;;;;;
+12FF;ETHIOPIC SYLLABLE DDWA;Lo;0;L;;;;;N;;;;;
+1300;ETHIOPIC SYLLABLE JA;Lo;0;L;;;;;N;;;;;
+1301;ETHIOPIC SYLLABLE JU;Lo;0;L;;;;;N;;;;;
+1302;ETHIOPIC SYLLABLE JI;Lo;0;L;;;;;N;;;;;
+1303;ETHIOPIC SYLLABLE JAA;Lo;0;L;;;;;N;;;;;
+1304;ETHIOPIC SYLLABLE JEE;Lo;0;L;;;;;N;;;;;
+1305;ETHIOPIC SYLLABLE JE;Lo;0;L;;;;;N;;;;;
+1306;ETHIOPIC SYLLABLE JO;Lo;0;L;;;;;N;;;;;
+1307;ETHIOPIC SYLLABLE JWA;Lo;0;L;;;;;N;;;;;
+1308;ETHIOPIC SYLLABLE GA;Lo;0;L;;;;;N;;;;;
+1309;ETHIOPIC SYLLABLE GU;Lo;0;L;;;;;N;;;;;
+130A;ETHIOPIC SYLLABLE GI;Lo;0;L;;;;;N;;;;;
+130B;ETHIOPIC SYLLABLE GAA;Lo;0;L;;;;;N;;;;;
+130C;ETHIOPIC SYLLABLE GEE;Lo;0;L;;;;;N;;;;;
+130D;ETHIOPIC SYLLABLE GE;Lo;0;L;;;;;N;;;;;
+130E;ETHIOPIC SYLLABLE GO;Lo;0;L;;;;;N;;;;;
+130F;ETHIOPIC SYLLABLE GOA;Lo;0;L;;;;;N;;;;;
+1310;ETHIOPIC SYLLABLE GWA;Lo;0;L;;;;;N;;;;;
+1312;ETHIOPIC SYLLABLE GWI;Lo;0;L;;;;;N;;;;;
+1313;ETHIOPIC SYLLABLE GWAA;Lo;0;L;;;;;N;;;;;
+1314;ETHIOPIC SYLLABLE GWEE;Lo;0;L;;;;;N;;;;;
+1315;ETHIOPIC SYLLABLE GWE;Lo;0;L;;;;;N;;;;;
+1318;ETHIOPIC SYLLABLE GGA;Lo;0;L;;;;;N;;;;;
+1319;ETHIOPIC SYLLABLE GGU;Lo;0;L;;;;;N;;;;;
+131A;ETHIOPIC SYLLABLE GGI;Lo;0;L;;;;;N;;;;;
+131B;ETHIOPIC SYLLABLE GGAA;Lo;0;L;;;;;N;;;;;
+131C;ETHIOPIC SYLLABLE GGEE;Lo;0;L;;;;;N;;;;;
+131D;ETHIOPIC SYLLABLE GGE;Lo;0;L;;;;;N;;;;;
+131E;ETHIOPIC SYLLABLE GGO;Lo;0;L;;;;;N;;;;;
+131F;ETHIOPIC SYLLABLE GGWAA;Lo;0;L;;;;;N;;;;;
+1320;ETHIOPIC SYLLABLE THA;Lo;0;L;;;;;N;;;;;
+1321;ETHIOPIC SYLLABLE THU;Lo;0;L;;;;;N;;;;;
+1322;ETHIOPIC SYLLABLE THI;Lo;0;L;;;;;N;;;;;
+1323;ETHIOPIC SYLLABLE THAA;Lo;0;L;;;;;N;;;;;
+1324;ETHIOPIC SYLLABLE THEE;Lo;0;L;;;;;N;;;;;
+1325;ETHIOPIC SYLLABLE THE;Lo;0;L;;;;;N;;;;;
+1326;ETHIOPIC SYLLABLE THO;Lo;0;L;;;;;N;;;;;
+1327;ETHIOPIC SYLLABLE THWA;Lo;0;L;;;;;N;;;;;
+1328;ETHIOPIC SYLLABLE CHA;Lo;0;L;;;;;N;;;;;
+1329;ETHIOPIC SYLLABLE CHU;Lo;0;L;;;;;N;;;;;
+132A;ETHIOPIC SYLLABLE CHI;Lo;0;L;;;;;N;;;;;
+132B;ETHIOPIC SYLLABLE CHAA;Lo;0;L;;;;;N;;;;;
+132C;ETHIOPIC SYLLABLE CHEE;Lo;0;L;;;;;N;;;;;
+132D;ETHIOPIC SYLLABLE CHE;Lo;0;L;;;;;N;;;;;
+132E;ETHIOPIC SYLLABLE CHO;Lo;0;L;;;;;N;;;;;
+132F;ETHIOPIC SYLLABLE CHWA;Lo;0;L;;;;;N;;;;;
+1330;ETHIOPIC SYLLABLE PHA;Lo;0;L;;;;;N;;;;;
+1331;ETHIOPIC SYLLABLE PHU;Lo;0;L;;;;;N;;;;;
+1332;ETHIOPIC SYLLABLE PHI;Lo;0;L;;;;;N;;;;;
+1333;ETHIOPIC SYLLABLE PHAA;Lo;0;L;;;;;N;;;;;
+1334;ETHIOPIC SYLLABLE PHEE;Lo;0;L;;;;;N;;;;;
+1335;ETHIOPIC SYLLABLE PHE;Lo;0;L;;;;;N;;;;;
+1336;ETHIOPIC SYLLABLE PHO;Lo;0;L;;;;;N;;;;;
+1337;ETHIOPIC SYLLABLE PHWA;Lo;0;L;;;;;N;;;;;
+1338;ETHIOPIC SYLLABLE TSA;Lo;0;L;;;;;N;;;;;
+1339;ETHIOPIC SYLLABLE TSU;Lo;0;L;;;;;N;;;;;
+133A;ETHIOPIC SYLLABLE TSI;Lo;0;L;;;;;N;;;;;
+133B;ETHIOPIC SYLLABLE TSAA;Lo;0;L;;;;;N;;;;;
+133C;ETHIOPIC SYLLABLE TSEE;Lo;0;L;;;;;N;;;;;
+133D;ETHIOPIC SYLLABLE TSE;Lo;0;L;;;;;N;;;;;
+133E;ETHIOPIC SYLLABLE TSO;Lo;0;L;;;;;N;;;;;
+133F;ETHIOPIC SYLLABLE TSWA;Lo;0;L;;;;;N;;;;;
+1340;ETHIOPIC SYLLABLE TZA;Lo;0;L;;;;;N;;;;;
+1341;ETHIOPIC SYLLABLE TZU;Lo;0;L;;;;;N;;;;;
+1342;ETHIOPIC SYLLABLE TZI;Lo;0;L;;;;;N;;;;;
+1343;ETHIOPIC SYLLABLE TZAA;Lo;0;L;;;;;N;;;;;
+1344;ETHIOPIC SYLLABLE TZEE;Lo;0;L;;;;;N;;;;;
+1345;ETHIOPIC SYLLABLE TZE;Lo;0;L;;;;;N;;;;;
+1346;ETHIOPIC SYLLABLE TZO;Lo;0;L;;;;;N;;;;;
+1347;ETHIOPIC SYLLABLE TZOA;Lo;0;L;;;;;N;;;;;
+1348;ETHIOPIC SYLLABLE FA;Lo;0;L;;;;;N;;;;;
+1349;ETHIOPIC SYLLABLE FU;Lo;0;L;;;;;N;;;;;
+134A;ETHIOPIC SYLLABLE FI;Lo;0;L;;;;;N;;;;;
+134B;ETHIOPIC SYLLABLE FAA;Lo;0;L;;;;;N;;;;;
+134C;ETHIOPIC SYLLABLE FEE;Lo;0;L;;;;;N;;;;;
+134D;ETHIOPIC SYLLABLE FE;Lo;0;L;;;;;N;;;;;
+134E;ETHIOPIC SYLLABLE FO;Lo;0;L;;;;;N;;;;;
+134F;ETHIOPIC SYLLABLE FWA;Lo;0;L;;;;;N;;;;;
+1350;ETHIOPIC SYLLABLE PA;Lo;0;L;;;;;N;;;;;
+1351;ETHIOPIC SYLLABLE PU;Lo;0;L;;;;;N;;;;;
+1352;ETHIOPIC SYLLABLE PI;Lo;0;L;;;;;N;;;;;
+1353;ETHIOPIC SYLLABLE PAA;Lo;0;L;;;;;N;;;;;
+1354;ETHIOPIC SYLLABLE PEE;Lo;0;L;;;;;N;;;;;
+1355;ETHIOPIC SYLLABLE PE;Lo;0;L;;;;;N;;;;;
+1356;ETHIOPIC SYLLABLE PO;Lo;0;L;;;;;N;;;;;
+1357;ETHIOPIC SYLLABLE PWA;Lo;0;L;;;;;N;;;;;
+1358;ETHIOPIC SYLLABLE RYA;Lo;0;L;;;;;N;;;;;
+1359;ETHIOPIC SYLLABLE MYA;Lo;0;L;;;;;N;;;;;
+135A;ETHIOPIC SYLLABLE FYA;Lo;0;L;;;;;N;;;;;
+135F;ETHIOPIC COMBINING GEMINATION MARK;Mn;230;NSM;;;;;N;;;;;
+1360;ETHIOPIC SECTION MARK;So;0;L;;;;;N;;;;;
+1361;ETHIOPIC WORDSPACE;Po;0;L;;;;;N;;;;;
+1362;ETHIOPIC FULL STOP;Po;0;L;;;;;N;;;;;
+1363;ETHIOPIC COMMA;Po;0;L;;;;;N;;;;;
+1364;ETHIOPIC SEMICOLON;Po;0;L;;;;;N;;;;;
+1365;ETHIOPIC COLON;Po;0;L;;;;;N;;;;;
+1366;ETHIOPIC PREFACE COLON;Po;0;L;;;;;N;;;;;
+1367;ETHIOPIC QUESTION MARK;Po;0;L;;;;;N;;;;;
+1368;ETHIOPIC PARAGRAPH SEPARATOR;Po;0;L;;;;;N;;;;;
+1369;ETHIOPIC DIGIT ONE;No;0;L;;;1;1;N;;;;;
+136A;ETHIOPIC DIGIT TWO;No;0;L;;;2;2;N;;;;;
+136B;ETHIOPIC DIGIT THREE;No;0;L;;;3;3;N;;;;;
+136C;ETHIOPIC DIGIT FOUR;No;0;L;;;4;4;N;;;;;
+136D;ETHIOPIC DIGIT FIVE;No;0;L;;;5;5;N;;;;;
+136E;ETHIOPIC DIGIT SIX;No;0;L;;;6;6;N;;;;;
+136F;ETHIOPIC DIGIT SEVEN;No;0;L;;;7;7;N;;;;;
+1370;ETHIOPIC DIGIT EIGHT;No;0;L;;;8;8;N;;;;;
+1371;ETHIOPIC DIGIT NINE;No;0;L;;;9;9;N;;;;;
+1372;ETHIOPIC NUMBER TEN;No;0;L;;;;10;N;;;;;
+1373;ETHIOPIC NUMBER TWENTY;No;0;L;;;;20;N;;;;;
+1374;ETHIOPIC NUMBER THIRTY;No;0;L;;;;30;N;;;;;
+1375;ETHIOPIC NUMBER FORTY;No;0;L;;;;40;N;;;;;
+1376;ETHIOPIC NUMBER FIFTY;No;0;L;;;;50;N;;;;;
+1377;ETHIOPIC NUMBER SIXTY;No;0;L;;;;60;N;;;;;
+1378;ETHIOPIC NUMBER SEVENTY;No;0;L;;;;70;N;;;;;
+1379;ETHIOPIC NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
+137A;ETHIOPIC NUMBER NINETY;No;0;L;;;;90;N;;;;;
+137B;ETHIOPIC NUMBER HUNDRED;No;0;L;;;;100;N;;;;;
+137C;ETHIOPIC NUMBER TEN THOUSAND;No;0;L;;;;10000;N;;;;;
+1380;ETHIOPIC SYLLABLE SEBATBEIT MWA;Lo;0;L;;;;;N;;;;;
+1381;ETHIOPIC SYLLABLE MWI;Lo;0;L;;;;;N;;;;;
+1382;ETHIOPIC SYLLABLE MWEE;Lo;0;L;;;;;N;;;;;
+1383;ETHIOPIC SYLLABLE MWE;Lo;0;L;;;;;N;;;;;
+1384;ETHIOPIC SYLLABLE SEBATBEIT BWA;Lo;0;L;;;;;N;;;;;
+1385;ETHIOPIC SYLLABLE BWI;Lo;0;L;;;;;N;;;;;
+1386;ETHIOPIC SYLLABLE BWEE;Lo;0;L;;;;;N;;;;;
+1387;ETHIOPIC SYLLABLE BWE;Lo;0;L;;;;;N;;;;;
+1388;ETHIOPIC SYLLABLE SEBATBEIT FWA;Lo;0;L;;;;;N;;;;;
+1389;ETHIOPIC SYLLABLE FWI;Lo;0;L;;;;;N;;;;;
+138A;ETHIOPIC SYLLABLE FWEE;Lo;0;L;;;;;N;;;;;
+138B;ETHIOPIC SYLLABLE FWE;Lo;0;L;;;;;N;;;;;
+138C;ETHIOPIC SYLLABLE SEBATBEIT PWA;Lo;0;L;;;;;N;;;;;
+138D;ETHIOPIC SYLLABLE PWI;Lo;0;L;;;;;N;;;;;
+138E;ETHIOPIC SYLLABLE PWEE;Lo;0;L;;;;;N;;;;;
+138F;ETHIOPIC SYLLABLE PWE;Lo;0;L;;;;;N;;;;;
+1390;ETHIOPIC TONAL MARK YIZET;So;0;ON;;;;;N;;;;;
+1391;ETHIOPIC TONAL MARK DERET;So;0;ON;;;;;N;;;;;
+1392;ETHIOPIC TONAL MARK RIKRIK;So;0;ON;;;;;N;;;;;
+1393;ETHIOPIC TONAL MARK SHORT RIKRIK;So;0;ON;;;;;N;;;;;
+1394;ETHIOPIC TONAL MARK DIFAT;So;0;ON;;;;;N;;;;;
+1395;ETHIOPIC TONAL MARK KENAT;So;0;ON;;;;;N;;;;;
+1396;ETHIOPIC TONAL MARK CHIRET;So;0;ON;;;;;N;;;;;
+1397;ETHIOPIC TONAL MARK HIDET;So;0;ON;;;;;N;;;;;
+1398;ETHIOPIC TONAL MARK DERET-HIDET;So;0;ON;;;;;N;;;;;
+1399;ETHIOPIC TONAL MARK KURT;So;0;ON;;;;;N;;;;;
+13A0;CHEROKEE LETTER A;Lo;0;L;;;;;N;;;;;
+13A1;CHEROKEE LETTER E;Lo;0;L;;;;;N;;;;;
+13A2;CHEROKEE LETTER I;Lo;0;L;;;;;N;;;;;
+13A3;CHEROKEE LETTER O;Lo;0;L;;;;;N;;;;;
+13A4;CHEROKEE LETTER U;Lo;0;L;;;;;N;;;;;
+13A5;CHEROKEE LETTER V;Lo;0;L;;;;;N;;;;;
+13A6;CHEROKEE LETTER GA;Lo;0;L;;;;;N;;;;;
+13A7;CHEROKEE LETTER KA;Lo;0;L;;;;;N;;;;;
+13A8;CHEROKEE LETTER GE;Lo;0;L;;;;;N;;;;;
+13A9;CHEROKEE LETTER GI;Lo;0;L;;;;;N;;;;;
+13AA;CHEROKEE LETTER GO;Lo;0;L;;;;;N;;;;;
+13AB;CHEROKEE LETTER GU;Lo;0;L;;;;;N;;;;;
+13AC;CHEROKEE LETTER GV;Lo;0;L;;;;;N;;;;;
+13AD;CHEROKEE LETTER HA;Lo;0;L;;;;;N;;;;;
+13AE;CHEROKEE LETTER HE;Lo;0;L;;;;;N;;;;;
+13AF;CHEROKEE LETTER HI;Lo;0;L;;;;;N;;;;;
+13B0;CHEROKEE LETTER HO;Lo;0;L;;;;;N;;;;;
+13B1;CHEROKEE LETTER HU;Lo;0;L;;;;;N;;;;;
+13B2;CHEROKEE LETTER HV;Lo;0;L;;;;;N;;;;;
+13B3;CHEROKEE LETTER LA;Lo;0;L;;;;;N;;;;;
+13B4;CHEROKEE LETTER LE;Lo;0;L;;;;;N;;;;;
+13B5;CHEROKEE LETTER LI;Lo;0;L;;;;;N;;;;;
+13B6;CHEROKEE LETTER LO;Lo;0;L;;;;;N;;;;;
+13B7;CHEROKEE LETTER LU;Lo;0;L;;;;;N;;;;;
+13B8;CHEROKEE LETTER LV;Lo;0;L;;;;;N;;;;;
+13B9;CHEROKEE LETTER MA;Lo;0;L;;;;;N;;;;;
+13BA;CHEROKEE LETTER ME;Lo;0;L;;;;;N;;;;;
+13BB;CHEROKEE LETTER MI;Lo;0;L;;;;;N;;;;;
+13BC;CHEROKEE LETTER MO;Lo;0;L;;;;;N;;;;;
+13BD;CHEROKEE LETTER MU;Lo;0;L;;;;;N;;;;;
+13BE;CHEROKEE LETTER NA;Lo;0;L;;;;;N;;;;;
+13BF;CHEROKEE LETTER HNA;Lo;0;L;;;;;N;;;;;
+13C0;CHEROKEE LETTER NAH;Lo;0;L;;;;;N;;;;;
+13C1;CHEROKEE LETTER NE;Lo;0;L;;;;;N;;;;;
+13C2;CHEROKEE LETTER NI;Lo;0;L;;;;;N;;;;;
+13C3;CHEROKEE LETTER NO;Lo;0;L;;;;;N;;;;;
+13C4;CHEROKEE LETTER NU;Lo;0;L;;;;;N;;;;;
+13C5;CHEROKEE LETTER NV;Lo;0;L;;;;;N;;;;;
+13C6;CHEROKEE LETTER QUA;Lo;0;L;;;;;N;;;;;
+13C7;CHEROKEE LETTER QUE;Lo;0;L;;;;;N;;;;;
+13C8;CHEROKEE LETTER QUI;Lo;0;L;;;;;N;;;;;
+13C9;CHEROKEE LETTER QUO;Lo;0;L;;;;;N;;;;;
+13CA;CHEROKEE LETTER QUU;Lo;0;L;;;;;N;;;;;
+13CB;CHEROKEE LETTER QUV;Lo;0;L;;;;;N;;;;;
+13CC;CHEROKEE LETTER SA;Lo;0;L;;;;;N;;;;;
+13CD;CHEROKEE LETTER S;Lo;0;L;;;;;N;;;;;
+13CE;CHEROKEE LETTER SE;Lo;0;L;;;;;N;;;;;
+13CF;CHEROKEE LETTER SI;Lo;0;L;;;;;N;;;;;
+13D0;CHEROKEE LETTER SO;Lo;0;L;;;;;N;;;;;
+13D1;CHEROKEE LETTER SU;Lo;0;L;;;;;N;;;;;
+13D2;CHEROKEE LETTER SV;Lo;0;L;;;;;N;;;;;
+13D3;CHEROKEE LETTER DA;Lo;0;L;;;;;N;;;;;
+13D4;CHEROKEE LETTER TA;Lo;0;L;;;;;N;;;;;
+13D5;CHEROKEE LETTER DE;Lo;0;L;;;;;N;;;;;
+13D6;CHEROKEE LETTER TE;Lo;0;L;;;;;N;;;;;
+13D7;CHEROKEE LETTER DI;Lo;0;L;;;;;N;;;;;
+13D8;CHEROKEE LETTER TI;Lo;0;L;;;;;N;;;;;
+13D9;CHEROKEE LETTER DO;Lo;0;L;;;;;N;;;;;
+13DA;CHEROKEE LETTER DU;Lo;0;L;;;;;N;;;;;
+13DB;CHEROKEE LETTER DV;Lo;0;L;;;;;N;;;;;
+13DC;CHEROKEE LETTER DLA;Lo;0;L;;;;;N;;;;;
+13DD;CHEROKEE LETTER TLA;Lo;0;L;;;;;N;;;;;
+13DE;CHEROKEE LETTER TLE;Lo;0;L;;;;;N;;;;;
+13DF;CHEROKEE LETTER TLI;Lo;0;L;;;;;N;;;;;
+13E0;CHEROKEE LETTER TLO;Lo;0;L;;;;;N;;;;;
+13E1;CHEROKEE LETTER TLU;Lo;0;L;;;;;N;;;;;
+13E2;CHEROKEE LETTER TLV;Lo;0;L;;;;;N;;;;;
+13E3;CHEROKEE LETTER TSA;Lo;0;L;;;;;N;;;;;
+13E4;CHEROKEE LETTER TSE;Lo;0;L;;;;;N;;;;;
+13E5;CHEROKEE LETTER TSI;Lo;0;L;;;;;N;;;;;
+13E6;CHEROKEE LETTER TSO;Lo;0;L;;;;;N;;;;;
+13E7;CHEROKEE LETTER TSU;Lo;0;L;;;;;N;;;;;
+13E8;CHEROKEE LETTER TSV;Lo;0;L;;;;;N;;;;;
+13E9;CHEROKEE LETTER WA;Lo;0;L;;;;;N;;;;;
+13EA;CHEROKEE LETTER WE;Lo;0;L;;;;;N;;;;;
+13EB;CHEROKEE LETTER WI;Lo;0;L;;;;;N;;;;;
+13EC;CHEROKEE LETTER WO;Lo;0;L;;;;;N;;;;;
+13ED;CHEROKEE LETTER WU;Lo;0;L;;;;;N;;;;;
+13EE;CHEROKEE LETTER WV;Lo;0;L;;;;;N;;;;;
+13EF;CHEROKEE LETTER YA;Lo;0;L;;;;;N;;;;;
+13F0;CHEROKEE LETTER YE;Lo;0;L;;;;;N;;;;;
+13F1;CHEROKEE LETTER YI;Lo;0;L;;;;;N;;;;;
+13F2;CHEROKEE LETTER YO;Lo;0;L;;;;;N;;;;;
+13F3;CHEROKEE LETTER YU;Lo;0;L;;;;;N;;;;;
+13F4;CHEROKEE LETTER YV;Lo;0;L;;;;;N;;;;;
+1401;CANADIAN SYLLABICS E;Lo;0;L;;;;;N;;;;;
+1402;CANADIAN SYLLABICS AAI;Lo;0;L;;;;;N;;;;;
+1403;CANADIAN SYLLABICS I;Lo;0;L;;;;;N;;;;;
+1404;CANADIAN SYLLABICS II;Lo;0;L;;;;;N;;;;;
+1405;CANADIAN SYLLABICS O;Lo;0;L;;;;;N;;;;;
+1406;CANADIAN SYLLABICS OO;Lo;0;L;;;;;N;;;;;
+1407;CANADIAN SYLLABICS Y-CREE OO;Lo;0;L;;;;;N;;;;;
+1408;CANADIAN SYLLABICS CARRIER EE;Lo;0;L;;;;;N;;;;;
+1409;CANADIAN SYLLABICS CARRIER I;Lo;0;L;;;;;N;;;;;
+140A;CANADIAN SYLLABICS A;Lo;0;L;;;;;N;;;;;
+140B;CANADIAN SYLLABICS AA;Lo;0;L;;;;;N;;;;;
+140C;CANADIAN SYLLABICS WE;Lo;0;L;;;;;N;;;;;
+140D;CANADIAN SYLLABICS WEST-CREE WE;Lo;0;L;;;;;N;;;;;
+140E;CANADIAN SYLLABICS WI;Lo;0;L;;;;;N;;;;;
+140F;CANADIAN SYLLABICS WEST-CREE WI;Lo;0;L;;;;;N;;;;;
+1410;CANADIAN SYLLABICS WII;Lo;0;L;;;;;N;;;;;
+1411;CANADIAN SYLLABICS WEST-CREE WII;Lo;0;L;;;;;N;;;;;
+1412;CANADIAN SYLLABICS WO;Lo;0;L;;;;;N;;;;;
+1413;CANADIAN SYLLABICS WEST-CREE WO;Lo;0;L;;;;;N;;;;;
+1414;CANADIAN SYLLABICS WOO;Lo;0;L;;;;;N;;;;;
+1415;CANADIAN SYLLABICS WEST-CREE WOO;Lo;0;L;;;;;N;;;;;
+1416;CANADIAN SYLLABICS NASKAPI WOO;Lo;0;L;;;;;N;;;;;
+1417;CANADIAN SYLLABICS WA;Lo;0;L;;;;;N;;;;;
+1418;CANADIAN SYLLABICS WEST-CREE WA;Lo;0;L;;;;;N;;;;;
+1419;CANADIAN SYLLABICS WAA;Lo;0;L;;;;;N;;;;;
+141A;CANADIAN SYLLABICS WEST-CREE WAA;Lo;0;L;;;;;N;;;;;
+141B;CANADIAN SYLLABICS NASKAPI WAA;Lo;0;L;;;;;N;;;;;
+141C;CANADIAN SYLLABICS AI;Lo;0;L;;;;;N;;;;;
+141D;CANADIAN SYLLABICS Y-CREE W;Lo;0;L;;;;;N;;;;;
+141E;CANADIAN SYLLABICS GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
+141F;CANADIAN SYLLABICS FINAL ACUTE;Lo;0;L;;;;;N;;;;;
+1420;CANADIAN SYLLABICS FINAL GRAVE;Lo;0;L;;;;;N;;;;;
+1421;CANADIAN SYLLABICS FINAL BOTTOM HALF RING;Lo;0;L;;;;;N;;;;;
+1422;CANADIAN SYLLABICS FINAL TOP HALF RING;Lo;0;L;;;;;N;;;;;
+1423;CANADIAN SYLLABICS FINAL RIGHT HALF RING;Lo;0;L;;;;;N;;;;;
+1424;CANADIAN SYLLABICS FINAL RING;Lo;0;L;;;;;N;;;;;
+1425;CANADIAN SYLLABICS FINAL DOUBLE ACUTE;Lo;0;L;;;;;N;;;;;
+1426;CANADIAN SYLLABICS FINAL DOUBLE SHORT VERTICAL STROKES;Lo;0;L;;;;;N;;;;;
+1427;CANADIAN SYLLABICS FINAL MIDDLE DOT;Lo;0;L;;;;;N;;;;;
+1428;CANADIAN SYLLABICS FINAL SHORT HORIZONTAL STROKE;Lo;0;L;;;;;N;;;;;
+1429;CANADIAN SYLLABICS FINAL PLUS;Lo;0;L;;;;;N;;;;;
+142A;CANADIAN SYLLABICS FINAL DOWN TACK;Lo;0;L;;;;;N;;;;;
+142B;CANADIAN SYLLABICS EN;Lo;0;L;;;;;N;;;;;
+142C;CANADIAN SYLLABICS IN;Lo;0;L;;;;;N;;;;;
+142D;CANADIAN SYLLABICS ON;Lo;0;L;;;;;N;;;;;
+142E;CANADIAN SYLLABICS AN;Lo;0;L;;;;;N;;;;;
+142F;CANADIAN SYLLABICS PE;Lo;0;L;;;;;N;;;;;
+1430;CANADIAN SYLLABICS PAAI;Lo;0;L;;;;;N;;;;;
+1431;CANADIAN SYLLABICS PI;Lo;0;L;;;;;N;;;;;
+1432;CANADIAN SYLLABICS PII;Lo;0;L;;;;;N;;;;;
+1433;CANADIAN SYLLABICS PO;Lo;0;L;;;;;N;;;;;
+1434;CANADIAN SYLLABICS POO;Lo;0;L;;;;;N;;;;;
+1435;CANADIAN SYLLABICS Y-CREE POO;Lo;0;L;;;;;N;;;;;
+1436;CANADIAN SYLLABICS CARRIER HEE;Lo;0;L;;;;;N;;;;;
+1437;CANADIAN SYLLABICS CARRIER HI;Lo;0;L;;;;;N;;;;;
+1438;CANADIAN SYLLABICS PA;Lo;0;L;;;;;N;;;;;
+1439;CANADIAN SYLLABICS PAA;Lo;0;L;;;;;N;;;;;
+143A;CANADIAN SYLLABICS PWE;Lo;0;L;;;;;N;;;;;
+143B;CANADIAN SYLLABICS WEST-CREE PWE;Lo;0;L;;;;;N;;;;;
+143C;CANADIAN SYLLABICS PWI;Lo;0;L;;;;;N;;;;;
+143D;CANADIAN SYLLABICS WEST-CREE PWI;Lo;0;L;;;;;N;;;;;
+143E;CANADIAN SYLLABICS PWII;Lo;0;L;;;;;N;;;;;
+143F;CANADIAN SYLLABICS WEST-CREE PWII;Lo;0;L;;;;;N;;;;;
+1440;CANADIAN SYLLABICS PWO;Lo;0;L;;;;;N;;;;;
+1441;CANADIAN SYLLABICS WEST-CREE PWO;Lo;0;L;;;;;N;;;;;
+1442;CANADIAN SYLLABICS PWOO;Lo;0;L;;;;;N;;;;;
+1443;CANADIAN SYLLABICS WEST-CREE PWOO;Lo;0;L;;;;;N;;;;;
+1444;CANADIAN SYLLABICS PWA;Lo;0;L;;;;;N;;;;;
+1445;CANADIAN SYLLABICS WEST-CREE PWA;Lo;0;L;;;;;N;;;;;
+1446;CANADIAN SYLLABICS PWAA;Lo;0;L;;;;;N;;;;;
+1447;CANADIAN SYLLABICS WEST-CREE PWAA;Lo;0;L;;;;;N;;;;;
+1448;CANADIAN SYLLABICS Y-CREE PWAA;Lo;0;L;;;;;N;;;;;
+1449;CANADIAN SYLLABICS P;Lo;0;L;;;;;N;;;;;
+144A;CANADIAN SYLLABICS WEST-CREE P;Lo;0;L;;;;;N;;;;;
+144B;CANADIAN SYLLABICS CARRIER H;Lo;0;L;;;;;N;;;;;
+144C;CANADIAN SYLLABICS TE;Lo;0;L;;;;;N;;;;;
+144D;CANADIAN SYLLABICS TAAI;Lo;0;L;;;;;N;;;;;
+144E;CANADIAN SYLLABICS TI;Lo;0;L;;;;;N;;;;;
+144F;CANADIAN SYLLABICS TII;Lo;0;L;;;;;N;;;;;
+1450;CANADIAN SYLLABICS TO;Lo;0;L;;;;;N;;;;;
+1451;CANADIAN SYLLABICS TOO;Lo;0;L;;;;;N;;;;;
+1452;CANADIAN SYLLABICS Y-CREE TOO;Lo;0;L;;;;;N;;;;;
+1453;CANADIAN SYLLABICS CARRIER DEE;Lo;0;L;;;;;N;;;;;
+1454;CANADIAN SYLLABICS CARRIER DI;Lo;0;L;;;;;N;;;;;
+1455;CANADIAN SYLLABICS TA;Lo;0;L;;;;;N;;;;;
+1456;CANADIAN SYLLABICS TAA;Lo;0;L;;;;;N;;;;;
+1457;CANADIAN SYLLABICS TWE;Lo;0;L;;;;;N;;;;;
+1458;CANADIAN SYLLABICS WEST-CREE TWE;Lo;0;L;;;;;N;;;;;
+1459;CANADIAN SYLLABICS TWI;Lo;0;L;;;;;N;;;;;
+145A;CANADIAN SYLLABICS WEST-CREE TWI;Lo;0;L;;;;;N;;;;;
+145B;CANADIAN SYLLABICS TWII;Lo;0;L;;;;;N;;;;;
+145C;CANADIAN SYLLABICS WEST-CREE TWII;Lo;0;L;;;;;N;;;;;
+145D;CANADIAN SYLLABICS TWO;Lo;0;L;;;;;N;;;;;
+145E;CANADIAN SYLLABICS WEST-CREE TWO;Lo;0;L;;;;;N;;;;;
+145F;CANADIAN SYLLABICS TWOO;Lo;0;L;;;;;N;;;;;
+1460;CANADIAN SYLLABICS WEST-CREE TWOO;Lo;0;L;;;;;N;;;;;
+1461;CANADIAN SYLLABICS TWA;Lo;0;L;;;;;N;;;;;
+1462;CANADIAN SYLLABICS WEST-CREE TWA;Lo;0;L;;;;;N;;;;;
+1463;CANADIAN SYLLABICS TWAA;Lo;0;L;;;;;N;;;;;
+1464;CANADIAN SYLLABICS WEST-CREE TWAA;Lo;0;L;;;;;N;;;;;
+1465;CANADIAN SYLLABICS NASKAPI TWAA;Lo;0;L;;;;;N;;;;;
+1466;CANADIAN SYLLABICS T;Lo;0;L;;;;;N;;;;;
+1467;CANADIAN SYLLABICS TTE;Lo;0;L;;;;;N;;;;;
+1468;CANADIAN SYLLABICS TTI;Lo;0;L;;;;;N;;;;;
+1469;CANADIAN SYLLABICS TTO;Lo;0;L;;;;;N;;;;;
+146A;CANADIAN SYLLABICS TTA;Lo;0;L;;;;;N;;;;;
+146B;CANADIAN SYLLABICS KE;Lo;0;L;;;;;N;;;;;
+146C;CANADIAN SYLLABICS KAAI;Lo;0;L;;;;;N;;;;;
+146D;CANADIAN SYLLABICS KI;Lo;0;L;;;;;N;;;;;
+146E;CANADIAN SYLLABICS KII;Lo;0;L;;;;;N;;;;;
+146F;CANADIAN SYLLABICS KO;Lo;0;L;;;;;N;;;;;
+1470;CANADIAN SYLLABICS KOO;Lo;0;L;;;;;N;;;;;
+1471;CANADIAN SYLLABICS Y-CREE KOO;Lo;0;L;;;;;N;;;;;
+1472;CANADIAN SYLLABICS KA;Lo;0;L;;;;;N;;;;;
+1473;CANADIAN SYLLABICS KAA;Lo;0;L;;;;;N;;;;;
+1474;CANADIAN SYLLABICS KWE;Lo;0;L;;;;;N;;;;;
+1475;CANADIAN SYLLABICS WEST-CREE KWE;Lo;0;L;;;;;N;;;;;
+1476;CANADIAN SYLLABICS KWI;Lo;0;L;;;;;N;;;;;
+1477;CANADIAN SYLLABICS WEST-CREE KWI;Lo;0;L;;;;;N;;;;;
+1478;CANADIAN SYLLABICS KWII;Lo;0;L;;;;;N;;;;;
+1479;CANADIAN SYLLABICS WEST-CREE KWII;Lo;0;L;;;;;N;;;;;
+147A;CANADIAN SYLLABICS KWO;Lo;0;L;;;;;N;;;;;
+147B;CANADIAN SYLLABICS WEST-CREE KWO;Lo;0;L;;;;;N;;;;;
+147C;CANADIAN SYLLABICS KWOO;Lo;0;L;;;;;N;;;;;
+147D;CANADIAN SYLLABICS WEST-CREE KWOO;Lo;0;L;;;;;N;;;;;
+147E;CANADIAN SYLLABICS KWA;Lo;0;L;;;;;N;;;;;
+147F;CANADIAN SYLLABICS WEST-CREE KWA;Lo;0;L;;;;;N;;;;;
+1480;CANADIAN SYLLABICS KWAA;Lo;0;L;;;;;N;;;;;
+1481;CANADIAN SYLLABICS WEST-CREE KWAA;Lo;0;L;;;;;N;;;;;
+1482;CANADIAN SYLLABICS NASKAPI KWAA;Lo;0;L;;;;;N;;;;;
+1483;CANADIAN SYLLABICS K;Lo;0;L;;;;;N;;;;;
+1484;CANADIAN SYLLABICS KW;Lo;0;L;;;;;N;;;;;
+1485;CANADIAN SYLLABICS SOUTH-SLAVEY KEH;Lo;0;L;;;;;N;;;;;
+1486;CANADIAN SYLLABICS SOUTH-SLAVEY KIH;Lo;0;L;;;;;N;;;;;
+1487;CANADIAN SYLLABICS SOUTH-SLAVEY KOH;Lo;0;L;;;;;N;;;;;
+1488;CANADIAN SYLLABICS SOUTH-SLAVEY KAH;Lo;0;L;;;;;N;;;;;
+1489;CANADIAN SYLLABICS CE;Lo;0;L;;;;;N;;;;;
+148A;CANADIAN SYLLABICS CAAI;Lo;0;L;;;;;N;;;;;
+148B;CANADIAN SYLLABICS CI;Lo;0;L;;;;;N;;;;;
+148C;CANADIAN SYLLABICS CII;Lo;0;L;;;;;N;;;;;
+148D;CANADIAN SYLLABICS CO;Lo;0;L;;;;;N;;;;;
+148E;CANADIAN SYLLABICS COO;Lo;0;L;;;;;N;;;;;
+148F;CANADIAN SYLLABICS Y-CREE COO;Lo;0;L;;;;;N;;;;;
+1490;CANADIAN SYLLABICS CA;Lo;0;L;;;;;N;;;;;
+1491;CANADIAN SYLLABICS CAA;Lo;0;L;;;;;N;;;;;
+1492;CANADIAN SYLLABICS CWE;Lo;0;L;;;;;N;;;;;
+1493;CANADIAN SYLLABICS WEST-CREE CWE;Lo;0;L;;;;;N;;;;;
+1494;CANADIAN SYLLABICS CWI;Lo;0;L;;;;;N;;;;;
+1495;CANADIAN SYLLABICS WEST-CREE CWI;Lo;0;L;;;;;N;;;;;
+1496;CANADIAN SYLLABICS CWII;Lo;0;L;;;;;N;;;;;
+1497;CANADIAN SYLLABICS WEST-CREE CWII;Lo;0;L;;;;;N;;;;;
+1498;CANADIAN SYLLABICS CWO;Lo;0;L;;;;;N;;;;;
+1499;CANADIAN SYLLABICS WEST-CREE CWO;Lo;0;L;;;;;N;;;;;
+149A;CANADIAN SYLLABICS CWOO;Lo;0;L;;;;;N;;;;;
+149B;CANADIAN SYLLABICS WEST-CREE CWOO;Lo;0;L;;;;;N;;;;;
+149C;CANADIAN SYLLABICS CWA;Lo;0;L;;;;;N;;;;;
+149D;CANADIAN SYLLABICS WEST-CREE CWA;Lo;0;L;;;;;N;;;;;
+149E;CANADIAN SYLLABICS CWAA;Lo;0;L;;;;;N;;;;;
+149F;CANADIAN SYLLABICS WEST-CREE CWAA;Lo;0;L;;;;;N;;;;;
+14A0;CANADIAN SYLLABICS NASKAPI CWAA;Lo;0;L;;;;;N;;;;;
+14A1;CANADIAN SYLLABICS C;Lo;0;L;;;;;N;;;;;
+14A2;CANADIAN SYLLABICS SAYISI TH;Lo;0;L;;;;;N;;;;;
+14A3;CANADIAN SYLLABICS ME;Lo;0;L;;;;;N;;;;;
+14A4;CANADIAN SYLLABICS MAAI;Lo;0;L;;;;;N;;;;;
+14A5;CANADIAN SYLLABICS MI;Lo;0;L;;;;;N;;;;;
+14A6;CANADIAN SYLLABICS MII;Lo;0;L;;;;;N;;;;;
+14A7;CANADIAN SYLLABICS MO;Lo;0;L;;;;;N;;;;;
+14A8;CANADIAN SYLLABICS MOO;Lo;0;L;;;;;N;;;;;
+14A9;CANADIAN SYLLABICS Y-CREE MOO;Lo;0;L;;;;;N;;;;;
+14AA;CANADIAN SYLLABICS MA;Lo;0;L;;;;;N;;;;;
+14AB;CANADIAN SYLLABICS MAA;Lo;0;L;;;;;N;;;;;
+14AC;CANADIAN SYLLABICS MWE;Lo;0;L;;;;;N;;;;;
+14AD;CANADIAN SYLLABICS WEST-CREE MWE;Lo;0;L;;;;;N;;;;;
+14AE;CANADIAN SYLLABICS MWI;Lo;0;L;;;;;N;;;;;
+14AF;CANADIAN SYLLABICS WEST-CREE MWI;Lo;0;L;;;;;N;;;;;
+14B0;CANADIAN SYLLABICS MWII;Lo;0;L;;;;;N;;;;;
+14B1;CANADIAN SYLLABICS WEST-CREE MWII;Lo;0;L;;;;;N;;;;;
+14B2;CANADIAN SYLLABICS MWO;Lo;0;L;;;;;N;;;;;
+14B3;CANADIAN SYLLABICS WEST-CREE MWO;Lo;0;L;;;;;N;;;;;
+14B4;CANADIAN SYLLABICS MWOO;Lo;0;L;;;;;N;;;;;
+14B5;CANADIAN SYLLABICS WEST-CREE MWOO;Lo;0;L;;;;;N;;;;;
+14B6;CANADIAN SYLLABICS MWA;Lo;0;L;;;;;N;;;;;
+14B7;CANADIAN SYLLABICS WEST-CREE MWA;Lo;0;L;;;;;N;;;;;
+14B8;CANADIAN SYLLABICS MWAA;Lo;0;L;;;;;N;;;;;
+14B9;CANADIAN SYLLABICS WEST-CREE MWAA;Lo;0;L;;;;;N;;;;;
+14BA;CANADIAN SYLLABICS NASKAPI MWAA;Lo;0;L;;;;;N;;;;;
+14BB;CANADIAN SYLLABICS M;Lo;0;L;;;;;N;;;;;
+14BC;CANADIAN SYLLABICS WEST-CREE M;Lo;0;L;;;;;N;;;;;
+14BD;CANADIAN SYLLABICS MH;Lo;0;L;;;;;N;;;;;
+14BE;CANADIAN SYLLABICS ATHAPASCAN M;Lo;0;L;;;;;N;;;;;
+14BF;CANADIAN SYLLABICS SAYISI M;Lo;0;L;;;;;N;;;;;
+14C0;CANADIAN SYLLABICS NE;Lo;0;L;;;;;N;;;;;
+14C1;CANADIAN SYLLABICS NAAI;Lo;0;L;;;;;N;;;;;
+14C2;CANADIAN SYLLABICS NI;Lo;0;L;;;;;N;;;;;
+14C3;CANADIAN SYLLABICS NII;Lo;0;L;;;;;N;;;;;
+14C4;CANADIAN SYLLABICS NO;Lo;0;L;;;;;N;;;;;
+14C5;CANADIAN SYLLABICS NOO;Lo;0;L;;;;;N;;;;;
+14C6;CANADIAN SYLLABICS Y-CREE NOO;Lo;0;L;;;;;N;;;;;
+14C7;CANADIAN SYLLABICS NA;Lo;0;L;;;;;N;;;;;
+14C8;CANADIAN SYLLABICS NAA;Lo;0;L;;;;;N;;;;;
+14C9;CANADIAN SYLLABICS NWE;Lo;0;L;;;;;N;;;;;
+14CA;CANADIAN SYLLABICS WEST-CREE NWE;Lo;0;L;;;;;N;;;;;
+14CB;CANADIAN SYLLABICS NWA;Lo;0;L;;;;;N;;;;;
+14CC;CANADIAN SYLLABICS WEST-CREE NWA;Lo;0;L;;;;;N;;;;;
+14CD;CANADIAN SYLLABICS NWAA;Lo;0;L;;;;;N;;;;;
+14CE;CANADIAN SYLLABICS WEST-CREE NWAA;Lo;0;L;;;;;N;;;;;
+14CF;CANADIAN SYLLABICS NASKAPI NWAA;Lo;0;L;;;;;N;;;;;
+14D0;CANADIAN SYLLABICS N;Lo;0;L;;;;;N;;;;;
+14D1;CANADIAN SYLLABICS CARRIER NG;Lo;0;L;;;;;N;;;;;
+14D2;CANADIAN SYLLABICS NH;Lo;0;L;;;;;N;;;;;
+14D3;CANADIAN SYLLABICS LE;Lo;0;L;;;;;N;;;;;
+14D4;CANADIAN SYLLABICS LAAI;Lo;0;L;;;;;N;;;;;
+14D5;CANADIAN SYLLABICS LI;Lo;0;L;;;;;N;;;;;
+14D6;CANADIAN SYLLABICS LII;Lo;0;L;;;;;N;;;;;
+14D7;CANADIAN SYLLABICS LO;Lo;0;L;;;;;N;;;;;
+14D8;CANADIAN SYLLABICS LOO;Lo;0;L;;;;;N;;;;;
+14D9;CANADIAN SYLLABICS Y-CREE LOO;Lo;0;L;;;;;N;;;;;
+14DA;CANADIAN SYLLABICS LA;Lo;0;L;;;;;N;;;;;
+14DB;CANADIAN SYLLABICS LAA;Lo;0;L;;;;;N;;;;;
+14DC;CANADIAN SYLLABICS LWE;Lo;0;L;;;;;N;;;;;
+14DD;CANADIAN SYLLABICS WEST-CREE LWE;Lo;0;L;;;;;N;;;;;
+14DE;CANADIAN SYLLABICS LWI;Lo;0;L;;;;;N;;;;;
+14DF;CANADIAN SYLLABICS WEST-CREE LWI;Lo;0;L;;;;;N;;;;;
+14E0;CANADIAN SYLLABICS LWII;Lo;0;L;;;;;N;;;;;
+14E1;CANADIAN SYLLABICS WEST-CREE LWII;Lo;0;L;;;;;N;;;;;
+14E2;CANADIAN SYLLABICS LWO;Lo;0;L;;;;;N;;;;;
+14E3;CANADIAN SYLLABICS WEST-CREE LWO;Lo;0;L;;;;;N;;;;;
+14E4;CANADIAN SYLLABICS LWOO;Lo;0;L;;;;;N;;;;;
+14E5;CANADIAN SYLLABICS WEST-CREE LWOO;Lo;0;L;;;;;N;;;;;
+14E6;CANADIAN SYLLABICS LWA;Lo;0;L;;;;;N;;;;;
+14E7;CANADIAN SYLLABICS WEST-CREE LWA;Lo;0;L;;;;;N;;;;;
+14E8;CANADIAN SYLLABICS LWAA;Lo;0;L;;;;;N;;;;;
+14E9;CANADIAN SYLLABICS WEST-CREE LWAA;Lo;0;L;;;;;N;;;;;
+14EA;CANADIAN SYLLABICS L;Lo;0;L;;;;;N;;;;;
+14EB;CANADIAN SYLLABICS WEST-CREE L;Lo;0;L;;;;;N;;;;;
+14EC;CANADIAN SYLLABICS MEDIAL L;Lo;0;L;;;;;N;;;;;
+14ED;CANADIAN SYLLABICS SE;Lo;0;L;;;;;N;;;;;
+14EE;CANADIAN SYLLABICS SAAI;Lo;0;L;;;;;N;;;;;
+14EF;CANADIAN SYLLABICS SI;Lo;0;L;;;;;N;;;;;
+14F0;CANADIAN SYLLABICS SII;Lo;0;L;;;;;N;;;;;
+14F1;CANADIAN SYLLABICS SO;Lo;0;L;;;;;N;;;;;
+14F2;CANADIAN SYLLABICS SOO;Lo;0;L;;;;;N;;;;;
+14F3;CANADIAN SYLLABICS Y-CREE SOO;Lo;0;L;;;;;N;;;;;
+14F4;CANADIAN SYLLABICS SA;Lo;0;L;;;;;N;;;;;
+14F5;CANADIAN SYLLABICS SAA;Lo;0;L;;;;;N;;;;;
+14F6;CANADIAN SYLLABICS SWE;Lo;0;L;;;;;N;;;;;
+14F7;CANADIAN SYLLABICS WEST-CREE SWE;Lo;0;L;;;;;N;;;;;
+14F8;CANADIAN SYLLABICS SWI;Lo;0;L;;;;;N;;;;;
+14F9;CANADIAN SYLLABICS WEST-CREE SWI;Lo;0;L;;;;;N;;;;;
+14FA;CANADIAN SYLLABICS SWII;Lo;0;L;;;;;N;;;;;
+14FB;CANADIAN SYLLABICS WEST-CREE SWII;Lo;0;L;;;;;N;;;;;
+14FC;CANADIAN SYLLABICS SWO;Lo;0;L;;;;;N;;;;;
+14FD;CANADIAN SYLLABICS WEST-CREE SWO;Lo;0;L;;;;;N;;;;;
+14FE;CANADIAN SYLLABICS SWOO;Lo;0;L;;;;;N;;;;;
+14FF;CANADIAN SYLLABICS WEST-CREE SWOO;Lo;0;L;;;;;N;;;;;
+1500;CANADIAN SYLLABICS SWA;Lo;0;L;;;;;N;;;;;
+1501;CANADIAN SYLLABICS WEST-CREE SWA;Lo;0;L;;;;;N;;;;;
+1502;CANADIAN SYLLABICS SWAA;Lo;0;L;;;;;N;;;;;
+1503;CANADIAN SYLLABICS WEST-CREE SWAA;Lo;0;L;;;;;N;;;;;
+1504;CANADIAN SYLLABICS NASKAPI SWAA;Lo;0;L;;;;;N;;;;;
+1505;CANADIAN SYLLABICS S;Lo;0;L;;;;;N;;;;;
+1506;CANADIAN SYLLABICS ATHAPASCAN S;Lo;0;L;;;;;N;;;;;
+1507;CANADIAN SYLLABICS SW;Lo;0;L;;;;;N;;;;;
+1508;CANADIAN SYLLABICS BLACKFOOT S;Lo;0;L;;;;;N;;;;;
+1509;CANADIAN SYLLABICS MOOSE-CREE SK;Lo;0;L;;;;;N;;;;;
+150A;CANADIAN SYLLABICS NASKAPI SKW;Lo;0;L;;;;;N;;;;;
+150B;CANADIAN SYLLABICS NASKAPI S-W;Lo;0;L;;;;;N;;;;;
+150C;CANADIAN SYLLABICS NASKAPI SPWA;Lo;0;L;;;;;N;;;;;
+150D;CANADIAN SYLLABICS NASKAPI STWA;Lo;0;L;;;;;N;;;;;
+150E;CANADIAN SYLLABICS NASKAPI SKWA;Lo;0;L;;;;;N;;;;;
+150F;CANADIAN SYLLABICS NASKAPI SCWA;Lo;0;L;;;;;N;;;;;
+1510;CANADIAN SYLLABICS SHE;Lo;0;L;;;;;N;;;;;
+1511;CANADIAN SYLLABICS SHI;Lo;0;L;;;;;N;;;;;
+1512;CANADIAN SYLLABICS SHII;Lo;0;L;;;;;N;;;;;
+1513;CANADIAN SYLLABICS SHO;Lo;0;L;;;;;N;;;;;
+1514;CANADIAN SYLLABICS SHOO;Lo;0;L;;;;;N;;;;;
+1515;CANADIAN SYLLABICS SHA;Lo;0;L;;;;;N;;;;;
+1516;CANADIAN SYLLABICS SHAA;Lo;0;L;;;;;N;;;;;
+1517;CANADIAN SYLLABICS SHWE;Lo;0;L;;;;;N;;;;;
+1518;CANADIAN SYLLABICS WEST-CREE SHWE;Lo;0;L;;;;;N;;;;;
+1519;CANADIAN SYLLABICS SHWI;Lo;0;L;;;;;N;;;;;
+151A;CANADIAN SYLLABICS WEST-CREE SHWI;Lo;0;L;;;;;N;;;;;
+151B;CANADIAN SYLLABICS SHWII;Lo;0;L;;;;;N;;;;;
+151C;CANADIAN SYLLABICS WEST-CREE SHWII;Lo;0;L;;;;;N;;;;;
+151D;CANADIAN SYLLABICS SHWO;Lo;0;L;;;;;N;;;;;
+151E;CANADIAN SYLLABICS WEST-CREE SHWO;Lo;0;L;;;;;N;;;;;
+151F;CANADIAN SYLLABICS SHWOO;Lo;0;L;;;;;N;;;;;
+1520;CANADIAN SYLLABICS WEST-CREE SHWOO;Lo;0;L;;;;;N;;;;;
+1521;CANADIAN SYLLABICS SHWA;Lo;0;L;;;;;N;;;;;
+1522;CANADIAN SYLLABICS WEST-CREE SHWA;Lo;0;L;;;;;N;;;;;
+1523;CANADIAN SYLLABICS SHWAA;Lo;0;L;;;;;N;;;;;
+1524;CANADIAN SYLLABICS WEST-CREE SHWAA;Lo;0;L;;;;;N;;;;;
+1525;CANADIAN SYLLABICS SH;Lo;0;L;;;;;N;;;;;
+1526;CANADIAN SYLLABICS YE;Lo;0;L;;;;;N;;;;;
+1527;CANADIAN SYLLABICS YAAI;Lo;0;L;;;;;N;;;;;
+1528;CANADIAN SYLLABICS YI;Lo;0;L;;;;;N;;;;;
+1529;CANADIAN SYLLABICS YII;Lo;0;L;;;;;N;;;;;
+152A;CANADIAN SYLLABICS YO;Lo;0;L;;;;;N;;;;;
+152B;CANADIAN SYLLABICS YOO;Lo;0;L;;;;;N;;;;;
+152C;CANADIAN SYLLABICS Y-CREE YOO;Lo;0;L;;;;;N;;;;;
+152D;CANADIAN SYLLABICS YA;Lo;0;L;;;;;N;;;;;
+152E;CANADIAN SYLLABICS YAA;Lo;0;L;;;;;N;;;;;
+152F;CANADIAN SYLLABICS YWE;Lo;0;L;;;;;N;;;;;
+1530;CANADIAN SYLLABICS WEST-CREE YWE;Lo;0;L;;;;;N;;;;;
+1531;CANADIAN SYLLABICS YWI;Lo;0;L;;;;;N;;;;;
+1532;CANADIAN SYLLABICS WEST-CREE YWI;Lo;0;L;;;;;N;;;;;
+1533;CANADIAN SYLLABICS YWII;Lo;0;L;;;;;N;;;;;
+1534;CANADIAN SYLLABICS WEST-CREE YWII;Lo;0;L;;;;;N;;;;;
+1535;CANADIAN SYLLABICS YWO;Lo;0;L;;;;;N;;;;;
+1536;CANADIAN SYLLABICS WEST-CREE YWO;Lo;0;L;;;;;N;;;;;
+1537;CANADIAN SYLLABICS YWOO;Lo;0;L;;;;;N;;;;;
+1538;CANADIAN SYLLABICS WEST-CREE YWOO;Lo;0;L;;;;;N;;;;;
+1539;CANADIAN SYLLABICS YWA;Lo;0;L;;;;;N;;;;;
+153A;CANADIAN SYLLABICS WEST-CREE YWA;Lo;0;L;;;;;N;;;;;
+153B;CANADIAN SYLLABICS YWAA;Lo;0;L;;;;;N;;;;;
+153C;CANADIAN SYLLABICS WEST-CREE YWAA;Lo;0;L;;;;;N;;;;;
+153D;CANADIAN SYLLABICS NASKAPI YWAA;Lo;0;L;;;;;N;;;;;
+153E;CANADIAN SYLLABICS Y;Lo;0;L;;;;;N;;;;;
+153F;CANADIAN SYLLABICS BIBLE-CREE Y;Lo;0;L;;;;;N;;;;;
+1540;CANADIAN SYLLABICS WEST-CREE Y;Lo;0;L;;;;;N;;;;;
+1541;CANADIAN SYLLABICS SAYISI YI;Lo;0;L;;;;;N;;;;;
+1542;CANADIAN SYLLABICS RE;Lo;0;L;;;;;N;;;;;
+1543;CANADIAN SYLLABICS R-CREE RE;Lo;0;L;;;;;N;;;;;
+1544;CANADIAN SYLLABICS WEST-CREE LE;Lo;0;L;;;;;N;;;;;
+1545;CANADIAN SYLLABICS RAAI;Lo;0;L;;;;;N;;;;;
+1546;CANADIAN SYLLABICS RI;Lo;0;L;;;;;N;;;;;
+1547;CANADIAN SYLLABICS RII;Lo;0;L;;;;;N;;;;;
+1548;CANADIAN SYLLABICS RO;Lo;0;L;;;;;N;;;;;
+1549;CANADIAN SYLLABICS ROO;Lo;0;L;;;;;N;;;;;
+154A;CANADIAN SYLLABICS WEST-CREE LO;Lo;0;L;;;;;N;;;;;
+154B;CANADIAN SYLLABICS RA;Lo;0;L;;;;;N;;;;;
+154C;CANADIAN SYLLABICS RAA;Lo;0;L;;;;;N;;;;;
+154D;CANADIAN SYLLABICS WEST-CREE LA;Lo;0;L;;;;;N;;;;;
+154E;CANADIAN SYLLABICS RWAA;Lo;0;L;;;;;N;;;;;
+154F;CANADIAN SYLLABICS WEST-CREE RWAA;Lo;0;L;;;;;N;;;;;
+1550;CANADIAN SYLLABICS R;Lo;0;L;;;;;N;;;;;
+1551;CANADIAN SYLLABICS WEST-CREE R;Lo;0;L;;;;;N;;;;;
+1552;CANADIAN SYLLABICS MEDIAL R;Lo;0;L;;;;;N;;;;;
+1553;CANADIAN SYLLABICS FE;Lo;0;L;;;;;N;;;;;
+1554;CANADIAN SYLLABICS FAAI;Lo;0;L;;;;;N;;;;;
+1555;CANADIAN SYLLABICS FI;Lo;0;L;;;;;N;;;;;
+1556;CANADIAN SYLLABICS FII;Lo;0;L;;;;;N;;;;;
+1557;CANADIAN SYLLABICS FO;Lo;0;L;;;;;N;;;;;
+1558;CANADIAN SYLLABICS FOO;Lo;0;L;;;;;N;;;;;
+1559;CANADIAN SYLLABICS FA;Lo;0;L;;;;;N;;;;;
+155A;CANADIAN SYLLABICS FAA;Lo;0;L;;;;;N;;;;;
+155B;CANADIAN SYLLABICS FWAA;Lo;0;L;;;;;N;;;;;
+155C;CANADIAN SYLLABICS WEST-CREE FWAA;Lo;0;L;;;;;N;;;;;
+155D;CANADIAN SYLLABICS F;Lo;0;L;;;;;N;;;;;
+155E;CANADIAN SYLLABICS THE;Lo;0;L;;;;;N;;;;;
+155F;CANADIAN SYLLABICS N-CREE THE;Lo;0;L;;;;;N;;;;;
+1560;CANADIAN SYLLABICS THI;Lo;0;L;;;;;N;;;;;
+1561;CANADIAN SYLLABICS N-CREE THI;Lo;0;L;;;;;N;;;;;
+1562;CANADIAN SYLLABICS THII;Lo;0;L;;;;;N;;;;;
+1563;CANADIAN SYLLABICS N-CREE THII;Lo;0;L;;;;;N;;;;;
+1564;CANADIAN SYLLABICS THO;Lo;0;L;;;;;N;;;;;
+1565;CANADIAN SYLLABICS THOO;Lo;0;L;;;;;N;;;;;
+1566;CANADIAN SYLLABICS THA;Lo;0;L;;;;;N;;;;;
+1567;CANADIAN SYLLABICS THAA;Lo;0;L;;;;;N;;;;;
+1568;CANADIAN SYLLABICS THWAA;Lo;0;L;;;;;N;;;;;
+1569;CANADIAN SYLLABICS WEST-CREE THWAA;Lo;0;L;;;;;N;;;;;
+156A;CANADIAN SYLLABICS TH;Lo;0;L;;;;;N;;;;;
+156B;CANADIAN SYLLABICS TTHE;Lo;0;L;;;;;N;;;;;
+156C;CANADIAN SYLLABICS TTHI;Lo;0;L;;;;;N;;;;;
+156D;CANADIAN SYLLABICS TTHO;Lo;0;L;;;;;N;;;;;
+156E;CANADIAN SYLLABICS TTHA;Lo;0;L;;;;;N;;;;;
+156F;CANADIAN SYLLABICS TTH;Lo;0;L;;;;;N;;;;;
+1570;CANADIAN SYLLABICS TYE;Lo;0;L;;;;;N;;;;;
+1571;CANADIAN SYLLABICS TYI;Lo;0;L;;;;;N;;;;;
+1572;CANADIAN SYLLABICS TYO;Lo;0;L;;;;;N;;;;;
+1573;CANADIAN SYLLABICS TYA;Lo;0;L;;;;;N;;;;;
+1574;CANADIAN SYLLABICS NUNAVIK HE;Lo;0;L;;;;;N;;;;;
+1575;CANADIAN SYLLABICS NUNAVIK HI;Lo;0;L;;;;;N;;;;;
+1576;CANADIAN SYLLABICS NUNAVIK HII;Lo;0;L;;;;;N;;;;;
+1577;CANADIAN SYLLABICS NUNAVIK HO;Lo;0;L;;;;;N;;;;;
+1578;CANADIAN SYLLABICS NUNAVIK HOO;Lo;0;L;;;;;N;;;;;
+1579;CANADIAN SYLLABICS NUNAVIK HA;Lo;0;L;;;;;N;;;;;
+157A;CANADIAN SYLLABICS NUNAVIK HAA;Lo;0;L;;;;;N;;;;;
+157B;CANADIAN SYLLABICS NUNAVIK H;Lo;0;L;;;;;N;;;;;
+157C;CANADIAN SYLLABICS NUNAVUT H;Lo;0;L;;;;;N;;;;;
+157D;CANADIAN SYLLABICS HK;Lo;0;L;;;;;N;;;;;
+157E;CANADIAN SYLLABICS QAAI;Lo;0;L;;;;;N;;;;;
+157F;CANADIAN SYLLABICS QI;Lo;0;L;;;;;N;;;;;
+1580;CANADIAN SYLLABICS QII;Lo;0;L;;;;;N;;;;;
+1581;CANADIAN SYLLABICS QO;Lo;0;L;;;;;N;;;;;
+1582;CANADIAN SYLLABICS QOO;Lo;0;L;;;;;N;;;;;
+1583;CANADIAN SYLLABICS QA;Lo;0;L;;;;;N;;;;;
+1584;CANADIAN SYLLABICS QAA;Lo;0;L;;;;;N;;;;;
+1585;CANADIAN SYLLABICS Q;Lo;0;L;;;;;N;;;;;
+1586;CANADIAN SYLLABICS TLHE;Lo;0;L;;;;;N;;;;;
+1587;CANADIAN SYLLABICS TLHI;Lo;0;L;;;;;N;;;;;
+1588;CANADIAN SYLLABICS TLHO;Lo;0;L;;;;;N;;;;;
+1589;CANADIAN SYLLABICS TLHA;Lo;0;L;;;;;N;;;;;
+158A;CANADIAN SYLLABICS WEST-CREE RE;Lo;0;L;;;;;N;;;;;
+158B;CANADIAN SYLLABICS WEST-CREE RI;Lo;0;L;;;;;N;;;;;
+158C;CANADIAN SYLLABICS WEST-CREE RO;Lo;0;L;;;;;N;;;;;
+158D;CANADIAN SYLLABICS WEST-CREE RA;Lo;0;L;;;;;N;;;;;
+158E;CANADIAN SYLLABICS NGAAI;Lo;0;L;;;;;N;;;;;
+158F;CANADIAN SYLLABICS NGI;Lo;0;L;;;;;N;;;;;
+1590;CANADIAN SYLLABICS NGII;Lo;0;L;;;;;N;;;;;
+1591;CANADIAN SYLLABICS NGO;Lo;0;L;;;;;N;;;;;
+1592;CANADIAN SYLLABICS NGOO;Lo;0;L;;;;;N;;;;;
+1593;CANADIAN SYLLABICS NGA;Lo;0;L;;;;;N;;;;;
+1594;CANADIAN SYLLABICS NGAA;Lo;0;L;;;;;N;;;;;
+1595;CANADIAN SYLLABICS NG;Lo;0;L;;;;;N;;;;;
+1596;CANADIAN SYLLABICS NNG;Lo;0;L;;;;;N;;;;;
+1597;CANADIAN SYLLABICS SAYISI SHE;Lo;0;L;;;;;N;;;;;
+1598;CANADIAN SYLLABICS SAYISI SHI;Lo;0;L;;;;;N;;;;;
+1599;CANADIAN SYLLABICS SAYISI SHO;Lo;0;L;;;;;N;;;;;
+159A;CANADIAN SYLLABICS SAYISI SHA;Lo;0;L;;;;;N;;;;;
+159B;CANADIAN SYLLABICS WOODS-CREE THE;Lo;0;L;;;;;N;;;;;
+159C;CANADIAN SYLLABICS WOODS-CREE THI;Lo;0;L;;;;;N;;;;;
+159D;CANADIAN SYLLABICS WOODS-CREE THO;Lo;0;L;;;;;N;;;;;
+159E;CANADIAN SYLLABICS WOODS-CREE THA;Lo;0;L;;;;;N;;;;;
+159F;CANADIAN SYLLABICS WOODS-CREE TH;Lo;0;L;;;;;N;;;;;
+15A0;CANADIAN SYLLABICS LHI;Lo;0;L;;;;;N;;;;;
+15A1;CANADIAN SYLLABICS LHII;Lo;0;L;;;;;N;;;;;
+15A2;CANADIAN SYLLABICS LHO;Lo;0;L;;;;;N;;;;;
+15A3;CANADIAN SYLLABICS LHOO;Lo;0;L;;;;;N;;;;;
+15A4;CANADIAN SYLLABICS LHA;Lo;0;L;;;;;N;;;;;
+15A5;CANADIAN SYLLABICS LHAA;Lo;0;L;;;;;N;;;;;
+15A6;CANADIAN SYLLABICS LH;Lo;0;L;;;;;N;;;;;
+15A7;CANADIAN SYLLABICS TH-CREE THE;Lo;0;L;;;;;N;;;;;
+15A8;CANADIAN SYLLABICS TH-CREE THI;Lo;0;L;;;;;N;;;;;
+15A9;CANADIAN SYLLABICS TH-CREE THII;Lo;0;L;;;;;N;;;;;
+15AA;CANADIAN SYLLABICS TH-CREE THO;Lo;0;L;;;;;N;;;;;
+15AB;CANADIAN SYLLABICS TH-CREE THOO;Lo;0;L;;;;;N;;;;;
+15AC;CANADIAN SYLLABICS TH-CREE THA;Lo;0;L;;;;;N;;;;;
+15AD;CANADIAN SYLLABICS TH-CREE THAA;Lo;0;L;;;;;N;;;;;
+15AE;CANADIAN SYLLABICS TH-CREE TH;Lo;0;L;;;;;N;;;;;
+15AF;CANADIAN SYLLABICS AIVILIK B;Lo;0;L;;;;;N;;;;;
+15B0;CANADIAN SYLLABICS BLACKFOOT E;Lo;0;L;;;;;N;;;;;
+15B1;CANADIAN SYLLABICS BLACKFOOT I;Lo;0;L;;;;;N;;;;;
+15B2;CANADIAN SYLLABICS BLACKFOOT O;Lo;0;L;;;;;N;;;;;
+15B3;CANADIAN SYLLABICS BLACKFOOT A;Lo;0;L;;;;;N;;;;;
+15B4;CANADIAN SYLLABICS BLACKFOOT WE;Lo;0;L;;;;;N;;;;;
+15B5;CANADIAN SYLLABICS BLACKFOOT WI;Lo;0;L;;;;;N;;;;;
+15B6;CANADIAN SYLLABICS BLACKFOOT WO;Lo;0;L;;;;;N;;;;;
+15B7;CANADIAN SYLLABICS BLACKFOOT WA;Lo;0;L;;;;;N;;;;;
+15B8;CANADIAN SYLLABICS BLACKFOOT NE;Lo;0;L;;;;;N;;;;;
+15B9;CANADIAN SYLLABICS BLACKFOOT NI;Lo;0;L;;;;;N;;;;;
+15BA;CANADIAN SYLLABICS BLACKFOOT NO;Lo;0;L;;;;;N;;;;;
+15BB;CANADIAN SYLLABICS BLACKFOOT NA;Lo;0;L;;;;;N;;;;;
+15BC;CANADIAN SYLLABICS BLACKFOOT KE;Lo;0;L;;;;;N;;;;;
+15BD;CANADIAN SYLLABICS BLACKFOOT KI;Lo;0;L;;;;;N;;;;;
+15BE;CANADIAN SYLLABICS BLACKFOOT KO;Lo;0;L;;;;;N;;;;;
+15BF;CANADIAN SYLLABICS BLACKFOOT KA;Lo;0;L;;;;;N;;;;;
+15C0;CANADIAN SYLLABICS SAYISI HE;Lo;0;L;;;;;N;;;;;
+15C1;CANADIAN SYLLABICS SAYISI HI;Lo;0;L;;;;;N;;;;;
+15C2;CANADIAN SYLLABICS SAYISI HO;Lo;0;L;;;;;N;;;;;
+15C3;CANADIAN SYLLABICS SAYISI HA;Lo;0;L;;;;;N;;;;;
+15C4;CANADIAN SYLLABICS CARRIER GHU;Lo;0;L;;;;;N;;;;;
+15C5;CANADIAN SYLLABICS CARRIER GHO;Lo;0;L;;;;;N;;;;;
+15C6;CANADIAN SYLLABICS CARRIER GHE;Lo;0;L;;;;;N;;;;;
+15C7;CANADIAN SYLLABICS CARRIER GHEE;Lo;0;L;;;;;N;;;;;
+15C8;CANADIAN SYLLABICS CARRIER GHI;Lo;0;L;;;;;N;;;;;
+15C9;CANADIAN SYLLABICS CARRIER GHA;Lo;0;L;;;;;N;;;;;
+15CA;CANADIAN SYLLABICS CARRIER RU;Lo;0;L;;;;;N;;;;;
+15CB;CANADIAN SYLLABICS CARRIER RO;Lo;0;L;;;;;N;;;;;
+15CC;CANADIAN SYLLABICS CARRIER RE;Lo;0;L;;;;;N;;;;;
+15CD;CANADIAN SYLLABICS CARRIER REE;Lo;0;L;;;;;N;;;;;
+15CE;CANADIAN SYLLABICS CARRIER RI;Lo;0;L;;;;;N;;;;;
+15CF;CANADIAN SYLLABICS CARRIER RA;Lo;0;L;;;;;N;;;;;
+15D0;CANADIAN SYLLABICS CARRIER WU;Lo;0;L;;;;;N;;;;;
+15D1;CANADIAN SYLLABICS CARRIER WO;Lo;0;L;;;;;N;;;;;
+15D2;CANADIAN SYLLABICS CARRIER WE;Lo;0;L;;;;;N;;;;;
+15D3;CANADIAN SYLLABICS CARRIER WEE;Lo;0;L;;;;;N;;;;;
+15D4;CANADIAN SYLLABICS CARRIER WI;Lo;0;L;;;;;N;;;;;
+15D5;CANADIAN SYLLABICS CARRIER WA;Lo;0;L;;;;;N;;;;;
+15D6;CANADIAN SYLLABICS CARRIER HWU;Lo;0;L;;;;;N;;;;;
+15D7;CANADIAN SYLLABICS CARRIER HWO;Lo;0;L;;;;;N;;;;;
+15D8;CANADIAN SYLLABICS CARRIER HWE;Lo;0;L;;;;;N;;;;;
+15D9;CANADIAN SYLLABICS CARRIER HWEE;Lo;0;L;;;;;N;;;;;
+15DA;CANADIAN SYLLABICS CARRIER HWI;Lo;0;L;;;;;N;;;;;
+15DB;CANADIAN SYLLABICS CARRIER HWA;Lo;0;L;;;;;N;;;;;
+15DC;CANADIAN SYLLABICS CARRIER THU;Lo;0;L;;;;;N;;;;;
+15DD;CANADIAN SYLLABICS CARRIER THO;Lo;0;L;;;;;N;;;;;
+15DE;CANADIAN SYLLABICS CARRIER THE;Lo;0;L;;;;;N;;;;;
+15DF;CANADIAN SYLLABICS CARRIER THEE;Lo;0;L;;;;;N;;;;;
+15E0;CANADIAN SYLLABICS CARRIER THI;Lo;0;L;;;;;N;;;;;
+15E1;CANADIAN SYLLABICS CARRIER THA;Lo;0;L;;;;;N;;;;;
+15E2;CANADIAN SYLLABICS CARRIER TTU;Lo;0;L;;;;;N;;;;;
+15E3;CANADIAN SYLLABICS CARRIER TTO;Lo;0;L;;;;;N;;;;;
+15E4;CANADIAN SYLLABICS CARRIER TTE;Lo;0;L;;;;;N;;;;;
+15E5;CANADIAN SYLLABICS CARRIER TTEE;Lo;0;L;;;;;N;;;;;
+15E6;CANADIAN SYLLABICS CARRIER TTI;Lo;0;L;;;;;N;;;;;
+15E7;CANADIAN SYLLABICS CARRIER TTA;Lo;0;L;;;;;N;;;;;
+15E8;CANADIAN SYLLABICS CARRIER PU;Lo;0;L;;;;;N;;;;;
+15E9;CANADIAN SYLLABICS CARRIER PO;Lo;0;L;;;;;N;;;;;
+15EA;CANADIAN SYLLABICS CARRIER PE;Lo;0;L;;;;;N;;;;;
+15EB;CANADIAN SYLLABICS CARRIER PEE;Lo;0;L;;;;;N;;;;;
+15EC;CANADIAN SYLLABICS CARRIER PI;Lo;0;L;;;;;N;;;;;
+15ED;CANADIAN SYLLABICS CARRIER PA;Lo;0;L;;;;;N;;;;;
+15EE;CANADIAN SYLLABICS CARRIER P;Lo;0;L;;;;;N;;;;;
+15EF;CANADIAN SYLLABICS CARRIER GU;Lo;0;L;;;;;N;;;;;
+15F0;CANADIAN SYLLABICS CARRIER GO;Lo;0;L;;;;;N;;;;;
+15F1;CANADIAN SYLLABICS CARRIER GE;Lo;0;L;;;;;N;;;;;
+15F2;CANADIAN SYLLABICS CARRIER GEE;Lo;0;L;;;;;N;;;;;
+15F3;CANADIAN SYLLABICS CARRIER GI;Lo;0;L;;;;;N;;;;;
+15F4;CANADIAN SYLLABICS CARRIER GA;Lo;0;L;;;;;N;;;;;
+15F5;CANADIAN SYLLABICS CARRIER KHU;Lo;0;L;;;;;N;;;;;
+15F6;CANADIAN SYLLABICS CARRIER KHO;Lo;0;L;;;;;N;;;;;
+15F7;CANADIAN SYLLABICS CARRIER KHE;Lo;0;L;;;;;N;;;;;
+15F8;CANADIAN SYLLABICS CARRIER KHEE;Lo;0;L;;;;;N;;;;;
+15F9;CANADIAN SYLLABICS CARRIER KHI;Lo;0;L;;;;;N;;;;;
+15FA;CANADIAN SYLLABICS CARRIER KHA;Lo;0;L;;;;;N;;;;;
+15FB;CANADIAN SYLLABICS CARRIER KKU;Lo;0;L;;;;;N;;;;;
+15FC;CANADIAN SYLLABICS CARRIER KKO;Lo;0;L;;;;;N;;;;;
+15FD;CANADIAN SYLLABICS CARRIER KKE;Lo;0;L;;;;;N;;;;;
+15FE;CANADIAN SYLLABICS CARRIER KKEE;Lo;0;L;;;;;N;;;;;
+15FF;CANADIAN SYLLABICS CARRIER KKI;Lo;0;L;;;;;N;;;;;
+1600;CANADIAN SYLLABICS CARRIER KKA;Lo;0;L;;;;;N;;;;;
+1601;CANADIAN SYLLABICS CARRIER KK;Lo;0;L;;;;;N;;;;;
+1602;CANADIAN SYLLABICS CARRIER NU;Lo;0;L;;;;;N;;;;;
+1603;CANADIAN SYLLABICS CARRIER NO;Lo;0;L;;;;;N;;;;;
+1604;CANADIAN SYLLABICS CARRIER NE;Lo;0;L;;;;;N;;;;;
+1605;CANADIAN SYLLABICS CARRIER NEE;Lo;0;L;;;;;N;;;;;
+1606;CANADIAN SYLLABICS CARRIER NI;Lo;0;L;;;;;N;;;;;
+1607;CANADIAN SYLLABICS CARRIER NA;Lo;0;L;;;;;N;;;;;
+1608;CANADIAN SYLLABICS CARRIER MU;Lo;0;L;;;;;N;;;;;
+1609;CANADIAN SYLLABICS CARRIER MO;Lo;0;L;;;;;N;;;;;
+160A;CANADIAN SYLLABICS CARRIER ME;Lo;0;L;;;;;N;;;;;
+160B;CANADIAN SYLLABICS CARRIER MEE;Lo;0;L;;;;;N;;;;;
+160C;CANADIAN SYLLABICS CARRIER MI;Lo;0;L;;;;;N;;;;;
+160D;CANADIAN SYLLABICS CARRIER MA;Lo;0;L;;;;;N;;;;;
+160E;CANADIAN SYLLABICS CARRIER YU;Lo;0;L;;;;;N;;;;;
+160F;CANADIAN SYLLABICS CARRIER YO;Lo;0;L;;;;;N;;;;;
+1610;CANADIAN SYLLABICS CARRIER YE;Lo;0;L;;;;;N;;;;;
+1611;CANADIAN SYLLABICS CARRIER YEE;Lo;0;L;;;;;N;;;;;
+1612;CANADIAN SYLLABICS CARRIER YI;Lo;0;L;;;;;N;;;;;
+1613;CANADIAN SYLLABICS CARRIER YA;Lo;0;L;;;;;N;;;;;
+1614;CANADIAN SYLLABICS CARRIER JU;Lo;0;L;;;;;N;;;;;
+1615;CANADIAN SYLLABICS SAYISI JU;Lo;0;L;;;;;N;;;;;
+1616;CANADIAN SYLLABICS CARRIER JO;Lo;0;L;;;;;N;;;;;
+1617;CANADIAN SYLLABICS CARRIER JE;Lo;0;L;;;;;N;;;;;
+1618;CANADIAN SYLLABICS CARRIER JEE;Lo;0;L;;;;;N;;;;;
+1619;CANADIAN SYLLABICS CARRIER JI;Lo;0;L;;;;;N;;;;;
+161A;CANADIAN SYLLABICS SAYISI JI;Lo;0;L;;;;;N;;;;;
+161B;CANADIAN SYLLABICS CARRIER JA;Lo;0;L;;;;;N;;;;;
+161C;CANADIAN SYLLABICS CARRIER JJU;Lo;0;L;;;;;N;;;;;
+161D;CANADIAN SYLLABICS CARRIER JJO;Lo;0;L;;;;;N;;;;;
+161E;CANADIAN SYLLABICS CARRIER JJE;Lo;0;L;;;;;N;;;;;
+161F;CANADIAN SYLLABICS CARRIER JJEE;Lo;0;L;;;;;N;;;;;
+1620;CANADIAN SYLLABICS CARRIER JJI;Lo;0;L;;;;;N;;;;;
+1621;CANADIAN SYLLABICS CARRIER JJA;Lo;0;L;;;;;N;;;;;
+1622;CANADIAN SYLLABICS CARRIER LU;Lo;0;L;;;;;N;;;;;
+1623;CANADIAN SYLLABICS CARRIER LO;Lo;0;L;;;;;N;;;;;
+1624;CANADIAN SYLLABICS CARRIER LE;Lo;0;L;;;;;N;;;;;
+1625;CANADIAN SYLLABICS CARRIER LEE;Lo;0;L;;;;;N;;;;;
+1626;CANADIAN SYLLABICS CARRIER LI;Lo;0;L;;;;;N;;;;;
+1627;CANADIAN SYLLABICS CARRIER LA;Lo;0;L;;;;;N;;;;;
+1628;CANADIAN SYLLABICS CARRIER DLU;Lo;0;L;;;;;N;;;;;
+1629;CANADIAN SYLLABICS CARRIER DLO;Lo;0;L;;;;;N;;;;;
+162A;CANADIAN SYLLABICS CARRIER DLE;Lo;0;L;;;;;N;;;;;
+162B;CANADIAN SYLLABICS CARRIER DLEE;Lo;0;L;;;;;N;;;;;
+162C;CANADIAN SYLLABICS CARRIER DLI;Lo;0;L;;;;;N;;;;;
+162D;CANADIAN SYLLABICS CARRIER DLA;Lo;0;L;;;;;N;;;;;
+162E;CANADIAN SYLLABICS CARRIER LHU;Lo;0;L;;;;;N;;;;;
+162F;CANADIAN SYLLABICS CARRIER LHO;Lo;0;L;;;;;N;;;;;
+1630;CANADIAN SYLLABICS CARRIER LHE;Lo;0;L;;;;;N;;;;;
+1631;CANADIAN SYLLABICS CARRIER LHEE;Lo;0;L;;;;;N;;;;;
+1632;CANADIAN SYLLABICS CARRIER LHI;Lo;0;L;;;;;N;;;;;
+1633;CANADIAN SYLLABICS CARRIER LHA;Lo;0;L;;;;;N;;;;;
+1634;CANADIAN SYLLABICS CARRIER TLHU;Lo;0;L;;;;;N;;;;;
+1635;CANADIAN SYLLABICS CARRIER TLHO;Lo;0;L;;;;;N;;;;;
+1636;CANADIAN SYLLABICS CARRIER TLHE;Lo;0;L;;;;;N;;;;;
+1637;CANADIAN SYLLABICS CARRIER TLHEE;Lo;0;L;;;;;N;;;;;
+1638;CANADIAN SYLLABICS CARRIER TLHI;Lo;0;L;;;;;N;;;;;
+1639;CANADIAN SYLLABICS CARRIER TLHA;Lo;0;L;;;;;N;;;;;
+163A;CANADIAN SYLLABICS CARRIER TLU;Lo;0;L;;;;;N;;;;;
+163B;CANADIAN SYLLABICS CARRIER TLO;Lo;0;L;;;;;N;;;;;
+163C;CANADIAN SYLLABICS CARRIER TLE;Lo;0;L;;;;;N;;;;;
+163D;CANADIAN SYLLABICS CARRIER TLEE;Lo;0;L;;;;;N;;;;;
+163E;CANADIAN SYLLABICS CARRIER TLI;Lo;0;L;;;;;N;;;;;
+163F;CANADIAN SYLLABICS CARRIER TLA;Lo;0;L;;;;;N;;;;;
+1640;CANADIAN SYLLABICS CARRIER ZU;Lo;0;L;;;;;N;;;;;
+1641;CANADIAN SYLLABICS CARRIER ZO;Lo;0;L;;;;;N;;;;;
+1642;CANADIAN SYLLABICS CARRIER ZE;Lo;0;L;;;;;N;;;;;
+1643;CANADIAN SYLLABICS CARRIER ZEE;Lo;0;L;;;;;N;;;;;
+1644;CANADIAN SYLLABICS CARRIER ZI;Lo;0;L;;;;;N;;;;;
+1645;CANADIAN SYLLABICS CARRIER ZA;Lo;0;L;;;;;N;;;;;
+1646;CANADIAN SYLLABICS CARRIER Z;Lo;0;L;;;;;N;;;;;
+1647;CANADIAN SYLLABICS CARRIER INITIAL Z;Lo;0;L;;;;;N;;;;;
+1648;CANADIAN SYLLABICS CARRIER DZU;Lo;0;L;;;;;N;;;;;
+1649;CANADIAN SYLLABICS CARRIER DZO;Lo;0;L;;;;;N;;;;;
+164A;CANADIAN SYLLABICS CARRIER DZE;Lo;0;L;;;;;N;;;;;
+164B;CANADIAN SYLLABICS CARRIER DZEE;Lo;0;L;;;;;N;;;;;
+164C;CANADIAN SYLLABICS CARRIER DZI;Lo;0;L;;;;;N;;;;;
+164D;CANADIAN SYLLABICS CARRIER DZA;Lo;0;L;;;;;N;;;;;
+164E;CANADIAN SYLLABICS CARRIER SU;Lo;0;L;;;;;N;;;;;
+164F;CANADIAN SYLLABICS CARRIER SO;Lo;0;L;;;;;N;;;;;
+1650;CANADIAN SYLLABICS CARRIER SE;Lo;0;L;;;;;N;;;;;
+1651;CANADIAN SYLLABICS CARRIER SEE;Lo;0;L;;;;;N;;;;;
+1652;CANADIAN SYLLABICS CARRIER SI;Lo;0;L;;;;;N;;;;;
+1653;CANADIAN SYLLABICS CARRIER SA;Lo;0;L;;;;;N;;;;;
+1654;CANADIAN SYLLABICS CARRIER SHU;Lo;0;L;;;;;N;;;;;
+1655;CANADIAN SYLLABICS CARRIER SHO;Lo;0;L;;;;;N;;;;;
+1656;CANADIAN SYLLABICS CARRIER SHE;Lo;0;L;;;;;N;;;;;
+1657;CANADIAN SYLLABICS CARRIER SHEE;Lo;0;L;;;;;N;;;;;
+1658;CANADIAN SYLLABICS CARRIER SHI;Lo;0;L;;;;;N;;;;;
+1659;CANADIAN SYLLABICS CARRIER SHA;Lo;0;L;;;;;N;;;;;
+165A;CANADIAN SYLLABICS CARRIER SH;Lo;0;L;;;;;N;;;;;
+165B;CANADIAN SYLLABICS CARRIER TSU;Lo;0;L;;;;;N;;;;;
+165C;CANADIAN SYLLABICS CARRIER TSO;Lo;0;L;;;;;N;;;;;
+165D;CANADIAN SYLLABICS CARRIER TSE;Lo;0;L;;;;;N;;;;;
+165E;CANADIAN SYLLABICS CARRIER TSEE;Lo;0;L;;;;;N;;;;;
+165F;CANADIAN SYLLABICS CARRIER TSI;Lo;0;L;;;;;N;;;;;
+1660;CANADIAN SYLLABICS CARRIER TSA;Lo;0;L;;;;;N;;;;;
+1661;CANADIAN SYLLABICS CARRIER CHU;Lo;0;L;;;;;N;;;;;
+1662;CANADIAN SYLLABICS CARRIER CHO;Lo;0;L;;;;;N;;;;;
+1663;CANADIAN SYLLABICS CARRIER CHE;Lo;0;L;;;;;N;;;;;
+1664;CANADIAN SYLLABICS CARRIER CHEE;Lo;0;L;;;;;N;;;;;
+1665;CANADIAN SYLLABICS CARRIER CHI;Lo;0;L;;;;;N;;;;;
+1666;CANADIAN SYLLABICS CARRIER CHA;Lo;0;L;;;;;N;;;;;
+1667;CANADIAN SYLLABICS CARRIER TTSU;Lo;0;L;;;;;N;;;;;
+1668;CANADIAN SYLLABICS CARRIER TTSO;Lo;0;L;;;;;N;;;;;
+1669;CANADIAN SYLLABICS CARRIER TTSE;Lo;0;L;;;;;N;;;;;
+166A;CANADIAN SYLLABICS CARRIER TTSEE;Lo;0;L;;;;;N;;;;;
+166B;CANADIAN SYLLABICS CARRIER TTSI;Lo;0;L;;;;;N;;;;;
+166C;CANADIAN SYLLABICS CARRIER TTSA;Lo;0;L;;;;;N;;;;;
+166D;CANADIAN SYLLABICS CHI SIGN;Po;0;L;;;;;N;;;;;
+166E;CANADIAN SYLLABICS FULL STOP;Po;0;L;;;;;N;;;;;
+166F;CANADIAN SYLLABICS QAI;Lo;0;L;;;;;N;;;;;
+1670;CANADIAN SYLLABICS NGAI;Lo;0;L;;;;;N;;;;;
+1671;CANADIAN SYLLABICS NNGI;Lo;0;L;;;;;N;;;;;
+1672;CANADIAN SYLLABICS NNGII;Lo;0;L;;;;;N;;;;;
+1673;CANADIAN SYLLABICS NNGO;Lo;0;L;;;;;N;;;;;
+1674;CANADIAN SYLLABICS NNGOO;Lo;0;L;;;;;N;;;;;
+1675;CANADIAN SYLLABICS NNGA;Lo;0;L;;;;;N;;;;;
+1676;CANADIAN SYLLABICS NNGAA;Lo;0;L;;;;;N;;;;;
+1680;OGHAM SPACE MARK;Zs;0;WS;;;;;N;;;;;
+1681;OGHAM LETTER BEITH;Lo;0;L;;;;;N;;;;;
+1682;OGHAM LETTER LUIS;Lo;0;L;;;;;N;;;;;
+1683;OGHAM LETTER FEARN;Lo;0;L;;;;;N;;;;;
+1684;OGHAM LETTER SAIL;Lo;0;L;;;;;N;;;;;
+1685;OGHAM LETTER NION;Lo;0;L;;;;;N;;;;;
+1686;OGHAM LETTER UATH;Lo;0;L;;;;;N;;;;;
+1687;OGHAM LETTER DAIR;Lo;0;L;;;;;N;;;;;
+1688;OGHAM LETTER TINNE;Lo;0;L;;;;;N;;;;;
+1689;OGHAM LETTER COLL;Lo;0;L;;;;;N;;;;;
+168A;OGHAM LETTER CEIRT;Lo;0;L;;;;;N;;;;;
+168B;OGHAM LETTER MUIN;Lo;0;L;;;;;N;;;;;
+168C;OGHAM LETTER GORT;Lo;0;L;;;;;N;;;;;
+168D;OGHAM LETTER NGEADAL;Lo;0;L;;;;;N;;;;;
+168E;OGHAM LETTER STRAIF;Lo;0;L;;;;;N;;;;;
+168F;OGHAM LETTER RUIS;Lo;0;L;;;;;N;;;;;
+1690;OGHAM LETTER AILM;Lo;0;L;;;;;N;;;;;
+1691;OGHAM LETTER ONN;Lo;0;L;;;;;N;;;;;
+1692;OGHAM LETTER UR;Lo;0;L;;;;;N;;;;;
+1693;OGHAM LETTER EADHADH;Lo;0;L;;;;;N;;;;;
+1694;OGHAM LETTER IODHADH;Lo;0;L;;;;;N;;;;;
+1695;OGHAM LETTER EABHADH;Lo;0;L;;;;;N;;;;;
+1696;OGHAM LETTER OR;Lo;0;L;;;;;N;;;;;
+1697;OGHAM LETTER UILLEANN;Lo;0;L;;;;;N;;;;;
+1698;OGHAM LETTER IFIN;Lo;0;L;;;;;N;;;;;
+1699;OGHAM LETTER EAMHANCHOLL;Lo;0;L;;;;;N;;;;;
+169A;OGHAM LETTER PEITH;Lo;0;L;;;;;N;;;;;
+169B;OGHAM FEATHER MARK;Ps;0;ON;;;;;Y;;;;;
+169C;OGHAM REVERSED FEATHER MARK;Pe;0;ON;;;;;Y;;;;;
+16A0;RUNIC LETTER FEHU FEOH FE F;Lo;0;L;;;;;N;;;;;
+16A1;RUNIC LETTER V;Lo;0;L;;;;;N;;;;;
+16A2;RUNIC LETTER URUZ UR U;Lo;0;L;;;;;N;;;;;
+16A3;RUNIC LETTER YR;Lo;0;L;;;;;N;;;;;
+16A4;RUNIC LETTER Y;Lo;0;L;;;;;N;;;;;
+16A5;RUNIC LETTER W;Lo;0;L;;;;;N;;;;;
+16A6;RUNIC LETTER THURISAZ THURS THORN;Lo;0;L;;;;;N;;;;;
+16A7;RUNIC LETTER ETH;Lo;0;L;;;;;N;;;;;
+16A8;RUNIC LETTER ANSUZ A;Lo;0;L;;;;;N;;;;;
+16A9;RUNIC LETTER OS O;Lo;0;L;;;;;N;;;;;
+16AA;RUNIC LETTER AC A;Lo;0;L;;;;;N;;;;;
+16AB;RUNIC LETTER AESC;Lo;0;L;;;;;N;;;;;
+16AC;RUNIC LETTER LONG-BRANCH-OSS O;Lo;0;L;;;;;N;;;;;
+16AD;RUNIC LETTER SHORT-TWIG-OSS O;Lo;0;L;;;;;N;;;;;
+16AE;RUNIC LETTER O;Lo;0;L;;;;;N;;;;;
+16AF;RUNIC LETTER OE;Lo;0;L;;;;;N;;;;;
+16B0;RUNIC LETTER ON;Lo;0;L;;;;;N;;;;;
+16B1;RUNIC LETTER RAIDO RAD REID R;Lo;0;L;;;;;N;;;;;
+16B2;RUNIC LETTER KAUNA;Lo;0;L;;;;;N;;;;;
+16B3;RUNIC LETTER CEN;Lo;0;L;;;;;N;;;;;
+16B4;RUNIC LETTER KAUN K;Lo;0;L;;;;;N;;;;;
+16B5;RUNIC LETTER G;Lo;0;L;;;;;N;;;;;
+16B6;RUNIC LETTER ENG;Lo;0;L;;;;;N;;;;;
+16B7;RUNIC LETTER GEBO GYFU G;Lo;0;L;;;;;N;;;;;
+16B8;RUNIC LETTER GAR;Lo;0;L;;;;;N;;;;;
+16B9;RUNIC LETTER WUNJO WYNN W;Lo;0;L;;;;;N;;;;;
+16BA;RUNIC LETTER HAGLAZ H;Lo;0;L;;;;;N;;;;;
+16BB;RUNIC LETTER HAEGL H;Lo;0;L;;;;;N;;;;;
+16BC;RUNIC LETTER LONG-BRANCH-HAGALL H;Lo;0;L;;;;;N;;;;;
+16BD;RUNIC LETTER SHORT-TWIG-HAGALL H;Lo;0;L;;;;;N;;;;;
+16BE;RUNIC LETTER NAUDIZ NYD NAUD N;Lo;0;L;;;;;N;;;;;
+16BF;RUNIC LETTER SHORT-TWIG-NAUD N;Lo;0;L;;;;;N;;;;;
+16C0;RUNIC LETTER DOTTED-N;Lo;0;L;;;;;N;;;;;
+16C1;RUNIC LETTER ISAZ IS ISS I;Lo;0;L;;;;;N;;;;;
+16C2;RUNIC LETTER E;Lo;0;L;;;;;N;;;;;
+16C3;RUNIC LETTER JERAN J;Lo;0;L;;;;;N;;;;;
+16C4;RUNIC LETTER GER;Lo;0;L;;;;;N;;;;;
+16C5;RUNIC LETTER LONG-BRANCH-AR AE;Lo;0;L;;;;;N;;;;;
+16C6;RUNIC LETTER SHORT-TWIG-AR A;Lo;0;L;;;;;N;;;;;
+16C7;RUNIC LETTER IWAZ EOH;Lo;0;L;;;;;N;;;;;
+16C8;RUNIC LETTER PERTHO PEORTH P;Lo;0;L;;;;;N;;;;;
+16C9;RUNIC LETTER ALGIZ EOLHX;Lo;0;L;;;;;N;;;;;
+16CA;RUNIC LETTER SOWILO S;Lo;0;L;;;;;N;;;;;
+16CB;RUNIC LETTER SIGEL LONG-BRANCH-SOL S;Lo;0;L;;;;;N;;;;;
+16CC;RUNIC LETTER SHORT-TWIG-SOL S;Lo;0;L;;;;;N;;;;;
+16CD;RUNIC LETTER C;Lo;0;L;;;;;N;;;;;
+16CE;RUNIC LETTER Z;Lo;0;L;;;;;N;;;;;
+16CF;RUNIC LETTER TIWAZ TIR TYR T;Lo;0;L;;;;;N;;;;;
+16D0;RUNIC LETTER SHORT-TWIG-TYR T;Lo;0;L;;;;;N;;;;;
+16D1;RUNIC LETTER D;Lo;0;L;;;;;N;;;;;
+16D2;RUNIC LETTER BERKANAN BEORC BJARKAN B;Lo;0;L;;;;;N;;;;;
+16D3;RUNIC LETTER SHORT-TWIG-BJARKAN B;Lo;0;L;;;;;N;;;;;
+16D4;RUNIC LETTER DOTTED-P;Lo;0;L;;;;;N;;;;;
+16D5;RUNIC LETTER OPEN-P;Lo;0;L;;;;;N;;;;;
+16D6;RUNIC LETTER EHWAZ EH E;Lo;0;L;;;;;N;;;;;
+16D7;RUNIC LETTER MANNAZ MAN M;Lo;0;L;;;;;N;;;;;
+16D8;RUNIC LETTER LONG-BRANCH-MADR M;Lo;0;L;;;;;N;;;;;
+16D9;RUNIC LETTER SHORT-TWIG-MADR M;Lo;0;L;;;;;N;;;;;
+16DA;RUNIC LETTER LAUKAZ LAGU LOGR L;Lo;0;L;;;;;N;;;;;
+16DB;RUNIC LETTER DOTTED-L;Lo;0;L;;;;;N;;;;;
+16DC;RUNIC LETTER INGWAZ;Lo;0;L;;;;;N;;;;;
+16DD;RUNIC LETTER ING;Lo;0;L;;;;;N;;;;;
+16DE;RUNIC LETTER DAGAZ DAEG D;Lo;0;L;;;;;N;;;;;
+16DF;RUNIC LETTER OTHALAN ETHEL O;Lo;0;L;;;;;N;;;;;
+16E0;RUNIC LETTER EAR;Lo;0;L;;;;;N;;;;;
+16E1;RUNIC LETTER IOR;Lo;0;L;;;;;N;;;;;
+16E2;RUNIC LETTER CWEORTH;Lo;0;L;;;;;N;;;;;
+16E3;RUNIC LETTER CALC;Lo;0;L;;;;;N;;;;;
+16E4;RUNIC LETTER CEALC;Lo;0;L;;;;;N;;;;;
+16E5;RUNIC LETTER STAN;Lo;0;L;;;;;N;;;;;
+16E6;RUNIC LETTER LONG-BRANCH-YR;Lo;0;L;;;;;N;;;;;
+16E7;RUNIC LETTER SHORT-TWIG-YR;Lo;0;L;;;;;N;;;;;
+16E8;RUNIC LETTER ICELANDIC-YR;Lo;0;L;;;;;N;;;;;
+16E9;RUNIC LETTER Q;Lo;0;L;;;;;N;;;;;
+16EA;RUNIC LETTER X;Lo;0;L;;;;;N;;;;;
+16EB;RUNIC SINGLE PUNCTUATION;Po;0;L;;;;;N;;;;;
+16EC;RUNIC MULTIPLE PUNCTUATION;Po;0;L;;;;;N;;;;;
+16ED;RUNIC CROSS PUNCTUATION;Po;0;L;;;;;N;;;;;
+16EE;RUNIC ARLAUG SYMBOL;Nl;0;L;;;;17;N;;golden number 17;;;
+16EF;RUNIC TVIMADUR SYMBOL;Nl;0;L;;;;18;N;;golden number 18;;;
+16F0;RUNIC BELGTHOR SYMBOL;Nl;0;L;;;;19;N;;golden number 19;;;
+1700;TAGALOG LETTER A;Lo;0;L;;;;;N;;;;;
+1701;TAGALOG LETTER I;Lo;0;L;;;;;N;;;;;
+1702;TAGALOG LETTER U;Lo;0;L;;;;;N;;;;;
+1703;TAGALOG LETTER KA;Lo;0;L;;;;;N;;;;;
+1704;TAGALOG LETTER GA;Lo;0;L;;;;;N;;;;;
+1705;TAGALOG LETTER NGA;Lo;0;L;;;;;N;;;;;
+1706;TAGALOG LETTER TA;Lo;0;L;;;;;N;;;;;
+1707;TAGALOG LETTER DA;Lo;0;L;;;;;N;;;;;
+1708;TAGALOG LETTER NA;Lo;0;L;;;;;N;;;;;
+1709;TAGALOG LETTER PA;Lo;0;L;;;;;N;;;;;
+170A;TAGALOG LETTER BA;Lo;0;L;;;;;N;;;;;
+170B;TAGALOG LETTER MA;Lo;0;L;;;;;N;;;;;
+170C;TAGALOG LETTER YA;Lo;0;L;;;;;N;;;;;
+170E;TAGALOG LETTER LA;Lo;0;L;;;;;N;;;;;
+170F;TAGALOG LETTER WA;Lo;0;L;;;;;N;;;;;
+1710;TAGALOG LETTER SA;Lo;0;L;;;;;N;;;;;
+1711;TAGALOG LETTER HA;Lo;0;L;;;;;N;;;;;
+1712;TAGALOG VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1713;TAGALOG VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1714;TAGALOG SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+1720;HANUNOO LETTER A;Lo;0;L;;;;;N;;;;;
+1721;HANUNOO LETTER I;Lo;0;L;;;;;N;;;;;
+1722;HANUNOO LETTER U;Lo;0;L;;;;;N;;;;;
+1723;HANUNOO LETTER KA;Lo;0;L;;;;;N;;;;;
+1724;HANUNOO LETTER GA;Lo;0;L;;;;;N;;;;;
+1725;HANUNOO LETTER NGA;Lo;0;L;;;;;N;;;;;
+1726;HANUNOO LETTER TA;Lo;0;L;;;;;N;;;;;
+1727;HANUNOO LETTER DA;Lo;0;L;;;;;N;;;;;
+1728;HANUNOO LETTER NA;Lo;0;L;;;;;N;;;;;
+1729;HANUNOO LETTER PA;Lo;0;L;;;;;N;;;;;
+172A;HANUNOO LETTER BA;Lo;0;L;;;;;N;;;;;
+172B;HANUNOO LETTER MA;Lo;0;L;;;;;N;;;;;
+172C;HANUNOO LETTER YA;Lo;0;L;;;;;N;;;;;
+172D;HANUNOO LETTER RA;Lo;0;L;;;;;N;;;;;
+172E;HANUNOO LETTER LA;Lo;0;L;;;;;N;;;;;
+172F;HANUNOO LETTER WA;Lo;0;L;;;;;N;;;;;
+1730;HANUNOO LETTER SA;Lo;0;L;;;;;N;;;;;
+1731;HANUNOO LETTER HA;Lo;0;L;;;;;N;;;;;
+1732;HANUNOO VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1733;HANUNOO VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1734;HANUNOO SIGN PAMUDPOD;Mn;9;NSM;;;;;N;;;;;
+1735;PHILIPPINE SINGLE PUNCTUATION;Po;0;L;;;;;N;;;;;
+1736;PHILIPPINE DOUBLE PUNCTUATION;Po;0;L;;;;;N;;;;;
+1740;BUHID LETTER A;Lo;0;L;;;;;N;;;;;
+1741;BUHID LETTER I;Lo;0;L;;;;;N;;;;;
+1742;BUHID LETTER U;Lo;0;L;;;;;N;;;;;
+1743;BUHID LETTER KA;Lo;0;L;;;;;N;;;;;
+1744;BUHID LETTER GA;Lo;0;L;;;;;N;;;;;
+1745;BUHID LETTER NGA;Lo;0;L;;;;;N;;;;;
+1746;BUHID LETTER TA;Lo;0;L;;;;;N;;;;;
+1747;BUHID LETTER DA;Lo;0;L;;;;;N;;;;;
+1748;BUHID LETTER NA;Lo;0;L;;;;;N;;;;;
+1749;BUHID LETTER PA;Lo;0;L;;;;;N;;;;;
+174A;BUHID LETTER BA;Lo;0;L;;;;;N;;;;;
+174B;BUHID LETTER MA;Lo;0;L;;;;;N;;;;;
+174C;BUHID LETTER YA;Lo;0;L;;;;;N;;;;;
+174D;BUHID LETTER RA;Lo;0;L;;;;;N;;;;;
+174E;BUHID LETTER LA;Lo;0;L;;;;;N;;;;;
+174F;BUHID LETTER WA;Lo;0;L;;;;;N;;;;;
+1750;BUHID LETTER SA;Lo;0;L;;;;;N;;;;;
+1751;BUHID LETTER HA;Lo;0;L;;;;;N;;;;;
+1752;BUHID VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1753;BUHID VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1760;TAGBANWA LETTER A;Lo;0;L;;;;;N;;;;;
+1761;TAGBANWA LETTER I;Lo;0;L;;;;;N;;;;;
+1762;TAGBANWA LETTER U;Lo;0;L;;;;;N;;;;;
+1763;TAGBANWA LETTER KA;Lo;0;L;;;;;N;;;;;
+1764;TAGBANWA LETTER GA;Lo;0;L;;;;;N;;;;;
+1765;TAGBANWA LETTER NGA;Lo;0;L;;;;;N;;;;;
+1766;TAGBANWA LETTER TA;Lo;0;L;;;;;N;;;;;
+1767;TAGBANWA LETTER DA;Lo;0;L;;;;;N;;;;;
+1768;TAGBANWA LETTER NA;Lo;0;L;;;;;N;;;;;
+1769;TAGBANWA LETTER PA;Lo;0;L;;;;;N;;;;;
+176A;TAGBANWA LETTER BA;Lo;0;L;;;;;N;;;;;
+176B;TAGBANWA LETTER MA;Lo;0;L;;;;;N;;;;;
+176C;TAGBANWA LETTER YA;Lo;0;L;;;;;N;;;;;
+176E;TAGBANWA LETTER LA;Lo;0;L;;;;;N;;;;;
+176F;TAGBANWA LETTER WA;Lo;0;L;;;;;N;;;;;
+1770;TAGBANWA LETTER SA;Lo;0;L;;;;;N;;;;;
+1772;TAGBANWA VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1773;TAGBANWA VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1780;KHMER LETTER KA;Lo;0;L;;;;;N;;;;;
+1781;KHMER LETTER KHA;Lo;0;L;;;;;N;;;;;
+1782;KHMER LETTER KO;Lo;0;L;;;;;N;;;;;
+1783;KHMER LETTER KHO;Lo;0;L;;;;;N;;;;;
+1784;KHMER LETTER NGO;Lo;0;L;;;;;N;;;;;
+1785;KHMER LETTER CA;Lo;0;L;;;;;N;;;;;
+1786;KHMER LETTER CHA;Lo;0;L;;;;;N;;;;;
+1787;KHMER LETTER CO;Lo;0;L;;;;;N;;;;;
+1788;KHMER LETTER CHO;Lo;0;L;;;;;N;;;;;
+1789;KHMER LETTER NYO;Lo;0;L;;;;;N;;;;;
+178A;KHMER LETTER DA;Lo;0;L;;;;;N;;;;;
+178B;KHMER LETTER TTHA;Lo;0;L;;;;;N;;;;;
+178C;KHMER LETTER DO;Lo;0;L;;;;;N;;;;;
+178D;KHMER LETTER TTHO;Lo;0;L;;;;;N;;;;;
+178E;KHMER LETTER NNO;Lo;0;L;;;;;N;;;;;
+178F;KHMER LETTER TA;Lo;0;L;;;;;N;;;;;
+1790;KHMER LETTER THA;Lo;0;L;;;;;N;;;;;
+1791;KHMER LETTER TO;Lo;0;L;;;;;N;;;;;
+1792;KHMER LETTER THO;Lo;0;L;;;;;N;;;;;
+1793;KHMER LETTER NO;Lo;0;L;;;;;N;;;;;
+1794;KHMER LETTER BA;Lo;0;L;;;;;N;;;;;
+1795;KHMER LETTER PHA;Lo;0;L;;;;;N;;;;;
+1796;KHMER LETTER PO;Lo;0;L;;;;;N;;;;;
+1797;KHMER LETTER PHO;Lo;0;L;;;;;N;;;;;
+1798;KHMER LETTER MO;Lo;0;L;;;;;N;;;;;
+1799;KHMER LETTER YO;Lo;0;L;;;;;N;;;;;
+179A;KHMER LETTER RO;Lo;0;L;;;;;N;;;;;
+179B;KHMER LETTER LO;Lo;0;L;;;;;N;;;;;
+179C;KHMER LETTER VO;Lo;0;L;;;;;N;;;;;
+179D;KHMER LETTER SHA;Lo;0;L;;;;;N;;;;;
+179E;KHMER LETTER SSO;Lo;0;L;;;;;N;;;;;
+179F;KHMER LETTER SA;Lo;0;L;;;;;N;;;;;
+17A0;KHMER LETTER HA;Lo;0;L;;;;;N;;;;;
+17A1;KHMER LETTER LA;Lo;0;L;;;;;N;;;;;
+17A2;KHMER LETTER QA;Lo;0;L;;;;;N;;;;;
+17A3;KHMER INDEPENDENT VOWEL QAQ;Lo;0;L;;;;;N;;*;;;
+17A4;KHMER INDEPENDENT VOWEL QAA;Lo;0;L;;;;;N;;*;;;
+17A5;KHMER INDEPENDENT VOWEL QI;Lo;0;L;;;;;N;;;;;
+17A6;KHMER INDEPENDENT VOWEL QII;Lo;0;L;;;;;N;;;;;
+17A7;KHMER INDEPENDENT VOWEL QU;Lo;0;L;;;;;N;;;;;
+17A8;KHMER INDEPENDENT VOWEL QUK;Lo;0;L;;;;;N;;;;;
+17A9;KHMER INDEPENDENT VOWEL QUU;Lo;0;L;;;;;N;;;;;
+17AA;KHMER INDEPENDENT VOWEL QUUV;Lo;0;L;;;;;N;;;;;
+17AB;KHMER INDEPENDENT VOWEL RY;Lo;0;L;;;;;N;;;;;
+17AC;KHMER INDEPENDENT VOWEL RYY;Lo;0;L;;;;;N;;;;;
+17AD;KHMER INDEPENDENT VOWEL LY;Lo;0;L;;;;;N;;;;;
+17AE;KHMER INDEPENDENT VOWEL LYY;Lo;0;L;;;;;N;;;;;
+17AF;KHMER INDEPENDENT VOWEL QE;Lo;0;L;;;;;N;;;;;
+17B0;KHMER INDEPENDENT VOWEL QAI;Lo;0;L;;;;;N;;;;;
+17B1;KHMER INDEPENDENT VOWEL QOO TYPE ONE;Lo;0;L;;;;;N;;;;;
+17B2;KHMER INDEPENDENT VOWEL QOO TYPE TWO;Lo;0;L;;;;;N;;;;;
+17B3;KHMER INDEPENDENT VOWEL QAU;Lo;0;L;;;;;N;;;;;
+17B4;KHMER VOWEL INHERENT AQ;Cf;0;L;;;;;N;;*;;;
+17B5;KHMER VOWEL INHERENT AA;Cf;0;L;;;;;N;;*;;;
+17B6;KHMER VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+17B7;KHMER VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+17B8;KHMER VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+17B9;KHMER VOWEL SIGN Y;Mn;0;NSM;;;;;N;;;;;
+17BA;KHMER VOWEL SIGN YY;Mn;0;NSM;;;;;N;;;;;
+17BB;KHMER VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+17BC;KHMER VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+17BD;KHMER VOWEL SIGN UA;Mn;0;NSM;;;;;N;;;;;
+17BE;KHMER VOWEL SIGN OE;Mc;0;L;;;;;N;;;;;
+17BF;KHMER VOWEL SIGN YA;Mc;0;L;;;;;N;;;;;
+17C0;KHMER VOWEL SIGN IE;Mc;0;L;;;;;N;;;;;
+17C1;KHMER VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+17C2;KHMER VOWEL SIGN AE;Mc;0;L;;;;;N;;;;;
+17C3;KHMER VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+17C4;KHMER VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+17C5;KHMER VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+17C6;KHMER SIGN NIKAHIT;Mn;0;NSM;;;;;N;;;;;
+17C7;KHMER SIGN REAHMUK;Mc;0;L;;;;;N;;;;;
+17C8;KHMER SIGN YUUKALEAPINTU;Mc;0;L;;;;;N;;;;;
+17C9;KHMER SIGN MUUSIKATOAN;Mn;0;NSM;;;;;N;;;;;
+17CA;KHMER SIGN TRIISAP;Mn;0;NSM;;;;;N;;;;;
+17CB;KHMER SIGN BANTOC;Mn;0;NSM;;;;;N;;;;;
+17CC;KHMER SIGN ROBAT;Mn;0;NSM;;;;;N;;;;;
+17CD;KHMER SIGN TOANDAKHIAT;Mn;0;NSM;;;;;N;;;;;
+17CE;KHMER SIGN KAKABAT;Mn;0;NSM;;;;;N;;;;;
+17CF;KHMER SIGN AHSDA;Mn;0;NSM;;;;;N;;;;;
+17D0;KHMER SIGN SAMYOK SANNYA;Mn;0;NSM;;;;;N;;;;;
+17D1;KHMER SIGN VIRIAM;Mn;0;NSM;;;;;N;;;;;
+17D2;KHMER SIGN COENG;Mn;9;NSM;;;;;N;;;;;
+17D3;KHMER SIGN BATHAMASAT;Mn;0;NSM;;;;;N;;*;;;
+17D4;KHMER SIGN KHAN;Po;0;L;;;;;N;;;;;
+17D5;KHMER SIGN BARIYOOSAN;Po;0;L;;;;;N;;;;;
+17D6;KHMER SIGN CAMNUC PII KUUH;Po;0;L;;;;;N;;;;;
+17D7;KHMER SIGN LEK TOO;Lm;0;L;;;;;N;;;;;
+17D8;KHMER SIGN BEYYAL;Po;0;L;;;;;N;;*;;;
+17D9;KHMER SIGN PHNAEK MUAN;Po;0;L;;;;;N;;;;;
+17DA;KHMER SIGN KOOMUUT;Po;0;L;;;;;N;;;;;
+17DB;KHMER CURRENCY SYMBOL RIEL;Sc;0;ET;;;;;N;;;;;
+17DC;KHMER SIGN AVAKRAHASANYA;Lo;0;L;;;;;N;;;;;
+17DD;KHMER SIGN ATTHACAN;Mn;230;NSM;;;;;N;;;;;
+17E0;KHMER DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+17E1;KHMER DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+17E2;KHMER DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+17E3;KHMER DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+17E4;KHMER DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+17E5;KHMER DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+17E6;KHMER DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+17E7;KHMER DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+17E8;KHMER DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+17E9;KHMER DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+17F0;KHMER SYMBOL LEK ATTAK SON;No;0;ON;;;;0;N;;;;;
+17F1;KHMER SYMBOL LEK ATTAK MUOY;No;0;ON;;;;1;N;;;;;
+17F2;KHMER SYMBOL LEK ATTAK PII;No;0;ON;;;;2;N;;;;;
+17F3;KHMER SYMBOL LEK ATTAK BEI;No;0;ON;;;;3;N;;;;;
+17F4;KHMER SYMBOL LEK ATTAK BUON;No;0;ON;;;;4;N;;;;;
+17F5;KHMER SYMBOL LEK ATTAK PRAM;No;0;ON;;;;5;N;;;;;
+17F6;KHMER SYMBOL LEK ATTAK PRAM-MUOY;No;0;ON;;;;6;N;;;;;
+17F7;KHMER SYMBOL LEK ATTAK PRAM-PII;No;0;ON;;;;7;N;;;;;
+17F8;KHMER SYMBOL LEK ATTAK PRAM-BEI;No;0;ON;;;;8;N;;;;;
+17F9;KHMER SYMBOL LEK ATTAK PRAM-BUON;No;0;ON;;;;9;N;;;;;
+1800;MONGOLIAN BIRGA;Po;0;ON;;;;;N;;;;;
+1801;MONGOLIAN ELLIPSIS;Po;0;ON;;;;;N;;;;;
+1802;MONGOLIAN COMMA;Po;0;ON;;;;;N;;;;;
+1803;MONGOLIAN FULL STOP;Po;0;ON;;;;;N;;;;;
+1804;MONGOLIAN COLON;Po;0;ON;;;;;N;;;;;
+1805;MONGOLIAN FOUR DOTS;Po;0;ON;;;;;N;;;;;
+1806;MONGOLIAN TODO SOFT HYPHEN;Pd;0;ON;;;;;N;;;;;
+1807;MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER;Po;0;ON;;;;;N;;;;;
+1808;MONGOLIAN MANCHU COMMA;Po;0;ON;;;;;N;;;;;
+1809;MONGOLIAN MANCHU FULL STOP;Po;0;ON;;;;;N;;;;;
+180A;MONGOLIAN NIRUGU;Po;0;ON;;;;;N;;;;;
+180B;MONGOLIAN FREE VARIATION SELECTOR ONE;Mn;0;NSM;;;;;N;;;;;
+180C;MONGOLIAN FREE VARIATION SELECTOR TWO;Mn;0;NSM;;;;;N;;;;;
+180D;MONGOLIAN FREE VARIATION SELECTOR THREE;Mn;0;NSM;;;;;N;;;;;
+180E;MONGOLIAN VOWEL SEPARATOR;Zs;0;WS;;;;;N;;;;;
+1810;MONGOLIAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1811;MONGOLIAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1812;MONGOLIAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1813;MONGOLIAN DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1814;MONGOLIAN DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1815;MONGOLIAN DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1816;MONGOLIAN DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1817;MONGOLIAN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1818;MONGOLIAN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1819;MONGOLIAN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1820;MONGOLIAN LETTER A;Lo;0;L;;;;;N;;;;;
+1821;MONGOLIAN LETTER E;Lo;0;L;;;;;N;;;;;
+1822;MONGOLIAN LETTER I;Lo;0;L;;;;;N;;;;;
+1823;MONGOLIAN LETTER O;Lo;0;L;;;;;N;;;;;
+1824;MONGOLIAN LETTER U;Lo;0;L;;;;;N;;;;;
+1825;MONGOLIAN LETTER OE;Lo;0;L;;;;;N;;;;;
+1826;MONGOLIAN LETTER UE;Lo;0;L;;;;;N;;;;;
+1827;MONGOLIAN LETTER EE;Lo;0;L;;;;;N;;;;;
+1828;MONGOLIAN LETTER NA;Lo;0;L;;;;;N;;;;;
+1829;MONGOLIAN LETTER ANG;Lo;0;L;;;;;N;;;;;
+182A;MONGOLIAN LETTER BA;Lo;0;L;;;;;N;;;;;
+182B;MONGOLIAN LETTER PA;Lo;0;L;;;;;N;;;;;
+182C;MONGOLIAN LETTER QA;Lo;0;L;;;;;N;;;;;
+182D;MONGOLIAN LETTER GA;Lo;0;L;;;;;N;;;;;
+182E;MONGOLIAN LETTER MA;Lo;0;L;;;;;N;;;;;
+182F;MONGOLIAN LETTER LA;Lo;0;L;;;;;N;;;;;
+1830;MONGOLIAN LETTER SA;Lo;0;L;;;;;N;;;;;
+1831;MONGOLIAN LETTER SHA;Lo;0;L;;;;;N;;;;;
+1832;MONGOLIAN LETTER TA;Lo;0;L;;;;;N;;;;;
+1833;MONGOLIAN LETTER DA;Lo;0;L;;;;;N;;;;;
+1834;MONGOLIAN LETTER CHA;Lo;0;L;;;;;N;;;;;
+1835;MONGOLIAN LETTER JA;Lo;0;L;;;;;N;;;;;
+1836;MONGOLIAN LETTER YA;Lo;0;L;;;;;N;;;;;
+1837;MONGOLIAN LETTER RA;Lo;0;L;;;;;N;;;;;
+1838;MONGOLIAN LETTER WA;Lo;0;L;;;;;N;;;;;
+1839;MONGOLIAN LETTER FA;Lo;0;L;;;;;N;;;;;
+183A;MONGOLIAN LETTER KA;Lo;0;L;;;;;N;;;;;
+183B;MONGOLIAN LETTER KHA;Lo;0;L;;;;;N;;;;;
+183C;MONGOLIAN LETTER TSA;Lo;0;L;;;;;N;;;;;
+183D;MONGOLIAN LETTER ZA;Lo;0;L;;;;;N;;;;;
+183E;MONGOLIAN LETTER HAA;Lo;0;L;;;;;N;;;;;
+183F;MONGOLIAN LETTER ZRA;Lo;0;L;;;;;N;;;;;
+1840;MONGOLIAN LETTER LHA;Lo;0;L;;;;;N;;;;;
+1841;MONGOLIAN LETTER ZHI;Lo;0;L;;;;;N;;;;;
+1842;MONGOLIAN LETTER CHI;Lo;0;L;;;;;N;;;;;
+1843;MONGOLIAN LETTER TODO LONG VOWEL SIGN;Lm;0;L;;;;;N;;;;;
+1844;MONGOLIAN LETTER TODO E;Lo;0;L;;;;;N;;;;;
+1845;MONGOLIAN LETTER TODO I;Lo;0;L;;;;;N;;;;;
+1846;MONGOLIAN LETTER TODO O;Lo;0;L;;;;;N;;;;;
+1847;MONGOLIAN LETTER TODO U;Lo;0;L;;;;;N;;;;;
+1848;MONGOLIAN LETTER TODO OE;Lo;0;L;;;;;N;;;;;
+1849;MONGOLIAN LETTER TODO UE;Lo;0;L;;;;;N;;;;;
+184A;MONGOLIAN LETTER TODO ANG;Lo;0;L;;;;;N;;;;;
+184B;MONGOLIAN LETTER TODO BA;Lo;0;L;;;;;N;;;;;
+184C;MONGOLIAN LETTER TODO PA;Lo;0;L;;;;;N;;;;;
+184D;MONGOLIAN LETTER TODO QA;Lo;0;L;;;;;N;;;;;
+184E;MONGOLIAN LETTER TODO GA;Lo;0;L;;;;;N;;;;;
+184F;MONGOLIAN LETTER TODO MA;Lo;0;L;;;;;N;;;;;
+1850;MONGOLIAN LETTER TODO TA;Lo;0;L;;;;;N;;;;;
+1851;MONGOLIAN LETTER TODO DA;Lo;0;L;;;;;N;;;;;
+1852;MONGOLIAN LETTER TODO CHA;Lo;0;L;;;;;N;;;;;
+1853;MONGOLIAN LETTER TODO JA;Lo;0;L;;;;;N;;;;;
+1854;MONGOLIAN LETTER TODO TSA;Lo;0;L;;;;;N;;;;;
+1855;MONGOLIAN LETTER TODO YA;Lo;0;L;;;;;N;;;;;
+1856;MONGOLIAN LETTER TODO WA;Lo;0;L;;;;;N;;;;;
+1857;MONGOLIAN LETTER TODO KA;Lo;0;L;;;;;N;;;;;
+1858;MONGOLIAN LETTER TODO GAA;Lo;0;L;;;;;N;;;;;
+1859;MONGOLIAN LETTER TODO HAA;Lo;0;L;;;;;N;;;;;
+185A;MONGOLIAN LETTER TODO JIA;Lo;0;L;;;;;N;;;;;
+185B;MONGOLIAN LETTER TODO NIA;Lo;0;L;;;;;N;;;;;
+185C;MONGOLIAN LETTER TODO DZA;Lo;0;L;;;;;N;;;;;
+185D;MONGOLIAN LETTER SIBE E;Lo;0;L;;;;;N;;;;;
+185E;MONGOLIAN LETTER SIBE I;Lo;0;L;;;;;N;;;;;
+185F;MONGOLIAN LETTER SIBE IY;Lo;0;L;;;;;N;;;;;
+1860;MONGOLIAN LETTER SIBE UE;Lo;0;L;;;;;N;;;;;
+1861;MONGOLIAN LETTER SIBE U;Lo;0;L;;;;;N;;;;;
+1862;MONGOLIAN LETTER SIBE ANG;Lo;0;L;;;;;N;;;;;
+1863;MONGOLIAN LETTER SIBE KA;Lo;0;L;;;;;N;;;;;
+1864;MONGOLIAN LETTER SIBE GA;Lo;0;L;;;;;N;;;;;
+1865;MONGOLIAN LETTER SIBE HA;Lo;0;L;;;;;N;;;;;
+1866;MONGOLIAN LETTER SIBE PA;Lo;0;L;;;;;N;;;;;
+1867;MONGOLIAN LETTER SIBE SHA;Lo;0;L;;;;;N;;;;;
+1868;MONGOLIAN LETTER SIBE TA;Lo;0;L;;;;;N;;;;;
+1869;MONGOLIAN LETTER SIBE DA;Lo;0;L;;;;;N;;;;;
+186A;MONGOLIAN LETTER SIBE JA;Lo;0;L;;;;;N;;;;;
+186B;MONGOLIAN LETTER SIBE FA;Lo;0;L;;;;;N;;;;;
+186C;MONGOLIAN LETTER SIBE GAA;Lo;0;L;;;;;N;;;;;
+186D;MONGOLIAN LETTER SIBE HAA;Lo;0;L;;;;;N;;;;;
+186E;MONGOLIAN LETTER SIBE TSA;Lo;0;L;;;;;N;;;;;
+186F;MONGOLIAN LETTER SIBE ZA;Lo;0;L;;;;;N;;;;;
+1870;MONGOLIAN LETTER SIBE RAA;Lo;0;L;;;;;N;;;;;
+1871;MONGOLIAN LETTER SIBE CHA;Lo;0;L;;;;;N;;;;;
+1872;MONGOLIAN LETTER SIBE ZHA;Lo;0;L;;;;;N;;;;;
+1873;MONGOLIAN LETTER MANCHU I;Lo;0;L;;;;;N;;;;;
+1874;MONGOLIAN LETTER MANCHU KA;Lo;0;L;;;;;N;;;;;
+1875;MONGOLIAN LETTER MANCHU RA;Lo;0;L;;;;;N;;;;;
+1876;MONGOLIAN LETTER MANCHU FA;Lo;0;L;;;;;N;;;;;
+1877;MONGOLIAN LETTER MANCHU ZHA;Lo;0;L;;;;;N;;;;;
+1880;MONGOLIAN LETTER ALI GALI ANUSVARA ONE;Lo;0;L;;;;;N;;;;;
+1881;MONGOLIAN LETTER ALI GALI VISARGA ONE;Lo;0;L;;;;;N;;;;;
+1882;MONGOLIAN LETTER ALI GALI DAMARU;Lo;0;L;;;;;N;;;;;
+1883;MONGOLIAN LETTER ALI GALI UBADAMA;Lo;0;L;;;;;N;;;;;
+1884;MONGOLIAN LETTER ALI GALI INVERTED UBADAMA;Lo;0;L;;;;;N;;;;;
+1885;MONGOLIAN LETTER ALI GALI BALUDA;Lo;0;L;;;;;N;;;;;
+1886;MONGOLIAN LETTER ALI GALI THREE BALUDA;Lo;0;L;;;;;N;;;;;
+1887;MONGOLIAN LETTER ALI GALI A;Lo;0;L;;;;;N;;;;;
+1888;MONGOLIAN LETTER ALI GALI I;Lo;0;L;;;;;N;;;;;
+1889;MONGOLIAN LETTER ALI GALI KA;Lo;0;L;;;;;N;;;;;
+188A;MONGOLIAN LETTER ALI GALI NGA;Lo;0;L;;;;;N;;;;;
+188B;MONGOLIAN LETTER ALI GALI CA;Lo;0;L;;;;;N;;;;;
+188C;MONGOLIAN LETTER ALI GALI TTA;Lo;0;L;;;;;N;;;;;
+188D;MONGOLIAN LETTER ALI GALI TTHA;Lo;0;L;;;;;N;;;;;
+188E;MONGOLIAN LETTER ALI GALI DDA;Lo;0;L;;;;;N;;;;;
+188F;MONGOLIAN LETTER ALI GALI NNA;Lo;0;L;;;;;N;;;;;
+1890;MONGOLIAN LETTER ALI GALI TA;Lo;0;L;;;;;N;;;;;
+1891;MONGOLIAN LETTER ALI GALI DA;Lo;0;L;;;;;N;;;;;
+1892;MONGOLIAN LETTER ALI GALI PA;Lo;0;L;;;;;N;;;;;
+1893;MONGOLIAN LETTER ALI GALI PHA;Lo;0;L;;;;;N;;;;;
+1894;MONGOLIAN LETTER ALI GALI SSA;Lo;0;L;;;;;N;;;;;
+1895;MONGOLIAN LETTER ALI GALI ZHA;Lo;0;L;;;;;N;;;;;
+1896;MONGOLIAN LETTER ALI GALI ZA;Lo;0;L;;;;;N;;;;;
+1897;MONGOLIAN LETTER ALI GALI AH;Lo;0;L;;;;;N;;;;;
+1898;MONGOLIAN LETTER TODO ALI GALI TA;Lo;0;L;;;;;N;;;;;
+1899;MONGOLIAN LETTER TODO ALI GALI ZHA;Lo;0;L;;;;;N;;;;;
+189A;MONGOLIAN LETTER MANCHU ALI GALI GHA;Lo;0;L;;;;;N;;;;;
+189B;MONGOLIAN LETTER MANCHU ALI GALI NGA;Lo;0;L;;;;;N;;;;;
+189C;MONGOLIAN LETTER MANCHU ALI GALI CA;Lo;0;L;;;;;N;;;;;
+189D;MONGOLIAN LETTER MANCHU ALI GALI JHA;Lo;0;L;;;;;N;;;;;
+189E;MONGOLIAN LETTER MANCHU ALI GALI TTA;Lo;0;L;;;;;N;;;;;
+189F;MONGOLIAN LETTER MANCHU ALI GALI DDHA;Lo;0;L;;;;;N;;;;;
+18A0;MONGOLIAN LETTER MANCHU ALI GALI TA;Lo;0;L;;;;;N;;;;;
+18A1;MONGOLIAN LETTER MANCHU ALI GALI DHA;Lo;0;L;;;;;N;;;;;
+18A2;MONGOLIAN LETTER MANCHU ALI GALI SSA;Lo;0;L;;;;;N;;;;;
+18A3;MONGOLIAN LETTER MANCHU ALI GALI CYA;Lo;0;L;;;;;N;;;;;
+18A4;MONGOLIAN LETTER MANCHU ALI GALI ZHA;Lo;0;L;;;;;N;;;;;
+18A5;MONGOLIAN LETTER MANCHU ALI GALI ZA;Lo;0;L;;;;;N;;;;;
+18A6;MONGOLIAN LETTER ALI GALI HALF U;Lo;0;L;;;;;N;;;;;
+18A7;MONGOLIAN LETTER ALI GALI HALF YA;Lo;0;L;;;;;N;;;;;
+18A8;MONGOLIAN LETTER MANCHU ALI GALI BHA;Lo;0;L;;;;;N;;;;;
+18A9;MONGOLIAN LETTER ALI GALI DAGALGA;Mn;228;NSM;;;;;N;;;;;
+18AA;MONGOLIAN LETTER MANCHU ALI GALI LHA;Lo;0;L;;;;;N;;;;;
+1900;LIMBU VOWEL-CARRIER LETTER;Lo;0;L;;;;;N;;;;;
+1901;LIMBU LETTER KA;Lo;0;L;;;;;N;;;;;
+1902;LIMBU LETTER KHA;Lo;0;L;;;;;N;;;;;
+1903;LIMBU LETTER GA;Lo;0;L;;;;;N;;;;;
+1904;LIMBU LETTER GHA;Lo;0;L;;;;;N;;;;;
+1905;LIMBU LETTER NGA;Lo;0;L;;;;;N;;;;;
+1906;LIMBU LETTER CA;Lo;0;L;;;;;N;;;;;
+1907;LIMBU LETTER CHA;Lo;0;L;;;;;N;;;;;
+1908;LIMBU LETTER JA;Lo;0;L;;;;;N;;;;;
+1909;LIMBU LETTER JHA;Lo;0;L;;;;;N;;;;;
+190A;LIMBU LETTER YAN;Lo;0;L;;;;;N;;;;;
+190B;LIMBU LETTER TA;Lo;0;L;;;;;N;;;;;
+190C;LIMBU LETTER THA;Lo;0;L;;;;;N;;;;;
+190D;LIMBU LETTER DA;Lo;0;L;;;;;N;;;;;
+190E;LIMBU LETTER DHA;Lo;0;L;;;;;N;;;;;
+190F;LIMBU LETTER NA;Lo;0;L;;;;;N;;;;;
+1910;LIMBU LETTER PA;Lo;0;L;;;;;N;;;;;
+1911;LIMBU LETTER PHA;Lo;0;L;;;;;N;;;;;
+1912;LIMBU LETTER BA;Lo;0;L;;;;;N;;;;;
+1913;LIMBU LETTER BHA;Lo;0;L;;;;;N;;;;;
+1914;LIMBU LETTER MA;Lo;0;L;;;;;N;;;;;
+1915;LIMBU LETTER YA;Lo;0;L;;;;;N;;;;;
+1916;LIMBU LETTER RA;Lo;0;L;;;;;N;;;;;
+1917;LIMBU LETTER LA;Lo;0;L;;;;;N;;;;;
+1918;LIMBU LETTER WA;Lo;0;L;;;;;N;;;;;
+1919;LIMBU LETTER SHA;Lo;0;L;;;;;N;;;;;
+191A;LIMBU LETTER SSA;Lo;0;L;;;;;N;;;;;
+191B;LIMBU LETTER SA;Lo;0;L;;;;;N;;;;;
+191C;LIMBU LETTER HA;Lo;0;L;;;;;N;;;;;
+1920;LIMBU VOWEL SIGN A;Mn;0;NSM;;;;;N;;;;;
+1921;LIMBU VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1922;LIMBU VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1923;LIMBU VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
+1924;LIMBU VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+1925;LIMBU VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+1926;LIMBU VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+1927;LIMBU VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+1928;LIMBU VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+1929;LIMBU SUBJOINED LETTER YA;Mc;0;L;;;;;N;;;;;
+192A;LIMBU SUBJOINED LETTER RA;Mc;0;L;;;;;N;;;;;
+192B;LIMBU SUBJOINED LETTER WA;Mc;0;L;;;;;N;;;;;
+1930;LIMBU SMALL LETTER KA;Mc;0;L;;;;;N;;;;;
+1931;LIMBU SMALL LETTER NGA;Mc;0;L;;;;;N;;;;;
+1932;LIMBU SMALL LETTER ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+1933;LIMBU SMALL LETTER TA;Mc;0;L;;;;;N;;;;;
+1934;LIMBU SMALL LETTER NA;Mc;0;L;;;;;N;;;;;
+1935;LIMBU SMALL LETTER PA;Mc;0;L;;;;;N;;;;;
+1936;LIMBU SMALL LETTER MA;Mc;0;L;;;;;N;;;;;
+1937;LIMBU SMALL LETTER RA;Mc;0;L;;;;;N;;;;;
+1938;LIMBU SMALL LETTER LA;Mc;0;L;;;;;N;;;;;
+1939;LIMBU SIGN MUKPHRENG;Mn;222;NSM;;;;;N;;;;;
+193A;LIMBU SIGN KEMPHRENG;Mn;230;NSM;;;;;N;;;;;
+193B;LIMBU SIGN SA-I;Mn;220;NSM;;;;;N;;;;;
+1940;LIMBU SIGN LOO;So;0;ON;;;;;N;;;;;
+1944;LIMBU EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
+1945;LIMBU QUESTION MARK;Po;0;ON;;;;;N;;;;;
+1946;LIMBU DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1947;LIMBU DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1948;LIMBU DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1949;LIMBU DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+194A;LIMBU DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+194B;LIMBU DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+194C;LIMBU DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+194D;LIMBU DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+194E;LIMBU DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+194F;LIMBU DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1950;TAI LE LETTER KA;Lo;0;L;;;;;N;;;;;
+1951;TAI LE LETTER XA;Lo;0;L;;;;;N;;;;;
+1952;TAI LE LETTER NGA;Lo;0;L;;;;;N;;;;;
+1953;TAI LE LETTER TSA;Lo;0;L;;;;;N;;;;;
+1954;TAI LE LETTER SA;Lo;0;L;;;;;N;;;;;
+1955;TAI LE LETTER YA;Lo;0;L;;;;;N;;;;;
+1956;TAI LE LETTER TA;Lo;0;L;;;;;N;;;;;
+1957;TAI LE LETTER THA;Lo;0;L;;;;;N;;;;;
+1958;TAI LE LETTER LA;Lo;0;L;;;;;N;;;;;
+1959;TAI LE LETTER PA;Lo;0;L;;;;;N;;;;;
+195A;TAI LE LETTER PHA;Lo;0;L;;;;;N;;;;;
+195B;TAI LE LETTER MA;Lo;0;L;;;;;N;;;;;
+195C;TAI LE LETTER FA;Lo;0;L;;;;;N;;;;;
+195D;TAI LE LETTER VA;Lo;0;L;;;;;N;;;;;
+195E;TAI LE LETTER HA;Lo;0;L;;;;;N;;;;;
+195F;TAI LE LETTER QA;Lo;0;L;;;;;N;;;;;
+1960;TAI LE LETTER KHA;Lo;0;L;;;;;N;;;;;
+1961;TAI LE LETTER TSHA;Lo;0;L;;;;;N;;;;;
+1962;TAI LE LETTER NA;Lo;0;L;;;;;N;;;;;
+1963;TAI LE LETTER A;Lo;0;L;;;;;N;;;;;
+1964;TAI LE LETTER I;Lo;0;L;;;;;N;;;;;
+1965;TAI LE LETTER EE;Lo;0;L;;;;;N;;;;;
+1966;TAI LE LETTER EH;Lo;0;L;;;;;N;;;;;
+1967;TAI LE LETTER U;Lo;0;L;;;;;N;;;;;
+1968;TAI LE LETTER OO;Lo;0;L;;;;;N;;;;;
+1969;TAI LE LETTER O;Lo;0;L;;;;;N;;;;;
+196A;TAI LE LETTER UE;Lo;0;L;;;;;N;;;;;
+196B;TAI LE LETTER E;Lo;0;L;;;;;N;;;;;
+196C;TAI LE LETTER AUE;Lo;0;L;;;;;N;;;;;
+196D;TAI LE LETTER AI;Lo;0;L;;;;;N;;;;;
+1970;TAI LE LETTER TONE-2;Lo;0;L;;;;;N;;;;;
+1971;TAI LE LETTER TONE-3;Lo;0;L;;;;;N;;;;;
+1972;TAI LE LETTER TONE-4;Lo;0;L;;;;;N;;;;;
+1973;TAI LE LETTER TONE-5;Lo;0;L;;;;;N;;;;;
+1974;TAI LE LETTER TONE-6;Lo;0;L;;;;;N;;;;;
+1980;NEW TAI LUE LETTER HIGH QA;Lo;0;L;;;;;N;;;;;
+1981;NEW TAI LUE LETTER LOW QA;Lo;0;L;;;;;N;;;;;
+1982;NEW TAI LUE LETTER HIGH KA;Lo;0;L;;;;;N;;;;;
+1983;NEW TAI LUE LETTER HIGH XA;Lo;0;L;;;;;N;;;;;
+1984;NEW TAI LUE LETTER HIGH NGA;Lo;0;L;;;;;N;;;;;
+1985;NEW TAI LUE LETTER LOW KA;Lo;0;L;;;;;N;;;;;
+1986;NEW TAI LUE LETTER LOW XA;Lo;0;L;;;;;N;;;;;
+1987;NEW TAI LUE LETTER LOW NGA;Lo;0;L;;;;;N;;;;;
+1988;NEW TAI LUE LETTER HIGH TSA;Lo;0;L;;;;;N;;;;;
+1989;NEW TAI LUE LETTER HIGH SA;Lo;0;L;;;;;N;;;;;
+198A;NEW TAI LUE LETTER HIGH YA;Lo;0;L;;;;;N;;;;;
+198B;NEW TAI LUE LETTER LOW TSA;Lo;0;L;;;;;N;;;;;
+198C;NEW TAI LUE LETTER LOW SA;Lo;0;L;;;;;N;;;;;
+198D;NEW TAI LUE LETTER LOW YA;Lo;0;L;;;;;N;;;;;
+198E;NEW TAI LUE LETTER HIGH TA;Lo;0;L;;;;;N;;;;;
+198F;NEW TAI LUE LETTER HIGH THA;Lo;0;L;;;;;N;;;;;
+1990;NEW TAI LUE LETTER HIGH NA;Lo;0;L;;;;;N;;;;;
+1991;NEW TAI LUE LETTER LOW TA;Lo;0;L;;;;;N;;;;;
+1992;NEW TAI LUE LETTER LOW THA;Lo;0;L;;;;;N;;;;;
+1993;NEW TAI LUE LETTER LOW NA;Lo;0;L;;;;;N;;;;;
+1994;NEW TAI LUE LETTER HIGH PA;Lo;0;L;;;;;N;;;;;
+1995;NEW TAI LUE LETTER HIGH PHA;Lo;0;L;;;;;N;;;;;
+1996;NEW TAI LUE LETTER HIGH MA;Lo;0;L;;;;;N;;;;;
+1997;NEW TAI LUE LETTER LOW PA;Lo;0;L;;;;;N;;;;;
+1998;NEW TAI LUE LETTER LOW PHA;Lo;0;L;;;;;N;;;;;
+1999;NEW TAI LUE LETTER LOW MA;Lo;0;L;;;;;N;;;;;
+199A;NEW TAI LUE LETTER HIGH FA;Lo;0;L;;;;;N;;;;;
+199B;NEW TAI LUE LETTER HIGH VA;Lo;0;L;;;;;N;;;;;
+199C;NEW TAI LUE LETTER HIGH LA;Lo;0;L;;;;;N;;;;;
+199D;NEW TAI LUE LETTER LOW FA;Lo;0;L;;;;;N;;;;;
+199E;NEW TAI LUE LETTER LOW VA;Lo;0;L;;;;;N;;;;;
+199F;NEW TAI LUE LETTER LOW LA;Lo;0;L;;;;;N;;;;;
+19A0;NEW TAI LUE LETTER HIGH HA;Lo;0;L;;;;;N;;;;;
+19A1;NEW TAI LUE LETTER HIGH DA;Lo;0;L;;;;;N;;;;;
+19A2;NEW TAI LUE LETTER HIGH BA;Lo;0;L;;;;;N;;;;;
+19A3;NEW TAI LUE LETTER LOW HA;Lo;0;L;;;;;N;;;;;
+19A4;NEW TAI LUE LETTER LOW DA;Lo;0;L;;;;;N;;;;;
+19A5;NEW TAI LUE LETTER LOW BA;Lo;0;L;;;;;N;;;;;
+19A6;NEW TAI LUE LETTER HIGH KVA;Lo;0;L;;;;;N;;;;;
+19A7;NEW TAI LUE LETTER HIGH XVA;Lo;0;L;;;;;N;;;;;
+19A8;NEW TAI LUE LETTER LOW KVA;Lo;0;L;;;;;N;;;;;
+19A9;NEW TAI LUE LETTER LOW XVA;Lo;0;L;;;;;N;;;;;
+19B0;NEW TAI LUE VOWEL SIGN VOWEL SHORTENER;Mc;0;L;;;;;N;;;;;
+19B1;NEW TAI LUE VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+19B2;NEW TAI LUE VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+19B3;NEW TAI LUE VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+19B4;NEW TAI LUE VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+19B5;NEW TAI LUE VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+19B6;NEW TAI LUE VOWEL SIGN AE;Mc;0;L;;;;;N;;;;;
+19B7;NEW TAI LUE VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+19B8;NEW TAI LUE VOWEL SIGN OA;Mc;0;L;;;;;N;;;;;
+19B9;NEW TAI LUE VOWEL SIGN UE;Mc;0;L;;;;;N;;;;;
+19BA;NEW TAI LUE VOWEL SIGN AY;Mc;0;L;;;;;N;;;;;
+19BB;NEW TAI LUE VOWEL SIGN AAY;Mc;0;L;;;;;N;;;;;
+19BC;NEW TAI LUE VOWEL SIGN UY;Mc;0;L;;;;;N;;;;;
+19BD;NEW TAI LUE VOWEL SIGN OY;Mc;0;L;;;;;N;;;;;
+19BE;NEW TAI LUE VOWEL SIGN OAY;Mc;0;L;;;;;N;;;;;
+19BF;NEW TAI LUE VOWEL SIGN UEY;Mc;0;L;;;;;N;;;;;
+19C0;NEW TAI LUE VOWEL SIGN IY;Mc;0;L;;;;;N;;;;;
+19C1;NEW TAI LUE LETTER FINAL V;Lo;0;L;;;;;N;;;;;
+19C2;NEW TAI LUE LETTER FINAL NG;Lo;0;L;;;;;N;;;;;
+19C3;NEW TAI LUE LETTER FINAL N;Lo;0;L;;;;;N;;;;;
+19C4;NEW TAI LUE LETTER FINAL M;Lo;0;L;;;;;N;;;;;
+19C5;NEW TAI LUE LETTER FINAL K;Lo;0;L;;;;;N;;;;;
+19C6;NEW TAI LUE LETTER FINAL D;Lo;0;L;;;;;N;;;;;
+19C7;NEW TAI LUE LETTER FINAL B;Lo;0;L;;;;;N;;;;;
+19C8;NEW TAI LUE TONE MARK-1;Mc;0;L;;;;;N;;;;;
+19C9;NEW TAI LUE TONE MARK-2;Mc;0;L;;;;;N;;;;;
+19D0;NEW TAI LUE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+19D1;NEW TAI LUE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+19D2;NEW TAI LUE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+19D3;NEW TAI LUE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+19D4;NEW TAI LUE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+19D5;NEW TAI LUE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+19D6;NEW TAI LUE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+19D7;NEW TAI LUE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+19D8;NEW TAI LUE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+19D9;NEW TAI LUE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+19DE;NEW TAI LUE SIGN LAE;Po;0;ON;;;;;N;;;;;
+19DF;NEW TAI LUE SIGN LAEV;Po;0;ON;;;;;N;;;;;
+19E0;KHMER SYMBOL PATHAMASAT;So;0;ON;;;;;N;;;;;
+19E1;KHMER SYMBOL MUOY KOET;So;0;ON;;;;;N;;;;;
+19E2;KHMER SYMBOL PII KOET;So;0;ON;;;;;N;;;;;
+19E3;KHMER SYMBOL BEI KOET;So;0;ON;;;;;N;;;;;
+19E4;KHMER SYMBOL BUON KOET;So;0;ON;;;;;N;;;;;
+19E5;KHMER SYMBOL PRAM KOET;So;0;ON;;;;;N;;;;;
+19E6;KHMER SYMBOL PRAM-MUOY KOET;So;0;ON;;;;;N;;;;;
+19E7;KHMER SYMBOL PRAM-PII KOET;So;0;ON;;;;;N;;;;;
+19E8;KHMER SYMBOL PRAM-BEI KOET;So;0;ON;;;;;N;;;;;
+19E9;KHMER SYMBOL PRAM-BUON KOET;So;0;ON;;;;;N;;;;;
+19EA;KHMER SYMBOL DAP KOET;So;0;ON;;;;;N;;;;;
+19EB;KHMER SYMBOL DAP-MUOY KOET;So;0;ON;;;;;N;;;;;
+19EC;KHMER SYMBOL DAP-PII KOET;So;0;ON;;;;;N;;;;;
+19ED;KHMER SYMBOL DAP-BEI KOET;So;0;ON;;;;;N;;;;;
+19EE;KHMER SYMBOL DAP-BUON KOET;So;0;ON;;;;;N;;;;;
+19EF;KHMER SYMBOL DAP-PRAM KOET;So;0;ON;;;;;N;;;;;
+19F0;KHMER SYMBOL TUTEYASAT;So;0;ON;;;;;N;;;;;
+19F1;KHMER SYMBOL MUOY ROC;So;0;ON;;;;;N;;;;;
+19F2;KHMER SYMBOL PII ROC;So;0;ON;;;;;N;;;;;
+19F3;KHMER SYMBOL BEI ROC;So;0;ON;;;;;N;;;;;
+19F4;KHMER SYMBOL BUON ROC;So;0;ON;;;;;N;;;;;
+19F5;KHMER SYMBOL PRAM ROC;So;0;ON;;;;;N;;;;;
+19F6;KHMER SYMBOL PRAM-MUOY ROC;So;0;ON;;;;;N;;;;;
+19F7;KHMER SYMBOL PRAM-PII ROC;So;0;ON;;;;;N;;;;;
+19F8;KHMER SYMBOL PRAM-BEI ROC;So;0;ON;;;;;N;;;;;
+19F9;KHMER SYMBOL PRAM-BUON ROC;So;0;ON;;;;;N;;;;;
+19FA;KHMER SYMBOL DAP ROC;So;0;ON;;;;;N;;;;;
+19FB;KHMER SYMBOL DAP-MUOY ROC;So;0;ON;;;;;N;;;;;
+19FC;KHMER SYMBOL DAP-PII ROC;So;0;ON;;;;;N;;;;;
+19FD;KHMER SYMBOL DAP-BEI ROC;So;0;ON;;;;;N;;;;;
+19FE;KHMER SYMBOL DAP-BUON ROC;So;0;ON;;;;;N;;;;;
+19FF;KHMER SYMBOL DAP-PRAM ROC;So;0;ON;;;;;N;;;;;
+1A00;BUGINESE LETTER KA;Lo;0;L;;;;;N;;;;;
+1A01;BUGINESE LETTER GA;Lo;0;L;;;;;N;;;;;
+1A02;BUGINESE LETTER NGA;Lo;0;L;;;;;N;;;;;
+1A03;BUGINESE LETTER NGKA;Lo;0;L;;;;;N;;;;;
+1A04;BUGINESE LETTER PA;Lo;0;L;;;;;N;;;;;
+1A05;BUGINESE LETTER BA;Lo;0;L;;;;;N;;;;;
+1A06;BUGINESE LETTER MA;Lo;0;L;;;;;N;;;;;
+1A07;BUGINESE LETTER MPA;Lo;0;L;;;;;N;;;;;
+1A08;BUGINESE LETTER TA;Lo;0;L;;;;;N;;;;;
+1A09;BUGINESE LETTER DA;Lo;0;L;;;;;N;;;;;
+1A0A;BUGINESE LETTER NA;Lo;0;L;;;;;N;;;;;
+1A0B;BUGINESE LETTER NRA;Lo;0;L;;;;;N;;;;;
+1A0C;BUGINESE LETTER CA;Lo;0;L;;;;;N;;;;;
+1A0D;BUGINESE LETTER JA;Lo;0;L;;;;;N;;;;;
+1A0E;BUGINESE LETTER NYA;Lo;0;L;;;;;N;;;;;
+1A0F;BUGINESE LETTER NYCA;Lo;0;L;;;;;N;;;;;
+1A10;BUGINESE LETTER YA;Lo;0;L;;;;;N;;;;;
+1A11;BUGINESE LETTER RA;Lo;0;L;;;;;N;;;;;
+1A12;BUGINESE LETTER LA;Lo;0;L;;;;;N;;;;;
+1A13;BUGINESE LETTER VA;Lo;0;L;;;;;N;;;;;
+1A14;BUGINESE LETTER SA;Lo;0;L;;;;;N;;;;;
+1A15;BUGINESE LETTER A;Lo;0;L;;;;;N;;;;;
+1A16;BUGINESE LETTER HA;Lo;0;L;;;;;N;;;;;
+1A17;BUGINESE VOWEL SIGN I;Mn;230;NSM;;;;;N;;;;;
+1A18;BUGINESE VOWEL SIGN U;Mn;220;NSM;;;;;N;;;;;
+1A19;BUGINESE VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+1A1A;BUGINESE VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+1A1B;BUGINESE VOWEL SIGN AE;Mc;0;L;;;;;N;;;;;
+1A1E;BUGINESE PALLAWA;Po;0;L;;;;;N;;;;;
+1A1F;BUGINESE END OF SECTION;Po;0;L;;;;;N;;;;;
+1B00;BALINESE SIGN ULU RICEM;Mn;0;NSM;;;;;N;;ardhacandra;;;
+1B01;BALINESE SIGN ULU CANDRA;Mn;0;NSM;;;;;N;;candrabindu;;;
+1B02;BALINESE SIGN CECEK;Mn;0;NSM;;;;;N;;anusvara;;;
+1B03;BALINESE SIGN SURANG;Mn;0;NSM;;;;;N;;repha;;;
+1B04;BALINESE SIGN BISAH;Mc;0;L;;;;;N;;visarga;;;
+1B05;BALINESE LETTER AKARA;Lo;0;L;;;;;N;;a;;;
+1B06;BALINESE LETTER AKARA TEDUNG;Lo;0;L;1B05 1B35;;;;N;;aa;;;
+1B07;BALINESE LETTER IKARA;Lo;0;L;;;;;N;;i;;;
+1B08;BALINESE LETTER IKARA TEDUNG;Lo;0;L;1B07 1B35;;;;N;;ii;;;
+1B09;BALINESE LETTER UKARA;Lo;0;L;;;;;N;;u;;;
+1B0A;BALINESE LETTER UKARA TEDUNG;Lo;0;L;1B09 1B35;;;;N;;uu;;;
+1B0B;BALINESE LETTER RA REPA;Lo;0;L;;;;;N;;vocalic r;;;
+1B0C;BALINESE LETTER RA REPA TEDUNG;Lo;0;L;1B0B 1B35;;;;N;;vocalic rr;;;
+1B0D;BALINESE LETTER LA LENGA;Lo;0;L;;;;;N;;vocalic l;;;
+1B0E;BALINESE LETTER LA LENGA TEDUNG;Lo;0;L;1B0D 1B35;;;;N;;vocalic ll;;;
+1B0F;BALINESE LETTER EKARA;Lo;0;L;;;;;N;;e;;;
+1B10;BALINESE LETTER AIKARA;Lo;0;L;;;;;N;;ai;;;
+1B11;BALINESE LETTER OKARA;Lo;0;L;;;;;N;;o;;;
+1B12;BALINESE LETTER OKARA TEDUNG;Lo;0;L;1B11 1B35;;;;N;;au;;;
+1B13;BALINESE LETTER KA;Lo;0;L;;;;;N;;;;;
+1B14;BALINESE LETTER KA MAHAPRANA;Lo;0;L;;;;;N;;kha;;;
+1B15;BALINESE LETTER GA;Lo;0;L;;;;;N;;;;;
+1B16;BALINESE LETTER GA GORA;Lo;0;L;;;;;N;;gha;;;
+1B17;BALINESE LETTER NGA;Lo;0;L;;;;;N;;;;;
+1B18;BALINESE LETTER CA;Lo;0;L;;;;;N;;;;;
+1B19;BALINESE LETTER CA LACA;Lo;0;L;;;;;N;;cha;;;
+1B1A;BALINESE LETTER JA;Lo;0;L;;;;;N;;;;;
+1B1B;BALINESE LETTER JA JERA;Lo;0;L;;;;;N;;jha;;;
+1B1C;BALINESE LETTER NYA;Lo;0;L;;;;;N;;;;;
+1B1D;BALINESE LETTER TA LATIK;Lo;0;L;;;;;N;;tta;;;
+1B1E;BALINESE LETTER TA MURDA MAHAPRANA;Lo;0;L;;;;;N;;ttha;;;
+1B1F;BALINESE LETTER DA MURDA ALPAPRANA;Lo;0;L;;;;;N;;dda;;;
+1B20;BALINESE LETTER DA MURDA MAHAPRANA;Lo;0;L;;;;;N;;ddha;;;
+1B21;BALINESE LETTER NA RAMBAT;Lo;0;L;;;;;N;;nna;;;
+1B22;BALINESE LETTER TA;Lo;0;L;;;;;N;;;;;
+1B23;BALINESE LETTER TA TAWA;Lo;0;L;;;;;N;;tha;;;
+1B24;BALINESE LETTER DA;Lo;0;L;;;;;N;;;;;
+1B25;BALINESE LETTER DA MADU;Lo;0;L;;;;;N;;dha;;;
+1B26;BALINESE LETTER NA;Lo;0;L;;;;;N;;;;;
+1B27;BALINESE LETTER PA;Lo;0;L;;;;;N;;;;;
+1B28;BALINESE LETTER PA KAPAL;Lo;0;L;;;;;N;;pha;;;
+1B29;BALINESE LETTER BA;Lo;0;L;;;;;N;;;;;
+1B2A;BALINESE LETTER BA KEMBANG;Lo;0;L;;;;;N;;bha;;;
+1B2B;BALINESE LETTER MA;Lo;0;L;;;;;N;;;;;
+1B2C;BALINESE LETTER YA;Lo;0;L;;;;;N;;;;;
+1B2D;BALINESE LETTER RA;Lo;0;L;;;;;N;;;;;
+1B2E;BALINESE LETTER LA;Lo;0;L;;;;;N;;;;;
+1B2F;BALINESE LETTER WA;Lo;0;L;;;;;N;;;;;
+1B30;BALINESE LETTER SA SAGA;Lo;0;L;;;;;N;;sha;;;
+1B31;BALINESE LETTER SA SAPA;Lo;0;L;;;;;N;;ssa;;;
+1B32;BALINESE LETTER SA;Lo;0;L;;;;;N;;;;;
+1B33;BALINESE LETTER HA;Lo;0;L;;;;;N;;;;;
+1B34;BALINESE SIGN REREKAN;Mn;7;NSM;;;;;N;;nukta;;;
+1B35;BALINESE VOWEL SIGN TEDUNG;Mc;0;L;;;;;N;;aa;;;
+1B36;BALINESE VOWEL SIGN ULU;Mn;0;NSM;;;;;N;;i;;;
+1B37;BALINESE VOWEL SIGN ULU SARI;Mn;0;NSM;;;;;N;;ii;;;
+1B38;BALINESE VOWEL SIGN SUKU;Mn;0;NSM;;;;;N;;u;;;
+1B39;BALINESE VOWEL SIGN SUKU ILUT;Mn;0;NSM;;;;;N;;uu;;;
+1B3A;BALINESE VOWEL SIGN RA REPA;Mn;0;NSM;;;;;N;;vocalic r;;;
+1B3B;BALINESE VOWEL SIGN RA REPA TEDUNG;Mc;0;L;1B3A 1B35;;;;N;;vocalic rr;;;
+1B3C;BALINESE VOWEL SIGN LA LENGA;Mn;0;NSM;;;;;N;;vocalic l;;;
+1B3D;BALINESE VOWEL SIGN LA LENGA TEDUNG;Mc;0;L;1B3C 1B35;;;;N;;vocalic ll;;;
+1B3E;BALINESE VOWEL SIGN TALING;Mc;0;L;;;;;N;;e;;;
+1B3F;BALINESE VOWEL SIGN TALING REPA;Mc;0;L;;;;;N;;ai;;;
+1B40;BALINESE VOWEL SIGN TALING TEDUNG;Mc;0;L;1B3E 1B35;;;;N;;o;;;
+1B41;BALINESE VOWEL SIGN TALING REPA TEDUNG;Mc;0;L;1B3F 1B35;;;;N;;au;;;
+1B42;BALINESE VOWEL SIGN PEPET;Mn;0;NSM;;;;;N;;ae;;;
+1B43;BALINESE VOWEL SIGN PEPET TEDUNG;Mc;0;L;1B42 1B35;;;;N;;oe;;;
+1B44;BALINESE ADEG ADEG;Mc;9;L;;;;;N;;virama;;;
+1B45;BALINESE LETTER KAF SASAK;Lo;0;L;;;;;N;;;;;
+1B46;BALINESE LETTER KHOT SASAK;Lo;0;L;;;;;N;;;;;
+1B47;BALINESE LETTER TZIR SASAK;Lo;0;L;;;;;N;;;;;
+1B48;BALINESE LETTER EF SASAK;Lo;0;L;;;;;N;;;;;
+1B49;BALINESE LETTER VE SASAK;Lo;0;L;;;;;N;;;;;
+1B4A;BALINESE LETTER ZAL SASAK;Lo;0;L;;;;;N;;;;;
+1B4B;BALINESE LETTER ASYURA SASAK;Lo;0;L;;;;;N;;;;;
+1B50;BALINESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1B51;BALINESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1B52;BALINESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1B53;BALINESE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1B54;BALINESE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1B55;BALINESE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1B56;BALINESE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1B57;BALINESE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1B58;BALINESE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1B59;BALINESE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1B5A;BALINESE PANTI;Po;0;L;;;;;N;;section;;;
+1B5B;BALINESE PAMADA;Po;0;L;;;;;N;;honorific section;;;
+1B5C;BALINESE WINDU;Po;0;L;;;;;N;;punctuation ring;;;
+1B5D;BALINESE CARIK PAMUNGKAH;Po;0;L;;;;;N;;colon;;;
+1B5E;BALINESE CARIK SIKI;Po;0;L;;;;;N;;danda;;;
+1B5F;BALINESE CARIK PAREREN;Po;0;L;;;;;N;;double danda;;;
+1B60;BALINESE PAMENENG;Po;0;L;;;;;N;;line-breaking hyphen;;;
+1B61;BALINESE MUSICAL SYMBOL DONG;So;0;L;;;;;N;;;;;
+1B62;BALINESE MUSICAL SYMBOL DENG;So;0;L;;;;;N;;;;;
+1B63;BALINESE MUSICAL SYMBOL DUNG;So;0;L;;;;;N;;;;;
+1B64;BALINESE MUSICAL SYMBOL DANG;So;0;L;;;;;N;;;;;
+1B65;BALINESE MUSICAL SYMBOL DANG SURANG;So;0;L;;;;;N;;;;;
+1B66;BALINESE MUSICAL SYMBOL DING;So;0;L;;;;;N;;;;;
+1B67;BALINESE MUSICAL SYMBOL DAENG;So;0;L;;;;;N;;;;;
+1B68;BALINESE MUSICAL SYMBOL DEUNG;So;0;L;;;;;N;;;;;
+1B69;BALINESE MUSICAL SYMBOL DAING;So;0;L;;;;;N;;;;;
+1B6A;BALINESE MUSICAL SYMBOL DANG GEDE;So;0;L;;;;;N;;;;;
+1B6B;BALINESE MUSICAL SYMBOL COMBINING TEGEH;Mn;230;NSM;;;;;N;;;;;
+1B6C;BALINESE MUSICAL SYMBOL COMBINING ENDEP;Mn;220;NSM;;;;;N;;;;;
+1B6D;BALINESE MUSICAL SYMBOL COMBINING KEMPUL;Mn;230;NSM;;;;;N;;;;;
+1B6E;BALINESE MUSICAL SYMBOL COMBINING KEMPLI;Mn;230;NSM;;;;;N;;;;;
+1B6F;BALINESE MUSICAL SYMBOL COMBINING JEGOGAN;Mn;230;NSM;;;;;N;;;;;
+1B70;BALINESE MUSICAL SYMBOL COMBINING KEMPUL WITH JEGOGAN;Mn;230;NSM;;;;;N;;;;;
+1B71;BALINESE MUSICAL SYMBOL COMBINING KEMPLI WITH JEGOGAN;Mn;230;NSM;;;;;N;;;;;
+1B72;BALINESE MUSICAL SYMBOL COMBINING BENDE;Mn;230;NSM;;;;;N;;;;;
+1B73;BALINESE MUSICAL SYMBOL COMBINING GONG;Mn;230;NSM;;;;;N;;;;;
+1B74;BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DUG;So;0;L;;;;;N;;;;;
+1B75;BALINESE MUSICAL SYMBOL RIGHT-HAND OPEN DAG;So;0;L;;;;;N;;;;;
+1B76;BALINESE MUSICAL SYMBOL RIGHT-HAND CLOSED TUK;So;0;L;;;;;N;;;;;
+1B77;BALINESE MUSICAL SYMBOL RIGHT-HAND CLOSED TAK;So;0;L;;;;;N;;;;;
+1B78;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PANG;So;0;L;;;;;N;;;;;
+1B79;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PUNG;So;0;L;;;;;N;;;;;
+1B7A;BALINESE MUSICAL SYMBOL LEFT-HAND CLOSED PLAK;So;0;L;;;;;N;;;;;
+1B7B;BALINESE MUSICAL SYMBOL LEFT-HAND CLOSED PLUK;So;0;L;;;;;N;;;;;
+1B7C;BALINESE MUSICAL SYMBOL LEFT-HAND OPEN PING;So;0;L;;;;;N;;;;;
+1B80;SUNDANESE SIGN PANYECEK;Mn;0;NSM;;;;;N;;;;;
+1B81;SUNDANESE SIGN PANGLAYAR;Mn;0;NSM;;;;;N;;;;;
+1B82;SUNDANESE SIGN PANGWISAD;Mc;0;L;;;;;N;;;;;
+1B83;SUNDANESE LETTER A;Lo;0;L;;;;;N;;;;;
+1B84;SUNDANESE LETTER I;Lo;0;L;;;;;N;;;;;
+1B85;SUNDANESE LETTER U;Lo;0;L;;;;;N;;;;;
+1B86;SUNDANESE LETTER AE;Lo;0;L;;;;;N;;;;;
+1B87;SUNDANESE LETTER O;Lo;0;L;;;;;N;;;;;
+1B88;SUNDANESE LETTER E;Lo;0;L;;;;;N;;;;;
+1B89;SUNDANESE LETTER EU;Lo;0;L;;;;;N;;;;;
+1B8A;SUNDANESE LETTER KA;Lo;0;L;;;;;N;;;;;
+1B8B;SUNDANESE LETTER QA;Lo;0;L;;;;;N;;;;;
+1B8C;SUNDANESE LETTER GA;Lo;0;L;;;;;N;;;;;
+1B8D;SUNDANESE LETTER NGA;Lo;0;L;;;;;N;;;;;
+1B8E;SUNDANESE LETTER CA;Lo;0;L;;;;;N;;;;;
+1B8F;SUNDANESE LETTER JA;Lo;0;L;;;;;N;;;;;
+1B90;SUNDANESE LETTER ZA;Lo;0;L;;;;;N;;;;;
+1B91;SUNDANESE LETTER NYA;Lo;0;L;;;;;N;;;;;
+1B92;SUNDANESE LETTER TA;Lo;0;L;;;;;N;;;;;
+1B93;SUNDANESE LETTER DA;Lo;0;L;;;;;N;;;;;
+1B94;SUNDANESE LETTER NA;Lo;0;L;;;;;N;;;;;
+1B95;SUNDANESE LETTER PA;Lo;0;L;;;;;N;;;;;
+1B96;SUNDANESE LETTER FA;Lo;0;L;;;;;N;;;;;
+1B97;SUNDANESE LETTER VA;Lo;0;L;;;;;N;;;;;
+1B98;SUNDANESE LETTER BA;Lo;0;L;;;;;N;;;;;
+1B99;SUNDANESE LETTER MA;Lo;0;L;;;;;N;;;;;
+1B9A;SUNDANESE LETTER YA;Lo;0;L;;;;;N;;;;;
+1B9B;SUNDANESE LETTER RA;Lo;0;L;;;;;N;;;;;
+1B9C;SUNDANESE LETTER LA;Lo;0;L;;;;;N;;;;;
+1B9D;SUNDANESE LETTER WA;Lo;0;L;;;;;N;;;;;
+1B9E;SUNDANESE LETTER SA;Lo;0;L;;;;;N;;;;;
+1B9F;SUNDANESE LETTER XA;Lo;0;L;;;;;N;;;;;
+1BA0;SUNDANESE LETTER HA;Lo;0;L;;;;;N;;;;;
+1BA1;SUNDANESE CONSONANT SIGN PAMINGKAL;Mc;0;L;;;;;N;;;;;
+1BA2;SUNDANESE CONSONANT SIGN PANYAKRA;Mn;0;NSM;;;;;N;;;;;
+1BA3;SUNDANESE CONSONANT SIGN PANYIKU;Mn;0;NSM;;;;;N;;;;;
+1BA4;SUNDANESE VOWEL SIGN PANGHULU;Mn;0;NSM;;;;;N;;;;;
+1BA5;SUNDANESE VOWEL SIGN PANYUKU;Mn;0;NSM;;;;;N;;;;;
+1BA6;SUNDANESE VOWEL SIGN PANAELAENG;Mc;0;L;;;;;N;;;;;
+1BA7;SUNDANESE VOWEL SIGN PANOLONG;Mc;0;L;;;;;N;;;;;
+1BA8;SUNDANESE VOWEL SIGN PAMEPET;Mn;0;NSM;;;;;N;;;;;
+1BA9;SUNDANESE VOWEL SIGN PANEULEUNG;Mn;0;NSM;;;;;N;;;;;
+1BAA;SUNDANESE SIGN PAMAAEH;Mc;9;L;;;;;N;;;;;
+1BAE;SUNDANESE LETTER KHA;Lo;0;L;;;;;N;;;;;
+1BAF;SUNDANESE LETTER SYA;Lo;0;L;;;;;N;;;;;
+1BB0;SUNDANESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1BB1;SUNDANESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1BB2;SUNDANESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1BB3;SUNDANESE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1BB4;SUNDANESE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1BB5;SUNDANESE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1BB6;SUNDANESE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1BB7;SUNDANESE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1BB8;SUNDANESE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1BB9;SUNDANESE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1C00;LEPCHA LETTER KA;Lo;0;L;;;;;N;;;;;
+1C01;LEPCHA LETTER KLA;Lo;0;L;;;;;N;;;;;
+1C02;LEPCHA LETTER KHA;Lo;0;L;;;;;N;;;;;
+1C03;LEPCHA LETTER GA;Lo;0;L;;;;;N;;;;;
+1C04;LEPCHA LETTER GLA;Lo;0;L;;;;;N;;;;;
+1C05;LEPCHA LETTER NGA;Lo;0;L;;;;;N;;;;;
+1C06;LEPCHA LETTER CA;Lo;0;L;;;;;N;;;;;
+1C07;LEPCHA LETTER CHA;Lo;0;L;;;;;N;;;;;
+1C08;LEPCHA LETTER JA;Lo;0;L;;;;;N;;;;;
+1C09;LEPCHA LETTER NYA;Lo;0;L;;;;;N;;;;;
+1C0A;LEPCHA LETTER TA;Lo;0;L;;;;;N;;;;;
+1C0B;LEPCHA LETTER THA;Lo;0;L;;;;;N;;;;;
+1C0C;LEPCHA LETTER DA;Lo;0;L;;;;;N;;;;;
+1C0D;LEPCHA LETTER NA;Lo;0;L;;;;;N;;;;;
+1C0E;LEPCHA LETTER PA;Lo;0;L;;;;;N;;;;;
+1C0F;LEPCHA LETTER PLA;Lo;0;L;;;;;N;;;;;
+1C10;LEPCHA LETTER PHA;Lo;0;L;;;;;N;;;;;
+1C11;LEPCHA LETTER FA;Lo;0;L;;;;;N;;;;;
+1C12;LEPCHA LETTER FLA;Lo;0;L;;;;;N;;;;;
+1C13;LEPCHA LETTER BA;Lo;0;L;;;;;N;;;;;
+1C14;LEPCHA LETTER BLA;Lo;0;L;;;;;N;;;;;
+1C15;LEPCHA LETTER MA;Lo;0;L;;;;;N;;;;;
+1C16;LEPCHA LETTER MLA;Lo;0;L;;;;;N;;;;;
+1C17;LEPCHA LETTER TSA;Lo;0;L;;;;;N;;;;;
+1C18;LEPCHA LETTER TSHA;Lo;0;L;;;;;N;;;;;
+1C19;LEPCHA LETTER DZA;Lo;0;L;;;;;N;;;;;
+1C1A;LEPCHA LETTER YA;Lo;0;L;;;;;N;;;;;
+1C1B;LEPCHA LETTER RA;Lo;0;L;;;;;N;;;;;
+1C1C;LEPCHA LETTER LA;Lo;0;L;;;;;N;;;;;
+1C1D;LEPCHA LETTER HA;Lo;0;L;;;;;N;;;;;
+1C1E;LEPCHA LETTER HLA;Lo;0;L;;;;;N;;;;;
+1C1F;LEPCHA LETTER VA;Lo;0;L;;;;;N;;;;;
+1C20;LEPCHA LETTER SA;Lo;0;L;;;;;N;;;;;
+1C21;LEPCHA LETTER SHA;Lo;0;L;;;;;N;;;;;
+1C22;LEPCHA LETTER WA;Lo;0;L;;;;;N;;;;;
+1C23;LEPCHA LETTER A;Lo;0;L;;;;;N;;;;;
+1C24;LEPCHA SUBJOINED LETTER YA;Mc;0;L;;;;;N;;;;;
+1C25;LEPCHA SUBJOINED LETTER RA;Mc;0;L;;;;;N;;;;;
+1C26;LEPCHA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+1C27;LEPCHA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+1C28;LEPCHA VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+1C29;LEPCHA VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+1C2A;LEPCHA VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+1C2B;LEPCHA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+1C2C;LEPCHA VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+1C2D;LEPCHA CONSONANT SIGN K;Mn;0;NSM;;;;;N;;;;;
+1C2E;LEPCHA CONSONANT SIGN M;Mn;0;NSM;;;;;N;;;;;
+1C2F;LEPCHA CONSONANT SIGN L;Mn;0;NSM;;;;;N;;;;;
+1C30;LEPCHA CONSONANT SIGN N;Mn;0;NSM;;;;;N;;;;;
+1C31;LEPCHA CONSONANT SIGN P;Mn;0;NSM;;;;;N;;;;;
+1C32;LEPCHA CONSONANT SIGN R;Mn;0;NSM;;;;;N;;;;;
+1C33;LEPCHA CONSONANT SIGN T;Mn;0;NSM;;;;;N;;;;;
+1C34;LEPCHA CONSONANT SIGN NYIN-DO;Mc;0;L;;;;;N;;;;;
+1C35;LEPCHA CONSONANT SIGN KANG;Mc;0;L;;;;;N;;;;;
+1C36;LEPCHA SIGN RAN;Mn;0;NSM;;;;;N;;;;;
+1C37;LEPCHA SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+1C3B;LEPCHA PUNCTUATION TA-ROL;Po;0;L;;;;;N;;;;;
+1C3C;LEPCHA PUNCTUATION NYET THYOOM TA-ROL;Po;0;L;;;;;N;;;;;
+1C3D;LEPCHA PUNCTUATION CER-WA;Po;0;L;;;;;N;;;;;
+1C3E;LEPCHA PUNCTUATION TSHOOK CER-WA;Po;0;L;;;;;N;;;;;
+1C3F;LEPCHA PUNCTUATION TSHOOK;Po;0;L;;;;;N;;;;;
+1C40;LEPCHA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1C41;LEPCHA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1C42;LEPCHA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1C43;LEPCHA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1C44;LEPCHA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1C45;LEPCHA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1C46;LEPCHA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1C47;LEPCHA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1C48;LEPCHA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1C49;LEPCHA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1C4D;LEPCHA LETTER TTA;Lo;0;L;;;;;N;;;;;
+1C4E;LEPCHA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+1C4F;LEPCHA LETTER DDA;Lo;0;L;;;;;N;;;;;
+1C50;OL CHIKI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1C51;OL CHIKI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1C52;OL CHIKI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1C53;OL CHIKI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1C54;OL CHIKI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1C55;OL CHIKI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1C56;OL CHIKI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1C57;OL CHIKI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1C58;OL CHIKI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1C59;OL CHIKI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1C5A;OL CHIKI LETTER LA;Lo;0;L;;;;;N;;;;;
+1C5B;OL CHIKI LETTER AT;Lo;0;L;;;;;N;;;;;
+1C5C;OL CHIKI LETTER AG;Lo;0;L;;;;;N;;;;;
+1C5D;OL CHIKI LETTER ANG;Lo;0;L;;;;;N;;;;;
+1C5E;OL CHIKI LETTER AL;Lo;0;L;;;;;N;;;;;
+1C5F;OL CHIKI LETTER LAA;Lo;0;L;;;;;N;;;;;
+1C60;OL CHIKI LETTER AAK;Lo;0;L;;;;;N;;;;;
+1C61;OL CHIKI LETTER AAJ;Lo;0;L;;;;;N;;;;;
+1C62;OL CHIKI LETTER AAM;Lo;0;L;;;;;N;;;;;
+1C63;OL CHIKI LETTER AAW;Lo;0;L;;;;;N;;;;;
+1C64;OL CHIKI LETTER LI;Lo;0;L;;;;;N;;;;;
+1C65;OL CHIKI LETTER IS;Lo;0;L;;;;;N;;;;;
+1C66;OL CHIKI LETTER IH;Lo;0;L;;;;;N;;;;;
+1C67;OL CHIKI LETTER INY;Lo;0;L;;;;;N;;;;;
+1C68;OL CHIKI LETTER IR;Lo;0;L;;;;;N;;;;;
+1C69;OL CHIKI LETTER LU;Lo;0;L;;;;;N;;;;;
+1C6A;OL CHIKI LETTER UC;Lo;0;L;;;;;N;;;;;
+1C6B;OL CHIKI LETTER UD;Lo;0;L;;;;;N;;;;;
+1C6C;OL CHIKI LETTER UNN;Lo;0;L;;;;;N;;;;;
+1C6D;OL CHIKI LETTER UY;Lo;0;L;;;;;N;;;;;
+1C6E;OL CHIKI LETTER LE;Lo;0;L;;;;;N;;;;;
+1C6F;OL CHIKI LETTER EP;Lo;0;L;;;;;N;;;;;
+1C70;OL CHIKI LETTER EDD;Lo;0;L;;;;;N;;;;;
+1C71;OL CHIKI LETTER EN;Lo;0;L;;;;;N;;;;;
+1C72;OL CHIKI LETTER ERR;Lo;0;L;;;;;N;;;;;
+1C73;OL CHIKI LETTER LO;Lo;0;L;;;;;N;;;;;
+1C74;OL CHIKI LETTER OTT;Lo;0;L;;;;;N;;;;;
+1C75;OL CHIKI LETTER OB;Lo;0;L;;;;;N;;;;;
+1C76;OL CHIKI LETTER OV;Lo;0;L;;;;;N;;;;;
+1C77;OL CHIKI LETTER OH;Lo;0;L;;;;;N;;;;;
+1C78;OL CHIKI MU TTUDDAG;Lm;0;L;;;;;N;;;;;
+1C79;OL CHIKI GAAHLAA TTUDDAAG;Lm;0;L;;;;;N;;;;;
+1C7A;OL CHIKI MU-GAAHLAA TTUDDAAG;Lm;0;L;;;;;N;;;;;
+1C7B;OL CHIKI RELAA;Lm;0;L;;;;;N;;;;;
+1C7C;OL CHIKI PHAARKAA;Lm;0;L;;;;;N;;;;;
+1C7D;OL CHIKI AHAD;Lm;0;L;;;;;N;;;;;
+1C7E;OL CHIKI PUNCTUATION MUCAAD;Po;0;L;;;;;N;;;;;
+1C7F;OL CHIKI PUNCTUATION DOUBLE MUCAAD;Po;0;L;;;;;N;;;;;
+1D00;LATIN LETTER SMALL CAPITAL A;Ll;0;L;;;;;N;;;;;
+1D01;LATIN LETTER SMALL CAPITAL AE;Ll;0;L;;;;;N;;;;;
+1D02;LATIN SMALL LETTER TURNED AE;Ll;0;L;;;;;N;;;;;
+1D03;LATIN LETTER SMALL CAPITAL BARRED B;Ll;0;L;;;;;N;;;;;
+1D04;LATIN LETTER SMALL CAPITAL C;Ll;0;L;;;;;N;;;;;
+1D05;LATIN LETTER SMALL CAPITAL D;Ll;0;L;;;;;N;;;;;
+1D06;LATIN LETTER SMALL CAPITAL ETH;Ll;0;L;;;;;N;;;;;
+1D07;LATIN LETTER SMALL CAPITAL E;Ll;0;L;;;;;N;;;;;
+1D08;LATIN SMALL LETTER TURNED OPEN E;Ll;0;L;;;;;N;;;;;
+1D09;LATIN SMALL LETTER TURNED I;Ll;0;L;;;;;N;;;;;
+1D0A;LATIN LETTER SMALL CAPITAL J;Ll;0;L;;;;;N;;;;;
+1D0B;LATIN LETTER SMALL CAPITAL K;Ll;0;L;;;;;N;;;;;
+1D0C;LATIN LETTER SMALL CAPITAL L WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D0D;LATIN LETTER SMALL CAPITAL M;Ll;0;L;;;;;N;;;;;
+1D0E;LATIN LETTER SMALL CAPITAL REVERSED N;Ll;0;L;;;;;N;;;;;
+1D0F;LATIN LETTER SMALL CAPITAL O;Ll;0;L;;;;;N;;;;;
+1D10;LATIN LETTER SMALL CAPITAL OPEN O;Ll;0;L;;;;;N;;;;;
+1D11;LATIN SMALL LETTER SIDEWAYS O;Ll;0;L;;;;;N;;;;;
+1D12;LATIN SMALL LETTER SIDEWAYS OPEN O;Ll;0;L;;;;;N;;;;;
+1D13;LATIN SMALL LETTER SIDEWAYS O WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D14;LATIN SMALL LETTER TURNED OE;Ll;0;L;;;;;N;;;;;
+1D15;LATIN LETTER SMALL CAPITAL OU;Ll;0;L;;;;;N;;;;;
+1D16;LATIN SMALL LETTER TOP HALF O;Ll;0;L;;;;;N;;;;;
+1D17;LATIN SMALL LETTER BOTTOM HALF O;Ll;0;L;;;;;N;;;;;
+1D18;LATIN LETTER SMALL CAPITAL P;Ll;0;L;;;;;N;;;;;
+1D19;LATIN LETTER SMALL CAPITAL REVERSED R;Ll;0;L;;;;;N;;;;;
+1D1A;LATIN LETTER SMALL CAPITAL TURNED R;Ll;0;L;;;;;N;;;;;
+1D1B;LATIN LETTER SMALL CAPITAL T;Ll;0;L;;;;;N;;;;;
+1D1C;LATIN LETTER SMALL CAPITAL U;Ll;0;L;;;;;N;;;;;
+1D1D;LATIN SMALL LETTER SIDEWAYS U;Ll;0;L;;;;;N;;;;;
+1D1E;LATIN SMALL LETTER SIDEWAYS DIAERESIZED U;Ll;0;L;;;;;N;;;;;
+1D1F;LATIN SMALL LETTER SIDEWAYS TURNED M;Ll;0;L;;;;;N;;;;;
+1D20;LATIN LETTER SMALL CAPITAL V;Ll;0;L;;;;;N;;;;;
+1D21;LATIN LETTER SMALL CAPITAL W;Ll;0;L;;;;;N;;;;;
+1D22;LATIN LETTER SMALL CAPITAL Z;Ll;0;L;;;;;N;;;;;
+1D23;LATIN LETTER SMALL CAPITAL EZH;Ll;0;L;;;;;N;;;;;
+1D24;LATIN LETTER VOICED LARYNGEAL SPIRANT;Ll;0;L;;;;;N;;;;;
+1D25;LATIN LETTER AIN;Ll;0;L;;;;;N;;;;;
+1D26;GREEK LETTER SMALL CAPITAL GAMMA;Ll;0;L;;;;;N;;;;;
+1D27;GREEK LETTER SMALL CAPITAL LAMDA;Ll;0;L;;;;;N;;;;;
+1D28;GREEK LETTER SMALL CAPITAL PI;Ll;0;L;;;;;N;;;;;
+1D29;GREEK LETTER SMALL CAPITAL RHO;Ll;0;L;;;;;N;;;;;
+1D2A;GREEK LETTER SMALL CAPITAL PSI;Ll;0;L;;;;;N;;;;;
+1D2B;CYRILLIC LETTER SMALL CAPITAL EL;Ll;0;L;;;;;N;;;;;
+1D2C;MODIFIER LETTER CAPITAL A;Lm;0;L;<super> 0041;;;;N;;;;;
+1D2D;MODIFIER LETTER CAPITAL AE;Lm;0;L;<super> 00C6;;;;N;;;;;
+1D2E;MODIFIER LETTER CAPITAL B;Lm;0;L;<super> 0042;;;;N;;;;;
+1D2F;MODIFIER LETTER CAPITAL BARRED B;Lm;0;L;;;;;N;;;;;
+1D30;MODIFIER LETTER CAPITAL D;Lm;0;L;<super> 0044;;;;N;;;;;
+1D31;MODIFIER LETTER CAPITAL E;Lm;0;L;<super> 0045;;;;N;;;;;
+1D32;MODIFIER LETTER CAPITAL REVERSED E;Lm;0;L;<super> 018E;;;;N;;;;;
+1D33;MODIFIER LETTER CAPITAL G;Lm;0;L;<super> 0047;;;;N;;;;;
+1D34;MODIFIER LETTER CAPITAL H;Lm;0;L;<super> 0048;;;;N;;;;;
+1D35;MODIFIER LETTER CAPITAL I;Lm;0;L;<super> 0049;;;;N;;;;;
+1D36;MODIFIER LETTER CAPITAL J;Lm;0;L;<super> 004A;;;;N;;;;;
+1D37;MODIFIER LETTER CAPITAL K;Lm;0;L;<super> 004B;;;;N;;;;;
+1D38;MODIFIER LETTER CAPITAL L;Lm;0;L;<super> 004C;;;;N;;;;;
+1D39;MODIFIER LETTER CAPITAL M;Lm;0;L;<super> 004D;;;;N;;;;;
+1D3A;MODIFIER LETTER CAPITAL N;Lm;0;L;<super> 004E;;;;N;;;;;
+1D3B;MODIFIER LETTER CAPITAL REVERSED N;Lm;0;L;;;;;N;;;;;
+1D3C;MODIFIER LETTER CAPITAL O;Lm;0;L;<super> 004F;;;;N;;;;;
+1D3D;MODIFIER LETTER CAPITAL OU;Lm;0;L;<super> 0222;;;;N;;;;;
+1D3E;MODIFIER LETTER CAPITAL P;Lm;0;L;<super> 0050;;;;N;;;;;
+1D3F;MODIFIER LETTER CAPITAL R;Lm;0;L;<super> 0052;;;;N;;;;;
+1D40;MODIFIER LETTER CAPITAL T;Lm;0;L;<super> 0054;;;;N;;;;;
+1D41;MODIFIER LETTER CAPITAL U;Lm;0;L;<super> 0055;;;;N;;;;;
+1D42;MODIFIER LETTER CAPITAL W;Lm;0;L;<super> 0057;;;;N;;;;;
+1D43;MODIFIER LETTER SMALL A;Lm;0;L;<super> 0061;;;;N;;;;;
+1D44;MODIFIER LETTER SMALL TURNED A;Lm;0;L;<super> 0250;;;;N;;;;;
+1D45;MODIFIER LETTER SMALL ALPHA;Lm;0;L;<super> 0251;;;;N;;;;;
+1D46;MODIFIER LETTER SMALL TURNED AE;Lm;0;L;<super> 1D02;;;;N;;;;;
+1D47;MODIFIER LETTER SMALL B;Lm;0;L;<super> 0062;;;;N;;;;;
+1D48;MODIFIER LETTER SMALL D;Lm;0;L;<super> 0064;;;;N;;;;;
+1D49;MODIFIER LETTER SMALL E;Lm;0;L;<super> 0065;;;;N;;;;;
+1D4A;MODIFIER LETTER SMALL SCHWA;Lm;0;L;<super> 0259;;;;N;;;;;
+1D4B;MODIFIER LETTER SMALL OPEN E;Lm;0;L;<super> 025B;;;;N;;;;;
+1D4C;MODIFIER LETTER SMALL TURNED OPEN E;Lm;0;L;<super> 025C;;;;N;;;;;
+1D4D;MODIFIER LETTER SMALL G;Lm;0;L;<super> 0067;;;;N;;;;;
+1D4E;MODIFIER LETTER SMALL TURNED I;Lm;0;L;;;;;N;;;;;
+1D4F;MODIFIER LETTER SMALL K;Lm;0;L;<super> 006B;;;;N;;;;;
+1D50;MODIFIER LETTER SMALL M;Lm;0;L;<super> 006D;;;;N;;;;;
+1D51;MODIFIER LETTER SMALL ENG;Lm;0;L;<super> 014B;;;;N;;;;;
+1D52;MODIFIER LETTER SMALL O;Lm;0;L;<super> 006F;;;;N;;;;;
+1D53;MODIFIER LETTER SMALL OPEN O;Lm;0;L;<super> 0254;;;;N;;;;;
+1D54;MODIFIER LETTER SMALL TOP HALF O;Lm;0;L;<super> 1D16;;;;N;;;;;
+1D55;MODIFIER LETTER SMALL BOTTOM HALF O;Lm;0;L;<super> 1D17;;;;N;;;;;
+1D56;MODIFIER LETTER SMALL P;Lm;0;L;<super> 0070;;;;N;;;;;
+1D57;MODIFIER LETTER SMALL T;Lm;0;L;<super> 0074;;;;N;;;;;
+1D58;MODIFIER LETTER SMALL U;Lm;0;L;<super> 0075;;;;N;;;;;
+1D59;MODIFIER LETTER SMALL SIDEWAYS U;Lm;0;L;<super> 1D1D;;;;N;;;;;
+1D5A;MODIFIER LETTER SMALL TURNED M;Lm;0;L;<super> 026F;;;;N;;;;;
+1D5B;MODIFIER LETTER SMALL V;Lm;0;L;<super> 0076;;;;N;;;;;
+1D5C;MODIFIER LETTER SMALL AIN;Lm;0;L;<super> 1D25;;;;N;;;;;
+1D5D;MODIFIER LETTER SMALL BETA;Lm;0;L;<super> 03B2;;;;N;;;;;
+1D5E;MODIFIER LETTER SMALL GREEK GAMMA;Lm;0;L;<super> 03B3;;;;N;;;;;
+1D5F;MODIFIER LETTER SMALL DELTA;Lm;0;L;<super> 03B4;;;;N;;;;;
+1D60;MODIFIER LETTER SMALL GREEK PHI;Lm;0;L;<super> 03C6;;;;N;;;;;
+1D61;MODIFIER LETTER SMALL CHI;Lm;0;L;<super> 03C7;;;;N;;;;;
+1D62;LATIN SUBSCRIPT SMALL LETTER I;Ll;0;L;<sub> 0069;;;;N;;;;;
+1D63;LATIN SUBSCRIPT SMALL LETTER R;Ll;0;L;<sub> 0072;;;;N;;;;;
+1D64;LATIN SUBSCRIPT SMALL LETTER U;Ll;0;L;<sub> 0075;;;;N;;;;;
+1D65;LATIN SUBSCRIPT SMALL LETTER V;Ll;0;L;<sub> 0076;;;;N;;;;;
+1D66;GREEK SUBSCRIPT SMALL LETTER BETA;Ll;0;L;<sub> 03B2;;;;N;;;;;
+1D67;GREEK SUBSCRIPT SMALL LETTER GAMMA;Ll;0;L;<sub> 03B3;;;;N;;;;;
+1D68;GREEK SUBSCRIPT SMALL LETTER RHO;Ll;0;L;<sub> 03C1;;;;N;;;;;
+1D69;GREEK SUBSCRIPT SMALL LETTER PHI;Ll;0;L;<sub> 03C6;;;;N;;;;;
+1D6A;GREEK SUBSCRIPT SMALL LETTER CHI;Ll;0;L;<sub> 03C7;;;;N;;;;;
+1D6B;LATIN SMALL LETTER UE;Ll;0;L;;;;;N;;;;;
+1D6C;LATIN SMALL LETTER B WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D6D;LATIN SMALL LETTER D WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D6E;LATIN SMALL LETTER F WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D6F;LATIN SMALL LETTER M WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D70;LATIN SMALL LETTER N WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D71;LATIN SMALL LETTER P WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D72;LATIN SMALL LETTER R WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D73;LATIN SMALL LETTER R WITH FISHHOOK AND MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D74;LATIN SMALL LETTER S WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D75;LATIN SMALL LETTER T WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D76;LATIN SMALL LETTER Z WITH MIDDLE TILDE;Ll;0;L;;;;;N;;;;;
+1D77;LATIN SMALL LETTER TURNED G;Ll;0;L;;;;;N;;;;;
+1D78;MODIFIER LETTER CYRILLIC EN;Lm;0;L;<super> 043D;;;;N;;;;;
+1D79;LATIN SMALL LETTER INSULAR G;Ll;0;L;;;;;N;;;A77D;;A77D
+1D7A;LATIN SMALL LETTER TH WITH STRIKETHROUGH;Ll;0;L;;;;;N;;;;;
+1D7B;LATIN SMALL CAPITAL LETTER I WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D7C;LATIN SMALL LETTER IOTA WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D7D;LATIN SMALL LETTER P WITH STROKE;Ll;0;L;;;;;N;;;2C63;;2C63
+1D7E;LATIN SMALL CAPITAL LETTER U WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D7F;LATIN SMALL LETTER UPSILON WITH STROKE;Ll;0;L;;;;;N;;;;;
+1D80;LATIN SMALL LETTER B WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D81;LATIN SMALL LETTER D WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D82;LATIN SMALL LETTER F WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D83;LATIN SMALL LETTER G WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D84;LATIN SMALL LETTER K WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D85;LATIN SMALL LETTER L WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D86;LATIN SMALL LETTER M WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D87;LATIN SMALL LETTER N WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D88;LATIN SMALL LETTER P WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D89;LATIN SMALL LETTER R WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8A;LATIN SMALL LETTER S WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8B;LATIN SMALL LETTER ESH WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8C;LATIN SMALL LETTER V WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8D;LATIN SMALL LETTER X WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8E;LATIN SMALL LETTER Z WITH PALATAL HOOK;Ll;0;L;;;;;N;;;;;
+1D8F;LATIN SMALL LETTER A WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D90;LATIN SMALL LETTER ALPHA WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D91;LATIN SMALL LETTER D WITH HOOK AND TAIL;Ll;0;L;;;;;N;;;;;
+1D92;LATIN SMALL LETTER E WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D93;LATIN SMALL LETTER OPEN E WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D94;LATIN SMALL LETTER REVERSED OPEN E WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D95;LATIN SMALL LETTER SCHWA WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D96;LATIN SMALL LETTER I WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D97;LATIN SMALL LETTER OPEN O WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D98;LATIN SMALL LETTER ESH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D99;LATIN SMALL LETTER U WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D9A;LATIN SMALL LETTER EZH WITH RETROFLEX HOOK;Ll;0;L;;;;;N;;;;;
+1D9B;MODIFIER LETTER SMALL TURNED ALPHA;Lm;0;L;<super> 0252;;;;N;;;;;
+1D9C;MODIFIER LETTER SMALL C;Lm;0;L;<super> 0063;;;;N;;;;;
+1D9D;MODIFIER LETTER SMALL C WITH CURL;Lm;0;L;<super> 0255;;;;N;;;;;
+1D9E;MODIFIER LETTER SMALL ETH;Lm;0;L;<super> 00F0;;;;N;;;;;
+1D9F;MODIFIER LETTER SMALL REVERSED OPEN E;Lm;0;L;<super> 025C;;;;N;;;;;
+1DA0;MODIFIER LETTER SMALL F;Lm;0;L;<super> 0066;;;;N;;;;;
+1DA1;MODIFIER LETTER SMALL DOTLESS J WITH STROKE;Lm;0;L;<super> 025F;;;;N;;;;;
+1DA2;MODIFIER LETTER SMALL SCRIPT G;Lm;0;L;<super> 0261;;;;N;;;;;
+1DA3;MODIFIER LETTER SMALL TURNED H;Lm;0;L;<super> 0265;;;;N;;;;;
+1DA4;MODIFIER LETTER SMALL I WITH STROKE;Lm;0;L;<super> 0268;;;;N;;;;;
+1DA5;MODIFIER LETTER SMALL IOTA;Lm;0;L;<super> 0269;;;;N;;;;;
+1DA6;MODIFIER LETTER SMALL CAPITAL I;Lm;0;L;<super> 026A;;;;N;;;;;
+1DA7;MODIFIER LETTER SMALL CAPITAL I WITH STROKE;Lm;0;L;<super> 1D7B;;;;N;;;;;
+1DA8;MODIFIER LETTER SMALL J WITH CROSSED-TAIL;Lm;0;L;<super> 029D;;;;N;;;;;
+1DA9;MODIFIER LETTER SMALL L WITH RETROFLEX HOOK;Lm;0;L;<super> 026D;;;;N;;;;;
+1DAA;MODIFIER LETTER SMALL L WITH PALATAL HOOK;Lm;0;L;<super> 1D85;;;;N;;;;;
+1DAB;MODIFIER LETTER SMALL CAPITAL L;Lm;0;L;<super> 029F;;;;N;;;;;
+1DAC;MODIFIER LETTER SMALL M WITH HOOK;Lm;0;L;<super> 0271;;;;N;;;;;
+1DAD;MODIFIER LETTER SMALL TURNED M WITH LONG LEG;Lm;0;L;<super> 0270;;;;N;;;;;
+1DAE;MODIFIER LETTER SMALL N WITH LEFT HOOK;Lm;0;L;<super> 0272;;;;N;;;;;
+1DAF;MODIFIER LETTER SMALL N WITH RETROFLEX HOOK;Lm;0;L;<super> 0273;;;;N;;;;;
+1DB0;MODIFIER LETTER SMALL CAPITAL N;Lm;0;L;<super> 0274;;;;N;;;;;
+1DB1;MODIFIER LETTER SMALL BARRED O;Lm;0;L;<super> 0275;;;;N;;;;;
+1DB2;MODIFIER LETTER SMALL PHI;Lm;0;L;<super> 0278;;;;N;;;;;
+1DB3;MODIFIER LETTER SMALL S WITH HOOK;Lm;0;L;<super> 0282;;;;N;;;;;
+1DB4;MODIFIER LETTER SMALL ESH;Lm;0;L;<super> 0283;;;;N;;;;;
+1DB5;MODIFIER LETTER SMALL T WITH PALATAL HOOK;Lm;0;L;<super> 01AB;;;;N;;;;;
+1DB6;MODIFIER LETTER SMALL U BAR;Lm;0;L;<super> 0289;;;;N;;;;;
+1DB7;MODIFIER LETTER SMALL UPSILON;Lm;0;L;<super> 028A;;;;N;;;;;
+1DB8;MODIFIER LETTER SMALL CAPITAL U;Lm;0;L;<super> 1D1C;;;;N;;;;;
+1DB9;MODIFIER LETTER SMALL V WITH HOOK;Lm;0;L;<super> 028B;;;;N;;;;;
+1DBA;MODIFIER LETTER SMALL TURNED V;Lm;0;L;<super> 028C;;;;N;;;;;
+1DBB;MODIFIER LETTER SMALL Z;Lm;0;L;<super> 007A;;;;N;;;;;
+1DBC;MODIFIER LETTER SMALL Z WITH RETROFLEX HOOK;Lm;0;L;<super> 0290;;;;N;;;;;
+1DBD;MODIFIER LETTER SMALL Z WITH CURL;Lm;0;L;<super> 0291;;;;N;;;;;
+1DBE;MODIFIER LETTER SMALL EZH;Lm;0;L;<super> 0292;;;;N;;;;;
+1DBF;MODIFIER LETTER SMALL THETA;Lm;0;L;<super> 03B8;;;;N;;;;;
+1DC0;COMBINING DOTTED GRAVE ACCENT;Mn;230;NSM;;;;;N;;;;;
+1DC1;COMBINING DOTTED ACUTE ACCENT;Mn;230;NSM;;;;;N;;;;;
+1DC2;COMBINING SNAKE BELOW;Mn;220;NSM;;;;;N;;;;;
+1DC3;COMBINING SUSPENSION MARK;Mn;230;NSM;;;;;N;;;;;
+1DC4;COMBINING MACRON-ACUTE;Mn;230;NSM;;;;;N;;;;;
+1DC5;COMBINING GRAVE-MACRON;Mn;230;NSM;;;;;N;;;;;
+1DC6;COMBINING MACRON-GRAVE;Mn;230;NSM;;;;;N;;;;;
+1DC7;COMBINING ACUTE-MACRON;Mn;230;NSM;;;;;N;;;;;
+1DC8;COMBINING GRAVE-ACUTE-GRAVE;Mn;230;NSM;;;;;N;;;;;
+1DC9;COMBINING ACUTE-GRAVE-ACUTE;Mn;230;NSM;;;;;N;;;;;
+1DCA;COMBINING LATIN SMALL LETTER R BELOW;Mn;220;NSM;;;;;N;;;;;
+1DCB;COMBINING BREVE-MACRON;Mn;230;NSM;;;;;N;;;;;
+1DCC;COMBINING MACRON-BREVE;Mn;230;NSM;;;;;N;;;;;
+1DCD;COMBINING DOUBLE CIRCUMFLEX ABOVE;Mn;234;NSM;;;;;N;;;;;
+1DCE;COMBINING OGONEK ABOVE;Mn;214;NSM;;;;;N;;;;;
+1DCF;COMBINING ZIGZAG BELOW;Mn;220;NSM;;;;;N;;;;;
+1DD0;COMBINING IS BELOW;Mn;202;NSM;;;;;N;;;;;
+1DD1;COMBINING UR ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DD2;COMBINING US ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DD3;COMBINING LATIN SMALL LETTER FLATTENED OPEN A ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DD4;COMBINING LATIN SMALL LETTER AE;Mn;230;NSM;;;;;N;;;;;
+1DD5;COMBINING LATIN SMALL LETTER AO;Mn;230;NSM;;;;;N;;;;;
+1DD6;COMBINING LATIN SMALL LETTER AV;Mn;230;NSM;;;;;N;;;;;
+1DD7;COMBINING LATIN SMALL LETTER C CEDILLA;Mn;230;NSM;;;;;N;;;;;
+1DD8;COMBINING LATIN SMALL LETTER INSULAR D;Mn;230;NSM;;;;;N;;;;;
+1DD9;COMBINING LATIN SMALL LETTER ETH;Mn;230;NSM;;;;;N;;;;;
+1DDA;COMBINING LATIN SMALL LETTER G;Mn;230;NSM;;;;;N;;;;;
+1DDB;COMBINING LATIN LETTER SMALL CAPITAL G;Mn;230;NSM;;;;;N;;;;;
+1DDC;COMBINING LATIN SMALL LETTER K;Mn;230;NSM;;;;;N;;;;;
+1DDD;COMBINING LATIN SMALL LETTER L;Mn;230;NSM;;;;;N;;;;;
+1DDE;COMBINING LATIN LETTER SMALL CAPITAL L;Mn;230;NSM;;;;;N;;;;;
+1DDF;COMBINING LATIN LETTER SMALL CAPITAL M;Mn;230;NSM;;;;;N;;;;;
+1DE0;COMBINING LATIN SMALL LETTER N;Mn;230;NSM;;;;;N;;;;;
+1DE1;COMBINING LATIN LETTER SMALL CAPITAL N;Mn;230;NSM;;;;;N;;;;;
+1DE2;COMBINING LATIN LETTER SMALL CAPITAL R;Mn;230;NSM;;;;;N;;;;;
+1DE3;COMBINING LATIN SMALL LETTER R ROTUNDA;Mn;230;NSM;;;;;N;;;;;
+1DE4;COMBINING LATIN SMALL LETTER S;Mn;230;NSM;;;;;N;;;;;
+1DE5;COMBINING LATIN SMALL LETTER LONG S;Mn;230;NSM;;;;;N;;;;;
+1DE6;COMBINING LATIN SMALL LETTER Z;Mn;230;NSM;;;;;N;;;;;
+1DFE;COMBINING LEFT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;;
+1DFF;COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
+1E00;LATIN CAPITAL LETTER A WITH RING BELOW;Lu;0;L;0041 0325;;;;N;;;;1E01;
+1E01;LATIN SMALL LETTER A WITH RING BELOW;Ll;0;L;0061 0325;;;;N;;;1E00;;1E00
+1E02;LATIN CAPITAL LETTER B WITH DOT ABOVE;Lu;0;L;0042 0307;;;;N;;;;1E03;
+1E03;LATIN SMALL LETTER B WITH DOT ABOVE;Ll;0;L;0062 0307;;;;N;;;1E02;;1E02
+1E04;LATIN CAPITAL LETTER B WITH DOT BELOW;Lu;0;L;0042 0323;;;;N;;;;1E05;
+1E05;LATIN SMALL LETTER B WITH DOT BELOW;Ll;0;L;0062 0323;;;;N;;;1E04;;1E04
+1E06;LATIN CAPITAL LETTER B WITH LINE BELOW;Lu;0;L;0042 0331;;;;N;;;;1E07;
+1E07;LATIN SMALL LETTER B WITH LINE BELOW;Ll;0;L;0062 0331;;;;N;;;1E06;;1E06
+1E08;LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE;Lu;0;L;00C7 0301;;;;N;;;;1E09;
+1E09;LATIN SMALL LETTER C WITH CEDILLA AND ACUTE;Ll;0;L;00E7 0301;;;;N;;;1E08;;1E08
+1E0A;LATIN CAPITAL LETTER D WITH DOT ABOVE;Lu;0;L;0044 0307;;;;N;;;;1E0B;
+1E0B;LATIN SMALL LETTER D WITH DOT ABOVE;Ll;0;L;0064 0307;;;;N;;;1E0A;;1E0A
+1E0C;LATIN CAPITAL LETTER D WITH DOT BELOW;Lu;0;L;0044 0323;;;;N;;;;1E0D;
+1E0D;LATIN SMALL LETTER D WITH DOT BELOW;Ll;0;L;0064 0323;;;;N;;;1E0C;;1E0C
+1E0E;LATIN CAPITAL LETTER D WITH LINE BELOW;Lu;0;L;0044 0331;;;;N;;;;1E0F;
+1E0F;LATIN SMALL LETTER D WITH LINE BELOW;Ll;0;L;0064 0331;;;;N;;;1E0E;;1E0E
+1E10;LATIN CAPITAL LETTER D WITH CEDILLA;Lu;0;L;0044 0327;;;;N;;;;1E11;
+1E11;LATIN SMALL LETTER D WITH CEDILLA;Ll;0;L;0064 0327;;;;N;;;1E10;;1E10
+1E12;LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW;Lu;0;L;0044 032D;;;;N;;;;1E13;
+1E13;LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW;Ll;0;L;0064 032D;;;;N;;;1E12;;1E12
+1E14;LATIN CAPITAL LETTER E WITH MACRON AND GRAVE;Lu;0;L;0112 0300;;;;N;;;;1E15;
+1E15;LATIN SMALL LETTER E WITH MACRON AND GRAVE;Ll;0;L;0113 0300;;;;N;;;1E14;;1E14
+1E16;LATIN CAPITAL LETTER E WITH MACRON AND ACUTE;Lu;0;L;0112 0301;;;;N;;;;1E17;
+1E17;LATIN SMALL LETTER E WITH MACRON AND ACUTE;Ll;0;L;0113 0301;;;;N;;;1E16;;1E16
+1E18;LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW;Lu;0;L;0045 032D;;;;N;;;;1E19;
+1E19;LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW;Ll;0;L;0065 032D;;;;N;;;1E18;;1E18
+1E1A;LATIN CAPITAL LETTER E WITH TILDE BELOW;Lu;0;L;0045 0330;;;;N;;;;1E1B;
+1E1B;LATIN SMALL LETTER E WITH TILDE BELOW;Ll;0;L;0065 0330;;;;N;;;1E1A;;1E1A
+1E1C;LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE;Lu;0;L;0228 0306;;;;N;;;;1E1D;
+1E1D;LATIN SMALL LETTER E WITH CEDILLA AND BREVE;Ll;0;L;0229 0306;;;;N;;;1E1C;;1E1C
+1E1E;LATIN CAPITAL LETTER F WITH DOT ABOVE;Lu;0;L;0046 0307;;;;N;;;;1E1F;
+1E1F;LATIN SMALL LETTER F WITH DOT ABOVE;Ll;0;L;0066 0307;;;;N;;;1E1E;;1E1E
+1E20;LATIN CAPITAL LETTER G WITH MACRON;Lu;0;L;0047 0304;;;;N;;;;1E21;
+1E21;LATIN SMALL LETTER G WITH MACRON;Ll;0;L;0067 0304;;;;N;;;1E20;;1E20
+1E22;LATIN CAPITAL LETTER H WITH DOT ABOVE;Lu;0;L;0048 0307;;;;N;;;;1E23;
+1E23;LATIN SMALL LETTER H WITH DOT ABOVE;Ll;0;L;0068 0307;;;;N;;;1E22;;1E22
+1E24;LATIN CAPITAL LETTER H WITH DOT BELOW;Lu;0;L;0048 0323;;;;N;;;;1E25;
+1E25;LATIN SMALL LETTER H WITH DOT BELOW;Ll;0;L;0068 0323;;;;N;;;1E24;;1E24
+1E26;LATIN CAPITAL LETTER H WITH DIAERESIS;Lu;0;L;0048 0308;;;;N;;;;1E27;
+1E27;LATIN SMALL LETTER H WITH DIAERESIS;Ll;0;L;0068 0308;;;;N;;;1E26;;1E26
+1E28;LATIN CAPITAL LETTER H WITH CEDILLA;Lu;0;L;0048 0327;;;;N;;;;1E29;
+1E29;LATIN SMALL LETTER H WITH CEDILLA;Ll;0;L;0068 0327;;;;N;;;1E28;;1E28
+1E2A;LATIN CAPITAL LETTER H WITH BREVE BELOW;Lu;0;L;0048 032E;;;;N;;;;1E2B;
+1E2B;LATIN SMALL LETTER H WITH BREVE BELOW;Ll;0;L;0068 032E;;;;N;;;1E2A;;1E2A
+1E2C;LATIN CAPITAL LETTER I WITH TILDE BELOW;Lu;0;L;0049 0330;;;;N;;;;1E2D;
+1E2D;LATIN SMALL LETTER I WITH TILDE BELOW;Ll;0;L;0069 0330;;;;N;;;1E2C;;1E2C
+1E2E;LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE;Lu;0;L;00CF 0301;;;;N;;;;1E2F;
+1E2F;LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE;Ll;0;L;00EF 0301;;;;N;;;1E2E;;1E2E
+1E30;LATIN CAPITAL LETTER K WITH ACUTE;Lu;0;L;004B 0301;;;;N;;;;1E31;
+1E31;LATIN SMALL LETTER K WITH ACUTE;Ll;0;L;006B 0301;;;;N;;;1E30;;1E30
+1E32;LATIN CAPITAL LETTER K WITH DOT BELOW;Lu;0;L;004B 0323;;;;N;;;;1E33;
+1E33;LATIN SMALL LETTER K WITH DOT BELOW;Ll;0;L;006B 0323;;;;N;;;1E32;;1E32
+1E34;LATIN CAPITAL LETTER K WITH LINE BELOW;Lu;0;L;004B 0331;;;;N;;;;1E35;
+1E35;LATIN SMALL LETTER K WITH LINE BELOW;Ll;0;L;006B 0331;;;;N;;;1E34;;1E34
+1E36;LATIN CAPITAL LETTER L WITH DOT BELOW;Lu;0;L;004C 0323;;;;N;;;;1E37;
+1E37;LATIN SMALL LETTER L WITH DOT BELOW;Ll;0;L;006C 0323;;;;N;;;1E36;;1E36
+1E38;LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON;Lu;0;L;1E36 0304;;;;N;;;;1E39;
+1E39;LATIN SMALL LETTER L WITH DOT BELOW AND MACRON;Ll;0;L;1E37 0304;;;;N;;;1E38;;1E38
+1E3A;LATIN CAPITAL LETTER L WITH LINE BELOW;Lu;0;L;004C 0331;;;;N;;;;1E3B;
+1E3B;LATIN SMALL LETTER L WITH LINE BELOW;Ll;0;L;006C 0331;;;;N;;;1E3A;;1E3A
+1E3C;LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW;Lu;0;L;004C 032D;;;;N;;;;1E3D;
+1E3D;LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW;Ll;0;L;006C 032D;;;;N;;;1E3C;;1E3C
+1E3E;LATIN CAPITAL LETTER M WITH ACUTE;Lu;0;L;004D 0301;;;;N;;;;1E3F;
+1E3F;LATIN SMALL LETTER M WITH ACUTE;Ll;0;L;006D 0301;;;;N;;;1E3E;;1E3E
+1E40;LATIN CAPITAL LETTER M WITH DOT ABOVE;Lu;0;L;004D 0307;;;;N;;;;1E41;
+1E41;LATIN SMALL LETTER M WITH DOT ABOVE;Ll;0;L;006D 0307;;;;N;;;1E40;;1E40
+1E42;LATIN CAPITAL LETTER M WITH DOT BELOW;Lu;0;L;004D 0323;;;;N;;;;1E43;
+1E43;LATIN SMALL LETTER M WITH DOT BELOW;Ll;0;L;006D 0323;;;;N;;;1E42;;1E42
+1E44;LATIN CAPITAL LETTER N WITH DOT ABOVE;Lu;0;L;004E 0307;;;;N;;;;1E45;
+1E45;LATIN SMALL LETTER N WITH DOT ABOVE;Ll;0;L;006E 0307;;;;N;;;1E44;;1E44
+1E46;LATIN CAPITAL LETTER N WITH DOT BELOW;Lu;0;L;004E 0323;;;;N;;;;1E47;
+1E47;LATIN SMALL LETTER N WITH DOT BELOW;Ll;0;L;006E 0323;;;;N;;;1E46;;1E46
+1E48;LATIN CAPITAL LETTER N WITH LINE BELOW;Lu;0;L;004E 0331;;;;N;;;;1E49;
+1E49;LATIN SMALL LETTER N WITH LINE BELOW;Ll;0;L;006E 0331;;;;N;;;1E48;;1E48
+1E4A;LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW;Lu;0;L;004E 032D;;;;N;;;;1E4B;
+1E4B;LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW;Ll;0;L;006E 032D;;;;N;;;1E4A;;1E4A
+1E4C;LATIN CAPITAL LETTER O WITH TILDE AND ACUTE;Lu;0;L;00D5 0301;;;;N;;;;1E4D;
+1E4D;LATIN SMALL LETTER O WITH TILDE AND ACUTE;Ll;0;L;00F5 0301;;;;N;;;1E4C;;1E4C
+1E4E;LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS;Lu;0;L;00D5 0308;;;;N;;;;1E4F;
+1E4F;LATIN SMALL LETTER O WITH TILDE AND DIAERESIS;Ll;0;L;00F5 0308;;;;N;;;1E4E;;1E4E
+1E50;LATIN CAPITAL LETTER O WITH MACRON AND GRAVE;Lu;0;L;014C 0300;;;;N;;;;1E51;
+1E51;LATIN SMALL LETTER O WITH MACRON AND GRAVE;Ll;0;L;014D 0300;;;;N;;;1E50;;1E50
+1E52;LATIN CAPITAL LETTER O WITH MACRON AND ACUTE;Lu;0;L;014C 0301;;;;N;;;;1E53;
+1E53;LATIN SMALL LETTER O WITH MACRON AND ACUTE;Ll;0;L;014D 0301;;;;N;;;1E52;;1E52
+1E54;LATIN CAPITAL LETTER P WITH ACUTE;Lu;0;L;0050 0301;;;;N;;;;1E55;
+1E55;LATIN SMALL LETTER P WITH ACUTE;Ll;0;L;0070 0301;;;;N;;;1E54;;1E54
+1E56;LATIN CAPITAL LETTER P WITH DOT ABOVE;Lu;0;L;0050 0307;;;;N;;;;1E57;
+1E57;LATIN SMALL LETTER P WITH DOT ABOVE;Ll;0;L;0070 0307;;;;N;;;1E56;;1E56
+1E58;LATIN CAPITAL LETTER R WITH DOT ABOVE;Lu;0;L;0052 0307;;;;N;;;;1E59;
+1E59;LATIN SMALL LETTER R WITH DOT ABOVE;Ll;0;L;0072 0307;;;;N;;;1E58;;1E58
+1E5A;LATIN CAPITAL LETTER R WITH DOT BELOW;Lu;0;L;0052 0323;;;;N;;;;1E5B;
+1E5B;LATIN SMALL LETTER R WITH DOT BELOW;Ll;0;L;0072 0323;;;;N;;;1E5A;;1E5A
+1E5C;LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON;Lu;0;L;1E5A 0304;;;;N;;;;1E5D;
+1E5D;LATIN SMALL LETTER R WITH DOT BELOW AND MACRON;Ll;0;L;1E5B 0304;;;;N;;;1E5C;;1E5C
+1E5E;LATIN CAPITAL LETTER R WITH LINE BELOW;Lu;0;L;0052 0331;;;;N;;;;1E5F;
+1E5F;LATIN SMALL LETTER R WITH LINE BELOW;Ll;0;L;0072 0331;;;;N;;;1E5E;;1E5E
+1E60;LATIN CAPITAL LETTER S WITH DOT ABOVE;Lu;0;L;0053 0307;;;;N;;;;1E61;
+1E61;LATIN SMALL LETTER S WITH DOT ABOVE;Ll;0;L;0073 0307;;;;N;;;1E60;;1E60
+1E62;LATIN CAPITAL LETTER S WITH DOT BELOW;Lu;0;L;0053 0323;;;;N;;;;1E63;
+1E63;LATIN SMALL LETTER S WITH DOT BELOW;Ll;0;L;0073 0323;;;;N;;;1E62;;1E62
+1E64;LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE;Lu;0;L;015A 0307;;;;N;;;;1E65;
+1E65;LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE;Ll;0;L;015B 0307;;;;N;;;1E64;;1E64
+1E66;LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE;Lu;0;L;0160 0307;;;;N;;;;1E67;
+1E67;LATIN SMALL LETTER S WITH CARON AND DOT ABOVE;Ll;0;L;0161 0307;;;;N;;;1E66;;1E66
+1E68;LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE;Lu;0;L;1E62 0307;;;;N;;;;1E69;
+1E69;LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE;Ll;0;L;1E63 0307;;;;N;;;1E68;;1E68
+1E6A;LATIN CAPITAL LETTER T WITH DOT ABOVE;Lu;0;L;0054 0307;;;;N;;;;1E6B;
+1E6B;LATIN SMALL LETTER T WITH DOT ABOVE;Ll;0;L;0074 0307;;;;N;;;1E6A;;1E6A
+1E6C;LATIN CAPITAL LETTER T WITH DOT BELOW;Lu;0;L;0054 0323;;;;N;;;;1E6D;
+1E6D;LATIN SMALL LETTER T WITH DOT BELOW;Ll;0;L;0074 0323;;;;N;;;1E6C;;1E6C
+1E6E;LATIN CAPITAL LETTER T WITH LINE BELOW;Lu;0;L;0054 0331;;;;N;;;;1E6F;
+1E6F;LATIN SMALL LETTER T WITH LINE BELOW;Ll;0;L;0074 0331;;;;N;;;1E6E;;1E6E
+1E70;LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW;Lu;0;L;0054 032D;;;;N;;;;1E71;
+1E71;LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW;Ll;0;L;0074 032D;;;;N;;;1E70;;1E70
+1E72;LATIN CAPITAL LETTER U WITH DIAERESIS BELOW;Lu;0;L;0055 0324;;;;N;;;;1E73;
+1E73;LATIN SMALL LETTER U WITH DIAERESIS BELOW;Ll;0;L;0075 0324;;;;N;;;1E72;;1E72
+1E74;LATIN CAPITAL LETTER U WITH TILDE BELOW;Lu;0;L;0055 0330;;;;N;;;;1E75;
+1E75;LATIN SMALL LETTER U WITH TILDE BELOW;Ll;0;L;0075 0330;;;;N;;;1E74;;1E74
+1E76;LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW;Lu;0;L;0055 032D;;;;N;;;;1E77;
+1E77;LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW;Ll;0;L;0075 032D;;;;N;;;1E76;;1E76
+1E78;LATIN CAPITAL LETTER U WITH TILDE AND ACUTE;Lu;0;L;0168 0301;;;;N;;;;1E79;
+1E79;LATIN SMALL LETTER U WITH TILDE AND ACUTE;Ll;0;L;0169 0301;;;;N;;;1E78;;1E78
+1E7A;LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS;Lu;0;L;016A 0308;;;;N;;;;1E7B;
+1E7B;LATIN SMALL LETTER U WITH MACRON AND DIAERESIS;Ll;0;L;016B 0308;;;;N;;;1E7A;;1E7A
+1E7C;LATIN CAPITAL LETTER V WITH TILDE;Lu;0;L;0056 0303;;;;N;;;;1E7D;
+1E7D;LATIN SMALL LETTER V WITH TILDE;Ll;0;L;0076 0303;;;;N;;;1E7C;;1E7C
+1E7E;LATIN CAPITAL LETTER V WITH DOT BELOW;Lu;0;L;0056 0323;;;;N;;;;1E7F;
+1E7F;LATIN SMALL LETTER V WITH DOT BELOW;Ll;0;L;0076 0323;;;;N;;;1E7E;;1E7E
+1E80;LATIN CAPITAL LETTER W WITH GRAVE;Lu;0;L;0057 0300;;;;N;;;;1E81;
+1E81;LATIN SMALL LETTER W WITH GRAVE;Ll;0;L;0077 0300;;;;N;;;1E80;;1E80
+1E82;LATIN CAPITAL LETTER W WITH ACUTE;Lu;0;L;0057 0301;;;;N;;;;1E83;
+1E83;LATIN SMALL LETTER W WITH ACUTE;Ll;0;L;0077 0301;;;;N;;;1E82;;1E82
+1E84;LATIN CAPITAL LETTER W WITH DIAERESIS;Lu;0;L;0057 0308;;;;N;;;;1E85;
+1E85;LATIN SMALL LETTER W WITH DIAERESIS;Ll;0;L;0077 0308;;;;N;;;1E84;;1E84
+1E86;LATIN CAPITAL LETTER W WITH DOT ABOVE;Lu;0;L;0057 0307;;;;N;;;;1E87;
+1E87;LATIN SMALL LETTER W WITH DOT ABOVE;Ll;0;L;0077 0307;;;;N;;;1E86;;1E86
+1E88;LATIN CAPITAL LETTER W WITH DOT BELOW;Lu;0;L;0057 0323;;;;N;;;;1E89;
+1E89;LATIN SMALL LETTER W WITH DOT BELOW;Ll;0;L;0077 0323;;;;N;;;1E88;;1E88
+1E8A;LATIN CAPITAL LETTER X WITH DOT ABOVE;Lu;0;L;0058 0307;;;;N;;;;1E8B;
+1E8B;LATIN SMALL LETTER X WITH DOT ABOVE;Ll;0;L;0078 0307;;;;N;;;1E8A;;1E8A
+1E8C;LATIN CAPITAL LETTER X WITH DIAERESIS;Lu;0;L;0058 0308;;;;N;;;;1E8D;
+1E8D;LATIN SMALL LETTER X WITH DIAERESIS;Ll;0;L;0078 0308;;;;N;;;1E8C;;1E8C
+1E8E;LATIN CAPITAL LETTER Y WITH DOT ABOVE;Lu;0;L;0059 0307;;;;N;;;;1E8F;
+1E8F;LATIN SMALL LETTER Y WITH DOT ABOVE;Ll;0;L;0079 0307;;;;N;;;1E8E;;1E8E
+1E90;LATIN CAPITAL LETTER Z WITH CIRCUMFLEX;Lu;0;L;005A 0302;;;;N;;;;1E91;
+1E91;LATIN SMALL LETTER Z WITH CIRCUMFLEX;Ll;0;L;007A 0302;;;;N;;;1E90;;1E90
+1E92;LATIN CAPITAL LETTER Z WITH DOT BELOW;Lu;0;L;005A 0323;;;;N;;;;1E93;
+1E93;LATIN SMALL LETTER Z WITH DOT BELOW;Ll;0;L;007A 0323;;;;N;;;1E92;;1E92
+1E94;LATIN CAPITAL LETTER Z WITH LINE BELOW;Lu;0;L;005A 0331;;;;N;;;;1E95;
+1E95;LATIN SMALL LETTER Z WITH LINE BELOW;Ll;0;L;007A 0331;;;;N;;;1E94;;1E94
+1E96;LATIN SMALL LETTER H WITH LINE BELOW;Ll;0;L;0068 0331;;;;N;;;;;
+1E97;LATIN SMALL LETTER T WITH DIAERESIS;Ll;0;L;0074 0308;;;;N;;;;;
+1E98;LATIN SMALL LETTER W WITH RING ABOVE;Ll;0;L;0077 030A;;;;N;;;;;
+1E99;LATIN SMALL LETTER Y WITH RING ABOVE;Ll;0;L;0079 030A;;;;N;;;;;
+1E9A;LATIN SMALL LETTER A WITH RIGHT HALF RING;Ll;0;L;<compat> 0061 02BE;;;;N;;;;;
+1E9B;LATIN SMALL LETTER LONG S WITH DOT ABOVE;Ll;0;L;017F 0307;;;;N;;;1E60;;1E60
+1E9C;LATIN SMALL LETTER LONG S WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;;;
+1E9D;LATIN SMALL LETTER LONG S WITH HIGH STROKE;Ll;0;L;;;;;N;;;;;
+1E9E;LATIN CAPITAL LETTER SHARP S;Lu;0;L;;;;;N;;;;00DF;
+1E9F;LATIN SMALL LETTER DELTA;Ll;0;L;;;;;N;;;;;
+1EA0;LATIN CAPITAL LETTER A WITH DOT BELOW;Lu;0;L;0041 0323;;;;N;;;;1EA1;
+1EA1;LATIN SMALL LETTER A WITH DOT BELOW;Ll;0;L;0061 0323;;;;N;;;1EA0;;1EA0
+1EA2;LATIN CAPITAL LETTER A WITH HOOK ABOVE;Lu;0;L;0041 0309;;;;N;;;;1EA3;
+1EA3;LATIN SMALL LETTER A WITH HOOK ABOVE;Ll;0;L;0061 0309;;;;N;;;1EA2;;1EA2
+1EA4;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE;Lu;0;L;00C2 0301;;;;N;;;;1EA5;
+1EA5;LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE;Ll;0;L;00E2 0301;;;;N;;;1EA4;;1EA4
+1EA6;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE;Lu;0;L;00C2 0300;;;;N;;;;1EA7;
+1EA7;LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE;Ll;0;L;00E2 0300;;;;N;;;1EA6;;1EA6
+1EA8;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE;Lu;0;L;00C2 0309;;;;N;;;;1EA9;
+1EA9;LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE;Ll;0;L;00E2 0309;;;;N;;;1EA8;;1EA8
+1EAA;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE;Lu;0;L;00C2 0303;;;;N;;;;1EAB;
+1EAB;LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE;Ll;0;L;00E2 0303;;;;N;;;1EAA;;1EAA
+1EAC;LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW;Lu;0;L;1EA0 0302;;;;N;;;;1EAD;
+1EAD;LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW;Ll;0;L;1EA1 0302;;;;N;;;1EAC;;1EAC
+1EAE;LATIN CAPITAL LETTER A WITH BREVE AND ACUTE;Lu;0;L;0102 0301;;;;N;;;;1EAF;
+1EAF;LATIN SMALL LETTER A WITH BREVE AND ACUTE;Ll;0;L;0103 0301;;;;N;;;1EAE;;1EAE
+1EB0;LATIN CAPITAL LETTER A WITH BREVE AND GRAVE;Lu;0;L;0102 0300;;;;N;;;;1EB1;
+1EB1;LATIN SMALL LETTER A WITH BREVE AND GRAVE;Ll;0;L;0103 0300;;;;N;;;1EB0;;1EB0
+1EB2;LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE;Lu;0;L;0102 0309;;;;N;;;;1EB3;
+1EB3;LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE;Ll;0;L;0103 0309;;;;N;;;1EB2;;1EB2
+1EB4;LATIN CAPITAL LETTER A WITH BREVE AND TILDE;Lu;0;L;0102 0303;;;;N;;;;1EB5;
+1EB5;LATIN SMALL LETTER A WITH BREVE AND TILDE;Ll;0;L;0103 0303;;;;N;;;1EB4;;1EB4
+1EB6;LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW;Lu;0;L;1EA0 0306;;;;N;;;;1EB7;
+1EB7;LATIN SMALL LETTER A WITH BREVE AND DOT BELOW;Ll;0;L;1EA1 0306;;;;N;;;1EB6;;1EB6
+1EB8;LATIN CAPITAL LETTER E WITH DOT BELOW;Lu;0;L;0045 0323;;;;N;;;;1EB9;
+1EB9;LATIN SMALL LETTER E WITH DOT BELOW;Ll;0;L;0065 0323;;;;N;;;1EB8;;1EB8
+1EBA;LATIN CAPITAL LETTER E WITH HOOK ABOVE;Lu;0;L;0045 0309;;;;N;;;;1EBB;
+1EBB;LATIN SMALL LETTER E WITH HOOK ABOVE;Ll;0;L;0065 0309;;;;N;;;1EBA;;1EBA
+1EBC;LATIN CAPITAL LETTER E WITH TILDE;Lu;0;L;0045 0303;;;;N;;;;1EBD;
+1EBD;LATIN SMALL LETTER E WITH TILDE;Ll;0;L;0065 0303;;;;N;;;1EBC;;1EBC
+1EBE;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE;Lu;0;L;00CA 0301;;;;N;;;;1EBF;
+1EBF;LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE;Ll;0;L;00EA 0301;;;;N;;;1EBE;;1EBE
+1EC0;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE;Lu;0;L;00CA 0300;;;;N;;;;1EC1;
+1EC1;LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE;Ll;0;L;00EA 0300;;;;N;;;1EC0;;1EC0
+1EC2;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE;Lu;0;L;00CA 0309;;;;N;;;;1EC3;
+1EC3;LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE;Ll;0;L;00EA 0309;;;;N;;;1EC2;;1EC2
+1EC4;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE;Lu;0;L;00CA 0303;;;;N;;;;1EC5;
+1EC5;LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE;Ll;0;L;00EA 0303;;;;N;;;1EC4;;1EC4
+1EC6;LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW;Lu;0;L;1EB8 0302;;;;N;;;;1EC7;
+1EC7;LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW;Ll;0;L;1EB9 0302;;;;N;;;1EC6;;1EC6
+1EC8;LATIN CAPITAL LETTER I WITH HOOK ABOVE;Lu;0;L;0049 0309;;;;N;;;;1EC9;
+1EC9;LATIN SMALL LETTER I WITH HOOK ABOVE;Ll;0;L;0069 0309;;;;N;;;1EC8;;1EC8
+1ECA;LATIN CAPITAL LETTER I WITH DOT BELOW;Lu;0;L;0049 0323;;;;N;;;;1ECB;
+1ECB;LATIN SMALL LETTER I WITH DOT BELOW;Ll;0;L;0069 0323;;;;N;;;1ECA;;1ECA
+1ECC;LATIN CAPITAL LETTER O WITH DOT BELOW;Lu;0;L;004F 0323;;;;N;;;;1ECD;
+1ECD;LATIN SMALL LETTER O WITH DOT BELOW;Ll;0;L;006F 0323;;;;N;;;1ECC;;1ECC
+1ECE;LATIN CAPITAL LETTER O WITH HOOK ABOVE;Lu;0;L;004F 0309;;;;N;;;;1ECF;
+1ECF;LATIN SMALL LETTER O WITH HOOK ABOVE;Ll;0;L;006F 0309;;;;N;;;1ECE;;1ECE
+1ED0;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE;Lu;0;L;00D4 0301;;;;N;;;;1ED1;
+1ED1;LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE;Ll;0;L;00F4 0301;;;;N;;;1ED0;;1ED0
+1ED2;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE;Lu;0;L;00D4 0300;;;;N;;;;1ED3;
+1ED3;LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE;Ll;0;L;00F4 0300;;;;N;;;1ED2;;1ED2
+1ED4;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE;Lu;0;L;00D4 0309;;;;N;;;;1ED5;
+1ED5;LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE;Ll;0;L;00F4 0309;;;;N;;;1ED4;;1ED4
+1ED6;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE;Lu;0;L;00D4 0303;;;;N;;;;1ED7;
+1ED7;LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE;Ll;0;L;00F4 0303;;;;N;;;1ED6;;1ED6
+1ED8;LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW;Lu;0;L;1ECC 0302;;;;N;;;;1ED9;
+1ED9;LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW;Ll;0;L;1ECD 0302;;;;N;;;1ED8;;1ED8
+1EDA;LATIN CAPITAL LETTER O WITH HORN AND ACUTE;Lu;0;L;01A0 0301;;;;N;;;;1EDB;
+1EDB;LATIN SMALL LETTER O WITH HORN AND ACUTE;Ll;0;L;01A1 0301;;;;N;;;1EDA;;1EDA
+1EDC;LATIN CAPITAL LETTER O WITH HORN AND GRAVE;Lu;0;L;01A0 0300;;;;N;;;;1EDD;
+1EDD;LATIN SMALL LETTER O WITH HORN AND GRAVE;Ll;0;L;01A1 0300;;;;N;;;1EDC;;1EDC
+1EDE;LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE;Lu;0;L;01A0 0309;;;;N;;;;1EDF;
+1EDF;LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE;Ll;0;L;01A1 0309;;;;N;;;1EDE;;1EDE
+1EE0;LATIN CAPITAL LETTER O WITH HORN AND TILDE;Lu;0;L;01A0 0303;;;;N;;;;1EE1;
+1EE1;LATIN SMALL LETTER O WITH HORN AND TILDE;Ll;0;L;01A1 0303;;;;N;;;1EE0;;1EE0
+1EE2;LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW;Lu;0;L;01A0 0323;;;;N;;;;1EE3;
+1EE3;LATIN SMALL LETTER O WITH HORN AND DOT BELOW;Ll;0;L;01A1 0323;;;;N;;;1EE2;;1EE2
+1EE4;LATIN CAPITAL LETTER U WITH DOT BELOW;Lu;0;L;0055 0323;;;;N;;;;1EE5;
+1EE5;LATIN SMALL LETTER U WITH DOT BELOW;Ll;0;L;0075 0323;;;;N;;;1EE4;;1EE4
+1EE6;LATIN CAPITAL LETTER U WITH HOOK ABOVE;Lu;0;L;0055 0309;;;;N;;;;1EE7;
+1EE7;LATIN SMALL LETTER U WITH HOOK ABOVE;Ll;0;L;0075 0309;;;;N;;;1EE6;;1EE6
+1EE8;LATIN CAPITAL LETTER U WITH HORN AND ACUTE;Lu;0;L;01AF 0301;;;;N;;;;1EE9;
+1EE9;LATIN SMALL LETTER U WITH HORN AND ACUTE;Ll;0;L;01B0 0301;;;;N;;;1EE8;;1EE8
+1EEA;LATIN CAPITAL LETTER U WITH HORN AND GRAVE;Lu;0;L;01AF 0300;;;;N;;;;1EEB;
+1EEB;LATIN SMALL LETTER U WITH HORN AND GRAVE;Ll;0;L;01B0 0300;;;;N;;;1EEA;;1EEA
+1EEC;LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE;Lu;0;L;01AF 0309;;;;N;;;;1EED;
+1EED;LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE;Ll;0;L;01B0 0309;;;;N;;;1EEC;;1EEC
+1EEE;LATIN CAPITAL LETTER U WITH HORN AND TILDE;Lu;0;L;01AF 0303;;;;N;;;;1EEF;
+1EEF;LATIN SMALL LETTER U WITH HORN AND TILDE;Ll;0;L;01B0 0303;;;;N;;;1EEE;;1EEE
+1EF0;LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW;Lu;0;L;01AF 0323;;;;N;;;;1EF1;
+1EF1;LATIN SMALL LETTER U WITH HORN AND DOT BELOW;Ll;0;L;01B0 0323;;;;N;;;1EF0;;1EF0
+1EF2;LATIN CAPITAL LETTER Y WITH GRAVE;Lu;0;L;0059 0300;;;;N;;;;1EF3;
+1EF3;LATIN SMALL LETTER Y WITH GRAVE;Ll;0;L;0079 0300;;;;N;;;1EF2;;1EF2
+1EF4;LATIN CAPITAL LETTER Y WITH DOT BELOW;Lu;0;L;0059 0323;;;;N;;;;1EF5;
+1EF5;LATIN SMALL LETTER Y WITH DOT BELOW;Ll;0;L;0079 0323;;;;N;;;1EF4;;1EF4
+1EF6;LATIN CAPITAL LETTER Y WITH HOOK ABOVE;Lu;0;L;0059 0309;;;;N;;;;1EF7;
+1EF7;LATIN SMALL LETTER Y WITH HOOK ABOVE;Ll;0;L;0079 0309;;;;N;;;1EF6;;1EF6
+1EF8;LATIN CAPITAL LETTER Y WITH TILDE;Lu;0;L;0059 0303;;;;N;;;;1EF9;
+1EF9;LATIN SMALL LETTER Y WITH TILDE;Ll;0;L;0079 0303;;;;N;;;1EF8;;1EF8
+1EFA;LATIN CAPITAL LETTER MIDDLE-WELSH LL;Lu;0;L;;;;;N;;;;1EFB;
+1EFB;LATIN SMALL LETTER MIDDLE-WELSH LL;Ll;0;L;;;;;N;;;1EFA;;1EFA
+1EFC;LATIN CAPITAL LETTER MIDDLE-WELSH V;Lu;0;L;;;;;N;;;;1EFD;
+1EFD;LATIN SMALL LETTER MIDDLE-WELSH V;Ll;0;L;;;;;N;;;1EFC;;1EFC
+1EFE;LATIN CAPITAL LETTER Y WITH LOOP;Lu;0;L;;;;;N;;;;1EFF;
+1EFF;LATIN SMALL LETTER Y WITH LOOP;Ll;0;L;;;;;N;;;1EFE;;1EFE
+1F00;GREEK SMALL LETTER ALPHA WITH PSILI;Ll;0;L;03B1 0313;;;;N;;;1F08;;1F08
+1F01;GREEK SMALL LETTER ALPHA WITH DASIA;Ll;0;L;03B1 0314;;;;N;;;1F09;;1F09
+1F02;GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA;Ll;0;L;1F00 0300;;;;N;;;1F0A;;1F0A
+1F03;GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA;Ll;0;L;1F01 0300;;;;N;;;1F0B;;1F0B
+1F04;GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA;Ll;0;L;1F00 0301;;;;N;;;1F0C;;1F0C
+1F05;GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA;Ll;0;L;1F01 0301;;;;N;;;1F0D;;1F0D
+1F06;GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI;Ll;0;L;1F00 0342;;;;N;;;1F0E;;1F0E
+1F07;GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI;Ll;0;L;1F01 0342;;;;N;;;1F0F;;1F0F
+1F08;GREEK CAPITAL LETTER ALPHA WITH PSILI;Lu;0;L;0391 0313;;;;N;;;;1F00;
+1F09;GREEK CAPITAL LETTER ALPHA WITH DASIA;Lu;0;L;0391 0314;;;;N;;;;1F01;
+1F0A;GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA;Lu;0;L;1F08 0300;;;;N;;;;1F02;
+1F0B;GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA;Lu;0;L;1F09 0300;;;;N;;;;1F03;
+1F0C;GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA;Lu;0;L;1F08 0301;;;;N;;;;1F04;
+1F0D;GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA;Lu;0;L;1F09 0301;;;;N;;;;1F05;
+1F0E;GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI;Lu;0;L;1F08 0342;;;;N;;;;1F06;
+1F0F;GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI;Lu;0;L;1F09 0342;;;;N;;;;1F07;
+1F10;GREEK SMALL LETTER EPSILON WITH PSILI;Ll;0;L;03B5 0313;;;;N;;;1F18;;1F18
+1F11;GREEK SMALL LETTER EPSILON WITH DASIA;Ll;0;L;03B5 0314;;;;N;;;1F19;;1F19
+1F12;GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA;Ll;0;L;1F10 0300;;;;N;;;1F1A;;1F1A
+1F13;GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA;Ll;0;L;1F11 0300;;;;N;;;1F1B;;1F1B
+1F14;GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA;Ll;0;L;1F10 0301;;;;N;;;1F1C;;1F1C
+1F15;GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA;Ll;0;L;1F11 0301;;;;N;;;1F1D;;1F1D
+1F18;GREEK CAPITAL LETTER EPSILON WITH PSILI;Lu;0;L;0395 0313;;;;N;;;;1F10;
+1F19;GREEK CAPITAL LETTER EPSILON WITH DASIA;Lu;0;L;0395 0314;;;;N;;;;1F11;
+1F1A;GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA;Lu;0;L;1F18 0300;;;;N;;;;1F12;
+1F1B;GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA;Lu;0;L;1F19 0300;;;;N;;;;1F13;
+1F1C;GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA;Lu;0;L;1F18 0301;;;;N;;;;1F14;
+1F1D;GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA;Lu;0;L;1F19 0301;;;;N;;;;1F15;
+1F20;GREEK SMALL LETTER ETA WITH PSILI;Ll;0;L;03B7 0313;;;;N;;;1F28;;1F28
+1F21;GREEK SMALL LETTER ETA WITH DASIA;Ll;0;L;03B7 0314;;;;N;;;1F29;;1F29
+1F22;GREEK SMALL LETTER ETA WITH PSILI AND VARIA;Ll;0;L;1F20 0300;;;;N;;;1F2A;;1F2A
+1F23;GREEK SMALL LETTER ETA WITH DASIA AND VARIA;Ll;0;L;1F21 0300;;;;N;;;1F2B;;1F2B
+1F24;GREEK SMALL LETTER ETA WITH PSILI AND OXIA;Ll;0;L;1F20 0301;;;;N;;;1F2C;;1F2C
+1F25;GREEK SMALL LETTER ETA WITH DASIA AND OXIA;Ll;0;L;1F21 0301;;;;N;;;1F2D;;1F2D
+1F26;GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI;Ll;0;L;1F20 0342;;;;N;;;1F2E;;1F2E
+1F27;GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI;Ll;0;L;1F21 0342;;;;N;;;1F2F;;1F2F
+1F28;GREEK CAPITAL LETTER ETA WITH PSILI;Lu;0;L;0397 0313;;;;N;;;;1F20;
+1F29;GREEK CAPITAL LETTER ETA WITH DASIA;Lu;0;L;0397 0314;;;;N;;;;1F21;
+1F2A;GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA;Lu;0;L;1F28 0300;;;;N;;;;1F22;
+1F2B;GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA;Lu;0;L;1F29 0300;;;;N;;;;1F23;
+1F2C;GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA;Lu;0;L;1F28 0301;;;;N;;;;1F24;
+1F2D;GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA;Lu;0;L;1F29 0301;;;;N;;;;1F25;
+1F2E;GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI;Lu;0;L;1F28 0342;;;;N;;;;1F26;
+1F2F;GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI;Lu;0;L;1F29 0342;;;;N;;;;1F27;
+1F30;GREEK SMALL LETTER IOTA WITH PSILI;Ll;0;L;03B9 0313;;;;N;;;1F38;;1F38
+1F31;GREEK SMALL LETTER IOTA WITH DASIA;Ll;0;L;03B9 0314;;;;N;;;1F39;;1F39
+1F32;GREEK SMALL LETTER IOTA WITH PSILI AND VARIA;Ll;0;L;1F30 0300;;;;N;;;1F3A;;1F3A
+1F33;GREEK SMALL LETTER IOTA WITH DASIA AND VARIA;Ll;0;L;1F31 0300;;;;N;;;1F3B;;1F3B
+1F34;GREEK SMALL LETTER IOTA WITH PSILI AND OXIA;Ll;0;L;1F30 0301;;;;N;;;1F3C;;1F3C
+1F35;GREEK SMALL LETTER IOTA WITH DASIA AND OXIA;Ll;0;L;1F31 0301;;;;N;;;1F3D;;1F3D
+1F36;GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI;Ll;0;L;1F30 0342;;;;N;;;1F3E;;1F3E
+1F37;GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI;Ll;0;L;1F31 0342;;;;N;;;1F3F;;1F3F
+1F38;GREEK CAPITAL LETTER IOTA WITH PSILI;Lu;0;L;0399 0313;;;;N;;;;1F30;
+1F39;GREEK CAPITAL LETTER IOTA WITH DASIA;Lu;0;L;0399 0314;;;;N;;;;1F31;
+1F3A;GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA;Lu;0;L;1F38 0300;;;;N;;;;1F32;
+1F3B;GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA;Lu;0;L;1F39 0300;;;;N;;;;1F33;
+1F3C;GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA;Lu;0;L;1F38 0301;;;;N;;;;1F34;
+1F3D;GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA;Lu;0;L;1F39 0301;;;;N;;;;1F35;
+1F3E;GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI;Lu;0;L;1F38 0342;;;;N;;;;1F36;
+1F3F;GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI;Lu;0;L;1F39 0342;;;;N;;;;1F37;
+1F40;GREEK SMALL LETTER OMICRON WITH PSILI;Ll;0;L;03BF 0313;;;;N;;;1F48;;1F48
+1F41;GREEK SMALL LETTER OMICRON WITH DASIA;Ll;0;L;03BF 0314;;;;N;;;1F49;;1F49
+1F42;GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA;Ll;0;L;1F40 0300;;;;N;;;1F4A;;1F4A
+1F43;GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA;Ll;0;L;1F41 0300;;;;N;;;1F4B;;1F4B
+1F44;GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA;Ll;0;L;1F40 0301;;;;N;;;1F4C;;1F4C
+1F45;GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA;Ll;0;L;1F41 0301;;;;N;;;1F4D;;1F4D
+1F48;GREEK CAPITAL LETTER OMICRON WITH PSILI;Lu;0;L;039F 0313;;;;N;;;;1F40;
+1F49;GREEK CAPITAL LETTER OMICRON WITH DASIA;Lu;0;L;039F 0314;;;;N;;;;1F41;
+1F4A;GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA;Lu;0;L;1F48 0300;;;;N;;;;1F42;
+1F4B;GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA;Lu;0;L;1F49 0300;;;;N;;;;1F43;
+1F4C;GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA;Lu;0;L;1F48 0301;;;;N;;;;1F44;
+1F4D;GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA;Lu;0;L;1F49 0301;;;;N;;;;1F45;
+1F50;GREEK SMALL LETTER UPSILON WITH PSILI;Ll;0;L;03C5 0313;;;;N;;;;;
+1F51;GREEK SMALL LETTER UPSILON WITH DASIA;Ll;0;L;03C5 0314;;;;N;;;1F59;;1F59
+1F52;GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA;Ll;0;L;1F50 0300;;;;N;;;;;
+1F53;GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA;Ll;0;L;1F51 0300;;;;N;;;1F5B;;1F5B
+1F54;GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA;Ll;0;L;1F50 0301;;;;N;;;;;
+1F55;GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA;Ll;0;L;1F51 0301;;;;N;;;1F5D;;1F5D
+1F56;GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI;Ll;0;L;1F50 0342;;;;N;;;;;
+1F57;GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI;Ll;0;L;1F51 0342;;;;N;;;1F5F;;1F5F
+1F59;GREEK CAPITAL LETTER UPSILON WITH DASIA;Lu;0;L;03A5 0314;;;;N;;;;1F51;
+1F5B;GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA;Lu;0;L;1F59 0300;;;;N;;;;1F53;
+1F5D;GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA;Lu;0;L;1F59 0301;;;;N;;;;1F55;
+1F5F;GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI;Lu;0;L;1F59 0342;;;;N;;;;1F57;
+1F60;GREEK SMALL LETTER OMEGA WITH PSILI;Ll;0;L;03C9 0313;;;;N;;;1F68;;1F68
+1F61;GREEK SMALL LETTER OMEGA WITH DASIA;Ll;0;L;03C9 0314;;;;N;;;1F69;;1F69
+1F62;GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA;Ll;0;L;1F60 0300;;;;N;;;1F6A;;1F6A
+1F63;GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA;Ll;0;L;1F61 0300;;;;N;;;1F6B;;1F6B
+1F64;GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA;Ll;0;L;1F60 0301;;;;N;;;1F6C;;1F6C
+1F65;GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA;Ll;0;L;1F61 0301;;;;N;;;1F6D;;1F6D
+1F66;GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI;Ll;0;L;1F60 0342;;;;N;;;1F6E;;1F6E
+1F67;GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI;Ll;0;L;1F61 0342;;;;N;;;1F6F;;1F6F
+1F68;GREEK CAPITAL LETTER OMEGA WITH PSILI;Lu;0;L;03A9 0313;;;;N;;;;1F60;
+1F69;GREEK CAPITAL LETTER OMEGA WITH DASIA;Lu;0;L;03A9 0314;;;;N;;;;1F61;
+1F6A;GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA;Lu;0;L;1F68 0300;;;;N;;;;1F62;
+1F6B;GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA;Lu;0;L;1F69 0300;;;;N;;;;1F63;
+1F6C;GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA;Lu;0;L;1F68 0301;;;;N;;;;1F64;
+1F6D;GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA;Lu;0;L;1F69 0301;;;;N;;;;1F65;
+1F6E;GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI;Lu;0;L;1F68 0342;;;;N;;;;1F66;
+1F6F;GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI;Lu;0;L;1F69 0342;;;;N;;;;1F67;
+1F70;GREEK SMALL LETTER ALPHA WITH VARIA;Ll;0;L;03B1 0300;;;;N;;;1FBA;;1FBA
+1F71;GREEK SMALL LETTER ALPHA WITH OXIA;Ll;0;L;03AC;;;;N;;;1FBB;;1FBB
+1F72;GREEK SMALL LETTER EPSILON WITH VARIA;Ll;0;L;03B5 0300;;;;N;;;1FC8;;1FC8
+1F73;GREEK SMALL LETTER EPSILON WITH OXIA;Ll;0;L;03AD;;;;N;;;1FC9;;1FC9
+1F74;GREEK SMALL LETTER ETA WITH VARIA;Ll;0;L;03B7 0300;;;;N;;;1FCA;;1FCA
+1F75;GREEK SMALL LETTER ETA WITH OXIA;Ll;0;L;03AE;;;;N;;;1FCB;;1FCB
+1F76;GREEK SMALL LETTER IOTA WITH VARIA;Ll;0;L;03B9 0300;;;;N;;;1FDA;;1FDA
+1F77;GREEK SMALL LETTER IOTA WITH OXIA;Ll;0;L;03AF;;;;N;;;1FDB;;1FDB
+1F78;GREEK SMALL LETTER OMICRON WITH VARIA;Ll;0;L;03BF 0300;;;;N;;;1FF8;;1FF8
+1F79;GREEK SMALL LETTER OMICRON WITH OXIA;Ll;0;L;03CC;;;;N;;;1FF9;;1FF9
+1F7A;GREEK SMALL LETTER UPSILON WITH VARIA;Ll;0;L;03C5 0300;;;;N;;;1FEA;;1FEA
+1F7B;GREEK SMALL LETTER UPSILON WITH OXIA;Ll;0;L;03CD;;;;N;;;1FEB;;1FEB
+1F7C;GREEK SMALL LETTER OMEGA WITH VARIA;Ll;0;L;03C9 0300;;;;N;;;1FFA;;1FFA
+1F7D;GREEK SMALL LETTER OMEGA WITH OXIA;Ll;0;L;03CE;;;;N;;;1FFB;;1FFB
+1F80;GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI;Ll;0;L;1F00 0345;;;;N;;;1F88;;1F88
+1F81;GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI;Ll;0;L;1F01 0345;;;;N;;;1F89;;1F89
+1F82;GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F02 0345;;;;N;;;1F8A;;1F8A
+1F83;GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F03 0345;;;;N;;;1F8B;;1F8B
+1F84;GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F04 0345;;;;N;;;1F8C;;1F8C
+1F85;GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F05 0345;;;;N;;;1F8D;;1F8D
+1F86;GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F06 0345;;;;N;;;1F8E;;1F8E
+1F87;GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F07 0345;;;;N;;;1F8F;;1F8F
+1F88;GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI;Lt;0;L;1F08 0345;;;;N;;;;1F80;
+1F89;GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI;Lt;0;L;1F09 0345;;;;N;;;;1F81;
+1F8A;GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F0A 0345;;;;N;;;;1F82;
+1F8B;GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F0B 0345;;;;N;;;;1F83;
+1F8C;GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F0C 0345;;;;N;;;;1F84;
+1F8D;GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F0D 0345;;;;N;;;;1F85;
+1F8E;GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F0E 0345;;;;N;;;;1F86;
+1F8F;GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F0F 0345;;;;N;;;;1F87;
+1F90;GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI;Ll;0;L;1F20 0345;;;;N;;;1F98;;1F98
+1F91;GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI;Ll;0;L;1F21 0345;;;;N;;;1F99;;1F99
+1F92;GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F22 0345;;;;N;;;1F9A;;1F9A
+1F93;GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F23 0345;;;;N;;;1F9B;;1F9B
+1F94;GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F24 0345;;;;N;;;1F9C;;1F9C
+1F95;GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F25 0345;;;;N;;;1F9D;;1F9D
+1F96;GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F26 0345;;;;N;;;1F9E;;1F9E
+1F97;GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F27 0345;;;;N;;;1F9F;;1F9F
+1F98;GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI;Lt;0;L;1F28 0345;;;;N;;;;1F90;
+1F99;GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI;Lt;0;L;1F29 0345;;;;N;;;;1F91;
+1F9A;GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F2A 0345;;;;N;;;;1F92;
+1F9B;GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F2B 0345;;;;N;;;;1F93;
+1F9C;GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F2C 0345;;;;N;;;;1F94;
+1F9D;GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F2D 0345;;;;N;;;;1F95;
+1F9E;GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F2E 0345;;;;N;;;;1F96;
+1F9F;GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F2F 0345;;;;N;;;;1F97;
+1FA0;GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI;Ll;0;L;1F60 0345;;;;N;;;1FA8;;1FA8
+1FA1;GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI;Ll;0;L;1F61 0345;;;;N;;;1FA9;;1FA9
+1FA2;GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F62 0345;;;;N;;;1FAA;;1FAA
+1FA3;GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI;Ll;0;L;1F63 0345;;;;N;;;1FAB;;1FAB
+1FA4;GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F64 0345;;;;N;;;1FAC;;1FAC
+1FA5;GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI;Ll;0;L;1F65 0345;;;;N;;;1FAD;;1FAD
+1FA6;GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F66 0345;;;;N;;;1FAE;;1FAE
+1FA7;GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1F67 0345;;;;N;;;1FAF;;1FAF
+1FA8;GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI;Lt;0;L;1F68 0345;;;;N;;;;1FA0;
+1FA9;GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI;Lt;0;L;1F69 0345;;;;N;;;;1FA1;
+1FAA;GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F6A 0345;;;;N;;;;1FA2;
+1FAB;GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI;Lt;0;L;1F6B 0345;;;;N;;;;1FA3;
+1FAC;GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F6C 0345;;;;N;;;;1FA4;
+1FAD;GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI;Lt;0;L;1F6D 0345;;;;N;;;;1FA5;
+1FAE;GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F6E 0345;;;;N;;;;1FA6;
+1FAF;GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI;Lt;0;L;1F6F 0345;;;;N;;;;1FA7;
+1FB0;GREEK SMALL LETTER ALPHA WITH VRACHY;Ll;0;L;03B1 0306;;;;N;;;1FB8;;1FB8
+1FB1;GREEK SMALL LETTER ALPHA WITH MACRON;Ll;0;L;03B1 0304;;;;N;;;1FB9;;1FB9
+1FB2;GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI;Ll;0;L;1F70 0345;;;;N;;;;;
+1FB3;GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI;Ll;0;L;03B1 0345;;;;N;;;1FBC;;1FBC
+1FB4;GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI;Ll;0;L;03AC 0345;;;;N;;;;;
+1FB6;GREEK SMALL LETTER ALPHA WITH PERISPOMENI;Ll;0;L;03B1 0342;;;;N;;;;;
+1FB7;GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1FB6 0345;;;;N;;;;;
+1FB8;GREEK CAPITAL LETTER ALPHA WITH VRACHY;Lu;0;L;0391 0306;;;;N;;;;1FB0;
+1FB9;GREEK CAPITAL LETTER ALPHA WITH MACRON;Lu;0;L;0391 0304;;;;N;;;;1FB1;
+1FBA;GREEK CAPITAL LETTER ALPHA WITH VARIA;Lu;0;L;0391 0300;;;;N;;;;1F70;
+1FBB;GREEK CAPITAL LETTER ALPHA WITH OXIA;Lu;0;L;0386;;;;N;;;;1F71;
+1FBC;GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI;Lt;0;L;0391 0345;;;;N;;;;1FB3;
+1FBD;GREEK KORONIS;Sk;0;ON;<compat> 0020 0313;;;;N;;;;;
+1FBE;GREEK PROSGEGRAMMENI;Ll;0;L;03B9;;;;N;;;0399;;0399
+1FBF;GREEK PSILI;Sk;0;ON;<compat> 0020 0313;;;;N;;;;;
+1FC0;GREEK PERISPOMENI;Sk;0;ON;<compat> 0020 0342;;;;N;;;;;
+1FC1;GREEK DIALYTIKA AND PERISPOMENI;Sk;0;ON;00A8 0342;;;;N;;;;;
+1FC2;GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI;Ll;0;L;1F74 0345;;;;N;;;;;
+1FC3;GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI;Ll;0;L;03B7 0345;;;;N;;;1FCC;;1FCC
+1FC4;GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI;Ll;0;L;03AE 0345;;;;N;;;;;
+1FC6;GREEK SMALL LETTER ETA WITH PERISPOMENI;Ll;0;L;03B7 0342;;;;N;;;;;
+1FC7;GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1FC6 0345;;;;N;;;;;
+1FC8;GREEK CAPITAL LETTER EPSILON WITH VARIA;Lu;0;L;0395 0300;;;;N;;;;1F72;
+1FC9;GREEK CAPITAL LETTER EPSILON WITH OXIA;Lu;0;L;0388;;;;N;;;;1F73;
+1FCA;GREEK CAPITAL LETTER ETA WITH VARIA;Lu;0;L;0397 0300;;;;N;;;;1F74;
+1FCB;GREEK CAPITAL LETTER ETA WITH OXIA;Lu;0;L;0389;;;;N;;;;1F75;
+1FCC;GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI;Lt;0;L;0397 0345;;;;N;;;;1FC3;
+1FCD;GREEK PSILI AND VARIA;Sk;0;ON;1FBF 0300;;;;N;;;;;
+1FCE;GREEK PSILI AND OXIA;Sk;0;ON;1FBF 0301;;;;N;;;;;
+1FCF;GREEK PSILI AND PERISPOMENI;Sk;0;ON;1FBF 0342;;;;N;;;;;
+1FD0;GREEK SMALL LETTER IOTA WITH VRACHY;Ll;0;L;03B9 0306;;;;N;;;1FD8;;1FD8
+1FD1;GREEK SMALL LETTER IOTA WITH MACRON;Ll;0;L;03B9 0304;;;;N;;;1FD9;;1FD9
+1FD2;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA;Ll;0;L;03CA 0300;;;;N;;;;;
+1FD3;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA;Ll;0;L;0390;;;;N;;;;;
+1FD6;GREEK SMALL LETTER IOTA WITH PERISPOMENI;Ll;0;L;03B9 0342;;;;N;;;;;
+1FD7;GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI;Ll;0;L;03CA 0342;;;;N;;;;;
+1FD8;GREEK CAPITAL LETTER IOTA WITH VRACHY;Lu;0;L;0399 0306;;;;N;;;;1FD0;
+1FD9;GREEK CAPITAL LETTER IOTA WITH MACRON;Lu;0;L;0399 0304;;;;N;;;;1FD1;
+1FDA;GREEK CAPITAL LETTER IOTA WITH VARIA;Lu;0;L;0399 0300;;;;N;;;;1F76;
+1FDB;GREEK CAPITAL LETTER IOTA WITH OXIA;Lu;0;L;038A;;;;N;;;;1F77;
+1FDD;GREEK DASIA AND VARIA;Sk;0;ON;1FFE 0300;;;;N;;;;;
+1FDE;GREEK DASIA AND OXIA;Sk;0;ON;1FFE 0301;;;;N;;;;;
+1FDF;GREEK DASIA AND PERISPOMENI;Sk;0;ON;1FFE 0342;;;;N;;;;;
+1FE0;GREEK SMALL LETTER UPSILON WITH VRACHY;Ll;0;L;03C5 0306;;;;N;;;1FE8;;1FE8
+1FE1;GREEK SMALL LETTER UPSILON WITH MACRON;Ll;0;L;03C5 0304;;;;N;;;1FE9;;1FE9
+1FE2;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA;Ll;0;L;03CB 0300;;;;N;;;;;
+1FE3;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA;Ll;0;L;03B0;;;;N;;;;;
+1FE4;GREEK SMALL LETTER RHO WITH PSILI;Ll;0;L;03C1 0313;;;;N;;;;;
+1FE5;GREEK SMALL LETTER RHO WITH DASIA;Ll;0;L;03C1 0314;;;;N;;;1FEC;;1FEC
+1FE6;GREEK SMALL LETTER UPSILON WITH PERISPOMENI;Ll;0;L;03C5 0342;;;;N;;;;;
+1FE7;GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI;Ll;0;L;03CB 0342;;;;N;;;;;
+1FE8;GREEK CAPITAL LETTER UPSILON WITH VRACHY;Lu;0;L;03A5 0306;;;;N;;;;1FE0;
+1FE9;GREEK CAPITAL LETTER UPSILON WITH MACRON;Lu;0;L;03A5 0304;;;;N;;;;1FE1;
+1FEA;GREEK CAPITAL LETTER UPSILON WITH VARIA;Lu;0;L;03A5 0300;;;;N;;;;1F7A;
+1FEB;GREEK CAPITAL LETTER UPSILON WITH OXIA;Lu;0;L;038E;;;;N;;;;1F7B;
+1FEC;GREEK CAPITAL LETTER RHO WITH DASIA;Lu;0;L;03A1 0314;;;;N;;;;1FE5;
+1FED;GREEK DIALYTIKA AND VARIA;Sk;0;ON;00A8 0300;;;;N;;;;;
+1FEE;GREEK DIALYTIKA AND OXIA;Sk;0;ON;0385;;;;N;;;;;
+1FEF;GREEK VARIA;Sk;0;ON;0060;;;;N;;;;;
+1FF2;GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI;Ll;0;L;1F7C 0345;;;;N;;;;;
+1FF3;GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI;Ll;0;L;03C9 0345;;;;N;;;1FFC;;1FFC
+1FF4;GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI;Ll;0;L;03CE 0345;;;;N;;;;;
+1FF6;GREEK SMALL LETTER OMEGA WITH PERISPOMENI;Ll;0;L;03C9 0342;;;;N;;;;;
+1FF7;GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI;Ll;0;L;1FF6 0345;;;;N;;;;;
+1FF8;GREEK CAPITAL LETTER OMICRON WITH VARIA;Lu;0;L;039F 0300;;;;N;;;;1F78;
+1FF9;GREEK CAPITAL LETTER OMICRON WITH OXIA;Lu;0;L;038C;;;;N;;;;1F79;
+1FFA;GREEK CAPITAL LETTER OMEGA WITH VARIA;Lu;0;L;03A9 0300;;;;N;;;;1F7C;
+1FFB;GREEK CAPITAL LETTER OMEGA WITH OXIA;Lu;0;L;038F;;;;N;;;;1F7D;
+1FFC;GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI;Lt;0;L;03A9 0345;;;;N;;;;1FF3;
+1FFD;GREEK OXIA;Sk;0;ON;00B4;;;;N;;;;;
+1FFE;GREEK DASIA;Sk;0;ON;<compat> 0020 0314;;;;N;;;;;
+2000;EN QUAD;Zs;0;WS;2002;;;;N;;;;;
+2001;EM QUAD;Zs;0;WS;2003;;;;N;;;;;
+2002;EN SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2003;EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2004;THREE-PER-EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2005;FOUR-PER-EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2006;SIX-PER-EM SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2007;FIGURE SPACE;Zs;0;WS;<noBreak> 0020;;;;N;;;;;
+2008;PUNCTUATION SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2009;THIN SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+200A;HAIR SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+200B;ZERO WIDTH SPACE;Cf;0;BN;;;;;N;;;;;
+200C;ZERO WIDTH NON-JOINER;Cf;0;BN;;;;;N;;;;;
+200D;ZERO WIDTH JOINER;Cf;0;BN;;;;;N;;;;;
+200E;LEFT-TO-RIGHT MARK;Cf;0;L;;;;;N;;;;;
+200F;RIGHT-TO-LEFT MARK;Cf;0;R;;;;;N;;;;;
+2010;HYPHEN;Pd;0;ON;;;;;N;;;;;
+2011;NON-BREAKING HYPHEN;Pd;0;ON;<noBreak> 2010;;;;N;;;;;
+2012;FIGURE DASH;Pd;0;ON;;;;;N;;;;;
+2013;EN DASH;Pd;0;ON;;;;;N;;;;;
+2014;EM DASH;Pd;0;ON;;;;;N;;;;;
+2015;HORIZONTAL BAR;Pd;0;ON;;;;;N;QUOTATION DASH;;;;
+2016;DOUBLE VERTICAL LINE;Po;0;ON;;;;;N;DOUBLE VERTICAL BAR;;;;
+2017;DOUBLE LOW LINE;Po;0;ON;<compat> 0020 0333;;;;N;SPACING DOUBLE UNDERSCORE;;;;
+2018;LEFT SINGLE QUOTATION MARK;Pi;0;ON;;;;;N;SINGLE TURNED COMMA QUOTATION MARK;;;;
+2019;RIGHT SINGLE QUOTATION MARK;Pf;0;ON;;;;;N;SINGLE COMMA QUOTATION MARK;;;;
+201A;SINGLE LOW-9 QUOTATION MARK;Ps;0;ON;;;;;N;LOW SINGLE COMMA QUOTATION MARK;;;;
+201B;SINGLE HIGH-REVERSED-9 QUOTATION MARK;Pi;0;ON;;;;;N;SINGLE REVERSED COMMA QUOTATION MARK;;;;
+201C;LEFT DOUBLE QUOTATION MARK;Pi;0;ON;;;;;N;DOUBLE TURNED COMMA QUOTATION MARK;;;;
+201D;RIGHT DOUBLE QUOTATION MARK;Pf;0;ON;;;;;N;DOUBLE COMMA QUOTATION MARK;;;;
+201E;DOUBLE LOW-9 QUOTATION MARK;Ps;0;ON;;;;;N;LOW DOUBLE COMMA QUOTATION MARK;;;;
+201F;DOUBLE HIGH-REVERSED-9 QUOTATION MARK;Pi;0;ON;;;;;N;DOUBLE REVERSED COMMA QUOTATION MARK;;;;
+2020;DAGGER;Po;0;ON;;;;;N;;;;;
+2021;DOUBLE DAGGER;Po;0;ON;;;;;N;;;;;
+2022;BULLET;Po;0;ON;;;;;N;;;;;
+2023;TRIANGULAR BULLET;Po;0;ON;;;;;N;;;;;
+2024;ONE DOT LEADER;Po;0;ON;<compat> 002E;;;;N;;;;;
+2025;TWO DOT LEADER;Po;0;ON;<compat> 002E 002E;;;;N;;;;;
+2026;HORIZONTAL ELLIPSIS;Po;0;ON;<compat> 002E 002E 002E;;;;N;;;;;
+2027;HYPHENATION POINT;Po;0;ON;;;;;N;;;;;
+2028;LINE SEPARATOR;Zl;0;WS;;;;;N;;;;;
+2029;PARAGRAPH SEPARATOR;Zp;0;B;;;;;N;;;;;
+202A;LEFT-TO-RIGHT EMBEDDING;Cf;0;LRE;;;;;N;;;;;
+202B;RIGHT-TO-LEFT EMBEDDING;Cf;0;RLE;;;;;N;;;;;
+202C;POP DIRECTIONAL FORMATTING;Cf;0;PDF;;;;;N;;;;;
+202D;LEFT-TO-RIGHT OVERRIDE;Cf;0;LRO;;;;;N;;;;;
+202E;RIGHT-TO-LEFT OVERRIDE;Cf;0;RLO;;;;;N;;;;;
+202F;NARROW NO-BREAK SPACE;Zs;0;CS;<noBreak> 0020;;;;N;;;;;
+2030;PER MILLE SIGN;Po;0;ET;;;;;N;;;;;
+2031;PER TEN THOUSAND SIGN;Po;0;ET;;;;;N;;;;;
+2032;PRIME;Po;0;ET;;;;;N;;;;;
+2033;DOUBLE PRIME;Po;0;ET;<compat> 2032 2032;;;;N;;;;;
+2034;TRIPLE PRIME;Po;0;ET;<compat> 2032 2032 2032;;;;N;;;;;
+2035;REVERSED PRIME;Po;0;ON;;;;;N;;;;;
+2036;REVERSED DOUBLE PRIME;Po;0;ON;<compat> 2035 2035;;;;N;;;;;
+2037;REVERSED TRIPLE PRIME;Po;0;ON;<compat> 2035 2035 2035;;;;N;;;;;
+2038;CARET;Po;0;ON;;;;;N;;;;;
+2039;SINGLE LEFT-POINTING ANGLE QUOTATION MARK;Pi;0;ON;;;;;Y;LEFT POINTING SINGLE GUILLEMET;;;;
+203A;SINGLE RIGHT-POINTING ANGLE QUOTATION MARK;Pf;0;ON;;;;;Y;RIGHT POINTING SINGLE GUILLEMET;;;;
+203B;REFERENCE MARK;Po;0;ON;;;;;N;;;;;
+203C;DOUBLE EXCLAMATION MARK;Po;0;ON;<compat> 0021 0021;;;;N;;;;;
+203D;INTERROBANG;Po;0;ON;;;;;N;;;;;
+203E;OVERLINE;Po;0;ON;<compat> 0020 0305;;;;N;SPACING OVERSCORE;;;;
+203F;UNDERTIE;Pc;0;ON;;;;;N;;Enotikon;;;
+2040;CHARACTER TIE;Pc;0;ON;;;;;N;;;;;
+2041;CARET INSERTION POINT;Po;0;ON;;;;;N;;;;;
+2042;ASTERISM;Po;0;ON;;;;;N;;;;;
+2043;HYPHEN BULLET;Po;0;ON;;;;;N;;;;;
+2044;FRACTION SLASH;Sm;0;CS;;;;;N;;;;;
+2045;LEFT SQUARE BRACKET WITH QUILL;Ps;0;ON;;;;;Y;;;;;
+2046;RIGHT SQUARE BRACKET WITH QUILL;Pe;0;ON;;;;;Y;;;;;
+2047;DOUBLE QUESTION MARK;Po;0;ON;<compat> 003F 003F;;;;N;;;;;
+2048;QUESTION EXCLAMATION MARK;Po;0;ON;<compat> 003F 0021;;;;N;;;;;
+2049;EXCLAMATION QUESTION MARK;Po;0;ON;<compat> 0021 003F;;;;N;;;;;
+204A;TIRONIAN SIGN ET;Po;0;ON;;;;;N;;;;;
+204B;REVERSED PILCROW SIGN;Po;0;ON;;;;;N;;;;;
+204C;BLACK LEFTWARDS BULLET;Po;0;ON;;;;;N;;;;;
+204D;BLACK RIGHTWARDS BULLET;Po;0;ON;;;;;N;;;;;
+204E;LOW ASTERISK;Po;0;ON;;;;;N;;;;;
+204F;REVERSED SEMICOLON;Po;0;ON;;;;;N;;;;;
+2050;CLOSE UP;Po;0;ON;;;;;N;;;;;
+2051;TWO ASTERISKS ALIGNED VERTICALLY;Po;0;ON;;;;;N;;;;;
+2052;COMMERCIAL MINUS SIGN;Sm;0;ON;;;;;N;;;;;
+2053;SWUNG DASH;Po;0;ON;;;;;N;;;;;
+2054;INVERTED UNDERTIE;Pc;0;ON;;;;;N;;;;;
+2055;FLOWER PUNCTUATION MARK;Po;0;ON;;;;;N;;;;;
+2056;THREE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+2057;QUADRUPLE PRIME;Po;0;ON;<compat> 2032 2032 2032 2032;;;;N;;;;;
+2058;FOUR DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+2059;FIVE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+205A;TWO DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+205B;FOUR DOT MARK;Po;0;ON;;;;;N;;;;;
+205C;DOTTED CROSS;Po;0;ON;;;;;N;;;;;
+205D;TRICOLON;Po;0;ON;;;;;N;;;;;
+205E;VERTICAL FOUR DOTS;Po;0;ON;;;;;N;;;;;
+205F;MEDIUM MATHEMATICAL SPACE;Zs;0;WS;<compat> 0020;;;;N;;;;;
+2060;WORD JOINER;Cf;0;BN;;;;;N;;;;;
+2061;FUNCTION APPLICATION;Cf;0;BN;;;;;N;;;;;
+2062;INVISIBLE TIMES;Cf;0;BN;;;;;N;;;;;
+2063;INVISIBLE SEPARATOR;Cf;0;BN;;;;;N;;;;;
+2064;INVISIBLE PLUS;Cf;0;BN;;;;;N;;;;;
+206A;INHIBIT SYMMETRIC SWAPPING;Cf;0;BN;;;;;N;;;;;
+206B;ACTIVATE SYMMETRIC SWAPPING;Cf;0;BN;;;;;N;;;;;
+206C;INHIBIT ARABIC FORM SHAPING;Cf;0;BN;;;;;N;;;;;
+206D;ACTIVATE ARABIC FORM SHAPING;Cf;0;BN;;;;;N;;;;;
+206E;NATIONAL DIGIT SHAPES;Cf;0;BN;;;;;N;;;;;
+206F;NOMINAL DIGIT SHAPES;Cf;0;BN;;;;;N;;;;;
+2070;SUPERSCRIPT ZERO;No;0;EN;<super> 0030;;0;0;N;SUPERSCRIPT DIGIT ZERO;;;;
+2071;SUPERSCRIPT LATIN SMALL LETTER I;Ll;0;L;<super> 0069;;;;N;;;;;
+2074;SUPERSCRIPT FOUR;No;0;EN;<super> 0034;;4;4;N;SUPERSCRIPT DIGIT FOUR;;;;
+2075;SUPERSCRIPT FIVE;No;0;EN;<super> 0035;;5;5;N;SUPERSCRIPT DIGIT FIVE;;;;
+2076;SUPERSCRIPT SIX;No;0;EN;<super> 0036;;6;6;N;SUPERSCRIPT DIGIT SIX;;;;
+2077;SUPERSCRIPT SEVEN;No;0;EN;<super> 0037;;7;7;N;SUPERSCRIPT DIGIT SEVEN;;;;
+2078;SUPERSCRIPT EIGHT;No;0;EN;<super> 0038;;8;8;N;SUPERSCRIPT DIGIT EIGHT;;;;
+2079;SUPERSCRIPT NINE;No;0;EN;<super> 0039;;9;9;N;SUPERSCRIPT DIGIT NINE;;;;
+207A;SUPERSCRIPT PLUS SIGN;Sm;0;ES;<super> 002B;;;;N;;;;;
+207B;SUPERSCRIPT MINUS;Sm;0;ES;<super> 2212;;;;N;SUPERSCRIPT HYPHEN-MINUS;;;;
+207C;SUPERSCRIPT EQUALS SIGN;Sm;0;ON;<super> 003D;;;;N;;;;;
+207D;SUPERSCRIPT LEFT PARENTHESIS;Ps;0;ON;<super> 0028;;;;Y;SUPERSCRIPT OPENING PARENTHESIS;;;;
+207E;SUPERSCRIPT RIGHT PARENTHESIS;Pe;0;ON;<super> 0029;;;;Y;SUPERSCRIPT CLOSING PARENTHESIS;;;;
+207F;SUPERSCRIPT LATIN SMALL LETTER N;Ll;0;L;<super> 006E;;;;N;;;;;
+2080;SUBSCRIPT ZERO;No;0;EN;<sub> 0030;;0;0;N;SUBSCRIPT DIGIT ZERO;;;;
+2081;SUBSCRIPT ONE;No;0;EN;<sub> 0031;;1;1;N;SUBSCRIPT DIGIT ONE;;;;
+2082;SUBSCRIPT TWO;No;0;EN;<sub> 0032;;2;2;N;SUBSCRIPT DIGIT TWO;;;;
+2083;SUBSCRIPT THREE;No;0;EN;<sub> 0033;;3;3;N;SUBSCRIPT DIGIT THREE;;;;
+2084;SUBSCRIPT FOUR;No;0;EN;<sub> 0034;;4;4;N;SUBSCRIPT DIGIT FOUR;;;;
+2085;SUBSCRIPT FIVE;No;0;EN;<sub> 0035;;5;5;N;SUBSCRIPT DIGIT FIVE;;;;
+2086;SUBSCRIPT SIX;No;0;EN;<sub> 0036;;6;6;N;SUBSCRIPT DIGIT SIX;;;;
+2087;SUBSCRIPT SEVEN;No;0;EN;<sub> 0037;;7;7;N;SUBSCRIPT DIGIT SEVEN;;;;
+2088;SUBSCRIPT EIGHT;No;0;EN;<sub> 0038;;8;8;N;SUBSCRIPT DIGIT EIGHT;;;;
+2089;SUBSCRIPT NINE;No;0;EN;<sub> 0039;;9;9;N;SUBSCRIPT DIGIT NINE;;;;
+208A;SUBSCRIPT PLUS SIGN;Sm;0;ES;<sub> 002B;;;;N;;;;;
+208B;SUBSCRIPT MINUS;Sm;0;ES;<sub> 2212;;;;N;SUBSCRIPT HYPHEN-MINUS;;;;
+208C;SUBSCRIPT EQUALS SIGN;Sm;0;ON;<sub> 003D;;;;N;;;;;
+208D;SUBSCRIPT LEFT PARENTHESIS;Ps;0;ON;<sub> 0028;;;;Y;SUBSCRIPT OPENING PARENTHESIS;;;;
+208E;SUBSCRIPT RIGHT PARENTHESIS;Pe;0;ON;<sub> 0029;;;;Y;SUBSCRIPT CLOSING PARENTHESIS;;;;
+2090;LATIN SUBSCRIPT SMALL LETTER A;Lm;0;L;<sub> 0061;;;;N;;;;;
+2091;LATIN SUBSCRIPT SMALL LETTER E;Lm;0;L;<sub> 0065;;;;N;;;;;
+2092;LATIN SUBSCRIPT SMALL LETTER O;Lm;0;L;<sub> 006F;;;;N;;;;;
+2093;LATIN SUBSCRIPT SMALL LETTER X;Lm;0;L;<sub> 0078;;;;N;;;;;
+2094;LATIN SUBSCRIPT SMALL LETTER SCHWA;Lm;0;L;<sub> 0259;;;;N;;;;;
+20A0;EURO-CURRENCY SIGN;Sc;0;ET;;;;;N;;;;;
+20A1;COLON SIGN;Sc;0;ET;;;;;N;;;;;
+20A2;CRUZEIRO SIGN;Sc;0;ET;;;;;N;;;;;
+20A3;FRENCH FRANC SIGN;Sc;0;ET;;;;;N;;;;;
+20A4;LIRA SIGN;Sc;0;ET;;;;;N;;;;;
+20A5;MILL SIGN;Sc;0;ET;;;;;N;;;;;
+20A6;NAIRA SIGN;Sc;0;ET;;;;;N;;;;;
+20A7;PESETA SIGN;Sc;0;ET;;;;;N;;;;;
+20A8;RUPEE SIGN;Sc;0;ET;<compat> 0052 0073;;;;N;;;;;
+20A9;WON SIGN;Sc;0;ET;;;;;N;;;;;
+20AA;NEW SHEQEL SIGN;Sc;0;ET;;;;;N;;;;;
+20AB;DONG SIGN;Sc;0;ET;;;;;N;;;;;
+20AC;EURO SIGN;Sc;0;ET;;;;;N;;;;;
+20AD;KIP SIGN;Sc;0;ET;;;;;N;;;;;
+20AE;TUGRIK SIGN;Sc;0;ET;;;;;N;;;;;
+20AF;DRACHMA SIGN;Sc;0;ET;;;;;N;;;;;
+20B0;GERMAN PENNY SIGN;Sc;0;ET;;;;;N;;;;;
+20B1;PESO SIGN;Sc;0;ET;;;;;N;;;;;
+20B2;GUARANI SIGN;Sc;0;ET;;;;;N;;;;;
+20B3;AUSTRAL SIGN;Sc;0;ET;;;;;N;;;;;
+20B4;HRYVNIA SIGN;Sc;0;ET;;;;;N;;;;;
+20B5;CEDI SIGN;Sc;0;ET;;;;;N;;;;;
+20D0;COMBINING LEFT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT HARPOON ABOVE;;;;
+20D1;COMBINING RIGHT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT HARPOON ABOVE;;;;
+20D2;COMBINING LONG VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG VERTICAL BAR OVERLAY;;;;
+20D3;COMBINING SHORT VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING SHORT VERTICAL BAR OVERLAY;;;;
+20D4;COMBINING ANTICLOCKWISE ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING ANTICLOCKWISE ARROW ABOVE;;;;
+20D5;COMBINING CLOCKWISE ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING CLOCKWISE ARROW ABOVE;;;;
+20D6;COMBINING LEFT ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT ARROW ABOVE;;;;
+20D7;COMBINING RIGHT ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT ARROW ABOVE;;;;
+20D8;COMBINING RING OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING RING OVERLAY;;;;
+20D9;COMBINING CLOCKWISE RING OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING CLOCKWISE RING OVERLAY;;;;
+20DA;COMBINING ANTICLOCKWISE RING OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING ANTICLOCKWISE RING OVERLAY;;;;
+20DB;COMBINING THREE DOTS ABOVE;Mn;230;NSM;;;;;N;NON-SPACING THREE DOTS ABOVE;;;;
+20DC;COMBINING FOUR DOTS ABOVE;Mn;230;NSM;;;;;N;NON-SPACING FOUR DOTS ABOVE;;;;
+20DD;COMBINING ENCLOSING CIRCLE;Me;0;NSM;;;;;N;ENCLOSING CIRCLE;;;;
+20DE;COMBINING ENCLOSING SQUARE;Me;0;NSM;;;;;N;ENCLOSING SQUARE;;;;
+20DF;COMBINING ENCLOSING DIAMOND;Me;0;NSM;;;;;N;ENCLOSING DIAMOND;;;;
+20E0;COMBINING ENCLOSING CIRCLE BACKSLASH;Me;0;NSM;;;;;N;ENCLOSING CIRCLE SLASH;;;;
+20E1;COMBINING LEFT RIGHT ARROW ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT RIGHT ARROW ABOVE;;;;
+20E2;COMBINING ENCLOSING SCREEN;Me;0;NSM;;;;;N;;;;;
+20E3;COMBINING ENCLOSING KEYCAP;Me;0;NSM;;;;;N;;;;;
+20E4;COMBINING ENCLOSING UPWARD POINTING TRIANGLE;Me;0;NSM;;;;;N;;;;;
+20E5;COMBINING REVERSE SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;;;;;
+20E6;COMBINING DOUBLE VERTICAL STROKE OVERLAY;Mn;1;NSM;;;;;N;;;;;
+20E7;COMBINING ANNUITY SYMBOL;Mn;230;NSM;;;;;N;;;;;
+20E8;COMBINING TRIPLE UNDERDOT;Mn;220;NSM;;;;;N;;;;;
+20E9;COMBINING WIDE BRIDGE ABOVE;Mn;230;NSM;;;;;N;;;;;
+20EA;COMBINING LEFTWARDS ARROW OVERLAY;Mn;1;NSM;;;;;N;;;;;
+20EB;COMBINING LONG DOUBLE SOLIDUS OVERLAY;Mn;1;NSM;;;;;N;;;;;
+20EC;COMBINING RIGHTWARDS HARPOON WITH BARB DOWNWARDS;Mn;220;NSM;;;;;N;;;;;
+20ED;COMBINING LEFTWARDS HARPOON WITH BARB DOWNWARDS;Mn;220;NSM;;;;;N;;;;;
+20EE;COMBINING LEFT ARROW BELOW;Mn;220;NSM;;;;;N;;;;;
+20EF;COMBINING RIGHT ARROW BELOW;Mn;220;NSM;;;;;N;;;;;
+20F0;COMBINING ASTERISK ABOVE;Mn;230;NSM;;;;;N;;;;;
+2100;ACCOUNT OF;So;0;ON;<compat> 0061 002F 0063;;;;N;;;;;
+2101;ADDRESSED TO THE SUBJECT;So;0;ON;<compat> 0061 002F 0073;;;;N;;;;;
+2102;DOUBLE-STRUCK CAPITAL C;Lu;0;L;<font> 0043;;;;N;DOUBLE-STRUCK C;;;;
+2103;DEGREE CELSIUS;So;0;ON;<compat> 00B0 0043;;;;N;DEGREES CENTIGRADE;;;;
+2104;CENTRE LINE SYMBOL;So;0;ON;;;;;N;C L SYMBOL;;;;
+2105;CARE OF;So;0;ON;<compat> 0063 002F 006F;;;;N;;;;;
+2106;CADA UNA;So;0;ON;<compat> 0063 002F 0075;;;;N;;;;;
+2107;EULER CONSTANT;Lu;0;L;<compat> 0190;;;;N;EULERS;;;;
+2108;SCRUPLE;So;0;ON;;;;;N;;;;;
+2109;DEGREE FAHRENHEIT;So;0;ON;<compat> 00B0 0046;;;;N;DEGREES FAHRENHEIT;;;;
+210A;SCRIPT SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+210B;SCRIPT CAPITAL H;Lu;0;L;<font> 0048;;;;N;SCRIPT H;;;;
+210C;BLACK-LETTER CAPITAL H;Lu;0;L;<font> 0048;;;;N;BLACK-LETTER H;;;;
+210D;DOUBLE-STRUCK CAPITAL H;Lu;0;L;<font> 0048;;;;N;DOUBLE-STRUCK H;;;;
+210E;PLANCK CONSTANT;Ll;0;L;<font> 0068;;;;N;;;;;
+210F;PLANCK CONSTANT OVER TWO PI;Ll;0;L;<font> 0127;;;;N;PLANCK CONSTANT OVER 2 PI;;;;
+2110;SCRIPT CAPITAL I;Lu;0;L;<font> 0049;;;;N;SCRIPT I;;;;
+2111;BLACK-LETTER CAPITAL I;Lu;0;L;<font> 0049;;;;N;BLACK-LETTER I;;;;
+2112;SCRIPT CAPITAL L;Lu;0;L;<font> 004C;;;;N;SCRIPT L;;;;
+2113;SCRIPT SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+2114;L B BAR SYMBOL;So;0;ON;;;;;N;;;;;
+2115;DOUBLE-STRUCK CAPITAL N;Lu;0;L;<font> 004E;;;;N;DOUBLE-STRUCK N;;;;
+2116;NUMERO SIGN;So;0;ON;<compat> 004E 006F;;;;N;NUMERO;;;;
+2117;SOUND RECORDING COPYRIGHT;So;0;ON;;;;;N;;;;;
+2118;SCRIPT CAPITAL P;So;0;ON;;;;;N;SCRIPT P;;;;
+2119;DOUBLE-STRUCK CAPITAL P;Lu;0;L;<font> 0050;;;;N;DOUBLE-STRUCK P;;;;
+211A;DOUBLE-STRUCK CAPITAL Q;Lu;0;L;<font> 0051;;;;N;DOUBLE-STRUCK Q;;;;
+211B;SCRIPT CAPITAL R;Lu;0;L;<font> 0052;;;;N;SCRIPT R;;;;
+211C;BLACK-LETTER CAPITAL R;Lu;0;L;<font> 0052;;;;N;BLACK-LETTER R;;;;
+211D;DOUBLE-STRUCK CAPITAL R;Lu;0;L;<font> 0052;;;;N;DOUBLE-STRUCK R;;;;
+211E;PRESCRIPTION TAKE;So;0;ON;;;;;N;;;;;
+211F;RESPONSE;So;0;ON;;;;;N;;;;;
+2120;SERVICE MARK;So;0;ON;<super> 0053 004D;;;;N;;;;;
+2121;TELEPHONE SIGN;So;0;ON;<compat> 0054 0045 004C;;;;N;T E L SYMBOL;;;;
+2122;TRADE MARK SIGN;So;0;ON;<super> 0054 004D;;;;N;TRADEMARK;;;;
+2123;VERSICLE;So;0;ON;;;;;N;;;;;
+2124;DOUBLE-STRUCK CAPITAL Z;Lu;0;L;<font> 005A;;;;N;DOUBLE-STRUCK Z;;;;
+2125;OUNCE SIGN;So;0;ON;;;;;N;OUNCE;;;;
+2126;OHM SIGN;Lu;0;L;03A9;;;;N;OHM;;;03C9;
+2127;INVERTED OHM SIGN;So;0;ON;;;;;N;MHO;;;;
+2128;BLACK-LETTER CAPITAL Z;Lu;0;L;<font> 005A;;;;N;BLACK-LETTER Z;;;;
+2129;TURNED GREEK SMALL LETTER IOTA;So;0;ON;;;;;N;;;;;
+212A;KELVIN SIGN;Lu;0;L;004B;;;;N;DEGREES KELVIN;;;006B;
+212B;ANGSTROM SIGN;Lu;0;L;00C5;;;;N;ANGSTROM UNIT;;;00E5;
+212C;SCRIPT CAPITAL B;Lu;0;L;<font> 0042;;;;N;SCRIPT B;;;;
+212D;BLACK-LETTER CAPITAL C;Lu;0;L;<font> 0043;;;;N;BLACK-LETTER C;;;;
+212E;ESTIMATED SYMBOL;So;0;ET;;;;;N;;;;;
+212F;SCRIPT SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+2130;SCRIPT CAPITAL E;Lu;0;L;<font> 0045;;;;N;SCRIPT E;;;;
+2131;SCRIPT CAPITAL F;Lu;0;L;<font> 0046;;;;N;SCRIPT F;;;;
+2132;TURNED CAPITAL F;Lu;0;L;;;;;N;TURNED F;;;214E;
+2133;SCRIPT CAPITAL M;Lu;0;L;<font> 004D;;;;N;SCRIPT M;;;;
+2134;SCRIPT SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+2135;ALEF SYMBOL;Lo;0;L;<compat> 05D0;;;;N;FIRST TRANSFINITE CARDINAL;;;;
+2136;BET SYMBOL;Lo;0;L;<compat> 05D1;;;;N;SECOND TRANSFINITE CARDINAL;;;;
+2137;GIMEL SYMBOL;Lo;0;L;<compat> 05D2;;;;N;THIRD TRANSFINITE CARDINAL;;;;
+2138;DALET SYMBOL;Lo;0;L;<compat> 05D3;;;;N;FOURTH TRANSFINITE CARDINAL;;;;
+2139;INFORMATION SOURCE;Ll;0;L;<font> 0069;;;;N;;;;;
+213A;ROTATED CAPITAL Q;So;0;ON;;;;;N;;;;;
+213B;FACSIMILE SIGN;So;0;ON;<compat> 0046 0041 0058;;;;N;;;;;
+213C;DOUBLE-STRUCK SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+213D;DOUBLE-STRUCK SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+213E;DOUBLE-STRUCK CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+213F;DOUBLE-STRUCK CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+2140;DOUBLE-STRUCK N-ARY SUMMATION;Sm;0;ON;<font> 2211;;;;Y;;;;;
+2141;TURNED SANS-SERIF CAPITAL G;Sm;0;ON;;;;;N;;;;;
+2142;TURNED SANS-SERIF CAPITAL L;Sm;0;ON;;;;;N;;;;;
+2143;REVERSED SANS-SERIF CAPITAL L;Sm;0;ON;;;;;N;;;;;
+2144;TURNED SANS-SERIF CAPITAL Y;Sm;0;ON;;;;;N;;;;;
+2145;DOUBLE-STRUCK ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+2146;DOUBLE-STRUCK ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+2147;DOUBLE-STRUCK ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+2148;DOUBLE-STRUCK ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+2149;DOUBLE-STRUCK ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+214A;PROPERTY LINE;So;0;ON;;;;;N;;;;;
+214B;TURNED AMPERSAND;Sm;0;ON;;;;;N;;;;;
+214C;PER SIGN;So;0;ON;;;;;N;;;;;
+214D;AKTIESELSKAB;So;0;ON;;;;;N;;;;;
+214E;TURNED SMALL F;Ll;0;L;;;;;N;;;2132;;2132
+214F;SYMBOL FOR SAMARITAN SOURCE;So;0;L;;;;;N;;;;;
+2153;VULGAR FRACTION ONE THIRD;No;0;ON;<fraction> 0031 2044 0033;;;1/3;N;FRACTION ONE THIRD;;;;
+2154;VULGAR FRACTION TWO THIRDS;No;0;ON;<fraction> 0032 2044 0033;;;2/3;N;FRACTION TWO THIRDS;;;;
+2155;VULGAR FRACTION ONE FIFTH;No;0;ON;<fraction> 0031 2044 0035;;;1/5;N;FRACTION ONE FIFTH;;;;
+2156;VULGAR FRACTION TWO FIFTHS;No;0;ON;<fraction> 0032 2044 0035;;;2/5;N;FRACTION TWO FIFTHS;;;;
+2157;VULGAR FRACTION THREE FIFTHS;No;0;ON;<fraction> 0033 2044 0035;;;3/5;N;FRACTION THREE FIFTHS;;;;
+2158;VULGAR FRACTION FOUR FIFTHS;No;0;ON;<fraction> 0034 2044 0035;;;4/5;N;FRACTION FOUR FIFTHS;;;;
+2159;VULGAR FRACTION ONE SIXTH;No;0;ON;<fraction> 0031 2044 0036;;;1/6;N;FRACTION ONE SIXTH;;;;
+215A;VULGAR FRACTION FIVE SIXTHS;No;0;ON;<fraction> 0035 2044 0036;;;5/6;N;FRACTION FIVE SIXTHS;;;;
+215B;VULGAR FRACTION ONE EIGHTH;No;0;ON;<fraction> 0031 2044 0038;;;1/8;N;FRACTION ONE EIGHTH;;;;
+215C;VULGAR FRACTION THREE EIGHTHS;No;0;ON;<fraction> 0033 2044 0038;;;3/8;N;FRACTION THREE EIGHTHS;;;;
+215D;VULGAR FRACTION FIVE EIGHTHS;No;0;ON;<fraction> 0035 2044 0038;;;5/8;N;FRACTION FIVE EIGHTHS;;;;
+215E;VULGAR FRACTION SEVEN EIGHTHS;No;0;ON;<fraction> 0037 2044 0038;;;7/8;N;FRACTION SEVEN EIGHTHS;;;;
+215F;FRACTION NUMERATOR ONE;No;0;ON;<fraction> 0031 2044;;;1;N;;;;;
+2160;ROMAN NUMERAL ONE;Nl;0;L;<compat> 0049;;;1;N;;;;2170;
+2161;ROMAN NUMERAL TWO;Nl;0;L;<compat> 0049 0049;;;2;N;;;;2171;
+2162;ROMAN NUMERAL THREE;Nl;0;L;<compat> 0049 0049 0049;;;3;N;;;;2172;
+2163;ROMAN NUMERAL FOUR;Nl;0;L;<compat> 0049 0056;;;4;N;;;;2173;
+2164;ROMAN NUMERAL FIVE;Nl;0;L;<compat> 0056;;;5;N;;;;2174;
+2165;ROMAN NUMERAL SIX;Nl;0;L;<compat> 0056 0049;;;6;N;;;;2175;
+2166;ROMAN NUMERAL SEVEN;Nl;0;L;<compat> 0056 0049 0049;;;7;N;;;;2176;
+2167;ROMAN NUMERAL EIGHT;Nl;0;L;<compat> 0056 0049 0049 0049;;;8;N;;;;2177;
+2168;ROMAN NUMERAL NINE;Nl;0;L;<compat> 0049 0058;;;9;N;;;;2178;
+2169;ROMAN NUMERAL TEN;Nl;0;L;<compat> 0058;;;10;N;;;;2179;
+216A;ROMAN NUMERAL ELEVEN;Nl;0;L;<compat> 0058 0049;;;11;N;;;;217A;
+216B;ROMAN NUMERAL TWELVE;Nl;0;L;<compat> 0058 0049 0049;;;12;N;;;;217B;
+216C;ROMAN NUMERAL FIFTY;Nl;0;L;<compat> 004C;;;50;N;;;;217C;
+216D;ROMAN NUMERAL ONE HUNDRED;Nl;0;L;<compat> 0043;;;100;N;;;;217D;
+216E;ROMAN NUMERAL FIVE HUNDRED;Nl;0;L;<compat> 0044;;;500;N;;;;217E;
+216F;ROMAN NUMERAL ONE THOUSAND;Nl;0;L;<compat> 004D;;;1000;N;;;;217F;
+2170;SMALL ROMAN NUMERAL ONE;Nl;0;L;<compat> 0069;;;1;N;;;2160;;2160
+2171;SMALL ROMAN NUMERAL TWO;Nl;0;L;<compat> 0069 0069;;;2;N;;;2161;;2161
+2172;SMALL ROMAN NUMERAL THREE;Nl;0;L;<compat> 0069 0069 0069;;;3;N;;;2162;;2162
+2173;SMALL ROMAN NUMERAL FOUR;Nl;0;L;<compat> 0069 0076;;;4;N;;;2163;;2163
+2174;SMALL ROMAN NUMERAL FIVE;Nl;0;L;<compat> 0076;;;5;N;;;2164;;2164
+2175;SMALL ROMAN NUMERAL SIX;Nl;0;L;<compat> 0076 0069;;;6;N;;;2165;;2165
+2176;SMALL ROMAN NUMERAL SEVEN;Nl;0;L;<compat> 0076 0069 0069;;;7;N;;;2166;;2166
+2177;SMALL ROMAN NUMERAL EIGHT;Nl;0;L;<compat> 0076 0069 0069 0069;;;8;N;;;2167;;2167
+2178;SMALL ROMAN NUMERAL NINE;Nl;0;L;<compat> 0069 0078;;;9;N;;;2168;;2168
+2179;SMALL ROMAN NUMERAL TEN;Nl;0;L;<compat> 0078;;;10;N;;;2169;;2169
+217A;SMALL ROMAN NUMERAL ELEVEN;Nl;0;L;<compat> 0078 0069;;;11;N;;;216A;;216A
+217B;SMALL ROMAN NUMERAL TWELVE;Nl;0;L;<compat> 0078 0069 0069;;;12;N;;;216B;;216B
+217C;SMALL ROMAN NUMERAL FIFTY;Nl;0;L;<compat> 006C;;;50;N;;;216C;;216C
+217D;SMALL ROMAN NUMERAL ONE HUNDRED;Nl;0;L;<compat> 0063;;;100;N;;;216D;;216D
+217E;SMALL ROMAN NUMERAL FIVE HUNDRED;Nl;0;L;<compat> 0064;;;500;N;;;216E;;216E
+217F;SMALL ROMAN NUMERAL ONE THOUSAND;Nl;0;L;<compat> 006D;;;1000;N;;;216F;;216F
+2180;ROMAN NUMERAL ONE THOUSAND C D;Nl;0;L;;;;1000;N;;;;;
+2181;ROMAN NUMERAL FIVE THOUSAND;Nl;0;L;;;;5000;N;;;;;
+2182;ROMAN NUMERAL TEN THOUSAND;Nl;0;L;;;;10000;N;;;;;
+2183;ROMAN NUMERAL REVERSED ONE HUNDRED;Lu;0;L;;;;;N;;;;2184;
+2184;LATIN SMALL LETTER REVERSED C;Ll;0;L;;;;;N;;;2183;;2183
+2185;ROMAN NUMERAL SIX LATE FORM;Nl;0;L;;;;6;N;;;;;
+2186;ROMAN NUMERAL FIFTY EARLY FORM;Nl;0;L;;;;50;N;;;;;
+2187;ROMAN NUMERAL FIFTY THOUSAND;Nl;0;L;;;;50000;N;;;;;
+2188;ROMAN NUMERAL ONE HUNDRED THOUSAND;Nl;0;L;;;;100000;N;;;;;
+2190;LEFTWARDS ARROW;Sm;0;ON;;;;;N;LEFT ARROW;;;;
+2191;UPWARDS ARROW;Sm;0;ON;;;;;N;UP ARROW;;;;
+2192;RIGHTWARDS ARROW;Sm;0;ON;;;;;N;RIGHT ARROW;;;;
+2193;DOWNWARDS ARROW;Sm;0;ON;;;;;N;DOWN ARROW;;;;
+2194;LEFT RIGHT ARROW;Sm;0;ON;;;;;N;;;;;
+2195;UP DOWN ARROW;So;0;ON;;;;;N;;;;;
+2196;NORTH WEST ARROW;So;0;ON;;;;;N;UPPER LEFT ARROW;;;;
+2197;NORTH EAST ARROW;So;0;ON;;;;;N;UPPER RIGHT ARROW;;;;
+2198;SOUTH EAST ARROW;So;0;ON;;;;;N;LOWER RIGHT ARROW;;;;
+2199;SOUTH WEST ARROW;So;0;ON;;;;;N;LOWER LEFT ARROW;;;;
+219A;LEFTWARDS ARROW WITH STROKE;Sm;0;ON;2190 0338;;;;N;LEFT ARROW WITH STROKE;;;;
+219B;RIGHTWARDS ARROW WITH STROKE;Sm;0;ON;2192 0338;;;;N;RIGHT ARROW WITH STROKE;;;;
+219C;LEFTWARDS WAVE ARROW;So;0;ON;;;;;N;LEFT WAVE ARROW;;;;
+219D;RIGHTWARDS WAVE ARROW;So;0;ON;;;;;N;RIGHT WAVE ARROW;;;;
+219E;LEFTWARDS TWO HEADED ARROW;So;0;ON;;;;;N;LEFT TWO HEADED ARROW;;;;
+219F;UPWARDS TWO HEADED ARROW;So;0;ON;;;;;N;UP TWO HEADED ARROW;;;;
+21A0;RIGHTWARDS TWO HEADED ARROW;Sm;0;ON;;;;;N;RIGHT TWO HEADED ARROW;;;;
+21A1;DOWNWARDS TWO HEADED ARROW;So;0;ON;;;;;N;DOWN TWO HEADED ARROW;;;;
+21A2;LEFTWARDS ARROW WITH TAIL;So;0;ON;;;;;N;LEFT ARROW WITH TAIL;;;;
+21A3;RIGHTWARDS ARROW WITH TAIL;Sm;0;ON;;;;;N;RIGHT ARROW WITH TAIL;;;;
+21A4;LEFTWARDS ARROW FROM BAR;So;0;ON;;;;;N;LEFT ARROW FROM BAR;;;;
+21A5;UPWARDS ARROW FROM BAR;So;0;ON;;;;;N;UP ARROW FROM BAR;;;;
+21A6;RIGHTWARDS ARROW FROM BAR;Sm;0;ON;;;;;N;RIGHT ARROW FROM BAR;;;;
+21A7;DOWNWARDS ARROW FROM BAR;So;0;ON;;;;;N;DOWN ARROW FROM BAR;;;;
+21A8;UP DOWN ARROW WITH BASE;So;0;ON;;;;;N;;;;;
+21A9;LEFTWARDS ARROW WITH HOOK;So;0;ON;;;;;N;LEFT ARROW WITH HOOK;;;;
+21AA;RIGHTWARDS ARROW WITH HOOK;So;0;ON;;;;;N;RIGHT ARROW WITH HOOK;;;;
+21AB;LEFTWARDS ARROW WITH LOOP;So;0;ON;;;;;N;LEFT ARROW WITH LOOP;;;;
+21AC;RIGHTWARDS ARROW WITH LOOP;So;0;ON;;;;;N;RIGHT ARROW WITH LOOP;;;;
+21AD;LEFT RIGHT WAVE ARROW;So;0;ON;;;;;N;;;;;
+21AE;LEFT RIGHT ARROW WITH STROKE;Sm;0;ON;2194 0338;;;;N;;;;;
+21AF;DOWNWARDS ZIGZAG ARROW;So;0;ON;;;;;N;DOWN ZIGZAG ARROW;;;;
+21B0;UPWARDS ARROW WITH TIP LEFTWARDS;So;0;ON;;;;;N;UP ARROW WITH TIP LEFT;;;;
+21B1;UPWARDS ARROW WITH TIP RIGHTWARDS;So;0;ON;;;;;N;UP ARROW WITH TIP RIGHT;;;;
+21B2;DOWNWARDS ARROW WITH TIP LEFTWARDS;So;0;ON;;;;;N;DOWN ARROW WITH TIP LEFT;;;;
+21B3;DOWNWARDS ARROW WITH TIP RIGHTWARDS;So;0;ON;;;;;N;DOWN ARROW WITH TIP RIGHT;;;;
+21B4;RIGHTWARDS ARROW WITH CORNER DOWNWARDS;So;0;ON;;;;;N;RIGHT ARROW WITH CORNER DOWN;;;;
+21B5;DOWNWARDS ARROW WITH CORNER LEFTWARDS;So;0;ON;;;;;N;DOWN ARROW WITH CORNER LEFT;;;;
+21B6;ANTICLOCKWISE TOP SEMICIRCLE ARROW;So;0;ON;;;;;N;;;;;
+21B7;CLOCKWISE TOP SEMICIRCLE ARROW;So;0;ON;;;;;N;;;;;
+21B8;NORTH WEST ARROW TO LONG BAR;So;0;ON;;;;;N;UPPER LEFT ARROW TO LONG BAR;;;;
+21B9;LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR;So;0;ON;;;;;N;LEFT ARROW TO BAR OVER RIGHT ARROW TO BAR;;;;
+21BA;ANTICLOCKWISE OPEN CIRCLE ARROW;So;0;ON;;;;;N;;;;;
+21BB;CLOCKWISE OPEN CIRCLE ARROW;So;0;ON;;;;;N;;;;;
+21BC;LEFTWARDS HARPOON WITH BARB UPWARDS;So;0;ON;;;;;N;LEFT HARPOON WITH BARB UP;;;;
+21BD;LEFTWARDS HARPOON WITH BARB DOWNWARDS;So;0;ON;;;;;N;LEFT HARPOON WITH BARB DOWN;;;;
+21BE;UPWARDS HARPOON WITH BARB RIGHTWARDS;So;0;ON;;;;;N;UP HARPOON WITH BARB RIGHT;;;;
+21BF;UPWARDS HARPOON WITH BARB LEFTWARDS;So;0;ON;;;;;N;UP HARPOON WITH BARB LEFT;;;;
+21C0;RIGHTWARDS HARPOON WITH BARB UPWARDS;So;0;ON;;;;;N;RIGHT HARPOON WITH BARB UP;;;;
+21C1;RIGHTWARDS HARPOON WITH BARB DOWNWARDS;So;0;ON;;;;;N;RIGHT HARPOON WITH BARB DOWN;;;;
+21C2;DOWNWARDS HARPOON WITH BARB RIGHTWARDS;So;0;ON;;;;;N;DOWN HARPOON WITH BARB RIGHT;;;;
+21C3;DOWNWARDS HARPOON WITH BARB LEFTWARDS;So;0;ON;;;;;N;DOWN HARPOON WITH BARB LEFT;;;;
+21C4;RIGHTWARDS ARROW OVER LEFTWARDS ARROW;So;0;ON;;;;;N;RIGHT ARROW OVER LEFT ARROW;;;;
+21C5;UPWARDS ARROW LEFTWARDS OF DOWNWARDS ARROW;So;0;ON;;;;;N;UP ARROW LEFT OF DOWN ARROW;;;;
+21C6;LEFTWARDS ARROW OVER RIGHTWARDS ARROW;So;0;ON;;;;;N;LEFT ARROW OVER RIGHT ARROW;;;;
+21C7;LEFTWARDS PAIRED ARROWS;So;0;ON;;;;;N;LEFT PAIRED ARROWS;;;;
+21C8;UPWARDS PAIRED ARROWS;So;0;ON;;;;;N;UP PAIRED ARROWS;;;;
+21C9;RIGHTWARDS PAIRED ARROWS;So;0;ON;;;;;N;RIGHT PAIRED ARROWS;;;;
+21CA;DOWNWARDS PAIRED ARROWS;So;0;ON;;;;;N;DOWN PAIRED ARROWS;;;;
+21CB;LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON;So;0;ON;;;;;N;LEFT HARPOON OVER RIGHT HARPOON;;;;
+21CC;RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON;So;0;ON;;;;;N;RIGHT HARPOON OVER LEFT HARPOON;;;;
+21CD;LEFTWARDS DOUBLE ARROW WITH STROKE;So;0;ON;21D0 0338;;;;N;LEFT DOUBLE ARROW WITH STROKE;;;;
+21CE;LEFT RIGHT DOUBLE ARROW WITH STROKE;Sm;0;ON;21D4 0338;;;;N;;;;;
+21CF;RIGHTWARDS DOUBLE ARROW WITH STROKE;Sm;0;ON;21D2 0338;;;;N;RIGHT DOUBLE ARROW WITH STROKE;;;;
+21D0;LEFTWARDS DOUBLE ARROW;So;0;ON;;;;;N;LEFT DOUBLE ARROW;;;;
+21D1;UPWARDS DOUBLE ARROW;So;0;ON;;;;;N;UP DOUBLE ARROW;;;;
+21D2;RIGHTWARDS DOUBLE ARROW;Sm;0;ON;;;;;N;RIGHT DOUBLE ARROW;;;;
+21D3;DOWNWARDS DOUBLE ARROW;So;0;ON;;;;;N;DOWN DOUBLE ARROW;;;;
+21D4;LEFT RIGHT DOUBLE ARROW;Sm;0;ON;;;;;N;;;;;
+21D5;UP DOWN DOUBLE ARROW;So;0;ON;;;;;N;;;;;
+21D6;NORTH WEST DOUBLE ARROW;So;0;ON;;;;;N;UPPER LEFT DOUBLE ARROW;;;;
+21D7;NORTH EAST DOUBLE ARROW;So;0;ON;;;;;N;UPPER RIGHT DOUBLE ARROW;;;;
+21D8;SOUTH EAST DOUBLE ARROW;So;0;ON;;;;;N;LOWER RIGHT DOUBLE ARROW;;;;
+21D9;SOUTH WEST DOUBLE ARROW;So;0;ON;;;;;N;LOWER LEFT DOUBLE ARROW;;;;
+21DA;LEFTWARDS TRIPLE ARROW;So;0;ON;;;;;N;LEFT TRIPLE ARROW;;;;
+21DB;RIGHTWARDS TRIPLE ARROW;So;0;ON;;;;;N;RIGHT TRIPLE ARROW;;;;
+21DC;LEFTWARDS SQUIGGLE ARROW;So;0;ON;;;;;N;LEFT SQUIGGLE ARROW;;;;
+21DD;RIGHTWARDS SQUIGGLE ARROW;So;0;ON;;;;;N;RIGHT SQUIGGLE ARROW;;;;
+21DE;UPWARDS ARROW WITH DOUBLE STROKE;So;0;ON;;;;;N;UP ARROW WITH DOUBLE STROKE;;;;
+21DF;DOWNWARDS ARROW WITH DOUBLE STROKE;So;0;ON;;;;;N;DOWN ARROW WITH DOUBLE STROKE;;;;
+21E0;LEFTWARDS DASHED ARROW;So;0;ON;;;;;N;LEFT DASHED ARROW;;;;
+21E1;UPWARDS DASHED ARROW;So;0;ON;;;;;N;UP DASHED ARROW;;;;
+21E2;RIGHTWARDS DASHED ARROW;So;0;ON;;;;;N;RIGHT DASHED ARROW;;;;
+21E3;DOWNWARDS DASHED ARROW;So;0;ON;;;;;N;DOWN DASHED ARROW;;;;
+21E4;LEFTWARDS ARROW TO BAR;So;0;ON;;;;;N;LEFT ARROW TO BAR;;;;
+21E5;RIGHTWARDS ARROW TO BAR;So;0;ON;;;;;N;RIGHT ARROW TO BAR;;;;
+21E6;LEFTWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE LEFT ARROW;;;;
+21E7;UPWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE UP ARROW;;;;
+21E8;RIGHTWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE RIGHT ARROW;;;;
+21E9;DOWNWARDS WHITE ARROW;So;0;ON;;;;;N;WHITE DOWN ARROW;;;;
+21EA;UPWARDS WHITE ARROW FROM BAR;So;0;ON;;;;;N;WHITE UP ARROW FROM BAR;;;;
+21EB;UPWARDS WHITE ARROW ON PEDESTAL;So;0;ON;;;;;N;;;;;
+21EC;UPWARDS WHITE ARROW ON PEDESTAL WITH HORIZONTAL BAR;So;0;ON;;;;;N;;;;;
+21ED;UPWARDS WHITE ARROW ON PEDESTAL WITH VERTICAL BAR;So;0;ON;;;;;N;;;;;
+21EE;UPWARDS WHITE DOUBLE ARROW;So;0;ON;;;;;N;;;;;
+21EF;UPWARDS WHITE DOUBLE ARROW ON PEDESTAL;So;0;ON;;;;;N;;;;;
+21F0;RIGHTWARDS WHITE ARROW FROM WALL;So;0;ON;;;;;N;;;;;
+21F1;NORTH WEST ARROW TO CORNER;So;0;ON;;;;;N;;;;;
+21F2;SOUTH EAST ARROW TO CORNER;So;0;ON;;;;;N;;;;;
+21F3;UP DOWN WHITE ARROW;So;0;ON;;;;;N;;;;;
+21F4;RIGHT ARROW WITH SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
+21F5;DOWNWARDS ARROW LEFTWARDS OF UPWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+21F6;THREE RIGHTWARDS ARROWS;Sm;0;ON;;;;;N;;;;;
+21F7;LEFTWARDS ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21F8;RIGHTWARDS ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21F9;LEFT RIGHT ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21FA;LEFTWARDS ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21FB;RIGHTWARDS ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21FC;LEFT RIGHT ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+21FD;LEFTWARDS OPEN-HEADED ARROW;Sm;0;ON;;;;;N;;;;;
+21FE;RIGHTWARDS OPEN-HEADED ARROW;Sm;0;ON;;;;;N;;;;;
+21FF;LEFT RIGHT OPEN-HEADED ARROW;Sm;0;ON;;;;;N;;;;;
+2200;FOR ALL;Sm;0;ON;;;;;N;;;;;
+2201;COMPLEMENT;Sm;0;ON;;;;;Y;;;;;
+2202;PARTIAL DIFFERENTIAL;Sm;0;ON;;;;;Y;;;;;
+2203;THERE EXISTS;Sm;0;ON;;;;;Y;;;;;
+2204;THERE DOES NOT EXIST;Sm;0;ON;2203 0338;;;;Y;;;;;
+2205;EMPTY SET;Sm;0;ON;;;;;N;;;;;
+2206;INCREMENT;Sm;0;ON;;;;;N;;;;;
+2207;NABLA;Sm;0;ON;;;;;N;;;;;
+2208;ELEMENT OF;Sm;0;ON;;;;;Y;;;;;
+2209;NOT AN ELEMENT OF;Sm;0;ON;2208 0338;;;;Y;;;;;
+220A;SMALL ELEMENT OF;Sm;0;ON;;;;;Y;;;;;
+220B;CONTAINS AS MEMBER;Sm;0;ON;;;;;Y;;;;;
+220C;DOES NOT CONTAIN AS MEMBER;Sm;0;ON;220B 0338;;;;Y;;;;;
+220D;SMALL CONTAINS AS MEMBER;Sm;0;ON;;;;;Y;;;;;
+220E;END OF PROOF;Sm;0;ON;;;;;N;;;;;
+220F;N-ARY PRODUCT;Sm;0;ON;;;;;N;;;;;
+2210;N-ARY COPRODUCT;Sm;0;ON;;;;;N;;;;;
+2211;N-ARY SUMMATION;Sm;0;ON;;;;;Y;;;;;
+2212;MINUS SIGN;Sm;0;ES;;;;;N;;;;;
+2213;MINUS-OR-PLUS SIGN;Sm;0;ET;;;;;N;;;;;
+2214;DOT PLUS;Sm;0;ON;;;;;N;;;;;
+2215;DIVISION SLASH;Sm;0;ON;;;;;Y;;;;;
+2216;SET MINUS;Sm;0;ON;;;;;Y;;;;;
+2217;ASTERISK OPERATOR;Sm;0;ON;;;;;N;;;;;
+2218;RING OPERATOR;Sm;0;ON;;;;;N;;;;;
+2219;BULLET OPERATOR;Sm;0;ON;;;;;N;;;;;
+221A;SQUARE ROOT;Sm;0;ON;;;;;Y;;;;;
+221B;CUBE ROOT;Sm;0;ON;;;;;Y;;;;;
+221C;FOURTH ROOT;Sm;0;ON;;;;;Y;;;;;
+221D;PROPORTIONAL TO;Sm;0;ON;;;;;Y;;;;;
+221E;INFINITY;Sm;0;ON;;;;;N;;;;;
+221F;RIGHT ANGLE;Sm;0;ON;;;;;Y;;;;;
+2220;ANGLE;Sm;0;ON;;;;;Y;;;;;
+2221;MEASURED ANGLE;Sm;0;ON;;;;;Y;;;;;
+2222;SPHERICAL ANGLE;Sm;0;ON;;;;;Y;;;;;
+2223;DIVIDES;Sm;0;ON;;;;;N;;;;;
+2224;DOES NOT DIVIDE;Sm;0;ON;2223 0338;;;;Y;;;;;
+2225;PARALLEL TO;Sm;0;ON;;;;;N;;;;;
+2226;NOT PARALLEL TO;Sm;0;ON;2225 0338;;;;Y;;;;;
+2227;LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+2228;LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+2229;INTERSECTION;Sm;0;ON;;;;;N;;;;;
+222A;UNION;Sm;0;ON;;;;;N;;;;;
+222B;INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+222C;DOUBLE INTEGRAL;Sm;0;ON;<compat> 222B 222B;;;;Y;;;;;
+222D;TRIPLE INTEGRAL;Sm;0;ON;<compat> 222B 222B 222B;;;;Y;;;;;
+222E;CONTOUR INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+222F;SURFACE INTEGRAL;Sm;0;ON;<compat> 222E 222E;;;;Y;;;;;
+2230;VOLUME INTEGRAL;Sm;0;ON;<compat> 222E 222E 222E;;;;Y;;;;;
+2231;CLOCKWISE INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2232;CLOCKWISE CONTOUR INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2233;ANTICLOCKWISE CONTOUR INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2234;THEREFORE;Sm;0;ON;;;;;N;;;;;
+2235;BECAUSE;Sm;0;ON;;;;;N;;;;;
+2236;RATIO;Sm;0;ON;;;;;N;;;;;
+2237;PROPORTION;Sm;0;ON;;;;;N;;;;;
+2238;DOT MINUS;Sm;0;ON;;;;;N;;;;;
+2239;EXCESS;Sm;0;ON;;;;;Y;;;;;
+223A;GEOMETRIC PROPORTION;Sm;0;ON;;;;;N;;;;;
+223B;HOMOTHETIC;Sm;0;ON;;;;;Y;;;;;
+223C;TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+223D;REVERSED TILDE;Sm;0;ON;;;;;Y;;lazy S;;;
+223E;INVERTED LAZY S;Sm;0;ON;;;;;Y;;;;;
+223F;SINE WAVE;Sm;0;ON;;;;;Y;;;;;
+2240;WREATH PRODUCT;Sm;0;ON;;;;;Y;;;;;
+2241;NOT TILDE;Sm;0;ON;223C 0338;;;;Y;;;;;
+2242;MINUS TILDE;Sm;0;ON;;;;;Y;;;;;
+2243;ASYMPTOTICALLY EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2244;NOT ASYMPTOTICALLY EQUAL TO;Sm;0;ON;2243 0338;;;;Y;;;;;
+2245;APPROXIMATELY EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2246;APPROXIMATELY BUT NOT ACTUALLY EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2247;NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO;Sm;0;ON;2245 0338;;;;Y;;;;;
+2248;ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2249;NOT ALMOST EQUAL TO;Sm;0;ON;2248 0338;;;;Y;;;;;
+224A;ALMOST EQUAL OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+224B;TRIPLE TILDE;Sm;0;ON;;;;;Y;;;;;
+224C;ALL EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+224D;EQUIVALENT TO;Sm;0;ON;;;;;N;;;;;
+224E;GEOMETRICALLY EQUIVALENT TO;Sm;0;ON;;;;;N;;;;;
+224F;DIFFERENCE BETWEEN;Sm;0;ON;;;;;N;;;;;
+2250;APPROACHES THE LIMIT;Sm;0;ON;;;;;N;;;;;
+2251;GEOMETRICALLY EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2252;APPROXIMATELY EQUAL TO OR THE IMAGE OF;Sm;0;ON;;;;;Y;;;;;
+2253;IMAGE OF OR APPROXIMATELY EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2254;COLON EQUALS;Sm;0;ON;;;;;Y;COLON EQUAL;;;;
+2255;EQUALS COLON;Sm;0;ON;;;;;Y;EQUAL COLON;;;;
+2256;RING IN EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2257;RING EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2258;CORRESPONDS TO;Sm;0;ON;;;;;N;;;;;
+2259;ESTIMATES;Sm;0;ON;;;;;N;;;;;
+225A;EQUIANGULAR TO;Sm;0;ON;;;;;N;;;;;
+225B;STAR EQUALS;Sm;0;ON;;;;;N;;;;;
+225C;DELTA EQUAL TO;Sm;0;ON;;;;;N;;;;;
+225D;EQUAL TO BY DEFINITION;Sm;0;ON;;;;;N;;;;;
+225E;MEASURED BY;Sm;0;ON;;;;;N;;;;;
+225F;QUESTIONED EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2260;NOT EQUAL TO;Sm;0;ON;003D 0338;;;;Y;;;;;
+2261;IDENTICAL TO;Sm;0;ON;;;;;N;;;;;
+2262;NOT IDENTICAL TO;Sm;0;ON;2261 0338;;;;Y;;;;;
+2263;STRICTLY EQUIVALENT TO;Sm;0;ON;;;;;N;;;;;
+2264;LESS-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;LESS THAN OR EQUAL TO;;;;
+2265;GREATER-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;GREATER THAN OR EQUAL TO;;;;
+2266;LESS-THAN OVER EQUAL TO;Sm;0;ON;;;;;Y;LESS THAN OVER EQUAL TO;;;;
+2267;GREATER-THAN OVER EQUAL TO;Sm;0;ON;;;;;Y;GREATER THAN OVER EQUAL TO;;;;
+2268;LESS-THAN BUT NOT EQUAL TO;Sm;0;ON;;;;;Y;LESS THAN BUT NOT EQUAL TO;;;;
+2269;GREATER-THAN BUT NOT EQUAL TO;Sm;0;ON;;;;;Y;GREATER THAN BUT NOT EQUAL TO;;;;
+226A;MUCH LESS-THAN;Sm;0;ON;;;;;Y;MUCH LESS THAN;;;;
+226B;MUCH GREATER-THAN;Sm;0;ON;;;;;Y;MUCH GREATER THAN;;;;
+226C;BETWEEN;Sm;0;ON;;;;;N;;;;;
+226D;NOT EQUIVALENT TO;Sm;0;ON;224D 0338;;;;N;;;;;
+226E;NOT LESS-THAN;Sm;0;ON;003C 0338;;;;Y;NOT LESS THAN;;;;
+226F;NOT GREATER-THAN;Sm;0;ON;003E 0338;;;;Y;NOT GREATER THAN;;;;
+2270;NEITHER LESS-THAN NOR EQUAL TO;Sm;0;ON;2264 0338;;;;Y;NEITHER LESS THAN NOR EQUAL TO;;;;
+2271;NEITHER GREATER-THAN NOR EQUAL TO;Sm;0;ON;2265 0338;;;;Y;NEITHER GREATER THAN NOR EQUAL TO;;;;
+2272;LESS-THAN OR EQUIVALENT TO;Sm;0;ON;;;;;Y;LESS THAN OR EQUIVALENT TO;;;;
+2273;GREATER-THAN OR EQUIVALENT TO;Sm;0;ON;;;;;Y;GREATER THAN OR EQUIVALENT TO;;;;
+2274;NEITHER LESS-THAN NOR EQUIVALENT TO;Sm;0;ON;2272 0338;;;;Y;NEITHER LESS THAN NOR EQUIVALENT TO;;;;
+2275;NEITHER GREATER-THAN NOR EQUIVALENT TO;Sm;0;ON;2273 0338;;;;Y;NEITHER GREATER THAN NOR EQUIVALENT TO;;;;
+2276;LESS-THAN OR GREATER-THAN;Sm;0;ON;;;;;Y;LESS THAN OR GREATER THAN;;;;
+2277;GREATER-THAN OR LESS-THAN;Sm;0;ON;;;;;Y;GREATER THAN OR LESS THAN;;;;
+2278;NEITHER LESS-THAN NOR GREATER-THAN;Sm;0;ON;2276 0338;;;;Y;NEITHER LESS THAN NOR GREATER THAN;;;;
+2279;NEITHER GREATER-THAN NOR LESS-THAN;Sm;0;ON;2277 0338;;;;Y;NEITHER GREATER THAN NOR LESS THAN;;;;
+227A;PRECEDES;Sm;0;ON;;;;;Y;;;;;
+227B;SUCCEEDS;Sm;0;ON;;;;;Y;;;;;
+227C;PRECEDES OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+227D;SUCCEEDS OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+227E;PRECEDES OR EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;;
+227F;SUCCEEDS OR EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;;
+2280;DOES NOT PRECEDE;Sm;0;ON;227A 0338;;;;Y;;;;;
+2281;DOES NOT SUCCEED;Sm;0;ON;227B 0338;;;;Y;;;;;
+2282;SUBSET OF;Sm;0;ON;;;;;Y;;;;;
+2283;SUPERSET OF;Sm;0;ON;;;;;Y;;;;;
+2284;NOT A SUBSET OF;Sm;0;ON;2282 0338;;;;Y;;;;;
+2285;NOT A SUPERSET OF;Sm;0;ON;2283 0338;;;;Y;;;;;
+2286;SUBSET OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2287;SUPERSET OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2288;NEITHER A SUBSET OF NOR EQUAL TO;Sm;0;ON;2286 0338;;;;Y;;;;;
+2289;NEITHER A SUPERSET OF NOR EQUAL TO;Sm;0;ON;2287 0338;;;;Y;;;;;
+228A;SUBSET OF WITH NOT EQUAL TO;Sm;0;ON;;;;;Y;SUBSET OF OR NOT EQUAL TO;;;;
+228B;SUPERSET OF WITH NOT EQUAL TO;Sm;0;ON;;;;;Y;SUPERSET OF OR NOT EQUAL TO;;;;
+228C;MULTISET;Sm;0;ON;;;;;Y;;;;;
+228D;MULTISET MULTIPLICATION;Sm;0;ON;;;;;N;;;;;
+228E;MULTISET UNION;Sm;0;ON;;;;;N;;;;;
+228F;SQUARE IMAGE OF;Sm;0;ON;;;;;Y;;;;;
+2290;SQUARE ORIGINAL OF;Sm;0;ON;;;;;Y;;;;;
+2291;SQUARE IMAGE OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2292;SQUARE ORIGINAL OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2293;SQUARE CAP;Sm;0;ON;;;;;N;;;;;
+2294;SQUARE CUP;Sm;0;ON;;;;;N;;;;;
+2295;CIRCLED PLUS;Sm;0;ON;;;;;N;;;;;
+2296;CIRCLED MINUS;Sm;0;ON;;;;;N;;;;;
+2297;CIRCLED TIMES;Sm;0;ON;;;;;N;;;;;
+2298;CIRCLED DIVISION SLASH;Sm;0;ON;;;;;Y;;;;;
+2299;CIRCLED DOT OPERATOR;Sm;0;ON;;;;;N;;;;;
+229A;CIRCLED RING OPERATOR;Sm;0;ON;;;;;N;;;;;
+229B;CIRCLED ASTERISK OPERATOR;Sm;0;ON;;;;;N;;;;;
+229C;CIRCLED EQUALS;Sm;0;ON;;;;;N;;;;;
+229D;CIRCLED DASH;Sm;0;ON;;;;;N;;;;;
+229E;SQUARED PLUS;Sm;0;ON;;;;;N;;;;;
+229F;SQUARED MINUS;Sm;0;ON;;;;;N;;;;;
+22A0;SQUARED TIMES;Sm;0;ON;;;;;N;;;;;
+22A1;SQUARED DOT OPERATOR;Sm;0;ON;;;;;N;;;;;
+22A2;RIGHT TACK;Sm;0;ON;;;;;Y;;;;;
+22A3;LEFT TACK;Sm;0;ON;;;;;Y;;;;;
+22A4;DOWN TACK;Sm;0;ON;;;;;N;;;;;
+22A5;UP TACK;Sm;0;ON;;;;;N;;;;;
+22A6;ASSERTION;Sm;0;ON;;;;;Y;;;;;
+22A7;MODELS;Sm;0;ON;;;;;Y;;;;;
+22A8;TRUE;Sm;0;ON;;;;;Y;;;;;
+22A9;FORCES;Sm;0;ON;;;;;Y;;;;;
+22AA;TRIPLE VERTICAL BAR RIGHT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+22AB;DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+22AC;DOES NOT PROVE;Sm;0;ON;22A2 0338;;;;Y;;;;;
+22AD;NOT TRUE;Sm;0;ON;22A8 0338;;;;Y;;;;;
+22AE;DOES NOT FORCE;Sm;0;ON;22A9 0338;;;;Y;;;;;
+22AF;NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE;Sm;0;ON;22AB 0338;;;;Y;;;;;
+22B0;PRECEDES UNDER RELATION;Sm;0;ON;;;;;Y;;;;;
+22B1;SUCCEEDS UNDER RELATION;Sm;0;ON;;;;;Y;;;;;
+22B2;NORMAL SUBGROUP OF;Sm;0;ON;;;;;Y;;;;;
+22B3;CONTAINS AS NORMAL SUBGROUP;Sm;0;ON;;;;;Y;;;;;
+22B4;NORMAL SUBGROUP OF OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+22B5;CONTAINS AS NORMAL SUBGROUP OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+22B6;ORIGINAL OF;Sm;0;ON;;;;;Y;;;;;
+22B7;IMAGE OF;Sm;0;ON;;;;;Y;;;;;
+22B8;MULTIMAP;Sm;0;ON;;;;;Y;;;;;
+22B9;HERMITIAN CONJUGATE MATRIX;Sm;0;ON;;;;;N;;;;;
+22BA;INTERCALATE;Sm;0;ON;;;;;N;;;;;
+22BB;XOR;Sm;0;ON;;;;;N;;;;;
+22BC;NAND;Sm;0;ON;;;;;N;;;;;
+22BD;NOR;Sm;0;ON;;;;;N;;;;;
+22BE;RIGHT ANGLE WITH ARC;Sm;0;ON;;;;;Y;;;;;
+22BF;RIGHT TRIANGLE;Sm;0;ON;;;;;Y;;;;;
+22C0;N-ARY LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+22C1;N-ARY LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+22C2;N-ARY INTERSECTION;Sm;0;ON;;;;;N;;;;;
+22C3;N-ARY UNION;Sm;0;ON;;;;;N;;;;;
+22C4;DIAMOND OPERATOR;Sm;0;ON;;;;;N;;;;;
+22C5;DOT OPERATOR;Sm;0;ON;;;;;N;;;;;
+22C6;STAR OPERATOR;Sm;0;ON;;;;;N;;;;;
+22C7;DIVISION TIMES;Sm;0;ON;;;;;N;;;;;
+22C8;BOWTIE;Sm;0;ON;;;;;N;;;;;
+22C9;LEFT NORMAL FACTOR SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;;
+22CA;RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;;
+22CB;LEFT SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;;
+22CC;RIGHT SEMIDIRECT PRODUCT;Sm;0;ON;;;;;Y;;;;;
+22CD;REVERSED TILDE EQUALS;Sm;0;ON;;;;;Y;;;;;
+22CE;CURLY LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+22CF;CURLY LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+22D0;DOUBLE SUBSET;Sm;0;ON;;;;;Y;;;;;
+22D1;DOUBLE SUPERSET;Sm;0;ON;;;;;Y;;;;;
+22D2;DOUBLE INTERSECTION;Sm;0;ON;;;;;N;;;;;
+22D3;DOUBLE UNION;Sm;0;ON;;;;;N;;;;;
+22D4;PITCHFORK;Sm;0;ON;;;;;N;;;;;
+22D5;EQUAL AND PARALLEL TO;Sm;0;ON;;;;;N;;;;;
+22D6;LESS-THAN WITH DOT;Sm;0;ON;;;;;Y;LESS THAN WITH DOT;;;;
+22D7;GREATER-THAN WITH DOT;Sm;0;ON;;;;;Y;GREATER THAN WITH DOT;;;;
+22D8;VERY MUCH LESS-THAN;Sm;0;ON;;;;;Y;VERY MUCH LESS THAN;;;;
+22D9;VERY MUCH GREATER-THAN;Sm;0;ON;;;;;Y;VERY MUCH GREATER THAN;;;;
+22DA;LESS-THAN EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;LESS THAN EQUAL TO OR GREATER THAN;;;;
+22DB;GREATER-THAN EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;GREATER THAN EQUAL TO OR LESS THAN;;;;
+22DC;EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;EQUAL TO OR LESS THAN;;;;
+22DD;EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;EQUAL TO OR GREATER THAN;;;;
+22DE;EQUAL TO OR PRECEDES;Sm;0;ON;;;;;Y;;;;;
+22DF;EQUAL TO OR SUCCEEDS;Sm;0;ON;;;;;Y;;;;;
+22E0;DOES NOT PRECEDE OR EQUAL;Sm;0;ON;227C 0338;;;;Y;;;;;
+22E1;DOES NOT SUCCEED OR EQUAL;Sm;0;ON;227D 0338;;;;Y;;;;;
+22E2;NOT SQUARE IMAGE OF OR EQUAL TO;Sm;0;ON;2291 0338;;;;Y;;;;;
+22E3;NOT SQUARE ORIGINAL OF OR EQUAL TO;Sm;0;ON;2292 0338;;;;Y;;;;;
+22E4;SQUARE IMAGE OF OR NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+22E5;SQUARE ORIGINAL OF OR NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+22E6;LESS-THAN BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;LESS THAN BUT NOT EQUIVALENT TO;;;;
+22E7;GREATER-THAN BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;GREATER THAN BUT NOT EQUIVALENT TO;;;;
+22E8;PRECEDES BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;;
+22E9;SUCCEEDS BUT NOT EQUIVALENT TO;Sm;0;ON;;;;;Y;;;;;
+22EA;NOT NORMAL SUBGROUP OF;Sm;0;ON;22B2 0338;;;;Y;;;;;
+22EB;DOES NOT CONTAIN AS NORMAL SUBGROUP;Sm;0;ON;22B3 0338;;;;Y;;;;;
+22EC;NOT NORMAL SUBGROUP OF OR EQUAL TO;Sm;0;ON;22B4 0338;;;;Y;;;;;
+22ED;DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL;Sm;0;ON;22B5 0338;;;;Y;;;;;
+22EE;VERTICAL ELLIPSIS;Sm;0;ON;;;;;N;;;;;
+22EF;MIDLINE HORIZONTAL ELLIPSIS;Sm;0;ON;;;;;N;;;;;
+22F0;UP RIGHT DIAGONAL ELLIPSIS;Sm;0;ON;;;;;Y;;;;;
+22F1;DOWN RIGHT DIAGONAL ELLIPSIS;Sm;0;ON;;;;;Y;;;;;
+22F2;ELEMENT OF WITH LONG HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22F3;ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22F4;SMALL ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22F5;ELEMENT OF WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+22F6;ELEMENT OF WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+22F7;SMALL ELEMENT OF WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+22F8;ELEMENT OF WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
+22F9;ELEMENT OF WITH TWO HORIZONTAL STROKES;Sm;0;ON;;;;;Y;;;;;
+22FA;CONTAINS WITH LONG HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22FB;CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22FC;SMALL CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+22FD;CONTAINS WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+22FE;SMALL CONTAINS WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+22FF;Z NOTATION BAG MEMBERSHIP;Sm;0;ON;;;;;Y;;;;;
+2300;DIAMETER SIGN;So;0;ON;;;;;N;;;;;
+2301;ELECTRIC ARROW;So;0;ON;;;;;N;;;;;
+2302;HOUSE;So;0;ON;;;;;N;;;;;
+2303;UP ARROWHEAD;So;0;ON;;;;;N;;;;;
+2304;DOWN ARROWHEAD;So;0;ON;;;;;N;;;;;
+2305;PROJECTIVE;So;0;ON;;;;;N;;;;;
+2306;PERSPECTIVE;So;0;ON;;;;;N;;;;;
+2307;WAVY LINE;So;0;ON;;;;;N;;;;;
+2308;LEFT CEILING;Sm;0;ON;;;;;Y;;;;;
+2309;RIGHT CEILING;Sm;0;ON;;;;;Y;;;;;
+230A;LEFT FLOOR;Sm;0;ON;;;;;Y;;;;;
+230B;RIGHT FLOOR;Sm;0;ON;;;;;Y;;;;;
+230C;BOTTOM RIGHT CROP;So;0;ON;;;;;N;;;;;
+230D;BOTTOM LEFT CROP;So;0;ON;;;;;N;;;;;
+230E;TOP RIGHT CROP;So;0;ON;;;;;N;;;;;
+230F;TOP LEFT CROP;So;0;ON;;;;;N;;;;;
+2310;REVERSED NOT SIGN;So;0;ON;;;;;N;;;;;
+2311;SQUARE LOZENGE;So;0;ON;;;;;N;;;;;
+2312;ARC;So;0;ON;;;;;N;;;;;
+2313;SEGMENT;So;0;ON;;;;;N;;;;;
+2314;SECTOR;So;0;ON;;;;;N;;;;;
+2315;TELEPHONE RECORDER;So;0;ON;;;;;N;;;;;
+2316;POSITION INDICATOR;So;0;ON;;;;;N;;;;;
+2317;VIEWDATA SQUARE;So;0;ON;;;;;N;;;;;
+2318;PLACE OF INTEREST SIGN;So;0;ON;;;;;N;COMMAND KEY;;;;
+2319;TURNED NOT SIGN;So;0;ON;;;;;N;;;;;
+231A;WATCH;So;0;ON;;;;;N;;;;;
+231B;HOURGLASS;So;0;ON;;;;;N;;;;;
+231C;TOP LEFT CORNER;So;0;ON;;;;;N;;;;;
+231D;TOP RIGHT CORNER;So;0;ON;;;;;N;;;;;
+231E;BOTTOM LEFT CORNER;So;0;ON;;;;;N;;;;;
+231F;BOTTOM RIGHT CORNER;So;0;ON;;;;;N;;;;;
+2320;TOP HALF INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2321;BOTTOM HALF INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2322;FROWN;So;0;ON;;;;;N;;;;;
+2323;SMILE;So;0;ON;;;;;N;;;;;
+2324;UP ARROWHEAD BETWEEN TWO HORIZONTAL BARS;So;0;ON;;;;;N;ENTER KEY;;;;
+2325;OPTION KEY;So;0;ON;;;;;N;;;;;
+2326;ERASE TO THE RIGHT;So;0;ON;;;;;N;DELETE TO THE RIGHT KEY;;;;
+2327;X IN A RECTANGLE BOX;So;0;ON;;;;;N;CLEAR KEY;;;;
+2328;KEYBOARD;So;0;ON;;;;;N;;;;;
+2329;LEFT-POINTING ANGLE BRACKET;Ps;0;ON;3008;;;;Y;BRA;;;;
+232A;RIGHT-POINTING ANGLE BRACKET;Pe;0;ON;3009;;;;Y;KET;;;;
+232B;ERASE TO THE LEFT;So;0;ON;;;;;N;DELETE TO THE LEFT KEY;;;;
+232C;BENZENE RING;So;0;ON;;;;;N;;;;;
+232D;CYLINDRICITY;So;0;ON;;;;;N;;;;;
+232E;ALL AROUND-PROFILE;So;0;ON;;;;;N;;;;;
+232F;SYMMETRY;So;0;ON;;;;;N;;;;;
+2330;TOTAL RUNOUT;So;0;ON;;;;;N;;;;;
+2331;DIMENSION ORIGIN;So;0;ON;;;;;N;;;;;
+2332;CONICAL TAPER;So;0;ON;;;;;N;;;;;
+2333;SLOPE;So;0;ON;;;;;N;;;;;
+2334;COUNTERBORE;So;0;ON;;;;;N;;;;;
+2335;COUNTERSINK;So;0;ON;;;;;N;;;;;
+2336;APL FUNCTIONAL SYMBOL I-BEAM;So;0;L;;;;;N;;;;;
+2337;APL FUNCTIONAL SYMBOL SQUISH QUAD;So;0;L;;;;;N;;;;;
+2338;APL FUNCTIONAL SYMBOL QUAD EQUAL;So;0;L;;;;;N;;;;;
+2339;APL FUNCTIONAL SYMBOL QUAD DIVIDE;So;0;L;;;;;N;;;;;
+233A;APL FUNCTIONAL SYMBOL QUAD DIAMOND;So;0;L;;;;;N;;;;;
+233B;APL FUNCTIONAL SYMBOL QUAD JOT;So;0;L;;;;;N;;;;;
+233C;APL FUNCTIONAL SYMBOL QUAD CIRCLE;So;0;L;;;;;N;;;;;
+233D;APL FUNCTIONAL SYMBOL CIRCLE STILE;So;0;L;;;;;N;;;;;
+233E;APL FUNCTIONAL SYMBOL CIRCLE JOT;So;0;L;;;;;N;;;;;
+233F;APL FUNCTIONAL SYMBOL SLASH BAR;So;0;L;;;;;N;;;;;
+2340;APL FUNCTIONAL SYMBOL BACKSLASH BAR;So;0;L;;;;;N;;;;;
+2341;APL FUNCTIONAL SYMBOL QUAD SLASH;So;0;L;;;;;N;;;;;
+2342;APL FUNCTIONAL SYMBOL QUAD BACKSLASH;So;0;L;;;;;N;;;;;
+2343;APL FUNCTIONAL SYMBOL QUAD LESS-THAN;So;0;L;;;;;N;;;;;
+2344;APL FUNCTIONAL SYMBOL QUAD GREATER-THAN;So;0;L;;;;;N;;;;;
+2345;APL FUNCTIONAL SYMBOL LEFTWARDS VANE;So;0;L;;;;;N;;;;;
+2346;APL FUNCTIONAL SYMBOL RIGHTWARDS VANE;So;0;L;;;;;N;;;;;
+2347;APL FUNCTIONAL SYMBOL QUAD LEFTWARDS ARROW;So;0;L;;;;;N;;;;;
+2348;APL FUNCTIONAL SYMBOL QUAD RIGHTWARDS ARROW;So;0;L;;;;;N;;;;;
+2349;APL FUNCTIONAL SYMBOL CIRCLE BACKSLASH;So;0;L;;;;;N;;;;;
+234A;APL FUNCTIONAL SYMBOL DOWN TACK UNDERBAR;So;0;L;;;;;N;;*;;;
+234B;APL FUNCTIONAL SYMBOL DELTA STILE;So;0;L;;;;;N;;;;;
+234C;APL FUNCTIONAL SYMBOL QUAD DOWN CARET;So;0;L;;;;;N;;;;;
+234D;APL FUNCTIONAL SYMBOL QUAD DELTA;So;0;L;;;;;N;;;;;
+234E;APL FUNCTIONAL SYMBOL DOWN TACK JOT;So;0;L;;;;;N;;*;;;
+234F;APL FUNCTIONAL SYMBOL UPWARDS VANE;So;0;L;;;;;N;;;;;
+2350;APL FUNCTIONAL SYMBOL QUAD UPWARDS ARROW;So;0;L;;;;;N;;;;;
+2351;APL FUNCTIONAL SYMBOL UP TACK OVERBAR;So;0;L;;;;;N;;*;;;
+2352;APL FUNCTIONAL SYMBOL DEL STILE;So;0;L;;;;;N;;;;;
+2353;APL FUNCTIONAL SYMBOL QUAD UP CARET;So;0;L;;;;;N;;;;;
+2354;APL FUNCTIONAL SYMBOL QUAD DEL;So;0;L;;;;;N;;;;;
+2355;APL FUNCTIONAL SYMBOL UP TACK JOT;So;0;L;;;;;N;;*;;;
+2356;APL FUNCTIONAL SYMBOL DOWNWARDS VANE;So;0;L;;;;;N;;;;;
+2357;APL FUNCTIONAL SYMBOL QUAD DOWNWARDS ARROW;So;0;L;;;;;N;;;;;
+2358;APL FUNCTIONAL SYMBOL QUOTE UNDERBAR;So;0;L;;;;;N;;;;;
+2359;APL FUNCTIONAL SYMBOL DELTA UNDERBAR;So;0;L;;;;;N;;;;;
+235A;APL FUNCTIONAL SYMBOL DIAMOND UNDERBAR;So;0;L;;;;;N;;;;;
+235B;APL FUNCTIONAL SYMBOL JOT UNDERBAR;So;0;L;;;;;N;;;;;
+235C;APL FUNCTIONAL SYMBOL CIRCLE UNDERBAR;So;0;L;;;;;N;;;;;
+235D;APL FUNCTIONAL SYMBOL UP SHOE JOT;So;0;L;;;;;N;;;;;
+235E;APL FUNCTIONAL SYMBOL QUOTE QUAD;So;0;L;;;;;N;;;;;
+235F;APL FUNCTIONAL SYMBOL CIRCLE STAR;So;0;L;;;;;N;;;;;
+2360;APL FUNCTIONAL SYMBOL QUAD COLON;So;0;L;;;;;N;;;;;
+2361;APL FUNCTIONAL SYMBOL UP TACK DIAERESIS;So;0;L;;;;;N;;*;;;
+2362;APL FUNCTIONAL SYMBOL DEL DIAERESIS;So;0;L;;;;;N;;;;;
+2363;APL FUNCTIONAL SYMBOL STAR DIAERESIS;So;0;L;;;;;N;;;;;
+2364;APL FUNCTIONAL SYMBOL JOT DIAERESIS;So;0;L;;;;;N;;;;;
+2365;APL FUNCTIONAL SYMBOL CIRCLE DIAERESIS;So;0;L;;;;;N;;;;;
+2366;APL FUNCTIONAL SYMBOL DOWN SHOE STILE;So;0;L;;;;;N;;;;;
+2367;APL FUNCTIONAL SYMBOL LEFT SHOE STILE;So;0;L;;;;;N;;;;;
+2368;APL FUNCTIONAL SYMBOL TILDE DIAERESIS;So;0;L;;;;;N;;;;;
+2369;APL FUNCTIONAL SYMBOL GREATER-THAN DIAERESIS;So;0;L;;;;;N;;;;;
+236A;APL FUNCTIONAL SYMBOL COMMA BAR;So;0;L;;;;;N;;;;;
+236B;APL FUNCTIONAL SYMBOL DEL TILDE;So;0;L;;;;;N;;;;;
+236C;APL FUNCTIONAL SYMBOL ZILDE;So;0;L;;;;;N;;;;;
+236D;APL FUNCTIONAL SYMBOL STILE TILDE;So;0;L;;;;;N;;;;;
+236E;APL FUNCTIONAL SYMBOL SEMICOLON UNDERBAR;So;0;L;;;;;N;;;;;
+236F;APL FUNCTIONAL SYMBOL QUAD NOT EQUAL;So;0;L;;;;;N;;;;;
+2370;APL FUNCTIONAL SYMBOL QUAD QUESTION;So;0;L;;;;;N;;;;;
+2371;APL FUNCTIONAL SYMBOL DOWN CARET TILDE;So;0;L;;;;;N;;;;;
+2372;APL FUNCTIONAL SYMBOL UP CARET TILDE;So;0;L;;;;;N;;;;;
+2373;APL FUNCTIONAL SYMBOL IOTA;So;0;L;;;;;N;;;;;
+2374;APL FUNCTIONAL SYMBOL RHO;So;0;L;;;;;N;;;;;
+2375;APL FUNCTIONAL SYMBOL OMEGA;So;0;L;;;;;N;;;;;
+2376;APL FUNCTIONAL SYMBOL ALPHA UNDERBAR;So;0;L;;;;;N;;;;;
+2377;APL FUNCTIONAL SYMBOL EPSILON UNDERBAR;So;0;L;;;;;N;;;;;
+2378;APL FUNCTIONAL SYMBOL IOTA UNDERBAR;So;0;L;;;;;N;;;;;
+2379;APL FUNCTIONAL SYMBOL OMEGA UNDERBAR;So;0;L;;;;;N;;;;;
+237A;APL FUNCTIONAL SYMBOL ALPHA;So;0;L;;;;;N;;;;;
+237B;NOT CHECK MARK;So;0;ON;;;;;N;;;;;
+237C;RIGHT ANGLE WITH DOWNWARDS ZIGZAG ARROW;Sm;0;ON;;;;;N;;;;;
+237D;SHOULDERED OPEN BOX;So;0;ON;;;;;N;;;;;
+237E;BELL SYMBOL;So;0;ON;;;;;N;;;;;
+237F;VERTICAL LINE WITH MIDDLE DOT;So;0;ON;;;;;N;;;;;
+2380;INSERTION SYMBOL;So;0;ON;;;;;N;;;;;
+2381;CONTINUOUS UNDERLINE SYMBOL;So;0;ON;;;;;N;;;;;
+2382;DISCONTINUOUS UNDERLINE SYMBOL;So;0;ON;;;;;N;;;;;
+2383;EMPHASIS SYMBOL;So;0;ON;;;;;N;;;;;
+2384;COMPOSITION SYMBOL;So;0;ON;;;;;N;;;;;
+2385;WHITE SQUARE WITH CENTRE VERTICAL LINE;So;0;ON;;;;;N;;;;;
+2386;ENTER SYMBOL;So;0;ON;;;;;N;;;;;
+2387;ALTERNATIVE KEY SYMBOL;So;0;ON;;;;;N;;;;;
+2388;HELM SYMBOL;So;0;ON;;;;;N;;;;;
+2389;CIRCLED HORIZONTAL BAR WITH NOTCH;So;0;ON;;;;;N;;pause;;;
+238A;CIRCLED TRIANGLE DOWN;So;0;ON;;;;;N;;break;;;
+238B;BROKEN CIRCLE WITH NORTHWEST ARROW;So;0;ON;;;;;N;;escape;;;
+238C;UNDO SYMBOL;So;0;ON;;;;;N;;;;;
+238D;MONOSTABLE SYMBOL;So;0;ON;;;;;N;;;;;
+238E;HYSTERESIS SYMBOL;So;0;ON;;;;;N;;;;;
+238F;OPEN-CIRCUIT-OUTPUT H-TYPE SYMBOL;So;0;ON;;;;;N;;;;;
+2390;OPEN-CIRCUIT-OUTPUT L-TYPE SYMBOL;So;0;ON;;;;;N;;;;;
+2391;PASSIVE-PULL-DOWN-OUTPUT SYMBOL;So;0;ON;;;;;N;;;;;
+2392;PASSIVE-PULL-UP-OUTPUT SYMBOL;So;0;ON;;;;;N;;;;;
+2393;DIRECT CURRENT SYMBOL FORM TWO;So;0;ON;;;;;N;;;;;
+2394;SOFTWARE-FUNCTION SYMBOL;So;0;ON;;;;;N;;;;;
+2395;APL FUNCTIONAL SYMBOL QUAD;So;0;L;;;;;N;;;;;
+2396;DECIMAL SEPARATOR KEY SYMBOL;So;0;ON;;;;;N;;;;;
+2397;PREVIOUS PAGE;So;0;ON;;;;;N;;;;;
+2398;NEXT PAGE;So;0;ON;;;;;N;;;;;
+2399;PRINT SCREEN SYMBOL;So;0;ON;;;;;N;;;;;
+239A;CLEAR SCREEN SYMBOL;So;0;ON;;;;;N;;;;;
+239B;LEFT PARENTHESIS UPPER HOOK;Sm;0;ON;;;;;N;;;;;
+239C;LEFT PARENTHESIS EXTENSION;Sm;0;ON;;;;;N;;;;;
+239D;LEFT PARENTHESIS LOWER HOOK;Sm;0;ON;;;;;N;;;;;
+239E;RIGHT PARENTHESIS UPPER HOOK;Sm;0;ON;;;;;N;;;;;
+239F;RIGHT PARENTHESIS EXTENSION;Sm;0;ON;;;;;N;;;;;
+23A0;RIGHT PARENTHESIS LOWER HOOK;Sm;0;ON;;;;;N;;;;;
+23A1;LEFT SQUARE BRACKET UPPER CORNER;Sm;0;ON;;;;;N;;;;;
+23A2;LEFT SQUARE BRACKET EXTENSION;Sm;0;ON;;;;;N;;;;;
+23A3;LEFT SQUARE BRACKET LOWER CORNER;Sm;0;ON;;;;;N;;;;;
+23A4;RIGHT SQUARE BRACKET UPPER CORNER;Sm;0;ON;;;;;N;;;;;
+23A5;RIGHT SQUARE BRACKET EXTENSION;Sm;0;ON;;;;;N;;;;;
+23A6;RIGHT SQUARE BRACKET LOWER CORNER;Sm;0;ON;;;;;N;;;;;
+23A7;LEFT CURLY BRACKET UPPER HOOK;Sm;0;ON;;;;;N;;;;;
+23A8;LEFT CURLY BRACKET MIDDLE PIECE;Sm;0;ON;;;;;N;;;;;
+23A9;LEFT CURLY BRACKET LOWER HOOK;Sm;0;ON;;;;;N;;;;;
+23AA;CURLY BRACKET EXTENSION;Sm;0;ON;;;;;N;;;;;
+23AB;RIGHT CURLY BRACKET UPPER HOOK;Sm;0;ON;;;;;N;;;;;
+23AC;RIGHT CURLY BRACKET MIDDLE PIECE;Sm;0;ON;;;;;N;;;;;
+23AD;RIGHT CURLY BRACKET LOWER HOOK;Sm;0;ON;;;;;N;;;;;
+23AE;INTEGRAL EXTENSION;Sm;0;ON;;;;;N;;;;;
+23AF;HORIZONTAL LINE EXTENSION;Sm;0;ON;;;;;N;;;;;
+23B0;UPPER LEFT OR LOWER RIGHT CURLY BRACKET SECTION;Sm;0;ON;;;;;N;;;;;
+23B1;UPPER RIGHT OR LOWER LEFT CURLY BRACKET SECTION;Sm;0;ON;;;;;N;;;;;
+23B2;SUMMATION TOP;Sm;0;ON;;;;;N;;;;;
+23B3;SUMMATION BOTTOM;Sm;0;ON;;;;;N;;;;;
+23B4;TOP SQUARE BRACKET;So;0;ON;;;;;N;;;;;
+23B5;BOTTOM SQUARE BRACKET;So;0;ON;;;;;N;;;;;
+23B6;BOTTOM SQUARE BRACKET OVER TOP SQUARE BRACKET;So;0;ON;;;;;N;;;;;
+23B7;RADICAL SYMBOL BOTTOM;So;0;ON;;;;;N;;;;;
+23B8;LEFT VERTICAL BOX LINE;So;0;ON;;;;;N;;;;;
+23B9;RIGHT VERTICAL BOX LINE;So;0;ON;;;;;N;;;;;
+23BA;HORIZONTAL SCAN LINE-1;So;0;ON;;;;;N;;;;;
+23BB;HORIZONTAL SCAN LINE-3;So;0;ON;;;;;N;;;;;
+23BC;HORIZONTAL SCAN LINE-7;So;0;ON;;;;;N;;;;;
+23BD;HORIZONTAL SCAN LINE-9;So;0;ON;;;;;N;;;;;
+23BE;DENTISTRY SYMBOL LIGHT VERTICAL AND TOP RIGHT;So;0;ON;;;;;N;;;;;
+23BF;DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM RIGHT;So;0;ON;;;;;N;;;;;
+23C0;DENTISTRY SYMBOL LIGHT VERTICAL WITH CIRCLE;So;0;ON;;;;;N;;;;;
+23C1;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH CIRCLE;So;0;ON;;;;;N;;;;;
+23C2;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH CIRCLE;So;0;ON;;;;;N;;;;;
+23C3;DENTISTRY SYMBOL LIGHT VERTICAL WITH TRIANGLE;So;0;ON;;;;;N;;;;;
+23C4;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH TRIANGLE;So;0;ON;;;;;N;;;;;
+23C5;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH TRIANGLE;So;0;ON;;;;;N;;;;;
+23C6;DENTISTRY SYMBOL LIGHT VERTICAL AND WAVE;So;0;ON;;;;;N;;;;;
+23C7;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL WITH WAVE;So;0;ON;;;;;N;;;;;
+23C8;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL WITH WAVE;So;0;ON;;;;;N;;;;;
+23C9;DENTISTRY SYMBOL LIGHT DOWN AND HORIZONTAL;So;0;ON;;;;;N;;;;;
+23CA;DENTISTRY SYMBOL LIGHT UP AND HORIZONTAL;So;0;ON;;;;;N;;;;;
+23CB;DENTISTRY SYMBOL LIGHT VERTICAL AND TOP LEFT;So;0;ON;;;;;N;;;;;
+23CC;DENTISTRY SYMBOL LIGHT VERTICAL AND BOTTOM LEFT;So;0;ON;;;;;N;;;;;
+23CD;SQUARE FOOT;So;0;ON;;;;;N;;;;;
+23CE;RETURN SYMBOL;So;0;ON;;;;;N;;;;;
+23CF;EJECT SYMBOL;So;0;ON;;;;;N;;;;;
+23D0;VERTICAL LINE EXTENSION;So;0;ON;;;;;N;;;;;
+23D1;METRICAL BREVE;So;0;ON;;;;;N;;;;;
+23D2;METRICAL LONG OVER SHORT;So;0;ON;;;;;N;;;;;
+23D3;METRICAL SHORT OVER LONG;So;0;ON;;;;;N;;;;;
+23D4;METRICAL LONG OVER TWO SHORTS;So;0;ON;;;;;N;;;;;
+23D5;METRICAL TWO SHORTS OVER LONG;So;0;ON;;;;;N;;;;;
+23D6;METRICAL TWO SHORTS JOINED;So;0;ON;;;;;N;;;;;
+23D7;METRICAL TRISEME;So;0;ON;;;;;N;;;;;
+23D8;METRICAL TETRASEME;So;0;ON;;;;;N;;;;;
+23D9;METRICAL PENTASEME;So;0;ON;;;;;N;;;;;
+23DA;EARTH GROUND;So;0;ON;;;;;N;;;;;
+23DB;FUSE;So;0;ON;;;;;N;;;;;
+23DC;TOP PARENTHESIS;Sm;0;ON;;;;;N;;mathematical use;;;
+23DD;BOTTOM PARENTHESIS;Sm;0;ON;;;;;N;;mathematical use;;;
+23DE;TOP CURLY BRACKET;Sm;0;ON;;;;;N;;mathematical use;;;
+23DF;BOTTOM CURLY BRACKET;Sm;0;ON;;;;;N;;mathematical use;;;
+23E0;TOP TORTOISE SHELL BRACKET;Sm;0;ON;;;;;N;;mathematical use;;;
+23E1;BOTTOM TORTOISE SHELL BRACKET;Sm;0;ON;;;;;N;;mathematical use;;;
+23E2;WHITE TRAPEZIUM;So;0;ON;;;;;N;;;;;
+23E3;BENZENE RING WITH CIRCLE;So;0;ON;;;;;N;;;;;
+23E4;STRAIGHTNESS;So;0;ON;;;;;N;;;;;
+23E5;FLATNESS;So;0;ON;;;;;N;;;;;
+23E6;AC CURRENT;So;0;ON;;;;;N;;;;;
+23E7;ELECTRICAL INTERSECTION;So;0;ON;;;;;N;;;;;
+2400;SYMBOL FOR NULL;So;0;ON;;;;;N;GRAPHIC FOR NULL;;;;
+2401;SYMBOL FOR START OF HEADING;So;0;ON;;;;;N;GRAPHIC FOR START OF HEADING;;;;
+2402;SYMBOL FOR START OF TEXT;So;0;ON;;;;;N;GRAPHIC FOR START OF TEXT;;;;
+2403;SYMBOL FOR END OF TEXT;So;0;ON;;;;;N;GRAPHIC FOR END OF TEXT;;;;
+2404;SYMBOL FOR END OF TRANSMISSION;So;0;ON;;;;;N;GRAPHIC FOR END OF TRANSMISSION;;;;
+2405;SYMBOL FOR ENQUIRY;So;0;ON;;;;;N;GRAPHIC FOR ENQUIRY;;;;
+2406;SYMBOL FOR ACKNOWLEDGE;So;0;ON;;;;;N;GRAPHIC FOR ACKNOWLEDGE;;;;
+2407;SYMBOL FOR BELL;So;0;ON;;;;;N;GRAPHIC FOR BELL;;;;
+2408;SYMBOL FOR BACKSPACE;So;0;ON;;;;;N;GRAPHIC FOR BACKSPACE;;;;
+2409;SYMBOL FOR HORIZONTAL TABULATION;So;0;ON;;;;;N;GRAPHIC FOR HORIZONTAL TABULATION;;;;
+240A;SYMBOL FOR LINE FEED;So;0;ON;;;;;N;GRAPHIC FOR LINE FEED;;;;
+240B;SYMBOL FOR VERTICAL TABULATION;So;0;ON;;;;;N;GRAPHIC FOR VERTICAL TABULATION;;;;
+240C;SYMBOL FOR FORM FEED;So;0;ON;;;;;N;GRAPHIC FOR FORM FEED;;;;
+240D;SYMBOL FOR CARRIAGE RETURN;So;0;ON;;;;;N;GRAPHIC FOR CARRIAGE RETURN;;;;
+240E;SYMBOL FOR SHIFT OUT;So;0;ON;;;;;N;GRAPHIC FOR SHIFT OUT;;;;
+240F;SYMBOL FOR SHIFT IN;So;0;ON;;;;;N;GRAPHIC FOR SHIFT IN;;;;
+2410;SYMBOL FOR DATA LINK ESCAPE;So;0;ON;;;;;N;GRAPHIC FOR DATA LINK ESCAPE;;;;
+2411;SYMBOL FOR DEVICE CONTROL ONE;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL ONE;;;;
+2412;SYMBOL FOR DEVICE CONTROL TWO;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL TWO;;;;
+2413;SYMBOL FOR DEVICE CONTROL THREE;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL THREE;;;;
+2414;SYMBOL FOR DEVICE CONTROL FOUR;So;0;ON;;;;;N;GRAPHIC FOR DEVICE CONTROL FOUR;;;;
+2415;SYMBOL FOR NEGATIVE ACKNOWLEDGE;So;0;ON;;;;;N;GRAPHIC FOR NEGATIVE ACKNOWLEDGE;;;;
+2416;SYMBOL FOR SYNCHRONOUS IDLE;So;0;ON;;;;;N;GRAPHIC FOR SYNCHRONOUS IDLE;;;;
+2417;SYMBOL FOR END OF TRANSMISSION BLOCK;So;0;ON;;;;;N;GRAPHIC FOR END OF TRANSMISSION BLOCK;;;;
+2418;SYMBOL FOR CANCEL;So;0;ON;;;;;N;GRAPHIC FOR CANCEL;;;;
+2419;SYMBOL FOR END OF MEDIUM;So;0;ON;;;;;N;GRAPHIC FOR END OF MEDIUM;;;;
+241A;SYMBOL FOR SUBSTITUTE;So;0;ON;;;;;N;GRAPHIC FOR SUBSTITUTE;;;;
+241B;SYMBOL FOR ESCAPE;So;0;ON;;;;;N;GRAPHIC FOR ESCAPE;;;;
+241C;SYMBOL FOR FILE SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR FILE SEPARATOR;;;;
+241D;SYMBOL FOR GROUP SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR GROUP SEPARATOR;;;;
+241E;SYMBOL FOR RECORD SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR RECORD SEPARATOR;;;;
+241F;SYMBOL FOR UNIT SEPARATOR;So;0;ON;;;;;N;GRAPHIC FOR UNIT SEPARATOR;;;;
+2420;SYMBOL FOR SPACE;So;0;ON;;;;;N;GRAPHIC FOR SPACE;;;;
+2421;SYMBOL FOR DELETE;So;0;ON;;;;;N;GRAPHIC FOR DELETE;;;;
+2422;BLANK SYMBOL;So;0;ON;;;;;N;BLANK;;;;
+2423;OPEN BOX;So;0;ON;;;;;N;;;;;
+2424;SYMBOL FOR NEWLINE;So;0;ON;;;;;N;GRAPHIC FOR NEWLINE;;;;
+2425;SYMBOL FOR DELETE FORM TWO;So;0;ON;;;;;N;;;;;
+2426;SYMBOL FOR SUBSTITUTE FORM TWO;So;0;ON;;;;;N;;;;;
+2440;OCR HOOK;So;0;ON;;;;;N;;;;;
+2441;OCR CHAIR;So;0;ON;;;;;N;;;;;
+2442;OCR FORK;So;0;ON;;;;;N;;;;;
+2443;OCR INVERTED FORK;So;0;ON;;;;;N;;;;;
+2444;OCR BELT BUCKLE;So;0;ON;;;;;N;;;;;
+2445;OCR BOW TIE;So;0;ON;;;;;N;;;;;
+2446;OCR BRANCH BANK IDENTIFICATION;So;0;ON;;;;;N;;;;;
+2447;OCR AMOUNT OF CHECK;So;0;ON;;;;;N;;;;;
+2448;OCR DASH;So;0;ON;;;;;N;;;;;
+2449;OCR CUSTOMER ACCOUNT NUMBER;So;0;ON;;;;;N;;;;;
+244A;OCR DOUBLE BACKSLASH;So;0;ON;;;;;N;;;;;
+2460;CIRCLED DIGIT ONE;No;0;ON;<circle> 0031;;1;1;N;;;;;
+2461;CIRCLED DIGIT TWO;No;0;ON;<circle> 0032;;2;2;N;;;;;
+2462;CIRCLED DIGIT THREE;No;0;ON;<circle> 0033;;3;3;N;;;;;
+2463;CIRCLED DIGIT FOUR;No;0;ON;<circle> 0034;;4;4;N;;;;;
+2464;CIRCLED DIGIT FIVE;No;0;ON;<circle> 0035;;5;5;N;;;;;
+2465;CIRCLED DIGIT SIX;No;0;ON;<circle> 0036;;6;6;N;;;;;
+2466;CIRCLED DIGIT SEVEN;No;0;ON;<circle> 0037;;7;7;N;;;;;
+2467;CIRCLED DIGIT EIGHT;No;0;ON;<circle> 0038;;8;8;N;;;;;
+2468;CIRCLED DIGIT NINE;No;0;ON;<circle> 0039;;9;9;N;;;;;
+2469;CIRCLED NUMBER TEN;No;0;ON;<circle> 0031 0030;;;10;N;;;;;
+246A;CIRCLED NUMBER ELEVEN;No;0;ON;<circle> 0031 0031;;;11;N;;;;;
+246B;CIRCLED NUMBER TWELVE;No;0;ON;<circle> 0031 0032;;;12;N;;;;;
+246C;CIRCLED NUMBER THIRTEEN;No;0;ON;<circle> 0031 0033;;;13;N;;;;;
+246D;CIRCLED NUMBER FOURTEEN;No;0;ON;<circle> 0031 0034;;;14;N;;;;;
+246E;CIRCLED NUMBER FIFTEEN;No;0;ON;<circle> 0031 0035;;;15;N;;;;;
+246F;CIRCLED NUMBER SIXTEEN;No;0;ON;<circle> 0031 0036;;;16;N;;;;;
+2470;CIRCLED NUMBER SEVENTEEN;No;0;ON;<circle> 0031 0037;;;17;N;;;;;
+2471;CIRCLED NUMBER EIGHTEEN;No;0;ON;<circle> 0031 0038;;;18;N;;;;;
+2472;CIRCLED NUMBER NINETEEN;No;0;ON;<circle> 0031 0039;;;19;N;;;;;
+2473;CIRCLED NUMBER TWENTY;No;0;ON;<circle> 0032 0030;;;20;N;;;;;
+2474;PARENTHESIZED DIGIT ONE;No;0;ON;<compat> 0028 0031 0029;;1;1;N;;;;;
+2475;PARENTHESIZED DIGIT TWO;No;0;ON;<compat> 0028 0032 0029;;2;2;N;;;;;
+2476;PARENTHESIZED DIGIT THREE;No;0;ON;<compat> 0028 0033 0029;;3;3;N;;;;;
+2477;PARENTHESIZED DIGIT FOUR;No;0;ON;<compat> 0028 0034 0029;;4;4;N;;;;;
+2478;PARENTHESIZED DIGIT FIVE;No;0;ON;<compat> 0028 0035 0029;;5;5;N;;;;;
+2479;PARENTHESIZED DIGIT SIX;No;0;ON;<compat> 0028 0036 0029;;6;6;N;;;;;
+247A;PARENTHESIZED DIGIT SEVEN;No;0;ON;<compat> 0028 0037 0029;;7;7;N;;;;;
+247B;PARENTHESIZED DIGIT EIGHT;No;0;ON;<compat> 0028 0038 0029;;8;8;N;;;;;
+247C;PARENTHESIZED DIGIT NINE;No;0;ON;<compat> 0028 0039 0029;;9;9;N;;;;;
+247D;PARENTHESIZED NUMBER TEN;No;0;ON;<compat> 0028 0031 0030 0029;;;10;N;;;;;
+247E;PARENTHESIZED NUMBER ELEVEN;No;0;ON;<compat> 0028 0031 0031 0029;;;11;N;;;;;
+247F;PARENTHESIZED NUMBER TWELVE;No;0;ON;<compat> 0028 0031 0032 0029;;;12;N;;;;;
+2480;PARENTHESIZED NUMBER THIRTEEN;No;0;ON;<compat> 0028 0031 0033 0029;;;13;N;;;;;
+2481;PARENTHESIZED NUMBER FOURTEEN;No;0;ON;<compat> 0028 0031 0034 0029;;;14;N;;;;;
+2482;PARENTHESIZED NUMBER FIFTEEN;No;0;ON;<compat> 0028 0031 0035 0029;;;15;N;;;;;
+2483;PARENTHESIZED NUMBER SIXTEEN;No;0;ON;<compat> 0028 0031 0036 0029;;;16;N;;;;;
+2484;PARENTHESIZED NUMBER SEVENTEEN;No;0;ON;<compat> 0028 0031 0037 0029;;;17;N;;;;;
+2485;PARENTHESIZED NUMBER EIGHTEEN;No;0;ON;<compat> 0028 0031 0038 0029;;;18;N;;;;;
+2486;PARENTHESIZED NUMBER NINETEEN;No;0;ON;<compat> 0028 0031 0039 0029;;;19;N;;;;;
+2487;PARENTHESIZED NUMBER TWENTY;No;0;ON;<compat> 0028 0032 0030 0029;;;20;N;;;;;
+2488;DIGIT ONE FULL STOP;No;0;EN;<compat> 0031 002E;;1;1;N;DIGIT ONE PERIOD;;;;
+2489;DIGIT TWO FULL STOP;No;0;EN;<compat> 0032 002E;;2;2;N;DIGIT TWO PERIOD;;;;
+248A;DIGIT THREE FULL STOP;No;0;EN;<compat> 0033 002E;;3;3;N;DIGIT THREE PERIOD;;;;
+248B;DIGIT FOUR FULL STOP;No;0;EN;<compat> 0034 002E;;4;4;N;DIGIT FOUR PERIOD;;;;
+248C;DIGIT FIVE FULL STOP;No;0;EN;<compat> 0035 002E;;5;5;N;DIGIT FIVE PERIOD;;;;
+248D;DIGIT SIX FULL STOP;No;0;EN;<compat> 0036 002E;;6;6;N;DIGIT SIX PERIOD;;;;
+248E;DIGIT SEVEN FULL STOP;No;0;EN;<compat> 0037 002E;;7;7;N;DIGIT SEVEN PERIOD;;;;
+248F;DIGIT EIGHT FULL STOP;No;0;EN;<compat> 0038 002E;;8;8;N;DIGIT EIGHT PERIOD;;;;
+2490;DIGIT NINE FULL STOP;No;0;EN;<compat> 0039 002E;;9;9;N;DIGIT NINE PERIOD;;;;
+2491;NUMBER TEN FULL STOP;No;0;EN;<compat> 0031 0030 002E;;;10;N;NUMBER TEN PERIOD;;;;
+2492;NUMBER ELEVEN FULL STOP;No;0;EN;<compat> 0031 0031 002E;;;11;N;NUMBER ELEVEN PERIOD;;;;
+2493;NUMBER TWELVE FULL STOP;No;0;EN;<compat> 0031 0032 002E;;;12;N;NUMBER TWELVE PERIOD;;;;
+2494;NUMBER THIRTEEN FULL STOP;No;0;EN;<compat> 0031 0033 002E;;;13;N;NUMBER THIRTEEN PERIOD;;;;
+2495;NUMBER FOURTEEN FULL STOP;No;0;EN;<compat> 0031 0034 002E;;;14;N;NUMBER FOURTEEN PERIOD;;;;
+2496;NUMBER FIFTEEN FULL STOP;No;0;EN;<compat> 0031 0035 002E;;;15;N;NUMBER FIFTEEN PERIOD;;;;
+2497;NUMBER SIXTEEN FULL STOP;No;0;EN;<compat> 0031 0036 002E;;;16;N;NUMBER SIXTEEN PERIOD;;;;
+2498;NUMBER SEVENTEEN FULL STOP;No;0;EN;<compat> 0031 0037 002E;;;17;N;NUMBER SEVENTEEN PERIOD;;;;
+2499;NUMBER EIGHTEEN FULL STOP;No;0;EN;<compat> 0031 0038 002E;;;18;N;NUMBER EIGHTEEN PERIOD;;;;
+249A;NUMBER NINETEEN FULL STOP;No;0;EN;<compat> 0031 0039 002E;;;19;N;NUMBER NINETEEN PERIOD;;;;
+249B;NUMBER TWENTY FULL STOP;No;0;EN;<compat> 0032 0030 002E;;;20;N;NUMBER TWENTY PERIOD;;;;
+249C;PARENTHESIZED LATIN SMALL LETTER A;So;0;L;<compat> 0028 0061 0029;;;;N;;;;;
+249D;PARENTHESIZED LATIN SMALL LETTER B;So;0;L;<compat> 0028 0062 0029;;;;N;;;;;
+249E;PARENTHESIZED LATIN SMALL LETTER C;So;0;L;<compat> 0028 0063 0029;;;;N;;;;;
+249F;PARENTHESIZED LATIN SMALL LETTER D;So;0;L;<compat> 0028 0064 0029;;;;N;;;;;
+24A0;PARENTHESIZED LATIN SMALL LETTER E;So;0;L;<compat> 0028 0065 0029;;;;N;;;;;
+24A1;PARENTHESIZED LATIN SMALL LETTER F;So;0;L;<compat> 0028 0066 0029;;;;N;;;;;
+24A2;PARENTHESIZED LATIN SMALL LETTER G;So;0;L;<compat> 0028 0067 0029;;;;N;;;;;
+24A3;PARENTHESIZED LATIN SMALL LETTER H;So;0;L;<compat> 0028 0068 0029;;;;N;;;;;
+24A4;PARENTHESIZED LATIN SMALL LETTER I;So;0;L;<compat> 0028 0069 0029;;;;N;;;;;
+24A5;PARENTHESIZED LATIN SMALL LETTER J;So;0;L;<compat> 0028 006A 0029;;;;N;;;;;
+24A6;PARENTHESIZED LATIN SMALL LETTER K;So;0;L;<compat> 0028 006B 0029;;;;N;;;;;
+24A7;PARENTHESIZED LATIN SMALL LETTER L;So;0;L;<compat> 0028 006C 0029;;;;N;;;;;
+24A8;PARENTHESIZED LATIN SMALL LETTER M;So;0;L;<compat> 0028 006D 0029;;;;N;;;;;
+24A9;PARENTHESIZED LATIN SMALL LETTER N;So;0;L;<compat> 0028 006E 0029;;;;N;;;;;
+24AA;PARENTHESIZED LATIN SMALL LETTER O;So;0;L;<compat> 0028 006F 0029;;;;N;;;;;
+24AB;PARENTHESIZED LATIN SMALL LETTER P;So;0;L;<compat> 0028 0070 0029;;;;N;;;;;
+24AC;PARENTHESIZED LATIN SMALL LETTER Q;So;0;L;<compat> 0028 0071 0029;;;;N;;;;;
+24AD;PARENTHESIZED LATIN SMALL LETTER R;So;0;L;<compat> 0028 0072 0029;;;;N;;;;;
+24AE;PARENTHESIZED LATIN SMALL LETTER S;So;0;L;<compat> 0028 0073 0029;;;;N;;;;;
+24AF;PARENTHESIZED LATIN SMALL LETTER T;So;0;L;<compat> 0028 0074 0029;;;;N;;;;;
+24B0;PARENTHESIZED LATIN SMALL LETTER U;So;0;L;<compat> 0028 0075 0029;;;;N;;;;;
+24B1;PARENTHESIZED LATIN SMALL LETTER V;So;0;L;<compat> 0028 0076 0029;;;;N;;;;;
+24B2;PARENTHESIZED LATIN SMALL LETTER W;So;0;L;<compat> 0028 0077 0029;;;;N;;;;;
+24B3;PARENTHESIZED LATIN SMALL LETTER X;So;0;L;<compat> 0028 0078 0029;;;;N;;;;;
+24B4;PARENTHESIZED LATIN SMALL LETTER Y;So;0;L;<compat> 0028 0079 0029;;;;N;;;;;
+24B5;PARENTHESIZED LATIN SMALL LETTER Z;So;0;L;<compat> 0028 007A 0029;;;;N;;;;;
+24B6;CIRCLED LATIN CAPITAL LETTER A;So;0;L;<circle> 0041;;;;N;;;;24D0;
+24B7;CIRCLED LATIN CAPITAL LETTER B;So;0;L;<circle> 0042;;;;N;;;;24D1;
+24B8;CIRCLED LATIN CAPITAL LETTER C;So;0;L;<circle> 0043;;;;N;;;;24D2;
+24B9;CIRCLED LATIN CAPITAL LETTER D;So;0;L;<circle> 0044;;;;N;;;;24D3;
+24BA;CIRCLED LATIN CAPITAL LETTER E;So;0;L;<circle> 0045;;;;N;;;;24D4;
+24BB;CIRCLED LATIN CAPITAL LETTER F;So;0;L;<circle> 0046;;;;N;;;;24D5;
+24BC;CIRCLED LATIN CAPITAL LETTER G;So;0;L;<circle> 0047;;;;N;;;;24D6;
+24BD;CIRCLED LATIN CAPITAL LETTER H;So;0;L;<circle> 0048;;;;N;;;;24D7;
+24BE;CIRCLED LATIN CAPITAL LETTER I;So;0;L;<circle> 0049;;;;N;;;;24D8;
+24BF;CIRCLED LATIN CAPITAL LETTER J;So;0;L;<circle> 004A;;;;N;;;;24D9;
+24C0;CIRCLED LATIN CAPITAL LETTER K;So;0;L;<circle> 004B;;;;N;;;;24DA;
+24C1;CIRCLED LATIN CAPITAL LETTER L;So;0;L;<circle> 004C;;;;N;;;;24DB;
+24C2;CIRCLED LATIN CAPITAL LETTER M;So;0;L;<circle> 004D;;;;N;;;;24DC;
+24C3;CIRCLED LATIN CAPITAL LETTER N;So;0;L;<circle> 004E;;;;N;;;;24DD;
+24C4;CIRCLED LATIN CAPITAL LETTER O;So;0;L;<circle> 004F;;;;N;;;;24DE;
+24C5;CIRCLED LATIN CAPITAL LETTER P;So;0;L;<circle> 0050;;;;N;;;;24DF;
+24C6;CIRCLED LATIN CAPITAL LETTER Q;So;0;L;<circle> 0051;;;;N;;;;24E0;
+24C7;CIRCLED LATIN CAPITAL LETTER R;So;0;L;<circle> 0052;;;;N;;;;24E1;
+24C8;CIRCLED LATIN CAPITAL LETTER S;So;0;L;<circle> 0053;;;;N;;;;24E2;
+24C9;CIRCLED LATIN CAPITAL LETTER T;So;0;L;<circle> 0054;;;;N;;;;24E3;
+24CA;CIRCLED LATIN CAPITAL LETTER U;So;0;L;<circle> 0055;;;;N;;;;24E4;
+24CB;CIRCLED LATIN CAPITAL LETTER V;So;0;L;<circle> 0056;;;;N;;;;24E5;
+24CC;CIRCLED LATIN CAPITAL LETTER W;So;0;L;<circle> 0057;;;;N;;;;24E6;
+24CD;CIRCLED LATIN CAPITAL LETTER X;So;0;L;<circle> 0058;;;;N;;;;24E7;
+24CE;CIRCLED LATIN CAPITAL LETTER Y;So;0;L;<circle> 0059;;;;N;;;;24E8;
+24CF;CIRCLED LATIN CAPITAL LETTER Z;So;0;L;<circle> 005A;;;;N;;;;24E9;
+24D0;CIRCLED LATIN SMALL LETTER A;So;0;L;<circle> 0061;;;;N;;;24B6;;24B6
+24D1;CIRCLED LATIN SMALL LETTER B;So;0;L;<circle> 0062;;;;N;;;24B7;;24B7
+24D2;CIRCLED LATIN SMALL LETTER C;So;0;L;<circle> 0063;;;;N;;;24B8;;24B8
+24D3;CIRCLED LATIN SMALL LETTER D;So;0;L;<circle> 0064;;;;N;;;24B9;;24B9
+24D4;CIRCLED LATIN SMALL LETTER E;So;0;L;<circle> 0065;;;;N;;;24BA;;24BA
+24D5;CIRCLED LATIN SMALL LETTER F;So;0;L;<circle> 0066;;;;N;;;24BB;;24BB
+24D6;CIRCLED LATIN SMALL LETTER G;So;0;L;<circle> 0067;;;;N;;;24BC;;24BC
+24D7;CIRCLED LATIN SMALL LETTER H;So;0;L;<circle> 0068;;;;N;;;24BD;;24BD
+24D8;CIRCLED LATIN SMALL LETTER I;So;0;L;<circle> 0069;;;;N;;;24BE;;24BE
+24D9;CIRCLED LATIN SMALL LETTER J;So;0;L;<circle> 006A;;;;N;;;24BF;;24BF
+24DA;CIRCLED LATIN SMALL LETTER K;So;0;L;<circle> 006B;;;;N;;;24C0;;24C0
+24DB;CIRCLED LATIN SMALL LETTER L;So;0;L;<circle> 006C;;;;N;;;24C1;;24C1
+24DC;CIRCLED LATIN SMALL LETTER M;So;0;L;<circle> 006D;;;;N;;;24C2;;24C2
+24DD;CIRCLED LATIN SMALL LETTER N;So;0;L;<circle> 006E;;;;N;;;24C3;;24C3
+24DE;CIRCLED LATIN SMALL LETTER O;So;0;L;<circle> 006F;;;;N;;;24C4;;24C4
+24DF;CIRCLED LATIN SMALL LETTER P;So;0;L;<circle> 0070;;;;N;;;24C5;;24C5
+24E0;CIRCLED LATIN SMALL LETTER Q;So;0;L;<circle> 0071;;;;N;;;24C6;;24C6
+24E1;CIRCLED LATIN SMALL LETTER R;So;0;L;<circle> 0072;;;;N;;;24C7;;24C7
+24E2;CIRCLED LATIN SMALL LETTER S;So;0;L;<circle> 0073;;;;N;;;24C8;;24C8
+24E3;CIRCLED LATIN SMALL LETTER T;So;0;L;<circle> 0074;;;;N;;;24C9;;24C9
+24E4;CIRCLED LATIN SMALL LETTER U;So;0;L;<circle> 0075;;;;N;;;24CA;;24CA
+24E5;CIRCLED LATIN SMALL LETTER V;So;0;L;<circle> 0076;;;;N;;;24CB;;24CB
+24E6;CIRCLED LATIN SMALL LETTER W;So;0;L;<circle> 0077;;;;N;;;24CC;;24CC
+24E7;CIRCLED LATIN SMALL LETTER X;So;0;L;<circle> 0078;;;;N;;;24CD;;24CD
+24E8;CIRCLED LATIN SMALL LETTER Y;So;0;L;<circle> 0079;;;;N;;;24CE;;24CE
+24E9;CIRCLED LATIN SMALL LETTER Z;So;0;L;<circle> 007A;;;;N;;;24CF;;24CF
+24EA;CIRCLED DIGIT ZERO;No;0;ON;<circle> 0030;;0;0;N;;;;;
+24EB;NEGATIVE CIRCLED NUMBER ELEVEN;No;0;ON;;;;11;N;;;;;
+24EC;NEGATIVE CIRCLED NUMBER TWELVE;No;0;ON;;;;12;N;;;;;
+24ED;NEGATIVE CIRCLED NUMBER THIRTEEN;No;0;ON;;;;13;N;;;;;
+24EE;NEGATIVE CIRCLED NUMBER FOURTEEN;No;0;ON;;;;14;N;;;;;
+24EF;NEGATIVE CIRCLED NUMBER FIFTEEN;No;0;ON;;;;15;N;;;;;
+24F0;NEGATIVE CIRCLED NUMBER SIXTEEN;No;0;ON;;;;16;N;;;;;
+24F1;NEGATIVE CIRCLED NUMBER SEVENTEEN;No;0;ON;;;;17;N;;;;;
+24F2;NEGATIVE CIRCLED NUMBER EIGHTEEN;No;0;ON;;;;18;N;;;;;
+24F3;NEGATIVE CIRCLED NUMBER NINETEEN;No;0;ON;;;;19;N;;;;;
+24F4;NEGATIVE CIRCLED NUMBER TWENTY;No;0;ON;;;;20;N;;;;;
+24F5;DOUBLE CIRCLED DIGIT ONE;No;0;ON;;;1;1;N;;;;;
+24F6;DOUBLE CIRCLED DIGIT TWO;No;0;ON;;;2;2;N;;;;;
+24F7;DOUBLE CIRCLED DIGIT THREE;No;0;ON;;;3;3;N;;;;;
+24F8;DOUBLE CIRCLED DIGIT FOUR;No;0;ON;;;4;4;N;;;;;
+24F9;DOUBLE CIRCLED DIGIT FIVE;No;0;ON;;;5;5;N;;;;;
+24FA;DOUBLE CIRCLED DIGIT SIX;No;0;ON;;;6;6;N;;;;;
+24FB;DOUBLE CIRCLED DIGIT SEVEN;No;0;ON;;;7;7;N;;;;;
+24FC;DOUBLE CIRCLED DIGIT EIGHT;No;0;ON;;;8;8;N;;;;;
+24FD;DOUBLE CIRCLED DIGIT NINE;No;0;ON;;;9;9;N;;;;;
+24FE;DOUBLE CIRCLED NUMBER TEN;No;0;ON;;;;10;N;;;;;
+24FF;NEGATIVE CIRCLED DIGIT ZERO;No;0;ON;;;0;0;N;;;;;
+2500;BOX DRAWINGS LIGHT HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT HORIZONTAL;;;;
+2501;BOX DRAWINGS HEAVY HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY HORIZONTAL;;;;
+2502;BOX DRAWINGS LIGHT VERTICAL;So;0;ON;;;;;N;FORMS LIGHT VERTICAL;;;;
+2503;BOX DRAWINGS HEAVY VERTICAL;So;0;ON;;;;;N;FORMS HEAVY VERTICAL;;;;
+2504;BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT TRIPLE DASH HORIZONTAL;;;;
+2505;BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY TRIPLE DASH HORIZONTAL;;;;
+2506;BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS LIGHT TRIPLE DASH VERTICAL;;;;
+2507;BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS HEAVY TRIPLE DASH VERTICAL;;;;
+2508;BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT QUADRUPLE DASH HORIZONTAL;;;;
+2509;BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY QUADRUPLE DASH HORIZONTAL;;;;
+250A;BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS LIGHT QUADRUPLE DASH VERTICAL;;;;
+250B;BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL;So;0;ON;;;;;N;FORMS HEAVY QUADRUPLE DASH VERTICAL;;;;
+250C;BOX DRAWINGS LIGHT DOWN AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT DOWN AND RIGHT;;;;
+250D;BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND RIGHT HEAVY;;;;
+250E;BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND RIGHT LIGHT;;;;
+250F;BOX DRAWINGS HEAVY DOWN AND RIGHT;So;0;ON;;;;;N;FORMS HEAVY DOWN AND RIGHT;;;;
+2510;BOX DRAWINGS LIGHT DOWN AND LEFT;So;0;ON;;;;;N;FORMS LIGHT DOWN AND LEFT;;;;
+2511;BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND LEFT HEAVY;;;;
+2512;BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND LEFT LIGHT;;;;
+2513;BOX DRAWINGS HEAVY DOWN AND LEFT;So;0;ON;;;;;N;FORMS HEAVY DOWN AND LEFT;;;;
+2514;BOX DRAWINGS LIGHT UP AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT UP AND RIGHT;;;;
+2515;BOX DRAWINGS UP LIGHT AND RIGHT HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND RIGHT HEAVY;;;;
+2516;BOX DRAWINGS UP HEAVY AND RIGHT LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND RIGHT LIGHT;;;;
+2517;BOX DRAWINGS HEAVY UP AND RIGHT;So;0;ON;;;;;N;FORMS HEAVY UP AND RIGHT;;;;
+2518;BOX DRAWINGS LIGHT UP AND LEFT;So;0;ON;;;;;N;FORMS LIGHT UP AND LEFT;;;;
+2519;BOX DRAWINGS UP LIGHT AND LEFT HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND LEFT HEAVY;;;;
+251A;BOX DRAWINGS UP HEAVY AND LEFT LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND LEFT LIGHT;;;;
+251B;BOX DRAWINGS HEAVY UP AND LEFT;So;0;ON;;;;;N;FORMS HEAVY UP AND LEFT;;;;
+251C;BOX DRAWINGS LIGHT VERTICAL AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT VERTICAL AND RIGHT;;;;
+251D;BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY;So;0;ON;;;;;N;FORMS VERTICAL LIGHT AND RIGHT HEAVY;;;;
+251E;BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND RIGHT DOWN LIGHT;;;;
+251F;BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND RIGHT UP LIGHT;;;;
+2520;BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT;So;0;ON;;;;;N;FORMS VERTICAL HEAVY AND RIGHT LIGHT;;;;
+2521;BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND RIGHT UP HEAVY;;;;
+2522;BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND RIGHT DOWN HEAVY;;;;
+2523;BOX DRAWINGS HEAVY VERTICAL AND RIGHT;So;0;ON;;;;;N;FORMS HEAVY VERTICAL AND RIGHT;;;;
+2524;BOX DRAWINGS LIGHT VERTICAL AND LEFT;So;0;ON;;;;;N;FORMS LIGHT VERTICAL AND LEFT;;;;
+2525;BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY;So;0;ON;;;;;N;FORMS VERTICAL LIGHT AND LEFT HEAVY;;;;
+2526;BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND LEFT DOWN LIGHT;;;;
+2527;BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND LEFT UP LIGHT;;;;
+2528;BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT;So;0;ON;;;;;N;FORMS VERTICAL HEAVY AND LEFT LIGHT;;;;
+2529;BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND LEFT UP HEAVY;;;;
+252A;BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND LEFT DOWN HEAVY;;;;
+252B;BOX DRAWINGS HEAVY VERTICAL AND LEFT;So;0;ON;;;;;N;FORMS HEAVY VERTICAL AND LEFT;;;;
+252C;BOX DRAWINGS LIGHT DOWN AND HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT DOWN AND HORIZONTAL;;;;
+252D;BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT;So;0;ON;;;;;N;FORMS LEFT HEAVY AND RIGHT DOWN LIGHT;;;;
+252E;BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT;So;0;ON;;;;;N;FORMS RIGHT HEAVY AND LEFT DOWN LIGHT;;;;
+252F;BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND HORIZONTAL HEAVY;;;;
+2530;BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND HORIZONTAL LIGHT;;;;
+2531;BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY;So;0;ON;;;;;N;FORMS RIGHT LIGHT AND LEFT DOWN HEAVY;;;;
+2532;BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY;So;0;ON;;;;;N;FORMS LEFT LIGHT AND RIGHT DOWN HEAVY;;;;
+2533;BOX DRAWINGS HEAVY DOWN AND HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY DOWN AND HORIZONTAL;;;;
+2534;BOX DRAWINGS LIGHT UP AND HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT UP AND HORIZONTAL;;;;
+2535;BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT;So;0;ON;;;;;N;FORMS LEFT HEAVY AND RIGHT UP LIGHT;;;;
+2536;BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT;So;0;ON;;;;;N;FORMS RIGHT HEAVY AND LEFT UP LIGHT;;;;
+2537;BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND HORIZONTAL HEAVY;;;;
+2538;BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND HORIZONTAL LIGHT;;;;
+2539;BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY;So;0;ON;;;;;N;FORMS RIGHT LIGHT AND LEFT UP HEAVY;;;;
+253A;BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY;So;0;ON;;;;;N;FORMS LEFT LIGHT AND RIGHT UP HEAVY;;;;
+253B;BOX DRAWINGS HEAVY UP AND HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY UP AND HORIZONTAL;;;;
+253C;BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT VERTICAL AND HORIZONTAL;;;;
+253D;BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT;So;0;ON;;;;;N;FORMS LEFT HEAVY AND RIGHT VERTICAL LIGHT;;;;
+253E;BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT;So;0;ON;;;;;N;FORMS RIGHT HEAVY AND LEFT VERTICAL LIGHT;;;;
+253F;BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS VERTICAL LIGHT AND HORIZONTAL HEAVY;;;;
+2540;BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS UP HEAVY AND DOWN HORIZONTAL LIGHT;;;;
+2541;BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS DOWN HEAVY AND UP HORIZONTAL LIGHT;;;;
+2542;BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT;So;0;ON;;;;;N;FORMS VERTICAL HEAVY AND HORIZONTAL LIGHT;;;;
+2543;BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT;So;0;ON;;;;;N;FORMS LEFT UP HEAVY AND RIGHT DOWN LIGHT;;;;
+2544;BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT;So;0;ON;;;;;N;FORMS RIGHT UP HEAVY AND LEFT DOWN LIGHT;;;;
+2545;BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT;So;0;ON;;;;;N;FORMS LEFT DOWN HEAVY AND RIGHT UP LIGHT;;;;
+2546;BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT;So;0;ON;;;;;N;FORMS RIGHT DOWN HEAVY AND LEFT UP LIGHT;;;;
+2547;BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS DOWN LIGHT AND UP HORIZONTAL HEAVY;;;;
+2548;BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY;So;0;ON;;;;;N;FORMS UP LIGHT AND DOWN HORIZONTAL HEAVY;;;;
+2549;BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY;So;0;ON;;;;;N;FORMS RIGHT LIGHT AND LEFT VERTICAL HEAVY;;;;
+254A;BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY;So;0;ON;;;;;N;FORMS LEFT LIGHT AND RIGHT VERTICAL HEAVY;;;;
+254B;BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY VERTICAL AND HORIZONTAL;;;;
+254C;BOX DRAWINGS LIGHT DOUBLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS LIGHT DOUBLE DASH HORIZONTAL;;;;
+254D;BOX DRAWINGS HEAVY DOUBLE DASH HORIZONTAL;So;0;ON;;;;;N;FORMS HEAVY DOUBLE DASH HORIZONTAL;;;;
+254E;BOX DRAWINGS LIGHT DOUBLE DASH VERTICAL;So;0;ON;;;;;N;FORMS LIGHT DOUBLE DASH VERTICAL;;;;
+254F;BOX DRAWINGS HEAVY DOUBLE DASH VERTICAL;So;0;ON;;;;;N;FORMS HEAVY DOUBLE DASH VERTICAL;;;;
+2550;BOX DRAWINGS DOUBLE HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE HORIZONTAL;;;;
+2551;BOX DRAWINGS DOUBLE VERTICAL;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL;;;;
+2552;BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE;So;0;ON;;;;;N;FORMS DOWN SINGLE AND RIGHT DOUBLE;;;;
+2553;BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE;So;0;ON;;;;;N;FORMS DOWN DOUBLE AND RIGHT SINGLE;;;;
+2554;BOX DRAWINGS DOUBLE DOWN AND RIGHT;So;0;ON;;;;;N;FORMS DOUBLE DOWN AND RIGHT;;;;
+2555;BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE;So;0;ON;;;;;N;FORMS DOWN SINGLE AND LEFT DOUBLE;;;;
+2556;BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE;So;0;ON;;;;;N;FORMS DOWN DOUBLE AND LEFT SINGLE;;;;
+2557;BOX DRAWINGS DOUBLE DOWN AND LEFT;So;0;ON;;;;;N;FORMS DOUBLE DOWN AND LEFT;;;;
+2558;BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE;So;0;ON;;;;;N;FORMS UP SINGLE AND RIGHT DOUBLE;;;;
+2559;BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE;So;0;ON;;;;;N;FORMS UP DOUBLE AND RIGHT SINGLE;;;;
+255A;BOX DRAWINGS DOUBLE UP AND RIGHT;So;0;ON;;;;;N;FORMS DOUBLE UP AND RIGHT;;;;
+255B;BOX DRAWINGS UP SINGLE AND LEFT DOUBLE;So;0;ON;;;;;N;FORMS UP SINGLE AND LEFT DOUBLE;;;;
+255C;BOX DRAWINGS UP DOUBLE AND LEFT SINGLE;So;0;ON;;;;;N;FORMS UP DOUBLE AND LEFT SINGLE;;;;
+255D;BOX DRAWINGS DOUBLE UP AND LEFT;So;0;ON;;;;;N;FORMS DOUBLE UP AND LEFT;;;;
+255E;BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE;So;0;ON;;;;;N;FORMS VERTICAL SINGLE AND RIGHT DOUBLE;;;;
+255F;BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE;So;0;ON;;;;;N;FORMS VERTICAL DOUBLE AND RIGHT SINGLE;;;;
+2560;BOX DRAWINGS DOUBLE VERTICAL AND RIGHT;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL AND RIGHT;;;;
+2561;BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE;So;0;ON;;;;;N;FORMS VERTICAL SINGLE AND LEFT DOUBLE;;;;
+2562;BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE;So;0;ON;;;;;N;FORMS VERTICAL DOUBLE AND LEFT SINGLE;;;;
+2563;BOX DRAWINGS DOUBLE VERTICAL AND LEFT;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL AND LEFT;;;;
+2564;BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE;So;0;ON;;;;;N;FORMS DOWN SINGLE AND HORIZONTAL DOUBLE;;;;
+2565;BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE;So;0;ON;;;;;N;FORMS DOWN DOUBLE AND HORIZONTAL SINGLE;;;;
+2566;BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE DOWN AND HORIZONTAL;;;;
+2567;BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE;So;0;ON;;;;;N;FORMS UP SINGLE AND HORIZONTAL DOUBLE;;;;
+2568;BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE;So;0;ON;;;;;N;FORMS UP DOUBLE AND HORIZONTAL SINGLE;;;;
+2569;BOX DRAWINGS DOUBLE UP AND HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE UP AND HORIZONTAL;;;;
+256A;BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE;So;0;ON;;;;;N;FORMS VERTICAL SINGLE AND HORIZONTAL DOUBLE;;;;
+256B;BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE;So;0;ON;;;;;N;FORMS VERTICAL DOUBLE AND HORIZONTAL SINGLE;;;;
+256C;BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL;So;0;ON;;;;;N;FORMS DOUBLE VERTICAL AND HORIZONTAL;;;;
+256D;BOX DRAWINGS LIGHT ARC DOWN AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT ARC DOWN AND RIGHT;;;;
+256E;BOX DRAWINGS LIGHT ARC DOWN AND LEFT;So;0;ON;;;;;N;FORMS LIGHT ARC DOWN AND LEFT;;;;
+256F;BOX DRAWINGS LIGHT ARC UP AND LEFT;So;0;ON;;;;;N;FORMS LIGHT ARC UP AND LEFT;;;;
+2570;BOX DRAWINGS LIGHT ARC UP AND RIGHT;So;0;ON;;;;;N;FORMS LIGHT ARC UP AND RIGHT;;;;
+2571;BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT;So;0;ON;;;;;N;FORMS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT;;;;
+2572;BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT;So;0;ON;;;;;N;FORMS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT;;;;
+2573;BOX DRAWINGS LIGHT DIAGONAL CROSS;So;0;ON;;;;;N;FORMS LIGHT DIAGONAL CROSS;;;;
+2574;BOX DRAWINGS LIGHT LEFT;So;0;ON;;;;;N;FORMS LIGHT LEFT;;;;
+2575;BOX DRAWINGS LIGHT UP;So;0;ON;;;;;N;FORMS LIGHT UP;;;;
+2576;BOX DRAWINGS LIGHT RIGHT;So;0;ON;;;;;N;FORMS LIGHT RIGHT;;;;
+2577;BOX DRAWINGS LIGHT DOWN;So;0;ON;;;;;N;FORMS LIGHT DOWN;;;;
+2578;BOX DRAWINGS HEAVY LEFT;So;0;ON;;;;;N;FORMS HEAVY LEFT;;;;
+2579;BOX DRAWINGS HEAVY UP;So;0;ON;;;;;N;FORMS HEAVY UP;;;;
+257A;BOX DRAWINGS HEAVY RIGHT;So;0;ON;;;;;N;FORMS HEAVY RIGHT;;;;
+257B;BOX DRAWINGS HEAVY DOWN;So;0;ON;;;;;N;FORMS HEAVY DOWN;;;;
+257C;BOX DRAWINGS LIGHT LEFT AND HEAVY RIGHT;So;0;ON;;;;;N;FORMS LIGHT LEFT AND HEAVY RIGHT;;;;
+257D;BOX DRAWINGS LIGHT UP AND HEAVY DOWN;So;0;ON;;;;;N;FORMS LIGHT UP AND HEAVY DOWN;;;;
+257E;BOX DRAWINGS HEAVY LEFT AND LIGHT RIGHT;So;0;ON;;;;;N;FORMS HEAVY LEFT AND LIGHT RIGHT;;;;
+257F;BOX DRAWINGS HEAVY UP AND LIGHT DOWN;So;0;ON;;;;;N;FORMS HEAVY UP AND LIGHT DOWN;;;;
+2580;UPPER HALF BLOCK;So;0;ON;;;;;N;;;;;
+2581;LOWER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+2582;LOWER ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;;
+2583;LOWER THREE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+2584;LOWER HALF BLOCK;So;0;ON;;;;;N;;;;;
+2585;LOWER FIVE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+2586;LOWER THREE QUARTERS BLOCK;So;0;ON;;;;;N;LOWER THREE QUARTER BLOCK;;;;
+2587;LOWER SEVEN EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+2588;FULL BLOCK;So;0;ON;;;;;N;;;;;
+2589;LEFT SEVEN EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+258A;LEFT THREE QUARTERS BLOCK;So;0;ON;;;;;N;LEFT THREE QUARTER BLOCK;;;;
+258B;LEFT FIVE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+258C;LEFT HALF BLOCK;So;0;ON;;;;;N;;;;;
+258D;LEFT THREE EIGHTHS BLOCK;So;0;ON;;;;;N;;;;;
+258E;LEFT ONE QUARTER BLOCK;So;0;ON;;;;;N;;;;;
+258F;LEFT ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+2590;RIGHT HALF BLOCK;So;0;ON;;;;;N;;;;;
+2591;LIGHT SHADE;So;0;ON;;;;;N;;;;;
+2592;MEDIUM SHADE;So;0;ON;;;;;N;;;;;
+2593;DARK SHADE;So;0;ON;;;;;N;;;;;
+2594;UPPER ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+2595;RIGHT ONE EIGHTH BLOCK;So;0;ON;;;;;N;;;;;
+2596;QUADRANT LOWER LEFT;So;0;ON;;;;;N;;;;;
+2597;QUADRANT LOWER RIGHT;So;0;ON;;;;;N;;;;;
+2598;QUADRANT UPPER LEFT;So;0;ON;;;;;N;;;;;
+2599;QUADRANT UPPER LEFT AND LOWER LEFT AND LOWER RIGHT;So;0;ON;;;;;N;;;;;
+259A;QUADRANT UPPER LEFT AND LOWER RIGHT;So;0;ON;;;;;N;;;;;
+259B;QUADRANT UPPER LEFT AND UPPER RIGHT AND LOWER LEFT;So;0;ON;;;;;N;;;;;
+259C;QUADRANT UPPER LEFT AND UPPER RIGHT AND LOWER RIGHT;So;0;ON;;;;;N;;;;;
+259D;QUADRANT UPPER RIGHT;So;0;ON;;;;;N;;;;;
+259E;QUADRANT UPPER RIGHT AND LOWER LEFT;So;0;ON;;;;;N;;;;;
+259F;QUADRANT UPPER RIGHT AND LOWER LEFT AND LOWER RIGHT;So;0;ON;;;;;N;;;;;
+25A0;BLACK SQUARE;So;0;ON;;;;;N;;;;;
+25A1;WHITE SQUARE;So;0;ON;;;;;N;;;;;
+25A2;WHITE SQUARE WITH ROUNDED CORNERS;So;0;ON;;;;;N;;;;;
+25A3;WHITE SQUARE CONTAINING BLACK SMALL SQUARE;So;0;ON;;;;;N;;;;;
+25A4;SQUARE WITH HORIZONTAL FILL;So;0;ON;;;;;N;;;;;
+25A5;SQUARE WITH VERTICAL FILL;So;0;ON;;;;;N;;;;;
+25A6;SQUARE WITH ORTHOGONAL CROSSHATCH FILL;So;0;ON;;;;;N;;;;;
+25A7;SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL;So;0;ON;;;;;N;;;;;
+25A8;SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL;So;0;ON;;;;;N;;;;;
+25A9;SQUARE WITH DIAGONAL CROSSHATCH FILL;So;0;ON;;;;;N;;;;;
+25AA;BLACK SMALL SQUARE;So;0;ON;;;;;N;;;;;
+25AB;WHITE SMALL SQUARE;So;0;ON;;;;;N;;;;;
+25AC;BLACK RECTANGLE;So;0;ON;;;;;N;;;;;
+25AD;WHITE RECTANGLE;So;0;ON;;;;;N;;;;;
+25AE;BLACK VERTICAL RECTANGLE;So;0;ON;;;;;N;;;;;
+25AF;WHITE VERTICAL RECTANGLE;So;0;ON;;;;;N;;;;;
+25B0;BLACK PARALLELOGRAM;So;0;ON;;;;;N;;;;;
+25B1;WHITE PARALLELOGRAM;So;0;ON;;;;;N;;;;;
+25B2;BLACK UP-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK UP POINTING TRIANGLE;;;;
+25B3;WHITE UP-POINTING TRIANGLE;So;0;ON;;;;;N;WHITE UP POINTING TRIANGLE;;;;
+25B4;BLACK UP-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK UP POINTING SMALL TRIANGLE;;;;
+25B5;WHITE UP-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE UP POINTING SMALL TRIANGLE;;;;
+25B6;BLACK RIGHT-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK RIGHT POINTING TRIANGLE;;;;
+25B7;WHITE RIGHT-POINTING TRIANGLE;Sm;0;ON;;;;;N;WHITE RIGHT POINTING TRIANGLE;;;;
+25B8;BLACK RIGHT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK RIGHT POINTING SMALL TRIANGLE;;;;
+25B9;WHITE RIGHT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE RIGHT POINTING SMALL TRIANGLE;;;;
+25BA;BLACK RIGHT-POINTING POINTER;So;0;ON;;;;;N;BLACK RIGHT POINTING POINTER;;;;
+25BB;WHITE RIGHT-POINTING POINTER;So;0;ON;;;;;N;WHITE RIGHT POINTING POINTER;;;;
+25BC;BLACK DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK DOWN POINTING TRIANGLE;;;;
+25BD;WHITE DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;WHITE DOWN POINTING TRIANGLE;;;;
+25BE;BLACK DOWN-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK DOWN POINTING SMALL TRIANGLE;;;;
+25BF;WHITE DOWN-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE DOWN POINTING SMALL TRIANGLE;;;;
+25C0;BLACK LEFT-POINTING TRIANGLE;So;0;ON;;;;;N;BLACK LEFT POINTING TRIANGLE;;;;
+25C1;WHITE LEFT-POINTING TRIANGLE;Sm;0;ON;;;;;N;WHITE LEFT POINTING TRIANGLE;;;;
+25C2;BLACK LEFT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;BLACK LEFT POINTING SMALL TRIANGLE;;;;
+25C3;WHITE LEFT-POINTING SMALL TRIANGLE;So;0;ON;;;;;N;WHITE LEFT POINTING SMALL TRIANGLE;;;;
+25C4;BLACK LEFT-POINTING POINTER;So;0;ON;;;;;N;BLACK LEFT POINTING POINTER;;;;
+25C5;WHITE LEFT-POINTING POINTER;So;0;ON;;;;;N;WHITE LEFT POINTING POINTER;;;;
+25C6;BLACK DIAMOND;So;0;ON;;;;;N;;;;;
+25C7;WHITE DIAMOND;So;0;ON;;;;;N;;;;;
+25C8;WHITE DIAMOND CONTAINING BLACK SMALL DIAMOND;So;0;ON;;;;;N;;;;;
+25C9;FISHEYE;So;0;ON;;;;;N;;;;;
+25CA;LOZENGE;So;0;ON;;;;;N;;;;;
+25CB;WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+25CC;DOTTED CIRCLE;So;0;ON;;;;;N;;;;;
+25CD;CIRCLE WITH VERTICAL FILL;So;0;ON;;;;;N;;;;;
+25CE;BULLSEYE;So;0;ON;;;;;N;;;;;
+25CF;BLACK CIRCLE;So;0;ON;;;;;N;;;;;
+25D0;CIRCLE WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;;
+25D1;CIRCLE WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;;
+25D2;CIRCLE WITH LOWER HALF BLACK;So;0;ON;;;;;N;;;;;
+25D3;CIRCLE WITH UPPER HALF BLACK;So;0;ON;;;;;N;;;;;
+25D4;CIRCLE WITH UPPER RIGHT QUADRANT BLACK;So;0;ON;;;;;N;;;;;
+25D5;CIRCLE WITH ALL BUT UPPER LEFT QUADRANT BLACK;So;0;ON;;;;;N;;;;;
+25D6;LEFT HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;;
+25D7;RIGHT HALF BLACK CIRCLE;So;0;ON;;;;;N;;;;;
+25D8;INVERSE BULLET;So;0;ON;;;;;N;;;;;
+25D9;INVERSE WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+25DA;UPPER HALF INVERSE WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+25DB;LOWER HALF INVERSE WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+25DC;UPPER LEFT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;;
+25DD;UPPER RIGHT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;;
+25DE;LOWER RIGHT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;;
+25DF;LOWER LEFT QUADRANT CIRCULAR ARC;So;0;ON;;;;;N;;;;;
+25E0;UPPER HALF CIRCLE;So;0;ON;;;;;N;;;;;
+25E1;LOWER HALF CIRCLE;So;0;ON;;;;;N;;;;;
+25E2;BLACK LOWER RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
+25E3;BLACK LOWER LEFT TRIANGLE;So;0;ON;;;;;N;;;;;
+25E4;BLACK UPPER LEFT TRIANGLE;So;0;ON;;;;;N;;;;;
+25E5;BLACK UPPER RIGHT TRIANGLE;So;0;ON;;;;;N;;;;;
+25E6;WHITE BULLET;So;0;ON;;;;;N;;;;;
+25E7;SQUARE WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;;
+25E8;SQUARE WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;;
+25E9;SQUARE WITH UPPER LEFT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;;
+25EA;SQUARE WITH LOWER RIGHT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;;
+25EB;WHITE SQUARE WITH VERTICAL BISECTING LINE;So;0;ON;;;;;N;;;;;
+25EC;WHITE UP-POINTING TRIANGLE WITH DOT;So;0;ON;;;;;N;WHITE UP POINTING TRIANGLE WITH DOT;;;;
+25ED;UP-POINTING TRIANGLE WITH LEFT HALF BLACK;So;0;ON;;;;;N;UP POINTING TRIANGLE WITH LEFT HALF BLACK;;;;
+25EE;UP-POINTING TRIANGLE WITH RIGHT HALF BLACK;So;0;ON;;;;;N;UP POINTING TRIANGLE WITH RIGHT HALF BLACK;;;;
+25EF;LARGE CIRCLE;So;0;ON;;;;;N;;;;;
+25F0;WHITE SQUARE WITH UPPER LEFT QUADRANT;So;0;ON;;;;;N;;;;;
+25F1;WHITE SQUARE WITH LOWER LEFT QUADRANT;So;0;ON;;;;;N;;;;;
+25F2;WHITE SQUARE WITH LOWER RIGHT QUADRANT;So;0;ON;;;;;N;;;;;
+25F3;WHITE SQUARE WITH UPPER RIGHT QUADRANT;So;0;ON;;;;;N;;;;;
+25F4;WHITE CIRCLE WITH UPPER LEFT QUADRANT;So;0;ON;;;;;N;;;;;
+25F5;WHITE CIRCLE WITH LOWER LEFT QUADRANT;So;0;ON;;;;;N;;;;;
+25F6;WHITE CIRCLE WITH LOWER RIGHT QUADRANT;So;0;ON;;;;;N;;;;;
+25F7;WHITE CIRCLE WITH UPPER RIGHT QUADRANT;So;0;ON;;;;;N;;;;;
+25F8;UPPER LEFT TRIANGLE;Sm;0;ON;;;;;N;;;;;
+25F9;UPPER RIGHT TRIANGLE;Sm;0;ON;;;;;N;;;;;
+25FA;LOWER LEFT TRIANGLE;Sm;0;ON;;;;;N;;;;;
+25FB;WHITE MEDIUM SQUARE;Sm;0;ON;;;;;N;;;;;
+25FC;BLACK MEDIUM SQUARE;Sm;0;ON;;;;;N;;;;;
+25FD;WHITE MEDIUM SMALL SQUARE;Sm;0;ON;;;;;N;;;;;
+25FE;BLACK MEDIUM SMALL SQUARE;Sm;0;ON;;;;;N;;;;;
+25FF;LOWER RIGHT TRIANGLE;Sm;0;ON;;;;;N;;;;;
+2600;BLACK SUN WITH RAYS;So;0;ON;;;;;N;;;;;
+2601;CLOUD;So;0;ON;;;;;N;;;;;
+2602;UMBRELLA;So;0;ON;;;;;N;;;;;
+2603;SNOWMAN;So;0;ON;;;;;N;;;;;
+2604;COMET;So;0;ON;;;;;N;;;;;
+2605;BLACK STAR;So;0;ON;;;;;N;;;;;
+2606;WHITE STAR;So;0;ON;;;;;N;;;;;
+2607;LIGHTNING;So;0;ON;;;;;N;;;;;
+2608;THUNDERSTORM;So;0;ON;;;;;N;;;;;
+2609;SUN;So;0;ON;;;;;N;;;;;
+260A;ASCENDING NODE;So;0;ON;;;;;N;;;;;
+260B;DESCENDING NODE;So;0;ON;;;;;N;;;;;
+260C;CONJUNCTION;So;0;ON;;;;;N;;;;;
+260D;OPPOSITION;So;0;ON;;;;;N;;;;;
+260E;BLACK TELEPHONE;So;0;ON;;;;;N;;;;;
+260F;WHITE TELEPHONE;So;0;ON;;;;;N;;;;;
+2610;BALLOT BOX;So;0;ON;;;;;N;;;;;
+2611;BALLOT BOX WITH CHECK;So;0;ON;;;;;N;;;;;
+2612;BALLOT BOX WITH X;So;0;ON;;;;;N;;;;;
+2613;SALTIRE;So;0;ON;;;;;N;;;;;
+2614;UMBRELLA WITH RAIN DROPS;So;0;ON;;;;;N;;;;;
+2615;HOT BEVERAGE;So;0;ON;;;;;N;;;;;
+2616;WHITE SHOGI PIECE;So;0;ON;;;;;N;;;;;
+2617;BLACK SHOGI PIECE;So;0;ON;;;;;N;;;;;
+2618;SHAMROCK;So;0;ON;;;;;N;;;;;
+2619;REVERSED ROTATED FLORAL HEART BULLET;So;0;ON;;;;;N;;;;;
+261A;BLACK LEFT POINTING INDEX;So;0;ON;;;;;N;;;;;
+261B;BLACK RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;;
+261C;WHITE LEFT POINTING INDEX;So;0;ON;;;;;N;;;;;
+261D;WHITE UP POINTING INDEX;So;0;ON;;;;;N;;;;;
+261E;WHITE RIGHT POINTING INDEX;So;0;ON;;;;;N;;;;;
+261F;WHITE DOWN POINTING INDEX;So;0;ON;;;;;N;;;;;
+2620;SKULL AND CROSSBONES;So;0;ON;;;;;N;;;;;
+2621;CAUTION SIGN;So;0;ON;;;;;N;;;;;
+2622;RADIOACTIVE SIGN;So;0;ON;;;;;N;;;;;
+2623;BIOHAZARD SIGN;So;0;ON;;;;;N;;;;;
+2624;CADUCEUS;So;0;ON;;;;;N;;;;;
+2625;ANKH;So;0;ON;;;;;N;;;;;
+2626;ORTHODOX CROSS;So;0;ON;;;;;N;;;;;
+2627;CHI RHO;So;0;ON;;;;;N;;;;;
+2628;CROSS OF LORRAINE;So;0;ON;;;;;N;;;;;
+2629;CROSS OF JERUSALEM;So;0;ON;;;;;N;;;;;
+262A;STAR AND CRESCENT;So;0;ON;;;;;N;;;;;
+262B;FARSI SYMBOL;So;0;ON;;;;;N;SYMBOL OF IRAN;;;;
+262C;ADI SHAKTI;So;0;ON;;;;;N;;;;;
+262D;HAMMER AND SICKLE;So;0;ON;;;;;N;;;;;
+262E;PEACE SYMBOL;So;0;ON;;;;;N;;;;;
+262F;YIN YANG;So;0;ON;;;;;N;;;;;
+2630;TRIGRAM FOR HEAVEN;So;0;ON;;;;;N;;;;;
+2631;TRIGRAM FOR LAKE;So;0;ON;;;;;N;;;;;
+2632;TRIGRAM FOR FIRE;So;0;ON;;;;;N;;;;;
+2633;TRIGRAM FOR THUNDER;So;0;ON;;;;;N;;;;;
+2634;TRIGRAM FOR WIND;So;0;ON;;;;;N;;;;;
+2635;TRIGRAM FOR WATER;So;0;ON;;;;;N;;;;;
+2636;TRIGRAM FOR MOUNTAIN;So;0;ON;;;;;N;;;;;
+2637;TRIGRAM FOR EARTH;So;0;ON;;;;;N;;;;;
+2638;WHEEL OF DHARMA;So;0;ON;;;;;N;;;;;
+2639;WHITE FROWNING FACE;So;0;ON;;;;;N;;;;;
+263A;WHITE SMILING FACE;So;0;ON;;;;;N;;;;;
+263B;BLACK SMILING FACE;So;0;ON;;;;;N;;;;;
+263C;WHITE SUN WITH RAYS;So;0;ON;;;;;N;;;;;
+263D;FIRST QUARTER MOON;So;0;ON;;;;;N;;;;;
+263E;LAST QUARTER MOON;So;0;ON;;;;;N;;;;;
+263F;MERCURY;So;0;ON;;;;;N;;;;;
+2640;FEMALE SIGN;So;0;ON;;;;;N;;;;;
+2641;EARTH;So;0;ON;;;;;N;;;;;
+2642;MALE SIGN;So;0;ON;;;;;N;;;;;
+2643;JUPITER;So;0;ON;;;;;N;;;;;
+2644;SATURN;So;0;ON;;;;;N;;;;;
+2645;URANUS;So;0;ON;;;;;N;;;;;
+2646;NEPTUNE;So;0;ON;;;;;N;;;;;
+2647;PLUTO;So;0;ON;;;;;N;;;;;
+2648;ARIES;So;0;ON;;;;;N;;;;;
+2649;TAURUS;So;0;ON;;;;;N;;;;;
+264A;GEMINI;So;0;ON;;;;;N;;;;;
+264B;CANCER;So;0;ON;;;;;N;;;;;
+264C;LEO;So;0;ON;;;;;N;;;;;
+264D;VIRGO;So;0;ON;;;;;N;;;;;
+264E;LIBRA;So;0;ON;;;;;N;;;;;
+264F;SCORPIUS;So;0;ON;;;;;N;;;;;
+2650;SAGITTARIUS;So;0;ON;;;;;N;;;;;
+2651;CAPRICORN;So;0;ON;;;;;N;;;;;
+2652;AQUARIUS;So;0;ON;;;;;N;;;;;
+2653;PISCES;So;0;ON;;;;;N;;;;;
+2654;WHITE CHESS KING;So;0;ON;;;;;N;;;;;
+2655;WHITE CHESS QUEEN;So;0;ON;;;;;N;;;;;
+2656;WHITE CHESS ROOK;So;0;ON;;;;;N;;;;;
+2657;WHITE CHESS BISHOP;So;0;ON;;;;;N;;;;;
+2658;WHITE CHESS KNIGHT;So;0;ON;;;;;N;;;;;
+2659;WHITE CHESS PAWN;So;0;ON;;;;;N;;;;;
+265A;BLACK CHESS KING;So;0;ON;;;;;N;;;;;
+265B;BLACK CHESS QUEEN;So;0;ON;;;;;N;;;;;
+265C;BLACK CHESS ROOK;So;0;ON;;;;;N;;;;;
+265D;BLACK CHESS BISHOP;So;0;ON;;;;;N;;;;;
+265E;BLACK CHESS KNIGHT;So;0;ON;;;;;N;;;;;
+265F;BLACK CHESS PAWN;So;0;ON;;;;;N;;;;;
+2660;BLACK SPADE SUIT;So;0;ON;;;;;N;;;;;
+2661;WHITE HEART SUIT;So;0;ON;;;;;N;;;;;
+2662;WHITE DIAMOND SUIT;So;0;ON;;;;;N;;;;;
+2663;BLACK CLUB SUIT;So;0;ON;;;;;N;;;;;
+2664;WHITE SPADE SUIT;So;0;ON;;;;;N;;;;;
+2665;BLACK HEART SUIT;So;0;ON;;;;;N;;;;;
+2666;BLACK DIAMOND SUIT;So;0;ON;;;;;N;;;;;
+2667;WHITE CLUB SUIT;So;0;ON;;;;;N;;;;;
+2668;HOT SPRINGS;So;0;ON;;;;;N;;;;;
+2669;QUARTER NOTE;So;0;ON;;;;;N;;;;;
+266A;EIGHTH NOTE;So;0;ON;;;;;N;;;;;
+266B;BEAMED EIGHTH NOTES;So;0;ON;;;;;N;BARRED EIGHTH NOTES;;;;
+266C;BEAMED SIXTEENTH NOTES;So;0;ON;;;;;N;BARRED SIXTEENTH NOTES;;;;
+266D;MUSIC FLAT SIGN;So;0;ON;;;;;N;FLAT;;;;
+266E;MUSIC NATURAL SIGN;So;0;ON;;;;;N;NATURAL;;;;
+266F;MUSIC SHARP SIGN;Sm;0;ON;;;;;N;SHARP;;;;
+2670;WEST SYRIAC CROSS;So;0;ON;;;;;N;;;;;
+2671;EAST SYRIAC CROSS;So;0;ON;;;;;N;;;;;
+2672;UNIVERSAL RECYCLING SYMBOL;So;0;ON;;;;;N;;;;;
+2673;RECYCLING SYMBOL FOR TYPE-1 PLASTICS;So;0;ON;;;;;N;;pete;;;
+2674;RECYCLING SYMBOL FOR TYPE-2 PLASTICS;So;0;ON;;;;;N;;hdpe;;;
+2675;RECYCLING SYMBOL FOR TYPE-3 PLASTICS;So;0;ON;;;;;N;;pvc;;;
+2676;RECYCLING SYMBOL FOR TYPE-4 PLASTICS;So;0;ON;;;;;N;;ldpe;;;
+2677;RECYCLING SYMBOL FOR TYPE-5 PLASTICS;So;0;ON;;;;;N;;pp;;;
+2678;RECYCLING SYMBOL FOR TYPE-6 PLASTICS;So;0;ON;;;;;N;;ps;;;
+2679;RECYCLING SYMBOL FOR TYPE-7 PLASTICS;So;0;ON;;;;;N;;other;;;
+267A;RECYCLING SYMBOL FOR GENERIC MATERIALS;So;0;ON;;;;;N;;;;;
+267B;BLACK UNIVERSAL RECYCLING SYMBOL;So;0;ON;;;;;N;;;;;
+267C;RECYCLED PAPER SYMBOL;So;0;ON;;;;;N;;;;;
+267D;PARTIALLY-RECYCLED PAPER SYMBOL;So;0;ON;;;;;N;;;;;
+267E;PERMANENT PAPER SIGN;So;0;ON;;;;;N;;;;;
+267F;WHEELCHAIR SYMBOL;So;0;ON;;;;;N;;;;;
+2680;DIE FACE-1;So;0;ON;;;;;N;;;;;
+2681;DIE FACE-2;So;0;ON;;;;;N;;;;;
+2682;DIE FACE-3;So;0;ON;;;;;N;;;;;
+2683;DIE FACE-4;So;0;ON;;;;;N;;;;;
+2684;DIE FACE-5;So;0;ON;;;;;N;;;;;
+2685;DIE FACE-6;So;0;ON;;;;;N;;;;;
+2686;WHITE CIRCLE WITH DOT RIGHT;So;0;ON;;;;;N;;;;;
+2687;WHITE CIRCLE WITH TWO DOTS;So;0;ON;;;;;N;;;;;
+2688;BLACK CIRCLE WITH WHITE DOT RIGHT;So;0;ON;;;;;N;;;;;
+2689;BLACK CIRCLE WITH TWO WHITE DOTS;So;0;ON;;;;;N;;;;;
+268A;MONOGRAM FOR YANG;So;0;ON;;;;;N;;;;;
+268B;MONOGRAM FOR YIN;So;0;ON;;;;;N;;;;;
+268C;DIGRAM FOR GREATER YANG;So;0;ON;;;;;N;;;;;
+268D;DIGRAM FOR LESSER YIN;So;0;ON;;;;;N;;;;;
+268E;DIGRAM FOR LESSER YANG;So;0;ON;;;;;N;;;;;
+268F;DIGRAM FOR GREATER YIN;So;0;ON;;;;;N;;;;;
+2690;WHITE FLAG;So;0;ON;;;;;N;;;;;
+2691;BLACK FLAG;So;0;ON;;;;;N;;;;;
+2692;HAMMER AND PICK;So;0;ON;;;;;N;;;;;
+2693;ANCHOR;So;0;ON;;;;;N;;;;;
+2694;CROSSED SWORDS;So;0;ON;;;;;N;;;;;
+2695;STAFF OF AESCULAPIUS;So;0;ON;;;;;N;;;;;
+2696;SCALES;So;0;ON;;;;;N;;;;;
+2697;ALEMBIC;So;0;ON;;;;;N;;;;;
+2698;FLOWER;So;0;ON;;;;;N;;;;;
+2699;GEAR;So;0;ON;;;;;N;;;;;
+269A;STAFF OF HERMES;So;0;ON;;;;;N;;;;;
+269B;ATOM SYMBOL;So;0;ON;;;;;N;;;;;
+269C;FLEUR-DE-LIS;So;0;ON;;;;;N;;;;;
+269D;OUTLINED WHITE STAR;So;0;ON;;;;;N;;;;;
+26A0;WARNING SIGN;So;0;ON;;;;;N;;;;;
+26A1;HIGH VOLTAGE SIGN;So;0;ON;;;;;N;;;;;
+26A2;DOUBLED FEMALE SIGN;So;0;ON;;;;;N;;;;;
+26A3;DOUBLED MALE SIGN;So;0;ON;;;;;N;;;;;
+26A4;INTERLOCKED FEMALE AND MALE SIGN;So;0;ON;;;;;N;;;;;
+26A5;MALE AND FEMALE SIGN;So;0;ON;;;;;N;;;;;
+26A6;MALE WITH STROKE SIGN;So;0;ON;;;;;N;;;;;
+26A7;MALE WITH STROKE AND MALE AND FEMALE SIGN;So;0;ON;;;;;N;;;;;
+26A8;VERTICAL MALE WITH STROKE SIGN;So;0;ON;;;;;N;;;;;
+26A9;HORIZONTAL MALE WITH STROKE SIGN;So;0;ON;;;;;N;;;;;
+26AA;MEDIUM WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+26AB;MEDIUM BLACK CIRCLE;So;0;ON;;;;;N;;;;;
+26AC;MEDIUM SMALL WHITE CIRCLE;So;0;L;;;;;N;;;;;
+26AD;MARRIAGE SYMBOL;So;0;ON;;;;;N;;;;;
+26AE;DIVORCE SYMBOL;So;0;ON;;;;;N;;;;;
+26AF;UNMARRIED PARTNERSHIP SYMBOL;So;0;ON;;;;;N;;;;;
+26B0;COFFIN;So;0;ON;;;;;N;;;;;
+26B1;FUNERAL URN;So;0;ON;;;;;N;;;;;
+26B2;NEUTER;So;0;ON;;;;;N;;;;;
+26B3;CERES;So;0;ON;;;;;N;;;;;
+26B4;PALLAS;So;0;ON;;;;;N;;;;;
+26B5;JUNO;So;0;ON;;;;;N;;;;;
+26B6;VESTA;So;0;ON;;;;;N;;;;;
+26B7;CHIRON;So;0;ON;;;;;N;;;;;
+26B8;BLACK MOON LILITH;So;0;ON;;;;;N;;;;;
+26B9;SEXTILE;So;0;ON;;;;;N;;;;;
+26BA;SEMISEXTILE;So;0;ON;;;;;N;;;;;
+26BB;QUINCUNX;So;0;ON;;;;;N;;;;;
+26BC;SESQUIQUADRATE;So;0;ON;;;;;N;;;;;
+26C0;WHITE DRAUGHTS MAN;So;0;ON;;;;;N;;;;;
+26C1;WHITE DRAUGHTS KING;So;0;ON;;;;;N;;;;;
+26C2;BLACK DRAUGHTS MAN;So;0;ON;;;;;N;;;;;
+26C3;BLACK DRAUGHTS KING;So;0;ON;;;;;N;;;;;
+2701;UPPER BLADE SCISSORS;So;0;ON;;;;;N;;;;;
+2702;BLACK SCISSORS;So;0;ON;;;;;N;;;;;
+2703;LOWER BLADE SCISSORS;So;0;ON;;;;;N;;;;;
+2704;WHITE SCISSORS;So;0;ON;;;;;N;;;;;
+2706;TELEPHONE LOCATION SIGN;So;0;ON;;;;;N;;;;;
+2707;TAPE DRIVE;So;0;ON;;;;;N;;;;;
+2708;AIRPLANE;So;0;ON;;;;;N;;;;;
+2709;ENVELOPE;So;0;ON;;;;;N;;;;;
+270C;VICTORY HAND;So;0;ON;;;;;N;;;;;
+270D;WRITING HAND;So;0;ON;;;;;N;;;;;
+270E;LOWER RIGHT PENCIL;So;0;ON;;;;;N;;;;;
+270F;PENCIL;So;0;ON;;;;;N;;;;;
+2710;UPPER RIGHT PENCIL;So;0;ON;;;;;N;;;;;
+2711;WHITE NIB;So;0;ON;;;;;N;;;;;
+2712;BLACK NIB;So;0;ON;;;;;N;;;;;
+2713;CHECK MARK;So;0;ON;;;;;N;;;;;
+2714;HEAVY CHECK MARK;So;0;ON;;;;;N;;;;;
+2715;MULTIPLICATION X;So;0;ON;;;;;N;;;;;
+2716;HEAVY MULTIPLICATION X;So;0;ON;;;;;N;;;;;
+2717;BALLOT X;So;0;ON;;;;;N;;;;;
+2718;HEAVY BALLOT X;So;0;ON;;;;;N;;;;;
+2719;OUTLINED GREEK CROSS;So;0;ON;;;;;N;;;;;
+271A;HEAVY GREEK CROSS;So;0;ON;;;;;N;;;;;
+271B;OPEN CENTRE CROSS;So;0;ON;;;;;N;OPEN CENTER CROSS;;;;
+271C;HEAVY OPEN CENTRE CROSS;So;0;ON;;;;;N;HEAVY OPEN CENTER CROSS;;;;
+271D;LATIN CROSS;So;0;ON;;;;;N;;;;;
+271E;SHADOWED WHITE LATIN CROSS;So;0;ON;;;;;N;;;;;
+271F;OUTLINED LATIN CROSS;So;0;ON;;;;;N;;;;;
+2720;MALTESE CROSS;So;0;ON;;;;;N;;;;;
+2721;STAR OF DAVID;So;0;ON;;;;;N;;;;;
+2722;FOUR TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+2723;FOUR BALLOON-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+2724;HEAVY FOUR BALLOON-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+2725;FOUR CLUB-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+2726;BLACK FOUR POINTED STAR;So;0;ON;;;;;N;;;;;
+2727;WHITE FOUR POINTED STAR;So;0;ON;;;;;N;;;;;
+2729;STRESS OUTLINED WHITE STAR;So;0;ON;;;;;N;;;;;
+272A;CIRCLED WHITE STAR;So;0;ON;;;;;N;;;;;
+272B;OPEN CENTRE BLACK STAR;So;0;ON;;;;;N;OPEN CENTER BLACK STAR;;;;
+272C;BLACK CENTRE WHITE STAR;So;0;ON;;;;;N;BLACK CENTER WHITE STAR;;;;
+272D;OUTLINED BLACK STAR;So;0;ON;;;;;N;;;;;
+272E;HEAVY OUTLINED BLACK STAR;So;0;ON;;;;;N;;;;;
+272F;PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+2730;SHADOWED WHITE STAR;So;0;ON;;;;;N;;;;;
+2731;HEAVY ASTERISK;So;0;ON;;;;;N;;;;;
+2732;OPEN CENTRE ASTERISK;So;0;ON;;;;;N;OPEN CENTER ASTERISK;;;;
+2733;EIGHT SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+2734;EIGHT POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+2735;EIGHT POINTED PINWHEEL STAR;So;0;ON;;;;;N;;;;;
+2736;SIX POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+2737;EIGHT POINTED RECTILINEAR BLACK STAR;So;0;ON;;;;;N;;;;;
+2738;HEAVY EIGHT POINTED RECTILINEAR BLACK STAR;So;0;ON;;;;;N;;;;;
+2739;TWELVE POINTED BLACK STAR;So;0;ON;;;;;N;;;;;
+273A;SIXTEEN POINTED ASTERISK;So;0;ON;;;;;N;;;;;
+273B;TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+273C;OPEN CENTRE TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;OPEN CENTER TEARDROP-SPOKED ASTERISK;;;;
+273D;HEAVY TEARDROP-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+273E;SIX PETALLED BLACK AND WHITE FLORETTE;So;0;ON;;;;;N;;;;;
+273F;BLACK FLORETTE;So;0;ON;;;;;N;;;;;
+2740;WHITE FLORETTE;So;0;ON;;;;;N;;;;;
+2741;EIGHT PETALLED OUTLINED BLACK FLORETTE;So;0;ON;;;;;N;;;;;
+2742;CIRCLED OPEN CENTRE EIGHT POINTED STAR;So;0;ON;;;;;N;CIRCLED OPEN CENTER EIGHT POINTED STAR;;;;
+2743;HEAVY TEARDROP-SPOKED PINWHEEL ASTERISK;So;0;ON;;;;;N;;;;;
+2744;SNOWFLAKE;So;0;ON;;;;;N;;;;;
+2745;TIGHT TRIFOLIATE SNOWFLAKE;So;0;ON;;;;;N;;;;;
+2746;HEAVY CHEVRON SNOWFLAKE;So;0;ON;;;;;N;;;;;
+2747;SPARKLE;So;0;ON;;;;;N;;;;;
+2748;HEAVY SPARKLE;So;0;ON;;;;;N;;;;;
+2749;BALLOON-SPOKED ASTERISK;So;0;ON;;;;;N;;;;;
+274A;EIGHT TEARDROP-SPOKED PROPELLER ASTERISK;So;0;ON;;;;;N;;;;;
+274B;HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK;So;0;ON;;;;;N;;;;;
+274D;SHADOWED WHITE CIRCLE;So;0;ON;;;;;N;;;;;
+274F;LOWER RIGHT DROP-SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
+2750;UPPER RIGHT DROP-SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
+2751;LOWER RIGHT SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
+2752;UPPER RIGHT SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
+2756;BLACK DIAMOND MINUS WHITE X;So;0;ON;;;;;N;;;;;
+2758;LIGHT VERTICAL BAR;So;0;ON;;;;;N;;;;;
+2759;MEDIUM VERTICAL BAR;So;0;ON;;;;;N;;;;;
+275A;HEAVY VERTICAL BAR;So;0;ON;;;;;N;;;;;
+275B;HEAVY SINGLE TURNED COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+275C;HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+275D;HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+275E;HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2761;CURVED STEM PARAGRAPH SIGN ORNAMENT;So;0;ON;;;;;N;;;;;
+2762;HEAVY EXCLAMATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2763;HEAVY HEART EXCLAMATION MARK ORNAMENT;So;0;ON;;;;;N;;;;;
+2764;HEAVY BLACK HEART;So;0;ON;;;;;N;;;;;
+2765;ROTATED HEAVY BLACK HEART BULLET;So;0;ON;;;;;N;;;;;
+2766;FLORAL HEART;So;0;ON;;;;;N;;;;;
+2767;ROTATED FLORAL HEART BULLET;So;0;ON;;;;;N;;;;;
+2768;MEDIUM LEFT PARENTHESIS ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+2769;MEDIUM RIGHT PARENTHESIS ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+276A;MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+276B;MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+276C;MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+276D;MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+276E;HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+276F;HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+2770;HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+2771;HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+2772;LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+2773;LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+2774;MEDIUM LEFT CURLY BRACKET ORNAMENT;Ps;0;ON;;;;;Y;;;;;
+2775;MEDIUM RIGHT CURLY BRACKET ORNAMENT;Pe;0;ON;;;;;Y;;;;;
+2776;DINGBAT NEGATIVE CIRCLED DIGIT ONE;No;0;ON;;;1;1;N;INVERSE CIRCLED DIGIT ONE;;;;
+2777;DINGBAT NEGATIVE CIRCLED DIGIT TWO;No;0;ON;;;2;2;N;INVERSE CIRCLED DIGIT TWO;;;;
+2778;DINGBAT NEGATIVE CIRCLED DIGIT THREE;No;0;ON;;;3;3;N;INVERSE CIRCLED DIGIT THREE;;;;
+2779;DINGBAT NEGATIVE CIRCLED DIGIT FOUR;No;0;ON;;;4;4;N;INVERSE CIRCLED DIGIT FOUR;;;;
+277A;DINGBAT NEGATIVE CIRCLED DIGIT FIVE;No;0;ON;;;5;5;N;INVERSE CIRCLED DIGIT FIVE;;;;
+277B;DINGBAT NEGATIVE CIRCLED DIGIT SIX;No;0;ON;;;6;6;N;INVERSE CIRCLED DIGIT SIX;;;;
+277C;DINGBAT NEGATIVE CIRCLED DIGIT SEVEN;No;0;ON;;;7;7;N;INVERSE CIRCLED DIGIT SEVEN;;;;
+277D;DINGBAT NEGATIVE CIRCLED DIGIT EIGHT;No;0;ON;;;8;8;N;INVERSE CIRCLED DIGIT EIGHT;;;;
+277E;DINGBAT NEGATIVE CIRCLED DIGIT NINE;No;0;ON;;;9;9;N;INVERSE CIRCLED DIGIT NINE;;;;
+277F;DINGBAT NEGATIVE CIRCLED NUMBER TEN;No;0;ON;;;;10;N;INVERSE CIRCLED NUMBER TEN;;;;
+2780;DINGBAT CIRCLED SANS-SERIF DIGIT ONE;No;0;ON;;;1;1;N;CIRCLED SANS-SERIF DIGIT ONE;;;;
+2781;DINGBAT CIRCLED SANS-SERIF DIGIT TWO;No;0;ON;;;2;2;N;CIRCLED SANS-SERIF DIGIT TWO;;;;
+2782;DINGBAT CIRCLED SANS-SERIF DIGIT THREE;No;0;ON;;;3;3;N;CIRCLED SANS-SERIF DIGIT THREE;;;;
+2783;DINGBAT CIRCLED SANS-SERIF DIGIT FOUR;No;0;ON;;;4;4;N;CIRCLED SANS-SERIF DIGIT FOUR;;;;
+2784;DINGBAT CIRCLED SANS-SERIF DIGIT FIVE;No;0;ON;;;5;5;N;CIRCLED SANS-SERIF DIGIT FIVE;;;;
+2785;DINGBAT CIRCLED SANS-SERIF DIGIT SIX;No;0;ON;;;6;6;N;CIRCLED SANS-SERIF DIGIT SIX;;;;
+2786;DINGBAT CIRCLED SANS-SERIF DIGIT SEVEN;No;0;ON;;;7;7;N;CIRCLED SANS-SERIF DIGIT SEVEN;;;;
+2787;DINGBAT CIRCLED SANS-SERIF DIGIT EIGHT;No;0;ON;;;8;8;N;CIRCLED SANS-SERIF DIGIT EIGHT;;;;
+2788;DINGBAT CIRCLED SANS-SERIF DIGIT NINE;No;0;ON;;;9;9;N;CIRCLED SANS-SERIF DIGIT NINE;;;;
+2789;DINGBAT CIRCLED SANS-SERIF NUMBER TEN;No;0;ON;;;;10;N;CIRCLED SANS-SERIF NUMBER TEN;;;;
+278A;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ONE;No;0;ON;;;1;1;N;INVERSE CIRCLED SANS-SERIF DIGIT ONE;;;;
+278B;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT TWO;No;0;ON;;;2;2;N;INVERSE CIRCLED SANS-SERIF DIGIT TWO;;;;
+278C;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT THREE;No;0;ON;;;3;3;N;INVERSE CIRCLED SANS-SERIF DIGIT THREE;;;;
+278D;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FOUR;No;0;ON;;;4;4;N;INVERSE CIRCLED SANS-SERIF DIGIT FOUR;;;;
+278E;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FIVE;No;0;ON;;;5;5;N;INVERSE CIRCLED SANS-SERIF DIGIT FIVE;;;;
+278F;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SIX;No;0;ON;;;6;6;N;INVERSE CIRCLED SANS-SERIF DIGIT SIX;;;;
+2790;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SEVEN;No;0;ON;;;7;7;N;INVERSE CIRCLED SANS-SERIF DIGIT SEVEN;;;;
+2791;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT EIGHT;No;0;ON;;;8;8;N;INVERSE CIRCLED SANS-SERIF DIGIT EIGHT;;;;
+2792;DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT NINE;No;0;ON;;;9;9;N;INVERSE CIRCLED SANS-SERIF DIGIT NINE;;;;
+2793;DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN;No;0;ON;;;;10;N;INVERSE CIRCLED SANS-SERIF NUMBER TEN;;;;
+2794;HEAVY WIDE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY WIDE-HEADED RIGHT ARROW;;;;
+2798;HEAVY SOUTH EAST ARROW;So;0;ON;;;;;N;HEAVY LOWER RIGHT ARROW;;;;
+2799;HEAVY RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY RIGHT ARROW;;;;
+279A;HEAVY NORTH EAST ARROW;So;0;ON;;;;;N;HEAVY UPPER RIGHT ARROW;;;;
+279B;DRAFTING POINT RIGHTWARDS ARROW;So;0;ON;;;;;N;DRAFTING POINT RIGHT ARROW;;;;
+279C;HEAVY ROUND-TIPPED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY ROUND-TIPPED RIGHT ARROW;;;;
+279D;TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;TRIANGLE-HEADED RIGHT ARROW;;;;
+279E;HEAVY TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY TRIANGLE-HEADED RIGHT ARROW;;;;
+279F;DASHED TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;DASHED TRIANGLE-HEADED RIGHT ARROW;;;;
+27A0;HEAVY DASHED TRIANGLE-HEADED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY DASHED TRIANGLE-HEADED RIGHT ARROW;;;;
+27A1;BLACK RIGHTWARDS ARROW;So;0;ON;;;;;N;BLACK RIGHT ARROW;;;;
+27A2;THREE-D TOP-LIGHTED RIGHTWARDS ARROWHEAD;So;0;ON;;;;;N;THREE-D TOP-LIGHTED RIGHT ARROWHEAD;;;;
+27A3;THREE-D BOTTOM-LIGHTED RIGHTWARDS ARROWHEAD;So;0;ON;;;;;N;THREE-D BOTTOM-LIGHTED RIGHT ARROWHEAD;;;;
+27A4;BLACK RIGHTWARDS ARROWHEAD;So;0;ON;;;;;N;BLACK RIGHT ARROWHEAD;;;;
+27A5;HEAVY BLACK CURVED DOWNWARDS AND RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY BLACK CURVED DOWN AND RIGHT ARROW;;;;
+27A6;HEAVY BLACK CURVED UPWARDS AND RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY BLACK CURVED UP AND RIGHT ARROW;;;;
+27A7;SQUAT BLACK RIGHTWARDS ARROW;So;0;ON;;;;;N;SQUAT BLACK RIGHT ARROW;;;;
+27A8;HEAVY CONCAVE-POINTED BLACK RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY CONCAVE-POINTED BLACK RIGHT ARROW;;;;
+27A9;RIGHT-SHADED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;RIGHT-SHADED WHITE RIGHT ARROW;;;;
+27AA;LEFT-SHADED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;LEFT-SHADED WHITE RIGHT ARROW;;;;
+27AB;BACK-TILTED SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;BACK-TILTED SHADOWED WHITE RIGHT ARROW;;;;
+27AC;FRONT-TILTED SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;FRONT-TILTED SHADOWED WHITE RIGHT ARROW;;;;
+27AD;HEAVY LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY LOWER RIGHT-SHADOWED WHITE RIGHT ARROW;;;;
+27AE;HEAVY UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY UPPER RIGHT-SHADOWED WHITE RIGHT ARROW;;;;
+27AF;NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHT ARROW;;;;
+27B1;NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHT ARROW;;;;
+27B2;CIRCLED HEAVY WHITE RIGHTWARDS ARROW;So;0;ON;;;;;N;CIRCLED HEAVY WHITE RIGHT ARROW;;;;
+27B3;WHITE-FEATHERED RIGHTWARDS ARROW;So;0;ON;;;;;N;WHITE-FEATHERED RIGHT ARROW;;;;
+27B4;BLACK-FEATHERED SOUTH EAST ARROW;So;0;ON;;;;;N;BLACK-FEATHERED LOWER RIGHT ARROW;;;;
+27B5;BLACK-FEATHERED RIGHTWARDS ARROW;So;0;ON;;;;;N;BLACK-FEATHERED RIGHT ARROW;;;;
+27B6;BLACK-FEATHERED NORTH EAST ARROW;So;0;ON;;;;;N;BLACK-FEATHERED UPPER RIGHT ARROW;;;;
+27B7;HEAVY BLACK-FEATHERED SOUTH EAST ARROW;So;0;ON;;;;;N;HEAVY BLACK-FEATHERED LOWER RIGHT ARROW;;;;
+27B8;HEAVY BLACK-FEATHERED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY BLACK-FEATHERED RIGHT ARROW;;;;
+27B9;HEAVY BLACK-FEATHERED NORTH EAST ARROW;So;0;ON;;;;;N;HEAVY BLACK-FEATHERED UPPER RIGHT ARROW;;;;
+27BA;TEARDROP-BARBED RIGHTWARDS ARROW;So;0;ON;;;;;N;TEARDROP-BARBED RIGHT ARROW;;;;
+27BB;HEAVY TEARDROP-SHANKED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY TEARDROP-SHANKED RIGHT ARROW;;;;
+27BC;WEDGE-TAILED RIGHTWARDS ARROW;So;0;ON;;;;;N;WEDGE-TAILED RIGHT ARROW;;;;
+27BD;HEAVY WEDGE-TAILED RIGHTWARDS ARROW;So;0;ON;;;;;N;HEAVY WEDGE-TAILED RIGHT ARROW;;;;
+27BE;OPEN-OUTLINED RIGHTWARDS ARROW;So;0;ON;;;;;N;OPEN-OUTLINED RIGHT ARROW;;;;
+27C0;THREE DIMENSIONAL ANGLE;Sm;0;ON;;;;;Y;;;;;
+27C1;WHITE TRIANGLE CONTAINING SMALL WHITE TRIANGLE;Sm;0;ON;;;;;N;;;;;
+27C2;PERPENDICULAR;Sm;0;ON;;;;;N;;;;;
+27C3;OPEN SUBSET;Sm;0;ON;;;;;Y;;;;;
+27C4;OPEN SUPERSET;Sm;0;ON;;;;;Y;;;;;
+27C5;LEFT S-SHAPED BAG DELIMITER;Ps;0;ON;;;;;Y;;;;;
+27C6;RIGHT S-SHAPED BAG DELIMITER;Pe;0;ON;;;;;Y;;;;;
+27C7;OR WITH DOT INSIDE;Sm;0;ON;;;;;N;;;;;
+27C8;REVERSE SOLIDUS PRECEDING SUBSET;Sm;0;ON;;;;;Y;;;;;
+27C9;SUPERSET PRECEDING SOLIDUS;Sm;0;ON;;;;;Y;;;;;
+27CA;VERTICAL BAR WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
+27CC;LONG DIVISION;Sm;0;ON;;;;;Y;;;;;
+27D0;WHITE DIAMOND WITH CENTRED DOT;Sm;0;ON;;;;;N;;;;;
+27D1;AND WITH DOT;Sm;0;ON;;;;;N;;;;;
+27D2;ELEMENT OF OPENING UPWARDS;Sm;0;ON;;;;;N;;;;;
+27D3;LOWER RIGHT CORNER WITH DOT;Sm;0;ON;;;;;Y;;;;;
+27D4;UPPER LEFT CORNER WITH DOT;Sm;0;ON;;;;;Y;;;;;
+27D5;LEFT OUTER JOIN;Sm;0;ON;;;;;Y;;;;;
+27D6;RIGHT OUTER JOIN;Sm;0;ON;;;;;Y;;;;;
+27D7;FULL OUTER JOIN;Sm;0;ON;;;;;N;;;;;
+27D8;LARGE UP TACK;Sm;0;ON;;;;;N;;;;;
+27D9;LARGE DOWN TACK;Sm;0;ON;;;;;N;;;;;
+27DA;LEFT AND RIGHT DOUBLE TURNSTILE;Sm;0;ON;;;;;N;;;;;
+27DB;LEFT AND RIGHT TACK;Sm;0;ON;;;;;N;;;;;
+27DC;LEFT MULTIMAP;Sm;0;ON;;;;;Y;;;;;
+27DD;LONG RIGHT TACK;Sm;0;ON;;;;;Y;;;;;
+27DE;LONG LEFT TACK;Sm;0;ON;;;;;Y;;;;;
+27DF;UP TACK WITH CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;;
+27E0;LOZENGE DIVIDED BY HORIZONTAL RULE;Sm;0;ON;;;;;N;;;;;
+27E1;WHITE CONCAVE-SIDED DIAMOND;Sm;0;ON;;;;;N;;;;;
+27E2;WHITE CONCAVE-SIDED DIAMOND WITH LEFTWARDS TICK;Sm;0;ON;;;;;Y;;;;;
+27E3;WHITE CONCAVE-SIDED DIAMOND WITH RIGHTWARDS TICK;Sm;0;ON;;;;;Y;;;;;
+27E4;WHITE SQUARE WITH LEFTWARDS TICK;Sm;0;ON;;;;;Y;;;;;
+27E5;WHITE SQUARE WITH RIGHTWARDS TICK;Sm;0;ON;;;;;Y;;;;;
+27E6;MATHEMATICAL LEFT WHITE SQUARE BRACKET;Ps;0;ON;;;;;Y;;;;;
+27E7;MATHEMATICAL RIGHT WHITE SQUARE BRACKET;Pe;0;ON;;;;;Y;;;;;
+27E8;MATHEMATICAL LEFT ANGLE BRACKET;Ps;0;ON;;;;;Y;;;;;
+27E9;MATHEMATICAL RIGHT ANGLE BRACKET;Pe;0;ON;;;;;Y;;;;;
+27EA;MATHEMATICAL LEFT DOUBLE ANGLE BRACKET;Ps;0;ON;;;;;Y;;;;;
+27EB;MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET;Pe;0;ON;;;;;Y;;;;;
+27EC;MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;;;;;
+27ED;MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;;;;;
+27EE;MATHEMATICAL LEFT FLATTENED PARENTHESIS;Ps;0;ON;;;;;Y;;;;;
+27EF;MATHEMATICAL RIGHT FLATTENED PARENTHESIS;Pe;0;ON;;;;;Y;;;;;
+27F0;UPWARDS QUADRUPLE ARROW;Sm;0;ON;;;;;N;;;;;
+27F1;DOWNWARDS QUADRUPLE ARROW;Sm;0;ON;;;;;N;;;;;
+27F2;ANTICLOCKWISE GAPPED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;;
+27F3;CLOCKWISE GAPPED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;;
+27F4;RIGHT ARROW WITH CIRCLED PLUS;Sm;0;ON;;;;;N;;;;;
+27F5;LONG LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+27F6;LONG RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+27F7;LONG LEFT RIGHT ARROW;Sm;0;ON;;;;;N;;;;;
+27F8;LONG LEFTWARDS DOUBLE ARROW;Sm;0;ON;;;;;N;;;;;
+27F9;LONG RIGHTWARDS DOUBLE ARROW;Sm;0;ON;;;;;N;;;;;
+27FA;LONG LEFT RIGHT DOUBLE ARROW;Sm;0;ON;;;;;N;;;;;
+27FB;LONG LEFTWARDS ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+27FC;LONG RIGHTWARDS ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+27FD;LONG LEFTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+27FE;LONG RIGHTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+27FF;LONG RIGHTWARDS SQUIGGLE ARROW;Sm;0;ON;;;;;N;;;;;
+2800;BRAILLE PATTERN BLANK;So;0;L;;;;;N;;;;;
+2801;BRAILLE PATTERN DOTS-1;So;0;L;;;;;N;;;;;
+2802;BRAILLE PATTERN DOTS-2;So;0;L;;;;;N;;;;;
+2803;BRAILLE PATTERN DOTS-12;So;0;L;;;;;N;;;;;
+2804;BRAILLE PATTERN DOTS-3;So;0;L;;;;;N;;;;;
+2805;BRAILLE PATTERN DOTS-13;So;0;L;;;;;N;;;;;
+2806;BRAILLE PATTERN DOTS-23;So;0;L;;;;;N;;;;;
+2807;BRAILLE PATTERN DOTS-123;So;0;L;;;;;N;;;;;
+2808;BRAILLE PATTERN DOTS-4;So;0;L;;;;;N;;;;;
+2809;BRAILLE PATTERN DOTS-14;So;0;L;;;;;N;;;;;
+280A;BRAILLE PATTERN DOTS-24;So;0;L;;;;;N;;;;;
+280B;BRAILLE PATTERN DOTS-124;So;0;L;;;;;N;;;;;
+280C;BRAILLE PATTERN DOTS-34;So;0;L;;;;;N;;;;;
+280D;BRAILLE PATTERN DOTS-134;So;0;L;;;;;N;;;;;
+280E;BRAILLE PATTERN DOTS-234;So;0;L;;;;;N;;;;;
+280F;BRAILLE PATTERN DOTS-1234;So;0;L;;;;;N;;;;;
+2810;BRAILLE PATTERN DOTS-5;So;0;L;;;;;N;;;;;
+2811;BRAILLE PATTERN DOTS-15;So;0;L;;;;;N;;;;;
+2812;BRAILLE PATTERN DOTS-25;So;0;L;;;;;N;;;;;
+2813;BRAILLE PATTERN DOTS-125;So;0;L;;;;;N;;;;;
+2814;BRAILLE PATTERN DOTS-35;So;0;L;;;;;N;;;;;
+2815;BRAILLE PATTERN DOTS-135;So;0;L;;;;;N;;;;;
+2816;BRAILLE PATTERN DOTS-235;So;0;L;;;;;N;;;;;
+2817;BRAILLE PATTERN DOTS-1235;So;0;L;;;;;N;;;;;
+2818;BRAILLE PATTERN DOTS-45;So;0;L;;;;;N;;;;;
+2819;BRAILLE PATTERN DOTS-145;So;0;L;;;;;N;;;;;
+281A;BRAILLE PATTERN DOTS-245;So;0;L;;;;;N;;;;;
+281B;BRAILLE PATTERN DOTS-1245;So;0;L;;;;;N;;;;;
+281C;BRAILLE PATTERN DOTS-345;So;0;L;;;;;N;;;;;
+281D;BRAILLE PATTERN DOTS-1345;So;0;L;;;;;N;;;;;
+281E;BRAILLE PATTERN DOTS-2345;So;0;L;;;;;N;;;;;
+281F;BRAILLE PATTERN DOTS-12345;So;0;L;;;;;N;;;;;
+2820;BRAILLE PATTERN DOTS-6;So;0;L;;;;;N;;;;;
+2821;BRAILLE PATTERN DOTS-16;So;0;L;;;;;N;;;;;
+2822;BRAILLE PATTERN DOTS-26;So;0;L;;;;;N;;;;;
+2823;BRAILLE PATTERN DOTS-126;So;0;L;;;;;N;;;;;
+2824;BRAILLE PATTERN DOTS-36;So;0;L;;;;;N;;;;;
+2825;BRAILLE PATTERN DOTS-136;So;0;L;;;;;N;;;;;
+2826;BRAILLE PATTERN DOTS-236;So;0;L;;;;;N;;;;;
+2827;BRAILLE PATTERN DOTS-1236;So;0;L;;;;;N;;;;;
+2828;BRAILLE PATTERN DOTS-46;So;0;L;;;;;N;;;;;
+2829;BRAILLE PATTERN DOTS-146;So;0;L;;;;;N;;;;;
+282A;BRAILLE PATTERN DOTS-246;So;0;L;;;;;N;;;;;
+282B;BRAILLE PATTERN DOTS-1246;So;0;L;;;;;N;;;;;
+282C;BRAILLE PATTERN DOTS-346;So;0;L;;;;;N;;;;;
+282D;BRAILLE PATTERN DOTS-1346;So;0;L;;;;;N;;;;;
+282E;BRAILLE PATTERN DOTS-2346;So;0;L;;;;;N;;;;;
+282F;BRAILLE PATTERN DOTS-12346;So;0;L;;;;;N;;;;;
+2830;BRAILLE PATTERN DOTS-56;So;0;L;;;;;N;;;;;
+2831;BRAILLE PATTERN DOTS-156;So;0;L;;;;;N;;;;;
+2832;BRAILLE PATTERN DOTS-256;So;0;L;;;;;N;;;;;
+2833;BRAILLE PATTERN DOTS-1256;So;0;L;;;;;N;;;;;
+2834;BRAILLE PATTERN DOTS-356;So;0;L;;;;;N;;;;;
+2835;BRAILLE PATTERN DOTS-1356;So;0;L;;;;;N;;;;;
+2836;BRAILLE PATTERN DOTS-2356;So;0;L;;;;;N;;;;;
+2837;BRAILLE PATTERN DOTS-12356;So;0;L;;;;;N;;;;;
+2838;BRAILLE PATTERN DOTS-456;So;0;L;;;;;N;;;;;
+2839;BRAILLE PATTERN DOTS-1456;So;0;L;;;;;N;;;;;
+283A;BRAILLE PATTERN DOTS-2456;So;0;L;;;;;N;;;;;
+283B;BRAILLE PATTERN DOTS-12456;So;0;L;;;;;N;;;;;
+283C;BRAILLE PATTERN DOTS-3456;So;0;L;;;;;N;;;;;
+283D;BRAILLE PATTERN DOTS-13456;So;0;L;;;;;N;;;;;
+283E;BRAILLE PATTERN DOTS-23456;So;0;L;;;;;N;;;;;
+283F;BRAILLE PATTERN DOTS-123456;So;0;L;;;;;N;;;;;
+2840;BRAILLE PATTERN DOTS-7;So;0;L;;;;;N;;;;;
+2841;BRAILLE PATTERN DOTS-17;So;0;L;;;;;N;;;;;
+2842;BRAILLE PATTERN DOTS-27;So;0;L;;;;;N;;;;;
+2843;BRAILLE PATTERN DOTS-127;So;0;L;;;;;N;;;;;
+2844;BRAILLE PATTERN DOTS-37;So;0;L;;;;;N;;;;;
+2845;BRAILLE PATTERN DOTS-137;So;0;L;;;;;N;;;;;
+2846;BRAILLE PATTERN DOTS-237;So;0;L;;;;;N;;;;;
+2847;BRAILLE PATTERN DOTS-1237;So;0;L;;;;;N;;;;;
+2848;BRAILLE PATTERN DOTS-47;So;0;L;;;;;N;;;;;
+2849;BRAILLE PATTERN DOTS-147;So;0;L;;;;;N;;;;;
+284A;BRAILLE PATTERN DOTS-247;So;0;L;;;;;N;;;;;
+284B;BRAILLE PATTERN DOTS-1247;So;0;L;;;;;N;;;;;
+284C;BRAILLE PATTERN DOTS-347;So;0;L;;;;;N;;;;;
+284D;BRAILLE PATTERN DOTS-1347;So;0;L;;;;;N;;;;;
+284E;BRAILLE PATTERN DOTS-2347;So;0;L;;;;;N;;;;;
+284F;BRAILLE PATTERN DOTS-12347;So;0;L;;;;;N;;;;;
+2850;BRAILLE PATTERN DOTS-57;So;0;L;;;;;N;;;;;
+2851;BRAILLE PATTERN DOTS-157;So;0;L;;;;;N;;;;;
+2852;BRAILLE PATTERN DOTS-257;So;0;L;;;;;N;;;;;
+2853;BRAILLE PATTERN DOTS-1257;So;0;L;;;;;N;;;;;
+2854;BRAILLE PATTERN DOTS-357;So;0;L;;;;;N;;;;;
+2855;BRAILLE PATTERN DOTS-1357;So;0;L;;;;;N;;;;;
+2856;BRAILLE PATTERN DOTS-2357;So;0;L;;;;;N;;;;;
+2857;BRAILLE PATTERN DOTS-12357;So;0;L;;;;;N;;;;;
+2858;BRAILLE PATTERN DOTS-457;So;0;L;;;;;N;;;;;
+2859;BRAILLE PATTERN DOTS-1457;So;0;L;;;;;N;;;;;
+285A;BRAILLE PATTERN DOTS-2457;So;0;L;;;;;N;;;;;
+285B;BRAILLE PATTERN DOTS-12457;So;0;L;;;;;N;;;;;
+285C;BRAILLE PATTERN DOTS-3457;So;0;L;;;;;N;;;;;
+285D;BRAILLE PATTERN DOTS-13457;So;0;L;;;;;N;;;;;
+285E;BRAILLE PATTERN DOTS-23457;So;0;L;;;;;N;;;;;
+285F;BRAILLE PATTERN DOTS-123457;So;0;L;;;;;N;;;;;
+2860;BRAILLE PATTERN DOTS-67;So;0;L;;;;;N;;;;;
+2861;BRAILLE PATTERN DOTS-167;So;0;L;;;;;N;;;;;
+2862;BRAILLE PATTERN DOTS-267;So;0;L;;;;;N;;;;;
+2863;BRAILLE PATTERN DOTS-1267;So;0;L;;;;;N;;;;;
+2864;BRAILLE PATTERN DOTS-367;So;0;L;;;;;N;;;;;
+2865;BRAILLE PATTERN DOTS-1367;So;0;L;;;;;N;;;;;
+2866;BRAILLE PATTERN DOTS-2367;So;0;L;;;;;N;;;;;
+2867;BRAILLE PATTERN DOTS-12367;So;0;L;;;;;N;;;;;
+2868;BRAILLE PATTERN DOTS-467;So;0;L;;;;;N;;;;;
+2869;BRAILLE PATTERN DOTS-1467;So;0;L;;;;;N;;;;;
+286A;BRAILLE PATTERN DOTS-2467;So;0;L;;;;;N;;;;;
+286B;BRAILLE PATTERN DOTS-12467;So;0;L;;;;;N;;;;;
+286C;BRAILLE PATTERN DOTS-3467;So;0;L;;;;;N;;;;;
+286D;BRAILLE PATTERN DOTS-13467;So;0;L;;;;;N;;;;;
+286E;BRAILLE PATTERN DOTS-23467;So;0;L;;;;;N;;;;;
+286F;BRAILLE PATTERN DOTS-123467;So;0;L;;;;;N;;;;;
+2870;BRAILLE PATTERN DOTS-567;So;0;L;;;;;N;;;;;
+2871;BRAILLE PATTERN DOTS-1567;So;0;L;;;;;N;;;;;
+2872;BRAILLE PATTERN DOTS-2567;So;0;L;;;;;N;;;;;
+2873;BRAILLE PATTERN DOTS-12567;So;0;L;;;;;N;;;;;
+2874;BRAILLE PATTERN DOTS-3567;So;0;L;;;;;N;;;;;
+2875;BRAILLE PATTERN DOTS-13567;So;0;L;;;;;N;;;;;
+2876;BRAILLE PATTERN DOTS-23567;So;0;L;;;;;N;;;;;
+2877;BRAILLE PATTERN DOTS-123567;So;0;L;;;;;N;;;;;
+2878;BRAILLE PATTERN DOTS-4567;So;0;L;;;;;N;;;;;
+2879;BRAILLE PATTERN DOTS-14567;So;0;L;;;;;N;;;;;
+287A;BRAILLE PATTERN DOTS-24567;So;0;L;;;;;N;;;;;
+287B;BRAILLE PATTERN DOTS-124567;So;0;L;;;;;N;;;;;
+287C;BRAILLE PATTERN DOTS-34567;So;0;L;;;;;N;;;;;
+287D;BRAILLE PATTERN DOTS-134567;So;0;L;;;;;N;;;;;
+287E;BRAILLE PATTERN DOTS-234567;So;0;L;;;;;N;;;;;
+287F;BRAILLE PATTERN DOTS-1234567;So;0;L;;;;;N;;;;;
+2880;BRAILLE PATTERN DOTS-8;So;0;L;;;;;N;;;;;
+2881;BRAILLE PATTERN DOTS-18;So;0;L;;;;;N;;;;;
+2882;BRAILLE PATTERN DOTS-28;So;0;L;;;;;N;;;;;
+2883;BRAILLE PATTERN DOTS-128;So;0;L;;;;;N;;;;;
+2884;BRAILLE PATTERN DOTS-38;So;0;L;;;;;N;;;;;
+2885;BRAILLE PATTERN DOTS-138;So;0;L;;;;;N;;;;;
+2886;BRAILLE PATTERN DOTS-238;So;0;L;;;;;N;;;;;
+2887;BRAILLE PATTERN DOTS-1238;So;0;L;;;;;N;;;;;
+2888;BRAILLE PATTERN DOTS-48;So;0;L;;;;;N;;;;;
+2889;BRAILLE PATTERN DOTS-148;So;0;L;;;;;N;;;;;
+288A;BRAILLE PATTERN DOTS-248;So;0;L;;;;;N;;;;;
+288B;BRAILLE PATTERN DOTS-1248;So;0;L;;;;;N;;;;;
+288C;BRAILLE PATTERN DOTS-348;So;0;L;;;;;N;;;;;
+288D;BRAILLE PATTERN DOTS-1348;So;0;L;;;;;N;;;;;
+288E;BRAILLE PATTERN DOTS-2348;So;0;L;;;;;N;;;;;
+288F;BRAILLE PATTERN DOTS-12348;So;0;L;;;;;N;;;;;
+2890;BRAILLE PATTERN DOTS-58;So;0;L;;;;;N;;;;;
+2891;BRAILLE PATTERN DOTS-158;So;0;L;;;;;N;;;;;
+2892;BRAILLE PATTERN DOTS-258;So;0;L;;;;;N;;;;;
+2893;BRAILLE PATTERN DOTS-1258;So;0;L;;;;;N;;;;;
+2894;BRAILLE PATTERN DOTS-358;So;0;L;;;;;N;;;;;
+2895;BRAILLE PATTERN DOTS-1358;So;0;L;;;;;N;;;;;
+2896;BRAILLE PATTERN DOTS-2358;So;0;L;;;;;N;;;;;
+2897;BRAILLE PATTERN DOTS-12358;So;0;L;;;;;N;;;;;
+2898;BRAILLE PATTERN DOTS-458;So;0;L;;;;;N;;;;;
+2899;BRAILLE PATTERN DOTS-1458;So;0;L;;;;;N;;;;;
+289A;BRAILLE PATTERN DOTS-2458;So;0;L;;;;;N;;;;;
+289B;BRAILLE PATTERN DOTS-12458;So;0;L;;;;;N;;;;;
+289C;BRAILLE PATTERN DOTS-3458;So;0;L;;;;;N;;;;;
+289D;BRAILLE PATTERN DOTS-13458;So;0;L;;;;;N;;;;;
+289E;BRAILLE PATTERN DOTS-23458;So;0;L;;;;;N;;;;;
+289F;BRAILLE PATTERN DOTS-123458;So;0;L;;;;;N;;;;;
+28A0;BRAILLE PATTERN DOTS-68;So;0;L;;;;;N;;;;;
+28A1;BRAILLE PATTERN DOTS-168;So;0;L;;;;;N;;;;;
+28A2;BRAILLE PATTERN DOTS-268;So;0;L;;;;;N;;;;;
+28A3;BRAILLE PATTERN DOTS-1268;So;0;L;;;;;N;;;;;
+28A4;BRAILLE PATTERN DOTS-368;So;0;L;;;;;N;;;;;
+28A5;BRAILLE PATTERN DOTS-1368;So;0;L;;;;;N;;;;;
+28A6;BRAILLE PATTERN DOTS-2368;So;0;L;;;;;N;;;;;
+28A7;BRAILLE PATTERN DOTS-12368;So;0;L;;;;;N;;;;;
+28A8;BRAILLE PATTERN DOTS-468;So;0;L;;;;;N;;;;;
+28A9;BRAILLE PATTERN DOTS-1468;So;0;L;;;;;N;;;;;
+28AA;BRAILLE PATTERN DOTS-2468;So;0;L;;;;;N;;;;;
+28AB;BRAILLE PATTERN DOTS-12468;So;0;L;;;;;N;;;;;
+28AC;BRAILLE PATTERN DOTS-3468;So;0;L;;;;;N;;;;;
+28AD;BRAILLE PATTERN DOTS-13468;So;0;L;;;;;N;;;;;
+28AE;BRAILLE PATTERN DOTS-23468;So;0;L;;;;;N;;;;;
+28AF;BRAILLE PATTERN DOTS-123468;So;0;L;;;;;N;;;;;
+28B0;BRAILLE PATTERN DOTS-568;So;0;L;;;;;N;;;;;
+28B1;BRAILLE PATTERN DOTS-1568;So;0;L;;;;;N;;;;;
+28B2;BRAILLE PATTERN DOTS-2568;So;0;L;;;;;N;;;;;
+28B3;BRAILLE PATTERN DOTS-12568;So;0;L;;;;;N;;;;;
+28B4;BRAILLE PATTERN DOTS-3568;So;0;L;;;;;N;;;;;
+28B5;BRAILLE PATTERN DOTS-13568;So;0;L;;;;;N;;;;;
+28B6;BRAILLE PATTERN DOTS-23568;So;0;L;;;;;N;;;;;
+28B7;BRAILLE PATTERN DOTS-123568;So;0;L;;;;;N;;;;;
+28B8;BRAILLE PATTERN DOTS-4568;So;0;L;;;;;N;;;;;
+28B9;BRAILLE PATTERN DOTS-14568;So;0;L;;;;;N;;;;;
+28BA;BRAILLE PATTERN DOTS-24568;So;0;L;;;;;N;;;;;
+28BB;BRAILLE PATTERN DOTS-124568;So;0;L;;;;;N;;;;;
+28BC;BRAILLE PATTERN DOTS-34568;So;0;L;;;;;N;;;;;
+28BD;BRAILLE PATTERN DOTS-134568;So;0;L;;;;;N;;;;;
+28BE;BRAILLE PATTERN DOTS-234568;So;0;L;;;;;N;;;;;
+28BF;BRAILLE PATTERN DOTS-1234568;So;0;L;;;;;N;;;;;
+28C0;BRAILLE PATTERN DOTS-78;So;0;L;;;;;N;;;;;
+28C1;BRAILLE PATTERN DOTS-178;So;0;L;;;;;N;;;;;
+28C2;BRAILLE PATTERN DOTS-278;So;0;L;;;;;N;;;;;
+28C3;BRAILLE PATTERN DOTS-1278;So;0;L;;;;;N;;;;;
+28C4;BRAILLE PATTERN DOTS-378;So;0;L;;;;;N;;;;;
+28C5;BRAILLE PATTERN DOTS-1378;So;0;L;;;;;N;;;;;
+28C6;BRAILLE PATTERN DOTS-2378;So;0;L;;;;;N;;;;;
+28C7;BRAILLE PATTERN DOTS-12378;So;0;L;;;;;N;;;;;
+28C8;BRAILLE PATTERN DOTS-478;So;0;L;;;;;N;;;;;
+28C9;BRAILLE PATTERN DOTS-1478;So;0;L;;;;;N;;;;;
+28CA;BRAILLE PATTERN DOTS-2478;So;0;L;;;;;N;;;;;
+28CB;BRAILLE PATTERN DOTS-12478;So;0;L;;;;;N;;;;;
+28CC;BRAILLE PATTERN DOTS-3478;So;0;L;;;;;N;;;;;
+28CD;BRAILLE PATTERN DOTS-13478;So;0;L;;;;;N;;;;;
+28CE;BRAILLE PATTERN DOTS-23478;So;0;L;;;;;N;;;;;
+28CF;BRAILLE PATTERN DOTS-123478;So;0;L;;;;;N;;;;;
+28D0;BRAILLE PATTERN DOTS-578;So;0;L;;;;;N;;;;;
+28D1;BRAILLE PATTERN DOTS-1578;So;0;L;;;;;N;;;;;
+28D2;BRAILLE PATTERN DOTS-2578;So;0;L;;;;;N;;;;;
+28D3;BRAILLE PATTERN DOTS-12578;So;0;L;;;;;N;;;;;
+28D4;BRAILLE PATTERN DOTS-3578;So;0;L;;;;;N;;;;;
+28D5;BRAILLE PATTERN DOTS-13578;So;0;L;;;;;N;;;;;
+28D6;BRAILLE PATTERN DOTS-23578;So;0;L;;;;;N;;;;;
+28D7;BRAILLE PATTERN DOTS-123578;So;0;L;;;;;N;;;;;
+28D8;BRAILLE PATTERN DOTS-4578;So;0;L;;;;;N;;;;;
+28D9;BRAILLE PATTERN DOTS-14578;So;0;L;;;;;N;;;;;
+28DA;BRAILLE PATTERN DOTS-24578;So;0;L;;;;;N;;;;;
+28DB;BRAILLE PATTERN DOTS-124578;So;0;L;;;;;N;;;;;
+28DC;BRAILLE PATTERN DOTS-34578;So;0;L;;;;;N;;;;;
+28DD;BRAILLE PATTERN DOTS-134578;So;0;L;;;;;N;;;;;
+28DE;BRAILLE PATTERN DOTS-234578;So;0;L;;;;;N;;;;;
+28DF;BRAILLE PATTERN DOTS-1234578;So;0;L;;;;;N;;;;;
+28E0;BRAILLE PATTERN DOTS-678;So;0;L;;;;;N;;;;;
+28E1;BRAILLE PATTERN DOTS-1678;So;0;L;;;;;N;;;;;
+28E2;BRAILLE PATTERN DOTS-2678;So;0;L;;;;;N;;;;;
+28E3;BRAILLE PATTERN DOTS-12678;So;0;L;;;;;N;;;;;
+28E4;BRAILLE PATTERN DOTS-3678;So;0;L;;;;;N;;;;;
+28E5;BRAILLE PATTERN DOTS-13678;So;0;L;;;;;N;;;;;
+28E6;BRAILLE PATTERN DOTS-23678;So;0;L;;;;;N;;;;;
+28E7;BRAILLE PATTERN DOTS-123678;So;0;L;;;;;N;;;;;
+28E8;BRAILLE PATTERN DOTS-4678;So;0;L;;;;;N;;;;;
+28E9;BRAILLE PATTERN DOTS-14678;So;0;L;;;;;N;;;;;
+28EA;BRAILLE PATTERN DOTS-24678;So;0;L;;;;;N;;;;;
+28EB;BRAILLE PATTERN DOTS-124678;So;0;L;;;;;N;;;;;
+28EC;BRAILLE PATTERN DOTS-34678;So;0;L;;;;;N;;;;;
+28ED;BRAILLE PATTERN DOTS-134678;So;0;L;;;;;N;;;;;
+28EE;BRAILLE PATTERN DOTS-234678;So;0;L;;;;;N;;;;;
+28EF;BRAILLE PATTERN DOTS-1234678;So;0;L;;;;;N;;;;;
+28F0;BRAILLE PATTERN DOTS-5678;So;0;L;;;;;N;;;;;
+28F1;BRAILLE PATTERN DOTS-15678;So;0;L;;;;;N;;;;;
+28F2;BRAILLE PATTERN DOTS-25678;So;0;L;;;;;N;;;;;
+28F3;BRAILLE PATTERN DOTS-125678;So;0;L;;;;;N;;;;;
+28F4;BRAILLE PATTERN DOTS-35678;So;0;L;;;;;N;;;;;
+28F5;BRAILLE PATTERN DOTS-135678;So;0;L;;;;;N;;;;;
+28F6;BRAILLE PATTERN DOTS-235678;So;0;L;;;;;N;;;;;
+28F7;BRAILLE PATTERN DOTS-1235678;So;0;L;;;;;N;;;;;
+28F8;BRAILLE PATTERN DOTS-45678;So;0;L;;;;;N;;;;;
+28F9;BRAILLE PATTERN DOTS-145678;So;0;L;;;;;N;;;;;
+28FA;BRAILLE PATTERN DOTS-245678;So;0;L;;;;;N;;;;;
+28FB;BRAILLE PATTERN DOTS-1245678;So;0;L;;;;;N;;;;;
+28FC;BRAILLE PATTERN DOTS-345678;So;0;L;;;;;N;;;;;
+28FD;BRAILLE PATTERN DOTS-1345678;So;0;L;;;;;N;;;;;
+28FE;BRAILLE PATTERN DOTS-2345678;So;0;L;;;;;N;;;;;
+28FF;BRAILLE PATTERN DOTS-12345678;So;0;L;;;;;N;;;;;
+2900;RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2901;RIGHTWARDS TWO-HEADED ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2902;LEFTWARDS DOUBLE ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2903;RIGHTWARDS DOUBLE ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2904;LEFT RIGHT DOUBLE ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2905;RIGHTWARDS TWO-HEADED ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+2906;LEFTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+2907;RIGHTWARDS DOUBLE ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+2908;DOWNWARDS ARROW WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
+2909;UPWARDS ARROW WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
+290A;UPWARDS TRIPLE ARROW;Sm;0;ON;;;;;N;;;;;
+290B;DOWNWARDS TRIPLE ARROW;Sm;0;ON;;;;;N;;;;;
+290C;LEFTWARDS DOUBLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+290D;RIGHTWARDS DOUBLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+290E;LEFTWARDS TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+290F;RIGHTWARDS TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+2910;RIGHTWARDS TWO-HEADED TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+2911;RIGHTWARDS ARROW WITH DOTTED STEM;Sm;0;ON;;;;;N;;;;;
+2912;UPWARDS ARROW TO BAR;Sm;0;ON;;;;;N;;;;;
+2913;DOWNWARDS ARROW TO BAR;Sm;0;ON;;;;;N;;;;;
+2914;RIGHTWARDS ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2915;RIGHTWARDS ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2916;RIGHTWARDS TWO-HEADED ARROW WITH TAIL;Sm;0;ON;;;;;N;;;;;
+2917;RIGHTWARDS TWO-HEADED ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2918;RIGHTWARDS TWO-HEADED ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2919;LEFTWARDS ARROW-TAIL;Sm;0;ON;;;;;N;;;;;
+291A;RIGHTWARDS ARROW-TAIL;Sm;0;ON;;;;;N;;;;;
+291B;LEFTWARDS DOUBLE ARROW-TAIL;Sm;0;ON;;;;;N;;;;;
+291C;RIGHTWARDS DOUBLE ARROW-TAIL;Sm;0;ON;;;;;N;;;;;
+291D;LEFTWARDS ARROW TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
+291E;RIGHTWARDS ARROW TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
+291F;LEFTWARDS ARROW FROM BAR TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
+2920;RIGHTWARDS ARROW FROM BAR TO BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
+2921;NORTH WEST AND SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2922;NORTH EAST AND SOUTH WEST ARROW;Sm;0;ON;;;;;N;;;;;
+2923;NORTH WEST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;;
+2924;NORTH EAST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;;
+2925;SOUTH EAST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;;
+2926;SOUTH WEST ARROW WITH HOOK;Sm;0;ON;;;;;N;;;;;
+2927;NORTH WEST ARROW AND NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2928;NORTH EAST ARROW AND SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2929;SOUTH EAST ARROW AND SOUTH WEST ARROW;Sm;0;ON;;;;;N;;;;;
+292A;SOUTH WEST ARROW AND NORTH WEST ARROW;Sm;0;ON;;;;;N;;;;;
+292B;RISING DIAGONAL CROSSING FALLING DIAGONAL;Sm;0;ON;;;;;N;;;;;
+292C;FALLING DIAGONAL CROSSING RISING DIAGONAL;Sm;0;ON;;;;;N;;;;;
+292D;SOUTH EAST ARROW CROSSING NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+292E;NORTH EAST ARROW CROSSING SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+292F;FALLING DIAGONAL CROSSING NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2930;RISING DIAGONAL CROSSING SOUTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2931;NORTH EAST ARROW CROSSING NORTH WEST ARROW;Sm;0;ON;;;;;N;;;;;
+2932;NORTH WEST ARROW CROSSING NORTH EAST ARROW;Sm;0;ON;;;;;N;;;;;
+2933;WAVE ARROW POINTING DIRECTLY RIGHT;Sm;0;ON;;;;;N;;;;;
+2934;ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS;Sm;0;ON;;;;;N;;;;;
+2935;ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS;Sm;0;ON;;;;;N;;;;;
+2936;ARROW POINTING DOWNWARDS THEN CURVING LEFTWARDS;Sm;0;ON;;;;;N;;;;;
+2937;ARROW POINTING DOWNWARDS THEN CURVING RIGHTWARDS;Sm;0;ON;;;;;N;;;;;
+2938;RIGHT-SIDE ARC CLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+2939;LEFT-SIDE ARC ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+293A;TOP ARC ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+293B;BOTTOM ARC ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+293C;TOP ARC CLOCKWISE ARROW WITH MINUS;Sm;0;ON;;;;;N;;;;;
+293D;TOP ARC ANTICLOCKWISE ARROW WITH PLUS;Sm;0;ON;;;;;N;;;;;
+293E;LOWER RIGHT SEMICIRCULAR CLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+293F;LOWER LEFT SEMICIRCULAR ANTICLOCKWISE ARROW;Sm;0;ON;;;;;N;;;;;
+2940;ANTICLOCKWISE CLOSED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;;
+2941;CLOCKWISE CLOSED CIRCLE ARROW;Sm;0;ON;;;;;N;;;;;
+2942;RIGHTWARDS ARROW ABOVE SHORT LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2943;LEFTWARDS ARROW ABOVE SHORT RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2944;SHORT RIGHTWARDS ARROW ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2945;RIGHTWARDS ARROW WITH PLUS BELOW;Sm;0;ON;;;;;N;;;;;
+2946;LEFTWARDS ARROW WITH PLUS BELOW;Sm;0;ON;;;;;N;;;;;
+2947;RIGHTWARDS ARROW THROUGH X;Sm;0;ON;;;;;N;;;;;
+2948;LEFT RIGHT ARROW THROUGH SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
+2949;UPWARDS TWO-HEADED ARROW FROM SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
+294A;LEFT BARB UP RIGHT BARB DOWN HARPOON;Sm;0;ON;;;;;N;;;;;
+294B;LEFT BARB DOWN RIGHT BARB UP HARPOON;Sm;0;ON;;;;;N;;;;;
+294C;UP BARB RIGHT DOWN BARB LEFT HARPOON;Sm;0;ON;;;;;N;;;;;
+294D;UP BARB LEFT DOWN BARB RIGHT HARPOON;Sm;0;ON;;;;;N;;;;;
+294E;LEFT BARB UP RIGHT BARB UP HARPOON;Sm;0;ON;;;;;N;;;;;
+294F;UP BARB RIGHT DOWN BARB RIGHT HARPOON;Sm;0;ON;;;;;N;;;;;
+2950;LEFT BARB DOWN RIGHT BARB DOWN HARPOON;Sm;0;ON;;;;;N;;;;;
+2951;UP BARB LEFT DOWN BARB LEFT HARPOON;Sm;0;ON;;;;;N;;;;;
+2952;LEFTWARDS HARPOON WITH BARB UP TO BAR;Sm;0;ON;;;;;N;;;;;
+2953;RIGHTWARDS HARPOON WITH BARB UP TO BAR;Sm;0;ON;;;;;N;;;;;
+2954;UPWARDS HARPOON WITH BARB RIGHT TO BAR;Sm;0;ON;;;;;N;;;;;
+2955;DOWNWARDS HARPOON WITH BARB RIGHT TO BAR;Sm;0;ON;;;;;N;;;;;
+2956;LEFTWARDS HARPOON WITH BARB DOWN TO BAR;Sm;0;ON;;;;;N;;;;;
+2957;RIGHTWARDS HARPOON WITH BARB DOWN TO BAR;Sm;0;ON;;;;;N;;;;;
+2958;UPWARDS HARPOON WITH BARB LEFT TO BAR;Sm;0;ON;;;;;N;;;;;
+2959;DOWNWARDS HARPOON WITH BARB LEFT TO BAR;Sm;0;ON;;;;;N;;;;;
+295A;LEFTWARDS HARPOON WITH BARB UP FROM BAR;Sm;0;ON;;;;;N;;;;;
+295B;RIGHTWARDS HARPOON WITH BARB UP FROM BAR;Sm;0;ON;;;;;N;;;;;
+295C;UPWARDS HARPOON WITH BARB RIGHT FROM BAR;Sm;0;ON;;;;;N;;;;;
+295D;DOWNWARDS HARPOON WITH BARB RIGHT FROM BAR;Sm;0;ON;;;;;N;;;;;
+295E;LEFTWARDS HARPOON WITH BARB DOWN FROM BAR;Sm;0;ON;;;;;N;;;;;
+295F;RIGHTWARDS HARPOON WITH BARB DOWN FROM BAR;Sm;0;ON;;;;;N;;;;;
+2960;UPWARDS HARPOON WITH BARB LEFT FROM BAR;Sm;0;ON;;;;;N;;;;;
+2961;DOWNWARDS HARPOON WITH BARB LEFT FROM BAR;Sm;0;ON;;;;;N;;;;;
+2962;LEFTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;;
+2963;UPWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;;
+2964;RIGHTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;;
+2965;DOWNWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;;
+2966;LEFTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB UP;Sm;0;ON;;;;;N;;;;;
+2967;LEFTWARDS HARPOON WITH BARB DOWN ABOVE RIGHTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;;
+2968;RIGHTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB UP;Sm;0;ON;;;;;N;;;;;
+2969;RIGHTWARDS HARPOON WITH BARB DOWN ABOVE LEFTWARDS HARPOON WITH BARB DOWN;Sm;0;ON;;;;;N;;;;;
+296A;LEFTWARDS HARPOON WITH BARB UP ABOVE LONG DASH;Sm;0;ON;;;;;N;;;;;
+296B;LEFTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH;Sm;0;ON;;;;;N;;;;;
+296C;RIGHTWARDS HARPOON WITH BARB UP ABOVE LONG DASH;Sm;0;ON;;;;;N;;;;;
+296D;RIGHTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH;Sm;0;ON;;;;;N;;;;;
+296E;UPWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;;
+296F;DOWNWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT;Sm;0;ON;;;;;N;;;;;
+2970;RIGHT DOUBLE ARROW WITH ROUNDED HEAD;Sm;0;ON;;;;;N;;;;;
+2971;EQUALS SIGN ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2972;TILDE OPERATOR ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2973;LEFTWARDS ARROW ABOVE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;;
+2974;RIGHTWARDS ARROW ABOVE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;;
+2975;RIGHTWARDS ARROW ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2976;LESS-THAN ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2977;LEFTWARDS ARROW THROUGH LESS-THAN;Sm;0;ON;;;;;N;;;;;
+2978;GREATER-THAN ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2979;SUBSET ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+297A;LEFTWARDS ARROW THROUGH SUBSET;Sm;0;ON;;;;;N;;;;;
+297B;SUPERSET ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+297C;LEFT FISH TAIL;Sm;0;ON;;;;;N;;;;;
+297D;RIGHT FISH TAIL;Sm;0;ON;;;;;N;;;;;
+297E;UP FISH TAIL;Sm;0;ON;;;;;N;;;;;
+297F;DOWN FISH TAIL;Sm;0;ON;;;;;N;;;;;
+2980;TRIPLE VERTICAL BAR DELIMITER;Sm;0;ON;;;;;N;;;;;
+2981;Z NOTATION SPOT;Sm;0;ON;;;;;N;;;;;
+2982;Z NOTATION TYPE COLON;Sm;0;ON;;;;;N;;;;;
+2983;LEFT WHITE CURLY BRACKET;Ps;0;ON;;;;;Y;;;;;
+2984;RIGHT WHITE CURLY BRACKET;Pe;0;ON;;;;;Y;;;;;
+2985;LEFT WHITE PARENTHESIS;Ps;0;ON;;;;;Y;;;;;
+2986;RIGHT WHITE PARENTHESIS;Pe;0;ON;;;;;Y;;;;;
+2987;Z NOTATION LEFT IMAGE BRACKET;Ps;0;ON;;;;;Y;;;;;
+2988;Z NOTATION RIGHT IMAGE BRACKET;Pe;0;ON;;;;;Y;;;;;
+2989;Z NOTATION LEFT BINDING BRACKET;Ps;0;ON;;;;;Y;;;;;
+298A;Z NOTATION RIGHT BINDING BRACKET;Pe;0;ON;;;;;Y;;;;;
+298B;LEFT SQUARE BRACKET WITH UNDERBAR;Ps;0;ON;;;;;Y;;;;;
+298C;RIGHT SQUARE BRACKET WITH UNDERBAR;Pe;0;ON;;;;;Y;;;;;
+298D;LEFT SQUARE BRACKET WITH TICK IN TOP CORNER;Ps;0;ON;;;;;Y;;;;;
+298E;RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER;Pe;0;ON;;;;;Y;;;;;
+298F;LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER;Ps;0;ON;;;;;Y;;;;;
+2990;RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER;Pe;0;ON;;;;;Y;;;;;
+2991;LEFT ANGLE BRACKET WITH DOT;Ps;0;ON;;;;;Y;;;;;
+2992;RIGHT ANGLE BRACKET WITH DOT;Pe;0;ON;;;;;Y;;;;;
+2993;LEFT ARC LESS-THAN BRACKET;Ps;0;ON;;;;;Y;;;;;
+2994;RIGHT ARC GREATER-THAN BRACKET;Pe;0;ON;;;;;Y;;;;;
+2995;DOUBLE LEFT ARC GREATER-THAN BRACKET;Ps;0;ON;;;;;Y;;;;;
+2996;DOUBLE RIGHT ARC LESS-THAN BRACKET;Pe;0;ON;;;;;Y;;;;;
+2997;LEFT BLACK TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;;;;;
+2998;RIGHT BLACK TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;;;;;
+2999;DOTTED FENCE;Sm;0;ON;;;;;N;;;;;
+299A;VERTICAL ZIGZAG LINE;Sm;0;ON;;;;;N;;;;;
+299B;MEASURED ANGLE OPENING LEFT;Sm;0;ON;;;;;Y;;;;;
+299C;RIGHT ANGLE VARIANT WITH SQUARE;Sm;0;ON;;;;;Y;;;;;
+299D;MEASURED RIGHT ANGLE WITH DOT;Sm;0;ON;;;;;Y;;;;;
+299E;ANGLE WITH S INSIDE;Sm;0;ON;;;;;Y;;;;;
+299F;ACUTE ANGLE;Sm;0;ON;;;;;Y;;;;;
+29A0;SPHERICAL ANGLE OPENING LEFT;Sm;0;ON;;;;;Y;;;;;
+29A1;SPHERICAL ANGLE OPENING UP;Sm;0;ON;;;;;Y;;;;;
+29A2;TURNED ANGLE;Sm;0;ON;;;;;Y;;;;;
+29A3;REVERSED ANGLE;Sm;0;ON;;;;;Y;;;;;
+29A4;ANGLE WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
+29A5;REVERSED ANGLE WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
+29A6;OBLIQUE ANGLE OPENING UP;Sm;0;ON;;;;;Y;;;;;
+29A7;OBLIQUE ANGLE OPENING DOWN;Sm;0;ON;;;;;Y;;;;;
+29A8;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND RIGHT;Sm;0;ON;;;;;Y;;;;;
+29A9;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND LEFT;Sm;0;ON;;;;;Y;;;;;
+29AA;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND RIGHT;Sm;0;ON;;;;;Y;;;;;
+29AB;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND LEFT;Sm;0;ON;;;;;Y;;;;;
+29AC;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND UP;Sm;0;ON;;;;;Y;;;;;
+29AD;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND UP;Sm;0;ON;;;;;Y;;;;;
+29AE;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND DOWN;Sm;0;ON;;;;;Y;;;;;
+29AF;MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND DOWN;Sm;0;ON;;;;;Y;;;;;
+29B0;REVERSED EMPTY SET;Sm;0;ON;;;;;N;;;;;
+29B1;EMPTY SET WITH OVERBAR;Sm;0;ON;;;;;N;;;;;
+29B2;EMPTY SET WITH SMALL CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;;
+29B3;EMPTY SET WITH RIGHT ARROW ABOVE;Sm;0;ON;;;;;N;;;;;
+29B4;EMPTY SET WITH LEFT ARROW ABOVE;Sm;0;ON;;;;;N;;;;;
+29B5;CIRCLE WITH HORIZONTAL BAR;Sm;0;ON;;;;;N;;;;;
+29B6;CIRCLED VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
+29B7;CIRCLED PARALLEL;Sm;0;ON;;;;;N;;;;;
+29B8;CIRCLED REVERSE SOLIDUS;Sm;0;ON;;;;;Y;;;;;
+29B9;CIRCLED PERPENDICULAR;Sm;0;ON;;;;;N;;;;;
+29BA;CIRCLE DIVIDED BY HORIZONTAL BAR AND TOP HALF DIVIDED BY VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
+29BB;CIRCLE WITH SUPERIMPOSED X;Sm;0;ON;;;;;N;;;;;
+29BC;CIRCLED ANTICLOCKWISE-ROTATED DIVISION SIGN;Sm;0;ON;;;;;N;;;;;
+29BD;UP ARROW THROUGH CIRCLE;Sm;0;ON;;;;;N;;;;;
+29BE;CIRCLED WHITE BULLET;Sm;0;ON;;;;;N;;;;;
+29BF;CIRCLED BULLET;Sm;0;ON;;;;;N;;;;;
+29C0;CIRCLED LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+29C1;CIRCLED GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+29C2;CIRCLE WITH SMALL CIRCLE TO THE RIGHT;Sm;0;ON;;;;;Y;;;;;
+29C3;CIRCLE WITH TWO HORIZONTAL STROKES TO THE RIGHT;Sm;0;ON;;;;;Y;;;;;
+29C4;SQUARED RISING DIAGONAL SLASH;Sm;0;ON;;;;;Y;;;;;
+29C5;SQUARED FALLING DIAGONAL SLASH;Sm;0;ON;;;;;Y;;;;;
+29C6;SQUARED ASTERISK;Sm;0;ON;;;;;N;;;;;
+29C7;SQUARED SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
+29C8;SQUARED SQUARE;Sm;0;ON;;;;;N;;;;;
+29C9;TWO JOINED SQUARES;Sm;0;ON;;;;;Y;;;;;
+29CA;TRIANGLE WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
+29CB;TRIANGLE WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
+29CC;S IN TRIANGLE;Sm;0;ON;;;;;N;;;;;
+29CD;TRIANGLE WITH SERIFS AT BOTTOM;Sm;0;ON;;;;;N;;;;;
+29CE;RIGHT TRIANGLE ABOVE LEFT TRIANGLE;Sm;0;ON;;;;;Y;;;;;
+29CF;LEFT TRIANGLE BESIDE VERTICAL BAR;Sm;0;ON;;;;;Y;;;;;
+29D0;VERTICAL BAR BESIDE RIGHT TRIANGLE;Sm;0;ON;;;;;Y;;;;;
+29D1;BOWTIE WITH LEFT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29D2;BOWTIE WITH RIGHT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29D3;BLACK BOWTIE;Sm;0;ON;;;;;N;;;;;
+29D4;TIMES WITH LEFT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29D5;TIMES WITH RIGHT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29D6;WHITE HOURGLASS;Sm;0;ON;;;;;N;;;;;
+29D7;BLACK HOURGLASS;Sm;0;ON;;;;;N;;;;;
+29D8;LEFT WIGGLY FENCE;Ps;0;ON;;;;;Y;;;;;
+29D9;RIGHT WIGGLY FENCE;Pe;0;ON;;;;;Y;;;;;
+29DA;LEFT DOUBLE WIGGLY FENCE;Ps;0;ON;;;;;Y;;;;;
+29DB;RIGHT DOUBLE WIGGLY FENCE;Pe;0;ON;;;;;Y;;;;;
+29DC;INCOMPLETE INFINITY;Sm;0;ON;;;;;Y;;;;;
+29DD;TIE OVER INFINITY;Sm;0;ON;;;;;N;;;;;
+29DE;INFINITY NEGATED WITH VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
+29DF;DOUBLE-ENDED MULTIMAP;Sm;0;ON;;;;;N;;;;;
+29E0;SQUARE WITH CONTOURED OUTLINE;Sm;0;ON;;;;;N;;;;;
+29E1;INCREASES AS;Sm;0;ON;;;;;Y;;;;;
+29E2;SHUFFLE PRODUCT;Sm;0;ON;;;;;N;;;;;
+29E3;EQUALS SIGN AND SLANTED PARALLEL;Sm;0;ON;;;;;Y;;;;;
+29E4;EQUALS SIGN AND SLANTED PARALLEL WITH TILDE ABOVE;Sm;0;ON;;;;;Y;;;;;
+29E5;IDENTICAL TO AND SLANTED PARALLEL;Sm;0;ON;;;;;Y;;;;;
+29E6;GLEICH STARK;Sm;0;ON;;;;;N;;;;;
+29E7;THERMODYNAMIC;Sm;0;ON;;;;;N;;;;;
+29E8;DOWN-POINTING TRIANGLE WITH LEFT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29E9;DOWN-POINTING TRIANGLE WITH RIGHT HALF BLACK;Sm;0;ON;;;;;Y;;;;;
+29EA;BLACK DIAMOND WITH DOWN ARROW;Sm;0;ON;;;;;N;;;;;
+29EB;BLACK LOZENGE;Sm;0;ON;;;;;N;;;;;
+29EC;WHITE CIRCLE WITH DOWN ARROW;Sm;0;ON;;;;;N;;;;;
+29ED;BLACK CIRCLE WITH DOWN ARROW;Sm;0;ON;;;;;N;;;;;
+29EE;ERROR-BARRED WHITE SQUARE;Sm;0;ON;;;;;N;;;;;
+29EF;ERROR-BARRED BLACK SQUARE;Sm;0;ON;;;;;N;;;;;
+29F0;ERROR-BARRED WHITE DIAMOND;Sm;0;ON;;;;;N;;;;;
+29F1;ERROR-BARRED BLACK DIAMOND;Sm;0;ON;;;;;N;;;;;
+29F2;ERROR-BARRED WHITE CIRCLE;Sm;0;ON;;;;;N;;;;;
+29F3;ERROR-BARRED BLACK CIRCLE;Sm;0;ON;;;;;N;;;;;
+29F4;RULE-DELAYED;Sm;0;ON;;;;;Y;;;;;
+29F5;REVERSE SOLIDUS OPERATOR;Sm;0;ON;;;;;Y;;;;;
+29F6;SOLIDUS WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+29F7;REVERSE SOLIDUS WITH HORIZONTAL STROKE;Sm;0;ON;;;;;Y;;;;;
+29F8;BIG SOLIDUS;Sm;0;ON;;;;;Y;;;;;
+29F9;BIG REVERSE SOLIDUS;Sm;0;ON;;;;;Y;;;;;
+29FA;DOUBLE PLUS;Sm;0;ON;;;;;N;;;;;
+29FB;TRIPLE PLUS;Sm;0;ON;;;;;N;;;;;
+29FC;LEFT-POINTING CURVED ANGLE BRACKET;Ps;0;ON;;;;;Y;;;;;
+29FD;RIGHT-POINTING CURVED ANGLE BRACKET;Pe;0;ON;;;;;Y;;;;;
+29FE;TINY;Sm;0;ON;;;;;N;;;;;
+29FF;MINY;Sm;0;ON;;;;;N;;;;;
+2A00;N-ARY CIRCLED DOT OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A01;N-ARY CIRCLED PLUS OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A02;N-ARY CIRCLED TIMES OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A03;N-ARY UNION OPERATOR WITH DOT;Sm;0;ON;;;;;N;;;;;
+2A04;N-ARY UNION OPERATOR WITH PLUS;Sm;0;ON;;;;;N;;;;;
+2A05;N-ARY SQUARE INTERSECTION OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A06;N-ARY SQUARE UNION OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A07;TWO LOGICAL AND OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A08;TWO LOGICAL OR OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A09;N-ARY TIMES OPERATOR;Sm;0;ON;;;;;N;;;;;
+2A0A;MODULO TWO SUM;Sm;0;ON;;;;;Y;;;;;
+2A0B;SUMMATION WITH INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2A0C;QUADRUPLE INTEGRAL OPERATOR;Sm;0;ON;<compat> 222B 222B 222B 222B;;;;Y;;;;;
+2A0D;FINITE PART INTEGRAL;Sm;0;ON;;;;;Y;;;;;
+2A0E;INTEGRAL WITH DOUBLE STROKE;Sm;0;ON;;;;;Y;;;;;
+2A0F;INTEGRAL AVERAGE WITH SLASH;Sm;0;ON;;;;;Y;;;;;
+2A10;CIRCULATION FUNCTION;Sm;0;ON;;;;;Y;;;;;
+2A11;ANTICLOCKWISE INTEGRATION;Sm;0;ON;;;;;Y;;;;;
+2A12;LINE INTEGRATION WITH RECTANGULAR PATH AROUND POLE;Sm;0;ON;;;;;Y;;;;;
+2A13;LINE INTEGRATION WITH SEMICIRCULAR PATH AROUND POLE;Sm;0;ON;;;;;Y;;;;;
+2A14;LINE INTEGRATION NOT INCLUDING THE POLE;Sm;0;ON;;;;;Y;;;;;
+2A15;INTEGRAL AROUND A POINT OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2A16;QUATERNION INTEGRAL OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2A17;INTEGRAL WITH LEFTWARDS ARROW WITH HOOK;Sm;0;ON;;;;;Y;;;;;
+2A18;INTEGRAL WITH TIMES SIGN;Sm;0;ON;;;;;Y;;;;;
+2A19;INTEGRAL WITH INTERSECTION;Sm;0;ON;;;;;Y;;;;;
+2A1A;INTEGRAL WITH UNION;Sm;0;ON;;;;;Y;;;;;
+2A1B;INTEGRAL WITH OVERBAR;Sm;0;ON;;;;;Y;;;;;
+2A1C;INTEGRAL WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
+2A1D;JOIN;Sm;0;ON;;;;;N;;;;;
+2A1E;LARGE LEFT TRIANGLE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2A1F;Z NOTATION SCHEMA COMPOSITION;Sm;0;ON;;;;;Y;;;;;
+2A20;Z NOTATION SCHEMA PIPING;Sm;0;ON;;;;;Y;;;;;
+2A21;Z NOTATION SCHEMA PROJECTION;Sm;0;ON;;;;;Y;;;;;
+2A22;PLUS SIGN WITH SMALL CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;;
+2A23;PLUS SIGN WITH CIRCUMFLEX ACCENT ABOVE;Sm;0;ON;;;;;N;;;;;
+2A24;PLUS SIGN WITH TILDE ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A25;PLUS SIGN WITH DOT BELOW;Sm;0;ON;;;;;N;;;;;
+2A26;PLUS SIGN WITH TILDE BELOW;Sm;0;ON;;;;;Y;;;;;
+2A27;PLUS SIGN WITH SUBSCRIPT TWO;Sm;0;ON;;;;;N;;;;;
+2A28;PLUS SIGN WITH BLACK TRIANGLE;Sm;0;ON;;;;;N;;;;;
+2A29;MINUS SIGN WITH COMMA ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A2A;MINUS SIGN WITH DOT BELOW;Sm;0;ON;;;;;N;;;;;
+2A2B;MINUS SIGN WITH FALLING DOTS;Sm;0;ON;;;;;Y;;;;;
+2A2C;MINUS SIGN WITH RISING DOTS;Sm;0;ON;;;;;Y;;;;;
+2A2D;PLUS SIGN IN LEFT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;;
+2A2E;PLUS SIGN IN RIGHT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;;
+2A2F;VECTOR OR CROSS PRODUCT;Sm;0;ON;;;;;N;;;;;
+2A30;MULTIPLICATION SIGN WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
+2A31;MULTIPLICATION SIGN WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2A32;SEMIDIRECT PRODUCT WITH BOTTOM CLOSED;Sm;0;ON;;;;;N;;;;;
+2A33;SMASH PRODUCT;Sm;0;ON;;;;;N;;;;;
+2A34;MULTIPLICATION SIGN IN LEFT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;;
+2A35;MULTIPLICATION SIGN IN RIGHT HALF CIRCLE;Sm;0;ON;;;;;Y;;;;;
+2A36;CIRCLED MULTIPLICATION SIGN WITH CIRCUMFLEX ACCENT;Sm;0;ON;;;;;N;;;;;
+2A37;MULTIPLICATION SIGN IN DOUBLE CIRCLE;Sm;0;ON;;;;;N;;;;;
+2A38;CIRCLED DIVISION SIGN;Sm;0;ON;;;;;N;;;;;
+2A39;PLUS SIGN IN TRIANGLE;Sm;0;ON;;;;;N;;;;;
+2A3A;MINUS SIGN IN TRIANGLE;Sm;0;ON;;;;;N;;;;;
+2A3B;MULTIPLICATION SIGN IN TRIANGLE;Sm;0;ON;;;;;N;;;;;
+2A3C;INTERIOR PRODUCT;Sm;0;ON;;;;;Y;;;;;
+2A3D;RIGHTHAND INTERIOR PRODUCT;Sm;0;ON;;;;;Y;;;;;
+2A3E;Z NOTATION RELATIONAL COMPOSITION;Sm;0;ON;;;;;Y;;;;;
+2A3F;AMALGAMATION OR COPRODUCT;Sm;0;ON;;;;;N;;;;;
+2A40;INTERSECTION WITH DOT;Sm;0;ON;;;;;N;;;;;
+2A41;UNION WITH MINUS SIGN;Sm;0;ON;;;;;N;;;;;
+2A42;UNION WITH OVERBAR;Sm;0;ON;;;;;N;;;;;
+2A43;INTERSECTION WITH OVERBAR;Sm;0;ON;;;;;N;;;;;
+2A44;INTERSECTION WITH LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+2A45;UNION WITH LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+2A46;UNION ABOVE INTERSECTION;Sm;0;ON;;;;;N;;;;;
+2A47;INTERSECTION ABOVE UNION;Sm;0;ON;;;;;N;;;;;
+2A48;UNION ABOVE BAR ABOVE INTERSECTION;Sm;0;ON;;;;;N;;;;;
+2A49;INTERSECTION ABOVE BAR ABOVE UNION;Sm;0;ON;;;;;N;;;;;
+2A4A;UNION BESIDE AND JOINED WITH UNION;Sm;0;ON;;;;;N;;;;;
+2A4B;INTERSECTION BESIDE AND JOINED WITH INTERSECTION;Sm;0;ON;;;;;N;;;;;
+2A4C;CLOSED UNION WITH SERIFS;Sm;0;ON;;;;;N;;;;;
+2A4D;CLOSED INTERSECTION WITH SERIFS;Sm;0;ON;;;;;N;;;;;
+2A4E;DOUBLE SQUARE INTERSECTION;Sm;0;ON;;;;;N;;;;;
+2A4F;DOUBLE SQUARE UNION;Sm;0;ON;;;;;N;;;;;
+2A50;CLOSED UNION WITH SERIFS AND SMASH PRODUCT;Sm;0;ON;;;;;N;;;;;
+2A51;LOGICAL AND WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
+2A52;LOGICAL OR WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
+2A53;DOUBLE LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+2A54;DOUBLE LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+2A55;TWO INTERSECTING LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+2A56;TWO INTERSECTING LOGICAL OR;Sm;0;ON;;;;;N;;;;;
+2A57;SLOPING LARGE OR;Sm;0;ON;;;;;Y;;;;;
+2A58;SLOPING LARGE AND;Sm;0;ON;;;;;Y;;;;;
+2A59;LOGICAL OR OVERLAPPING LOGICAL AND;Sm;0;ON;;;;;N;;;;;
+2A5A;LOGICAL AND WITH MIDDLE STEM;Sm;0;ON;;;;;N;;;;;
+2A5B;LOGICAL OR WITH MIDDLE STEM;Sm;0;ON;;;;;N;;;;;
+2A5C;LOGICAL AND WITH HORIZONTAL DASH;Sm;0;ON;;;;;N;;;;;
+2A5D;LOGICAL OR WITH HORIZONTAL DASH;Sm;0;ON;;;;;N;;;;;
+2A5E;LOGICAL AND WITH DOUBLE OVERBAR;Sm;0;ON;;;;;N;;;;;
+2A5F;LOGICAL AND WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2A60;LOGICAL AND WITH DOUBLE UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2A61;SMALL VEE WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2A62;LOGICAL OR WITH DOUBLE OVERBAR;Sm;0;ON;;;;;N;;;;;
+2A63;LOGICAL OR WITH DOUBLE UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2A64;Z NOTATION DOMAIN ANTIRESTRICTION;Sm;0;ON;;;;;Y;;;;;
+2A65;Z NOTATION RANGE ANTIRESTRICTION;Sm;0;ON;;;;;Y;;;;;
+2A66;EQUALS SIGN WITH DOT BELOW;Sm;0;ON;;;;;N;;;;;
+2A67;IDENTICAL WITH DOT ABOVE;Sm;0;ON;;;;;N;;;;;
+2A68;TRIPLE HORIZONTAL BAR WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2A69;TRIPLE HORIZONTAL BAR WITH TRIPLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2A6A;TILDE OPERATOR WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A6B;TILDE OPERATOR WITH RISING DOTS;Sm;0;ON;;;;;Y;;;;;
+2A6C;SIMILAR MINUS SIMILAR;Sm;0;ON;;;;;Y;;;;;
+2A6D;CONGRUENT WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A6E;EQUALS WITH ASTERISK;Sm;0;ON;;;;;N;;;;;
+2A6F;ALMOST EQUAL TO WITH CIRCUMFLEX ACCENT;Sm;0;ON;;;;;Y;;;;;
+2A70;APPROXIMATELY EQUAL OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2A71;EQUALS SIGN ABOVE PLUS SIGN;Sm;0;ON;;;;;N;;;;;
+2A72;PLUS SIGN ABOVE EQUALS SIGN;Sm;0;ON;;;;;N;;;;;
+2A73;EQUALS SIGN ABOVE TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2A74;DOUBLE COLON EQUAL;Sm;0;ON;<compat> 003A 003A 003D;;;;Y;;;;;
+2A75;TWO CONSECUTIVE EQUALS SIGNS;Sm;0;ON;<compat> 003D 003D;;;;N;;;;;
+2A76;THREE CONSECUTIVE EQUALS SIGNS;Sm;0;ON;<compat> 003D 003D 003D;;;;N;;;;;
+2A77;EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW;Sm;0;ON;;;;;N;;;;;
+2A78;EQUIVALENT WITH FOUR DOTS ABOVE;Sm;0;ON;;;;;N;;;;;
+2A79;LESS-THAN WITH CIRCLE INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A7A;GREATER-THAN WITH CIRCLE INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A7B;LESS-THAN WITH QUESTION MARK ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A7C;GREATER-THAN WITH QUESTION MARK ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A7D;LESS-THAN OR SLANTED EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2A7E;GREATER-THAN OR SLANTED EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2A7F;LESS-THAN OR SLANTED EQUAL TO WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A80;GREATER-THAN OR SLANTED EQUAL TO WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A81;LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A82;GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2A83;LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE RIGHT;Sm;0;ON;;;;;Y;;;;;
+2A84;GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE LEFT;Sm;0;ON;;;;;Y;;;;;
+2A85;LESS-THAN OR APPROXIMATE;Sm;0;ON;;;;;Y;;;;;
+2A86;GREATER-THAN OR APPROXIMATE;Sm;0;ON;;;;;Y;;;;;
+2A87;LESS-THAN AND SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2A88;GREATER-THAN AND SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2A89;LESS-THAN AND NOT APPROXIMATE;Sm;0;ON;;;;;Y;;;;;
+2A8A;GREATER-THAN AND NOT APPROXIMATE;Sm;0;ON;;;;;Y;;;;;
+2A8B;LESS-THAN ABOVE DOUBLE-LINE EQUAL ABOVE GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A8C;GREATER-THAN ABOVE DOUBLE-LINE EQUAL ABOVE LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A8D;LESS-THAN ABOVE SIMILAR OR EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A8E;GREATER-THAN ABOVE SIMILAR OR EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A8F;LESS-THAN ABOVE SIMILAR ABOVE GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A90;GREATER-THAN ABOVE SIMILAR ABOVE LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A91;LESS-THAN ABOVE GREATER-THAN ABOVE DOUBLE-LINE EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A92;GREATER-THAN ABOVE LESS-THAN ABOVE DOUBLE-LINE EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A93;LESS-THAN ABOVE SLANTED EQUAL ABOVE GREATER-THAN ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A94;GREATER-THAN ABOVE SLANTED EQUAL ABOVE LESS-THAN ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;;
+2A95;SLANTED EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A96;SLANTED EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A97;SLANTED EQUAL TO OR LESS-THAN WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A98;SLANTED EQUAL TO OR GREATER-THAN WITH DOT INSIDE;Sm;0;ON;;;;;Y;;;;;
+2A99;DOUBLE-LINE EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9A;DOUBLE-LINE EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9B;DOUBLE-LINE SLANTED EQUAL TO OR LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9C;DOUBLE-LINE SLANTED EQUAL TO OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9D;SIMILAR OR LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9E;SIMILAR OR GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2A9F;SIMILAR ABOVE LESS-THAN ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AA0;SIMILAR ABOVE GREATER-THAN ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AA1;DOUBLE NESTED LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2AA2;DOUBLE NESTED GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2AA3;DOUBLE NESTED LESS-THAN WITH UNDERBAR;Sm;0;ON;;;;;Y;;;;;
+2AA4;GREATER-THAN OVERLAPPING LESS-THAN;Sm;0;ON;;;;;N;;;;;
+2AA5;GREATER-THAN BESIDE LESS-THAN;Sm;0;ON;;;;;N;;;;;
+2AA6;LESS-THAN CLOSED BY CURVE;Sm;0;ON;;;;;Y;;;;;
+2AA7;GREATER-THAN CLOSED BY CURVE;Sm;0;ON;;;;;Y;;;;;
+2AA8;LESS-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;;
+2AA9;GREATER-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL;Sm;0;ON;;;;;Y;;;;;
+2AAA;SMALLER THAN;Sm;0;ON;;;;;Y;;;;;
+2AAB;LARGER THAN;Sm;0;ON;;;;;Y;;;;;
+2AAC;SMALLER THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AAD;LARGER THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AAE;EQUALS SIGN WITH BUMPY ABOVE;Sm;0;ON;;;;;N;;;;;
+2AAF;PRECEDES ABOVE SINGLE-LINE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AB0;SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AB1;PRECEDES ABOVE SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB2;SUCCEEDS ABOVE SINGLE-LINE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB3;PRECEDES ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AB4;SUCCEEDS ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AB5;PRECEDES ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB6;SUCCEEDS ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB7;PRECEDES ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB8;SUCCEEDS ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AB9;PRECEDES ABOVE NOT ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ABA;SUCCEEDS ABOVE NOT ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ABB;DOUBLE PRECEDES;Sm;0;ON;;;;;Y;;;;;
+2ABC;DOUBLE SUCCEEDS;Sm;0;ON;;;;;Y;;;;;
+2ABD;SUBSET WITH DOT;Sm;0;ON;;;;;Y;;;;;
+2ABE;SUPERSET WITH DOT;Sm;0;ON;;;;;Y;;;;;
+2ABF;SUBSET WITH PLUS SIGN BELOW;Sm;0;ON;;;;;Y;;;;;
+2AC0;SUPERSET WITH PLUS SIGN BELOW;Sm;0;ON;;;;;Y;;;;;
+2AC1;SUBSET WITH MULTIPLICATION SIGN BELOW;Sm;0;ON;;;;;Y;;;;;
+2AC2;SUPERSET WITH MULTIPLICATION SIGN BELOW;Sm;0;ON;;;;;Y;;;;;
+2AC3;SUBSET OF OR EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2AC4;SUPERSET OF OR EQUAL TO WITH DOT ABOVE;Sm;0;ON;;;;;Y;;;;;
+2AC5;SUBSET OF ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AC6;SUPERSET OF ABOVE EQUALS SIGN;Sm;0;ON;;;;;Y;;;;;
+2AC7;SUBSET OF ABOVE TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2AC8;SUPERSET OF ABOVE TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2AC9;SUBSET OF ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ACA;SUPERSET OF ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ACB;SUBSET OF ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ACC;SUPERSET OF ABOVE NOT EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2ACD;SQUARE LEFT OPEN BOX OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2ACE;SQUARE RIGHT OPEN BOX OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2ACF;CLOSED SUBSET;Sm;0;ON;;;;;Y;;;;;
+2AD0;CLOSED SUPERSET;Sm;0;ON;;;;;Y;;;;;
+2AD1;CLOSED SUBSET OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AD2;CLOSED SUPERSET OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AD3;SUBSET ABOVE SUPERSET;Sm;0;ON;;;;;Y;;;;;
+2AD4;SUPERSET ABOVE SUBSET;Sm;0;ON;;;;;Y;;;;;
+2AD5;SUBSET ABOVE SUBSET;Sm;0;ON;;;;;Y;;;;;
+2AD6;SUPERSET ABOVE SUPERSET;Sm;0;ON;;;;;Y;;;;;
+2AD7;SUPERSET BESIDE SUBSET;Sm;0;ON;;;;;N;;;;;
+2AD8;SUPERSET BESIDE AND JOINED BY DASH WITH SUBSET;Sm;0;ON;;;;;N;;;;;
+2AD9;ELEMENT OF OPENING DOWNWARDS;Sm;0;ON;;;;;N;;;;;
+2ADA;PITCHFORK WITH TEE TOP;Sm;0;ON;;;;;N;;;;;
+2ADB;TRANSVERSAL INTERSECTION;Sm;0;ON;;;;;N;;;;;
+2ADC;FORKING;Sm;0;ON;2ADD 0338;;;;Y;;not independent;;;
+2ADD;NONFORKING;Sm;0;ON;;;;;N;;independent;;;
+2ADE;SHORT LEFT TACK;Sm;0;ON;;;;;Y;;;;;
+2ADF;SHORT DOWN TACK;Sm;0;ON;;;;;N;;;;;
+2AE0;SHORT UP TACK;Sm;0;ON;;;;;N;;;;;
+2AE1;PERPENDICULAR WITH S;Sm;0;ON;;;;;N;;;;;
+2AE2;VERTICAL BAR TRIPLE RIGHT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+2AE3;DOUBLE VERTICAL BAR LEFT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+2AE4;VERTICAL BAR DOUBLE LEFT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+2AE5;DOUBLE VERTICAL BAR DOUBLE LEFT TURNSTILE;Sm;0;ON;;;;;Y;;;;;
+2AE6;LONG DASH FROM LEFT MEMBER OF DOUBLE VERTICAL;Sm;0;ON;;;;;Y;;;;;
+2AE7;SHORT DOWN TACK WITH OVERBAR;Sm;0;ON;;;;;N;;;;;
+2AE8;SHORT UP TACK WITH UNDERBAR;Sm;0;ON;;;;;N;;;;;
+2AE9;SHORT UP TACK ABOVE SHORT DOWN TACK;Sm;0;ON;;;;;N;;;;;
+2AEA;DOUBLE DOWN TACK;Sm;0;ON;;;;;N;;;;;
+2AEB;DOUBLE UP TACK;Sm;0;ON;;;;;N;;;;;
+2AEC;DOUBLE STROKE NOT SIGN;Sm;0;ON;;;;;Y;;;;;
+2AED;REVERSED DOUBLE STROKE NOT SIGN;Sm;0;ON;;;;;Y;;;;;
+2AEE;DOES NOT DIVIDE WITH REVERSED NEGATION SLASH;Sm;0;ON;;;;;Y;;;;;
+2AEF;VERTICAL LINE WITH CIRCLE ABOVE;Sm;0;ON;;;;;N;;;;;
+2AF0;VERTICAL LINE WITH CIRCLE BELOW;Sm;0;ON;;;;;N;;;;;
+2AF1;DOWN TACK WITH CIRCLE BELOW;Sm;0;ON;;;;;N;;;;;
+2AF2;PARALLEL WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
+2AF3;PARALLEL WITH TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2AF4;TRIPLE VERTICAL BAR BINARY RELATION;Sm;0;ON;;;;;N;;;;;
+2AF5;TRIPLE VERTICAL BAR WITH HORIZONTAL STROKE;Sm;0;ON;;;;;N;;;;;
+2AF6;TRIPLE COLON OPERATOR;Sm;0;ON;;;;;N;;;;;
+2AF7;TRIPLE NESTED LESS-THAN;Sm;0;ON;;;;;Y;;;;;
+2AF8;TRIPLE NESTED GREATER-THAN;Sm;0;ON;;;;;Y;;;;;
+2AF9;DOUBLE-LINE SLANTED LESS-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AFA;DOUBLE-LINE SLANTED GREATER-THAN OR EQUAL TO;Sm;0;ON;;;;;Y;;;;;
+2AFB;TRIPLE SOLIDUS BINARY RELATION;Sm;0;ON;;;;;Y;;;;;
+2AFC;LARGE TRIPLE VERTICAL BAR OPERATOR;Sm;0;ON;;;;;N;;;;;
+2AFD;DOUBLE SOLIDUS OPERATOR;Sm;0;ON;;;;;Y;;;;;
+2AFE;WHITE VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
+2AFF;N-ARY WHITE VERTICAL BAR;Sm;0;ON;;;;;N;;;;;
+2B00;NORTH EAST WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B01;NORTH WEST WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B02;SOUTH EAST WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B03;SOUTH WEST WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B04;LEFT RIGHT WHITE ARROW;So;0;ON;;;;;N;;;;;
+2B05;LEFTWARDS BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B06;UPWARDS BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B07;DOWNWARDS BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B08;NORTH EAST BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B09;NORTH WEST BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B0A;SOUTH EAST BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B0B;SOUTH WEST BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B0C;LEFT RIGHT BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B0D;UP DOWN BLACK ARROW;So;0;ON;;;;;N;;;;;
+2B0E;RIGHTWARDS ARROW WITH TIP DOWNWARDS;So;0;ON;;;;;N;;;;;
+2B0F;RIGHTWARDS ARROW WITH TIP UPWARDS;So;0;ON;;;;;N;;;;;
+2B10;LEFTWARDS ARROW WITH TIP DOWNWARDS;So;0;ON;;;;;N;;;;;
+2B11;LEFTWARDS ARROW WITH TIP UPWARDS;So;0;ON;;;;;N;;;;;
+2B12;SQUARE WITH TOP HALF BLACK;So;0;ON;;;;;N;;;;;
+2B13;SQUARE WITH BOTTOM HALF BLACK;So;0;ON;;;;;N;;;;;
+2B14;SQUARE WITH UPPER RIGHT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;;
+2B15;SQUARE WITH LOWER LEFT DIAGONAL HALF BLACK;So;0;ON;;;;;N;;;;;
+2B16;DIAMOND WITH LEFT HALF BLACK;So;0;ON;;;;;N;;;;;
+2B17;DIAMOND WITH RIGHT HALF BLACK;So;0;ON;;;;;N;;;;;
+2B18;DIAMOND WITH TOP HALF BLACK;So;0;ON;;;;;N;;;;;
+2B19;DIAMOND WITH BOTTOM HALF BLACK;So;0;ON;;;;;N;;;;;
+2B1A;DOTTED SQUARE;So;0;ON;;;;;N;;;;;
+2B1B;BLACK LARGE SQUARE;So;0;ON;;;;;N;;;;;
+2B1C;WHITE LARGE SQUARE;So;0;ON;;;;;N;;;;;
+2B1D;BLACK VERY SMALL SQUARE;So;0;ON;;;;;N;;;;;
+2B1E;WHITE VERY SMALL SQUARE;So;0;ON;;;;;N;;;;;
+2B1F;BLACK PENTAGON;So;0;ON;;;;;N;;;;;
+2B20;WHITE PENTAGON;So;0;ON;;;;;N;;;;;
+2B21;WHITE HEXAGON;So;0;ON;;;;;N;;;;;
+2B22;BLACK HEXAGON;So;0;ON;;;;;N;;;;;
+2B23;HORIZONTAL BLACK HEXAGON;So;0;ON;;;;;N;;;;;
+2B24;BLACK LARGE CIRCLE;So;0;ON;;;;;N;;;;;
+2B25;BLACK MEDIUM DIAMOND;So;0;ON;;;;;N;;;;;
+2B26;WHITE MEDIUM DIAMOND;So;0;ON;;;;;N;;;;;
+2B27;BLACK MEDIUM LOZENGE;So;0;ON;;;;;N;;;;;
+2B28;WHITE MEDIUM LOZENGE;So;0;ON;;;;;N;;;;;
+2B29;BLACK SMALL DIAMOND;So;0;ON;;;;;N;;;;;
+2B2A;BLACK SMALL LOZENGE;So;0;ON;;;;;N;;;;;
+2B2B;WHITE SMALL LOZENGE;So;0;ON;;;;;N;;;;;
+2B2C;BLACK HORIZONTAL ELLIPSE;So;0;ON;;;;;N;;;;;
+2B2D;WHITE HORIZONTAL ELLIPSE;So;0;ON;;;;;N;;;;;
+2B2E;BLACK VERTICAL ELLIPSE;So;0;ON;;;;;N;;;;;
+2B2F;WHITE VERTICAL ELLIPSE;So;0;ON;;;;;N;;;;;
+2B30;LEFT ARROW WITH SMALL CIRCLE;Sm;0;ON;;;;;N;;;;;
+2B31;THREE LEFTWARDS ARROWS;Sm;0;ON;;;;;N;;;;;
+2B32;LEFT ARROW WITH CIRCLED PLUS;Sm;0;ON;;;;;N;;;;;
+2B33;LONG LEFTWARDS SQUIGGLE ARROW;Sm;0;ON;;;;;N;;;;;
+2B34;LEFTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B35;LEFTWARDS TWO-HEADED ARROW WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B36;LEFTWARDS TWO-HEADED ARROW FROM BAR;Sm;0;ON;;;;;N;;;;;
+2B37;LEFTWARDS TWO-HEADED TRIPLE DASH ARROW;Sm;0;ON;;;;;N;;;;;
+2B38;LEFTWARDS ARROW WITH DOTTED STEM;Sm;0;ON;;;;;N;;;;;
+2B39;LEFTWARDS ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B3A;LEFTWARDS ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B3B;LEFTWARDS TWO-HEADED ARROW WITH TAIL;Sm;0;ON;;;;;N;;;;;
+2B3C;LEFTWARDS TWO-HEADED ARROW WITH TAIL WITH VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B3D;LEFTWARDS TWO-HEADED ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE;Sm;0;ON;;;;;N;;;;;
+2B3E;LEFTWARDS ARROW THROUGH X;Sm;0;ON;;;;;N;;;;;
+2B3F;WAVE ARROW POINTING DIRECTLY LEFT;Sm;0;ON;;;;;N;;;;;
+2B40;EQUALS SIGN ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2B41;REVERSE TILDE OPERATOR ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2B42;LEFTWARDS ARROW ABOVE REVERSE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2B43;RIGHTWARDS ARROW THROUGH GREATER-THAN;Sm;0;ON;;;;;N;;;;;
+2B44;RIGHTWARDS ARROW THROUGH SUPERSET;Sm;0;ON;;;;;N;;;;;
+2B45;LEFTWARDS QUADRUPLE ARROW;So;0;ON;;;;;N;;;;;
+2B46;RIGHTWARDS QUADRUPLE ARROW;So;0;ON;;;;;N;;;;;
+2B47;REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2B48;RIGHTWARDS ARROW ABOVE REVERSE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2B49;TILDE OPERATOR ABOVE LEFTWARDS ARROW;Sm;0;ON;;;;;N;;;;;
+2B4A;LEFTWARDS ARROW ABOVE ALMOST EQUAL TO;Sm;0;ON;;;;;N;;;;;
+2B4B;LEFTWARDS ARROW ABOVE REVERSE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;;
+2B4C;RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR;Sm;0;ON;;;;;N;;;;;
+2B50;WHITE MEDIUM STAR;So;0;ON;;;;;N;;;;;
+2B51;BLACK SMALL STAR;So;0;ON;;;;;N;;;;;
+2B52;WHITE SMALL STAR;So;0;ON;;;;;N;;;;;
+2B53;BLACK RIGHT-POINTING PENTAGON;So;0;ON;;;;;N;;;;;
+2B54;WHITE RIGHT-POINTING PENTAGON;So;0;ON;;;;;N;;;;;
+2C00;GLAGOLITIC CAPITAL LETTER AZU;Lu;0;L;;;;;N;;;;2C30;
+2C01;GLAGOLITIC CAPITAL LETTER BUKY;Lu;0;L;;;;;N;;;;2C31;
+2C02;GLAGOLITIC CAPITAL LETTER VEDE;Lu;0;L;;;;;N;;;;2C32;
+2C03;GLAGOLITIC CAPITAL LETTER GLAGOLI;Lu;0;L;;;;;N;;;;2C33;
+2C04;GLAGOLITIC CAPITAL LETTER DOBRO;Lu;0;L;;;;;N;;;;2C34;
+2C05;GLAGOLITIC CAPITAL LETTER YESTU;Lu;0;L;;;;;N;;;;2C35;
+2C06;GLAGOLITIC CAPITAL LETTER ZHIVETE;Lu;0;L;;;;;N;;;;2C36;
+2C07;GLAGOLITIC CAPITAL LETTER DZELO;Lu;0;L;;;;;N;;;;2C37;
+2C08;GLAGOLITIC CAPITAL LETTER ZEMLJA;Lu;0;L;;;;;N;;;;2C38;
+2C09;GLAGOLITIC CAPITAL LETTER IZHE;Lu;0;L;;;;;N;;;;2C39;
+2C0A;GLAGOLITIC CAPITAL LETTER INITIAL IZHE;Lu;0;L;;;;;N;;;;2C3A;
+2C0B;GLAGOLITIC CAPITAL LETTER I;Lu;0;L;;;;;N;;;;2C3B;
+2C0C;GLAGOLITIC CAPITAL LETTER DJERVI;Lu;0;L;;;;;N;;;;2C3C;
+2C0D;GLAGOLITIC CAPITAL LETTER KAKO;Lu;0;L;;;;;N;;;;2C3D;
+2C0E;GLAGOLITIC CAPITAL LETTER LJUDIJE;Lu;0;L;;;;;N;;;;2C3E;
+2C0F;GLAGOLITIC CAPITAL LETTER MYSLITE;Lu;0;L;;;;;N;;;;2C3F;
+2C10;GLAGOLITIC CAPITAL LETTER NASHI;Lu;0;L;;;;;N;;;;2C40;
+2C11;GLAGOLITIC CAPITAL LETTER ONU;Lu;0;L;;;;;N;;;;2C41;
+2C12;GLAGOLITIC CAPITAL LETTER POKOJI;Lu;0;L;;;;;N;;;;2C42;
+2C13;GLAGOLITIC CAPITAL LETTER RITSI;Lu;0;L;;;;;N;;;;2C43;
+2C14;GLAGOLITIC CAPITAL LETTER SLOVO;Lu;0;L;;;;;N;;;;2C44;
+2C15;GLAGOLITIC CAPITAL LETTER TVRIDO;Lu;0;L;;;;;N;;;;2C45;
+2C16;GLAGOLITIC CAPITAL LETTER UKU;Lu;0;L;;;;;N;;;;2C46;
+2C17;GLAGOLITIC CAPITAL LETTER FRITU;Lu;0;L;;;;;N;;;;2C47;
+2C18;GLAGOLITIC CAPITAL LETTER HERU;Lu;0;L;;;;;N;;;;2C48;
+2C19;GLAGOLITIC CAPITAL LETTER OTU;Lu;0;L;;;;;N;;;;2C49;
+2C1A;GLAGOLITIC CAPITAL LETTER PE;Lu;0;L;;;;;N;;;;2C4A;
+2C1B;GLAGOLITIC CAPITAL LETTER SHTA;Lu;0;L;;;;;N;;;;2C4B;
+2C1C;GLAGOLITIC CAPITAL LETTER TSI;Lu;0;L;;;;;N;;;;2C4C;
+2C1D;GLAGOLITIC CAPITAL LETTER CHRIVI;Lu;0;L;;;;;N;;;;2C4D;
+2C1E;GLAGOLITIC CAPITAL LETTER SHA;Lu;0;L;;;;;N;;;;2C4E;
+2C1F;GLAGOLITIC CAPITAL LETTER YERU;Lu;0;L;;;;;N;;;;2C4F;
+2C20;GLAGOLITIC CAPITAL LETTER YERI;Lu;0;L;;;;;N;;;;2C50;
+2C21;GLAGOLITIC CAPITAL LETTER YATI;Lu;0;L;;;;;N;;;;2C51;
+2C22;GLAGOLITIC CAPITAL LETTER SPIDERY HA;Lu;0;L;;;;;N;;;;2C52;
+2C23;GLAGOLITIC CAPITAL LETTER YU;Lu;0;L;;;;;N;;;;2C53;
+2C24;GLAGOLITIC CAPITAL LETTER SMALL YUS;Lu;0;L;;;;;N;;;;2C54;
+2C25;GLAGOLITIC CAPITAL LETTER SMALL YUS WITH TAIL;Lu;0;L;;;;;N;;;;2C55;
+2C26;GLAGOLITIC CAPITAL LETTER YO;Lu;0;L;;;;;N;;;;2C56;
+2C27;GLAGOLITIC CAPITAL LETTER IOTATED SMALL YUS;Lu;0;L;;;;;N;;;;2C57;
+2C28;GLAGOLITIC CAPITAL LETTER BIG YUS;Lu;0;L;;;;;N;;;;2C58;
+2C29;GLAGOLITIC CAPITAL LETTER IOTATED BIG YUS;Lu;0;L;;;;;N;;;;2C59;
+2C2A;GLAGOLITIC CAPITAL LETTER FITA;Lu;0;L;;;;;N;;;;2C5A;
+2C2B;GLAGOLITIC CAPITAL LETTER IZHITSA;Lu;0;L;;;;;N;;;;2C5B;
+2C2C;GLAGOLITIC CAPITAL LETTER SHTAPIC;Lu;0;L;;;;;N;;;;2C5C;
+2C2D;GLAGOLITIC CAPITAL LETTER TROKUTASTI A;Lu;0;L;;;;;N;;;;2C5D;
+2C2E;GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE;Lu;0;L;;;;;N;;;;2C5E;
+2C30;GLAGOLITIC SMALL LETTER AZU;Ll;0;L;;;;;N;;;2C00;;2C00
+2C31;GLAGOLITIC SMALL LETTER BUKY;Ll;0;L;;;;;N;;;2C01;;2C01
+2C32;GLAGOLITIC SMALL LETTER VEDE;Ll;0;L;;;;;N;;;2C02;;2C02
+2C33;GLAGOLITIC SMALL LETTER GLAGOLI;Ll;0;L;;;;;N;;;2C03;;2C03
+2C34;GLAGOLITIC SMALL LETTER DOBRO;Ll;0;L;;;;;N;;;2C04;;2C04
+2C35;GLAGOLITIC SMALL LETTER YESTU;Ll;0;L;;;;;N;;;2C05;;2C05
+2C36;GLAGOLITIC SMALL LETTER ZHIVETE;Ll;0;L;;;;;N;;;2C06;;2C06
+2C37;GLAGOLITIC SMALL LETTER DZELO;Ll;0;L;;;;;N;;;2C07;;2C07
+2C38;GLAGOLITIC SMALL LETTER ZEMLJA;Ll;0;L;;;;;N;;;2C08;;2C08
+2C39;GLAGOLITIC SMALL LETTER IZHE;Ll;0;L;;;;;N;;;2C09;;2C09
+2C3A;GLAGOLITIC SMALL LETTER INITIAL IZHE;Ll;0;L;;;;;N;;;2C0A;;2C0A
+2C3B;GLAGOLITIC SMALL LETTER I;Ll;0;L;;;;;N;;;2C0B;;2C0B
+2C3C;GLAGOLITIC SMALL LETTER DJERVI;Ll;0;L;;;;;N;;;2C0C;;2C0C
+2C3D;GLAGOLITIC SMALL LETTER KAKO;Ll;0;L;;;;;N;;;2C0D;;2C0D
+2C3E;GLAGOLITIC SMALL LETTER LJUDIJE;Ll;0;L;;;;;N;;;2C0E;;2C0E
+2C3F;GLAGOLITIC SMALL LETTER MYSLITE;Ll;0;L;;;;;N;;;2C0F;;2C0F
+2C40;GLAGOLITIC SMALL LETTER NASHI;Ll;0;L;;;;;N;;;2C10;;2C10
+2C41;GLAGOLITIC SMALL LETTER ONU;Ll;0;L;;;;;N;;;2C11;;2C11
+2C42;GLAGOLITIC SMALL LETTER POKOJI;Ll;0;L;;;;;N;;;2C12;;2C12
+2C43;GLAGOLITIC SMALL LETTER RITSI;Ll;0;L;;;;;N;;;2C13;;2C13
+2C44;GLAGOLITIC SMALL LETTER SLOVO;Ll;0;L;;;;;N;;;2C14;;2C14
+2C45;GLAGOLITIC SMALL LETTER TVRIDO;Ll;0;L;;;;;N;;;2C15;;2C15
+2C46;GLAGOLITIC SMALL LETTER UKU;Ll;0;L;;;;;N;;;2C16;;2C16
+2C47;GLAGOLITIC SMALL LETTER FRITU;Ll;0;L;;;;;N;;;2C17;;2C17
+2C48;GLAGOLITIC SMALL LETTER HERU;Ll;0;L;;;;;N;;;2C18;;2C18
+2C49;GLAGOLITIC SMALL LETTER OTU;Ll;0;L;;;;;N;;;2C19;;2C19
+2C4A;GLAGOLITIC SMALL LETTER PE;Ll;0;L;;;;;N;;;2C1A;;2C1A
+2C4B;GLAGOLITIC SMALL LETTER SHTA;Ll;0;L;;;;;N;;;2C1B;;2C1B
+2C4C;GLAGOLITIC SMALL LETTER TSI;Ll;0;L;;;;;N;;;2C1C;;2C1C
+2C4D;GLAGOLITIC SMALL LETTER CHRIVI;Ll;0;L;;;;;N;;;2C1D;;2C1D
+2C4E;GLAGOLITIC SMALL LETTER SHA;Ll;0;L;;;;;N;;;2C1E;;2C1E
+2C4F;GLAGOLITIC SMALL LETTER YERU;Ll;0;L;;;;;N;;;2C1F;;2C1F
+2C50;GLAGOLITIC SMALL LETTER YERI;Ll;0;L;;;;;N;;;2C20;;2C20
+2C51;GLAGOLITIC SMALL LETTER YATI;Ll;0;L;;;;;N;;;2C21;;2C21
+2C52;GLAGOLITIC SMALL LETTER SPIDERY HA;Ll;0;L;;;;;N;;;2C22;;2C22
+2C53;GLAGOLITIC SMALL LETTER YU;Ll;0;L;;;;;N;;;2C23;;2C23
+2C54;GLAGOLITIC SMALL LETTER SMALL YUS;Ll;0;L;;;;;N;;;2C24;;2C24
+2C55;GLAGOLITIC SMALL LETTER SMALL YUS WITH TAIL;Ll;0;L;;;;;N;;;2C25;;2C25
+2C56;GLAGOLITIC SMALL LETTER YO;Ll;0;L;;;;;N;;;2C26;;2C26
+2C57;GLAGOLITIC SMALL LETTER IOTATED SMALL YUS;Ll;0;L;;;;;N;;;2C27;;2C27
+2C58;GLAGOLITIC SMALL LETTER BIG YUS;Ll;0;L;;;;;N;;;2C28;;2C28
+2C59;GLAGOLITIC SMALL LETTER IOTATED BIG YUS;Ll;0;L;;;;;N;;;2C29;;2C29
+2C5A;GLAGOLITIC SMALL LETTER FITA;Ll;0;L;;;;;N;;;2C2A;;2C2A
+2C5B;GLAGOLITIC SMALL LETTER IZHITSA;Ll;0;L;;;;;N;;;2C2B;;2C2B
+2C5C;GLAGOLITIC SMALL LETTER SHTAPIC;Ll;0;L;;;;;N;;;2C2C;;2C2C
+2C5D;GLAGOLITIC SMALL LETTER TROKUTASTI A;Ll;0;L;;;;;N;;;2C2D;;2C2D
+2C5E;GLAGOLITIC SMALL LETTER LATINATE MYSLITE;Ll;0;L;;;;;N;;;2C2E;;2C2E
+2C60;LATIN CAPITAL LETTER L WITH DOUBLE BAR;Lu;0;L;;;;;N;;;;2C61;
+2C61;LATIN SMALL LETTER L WITH DOUBLE BAR;Ll;0;L;;;;;N;;;2C60;;2C60
+2C62;LATIN CAPITAL LETTER L WITH MIDDLE TILDE;Lu;0;L;;;;;N;;;;026B;
+2C63;LATIN CAPITAL LETTER P WITH STROKE;Lu;0;L;;;;;N;;;;1D7D;
+2C64;LATIN CAPITAL LETTER R WITH TAIL;Lu;0;L;;;;;N;;;;027D;
+2C65;LATIN SMALL LETTER A WITH STROKE;Ll;0;L;;;;;N;;;023A;;023A
+2C66;LATIN SMALL LETTER T WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;023E;;023E
+2C67;LATIN CAPITAL LETTER H WITH DESCENDER;Lu;0;L;;;;;N;;;;2C68;
+2C68;LATIN SMALL LETTER H WITH DESCENDER;Ll;0;L;;;;;N;;;2C67;;2C67
+2C69;LATIN CAPITAL LETTER K WITH DESCENDER;Lu;0;L;;;;;N;;;;2C6A;
+2C6A;LATIN SMALL LETTER K WITH DESCENDER;Ll;0;L;;;;;N;;;2C69;;2C69
+2C6B;LATIN CAPITAL LETTER Z WITH DESCENDER;Lu;0;L;;;;;N;;;;2C6C;
+2C6C;LATIN SMALL LETTER Z WITH DESCENDER;Ll;0;L;;;;;N;;;2C6B;;2C6B
+2C6D;LATIN CAPITAL LETTER ALPHA;Lu;0;L;;;;;N;;;;0251;
+2C6E;LATIN CAPITAL LETTER M WITH HOOK;Lu;0;L;;;;;N;;;;0271;
+2C6F;LATIN CAPITAL LETTER TURNED A;Lu;0;L;;;;;N;;;;0250;
+2C71;LATIN SMALL LETTER V WITH RIGHT HOOK;Ll;0;L;;;;;N;;;;;
+2C72;LATIN CAPITAL LETTER W WITH HOOK;Lu;0;L;;;;;N;;;;2C73;
+2C73;LATIN SMALL LETTER W WITH HOOK;Ll;0;L;;;;;N;;;2C72;;2C72
+2C74;LATIN SMALL LETTER V WITH CURL;Ll;0;L;;;;;N;;;;;
+2C75;LATIN CAPITAL LETTER HALF H;Lu;0;L;;;;;N;;;;2C76;
+2C76;LATIN SMALL LETTER HALF H;Ll;0;L;;;;;N;;;2C75;;2C75
+2C77;LATIN SMALL LETTER TAILLESS PHI;Ll;0;L;;;;;N;;;;;
+2C78;LATIN SMALL LETTER E WITH NOTCH;Ll;0;L;;;;;N;;;;;
+2C79;LATIN SMALL LETTER TURNED R WITH TAIL;Ll;0;L;;;;;N;;;;;
+2C7A;LATIN SMALL LETTER O WITH LOW RING INSIDE;Ll;0;L;;;;;N;;;;;
+2C7B;LATIN LETTER SMALL CAPITAL TURNED E;Ll;0;L;;;;;N;;;;;
+2C7C;LATIN SUBSCRIPT SMALL LETTER J;Ll;0;L;<sub> 006A;;;;N;;;;;
+2C7D;MODIFIER LETTER CAPITAL V;Lm;0;L;<super> 0056;;;;N;;;;;
+2C80;COPTIC CAPITAL LETTER ALFA;Lu;0;L;;;;;N;;;;2C81;
+2C81;COPTIC SMALL LETTER ALFA;Ll;0;L;;;;;N;;;2C80;;2C80
+2C82;COPTIC CAPITAL LETTER VIDA;Lu;0;L;;;;;N;;;;2C83;
+2C83;COPTIC SMALL LETTER VIDA;Ll;0;L;;;;;N;;;2C82;;2C82
+2C84;COPTIC CAPITAL LETTER GAMMA;Lu;0;L;;;;;N;;;;2C85;
+2C85;COPTIC SMALL LETTER GAMMA;Ll;0;L;;;;;N;;;2C84;;2C84
+2C86;COPTIC CAPITAL LETTER DALDA;Lu;0;L;;;;;N;;;;2C87;
+2C87;COPTIC SMALL LETTER DALDA;Ll;0;L;;;;;N;;;2C86;;2C86
+2C88;COPTIC CAPITAL LETTER EIE;Lu;0;L;;;;;N;;;;2C89;
+2C89;COPTIC SMALL LETTER EIE;Ll;0;L;;;;;N;;;2C88;;2C88
+2C8A;COPTIC CAPITAL LETTER SOU;Lu;0;L;;;;;N;;;;2C8B;
+2C8B;COPTIC SMALL LETTER SOU;Ll;0;L;;;;;N;;;2C8A;;2C8A
+2C8C;COPTIC CAPITAL LETTER ZATA;Lu;0;L;;;;;N;;;;2C8D;
+2C8D;COPTIC SMALL LETTER ZATA;Ll;0;L;;;;;N;;;2C8C;;2C8C
+2C8E;COPTIC CAPITAL LETTER HATE;Lu;0;L;;;;;N;;;;2C8F;
+2C8F;COPTIC SMALL LETTER HATE;Ll;0;L;;;;;N;;;2C8E;;2C8E
+2C90;COPTIC CAPITAL LETTER THETHE;Lu;0;L;;;;;N;;;;2C91;
+2C91;COPTIC SMALL LETTER THETHE;Ll;0;L;;;;;N;;;2C90;;2C90
+2C92;COPTIC CAPITAL LETTER IAUDA;Lu;0;L;;;;;N;;;;2C93;
+2C93;COPTIC SMALL LETTER IAUDA;Ll;0;L;;;;;N;;;2C92;;2C92
+2C94;COPTIC CAPITAL LETTER KAPA;Lu;0;L;;;;;N;;;;2C95;
+2C95;COPTIC SMALL LETTER KAPA;Ll;0;L;;;;;N;;;2C94;;2C94
+2C96;COPTIC CAPITAL LETTER LAULA;Lu;0;L;;;;;N;;;;2C97;
+2C97;COPTIC SMALL LETTER LAULA;Ll;0;L;;;;;N;;;2C96;;2C96
+2C98;COPTIC CAPITAL LETTER MI;Lu;0;L;;;;;N;;;;2C99;
+2C99;COPTIC SMALL LETTER MI;Ll;0;L;;;;;N;;;2C98;;2C98
+2C9A;COPTIC CAPITAL LETTER NI;Lu;0;L;;;;;N;;;;2C9B;
+2C9B;COPTIC SMALL LETTER NI;Ll;0;L;;;;;N;;;2C9A;;2C9A
+2C9C;COPTIC CAPITAL LETTER KSI;Lu;0;L;;;;;N;;;;2C9D;
+2C9D;COPTIC SMALL LETTER KSI;Ll;0;L;;;;;N;;;2C9C;;2C9C
+2C9E;COPTIC CAPITAL LETTER O;Lu;0;L;;;;;N;;;;2C9F;
+2C9F;COPTIC SMALL LETTER O;Ll;0;L;;;;;N;;;2C9E;;2C9E
+2CA0;COPTIC CAPITAL LETTER PI;Lu;0;L;;;;;N;;;;2CA1;
+2CA1;COPTIC SMALL LETTER PI;Ll;0;L;;;;;N;;;2CA0;;2CA0
+2CA2;COPTIC CAPITAL LETTER RO;Lu;0;L;;;;;N;;;;2CA3;
+2CA3;COPTIC SMALL LETTER RO;Ll;0;L;;;;;N;;;2CA2;;2CA2
+2CA4;COPTIC CAPITAL LETTER SIMA;Lu;0;L;;;;;N;;;;2CA5;
+2CA5;COPTIC SMALL LETTER SIMA;Ll;0;L;;;;;N;;;2CA4;;2CA4
+2CA6;COPTIC CAPITAL LETTER TAU;Lu;0;L;;;;;N;;;;2CA7;
+2CA7;COPTIC SMALL LETTER TAU;Ll;0;L;;;;;N;;;2CA6;;2CA6
+2CA8;COPTIC CAPITAL LETTER UA;Lu;0;L;;;;;N;;;;2CA9;
+2CA9;COPTIC SMALL LETTER UA;Ll;0;L;;;;;N;;;2CA8;;2CA8
+2CAA;COPTIC CAPITAL LETTER FI;Lu;0;L;;;;;N;;;;2CAB;
+2CAB;COPTIC SMALL LETTER FI;Ll;0;L;;;;;N;;;2CAA;;2CAA
+2CAC;COPTIC CAPITAL LETTER KHI;Lu;0;L;;;;;N;;;;2CAD;
+2CAD;COPTIC SMALL LETTER KHI;Ll;0;L;;;;;N;;;2CAC;;2CAC
+2CAE;COPTIC CAPITAL LETTER PSI;Lu;0;L;;;;;N;;;;2CAF;
+2CAF;COPTIC SMALL LETTER PSI;Ll;0;L;;;;;N;;;2CAE;;2CAE
+2CB0;COPTIC CAPITAL LETTER OOU;Lu;0;L;;;;;N;;;;2CB1;
+2CB1;COPTIC SMALL LETTER OOU;Ll;0;L;;;;;N;;;2CB0;;2CB0
+2CB2;COPTIC CAPITAL LETTER DIALECT-P ALEF;Lu;0;L;;;;;N;;;;2CB3;
+2CB3;COPTIC SMALL LETTER DIALECT-P ALEF;Ll;0;L;;;;;N;;;2CB2;;2CB2
+2CB4;COPTIC CAPITAL LETTER OLD COPTIC AIN;Lu;0;L;;;;;N;;;;2CB5;
+2CB5;COPTIC SMALL LETTER OLD COPTIC AIN;Ll;0;L;;;;;N;;;2CB4;;2CB4
+2CB6;COPTIC CAPITAL LETTER CRYPTOGRAMMIC EIE;Lu;0;L;;;;;N;;;;2CB7;
+2CB7;COPTIC SMALL LETTER CRYPTOGRAMMIC EIE;Ll;0;L;;;;;N;;;2CB6;;2CB6
+2CB8;COPTIC CAPITAL LETTER DIALECT-P KAPA;Lu;0;L;;;;;N;;;;2CB9;
+2CB9;COPTIC SMALL LETTER DIALECT-P KAPA;Ll;0;L;;;;;N;;;2CB8;;2CB8
+2CBA;COPTIC CAPITAL LETTER DIALECT-P NI;Lu;0;L;;;;;N;;;;2CBB;
+2CBB;COPTIC SMALL LETTER DIALECT-P NI;Ll;0;L;;;;;N;;;2CBA;;2CBA
+2CBC;COPTIC CAPITAL LETTER CRYPTOGRAMMIC NI;Lu;0;L;;;;;N;;;;2CBD;
+2CBD;COPTIC SMALL LETTER CRYPTOGRAMMIC NI;Ll;0;L;;;;;N;;;2CBC;;2CBC
+2CBE;COPTIC CAPITAL LETTER OLD COPTIC OOU;Lu;0;L;;;;;N;;;;2CBF;
+2CBF;COPTIC SMALL LETTER OLD COPTIC OOU;Ll;0;L;;;;;N;;;2CBE;;2CBE
+2CC0;COPTIC CAPITAL LETTER SAMPI;Lu;0;L;;;;;N;;;;2CC1;
+2CC1;COPTIC SMALL LETTER SAMPI;Ll;0;L;;;;;N;;;2CC0;;2CC0
+2CC2;COPTIC CAPITAL LETTER CROSSED SHEI;Lu;0;L;;;;;N;;;;2CC3;
+2CC3;COPTIC SMALL LETTER CROSSED SHEI;Ll;0;L;;;;;N;;;2CC2;;2CC2
+2CC4;COPTIC CAPITAL LETTER OLD COPTIC SHEI;Lu;0;L;;;;;N;;;;2CC5;
+2CC5;COPTIC SMALL LETTER OLD COPTIC SHEI;Ll;0;L;;;;;N;;;2CC4;;2CC4
+2CC6;COPTIC CAPITAL LETTER OLD COPTIC ESH;Lu;0;L;;;;;N;;;;2CC7;
+2CC7;COPTIC SMALL LETTER OLD COPTIC ESH;Ll;0;L;;;;;N;;;2CC6;;2CC6
+2CC8;COPTIC CAPITAL LETTER AKHMIMIC KHEI;Lu;0;L;;;;;N;;;;2CC9;
+2CC9;COPTIC SMALL LETTER AKHMIMIC KHEI;Ll;0;L;;;;;N;;;2CC8;;2CC8
+2CCA;COPTIC CAPITAL LETTER DIALECT-P HORI;Lu;0;L;;;;;N;;;;2CCB;
+2CCB;COPTIC SMALL LETTER DIALECT-P HORI;Ll;0;L;;;;;N;;;2CCA;;2CCA
+2CCC;COPTIC CAPITAL LETTER OLD COPTIC HORI;Lu;0;L;;;;;N;;;;2CCD;
+2CCD;COPTIC SMALL LETTER OLD COPTIC HORI;Ll;0;L;;;;;N;;;2CCC;;2CCC
+2CCE;COPTIC CAPITAL LETTER OLD COPTIC HA;Lu;0;L;;;;;N;;;;2CCF;
+2CCF;COPTIC SMALL LETTER OLD COPTIC HA;Ll;0;L;;;;;N;;;2CCE;;2CCE
+2CD0;COPTIC CAPITAL LETTER L-SHAPED HA;Lu;0;L;;;;;N;;;;2CD1;
+2CD1;COPTIC SMALL LETTER L-SHAPED HA;Ll;0;L;;;;;N;;;2CD0;;2CD0
+2CD2;COPTIC CAPITAL LETTER OLD COPTIC HEI;Lu;0;L;;;;;N;;;;2CD3;
+2CD3;COPTIC SMALL LETTER OLD COPTIC HEI;Ll;0;L;;;;;N;;;2CD2;;2CD2
+2CD4;COPTIC CAPITAL LETTER OLD COPTIC HAT;Lu;0;L;;;;;N;;;;2CD5;
+2CD5;COPTIC SMALL LETTER OLD COPTIC HAT;Ll;0;L;;;;;N;;;2CD4;;2CD4
+2CD6;COPTIC CAPITAL LETTER OLD COPTIC GANGIA;Lu;0;L;;;;;N;;;;2CD7;
+2CD7;COPTIC SMALL LETTER OLD COPTIC GANGIA;Ll;0;L;;;;;N;;;2CD6;;2CD6
+2CD8;COPTIC CAPITAL LETTER OLD COPTIC DJA;Lu;0;L;;;;;N;;;;2CD9;
+2CD9;COPTIC SMALL LETTER OLD COPTIC DJA;Ll;0;L;;;;;N;;;2CD8;;2CD8
+2CDA;COPTIC CAPITAL LETTER OLD COPTIC SHIMA;Lu;0;L;;;;;N;;;;2CDB;
+2CDB;COPTIC SMALL LETTER OLD COPTIC SHIMA;Ll;0;L;;;;;N;;;2CDA;;2CDA
+2CDC;COPTIC CAPITAL LETTER OLD NUBIAN SHIMA;Lu;0;L;;;;;N;;;;2CDD;
+2CDD;COPTIC SMALL LETTER OLD NUBIAN SHIMA;Ll;0;L;;;;;N;;;2CDC;;2CDC
+2CDE;COPTIC CAPITAL LETTER OLD NUBIAN NGI;Lu;0;L;;;;;N;;;;2CDF;
+2CDF;COPTIC SMALL LETTER OLD NUBIAN NGI;Ll;0;L;;;;;N;;;2CDE;;2CDE
+2CE0;COPTIC CAPITAL LETTER OLD NUBIAN NYI;Lu;0;L;;;;;N;;;;2CE1;
+2CE1;COPTIC SMALL LETTER OLD NUBIAN NYI;Ll;0;L;;;;;N;;;2CE0;;2CE0
+2CE2;COPTIC CAPITAL LETTER OLD NUBIAN WAU;Lu;0;L;;;;;N;;;;2CE3;
+2CE3;COPTIC SMALL LETTER OLD NUBIAN WAU;Ll;0;L;;;;;N;;;2CE2;;2CE2
+2CE4;COPTIC SYMBOL KAI;Ll;0;L;;;;;N;;;;;
+2CE5;COPTIC SYMBOL MI RO;So;0;ON;;;;;N;;;;;
+2CE6;COPTIC SYMBOL PI RO;So;0;ON;;;;;N;;;;;
+2CE7;COPTIC SYMBOL STAUROS;So;0;ON;;;;;N;;;;;
+2CE8;COPTIC SYMBOL TAU RO;So;0;ON;;;;;N;;;;;
+2CE9;COPTIC SYMBOL KHI RO;So;0;ON;;;;;N;;;;;
+2CEA;COPTIC SYMBOL SHIMA SIMA;So;0;ON;;;;;N;;;;;
+2CF9;COPTIC OLD NUBIAN FULL STOP;Po;0;ON;;;;;N;;;;;
+2CFA;COPTIC OLD NUBIAN DIRECT QUESTION MARK;Po;0;ON;;;;;N;;;;;
+2CFB;COPTIC OLD NUBIAN INDIRECT QUESTION MARK;Po;0;ON;;;;;N;;;;;
+2CFC;COPTIC OLD NUBIAN VERSE DIVIDER;Po;0;ON;;;;;N;;;;;
+2CFD;COPTIC FRACTION ONE HALF;No;0;ON;;;;1/2;N;;;;;
+2CFE;COPTIC FULL STOP;Po;0;ON;;;;;N;;;;;
+2CFF;COPTIC MORPHOLOGICAL DIVIDER;Po;0;ON;;;;;N;;;;;
+2D00;GEORGIAN SMALL LETTER AN;Ll;0;L;;;;;N;;Khutsuri;10A0;;10A0
+2D01;GEORGIAN SMALL LETTER BAN;Ll;0;L;;;;;N;;Khutsuri;10A1;;10A1
+2D02;GEORGIAN SMALL LETTER GAN;Ll;0;L;;;;;N;;Khutsuri;10A2;;10A2
+2D03;GEORGIAN SMALL LETTER DON;Ll;0;L;;;;;N;;Khutsuri;10A3;;10A3
+2D04;GEORGIAN SMALL LETTER EN;Ll;0;L;;;;;N;;Khutsuri;10A4;;10A4
+2D05;GEORGIAN SMALL LETTER VIN;Ll;0;L;;;;;N;;Khutsuri;10A5;;10A5
+2D06;GEORGIAN SMALL LETTER ZEN;Ll;0;L;;;;;N;;Khutsuri;10A6;;10A6
+2D07;GEORGIAN SMALL LETTER TAN;Ll;0;L;;;;;N;;Khutsuri;10A7;;10A7
+2D08;GEORGIAN SMALL LETTER IN;Ll;0;L;;;;;N;;Khutsuri;10A8;;10A8
+2D09;GEORGIAN SMALL LETTER KAN;Ll;0;L;;;;;N;;Khutsuri;10A9;;10A9
+2D0A;GEORGIAN SMALL LETTER LAS;Ll;0;L;;;;;N;;Khutsuri;10AA;;10AA
+2D0B;GEORGIAN SMALL LETTER MAN;Ll;0;L;;;;;N;;Khutsuri;10AB;;10AB
+2D0C;GEORGIAN SMALL LETTER NAR;Ll;0;L;;;;;N;;Khutsuri;10AC;;10AC
+2D0D;GEORGIAN SMALL LETTER ON;Ll;0;L;;;;;N;;Khutsuri;10AD;;10AD
+2D0E;GEORGIAN SMALL LETTER PAR;Ll;0;L;;;;;N;;Khutsuri;10AE;;10AE
+2D0F;GEORGIAN SMALL LETTER ZHAR;Ll;0;L;;;;;N;;Khutsuri;10AF;;10AF
+2D10;GEORGIAN SMALL LETTER RAE;Ll;0;L;;;;;N;;Khutsuri;10B0;;10B0
+2D11;GEORGIAN SMALL LETTER SAN;Ll;0;L;;;;;N;;Khutsuri;10B1;;10B1
+2D12;GEORGIAN SMALL LETTER TAR;Ll;0;L;;;;;N;;Khutsuri;10B2;;10B2
+2D13;GEORGIAN SMALL LETTER UN;Ll;0;L;;;;;N;;Khutsuri;10B3;;10B3
+2D14;GEORGIAN SMALL LETTER PHAR;Ll;0;L;;;;;N;;Khutsuri;10B4;;10B4
+2D15;GEORGIAN SMALL LETTER KHAR;Ll;0;L;;;;;N;;Khutsuri;10B5;;10B5
+2D16;GEORGIAN SMALL LETTER GHAN;Ll;0;L;;;;;N;;Khutsuri;10B6;;10B6
+2D17;GEORGIAN SMALL LETTER QAR;Ll;0;L;;;;;N;;Khutsuri;10B7;;10B7
+2D18;GEORGIAN SMALL LETTER SHIN;Ll;0;L;;;;;N;;Khutsuri;10B8;;10B8
+2D19;GEORGIAN SMALL LETTER CHIN;Ll;0;L;;;;;N;;Khutsuri;10B9;;10B9
+2D1A;GEORGIAN SMALL LETTER CAN;Ll;0;L;;;;;N;;Khutsuri;10BA;;10BA
+2D1B;GEORGIAN SMALL LETTER JIL;Ll;0;L;;;;;N;;Khutsuri;10BB;;10BB
+2D1C;GEORGIAN SMALL LETTER CIL;Ll;0;L;;;;;N;;Khutsuri;10BC;;10BC
+2D1D;GEORGIAN SMALL LETTER CHAR;Ll;0;L;;;;;N;;Khutsuri;10BD;;10BD
+2D1E;GEORGIAN SMALL LETTER XAN;Ll;0;L;;;;;N;;Khutsuri;10BE;;10BE
+2D1F;GEORGIAN SMALL LETTER JHAN;Ll;0;L;;;;;N;;Khutsuri;10BF;;10BF
+2D20;GEORGIAN SMALL LETTER HAE;Ll;0;L;;;;;N;;Khutsuri;10C0;;10C0
+2D21;GEORGIAN SMALL LETTER HE;Ll;0;L;;;;;N;;Khutsuri;10C1;;10C1
+2D22;GEORGIAN SMALL LETTER HIE;Ll;0;L;;;;;N;;Khutsuri;10C2;;10C2
+2D23;GEORGIAN SMALL LETTER WE;Ll;0;L;;;;;N;;Khutsuri;10C3;;10C3
+2D24;GEORGIAN SMALL LETTER HAR;Ll;0;L;;;;;N;;Khutsuri;10C4;;10C4
+2D25;GEORGIAN SMALL LETTER HOE;Ll;0;L;;;;;N;;Khutsuri;10C5;;10C5
+2D30;TIFINAGH LETTER YA;Lo;0;L;;;;;N;;;;;
+2D31;TIFINAGH LETTER YAB;Lo;0;L;;;;;N;;;;;
+2D32;TIFINAGH LETTER YABH;Lo;0;L;;;;;N;;;;;
+2D33;TIFINAGH LETTER YAG;Lo;0;L;;;;;N;;;;;
+2D34;TIFINAGH LETTER YAGHH;Lo;0;L;;;;;N;;;;;
+2D35;TIFINAGH LETTER BERBER ACADEMY YAJ;Lo;0;L;;;;;N;;;;;
+2D36;TIFINAGH LETTER YAJ;Lo;0;L;;;;;N;;;;;
+2D37;TIFINAGH LETTER YAD;Lo;0;L;;;;;N;;;;;
+2D38;TIFINAGH LETTER YADH;Lo;0;L;;;;;N;;;;;
+2D39;TIFINAGH LETTER YADD;Lo;0;L;;;;;N;;;;;
+2D3A;TIFINAGH LETTER YADDH;Lo;0;L;;;;;N;;;;;
+2D3B;TIFINAGH LETTER YEY;Lo;0;L;;;;;N;;;;;
+2D3C;TIFINAGH LETTER YAF;Lo;0;L;;;;;N;;;;;
+2D3D;TIFINAGH LETTER YAK;Lo;0;L;;;;;N;;;;;
+2D3E;TIFINAGH LETTER TUAREG YAK;Lo;0;L;;;;;N;;;;;
+2D3F;TIFINAGH LETTER YAKHH;Lo;0;L;;;;;N;;;;;
+2D40;TIFINAGH LETTER YAH;Lo;0;L;;;;;N;;Tuareg yab;;;
+2D41;TIFINAGH LETTER BERBER ACADEMY YAH;Lo;0;L;;;;;N;;;;;
+2D42;TIFINAGH LETTER TUAREG YAH;Lo;0;L;;;;;N;;;;;
+2D43;TIFINAGH LETTER YAHH;Lo;0;L;;;;;N;;;;;
+2D44;TIFINAGH LETTER YAA;Lo;0;L;;;;;N;;;;;
+2D45;TIFINAGH LETTER YAKH;Lo;0;L;;;;;N;;;;;
+2D46;TIFINAGH LETTER TUAREG YAKH;Lo;0;L;;;;;N;;;;;
+2D47;TIFINAGH LETTER YAQ;Lo;0;L;;;;;N;;;;;
+2D48;TIFINAGH LETTER TUAREG YAQ;Lo;0;L;;;;;N;;;;;
+2D49;TIFINAGH LETTER YI;Lo;0;L;;;;;N;;;;;
+2D4A;TIFINAGH LETTER YAZH;Lo;0;L;;;;;N;;;;;
+2D4B;TIFINAGH LETTER AHAGGAR YAZH;Lo;0;L;;;;;N;;;;;
+2D4C;TIFINAGH LETTER TUAREG YAZH;Lo;0;L;;;;;N;;;;;
+2D4D;TIFINAGH LETTER YAL;Lo;0;L;;;;;N;;;;;
+2D4E;TIFINAGH LETTER YAM;Lo;0;L;;;;;N;;;;;
+2D4F;TIFINAGH LETTER YAN;Lo;0;L;;;;;N;;;;;
+2D50;TIFINAGH LETTER TUAREG YAGN;Lo;0;L;;;;;N;;;;;
+2D51;TIFINAGH LETTER TUAREG YANG;Lo;0;L;;;;;N;;;;;
+2D52;TIFINAGH LETTER YAP;Lo;0;L;;;;;N;;;;;
+2D53;TIFINAGH LETTER YU;Lo;0;L;;;;;N;;Tuareg yaw;;;
+2D54;TIFINAGH LETTER YAR;Lo;0;L;;;;;N;;;;;
+2D55;TIFINAGH LETTER YARR;Lo;0;L;;;;;N;;;;;
+2D56;TIFINAGH LETTER YAGH;Lo;0;L;;;;;N;;;;;
+2D57;TIFINAGH LETTER TUAREG YAGH;Lo;0;L;;;;;N;;;;;
+2D58;TIFINAGH LETTER AYER YAGH;Lo;0;L;;;;;N;;Adrar yaj;;;
+2D59;TIFINAGH LETTER YAS;Lo;0;L;;;;;N;;;;;
+2D5A;TIFINAGH LETTER YASS;Lo;0;L;;;;;N;;;;;
+2D5B;TIFINAGH LETTER YASH;Lo;0;L;;;;;N;;;;;
+2D5C;TIFINAGH LETTER YAT;Lo;0;L;;;;;N;;;;;
+2D5D;TIFINAGH LETTER YATH;Lo;0;L;;;;;N;;;;;
+2D5E;TIFINAGH LETTER YACH;Lo;0;L;;;;;N;;;;;
+2D5F;TIFINAGH LETTER YATT;Lo;0;L;;;;;N;;;;;
+2D60;TIFINAGH LETTER YAV;Lo;0;L;;;;;N;;;;;
+2D61;TIFINAGH LETTER YAW;Lo;0;L;;;;;N;;;;;
+2D62;TIFINAGH LETTER YAY;Lo;0;L;;;;;N;;;;;
+2D63;TIFINAGH LETTER YAZ;Lo;0;L;;;;;N;;;;;
+2D64;TIFINAGH LETTER TAWELLEMET YAZ;Lo;0;L;;;;;N;;harpoon yaz;;;
+2D65;TIFINAGH LETTER YAZZ;Lo;0;L;;;;;N;;;;;
+2D6F;TIFINAGH MODIFIER LETTER LABIALIZATION MARK;Lm;0;L;<super> 2D61;;;;N;;tamatart;;;
+2D80;ETHIOPIC SYLLABLE LOA;Lo;0;L;;;;;N;;;;;
+2D81;ETHIOPIC SYLLABLE MOA;Lo;0;L;;;;;N;;;;;
+2D82;ETHIOPIC SYLLABLE ROA;Lo;0;L;;;;;N;;;;;
+2D83;ETHIOPIC SYLLABLE SOA;Lo;0;L;;;;;N;;;;;
+2D84;ETHIOPIC SYLLABLE SHOA;Lo;0;L;;;;;N;;;;;
+2D85;ETHIOPIC SYLLABLE BOA;Lo;0;L;;;;;N;;;;;
+2D86;ETHIOPIC SYLLABLE TOA;Lo;0;L;;;;;N;;;;;
+2D87;ETHIOPIC SYLLABLE COA;Lo;0;L;;;;;N;;;;;
+2D88;ETHIOPIC SYLLABLE NOA;Lo;0;L;;;;;N;;;;;
+2D89;ETHIOPIC SYLLABLE NYOA;Lo;0;L;;;;;N;;;;;
+2D8A;ETHIOPIC SYLLABLE GLOTTAL OA;Lo;0;L;;;;;N;;;;;
+2D8B;ETHIOPIC SYLLABLE ZOA;Lo;0;L;;;;;N;;;;;
+2D8C;ETHIOPIC SYLLABLE DOA;Lo;0;L;;;;;N;;;;;
+2D8D;ETHIOPIC SYLLABLE DDOA;Lo;0;L;;;;;N;;;;;
+2D8E;ETHIOPIC SYLLABLE JOA;Lo;0;L;;;;;N;;;;;
+2D8F;ETHIOPIC SYLLABLE THOA;Lo;0;L;;;;;N;;;;;
+2D90;ETHIOPIC SYLLABLE CHOA;Lo;0;L;;;;;N;;;;;
+2D91;ETHIOPIC SYLLABLE PHOA;Lo;0;L;;;;;N;;;;;
+2D92;ETHIOPIC SYLLABLE POA;Lo;0;L;;;;;N;;;;;
+2D93;ETHIOPIC SYLLABLE GGWA;Lo;0;L;;;;;N;;;;;
+2D94;ETHIOPIC SYLLABLE GGWI;Lo;0;L;;;;;N;;;;;
+2D95;ETHIOPIC SYLLABLE GGWEE;Lo;0;L;;;;;N;;;;;
+2D96;ETHIOPIC SYLLABLE GGWE;Lo;0;L;;;;;N;;;;;
+2DA0;ETHIOPIC SYLLABLE SSA;Lo;0;L;;;;;N;;;;;
+2DA1;ETHIOPIC SYLLABLE SSU;Lo;0;L;;;;;N;;;;;
+2DA2;ETHIOPIC SYLLABLE SSI;Lo;0;L;;;;;N;;;;;
+2DA3;ETHIOPIC SYLLABLE SSAA;Lo;0;L;;;;;N;;;;;
+2DA4;ETHIOPIC SYLLABLE SSEE;Lo;0;L;;;;;N;;;;;
+2DA5;ETHIOPIC SYLLABLE SSE;Lo;0;L;;;;;N;;;;;
+2DA6;ETHIOPIC SYLLABLE SSO;Lo;0;L;;;;;N;;;;;
+2DA8;ETHIOPIC SYLLABLE CCA;Lo;0;L;;;;;N;;;;;
+2DA9;ETHIOPIC SYLLABLE CCU;Lo;0;L;;;;;N;;;;;
+2DAA;ETHIOPIC SYLLABLE CCI;Lo;0;L;;;;;N;;;;;
+2DAB;ETHIOPIC SYLLABLE CCAA;Lo;0;L;;;;;N;;;;;
+2DAC;ETHIOPIC SYLLABLE CCEE;Lo;0;L;;;;;N;;;;;
+2DAD;ETHIOPIC SYLLABLE CCE;Lo;0;L;;;;;N;;;;;
+2DAE;ETHIOPIC SYLLABLE CCO;Lo;0;L;;;;;N;;;;;
+2DB0;ETHIOPIC SYLLABLE ZZA;Lo;0;L;;;;;N;;;;;
+2DB1;ETHIOPIC SYLLABLE ZZU;Lo;0;L;;;;;N;;;;;
+2DB2;ETHIOPIC SYLLABLE ZZI;Lo;0;L;;;;;N;;;;;
+2DB3;ETHIOPIC SYLLABLE ZZAA;Lo;0;L;;;;;N;;;;;
+2DB4;ETHIOPIC SYLLABLE ZZEE;Lo;0;L;;;;;N;;;;;
+2DB5;ETHIOPIC SYLLABLE ZZE;Lo;0;L;;;;;N;;;;;
+2DB6;ETHIOPIC SYLLABLE ZZO;Lo;0;L;;;;;N;;;;;
+2DB8;ETHIOPIC SYLLABLE CCHA;Lo;0;L;;;;;N;;;;;
+2DB9;ETHIOPIC SYLLABLE CCHU;Lo;0;L;;;;;N;;;;;
+2DBA;ETHIOPIC SYLLABLE CCHI;Lo;0;L;;;;;N;;;;;
+2DBB;ETHIOPIC SYLLABLE CCHAA;Lo;0;L;;;;;N;;;;;
+2DBC;ETHIOPIC SYLLABLE CCHEE;Lo;0;L;;;;;N;;;;;
+2DBD;ETHIOPIC SYLLABLE CCHE;Lo;0;L;;;;;N;;;;;
+2DBE;ETHIOPIC SYLLABLE CCHO;Lo;0;L;;;;;N;;;;;
+2DC0;ETHIOPIC SYLLABLE QYA;Lo;0;L;;;;;N;;;;;
+2DC1;ETHIOPIC SYLLABLE QYU;Lo;0;L;;;;;N;;;;;
+2DC2;ETHIOPIC SYLLABLE QYI;Lo;0;L;;;;;N;;;;;
+2DC3;ETHIOPIC SYLLABLE QYAA;Lo;0;L;;;;;N;;;;;
+2DC4;ETHIOPIC SYLLABLE QYEE;Lo;0;L;;;;;N;;;;;
+2DC5;ETHIOPIC SYLLABLE QYE;Lo;0;L;;;;;N;;;;;
+2DC6;ETHIOPIC SYLLABLE QYO;Lo;0;L;;;;;N;;;;;
+2DC8;ETHIOPIC SYLLABLE KYA;Lo;0;L;;;;;N;;;;;
+2DC9;ETHIOPIC SYLLABLE KYU;Lo;0;L;;;;;N;;;;;
+2DCA;ETHIOPIC SYLLABLE KYI;Lo;0;L;;;;;N;;;;;
+2DCB;ETHIOPIC SYLLABLE KYAA;Lo;0;L;;;;;N;;;;;
+2DCC;ETHIOPIC SYLLABLE KYEE;Lo;0;L;;;;;N;;;;;
+2DCD;ETHIOPIC SYLLABLE KYE;Lo;0;L;;;;;N;;;;;
+2DCE;ETHIOPIC SYLLABLE KYO;Lo;0;L;;;;;N;;;;;
+2DD0;ETHIOPIC SYLLABLE XYA;Lo;0;L;;;;;N;;;;;
+2DD1;ETHIOPIC SYLLABLE XYU;Lo;0;L;;;;;N;;;;;
+2DD2;ETHIOPIC SYLLABLE XYI;Lo;0;L;;;;;N;;;;;
+2DD3;ETHIOPIC SYLLABLE XYAA;Lo;0;L;;;;;N;;;;;
+2DD4;ETHIOPIC SYLLABLE XYEE;Lo;0;L;;;;;N;;;;;
+2DD5;ETHIOPIC SYLLABLE XYE;Lo;0;L;;;;;N;;;;;
+2DD6;ETHIOPIC SYLLABLE XYO;Lo;0;L;;;;;N;;;;;
+2DD8;ETHIOPIC SYLLABLE GYA;Lo;0;L;;;;;N;;;;;
+2DD9;ETHIOPIC SYLLABLE GYU;Lo;0;L;;;;;N;;;;;
+2DDA;ETHIOPIC SYLLABLE GYI;Lo;0;L;;;;;N;;;;;
+2DDB;ETHIOPIC SYLLABLE GYAA;Lo;0;L;;;;;N;;;;;
+2DDC;ETHIOPIC SYLLABLE GYEE;Lo;0;L;;;;;N;;;;;
+2DDD;ETHIOPIC SYLLABLE GYE;Lo;0;L;;;;;N;;;;;
+2DDE;ETHIOPIC SYLLABLE GYO;Lo;0;L;;;;;N;;;;;
+2DE0;COMBINING CYRILLIC LETTER BE;Mn;230;NSM;;;;;N;;;;;
+2DE1;COMBINING CYRILLIC LETTER VE;Mn;230;NSM;;;;;N;;;;;
+2DE2;COMBINING CYRILLIC LETTER GHE;Mn;230;NSM;;;;;N;;;;;
+2DE3;COMBINING CYRILLIC LETTER DE;Mn;230;NSM;;;;;N;;;;;
+2DE4;COMBINING CYRILLIC LETTER ZHE;Mn;230;NSM;;;;;N;;;;;
+2DE5;COMBINING CYRILLIC LETTER ZE;Mn;230;NSM;;;;;N;;;;;
+2DE6;COMBINING CYRILLIC LETTER KA;Mn;230;NSM;;;;;N;;;;;
+2DE7;COMBINING CYRILLIC LETTER EL;Mn;230;NSM;;;;;N;;;;;
+2DE8;COMBINING CYRILLIC LETTER EM;Mn;230;NSM;;;;;N;;;;;
+2DE9;COMBINING CYRILLIC LETTER EN;Mn;230;NSM;;;;;N;;;;;
+2DEA;COMBINING CYRILLIC LETTER O;Mn;230;NSM;;;;;N;;;;;
+2DEB;COMBINING CYRILLIC LETTER PE;Mn;230;NSM;;;;;N;;;;;
+2DEC;COMBINING CYRILLIC LETTER ER;Mn;230;NSM;;;;;N;;;;;
+2DED;COMBINING CYRILLIC LETTER ES;Mn;230;NSM;;;;;N;;;;;
+2DEE;COMBINING CYRILLIC LETTER TE;Mn;230;NSM;;;;;N;;;;;
+2DEF;COMBINING CYRILLIC LETTER HA;Mn;230;NSM;;;;;N;;;;;
+2DF0;COMBINING CYRILLIC LETTER TSE;Mn;230;NSM;;;;;N;;;;;
+2DF1;COMBINING CYRILLIC LETTER CHE;Mn;230;NSM;;;;;N;;;;;
+2DF2;COMBINING CYRILLIC LETTER SHA;Mn;230;NSM;;;;;N;;;;;
+2DF3;COMBINING CYRILLIC LETTER SHCHA;Mn;230;NSM;;;;;N;;;;;
+2DF4;COMBINING CYRILLIC LETTER FITA;Mn;230;NSM;;;;;N;;;;;
+2DF5;COMBINING CYRILLIC LETTER ES-TE;Mn;230;NSM;;;;;N;;;;;
+2DF6;COMBINING CYRILLIC LETTER A;Mn;230;NSM;;;;;N;;;;;
+2DF7;COMBINING CYRILLIC LETTER IE;Mn;230;NSM;;;;;N;;;;;
+2DF8;COMBINING CYRILLIC LETTER DJERV;Mn;230;NSM;;;;;N;;;;;
+2DF9;COMBINING CYRILLIC LETTER MONOGRAPH UK;Mn;230;NSM;;;;;N;;;;;
+2DFA;COMBINING CYRILLIC LETTER YAT;Mn;230;NSM;;;;;N;;;;;
+2DFB;COMBINING CYRILLIC LETTER YU;Mn;230;NSM;;;;;N;;;;;
+2DFC;COMBINING CYRILLIC LETTER IOTIFIED A;Mn;230;NSM;;;;;N;;;;;
+2DFD;COMBINING CYRILLIC LETTER LITTLE YUS;Mn;230;NSM;;;;;N;;;;;
+2DFE;COMBINING CYRILLIC LETTER BIG YUS;Mn;230;NSM;;;;;N;;;;;
+2DFF;COMBINING CYRILLIC LETTER IOTIFIED BIG YUS;Mn;230;NSM;;;;;N;;;;;
+2E00;RIGHT ANGLE SUBSTITUTION MARKER;Po;0;ON;;;;;N;;;;;
+2E01;RIGHT ANGLE DOTTED SUBSTITUTION MARKER;Po;0;ON;;;;;N;;;;;
+2E02;LEFT SUBSTITUTION BRACKET;Pi;0;ON;;;;;Y;;;;;
+2E03;RIGHT SUBSTITUTION BRACKET;Pf;0;ON;;;;;Y;;;;;
+2E04;LEFT DOTTED SUBSTITUTION BRACKET;Pi;0;ON;;;;;Y;;;;;
+2E05;RIGHT DOTTED SUBSTITUTION BRACKET;Pf;0;ON;;;;;Y;;;;;
+2E06;RAISED INTERPOLATION MARKER;Po;0;ON;;;;;N;;;;;
+2E07;RAISED DOTTED INTERPOLATION MARKER;Po;0;ON;;;;;N;;;;;
+2E08;DOTTED TRANSPOSITION MARKER;Po;0;ON;;;;;N;;;;;
+2E09;LEFT TRANSPOSITION BRACKET;Pi;0;ON;;;;;Y;;;;;
+2E0A;RIGHT TRANSPOSITION BRACKET;Pf;0;ON;;;;;Y;;;;;
+2E0B;RAISED SQUARE;Po;0;ON;;;;;N;;;;;
+2E0C;LEFT RAISED OMISSION BRACKET;Pi;0;ON;;;;;Y;;;;;
+2E0D;RIGHT RAISED OMISSION BRACKET;Pf;0;ON;;;;;Y;;;;;
+2E0E;EDITORIAL CORONIS;Po;0;ON;;;;;N;;;;;
+2E0F;PARAGRAPHOS;Po;0;ON;;;;;N;;;;;
+2E10;FORKED PARAGRAPHOS;Po;0;ON;;;;;N;;;;;
+2E11;REVERSED FORKED PARAGRAPHOS;Po;0;ON;;;;;N;;;;;
+2E12;HYPODIASTOLE;Po;0;ON;;;;;N;;;;;
+2E13;DOTTED OBELOS;Po;0;ON;;;;;N;;;;;
+2E14;DOWNWARDS ANCORA;Po;0;ON;;;;;N;;;;;
+2E15;UPWARDS ANCORA;Po;0;ON;;;;;N;;;;;
+2E16;DOTTED RIGHT-POINTING ANGLE;Po;0;ON;;;;;N;;;;;
+2E17;DOUBLE OBLIQUE HYPHEN;Pd;0;ON;;;;;N;;;;;
+2E18;INVERTED INTERROBANG;Po;0;ON;;;;;N;;;;;
+2E19;PALM BRANCH;Po;0;ON;;;;;N;;;;;
+2E1A;HYPHEN WITH DIAERESIS;Pd;0;ON;;;;;N;;;;;
+2E1B;TILDE WITH RING ABOVE;Po;0;ON;;;;;N;;;;;
+2E1C;LEFT LOW PARAPHRASE BRACKET;Pi;0;ON;;;;;Y;;;;;
+2E1D;RIGHT LOW PARAPHRASE BRACKET;Pf;0;ON;;;;;Y;;;;;
+2E1E;TILDE WITH DOT ABOVE;Po;0;ON;;;;;N;;;;;
+2E1F;TILDE WITH DOT BELOW;Po;0;ON;;;;;N;;;;;
+2E20;LEFT VERTICAL BAR WITH QUILL;Pi;0;ON;;;;;Y;;;;;
+2E21;RIGHT VERTICAL BAR WITH QUILL;Pf;0;ON;;;;;Y;;;;;
+2E22;TOP LEFT HALF BRACKET;Ps;0;ON;;;;;Y;;;;;
+2E23;TOP RIGHT HALF BRACKET;Pe;0;ON;;;;;Y;;;;;
+2E24;BOTTOM LEFT HALF BRACKET;Ps;0;ON;;;;;Y;;;;;
+2E25;BOTTOM RIGHT HALF BRACKET;Pe;0;ON;;;;;Y;;;;;
+2E26;LEFT SIDEWAYS U BRACKET;Ps;0;ON;;;;;Y;;;;;
+2E27;RIGHT SIDEWAYS U BRACKET;Pe;0;ON;;;;;Y;;;;;
+2E28;LEFT DOUBLE PARENTHESIS;Ps;0;ON;;;;;Y;;;;;
+2E29;RIGHT DOUBLE PARENTHESIS;Pe;0;ON;;;;;Y;;;;;
+2E2A;TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+2E2B;ONE DOT OVER TWO DOTS PUNCTUATION;Po;0;ON;;;;;N;;;;;
+2E2C;SQUARED FOUR DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+2E2D;FIVE DOT MARK;Po;0;ON;;;;;N;;;;;
+2E2E;REVERSED QUESTION MARK;Po;0;ON;;;;;N;;;;;
+2E2F;VERTICAL TILDE;Lm;0;ON;;;;;N;;;;;
+2E30;RING POINT;Po;0;ON;;;;;N;;;;;
+2E80;CJK RADICAL REPEAT;So;0;ON;;;;;N;;;;;
+2E81;CJK RADICAL CLIFF;So;0;ON;;;;;N;;;;;
+2E82;CJK RADICAL SECOND ONE;So;0;ON;;;;;N;;;;;
+2E83;CJK RADICAL SECOND TWO;So;0;ON;;;;;N;;;;;
+2E84;CJK RADICAL SECOND THREE;So;0;ON;;;;;N;;;;;
+2E85;CJK RADICAL PERSON;So;0;ON;;;;;N;;;;;
+2E86;CJK RADICAL BOX;So;0;ON;;;;;N;;;;;
+2E87;CJK RADICAL TABLE;So;0;ON;;;;;N;;;;;
+2E88;CJK RADICAL KNIFE ONE;So;0;ON;;;;;N;;;;;
+2E89;CJK RADICAL KNIFE TWO;So;0;ON;;;;;N;;;;;
+2E8A;CJK RADICAL DIVINATION;So;0;ON;;;;;N;;;;;
+2E8B;CJK RADICAL SEAL;So;0;ON;;;;;N;;;;;
+2E8C;CJK RADICAL SMALL ONE;So;0;ON;;;;;N;;;;;
+2E8D;CJK RADICAL SMALL TWO;So;0;ON;;;;;N;;;;;
+2E8E;CJK RADICAL LAME ONE;So;0;ON;;;;;N;;;;;
+2E8F;CJK RADICAL LAME TWO;So;0;ON;;;;;N;;;;;
+2E90;CJK RADICAL LAME THREE;So;0;ON;;;;;N;;;;;
+2E91;CJK RADICAL LAME FOUR;So;0;ON;;;;;N;;;;;
+2E92;CJK RADICAL SNAKE;So;0;ON;;;;;N;;;;;
+2E93;CJK RADICAL THREAD;So;0;ON;;;;;N;;;;;
+2E94;CJK RADICAL SNOUT ONE;So;0;ON;;;;;N;;;;;
+2E95;CJK RADICAL SNOUT TWO;So;0;ON;;;;;N;;;;;
+2E96;CJK RADICAL HEART ONE;So;0;ON;;;;;N;;;;;
+2E97;CJK RADICAL HEART TWO;So;0;ON;;;;;N;;;;;
+2E98;CJK RADICAL HAND;So;0;ON;;;;;N;;;;;
+2E99;CJK RADICAL RAP;So;0;ON;;;;;N;;;;;
+2E9B;CJK RADICAL CHOKE;So;0;ON;;;;;N;;;;;
+2E9C;CJK RADICAL SUN;So;0;ON;;;;;N;;;;;
+2E9D;CJK RADICAL MOON;So;0;ON;;;;;N;;;;;
+2E9E;CJK RADICAL DEATH;So;0;ON;;;;;N;;;;;
+2E9F;CJK RADICAL MOTHER;So;0;ON;<compat> 6BCD;;;;N;;;;;
+2EA0;CJK RADICAL CIVILIAN;So;0;ON;;;;;N;;;;;
+2EA1;CJK RADICAL WATER ONE;So;0;ON;;;;;N;;;;;
+2EA2;CJK RADICAL WATER TWO;So;0;ON;;;;;N;;;;;
+2EA3;CJK RADICAL FIRE;So;0;ON;;;;;N;;;;;
+2EA4;CJK RADICAL PAW ONE;So;0;ON;;;;;N;;;;;
+2EA5;CJK RADICAL PAW TWO;So;0;ON;;;;;N;;;;;
+2EA6;CJK RADICAL SIMPLIFIED HALF TREE TRUNK;So;0;ON;;;;;N;;;;;
+2EA7;CJK RADICAL COW;So;0;ON;;;;;N;;;;;
+2EA8;CJK RADICAL DOG;So;0;ON;;;;;N;;;;;
+2EA9;CJK RADICAL JADE;So;0;ON;;;;;N;;;;;
+2EAA;CJK RADICAL BOLT OF CLOTH;So;0;ON;;;;;N;;;;;
+2EAB;CJK RADICAL EYE;So;0;ON;;;;;N;;;;;
+2EAC;CJK RADICAL SPIRIT ONE;So;0;ON;;;;;N;;;;;
+2EAD;CJK RADICAL SPIRIT TWO;So;0;ON;;;;;N;;;;;
+2EAE;CJK RADICAL BAMBOO;So;0;ON;;;;;N;;;;;
+2EAF;CJK RADICAL SILK;So;0;ON;;;;;N;;;;;
+2EB0;CJK RADICAL C-SIMPLIFIED SILK;So;0;ON;;;;;N;;;;;
+2EB1;CJK RADICAL NET ONE;So;0;ON;;;;;N;;;;;
+2EB2;CJK RADICAL NET TWO;So;0;ON;;;;;N;;;;;
+2EB3;CJK RADICAL NET THREE;So;0;ON;;;;;N;;;;;
+2EB4;CJK RADICAL NET FOUR;So;0;ON;;;;;N;;;;;
+2EB5;CJK RADICAL MESH;So;0;ON;;;;;N;;;;;
+2EB6;CJK RADICAL SHEEP;So;0;ON;;;;;N;;;;;
+2EB7;CJK RADICAL RAM;So;0;ON;;;;;N;;;;;
+2EB8;CJK RADICAL EWE;So;0;ON;;;;;N;;;;;
+2EB9;CJK RADICAL OLD;So;0;ON;;;;;N;;;;;
+2EBA;CJK RADICAL BRUSH ONE;So;0;ON;;;;;N;;;;;
+2EBB;CJK RADICAL BRUSH TWO;So;0;ON;;;;;N;;;;;
+2EBC;CJK RADICAL MEAT;So;0;ON;;;;;N;;;;;
+2EBD;CJK RADICAL MORTAR;So;0;ON;;;;;N;;;;;
+2EBE;CJK RADICAL GRASS ONE;So;0;ON;;;;;N;;;;;
+2EBF;CJK RADICAL GRASS TWO;So;0;ON;;;;;N;;;;;
+2EC0;CJK RADICAL GRASS THREE;So;0;ON;;;;;N;;;;;
+2EC1;CJK RADICAL TIGER;So;0;ON;;;;;N;;;;;
+2EC2;CJK RADICAL CLOTHES;So;0;ON;;;;;N;;;;;
+2EC3;CJK RADICAL WEST ONE;So;0;ON;;;;;N;;;;;
+2EC4;CJK RADICAL WEST TWO;So;0;ON;;;;;N;;;;;
+2EC5;CJK RADICAL C-SIMPLIFIED SEE;So;0;ON;;;;;N;;;;;
+2EC6;CJK RADICAL SIMPLIFIED HORN;So;0;ON;;;;;N;;;;;
+2EC7;CJK RADICAL HORN;So;0;ON;;;;;N;;;;;
+2EC8;CJK RADICAL C-SIMPLIFIED SPEECH;So;0;ON;;;;;N;;;;;
+2EC9;CJK RADICAL C-SIMPLIFIED SHELL;So;0;ON;;;;;N;;;;;
+2ECA;CJK RADICAL FOOT;So;0;ON;;;;;N;;;;;
+2ECB;CJK RADICAL C-SIMPLIFIED CART;So;0;ON;;;;;N;;;;;
+2ECC;CJK RADICAL SIMPLIFIED WALK;So;0;ON;;;;;N;;;;;
+2ECD;CJK RADICAL WALK ONE;So;0;ON;;;;;N;;;;;
+2ECE;CJK RADICAL WALK TWO;So;0;ON;;;;;N;;;;;
+2ECF;CJK RADICAL CITY;So;0;ON;;;;;N;;;;;
+2ED0;CJK RADICAL C-SIMPLIFIED GOLD;So;0;ON;;;;;N;;;;;
+2ED1;CJK RADICAL LONG ONE;So;0;ON;;;;;N;;;;;
+2ED2;CJK RADICAL LONG TWO;So;0;ON;;;;;N;;;;;
+2ED3;CJK RADICAL C-SIMPLIFIED LONG;So;0;ON;;;;;N;;;;;
+2ED4;CJK RADICAL C-SIMPLIFIED GATE;So;0;ON;;;;;N;;;;;
+2ED5;CJK RADICAL MOUND ONE;So;0;ON;;;;;N;;;;;
+2ED6;CJK RADICAL MOUND TWO;So;0;ON;;;;;N;;;;;
+2ED7;CJK RADICAL RAIN;So;0;ON;;;;;N;;;;;
+2ED8;CJK RADICAL BLUE;So;0;ON;;;;;N;;;;;
+2ED9;CJK RADICAL C-SIMPLIFIED TANNED LEATHER;So;0;ON;;;;;N;;;;;
+2EDA;CJK RADICAL C-SIMPLIFIED LEAF;So;0;ON;;;;;N;;;;;
+2EDB;CJK RADICAL C-SIMPLIFIED WIND;So;0;ON;;;;;N;;;;;
+2EDC;CJK RADICAL C-SIMPLIFIED FLY;So;0;ON;;;;;N;;;;;
+2EDD;CJK RADICAL EAT ONE;So;0;ON;;;;;N;;;;;
+2EDE;CJK RADICAL EAT TWO;So;0;ON;;;;;N;;;;;
+2EDF;CJK RADICAL EAT THREE;So;0;ON;;;;;N;;;;;
+2EE0;CJK RADICAL C-SIMPLIFIED EAT;So;0;ON;;;;;N;;;;;
+2EE1;CJK RADICAL HEAD;So;0;ON;;;;;N;;;;;
+2EE2;CJK RADICAL C-SIMPLIFIED HORSE;So;0;ON;;;;;N;;;;;
+2EE3;CJK RADICAL BONE;So;0;ON;;;;;N;;;;;
+2EE4;CJK RADICAL GHOST;So;0;ON;;;;;N;;;;;
+2EE5;CJK RADICAL C-SIMPLIFIED FISH;So;0;ON;;;;;N;;;;;
+2EE6;CJK RADICAL C-SIMPLIFIED BIRD;So;0;ON;;;;;N;;;;;
+2EE7;CJK RADICAL C-SIMPLIFIED SALT;So;0;ON;;;;;N;;;;;
+2EE8;CJK RADICAL SIMPLIFIED WHEAT;So;0;ON;;;;;N;;;;;
+2EE9;CJK RADICAL SIMPLIFIED YELLOW;So;0;ON;;;;;N;;;;;
+2EEA;CJK RADICAL C-SIMPLIFIED FROG;So;0;ON;;;;;N;;;;;
+2EEB;CJK RADICAL J-SIMPLIFIED EVEN;So;0;ON;;;;;N;;;;;
+2EEC;CJK RADICAL C-SIMPLIFIED EVEN;So;0;ON;;;;;N;;;;;
+2EED;CJK RADICAL J-SIMPLIFIED TOOTH;So;0;ON;;;;;N;;;;;
+2EEE;CJK RADICAL C-SIMPLIFIED TOOTH;So;0;ON;;;;;N;;;;;
+2EEF;CJK RADICAL J-SIMPLIFIED DRAGON;So;0;ON;;;;;N;;;;;
+2EF0;CJK RADICAL C-SIMPLIFIED DRAGON;So;0;ON;;;;;N;;;;;
+2EF1;CJK RADICAL TURTLE;So;0;ON;;;;;N;;;;;
+2EF2;CJK RADICAL J-SIMPLIFIED TURTLE;So;0;ON;;;;;N;;;;;
+2EF3;CJK RADICAL C-SIMPLIFIED TURTLE;So;0;ON;<compat> 9F9F;;;;N;;;;;
+2F00;KANGXI RADICAL ONE;So;0;ON;<compat> 4E00;;;;N;;;;;
+2F01;KANGXI RADICAL LINE;So;0;ON;<compat> 4E28;;;;N;;;;;
+2F02;KANGXI RADICAL DOT;So;0;ON;<compat> 4E36;;;;N;;;;;
+2F03;KANGXI RADICAL SLASH;So;0;ON;<compat> 4E3F;;;;N;;;;;
+2F04;KANGXI RADICAL SECOND;So;0;ON;<compat> 4E59;;;;N;;;;;
+2F05;KANGXI RADICAL HOOK;So;0;ON;<compat> 4E85;;;;N;;;;;
+2F06;KANGXI RADICAL TWO;So;0;ON;<compat> 4E8C;;;;N;;;;;
+2F07;KANGXI RADICAL LID;So;0;ON;<compat> 4EA0;;;;N;;;;;
+2F08;KANGXI RADICAL MAN;So;0;ON;<compat> 4EBA;;;;N;;;;;
+2F09;KANGXI RADICAL LEGS;So;0;ON;<compat> 513F;;;;N;;;;;
+2F0A;KANGXI RADICAL ENTER;So;0;ON;<compat> 5165;;;;N;;;;;
+2F0B;KANGXI RADICAL EIGHT;So;0;ON;<compat> 516B;;;;N;;;;;
+2F0C;KANGXI RADICAL DOWN BOX;So;0;ON;<compat> 5182;;;;N;;;;;
+2F0D;KANGXI RADICAL COVER;So;0;ON;<compat> 5196;;;;N;;;;;
+2F0E;KANGXI RADICAL ICE;So;0;ON;<compat> 51AB;;;;N;;;;;
+2F0F;KANGXI RADICAL TABLE;So;0;ON;<compat> 51E0;;;;N;;;;;
+2F10;KANGXI RADICAL OPEN BOX;So;0;ON;<compat> 51F5;;;;N;;;;;
+2F11;KANGXI RADICAL KNIFE;So;0;ON;<compat> 5200;;;;N;;;;;
+2F12;KANGXI RADICAL POWER;So;0;ON;<compat> 529B;;;;N;;;;;
+2F13;KANGXI RADICAL WRAP;So;0;ON;<compat> 52F9;;;;N;;;;;
+2F14;KANGXI RADICAL SPOON;So;0;ON;<compat> 5315;;;;N;;;;;
+2F15;KANGXI RADICAL RIGHT OPEN BOX;So;0;ON;<compat> 531A;;;;N;;;;;
+2F16;KANGXI RADICAL HIDING ENCLOSURE;So;0;ON;<compat> 5338;;;;N;;;;;
+2F17;KANGXI RADICAL TEN;So;0;ON;<compat> 5341;;;;N;;;;;
+2F18;KANGXI RADICAL DIVINATION;So;0;ON;<compat> 535C;;;;N;;;;;
+2F19;KANGXI RADICAL SEAL;So;0;ON;<compat> 5369;;;;N;;;;;
+2F1A;KANGXI RADICAL CLIFF;So;0;ON;<compat> 5382;;;;N;;;;;
+2F1B;KANGXI RADICAL PRIVATE;So;0;ON;<compat> 53B6;;;;N;;;;;
+2F1C;KANGXI RADICAL AGAIN;So;0;ON;<compat> 53C8;;;;N;;;;;
+2F1D;KANGXI RADICAL MOUTH;So;0;ON;<compat> 53E3;;;;N;;;;;
+2F1E;KANGXI RADICAL ENCLOSURE;So;0;ON;<compat> 56D7;;;;N;;;;;
+2F1F;KANGXI RADICAL EARTH;So;0;ON;<compat> 571F;;;;N;;;;;
+2F20;KANGXI RADICAL SCHOLAR;So;0;ON;<compat> 58EB;;;;N;;;;;
+2F21;KANGXI RADICAL GO;So;0;ON;<compat> 5902;;;;N;;;;;
+2F22;KANGXI RADICAL GO SLOWLY;So;0;ON;<compat> 590A;;;;N;;;;;
+2F23;KANGXI RADICAL EVENING;So;0;ON;<compat> 5915;;;;N;;;;;
+2F24;KANGXI RADICAL BIG;So;0;ON;<compat> 5927;;;;N;;;;;
+2F25;KANGXI RADICAL WOMAN;So;0;ON;<compat> 5973;;;;N;;;;;
+2F26;KANGXI RADICAL CHILD;So;0;ON;<compat> 5B50;;;;N;;;;;
+2F27;KANGXI RADICAL ROOF;So;0;ON;<compat> 5B80;;;;N;;;;;
+2F28;KANGXI RADICAL INCH;So;0;ON;<compat> 5BF8;;;;N;;;;;
+2F29;KANGXI RADICAL SMALL;So;0;ON;<compat> 5C0F;;;;N;;;;;
+2F2A;KANGXI RADICAL LAME;So;0;ON;<compat> 5C22;;;;N;;;;;
+2F2B;KANGXI RADICAL CORPSE;So;0;ON;<compat> 5C38;;;;N;;;;;
+2F2C;KANGXI RADICAL SPROUT;So;0;ON;<compat> 5C6E;;;;N;;;;;
+2F2D;KANGXI RADICAL MOUNTAIN;So;0;ON;<compat> 5C71;;;;N;;;;;
+2F2E;KANGXI RADICAL RIVER;So;0;ON;<compat> 5DDB;;;;N;;;;;
+2F2F;KANGXI RADICAL WORK;So;0;ON;<compat> 5DE5;;;;N;;;;;
+2F30;KANGXI RADICAL ONESELF;So;0;ON;<compat> 5DF1;;;;N;;;;;
+2F31;KANGXI RADICAL TURBAN;So;0;ON;<compat> 5DFE;;;;N;;;;;
+2F32;KANGXI RADICAL DRY;So;0;ON;<compat> 5E72;;;;N;;;;;
+2F33;KANGXI RADICAL SHORT THREAD;So;0;ON;<compat> 5E7A;;;;N;;;;;
+2F34;KANGXI RADICAL DOTTED CLIFF;So;0;ON;<compat> 5E7F;;;;N;;;;;
+2F35;KANGXI RADICAL LONG STRIDE;So;0;ON;<compat> 5EF4;;;;N;;;;;
+2F36;KANGXI RADICAL TWO HANDS;So;0;ON;<compat> 5EFE;;;;N;;;;;
+2F37;KANGXI RADICAL SHOOT;So;0;ON;<compat> 5F0B;;;;N;;;;;
+2F38;KANGXI RADICAL BOW;So;0;ON;<compat> 5F13;;;;N;;;;;
+2F39;KANGXI RADICAL SNOUT;So;0;ON;<compat> 5F50;;;;N;;;;;
+2F3A;KANGXI RADICAL BRISTLE;So;0;ON;<compat> 5F61;;;;N;;;;;
+2F3B;KANGXI RADICAL STEP;So;0;ON;<compat> 5F73;;;;N;;;;;
+2F3C;KANGXI RADICAL HEART;So;0;ON;<compat> 5FC3;;;;N;;;;;
+2F3D;KANGXI RADICAL HALBERD;So;0;ON;<compat> 6208;;;;N;;;;;
+2F3E;KANGXI RADICAL DOOR;So;0;ON;<compat> 6236;;;;N;;;;;
+2F3F;KANGXI RADICAL HAND;So;0;ON;<compat> 624B;;;;N;;;;;
+2F40;KANGXI RADICAL BRANCH;So;0;ON;<compat> 652F;;;;N;;;;;
+2F41;KANGXI RADICAL RAP;So;0;ON;<compat> 6534;;;;N;;;;;
+2F42;KANGXI RADICAL SCRIPT;So;0;ON;<compat> 6587;;;;N;;;;;
+2F43;KANGXI RADICAL DIPPER;So;0;ON;<compat> 6597;;;;N;;;;;
+2F44;KANGXI RADICAL AXE;So;0;ON;<compat> 65A4;;;;N;;;;;
+2F45;KANGXI RADICAL SQUARE;So;0;ON;<compat> 65B9;;;;N;;;;;
+2F46;KANGXI RADICAL NOT;So;0;ON;<compat> 65E0;;;;N;;;;;
+2F47;KANGXI RADICAL SUN;So;0;ON;<compat> 65E5;;;;N;;;;;
+2F48;KANGXI RADICAL SAY;So;0;ON;<compat> 66F0;;;;N;;;;;
+2F49;KANGXI RADICAL MOON;So;0;ON;<compat> 6708;;;;N;;;;;
+2F4A;KANGXI RADICAL TREE;So;0;ON;<compat> 6728;;;;N;;;;;
+2F4B;KANGXI RADICAL LACK;So;0;ON;<compat> 6B20;;;;N;;;;;
+2F4C;KANGXI RADICAL STOP;So;0;ON;<compat> 6B62;;;;N;;;;;
+2F4D;KANGXI RADICAL DEATH;So;0;ON;<compat> 6B79;;;;N;;;;;
+2F4E;KANGXI RADICAL WEAPON;So;0;ON;<compat> 6BB3;;;;N;;;;;
+2F4F;KANGXI RADICAL DO NOT;So;0;ON;<compat> 6BCB;;;;N;;;;;
+2F50;KANGXI RADICAL COMPARE;So;0;ON;<compat> 6BD4;;;;N;;;;;
+2F51;KANGXI RADICAL FUR;So;0;ON;<compat> 6BDB;;;;N;;;;;
+2F52;KANGXI RADICAL CLAN;So;0;ON;<compat> 6C0F;;;;N;;;;;
+2F53;KANGXI RADICAL STEAM;So;0;ON;<compat> 6C14;;;;N;;;;;
+2F54;KANGXI RADICAL WATER;So;0;ON;<compat> 6C34;;;;N;;;;;
+2F55;KANGXI RADICAL FIRE;So;0;ON;<compat> 706B;;;;N;;;;;
+2F56;KANGXI RADICAL CLAW;So;0;ON;<compat> 722A;;;;N;;;;;
+2F57;KANGXI RADICAL FATHER;So;0;ON;<compat> 7236;;;;N;;;;;
+2F58;KANGXI RADICAL DOUBLE X;So;0;ON;<compat> 723B;;;;N;;;;;
+2F59;KANGXI RADICAL HALF TREE TRUNK;So;0;ON;<compat> 723F;;;;N;;;;;
+2F5A;KANGXI RADICAL SLICE;So;0;ON;<compat> 7247;;;;N;;;;;
+2F5B;KANGXI RADICAL FANG;So;0;ON;<compat> 7259;;;;N;;;;;
+2F5C;KANGXI RADICAL COW;So;0;ON;<compat> 725B;;;;N;;;;;
+2F5D;KANGXI RADICAL DOG;So;0;ON;<compat> 72AC;;;;N;;;;;
+2F5E;KANGXI RADICAL PROFOUND;So;0;ON;<compat> 7384;;;;N;;;;;
+2F5F;KANGXI RADICAL JADE;So;0;ON;<compat> 7389;;;;N;;;;;
+2F60;KANGXI RADICAL MELON;So;0;ON;<compat> 74DC;;;;N;;;;;
+2F61;KANGXI RADICAL TILE;So;0;ON;<compat> 74E6;;;;N;;;;;
+2F62;KANGXI RADICAL SWEET;So;0;ON;<compat> 7518;;;;N;;;;;
+2F63;KANGXI RADICAL LIFE;So;0;ON;<compat> 751F;;;;N;;;;;
+2F64;KANGXI RADICAL USE;So;0;ON;<compat> 7528;;;;N;;;;;
+2F65;KANGXI RADICAL FIELD;So;0;ON;<compat> 7530;;;;N;;;;;
+2F66;KANGXI RADICAL BOLT OF CLOTH;So;0;ON;<compat> 758B;;;;N;;;;;
+2F67;KANGXI RADICAL SICKNESS;So;0;ON;<compat> 7592;;;;N;;;;;
+2F68;KANGXI RADICAL DOTTED TENT;So;0;ON;<compat> 7676;;;;N;;;;;
+2F69;KANGXI RADICAL WHITE;So;0;ON;<compat> 767D;;;;N;;;;;
+2F6A;KANGXI RADICAL SKIN;So;0;ON;<compat> 76AE;;;;N;;;;;
+2F6B;KANGXI RADICAL DISH;So;0;ON;<compat> 76BF;;;;N;;;;;
+2F6C;KANGXI RADICAL EYE;So;0;ON;<compat> 76EE;;;;N;;;;;
+2F6D;KANGXI RADICAL SPEAR;So;0;ON;<compat> 77DB;;;;N;;;;;
+2F6E;KANGXI RADICAL ARROW;So;0;ON;<compat> 77E2;;;;N;;;;;
+2F6F;KANGXI RADICAL STONE;So;0;ON;<compat> 77F3;;;;N;;;;;
+2F70;KANGXI RADICAL SPIRIT;So;0;ON;<compat> 793A;;;;N;;;;;
+2F71;KANGXI RADICAL TRACK;So;0;ON;<compat> 79B8;;;;N;;;;;
+2F72;KANGXI RADICAL GRAIN;So;0;ON;<compat> 79BE;;;;N;;;;;
+2F73;KANGXI RADICAL CAVE;So;0;ON;<compat> 7A74;;;;N;;;;;
+2F74;KANGXI RADICAL STAND;So;0;ON;<compat> 7ACB;;;;N;;;;;
+2F75;KANGXI RADICAL BAMBOO;So;0;ON;<compat> 7AF9;;;;N;;;;;
+2F76;KANGXI RADICAL RICE;So;0;ON;<compat> 7C73;;;;N;;;;;
+2F77;KANGXI RADICAL SILK;So;0;ON;<compat> 7CF8;;;;N;;;;;
+2F78;KANGXI RADICAL JAR;So;0;ON;<compat> 7F36;;;;N;;;;;
+2F79;KANGXI RADICAL NET;So;0;ON;<compat> 7F51;;;;N;;;;;
+2F7A;KANGXI RADICAL SHEEP;So;0;ON;<compat> 7F8A;;;;N;;;;;
+2F7B;KANGXI RADICAL FEATHER;So;0;ON;<compat> 7FBD;;;;N;;;;;
+2F7C;KANGXI RADICAL OLD;So;0;ON;<compat> 8001;;;;N;;;;;
+2F7D;KANGXI RADICAL AND;So;0;ON;<compat> 800C;;;;N;;;;;
+2F7E;KANGXI RADICAL PLOW;So;0;ON;<compat> 8012;;;;N;;;;;
+2F7F;KANGXI RADICAL EAR;So;0;ON;<compat> 8033;;;;N;;;;;
+2F80;KANGXI RADICAL BRUSH;So;0;ON;<compat> 807F;;;;N;;;;;
+2F81;KANGXI RADICAL MEAT;So;0;ON;<compat> 8089;;;;N;;;;;
+2F82;KANGXI RADICAL MINISTER;So;0;ON;<compat> 81E3;;;;N;;;;;
+2F83;KANGXI RADICAL SELF;So;0;ON;<compat> 81EA;;;;N;;;;;
+2F84;KANGXI RADICAL ARRIVE;So;0;ON;<compat> 81F3;;;;N;;;;;
+2F85;KANGXI RADICAL MORTAR;So;0;ON;<compat> 81FC;;;;N;;;;;
+2F86;KANGXI RADICAL TONGUE;So;0;ON;<compat> 820C;;;;N;;;;;
+2F87;KANGXI RADICAL OPPOSE;So;0;ON;<compat> 821B;;;;N;;;;;
+2F88;KANGXI RADICAL BOAT;So;0;ON;<compat> 821F;;;;N;;;;;
+2F89;KANGXI RADICAL STOPPING;So;0;ON;<compat> 826E;;;;N;;;;;
+2F8A;KANGXI RADICAL COLOR;So;0;ON;<compat> 8272;;;;N;;;;;
+2F8B;KANGXI RADICAL GRASS;So;0;ON;<compat> 8278;;;;N;;;;;
+2F8C;KANGXI RADICAL TIGER;So;0;ON;<compat> 864D;;;;N;;;;;
+2F8D;KANGXI RADICAL INSECT;So;0;ON;<compat> 866B;;;;N;;;;;
+2F8E;KANGXI RADICAL BLOOD;So;0;ON;<compat> 8840;;;;N;;;;;
+2F8F;KANGXI RADICAL WALK ENCLOSURE;So;0;ON;<compat> 884C;;;;N;;;;;
+2F90;KANGXI RADICAL CLOTHES;So;0;ON;<compat> 8863;;;;N;;;;;
+2F91;KANGXI RADICAL WEST;So;0;ON;<compat> 897E;;;;N;;;;;
+2F92;KANGXI RADICAL SEE;So;0;ON;<compat> 898B;;;;N;;;;;
+2F93;KANGXI RADICAL HORN;So;0;ON;<compat> 89D2;;;;N;;;;;
+2F94;KANGXI RADICAL SPEECH;So;0;ON;<compat> 8A00;;;;N;;;;;
+2F95;KANGXI RADICAL VALLEY;So;0;ON;<compat> 8C37;;;;N;;;;;
+2F96;KANGXI RADICAL BEAN;So;0;ON;<compat> 8C46;;;;N;;;;;
+2F97;KANGXI RADICAL PIG;So;0;ON;<compat> 8C55;;;;N;;;;;
+2F98;KANGXI RADICAL BADGER;So;0;ON;<compat> 8C78;;;;N;;;;;
+2F99;KANGXI RADICAL SHELL;So;0;ON;<compat> 8C9D;;;;N;;;;;
+2F9A;KANGXI RADICAL RED;So;0;ON;<compat> 8D64;;;;N;;;;;
+2F9B;KANGXI RADICAL RUN;So;0;ON;<compat> 8D70;;;;N;;;;;
+2F9C;KANGXI RADICAL FOOT;So;0;ON;<compat> 8DB3;;;;N;;;;;
+2F9D;KANGXI RADICAL BODY;So;0;ON;<compat> 8EAB;;;;N;;;;;
+2F9E;KANGXI RADICAL CART;So;0;ON;<compat> 8ECA;;;;N;;;;;
+2F9F;KANGXI RADICAL BITTER;So;0;ON;<compat> 8F9B;;;;N;;;;;
+2FA0;KANGXI RADICAL MORNING;So;0;ON;<compat> 8FB0;;;;N;;;;;
+2FA1;KANGXI RADICAL WALK;So;0;ON;<compat> 8FB5;;;;N;;;;;
+2FA2;KANGXI RADICAL CITY;So;0;ON;<compat> 9091;;;;N;;;;;
+2FA3;KANGXI RADICAL WINE;So;0;ON;<compat> 9149;;;;N;;;;;
+2FA4;KANGXI RADICAL DISTINGUISH;So;0;ON;<compat> 91C6;;;;N;;;;;
+2FA5;KANGXI RADICAL VILLAGE;So;0;ON;<compat> 91CC;;;;N;;;;;
+2FA6;KANGXI RADICAL GOLD;So;0;ON;<compat> 91D1;;;;N;;;;;
+2FA7;KANGXI RADICAL LONG;So;0;ON;<compat> 9577;;;;N;;;;;
+2FA8;KANGXI RADICAL GATE;So;0;ON;<compat> 9580;;;;N;;;;;
+2FA9;KANGXI RADICAL MOUND;So;0;ON;<compat> 961C;;;;N;;;;;
+2FAA;KANGXI RADICAL SLAVE;So;0;ON;<compat> 96B6;;;;N;;;;;
+2FAB;KANGXI RADICAL SHORT TAILED BIRD;So;0;ON;<compat> 96B9;;;;N;;;;;
+2FAC;KANGXI RADICAL RAIN;So;0;ON;<compat> 96E8;;;;N;;;;;
+2FAD;KANGXI RADICAL BLUE;So;0;ON;<compat> 9751;;;;N;;;;;
+2FAE;KANGXI RADICAL WRONG;So;0;ON;<compat> 975E;;;;N;;;;;
+2FAF;KANGXI RADICAL FACE;So;0;ON;<compat> 9762;;;;N;;;;;
+2FB0;KANGXI RADICAL LEATHER;So;0;ON;<compat> 9769;;;;N;;;;;
+2FB1;KANGXI RADICAL TANNED LEATHER;So;0;ON;<compat> 97CB;;;;N;;;;;
+2FB2;KANGXI RADICAL LEEK;So;0;ON;<compat> 97ED;;;;N;;;;;
+2FB3;KANGXI RADICAL SOUND;So;0;ON;<compat> 97F3;;;;N;;;;;
+2FB4;KANGXI RADICAL LEAF;So;0;ON;<compat> 9801;;;;N;;;;;
+2FB5;KANGXI RADICAL WIND;So;0;ON;<compat> 98A8;;;;N;;;;;
+2FB6;KANGXI RADICAL FLY;So;0;ON;<compat> 98DB;;;;N;;;;;
+2FB7;KANGXI RADICAL EAT;So;0;ON;<compat> 98DF;;;;N;;;;;
+2FB8;KANGXI RADICAL HEAD;So;0;ON;<compat> 9996;;;;N;;;;;
+2FB9;KANGXI RADICAL FRAGRANT;So;0;ON;<compat> 9999;;;;N;;;;;
+2FBA;KANGXI RADICAL HORSE;So;0;ON;<compat> 99AC;;;;N;;;;;
+2FBB;KANGXI RADICAL BONE;So;0;ON;<compat> 9AA8;;;;N;;;;;
+2FBC;KANGXI RADICAL TALL;So;0;ON;<compat> 9AD8;;;;N;;;;;
+2FBD;KANGXI RADICAL HAIR;So;0;ON;<compat> 9ADF;;;;N;;;;;
+2FBE;KANGXI RADICAL FIGHT;So;0;ON;<compat> 9B25;;;;N;;;;;
+2FBF;KANGXI RADICAL SACRIFICIAL WINE;So;0;ON;<compat> 9B2F;;;;N;;;;;
+2FC0;KANGXI RADICAL CAULDRON;So;0;ON;<compat> 9B32;;;;N;;;;;
+2FC1;KANGXI RADICAL GHOST;So;0;ON;<compat> 9B3C;;;;N;;;;;
+2FC2;KANGXI RADICAL FISH;So;0;ON;<compat> 9B5A;;;;N;;;;;
+2FC3;KANGXI RADICAL BIRD;So;0;ON;<compat> 9CE5;;;;N;;;;;
+2FC4;KANGXI RADICAL SALT;So;0;ON;<compat> 9E75;;;;N;;;;;
+2FC5;KANGXI RADICAL DEER;So;0;ON;<compat> 9E7F;;;;N;;;;;
+2FC6;KANGXI RADICAL WHEAT;So;0;ON;<compat> 9EA5;;;;N;;;;;
+2FC7;KANGXI RADICAL HEMP;So;0;ON;<compat> 9EBB;;;;N;;;;;
+2FC8;KANGXI RADICAL YELLOW;So;0;ON;<compat> 9EC3;;;;N;;;;;
+2FC9;KANGXI RADICAL MILLET;So;0;ON;<compat> 9ECD;;;;N;;;;;
+2FCA;KANGXI RADICAL BLACK;So;0;ON;<compat> 9ED1;;;;N;;;;;
+2FCB;KANGXI RADICAL EMBROIDERY;So;0;ON;<compat> 9EF9;;;;N;;;;;
+2FCC;KANGXI RADICAL FROG;So;0;ON;<compat> 9EFD;;;;N;;;;;
+2FCD;KANGXI RADICAL TRIPOD;So;0;ON;<compat> 9F0E;;;;N;;;;;
+2FCE;KANGXI RADICAL DRUM;So;0;ON;<compat> 9F13;;;;N;;;;;
+2FCF;KANGXI RADICAL RAT;So;0;ON;<compat> 9F20;;;;N;;;;;
+2FD0;KANGXI RADICAL NOSE;So;0;ON;<compat> 9F3B;;;;N;;;;;
+2FD1;KANGXI RADICAL EVEN;So;0;ON;<compat> 9F4A;;;;N;;;;;
+2FD2;KANGXI RADICAL TOOTH;So;0;ON;<compat> 9F52;;;;N;;;;;
+2FD3;KANGXI RADICAL DRAGON;So;0;ON;<compat> 9F8D;;;;N;;;;;
+2FD4;KANGXI RADICAL TURTLE;So;0;ON;<compat> 9F9C;;;;N;;;;;
+2FD5;KANGXI RADICAL FLUTE;So;0;ON;<compat> 9FA0;;;;N;;;;;
+2FF0;IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT;So;0;ON;;;;;N;;;;;
+2FF1;IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW;So;0;ON;;;;;N;;;;;
+2FF2;IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT;So;0;ON;;;;;N;;;;;
+2FF3;IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO MIDDLE AND BELOW;So;0;ON;;;;;N;;;;;
+2FF4;IDEOGRAPHIC DESCRIPTION CHARACTER FULL SURROUND;So;0;ON;;;;;N;;;;;
+2FF5;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM ABOVE;So;0;ON;;;;;N;;;;;
+2FF6;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM BELOW;So;0;ON;;;;;N;;;;;
+2FF7;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT;So;0;ON;;;;;N;;;;;
+2FF8;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT;So;0;ON;;;;;N;;;;;
+2FF9;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT;So;0;ON;;;;;N;;;;;
+2FFA;IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT;So;0;ON;;;;;N;;;;;
+2FFB;IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID;So;0;ON;;;;;N;;;;;
+3000;IDEOGRAPHIC SPACE;Zs;0;WS;<wide> 0020;;;;N;;;;;
+3001;IDEOGRAPHIC COMMA;Po;0;ON;;;;;N;;;;;
+3002;IDEOGRAPHIC FULL STOP;Po;0;ON;;;;;N;IDEOGRAPHIC PERIOD;;;;
+3003;DITTO MARK;Po;0;ON;;;;;N;;;;;
+3004;JAPANESE INDUSTRIAL STANDARD SYMBOL;So;0;ON;;;;;N;;;;;
+3005;IDEOGRAPHIC ITERATION MARK;Lm;0;L;;;;;N;;;;;
+3006;IDEOGRAPHIC CLOSING MARK;Lo;0;L;;;;;N;;;;;
+3007;IDEOGRAPHIC NUMBER ZERO;Nl;0;L;;;;0;N;;;;;
+3008;LEFT ANGLE BRACKET;Ps;0;ON;;;;;Y;OPENING ANGLE BRACKET;;;;
+3009;RIGHT ANGLE BRACKET;Pe;0;ON;;;;;Y;CLOSING ANGLE BRACKET;;;;
+300A;LEFT DOUBLE ANGLE BRACKET;Ps;0;ON;;;;;Y;OPENING DOUBLE ANGLE BRACKET;;;;
+300B;RIGHT DOUBLE ANGLE BRACKET;Pe;0;ON;;;;;Y;CLOSING DOUBLE ANGLE BRACKET;;;;
+300C;LEFT CORNER BRACKET;Ps;0;ON;;;;;Y;OPENING CORNER BRACKET;;;;
+300D;RIGHT CORNER BRACKET;Pe;0;ON;;;;;Y;CLOSING CORNER BRACKET;;;;
+300E;LEFT WHITE CORNER BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE CORNER BRACKET;;;;
+300F;RIGHT WHITE CORNER BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE CORNER BRACKET;;;;
+3010;LEFT BLACK LENTICULAR BRACKET;Ps;0;ON;;;;;Y;OPENING BLACK LENTICULAR BRACKET;;;;
+3011;RIGHT BLACK LENTICULAR BRACKET;Pe;0;ON;;;;;Y;CLOSING BLACK LENTICULAR BRACKET;;;;
+3012;POSTAL MARK;So;0;ON;;;;;N;;;;;
+3013;GETA MARK;So;0;ON;;;;;N;;;;;
+3014;LEFT TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;OPENING TORTOISE SHELL BRACKET;;;;
+3015;RIGHT TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;CLOSING TORTOISE SHELL BRACKET;;;;
+3016;LEFT WHITE LENTICULAR BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE LENTICULAR BRACKET;;;;
+3017;RIGHT WHITE LENTICULAR BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE LENTICULAR BRACKET;;;;
+3018;LEFT WHITE TORTOISE SHELL BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE TORTOISE SHELL BRACKET;;;;
+3019;RIGHT WHITE TORTOISE SHELL BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE TORTOISE SHELL BRACKET;;;;
+301A;LEFT WHITE SQUARE BRACKET;Ps;0;ON;;;;;Y;OPENING WHITE SQUARE BRACKET;;;;
+301B;RIGHT WHITE SQUARE BRACKET;Pe;0;ON;;;;;Y;CLOSING WHITE SQUARE BRACKET;;;;
+301C;WAVE DASH;Pd;0;ON;;;;;N;;;;;
+301D;REVERSED DOUBLE PRIME QUOTATION MARK;Ps;0;ON;;;;;N;;;;;
+301E;DOUBLE PRIME QUOTATION MARK;Pe;0;ON;;;;;N;;;;;
+301F;LOW DOUBLE PRIME QUOTATION MARK;Pe;0;ON;;;;;N;;;;;
+3020;POSTAL MARK FACE;So;0;ON;;;;;N;;;;;
+3021;HANGZHOU NUMERAL ONE;Nl;0;L;;;;1;N;;;;;
+3022;HANGZHOU NUMERAL TWO;Nl;0;L;;;;2;N;;;;;
+3023;HANGZHOU NUMERAL THREE;Nl;0;L;;;;3;N;;;;;
+3024;HANGZHOU NUMERAL FOUR;Nl;0;L;;;;4;N;;;;;
+3025;HANGZHOU NUMERAL FIVE;Nl;0;L;;;;5;N;;;;;
+3026;HANGZHOU NUMERAL SIX;Nl;0;L;;;;6;N;;;;;
+3027;HANGZHOU NUMERAL SEVEN;Nl;0;L;;;;7;N;;;;;
+3028;HANGZHOU NUMERAL EIGHT;Nl;0;L;;;;8;N;;;;;
+3029;HANGZHOU NUMERAL NINE;Nl;0;L;;;;9;N;;;;;
+302A;IDEOGRAPHIC LEVEL TONE MARK;Mn;218;NSM;;;;;N;;;;;
+302B;IDEOGRAPHIC RISING TONE MARK;Mn;228;NSM;;;;;N;;;;;
+302C;IDEOGRAPHIC DEPARTING TONE MARK;Mn;232;NSM;;;;;N;;;;;
+302D;IDEOGRAPHIC ENTERING TONE MARK;Mn;222;NSM;;;;;N;;;;;
+302E;HANGUL SINGLE DOT TONE MARK;Mn;224;NSM;;;;;N;;;;;
+302F;HANGUL DOUBLE DOT TONE MARK;Mn;224;NSM;;;;;N;;;;;
+3030;WAVY DASH;Pd;0;ON;;;;;N;;;;;
+3031;VERTICAL KANA REPEAT MARK;Lm;0;L;;;;;N;;;;;
+3032;VERTICAL KANA REPEAT WITH VOICED SOUND MARK;Lm;0;L;;;;;N;;;;;
+3033;VERTICAL KANA REPEAT MARK UPPER HALF;Lm;0;L;;;;;N;;;;;
+3034;VERTICAL KANA REPEAT WITH VOICED SOUND MARK UPPER HALF;Lm;0;L;;;;;N;;;;;
+3035;VERTICAL KANA REPEAT MARK LOWER HALF;Lm;0;L;;;;;N;;;;;
+3036;CIRCLED POSTAL MARK;So;0;ON;<compat> 3012;;;;N;;;;;
+3037;IDEOGRAPHIC TELEGRAPH LINE FEED SEPARATOR SYMBOL;So;0;ON;;;;;N;;;;;
+3038;HANGZHOU NUMERAL TEN;Nl;0;L;<compat> 5341;;;10;N;;;;;
+3039;HANGZHOU NUMERAL TWENTY;Nl;0;L;<compat> 5344;;;20;N;;;;;
+303A;HANGZHOU NUMERAL THIRTY;Nl;0;L;<compat> 5345;;;30;N;;;;;
+303B;VERTICAL IDEOGRAPHIC ITERATION MARK;Lm;0;L;;;;;N;;;;;
+303C;MASU MARK;Lo;0;L;;;;;N;;;;;
+303D;PART ALTERNATION MARK;Po;0;ON;;;;;N;;;;;
+303E;IDEOGRAPHIC VARIATION INDICATOR;So;0;ON;;;;;N;;;;;
+303F;IDEOGRAPHIC HALF FILL SPACE;So;0;ON;;;;;N;;;;;
+3041;HIRAGANA LETTER SMALL A;Lo;0;L;;;;;N;;;;;
+3042;HIRAGANA LETTER A;Lo;0;L;;;;;N;;;;;
+3043;HIRAGANA LETTER SMALL I;Lo;0;L;;;;;N;;;;;
+3044;HIRAGANA LETTER I;Lo;0;L;;;;;N;;;;;
+3045;HIRAGANA LETTER SMALL U;Lo;0;L;;;;;N;;;;;
+3046;HIRAGANA LETTER U;Lo;0;L;;;;;N;;;;;
+3047;HIRAGANA LETTER SMALL E;Lo;0;L;;;;;N;;;;;
+3048;HIRAGANA LETTER E;Lo;0;L;;;;;N;;;;;
+3049;HIRAGANA LETTER SMALL O;Lo;0;L;;;;;N;;;;;
+304A;HIRAGANA LETTER O;Lo;0;L;;;;;N;;;;;
+304B;HIRAGANA LETTER KA;Lo;0;L;;;;;N;;;;;
+304C;HIRAGANA LETTER GA;Lo;0;L;304B 3099;;;;N;;;;;
+304D;HIRAGANA LETTER KI;Lo;0;L;;;;;N;;;;;
+304E;HIRAGANA LETTER GI;Lo;0;L;304D 3099;;;;N;;;;;
+304F;HIRAGANA LETTER KU;Lo;0;L;;;;;N;;;;;
+3050;HIRAGANA LETTER GU;Lo;0;L;304F 3099;;;;N;;;;;
+3051;HIRAGANA LETTER KE;Lo;0;L;;;;;N;;;;;
+3052;HIRAGANA LETTER GE;Lo;0;L;3051 3099;;;;N;;;;;
+3053;HIRAGANA LETTER KO;Lo;0;L;;;;;N;;;;;
+3054;HIRAGANA LETTER GO;Lo;0;L;3053 3099;;;;N;;;;;
+3055;HIRAGANA LETTER SA;Lo;0;L;;;;;N;;;;;
+3056;HIRAGANA LETTER ZA;Lo;0;L;3055 3099;;;;N;;;;;
+3057;HIRAGANA LETTER SI;Lo;0;L;;;;;N;;;;;
+3058;HIRAGANA LETTER ZI;Lo;0;L;3057 3099;;;;N;;;;;
+3059;HIRAGANA LETTER SU;Lo;0;L;;;;;N;;;;;
+305A;HIRAGANA LETTER ZU;Lo;0;L;3059 3099;;;;N;;;;;
+305B;HIRAGANA LETTER SE;Lo;0;L;;;;;N;;;;;
+305C;HIRAGANA LETTER ZE;Lo;0;L;305B 3099;;;;N;;;;;
+305D;HIRAGANA LETTER SO;Lo;0;L;;;;;N;;;;;
+305E;HIRAGANA LETTER ZO;Lo;0;L;305D 3099;;;;N;;;;;
+305F;HIRAGANA LETTER TA;Lo;0;L;;;;;N;;;;;
+3060;HIRAGANA LETTER DA;Lo;0;L;305F 3099;;;;N;;;;;
+3061;HIRAGANA LETTER TI;Lo;0;L;;;;;N;;;;;
+3062;HIRAGANA LETTER DI;Lo;0;L;3061 3099;;;;N;;;;;
+3063;HIRAGANA LETTER SMALL TU;Lo;0;L;;;;;N;;;;;
+3064;HIRAGANA LETTER TU;Lo;0;L;;;;;N;;;;;
+3065;HIRAGANA LETTER DU;Lo;0;L;3064 3099;;;;N;;;;;
+3066;HIRAGANA LETTER TE;Lo;0;L;;;;;N;;;;;
+3067;HIRAGANA LETTER DE;Lo;0;L;3066 3099;;;;N;;;;;
+3068;HIRAGANA LETTER TO;Lo;0;L;;;;;N;;;;;
+3069;HIRAGANA LETTER DO;Lo;0;L;3068 3099;;;;N;;;;;
+306A;HIRAGANA LETTER NA;Lo;0;L;;;;;N;;;;;
+306B;HIRAGANA LETTER NI;Lo;0;L;;;;;N;;;;;
+306C;HIRAGANA LETTER NU;Lo;0;L;;;;;N;;;;;
+306D;HIRAGANA LETTER NE;Lo;0;L;;;;;N;;;;;
+306E;HIRAGANA LETTER NO;Lo;0;L;;;;;N;;;;;
+306F;HIRAGANA LETTER HA;Lo;0;L;;;;;N;;;;;
+3070;HIRAGANA LETTER BA;Lo;0;L;306F 3099;;;;N;;;;;
+3071;HIRAGANA LETTER PA;Lo;0;L;306F 309A;;;;N;;;;;
+3072;HIRAGANA LETTER HI;Lo;0;L;;;;;N;;;;;
+3073;HIRAGANA LETTER BI;Lo;0;L;3072 3099;;;;N;;;;;
+3074;HIRAGANA LETTER PI;Lo;0;L;3072 309A;;;;N;;;;;
+3075;HIRAGANA LETTER HU;Lo;0;L;;;;;N;;;;;
+3076;HIRAGANA LETTER BU;Lo;0;L;3075 3099;;;;N;;;;;
+3077;HIRAGANA LETTER PU;Lo;0;L;3075 309A;;;;N;;;;;
+3078;HIRAGANA LETTER HE;Lo;0;L;;;;;N;;;;;
+3079;HIRAGANA LETTER BE;Lo;0;L;3078 3099;;;;N;;;;;
+307A;HIRAGANA LETTER PE;Lo;0;L;3078 309A;;;;N;;;;;
+307B;HIRAGANA LETTER HO;Lo;0;L;;;;;N;;;;;
+307C;HIRAGANA LETTER BO;Lo;0;L;307B 3099;;;;N;;;;;
+307D;HIRAGANA LETTER PO;Lo;0;L;307B 309A;;;;N;;;;;
+307E;HIRAGANA LETTER MA;Lo;0;L;;;;;N;;;;;
+307F;HIRAGANA LETTER MI;Lo;0;L;;;;;N;;;;;
+3080;HIRAGANA LETTER MU;Lo;0;L;;;;;N;;;;;
+3081;HIRAGANA LETTER ME;Lo;0;L;;;;;N;;;;;
+3082;HIRAGANA LETTER MO;Lo;0;L;;;;;N;;;;;
+3083;HIRAGANA LETTER SMALL YA;Lo;0;L;;;;;N;;;;;
+3084;HIRAGANA LETTER YA;Lo;0;L;;;;;N;;;;;
+3085;HIRAGANA LETTER SMALL YU;Lo;0;L;;;;;N;;;;;
+3086;HIRAGANA LETTER YU;Lo;0;L;;;;;N;;;;;
+3087;HIRAGANA LETTER SMALL YO;Lo;0;L;;;;;N;;;;;
+3088;HIRAGANA LETTER YO;Lo;0;L;;;;;N;;;;;
+3089;HIRAGANA LETTER RA;Lo;0;L;;;;;N;;;;;
+308A;HIRAGANA LETTER RI;Lo;0;L;;;;;N;;;;;
+308B;HIRAGANA LETTER RU;Lo;0;L;;;;;N;;;;;
+308C;HIRAGANA LETTER RE;Lo;0;L;;;;;N;;;;;
+308D;HIRAGANA LETTER RO;Lo;0;L;;;;;N;;;;;
+308E;HIRAGANA LETTER SMALL WA;Lo;0;L;;;;;N;;;;;
+308F;HIRAGANA LETTER WA;Lo;0;L;;;;;N;;;;;
+3090;HIRAGANA LETTER WI;Lo;0;L;;;;;N;;;;;
+3091;HIRAGANA LETTER WE;Lo;0;L;;;;;N;;;;;
+3092;HIRAGANA LETTER WO;Lo;0;L;;;;;N;;;;;
+3093;HIRAGANA LETTER N;Lo;0;L;;;;;N;;;;;
+3094;HIRAGANA LETTER VU;Lo;0;L;3046 3099;;;;N;;;;;
+3095;HIRAGANA LETTER SMALL KA;Lo;0;L;;;;;N;;;;;
+3096;HIRAGANA LETTER SMALL KE;Lo;0;L;;;;;N;;;;;
+3099;COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK;Mn;8;NSM;;;;;N;NON-SPACING KATAKANA-HIRAGANA VOICED SOUND MARK;;;;
+309A;COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK;Mn;8;NSM;;;;;N;NON-SPACING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK;;;;
+309B;KATAKANA-HIRAGANA VOICED SOUND MARK;Sk;0;ON;<compat> 0020 3099;;;;N;;;;;
+309C;KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK;Sk;0;ON;<compat> 0020 309A;;;;N;;;;;
+309D;HIRAGANA ITERATION MARK;Lm;0;L;;;;;N;;;;;
+309E;HIRAGANA VOICED ITERATION MARK;Lm;0;L;309D 3099;;;;N;;;;;
+309F;HIRAGANA DIGRAPH YORI;Lo;0;L;<vertical> 3088 308A;;;;N;;;;;
+30A0;KATAKANA-HIRAGANA DOUBLE HYPHEN;Pd;0;ON;;;;;N;;;;;
+30A1;KATAKANA LETTER SMALL A;Lo;0;L;;;;;N;;;;;
+30A2;KATAKANA LETTER A;Lo;0;L;;;;;N;;;;;
+30A3;KATAKANA LETTER SMALL I;Lo;0;L;;;;;N;;;;;
+30A4;KATAKANA LETTER I;Lo;0;L;;;;;N;;;;;
+30A5;KATAKANA LETTER SMALL U;Lo;0;L;;;;;N;;;;;
+30A6;KATAKANA LETTER U;Lo;0;L;;;;;N;;;;;
+30A7;KATAKANA LETTER SMALL E;Lo;0;L;;;;;N;;;;;
+30A8;KATAKANA LETTER E;Lo;0;L;;;;;N;;;;;
+30A9;KATAKANA LETTER SMALL O;Lo;0;L;;;;;N;;;;;
+30AA;KATAKANA LETTER O;Lo;0;L;;;;;N;;;;;
+30AB;KATAKANA LETTER KA;Lo;0;L;;;;;N;;;;;
+30AC;KATAKANA LETTER GA;Lo;0;L;30AB 3099;;;;N;;;;;
+30AD;KATAKANA LETTER KI;Lo;0;L;;;;;N;;;;;
+30AE;KATAKANA LETTER GI;Lo;0;L;30AD 3099;;;;N;;;;;
+30AF;KATAKANA LETTER KU;Lo;0;L;;;;;N;;;;;
+30B0;KATAKANA LETTER GU;Lo;0;L;30AF 3099;;;;N;;;;;
+30B1;KATAKANA LETTER KE;Lo;0;L;;;;;N;;;;;
+30B2;KATAKANA LETTER GE;Lo;0;L;30B1 3099;;;;N;;;;;
+30B3;KATAKANA LETTER KO;Lo;0;L;;;;;N;;;;;
+30B4;KATAKANA LETTER GO;Lo;0;L;30B3 3099;;;;N;;;;;
+30B5;KATAKANA LETTER SA;Lo;0;L;;;;;N;;;;;
+30B6;KATAKANA LETTER ZA;Lo;0;L;30B5 3099;;;;N;;;;;
+30B7;KATAKANA LETTER SI;Lo;0;L;;;;;N;;;;;
+30B8;KATAKANA LETTER ZI;Lo;0;L;30B7 3099;;;;N;;;;;
+30B9;KATAKANA LETTER SU;Lo;0;L;;;;;N;;;;;
+30BA;KATAKANA LETTER ZU;Lo;0;L;30B9 3099;;;;N;;;;;
+30BB;KATAKANA LETTER SE;Lo;0;L;;;;;N;;;;;
+30BC;KATAKANA LETTER ZE;Lo;0;L;30BB 3099;;;;N;;;;;
+30BD;KATAKANA LETTER SO;Lo;0;L;;;;;N;;;;;
+30BE;KATAKANA LETTER ZO;Lo;0;L;30BD 3099;;;;N;;;;;
+30BF;KATAKANA LETTER TA;Lo;0;L;;;;;N;;;;;
+30C0;KATAKANA LETTER DA;Lo;0;L;30BF 3099;;;;N;;;;;
+30C1;KATAKANA LETTER TI;Lo;0;L;;;;;N;;;;;
+30C2;KATAKANA LETTER DI;Lo;0;L;30C1 3099;;;;N;;;;;
+30C3;KATAKANA LETTER SMALL TU;Lo;0;L;;;;;N;;;;;
+30C4;KATAKANA LETTER TU;Lo;0;L;;;;;N;;;;;
+30C5;KATAKANA LETTER DU;Lo;0;L;30C4 3099;;;;N;;;;;
+30C6;KATAKANA LETTER TE;Lo;0;L;;;;;N;;;;;
+30C7;KATAKANA LETTER DE;Lo;0;L;30C6 3099;;;;N;;;;;
+30C8;KATAKANA LETTER TO;Lo;0;L;;;;;N;;;;;
+30C9;KATAKANA LETTER DO;Lo;0;L;30C8 3099;;;;N;;;;;
+30CA;KATAKANA LETTER NA;Lo;0;L;;;;;N;;;;;
+30CB;KATAKANA LETTER NI;Lo;0;L;;;;;N;;;;;
+30CC;KATAKANA LETTER NU;Lo;0;L;;;;;N;;;;;
+30CD;KATAKANA LETTER NE;Lo;0;L;;;;;N;;;;;
+30CE;KATAKANA LETTER NO;Lo;0;L;;;;;N;;;;;
+30CF;KATAKANA LETTER HA;Lo;0;L;;;;;N;;;;;
+30D0;KATAKANA LETTER BA;Lo;0;L;30CF 3099;;;;N;;;;;
+30D1;KATAKANA LETTER PA;Lo;0;L;30CF 309A;;;;N;;;;;
+30D2;KATAKANA LETTER HI;Lo;0;L;;;;;N;;;;;
+30D3;KATAKANA LETTER BI;Lo;0;L;30D2 3099;;;;N;;;;;
+30D4;KATAKANA LETTER PI;Lo;0;L;30D2 309A;;;;N;;;;;
+30D5;KATAKANA LETTER HU;Lo;0;L;;;;;N;;;;;
+30D6;KATAKANA LETTER BU;Lo;0;L;30D5 3099;;;;N;;;;;
+30D7;KATAKANA LETTER PU;Lo;0;L;30D5 309A;;;;N;;;;;
+30D8;KATAKANA LETTER HE;Lo;0;L;;;;;N;;;;;
+30D9;KATAKANA LETTER BE;Lo;0;L;30D8 3099;;;;N;;;;;
+30DA;KATAKANA LETTER PE;Lo;0;L;30D8 309A;;;;N;;;;;
+30DB;KATAKANA LETTER HO;Lo;0;L;;;;;N;;;;;
+30DC;KATAKANA LETTER BO;Lo;0;L;30DB 3099;;;;N;;;;;
+30DD;KATAKANA LETTER PO;Lo;0;L;30DB 309A;;;;N;;;;;
+30DE;KATAKANA LETTER MA;Lo;0;L;;;;;N;;;;;
+30DF;KATAKANA LETTER MI;Lo;0;L;;;;;N;;;;;
+30E0;KATAKANA LETTER MU;Lo;0;L;;;;;N;;;;;
+30E1;KATAKANA LETTER ME;Lo;0;L;;;;;N;;;;;
+30E2;KATAKANA LETTER MO;Lo;0;L;;;;;N;;;;;
+30E3;KATAKANA LETTER SMALL YA;Lo;0;L;;;;;N;;;;;
+30E4;KATAKANA LETTER YA;Lo;0;L;;;;;N;;;;;
+30E5;KATAKANA LETTER SMALL YU;Lo;0;L;;;;;N;;;;;
+30E6;KATAKANA LETTER YU;Lo;0;L;;;;;N;;;;;
+30E7;KATAKANA LETTER SMALL YO;Lo;0;L;;;;;N;;;;;
+30E8;KATAKANA LETTER YO;Lo;0;L;;;;;N;;;;;
+30E9;KATAKANA LETTER RA;Lo;0;L;;;;;N;;;;;
+30EA;KATAKANA LETTER RI;Lo;0;L;;;;;N;;;;;
+30EB;KATAKANA LETTER RU;Lo;0;L;;;;;N;;;;;
+30EC;KATAKANA LETTER RE;Lo;0;L;;;;;N;;;;;
+30ED;KATAKANA LETTER RO;Lo;0;L;;;;;N;;;;;
+30EE;KATAKANA LETTER SMALL WA;Lo;0;L;;;;;N;;;;;
+30EF;KATAKANA LETTER WA;Lo;0;L;;;;;N;;;;;
+30F0;KATAKANA LETTER WI;Lo;0;L;;;;;N;;;;;
+30F1;KATAKANA LETTER WE;Lo;0;L;;;;;N;;;;;
+30F2;KATAKANA LETTER WO;Lo;0;L;;;;;N;;;;;
+30F3;KATAKANA LETTER N;Lo;0;L;;;;;N;;;;;
+30F4;KATAKANA LETTER VU;Lo;0;L;30A6 3099;;;;N;;;;;
+30F5;KATAKANA LETTER SMALL KA;Lo;0;L;;;;;N;;;;;
+30F6;KATAKANA LETTER SMALL KE;Lo;0;L;;;;;N;;;;;
+30F7;KATAKANA LETTER VA;Lo;0;L;30EF 3099;;;;N;;;;;
+30F8;KATAKANA LETTER VI;Lo;0;L;30F0 3099;;;;N;;;;;
+30F9;KATAKANA LETTER VE;Lo;0;L;30F1 3099;;;;N;;;;;
+30FA;KATAKANA LETTER VO;Lo;0;L;30F2 3099;;;;N;;;;;
+30FB;KATAKANA MIDDLE DOT;Po;0;ON;;;;;N;;;;;
+30FC;KATAKANA-HIRAGANA PROLONGED SOUND MARK;Lm;0;L;;;;;N;;;;;
+30FD;KATAKANA ITERATION MARK;Lm;0;L;;;;;N;;;;;
+30FE;KATAKANA VOICED ITERATION MARK;Lm;0;L;30FD 3099;;;;N;;;;;
+30FF;KATAKANA DIGRAPH KOTO;Lo;0;L;<vertical> 30B3 30C8;;;;N;;;;;
+3105;BOPOMOFO LETTER B;Lo;0;L;;;;;N;;;;;
+3106;BOPOMOFO LETTER P;Lo;0;L;;;;;N;;;;;
+3107;BOPOMOFO LETTER M;Lo;0;L;;;;;N;;;;;
+3108;BOPOMOFO LETTER F;Lo;0;L;;;;;N;;;;;
+3109;BOPOMOFO LETTER D;Lo;0;L;;;;;N;;;;;
+310A;BOPOMOFO LETTER T;Lo;0;L;;;;;N;;;;;
+310B;BOPOMOFO LETTER N;Lo;0;L;;;;;N;;;;;
+310C;BOPOMOFO LETTER L;Lo;0;L;;;;;N;;;;;
+310D;BOPOMOFO LETTER G;Lo;0;L;;;;;N;;;;;
+310E;BOPOMOFO LETTER K;Lo;0;L;;;;;N;;;;;
+310F;BOPOMOFO LETTER H;Lo;0;L;;;;;N;;;;;
+3110;BOPOMOFO LETTER J;Lo;0;L;;;;;N;;;;;
+3111;BOPOMOFO LETTER Q;Lo;0;L;;;;;N;;;;;
+3112;BOPOMOFO LETTER X;Lo;0;L;;;;;N;;;;;
+3113;BOPOMOFO LETTER ZH;Lo;0;L;;;;;N;;;;;
+3114;BOPOMOFO LETTER CH;Lo;0;L;;;;;N;;;;;
+3115;BOPOMOFO LETTER SH;Lo;0;L;;;;;N;;;;;
+3116;BOPOMOFO LETTER R;Lo;0;L;;;;;N;;;;;
+3117;BOPOMOFO LETTER Z;Lo;0;L;;;;;N;;;;;
+3118;BOPOMOFO LETTER C;Lo;0;L;;;;;N;;;;;
+3119;BOPOMOFO LETTER S;Lo;0;L;;;;;N;;;;;
+311A;BOPOMOFO LETTER A;Lo;0;L;;;;;N;;;;;
+311B;BOPOMOFO LETTER O;Lo;0;L;;;;;N;;;;;
+311C;BOPOMOFO LETTER E;Lo;0;L;;;;;N;;;;;
+311D;BOPOMOFO LETTER EH;Lo;0;L;;;;;N;;;;;
+311E;BOPOMOFO LETTER AI;Lo;0;L;;;;;N;;;;;
+311F;BOPOMOFO LETTER EI;Lo;0;L;;;;;N;;;;;
+3120;BOPOMOFO LETTER AU;Lo;0;L;;;;;N;;;;;
+3121;BOPOMOFO LETTER OU;Lo;0;L;;;;;N;;;;;
+3122;BOPOMOFO LETTER AN;Lo;0;L;;;;;N;;;;;
+3123;BOPOMOFO LETTER EN;Lo;0;L;;;;;N;;;;;
+3124;BOPOMOFO LETTER ANG;Lo;0;L;;;;;N;;;;;
+3125;BOPOMOFO LETTER ENG;Lo;0;L;;;;;N;;;;;
+3126;BOPOMOFO LETTER ER;Lo;0;L;;;;;N;;;;;
+3127;BOPOMOFO LETTER I;Lo;0;L;;;;;N;;;;;
+3128;BOPOMOFO LETTER U;Lo;0;L;;;;;N;;;;;
+3129;BOPOMOFO LETTER IU;Lo;0;L;;;;;N;;;;;
+312A;BOPOMOFO LETTER V;Lo;0;L;;;;;N;;;;;
+312B;BOPOMOFO LETTER NG;Lo;0;L;;;;;N;;;;;
+312C;BOPOMOFO LETTER GN;Lo;0;L;;;;;N;;;;;
+312D;BOPOMOFO LETTER IH;Lo;0;L;;;;;N;;;;;
+3131;HANGUL LETTER KIYEOK;Lo;0;L;<compat> 1100;;;;N;HANGUL LETTER GIYEOG;;;;
+3132;HANGUL LETTER SSANGKIYEOK;Lo;0;L;<compat> 1101;;;;N;HANGUL LETTER SSANG GIYEOG;;;;
+3133;HANGUL LETTER KIYEOK-SIOS;Lo;0;L;<compat> 11AA;;;;N;HANGUL LETTER GIYEOG SIOS;;;;
+3134;HANGUL LETTER NIEUN;Lo;0;L;<compat> 1102;;;;N;;;;;
+3135;HANGUL LETTER NIEUN-CIEUC;Lo;0;L;<compat> 11AC;;;;N;HANGUL LETTER NIEUN JIEUJ;;;;
+3136;HANGUL LETTER NIEUN-HIEUH;Lo;0;L;<compat> 11AD;;;;N;HANGUL LETTER NIEUN HIEUH;;;;
+3137;HANGUL LETTER TIKEUT;Lo;0;L;<compat> 1103;;;;N;HANGUL LETTER DIGEUD;;;;
+3138;HANGUL LETTER SSANGTIKEUT;Lo;0;L;<compat> 1104;;;;N;HANGUL LETTER SSANG DIGEUD;;;;
+3139;HANGUL LETTER RIEUL;Lo;0;L;<compat> 1105;;;;N;HANGUL LETTER LIEUL;;;;
+313A;HANGUL LETTER RIEUL-KIYEOK;Lo;0;L;<compat> 11B0;;;;N;HANGUL LETTER LIEUL GIYEOG;;;;
+313B;HANGUL LETTER RIEUL-MIEUM;Lo;0;L;<compat> 11B1;;;;N;HANGUL LETTER LIEUL MIEUM;;;;
+313C;HANGUL LETTER RIEUL-PIEUP;Lo;0;L;<compat> 11B2;;;;N;HANGUL LETTER LIEUL BIEUB;;;;
+313D;HANGUL LETTER RIEUL-SIOS;Lo;0;L;<compat> 11B3;;;;N;HANGUL LETTER LIEUL SIOS;;;;
+313E;HANGUL LETTER RIEUL-THIEUTH;Lo;0;L;<compat> 11B4;;;;N;HANGUL LETTER LIEUL TIEUT;;;;
+313F;HANGUL LETTER RIEUL-PHIEUPH;Lo;0;L;<compat> 11B5;;;;N;HANGUL LETTER LIEUL PIEUP;;;;
+3140;HANGUL LETTER RIEUL-HIEUH;Lo;0;L;<compat> 111A;;;;N;HANGUL LETTER LIEUL HIEUH;;;;
+3141;HANGUL LETTER MIEUM;Lo;0;L;<compat> 1106;;;;N;;;;;
+3142;HANGUL LETTER PIEUP;Lo;0;L;<compat> 1107;;;;N;HANGUL LETTER BIEUB;;;;
+3143;HANGUL LETTER SSANGPIEUP;Lo;0;L;<compat> 1108;;;;N;HANGUL LETTER SSANG BIEUB;;;;
+3144;HANGUL LETTER PIEUP-SIOS;Lo;0;L;<compat> 1121;;;;N;HANGUL LETTER BIEUB SIOS;;;;
+3145;HANGUL LETTER SIOS;Lo;0;L;<compat> 1109;;;;N;;;;;
+3146;HANGUL LETTER SSANGSIOS;Lo;0;L;<compat> 110A;;;;N;HANGUL LETTER SSANG SIOS;;;;
+3147;HANGUL LETTER IEUNG;Lo;0;L;<compat> 110B;;;;N;;;;;
+3148;HANGUL LETTER CIEUC;Lo;0;L;<compat> 110C;;;;N;HANGUL LETTER JIEUJ;;;;
+3149;HANGUL LETTER SSANGCIEUC;Lo;0;L;<compat> 110D;;;;N;HANGUL LETTER SSANG JIEUJ;;;;
+314A;HANGUL LETTER CHIEUCH;Lo;0;L;<compat> 110E;;;;N;HANGUL LETTER CIEUC;;;;
+314B;HANGUL LETTER KHIEUKH;Lo;0;L;<compat> 110F;;;;N;HANGUL LETTER KIYEOK;;;;
+314C;HANGUL LETTER THIEUTH;Lo;0;L;<compat> 1110;;;;N;HANGUL LETTER TIEUT;;;;
+314D;HANGUL LETTER PHIEUPH;Lo;0;L;<compat> 1111;;;;N;HANGUL LETTER PIEUP;;;;
+314E;HANGUL LETTER HIEUH;Lo;0;L;<compat> 1112;;;;N;;;;;
+314F;HANGUL LETTER A;Lo;0;L;<compat> 1161;;;;N;;;;;
+3150;HANGUL LETTER AE;Lo;0;L;<compat> 1162;;;;N;;;;;
+3151;HANGUL LETTER YA;Lo;0;L;<compat> 1163;;;;N;;;;;
+3152;HANGUL LETTER YAE;Lo;0;L;<compat> 1164;;;;N;;;;;
+3153;HANGUL LETTER EO;Lo;0;L;<compat> 1165;;;;N;;;;;
+3154;HANGUL LETTER E;Lo;0;L;<compat> 1166;;;;N;;;;;
+3155;HANGUL LETTER YEO;Lo;0;L;<compat> 1167;;;;N;;;;;
+3156;HANGUL LETTER YE;Lo;0;L;<compat> 1168;;;;N;;;;;
+3157;HANGUL LETTER O;Lo;0;L;<compat> 1169;;;;N;;;;;
+3158;HANGUL LETTER WA;Lo;0;L;<compat> 116A;;;;N;;;;;
+3159;HANGUL LETTER WAE;Lo;0;L;<compat> 116B;;;;N;;;;;
+315A;HANGUL LETTER OE;Lo;0;L;<compat> 116C;;;;N;;;;;
+315B;HANGUL LETTER YO;Lo;0;L;<compat> 116D;;;;N;;;;;
+315C;HANGUL LETTER U;Lo;0;L;<compat> 116E;;;;N;;;;;
+315D;HANGUL LETTER WEO;Lo;0;L;<compat> 116F;;;;N;;;;;
+315E;HANGUL LETTER WE;Lo;0;L;<compat> 1170;;;;N;;;;;
+315F;HANGUL LETTER WI;Lo;0;L;<compat> 1171;;;;N;;;;;
+3160;HANGUL LETTER YU;Lo;0;L;<compat> 1172;;;;N;;;;;
+3161;HANGUL LETTER EU;Lo;0;L;<compat> 1173;;;;N;;;;;
+3162;HANGUL LETTER YI;Lo;0;L;<compat> 1174;;;;N;;;;;
+3163;HANGUL LETTER I;Lo;0;L;<compat> 1175;;;;N;;;;;
+3164;HANGUL FILLER;Lo;0;L;<compat> 1160;;;;N;HANGUL CAE OM;;;;
+3165;HANGUL LETTER SSANGNIEUN;Lo;0;L;<compat> 1114;;;;N;HANGUL LETTER SSANG NIEUN;;;;
+3166;HANGUL LETTER NIEUN-TIKEUT;Lo;0;L;<compat> 1115;;;;N;HANGUL LETTER NIEUN DIGEUD;;;;
+3167;HANGUL LETTER NIEUN-SIOS;Lo;0;L;<compat> 11C7;;;;N;HANGUL LETTER NIEUN SIOS;;;;
+3168;HANGUL LETTER NIEUN-PANSIOS;Lo;0;L;<compat> 11C8;;;;N;HANGUL LETTER NIEUN BAN CHI EUM;;;;
+3169;HANGUL LETTER RIEUL-KIYEOK-SIOS;Lo;0;L;<compat> 11CC;;;;N;HANGUL LETTER LIEUL GIYEOG SIOS;;;;
+316A;HANGUL LETTER RIEUL-TIKEUT;Lo;0;L;<compat> 11CE;;;;N;HANGUL LETTER LIEUL DIGEUD;;;;
+316B;HANGUL LETTER RIEUL-PIEUP-SIOS;Lo;0;L;<compat> 11D3;;;;N;HANGUL LETTER LIEUL BIEUB SIOS;;;;
+316C;HANGUL LETTER RIEUL-PANSIOS;Lo;0;L;<compat> 11D7;;;;N;HANGUL LETTER LIEUL BAN CHI EUM;;;;
+316D;HANGUL LETTER RIEUL-YEORINHIEUH;Lo;0;L;<compat> 11D9;;;;N;HANGUL LETTER LIEUL YEOLIN HIEUH;;;;
+316E;HANGUL LETTER MIEUM-PIEUP;Lo;0;L;<compat> 111C;;;;N;HANGUL LETTER MIEUM BIEUB;;;;
+316F;HANGUL LETTER MIEUM-SIOS;Lo;0;L;<compat> 11DD;;;;N;HANGUL LETTER MIEUM SIOS;;;;
+3170;HANGUL LETTER MIEUM-PANSIOS;Lo;0;L;<compat> 11DF;;;;N;HANGUL LETTER BIEUB BAN CHI EUM;;;;
+3171;HANGUL LETTER KAPYEOUNMIEUM;Lo;0;L;<compat> 111D;;;;N;HANGUL LETTER MIEUM SUN GYEONG EUM;;;;
+3172;HANGUL LETTER PIEUP-KIYEOK;Lo;0;L;<compat> 111E;;;;N;HANGUL LETTER BIEUB GIYEOG;;;;
+3173;HANGUL LETTER PIEUP-TIKEUT;Lo;0;L;<compat> 1120;;;;N;HANGUL LETTER BIEUB DIGEUD;;;;
+3174;HANGUL LETTER PIEUP-SIOS-KIYEOK;Lo;0;L;<compat> 1122;;;;N;HANGUL LETTER BIEUB SIOS GIYEOG;;;;
+3175;HANGUL LETTER PIEUP-SIOS-TIKEUT;Lo;0;L;<compat> 1123;;;;N;HANGUL LETTER BIEUB SIOS DIGEUD;;;;
+3176;HANGUL LETTER PIEUP-CIEUC;Lo;0;L;<compat> 1127;;;;N;HANGUL LETTER BIEUB JIEUJ;;;;
+3177;HANGUL LETTER PIEUP-THIEUTH;Lo;0;L;<compat> 1129;;;;N;HANGUL LETTER BIEUB TIEUT;;;;
+3178;HANGUL LETTER KAPYEOUNPIEUP;Lo;0;L;<compat> 112B;;;;N;HANGUL LETTER BIEUB SUN GYEONG EUM;;;;
+3179;HANGUL LETTER KAPYEOUNSSANGPIEUP;Lo;0;L;<compat> 112C;;;;N;HANGUL LETTER SSANG BIEUB SUN GYEONG EUM;;;;
+317A;HANGUL LETTER SIOS-KIYEOK;Lo;0;L;<compat> 112D;;;;N;HANGUL LETTER SIOS GIYEOG;;;;
+317B;HANGUL LETTER SIOS-NIEUN;Lo;0;L;<compat> 112E;;;;N;HANGUL LETTER SIOS NIEUN;;;;
+317C;HANGUL LETTER SIOS-TIKEUT;Lo;0;L;<compat> 112F;;;;N;HANGUL LETTER SIOS DIGEUD;;;;
+317D;HANGUL LETTER SIOS-PIEUP;Lo;0;L;<compat> 1132;;;;N;HANGUL LETTER SIOS BIEUB;;;;
+317E;HANGUL LETTER SIOS-CIEUC;Lo;0;L;<compat> 1136;;;;N;HANGUL LETTER SIOS JIEUJ;;;;
+317F;HANGUL LETTER PANSIOS;Lo;0;L;<compat> 1140;;;;N;HANGUL LETTER BAN CHI EUM;;;;
+3180;HANGUL LETTER SSANGIEUNG;Lo;0;L;<compat> 1147;;;;N;HANGUL LETTER SSANG IEUNG;;;;
+3181;HANGUL LETTER YESIEUNG;Lo;0;L;<compat> 114C;;;;N;HANGUL LETTER NGIEUNG;;;;
+3182;HANGUL LETTER YESIEUNG-SIOS;Lo;0;L;<compat> 11F1;;;;N;HANGUL LETTER NGIEUNG SIOS;;;;
+3183;HANGUL LETTER YESIEUNG-PANSIOS;Lo;0;L;<compat> 11F2;;;;N;HANGUL LETTER NGIEUNG BAN CHI EUM;;;;
+3184;HANGUL LETTER KAPYEOUNPHIEUPH;Lo;0;L;<compat> 1157;;;;N;HANGUL LETTER PIEUP SUN GYEONG EUM;;;;
+3185;HANGUL LETTER SSANGHIEUH;Lo;0;L;<compat> 1158;;;;N;HANGUL LETTER SSANG HIEUH;;;;
+3186;HANGUL LETTER YEORINHIEUH;Lo;0;L;<compat> 1159;;;;N;HANGUL LETTER YEOLIN HIEUH;;;;
+3187;HANGUL LETTER YO-YA;Lo;0;L;<compat> 1184;;;;N;HANGUL LETTER YOYA;;;;
+3188;HANGUL LETTER YO-YAE;Lo;0;L;<compat> 1185;;;;N;HANGUL LETTER YOYAE;;;;
+3189;HANGUL LETTER YO-I;Lo;0;L;<compat> 1188;;;;N;HANGUL LETTER YOI;;;;
+318A;HANGUL LETTER YU-YEO;Lo;0;L;<compat> 1191;;;;N;HANGUL LETTER YUYEO;;;;
+318B;HANGUL LETTER YU-YE;Lo;0;L;<compat> 1192;;;;N;HANGUL LETTER YUYE;;;;
+318C;HANGUL LETTER YU-I;Lo;0;L;<compat> 1194;;;;N;HANGUL LETTER YUI;;;;
+318D;HANGUL LETTER ARAEA;Lo;0;L;<compat> 119E;;;;N;HANGUL LETTER ALAE A;;;;
+318E;HANGUL LETTER ARAEAE;Lo;0;L;<compat> 11A1;;;;N;HANGUL LETTER ALAE AE;;;;
+3190;IDEOGRAPHIC ANNOTATION LINKING MARK;So;0;L;;;;;N;KANBUN TATETEN;Kanbun Tateten;;;
+3191;IDEOGRAPHIC ANNOTATION REVERSE MARK;So;0;L;;;;;N;KAERITEN RE;Kaeriten;;;
+3192;IDEOGRAPHIC ANNOTATION ONE MARK;No;0;L;<super> 4E00;;;1;N;KAERITEN ITI;Kaeriten;;;
+3193;IDEOGRAPHIC ANNOTATION TWO MARK;No;0;L;<super> 4E8C;;;2;N;KAERITEN NI;Kaeriten;;;
+3194;IDEOGRAPHIC ANNOTATION THREE MARK;No;0;L;<super> 4E09;;;3;N;KAERITEN SAN;Kaeriten;;;
+3195;IDEOGRAPHIC ANNOTATION FOUR MARK;No;0;L;<super> 56DB;;;4;N;KAERITEN SI;Kaeriten;;;
+3196;IDEOGRAPHIC ANNOTATION TOP MARK;So;0;L;<super> 4E0A;;;;N;KAERITEN ZYOU;Kaeriten;;;
+3197;IDEOGRAPHIC ANNOTATION MIDDLE MARK;So;0;L;<super> 4E2D;;;;N;KAERITEN TYUU;Kaeriten;;;
+3198;IDEOGRAPHIC ANNOTATION BOTTOM MARK;So;0;L;<super> 4E0B;;;;N;KAERITEN GE;Kaeriten;;;
+3199;IDEOGRAPHIC ANNOTATION FIRST MARK;So;0;L;<super> 7532;;;;N;KAERITEN KOU;Kaeriten;;;
+319A;IDEOGRAPHIC ANNOTATION SECOND MARK;So;0;L;<super> 4E59;;;;N;KAERITEN OTU;Kaeriten;;;
+319B;IDEOGRAPHIC ANNOTATION THIRD MARK;So;0;L;<super> 4E19;;;;N;KAERITEN HEI;Kaeriten;;;
+319C;IDEOGRAPHIC ANNOTATION FOURTH MARK;So;0;L;<super> 4E01;;;;N;KAERITEN TEI;Kaeriten;;;
+319D;IDEOGRAPHIC ANNOTATION HEAVEN MARK;So;0;L;<super> 5929;;;;N;KAERITEN TEN;Kaeriten;;;
+319E;IDEOGRAPHIC ANNOTATION EARTH MARK;So;0;L;<super> 5730;;;;N;KAERITEN TI;Kaeriten;;;
+319F;IDEOGRAPHIC ANNOTATION MAN MARK;So;0;L;<super> 4EBA;;;;N;KAERITEN ZIN;Kaeriten;;;
+31A0;BOPOMOFO LETTER BU;Lo;0;L;;;;;N;;;;;
+31A1;BOPOMOFO LETTER ZI;Lo;0;L;;;;;N;;;;;
+31A2;BOPOMOFO LETTER JI;Lo;0;L;;;;;N;;;;;
+31A3;BOPOMOFO LETTER GU;Lo;0;L;;;;;N;;;;;
+31A4;BOPOMOFO LETTER EE;Lo;0;L;;;;;N;;;;;
+31A5;BOPOMOFO LETTER ENN;Lo;0;L;;;;;N;;;;;
+31A6;BOPOMOFO LETTER OO;Lo;0;L;;;;;N;;;;;
+31A7;BOPOMOFO LETTER ONN;Lo;0;L;;;;;N;;;;;
+31A8;BOPOMOFO LETTER IR;Lo;0;L;;;;;N;;;;;
+31A9;BOPOMOFO LETTER ANN;Lo;0;L;;;;;N;;;;;
+31AA;BOPOMOFO LETTER INN;Lo;0;L;;;;;N;;;;;
+31AB;BOPOMOFO LETTER UNN;Lo;0;L;;;;;N;;;;;
+31AC;BOPOMOFO LETTER IM;Lo;0;L;;;;;N;;;;;
+31AD;BOPOMOFO LETTER NGG;Lo;0;L;;;;;N;;;;;
+31AE;BOPOMOFO LETTER AINN;Lo;0;L;;;;;N;;;;;
+31AF;BOPOMOFO LETTER AUNN;Lo;0;L;;;;;N;;;;;
+31B0;BOPOMOFO LETTER AM;Lo;0;L;;;;;N;;;;;
+31B1;BOPOMOFO LETTER OM;Lo;0;L;;;;;N;;;;;
+31B2;BOPOMOFO LETTER ONG;Lo;0;L;;;;;N;;;;;
+31B3;BOPOMOFO LETTER INNN;Lo;0;L;;;;;N;;;;;
+31B4;BOPOMOFO FINAL LETTER P;Lo;0;L;;;;;N;;;;;
+31B5;BOPOMOFO FINAL LETTER T;Lo;0;L;;;;;N;;;;;
+31B6;BOPOMOFO FINAL LETTER K;Lo;0;L;;;;;N;;;;;
+31B7;BOPOMOFO FINAL LETTER H;Lo;0;L;;;;;N;;;;;
+31C0;CJK STROKE T;So;0;ON;;;;;N;;;;;
+31C1;CJK STROKE WG;So;0;ON;;;;;N;;;;;
+31C2;CJK STROKE XG;So;0;ON;;;;;N;;;;;
+31C3;CJK STROKE BXG;So;0;ON;;;;;N;;;;;
+31C4;CJK STROKE SW;So;0;ON;;;;;N;;;;;
+31C5;CJK STROKE HZZ;So;0;ON;;;;;N;;;;;
+31C6;CJK STROKE HZG;So;0;ON;;;;;N;;;;;
+31C7;CJK STROKE HP;So;0;ON;;;;;N;;;;;
+31C8;CJK STROKE HZWG;So;0;ON;;;;;N;;;;;
+31C9;CJK STROKE SZWG;So;0;ON;;;;;N;;;;;
+31CA;CJK STROKE HZT;So;0;ON;;;;;N;;;;;
+31CB;CJK STROKE HZZP;So;0;ON;;;;;N;;;;;
+31CC;CJK STROKE HPWG;So;0;ON;;;;;N;;;;;
+31CD;CJK STROKE HZW;So;0;ON;;;;;N;;;;;
+31CE;CJK STROKE HZZZ;So;0;ON;;;;;N;;;;;
+31CF;CJK STROKE N;So;0;ON;;;;;N;;;;;
+31D0;CJK STROKE H;So;0;ON;;;;;N;;;;;
+31D1;CJK STROKE S;So;0;ON;;;;;N;;;;;
+31D2;CJK STROKE P;So;0;ON;;;;;N;;;;;
+31D3;CJK STROKE SP;So;0;ON;;;;;N;;;;;
+31D4;CJK STROKE D;So;0;ON;;;;;N;;;;;
+31D5;CJK STROKE HZ;So;0;ON;;;;;N;;;;;
+31D6;CJK STROKE HG;So;0;ON;;;;;N;;;;;
+31D7;CJK STROKE SZ;So;0;ON;;;;;N;;;;;
+31D8;CJK STROKE SWZ;So;0;ON;;;;;N;;;;;
+31D9;CJK STROKE ST;So;0;ON;;;;;N;;;;;
+31DA;CJK STROKE SG;So;0;ON;;;;;N;;;;;
+31DB;CJK STROKE PD;So;0;ON;;;;;N;;;;;
+31DC;CJK STROKE PZ;So;0;ON;;;;;N;;;;;
+31DD;CJK STROKE TN;So;0;ON;;;;;N;;;;;
+31DE;CJK STROKE SZZ;So;0;ON;;;;;N;;;;;
+31DF;CJK STROKE SWG;So;0;ON;;;;;N;;;;;
+31E0;CJK STROKE HXWG;So;0;ON;;;;;N;;;;;
+31E1;CJK STROKE HZZZG;So;0;ON;;;;;N;;;;;
+31E2;CJK STROKE PG;So;0;ON;;;;;N;;;;;
+31E3;CJK STROKE Q;So;0;ON;;;;;N;;;;;
+31F0;KATAKANA LETTER SMALL KU;Lo;0;L;;;;;N;;;;;
+31F1;KATAKANA LETTER SMALL SI;Lo;0;L;;;;;N;;;;;
+31F2;KATAKANA LETTER SMALL SU;Lo;0;L;;;;;N;;;;;
+31F3;KATAKANA LETTER SMALL TO;Lo;0;L;;;;;N;;;;;
+31F4;KATAKANA LETTER SMALL NU;Lo;0;L;;;;;N;;;;;
+31F5;KATAKANA LETTER SMALL HA;Lo;0;L;;;;;N;;;;;
+31F6;KATAKANA LETTER SMALL HI;Lo;0;L;;;;;N;;;;;
+31F7;KATAKANA LETTER SMALL HU;Lo;0;L;;;;;N;;;;;
+31F8;KATAKANA LETTER SMALL HE;Lo;0;L;;;;;N;;;;;
+31F9;KATAKANA LETTER SMALL HO;Lo;0;L;;;;;N;;;;;
+31FA;KATAKANA LETTER SMALL MU;Lo;0;L;;;;;N;;;;;
+31FB;KATAKANA LETTER SMALL RA;Lo;0;L;;;;;N;;;;;
+31FC;KATAKANA LETTER SMALL RI;Lo;0;L;;;;;N;;;;;
+31FD;KATAKANA LETTER SMALL RU;Lo;0;L;;;;;N;;;;;
+31FE;KATAKANA LETTER SMALL RE;Lo;0;L;;;;;N;;;;;
+31FF;KATAKANA LETTER SMALL RO;Lo;0;L;;;;;N;;;;;
+3200;PARENTHESIZED HANGUL KIYEOK;So;0;L;<compat> 0028 1100 0029;;;;N;PARENTHESIZED HANGUL GIYEOG;;;;
+3201;PARENTHESIZED HANGUL NIEUN;So;0;L;<compat> 0028 1102 0029;;;;N;;;;;
+3202;PARENTHESIZED HANGUL TIKEUT;So;0;L;<compat> 0028 1103 0029;;;;N;PARENTHESIZED HANGUL DIGEUD;;;;
+3203;PARENTHESIZED HANGUL RIEUL;So;0;L;<compat> 0028 1105 0029;;;;N;PARENTHESIZED HANGUL LIEUL;;;;
+3204;PARENTHESIZED HANGUL MIEUM;So;0;L;<compat> 0028 1106 0029;;;;N;;;;;
+3205;PARENTHESIZED HANGUL PIEUP;So;0;L;<compat> 0028 1107 0029;;;;N;PARENTHESIZED HANGUL BIEUB;;;;
+3206;PARENTHESIZED HANGUL SIOS;So;0;L;<compat> 0028 1109 0029;;;;N;;;;;
+3207;PARENTHESIZED HANGUL IEUNG;So;0;L;<compat> 0028 110B 0029;;;;N;;;;;
+3208;PARENTHESIZED HANGUL CIEUC;So;0;L;<compat> 0028 110C 0029;;;;N;PARENTHESIZED HANGUL JIEUJ;;;;
+3209;PARENTHESIZED HANGUL CHIEUCH;So;0;L;<compat> 0028 110E 0029;;;;N;PARENTHESIZED HANGUL CIEUC;;;;
+320A;PARENTHESIZED HANGUL KHIEUKH;So;0;L;<compat> 0028 110F 0029;;;;N;PARENTHESIZED HANGUL KIYEOK;;;;
+320B;PARENTHESIZED HANGUL THIEUTH;So;0;L;<compat> 0028 1110 0029;;;;N;PARENTHESIZED HANGUL TIEUT;;;;
+320C;PARENTHESIZED HANGUL PHIEUPH;So;0;L;<compat> 0028 1111 0029;;;;N;PARENTHESIZED HANGUL PIEUP;;;;
+320D;PARENTHESIZED HANGUL HIEUH;So;0;L;<compat> 0028 1112 0029;;;;N;;;;;
+320E;PARENTHESIZED HANGUL KIYEOK A;So;0;L;<compat> 0028 1100 1161 0029;;;;N;PARENTHESIZED HANGUL GA;;;;
+320F;PARENTHESIZED HANGUL NIEUN A;So;0;L;<compat> 0028 1102 1161 0029;;;;N;PARENTHESIZED HANGUL NA;;;;
+3210;PARENTHESIZED HANGUL TIKEUT A;So;0;L;<compat> 0028 1103 1161 0029;;;;N;PARENTHESIZED HANGUL DA;;;;
+3211;PARENTHESIZED HANGUL RIEUL A;So;0;L;<compat> 0028 1105 1161 0029;;;;N;PARENTHESIZED HANGUL LA;;;;
+3212;PARENTHESIZED HANGUL MIEUM A;So;0;L;<compat> 0028 1106 1161 0029;;;;N;PARENTHESIZED HANGUL MA;;;;
+3213;PARENTHESIZED HANGUL PIEUP A;So;0;L;<compat> 0028 1107 1161 0029;;;;N;PARENTHESIZED HANGUL BA;;;;
+3214;PARENTHESIZED HANGUL SIOS A;So;0;L;<compat> 0028 1109 1161 0029;;;;N;PARENTHESIZED HANGUL SA;;;;
+3215;PARENTHESIZED HANGUL IEUNG A;So;0;L;<compat> 0028 110B 1161 0029;;;;N;PARENTHESIZED HANGUL A;;;;
+3216;PARENTHESIZED HANGUL CIEUC A;So;0;L;<compat> 0028 110C 1161 0029;;;;N;PARENTHESIZED HANGUL JA;;;;
+3217;PARENTHESIZED HANGUL CHIEUCH A;So;0;L;<compat> 0028 110E 1161 0029;;;;N;PARENTHESIZED HANGUL CA;;;;
+3218;PARENTHESIZED HANGUL KHIEUKH A;So;0;L;<compat> 0028 110F 1161 0029;;;;N;PARENTHESIZED HANGUL KA;;;;
+3219;PARENTHESIZED HANGUL THIEUTH A;So;0;L;<compat> 0028 1110 1161 0029;;;;N;PARENTHESIZED HANGUL TA;;;;
+321A;PARENTHESIZED HANGUL PHIEUPH A;So;0;L;<compat> 0028 1111 1161 0029;;;;N;PARENTHESIZED HANGUL PA;;;;
+321B;PARENTHESIZED HANGUL HIEUH A;So;0;L;<compat> 0028 1112 1161 0029;;;;N;PARENTHESIZED HANGUL HA;;;;
+321C;PARENTHESIZED HANGUL CIEUC U;So;0;L;<compat> 0028 110C 116E 0029;;;;N;PARENTHESIZED HANGUL JU;;;;
+321D;PARENTHESIZED KOREAN CHARACTER OJEON;So;0;ON;<compat> 0028 110B 1169 110C 1165 11AB 0029;;;;N;;;;;
+321E;PARENTHESIZED KOREAN CHARACTER O HU;So;0;ON;<compat> 0028 110B 1169 1112 116E 0029;;;;N;;;;;
+3220;PARENTHESIZED IDEOGRAPH ONE;No;0;L;<compat> 0028 4E00 0029;;;1;N;;;;;
+3221;PARENTHESIZED IDEOGRAPH TWO;No;0;L;<compat> 0028 4E8C 0029;;;2;N;;;;;
+3222;PARENTHESIZED IDEOGRAPH THREE;No;0;L;<compat> 0028 4E09 0029;;;3;N;;;;;
+3223;PARENTHESIZED IDEOGRAPH FOUR;No;0;L;<compat> 0028 56DB 0029;;;4;N;;;;;
+3224;PARENTHESIZED IDEOGRAPH FIVE;No;0;L;<compat> 0028 4E94 0029;;;5;N;;;;;
+3225;PARENTHESIZED IDEOGRAPH SIX;No;0;L;<compat> 0028 516D 0029;;;6;N;;;;;
+3226;PARENTHESIZED IDEOGRAPH SEVEN;No;0;L;<compat> 0028 4E03 0029;;;7;N;;;;;
+3227;PARENTHESIZED IDEOGRAPH EIGHT;No;0;L;<compat> 0028 516B 0029;;;8;N;;;;;
+3228;PARENTHESIZED IDEOGRAPH NINE;No;0;L;<compat> 0028 4E5D 0029;;;9;N;;;;;
+3229;PARENTHESIZED IDEOGRAPH TEN;No;0;L;<compat> 0028 5341 0029;;;10;N;;;;;
+322A;PARENTHESIZED IDEOGRAPH MOON;So;0;L;<compat> 0028 6708 0029;;;;N;;;;;
+322B;PARENTHESIZED IDEOGRAPH FIRE;So;0;L;<compat> 0028 706B 0029;;;;N;;;;;
+322C;PARENTHESIZED IDEOGRAPH WATER;So;0;L;<compat> 0028 6C34 0029;;;;N;;;;;
+322D;PARENTHESIZED IDEOGRAPH WOOD;So;0;L;<compat> 0028 6728 0029;;;;N;;;;;
+322E;PARENTHESIZED IDEOGRAPH METAL;So;0;L;<compat> 0028 91D1 0029;;;;N;;;;;
+322F;PARENTHESIZED IDEOGRAPH EARTH;So;0;L;<compat> 0028 571F 0029;;;;N;;;;;
+3230;PARENTHESIZED IDEOGRAPH SUN;So;0;L;<compat> 0028 65E5 0029;;;;N;;;;;
+3231;PARENTHESIZED IDEOGRAPH STOCK;So;0;L;<compat> 0028 682A 0029;;;;N;;;;;
+3232;PARENTHESIZED IDEOGRAPH HAVE;So;0;L;<compat> 0028 6709 0029;;;;N;;;;;
+3233;PARENTHESIZED IDEOGRAPH SOCIETY;So;0;L;<compat> 0028 793E 0029;;;;N;;;;;
+3234;PARENTHESIZED IDEOGRAPH NAME;So;0;L;<compat> 0028 540D 0029;;;;N;;;;;
+3235;PARENTHESIZED IDEOGRAPH SPECIAL;So;0;L;<compat> 0028 7279 0029;;;;N;;;;;
+3236;PARENTHESIZED IDEOGRAPH FINANCIAL;So;0;L;<compat> 0028 8CA1 0029;;;;N;;;;;
+3237;PARENTHESIZED IDEOGRAPH CONGRATULATION;So;0;L;<compat> 0028 795D 0029;;;;N;;;;;
+3238;PARENTHESIZED IDEOGRAPH LABOR;So;0;L;<compat> 0028 52B4 0029;;;;N;;;;;
+3239;PARENTHESIZED IDEOGRAPH REPRESENT;So;0;L;<compat> 0028 4EE3 0029;;;;N;;;;;
+323A;PARENTHESIZED IDEOGRAPH CALL;So;0;L;<compat> 0028 547C 0029;;;;N;;;;;
+323B;PARENTHESIZED IDEOGRAPH STUDY;So;0;L;<compat> 0028 5B66 0029;;;;N;;;;;
+323C;PARENTHESIZED IDEOGRAPH SUPERVISE;So;0;L;<compat> 0028 76E3 0029;;;;N;;;;;
+323D;PARENTHESIZED IDEOGRAPH ENTERPRISE;So;0;L;<compat> 0028 4F01 0029;;;;N;;;;;
+323E;PARENTHESIZED IDEOGRAPH RESOURCE;So;0;L;<compat> 0028 8CC7 0029;;;;N;;;;;
+323F;PARENTHESIZED IDEOGRAPH ALLIANCE;So;0;L;<compat> 0028 5354 0029;;;;N;;;;;
+3240;PARENTHESIZED IDEOGRAPH FESTIVAL;So;0;L;<compat> 0028 796D 0029;;;;N;;;;;
+3241;PARENTHESIZED IDEOGRAPH REST;So;0;L;<compat> 0028 4F11 0029;;;;N;;;;;
+3242;PARENTHESIZED IDEOGRAPH SELF;So;0;L;<compat> 0028 81EA 0029;;;;N;;;;;
+3243;PARENTHESIZED IDEOGRAPH REACH;So;0;L;<compat> 0028 81F3 0029;;;;N;;;;;
+3250;PARTNERSHIP SIGN;So;0;ON;<square> 0050 0054 0045;;;;N;;;;;
+3251;CIRCLED NUMBER TWENTY ONE;No;0;ON;<circle> 0032 0031;;;21;N;;;;;
+3252;CIRCLED NUMBER TWENTY TWO;No;0;ON;<circle> 0032 0032;;;22;N;;;;;
+3253;CIRCLED NUMBER TWENTY THREE;No;0;ON;<circle> 0032 0033;;;23;N;;;;;
+3254;CIRCLED NUMBER TWENTY FOUR;No;0;ON;<circle> 0032 0034;;;24;N;;;;;
+3255;CIRCLED NUMBER TWENTY FIVE;No;0;ON;<circle> 0032 0035;;;25;N;;;;;
+3256;CIRCLED NUMBER TWENTY SIX;No;0;ON;<circle> 0032 0036;;;26;N;;;;;
+3257;CIRCLED NUMBER TWENTY SEVEN;No;0;ON;<circle> 0032 0037;;;27;N;;;;;
+3258;CIRCLED NUMBER TWENTY EIGHT;No;0;ON;<circle> 0032 0038;;;28;N;;;;;
+3259;CIRCLED NUMBER TWENTY NINE;No;0;ON;<circle> 0032 0039;;;29;N;;;;;
+325A;CIRCLED NUMBER THIRTY;No;0;ON;<circle> 0033 0030;;;30;N;;;;;
+325B;CIRCLED NUMBER THIRTY ONE;No;0;ON;<circle> 0033 0031;;;31;N;;;;;
+325C;CIRCLED NUMBER THIRTY TWO;No;0;ON;<circle> 0033 0032;;;32;N;;;;;
+325D;CIRCLED NUMBER THIRTY THREE;No;0;ON;<circle> 0033 0033;;;33;N;;;;;
+325E;CIRCLED NUMBER THIRTY FOUR;No;0;ON;<circle> 0033 0034;;;34;N;;;;;
+325F;CIRCLED NUMBER THIRTY FIVE;No;0;ON;<circle> 0033 0035;;;35;N;;;;;
+3260;CIRCLED HANGUL KIYEOK;So;0;L;<circle> 1100;;;;N;CIRCLED HANGUL GIYEOG;;;;
+3261;CIRCLED HANGUL NIEUN;So;0;L;<circle> 1102;;;;N;;;;;
+3262;CIRCLED HANGUL TIKEUT;So;0;L;<circle> 1103;;;;N;CIRCLED HANGUL DIGEUD;;;;
+3263;CIRCLED HANGUL RIEUL;So;0;L;<circle> 1105;;;;N;CIRCLED HANGUL LIEUL;;;;
+3264;CIRCLED HANGUL MIEUM;So;0;L;<circle> 1106;;;;N;;;;;
+3265;CIRCLED HANGUL PIEUP;So;0;L;<circle> 1107;;;;N;CIRCLED HANGUL BIEUB;;;;
+3266;CIRCLED HANGUL SIOS;So;0;L;<circle> 1109;;;;N;;;;;
+3267;CIRCLED HANGUL IEUNG;So;0;L;<circle> 110B;;;;N;;;;;
+3268;CIRCLED HANGUL CIEUC;So;0;L;<circle> 110C;;;;N;CIRCLED HANGUL JIEUJ;;;;
+3269;CIRCLED HANGUL CHIEUCH;So;0;L;<circle> 110E;;;;N;CIRCLED HANGUL CIEUC;;;;
+326A;CIRCLED HANGUL KHIEUKH;So;0;L;<circle> 110F;;;;N;CIRCLED HANGUL KIYEOK;;;;
+326B;CIRCLED HANGUL THIEUTH;So;0;L;<circle> 1110;;;;N;CIRCLED HANGUL TIEUT;;;;
+326C;CIRCLED HANGUL PHIEUPH;So;0;L;<circle> 1111;;;;N;CIRCLED HANGUL PIEUP;;;;
+326D;CIRCLED HANGUL HIEUH;So;0;L;<circle> 1112;;;;N;;;;;
+326E;CIRCLED HANGUL KIYEOK A;So;0;L;<circle> 1100 1161;;;;N;CIRCLED HANGUL GA;;;;
+326F;CIRCLED HANGUL NIEUN A;So;0;L;<circle> 1102 1161;;;;N;CIRCLED HANGUL NA;;;;
+3270;CIRCLED HANGUL TIKEUT A;So;0;L;<circle> 1103 1161;;;;N;CIRCLED HANGUL DA;;;;
+3271;CIRCLED HANGUL RIEUL A;So;0;L;<circle> 1105 1161;;;;N;CIRCLED HANGUL LA;;;;
+3272;CIRCLED HANGUL MIEUM A;So;0;L;<circle> 1106 1161;;;;N;CIRCLED HANGUL MA;;;;
+3273;CIRCLED HANGUL PIEUP A;So;0;L;<circle> 1107 1161;;;;N;CIRCLED HANGUL BA;;;;
+3274;CIRCLED HANGUL SIOS A;So;0;L;<circle> 1109 1161;;;;N;CIRCLED HANGUL SA;;;;
+3275;CIRCLED HANGUL IEUNG A;So;0;L;<circle> 110B 1161;;;;N;CIRCLED HANGUL A;;;;
+3276;CIRCLED HANGUL CIEUC A;So;0;L;<circle> 110C 1161;;;;N;CIRCLED HANGUL JA;;;;
+3277;CIRCLED HANGUL CHIEUCH A;So;0;L;<circle> 110E 1161;;;;N;CIRCLED HANGUL CA;;;;
+3278;CIRCLED HANGUL KHIEUKH A;So;0;L;<circle> 110F 1161;;;;N;CIRCLED HANGUL KA;;;;
+3279;CIRCLED HANGUL THIEUTH A;So;0;L;<circle> 1110 1161;;;;N;CIRCLED HANGUL TA;;;;
+327A;CIRCLED HANGUL PHIEUPH A;So;0;L;<circle> 1111 1161;;;;N;CIRCLED HANGUL PA;;;;
+327B;CIRCLED HANGUL HIEUH A;So;0;L;<circle> 1112 1161;;;;N;CIRCLED HANGUL HA;;;;
+327C;CIRCLED KOREAN CHARACTER CHAMKO;So;0;ON;<circle> 110E 1161 11B7 1100 1169;;;;N;;;;;
+327D;CIRCLED KOREAN CHARACTER JUEUI;So;0;ON;<circle> 110C 116E 110B 1174;;;;N;;;;;
+327E;CIRCLED HANGUL IEUNG U;So;0;ON;<circle> 110B 116E;;;;N;;;;;
+327F;KOREAN STANDARD SYMBOL;So;0;L;;;;;N;;;;;
+3280;CIRCLED IDEOGRAPH ONE;No;0;L;<circle> 4E00;;;1;N;;;;;
+3281;CIRCLED IDEOGRAPH TWO;No;0;L;<circle> 4E8C;;;2;N;;;;;
+3282;CIRCLED IDEOGRAPH THREE;No;0;L;<circle> 4E09;;;3;N;;;;;
+3283;CIRCLED IDEOGRAPH FOUR;No;0;L;<circle> 56DB;;;4;N;;;;;
+3284;CIRCLED IDEOGRAPH FIVE;No;0;L;<circle> 4E94;;;5;N;;;;;
+3285;CIRCLED IDEOGRAPH SIX;No;0;L;<circle> 516D;;;6;N;;;;;
+3286;CIRCLED IDEOGRAPH SEVEN;No;0;L;<circle> 4E03;;;7;N;;;;;
+3287;CIRCLED IDEOGRAPH EIGHT;No;0;L;<circle> 516B;;;8;N;;;;;
+3288;CIRCLED IDEOGRAPH NINE;No;0;L;<circle> 4E5D;;;9;N;;;;;
+3289;CIRCLED IDEOGRAPH TEN;No;0;L;<circle> 5341;;;10;N;;;;;
+328A;CIRCLED IDEOGRAPH MOON;So;0;L;<circle> 6708;;;;N;;;;;
+328B;CIRCLED IDEOGRAPH FIRE;So;0;L;<circle> 706B;;;;N;;;;;
+328C;CIRCLED IDEOGRAPH WATER;So;0;L;<circle> 6C34;;;;N;;;;;
+328D;CIRCLED IDEOGRAPH WOOD;So;0;L;<circle> 6728;;;;N;;;;;
+328E;CIRCLED IDEOGRAPH METAL;So;0;L;<circle> 91D1;;;;N;;;;;
+328F;CIRCLED IDEOGRAPH EARTH;So;0;L;<circle> 571F;;;;N;;;;;
+3290;CIRCLED IDEOGRAPH SUN;So;0;L;<circle> 65E5;;;;N;;;;;
+3291;CIRCLED IDEOGRAPH STOCK;So;0;L;<circle> 682A;;;;N;;;;;
+3292;CIRCLED IDEOGRAPH HAVE;So;0;L;<circle> 6709;;;;N;;;;;
+3293;CIRCLED IDEOGRAPH SOCIETY;So;0;L;<circle> 793E;;;;N;;;;;
+3294;CIRCLED IDEOGRAPH NAME;So;0;L;<circle> 540D;;;;N;;;;;
+3295;CIRCLED IDEOGRAPH SPECIAL;So;0;L;<circle> 7279;;;;N;;;;;
+3296;CIRCLED IDEOGRAPH FINANCIAL;So;0;L;<circle> 8CA1;;;;N;;;;;
+3297;CIRCLED IDEOGRAPH CONGRATULATION;So;0;L;<circle> 795D;;;;N;;;;;
+3298;CIRCLED IDEOGRAPH LABOR;So;0;L;<circle> 52B4;;;;N;;;;;
+3299;CIRCLED IDEOGRAPH SECRET;So;0;L;<circle> 79D8;;;;N;;;;;
+329A;CIRCLED IDEOGRAPH MALE;So;0;L;<circle> 7537;;;;N;;;;;
+329B;CIRCLED IDEOGRAPH FEMALE;So;0;L;<circle> 5973;;;;N;;;;;
+329C;CIRCLED IDEOGRAPH SUITABLE;So;0;L;<circle> 9069;;;;N;;;;;
+329D;CIRCLED IDEOGRAPH EXCELLENT;So;0;L;<circle> 512A;;;;N;;;;;
+329E;CIRCLED IDEOGRAPH PRINT;So;0;L;<circle> 5370;;;;N;;;;;
+329F;CIRCLED IDEOGRAPH ATTENTION;So;0;L;<circle> 6CE8;;;;N;;;;;
+32A0;CIRCLED IDEOGRAPH ITEM;So;0;L;<circle> 9805;;;;N;;;;;
+32A1;CIRCLED IDEOGRAPH REST;So;0;L;<circle> 4F11;;;;N;;;;;
+32A2;CIRCLED IDEOGRAPH COPY;So;0;L;<circle> 5199;;;;N;;;;;
+32A3;CIRCLED IDEOGRAPH CORRECT;So;0;L;<circle> 6B63;;;;N;;;;;
+32A4;CIRCLED IDEOGRAPH HIGH;So;0;L;<circle> 4E0A;;;;N;;;;;
+32A5;CIRCLED IDEOGRAPH CENTRE;So;0;L;<circle> 4E2D;;;;N;CIRCLED IDEOGRAPH CENTER;;;;
+32A6;CIRCLED IDEOGRAPH LOW;So;0;L;<circle> 4E0B;;;;N;;;;;
+32A7;CIRCLED IDEOGRAPH LEFT;So;0;L;<circle> 5DE6;;;;N;;;;;
+32A8;CIRCLED IDEOGRAPH RIGHT;So;0;L;<circle> 53F3;;;;N;;;;;
+32A9;CIRCLED IDEOGRAPH MEDICINE;So;0;L;<circle> 533B;;;;N;;;;;
+32AA;CIRCLED IDEOGRAPH RELIGION;So;0;L;<circle> 5B97;;;;N;;;;;
+32AB;CIRCLED IDEOGRAPH STUDY;So;0;L;<circle> 5B66;;;;N;;;;;
+32AC;CIRCLED IDEOGRAPH SUPERVISE;So;0;L;<circle> 76E3;;;;N;;;;;
+32AD;CIRCLED IDEOGRAPH ENTERPRISE;So;0;L;<circle> 4F01;;;;N;;;;;
+32AE;CIRCLED IDEOGRAPH RESOURCE;So;0;L;<circle> 8CC7;;;;N;;;;;
+32AF;CIRCLED IDEOGRAPH ALLIANCE;So;0;L;<circle> 5354;;;;N;;;;;
+32B0;CIRCLED IDEOGRAPH NIGHT;So;0;L;<circle> 591C;;;;N;;;;;
+32B1;CIRCLED NUMBER THIRTY SIX;No;0;ON;<circle> 0033 0036;;;36;N;;;;;
+32B2;CIRCLED NUMBER THIRTY SEVEN;No;0;ON;<circle> 0033 0037;;;37;N;;;;;
+32B3;CIRCLED NUMBER THIRTY EIGHT;No;0;ON;<circle> 0033 0038;;;38;N;;;;;
+32B4;CIRCLED NUMBER THIRTY NINE;No;0;ON;<circle> 0033 0039;;;39;N;;;;;
+32B5;CIRCLED NUMBER FORTY;No;0;ON;<circle> 0034 0030;;;40;N;;;;;
+32B6;CIRCLED NUMBER FORTY ONE;No;0;ON;<circle> 0034 0031;;;41;N;;;;;
+32B7;CIRCLED NUMBER FORTY TWO;No;0;ON;<circle> 0034 0032;;;42;N;;;;;
+32B8;CIRCLED NUMBER FORTY THREE;No;0;ON;<circle> 0034 0033;;;43;N;;;;;
+32B9;CIRCLED NUMBER FORTY FOUR;No;0;ON;<circle> 0034 0034;;;44;N;;;;;
+32BA;CIRCLED NUMBER FORTY FIVE;No;0;ON;<circle> 0034 0035;;;45;N;;;;;
+32BB;CIRCLED NUMBER FORTY SIX;No;0;ON;<circle> 0034 0036;;;46;N;;;;;
+32BC;CIRCLED NUMBER FORTY SEVEN;No;0;ON;<circle> 0034 0037;;;47;N;;;;;
+32BD;CIRCLED NUMBER FORTY EIGHT;No;0;ON;<circle> 0034 0038;;;48;N;;;;;
+32BE;CIRCLED NUMBER FORTY NINE;No;0;ON;<circle> 0034 0039;;;49;N;;;;;
+32BF;CIRCLED NUMBER FIFTY;No;0;ON;<circle> 0035 0030;;;50;N;;;;;
+32C0;IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY;So;0;L;<compat> 0031 6708;;;;N;;;;;
+32C1;IDEOGRAPHIC TELEGRAPH SYMBOL FOR FEBRUARY;So;0;L;<compat> 0032 6708;;;;N;;;;;
+32C2;IDEOGRAPHIC TELEGRAPH SYMBOL FOR MARCH;So;0;L;<compat> 0033 6708;;;;N;;;;;
+32C3;IDEOGRAPHIC TELEGRAPH SYMBOL FOR APRIL;So;0;L;<compat> 0034 6708;;;;N;;;;;
+32C4;IDEOGRAPHIC TELEGRAPH SYMBOL FOR MAY;So;0;L;<compat> 0035 6708;;;;N;;;;;
+32C5;IDEOGRAPHIC TELEGRAPH SYMBOL FOR JUNE;So;0;L;<compat> 0036 6708;;;;N;;;;;
+32C6;IDEOGRAPHIC TELEGRAPH SYMBOL FOR JULY;So;0;L;<compat> 0037 6708;;;;N;;;;;
+32C7;IDEOGRAPHIC TELEGRAPH SYMBOL FOR AUGUST;So;0;L;<compat> 0038 6708;;;;N;;;;;
+32C8;IDEOGRAPHIC TELEGRAPH SYMBOL FOR SEPTEMBER;So;0;L;<compat> 0039 6708;;;;N;;;;;
+32C9;IDEOGRAPHIC TELEGRAPH SYMBOL FOR OCTOBER;So;0;L;<compat> 0031 0030 6708;;;;N;;;;;
+32CA;IDEOGRAPHIC TELEGRAPH SYMBOL FOR NOVEMBER;So;0;L;<compat> 0031 0031 6708;;;;N;;;;;
+32CB;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DECEMBER;So;0;L;<compat> 0031 0032 6708;;;;N;;;;;
+32CC;SQUARE HG;So;0;ON;<square> 0048 0067;;;;N;;;;;
+32CD;SQUARE ERG;So;0;ON;<square> 0065 0072 0067;;;;N;;;;;
+32CE;SQUARE EV;So;0;ON;<square> 0065 0056;;;;N;;;;;
+32CF;LIMITED LIABILITY SIGN;So;0;ON;<square> 004C 0054 0044;;;;N;;;;;
+32D0;CIRCLED KATAKANA A;So;0;L;<circle> 30A2;;;;N;;;;;
+32D1;CIRCLED KATAKANA I;So;0;L;<circle> 30A4;;;;N;;;;;
+32D2;CIRCLED KATAKANA U;So;0;L;<circle> 30A6;;;;N;;;;;
+32D3;CIRCLED KATAKANA E;So;0;L;<circle> 30A8;;;;N;;;;;
+32D4;CIRCLED KATAKANA O;So;0;L;<circle> 30AA;;;;N;;;;;
+32D5;CIRCLED KATAKANA KA;So;0;L;<circle> 30AB;;;;N;;;;;
+32D6;CIRCLED KATAKANA KI;So;0;L;<circle> 30AD;;;;N;;;;;
+32D7;CIRCLED KATAKANA KU;So;0;L;<circle> 30AF;;;;N;;;;;
+32D8;CIRCLED KATAKANA KE;So;0;L;<circle> 30B1;;;;N;;;;;
+32D9;CIRCLED KATAKANA KO;So;0;L;<circle> 30B3;;;;N;;;;;
+32DA;CIRCLED KATAKANA SA;So;0;L;<circle> 30B5;;;;N;;;;;
+32DB;CIRCLED KATAKANA SI;So;0;L;<circle> 30B7;;;;N;;;;;
+32DC;CIRCLED KATAKANA SU;So;0;L;<circle> 30B9;;;;N;;;;;
+32DD;CIRCLED KATAKANA SE;So;0;L;<circle> 30BB;;;;N;;;;;
+32DE;CIRCLED KATAKANA SO;So;0;L;<circle> 30BD;;;;N;;;;;
+32DF;CIRCLED KATAKANA TA;So;0;L;<circle> 30BF;;;;N;;;;;
+32E0;CIRCLED KATAKANA TI;So;0;L;<circle> 30C1;;;;N;;;;;
+32E1;CIRCLED KATAKANA TU;So;0;L;<circle> 30C4;;;;N;;;;;
+32E2;CIRCLED KATAKANA TE;So;0;L;<circle> 30C6;;;;N;;;;;
+32E3;CIRCLED KATAKANA TO;So;0;L;<circle> 30C8;;;;N;;;;;
+32E4;CIRCLED KATAKANA NA;So;0;L;<circle> 30CA;;;;N;;;;;
+32E5;CIRCLED KATAKANA NI;So;0;L;<circle> 30CB;;;;N;;;;;
+32E6;CIRCLED KATAKANA NU;So;0;L;<circle> 30CC;;;;N;;;;;
+32E7;CIRCLED KATAKANA NE;So;0;L;<circle> 30CD;;;;N;;;;;
+32E8;CIRCLED KATAKANA NO;So;0;L;<circle> 30CE;;;;N;;;;;
+32E9;CIRCLED KATAKANA HA;So;0;L;<circle> 30CF;;;;N;;;;;
+32EA;CIRCLED KATAKANA HI;So;0;L;<circle> 30D2;;;;N;;;;;
+32EB;CIRCLED KATAKANA HU;So;0;L;<circle> 30D5;;;;N;;;;;
+32EC;CIRCLED KATAKANA HE;So;0;L;<circle> 30D8;;;;N;;;;;
+32ED;CIRCLED KATAKANA HO;So;0;L;<circle> 30DB;;;;N;;;;;
+32EE;CIRCLED KATAKANA MA;So;0;L;<circle> 30DE;;;;N;;;;;
+32EF;CIRCLED KATAKANA MI;So;0;L;<circle> 30DF;;;;N;;;;;
+32F0;CIRCLED KATAKANA MU;So;0;L;<circle> 30E0;;;;N;;;;;
+32F1;CIRCLED KATAKANA ME;So;0;L;<circle> 30E1;;;;N;;;;;
+32F2;CIRCLED KATAKANA MO;So;0;L;<circle> 30E2;;;;N;;;;;
+32F3;CIRCLED KATAKANA YA;So;0;L;<circle> 30E4;;;;N;;;;;
+32F4;CIRCLED KATAKANA YU;So;0;L;<circle> 30E6;;;;N;;;;;
+32F5;CIRCLED KATAKANA YO;So;0;L;<circle> 30E8;;;;N;;;;;
+32F6;CIRCLED KATAKANA RA;So;0;L;<circle> 30E9;;;;N;;;;;
+32F7;CIRCLED KATAKANA RI;So;0;L;<circle> 30EA;;;;N;;;;;
+32F8;CIRCLED KATAKANA RU;So;0;L;<circle> 30EB;;;;N;;;;;
+32F9;CIRCLED KATAKANA RE;So;0;L;<circle> 30EC;;;;N;;;;;
+32FA;CIRCLED KATAKANA RO;So;0;L;<circle> 30ED;;;;N;;;;;
+32FB;CIRCLED KATAKANA WA;So;0;L;<circle> 30EF;;;;N;;;;;
+32FC;CIRCLED KATAKANA WI;So;0;L;<circle> 30F0;;;;N;;;;;
+32FD;CIRCLED KATAKANA WE;So;0;L;<circle> 30F1;;;;N;;;;;
+32FE;CIRCLED KATAKANA WO;So;0;L;<circle> 30F2;;;;N;;;;;
+3300;SQUARE APAATO;So;0;L;<square> 30A2 30D1 30FC 30C8;;;;N;SQUARED APAATO;;;;
+3301;SQUARE ARUHUA;So;0;L;<square> 30A2 30EB 30D5 30A1;;;;N;SQUARED ARUHUA;;;;
+3302;SQUARE ANPEA;So;0;L;<square> 30A2 30F3 30DA 30A2;;;;N;SQUARED ANPEA;;;;
+3303;SQUARE AARU;So;0;L;<square> 30A2 30FC 30EB;;;;N;SQUARED AARU;;;;
+3304;SQUARE ININGU;So;0;L;<square> 30A4 30CB 30F3 30B0;;;;N;SQUARED ININGU;;;;
+3305;SQUARE INTI;So;0;L;<square> 30A4 30F3 30C1;;;;N;SQUARED INTI;;;;
+3306;SQUARE UON;So;0;L;<square> 30A6 30A9 30F3;;;;N;SQUARED UON;;;;
+3307;SQUARE ESUKUUDO;So;0;L;<square> 30A8 30B9 30AF 30FC 30C9;;;;N;SQUARED ESUKUUDO;;;;
+3308;SQUARE EEKAA;So;0;L;<square> 30A8 30FC 30AB 30FC;;;;N;SQUARED EEKAA;;;;
+3309;SQUARE ONSU;So;0;L;<square> 30AA 30F3 30B9;;;;N;SQUARED ONSU;;;;
+330A;SQUARE OOMU;So;0;L;<square> 30AA 30FC 30E0;;;;N;SQUARED OOMU;;;;
+330B;SQUARE KAIRI;So;0;L;<square> 30AB 30A4 30EA;;;;N;SQUARED KAIRI;;;;
+330C;SQUARE KARATTO;So;0;L;<square> 30AB 30E9 30C3 30C8;;;;N;SQUARED KARATTO;;;;
+330D;SQUARE KARORII;So;0;L;<square> 30AB 30ED 30EA 30FC;;;;N;SQUARED KARORII;;;;
+330E;SQUARE GARON;So;0;L;<square> 30AC 30ED 30F3;;;;N;SQUARED GARON;;;;
+330F;SQUARE GANMA;So;0;L;<square> 30AC 30F3 30DE;;;;N;SQUARED GANMA;;;;
+3310;SQUARE GIGA;So;0;L;<square> 30AE 30AC;;;;N;SQUARED GIGA;;;;
+3311;SQUARE GINII;So;0;L;<square> 30AE 30CB 30FC;;;;N;SQUARED GINII;;;;
+3312;SQUARE KYURII;So;0;L;<square> 30AD 30E5 30EA 30FC;;;;N;SQUARED KYURII;;;;
+3313;SQUARE GIRUDAA;So;0;L;<square> 30AE 30EB 30C0 30FC;;;;N;SQUARED GIRUDAA;;;;
+3314;SQUARE KIRO;So;0;L;<square> 30AD 30ED;;;;N;SQUARED KIRO;;;;
+3315;SQUARE KIROGURAMU;So;0;L;<square> 30AD 30ED 30B0 30E9 30E0;;;;N;SQUARED KIROGURAMU;;;;
+3316;SQUARE KIROMEETORU;So;0;L;<square> 30AD 30ED 30E1 30FC 30C8 30EB;;;;N;SQUARED KIROMEETORU;;;;
+3317;SQUARE KIROWATTO;So;0;L;<square> 30AD 30ED 30EF 30C3 30C8;;;;N;SQUARED KIROWATTO;;;;
+3318;SQUARE GURAMU;So;0;L;<square> 30B0 30E9 30E0;;;;N;SQUARED GURAMU;;;;
+3319;SQUARE GURAMUTON;So;0;L;<square> 30B0 30E9 30E0 30C8 30F3;;;;N;SQUARED GURAMUTON;;;;
+331A;SQUARE KURUZEIRO;So;0;L;<square> 30AF 30EB 30BC 30A4 30ED;;;;N;SQUARED KURUZEIRO;;;;
+331B;SQUARE KUROONE;So;0;L;<square> 30AF 30ED 30FC 30CD;;;;N;SQUARED KUROONE;;;;
+331C;SQUARE KEESU;So;0;L;<square> 30B1 30FC 30B9;;;;N;SQUARED KEESU;;;;
+331D;SQUARE KORUNA;So;0;L;<square> 30B3 30EB 30CA;;;;N;SQUARED KORUNA;;;;
+331E;SQUARE KOOPO;So;0;L;<square> 30B3 30FC 30DD;;;;N;SQUARED KOOPO;;;;
+331F;SQUARE SAIKURU;So;0;L;<square> 30B5 30A4 30AF 30EB;;;;N;SQUARED SAIKURU;;;;
+3320;SQUARE SANTIIMU;So;0;L;<square> 30B5 30F3 30C1 30FC 30E0;;;;N;SQUARED SANTIIMU;;;;
+3321;SQUARE SIRINGU;So;0;L;<square> 30B7 30EA 30F3 30B0;;;;N;SQUARED SIRINGU;;;;
+3322;SQUARE SENTI;So;0;L;<square> 30BB 30F3 30C1;;;;N;SQUARED SENTI;;;;
+3323;SQUARE SENTO;So;0;L;<square> 30BB 30F3 30C8;;;;N;SQUARED SENTO;;;;
+3324;SQUARE DAASU;So;0;L;<square> 30C0 30FC 30B9;;;;N;SQUARED DAASU;;;;
+3325;SQUARE DESI;So;0;L;<square> 30C7 30B7;;;;N;SQUARED DESI;;;;
+3326;SQUARE DORU;So;0;L;<square> 30C9 30EB;;;;N;SQUARED DORU;;;;
+3327;SQUARE TON;So;0;L;<square> 30C8 30F3;;;;N;SQUARED TON;;;;
+3328;SQUARE NANO;So;0;L;<square> 30CA 30CE;;;;N;SQUARED NANO;;;;
+3329;SQUARE NOTTO;So;0;L;<square> 30CE 30C3 30C8;;;;N;SQUARED NOTTO;;;;
+332A;SQUARE HAITU;So;0;L;<square> 30CF 30A4 30C4;;;;N;SQUARED HAITU;;;;
+332B;SQUARE PAASENTO;So;0;L;<square> 30D1 30FC 30BB 30F3 30C8;;;;N;SQUARED PAASENTO;;;;
+332C;SQUARE PAATU;So;0;L;<square> 30D1 30FC 30C4;;;;N;SQUARED PAATU;;;;
+332D;SQUARE BAARERU;So;0;L;<square> 30D0 30FC 30EC 30EB;;;;N;SQUARED BAARERU;;;;
+332E;SQUARE PIASUTORU;So;0;L;<square> 30D4 30A2 30B9 30C8 30EB;;;;N;SQUARED PIASUTORU;;;;
+332F;SQUARE PIKURU;So;0;L;<square> 30D4 30AF 30EB;;;;N;SQUARED PIKURU;;;;
+3330;SQUARE PIKO;So;0;L;<square> 30D4 30B3;;;;N;SQUARED PIKO;;;;
+3331;SQUARE BIRU;So;0;L;<square> 30D3 30EB;;;;N;SQUARED BIRU;;;;
+3332;SQUARE HUARADDO;So;0;L;<square> 30D5 30A1 30E9 30C3 30C9;;;;N;SQUARED HUARADDO;;;;
+3333;SQUARE HUIITO;So;0;L;<square> 30D5 30A3 30FC 30C8;;;;N;SQUARED HUIITO;;;;
+3334;SQUARE BUSSYERU;So;0;L;<square> 30D6 30C3 30B7 30A7 30EB;;;;N;SQUARED BUSSYERU;;;;
+3335;SQUARE HURAN;So;0;L;<square> 30D5 30E9 30F3;;;;N;SQUARED HURAN;;;;
+3336;SQUARE HEKUTAARU;So;0;L;<square> 30D8 30AF 30BF 30FC 30EB;;;;N;SQUARED HEKUTAARU;;;;
+3337;SQUARE PESO;So;0;L;<square> 30DA 30BD;;;;N;SQUARED PESO;;;;
+3338;SQUARE PENIHI;So;0;L;<square> 30DA 30CB 30D2;;;;N;SQUARED PENIHI;;;;
+3339;SQUARE HERUTU;So;0;L;<square> 30D8 30EB 30C4;;;;N;SQUARED HERUTU;;;;
+333A;SQUARE PENSU;So;0;L;<square> 30DA 30F3 30B9;;;;N;SQUARED PENSU;;;;
+333B;SQUARE PEEZI;So;0;L;<square> 30DA 30FC 30B8;;;;N;SQUARED PEEZI;;;;
+333C;SQUARE BEETA;So;0;L;<square> 30D9 30FC 30BF;;;;N;SQUARED BEETA;;;;
+333D;SQUARE POINTO;So;0;L;<square> 30DD 30A4 30F3 30C8;;;;N;SQUARED POINTO;;;;
+333E;SQUARE BORUTO;So;0;L;<square> 30DC 30EB 30C8;;;;N;SQUARED BORUTO;;;;
+333F;SQUARE HON;So;0;L;<square> 30DB 30F3;;;;N;SQUARED HON;;;;
+3340;SQUARE PONDO;So;0;L;<square> 30DD 30F3 30C9;;;;N;SQUARED PONDO;;;;
+3341;SQUARE HOORU;So;0;L;<square> 30DB 30FC 30EB;;;;N;SQUARED HOORU;;;;
+3342;SQUARE HOON;So;0;L;<square> 30DB 30FC 30F3;;;;N;SQUARED HOON;;;;
+3343;SQUARE MAIKURO;So;0;L;<square> 30DE 30A4 30AF 30ED;;;;N;SQUARED MAIKURO;;;;
+3344;SQUARE MAIRU;So;0;L;<square> 30DE 30A4 30EB;;;;N;SQUARED MAIRU;;;;
+3345;SQUARE MAHHA;So;0;L;<square> 30DE 30C3 30CF;;;;N;SQUARED MAHHA;;;;
+3346;SQUARE MARUKU;So;0;L;<square> 30DE 30EB 30AF;;;;N;SQUARED MARUKU;;;;
+3347;SQUARE MANSYON;So;0;L;<square> 30DE 30F3 30B7 30E7 30F3;;;;N;SQUARED MANSYON;;;;
+3348;SQUARE MIKURON;So;0;L;<square> 30DF 30AF 30ED 30F3;;;;N;SQUARED MIKURON;;;;
+3349;SQUARE MIRI;So;0;L;<square> 30DF 30EA;;;;N;SQUARED MIRI;;;;
+334A;SQUARE MIRIBAARU;So;0;L;<square> 30DF 30EA 30D0 30FC 30EB;;;;N;SQUARED MIRIBAARU;;;;
+334B;SQUARE MEGA;So;0;L;<square> 30E1 30AC;;;;N;SQUARED MEGA;;;;
+334C;SQUARE MEGATON;So;0;L;<square> 30E1 30AC 30C8 30F3;;;;N;SQUARED MEGATON;;;;
+334D;SQUARE MEETORU;So;0;L;<square> 30E1 30FC 30C8 30EB;;;;N;SQUARED MEETORU;;;;
+334E;SQUARE YAADO;So;0;L;<square> 30E4 30FC 30C9;;;;N;SQUARED YAADO;;;;
+334F;SQUARE YAARU;So;0;L;<square> 30E4 30FC 30EB;;;;N;SQUARED YAARU;;;;
+3350;SQUARE YUAN;So;0;L;<square> 30E6 30A2 30F3;;;;N;SQUARED YUAN;;;;
+3351;SQUARE RITTORU;So;0;L;<square> 30EA 30C3 30C8 30EB;;;;N;SQUARED RITTORU;;;;
+3352;SQUARE RIRA;So;0;L;<square> 30EA 30E9;;;;N;SQUARED RIRA;;;;
+3353;SQUARE RUPII;So;0;L;<square> 30EB 30D4 30FC;;;;N;SQUARED RUPII;;;;
+3354;SQUARE RUUBURU;So;0;L;<square> 30EB 30FC 30D6 30EB;;;;N;SQUARED RUUBURU;;;;
+3355;SQUARE REMU;So;0;L;<square> 30EC 30E0;;;;N;SQUARED REMU;;;;
+3356;SQUARE RENTOGEN;So;0;L;<square> 30EC 30F3 30C8 30B2 30F3;;;;N;SQUARED RENTOGEN;;;;
+3357;SQUARE WATTO;So;0;L;<square> 30EF 30C3 30C8;;;;N;SQUARED WATTO;;;;
+3358;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ZERO;So;0;L;<compat> 0030 70B9;;;;N;;;;;
+3359;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ONE;So;0;L;<compat> 0031 70B9;;;;N;;;;;
+335A;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWO;So;0;L;<compat> 0032 70B9;;;;N;;;;;
+335B;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR THREE;So;0;L;<compat> 0033 70B9;;;;N;;;;;
+335C;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FOUR;So;0;L;<compat> 0034 70B9;;;;N;;;;;
+335D;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FIVE;So;0;L;<compat> 0035 70B9;;;;N;;;;;
+335E;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SIX;So;0;L;<compat> 0036 70B9;;;;N;;;;;
+335F;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SEVEN;So;0;L;<compat> 0037 70B9;;;;N;;;;;
+3360;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR EIGHT;So;0;L;<compat> 0038 70B9;;;;N;;;;;
+3361;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR NINE;So;0;L;<compat> 0039 70B9;;;;N;;;;;
+3362;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TEN;So;0;L;<compat> 0031 0030 70B9;;;;N;;;;;
+3363;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR ELEVEN;So;0;L;<compat> 0031 0031 70B9;;;;N;;;;;
+3364;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWELVE;So;0;L;<compat> 0031 0032 70B9;;;;N;;;;;
+3365;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR THIRTEEN;So;0;L;<compat> 0031 0033 70B9;;;;N;;;;;
+3366;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FOURTEEN;So;0;L;<compat> 0031 0034 70B9;;;;N;;;;;
+3367;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR FIFTEEN;So;0;L;<compat> 0031 0035 70B9;;;;N;;;;;
+3368;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SIXTEEN;So;0;L;<compat> 0031 0036 70B9;;;;N;;;;;
+3369;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR SEVENTEEN;So;0;L;<compat> 0031 0037 70B9;;;;N;;;;;
+336A;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR EIGHTEEN;So;0;L;<compat> 0031 0038 70B9;;;;N;;;;;
+336B;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR NINETEEN;So;0;L;<compat> 0031 0039 70B9;;;;N;;;;;
+336C;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY;So;0;L;<compat> 0032 0030 70B9;;;;N;;;;;
+336D;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-ONE;So;0;L;<compat> 0032 0031 70B9;;;;N;;;;;
+336E;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-TWO;So;0;L;<compat> 0032 0032 70B9;;;;N;;;;;
+336F;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-THREE;So;0;L;<compat> 0032 0033 70B9;;;;N;;;;;
+3370;IDEOGRAPHIC TELEGRAPH SYMBOL FOR HOUR TWENTY-FOUR;So;0;L;<compat> 0032 0034 70B9;;;;N;;;;;
+3371;SQUARE HPA;So;0;L;<square> 0068 0050 0061;;;;N;;;;;
+3372;SQUARE DA;So;0;L;<square> 0064 0061;;;;N;;;;;
+3373;SQUARE AU;So;0;L;<square> 0041 0055;;;;N;;;;;
+3374;SQUARE BAR;So;0;L;<square> 0062 0061 0072;;;;N;;;;;
+3375;SQUARE OV;So;0;L;<square> 006F 0056;;;;N;;;;;
+3376;SQUARE PC;So;0;L;<square> 0070 0063;;;;N;;;;;
+3377;SQUARE DM;So;0;ON;<square> 0064 006D;;;;N;;;;;
+3378;SQUARE DM SQUARED;So;0;ON;<square> 0064 006D 00B2;;;;N;;;;;
+3379;SQUARE DM CUBED;So;0;ON;<square> 0064 006D 00B3;;;;N;;;;;
+337A;SQUARE IU;So;0;ON;<square> 0049 0055;;;;N;;;;;
+337B;SQUARE ERA NAME HEISEI;So;0;L;<square> 5E73 6210;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME HEISEI;;;;
+337C;SQUARE ERA NAME SYOUWA;So;0;L;<square> 662D 548C;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME SYOUWA;;;;
+337D;SQUARE ERA NAME TAISYOU;So;0;L;<square> 5927 6B63;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME TAISYOU;;;;
+337E;SQUARE ERA NAME MEIZI;So;0;L;<square> 660E 6CBB;;;;N;SQUARED TWO IDEOGRAPHS ERA NAME MEIZI;;;;
+337F;SQUARE CORPORATION;So;0;L;<square> 682A 5F0F 4F1A 793E;;;;N;SQUARED FOUR IDEOGRAPHS CORPORATION;;;;
+3380;SQUARE PA AMPS;So;0;L;<square> 0070 0041;;;;N;SQUARED PA AMPS;;;;
+3381;SQUARE NA;So;0;L;<square> 006E 0041;;;;N;SQUARED NA;;;;
+3382;SQUARE MU A;So;0;L;<square> 03BC 0041;;;;N;SQUARED MU A;;;;
+3383;SQUARE MA;So;0;L;<square> 006D 0041;;;;N;SQUARED MA;;;;
+3384;SQUARE KA;So;0;L;<square> 006B 0041;;;;N;SQUARED KA;;;;
+3385;SQUARE KB;So;0;L;<square> 004B 0042;;;;N;SQUARED KB;;;;
+3386;SQUARE MB;So;0;L;<square> 004D 0042;;;;N;SQUARED MB;;;;
+3387;SQUARE GB;So;0;L;<square> 0047 0042;;;;N;SQUARED GB;;;;
+3388;SQUARE CAL;So;0;L;<square> 0063 0061 006C;;;;N;SQUARED CAL;;;;
+3389;SQUARE KCAL;So;0;L;<square> 006B 0063 0061 006C;;;;N;SQUARED KCAL;;;;
+338A;SQUARE PF;So;0;L;<square> 0070 0046;;;;N;SQUARED PF;;;;
+338B;SQUARE NF;So;0;L;<square> 006E 0046;;;;N;SQUARED NF;;;;
+338C;SQUARE MU F;So;0;L;<square> 03BC 0046;;;;N;SQUARED MU F;;;;
+338D;SQUARE MU G;So;0;L;<square> 03BC 0067;;;;N;SQUARED MU G;;;;
+338E;SQUARE MG;So;0;L;<square> 006D 0067;;;;N;SQUARED MG;;;;
+338F;SQUARE KG;So;0;L;<square> 006B 0067;;;;N;SQUARED KG;;;;
+3390;SQUARE HZ;So;0;L;<square> 0048 007A;;;;N;SQUARED HZ;;;;
+3391;SQUARE KHZ;So;0;L;<square> 006B 0048 007A;;;;N;SQUARED KHZ;;;;
+3392;SQUARE MHZ;So;0;L;<square> 004D 0048 007A;;;;N;SQUARED MHZ;;;;
+3393;SQUARE GHZ;So;0;L;<square> 0047 0048 007A;;;;N;SQUARED GHZ;;;;
+3394;SQUARE THZ;So;0;L;<square> 0054 0048 007A;;;;N;SQUARED THZ;;;;
+3395;SQUARE MU L;So;0;L;<square> 03BC 2113;;;;N;SQUARED MU L;;;;
+3396;SQUARE ML;So;0;L;<square> 006D 2113;;;;N;SQUARED ML;;;;
+3397;SQUARE DL;So;0;L;<square> 0064 2113;;;;N;SQUARED DL;;;;
+3398;SQUARE KL;So;0;L;<square> 006B 2113;;;;N;SQUARED KL;;;;
+3399;SQUARE FM;So;0;L;<square> 0066 006D;;;;N;SQUARED FM;;;;
+339A;SQUARE NM;So;0;L;<square> 006E 006D;;;;N;SQUARED NM;;;;
+339B;SQUARE MU M;So;0;L;<square> 03BC 006D;;;;N;SQUARED MU M;;;;
+339C;SQUARE MM;So;0;L;<square> 006D 006D;;;;N;SQUARED MM;;;;
+339D;SQUARE CM;So;0;L;<square> 0063 006D;;;;N;SQUARED CM;;;;
+339E;SQUARE KM;So;0;L;<square> 006B 006D;;;;N;SQUARED KM;;;;
+339F;SQUARE MM SQUARED;So;0;L;<square> 006D 006D 00B2;;;;N;SQUARED MM SQUARED;;;;
+33A0;SQUARE CM SQUARED;So;0;L;<square> 0063 006D 00B2;;;;N;SQUARED CM SQUARED;;;;
+33A1;SQUARE M SQUARED;So;0;L;<square> 006D 00B2;;;;N;SQUARED M SQUARED;;;;
+33A2;SQUARE KM SQUARED;So;0;L;<square> 006B 006D 00B2;;;;N;SQUARED KM SQUARED;;;;
+33A3;SQUARE MM CUBED;So;0;L;<square> 006D 006D 00B3;;;;N;SQUARED MM CUBED;;;;
+33A4;SQUARE CM CUBED;So;0;L;<square> 0063 006D 00B3;;;;N;SQUARED CM CUBED;;;;
+33A5;SQUARE M CUBED;So;0;L;<square> 006D 00B3;;;;N;SQUARED M CUBED;;;;
+33A6;SQUARE KM CUBED;So;0;L;<square> 006B 006D 00B3;;;;N;SQUARED KM CUBED;;;;
+33A7;SQUARE M OVER S;So;0;L;<square> 006D 2215 0073;;;;N;SQUARED M OVER S;;;;
+33A8;SQUARE M OVER S SQUARED;So;0;L;<square> 006D 2215 0073 00B2;;;;N;SQUARED M OVER S SQUARED;;;;
+33A9;SQUARE PA;So;0;L;<square> 0050 0061;;;;N;SQUARED PA;;;;
+33AA;SQUARE KPA;So;0;L;<square> 006B 0050 0061;;;;N;SQUARED KPA;;;;
+33AB;SQUARE MPA;So;0;L;<square> 004D 0050 0061;;;;N;SQUARED MPA;;;;
+33AC;SQUARE GPA;So;0;L;<square> 0047 0050 0061;;;;N;SQUARED GPA;;;;
+33AD;SQUARE RAD;So;0;L;<square> 0072 0061 0064;;;;N;SQUARED RAD;;;;
+33AE;SQUARE RAD OVER S;So;0;L;<square> 0072 0061 0064 2215 0073;;;;N;SQUARED RAD OVER S;;;;
+33AF;SQUARE RAD OVER S SQUARED;So;0;L;<square> 0072 0061 0064 2215 0073 00B2;;;;N;SQUARED RAD OVER S SQUARED;;;;
+33B0;SQUARE PS;So;0;L;<square> 0070 0073;;;;N;SQUARED PS;;;;
+33B1;SQUARE NS;So;0;L;<square> 006E 0073;;;;N;SQUARED NS;;;;
+33B2;SQUARE MU S;So;0;L;<square> 03BC 0073;;;;N;SQUARED MU S;;;;
+33B3;SQUARE MS;So;0;L;<square> 006D 0073;;;;N;SQUARED MS;;;;
+33B4;SQUARE PV;So;0;L;<square> 0070 0056;;;;N;SQUARED PV;;;;
+33B5;SQUARE NV;So;0;L;<square> 006E 0056;;;;N;SQUARED NV;;;;
+33B6;SQUARE MU V;So;0;L;<square> 03BC 0056;;;;N;SQUARED MU V;;;;
+33B7;SQUARE MV;So;0;L;<square> 006D 0056;;;;N;SQUARED MV;;;;
+33B8;SQUARE KV;So;0;L;<square> 006B 0056;;;;N;SQUARED KV;;;;
+33B9;SQUARE MV MEGA;So;0;L;<square> 004D 0056;;;;N;SQUARED MV MEGA;;;;
+33BA;SQUARE PW;So;0;L;<square> 0070 0057;;;;N;SQUARED PW;;;;
+33BB;SQUARE NW;So;0;L;<square> 006E 0057;;;;N;SQUARED NW;;;;
+33BC;SQUARE MU W;So;0;L;<square> 03BC 0057;;;;N;SQUARED MU W;;;;
+33BD;SQUARE MW;So;0;L;<square> 006D 0057;;;;N;SQUARED MW;;;;
+33BE;SQUARE KW;So;0;L;<square> 006B 0057;;;;N;SQUARED KW;;;;
+33BF;SQUARE MW MEGA;So;0;L;<square> 004D 0057;;;;N;SQUARED MW MEGA;;;;
+33C0;SQUARE K OHM;So;0;L;<square> 006B 03A9;;;;N;SQUARED K OHM;;;;
+33C1;SQUARE M OHM;So;0;L;<square> 004D 03A9;;;;N;SQUARED M OHM;;;;
+33C2;SQUARE AM;So;0;L;<square> 0061 002E 006D 002E;;;;N;SQUARED AM;;;;
+33C3;SQUARE BQ;So;0;L;<square> 0042 0071;;;;N;SQUARED BQ;;;;
+33C4;SQUARE CC;So;0;L;<square> 0063 0063;;;;N;SQUARED CC;;;;
+33C5;SQUARE CD;So;0;L;<square> 0063 0064;;;;N;SQUARED CD;;;;
+33C6;SQUARE C OVER KG;So;0;L;<square> 0043 2215 006B 0067;;;;N;SQUARED C OVER KG;;;;
+33C7;SQUARE CO;So;0;L;<square> 0043 006F 002E;;;;N;SQUARED CO;;;;
+33C8;SQUARE DB;So;0;L;<square> 0064 0042;;;;N;SQUARED DB;;;;
+33C9;SQUARE GY;So;0;L;<square> 0047 0079;;;;N;SQUARED GY;;;;
+33CA;SQUARE HA;So;0;L;<square> 0068 0061;;;;N;SQUARED HA;;;;
+33CB;SQUARE HP;So;0;L;<square> 0048 0050;;;;N;SQUARED HP;;;;
+33CC;SQUARE IN;So;0;L;<square> 0069 006E;;;;N;SQUARED IN;;;;
+33CD;SQUARE KK;So;0;L;<square> 004B 004B;;;;N;SQUARED KK;;;;
+33CE;SQUARE KM CAPITAL;So;0;L;<square> 004B 004D;;;;N;SQUARED KM CAPITAL;;;;
+33CF;SQUARE KT;So;0;L;<square> 006B 0074;;;;N;SQUARED KT;;;;
+33D0;SQUARE LM;So;0;L;<square> 006C 006D;;;;N;SQUARED LM;;;;
+33D1;SQUARE LN;So;0;L;<square> 006C 006E;;;;N;SQUARED LN;;;;
+33D2;SQUARE LOG;So;0;L;<square> 006C 006F 0067;;;;N;SQUARED LOG;;;;
+33D3;SQUARE LX;So;0;L;<square> 006C 0078;;;;N;SQUARED LX;;;;
+33D4;SQUARE MB SMALL;So;0;L;<square> 006D 0062;;;;N;SQUARED MB SMALL;;;;
+33D5;SQUARE MIL;So;0;L;<square> 006D 0069 006C;;;;N;SQUARED MIL;;;;
+33D6;SQUARE MOL;So;0;L;<square> 006D 006F 006C;;;;N;SQUARED MOL;;;;
+33D7;SQUARE PH;So;0;L;<square> 0050 0048;;;;N;SQUARED PH;;;;
+33D8;SQUARE PM;So;0;L;<square> 0070 002E 006D 002E;;;;N;SQUARED PM;;;;
+33D9;SQUARE PPM;So;0;L;<square> 0050 0050 004D;;;;N;SQUARED PPM;;;;
+33DA;SQUARE PR;So;0;L;<square> 0050 0052;;;;N;SQUARED PR;;;;
+33DB;SQUARE SR;So;0;L;<square> 0073 0072;;;;N;SQUARED SR;;;;
+33DC;SQUARE SV;So;0;L;<square> 0053 0076;;;;N;SQUARED SV;;;;
+33DD;SQUARE WB;So;0;L;<square> 0057 0062;;;;N;SQUARED WB;;;;
+33DE;SQUARE V OVER M;So;0;ON;<square> 0056 2215 006D;;;;N;;;;;
+33DF;SQUARE A OVER M;So;0;ON;<square> 0041 2215 006D;;;;N;;;;;
+33E0;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ONE;So;0;L;<compat> 0031 65E5;;;;N;;;;;
+33E1;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWO;So;0;L;<compat> 0032 65E5;;;;N;;;;;
+33E2;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THREE;So;0;L;<compat> 0033 65E5;;;;N;;;;;
+33E3;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FOUR;So;0;L;<compat> 0034 65E5;;;;N;;;;;
+33E4;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FIVE;So;0;L;<compat> 0035 65E5;;;;N;;;;;
+33E5;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SIX;So;0;L;<compat> 0036 65E5;;;;N;;;;;
+33E6;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SEVEN;So;0;L;<compat> 0037 65E5;;;;N;;;;;
+33E7;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY EIGHT;So;0;L;<compat> 0038 65E5;;;;N;;;;;
+33E8;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY NINE;So;0;L;<compat> 0039 65E5;;;;N;;;;;
+33E9;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TEN;So;0;L;<compat> 0031 0030 65E5;;;;N;;;;;
+33EA;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY ELEVEN;So;0;L;<compat> 0031 0031 65E5;;;;N;;;;;
+33EB;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWELVE;So;0;L;<compat> 0031 0032 65E5;;;;N;;;;;
+33EC;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTEEN;So;0;L;<compat> 0031 0033 65E5;;;;N;;;;;
+33ED;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FOURTEEN;So;0;L;<compat> 0031 0034 65E5;;;;N;;;;;
+33EE;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY FIFTEEN;So;0;L;<compat> 0031 0035 65E5;;;;N;;;;;
+33EF;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SIXTEEN;So;0;L;<compat> 0031 0036 65E5;;;;N;;;;;
+33F0;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY SEVENTEEN;So;0;L;<compat> 0031 0037 65E5;;;;N;;;;;
+33F1;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY EIGHTEEN;So;0;L;<compat> 0031 0038 65E5;;;;N;;;;;
+33F2;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY NINETEEN;So;0;L;<compat> 0031 0039 65E5;;;;N;;;;;
+33F3;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY;So;0;L;<compat> 0032 0030 65E5;;;;N;;;;;
+33F4;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-ONE;So;0;L;<compat> 0032 0031 65E5;;;;N;;;;;
+33F5;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-TWO;So;0;L;<compat> 0032 0032 65E5;;;;N;;;;;
+33F6;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-THREE;So;0;L;<compat> 0032 0033 65E5;;;;N;;;;;
+33F7;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-FOUR;So;0;L;<compat> 0032 0034 65E5;;;;N;;;;;
+33F8;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-FIVE;So;0;L;<compat> 0032 0035 65E5;;;;N;;;;;
+33F9;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-SIX;So;0;L;<compat> 0032 0036 65E5;;;;N;;;;;
+33FA;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-SEVEN;So;0;L;<compat> 0032 0037 65E5;;;;N;;;;;
+33FB;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-EIGHT;So;0;L;<compat> 0032 0038 65E5;;;;N;;;;;
+33FC;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY TWENTY-NINE;So;0;L;<compat> 0032 0039 65E5;;;;N;;;;;
+33FD;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY;So;0;L;<compat> 0033 0030 65E5;;;;N;;;;;
+33FE;IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE;So;0;L;<compat> 0033 0031 65E5;;;;N;;;;;
+33FF;SQUARE GAL;So;0;ON;<square> 0067 0061 006C;;;;N;;;;;
+3400;<CJK Ideograph Extension A, First>;Lo;0;L;;;;;N;;;;;
+4DB5;<CJK Ideograph Extension A, Last>;Lo;0;L;;;;;N;;;;;
+4DC0;HEXAGRAM FOR THE CREATIVE HEAVEN;So;0;ON;;;;;N;;;;;
+4DC1;HEXAGRAM FOR THE RECEPTIVE EARTH;So;0;ON;;;;;N;;;;;
+4DC2;HEXAGRAM FOR DIFFICULTY AT THE BEGINNING;So;0;ON;;;;;N;;;;;
+4DC3;HEXAGRAM FOR YOUTHFUL FOLLY;So;0;ON;;;;;N;;;;;
+4DC4;HEXAGRAM FOR WAITING;So;0;ON;;;;;N;;;;;
+4DC5;HEXAGRAM FOR CONFLICT;So;0;ON;;;;;N;;;;;
+4DC6;HEXAGRAM FOR THE ARMY;So;0;ON;;;;;N;;;;;
+4DC7;HEXAGRAM FOR HOLDING TOGETHER;So;0;ON;;;;;N;;;;;
+4DC8;HEXAGRAM FOR SMALL TAMING;So;0;ON;;;;;N;;;;;
+4DC9;HEXAGRAM FOR TREADING;So;0;ON;;;;;N;;;;;
+4DCA;HEXAGRAM FOR PEACE;So;0;ON;;;;;N;;;;;
+4DCB;HEXAGRAM FOR STANDSTILL;So;0;ON;;;;;N;;;;;
+4DCC;HEXAGRAM FOR FELLOWSHIP;So;0;ON;;;;;N;;;;;
+4DCD;HEXAGRAM FOR GREAT POSSESSION;So;0;ON;;;;;N;;;;;
+4DCE;HEXAGRAM FOR MODESTY;So;0;ON;;;;;N;;;;;
+4DCF;HEXAGRAM FOR ENTHUSIASM;So;0;ON;;;;;N;;;;;
+4DD0;HEXAGRAM FOR FOLLOWING;So;0;ON;;;;;N;;;;;
+4DD1;HEXAGRAM FOR WORK ON THE DECAYED;So;0;ON;;;;;N;;;;;
+4DD2;HEXAGRAM FOR APPROACH;So;0;ON;;;;;N;;;;;
+4DD3;HEXAGRAM FOR CONTEMPLATION;So;0;ON;;;;;N;;;;;
+4DD4;HEXAGRAM FOR BITING THROUGH;So;0;ON;;;;;N;;;;;
+4DD5;HEXAGRAM FOR GRACE;So;0;ON;;;;;N;;;;;
+4DD6;HEXAGRAM FOR SPLITTING APART;So;0;ON;;;;;N;;;;;
+4DD7;HEXAGRAM FOR RETURN;So;0;ON;;;;;N;;;;;
+4DD8;HEXAGRAM FOR INNOCENCE;So;0;ON;;;;;N;;;;;
+4DD9;HEXAGRAM FOR GREAT TAMING;So;0;ON;;;;;N;;;;;
+4DDA;HEXAGRAM FOR MOUTH CORNERS;So;0;ON;;;;;N;;;;;
+4DDB;HEXAGRAM FOR GREAT PREPONDERANCE;So;0;ON;;;;;N;;;;;
+4DDC;HEXAGRAM FOR THE ABYSMAL WATER;So;0;ON;;;;;N;;;;;
+4DDD;HEXAGRAM FOR THE CLINGING FIRE;So;0;ON;;;;;N;;;;;
+4DDE;HEXAGRAM FOR INFLUENCE;So;0;ON;;;;;N;;;;;
+4DDF;HEXAGRAM FOR DURATION;So;0;ON;;;;;N;;;;;
+4DE0;HEXAGRAM FOR RETREAT;So;0;ON;;;;;N;;;;;
+4DE1;HEXAGRAM FOR GREAT POWER;So;0;ON;;;;;N;;;;;
+4DE2;HEXAGRAM FOR PROGRESS;So;0;ON;;;;;N;;;;;
+4DE3;HEXAGRAM FOR DARKENING OF THE LIGHT;So;0;ON;;;;;N;;;;;
+4DE4;HEXAGRAM FOR THE FAMILY;So;0;ON;;;;;N;;;;;
+4DE5;HEXAGRAM FOR OPPOSITION;So;0;ON;;;;;N;;;;;
+4DE6;HEXAGRAM FOR OBSTRUCTION;So;0;ON;;;;;N;;;;;
+4DE7;HEXAGRAM FOR DELIVERANCE;So;0;ON;;;;;N;;;;;
+4DE8;HEXAGRAM FOR DECREASE;So;0;ON;;;;;N;;;;;
+4DE9;HEXAGRAM FOR INCREASE;So;0;ON;;;;;N;;;;;
+4DEA;HEXAGRAM FOR BREAKTHROUGH;So;0;ON;;;;;N;;;;;
+4DEB;HEXAGRAM FOR COMING TO MEET;So;0;ON;;;;;N;;;;;
+4DEC;HEXAGRAM FOR GATHERING TOGETHER;So;0;ON;;;;;N;;;;;
+4DED;HEXAGRAM FOR PUSHING UPWARD;So;0;ON;;;;;N;;;;;
+4DEE;HEXAGRAM FOR OPPRESSION;So;0;ON;;;;;N;;;;;
+4DEF;HEXAGRAM FOR THE WELL;So;0;ON;;;;;N;;;;;
+4DF0;HEXAGRAM FOR REVOLUTION;So;0;ON;;;;;N;;;;;
+4DF1;HEXAGRAM FOR THE CAULDRON;So;0;ON;;;;;N;;;;;
+4DF2;HEXAGRAM FOR THE AROUSING THUNDER;So;0;ON;;;;;N;;;;;
+4DF3;HEXAGRAM FOR THE KEEPING STILL MOUNTAIN;So;0;ON;;;;;N;;;;;
+4DF4;HEXAGRAM FOR DEVELOPMENT;So;0;ON;;;;;N;;;;;
+4DF5;HEXAGRAM FOR THE MARRYING MAIDEN;So;0;ON;;;;;N;;;;;
+4DF6;HEXAGRAM FOR ABUNDANCE;So;0;ON;;;;;N;;;;;
+4DF7;HEXAGRAM FOR THE WANDERER;So;0;ON;;;;;N;;;;;
+4DF8;HEXAGRAM FOR THE GENTLE WIND;So;0;ON;;;;;N;;;;;
+4DF9;HEXAGRAM FOR THE JOYOUS LAKE;So;0;ON;;;;;N;;;;;
+4DFA;HEXAGRAM FOR DISPERSION;So;0;ON;;;;;N;;;;;
+4DFB;HEXAGRAM FOR LIMITATION;So;0;ON;;;;;N;;;;;
+4DFC;HEXAGRAM FOR INNER TRUTH;So;0;ON;;;;;N;;;;;
+4DFD;HEXAGRAM FOR SMALL PREPONDERANCE;So;0;ON;;;;;N;;;;;
+4DFE;HEXAGRAM FOR AFTER COMPLETION;So;0;ON;;;;;N;;;;;
+4DFF;HEXAGRAM FOR BEFORE COMPLETION;So;0;ON;;;;;N;;;;;
+4E00;<CJK Ideograph, First>;Lo;0;L;;;;;N;;;;;
+9FC3;<CJK Ideograph, Last>;Lo;0;L;;;;;N;;;;;
+A000;YI SYLLABLE IT;Lo;0;L;;;;;N;;;;;
+A001;YI SYLLABLE IX;Lo;0;L;;;;;N;;;;;
+A002;YI SYLLABLE I;Lo;0;L;;;;;N;;;;;
+A003;YI SYLLABLE IP;Lo;0;L;;;;;N;;;;;
+A004;YI SYLLABLE IET;Lo;0;L;;;;;N;;;;;
+A005;YI SYLLABLE IEX;Lo;0;L;;;;;N;;;;;
+A006;YI SYLLABLE IE;Lo;0;L;;;;;N;;;;;
+A007;YI SYLLABLE IEP;Lo;0;L;;;;;N;;;;;
+A008;YI SYLLABLE AT;Lo;0;L;;;;;N;;;;;
+A009;YI SYLLABLE AX;Lo;0;L;;;;;N;;;;;
+A00A;YI SYLLABLE A;Lo;0;L;;;;;N;;;;;
+A00B;YI SYLLABLE AP;Lo;0;L;;;;;N;;;;;
+A00C;YI SYLLABLE UOX;Lo;0;L;;;;;N;;;;;
+A00D;YI SYLLABLE UO;Lo;0;L;;;;;N;;;;;
+A00E;YI SYLLABLE UOP;Lo;0;L;;;;;N;;;;;
+A00F;YI SYLLABLE OT;Lo;0;L;;;;;N;;;;;
+A010;YI SYLLABLE OX;Lo;0;L;;;;;N;;;;;
+A011;YI SYLLABLE O;Lo;0;L;;;;;N;;;;;
+A012;YI SYLLABLE OP;Lo;0;L;;;;;N;;;;;
+A013;YI SYLLABLE EX;Lo;0;L;;;;;N;;;;;
+A014;YI SYLLABLE E;Lo;0;L;;;;;N;;;;;
+A015;YI SYLLABLE WU;Lm;0;L;;;;;N;;;;;
+A016;YI SYLLABLE BIT;Lo;0;L;;;;;N;;;;;
+A017;YI SYLLABLE BIX;Lo;0;L;;;;;N;;;;;
+A018;YI SYLLABLE BI;Lo;0;L;;;;;N;;;;;
+A019;YI SYLLABLE BIP;Lo;0;L;;;;;N;;;;;
+A01A;YI SYLLABLE BIET;Lo;0;L;;;;;N;;;;;
+A01B;YI SYLLABLE BIEX;Lo;0;L;;;;;N;;;;;
+A01C;YI SYLLABLE BIE;Lo;0;L;;;;;N;;;;;
+A01D;YI SYLLABLE BIEP;Lo;0;L;;;;;N;;;;;
+A01E;YI SYLLABLE BAT;Lo;0;L;;;;;N;;;;;
+A01F;YI SYLLABLE BAX;Lo;0;L;;;;;N;;;;;
+A020;YI SYLLABLE BA;Lo;0;L;;;;;N;;;;;
+A021;YI SYLLABLE BAP;Lo;0;L;;;;;N;;;;;
+A022;YI SYLLABLE BUOX;Lo;0;L;;;;;N;;;;;
+A023;YI SYLLABLE BUO;Lo;0;L;;;;;N;;;;;
+A024;YI SYLLABLE BUOP;Lo;0;L;;;;;N;;;;;
+A025;YI SYLLABLE BOT;Lo;0;L;;;;;N;;;;;
+A026;YI SYLLABLE BOX;Lo;0;L;;;;;N;;;;;
+A027;YI SYLLABLE BO;Lo;0;L;;;;;N;;;;;
+A028;YI SYLLABLE BOP;Lo;0;L;;;;;N;;;;;
+A029;YI SYLLABLE BEX;Lo;0;L;;;;;N;;;;;
+A02A;YI SYLLABLE BE;Lo;0;L;;;;;N;;;;;
+A02B;YI SYLLABLE BEP;Lo;0;L;;;;;N;;;;;
+A02C;YI SYLLABLE BUT;Lo;0;L;;;;;N;;;;;
+A02D;YI SYLLABLE BUX;Lo;0;L;;;;;N;;;;;
+A02E;YI SYLLABLE BU;Lo;0;L;;;;;N;;;;;
+A02F;YI SYLLABLE BUP;Lo;0;L;;;;;N;;;;;
+A030;YI SYLLABLE BURX;Lo;0;L;;;;;N;;;;;
+A031;YI SYLLABLE BUR;Lo;0;L;;;;;N;;;;;
+A032;YI SYLLABLE BYT;Lo;0;L;;;;;N;;;;;
+A033;YI SYLLABLE BYX;Lo;0;L;;;;;N;;;;;
+A034;YI SYLLABLE BY;Lo;0;L;;;;;N;;;;;
+A035;YI SYLLABLE BYP;Lo;0;L;;;;;N;;;;;
+A036;YI SYLLABLE BYRX;Lo;0;L;;;;;N;;;;;
+A037;YI SYLLABLE BYR;Lo;0;L;;;;;N;;;;;
+A038;YI SYLLABLE PIT;Lo;0;L;;;;;N;;;;;
+A039;YI SYLLABLE PIX;Lo;0;L;;;;;N;;;;;
+A03A;YI SYLLABLE PI;Lo;0;L;;;;;N;;;;;
+A03B;YI SYLLABLE PIP;Lo;0;L;;;;;N;;;;;
+A03C;YI SYLLABLE PIEX;Lo;0;L;;;;;N;;;;;
+A03D;YI SYLLABLE PIE;Lo;0;L;;;;;N;;;;;
+A03E;YI SYLLABLE PIEP;Lo;0;L;;;;;N;;;;;
+A03F;YI SYLLABLE PAT;Lo;0;L;;;;;N;;;;;
+A040;YI SYLLABLE PAX;Lo;0;L;;;;;N;;;;;
+A041;YI SYLLABLE PA;Lo;0;L;;;;;N;;;;;
+A042;YI SYLLABLE PAP;Lo;0;L;;;;;N;;;;;
+A043;YI SYLLABLE PUOX;Lo;0;L;;;;;N;;;;;
+A044;YI SYLLABLE PUO;Lo;0;L;;;;;N;;;;;
+A045;YI SYLLABLE PUOP;Lo;0;L;;;;;N;;;;;
+A046;YI SYLLABLE POT;Lo;0;L;;;;;N;;;;;
+A047;YI SYLLABLE POX;Lo;0;L;;;;;N;;;;;
+A048;YI SYLLABLE PO;Lo;0;L;;;;;N;;;;;
+A049;YI SYLLABLE POP;Lo;0;L;;;;;N;;;;;
+A04A;YI SYLLABLE PUT;Lo;0;L;;;;;N;;;;;
+A04B;YI SYLLABLE PUX;Lo;0;L;;;;;N;;;;;
+A04C;YI SYLLABLE PU;Lo;0;L;;;;;N;;;;;
+A04D;YI SYLLABLE PUP;Lo;0;L;;;;;N;;;;;
+A04E;YI SYLLABLE PURX;Lo;0;L;;;;;N;;;;;
+A04F;YI SYLLABLE PUR;Lo;0;L;;;;;N;;;;;
+A050;YI SYLLABLE PYT;Lo;0;L;;;;;N;;;;;
+A051;YI SYLLABLE PYX;Lo;0;L;;;;;N;;;;;
+A052;YI SYLLABLE PY;Lo;0;L;;;;;N;;;;;
+A053;YI SYLLABLE PYP;Lo;0;L;;;;;N;;;;;
+A054;YI SYLLABLE PYRX;Lo;0;L;;;;;N;;;;;
+A055;YI SYLLABLE PYR;Lo;0;L;;;;;N;;;;;
+A056;YI SYLLABLE BBIT;Lo;0;L;;;;;N;;;;;
+A057;YI SYLLABLE BBIX;Lo;0;L;;;;;N;;;;;
+A058;YI SYLLABLE BBI;Lo;0;L;;;;;N;;;;;
+A059;YI SYLLABLE BBIP;Lo;0;L;;;;;N;;;;;
+A05A;YI SYLLABLE BBIET;Lo;0;L;;;;;N;;;;;
+A05B;YI SYLLABLE BBIEX;Lo;0;L;;;;;N;;;;;
+A05C;YI SYLLABLE BBIE;Lo;0;L;;;;;N;;;;;
+A05D;YI SYLLABLE BBIEP;Lo;0;L;;;;;N;;;;;
+A05E;YI SYLLABLE BBAT;Lo;0;L;;;;;N;;;;;
+A05F;YI SYLLABLE BBAX;Lo;0;L;;;;;N;;;;;
+A060;YI SYLLABLE BBA;Lo;0;L;;;;;N;;;;;
+A061;YI SYLLABLE BBAP;Lo;0;L;;;;;N;;;;;
+A062;YI SYLLABLE BBUOX;Lo;0;L;;;;;N;;;;;
+A063;YI SYLLABLE BBUO;Lo;0;L;;;;;N;;;;;
+A064;YI SYLLABLE BBUOP;Lo;0;L;;;;;N;;;;;
+A065;YI SYLLABLE BBOT;Lo;0;L;;;;;N;;;;;
+A066;YI SYLLABLE BBOX;Lo;0;L;;;;;N;;;;;
+A067;YI SYLLABLE BBO;Lo;0;L;;;;;N;;;;;
+A068;YI SYLLABLE BBOP;Lo;0;L;;;;;N;;;;;
+A069;YI SYLLABLE BBEX;Lo;0;L;;;;;N;;;;;
+A06A;YI SYLLABLE BBE;Lo;0;L;;;;;N;;;;;
+A06B;YI SYLLABLE BBEP;Lo;0;L;;;;;N;;;;;
+A06C;YI SYLLABLE BBUT;Lo;0;L;;;;;N;;;;;
+A06D;YI SYLLABLE BBUX;Lo;0;L;;;;;N;;;;;
+A06E;YI SYLLABLE BBU;Lo;0;L;;;;;N;;;;;
+A06F;YI SYLLABLE BBUP;Lo;0;L;;;;;N;;;;;
+A070;YI SYLLABLE BBURX;Lo;0;L;;;;;N;;;;;
+A071;YI SYLLABLE BBUR;Lo;0;L;;;;;N;;;;;
+A072;YI SYLLABLE BBYT;Lo;0;L;;;;;N;;;;;
+A073;YI SYLLABLE BBYX;Lo;0;L;;;;;N;;;;;
+A074;YI SYLLABLE BBY;Lo;0;L;;;;;N;;;;;
+A075;YI SYLLABLE BBYP;Lo;0;L;;;;;N;;;;;
+A076;YI SYLLABLE NBIT;Lo;0;L;;;;;N;;;;;
+A077;YI SYLLABLE NBIX;Lo;0;L;;;;;N;;;;;
+A078;YI SYLLABLE NBI;Lo;0;L;;;;;N;;;;;
+A079;YI SYLLABLE NBIP;Lo;0;L;;;;;N;;;;;
+A07A;YI SYLLABLE NBIEX;Lo;0;L;;;;;N;;;;;
+A07B;YI SYLLABLE NBIE;Lo;0;L;;;;;N;;;;;
+A07C;YI SYLLABLE NBIEP;Lo;0;L;;;;;N;;;;;
+A07D;YI SYLLABLE NBAT;Lo;0;L;;;;;N;;;;;
+A07E;YI SYLLABLE NBAX;Lo;0;L;;;;;N;;;;;
+A07F;YI SYLLABLE NBA;Lo;0;L;;;;;N;;;;;
+A080;YI SYLLABLE NBAP;Lo;0;L;;;;;N;;;;;
+A081;YI SYLLABLE NBOT;Lo;0;L;;;;;N;;;;;
+A082;YI SYLLABLE NBOX;Lo;0;L;;;;;N;;;;;
+A083;YI SYLLABLE NBO;Lo;0;L;;;;;N;;;;;
+A084;YI SYLLABLE NBOP;Lo;0;L;;;;;N;;;;;
+A085;YI SYLLABLE NBUT;Lo;0;L;;;;;N;;;;;
+A086;YI SYLLABLE NBUX;Lo;0;L;;;;;N;;;;;
+A087;YI SYLLABLE NBU;Lo;0;L;;;;;N;;;;;
+A088;YI SYLLABLE NBUP;Lo;0;L;;;;;N;;;;;
+A089;YI SYLLABLE NBURX;Lo;0;L;;;;;N;;;;;
+A08A;YI SYLLABLE NBUR;Lo;0;L;;;;;N;;;;;
+A08B;YI SYLLABLE NBYT;Lo;0;L;;;;;N;;;;;
+A08C;YI SYLLABLE NBYX;Lo;0;L;;;;;N;;;;;
+A08D;YI SYLLABLE NBY;Lo;0;L;;;;;N;;;;;
+A08E;YI SYLLABLE NBYP;Lo;0;L;;;;;N;;;;;
+A08F;YI SYLLABLE NBYRX;Lo;0;L;;;;;N;;;;;
+A090;YI SYLLABLE NBYR;Lo;0;L;;;;;N;;;;;
+A091;YI SYLLABLE HMIT;Lo;0;L;;;;;N;;;;;
+A092;YI SYLLABLE HMIX;Lo;0;L;;;;;N;;;;;
+A093;YI SYLLABLE HMI;Lo;0;L;;;;;N;;;;;
+A094;YI SYLLABLE HMIP;Lo;0;L;;;;;N;;;;;
+A095;YI SYLLABLE HMIEX;Lo;0;L;;;;;N;;;;;
+A096;YI SYLLABLE HMIE;Lo;0;L;;;;;N;;;;;
+A097;YI SYLLABLE HMIEP;Lo;0;L;;;;;N;;;;;
+A098;YI SYLLABLE HMAT;Lo;0;L;;;;;N;;;;;
+A099;YI SYLLABLE HMAX;Lo;0;L;;;;;N;;;;;
+A09A;YI SYLLABLE HMA;Lo;0;L;;;;;N;;;;;
+A09B;YI SYLLABLE HMAP;Lo;0;L;;;;;N;;;;;
+A09C;YI SYLLABLE HMUOX;Lo;0;L;;;;;N;;;;;
+A09D;YI SYLLABLE HMUO;Lo;0;L;;;;;N;;;;;
+A09E;YI SYLLABLE HMUOP;Lo;0;L;;;;;N;;;;;
+A09F;YI SYLLABLE HMOT;Lo;0;L;;;;;N;;;;;
+A0A0;YI SYLLABLE HMOX;Lo;0;L;;;;;N;;;;;
+A0A1;YI SYLLABLE HMO;Lo;0;L;;;;;N;;;;;
+A0A2;YI SYLLABLE HMOP;Lo;0;L;;;;;N;;;;;
+A0A3;YI SYLLABLE HMUT;Lo;0;L;;;;;N;;;;;
+A0A4;YI SYLLABLE HMUX;Lo;0;L;;;;;N;;;;;
+A0A5;YI SYLLABLE HMU;Lo;0;L;;;;;N;;;;;
+A0A6;YI SYLLABLE HMUP;Lo;0;L;;;;;N;;;;;
+A0A7;YI SYLLABLE HMURX;Lo;0;L;;;;;N;;;;;
+A0A8;YI SYLLABLE HMUR;Lo;0;L;;;;;N;;;;;
+A0A9;YI SYLLABLE HMYX;Lo;0;L;;;;;N;;;;;
+A0AA;YI SYLLABLE HMY;Lo;0;L;;;;;N;;;;;
+A0AB;YI SYLLABLE HMYP;Lo;0;L;;;;;N;;;;;
+A0AC;YI SYLLABLE HMYRX;Lo;0;L;;;;;N;;;;;
+A0AD;YI SYLLABLE HMYR;Lo;0;L;;;;;N;;;;;
+A0AE;YI SYLLABLE MIT;Lo;0;L;;;;;N;;;;;
+A0AF;YI SYLLABLE MIX;Lo;0;L;;;;;N;;;;;
+A0B0;YI SYLLABLE MI;Lo;0;L;;;;;N;;;;;
+A0B1;YI SYLLABLE MIP;Lo;0;L;;;;;N;;;;;
+A0B2;YI SYLLABLE MIEX;Lo;0;L;;;;;N;;;;;
+A0B3;YI SYLLABLE MIE;Lo;0;L;;;;;N;;;;;
+A0B4;YI SYLLABLE MIEP;Lo;0;L;;;;;N;;;;;
+A0B5;YI SYLLABLE MAT;Lo;0;L;;;;;N;;;;;
+A0B6;YI SYLLABLE MAX;Lo;0;L;;;;;N;;;;;
+A0B7;YI SYLLABLE MA;Lo;0;L;;;;;N;;;;;
+A0B8;YI SYLLABLE MAP;Lo;0;L;;;;;N;;;;;
+A0B9;YI SYLLABLE MUOT;Lo;0;L;;;;;N;;;;;
+A0BA;YI SYLLABLE MUOX;Lo;0;L;;;;;N;;;;;
+A0BB;YI SYLLABLE MUO;Lo;0;L;;;;;N;;;;;
+A0BC;YI SYLLABLE MUOP;Lo;0;L;;;;;N;;;;;
+A0BD;YI SYLLABLE MOT;Lo;0;L;;;;;N;;;;;
+A0BE;YI SYLLABLE MOX;Lo;0;L;;;;;N;;;;;
+A0BF;YI SYLLABLE MO;Lo;0;L;;;;;N;;;;;
+A0C0;YI SYLLABLE MOP;Lo;0;L;;;;;N;;;;;
+A0C1;YI SYLLABLE MEX;Lo;0;L;;;;;N;;;;;
+A0C2;YI SYLLABLE ME;Lo;0;L;;;;;N;;;;;
+A0C3;YI SYLLABLE MUT;Lo;0;L;;;;;N;;;;;
+A0C4;YI SYLLABLE MUX;Lo;0;L;;;;;N;;;;;
+A0C5;YI SYLLABLE MU;Lo;0;L;;;;;N;;;;;
+A0C6;YI SYLLABLE MUP;Lo;0;L;;;;;N;;;;;
+A0C7;YI SYLLABLE MURX;Lo;0;L;;;;;N;;;;;
+A0C8;YI SYLLABLE MUR;Lo;0;L;;;;;N;;;;;
+A0C9;YI SYLLABLE MYT;Lo;0;L;;;;;N;;;;;
+A0CA;YI SYLLABLE MYX;Lo;0;L;;;;;N;;;;;
+A0CB;YI SYLLABLE MY;Lo;0;L;;;;;N;;;;;
+A0CC;YI SYLLABLE MYP;Lo;0;L;;;;;N;;;;;
+A0CD;YI SYLLABLE FIT;Lo;0;L;;;;;N;;;;;
+A0CE;YI SYLLABLE FIX;Lo;0;L;;;;;N;;;;;
+A0CF;YI SYLLABLE FI;Lo;0;L;;;;;N;;;;;
+A0D0;YI SYLLABLE FIP;Lo;0;L;;;;;N;;;;;
+A0D1;YI SYLLABLE FAT;Lo;0;L;;;;;N;;;;;
+A0D2;YI SYLLABLE FAX;Lo;0;L;;;;;N;;;;;
+A0D3;YI SYLLABLE FA;Lo;0;L;;;;;N;;;;;
+A0D4;YI SYLLABLE FAP;Lo;0;L;;;;;N;;;;;
+A0D5;YI SYLLABLE FOX;Lo;0;L;;;;;N;;;;;
+A0D6;YI SYLLABLE FO;Lo;0;L;;;;;N;;;;;
+A0D7;YI SYLLABLE FOP;Lo;0;L;;;;;N;;;;;
+A0D8;YI SYLLABLE FUT;Lo;0;L;;;;;N;;;;;
+A0D9;YI SYLLABLE FUX;Lo;0;L;;;;;N;;;;;
+A0DA;YI SYLLABLE FU;Lo;0;L;;;;;N;;;;;
+A0DB;YI SYLLABLE FUP;Lo;0;L;;;;;N;;;;;
+A0DC;YI SYLLABLE FURX;Lo;0;L;;;;;N;;;;;
+A0DD;YI SYLLABLE FUR;Lo;0;L;;;;;N;;;;;
+A0DE;YI SYLLABLE FYT;Lo;0;L;;;;;N;;;;;
+A0DF;YI SYLLABLE FYX;Lo;0;L;;;;;N;;;;;
+A0E0;YI SYLLABLE FY;Lo;0;L;;;;;N;;;;;
+A0E1;YI SYLLABLE FYP;Lo;0;L;;;;;N;;;;;
+A0E2;YI SYLLABLE VIT;Lo;0;L;;;;;N;;;;;
+A0E3;YI SYLLABLE VIX;Lo;0;L;;;;;N;;;;;
+A0E4;YI SYLLABLE VI;Lo;0;L;;;;;N;;;;;
+A0E5;YI SYLLABLE VIP;Lo;0;L;;;;;N;;;;;
+A0E6;YI SYLLABLE VIET;Lo;0;L;;;;;N;;;;;
+A0E7;YI SYLLABLE VIEX;Lo;0;L;;;;;N;;;;;
+A0E8;YI SYLLABLE VIE;Lo;0;L;;;;;N;;;;;
+A0E9;YI SYLLABLE VIEP;Lo;0;L;;;;;N;;;;;
+A0EA;YI SYLLABLE VAT;Lo;0;L;;;;;N;;;;;
+A0EB;YI SYLLABLE VAX;Lo;0;L;;;;;N;;;;;
+A0EC;YI SYLLABLE VA;Lo;0;L;;;;;N;;;;;
+A0ED;YI SYLLABLE VAP;Lo;0;L;;;;;N;;;;;
+A0EE;YI SYLLABLE VOT;Lo;0;L;;;;;N;;;;;
+A0EF;YI SYLLABLE VOX;Lo;0;L;;;;;N;;;;;
+A0F0;YI SYLLABLE VO;Lo;0;L;;;;;N;;;;;
+A0F1;YI SYLLABLE VOP;Lo;0;L;;;;;N;;;;;
+A0F2;YI SYLLABLE VEX;Lo;0;L;;;;;N;;;;;
+A0F3;YI SYLLABLE VEP;Lo;0;L;;;;;N;;;;;
+A0F4;YI SYLLABLE VUT;Lo;0;L;;;;;N;;;;;
+A0F5;YI SYLLABLE VUX;Lo;0;L;;;;;N;;;;;
+A0F6;YI SYLLABLE VU;Lo;0;L;;;;;N;;;;;
+A0F7;YI SYLLABLE VUP;Lo;0;L;;;;;N;;;;;
+A0F8;YI SYLLABLE VURX;Lo;0;L;;;;;N;;;;;
+A0F9;YI SYLLABLE VUR;Lo;0;L;;;;;N;;;;;
+A0FA;YI SYLLABLE VYT;Lo;0;L;;;;;N;;;;;
+A0FB;YI SYLLABLE VYX;Lo;0;L;;;;;N;;;;;
+A0FC;YI SYLLABLE VY;Lo;0;L;;;;;N;;;;;
+A0FD;YI SYLLABLE VYP;Lo;0;L;;;;;N;;;;;
+A0FE;YI SYLLABLE VYRX;Lo;0;L;;;;;N;;;;;
+A0FF;YI SYLLABLE VYR;Lo;0;L;;;;;N;;;;;
+A100;YI SYLLABLE DIT;Lo;0;L;;;;;N;;;;;
+A101;YI SYLLABLE DIX;Lo;0;L;;;;;N;;;;;
+A102;YI SYLLABLE DI;Lo;0;L;;;;;N;;;;;
+A103;YI SYLLABLE DIP;Lo;0;L;;;;;N;;;;;
+A104;YI SYLLABLE DIEX;Lo;0;L;;;;;N;;;;;
+A105;YI SYLLABLE DIE;Lo;0;L;;;;;N;;;;;
+A106;YI SYLLABLE DIEP;Lo;0;L;;;;;N;;;;;
+A107;YI SYLLABLE DAT;Lo;0;L;;;;;N;;;;;
+A108;YI SYLLABLE DAX;Lo;0;L;;;;;N;;;;;
+A109;YI SYLLABLE DA;Lo;0;L;;;;;N;;;;;
+A10A;YI SYLLABLE DAP;Lo;0;L;;;;;N;;;;;
+A10B;YI SYLLABLE DUOX;Lo;0;L;;;;;N;;;;;
+A10C;YI SYLLABLE DUO;Lo;0;L;;;;;N;;;;;
+A10D;YI SYLLABLE DOT;Lo;0;L;;;;;N;;;;;
+A10E;YI SYLLABLE DOX;Lo;0;L;;;;;N;;;;;
+A10F;YI SYLLABLE DO;Lo;0;L;;;;;N;;;;;
+A110;YI SYLLABLE DOP;Lo;0;L;;;;;N;;;;;
+A111;YI SYLLABLE DEX;Lo;0;L;;;;;N;;;;;
+A112;YI SYLLABLE DE;Lo;0;L;;;;;N;;;;;
+A113;YI SYLLABLE DEP;Lo;0;L;;;;;N;;;;;
+A114;YI SYLLABLE DUT;Lo;0;L;;;;;N;;;;;
+A115;YI SYLLABLE DUX;Lo;0;L;;;;;N;;;;;
+A116;YI SYLLABLE DU;Lo;0;L;;;;;N;;;;;
+A117;YI SYLLABLE DUP;Lo;0;L;;;;;N;;;;;
+A118;YI SYLLABLE DURX;Lo;0;L;;;;;N;;;;;
+A119;YI SYLLABLE DUR;Lo;0;L;;;;;N;;;;;
+A11A;YI SYLLABLE TIT;Lo;0;L;;;;;N;;;;;
+A11B;YI SYLLABLE TIX;Lo;0;L;;;;;N;;;;;
+A11C;YI SYLLABLE TI;Lo;0;L;;;;;N;;;;;
+A11D;YI SYLLABLE TIP;Lo;0;L;;;;;N;;;;;
+A11E;YI SYLLABLE TIEX;Lo;0;L;;;;;N;;;;;
+A11F;YI SYLLABLE TIE;Lo;0;L;;;;;N;;;;;
+A120;YI SYLLABLE TIEP;Lo;0;L;;;;;N;;;;;
+A121;YI SYLLABLE TAT;Lo;0;L;;;;;N;;;;;
+A122;YI SYLLABLE TAX;Lo;0;L;;;;;N;;;;;
+A123;YI SYLLABLE TA;Lo;0;L;;;;;N;;;;;
+A124;YI SYLLABLE TAP;Lo;0;L;;;;;N;;;;;
+A125;YI SYLLABLE TUOT;Lo;0;L;;;;;N;;;;;
+A126;YI SYLLABLE TUOX;Lo;0;L;;;;;N;;;;;
+A127;YI SYLLABLE TUO;Lo;0;L;;;;;N;;;;;
+A128;YI SYLLABLE TUOP;Lo;0;L;;;;;N;;;;;
+A129;YI SYLLABLE TOT;Lo;0;L;;;;;N;;;;;
+A12A;YI SYLLABLE TOX;Lo;0;L;;;;;N;;;;;
+A12B;YI SYLLABLE TO;Lo;0;L;;;;;N;;;;;
+A12C;YI SYLLABLE TOP;Lo;0;L;;;;;N;;;;;
+A12D;YI SYLLABLE TEX;Lo;0;L;;;;;N;;;;;
+A12E;YI SYLLABLE TE;Lo;0;L;;;;;N;;;;;
+A12F;YI SYLLABLE TEP;Lo;0;L;;;;;N;;;;;
+A130;YI SYLLABLE TUT;Lo;0;L;;;;;N;;;;;
+A131;YI SYLLABLE TUX;Lo;0;L;;;;;N;;;;;
+A132;YI SYLLABLE TU;Lo;0;L;;;;;N;;;;;
+A133;YI SYLLABLE TUP;Lo;0;L;;;;;N;;;;;
+A134;YI SYLLABLE TURX;Lo;0;L;;;;;N;;;;;
+A135;YI SYLLABLE TUR;Lo;0;L;;;;;N;;;;;
+A136;YI SYLLABLE DDIT;Lo;0;L;;;;;N;;;;;
+A137;YI SYLLABLE DDIX;Lo;0;L;;;;;N;;;;;
+A138;YI SYLLABLE DDI;Lo;0;L;;;;;N;;;;;
+A139;YI SYLLABLE DDIP;Lo;0;L;;;;;N;;;;;
+A13A;YI SYLLABLE DDIEX;Lo;0;L;;;;;N;;;;;
+A13B;YI SYLLABLE DDIE;Lo;0;L;;;;;N;;;;;
+A13C;YI SYLLABLE DDIEP;Lo;0;L;;;;;N;;;;;
+A13D;YI SYLLABLE DDAT;Lo;0;L;;;;;N;;;;;
+A13E;YI SYLLABLE DDAX;Lo;0;L;;;;;N;;;;;
+A13F;YI SYLLABLE DDA;Lo;0;L;;;;;N;;;;;
+A140;YI SYLLABLE DDAP;Lo;0;L;;;;;N;;;;;
+A141;YI SYLLABLE DDUOX;Lo;0;L;;;;;N;;;;;
+A142;YI SYLLABLE DDUO;Lo;0;L;;;;;N;;;;;
+A143;YI SYLLABLE DDUOP;Lo;0;L;;;;;N;;;;;
+A144;YI SYLLABLE DDOT;Lo;0;L;;;;;N;;;;;
+A145;YI SYLLABLE DDOX;Lo;0;L;;;;;N;;;;;
+A146;YI SYLLABLE DDO;Lo;0;L;;;;;N;;;;;
+A147;YI SYLLABLE DDOP;Lo;0;L;;;;;N;;;;;
+A148;YI SYLLABLE DDEX;Lo;0;L;;;;;N;;;;;
+A149;YI SYLLABLE DDE;Lo;0;L;;;;;N;;;;;
+A14A;YI SYLLABLE DDEP;Lo;0;L;;;;;N;;;;;
+A14B;YI SYLLABLE DDUT;Lo;0;L;;;;;N;;;;;
+A14C;YI SYLLABLE DDUX;Lo;0;L;;;;;N;;;;;
+A14D;YI SYLLABLE DDU;Lo;0;L;;;;;N;;;;;
+A14E;YI SYLLABLE DDUP;Lo;0;L;;;;;N;;;;;
+A14F;YI SYLLABLE DDURX;Lo;0;L;;;;;N;;;;;
+A150;YI SYLLABLE DDUR;Lo;0;L;;;;;N;;;;;
+A151;YI SYLLABLE NDIT;Lo;0;L;;;;;N;;;;;
+A152;YI SYLLABLE NDIX;Lo;0;L;;;;;N;;;;;
+A153;YI SYLLABLE NDI;Lo;0;L;;;;;N;;;;;
+A154;YI SYLLABLE NDIP;Lo;0;L;;;;;N;;;;;
+A155;YI SYLLABLE NDIEX;Lo;0;L;;;;;N;;;;;
+A156;YI SYLLABLE NDIE;Lo;0;L;;;;;N;;;;;
+A157;YI SYLLABLE NDAT;Lo;0;L;;;;;N;;;;;
+A158;YI SYLLABLE NDAX;Lo;0;L;;;;;N;;;;;
+A159;YI SYLLABLE NDA;Lo;0;L;;;;;N;;;;;
+A15A;YI SYLLABLE NDAP;Lo;0;L;;;;;N;;;;;
+A15B;YI SYLLABLE NDOT;Lo;0;L;;;;;N;;;;;
+A15C;YI SYLLABLE NDOX;Lo;0;L;;;;;N;;;;;
+A15D;YI SYLLABLE NDO;Lo;0;L;;;;;N;;;;;
+A15E;YI SYLLABLE NDOP;Lo;0;L;;;;;N;;;;;
+A15F;YI SYLLABLE NDEX;Lo;0;L;;;;;N;;;;;
+A160;YI SYLLABLE NDE;Lo;0;L;;;;;N;;;;;
+A161;YI SYLLABLE NDEP;Lo;0;L;;;;;N;;;;;
+A162;YI SYLLABLE NDUT;Lo;0;L;;;;;N;;;;;
+A163;YI SYLLABLE NDUX;Lo;0;L;;;;;N;;;;;
+A164;YI SYLLABLE NDU;Lo;0;L;;;;;N;;;;;
+A165;YI SYLLABLE NDUP;Lo;0;L;;;;;N;;;;;
+A166;YI SYLLABLE NDURX;Lo;0;L;;;;;N;;;;;
+A167;YI SYLLABLE NDUR;Lo;0;L;;;;;N;;;;;
+A168;YI SYLLABLE HNIT;Lo;0;L;;;;;N;;;;;
+A169;YI SYLLABLE HNIX;Lo;0;L;;;;;N;;;;;
+A16A;YI SYLLABLE HNI;Lo;0;L;;;;;N;;;;;
+A16B;YI SYLLABLE HNIP;Lo;0;L;;;;;N;;;;;
+A16C;YI SYLLABLE HNIET;Lo;0;L;;;;;N;;;;;
+A16D;YI SYLLABLE HNIEX;Lo;0;L;;;;;N;;;;;
+A16E;YI SYLLABLE HNIE;Lo;0;L;;;;;N;;;;;
+A16F;YI SYLLABLE HNIEP;Lo;0;L;;;;;N;;;;;
+A170;YI SYLLABLE HNAT;Lo;0;L;;;;;N;;;;;
+A171;YI SYLLABLE HNAX;Lo;0;L;;;;;N;;;;;
+A172;YI SYLLABLE HNA;Lo;0;L;;;;;N;;;;;
+A173;YI SYLLABLE HNAP;Lo;0;L;;;;;N;;;;;
+A174;YI SYLLABLE HNUOX;Lo;0;L;;;;;N;;;;;
+A175;YI SYLLABLE HNUO;Lo;0;L;;;;;N;;;;;
+A176;YI SYLLABLE HNOT;Lo;0;L;;;;;N;;;;;
+A177;YI SYLLABLE HNOX;Lo;0;L;;;;;N;;;;;
+A178;YI SYLLABLE HNOP;Lo;0;L;;;;;N;;;;;
+A179;YI SYLLABLE HNEX;Lo;0;L;;;;;N;;;;;
+A17A;YI SYLLABLE HNE;Lo;0;L;;;;;N;;;;;
+A17B;YI SYLLABLE HNEP;Lo;0;L;;;;;N;;;;;
+A17C;YI SYLLABLE HNUT;Lo;0;L;;;;;N;;;;;
+A17D;YI SYLLABLE NIT;Lo;0;L;;;;;N;;;;;
+A17E;YI SYLLABLE NIX;Lo;0;L;;;;;N;;;;;
+A17F;YI SYLLABLE NI;Lo;0;L;;;;;N;;;;;
+A180;YI SYLLABLE NIP;Lo;0;L;;;;;N;;;;;
+A181;YI SYLLABLE NIEX;Lo;0;L;;;;;N;;;;;
+A182;YI SYLLABLE NIE;Lo;0;L;;;;;N;;;;;
+A183;YI SYLLABLE NIEP;Lo;0;L;;;;;N;;;;;
+A184;YI SYLLABLE NAX;Lo;0;L;;;;;N;;;;;
+A185;YI SYLLABLE NA;Lo;0;L;;;;;N;;;;;
+A186;YI SYLLABLE NAP;Lo;0;L;;;;;N;;;;;
+A187;YI SYLLABLE NUOX;Lo;0;L;;;;;N;;;;;
+A188;YI SYLLABLE NUO;Lo;0;L;;;;;N;;;;;
+A189;YI SYLLABLE NUOP;Lo;0;L;;;;;N;;;;;
+A18A;YI SYLLABLE NOT;Lo;0;L;;;;;N;;;;;
+A18B;YI SYLLABLE NOX;Lo;0;L;;;;;N;;;;;
+A18C;YI SYLLABLE NO;Lo;0;L;;;;;N;;;;;
+A18D;YI SYLLABLE NOP;Lo;0;L;;;;;N;;;;;
+A18E;YI SYLLABLE NEX;Lo;0;L;;;;;N;;;;;
+A18F;YI SYLLABLE NE;Lo;0;L;;;;;N;;;;;
+A190;YI SYLLABLE NEP;Lo;0;L;;;;;N;;;;;
+A191;YI SYLLABLE NUT;Lo;0;L;;;;;N;;;;;
+A192;YI SYLLABLE NUX;Lo;0;L;;;;;N;;;;;
+A193;YI SYLLABLE NU;Lo;0;L;;;;;N;;;;;
+A194;YI SYLLABLE NUP;Lo;0;L;;;;;N;;;;;
+A195;YI SYLLABLE NURX;Lo;0;L;;;;;N;;;;;
+A196;YI SYLLABLE NUR;Lo;0;L;;;;;N;;;;;
+A197;YI SYLLABLE HLIT;Lo;0;L;;;;;N;;;;;
+A198;YI SYLLABLE HLIX;Lo;0;L;;;;;N;;;;;
+A199;YI SYLLABLE HLI;Lo;0;L;;;;;N;;;;;
+A19A;YI SYLLABLE HLIP;Lo;0;L;;;;;N;;;;;
+A19B;YI SYLLABLE HLIEX;Lo;0;L;;;;;N;;;;;
+A19C;YI SYLLABLE HLIE;Lo;0;L;;;;;N;;;;;
+A19D;YI SYLLABLE HLIEP;Lo;0;L;;;;;N;;;;;
+A19E;YI SYLLABLE HLAT;Lo;0;L;;;;;N;;;;;
+A19F;YI SYLLABLE HLAX;Lo;0;L;;;;;N;;;;;
+A1A0;YI SYLLABLE HLA;Lo;0;L;;;;;N;;;;;
+A1A1;YI SYLLABLE HLAP;Lo;0;L;;;;;N;;;;;
+A1A2;YI SYLLABLE HLUOX;Lo;0;L;;;;;N;;;;;
+A1A3;YI SYLLABLE HLUO;Lo;0;L;;;;;N;;;;;
+A1A4;YI SYLLABLE HLUOP;Lo;0;L;;;;;N;;;;;
+A1A5;YI SYLLABLE HLOX;Lo;0;L;;;;;N;;;;;
+A1A6;YI SYLLABLE HLO;Lo;0;L;;;;;N;;;;;
+A1A7;YI SYLLABLE HLOP;Lo;0;L;;;;;N;;;;;
+A1A8;YI SYLLABLE HLEX;Lo;0;L;;;;;N;;;;;
+A1A9;YI SYLLABLE HLE;Lo;0;L;;;;;N;;;;;
+A1AA;YI SYLLABLE HLEP;Lo;0;L;;;;;N;;;;;
+A1AB;YI SYLLABLE HLUT;Lo;0;L;;;;;N;;;;;
+A1AC;YI SYLLABLE HLUX;Lo;0;L;;;;;N;;;;;
+A1AD;YI SYLLABLE HLU;Lo;0;L;;;;;N;;;;;
+A1AE;YI SYLLABLE HLUP;Lo;0;L;;;;;N;;;;;
+A1AF;YI SYLLABLE HLURX;Lo;0;L;;;;;N;;;;;
+A1B0;YI SYLLABLE HLUR;Lo;0;L;;;;;N;;;;;
+A1B1;YI SYLLABLE HLYT;Lo;0;L;;;;;N;;;;;
+A1B2;YI SYLLABLE HLYX;Lo;0;L;;;;;N;;;;;
+A1B3;YI SYLLABLE HLY;Lo;0;L;;;;;N;;;;;
+A1B4;YI SYLLABLE HLYP;Lo;0;L;;;;;N;;;;;
+A1B5;YI SYLLABLE HLYRX;Lo;0;L;;;;;N;;;;;
+A1B6;YI SYLLABLE HLYR;Lo;0;L;;;;;N;;;;;
+A1B7;YI SYLLABLE LIT;Lo;0;L;;;;;N;;;;;
+A1B8;YI SYLLABLE LIX;Lo;0;L;;;;;N;;;;;
+A1B9;YI SYLLABLE LI;Lo;0;L;;;;;N;;;;;
+A1BA;YI SYLLABLE LIP;Lo;0;L;;;;;N;;;;;
+A1BB;YI SYLLABLE LIET;Lo;0;L;;;;;N;;;;;
+A1BC;YI SYLLABLE LIEX;Lo;0;L;;;;;N;;;;;
+A1BD;YI SYLLABLE LIE;Lo;0;L;;;;;N;;;;;
+A1BE;YI SYLLABLE LIEP;Lo;0;L;;;;;N;;;;;
+A1BF;YI SYLLABLE LAT;Lo;0;L;;;;;N;;;;;
+A1C0;YI SYLLABLE LAX;Lo;0;L;;;;;N;;;;;
+A1C1;YI SYLLABLE LA;Lo;0;L;;;;;N;;;;;
+A1C2;YI SYLLABLE LAP;Lo;0;L;;;;;N;;;;;
+A1C3;YI SYLLABLE LUOT;Lo;0;L;;;;;N;;;;;
+A1C4;YI SYLLABLE LUOX;Lo;0;L;;;;;N;;;;;
+A1C5;YI SYLLABLE LUO;Lo;0;L;;;;;N;;;;;
+A1C6;YI SYLLABLE LUOP;Lo;0;L;;;;;N;;;;;
+A1C7;YI SYLLABLE LOT;Lo;0;L;;;;;N;;;;;
+A1C8;YI SYLLABLE LOX;Lo;0;L;;;;;N;;;;;
+A1C9;YI SYLLABLE LO;Lo;0;L;;;;;N;;;;;
+A1CA;YI SYLLABLE LOP;Lo;0;L;;;;;N;;;;;
+A1CB;YI SYLLABLE LEX;Lo;0;L;;;;;N;;;;;
+A1CC;YI SYLLABLE LE;Lo;0;L;;;;;N;;;;;
+A1CD;YI SYLLABLE LEP;Lo;0;L;;;;;N;;;;;
+A1CE;YI SYLLABLE LUT;Lo;0;L;;;;;N;;;;;
+A1CF;YI SYLLABLE LUX;Lo;0;L;;;;;N;;;;;
+A1D0;YI SYLLABLE LU;Lo;0;L;;;;;N;;;;;
+A1D1;YI SYLLABLE LUP;Lo;0;L;;;;;N;;;;;
+A1D2;YI SYLLABLE LURX;Lo;0;L;;;;;N;;;;;
+A1D3;YI SYLLABLE LUR;Lo;0;L;;;;;N;;;;;
+A1D4;YI SYLLABLE LYT;Lo;0;L;;;;;N;;;;;
+A1D5;YI SYLLABLE LYX;Lo;0;L;;;;;N;;;;;
+A1D6;YI SYLLABLE LY;Lo;0;L;;;;;N;;;;;
+A1D7;YI SYLLABLE LYP;Lo;0;L;;;;;N;;;;;
+A1D8;YI SYLLABLE LYRX;Lo;0;L;;;;;N;;;;;
+A1D9;YI SYLLABLE LYR;Lo;0;L;;;;;N;;;;;
+A1DA;YI SYLLABLE GIT;Lo;0;L;;;;;N;;;;;
+A1DB;YI SYLLABLE GIX;Lo;0;L;;;;;N;;;;;
+A1DC;YI SYLLABLE GI;Lo;0;L;;;;;N;;;;;
+A1DD;YI SYLLABLE GIP;Lo;0;L;;;;;N;;;;;
+A1DE;YI SYLLABLE GIET;Lo;0;L;;;;;N;;;;;
+A1DF;YI SYLLABLE GIEX;Lo;0;L;;;;;N;;;;;
+A1E0;YI SYLLABLE GIE;Lo;0;L;;;;;N;;;;;
+A1E1;YI SYLLABLE GIEP;Lo;0;L;;;;;N;;;;;
+A1E2;YI SYLLABLE GAT;Lo;0;L;;;;;N;;;;;
+A1E3;YI SYLLABLE GAX;Lo;0;L;;;;;N;;;;;
+A1E4;YI SYLLABLE GA;Lo;0;L;;;;;N;;;;;
+A1E5;YI SYLLABLE GAP;Lo;0;L;;;;;N;;;;;
+A1E6;YI SYLLABLE GUOT;Lo;0;L;;;;;N;;;;;
+A1E7;YI SYLLABLE GUOX;Lo;0;L;;;;;N;;;;;
+A1E8;YI SYLLABLE GUO;Lo;0;L;;;;;N;;;;;
+A1E9;YI SYLLABLE GUOP;Lo;0;L;;;;;N;;;;;
+A1EA;YI SYLLABLE GOT;Lo;0;L;;;;;N;;;;;
+A1EB;YI SYLLABLE GOX;Lo;0;L;;;;;N;;;;;
+A1EC;YI SYLLABLE GO;Lo;0;L;;;;;N;;;;;
+A1ED;YI SYLLABLE GOP;Lo;0;L;;;;;N;;;;;
+A1EE;YI SYLLABLE GET;Lo;0;L;;;;;N;;;;;
+A1EF;YI SYLLABLE GEX;Lo;0;L;;;;;N;;;;;
+A1F0;YI SYLLABLE GE;Lo;0;L;;;;;N;;;;;
+A1F1;YI SYLLABLE GEP;Lo;0;L;;;;;N;;;;;
+A1F2;YI SYLLABLE GUT;Lo;0;L;;;;;N;;;;;
+A1F3;YI SYLLABLE GUX;Lo;0;L;;;;;N;;;;;
+A1F4;YI SYLLABLE GU;Lo;0;L;;;;;N;;;;;
+A1F5;YI SYLLABLE GUP;Lo;0;L;;;;;N;;;;;
+A1F6;YI SYLLABLE GURX;Lo;0;L;;;;;N;;;;;
+A1F7;YI SYLLABLE GUR;Lo;0;L;;;;;N;;;;;
+A1F8;YI SYLLABLE KIT;Lo;0;L;;;;;N;;;;;
+A1F9;YI SYLLABLE KIX;Lo;0;L;;;;;N;;;;;
+A1FA;YI SYLLABLE KI;Lo;0;L;;;;;N;;;;;
+A1FB;YI SYLLABLE KIP;Lo;0;L;;;;;N;;;;;
+A1FC;YI SYLLABLE KIEX;Lo;0;L;;;;;N;;;;;
+A1FD;YI SYLLABLE KIE;Lo;0;L;;;;;N;;;;;
+A1FE;YI SYLLABLE KIEP;Lo;0;L;;;;;N;;;;;
+A1FF;YI SYLLABLE KAT;Lo;0;L;;;;;N;;;;;
+A200;YI SYLLABLE KAX;Lo;0;L;;;;;N;;;;;
+A201;YI SYLLABLE KA;Lo;0;L;;;;;N;;;;;
+A202;YI SYLLABLE KAP;Lo;0;L;;;;;N;;;;;
+A203;YI SYLLABLE KUOX;Lo;0;L;;;;;N;;;;;
+A204;YI SYLLABLE KUO;Lo;0;L;;;;;N;;;;;
+A205;YI SYLLABLE KUOP;Lo;0;L;;;;;N;;;;;
+A206;YI SYLLABLE KOT;Lo;0;L;;;;;N;;;;;
+A207;YI SYLLABLE KOX;Lo;0;L;;;;;N;;;;;
+A208;YI SYLLABLE KO;Lo;0;L;;;;;N;;;;;
+A209;YI SYLLABLE KOP;Lo;0;L;;;;;N;;;;;
+A20A;YI SYLLABLE KET;Lo;0;L;;;;;N;;;;;
+A20B;YI SYLLABLE KEX;Lo;0;L;;;;;N;;;;;
+A20C;YI SYLLABLE KE;Lo;0;L;;;;;N;;;;;
+A20D;YI SYLLABLE KEP;Lo;0;L;;;;;N;;;;;
+A20E;YI SYLLABLE KUT;Lo;0;L;;;;;N;;;;;
+A20F;YI SYLLABLE KUX;Lo;0;L;;;;;N;;;;;
+A210;YI SYLLABLE KU;Lo;0;L;;;;;N;;;;;
+A211;YI SYLLABLE KUP;Lo;0;L;;;;;N;;;;;
+A212;YI SYLLABLE KURX;Lo;0;L;;;;;N;;;;;
+A213;YI SYLLABLE KUR;Lo;0;L;;;;;N;;;;;
+A214;YI SYLLABLE GGIT;Lo;0;L;;;;;N;;;;;
+A215;YI SYLLABLE GGIX;Lo;0;L;;;;;N;;;;;
+A216;YI SYLLABLE GGI;Lo;0;L;;;;;N;;;;;
+A217;YI SYLLABLE GGIEX;Lo;0;L;;;;;N;;;;;
+A218;YI SYLLABLE GGIE;Lo;0;L;;;;;N;;;;;
+A219;YI SYLLABLE GGIEP;Lo;0;L;;;;;N;;;;;
+A21A;YI SYLLABLE GGAT;Lo;0;L;;;;;N;;;;;
+A21B;YI SYLLABLE GGAX;Lo;0;L;;;;;N;;;;;
+A21C;YI SYLLABLE GGA;Lo;0;L;;;;;N;;;;;
+A21D;YI SYLLABLE GGAP;Lo;0;L;;;;;N;;;;;
+A21E;YI SYLLABLE GGUOT;Lo;0;L;;;;;N;;;;;
+A21F;YI SYLLABLE GGUOX;Lo;0;L;;;;;N;;;;;
+A220;YI SYLLABLE GGUO;Lo;0;L;;;;;N;;;;;
+A221;YI SYLLABLE GGUOP;Lo;0;L;;;;;N;;;;;
+A222;YI SYLLABLE GGOT;Lo;0;L;;;;;N;;;;;
+A223;YI SYLLABLE GGOX;Lo;0;L;;;;;N;;;;;
+A224;YI SYLLABLE GGO;Lo;0;L;;;;;N;;;;;
+A225;YI SYLLABLE GGOP;Lo;0;L;;;;;N;;;;;
+A226;YI SYLLABLE GGET;Lo;0;L;;;;;N;;;;;
+A227;YI SYLLABLE GGEX;Lo;0;L;;;;;N;;;;;
+A228;YI SYLLABLE GGE;Lo;0;L;;;;;N;;;;;
+A229;YI SYLLABLE GGEP;Lo;0;L;;;;;N;;;;;
+A22A;YI SYLLABLE GGUT;Lo;0;L;;;;;N;;;;;
+A22B;YI SYLLABLE GGUX;Lo;0;L;;;;;N;;;;;
+A22C;YI SYLLABLE GGU;Lo;0;L;;;;;N;;;;;
+A22D;YI SYLLABLE GGUP;Lo;0;L;;;;;N;;;;;
+A22E;YI SYLLABLE GGURX;Lo;0;L;;;;;N;;;;;
+A22F;YI SYLLABLE GGUR;Lo;0;L;;;;;N;;;;;
+A230;YI SYLLABLE MGIEX;Lo;0;L;;;;;N;;;;;
+A231;YI SYLLABLE MGIE;Lo;0;L;;;;;N;;;;;
+A232;YI SYLLABLE MGAT;Lo;0;L;;;;;N;;;;;
+A233;YI SYLLABLE MGAX;Lo;0;L;;;;;N;;;;;
+A234;YI SYLLABLE MGA;Lo;0;L;;;;;N;;;;;
+A235;YI SYLLABLE MGAP;Lo;0;L;;;;;N;;;;;
+A236;YI SYLLABLE MGUOX;Lo;0;L;;;;;N;;;;;
+A237;YI SYLLABLE MGUO;Lo;0;L;;;;;N;;;;;
+A238;YI SYLLABLE MGUOP;Lo;0;L;;;;;N;;;;;
+A239;YI SYLLABLE MGOT;Lo;0;L;;;;;N;;;;;
+A23A;YI SYLLABLE MGOX;Lo;0;L;;;;;N;;;;;
+A23B;YI SYLLABLE MGO;Lo;0;L;;;;;N;;;;;
+A23C;YI SYLLABLE MGOP;Lo;0;L;;;;;N;;;;;
+A23D;YI SYLLABLE MGEX;Lo;0;L;;;;;N;;;;;
+A23E;YI SYLLABLE MGE;Lo;0;L;;;;;N;;;;;
+A23F;YI SYLLABLE MGEP;Lo;0;L;;;;;N;;;;;
+A240;YI SYLLABLE MGUT;Lo;0;L;;;;;N;;;;;
+A241;YI SYLLABLE MGUX;Lo;0;L;;;;;N;;;;;
+A242;YI SYLLABLE MGU;Lo;0;L;;;;;N;;;;;
+A243;YI SYLLABLE MGUP;Lo;0;L;;;;;N;;;;;
+A244;YI SYLLABLE MGURX;Lo;0;L;;;;;N;;;;;
+A245;YI SYLLABLE MGUR;Lo;0;L;;;;;N;;;;;
+A246;YI SYLLABLE HXIT;Lo;0;L;;;;;N;;;;;
+A247;YI SYLLABLE HXIX;Lo;0;L;;;;;N;;;;;
+A248;YI SYLLABLE HXI;Lo;0;L;;;;;N;;;;;
+A249;YI SYLLABLE HXIP;Lo;0;L;;;;;N;;;;;
+A24A;YI SYLLABLE HXIET;Lo;0;L;;;;;N;;;;;
+A24B;YI SYLLABLE HXIEX;Lo;0;L;;;;;N;;;;;
+A24C;YI SYLLABLE HXIE;Lo;0;L;;;;;N;;;;;
+A24D;YI SYLLABLE HXIEP;Lo;0;L;;;;;N;;;;;
+A24E;YI SYLLABLE HXAT;Lo;0;L;;;;;N;;;;;
+A24F;YI SYLLABLE HXAX;Lo;0;L;;;;;N;;;;;
+A250;YI SYLLABLE HXA;Lo;0;L;;;;;N;;;;;
+A251;YI SYLLABLE HXAP;Lo;0;L;;;;;N;;;;;
+A252;YI SYLLABLE HXUOT;Lo;0;L;;;;;N;;;;;
+A253;YI SYLLABLE HXUOX;Lo;0;L;;;;;N;;;;;
+A254;YI SYLLABLE HXUO;Lo;0;L;;;;;N;;;;;
+A255;YI SYLLABLE HXUOP;Lo;0;L;;;;;N;;;;;
+A256;YI SYLLABLE HXOT;Lo;0;L;;;;;N;;;;;
+A257;YI SYLLABLE HXOX;Lo;0;L;;;;;N;;;;;
+A258;YI SYLLABLE HXO;Lo;0;L;;;;;N;;;;;
+A259;YI SYLLABLE HXOP;Lo;0;L;;;;;N;;;;;
+A25A;YI SYLLABLE HXEX;Lo;0;L;;;;;N;;;;;
+A25B;YI SYLLABLE HXE;Lo;0;L;;;;;N;;;;;
+A25C;YI SYLLABLE HXEP;Lo;0;L;;;;;N;;;;;
+A25D;YI SYLLABLE NGIEX;Lo;0;L;;;;;N;;;;;
+A25E;YI SYLLABLE NGIE;Lo;0;L;;;;;N;;;;;
+A25F;YI SYLLABLE NGIEP;Lo;0;L;;;;;N;;;;;
+A260;YI SYLLABLE NGAT;Lo;0;L;;;;;N;;;;;
+A261;YI SYLLABLE NGAX;Lo;0;L;;;;;N;;;;;
+A262;YI SYLLABLE NGA;Lo;0;L;;;;;N;;;;;
+A263;YI SYLLABLE NGAP;Lo;0;L;;;;;N;;;;;
+A264;YI SYLLABLE NGUOT;Lo;0;L;;;;;N;;;;;
+A265;YI SYLLABLE NGUOX;Lo;0;L;;;;;N;;;;;
+A266;YI SYLLABLE NGUO;Lo;0;L;;;;;N;;;;;
+A267;YI SYLLABLE NGOT;Lo;0;L;;;;;N;;;;;
+A268;YI SYLLABLE NGOX;Lo;0;L;;;;;N;;;;;
+A269;YI SYLLABLE NGO;Lo;0;L;;;;;N;;;;;
+A26A;YI SYLLABLE NGOP;Lo;0;L;;;;;N;;;;;
+A26B;YI SYLLABLE NGEX;Lo;0;L;;;;;N;;;;;
+A26C;YI SYLLABLE NGE;Lo;0;L;;;;;N;;;;;
+A26D;YI SYLLABLE NGEP;Lo;0;L;;;;;N;;;;;
+A26E;YI SYLLABLE HIT;Lo;0;L;;;;;N;;;;;
+A26F;YI SYLLABLE HIEX;Lo;0;L;;;;;N;;;;;
+A270;YI SYLLABLE HIE;Lo;0;L;;;;;N;;;;;
+A271;YI SYLLABLE HAT;Lo;0;L;;;;;N;;;;;
+A272;YI SYLLABLE HAX;Lo;0;L;;;;;N;;;;;
+A273;YI SYLLABLE HA;Lo;0;L;;;;;N;;;;;
+A274;YI SYLLABLE HAP;Lo;0;L;;;;;N;;;;;
+A275;YI SYLLABLE HUOT;Lo;0;L;;;;;N;;;;;
+A276;YI SYLLABLE HUOX;Lo;0;L;;;;;N;;;;;
+A277;YI SYLLABLE HUO;Lo;0;L;;;;;N;;;;;
+A278;YI SYLLABLE HUOP;Lo;0;L;;;;;N;;;;;
+A279;YI SYLLABLE HOT;Lo;0;L;;;;;N;;;;;
+A27A;YI SYLLABLE HOX;Lo;0;L;;;;;N;;;;;
+A27B;YI SYLLABLE HO;Lo;0;L;;;;;N;;;;;
+A27C;YI SYLLABLE HOP;Lo;0;L;;;;;N;;;;;
+A27D;YI SYLLABLE HEX;Lo;0;L;;;;;N;;;;;
+A27E;YI SYLLABLE HE;Lo;0;L;;;;;N;;;;;
+A27F;YI SYLLABLE HEP;Lo;0;L;;;;;N;;;;;
+A280;YI SYLLABLE WAT;Lo;0;L;;;;;N;;;;;
+A281;YI SYLLABLE WAX;Lo;0;L;;;;;N;;;;;
+A282;YI SYLLABLE WA;Lo;0;L;;;;;N;;;;;
+A283;YI SYLLABLE WAP;Lo;0;L;;;;;N;;;;;
+A284;YI SYLLABLE WUOX;Lo;0;L;;;;;N;;;;;
+A285;YI SYLLABLE WUO;Lo;0;L;;;;;N;;;;;
+A286;YI SYLLABLE WUOP;Lo;0;L;;;;;N;;;;;
+A287;YI SYLLABLE WOX;Lo;0;L;;;;;N;;;;;
+A288;YI SYLLABLE WO;Lo;0;L;;;;;N;;;;;
+A289;YI SYLLABLE WOP;Lo;0;L;;;;;N;;;;;
+A28A;YI SYLLABLE WEX;Lo;0;L;;;;;N;;;;;
+A28B;YI SYLLABLE WE;Lo;0;L;;;;;N;;;;;
+A28C;YI SYLLABLE WEP;Lo;0;L;;;;;N;;;;;
+A28D;YI SYLLABLE ZIT;Lo;0;L;;;;;N;;;;;
+A28E;YI SYLLABLE ZIX;Lo;0;L;;;;;N;;;;;
+A28F;YI SYLLABLE ZI;Lo;0;L;;;;;N;;;;;
+A290;YI SYLLABLE ZIP;Lo;0;L;;;;;N;;;;;
+A291;YI SYLLABLE ZIEX;Lo;0;L;;;;;N;;;;;
+A292;YI SYLLABLE ZIE;Lo;0;L;;;;;N;;;;;
+A293;YI SYLLABLE ZIEP;Lo;0;L;;;;;N;;;;;
+A294;YI SYLLABLE ZAT;Lo;0;L;;;;;N;;;;;
+A295;YI SYLLABLE ZAX;Lo;0;L;;;;;N;;;;;
+A296;YI SYLLABLE ZA;Lo;0;L;;;;;N;;;;;
+A297;YI SYLLABLE ZAP;Lo;0;L;;;;;N;;;;;
+A298;YI SYLLABLE ZUOX;Lo;0;L;;;;;N;;;;;
+A299;YI SYLLABLE ZUO;Lo;0;L;;;;;N;;;;;
+A29A;YI SYLLABLE ZUOP;Lo;0;L;;;;;N;;;;;
+A29B;YI SYLLABLE ZOT;Lo;0;L;;;;;N;;;;;
+A29C;YI SYLLABLE ZOX;Lo;0;L;;;;;N;;;;;
+A29D;YI SYLLABLE ZO;Lo;0;L;;;;;N;;;;;
+A29E;YI SYLLABLE ZOP;Lo;0;L;;;;;N;;;;;
+A29F;YI SYLLABLE ZEX;Lo;0;L;;;;;N;;;;;
+A2A0;YI SYLLABLE ZE;Lo;0;L;;;;;N;;;;;
+A2A1;YI SYLLABLE ZEP;Lo;0;L;;;;;N;;;;;
+A2A2;YI SYLLABLE ZUT;Lo;0;L;;;;;N;;;;;
+A2A3;YI SYLLABLE ZUX;Lo;0;L;;;;;N;;;;;
+A2A4;YI SYLLABLE ZU;Lo;0;L;;;;;N;;;;;
+A2A5;YI SYLLABLE ZUP;Lo;0;L;;;;;N;;;;;
+A2A6;YI SYLLABLE ZURX;Lo;0;L;;;;;N;;;;;
+A2A7;YI SYLLABLE ZUR;Lo;0;L;;;;;N;;;;;
+A2A8;YI SYLLABLE ZYT;Lo;0;L;;;;;N;;;;;
+A2A9;YI SYLLABLE ZYX;Lo;0;L;;;;;N;;;;;
+A2AA;YI SYLLABLE ZY;Lo;0;L;;;;;N;;;;;
+A2AB;YI SYLLABLE ZYP;Lo;0;L;;;;;N;;;;;
+A2AC;YI SYLLABLE ZYRX;Lo;0;L;;;;;N;;;;;
+A2AD;YI SYLLABLE ZYR;Lo;0;L;;;;;N;;;;;
+A2AE;YI SYLLABLE CIT;Lo;0;L;;;;;N;;;;;
+A2AF;YI SYLLABLE CIX;Lo;0;L;;;;;N;;;;;
+A2B0;YI SYLLABLE CI;Lo;0;L;;;;;N;;;;;
+A2B1;YI SYLLABLE CIP;Lo;0;L;;;;;N;;;;;
+A2B2;YI SYLLABLE CIET;Lo;0;L;;;;;N;;;;;
+A2B3;YI SYLLABLE CIEX;Lo;0;L;;;;;N;;;;;
+A2B4;YI SYLLABLE CIE;Lo;0;L;;;;;N;;;;;
+A2B5;YI SYLLABLE CIEP;Lo;0;L;;;;;N;;;;;
+A2B6;YI SYLLABLE CAT;Lo;0;L;;;;;N;;;;;
+A2B7;YI SYLLABLE CAX;Lo;0;L;;;;;N;;;;;
+A2B8;YI SYLLABLE CA;Lo;0;L;;;;;N;;;;;
+A2B9;YI SYLLABLE CAP;Lo;0;L;;;;;N;;;;;
+A2BA;YI SYLLABLE CUOX;Lo;0;L;;;;;N;;;;;
+A2BB;YI SYLLABLE CUO;Lo;0;L;;;;;N;;;;;
+A2BC;YI SYLLABLE CUOP;Lo;0;L;;;;;N;;;;;
+A2BD;YI SYLLABLE COT;Lo;0;L;;;;;N;;;;;
+A2BE;YI SYLLABLE COX;Lo;0;L;;;;;N;;;;;
+A2BF;YI SYLLABLE CO;Lo;0;L;;;;;N;;;;;
+A2C0;YI SYLLABLE COP;Lo;0;L;;;;;N;;;;;
+A2C1;YI SYLLABLE CEX;Lo;0;L;;;;;N;;;;;
+A2C2;YI SYLLABLE CE;Lo;0;L;;;;;N;;;;;
+A2C3;YI SYLLABLE CEP;Lo;0;L;;;;;N;;;;;
+A2C4;YI SYLLABLE CUT;Lo;0;L;;;;;N;;;;;
+A2C5;YI SYLLABLE CUX;Lo;0;L;;;;;N;;;;;
+A2C6;YI SYLLABLE CU;Lo;0;L;;;;;N;;;;;
+A2C7;YI SYLLABLE CUP;Lo;0;L;;;;;N;;;;;
+A2C8;YI SYLLABLE CURX;Lo;0;L;;;;;N;;;;;
+A2C9;YI SYLLABLE CUR;Lo;0;L;;;;;N;;;;;
+A2CA;YI SYLLABLE CYT;Lo;0;L;;;;;N;;;;;
+A2CB;YI SYLLABLE CYX;Lo;0;L;;;;;N;;;;;
+A2CC;YI SYLLABLE CY;Lo;0;L;;;;;N;;;;;
+A2CD;YI SYLLABLE CYP;Lo;0;L;;;;;N;;;;;
+A2CE;YI SYLLABLE CYRX;Lo;0;L;;;;;N;;;;;
+A2CF;YI SYLLABLE CYR;Lo;0;L;;;;;N;;;;;
+A2D0;YI SYLLABLE ZZIT;Lo;0;L;;;;;N;;;;;
+A2D1;YI SYLLABLE ZZIX;Lo;0;L;;;;;N;;;;;
+A2D2;YI SYLLABLE ZZI;Lo;0;L;;;;;N;;;;;
+A2D3;YI SYLLABLE ZZIP;Lo;0;L;;;;;N;;;;;
+A2D4;YI SYLLABLE ZZIET;Lo;0;L;;;;;N;;;;;
+A2D5;YI SYLLABLE ZZIEX;Lo;0;L;;;;;N;;;;;
+A2D6;YI SYLLABLE ZZIE;Lo;0;L;;;;;N;;;;;
+A2D7;YI SYLLABLE ZZIEP;Lo;0;L;;;;;N;;;;;
+A2D8;YI SYLLABLE ZZAT;Lo;0;L;;;;;N;;;;;
+A2D9;YI SYLLABLE ZZAX;Lo;0;L;;;;;N;;;;;
+A2DA;YI SYLLABLE ZZA;Lo;0;L;;;;;N;;;;;
+A2DB;YI SYLLABLE ZZAP;Lo;0;L;;;;;N;;;;;
+A2DC;YI SYLLABLE ZZOX;Lo;0;L;;;;;N;;;;;
+A2DD;YI SYLLABLE ZZO;Lo;0;L;;;;;N;;;;;
+A2DE;YI SYLLABLE ZZOP;Lo;0;L;;;;;N;;;;;
+A2DF;YI SYLLABLE ZZEX;Lo;0;L;;;;;N;;;;;
+A2E0;YI SYLLABLE ZZE;Lo;0;L;;;;;N;;;;;
+A2E1;YI SYLLABLE ZZEP;Lo;0;L;;;;;N;;;;;
+A2E2;YI SYLLABLE ZZUX;Lo;0;L;;;;;N;;;;;
+A2E3;YI SYLLABLE ZZU;Lo;0;L;;;;;N;;;;;
+A2E4;YI SYLLABLE ZZUP;Lo;0;L;;;;;N;;;;;
+A2E5;YI SYLLABLE ZZURX;Lo;0;L;;;;;N;;;;;
+A2E6;YI SYLLABLE ZZUR;Lo;0;L;;;;;N;;;;;
+A2E7;YI SYLLABLE ZZYT;Lo;0;L;;;;;N;;;;;
+A2E8;YI SYLLABLE ZZYX;Lo;0;L;;;;;N;;;;;
+A2E9;YI SYLLABLE ZZY;Lo;0;L;;;;;N;;;;;
+A2EA;YI SYLLABLE ZZYP;Lo;0;L;;;;;N;;;;;
+A2EB;YI SYLLABLE ZZYRX;Lo;0;L;;;;;N;;;;;
+A2EC;YI SYLLABLE ZZYR;Lo;0;L;;;;;N;;;;;
+A2ED;YI SYLLABLE NZIT;Lo;0;L;;;;;N;;;;;
+A2EE;YI SYLLABLE NZIX;Lo;0;L;;;;;N;;;;;
+A2EF;YI SYLLABLE NZI;Lo;0;L;;;;;N;;;;;
+A2F0;YI SYLLABLE NZIP;Lo;0;L;;;;;N;;;;;
+A2F1;YI SYLLABLE NZIEX;Lo;0;L;;;;;N;;;;;
+A2F2;YI SYLLABLE NZIE;Lo;0;L;;;;;N;;;;;
+A2F3;YI SYLLABLE NZIEP;Lo;0;L;;;;;N;;;;;
+A2F4;YI SYLLABLE NZAT;Lo;0;L;;;;;N;;;;;
+A2F5;YI SYLLABLE NZAX;Lo;0;L;;;;;N;;;;;
+A2F6;YI SYLLABLE NZA;Lo;0;L;;;;;N;;;;;
+A2F7;YI SYLLABLE NZAP;Lo;0;L;;;;;N;;;;;
+A2F8;YI SYLLABLE NZUOX;Lo;0;L;;;;;N;;;;;
+A2F9;YI SYLLABLE NZUO;Lo;0;L;;;;;N;;;;;
+A2FA;YI SYLLABLE NZOX;Lo;0;L;;;;;N;;;;;
+A2FB;YI SYLLABLE NZOP;Lo;0;L;;;;;N;;;;;
+A2FC;YI SYLLABLE NZEX;Lo;0;L;;;;;N;;;;;
+A2FD;YI SYLLABLE NZE;Lo;0;L;;;;;N;;;;;
+A2FE;YI SYLLABLE NZUX;Lo;0;L;;;;;N;;;;;
+A2FF;YI SYLLABLE NZU;Lo;0;L;;;;;N;;;;;
+A300;YI SYLLABLE NZUP;Lo;0;L;;;;;N;;;;;
+A301;YI SYLLABLE NZURX;Lo;0;L;;;;;N;;;;;
+A302;YI SYLLABLE NZUR;Lo;0;L;;;;;N;;;;;
+A303;YI SYLLABLE NZYT;Lo;0;L;;;;;N;;;;;
+A304;YI SYLLABLE NZYX;Lo;0;L;;;;;N;;;;;
+A305;YI SYLLABLE NZY;Lo;0;L;;;;;N;;;;;
+A306;YI SYLLABLE NZYP;Lo;0;L;;;;;N;;;;;
+A307;YI SYLLABLE NZYRX;Lo;0;L;;;;;N;;;;;
+A308;YI SYLLABLE NZYR;Lo;0;L;;;;;N;;;;;
+A309;YI SYLLABLE SIT;Lo;0;L;;;;;N;;;;;
+A30A;YI SYLLABLE SIX;Lo;0;L;;;;;N;;;;;
+A30B;YI SYLLABLE SI;Lo;0;L;;;;;N;;;;;
+A30C;YI SYLLABLE SIP;Lo;0;L;;;;;N;;;;;
+A30D;YI SYLLABLE SIEX;Lo;0;L;;;;;N;;;;;
+A30E;YI SYLLABLE SIE;Lo;0;L;;;;;N;;;;;
+A30F;YI SYLLABLE SIEP;Lo;0;L;;;;;N;;;;;
+A310;YI SYLLABLE SAT;Lo;0;L;;;;;N;;;;;
+A311;YI SYLLABLE SAX;Lo;0;L;;;;;N;;;;;
+A312;YI SYLLABLE SA;Lo;0;L;;;;;N;;;;;
+A313;YI SYLLABLE SAP;Lo;0;L;;;;;N;;;;;
+A314;YI SYLLABLE SUOX;Lo;0;L;;;;;N;;;;;
+A315;YI SYLLABLE SUO;Lo;0;L;;;;;N;;;;;
+A316;YI SYLLABLE SUOP;Lo;0;L;;;;;N;;;;;
+A317;YI SYLLABLE SOT;Lo;0;L;;;;;N;;;;;
+A318;YI SYLLABLE SOX;Lo;0;L;;;;;N;;;;;
+A319;YI SYLLABLE SO;Lo;0;L;;;;;N;;;;;
+A31A;YI SYLLABLE SOP;Lo;0;L;;;;;N;;;;;
+A31B;YI SYLLABLE SEX;Lo;0;L;;;;;N;;;;;
+A31C;YI SYLLABLE SE;Lo;0;L;;;;;N;;;;;
+A31D;YI SYLLABLE SEP;Lo;0;L;;;;;N;;;;;
+A31E;YI SYLLABLE SUT;Lo;0;L;;;;;N;;;;;
+A31F;YI SYLLABLE SUX;Lo;0;L;;;;;N;;;;;
+A320;YI SYLLABLE SU;Lo;0;L;;;;;N;;;;;
+A321;YI SYLLABLE SUP;Lo;0;L;;;;;N;;;;;
+A322;YI SYLLABLE SURX;Lo;0;L;;;;;N;;;;;
+A323;YI SYLLABLE SUR;Lo;0;L;;;;;N;;;;;
+A324;YI SYLLABLE SYT;Lo;0;L;;;;;N;;;;;
+A325;YI SYLLABLE SYX;Lo;0;L;;;;;N;;;;;
+A326;YI SYLLABLE SY;Lo;0;L;;;;;N;;;;;
+A327;YI SYLLABLE SYP;Lo;0;L;;;;;N;;;;;
+A328;YI SYLLABLE SYRX;Lo;0;L;;;;;N;;;;;
+A329;YI SYLLABLE SYR;Lo;0;L;;;;;N;;;;;
+A32A;YI SYLLABLE SSIT;Lo;0;L;;;;;N;;;;;
+A32B;YI SYLLABLE SSIX;Lo;0;L;;;;;N;;;;;
+A32C;YI SYLLABLE SSI;Lo;0;L;;;;;N;;;;;
+A32D;YI SYLLABLE SSIP;Lo;0;L;;;;;N;;;;;
+A32E;YI SYLLABLE SSIEX;Lo;0;L;;;;;N;;;;;
+A32F;YI SYLLABLE SSIE;Lo;0;L;;;;;N;;;;;
+A330;YI SYLLABLE SSIEP;Lo;0;L;;;;;N;;;;;
+A331;YI SYLLABLE SSAT;Lo;0;L;;;;;N;;;;;
+A332;YI SYLLABLE SSAX;Lo;0;L;;;;;N;;;;;
+A333;YI SYLLABLE SSA;Lo;0;L;;;;;N;;;;;
+A334;YI SYLLABLE SSAP;Lo;0;L;;;;;N;;;;;
+A335;YI SYLLABLE SSOT;Lo;0;L;;;;;N;;;;;
+A336;YI SYLLABLE SSOX;Lo;0;L;;;;;N;;;;;
+A337;YI SYLLABLE SSO;Lo;0;L;;;;;N;;;;;
+A338;YI SYLLABLE SSOP;Lo;0;L;;;;;N;;;;;
+A339;YI SYLLABLE SSEX;Lo;0;L;;;;;N;;;;;
+A33A;YI SYLLABLE SSE;Lo;0;L;;;;;N;;;;;
+A33B;YI SYLLABLE SSEP;Lo;0;L;;;;;N;;;;;
+A33C;YI SYLLABLE SSUT;Lo;0;L;;;;;N;;;;;
+A33D;YI SYLLABLE SSUX;Lo;0;L;;;;;N;;;;;
+A33E;YI SYLLABLE SSU;Lo;0;L;;;;;N;;;;;
+A33F;YI SYLLABLE SSUP;Lo;0;L;;;;;N;;;;;
+A340;YI SYLLABLE SSYT;Lo;0;L;;;;;N;;;;;
+A341;YI SYLLABLE SSYX;Lo;0;L;;;;;N;;;;;
+A342;YI SYLLABLE SSY;Lo;0;L;;;;;N;;;;;
+A343;YI SYLLABLE SSYP;Lo;0;L;;;;;N;;;;;
+A344;YI SYLLABLE SSYRX;Lo;0;L;;;;;N;;;;;
+A345;YI SYLLABLE SSYR;Lo;0;L;;;;;N;;;;;
+A346;YI SYLLABLE ZHAT;Lo;0;L;;;;;N;;;;;
+A347;YI SYLLABLE ZHAX;Lo;0;L;;;;;N;;;;;
+A348;YI SYLLABLE ZHA;Lo;0;L;;;;;N;;;;;
+A349;YI SYLLABLE ZHAP;Lo;0;L;;;;;N;;;;;
+A34A;YI SYLLABLE ZHUOX;Lo;0;L;;;;;N;;;;;
+A34B;YI SYLLABLE ZHUO;Lo;0;L;;;;;N;;;;;
+A34C;YI SYLLABLE ZHUOP;Lo;0;L;;;;;N;;;;;
+A34D;YI SYLLABLE ZHOT;Lo;0;L;;;;;N;;;;;
+A34E;YI SYLLABLE ZHOX;Lo;0;L;;;;;N;;;;;
+A34F;YI SYLLABLE ZHO;Lo;0;L;;;;;N;;;;;
+A350;YI SYLLABLE ZHOP;Lo;0;L;;;;;N;;;;;
+A351;YI SYLLABLE ZHET;Lo;0;L;;;;;N;;;;;
+A352;YI SYLLABLE ZHEX;Lo;0;L;;;;;N;;;;;
+A353;YI SYLLABLE ZHE;Lo;0;L;;;;;N;;;;;
+A354;YI SYLLABLE ZHEP;Lo;0;L;;;;;N;;;;;
+A355;YI SYLLABLE ZHUT;Lo;0;L;;;;;N;;;;;
+A356;YI SYLLABLE ZHUX;Lo;0;L;;;;;N;;;;;
+A357;YI SYLLABLE ZHU;Lo;0;L;;;;;N;;;;;
+A358;YI SYLLABLE ZHUP;Lo;0;L;;;;;N;;;;;
+A359;YI SYLLABLE ZHURX;Lo;0;L;;;;;N;;;;;
+A35A;YI SYLLABLE ZHUR;Lo;0;L;;;;;N;;;;;
+A35B;YI SYLLABLE ZHYT;Lo;0;L;;;;;N;;;;;
+A35C;YI SYLLABLE ZHYX;Lo;0;L;;;;;N;;;;;
+A35D;YI SYLLABLE ZHY;Lo;0;L;;;;;N;;;;;
+A35E;YI SYLLABLE ZHYP;Lo;0;L;;;;;N;;;;;
+A35F;YI SYLLABLE ZHYRX;Lo;0;L;;;;;N;;;;;
+A360;YI SYLLABLE ZHYR;Lo;0;L;;;;;N;;;;;
+A361;YI SYLLABLE CHAT;Lo;0;L;;;;;N;;;;;
+A362;YI SYLLABLE CHAX;Lo;0;L;;;;;N;;;;;
+A363;YI SYLLABLE CHA;Lo;0;L;;;;;N;;;;;
+A364;YI SYLLABLE CHAP;Lo;0;L;;;;;N;;;;;
+A365;YI SYLLABLE CHUOT;Lo;0;L;;;;;N;;;;;
+A366;YI SYLLABLE CHUOX;Lo;0;L;;;;;N;;;;;
+A367;YI SYLLABLE CHUO;Lo;0;L;;;;;N;;;;;
+A368;YI SYLLABLE CHUOP;Lo;0;L;;;;;N;;;;;
+A369;YI SYLLABLE CHOT;Lo;0;L;;;;;N;;;;;
+A36A;YI SYLLABLE CHOX;Lo;0;L;;;;;N;;;;;
+A36B;YI SYLLABLE CHO;Lo;0;L;;;;;N;;;;;
+A36C;YI SYLLABLE CHOP;Lo;0;L;;;;;N;;;;;
+A36D;YI SYLLABLE CHET;Lo;0;L;;;;;N;;;;;
+A36E;YI SYLLABLE CHEX;Lo;0;L;;;;;N;;;;;
+A36F;YI SYLLABLE CHE;Lo;0;L;;;;;N;;;;;
+A370;YI SYLLABLE CHEP;Lo;0;L;;;;;N;;;;;
+A371;YI SYLLABLE CHUX;Lo;0;L;;;;;N;;;;;
+A372;YI SYLLABLE CHU;Lo;0;L;;;;;N;;;;;
+A373;YI SYLLABLE CHUP;Lo;0;L;;;;;N;;;;;
+A374;YI SYLLABLE CHURX;Lo;0;L;;;;;N;;;;;
+A375;YI SYLLABLE CHUR;Lo;0;L;;;;;N;;;;;
+A376;YI SYLLABLE CHYT;Lo;0;L;;;;;N;;;;;
+A377;YI SYLLABLE CHYX;Lo;0;L;;;;;N;;;;;
+A378;YI SYLLABLE CHY;Lo;0;L;;;;;N;;;;;
+A379;YI SYLLABLE CHYP;Lo;0;L;;;;;N;;;;;
+A37A;YI SYLLABLE CHYRX;Lo;0;L;;;;;N;;;;;
+A37B;YI SYLLABLE CHYR;Lo;0;L;;;;;N;;;;;
+A37C;YI SYLLABLE RRAX;Lo;0;L;;;;;N;;;;;
+A37D;YI SYLLABLE RRA;Lo;0;L;;;;;N;;;;;
+A37E;YI SYLLABLE RRUOX;Lo;0;L;;;;;N;;;;;
+A37F;YI SYLLABLE RRUO;Lo;0;L;;;;;N;;;;;
+A380;YI SYLLABLE RROT;Lo;0;L;;;;;N;;;;;
+A381;YI SYLLABLE RROX;Lo;0;L;;;;;N;;;;;
+A382;YI SYLLABLE RRO;Lo;0;L;;;;;N;;;;;
+A383;YI SYLLABLE RROP;Lo;0;L;;;;;N;;;;;
+A384;YI SYLLABLE RRET;Lo;0;L;;;;;N;;;;;
+A385;YI SYLLABLE RREX;Lo;0;L;;;;;N;;;;;
+A386;YI SYLLABLE RRE;Lo;0;L;;;;;N;;;;;
+A387;YI SYLLABLE RREP;Lo;0;L;;;;;N;;;;;
+A388;YI SYLLABLE RRUT;Lo;0;L;;;;;N;;;;;
+A389;YI SYLLABLE RRUX;Lo;0;L;;;;;N;;;;;
+A38A;YI SYLLABLE RRU;Lo;0;L;;;;;N;;;;;
+A38B;YI SYLLABLE RRUP;Lo;0;L;;;;;N;;;;;
+A38C;YI SYLLABLE RRURX;Lo;0;L;;;;;N;;;;;
+A38D;YI SYLLABLE RRUR;Lo;0;L;;;;;N;;;;;
+A38E;YI SYLLABLE RRYT;Lo;0;L;;;;;N;;;;;
+A38F;YI SYLLABLE RRYX;Lo;0;L;;;;;N;;;;;
+A390;YI SYLLABLE RRY;Lo;0;L;;;;;N;;;;;
+A391;YI SYLLABLE RRYP;Lo;0;L;;;;;N;;;;;
+A392;YI SYLLABLE RRYRX;Lo;0;L;;;;;N;;;;;
+A393;YI SYLLABLE RRYR;Lo;0;L;;;;;N;;;;;
+A394;YI SYLLABLE NRAT;Lo;0;L;;;;;N;;;;;
+A395;YI SYLLABLE NRAX;Lo;0;L;;;;;N;;;;;
+A396;YI SYLLABLE NRA;Lo;0;L;;;;;N;;;;;
+A397;YI SYLLABLE NRAP;Lo;0;L;;;;;N;;;;;
+A398;YI SYLLABLE NROX;Lo;0;L;;;;;N;;;;;
+A399;YI SYLLABLE NRO;Lo;0;L;;;;;N;;;;;
+A39A;YI SYLLABLE NROP;Lo;0;L;;;;;N;;;;;
+A39B;YI SYLLABLE NRET;Lo;0;L;;;;;N;;;;;
+A39C;YI SYLLABLE NREX;Lo;0;L;;;;;N;;;;;
+A39D;YI SYLLABLE NRE;Lo;0;L;;;;;N;;;;;
+A39E;YI SYLLABLE NREP;Lo;0;L;;;;;N;;;;;
+A39F;YI SYLLABLE NRUT;Lo;0;L;;;;;N;;;;;
+A3A0;YI SYLLABLE NRUX;Lo;0;L;;;;;N;;;;;
+A3A1;YI SYLLABLE NRU;Lo;0;L;;;;;N;;;;;
+A3A2;YI SYLLABLE NRUP;Lo;0;L;;;;;N;;;;;
+A3A3;YI SYLLABLE NRURX;Lo;0;L;;;;;N;;;;;
+A3A4;YI SYLLABLE NRUR;Lo;0;L;;;;;N;;;;;
+A3A5;YI SYLLABLE NRYT;Lo;0;L;;;;;N;;;;;
+A3A6;YI SYLLABLE NRYX;Lo;0;L;;;;;N;;;;;
+A3A7;YI SYLLABLE NRY;Lo;0;L;;;;;N;;;;;
+A3A8;YI SYLLABLE NRYP;Lo;0;L;;;;;N;;;;;
+A3A9;YI SYLLABLE NRYRX;Lo;0;L;;;;;N;;;;;
+A3AA;YI SYLLABLE NRYR;Lo;0;L;;;;;N;;;;;
+A3AB;YI SYLLABLE SHAT;Lo;0;L;;;;;N;;;;;
+A3AC;YI SYLLABLE SHAX;Lo;0;L;;;;;N;;;;;
+A3AD;YI SYLLABLE SHA;Lo;0;L;;;;;N;;;;;
+A3AE;YI SYLLABLE SHAP;Lo;0;L;;;;;N;;;;;
+A3AF;YI SYLLABLE SHUOX;Lo;0;L;;;;;N;;;;;
+A3B0;YI SYLLABLE SHUO;Lo;0;L;;;;;N;;;;;
+A3B1;YI SYLLABLE SHUOP;Lo;0;L;;;;;N;;;;;
+A3B2;YI SYLLABLE SHOT;Lo;0;L;;;;;N;;;;;
+A3B3;YI SYLLABLE SHOX;Lo;0;L;;;;;N;;;;;
+A3B4;YI SYLLABLE SHO;Lo;0;L;;;;;N;;;;;
+A3B5;YI SYLLABLE SHOP;Lo;0;L;;;;;N;;;;;
+A3B6;YI SYLLABLE SHET;Lo;0;L;;;;;N;;;;;
+A3B7;YI SYLLABLE SHEX;Lo;0;L;;;;;N;;;;;
+A3B8;YI SYLLABLE SHE;Lo;0;L;;;;;N;;;;;
+A3B9;YI SYLLABLE SHEP;Lo;0;L;;;;;N;;;;;
+A3BA;YI SYLLABLE SHUT;Lo;0;L;;;;;N;;;;;
+A3BB;YI SYLLABLE SHUX;Lo;0;L;;;;;N;;;;;
+A3BC;YI SYLLABLE SHU;Lo;0;L;;;;;N;;;;;
+A3BD;YI SYLLABLE SHUP;Lo;0;L;;;;;N;;;;;
+A3BE;YI SYLLABLE SHURX;Lo;0;L;;;;;N;;;;;
+A3BF;YI SYLLABLE SHUR;Lo;0;L;;;;;N;;;;;
+A3C0;YI SYLLABLE SHYT;Lo;0;L;;;;;N;;;;;
+A3C1;YI SYLLABLE SHYX;Lo;0;L;;;;;N;;;;;
+A3C2;YI SYLLABLE SHY;Lo;0;L;;;;;N;;;;;
+A3C3;YI SYLLABLE SHYP;Lo;0;L;;;;;N;;;;;
+A3C4;YI SYLLABLE SHYRX;Lo;0;L;;;;;N;;;;;
+A3C5;YI SYLLABLE SHYR;Lo;0;L;;;;;N;;;;;
+A3C6;YI SYLLABLE RAT;Lo;0;L;;;;;N;;;;;
+A3C7;YI SYLLABLE RAX;Lo;0;L;;;;;N;;;;;
+A3C8;YI SYLLABLE RA;Lo;0;L;;;;;N;;;;;
+A3C9;YI SYLLABLE RAP;Lo;0;L;;;;;N;;;;;
+A3CA;YI SYLLABLE RUOX;Lo;0;L;;;;;N;;;;;
+A3CB;YI SYLLABLE RUO;Lo;0;L;;;;;N;;;;;
+A3CC;YI SYLLABLE RUOP;Lo;0;L;;;;;N;;;;;
+A3CD;YI SYLLABLE ROT;Lo;0;L;;;;;N;;;;;
+A3CE;YI SYLLABLE ROX;Lo;0;L;;;;;N;;;;;
+A3CF;YI SYLLABLE RO;Lo;0;L;;;;;N;;;;;
+A3D0;YI SYLLABLE ROP;Lo;0;L;;;;;N;;;;;
+A3D1;YI SYLLABLE REX;Lo;0;L;;;;;N;;;;;
+A3D2;YI SYLLABLE RE;Lo;0;L;;;;;N;;;;;
+A3D3;YI SYLLABLE REP;Lo;0;L;;;;;N;;;;;
+A3D4;YI SYLLABLE RUT;Lo;0;L;;;;;N;;;;;
+A3D5;YI SYLLABLE RUX;Lo;0;L;;;;;N;;;;;
+A3D6;YI SYLLABLE RU;Lo;0;L;;;;;N;;;;;
+A3D7;YI SYLLABLE RUP;Lo;0;L;;;;;N;;;;;
+A3D8;YI SYLLABLE RURX;Lo;0;L;;;;;N;;;;;
+A3D9;YI SYLLABLE RUR;Lo;0;L;;;;;N;;;;;
+A3DA;YI SYLLABLE RYT;Lo;0;L;;;;;N;;;;;
+A3DB;YI SYLLABLE RYX;Lo;0;L;;;;;N;;;;;
+A3DC;YI SYLLABLE RY;Lo;0;L;;;;;N;;;;;
+A3DD;YI SYLLABLE RYP;Lo;0;L;;;;;N;;;;;
+A3DE;YI SYLLABLE RYRX;Lo;0;L;;;;;N;;;;;
+A3DF;YI SYLLABLE RYR;Lo;0;L;;;;;N;;;;;
+A3E0;YI SYLLABLE JIT;Lo;0;L;;;;;N;;;;;
+A3E1;YI SYLLABLE JIX;Lo;0;L;;;;;N;;;;;
+A3E2;YI SYLLABLE JI;Lo;0;L;;;;;N;;;;;
+A3E3;YI SYLLABLE JIP;Lo;0;L;;;;;N;;;;;
+A3E4;YI SYLLABLE JIET;Lo;0;L;;;;;N;;;;;
+A3E5;YI SYLLABLE JIEX;Lo;0;L;;;;;N;;;;;
+A3E6;YI SYLLABLE JIE;Lo;0;L;;;;;N;;;;;
+A3E7;YI SYLLABLE JIEP;Lo;0;L;;;;;N;;;;;
+A3E8;YI SYLLABLE JUOT;Lo;0;L;;;;;N;;;;;
+A3E9;YI SYLLABLE JUOX;Lo;0;L;;;;;N;;;;;
+A3EA;YI SYLLABLE JUO;Lo;0;L;;;;;N;;;;;
+A3EB;YI SYLLABLE JUOP;Lo;0;L;;;;;N;;;;;
+A3EC;YI SYLLABLE JOT;Lo;0;L;;;;;N;;;;;
+A3ED;YI SYLLABLE JOX;Lo;0;L;;;;;N;;;;;
+A3EE;YI SYLLABLE JO;Lo;0;L;;;;;N;;;;;
+A3EF;YI SYLLABLE JOP;Lo;0;L;;;;;N;;;;;
+A3F0;YI SYLLABLE JUT;Lo;0;L;;;;;N;;;;;
+A3F1;YI SYLLABLE JUX;Lo;0;L;;;;;N;;;;;
+A3F2;YI SYLLABLE JU;Lo;0;L;;;;;N;;;;;
+A3F3;YI SYLLABLE JUP;Lo;0;L;;;;;N;;;;;
+A3F4;YI SYLLABLE JURX;Lo;0;L;;;;;N;;;;;
+A3F5;YI SYLLABLE JUR;Lo;0;L;;;;;N;;;;;
+A3F6;YI SYLLABLE JYT;Lo;0;L;;;;;N;;;;;
+A3F7;YI SYLLABLE JYX;Lo;0;L;;;;;N;;;;;
+A3F8;YI SYLLABLE JY;Lo;0;L;;;;;N;;;;;
+A3F9;YI SYLLABLE JYP;Lo;0;L;;;;;N;;;;;
+A3FA;YI SYLLABLE JYRX;Lo;0;L;;;;;N;;;;;
+A3FB;YI SYLLABLE JYR;Lo;0;L;;;;;N;;;;;
+A3FC;YI SYLLABLE QIT;Lo;0;L;;;;;N;;;;;
+A3FD;YI SYLLABLE QIX;Lo;0;L;;;;;N;;;;;
+A3FE;YI SYLLABLE QI;Lo;0;L;;;;;N;;;;;
+A3FF;YI SYLLABLE QIP;Lo;0;L;;;;;N;;;;;
+A400;YI SYLLABLE QIET;Lo;0;L;;;;;N;;;;;
+A401;YI SYLLABLE QIEX;Lo;0;L;;;;;N;;;;;
+A402;YI SYLLABLE QIE;Lo;0;L;;;;;N;;;;;
+A403;YI SYLLABLE QIEP;Lo;0;L;;;;;N;;;;;
+A404;YI SYLLABLE QUOT;Lo;0;L;;;;;N;;;;;
+A405;YI SYLLABLE QUOX;Lo;0;L;;;;;N;;;;;
+A406;YI SYLLABLE QUO;Lo;0;L;;;;;N;;;;;
+A407;YI SYLLABLE QUOP;Lo;0;L;;;;;N;;;;;
+A408;YI SYLLABLE QOT;Lo;0;L;;;;;N;;;;;
+A409;YI SYLLABLE QOX;Lo;0;L;;;;;N;;;;;
+A40A;YI SYLLABLE QO;Lo;0;L;;;;;N;;;;;
+A40B;YI SYLLABLE QOP;Lo;0;L;;;;;N;;;;;
+A40C;YI SYLLABLE QUT;Lo;0;L;;;;;N;;;;;
+A40D;YI SYLLABLE QUX;Lo;0;L;;;;;N;;;;;
+A40E;YI SYLLABLE QU;Lo;0;L;;;;;N;;;;;
+A40F;YI SYLLABLE QUP;Lo;0;L;;;;;N;;;;;
+A410;YI SYLLABLE QURX;Lo;0;L;;;;;N;;;;;
+A411;YI SYLLABLE QUR;Lo;0;L;;;;;N;;;;;
+A412;YI SYLLABLE QYT;Lo;0;L;;;;;N;;;;;
+A413;YI SYLLABLE QYX;Lo;0;L;;;;;N;;;;;
+A414;YI SYLLABLE QY;Lo;0;L;;;;;N;;;;;
+A415;YI SYLLABLE QYP;Lo;0;L;;;;;N;;;;;
+A416;YI SYLLABLE QYRX;Lo;0;L;;;;;N;;;;;
+A417;YI SYLLABLE QYR;Lo;0;L;;;;;N;;;;;
+A418;YI SYLLABLE JJIT;Lo;0;L;;;;;N;;;;;
+A419;YI SYLLABLE JJIX;Lo;0;L;;;;;N;;;;;
+A41A;YI SYLLABLE JJI;Lo;0;L;;;;;N;;;;;
+A41B;YI SYLLABLE JJIP;Lo;0;L;;;;;N;;;;;
+A41C;YI SYLLABLE JJIET;Lo;0;L;;;;;N;;;;;
+A41D;YI SYLLABLE JJIEX;Lo;0;L;;;;;N;;;;;
+A41E;YI SYLLABLE JJIE;Lo;0;L;;;;;N;;;;;
+A41F;YI SYLLABLE JJIEP;Lo;0;L;;;;;N;;;;;
+A420;YI SYLLABLE JJUOX;Lo;0;L;;;;;N;;;;;
+A421;YI SYLLABLE JJUO;Lo;0;L;;;;;N;;;;;
+A422;YI SYLLABLE JJUOP;Lo;0;L;;;;;N;;;;;
+A423;YI SYLLABLE JJOT;Lo;0;L;;;;;N;;;;;
+A424;YI SYLLABLE JJOX;Lo;0;L;;;;;N;;;;;
+A425;YI SYLLABLE JJO;Lo;0;L;;;;;N;;;;;
+A426;YI SYLLABLE JJOP;Lo;0;L;;;;;N;;;;;
+A427;YI SYLLABLE JJUT;Lo;0;L;;;;;N;;;;;
+A428;YI SYLLABLE JJUX;Lo;0;L;;;;;N;;;;;
+A429;YI SYLLABLE JJU;Lo;0;L;;;;;N;;;;;
+A42A;YI SYLLABLE JJUP;Lo;0;L;;;;;N;;;;;
+A42B;YI SYLLABLE JJURX;Lo;0;L;;;;;N;;;;;
+A42C;YI SYLLABLE JJUR;Lo;0;L;;;;;N;;;;;
+A42D;YI SYLLABLE JJYT;Lo;0;L;;;;;N;;;;;
+A42E;YI SYLLABLE JJYX;Lo;0;L;;;;;N;;;;;
+A42F;YI SYLLABLE JJY;Lo;0;L;;;;;N;;;;;
+A430;YI SYLLABLE JJYP;Lo;0;L;;;;;N;;;;;
+A431;YI SYLLABLE NJIT;Lo;0;L;;;;;N;;;;;
+A432;YI SYLLABLE NJIX;Lo;0;L;;;;;N;;;;;
+A433;YI SYLLABLE NJI;Lo;0;L;;;;;N;;;;;
+A434;YI SYLLABLE NJIP;Lo;0;L;;;;;N;;;;;
+A435;YI SYLLABLE NJIET;Lo;0;L;;;;;N;;;;;
+A436;YI SYLLABLE NJIEX;Lo;0;L;;;;;N;;;;;
+A437;YI SYLLABLE NJIE;Lo;0;L;;;;;N;;;;;
+A438;YI SYLLABLE NJIEP;Lo;0;L;;;;;N;;;;;
+A439;YI SYLLABLE NJUOX;Lo;0;L;;;;;N;;;;;
+A43A;YI SYLLABLE NJUO;Lo;0;L;;;;;N;;;;;
+A43B;YI SYLLABLE NJOT;Lo;0;L;;;;;N;;;;;
+A43C;YI SYLLABLE NJOX;Lo;0;L;;;;;N;;;;;
+A43D;YI SYLLABLE NJO;Lo;0;L;;;;;N;;;;;
+A43E;YI SYLLABLE NJOP;Lo;0;L;;;;;N;;;;;
+A43F;YI SYLLABLE NJUX;Lo;0;L;;;;;N;;;;;
+A440;YI SYLLABLE NJU;Lo;0;L;;;;;N;;;;;
+A441;YI SYLLABLE NJUP;Lo;0;L;;;;;N;;;;;
+A442;YI SYLLABLE NJURX;Lo;0;L;;;;;N;;;;;
+A443;YI SYLLABLE NJUR;Lo;0;L;;;;;N;;;;;
+A444;YI SYLLABLE NJYT;Lo;0;L;;;;;N;;;;;
+A445;YI SYLLABLE NJYX;Lo;0;L;;;;;N;;;;;
+A446;YI SYLLABLE NJY;Lo;0;L;;;;;N;;;;;
+A447;YI SYLLABLE NJYP;Lo;0;L;;;;;N;;;;;
+A448;YI SYLLABLE NJYRX;Lo;0;L;;;;;N;;;;;
+A449;YI SYLLABLE NJYR;Lo;0;L;;;;;N;;;;;
+A44A;YI SYLLABLE NYIT;Lo;0;L;;;;;N;;;;;
+A44B;YI SYLLABLE NYIX;Lo;0;L;;;;;N;;;;;
+A44C;YI SYLLABLE NYI;Lo;0;L;;;;;N;;;;;
+A44D;YI SYLLABLE NYIP;Lo;0;L;;;;;N;;;;;
+A44E;YI SYLLABLE NYIET;Lo;0;L;;;;;N;;;;;
+A44F;YI SYLLABLE NYIEX;Lo;0;L;;;;;N;;;;;
+A450;YI SYLLABLE NYIE;Lo;0;L;;;;;N;;;;;
+A451;YI SYLLABLE NYIEP;Lo;0;L;;;;;N;;;;;
+A452;YI SYLLABLE NYUOX;Lo;0;L;;;;;N;;;;;
+A453;YI SYLLABLE NYUO;Lo;0;L;;;;;N;;;;;
+A454;YI SYLLABLE NYUOP;Lo;0;L;;;;;N;;;;;
+A455;YI SYLLABLE NYOT;Lo;0;L;;;;;N;;;;;
+A456;YI SYLLABLE NYOX;Lo;0;L;;;;;N;;;;;
+A457;YI SYLLABLE NYO;Lo;0;L;;;;;N;;;;;
+A458;YI SYLLABLE NYOP;Lo;0;L;;;;;N;;;;;
+A459;YI SYLLABLE NYUT;Lo;0;L;;;;;N;;;;;
+A45A;YI SYLLABLE NYUX;Lo;0;L;;;;;N;;;;;
+A45B;YI SYLLABLE NYU;Lo;0;L;;;;;N;;;;;
+A45C;YI SYLLABLE NYUP;Lo;0;L;;;;;N;;;;;
+A45D;YI SYLLABLE XIT;Lo;0;L;;;;;N;;;;;
+A45E;YI SYLLABLE XIX;Lo;0;L;;;;;N;;;;;
+A45F;YI SYLLABLE XI;Lo;0;L;;;;;N;;;;;
+A460;YI SYLLABLE XIP;Lo;0;L;;;;;N;;;;;
+A461;YI SYLLABLE XIET;Lo;0;L;;;;;N;;;;;
+A462;YI SYLLABLE XIEX;Lo;0;L;;;;;N;;;;;
+A463;YI SYLLABLE XIE;Lo;0;L;;;;;N;;;;;
+A464;YI SYLLABLE XIEP;Lo;0;L;;;;;N;;;;;
+A465;YI SYLLABLE XUOX;Lo;0;L;;;;;N;;;;;
+A466;YI SYLLABLE XUO;Lo;0;L;;;;;N;;;;;
+A467;YI SYLLABLE XOT;Lo;0;L;;;;;N;;;;;
+A468;YI SYLLABLE XOX;Lo;0;L;;;;;N;;;;;
+A469;YI SYLLABLE XO;Lo;0;L;;;;;N;;;;;
+A46A;YI SYLLABLE XOP;Lo;0;L;;;;;N;;;;;
+A46B;YI SYLLABLE XYT;Lo;0;L;;;;;N;;;;;
+A46C;YI SYLLABLE XYX;Lo;0;L;;;;;N;;;;;
+A46D;YI SYLLABLE XY;Lo;0;L;;;;;N;;;;;
+A46E;YI SYLLABLE XYP;Lo;0;L;;;;;N;;;;;
+A46F;YI SYLLABLE XYRX;Lo;0;L;;;;;N;;;;;
+A470;YI SYLLABLE XYR;Lo;0;L;;;;;N;;;;;
+A471;YI SYLLABLE YIT;Lo;0;L;;;;;N;;;;;
+A472;YI SYLLABLE YIX;Lo;0;L;;;;;N;;;;;
+A473;YI SYLLABLE YI;Lo;0;L;;;;;N;;;;;
+A474;YI SYLLABLE YIP;Lo;0;L;;;;;N;;;;;
+A475;YI SYLLABLE YIET;Lo;0;L;;;;;N;;;;;
+A476;YI SYLLABLE YIEX;Lo;0;L;;;;;N;;;;;
+A477;YI SYLLABLE YIE;Lo;0;L;;;;;N;;;;;
+A478;YI SYLLABLE YIEP;Lo;0;L;;;;;N;;;;;
+A479;YI SYLLABLE YUOT;Lo;0;L;;;;;N;;;;;
+A47A;YI SYLLABLE YUOX;Lo;0;L;;;;;N;;;;;
+A47B;YI SYLLABLE YUO;Lo;0;L;;;;;N;;;;;
+A47C;YI SYLLABLE YUOP;Lo;0;L;;;;;N;;;;;
+A47D;YI SYLLABLE YOT;Lo;0;L;;;;;N;;;;;
+A47E;YI SYLLABLE YOX;Lo;0;L;;;;;N;;;;;
+A47F;YI SYLLABLE YO;Lo;0;L;;;;;N;;;;;
+A480;YI SYLLABLE YOP;Lo;0;L;;;;;N;;;;;
+A481;YI SYLLABLE YUT;Lo;0;L;;;;;N;;;;;
+A482;YI SYLLABLE YUX;Lo;0;L;;;;;N;;;;;
+A483;YI SYLLABLE YU;Lo;0;L;;;;;N;;;;;
+A484;YI SYLLABLE YUP;Lo;0;L;;;;;N;;;;;
+A485;YI SYLLABLE YURX;Lo;0;L;;;;;N;;;;;
+A486;YI SYLLABLE YUR;Lo;0;L;;;;;N;;;;;
+A487;YI SYLLABLE YYT;Lo;0;L;;;;;N;;;;;
+A488;YI SYLLABLE YYX;Lo;0;L;;;;;N;;;;;
+A489;YI SYLLABLE YY;Lo;0;L;;;;;N;;;;;
+A48A;YI SYLLABLE YYP;Lo;0;L;;;;;N;;;;;
+A48B;YI SYLLABLE YYRX;Lo;0;L;;;;;N;;;;;
+A48C;YI SYLLABLE YYR;Lo;0;L;;;;;N;;;;;
+A490;YI RADICAL QOT;So;0;ON;;;;;N;;;;;
+A491;YI RADICAL LI;So;0;ON;;;;;N;;;;;
+A492;YI RADICAL KIT;So;0;ON;;;;;N;;;;;
+A493;YI RADICAL NYIP;So;0;ON;;;;;N;;;;;
+A494;YI RADICAL CYP;So;0;ON;;;;;N;;;;;
+A495;YI RADICAL SSI;So;0;ON;;;;;N;;;;;
+A496;YI RADICAL GGOP;So;0;ON;;;;;N;;;;;
+A497;YI RADICAL GEP;So;0;ON;;;;;N;;;;;
+A498;YI RADICAL MI;So;0;ON;;;;;N;;;;;
+A499;YI RADICAL HXIT;So;0;ON;;;;;N;;;;;
+A49A;YI RADICAL LYR;So;0;ON;;;;;N;;;;;
+A49B;YI RADICAL BBUT;So;0;ON;;;;;N;;;;;
+A49C;YI RADICAL MOP;So;0;ON;;;;;N;;;;;
+A49D;YI RADICAL YO;So;0;ON;;;;;N;;;;;
+A49E;YI RADICAL PUT;So;0;ON;;;;;N;;;;;
+A49F;YI RADICAL HXUO;So;0;ON;;;;;N;;;;;
+A4A0;YI RADICAL TAT;So;0;ON;;;;;N;;;;;
+A4A1;YI RADICAL GA;So;0;ON;;;;;N;;;;;
+A4A2;YI RADICAL ZUP;So;0;ON;;;;;N;;;;;
+A4A3;YI RADICAL CYT;So;0;ON;;;;;N;;;;;
+A4A4;YI RADICAL DDUR;So;0;ON;;;;;N;;;;;
+A4A5;YI RADICAL BUR;So;0;ON;;;;;N;;;;;
+A4A6;YI RADICAL GGUO;So;0;ON;;;;;N;;;;;
+A4A7;YI RADICAL NYOP;So;0;ON;;;;;N;;;;;
+A4A8;YI RADICAL TU;So;0;ON;;;;;N;;;;;
+A4A9;YI RADICAL OP;So;0;ON;;;;;N;;;;;
+A4AA;YI RADICAL JJUT;So;0;ON;;;;;N;;;;;
+A4AB;YI RADICAL ZOT;So;0;ON;;;;;N;;;;;
+A4AC;YI RADICAL PYT;So;0;ON;;;;;N;;;;;
+A4AD;YI RADICAL HMO;So;0;ON;;;;;N;;;;;
+A4AE;YI RADICAL YIT;So;0;ON;;;;;N;;;;;
+A4AF;YI RADICAL VUR;So;0;ON;;;;;N;;;;;
+A4B0;YI RADICAL SHY;So;0;ON;;;;;N;;;;;
+A4B1;YI RADICAL VEP;So;0;ON;;;;;N;;;;;
+A4B2;YI RADICAL ZA;So;0;ON;;;;;N;;;;;
+A4B3;YI RADICAL JO;So;0;ON;;;;;N;;;;;
+A4B4;YI RADICAL NZUP;So;0;ON;;;;;N;;;;;
+A4B5;YI RADICAL JJY;So;0;ON;;;;;N;;;;;
+A4B6;YI RADICAL GOT;So;0;ON;;;;;N;;;;;
+A4B7;YI RADICAL JJIE;So;0;ON;;;;;N;;;;;
+A4B8;YI RADICAL WO;So;0;ON;;;;;N;;;;;
+A4B9;YI RADICAL DU;So;0;ON;;;;;N;;;;;
+A4BA;YI RADICAL SHUR;So;0;ON;;;;;N;;;;;
+A4BB;YI RADICAL LIE;So;0;ON;;;;;N;;;;;
+A4BC;YI RADICAL CY;So;0;ON;;;;;N;;;;;
+A4BD;YI RADICAL CUOP;So;0;ON;;;;;N;;;;;
+A4BE;YI RADICAL CIP;So;0;ON;;;;;N;;;;;
+A4BF;YI RADICAL HXOP;So;0;ON;;;;;N;;;;;
+A4C0;YI RADICAL SHAT;So;0;ON;;;;;N;;;;;
+A4C1;YI RADICAL ZUR;So;0;ON;;;;;N;;;;;
+A4C2;YI RADICAL SHOP;So;0;ON;;;;;N;;;;;
+A4C3;YI RADICAL CHE;So;0;ON;;;;;N;;;;;
+A4C4;YI RADICAL ZZIET;So;0;ON;;;;;N;;;;;
+A4C5;YI RADICAL NBIE;So;0;ON;;;;;N;;;;;
+A4C6;YI RADICAL KE;So;0;ON;;;;;N;;;;;
+A500;VAI SYLLABLE EE;Lo;0;L;;;;;N;;;;;
+A501;VAI SYLLABLE EEN;Lo;0;L;;;;;N;;;;;
+A502;VAI SYLLABLE HEE;Lo;0;L;;;;;N;;;;;
+A503;VAI SYLLABLE WEE;Lo;0;L;;;;;N;;;;;
+A504;VAI SYLLABLE WEEN;Lo;0;L;;;;;N;;;;;
+A505;VAI SYLLABLE PEE;Lo;0;L;;;;;N;;;;;
+A506;VAI SYLLABLE BHEE;Lo;0;L;;;;;N;;;;;
+A507;VAI SYLLABLE BEE;Lo;0;L;;;;;N;;;;;
+A508;VAI SYLLABLE MBEE;Lo;0;L;;;;;N;;;;;
+A509;VAI SYLLABLE KPEE;Lo;0;L;;;;;N;;;;;
+A50A;VAI SYLLABLE MGBEE;Lo;0;L;;;;;N;;;;;
+A50B;VAI SYLLABLE GBEE;Lo;0;L;;;;;N;;;;;
+A50C;VAI SYLLABLE FEE;Lo;0;L;;;;;N;;;;;
+A50D;VAI SYLLABLE VEE;Lo;0;L;;;;;N;;;;;
+A50E;VAI SYLLABLE TEE;Lo;0;L;;;;;N;;;;;
+A50F;VAI SYLLABLE THEE;Lo;0;L;;;;;N;;;;;
+A510;VAI SYLLABLE DHEE;Lo;0;L;;;;;N;;;;;
+A511;VAI SYLLABLE DHHEE;Lo;0;L;;;;;N;;;;;
+A512;VAI SYLLABLE LEE;Lo;0;L;;;;;N;;;;;
+A513;VAI SYLLABLE REE;Lo;0;L;;;;;N;;;;;
+A514;VAI SYLLABLE DEE;Lo;0;L;;;;;N;;;;;
+A515;VAI SYLLABLE NDEE;Lo;0;L;;;;;N;;;;;
+A516;VAI SYLLABLE SEE;Lo;0;L;;;;;N;;;;;
+A517;VAI SYLLABLE SHEE;Lo;0;L;;;;;N;;;;;
+A518;VAI SYLLABLE ZEE;Lo;0;L;;;;;N;;;;;
+A519;VAI SYLLABLE ZHEE;Lo;0;L;;;;;N;;;;;
+A51A;VAI SYLLABLE CEE;Lo;0;L;;;;;N;;;;;
+A51B;VAI SYLLABLE JEE;Lo;0;L;;;;;N;;;;;
+A51C;VAI SYLLABLE NJEE;Lo;0;L;;;;;N;;;;;
+A51D;VAI SYLLABLE YEE;Lo;0;L;;;;;N;;;;;
+A51E;VAI SYLLABLE KEE;Lo;0;L;;;;;N;;;;;
+A51F;VAI SYLLABLE NGGEE;Lo;0;L;;;;;N;;;;;
+A520;VAI SYLLABLE GEE;Lo;0;L;;;;;N;;;;;
+A521;VAI SYLLABLE MEE;Lo;0;L;;;;;N;;;;;
+A522;VAI SYLLABLE NEE;Lo;0;L;;;;;N;;;;;
+A523;VAI SYLLABLE NYEE;Lo;0;L;;;;;N;;;;;
+A524;VAI SYLLABLE I;Lo;0;L;;;;;N;;;;;
+A525;VAI SYLLABLE IN;Lo;0;L;;;;;N;;;;;
+A526;VAI SYLLABLE HI;Lo;0;L;;;;;N;;;;;
+A527;VAI SYLLABLE HIN;Lo;0;L;;;;;N;;;;;
+A528;VAI SYLLABLE WI;Lo;0;L;;;;;N;;;;;
+A529;VAI SYLLABLE WIN;Lo;0;L;;;;;N;;;;;
+A52A;VAI SYLLABLE PI;Lo;0;L;;;;;N;;;;;
+A52B;VAI SYLLABLE BHI;Lo;0;L;;;;;N;;;;;
+A52C;VAI SYLLABLE BI;Lo;0;L;;;;;N;;;;;
+A52D;VAI SYLLABLE MBI;Lo;0;L;;;;;N;;;;;
+A52E;VAI SYLLABLE KPI;Lo;0;L;;;;;N;;;;;
+A52F;VAI SYLLABLE MGBI;Lo;0;L;;;;;N;;;;;
+A530;VAI SYLLABLE GBI;Lo;0;L;;;;;N;;;;;
+A531;VAI SYLLABLE FI;Lo;0;L;;;;;N;;;;;
+A532;VAI SYLLABLE VI;Lo;0;L;;;;;N;;;;;
+A533;VAI SYLLABLE TI;Lo;0;L;;;;;N;;;;;
+A534;VAI SYLLABLE THI;Lo;0;L;;;;;N;;;;;
+A535;VAI SYLLABLE DHI;Lo;0;L;;;;;N;;;;;
+A536;VAI SYLLABLE DHHI;Lo;0;L;;;;;N;;;;;
+A537;VAI SYLLABLE LI;Lo;0;L;;;;;N;;;;;
+A538;VAI SYLLABLE RI;Lo;0;L;;;;;N;;;;;
+A539;VAI SYLLABLE DI;Lo;0;L;;;;;N;;;;;
+A53A;VAI SYLLABLE NDI;Lo;0;L;;;;;N;;;;;
+A53B;VAI SYLLABLE SI;Lo;0;L;;;;;N;;;;;
+A53C;VAI SYLLABLE SHI;Lo;0;L;;;;;N;;;;;
+A53D;VAI SYLLABLE ZI;Lo;0;L;;;;;N;;;;;
+A53E;VAI SYLLABLE ZHI;Lo;0;L;;;;;N;;;;;
+A53F;VAI SYLLABLE CI;Lo;0;L;;;;;N;;;;;
+A540;VAI SYLLABLE JI;Lo;0;L;;;;;N;;;;;
+A541;VAI SYLLABLE NJI;Lo;0;L;;;;;N;;;;;
+A542;VAI SYLLABLE YI;Lo;0;L;;;;;N;;;;;
+A543;VAI SYLLABLE KI;Lo;0;L;;;;;N;;;;;
+A544;VAI SYLLABLE NGGI;Lo;0;L;;;;;N;;;;;
+A545;VAI SYLLABLE GI;Lo;0;L;;;;;N;;;;;
+A546;VAI SYLLABLE MI;Lo;0;L;;;;;N;;;;;
+A547;VAI SYLLABLE NI;Lo;0;L;;;;;N;;;;;
+A548;VAI SYLLABLE NYI;Lo;0;L;;;;;N;;;;;
+A549;VAI SYLLABLE A;Lo;0;L;;;;;N;;;;;
+A54A;VAI SYLLABLE AN;Lo;0;L;;;;;N;;;;;
+A54B;VAI SYLLABLE NGAN;Lo;0;L;;;;;N;;;;;
+A54C;VAI SYLLABLE HA;Lo;0;L;;;;;N;;;;;
+A54D;VAI SYLLABLE HAN;Lo;0;L;;;;;N;;;;;
+A54E;VAI SYLLABLE WA;Lo;0;L;;;;;N;;;;;
+A54F;VAI SYLLABLE WAN;Lo;0;L;;;;;N;;;;;
+A550;VAI SYLLABLE PA;Lo;0;L;;;;;N;;;;;
+A551;VAI SYLLABLE BHA;Lo;0;L;;;;;N;;;;;
+A552;VAI SYLLABLE BA;Lo;0;L;;;;;N;;;;;
+A553;VAI SYLLABLE MBA;Lo;0;L;;;;;N;;;;;
+A554;VAI SYLLABLE KPA;Lo;0;L;;;;;N;;;;;
+A555;VAI SYLLABLE KPAN;Lo;0;L;;;;;N;;;;;
+A556;VAI SYLLABLE MGBA;Lo;0;L;;;;;N;;;;;
+A557;VAI SYLLABLE GBA;Lo;0;L;;;;;N;;;;;
+A558;VAI SYLLABLE FA;Lo;0;L;;;;;N;;;;;
+A559;VAI SYLLABLE VA;Lo;0;L;;;;;N;;;;;
+A55A;VAI SYLLABLE TA;Lo;0;L;;;;;N;;;;;
+A55B;VAI SYLLABLE THA;Lo;0;L;;;;;N;;;;;
+A55C;VAI SYLLABLE DHA;Lo;0;L;;;;;N;;;;;
+A55D;VAI SYLLABLE DHHA;Lo;0;L;;;;;N;;;;;
+A55E;VAI SYLLABLE LA;Lo;0;L;;;;;N;;;;;
+A55F;VAI SYLLABLE RA;Lo;0;L;;;;;N;;;;;
+A560;VAI SYLLABLE DA;Lo;0;L;;;;;N;;;;;
+A561;VAI SYLLABLE NDA;Lo;0;L;;;;;N;;;;;
+A562;VAI SYLLABLE SA;Lo;0;L;;;;;N;;;;;
+A563;VAI SYLLABLE SHA;Lo;0;L;;;;;N;;;;;
+A564;VAI SYLLABLE ZA;Lo;0;L;;;;;N;;;;;
+A565;VAI SYLLABLE ZHA;Lo;0;L;;;;;N;;;;;
+A566;VAI SYLLABLE CA;Lo;0;L;;;;;N;;;;;
+A567;VAI SYLLABLE JA;Lo;0;L;;;;;N;;;;;
+A568;VAI SYLLABLE NJA;Lo;0;L;;;;;N;;;;;
+A569;VAI SYLLABLE YA;Lo;0;L;;;;;N;;;;;
+A56A;VAI SYLLABLE KA;Lo;0;L;;;;;N;;;;;
+A56B;VAI SYLLABLE KAN;Lo;0;L;;;;;N;;;;;
+A56C;VAI SYLLABLE NGGA;Lo;0;L;;;;;N;;;;;
+A56D;VAI SYLLABLE GA;Lo;0;L;;;;;N;;;;;
+A56E;VAI SYLLABLE MA;Lo;0;L;;;;;N;;;;;
+A56F;VAI SYLLABLE NA;Lo;0;L;;;;;N;;;;;
+A570;VAI SYLLABLE NYA;Lo;0;L;;;;;N;;;;;
+A571;VAI SYLLABLE OO;Lo;0;L;;;;;N;;;;;
+A572;VAI SYLLABLE OON;Lo;0;L;;;;;N;;;;;
+A573;VAI SYLLABLE HOO;Lo;0;L;;;;;N;;;;;
+A574;VAI SYLLABLE WOO;Lo;0;L;;;;;N;;;;;
+A575;VAI SYLLABLE WOON;Lo;0;L;;;;;N;;;;;
+A576;VAI SYLLABLE POO;Lo;0;L;;;;;N;;;;;
+A577;VAI SYLLABLE BHOO;Lo;0;L;;;;;N;;;;;
+A578;VAI SYLLABLE BOO;Lo;0;L;;;;;N;;;;;
+A579;VAI SYLLABLE MBOO;Lo;0;L;;;;;N;;;;;
+A57A;VAI SYLLABLE KPOO;Lo;0;L;;;;;N;;;;;
+A57B;VAI SYLLABLE MGBOO;Lo;0;L;;;;;N;;;;;
+A57C;VAI SYLLABLE GBOO;Lo;0;L;;;;;N;;;;;
+A57D;VAI SYLLABLE FOO;Lo;0;L;;;;;N;;;;;
+A57E;VAI SYLLABLE VOO;Lo;0;L;;;;;N;;;;;
+A57F;VAI SYLLABLE TOO;Lo;0;L;;;;;N;;;;;
+A580;VAI SYLLABLE THOO;Lo;0;L;;;;;N;;;;;
+A581;VAI SYLLABLE DHOO;Lo;0;L;;;;;N;;;;;
+A582;VAI SYLLABLE DHHOO;Lo;0;L;;;;;N;;;;;
+A583;VAI SYLLABLE LOO;Lo;0;L;;;;;N;;;;;
+A584;VAI SYLLABLE ROO;Lo;0;L;;;;;N;;;;;
+A585;VAI SYLLABLE DOO;Lo;0;L;;;;;N;;;;;
+A586;VAI SYLLABLE NDOO;Lo;0;L;;;;;N;;;;;
+A587;VAI SYLLABLE SOO;Lo;0;L;;;;;N;;;;;
+A588;VAI SYLLABLE SHOO;Lo;0;L;;;;;N;;;;;
+A589;VAI SYLLABLE ZOO;Lo;0;L;;;;;N;;;;;
+A58A;VAI SYLLABLE ZHOO;Lo;0;L;;;;;N;;;;;
+A58B;VAI SYLLABLE COO;Lo;0;L;;;;;N;;;;;
+A58C;VAI SYLLABLE JOO;Lo;0;L;;;;;N;;;;;
+A58D;VAI SYLLABLE NJOO;Lo;0;L;;;;;N;;;;;
+A58E;VAI SYLLABLE YOO;Lo;0;L;;;;;N;;;;;
+A58F;VAI SYLLABLE KOO;Lo;0;L;;;;;N;;;;;
+A590;VAI SYLLABLE NGGOO;Lo;0;L;;;;;N;;;;;
+A591;VAI SYLLABLE GOO;Lo;0;L;;;;;N;;;;;
+A592;VAI SYLLABLE MOO;Lo;0;L;;;;;N;;;;;
+A593;VAI SYLLABLE NOO;Lo;0;L;;;;;N;;;;;
+A594;VAI SYLLABLE NYOO;Lo;0;L;;;;;N;;;;;
+A595;VAI SYLLABLE U;Lo;0;L;;;;;N;;;;;
+A596;VAI SYLLABLE UN;Lo;0;L;;;;;N;;;;;
+A597;VAI SYLLABLE HU;Lo;0;L;;;;;N;;;;;
+A598;VAI SYLLABLE HUN;Lo;0;L;;;;;N;;;;;
+A599;VAI SYLLABLE WU;Lo;0;L;;;;;N;;;;;
+A59A;VAI SYLLABLE WUN;Lo;0;L;;;;;N;;;;;
+A59B;VAI SYLLABLE PU;Lo;0;L;;;;;N;;;;;
+A59C;VAI SYLLABLE BHU;Lo;0;L;;;;;N;;;;;
+A59D;VAI SYLLABLE BU;Lo;0;L;;;;;N;;;;;
+A59E;VAI SYLLABLE MBU;Lo;0;L;;;;;N;;;;;
+A59F;VAI SYLLABLE KPU;Lo;0;L;;;;;N;;;;;
+A5A0;VAI SYLLABLE MGBU;Lo;0;L;;;;;N;;;;;
+A5A1;VAI SYLLABLE GBU;Lo;0;L;;;;;N;;;;;
+A5A2;VAI SYLLABLE FU;Lo;0;L;;;;;N;;;;;
+A5A3;VAI SYLLABLE VU;Lo;0;L;;;;;N;;;;;
+A5A4;VAI SYLLABLE TU;Lo;0;L;;;;;N;;;;;
+A5A5;VAI SYLLABLE THU;Lo;0;L;;;;;N;;;;;
+A5A6;VAI SYLLABLE DHU;Lo;0;L;;;;;N;;;;;
+A5A7;VAI SYLLABLE DHHU;Lo;0;L;;;;;N;;;;;
+A5A8;VAI SYLLABLE LU;Lo;0;L;;;;;N;;;;;
+A5A9;VAI SYLLABLE RU;Lo;0;L;;;;;N;;;;;
+A5AA;VAI SYLLABLE DU;Lo;0;L;;;;;N;;;;;
+A5AB;VAI SYLLABLE NDU;Lo;0;L;;;;;N;;;;;
+A5AC;VAI SYLLABLE SU;Lo;0;L;;;;;N;;;;;
+A5AD;VAI SYLLABLE SHU;Lo;0;L;;;;;N;;;;;
+A5AE;VAI SYLLABLE ZU;Lo;0;L;;;;;N;;;;;
+A5AF;VAI SYLLABLE ZHU;Lo;0;L;;;;;N;;;;;
+A5B0;VAI SYLLABLE CU;Lo;0;L;;;;;N;;;;;
+A5B1;VAI SYLLABLE JU;Lo;0;L;;;;;N;;;;;
+A5B2;VAI SYLLABLE NJU;Lo;0;L;;;;;N;;;;;
+A5B3;VAI SYLLABLE YU;Lo;0;L;;;;;N;;;;;
+A5B4;VAI SYLLABLE KU;Lo;0;L;;;;;N;;;;;
+A5B5;VAI SYLLABLE NGGU;Lo;0;L;;;;;N;;;;;
+A5B6;VAI SYLLABLE GU;Lo;0;L;;;;;N;;;;;
+A5B7;VAI SYLLABLE MU;Lo;0;L;;;;;N;;;;;
+A5B8;VAI SYLLABLE NU;Lo;0;L;;;;;N;;;;;
+A5B9;VAI SYLLABLE NYU;Lo;0;L;;;;;N;;;;;
+A5BA;VAI SYLLABLE O;Lo;0;L;;;;;N;;;;;
+A5BB;VAI SYLLABLE ON;Lo;0;L;;;;;N;;;;;
+A5BC;VAI SYLLABLE NGON;Lo;0;L;;;;;N;;;;;
+A5BD;VAI SYLLABLE HO;Lo;0;L;;;;;N;;;;;
+A5BE;VAI SYLLABLE HON;Lo;0;L;;;;;N;;;;;
+A5BF;VAI SYLLABLE WO;Lo;0;L;;;;;N;;;;;
+A5C0;VAI SYLLABLE WON;Lo;0;L;;;;;N;;;;;
+A5C1;VAI SYLLABLE PO;Lo;0;L;;;;;N;;;;;
+A5C2;VAI SYLLABLE BHO;Lo;0;L;;;;;N;;;;;
+A5C3;VAI SYLLABLE BO;Lo;0;L;;;;;N;;;;;
+A5C4;VAI SYLLABLE MBO;Lo;0;L;;;;;N;;;;;
+A5C5;VAI SYLLABLE KPO;Lo;0;L;;;;;N;;;;;
+A5C6;VAI SYLLABLE MGBO;Lo;0;L;;;;;N;;;;;
+A5C7;VAI SYLLABLE GBO;Lo;0;L;;;;;N;;;;;
+A5C8;VAI SYLLABLE GBON;Lo;0;L;;;;;N;;;;;
+A5C9;VAI SYLLABLE FO;Lo;0;L;;;;;N;;;;;
+A5CA;VAI SYLLABLE VO;Lo;0;L;;;;;N;;;;;
+A5CB;VAI SYLLABLE TO;Lo;0;L;;;;;N;;;;;
+A5CC;VAI SYLLABLE THO;Lo;0;L;;;;;N;;;;;
+A5CD;VAI SYLLABLE DHO;Lo;0;L;;;;;N;;;;;
+A5CE;VAI SYLLABLE DHHO;Lo;0;L;;;;;N;;;;;
+A5CF;VAI SYLLABLE LO;Lo;0;L;;;;;N;;;;;
+A5D0;VAI SYLLABLE RO;Lo;0;L;;;;;N;;;;;
+A5D1;VAI SYLLABLE DO;Lo;0;L;;;;;N;;;;;
+A5D2;VAI SYLLABLE NDO;Lo;0;L;;;;;N;;;;;
+A5D3;VAI SYLLABLE SO;Lo;0;L;;;;;N;;;;;
+A5D4;VAI SYLLABLE SHO;Lo;0;L;;;;;N;;;;;
+A5D5;VAI SYLLABLE ZO;Lo;0;L;;;;;N;;;;;
+A5D6;VAI SYLLABLE ZHO;Lo;0;L;;;;;N;;;;;
+A5D7;VAI SYLLABLE CO;Lo;0;L;;;;;N;;;;;
+A5D8;VAI SYLLABLE JO;Lo;0;L;;;;;N;;;;;
+A5D9;VAI SYLLABLE NJO;Lo;0;L;;;;;N;;;;;
+A5DA;VAI SYLLABLE YO;Lo;0;L;;;;;N;;;;;
+A5DB;VAI SYLLABLE KO;Lo;0;L;;;;;N;;;;;
+A5DC;VAI SYLLABLE NGGO;Lo;0;L;;;;;N;;;;;
+A5DD;VAI SYLLABLE GO;Lo;0;L;;;;;N;;;;;
+A5DE;VAI SYLLABLE MO;Lo;0;L;;;;;N;;;;;
+A5DF;VAI SYLLABLE NO;Lo;0;L;;;;;N;;;;;
+A5E0;VAI SYLLABLE NYO;Lo;0;L;;;;;N;;;;;
+A5E1;VAI SYLLABLE E;Lo;0;L;;;;;N;;;;;
+A5E2;VAI SYLLABLE EN;Lo;0;L;;;;;N;;;;;
+A5E3;VAI SYLLABLE NGEN;Lo;0;L;;;;;N;;;;;
+A5E4;VAI SYLLABLE HE;Lo;0;L;;;;;N;;;;;
+A5E5;VAI SYLLABLE HEN;Lo;0;L;;;;;N;;;;;
+A5E6;VAI SYLLABLE WE;Lo;0;L;;;;;N;;;;;
+A5E7;VAI SYLLABLE WEN;Lo;0;L;;;;;N;;;;;
+A5E8;VAI SYLLABLE PE;Lo;0;L;;;;;N;;;;;
+A5E9;VAI SYLLABLE BHE;Lo;0;L;;;;;N;;;;;
+A5EA;VAI SYLLABLE BE;Lo;0;L;;;;;N;;;;;
+A5EB;VAI SYLLABLE MBE;Lo;0;L;;;;;N;;;;;
+A5EC;VAI SYLLABLE KPE;Lo;0;L;;;;;N;;;;;
+A5ED;VAI SYLLABLE KPEN;Lo;0;L;;;;;N;;;;;
+A5EE;VAI SYLLABLE MGBE;Lo;0;L;;;;;N;;;;;
+A5EF;VAI SYLLABLE GBE;Lo;0;L;;;;;N;;;;;
+A5F0;VAI SYLLABLE GBEN;Lo;0;L;;;;;N;;;;;
+A5F1;VAI SYLLABLE FE;Lo;0;L;;;;;N;;;;;
+A5F2;VAI SYLLABLE VE;Lo;0;L;;;;;N;;;;;
+A5F3;VAI SYLLABLE TE;Lo;0;L;;;;;N;;;;;
+A5F4;VAI SYLLABLE THE;Lo;0;L;;;;;N;;;;;
+A5F5;VAI SYLLABLE DHE;Lo;0;L;;;;;N;;;;;
+A5F6;VAI SYLLABLE DHHE;Lo;0;L;;;;;N;;;;;
+A5F7;VAI SYLLABLE LE;Lo;0;L;;;;;N;;;;;
+A5F8;VAI SYLLABLE RE;Lo;0;L;;;;;N;;;;;
+A5F9;VAI SYLLABLE DE;Lo;0;L;;;;;N;;;;;
+A5FA;VAI SYLLABLE NDE;Lo;0;L;;;;;N;;;;;
+A5FB;VAI SYLLABLE SE;Lo;0;L;;;;;N;;;;;
+A5FC;VAI SYLLABLE SHE;Lo;0;L;;;;;N;;;;;
+A5FD;VAI SYLLABLE ZE;Lo;0;L;;;;;N;;;;;
+A5FE;VAI SYLLABLE ZHE;Lo;0;L;;;;;N;;;;;
+A5FF;VAI SYLLABLE CE;Lo;0;L;;;;;N;;;;;
+A600;VAI SYLLABLE JE;Lo;0;L;;;;;N;;;;;
+A601;VAI SYLLABLE NJE;Lo;0;L;;;;;N;;;;;
+A602;VAI SYLLABLE YE;Lo;0;L;;;;;N;;;;;
+A603;VAI SYLLABLE KE;Lo;0;L;;;;;N;;;;;
+A604;VAI SYLLABLE NGGE;Lo;0;L;;;;;N;;;;;
+A605;VAI SYLLABLE NGGEN;Lo;0;L;;;;;N;;;;;
+A606;VAI SYLLABLE GE;Lo;0;L;;;;;N;;;;;
+A607;VAI SYLLABLE GEN;Lo;0;L;;;;;N;;;;;
+A608;VAI SYLLABLE ME;Lo;0;L;;;;;N;;;;;
+A609;VAI SYLLABLE NE;Lo;0;L;;;;;N;;;;;
+A60A;VAI SYLLABLE NYE;Lo;0;L;;;;;N;;;;;
+A60B;VAI SYLLABLE NG;Lo;0;L;;;;;N;;;;;
+A60C;VAI SYLLABLE LENGTHENER;Lm;0;L;;;;;N;;;;;
+A60D;VAI COMMA;Po;0;ON;;;;;N;;;;;
+A60E;VAI FULL STOP;Po;0;ON;;;;;N;;;;;
+A60F;VAI QUESTION MARK;Po;0;ON;;;;;N;;;;;
+A610;VAI SYLLABLE NDOLE FA;Lo;0;L;;;;;N;;;;;
+A611;VAI SYLLABLE NDOLE KA;Lo;0;L;;;;;N;;;;;
+A612;VAI SYLLABLE NDOLE SOO;Lo;0;L;;;;;N;;;;;
+A613;VAI SYMBOL FEENG;Lo;0;L;;;;;N;;;;;
+A614;VAI SYMBOL KEENG;Lo;0;L;;;;;N;;;;;
+A615;VAI SYMBOL TING;Lo;0;L;;;;;N;;;;;
+A616;VAI SYMBOL NII;Lo;0;L;;;;;N;;;;;
+A617;VAI SYMBOL BANG;Lo;0;L;;;;;N;;;;;
+A618;VAI SYMBOL FAA;Lo;0;L;;;;;N;;;;;
+A619;VAI SYMBOL TAA;Lo;0;L;;;;;N;;;;;
+A61A;VAI SYMBOL DANG;Lo;0;L;;;;;N;;;;;
+A61B;VAI SYMBOL DOONG;Lo;0;L;;;;;N;;;;;
+A61C;VAI SYMBOL KUNG;Lo;0;L;;;;;N;;;;;
+A61D;VAI SYMBOL TONG;Lo;0;L;;;;;N;;;;;
+A61E;VAI SYMBOL DO-O;Lo;0;L;;;;;N;;;;;
+A61F;VAI SYMBOL JONG;Lo;0;L;;;;;N;;;;;
+A620;VAI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+A621;VAI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+A622;VAI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+A623;VAI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+A624;VAI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+A625;VAI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+A626;VAI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+A627;VAI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+A628;VAI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+A629;VAI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+A62A;VAI SYLLABLE NDOLE MA;Lo;0;L;;;;;N;;;;;
+A62B;VAI SYLLABLE NDOLE DO;Lo;0;L;;;;;N;;;;;
+A640;CYRILLIC CAPITAL LETTER ZEMLYA;Lu;0;L;;;;;N;;;;A641;
+A641;CYRILLIC SMALL LETTER ZEMLYA;Ll;0;L;;;;;N;;;A640;;A640
+A642;CYRILLIC CAPITAL LETTER DZELO;Lu;0;L;;;;;N;;;;A643;
+A643;CYRILLIC SMALL LETTER DZELO;Ll;0;L;;;;;N;;;A642;;A642
+A644;CYRILLIC CAPITAL LETTER REVERSED DZE;Lu;0;L;;;;;N;;;;A645;
+A645;CYRILLIC SMALL LETTER REVERSED DZE;Ll;0;L;;;;;N;;;A644;;A644
+A646;CYRILLIC CAPITAL LETTER IOTA;Lu;0;L;;;;;N;;;;A647;
+A647;CYRILLIC SMALL LETTER IOTA;Ll;0;L;;;;;N;;;A646;;A646
+A648;CYRILLIC CAPITAL LETTER DJERV;Lu;0;L;;;;;N;;;;A649;
+A649;CYRILLIC SMALL LETTER DJERV;Ll;0;L;;;;;N;;;A648;;A648
+A64A;CYRILLIC CAPITAL LETTER MONOGRAPH UK;Lu;0;L;;;;;N;;;;A64B;
+A64B;CYRILLIC SMALL LETTER MONOGRAPH UK;Ll;0;L;;;;;N;;;A64A;;A64A
+A64C;CYRILLIC CAPITAL LETTER BROAD OMEGA;Lu;0;L;;;;;N;;;;A64D;
+A64D;CYRILLIC SMALL LETTER BROAD OMEGA;Ll;0;L;;;;;N;;;A64C;;A64C
+A64E;CYRILLIC CAPITAL LETTER NEUTRAL YER;Lu;0;L;;;;;N;;;;A64F;
+A64F;CYRILLIC SMALL LETTER NEUTRAL YER;Ll;0;L;;;;;N;;;A64E;;A64E
+A650;CYRILLIC CAPITAL LETTER YERU WITH BACK YER;Lu;0;L;;;;;N;;;;A651;
+A651;CYRILLIC SMALL LETTER YERU WITH BACK YER;Ll;0;L;;;;;N;;;A650;;A650
+A652;CYRILLIC CAPITAL LETTER IOTIFIED YAT;Lu;0;L;;;;;N;;;;A653;
+A653;CYRILLIC SMALL LETTER IOTIFIED YAT;Ll;0;L;;;;;N;;;A652;;A652
+A654;CYRILLIC CAPITAL LETTER REVERSED YU;Lu;0;L;;;;;N;;;;A655;
+A655;CYRILLIC SMALL LETTER REVERSED YU;Ll;0;L;;;;;N;;;A654;;A654
+A656;CYRILLIC CAPITAL LETTER IOTIFIED A;Lu;0;L;;;;;N;;;;A657;
+A657;CYRILLIC SMALL LETTER IOTIFIED A;Ll;0;L;;;;;N;;;A656;;A656
+A658;CYRILLIC CAPITAL LETTER CLOSED LITTLE YUS;Lu;0;L;;;;;N;;;;A659;
+A659;CYRILLIC SMALL LETTER CLOSED LITTLE YUS;Ll;0;L;;;;;N;;;A658;;A658
+A65A;CYRILLIC CAPITAL LETTER BLENDED YUS;Lu;0;L;;;;;N;;;;A65B;
+A65B;CYRILLIC SMALL LETTER BLENDED YUS;Ll;0;L;;;;;N;;;A65A;;A65A
+A65C;CYRILLIC CAPITAL LETTER IOTIFIED CLOSED LITTLE YUS;Lu;0;L;;;;;N;;;;A65D;
+A65D;CYRILLIC SMALL LETTER IOTIFIED CLOSED LITTLE YUS;Ll;0;L;;;;;N;;;A65C;;A65C
+A65E;CYRILLIC CAPITAL LETTER YN;Lu;0;L;;;;;N;;;;A65F;
+A65F;CYRILLIC SMALL LETTER YN;Ll;0;L;;;;;N;;;A65E;;A65E
+A662;CYRILLIC CAPITAL LETTER SOFT DE;Lu;0;L;;;;;N;;;;A663;
+A663;CYRILLIC SMALL LETTER SOFT DE;Ll;0;L;;;;;N;;;A662;;A662
+A664;CYRILLIC CAPITAL LETTER SOFT EL;Lu;0;L;;;;;N;;;;A665;
+A665;CYRILLIC SMALL LETTER SOFT EL;Ll;0;L;;;;;N;;;A664;;A664
+A666;CYRILLIC CAPITAL LETTER SOFT EM;Lu;0;L;;;;;N;;;;A667;
+A667;CYRILLIC SMALL LETTER SOFT EM;Ll;0;L;;;;;N;;;A666;;A666
+A668;CYRILLIC CAPITAL LETTER MONOCULAR O;Lu;0;L;;;;;N;;;;A669;
+A669;CYRILLIC SMALL LETTER MONOCULAR O;Ll;0;L;;;;;N;;;A668;;A668
+A66A;CYRILLIC CAPITAL LETTER BINOCULAR O;Lu;0;L;;;;;N;;;;A66B;
+A66B;CYRILLIC SMALL LETTER BINOCULAR O;Ll;0;L;;;;;N;;;A66A;;A66A
+A66C;CYRILLIC CAPITAL LETTER DOUBLE MONOCULAR O;Lu;0;L;;;;;N;;;;A66D;
+A66D;CYRILLIC SMALL LETTER DOUBLE MONOCULAR O;Ll;0;L;;;;;N;;;A66C;;A66C
+A66E;CYRILLIC LETTER MULTIOCULAR O;Lo;0;L;;;;;N;;;;;
+A66F;COMBINING CYRILLIC VZMET;Mn;230;NSM;;;;;N;;;;;
+A670;COMBINING CYRILLIC TEN MILLIONS SIGN;Me;0;NSM;;;;;N;;;;;
+A671;COMBINING CYRILLIC HUNDRED MILLIONS SIGN;Me;0;NSM;;;;;N;;;;;
+A672;COMBINING CYRILLIC THOUSAND MILLIONS SIGN;Me;0;NSM;;;;;N;;;;;
+A673;SLAVONIC ASTERISK;Po;0;ON;;;;;N;;;;;
+A67C;COMBINING CYRILLIC KAVYKA;Mn;230;NSM;;;;;N;;;;;
+A67D;COMBINING CYRILLIC PAYEROK;Mn;230;NSM;;;;;N;;;;;
+A67E;CYRILLIC KAVYKA;Po;0;ON;;;;;N;;;;;
+A67F;CYRILLIC PAYEROK;Lm;0;ON;;;;;N;;;;;
+A680;CYRILLIC CAPITAL LETTER DWE;Lu;0;L;;;;;N;;;;A681;
+A681;CYRILLIC SMALL LETTER DWE;Ll;0;L;;;;;N;;;A680;;A680
+A682;CYRILLIC CAPITAL LETTER DZWE;Lu;0;L;;;;;N;;;;A683;
+A683;CYRILLIC SMALL LETTER DZWE;Ll;0;L;;;;;N;;;A682;;A682
+A684;CYRILLIC CAPITAL LETTER ZHWE;Lu;0;L;;;;;N;;;;A685;
+A685;CYRILLIC SMALL LETTER ZHWE;Ll;0;L;;;;;N;;;A684;;A684
+A686;CYRILLIC CAPITAL LETTER CCHE;Lu;0;L;;;;;N;;;;A687;
+A687;CYRILLIC SMALL LETTER CCHE;Ll;0;L;;;;;N;;;A686;;A686
+A688;CYRILLIC CAPITAL LETTER DZZE;Lu;0;L;;;;;N;;;;A689;
+A689;CYRILLIC SMALL LETTER DZZE;Ll;0;L;;;;;N;;;A688;;A688
+A68A;CYRILLIC CAPITAL LETTER TE WITH MIDDLE HOOK;Lu;0;L;;;;;N;;;;A68B;
+A68B;CYRILLIC SMALL LETTER TE WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;A68A;;A68A
+A68C;CYRILLIC CAPITAL LETTER TWE;Lu;0;L;;;;;N;;;;A68D;
+A68D;CYRILLIC SMALL LETTER TWE;Ll;0;L;;;;;N;;;A68C;;A68C
+A68E;CYRILLIC CAPITAL LETTER TSWE;Lu;0;L;;;;;N;;;;A68F;
+A68F;CYRILLIC SMALL LETTER TSWE;Ll;0;L;;;;;N;;;A68E;;A68E
+A690;CYRILLIC CAPITAL LETTER TSSE;Lu;0;L;;;;;N;;;;A691;
+A691;CYRILLIC SMALL LETTER TSSE;Ll;0;L;;;;;N;;;A690;;A690
+A692;CYRILLIC CAPITAL LETTER TCHE;Lu;0;L;;;;;N;;;;A693;
+A693;CYRILLIC SMALL LETTER TCHE;Ll;0;L;;;;;N;;;A692;;A692
+A694;CYRILLIC CAPITAL LETTER HWE;Lu;0;L;;;;;N;;;;A695;
+A695;CYRILLIC SMALL LETTER HWE;Ll;0;L;;;;;N;;;A694;;A694
+A696;CYRILLIC CAPITAL LETTER SHWE;Lu;0;L;;;;;N;;;;A697;
+A697;CYRILLIC SMALL LETTER SHWE;Ll;0;L;;;;;N;;;A696;;A696
+A700;MODIFIER LETTER CHINESE TONE YIN PING;Sk;0;ON;;;;;N;;;;;
+A701;MODIFIER LETTER CHINESE TONE YANG PING;Sk;0;ON;;;;;N;;;;;
+A702;MODIFIER LETTER CHINESE TONE YIN SHANG;Sk;0;ON;;;;;N;;;;;
+A703;MODIFIER LETTER CHINESE TONE YANG SHANG;Sk;0;ON;;;;;N;;;;;
+A704;MODIFIER LETTER CHINESE TONE YIN QU;Sk;0;ON;;;;;N;;;;;
+A705;MODIFIER LETTER CHINESE TONE YANG QU;Sk;0;ON;;;;;N;;;;;
+A706;MODIFIER LETTER CHINESE TONE YIN RU;Sk;0;ON;;;;;N;;;;;
+A707;MODIFIER LETTER CHINESE TONE YANG RU;Sk;0;ON;;;;;N;;;;;
+A708;MODIFIER LETTER EXTRA-HIGH DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
+A709;MODIFIER LETTER HIGH DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70A;MODIFIER LETTER MID DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70B;MODIFIER LETTER LOW DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70C;MODIFIER LETTER EXTRA-LOW DOTTED TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70D;MODIFIER LETTER EXTRA-HIGH DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70E;MODIFIER LETTER HIGH DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A70F;MODIFIER LETTER MID DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A710;MODIFIER LETTER LOW DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A711;MODIFIER LETTER EXTRA-LOW DOTTED LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A712;MODIFIER LETTER EXTRA-HIGH LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A713;MODIFIER LETTER HIGH LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A714;MODIFIER LETTER MID LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A715;MODIFIER LETTER LOW LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A716;MODIFIER LETTER EXTRA-LOW LEFT-STEM TONE BAR;Sk;0;ON;;;;;N;;;;;
+A717;MODIFIER LETTER DOT VERTICAL BAR;Lm;0;ON;;;;;N;;;;;
+A718;MODIFIER LETTER DOT SLASH;Lm;0;ON;;;;;N;;;;;
+A719;MODIFIER LETTER DOT HORIZONTAL BAR;Lm;0;ON;;;;;N;;;;;
+A71A;MODIFIER LETTER LOWER RIGHT CORNER ANGLE;Lm;0;ON;;;;;N;;;;;
+A71B;MODIFIER LETTER RAISED UP ARROW;Lm;0;ON;;;;;N;;;;;
+A71C;MODIFIER LETTER RAISED DOWN ARROW;Lm;0;ON;;;;;N;;;;;
+A71D;MODIFIER LETTER RAISED EXCLAMATION MARK;Lm;0;ON;;;;;N;;;;;
+A71E;MODIFIER LETTER RAISED INVERTED EXCLAMATION MARK;Lm;0;ON;;;;;N;;;;;
+A71F;MODIFIER LETTER LOW INVERTED EXCLAMATION MARK;Lm;0;ON;;;;;N;;;;;
+A720;MODIFIER LETTER STRESS AND HIGH TONE;Sk;0;ON;;;;;N;;;;;
+A721;MODIFIER LETTER STRESS AND LOW TONE;Sk;0;ON;;;;;N;;;;;
+A722;LATIN CAPITAL LETTER EGYPTOLOGICAL ALEF;Lu;0;L;;;;;N;;;;A723;
+A723;LATIN SMALL LETTER EGYPTOLOGICAL ALEF;Ll;0;L;;;;;N;;;A722;;A722
+A724;LATIN CAPITAL LETTER EGYPTOLOGICAL AIN;Lu;0;L;;;;;N;;;;A725;
+A725;LATIN SMALL LETTER EGYPTOLOGICAL AIN;Ll;0;L;;;;;N;;;A724;;A724
+A726;LATIN CAPITAL LETTER HENG;Lu;0;L;;;;;N;;;;A727;
+A727;LATIN SMALL LETTER HENG;Ll;0;L;;;;;N;;;A726;;A726
+A728;LATIN CAPITAL LETTER TZ;Lu;0;L;;;;;N;;;;A729;
+A729;LATIN SMALL LETTER TZ;Ll;0;L;;;;;N;;;A728;;A728
+A72A;LATIN CAPITAL LETTER TRESILLO;Lu;0;L;;;;;N;;;;A72B;
+A72B;LATIN SMALL LETTER TRESILLO;Ll;0;L;;;;;N;;;A72A;;A72A
+A72C;LATIN CAPITAL LETTER CUATRILLO;Lu;0;L;;;;;N;;;;A72D;
+A72D;LATIN SMALL LETTER CUATRILLO;Ll;0;L;;;;;N;;;A72C;;A72C
+A72E;LATIN CAPITAL LETTER CUATRILLO WITH COMMA;Lu;0;L;;;;;N;;;;A72F;
+A72F;LATIN SMALL LETTER CUATRILLO WITH COMMA;Ll;0;L;;;;;N;;;A72E;;A72E
+A730;LATIN LETTER SMALL CAPITAL F;Ll;0;L;;;;;N;;;;;
+A731;LATIN LETTER SMALL CAPITAL S;Ll;0;L;;;;;N;;;;;
+A732;LATIN CAPITAL LETTER AA;Lu;0;L;;;;;N;;;;A733;
+A733;LATIN SMALL LETTER AA;Ll;0;L;;;;;N;;;A732;;A732
+A734;LATIN CAPITAL LETTER AO;Lu;0;L;;;;;N;;;;A735;
+A735;LATIN SMALL LETTER AO;Ll;0;L;;;;;N;;;A734;;A734
+A736;LATIN CAPITAL LETTER AU;Lu;0;L;;;;;N;;;;A737;
+A737;LATIN SMALL LETTER AU;Ll;0;L;;;;;N;;;A736;;A736
+A738;LATIN CAPITAL LETTER AV;Lu;0;L;;;;;N;;;;A739;
+A739;LATIN SMALL LETTER AV;Ll;0;L;;;;;N;;;A738;;A738
+A73A;LATIN CAPITAL LETTER AV WITH HORIZONTAL BAR;Lu;0;L;;;;;N;;;;A73B;
+A73B;LATIN SMALL LETTER AV WITH HORIZONTAL BAR;Ll;0;L;;;;;N;;;A73A;;A73A
+A73C;LATIN CAPITAL LETTER AY;Lu;0;L;;;;;N;;;;A73D;
+A73D;LATIN SMALL LETTER AY;Ll;0;L;;;;;N;;;A73C;;A73C
+A73E;LATIN CAPITAL LETTER REVERSED C WITH DOT;Lu;0;L;;;;;N;;;;A73F;
+A73F;LATIN SMALL LETTER REVERSED C WITH DOT;Ll;0;L;;;;;N;;;A73E;;A73E
+A740;LATIN CAPITAL LETTER K WITH STROKE;Lu;0;L;;;;;N;;;;A741;
+A741;LATIN SMALL LETTER K WITH STROKE;Ll;0;L;;;;;N;;;A740;;A740
+A742;LATIN CAPITAL LETTER K WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A743;
+A743;LATIN SMALL LETTER K WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A742;;A742
+A744;LATIN CAPITAL LETTER K WITH STROKE AND DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A745;
+A745;LATIN SMALL LETTER K WITH STROKE AND DIAGONAL STROKE;Ll;0;L;;;;;N;;;A744;;A744
+A746;LATIN CAPITAL LETTER BROKEN L;Lu;0;L;;;;;N;;;;A747;
+A747;LATIN SMALL LETTER BROKEN L;Ll;0;L;;;;;N;;;A746;;A746
+A748;LATIN CAPITAL LETTER L WITH HIGH STROKE;Lu;0;L;;;;;N;;;;A749;
+A749;LATIN SMALL LETTER L WITH HIGH STROKE;Ll;0;L;;;;;N;;;A748;;A748
+A74A;LATIN CAPITAL LETTER O WITH LONG STROKE OVERLAY;Lu;0;L;;;;;N;;;;A74B;
+A74B;LATIN SMALL LETTER O WITH LONG STROKE OVERLAY;Ll;0;L;;;;;N;;;A74A;;A74A
+A74C;LATIN CAPITAL LETTER O WITH LOOP;Lu;0;L;;;;;N;;;;A74D;
+A74D;LATIN SMALL LETTER O WITH LOOP;Ll;0;L;;;;;N;;;A74C;;A74C
+A74E;LATIN CAPITAL LETTER OO;Lu;0;L;;;;;N;;;;A74F;
+A74F;LATIN SMALL LETTER OO;Ll;0;L;;;;;N;;;A74E;;A74E
+A750;LATIN CAPITAL LETTER P WITH STROKE THROUGH DESCENDER;Lu;0;L;;;;;N;;;;A751;
+A751;LATIN SMALL LETTER P WITH STROKE THROUGH DESCENDER;Ll;0;L;;;;;N;;;A750;;A750
+A752;LATIN CAPITAL LETTER P WITH FLOURISH;Lu;0;L;;;;;N;;;;A753;
+A753;LATIN SMALL LETTER P WITH FLOURISH;Ll;0;L;;;;;N;;;A752;;A752
+A754;LATIN CAPITAL LETTER P WITH SQUIRREL TAIL;Lu;0;L;;;;;N;;;;A755;
+A755;LATIN SMALL LETTER P WITH SQUIRREL TAIL;Ll;0;L;;;;;N;;;A754;;A754
+A756;LATIN CAPITAL LETTER Q WITH STROKE THROUGH DESCENDER;Lu;0;L;;;;;N;;;;A757;
+A757;LATIN SMALL LETTER Q WITH STROKE THROUGH DESCENDER;Ll;0;L;;;;;N;;;A756;;A756
+A758;LATIN CAPITAL LETTER Q WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A759;
+A759;LATIN SMALL LETTER Q WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A758;;A758
+A75A;LATIN CAPITAL LETTER R ROTUNDA;Lu;0;L;;;;;N;;;;A75B;
+A75B;LATIN SMALL LETTER R ROTUNDA;Ll;0;L;;;;;N;;;A75A;;A75A
+A75C;LATIN CAPITAL LETTER RUM ROTUNDA;Lu;0;L;;;;;N;;;;A75D;
+A75D;LATIN SMALL LETTER RUM ROTUNDA;Ll;0;L;;;;;N;;;A75C;;A75C
+A75E;LATIN CAPITAL LETTER V WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;A75F;
+A75F;LATIN SMALL LETTER V WITH DIAGONAL STROKE;Ll;0;L;;;;;N;;;A75E;;A75E
+A760;LATIN CAPITAL LETTER VY;Lu;0;L;;;;;N;;;;A761;
+A761;LATIN SMALL LETTER VY;Ll;0;L;;;;;N;;;A760;;A760
+A762;LATIN CAPITAL LETTER VISIGOTHIC Z;Lu;0;L;;;;;N;;;;A763;
+A763;LATIN SMALL LETTER VISIGOTHIC Z;Ll;0;L;;;;;N;;;A762;;A762
+A764;LATIN CAPITAL LETTER THORN WITH STROKE;Lu;0;L;;;;;N;;;;A765;
+A765;LATIN SMALL LETTER THORN WITH STROKE;Ll;0;L;;;;;N;;;A764;;A764
+A766;LATIN CAPITAL LETTER THORN WITH STROKE THROUGH DESCENDER;Lu;0;L;;;;;N;;;;A767;
+A767;LATIN SMALL LETTER THORN WITH STROKE THROUGH DESCENDER;Ll;0;L;;;;;N;;;A766;;A766
+A768;LATIN CAPITAL LETTER VEND;Lu;0;L;;;;;N;;;;A769;
+A769;LATIN SMALL LETTER VEND;Ll;0;L;;;;;N;;;A768;;A768
+A76A;LATIN CAPITAL LETTER ET;Lu;0;L;;;;;N;;;;A76B;
+A76B;LATIN SMALL LETTER ET;Ll;0;L;;;;;N;;;A76A;;A76A
+A76C;LATIN CAPITAL LETTER IS;Lu;0;L;;;;;N;;;;A76D;
+A76D;LATIN SMALL LETTER IS;Ll;0;L;;;;;N;;;A76C;;A76C
+A76E;LATIN CAPITAL LETTER CON;Lu;0;L;;;;;N;;;;A76F;
+A76F;LATIN SMALL LETTER CON;Ll;0;L;;;;;N;;;A76E;;A76E
+A770;MODIFIER LETTER US;Lm;0;L;<super> A76F;;;;N;;;;;
+A771;LATIN SMALL LETTER DUM;Ll;0;L;;;;;N;;;;;
+A772;LATIN SMALL LETTER LUM;Ll;0;L;;;;;N;;;;;
+A773;LATIN SMALL LETTER MUM;Ll;0;L;;;;;N;;;;;
+A774;LATIN SMALL LETTER NUM;Ll;0;L;;;;;N;;;;;
+A775;LATIN SMALL LETTER RUM;Ll;0;L;;;;;N;;;;;
+A776;LATIN LETTER SMALL CAPITAL RUM;Ll;0;L;;;;;N;;;;;
+A777;LATIN SMALL LETTER TUM;Ll;0;L;;;;;N;;;;;
+A778;LATIN SMALL LETTER UM;Ll;0;L;;;;;N;;;;;
+A779;LATIN CAPITAL LETTER INSULAR D;Lu;0;L;;;;;N;;;;A77A;
+A77A;LATIN SMALL LETTER INSULAR D;Ll;0;L;;;;;N;;;A779;;A779
+A77B;LATIN CAPITAL LETTER INSULAR F;Lu;0;L;;;;;N;;;;A77C;
+A77C;LATIN SMALL LETTER INSULAR F;Ll;0;L;;;;;N;;;A77B;;A77B
+A77D;LATIN CAPITAL LETTER INSULAR G;Lu;0;L;;;;;N;;;;1D79;
+A77E;LATIN CAPITAL LETTER TURNED INSULAR G;Lu;0;L;;;;;N;;;;A77F;
+A77F;LATIN SMALL LETTER TURNED INSULAR G;Ll;0;L;;;;;N;;;A77E;;A77E
+A780;LATIN CAPITAL LETTER TURNED L;Lu;0;L;;;;;N;;;;A781;
+A781;LATIN SMALL LETTER TURNED L;Ll;0;L;;;;;N;;;A780;;A780
+A782;LATIN CAPITAL LETTER INSULAR R;Lu;0;L;;;;;N;;;;A783;
+A783;LATIN SMALL LETTER INSULAR R;Ll;0;L;;;;;N;;;A782;;A782
+A784;LATIN CAPITAL LETTER INSULAR S;Lu;0;L;;;;;N;;;;A785;
+A785;LATIN SMALL LETTER INSULAR S;Ll;0;L;;;;;N;;;A784;;A784
+A786;LATIN CAPITAL LETTER INSULAR T;Lu;0;L;;;;;N;;;;A787;
+A787;LATIN SMALL LETTER INSULAR T;Ll;0;L;;;;;N;;;A786;;A786
+A788;MODIFIER LETTER LOW CIRCUMFLEX ACCENT;Lm;0;ON;;;;;N;;;;;
+A789;MODIFIER LETTER COLON;Sk;0;L;;;;;N;;;;;
+A78A;MODIFIER LETTER SHORT EQUALS SIGN;Sk;0;L;;;;;N;;;;;
+A78B;LATIN CAPITAL LETTER SALTILLO;Lu;0;L;;;;;N;;;;A78C;
+A78C;LATIN SMALL LETTER SALTILLO;Ll;0;L;;;;;N;;;A78B;;A78B
+A7FB;LATIN EPIGRAPHIC LETTER REVERSED F;Lo;0;L;;;;;N;;;;;
+A7FC;LATIN EPIGRAPHIC LETTER REVERSED P;Lo;0;L;;;;;N;;;;;
+A7FD;LATIN EPIGRAPHIC LETTER INVERTED M;Lo;0;L;;;;;N;;;;;
+A7FE;LATIN EPIGRAPHIC LETTER I LONGA;Lo;0;L;;;;;N;;;;;
+A7FF;LATIN EPIGRAPHIC LETTER ARCHAIC M;Lo;0;L;;;;;N;;;;;
+A800;SYLOTI NAGRI LETTER A;Lo;0;L;;;;;N;;;;;
+A801;SYLOTI NAGRI LETTER I;Lo;0;L;;;;;N;;;;;
+A802;SYLOTI NAGRI SIGN DVISVARA;Mn;0;NSM;;;;;N;;;;;
+A803;SYLOTI NAGRI LETTER U;Lo;0;L;;;;;N;;;;;
+A804;SYLOTI NAGRI LETTER E;Lo;0;L;;;;;N;;;;;
+A805;SYLOTI NAGRI LETTER O;Lo;0;L;;;;;N;;;;;
+A806;SYLOTI NAGRI SIGN HASANTA;Mn;9;NSM;;;;;N;;;;;
+A807;SYLOTI NAGRI LETTER KO;Lo;0;L;;;;;N;;;;;
+A808;SYLOTI NAGRI LETTER KHO;Lo;0;L;;;;;N;;;;;
+A809;SYLOTI NAGRI LETTER GO;Lo;0;L;;;;;N;;;;;
+A80A;SYLOTI NAGRI LETTER GHO;Lo;0;L;;;;;N;;;;;
+A80B;SYLOTI NAGRI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+A80C;SYLOTI NAGRI LETTER CO;Lo;0;L;;;;;N;;;;;
+A80D;SYLOTI NAGRI LETTER CHO;Lo;0;L;;;;;N;;;;;
+A80E;SYLOTI NAGRI LETTER JO;Lo;0;L;;;;;N;;;;;
+A80F;SYLOTI NAGRI LETTER JHO;Lo;0;L;;;;;N;;;;;
+A810;SYLOTI NAGRI LETTER TTO;Lo;0;L;;;;;N;;;;;
+A811;SYLOTI NAGRI LETTER TTHO;Lo;0;L;;;;;N;;;;;
+A812;SYLOTI NAGRI LETTER DDO;Lo;0;L;;;;;N;;;;;
+A813;SYLOTI NAGRI LETTER DDHO;Lo;0;L;;;;;N;;;;;
+A814;SYLOTI NAGRI LETTER TO;Lo;0;L;;;;;N;;;;;
+A815;SYLOTI NAGRI LETTER THO;Lo;0;L;;;;;N;;;;;
+A816;SYLOTI NAGRI LETTER DO;Lo;0;L;;;;;N;;;;;
+A817;SYLOTI NAGRI LETTER DHO;Lo;0;L;;;;;N;;;;;
+A818;SYLOTI NAGRI LETTER NO;Lo;0;L;;;;;N;;;;;
+A819;SYLOTI NAGRI LETTER PO;Lo;0;L;;;;;N;;;;;
+A81A;SYLOTI NAGRI LETTER PHO;Lo;0;L;;;;;N;;;;;
+A81B;SYLOTI NAGRI LETTER BO;Lo;0;L;;;;;N;;;;;
+A81C;SYLOTI NAGRI LETTER BHO;Lo;0;L;;;;;N;;;;;
+A81D;SYLOTI NAGRI LETTER MO;Lo;0;L;;;;;N;;;;;
+A81E;SYLOTI NAGRI LETTER RO;Lo;0;L;;;;;N;;;;;
+A81F;SYLOTI NAGRI LETTER LO;Lo;0;L;;;;;N;;;;;
+A820;SYLOTI NAGRI LETTER RRO;Lo;0;L;;;;;N;;;;;
+A821;SYLOTI NAGRI LETTER SO;Lo;0;L;;;;;N;;;;;
+A822;SYLOTI NAGRI LETTER HO;Lo;0;L;;;;;N;;;;;
+A823;SYLOTI NAGRI VOWEL SIGN A;Mc;0;L;;;;;N;;;;;
+A824;SYLOTI NAGRI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+A825;SYLOTI NAGRI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+A826;SYLOTI NAGRI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+A827;SYLOTI NAGRI VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+A828;SYLOTI NAGRI POETRY MARK-1;So;0;ON;;;;;N;;;;;
+A829;SYLOTI NAGRI POETRY MARK-2;So;0;ON;;;;;N;;;;;
+A82A;SYLOTI NAGRI POETRY MARK-3;So;0;ON;;;;;N;;;;;
+A82B;SYLOTI NAGRI POETRY MARK-4;So;0;ON;;;;;N;;;;;
+A840;PHAGS-PA LETTER KA;Lo;0;L;;;;;N;;;;;
+A841;PHAGS-PA LETTER KHA;Lo;0;L;;;;;N;;;;;
+A842;PHAGS-PA LETTER GA;Lo;0;L;;;;;N;;;;;
+A843;PHAGS-PA LETTER NGA;Lo;0;L;;;;;N;;;;;
+A844;PHAGS-PA LETTER CA;Lo;0;L;;;;;N;;;;;
+A845;PHAGS-PA LETTER CHA;Lo;0;L;;;;;N;;;;;
+A846;PHAGS-PA LETTER JA;Lo;0;L;;;;;N;;;;;
+A847;PHAGS-PA LETTER NYA;Lo;0;L;;;;;N;;;;;
+A848;PHAGS-PA LETTER TA;Lo;0;L;;;;;N;;;;;
+A849;PHAGS-PA LETTER THA;Lo;0;L;;;;;N;;;;;
+A84A;PHAGS-PA LETTER DA;Lo;0;L;;;;;N;;;;;
+A84B;PHAGS-PA LETTER NA;Lo;0;L;;;;;N;;;;;
+A84C;PHAGS-PA LETTER PA;Lo;0;L;;;;;N;;;;;
+A84D;PHAGS-PA LETTER PHA;Lo;0;L;;;;;N;;;;;
+A84E;PHAGS-PA LETTER BA;Lo;0;L;;;;;N;;;;;
+A84F;PHAGS-PA LETTER MA;Lo;0;L;;;;;N;;;;;
+A850;PHAGS-PA LETTER TSA;Lo;0;L;;;;;N;;;;;
+A851;PHAGS-PA LETTER TSHA;Lo;0;L;;;;;N;;;;;
+A852;PHAGS-PA LETTER DZA;Lo;0;L;;;;;N;;;;;
+A853;PHAGS-PA LETTER WA;Lo;0;L;;;;;N;;;;;
+A854;PHAGS-PA LETTER ZHA;Lo;0;L;;;;;N;;;;;
+A855;PHAGS-PA LETTER ZA;Lo;0;L;;;;;N;;;;;
+A856;PHAGS-PA LETTER SMALL A;Lo;0;L;;;;;N;;;;;
+A857;PHAGS-PA LETTER YA;Lo;0;L;;;;;N;;;;;
+A858;PHAGS-PA LETTER RA;Lo;0;L;;;;;N;;;;;
+A859;PHAGS-PA LETTER LA;Lo;0;L;;;;;N;;;;;
+A85A;PHAGS-PA LETTER SHA;Lo;0;L;;;;;N;;;;;
+A85B;PHAGS-PA LETTER SA;Lo;0;L;;;;;N;;;;;
+A85C;PHAGS-PA LETTER HA;Lo;0;L;;;;;N;;;;;
+A85D;PHAGS-PA LETTER A;Lo;0;L;;;;;N;;;;;
+A85E;PHAGS-PA LETTER I;Lo;0;L;;;;;N;;;;;
+A85F;PHAGS-PA LETTER U;Lo;0;L;;;;;N;;;;;
+A860;PHAGS-PA LETTER E;Lo;0;L;;;;;N;;;;;
+A861;PHAGS-PA LETTER O;Lo;0;L;;;;;N;;;;;
+A862;PHAGS-PA LETTER QA;Lo;0;L;;;;;N;;;;;
+A863;PHAGS-PA LETTER XA;Lo;0;L;;;;;N;;;;;
+A864;PHAGS-PA LETTER FA;Lo;0;L;;;;;N;;;;;
+A865;PHAGS-PA LETTER GGA;Lo;0;L;;;;;N;;;;;
+A866;PHAGS-PA LETTER EE;Lo;0;L;;;;;N;;;;;
+A867;PHAGS-PA SUBJOINED LETTER WA;Lo;0;L;;;;;N;;;;;
+A868;PHAGS-PA SUBJOINED LETTER YA;Lo;0;L;;;;;N;;;;;
+A869;PHAGS-PA LETTER TTA;Lo;0;L;;;;;N;;;;;
+A86A;PHAGS-PA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+A86B;PHAGS-PA LETTER DDA;Lo;0;L;;;;;N;;;;;
+A86C;PHAGS-PA LETTER NNA;Lo;0;L;;;;;N;;;;;
+A86D;PHAGS-PA LETTER ALTERNATE YA;Lo;0;L;;;;;N;;;;;
+A86E;PHAGS-PA LETTER VOICELESS SHA;Lo;0;L;;;;;N;;;;;
+A86F;PHAGS-PA LETTER VOICED HA;Lo;0;L;;;;;N;;;;;
+A870;PHAGS-PA LETTER ASPIRATED FA;Lo;0;L;;;;;N;;;;;
+A871;PHAGS-PA SUBJOINED LETTER RA;Lo;0;L;;;;;N;;;;;
+A872;PHAGS-PA SUPERFIXED LETTER RA;Lo;0;L;;;;;N;;;;;
+A873;PHAGS-PA LETTER CANDRABINDU;Lo;0;L;;;;;N;;;;;
+A874;PHAGS-PA SINGLE HEAD MARK;Po;0;ON;;;;;N;;;;;
+A875;PHAGS-PA DOUBLE HEAD MARK;Po;0;ON;;;;;N;;;;;
+A876;PHAGS-PA MARK SHAD;Po;0;ON;;;;;N;;;;;
+A877;PHAGS-PA MARK DOUBLE SHAD;Po;0;ON;;;;;N;;;;;
+A880;SAURASHTRA SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
+A881;SAURASHTRA SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+A882;SAURASHTRA LETTER A;Lo;0;L;;;;;N;;;;;
+A883;SAURASHTRA LETTER AA;Lo;0;L;;;;;N;;;;;
+A884;SAURASHTRA LETTER I;Lo;0;L;;;;;N;;;;;
+A885;SAURASHTRA LETTER II;Lo;0;L;;;;;N;;;;;
+A886;SAURASHTRA LETTER U;Lo;0;L;;;;;N;;;;;
+A887;SAURASHTRA LETTER UU;Lo;0;L;;;;;N;;;;;
+A888;SAURASHTRA LETTER VOCALIC R;Lo;0;L;;;;;N;;;;;
+A889;SAURASHTRA LETTER VOCALIC RR;Lo;0;L;;;;;N;;;;;
+A88A;SAURASHTRA LETTER VOCALIC L;Lo;0;L;;;;;N;;;;;
+A88B;SAURASHTRA LETTER VOCALIC LL;Lo;0;L;;;;;N;;;;;
+A88C;SAURASHTRA LETTER E;Lo;0;L;;;;;N;;;;;
+A88D;SAURASHTRA LETTER EE;Lo;0;L;;;;;N;;;;;
+A88E;SAURASHTRA LETTER AI;Lo;0;L;;;;;N;;;;;
+A88F;SAURASHTRA LETTER O;Lo;0;L;;;;;N;;;;;
+A890;SAURASHTRA LETTER OO;Lo;0;L;;;;;N;;;;;
+A891;SAURASHTRA LETTER AU;Lo;0;L;;;;;N;;;;;
+A892;SAURASHTRA LETTER KA;Lo;0;L;;;;;N;;;;;
+A893;SAURASHTRA LETTER KHA;Lo;0;L;;;;;N;;;;;
+A894;SAURASHTRA LETTER GA;Lo;0;L;;;;;N;;;;;
+A895;SAURASHTRA LETTER GHA;Lo;0;L;;;;;N;;;;;
+A896;SAURASHTRA LETTER NGA;Lo;0;L;;;;;N;;;;;
+A897;SAURASHTRA LETTER CA;Lo;0;L;;;;;N;;;;;
+A898;SAURASHTRA LETTER CHA;Lo;0;L;;;;;N;;;;;
+A899;SAURASHTRA LETTER JA;Lo;0;L;;;;;N;;;;;
+A89A;SAURASHTRA LETTER JHA;Lo;0;L;;;;;N;;;;;
+A89B;SAURASHTRA LETTER NYA;Lo;0;L;;;;;N;;;;;
+A89C;SAURASHTRA LETTER TTA;Lo;0;L;;;;;N;;;;;
+A89D;SAURASHTRA LETTER TTHA;Lo;0;L;;;;;N;;;;;
+A89E;SAURASHTRA LETTER DDA;Lo;0;L;;;;;N;;;;;
+A89F;SAURASHTRA LETTER DDHA;Lo;0;L;;;;;N;;;;;
+A8A0;SAURASHTRA LETTER NNA;Lo;0;L;;;;;N;;;;;
+A8A1;SAURASHTRA LETTER TA;Lo;0;L;;;;;N;;;;;
+A8A2;SAURASHTRA LETTER THA;Lo;0;L;;;;;N;;;;;
+A8A3;SAURASHTRA LETTER DA;Lo;0;L;;;;;N;;;;;
+A8A4;SAURASHTRA LETTER DHA;Lo;0;L;;;;;N;;;;;
+A8A5;SAURASHTRA LETTER NA;Lo;0;L;;;;;N;;;;;
+A8A6;SAURASHTRA LETTER PA;Lo;0;L;;;;;N;;;;;
+A8A7;SAURASHTRA LETTER PHA;Lo;0;L;;;;;N;;;;;
+A8A8;SAURASHTRA LETTER BA;Lo;0;L;;;;;N;;;;;
+A8A9;SAURASHTRA LETTER BHA;Lo;0;L;;;;;N;;;;;
+A8AA;SAURASHTRA LETTER MA;Lo;0;L;;;;;N;;;;;
+A8AB;SAURASHTRA LETTER YA;Lo;0;L;;;;;N;;;;;
+A8AC;SAURASHTRA LETTER RA;Lo;0;L;;;;;N;;;;;
+A8AD;SAURASHTRA LETTER LA;Lo;0;L;;;;;N;;;;;
+A8AE;SAURASHTRA LETTER VA;Lo;0;L;;;;;N;;;;;
+A8AF;SAURASHTRA LETTER SHA;Lo;0;L;;;;;N;;;;;
+A8B0;SAURASHTRA LETTER SSA;Lo;0;L;;;;;N;;;;;
+A8B1;SAURASHTRA LETTER SA;Lo;0;L;;;;;N;;;;;
+A8B2;SAURASHTRA LETTER HA;Lo;0;L;;;;;N;;;;;
+A8B3;SAURASHTRA LETTER LLA;Lo;0;L;;;;;N;;;;;
+A8B4;SAURASHTRA CONSONANT SIGN HAARU;Mc;0;L;;;;;N;;;;;
+A8B5;SAURASHTRA VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+A8B6;SAURASHTRA VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+A8B7;SAURASHTRA VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+A8B8;SAURASHTRA VOWEL SIGN U;Mc;0;L;;;;;N;;;;;
+A8B9;SAURASHTRA VOWEL SIGN UU;Mc;0;L;;;;;N;;;;;
+A8BA;SAURASHTRA VOWEL SIGN VOCALIC R;Mc;0;L;;;;;N;;;;;
+A8BB;SAURASHTRA VOWEL SIGN VOCALIC RR;Mc;0;L;;;;;N;;;;;
+A8BC;SAURASHTRA VOWEL SIGN VOCALIC L;Mc;0;L;;;;;N;;;;;
+A8BD;SAURASHTRA VOWEL SIGN VOCALIC LL;Mc;0;L;;;;;N;;;;;
+A8BE;SAURASHTRA VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+A8BF;SAURASHTRA VOWEL SIGN EE;Mc;0;L;;;;;N;;;;;
+A8C0;SAURASHTRA VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+A8C1;SAURASHTRA VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+A8C2;SAURASHTRA VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+A8C3;SAURASHTRA VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+A8C4;SAURASHTRA SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+A8CE;SAURASHTRA DANDA;Po;0;L;;;;;N;;;;;
+A8CF;SAURASHTRA DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+A8D0;SAURASHTRA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+A8D1;SAURASHTRA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+A8D2;SAURASHTRA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+A8D3;SAURASHTRA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+A8D4;SAURASHTRA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+A8D5;SAURASHTRA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+A8D6;SAURASHTRA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+A8D7;SAURASHTRA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+A8D8;SAURASHTRA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+A8D9;SAURASHTRA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+A900;KAYAH LI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+A901;KAYAH LI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+A902;KAYAH LI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+A903;KAYAH LI DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+A904;KAYAH LI DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+A905;KAYAH LI DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+A906;KAYAH LI DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+A907;KAYAH LI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+A908;KAYAH LI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+A909;KAYAH LI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+A90A;KAYAH LI LETTER KA;Lo;0;L;;;;;N;;;;;
+A90B;KAYAH LI LETTER KHA;Lo;0;L;;;;;N;;;;;
+A90C;KAYAH LI LETTER GA;Lo;0;L;;;;;N;;;;;
+A90D;KAYAH LI LETTER NGA;Lo;0;L;;;;;N;;;;;
+A90E;KAYAH LI LETTER SA;Lo;0;L;;;;;N;;;;;
+A90F;KAYAH LI LETTER SHA;Lo;0;L;;;;;N;;;;;
+A910;KAYAH LI LETTER ZA;Lo;0;L;;;;;N;;;;;
+A911;KAYAH LI LETTER NYA;Lo;0;L;;;;;N;;;;;
+A912;KAYAH LI LETTER TA;Lo;0;L;;;;;N;;;;;
+A913;KAYAH LI LETTER HTA;Lo;0;L;;;;;N;;;;;
+A914;KAYAH LI LETTER NA;Lo;0;L;;;;;N;;;;;
+A915;KAYAH LI LETTER PA;Lo;0;L;;;;;N;;;;;
+A916;KAYAH LI LETTER PHA;Lo;0;L;;;;;N;;;;;
+A917;KAYAH LI LETTER MA;Lo;0;L;;;;;N;;;;;
+A918;KAYAH LI LETTER DA;Lo;0;L;;;;;N;;;;;
+A919;KAYAH LI LETTER BA;Lo;0;L;;;;;N;;;;;
+A91A;KAYAH LI LETTER RA;Lo;0;L;;;;;N;;;;;
+A91B;KAYAH LI LETTER YA;Lo;0;L;;;;;N;;;;;
+A91C;KAYAH LI LETTER LA;Lo;0;L;;;;;N;;;;;
+A91D;KAYAH LI LETTER WA;Lo;0;L;;;;;N;;;;;
+A91E;KAYAH LI LETTER THA;Lo;0;L;;;;;N;;;;;
+A91F;KAYAH LI LETTER HA;Lo;0;L;;;;;N;;;;;
+A920;KAYAH LI LETTER VA;Lo;0;L;;;;;N;;;;;
+A921;KAYAH LI LETTER CA;Lo;0;L;;;;;N;;;;;
+A922;KAYAH LI LETTER A;Lo;0;L;;;;;N;;;;;
+A923;KAYAH LI LETTER OE;Lo;0;L;;;;;N;;;;;
+A924;KAYAH LI LETTER I;Lo;0;L;;;;;N;;;;;
+A925;KAYAH LI LETTER OO;Lo;0;L;;;;;N;;;;;
+A926;KAYAH LI VOWEL UE;Mn;0;NSM;;;;;N;;;;;
+A927;KAYAH LI VOWEL E;Mn;0;NSM;;;;;N;;;;;
+A928;KAYAH LI VOWEL U;Mn;0;NSM;;;;;N;;;;;
+A929;KAYAH LI VOWEL EE;Mn;0;NSM;;;;;N;;;;;
+A92A;KAYAH LI VOWEL O;Mn;0;NSM;;;;;N;;;;;
+A92B;KAYAH LI TONE PLOPHU;Mn;220;NSM;;;;;N;;;;;
+A92C;KAYAH LI TONE CALYA;Mn;220;NSM;;;;;N;;;;;
+A92D;KAYAH LI TONE CALYA PLOPHU;Mn;220;NSM;;;;;N;;;;;
+A92E;KAYAH LI SIGN CWI;Po;0;L;;;;;N;;;;;
+A92F;KAYAH LI SIGN SHYA;Po;0;L;;;;;N;;;;;
+A930;REJANG LETTER KA;Lo;0;L;;;;;N;;;;;
+A931;REJANG LETTER GA;Lo;0;L;;;;;N;;;;;
+A932;REJANG LETTER NGA;Lo;0;L;;;;;N;;;;;
+A933;REJANG LETTER TA;Lo;0;L;;;;;N;;;;;
+A934;REJANG LETTER DA;Lo;0;L;;;;;N;;;;;
+A935;REJANG LETTER NA;Lo;0;L;;;;;N;;;;;
+A936;REJANG LETTER PA;Lo;0;L;;;;;N;;;;;
+A937;REJANG LETTER BA;Lo;0;L;;;;;N;;;;;
+A938;REJANG LETTER MA;Lo;0;L;;;;;N;;;;;
+A939;REJANG LETTER CA;Lo;0;L;;;;;N;;;;;
+A93A;REJANG LETTER JA;Lo;0;L;;;;;N;;;;;
+A93B;REJANG LETTER NYA;Lo;0;L;;;;;N;;;;;
+A93C;REJANG LETTER SA;Lo;0;L;;;;;N;;;;;
+A93D;REJANG LETTER RA;Lo;0;L;;;;;N;;;;;
+A93E;REJANG LETTER LA;Lo;0;L;;;;;N;;;;;
+A93F;REJANG LETTER YA;Lo;0;L;;;;;N;;;;;
+A940;REJANG LETTER WA;Lo;0;L;;;;;N;;;;;
+A941;REJANG LETTER HA;Lo;0;L;;;;;N;;;;;
+A942;REJANG LETTER MBA;Lo;0;L;;;;;N;;;;;
+A943;REJANG LETTER NGGA;Lo;0;L;;;;;N;;;;;
+A944;REJANG LETTER NDA;Lo;0;L;;;;;N;;;;;
+A945;REJANG LETTER NYJA;Lo;0;L;;;;;N;;;;;
+A946;REJANG LETTER A;Lo;0;L;;;;;N;;;;;
+A947;REJANG VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+A948;REJANG VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+A949;REJANG VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+A94A;REJANG VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+A94B;REJANG VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+A94C;REJANG VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+A94D;REJANG VOWEL SIGN EU;Mn;0;NSM;;;;;N;;;;;
+A94E;REJANG VOWEL SIGN EA;Mn;0;NSM;;;;;N;;;;;
+A94F;REJANG CONSONANT SIGN NG;Mn;0;NSM;;;;;N;;;;;
+A950;REJANG CONSONANT SIGN N;Mn;0;NSM;;;;;N;;;;;
+A951;REJANG CONSONANT SIGN R;Mn;0;NSM;;;;;N;;;;;
+A952;REJANG CONSONANT SIGN H;Mc;0;L;;;;;N;;;;;
+A953;REJANG VIRAMA;Mc;9;L;;;;;N;;;;;
+A95F;REJANG SECTION MARK;Po;0;L;;;;;N;;;;;
+AA00;CHAM LETTER A;Lo;0;L;;;;;N;;;;;
+AA01;CHAM LETTER I;Lo;0;L;;;;;N;;;;;
+AA02;CHAM LETTER U;Lo;0;L;;;;;N;;;;;
+AA03;CHAM LETTER E;Lo;0;L;;;;;N;;;;;
+AA04;CHAM LETTER AI;Lo;0;L;;;;;N;;;;;
+AA05;CHAM LETTER O;Lo;0;L;;;;;N;;;;;
+AA06;CHAM LETTER KA;Lo;0;L;;;;;N;;;;;
+AA07;CHAM LETTER KHA;Lo;0;L;;;;;N;;;;;
+AA08;CHAM LETTER GA;Lo;0;L;;;;;N;;;;;
+AA09;CHAM LETTER GHA;Lo;0;L;;;;;N;;;;;
+AA0A;CHAM LETTER NGUE;Lo;0;L;;;;;N;;;;;
+AA0B;CHAM LETTER NGA;Lo;0;L;;;;;N;;;;;
+AA0C;CHAM LETTER CHA;Lo;0;L;;;;;N;;;;;
+AA0D;CHAM LETTER CHHA;Lo;0;L;;;;;N;;;;;
+AA0E;CHAM LETTER JA;Lo;0;L;;;;;N;;;;;
+AA0F;CHAM LETTER JHA;Lo;0;L;;;;;N;;;;;
+AA10;CHAM LETTER NHUE;Lo;0;L;;;;;N;;;;;
+AA11;CHAM LETTER NHA;Lo;0;L;;;;;N;;;;;
+AA12;CHAM LETTER NHJA;Lo;0;L;;;;;N;;;;;
+AA13;CHAM LETTER TA;Lo;0;L;;;;;N;;;;;
+AA14;CHAM LETTER THA;Lo;0;L;;;;;N;;;;;
+AA15;CHAM LETTER DA;Lo;0;L;;;;;N;;;;;
+AA16;CHAM LETTER DHA;Lo;0;L;;;;;N;;;;;
+AA17;CHAM LETTER NUE;Lo;0;L;;;;;N;;;;;
+AA18;CHAM LETTER NA;Lo;0;L;;;;;N;;;;;
+AA19;CHAM LETTER DDA;Lo;0;L;;;;;N;;;;;
+AA1A;CHAM LETTER PA;Lo;0;L;;;;;N;;;;;
+AA1B;CHAM LETTER PPA;Lo;0;L;;;;;N;;;;;
+AA1C;CHAM LETTER PHA;Lo;0;L;;;;;N;;;;;
+AA1D;CHAM LETTER BA;Lo;0;L;;;;;N;;;;;
+AA1E;CHAM LETTER BHA;Lo;0;L;;;;;N;;;;;
+AA1F;CHAM LETTER MUE;Lo;0;L;;;;;N;;;;;
+AA20;CHAM LETTER MA;Lo;0;L;;;;;N;;;;;
+AA21;CHAM LETTER BBA;Lo;0;L;;;;;N;;;;;
+AA22;CHAM LETTER YA;Lo;0;L;;;;;N;;;;;
+AA23;CHAM LETTER RA;Lo;0;L;;;;;N;;;;;
+AA24;CHAM LETTER LA;Lo;0;L;;;;;N;;;;;
+AA25;CHAM LETTER VA;Lo;0;L;;;;;N;;;;;
+AA26;CHAM LETTER SSA;Lo;0;L;;;;;N;;;;;
+AA27;CHAM LETTER SA;Lo;0;L;;;;;N;;;;;
+AA28;CHAM LETTER HA;Lo;0;L;;;;;N;;;;;
+AA29;CHAM VOWEL SIGN AA;Mn;0;NSM;;;;;N;;;;;
+AA2A;CHAM VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+AA2B;CHAM VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+AA2C;CHAM VOWEL SIGN EI;Mn;0;NSM;;;;;N;;;;;
+AA2D;CHAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+AA2E;CHAM VOWEL SIGN OE;Mn;0;NSM;;;;;N;;;;;
+AA2F;CHAM VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+AA30;CHAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+AA31;CHAM VOWEL SIGN AU;Mn;0;NSM;;;;;N;;;;;
+AA32;CHAM VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;;
+AA33;CHAM CONSONANT SIGN YA;Mc;0;L;;;;;N;;;;;
+AA34;CHAM CONSONANT SIGN RA;Mc;0;L;;;;;N;;;;;
+AA35;CHAM CONSONANT SIGN LA;Mn;0;NSM;;;;;N;;;;;
+AA36;CHAM CONSONANT SIGN WA;Mn;0;NSM;;;;;N;;;;;
+AA40;CHAM LETTER FINAL K;Lo;0;L;;;;;N;;;;;
+AA41;CHAM LETTER FINAL G;Lo;0;L;;;;;N;;;;;
+AA42;CHAM LETTER FINAL NG;Lo;0;L;;;;;N;;;;;
+AA43;CHAM CONSONANT SIGN FINAL NG;Mn;0;NSM;;;;;N;;;;;
+AA44;CHAM LETTER FINAL CH;Lo;0;L;;;;;N;;;;;
+AA45;CHAM LETTER FINAL T;Lo;0;L;;;;;N;;;;;
+AA46;CHAM LETTER FINAL N;Lo;0;L;;;;;N;;;;;
+AA47;CHAM LETTER FINAL P;Lo;0;L;;;;;N;;;;;
+AA48;CHAM LETTER FINAL Y;Lo;0;L;;;;;N;;;;;
+AA49;CHAM LETTER FINAL R;Lo;0;L;;;;;N;;;;;
+AA4A;CHAM LETTER FINAL L;Lo;0;L;;;;;N;;;;;
+AA4B;CHAM LETTER FINAL SS;Lo;0;L;;;;;N;;;;;
+AA4C;CHAM CONSONANT SIGN FINAL M;Mn;0;NSM;;;;;N;;;;;
+AA4D;CHAM CONSONANT SIGN FINAL H;Mc;0;L;;;;;N;;;;;
+AA50;CHAM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+AA51;CHAM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+AA52;CHAM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+AA53;CHAM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+AA54;CHAM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+AA55;CHAM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+AA56;CHAM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+AA57;CHAM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+AA58;CHAM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+AA59;CHAM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+AA5C;CHAM PUNCTUATION SPIRAL;Po;0;L;;;;;N;;;;;
+AA5D;CHAM PUNCTUATION DANDA;Po;0;L;;;;;N;;;;;
+AA5E;CHAM PUNCTUATION DOUBLE DANDA;Po;0;L;;;;;N;;;;;
+AA5F;CHAM PUNCTUATION TRIPLE DANDA;Po;0;L;;;;;N;;;;;
+AC00;<Hangul Syllable, First>;Lo;0;L;;;;;N;;;;;
+D7A3;<Hangul Syllable, Last>;Lo;0;L;;;;;N;;;;;
+D800;<Non Private Use High Surrogate, First>;Cs;0;L;;;;;N;;;;;
+DB7F;<Non Private Use High Surrogate, Last>;Cs;0;L;;;;;N;;;;;
+DB80;<Private Use High Surrogate, First>;Cs;0;L;;;;;N;;;;;
+DBFF;<Private Use High Surrogate, Last>;Cs;0;L;;;;;N;;;;;
+DC00;<Low Surrogate, First>;Cs;0;L;;;;;N;;;;;
+DFFF;<Low Surrogate, Last>;Cs;0;L;;;;;N;;;;;
+E000;<Private Use, First>;Co;0;L;;;;;N;;;;;
+F8FF;<Private Use, Last>;Co;0;L;;;;;N;;;;;
+F900;CJK COMPATIBILITY IDEOGRAPH-F900;Lo;0;L;8C48;;;;N;;;;;
+F901;CJK COMPATIBILITY IDEOGRAPH-F901;Lo;0;L;66F4;;;;N;;;;;
+F902;CJK COMPATIBILITY IDEOGRAPH-F902;Lo;0;L;8ECA;;;;N;;;;;
+F903;CJK COMPATIBILITY IDEOGRAPH-F903;Lo;0;L;8CC8;;;;N;;;;;
+F904;CJK COMPATIBILITY IDEOGRAPH-F904;Lo;0;L;6ED1;;;;N;;;;;
+F905;CJK COMPATIBILITY IDEOGRAPH-F905;Lo;0;L;4E32;;;;N;;;;;
+F906;CJK COMPATIBILITY IDEOGRAPH-F906;Lo;0;L;53E5;;;;N;;;;;
+F907;CJK COMPATIBILITY IDEOGRAPH-F907;Lo;0;L;9F9C;;;;N;;;;;
+F908;CJK COMPATIBILITY IDEOGRAPH-F908;Lo;0;L;9F9C;;;;N;;;;;
+F909;CJK COMPATIBILITY IDEOGRAPH-F909;Lo;0;L;5951;;;;N;;;;;
+F90A;CJK COMPATIBILITY IDEOGRAPH-F90A;Lo;0;L;91D1;;;;N;;;;;
+F90B;CJK COMPATIBILITY IDEOGRAPH-F90B;Lo;0;L;5587;;;;N;;;;;
+F90C;CJK COMPATIBILITY IDEOGRAPH-F90C;Lo;0;L;5948;;;;N;;;;;
+F90D;CJK COMPATIBILITY IDEOGRAPH-F90D;Lo;0;L;61F6;;;;N;;;;;
+F90E;CJK COMPATIBILITY IDEOGRAPH-F90E;Lo;0;L;7669;;;;N;;;;;
+F90F;CJK COMPATIBILITY IDEOGRAPH-F90F;Lo;0;L;7F85;;;;N;;;;;
+F910;CJK COMPATIBILITY IDEOGRAPH-F910;Lo;0;L;863F;;;;N;;;;;
+F911;CJK COMPATIBILITY IDEOGRAPH-F911;Lo;0;L;87BA;;;;N;;;;;
+F912;CJK COMPATIBILITY IDEOGRAPH-F912;Lo;0;L;88F8;;;;N;;;;;
+F913;CJK COMPATIBILITY IDEOGRAPH-F913;Lo;0;L;908F;;;;N;;;;;
+F914;CJK COMPATIBILITY IDEOGRAPH-F914;Lo;0;L;6A02;;;;N;;;;;
+F915;CJK COMPATIBILITY IDEOGRAPH-F915;Lo;0;L;6D1B;;;;N;;;;;
+F916;CJK COMPATIBILITY IDEOGRAPH-F916;Lo;0;L;70D9;;;;N;;;;;
+F917;CJK COMPATIBILITY IDEOGRAPH-F917;Lo;0;L;73DE;;;;N;;;;;
+F918;CJK COMPATIBILITY IDEOGRAPH-F918;Lo;0;L;843D;;;;N;;;;;
+F919;CJK COMPATIBILITY IDEOGRAPH-F919;Lo;0;L;916A;;;;N;;;;;
+F91A;CJK COMPATIBILITY IDEOGRAPH-F91A;Lo;0;L;99F1;;;;N;;;;;
+F91B;CJK COMPATIBILITY IDEOGRAPH-F91B;Lo;0;L;4E82;;;;N;;;;;
+F91C;CJK COMPATIBILITY IDEOGRAPH-F91C;Lo;0;L;5375;;;;N;;;;;
+F91D;CJK COMPATIBILITY IDEOGRAPH-F91D;Lo;0;L;6B04;;;;N;;;;;
+F91E;CJK COMPATIBILITY IDEOGRAPH-F91E;Lo;0;L;721B;;;;N;;;;;
+F91F;CJK COMPATIBILITY IDEOGRAPH-F91F;Lo;0;L;862D;;;;N;;;;;
+F920;CJK COMPATIBILITY IDEOGRAPH-F920;Lo;0;L;9E1E;;;;N;;;;;
+F921;CJK COMPATIBILITY IDEOGRAPH-F921;Lo;0;L;5D50;;;;N;;;;;
+F922;CJK COMPATIBILITY IDEOGRAPH-F922;Lo;0;L;6FEB;;;;N;;;;;
+F923;CJK COMPATIBILITY IDEOGRAPH-F923;Lo;0;L;85CD;;;;N;;;;;
+F924;CJK COMPATIBILITY IDEOGRAPH-F924;Lo;0;L;8964;;;;N;;;;;
+F925;CJK COMPATIBILITY IDEOGRAPH-F925;Lo;0;L;62C9;;;;N;;;;;
+F926;CJK COMPATIBILITY IDEOGRAPH-F926;Lo;0;L;81D8;;;;N;;;;;
+F927;CJK COMPATIBILITY IDEOGRAPH-F927;Lo;0;L;881F;;;;N;;;;;
+F928;CJK COMPATIBILITY IDEOGRAPH-F928;Lo;0;L;5ECA;;;;N;;;;;
+F929;CJK COMPATIBILITY IDEOGRAPH-F929;Lo;0;L;6717;;;;N;;;;;
+F92A;CJK COMPATIBILITY IDEOGRAPH-F92A;Lo;0;L;6D6A;;;;N;;;;;
+F92B;CJK COMPATIBILITY IDEOGRAPH-F92B;Lo;0;L;72FC;;;;N;;;;;
+F92C;CJK COMPATIBILITY IDEOGRAPH-F92C;Lo;0;L;90CE;;;;N;;;;;
+F92D;CJK COMPATIBILITY IDEOGRAPH-F92D;Lo;0;L;4F86;;;;N;;;;;
+F92E;CJK COMPATIBILITY IDEOGRAPH-F92E;Lo;0;L;51B7;;;;N;;;;;
+F92F;CJK COMPATIBILITY IDEOGRAPH-F92F;Lo;0;L;52DE;;;;N;;;;;
+F930;CJK COMPATIBILITY IDEOGRAPH-F930;Lo;0;L;64C4;;;;N;;;;;
+F931;CJK COMPATIBILITY IDEOGRAPH-F931;Lo;0;L;6AD3;;;;N;;;;;
+F932;CJK COMPATIBILITY IDEOGRAPH-F932;Lo;0;L;7210;;;;N;;;;;
+F933;CJK COMPATIBILITY IDEOGRAPH-F933;Lo;0;L;76E7;;;;N;;;;;
+F934;CJK COMPATIBILITY IDEOGRAPH-F934;Lo;0;L;8001;;;;N;;;;;
+F935;CJK COMPATIBILITY IDEOGRAPH-F935;Lo;0;L;8606;;;;N;;;;;
+F936;CJK COMPATIBILITY IDEOGRAPH-F936;Lo;0;L;865C;;;;N;;;;;
+F937;CJK COMPATIBILITY IDEOGRAPH-F937;Lo;0;L;8DEF;;;;N;;;;;
+F938;CJK COMPATIBILITY IDEOGRAPH-F938;Lo;0;L;9732;;;;N;;;;;
+F939;CJK COMPATIBILITY IDEOGRAPH-F939;Lo;0;L;9B6F;;;;N;;;;;
+F93A;CJK COMPATIBILITY IDEOGRAPH-F93A;Lo;0;L;9DFA;;;;N;;;;;
+F93B;CJK COMPATIBILITY IDEOGRAPH-F93B;Lo;0;L;788C;;;;N;;;;;
+F93C;CJK COMPATIBILITY IDEOGRAPH-F93C;Lo;0;L;797F;;;;N;;;;;
+F93D;CJK COMPATIBILITY IDEOGRAPH-F93D;Lo;0;L;7DA0;;;;N;;;;;
+F93E;CJK COMPATIBILITY IDEOGRAPH-F93E;Lo;0;L;83C9;;;;N;;;;;
+F93F;CJK COMPATIBILITY IDEOGRAPH-F93F;Lo;0;L;9304;;;;N;;;;;
+F940;CJK COMPATIBILITY IDEOGRAPH-F940;Lo;0;L;9E7F;;;;N;;;;;
+F941;CJK COMPATIBILITY IDEOGRAPH-F941;Lo;0;L;8AD6;;;;N;;;;;
+F942;CJK COMPATIBILITY IDEOGRAPH-F942;Lo;0;L;58DF;;;;N;;;;;
+F943;CJK COMPATIBILITY IDEOGRAPH-F943;Lo;0;L;5F04;;;;N;;;;;
+F944;CJK COMPATIBILITY IDEOGRAPH-F944;Lo;0;L;7C60;;;;N;;;;;
+F945;CJK COMPATIBILITY IDEOGRAPH-F945;Lo;0;L;807E;;;;N;;;;;
+F946;CJK COMPATIBILITY IDEOGRAPH-F946;Lo;0;L;7262;;;;N;;;;;
+F947;CJK COMPATIBILITY IDEOGRAPH-F947;Lo;0;L;78CA;;;;N;;;;;
+F948;CJK COMPATIBILITY IDEOGRAPH-F948;Lo;0;L;8CC2;;;;N;;;;;
+F949;CJK COMPATIBILITY IDEOGRAPH-F949;Lo;0;L;96F7;;;;N;;;;;
+F94A;CJK COMPATIBILITY IDEOGRAPH-F94A;Lo;0;L;58D8;;;;N;;;;;
+F94B;CJK COMPATIBILITY IDEOGRAPH-F94B;Lo;0;L;5C62;;;;N;;;;;
+F94C;CJK COMPATIBILITY IDEOGRAPH-F94C;Lo;0;L;6A13;;;;N;;;;;
+F94D;CJK COMPATIBILITY IDEOGRAPH-F94D;Lo;0;L;6DDA;;;;N;;;;;
+F94E;CJK COMPATIBILITY IDEOGRAPH-F94E;Lo;0;L;6F0F;;;;N;;;;;
+F94F;CJK COMPATIBILITY IDEOGRAPH-F94F;Lo;0;L;7D2F;;;;N;;;;;
+F950;CJK COMPATIBILITY IDEOGRAPH-F950;Lo;0;L;7E37;;;;N;;;;;
+F951;CJK COMPATIBILITY IDEOGRAPH-F951;Lo;0;L;964B;;;;N;;;;;
+F952;CJK COMPATIBILITY IDEOGRAPH-F952;Lo;0;L;52D2;;;;N;;;;;
+F953;CJK COMPATIBILITY IDEOGRAPH-F953;Lo;0;L;808B;;;;N;;;;;
+F954;CJK COMPATIBILITY IDEOGRAPH-F954;Lo;0;L;51DC;;;;N;;;;;
+F955;CJK COMPATIBILITY IDEOGRAPH-F955;Lo;0;L;51CC;;;;N;;;;;
+F956;CJK COMPATIBILITY IDEOGRAPH-F956;Lo;0;L;7A1C;;;;N;;;;;
+F957;CJK COMPATIBILITY IDEOGRAPH-F957;Lo;0;L;7DBE;;;;N;;;;;
+F958;CJK COMPATIBILITY IDEOGRAPH-F958;Lo;0;L;83F1;;;;N;;;;;
+F959;CJK COMPATIBILITY IDEOGRAPH-F959;Lo;0;L;9675;;;;N;;;;;
+F95A;CJK COMPATIBILITY IDEOGRAPH-F95A;Lo;0;L;8B80;;;;N;;;;;
+F95B;CJK COMPATIBILITY IDEOGRAPH-F95B;Lo;0;L;62CF;;;;N;;;;;
+F95C;CJK COMPATIBILITY IDEOGRAPH-F95C;Lo;0;L;6A02;;;;N;;;;;
+F95D;CJK COMPATIBILITY IDEOGRAPH-F95D;Lo;0;L;8AFE;;;;N;;;;;
+F95E;CJK COMPATIBILITY IDEOGRAPH-F95E;Lo;0;L;4E39;;;;N;;;;;
+F95F;CJK COMPATIBILITY IDEOGRAPH-F95F;Lo;0;L;5BE7;;;;N;;;;;
+F960;CJK COMPATIBILITY IDEOGRAPH-F960;Lo;0;L;6012;;;;N;;;;;
+F961;CJK COMPATIBILITY IDEOGRAPH-F961;Lo;0;L;7387;;;;N;;;;;
+F962;CJK COMPATIBILITY IDEOGRAPH-F962;Lo;0;L;7570;;;;N;;;;;
+F963;CJK COMPATIBILITY IDEOGRAPH-F963;Lo;0;L;5317;;;;N;;;;;
+F964;CJK COMPATIBILITY IDEOGRAPH-F964;Lo;0;L;78FB;;;;N;;;;;
+F965;CJK COMPATIBILITY IDEOGRAPH-F965;Lo;0;L;4FBF;;;;N;;;;;
+F966;CJK COMPATIBILITY IDEOGRAPH-F966;Lo;0;L;5FA9;;;;N;;;;;
+F967;CJK COMPATIBILITY IDEOGRAPH-F967;Lo;0;L;4E0D;;;;N;;;;;
+F968;CJK COMPATIBILITY IDEOGRAPH-F968;Lo;0;L;6CCC;;;;N;;;;;
+F969;CJK COMPATIBILITY IDEOGRAPH-F969;Lo;0;L;6578;;;;N;;;;;
+F96A;CJK COMPATIBILITY IDEOGRAPH-F96A;Lo;0;L;7D22;;;;N;;;;;
+F96B;CJK COMPATIBILITY IDEOGRAPH-F96B;Lo;0;L;53C3;;;3;N;;;;;
+F96C;CJK COMPATIBILITY IDEOGRAPH-F96C;Lo;0;L;585E;;;;N;;;;;
+F96D;CJK COMPATIBILITY IDEOGRAPH-F96D;Lo;0;L;7701;;;;N;;;;;
+F96E;CJK COMPATIBILITY IDEOGRAPH-F96E;Lo;0;L;8449;;;;N;;;;;
+F96F;CJK COMPATIBILITY IDEOGRAPH-F96F;Lo;0;L;8AAA;;;;N;;;;;
+F970;CJK COMPATIBILITY IDEOGRAPH-F970;Lo;0;L;6BBA;;;;N;;;;;
+F971;CJK COMPATIBILITY IDEOGRAPH-F971;Lo;0;L;8FB0;;;;N;;;;;
+F972;CJK COMPATIBILITY IDEOGRAPH-F972;Lo;0;L;6C88;;;;N;;;;;
+F973;CJK COMPATIBILITY IDEOGRAPH-F973;Lo;0;L;62FE;;;10;N;;;;;
+F974;CJK COMPATIBILITY IDEOGRAPH-F974;Lo;0;L;82E5;;;;N;;;;;
+F975;CJK COMPATIBILITY IDEOGRAPH-F975;Lo;0;L;63A0;;;;N;;;;;
+F976;CJK COMPATIBILITY IDEOGRAPH-F976;Lo;0;L;7565;;;;N;;;;;
+F977;CJK COMPATIBILITY IDEOGRAPH-F977;Lo;0;L;4EAE;;;;N;;;;;
+F978;CJK COMPATIBILITY IDEOGRAPH-F978;Lo;0;L;5169;;;2;N;;;;;
+F979;CJK COMPATIBILITY IDEOGRAPH-F979;Lo;0;L;51C9;;;;N;;;;;
+F97A;CJK COMPATIBILITY IDEOGRAPH-F97A;Lo;0;L;6881;;;;N;;;;;
+F97B;CJK COMPATIBILITY IDEOGRAPH-F97B;Lo;0;L;7CE7;;;;N;;;;;
+F97C;CJK COMPATIBILITY IDEOGRAPH-F97C;Lo;0;L;826F;;;;N;;;;;
+F97D;CJK COMPATIBILITY IDEOGRAPH-F97D;Lo;0;L;8AD2;;;;N;;;;;
+F97E;CJK COMPATIBILITY IDEOGRAPH-F97E;Lo;0;L;91CF;;;;N;;;;;
+F97F;CJK COMPATIBILITY IDEOGRAPH-F97F;Lo;0;L;52F5;;;;N;;;;;
+F980;CJK COMPATIBILITY IDEOGRAPH-F980;Lo;0;L;5442;;;;N;;;;;
+F981;CJK COMPATIBILITY IDEOGRAPH-F981;Lo;0;L;5973;;;;N;;;;;
+F982;CJK COMPATIBILITY IDEOGRAPH-F982;Lo;0;L;5EEC;;;;N;;;;;
+F983;CJK COMPATIBILITY IDEOGRAPH-F983;Lo;0;L;65C5;;;;N;;;;;
+F984;CJK COMPATIBILITY IDEOGRAPH-F984;Lo;0;L;6FFE;;;;N;;;;;
+F985;CJK COMPATIBILITY IDEOGRAPH-F985;Lo;0;L;792A;;;;N;;;;;
+F986;CJK COMPATIBILITY IDEOGRAPH-F986;Lo;0;L;95AD;;;;N;;;;;
+F987;CJK COMPATIBILITY IDEOGRAPH-F987;Lo;0;L;9A6A;;;;N;;;;;
+F988;CJK COMPATIBILITY IDEOGRAPH-F988;Lo;0;L;9E97;;;;N;;;;;
+F989;CJK COMPATIBILITY IDEOGRAPH-F989;Lo;0;L;9ECE;;;;N;;;;;
+F98A;CJK COMPATIBILITY IDEOGRAPH-F98A;Lo;0;L;529B;;;;N;;;;;
+F98B;CJK COMPATIBILITY IDEOGRAPH-F98B;Lo;0;L;66C6;;;;N;;;;;
+F98C;CJK COMPATIBILITY IDEOGRAPH-F98C;Lo;0;L;6B77;;;;N;;;;;
+F98D;CJK COMPATIBILITY IDEOGRAPH-F98D;Lo;0;L;8F62;;;;N;;;;;
+F98E;CJK COMPATIBILITY IDEOGRAPH-F98E;Lo;0;L;5E74;;;;N;;;;;
+F98F;CJK COMPATIBILITY IDEOGRAPH-F98F;Lo;0;L;6190;;;;N;;;;;
+F990;CJK COMPATIBILITY IDEOGRAPH-F990;Lo;0;L;6200;;;;N;;;;;
+F991;CJK COMPATIBILITY IDEOGRAPH-F991;Lo;0;L;649A;;;;N;;;;;
+F992;CJK COMPATIBILITY IDEOGRAPH-F992;Lo;0;L;6F23;;;;N;;;;;
+F993;CJK COMPATIBILITY IDEOGRAPH-F993;Lo;0;L;7149;;;;N;;;;;
+F994;CJK COMPATIBILITY IDEOGRAPH-F994;Lo;0;L;7489;;;;N;;;;;
+F995;CJK COMPATIBILITY IDEOGRAPH-F995;Lo;0;L;79CA;;;;N;;;;;
+F996;CJK COMPATIBILITY IDEOGRAPH-F996;Lo;0;L;7DF4;;;;N;;;;;
+F997;CJK COMPATIBILITY IDEOGRAPH-F997;Lo;0;L;806F;;;;N;;;;;
+F998;CJK COMPATIBILITY IDEOGRAPH-F998;Lo;0;L;8F26;;;;N;;;;;
+F999;CJK COMPATIBILITY IDEOGRAPH-F999;Lo;0;L;84EE;;;;N;;;;;
+F99A;CJK COMPATIBILITY IDEOGRAPH-F99A;Lo;0;L;9023;;;;N;;;;;
+F99B;CJK COMPATIBILITY IDEOGRAPH-F99B;Lo;0;L;934A;;;;N;;;;;
+F99C;CJK COMPATIBILITY IDEOGRAPH-F99C;Lo;0;L;5217;;;;N;;;;;
+F99D;CJK COMPATIBILITY IDEOGRAPH-F99D;Lo;0;L;52A3;;;;N;;;;;
+F99E;CJK COMPATIBILITY IDEOGRAPH-F99E;Lo;0;L;54BD;;;;N;;;;;
+F99F;CJK COMPATIBILITY IDEOGRAPH-F99F;Lo;0;L;70C8;;;;N;;;;;
+F9A0;CJK COMPATIBILITY IDEOGRAPH-F9A0;Lo;0;L;88C2;;;;N;;;;;
+F9A1;CJK COMPATIBILITY IDEOGRAPH-F9A1;Lo;0;L;8AAA;;;;N;;;;;
+F9A2;CJK COMPATIBILITY IDEOGRAPH-F9A2;Lo;0;L;5EC9;;;;N;;;;;
+F9A3;CJK COMPATIBILITY IDEOGRAPH-F9A3;Lo;0;L;5FF5;;;;N;;;;;
+F9A4;CJK COMPATIBILITY IDEOGRAPH-F9A4;Lo;0;L;637B;;;;N;;;;;
+F9A5;CJK COMPATIBILITY IDEOGRAPH-F9A5;Lo;0;L;6BAE;;;;N;;;;;
+F9A6;CJK COMPATIBILITY IDEOGRAPH-F9A6;Lo;0;L;7C3E;;;;N;;;;;
+F9A7;CJK COMPATIBILITY IDEOGRAPH-F9A7;Lo;0;L;7375;;;;N;;;;;
+F9A8;CJK COMPATIBILITY IDEOGRAPH-F9A8;Lo;0;L;4EE4;;;;N;;;;;
+F9A9;CJK COMPATIBILITY IDEOGRAPH-F9A9;Lo;0;L;56F9;;;;N;;;;;
+F9AA;CJK COMPATIBILITY IDEOGRAPH-F9AA;Lo;0;L;5BE7;;;;N;;;;;
+F9AB;CJK COMPATIBILITY IDEOGRAPH-F9AB;Lo;0;L;5DBA;;;;N;;;;;
+F9AC;CJK COMPATIBILITY IDEOGRAPH-F9AC;Lo;0;L;601C;;;;N;;;;;
+F9AD;CJK COMPATIBILITY IDEOGRAPH-F9AD;Lo;0;L;73B2;;;;N;;;;;
+F9AE;CJK COMPATIBILITY IDEOGRAPH-F9AE;Lo;0;L;7469;;;;N;;;;;
+F9AF;CJK COMPATIBILITY IDEOGRAPH-F9AF;Lo;0;L;7F9A;;;;N;;;;;
+F9B0;CJK COMPATIBILITY IDEOGRAPH-F9B0;Lo;0;L;8046;;;;N;;;;;
+F9B1;CJK COMPATIBILITY IDEOGRAPH-F9B1;Lo;0;L;9234;;;;N;;;;;
+F9B2;CJK COMPATIBILITY IDEOGRAPH-F9B2;Lo;0;L;96F6;;;0;N;;;;;
+F9B3;CJK COMPATIBILITY IDEOGRAPH-F9B3;Lo;0;L;9748;;;;N;;;;;
+F9B4;CJK COMPATIBILITY IDEOGRAPH-F9B4;Lo;0;L;9818;;;;N;;;;;
+F9B5;CJK COMPATIBILITY IDEOGRAPH-F9B5;Lo;0;L;4F8B;;;;N;;;;;
+F9B6;CJK COMPATIBILITY IDEOGRAPH-F9B6;Lo;0;L;79AE;;;;N;;;;;
+F9B7;CJK COMPATIBILITY IDEOGRAPH-F9B7;Lo;0;L;91B4;;;;N;;;;;
+F9B8;CJK COMPATIBILITY IDEOGRAPH-F9B8;Lo;0;L;96B8;;;;N;;;;;
+F9B9;CJK COMPATIBILITY IDEOGRAPH-F9B9;Lo;0;L;60E1;;;;N;;;;;
+F9BA;CJK COMPATIBILITY IDEOGRAPH-F9BA;Lo;0;L;4E86;;;;N;;;;;
+F9BB;CJK COMPATIBILITY IDEOGRAPH-F9BB;Lo;0;L;50DA;;;;N;;;;;
+F9BC;CJK COMPATIBILITY IDEOGRAPH-F9BC;Lo;0;L;5BEE;;;;N;;;;;
+F9BD;CJK COMPATIBILITY IDEOGRAPH-F9BD;Lo;0;L;5C3F;;;;N;;;;;
+F9BE;CJK COMPATIBILITY IDEOGRAPH-F9BE;Lo;0;L;6599;;;;N;;;;;
+F9BF;CJK COMPATIBILITY IDEOGRAPH-F9BF;Lo;0;L;6A02;;;;N;;;;;
+F9C0;CJK COMPATIBILITY IDEOGRAPH-F9C0;Lo;0;L;71CE;;;;N;;;;;
+F9C1;CJK COMPATIBILITY IDEOGRAPH-F9C1;Lo;0;L;7642;;;;N;;;;;
+F9C2;CJK COMPATIBILITY IDEOGRAPH-F9C2;Lo;0;L;84FC;;;;N;;;;;
+F9C3;CJK COMPATIBILITY IDEOGRAPH-F9C3;Lo;0;L;907C;;;;N;;;;;
+F9C4;CJK COMPATIBILITY IDEOGRAPH-F9C4;Lo;0;L;9F8D;;;;N;;;;;
+F9C5;CJK COMPATIBILITY IDEOGRAPH-F9C5;Lo;0;L;6688;;;;N;;;;;
+F9C6;CJK COMPATIBILITY IDEOGRAPH-F9C6;Lo;0;L;962E;;;;N;;;;;
+F9C7;CJK COMPATIBILITY IDEOGRAPH-F9C7;Lo;0;L;5289;;;;N;;;;;
+F9C8;CJK COMPATIBILITY IDEOGRAPH-F9C8;Lo;0;L;677B;;;;N;;;;;
+F9C9;CJK COMPATIBILITY IDEOGRAPH-F9C9;Lo;0;L;67F3;;;;N;;;;;
+F9CA;CJK COMPATIBILITY IDEOGRAPH-F9CA;Lo;0;L;6D41;;;;N;;;;;
+F9CB;CJK COMPATIBILITY IDEOGRAPH-F9CB;Lo;0;L;6E9C;;;;N;;;;;
+F9CC;CJK COMPATIBILITY IDEOGRAPH-F9CC;Lo;0;L;7409;;;;N;;;;;
+F9CD;CJK COMPATIBILITY IDEOGRAPH-F9CD;Lo;0;L;7559;;;;N;;;;;
+F9CE;CJK COMPATIBILITY IDEOGRAPH-F9CE;Lo;0;L;786B;;;;N;;;;;
+F9CF;CJK COMPATIBILITY IDEOGRAPH-F9CF;Lo;0;L;7D10;;;;N;;;;;
+F9D0;CJK COMPATIBILITY IDEOGRAPH-F9D0;Lo;0;L;985E;;;;N;;;;;
+F9D1;CJK COMPATIBILITY IDEOGRAPH-F9D1;Lo;0;L;516D;;;6;N;;;;;
+F9D2;CJK COMPATIBILITY IDEOGRAPH-F9D2;Lo;0;L;622E;;;;N;;;;;
+F9D3;CJK COMPATIBILITY IDEOGRAPH-F9D3;Lo;0;L;9678;;;6;N;;;;;
+F9D4;CJK COMPATIBILITY IDEOGRAPH-F9D4;Lo;0;L;502B;;;;N;;;;;
+F9D5;CJK COMPATIBILITY IDEOGRAPH-F9D5;Lo;0;L;5D19;;;;N;;;;;
+F9D6;CJK COMPATIBILITY IDEOGRAPH-F9D6;Lo;0;L;6DEA;;;;N;;;;;
+F9D7;CJK COMPATIBILITY IDEOGRAPH-F9D7;Lo;0;L;8F2A;;;;N;;;;;
+F9D8;CJK COMPATIBILITY IDEOGRAPH-F9D8;Lo;0;L;5F8B;;;;N;;;;;
+F9D9;CJK COMPATIBILITY IDEOGRAPH-F9D9;Lo;0;L;6144;;;;N;;;;;
+F9DA;CJK COMPATIBILITY IDEOGRAPH-F9DA;Lo;0;L;6817;;;;N;;;;;
+F9DB;CJK COMPATIBILITY IDEOGRAPH-F9DB;Lo;0;L;7387;;;;N;;;;;
+F9DC;CJK COMPATIBILITY IDEOGRAPH-F9DC;Lo;0;L;9686;;;;N;;;;;
+F9DD;CJK COMPATIBILITY IDEOGRAPH-F9DD;Lo;0;L;5229;;;;N;;;;;
+F9DE;CJK COMPATIBILITY IDEOGRAPH-F9DE;Lo;0;L;540F;;;;N;;;;;
+F9DF;CJK COMPATIBILITY IDEOGRAPH-F9DF;Lo;0;L;5C65;;;;N;;;;;
+F9E0;CJK COMPATIBILITY IDEOGRAPH-F9E0;Lo;0;L;6613;;;;N;;;;;
+F9E1;CJK COMPATIBILITY IDEOGRAPH-F9E1;Lo;0;L;674E;;;;N;;;;;
+F9E2;CJK COMPATIBILITY IDEOGRAPH-F9E2;Lo;0;L;68A8;;;;N;;;;;
+F9E3;CJK COMPATIBILITY IDEOGRAPH-F9E3;Lo;0;L;6CE5;;;;N;;;;;
+F9E4;CJK COMPATIBILITY IDEOGRAPH-F9E4;Lo;0;L;7406;;;;N;;;;;
+F9E5;CJK COMPATIBILITY IDEOGRAPH-F9E5;Lo;0;L;75E2;;;;N;;;;;
+F9E6;CJK COMPATIBILITY IDEOGRAPH-F9E6;Lo;0;L;7F79;;;;N;;;;;
+F9E7;CJK COMPATIBILITY IDEOGRAPH-F9E7;Lo;0;L;88CF;;;;N;;;;;
+F9E8;CJK COMPATIBILITY IDEOGRAPH-F9E8;Lo;0;L;88E1;;;;N;;;;;
+F9E9;CJK COMPATIBILITY IDEOGRAPH-F9E9;Lo;0;L;91CC;;;;N;;;;;
+F9EA;CJK COMPATIBILITY IDEOGRAPH-F9EA;Lo;0;L;96E2;;;;N;;;;;
+F9EB;CJK COMPATIBILITY IDEOGRAPH-F9EB;Lo;0;L;533F;;;;N;;;;;
+F9EC;CJK COMPATIBILITY IDEOGRAPH-F9EC;Lo;0;L;6EBA;;;;N;;;;;
+F9ED;CJK COMPATIBILITY IDEOGRAPH-F9ED;Lo;0;L;541D;;;;N;;;;;
+F9EE;CJK COMPATIBILITY IDEOGRAPH-F9EE;Lo;0;L;71D0;;;;N;;;;;
+F9EF;CJK COMPATIBILITY IDEOGRAPH-F9EF;Lo;0;L;7498;;;;N;;;;;
+F9F0;CJK COMPATIBILITY IDEOGRAPH-F9F0;Lo;0;L;85FA;;;;N;;;;;
+F9F1;CJK COMPATIBILITY IDEOGRAPH-F9F1;Lo;0;L;96A3;;;;N;;;;;
+F9F2;CJK COMPATIBILITY IDEOGRAPH-F9F2;Lo;0;L;9C57;;;;N;;;;;
+F9F3;CJK COMPATIBILITY IDEOGRAPH-F9F3;Lo;0;L;9E9F;;;;N;;;;;
+F9F4;CJK COMPATIBILITY IDEOGRAPH-F9F4;Lo;0;L;6797;;;;N;;;;;
+F9F5;CJK COMPATIBILITY IDEOGRAPH-F9F5;Lo;0;L;6DCB;;;;N;;;;;
+F9F6;CJK COMPATIBILITY IDEOGRAPH-F9F6;Lo;0;L;81E8;;;;N;;;;;
+F9F7;CJK COMPATIBILITY IDEOGRAPH-F9F7;Lo;0;L;7ACB;;;;N;;;;;
+F9F8;CJK COMPATIBILITY IDEOGRAPH-F9F8;Lo;0;L;7B20;;;;N;;;;;
+F9F9;CJK COMPATIBILITY IDEOGRAPH-F9F9;Lo;0;L;7C92;;;;N;;;;;
+F9FA;CJK COMPATIBILITY IDEOGRAPH-F9FA;Lo;0;L;72C0;;;;N;;;;;
+F9FB;CJK COMPATIBILITY IDEOGRAPH-F9FB;Lo;0;L;7099;;;;N;;;;;
+F9FC;CJK COMPATIBILITY IDEOGRAPH-F9FC;Lo;0;L;8B58;;;;N;;;;;
+F9FD;CJK COMPATIBILITY IDEOGRAPH-F9FD;Lo;0;L;4EC0;;;10;N;;;;;
+F9FE;CJK COMPATIBILITY IDEOGRAPH-F9FE;Lo;0;L;8336;;;;N;;;;;
+F9FF;CJK COMPATIBILITY IDEOGRAPH-F9FF;Lo;0;L;523A;;;;N;;;;;
+FA00;CJK COMPATIBILITY IDEOGRAPH-FA00;Lo;0;L;5207;;;;N;;;;;
+FA01;CJK COMPATIBILITY IDEOGRAPH-FA01;Lo;0;L;5EA6;;;;N;;;;;
+FA02;CJK COMPATIBILITY IDEOGRAPH-FA02;Lo;0;L;62D3;;;;N;;;;;
+FA03;CJK COMPATIBILITY IDEOGRAPH-FA03;Lo;0;L;7CD6;;;;N;;;;;
+FA04;CJK COMPATIBILITY IDEOGRAPH-FA04;Lo;0;L;5B85;;;;N;;;;;
+FA05;CJK COMPATIBILITY IDEOGRAPH-FA05;Lo;0;L;6D1E;;;;N;;;;;
+FA06;CJK COMPATIBILITY IDEOGRAPH-FA06;Lo;0;L;66B4;;;;N;;;;;
+FA07;CJK COMPATIBILITY IDEOGRAPH-FA07;Lo;0;L;8F3B;;;;N;;;;;
+FA08;CJK COMPATIBILITY IDEOGRAPH-FA08;Lo;0;L;884C;;;;N;;;;;
+FA09;CJK COMPATIBILITY IDEOGRAPH-FA09;Lo;0;L;964D;;;;N;;;;;
+FA0A;CJK COMPATIBILITY IDEOGRAPH-FA0A;Lo;0;L;898B;;;;N;;;;;
+FA0B;CJK COMPATIBILITY IDEOGRAPH-FA0B;Lo;0;L;5ED3;;;;N;;;;;
+FA0C;CJK COMPATIBILITY IDEOGRAPH-FA0C;Lo;0;L;5140;;;;N;;;;;
+FA0D;CJK COMPATIBILITY IDEOGRAPH-FA0D;Lo;0;L;55C0;;;;N;;;;;
+FA0E;CJK COMPATIBILITY IDEOGRAPH-FA0E;Lo;0;L;;;;;N;;;;;
+FA0F;CJK COMPATIBILITY IDEOGRAPH-FA0F;Lo;0;L;;;;;N;;;;;
+FA10;CJK COMPATIBILITY IDEOGRAPH-FA10;Lo;0;L;585A;;;;N;;;;;
+FA11;CJK COMPATIBILITY IDEOGRAPH-FA11;Lo;0;L;;;;;N;;;;;
+FA12;CJK COMPATIBILITY IDEOGRAPH-FA12;Lo;0;L;6674;;;;N;;;;;
+FA13;CJK COMPATIBILITY IDEOGRAPH-FA13;Lo;0;L;;;;;N;;;;;
+FA14;CJK COMPATIBILITY IDEOGRAPH-FA14;Lo;0;L;;;;;N;;;;;
+FA15;CJK COMPATIBILITY IDEOGRAPH-FA15;Lo;0;L;51DE;;;;N;;;;;
+FA16;CJK COMPATIBILITY IDEOGRAPH-FA16;Lo;0;L;732A;;;;N;;;;;
+FA17;CJK COMPATIBILITY IDEOGRAPH-FA17;Lo;0;L;76CA;;;;N;;;;;
+FA18;CJK COMPATIBILITY IDEOGRAPH-FA18;Lo;0;L;793C;;;;N;;;;;
+FA19;CJK COMPATIBILITY IDEOGRAPH-FA19;Lo;0;L;795E;;;;N;;;;;
+FA1A;CJK COMPATIBILITY IDEOGRAPH-FA1A;Lo;0;L;7965;;;;N;;;;;
+FA1B;CJK COMPATIBILITY IDEOGRAPH-FA1B;Lo;0;L;798F;;;;N;;;;;
+FA1C;CJK COMPATIBILITY IDEOGRAPH-FA1C;Lo;0;L;9756;;;;N;;;;;
+FA1D;CJK COMPATIBILITY IDEOGRAPH-FA1D;Lo;0;L;7CBE;;;;N;;;;;
+FA1E;CJK COMPATIBILITY IDEOGRAPH-FA1E;Lo;0;L;7FBD;;;;N;;;;;
+FA1F;CJK COMPATIBILITY IDEOGRAPH-FA1F;Lo;0;L;;;;;N;;*;;;
+FA20;CJK COMPATIBILITY IDEOGRAPH-FA20;Lo;0;L;8612;;;;N;;;;;
+FA21;CJK COMPATIBILITY IDEOGRAPH-FA21;Lo;0;L;;;;;N;;;;;
+FA22;CJK COMPATIBILITY IDEOGRAPH-FA22;Lo;0;L;8AF8;;;;N;;;;;
+FA23;CJK COMPATIBILITY IDEOGRAPH-FA23;Lo;0;L;;;;;N;;*;;;
+FA24;CJK COMPATIBILITY IDEOGRAPH-FA24;Lo;0;L;;;;;N;;;;;
+FA25;CJK COMPATIBILITY IDEOGRAPH-FA25;Lo;0;L;9038;;;;N;;;;;
+FA26;CJK COMPATIBILITY IDEOGRAPH-FA26;Lo;0;L;90FD;;;;N;;;;;
+FA27;CJK COMPATIBILITY IDEOGRAPH-FA27;Lo;0;L;;;;;N;;;;;
+FA28;CJK COMPATIBILITY IDEOGRAPH-FA28;Lo;0;L;;;;;N;;;;;
+FA29;CJK COMPATIBILITY IDEOGRAPH-FA29;Lo;0;L;;;;;N;;;;;
+FA2A;CJK COMPATIBILITY IDEOGRAPH-FA2A;Lo;0;L;98EF;;;;N;;;;;
+FA2B;CJK COMPATIBILITY IDEOGRAPH-FA2B;Lo;0;L;98FC;;;;N;;;;;
+FA2C;CJK COMPATIBILITY IDEOGRAPH-FA2C;Lo;0;L;9928;;;;N;;;;;
+FA2D;CJK COMPATIBILITY IDEOGRAPH-FA2D;Lo;0;L;9DB4;;;;N;;;;;
+FA30;CJK COMPATIBILITY IDEOGRAPH-FA30;Lo;0;L;4FAE;;;;N;;;;;
+FA31;CJK COMPATIBILITY IDEOGRAPH-FA31;Lo;0;L;50E7;;;;N;;;;;
+FA32;CJK COMPATIBILITY IDEOGRAPH-FA32;Lo;0;L;514D;;;;N;;;;;
+FA33;CJK COMPATIBILITY IDEOGRAPH-FA33;Lo;0;L;52C9;;;;N;;;;;
+FA34;CJK COMPATIBILITY IDEOGRAPH-FA34;Lo;0;L;52E4;;;;N;;;;;
+FA35;CJK COMPATIBILITY IDEOGRAPH-FA35;Lo;0;L;5351;;;;N;;;;;
+FA36;CJK COMPATIBILITY IDEOGRAPH-FA36;Lo;0;L;559D;;;;N;;;;;
+FA37;CJK COMPATIBILITY IDEOGRAPH-FA37;Lo;0;L;5606;;;;N;;;;;
+FA38;CJK COMPATIBILITY IDEOGRAPH-FA38;Lo;0;L;5668;;;;N;;;;;
+FA39;CJK COMPATIBILITY IDEOGRAPH-FA39;Lo;0;L;5840;;;;N;;;;;
+FA3A;CJK COMPATIBILITY IDEOGRAPH-FA3A;Lo;0;L;58A8;;;;N;;;;;
+FA3B;CJK COMPATIBILITY IDEOGRAPH-FA3B;Lo;0;L;5C64;;;;N;;;;;
+FA3C;CJK COMPATIBILITY IDEOGRAPH-FA3C;Lo;0;L;5C6E;;;;N;;;;;
+FA3D;CJK COMPATIBILITY IDEOGRAPH-FA3D;Lo;0;L;6094;;;;N;;;;;
+FA3E;CJK COMPATIBILITY IDEOGRAPH-FA3E;Lo;0;L;6168;;;;N;;;;;
+FA3F;CJK COMPATIBILITY IDEOGRAPH-FA3F;Lo;0;L;618E;;;;N;;;;;
+FA40;CJK COMPATIBILITY IDEOGRAPH-FA40;Lo;0;L;61F2;;;;N;;;;;
+FA41;CJK COMPATIBILITY IDEOGRAPH-FA41;Lo;0;L;654F;;;;N;;;;;
+FA42;CJK COMPATIBILITY IDEOGRAPH-FA42;Lo;0;L;65E2;;;;N;;;;;
+FA43;CJK COMPATIBILITY IDEOGRAPH-FA43;Lo;0;L;6691;;;;N;;;;;
+FA44;CJK COMPATIBILITY IDEOGRAPH-FA44;Lo;0;L;6885;;;;N;;;;;
+FA45;CJK COMPATIBILITY IDEOGRAPH-FA45;Lo;0;L;6D77;;;;N;;;;;
+FA46;CJK COMPATIBILITY IDEOGRAPH-FA46;Lo;0;L;6E1A;;;;N;;;;;
+FA47;CJK COMPATIBILITY IDEOGRAPH-FA47;Lo;0;L;6F22;;;;N;;;;;
+FA48;CJK COMPATIBILITY IDEOGRAPH-FA48;Lo;0;L;716E;;;;N;;;;;
+FA49;CJK COMPATIBILITY IDEOGRAPH-FA49;Lo;0;L;722B;;;;N;;;;;
+FA4A;CJK COMPATIBILITY IDEOGRAPH-FA4A;Lo;0;L;7422;;;;N;;;;;
+FA4B;CJK COMPATIBILITY IDEOGRAPH-FA4B;Lo;0;L;7891;;;;N;;;;;
+FA4C;CJK COMPATIBILITY IDEOGRAPH-FA4C;Lo;0;L;793E;;;;N;;;;;
+FA4D;CJK COMPATIBILITY IDEOGRAPH-FA4D;Lo;0;L;7949;;;;N;;;;;
+FA4E;CJK COMPATIBILITY IDEOGRAPH-FA4E;Lo;0;L;7948;;;;N;;;;;
+FA4F;CJK COMPATIBILITY IDEOGRAPH-FA4F;Lo;0;L;7950;;;;N;;;;;
+FA50;CJK COMPATIBILITY IDEOGRAPH-FA50;Lo;0;L;7956;;;;N;;;;;
+FA51;CJK COMPATIBILITY IDEOGRAPH-FA51;Lo;0;L;795D;;;;N;;;;;
+FA52;CJK COMPATIBILITY IDEOGRAPH-FA52;Lo;0;L;798D;;;;N;;;;;
+FA53;CJK COMPATIBILITY IDEOGRAPH-FA53;Lo;0;L;798E;;;;N;;;;;
+FA54;CJK COMPATIBILITY IDEOGRAPH-FA54;Lo;0;L;7A40;;;;N;;;;;
+FA55;CJK COMPATIBILITY IDEOGRAPH-FA55;Lo;0;L;7A81;;;;N;;;;;
+FA56;CJK COMPATIBILITY IDEOGRAPH-FA56;Lo;0;L;7BC0;;;;N;;;;;
+FA57;CJK COMPATIBILITY IDEOGRAPH-FA57;Lo;0;L;7DF4;;;;N;;;;;
+FA58;CJK COMPATIBILITY IDEOGRAPH-FA58;Lo;0;L;7E09;;;;N;;;;;
+FA59;CJK COMPATIBILITY IDEOGRAPH-FA59;Lo;0;L;7E41;;;;N;;;;;
+FA5A;CJK COMPATIBILITY IDEOGRAPH-FA5A;Lo;0;L;7F72;;;;N;;;;;
+FA5B;CJK COMPATIBILITY IDEOGRAPH-FA5B;Lo;0;L;8005;;;;N;;;;;
+FA5C;CJK COMPATIBILITY IDEOGRAPH-FA5C;Lo;0;L;81ED;;;;N;;;;;
+FA5D;CJK COMPATIBILITY IDEOGRAPH-FA5D;Lo;0;L;8279;;;;N;;;;;
+FA5E;CJK COMPATIBILITY IDEOGRAPH-FA5E;Lo;0;L;8279;;;;N;;;;;
+FA5F;CJK COMPATIBILITY IDEOGRAPH-FA5F;Lo;0;L;8457;;;;N;;;;;
+FA60;CJK COMPATIBILITY IDEOGRAPH-FA60;Lo;0;L;8910;;;;N;;;;;
+FA61;CJK COMPATIBILITY IDEOGRAPH-FA61;Lo;0;L;8996;;;;N;;;;;
+FA62;CJK COMPATIBILITY IDEOGRAPH-FA62;Lo;0;L;8B01;;;;N;;;;;
+FA63;CJK COMPATIBILITY IDEOGRAPH-FA63;Lo;0;L;8B39;;;;N;;;;;
+FA64;CJK COMPATIBILITY IDEOGRAPH-FA64;Lo;0;L;8CD3;;;;N;;;;;
+FA65;CJK COMPATIBILITY IDEOGRAPH-FA65;Lo;0;L;8D08;;;;N;;;;;
+FA66;CJK COMPATIBILITY IDEOGRAPH-FA66;Lo;0;L;8FB6;;;;N;;;;;
+FA67;CJK COMPATIBILITY IDEOGRAPH-FA67;Lo;0;L;9038;;;;N;;;;;
+FA68;CJK COMPATIBILITY IDEOGRAPH-FA68;Lo;0;L;96E3;;;;N;;;;;
+FA69;CJK COMPATIBILITY IDEOGRAPH-FA69;Lo;0;L;97FF;;;;N;;;;;
+FA6A;CJK COMPATIBILITY IDEOGRAPH-FA6A;Lo;0;L;983B;;;;N;;;;;
+FA70;CJK COMPATIBILITY IDEOGRAPH-FA70;Lo;0;L;4E26;;;;N;;;;;
+FA71;CJK COMPATIBILITY IDEOGRAPH-FA71;Lo;0;L;51B5;;;;N;;;;;
+FA72;CJK COMPATIBILITY IDEOGRAPH-FA72;Lo;0;L;5168;;;;N;;;;;
+FA73;CJK COMPATIBILITY IDEOGRAPH-FA73;Lo;0;L;4F80;;;;N;;;;;
+FA74;CJK COMPATIBILITY IDEOGRAPH-FA74;Lo;0;L;5145;;;;N;;;;;
+FA75;CJK COMPATIBILITY IDEOGRAPH-FA75;Lo;0;L;5180;;;;N;;;;;
+FA76;CJK COMPATIBILITY IDEOGRAPH-FA76;Lo;0;L;52C7;;;;N;;;;;
+FA77;CJK COMPATIBILITY IDEOGRAPH-FA77;Lo;0;L;52FA;;;;N;;;;;
+FA78;CJK COMPATIBILITY IDEOGRAPH-FA78;Lo;0;L;559D;;;;N;;;;;
+FA79;CJK COMPATIBILITY IDEOGRAPH-FA79;Lo;0;L;5555;;;;N;;;;;
+FA7A;CJK COMPATIBILITY IDEOGRAPH-FA7A;Lo;0;L;5599;;;;N;;;;;
+FA7B;CJK COMPATIBILITY IDEOGRAPH-FA7B;Lo;0;L;55E2;;;;N;;;;;
+FA7C;CJK COMPATIBILITY IDEOGRAPH-FA7C;Lo;0;L;585A;;;;N;;;;;
+FA7D;CJK COMPATIBILITY IDEOGRAPH-FA7D;Lo;0;L;58B3;;;;N;;;;;
+FA7E;CJK COMPATIBILITY IDEOGRAPH-FA7E;Lo;0;L;5944;;;;N;;;;;
+FA7F;CJK COMPATIBILITY IDEOGRAPH-FA7F;Lo;0;L;5954;;;;N;;;;;
+FA80;CJK COMPATIBILITY IDEOGRAPH-FA80;Lo;0;L;5A62;;;;N;;;;;
+FA81;CJK COMPATIBILITY IDEOGRAPH-FA81;Lo;0;L;5B28;;;;N;;;;;
+FA82;CJK COMPATIBILITY IDEOGRAPH-FA82;Lo;0;L;5ED2;;;;N;;;;;
+FA83;CJK COMPATIBILITY IDEOGRAPH-FA83;Lo;0;L;5ED9;;;;N;;;;;
+FA84;CJK COMPATIBILITY IDEOGRAPH-FA84;Lo;0;L;5F69;;;;N;;;;;
+FA85;CJK COMPATIBILITY IDEOGRAPH-FA85;Lo;0;L;5FAD;;;;N;;;;;
+FA86;CJK COMPATIBILITY IDEOGRAPH-FA86;Lo;0;L;60D8;;;;N;;;;;
+FA87;CJK COMPATIBILITY IDEOGRAPH-FA87;Lo;0;L;614E;;;;N;;;;;
+FA88;CJK COMPATIBILITY IDEOGRAPH-FA88;Lo;0;L;6108;;;;N;;;;;
+FA89;CJK COMPATIBILITY IDEOGRAPH-FA89;Lo;0;L;618E;;;;N;;;;;
+FA8A;CJK COMPATIBILITY IDEOGRAPH-FA8A;Lo;0;L;6160;;;;N;;;;;
+FA8B;CJK COMPATIBILITY IDEOGRAPH-FA8B;Lo;0;L;61F2;;;;N;;;;;
+FA8C;CJK COMPATIBILITY IDEOGRAPH-FA8C;Lo;0;L;6234;;;;N;;;;;
+FA8D;CJK COMPATIBILITY IDEOGRAPH-FA8D;Lo;0;L;63C4;;;;N;;;;;
+FA8E;CJK COMPATIBILITY IDEOGRAPH-FA8E;Lo;0;L;641C;;;;N;;;;;
+FA8F;CJK COMPATIBILITY IDEOGRAPH-FA8F;Lo;0;L;6452;;;;N;;;;;
+FA90;CJK COMPATIBILITY IDEOGRAPH-FA90;Lo;0;L;6556;;;;N;;;;;
+FA91;CJK COMPATIBILITY IDEOGRAPH-FA91;Lo;0;L;6674;;;;N;;;;;
+FA92;CJK COMPATIBILITY IDEOGRAPH-FA92;Lo;0;L;6717;;;;N;;;;;
+FA93;CJK COMPATIBILITY IDEOGRAPH-FA93;Lo;0;L;671B;;;;N;;;;;
+FA94;CJK COMPATIBILITY IDEOGRAPH-FA94;Lo;0;L;6756;;;;N;;;;;
+FA95;CJK COMPATIBILITY IDEOGRAPH-FA95;Lo;0;L;6B79;;;;N;;;;;
+FA96;CJK COMPATIBILITY IDEOGRAPH-FA96;Lo;0;L;6BBA;;;;N;;;;;
+FA97;CJK COMPATIBILITY IDEOGRAPH-FA97;Lo;0;L;6D41;;;;N;;;;;
+FA98;CJK COMPATIBILITY IDEOGRAPH-FA98;Lo;0;L;6EDB;;;;N;;;;;
+FA99;CJK COMPATIBILITY IDEOGRAPH-FA99;Lo;0;L;6ECB;;;;N;;;;;
+FA9A;CJK COMPATIBILITY IDEOGRAPH-FA9A;Lo;0;L;6F22;;;;N;;;;;
+FA9B;CJK COMPATIBILITY IDEOGRAPH-FA9B;Lo;0;L;701E;;;;N;;;;;
+FA9C;CJK COMPATIBILITY IDEOGRAPH-FA9C;Lo;0;L;716E;;;;N;;;;;
+FA9D;CJK COMPATIBILITY IDEOGRAPH-FA9D;Lo;0;L;77A7;;;;N;;;;;
+FA9E;CJK COMPATIBILITY IDEOGRAPH-FA9E;Lo;0;L;7235;;;;N;;;;;
+FA9F;CJK COMPATIBILITY IDEOGRAPH-FA9F;Lo;0;L;72AF;;;;N;;;;;
+FAA0;CJK COMPATIBILITY IDEOGRAPH-FAA0;Lo;0;L;732A;;;;N;;;;;
+FAA1;CJK COMPATIBILITY IDEOGRAPH-FAA1;Lo;0;L;7471;;;;N;;;;;
+FAA2;CJK COMPATIBILITY IDEOGRAPH-FAA2;Lo;0;L;7506;;;;N;;;;;
+FAA3;CJK COMPATIBILITY IDEOGRAPH-FAA3;Lo;0;L;753B;;;;N;;;;;
+FAA4;CJK COMPATIBILITY IDEOGRAPH-FAA4;Lo;0;L;761D;;;;N;;;;;
+FAA5;CJK COMPATIBILITY IDEOGRAPH-FAA5;Lo;0;L;761F;;;;N;;;;;
+FAA6;CJK COMPATIBILITY IDEOGRAPH-FAA6;Lo;0;L;76CA;;;;N;;;;;
+FAA7;CJK COMPATIBILITY IDEOGRAPH-FAA7;Lo;0;L;76DB;;;;N;;;;;
+FAA8;CJK COMPATIBILITY IDEOGRAPH-FAA8;Lo;0;L;76F4;;;;N;;;;;
+FAA9;CJK COMPATIBILITY IDEOGRAPH-FAA9;Lo;0;L;774A;;;;N;;;;;
+FAAA;CJK COMPATIBILITY IDEOGRAPH-FAAA;Lo;0;L;7740;;;;N;;;;;
+FAAB;CJK COMPATIBILITY IDEOGRAPH-FAAB;Lo;0;L;78CC;;;;N;;;;;
+FAAC;CJK COMPATIBILITY IDEOGRAPH-FAAC;Lo;0;L;7AB1;;;;N;;;;;
+FAAD;CJK COMPATIBILITY IDEOGRAPH-FAAD;Lo;0;L;7BC0;;;;N;;;;;
+FAAE;CJK COMPATIBILITY IDEOGRAPH-FAAE;Lo;0;L;7C7B;;;;N;;;;;
+FAAF;CJK COMPATIBILITY IDEOGRAPH-FAAF;Lo;0;L;7D5B;;;;N;;;;;
+FAB0;CJK COMPATIBILITY IDEOGRAPH-FAB0;Lo;0;L;7DF4;;;;N;;;;;
+FAB1;CJK COMPATIBILITY IDEOGRAPH-FAB1;Lo;0;L;7F3E;;;;N;;;;;
+FAB2;CJK COMPATIBILITY IDEOGRAPH-FAB2;Lo;0;L;8005;;;;N;;;;;
+FAB3;CJK COMPATIBILITY IDEOGRAPH-FAB3;Lo;0;L;8352;;;;N;;;;;
+FAB4;CJK COMPATIBILITY IDEOGRAPH-FAB4;Lo;0;L;83EF;;;;N;;;;;
+FAB5;CJK COMPATIBILITY IDEOGRAPH-FAB5;Lo;0;L;8779;;;;N;;;;;
+FAB6;CJK COMPATIBILITY IDEOGRAPH-FAB6;Lo;0;L;8941;;;;N;;;;;
+FAB7;CJK COMPATIBILITY IDEOGRAPH-FAB7;Lo;0;L;8986;;;;N;;;;;
+FAB8;CJK COMPATIBILITY IDEOGRAPH-FAB8;Lo;0;L;8996;;;;N;;;;;
+FAB9;CJK COMPATIBILITY IDEOGRAPH-FAB9;Lo;0;L;8ABF;;;;N;;;;;
+FABA;CJK COMPATIBILITY IDEOGRAPH-FABA;Lo;0;L;8AF8;;;;N;;;;;
+FABB;CJK COMPATIBILITY IDEOGRAPH-FABB;Lo;0;L;8ACB;;;;N;;;;;
+FABC;CJK COMPATIBILITY IDEOGRAPH-FABC;Lo;0;L;8B01;;;;N;;;;;
+FABD;CJK COMPATIBILITY IDEOGRAPH-FABD;Lo;0;L;8AFE;;;;N;;;;;
+FABE;CJK COMPATIBILITY IDEOGRAPH-FABE;Lo;0;L;8AED;;;;N;;;;;
+FABF;CJK COMPATIBILITY IDEOGRAPH-FABF;Lo;0;L;8B39;;;;N;;;;;
+FAC0;CJK COMPATIBILITY IDEOGRAPH-FAC0;Lo;0;L;8B8A;;;;N;;;;;
+FAC1;CJK COMPATIBILITY IDEOGRAPH-FAC1;Lo;0;L;8D08;;;;N;;;;;
+FAC2;CJK COMPATIBILITY IDEOGRAPH-FAC2;Lo;0;L;8F38;;;;N;;;;;
+FAC3;CJK COMPATIBILITY IDEOGRAPH-FAC3;Lo;0;L;9072;;;;N;;;;;
+FAC4;CJK COMPATIBILITY IDEOGRAPH-FAC4;Lo;0;L;9199;;;;N;;;;;
+FAC5;CJK COMPATIBILITY IDEOGRAPH-FAC5;Lo;0;L;9276;;;;N;;;;;
+FAC6;CJK COMPATIBILITY IDEOGRAPH-FAC6;Lo;0;L;967C;;;;N;;;;;
+FAC7;CJK COMPATIBILITY IDEOGRAPH-FAC7;Lo;0;L;96E3;;;;N;;;;;
+FAC8;CJK COMPATIBILITY IDEOGRAPH-FAC8;Lo;0;L;9756;;;;N;;;;;
+FAC9;CJK COMPATIBILITY IDEOGRAPH-FAC9;Lo;0;L;97DB;;;;N;;;;;
+FACA;CJK COMPATIBILITY IDEOGRAPH-FACA;Lo;0;L;97FF;;;;N;;;;;
+FACB;CJK COMPATIBILITY IDEOGRAPH-FACB;Lo;0;L;980B;;;;N;;;;;
+FACC;CJK COMPATIBILITY IDEOGRAPH-FACC;Lo;0;L;983B;;;;N;;;;;
+FACD;CJK COMPATIBILITY IDEOGRAPH-FACD;Lo;0;L;9B12;;;;N;;;;;
+FACE;CJK COMPATIBILITY IDEOGRAPH-FACE;Lo;0;L;9F9C;;;;N;;;;;
+FACF;CJK COMPATIBILITY IDEOGRAPH-FACF;Lo;0;L;2284A;;;;N;;;;;
+FAD0;CJK COMPATIBILITY IDEOGRAPH-FAD0;Lo;0;L;22844;;;;N;;;;;
+FAD1;CJK COMPATIBILITY IDEOGRAPH-FAD1;Lo;0;L;233D5;;;;N;;;;;
+FAD2;CJK COMPATIBILITY IDEOGRAPH-FAD2;Lo;0;L;3B9D;;;;N;;;;;
+FAD3;CJK COMPATIBILITY IDEOGRAPH-FAD3;Lo;0;L;4018;;;;N;;;;;
+FAD4;CJK COMPATIBILITY IDEOGRAPH-FAD4;Lo;0;L;4039;;;;N;;;;;
+FAD5;CJK COMPATIBILITY IDEOGRAPH-FAD5;Lo;0;L;25249;;;;N;;;;;
+FAD6;CJK COMPATIBILITY IDEOGRAPH-FAD6;Lo;0;L;25CD0;;;;N;;;;;
+FAD7;CJK COMPATIBILITY IDEOGRAPH-FAD7;Lo;0;L;27ED3;;;;N;;;;;
+FAD8;CJK COMPATIBILITY IDEOGRAPH-FAD8;Lo;0;L;9F43;;;;N;;;;;
+FAD9;CJK COMPATIBILITY IDEOGRAPH-FAD9;Lo;0;L;9F8E;;;;N;;;;;
+FB00;LATIN SMALL LIGATURE FF;Ll;0;L;<compat> 0066 0066;;;;N;;;;;
+FB01;LATIN SMALL LIGATURE FI;Ll;0;L;<compat> 0066 0069;;;;N;;;;;
+FB02;LATIN SMALL LIGATURE FL;Ll;0;L;<compat> 0066 006C;;;;N;;;;;
+FB03;LATIN SMALL LIGATURE FFI;Ll;0;L;<compat> 0066 0066 0069;;;;N;;;;;
+FB04;LATIN SMALL LIGATURE FFL;Ll;0;L;<compat> 0066 0066 006C;;;;N;;;;;
+FB05;LATIN SMALL LIGATURE LONG S T;Ll;0;L;<compat> 017F 0074;;;;N;;;;;
+FB06;LATIN SMALL LIGATURE ST;Ll;0;L;<compat> 0073 0074;;;;N;;;;;
+FB13;ARMENIAN SMALL LIGATURE MEN NOW;Ll;0;L;<compat> 0574 0576;;;;N;;;;;
+FB14;ARMENIAN SMALL LIGATURE MEN ECH;Ll;0;L;<compat> 0574 0565;;;;N;;;;;
+FB15;ARMENIAN SMALL LIGATURE MEN INI;Ll;0;L;<compat> 0574 056B;;;;N;;;;;
+FB16;ARMENIAN SMALL LIGATURE VEW NOW;Ll;0;L;<compat> 057E 0576;;;;N;;;;;
+FB17;ARMENIAN SMALL LIGATURE MEN XEH;Ll;0;L;<compat> 0574 056D;;;;N;;;;;
+FB1D;HEBREW LETTER YOD WITH HIRIQ;Lo;0;R;05D9 05B4;;;;N;;;;;
+FB1E;HEBREW POINT JUDEO-SPANISH VARIKA;Mn;26;NSM;;;;;N;HEBREW POINT VARIKA;;;;
+FB1F;HEBREW LIGATURE YIDDISH YOD YOD PATAH;Lo;0;R;05F2 05B7;;;;N;;;;;
+FB20;HEBREW LETTER ALTERNATIVE AYIN;Lo;0;R;<font> 05E2;;;;N;;;;;
+FB21;HEBREW LETTER WIDE ALEF;Lo;0;R;<font> 05D0;;;;N;;;;;
+FB22;HEBREW LETTER WIDE DALET;Lo;0;R;<font> 05D3;;;;N;;;;;
+FB23;HEBREW LETTER WIDE HE;Lo;0;R;<font> 05D4;;;;N;;;;;
+FB24;HEBREW LETTER WIDE KAF;Lo;0;R;<font> 05DB;;;;N;;;;;
+FB25;HEBREW LETTER WIDE LAMED;Lo;0;R;<font> 05DC;;;;N;;;;;
+FB26;HEBREW LETTER WIDE FINAL MEM;Lo;0;R;<font> 05DD;;;;N;;;;;
+FB27;HEBREW LETTER WIDE RESH;Lo;0;R;<font> 05E8;;;;N;;;;;
+FB28;HEBREW LETTER WIDE TAV;Lo;0;R;<font> 05EA;;;;N;;;;;
+FB29;HEBREW LETTER ALTERNATIVE PLUS SIGN;Sm;0;ES;<font> 002B;;;;N;;;;;
+FB2A;HEBREW LETTER SHIN WITH SHIN DOT;Lo;0;R;05E9 05C1;;;;N;;;;;
+FB2B;HEBREW LETTER SHIN WITH SIN DOT;Lo;0;R;05E9 05C2;;;;N;;;;;
+FB2C;HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT;Lo;0;R;FB49 05C1;;;;N;;;;;
+FB2D;HEBREW LETTER SHIN WITH DAGESH AND SIN DOT;Lo;0;R;FB49 05C2;;;;N;;;;;
+FB2E;HEBREW LETTER ALEF WITH PATAH;Lo;0;R;05D0 05B7;;;;N;;;;;
+FB2F;HEBREW LETTER ALEF WITH QAMATS;Lo;0;R;05D0 05B8;;;;N;;;;;
+FB30;HEBREW LETTER ALEF WITH MAPIQ;Lo;0;R;05D0 05BC;;;;N;;;;;
+FB31;HEBREW LETTER BET WITH DAGESH;Lo;0;R;05D1 05BC;;;;N;;;;;
+FB32;HEBREW LETTER GIMEL WITH DAGESH;Lo;0;R;05D2 05BC;;;;N;;;;;
+FB33;HEBREW LETTER DALET WITH DAGESH;Lo;0;R;05D3 05BC;;;;N;;;;;
+FB34;HEBREW LETTER HE WITH MAPIQ;Lo;0;R;05D4 05BC;;;;N;;;;;
+FB35;HEBREW LETTER VAV WITH DAGESH;Lo;0;R;05D5 05BC;;;;N;;;;;
+FB36;HEBREW LETTER ZAYIN WITH DAGESH;Lo;0;R;05D6 05BC;;;;N;;;;;
+FB38;HEBREW LETTER TET WITH DAGESH;Lo;0;R;05D8 05BC;;;;N;;;;;
+FB39;HEBREW LETTER YOD WITH DAGESH;Lo;0;R;05D9 05BC;;;;N;;;;;
+FB3A;HEBREW LETTER FINAL KAF WITH DAGESH;Lo;0;R;05DA 05BC;;;;N;;;;;
+FB3B;HEBREW LETTER KAF WITH DAGESH;Lo;0;R;05DB 05BC;;;;N;;;;;
+FB3C;HEBREW LETTER LAMED WITH DAGESH;Lo;0;R;05DC 05BC;;;;N;;;;;
+FB3E;HEBREW LETTER MEM WITH DAGESH;Lo;0;R;05DE 05BC;;;;N;;;;;
+FB40;HEBREW LETTER NUN WITH DAGESH;Lo;0;R;05E0 05BC;;;;N;;;;;
+FB41;HEBREW LETTER SAMEKH WITH DAGESH;Lo;0;R;05E1 05BC;;;;N;;;;;
+FB43;HEBREW LETTER FINAL PE WITH DAGESH;Lo;0;R;05E3 05BC;;;;N;;;;;
+FB44;HEBREW LETTER PE WITH DAGESH;Lo;0;R;05E4 05BC;;;;N;;;;;
+FB46;HEBREW LETTER TSADI WITH DAGESH;Lo;0;R;05E6 05BC;;;;N;;;;;
+FB47;HEBREW LETTER QOF WITH DAGESH;Lo;0;R;05E7 05BC;;;;N;;;;;
+FB48;HEBREW LETTER RESH WITH DAGESH;Lo;0;R;05E8 05BC;;;;N;;;;;
+FB49;HEBREW LETTER SHIN WITH DAGESH;Lo;0;R;05E9 05BC;;;;N;;;;;
+FB4A;HEBREW LETTER TAV WITH DAGESH;Lo;0;R;05EA 05BC;;;;N;;;;;
+FB4B;HEBREW LETTER VAV WITH HOLAM;Lo;0;R;05D5 05B9;;;;N;;;;;
+FB4C;HEBREW LETTER BET WITH RAFE;Lo;0;R;05D1 05BF;;;;N;;;;;
+FB4D;HEBREW LETTER KAF WITH RAFE;Lo;0;R;05DB 05BF;;;;N;;;;;
+FB4E;HEBREW LETTER PE WITH RAFE;Lo;0;R;05E4 05BF;;;;N;;;;;
+FB4F;HEBREW LIGATURE ALEF LAMED;Lo;0;R;<compat> 05D0 05DC;;;;N;;;;;
+FB50;ARABIC LETTER ALEF WASLA ISOLATED FORM;Lo;0;AL;<isolated> 0671;;;;N;;;;;
+FB51;ARABIC LETTER ALEF WASLA FINAL FORM;Lo;0;AL;<final> 0671;;;;N;;;;;
+FB52;ARABIC LETTER BEEH ISOLATED FORM;Lo;0;AL;<isolated> 067B;;;;N;;;;;
+FB53;ARABIC LETTER BEEH FINAL FORM;Lo;0;AL;<final> 067B;;;;N;;;;;
+FB54;ARABIC LETTER BEEH INITIAL FORM;Lo;0;AL;<initial> 067B;;;;N;;;;;
+FB55;ARABIC LETTER BEEH MEDIAL FORM;Lo;0;AL;<medial> 067B;;;;N;;;;;
+FB56;ARABIC LETTER PEH ISOLATED FORM;Lo;0;AL;<isolated> 067E;;;;N;;;;;
+FB57;ARABIC LETTER PEH FINAL FORM;Lo;0;AL;<final> 067E;;;;N;;;;;
+FB58;ARABIC LETTER PEH INITIAL FORM;Lo;0;AL;<initial> 067E;;;;N;;;;;
+FB59;ARABIC LETTER PEH MEDIAL FORM;Lo;0;AL;<medial> 067E;;;;N;;;;;
+FB5A;ARABIC LETTER BEHEH ISOLATED FORM;Lo;0;AL;<isolated> 0680;;;;N;;;;;
+FB5B;ARABIC LETTER BEHEH FINAL FORM;Lo;0;AL;<final> 0680;;;;N;;;;;
+FB5C;ARABIC LETTER BEHEH INITIAL FORM;Lo;0;AL;<initial> 0680;;;;N;;;;;
+FB5D;ARABIC LETTER BEHEH MEDIAL FORM;Lo;0;AL;<medial> 0680;;;;N;;;;;
+FB5E;ARABIC LETTER TTEHEH ISOLATED FORM;Lo;0;AL;<isolated> 067A;;;;N;;;;;
+FB5F;ARABIC LETTER TTEHEH FINAL FORM;Lo;0;AL;<final> 067A;;;;N;;;;;
+FB60;ARABIC LETTER TTEHEH INITIAL FORM;Lo;0;AL;<initial> 067A;;;;N;;;;;
+FB61;ARABIC LETTER TTEHEH MEDIAL FORM;Lo;0;AL;<medial> 067A;;;;N;;;;;
+FB62;ARABIC LETTER TEHEH ISOLATED FORM;Lo;0;AL;<isolated> 067F;;;;N;;;;;
+FB63;ARABIC LETTER TEHEH FINAL FORM;Lo;0;AL;<final> 067F;;;;N;;;;;
+FB64;ARABIC LETTER TEHEH INITIAL FORM;Lo;0;AL;<initial> 067F;;;;N;;;;;
+FB65;ARABIC LETTER TEHEH MEDIAL FORM;Lo;0;AL;<medial> 067F;;;;N;;;;;
+FB66;ARABIC LETTER TTEH ISOLATED FORM;Lo;0;AL;<isolated> 0679;;;;N;;;;;
+FB67;ARABIC LETTER TTEH FINAL FORM;Lo;0;AL;<final> 0679;;;;N;;;;;
+FB68;ARABIC LETTER TTEH INITIAL FORM;Lo;0;AL;<initial> 0679;;;;N;;;;;
+FB69;ARABIC LETTER TTEH MEDIAL FORM;Lo;0;AL;<medial> 0679;;;;N;;;;;
+FB6A;ARABIC LETTER VEH ISOLATED FORM;Lo;0;AL;<isolated> 06A4;;;;N;;;;;
+FB6B;ARABIC LETTER VEH FINAL FORM;Lo;0;AL;<final> 06A4;;;;N;;;;;
+FB6C;ARABIC LETTER VEH INITIAL FORM;Lo;0;AL;<initial> 06A4;;;;N;;;;;
+FB6D;ARABIC LETTER VEH MEDIAL FORM;Lo;0;AL;<medial> 06A4;;;;N;;;;;
+FB6E;ARABIC LETTER PEHEH ISOLATED FORM;Lo;0;AL;<isolated> 06A6;;;;N;;;;;
+FB6F;ARABIC LETTER PEHEH FINAL FORM;Lo;0;AL;<final> 06A6;;;;N;;;;;
+FB70;ARABIC LETTER PEHEH INITIAL FORM;Lo;0;AL;<initial> 06A6;;;;N;;;;;
+FB71;ARABIC LETTER PEHEH MEDIAL FORM;Lo;0;AL;<medial> 06A6;;;;N;;;;;
+FB72;ARABIC LETTER DYEH ISOLATED FORM;Lo;0;AL;<isolated> 0684;;;;N;;;;;
+FB73;ARABIC LETTER DYEH FINAL FORM;Lo;0;AL;<final> 0684;;;;N;;;;;
+FB74;ARABIC LETTER DYEH INITIAL FORM;Lo;0;AL;<initial> 0684;;;;N;;;;;
+FB75;ARABIC LETTER DYEH MEDIAL FORM;Lo;0;AL;<medial> 0684;;;;N;;;;;
+FB76;ARABIC LETTER NYEH ISOLATED FORM;Lo;0;AL;<isolated> 0683;;;;N;;;;;
+FB77;ARABIC LETTER NYEH FINAL FORM;Lo;0;AL;<final> 0683;;;;N;;;;;
+FB78;ARABIC LETTER NYEH INITIAL FORM;Lo;0;AL;<initial> 0683;;;;N;;;;;
+FB79;ARABIC LETTER NYEH MEDIAL FORM;Lo;0;AL;<medial> 0683;;;;N;;;;;
+FB7A;ARABIC LETTER TCHEH ISOLATED FORM;Lo;0;AL;<isolated> 0686;;;;N;;;;;
+FB7B;ARABIC LETTER TCHEH FINAL FORM;Lo;0;AL;<final> 0686;;;;N;;;;;
+FB7C;ARABIC LETTER TCHEH INITIAL FORM;Lo;0;AL;<initial> 0686;;;;N;;;;;
+FB7D;ARABIC LETTER TCHEH MEDIAL FORM;Lo;0;AL;<medial> 0686;;;;N;;;;;
+FB7E;ARABIC LETTER TCHEHEH ISOLATED FORM;Lo;0;AL;<isolated> 0687;;;;N;;;;;
+FB7F;ARABIC LETTER TCHEHEH FINAL FORM;Lo;0;AL;<final> 0687;;;;N;;;;;
+FB80;ARABIC LETTER TCHEHEH INITIAL FORM;Lo;0;AL;<initial> 0687;;;;N;;;;;
+FB81;ARABIC LETTER TCHEHEH MEDIAL FORM;Lo;0;AL;<medial> 0687;;;;N;;;;;
+FB82;ARABIC LETTER DDAHAL ISOLATED FORM;Lo;0;AL;<isolated> 068D;;;;N;;;;;
+FB83;ARABIC LETTER DDAHAL FINAL FORM;Lo;0;AL;<final> 068D;;;;N;;;;;
+FB84;ARABIC LETTER DAHAL ISOLATED FORM;Lo;0;AL;<isolated> 068C;;;;N;;;;;
+FB85;ARABIC LETTER DAHAL FINAL FORM;Lo;0;AL;<final> 068C;;;;N;;;;;
+FB86;ARABIC LETTER DUL ISOLATED FORM;Lo;0;AL;<isolated> 068E;;;;N;;;;;
+FB87;ARABIC LETTER DUL FINAL FORM;Lo;0;AL;<final> 068E;;;;N;;;;;
+FB88;ARABIC LETTER DDAL ISOLATED FORM;Lo;0;AL;<isolated> 0688;;;;N;;;;;
+FB89;ARABIC LETTER DDAL FINAL FORM;Lo;0;AL;<final> 0688;;;;N;;;;;
+FB8A;ARABIC LETTER JEH ISOLATED FORM;Lo;0;AL;<isolated> 0698;;;;N;;;;;
+FB8B;ARABIC LETTER JEH FINAL FORM;Lo;0;AL;<final> 0698;;;;N;;;;;
+FB8C;ARABIC LETTER RREH ISOLATED FORM;Lo;0;AL;<isolated> 0691;;;;N;;;;;
+FB8D;ARABIC LETTER RREH FINAL FORM;Lo;0;AL;<final> 0691;;;;N;;;;;
+FB8E;ARABIC LETTER KEHEH ISOLATED FORM;Lo;0;AL;<isolated> 06A9;;;;N;;;;;
+FB8F;ARABIC LETTER KEHEH FINAL FORM;Lo;0;AL;<final> 06A9;;;;N;;;;;
+FB90;ARABIC LETTER KEHEH INITIAL FORM;Lo;0;AL;<initial> 06A9;;;;N;;;;;
+FB91;ARABIC LETTER KEHEH MEDIAL FORM;Lo;0;AL;<medial> 06A9;;;;N;;;;;
+FB92;ARABIC LETTER GAF ISOLATED FORM;Lo;0;AL;<isolated> 06AF;;;;N;;;;;
+FB93;ARABIC LETTER GAF FINAL FORM;Lo;0;AL;<final> 06AF;;;;N;;;;;
+FB94;ARABIC LETTER GAF INITIAL FORM;Lo;0;AL;<initial> 06AF;;;;N;;;;;
+FB95;ARABIC LETTER GAF MEDIAL FORM;Lo;0;AL;<medial> 06AF;;;;N;;;;;
+FB96;ARABIC LETTER GUEH ISOLATED FORM;Lo;0;AL;<isolated> 06B3;;;;N;;;;;
+FB97;ARABIC LETTER GUEH FINAL FORM;Lo;0;AL;<final> 06B3;;;;N;;;;;
+FB98;ARABIC LETTER GUEH INITIAL FORM;Lo;0;AL;<initial> 06B3;;;;N;;;;;
+FB99;ARABIC LETTER GUEH MEDIAL FORM;Lo;0;AL;<medial> 06B3;;;;N;;;;;
+FB9A;ARABIC LETTER NGOEH ISOLATED FORM;Lo;0;AL;<isolated> 06B1;;;;N;;;;;
+FB9B;ARABIC LETTER NGOEH FINAL FORM;Lo;0;AL;<final> 06B1;;;;N;;;;;
+FB9C;ARABIC LETTER NGOEH INITIAL FORM;Lo;0;AL;<initial> 06B1;;;;N;;;;;
+FB9D;ARABIC LETTER NGOEH MEDIAL FORM;Lo;0;AL;<medial> 06B1;;;;N;;;;;
+FB9E;ARABIC LETTER NOON GHUNNA ISOLATED FORM;Lo;0;AL;<isolated> 06BA;;;;N;;;;;
+FB9F;ARABIC LETTER NOON GHUNNA FINAL FORM;Lo;0;AL;<final> 06BA;;;;N;;;;;
+FBA0;ARABIC LETTER RNOON ISOLATED FORM;Lo;0;AL;<isolated> 06BB;;;;N;;;;;
+FBA1;ARABIC LETTER RNOON FINAL FORM;Lo;0;AL;<final> 06BB;;;;N;;;;;
+FBA2;ARABIC LETTER RNOON INITIAL FORM;Lo;0;AL;<initial> 06BB;;;;N;;;;;
+FBA3;ARABIC LETTER RNOON MEDIAL FORM;Lo;0;AL;<medial> 06BB;;;;N;;;;;
+FBA4;ARABIC LETTER HEH WITH YEH ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 06C0;;;;N;;;;;
+FBA5;ARABIC LETTER HEH WITH YEH ABOVE FINAL FORM;Lo;0;AL;<final> 06C0;;;;N;;;;;
+FBA6;ARABIC LETTER HEH GOAL ISOLATED FORM;Lo;0;AL;<isolated> 06C1;;;;N;;;;;
+FBA7;ARABIC LETTER HEH GOAL FINAL FORM;Lo;0;AL;<final> 06C1;;;;N;;;;;
+FBA8;ARABIC LETTER HEH GOAL INITIAL FORM;Lo;0;AL;<initial> 06C1;;;;N;;;;;
+FBA9;ARABIC LETTER HEH GOAL MEDIAL FORM;Lo;0;AL;<medial> 06C1;;;;N;;;;;
+FBAA;ARABIC LETTER HEH DOACHASHMEE ISOLATED FORM;Lo;0;AL;<isolated> 06BE;;;;N;;;;;
+FBAB;ARABIC LETTER HEH DOACHASHMEE FINAL FORM;Lo;0;AL;<final> 06BE;;;;N;;;;;
+FBAC;ARABIC LETTER HEH DOACHASHMEE INITIAL FORM;Lo;0;AL;<initial> 06BE;;;;N;;;;;
+FBAD;ARABIC LETTER HEH DOACHASHMEE MEDIAL FORM;Lo;0;AL;<medial> 06BE;;;;N;;;;;
+FBAE;ARABIC LETTER YEH BARREE ISOLATED FORM;Lo;0;AL;<isolated> 06D2;;;;N;;;;;
+FBAF;ARABIC LETTER YEH BARREE FINAL FORM;Lo;0;AL;<final> 06D2;;;;N;;;;;
+FBB0;ARABIC LETTER YEH BARREE WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 06D3;;;;N;;;;;
+FBB1;ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 06D3;;;;N;;;;;
+FBD3;ARABIC LETTER NG ISOLATED FORM;Lo;0;AL;<isolated> 06AD;;;;N;;;;;
+FBD4;ARABIC LETTER NG FINAL FORM;Lo;0;AL;<final> 06AD;;;;N;;;;;
+FBD5;ARABIC LETTER NG INITIAL FORM;Lo;0;AL;<initial> 06AD;;;;N;;;;;
+FBD6;ARABIC LETTER NG MEDIAL FORM;Lo;0;AL;<medial> 06AD;;;;N;;;;;
+FBD7;ARABIC LETTER U ISOLATED FORM;Lo;0;AL;<isolated> 06C7;;;;N;;;;;
+FBD8;ARABIC LETTER U FINAL FORM;Lo;0;AL;<final> 06C7;;;;N;;;;;
+FBD9;ARABIC LETTER OE ISOLATED FORM;Lo;0;AL;<isolated> 06C6;;;;N;;;;;
+FBDA;ARABIC LETTER OE FINAL FORM;Lo;0;AL;<final> 06C6;;;;N;;;;;
+FBDB;ARABIC LETTER YU ISOLATED FORM;Lo;0;AL;<isolated> 06C8;;;;N;;;;;
+FBDC;ARABIC LETTER YU FINAL FORM;Lo;0;AL;<final> 06C8;;;;N;;;;;
+FBDD;ARABIC LETTER U WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0677;;;;N;;;;;
+FBDE;ARABIC LETTER VE ISOLATED FORM;Lo;0;AL;<isolated> 06CB;;;;N;;;;;
+FBDF;ARABIC LETTER VE FINAL FORM;Lo;0;AL;<final> 06CB;;;;N;;;;;
+FBE0;ARABIC LETTER KIRGHIZ OE ISOLATED FORM;Lo;0;AL;<isolated> 06C5;;;;N;;;;;
+FBE1;ARABIC LETTER KIRGHIZ OE FINAL FORM;Lo;0;AL;<final> 06C5;;;;N;;;;;
+FBE2;ARABIC LETTER KIRGHIZ YU ISOLATED FORM;Lo;0;AL;<isolated> 06C9;;;;N;;;;;
+FBE3;ARABIC LETTER KIRGHIZ YU FINAL FORM;Lo;0;AL;<final> 06C9;;;;N;;;;;
+FBE4;ARABIC LETTER E ISOLATED FORM;Lo;0;AL;<isolated> 06D0;;;;N;;;;;
+FBE5;ARABIC LETTER E FINAL FORM;Lo;0;AL;<final> 06D0;;;;N;;;;;
+FBE6;ARABIC LETTER E INITIAL FORM;Lo;0;AL;<initial> 06D0;;;;N;;;;;
+FBE7;ARABIC LETTER E MEDIAL FORM;Lo;0;AL;<medial> 06D0;;;;N;;;;;
+FBE8;ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA INITIAL FORM;Lo;0;AL;<initial> 0649;;;;N;;;;;
+FBE9;ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA MEDIAL FORM;Lo;0;AL;<medial> 0649;;;;N;;;;;
+FBEA;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0626 0627;;;;N;;;;;
+FBEB;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF FINAL FORM;Lo;0;AL;<final> 0626 0627;;;;N;;;;;
+FBEC;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE ISOLATED FORM;Lo;0;AL;<isolated> 0626 06D5;;;;N;;;;;
+FBED;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE FINAL FORM;Lo;0;AL;<final> 0626 06D5;;;;N;;;;;
+FBEE;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW ISOLATED FORM;Lo;0;AL;<isolated> 0626 0648;;;;N;;;;;
+FBEF;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW FINAL FORM;Lo;0;AL;<final> 0626 0648;;;;N;;;;;
+FBF0;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U ISOLATED FORM;Lo;0;AL;<isolated> 0626 06C7;;;;N;;;;;
+FBF1;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U FINAL FORM;Lo;0;AL;<final> 0626 06C7;;;;N;;;;;
+FBF2;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE ISOLATED FORM;Lo;0;AL;<isolated> 0626 06C6;;;;N;;;;;
+FBF3;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE FINAL FORM;Lo;0;AL;<final> 0626 06C6;;;;N;;;;;
+FBF4;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU ISOLATED FORM;Lo;0;AL;<isolated> 0626 06C8;;;;N;;;;;
+FBF5;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU FINAL FORM;Lo;0;AL;<final> 0626 06C8;;;;N;;;;;
+FBF6;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E ISOLATED FORM;Lo;0;AL;<isolated> 0626 06D0;;;;N;;;;;
+FBF7;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E FINAL FORM;Lo;0;AL;<final> 0626 06D0;;;;N;;;;;
+FBF8;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E INITIAL FORM;Lo;0;AL;<initial> 0626 06D0;;;;N;;;;;
+FBF9;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0626 0649;;;;N;;;;;
+FBFA;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0626 0649;;;;N;;;;;
+FBFB;ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA INITIAL FORM;Lo;0;AL;<initial> 0626 0649;;;;N;;;;;
+FBFC;ARABIC LETTER FARSI YEH ISOLATED FORM;Lo;0;AL;<isolated> 06CC;;;;N;;;;;
+FBFD;ARABIC LETTER FARSI YEH FINAL FORM;Lo;0;AL;<final> 06CC;;;;N;;;;;
+FBFE;ARABIC LETTER FARSI YEH INITIAL FORM;Lo;0;AL;<initial> 06CC;;;;N;;;;;
+FBFF;ARABIC LETTER FARSI YEH MEDIAL FORM;Lo;0;AL;<medial> 06CC;;;;N;;;;;
+FC00;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0626 062C;;;;N;;;;;
+FC01;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0626 062D;;;;N;;;;;
+FC02;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0626 0645;;;;N;;;;;
+FC03;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0626 0649;;;;N;;;;;
+FC04;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0626 064A;;;;N;;;;;
+FC05;ARABIC LIGATURE BEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0628 062C;;;;N;;;;;
+FC06;ARABIC LIGATURE BEH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0628 062D;;;;N;;;;;
+FC07;ARABIC LIGATURE BEH WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0628 062E;;;;N;;;;;
+FC08;ARABIC LIGATURE BEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0628 0645;;;;N;;;;;
+FC09;ARABIC LIGATURE BEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0628 0649;;;;N;;;;;
+FC0A;ARABIC LIGATURE BEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0628 064A;;;;N;;;;;
+FC0B;ARABIC LIGATURE TEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062A 062C;;;;N;;;;;
+FC0C;ARABIC LIGATURE TEH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 062A 062D;;;;N;;;;;
+FC0D;ARABIC LIGATURE TEH WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 062A 062E;;;;N;;;;;
+FC0E;ARABIC LIGATURE TEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062A 0645;;;;N;;;;;
+FC0F;ARABIC LIGATURE TEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062A 0649;;;;N;;;;;
+FC10;ARABIC LIGATURE TEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062A 064A;;;;N;;;;;
+FC11;ARABIC LIGATURE THEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062B 062C;;;;N;;;;;
+FC12;ARABIC LIGATURE THEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062B 0645;;;;N;;;;;
+FC13;ARABIC LIGATURE THEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062B 0649;;;;N;;;;;
+FC14;ARABIC LIGATURE THEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062B 064A;;;;N;;;;;
+FC15;ARABIC LIGATURE JEEM WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 062C 062D;;;;N;;;;;
+FC16;ARABIC LIGATURE JEEM WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062C 0645;;;;N;;;;;
+FC17;ARABIC LIGATURE HAH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062D 062C;;;;N;;;;;
+FC18;ARABIC LIGATURE HAH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062D 0645;;;;N;;;;;
+FC19;ARABIC LIGATURE KHAH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062E 062C;;;;N;;;;;
+FC1A;ARABIC LIGATURE KHAH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 062E 062D;;;;N;;;;;
+FC1B;ARABIC LIGATURE KHAH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 062E 0645;;;;N;;;;;
+FC1C;ARABIC LIGATURE SEEN WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0633 062C;;;;N;;;;;
+FC1D;ARABIC LIGATURE SEEN WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0633 062D;;;;N;;;;;
+FC1E;ARABIC LIGATURE SEEN WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0633 062E;;;;N;;;;;
+FC1F;ARABIC LIGATURE SEEN WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0633 0645;;;;N;;;;;
+FC20;ARABIC LIGATURE SAD WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0635 062D;;;;N;;;;;
+FC21;ARABIC LIGATURE SAD WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0635 0645;;;;N;;;;;
+FC22;ARABIC LIGATURE DAD WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0636 062C;;;;N;;;;;
+FC23;ARABIC LIGATURE DAD WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0636 062D;;;;N;;;;;
+FC24;ARABIC LIGATURE DAD WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0636 062E;;;;N;;;;;
+FC25;ARABIC LIGATURE DAD WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0636 0645;;;;N;;;;;
+FC26;ARABIC LIGATURE TAH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0637 062D;;;;N;;;;;
+FC27;ARABIC LIGATURE TAH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0637 0645;;;;N;;;;;
+FC28;ARABIC LIGATURE ZAH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0638 0645;;;;N;;;;;
+FC29;ARABIC LIGATURE AIN WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0639 062C;;;;N;;;;;
+FC2A;ARABIC LIGATURE AIN WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0639 0645;;;;N;;;;;
+FC2B;ARABIC LIGATURE GHAIN WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 063A 062C;;;;N;;;;;
+FC2C;ARABIC LIGATURE GHAIN WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 063A 0645;;;;N;;;;;
+FC2D;ARABIC LIGATURE FEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0641 062C;;;;N;;;;;
+FC2E;ARABIC LIGATURE FEH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0641 062D;;;;N;;;;;
+FC2F;ARABIC LIGATURE FEH WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0641 062E;;;;N;;;;;
+FC30;ARABIC LIGATURE FEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0641 0645;;;;N;;;;;
+FC31;ARABIC LIGATURE FEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0641 0649;;;;N;;;;;
+FC32;ARABIC LIGATURE FEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0641 064A;;;;N;;;;;
+FC33;ARABIC LIGATURE QAF WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0642 062D;;;;N;;;;;
+FC34;ARABIC LIGATURE QAF WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0642 0645;;;;N;;;;;
+FC35;ARABIC LIGATURE QAF WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0642 0649;;;;N;;;;;
+FC36;ARABIC LIGATURE QAF WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0642 064A;;;;N;;;;;
+FC37;ARABIC LIGATURE KAF WITH ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0643 0627;;;;N;;;;;
+FC38;ARABIC LIGATURE KAF WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0643 062C;;;;N;;;;;
+FC39;ARABIC LIGATURE KAF WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0643 062D;;;;N;;;;;
+FC3A;ARABIC LIGATURE KAF WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0643 062E;;;;N;;;;;
+FC3B;ARABIC LIGATURE KAF WITH LAM ISOLATED FORM;Lo;0;AL;<isolated> 0643 0644;;;;N;;;;;
+FC3C;ARABIC LIGATURE KAF WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0643 0645;;;;N;;;;;
+FC3D;ARABIC LIGATURE KAF WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0643 0649;;;;N;;;;;
+FC3E;ARABIC LIGATURE KAF WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0643 064A;;;;N;;;;;
+FC3F;ARABIC LIGATURE LAM WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0644 062C;;;;N;;;;;
+FC40;ARABIC LIGATURE LAM WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0644 062D;;;;N;;;;;
+FC41;ARABIC LIGATURE LAM WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0644 062E;;;;N;;;;;
+FC42;ARABIC LIGATURE LAM WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0644 0645;;;;N;;;;;
+FC43;ARABIC LIGATURE LAM WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0644 0649;;;;N;;;;;
+FC44;ARABIC LIGATURE LAM WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0644 064A;;;;N;;;;;
+FC45;ARABIC LIGATURE MEEM WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0645 062C;;;;N;;;;;
+FC46;ARABIC LIGATURE MEEM WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0645 062D;;;;N;;;;;
+FC47;ARABIC LIGATURE MEEM WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0645 062E;;;;N;;;;;
+FC48;ARABIC LIGATURE MEEM WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0645 0645;;;;N;;;;;
+FC49;ARABIC LIGATURE MEEM WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0645 0649;;;;N;;;;;
+FC4A;ARABIC LIGATURE MEEM WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0645 064A;;;;N;;;;;
+FC4B;ARABIC LIGATURE NOON WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0646 062C;;;;N;;;;;
+FC4C;ARABIC LIGATURE NOON WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0646 062D;;;;N;;;;;
+FC4D;ARABIC LIGATURE NOON WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0646 062E;;;;N;;;;;
+FC4E;ARABIC LIGATURE NOON WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0646 0645;;;;N;;;;;
+FC4F;ARABIC LIGATURE NOON WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0646 0649;;;;N;;;;;
+FC50;ARABIC LIGATURE NOON WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0646 064A;;;;N;;;;;
+FC51;ARABIC LIGATURE HEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0647 062C;;;;N;;;;;
+FC52;ARABIC LIGATURE HEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0647 0645;;;;N;;;;;
+FC53;ARABIC LIGATURE HEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0647 0649;;;;N;;;;;
+FC54;ARABIC LIGATURE HEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0647 064A;;;;N;;;;;
+FC55;ARABIC LIGATURE YEH WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 064A 062C;;;;N;;;;;
+FC56;ARABIC LIGATURE YEH WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 064A 062D;;;;N;;;;;
+FC57;ARABIC LIGATURE YEH WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 064A 062E;;;;N;;;;;
+FC58;ARABIC LIGATURE YEH WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 064A 0645;;;;N;;;;;
+FC59;ARABIC LIGATURE YEH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 064A 0649;;;;N;;;;;
+FC5A;ARABIC LIGATURE YEH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 064A 064A;;;;N;;;;;
+FC5B;ARABIC LIGATURE THAL WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0630 0670;;;;N;;;;;
+FC5C;ARABIC LIGATURE REH WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0631 0670;;;;N;;;;;
+FC5D;ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0649 0670;;;;N;;;;;
+FC5E;ARABIC LIGATURE SHADDA WITH DAMMATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064C 0651;;;;N;;;;;
+FC5F;ARABIC LIGATURE SHADDA WITH KASRATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064D 0651;;;;N;;;;;
+FC60;ARABIC LIGATURE SHADDA WITH FATHA ISOLATED FORM;Lo;0;AL;<isolated> 0020 064E 0651;;;;N;;;;;
+FC61;ARABIC LIGATURE SHADDA WITH DAMMA ISOLATED FORM;Lo;0;AL;<isolated> 0020 064F 0651;;;;N;;;;;
+FC62;ARABIC LIGATURE SHADDA WITH KASRA ISOLATED FORM;Lo;0;AL;<isolated> 0020 0650 0651;;;;N;;;;;
+FC63;ARABIC LIGATURE SHADDA WITH SUPERSCRIPT ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0020 0651 0670;;;;N;;;;;
+FC64;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH REH FINAL FORM;Lo;0;AL;<final> 0626 0631;;;;N;;;;;
+FC65;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ZAIN FINAL FORM;Lo;0;AL;<final> 0626 0632;;;;N;;;;;
+FC66;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM FINAL FORM;Lo;0;AL;<final> 0626 0645;;;;N;;;;;
+FC67;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH NOON FINAL FORM;Lo;0;AL;<final> 0626 0646;;;;N;;;;;
+FC68;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0626 0649;;;;N;;;;;
+FC69;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH FINAL FORM;Lo;0;AL;<final> 0626 064A;;;;N;;;;;
+FC6A;ARABIC LIGATURE BEH WITH REH FINAL FORM;Lo;0;AL;<final> 0628 0631;;;;N;;;;;
+FC6B;ARABIC LIGATURE BEH WITH ZAIN FINAL FORM;Lo;0;AL;<final> 0628 0632;;;;N;;;;;
+FC6C;ARABIC LIGATURE BEH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0628 0645;;;;N;;;;;
+FC6D;ARABIC LIGATURE BEH WITH NOON FINAL FORM;Lo;0;AL;<final> 0628 0646;;;;N;;;;;
+FC6E;ARABIC LIGATURE BEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0628 0649;;;;N;;;;;
+FC6F;ARABIC LIGATURE BEH WITH YEH FINAL FORM;Lo;0;AL;<final> 0628 064A;;;;N;;;;;
+FC70;ARABIC LIGATURE TEH WITH REH FINAL FORM;Lo;0;AL;<final> 062A 0631;;;;N;;;;;
+FC71;ARABIC LIGATURE TEH WITH ZAIN FINAL FORM;Lo;0;AL;<final> 062A 0632;;;;N;;;;;
+FC72;ARABIC LIGATURE TEH WITH MEEM FINAL FORM;Lo;0;AL;<final> 062A 0645;;;;N;;;;;
+FC73;ARABIC LIGATURE TEH WITH NOON FINAL FORM;Lo;0;AL;<final> 062A 0646;;;;N;;;;;
+FC74;ARABIC LIGATURE TEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062A 0649;;;;N;;;;;
+FC75;ARABIC LIGATURE TEH WITH YEH FINAL FORM;Lo;0;AL;<final> 062A 064A;;;;N;;;;;
+FC76;ARABIC LIGATURE THEH WITH REH FINAL FORM;Lo;0;AL;<final> 062B 0631;;;;N;;;;;
+FC77;ARABIC LIGATURE THEH WITH ZAIN FINAL FORM;Lo;0;AL;<final> 062B 0632;;;;N;;;;;
+FC78;ARABIC LIGATURE THEH WITH MEEM FINAL FORM;Lo;0;AL;<final> 062B 0645;;;;N;;;;;
+FC79;ARABIC LIGATURE THEH WITH NOON FINAL FORM;Lo;0;AL;<final> 062B 0646;;;;N;;;;;
+FC7A;ARABIC LIGATURE THEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062B 0649;;;;N;;;;;
+FC7B;ARABIC LIGATURE THEH WITH YEH FINAL FORM;Lo;0;AL;<final> 062B 064A;;;;N;;;;;
+FC7C;ARABIC LIGATURE FEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0641 0649;;;;N;;;;;
+FC7D;ARABIC LIGATURE FEH WITH YEH FINAL FORM;Lo;0;AL;<final> 0641 064A;;;;N;;;;;
+FC7E;ARABIC LIGATURE QAF WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0642 0649;;;;N;;;;;
+FC7F;ARABIC LIGATURE QAF WITH YEH FINAL FORM;Lo;0;AL;<final> 0642 064A;;;;N;;;;;
+FC80;ARABIC LIGATURE KAF WITH ALEF FINAL FORM;Lo;0;AL;<final> 0643 0627;;;;N;;;;;
+FC81;ARABIC LIGATURE KAF WITH LAM FINAL FORM;Lo;0;AL;<final> 0643 0644;;;;N;;;;;
+FC82;ARABIC LIGATURE KAF WITH MEEM FINAL FORM;Lo;0;AL;<final> 0643 0645;;;;N;;;;;
+FC83;ARABIC LIGATURE KAF WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0643 0649;;;;N;;;;;
+FC84;ARABIC LIGATURE KAF WITH YEH FINAL FORM;Lo;0;AL;<final> 0643 064A;;;;N;;;;;
+FC85;ARABIC LIGATURE LAM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0644 0645;;;;N;;;;;
+FC86;ARABIC LIGATURE LAM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0644 0649;;;;N;;;;;
+FC87;ARABIC LIGATURE LAM WITH YEH FINAL FORM;Lo;0;AL;<final> 0644 064A;;;;N;;;;;
+FC88;ARABIC LIGATURE MEEM WITH ALEF FINAL FORM;Lo;0;AL;<final> 0645 0627;;;;N;;;;;
+FC89;ARABIC LIGATURE MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0645 0645;;;;N;;;;;
+FC8A;ARABIC LIGATURE NOON WITH REH FINAL FORM;Lo;0;AL;<final> 0646 0631;;;;N;;;;;
+FC8B;ARABIC LIGATURE NOON WITH ZAIN FINAL FORM;Lo;0;AL;<final> 0646 0632;;;;N;;;;;
+FC8C;ARABIC LIGATURE NOON WITH MEEM FINAL FORM;Lo;0;AL;<final> 0646 0645;;;;N;;;;;
+FC8D;ARABIC LIGATURE NOON WITH NOON FINAL FORM;Lo;0;AL;<final> 0646 0646;;;;N;;;;;
+FC8E;ARABIC LIGATURE NOON WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0646 0649;;;;N;;;;;
+FC8F;ARABIC LIGATURE NOON WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 064A;;;;N;;;;;
+FC90;ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF FINAL FORM;Lo;0;AL;<final> 0649 0670;;;;N;;;;;
+FC91;ARABIC LIGATURE YEH WITH REH FINAL FORM;Lo;0;AL;<final> 064A 0631;;;;N;;;;;
+FC92;ARABIC LIGATURE YEH WITH ZAIN FINAL FORM;Lo;0;AL;<final> 064A 0632;;;;N;;;;;
+FC93;ARABIC LIGATURE YEH WITH MEEM FINAL FORM;Lo;0;AL;<final> 064A 0645;;;;N;;;;;
+FC94;ARABIC LIGATURE YEH WITH NOON FINAL FORM;Lo;0;AL;<final> 064A 0646;;;;N;;;;;
+FC95;ARABIC LIGATURE YEH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 064A 0649;;;;N;;;;;
+FC96;ARABIC LIGATURE YEH WITH YEH FINAL FORM;Lo;0;AL;<final> 064A 064A;;;;N;;;;;
+FC97;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0626 062C;;;;N;;;;;
+FC98;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0626 062D;;;;N;;;;;
+FC99;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0626 062E;;;;N;;;;;
+FC9A;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0626 0645;;;;N;;;;;
+FC9B;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0626 0647;;;;N;;;;;
+FC9C;ARABIC LIGATURE BEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0628 062C;;;;N;;;;;
+FC9D;ARABIC LIGATURE BEH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0628 062D;;;;N;;;;;
+FC9E;ARABIC LIGATURE BEH WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0628 062E;;;;N;;;;;
+FC9F;ARABIC LIGATURE BEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0628 0645;;;;N;;;;;
+FCA0;ARABIC LIGATURE BEH WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0628 0647;;;;N;;;;;
+FCA1;ARABIC LIGATURE TEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062C;;;;N;;;;;
+FCA2;ARABIC LIGATURE TEH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 062A 062D;;;;N;;;;;
+FCA3;ARABIC LIGATURE TEH WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 062A 062E;;;;N;;;;;
+FCA4;ARABIC LIGATURE TEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062A 0645;;;;N;;;;;
+FCA5;ARABIC LIGATURE TEH WITH HEH INITIAL FORM;Lo;0;AL;<initial> 062A 0647;;;;N;;;;;
+FCA6;ARABIC LIGATURE THEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062B 0645;;;;N;;;;;
+FCA7;ARABIC LIGATURE JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 062C 062D;;;;N;;;;;
+FCA8;ARABIC LIGATURE JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062C 0645;;;;N;;;;;
+FCA9;ARABIC LIGATURE HAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062D 062C;;;;N;;;;;
+FCAA;ARABIC LIGATURE HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062D 0645;;;;N;;;;;
+FCAB;ARABIC LIGATURE KHAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062E 062C;;;;N;;;;;
+FCAC;ARABIC LIGATURE KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062E 0645;;;;N;;;;;
+FCAD;ARABIC LIGATURE SEEN WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0633 062C;;;;N;;;;;
+FCAE;ARABIC LIGATURE SEEN WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0633 062D;;;;N;;;;;
+FCAF;ARABIC LIGATURE SEEN WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0633 062E;;;;N;;;;;
+FCB0;ARABIC LIGATURE SEEN WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0633 0645;;;;N;;;;;
+FCB1;ARABIC LIGATURE SAD WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0635 062D;;;;N;;;;;
+FCB2;ARABIC LIGATURE SAD WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0635 062E;;;;N;;;;;
+FCB3;ARABIC LIGATURE SAD WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0635 0645;;;;N;;;;;
+FCB4;ARABIC LIGATURE DAD WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0636 062C;;;;N;;;;;
+FCB5;ARABIC LIGATURE DAD WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0636 062D;;;;N;;;;;
+FCB6;ARABIC LIGATURE DAD WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0636 062E;;;;N;;;;;
+FCB7;ARABIC LIGATURE DAD WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0636 0645;;;;N;;;;;
+FCB8;ARABIC LIGATURE TAH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0637 062D;;;;N;;;;;
+FCB9;ARABIC LIGATURE ZAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0638 0645;;;;N;;;;;
+FCBA;ARABIC LIGATURE AIN WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0639 062C;;;;N;;;;;
+FCBB;ARABIC LIGATURE AIN WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0639 0645;;;;N;;;;;
+FCBC;ARABIC LIGATURE GHAIN WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 063A 062C;;;;N;;;;;
+FCBD;ARABIC LIGATURE GHAIN WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 063A 0645;;;;N;;;;;
+FCBE;ARABIC LIGATURE FEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0641 062C;;;;N;;;;;
+FCBF;ARABIC LIGATURE FEH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0641 062D;;;;N;;;;;
+FCC0;ARABIC LIGATURE FEH WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0641 062E;;;;N;;;;;
+FCC1;ARABIC LIGATURE FEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0641 0645;;;;N;;;;;
+FCC2;ARABIC LIGATURE QAF WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0642 062D;;;;N;;;;;
+FCC3;ARABIC LIGATURE QAF WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0642 0645;;;;N;;;;;
+FCC4;ARABIC LIGATURE KAF WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0643 062C;;;;N;;;;;
+FCC5;ARABIC LIGATURE KAF WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0643 062D;;;;N;;;;;
+FCC6;ARABIC LIGATURE KAF WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0643 062E;;;;N;;;;;
+FCC7;ARABIC LIGATURE KAF WITH LAM INITIAL FORM;Lo;0;AL;<initial> 0643 0644;;;;N;;;;;
+FCC8;ARABIC LIGATURE KAF WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0643 0645;;;;N;;;;;
+FCC9;ARABIC LIGATURE LAM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062C;;;;N;;;;;
+FCCA;ARABIC LIGATURE LAM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0644 062D;;;;N;;;;;
+FCCB;ARABIC LIGATURE LAM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0644 062E;;;;N;;;;;
+FCCC;ARABIC LIGATURE LAM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0644 0645;;;;N;;;;;
+FCCD;ARABIC LIGATURE LAM WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0644 0647;;;;N;;;;;
+FCCE;ARABIC LIGATURE MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062C;;;;N;;;;;
+FCCF;ARABIC LIGATURE MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0645 062D;;;;N;;;;;
+FCD0;ARABIC LIGATURE MEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0645 062E;;;;N;;;;;
+FCD1;ARABIC LIGATURE MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 0645;;;;N;;;;;
+FCD2;ARABIC LIGATURE NOON WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0646 062C;;;;N;;;;;
+FCD3;ARABIC LIGATURE NOON WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0646 062D;;;;N;;;;;
+FCD4;ARABIC LIGATURE NOON WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0646 062E;;;;N;;;;;
+FCD5;ARABIC LIGATURE NOON WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0646 0645;;;;N;;;;;
+FCD6;ARABIC LIGATURE NOON WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0646 0647;;;;N;;;;;
+FCD7;ARABIC LIGATURE HEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0647 062C;;;;N;;;;;
+FCD8;ARABIC LIGATURE HEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0647 0645;;;;N;;;;;
+FCD9;ARABIC LIGATURE HEH WITH SUPERSCRIPT ALEF INITIAL FORM;Lo;0;AL;<initial> 0647 0670;;;;N;;;;;
+FCDA;ARABIC LIGATURE YEH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 064A 062C;;;;N;;;;;
+FCDB;ARABIC LIGATURE YEH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 064A 062D;;;;N;;;;;
+FCDC;ARABIC LIGATURE YEH WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 064A 062E;;;;N;;;;;
+FCDD;ARABIC LIGATURE YEH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 064A 0645;;;;N;;;;;
+FCDE;ARABIC LIGATURE YEH WITH HEH INITIAL FORM;Lo;0;AL;<initial> 064A 0647;;;;N;;;;;
+FCDF;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0626 0645;;;;N;;;;;
+FCE0;ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0626 0647;;;;N;;;;;
+FCE1;ARABIC LIGATURE BEH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0628 0645;;;;N;;;;;
+FCE2;ARABIC LIGATURE BEH WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0628 0647;;;;N;;;;;
+FCE3;ARABIC LIGATURE TEH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 062A 0645;;;;N;;;;;
+FCE4;ARABIC LIGATURE TEH WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 062A 0647;;;;N;;;;;
+FCE5;ARABIC LIGATURE THEH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 062B 0645;;;;N;;;;;
+FCE6;ARABIC LIGATURE THEH WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 062B 0647;;;;N;;;;;
+FCE7;ARABIC LIGATURE SEEN WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0633 0645;;;;N;;;;;
+FCE8;ARABIC LIGATURE SEEN WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0633 0647;;;;N;;;;;
+FCE9;ARABIC LIGATURE SHEEN WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0634 0645;;;;N;;;;;
+FCEA;ARABIC LIGATURE SHEEN WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0634 0647;;;;N;;;;;
+FCEB;ARABIC LIGATURE KAF WITH LAM MEDIAL FORM;Lo;0;AL;<medial> 0643 0644;;;;N;;;;;
+FCEC;ARABIC LIGATURE KAF WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0643 0645;;;;N;;;;;
+FCED;ARABIC LIGATURE LAM WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0644 0645;;;;N;;;;;
+FCEE;ARABIC LIGATURE NOON WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0646 0645;;;;N;;;;;
+FCEF;ARABIC LIGATURE NOON WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 0646 0647;;;;N;;;;;
+FCF0;ARABIC LIGATURE YEH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 064A 0645;;;;N;;;;;
+FCF1;ARABIC LIGATURE YEH WITH HEH MEDIAL FORM;Lo;0;AL;<medial> 064A 0647;;;;N;;;;;
+FCF2;ARABIC LIGATURE SHADDA WITH FATHA MEDIAL FORM;Lo;0;AL;<medial> 0640 064E 0651;;;;N;;;;;
+FCF3;ARABIC LIGATURE SHADDA WITH DAMMA MEDIAL FORM;Lo;0;AL;<medial> 0640 064F 0651;;;;N;;;;;
+FCF4;ARABIC LIGATURE SHADDA WITH KASRA MEDIAL FORM;Lo;0;AL;<medial> 0640 0650 0651;;;;N;;;;;
+FCF5;ARABIC LIGATURE TAH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0637 0649;;;;N;;;;;
+FCF6;ARABIC LIGATURE TAH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0637 064A;;;;N;;;;;
+FCF7;ARABIC LIGATURE AIN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0639 0649;;;;N;;;;;
+FCF8;ARABIC LIGATURE AIN WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0639 064A;;;;N;;;;;
+FCF9;ARABIC LIGATURE GHAIN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 063A 0649;;;;N;;;;;
+FCFA;ARABIC LIGATURE GHAIN WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 063A 064A;;;;N;;;;;
+FCFB;ARABIC LIGATURE SEEN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0633 0649;;;;N;;;;;
+FCFC;ARABIC LIGATURE SEEN WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0633 064A;;;;N;;;;;
+FCFD;ARABIC LIGATURE SHEEN WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0634 0649;;;;N;;;;;
+FCFE;ARABIC LIGATURE SHEEN WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0634 064A;;;;N;;;;;
+FCFF;ARABIC LIGATURE HAH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062D 0649;;;;N;;;;;
+FD00;ARABIC LIGATURE HAH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062D 064A;;;;N;;;;;
+FD01;ARABIC LIGATURE JEEM WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062C 0649;;;;N;;;;;
+FD02;ARABIC LIGATURE JEEM WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062C 064A;;;;N;;;;;
+FD03;ARABIC LIGATURE KHAH WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 062E 0649;;;;N;;;;;
+FD04;ARABIC LIGATURE KHAH WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 062E 064A;;;;N;;;;;
+FD05;ARABIC LIGATURE SAD WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0635 0649;;;;N;;;;;
+FD06;ARABIC LIGATURE SAD WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0635 064A;;;;N;;;;;
+FD07;ARABIC LIGATURE DAD WITH ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0636 0649;;;;N;;;;;
+FD08;ARABIC LIGATURE DAD WITH YEH ISOLATED FORM;Lo;0;AL;<isolated> 0636 064A;;;;N;;;;;
+FD09;ARABIC LIGATURE SHEEN WITH JEEM ISOLATED FORM;Lo;0;AL;<isolated> 0634 062C;;;;N;;;;;
+FD0A;ARABIC LIGATURE SHEEN WITH HAH ISOLATED FORM;Lo;0;AL;<isolated> 0634 062D;;;;N;;;;;
+FD0B;ARABIC LIGATURE SHEEN WITH KHAH ISOLATED FORM;Lo;0;AL;<isolated> 0634 062E;;;;N;;;;;
+FD0C;ARABIC LIGATURE SHEEN WITH MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0634 0645;;;;N;;;;;
+FD0D;ARABIC LIGATURE SHEEN WITH REH ISOLATED FORM;Lo;0;AL;<isolated> 0634 0631;;;;N;;;;;
+FD0E;ARABIC LIGATURE SEEN WITH REH ISOLATED FORM;Lo;0;AL;<isolated> 0633 0631;;;;N;;;;;
+FD0F;ARABIC LIGATURE SAD WITH REH ISOLATED FORM;Lo;0;AL;<isolated> 0635 0631;;;;N;;;;;
+FD10;ARABIC LIGATURE DAD WITH REH ISOLATED FORM;Lo;0;AL;<isolated> 0636 0631;;;;N;;;;;
+FD11;ARABIC LIGATURE TAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0637 0649;;;;N;;;;;
+FD12;ARABIC LIGATURE TAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0637 064A;;;;N;;;;;
+FD13;ARABIC LIGATURE AIN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0639 0649;;;;N;;;;;
+FD14;ARABIC LIGATURE AIN WITH YEH FINAL FORM;Lo;0;AL;<final> 0639 064A;;;;N;;;;;
+FD15;ARABIC LIGATURE GHAIN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 063A 0649;;;;N;;;;;
+FD16;ARABIC LIGATURE GHAIN WITH YEH FINAL FORM;Lo;0;AL;<final> 063A 064A;;;;N;;;;;
+FD17;ARABIC LIGATURE SEEN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0633 0649;;;;N;;;;;
+FD18;ARABIC LIGATURE SEEN WITH YEH FINAL FORM;Lo;0;AL;<final> 0633 064A;;;;N;;;;;
+FD19;ARABIC LIGATURE SHEEN WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0634 0649;;;;N;;;;;
+FD1A;ARABIC LIGATURE SHEEN WITH YEH FINAL FORM;Lo;0;AL;<final> 0634 064A;;;;N;;;;;
+FD1B;ARABIC LIGATURE HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062D 0649;;;;N;;;;;
+FD1C;ARABIC LIGATURE HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 062D 064A;;;;N;;;;;
+FD1D;ARABIC LIGATURE JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062C 0649;;;;N;;;;;
+FD1E;ARABIC LIGATURE JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062C 064A;;;;N;;;;;
+FD1F;ARABIC LIGATURE KHAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062E 0649;;;;N;;;;;
+FD20;ARABIC LIGATURE KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 062E 064A;;;;N;;;;;
+FD21;ARABIC LIGATURE SAD WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0635 0649;;;;N;;;;;
+FD22;ARABIC LIGATURE SAD WITH YEH FINAL FORM;Lo;0;AL;<final> 0635 064A;;;;N;;;;;
+FD23;ARABIC LIGATURE DAD WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0636 0649;;;;N;;;;;
+FD24;ARABIC LIGATURE DAD WITH YEH FINAL FORM;Lo;0;AL;<final> 0636 064A;;;;N;;;;;
+FD25;ARABIC LIGATURE SHEEN WITH JEEM FINAL FORM;Lo;0;AL;<final> 0634 062C;;;;N;;;;;
+FD26;ARABIC LIGATURE SHEEN WITH HAH FINAL FORM;Lo;0;AL;<final> 0634 062D;;;;N;;;;;
+FD27;ARABIC LIGATURE SHEEN WITH KHAH FINAL FORM;Lo;0;AL;<final> 0634 062E;;;;N;;;;;
+FD28;ARABIC LIGATURE SHEEN WITH MEEM FINAL FORM;Lo;0;AL;<final> 0634 0645;;;;N;;;;;
+FD29;ARABIC LIGATURE SHEEN WITH REH FINAL FORM;Lo;0;AL;<final> 0634 0631;;;;N;;;;;
+FD2A;ARABIC LIGATURE SEEN WITH REH FINAL FORM;Lo;0;AL;<final> 0633 0631;;;;N;;;;;
+FD2B;ARABIC LIGATURE SAD WITH REH FINAL FORM;Lo;0;AL;<final> 0635 0631;;;;N;;;;;
+FD2C;ARABIC LIGATURE DAD WITH REH FINAL FORM;Lo;0;AL;<final> 0636 0631;;;;N;;;;;
+FD2D;ARABIC LIGATURE SHEEN WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0634 062C;;;;N;;;;;
+FD2E;ARABIC LIGATURE SHEEN WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0634 062D;;;;N;;;;;
+FD2F;ARABIC LIGATURE SHEEN WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0634 062E;;;;N;;;;;
+FD30;ARABIC LIGATURE SHEEN WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0634 0645;;;;N;;;;;
+FD31;ARABIC LIGATURE SEEN WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0633 0647;;;;N;;;;;
+FD32;ARABIC LIGATURE SHEEN WITH HEH INITIAL FORM;Lo;0;AL;<initial> 0634 0647;;;;N;;;;;
+FD33;ARABIC LIGATURE TAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0637 0645;;;;N;;;;;
+FD34;ARABIC LIGATURE SEEN WITH JEEM MEDIAL FORM;Lo;0;AL;<medial> 0633 062C;;;;N;;;;;
+FD35;ARABIC LIGATURE SEEN WITH HAH MEDIAL FORM;Lo;0;AL;<medial> 0633 062D;;;;N;;;;;
+FD36;ARABIC LIGATURE SEEN WITH KHAH MEDIAL FORM;Lo;0;AL;<medial> 0633 062E;;;;N;;;;;
+FD37;ARABIC LIGATURE SHEEN WITH JEEM MEDIAL FORM;Lo;0;AL;<medial> 0634 062C;;;;N;;;;;
+FD38;ARABIC LIGATURE SHEEN WITH HAH MEDIAL FORM;Lo;0;AL;<medial> 0634 062D;;;;N;;;;;
+FD39;ARABIC LIGATURE SHEEN WITH KHAH MEDIAL FORM;Lo;0;AL;<medial> 0634 062E;;;;N;;;;;
+FD3A;ARABIC LIGATURE TAH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0637 0645;;;;N;;;;;
+FD3B;ARABIC LIGATURE ZAH WITH MEEM MEDIAL FORM;Lo;0;AL;<medial> 0638 0645;;;;N;;;;;
+FD3C;ARABIC LIGATURE ALEF WITH FATHATAN FINAL FORM;Lo;0;AL;<final> 0627 064B;;;;N;;;;;
+FD3D;ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM;Lo;0;AL;<isolated> 0627 064B;;;;N;;;;;
+FD3E;ORNATE LEFT PARENTHESIS;Ps;0;ON;;;;;N;;;;;
+FD3F;ORNATE RIGHT PARENTHESIS;Pe;0;ON;;;;;N;;;;;
+FD50;ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062C 0645;;;;N;;;;;
+FD51;ARABIC LIGATURE TEH WITH HAH WITH JEEM FINAL FORM;Lo;0;AL;<final> 062A 062D 062C;;;;N;;;;;
+FD52;ARABIC LIGATURE TEH WITH HAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062D 062C;;;;N;;;;;
+FD53;ARABIC LIGATURE TEH WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062D 0645;;;;N;;;;;
+FD54;ARABIC LIGATURE TEH WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 062A 062E 0645;;;;N;;;;;
+FD55;ARABIC LIGATURE TEH WITH MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 062A 0645 062C;;;;N;;;;;
+FD56;ARABIC LIGATURE TEH WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 062A 0645 062D;;;;N;;;;;
+FD57;ARABIC LIGATURE TEH WITH MEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 062A 0645 062E;;;;N;;;;;
+FD58;ARABIC LIGATURE JEEM WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 062C 0645 062D;;;;N;;;;;
+FD59;ARABIC LIGATURE JEEM WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 062C 0645 062D;;;;N;;;;;
+FD5A;ARABIC LIGATURE HAH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062D 0645 064A;;;;N;;;;;
+FD5B;ARABIC LIGATURE HAH WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062D 0645 0649;;;;N;;;;;
+FD5C;ARABIC LIGATURE SEEN WITH HAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0633 062D 062C;;;;N;;;;;
+FD5D;ARABIC LIGATURE SEEN WITH JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0633 062C 062D;;;;N;;;;;
+FD5E;ARABIC LIGATURE SEEN WITH JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0633 062C 0649;;;;N;;;;;
+FD5F;ARABIC LIGATURE SEEN WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0633 0645 062D;;;;N;;;;;
+FD60;ARABIC LIGATURE SEEN WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0633 0645 062D;;;;N;;;;;
+FD61;ARABIC LIGATURE SEEN WITH MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0633 0645 062C;;;;N;;;;;
+FD62;ARABIC LIGATURE SEEN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0633 0645 0645;;;;N;;;;;
+FD63;ARABIC LIGATURE SEEN WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0633 0645 0645;;;;N;;;;;
+FD64;ARABIC LIGATURE SAD WITH HAH WITH HAH FINAL FORM;Lo;0;AL;<final> 0635 062D 062D;;;;N;;;;;
+FD65;ARABIC LIGATURE SAD WITH HAH WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0635 062D 062D;;;;N;;;;;
+FD66;ARABIC LIGATURE SAD WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0635 0645 0645;;;;N;;;;;
+FD67;ARABIC LIGATURE SHEEN WITH HAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0634 062D 0645;;;;N;;;;;
+FD68;ARABIC LIGATURE SHEEN WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0634 062D 0645;;;;N;;;;;
+FD69;ARABIC LIGATURE SHEEN WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0634 062C 064A;;;;N;;;;;
+FD6A;ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH FINAL FORM;Lo;0;AL;<final> 0634 0645 062E;;;;N;;;;;
+FD6B;ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0634 0645 062E;;;;N;;;;;
+FD6C;ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0634 0645 0645;;;;N;;;;;
+FD6D;ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0634 0645 0645;;;;N;;;;;
+FD6E;ARABIC LIGATURE DAD WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0636 062D 0649;;;;N;;;;;
+FD6F;ARABIC LIGATURE DAD WITH KHAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0636 062E 0645;;;;N;;;;;
+FD70;ARABIC LIGATURE DAD WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0636 062E 0645;;;;N;;;;;
+FD71;ARABIC LIGATURE TAH WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0637 0645 062D;;;;N;;;;;
+FD72;ARABIC LIGATURE TAH WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0637 0645 062D;;;;N;;;;;
+FD73;ARABIC LIGATURE TAH WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0637 0645 0645;;;;N;;;;;
+FD74;ARABIC LIGATURE TAH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0637 0645 064A;;;;N;;;;;
+FD75;ARABIC LIGATURE AIN WITH JEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0639 062C 0645;;;;N;;;;;
+FD76;ARABIC LIGATURE AIN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0639 0645 0645;;;;N;;;;;
+FD77;ARABIC LIGATURE AIN WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0639 0645 0645;;;;N;;;;;
+FD78;ARABIC LIGATURE AIN WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0639 0645 0649;;;;N;;;;;
+FD79;ARABIC LIGATURE GHAIN WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 063A 0645 0645;;;;N;;;;;
+FD7A;ARABIC LIGATURE GHAIN WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 063A 0645 064A;;;;N;;;;;
+FD7B;ARABIC LIGATURE GHAIN WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 063A 0645 0649;;;;N;;;;;
+FD7C;ARABIC LIGATURE FEH WITH KHAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0641 062E 0645;;;;N;;;;;
+FD7D;ARABIC LIGATURE FEH WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0641 062E 0645;;;;N;;;;;
+FD7E;ARABIC LIGATURE QAF WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0642 0645 062D;;;;N;;;;;
+FD7F;ARABIC LIGATURE QAF WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0642 0645 0645;;;;N;;;;;
+FD80;ARABIC LIGATURE LAM WITH HAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0644 062D 0645;;;;N;;;;;
+FD81;ARABIC LIGATURE LAM WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0644 062D 064A;;;;N;;;;;
+FD82;ARABIC LIGATURE LAM WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0644 062D 0649;;;;N;;;;;
+FD83;ARABIC LIGATURE LAM WITH JEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062C 062C;;;;N;;;;;
+FD84;ARABIC LIGATURE LAM WITH JEEM WITH JEEM FINAL FORM;Lo;0;AL;<final> 0644 062C 062C;;;;N;;;;;
+FD85;ARABIC LIGATURE LAM WITH KHAH WITH MEEM FINAL FORM;Lo;0;AL;<final> 0644 062E 0645;;;;N;;;;;
+FD86;ARABIC LIGATURE LAM WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062E 0645;;;;N;;;;;
+FD87;ARABIC LIGATURE LAM WITH MEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0644 0645 062D;;;;N;;;;;
+FD88;ARABIC LIGATURE LAM WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0644 0645 062D;;;;N;;;;;
+FD89;ARABIC LIGATURE MEEM WITH HAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062D 062C;;;;N;;;;;
+FD8A;ARABIC LIGATURE MEEM WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062D 0645;;;;N;;;;;
+FD8B;ARABIC LIGATURE MEEM WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0645 062D 064A;;;;N;;;;;
+FD8C;ARABIC LIGATURE MEEM WITH JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0645 062C 062D;;;;N;;;;;
+FD8D;ARABIC LIGATURE MEEM WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062C 0645;;;;N;;;;;
+FD8E;ARABIC LIGATURE MEEM WITH KHAH WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062E 062C;;;;N;;;;;
+FD8F;ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0645 062E 0645;;;;N;;;;;
+FD92;ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM;Lo;0;AL;<initial> 0645 062C 062E;;;;N;;;;;
+FD93;ARABIC LIGATURE HEH WITH MEEM WITH JEEM INITIAL FORM;Lo;0;AL;<initial> 0647 0645 062C;;;;N;;;;;
+FD94;ARABIC LIGATURE HEH WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0647 0645 0645;;;;N;;;;;
+FD95;ARABIC LIGATURE NOON WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0646 062D 0645;;;;N;;;;;
+FD96;ARABIC LIGATURE NOON WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0646 062D 0649;;;;N;;;;;
+FD97;ARABIC LIGATURE NOON WITH JEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0646 062C 0645;;;;N;;;;;
+FD98;ARABIC LIGATURE NOON WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0646 062C 0645;;;;N;;;;;
+FD99;ARABIC LIGATURE NOON WITH JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0646 062C 0649;;;;N;;;;;
+FD9A;ARABIC LIGATURE NOON WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 0645 064A;;;;N;;;;;
+FD9B;ARABIC LIGATURE NOON WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0646 0645 0649;;;;N;;;;;
+FD9C;ARABIC LIGATURE YEH WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 064A 0645 0645;;;;N;;;;;
+FD9D;ARABIC LIGATURE YEH WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 064A 0645 0645;;;;N;;;;;
+FD9E;ARABIC LIGATURE BEH WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0628 062E 064A;;;;N;;;;;
+FD9F;ARABIC LIGATURE TEH WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062A 062C 064A;;;;N;;;;;
+FDA0;ARABIC LIGATURE TEH WITH JEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062A 062C 0649;;;;N;;;;;
+FDA1;ARABIC LIGATURE TEH WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 062A 062E 064A;;;;N;;;;;
+FDA2;ARABIC LIGATURE TEH WITH KHAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062A 062E 0649;;;;N;;;;;
+FDA3;ARABIC LIGATURE TEH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062A 0645 064A;;;;N;;;;;
+FDA4;ARABIC LIGATURE TEH WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062A 0645 0649;;;;N;;;;;
+FDA5;ARABIC LIGATURE JEEM WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062C 0645 064A;;;;N;;;;;
+FDA6;ARABIC LIGATURE JEEM WITH HAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062C 062D 0649;;;;N;;;;;
+FDA7;ARABIC LIGATURE JEEM WITH MEEM WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 062C 0645 0649;;;;N;;;;;
+FDA8;ARABIC LIGATURE SEEN WITH KHAH WITH ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0633 062E 0649;;;;N;;;;;
+FDA9;ARABIC LIGATURE SAD WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0635 062D 064A;;;;N;;;;;
+FDAA;ARABIC LIGATURE SHEEN WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0634 062D 064A;;;;N;;;;;
+FDAB;ARABIC LIGATURE DAD WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0636 062D 064A;;;;N;;;;;
+FDAC;ARABIC LIGATURE LAM WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0644 062C 064A;;;;N;;;;;
+FDAD;ARABIC LIGATURE LAM WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0644 0645 064A;;;;N;;;;;
+FDAE;ARABIC LIGATURE YEH WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 064A 062D 064A;;;;N;;;;;
+FDAF;ARABIC LIGATURE YEH WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 064A 062C 064A;;;;N;;;;;
+FDB0;ARABIC LIGATURE YEH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 064A 0645 064A;;;;N;;;;;
+FDB1;ARABIC LIGATURE MEEM WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0645 0645 064A;;;;N;;;;;
+FDB2;ARABIC LIGATURE QAF WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0642 0645 064A;;;;N;;;;;
+FDB3;ARABIC LIGATURE NOON WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 062D 064A;;;;N;;;;;
+FDB4;ARABIC LIGATURE QAF WITH MEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0642 0645 062D;;;;N;;;;;
+FDB5;ARABIC LIGATURE LAM WITH HAH WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062D 0645;;;;N;;;;;
+FDB6;ARABIC LIGATURE AIN WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0639 0645 064A;;;;N;;;;;
+FDB7;ARABIC LIGATURE KAF WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0643 0645 064A;;;;N;;;;;
+FDB8;ARABIC LIGATURE NOON WITH JEEM WITH HAH INITIAL FORM;Lo;0;AL;<initial> 0646 062C 062D;;;;N;;;;;
+FDB9;ARABIC LIGATURE MEEM WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0645 062E 064A;;;;N;;;;;
+FDBA;ARABIC LIGATURE LAM WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0644 062C 0645;;;;N;;;;;
+FDBB;ARABIC LIGATURE KAF WITH MEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0643 0645 0645;;;;N;;;;;
+FDBC;ARABIC LIGATURE LAM WITH JEEM WITH MEEM FINAL FORM;Lo;0;AL;<final> 0644 062C 0645;;;;N;;;;;
+FDBD;ARABIC LIGATURE NOON WITH JEEM WITH HAH FINAL FORM;Lo;0;AL;<final> 0646 062C 062D;;;;N;;;;;
+FDBE;ARABIC LIGATURE JEEM WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 062C 062D 064A;;;;N;;;;;
+FDBF;ARABIC LIGATURE HAH WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 062D 062C 064A;;;;N;;;;;
+FDC0;ARABIC LIGATURE MEEM WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0645 062C 064A;;;;N;;;;;
+FDC1;ARABIC LIGATURE FEH WITH MEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0641 0645 064A;;;;N;;;;;
+FDC2;ARABIC LIGATURE BEH WITH HAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0628 062D 064A;;;;N;;;;;
+FDC3;ARABIC LIGATURE KAF WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0643 0645 0645;;;;N;;;;;
+FDC4;ARABIC LIGATURE AIN WITH JEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0639 062C 0645;;;;N;;;;;
+FDC5;ARABIC LIGATURE SAD WITH MEEM WITH MEEM INITIAL FORM;Lo;0;AL;<initial> 0635 0645 0645;;;;N;;;;;
+FDC6;ARABIC LIGATURE SEEN WITH KHAH WITH YEH FINAL FORM;Lo;0;AL;<final> 0633 062E 064A;;;;N;;;;;
+FDC7;ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM;Lo;0;AL;<final> 0646 062C 064A;;;;N;;;;;
+FDF0;ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM;Lo;0;AL;<isolated> 0635 0644 06D2;;;;N;;;;;
+FDF1;ARABIC LIGATURE QALA USED AS KORANIC STOP SIGN ISOLATED FORM;Lo;0;AL;<isolated> 0642 0644 06D2;;;;N;;;;;
+FDF2;ARABIC LIGATURE ALLAH ISOLATED FORM;Lo;0;AL;<isolated> 0627 0644 0644 0647;;;;N;;;;;
+FDF3;ARABIC LIGATURE AKBAR ISOLATED FORM;Lo;0;AL;<isolated> 0627 0643 0628 0631;;;;N;;;;;
+FDF4;ARABIC LIGATURE MOHAMMAD ISOLATED FORM;Lo;0;AL;<isolated> 0645 062D 0645 062F;;;;N;;;;;
+FDF5;ARABIC LIGATURE SALAM ISOLATED FORM;Lo;0;AL;<isolated> 0635 0644 0639 0645;;;;N;;;;;
+FDF6;ARABIC LIGATURE RASOUL ISOLATED FORM;Lo;0;AL;<isolated> 0631 0633 0648 0644;;;;N;;;;;
+FDF7;ARABIC LIGATURE ALAYHE ISOLATED FORM;Lo;0;AL;<isolated> 0639 0644 064A 0647;;;;N;;;;;
+FDF8;ARABIC LIGATURE WASALLAM ISOLATED FORM;Lo;0;AL;<isolated> 0648 0633 0644 0645;;;;N;;;;;
+FDF9;ARABIC LIGATURE SALLA ISOLATED FORM;Lo;0;AL;<isolated> 0635 0644 0649;;;;N;;;;;
+FDFA;ARABIC LIGATURE SALLALLAHOU ALAYHE WASALLAM;Lo;0;AL;<isolated> 0635 0644 0649 0020 0627 0644 0644 0647 0020 0639 0644 064A 0647 0020 0648 0633 0644 0645;;;;N;ARABIC LETTER SALLALLAHOU ALAYHE WASALLAM;;;;
+FDFB;ARABIC LIGATURE JALLAJALALOUHOU;Lo;0;AL;<isolated> 062C 0644 0020 062C 0644 0627 0644 0647;;;;N;ARABIC LETTER JALLAJALALOUHOU;;;;
+FDFC;RIAL SIGN;Sc;0;AL;<isolated> 0631 06CC 0627 0644;;;;N;;;;;
+FDFD;ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM;So;0;ON;;;;;N;;;;;
+FE00;VARIATION SELECTOR-1;Mn;0;NSM;;;;;N;;;;;
+FE01;VARIATION SELECTOR-2;Mn;0;NSM;;;;;N;;;;;
+FE02;VARIATION SELECTOR-3;Mn;0;NSM;;;;;N;;;;;
+FE03;VARIATION SELECTOR-4;Mn;0;NSM;;;;;N;;;;;
+FE04;VARIATION SELECTOR-5;Mn;0;NSM;;;;;N;;;;;
+FE05;VARIATION SELECTOR-6;Mn;0;NSM;;;;;N;;;;;
+FE06;VARIATION SELECTOR-7;Mn;0;NSM;;;;;N;;;;;
+FE07;VARIATION SELECTOR-8;Mn;0;NSM;;;;;N;;;;;
+FE08;VARIATION SELECTOR-9;Mn;0;NSM;;;;;N;;;;;
+FE09;VARIATION SELECTOR-10;Mn;0;NSM;;;;;N;;;;;
+FE0A;VARIATION SELECTOR-11;Mn;0;NSM;;;;;N;;;;;
+FE0B;VARIATION SELECTOR-12;Mn;0;NSM;;;;;N;;;;;
+FE0C;VARIATION SELECTOR-13;Mn;0;NSM;;;;;N;;;;;
+FE0D;VARIATION SELECTOR-14;Mn;0;NSM;;;;;N;;;;;
+FE0E;VARIATION SELECTOR-15;Mn;0;NSM;;;;;N;;;;;
+FE0F;VARIATION SELECTOR-16;Mn;0;NSM;;;;;N;;;;;
+FE10;PRESENTATION FORM FOR VERTICAL COMMA;Po;0;ON;<vertical> 002C;;;;N;;;;;
+FE11;PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC COMMA;Po;0;ON;<vertical> 3001;;;;N;;;;;
+FE12;PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC FULL STOP;Po;0;ON;<vertical> 3002;;;;N;;;;;
+FE13;PRESENTATION FORM FOR VERTICAL COLON;Po;0;ON;<vertical> 003A;;;;N;;;;;
+FE14;PRESENTATION FORM FOR VERTICAL SEMICOLON;Po;0;ON;<vertical> 003B;;;;N;;;;;
+FE15;PRESENTATION FORM FOR VERTICAL EXCLAMATION MARK;Po;0;ON;<vertical> 0021;;;;N;;;;;
+FE16;PRESENTATION FORM FOR VERTICAL QUESTION MARK;Po;0;ON;<vertical> 003F;;;;N;;;;;
+FE17;PRESENTATION FORM FOR VERTICAL LEFT WHITE LENTICULAR BRACKET;Ps;0;ON;<vertical> 3016;;;;N;;;;;
+FE18;PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRAKCET;Pe;0;ON;<vertical> 3017;;;;N;;;;;
+FE19;PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS;Po;0;ON;<vertical> 2026;;;;N;;;;;
+FE20;COMBINING LIGATURE LEFT HALF;Mn;230;NSM;;;;;N;;;;;
+FE21;COMBINING LIGATURE RIGHT HALF;Mn;230;NSM;;;;;N;;;;;
+FE22;COMBINING DOUBLE TILDE LEFT HALF;Mn;230;NSM;;;;;N;;;;;
+FE23;COMBINING DOUBLE TILDE RIGHT HALF;Mn;230;NSM;;;;;N;;;;;
+FE24;COMBINING MACRON LEFT HALF;Mn;230;NSM;;;;;N;;;;;
+FE25;COMBINING MACRON RIGHT HALF;Mn;230;NSM;;;;;N;;;;;
+FE26;COMBINING CONJOINING MACRON;Mn;230;NSM;;;;;N;;;;;
+FE30;PRESENTATION FORM FOR VERTICAL TWO DOT LEADER;Po;0;ON;<vertical> 2025;;;;N;GLYPH FOR VERTICAL TWO DOT LEADER;;;;
+FE31;PRESENTATION FORM FOR VERTICAL EM DASH;Pd;0;ON;<vertical> 2014;;;;N;GLYPH FOR VERTICAL EM DASH;;;;
+FE32;PRESENTATION FORM FOR VERTICAL EN DASH;Pd;0;ON;<vertical> 2013;;;;N;GLYPH FOR VERTICAL EN DASH;;;;
+FE33;PRESENTATION FORM FOR VERTICAL LOW LINE;Pc;0;ON;<vertical> 005F;;;;N;GLYPH FOR VERTICAL SPACING UNDERSCORE;;;;
+FE34;PRESENTATION FORM FOR VERTICAL WAVY LOW LINE;Pc;0;ON;<vertical> 005F;;;;N;GLYPH FOR VERTICAL SPACING WAVY UNDERSCORE;;;;
+FE35;PRESENTATION FORM FOR VERTICAL LEFT PARENTHESIS;Ps;0;ON;<vertical> 0028;;;;N;GLYPH FOR VERTICAL OPENING PARENTHESIS;;;;
+FE36;PRESENTATION FORM FOR VERTICAL RIGHT PARENTHESIS;Pe;0;ON;<vertical> 0029;;;;N;GLYPH FOR VERTICAL CLOSING PARENTHESIS;;;;
+FE37;PRESENTATION FORM FOR VERTICAL LEFT CURLY BRACKET;Ps;0;ON;<vertical> 007B;;;;N;GLYPH FOR VERTICAL OPENING CURLY BRACKET;;;;
+FE38;PRESENTATION FORM FOR VERTICAL RIGHT CURLY BRACKET;Pe;0;ON;<vertical> 007D;;;;N;GLYPH FOR VERTICAL CLOSING CURLY BRACKET;;;;
+FE39;PRESENTATION FORM FOR VERTICAL LEFT TORTOISE SHELL BRACKET;Ps;0;ON;<vertical> 3014;;;;N;GLYPH FOR VERTICAL OPENING TORTOISE SHELL BRACKET;;;;
+FE3A;PRESENTATION FORM FOR VERTICAL RIGHT TORTOISE SHELL BRACKET;Pe;0;ON;<vertical> 3015;;;;N;GLYPH FOR VERTICAL CLOSING TORTOISE SHELL BRACKET;;;;
+FE3B;PRESENTATION FORM FOR VERTICAL LEFT BLACK LENTICULAR BRACKET;Ps;0;ON;<vertical> 3010;;;;N;GLYPH FOR VERTICAL OPENING BLACK LENTICULAR BRACKET;;;;
+FE3C;PRESENTATION FORM FOR VERTICAL RIGHT BLACK LENTICULAR BRACKET;Pe;0;ON;<vertical> 3011;;;;N;GLYPH FOR VERTICAL CLOSING BLACK LENTICULAR BRACKET;;;;
+FE3D;PRESENTATION FORM FOR VERTICAL LEFT DOUBLE ANGLE BRACKET;Ps;0;ON;<vertical> 300A;;;;N;GLYPH FOR VERTICAL OPENING DOUBLE ANGLE BRACKET;;;;
+FE3E;PRESENTATION FORM FOR VERTICAL RIGHT DOUBLE ANGLE BRACKET;Pe;0;ON;<vertical> 300B;;;;N;GLYPH FOR VERTICAL CLOSING DOUBLE ANGLE BRACKET;;;;
+FE3F;PRESENTATION FORM FOR VERTICAL LEFT ANGLE BRACKET;Ps;0;ON;<vertical> 3008;;;;N;GLYPH FOR VERTICAL OPENING ANGLE BRACKET;;;;
+FE40;PRESENTATION FORM FOR VERTICAL RIGHT ANGLE BRACKET;Pe;0;ON;<vertical> 3009;;;;N;GLYPH FOR VERTICAL CLOSING ANGLE BRACKET;;;;
+FE41;PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET;Ps;0;ON;<vertical> 300C;;;;N;GLYPH FOR VERTICAL OPENING CORNER BRACKET;;;;
+FE42;PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET;Pe;0;ON;<vertical> 300D;;;;N;GLYPH FOR VERTICAL CLOSING CORNER BRACKET;;;;
+FE43;PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET;Ps;0;ON;<vertical> 300E;;;;N;GLYPH FOR VERTICAL OPENING WHITE CORNER BRACKET;;;;
+FE44;PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET;Pe;0;ON;<vertical> 300F;;;;N;GLYPH FOR VERTICAL CLOSING WHITE CORNER BRACKET;;;;
+FE45;SESAME DOT;Po;0;ON;;;;;N;;;;;
+FE46;WHITE SESAME DOT;Po;0;ON;;;;;N;;;;;
+FE47;PRESENTATION FORM FOR VERTICAL LEFT SQUARE BRACKET;Ps;0;ON;<vertical> 005B;;;;N;;;;;
+FE48;PRESENTATION FORM FOR VERTICAL RIGHT SQUARE BRACKET;Pe;0;ON;<vertical> 005D;;;;N;;;;;
+FE49;DASHED OVERLINE;Po;0;ON;<compat> 203E;;;;N;SPACING DASHED OVERSCORE;;;;
+FE4A;CENTRELINE OVERLINE;Po;0;ON;<compat> 203E;;;;N;SPACING CENTERLINE OVERSCORE;;;;
+FE4B;WAVY OVERLINE;Po;0;ON;<compat> 203E;;;;N;SPACING WAVY OVERSCORE;;;;
+FE4C;DOUBLE WAVY OVERLINE;Po;0;ON;<compat> 203E;;;;N;SPACING DOUBLE WAVY OVERSCORE;;;;
+FE4D;DASHED LOW LINE;Pc;0;ON;<compat> 005F;;;;N;SPACING DASHED UNDERSCORE;;;;
+FE4E;CENTRELINE LOW LINE;Pc;0;ON;<compat> 005F;;;;N;SPACING CENTERLINE UNDERSCORE;;;;
+FE4F;WAVY LOW LINE;Pc;0;ON;<compat> 005F;;;;N;SPACING WAVY UNDERSCORE;;;;
+FE50;SMALL COMMA;Po;0;CS;<small> 002C;;;;N;;;;;
+FE51;SMALL IDEOGRAPHIC COMMA;Po;0;ON;<small> 3001;;;;N;;;;;
+FE52;SMALL FULL STOP;Po;0;CS;<small> 002E;;;;N;SMALL PERIOD;;;;
+FE54;SMALL SEMICOLON;Po;0;ON;<small> 003B;;;;N;;;;;
+FE55;SMALL COLON;Po;0;CS;<small> 003A;;;;N;;;;;
+FE56;SMALL QUESTION MARK;Po;0;ON;<small> 003F;;;;N;;;;;
+FE57;SMALL EXCLAMATION MARK;Po;0;ON;<small> 0021;;;;N;;;;;
+FE58;SMALL EM DASH;Pd;0;ON;<small> 2014;;;;N;;;;;
+FE59;SMALL LEFT PARENTHESIS;Ps;0;ON;<small> 0028;;;;Y;SMALL OPENING PARENTHESIS;;;;
+FE5A;SMALL RIGHT PARENTHESIS;Pe;0;ON;<small> 0029;;;;Y;SMALL CLOSING PARENTHESIS;;;;
+FE5B;SMALL LEFT CURLY BRACKET;Ps;0;ON;<small> 007B;;;;Y;SMALL OPENING CURLY BRACKET;;;;
+FE5C;SMALL RIGHT CURLY BRACKET;Pe;0;ON;<small> 007D;;;;Y;SMALL CLOSING CURLY BRACKET;;;;
+FE5D;SMALL LEFT TORTOISE SHELL BRACKET;Ps;0;ON;<small> 3014;;;;Y;SMALL OPENING TORTOISE SHELL BRACKET;;;;
+FE5E;SMALL RIGHT TORTOISE SHELL BRACKET;Pe;0;ON;<small> 3015;;;;Y;SMALL CLOSING TORTOISE SHELL BRACKET;;;;
+FE5F;SMALL NUMBER SIGN;Po;0;ET;<small> 0023;;;;N;;;;;
+FE60;SMALL AMPERSAND;Po;0;ON;<small> 0026;;;;N;;;;;
+FE61;SMALL ASTERISK;Po;0;ON;<small> 002A;;;;N;;;;;
+FE62;SMALL PLUS SIGN;Sm;0;ES;<small> 002B;;;;N;;;;;
+FE63;SMALL HYPHEN-MINUS;Pd;0;ES;<small> 002D;;;;N;;;;;
+FE64;SMALL LESS-THAN SIGN;Sm;0;ON;<small> 003C;;;;Y;;;;;
+FE65;SMALL GREATER-THAN SIGN;Sm;0;ON;<small> 003E;;;;Y;;;;;
+FE66;SMALL EQUALS SIGN;Sm;0;ON;<small> 003D;;;;N;;;;;
+FE68;SMALL REVERSE SOLIDUS;Po;0;ON;<small> 005C;;;;N;SMALL BACKSLASH;;;;
+FE69;SMALL DOLLAR SIGN;Sc;0;ET;<small> 0024;;;;N;;;;;
+FE6A;SMALL PERCENT SIGN;Po;0;ET;<small> 0025;;;;N;;;;;
+FE6B;SMALL COMMERCIAL AT;Po;0;ON;<small> 0040;;;;N;;;;;
+FE70;ARABIC FATHATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064B;;;;N;ARABIC SPACING FATHATAN;;;;
+FE71;ARABIC TATWEEL WITH FATHATAN ABOVE;Lo;0;AL;<medial> 0640 064B;;;;N;ARABIC FATHATAN ON TATWEEL;;;;
+FE72;ARABIC DAMMATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064C;;;;N;ARABIC SPACING DAMMATAN;;;;
+FE73;ARABIC TAIL FRAGMENT;Lo;0;AL;;;;;N;;;;;
+FE74;ARABIC KASRATAN ISOLATED FORM;Lo;0;AL;<isolated> 0020 064D;;;;N;ARABIC SPACING KASRATAN;;;;
+FE76;ARABIC FATHA ISOLATED FORM;Lo;0;AL;<isolated> 0020 064E;;;;N;ARABIC SPACING FATHAH;;;;
+FE77;ARABIC FATHA MEDIAL FORM;Lo;0;AL;<medial> 0640 064E;;;;N;ARABIC FATHAH ON TATWEEL;;;;
+FE78;ARABIC DAMMA ISOLATED FORM;Lo;0;AL;<isolated> 0020 064F;;;;N;ARABIC SPACING DAMMAH;;;;
+FE79;ARABIC DAMMA MEDIAL FORM;Lo;0;AL;<medial> 0640 064F;;;;N;ARABIC DAMMAH ON TATWEEL;;;;
+FE7A;ARABIC KASRA ISOLATED FORM;Lo;0;AL;<isolated> 0020 0650;;;;N;ARABIC SPACING KASRAH;;;;
+FE7B;ARABIC KASRA MEDIAL FORM;Lo;0;AL;<medial> 0640 0650;;;;N;ARABIC KASRAH ON TATWEEL;;;;
+FE7C;ARABIC SHADDA ISOLATED FORM;Lo;0;AL;<isolated> 0020 0651;;;;N;ARABIC SPACING SHADDAH;;;;
+FE7D;ARABIC SHADDA MEDIAL FORM;Lo;0;AL;<medial> 0640 0651;;;;N;ARABIC SHADDAH ON TATWEEL;;;;
+FE7E;ARABIC SUKUN ISOLATED FORM;Lo;0;AL;<isolated> 0020 0652;;;;N;ARABIC SPACING SUKUN;;;;
+FE7F;ARABIC SUKUN MEDIAL FORM;Lo;0;AL;<medial> 0640 0652;;;;N;ARABIC SUKUN ON TATWEEL;;;;
+FE80;ARABIC LETTER HAMZA ISOLATED FORM;Lo;0;AL;<isolated> 0621;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH;;;;
+FE81;ARABIC LETTER ALEF WITH MADDA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0622;;;;N;GLYPH FOR ISOLATE ARABIC MADDAH ON ALEF;;;;
+FE82;ARABIC LETTER ALEF WITH MADDA ABOVE FINAL FORM;Lo;0;AL;<final> 0622;;;;N;GLYPH FOR FINAL ARABIC MADDAH ON ALEF;;;;
+FE83;ARABIC LETTER ALEF WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0623;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON ALEF;;;;
+FE84;ARABIC LETTER ALEF WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 0623;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON ALEF;;;;
+FE85;ARABIC LETTER WAW WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0624;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON WAW;;;;
+FE86;ARABIC LETTER WAW WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 0624;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON WAW;;;;
+FE87;ARABIC LETTER ALEF WITH HAMZA BELOW ISOLATED FORM;Lo;0;AL;<isolated> 0625;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH UNDER ALEF;;;;
+FE88;ARABIC LETTER ALEF WITH HAMZA BELOW FINAL FORM;Lo;0;AL;<final> 0625;;;;N;GLYPH FOR FINAL ARABIC HAMZAH UNDER ALEF;;;;
+FE89;ARABIC LETTER YEH WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0626;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON YA;;;;
+FE8A;ARABIC LETTER YEH WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 0626;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON YA;;;;
+FE8B;ARABIC LETTER YEH WITH HAMZA ABOVE INITIAL FORM;Lo;0;AL;<initial> 0626;;;;N;GLYPH FOR INITIAL ARABIC HAMZAH ON YA;;;;
+FE8C;ARABIC LETTER YEH WITH HAMZA ABOVE MEDIAL FORM;Lo;0;AL;<medial> 0626;;;;N;GLYPH FOR MEDIAL ARABIC HAMZAH ON YA;;;;
+FE8D;ARABIC LETTER ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0627;;;;N;GLYPH FOR ISOLATE ARABIC ALEF;;;;
+FE8E;ARABIC LETTER ALEF FINAL FORM;Lo;0;AL;<final> 0627;;;;N;GLYPH FOR FINAL ARABIC ALEF;;;;
+FE8F;ARABIC LETTER BEH ISOLATED FORM;Lo;0;AL;<isolated> 0628;;;;N;GLYPH FOR ISOLATE ARABIC BAA;;;;
+FE90;ARABIC LETTER BEH FINAL FORM;Lo;0;AL;<final> 0628;;;;N;GLYPH FOR FINAL ARABIC BAA;;;;
+FE91;ARABIC LETTER BEH INITIAL FORM;Lo;0;AL;<initial> 0628;;;;N;GLYPH FOR INITIAL ARABIC BAA;;;;
+FE92;ARABIC LETTER BEH MEDIAL FORM;Lo;0;AL;<medial> 0628;;;;N;GLYPH FOR MEDIAL ARABIC BAA;;;;
+FE93;ARABIC LETTER TEH MARBUTA ISOLATED FORM;Lo;0;AL;<isolated> 0629;;;;N;GLYPH FOR ISOLATE ARABIC TAA MARBUTAH;;;;
+FE94;ARABIC LETTER TEH MARBUTA FINAL FORM;Lo;0;AL;<final> 0629;;;;N;GLYPH FOR FINAL ARABIC TAA MARBUTAH;;;;
+FE95;ARABIC LETTER TEH ISOLATED FORM;Lo;0;AL;<isolated> 062A;;;;N;GLYPH FOR ISOLATE ARABIC TAA;;;;
+FE96;ARABIC LETTER TEH FINAL FORM;Lo;0;AL;<final> 062A;;;;N;GLYPH FOR FINAL ARABIC TAA;;;;
+FE97;ARABIC LETTER TEH INITIAL FORM;Lo;0;AL;<initial> 062A;;;;N;GLYPH FOR INITIAL ARABIC TAA;;;;
+FE98;ARABIC LETTER TEH MEDIAL FORM;Lo;0;AL;<medial> 062A;;;;N;GLYPH FOR MEDIAL ARABIC TAA;;;;
+FE99;ARABIC LETTER THEH ISOLATED FORM;Lo;0;AL;<isolated> 062B;;;;N;GLYPH FOR ISOLATE ARABIC THAA;;;;
+FE9A;ARABIC LETTER THEH FINAL FORM;Lo;0;AL;<final> 062B;;;;N;GLYPH FOR FINAL ARABIC THAA;;;;
+FE9B;ARABIC LETTER THEH INITIAL FORM;Lo;0;AL;<initial> 062B;;;;N;GLYPH FOR INITIAL ARABIC THAA;;;;
+FE9C;ARABIC LETTER THEH MEDIAL FORM;Lo;0;AL;<medial> 062B;;;;N;GLYPH FOR MEDIAL ARABIC THAA;;;;
+FE9D;ARABIC LETTER JEEM ISOLATED FORM;Lo;0;AL;<isolated> 062C;;;;N;GLYPH FOR ISOLATE ARABIC JEEM;;;;
+FE9E;ARABIC LETTER JEEM FINAL FORM;Lo;0;AL;<final> 062C;;;;N;GLYPH FOR FINAL ARABIC JEEM;;;;
+FE9F;ARABIC LETTER JEEM INITIAL FORM;Lo;0;AL;<initial> 062C;;;;N;GLYPH FOR INITIAL ARABIC JEEM;;;;
+FEA0;ARABIC LETTER JEEM MEDIAL FORM;Lo;0;AL;<medial> 062C;;;;N;GLYPH FOR MEDIAL ARABIC JEEM;;;;
+FEA1;ARABIC LETTER HAH ISOLATED FORM;Lo;0;AL;<isolated> 062D;;;;N;GLYPH FOR ISOLATE ARABIC HAA;;;;
+FEA2;ARABIC LETTER HAH FINAL FORM;Lo;0;AL;<final> 062D;;;;N;GLYPH FOR FINAL ARABIC HAA;;;;
+FEA3;ARABIC LETTER HAH INITIAL FORM;Lo;0;AL;<initial> 062D;;;;N;GLYPH FOR INITIAL ARABIC HAA;;;;
+FEA4;ARABIC LETTER HAH MEDIAL FORM;Lo;0;AL;<medial> 062D;;;;N;GLYPH FOR MEDIAL ARABIC HAA;;;;
+FEA5;ARABIC LETTER KHAH ISOLATED FORM;Lo;0;AL;<isolated> 062E;;;;N;GLYPH FOR ISOLATE ARABIC KHAA;;;;
+FEA6;ARABIC LETTER KHAH FINAL FORM;Lo;0;AL;<final> 062E;;;;N;GLYPH FOR FINAL ARABIC KHAA;;;;
+FEA7;ARABIC LETTER KHAH INITIAL FORM;Lo;0;AL;<initial> 062E;;;;N;GLYPH FOR INITIAL ARABIC KHAA;;;;
+FEA8;ARABIC LETTER KHAH MEDIAL FORM;Lo;0;AL;<medial> 062E;;;;N;GLYPH FOR MEDIAL ARABIC KHAA;;;;
+FEA9;ARABIC LETTER DAL ISOLATED FORM;Lo;0;AL;<isolated> 062F;;;;N;GLYPH FOR ISOLATE ARABIC DAL;;;;
+FEAA;ARABIC LETTER DAL FINAL FORM;Lo;0;AL;<final> 062F;;;;N;GLYPH FOR FINAL ARABIC DAL;;;;
+FEAB;ARABIC LETTER THAL ISOLATED FORM;Lo;0;AL;<isolated> 0630;;;;N;GLYPH FOR ISOLATE ARABIC THAL;;;;
+FEAC;ARABIC LETTER THAL FINAL FORM;Lo;0;AL;<final> 0630;;;;N;GLYPH FOR FINAL ARABIC THAL;;;;
+FEAD;ARABIC LETTER REH ISOLATED FORM;Lo;0;AL;<isolated> 0631;;;;N;GLYPH FOR ISOLATE ARABIC RA;;;;
+FEAE;ARABIC LETTER REH FINAL FORM;Lo;0;AL;<final> 0631;;;;N;GLYPH FOR FINAL ARABIC RA;;;;
+FEAF;ARABIC LETTER ZAIN ISOLATED FORM;Lo;0;AL;<isolated> 0632;;;;N;GLYPH FOR ISOLATE ARABIC ZAIN;;;;
+FEB0;ARABIC LETTER ZAIN FINAL FORM;Lo;0;AL;<final> 0632;;;;N;GLYPH FOR FINAL ARABIC ZAIN;;;;
+FEB1;ARABIC LETTER SEEN ISOLATED FORM;Lo;0;AL;<isolated> 0633;;;;N;GLYPH FOR ISOLATE ARABIC SEEN;;;;
+FEB2;ARABIC LETTER SEEN FINAL FORM;Lo;0;AL;<final> 0633;;;;N;GLYPH FOR FINAL ARABIC SEEN;;;;
+FEB3;ARABIC LETTER SEEN INITIAL FORM;Lo;0;AL;<initial> 0633;;;;N;GLYPH FOR INITIAL ARABIC SEEN;;;;
+FEB4;ARABIC LETTER SEEN MEDIAL FORM;Lo;0;AL;<medial> 0633;;;;N;GLYPH FOR MEDIAL ARABIC SEEN;;;;
+FEB5;ARABIC LETTER SHEEN ISOLATED FORM;Lo;0;AL;<isolated> 0634;;;;N;GLYPH FOR ISOLATE ARABIC SHEEN;;;;
+FEB6;ARABIC LETTER SHEEN FINAL FORM;Lo;0;AL;<final> 0634;;;;N;GLYPH FOR FINAL ARABIC SHEEN;;;;
+FEB7;ARABIC LETTER SHEEN INITIAL FORM;Lo;0;AL;<initial> 0634;;;;N;GLYPH FOR INITIAL ARABIC SHEEN;;;;
+FEB8;ARABIC LETTER SHEEN MEDIAL FORM;Lo;0;AL;<medial> 0634;;;;N;GLYPH FOR MEDIAL ARABIC SHEEN;;;;
+FEB9;ARABIC LETTER SAD ISOLATED FORM;Lo;0;AL;<isolated> 0635;;;;N;GLYPH FOR ISOLATE ARABIC SAD;;;;
+FEBA;ARABIC LETTER SAD FINAL FORM;Lo;0;AL;<final> 0635;;;;N;GLYPH FOR FINAL ARABIC SAD;;;;
+FEBB;ARABIC LETTER SAD INITIAL FORM;Lo;0;AL;<initial> 0635;;;;N;GLYPH FOR INITIAL ARABIC SAD;;;;
+FEBC;ARABIC LETTER SAD MEDIAL FORM;Lo;0;AL;<medial> 0635;;;;N;GLYPH FOR MEDIAL ARABIC SAD;;;;
+FEBD;ARABIC LETTER DAD ISOLATED FORM;Lo;0;AL;<isolated> 0636;;;;N;GLYPH FOR ISOLATE ARABIC DAD;;;;
+FEBE;ARABIC LETTER DAD FINAL FORM;Lo;0;AL;<final> 0636;;;;N;GLYPH FOR FINAL ARABIC DAD;;;;
+FEBF;ARABIC LETTER DAD INITIAL FORM;Lo;0;AL;<initial> 0636;;;;N;GLYPH FOR INITIAL ARABIC DAD;;;;
+FEC0;ARABIC LETTER DAD MEDIAL FORM;Lo;0;AL;<medial> 0636;;;;N;GLYPH FOR MEDIAL ARABIC DAD;;;;
+FEC1;ARABIC LETTER TAH ISOLATED FORM;Lo;0;AL;<isolated> 0637;;;;N;GLYPH FOR ISOLATE ARABIC TAH;;;;
+FEC2;ARABIC LETTER TAH FINAL FORM;Lo;0;AL;<final> 0637;;;;N;GLYPH FOR FINAL ARABIC TAH;;;;
+FEC3;ARABIC LETTER TAH INITIAL FORM;Lo;0;AL;<initial> 0637;;;;N;GLYPH FOR INITIAL ARABIC TAH;;;;
+FEC4;ARABIC LETTER TAH MEDIAL FORM;Lo;0;AL;<medial> 0637;;;;N;GLYPH FOR MEDIAL ARABIC TAH;;;;
+FEC5;ARABIC LETTER ZAH ISOLATED FORM;Lo;0;AL;<isolated> 0638;;;;N;GLYPH FOR ISOLATE ARABIC DHAH;;;;
+FEC6;ARABIC LETTER ZAH FINAL FORM;Lo;0;AL;<final> 0638;;;;N;GLYPH FOR FINAL ARABIC DHAH;;;;
+FEC7;ARABIC LETTER ZAH INITIAL FORM;Lo;0;AL;<initial> 0638;;;;N;GLYPH FOR INITIAL ARABIC DHAH;;;;
+FEC8;ARABIC LETTER ZAH MEDIAL FORM;Lo;0;AL;<medial> 0638;;;;N;GLYPH FOR MEDIAL ARABIC DHAH;;;;
+FEC9;ARABIC LETTER AIN ISOLATED FORM;Lo;0;AL;<isolated> 0639;;;;N;GLYPH FOR ISOLATE ARABIC AIN;;;;
+FECA;ARABIC LETTER AIN FINAL FORM;Lo;0;AL;<final> 0639;;;;N;GLYPH FOR FINAL ARABIC AIN;;;;
+FECB;ARABIC LETTER AIN INITIAL FORM;Lo;0;AL;<initial> 0639;;;;N;GLYPH FOR INITIAL ARABIC AIN;;;;
+FECC;ARABIC LETTER AIN MEDIAL FORM;Lo;0;AL;<medial> 0639;;;;N;GLYPH FOR MEDIAL ARABIC AIN;;;;
+FECD;ARABIC LETTER GHAIN ISOLATED FORM;Lo;0;AL;<isolated> 063A;;;;N;GLYPH FOR ISOLATE ARABIC GHAIN;;;;
+FECE;ARABIC LETTER GHAIN FINAL FORM;Lo;0;AL;<final> 063A;;;;N;GLYPH FOR FINAL ARABIC GHAIN;;;;
+FECF;ARABIC LETTER GHAIN INITIAL FORM;Lo;0;AL;<initial> 063A;;;;N;GLYPH FOR INITIAL ARABIC GHAIN;;;;
+FED0;ARABIC LETTER GHAIN MEDIAL FORM;Lo;0;AL;<medial> 063A;;;;N;GLYPH FOR MEDIAL ARABIC GHAIN;;;;
+FED1;ARABIC LETTER FEH ISOLATED FORM;Lo;0;AL;<isolated> 0641;;;;N;GLYPH FOR ISOLATE ARABIC FA;;;;
+FED2;ARABIC LETTER FEH FINAL FORM;Lo;0;AL;<final> 0641;;;;N;GLYPH FOR FINAL ARABIC FA;;;;
+FED3;ARABIC LETTER FEH INITIAL FORM;Lo;0;AL;<initial> 0641;;;;N;GLYPH FOR INITIAL ARABIC FA;;;;
+FED4;ARABIC LETTER FEH MEDIAL FORM;Lo;0;AL;<medial> 0641;;;;N;GLYPH FOR MEDIAL ARABIC FA;;;;
+FED5;ARABIC LETTER QAF ISOLATED FORM;Lo;0;AL;<isolated> 0642;;;;N;GLYPH FOR ISOLATE ARABIC QAF;;;;
+FED6;ARABIC LETTER QAF FINAL FORM;Lo;0;AL;<final> 0642;;;;N;GLYPH FOR FINAL ARABIC QAF;;;;
+FED7;ARABIC LETTER QAF INITIAL FORM;Lo;0;AL;<initial> 0642;;;;N;GLYPH FOR INITIAL ARABIC QAF;;;;
+FED8;ARABIC LETTER QAF MEDIAL FORM;Lo;0;AL;<medial> 0642;;;;N;GLYPH FOR MEDIAL ARABIC QAF;;;;
+FED9;ARABIC LETTER KAF ISOLATED FORM;Lo;0;AL;<isolated> 0643;;;;N;GLYPH FOR ISOLATE ARABIC CAF;;;;
+FEDA;ARABIC LETTER KAF FINAL FORM;Lo;0;AL;<final> 0643;;;;N;GLYPH FOR FINAL ARABIC CAF;;;;
+FEDB;ARABIC LETTER KAF INITIAL FORM;Lo;0;AL;<initial> 0643;;;;N;GLYPH FOR INITIAL ARABIC CAF;;;;
+FEDC;ARABIC LETTER KAF MEDIAL FORM;Lo;0;AL;<medial> 0643;;;;N;GLYPH FOR MEDIAL ARABIC CAF;;;;
+FEDD;ARABIC LETTER LAM ISOLATED FORM;Lo;0;AL;<isolated> 0644;;;;N;GLYPH FOR ISOLATE ARABIC LAM;;;;
+FEDE;ARABIC LETTER LAM FINAL FORM;Lo;0;AL;<final> 0644;;;;N;GLYPH FOR FINAL ARABIC LAM;;;;
+FEDF;ARABIC LETTER LAM INITIAL FORM;Lo;0;AL;<initial> 0644;;;;N;GLYPH FOR INITIAL ARABIC LAM;;;;
+FEE0;ARABIC LETTER LAM MEDIAL FORM;Lo;0;AL;<medial> 0644;;;;N;GLYPH FOR MEDIAL ARABIC LAM;;;;
+FEE1;ARABIC LETTER MEEM ISOLATED FORM;Lo;0;AL;<isolated> 0645;;;;N;GLYPH FOR ISOLATE ARABIC MEEM;;;;
+FEE2;ARABIC LETTER MEEM FINAL FORM;Lo;0;AL;<final> 0645;;;;N;GLYPH FOR FINAL ARABIC MEEM;;;;
+FEE3;ARABIC LETTER MEEM INITIAL FORM;Lo;0;AL;<initial> 0645;;;;N;GLYPH FOR INITIAL ARABIC MEEM;;;;
+FEE4;ARABIC LETTER MEEM MEDIAL FORM;Lo;0;AL;<medial> 0645;;;;N;GLYPH FOR MEDIAL ARABIC MEEM;;;;
+FEE5;ARABIC LETTER NOON ISOLATED FORM;Lo;0;AL;<isolated> 0646;;;;N;GLYPH FOR ISOLATE ARABIC NOON;;;;
+FEE6;ARABIC LETTER NOON FINAL FORM;Lo;0;AL;<final> 0646;;;;N;GLYPH FOR FINAL ARABIC NOON;;;;
+FEE7;ARABIC LETTER NOON INITIAL FORM;Lo;0;AL;<initial> 0646;;;;N;GLYPH FOR INITIAL ARABIC NOON;;;;
+FEE8;ARABIC LETTER NOON MEDIAL FORM;Lo;0;AL;<medial> 0646;;;;N;GLYPH FOR MEDIAL ARABIC NOON;;;;
+FEE9;ARABIC LETTER HEH ISOLATED FORM;Lo;0;AL;<isolated> 0647;;;;N;GLYPH FOR ISOLATE ARABIC HA;;;;
+FEEA;ARABIC LETTER HEH FINAL FORM;Lo;0;AL;<final> 0647;;;;N;GLYPH FOR FINAL ARABIC HA;;;;
+FEEB;ARABIC LETTER HEH INITIAL FORM;Lo;0;AL;<initial> 0647;;;;N;GLYPH FOR INITIAL ARABIC HA;;;;
+FEEC;ARABIC LETTER HEH MEDIAL FORM;Lo;0;AL;<medial> 0647;;;;N;GLYPH FOR MEDIAL ARABIC HA;;;;
+FEED;ARABIC LETTER WAW ISOLATED FORM;Lo;0;AL;<isolated> 0648;;;;N;GLYPH FOR ISOLATE ARABIC WAW;;;;
+FEEE;ARABIC LETTER WAW FINAL FORM;Lo;0;AL;<final> 0648;;;;N;GLYPH FOR FINAL ARABIC WAW;;;;
+FEEF;ARABIC LETTER ALEF MAKSURA ISOLATED FORM;Lo;0;AL;<isolated> 0649;;;;N;GLYPH FOR ISOLATE ARABIC ALEF MAQSURAH;;;;
+FEF0;ARABIC LETTER ALEF MAKSURA FINAL FORM;Lo;0;AL;<final> 0649;;;;N;GLYPH FOR FINAL ARABIC ALEF MAQSURAH;;;;
+FEF1;ARABIC LETTER YEH ISOLATED FORM;Lo;0;AL;<isolated> 064A;;;;N;GLYPH FOR ISOLATE ARABIC YA;;;;
+FEF2;ARABIC LETTER YEH FINAL FORM;Lo;0;AL;<final> 064A;;;;N;GLYPH FOR FINAL ARABIC YA;;;;
+FEF3;ARABIC LETTER YEH INITIAL FORM;Lo;0;AL;<initial> 064A;;;;N;GLYPH FOR INITIAL ARABIC YA;;;;
+FEF4;ARABIC LETTER YEH MEDIAL FORM;Lo;0;AL;<medial> 064A;;;;N;GLYPH FOR MEDIAL ARABIC YA;;;;
+FEF5;ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0644 0622;;;;N;GLYPH FOR ISOLATE ARABIC MADDAH ON LIGATURE LAM ALEF;;;;
+FEF6;ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE FINAL FORM;Lo;0;AL;<final> 0644 0622;;;;N;GLYPH FOR FINAL ARABIC MADDAH ON LIGATURE LAM ALEF;;;;
+FEF7;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM;Lo;0;AL;<isolated> 0644 0623;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH ON LIGATURE LAM ALEF;;;;
+FEF8;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE FINAL FORM;Lo;0;AL;<final> 0644 0623;;;;N;GLYPH FOR FINAL ARABIC HAMZAH ON LIGATURE LAM ALEF;;;;
+FEF9;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM;Lo;0;AL;<isolated> 0644 0625;;;;N;GLYPH FOR ISOLATE ARABIC HAMZAH UNDER LIGATURE LAM ALEF;;;;
+FEFA;ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW FINAL FORM;Lo;0;AL;<final> 0644 0625;;;;N;GLYPH FOR FINAL ARABIC HAMZAH UNDER LIGATURE LAM ALEF;;;;
+FEFB;ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM;Lo;0;AL;<isolated> 0644 0627;;;;N;GLYPH FOR ISOLATE ARABIC LIGATURE LAM ALEF;;;;
+FEFC;ARABIC LIGATURE LAM WITH ALEF FINAL FORM;Lo;0;AL;<final> 0644 0627;;;;N;GLYPH FOR FINAL ARABIC LIGATURE LAM ALEF;;;;
+FEFF;ZERO WIDTH NO-BREAK SPACE;Cf;0;BN;;;;;N;BYTE ORDER MARK;;;;
+FF01;FULLWIDTH EXCLAMATION MARK;Po;0;ON;<wide> 0021;;;;N;;;;;
+FF02;FULLWIDTH QUOTATION MARK;Po;0;ON;<wide> 0022;;;;N;;;;;
+FF03;FULLWIDTH NUMBER SIGN;Po;0;ET;<wide> 0023;;;;N;;;;;
+FF04;FULLWIDTH DOLLAR SIGN;Sc;0;ET;<wide> 0024;;;;N;;;;;
+FF05;FULLWIDTH PERCENT SIGN;Po;0;ET;<wide> 0025;;;;N;;;;;
+FF06;FULLWIDTH AMPERSAND;Po;0;ON;<wide> 0026;;;;N;;;;;
+FF07;FULLWIDTH APOSTROPHE;Po;0;ON;<wide> 0027;;;;N;;;;;
+FF08;FULLWIDTH LEFT PARENTHESIS;Ps;0;ON;<wide> 0028;;;;Y;FULLWIDTH OPENING PARENTHESIS;;;;
+FF09;FULLWIDTH RIGHT PARENTHESIS;Pe;0;ON;<wide> 0029;;;;Y;FULLWIDTH CLOSING PARENTHESIS;;;;
+FF0A;FULLWIDTH ASTERISK;Po;0;ON;<wide> 002A;;;;N;;;;;
+FF0B;FULLWIDTH PLUS SIGN;Sm;0;ES;<wide> 002B;;;;N;;;;;
+FF0C;FULLWIDTH COMMA;Po;0;CS;<wide> 002C;;;;N;;;;;
+FF0D;FULLWIDTH HYPHEN-MINUS;Pd;0;ES;<wide> 002D;;;;N;;;;;
+FF0E;FULLWIDTH FULL STOP;Po;0;CS;<wide> 002E;;;;N;FULLWIDTH PERIOD;;;;
+FF0F;FULLWIDTH SOLIDUS;Po;0;CS;<wide> 002F;;;;N;FULLWIDTH SLASH;;;;
+FF10;FULLWIDTH DIGIT ZERO;Nd;0;EN;<wide> 0030;0;0;0;N;;;;;
+FF11;FULLWIDTH DIGIT ONE;Nd;0;EN;<wide> 0031;1;1;1;N;;;;;
+FF12;FULLWIDTH DIGIT TWO;Nd;0;EN;<wide> 0032;2;2;2;N;;;;;
+FF13;FULLWIDTH DIGIT THREE;Nd;0;EN;<wide> 0033;3;3;3;N;;;;;
+FF14;FULLWIDTH DIGIT FOUR;Nd;0;EN;<wide> 0034;4;4;4;N;;;;;
+FF15;FULLWIDTH DIGIT FIVE;Nd;0;EN;<wide> 0035;5;5;5;N;;;;;
+FF16;FULLWIDTH DIGIT SIX;Nd;0;EN;<wide> 0036;6;6;6;N;;;;;
+FF17;FULLWIDTH DIGIT SEVEN;Nd;0;EN;<wide> 0037;7;7;7;N;;;;;
+FF18;FULLWIDTH DIGIT EIGHT;Nd;0;EN;<wide> 0038;8;8;8;N;;;;;
+FF19;FULLWIDTH DIGIT NINE;Nd;0;EN;<wide> 0039;9;9;9;N;;;;;
+FF1A;FULLWIDTH COLON;Po;0;CS;<wide> 003A;;;;N;;;;;
+FF1B;FULLWIDTH SEMICOLON;Po;0;ON;<wide> 003B;;;;N;;;;;
+FF1C;FULLWIDTH LESS-THAN SIGN;Sm;0;ON;<wide> 003C;;;;Y;;;;;
+FF1D;FULLWIDTH EQUALS SIGN;Sm;0;ON;<wide> 003D;;;;N;;;;;
+FF1E;FULLWIDTH GREATER-THAN SIGN;Sm;0;ON;<wide> 003E;;;;Y;;;;;
+FF1F;FULLWIDTH QUESTION MARK;Po;0;ON;<wide> 003F;;;;N;;;;;
+FF20;FULLWIDTH COMMERCIAL AT;Po;0;ON;<wide> 0040;;;;N;;;;;
+FF21;FULLWIDTH LATIN CAPITAL LETTER A;Lu;0;L;<wide> 0041;;;;N;;;;FF41;
+FF22;FULLWIDTH LATIN CAPITAL LETTER B;Lu;0;L;<wide> 0042;;;;N;;;;FF42;
+FF23;FULLWIDTH LATIN CAPITAL LETTER C;Lu;0;L;<wide> 0043;;;;N;;;;FF43;
+FF24;FULLWIDTH LATIN CAPITAL LETTER D;Lu;0;L;<wide> 0044;;;;N;;;;FF44;
+FF25;FULLWIDTH LATIN CAPITAL LETTER E;Lu;0;L;<wide> 0045;;;;N;;;;FF45;
+FF26;FULLWIDTH LATIN CAPITAL LETTER F;Lu;0;L;<wide> 0046;;;;N;;;;FF46;
+FF27;FULLWIDTH LATIN CAPITAL LETTER G;Lu;0;L;<wide> 0047;;;;N;;;;FF47;
+FF28;FULLWIDTH LATIN CAPITAL LETTER H;Lu;0;L;<wide> 0048;;;;N;;;;FF48;
+FF29;FULLWIDTH LATIN CAPITAL LETTER I;Lu;0;L;<wide> 0049;;;;N;;;;FF49;
+FF2A;FULLWIDTH LATIN CAPITAL LETTER J;Lu;0;L;<wide> 004A;;;;N;;;;FF4A;
+FF2B;FULLWIDTH LATIN CAPITAL LETTER K;Lu;0;L;<wide> 004B;;;;N;;;;FF4B;
+FF2C;FULLWIDTH LATIN CAPITAL LETTER L;Lu;0;L;<wide> 004C;;;;N;;;;FF4C;
+FF2D;FULLWIDTH LATIN CAPITAL LETTER M;Lu;0;L;<wide> 004D;;;;N;;;;FF4D;
+FF2E;FULLWIDTH LATIN CAPITAL LETTER N;Lu;0;L;<wide> 004E;;;;N;;;;FF4E;
+FF2F;FULLWIDTH LATIN CAPITAL LETTER O;Lu;0;L;<wide> 004F;;;;N;;;;FF4F;
+FF30;FULLWIDTH LATIN CAPITAL LETTER P;Lu;0;L;<wide> 0050;;;;N;;;;FF50;
+FF31;FULLWIDTH LATIN CAPITAL LETTER Q;Lu;0;L;<wide> 0051;;;;N;;;;FF51;
+FF32;FULLWIDTH LATIN CAPITAL LETTER R;Lu;0;L;<wide> 0052;;;;N;;;;FF52;
+FF33;FULLWIDTH LATIN CAPITAL LETTER S;Lu;0;L;<wide> 0053;;;;N;;;;FF53;
+FF34;FULLWIDTH LATIN CAPITAL LETTER T;Lu;0;L;<wide> 0054;;;;N;;;;FF54;
+FF35;FULLWIDTH LATIN CAPITAL LETTER U;Lu;0;L;<wide> 0055;;;;N;;;;FF55;
+FF36;FULLWIDTH LATIN CAPITAL LETTER V;Lu;0;L;<wide> 0056;;;;N;;;;FF56;
+FF37;FULLWIDTH LATIN CAPITAL LETTER W;Lu;0;L;<wide> 0057;;;;N;;;;FF57;
+FF38;FULLWIDTH LATIN CAPITAL LETTER X;Lu;0;L;<wide> 0058;;;;N;;;;FF58;
+FF39;FULLWIDTH LATIN CAPITAL LETTER Y;Lu;0;L;<wide> 0059;;;;N;;;;FF59;
+FF3A;FULLWIDTH LATIN CAPITAL LETTER Z;Lu;0;L;<wide> 005A;;;;N;;;;FF5A;
+FF3B;FULLWIDTH LEFT SQUARE BRACKET;Ps;0;ON;<wide> 005B;;;;Y;FULLWIDTH OPENING SQUARE BRACKET;;;;
+FF3C;FULLWIDTH REVERSE SOLIDUS;Po;0;ON;<wide> 005C;;;;N;FULLWIDTH BACKSLASH;;;;
+FF3D;FULLWIDTH RIGHT SQUARE BRACKET;Pe;0;ON;<wide> 005D;;;;Y;FULLWIDTH CLOSING SQUARE BRACKET;;;;
+FF3E;FULLWIDTH CIRCUMFLEX ACCENT;Sk;0;ON;<wide> 005E;;;;N;FULLWIDTH SPACING CIRCUMFLEX;;;;
+FF3F;FULLWIDTH LOW LINE;Pc;0;ON;<wide> 005F;;;;N;FULLWIDTH SPACING UNDERSCORE;;;;
+FF40;FULLWIDTH GRAVE ACCENT;Sk;0;ON;<wide> 0060;;;;N;FULLWIDTH SPACING GRAVE;;;;
+FF41;FULLWIDTH LATIN SMALL LETTER A;Ll;0;L;<wide> 0061;;;;N;;;FF21;;FF21
+FF42;FULLWIDTH LATIN SMALL LETTER B;Ll;0;L;<wide> 0062;;;;N;;;FF22;;FF22
+FF43;FULLWIDTH LATIN SMALL LETTER C;Ll;0;L;<wide> 0063;;;;N;;;FF23;;FF23
+FF44;FULLWIDTH LATIN SMALL LETTER D;Ll;0;L;<wide> 0064;;;;N;;;FF24;;FF24
+FF45;FULLWIDTH LATIN SMALL LETTER E;Ll;0;L;<wide> 0065;;;;N;;;FF25;;FF25
+FF46;FULLWIDTH LATIN SMALL LETTER F;Ll;0;L;<wide> 0066;;;;N;;;FF26;;FF26
+FF47;FULLWIDTH LATIN SMALL LETTER G;Ll;0;L;<wide> 0067;;;;N;;;FF27;;FF27
+FF48;FULLWIDTH LATIN SMALL LETTER H;Ll;0;L;<wide> 0068;;;;N;;;FF28;;FF28
+FF49;FULLWIDTH LATIN SMALL LETTER I;Ll;0;L;<wide> 0069;;;;N;;;FF29;;FF29
+FF4A;FULLWIDTH LATIN SMALL LETTER J;Ll;0;L;<wide> 006A;;;;N;;;FF2A;;FF2A
+FF4B;FULLWIDTH LATIN SMALL LETTER K;Ll;0;L;<wide> 006B;;;;N;;;FF2B;;FF2B
+FF4C;FULLWIDTH LATIN SMALL LETTER L;Ll;0;L;<wide> 006C;;;;N;;;FF2C;;FF2C
+FF4D;FULLWIDTH LATIN SMALL LETTER M;Ll;0;L;<wide> 006D;;;;N;;;FF2D;;FF2D
+FF4E;FULLWIDTH LATIN SMALL LETTER N;Ll;0;L;<wide> 006E;;;;N;;;FF2E;;FF2E
+FF4F;FULLWIDTH LATIN SMALL LETTER O;Ll;0;L;<wide> 006F;;;;N;;;FF2F;;FF2F
+FF50;FULLWIDTH LATIN SMALL LETTER P;Ll;0;L;<wide> 0070;;;;N;;;FF30;;FF30
+FF51;FULLWIDTH LATIN SMALL LETTER Q;Ll;0;L;<wide> 0071;;;;N;;;FF31;;FF31
+FF52;FULLWIDTH LATIN SMALL LETTER R;Ll;0;L;<wide> 0072;;;;N;;;FF32;;FF32
+FF53;FULLWIDTH LATIN SMALL LETTER S;Ll;0;L;<wide> 0073;;;;N;;;FF33;;FF33
+FF54;FULLWIDTH LATIN SMALL LETTER T;Ll;0;L;<wide> 0074;;;;N;;;FF34;;FF34
+FF55;FULLWIDTH LATIN SMALL LETTER U;Ll;0;L;<wide> 0075;;;;N;;;FF35;;FF35
+FF56;FULLWIDTH LATIN SMALL LETTER V;Ll;0;L;<wide> 0076;;;;N;;;FF36;;FF36
+FF57;FULLWIDTH LATIN SMALL LETTER W;Ll;0;L;<wide> 0077;;;;N;;;FF37;;FF37
+FF58;FULLWIDTH LATIN SMALL LETTER X;Ll;0;L;<wide> 0078;;;;N;;;FF38;;FF38
+FF59;FULLWIDTH LATIN SMALL LETTER Y;Ll;0;L;<wide> 0079;;;;N;;;FF39;;FF39
+FF5A;FULLWIDTH LATIN SMALL LETTER Z;Ll;0;L;<wide> 007A;;;;N;;;FF3A;;FF3A
+FF5B;FULLWIDTH LEFT CURLY BRACKET;Ps;0;ON;<wide> 007B;;;;Y;FULLWIDTH OPENING CURLY BRACKET;;;;
+FF5C;FULLWIDTH VERTICAL LINE;Sm;0;ON;<wide> 007C;;;;N;FULLWIDTH VERTICAL BAR;;;;
+FF5D;FULLWIDTH RIGHT CURLY BRACKET;Pe;0;ON;<wide> 007D;;;;Y;FULLWIDTH CLOSING CURLY BRACKET;;;;
+FF5E;FULLWIDTH TILDE;Sm;0;ON;<wide> 007E;;;;N;FULLWIDTH SPACING TILDE;;;;
+FF5F;FULLWIDTH LEFT WHITE PARENTHESIS;Ps;0;ON;<wide> 2985;;;;Y;;*;;;
+FF60;FULLWIDTH RIGHT WHITE PARENTHESIS;Pe;0;ON;<wide> 2986;;;;Y;;*;;;
+FF61;HALFWIDTH IDEOGRAPHIC FULL STOP;Po;0;ON;<narrow> 3002;;;;N;HALFWIDTH IDEOGRAPHIC PERIOD;;;;
+FF62;HALFWIDTH LEFT CORNER BRACKET;Ps;0;ON;<narrow> 300C;;;;Y;HALFWIDTH OPENING CORNER BRACKET;;;;
+FF63;HALFWIDTH RIGHT CORNER BRACKET;Pe;0;ON;<narrow> 300D;;;;Y;HALFWIDTH CLOSING CORNER BRACKET;;;;
+FF64;HALFWIDTH IDEOGRAPHIC COMMA;Po;0;ON;<narrow> 3001;;;;N;;;;;
+FF65;HALFWIDTH KATAKANA MIDDLE DOT;Po;0;ON;<narrow> 30FB;;;;N;;;;;
+FF66;HALFWIDTH KATAKANA LETTER WO;Lo;0;L;<narrow> 30F2;;;;N;;;;;
+FF67;HALFWIDTH KATAKANA LETTER SMALL A;Lo;0;L;<narrow> 30A1;;;;N;;;;;
+FF68;HALFWIDTH KATAKANA LETTER SMALL I;Lo;0;L;<narrow> 30A3;;;;N;;;;;
+FF69;HALFWIDTH KATAKANA LETTER SMALL U;Lo;0;L;<narrow> 30A5;;;;N;;;;;
+FF6A;HALFWIDTH KATAKANA LETTER SMALL E;Lo;0;L;<narrow> 30A7;;;;N;;;;;
+FF6B;HALFWIDTH KATAKANA LETTER SMALL O;Lo;0;L;<narrow> 30A9;;;;N;;;;;
+FF6C;HALFWIDTH KATAKANA LETTER SMALL YA;Lo;0;L;<narrow> 30E3;;;;N;;;;;
+FF6D;HALFWIDTH KATAKANA LETTER SMALL YU;Lo;0;L;<narrow> 30E5;;;;N;;;;;
+FF6E;HALFWIDTH KATAKANA LETTER SMALL YO;Lo;0;L;<narrow> 30E7;;;;N;;;;;
+FF6F;HALFWIDTH KATAKANA LETTER SMALL TU;Lo;0;L;<narrow> 30C3;;;;N;;;;;
+FF70;HALFWIDTH KATAKANA-HIRAGANA PROLONGED SOUND MARK;Lm;0;L;<narrow> 30FC;;;;N;;;;;
+FF71;HALFWIDTH KATAKANA LETTER A;Lo;0;L;<narrow> 30A2;;;;N;;;;;
+FF72;HALFWIDTH KATAKANA LETTER I;Lo;0;L;<narrow> 30A4;;;;N;;;;;
+FF73;HALFWIDTH KATAKANA LETTER U;Lo;0;L;<narrow> 30A6;;;;N;;;;;
+FF74;HALFWIDTH KATAKANA LETTER E;Lo;0;L;<narrow> 30A8;;;;N;;;;;
+FF75;HALFWIDTH KATAKANA LETTER O;Lo;0;L;<narrow> 30AA;;;;N;;;;;
+FF76;HALFWIDTH KATAKANA LETTER KA;Lo;0;L;<narrow> 30AB;;;;N;;;;;
+FF77;HALFWIDTH KATAKANA LETTER KI;Lo;0;L;<narrow> 30AD;;;;N;;;;;
+FF78;HALFWIDTH KATAKANA LETTER KU;Lo;0;L;<narrow> 30AF;;;;N;;;;;
+FF79;HALFWIDTH KATAKANA LETTER KE;Lo;0;L;<narrow> 30B1;;;;N;;;;;
+FF7A;HALFWIDTH KATAKANA LETTER KO;Lo;0;L;<narrow> 30B3;;;;N;;;;;
+FF7B;HALFWIDTH KATAKANA LETTER SA;Lo;0;L;<narrow> 30B5;;;;N;;;;;
+FF7C;HALFWIDTH KATAKANA LETTER SI;Lo;0;L;<narrow> 30B7;;;;N;;;;;
+FF7D;HALFWIDTH KATAKANA LETTER SU;Lo;0;L;<narrow> 30B9;;;;N;;;;;
+FF7E;HALFWIDTH KATAKANA LETTER SE;Lo;0;L;<narrow> 30BB;;;;N;;;;;
+FF7F;HALFWIDTH KATAKANA LETTER SO;Lo;0;L;<narrow> 30BD;;;;N;;;;;
+FF80;HALFWIDTH KATAKANA LETTER TA;Lo;0;L;<narrow> 30BF;;;;N;;;;;
+FF81;HALFWIDTH KATAKANA LETTER TI;Lo;0;L;<narrow> 30C1;;;;N;;;;;
+FF82;HALFWIDTH KATAKANA LETTER TU;Lo;0;L;<narrow> 30C4;;;;N;;;;;
+FF83;HALFWIDTH KATAKANA LETTER TE;Lo;0;L;<narrow> 30C6;;;;N;;;;;
+FF84;HALFWIDTH KATAKANA LETTER TO;Lo;0;L;<narrow> 30C8;;;;N;;;;;
+FF85;HALFWIDTH KATAKANA LETTER NA;Lo;0;L;<narrow> 30CA;;;;N;;;;;
+FF86;HALFWIDTH KATAKANA LETTER NI;Lo;0;L;<narrow> 30CB;;;;N;;;;;
+FF87;HALFWIDTH KATAKANA LETTER NU;Lo;0;L;<narrow> 30CC;;;;N;;;;;
+FF88;HALFWIDTH KATAKANA LETTER NE;Lo;0;L;<narrow> 30CD;;;;N;;;;;
+FF89;HALFWIDTH KATAKANA LETTER NO;Lo;0;L;<narrow> 30CE;;;;N;;;;;
+FF8A;HALFWIDTH KATAKANA LETTER HA;Lo;0;L;<narrow> 30CF;;;;N;;;;;
+FF8B;HALFWIDTH KATAKANA LETTER HI;Lo;0;L;<narrow> 30D2;;;;N;;;;;
+FF8C;HALFWIDTH KATAKANA LETTER HU;Lo;0;L;<narrow> 30D5;;;;N;;;;;
+FF8D;HALFWIDTH KATAKANA LETTER HE;Lo;0;L;<narrow> 30D8;;;;N;;;;;
+FF8E;HALFWIDTH KATAKANA LETTER HO;Lo;0;L;<narrow> 30DB;;;;N;;;;;
+FF8F;HALFWIDTH KATAKANA LETTER MA;Lo;0;L;<narrow> 30DE;;;;N;;;;;
+FF90;HALFWIDTH KATAKANA LETTER MI;Lo;0;L;<narrow> 30DF;;;;N;;;;;
+FF91;HALFWIDTH KATAKANA LETTER MU;Lo;0;L;<narrow> 30E0;;;;N;;;;;
+FF92;HALFWIDTH KATAKANA LETTER ME;Lo;0;L;<narrow> 30E1;;;;N;;;;;
+FF93;HALFWIDTH KATAKANA LETTER MO;Lo;0;L;<narrow> 30E2;;;;N;;;;;
+FF94;HALFWIDTH KATAKANA LETTER YA;Lo;0;L;<narrow> 30E4;;;;N;;;;;
+FF95;HALFWIDTH KATAKANA LETTER YU;Lo;0;L;<narrow> 30E6;;;;N;;;;;
+FF96;HALFWIDTH KATAKANA LETTER YO;Lo;0;L;<narrow> 30E8;;;;N;;;;;
+FF97;HALFWIDTH KATAKANA LETTER RA;Lo;0;L;<narrow> 30E9;;;;N;;;;;
+FF98;HALFWIDTH KATAKANA LETTER RI;Lo;0;L;<narrow> 30EA;;;;N;;;;;
+FF99;HALFWIDTH KATAKANA LETTER RU;Lo;0;L;<narrow> 30EB;;;;N;;;;;
+FF9A;HALFWIDTH KATAKANA LETTER RE;Lo;0;L;<narrow> 30EC;;;;N;;;;;
+FF9B;HALFWIDTH KATAKANA LETTER RO;Lo;0;L;<narrow> 30ED;;;;N;;;;;
+FF9C;HALFWIDTH KATAKANA LETTER WA;Lo;0;L;<narrow> 30EF;;;;N;;;;;
+FF9D;HALFWIDTH KATAKANA LETTER N;Lo;0;L;<narrow> 30F3;;;;N;;;;;
+FF9E;HALFWIDTH KATAKANA VOICED SOUND MARK;Lm;0;L;<narrow> 3099;;;;N;;halfwidth katakana-hiragana voiced sound mark;;;
+FF9F;HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK;Lm;0;L;<narrow> 309A;;;;N;;halfwidth katakana-hiragana semi-voiced sound mark;;;
+FFA0;HALFWIDTH HANGUL FILLER;Lo;0;L;<narrow> 3164;;;;N;HALFWIDTH HANGUL CAE OM;;;;
+FFA1;HALFWIDTH HANGUL LETTER KIYEOK;Lo;0;L;<narrow> 3131;;;;N;HALFWIDTH HANGUL LETTER GIYEOG;;;;
+FFA2;HALFWIDTH HANGUL LETTER SSANGKIYEOK;Lo;0;L;<narrow> 3132;;;;N;HALFWIDTH HANGUL LETTER SSANG GIYEOG;;;;
+FFA3;HALFWIDTH HANGUL LETTER KIYEOK-SIOS;Lo;0;L;<narrow> 3133;;;;N;HALFWIDTH HANGUL LETTER GIYEOG SIOS;;;;
+FFA4;HALFWIDTH HANGUL LETTER NIEUN;Lo;0;L;<narrow> 3134;;;;N;;;;;
+FFA5;HALFWIDTH HANGUL LETTER NIEUN-CIEUC;Lo;0;L;<narrow> 3135;;;;N;HALFWIDTH HANGUL LETTER NIEUN JIEUJ;;;;
+FFA6;HALFWIDTH HANGUL LETTER NIEUN-HIEUH;Lo;0;L;<narrow> 3136;;;;N;HALFWIDTH HANGUL LETTER NIEUN HIEUH;;;;
+FFA7;HALFWIDTH HANGUL LETTER TIKEUT;Lo;0;L;<narrow> 3137;;;;N;HALFWIDTH HANGUL LETTER DIGEUD;;;;
+FFA8;HALFWIDTH HANGUL LETTER SSANGTIKEUT;Lo;0;L;<narrow> 3138;;;;N;HALFWIDTH HANGUL LETTER SSANG DIGEUD;;;;
+FFA9;HALFWIDTH HANGUL LETTER RIEUL;Lo;0;L;<narrow> 3139;;;;N;HALFWIDTH HANGUL LETTER LIEUL;;;;
+FFAA;HALFWIDTH HANGUL LETTER RIEUL-KIYEOK;Lo;0;L;<narrow> 313A;;;;N;HALFWIDTH HANGUL LETTER LIEUL GIYEOG;;;;
+FFAB;HALFWIDTH HANGUL LETTER RIEUL-MIEUM;Lo;0;L;<narrow> 313B;;;;N;HALFWIDTH HANGUL LETTER LIEUL MIEUM;;;;
+FFAC;HALFWIDTH HANGUL LETTER RIEUL-PIEUP;Lo;0;L;<narrow> 313C;;;;N;HALFWIDTH HANGUL LETTER LIEUL BIEUB;;;;
+FFAD;HALFWIDTH HANGUL LETTER RIEUL-SIOS;Lo;0;L;<narrow> 313D;;;;N;HALFWIDTH HANGUL LETTER LIEUL SIOS;;;;
+FFAE;HALFWIDTH HANGUL LETTER RIEUL-THIEUTH;Lo;0;L;<narrow> 313E;;;;N;HALFWIDTH HANGUL LETTER LIEUL TIEUT;;;;
+FFAF;HALFWIDTH HANGUL LETTER RIEUL-PHIEUPH;Lo;0;L;<narrow> 313F;;;;N;HALFWIDTH HANGUL LETTER LIEUL PIEUP;;;;
+FFB0;HALFWIDTH HANGUL LETTER RIEUL-HIEUH;Lo;0;L;<narrow> 3140;;;;N;HALFWIDTH HANGUL LETTER LIEUL HIEUH;;;;
+FFB1;HALFWIDTH HANGUL LETTER MIEUM;Lo;0;L;<narrow> 3141;;;;N;;;;;
+FFB2;HALFWIDTH HANGUL LETTER PIEUP;Lo;0;L;<narrow> 3142;;;;N;HALFWIDTH HANGUL LETTER BIEUB;;;;
+FFB3;HALFWIDTH HANGUL LETTER SSANGPIEUP;Lo;0;L;<narrow> 3143;;;;N;HALFWIDTH HANGUL LETTER SSANG BIEUB;;;;
+FFB4;HALFWIDTH HANGUL LETTER PIEUP-SIOS;Lo;0;L;<narrow> 3144;;;;N;HALFWIDTH HANGUL LETTER BIEUB SIOS;;;;
+FFB5;HALFWIDTH HANGUL LETTER SIOS;Lo;0;L;<narrow> 3145;;;;N;;;;;
+FFB6;HALFWIDTH HANGUL LETTER SSANGSIOS;Lo;0;L;<narrow> 3146;;;;N;HALFWIDTH HANGUL LETTER SSANG SIOS;;;;
+FFB7;HALFWIDTH HANGUL LETTER IEUNG;Lo;0;L;<narrow> 3147;;;;N;;;;;
+FFB8;HALFWIDTH HANGUL LETTER CIEUC;Lo;0;L;<narrow> 3148;;;;N;HALFWIDTH HANGUL LETTER JIEUJ;;;;
+FFB9;HALFWIDTH HANGUL LETTER SSANGCIEUC;Lo;0;L;<narrow> 3149;;;;N;HALFWIDTH HANGUL LETTER SSANG JIEUJ;;;;
+FFBA;HALFWIDTH HANGUL LETTER CHIEUCH;Lo;0;L;<narrow> 314A;;;;N;HALFWIDTH HANGUL LETTER CIEUC;;;;
+FFBB;HALFWIDTH HANGUL LETTER KHIEUKH;Lo;0;L;<narrow> 314B;;;;N;HALFWIDTH HANGUL LETTER KIYEOK;;;;
+FFBC;HALFWIDTH HANGUL LETTER THIEUTH;Lo;0;L;<narrow> 314C;;;;N;HALFWIDTH HANGUL LETTER TIEUT;;;;
+FFBD;HALFWIDTH HANGUL LETTER PHIEUPH;Lo;0;L;<narrow> 314D;;;;N;HALFWIDTH HANGUL LETTER PIEUP;;;;
+FFBE;HALFWIDTH HANGUL LETTER HIEUH;Lo;0;L;<narrow> 314E;;;;N;;;;;
+FFC2;HALFWIDTH HANGUL LETTER A;Lo;0;L;<narrow> 314F;;;;N;;;;;
+FFC3;HALFWIDTH HANGUL LETTER AE;Lo;0;L;<narrow> 3150;;;;N;;;;;
+FFC4;HALFWIDTH HANGUL LETTER YA;Lo;0;L;<narrow> 3151;;;;N;;;;;
+FFC5;HALFWIDTH HANGUL LETTER YAE;Lo;0;L;<narrow> 3152;;;;N;;;;;
+FFC6;HALFWIDTH HANGUL LETTER EO;Lo;0;L;<narrow> 3153;;;;N;;;;;
+FFC7;HALFWIDTH HANGUL LETTER E;Lo;0;L;<narrow> 3154;;;;N;;;;;
+FFCA;HALFWIDTH HANGUL LETTER YEO;Lo;0;L;<narrow> 3155;;;;N;;;;;
+FFCB;HALFWIDTH HANGUL LETTER YE;Lo;0;L;<narrow> 3156;;;;N;;;;;
+FFCC;HALFWIDTH HANGUL LETTER O;Lo;0;L;<narrow> 3157;;;;N;;;;;
+FFCD;HALFWIDTH HANGUL LETTER WA;Lo;0;L;<narrow> 3158;;;;N;;;;;
+FFCE;HALFWIDTH HANGUL LETTER WAE;Lo;0;L;<narrow> 3159;;;;N;;;;;
+FFCF;HALFWIDTH HANGUL LETTER OE;Lo;0;L;<narrow> 315A;;;;N;;;;;
+FFD2;HALFWIDTH HANGUL LETTER YO;Lo;0;L;<narrow> 315B;;;;N;;;;;
+FFD3;HALFWIDTH HANGUL LETTER U;Lo;0;L;<narrow> 315C;;;;N;;;;;
+FFD4;HALFWIDTH HANGUL LETTER WEO;Lo;0;L;<narrow> 315D;;;;N;;;;;
+FFD5;HALFWIDTH HANGUL LETTER WE;Lo;0;L;<narrow> 315E;;;;N;;;;;
+FFD6;HALFWIDTH HANGUL LETTER WI;Lo;0;L;<narrow> 315F;;;;N;;;;;
+FFD7;HALFWIDTH HANGUL LETTER YU;Lo;0;L;<narrow> 3160;;;;N;;;;;
+FFDA;HALFWIDTH HANGUL LETTER EU;Lo;0;L;<narrow> 3161;;;;N;;;;;
+FFDB;HALFWIDTH HANGUL LETTER YI;Lo;0;L;<narrow> 3162;;;;N;;;;;
+FFDC;HALFWIDTH HANGUL LETTER I;Lo;0;L;<narrow> 3163;;;;N;;;;;
+FFE0;FULLWIDTH CENT SIGN;Sc;0;ET;<wide> 00A2;;;;N;;;;;
+FFE1;FULLWIDTH POUND SIGN;Sc;0;ET;<wide> 00A3;;;;N;;;;;
+FFE2;FULLWIDTH NOT SIGN;Sm;0;ON;<wide> 00AC;;;;N;;;;;
+FFE3;FULLWIDTH MACRON;Sk;0;ON;<wide> 00AF;;;;N;FULLWIDTH SPACING MACRON;*;;;
+FFE4;FULLWIDTH BROKEN BAR;So;0;ON;<wide> 00A6;;;;N;FULLWIDTH BROKEN VERTICAL BAR;;;;
+FFE5;FULLWIDTH YEN SIGN;Sc;0;ET;<wide> 00A5;;;;N;;;;;
+FFE6;FULLWIDTH WON SIGN;Sc;0;ET;<wide> 20A9;;;;N;;;;;
+FFE8;HALFWIDTH FORMS LIGHT VERTICAL;So;0;ON;<narrow> 2502;;;;N;;;;;
+FFE9;HALFWIDTH LEFTWARDS ARROW;Sm;0;ON;<narrow> 2190;;;;N;;;;;
+FFEA;HALFWIDTH UPWARDS ARROW;Sm;0;ON;<narrow> 2191;;;;N;;;;;
+FFEB;HALFWIDTH RIGHTWARDS ARROW;Sm;0;ON;<narrow> 2192;;;;N;;;;;
+FFEC;HALFWIDTH DOWNWARDS ARROW;Sm;0;ON;<narrow> 2193;;;;N;;;;;
+FFED;HALFWIDTH BLACK SQUARE;So;0;ON;<narrow> 25A0;;;;N;;;;;
+FFEE;HALFWIDTH WHITE CIRCLE;So;0;ON;<narrow> 25CB;;;;N;;;;;
+FFF9;INTERLINEAR ANNOTATION ANCHOR;Cf;0;ON;;;;;N;;;;;
+FFFA;INTERLINEAR ANNOTATION SEPARATOR;Cf;0;ON;;;;;N;;;;;
+FFFB;INTERLINEAR ANNOTATION TERMINATOR;Cf;0;ON;;;;;N;;;;;
+FFFC;OBJECT REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
+FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
+10000;LINEAR B SYLLABLE B008 A;Lo;0;L;;;;;N;;;;;
+10001;LINEAR B SYLLABLE B038 E;Lo;0;L;;;;;N;;;;;
+10002;LINEAR B SYLLABLE B028 I;Lo;0;L;;;;;N;;;;;
+10003;LINEAR B SYLLABLE B061 O;Lo;0;L;;;;;N;;;;;
+10004;LINEAR B SYLLABLE B010 U;Lo;0;L;;;;;N;;;;;
+10005;LINEAR B SYLLABLE B001 DA;Lo;0;L;;;;;N;;;;;
+10006;LINEAR B SYLLABLE B045 DE;Lo;0;L;;;;;N;;;;;
+10007;LINEAR B SYLLABLE B007 DI;Lo;0;L;;;;;N;;;;;
+10008;LINEAR B SYLLABLE B014 DO;Lo;0;L;;;;;N;;;;;
+10009;LINEAR B SYLLABLE B051 DU;Lo;0;L;;;;;N;;;;;
+1000A;LINEAR B SYLLABLE B057 JA;Lo;0;L;;;;;N;;;;;
+1000B;LINEAR B SYLLABLE B046 JE;Lo;0;L;;;;;N;;;;;
+1000D;LINEAR B SYLLABLE B036 JO;Lo;0;L;;;;;N;;;;;
+1000E;LINEAR B SYLLABLE B065 JU;Lo;0;L;;;;;N;;;;;
+1000F;LINEAR B SYLLABLE B077 KA;Lo;0;L;;;;;N;;;;;
+10010;LINEAR B SYLLABLE B044 KE;Lo;0;L;;;;;N;;;;;
+10011;LINEAR B SYLLABLE B067 KI;Lo;0;L;;;;;N;;;;;
+10012;LINEAR B SYLLABLE B070 KO;Lo;0;L;;;;;N;;;;;
+10013;LINEAR B SYLLABLE B081 KU;Lo;0;L;;;;;N;;;;;
+10014;LINEAR B SYLLABLE B080 MA;Lo;0;L;;;;;N;;;;;
+10015;LINEAR B SYLLABLE B013 ME;Lo;0;L;;;;;N;;;;;
+10016;LINEAR B SYLLABLE B073 MI;Lo;0;L;;;;;N;;;;;
+10017;LINEAR B SYLLABLE B015 MO;Lo;0;L;;;;;N;;;;;
+10018;LINEAR B SYLLABLE B023 MU;Lo;0;L;;;;;N;;;;;
+10019;LINEAR B SYLLABLE B006 NA;Lo;0;L;;;;;N;;;;;
+1001A;LINEAR B SYLLABLE B024 NE;Lo;0;L;;;;;N;;;;;
+1001B;LINEAR B SYLLABLE B030 NI;Lo;0;L;;;;;N;;;;;
+1001C;LINEAR B SYLLABLE B052 NO;Lo;0;L;;;;;N;;;;;
+1001D;LINEAR B SYLLABLE B055 NU;Lo;0;L;;;;;N;;;;;
+1001E;LINEAR B SYLLABLE B003 PA;Lo;0;L;;;;;N;;;;;
+1001F;LINEAR B SYLLABLE B072 PE;Lo;0;L;;;;;N;;;;;
+10020;LINEAR B SYLLABLE B039 PI;Lo;0;L;;;;;N;;;;;
+10021;LINEAR B SYLLABLE B011 PO;Lo;0;L;;;;;N;;;;;
+10022;LINEAR B SYLLABLE B050 PU;Lo;0;L;;;;;N;;;;;
+10023;LINEAR B SYLLABLE B016 QA;Lo;0;L;;;;;N;;;;;
+10024;LINEAR B SYLLABLE B078 QE;Lo;0;L;;;;;N;;;;;
+10025;LINEAR B SYLLABLE B021 QI;Lo;0;L;;;;;N;;;;;
+10026;LINEAR B SYLLABLE B032 QO;Lo;0;L;;;;;N;;;;;
+10028;LINEAR B SYLLABLE B060 RA;Lo;0;L;;;;;N;;;;;
+10029;LINEAR B SYLLABLE B027 RE;Lo;0;L;;;;;N;;;;;
+1002A;LINEAR B SYLLABLE B053 RI;Lo;0;L;;;;;N;;;;;
+1002B;LINEAR B SYLLABLE B002 RO;Lo;0;L;;;;;N;;;;;
+1002C;LINEAR B SYLLABLE B026 RU;Lo;0;L;;;;;N;;;;;
+1002D;LINEAR B SYLLABLE B031 SA;Lo;0;L;;;;;N;;;;;
+1002E;LINEAR B SYLLABLE B009 SE;Lo;0;L;;;;;N;;;;;
+1002F;LINEAR B SYLLABLE B041 SI;Lo;0;L;;;;;N;;;;;
+10030;LINEAR B SYLLABLE B012 SO;Lo;0;L;;;;;N;;;;;
+10031;LINEAR B SYLLABLE B058 SU;Lo;0;L;;;;;N;;;;;
+10032;LINEAR B SYLLABLE B059 TA;Lo;0;L;;;;;N;;;;;
+10033;LINEAR B SYLLABLE B004 TE;Lo;0;L;;;;;N;;;;;
+10034;LINEAR B SYLLABLE B037 TI;Lo;0;L;;;;;N;;;;;
+10035;LINEAR B SYLLABLE B005 TO;Lo;0;L;;;;;N;;;;;
+10036;LINEAR B SYLLABLE B069 TU;Lo;0;L;;;;;N;;;;;
+10037;LINEAR B SYLLABLE B054 WA;Lo;0;L;;;;;N;;;;;
+10038;LINEAR B SYLLABLE B075 WE;Lo;0;L;;;;;N;;;;;
+10039;LINEAR B SYLLABLE B040 WI;Lo;0;L;;;;;N;;;;;
+1003A;LINEAR B SYLLABLE B042 WO;Lo;0;L;;;;;N;;;;;
+1003C;LINEAR B SYLLABLE B017 ZA;Lo;0;L;;;;;N;;;;;
+1003D;LINEAR B SYLLABLE B074 ZE;Lo;0;L;;;;;N;;;;;
+1003F;LINEAR B SYLLABLE B020 ZO;Lo;0;L;;;;;N;;;;;
+10040;LINEAR B SYLLABLE B025 A2;Lo;0;L;;;;;N;;;;;
+10041;LINEAR B SYLLABLE B043 A3;Lo;0;L;;;;;N;;;;;
+10042;LINEAR B SYLLABLE B085 AU;Lo;0;L;;;;;N;;;;;
+10043;LINEAR B SYLLABLE B071 DWE;Lo;0;L;;;;;N;;;;;
+10044;LINEAR B SYLLABLE B090 DWO;Lo;0;L;;;;;N;;;;;
+10045;LINEAR B SYLLABLE B048 NWA;Lo;0;L;;;;;N;;;;;
+10046;LINEAR B SYLLABLE B029 PU2;Lo;0;L;;;;;N;;;;;
+10047;LINEAR B SYLLABLE B062 PTE;Lo;0;L;;;;;N;;;;;
+10048;LINEAR B SYLLABLE B076 RA2;Lo;0;L;;;;;N;;;;;
+10049;LINEAR B SYLLABLE B033 RA3;Lo;0;L;;;;;N;;;;;
+1004A;LINEAR B SYLLABLE B068 RO2;Lo;0;L;;;;;N;;;;;
+1004B;LINEAR B SYLLABLE B066 TA2;Lo;0;L;;;;;N;;;;;
+1004C;LINEAR B SYLLABLE B087 TWE;Lo;0;L;;;;;N;;;;;
+1004D;LINEAR B SYLLABLE B091 TWO;Lo;0;L;;;;;N;;;;;
+10050;LINEAR B SYMBOL B018;Lo;0;L;;;;;N;;;;;
+10051;LINEAR B SYMBOL B019;Lo;0;L;;;;;N;;;;;
+10052;LINEAR B SYMBOL B022;Lo;0;L;;;;;N;;;;;
+10053;LINEAR B SYMBOL B034;Lo;0;L;;;;;N;;;;;
+10054;LINEAR B SYMBOL B047;Lo;0;L;;;;;N;;;;;
+10055;LINEAR B SYMBOL B049;Lo;0;L;;;;;N;;;;;
+10056;LINEAR B SYMBOL B056;Lo;0;L;;;;;N;;;;;
+10057;LINEAR B SYMBOL B063;Lo;0;L;;;;;N;;;;;
+10058;LINEAR B SYMBOL B064;Lo;0;L;;;;;N;;;;;
+10059;LINEAR B SYMBOL B079;Lo;0;L;;;;;N;;;;;
+1005A;LINEAR B SYMBOL B082;Lo;0;L;;;;;N;;;;;
+1005B;LINEAR B SYMBOL B083;Lo;0;L;;;;;N;;;;;
+1005C;LINEAR B SYMBOL B086;Lo;0;L;;;;;N;;;;;
+1005D;LINEAR B SYMBOL B089;Lo;0;L;;;;;N;;;;;
+10080;LINEAR B IDEOGRAM B100 MAN;Lo;0;L;;;;;N;;;;;
+10081;LINEAR B IDEOGRAM B102 WOMAN;Lo;0;L;;;;;N;;;;;
+10082;LINEAR B IDEOGRAM B104 DEER;Lo;0;L;;;;;N;;;;;
+10083;LINEAR B IDEOGRAM B105 EQUID;Lo;0;L;;;;;N;;;;;
+10084;LINEAR B IDEOGRAM B105F MARE;Lo;0;L;;;;;N;;;;;
+10085;LINEAR B IDEOGRAM B105M STALLION;Lo;0;L;;;;;N;;;;;
+10086;LINEAR B IDEOGRAM B106F EWE;Lo;0;L;;;;;N;;;;;
+10087;LINEAR B IDEOGRAM B106M RAM;Lo;0;L;;;;;N;;;;;
+10088;LINEAR B IDEOGRAM B107F SHE-GOAT;Lo;0;L;;;;;N;;;;;
+10089;LINEAR B IDEOGRAM B107M HE-GOAT;Lo;0;L;;;;;N;;;;;
+1008A;LINEAR B IDEOGRAM B108F SOW;Lo;0;L;;;;;N;;;;;
+1008B;LINEAR B IDEOGRAM B108M BOAR;Lo;0;L;;;;;N;;;;;
+1008C;LINEAR B IDEOGRAM B109F COW;Lo;0;L;;;;;N;;;;;
+1008D;LINEAR B IDEOGRAM B109M BULL;Lo;0;L;;;;;N;;;;;
+1008E;LINEAR B IDEOGRAM B120 WHEAT;Lo;0;L;;;;;N;;;;;
+1008F;LINEAR B IDEOGRAM B121 BARLEY;Lo;0;L;;;;;N;;;;;
+10090;LINEAR B IDEOGRAM B122 OLIVE;Lo;0;L;;;;;N;;;;;
+10091;LINEAR B IDEOGRAM B123 SPICE;Lo;0;L;;;;;N;;;;;
+10092;LINEAR B IDEOGRAM B125 CYPERUS;Lo;0;L;;;;;N;;;;;
+10093;LINEAR B MONOGRAM B127 KAPO;Lo;0;L;;;;;N;;;;;
+10094;LINEAR B MONOGRAM B128 KANAKO;Lo;0;L;;;;;N;;;;;
+10095;LINEAR B IDEOGRAM B130 OIL;Lo;0;L;;;;;N;;;;;
+10096;LINEAR B IDEOGRAM B131 WINE;Lo;0;L;;;;;N;;;;;
+10097;LINEAR B IDEOGRAM B132;Lo;0;L;;;;;N;;;;;
+10098;LINEAR B MONOGRAM B133 AREPA;Lo;0;L;;;;;N;;;;;
+10099;LINEAR B MONOGRAM B135 MERI;Lo;0;L;;;;;N;;;;;
+1009A;LINEAR B IDEOGRAM B140 BRONZE;Lo;0;L;;;;;N;;;;;
+1009B;LINEAR B IDEOGRAM B141 GOLD;Lo;0;L;;;;;N;;;;;
+1009C;LINEAR B IDEOGRAM B142;Lo;0;L;;;;;N;;;;;
+1009D;LINEAR B IDEOGRAM B145 WOOL;Lo;0;L;;;;;N;;;;;
+1009E;LINEAR B IDEOGRAM B146;Lo;0;L;;;;;N;;;;;
+1009F;LINEAR B IDEOGRAM B150;Lo;0;L;;;;;N;;;;;
+100A0;LINEAR B IDEOGRAM B151 HORN;Lo;0;L;;;;;N;;;;;
+100A1;LINEAR B IDEOGRAM B152;Lo;0;L;;;;;N;;;;;
+100A2;LINEAR B IDEOGRAM B153;Lo;0;L;;;;;N;;;;;
+100A3;LINEAR B IDEOGRAM B154;Lo;0;L;;;;;N;;;;;
+100A4;LINEAR B MONOGRAM B156 TURO2;Lo;0;L;;;;;N;;;;;
+100A5;LINEAR B IDEOGRAM B157;Lo;0;L;;;;;N;;;;;
+100A6;LINEAR B IDEOGRAM B158;Lo;0;L;;;;;N;;;;;
+100A7;LINEAR B IDEOGRAM B159 CLOTH;Lo;0;L;;;;;N;;;;;
+100A8;LINEAR B IDEOGRAM B160;Lo;0;L;;;;;N;;;;;
+100A9;LINEAR B IDEOGRAM B161;Lo;0;L;;;;;N;;;;;
+100AA;LINEAR B IDEOGRAM B162 GARMENT;Lo;0;L;;;;;N;;;;;
+100AB;LINEAR B IDEOGRAM B163 ARMOUR;Lo;0;L;;;;;N;;;;;
+100AC;LINEAR B IDEOGRAM B164;Lo;0;L;;;;;N;;;;;
+100AD;LINEAR B IDEOGRAM B165;Lo;0;L;;;;;N;;;;;
+100AE;LINEAR B IDEOGRAM B166;Lo;0;L;;;;;N;;;;;
+100AF;LINEAR B IDEOGRAM B167;Lo;0;L;;;;;N;;;;;
+100B0;LINEAR B IDEOGRAM B168;Lo;0;L;;;;;N;;;;;
+100B1;LINEAR B IDEOGRAM B169;Lo;0;L;;;;;N;;;;;
+100B2;LINEAR B IDEOGRAM B170;Lo;0;L;;;;;N;;;;;
+100B3;LINEAR B IDEOGRAM B171;Lo;0;L;;;;;N;;;;;
+100B4;LINEAR B IDEOGRAM B172;Lo;0;L;;;;;N;;;;;
+100B5;LINEAR B IDEOGRAM B173 MONTH;Lo;0;L;;;;;N;;;;;
+100B6;LINEAR B IDEOGRAM B174;Lo;0;L;;;;;N;;;;;
+100B7;LINEAR B IDEOGRAM B176 TREE;Lo;0;L;;;;;N;;;;;
+100B8;LINEAR B IDEOGRAM B177;Lo;0;L;;;;;N;;;;;
+100B9;LINEAR B IDEOGRAM B178;Lo;0;L;;;;;N;;;;;
+100BA;LINEAR B IDEOGRAM B179;Lo;0;L;;;;;N;;;;;
+100BB;LINEAR B IDEOGRAM B180;Lo;0;L;;;;;N;;;;;
+100BC;LINEAR B IDEOGRAM B181;Lo;0;L;;;;;N;;;;;
+100BD;LINEAR B IDEOGRAM B182;Lo;0;L;;;;;N;;;;;
+100BE;LINEAR B IDEOGRAM B183;Lo;0;L;;;;;N;;;;;
+100BF;LINEAR B IDEOGRAM B184;Lo;0;L;;;;;N;;;;;
+100C0;LINEAR B IDEOGRAM B185;Lo;0;L;;;;;N;;;;;
+100C1;LINEAR B IDEOGRAM B189;Lo;0;L;;;;;N;;;;;
+100C2;LINEAR B IDEOGRAM B190;Lo;0;L;;;;;N;;;;;
+100C3;LINEAR B IDEOGRAM B191 HELMET;Lo;0;L;;;;;N;;;;;
+100C4;LINEAR B IDEOGRAM B220 FOOTSTOOL;Lo;0;L;;;;;N;;;;;
+100C5;LINEAR B IDEOGRAM B225 BATHTUB;Lo;0;L;;;;;N;;;;;
+100C6;LINEAR B IDEOGRAM B230 SPEAR;Lo;0;L;;;;;N;;;;;
+100C7;LINEAR B IDEOGRAM B231 ARROW;Lo;0;L;;;;;N;;;;;
+100C8;LINEAR B IDEOGRAM B232;Lo;0;L;;;;;N;;;;;
+100C9;LINEAR B IDEOGRAM B233 SWORD;Lo;0;L;;;;;N;;pug;;;
+100CA;LINEAR B IDEOGRAM B234;Lo;0;L;;;;;N;;;;;
+100CB;LINEAR B IDEOGRAM B236;Lo;0;L;;;;;N;;gup;;;
+100CC;LINEAR B IDEOGRAM B240 WHEELED CHARIOT;Lo;0;L;;;;;N;;;;;
+100CD;LINEAR B IDEOGRAM B241 CHARIOT;Lo;0;L;;;;;N;;;;;
+100CE;LINEAR B IDEOGRAM B242 CHARIOT FRAME;Lo;0;L;;;;;N;;;;;
+100CF;LINEAR B IDEOGRAM B243 WHEEL;Lo;0;L;;;;;N;;;;;
+100D0;LINEAR B IDEOGRAM B245;Lo;0;L;;;;;N;;;;;
+100D1;LINEAR B IDEOGRAM B246;Lo;0;L;;;;;N;;;;;
+100D2;LINEAR B MONOGRAM B247 DIPTE;Lo;0;L;;;;;N;;;;;
+100D3;LINEAR B IDEOGRAM B248;Lo;0;L;;;;;N;;;;;
+100D4;LINEAR B IDEOGRAM B249;Lo;0;L;;;;;N;;;;;
+100D5;LINEAR B IDEOGRAM B251;Lo;0;L;;;;;N;;;;;
+100D6;LINEAR B IDEOGRAM B252;Lo;0;L;;;;;N;;;;;
+100D7;LINEAR B IDEOGRAM B253;Lo;0;L;;;;;N;;;;;
+100D8;LINEAR B IDEOGRAM B254 DART;Lo;0;L;;;;;N;;;;;
+100D9;LINEAR B IDEOGRAM B255;Lo;0;L;;;;;N;;;;;
+100DA;LINEAR B IDEOGRAM B256;Lo;0;L;;;;;N;;;;;
+100DB;LINEAR B IDEOGRAM B257;Lo;0;L;;;;;N;;;;;
+100DC;LINEAR B IDEOGRAM B258;Lo;0;L;;;;;N;;;;;
+100DD;LINEAR B IDEOGRAM B259;Lo;0;L;;;;;N;;;;;
+100DE;LINEAR B IDEOGRAM VESSEL B155;Lo;0;L;;;;;N;;;;;
+100DF;LINEAR B IDEOGRAM VESSEL B200;Lo;0;L;;;;;N;;;;;
+100E0;LINEAR B IDEOGRAM VESSEL B201;Lo;0;L;;;;;N;;;;;
+100E1;LINEAR B IDEOGRAM VESSEL B202;Lo;0;L;;;;;N;;;;;
+100E2;LINEAR B IDEOGRAM VESSEL B203;Lo;0;L;;;;;N;;;;;
+100E3;LINEAR B IDEOGRAM VESSEL B204;Lo;0;L;;;;;N;;;;;
+100E4;LINEAR B IDEOGRAM VESSEL B205;Lo;0;L;;;;;N;;;;;
+100E5;LINEAR B IDEOGRAM VESSEL B206;Lo;0;L;;;;;N;;;;;
+100E6;LINEAR B IDEOGRAM VESSEL B207;Lo;0;L;;;;;N;;;;;
+100E7;LINEAR B IDEOGRAM VESSEL B208;Lo;0;L;;;;;N;;;;;
+100E8;LINEAR B IDEOGRAM VESSEL B209;Lo;0;L;;;;;N;;;;;
+100E9;LINEAR B IDEOGRAM VESSEL B210;Lo;0;L;;;;;N;;;;;
+100EA;LINEAR B IDEOGRAM VESSEL B211;Lo;0;L;;;;;N;;;;;
+100EB;LINEAR B IDEOGRAM VESSEL B212;Lo;0;L;;;;;N;;;;;
+100EC;LINEAR B IDEOGRAM VESSEL B213;Lo;0;L;;;;;N;;;;;
+100ED;LINEAR B IDEOGRAM VESSEL B214;Lo;0;L;;;;;N;;;;;
+100EE;LINEAR B IDEOGRAM VESSEL B215;Lo;0;L;;;;;N;;;;;
+100EF;LINEAR B IDEOGRAM VESSEL B216;Lo;0;L;;;;;N;;;;;
+100F0;LINEAR B IDEOGRAM VESSEL B217;Lo;0;L;;;;;N;;;;;
+100F1;LINEAR B IDEOGRAM VESSEL B218;Lo;0;L;;;;;N;;;;;
+100F2;LINEAR B IDEOGRAM VESSEL B219;Lo;0;L;;;;;N;;;;;
+100F3;LINEAR B IDEOGRAM VESSEL B221;Lo;0;L;;;;;N;;;;;
+100F4;LINEAR B IDEOGRAM VESSEL B222;Lo;0;L;;;;;N;;;;;
+100F5;LINEAR B IDEOGRAM VESSEL B226;Lo;0;L;;;;;N;;;;;
+100F6;LINEAR B IDEOGRAM VESSEL B227;Lo;0;L;;;;;N;;;;;
+100F7;LINEAR B IDEOGRAM VESSEL B228;Lo;0;L;;;;;N;;;;;
+100F8;LINEAR B IDEOGRAM VESSEL B229;Lo;0;L;;;;;N;;;;;
+100F9;LINEAR B IDEOGRAM VESSEL B250;Lo;0;L;;;;;N;;;;;
+100FA;LINEAR B IDEOGRAM VESSEL B305;Lo;0;L;;;;;N;;;;;
+10100;AEGEAN WORD SEPARATOR LINE;Po;0;L;;;;;N;;;;;
+10101;AEGEAN WORD SEPARATOR DOT;Po;0;ON;;;;;N;;;;;
+10102;AEGEAN CHECK MARK;So;0;L;;;;;N;;;;;
+10107;AEGEAN NUMBER ONE;No;0;L;;;;1;N;;;;;
+10108;AEGEAN NUMBER TWO;No;0;L;;;;2;N;;;;;
+10109;AEGEAN NUMBER THREE;No;0;L;;;;3;N;;;;;
+1010A;AEGEAN NUMBER FOUR;No;0;L;;;;4;N;;;;;
+1010B;AEGEAN NUMBER FIVE;No;0;L;;;;5;N;;;;;
+1010C;AEGEAN NUMBER SIX;No;0;L;;;;6;N;;;;;
+1010D;AEGEAN NUMBER SEVEN;No;0;L;;;;7;N;;;;;
+1010E;AEGEAN NUMBER EIGHT;No;0;L;;;;8;N;;;;;
+1010F;AEGEAN NUMBER NINE;No;0;L;;;;9;N;;;;;
+10110;AEGEAN NUMBER TEN;No;0;L;;;;10;N;;;;;
+10111;AEGEAN NUMBER TWENTY;No;0;L;;;;20;N;;;;;
+10112;AEGEAN NUMBER THIRTY;No;0;L;;;;30;N;;;;;
+10113;AEGEAN NUMBER FORTY;No;0;L;;;;40;N;;;;;
+10114;AEGEAN NUMBER FIFTY;No;0;L;;;;50;N;;;;;
+10115;AEGEAN NUMBER SIXTY;No;0;L;;;;60;N;;;;;
+10116;AEGEAN NUMBER SEVENTY;No;0;L;;;;70;N;;;;;
+10117;AEGEAN NUMBER EIGHTY;No;0;L;;;;80;N;;;;;
+10118;AEGEAN NUMBER NINETY;No;0;L;;;;90;N;;;;;
+10119;AEGEAN NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;;
+1011A;AEGEAN NUMBER TWO HUNDRED;No;0;L;;;;200;N;;;;;
+1011B;AEGEAN NUMBER THREE HUNDRED;No;0;L;;;;300;N;;;;;
+1011C;AEGEAN NUMBER FOUR HUNDRED;No;0;L;;;;400;N;;;;;
+1011D;AEGEAN NUMBER FIVE HUNDRED;No;0;L;;;;500;N;;;;;
+1011E;AEGEAN NUMBER SIX HUNDRED;No;0;L;;;;600;N;;;;;
+1011F;AEGEAN NUMBER SEVEN HUNDRED;No;0;L;;;;700;N;;;;;
+10120;AEGEAN NUMBER EIGHT HUNDRED;No;0;L;;;;800;N;;;;;
+10121;AEGEAN NUMBER NINE HUNDRED;No;0;L;;;;900;N;;;;;
+10122;AEGEAN NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;;
+10123;AEGEAN NUMBER TWO THOUSAND;No;0;L;;;;2000;N;;;;;
+10124;AEGEAN NUMBER THREE THOUSAND;No;0;L;;;;3000;N;;;;;
+10125;AEGEAN NUMBER FOUR THOUSAND;No;0;L;;;;4000;N;;;;;
+10126;AEGEAN NUMBER FIVE THOUSAND;No;0;L;;;;5000;N;;;;;
+10127;AEGEAN NUMBER SIX THOUSAND;No;0;L;;;;6000;N;;;;;
+10128;AEGEAN NUMBER SEVEN THOUSAND;No;0;L;;;;7000;N;;;;;
+10129;AEGEAN NUMBER EIGHT THOUSAND;No;0;L;;;;8000;N;;;;;
+1012A;AEGEAN NUMBER NINE THOUSAND;No;0;L;;;;9000;N;;;;;
+1012B;AEGEAN NUMBER TEN THOUSAND;No;0;L;;;;10000;N;;;;;
+1012C;AEGEAN NUMBER TWENTY THOUSAND;No;0;L;;;;20000;N;;;;;
+1012D;AEGEAN NUMBER THIRTY THOUSAND;No;0;L;;;;30000;N;;;;;
+1012E;AEGEAN NUMBER FORTY THOUSAND;No;0;L;;;;40000;N;;;;;
+1012F;AEGEAN NUMBER FIFTY THOUSAND;No;0;L;;;;50000;N;;;;;
+10130;AEGEAN NUMBER SIXTY THOUSAND;No;0;L;;;;60000;N;;;;;
+10131;AEGEAN NUMBER SEVENTY THOUSAND;No;0;L;;;;70000;N;;;;;
+10132;AEGEAN NUMBER EIGHTY THOUSAND;No;0;L;;;;80000;N;;;;;
+10133;AEGEAN NUMBER NINETY THOUSAND;No;0;L;;;;90000;N;;;;;
+10137;AEGEAN WEIGHT BASE UNIT;So;0;L;;;;;N;;;;;
+10138;AEGEAN WEIGHT FIRST SUBUNIT;So;0;L;;;;;N;;;;;
+10139;AEGEAN WEIGHT SECOND SUBUNIT;So;0;L;;;;;N;;;;;
+1013A;AEGEAN WEIGHT THIRD SUBUNIT;So;0;L;;;;;N;;;;;
+1013B;AEGEAN WEIGHT FOURTH SUBUNIT;So;0;L;;;;;N;;;;;
+1013C;AEGEAN DRY MEASURE FIRST SUBUNIT;So;0;L;;;;;N;;;;;
+1013D;AEGEAN LIQUID MEASURE FIRST SUBUNIT;So;0;L;;;;;N;;;;;
+1013E;AEGEAN MEASURE SECOND SUBUNIT;So;0;L;;;;;N;;;;;
+1013F;AEGEAN MEASURE THIRD SUBUNIT;So;0;L;;;;;N;;;;;
+10140;GREEK ACROPHONIC ATTIC ONE QUARTER;Nl;0;ON;;;;1/4;N;;;;;
+10141;GREEK ACROPHONIC ATTIC ONE HALF;Nl;0;ON;;;;1/2;N;;;;;
+10142;GREEK ACROPHONIC ATTIC ONE DRACHMA;Nl;0;ON;;;;1;N;;;;;
+10143;GREEK ACROPHONIC ATTIC FIVE;Nl;0;ON;;;;5;N;;;;;
+10144;GREEK ACROPHONIC ATTIC FIFTY;Nl;0;ON;;;;50;N;;;;;
+10145;GREEK ACROPHONIC ATTIC FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+10146;GREEK ACROPHONIC ATTIC FIVE THOUSAND;Nl;0;ON;;;;5000;N;;;;;
+10147;GREEK ACROPHONIC ATTIC FIFTY THOUSAND;Nl;0;ON;;;;50000;N;;;;;
+10148;GREEK ACROPHONIC ATTIC FIVE TALENTS;Nl;0;ON;;;;5;N;;;;;
+10149;GREEK ACROPHONIC ATTIC TEN TALENTS;Nl;0;ON;;;;10;N;;;;;
+1014A;GREEK ACROPHONIC ATTIC FIFTY TALENTS;Nl;0;ON;;;;50;N;;;;;
+1014B;GREEK ACROPHONIC ATTIC ONE HUNDRED TALENTS;Nl;0;ON;;;;100;N;;;;;
+1014C;GREEK ACROPHONIC ATTIC FIVE HUNDRED TALENTS;Nl;0;ON;;;;500;N;;;;;
+1014D;GREEK ACROPHONIC ATTIC ONE THOUSAND TALENTS;Nl;0;ON;;;;1000;N;;;;;
+1014E;GREEK ACROPHONIC ATTIC FIVE THOUSAND TALENTS;Nl;0;ON;;;;5000;N;;;;;
+1014F;GREEK ACROPHONIC ATTIC FIVE STATERS;Nl;0;ON;;;;5;N;;;;;
+10150;GREEK ACROPHONIC ATTIC TEN STATERS;Nl;0;ON;;;;10;N;;;;;
+10151;GREEK ACROPHONIC ATTIC FIFTY STATERS;Nl;0;ON;;;;50;N;;;;;
+10152;GREEK ACROPHONIC ATTIC ONE HUNDRED STATERS;Nl;0;ON;;;;100;N;;;;;
+10153;GREEK ACROPHONIC ATTIC FIVE HUNDRED STATERS;Nl;0;ON;;;;500;N;;;;;
+10154;GREEK ACROPHONIC ATTIC ONE THOUSAND STATERS;Nl;0;ON;;;;1000;N;;;;;
+10155;GREEK ACROPHONIC ATTIC TEN THOUSAND STATERS;Nl;0;ON;;;;10000;N;;;;;
+10156;GREEK ACROPHONIC ATTIC FIFTY THOUSAND STATERS;Nl;0;ON;;;;50000;N;;;;;
+10157;GREEK ACROPHONIC ATTIC TEN MNAS;Nl;0;ON;;;;10;N;;;;;
+10158;GREEK ACROPHONIC HERAEUM ONE PLETHRON;Nl;0;ON;;;;1;N;;;;;
+10159;GREEK ACROPHONIC THESPIAN ONE;Nl;0;ON;;;;1;N;;;;;
+1015A;GREEK ACROPHONIC HERMIONIAN ONE;Nl;0;ON;;;;1;N;;;;;
+1015B;GREEK ACROPHONIC EPIDAUREAN TWO;Nl;0;ON;;;;2;N;;;;;
+1015C;GREEK ACROPHONIC THESPIAN TWO;Nl;0;ON;;;;2;N;;;;;
+1015D;GREEK ACROPHONIC CYRENAIC TWO DRACHMAS;Nl;0;ON;;;;2;N;;;;;
+1015E;GREEK ACROPHONIC EPIDAUREAN TWO DRACHMAS;Nl;0;ON;;;;2;N;;;;;
+1015F;GREEK ACROPHONIC TROEZENIAN FIVE;Nl;0;ON;;;;5;N;;;;;
+10160;GREEK ACROPHONIC TROEZENIAN TEN;Nl;0;ON;;;;10;N;;;;;
+10161;GREEK ACROPHONIC TROEZENIAN TEN ALTERNATE FORM;Nl;0;ON;;;;10;N;;;;;
+10162;GREEK ACROPHONIC HERMIONIAN TEN;Nl;0;ON;;;;10;N;;;;;
+10163;GREEK ACROPHONIC MESSENIAN TEN;Nl;0;ON;;;;10;N;;;;;
+10164;GREEK ACROPHONIC THESPIAN TEN;Nl;0;ON;;;;10;N;;;;;
+10165;GREEK ACROPHONIC THESPIAN THIRTY;Nl;0;ON;;;;30;N;;;;;
+10166;GREEK ACROPHONIC TROEZENIAN FIFTY;Nl;0;ON;;;;50;N;;;;;
+10167;GREEK ACROPHONIC TROEZENIAN FIFTY ALTERNATE FORM;Nl;0;ON;;;;50;N;;;;;
+10168;GREEK ACROPHONIC HERMIONIAN FIFTY;Nl;0;ON;;;;50;N;;;;;
+10169;GREEK ACROPHONIC THESPIAN FIFTY;Nl;0;ON;;;;50;N;;;;;
+1016A;GREEK ACROPHONIC THESPIAN ONE HUNDRED;Nl;0;ON;;;;100;N;;;;;
+1016B;GREEK ACROPHONIC THESPIAN THREE HUNDRED;Nl;0;ON;;;;300;N;;;;;
+1016C;GREEK ACROPHONIC EPIDAUREAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+1016D;GREEK ACROPHONIC TROEZENIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+1016E;GREEK ACROPHONIC THESPIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+1016F;GREEK ACROPHONIC CARYSTIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+10170;GREEK ACROPHONIC NAXIAN FIVE HUNDRED;Nl;0;ON;;;;500;N;;;;;
+10171;GREEK ACROPHONIC THESPIAN ONE THOUSAND;Nl;0;ON;;;;1000;N;;;;;
+10172;GREEK ACROPHONIC THESPIAN FIVE THOUSAND;Nl;0;ON;;;;5000;N;;;;;
+10173;GREEK ACROPHONIC DELPHIC FIVE MNAS;Nl;0;ON;;;;5;N;;;;;
+10174;GREEK ACROPHONIC STRATIAN FIFTY MNAS;Nl;0;ON;;;;50;N;;;;;
+10175;GREEK ONE HALF SIGN;No;0;ON;;;;1/2;N;;;;;
+10176;GREEK ONE HALF SIGN ALTERNATE FORM;No;0;ON;;;;1/2;N;;;;;
+10177;GREEK TWO THIRDS SIGN;No;0;ON;;;;2/3;N;;;;;
+10178;GREEK THREE QUARTERS SIGN;No;0;ON;;;;3/4;N;;;;;
+10179;GREEK YEAR SIGN;So;0;ON;;;;;N;;;;;
+1017A;GREEK TALENT SIGN;So;0;ON;;;;;N;;;;;
+1017B;GREEK DRACHMA SIGN;So;0;ON;;;;;N;;;;;
+1017C;GREEK OBOL SIGN;So;0;ON;;;;;N;;;;;
+1017D;GREEK TWO OBOLS SIGN;So;0;ON;;;;;N;;;;;
+1017E;GREEK THREE OBOLS SIGN;So;0;ON;;;;;N;;;;;
+1017F;GREEK FOUR OBOLS SIGN;So;0;ON;;;;;N;;;;;
+10180;GREEK FIVE OBOLS SIGN;So;0;ON;;;;;N;;;;;
+10181;GREEK METRETES SIGN;So;0;ON;;;;;N;;;;;
+10182;GREEK KYATHOS BASE SIGN;So;0;ON;;;;;N;;;;;
+10183;GREEK LITRA SIGN;So;0;ON;;;;;N;;;;;
+10184;GREEK OUNKIA SIGN;So;0;ON;;;;;N;;;;;
+10185;GREEK XESTES SIGN;So;0;ON;;;;;N;;;;;
+10186;GREEK ARTABE SIGN;So;0;ON;;;;;N;;;;;
+10187;GREEK AROURA SIGN;So;0;ON;;;;;N;;;;;
+10188;GREEK GRAMMA SIGN;So;0;ON;;;;;N;;;;;
+10189;GREEK TRYBLION BASE SIGN;So;0;ON;;;;;N;;;;;
+1018A;GREEK ZERO SIGN;No;0;ON;;;;0;N;;;;;
+10190;ROMAN SEXTANS SIGN;So;0;ON;;;;;N;;;;;
+10191;ROMAN UNCIA SIGN;So;0;ON;;;;;N;;;;;
+10192;ROMAN SEMUNCIA SIGN;So;0;ON;;;;;N;;;;;
+10193;ROMAN SEXTULA SIGN;So;0;ON;;;;;N;;;;;
+10194;ROMAN DIMIDIA SEXTULA SIGN;So;0;ON;;;;;N;;;;;
+10195;ROMAN SILIQUA SIGN;So;0;ON;;;;;N;;;;;
+10196;ROMAN DENARIUS SIGN;So;0;ON;;;;;N;;;;;
+10197;ROMAN QUINARIUS SIGN;So;0;ON;;;;;N;;;;;
+10198;ROMAN SESTERTIUS SIGN;So;0;ON;;;;;N;;;;;
+10199;ROMAN DUPONDIUS SIGN;So;0;ON;;;;;N;;;;;
+1019A;ROMAN AS SIGN;So;0;ON;;;;;N;;;;;
+1019B;ROMAN CENTURIAL SIGN;So;0;ON;;;;;N;;;;;
+101D0;PHAISTOS DISC SIGN PEDESTRIAN;So;0;L;;;;;N;;;;;
+101D1;PHAISTOS DISC SIGN PLUMED HEAD;So;0;L;;;;;N;;;;;
+101D2;PHAISTOS DISC SIGN TATTOOED HEAD;So;0;L;;;;;N;;;;;
+101D3;PHAISTOS DISC SIGN CAPTIVE;So;0;L;;;;;N;;;;;
+101D4;PHAISTOS DISC SIGN CHILD;So;0;L;;;;;N;;;;;
+101D5;PHAISTOS DISC SIGN WOMAN;So;0;L;;;;;N;;;;;
+101D6;PHAISTOS DISC SIGN HELMET;So;0;L;;;;;N;;;;;
+101D7;PHAISTOS DISC SIGN GAUNTLET;So;0;L;;;;;N;;;;;
+101D8;PHAISTOS DISC SIGN TIARA;So;0;L;;;;;N;;;;;
+101D9;PHAISTOS DISC SIGN ARROW;So;0;L;;;;;N;;;;;
+101DA;PHAISTOS DISC SIGN BOW;So;0;L;;;;;N;;;;;
+101DB;PHAISTOS DISC SIGN SHIELD;So;0;L;;;;;N;;;;;
+101DC;PHAISTOS DISC SIGN CLUB;So;0;L;;;;;N;;;;;
+101DD;PHAISTOS DISC SIGN MANACLES;So;0;L;;;;;N;;;;;
+101DE;PHAISTOS DISC SIGN MATTOCK;So;0;L;;;;;N;;;;;
+101DF;PHAISTOS DISC SIGN SAW;So;0;L;;;;;N;;;;;
+101E0;PHAISTOS DISC SIGN LID;So;0;L;;;;;N;;;;;
+101E1;PHAISTOS DISC SIGN BOOMERANG;So;0;L;;;;;N;;;;;
+101E2;PHAISTOS DISC SIGN CARPENTRY PLANE;So;0;L;;;;;N;;;;;
+101E3;PHAISTOS DISC SIGN DOLIUM;So;0;L;;;;;N;;;;;
+101E4;PHAISTOS DISC SIGN COMB;So;0;L;;;;;N;;;;;
+101E5;PHAISTOS DISC SIGN SLING;So;0;L;;;;;N;;;;;
+101E6;PHAISTOS DISC SIGN COLUMN;So;0;L;;;;;N;;;;;
+101E7;PHAISTOS DISC SIGN BEEHIVE;So;0;L;;;;;N;;;;;
+101E8;PHAISTOS DISC SIGN SHIP;So;0;L;;;;;N;;;;;
+101E9;PHAISTOS DISC SIGN HORN;So;0;L;;;;;N;;;;;
+101EA;PHAISTOS DISC SIGN HIDE;So;0;L;;;;;N;;;;;
+101EB;PHAISTOS DISC SIGN BULLS LEG;So;0;L;;;;;N;;;;;
+101EC;PHAISTOS DISC SIGN CAT;So;0;L;;;;;N;;;;;
+101ED;PHAISTOS DISC SIGN RAM;So;0;L;;;;;N;;;;;
+101EE;PHAISTOS DISC SIGN EAGLE;So;0;L;;;;;N;;;;;
+101EF;PHAISTOS DISC SIGN DOVE;So;0;L;;;;;N;;;;;
+101F0;PHAISTOS DISC SIGN TUNNY;So;0;L;;;;;N;;;;;
+101F1;PHAISTOS DISC SIGN BEE;So;0;L;;;;;N;;;;;
+101F2;PHAISTOS DISC SIGN PLANE TREE;So;0;L;;;;;N;;;;;
+101F3;PHAISTOS DISC SIGN VINE;So;0;L;;;;;N;;;;;
+101F4;PHAISTOS DISC SIGN PAPYRUS;So;0;L;;;;;N;;;;;
+101F5;PHAISTOS DISC SIGN ROSETTE;So;0;L;;;;;N;;;;;
+101F6;PHAISTOS DISC SIGN LILY;So;0;L;;;;;N;;;;;
+101F7;PHAISTOS DISC SIGN OX BACK;So;0;L;;;;;N;;;;;
+101F8;PHAISTOS DISC SIGN FLUTE;So;0;L;;;;;N;;;;;
+101F9;PHAISTOS DISC SIGN GRATER;So;0;L;;;;;N;;;;;
+101FA;PHAISTOS DISC SIGN STRAINER;So;0;L;;;;;N;;;;;
+101FB;PHAISTOS DISC SIGN SMALL AXE;So;0;L;;;;;N;;;;;
+101FC;PHAISTOS DISC SIGN WAVY BAND;So;0;L;;;;;N;;;;;
+101FD;PHAISTOS DISC SIGN COMBINING OBLIQUE STROKE;Mn;220;NSM;;;;;N;;;;;
+10280;LYCIAN LETTER A;Lo;0;L;;;;;N;;;;;
+10281;LYCIAN LETTER E;Lo;0;L;;;;;N;;;;;
+10282;LYCIAN LETTER B;Lo;0;L;;;;;N;;;;;
+10283;LYCIAN LETTER BH;Lo;0;L;;;;;N;;;;;
+10284;LYCIAN LETTER G;Lo;0;L;;;;;N;;;;;
+10285;LYCIAN LETTER D;Lo;0;L;;;;;N;;;;;
+10286;LYCIAN LETTER I;Lo;0;L;;;;;N;;;;;
+10287;LYCIAN LETTER W;Lo;0;L;;;;;N;;;;;
+10288;LYCIAN LETTER Z;Lo;0;L;;;;;N;;;;;
+10289;LYCIAN LETTER TH;Lo;0;L;;;;;N;;;;;
+1028A;LYCIAN LETTER J;Lo;0;L;;;;;N;;;;;
+1028B;LYCIAN LETTER K;Lo;0;L;;;;;N;;;;;
+1028C;LYCIAN LETTER Q;Lo;0;L;;;;;N;;;;;
+1028D;LYCIAN LETTER L;Lo;0;L;;;;;N;;;;;
+1028E;LYCIAN LETTER M;Lo;0;L;;;;;N;;;;;
+1028F;LYCIAN LETTER N;Lo;0;L;;;;;N;;;;;
+10290;LYCIAN LETTER MM;Lo;0;L;;;;;N;;;;;
+10291;LYCIAN LETTER NN;Lo;0;L;;;;;N;;;;;
+10292;LYCIAN LETTER U;Lo;0;L;;;;;N;;;;;
+10293;LYCIAN LETTER P;Lo;0;L;;;;;N;;;;;
+10294;LYCIAN LETTER KK;Lo;0;L;;;;;N;;;;;
+10295;LYCIAN LETTER R;Lo;0;L;;;;;N;;;;;
+10296;LYCIAN LETTER S;Lo;0;L;;;;;N;;;;;
+10297;LYCIAN LETTER T;Lo;0;L;;;;;N;;;;;
+10298;LYCIAN LETTER TT;Lo;0;L;;;;;N;;;;;
+10299;LYCIAN LETTER AN;Lo;0;L;;;;;N;;;;;
+1029A;LYCIAN LETTER EN;Lo;0;L;;;;;N;;;;;
+1029B;LYCIAN LETTER H;Lo;0;L;;;;;N;;;;;
+1029C;LYCIAN LETTER X;Lo;0;L;;;;;N;;;;;
+102A0;CARIAN LETTER A;Lo;0;L;;;;;N;;;;;
+102A1;CARIAN LETTER P2;Lo;0;L;;;;;N;;;;;
+102A2;CARIAN LETTER D;Lo;0;L;;;;;N;;;;;
+102A3;CARIAN LETTER L;Lo;0;L;;;;;N;;;;;
+102A4;CARIAN LETTER UUU;Lo;0;L;;;;;N;;;;;
+102A5;CARIAN LETTER R;Lo;0;L;;;;;N;;;;;
+102A6;CARIAN LETTER LD;Lo;0;L;;;;;N;;;;;
+102A7;CARIAN LETTER A2;Lo;0;L;;;;;N;;;;;
+102A8;CARIAN LETTER Q;Lo;0;L;;;;;N;;;;;
+102A9;CARIAN LETTER B;Lo;0;L;;;;;N;;;;;
+102AA;CARIAN LETTER M;Lo;0;L;;;;;N;;;;;
+102AB;CARIAN LETTER O;Lo;0;L;;;;;N;;;;;
+102AC;CARIAN LETTER D2;Lo;0;L;;;;;N;;;;;
+102AD;CARIAN LETTER T;Lo;0;L;;;;;N;;;;;
+102AE;CARIAN LETTER SH;Lo;0;L;;;;;N;;;;;
+102AF;CARIAN LETTER SH2;Lo;0;L;;;;;N;;;;;
+102B0;CARIAN LETTER S;Lo;0;L;;;;;N;;;;;
+102B1;CARIAN LETTER C-18;Lo;0;L;;;;;N;;;;;
+102B2;CARIAN LETTER U;Lo;0;L;;;;;N;;;;;
+102B3;CARIAN LETTER NN;Lo;0;L;;;;;N;;;;;
+102B4;CARIAN LETTER X;Lo;0;L;;;;;N;;;;;
+102B5;CARIAN LETTER N;Lo;0;L;;;;;N;;;;;
+102B6;CARIAN LETTER TT2;Lo;0;L;;;;;N;;;;;
+102B7;CARIAN LETTER P;Lo;0;L;;;;;N;;;;;
+102B8;CARIAN LETTER SS;Lo;0;L;;;;;N;;;;;
+102B9;CARIAN LETTER I;Lo;0;L;;;;;N;;;;;
+102BA;CARIAN LETTER E;Lo;0;L;;;;;N;;;;;
+102BB;CARIAN LETTER UUUU;Lo;0;L;;;;;N;;;;;
+102BC;CARIAN LETTER K;Lo;0;L;;;;;N;;;;;
+102BD;CARIAN LETTER K2;Lo;0;L;;;;;N;;;;;
+102BE;CARIAN LETTER ND;Lo;0;L;;;;;N;;;;;
+102BF;CARIAN LETTER UU;Lo;0;L;;;;;N;;;;;
+102C0;CARIAN LETTER G;Lo;0;L;;;;;N;;;;;
+102C1;CARIAN LETTER G2;Lo;0;L;;;;;N;;;;;
+102C2;CARIAN LETTER ST;Lo;0;L;;;;;N;;;;;
+102C3;CARIAN LETTER ST2;Lo;0;L;;;;;N;;;;;
+102C4;CARIAN LETTER NG;Lo;0;L;;;;;N;;;;;
+102C5;CARIAN LETTER II;Lo;0;L;;;;;N;;;;;
+102C6;CARIAN LETTER C-39;Lo;0;L;;;;;N;;;;;
+102C7;CARIAN LETTER TT;Lo;0;L;;;;;N;;;;;
+102C8;CARIAN LETTER UUU2;Lo;0;L;;;;;N;;;;;
+102C9;CARIAN LETTER RR;Lo;0;L;;;;;N;;;;;
+102CA;CARIAN LETTER MB;Lo;0;L;;;;;N;;;;;
+102CB;CARIAN LETTER MB2;Lo;0;L;;;;;N;;;;;
+102CC;CARIAN LETTER MB3;Lo;0;L;;;;;N;;;;;
+102CD;CARIAN LETTER MB4;Lo;0;L;;;;;N;;;;;
+102CE;CARIAN LETTER LD2;Lo;0;L;;;;;N;;;;;
+102CF;CARIAN LETTER E2;Lo;0;L;;;;;N;;;;;
+102D0;CARIAN LETTER UUU3;Lo;0;L;;;;;N;;;;;
+10300;OLD ITALIC LETTER A;Lo;0;L;;;;;N;;;;;
+10301;OLD ITALIC LETTER BE;Lo;0;L;;;;;N;;;;;
+10302;OLD ITALIC LETTER KE;Lo;0;L;;;;;N;;;;;
+10303;OLD ITALIC LETTER DE;Lo;0;L;;;;;N;;;;;
+10304;OLD ITALIC LETTER E;Lo;0;L;;;;;N;;;;;
+10305;OLD ITALIC LETTER VE;Lo;0;L;;;;;N;;;;;
+10306;OLD ITALIC LETTER ZE;Lo;0;L;;;;;N;;;;;
+10307;OLD ITALIC LETTER HE;Lo;0;L;;;;;N;;;;;
+10308;OLD ITALIC LETTER THE;Lo;0;L;;;;;N;;;;;
+10309;OLD ITALIC LETTER I;Lo;0;L;;;;;N;;;;;
+1030A;OLD ITALIC LETTER KA;Lo;0;L;;;;;N;;;;;
+1030B;OLD ITALIC LETTER EL;Lo;0;L;;;;;N;;;;;
+1030C;OLD ITALIC LETTER EM;Lo;0;L;;;;;N;;;;;
+1030D;OLD ITALIC LETTER EN;Lo;0;L;;;;;N;;;;;
+1030E;OLD ITALIC LETTER ESH;Lo;0;L;;;;;N;;;;;
+1030F;OLD ITALIC LETTER O;Lo;0;L;;;;;N;;Faliscan;;;
+10310;OLD ITALIC LETTER PE;Lo;0;L;;;;;N;;;;;
+10311;OLD ITALIC LETTER SHE;Lo;0;L;;;;;N;;;;;
+10312;OLD ITALIC LETTER KU;Lo;0;L;;;;;N;;;;;
+10313;OLD ITALIC LETTER ER;Lo;0;L;;;;;N;;;;;
+10314;OLD ITALIC LETTER ES;Lo;0;L;;;;;N;;;;;
+10315;OLD ITALIC LETTER TE;Lo;0;L;;;;;N;;;;;
+10316;OLD ITALIC LETTER U;Lo;0;L;;;;;N;;;;;
+10317;OLD ITALIC LETTER EKS;Lo;0;L;;;;;N;;Faliscan;;;
+10318;OLD ITALIC LETTER PHE;Lo;0;L;;;;;N;;;;;
+10319;OLD ITALIC LETTER KHE;Lo;0;L;;;;;N;;;;;
+1031A;OLD ITALIC LETTER EF;Lo;0;L;;;;;N;;;;;
+1031B;OLD ITALIC LETTER ERS;Lo;0;L;;;;;N;;Umbrian;;;
+1031C;OLD ITALIC LETTER CHE;Lo;0;L;;;;;N;;Umbrian;;;
+1031D;OLD ITALIC LETTER II;Lo;0;L;;;;;N;;Oscan;;;
+1031E;OLD ITALIC LETTER UU;Lo;0;L;;;;;N;;Oscan;;;
+10320;OLD ITALIC NUMERAL ONE;No;0;L;;;;1;N;;;;;
+10321;OLD ITALIC NUMERAL FIVE;No;0;L;;;;5;N;;;;;
+10322;OLD ITALIC NUMERAL TEN;No;0;L;;;;10;N;;;;;
+10323;OLD ITALIC NUMERAL FIFTY;No;0;L;;;;50;N;;;;;
+10330;GOTHIC LETTER AHSA;Lo;0;L;;;;;N;;;;;
+10331;GOTHIC LETTER BAIRKAN;Lo;0;L;;;;;N;;;;;
+10332;GOTHIC LETTER GIBA;Lo;0;L;;;;;N;;;;;
+10333;GOTHIC LETTER DAGS;Lo;0;L;;;;;N;;;;;
+10334;GOTHIC LETTER AIHVUS;Lo;0;L;;;;;N;;;;;
+10335;GOTHIC LETTER QAIRTHRA;Lo;0;L;;;;;N;;;;;
+10336;GOTHIC LETTER IUJA;Lo;0;L;;;;;N;;;;;
+10337;GOTHIC LETTER HAGL;Lo;0;L;;;;;N;;;;;
+10338;GOTHIC LETTER THIUTH;Lo;0;L;;;;;N;;;;;
+10339;GOTHIC LETTER EIS;Lo;0;L;;;;;N;;;;;
+1033A;GOTHIC LETTER KUSMA;Lo;0;L;;;;;N;;;;;
+1033B;GOTHIC LETTER LAGUS;Lo;0;L;;;;;N;;;;;
+1033C;GOTHIC LETTER MANNA;Lo;0;L;;;;;N;;;;;
+1033D;GOTHIC LETTER NAUTHS;Lo;0;L;;;;;N;;;;;
+1033E;GOTHIC LETTER JER;Lo;0;L;;;;;N;;;;;
+1033F;GOTHIC LETTER URUS;Lo;0;L;;;;;N;;;;;
+10340;GOTHIC LETTER PAIRTHRA;Lo;0;L;;;;;N;;;;;
+10341;GOTHIC LETTER NINETY;Nl;0;L;;;;90;N;;;;;
+10342;GOTHIC LETTER RAIDA;Lo;0;L;;;;;N;;;;;
+10343;GOTHIC LETTER SAUIL;Lo;0;L;;;;;N;;;;;
+10344;GOTHIC LETTER TEIWS;Lo;0;L;;;;;N;;;;;
+10345;GOTHIC LETTER WINJA;Lo;0;L;;;;;N;;;;;
+10346;GOTHIC LETTER FAIHU;Lo;0;L;;;;;N;;;;;
+10347;GOTHIC LETTER IGGWS;Lo;0;L;;;;;N;;;;;
+10348;GOTHIC LETTER HWAIR;Lo;0;L;;;;;N;;;;;
+10349;GOTHIC LETTER OTHAL;Lo;0;L;;;;;N;;;;;
+1034A;GOTHIC LETTER NINE HUNDRED;Nl;0;L;;;;900;N;;;;;
+10380;UGARITIC LETTER ALPA;Lo;0;L;;;;;N;;;;;
+10381;UGARITIC LETTER BETA;Lo;0;L;;;;;N;;;;;
+10382;UGARITIC LETTER GAMLA;Lo;0;L;;;;;N;;;;;
+10383;UGARITIC LETTER KHA;Lo;0;L;;;;;N;;;;;
+10384;UGARITIC LETTER DELTA;Lo;0;L;;;;;N;;;;;
+10385;UGARITIC LETTER HO;Lo;0;L;;;;;N;;;;;
+10386;UGARITIC LETTER WO;Lo;0;L;;;;;N;;;;;
+10387;UGARITIC LETTER ZETA;Lo;0;L;;;;;N;;;;;
+10388;UGARITIC LETTER HOTA;Lo;0;L;;;;;N;;;;;
+10389;UGARITIC LETTER TET;Lo;0;L;;;;;N;;;;;
+1038A;UGARITIC LETTER YOD;Lo;0;L;;;;;N;;;;;
+1038B;UGARITIC LETTER KAF;Lo;0;L;;;;;N;;;;;
+1038C;UGARITIC LETTER SHIN;Lo;0;L;;;;;N;;;;;
+1038D;UGARITIC LETTER LAMDA;Lo;0;L;;;;;N;;;;;
+1038E;UGARITIC LETTER MEM;Lo;0;L;;;;;N;;;;;
+1038F;UGARITIC LETTER DHAL;Lo;0;L;;;;;N;;;;;
+10390;UGARITIC LETTER NUN;Lo;0;L;;;;;N;;;;;
+10391;UGARITIC LETTER ZU;Lo;0;L;;;;;N;;;;;
+10392;UGARITIC LETTER SAMKA;Lo;0;L;;;;;N;;;;;
+10393;UGARITIC LETTER AIN;Lo;0;L;;;;;N;;;;;
+10394;UGARITIC LETTER PU;Lo;0;L;;;;;N;;;;;
+10395;UGARITIC LETTER SADE;Lo;0;L;;;;;N;;;;;
+10396;UGARITIC LETTER QOPA;Lo;0;L;;;;;N;;;;;
+10397;UGARITIC LETTER RASHA;Lo;0;L;;;;;N;;;;;
+10398;UGARITIC LETTER THANNA;Lo;0;L;;;;;N;;;;;
+10399;UGARITIC LETTER GHAIN;Lo;0;L;;;;;N;;;;;
+1039A;UGARITIC LETTER TO;Lo;0;L;;;;;N;;;;;
+1039B;UGARITIC LETTER I;Lo;0;L;;;;;N;;;;;
+1039C;UGARITIC LETTER U;Lo;0;L;;;;;N;;;;;
+1039D;UGARITIC LETTER SSU;Lo;0;L;;;;;N;;;;;
+1039F;UGARITIC WORD DIVIDER;Po;0;L;;;;;N;;;;;
+103A0;OLD PERSIAN SIGN A;Lo;0;L;;;;;N;;;;;
+103A1;OLD PERSIAN SIGN I;Lo;0;L;;;;;N;;;;;
+103A2;OLD PERSIAN SIGN U;Lo;0;L;;;;;N;;;;;
+103A3;OLD PERSIAN SIGN KA;Lo;0;L;;;;;N;;;;;
+103A4;OLD PERSIAN SIGN KU;Lo;0;L;;;;;N;;;;;
+103A5;OLD PERSIAN SIGN GA;Lo;0;L;;;;;N;;;;;
+103A6;OLD PERSIAN SIGN GU;Lo;0;L;;;;;N;;;;;
+103A7;OLD PERSIAN SIGN XA;Lo;0;L;;;;;N;;;;;
+103A8;OLD PERSIAN SIGN CA;Lo;0;L;;;;;N;;;;;
+103A9;OLD PERSIAN SIGN JA;Lo;0;L;;;;;N;;;;;
+103AA;OLD PERSIAN SIGN JI;Lo;0;L;;;;;N;;;;;
+103AB;OLD PERSIAN SIGN TA;Lo;0;L;;;;;N;;;;;
+103AC;OLD PERSIAN SIGN TU;Lo;0;L;;;;;N;;;;;
+103AD;OLD PERSIAN SIGN DA;Lo;0;L;;;;;N;;;;;
+103AE;OLD PERSIAN SIGN DI;Lo;0;L;;;;;N;;;;;
+103AF;OLD PERSIAN SIGN DU;Lo;0;L;;;;;N;;;;;
+103B0;OLD PERSIAN SIGN THA;Lo;0;L;;;;;N;;;;;
+103B1;OLD PERSIAN SIGN PA;Lo;0;L;;;;;N;;;;;
+103B2;OLD PERSIAN SIGN BA;Lo;0;L;;;;;N;;;;;
+103B3;OLD PERSIAN SIGN FA;Lo;0;L;;;;;N;;;;;
+103B4;OLD PERSIAN SIGN NA;Lo;0;L;;;;;N;;;;;
+103B5;OLD PERSIAN SIGN NU;Lo;0;L;;;;;N;;;;;
+103B6;OLD PERSIAN SIGN MA;Lo;0;L;;;;;N;;;;;
+103B7;OLD PERSIAN SIGN MI;Lo;0;L;;;;;N;;;;;
+103B8;OLD PERSIAN SIGN MU;Lo;0;L;;;;;N;;;;;
+103B9;OLD PERSIAN SIGN YA;Lo;0;L;;;;;N;;;;;
+103BA;OLD PERSIAN SIGN VA;Lo;0;L;;;;;N;;;;;
+103BB;OLD PERSIAN SIGN VI;Lo;0;L;;;;;N;;;;;
+103BC;OLD PERSIAN SIGN RA;Lo;0;L;;;;;N;;;;;
+103BD;OLD PERSIAN SIGN RU;Lo;0;L;;;;;N;;;;;
+103BE;OLD PERSIAN SIGN LA;Lo;0;L;;;;;N;;;;;
+103BF;OLD PERSIAN SIGN SA;Lo;0;L;;;;;N;;;;;
+103C0;OLD PERSIAN SIGN ZA;Lo;0;L;;;;;N;;;;;
+103C1;OLD PERSIAN SIGN SHA;Lo;0;L;;;;;N;;;;;
+103C2;OLD PERSIAN SIGN SSA;Lo;0;L;;;;;N;;;;;
+103C3;OLD PERSIAN SIGN HA;Lo;0;L;;;;;N;;;;;
+103C8;OLD PERSIAN SIGN AURAMAZDAA;Lo;0;L;;;;;N;;;;;
+103C9;OLD PERSIAN SIGN AURAMAZDAA-2;Lo;0;L;;;;;N;;;;;
+103CA;OLD PERSIAN SIGN AURAMAZDAAHA;Lo;0;L;;;;;N;;;;;
+103CB;OLD PERSIAN SIGN XSHAAYATHIYA;Lo;0;L;;;;;N;;;;;
+103CC;OLD PERSIAN SIGN DAHYAAUSH;Lo;0;L;;;;;N;;;;;
+103CD;OLD PERSIAN SIGN DAHYAAUSH-2;Lo;0;L;;;;;N;;;;;
+103CE;OLD PERSIAN SIGN BAGA;Lo;0;L;;;;;N;;;;;
+103CF;OLD PERSIAN SIGN BUUMISH;Lo;0;L;;;;;N;;;;;
+103D0;OLD PERSIAN WORD DIVIDER;Po;0;L;;;;;N;;;;;
+103D1;OLD PERSIAN NUMBER ONE;Nl;0;L;;;;1;N;;;;;
+103D2;OLD PERSIAN NUMBER TWO;Nl;0;L;;;;2;N;;;;;
+103D3;OLD PERSIAN NUMBER TEN;Nl;0;L;;;;10;N;;;;;
+103D4;OLD PERSIAN NUMBER TWENTY;Nl;0;L;;;;20;N;;;;;
+103D5;OLD PERSIAN NUMBER HUNDRED;Nl;0;L;;;;100;N;;;;;
+10400;DESERET CAPITAL LETTER LONG I;Lu;0;L;;;;;N;;;;10428;
+10401;DESERET CAPITAL LETTER LONG E;Lu;0;L;;;;;N;;;;10429;
+10402;DESERET CAPITAL LETTER LONG A;Lu;0;L;;;;;N;;;;1042A;
+10403;DESERET CAPITAL LETTER LONG AH;Lu;0;L;;;;;N;;;;1042B;
+10404;DESERET CAPITAL LETTER LONG O;Lu;0;L;;;;;N;;;;1042C;
+10405;DESERET CAPITAL LETTER LONG OO;Lu;0;L;;;;;N;;;;1042D;
+10406;DESERET CAPITAL LETTER SHORT I;Lu;0;L;;;;;N;;;;1042E;
+10407;DESERET CAPITAL LETTER SHORT E;Lu;0;L;;;;;N;;;;1042F;
+10408;DESERET CAPITAL LETTER SHORT A;Lu;0;L;;;;;N;;;;10430;
+10409;DESERET CAPITAL LETTER SHORT AH;Lu;0;L;;;;;N;;;;10431;
+1040A;DESERET CAPITAL LETTER SHORT O;Lu;0;L;;;;;N;;;;10432;
+1040B;DESERET CAPITAL LETTER SHORT OO;Lu;0;L;;;;;N;;;;10433;
+1040C;DESERET CAPITAL LETTER AY;Lu;0;L;;;;;N;;;;10434;
+1040D;DESERET CAPITAL LETTER OW;Lu;0;L;;;;;N;;;;10435;
+1040E;DESERET CAPITAL LETTER WU;Lu;0;L;;;;;N;;;;10436;
+1040F;DESERET CAPITAL LETTER YEE;Lu;0;L;;;;;N;;;;10437;
+10410;DESERET CAPITAL LETTER H;Lu;0;L;;;;;N;;;;10438;
+10411;DESERET CAPITAL LETTER PEE;Lu;0;L;;;;;N;;;;10439;
+10412;DESERET CAPITAL LETTER BEE;Lu;0;L;;;;;N;;;;1043A;
+10413;DESERET CAPITAL LETTER TEE;Lu;0;L;;;;;N;;;;1043B;
+10414;DESERET CAPITAL LETTER DEE;Lu;0;L;;;;;N;;;;1043C;
+10415;DESERET CAPITAL LETTER CHEE;Lu;0;L;;;;;N;;;;1043D;
+10416;DESERET CAPITAL LETTER JEE;Lu;0;L;;;;;N;;;;1043E;
+10417;DESERET CAPITAL LETTER KAY;Lu;0;L;;;;;N;;;;1043F;
+10418;DESERET CAPITAL LETTER GAY;Lu;0;L;;;;;N;;;;10440;
+10419;DESERET CAPITAL LETTER EF;Lu;0;L;;;;;N;;;;10441;
+1041A;DESERET CAPITAL LETTER VEE;Lu;0;L;;;;;N;;;;10442;
+1041B;DESERET CAPITAL LETTER ETH;Lu;0;L;;;;;N;;;;10443;
+1041C;DESERET CAPITAL LETTER THEE;Lu;0;L;;;;;N;;;;10444;
+1041D;DESERET CAPITAL LETTER ES;Lu;0;L;;;;;N;;;;10445;
+1041E;DESERET CAPITAL LETTER ZEE;Lu;0;L;;;;;N;;;;10446;
+1041F;DESERET CAPITAL LETTER ESH;Lu;0;L;;;;;N;;;;10447;
+10420;DESERET CAPITAL LETTER ZHEE;Lu;0;L;;;;;N;;;;10448;
+10421;DESERET CAPITAL LETTER ER;Lu;0;L;;;;;N;;;;10449;
+10422;DESERET CAPITAL LETTER EL;Lu;0;L;;;;;N;;;;1044A;
+10423;DESERET CAPITAL LETTER EM;Lu;0;L;;;;;N;;;;1044B;
+10424;DESERET CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;1044C;
+10425;DESERET CAPITAL LETTER ENG;Lu;0;L;;;;;N;;;;1044D;
+10426;DESERET CAPITAL LETTER OI;Lu;0;L;;;;;N;;;;1044E;
+10427;DESERET CAPITAL LETTER EW;Lu;0;L;;;;;N;;;;1044F;
+10428;DESERET SMALL LETTER LONG I;Ll;0;L;;;;;N;;;10400;;10400
+10429;DESERET SMALL LETTER LONG E;Ll;0;L;;;;;N;;;10401;;10401
+1042A;DESERET SMALL LETTER LONG A;Ll;0;L;;;;;N;;;10402;;10402
+1042B;DESERET SMALL LETTER LONG AH;Ll;0;L;;;;;N;;;10403;;10403
+1042C;DESERET SMALL LETTER LONG O;Ll;0;L;;;;;N;;;10404;;10404
+1042D;DESERET SMALL LETTER LONG OO;Ll;0;L;;;;;N;;;10405;;10405
+1042E;DESERET SMALL LETTER SHORT I;Ll;0;L;;;;;N;;;10406;;10406
+1042F;DESERET SMALL LETTER SHORT E;Ll;0;L;;;;;N;;;10407;;10407
+10430;DESERET SMALL LETTER SHORT A;Ll;0;L;;;;;N;;;10408;;10408
+10431;DESERET SMALL LETTER SHORT AH;Ll;0;L;;;;;N;;;10409;;10409
+10432;DESERET SMALL LETTER SHORT O;Ll;0;L;;;;;N;;;1040A;;1040A
+10433;DESERET SMALL LETTER SHORT OO;Ll;0;L;;;;;N;;;1040B;;1040B
+10434;DESERET SMALL LETTER AY;Ll;0;L;;;;;N;;;1040C;;1040C
+10435;DESERET SMALL LETTER OW;Ll;0;L;;;;;N;;;1040D;;1040D
+10436;DESERET SMALL LETTER WU;Ll;0;L;;;;;N;;;1040E;;1040E
+10437;DESERET SMALL LETTER YEE;Ll;0;L;;;;;N;;;1040F;;1040F
+10438;DESERET SMALL LETTER H;Ll;0;L;;;;;N;;;10410;;10410
+10439;DESERET SMALL LETTER PEE;Ll;0;L;;;;;N;;;10411;;10411
+1043A;DESERET SMALL LETTER BEE;Ll;0;L;;;;;N;;;10412;;10412
+1043B;DESERET SMALL LETTER TEE;Ll;0;L;;;;;N;;;10413;;10413
+1043C;DESERET SMALL LETTER DEE;Ll;0;L;;;;;N;;;10414;;10414
+1043D;DESERET SMALL LETTER CHEE;Ll;0;L;;;;;N;;;10415;;10415
+1043E;DESERET SMALL LETTER JEE;Ll;0;L;;;;;N;;;10416;;10416
+1043F;DESERET SMALL LETTER KAY;Ll;0;L;;;;;N;;;10417;;10417
+10440;DESERET SMALL LETTER GAY;Ll;0;L;;;;;N;;;10418;;10418
+10441;DESERET SMALL LETTER EF;Ll;0;L;;;;;N;;;10419;;10419
+10442;DESERET SMALL LETTER VEE;Ll;0;L;;;;;N;;;1041A;;1041A
+10443;DESERET SMALL LETTER ETH;Ll;0;L;;;;;N;;;1041B;;1041B
+10444;DESERET SMALL LETTER THEE;Ll;0;L;;;;;N;;;1041C;;1041C
+10445;DESERET SMALL LETTER ES;Ll;0;L;;;;;N;;;1041D;;1041D
+10446;DESERET SMALL LETTER ZEE;Ll;0;L;;;;;N;;;1041E;;1041E
+10447;DESERET SMALL LETTER ESH;Ll;0;L;;;;;N;;;1041F;;1041F
+10448;DESERET SMALL LETTER ZHEE;Ll;0;L;;;;;N;;;10420;;10420
+10449;DESERET SMALL LETTER ER;Ll;0;L;;;;;N;;;10421;;10421
+1044A;DESERET SMALL LETTER EL;Ll;0;L;;;;;N;;;10422;;10422
+1044B;DESERET SMALL LETTER EM;Ll;0;L;;;;;N;;;10423;;10423
+1044C;DESERET SMALL LETTER EN;Ll;0;L;;;;;N;;;10424;;10424
+1044D;DESERET SMALL LETTER ENG;Ll;0;L;;;;;N;;;10425;;10425
+1044E;DESERET SMALL LETTER OI;Ll;0;L;;;;;N;;;10426;;10426
+1044F;DESERET SMALL LETTER EW;Ll;0;L;;;;;N;;;10427;;10427
+10450;SHAVIAN LETTER PEEP;Lo;0;L;;;;;N;;;;;
+10451;SHAVIAN LETTER TOT;Lo;0;L;;;;;N;;;;;
+10452;SHAVIAN LETTER KICK;Lo;0;L;;;;;N;;;;;
+10453;SHAVIAN LETTER FEE;Lo;0;L;;;;;N;;;;;
+10454;SHAVIAN LETTER THIGH;Lo;0;L;;;;;N;;;;;
+10455;SHAVIAN LETTER SO;Lo;0;L;;;;;N;;;;;
+10456;SHAVIAN LETTER SURE;Lo;0;L;;;;;N;;;;;
+10457;SHAVIAN LETTER CHURCH;Lo;0;L;;;;;N;;;;;
+10458;SHAVIAN LETTER YEA;Lo;0;L;;;;;N;;;;;
+10459;SHAVIAN LETTER HUNG;Lo;0;L;;;;;N;;;;;
+1045A;SHAVIAN LETTER BIB;Lo;0;L;;;;;N;;;;;
+1045B;SHAVIAN LETTER DEAD;Lo;0;L;;;;;N;;;;;
+1045C;SHAVIAN LETTER GAG;Lo;0;L;;;;;N;;;;;
+1045D;SHAVIAN LETTER VOW;Lo;0;L;;;;;N;;;;;
+1045E;SHAVIAN LETTER THEY;Lo;0;L;;;;;N;;;;;
+1045F;SHAVIAN LETTER ZOO;Lo;0;L;;;;;N;;;;;
+10460;SHAVIAN LETTER MEASURE;Lo;0;L;;;;;N;;;;;
+10461;SHAVIAN LETTER JUDGE;Lo;0;L;;;;;N;;;;;
+10462;SHAVIAN LETTER WOE;Lo;0;L;;;;;N;;;;;
+10463;SHAVIAN LETTER HA-HA;Lo;0;L;;;;;N;;;;;
+10464;SHAVIAN LETTER LOLL;Lo;0;L;;;;;N;;;;;
+10465;SHAVIAN LETTER MIME;Lo;0;L;;;;;N;;;;;
+10466;SHAVIAN LETTER IF;Lo;0;L;;;;;N;;;;;
+10467;SHAVIAN LETTER EGG;Lo;0;L;;;;;N;;;;;
+10468;SHAVIAN LETTER ASH;Lo;0;L;;;;;N;;;;;
+10469;SHAVIAN LETTER ADO;Lo;0;L;;;;;N;;;;;
+1046A;SHAVIAN LETTER ON;Lo;0;L;;;;;N;;;;;
+1046B;SHAVIAN LETTER WOOL;Lo;0;L;;;;;N;;;;;
+1046C;SHAVIAN LETTER OUT;Lo;0;L;;;;;N;;;;;
+1046D;SHAVIAN LETTER AH;Lo;0;L;;;;;N;;;;;
+1046E;SHAVIAN LETTER ROAR;Lo;0;L;;;;;N;;;;;
+1046F;SHAVIAN LETTER NUN;Lo;0;L;;;;;N;;;;;
+10470;SHAVIAN LETTER EAT;Lo;0;L;;;;;N;;;;;
+10471;SHAVIAN LETTER AGE;Lo;0;L;;;;;N;;;;;
+10472;SHAVIAN LETTER ICE;Lo;0;L;;;;;N;;;;;
+10473;SHAVIAN LETTER UP;Lo;0;L;;;;;N;;;;;
+10474;SHAVIAN LETTER OAK;Lo;0;L;;;;;N;;;;;
+10475;SHAVIAN LETTER OOZE;Lo;0;L;;;;;N;;;;;
+10476;SHAVIAN LETTER OIL;Lo;0;L;;;;;N;;;;;
+10477;SHAVIAN LETTER AWE;Lo;0;L;;;;;N;;;;;
+10478;SHAVIAN LETTER ARE;Lo;0;L;;;;;N;;;;;
+10479;SHAVIAN LETTER OR;Lo;0;L;;;;;N;;;;;
+1047A;SHAVIAN LETTER AIR;Lo;0;L;;;;;N;;;;;
+1047B;SHAVIAN LETTER ERR;Lo;0;L;;;;;N;;;;;
+1047C;SHAVIAN LETTER ARRAY;Lo;0;L;;;;;N;;;;;
+1047D;SHAVIAN LETTER EAR;Lo;0;L;;;;;N;;;;;
+1047E;SHAVIAN LETTER IAN;Lo;0;L;;;;;N;;;;;
+1047F;SHAVIAN LETTER YEW;Lo;0;L;;;;;N;;;;;
+10480;OSMANYA LETTER ALEF;Lo;0;L;;;;;N;;;;;
+10481;OSMANYA LETTER BA;Lo;0;L;;;;;N;;;;;
+10482;OSMANYA LETTER TA;Lo;0;L;;;;;N;;;;;
+10483;OSMANYA LETTER JA;Lo;0;L;;;;;N;;;;;
+10484;OSMANYA LETTER XA;Lo;0;L;;;;;N;;;;;
+10485;OSMANYA LETTER KHA;Lo;0;L;;;;;N;;;;;
+10486;OSMANYA LETTER DEEL;Lo;0;L;;;;;N;;;;;
+10487;OSMANYA LETTER RA;Lo;0;L;;;;;N;;;;;
+10488;OSMANYA LETTER SA;Lo;0;L;;;;;N;;;;;
+10489;OSMANYA LETTER SHIIN;Lo;0;L;;;;;N;;;;;
+1048A;OSMANYA LETTER DHA;Lo;0;L;;;;;N;;;;;
+1048B;OSMANYA LETTER CAYN;Lo;0;L;;;;;N;;;;;
+1048C;OSMANYA LETTER GA;Lo;0;L;;;;;N;;;;;
+1048D;OSMANYA LETTER FA;Lo;0;L;;;;;N;;;;;
+1048E;OSMANYA LETTER QAAF;Lo;0;L;;;;;N;;;;;
+1048F;OSMANYA LETTER KAAF;Lo;0;L;;;;;N;;;;;
+10490;OSMANYA LETTER LAAN;Lo;0;L;;;;;N;;;;;
+10491;OSMANYA LETTER MIIN;Lo;0;L;;;;;N;;;;;
+10492;OSMANYA LETTER NUUN;Lo;0;L;;;;;N;;;;;
+10493;OSMANYA LETTER WAW;Lo;0;L;;;;;N;;;;;
+10494;OSMANYA LETTER HA;Lo;0;L;;;;;N;;;;;
+10495;OSMANYA LETTER YA;Lo;0;L;;;;;N;;;;;
+10496;OSMANYA LETTER A;Lo;0;L;;;;;N;;;;;
+10497;OSMANYA LETTER E;Lo;0;L;;;;;N;;;;;
+10498;OSMANYA LETTER I;Lo;0;L;;;;;N;;;;;
+10499;OSMANYA LETTER O;Lo;0;L;;;;;N;;;;;
+1049A;OSMANYA LETTER U;Lo;0;L;;;;;N;;;;;
+1049B;OSMANYA LETTER AA;Lo;0;L;;;;;N;;;;;
+1049C;OSMANYA LETTER EE;Lo;0;L;;;;;N;;;;;
+1049D;OSMANYA LETTER OO;Lo;0;L;;;;;N;;;;;
+104A0;OSMANYA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+104A1;OSMANYA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+104A2;OSMANYA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+104A3;OSMANYA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+104A4;OSMANYA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+104A5;OSMANYA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+104A6;OSMANYA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+104A7;OSMANYA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+104A8;OSMANYA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+104A9;OSMANYA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+10800;CYPRIOT SYLLABLE A;Lo;0;R;;;;;N;;;;;
+10801;CYPRIOT SYLLABLE E;Lo;0;R;;;;;N;;;;;
+10802;CYPRIOT SYLLABLE I;Lo;0;R;;;;;N;;;;;
+10803;CYPRIOT SYLLABLE O;Lo;0;R;;;;;N;;;;;
+10804;CYPRIOT SYLLABLE U;Lo;0;R;;;;;N;;;;;
+10805;CYPRIOT SYLLABLE JA;Lo;0;R;;;;;N;;;;;
+10808;CYPRIOT SYLLABLE JO;Lo;0;R;;;;;N;;;;;
+1080A;CYPRIOT SYLLABLE KA;Lo;0;R;;;;;N;;;;;
+1080B;CYPRIOT SYLLABLE KE;Lo;0;R;;;;;N;;;;;
+1080C;CYPRIOT SYLLABLE KI;Lo;0;R;;;;;N;;;;;
+1080D;CYPRIOT SYLLABLE KO;Lo;0;R;;;;;N;;;;;
+1080E;CYPRIOT SYLLABLE KU;Lo;0;R;;;;;N;;;;;
+1080F;CYPRIOT SYLLABLE LA;Lo;0;R;;;;;N;;;;;
+10810;CYPRIOT SYLLABLE LE;Lo;0;R;;;;;N;;;;;
+10811;CYPRIOT SYLLABLE LI;Lo;0;R;;;;;N;;;;;
+10812;CYPRIOT SYLLABLE LO;Lo;0;R;;;;;N;;;;;
+10813;CYPRIOT SYLLABLE LU;Lo;0;R;;;;;N;;;;;
+10814;CYPRIOT SYLLABLE MA;Lo;0;R;;;;;N;;;;;
+10815;CYPRIOT SYLLABLE ME;Lo;0;R;;;;;N;;;;;
+10816;CYPRIOT SYLLABLE MI;Lo;0;R;;;;;N;;;;;
+10817;CYPRIOT SYLLABLE MO;Lo;0;R;;;;;N;;;;;
+10818;CYPRIOT SYLLABLE MU;Lo;0;R;;;;;N;;;;;
+10819;CYPRIOT SYLLABLE NA;Lo;0;R;;;;;N;;;;;
+1081A;CYPRIOT SYLLABLE NE;Lo;0;R;;;;;N;;;;;
+1081B;CYPRIOT SYLLABLE NI;Lo;0;R;;;;;N;;;;;
+1081C;CYPRIOT SYLLABLE NO;Lo;0;R;;;;;N;;;;;
+1081D;CYPRIOT SYLLABLE NU;Lo;0;R;;;;;N;;;;;
+1081E;CYPRIOT SYLLABLE PA;Lo;0;R;;;;;N;;;;;
+1081F;CYPRIOT SYLLABLE PE;Lo;0;R;;;;;N;;;;;
+10820;CYPRIOT SYLLABLE PI;Lo;0;R;;;;;N;;;;;
+10821;CYPRIOT SYLLABLE PO;Lo;0;R;;;;;N;;;;;
+10822;CYPRIOT SYLLABLE PU;Lo;0;R;;;;;N;;;;;
+10823;CYPRIOT SYLLABLE RA;Lo;0;R;;;;;N;;;;;
+10824;CYPRIOT SYLLABLE RE;Lo;0;R;;;;;N;;;;;
+10825;CYPRIOT SYLLABLE RI;Lo;0;R;;;;;N;;;;;
+10826;CYPRIOT SYLLABLE RO;Lo;0;R;;;;;N;;;;;
+10827;CYPRIOT SYLLABLE RU;Lo;0;R;;;;;N;;;;;
+10828;CYPRIOT SYLLABLE SA;Lo;0;R;;;;;N;;;;;
+10829;CYPRIOT SYLLABLE SE;Lo;0;R;;;;;N;;;;;
+1082A;CYPRIOT SYLLABLE SI;Lo;0;R;;;;;N;;;;;
+1082B;CYPRIOT SYLLABLE SO;Lo;0;R;;;;;N;;;;;
+1082C;CYPRIOT SYLLABLE SU;Lo;0;R;;;;;N;;;;;
+1082D;CYPRIOT SYLLABLE TA;Lo;0;R;;;;;N;;;;;
+1082E;CYPRIOT SYLLABLE TE;Lo;0;R;;;;;N;;;;;
+1082F;CYPRIOT SYLLABLE TI;Lo;0;R;;;;;N;;;;;
+10830;CYPRIOT SYLLABLE TO;Lo;0;R;;;;;N;;;;;
+10831;CYPRIOT SYLLABLE TU;Lo;0;R;;;;;N;;;;;
+10832;CYPRIOT SYLLABLE WA;Lo;0;R;;;;;N;;;;;
+10833;CYPRIOT SYLLABLE WE;Lo;0;R;;;;;N;;;;;
+10834;CYPRIOT SYLLABLE WI;Lo;0;R;;;;;N;;;;;
+10835;CYPRIOT SYLLABLE WO;Lo;0;R;;;;;N;;;;;
+10837;CYPRIOT SYLLABLE XA;Lo;0;R;;;;;N;;;;;
+10838;CYPRIOT SYLLABLE XE;Lo;0;R;;;;;N;;;;;
+1083C;CYPRIOT SYLLABLE ZA;Lo;0;R;;;;;N;;;;;
+1083F;CYPRIOT SYLLABLE ZO;Lo;0;R;;;;;N;;;;;
+10900;PHOENICIAN LETTER ALF;Lo;0;R;;;;;N;;;;;
+10901;PHOENICIAN LETTER BET;Lo;0;R;;;;;N;;;;;
+10902;PHOENICIAN LETTER GAML;Lo;0;R;;;;;N;;;;;
+10903;PHOENICIAN LETTER DELT;Lo;0;R;;;;;N;;;;;
+10904;PHOENICIAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10905;PHOENICIAN LETTER WAU;Lo;0;R;;;;;N;;;;;
+10906;PHOENICIAN LETTER ZAI;Lo;0;R;;;;;N;;;;;
+10907;PHOENICIAN LETTER HET;Lo;0;R;;;;;N;;;;;
+10908;PHOENICIAN LETTER TET;Lo;0;R;;;;;N;;;;;
+10909;PHOENICIAN LETTER YOD;Lo;0;R;;;;;N;;;;;
+1090A;PHOENICIAN LETTER KAF;Lo;0;R;;;;;N;;;;;
+1090B;PHOENICIAN LETTER LAMD;Lo;0;R;;;;;N;;;;;
+1090C;PHOENICIAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+1090D;PHOENICIAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+1090E;PHOENICIAN LETTER SEMK;Lo;0;R;;;;;N;;;;;
+1090F;PHOENICIAN LETTER AIN;Lo;0;R;;;;;N;;;;;
+10910;PHOENICIAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10911;PHOENICIAN LETTER SADE;Lo;0;R;;;;;N;;;;;
+10912;PHOENICIAN LETTER QOF;Lo;0;R;;;;;N;;;;;
+10913;PHOENICIAN LETTER ROSH;Lo;0;R;;;;;N;;;;;
+10914;PHOENICIAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10915;PHOENICIAN LETTER TAU;Lo;0;R;;;;;N;;;;;
+10916;PHOENICIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10917;PHOENICIAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+10918;PHOENICIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10919;PHOENICIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+1091F;PHOENICIAN WORD SEPARATOR;Po;0;ON;;;;;N;;;;;
+10920;LYDIAN LETTER A;Lo;0;R;;;;;N;;;;;
+10921;LYDIAN LETTER B;Lo;0;R;;;;;N;;;;;
+10922;LYDIAN LETTER G;Lo;0;R;;;;;N;;;;;
+10923;LYDIAN LETTER D;Lo;0;R;;;;;N;;;;;
+10924;LYDIAN LETTER E;Lo;0;R;;;;;N;;;;;
+10925;LYDIAN LETTER V;Lo;0;R;;;;;N;;;;;
+10926;LYDIAN LETTER I;Lo;0;R;;;;;N;;;;;
+10927;LYDIAN LETTER Y;Lo;0;R;;;;;N;;;;;
+10928;LYDIAN LETTER K;Lo;0;R;;;;;N;;;;;
+10929;LYDIAN LETTER L;Lo;0;R;;;;;N;;;;;
+1092A;LYDIAN LETTER M;Lo;0;R;;;;;N;;;;;
+1092B;LYDIAN LETTER N;Lo;0;R;;;;;N;;;;;
+1092C;LYDIAN LETTER O;Lo;0;R;;;;;N;;;;;
+1092D;LYDIAN LETTER R;Lo;0;R;;;;;N;;;;;
+1092E;LYDIAN LETTER SS;Lo;0;R;;;;;N;;;;;
+1092F;LYDIAN LETTER T;Lo;0;R;;;;;N;;;;;
+10930;LYDIAN LETTER U;Lo;0;R;;;;;N;;;;;
+10931;LYDIAN LETTER F;Lo;0;R;;;;;N;;;;;
+10932;LYDIAN LETTER Q;Lo;0;R;;;;;N;;;;;
+10933;LYDIAN LETTER S;Lo;0;R;;;;;N;;;;;
+10934;LYDIAN LETTER TT;Lo;0;R;;;;;N;;;;;
+10935;LYDIAN LETTER AN;Lo;0;R;;;;;N;;;;;
+10936;LYDIAN LETTER EN;Lo;0;R;;;;;N;;;;;
+10937;LYDIAN LETTER LY;Lo;0;R;;;;;N;;;;;
+10938;LYDIAN LETTER NN;Lo;0;R;;;;;N;;;;;
+10939;LYDIAN LETTER C;Lo;0;R;;;;;N;;;;;
+1093F;LYDIAN TRIANGULAR MARK;Po;0;R;;;;;N;;;;;
+10A00;KHAROSHTHI LETTER A;Lo;0;R;;;;;N;;;;;
+10A01;KHAROSHTHI VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+10A02;KHAROSHTHI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+10A03;KHAROSHTHI VOWEL SIGN VOCALIC R;Mn;0;NSM;;;;;N;;;;;
+10A05;KHAROSHTHI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+10A06;KHAROSHTHI VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+10A0C;KHAROSHTHI VOWEL LENGTH MARK;Mn;0;NSM;;;;;N;;;;;
+10A0D;KHAROSHTHI SIGN DOUBLE RING BELOW;Mn;220;NSM;;;;;N;;;;;
+10A0E;KHAROSHTHI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+10A0F;KHAROSHTHI SIGN VISARGA;Mn;230;NSM;;;;;N;;;;;
+10A10;KHAROSHTHI LETTER KA;Lo;0;R;;;;;N;;;;;
+10A11;KHAROSHTHI LETTER KHA;Lo;0;R;;;;;N;;;;;
+10A12;KHAROSHTHI LETTER GA;Lo;0;R;;;;;N;;;;;
+10A13;KHAROSHTHI LETTER GHA;Lo;0;R;;;;;N;;;;;
+10A15;KHAROSHTHI LETTER CA;Lo;0;R;;;;;N;;;;;
+10A16;KHAROSHTHI LETTER CHA;Lo;0;R;;;;;N;;;;;
+10A17;KHAROSHTHI LETTER JA;Lo;0;R;;;;;N;;;;;
+10A19;KHAROSHTHI LETTER NYA;Lo;0;R;;;;;N;;;;;
+10A1A;KHAROSHTHI LETTER TTA;Lo;0;R;;;;;N;;;;;
+10A1B;KHAROSHTHI LETTER TTHA;Lo;0;R;;;;;N;;;;;
+10A1C;KHAROSHTHI LETTER DDA;Lo;0;R;;;;;N;;;;;
+10A1D;KHAROSHTHI LETTER DDHA;Lo;0;R;;;;;N;;;;;
+10A1E;KHAROSHTHI LETTER NNA;Lo;0;R;;;;;N;;;;;
+10A1F;KHAROSHTHI LETTER TA;Lo;0;R;;;;;N;;;;;
+10A20;KHAROSHTHI LETTER THA;Lo;0;R;;;;;N;;;;;
+10A21;KHAROSHTHI LETTER DA;Lo;0;R;;;;;N;;;;;
+10A22;KHAROSHTHI LETTER DHA;Lo;0;R;;;;;N;;;;;
+10A23;KHAROSHTHI LETTER NA;Lo;0;R;;;;;N;;;;;
+10A24;KHAROSHTHI LETTER PA;Lo;0;R;;;;;N;;;;;
+10A25;KHAROSHTHI LETTER PHA;Lo;0;R;;;;;N;;;;;
+10A26;KHAROSHTHI LETTER BA;Lo;0;R;;;;;N;;;;;
+10A27;KHAROSHTHI LETTER BHA;Lo;0;R;;;;;N;;;;;
+10A28;KHAROSHTHI LETTER MA;Lo;0;R;;;;;N;;;;;
+10A29;KHAROSHTHI LETTER YA;Lo;0;R;;;;;N;;;;;
+10A2A;KHAROSHTHI LETTER RA;Lo;0;R;;;;;N;;;;;
+10A2B;KHAROSHTHI LETTER LA;Lo;0;R;;;;;N;;;;;
+10A2C;KHAROSHTHI LETTER VA;Lo;0;R;;;;;N;;;;;
+10A2D;KHAROSHTHI LETTER SHA;Lo;0;R;;;;;N;;;;;
+10A2E;KHAROSHTHI LETTER SSA;Lo;0;R;;;;;N;;;;;
+10A2F;KHAROSHTHI LETTER SA;Lo;0;R;;;;;N;;;;;
+10A30;KHAROSHTHI LETTER ZA;Lo;0;R;;;;;N;;;;;
+10A31;KHAROSHTHI LETTER HA;Lo;0;R;;;;;N;;;;;
+10A32;KHAROSHTHI LETTER KKA;Lo;0;R;;;;;N;;;;;
+10A33;KHAROSHTHI LETTER TTTHA;Lo;0;R;;;;;N;;;;;
+10A38;KHAROSHTHI SIGN BAR ABOVE;Mn;230;NSM;;;;;N;;;;;
+10A39;KHAROSHTHI SIGN CAUDA;Mn;1;NSM;;;;;N;;;;;
+10A3A;KHAROSHTHI SIGN DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+10A3F;KHAROSHTHI VIRAMA;Mn;9;NSM;;;;;N;;;;;
+10A40;KHAROSHTHI DIGIT ONE;No;0;R;;;1;1;N;;;;;
+10A41;KHAROSHTHI DIGIT TWO;No;0;R;;;2;2;N;;;;;
+10A42;KHAROSHTHI DIGIT THREE;No;0;R;;;3;3;N;;;;;
+10A43;KHAROSHTHI DIGIT FOUR;No;0;R;;;4;4;N;;;;;
+10A44;KHAROSHTHI NUMBER TEN;No;0;R;;;;10;N;;;;;
+10A45;KHAROSHTHI NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10A46;KHAROSHTHI NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10A47;KHAROSHTHI NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+10A50;KHAROSHTHI PUNCTUATION DOT;Po;0;R;;;;;N;;;;;
+10A51;KHAROSHTHI PUNCTUATION SMALL CIRCLE;Po;0;R;;;;;N;;;;;
+10A52;KHAROSHTHI PUNCTUATION CIRCLE;Po;0;R;;;;;N;;;;;
+10A53;KHAROSHTHI PUNCTUATION CRESCENT BAR;Po;0;R;;;;;N;;;;;
+10A54;KHAROSHTHI PUNCTUATION MANGALAM;Po;0;R;;;;;N;;;;;
+10A55;KHAROSHTHI PUNCTUATION LOTUS;Po;0;R;;;;;N;;;;;
+10A56;KHAROSHTHI PUNCTUATION DANDA;Po;0;R;;;;;N;;;;;
+10A57;KHAROSHTHI PUNCTUATION DOUBLE DANDA;Po;0;R;;;;;N;;;;;
+10A58;KHAROSHTHI PUNCTUATION LINES;Po;0;R;;;;;N;;;;;
+12000;CUNEIFORM SIGN A;Lo;0;L;;;;;N;;;;;
+12001;CUNEIFORM SIGN A TIMES A;Lo;0;L;;;;;N;;;;;
+12002;CUNEIFORM SIGN A TIMES BAD;Lo;0;L;;;;;N;;;;;
+12003;CUNEIFORM SIGN A TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12004;CUNEIFORM SIGN A TIMES HA;Lo;0;L;;;;;N;;;;;
+12005;CUNEIFORM SIGN A TIMES IGI;Lo;0;L;;;;;N;;;;;
+12006;CUNEIFORM SIGN A TIMES LAGAR GUNU;Lo;0;L;;;;;N;;;;;
+12007;CUNEIFORM SIGN A TIMES MUSH;Lo;0;L;;;;;N;;;;;
+12008;CUNEIFORM SIGN A TIMES SAG;Lo;0;L;;;;;N;;;;;
+12009;CUNEIFORM SIGN A2;Lo;0;L;;;;;N;;;;;
+1200A;CUNEIFORM SIGN AB;Lo;0;L;;;;;N;;;;;
+1200B;CUNEIFORM SIGN AB TIMES ASH2;Lo;0;L;;;;;N;;;;;
+1200C;CUNEIFORM SIGN AB TIMES DUN3 GUNU;Lo;0;L;;;;;N;;;;;
+1200D;CUNEIFORM SIGN AB TIMES GAL;Lo;0;L;;;;;N;;;;;
+1200E;CUNEIFORM SIGN AB TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1200F;CUNEIFORM SIGN AB TIMES HA;Lo;0;L;;;;;N;;;;;
+12010;CUNEIFORM SIGN AB TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+12011;CUNEIFORM SIGN AB TIMES IMIN;Lo;0;L;;;;;N;;;;;
+12012;CUNEIFORM SIGN AB TIMES LAGAB;Lo;0;L;;;;;N;;;;;
+12013;CUNEIFORM SIGN AB TIMES SHESH;Lo;0;L;;;;;N;;;;;
+12014;CUNEIFORM SIGN AB TIMES U PLUS U PLUS U;Lo;0;L;;;;;N;;;;;
+12015;CUNEIFORM SIGN AB GUNU;Lo;0;L;;;;;N;;;;;
+12016;CUNEIFORM SIGN AB2;Lo;0;L;;;;;N;;;;;
+12017;CUNEIFORM SIGN AB2 TIMES BALAG;Lo;0;L;;;;;N;;;;;
+12018;CUNEIFORM SIGN AB2 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12019;CUNEIFORM SIGN AB2 TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;;
+1201A;CUNEIFORM SIGN AB2 TIMES SHA3;Lo;0;L;;;;;N;;;;;
+1201B;CUNEIFORM SIGN AB2 TIMES TAK4;Lo;0;L;;;;;N;;;;;
+1201C;CUNEIFORM SIGN AD;Lo;0;L;;;;;N;;;;;
+1201D;CUNEIFORM SIGN AK;Lo;0;L;;;;;N;;;;;
+1201E;CUNEIFORM SIGN AK TIMES ERIN2;Lo;0;L;;;;;N;;;;;
+1201F;CUNEIFORM SIGN AK TIMES SHITA PLUS GISH;Lo;0;L;;;;;N;;;;;
+12020;CUNEIFORM SIGN AL;Lo;0;L;;;;;N;;;;;
+12021;CUNEIFORM SIGN AL TIMES AL;Lo;0;L;;;;;N;;;;;
+12022;CUNEIFORM SIGN AL TIMES DIM2;Lo;0;L;;;;;N;;;;;
+12023;CUNEIFORM SIGN AL TIMES GISH;Lo;0;L;;;;;N;;;;;
+12024;CUNEIFORM SIGN AL TIMES HA;Lo;0;L;;;;;N;;;;;
+12025;CUNEIFORM SIGN AL TIMES KAD3;Lo;0;L;;;;;N;;;;;
+12026;CUNEIFORM SIGN AL TIMES KI;Lo;0;L;;;;;N;;;;;
+12027;CUNEIFORM SIGN AL TIMES SHE;Lo;0;L;;;;;N;;;;;
+12028;CUNEIFORM SIGN AL TIMES USH;Lo;0;L;;;;;N;;;;;
+12029;CUNEIFORM SIGN ALAN;Lo;0;L;;;;;N;;;;;
+1202A;CUNEIFORM SIGN ALEPH;Lo;0;L;;;;;N;;;;;
+1202B;CUNEIFORM SIGN AMAR;Lo;0;L;;;;;N;;;;;
+1202C;CUNEIFORM SIGN AMAR TIMES SHE;Lo;0;L;;;;;N;;;;;
+1202D;CUNEIFORM SIGN AN;Lo;0;L;;;;;N;;;;;
+1202E;CUNEIFORM SIGN AN OVER AN;Lo;0;L;;;;;N;;;;;
+1202F;CUNEIFORM SIGN AN THREE TIMES;Lo;0;L;;;;;N;;;;;
+12030;CUNEIFORM SIGN AN PLUS NAGA OPPOSING AN PLUS NAGA;Lo;0;L;;;;;N;;;;;
+12031;CUNEIFORM SIGN AN PLUS NAGA SQUARED;Lo;0;L;;;;;N;;;;;
+12032;CUNEIFORM SIGN ANSHE;Lo;0;L;;;;;N;;;;;
+12033;CUNEIFORM SIGN APIN;Lo;0;L;;;;;N;;;;;
+12034;CUNEIFORM SIGN ARAD;Lo;0;L;;;;;N;;;;;
+12035;CUNEIFORM SIGN ARAD TIMES KUR;Lo;0;L;;;;;N;;;;;
+12036;CUNEIFORM SIGN ARKAB;Lo;0;L;;;;;N;;;;;
+12037;CUNEIFORM SIGN ASAL2;Lo;0;L;;;;;N;;;;;
+12038;CUNEIFORM SIGN ASH;Lo;0;L;;;;;N;;;;;
+12039;CUNEIFORM SIGN ASH ZIDA TENU;Lo;0;L;;;;;N;;;;;
+1203A;CUNEIFORM SIGN ASH KABA TENU;Lo;0;L;;;;;N;;;;;
+1203B;CUNEIFORM SIGN ASH OVER ASH TUG2 OVER TUG2 TUG2 OVER TUG2 PAP;Lo;0;L;;;;;N;;;;;
+1203C;CUNEIFORM SIGN ASH OVER ASH OVER ASH;Lo;0;L;;;;;N;;;;;
+1203D;CUNEIFORM SIGN ASH OVER ASH OVER ASH CROSSING ASH OVER ASH OVER ASH;Lo;0;L;;;;;N;;;;;
+1203E;CUNEIFORM SIGN ASH2;Lo;0;L;;;;;N;;;;;
+1203F;CUNEIFORM SIGN ASHGAB;Lo;0;L;;;;;N;;;;;
+12040;CUNEIFORM SIGN BA;Lo;0;L;;;;;N;;;;;
+12041;CUNEIFORM SIGN BAD;Lo;0;L;;;;;N;;;;;
+12042;CUNEIFORM SIGN BAG3;Lo;0;L;;;;;N;;;;;
+12043;CUNEIFORM SIGN BAHAR2;Lo;0;L;;;;;N;;;;;
+12044;CUNEIFORM SIGN BAL;Lo;0;L;;;;;N;;;;;
+12045;CUNEIFORM SIGN BAL OVER BAL;Lo;0;L;;;;;N;;;;;
+12046;CUNEIFORM SIGN BALAG;Lo;0;L;;;;;N;;;;;
+12047;CUNEIFORM SIGN BAR;Lo;0;L;;;;;N;;;;;
+12048;CUNEIFORM SIGN BARA2;Lo;0;L;;;;;N;;;;;
+12049;CUNEIFORM SIGN BI;Lo;0;L;;;;;N;;;;;
+1204A;CUNEIFORM SIGN BI TIMES A;Lo;0;L;;;;;N;;;;;
+1204B;CUNEIFORM SIGN BI TIMES GAR;Lo;0;L;;;;;N;;;;;
+1204C;CUNEIFORM SIGN BI TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+1204D;CUNEIFORM SIGN BU;Lo;0;L;;;;;N;;;;;
+1204E;CUNEIFORM SIGN BU OVER BU AB;Lo;0;L;;;;;N;;;;;
+1204F;CUNEIFORM SIGN BU OVER BU UN;Lo;0;L;;;;;N;;;;;
+12050;CUNEIFORM SIGN BU CROSSING BU;Lo;0;L;;;;;N;;;;;
+12051;CUNEIFORM SIGN BULUG;Lo;0;L;;;;;N;;;;;
+12052;CUNEIFORM SIGN BULUG OVER BULUG;Lo;0;L;;;;;N;;;;;
+12053;CUNEIFORM SIGN BUR;Lo;0;L;;;;;N;;;;;
+12054;CUNEIFORM SIGN BUR2;Lo;0;L;;;;;N;;;;;
+12055;CUNEIFORM SIGN DA;Lo;0;L;;;;;N;;;;;
+12056;CUNEIFORM SIGN DAG;Lo;0;L;;;;;N;;;;;
+12057;CUNEIFORM SIGN DAG KISIM5 TIMES A PLUS MASH;Lo;0;L;;;;;N;;;;;
+12058;CUNEIFORM SIGN DAG KISIM5 TIMES AMAR;Lo;0;L;;;;;N;;;;;
+12059;CUNEIFORM SIGN DAG KISIM5 TIMES BALAG;Lo;0;L;;;;;N;;;;;
+1205A;CUNEIFORM SIGN DAG KISIM5 TIMES BI;Lo;0;L;;;;;N;;;;;
+1205B;CUNEIFORM SIGN DAG KISIM5 TIMES GA;Lo;0;L;;;;;N;;;;;
+1205C;CUNEIFORM SIGN DAG KISIM5 TIMES GA PLUS MASH;Lo;0;L;;;;;N;;;;;
+1205D;CUNEIFORM SIGN DAG KISIM5 TIMES GI;Lo;0;L;;;;;N;;;;;
+1205E;CUNEIFORM SIGN DAG KISIM5 TIMES GIR2;Lo;0;L;;;;;N;;;;;
+1205F;CUNEIFORM SIGN DAG KISIM5 TIMES GUD;Lo;0;L;;;;;N;;;;;
+12060;CUNEIFORM SIGN DAG KISIM5 TIMES HA;Lo;0;L;;;;;N;;;;;
+12061;CUNEIFORM SIGN DAG KISIM5 TIMES IR;Lo;0;L;;;;;N;;;;;
+12062;CUNEIFORM SIGN DAG KISIM5 TIMES IR PLUS LU;Lo;0;L;;;;;N;;;;;
+12063;CUNEIFORM SIGN DAG KISIM5 TIMES KAK;Lo;0;L;;;;;N;;;;;
+12064;CUNEIFORM SIGN DAG KISIM5 TIMES LA;Lo;0;L;;;;;N;;;;;
+12065;CUNEIFORM SIGN DAG KISIM5 TIMES LU;Lo;0;L;;;;;N;;;;;
+12066;CUNEIFORM SIGN DAG KISIM5 TIMES LU PLUS MASH2;Lo;0;L;;;;;N;;;;;
+12067;CUNEIFORM SIGN DAG KISIM5 TIMES LUM;Lo;0;L;;;;;N;;;;;
+12068;CUNEIFORM SIGN DAG KISIM5 TIMES NE;Lo;0;L;;;;;N;;;;;
+12069;CUNEIFORM SIGN DAG KISIM5 TIMES PAP PLUS PAP;Lo;0;L;;;;;N;;;;;
+1206A;CUNEIFORM SIGN DAG KISIM5 TIMES SI;Lo;0;L;;;;;N;;;;;
+1206B;CUNEIFORM SIGN DAG KISIM5 TIMES TAK4;Lo;0;L;;;;;N;;;;;
+1206C;CUNEIFORM SIGN DAG KISIM5 TIMES U2 PLUS GIR2;Lo;0;L;;;;;N;;;;;
+1206D;CUNEIFORM SIGN DAG KISIM5 TIMES USH;Lo;0;L;;;;;N;;;;;
+1206E;CUNEIFORM SIGN DAM;Lo;0;L;;;;;N;;;;;
+1206F;CUNEIFORM SIGN DAR;Lo;0;L;;;;;N;;;;;
+12070;CUNEIFORM SIGN DARA3;Lo;0;L;;;;;N;;;;;
+12071;CUNEIFORM SIGN DARA4;Lo;0;L;;;;;N;;;;;
+12072;CUNEIFORM SIGN DI;Lo;0;L;;;;;N;;;;;
+12073;CUNEIFORM SIGN DIB;Lo;0;L;;;;;N;;;;;
+12074;CUNEIFORM SIGN DIM;Lo;0;L;;;;;N;;;;;
+12075;CUNEIFORM SIGN DIM TIMES SHE;Lo;0;L;;;;;N;;;;;
+12076;CUNEIFORM SIGN DIM2;Lo;0;L;;;;;N;;;;;
+12077;CUNEIFORM SIGN DIN;Lo;0;L;;;;;N;;;;;
+12078;CUNEIFORM SIGN DIN KASKAL U GUNU DISH;Lo;0;L;;;;;N;;;;;
+12079;CUNEIFORM SIGN DISH;Lo;0;L;;;;;N;;;;;
+1207A;CUNEIFORM SIGN DU;Lo;0;L;;;;;N;;;;;
+1207B;CUNEIFORM SIGN DU OVER DU;Lo;0;L;;;;;N;;;;;
+1207C;CUNEIFORM SIGN DU GUNU;Lo;0;L;;;;;N;;;;;
+1207D;CUNEIFORM SIGN DU SHESHIG;Lo;0;L;;;;;N;;;;;
+1207E;CUNEIFORM SIGN DUB;Lo;0;L;;;;;N;;;;;
+1207F;CUNEIFORM SIGN DUB TIMES ESH2;Lo;0;L;;;;;N;;;;;
+12080;CUNEIFORM SIGN DUB2;Lo;0;L;;;;;N;;;;;
+12081;CUNEIFORM SIGN DUG;Lo;0;L;;;;;N;;;;;
+12082;CUNEIFORM SIGN DUGUD;Lo;0;L;;;;;N;;;;;
+12083;CUNEIFORM SIGN DUH;Lo;0;L;;;;;N;;;;;
+12084;CUNEIFORM SIGN DUN;Lo;0;L;;;;;N;;;;;
+12085;CUNEIFORM SIGN DUN3;Lo;0;L;;;;;N;;;;;
+12086;CUNEIFORM SIGN DUN3 GUNU;Lo;0;L;;;;;N;;;;;
+12087;CUNEIFORM SIGN DUN3 GUNU GUNU;Lo;0;L;;;;;N;;;;;
+12088;CUNEIFORM SIGN DUN4;Lo;0;L;;;;;N;;;;;
+12089;CUNEIFORM SIGN DUR2;Lo;0;L;;;;;N;;;;;
+1208A;CUNEIFORM SIGN E;Lo;0;L;;;;;N;;;;;
+1208B;CUNEIFORM SIGN E TIMES PAP;Lo;0;L;;;;;N;;;;;
+1208C;CUNEIFORM SIGN E OVER E NUN OVER NUN;Lo;0;L;;;;;N;;;;;
+1208D;CUNEIFORM SIGN E2;Lo;0;L;;;;;N;;;;;
+1208E;CUNEIFORM SIGN E2 TIMES A PLUS HA PLUS DA;Lo;0;L;;;;;N;;;;;
+1208F;CUNEIFORM SIGN E2 TIMES GAR;Lo;0;L;;;;;N;;;;;
+12090;CUNEIFORM SIGN E2 TIMES MI;Lo;0;L;;;;;N;;;;;
+12091;CUNEIFORM SIGN E2 TIMES SAL;Lo;0;L;;;;;N;;;;;
+12092;CUNEIFORM SIGN E2 TIMES SHE;Lo;0;L;;;;;N;;;;;
+12093;CUNEIFORM SIGN E2 TIMES U;Lo;0;L;;;;;N;;;;;
+12094;CUNEIFORM SIGN EDIN;Lo;0;L;;;;;N;;;;;
+12095;CUNEIFORM SIGN EGIR;Lo;0;L;;;;;N;;;;;
+12096;CUNEIFORM SIGN EL;Lo;0;L;;;;;N;;;;;
+12097;CUNEIFORM SIGN EN;Lo;0;L;;;;;N;;;;;
+12098;CUNEIFORM SIGN EN TIMES GAN2;Lo;0;L;;;;;N;;;;;
+12099;CUNEIFORM SIGN EN TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1209A;CUNEIFORM SIGN EN TIMES ME;Lo;0;L;;;;;N;;;;;
+1209B;CUNEIFORM SIGN EN CROSSING EN;Lo;0;L;;;;;N;;;;;
+1209C;CUNEIFORM SIGN EN OPPOSING EN;Lo;0;L;;;;;N;;;;;
+1209D;CUNEIFORM SIGN EN SQUARED;Lo;0;L;;;;;N;;;;;
+1209E;CUNEIFORM SIGN EREN;Lo;0;L;;;;;N;;;;;
+1209F;CUNEIFORM SIGN ERIN2;Lo;0;L;;;;;N;;;;;
+120A0;CUNEIFORM SIGN ESH2;Lo;0;L;;;;;N;;;;;
+120A1;CUNEIFORM SIGN EZEN;Lo;0;L;;;;;N;;;;;
+120A2;CUNEIFORM SIGN EZEN TIMES A;Lo;0;L;;;;;N;;;;;
+120A3;CUNEIFORM SIGN EZEN TIMES A PLUS LAL;Lo;0;L;;;;;N;;;;;
+120A4;CUNEIFORM SIGN EZEN TIMES A PLUS LAL TIMES LAL;Lo;0;L;;;;;N;;;;;
+120A5;CUNEIFORM SIGN EZEN TIMES AN;Lo;0;L;;;;;N;;;;;
+120A6;CUNEIFORM SIGN EZEN TIMES BAD;Lo;0;L;;;;;N;;;;;
+120A7;CUNEIFORM SIGN EZEN TIMES DUN3 GUNU;Lo;0;L;;;;;N;;;;;
+120A8;CUNEIFORM SIGN EZEN TIMES DUN3 GUNU GUNU;Lo;0;L;;;;;N;;;;;
+120A9;CUNEIFORM SIGN EZEN TIMES HA;Lo;0;L;;;;;N;;;;;
+120AA;CUNEIFORM SIGN EZEN TIMES HA GUNU;Lo;0;L;;;;;N;;;;;
+120AB;CUNEIFORM SIGN EZEN TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+120AC;CUNEIFORM SIGN EZEN TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+120AD;CUNEIFORM SIGN EZEN TIMES KASKAL SQUARED;Lo;0;L;;;;;N;;;;;
+120AE;CUNEIFORM SIGN EZEN TIMES KU3;Lo;0;L;;;;;N;;;;;
+120AF;CUNEIFORM SIGN EZEN TIMES LA;Lo;0;L;;;;;N;;;;;
+120B0;CUNEIFORM SIGN EZEN TIMES LAL TIMES LAL;Lo;0;L;;;;;N;;;;;
+120B1;CUNEIFORM SIGN EZEN TIMES LI;Lo;0;L;;;;;N;;;;;
+120B2;CUNEIFORM SIGN EZEN TIMES LU;Lo;0;L;;;;;N;;;;;
+120B3;CUNEIFORM SIGN EZEN TIMES U2;Lo;0;L;;;;;N;;;;;
+120B4;CUNEIFORM SIGN EZEN TIMES UD;Lo;0;L;;;;;N;;;;;
+120B5;CUNEIFORM SIGN GA;Lo;0;L;;;;;N;;;;;
+120B6;CUNEIFORM SIGN GA GUNU;Lo;0;L;;;;;N;;;;;
+120B7;CUNEIFORM SIGN GA2;Lo;0;L;;;;;N;;;;;
+120B8;CUNEIFORM SIGN GA2 TIMES A PLUS DA PLUS HA;Lo;0;L;;;;;N;;;;;
+120B9;CUNEIFORM SIGN GA2 TIMES A PLUS HA;Lo;0;L;;;;;N;;;;;
+120BA;CUNEIFORM SIGN GA2 TIMES A PLUS IGI;Lo;0;L;;;;;N;;;;;
+120BB;CUNEIFORM SIGN GA2 TIMES AB2 TENU PLUS TAB;Lo;0;L;;;;;N;;;;;
+120BC;CUNEIFORM SIGN GA2 TIMES AN;Lo;0;L;;;;;N;;;;;
+120BD;CUNEIFORM SIGN GA2 TIMES ASH;Lo;0;L;;;;;N;;;;;
+120BE;CUNEIFORM SIGN GA2 TIMES ASH2 PLUS GAL;Lo;0;L;;;;;N;;;;;
+120BF;CUNEIFORM SIGN GA2 TIMES BAD;Lo;0;L;;;;;N;;;;;
+120C0;CUNEIFORM SIGN GA2 TIMES BAR PLUS RA;Lo;0;L;;;;;N;;;;;
+120C1;CUNEIFORM SIGN GA2 TIMES BUR;Lo;0;L;;;;;N;;;;;
+120C2;CUNEIFORM SIGN GA2 TIMES BUR PLUS RA;Lo;0;L;;;;;N;;;;;
+120C3;CUNEIFORM SIGN GA2 TIMES DA;Lo;0;L;;;;;N;;;;;
+120C4;CUNEIFORM SIGN GA2 TIMES DI;Lo;0;L;;;;;N;;;;;
+120C5;CUNEIFORM SIGN GA2 TIMES DIM TIMES SHE;Lo;0;L;;;;;N;;;;;
+120C6;CUNEIFORM SIGN GA2 TIMES DUB;Lo;0;L;;;;;N;;;;;
+120C7;CUNEIFORM SIGN GA2 TIMES EL;Lo;0;L;;;;;N;;;;;
+120C8;CUNEIFORM SIGN GA2 TIMES EL PLUS LA;Lo;0;L;;;;;N;;;;;
+120C9;CUNEIFORM SIGN GA2 TIMES EN;Lo;0;L;;;;;N;;;;;
+120CA;CUNEIFORM SIGN GA2 TIMES EN TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+120CB;CUNEIFORM SIGN GA2 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+120CC;CUNEIFORM SIGN GA2 TIMES GAR;Lo;0;L;;;;;N;;;;;
+120CD;CUNEIFORM SIGN GA2 TIMES GI;Lo;0;L;;;;;N;;;;;
+120CE;CUNEIFORM SIGN GA2 TIMES GI4;Lo;0;L;;;;;N;;;;;
+120CF;CUNEIFORM SIGN GA2 TIMES GI4 PLUS A;Lo;0;L;;;;;N;;;;;
+120D0;CUNEIFORM SIGN GA2 TIMES GIR2 PLUS SU;Lo;0;L;;;;;N;;;;;
+120D1;CUNEIFORM SIGN GA2 TIMES HA PLUS LU PLUS ESH2;Lo;0;L;;;;;N;;;;;
+120D2;CUNEIFORM SIGN GA2 TIMES HAL;Lo;0;L;;;;;N;;;;;
+120D3;CUNEIFORM SIGN GA2 TIMES HAL PLUS LA;Lo;0;L;;;;;N;;;;;
+120D4;CUNEIFORM SIGN GA2 TIMES HI PLUS LI;Lo;0;L;;;;;N;;;;;
+120D5;CUNEIFORM SIGN GA2 TIMES HUB2;Lo;0;L;;;;;N;;;;;
+120D6;CUNEIFORM SIGN GA2 TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+120D7;CUNEIFORM SIGN GA2 TIMES ISH PLUS HU PLUS ASH;Lo;0;L;;;;;N;;;;;
+120D8;CUNEIFORM SIGN GA2 TIMES KAK;Lo;0;L;;;;;N;;;;;
+120D9;CUNEIFORM SIGN GA2 TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+120DA;CUNEIFORM SIGN GA2 TIMES KID;Lo;0;L;;;;;N;;;;;
+120DB;CUNEIFORM SIGN GA2 TIMES KID PLUS LAL;Lo;0;L;;;;;N;;;;;
+120DC;CUNEIFORM SIGN GA2 TIMES KU3 PLUS AN;Lo;0;L;;;;;N;;;;;
+120DD;CUNEIFORM SIGN GA2 TIMES LA;Lo;0;L;;;;;N;;;;;
+120DE;CUNEIFORM SIGN GA2 TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;;
+120DF;CUNEIFORM SIGN GA2 TIMES MI;Lo;0;L;;;;;N;;;;;
+120E0;CUNEIFORM SIGN GA2 TIMES NUN;Lo;0;L;;;;;N;;;;;
+120E1;CUNEIFORM SIGN GA2 TIMES NUN OVER NUN;Lo;0;L;;;;;N;;;;;
+120E2;CUNEIFORM SIGN GA2 TIMES PA;Lo;0;L;;;;;N;;;;;
+120E3;CUNEIFORM SIGN GA2 TIMES SAL;Lo;0;L;;;;;N;;;;;
+120E4;CUNEIFORM SIGN GA2 TIMES SAR;Lo;0;L;;;;;N;;;;;
+120E5;CUNEIFORM SIGN GA2 TIMES SHE;Lo;0;L;;;;;N;;;;;
+120E6;CUNEIFORM SIGN GA2 TIMES SHE PLUS TUR;Lo;0;L;;;;;N;;;;;
+120E7;CUNEIFORM SIGN GA2 TIMES SHID;Lo;0;L;;;;;N;;;;;
+120E8;CUNEIFORM SIGN GA2 TIMES SUM;Lo;0;L;;;;;N;;;;;
+120E9;CUNEIFORM SIGN GA2 TIMES TAK4;Lo;0;L;;;;;N;;;;;
+120EA;CUNEIFORM SIGN GA2 TIMES U;Lo;0;L;;;;;N;;;;;
+120EB;CUNEIFORM SIGN GA2 TIMES UD;Lo;0;L;;;;;N;;;;;
+120EC;CUNEIFORM SIGN GA2 TIMES UD PLUS DU;Lo;0;L;;;;;N;;;;;
+120ED;CUNEIFORM SIGN GA2 OVER GA2;Lo;0;L;;;;;N;;;;;
+120EE;CUNEIFORM SIGN GABA;Lo;0;L;;;;;N;;;;;
+120EF;CUNEIFORM SIGN GABA CROSSING GABA;Lo;0;L;;;;;N;;;;;
+120F0;CUNEIFORM SIGN GAD;Lo;0;L;;;;;N;;;;;
+120F1;CUNEIFORM SIGN GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+120F2;CUNEIFORM SIGN GAL;Lo;0;L;;;;;N;;;;;
+120F3;CUNEIFORM SIGN GAL GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+120F4;CUNEIFORM SIGN GALAM;Lo;0;L;;;;;N;;;;;
+120F5;CUNEIFORM SIGN GAM;Lo;0;L;;;;;N;;;;;
+120F6;CUNEIFORM SIGN GAN;Lo;0;L;;;;;N;;;;;
+120F7;CUNEIFORM SIGN GAN2;Lo;0;L;;;;;N;;;;;
+120F8;CUNEIFORM SIGN GAN2 TENU;Lo;0;L;;;;;N;;;;;
+120F9;CUNEIFORM SIGN GAN2 OVER GAN2;Lo;0;L;;;;;N;;;;;
+120FA;CUNEIFORM SIGN GAN2 CROSSING GAN2;Lo;0;L;;;;;N;;;;;
+120FB;CUNEIFORM SIGN GAR;Lo;0;L;;;;;N;;;;;
+120FC;CUNEIFORM SIGN GAR3;Lo;0;L;;;;;N;;;;;
+120FD;CUNEIFORM SIGN GASHAN;Lo;0;L;;;;;N;;;;;
+120FE;CUNEIFORM SIGN GESHTIN;Lo;0;L;;;;;N;;;;;
+120FF;CUNEIFORM SIGN GESHTIN TIMES KUR;Lo;0;L;;;;;N;;;;;
+12100;CUNEIFORM SIGN GI;Lo;0;L;;;;;N;;;;;
+12101;CUNEIFORM SIGN GI TIMES E;Lo;0;L;;;;;N;;;;;
+12102;CUNEIFORM SIGN GI TIMES U;Lo;0;L;;;;;N;;;;;
+12103;CUNEIFORM SIGN GI CROSSING GI;Lo;0;L;;;;;N;;;;;
+12104;CUNEIFORM SIGN GI4;Lo;0;L;;;;;N;;;;;
+12105;CUNEIFORM SIGN GI4 OVER GI4;Lo;0;L;;;;;N;;;;;
+12106;CUNEIFORM SIGN GI4 CROSSING GI4;Lo;0;L;;;;;N;;;;;
+12107;CUNEIFORM SIGN GIDIM;Lo;0;L;;;;;N;;;;;
+12108;CUNEIFORM SIGN GIR2;Lo;0;L;;;;;N;;;;;
+12109;CUNEIFORM SIGN GIR2 GUNU;Lo;0;L;;;;;N;;;;;
+1210A;CUNEIFORM SIGN GIR3;Lo;0;L;;;;;N;;;;;
+1210B;CUNEIFORM SIGN GIR3 TIMES A PLUS IGI;Lo;0;L;;;;;N;;;;;
+1210C;CUNEIFORM SIGN GIR3 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1210D;CUNEIFORM SIGN GIR3 TIMES IGI;Lo;0;L;;;;;N;;;;;
+1210E;CUNEIFORM SIGN GIR3 TIMES LU PLUS IGI;Lo;0;L;;;;;N;;;;;
+1210F;CUNEIFORM SIGN GIR3 TIMES PA;Lo;0;L;;;;;N;;;;;
+12110;CUNEIFORM SIGN GISAL;Lo;0;L;;;;;N;;;;;
+12111;CUNEIFORM SIGN GISH;Lo;0;L;;;;;N;;;;;
+12112;CUNEIFORM SIGN GISH CROSSING GISH;Lo;0;L;;;;;N;;;;;
+12113;CUNEIFORM SIGN GISH TIMES BAD;Lo;0;L;;;;;N;;;;;
+12114;CUNEIFORM SIGN GISH TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12115;CUNEIFORM SIGN GISH TENU;Lo;0;L;;;;;N;;;;;
+12116;CUNEIFORM SIGN GU;Lo;0;L;;;;;N;;;;;
+12117;CUNEIFORM SIGN GU CROSSING GU;Lo;0;L;;;;;N;;;;;
+12118;CUNEIFORM SIGN GU2;Lo;0;L;;;;;N;;;;;
+12119;CUNEIFORM SIGN GU2 TIMES KAK;Lo;0;L;;;;;N;;;;;
+1211A;CUNEIFORM SIGN GU2 TIMES KAK TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+1211B;CUNEIFORM SIGN GU2 TIMES NUN;Lo;0;L;;;;;N;;;;;
+1211C;CUNEIFORM SIGN GU2 TIMES SAL PLUS TUG2;Lo;0;L;;;;;N;;;;;
+1211D;CUNEIFORM SIGN GU2 GUNU;Lo;0;L;;;;;N;;;;;
+1211E;CUNEIFORM SIGN GUD;Lo;0;L;;;;;N;;;;;
+1211F;CUNEIFORM SIGN GUD TIMES A PLUS KUR;Lo;0;L;;;;;N;;;;;
+12120;CUNEIFORM SIGN GUD TIMES KUR;Lo;0;L;;;;;N;;;;;
+12121;CUNEIFORM SIGN GUD OVER GUD LUGAL;Lo;0;L;;;;;N;;;;;
+12122;CUNEIFORM SIGN GUL;Lo;0;L;;;;;N;;;;;
+12123;CUNEIFORM SIGN GUM;Lo;0;L;;;;;N;;;;;
+12124;CUNEIFORM SIGN GUM TIMES SHE;Lo;0;L;;;;;N;;;;;
+12125;CUNEIFORM SIGN GUR;Lo;0;L;;;;;N;;;;;
+12126;CUNEIFORM SIGN GUR7;Lo;0;L;;;;;N;;;;;
+12127;CUNEIFORM SIGN GURUN;Lo;0;L;;;;;N;;;;;
+12128;CUNEIFORM SIGN GURUSH;Lo;0;L;;;;;N;;;;;
+12129;CUNEIFORM SIGN HA;Lo;0;L;;;;;N;;;;;
+1212A;CUNEIFORM SIGN HA TENU;Lo;0;L;;;;;N;;;;;
+1212B;CUNEIFORM SIGN HA GUNU;Lo;0;L;;;;;N;;;;;
+1212C;CUNEIFORM SIGN HAL;Lo;0;L;;;;;N;;;;;
+1212D;CUNEIFORM SIGN HI;Lo;0;L;;;;;N;;;;;
+1212E;CUNEIFORM SIGN HI TIMES ASH;Lo;0;L;;;;;N;;;;;
+1212F;CUNEIFORM SIGN HI TIMES ASH2;Lo;0;L;;;;;N;;;;;
+12130;CUNEIFORM SIGN HI TIMES BAD;Lo;0;L;;;;;N;;;;;
+12131;CUNEIFORM SIGN HI TIMES DISH;Lo;0;L;;;;;N;;;;;
+12132;CUNEIFORM SIGN HI TIMES GAD;Lo;0;L;;;;;N;;;;;
+12133;CUNEIFORM SIGN HI TIMES KIN;Lo;0;L;;;;;N;;;;;
+12134;CUNEIFORM SIGN HI TIMES NUN;Lo;0;L;;;;;N;;;;;
+12135;CUNEIFORM SIGN HI TIMES SHE;Lo;0;L;;;;;N;;;;;
+12136;CUNEIFORM SIGN HI TIMES U;Lo;0;L;;;;;N;;;;;
+12137;CUNEIFORM SIGN HU;Lo;0;L;;;;;N;;;;;
+12138;CUNEIFORM SIGN HUB2;Lo;0;L;;;;;N;;;;;
+12139;CUNEIFORM SIGN HUB2 TIMES AN;Lo;0;L;;;;;N;;;;;
+1213A;CUNEIFORM SIGN HUB2 TIMES HAL;Lo;0;L;;;;;N;;;;;
+1213B;CUNEIFORM SIGN HUB2 TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+1213C;CUNEIFORM SIGN HUB2 TIMES LISH;Lo;0;L;;;;;N;;;;;
+1213D;CUNEIFORM SIGN HUB2 TIMES UD;Lo;0;L;;;;;N;;;;;
+1213E;CUNEIFORM SIGN HUL2;Lo;0;L;;;;;N;;;;;
+1213F;CUNEIFORM SIGN I;Lo;0;L;;;;;N;;;;;
+12140;CUNEIFORM SIGN I A;Lo;0;L;;;;;N;;;;;
+12141;CUNEIFORM SIGN IB;Lo;0;L;;;;;N;;;;;
+12142;CUNEIFORM SIGN IDIM;Lo;0;L;;;;;N;;;;;
+12143;CUNEIFORM SIGN IDIM OVER IDIM BUR;Lo;0;L;;;;;N;;;;;
+12144;CUNEIFORM SIGN IDIM OVER IDIM SQUARED;Lo;0;L;;;;;N;;;;;
+12145;CUNEIFORM SIGN IG;Lo;0;L;;;;;N;;;;;
+12146;CUNEIFORM SIGN IGI;Lo;0;L;;;;;N;;;;;
+12147;CUNEIFORM SIGN IGI DIB;Lo;0;L;;;;;N;;;;;
+12148;CUNEIFORM SIGN IGI RI;Lo;0;L;;;;;N;;;;;
+12149;CUNEIFORM SIGN IGI OVER IGI SHIR OVER SHIR UD OVER UD;Lo;0;L;;;;;N;;;;;
+1214A;CUNEIFORM SIGN IGI GUNU;Lo;0;L;;;;;N;;;;;
+1214B;CUNEIFORM SIGN IL;Lo;0;L;;;;;N;;;;;
+1214C;CUNEIFORM SIGN IL TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1214D;CUNEIFORM SIGN IL2;Lo;0;L;;;;;N;;;;;
+1214E;CUNEIFORM SIGN IM;Lo;0;L;;;;;N;;;;;
+1214F;CUNEIFORM SIGN IM TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12150;CUNEIFORM SIGN IM CROSSING IM;Lo;0;L;;;;;N;;;;;
+12151;CUNEIFORM SIGN IM OPPOSING IM;Lo;0;L;;;;;N;;;;;
+12152;CUNEIFORM SIGN IM SQUARED;Lo;0;L;;;;;N;;;;;
+12153;CUNEIFORM SIGN IMIN;Lo;0;L;;;;;N;;;;;
+12154;CUNEIFORM SIGN IN;Lo;0;L;;;;;N;;;;;
+12155;CUNEIFORM SIGN IR;Lo;0;L;;;;;N;;;;;
+12156;CUNEIFORM SIGN ISH;Lo;0;L;;;;;N;;;;;
+12157;CUNEIFORM SIGN KA;Lo;0;L;;;;;N;;;;;
+12158;CUNEIFORM SIGN KA TIMES A;Lo;0;L;;;;;N;;;;;
+12159;CUNEIFORM SIGN KA TIMES AD;Lo;0;L;;;;;N;;;;;
+1215A;CUNEIFORM SIGN KA TIMES AD PLUS KU3;Lo;0;L;;;;;N;;;;;
+1215B;CUNEIFORM SIGN KA TIMES ASH2;Lo;0;L;;;;;N;;;;;
+1215C;CUNEIFORM SIGN KA TIMES BAD;Lo;0;L;;;;;N;;;;;
+1215D;CUNEIFORM SIGN KA TIMES BALAG;Lo;0;L;;;;;N;;;;;
+1215E;CUNEIFORM SIGN KA TIMES BAR;Lo;0;L;;;;;N;;;;;
+1215F;CUNEIFORM SIGN KA TIMES BI;Lo;0;L;;;;;N;;;;;
+12160;CUNEIFORM SIGN KA TIMES ERIN2;Lo;0;L;;;;;N;;;;;
+12161;CUNEIFORM SIGN KA TIMES ESH2;Lo;0;L;;;;;N;;;;;
+12162;CUNEIFORM SIGN KA TIMES GA;Lo;0;L;;;;;N;;;;;
+12163;CUNEIFORM SIGN KA TIMES GAL;Lo;0;L;;;;;N;;;;;
+12164;CUNEIFORM SIGN KA TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12165;CUNEIFORM SIGN KA TIMES GAR;Lo;0;L;;;;;N;;;;;
+12166;CUNEIFORM SIGN KA TIMES GAR PLUS SHA3 PLUS A;Lo;0;L;;;;;N;;;;;
+12167;CUNEIFORM SIGN KA TIMES GI;Lo;0;L;;;;;N;;;;;
+12168;CUNEIFORM SIGN KA TIMES GIR2;Lo;0;L;;;;;N;;;;;
+12169;CUNEIFORM SIGN KA TIMES GISH PLUS SAR;Lo;0;L;;;;;N;;;;;
+1216A;CUNEIFORM SIGN KA TIMES GISH CROSSING GISH;Lo;0;L;;;;;N;;;;;
+1216B;CUNEIFORM SIGN KA TIMES GU;Lo;0;L;;;;;N;;;;;
+1216C;CUNEIFORM SIGN KA TIMES GUR7;Lo;0;L;;;;;N;;;;;
+1216D;CUNEIFORM SIGN KA TIMES IGI;Lo;0;L;;;;;N;;;;;
+1216E;CUNEIFORM SIGN KA TIMES IM;Lo;0;L;;;;;N;;;;;
+1216F;CUNEIFORM SIGN KA TIMES KAK;Lo;0;L;;;;;N;;;;;
+12170;CUNEIFORM SIGN KA TIMES KI;Lo;0;L;;;;;N;;;;;
+12171;CUNEIFORM SIGN KA TIMES KID;Lo;0;L;;;;;N;;;;;
+12172;CUNEIFORM SIGN KA TIMES LI;Lo;0;L;;;;;N;;;;;
+12173;CUNEIFORM SIGN KA TIMES LU;Lo;0;L;;;;;N;;;;;
+12174;CUNEIFORM SIGN KA TIMES ME;Lo;0;L;;;;;N;;;;;
+12175;CUNEIFORM SIGN KA TIMES ME PLUS DU;Lo;0;L;;;;;N;;;;;
+12176;CUNEIFORM SIGN KA TIMES ME PLUS GI;Lo;0;L;;;;;N;;;;;
+12177;CUNEIFORM SIGN KA TIMES ME PLUS TE;Lo;0;L;;;;;N;;;;;
+12178;CUNEIFORM SIGN KA TIMES MI;Lo;0;L;;;;;N;;;;;
+12179;CUNEIFORM SIGN KA TIMES MI PLUS NUNUZ;Lo;0;L;;;;;N;;;;;
+1217A;CUNEIFORM SIGN KA TIMES NE;Lo;0;L;;;;;N;;;;;
+1217B;CUNEIFORM SIGN KA TIMES NUN;Lo;0;L;;;;;N;;;;;
+1217C;CUNEIFORM SIGN KA TIMES PI;Lo;0;L;;;;;N;;;;;
+1217D;CUNEIFORM SIGN KA TIMES RU;Lo;0;L;;;;;N;;;;;
+1217E;CUNEIFORM SIGN KA TIMES SA;Lo;0;L;;;;;N;;;;;
+1217F;CUNEIFORM SIGN KA TIMES SAR;Lo;0;L;;;;;N;;;;;
+12180;CUNEIFORM SIGN KA TIMES SHA;Lo;0;L;;;;;N;;;;;
+12181;CUNEIFORM SIGN KA TIMES SHE;Lo;0;L;;;;;N;;;;;
+12182;CUNEIFORM SIGN KA TIMES SHID;Lo;0;L;;;;;N;;;;;
+12183;CUNEIFORM SIGN KA TIMES SHU;Lo;0;L;;;;;N;;;;;
+12184;CUNEIFORM SIGN KA TIMES SIG;Lo;0;L;;;;;N;;;;;
+12185;CUNEIFORM SIGN KA TIMES SUHUR;Lo;0;L;;;;;N;;;;;
+12186;CUNEIFORM SIGN KA TIMES TAR;Lo;0;L;;;;;N;;;;;
+12187;CUNEIFORM SIGN KA TIMES U;Lo;0;L;;;;;N;;;;;
+12188;CUNEIFORM SIGN KA TIMES U2;Lo;0;L;;;;;N;;;;;
+12189;CUNEIFORM SIGN KA TIMES UD;Lo;0;L;;;;;N;;;;;
+1218A;CUNEIFORM SIGN KA TIMES UMUM TIMES PA;Lo;0;L;;;;;N;;;;;
+1218B;CUNEIFORM SIGN KA TIMES USH;Lo;0;L;;;;;N;;;;;
+1218C;CUNEIFORM SIGN KA TIMES ZI;Lo;0;L;;;;;N;;;;;
+1218D;CUNEIFORM SIGN KA2;Lo;0;L;;;;;N;;;;;
+1218E;CUNEIFORM SIGN KA2 CROSSING KA2;Lo;0;L;;;;;N;;;;;
+1218F;CUNEIFORM SIGN KAB;Lo;0;L;;;;;N;;;;;
+12190;CUNEIFORM SIGN KAD2;Lo;0;L;;;;;N;;;;;
+12191;CUNEIFORM SIGN KAD3;Lo;0;L;;;;;N;;;;;
+12192;CUNEIFORM SIGN KAD4;Lo;0;L;;;;;N;;;;;
+12193;CUNEIFORM SIGN KAD5;Lo;0;L;;;;;N;;;;;
+12194;CUNEIFORM SIGN KAD5 OVER KAD5;Lo;0;L;;;;;N;;;;;
+12195;CUNEIFORM SIGN KAK;Lo;0;L;;;;;N;;;;;
+12196;CUNEIFORM SIGN KAK TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+12197;CUNEIFORM SIGN KAL;Lo;0;L;;;;;N;;;;;
+12198;CUNEIFORM SIGN KAL TIMES BAD;Lo;0;L;;;;;N;;;;;
+12199;CUNEIFORM SIGN KAL CROSSING KAL;Lo;0;L;;;;;N;;;;;
+1219A;CUNEIFORM SIGN KAM2;Lo;0;L;;;;;N;;;;;
+1219B;CUNEIFORM SIGN KAM4;Lo;0;L;;;;;N;;;;;
+1219C;CUNEIFORM SIGN KASKAL;Lo;0;L;;;;;N;;;;;
+1219D;CUNEIFORM SIGN KASKAL LAGAB TIMES U OVER LAGAB TIMES U;Lo;0;L;;;;;N;;;;;
+1219E;CUNEIFORM SIGN KASKAL OVER KASKAL LAGAB TIMES U OVER LAGAB TIMES U;Lo;0;L;;;;;N;;;;;
+1219F;CUNEIFORM SIGN KESH2;Lo;0;L;;;;;N;;;;;
+121A0;CUNEIFORM SIGN KI;Lo;0;L;;;;;N;;;;;
+121A1;CUNEIFORM SIGN KI TIMES BAD;Lo;0;L;;;;;N;;;;;
+121A2;CUNEIFORM SIGN KI TIMES U;Lo;0;L;;;;;N;;;;;
+121A3;CUNEIFORM SIGN KI TIMES UD;Lo;0;L;;;;;N;;;;;
+121A4;CUNEIFORM SIGN KID;Lo;0;L;;;;;N;;;;;
+121A5;CUNEIFORM SIGN KIN;Lo;0;L;;;;;N;;;;;
+121A6;CUNEIFORM SIGN KISAL;Lo;0;L;;;;;N;;;;;
+121A7;CUNEIFORM SIGN KISH;Lo;0;L;;;;;N;;;;;
+121A8;CUNEIFORM SIGN KISIM5;Lo;0;L;;;;;N;;;;;
+121A9;CUNEIFORM SIGN KISIM5 OVER KISIM5;Lo;0;L;;;;;N;;;;;
+121AA;CUNEIFORM SIGN KU;Lo;0;L;;;;;N;;;;;
+121AB;CUNEIFORM SIGN KU OVER HI TIMES ASH2 KU OVER HI TIMES ASH2;Lo;0;L;;;;;N;;;;;
+121AC;CUNEIFORM SIGN KU3;Lo;0;L;;;;;N;;;;;
+121AD;CUNEIFORM SIGN KU4;Lo;0;L;;;;;N;;;;;
+121AE;CUNEIFORM SIGN KU4 VARIANT FORM;Lo;0;L;;;;;N;;;;;
+121AF;CUNEIFORM SIGN KU7;Lo;0;L;;;;;N;;;;;
+121B0;CUNEIFORM SIGN KUL;Lo;0;L;;;;;N;;;;;
+121B1;CUNEIFORM SIGN KUL GUNU;Lo;0;L;;;;;N;;;;;
+121B2;CUNEIFORM SIGN KUN;Lo;0;L;;;;;N;;;;;
+121B3;CUNEIFORM SIGN KUR;Lo;0;L;;;;;N;;;;;
+121B4;CUNEIFORM SIGN KUR OPPOSING KUR;Lo;0;L;;;;;N;;;;;
+121B5;CUNEIFORM SIGN KUSHU2;Lo;0;L;;;;;N;;;;;
+121B6;CUNEIFORM SIGN KWU318;Lo;0;L;;;;;N;;;;;
+121B7;CUNEIFORM SIGN LA;Lo;0;L;;;;;N;;;;;
+121B8;CUNEIFORM SIGN LAGAB;Lo;0;L;;;;;N;;;;;
+121B9;CUNEIFORM SIGN LAGAB TIMES A;Lo;0;L;;;;;N;;;;;
+121BA;CUNEIFORM SIGN LAGAB TIMES A PLUS DA PLUS HA;Lo;0;L;;;;;N;;;;;
+121BB;CUNEIFORM SIGN LAGAB TIMES A PLUS GAR;Lo;0;L;;;;;N;;;;;
+121BC;CUNEIFORM SIGN LAGAB TIMES A PLUS LAL;Lo;0;L;;;;;N;;;;;
+121BD;CUNEIFORM SIGN LAGAB TIMES AL;Lo;0;L;;;;;N;;;;;
+121BE;CUNEIFORM SIGN LAGAB TIMES AN;Lo;0;L;;;;;N;;;;;
+121BF;CUNEIFORM SIGN LAGAB TIMES ASH ZIDA TENU;Lo;0;L;;;;;N;;;;;
+121C0;CUNEIFORM SIGN LAGAB TIMES BAD;Lo;0;L;;;;;N;;;;;
+121C1;CUNEIFORM SIGN LAGAB TIMES BI;Lo;0;L;;;;;N;;;;;
+121C2;CUNEIFORM SIGN LAGAB TIMES DAR;Lo;0;L;;;;;N;;;;;
+121C3;CUNEIFORM SIGN LAGAB TIMES EN;Lo;0;L;;;;;N;;;;;
+121C4;CUNEIFORM SIGN LAGAB TIMES GA;Lo;0;L;;;;;N;;;;;
+121C5;CUNEIFORM SIGN LAGAB TIMES GAR;Lo;0;L;;;;;N;;;;;
+121C6;CUNEIFORM SIGN LAGAB TIMES GUD;Lo;0;L;;;;;N;;;;;
+121C7;CUNEIFORM SIGN LAGAB TIMES GUD PLUS GUD;Lo;0;L;;;;;N;;;;;
+121C8;CUNEIFORM SIGN LAGAB TIMES HA;Lo;0;L;;;;;N;;;;;
+121C9;CUNEIFORM SIGN LAGAB TIMES HAL;Lo;0;L;;;;;N;;;;;
+121CA;CUNEIFORM SIGN LAGAB TIMES HI TIMES NUN;Lo;0;L;;;;;N;;;;;
+121CB;CUNEIFORM SIGN LAGAB TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+121CC;CUNEIFORM SIGN LAGAB TIMES IM;Lo;0;L;;;;;N;;;;;
+121CD;CUNEIFORM SIGN LAGAB TIMES IM PLUS HA;Lo;0;L;;;;;N;;;;;
+121CE;CUNEIFORM SIGN LAGAB TIMES IM PLUS LU;Lo;0;L;;;;;N;;;;;
+121CF;CUNEIFORM SIGN LAGAB TIMES KI;Lo;0;L;;;;;N;;;;;
+121D0;CUNEIFORM SIGN LAGAB TIMES KIN;Lo;0;L;;;;;N;;;;;
+121D1;CUNEIFORM SIGN LAGAB TIMES KU3;Lo;0;L;;;;;N;;;;;
+121D2;CUNEIFORM SIGN LAGAB TIMES KUL;Lo;0;L;;;;;N;;;;;
+121D3;CUNEIFORM SIGN LAGAB TIMES KUL PLUS HI PLUS A;Lo;0;L;;;;;N;;;;;
+121D4;CUNEIFORM SIGN LAGAB TIMES LAGAB;Lo;0;L;;;;;N;;;;;
+121D5;CUNEIFORM SIGN LAGAB TIMES LISH;Lo;0;L;;;;;N;;;;;
+121D6;CUNEIFORM SIGN LAGAB TIMES LU;Lo;0;L;;;;;N;;;;;
+121D7;CUNEIFORM SIGN LAGAB TIMES LUL;Lo;0;L;;;;;N;;;;;
+121D8;CUNEIFORM SIGN LAGAB TIMES ME;Lo;0;L;;;;;N;;;;;
+121D9;CUNEIFORM SIGN LAGAB TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;;
+121DA;CUNEIFORM SIGN LAGAB TIMES MUSH;Lo;0;L;;;;;N;;;;;
+121DB;CUNEIFORM SIGN LAGAB TIMES NE;Lo;0;L;;;;;N;;;;;
+121DC;CUNEIFORM SIGN LAGAB TIMES SHE PLUS SUM;Lo;0;L;;;;;N;;;;;
+121DD;CUNEIFORM SIGN LAGAB TIMES SHITA PLUS GISH PLUS ERIN2;Lo;0;L;;;;;N;;;;;
+121DE;CUNEIFORM SIGN LAGAB TIMES SHITA PLUS GISH TENU;Lo;0;L;;;;;N;;;;;
+121DF;CUNEIFORM SIGN LAGAB TIMES SHU2;Lo;0;L;;;;;N;;;;;
+121E0;CUNEIFORM SIGN LAGAB TIMES SHU2 PLUS SHU2;Lo;0;L;;;;;N;;;;;
+121E1;CUNEIFORM SIGN LAGAB TIMES SUM;Lo;0;L;;;;;N;;;;;
+121E2;CUNEIFORM SIGN LAGAB TIMES TAG;Lo;0;L;;;;;N;;;;;
+121E3;CUNEIFORM SIGN LAGAB TIMES TAK4;Lo;0;L;;;;;N;;;;;
+121E4;CUNEIFORM SIGN LAGAB TIMES TE PLUS A PLUS SU PLUS NA;Lo;0;L;;;;;N;;;;;
+121E5;CUNEIFORM SIGN LAGAB TIMES U;Lo;0;L;;;;;N;;;;;
+121E6;CUNEIFORM SIGN LAGAB TIMES U PLUS A;Lo;0;L;;;;;N;;;;;
+121E7;CUNEIFORM SIGN LAGAB TIMES U PLUS U PLUS U;Lo;0;L;;;;;N;;;;;
+121E8;CUNEIFORM SIGN LAGAB TIMES U2 PLUS ASH;Lo;0;L;;;;;N;;;;;
+121E9;CUNEIFORM SIGN LAGAB TIMES UD;Lo;0;L;;;;;N;;;;;
+121EA;CUNEIFORM SIGN LAGAB TIMES USH;Lo;0;L;;;;;N;;;;;
+121EB;CUNEIFORM SIGN LAGAB SQUARED;Lo;0;L;;;;;N;;;;;
+121EC;CUNEIFORM SIGN LAGAR;Lo;0;L;;;;;N;;;;;
+121ED;CUNEIFORM SIGN LAGAR TIMES SHE;Lo;0;L;;;;;N;;;;;
+121EE;CUNEIFORM SIGN LAGAR TIMES SHE PLUS SUM;Lo;0;L;;;;;N;;;;;
+121EF;CUNEIFORM SIGN LAGAR GUNU;Lo;0;L;;;;;N;;;;;
+121F0;CUNEIFORM SIGN LAGAR GUNU OVER LAGAR GUNU SHE;Lo;0;L;;;;;N;;;;;
+121F1;CUNEIFORM SIGN LAHSHU;Lo;0;L;;;;;N;;;;;
+121F2;CUNEIFORM SIGN LAL;Lo;0;L;;;;;N;;;;;
+121F3;CUNEIFORM SIGN LAL TIMES LAL;Lo;0;L;;;;;N;;;;;
+121F4;CUNEIFORM SIGN LAM;Lo;0;L;;;;;N;;;;;
+121F5;CUNEIFORM SIGN LAM TIMES KUR;Lo;0;L;;;;;N;;;;;
+121F6;CUNEIFORM SIGN LAM TIMES KUR PLUS RU;Lo;0;L;;;;;N;;;;;
+121F7;CUNEIFORM SIGN LI;Lo;0;L;;;;;N;;;;;
+121F8;CUNEIFORM SIGN LIL;Lo;0;L;;;;;N;;;;;
+121F9;CUNEIFORM SIGN LIMMU2;Lo;0;L;;;;;N;;;;;
+121FA;CUNEIFORM SIGN LISH;Lo;0;L;;;;;N;;;;;
+121FB;CUNEIFORM SIGN LU;Lo;0;L;;;;;N;;;;;
+121FC;CUNEIFORM SIGN LU TIMES BAD;Lo;0;L;;;;;N;;;;;
+121FD;CUNEIFORM SIGN LU2;Lo;0;L;;;;;N;;;;;
+121FE;CUNEIFORM SIGN LU2 TIMES AL;Lo;0;L;;;;;N;;;;;
+121FF;CUNEIFORM SIGN LU2 TIMES BAD;Lo;0;L;;;;;N;;;;;
+12200;CUNEIFORM SIGN LU2 TIMES ESH2;Lo;0;L;;;;;N;;;;;
+12201;CUNEIFORM SIGN LU2 TIMES ESH2 TENU;Lo;0;L;;;;;N;;;;;
+12202;CUNEIFORM SIGN LU2 TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12203;CUNEIFORM SIGN LU2 TIMES HI TIMES BAD;Lo;0;L;;;;;N;;;;;
+12204;CUNEIFORM SIGN LU2 TIMES IM;Lo;0;L;;;;;N;;;;;
+12205;CUNEIFORM SIGN LU2 TIMES KAD2;Lo;0;L;;;;;N;;;;;
+12206;CUNEIFORM SIGN LU2 TIMES KAD3;Lo;0;L;;;;;N;;;;;
+12207;CUNEIFORM SIGN LU2 TIMES KAD3 PLUS ASH;Lo;0;L;;;;;N;;;;;
+12208;CUNEIFORM SIGN LU2 TIMES KI;Lo;0;L;;;;;N;;;;;
+12209;CUNEIFORM SIGN LU2 TIMES LA PLUS ASH;Lo;0;L;;;;;N;;;;;
+1220A;CUNEIFORM SIGN LU2 TIMES LAGAB;Lo;0;L;;;;;N;;;;;
+1220B;CUNEIFORM SIGN LU2 TIMES ME PLUS EN;Lo;0;L;;;;;N;;;;;
+1220C;CUNEIFORM SIGN LU2 TIMES NE;Lo;0;L;;;;;N;;;;;
+1220D;CUNEIFORM SIGN LU2 TIMES NU;Lo;0;L;;;;;N;;;;;
+1220E;CUNEIFORM SIGN LU2 TIMES SI PLUS ASH;Lo;0;L;;;;;N;;;;;
+1220F;CUNEIFORM SIGN LU2 TIMES SIK2 PLUS BU;Lo;0;L;;;;;N;;;;;
+12210;CUNEIFORM SIGN LU2 TIMES TUG2;Lo;0;L;;;;;N;;;;;
+12211;CUNEIFORM SIGN LU2 TENU;Lo;0;L;;;;;N;;;;;
+12212;CUNEIFORM SIGN LU2 CROSSING LU2;Lo;0;L;;;;;N;;;;;
+12213;CUNEIFORM SIGN LU2 OPPOSING LU2;Lo;0;L;;;;;N;;;;;
+12214;CUNEIFORM SIGN LU2 SQUARED;Lo;0;L;;;;;N;;;;;
+12215;CUNEIFORM SIGN LU2 SHESHIG;Lo;0;L;;;;;N;;;;;
+12216;CUNEIFORM SIGN LU3;Lo;0;L;;;;;N;;;;;
+12217;CUNEIFORM SIGN LUGAL;Lo;0;L;;;;;N;;;;;
+12218;CUNEIFORM SIGN LUGAL OVER LUGAL;Lo;0;L;;;;;N;;;;;
+12219;CUNEIFORM SIGN LUGAL OPPOSING LUGAL;Lo;0;L;;;;;N;;;;;
+1221A;CUNEIFORM SIGN LUGAL SHESHIG;Lo;0;L;;;;;N;;;;;
+1221B;CUNEIFORM SIGN LUH;Lo;0;L;;;;;N;;;;;
+1221C;CUNEIFORM SIGN LUL;Lo;0;L;;;;;N;;;;;
+1221D;CUNEIFORM SIGN LUM;Lo;0;L;;;;;N;;;;;
+1221E;CUNEIFORM SIGN LUM OVER LUM;Lo;0;L;;;;;N;;;;;
+1221F;CUNEIFORM SIGN LUM OVER LUM GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+12220;CUNEIFORM SIGN MA;Lo;0;L;;;;;N;;;;;
+12221;CUNEIFORM SIGN MA TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12222;CUNEIFORM SIGN MA GUNU;Lo;0;L;;;;;N;;;;;
+12223;CUNEIFORM SIGN MA2;Lo;0;L;;;;;N;;;;;
+12224;CUNEIFORM SIGN MAH;Lo;0;L;;;;;N;;;;;
+12225;CUNEIFORM SIGN MAR;Lo;0;L;;;;;N;;;;;
+12226;CUNEIFORM SIGN MASH;Lo;0;L;;;;;N;;;;;
+12227;CUNEIFORM SIGN MASH2;Lo;0;L;;;;;N;;;;;
+12228;CUNEIFORM SIGN ME;Lo;0;L;;;;;N;;;;;
+12229;CUNEIFORM SIGN MES;Lo;0;L;;;;;N;;;;;
+1222A;CUNEIFORM SIGN MI;Lo;0;L;;;;;N;;;;;
+1222B;CUNEIFORM SIGN MIN;Lo;0;L;;;;;N;;;;;
+1222C;CUNEIFORM SIGN MU;Lo;0;L;;;;;N;;;;;
+1222D;CUNEIFORM SIGN MU OVER MU;Lo;0;L;;;;;N;;;;;
+1222E;CUNEIFORM SIGN MUG;Lo;0;L;;;;;N;;;;;
+1222F;CUNEIFORM SIGN MUG GUNU;Lo;0;L;;;;;N;;;;;
+12230;CUNEIFORM SIGN MUNSUB;Lo;0;L;;;;;N;;;;;
+12231;CUNEIFORM SIGN MURGU2;Lo;0;L;;;;;N;;;;;
+12232;CUNEIFORM SIGN MUSH;Lo;0;L;;;;;N;;;;;
+12233;CUNEIFORM SIGN MUSH TIMES A;Lo;0;L;;;;;N;;;;;
+12234;CUNEIFORM SIGN MUSH TIMES KUR;Lo;0;L;;;;;N;;;;;
+12235;CUNEIFORM SIGN MUSH TIMES ZA;Lo;0;L;;;;;N;;;;;
+12236;CUNEIFORM SIGN MUSH OVER MUSH;Lo;0;L;;;;;N;;;;;
+12237;CUNEIFORM SIGN MUSH OVER MUSH TIMES A PLUS NA;Lo;0;L;;;;;N;;;;;
+12238;CUNEIFORM SIGN MUSH CROSSING MUSH;Lo;0;L;;;;;N;;;;;
+12239;CUNEIFORM SIGN MUSH3;Lo;0;L;;;;;N;;;;;
+1223A;CUNEIFORM SIGN MUSH3 TIMES A;Lo;0;L;;;;;N;;;;;
+1223B;CUNEIFORM SIGN MUSH3 TIMES A PLUS DI;Lo;0;L;;;;;N;;;;;
+1223C;CUNEIFORM SIGN MUSH3 TIMES DI;Lo;0;L;;;;;N;;;;;
+1223D;CUNEIFORM SIGN MUSH3 GUNU;Lo;0;L;;;;;N;;;;;
+1223E;CUNEIFORM SIGN NA;Lo;0;L;;;;;N;;;;;
+1223F;CUNEIFORM SIGN NA2;Lo;0;L;;;;;N;;;;;
+12240;CUNEIFORM SIGN NAGA;Lo;0;L;;;;;N;;;;;
+12241;CUNEIFORM SIGN NAGA INVERTED;Lo;0;L;;;;;N;;;;;
+12242;CUNEIFORM SIGN NAGA TIMES SHU TENU;Lo;0;L;;;;;N;;;;;
+12243;CUNEIFORM SIGN NAGA OPPOSING NAGA;Lo;0;L;;;;;N;;;;;
+12244;CUNEIFORM SIGN NAGAR;Lo;0;L;;;;;N;;;;;
+12245;CUNEIFORM SIGN NAM NUTILLU;Lo;0;L;;;;;N;;;;;
+12246;CUNEIFORM SIGN NAM;Lo;0;L;;;;;N;;;;;
+12247;CUNEIFORM SIGN NAM2;Lo;0;L;;;;;N;;;;;
+12248;CUNEIFORM SIGN NE;Lo;0;L;;;;;N;;;;;
+12249;CUNEIFORM SIGN NE TIMES A;Lo;0;L;;;;;N;;;;;
+1224A;CUNEIFORM SIGN NE TIMES UD;Lo;0;L;;;;;N;;;;;
+1224B;CUNEIFORM SIGN NE SHESHIG;Lo;0;L;;;;;N;;;;;
+1224C;CUNEIFORM SIGN NI;Lo;0;L;;;;;N;;;;;
+1224D;CUNEIFORM SIGN NI TIMES E;Lo;0;L;;;;;N;;;;;
+1224E;CUNEIFORM SIGN NI2;Lo;0;L;;;;;N;;;;;
+1224F;CUNEIFORM SIGN NIM;Lo;0;L;;;;;N;;;;;
+12250;CUNEIFORM SIGN NIM TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12251;CUNEIFORM SIGN NIM TIMES GAR PLUS GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12252;CUNEIFORM SIGN NINDA2;Lo;0;L;;;;;N;;;;;
+12253;CUNEIFORM SIGN NINDA2 TIMES AN;Lo;0;L;;;;;N;;;;;
+12254;CUNEIFORM SIGN NINDA2 TIMES ASH;Lo;0;L;;;;;N;;;;;
+12255;CUNEIFORM SIGN NINDA2 TIMES ASH PLUS ASH;Lo;0;L;;;;;N;;;;;
+12256;CUNEIFORM SIGN NINDA2 TIMES GUD;Lo;0;L;;;;;N;;;;;
+12257;CUNEIFORM SIGN NINDA2 TIMES ME PLUS GAN2 TENU;Lo;0;L;;;;;N;;;;;
+12258;CUNEIFORM SIGN NINDA2 TIMES NE;Lo;0;L;;;;;N;;;;;
+12259;CUNEIFORM SIGN NINDA2 TIMES NUN;Lo;0;L;;;;;N;;;;;
+1225A;CUNEIFORM SIGN NINDA2 TIMES SHE;Lo;0;L;;;;;N;;;;;
+1225B;CUNEIFORM SIGN NINDA2 TIMES SHE PLUS A AN;Lo;0;L;;;;;N;;;;;
+1225C;CUNEIFORM SIGN NINDA2 TIMES SHE PLUS ASH;Lo;0;L;;;;;N;;;;;
+1225D;CUNEIFORM SIGN NINDA2 TIMES SHE PLUS ASH PLUS ASH;Lo;0;L;;;;;N;;;;;
+1225E;CUNEIFORM SIGN NINDA2 TIMES U2 PLUS ASH;Lo;0;L;;;;;N;;;;;
+1225F;CUNEIFORM SIGN NINDA2 TIMES USH;Lo;0;L;;;;;N;;;;;
+12260;CUNEIFORM SIGN NISAG;Lo;0;L;;;;;N;;;;;
+12261;CUNEIFORM SIGN NU;Lo;0;L;;;;;N;;;;;
+12262;CUNEIFORM SIGN NU11;Lo;0;L;;;;;N;;;;;
+12263;CUNEIFORM SIGN NUN;Lo;0;L;;;;;N;;;;;
+12264;CUNEIFORM SIGN NUN LAGAR TIMES GAR;Lo;0;L;;;;;N;;;;;
+12265;CUNEIFORM SIGN NUN LAGAR TIMES MASH;Lo;0;L;;;;;N;;;;;
+12266;CUNEIFORM SIGN NUN LAGAR TIMES SAL;Lo;0;L;;;;;N;;;;;
+12267;CUNEIFORM SIGN NUN LAGAR TIMES SAL OVER NUN LAGAR TIMES SAL;Lo;0;L;;;;;N;;;;;
+12268;CUNEIFORM SIGN NUN LAGAR TIMES USH;Lo;0;L;;;;;N;;;;;
+12269;CUNEIFORM SIGN NUN TENU;Lo;0;L;;;;;N;;;;;
+1226A;CUNEIFORM SIGN NUN OVER NUN;Lo;0;L;;;;;N;;;;;
+1226B;CUNEIFORM SIGN NUN CROSSING NUN;Lo;0;L;;;;;N;;;;;
+1226C;CUNEIFORM SIGN NUN CROSSING NUN LAGAR OVER LAGAR;Lo;0;L;;;;;N;;;;;
+1226D;CUNEIFORM SIGN NUNUZ;Lo;0;L;;;;;N;;;;;
+1226E;CUNEIFORM SIGN NUNUZ AB2 TIMES ASHGAB;Lo;0;L;;;;;N;;;;;
+1226F;CUNEIFORM SIGN NUNUZ AB2 TIMES BI;Lo;0;L;;;;;N;;;;;
+12270;CUNEIFORM SIGN NUNUZ AB2 TIMES DUG;Lo;0;L;;;;;N;;;;;
+12271;CUNEIFORM SIGN NUNUZ AB2 TIMES GUD;Lo;0;L;;;;;N;;;;;
+12272;CUNEIFORM SIGN NUNUZ AB2 TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+12273;CUNEIFORM SIGN NUNUZ AB2 TIMES KAD3;Lo;0;L;;;;;N;;;;;
+12274;CUNEIFORM SIGN NUNUZ AB2 TIMES LA;Lo;0;L;;;;;N;;;;;
+12275;CUNEIFORM SIGN NUNUZ AB2 TIMES NE;Lo;0;L;;;;;N;;;;;
+12276;CUNEIFORM SIGN NUNUZ AB2 TIMES SILA3;Lo;0;L;;;;;N;;;;;
+12277;CUNEIFORM SIGN NUNUZ AB2 TIMES U2;Lo;0;L;;;;;N;;;;;
+12278;CUNEIFORM SIGN NUNUZ KISIM5 TIMES BI;Lo;0;L;;;;;N;;;;;
+12279;CUNEIFORM SIGN NUNUZ KISIM5 TIMES BI U;Lo;0;L;;;;;N;;;;;
+1227A;CUNEIFORM SIGN PA;Lo;0;L;;;;;N;;;;;
+1227B;CUNEIFORM SIGN PAD;Lo;0;L;;;;;N;;;;;
+1227C;CUNEIFORM SIGN PAN;Lo;0;L;;;;;N;;;;;
+1227D;CUNEIFORM SIGN PAP;Lo;0;L;;;;;N;;;;;
+1227E;CUNEIFORM SIGN PESH2;Lo;0;L;;;;;N;;;;;
+1227F;CUNEIFORM SIGN PI;Lo;0;L;;;;;N;;;;;
+12280;CUNEIFORM SIGN PI TIMES A;Lo;0;L;;;;;N;;;;;
+12281;CUNEIFORM SIGN PI TIMES AB;Lo;0;L;;;;;N;;;;;
+12282;CUNEIFORM SIGN PI TIMES BI;Lo;0;L;;;;;N;;;;;
+12283;CUNEIFORM SIGN PI TIMES BU;Lo;0;L;;;;;N;;;;;
+12284;CUNEIFORM SIGN PI TIMES E;Lo;0;L;;;;;N;;;;;
+12285;CUNEIFORM SIGN PI TIMES I;Lo;0;L;;;;;N;;;;;
+12286;CUNEIFORM SIGN PI TIMES IB;Lo;0;L;;;;;N;;;;;
+12287;CUNEIFORM SIGN PI TIMES U;Lo;0;L;;;;;N;;;;;
+12288;CUNEIFORM SIGN PI TIMES U2;Lo;0;L;;;;;N;;;;;
+12289;CUNEIFORM SIGN PI CROSSING PI;Lo;0;L;;;;;N;;;;;
+1228A;CUNEIFORM SIGN PIRIG;Lo;0;L;;;;;N;;;;;
+1228B;CUNEIFORM SIGN PIRIG TIMES KAL;Lo;0;L;;;;;N;;;;;
+1228C;CUNEIFORM SIGN PIRIG TIMES UD;Lo;0;L;;;;;N;;;;;
+1228D;CUNEIFORM SIGN PIRIG TIMES ZA;Lo;0;L;;;;;N;;;;;
+1228E;CUNEIFORM SIGN PIRIG OPPOSING PIRIG;Lo;0;L;;;;;N;;;;;
+1228F;CUNEIFORM SIGN RA;Lo;0;L;;;;;N;;;;;
+12290;CUNEIFORM SIGN RAB;Lo;0;L;;;;;N;;;;;
+12291;CUNEIFORM SIGN RI;Lo;0;L;;;;;N;;;;;
+12292;CUNEIFORM SIGN RU;Lo;0;L;;;;;N;;;;;
+12293;CUNEIFORM SIGN SA;Lo;0;L;;;;;N;;;;;
+12294;CUNEIFORM SIGN SAG NUTILLU;Lo;0;L;;;;;N;;;;;
+12295;CUNEIFORM SIGN SAG;Lo;0;L;;;;;N;;;;;
+12296;CUNEIFORM SIGN SAG TIMES A;Lo;0;L;;;;;N;;;;;
+12297;CUNEIFORM SIGN SAG TIMES DU;Lo;0;L;;;;;N;;;;;
+12298;CUNEIFORM SIGN SAG TIMES DUB;Lo;0;L;;;;;N;;;;;
+12299;CUNEIFORM SIGN SAG TIMES HA;Lo;0;L;;;;;N;;;;;
+1229A;CUNEIFORM SIGN SAG TIMES KAK;Lo;0;L;;;;;N;;;;;
+1229B;CUNEIFORM SIGN SAG TIMES KUR;Lo;0;L;;;;;N;;;;;
+1229C;CUNEIFORM SIGN SAG TIMES LUM;Lo;0;L;;;;;N;;;;;
+1229D;CUNEIFORM SIGN SAG TIMES MI;Lo;0;L;;;;;N;;;;;
+1229E;CUNEIFORM SIGN SAG TIMES NUN;Lo;0;L;;;;;N;;;;;
+1229F;CUNEIFORM SIGN SAG TIMES SAL;Lo;0;L;;;;;N;;;;;
+122A0;CUNEIFORM SIGN SAG TIMES SHID;Lo;0;L;;;;;N;;;;;
+122A1;CUNEIFORM SIGN SAG TIMES TAB;Lo;0;L;;;;;N;;;;;
+122A2;CUNEIFORM SIGN SAG TIMES U2;Lo;0;L;;;;;N;;;;;
+122A3;CUNEIFORM SIGN SAG TIMES UB;Lo;0;L;;;;;N;;;;;
+122A4;CUNEIFORM SIGN SAG TIMES UM;Lo;0;L;;;;;N;;;;;
+122A5;CUNEIFORM SIGN SAG TIMES UR;Lo;0;L;;;;;N;;;;;
+122A6;CUNEIFORM SIGN SAG TIMES USH;Lo;0;L;;;;;N;;;;;
+122A7;CUNEIFORM SIGN SAG OVER SAG;Lo;0;L;;;;;N;;;;;
+122A8;CUNEIFORM SIGN SAG GUNU;Lo;0;L;;;;;N;;;;;
+122A9;CUNEIFORM SIGN SAL;Lo;0;L;;;;;N;;;;;
+122AA;CUNEIFORM SIGN SAL LAGAB TIMES ASH2;Lo;0;L;;;;;N;;;;;
+122AB;CUNEIFORM SIGN SANGA2;Lo;0;L;;;;;N;;;;;
+122AC;CUNEIFORM SIGN SAR;Lo;0;L;;;;;N;;;;;
+122AD;CUNEIFORM SIGN SHA;Lo;0;L;;;;;N;;;;;
+122AE;CUNEIFORM SIGN SHA3;Lo;0;L;;;;;N;;;;;
+122AF;CUNEIFORM SIGN SHA3 TIMES A;Lo;0;L;;;;;N;;;;;
+122B0;CUNEIFORM SIGN SHA3 TIMES BAD;Lo;0;L;;;;;N;;;;;
+122B1;CUNEIFORM SIGN SHA3 TIMES GISH;Lo;0;L;;;;;N;;;;;
+122B2;CUNEIFORM SIGN SHA3 TIMES NE;Lo;0;L;;;;;N;;;;;
+122B3;CUNEIFORM SIGN SHA3 TIMES SHU2;Lo;0;L;;;;;N;;;;;
+122B4;CUNEIFORM SIGN SHA3 TIMES TUR;Lo;0;L;;;;;N;;;;;
+122B5;CUNEIFORM SIGN SHA3 TIMES U;Lo;0;L;;;;;N;;;;;
+122B6;CUNEIFORM SIGN SHA3 TIMES U PLUS A;Lo;0;L;;;;;N;;;;;
+122B7;CUNEIFORM SIGN SHA6;Lo;0;L;;;;;N;;;;;
+122B8;CUNEIFORM SIGN SHAB6;Lo;0;L;;;;;N;;;;;
+122B9;CUNEIFORM SIGN SHAR2;Lo;0;L;;;;;N;;;;;
+122BA;CUNEIFORM SIGN SHE;Lo;0;L;;;;;N;;;;;
+122BB;CUNEIFORM SIGN SHE HU;Lo;0;L;;;;;N;;;;;
+122BC;CUNEIFORM SIGN SHE OVER SHE GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+122BD;CUNEIFORM SIGN SHE OVER SHE TAB OVER TAB GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+122BE;CUNEIFORM SIGN SHEG9;Lo;0;L;;;;;N;;;;;
+122BF;CUNEIFORM SIGN SHEN;Lo;0;L;;;;;N;;;;;
+122C0;CUNEIFORM SIGN SHESH;Lo;0;L;;;;;N;;;;;
+122C1;CUNEIFORM SIGN SHESH2;Lo;0;L;;;;;N;;;;;
+122C2;CUNEIFORM SIGN SHESHLAM;Lo;0;L;;;;;N;;;;;
+122C3;CUNEIFORM SIGN SHID;Lo;0;L;;;;;N;;;;;
+122C4;CUNEIFORM SIGN SHID TIMES A;Lo;0;L;;;;;N;;;;;
+122C5;CUNEIFORM SIGN SHID TIMES IM;Lo;0;L;;;;;N;;;;;
+122C6;CUNEIFORM SIGN SHIM;Lo;0;L;;;;;N;;;;;
+122C7;CUNEIFORM SIGN SHIM TIMES A;Lo;0;L;;;;;N;;;;;
+122C8;CUNEIFORM SIGN SHIM TIMES BAL;Lo;0;L;;;;;N;;;;;
+122C9;CUNEIFORM SIGN SHIM TIMES BULUG;Lo;0;L;;;;;N;;;;;
+122CA;CUNEIFORM SIGN SHIM TIMES DIN;Lo;0;L;;;;;N;;;;;
+122CB;CUNEIFORM SIGN SHIM TIMES GAR;Lo;0;L;;;;;N;;;;;
+122CC;CUNEIFORM SIGN SHIM TIMES IGI;Lo;0;L;;;;;N;;;;;
+122CD;CUNEIFORM SIGN SHIM TIMES IGI GUNU;Lo;0;L;;;;;N;;;;;
+122CE;CUNEIFORM SIGN SHIM TIMES KUSHU2;Lo;0;L;;;;;N;;;;;
+122CF;CUNEIFORM SIGN SHIM TIMES LUL;Lo;0;L;;;;;N;;;;;
+122D0;CUNEIFORM SIGN SHIM TIMES MUG;Lo;0;L;;;;;N;;;;;
+122D1;CUNEIFORM SIGN SHIM TIMES SAL;Lo;0;L;;;;;N;;;;;
+122D2;CUNEIFORM SIGN SHINIG;Lo;0;L;;;;;N;;;;;
+122D3;CUNEIFORM SIGN SHIR;Lo;0;L;;;;;N;;;;;
+122D4;CUNEIFORM SIGN SHIR TENU;Lo;0;L;;;;;N;;;;;
+122D5;CUNEIFORM SIGN SHIR OVER SHIR BUR OVER BUR;Lo;0;L;;;;;N;;;;;
+122D6;CUNEIFORM SIGN SHITA;Lo;0;L;;;;;N;;;;;
+122D7;CUNEIFORM SIGN SHU;Lo;0;L;;;;;N;;;;;
+122D8;CUNEIFORM SIGN SHU OVER INVERTED SHU;Lo;0;L;;;;;N;;;;;
+122D9;CUNEIFORM SIGN SHU2;Lo;0;L;;;;;N;;;;;
+122DA;CUNEIFORM SIGN SHUBUR;Lo;0;L;;;;;N;;;;;
+122DB;CUNEIFORM SIGN SI;Lo;0;L;;;;;N;;;;;
+122DC;CUNEIFORM SIGN SI GUNU;Lo;0;L;;;;;N;;;;;
+122DD;CUNEIFORM SIGN SIG;Lo;0;L;;;;;N;;;;;
+122DE;CUNEIFORM SIGN SIG4;Lo;0;L;;;;;N;;;;;
+122DF;CUNEIFORM SIGN SIG4 OVER SIG4 SHU2;Lo;0;L;;;;;N;;;;;
+122E0;CUNEIFORM SIGN SIK2;Lo;0;L;;;;;N;;;;;
+122E1;CUNEIFORM SIGN SILA3;Lo;0;L;;;;;N;;;;;
+122E2;CUNEIFORM SIGN SU;Lo;0;L;;;;;N;;;;;
+122E3;CUNEIFORM SIGN SU OVER SU;Lo;0;L;;;;;N;;;;;
+122E4;CUNEIFORM SIGN SUD;Lo;0;L;;;;;N;;;;;
+122E5;CUNEIFORM SIGN SUD2;Lo;0;L;;;;;N;;;;;
+122E6;CUNEIFORM SIGN SUHUR;Lo;0;L;;;;;N;;;;;
+122E7;CUNEIFORM SIGN SUM;Lo;0;L;;;;;N;;;;;
+122E8;CUNEIFORM SIGN SUMASH;Lo;0;L;;;;;N;;;;;
+122E9;CUNEIFORM SIGN SUR;Lo;0;L;;;;;N;;;;;
+122EA;CUNEIFORM SIGN SUR9;Lo;0;L;;;;;N;;;;;
+122EB;CUNEIFORM SIGN TA;Lo;0;L;;;;;N;;;;;
+122EC;CUNEIFORM SIGN TA ASTERISK;Lo;0;L;;;;;N;;;;;
+122ED;CUNEIFORM SIGN TA TIMES HI;Lo;0;L;;;;;N;;;;;
+122EE;CUNEIFORM SIGN TA TIMES MI;Lo;0;L;;;;;N;;;;;
+122EF;CUNEIFORM SIGN TA GUNU;Lo;0;L;;;;;N;;;;;
+122F0;CUNEIFORM SIGN TAB;Lo;0;L;;;;;N;;;;;
+122F1;CUNEIFORM SIGN TAB OVER TAB NI OVER NI DISH OVER DISH;Lo;0;L;;;;;N;;;;;
+122F2;CUNEIFORM SIGN TAB SQUARED;Lo;0;L;;;;;N;;;;;
+122F3;CUNEIFORM SIGN TAG;Lo;0;L;;;;;N;;;;;
+122F4;CUNEIFORM SIGN TAG TIMES BI;Lo;0;L;;;;;N;;;;;
+122F5;CUNEIFORM SIGN TAG TIMES GUD;Lo;0;L;;;;;N;;;;;
+122F6;CUNEIFORM SIGN TAG TIMES SHE;Lo;0;L;;;;;N;;;;;
+122F7;CUNEIFORM SIGN TAG TIMES SHU;Lo;0;L;;;;;N;;;;;
+122F8;CUNEIFORM SIGN TAG TIMES TUG2;Lo;0;L;;;;;N;;;;;
+122F9;CUNEIFORM SIGN TAG TIMES UD;Lo;0;L;;;;;N;;;;;
+122FA;CUNEIFORM SIGN TAK4;Lo;0;L;;;;;N;;;;;
+122FB;CUNEIFORM SIGN TAR;Lo;0;L;;;;;N;;;;;
+122FC;CUNEIFORM SIGN TE;Lo;0;L;;;;;N;;;;;
+122FD;CUNEIFORM SIGN TE GUNU;Lo;0;L;;;;;N;;;;;
+122FE;CUNEIFORM SIGN TI;Lo;0;L;;;;;N;;;;;
+122FF;CUNEIFORM SIGN TI TENU;Lo;0;L;;;;;N;;;;;
+12300;CUNEIFORM SIGN TIL;Lo;0;L;;;;;N;;;;;
+12301;CUNEIFORM SIGN TIR;Lo;0;L;;;;;N;;;;;
+12302;CUNEIFORM SIGN TIR TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12303;CUNEIFORM SIGN TIR OVER TIR;Lo;0;L;;;;;N;;;;;
+12304;CUNEIFORM SIGN TIR OVER TIR GAD OVER GAD GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+12305;CUNEIFORM SIGN TU;Lo;0;L;;;;;N;;;;;
+12306;CUNEIFORM SIGN TUG2;Lo;0;L;;;;;N;;;;;
+12307;CUNEIFORM SIGN TUK;Lo;0;L;;;;;N;;;;;
+12308;CUNEIFORM SIGN TUM;Lo;0;L;;;;;N;;;;;
+12309;CUNEIFORM SIGN TUR;Lo;0;L;;;;;N;;;;;
+1230A;CUNEIFORM SIGN TUR OVER TUR ZA OVER ZA;Lo;0;L;;;;;N;;;;;
+1230B;CUNEIFORM SIGN U;Lo;0;L;;;;;N;;;;;
+1230C;CUNEIFORM SIGN U GUD;Lo;0;L;;;;;N;;;;;
+1230D;CUNEIFORM SIGN U U U;Lo;0;L;;;;;N;;;;;
+1230E;CUNEIFORM SIGN U OVER U PA OVER PA GAR OVER GAR;Lo;0;L;;;;;N;;;;;
+1230F;CUNEIFORM SIGN U OVER U SUR OVER SUR;Lo;0;L;;;;;N;;;;;
+12310;CUNEIFORM SIGN U OVER U U REVERSED OVER U REVERSED;Lo;0;L;;;;;N;;;;;
+12311;CUNEIFORM SIGN U2;Lo;0;L;;;;;N;;;;;
+12312;CUNEIFORM SIGN UB;Lo;0;L;;;;;N;;;;;
+12313;CUNEIFORM SIGN UD;Lo;0;L;;;;;N;;;;;
+12314;CUNEIFORM SIGN UD KUSHU2;Lo;0;L;;;;;N;;;;;
+12315;CUNEIFORM SIGN UD TIMES BAD;Lo;0;L;;;;;N;;;;;
+12316;CUNEIFORM SIGN UD TIMES MI;Lo;0;L;;;;;N;;;;;
+12317;CUNEIFORM SIGN UD TIMES U PLUS U PLUS U;Lo;0;L;;;;;N;;;;;
+12318;CUNEIFORM SIGN UD TIMES U PLUS U PLUS U GUNU;Lo;0;L;;;;;N;;;;;
+12319;CUNEIFORM SIGN UD GUNU;Lo;0;L;;;;;N;;;;;
+1231A;CUNEIFORM SIGN UD SHESHIG;Lo;0;L;;;;;N;;;;;
+1231B;CUNEIFORM SIGN UD SHESHIG TIMES BAD;Lo;0;L;;;;;N;;;;;
+1231C;CUNEIFORM SIGN UDUG;Lo;0;L;;;;;N;;;;;
+1231D;CUNEIFORM SIGN UM;Lo;0;L;;;;;N;;;;;
+1231E;CUNEIFORM SIGN UM TIMES LAGAB;Lo;0;L;;;;;N;;;;;
+1231F;CUNEIFORM SIGN UM TIMES ME PLUS DA;Lo;0;L;;;;;N;;;;;
+12320;CUNEIFORM SIGN UM TIMES SHA3;Lo;0;L;;;;;N;;;;;
+12321;CUNEIFORM SIGN UM TIMES U;Lo;0;L;;;;;N;;;;;
+12322;CUNEIFORM SIGN UMBIN;Lo;0;L;;;;;N;;;;;
+12323;CUNEIFORM SIGN UMUM;Lo;0;L;;;;;N;;;;;
+12324;CUNEIFORM SIGN UMUM TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+12325;CUNEIFORM SIGN UMUM TIMES PA;Lo;0;L;;;;;N;;;;;
+12326;CUNEIFORM SIGN UN;Lo;0;L;;;;;N;;;;;
+12327;CUNEIFORM SIGN UN GUNU;Lo;0;L;;;;;N;;;;;
+12328;CUNEIFORM SIGN UR;Lo;0;L;;;;;N;;;;;
+12329;CUNEIFORM SIGN UR CROSSING UR;Lo;0;L;;;;;N;;;;;
+1232A;CUNEIFORM SIGN UR SHESHIG;Lo;0;L;;;;;N;;;;;
+1232B;CUNEIFORM SIGN UR2;Lo;0;L;;;;;N;;;;;
+1232C;CUNEIFORM SIGN UR2 TIMES A PLUS HA;Lo;0;L;;;;;N;;;;;
+1232D;CUNEIFORM SIGN UR2 TIMES A PLUS NA;Lo;0;L;;;;;N;;;;;
+1232E;CUNEIFORM SIGN UR2 TIMES AL;Lo;0;L;;;;;N;;;;;
+1232F;CUNEIFORM SIGN UR2 TIMES HA;Lo;0;L;;;;;N;;;;;
+12330;CUNEIFORM SIGN UR2 TIMES NUN;Lo;0;L;;;;;N;;;;;
+12331;CUNEIFORM SIGN UR2 TIMES U2;Lo;0;L;;;;;N;;;;;
+12332;CUNEIFORM SIGN UR2 TIMES U2 PLUS ASH;Lo;0;L;;;;;N;;;;;
+12333;CUNEIFORM SIGN UR2 TIMES U2 PLUS BI;Lo;0;L;;;;;N;;;;;
+12334;CUNEIFORM SIGN UR4;Lo;0;L;;;;;N;;;;;
+12335;CUNEIFORM SIGN URI;Lo;0;L;;;;;N;;;;;
+12336;CUNEIFORM SIGN URI3;Lo;0;L;;;;;N;;;;;
+12337;CUNEIFORM SIGN URU;Lo;0;L;;;;;N;;;;;
+12338;CUNEIFORM SIGN URU TIMES A;Lo;0;L;;;;;N;;;;;
+12339;CUNEIFORM SIGN URU TIMES ASHGAB;Lo;0;L;;;;;N;;;;;
+1233A;CUNEIFORM SIGN URU TIMES BAR;Lo;0;L;;;;;N;;;;;
+1233B;CUNEIFORM SIGN URU TIMES DUN;Lo;0;L;;;;;N;;;;;
+1233C;CUNEIFORM SIGN URU TIMES GA;Lo;0;L;;;;;N;;;;;
+1233D;CUNEIFORM SIGN URU TIMES GAL;Lo;0;L;;;;;N;;;;;
+1233E;CUNEIFORM SIGN URU TIMES GAN2 TENU;Lo;0;L;;;;;N;;;;;
+1233F;CUNEIFORM SIGN URU TIMES GAR;Lo;0;L;;;;;N;;;;;
+12340;CUNEIFORM SIGN URU TIMES GU;Lo;0;L;;;;;N;;;;;
+12341;CUNEIFORM SIGN URU TIMES HA;Lo;0;L;;;;;N;;;;;
+12342;CUNEIFORM SIGN URU TIMES IGI;Lo;0;L;;;;;N;;;;;
+12343;CUNEIFORM SIGN URU TIMES IM;Lo;0;L;;;;;N;;;;;
+12344;CUNEIFORM SIGN URU TIMES ISH;Lo;0;L;;;;;N;;;;;
+12345;CUNEIFORM SIGN URU TIMES KI;Lo;0;L;;;;;N;;;;;
+12346;CUNEIFORM SIGN URU TIMES LUM;Lo;0;L;;;;;N;;;;;
+12347;CUNEIFORM SIGN URU TIMES MIN;Lo;0;L;;;;;N;;;;;
+12348;CUNEIFORM SIGN URU TIMES PA;Lo;0;L;;;;;N;;;;;
+12349;CUNEIFORM SIGN URU TIMES SHE;Lo;0;L;;;;;N;;;;;
+1234A;CUNEIFORM SIGN URU TIMES SIG4;Lo;0;L;;;;;N;;;;;
+1234B;CUNEIFORM SIGN URU TIMES TU;Lo;0;L;;;;;N;;;;;
+1234C;CUNEIFORM SIGN URU TIMES U PLUS GUD;Lo;0;L;;;;;N;;;;;
+1234D;CUNEIFORM SIGN URU TIMES UD;Lo;0;L;;;;;N;;;;;
+1234E;CUNEIFORM SIGN URU TIMES URUDA;Lo;0;L;;;;;N;;;;;
+1234F;CUNEIFORM SIGN URUDA;Lo;0;L;;;;;N;;;;;
+12350;CUNEIFORM SIGN URUDA TIMES U;Lo;0;L;;;;;N;;;;;
+12351;CUNEIFORM SIGN USH;Lo;0;L;;;;;N;;;;;
+12352;CUNEIFORM SIGN USH TIMES A;Lo;0;L;;;;;N;;;;;
+12353;CUNEIFORM SIGN USH TIMES KU;Lo;0;L;;;;;N;;;;;
+12354;CUNEIFORM SIGN USH TIMES KUR;Lo;0;L;;;;;N;;;;;
+12355;CUNEIFORM SIGN USH TIMES TAK4;Lo;0;L;;;;;N;;;;;
+12356;CUNEIFORM SIGN USHX;Lo;0;L;;;;;N;;;;;
+12357;CUNEIFORM SIGN USH2;Lo;0;L;;;;;N;;;;;
+12358;CUNEIFORM SIGN USHUMX;Lo;0;L;;;;;N;;;;;
+12359;CUNEIFORM SIGN UTUKI;Lo;0;L;;;;;N;;;;;
+1235A;CUNEIFORM SIGN UZ3;Lo;0;L;;;;;N;;;;;
+1235B;CUNEIFORM SIGN UZ3 TIMES KASKAL;Lo;0;L;;;;;N;;;;;
+1235C;CUNEIFORM SIGN UZU;Lo;0;L;;;;;N;;;;;
+1235D;CUNEIFORM SIGN ZA;Lo;0;L;;;;;N;;;;;
+1235E;CUNEIFORM SIGN ZA TENU;Lo;0;L;;;;;N;;;;;
+1235F;CUNEIFORM SIGN ZA SQUARED TIMES KUR;Lo;0;L;;;;;N;;;;;
+12360;CUNEIFORM SIGN ZAG;Lo;0;L;;;;;N;;;;;
+12361;CUNEIFORM SIGN ZAMX;Lo;0;L;;;;;N;;;;;
+12362;CUNEIFORM SIGN ZE2;Lo;0;L;;;;;N;;;;;
+12363;CUNEIFORM SIGN ZI;Lo;0;L;;;;;N;;;;;
+12364;CUNEIFORM SIGN ZI OVER ZI;Lo;0;L;;;;;N;;;;;
+12365;CUNEIFORM SIGN ZI3;Lo;0;L;;;;;N;;;;;
+12366;CUNEIFORM SIGN ZIB;Lo;0;L;;;;;N;;;;;
+12367;CUNEIFORM SIGN ZIB KABA TENU;Lo;0;L;;;;;N;;;;;
+12368;CUNEIFORM SIGN ZIG;Lo;0;L;;;;;N;;;;;
+12369;CUNEIFORM SIGN ZIZ2;Lo;0;L;;;;;N;;;;;
+1236A;CUNEIFORM SIGN ZU;Lo;0;L;;;;;N;;;;;
+1236B;CUNEIFORM SIGN ZU5;Lo;0;L;;;;;N;;;;;
+1236C;CUNEIFORM SIGN ZU5 TIMES A;Lo;0;L;;;;;N;;;;;
+1236D;CUNEIFORM SIGN ZUBUR;Lo;0;L;;;;;N;;;;;
+1236E;CUNEIFORM SIGN ZUM;Lo;0;L;;;;;N;;;;;
+12400;CUNEIFORM NUMERIC SIGN TWO ASH;Nl;0;L;;;;2;N;;;;;
+12401;CUNEIFORM NUMERIC SIGN THREE ASH;Nl;0;L;;;;3;N;;;;;
+12402;CUNEIFORM NUMERIC SIGN FOUR ASH;Nl;0;L;;;;4;N;;;;;
+12403;CUNEIFORM NUMERIC SIGN FIVE ASH;Nl;0;L;;;;5;N;;;;;
+12404;CUNEIFORM NUMERIC SIGN SIX ASH;Nl;0;L;;;;6;N;;;;;
+12405;CUNEIFORM NUMERIC SIGN SEVEN ASH;Nl;0;L;;;;7;N;;;;;
+12406;CUNEIFORM NUMERIC SIGN EIGHT ASH;Nl;0;L;;;;8;N;;;;;
+12407;CUNEIFORM NUMERIC SIGN NINE ASH;Nl;0;L;;;;9;N;;;;;
+12408;CUNEIFORM NUMERIC SIGN THREE DISH;Nl;0;L;;;;3;N;;;;;
+12409;CUNEIFORM NUMERIC SIGN FOUR DISH;Nl;0;L;;;;4;N;;;;;
+1240A;CUNEIFORM NUMERIC SIGN FIVE DISH;Nl;0;L;;;;5;N;;;;;
+1240B;CUNEIFORM NUMERIC SIGN SIX DISH;Nl;0;L;;;;6;N;;;;;
+1240C;CUNEIFORM NUMERIC SIGN SEVEN DISH;Nl;0;L;;;;7;N;;;;;
+1240D;CUNEIFORM NUMERIC SIGN EIGHT DISH;Nl;0;L;;;;8;N;;;;;
+1240E;CUNEIFORM NUMERIC SIGN NINE DISH;Nl;0;L;;;;9;N;;;;;
+1240F;CUNEIFORM NUMERIC SIGN FOUR U;Nl;0;L;;;;4;N;;;;;
+12410;CUNEIFORM NUMERIC SIGN FIVE U;Nl;0;L;;;;5;N;;;;;
+12411;CUNEIFORM NUMERIC SIGN SIX U;Nl;0;L;;;;6;N;;;;;
+12412;CUNEIFORM NUMERIC SIGN SEVEN U;Nl;0;L;;;;7;N;;;;;
+12413;CUNEIFORM NUMERIC SIGN EIGHT U;Nl;0;L;;;;8;N;;;;;
+12414;CUNEIFORM NUMERIC SIGN NINE U;Nl;0;L;;;;9;N;;;;;
+12415;CUNEIFORM NUMERIC SIGN ONE GESH2;Nl;0;L;;;;1;N;;;;;
+12416;CUNEIFORM NUMERIC SIGN TWO GESH2;Nl;0;L;;;;2;N;;;;;
+12417;CUNEIFORM NUMERIC SIGN THREE GESH2;Nl;0;L;;;;3;N;;;;;
+12418;CUNEIFORM NUMERIC SIGN FOUR GESH2;Nl;0;L;;;;4;N;;;;;
+12419;CUNEIFORM NUMERIC SIGN FIVE GESH2;Nl;0;L;;;;5;N;;;;;
+1241A;CUNEIFORM NUMERIC SIGN SIX GESH2;Nl;0;L;;;;6;N;;;;;
+1241B;CUNEIFORM NUMERIC SIGN SEVEN GESH2;Nl;0;L;;;;7;N;;;;;
+1241C;CUNEIFORM NUMERIC SIGN EIGHT GESH2;Nl;0;L;;;;8;N;;;;;
+1241D;CUNEIFORM NUMERIC SIGN NINE GESH2;Nl;0;L;;;;9;N;;;;;
+1241E;CUNEIFORM NUMERIC SIGN ONE GESHU;Nl;0;L;;;;1;N;;;;;
+1241F;CUNEIFORM NUMERIC SIGN TWO GESHU;Nl;0;L;;;;2;N;;;;;
+12420;CUNEIFORM NUMERIC SIGN THREE GESHU;Nl;0;L;;;;3;N;;;;;
+12421;CUNEIFORM NUMERIC SIGN FOUR GESHU;Nl;0;L;;;;4;N;;;;;
+12422;CUNEIFORM NUMERIC SIGN FIVE GESHU;Nl;0;L;;;;5;N;;;;;
+12423;CUNEIFORM NUMERIC SIGN TWO SHAR2;Nl;0;L;;;;2;N;;;;;
+12424;CUNEIFORM NUMERIC SIGN THREE SHAR2;Nl;0;L;;;;3;N;;;;;
+12425;CUNEIFORM NUMERIC SIGN THREE SHAR2 VARIANT FORM;Nl;0;L;;;;3;N;;;;;
+12426;CUNEIFORM NUMERIC SIGN FOUR SHAR2;Nl;0;L;;;;4;N;;;;;
+12427;CUNEIFORM NUMERIC SIGN FIVE SHAR2;Nl;0;L;;;;5;N;;;;;
+12428;CUNEIFORM NUMERIC SIGN SIX SHAR2;Nl;0;L;;;;6;N;;;;;
+12429;CUNEIFORM NUMERIC SIGN SEVEN SHAR2;Nl;0;L;;;;7;N;;;;;
+1242A;CUNEIFORM NUMERIC SIGN EIGHT SHAR2;Nl;0;L;;;;8;N;;;;;
+1242B;CUNEIFORM NUMERIC SIGN NINE SHAR2;Nl;0;L;;;;9;N;;;;;
+1242C;CUNEIFORM NUMERIC SIGN ONE SHARU;Nl;0;L;;;;1;N;;;;;
+1242D;CUNEIFORM NUMERIC SIGN TWO SHARU;Nl;0;L;;;;2;N;;;;;
+1242E;CUNEIFORM NUMERIC SIGN THREE SHARU;Nl;0;L;;;;3;N;;;;;
+1242F;CUNEIFORM NUMERIC SIGN THREE SHARU VARIANT FORM;Nl;0;L;;;;3;N;;;;;
+12430;CUNEIFORM NUMERIC SIGN FOUR SHARU;Nl;0;L;;;;4;N;;;;;
+12431;CUNEIFORM NUMERIC SIGN FIVE SHARU;Nl;0;L;;;;5;N;;;;;
+12432;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS DISH;Nl;0;L;;;;;N;;;;;
+12433;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS MIN;Nl;0;L;;;;;N;;;;;
+12434;CUNEIFORM NUMERIC SIGN ONE BURU;Nl;0;L;;;;1;N;;;;;
+12435;CUNEIFORM NUMERIC SIGN TWO BURU;Nl;0;L;;;;2;N;;;;;
+12436;CUNEIFORM NUMERIC SIGN THREE BURU;Nl;0;L;;;;3;N;;;;;
+12437;CUNEIFORM NUMERIC SIGN THREE BURU VARIANT FORM;Nl;0;L;;;;3;N;;;;;
+12438;CUNEIFORM NUMERIC SIGN FOUR BURU;Nl;0;L;;;;4;N;;;;;
+12439;CUNEIFORM NUMERIC SIGN FIVE BURU;Nl;0;L;;;;5;N;;;;;
+1243A;CUNEIFORM NUMERIC SIGN THREE VARIANT FORM ESH16;Nl;0;L;;;;3;N;;;;;
+1243B;CUNEIFORM NUMERIC SIGN THREE VARIANT FORM ESH21;Nl;0;L;;;;3;N;;;;;
+1243C;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU;Nl;0;L;;;;4;N;;;;;
+1243D;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU4;Nl;0;L;;;;4;N;;;;;
+1243E;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU A;Nl;0;L;;;;4;N;;;;;
+1243F;CUNEIFORM NUMERIC SIGN FOUR VARIANT FORM LIMMU B;Nl;0;L;;;;4;N;;;;;
+12440;CUNEIFORM NUMERIC SIGN SIX VARIANT FORM ASH9;Nl;0;L;;;;6;N;;;;;
+12441;CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN3;Nl;0;L;;;;7;N;;;;;
+12442;CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN A;Nl;0;L;;;;7;N;;;;;
+12443;CUNEIFORM NUMERIC SIGN SEVEN VARIANT FORM IMIN B;Nl;0;L;;;;7;N;;;;;
+12444;CUNEIFORM NUMERIC SIGN EIGHT VARIANT FORM USSU;Nl;0;L;;;;8;N;;;;;
+12445;CUNEIFORM NUMERIC SIGN EIGHT VARIANT FORM USSU3;Nl;0;L;;;;8;N;;;;;
+12446;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU;Nl;0;L;;;;9;N;;;;;
+12447;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU3;Nl;0;L;;;;9;N;;;;;
+12448;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU4;Nl;0;L;;;;9;N;;;;;
+12449;CUNEIFORM NUMERIC SIGN NINE VARIANT FORM ILIMMU A;Nl;0;L;;;;9;N;;;;;
+1244A;CUNEIFORM NUMERIC SIGN TWO ASH TENU;Nl;0;L;;;;2;N;;;;;
+1244B;CUNEIFORM NUMERIC SIGN THREE ASH TENU;Nl;0;L;;;;3;N;;;;;
+1244C;CUNEIFORM NUMERIC SIGN FOUR ASH TENU;Nl;0;L;;;;4;N;;;;;
+1244D;CUNEIFORM NUMERIC SIGN FIVE ASH TENU;Nl;0;L;;;;5;N;;;;;
+1244E;CUNEIFORM NUMERIC SIGN SIX ASH TENU;Nl;0;L;;;;6;N;;;;;
+1244F;CUNEIFORM NUMERIC SIGN ONE BAN2;Nl;0;L;;;;1;N;;;;;
+12450;CUNEIFORM NUMERIC SIGN TWO BAN2;Nl;0;L;;;;2;N;;;;;
+12451;CUNEIFORM NUMERIC SIGN THREE BAN2;Nl;0;L;;;;3;N;;;;;
+12452;CUNEIFORM NUMERIC SIGN FOUR BAN2;Nl;0;L;;;;4;N;;;;;
+12453;CUNEIFORM NUMERIC SIGN FOUR BAN2 VARIANT FORM;Nl;0;L;;;;4;N;;;;;
+12454;CUNEIFORM NUMERIC SIGN FIVE BAN2;Nl;0;L;;;;5;N;;;;;
+12455;CUNEIFORM NUMERIC SIGN FIVE BAN2 VARIANT FORM;Nl;0;L;;;;5;N;;;;;
+12456;CUNEIFORM NUMERIC SIGN NIGIDAMIN;Nl;0;L;;;;;N;;;;;
+12457;CUNEIFORM NUMERIC SIGN NIGIDAESH;Nl;0;L;;;;;N;;;;;
+12458;CUNEIFORM NUMERIC SIGN ONE ESHE3;Nl;0;L;;;;1;N;;;;;
+12459;CUNEIFORM NUMERIC SIGN TWO ESHE3;Nl;0;L;;;;2;N;;;;;
+1245A;CUNEIFORM NUMERIC SIGN ONE THIRD DISH;Nl;0;L;;;;1/3;N;;;;;
+1245B;CUNEIFORM NUMERIC SIGN TWO THIRDS DISH;Nl;0;L;;;;2/3;N;;;;;
+1245C;CUNEIFORM NUMERIC SIGN FIVE SIXTHS DISH;Nl;0;L;;;;5/6;N;;;;;
+1245D;CUNEIFORM NUMERIC SIGN ONE THIRD VARIANT FORM A;Nl;0;L;;;;1/3;N;;;;;
+1245E;CUNEIFORM NUMERIC SIGN TWO THIRDS VARIANT FORM A;Nl;0;L;;;;2/3;N;;;;;
+1245F;CUNEIFORM NUMERIC SIGN ONE EIGHTH ASH;Nl;0;L;;;;1/8;N;;;;;
+12460;CUNEIFORM NUMERIC SIGN ONE QUARTER ASH;Nl;0;L;;;;1/4;N;;;;;
+12461;CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE SIXTH;Nl;0;L;;;;1/6;N;;;;;
+12462;CUNEIFORM NUMERIC SIGN OLD ASSYRIAN ONE QUARTER;Nl;0;L;;;;1/4;N;;;;;
+12470;CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER;Po;0;L;;;;;N;;;;;
+12471;CUNEIFORM PUNCTUATION SIGN VERTICAL COLON;Po;0;L;;;;;N;;;;;
+12472;CUNEIFORM PUNCTUATION SIGN DIAGONAL COLON;Po;0;L;;;;;N;;;;;
+12473;CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON;Po;0;L;;;;;N;;;;;
+1D000;BYZANTINE MUSICAL SYMBOL PSILI;So;0;L;;;;;N;;;;;
+1D001;BYZANTINE MUSICAL SYMBOL DASEIA;So;0;L;;;;;N;;;;;
+1D002;BYZANTINE MUSICAL SYMBOL PERISPOMENI;So;0;L;;;;;N;;;;;
+1D003;BYZANTINE MUSICAL SYMBOL OXEIA EKFONITIKON;So;0;L;;;;;N;;;;;
+1D004;BYZANTINE MUSICAL SYMBOL OXEIA DIPLI;So;0;L;;;;;N;;;;;
+1D005;BYZANTINE MUSICAL SYMBOL VAREIA EKFONITIKON;So;0;L;;;;;N;;;;;
+1D006;BYZANTINE MUSICAL SYMBOL VAREIA DIPLI;So;0;L;;;;;N;;;;;
+1D007;BYZANTINE MUSICAL SYMBOL KATHISTI;So;0;L;;;;;N;;;;;
+1D008;BYZANTINE MUSICAL SYMBOL SYRMATIKI;So;0;L;;;;;N;;;;;
+1D009;BYZANTINE MUSICAL SYMBOL PARAKLITIKI;So;0;L;;;;;N;;;;;
+1D00A;BYZANTINE MUSICAL SYMBOL YPOKRISIS;So;0;L;;;;;N;;;;;
+1D00B;BYZANTINE MUSICAL SYMBOL YPOKRISIS DIPLI;So;0;L;;;;;N;;;;;
+1D00C;BYZANTINE MUSICAL SYMBOL KREMASTI;So;0;L;;;;;N;;;;;
+1D00D;BYZANTINE MUSICAL SYMBOL APESO EKFONITIKON;So;0;L;;;;;N;;;;;
+1D00E;BYZANTINE MUSICAL SYMBOL EXO EKFONITIKON;So;0;L;;;;;N;;;;;
+1D00F;BYZANTINE MUSICAL SYMBOL TELEIA;So;0;L;;;;;N;;;;;
+1D010;BYZANTINE MUSICAL SYMBOL KENTIMATA;So;0;L;;;;;N;;;;;
+1D011;BYZANTINE MUSICAL SYMBOL APOSTROFOS;So;0;L;;;;;N;;;;;
+1D012;BYZANTINE MUSICAL SYMBOL APOSTROFOS DIPLI;So;0;L;;;;;N;;;;;
+1D013;BYZANTINE MUSICAL SYMBOL SYNEVMA;So;0;L;;;;;N;;;;;
+1D014;BYZANTINE MUSICAL SYMBOL THITA;So;0;L;;;;;N;;;;;
+1D015;BYZANTINE MUSICAL SYMBOL OLIGON ARCHAION;So;0;L;;;;;N;;;;;
+1D016;BYZANTINE MUSICAL SYMBOL GORGON ARCHAION;So;0;L;;;;;N;;;;;
+1D017;BYZANTINE MUSICAL SYMBOL PSILON;So;0;L;;;;;N;;;;;
+1D018;BYZANTINE MUSICAL SYMBOL CHAMILON;So;0;L;;;;;N;;;;;
+1D019;BYZANTINE MUSICAL SYMBOL VATHY;So;0;L;;;;;N;;;;;
+1D01A;BYZANTINE MUSICAL SYMBOL ISON ARCHAION;So;0;L;;;;;N;;;;;
+1D01B;BYZANTINE MUSICAL SYMBOL KENTIMA ARCHAION;So;0;L;;;;;N;;;;;
+1D01C;BYZANTINE MUSICAL SYMBOL KENTIMATA ARCHAION;So;0;L;;;;;N;;;;;
+1D01D;BYZANTINE MUSICAL SYMBOL SAXIMATA;So;0;L;;;;;N;;;;;
+1D01E;BYZANTINE MUSICAL SYMBOL PARICHON;So;0;L;;;;;N;;;;;
+1D01F;BYZANTINE MUSICAL SYMBOL STAVROS APODEXIA;So;0;L;;;;;N;;;;;
+1D020;BYZANTINE MUSICAL SYMBOL OXEIAI ARCHAION;So;0;L;;;;;N;;;;;
+1D021;BYZANTINE MUSICAL SYMBOL VAREIAI ARCHAION;So;0;L;;;;;N;;;;;
+1D022;BYZANTINE MUSICAL SYMBOL APODERMA ARCHAION;So;0;L;;;;;N;;;;;
+1D023;BYZANTINE MUSICAL SYMBOL APOTHEMA;So;0;L;;;;;N;;;;;
+1D024;BYZANTINE MUSICAL SYMBOL KLASMA;So;0;L;;;;;N;;;;;
+1D025;BYZANTINE MUSICAL SYMBOL REVMA;So;0;L;;;;;N;;;;;
+1D026;BYZANTINE MUSICAL SYMBOL PIASMA ARCHAION;So;0;L;;;;;N;;;;;
+1D027;BYZANTINE MUSICAL SYMBOL TINAGMA;So;0;L;;;;;N;;;;;
+1D028;BYZANTINE MUSICAL SYMBOL ANATRICHISMA;So;0;L;;;;;N;;;;;
+1D029;BYZANTINE MUSICAL SYMBOL SEISMA;So;0;L;;;;;N;;;;;
+1D02A;BYZANTINE MUSICAL SYMBOL SYNAGMA ARCHAION;So;0;L;;;;;N;;;;;
+1D02B;BYZANTINE MUSICAL SYMBOL SYNAGMA META STAVROU;So;0;L;;;;;N;;;;;
+1D02C;BYZANTINE MUSICAL SYMBOL OYRANISMA ARCHAION;So;0;L;;;;;N;;;;;
+1D02D;BYZANTINE MUSICAL SYMBOL THEMA;So;0;L;;;;;N;;;;;
+1D02E;BYZANTINE MUSICAL SYMBOL LEMOI;So;0;L;;;;;N;;;;;
+1D02F;BYZANTINE MUSICAL SYMBOL DYO;So;0;L;;;;;N;;;;;
+1D030;BYZANTINE MUSICAL SYMBOL TRIA;So;0;L;;;;;N;;;;;
+1D031;BYZANTINE MUSICAL SYMBOL TESSERA;So;0;L;;;;;N;;;;;
+1D032;BYZANTINE MUSICAL SYMBOL KRATIMATA;So;0;L;;;;;N;;;;;
+1D033;BYZANTINE MUSICAL SYMBOL APESO EXO NEO;So;0;L;;;;;N;;;;;
+1D034;BYZANTINE MUSICAL SYMBOL FTHORA ARCHAION;So;0;L;;;;;N;;;;;
+1D035;BYZANTINE MUSICAL SYMBOL IMIFTHORA;So;0;L;;;;;N;;;;;
+1D036;BYZANTINE MUSICAL SYMBOL TROMIKON ARCHAION;So;0;L;;;;;N;;;;;
+1D037;BYZANTINE MUSICAL SYMBOL KATAVA TROMIKON;So;0;L;;;;;N;;;;;
+1D038;BYZANTINE MUSICAL SYMBOL PELASTON;So;0;L;;;;;N;;;;;
+1D039;BYZANTINE MUSICAL SYMBOL PSIFISTON;So;0;L;;;;;N;;;;;
+1D03A;BYZANTINE MUSICAL SYMBOL KONTEVMA;So;0;L;;;;;N;;;;;
+1D03B;BYZANTINE MUSICAL SYMBOL CHOREVMA ARCHAION;So;0;L;;;;;N;;;;;
+1D03C;BYZANTINE MUSICAL SYMBOL RAPISMA;So;0;L;;;;;N;;;;;
+1D03D;BYZANTINE MUSICAL SYMBOL PARAKALESMA ARCHAION;So;0;L;;;;;N;;;;;
+1D03E;BYZANTINE MUSICAL SYMBOL PARAKLITIKI ARCHAION;So;0;L;;;;;N;;;;;
+1D03F;BYZANTINE MUSICAL SYMBOL ICHADIN;So;0;L;;;;;N;;;;;
+1D040;BYZANTINE MUSICAL SYMBOL NANA;So;0;L;;;;;N;;;;;
+1D041;BYZANTINE MUSICAL SYMBOL PETASMA;So;0;L;;;;;N;;;;;
+1D042;BYZANTINE MUSICAL SYMBOL KONTEVMA ALLO;So;0;L;;;;;N;;;;;
+1D043;BYZANTINE MUSICAL SYMBOL TROMIKON ALLO;So;0;L;;;;;N;;;;;
+1D044;BYZANTINE MUSICAL SYMBOL STRAGGISMATA;So;0;L;;;;;N;;;;;
+1D045;BYZANTINE MUSICAL SYMBOL GRONTHISMATA;So;0;L;;;;;N;;;;;
+1D046;BYZANTINE MUSICAL SYMBOL ISON NEO;So;0;L;;;;;N;;;;;
+1D047;BYZANTINE MUSICAL SYMBOL OLIGON NEO;So;0;L;;;;;N;;;;;
+1D048;BYZANTINE MUSICAL SYMBOL OXEIA NEO;So;0;L;;;;;N;;;;;
+1D049;BYZANTINE MUSICAL SYMBOL PETASTI;So;0;L;;;;;N;;;;;
+1D04A;BYZANTINE MUSICAL SYMBOL KOUFISMA;So;0;L;;;;;N;;;;;
+1D04B;BYZANTINE MUSICAL SYMBOL PETASTOKOUFISMA;So;0;L;;;;;N;;;;;
+1D04C;BYZANTINE MUSICAL SYMBOL KRATIMOKOUFISMA;So;0;L;;;;;N;;;;;
+1D04D;BYZANTINE MUSICAL SYMBOL PELASTON NEO;So;0;L;;;;;N;;;;;
+1D04E;BYZANTINE MUSICAL SYMBOL KENTIMATA NEO ANO;So;0;L;;;;;N;;;;;
+1D04F;BYZANTINE MUSICAL SYMBOL KENTIMA NEO ANO;So;0;L;;;;;N;;;;;
+1D050;BYZANTINE MUSICAL SYMBOL YPSILI;So;0;L;;;;;N;;;;;
+1D051;BYZANTINE MUSICAL SYMBOL APOSTROFOS NEO;So;0;L;;;;;N;;;;;
+1D052;BYZANTINE MUSICAL SYMBOL APOSTROFOI SYNDESMOS NEO;So;0;L;;;;;N;;;;;
+1D053;BYZANTINE MUSICAL SYMBOL YPORROI;So;0;L;;;;;N;;;;;
+1D054;BYZANTINE MUSICAL SYMBOL KRATIMOYPORROON;So;0;L;;;;;N;;;;;
+1D055;BYZANTINE MUSICAL SYMBOL ELAFRON;So;0;L;;;;;N;;;;;
+1D056;BYZANTINE MUSICAL SYMBOL CHAMILI;So;0;L;;;;;N;;;;;
+1D057;BYZANTINE MUSICAL SYMBOL MIKRON ISON;So;0;L;;;;;N;;;;;
+1D058;BYZANTINE MUSICAL SYMBOL VAREIA NEO;So;0;L;;;;;N;;;;;
+1D059;BYZANTINE MUSICAL SYMBOL PIASMA NEO;So;0;L;;;;;N;;;;;
+1D05A;BYZANTINE MUSICAL SYMBOL PSIFISTON NEO;So;0;L;;;;;N;;;;;
+1D05B;BYZANTINE MUSICAL SYMBOL OMALON;So;0;L;;;;;N;;;;;
+1D05C;BYZANTINE MUSICAL SYMBOL ANTIKENOMA;So;0;L;;;;;N;;;;;
+1D05D;BYZANTINE MUSICAL SYMBOL LYGISMA;So;0;L;;;;;N;;;;;
+1D05E;BYZANTINE MUSICAL SYMBOL PARAKLITIKI NEO;So;0;L;;;;;N;;;;;
+1D05F;BYZANTINE MUSICAL SYMBOL PARAKALESMA NEO;So;0;L;;;;;N;;;;;
+1D060;BYZANTINE MUSICAL SYMBOL ETERON PARAKALESMA;So;0;L;;;;;N;;;;;
+1D061;BYZANTINE MUSICAL SYMBOL KYLISMA;So;0;L;;;;;N;;;;;
+1D062;BYZANTINE MUSICAL SYMBOL ANTIKENOKYLISMA;So;0;L;;;;;N;;;;;
+1D063;BYZANTINE MUSICAL SYMBOL TROMIKON NEO;So;0;L;;;;;N;;;;;
+1D064;BYZANTINE MUSICAL SYMBOL EKSTREPTON;So;0;L;;;;;N;;;;;
+1D065;BYZANTINE MUSICAL SYMBOL SYNAGMA NEO;So;0;L;;;;;N;;;;;
+1D066;BYZANTINE MUSICAL SYMBOL SYRMA;So;0;L;;;;;N;;;;;
+1D067;BYZANTINE MUSICAL SYMBOL CHOREVMA NEO;So;0;L;;;;;N;;;;;
+1D068;BYZANTINE MUSICAL SYMBOL EPEGERMA;So;0;L;;;;;N;;;;;
+1D069;BYZANTINE MUSICAL SYMBOL SEISMA NEO;So;0;L;;;;;N;;;;;
+1D06A;BYZANTINE MUSICAL SYMBOL XIRON KLASMA;So;0;L;;;;;N;;;;;
+1D06B;BYZANTINE MUSICAL SYMBOL TROMIKOPSIFISTON;So;0;L;;;;;N;;;;;
+1D06C;BYZANTINE MUSICAL SYMBOL PSIFISTOLYGISMA;So;0;L;;;;;N;;;;;
+1D06D;BYZANTINE MUSICAL SYMBOL TROMIKOLYGISMA;So;0;L;;;;;N;;;;;
+1D06E;BYZANTINE MUSICAL SYMBOL TROMIKOPARAKALESMA;So;0;L;;;;;N;;;;;
+1D06F;BYZANTINE MUSICAL SYMBOL PSIFISTOPARAKALESMA;So;0;L;;;;;N;;;;;
+1D070;BYZANTINE MUSICAL SYMBOL TROMIKOSYNAGMA;So;0;L;;;;;N;;;;;
+1D071;BYZANTINE MUSICAL SYMBOL PSIFISTOSYNAGMA;So;0;L;;;;;N;;;;;
+1D072;BYZANTINE MUSICAL SYMBOL GORGOSYNTHETON;So;0;L;;;;;N;;;;;
+1D073;BYZANTINE MUSICAL SYMBOL ARGOSYNTHETON;So;0;L;;;;;N;;;;;
+1D074;BYZANTINE MUSICAL SYMBOL ETERON ARGOSYNTHETON;So;0;L;;;;;N;;;;;
+1D075;BYZANTINE MUSICAL SYMBOL OYRANISMA NEO;So;0;L;;;;;N;;;;;
+1D076;BYZANTINE MUSICAL SYMBOL THEMATISMOS ESO;So;0;L;;;;;N;;;;;
+1D077;BYZANTINE MUSICAL SYMBOL THEMATISMOS EXO;So;0;L;;;;;N;;;;;
+1D078;BYZANTINE MUSICAL SYMBOL THEMA APLOUN;So;0;L;;;;;N;;;;;
+1D079;BYZANTINE MUSICAL SYMBOL THES KAI APOTHES;So;0;L;;;;;N;;;;;
+1D07A;BYZANTINE MUSICAL SYMBOL KATAVASMA;So;0;L;;;;;N;;;;;
+1D07B;BYZANTINE MUSICAL SYMBOL ENDOFONON;So;0;L;;;;;N;;;;;
+1D07C;BYZANTINE MUSICAL SYMBOL YFEN KATO;So;0;L;;;;;N;;;;;
+1D07D;BYZANTINE MUSICAL SYMBOL YFEN ANO;So;0;L;;;;;N;;;;;
+1D07E;BYZANTINE MUSICAL SYMBOL STAVROS;So;0;L;;;;;N;;;;;
+1D07F;BYZANTINE MUSICAL SYMBOL KLASMA ANO;So;0;L;;;;;N;;;;;
+1D080;BYZANTINE MUSICAL SYMBOL DIPLI ARCHAION;So;0;L;;;;;N;;;;;
+1D081;BYZANTINE MUSICAL SYMBOL KRATIMA ARCHAION;So;0;L;;;;;N;;;;;
+1D082;BYZANTINE MUSICAL SYMBOL KRATIMA ALLO;So;0;L;;;;;N;;;;;
+1D083;BYZANTINE MUSICAL SYMBOL KRATIMA NEO;So;0;L;;;;;N;;;;;
+1D084;BYZANTINE MUSICAL SYMBOL APODERMA NEO;So;0;L;;;;;N;;;;;
+1D085;BYZANTINE MUSICAL SYMBOL APLI;So;0;L;;;;;N;;;;;
+1D086;BYZANTINE MUSICAL SYMBOL DIPLI;So;0;L;;;;;N;;;;;
+1D087;BYZANTINE MUSICAL SYMBOL TRIPLI;So;0;L;;;;;N;;;;;
+1D088;BYZANTINE MUSICAL SYMBOL TETRAPLI;So;0;L;;;;;N;;;;;
+1D089;BYZANTINE MUSICAL SYMBOL KORONIS;So;0;L;;;;;N;;;;;
+1D08A;BYZANTINE MUSICAL SYMBOL LEIMMA ENOS CHRONOU;So;0;L;;;;;N;;;;;
+1D08B;BYZANTINE MUSICAL SYMBOL LEIMMA DYO CHRONON;So;0;L;;;;;N;;;;;
+1D08C;BYZANTINE MUSICAL SYMBOL LEIMMA TRION CHRONON;So;0;L;;;;;N;;;;;
+1D08D;BYZANTINE MUSICAL SYMBOL LEIMMA TESSARON CHRONON;So;0;L;;;;;N;;;;;
+1D08E;BYZANTINE MUSICAL SYMBOL LEIMMA IMISEOS CHRONOU;So;0;L;;;;;N;;;;;
+1D08F;BYZANTINE MUSICAL SYMBOL GORGON NEO ANO;So;0;L;;;;;N;;;;;
+1D090;BYZANTINE MUSICAL SYMBOL GORGON PARESTIGMENON ARISTERA;So;0;L;;;;;N;;;;;
+1D091;BYZANTINE MUSICAL SYMBOL GORGON PARESTIGMENON DEXIA;So;0;L;;;;;N;;;;;
+1D092;BYZANTINE MUSICAL SYMBOL DIGORGON;So;0;L;;;;;N;;;;;
+1D093;BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON ARISTERA KATO;So;0;L;;;;;N;;;;;
+1D094;BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON ARISTERA ANO;So;0;L;;;;;N;;;;;
+1D095;BYZANTINE MUSICAL SYMBOL DIGORGON PARESTIGMENON DEXIA;So;0;L;;;;;N;;;;;
+1D096;BYZANTINE MUSICAL SYMBOL TRIGORGON;So;0;L;;;;;N;;;;;
+1D097;BYZANTINE MUSICAL SYMBOL ARGON;So;0;L;;;;;N;;;;;
+1D098;BYZANTINE MUSICAL SYMBOL IMIDIARGON;So;0;L;;;;;N;;;;;
+1D099;BYZANTINE MUSICAL SYMBOL DIARGON;So;0;L;;;;;N;;;;;
+1D09A;BYZANTINE MUSICAL SYMBOL AGOGI POLI ARGI;So;0;L;;;;;N;;;;;
+1D09B;BYZANTINE MUSICAL SYMBOL AGOGI ARGOTERI;So;0;L;;;;;N;;;;;
+1D09C;BYZANTINE MUSICAL SYMBOL AGOGI ARGI;So;0;L;;;;;N;;;;;
+1D09D;BYZANTINE MUSICAL SYMBOL AGOGI METRIA;So;0;L;;;;;N;;;;;
+1D09E;BYZANTINE MUSICAL SYMBOL AGOGI MESI;So;0;L;;;;;N;;;;;
+1D09F;BYZANTINE MUSICAL SYMBOL AGOGI GORGI;So;0;L;;;;;N;;;;;
+1D0A0;BYZANTINE MUSICAL SYMBOL AGOGI GORGOTERI;So;0;L;;;;;N;;;;;
+1D0A1;BYZANTINE MUSICAL SYMBOL AGOGI POLI GORGI;So;0;L;;;;;N;;;;;
+1D0A2;BYZANTINE MUSICAL SYMBOL MARTYRIA PROTOS ICHOS;So;0;L;;;;;N;;;;;
+1D0A3;BYZANTINE MUSICAL SYMBOL MARTYRIA ALLI PROTOS ICHOS;So;0;L;;;;;N;;;;;
+1D0A4;BYZANTINE MUSICAL SYMBOL MARTYRIA DEYTEROS ICHOS;So;0;L;;;;;N;;;;;
+1D0A5;BYZANTINE MUSICAL SYMBOL MARTYRIA ALLI DEYTEROS ICHOS;So;0;L;;;;;N;;;;;
+1D0A6;BYZANTINE MUSICAL SYMBOL MARTYRIA TRITOS ICHOS;So;0;L;;;;;N;;;;;
+1D0A7;BYZANTINE MUSICAL SYMBOL MARTYRIA TRIFONIAS;So;0;L;;;;;N;;;;;
+1D0A8;BYZANTINE MUSICAL SYMBOL MARTYRIA TETARTOS ICHOS;So;0;L;;;;;N;;;;;
+1D0A9;BYZANTINE MUSICAL SYMBOL MARTYRIA TETARTOS LEGETOS ICHOS;So;0;L;;;;;N;;;;;
+1D0AA;BYZANTINE MUSICAL SYMBOL MARTYRIA LEGETOS ICHOS;So;0;L;;;;;N;;;;;
+1D0AB;BYZANTINE MUSICAL SYMBOL MARTYRIA PLAGIOS ICHOS;So;0;L;;;;;N;;;;;
+1D0AC;BYZANTINE MUSICAL SYMBOL ISAKIA TELOUS ICHIMATOS;So;0;L;;;;;N;;;;;
+1D0AD;BYZANTINE MUSICAL SYMBOL APOSTROFOI TELOUS ICHIMATOS;So;0;L;;;;;N;;;;;
+1D0AE;BYZANTINE MUSICAL SYMBOL FANEROSIS TETRAFONIAS;So;0;L;;;;;N;;;;;
+1D0AF;BYZANTINE MUSICAL SYMBOL FANEROSIS MONOFONIAS;So;0;L;;;;;N;;;;;
+1D0B0;BYZANTINE MUSICAL SYMBOL FANEROSIS DIFONIAS;So;0;L;;;;;N;;;;;
+1D0B1;BYZANTINE MUSICAL SYMBOL MARTYRIA VARYS ICHOS;So;0;L;;;;;N;;;;;
+1D0B2;BYZANTINE MUSICAL SYMBOL MARTYRIA PROTOVARYS ICHOS;So;0;L;;;;;N;;;;;
+1D0B3;BYZANTINE MUSICAL SYMBOL MARTYRIA PLAGIOS TETARTOS ICHOS;So;0;L;;;;;N;;;;;
+1D0B4;BYZANTINE MUSICAL SYMBOL GORTHMIKON N APLOUN;So;0;L;;;;;N;;;;;
+1D0B5;BYZANTINE MUSICAL SYMBOL GORTHMIKON N DIPLOUN;So;0;L;;;;;N;;;;;
+1D0B6;BYZANTINE MUSICAL SYMBOL ENARXIS KAI FTHORA VOU;So;0;L;;;;;N;;;;;
+1D0B7;BYZANTINE MUSICAL SYMBOL IMIFONON;So;0;L;;;;;N;;;;;
+1D0B8;BYZANTINE MUSICAL SYMBOL IMIFTHORON;So;0;L;;;;;N;;;;;
+1D0B9;BYZANTINE MUSICAL SYMBOL FTHORA ARCHAION DEYTEROU ICHOU;So;0;L;;;;;N;;;;;
+1D0BA;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI PA;So;0;L;;;;;N;;;;;
+1D0BB;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NANA;So;0;L;;;;;N;;;;;
+1D0BC;BYZANTINE MUSICAL SYMBOL FTHORA NAOS ICHOS;So;0;L;;;;;N;;;;;
+1D0BD;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI DI;So;0;L;;;;;N;;;;;
+1D0BE;BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON DIATONON DI;So;0;L;;;;;N;;;;;
+1D0BF;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI KE;So;0;L;;;;;N;;;;;
+1D0C0;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI ZO;So;0;L;;;;;N;;;;;
+1D0C1;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NI KATO;So;0;L;;;;;N;;;;;
+1D0C2;BYZANTINE MUSICAL SYMBOL FTHORA DIATONIKI NI ANO;So;0;L;;;;;N;;;;;
+1D0C3;BYZANTINE MUSICAL SYMBOL FTHORA MALAKON CHROMA DIFONIAS;So;0;L;;;;;N;;;;;
+1D0C4;BYZANTINE MUSICAL SYMBOL FTHORA MALAKON CHROMA MONOFONIAS;So;0;L;;;;;N;;;;;
+1D0C5;BYZANTINE MUSICAL SYMBOL FHTORA SKLIRON CHROMA VASIS;So;0;L;;;;;N;;;;;
+1D0C6;BYZANTINE MUSICAL SYMBOL FTHORA SKLIRON CHROMA SYNAFI;So;0;L;;;;;N;;;;;
+1D0C7;BYZANTINE MUSICAL SYMBOL FTHORA NENANO;So;0;L;;;;;N;;;;;
+1D0C8;BYZANTINE MUSICAL SYMBOL CHROA ZYGOS;So;0;L;;;;;N;;;;;
+1D0C9;BYZANTINE MUSICAL SYMBOL CHROA KLITON;So;0;L;;;;;N;;;;;
+1D0CA;BYZANTINE MUSICAL SYMBOL CHROA SPATHI;So;0;L;;;;;N;;;;;
+1D0CB;BYZANTINE MUSICAL SYMBOL FTHORA I YFESIS TETARTIMORION;So;0;L;;;;;N;;;;;
+1D0CC;BYZANTINE MUSICAL SYMBOL FTHORA ENARMONIOS ANTIFONIA;So;0;L;;;;;N;;;;;
+1D0CD;BYZANTINE MUSICAL SYMBOL YFESIS TRITIMORION;So;0;L;;;;;N;;;;;
+1D0CE;BYZANTINE MUSICAL SYMBOL DIESIS TRITIMORION;So;0;L;;;;;N;;;;;
+1D0CF;BYZANTINE MUSICAL SYMBOL DIESIS TETARTIMORION;So;0;L;;;;;N;;;;;
+1D0D0;BYZANTINE MUSICAL SYMBOL DIESIS APLI DYO DODEKATA;So;0;L;;;;;N;;;;;
+1D0D1;BYZANTINE MUSICAL SYMBOL DIESIS MONOGRAMMOS TESSERA DODEKATA;So;0;L;;;;;N;;;;;
+1D0D2;BYZANTINE MUSICAL SYMBOL DIESIS DIGRAMMOS EX DODEKATA;So;0;L;;;;;N;;;;;
+1D0D3;BYZANTINE MUSICAL SYMBOL DIESIS TRIGRAMMOS OKTO DODEKATA;So;0;L;;;;;N;;;;;
+1D0D4;BYZANTINE MUSICAL SYMBOL YFESIS APLI DYO DODEKATA;So;0;L;;;;;N;;;;;
+1D0D5;BYZANTINE MUSICAL SYMBOL YFESIS MONOGRAMMOS TESSERA DODEKATA;So;0;L;;;;;N;;;;;
+1D0D6;BYZANTINE MUSICAL SYMBOL YFESIS DIGRAMMOS EX DODEKATA;So;0;L;;;;;N;;;;;
+1D0D7;BYZANTINE MUSICAL SYMBOL YFESIS TRIGRAMMOS OKTO DODEKATA;So;0;L;;;;;N;;;;;
+1D0D8;BYZANTINE MUSICAL SYMBOL GENIKI DIESIS;So;0;L;;;;;N;;;;;
+1D0D9;BYZANTINE MUSICAL SYMBOL GENIKI YFESIS;So;0;L;;;;;N;;;;;
+1D0DA;BYZANTINE MUSICAL SYMBOL DIASTOLI APLI MIKRI;So;0;L;;;;;N;;;;;
+1D0DB;BYZANTINE MUSICAL SYMBOL DIASTOLI APLI MEGALI;So;0;L;;;;;N;;;;;
+1D0DC;BYZANTINE MUSICAL SYMBOL DIASTOLI DIPLI;So;0;L;;;;;N;;;;;
+1D0DD;BYZANTINE MUSICAL SYMBOL DIASTOLI THESEOS;So;0;L;;;;;N;;;;;
+1D0DE;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS;So;0;L;;;;;N;;;;;
+1D0DF;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS DISIMOU;So;0;L;;;;;N;;;;;
+1D0E0;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS TRISIMOU;So;0;L;;;;;N;;;;;
+1D0E1;BYZANTINE MUSICAL SYMBOL SIMANSIS THESEOS TETRASIMOU;So;0;L;;;;;N;;;;;
+1D0E2;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS;So;0;L;;;;;N;;;;;
+1D0E3;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS DISIMOU;So;0;L;;;;;N;;;;;
+1D0E4;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS TRISIMOU;So;0;L;;;;;N;;;;;
+1D0E5;BYZANTINE MUSICAL SYMBOL SIMANSIS ARSEOS TETRASIMOU;So;0;L;;;;;N;;;;;
+1D0E6;BYZANTINE MUSICAL SYMBOL DIGRAMMA GG;So;0;L;;;;;N;;;;;
+1D0E7;BYZANTINE MUSICAL SYMBOL DIFTOGGOS OU;So;0;L;;;;;N;;;;;
+1D0E8;BYZANTINE MUSICAL SYMBOL STIGMA;So;0;L;;;;;N;;;;;
+1D0E9;BYZANTINE MUSICAL SYMBOL ARKTIKO PA;So;0;L;;;;;N;;;;;
+1D0EA;BYZANTINE MUSICAL SYMBOL ARKTIKO VOU;So;0;L;;;;;N;;;;;
+1D0EB;BYZANTINE MUSICAL SYMBOL ARKTIKO GA;So;0;L;;;;;N;;;;;
+1D0EC;BYZANTINE MUSICAL SYMBOL ARKTIKO DI;So;0;L;;;;;N;;;;;
+1D0ED;BYZANTINE MUSICAL SYMBOL ARKTIKO KE;So;0;L;;;;;N;;;;;
+1D0EE;BYZANTINE MUSICAL SYMBOL ARKTIKO ZO;So;0;L;;;;;N;;;;;
+1D0EF;BYZANTINE MUSICAL SYMBOL ARKTIKO NI;So;0;L;;;;;N;;;;;
+1D0F0;BYZANTINE MUSICAL SYMBOL KENTIMATA NEO MESO;So;0;L;;;;;N;;;;;
+1D0F1;BYZANTINE MUSICAL SYMBOL KENTIMA NEO MESO;So;0;L;;;;;N;;;;;
+1D0F2;BYZANTINE MUSICAL SYMBOL KENTIMATA NEO KATO;So;0;L;;;;;N;;;;;
+1D0F3;BYZANTINE MUSICAL SYMBOL KENTIMA NEO KATO;So;0;L;;;;;N;;;;;
+1D0F4;BYZANTINE MUSICAL SYMBOL KLASMA KATO;So;0;L;;;;;N;;;;;
+1D0F5;BYZANTINE MUSICAL SYMBOL GORGON NEO KATO;So;0;L;;;;;N;;;;;
+1D100;MUSICAL SYMBOL SINGLE BARLINE;So;0;L;;;;;N;;;;;
+1D101;MUSICAL SYMBOL DOUBLE BARLINE;So;0;L;;;;;N;;;;;
+1D102;MUSICAL SYMBOL FINAL BARLINE;So;0;L;;;;;N;;;;;
+1D103;MUSICAL SYMBOL REVERSE FINAL BARLINE;So;0;L;;;;;N;;;;;
+1D104;MUSICAL SYMBOL DASHED BARLINE;So;0;L;;;;;N;;;;;
+1D105;MUSICAL SYMBOL SHORT BARLINE;So;0;L;;;;;N;;;;;
+1D106;MUSICAL SYMBOL LEFT REPEAT SIGN;So;0;L;;;;;N;;;;;
+1D107;MUSICAL SYMBOL RIGHT REPEAT SIGN;So;0;L;;;;;N;;;;;
+1D108;MUSICAL SYMBOL REPEAT DOTS;So;0;L;;;;;N;;;;;
+1D109;MUSICAL SYMBOL DAL SEGNO;So;0;L;;;;;N;;;;;
+1D10A;MUSICAL SYMBOL DA CAPO;So;0;L;;;;;N;;;;;
+1D10B;MUSICAL SYMBOL SEGNO;So;0;L;;;;;N;;;;;
+1D10C;MUSICAL SYMBOL CODA;So;0;L;;;;;N;;;;;
+1D10D;MUSICAL SYMBOL REPEATED FIGURE-1;So;0;L;;;;;N;;;;;
+1D10E;MUSICAL SYMBOL REPEATED FIGURE-2;So;0;L;;;;;N;;;;;
+1D10F;MUSICAL SYMBOL REPEATED FIGURE-3;So;0;L;;;;;N;;;;;
+1D110;MUSICAL SYMBOL FERMATA;So;0;L;;;;;N;;;;;
+1D111;MUSICAL SYMBOL FERMATA BELOW;So;0;L;;;;;N;;;;;
+1D112;MUSICAL SYMBOL BREATH MARK;So;0;L;;;;;N;;;;;
+1D113;MUSICAL SYMBOL CAESURA;So;0;L;;;;;N;;;;;
+1D114;MUSICAL SYMBOL BRACE;So;0;L;;;;;N;;;;;
+1D115;MUSICAL SYMBOL BRACKET;So;0;L;;;;;N;;;;;
+1D116;MUSICAL SYMBOL ONE-LINE STAFF;So;0;L;;;;;N;;;;;
+1D117;MUSICAL SYMBOL TWO-LINE STAFF;So;0;L;;;;;N;;;;;
+1D118;MUSICAL SYMBOL THREE-LINE STAFF;So;0;L;;;;;N;;;;;
+1D119;MUSICAL SYMBOL FOUR-LINE STAFF;So;0;L;;;;;N;;;;;
+1D11A;MUSICAL SYMBOL FIVE-LINE STAFF;So;0;L;;;;;N;;;;;
+1D11B;MUSICAL SYMBOL SIX-LINE STAFF;So;0;L;;;;;N;;;;;
+1D11C;MUSICAL SYMBOL SIX-STRING FRETBOARD;So;0;L;;;;;N;;;;;
+1D11D;MUSICAL SYMBOL FOUR-STRING FRETBOARD;So;0;L;;;;;N;;;;;
+1D11E;MUSICAL SYMBOL G CLEF;So;0;L;;;;;N;;;;;
+1D11F;MUSICAL SYMBOL G CLEF OTTAVA ALTA;So;0;L;;;;;N;;;;;
+1D120;MUSICAL SYMBOL G CLEF OTTAVA BASSA;So;0;L;;;;;N;;;;;
+1D121;MUSICAL SYMBOL C CLEF;So;0;L;;;;;N;;;;;
+1D122;MUSICAL SYMBOL F CLEF;So;0;L;;;;;N;;;;;
+1D123;MUSICAL SYMBOL F CLEF OTTAVA ALTA;So;0;L;;;;;N;;;;;
+1D124;MUSICAL SYMBOL F CLEF OTTAVA BASSA;So;0;L;;;;;N;;;;;
+1D125;MUSICAL SYMBOL DRUM CLEF-1;So;0;L;;;;;N;;;;;
+1D126;MUSICAL SYMBOL DRUM CLEF-2;So;0;L;;;;;N;;;;;
+1D129;MUSICAL SYMBOL MULTIPLE MEASURE REST;So;0;L;;;;;N;;;;;
+1D12A;MUSICAL SYMBOL DOUBLE SHARP;So;0;L;;;;;N;;;;;
+1D12B;MUSICAL SYMBOL DOUBLE FLAT;So;0;L;;;;;N;;;;;
+1D12C;MUSICAL SYMBOL FLAT UP;So;0;L;;;;;N;;;;;
+1D12D;MUSICAL SYMBOL FLAT DOWN;So;0;L;;;;;N;;;;;
+1D12E;MUSICAL SYMBOL NATURAL UP;So;0;L;;;;;N;;;;;
+1D12F;MUSICAL SYMBOL NATURAL DOWN;So;0;L;;;;;N;;;;;
+1D130;MUSICAL SYMBOL SHARP UP;So;0;L;;;;;N;;;;;
+1D131;MUSICAL SYMBOL SHARP DOWN;So;0;L;;;;;N;;;;;
+1D132;MUSICAL SYMBOL QUARTER TONE SHARP;So;0;L;;;;;N;;;;;
+1D133;MUSICAL SYMBOL QUARTER TONE FLAT;So;0;L;;;;;N;;;;;
+1D134;MUSICAL SYMBOL COMMON TIME;So;0;L;;;;;N;;;;;
+1D135;MUSICAL SYMBOL CUT TIME;So;0;L;;;;;N;;;;;
+1D136;MUSICAL SYMBOL OTTAVA ALTA;So;0;L;;;;;N;;;;;
+1D137;MUSICAL SYMBOL OTTAVA BASSA;So;0;L;;;;;N;;;;;
+1D138;MUSICAL SYMBOL QUINDICESIMA ALTA;So;0;L;;;;;N;;;;;
+1D139;MUSICAL SYMBOL QUINDICESIMA BASSA;So;0;L;;;;;N;;;;;
+1D13A;MUSICAL SYMBOL MULTI REST;So;0;L;;;;;N;;;;;
+1D13B;MUSICAL SYMBOL WHOLE REST;So;0;L;;;;;N;;;;;
+1D13C;MUSICAL SYMBOL HALF REST;So;0;L;;;;;N;;;;;
+1D13D;MUSICAL SYMBOL QUARTER REST;So;0;L;;;;;N;;;;;
+1D13E;MUSICAL SYMBOL EIGHTH REST;So;0;L;;;;;N;;;;;
+1D13F;MUSICAL SYMBOL SIXTEENTH REST;So;0;L;;;;;N;;;;;
+1D140;MUSICAL SYMBOL THIRTY-SECOND REST;So;0;L;;;;;N;;;;;
+1D141;MUSICAL SYMBOL SIXTY-FOURTH REST;So;0;L;;;;;N;;;;;
+1D142;MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH REST;So;0;L;;;;;N;;;;;
+1D143;MUSICAL SYMBOL X NOTEHEAD;So;0;L;;;;;N;;;;;
+1D144;MUSICAL SYMBOL PLUS NOTEHEAD;So;0;L;;;;;N;;;;;
+1D145;MUSICAL SYMBOL CIRCLE X NOTEHEAD;So;0;L;;;;;N;;;;;
+1D146;MUSICAL SYMBOL SQUARE NOTEHEAD WHITE;So;0;L;;;;;N;;;;;
+1D147;MUSICAL SYMBOL SQUARE NOTEHEAD BLACK;So;0;L;;;;;N;;;;;
+1D148;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP WHITE;So;0;L;;;;;N;;;;;
+1D149;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP BLACK;So;0;L;;;;;N;;;;;
+1D14A;MUSICAL SYMBOL TRIANGLE NOTEHEAD LEFT WHITE;So;0;L;;;;;N;;;;;
+1D14B;MUSICAL SYMBOL TRIANGLE NOTEHEAD LEFT BLACK;So;0;L;;;;;N;;;;;
+1D14C;MUSICAL SYMBOL TRIANGLE NOTEHEAD RIGHT WHITE;So;0;L;;;;;N;;;;;
+1D14D;MUSICAL SYMBOL TRIANGLE NOTEHEAD RIGHT BLACK;So;0;L;;;;;N;;;;;
+1D14E;MUSICAL SYMBOL TRIANGLE NOTEHEAD DOWN WHITE;So;0;L;;;;;N;;;;;
+1D14F;MUSICAL SYMBOL TRIANGLE NOTEHEAD DOWN BLACK;So;0;L;;;;;N;;;;;
+1D150;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP RIGHT WHITE;So;0;L;;;;;N;;;;;
+1D151;MUSICAL SYMBOL TRIANGLE NOTEHEAD UP RIGHT BLACK;So;0;L;;;;;N;;;;;
+1D152;MUSICAL SYMBOL MOON NOTEHEAD WHITE;So;0;L;;;;;N;;;;;
+1D153;MUSICAL SYMBOL MOON NOTEHEAD BLACK;So;0;L;;;;;N;;;;;
+1D154;MUSICAL SYMBOL TRIANGLE-ROUND NOTEHEAD DOWN WHITE;So;0;L;;;;;N;;;;;
+1D155;MUSICAL SYMBOL TRIANGLE-ROUND NOTEHEAD DOWN BLACK;So;0;L;;;;;N;;;;;
+1D156;MUSICAL SYMBOL PARENTHESIS NOTEHEAD;So;0;L;;;;;N;;;;;
+1D157;MUSICAL SYMBOL VOID NOTEHEAD;So;0;L;;;;;N;;;;;
+1D158;MUSICAL SYMBOL NOTEHEAD BLACK;So;0;L;;;;;N;;;;;
+1D159;MUSICAL SYMBOL NULL NOTEHEAD;So;0;L;;;;;N;;;;;
+1D15A;MUSICAL SYMBOL CLUSTER NOTEHEAD WHITE;So;0;L;;;;;N;;;;;
+1D15B;MUSICAL SYMBOL CLUSTER NOTEHEAD BLACK;So;0;L;;;;;N;;;;;
+1D15C;MUSICAL SYMBOL BREVE;So;0;L;;;;;N;;;;;
+1D15D;MUSICAL SYMBOL WHOLE NOTE;So;0;L;;;;;N;;;;;
+1D15E;MUSICAL SYMBOL HALF NOTE;So;0;L;1D157 1D165;;;;N;;;;;
+1D15F;MUSICAL SYMBOL QUARTER NOTE;So;0;L;1D158 1D165;;;;N;;;;;
+1D160;MUSICAL SYMBOL EIGHTH NOTE;So;0;L;1D15F 1D16E;;;;N;;;;;
+1D161;MUSICAL SYMBOL SIXTEENTH NOTE;So;0;L;1D15F 1D16F;;;;N;;;;;
+1D162;MUSICAL SYMBOL THIRTY-SECOND NOTE;So;0;L;1D15F 1D170;;;;N;;;;;
+1D163;MUSICAL SYMBOL SIXTY-FOURTH NOTE;So;0;L;1D15F 1D171;;;;N;;;;;
+1D164;MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE;So;0;L;1D15F 1D172;;;;N;;;;;
+1D165;MUSICAL SYMBOL COMBINING STEM;Mc;216;L;;;;;N;;;;;
+1D166;MUSICAL SYMBOL COMBINING SPRECHGESANG STEM;Mc;216;L;;;;;N;;;;;
+1D167;MUSICAL SYMBOL COMBINING TREMOLO-1;Mn;1;NSM;;;;;N;;;;;
+1D168;MUSICAL SYMBOL COMBINING TREMOLO-2;Mn;1;NSM;;;;;N;;;;;
+1D169;MUSICAL SYMBOL COMBINING TREMOLO-3;Mn;1;NSM;;;;;N;;;;;
+1D16A;MUSICAL SYMBOL FINGERED TREMOLO-1;So;0;L;;;;;N;;;;;
+1D16B;MUSICAL SYMBOL FINGERED TREMOLO-2;So;0;L;;;;;N;;;;;
+1D16C;MUSICAL SYMBOL FINGERED TREMOLO-3;So;0;L;;;;;N;;;;;
+1D16D;MUSICAL SYMBOL COMBINING AUGMENTATION DOT;Mc;226;L;;;;;N;;;;;
+1D16E;MUSICAL SYMBOL COMBINING FLAG-1;Mc;216;L;;;;;N;;;;;
+1D16F;MUSICAL SYMBOL COMBINING FLAG-2;Mc;216;L;;;;;N;;;;;
+1D170;MUSICAL SYMBOL COMBINING FLAG-3;Mc;216;L;;;;;N;;;;;
+1D171;MUSICAL SYMBOL COMBINING FLAG-4;Mc;216;L;;;;;N;;;;;
+1D172;MUSICAL SYMBOL COMBINING FLAG-5;Mc;216;L;;;;;N;;;;;
+1D173;MUSICAL SYMBOL BEGIN BEAM;Cf;0;BN;;;;;N;;;;;
+1D174;MUSICAL SYMBOL END BEAM;Cf;0;BN;;;;;N;;;;;
+1D175;MUSICAL SYMBOL BEGIN TIE;Cf;0;BN;;;;;N;;;;;
+1D176;MUSICAL SYMBOL END TIE;Cf;0;BN;;;;;N;;;;;
+1D177;MUSICAL SYMBOL BEGIN SLUR;Cf;0;BN;;;;;N;;;;;
+1D178;MUSICAL SYMBOL END SLUR;Cf;0;BN;;;;;N;;;;;
+1D179;MUSICAL SYMBOL BEGIN PHRASE;Cf;0;BN;;;;;N;;;;;
+1D17A;MUSICAL SYMBOL END PHRASE;Cf;0;BN;;;;;N;;;;;
+1D17B;MUSICAL SYMBOL COMBINING ACCENT;Mn;220;NSM;;;;;N;;;;;
+1D17C;MUSICAL SYMBOL COMBINING STACCATO;Mn;220;NSM;;;;;N;;;;;
+1D17D;MUSICAL SYMBOL COMBINING TENUTO;Mn;220;NSM;;;;;N;;;;;
+1D17E;MUSICAL SYMBOL COMBINING STACCATISSIMO;Mn;220;NSM;;;;;N;;;;;
+1D17F;MUSICAL SYMBOL COMBINING MARCATO;Mn;220;NSM;;;;;N;;;;;
+1D180;MUSICAL SYMBOL COMBINING MARCATO-STACCATO;Mn;220;NSM;;;;;N;;;;;
+1D181;MUSICAL SYMBOL COMBINING ACCENT-STACCATO;Mn;220;NSM;;;;;N;;;;;
+1D182;MUSICAL SYMBOL COMBINING LOURE;Mn;220;NSM;;;;;N;;;;;
+1D183;MUSICAL SYMBOL ARPEGGIATO UP;So;0;L;;;;;N;;;;;
+1D184;MUSICAL SYMBOL ARPEGGIATO DOWN;So;0;L;;;;;N;;;;;
+1D185;MUSICAL SYMBOL COMBINING DOIT;Mn;230;NSM;;;;;N;;;;;
+1D186;MUSICAL SYMBOL COMBINING RIP;Mn;230;NSM;;;;;N;;;;;
+1D187;MUSICAL SYMBOL COMBINING FLIP;Mn;230;NSM;;;;;N;;;;;
+1D188;MUSICAL SYMBOL COMBINING SMEAR;Mn;230;NSM;;;;;N;;;;;
+1D189;MUSICAL SYMBOL COMBINING BEND;Mn;230;NSM;;;;;N;;;;;
+1D18A;MUSICAL SYMBOL COMBINING DOUBLE TONGUE;Mn;220;NSM;;;;;N;;;;;
+1D18B;MUSICAL SYMBOL COMBINING TRIPLE TONGUE;Mn;220;NSM;;;;;N;;;;;
+1D18C;MUSICAL SYMBOL RINFORZANDO;So;0;L;;;;;N;;;;;
+1D18D;MUSICAL SYMBOL SUBITO;So;0;L;;;;;N;;;;;
+1D18E;MUSICAL SYMBOL Z;So;0;L;;;;;N;;;;;
+1D18F;MUSICAL SYMBOL PIANO;So;0;L;;;;;N;;;;;
+1D190;MUSICAL SYMBOL MEZZO;So;0;L;;;;;N;;;;;
+1D191;MUSICAL SYMBOL FORTE;So;0;L;;;;;N;;;;;
+1D192;MUSICAL SYMBOL CRESCENDO;So;0;L;;;;;N;;;;;
+1D193;MUSICAL SYMBOL DECRESCENDO;So;0;L;;;;;N;;;;;
+1D194;MUSICAL SYMBOL GRACE NOTE SLASH;So;0;L;;;;;N;;;;;
+1D195;MUSICAL SYMBOL GRACE NOTE NO SLASH;So;0;L;;;;;N;;;;;
+1D196;MUSICAL SYMBOL TR;So;0;L;;;;;N;;;;;
+1D197;MUSICAL SYMBOL TURN;So;0;L;;;;;N;;;;;
+1D198;MUSICAL SYMBOL INVERTED TURN;So;0;L;;;;;N;;;;;
+1D199;MUSICAL SYMBOL TURN SLASH;So;0;L;;;;;N;;;;;
+1D19A;MUSICAL SYMBOL TURN UP;So;0;L;;;;;N;;;;;
+1D19B;MUSICAL SYMBOL ORNAMENT STROKE-1;So;0;L;;;;;N;;;;;
+1D19C;MUSICAL SYMBOL ORNAMENT STROKE-2;So;0;L;;;;;N;;;;;
+1D19D;MUSICAL SYMBOL ORNAMENT STROKE-3;So;0;L;;;;;N;;;;;
+1D19E;MUSICAL SYMBOL ORNAMENT STROKE-4;So;0;L;;;;;N;;;;;
+1D19F;MUSICAL SYMBOL ORNAMENT STROKE-5;So;0;L;;;;;N;;;;;
+1D1A0;MUSICAL SYMBOL ORNAMENT STROKE-6;So;0;L;;;;;N;;;;;
+1D1A1;MUSICAL SYMBOL ORNAMENT STROKE-7;So;0;L;;;;;N;;;;;
+1D1A2;MUSICAL SYMBOL ORNAMENT STROKE-8;So;0;L;;;;;N;;;;;
+1D1A3;MUSICAL SYMBOL ORNAMENT STROKE-9;So;0;L;;;;;N;;;;;
+1D1A4;MUSICAL SYMBOL ORNAMENT STROKE-10;So;0;L;;;;;N;;;;;
+1D1A5;MUSICAL SYMBOL ORNAMENT STROKE-11;So;0;L;;;;;N;;;;;
+1D1A6;MUSICAL SYMBOL HAUPTSTIMME;So;0;L;;;;;N;;;;;
+1D1A7;MUSICAL SYMBOL NEBENSTIMME;So;0;L;;;;;N;;;;;
+1D1A8;MUSICAL SYMBOL END OF STIMME;So;0;L;;;;;N;;;;;
+1D1A9;MUSICAL SYMBOL DEGREE SLASH;So;0;L;;;;;N;;;;;
+1D1AA;MUSICAL SYMBOL COMBINING DOWN BOW;Mn;230;NSM;;;;;N;;;;;
+1D1AB;MUSICAL SYMBOL COMBINING UP BOW;Mn;230;NSM;;;;;N;;;;;
+1D1AC;MUSICAL SYMBOL COMBINING HARMONIC;Mn;230;NSM;;;;;N;;;;;
+1D1AD;MUSICAL SYMBOL COMBINING SNAP PIZZICATO;Mn;230;NSM;;;;;N;;;;;
+1D1AE;MUSICAL SYMBOL PEDAL MARK;So;0;L;;;;;N;;;;;
+1D1AF;MUSICAL SYMBOL PEDAL UP MARK;So;0;L;;;;;N;;;;;
+1D1B0;MUSICAL SYMBOL HALF PEDAL MARK;So;0;L;;;;;N;;;;;
+1D1B1;MUSICAL SYMBOL GLISSANDO UP;So;0;L;;;;;N;;;;;
+1D1B2;MUSICAL SYMBOL GLISSANDO DOWN;So;0;L;;;;;N;;;;;
+1D1B3;MUSICAL SYMBOL WITH FINGERNAILS;So;0;L;;;;;N;;;;;
+1D1B4;MUSICAL SYMBOL DAMP;So;0;L;;;;;N;;;;;
+1D1B5;MUSICAL SYMBOL DAMP ALL;So;0;L;;;;;N;;;;;
+1D1B6;MUSICAL SYMBOL MAXIMA;So;0;L;;;;;N;;;;;
+1D1B7;MUSICAL SYMBOL LONGA;So;0;L;;;;;N;;;;;
+1D1B8;MUSICAL SYMBOL BREVIS;So;0;L;;;;;N;;;;;
+1D1B9;MUSICAL SYMBOL SEMIBREVIS WHITE;So;0;L;;;;;N;;;;;
+1D1BA;MUSICAL SYMBOL SEMIBREVIS BLACK;So;0;L;;;;;N;;;;;
+1D1BB;MUSICAL SYMBOL MINIMA;So;0;L;1D1B9 1D165;;;;N;;;;;
+1D1BC;MUSICAL SYMBOL MINIMA BLACK;So;0;L;1D1BA 1D165;;;;N;;;;;
+1D1BD;MUSICAL SYMBOL SEMIMINIMA WHITE;So;0;L;1D1BB 1D16E;;;;N;;;;;
+1D1BE;MUSICAL SYMBOL SEMIMINIMA BLACK;So;0;L;1D1BC 1D16E;;;;N;;;;;
+1D1BF;MUSICAL SYMBOL FUSA WHITE;So;0;L;1D1BB 1D16F;;;;N;;;;;
+1D1C0;MUSICAL SYMBOL FUSA BLACK;So;0;L;1D1BC 1D16F;;;;N;;;;;
+1D1C1;MUSICAL SYMBOL LONGA PERFECTA REST;So;0;L;;;;;N;;;;;
+1D1C2;MUSICAL SYMBOL LONGA IMPERFECTA REST;So;0;L;;;;;N;;;;;
+1D1C3;MUSICAL SYMBOL BREVIS REST;So;0;L;;;;;N;;;;;
+1D1C4;MUSICAL SYMBOL SEMIBREVIS REST;So;0;L;;;;;N;;;;;
+1D1C5;MUSICAL SYMBOL MINIMA REST;So;0;L;;;;;N;;;;;
+1D1C6;MUSICAL SYMBOL SEMIMINIMA REST;So;0;L;;;;;N;;;;;
+1D1C7;MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE PERFECTA;So;0;L;;;;;N;;;;;
+1D1C8;MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE IMPERFECTA;So;0;L;;;;;N;;;;;
+1D1C9;MUSICAL SYMBOL TEMPUS PERFECTUM CUM PROLATIONE PERFECTA DIMINUTION-1;So;0;L;;;;;N;;;;;
+1D1CA;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE PERFECTA;So;0;L;;;;;N;;;;;
+1D1CB;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA;So;0;L;;;;;N;;;;;
+1D1CC;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-1;So;0;L;;;;;N;;;;;
+1D1CD;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-2;So;0;L;;;;;N;;;;;
+1D1CE;MUSICAL SYMBOL TEMPUS IMPERFECTUM CUM PROLATIONE IMPERFECTA DIMINUTION-3;So;0;L;;;;;N;;;;;
+1D1CF;MUSICAL SYMBOL CROIX;So;0;L;;;;;N;;;;;
+1D1D0;MUSICAL SYMBOL GREGORIAN C CLEF;So;0;L;;;;;N;;;;;
+1D1D1;MUSICAL SYMBOL GREGORIAN F CLEF;So;0;L;;;;;N;;;;;
+1D1D2;MUSICAL SYMBOL SQUARE B;So;0;L;;;;;N;;;;;
+1D1D3;MUSICAL SYMBOL VIRGA;So;0;L;;;;;N;;;;;
+1D1D4;MUSICAL SYMBOL PODATUS;So;0;L;;;;;N;;;;;
+1D1D5;MUSICAL SYMBOL CLIVIS;So;0;L;;;;;N;;;;;
+1D1D6;MUSICAL SYMBOL SCANDICUS;So;0;L;;;;;N;;;;;
+1D1D7;MUSICAL SYMBOL CLIMACUS;So;0;L;;;;;N;;;;;
+1D1D8;MUSICAL SYMBOL TORCULUS;So;0;L;;;;;N;;;;;
+1D1D9;MUSICAL SYMBOL PORRECTUS;So;0;L;;;;;N;;;;;
+1D1DA;MUSICAL SYMBOL PORRECTUS FLEXUS;So;0;L;;;;;N;;;;;
+1D1DB;MUSICAL SYMBOL SCANDICUS FLEXUS;So;0;L;;;;;N;;;;;
+1D1DC;MUSICAL SYMBOL TORCULUS RESUPINUS;So;0;L;;;;;N;;;;;
+1D1DD;MUSICAL SYMBOL PES SUBPUNCTIS;So;0;L;;;;;N;;;;;
+1D200;GREEK VOCAL NOTATION SYMBOL-1;So;0;ON;;;;;N;;;;;
+1D201;GREEK VOCAL NOTATION SYMBOL-2;So;0;ON;;;;;N;;;;;
+1D202;GREEK VOCAL NOTATION SYMBOL-3;So;0;ON;;;;;N;;;;;
+1D203;GREEK VOCAL NOTATION SYMBOL-4;So;0;ON;;;;;N;;;;;
+1D204;GREEK VOCAL NOTATION SYMBOL-5;So;0;ON;;;;;N;;;;;
+1D205;GREEK VOCAL NOTATION SYMBOL-6;So;0;ON;;;;;N;;;;;
+1D206;GREEK VOCAL NOTATION SYMBOL-7;So;0;ON;;;;;N;;;;;
+1D207;GREEK VOCAL NOTATION SYMBOL-8;So;0;ON;;;;;N;;;;;
+1D208;GREEK VOCAL NOTATION SYMBOL-9;So;0;ON;;;;;N;;;;;
+1D209;GREEK VOCAL NOTATION SYMBOL-10;So;0;ON;;;;;N;;;;;
+1D20A;GREEK VOCAL NOTATION SYMBOL-11;So;0;ON;;;;;N;;;;;
+1D20B;GREEK VOCAL NOTATION SYMBOL-12;So;0;ON;;;;;N;;;;;
+1D20C;GREEK VOCAL NOTATION SYMBOL-13;So;0;ON;;;;;N;;;;;
+1D20D;GREEK VOCAL NOTATION SYMBOL-14;So;0;ON;;;;;N;;;;;
+1D20E;GREEK VOCAL NOTATION SYMBOL-15;So;0;ON;;;;;N;;;;;
+1D20F;GREEK VOCAL NOTATION SYMBOL-16;So;0;ON;;;;;N;;;;;
+1D210;GREEK VOCAL NOTATION SYMBOL-17;So;0;ON;;;;;N;;;;;
+1D211;GREEK VOCAL NOTATION SYMBOL-18;So;0;ON;;;;;N;;;;;
+1D212;GREEK VOCAL NOTATION SYMBOL-19;So;0;ON;;;;;N;;;;;
+1D213;GREEK VOCAL NOTATION SYMBOL-20;So;0;ON;;;;;N;;;;;
+1D214;GREEK VOCAL NOTATION SYMBOL-21;So;0;ON;;;;;N;;;;;
+1D215;GREEK VOCAL NOTATION SYMBOL-22;So;0;ON;;;;;N;;;;;
+1D216;GREEK VOCAL NOTATION SYMBOL-23;So;0;ON;;;;;N;;;;;
+1D217;GREEK VOCAL NOTATION SYMBOL-24;So;0;ON;;;;;N;;;;;
+1D218;GREEK VOCAL NOTATION SYMBOL-50;So;0;ON;;;;;N;;;;;
+1D219;GREEK VOCAL NOTATION SYMBOL-51;So;0;ON;;;;;N;;;;;
+1D21A;GREEK VOCAL NOTATION SYMBOL-52;So;0;ON;;;;;N;;;;;
+1D21B;GREEK VOCAL NOTATION SYMBOL-53;So;0;ON;;;;;N;;;;;
+1D21C;GREEK VOCAL NOTATION SYMBOL-54;So;0;ON;;;;;N;;;;;
+1D21D;GREEK INSTRUMENTAL NOTATION SYMBOL-1;So;0;ON;;;;;N;;;;;
+1D21E;GREEK INSTRUMENTAL NOTATION SYMBOL-2;So;0;ON;;;;;N;;;;;
+1D21F;GREEK INSTRUMENTAL NOTATION SYMBOL-4;So;0;ON;;;;;N;;;;;
+1D220;GREEK INSTRUMENTAL NOTATION SYMBOL-5;So;0;ON;;;;;N;;;;;
+1D221;GREEK INSTRUMENTAL NOTATION SYMBOL-7;So;0;ON;;;;;N;;;;;
+1D222;GREEK INSTRUMENTAL NOTATION SYMBOL-8;So;0;ON;;;;;N;;;;;
+1D223;GREEK INSTRUMENTAL NOTATION SYMBOL-11;So;0;ON;;;;;N;;;;;
+1D224;GREEK INSTRUMENTAL NOTATION SYMBOL-12;So;0;ON;;;;;N;;;;;
+1D225;GREEK INSTRUMENTAL NOTATION SYMBOL-13;So;0;ON;;;;;N;;;;;
+1D226;GREEK INSTRUMENTAL NOTATION SYMBOL-14;So;0;ON;;;;;N;;;;;
+1D227;GREEK INSTRUMENTAL NOTATION SYMBOL-17;So;0;ON;;;;;N;;;;;
+1D228;GREEK INSTRUMENTAL NOTATION SYMBOL-18;So;0;ON;;;;;N;;;;;
+1D229;GREEK INSTRUMENTAL NOTATION SYMBOL-19;So;0;ON;;;;;N;;;;;
+1D22A;GREEK INSTRUMENTAL NOTATION SYMBOL-23;So;0;ON;;;;;N;;;;;
+1D22B;GREEK INSTRUMENTAL NOTATION SYMBOL-24;So;0;ON;;;;;N;;;;;
+1D22C;GREEK INSTRUMENTAL NOTATION SYMBOL-25;So;0;ON;;;;;N;;;;;
+1D22D;GREEK INSTRUMENTAL NOTATION SYMBOL-26;So;0;ON;;;;;N;;;;;
+1D22E;GREEK INSTRUMENTAL NOTATION SYMBOL-27;So;0;ON;;;;;N;;;;;
+1D22F;GREEK INSTRUMENTAL NOTATION SYMBOL-29;So;0;ON;;;;;N;;;;;
+1D230;GREEK INSTRUMENTAL NOTATION SYMBOL-30;So;0;ON;;;;;N;;;;;
+1D231;GREEK INSTRUMENTAL NOTATION SYMBOL-32;So;0;ON;;;;;N;;;;;
+1D232;GREEK INSTRUMENTAL NOTATION SYMBOL-36;So;0;ON;;;;;N;;;;;
+1D233;GREEK INSTRUMENTAL NOTATION SYMBOL-37;So;0;ON;;;;;N;;;;;
+1D234;GREEK INSTRUMENTAL NOTATION SYMBOL-38;So;0;ON;;;;;N;;;;;
+1D235;GREEK INSTRUMENTAL NOTATION SYMBOL-39;So;0;ON;;;;;N;;;;;
+1D236;GREEK INSTRUMENTAL NOTATION SYMBOL-40;So;0;ON;;;;;N;;;;;
+1D237;GREEK INSTRUMENTAL NOTATION SYMBOL-42;So;0;ON;;;;;N;;;;;
+1D238;GREEK INSTRUMENTAL NOTATION SYMBOL-43;So;0;ON;;;;;N;;;;;
+1D239;GREEK INSTRUMENTAL NOTATION SYMBOL-45;So;0;ON;;;;;N;;;;;
+1D23A;GREEK INSTRUMENTAL NOTATION SYMBOL-47;So;0;ON;;;;;N;;;;;
+1D23B;GREEK INSTRUMENTAL NOTATION SYMBOL-48;So;0;ON;;;;;N;;;;;
+1D23C;GREEK INSTRUMENTAL NOTATION SYMBOL-49;So;0;ON;;;;;N;;;;;
+1D23D;GREEK INSTRUMENTAL NOTATION SYMBOL-50;So;0;ON;;;;;N;;;;;
+1D23E;GREEK INSTRUMENTAL NOTATION SYMBOL-51;So;0;ON;;;;;N;;;;;
+1D23F;GREEK INSTRUMENTAL NOTATION SYMBOL-52;So;0;ON;;;;;N;;;;;
+1D240;GREEK INSTRUMENTAL NOTATION SYMBOL-53;So;0;ON;;;;;N;;;;;
+1D241;GREEK INSTRUMENTAL NOTATION SYMBOL-54;So;0;ON;;;;;N;;;;;
+1D242;COMBINING GREEK MUSICAL TRISEME;Mn;230;NSM;;;;;N;;;;;
+1D243;COMBINING GREEK MUSICAL TETRASEME;Mn;230;NSM;;;;;N;;;;;
+1D244;COMBINING GREEK MUSICAL PENTASEME;Mn;230;NSM;;;;;N;;;;;
+1D245;GREEK MUSICAL LEIMMA;So;0;ON;;;;;N;;;;;
+1D300;MONOGRAM FOR EARTH;So;0;ON;;;;;N;;ren *;;;
+1D301;DIGRAM FOR HEAVENLY EARTH;So;0;ON;;;;;N;;tian ren *;;;
+1D302;DIGRAM FOR HUMAN EARTH;So;0;ON;;;;;N;;di ren *;;;
+1D303;DIGRAM FOR EARTHLY HEAVEN;So;0;ON;;;;;N;;ren tian *;;;
+1D304;DIGRAM FOR EARTHLY HUMAN;So;0;ON;;;;;N;;ren di *;;;
+1D305;DIGRAM FOR EARTH;So;0;ON;;;;;N;;ren ren *;;;
+1D306;TETRAGRAM FOR CENTRE;So;0;ON;;;;;N;;;;;
+1D307;TETRAGRAM FOR FULL CIRCLE;So;0;ON;;;;;N;;;;;
+1D308;TETRAGRAM FOR MIRED;So;0;ON;;;;;N;;;;;
+1D309;TETRAGRAM FOR BARRIER;So;0;ON;;;;;N;;;;;
+1D30A;TETRAGRAM FOR KEEPING SMALL;So;0;ON;;;;;N;;;;;
+1D30B;TETRAGRAM FOR CONTRARIETY;So;0;ON;;;;;N;;;;;
+1D30C;TETRAGRAM FOR ASCENT;So;0;ON;;;;;N;;;;;
+1D30D;TETRAGRAM FOR OPPOSITION;So;0;ON;;;;;N;;;;;
+1D30E;TETRAGRAM FOR BRANCHING OUT;So;0;ON;;;;;N;;;;;
+1D30F;TETRAGRAM FOR DEFECTIVENESS OR DISTORTION;So;0;ON;;;;;N;;;;;
+1D310;TETRAGRAM FOR DIVERGENCE;So;0;ON;;;;;N;;;;;
+1D311;TETRAGRAM FOR YOUTHFULNESS;So;0;ON;;;;;N;;;;;
+1D312;TETRAGRAM FOR INCREASE;So;0;ON;;;;;N;;;;;
+1D313;TETRAGRAM FOR PENETRATION;So;0;ON;;;;;N;;;;;
+1D314;TETRAGRAM FOR REACH;So;0;ON;;;;;N;;;;;
+1D315;TETRAGRAM FOR CONTACT;So;0;ON;;;;;N;;;;;
+1D316;TETRAGRAM FOR HOLDING BACK;So;0;ON;;;;;N;;;;;
+1D317;TETRAGRAM FOR WAITING;So;0;ON;;;;;N;;;;;
+1D318;TETRAGRAM FOR FOLLOWING;So;0;ON;;;;;N;;;;;
+1D319;TETRAGRAM FOR ADVANCE;So;0;ON;;;;;N;;;;;
+1D31A;TETRAGRAM FOR RELEASE;So;0;ON;;;;;N;;;;;
+1D31B;TETRAGRAM FOR RESISTANCE;So;0;ON;;;;;N;;;;;
+1D31C;TETRAGRAM FOR EASE;So;0;ON;;;;;N;;;;;
+1D31D;TETRAGRAM FOR JOY;So;0;ON;;;;;N;;;;;
+1D31E;TETRAGRAM FOR CONTENTION;So;0;ON;;;;;N;;;;;
+1D31F;TETRAGRAM FOR ENDEAVOUR;So;0;ON;;;;;N;;;;;
+1D320;TETRAGRAM FOR DUTIES;So;0;ON;;;;;N;;;;;
+1D321;TETRAGRAM FOR CHANGE;So;0;ON;;;;;N;;;;;
+1D322;TETRAGRAM FOR DECISIVENESS;So;0;ON;;;;;N;;;;;
+1D323;TETRAGRAM FOR BOLD RESOLUTION;So;0;ON;;;;;N;;;;;
+1D324;TETRAGRAM FOR PACKING;So;0;ON;;;;;N;;;;;
+1D325;TETRAGRAM FOR LEGION;So;0;ON;;;;;N;;;;;
+1D326;TETRAGRAM FOR CLOSENESS;So;0;ON;;;;;N;;;;;
+1D327;TETRAGRAM FOR KINSHIP;So;0;ON;;;;;N;;;;;
+1D328;TETRAGRAM FOR GATHERING;So;0;ON;;;;;N;;;;;
+1D329;TETRAGRAM FOR STRENGTH;So;0;ON;;;;;N;;;;;
+1D32A;TETRAGRAM FOR PURITY;So;0;ON;;;;;N;;;;;
+1D32B;TETRAGRAM FOR FULLNESS;So;0;ON;;;;;N;;;;;
+1D32C;TETRAGRAM FOR RESIDENCE;So;0;ON;;;;;N;;;;;
+1D32D;TETRAGRAM FOR LAW OR MODEL;So;0;ON;;;;;N;;;;;
+1D32E;TETRAGRAM FOR RESPONSE;So;0;ON;;;;;N;;;;;
+1D32F;TETRAGRAM FOR GOING TO MEET;So;0;ON;;;;;N;;;;;
+1D330;TETRAGRAM FOR ENCOUNTERS;So;0;ON;;;;;N;;;;;
+1D331;TETRAGRAM FOR STOVE;So;0;ON;;;;;N;;;;;
+1D332;TETRAGRAM FOR GREATNESS;So;0;ON;;;;;N;;;;;
+1D333;TETRAGRAM FOR ENLARGEMENT;So;0;ON;;;;;N;;;;;
+1D334;TETRAGRAM FOR PATTERN;So;0;ON;;;;;N;;;;;
+1D335;TETRAGRAM FOR RITUAL;So;0;ON;;;;;N;;;;;
+1D336;TETRAGRAM FOR FLIGHT;So;0;ON;;;;;N;;;;;
+1D337;TETRAGRAM FOR VASTNESS OR WASTING;So;0;ON;;;;;N;;;;;
+1D338;TETRAGRAM FOR CONSTANCY;So;0;ON;;;;;N;;;;;
+1D339;TETRAGRAM FOR MEASURE;So;0;ON;;;;;N;;;;;
+1D33A;TETRAGRAM FOR ETERNITY;So;0;ON;;;;;N;;;;;
+1D33B;TETRAGRAM FOR UNITY;So;0;ON;;;;;N;;;;;
+1D33C;TETRAGRAM FOR DIMINISHMENT;So;0;ON;;;;;N;;;;;
+1D33D;TETRAGRAM FOR CLOSED MOUTH;So;0;ON;;;;;N;;;;;
+1D33E;TETRAGRAM FOR GUARDEDNESS;So;0;ON;;;;;N;;;;;
+1D33F;TETRAGRAM FOR GATHERING IN;So;0;ON;;;;;N;;;;;
+1D340;TETRAGRAM FOR MASSING;So;0;ON;;;;;N;;;;;
+1D341;TETRAGRAM FOR ACCUMULATION;So;0;ON;;;;;N;;;;;
+1D342;TETRAGRAM FOR EMBELLISHMENT;So;0;ON;;;;;N;;;;;
+1D343;TETRAGRAM FOR DOUBT;So;0;ON;;;;;N;;;;;
+1D344;TETRAGRAM FOR WATCH;So;0;ON;;;;;N;;;;;
+1D345;TETRAGRAM FOR SINKING;So;0;ON;;;;;N;;;;;
+1D346;TETRAGRAM FOR INNER;So;0;ON;;;;;N;;;;;
+1D347;TETRAGRAM FOR DEPARTURE;So;0;ON;;;;;N;;;;;
+1D348;TETRAGRAM FOR DARKENING;So;0;ON;;;;;N;;;;;
+1D349;TETRAGRAM FOR DIMMING;So;0;ON;;;;;N;;;;;
+1D34A;TETRAGRAM FOR EXHAUSTION;So;0;ON;;;;;N;;;;;
+1D34B;TETRAGRAM FOR SEVERANCE;So;0;ON;;;;;N;;;;;
+1D34C;TETRAGRAM FOR STOPPAGE;So;0;ON;;;;;N;;;;;
+1D34D;TETRAGRAM FOR HARDNESS;So;0;ON;;;;;N;;;;;
+1D34E;TETRAGRAM FOR COMPLETION;So;0;ON;;;;;N;;;;;
+1D34F;TETRAGRAM FOR CLOSURE;So;0;ON;;;;;N;;;;;
+1D350;TETRAGRAM FOR FAILURE;So;0;ON;;;;;N;;;;;
+1D351;TETRAGRAM FOR AGGRAVATION;So;0;ON;;;;;N;;;;;
+1D352;TETRAGRAM FOR COMPLIANCE;So;0;ON;;;;;N;;;;;
+1D353;TETRAGRAM FOR ON THE VERGE;So;0;ON;;;;;N;;;;;
+1D354;TETRAGRAM FOR DIFFICULTIES;So;0;ON;;;;;N;;;;;
+1D355;TETRAGRAM FOR LABOURING;So;0;ON;;;;;N;;;;;
+1D356;TETRAGRAM FOR FOSTERING;So;0;ON;;;;;N;;;;;
+1D360;COUNTING ROD UNIT DIGIT ONE;No;0;L;;;;1;N;;;;;
+1D361;COUNTING ROD UNIT DIGIT TWO;No;0;L;;;;2;N;;;;;
+1D362;COUNTING ROD UNIT DIGIT THREE;No;0;L;;;;3;N;;;;;
+1D363;COUNTING ROD UNIT DIGIT FOUR;No;0;L;;;;4;N;;;;;
+1D364;COUNTING ROD UNIT DIGIT FIVE;No;0;L;;;;5;N;;;;;
+1D365;COUNTING ROD UNIT DIGIT SIX;No;0;L;;;;6;N;;;;;
+1D366;COUNTING ROD UNIT DIGIT SEVEN;No;0;L;;;;7;N;;;;;
+1D367;COUNTING ROD UNIT DIGIT EIGHT;No;0;L;;;;8;N;;;;;
+1D368;COUNTING ROD UNIT DIGIT NINE;No;0;L;;;;9;N;;;;;
+1D369;COUNTING ROD TENS DIGIT ONE;No;0;L;;;;10;N;;;;;
+1D36A;COUNTING ROD TENS DIGIT TWO;No;0;L;;;;20;N;;;;;
+1D36B;COUNTING ROD TENS DIGIT THREE;No;0;L;;;;30;N;;;;;
+1D36C;COUNTING ROD TENS DIGIT FOUR;No;0;L;;;;40;N;;;;;
+1D36D;COUNTING ROD TENS DIGIT FIVE;No;0;L;;;;50;N;;;;;
+1D36E;COUNTING ROD TENS DIGIT SIX;No;0;L;;;;60;N;;;;;
+1D36F;COUNTING ROD TENS DIGIT SEVEN;No;0;L;;;;70;N;;;;;
+1D370;COUNTING ROD TENS DIGIT EIGHT;No;0;L;;;;80;N;;;;;
+1D371;COUNTING ROD TENS DIGIT NINE;No;0;L;;;;90;N;;;;;
+1D400;MATHEMATICAL BOLD CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D401;MATHEMATICAL BOLD CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D402;MATHEMATICAL BOLD CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D403;MATHEMATICAL BOLD CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D404;MATHEMATICAL BOLD CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D405;MATHEMATICAL BOLD CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D406;MATHEMATICAL BOLD CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D407;MATHEMATICAL BOLD CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D408;MATHEMATICAL BOLD CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D409;MATHEMATICAL BOLD CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D40A;MATHEMATICAL BOLD CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D40B;MATHEMATICAL BOLD CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D40C;MATHEMATICAL BOLD CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D40D;MATHEMATICAL BOLD CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D40E;MATHEMATICAL BOLD CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D40F;MATHEMATICAL BOLD CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D410;MATHEMATICAL BOLD CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D411;MATHEMATICAL BOLD CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D412;MATHEMATICAL BOLD CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D413;MATHEMATICAL BOLD CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D414;MATHEMATICAL BOLD CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D415;MATHEMATICAL BOLD CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D416;MATHEMATICAL BOLD CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D417;MATHEMATICAL BOLD CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D418;MATHEMATICAL BOLD CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D419;MATHEMATICAL BOLD CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D41A;MATHEMATICAL BOLD SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D41B;MATHEMATICAL BOLD SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D41C;MATHEMATICAL BOLD SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D41D;MATHEMATICAL BOLD SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D41E;MATHEMATICAL BOLD SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D41F;MATHEMATICAL BOLD SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D420;MATHEMATICAL BOLD SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D421;MATHEMATICAL BOLD SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D422;MATHEMATICAL BOLD SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D423;MATHEMATICAL BOLD SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D424;MATHEMATICAL BOLD SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D425;MATHEMATICAL BOLD SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D426;MATHEMATICAL BOLD SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D427;MATHEMATICAL BOLD SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D428;MATHEMATICAL BOLD SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D429;MATHEMATICAL BOLD SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D42A;MATHEMATICAL BOLD SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D42B;MATHEMATICAL BOLD SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D42C;MATHEMATICAL BOLD SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D42D;MATHEMATICAL BOLD SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D42E;MATHEMATICAL BOLD SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D42F;MATHEMATICAL BOLD SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D430;MATHEMATICAL BOLD SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D431;MATHEMATICAL BOLD SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D432;MATHEMATICAL BOLD SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D433;MATHEMATICAL BOLD SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D434;MATHEMATICAL ITALIC CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D435;MATHEMATICAL ITALIC CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D436;MATHEMATICAL ITALIC CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D437;MATHEMATICAL ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D438;MATHEMATICAL ITALIC CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D439;MATHEMATICAL ITALIC CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D43A;MATHEMATICAL ITALIC CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D43B;MATHEMATICAL ITALIC CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D43C;MATHEMATICAL ITALIC CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D43D;MATHEMATICAL ITALIC CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D43E;MATHEMATICAL ITALIC CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D43F;MATHEMATICAL ITALIC CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D440;MATHEMATICAL ITALIC CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D441;MATHEMATICAL ITALIC CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D442;MATHEMATICAL ITALIC CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D443;MATHEMATICAL ITALIC CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D444;MATHEMATICAL ITALIC CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D445;MATHEMATICAL ITALIC CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D446;MATHEMATICAL ITALIC CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D447;MATHEMATICAL ITALIC CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D448;MATHEMATICAL ITALIC CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D449;MATHEMATICAL ITALIC CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D44A;MATHEMATICAL ITALIC CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D44B;MATHEMATICAL ITALIC CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D44C;MATHEMATICAL ITALIC CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D44D;MATHEMATICAL ITALIC CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D44E;MATHEMATICAL ITALIC SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D44F;MATHEMATICAL ITALIC SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D450;MATHEMATICAL ITALIC SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D451;MATHEMATICAL ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D452;MATHEMATICAL ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D453;MATHEMATICAL ITALIC SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D454;MATHEMATICAL ITALIC SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D456;MATHEMATICAL ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D457;MATHEMATICAL ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D458;MATHEMATICAL ITALIC SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D459;MATHEMATICAL ITALIC SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D45A;MATHEMATICAL ITALIC SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D45B;MATHEMATICAL ITALIC SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D45C;MATHEMATICAL ITALIC SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D45D;MATHEMATICAL ITALIC SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D45E;MATHEMATICAL ITALIC SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D45F;MATHEMATICAL ITALIC SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D460;MATHEMATICAL ITALIC SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D461;MATHEMATICAL ITALIC SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D462;MATHEMATICAL ITALIC SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D463;MATHEMATICAL ITALIC SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D464;MATHEMATICAL ITALIC SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D465;MATHEMATICAL ITALIC SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D466;MATHEMATICAL ITALIC SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D467;MATHEMATICAL ITALIC SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D468;MATHEMATICAL BOLD ITALIC CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D469;MATHEMATICAL BOLD ITALIC CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D46A;MATHEMATICAL BOLD ITALIC CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D46B;MATHEMATICAL BOLD ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D46C;MATHEMATICAL BOLD ITALIC CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D46D;MATHEMATICAL BOLD ITALIC CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D46E;MATHEMATICAL BOLD ITALIC CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D46F;MATHEMATICAL BOLD ITALIC CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D470;MATHEMATICAL BOLD ITALIC CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D471;MATHEMATICAL BOLD ITALIC CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D472;MATHEMATICAL BOLD ITALIC CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D473;MATHEMATICAL BOLD ITALIC CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D474;MATHEMATICAL BOLD ITALIC CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D475;MATHEMATICAL BOLD ITALIC CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D476;MATHEMATICAL BOLD ITALIC CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D477;MATHEMATICAL BOLD ITALIC CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D478;MATHEMATICAL BOLD ITALIC CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D479;MATHEMATICAL BOLD ITALIC CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D47A;MATHEMATICAL BOLD ITALIC CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D47B;MATHEMATICAL BOLD ITALIC CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D47C;MATHEMATICAL BOLD ITALIC CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D47D;MATHEMATICAL BOLD ITALIC CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D47E;MATHEMATICAL BOLD ITALIC CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D47F;MATHEMATICAL BOLD ITALIC CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D480;MATHEMATICAL BOLD ITALIC CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D481;MATHEMATICAL BOLD ITALIC CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D482;MATHEMATICAL BOLD ITALIC SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D483;MATHEMATICAL BOLD ITALIC SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D484;MATHEMATICAL BOLD ITALIC SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D485;MATHEMATICAL BOLD ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D486;MATHEMATICAL BOLD ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D487;MATHEMATICAL BOLD ITALIC SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D488;MATHEMATICAL BOLD ITALIC SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D489;MATHEMATICAL BOLD ITALIC SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D48A;MATHEMATICAL BOLD ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D48B;MATHEMATICAL BOLD ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D48C;MATHEMATICAL BOLD ITALIC SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D48D;MATHEMATICAL BOLD ITALIC SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D48E;MATHEMATICAL BOLD ITALIC SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D48F;MATHEMATICAL BOLD ITALIC SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D490;MATHEMATICAL BOLD ITALIC SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D491;MATHEMATICAL BOLD ITALIC SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D492;MATHEMATICAL BOLD ITALIC SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D493;MATHEMATICAL BOLD ITALIC SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D494;MATHEMATICAL BOLD ITALIC SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D495;MATHEMATICAL BOLD ITALIC SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D496;MATHEMATICAL BOLD ITALIC SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D497;MATHEMATICAL BOLD ITALIC SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D498;MATHEMATICAL BOLD ITALIC SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D499;MATHEMATICAL BOLD ITALIC SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D49A;MATHEMATICAL BOLD ITALIC SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D49B;MATHEMATICAL BOLD ITALIC SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D49C;MATHEMATICAL SCRIPT CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D49E;MATHEMATICAL SCRIPT CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D49F;MATHEMATICAL SCRIPT CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D4A2;MATHEMATICAL SCRIPT CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D4A5;MATHEMATICAL SCRIPT CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D4A6;MATHEMATICAL SCRIPT CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D4A9;MATHEMATICAL SCRIPT CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D4AA;MATHEMATICAL SCRIPT CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D4AB;MATHEMATICAL SCRIPT CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D4AC;MATHEMATICAL SCRIPT CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D4AE;MATHEMATICAL SCRIPT CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D4AF;MATHEMATICAL SCRIPT CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D4B0;MATHEMATICAL SCRIPT CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D4B1;MATHEMATICAL SCRIPT CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D4B2;MATHEMATICAL SCRIPT CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D4B3;MATHEMATICAL SCRIPT CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D4B4;MATHEMATICAL SCRIPT CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D4B5;MATHEMATICAL SCRIPT CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D4B6;MATHEMATICAL SCRIPT SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D4B7;MATHEMATICAL SCRIPT SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D4B8;MATHEMATICAL SCRIPT SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D4B9;MATHEMATICAL SCRIPT SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D4BB;MATHEMATICAL SCRIPT SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D4BD;MATHEMATICAL SCRIPT SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D4BE;MATHEMATICAL SCRIPT SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D4BF;MATHEMATICAL SCRIPT SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D4C0;MATHEMATICAL SCRIPT SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D4C1;MATHEMATICAL SCRIPT SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D4C2;MATHEMATICAL SCRIPT SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D4C3;MATHEMATICAL SCRIPT SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D4C5;MATHEMATICAL SCRIPT SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D4C6;MATHEMATICAL SCRIPT SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D4C7;MATHEMATICAL SCRIPT SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D4C8;MATHEMATICAL SCRIPT SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D4C9;MATHEMATICAL SCRIPT SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D4CA;MATHEMATICAL SCRIPT SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D4CB;MATHEMATICAL SCRIPT SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D4CC;MATHEMATICAL SCRIPT SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D4CD;MATHEMATICAL SCRIPT SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D4CE;MATHEMATICAL SCRIPT SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D4CF;MATHEMATICAL SCRIPT SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D4D0;MATHEMATICAL BOLD SCRIPT CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D4D1;MATHEMATICAL BOLD SCRIPT CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D4D2;MATHEMATICAL BOLD SCRIPT CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D4D3;MATHEMATICAL BOLD SCRIPT CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D4D4;MATHEMATICAL BOLD SCRIPT CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D4D5;MATHEMATICAL BOLD SCRIPT CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D4D6;MATHEMATICAL BOLD SCRIPT CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D4D7;MATHEMATICAL BOLD SCRIPT CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D4D8;MATHEMATICAL BOLD SCRIPT CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D4D9;MATHEMATICAL BOLD SCRIPT CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D4DA;MATHEMATICAL BOLD SCRIPT CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D4DB;MATHEMATICAL BOLD SCRIPT CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D4DC;MATHEMATICAL BOLD SCRIPT CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D4DD;MATHEMATICAL BOLD SCRIPT CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D4DE;MATHEMATICAL BOLD SCRIPT CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D4DF;MATHEMATICAL BOLD SCRIPT CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D4E0;MATHEMATICAL BOLD SCRIPT CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D4E1;MATHEMATICAL BOLD SCRIPT CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D4E2;MATHEMATICAL BOLD SCRIPT CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D4E3;MATHEMATICAL BOLD SCRIPT CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D4E4;MATHEMATICAL BOLD SCRIPT CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D4E5;MATHEMATICAL BOLD SCRIPT CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D4E6;MATHEMATICAL BOLD SCRIPT CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D4E7;MATHEMATICAL BOLD SCRIPT CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D4E8;MATHEMATICAL BOLD SCRIPT CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D4E9;MATHEMATICAL BOLD SCRIPT CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D4EA;MATHEMATICAL BOLD SCRIPT SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D4EB;MATHEMATICAL BOLD SCRIPT SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D4EC;MATHEMATICAL BOLD SCRIPT SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D4ED;MATHEMATICAL BOLD SCRIPT SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D4EE;MATHEMATICAL BOLD SCRIPT SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D4EF;MATHEMATICAL BOLD SCRIPT SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D4F0;MATHEMATICAL BOLD SCRIPT SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D4F1;MATHEMATICAL BOLD SCRIPT SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D4F2;MATHEMATICAL BOLD SCRIPT SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D4F3;MATHEMATICAL BOLD SCRIPT SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D4F4;MATHEMATICAL BOLD SCRIPT SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D4F5;MATHEMATICAL BOLD SCRIPT SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D4F6;MATHEMATICAL BOLD SCRIPT SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D4F7;MATHEMATICAL BOLD SCRIPT SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D4F8;MATHEMATICAL BOLD SCRIPT SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D4F9;MATHEMATICAL BOLD SCRIPT SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D4FA;MATHEMATICAL BOLD SCRIPT SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D4FB;MATHEMATICAL BOLD SCRIPT SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D4FC;MATHEMATICAL BOLD SCRIPT SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D4FD;MATHEMATICAL BOLD SCRIPT SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D4FE;MATHEMATICAL BOLD SCRIPT SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D4FF;MATHEMATICAL BOLD SCRIPT SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D500;MATHEMATICAL BOLD SCRIPT SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D501;MATHEMATICAL BOLD SCRIPT SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D502;MATHEMATICAL BOLD SCRIPT SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D503;MATHEMATICAL BOLD SCRIPT SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D504;MATHEMATICAL FRAKTUR CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D505;MATHEMATICAL FRAKTUR CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D507;MATHEMATICAL FRAKTUR CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D508;MATHEMATICAL FRAKTUR CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D509;MATHEMATICAL FRAKTUR CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D50A;MATHEMATICAL FRAKTUR CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D50D;MATHEMATICAL FRAKTUR CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D50E;MATHEMATICAL FRAKTUR CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D50F;MATHEMATICAL FRAKTUR CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D510;MATHEMATICAL FRAKTUR CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D511;MATHEMATICAL FRAKTUR CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D512;MATHEMATICAL FRAKTUR CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D513;MATHEMATICAL FRAKTUR CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D514;MATHEMATICAL FRAKTUR CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D516;MATHEMATICAL FRAKTUR CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D517;MATHEMATICAL FRAKTUR CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D518;MATHEMATICAL FRAKTUR CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D519;MATHEMATICAL FRAKTUR CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D51A;MATHEMATICAL FRAKTUR CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D51B;MATHEMATICAL FRAKTUR CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D51C;MATHEMATICAL FRAKTUR CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D51E;MATHEMATICAL FRAKTUR SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D51F;MATHEMATICAL FRAKTUR SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D520;MATHEMATICAL FRAKTUR SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D521;MATHEMATICAL FRAKTUR SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D522;MATHEMATICAL FRAKTUR SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D523;MATHEMATICAL FRAKTUR SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D524;MATHEMATICAL FRAKTUR SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D525;MATHEMATICAL FRAKTUR SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D526;MATHEMATICAL FRAKTUR SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D527;MATHEMATICAL FRAKTUR SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D528;MATHEMATICAL FRAKTUR SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D529;MATHEMATICAL FRAKTUR SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D52A;MATHEMATICAL FRAKTUR SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D52B;MATHEMATICAL FRAKTUR SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D52C;MATHEMATICAL FRAKTUR SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D52D;MATHEMATICAL FRAKTUR SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D52E;MATHEMATICAL FRAKTUR SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D52F;MATHEMATICAL FRAKTUR SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D530;MATHEMATICAL FRAKTUR SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D531;MATHEMATICAL FRAKTUR SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D532;MATHEMATICAL FRAKTUR SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D533;MATHEMATICAL FRAKTUR SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D534;MATHEMATICAL FRAKTUR SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D535;MATHEMATICAL FRAKTUR SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D536;MATHEMATICAL FRAKTUR SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D537;MATHEMATICAL FRAKTUR SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D538;MATHEMATICAL DOUBLE-STRUCK CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D539;MATHEMATICAL DOUBLE-STRUCK CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D53B;MATHEMATICAL DOUBLE-STRUCK CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D53C;MATHEMATICAL DOUBLE-STRUCK CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D53D;MATHEMATICAL DOUBLE-STRUCK CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D53E;MATHEMATICAL DOUBLE-STRUCK CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D540;MATHEMATICAL DOUBLE-STRUCK CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D541;MATHEMATICAL DOUBLE-STRUCK CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D542;MATHEMATICAL DOUBLE-STRUCK CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D543;MATHEMATICAL DOUBLE-STRUCK CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D544;MATHEMATICAL DOUBLE-STRUCK CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D546;MATHEMATICAL DOUBLE-STRUCK CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D54A;MATHEMATICAL DOUBLE-STRUCK CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D54B;MATHEMATICAL DOUBLE-STRUCK CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D54C;MATHEMATICAL DOUBLE-STRUCK CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D54D;MATHEMATICAL DOUBLE-STRUCK CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D54E;MATHEMATICAL DOUBLE-STRUCK CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D54F;MATHEMATICAL DOUBLE-STRUCK CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D550;MATHEMATICAL DOUBLE-STRUCK CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D552;MATHEMATICAL DOUBLE-STRUCK SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D553;MATHEMATICAL DOUBLE-STRUCK SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D554;MATHEMATICAL DOUBLE-STRUCK SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D555;MATHEMATICAL DOUBLE-STRUCK SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D556;MATHEMATICAL DOUBLE-STRUCK SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D557;MATHEMATICAL DOUBLE-STRUCK SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D558;MATHEMATICAL DOUBLE-STRUCK SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D559;MATHEMATICAL DOUBLE-STRUCK SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D55A;MATHEMATICAL DOUBLE-STRUCK SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D55B;MATHEMATICAL DOUBLE-STRUCK SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D55C;MATHEMATICAL DOUBLE-STRUCK SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D55D;MATHEMATICAL DOUBLE-STRUCK SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D55E;MATHEMATICAL DOUBLE-STRUCK SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D55F;MATHEMATICAL DOUBLE-STRUCK SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D560;MATHEMATICAL DOUBLE-STRUCK SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D561;MATHEMATICAL DOUBLE-STRUCK SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D562;MATHEMATICAL DOUBLE-STRUCK SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D563;MATHEMATICAL DOUBLE-STRUCK SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D564;MATHEMATICAL DOUBLE-STRUCK SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D565;MATHEMATICAL DOUBLE-STRUCK SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D566;MATHEMATICAL DOUBLE-STRUCK SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D567;MATHEMATICAL DOUBLE-STRUCK SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D568;MATHEMATICAL DOUBLE-STRUCK SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D569;MATHEMATICAL DOUBLE-STRUCK SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D56A;MATHEMATICAL DOUBLE-STRUCK SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D56B;MATHEMATICAL DOUBLE-STRUCK SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D56C;MATHEMATICAL BOLD FRAKTUR CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D56D;MATHEMATICAL BOLD FRAKTUR CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D56E;MATHEMATICAL BOLD FRAKTUR CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D56F;MATHEMATICAL BOLD FRAKTUR CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D570;MATHEMATICAL BOLD FRAKTUR CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D571;MATHEMATICAL BOLD FRAKTUR CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D572;MATHEMATICAL BOLD FRAKTUR CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D573;MATHEMATICAL BOLD FRAKTUR CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D574;MATHEMATICAL BOLD FRAKTUR CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D575;MATHEMATICAL BOLD FRAKTUR CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D576;MATHEMATICAL BOLD FRAKTUR CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D577;MATHEMATICAL BOLD FRAKTUR CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D578;MATHEMATICAL BOLD FRAKTUR CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D579;MATHEMATICAL BOLD FRAKTUR CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D57A;MATHEMATICAL BOLD FRAKTUR CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D57B;MATHEMATICAL BOLD FRAKTUR CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D57C;MATHEMATICAL BOLD FRAKTUR CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D57D;MATHEMATICAL BOLD FRAKTUR CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D57E;MATHEMATICAL BOLD FRAKTUR CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D57F;MATHEMATICAL BOLD FRAKTUR CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D580;MATHEMATICAL BOLD FRAKTUR CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D581;MATHEMATICAL BOLD FRAKTUR CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D582;MATHEMATICAL BOLD FRAKTUR CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D583;MATHEMATICAL BOLD FRAKTUR CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D584;MATHEMATICAL BOLD FRAKTUR CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D585;MATHEMATICAL BOLD FRAKTUR CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D586;MATHEMATICAL BOLD FRAKTUR SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D587;MATHEMATICAL BOLD FRAKTUR SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D588;MATHEMATICAL BOLD FRAKTUR SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D589;MATHEMATICAL BOLD FRAKTUR SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D58A;MATHEMATICAL BOLD FRAKTUR SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D58B;MATHEMATICAL BOLD FRAKTUR SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D58C;MATHEMATICAL BOLD FRAKTUR SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D58D;MATHEMATICAL BOLD FRAKTUR SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D58E;MATHEMATICAL BOLD FRAKTUR SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D58F;MATHEMATICAL BOLD FRAKTUR SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D590;MATHEMATICAL BOLD FRAKTUR SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D591;MATHEMATICAL BOLD FRAKTUR SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D592;MATHEMATICAL BOLD FRAKTUR SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D593;MATHEMATICAL BOLD FRAKTUR SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D594;MATHEMATICAL BOLD FRAKTUR SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D595;MATHEMATICAL BOLD FRAKTUR SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D596;MATHEMATICAL BOLD FRAKTUR SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D597;MATHEMATICAL BOLD FRAKTUR SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D598;MATHEMATICAL BOLD FRAKTUR SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D599;MATHEMATICAL BOLD FRAKTUR SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D59A;MATHEMATICAL BOLD FRAKTUR SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D59B;MATHEMATICAL BOLD FRAKTUR SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D59C;MATHEMATICAL BOLD FRAKTUR SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D59D;MATHEMATICAL BOLD FRAKTUR SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D59E;MATHEMATICAL BOLD FRAKTUR SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D59F;MATHEMATICAL BOLD FRAKTUR SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D5A0;MATHEMATICAL SANS-SERIF CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D5A1;MATHEMATICAL SANS-SERIF CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D5A2;MATHEMATICAL SANS-SERIF CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D5A3;MATHEMATICAL SANS-SERIF CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D5A4;MATHEMATICAL SANS-SERIF CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D5A5;MATHEMATICAL SANS-SERIF CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D5A6;MATHEMATICAL SANS-SERIF CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D5A7;MATHEMATICAL SANS-SERIF CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D5A8;MATHEMATICAL SANS-SERIF CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D5A9;MATHEMATICAL SANS-SERIF CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D5AA;MATHEMATICAL SANS-SERIF CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D5AB;MATHEMATICAL SANS-SERIF CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D5AC;MATHEMATICAL SANS-SERIF CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D5AD;MATHEMATICAL SANS-SERIF CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D5AE;MATHEMATICAL SANS-SERIF CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D5AF;MATHEMATICAL SANS-SERIF CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D5B0;MATHEMATICAL SANS-SERIF CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D5B1;MATHEMATICAL SANS-SERIF CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D5B2;MATHEMATICAL SANS-SERIF CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D5B3;MATHEMATICAL SANS-SERIF CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D5B4;MATHEMATICAL SANS-SERIF CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D5B5;MATHEMATICAL SANS-SERIF CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D5B6;MATHEMATICAL SANS-SERIF CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D5B7;MATHEMATICAL SANS-SERIF CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D5B8;MATHEMATICAL SANS-SERIF CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D5B9;MATHEMATICAL SANS-SERIF CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D5BA;MATHEMATICAL SANS-SERIF SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D5BB;MATHEMATICAL SANS-SERIF SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D5BC;MATHEMATICAL SANS-SERIF SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D5BD;MATHEMATICAL SANS-SERIF SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D5BE;MATHEMATICAL SANS-SERIF SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D5BF;MATHEMATICAL SANS-SERIF SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D5C0;MATHEMATICAL SANS-SERIF SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D5C1;MATHEMATICAL SANS-SERIF SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D5C2;MATHEMATICAL SANS-SERIF SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D5C3;MATHEMATICAL SANS-SERIF SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D5C4;MATHEMATICAL SANS-SERIF SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D5C5;MATHEMATICAL SANS-SERIF SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D5C6;MATHEMATICAL SANS-SERIF SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D5C7;MATHEMATICAL SANS-SERIF SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D5C8;MATHEMATICAL SANS-SERIF SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D5C9;MATHEMATICAL SANS-SERIF SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D5CA;MATHEMATICAL SANS-SERIF SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D5CB;MATHEMATICAL SANS-SERIF SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D5CC;MATHEMATICAL SANS-SERIF SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D5CD;MATHEMATICAL SANS-SERIF SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D5CE;MATHEMATICAL SANS-SERIF SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D5CF;MATHEMATICAL SANS-SERIF SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D5D0;MATHEMATICAL SANS-SERIF SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D5D1;MATHEMATICAL SANS-SERIF SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D5D2;MATHEMATICAL SANS-SERIF SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D5D3;MATHEMATICAL SANS-SERIF SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D5D4;MATHEMATICAL SANS-SERIF BOLD CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D5D5;MATHEMATICAL SANS-SERIF BOLD CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D5D6;MATHEMATICAL SANS-SERIF BOLD CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D5D7;MATHEMATICAL SANS-SERIF BOLD CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D5D8;MATHEMATICAL SANS-SERIF BOLD CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D5D9;MATHEMATICAL SANS-SERIF BOLD CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D5DA;MATHEMATICAL SANS-SERIF BOLD CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D5DB;MATHEMATICAL SANS-SERIF BOLD CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D5DC;MATHEMATICAL SANS-SERIF BOLD CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D5DD;MATHEMATICAL SANS-SERIF BOLD CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D5DE;MATHEMATICAL SANS-SERIF BOLD CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D5DF;MATHEMATICAL SANS-SERIF BOLD CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D5E0;MATHEMATICAL SANS-SERIF BOLD CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D5E1;MATHEMATICAL SANS-SERIF BOLD CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D5E2;MATHEMATICAL SANS-SERIF BOLD CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D5E3;MATHEMATICAL SANS-SERIF BOLD CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D5E4;MATHEMATICAL SANS-SERIF BOLD CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D5E5;MATHEMATICAL SANS-SERIF BOLD CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D5E6;MATHEMATICAL SANS-SERIF BOLD CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D5E7;MATHEMATICAL SANS-SERIF BOLD CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D5E8;MATHEMATICAL SANS-SERIF BOLD CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D5E9;MATHEMATICAL SANS-SERIF BOLD CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D5EA;MATHEMATICAL SANS-SERIF BOLD CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D5EB;MATHEMATICAL SANS-SERIF BOLD CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D5EC;MATHEMATICAL SANS-SERIF BOLD CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D5ED;MATHEMATICAL SANS-SERIF BOLD CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D5EE;MATHEMATICAL SANS-SERIF BOLD SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D5EF;MATHEMATICAL SANS-SERIF BOLD SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D5F0;MATHEMATICAL SANS-SERIF BOLD SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D5F1;MATHEMATICAL SANS-SERIF BOLD SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D5F2;MATHEMATICAL SANS-SERIF BOLD SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D5F3;MATHEMATICAL SANS-SERIF BOLD SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D5F4;MATHEMATICAL SANS-SERIF BOLD SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D5F5;MATHEMATICAL SANS-SERIF BOLD SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D5F6;MATHEMATICAL SANS-SERIF BOLD SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D5F7;MATHEMATICAL SANS-SERIF BOLD SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D5F8;MATHEMATICAL SANS-SERIF BOLD SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D5F9;MATHEMATICAL SANS-SERIF BOLD SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D5FA;MATHEMATICAL SANS-SERIF BOLD SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D5FB;MATHEMATICAL SANS-SERIF BOLD SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D5FC;MATHEMATICAL SANS-SERIF BOLD SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D5FD;MATHEMATICAL SANS-SERIF BOLD SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D5FE;MATHEMATICAL SANS-SERIF BOLD SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D5FF;MATHEMATICAL SANS-SERIF BOLD SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D600;MATHEMATICAL SANS-SERIF BOLD SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D601;MATHEMATICAL SANS-SERIF BOLD SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D602;MATHEMATICAL SANS-SERIF BOLD SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D603;MATHEMATICAL SANS-SERIF BOLD SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D604;MATHEMATICAL SANS-SERIF BOLD SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D605;MATHEMATICAL SANS-SERIF BOLD SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D606;MATHEMATICAL SANS-SERIF BOLD SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D607;MATHEMATICAL SANS-SERIF BOLD SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D608;MATHEMATICAL SANS-SERIF ITALIC CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D609;MATHEMATICAL SANS-SERIF ITALIC CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D60A;MATHEMATICAL SANS-SERIF ITALIC CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D60B;MATHEMATICAL SANS-SERIF ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D60C;MATHEMATICAL SANS-SERIF ITALIC CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D60D;MATHEMATICAL SANS-SERIF ITALIC CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D60E;MATHEMATICAL SANS-SERIF ITALIC CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D60F;MATHEMATICAL SANS-SERIF ITALIC CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D610;MATHEMATICAL SANS-SERIF ITALIC CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D611;MATHEMATICAL SANS-SERIF ITALIC CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D612;MATHEMATICAL SANS-SERIF ITALIC CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D613;MATHEMATICAL SANS-SERIF ITALIC CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D614;MATHEMATICAL SANS-SERIF ITALIC CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D615;MATHEMATICAL SANS-SERIF ITALIC CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D616;MATHEMATICAL SANS-SERIF ITALIC CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D617;MATHEMATICAL SANS-SERIF ITALIC CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D618;MATHEMATICAL SANS-SERIF ITALIC CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D619;MATHEMATICAL SANS-SERIF ITALIC CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D61A;MATHEMATICAL SANS-SERIF ITALIC CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D61B;MATHEMATICAL SANS-SERIF ITALIC CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D61C;MATHEMATICAL SANS-SERIF ITALIC CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D61D;MATHEMATICAL SANS-SERIF ITALIC CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D61E;MATHEMATICAL SANS-SERIF ITALIC CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D61F;MATHEMATICAL SANS-SERIF ITALIC CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D620;MATHEMATICAL SANS-SERIF ITALIC CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D621;MATHEMATICAL SANS-SERIF ITALIC CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D622;MATHEMATICAL SANS-SERIF ITALIC SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D623;MATHEMATICAL SANS-SERIF ITALIC SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D624;MATHEMATICAL SANS-SERIF ITALIC SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D625;MATHEMATICAL SANS-SERIF ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D626;MATHEMATICAL SANS-SERIF ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D627;MATHEMATICAL SANS-SERIF ITALIC SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D628;MATHEMATICAL SANS-SERIF ITALIC SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D629;MATHEMATICAL SANS-SERIF ITALIC SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D62A;MATHEMATICAL SANS-SERIF ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D62B;MATHEMATICAL SANS-SERIF ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D62C;MATHEMATICAL SANS-SERIF ITALIC SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D62D;MATHEMATICAL SANS-SERIF ITALIC SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D62E;MATHEMATICAL SANS-SERIF ITALIC SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D62F;MATHEMATICAL SANS-SERIF ITALIC SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D630;MATHEMATICAL SANS-SERIF ITALIC SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D631;MATHEMATICAL SANS-SERIF ITALIC SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D632;MATHEMATICAL SANS-SERIF ITALIC SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D633;MATHEMATICAL SANS-SERIF ITALIC SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D634;MATHEMATICAL SANS-SERIF ITALIC SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D635;MATHEMATICAL SANS-SERIF ITALIC SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D636;MATHEMATICAL SANS-SERIF ITALIC SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D637;MATHEMATICAL SANS-SERIF ITALIC SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D638;MATHEMATICAL SANS-SERIF ITALIC SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D639;MATHEMATICAL SANS-SERIF ITALIC SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D63A;MATHEMATICAL SANS-SERIF ITALIC SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D63B;MATHEMATICAL SANS-SERIF ITALIC SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D63C;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D63D;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D63E;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D63F;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D640;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D641;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D642;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D643;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D644;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D645;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D646;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D647;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D648;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D649;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D64A;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D64B;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D64C;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D64D;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D64E;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D64F;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D650;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D651;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D652;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D653;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D654;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D655;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D656;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D657;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D658;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D659;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D65A;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D65B;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D65C;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D65D;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D65E;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D65F;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D660;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D661;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D662;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D663;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D664;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D665;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D666;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D667;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D668;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D669;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D66A;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D66B;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D66C;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D66D;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D66E;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D66F;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D670;MATHEMATICAL MONOSPACE CAPITAL A;Lu;0;L;<font> 0041;;;;N;;;;;
+1D671;MATHEMATICAL MONOSPACE CAPITAL B;Lu;0;L;<font> 0042;;;;N;;;;;
+1D672;MATHEMATICAL MONOSPACE CAPITAL C;Lu;0;L;<font> 0043;;;;N;;;;;
+1D673;MATHEMATICAL MONOSPACE CAPITAL D;Lu;0;L;<font> 0044;;;;N;;;;;
+1D674;MATHEMATICAL MONOSPACE CAPITAL E;Lu;0;L;<font> 0045;;;;N;;;;;
+1D675;MATHEMATICAL MONOSPACE CAPITAL F;Lu;0;L;<font> 0046;;;;N;;;;;
+1D676;MATHEMATICAL MONOSPACE CAPITAL G;Lu;0;L;<font> 0047;;;;N;;;;;
+1D677;MATHEMATICAL MONOSPACE CAPITAL H;Lu;0;L;<font> 0048;;;;N;;;;;
+1D678;MATHEMATICAL MONOSPACE CAPITAL I;Lu;0;L;<font> 0049;;;;N;;;;;
+1D679;MATHEMATICAL MONOSPACE CAPITAL J;Lu;0;L;<font> 004A;;;;N;;;;;
+1D67A;MATHEMATICAL MONOSPACE CAPITAL K;Lu;0;L;<font> 004B;;;;N;;;;;
+1D67B;MATHEMATICAL MONOSPACE CAPITAL L;Lu;0;L;<font> 004C;;;;N;;;;;
+1D67C;MATHEMATICAL MONOSPACE CAPITAL M;Lu;0;L;<font> 004D;;;;N;;;;;
+1D67D;MATHEMATICAL MONOSPACE CAPITAL N;Lu;0;L;<font> 004E;;;;N;;;;;
+1D67E;MATHEMATICAL MONOSPACE CAPITAL O;Lu;0;L;<font> 004F;;;;N;;;;;
+1D67F;MATHEMATICAL MONOSPACE CAPITAL P;Lu;0;L;<font> 0050;;;;N;;;;;
+1D680;MATHEMATICAL MONOSPACE CAPITAL Q;Lu;0;L;<font> 0051;;;;N;;;;;
+1D681;MATHEMATICAL MONOSPACE CAPITAL R;Lu;0;L;<font> 0052;;;;N;;;;;
+1D682;MATHEMATICAL MONOSPACE CAPITAL S;Lu;0;L;<font> 0053;;;;N;;;;;
+1D683;MATHEMATICAL MONOSPACE CAPITAL T;Lu;0;L;<font> 0054;;;;N;;;;;
+1D684;MATHEMATICAL MONOSPACE CAPITAL U;Lu;0;L;<font> 0055;;;;N;;;;;
+1D685;MATHEMATICAL MONOSPACE CAPITAL V;Lu;0;L;<font> 0056;;;;N;;;;;
+1D686;MATHEMATICAL MONOSPACE CAPITAL W;Lu;0;L;<font> 0057;;;;N;;;;;
+1D687;MATHEMATICAL MONOSPACE CAPITAL X;Lu;0;L;<font> 0058;;;;N;;;;;
+1D688;MATHEMATICAL MONOSPACE CAPITAL Y;Lu;0;L;<font> 0059;;;;N;;;;;
+1D689;MATHEMATICAL MONOSPACE CAPITAL Z;Lu;0;L;<font> 005A;;;;N;;;;;
+1D68A;MATHEMATICAL MONOSPACE SMALL A;Ll;0;L;<font> 0061;;;;N;;;;;
+1D68B;MATHEMATICAL MONOSPACE SMALL B;Ll;0;L;<font> 0062;;;;N;;;;;
+1D68C;MATHEMATICAL MONOSPACE SMALL C;Ll;0;L;<font> 0063;;;;N;;;;;
+1D68D;MATHEMATICAL MONOSPACE SMALL D;Ll;0;L;<font> 0064;;;;N;;;;;
+1D68E;MATHEMATICAL MONOSPACE SMALL E;Ll;0;L;<font> 0065;;;;N;;;;;
+1D68F;MATHEMATICAL MONOSPACE SMALL F;Ll;0;L;<font> 0066;;;;N;;;;;
+1D690;MATHEMATICAL MONOSPACE SMALL G;Ll;0;L;<font> 0067;;;;N;;;;;
+1D691;MATHEMATICAL MONOSPACE SMALL H;Ll;0;L;<font> 0068;;;;N;;;;;
+1D692;MATHEMATICAL MONOSPACE SMALL I;Ll;0;L;<font> 0069;;;;N;;;;;
+1D693;MATHEMATICAL MONOSPACE SMALL J;Ll;0;L;<font> 006A;;;;N;;;;;
+1D694;MATHEMATICAL MONOSPACE SMALL K;Ll;0;L;<font> 006B;;;;N;;;;;
+1D695;MATHEMATICAL MONOSPACE SMALL L;Ll;0;L;<font> 006C;;;;N;;;;;
+1D696;MATHEMATICAL MONOSPACE SMALL M;Ll;0;L;<font> 006D;;;;N;;;;;
+1D697;MATHEMATICAL MONOSPACE SMALL N;Ll;0;L;<font> 006E;;;;N;;;;;
+1D698;MATHEMATICAL MONOSPACE SMALL O;Ll;0;L;<font> 006F;;;;N;;;;;
+1D699;MATHEMATICAL MONOSPACE SMALL P;Ll;0;L;<font> 0070;;;;N;;;;;
+1D69A;MATHEMATICAL MONOSPACE SMALL Q;Ll;0;L;<font> 0071;;;;N;;;;;
+1D69B;MATHEMATICAL MONOSPACE SMALL R;Ll;0;L;<font> 0072;;;;N;;;;;
+1D69C;MATHEMATICAL MONOSPACE SMALL S;Ll;0;L;<font> 0073;;;;N;;;;;
+1D69D;MATHEMATICAL MONOSPACE SMALL T;Ll;0;L;<font> 0074;;;;N;;;;;
+1D69E;MATHEMATICAL MONOSPACE SMALL U;Ll;0;L;<font> 0075;;;;N;;;;;
+1D69F;MATHEMATICAL MONOSPACE SMALL V;Ll;0;L;<font> 0076;;;;N;;;;;
+1D6A0;MATHEMATICAL MONOSPACE SMALL W;Ll;0;L;<font> 0077;;;;N;;;;;
+1D6A1;MATHEMATICAL MONOSPACE SMALL X;Ll;0;L;<font> 0078;;;;N;;;;;
+1D6A2;MATHEMATICAL MONOSPACE SMALL Y;Ll;0;L;<font> 0079;;;;N;;;;;
+1D6A3;MATHEMATICAL MONOSPACE SMALL Z;Ll;0;L;<font> 007A;;;;N;;;;;
+1D6A4;MATHEMATICAL ITALIC SMALL DOTLESS I;Ll;0;L;<font> 0131;;;;N;;;;;
+1D6A5;MATHEMATICAL ITALIC SMALL DOTLESS J;Ll;0;L;<font> 0237;;;;N;;;;;
+1D6A8;MATHEMATICAL BOLD CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
+1D6A9;MATHEMATICAL BOLD CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
+1D6AA;MATHEMATICAL BOLD CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+1D6AB;MATHEMATICAL BOLD CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
+1D6AC;MATHEMATICAL BOLD CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
+1D6AD;MATHEMATICAL BOLD CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
+1D6AE;MATHEMATICAL BOLD CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
+1D6AF;MATHEMATICAL BOLD CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
+1D6B0;MATHEMATICAL BOLD CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
+1D6B1;MATHEMATICAL BOLD CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
+1D6B2;MATHEMATICAL BOLD CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
+1D6B3;MATHEMATICAL BOLD CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
+1D6B4;MATHEMATICAL BOLD CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
+1D6B5;MATHEMATICAL BOLD CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
+1D6B6;MATHEMATICAL BOLD CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
+1D6B7;MATHEMATICAL BOLD CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+1D6B8;MATHEMATICAL BOLD CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
+1D6B9;MATHEMATICAL BOLD CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
+1D6BA;MATHEMATICAL BOLD CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
+1D6BB;MATHEMATICAL BOLD CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
+1D6BC;MATHEMATICAL BOLD CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
+1D6BD;MATHEMATICAL BOLD CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
+1D6BE;MATHEMATICAL BOLD CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
+1D6BF;MATHEMATICAL BOLD CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
+1D6C0;MATHEMATICAL BOLD CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
+1D6C1;MATHEMATICAL BOLD NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
+1D6C2;MATHEMATICAL BOLD SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
+1D6C3;MATHEMATICAL BOLD SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
+1D6C4;MATHEMATICAL BOLD SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+1D6C5;MATHEMATICAL BOLD SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
+1D6C6;MATHEMATICAL BOLD SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
+1D6C7;MATHEMATICAL BOLD SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
+1D6C8;MATHEMATICAL BOLD SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
+1D6C9;MATHEMATICAL BOLD SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
+1D6CA;MATHEMATICAL BOLD SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
+1D6CB;MATHEMATICAL BOLD SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
+1D6CC;MATHEMATICAL BOLD SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
+1D6CD;MATHEMATICAL BOLD SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
+1D6CE;MATHEMATICAL BOLD SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
+1D6CF;MATHEMATICAL BOLD SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
+1D6D0;MATHEMATICAL BOLD SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
+1D6D1;MATHEMATICAL BOLD SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+1D6D2;MATHEMATICAL BOLD SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
+1D6D3;MATHEMATICAL BOLD SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
+1D6D4;MATHEMATICAL BOLD SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
+1D6D5;MATHEMATICAL BOLD SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
+1D6D6;MATHEMATICAL BOLD SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
+1D6D7;MATHEMATICAL BOLD SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
+1D6D8;MATHEMATICAL BOLD SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
+1D6D9;MATHEMATICAL BOLD SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
+1D6DA;MATHEMATICAL BOLD SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
+1D6DB;MATHEMATICAL BOLD PARTIAL DIFFERENTIAL;Sm;0;L;<font> 2202;;;;Y;;;;;
+1D6DC;MATHEMATICAL BOLD EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
+1D6DD;MATHEMATICAL BOLD THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
+1D6DE;MATHEMATICAL BOLD KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
+1D6DF;MATHEMATICAL BOLD PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
+1D6E0;MATHEMATICAL BOLD RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
+1D6E1;MATHEMATICAL BOLD PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
+1D6E2;MATHEMATICAL ITALIC CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
+1D6E3;MATHEMATICAL ITALIC CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
+1D6E4;MATHEMATICAL ITALIC CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+1D6E5;MATHEMATICAL ITALIC CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
+1D6E6;MATHEMATICAL ITALIC CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
+1D6E7;MATHEMATICAL ITALIC CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
+1D6E8;MATHEMATICAL ITALIC CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
+1D6E9;MATHEMATICAL ITALIC CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
+1D6EA;MATHEMATICAL ITALIC CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
+1D6EB;MATHEMATICAL ITALIC CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
+1D6EC;MATHEMATICAL ITALIC CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
+1D6ED;MATHEMATICAL ITALIC CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
+1D6EE;MATHEMATICAL ITALIC CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
+1D6EF;MATHEMATICAL ITALIC CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
+1D6F0;MATHEMATICAL ITALIC CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
+1D6F1;MATHEMATICAL ITALIC CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+1D6F2;MATHEMATICAL ITALIC CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
+1D6F3;MATHEMATICAL ITALIC CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
+1D6F4;MATHEMATICAL ITALIC CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
+1D6F5;MATHEMATICAL ITALIC CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
+1D6F6;MATHEMATICAL ITALIC CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
+1D6F7;MATHEMATICAL ITALIC CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
+1D6F8;MATHEMATICAL ITALIC CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
+1D6F9;MATHEMATICAL ITALIC CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
+1D6FA;MATHEMATICAL ITALIC CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
+1D6FB;MATHEMATICAL ITALIC NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
+1D6FC;MATHEMATICAL ITALIC SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
+1D6FD;MATHEMATICAL ITALIC SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
+1D6FE;MATHEMATICAL ITALIC SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+1D6FF;MATHEMATICAL ITALIC SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
+1D700;MATHEMATICAL ITALIC SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
+1D701;MATHEMATICAL ITALIC SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
+1D702;MATHEMATICAL ITALIC SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
+1D703;MATHEMATICAL ITALIC SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
+1D704;MATHEMATICAL ITALIC SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
+1D705;MATHEMATICAL ITALIC SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
+1D706;MATHEMATICAL ITALIC SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
+1D707;MATHEMATICAL ITALIC SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
+1D708;MATHEMATICAL ITALIC SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
+1D709;MATHEMATICAL ITALIC SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
+1D70A;MATHEMATICAL ITALIC SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
+1D70B;MATHEMATICAL ITALIC SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+1D70C;MATHEMATICAL ITALIC SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
+1D70D;MATHEMATICAL ITALIC SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
+1D70E;MATHEMATICAL ITALIC SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
+1D70F;MATHEMATICAL ITALIC SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
+1D710;MATHEMATICAL ITALIC SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
+1D711;MATHEMATICAL ITALIC SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
+1D712;MATHEMATICAL ITALIC SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
+1D713;MATHEMATICAL ITALIC SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
+1D714;MATHEMATICAL ITALIC SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
+1D715;MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL;Sm;0;L;<font> 2202;;;;Y;;;;;
+1D716;MATHEMATICAL ITALIC EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
+1D717;MATHEMATICAL ITALIC THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
+1D718;MATHEMATICAL ITALIC KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
+1D719;MATHEMATICAL ITALIC PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
+1D71A;MATHEMATICAL ITALIC RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
+1D71B;MATHEMATICAL ITALIC PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
+1D71C;MATHEMATICAL BOLD ITALIC CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
+1D71D;MATHEMATICAL BOLD ITALIC CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
+1D71E;MATHEMATICAL BOLD ITALIC CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+1D71F;MATHEMATICAL BOLD ITALIC CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
+1D720;MATHEMATICAL BOLD ITALIC CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
+1D721;MATHEMATICAL BOLD ITALIC CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
+1D722;MATHEMATICAL BOLD ITALIC CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
+1D723;MATHEMATICAL BOLD ITALIC CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
+1D724;MATHEMATICAL BOLD ITALIC CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
+1D725;MATHEMATICAL BOLD ITALIC CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
+1D726;MATHEMATICAL BOLD ITALIC CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
+1D727;MATHEMATICAL BOLD ITALIC CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
+1D728;MATHEMATICAL BOLD ITALIC CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
+1D729;MATHEMATICAL BOLD ITALIC CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
+1D72A;MATHEMATICAL BOLD ITALIC CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
+1D72B;MATHEMATICAL BOLD ITALIC CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+1D72C;MATHEMATICAL BOLD ITALIC CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
+1D72D;MATHEMATICAL BOLD ITALIC CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
+1D72E;MATHEMATICAL BOLD ITALIC CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
+1D72F;MATHEMATICAL BOLD ITALIC CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
+1D730;MATHEMATICAL BOLD ITALIC CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
+1D731;MATHEMATICAL BOLD ITALIC CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
+1D732;MATHEMATICAL BOLD ITALIC CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
+1D733;MATHEMATICAL BOLD ITALIC CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
+1D734;MATHEMATICAL BOLD ITALIC CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
+1D735;MATHEMATICAL BOLD ITALIC NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
+1D736;MATHEMATICAL BOLD ITALIC SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
+1D737;MATHEMATICAL BOLD ITALIC SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
+1D738;MATHEMATICAL BOLD ITALIC SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+1D739;MATHEMATICAL BOLD ITALIC SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
+1D73A;MATHEMATICAL BOLD ITALIC SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
+1D73B;MATHEMATICAL BOLD ITALIC SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
+1D73C;MATHEMATICAL BOLD ITALIC SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
+1D73D;MATHEMATICAL BOLD ITALIC SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
+1D73E;MATHEMATICAL BOLD ITALIC SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
+1D73F;MATHEMATICAL BOLD ITALIC SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
+1D740;MATHEMATICAL BOLD ITALIC SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
+1D741;MATHEMATICAL BOLD ITALIC SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
+1D742;MATHEMATICAL BOLD ITALIC SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
+1D743;MATHEMATICAL BOLD ITALIC SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
+1D744;MATHEMATICAL BOLD ITALIC SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
+1D745;MATHEMATICAL BOLD ITALIC SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+1D746;MATHEMATICAL BOLD ITALIC SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
+1D747;MATHEMATICAL BOLD ITALIC SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
+1D748;MATHEMATICAL BOLD ITALIC SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
+1D749;MATHEMATICAL BOLD ITALIC SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
+1D74A;MATHEMATICAL BOLD ITALIC SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
+1D74B;MATHEMATICAL BOLD ITALIC SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
+1D74C;MATHEMATICAL BOLD ITALIC SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
+1D74D;MATHEMATICAL BOLD ITALIC SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
+1D74E;MATHEMATICAL BOLD ITALIC SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
+1D74F;MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL;Sm;0;L;<font> 2202;;;;Y;;;;;
+1D750;MATHEMATICAL BOLD ITALIC EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
+1D751;MATHEMATICAL BOLD ITALIC THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
+1D752;MATHEMATICAL BOLD ITALIC KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
+1D753;MATHEMATICAL BOLD ITALIC PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
+1D754;MATHEMATICAL BOLD ITALIC RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
+1D755;MATHEMATICAL BOLD ITALIC PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
+1D756;MATHEMATICAL SANS-SERIF BOLD CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
+1D757;MATHEMATICAL SANS-SERIF BOLD CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
+1D758;MATHEMATICAL SANS-SERIF BOLD CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+1D759;MATHEMATICAL SANS-SERIF BOLD CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
+1D75A;MATHEMATICAL SANS-SERIF BOLD CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
+1D75B;MATHEMATICAL SANS-SERIF BOLD CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
+1D75C;MATHEMATICAL SANS-SERIF BOLD CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
+1D75D;MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
+1D75E;MATHEMATICAL SANS-SERIF BOLD CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
+1D75F;MATHEMATICAL SANS-SERIF BOLD CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
+1D760;MATHEMATICAL SANS-SERIF BOLD CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
+1D761;MATHEMATICAL SANS-SERIF BOLD CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
+1D762;MATHEMATICAL SANS-SERIF BOLD CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
+1D763;MATHEMATICAL SANS-SERIF BOLD CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
+1D764;MATHEMATICAL SANS-SERIF BOLD CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
+1D765;MATHEMATICAL SANS-SERIF BOLD CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+1D766;MATHEMATICAL SANS-SERIF BOLD CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
+1D767;MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
+1D768;MATHEMATICAL SANS-SERIF BOLD CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
+1D769;MATHEMATICAL SANS-SERIF BOLD CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
+1D76A;MATHEMATICAL SANS-SERIF BOLD CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
+1D76B;MATHEMATICAL SANS-SERIF BOLD CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
+1D76C;MATHEMATICAL SANS-SERIF BOLD CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
+1D76D;MATHEMATICAL SANS-SERIF BOLD CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
+1D76E;MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
+1D76F;MATHEMATICAL SANS-SERIF BOLD NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
+1D770;MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
+1D771;MATHEMATICAL SANS-SERIF BOLD SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
+1D772;MATHEMATICAL SANS-SERIF BOLD SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+1D773;MATHEMATICAL SANS-SERIF BOLD SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
+1D774;MATHEMATICAL SANS-SERIF BOLD SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
+1D775;MATHEMATICAL SANS-SERIF BOLD SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
+1D776;MATHEMATICAL SANS-SERIF BOLD SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
+1D777;MATHEMATICAL SANS-SERIF BOLD SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
+1D778;MATHEMATICAL SANS-SERIF BOLD SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
+1D779;MATHEMATICAL SANS-SERIF BOLD SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
+1D77A;MATHEMATICAL SANS-SERIF BOLD SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
+1D77B;MATHEMATICAL SANS-SERIF BOLD SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
+1D77C;MATHEMATICAL SANS-SERIF BOLD SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
+1D77D;MATHEMATICAL SANS-SERIF BOLD SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
+1D77E;MATHEMATICAL SANS-SERIF BOLD SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
+1D77F;MATHEMATICAL SANS-SERIF BOLD SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+1D780;MATHEMATICAL SANS-SERIF BOLD SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
+1D781;MATHEMATICAL SANS-SERIF BOLD SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
+1D782;MATHEMATICAL SANS-SERIF BOLD SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
+1D783;MATHEMATICAL SANS-SERIF BOLD SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
+1D784;MATHEMATICAL SANS-SERIF BOLD SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
+1D785;MATHEMATICAL SANS-SERIF BOLD SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
+1D786;MATHEMATICAL SANS-SERIF BOLD SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
+1D787;MATHEMATICAL SANS-SERIF BOLD SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
+1D788;MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
+1D789;MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL;Sm;0;L;<font> 2202;;;;Y;;;;;
+1D78A;MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
+1D78B;MATHEMATICAL SANS-SERIF BOLD THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
+1D78C;MATHEMATICAL SANS-SERIF BOLD KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
+1D78D;MATHEMATICAL SANS-SERIF BOLD PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
+1D78E;MATHEMATICAL SANS-SERIF BOLD RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
+1D78F;MATHEMATICAL SANS-SERIF BOLD PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
+1D790;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ALPHA;Lu;0;L;<font> 0391;;;;N;;;;;
+1D791;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL BETA;Lu;0;L;<font> 0392;;;;N;;;;;
+1D792;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL GAMMA;Lu;0;L;<font> 0393;;;;N;;;;;
+1D793;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL DELTA;Lu;0;L;<font> 0394;;;;N;;;;;
+1D794;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL EPSILON;Lu;0;L;<font> 0395;;;;N;;;;;
+1D795;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ZETA;Lu;0;L;<font> 0396;;;;N;;;;;
+1D796;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ETA;Lu;0;L;<font> 0397;;;;N;;;;;
+1D797;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA;Lu;0;L;<font> 0398;;;;N;;;;;
+1D798;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL IOTA;Lu;0;L;<font> 0399;;;;N;;;;;
+1D799;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL KAPPA;Lu;0;L;<font> 039A;;;;N;;;;;
+1D79A;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL LAMDA;Lu;0;L;<font> 039B;;;;N;;;;;
+1D79B;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL MU;Lu;0;L;<font> 039C;;;;N;;;;;
+1D79C;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL NU;Lu;0;L;<font> 039D;;;;N;;;;;
+1D79D;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL XI;Lu;0;L;<font> 039E;;;;N;;;;;
+1D79E;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMICRON;Lu;0;L;<font> 039F;;;;N;;;;;
+1D79F;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PI;Lu;0;L;<font> 03A0;;;;N;;;;;
+1D7A0;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL RHO;Lu;0;L;<font> 03A1;;;;N;;;;;
+1D7A1;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA SYMBOL;Lu;0;L;<font> 03F4;;;;N;;;;;
+1D7A2;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL SIGMA;Lu;0;L;<font> 03A3;;;;N;;;;;
+1D7A3;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL TAU;Lu;0;L;<font> 03A4;;;;N;;;;;
+1D7A4;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL UPSILON;Lu;0;L;<font> 03A5;;;;N;;;;;
+1D7A5;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PHI;Lu;0;L;<font> 03A6;;;;N;;;;;
+1D7A6;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL CHI;Lu;0;L;<font> 03A7;;;;N;;;;;
+1D7A7;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PSI;Lu;0;L;<font> 03A8;;;;N;;;;;
+1D7A8;MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA;Lu;0;L;<font> 03A9;;;;N;;;;;
+1D7A9;MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA;Sm;0;L;<font> 2207;;;;N;;;;;
+1D7AA;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA;Ll;0;L;<font> 03B1;;;;N;;;;;
+1D7AB;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL BETA;Ll;0;L;<font> 03B2;;;;N;;;;;
+1D7AC;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL GAMMA;Ll;0;L;<font> 03B3;;;;N;;;;;
+1D7AD;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL DELTA;Ll;0;L;<font> 03B4;;;;N;;;;;
+1D7AE;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL EPSILON;Ll;0;L;<font> 03B5;;;;N;;;;;
+1D7AF;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ZETA;Ll;0;L;<font> 03B6;;;;N;;;;;
+1D7B0;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ETA;Ll;0;L;<font> 03B7;;;;N;;;;;
+1D7B1;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL THETA;Ll;0;L;<font> 03B8;;;;N;;;;;
+1D7B2;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL IOTA;Ll;0;L;<font> 03B9;;;;N;;;;;
+1D7B3;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL KAPPA;Ll;0;L;<font> 03BA;;;;N;;;;;
+1D7B4;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL LAMDA;Ll;0;L;<font> 03BB;;;;N;;;;;
+1D7B5;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL MU;Ll;0;L;<font> 03BC;;;;N;;;;;
+1D7B6;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL NU;Ll;0;L;<font> 03BD;;;;N;;;;;
+1D7B7;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL XI;Ll;0;L;<font> 03BE;;;;N;;;;;
+1D7B8;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMICRON;Ll;0;L;<font> 03BF;;;;N;;;;;
+1D7B9;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PI;Ll;0;L;<font> 03C0;;;;N;;;;;
+1D7BA;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL RHO;Ll;0;L;<font> 03C1;;;;N;;;;;
+1D7BB;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL FINAL SIGMA;Ll;0;L;<font> 03C2;;;;N;;;;;
+1D7BC;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL SIGMA;Ll;0;L;<font> 03C3;;;;N;;;;;
+1D7BD;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL TAU;Ll;0;L;<font> 03C4;;;;N;;;;;
+1D7BE;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL UPSILON;Ll;0;L;<font> 03C5;;;;N;;;;;
+1D7BF;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PHI;Ll;0;L;<font> 03C6;;;;N;;;;;
+1D7C0;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
+1D7C1;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
+1D7C2;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
+1D7C3;MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL;Sm;0;L;<font> 2202;;;;Y;;;;;
+1D7C4;MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
+1D7C5;MATHEMATICAL SANS-SERIF BOLD ITALIC THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
+1D7C6;MATHEMATICAL SANS-SERIF BOLD ITALIC KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
+1D7C7;MATHEMATICAL SANS-SERIF BOLD ITALIC PHI SYMBOL;Ll;0;L;<font> 03D5;;;;N;;;;;
+1D7C8;MATHEMATICAL SANS-SERIF BOLD ITALIC RHO SYMBOL;Ll;0;L;<font> 03F1;;;;N;;;;;
+1D7C9;MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL;Ll;0;L;<font> 03D6;;;;N;;;;;
+1D7CA;MATHEMATICAL BOLD CAPITAL DIGAMMA;Lu;0;L;<font> 03DC;;;;N;;;;;
+1D7CB;MATHEMATICAL BOLD SMALL DIGAMMA;Ll;0;L;<font> 03DD;;;;N;;;;;
+1D7CE;MATHEMATICAL BOLD DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
+1D7CF;MATHEMATICAL BOLD DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
+1D7D0;MATHEMATICAL BOLD DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
+1D7D1;MATHEMATICAL BOLD DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
+1D7D2;MATHEMATICAL BOLD DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
+1D7D3;MATHEMATICAL BOLD DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
+1D7D4;MATHEMATICAL BOLD DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
+1D7D5;MATHEMATICAL BOLD DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
+1D7D6;MATHEMATICAL BOLD DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
+1D7D7;MATHEMATICAL BOLD DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1D7D8;MATHEMATICAL DOUBLE-STRUCK DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
+1D7D9;MATHEMATICAL DOUBLE-STRUCK DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
+1D7DA;MATHEMATICAL DOUBLE-STRUCK DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
+1D7DB;MATHEMATICAL DOUBLE-STRUCK DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
+1D7DC;MATHEMATICAL DOUBLE-STRUCK DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
+1D7DD;MATHEMATICAL DOUBLE-STRUCK DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
+1D7DE;MATHEMATICAL DOUBLE-STRUCK DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
+1D7DF;MATHEMATICAL DOUBLE-STRUCK DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
+1D7E0;MATHEMATICAL DOUBLE-STRUCK DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
+1D7E1;MATHEMATICAL DOUBLE-STRUCK DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1D7E2;MATHEMATICAL SANS-SERIF DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
+1D7E3;MATHEMATICAL SANS-SERIF DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
+1D7E4;MATHEMATICAL SANS-SERIF DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
+1D7E5;MATHEMATICAL SANS-SERIF DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
+1D7E6;MATHEMATICAL SANS-SERIF DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
+1D7E7;MATHEMATICAL SANS-SERIF DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
+1D7E8;MATHEMATICAL SANS-SERIF DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
+1D7E9;MATHEMATICAL SANS-SERIF DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
+1D7EA;MATHEMATICAL SANS-SERIF DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
+1D7EB;MATHEMATICAL SANS-SERIF DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1D7EC;MATHEMATICAL SANS-SERIF BOLD DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
+1D7ED;MATHEMATICAL SANS-SERIF BOLD DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
+1D7EE;MATHEMATICAL SANS-SERIF BOLD DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
+1D7EF;MATHEMATICAL SANS-SERIF BOLD DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
+1D7F0;MATHEMATICAL SANS-SERIF BOLD DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
+1D7F1;MATHEMATICAL SANS-SERIF BOLD DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
+1D7F2;MATHEMATICAL SANS-SERIF BOLD DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
+1D7F3;MATHEMATICAL SANS-SERIF BOLD DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
+1D7F4;MATHEMATICAL SANS-SERIF BOLD DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
+1D7F5;MATHEMATICAL SANS-SERIF BOLD DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1D7F6;MATHEMATICAL MONOSPACE DIGIT ZERO;Nd;0;EN;<font> 0030;0;0;0;N;;;;;
+1D7F7;MATHEMATICAL MONOSPACE DIGIT ONE;Nd;0;EN;<font> 0031;1;1;1;N;;;;;
+1D7F8;MATHEMATICAL MONOSPACE DIGIT TWO;Nd;0;EN;<font> 0032;2;2;2;N;;;;;
+1D7F9;MATHEMATICAL MONOSPACE DIGIT THREE;Nd;0;EN;<font> 0033;3;3;3;N;;;;;
+1D7FA;MATHEMATICAL MONOSPACE DIGIT FOUR;Nd;0;EN;<font> 0034;4;4;4;N;;;;;
+1D7FB;MATHEMATICAL MONOSPACE DIGIT FIVE;Nd;0;EN;<font> 0035;5;5;5;N;;;;;
+1D7FC;MATHEMATICAL MONOSPACE DIGIT SIX;Nd;0;EN;<font> 0036;6;6;6;N;;;;;
+1D7FD;MATHEMATICAL MONOSPACE DIGIT SEVEN;Nd;0;EN;<font> 0037;7;7;7;N;;;;;
+1D7FE;MATHEMATICAL MONOSPACE DIGIT EIGHT;Nd;0;EN;<font> 0038;8;8;8;N;;;;;
+1D7FF;MATHEMATICAL MONOSPACE DIGIT NINE;Nd;0;EN;<font> 0039;9;9;9;N;;;;;
+1F000;MAHJONG TILE EAST WIND;So;0;ON;;;;;N;;;;;
+1F001;MAHJONG TILE SOUTH WIND;So;0;ON;;;;;N;;;;;
+1F002;MAHJONG TILE WEST WIND;So;0;ON;;;;;N;;;;;
+1F003;MAHJONG TILE NORTH WIND;So;0;ON;;;;;N;;;;;
+1F004;MAHJONG TILE RED DRAGON;So;0;ON;;;;;N;;;;;
+1F005;MAHJONG TILE GREEN DRAGON;So;0;ON;;;;;N;;;;;
+1F006;MAHJONG TILE WHITE DRAGON;So;0;ON;;;;;N;;;;;
+1F007;MAHJONG TILE ONE OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F008;MAHJONG TILE TWO OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F009;MAHJONG TILE THREE OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00A;MAHJONG TILE FOUR OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00B;MAHJONG TILE FIVE OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00C;MAHJONG TILE SIX OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00D;MAHJONG TILE SEVEN OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00E;MAHJONG TILE EIGHT OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F00F;MAHJONG TILE NINE OF CHARACTERS;So;0;ON;;;;;N;;;;;
+1F010;MAHJONG TILE ONE OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F011;MAHJONG TILE TWO OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F012;MAHJONG TILE THREE OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F013;MAHJONG TILE FOUR OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F014;MAHJONG TILE FIVE OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F015;MAHJONG TILE SIX OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F016;MAHJONG TILE SEVEN OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F017;MAHJONG TILE EIGHT OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F018;MAHJONG TILE NINE OF BAMBOOS;So;0;ON;;;;;N;;;;;
+1F019;MAHJONG TILE ONE OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01A;MAHJONG TILE TWO OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01B;MAHJONG TILE THREE OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01C;MAHJONG TILE FOUR OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01D;MAHJONG TILE FIVE OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01E;MAHJONG TILE SIX OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F01F;MAHJONG TILE SEVEN OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F020;MAHJONG TILE EIGHT OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F021;MAHJONG TILE NINE OF CIRCLES;So;0;ON;;;;;N;;;;;
+1F022;MAHJONG TILE PLUM;So;0;ON;;;;;N;;;;;
+1F023;MAHJONG TILE ORCHID;So;0;ON;;;;;N;;;;;
+1F024;MAHJONG TILE BAMBOO;So;0;ON;;;;;N;;;;;
+1F025;MAHJONG TILE CHRYSANTHEMUM;So;0;ON;;;;;N;;;;;
+1F026;MAHJONG TILE SPRING;So;0;ON;;;;;N;;;;;
+1F027;MAHJONG TILE SUMMER;So;0;ON;;;;;N;;;;;
+1F028;MAHJONG TILE AUTUMN;So;0;ON;;;;;N;;;;;
+1F029;MAHJONG TILE WINTER;So;0;ON;;;;;N;;;;;
+1F02A;MAHJONG TILE JOKER;So;0;ON;;;;;N;;;;;
+1F02B;MAHJONG TILE BACK;So;0;ON;;;;;N;;;;;
+1F030;DOMINO TILE HORIZONTAL BACK;So;0;ON;;;;;N;;;;;
+1F031;DOMINO TILE HORIZONTAL-00-00;So;0;ON;;;;;N;;;;;
+1F032;DOMINO TILE HORIZONTAL-00-01;So;0;ON;;;;;N;;;;;
+1F033;DOMINO TILE HORIZONTAL-00-02;So;0;ON;;;;;N;;;;;
+1F034;DOMINO TILE HORIZONTAL-00-03;So;0;ON;;;;;N;;;;;
+1F035;DOMINO TILE HORIZONTAL-00-04;So;0;ON;;;;;N;;;;;
+1F036;DOMINO TILE HORIZONTAL-00-05;So;0;ON;;;;;N;;;;;
+1F037;DOMINO TILE HORIZONTAL-00-06;So;0;ON;;;;;N;;;;;
+1F038;DOMINO TILE HORIZONTAL-01-00;So;0;ON;;;;;N;;;;;
+1F039;DOMINO TILE HORIZONTAL-01-01;So;0;ON;;;;;N;;;;;
+1F03A;DOMINO TILE HORIZONTAL-01-02;So;0;ON;;;;;N;;;;;
+1F03B;DOMINO TILE HORIZONTAL-01-03;So;0;ON;;;;;N;;;;;
+1F03C;DOMINO TILE HORIZONTAL-01-04;So;0;ON;;;;;N;;;;;
+1F03D;DOMINO TILE HORIZONTAL-01-05;So;0;ON;;;;;N;;;;;
+1F03E;DOMINO TILE HORIZONTAL-01-06;So;0;ON;;;;;N;;;;;
+1F03F;DOMINO TILE HORIZONTAL-02-00;So;0;ON;;;;;N;;;;;
+1F040;DOMINO TILE HORIZONTAL-02-01;So;0;ON;;;;;N;;;;;
+1F041;DOMINO TILE HORIZONTAL-02-02;So;0;ON;;;;;N;;;;;
+1F042;DOMINO TILE HORIZONTAL-02-03;So;0;ON;;;;;N;;;;;
+1F043;DOMINO TILE HORIZONTAL-02-04;So;0;ON;;;;;N;;;;;
+1F044;DOMINO TILE HORIZONTAL-02-05;So;0;ON;;;;;N;;;;;
+1F045;DOMINO TILE HORIZONTAL-02-06;So;0;ON;;;;;N;;;;;
+1F046;DOMINO TILE HORIZONTAL-03-00;So;0;ON;;;;;N;;;;;
+1F047;DOMINO TILE HORIZONTAL-03-01;So;0;ON;;;;;N;;;;;
+1F048;DOMINO TILE HORIZONTAL-03-02;So;0;ON;;;;;N;;;;;
+1F049;DOMINO TILE HORIZONTAL-03-03;So;0;ON;;;;;N;;;;;
+1F04A;DOMINO TILE HORIZONTAL-03-04;So;0;ON;;;;;N;;;;;
+1F04B;DOMINO TILE HORIZONTAL-03-05;So;0;ON;;;;;N;;;;;
+1F04C;DOMINO TILE HORIZONTAL-03-06;So;0;ON;;;;;N;;;;;
+1F04D;DOMINO TILE HORIZONTAL-04-00;So;0;ON;;;;;N;;;;;
+1F04E;DOMINO TILE HORIZONTAL-04-01;So;0;ON;;;;;N;;;;;
+1F04F;DOMINO TILE HORIZONTAL-04-02;So;0;ON;;;;;N;;;;;
+1F050;DOMINO TILE HORIZONTAL-04-03;So;0;ON;;;;;N;;;;;
+1F051;DOMINO TILE HORIZONTAL-04-04;So;0;ON;;;;;N;;;;;
+1F052;DOMINO TILE HORIZONTAL-04-05;So;0;ON;;;;;N;;;;;
+1F053;DOMINO TILE HORIZONTAL-04-06;So;0;ON;;;;;N;;;;;
+1F054;DOMINO TILE HORIZONTAL-05-00;So;0;ON;;;;;N;;;;;
+1F055;DOMINO TILE HORIZONTAL-05-01;So;0;ON;;;;;N;;;;;
+1F056;DOMINO TILE HORIZONTAL-05-02;So;0;ON;;;;;N;;;;;
+1F057;DOMINO TILE HORIZONTAL-05-03;So;0;ON;;;;;N;;;;;
+1F058;DOMINO TILE HORIZONTAL-05-04;So;0;ON;;;;;N;;;;;
+1F059;DOMINO TILE HORIZONTAL-05-05;So;0;ON;;;;;N;;;;;
+1F05A;DOMINO TILE HORIZONTAL-05-06;So;0;ON;;;;;N;;;;;
+1F05B;DOMINO TILE HORIZONTAL-06-00;So;0;ON;;;;;N;;;;;
+1F05C;DOMINO TILE HORIZONTAL-06-01;So;0;ON;;;;;N;;;;;
+1F05D;DOMINO TILE HORIZONTAL-06-02;So;0;ON;;;;;N;;;;;
+1F05E;DOMINO TILE HORIZONTAL-06-03;So;0;ON;;;;;N;;;;;
+1F05F;DOMINO TILE HORIZONTAL-06-04;So;0;ON;;;;;N;;;;;
+1F060;DOMINO TILE HORIZONTAL-06-05;So;0;ON;;;;;N;;;;;
+1F061;DOMINO TILE HORIZONTAL-06-06;So;0;ON;;;;;N;;;;;
+1F062;DOMINO TILE VERTICAL BACK;So;0;ON;;;;;N;;;;;
+1F063;DOMINO TILE VERTICAL-00-00;So;0;ON;;;;;N;;;;;
+1F064;DOMINO TILE VERTICAL-00-01;So;0;ON;;;;;N;;;;;
+1F065;DOMINO TILE VERTICAL-00-02;So;0;ON;;;;;N;;;;;
+1F066;DOMINO TILE VERTICAL-00-03;So;0;ON;;;;;N;;;;;
+1F067;DOMINO TILE VERTICAL-00-04;So;0;ON;;;;;N;;;;;
+1F068;DOMINO TILE VERTICAL-00-05;So;0;ON;;;;;N;;;;;
+1F069;DOMINO TILE VERTICAL-00-06;So;0;ON;;;;;N;;;;;
+1F06A;DOMINO TILE VERTICAL-01-00;So;0;ON;;;;;N;;;;;
+1F06B;DOMINO TILE VERTICAL-01-01;So;0;ON;;;;;N;;;;;
+1F06C;DOMINO TILE VERTICAL-01-02;So;0;ON;;;;;N;;;;;
+1F06D;DOMINO TILE VERTICAL-01-03;So;0;ON;;;;;N;;;;;
+1F06E;DOMINO TILE VERTICAL-01-04;So;0;ON;;;;;N;;;;;
+1F06F;DOMINO TILE VERTICAL-01-05;So;0;ON;;;;;N;;;;;
+1F070;DOMINO TILE VERTICAL-01-06;So;0;ON;;;;;N;;;;;
+1F071;DOMINO TILE VERTICAL-02-00;So;0;ON;;;;;N;;;;;
+1F072;DOMINO TILE VERTICAL-02-01;So;0;ON;;;;;N;;;;;
+1F073;DOMINO TILE VERTICAL-02-02;So;0;ON;;;;;N;;;;;
+1F074;DOMINO TILE VERTICAL-02-03;So;0;ON;;;;;N;;;;;
+1F075;DOMINO TILE VERTICAL-02-04;So;0;ON;;;;;N;;;;;
+1F076;DOMINO TILE VERTICAL-02-05;So;0;ON;;;;;N;;;;;
+1F077;DOMINO TILE VERTICAL-02-06;So;0;ON;;;;;N;;;;;
+1F078;DOMINO TILE VERTICAL-03-00;So;0;ON;;;;;N;;;;;
+1F079;DOMINO TILE VERTICAL-03-01;So;0;ON;;;;;N;;;;;
+1F07A;DOMINO TILE VERTICAL-03-02;So;0;ON;;;;;N;;;;;
+1F07B;DOMINO TILE VERTICAL-03-03;So;0;ON;;;;;N;;;;;
+1F07C;DOMINO TILE VERTICAL-03-04;So;0;ON;;;;;N;;;;;
+1F07D;DOMINO TILE VERTICAL-03-05;So;0;ON;;;;;N;;;;;
+1F07E;DOMINO TILE VERTICAL-03-06;So;0;ON;;;;;N;;;;;
+1F07F;DOMINO TILE VERTICAL-04-00;So;0;ON;;;;;N;;;;;
+1F080;DOMINO TILE VERTICAL-04-01;So;0;ON;;;;;N;;;;;
+1F081;DOMINO TILE VERTICAL-04-02;So;0;ON;;;;;N;;;;;
+1F082;DOMINO TILE VERTICAL-04-03;So;0;ON;;;;;N;;;;;
+1F083;DOMINO TILE VERTICAL-04-04;So;0;ON;;;;;N;;;;;
+1F084;DOMINO TILE VERTICAL-04-05;So;0;ON;;;;;N;;;;;
+1F085;DOMINO TILE VERTICAL-04-06;So;0;ON;;;;;N;;;;;
+1F086;DOMINO TILE VERTICAL-05-00;So;0;ON;;;;;N;;;;;
+1F087;DOMINO TILE VERTICAL-05-01;So;0;ON;;;;;N;;;;;
+1F088;DOMINO TILE VERTICAL-05-02;So;0;ON;;;;;N;;;;;
+1F089;DOMINO TILE VERTICAL-05-03;So;0;ON;;;;;N;;;;;
+1F08A;DOMINO TILE VERTICAL-05-04;So;0;ON;;;;;N;;;;;
+1F08B;DOMINO TILE VERTICAL-05-05;So;0;ON;;;;;N;;;;;
+1F08C;DOMINO TILE VERTICAL-05-06;So;0;ON;;;;;N;;;;;
+1F08D;DOMINO TILE VERTICAL-06-00;So;0;ON;;;;;N;;;;;
+1F08E;DOMINO TILE VERTICAL-06-01;So;0;ON;;;;;N;;;;;
+1F08F;DOMINO TILE VERTICAL-06-02;So;0;ON;;;;;N;;;;;
+1F090;DOMINO TILE VERTICAL-06-03;So;0;ON;;;;;N;;;;;
+1F091;DOMINO TILE VERTICAL-06-04;So;0;ON;;;;;N;;;;;
+1F092;DOMINO TILE VERTICAL-06-05;So;0;ON;;;;;N;;;;;
+1F093;DOMINO TILE VERTICAL-06-06;So;0;ON;;;;;N;;;;;
+20000;<CJK Ideograph Extension B, First>;Lo;0;L;;;;;N;;;;;
+2A6D6;<CJK Ideograph Extension B, Last>;Lo;0;L;;;;;N;;;;;
+2F800;CJK COMPATIBILITY IDEOGRAPH-2F800;Lo;0;L;4E3D;;;;N;;;;;
+2F801;CJK COMPATIBILITY IDEOGRAPH-2F801;Lo;0;L;4E38;;;;N;;;;;
+2F802;CJK COMPATIBILITY IDEOGRAPH-2F802;Lo;0;L;4E41;;;;N;;;;;
+2F803;CJK COMPATIBILITY IDEOGRAPH-2F803;Lo;0;L;20122;;;;N;;;;;
+2F804;CJK COMPATIBILITY IDEOGRAPH-2F804;Lo;0;L;4F60;;;;N;;;;;
+2F805;CJK COMPATIBILITY IDEOGRAPH-2F805;Lo;0;L;4FAE;;;;N;;;;;
+2F806;CJK COMPATIBILITY IDEOGRAPH-2F806;Lo;0;L;4FBB;;;;N;;;;;
+2F807;CJK COMPATIBILITY IDEOGRAPH-2F807;Lo;0;L;5002;;;;N;;;;;
+2F808;CJK COMPATIBILITY IDEOGRAPH-2F808;Lo;0;L;507A;;;;N;;;;;
+2F809;CJK COMPATIBILITY IDEOGRAPH-2F809;Lo;0;L;5099;;;;N;;;;;
+2F80A;CJK COMPATIBILITY IDEOGRAPH-2F80A;Lo;0;L;50E7;;;;N;;;;;
+2F80B;CJK COMPATIBILITY IDEOGRAPH-2F80B;Lo;0;L;50CF;;;;N;;;;;
+2F80C;CJK COMPATIBILITY IDEOGRAPH-2F80C;Lo;0;L;349E;;;;N;;;;;
+2F80D;CJK COMPATIBILITY IDEOGRAPH-2F80D;Lo;0;L;2063A;;;;N;;;;;
+2F80E;CJK COMPATIBILITY IDEOGRAPH-2F80E;Lo;0;L;514D;;;;N;;;;;
+2F80F;CJK COMPATIBILITY IDEOGRAPH-2F80F;Lo;0;L;5154;;;;N;;;;;
+2F810;CJK COMPATIBILITY IDEOGRAPH-2F810;Lo;0;L;5164;;;;N;;;;;
+2F811;CJK COMPATIBILITY IDEOGRAPH-2F811;Lo;0;L;5177;;;;N;;;;;
+2F812;CJK COMPATIBILITY IDEOGRAPH-2F812;Lo;0;L;2051C;;;;N;;;;;
+2F813;CJK COMPATIBILITY IDEOGRAPH-2F813;Lo;0;L;34B9;;;;N;;;;;
+2F814;CJK COMPATIBILITY IDEOGRAPH-2F814;Lo;0;L;5167;;;;N;;;;;
+2F815;CJK COMPATIBILITY IDEOGRAPH-2F815;Lo;0;L;518D;;;;N;;;;;
+2F816;CJK COMPATIBILITY IDEOGRAPH-2F816;Lo;0;L;2054B;;;;N;;;;;
+2F817;CJK COMPATIBILITY IDEOGRAPH-2F817;Lo;0;L;5197;;;;N;;;;;
+2F818;CJK COMPATIBILITY IDEOGRAPH-2F818;Lo;0;L;51A4;;;;N;;;;;
+2F819;CJK COMPATIBILITY IDEOGRAPH-2F819;Lo;0;L;4ECC;;;;N;;;;;
+2F81A;CJK COMPATIBILITY IDEOGRAPH-2F81A;Lo;0;L;51AC;;;;N;;;;;
+2F81B;CJK COMPATIBILITY IDEOGRAPH-2F81B;Lo;0;L;51B5;;;;N;;;;;
+2F81C;CJK COMPATIBILITY IDEOGRAPH-2F81C;Lo;0;L;291DF;;;;N;;;;;
+2F81D;CJK COMPATIBILITY IDEOGRAPH-2F81D;Lo;0;L;51F5;;;;N;;;;;
+2F81E;CJK COMPATIBILITY IDEOGRAPH-2F81E;Lo;0;L;5203;;;;N;;;;;
+2F81F;CJK COMPATIBILITY IDEOGRAPH-2F81F;Lo;0;L;34DF;;;;N;;;;;
+2F820;CJK COMPATIBILITY IDEOGRAPH-2F820;Lo;0;L;523B;;;;N;;;;;
+2F821;CJK COMPATIBILITY IDEOGRAPH-2F821;Lo;0;L;5246;;;;N;;;;;
+2F822;CJK COMPATIBILITY IDEOGRAPH-2F822;Lo;0;L;5272;;;;N;;;;;
+2F823;CJK COMPATIBILITY IDEOGRAPH-2F823;Lo;0;L;5277;;;;N;;;;;
+2F824;CJK COMPATIBILITY IDEOGRAPH-2F824;Lo;0;L;3515;;;;N;;;;;
+2F825;CJK COMPATIBILITY IDEOGRAPH-2F825;Lo;0;L;52C7;;;;N;;;;;
+2F826;CJK COMPATIBILITY IDEOGRAPH-2F826;Lo;0;L;52C9;;;;N;;;;;
+2F827;CJK COMPATIBILITY IDEOGRAPH-2F827;Lo;0;L;52E4;;;;N;;;;;
+2F828;CJK COMPATIBILITY IDEOGRAPH-2F828;Lo;0;L;52FA;;;;N;;;;;
+2F829;CJK COMPATIBILITY IDEOGRAPH-2F829;Lo;0;L;5305;;;;N;;;;;
+2F82A;CJK COMPATIBILITY IDEOGRAPH-2F82A;Lo;0;L;5306;;;;N;;;;;
+2F82B;CJK COMPATIBILITY IDEOGRAPH-2F82B;Lo;0;L;5317;;;;N;;;;;
+2F82C;CJK COMPATIBILITY IDEOGRAPH-2F82C;Lo;0;L;5349;;;;N;;;;;
+2F82D;CJK COMPATIBILITY IDEOGRAPH-2F82D;Lo;0;L;5351;;;;N;;;;;
+2F82E;CJK COMPATIBILITY IDEOGRAPH-2F82E;Lo;0;L;535A;;;;N;;;;;
+2F82F;CJK COMPATIBILITY IDEOGRAPH-2F82F;Lo;0;L;5373;;;;N;;;;;
+2F830;CJK COMPATIBILITY IDEOGRAPH-2F830;Lo;0;L;537D;;;;N;;;;;
+2F831;CJK COMPATIBILITY IDEOGRAPH-2F831;Lo;0;L;537F;;;;N;;;;;
+2F832;CJK COMPATIBILITY IDEOGRAPH-2F832;Lo;0;L;537F;;;;N;;;;;
+2F833;CJK COMPATIBILITY IDEOGRAPH-2F833;Lo;0;L;537F;;;;N;;;;;
+2F834;CJK COMPATIBILITY IDEOGRAPH-2F834;Lo;0;L;20A2C;;;;N;;;;;
+2F835;CJK COMPATIBILITY IDEOGRAPH-2F835;Lo;0;L;7070;;;;N;;;;;
+2F836;CJK COMPATIBILITY IDEOGRAPH-2F836;Lo;0;L;53CA;;;;N;;;;;
+2F837;CJK COMPATIBILITY IDEOGRAPH-2F837;Lo;0;L;53DF;;;;N;;;;;
+2F838;CJK COMPATIBILITY IDEOGRAPH-2F838;Lo;0;L;20B63;;;;N;;;;;
+2F839;CJK COMPATIBILITY IDEOGRAPH-2F839;Lo;0;L;53EB;;;;N;;;;;
+2F83A;CJK COMPATIBILITY IDEOGRAPH-2F83A;Lo;0;L;53F1;;;;N;;;;;
+2F83B;CJK COMPATIBILITY IDEOGRAPH-2F83B;Lo;0;L;5406;;;;N;;;;;
+2F83C;CJK COMPATIBILITY IDEOGRAPH-2F83C;Lo;0;L;549E;;;;N;;;;;
+2F83D;CJK COMPATIBILITY IDEOGRAPH-2F83D;Lo;0;L;5438;;;;N;;;;;
+2F83E;CJK COMPATIBILITY IDEOGRAPH-2F83E;Lo;0;L;5448;;;;N;;;;;
+2F83F;CJK COMPATIBILITY IDEOGRAPH-2F83F;Lo;0;L;5468;;;;N;;;;;
+2F840;CJK COMPATIBILITY IDEOGRAPH-2F840;Lo;0;L;54A2;;;;N;;;;;
+2F841;CJK COMPATIBILITY IDEOGRAPH-2F841;Lo;0;L;54F6;;;;N;;;;;
+2F842;CJK COMPATIBILITY IDEOGRAPH-2F842;Lo;0;L;5510;;;;N;;;;;
+2F843;CJK COMPATIBILITY IDEOGRAPH-2F843;Lo;0;L;5553;;;;N;;;;;
+2F844;CJK COMPATIBILITY IDEOGRAPH-2F844;Lo;0;L;5563;;;;N;;;;;
+2F845;CJK COMPATIBILITY IDEOGRAPH-2F845;Lo;0;L;5584;;;;N;;;;;
+2F846;CJK COMPATIBILITY IDEOGRAPH-2F846;Lo;0;L;5584;;;;N;;;;;
+2F847;CJK COMPATIBILITY IDEOGRAPH-2F847;Lo;0;L;5599;;;;N;;;;;
+2F848;CJK COMPATIBILITY IDEOGRAPH-2F848;Lo;0;L;55AB;;;;N;;;;;
+2F849;CJK COMPATIBILITY IDEOGRAPH-2F849;Lo;0;L;55B3;;;;N;;;;;
+2F84A;CJK COMPATIBILITY IDEOGRAPH-2F84A;Lo;0;L;55C2;;;;N;;;;;
+2F84B;CJK COMPATIBILITY IDEOGRAPH-2F84B;Lo;0;L;5716;;;;N;;;;;
+2F84C;CJK COMPATIBILITY IDEOGRAPH-2F84C;Lo;0;L;5606;;;;N;;;;;
+2F84D;CJK COMPATIBILITY IDEOGRAPH-2F84D;Lo;0;L;5717;;;;N;;;;;
+2F84E;CJK COMPATIBILITY IDEOGRAPH-2F84E;Lo;0;L;5651;;;;N;;;;;
+2F84F;CJK COMPATIBILITY IDEOGRAPH-2F84F;Lo;0;L;5674;;;;N;;;;;
+2F850;CJK COMPATIBILITY IDEOGRAPH-2F850;Lo;0;L;5207;;;;N;;;;;
+2F851;CJK COMPATIBILITY IDEOGRAPH-2F851;Lo;0;L;58EE;;;;N;;;;;
+2F852;CJK COMPATIBILITY IDEOGRAPH-2F852;Lo;0;L;57CE;;;;N;;;;;
+2F853;CJK COMPATIBILITY IDEOGRAPH-2F853;Lo;0;L;57F4;;;;N;;;;;
+2F854;CJK COMPATIBILITY IDEOGRAPH-2F854;Lo;0;L;580D;;;;N;;;;;
+2F855;CJK COMPATIBILITY IDEOGRAPH-2F855;Lo;0;L;578B;;;;N;;;;;
+2F856;CJK COMPATIBILITY IDEOGRAPH-2F856;Lo;0;L;5832;;;;N;;;;;
+2F857;CJK COMPATIBILITY IDEOGRAPH-2F857;Lo;0;L;5831;;;;N;;;;;
+2F858;CJK COMPATIBILITY IDEOGRAPH-2F858;Lo;0;L;58AC;;;;N;;;;;
+2F859;CJK COMPATIBILITY IDEOGRAPH-2F859;Lo;0;L;214E4;;;;N;;;;;
+2F85A;CJK COMPATIBILITY IDEOGRAPH-2F85A;Lo;0;L;58F2;;;;N;;;;;
+2F85B;CJK COMPATIBILITY IDEOGRAPH-2F85B;Lo;0;L;58F7;;;;N;;;;;
+2F85C;CJK COMPATIBILITY IDEOGRAPH-2F85C;Lo;0;L;5906;;;;N;;;;;
+2F85D;CJK COMPATIBILITY IDEOGRAPH-2F85D;Lo;0;L;591A;;;;N;;;;;
+2F85E;CJK COMPATIBILITY IDEOGRAPH-2F85E;Lo;0;L;5922;;;;N;;;;;
+2F85F;CJK COMPATIBILITY IDEOGRAPH-2F85F;Lo;0;L;5962;;;;N;;;;;
+2F860;CJK COMPATIBILITY IDEOGRAPH-2F860;Lo;0;L;216A8;;;;N;;;;;
+2F861;CJK COMPATIBILITY IDEOGRAPH-2F861;Lo;0;L;216EA;;;;N;;;;;
+2F862;CJK COMPATIBILITY IDEOGRAPH-2F862;Lo;0;L;59EC;;;;N;;;;;
+2F863;CJK COMPATIBILITY IDEOGRAPH-2F863;Lo;0;L;5A1B;;;;N;;;;;
+2F864;CJK COMPATIBILITY IDEOGRAPH-2F864;Lo;0;L;5A27;;;;N;;;;;
+2F865;CJK COMPATIBILITY IDEOGRAPH-2F865;Lo;0;L;59D8;;;;N;;;;;
+2F866;CJK COMPATIBILITY IDEOGRAPH-2F866;Lo;0;L;5A66;;;;N;;;;;
+2F867;CJK COMPATIBILITY IDEOGRAPH-2F867;Lo;0;L;36EE;;;;N;;;;;
+2F868;CJK COMPATIBILITY IDEOGRAPH-2F868;Lo;0;L;36FC;;;;N;;;;;
+2F869;CJK COMPATIBILITY IDEOGRAPH-2F869;Lo;0;L;5B08;;;;N;;;;;
+2F86A;CJK COMPATIBILITY IDEOGRAPH-2F86A;Lo;0;L;5B3E;;;;N;;;;;
+2F86B;CJK COMPATIBILITY IDEOGRAPH-2F86B;Lo;0;L;5B3E;;;;N;;;;;
+2F86C;CJK COMPATIBILITY IDEOGRAPH-2F86C;Lo;0;L;219C8;;;;N;;;;;
+2F86D;CJK COMPATIBILITY IDEOGRAPH-2F86D;Lo;0;L;5BC3;;;;N;;;;;
+2F86E;CJK COMPATIBILITY IDEOGRAPH-2F86E;Lo;0;L;5BD8;;;;N;;;;;
+2F86F;CJK COMPATIBILITY IDEOGRAPH-2F86F;Lo;0;L;5BE7;;;;N;;;;;
+2F870;CJK COMPATIBILITY IDEOGRAPH-2F870;Lo;0;L;5BF3;;;;N;;;;;
+2F871;CJK COMPATIBILITY IDEOGRAPH-2F871;Lo;0;L;21B18;;;;N;;;;;
+2F872;CJK COMPATIBILITY IDEOGRAPH-2F872;Lo;0;L;5BFF;;;;N;;;;;
+2F873;CJK COMPATIBILITY IDEOGRAPH-2F873;Lo;0;L;5C06;;;;N;;;;;
+2F874;CJK COMPATIBILITY IDEOGRAPH-2F874;Lo;0;L;5F53;;;;N;;;;;
+2F875;CJK COMPATIBILITY IDEOGRAPH-2F875;Lo;0;L;5C22;;;;N;;;;;
+2F876;CJK COMPATIBILITY IDEOGRAPH-2F876;Lo;0;L;3781;;;;N;;;;;
+2F877;CJK COMPATIBILITY IDEOGRAPH-2F877;Lo;0;L;5C60;;;;N;;;;;
+2F878;CJK COMPATIBILITY IDEOGRAPH-2F878;Lo;0;L;5C6E;;;;N;;;;;
+2F879;CJK COMPATIBILITY IDEOGRAPH-2F879;Lo;0;L;5CC0;;;;N;;;;;
+2F87A;CJK COMPATIBILITY IDEOGRAPH-2F87A;Lo;0;L;5C8D;;;;N;;;;;
+2F87B;CJK COMPATIBILITY IDEOGRAPH-2F87B;Lo;0;L;21DE4;;;;N;;;;;
+2F87C;CJK COMPATIBILITY IDEOGRAPH-2F87C;Lo;0;L;5D43;;;;N;;;;;
+2F87D;CJK COMPATIBILITY IDEOGRAPH-2F87D;Lo;0;L;21DE6;;;;N;;;;;
+2F87E;CJK COMPATIBILITY IDEOGRAPH-2F87E;Lo;0;L;5D6E;;;;N;;;;;
+2F87F;CJK COMPATIBILITY IDEOGRAPH-2F87F;Lo;0;L;5D6B;;;;N;;;;;
+2F880;CJK COMPATIBILITY IDEOGRAPH-2F880;Lo;0;L;5D7C;;;;N;;;;;
+2F881;CJK COMPATIBILITY IDEOGRAPH-2F881;Lo;0;L;5DE1;;;;N;;;;;
+2F882;CJK COMPATIBILITY IDEOGRAPH-2F882;Lo;0;L;5DE2;;;;N;;;;;
+2F883;CJK COMPATIBILITY IDEOGRAPH-2F883;Lo;0;L;382F;;;;N;;;;;
+2F884;CJK COMPATIBILITY IDEOGRAPH-2F884;Lo;0;L;5DFD;;;;N;;;;;
+2F885;CJK COMPATIBILITY IDEOGRAPH-2F885;Lo;0;L;5E28;;;;N;;;;;
+2F886;CJK COMPATIBILITY IDEOGRAPH-2F886;Lo;0;L;5E3D;;;;N;;;;;
+2F887;CJK COMPATIBILITY IDEOGRAPH-2F887;Lo;0;L;5E69;;;;N;;;;;
+2F888;CJK COMPATIBILITY IDEOGRAPH-2F888;Lo;0;L;3862;;;;N;;;;;
+2F889;CJK COMPATIBILITY IDEOGRAPH-2F889;Lo;0;L;22183;;;;N;;;;;
+2F88A;CJK COMPATIBILITY IDEOGRAPH-2F88A;Lo;0;L;387C;;;;N;;;;;
+2F88B;CJK COMPATIBILITY IDEOGRAPH-2F88B;Lo;0;L;5EB0;;;;N;;;;;
+2F88C;CJK COMPATIBILITY IDEOGRAPH-2F88C;Lo;0;L;5EB3;;;;N;;;;;
+2F88D;CJK COMPATIBILITY IDEOGRAPH-2F88D;Lo;0;L;5EB6;;;;N;;;;;
+2F88E;CJK COMPATIBILITY IDEOGRAPH-2F88E;Lo;0;L;5ECA;;;;N;;;;;
+2F88F;CJK COMPATIBILITY IDEOGRAPH-2F88F;Lo;0;L;2A392;;;;N;;;;;
+2F890;CJK COMPATIBILITY IDEOGRAPH-2F890;Lo;0;L;5EFE;;;9;N;;;;;
+2F891;CJK COMPATIBILITY IDEOGRAPH-2F891;Lo;0;L;22331;;;;N;;;;;
+2F892;CJK COMPATIBILITY IDEOGRAPH-2F892;Lo;0;L;22331;;;;N;;;;;
+2F893;CJK COMPATIBILITY IDEOGRAPH-2F893;Lo;0;L;8201;;;;N;;;;;
+2F894;CJK COMPATIBILITY IDEOGRAPH-2F894;Lo;0;L;5F22;;;;N;;;;;
+2F895;CJK COMPATIBILITY IDEOGRAPH-2F895;Lo;0;L;5F22;;;;N;;;;;
+2F896;CJK COMPATIBILITY IDEOGRAPH-2F896;Lo;0;L;38C7;;;;N;;;;;
+2F897;CJK COMPATIBILITY IDEOGRAPH-2F897;Lo;0;L;232B8;;;;N;;;;;
+2F898;CJK COMPATIBILITY IDEOGRAPH-2F898;Lo;0;L;261DA;;;;N;;;;;
+2F899;CJK COMPATIBILITY IDEOGRAPH-2F899;Lo;0;L;5F62;;;;N;;;;;
+2F89A;CJK COMPATIBILITY IDEOGRAPH-2F89A;Lo;0;L;5F6B;;;;N;;;;;
+2F89B;CJK COMPATIBILITY IDEOGRAPH-2F89B;Lo;0;L;38E3;;;;N;;;;;
+2F89C;CJK COMPATIBILITY IDEOGRAPH-2F89C;Lo;0;L;5F9A;;;;N;;;;;
+2F89D;CJK COMPATIBILITY IDEOGRAPH-2F89D;Lo;0;L;5FCD;;;;N;;;;;
+2F89E;CJK COMPATIBILITY IDEOGRAPH-2F89E;Lo;0;L;5FD7;;;;N;;;;;
+2F89F;CJK COMPATIBILITY IDEOGRAPH-2F89F;Lo;0;L;5FF9;;;;N;;;;;
+2F8A0;CJK COMPATIBILITY IDEOGRAPH-2F8A0;Lo;0;L;6081;;;;N;;;;;
+2F8A1;CJK COMPATIBILITY IDEOGRAPH-2F8A1;Lo;0;L;393A;;;;N;;;;;
+2F8A2;CJK COMPATIBILITY IDEOGRAPH-2F8A2;Lo;0;L;391C;;;;N;;;;;
+2F8A3;CJK COMPATIBILITY IDEOGRAPH-2F8A3;Lo;0;L;6094;;;;N;;;;;
+2F8A4;CJK COMPATIBILITY IDEOGRAPH-2F8A4;Lo;0;L;226D4;;;;N;;;;;
+2F8A5;CJK COMPATIBILITY IDEOGRAPH-2F8A5;Lo;0;L;60C7;;;;N;;;;;
+2F8A6;CJK COMPATIBILITY IDEOGRAPH-2F8A6;Lo;0;L;6148;;;;N;;;;;
+2F8A7;CJK COMPATIBILITY IDEOGRAPH-2F8A7;Lo;0;L;614C;;;;N;;;;;
+2F8A8;CJK COMPATIBILITY IDEOGRAPH-2F8A8;Lo;0;L;614E;;;;N;;;;;
+2F8A9;CJK COMPATIBILITY IDEOGRAPH-2F8A9;Lo;0;L;614C;;;;N;;;;;
+2F8AA;CJK COMPATIBILITY IDEOGRAPH-2F8AA;Lo;0;L;617A;;;;N;;;;;
+2F8AB;CJK COMPATIBILITY IDEOGRAPH-2F8AB;Lo;0;L;618E;;;;N;;;;;
+2F8AC;CJK COMPATIBILITY IDEOGRAPH-2F8AC;Lo;0;L;61B2;;;;N;;;;;
+2F8AD;CJK COMPATIBILITY IDEOGRAPH-2F8AD;Lo;0;L;61A4;;;;N;;;;;
+2F8AE;CJK COMPATIBILITY IDEOGRAPH-2F8AE;Lo;0;L;61AF;;;;N;;;;;
+2F8AF;CJK COMPATIBILITY IDEOGRAPH-2F8AF;Lo;0;L;61DE;;;;N;;;;;
+2F8B0;CJK COMPATIBILITY IDEOGRAPH-2F8B0;Lo;0;L;61F2;;;;N;;;;;
+2F8B1;CJK COMPATIBILITY IDEOGRAPH-2F8B1;Lo;0;L;61F6;;;;N;;;;;
+2F8B2;CJK COMPATIBILITY IDEOGRAPH-2F8B2;Lo;0;L;6210;;;;N;;;;;
+2F8B3;CJK COMPATIBILITY IDEOGRAPH-2F8B3;Lo;0;L;621B;;;;N;;;;;
+2F8B4;CJK COMPATIBILITY IDEOGRAPH-2F8B4;Lo;0;L;625D;;;;N;;;;;
+2F8B5;CJK COMPATIBILITY IDEOGRAPH-2F8B5;Lo;0;L;62B1;;;;N;;;;;
+2F8B6;CJK COMPATIBILITY IDEOGRAPH-2F8B6;Lo;0;L;62D4;;;;N;;;;;
+2F8B7;CJK COMPATIBILITY IDEOGRAPH-2F8B7;Lo;0;L;6350;;;;N;;;;;
+2F8B8;CJK COMPATIBILITY IDEOGRAPH-2F8B8;Lo;0;L;22B0C;;;;N;;;;;
+2F8B9;CJK COMPATIBILITY IDEOGRAPH-2F8B9;Lo;0;L;633D;;;;N;;;;;
+2F8BA;CJK COMPATIBILITY IDEOGRAPH-2F8BA;Lo;0;L;62FC;;;;N;;;;;
+2F8BB;CJK COMPATIBILITY IDEOGRAPH-2F8BB;Lo;0;L;6368;;;;N;;;;;
+2F8BC;CJK COMPATIBILITY IDEOGRAPH-2F8BC;Lo;0;L;6383;;;;N;;;;;
+2F8BD;CJK COMPATIBILITY IDEOGRAPH-2F8BD;Lo;0;L;63E4;;;;N;;;;;
+2F8BE;CJK COMPATIBILITY IDEOGRAPH-2F8BE;Lo;0;L;22BF1;;;;N;;;;;
+2F8BF;CJK COMPATIBILITY IDEOGRAPH-2F8BF;Lo;0;L;6422;;;;N;;;;;
+2F8C0;CJK COMPATIBILITY IDEOGRAPH-2F8C0;Lo;0;L;63C5;;;;N;;;;;
+2F8C1;CJK COMPATIBILITY IDEOGRAPH-2F8C1;Lo;0;L;63A9;;;;N;;;;;
+2F8C2;CJK COMPATIBILITY IDEOGRAPH-2F8C2;Lo;0;L;3A2E;;;;N;;;;;
+2F8C3;CJK COMPATIBILITY IDEOGRAPH-2F8C3;Lo;0;L;6469;;;;N;;;;;
+2F8C4;CJK COMPATIBILITY IDEOGRAPH-2F8C4;Lo;0;L;647E;;;;N;;;;;
+2F8C5;CJK COMPATIBILITY IDEOGRAPH-2F8C5;Lo;0;L;649D;;;;N;;;;;
+2F8C6;CJK COMPATIBILITY IDEOGRAPH-2F8C6;Lo;0;L;6477;;;;N;;;;;
+2F8C7;CJK COMPATIBILITY IDEOGRAPH-2F8C7;Lo;0;L;3A6C;;;;N;;;;;
+2F8C8;CJK COMPATIBILITY IDEOGRAPH-2F8C8;Lo;0;L;654F;;;;N;;;;;
+2F8C9;CJK COMPATIBILITY IDEOGRAPH-2F8C9;Lo;0;L;656C;;;;N;;;;;
+2F8CA;CJK COMPATIBILITY IDEOGRAPH-2F8CA;Lo;0;L;2300A;;;;N;;;;;
+2F8CB;CJK COMPATIBILITY IDEOGRAPH-2F8CB;Lo;0;L;65E3;;;;N;;;;;
+2F8CC;CJK COMPATIBILITY IDEOGRAPH-2F8CC;Lo;0;L;66F8;;;;N;;;;;
+2F8CD;CJK COMPATIBILITY IDEOGRAPH-2F8CD;Lo;0;L;6649;;;;N;;;;;
+2F8CE;CJK COMPATIBILITY IDEOGRAPH-2F8CE;Lo;0;L;3B19;;;;N;;;;;
+2F8CF;CJK COMPATIBILITY IDEOGRAPH-2F8CF;Lo;0;L;6691;;;;N;;;;;
+2F8D0;CJK COMPATIBILITY IDEOGRAPH-2F8D0;Lo;0;L;3B08;;;;N;;;;;
+2F8D1;CJK COMPATIBILITY IDEOGRAPH-2F8D1;Lo;0;L;3AE4;;;;N;;;;;
+2F8D2;CJK COMPATIBILITY IDEOGRAPH-2F8D2;Lo;0;L;5192;;;;N;;;;;
+2F8D3;CJK COMPATIBILITY IDEOGRAPH-2F8D3;Lo;0;L;5195;;;;N;;;;;
+2F8D4;CJK COMPATIBILITY IDEOGRAPH-2F8D4;Lo;0;L;6700;;;;N;;;;;
+2F8D5;CJK COMPATIBILITY IDEOGRAPH-2F8D5;Lo;0;L;669C;;;;N;;;;;
+2F8D6;CJK COMPATIBILITY IDEOGRAPH-2F8D6;Lo;0;L;80AD;;;;N;;;;;
+2F8D7;CJK COMPATIBILITY IDEOGRAPH-2F8D7;Lo;0;L;43D9;;;;N;;;;;
+2F8D8;CJK COMPATIBILITY IDEOGRAPH-2F8D8;Lo;0;L;6717;;;;N;;;;;
+2F8D9;CJK COMPATIBILITY IDEOGRAPH-2F8D9;Lo;0;L;671B;;;;N;;;;;
+2F8DA;CJK COMPATIBILITY IDEOGRAPH-2F8DA;Lo;0;L;6721;;;;N;;;;;
+2F8DB;CJK COMPATIBILITY IDEOGRAPH-2F8DB;Lo;0;L;675E;;;;N;;;;;
+2F8DC;CJK COMPATIBILITY IDEOGRAPH-2F8DC;Lo;0;L;6753;;;;N;;;;;
+2F8DD;CJK COMPATIBILITY IDEOGRAPH-2F8DD;Lo;0;L;233C3;;;;N;;;;;
+2F8DE;CJK COMPATIBILITY IDEOGRAPH-2F8DE;Lo;0;L;3B49;;;;N;;;;;
+2F8DF;CJK COMPATIBILITY IDEOGRAPH-2F8DF;Lo;0;L;67FA;;;;N;;;;;
+2F8E0;CJK COMPATIBILITY IDEOGRAPH-2F8E0;Lo;0;L;6785;;;;N;;;;;
+2F8E1;CJK COMPATIBILITY IDEOGRAPH-2F8E1;Lo;0;L;6852;;;;N;;;;;
+2F8E2;CJK COMPATIBILITY IDEOGRAPH-2F8E2;Lo;0;L;6885;;;;N;;;;;
+2F8E3;CJK COMPATIBILITY IDEOGRAPH-2F8E3;Lo;0;L;2346D;;;;N;;;;;
+2F8E4;CJK COMPATIBILITY IDEOGRAPH-2F8E4;Lo;0;L;688E;;;;N;;;;;
+2F8E5;CJK COMPATIBILITY IDEOGRAPH-2F8E5;Lo;0;L;681F;;;;N;;;;;
+2F8E6;CJK COMPATIBILITY IDEOGRAPH-2F8E6;Lo;0;L;6914;;;;N;;;;;
+2F8E7;CJK COMPATIBILITY IDEOGRAPH-2F8E7;Lo;0;L;3B9D;;;;N;;;;;
+2F8E8;CJK COMPATIBILITY IDEOGRAPH-2F8E8;Lo;0;L;6942;;;;N;;;;;
+2F8E9;CJK COMPATIBILITY IDEOGRAPH-2F8E9;Lo;0;L;69A3;;;;N;;;;;
+2F8EA;CJK COMPATIBILITY IDEOGRAPH-2F8EA;Lo;0;L;69EA;;;;N;;;;;
+2F8EB;CJK COMPATIBILITY IDEOGRAPH-2F8EB;Lo;0;L;6AA8;;;;N;;;;;
+2F8EC;CJK COMPATIBILITY IDEOGRAPH-2F8EC;Lo;0;L;236A3;;;;N;;;;;
+2F8ED;CJK COMPATIBILITY IDEOGRAPH-2F8ED;Lo;0;L;6ADB;;;;N;;;;;
+2F8EE;CJK COMPATIBILITY IDEOGRAPH-2F8EE;Lo;0;L;3C18;;;;N;;;;;
+2F8EF;CJK COMPATIBILITY IDEOGRAPH-2F8EF;Lo;0;L;6B21;;;;N;;;;;
+2F8F0;CJK COMPATIBILITY IDEOGRAPH-2F8F0;Lo;0;L;238A7;;;;N;;;;;
+2F8F1;CJK COMPATIBILITY IDEOGRAPH-2F8F1;Lo;0;L;6B54;;;;N;;;;;
+2F8F2;CJK COMPATIBILITY IDEOGRAPH-2F8F2;Lo;0;L;3C4E;;;;N;;;;;
+2F8F3;CJK COMPATIBILITY IDEOGRAPH-2F8F3;Lo;0;L;6B72;;;;N;;;;;
+2F8F4;CJK COMPATIBILITY IDEOGRAPH-2F8F4;Lo;0;L;6B9F;;;;N;;;;;
+2F8F5;CJK COMPATIBILITY IDEOGRAPH-2F8F5;Lo;0;L;6BBA;;;;N;;;;;
+2F8F6;CJK COMPATIBILITY IDEOGRAPH-2F8F6;Lo;0;L;6BBB;;;;N;;;;;
+2F8F7;CJK COMPATIBILITY IDEOGRAPH-2F8F7;Lo;0;L;23A8D;;;;N;;;;;
+2F8F8;CJK COMPATIBILITY IDEOGRAPH-2F8F8;Lo;0;L;21D0B;;;;N;;;;;
+2F8F9;CJK COMPATIBILITY IDEOGRAPH-2F8F9;Lo;0;L;23AFA;;;;N;;;;;
+2F8FA;CJK COMPATIBILITY IDEOGRAPH-2F8FA;Lo;0;L;6C4E;;;;N;;;;;
+2F8FB;CJK COMPATIBILITY IDEOGRAPH-2F8FB;Lo;0;L;23CBC;;;;N;;;;;
+2F8FC;CJK COMPATIBILITY IDEOGRAPH-2F8FC;Lo;0;L;6CBF;;;;N;;;;;
+2F8FD;CJK COMPATIBILITY IDEOGRAPH-2F8FD;Lo;0;L;6CCD;;;;N;;;;;
+2F8FE;CJK COMPATIBILITY IDEOGRAPH-2F8FE;Lo;0;L;6C67;;;;N;;;;;
+2F8FF;CJK COMPATIBILITY IDEOGRAPH-2F8FF;Lo;0;L;6D16;;;;N;;;;;
+2F900;CJK COMPATIBILITY IDEOGRAPH-2F900;Lo;0;L;6D3E;;;;N;;;;;
+2F901;CJK COMPATIBILITY IDEOGRAPH-2F901;Lo;0;L;6D77;;;;N;;;;;
+2F902;CJK COMPATIBILITY IDEOGRAPH-2F902;Lo;0;L;6D41;;;;N;;;;;
+2F903;CJK COMPATIBILITY IDEOGRAPH-2F903;Lo;0;L;6D69;;;;N;;;;;
+2F904;CJK COMPATIBILITY IDEOGRAPH-2F904;Lo;0;L;6D78;;;;N;;;;;
+2F905;CJK COMPATIBILITY IDEOGRAPH-2F905;Lo;0;L;6D85;;;;N;;;;;
+2F906;CJK COMPATIBILITY IDEOGRAPH-2F906;Lo;0;L;23D1E;;;;N;;;;;
+2F907;CJK COMPATIBILITY IDEOGRAPH-2F907;Lo;0;L;6D34;;;;N;;;;;
+2F908;CJK COMPATIBILITY IDEOGRAPH-2F908;Lo;0;L;6E2F;;;;N;;;;;
+2F909;CJK COMPATIBILITY IDEOGRAPH-2F909;Lo;0;L;6E6E;;;;N;;;;;
+2F90A;CJK COMPATIBILITY IDEOGRAPH-2F90A;Lo;0;L;3D33;;;;N;;;;;
+2F90B;CJK COMPATIBILITY IDEOGRAPH-2F90B;Lo;0;L;6ECB;;;;N;;;;;
+2F90C;CJK COMPATIBILITY IDEOGRAPH-2F90C;Lo;0;L;6EC7;;;;N;;;;;
+2F90D;CJK COMPATIBILITY IDEOGRAPH-2F90D;Lo;0;L;23ED1;;;;N;;;;;
+2F90E;CJK COMPATIBILITY IDEOGRAPH-2F90E;Lo;0;L;6DF9;;;;N;;;;;
+2F90F;CJK COMPATIBILITY IDEOGRAPH-2F90F;Lo;0;L;6F6E;;;;N;;;;;
+2F910;CJK COMPATIBILITY IDEOGRAPH-2F910;Lo;0;L;23F5E;;;;N;;;;;
+2F911;CJK COMPATIBILITY IDEOGRAPH-2F911;Lo;0;L;23F8E;;;;N;;;;;
+2F912;CJK COMPATIBILITY IDEOGRAPH-2F912;Lo;0;L;6FC6;;;;N;;;;;
+2F913;CJK COMPATIBILITY IDEOGRAPH-2F913;Lo;0;L;7039;;;;N;;;;;
+2F914;CJK COMPATIBILITY IDEOGRAPH-2F914;Lo;0;L;701E;;;;N;;;;;
+2F915;CJK COMPATIBILITY IDEOGRAPH-2F915;Lo;0;L;701B;;;;N;;;;;
+2F916;CJK COMPATIBILITY IDEOGRAPH-2F916;Lo;0;L;3D96;;;;N;;;;;
+2F917;CJK COMPATIBILITY IDEOGRAPH-2F917;Lo;0;L;704A;;;;N;;;;;
+2F918;CJK COMPATIBILITY IDEOGRAPH-2F918;Lo;0;L;707D;;;;N;;;;;
+2F919;CJK COMPATIBILITY IDEOGRAPH-2F919;Lo;0;L;7077;;;;N;;;;;
+2F91A;CJK COMPATIBILITY IDEOGRAPH-2F91A;Lo;0;L;70AD;;;;N;;;;;
+2F91B;CJK COMPATIBILITY IDEOGRAPH-2F91B;Lo;0;L;20525;;;;N;;;;;
+2F91C;CJK COMPATIBILITY IDEOGRAPH-2F91C;Lo;0;L;7145;;;;N;;;;;
+2F91D;CJK COMPATIBILITY IDEOGRAPH-2F91D;Lo;0;L;24263;;;;N;;;;;
+2F91E;CJK COMPATIBILITY IDEOGRAPH-2F91E;Lo;0;L;719C;;;;N;;;;;
+2F91F;CJK COMPATIBILITY IDEOGRAPH-2F91F;Lo;0;L;243AB;;;;N;;;;;
+2F920;CJK COMPATIBILITY IDEOGRAPH-2F920;Lo;0;L;7228;;;;N;;;;;
+2F921;CJK COMPATIBILITY IDEOGRAPH-2F921;Lo;0;L;7235;;;;N;;;;;
+2F922;CJK COMPATIBILITY IDEOGRAPH-2F922;Lo;0;L;7250;;;;N;;;;;
+2F923;CJK COMPATIBILITY IDEOGRAPH-2F923;Lo;0;L;24608;;;;N;;;;;
+2F924;CJK COMPATIBILITY IDEOGRAPH-2F924;Lo;0;L;7280;;;;N;;;;;
+2F925;CJK COMPATIBILITY IDEOGRAPH-2F925;Lo;0;L;7295;;;;N;;;;;
+2F926;CJK COMPATIBILITY IDEOGRAPH-2F926;Lo;0;L;24735;;;;N;;;;;
+2F927;CJK COMPATIBILITY IDEOGRAPH-2F927;Lo;0;L;24814;;;;N;;;;;
+2F928;CJK COMPATIBILITY IDEOGRAPH-2F928;Lo;0;L;737A;;;;N;;;;;
+2F929;CJK COMPATIBILITY IDEOGRAPH-2F929;Lo;0;L;738B;;;;N;;;;;
+2F92A;CJK COMPATIBILITY IDEOGRAPH-2F92A;Lo;0;L;3EAC;;;;N;;;;;
+2F92B;CJK COMPATIBILITY IDEOGRAPH-2F92B;Lo;0;L;73A5;;;;N;;;;;
+2F92C;CJK COMPATIBILITY IDEOGRAPH-2F92C;Lo;0;L;3EB8;;;;N;;;;;
+2F92D;CJK COMPATIBILITY IDEOGRAPH-2F92D;Lo;0;L;3EB8;;;;N;;;;;
+2F92E;CJK COMPATIBILITY IDEOGRAPH-2F92E;Lo;0;L;7447;;;;N;;;;;
+2F92F;CJK COMPATIBILITY IDEOGRAPH-2F92F;Lo;0;L;745C;;;;N;;;;;
+2F930;CJK COMPATIBILITY IDEOGRAPH-2F930;Lo;0;L;7471;;;;N;;;;;
+2F931;CJK COMPATIBILITY IDEOGRAPH-2F931;Lo;0;L;7485;;;;N;;;;;
+2F932;CJK COMPATIBILITY IDEOGRAPH-2F932;Lo;0;L;74CA;;;;N;;;;;
+2F933;CJK COMPATIBILITY IDEOGRAPH-2F933;Lo;0;L;3F1B;;;;N;;;;;
+2F934;CJK COMPATIBILITY IDEOGRAPH-2F934;Lo;0;L;7524;;;;N;;;;;
+2F935;CJK COMPATIBILITY IDEOGRAPH-2F935;Lo;0;L;24C36;;;;N;;;;;
+2F936;CJK COMPATIBILITY IDEOGRAPH-2F936;Lo;0;L;753E;;;;N;;;;;
+2F937;CJK COMPATIBILITY IDEOGRAPH-2F937;Lo;0;L;24C92;;;;N;;;;;
+2F938;CJK COMPATIBILITY IDEOGRAPH-2F938;Lo;0;L;7570;;;;N;;;;;
+2F939;CJK COMPATIBILITY IDEOGRAPH-2F939;Lo;0;L;2219F;;;;N;;;;;
+2F93A;CJK COMPATIBILITY IDEOGRAPH-2F93A;Lo;0;L;7610;;;;N;;;;;
+2F93B;CJK COMPATIBILITY IDEOGRAPH-2F93B;Lo;0;L;24FA1;;;;N;;;;;
+2F93C;CJK COMPATIBILITY IDEOGRAPH-2F93C;Lo;0;L;24FB8;;;;N;;;;;
+2F93D;CJK COMPATIBILITY IDEOGRAPH-2F93D;Lo;0;L;25044;;;;N;;;;;
+2F93E;CJK COMPATIBILITY IDEOGRAPH-2F93E;Lo;0;L;3FFC;;;;N;;;;;
+2F93F;CJK COMPATIBILITY IDEOGRAPH-2F93F;Lo;0;L;4008;;;;N;;;;;
+2F940;CJK COMPATIBILITY IDEOGRAPH-2F940;Lo;0;L;76F4;;;;N;;;;;
+2F941;CJK COMPATIBILITY IDEOGRAPH-2F941;Lo;0;L;250F3;;;;N;;;;;
+2F942;CJK COMPATIBILITY IDEOGRAPH-2F942;Lo;0;L;250F2;;;;N;;;;;
+2F943;CJK COMPATIBILITY IDEOGRAPH-2F943;Lo;0;L;25119;;;;N;;;;;
+2F944;CJK COMPATIBILITY IDEOGRAPH-2F944;Lo;0;L;25133;;;;N;;;;;
+2F945;CJK COMPATIBILITY IDEOGRAPH-2F945;Lo;0;L;771E;;;;N;;;;;
+2F946;CJK COMPATIBILITY IDEOGRAPH-2F946;Lo;0;L;771F;;;;N;;;;;
+2F947;CJK COMPATIBILITY IDEOGRAPH-2F947;Lo;0;L;771F;;;;N;;;;;
+2F948;CJK COMPATIBILITY IDEOGRAPH-2F948;Lo;0;L;774A;;;;N;;;;;
+2F949;CJK COMPATIBILITY IDEOGRAPH-2F949;Lo;0;L;4039;;;;N;;;;;
+2F94A;CJK COMPATIBILITY IDEOGRAPH-2F94A;Lo;0;L;778B;;;;N;;;;;
+2F94B;CJK COMPATIBILITY IDEOGRAPH-2F94B;Lo;0;L;4046;;;;N;;;;;
+2F94C;CJK COMPATIBILITY IDEOGRAPH-2F94C;Lo;0;L;4096;;;;N;;;;;
+2F94D;CJK COMPATIBILITY IDEOGRAPH-2F94D;Lo;0;L;2541D;;;;N;;;;;
+2F94E;CJK COMPATIBILITY IDEOGRAPH-2F94E;Lo;0;L;784E;;;;N;;;;;
+2F94F;CJK COMPATIBILITY IDEOGRAPH-2F94F;Lo;0;L;788C;;;;N;;;;;
+2F950;CJK COMPATIBILITY IDEOGRAPH-2F950;Lo;0;L;78CC;;;;N;;;;;
+2F951;CJK COMPATIBILITY IDEOGRAPH-2F951;Lo;0;L;40E3;;;;N;;;;;
+2F952;CJK COMPATIBILITY IDEOGRAPH-2F952;Lo;0;L;25626;;;;N;;;;;
+2F953;CJK COMPATIBILITY IDEOGRAPH-2F953;Lo;0;L;7956;;;;N;;;;;
+2F954;CJK COMPATIBILITY IDEOGRAPH-2F954;Lo;0;L;2569A;;;;N;;;;;
+2F955;CJK COMPATIBILITY IDEOGRAPH-2F955;Lo;0;L;256C5;;;;N;;;;;
+2F956;CJK COMPATIBILITY IDEOGRAPH-2F956;Lo;0;L;798F;;;;N;;;;;
+2F957;CJK COMPATIBILITY IDEOGRAPH-2F957;Lo;0;L;79EB;;;;N;;;;;
+2F958;CJK COMPATIBILITY IDEOGRAPH-2F958;Lo;0;L;412F;;;;N;;;;;
+2F959;CJK COMPATIBILITY IDEOGRAPH-2F959;Lo;0;L;7A40;;;;N;;;;;
+2F95A;CJK COMPATIBILITY IDEOGRAPH-2F95A;Lo;0;L;7A4A;;;;N;;;;;
+2F95B;CJK COMPATIBILITY IDEOGRAPH-2F95B;Lo;0;L;7A4F;;;;N;;;;;
+2F95C;CJK COMPATIBILITY IDEOGRAPH-2F95C;Lo;0;L;2597C;;;;N;;;;;
+2F95D;CJK COMPATIBILITY IDEOGRAPH-2F95D;Lo;0;L;25AA7;;;;N;;;;;
+2F95E;CJK COMPATIBILITY IDEOGRAPH-2F95E;Lo;0;L;25AA7;;;;N;;;;;
+2F95F;CJK COMPATIBILITY IDEOGRAPH-2F95F;Lo;0;L;7AEE;;;;N;;;;;
+2F960;CJK COMPATIBILITY IDEOGRAPH-2F960;Lo;0;L;4202;;;;N;;;;;
+2F961;CJK COMPATIBILITY IDEOGRAPH-2F961;Lo;0;L;25BAB;;;;N;;;;;
+2F962;CJK COMPATIBILITY IDEOGRAPH-2F962;Lo;0;L;7BC6;;;;N;;;;;
+2F963;CJK COMPATIBILITY IDEOGRAPH-2F963;Lo;0;L;7BC9;;;;N;;;;;
+2F964;CJK COMPATIBILITY IDEOGRAPH-2F964;Lo;0;L;4227;;;;N;;;;;
+2F965;CJK COMPATIBILITY IDEOGRAPH-2F965;Lo;0;L;25C80;;;;N;;;;;
+2F966;CJK COMPATIBILITY IDEOGRAPH-2F966;Lo;0;L;7CD2;;;;N;;;;;
+2F967;CJK COMPATIBILITY IDEOGRAPH-2F967;Lo;0;L;42A0;;;;N;;;;;
+2F968;CJK COMPATIBILITY IDEOGRAPH-2F968;Lo;0;L;7CE8;;;;N;;;;;
+2F969;CJK COMPATIBILITY IDEOGRAPH-2F969;Lo;0;L;7CE3;;;;N;;;;;
+2F96A;CJK COMPATIBILITY IDEOGRAPH-2F96A;Lo;0;L;7D00;;;;N;;;;;
+2F96B;CJK COMPATIBILITY IDEOGRAPH-2F96B;Lo;0;L;25F86;;;;N;;;;;
+2F96C;CJK COMPATIBILITY IDEOGRAPH-2F96C;Lo;0;L;7D63;;;;N;;;;;
+2F96D;CJK COMPATIBILITY IDEOGRAPH-2F96D;Lo;0;L;4301;;;;N;;;;;
+2F96E;CJK COMPATIBILITY IDEOGRAPH-2F96E;Lo;0;L;7DC7;;;;N;;;;;
+2F96F;CJK COMPATIBILITY IDEOGRAPH-2F96F;Lo;0;L;7E02;;;;N;;;;;
+2F970;CJK COMPATIBILITY IDEOGRAPH-2F970;Lo;0;L;7E45;;;;N;;;;;
+2F971;CJK COMPATIBILITY IDEOGRAPH-2F971;Lo;0;L;4334;;;;N;;;;;
+2F972;CJK COMPATIBILITY IDEOGRAPH-2F972;Lo;0;L;26228;;;;N;;;;;
+2F973;CJK COMPATIBILITY IDEOGRAPH-2F973;Lo;0;L;26247;;;;N;;;;;
+2F974;CJK COMPATIBILITY IDEOGRAPH-2F974;Lo;0;L;4359;;;;N;;;;;
+2F975;CJK COMPATIBILITY IDEOGRAPH-2F975;Lo;0;L;262D9;;;;N;;;;;
+2F976;CJK COMPATIBILITY IDEOGRAPH-2F976;Lo;0;L;7F7A;;;;N;;;;;
+2F977;CJK COMPATIBILITY IDEOGRAPH-2F977;Lo;0;L;2633E;;;;N;;;;;
+2F978;CJK COMPATIBILITY IDEOGRAPH-2F978;Lo;0;L;7F95;;;;N;;;;;
+2F979;CJK COMPATIBILITY IDEOGRAPH-2F979;Lo;0;L;7FFA;;;;N;;;;;
+2F97A;CJK COMPATIBILITY IDEOGRAPH-2F97A;Lo;0;L;8005;;;;N;;;;;
+2F97B;CJK COMPATIBILITY IDEOGRAPH-2F97B;Lo;0;L;264DA;;;;N;;;;;
+2F97C;CJK COMPATIBILITY IDEOGRAPH-2F97C;Lo;0;L;26523;;;;N;;;;;
+2F97D;CJK COMPATIBILITY IDEOGRAPH-2F97D;Lo;0;L;8060;;;;N;;;;;
+2F97E;CJK COMPATIBILITY IDEOGRAPH-2F97E;Lo;0;L;265A8;;;;N;;;;;
+2F97F;CJK COMPATIBILITY IDEOGRAPH-2F97F;Lo;0;L;8070;;;;N;;;;;
+2F980;CJK COMPATIBILITY IDEOGRAPH-2F980;Lo;0;L;2335F;;;;N;;;;;
+2F981;CJK COMPATIBILITY IDEOGRAPH-2F981;Lo;0;L;43D5;;;;N;;;;;
+2F982;CJK COMPATIBILITY IDEOGRAPH-2F982;Lo;0;L;80B2;;;;N;;;;;
+2F983;CJK COMPATIBILITY IDEOGRAPH-2F983;Lo;0;L;8103;;;;N;;;;;
+2F984;CJK COMPATIBILITY IDEOGRAPH-2F984;Lo;0;L;440B;;;;N;;;;;
+2F985;CJK COMPATIBILITY IDEOGRAPH-2F985;Lo;0;L;813E;;;;N;;;;;
+2F986;CJK COMPATIBILITY IDEOGRAPH-2F986;Lo;0;L;5AB5;;;;N;;;;;
+2F987;CJK COMPATIBILITY IDEOGRAPH-2F987;Lo;0;L;267A7;;;;N;;;;;
+2F988;CJK COMPATIBILITY IDEOGRAPH-2F988;Lo;0;L;267B5;;;;N;;;;;
+2F989;CJK COMPATIBILITY IDEOGRAPH-2F989;Lo;0;L;23393;;;;N;;;;;
+2F98A;CJK COMPATIBILITY IDEOGRAPH-2F98A;Lo;0;L;2339C;;;;N;;;;;
+2F98B;CJK COMPATIBILITY IDEOGRAPH-2F98B;Lo;0;L;8201;;;;N;;;;;
+2F98C;CJK COMPATIBILITY IDEOGRAPH-2F98C;Lo;0;L;8204;;;;N;;;;;
+2F98D;CJK COMPATIBILITY IDEOGRAPH-2F98D;Lo;0;L;8F9E;;;;N;;;;;
+2F98E;CJK COMPATIBILITY IDEOGRAPH-2F98E;Lo;0;L;446B;;;;N;;;;;
+2F98F;CJK COMPATIBILITY IDEOGRAPH-2F98F;Lo;0;L;8291;;;;N;;;;;
+2F990;CJK COMPATIBILITY IDEOGRAPH-2F990;Lo;0;L;828B;;;;N;;;;;
+2F991;CJK COMPATIBILITY IDEOGRAPH-2F991;Lo;0;L;829D;;;;N;;;;;
+2F992;CJK COMPATIBILITY IDEOGRAPH-2F992;Lo;0;L;52B3;;;;N;;;;;
+2F993;CJK COMPATIBILITY IDEOGRAPH-2F993;Lo;0;L;82B1;;;;N;;;;;
+2F994;CJK COMPATIBILITY IDEOGRAPH-2F994;Lo;0;L;82B3;;;;N;;;;;
+2F995;CJK COMPATIBILITY IDEOGRAPH-2F995;Lo;0;L;82BD;;;;N;;;;;
+2F996;CJK COMPATIBILITY IDEOGRAPH-2F996;Lo;0;L;82E6;;;;N;;;;;
+2F997;CJK COMPATIBILITY IDEOGRAPH-2F997;Lo;0;L;26B3C;;;;N;;;;;
+2F998;CJK COMPATIBILITY IDEOGRAPH-2F998;Lo;0;L;82E5;;;;N;;;;;
+2F999;CJK COMPATIBILITY IDEOGRAPH-2F999;Lo;0;L;831D;;;;N;;;;;
+2F99A;CJK COMPATIBILITY IDEOGRAPH-2F99A;Lo;0;L;8363;;;;N;;;;;
+2F99B;CJK COMPATIBILITY IDEOGRAPH-2F99B;Lo;0;L;83AD;;;;N;;;;;
+2F99C;CJK COMPATIBILITY IDEOGRAPH-2F99C;Lo;0;L;8323;;;;N;;;;;
+2F99D;CJK COMPATIBILITY IDEOGRAPH-2F99D;Lo;0;L;83BD;;;;N;;;;;
+2F99E;CJK COMPATIBILITY IDEOGRAPH-2F99E;Lo;0;L;83E7;;;;N;;;;;
+2F99F;CJK COMPATIBILITY IDEOGRAPH-2F99F;Lo;0;L;8457;;;;N;;;;;
+2F9A0;CJK COMPATIBILITY IDEOGRAPH-2F9A0;Lo;0;L;8353;;;;N;;;;;
+2F9A1;CJK COMPATIBILITY IDEOGRAPH-2F9A1;Lo;0;L;83CA;;;;N;;;;;
+2F9A2;CJK COMPATIBILITY IDEOGRAPH-2F9A2;Lo;0;L;83CC;;;;N;;;;;
+2F9A3;CJK COMPATIBILITY IDEOGRAPH-2F9A3;Lo;0;L;83DC;;;;N;;;;;
+2F9A4;CJK COMPATIBILITY IDEOGRAPH-2F9A4;Lo;0;L;26C36;;;;N;;;;;
+2F9A5;CJK COMPATIBILITY IDEOGRAPH-2F9A5;Lo;0;L;26D6B;;;;N;;;;;
+2F9A6;CJK COMPATIBILITY IDEOGRAPH-2F9A6;Lo;0;L;26CD5;;;;N;;;;;
+2F9A7;CJK COMPATIBILITY IDEOGRAPH-2F9A7;Lo;0;L;452B;;;;N;;;;;
+2F9A8;CJK COMPATIBILITY IDEOGRAPH-2F9A8;Lo;0;L;84F1;;;;N;;;;;
+2F9A9;CJK COMPATIBILITY IDEOGRAPH-2F9A9;Lo;0;L;84F3;;;;N;;;;;
+2F9AA;CJK COMPATIBILITY IDEOGRAPH-2F9AA;Lo;0;L;8516;;;;N;;;;;
+2F9AB;CJK COMPATIBILITY IDEOGRAPH-2F9AB;Lo;0;L;273CA;;;;N;;;;;
+2F9AC;CJK COMPATIBILITY IDEOGRAPH-2F9AC;Lo;0;L;8564;;;;N;;;;;
+2F9AD;CJK COMPATIBILITY IDEOGRAPH-2F9AD;Lo;0;L;26F2C;;;;N;;;;;
+2F9AE;CJK COMPATIBILITY IDEOGRAPH-2F9AE;Lo;0;L;455D;;;;N;;;;;
+2F9AF;CJK COMPATIBILITY IDEOGRAPH-2F9AF;Lo;0;L;4561;;;;N;;;;;
+2F9B0;CJK COMPATIBILITY IDEOGRAPH-2F9B0;Lo;0;L;26FB1;;;;N;;;;;
+2F9B1;CJK COMPATIBILITY IDEOGRAPH-2F9B1;Lo;0;L;270D2;;;;N;;;;;
+2F9B2;CJK COMPATIBILITY IDEOGRAPH-2F9B2;Lo;0;L;456B;;;;N;;;;;
+2F9B3;CJK COMPATIBILITY IDEOGRAPH-2F9B3;Lo;0;L;8650;;;;N;;;;;
+2F9B4;CJK COMPATIBILITY IDEOGRAPH-2F9B4;Lo;0;L;865C;;;;N;;;;;
+2F9B5;CJK COMPATIBILITY IDEOGRAPH-2F9B5;Lo;0;L;8667;;;;N;;;;;
+2F9B6;CJK COMPATIBILITY IDEOGRAPH-2F9B6;Lo;0;L;8669;;;;N;;;;;
+2F9B7;CJK COMPATIBILITY IDEOGRAPH-2F9B7;Lo;0;L;86A9;;;;N;;;;;
+2F9B8;CJK COMPATIBILITY IDEOGRAPH-2F9B8;Lo;0;L;8688;;;;N;;;;;
+2F9B9;CJK COMPATIBILITY IDEOGRAPH-2F9B9;Lo;0;L;870E;;;;N;;;;;
+2F9BA;CJK COMPATIBILITY IDEOGRAPH-2F9BA;Lo;0;L;86E2;;;;N;;;;;
+2F9BB;CJK COMPATIBILITY IDEOGRAPH-2F9BB;Lo;0;L;8779;;;;N;;;;;
+2F9BC;CJK COMPATIBILITY IDEOGRAPH-2F9BC;Lo;0;L;8728;;;;N;;;;;
+2F9BD;CJK COMPATIBILITY IDEOGRAPH-2F9BD;Lo;0;L;876B;;;;N;;;;;
+2F9BE;CJK COMPATIBILITY IDEOGRAPH-2F9BE;Lo;0;L;8786;;;;N;;;;;
+2F9BF;CJK COMPATIBILITY IDEOGRAPH-2F9BF;Lo;0;L;45D7;;;;N;;;;;
+2F9C0;CJK COMPATIBILITY IDEOGRAPH-2F9C0;Lo;0;L;87E1;;;;N;;;;;
+2F9C1;CJK COMPATIBILITY IDEOGRAPH-2F9C1;Lo;0;L;8801;;;;N;;;;;
+2F9C2;CJK COMPATIBILITY IDEOGRAPH-2F9C2;Lo;0;L;45F9;;;;N;;;;;
+2F9C3;CJK COMPATIBILITY IDEOGRAPH-2F9C3;Lo;0;L;8860;;;;N;;;;;
+2F9C4;CJK COMPATIBILITY IDEOGRAPH-2F9C4;Lo;0;L;8863;;;;N;;;;;
+2F9C5;CJK COMPATIBILITY IDEOGRAPH-2F9C5;Lo;0;L;27667;;;;N;;;;;
+2F9C6;CJK COMPATIBILITY IDEOGRAPH-2F9C6;Lo;0;L;88D7;;;;N;;;;;
+2F9C7;CJK COMPATIBILITY IDEOGRAPH-2F9C7;Lo;0;L;88DE;;;;N;;;;;
+2F9C8;CJK COMPATIBILITY IDEOGRAPH-2F9C8;Lo;0;L;4635;;;;N;;;;;
+2F9C9;CJK COMPATIBILITY IDEOGRAPH-2F9C9;Lo;0;L;88FA;;;;N;;;;;
+2F9CA;CJK COMPATIBILITY IDEOGRAPH-2F9CA;Lo;0;L;34BB;;;;N;;;;;
+2F9CB;CJK COMPATIBILITY IDEOGRAPH-2F9CB;Lo;0;L;278AE;;;;N;;;;;
+2F9CC;CJK COMPATIBILITY IDEOGRAPH-2F9CC;Lo;0;L;27966;;;;N;;;;;
+2F9CD;CJK COMPATIBILITY IDEOGRAPH-2F9CD;Lo;0;L;46BE;;;;N;;;;;
+2F9CE;CJK COMPATIBILITY IDEOGRAPH-2F9CE;Lo;0;L;46C7;;;;N;;;;;
+2F9CF;CJK COMPATIBILITY IDEOGRAPH-2F9CF;Lo;0;L;8AA0;;;;N;;;;;
+2F9D0;CJK COMPATIBILITY IDEOGRAPH-2F9D0;Lo;0;L;8AED;;;;N;;;;;
+2F9D1;CJK COMPATIBILITY IDEOGRAPH-2F9D1;Lo;0;L;8B8A;;;;N;;;;;
+2F9D2;CJK COMPATIBILITY IDEOGRAPH-2F9D2;Lo;0;L;8C55;;;;N;;;;;
+2F9D3;CJK COMPATIBILITY IDEOGRAPH-2F9D3;Lo;0;L;27CA8;;;;N;;;;;
+2F9D4;CJK COMPATIBILITY IDEOGRAPH-2F9D4;Lo;0;L;8CAB;;;;N;;;;;
+2F9D5;CJK COMPATIBILITY IDEOGRAPH-2F9D5;Lo;0;L;8CC1;;;;N;;;;;
+2F9D6;CJK COMPATIBILITY IDEOGRAPH-2F9D6;Lo;0;L;8D1B;;;;N;;;;;
+2F9D7;CJK COMPATIBILITY IDEOGRAPH-2F9D7;Lo;0;L;8D77;;;;N;;;;;
+2F9D8;CJK COMPATIBILITY IDEOGRAPH-2F9D8;Lo;0;L;27F2F;;;;N;;;;;
+2F9D9;CJK COMPATIBILITY IDEOGRAPH-2F9D9;Lo;0;L;20804;;;;N;;;;;
+2F9DA;CJK COMPATIBILITY IDEOGRAPH-2F9DA;Lo;0;L;8DCB;;;;N;;;;;
+2F9DB;CJK COMPATIBILITY IDEOGRAPH-2F9DB;Lo;0;L;8DBC;;;;N;;;;;
+2F9DC;CJK COMPATIBILITY IDEOGRAPH-2F9DC;Lo;0;L;8DF0;;;;N;;;;;
+2F9DD;CJK COMPATIBILITY IDEOGRAPH-2F9DD;Lo;0;L;208DE;;;;N;;;;;
+2F9DE;CJK COMPATIBILITY IDEOGRAPH-2F9DE;Lo;0;L;8ED4;;;;N;;;;;
+2F9DF;CJK COMPATIBILITY IDEOGRAPH-2F9DF;Lo;0;L;8F38;;;;N;;;;;
+2F9E0;CJK COMPATIBILITY IDEOGRAPH-2F9E0;Lo;0;L;285D2;;;;N;;;;;
+2F9E1;CJK COMPATIBILITY IDEOGRAPH-2F9E1;Lo;0;L;285ED;;;;N;;;;;
+2F9E2;CJK COMPATIBILITY IDEOGRAPH-2F9E2;Lo;0;L;9094;;;;N;;;;;
+2F9E3;CJK COMPATIBILITY IDEOGRAPH-2F9E3;Lo;0;L;90F1;;;;N;;;;;
+2F9E4;CJK COMPATIBILITY IDEOGRAPH-2F9E4;Lo;0;L;9111;;;;N;;;;;
+2F9E5;CJK COMPATIBILITY IDEOGRAPH-2F9E5;Lo;0;L;2872E;;;;N;;;;;
+2F9E6;CJK COMPATIBILITY IDEOGRAPH-2F9E6;Lo;0;L;911B;;;;N;;;;;
+2F9E7;CJK COMPATIBILITY IDEOGRAPH-2F9E7;Lo;0;L;9238;;;;N;;;;;
+2F9E8;CJK COMPATIBILITY IDEOGRAPH-2F9E8;Lo;0;L;92D7;;;;N;;;;;
+2F9E9;CJK COMPATIBILITY IDEOGRAPH-2F9E9;Lo;0;L;92D8;;;;N;;;;;
+2F9EA;CJK COMPATIBILITY IDEOGRAPH-2F9EA;Lo;0;L;927C;;;;N;;;;;
+2F9EB;CJK COMPATIBILITY IDEOGRAPH-2F9EB;Lo;0;L;93F9;;;;N;;;;;
+2F9EC;CJK COMPATIBILITY IDEOGRAPH-2F9EC;Lo;0;L;9415;;;;N;;;;;
+2F9ED;CJK COMPATIBILITY IDEOGRAPH-2F9ED;Lo;0;L;28BFA;;;;N;;;;;
+2F9EE;CJK COMPATIBILITY IDEOGRAPH-2F9EE;Lo;0;L;958B;;;;N;;;;;
+2F9EF;CJK COMPATIBILITY IDEOGRAPH-2F9EF;Lo;0;L;4995;;;;N;;;;;
+2F9F0;CJK COMPATIBILITY IDEOGRAPH-2F9F0;Lo;0;L;95B7;;;;N;;;;;
+2F9F1;CJK COMPATIBILITY IDEOGRAPH-2F9F1;Lo;0;L;28D77;;;;N;;;;;
+2F9F2;CJK COMPATIBILITY IDEOGRAPH-2F9F2;Lo;0;L;49E6;;;;N;;;;;
+2F9F3;CJK COMPATIBILITY IDEOGRAPH-2F9F3;Lo;0;L;96C3;;;;N;;;;;
+2F9F4;CJK COMPATIBILITY IDEOGRAPH-2F9F4;Lo;0;L;5DB2;;;;N;;;;;
+2F9F5;CJK COMPATIBILITY IDEOGRAPH-2F9F5;Lo;0;L;9723;;;;N;;;;;
+2F9F6;CJK COMPATIBILITY IDEOGRAPH-2F9F6;Lo;0;L;29145;;;;N;;;;;
+2F9F7;CJK COMPATIBILITY IDEOGRAPH-2F9F7;Lo;0;L;2921A;;;;N;;;;;
+2F9F8;CJK COMPATIBILITY IDEOGRAPH-2F9F8;Lo;0;L;4A6E;;;;N;;;;;
+2F9F9;CJK COMPATIBILITY IDEOGRAPH-2F9F9;Lo;0;L;4A76;;;;N;;;;;
+2F9FA;CJK COMPATIBILITY IDEOGRAPH-2F9FA;Lo;0;L;97E0;;;;N;;;;;
+2F9FB;CJK COMPATIBILITY IDEOGRAPH-2F9FB;Lo;0;L;2940A;;;;N;;;;;
+2F9FC;CJK COMPATIBILITY IDEOGRAPH-2F9FC;Lo;0;L;4AB2;;;;N;;;;;
+2F9FD;CJK COMPATIBILITY IDEOGRAPH-2F9FD;Lo;0;L;29496;;;;N;;;;;
+2F9FE;CJK COMPATIBILITY IDEOGRAPH-2F9FE;Lo;0;L;980B;;;;N;;;;;
+2F9FF;CJK COMPATIBILITY IDEOGRAPH-2F9FF;Lo;0;L;980B;;;;N;;;;;
+2FA00;CJK COMPATIBILITY IDEOGRAPH-2FA00;Lo;0;L;9829;;;;N;;;;;
+2FA01;CJK COMPATIBILITY IDEOGRAPH-2FA01;Lo;0;L;295B6;;;;N;;;;;
+2FA02;CJK COMPATIBILITY IDEOGRAPH-2FA02;Lo;0;L;98E2;;;;N;;;;;
+2FA03;CJK COMPATIBILITY IDEOGRAPH-2FA03;Lo;0;L;4B33;;;;N;;;;;
+2FA04;CJK COMPATIBILITY IDEOGRAPH-2FA04;Lo;0;L;9929;;;;N;;;;;
+2FA05;CJK COMPATIBILITY IDEOGRAPH-2FA05;Lo;0;L;99A7;;;;N;;;;;
+2FA06;CJK COMPATIBILITY IDEOGRAPH-2FA06;Lo;0;L;99C2;;;;N;;;;;
+2FA07;CJK COMPATIBILITY IDEOGRAPH-2FA07;Lo;0;L;99FE;;;;N;;;;;
+2FA08;CJK COMPATIBILITY IDEOGRAPH-2FA08;Lo;0;L;4BCE;;;;N;;;;;
+2FA09;CJK COMPATIBILITY IDEOGRAPH-2FA09;Lo;0;L;29B30;;;;N;;;;;
+2FA0A;CJK COMPATIBILITY IDEOGRAPH-2FA0A;Lo;0;L;9B12;;;;N;;;;;
+2FA0B;CJK COMPATIBILITY IDEOGRAPH-2FA0B;Lo;0;L;9C40;;;;N;;;;;
+2FA0C;CJK COMPATIBILITY IDEOGRAPH-2FA0C;Lo;0;L;9CFD;;;;N;;;;;
+2FA0D;CJK COMPATIBILITY IDEOGRAPH-2FA0D;Lo;0;L;4CCE;;;;N;;;;;
+2FA0E;CJK COMPATIBILITY IDEOGRAPH-2FA0E;Lo;0;L;4CED;;;;N;;;;;
+2FA0F;CJK COMPATIBILITY IDEOGRAPH-2FA0F;Lo;0;L;9D67;;;;N;;;;;
+2FA10;CJK COMPATIBILITY IDEOGRAPH-2FA10;Lo;0;L;2A0CE;;;;N;;;;;
+2FA11;CJK COMPATIBILITY IDEOGRAPH-2FA11;Lo;0;L;4CF8;;;;N;;;;;
+2FA12;CJK COMPATIBILITY IDEOGRAPH-2FA12;Lo;0;L;2A105;;;;N;;;;;
+2FA13;CJK COMPATIBILITY IDEOGRAPH-2FA13;Lo;0;L;2A20E;;;;N;;;;;
+2FA14;CJK COMPATIBILITY IDEOGRAPH-2FA14;Lo;0;L;2A291;;;;N;;;;;
+2FA15;CJK COMPATIBILITY IDEOGRAPH-2FA15;Lo;0;L;9EBB;;;;N;;;;;
+2FA16;CJK COMPATIBILITY IDEOGRAPH-2FA16;Lo;0;L;4D56;;;;N;;;;;
+2FA17;CJK COMPATIBILITY IDEOGRAPH-2FA17;Lo;0;L;9EF9;;;;N;;;;;
+2FA18;CJK COMPATIBILITY IDEOGRAPH-2FA18;Lo;0;L;9EFE;;;;N;;;;;
+2FA19;CJK COMPATIBILITY IDEOGRAPH-2FA19;Lo;0;L;9F05;;;;N;;;;;
+2FA1A;CJK COMPATIBILITY IDEOGRAPH-2FA1A;Lo;0;L;9F0F;;;;N;;;;;
+2FA1B;CJK COMPATIBILITY IDEOGRAPH-2FA1B;Lo;0;L;9F16;;;;N;;;;;
+2FA1C;CJK COMPATIBILITY IDEOGRAPH-2FA1C;Lo;0;L;9F3B;;;;N;;;;;
+2FA1D;CJK COMPATIBILITY IDEOGRAPH-2FA1D;Lo;0;L;2A600;;;;N;;;;;
+E0001;LANGUAGE TAG;Cf;0;BN;;;;;N;;;;;
+E0020;TAG SPACE;Cf;0;BN;;;;;N;;;;;
+E0021;TAG EXCLAMATION MARK;Cf;0;BN;;;;;N;;;;;
+E0022;TAG QUOTATION MARK;Cf;0;BN;;;;;N;;;;;
+E0023;TAG NUMBER SIGN;Cf;0;BN;;;;;N;;;;;
+E0024;TAG DOLLAR SIGN;Cf;0;BN;;;;;N;;;;;
+E0025;TAG PERCENT SIGN;Cf;0;BN;;;;;N;;;;;
+E0026;TAG AMPERSAND;Cf;0;BN;;;;;N;;;;;
+E0027;TAG APOSTROPHE;Cf;0;BN;;;;;N;;;;;
+E0028;TAG LEFT PARENTHESIS;Cf;0;BN;;;;;N;;;;;
+E0029;TAG RIGHT PARENTHESIS;Cf;0;BN;;;;;N;;;;;
+E002A;TAG ASTERISK;Cf;0;BN;;;;;N;;;;;
+E002B;TAG PLUS SIGN;Cf;0;BN;;;;;N;;;;;
+E002C;TAG COMMA;Cf;0;BN;;;;;N;;;;;
+E002D;TAG HYPHEN-MINUS;Cf;0;BN;;;;;N;;;;;
+E002E;TAG FULL STOP;Cf;0;BN;;;;;N;;;;;
+E002F;TAG SOLIDUS;Cf;0;BN;;;;;N;;;;;
+E0030;TAG DIGIT ZERO;Cf;0;BN;;;;;N;;;;;
+E0031;TAG DIGIT ONE;Cf;0;BN;;;;;N;;;;;
+E0032;TAG DIGIT TWO;Cf;0;BN;;;;;N;;;;;
+E0033;TAG DIGIT THREE;Cf;0;BN;;;;;N;;;;;
+E0034;TAG DIGIT FOUR;Cf;0;BN;;;;;N;;;;;
+E0035;TAG DIGIT FIVE;Cf;0;BN;;;;;N;;;;;
+E0036;TAG DIGIT SIX;Cf;0;BN;;;;;N;;;;;
+E0037;TAG DIGIT SEVEN;Cf;0;BN;;;;;N;;;;;
+E0038;TAG DIGIT EIGHT;Cf;0;BN;;;;;N;;;;;
+E0039;TAG DIGIT NINE;Cf;0;BN;;;;;N;;;;;
+E003A;TAG COLON;Cf;0;BN;;;;;N;;;;;
+E003B;TAG SEMICOLON;Cf;0;BN;;;;;N;;;;;
+E003C;TAG LESS-THAN SIGN;Cf;0;BN;;;;;N;;;;;
+E003D;TAG EQUALS SIGN;Cf;0;BN;;;;;N;;;;;
+E003E;TAG GREATER-THAN SIGN;Cf;0;BN;;;;;N;;;;;
+E003F;TAG QUESTION MARK;Cf;0;BN;;;;;N;;;;;
+E0040;TAG COMMERCIAL AT;Cf;0;BN;;;;;N;;;;;
+E0041;TAG LATIN CAPITAL LETTER A;Cf;0;BN;;;;;N;;;;;
+E0042;TAG LATIN CAPITAL LETTER B;Cf;0;BN;;;;;N;;;;;
+E0043;TAG LATIN CAPITAL LETTER C;Cf;0;BN;;;;;N;;;;;
+E0044;TAG LATIN CAPITAL LETTER D;Cf;0;BN;;;;;N;;;;;
+E0045;TAG LATIN CAPITAL LETTER E;Cf;0;BN;;;;;N;;;;;
+E0046;TAG LATIN CAPITAL LETTER F;Cf;0;BN;;;;;N;;;;;
+E0047;TAG LATIN CAPITAL LETTER G;Cf;0;BN;;;;;N;;;;;
+E0048;TAG LATIN CAPITAL LETTER H;Cf;0;BN;;;;;N;;;;;
+E0049;TAG LATIN CAPITAL LETTER I;Cf;0;BN;;;;;N;;;;;
+E004A;TAG LATIN CAPITAL LETTER J;Cf;0;BN;;;;;N;;;;;
+E004B;TAG LATIN CAPITAL LETTER K;Cf;0;BN;;;;;N;;;;;
+E004C;TAG LATIN CAPITAL LETTER L;Cf;0;BN;;;;;N;;;;;
+E004D;TAG LATIN CAPITAL LETTER M;Cf;0;BN;;;;;N;;;;;
+E004E;TAG LATIN CAPITAL LETTER N;Cf;0;BN;;;;;N;;;;;
+E004F;TAG LATIN CAPITAL LETTER O;Cf;0;BN;;;;;N;;;;;
+E0050;TAG LATIN CAPITAL LETTER P;Cf;0;BN;;;;;N;;;;;
+E0051;TAG LATIN CAPITAL LETTER Q;Cf;0;BN;;;;;N;;;;;
+E0052;TAG LATIN CAPITAL LETTER R;Cf;0;BN;;;;;N;;;;;
+E0053;TAG LATIN CAPITAL LETTER S;Cf;0;BN;;;;;N;;;;;
+E0054;TAG LATIN CAPITAL LETTER T;Cf;0;BN;;;;;N;;;;;
+E0055;TAG LATIN CAPITAL LETTER U;Cf;0;BN;;;;;N;;;;;
+E0056;TAG LATIN CAPITAL LETTER V;Cf;0;BN;;;;;N;;;;;
+E0057;TAG LATIN CAPITAL LETTER W;Cf;0;BN;;;;;N;;;;;
+E0058;TAG LATIN CAPITAL LETTER X;Cf;0;BN;;;;;N;;;;;
+E0059;TAG LATIN CAPITAL LETTER Y;Cf;0;BN;;;;;N;;;;;
+E005A;TAG LATIN CAPITAL LETTER Z;Cf;0;BN;;;;;N;;;;;
+E005B;TAG LEFT SQUARE BRACKET;Cf;0;BN;;;;;N;;;;;
+E005C;TAG REVERSE SOLIDUS;Cf;0;BN;;;;;N;;;;;
+E005D;TAG RIGHT SQUARE BRACKET;Cf;0;BN;;;;;N;;;;;
+E005E;TAG CIRCUMFLEX ACCENT;Cf;0;BN;;;;;N;;;;;
+E005F;TAG LOW LINE;Cf;0;BN;;;;;N;;;;;
+E0060;TAG GRAVE ACCENT;Cf;0;BN;;;;;N;;;;;
+E0061;TAG LATIN SMALL LETTER A;Cf;0;BN;;;;;N;;;;;
+E0062;TAG LATIN SMALL LETTER B;Cf;0;BN;;;;;N;;;;;
+E0063;TAG LATIN SMALL LETTER C;Cf;0;BN;;;;;N;;;;;
+E0064;TAG LATIN SMALL LETTER D;Cf;0;BN;;;;;N;;;;;
+E0065;TAG LATIN SMALL LETTER E;Cf;0;BN;;;;;N;;;;;
+E0066;TAG LATIN SMALL LETTER F;Cf;0;BN;;;;;N;;;;;
+E0067;TAG LATIN SMALL LETTER G;Cf;0;BN;;;;;N;;;;;
+E0068;TAG LATIN SMALL LETTER H;Cf;0;BN;;;;;N;;;;;
+E0069;TAG LATIN SMALL LETTER I;Cf;0;BN;;;;;N;;;;;
+E006A;TAG LATIN SMALL LETTER J;Cf;0;BN;;;;;N;;;;;
+E006B;TAG LATIN SMALL LETTER K;Cf;0;BN;;;;;N;;;;;
+E006C;TAG LATIN SMALL LETTER L;Cf;0;BN;;;;;N;;;;;
+E006D;TAG LATIN SMALL LETTER M;Cf;0;BN;;;;;N;;;;;
+E006E;TAG LATIN SMALL LETTER N;Cf;0;BN;;;;;N;;;;;
+E006F;TAG LATIN SMALL LETTER O;Cf;0;BN;;;;;N;;;;;
+E0070;TAG LATIN SMALL LETTER P;Cf;0;BN;;;;;N;;;;;
+E0071;TAG LATIN SMALL LETTER Q;Cf;0;BN;;;;;N;;;;;
+E0072;TAG LATIN SMALL LETTER R;Cf;0;BN;;;;;N;;;;;
+E0073;TAG LATIN SMALL LETTER S;Cf;0;BN;;;;;N;;;;;
+E0074;TAG LATIN SMALL LETTER T;Cf;0;BN;;;;;N;;;;;
+E0075;TAG LATIN SMALL LETTER U;Cf;0;BN;;;;;N;;;;;
+E0076;TAG LATIN SMALL LETTER V;Cf;0;BN;;;;;N;;;;;
+E0077;TAG LATIN SMALL LETTER W;Cf;0;BN;;;;;N;;;;;
+E0078;TAG LATIN SMALL LETTER X;Cf;0;BN;;;;;N;;;;;
+E0079;TAG LATIN SMALL LETTER Y;Cf;0;BN;;;;;N;;;;;
+E007A;TAG LATIN SMALL LETTER Z;Cf;0;BN;;;;;N;;;;;
+E007B;TAG LEFT CURLY BRACKET;Cf;0;BN;;;;;N;;;;;
+E007C;TAG VERTICAL LINE;Cf;0;BN;;;;;N;;;;;
+E007D;TAG RIGHT CURLY BRACKET;Cf;0;BN;;;;;N;;;;;
+E007E;TAG TILDE;Cf;0;BN;;;;;N;;;;;
+E007F;CANCEL TAG;Cf;0;BN;;;;;N;;;;;
+E0100;VARIATION SELECTOR-17;Mn;0;NSM;;;;;N;;;;;
+E0101;VARIATION SELECTOR-18;Mn;0;NSM;;;;;N;;;;;
+E0102;VARIATION SELECTOR-19;Mn;0;NSM;;;;;N;;;;;
+E0103;VARIATION SELECTOR-20;Mn;0;NSM;;;;;N;;;;;
+E0104;VARIATION SELECTOR-21;Mn;0;NSM;;;;;N;;;;;
+E0105;VARIATION SELECTOR-22;Mn;0;NSM;;;;;N;;;;;
+E0106;VARIATION SELECTOR-23;Mn;0;NSM;;;;;N;;;;;
+E0107;VARIATION SELECTOR-24;Mn;0;NSM;;;;;N;;;;;
+E0108;VARIATION SELECTOR-25;Mn;0;NSM;;;;;N;;;;;
+E0109;VARIATION SELECTOR-26;Mn;0;NSM;;;;;N;;;;;
+E010A;VARIATION SELECTOR-27;Mn;0;NSM;;;;;N;;;;;
+E010B;VARIATION SELECTOR-28;Mn;0;NSM;;;;;N;;;;;
+E010C;VARIATION SELECTOR-29;Mn;0;NSM;;;;;N;;;;;
+E010D;VARIATION SELECTOR-30;Mn;0;NSM;;;;;N;;;;;
+E010E;VARIATION SELECTOR-31;Mn;0;NSM;;;;;N;;;;;
+E010F;VARIATION SELECTOR-32;Mn;0;NSM;;;;;N;;;;;
+E0110;VARIATION SELECTOR-33;Mn;0;NSM;;;;;N;;;;;
+E0111;VARIATION SELECTOR-34;Mn;0;NSM;;;;;N;;;;;
+E0112;VARIATION SELECTOR-35;Mn;0;NSM;;;;;N;;;;;
+E0113;VARIATION SELECTOR-36;Mn;0;NSM;;;;;N;;;;;
+E0114;VARIATION SELECTOR-37;Mn;0;NSM;;;;;N;;;;;
+E0115;VARIATION SELECTOR-38;Mn;0;NSM;;;;;N;;;;;
+E0116;VARIATION SELECTOR-39;Mn;0;NSM;;;;;N;;;;;
+E0117;VARIATION SELECTOR-40;Mn;0;NSM;;;;;N;;;;;
+E0118;VARIATION SELECTOR-41;Mn;0;NSM;;;;;N;;;;;
+E0119;VARIATION SELECTOR-42;Mn;0;NSM;;;;;N;;;;;
+E011A;VARIATION SELECTOR-43;Mn;0;NSM;;;;;N;;;;;
+E011B;VARIATION SELECTOR-44;Mn;0;NSM;;;;;N;;;;;
+E011C;VARIATION SELECTOR-45;Mn;0;NSM;;;;;N;;;;;
+E011D;VARIATION SELECTOR-46;Mn;0;NSM;;;;;N;;;;;
+E011E;VARIATION SELECTOR-47;Mn;0;NSM;;;;;N;;;;;
+E011F;VARIATION SELECTOR-48;Mn;0;NSM;;;;;N;;;;;
+E0120;VARIATION SELECTOR-49;Mn;0;NSM;;;;;N;;;;;
+E0121;VARIATION SELECTOR-50;Mn;0;NSM;;;;;N;;;;;
+E0122;VARIATION SELECTOR-51;Mn;0;NSM;;;;;N;;;;;
+E0123;VARIATION SELECTOR-52;Mn;0;NSM;;;;;N;;;;;
+E0124;VARIATION SELECTOR-53;Mn;0;NSM;;;;;N;;;;;
+E0125;VARIATION SELECTOR-54;Mn;0;NSM;;;;;N;;;;;
+E0126;VARIATION SELECTOR-55;Mn;0;NSM;;;;;N;;;;;
+E0127;VARIATION SELECTOR-56;Mn;0;NSM;;;;;N;;;;;
+E0128;VARIATION SELECTOR-57;Mn;0;NSM;;;;;N;;;;;
+E0129;VARIATION SELECTOR-58;Mn;0;NSM;;;;;N;;;;;
+E012A;VARIATION SELECTOR-59;Mn;0;NSM;;;;;N;;;;;
+E012B;VARIATION SELECTOR-60;Mn;0;NSM;;;;;N;;;;;
+E012C;VARIATION SELECTOR-61;Mn;0;NSM;;;;;N;;;;;
+E012D;VARIATION SELECTOR-62;Mn;0;NSM;;;;;N;;;;;
+E012E;VARIATION SELECTOR-63;Mn;0;NSM;;;;;N;;;;;
+E012F;VARIATION SELECTOR-64;Mn;0;NSM;;;;;N;;;;;
+E0130;VARIATION SELECTOR-65;Mn;0;NSM;;;;;N;;;;;
+E0131;VARIATION SELECTOR-66;Mn;0;NSM;;;;;N;;;;;
+E0132;VARIATION SELECTOR-67;Mn;0;NSM;;;;;N;;;;;
+E0133;VARIATION SELECTOR-68;Mn;0;NSM;;;;;N;;;;;
+E0134;VARIATION SELECTOR-69;Mn;0;NSM;;;;;N;;;;;
+E0135;VARIATION SELECTOR-70;Mn;0;NSM;;;;;N;;;;;
+E0136;VARIATION SELECTOR-71;Mn;0;NSM;;;;;N;;;;;
+E0137;VARIATION SELECTOR-72;Mn;0;NSM;;;;;N;;;;;
+E0138;VARIATION SELECTOR-73;Mn;0;NSM;;;;;N;;;;;
+E0139;VARIATION SELECTOR-74;Mn;0;NSM;;;;;N;;;;;
+E013A;VARIATION SELECTOR-75;Mn;0;NSM;;;;;N;;;;;
+E013B;VARIATION SELECTOR-76;Mn;0;NSM;;;;;N;;;;;
+E013C;VARIATION SELECTOR-77;Mn;0;NSM;;;;;N;;;;;
+E013D;VARIATION SELECTOR-78;Mn;0;NSM;;;;;N;;;;;
+E013E;VARIATION SELECTOR-79;Mn;0;NSM;;;;;N;;;;;
+E013F;VARIATION SELECTOR-80;Mn;0;NSM;;;;;N;;;;;
+E0140;VARIATION SELECTOR-81;Mn;0;NSM;;;;;N;;;;;
+E0141;VARIATION SELECTOR-82;Mn;0;NSM;;;;;N;;;;;
+E0142;VARIATION SELECTOR-83;Mn;0;NSM;;;;;N;;;;;
+E0143;VARIATION SELECTOR-84;Mn;0;NSM;;;;;N;;;;;
+E0144;VARIATION SELECTOR-85;Mn;0;NSM;;;;;N;;;;;
+E0145;VARIATION SELECTOR-86;Mn;0;NSM;;;;;N;;;;;
+E0146;VARIATION SELECTOR-87;Mn;0;NSM;;;;;N;;;;;
+E0147;VARIATION SELECTOR-88;Mn;0;NSM;;;;;N;;;;;
+E0148;VARIATION SELECTOR-89;Mn;0;NSM;;;;;N;;;;;
+E0149;VARIATION SELECTOR-90;Mn;0;NSM;;;;;N;;;;;
+E014A;VARIATION SELECTOR-91;Mn;0;NSM;;;;;N;;;;;
+E014B;VARIATION SELECTOR-92;Mn;0;NSM;;;;;N;;;;;
+E014C;VARIATION SELECTOR-93;Mn;0;NSM;;;;;N;;;;;
+E014D;VARIATION SELECTOR-94;Mn;0;NSM;;;;;N;;;;;
+E014E;VARIATION SELECTOR-95;Mn;0;NSM;;;;;N;;;;;
+E014F;VARIATION SELECTOR-96;Mn;0;NSM;;;;;N;;;;;
+E0150;VARIATION SELECTOR-97;Mn;0;NSM;;;;;N;;;;;
+E0151;VARIATION SELECTOR-98;Mn;0;NSM;;;;;N;;;;;
+E0152;VARIATION SELECTOR-99;Mn;0;NSM;;;;;N;;;;;
+E0153;VARIATION SELECTOR-100;Mn;0;NSM;;;;;N;;;;;
+E0154;VARIATION SELECTOR-101;Mn;0;NSM;;;;;N;;;;;
+E0155;VARIATION SELECTOR-102;Mn;0;NSM;;;;;N;;;;;
+E0156;VARIATION SELECTOR-103;Mn;0;NSM;;;;;N;;;;;
+E0157;VARIATION SELECTOR-104;Mn;0;NSM;;;;;N;;;;;
+E0158;VARIATION SELECTOR-105;Mn;0;NSM;;;;;N;;;;;
+E0159;VARIATION SELECTOR-106;Mn;0;NSM;;;;;N;;;;;
+E015A;VARIATION SELECTOR-107;Mn;0;NSM;;;;;N;;;;;
+E015B;VARIATION SELECTOR-108;Mn;0;NSM;;;;;N;;;;;
+E015C;VARIATION SELECTOR-109;Mn;0;NSM;;;;;N;;;;;
+E015D;VARIATION SELECTOR-110;Mn;0;NSM;;;;;N;;;;;
+E015E;VARIATION SELECTOR-111;Mn;0;NSM;;;;;N;;;;;
+E015F;VARIATION SELECTOR-112;Mn;0;NSM;;;;;N;;;;;
+E0160;VARIATION SELECTOR-113;Mn;0;NSM;;;;;N;;;;;
+E0161;VARIATION SELECTOR-114;Mn;0;NSM;;;;;N;;;;;
+E0162;VARIATION SELECTOR-115;Mn;0;NSM;;;;;N;;;;;
+E0163;VARIATION SELECTOR-116;Mn;0;NSM;;;;;N;;;;;
+E0164;VARIATION SELECTOR-117;Mn;0;NSM;;;;;N;;;;;
+E0165;VARIATION SELECTOR-118;Mn;0;NSM;;;;;N;;;;;
+E0166;VARIATION SELECTOR-119;Mn;0;NSM;;;;;N;;;;;
+E0167;VARIATION SELECTOR-120;Mn;0;NSM;;;;;N;;;;;
+E0168;VARIATION SELECTOR-121;Mn;0;NSM;;;;;N;;;;;
+E0169;VARIATION SELECTOR-122;Mn;0;NSM;;;;;N;;;;;
+E016A;VARIATION SELECTOR-123;Mn;0;NSM;;;;;N;;;;;
+E016B;VARIATION SELECTOR-124;Mn;0;NSM;;;;;N;;;;;
+E016C;VARIATION SELECTOR-125;Mn;0;NSM;;;;;N;;;;;
+E016D;VARIATION SELECTOR-126;Mn;0;NSM;;;;;N;;;;;
+E016E;VARIATION SELECTOR-127;Mn;0;NSM;;;;;N;;;;;
+E016F;VARIATION SELECTOR-128;Mn;0;NSM;;;;;N;;;;;
+E0170;VARIATION SELECTOR-129;Mn;0;NSM;;;;;N;;;;;
+E0171;VARIATION SELECTOR-130;Mn;0;NSM;;;;;N;;;;;
+E0172;VARIATION SELECTOR-131;Mn;0;NSM;;;;;N;;;;;
+E0173;VARIATION SELECTOR-132;Mn;0;NSM;;;;;N;;;;;
+E0174;VARIATION SELECTOR-133;Mn;0;NSM;;;;;N;;;;;
+E0175;VARIATION SELECTOR-134;Mn;0;NSM;;;;;N;;;;;
+E0176;VARIATION SELECTOR-135;Mn;0;NSM;;;;;N;;;;;
+E0177;VARIATION SELECTOR-136;Mn;0;NSM;;;;;N;;;;;
+E0178;VARIATION SELECTOR-137;Mn;0;NSM;;;;;N;;;;;
+E0179;VARIATION SELECTOR-138;Mn;0;NSM;;;;;N;;;;;
+E017A;VARIATION SELECTOR-139;Mn;0;NSM;;;;;N;;;;;
+E017B;VARIATION SELECTOR-140;Mn;0;NSM;;;;;N;;;;;
+E017C;VARIATION SELECTOR-141;Mn;0;NSM;;;;;N;;;;;
+E017D;VARIATION SELECTOR-142;Mn;0;NSM;;;;;N;;;;;
+E017E;VARIATION SELECTOR-143;Mn;0;NSM;;;;;N;;;;;
+E017F;VARIATION SELECTOR-144;Mn;0;NSM;;;;;N;;;;;
+E0180;VARIATION SELECTOR-145;Mn;0;NSM;;;;;N;;;;;
+E0181;VARIATION SELECTOR-146;Mn;0;NSM;;;;;N;;;;;
+E0182;VARIATION SELECTOR-147;Mn;0;NSM;;;;;N;;;;;
+E0183;VARIATION SELECTOR-148;Mn;0;NSM;;;;;N;;;;;
+E0184;VARIATION SELECTOR-149;Mn;0;NSM;;;;;N;;;;;
+E0185;VARIATION SELECTOR-150;Mn;0;NSM;;;;;N;;;;;
+E0186;VARIATION SELECTOR-151;Mn;0;NSM;;;;;N;;;;;
+E0187;VARIATION SELECTOR-152;Mn;0;NSM;;;;;N;;;;;
+E0188;VARIATION SELECTOR-153;Mn;0;NSM;;;;;N;;;;;
+E0189;VARIATION SELECTOR-154;Mn;0;NSM;;;;;N;;;;;
+E018A;VARIATION SELECTOR-155;Mn;0;NSM;;;;;N;;;;;
+E018B;VARIATION SELECTOR-156;Mn;0;NSM;;;;;N;;;;;
+E018C;VARIATION SELECTOR-157;Mn;0;NSM;;;;;N;;;;;
+E018D;VARIATION SELECTOR-158;Mn;0;NSM;;;;;N;;;;;
+E018E;VARIATION SELECTOR-159;Mn;0;NSM;;;;;N;;;;;
+E018F;VARIATION SELECTOR-160;Mn;0;NSM;;;;;N;;;;;
+E0190;VARIATION SELECTOR-161;Mn;0;NSM;;;;;N;;;;;
+E0191;VARIATION SELECTOR-162;Mn;0;NSM;;;;;N;;;;;
+E0192;VARIATION SELECTOR-163;Mn;0;NSM;;;;;N;;;;;
+E0193;VARIATION SELECTOR-164;Mn;0;NSM;;;;;N;;;;;
+E0194;VARIATION SELECTOR-165;Mn;0;NSM;;;;;N;;;;;
+E0195;VARIATION SELECTOR-166;Mn;0;NSM;;;;;N;;;;;
+E0196;VARIATION SELECTOR-167;Mn;0;NSM;;;;;N;;;;;
+E0197;VARIATION SELECTOR-168;Mn;0;NSM;;;;;N;;;;;
+E0198;VARIATION SELECTOR-169;Mn;0;NSM;;;;;N;;;;;
+E0199;VARIATION SELECTOR-170;Mn;0;NSM;;;;;N;;;;;
+E019A;VARIATION SELECTOR-171;Mn;0;NSM;;;;;N;;;;;
+E019B;VARIATION SELECTOR-172;Mn;0;NSM;;;;;N;;;;;
+E019C;VARIATION SELECTOR-173;Mn;0;NSM;;;;;N;;;;;
+E019D;VARIATION SELECTOR-174;Mn;0;NSM;;;;;N;;;;;
+E019E;VARIATION SELECTOR-175;Mn;0;NSM;;;;;N;;;;;
+E019F;VARIATION SELECTOR-176;Mn;0;NSM;;;;;N;;;;;
+E01A0;VARIATION SELECTOR-177;Mn;0;NSM;;;;;N;;;;;
+E01A1;VARIATION SELECTOR-178;Mn;0;NSM;;;;;N;;;;;
+E01A2;VARIATION SELECTOR-179;Mn;0;NSM;;;;;N;;;;;
+E01A3;VARIATION SELECTOR-180;Mn;0;NSM;;;;;N;;;;;
+E01A4;VARIATION SELECTOR-181;Mn;0;NSM;;;;;N;;;;;
+E01A5;VARIATION SELECTOR-182;Mn;0;NSM;;;;;N;;;;;
+E01A6;VARIATION SELECTOR-183;Mn;0;NSM;;;;;N;;;;;
+E01A7;VARIATION SELECTOR-184;Mn;0;NSM;;;;;N;;;;;
+E01A8;VARIATION SELECTOR-185;Mn;0;NSM;;;;;N;;;;;
+E01A9;VARIATION SELECTOR-186;Mn;0;NSM;;;;;N;;;;;
+E01AA;VARIATION SELECTOR-187;Mn;0;NSM;;;;;N;;;;;
+E01AB;VARIATION SELECTOR-188;Mn;0;NSM;;;;;N;;;;;
+E01AC;VARIATION SELECTOR-189;Mn;0;NSM;;;;;N;;;;;
+E01AD;VARIATION SELECTOR-190;Mn;0;NSM;;;;;N;;;;;
+E01AE;VARIATION SELECTOR-191;Mn;0;NSM;;;;;N;;;;;
+E01AF;VARIATION SELECTOR-192;Mn;0;NSM;;;;;N;;;;;
+E01B0;VARIATION SELECTOR-193;Mn;0;NSM;;;;;N;;;;;
+E01B1;VARIATION SELECTOR-194;Mn;0;NSM;;;;;N;;;;;
+E01B2;VARIATION SELECTOR-195;Mn;0;NSM;;;;;N;;;;;
+E01B3;VARIATION SELECTOR-196;Mn;0;NSM;;;;;N;;;;;
+E01B4;VARIATION SELECTOR-197;Mn;0;NSM;;;;;N;;;;;
+E01B5;VARIATION SELECTOR-198;Mn;0;NSM;;;;;N;;;;;
+E01B6;VARIATION SELECTOR-199;Mn;0;NSM;;;;;N;;;;;
+E01B7;VARIATION SELECTOR-200;Mn;0;NSM;;;;;N;;;;;
+E01B8;VARIATION SELECTOR-201;Mn;0;NSM;;;;;N;;;;;
+E01B9;VARIATION SELECTOR-202;Mn;0;NSM;;;;;N;;;;;
+E01BA;VARIATION SELECTOR-203;Mn;0;NSM;;;;;N;;;;;
+E01BB;VARIATION SELECTOR-204;Mn;0;NSM;;;;;N;;;;;
+E01BC;VARIATION SELECTOR-205;Mn;0;NSM;;;;;N;;;;;
+E01BD;VARIATION SELECTOR-206;Mn;0;NSM;;;;;N;;;;;
+E01BE;VARIATION SELECTOR-207;Mn;0;NSM;;;;;N;;;;;
+E01BF;VARIATION SELECTOR-208;Mn;0;NSM;;;;;N;;;;;
+E01C0;VARIATION SELECTOR-209;Mn;0;NSM;;;;;N;;;;;
+E01C1;VARIATION SELECTOR-210;Mn;0;NSM;;;;;N;;;;;
+E01C2;VARIATION SELECTOR-211;Mn;0;NSM;;;;;N;;;;;
+E01C3;VARIATION SELECTOR-212;Mn;0;NSM;;;;;N;;;;;
+E01C4;VARIATION SELECTOR-213;Mn;0;NSM;;;;;N;;;;;
+E01C5;VARIATION SELECTOR-214;Mn;0;NSM;;;;;N;;;;;
+E01C6;VARIATION SELECTOR-215;Mn;0;NSM;;;;;N;;;;;
+E01C7;VARIATION SELECTOR-216;Mn;0;NSM;;;;;N;;;;;
+E01C8;VARIATION SELECTOR-217;Mn;0;NSM;;;;;N;;;;;
+E01C9;VARIATION SELECTOR-218;Mn;0;NSM;;;;;N;;;;;
+E01CA;VARIATION SELECTOR-219;Mn;0;NSM;;;;;N;;;;;
+E01CB;VARIATION SELECTOR-220;Mn;0;NSM;;;;;N;;;;;
+E01CC;VARIATION SELECTOR-221;Mn;0;NSM;;;;;N;;;;;
+E01CD;VARIATION SELECTOR-222;Mn;0;NSM;;;;;N;;;;;
+E01CE;VARIATION SELECTOR-223;Mn;0;NSM;;;;;N;;;;;
+E01CF;VARIATION SELECTOR-224;Mn;0;NSM;;;;;N;;;;;
+E01D0;VARIATION SELECTOR-225;Mn;0;NSM;;;;;N;;;;;
+E01D1;VARIATION SELECTOR-226;Mn;0;NSM;;;;;N;;;;;
+E01D2;VARIATION SELECTOR-227;Mn;0;NSM;;;;;N;;;;;
+E01D3;VARIATION SELECTOR-228;Mn;0;NSM;;;;;N;;;;;
+E01D4;VARIATION SELECTOR-229;Mn;0;NSM;;;;;N;;;;;
+E01D5;VARIATION SELECTOR-230;Mn;0;NSM;;;;;N;;;;;
+E01D6;VARIATION SELECTOR-231;Mn;0;NSM;;;;;N;;;;;
+E01D7;VARIATION SELECTOR-232;Mn;0;NSM;;;;;N;;;;;
+E01D8;VARIATION SELECTOR-233;Mn;0;NSM;;;;;N;;;;;
+E01D9;VARIATION SELECTOR-234;Mn;0;NSM;;;;;N;;;;;
+E01DA;VARIATION SELECTOR-235;Mn;0;NSM;;;;;N;;;;;
+E01DB;VARIATION SELECTOR-236;Mn;0;NSM;;;;;N;;;;;
+E01DC;VARIATION SELECTOR-237;Mn;0;NSM;;;;;N;;;;;
+E01DD;VARIATION SELECTOR-238;Mn;0;NSM;;;;;N;;;;;
+E01DE;VARIATION SELECTOR-239;Mn;0;NSM;;;;;N;;;;;
+E01DF;VARIATION SELECTOR-240;Mn;0;NSM;;;;;N;;;;;
+E01E0;VARIATION SELECTOR-241;Mn;0;NSM;;;;;N;;;;;
+E01E1;VARIATION SELECTOR-242;Mn;0;NSM;;;;;N;;;;;
+E01E2;VARIATION SELECTOR-243;Mn;0;NSM;;;;;N;;;;;
+E01E3;VARIATION SELECTOR-244;Mn;0;NSM;;;;;N;;;;;
+E01E4;VARIATION SELECTOR-245;Mn;0;NSM;;;;;N;;;;;
+E01E5;VARIATION SELECTOR-246;Mn;0;NSM;;;;;N;;;;;
+E01E6;VARIATION SELECTOR-247;Mn;0;NSM;;;;;N;;;;;
+E01E7;VARIATION SELECTOR-248;Mn;0;NSM;;;;;N;;;;;
+E01E8;VARIATION SELECTOR-249;Mn;0;NSM;;;;;N;;;;;
+E01E9;VARIATION SELECTOR-250;Mn;0;NSM;;;;;N;;;;;
+E01EA;VARIATION SELECTOR-251;Mn;0;NSM;;;;;N;;;;;
+E01EB;VARIATION SELECTOR-252;Mn;0;NSM;;;;;N;;;;;
+E01EC;VARIATION SELECTOR-253;Mn;0;NSM;;;;;N;;;;;
+E01ED;VARIATION SELECTOR-254;Mn;0;NSM;;;;;N;;;;;
+E01EE;VARIATION SELECTOR-255;Mn;0;NSM;;;;;N;;;;;
+E01EF;VARIATION SELECTOR-256;Mn;0;NSM;;;;;N;;;;;
+F0000;<Plane 15 Private Use, First>;Co;0;L;;;;;N;;;;;
+FFFFD;<Plane 15 Private Use, Last>;Co;0;L;;;;;N;;;;;
+100000;<Plane 16 Private Use, First>;Co;0;L;;;;;N;;;;;
+10FFFD;<Plane 16 Private Use, Last>;Co;0;L;;;;;N;;;;;
diff --git a/util/import_bidi.py b/util/import_bidi.py
new file mode 100644
index 000000000..543174ad9
--- /dev/null
+++ b/util/import_bidi.py
@@ -0,0 +1,52 @@
+#*
+#*  GRUB  --  GRand Unified Bootloader
+#*  Copyright (C) 2010  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/>.
+#*
+
+import re
+import sys
+import os
+import datetime
+
+if len (sys.argv) < 3:
+    print ("Usage: %s SOURCE DESTINATION" % sys.argv[0])
+    exit (0)
+infile = open (sys.argv[1], "r")
+outfile = open (sys.argv[2], "w")
+outfile.write ("#include <grub/bidi.h>\n")
+outfile.write ("\n")
+outfile.write ("struct grub_bidi_compact_range grub_bidi_compact[] = {\n")
+
+begin = -2
+last = -2
+lasttype = "X"
+for line in infile:
+    sp = line.split (";")
+    cur = int (sp[0], 16)
+    curtype = sp[4]
+    if last + 1 != cur or curtype != lasttype:
+        if begin != -2 and lasttype != "L":
+            outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s},\n" \
+                                % (begin, last, lasttype)))
+        begin = cur
+    last = cur
+    lasttype = curtype
+if lasttype != "L":
+    outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s},\n" \
+                        % (begin, last, lasttype)))
+outfile.write ("{0, 0, 0},\n")
+
+outfile.write ("};")

From 82b6651ab7492efb16a87b2ed988a010d8000986 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 6 Jan 2010 22:18:31 +0100
Subject: [PATCH 0212/1628] Add missing levels reversing

---
 font/font.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/font/font.c b/font/font.c
index 8823bc6d3..cd5908d5c 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1131,12 +1131,15 @@ grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
   void revert (unsigned start, unsigned end)
   {
     grub_uint32_t t;
-    unsigned k;
+    unsigned k, tl;
     for (k = 0; k <= (end - start) / 2; k++)
       {
 	t = no_markers[start+k];
 	no_markers[start+k] = no_markers[end-k];
 	no_markers[end-k] = t;
+	tl = levels[start+k];
+	levels[start+k] = levels[end-k];
+	levels[end-k] = tl;
       }
   }
 

From 34d2c9a10faf2abb7d4dc1562b272f692008a878 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 6 Jan 2010 22:19:28 +0100
Subject: [PATCH 0213/1628] Fix compilation error

---
 gfxmenu/gui_progress_bar.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gfxmenu/gui_progress_bar.c b/gfxmenu/gui_progress_bar.c
index 6a7f43962..550b5d43c 100644
--- a/gfxmenu/gui_progress_bar.c
+++ b/gfxmenu/gui_progress_bar.c
@@ -163,14 +163,15 @@ draw_text (grub_gui_progress_bar_t self)
       grub_video_color_t text_color = grub_gui_map_color (self->text_color);
       int width = self->bounds.width;
       int height = self->bounds.height;
-      char *text = grub_asprintf (self->template,
-				  self->value > 0 ? self->value : -self->value);
+      char *text = grub_malloc (grub_strlen (self->template) + 10);
       if (!text)
 	{
 	  grub_print_error ();
 	  grub_errno = GRUB_ERR_NONE;
 	  return;
 	}
+      grub_sprintf (text, self->template,
+		    self->value > 0 ? self->value : -self->value);
       /* Center the text. */
       int text_width = grub_font_get_string_width (font, text);
       int x = (width - text_width) / 2;

From 72f12cdcd93ddf25c74770d931b3e82b3711815b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 7 Jan 2010 16:37:53 +0100
Subject: [PATCH 0214/1628] Group combining diacritics

---
 autogen.sh                         |    2 +-
 font/font.c                        |  344 ++++++--
 include/grub/{bidi.h => unicode.h} |   40 +-
 unidata.c                          | 1169 +++++++++++++++++-----------
 util/grub-mkfont.c                 |    3 +
 util/import_bidi.py                |   52 --
 util/import_unicode.py             |   67 ++
 7 files changed, 1116 insertions(+), 561 deletions(-)
 rename include/grub/{bidi.h => unicode.h} (57%)
 delete mode 100644 util/import_bidi.py
 create mode 100644 util/import_unicode.py

diff --git a/autogen.sh b/autogen.sh
index 7aac1c534..5d0b5a282 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,7 +13,7 @@ echo timestamp > stamp-h.in
 
 python util/import_gcry.py lib/libgcrypt/ .
 
-python util/import_bidi.py util/UnicodeData.txt unidata.c
+python util/import_unicode.py util/UnicodeData.txt unidata.c
 
 for rmk in conf/*.rmk ${GRUB_CONTRIB}/*/conf/*.rmk; do
   if test -e $rmk ; then
diff --git a/font/font.c b/font/font.c
index cd5908d5c..54b6a1048 100644
--- a/font/font.c
+++ b/font/font.c
@@ -27,7 +27,7 @@
 #include <grub/video.h>
 #include <grub/bitmap.h>
 #include <grub/charset.h>
-#include <grub/bidi.h>
+#include <grub/unicode.h>
 
 #ifndef FONT_DEBUG
 #define FONT_DEBUG 0
@@ -882,7 +882,10 @@ grub_font_get_string_width (grub_font_t font, const char *str)
        grub_utf8_to_ucs4 (&code, 1, ptr, -1, &ptr) > 0; )
     {
       glyph = grub_font_get_glyph_with_fallback (font, code);
-      width += glyph->device_width;
+      if (glyph)
+	width += glyph->device_width;
+      else
+	width += unknown_glyph->device_width;
     }
 
   return width;
@@ -989,13 +992,210 @@ grub_font_get_glyph_with_fallback (grub_font_t font, grub_uint32_t code)
         }
     }
 
-  if (best_glyph)
-    return best_glyph;
-  else
-    /* Glyph not available in any font.  Return unknown glyph.  */
-    return unknown_glyph;
+  return best_glyph;
 }
 
+static struct grub_font_glyph *
+grub_font_dup_glyph (struct grub_font_glyph *glyph)
+{
+  static struct grub_font_glyph *ret;
+  ret = grub_malloc (sizeof (*ret) + (glyph->width * glyph->height + 7) / 8);
+  if (!ret)
+    return NULL;
+  grub_memcpy (ret, glyph, sizeof (*ret)
+	       + (glyph->width * glyph->height + 7) / 8);
+  return ret;
+}
+
+/* FIXME: suboptimal.  */
+static void
+grub_font_blit_glyph (struct grub_font_glyph *target,
+		      struct grub_font_glyph *src,
+		      unsigned dx, unsigned dy)
+{
+  unsigned src_bit, tgt_bit, src_byte, tgt_byte;
+  unsigned i, j;
+  for (i = 0; i < src->height; i++)
+    {
+      src_bit = (src->width * i) % 8;
+      src_byte = (src->width * i) / 8;
+      tgt_bit = (target->width * (dy + i) + dx) % 8;
+      tgt_byte = (target->width * (dy + i) + dx) / 8;
+      for (j = 0; j < src->width; j++)
+	{
+	  target->bitmap[tgt_byte] |= ((src->bitmap[src_byte] << src_bit)
+				       & 0x80) >> tgt_bit;
+	  src_bit++;
+	  tgt_bit++;
+	  if (src_bit == 8)
+	    {
+	      src_byte++;
+	      src_bit = 0;
+	    }
+	  if (tgt_bit == 8)
+	    {
+	      tgt_byte++;
+	      tgt_bit = 0;
+	    }
+	}
+    }
+}
+
+static inline enum grub_comb_type
+get_comb_type (grub_uint32_t c)
+{
+  static grub_uint8_t *comb_types = NULL;
+  struct grub_unicode_compact_range *cur;
+
+  if (!comb_types)
+    {
+      unsigned i;
+      comb_types = grub_zalloc (GRUB_UNICODE_MAX_CACHED_CHAR);
+      if (comb_types)
+	for (cur = grub_unicode_compact; cur->end; cur++)
+	  for (i = cur->start; i <= cur->end
+		 && i < GRUB_UNICODE_MAX_CACHED_CHAR; i++)
+	    comb_types[i] = cur->comb_type;
+      else
+	grub_errno = GRUB_ERR_NONE;
+    }
+
+  if (comb_types && c < GRUB_UNICODE_MAX_CACHED_CHAR)
+    return comb_types[c];
+
+  for (cur = grub_unicode_compact; cur->end; cur++)
+    if (cur->start <= c && c <= cur->end)
+      return cur->comb_type;
+
+  return GRUB_BIDI_TYPE_L;
+}
+
+static struct grub_font_glyph *
+grub_font_construct_glyph (grub_font_t hinted_font,
+			   const struct grub_unicode_glyph *glyph_id)
+{
+  grub_font_t font;
+  grub_uint16_t width;
+  grub_uint16_t height;
+  grub_int16_t offset_x;
+  grub_int16_t offset_y;
+  grub_uint16_t device_width;
+  struct grub_font_glyph *main_glyph;
+  struct grub_font_glyph **combining_glyphs;
+  unsigned i;
+  struct grub_font_glyph *glyph;
+
+  main_glyph = grub_font_get_glyph_with_fallback (hinted_font, glyph_id->base);
+
+  if (!main_glyph)
+    {
+      /* Glyph not available in any font.  Return unknown glyph.  */
+      return grub_font_dup_glyph (unknown_glyph);
+    }
+
+  if (!glyph_id->ncomb)
+    return grub_font_dup_glyph (main_glyph);
+
+  combining_glyphs = grub_malloc (sizeof (combining_glyphs[0])
+				  * glyph_id->ncomb);
+  if (!combining_glyphs)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      return grub_font_dup_glyph (main_glyph);
+    }
+  
+  font = main_glyph->font;
+  width = main_glyph->width;
+  height = main_glyph->height;
+  offset_x = main_glyph->offset_x;
+  offset_y = main_glyph->offset_y;
+  device_width = main_glyph->device_width;
+
+  for (i = 0; i < glyph_id->ncomb; i++)
+    {
+      enum grub_comb_type combtype;
+      combining_glyphs[i]
+	= grub_font_get_glyph_with_fallback (font, glyph_id->combining[i]);
+      if (!combining_glyphs[i])
+	continue;
+      combtype = get_comb_type (glyph_id->combining[i]);
+      switch (combtype)
+	{
+	default:
+	  {
+	    /* Default handling. Just draw combining character on top
+	       of base character.
+	       FIXME: support more unicode types correctly.
+	    */
+	    grub_int16_t nx = main_glyph->device_width
+	      + combining_glyphs[i]->offset_x;
+
+	    device_width += combining_glyphs[i]->device_width;
+	    if (nx < offset_x)
+	      {
+		width += offset_x - nx;
+		offset_x = nx;
+	      }
+	    if (offset_y > combining_glyphs[i]->offset_y)
+	      {
+		height += offset_y - combining_glyphs[i]->offset_y;
+		offset_y = combining_glyphs[i]->offset_y;
+	      }
+	    if (nx + combining_glyphs[i]->width - offset_x >= width)
+	      width = nx + combining_glyphs[i]->width - offset_x + 1;
+	    if (height
+		< (combining_glyphs[i]->height 
+		   + combining_glyphs[i]->offset_y) - offset_y)
+	      height = (combining_glyphs[i]->height 
+			+ combining_glyphs[i]->offset_y) - offset_y;
+	  }
+	}
+    }
+
+  glyph = grub_zalloc (sizeof (*glyph) + (width * height + 7) / 8);
+  if (!glyph)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      return grub_font_dup_glyph (main_glyph);
+    }
+
+  glyph->font = font;
+  glyph->width = width;
+  glyph->height = height;
+  glyph->offset_x = offset_x;
+  glyph->offset_y = offset_y;
+  glyph->device_width = device_width;
+
+  grub_font_blit_glyph (glyph, main_glyph, main_glyph->offset_x - offset_x,
+			(height + offset_y)
+			- (main_glyph->height + main_glyph->offset_y));
+
+  for (i = 0; i < glyph_id->ncomb; i++)
+    {
+      enum grub_comb_type combtype;
+      if (!combining_glyphs[i])
+	continue;
+      combtype = get_comb_type (glyph_id->combining[i]);
+      switch (combtype)
+	{
+	default:
+	  {
+	    /* Default handling. Just draw combining character on top
+	       of base character.
+	       FIXME: support more unicode types correctly.
+	    */
+	    grub_font_blit_glyph (glyph, combining_glyphs[i],
+				  main_glyph->device_width
+				  + combining_glyphs[i]->offset_x - offset_x,
+				  (height + offset_y)
+				  - (combining_glyphs[i]->height 
+				     + combining_glyphs[i]->offset_y));
+	  }
+	}
+    }
+
+  return glyph;
+}
 
 /* Draw the specified glyph at (x, y).  The y coordinate designates the
    baseline of the character, while the x coordinate designates the left
@@ -1051,27 +1251,27 @@ static inline enum grub_bidi_type
 get_bidi_type (grub_uint32_t c)
 {
   static grub_uint8_t *bidi_types = NULL;
-  struct grub_bidi_compact_range *cur;
+  struct grub_unicode_compact_range *cur;
 
   if (!bidi_types)
     {
       unsigned i;
-      bidi_types = grub_zalloc (GRUB_BIDI_MAX_CACHED_UNICODE_CHAR);
+      bidi_types = grub_zalloc (GRUB_UNICODE_MAX_CACHED_CHAR);
       if (bidi_types)
-	for (cur = grub_bidi_compact; cur->end; cur++)
+	for (cur = grub_unicode_compact; cur->end; cur++)
 	  for (i = cur->start; i <= cur->end
-		 && i < GRUB_BIDI_MAX_CACHED_UNICODE_CHAR; i++)
-	    bidi_types[i] = cur->type;
+		 && i < GRUB_UNICODE_MAX_CACHED_CHAR; i++)
+	    bidi_types[i] = cur->bidi_type;
       else
 	grub_errno = GRUB_ERR_NONE;
     }
 
-  if (bidi_types && c < GRUB_BIDI_MAX_CACHED_UNICODE_CHAR)
+  if (bidi_types && c < GRUB_UNICODE_MAX_CACHED_CHAR)
     return bidi_types[c];
 
-  for (cur = grub_bidi_compact; cur->end; cur++)
+  for (cur = grub_unicode_compact; cur->end; cur++)
     if (cur->start <= c && c <= cur->end)
-      return cur->type;
+      return cur->bidi_type;
 
   return GRUB_BIDI_TYPE_L;
 }
@@ -1079,7 +1279,7 @@ get_bidi_type (grub_uint32_t c)
 static grub_ssize_t
 grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
 				 grub_size_t logical_len,
-				 grub_uint32_t **visual)
+				 struct grub_unicode_glyph **visual_out)
 {
   enum grub_bidi_type type = GRUB_BIDI_TYPE_L;
   enum override_status {OVERRIDE_NEUTRAL = 0, OVERRIDE_R, OVERRIDE_L};
@@ -1092,9 +1292,9 @@ grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
   enum override_status stack_override[GRUB_BIDI_MAX_EXPLICIT_LEVEL + 3];
   unsigned stack_depth = 0;
   unsigned invalid_pushes = 0;
-  unsigned no_markers_len = 0;
+  unsigned visual_len = 0;
   unsigned run_start, run_end;
-  grub_uint32_t *no_markers;
+  struct grub_unicode_glyph *visual;
   unsigned cur_level;
 
   auto void push_stack (unsigned new_override, unsigned new_level);
@@ -1130,13 +1330,13 @@ grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
   auto void revert (unsigned start, unsigned end);
   void revert (unsigned start, unsigned end)
   {
-    grub_uint32_t t;
+    struct grub_unicode_glyph t;
     unsigned k, tl;
     for (k = 0; k <= (end - start) / 2; k++)
       {
-	t = no_markers[start+k];
-	no_markers[start+k] = no_markers[end-k];
-	no_markers[end-k] = t;
+	t = visual[start+k];
+	visual[start+k] = visual[end-k];
+	visual[end-k] = t;
 	tl = levels[start+k];
 	levels[start+k] = levels[end-k];
 	levels[end-k] = tl;
@@ -1154,8 +1354,8 @@ grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
       return -1;
     }
 
-  no_markers = grub_malloc (sizeof (resolved_types[0]) * logical_len);
-  if (!no_markers)
+  visual = grub_malloc (sizeof (visual[0]) * logical_len);
+  if (!visual)
     {
       grub_free (resolved_types);
       grub_free (levels);
@@ -1178,6 +1378,27 @@ grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
   cur_override = OVERRIDE_NEUTRAL;
   for (i = 0; i < logical_len; i++)
     {
+      /* Variation selectors >= 17 are outside of BMP and SMP. 
+	 Handle variation selectors first to avoid potentially costly lookups.
+       */
+      if (logical[i] >= GRUB_UNICODE_VARIATION_SELECTOR_1
+	  && logical[i] <= GRUB_UNICODE_VARIATION_SELECTOR_16)
+	{
+	  if (!visual_len)
+	    continue;
+	  visual[visual_len - 1].variant
+	    = logical[i] - GRUB_UNICODE_VARIATION_SELECTOR_1 + 1;
+	}
+      if (logical[i] >= GRUB_UNICODE_VARIATION_SELECTOR_17
+	  && logical[i] <= GRUB_UNICODE_VARIATION_SELECTOR_256)
+	{
+	  if (!visual_len)
+	    continue;
+	  visual[visual_len - 1].variant
+	    = logical[i] - GRUB_UNICODE_VARIATION_SELECTOR_17 + 17;
+	  continue;
+	}
+
       type = get_bidi_type (logical[i]);
       switch (type)
 	{
@@ -1199,28 +1420,54 @@ grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
 	case GRUB_BIDI_TYPE_BN:
 	  break;
 	default:
-	  levels[no_markers_len] = cur_level;
-	  if (cur_override != OVERRIDE_NEUTRAL)
-	    resolved_types[no_markers_len] = 
-	      (cur_override == OVERRIDE_L) ? GRUB_BIDI_TYPE_L : GRUB_BIDI_TYPE_R;
-	  else
-	    resolved_types[no_markers_len] = type;
-	  no_markers[no_markers_len] = logical[i];
-	  no_markers_len++;
+	  {
+	    enum grub_comb_type comb_type;
+	    comb_type = get_comb_type (logical[i]);
+	    if (comb_type)
+	      {
+		grub_uint32_t *n;
+		if (!visual_len)
+		  break;
+		n = grub_realloc (visual[visual_len - 1].combining, 
+				  sizeof (grub_uint32_t)
+				  * (visual[visual_len - 1].ncomb + 1));
+		if (!n)
+		  {
+		    grub_errno = GRUB_ERR_NONE;
+		    break;
+		  }
+		visual[visual_len - 1].combining = n;
+		visual[visual_len - 1].combining[visual[visual_len - 1].ncomb]
+		  = logical[i];
+		visual[visual_len - 1].ncomb++;
+		break;
+	      }
+	    levels[visual_len] = cur_level;
+	    if (cur_override != OVERRIDE_NEUTRAL)
+	      resolved_types[visual_len] = 
+		(cur_override == OVERRIDE_L) ? GRUB_BIDI_TYPE_L : GRUB_BIDI_TYPE_R;
+	    else
+	      resolved_types[visual_len] = type;
+	    visual[visual_len].base = logical[i];
+	    visual[visual_len].variant = 0;
+	    visual[visual_len].ncomb = 0;
+	    visual[visual_len].combining = NULL;
+	    visual_len++;
+	  }
 	}
     }
 
-  for (run_start = 0; run_start < no_markers_len; run_start = run_end)
+  for (run_start = 0; run_start < visual_len; run_start = run_end)
     {
       unsigned prev_level, next_level, cur_run_level;
       unsigned last_type, last_strong_type;
-      for (run_end = run_start; run_end < no_markers_len &&
+      for (run_end = run_start; run_end < visual_len &&
 	     levels[run_end] == levels[run_start]; run_end++);
       if (run_start == 0)
 	prev_level = base_level;
       else
 	prev_level = levels[run_start - 1];
-      if (run_end == no_markers_len)
+      if (run_end == visual_len)
 	next_level = base_level;
       else
 	next_level = levels[run_end];
@@ -1350,7 +1597,7 @@ grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
 	}
     }
 
-  for (i = 0; i < no_markers_len; i++)
+  for (i = 0; i < visual_len; i++)
     {
       if (!(levels[i] & 1) && resolved_types[i] == GRUB_BIDI_TYPE_R)
 	{
@@ -1377,7 +1624,7 @@ grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
     unsigned min_odd_level = 0xffffffff;
     unsigned max_level = 0;
     unsigned j;
-    for (i = 0; i < no_markers_len; i++)
+    for (i = 0; i < visual_len; i++)
       {
 	if (levels[i] > max_level)
 	  max_level = levels[i];
@@ -1387,11 +1634,11 @@ grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
     for (j = max_level; j >= min_odd_level; j--)
       {
 	unsigned in = 0;
-	for (i = 0; i < no_markers_len; i++)
+	for (i = 0; i < visual_len; i++)
 	  {
 	    if (i != 0 && levels[i] >= j && levels[i-1] < j)
 	      in = i;
-	    if (levels[i] >= j && (i + 1 == no_markers_len || levels[i+1] < j))
+	    if (levels[i] >= j && (i + 1 == visual_len || levels[i+1] < j))
 	      revert (in, i);
 	  }
       }
@@ -1399,8 +1646,8 @@ grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
 
   grub_free (levels);
 
-  *visual = no_markers;
-  return no_markers_len;
+  *visual_out = visual;
+  return visual_len;
 }
 
 /* Draw a UTF-8 string of text on the current video render target.
@@ -1415,8 +1662,9 @@ grub_font_draw_string (const char *str, grub_font_t font,
 {
   int x;
   struct grub_font_glyph *glyph;
-  grub_uint32_t *logical, *visual, *ptr;
+  grub_uint32_t *logical;
   grub_ssize_t logical_len, visual_len;
+  struct grub_unicode_glyph *visual, *ptr;
 
   logical_len = grub_utf8_to_ucs4_alloc (str, &logical, 0);
   if (logical_len < 0)
@@ -1429,10 +1677,14 @@ grub_font_draw_string (const char *str, grub_font_t font,
 
   for (ptr = visual, x = left_x; ptr < visual + visual_len; ptr++)
     {
-      glyph = grub_font_get_glyph_with_fallback (font, *ptr);
-      if (grub_font_draw_glyph (glyph, color, x, baseline_y)
-          != GRUB_ERR_NONE)
-        return grub_errno;
+      grub_err_t err;
+      glyph = grub_font_construct_glyph (font, ptr);
+      if (!glyph)
+	return grub_errno;
+      err = grub_font_draw_glyph (glyph, color, x, baseline_y);
+      grub_free (glyph);
+      if (err)
+	return err;
       x += glyph->device_width;
     }
 
diff --git a/include/grub/bidi.h b/include/grub/unicode.h
similarity index 57%
rename from include/grub/bidi.h
rename to include/grub/unicode.h
index 8612d6e24..79d553eec 100644
--- a/include/grub/bidi.h
+++ b/include/grub/unicode.h
@@ -21,11 +21,12 @@
 
 #include <grub/types.h>
 
-struct grub_bidi_compact_range
+struct grub_unicode_compact_range
 {
-  grub_uint32_t start:24;
-  grub_uint32_t end:24;
-  grub_uint8_t type;
+  grub_uint32_t start:21;
+  grub_uint32_t end:21;
+  grub_uint8_t bidi_type:5;
+  grub_uint8_t comb_type;
 } __attribute__ ((packed));
 
 enum grub_bidi_type
@@ -51,9 +52,36 @@ enum grub_bidi_type
     GRUB_BIDI_TYPE_ON
   };
 
-extern struct grub_bidi_compact_range grub_bidi_compact[];
+enum grub_comb_type
+  {
+    GRUB_UNICODE_STACK_BELOW = 220,
+    GRUB_UNICODE_STACK_ABOVE = 230,
+    /* If combining nature is indicated only by class and
+       not "combining type".  */
+    GRUB_UNICODE_COMB_ME = 253,
+    GRUB_UNICODE_COMB_MC = 254,
+    GRUB_UNICODE_COMB_MN = 255,
+  };
 
-#define GRUB_BIDI_MAX_CACHED_UNICODE_CHAR 0x20000
+/* This structure describes a glyph as opposed to character.  */
+struct grub_unicode_glyph
+{
+  grub_uint32_t base;
+  /* Unicode permits 256 variation selectors but since we need a value
+     for "default" we have to use grub_uint16_t.  */
+  grub_uint16_t variant;
+  grub_size_t ncomb;
+  grub_uint32_t *combining;
+};
+
+#define GRUB_UNICODE_VARIATION_SELECTOR_1 0xfe00
+#define GRUB_UNICODE_VARIATION_SELECTOR_16 0xfe0f
+#define GRUB_UNICODE_VARIATION_SELECTOR_17 0xe0100
+#define GRUB_UNICODE_VARIATION_SELECTOR_256 0xe01ef
+
+extern struct grub_unicode_compact_range grub_unicode_compact[];
+
+#define GRUB_UNICODE_MAX_CACHED_CHAR 0x20000
 /*  Unicode mandates an arbitrary limit.  */
 #define GRUB_BIDI_MAX_EXPLICIT_LEVEL 61
 
diff --git a/unidata.c b/unidata.c
index f4467c920..02d0f9712 100644
--- a/unidata.c
+++ b/unidata.c
@@ -1,458 +1,715 @@
-#include <grub/bidi.h>
+#include <grub/unicode.h>
 
-struct grub_bidi_compact_range grub_bidi_compact[] = {
-{0x0, 0x8, GRUB_BIDI_TYPE_BN},
-{0x9, 0x9, GRUB_BIDI_TYPE_S},
-{0xa, 0xa, GRUB_BIDI_TYPE_B},
-{0xb, 0xb, GRUB_BIDI_TYPE_S},
-{0xc, 0xc, GRUB_BIDI_TYPE_WS},
-{0xd, 0xd, GRUB_BIDI_TYPE_B},
-{0xe, 0x1b, GRUB_BIDI_TYPE_BN},
-{0x1c, 0x1e, GRUB_BIDI_TYPE_B},
-{0x1f, 0x1f, GRUB_BIDI_TYPE_S},
-{0x20, 0x20, GRUB_BIDI_TYPE_WS},
-{0x21, 0x22, GRUB_BIDI_TYPE_ON},
-{0x23, 0x25, GRUB_BIDI_TYPE_ET},
-{0x26, 0x2a, GRUB_BIDI_TYPE_ON},
-{0x2b, 0x2b, GRUB_BIDI_TYPE_ES},
-{0x2c, 0x2c, GRUB_BIDI_TYPE_CS},
-{0x2d, 0x2d, GRUB_BIDI_TYPE_ES},
-{0x2e, 0x2f, GRUB_BIDI_TYPE_CS},
-{0x30, 0x39, GRUB_BIDI_TYPE_EN},
-{0x3a, 0x3a, GRUB_BIDI_TYPE_CS},
-{0x3b, 0x40, GRUB_BIDI_TYPE_ON},
-{0x5b, 0x60, GRUB_BIDI_TYPE_ON},
-{0x7b, 0x7e, GRUB_BIDI_TYPE_ON},
-{0x7f, 0x84, GRUB_BIDI_TYPE_BN},
-{0x85, 0x85, GRUB_BIDI_TYPE_B},
-{0x86, 0x9f, GRUB_BIDI_TYPE_BN},
-{0xa0, 0xa0, GRUB_BIDI_TYPE_CS},
-{0xa1, 0xa1, GRUB_BIDI_TYPE_ON},
-{0xa2, 0xa5, GRUB_BIDI_TYPE_ET},
-{0xa6, 0xa9, GRUB_BIDI_TYPE_ON},
-{0xab, 0xac, GRUB_BIDI_TYPE_ON},
-{0xad, 0xad, GRUB_BIDI_TYPE_BN},
-{0xae, 0xaf, GRUB_BIDI_TYPE_ON},
-{0xb0, 0xb1, GRUB_BIDI_TYPE_ET},
-{0xb2, 0xb3, GRUB_BIDI_TYPE_EN},
-{0xb4, 0xb4, GRUB_BIDI_TYPE_ON},
-{0xb6, 0xb8, GRUB_BIDI_TYPE_ON},
-{0xb9, 0xb9, GRUB_BIDI_TYPE_EN},
-{0xbb, 0xbf, GRUB_BIDI_TYPE_ON},
-{0xd7, 0xd7, GRUB_BIDI_TYPE_ON},
-{0xf7, 0xf7, GRUB_BIDI_TYPE_ON},
-{0x2b9, 0x2ba, GRUB_BIDI_TYPE_ON},
-{0x2c2, 0x2cf, GRUB_BIDI_TYPE_ON},
-{0x2d2, 0x2df, GRUB_BIDI_TYPE_ON},
-{0x2e5, 0x2ed, GRUB_BIDI_TYPE_ON},
-{0x2ef, 0x2ff, GRUB_BIDI_TYPE_ON},
-{0x300, 0x36f, GRUB_BIDI_TYPE_NSM},
-{0x374, 0x375, GRUB_BIDI_TYPE_ON},
-{0x37e, 0x37e, GRUB_BIDI_TYPE_ON},
-{0x384, 0x385, GRUB_BIDI_TYPE_ON},
-{0x387, 0x387, GRUB_BIDI_TYPE_ON},
-{0x3f6, 0x3f6, GRUB_BIDI_TYPE_ON},
-{0x483, 0x489, GRUB_BIDI_TYPE_NSM},
-{0x58a, 0x58a, GRUB_BIDI_TYPE_ON},
-{0x591, 0x5bd, GRUB_BIDI_TYPE_NSM},
-{0x5be, 0x5be, GRUB_BIDI_TYPE_R},
-{0x5bf, 0x5bf, GRUB_BIDI_TYPE_NSM},
-{0x5c0, 0x5c0, GRUB_BIDI_TYPE_R},
-{0x5c1, 0x5c2, GRUB_BIDI_TYPE_NSM},
-{0x5c3, 0x5c3, GRUB_BIDI_TYPE_R},
-{0x5c4, 0x5c5, GRUB_BIDI_TYPE_NSM},
-{0x5c6, 0x5c6, GRUB_BIDI_TYPE_R},
-{0x5c7, 0x5c7, GRUB_BIDI_TYPE_NSM},
-{0x5d0, 0x5ea, GRUB_BIDI_TYPE_R},
-{0x5f0, 0x5f4, GRUB_BIDI_TYPE_R},
-{0x600, 0x603, GRUB_BIDI_TYPE_AN},
-{0x606, 0x607, GRUB_BIDI_TYPE_ON},
-{0x608, 0x608, GRUB_BIDI_TYPE_AL},
-{0x609, 0x60a, GRUB_BIDI_TYPE_ET},
-{0x60b, 0x60b, GRUB_BIDI_TYPE_AL},
-{0x60c, 0x60c, GRUB_BIDI_TYPE_CS},
-{0x60d, 0x60d, GRUB_BIDI_TYPE_AL},
-{0x60e, 0x60f, GRUB_BIDI_TYPE_ON},
-{0x610, 0x61a, GRUB_BIDI_TYPE_NSM},
-{0x61b, 0x61b, GRUB_BIDI_TYPE_AL},
-{0x61e, 0x61f, GRUB_BIDI_TYPE_AL},
-{0x621, 0x64a, GRUB_BIDI_TYPE_AL},
-{0x64b, 0x65e, GRUB_BIDI_TYPE_NSM},
-{0x660, 0x669, GRUB_BIDI_TYPE_AN},
-{0x66a, 0x66a, GRUB_BIDI_TYPE_ET},
-{0x66b, 0x66c, GRUB_BIDI_TYPE_AN},
-{0x66d, 0x66f, GRUB_BIDI_TYPE_AL},
-{0x670, 0x670, GRUB_BIDI_TYPE_NSM},
-{0x671, 0x6d5, GRUB_BIDI_TYPE_AL},
-{0x6d6, 0x6dc, GRUB_BIDI_TYPE_NSM},
-{0x6dd, 0x6dd, GRUB_BIDI_TYPE_AN},
-{0x6de, 0x6e4, GRUB_BIDI_TYPE_NSM},
-{0x6e5, 0x6e6, GRUB_BIDI_TYPE_AL},
-{0x6e7, 0x6e8, GRUB_BIDI_TYPE_NSM},
-{0x6e9, 0x6e9, GRUB_BIDI_TYPE_ON},
-{0x6ea, 0x6ed, GRUB_BIDI_TYPE_NSM},
-{0x6ee, 0x6ef, GRUB_BIDI_TYPE_AL},
-{0x6f0, 0x6f9, GRUB_BIDI_TYPE_EN},
-{0x6fa, 0x70d, GRUB_BIDI_TYPE_AL},
-{0x70f, 0x70f, GRUB_BIDI_TYPE_BN},
-{0x710, 0x710, GRUB_BIDI_TYPE_AL},
-{0x711, 0x711, GRUB_BIDI_TYPE_NSM},
-{0x712, 0x72f, GRUB_BIDI_TYPE_AL},
-{0x730, 0x74a, GRUB_BIDI_TYPE_NSM},
-{0x74d, 0x7a5, GRUB_BIDI_TYPE_AL},
-{0x7a6, 0x7b0, GRUB_BIDI_TYPE_NSM},
-{0x7b1, 0x7b1, GRUB_BIDI_TYPE_AL},
-{0x7c0, 0x7ea, GRUB_BIDI_TYPE_R},
-{0x7eb, 0x7f3, GRUB_BIDI_TYPE_NSM},
-{0x7f4, 0x7f5, GRUB_BIDI_TYPE_R},
-{0x7f6, 0x7f9, GRUB_BIDI_TYPE_ON},
-{0x7fa, 0x7fa, GRUB_BIDI_TYPE_R},
-{0x901, 0x902, GRUB_BIDI_TYPE_NSM},
-{0x93c, 0x93c, GRUB_BIDI_TYPE_NSM},
-{0x941, 0x948, GRUB_BIDI_TYPE_NSM},
-{0x94d, 0x94d, GRUB_BIDI_TYPE_NSM},
-{0x951, 0x954, GRUB_BIDI_TYPE_NSM},
-{0x962, 0x963, GRUB_BIDI_TYPE_NSM},
-{0x981, 0x981, GRUB_BIDI_TYPE_NSM},
-{0x9bc, 0x9bc, GRUB_BIDI_TYPE_NSM},
-{0x9c1, 0x9c4, GRUB_BIDI_TYPE_NSM},
-{0x9cd, 0x9cd, GRUB_BIDI_TYPE_NSM},
-{0x9e2, 0x9e3, GRUB_BIDI_TYPE_NSM},
-{0x9f2, 0x9f3, GRUB_BIDI_TYPE_ET},
-{0xa01, 0xa02, GRUB_BIDI_TYPE_NSM},
-{0xa3c, 0xa3c, GRUB_BIDI_TYPE_NSM},
-{0xa41, 0xa42, GRUB_BIDI_TYPE_NSM},
-{0xa47, 0xa48, GRUB_BIDI_TYPE_NSM},
-{0xa4b, 0xa4d, GRUB_BIDI_TYPE_NSM},
-{0xa51, 0xa51, GRUB_BIDI_TYPE_NSM},
-{0xa70, 0xa71, GRUB_BIDI_TYPE_NSM},
-{0xa75, 0xa75, GRUB_BIDI_TYPE_NSM},
-{0xa81, 0xa82, GRUB_BIDI_TYPE_NSM},
-{0xabc, 0xabc, GRUB_BIDI_TYPE_NSM},
-{0xac1, 0xac5, GRUB_BIDI_TYPE_NSM},
-{0xac7, 0xac8, GRUB_BIDI_TYPE_NSM},
-{0xacd, 0xacd, GRUB_BIDI_TYPE_NSM},
-{0xae2, 0xae3, GRUB_BIDI_TYPE_NSM},
-{0xaf1, 0xaf1, GRUB_BIDI_TYPE_ET},
-{0xb01, 0xb01, GRUB_BIDI_TYPE_NSM},
-{0xb3c, 0xb3c, GRUB_BIDI_TYPE_NSM},
-{0xb3f, 0xb3f, GRUB_BIDI_TYPE_NSM},
-{0xb41, 0xb44, GRUB_BIDI_TYPE_NSM},
-{0xb4d, 0xb4d, GRUB_BIDI_TYPE_NSM},
-{0xb56, 0xb56, GRUB_BIDI_TYPE_NSM},
-{0xb62, 0xb63, GRUB_BIDI_TYPE_NSM},
-{0xb82, 0xb82, GRUB_BIDI_TYPE_NSM},
-{0xbc0, 0xbc0, GRUB_BIDI_TYPE_NSM},
-{0xbcd, 0xbcd, GRUB_BIDI_TYPE_NSM},
-{0xbf3, 0xbf8, GRUB_BIDI_TYPE_ON},
-{0xbf9, 0xbf9, GRUB_BIDI_TYPE_ET},
-{0xbfa, 0xbfa, GRUB_BIDI_TYPE_ON},
-{0xc3e, 0xc40, GRUB_BIDI_TYPE_NSM},
-{0xc46, 0xc48, GRUB_BIDI_TYPE_NSM},
-{0xc4a, 0xc4d, GRUB_BIDI_TYPE_NSM},
-{0xc55, 0xc56, GRUB_BIDI_TYPE_NSM},
-{0xc62, 0xc63, GRUB_BIDI_TYPE_NSM},
-{0xc78, 0xc7e, GRUB_BIDI_TYPE_ON},
-{0xcbc, 0xcbc, GRUB_BIDI_TYPE_NSM},
-{0xccc, 0xccd, GRUB_BIDI_TYPE_NSM},
-{0xce2, 0xce3, GRUB_BIDI_TYPE_NSM},
-{0xcf1, 0xcf2, GRUB_BIDI_TYPE_ON},
-{0xd41, 0xd44, GRUB_BIDI_TYPE_NSM},
-{0xd4d, 0xd4d, GRUB_BIDI_TYPE_NSM},
-{0xd62, 0xd63, GRUB_BIDI_TYPE_NSM},
-{0xdca, 0xdca, GRUB_BIDI_TYPE_NSM},
-{0xdd2, 0xdd4, GRUB_BIDI_TYPE_NSM},
-{0xdd6, 0xdd6, GRUB_BIDI_TYPE_NSM},
-{0xe31, 0xe31, GRUB_BIDI_TYPE_NSM},
-{0xe34, 0xe3a, GRUB_BIDI_TYPE_NSM},
-{0xe3f, 0xe3f, GRUB_BIDI_TYPE_ET},
-{0xe47, 0xe4e, GRUB_BIDI_TYPE_NSM},
-{0xeb1, 0xeb1, GRUB_BIDI_TYPE_NSM},
-{0xeb4, 0xeb9, GRUB_BIDI_TYPE_NSM},
-{0xebb, 0xebc, GRUB_BIDI_TYPE_NSM},
-{0xec8, 0xecd, GRUB_BIDI_TYPE_NSM},
-{0xf18, 0xf19, GRUB_BIDI_TYPE_NSM},
-{0xf35, 0xf35, GRUB_BIDI_TYPE_NSM},
-{0xf37, 0xf37, GRUB_BIDI_TYPE_NSM},
-{0xf39, 0xf39, GRUB_BIDI_TYPE_NSM},
-{0xf3a, 0xf3d, GRUB_BIDI_TYPE_ON},
-{0xf71, 0xf7e, GRUB_BIDI_TYPE_NSM},
-{0xf80, 0xf84, GRUB_BIDI_TYPE_NSM},
-{0xf86, 0xf87, GRUB_BIDI_TYPE_NSM},
-{0xf90, 0xf97, GRUB_BIDI_TYPE_NSM},
-{0xf99, 0xfbc, GRUB_BIDI_TYPE_NSM},
-{0xfc6, 0xfc6, GRUB_BIDI_TYPE_NSM},
-{0x102d, 0x1030, GRUB_BIDI_TYPE_NSM},
-{0x1032, 0x1037, GRUB_BIDI_TYPE_NSM},
-{0x1039, 0x103a, GRUB_BIDI_TYPE_NSM},
-{0x103d, 0x103e, GRUB_BIDI_TYPE_NSM},
-{0x1058, 0x1059, GRUB_BIDI_TYPE_NSM},
-{0x105e, 0x1060, GRUB_BIDI_TYPE_NSM},
-{0x1071, 0x1074, GRUB_BIDI_TYPE_NSM},
-{0x1082, 0x1082, GRUB_BIDI_TYPE_NSM},
-{0x1085, 0x1086, GRUB_BIDI_TYPE_NSM},
-{0x108d, 0x108d, GRUB_BIDI_TYPE_NSM},
-{0x135f, 0x135f, GRUB_BIDI_TYPE_NSM},
-{0x1390, 0x1399, GRUB_BIDI_TYPE_ON},
-{0x1680, 0x1680, GRUB_BIDI_TYPE_WS},
-{0x169b, 0x169c, GRUB_BIDI_TYPE_ON},
-{0x1712, 0x1714, GRUB_BIDI_TYPE_NSM},
-{0x1732, 0x1734, GRUB_BIDI_TYPE_NSM},
-{0x1752, 0x1753, GRUB_BIDI_TYPE_NSM},
-{0x1772, 0x1773, GRUB_BIDI_TYPE_NSM},
-{0x17b7, 0x17bd, GRUB_BIDI_TYPE_NSM},
-{0x17c6, 0x17c6, GRUB_BIDI_TYPE_NSM},
-{0x17c9, 0x17d3, GRUB_BIDI_TYPE_NSM},
-{0x17db, 0x17db, GRUB_BIDI_TYPE_ET},
-{0x17dd, 0x17dd, GRUB_BIDI_TYPE_NSM},
-{0x17f0, 0x17f9, GRUB_BIDI_TYPE_ON},
-{0x1800, 0x180a, GRUB_BIDI_TYPE_ON},
-{0x180b, 0x180d, GRUB_BIDI_TYPE_NSM},
-{0x180e, 0x180e, GRUB_BIDI_TYPE_WS},
-{0x18a9, 0x18a9, GRUB_BIDI_TYPE_NSM},
-{0x1920, 0x1922, GRUB_BIDI_TYPE_NSM},
-{0x1927, 0x1928, GRUB_BIDI_TYPE_NSM},
-{0x1932, 0x1932, GRUB_BIDI_TYPE_NSM},
-{0x1939, 0x193b, GRUB_BIDI_TYPE_NSM},
-{0x1940, 0x1940, GRUB_BIDI_TYPE_ON},
-{0x1944, 0x1945, GRUB_BIDI_TYPE_ON},
-{0x19de, 0x19ff, GRUB_BIDI_TYPE_ON},
-{0x1a17, 0x1a18, GRUB_BIDI_TYPE_NSM},
-{0x1b00, 0x1b03, GRUB_BIDI_TYPE_NSM},
-{0x1b34, 0x1b34, GRUB_BIDI_TYPE_NSM},
-{0x1b36, 0x1b3a, GRUB_BIDI_TYPE_NSM},
-{0x1b3c, 0x1b3c, GRUB_BIDI_TYPE_NSM},
-{0x1b42, 0x1b42, GRUB_BIDI_TYPE_NSM},
-{0x1b6b, 0x1b73, GRUB_BIDI_TYPE_NSM},
-{0x1b80, 0x1b81, GRUB_BIDI_TYPE_NSM},
-{0x1ba2, 0x1ba5, GRUB_BIDI_TYPE_NSM},
-{0x1ba8, 0x1ba9, GRUB_BIDI_TYPE_NSM},
-{0x1c2c, 0x1c33, GRUB_BIDI_TYPE_NSM},
-{0x1c36, 0x1c37, GRUB_BIDI_TYPE_NSM},
-{0x1dc0, 0x1de6, GRUB_BIDI_TYPE_NSM},
-{0x1dfe, 0x1dff, GRUB_BIDI_TYPE_NSM},
-{0x1fbd, 0x1fbd, GRUB_BIDI_TYPE_ON},
-{0x1fbf, 0x1fc1, GRUB_BIDI_TYPE_ON},
-{0x1fcd, 0x1fcf, GRUB_BIDI_TYPE_ON},
-{0x1fdd, 0x1fdf, GRUB_BIDI_TYPE_ON},
-{0x1fed, 0x1fef, GRUB_BIDI_TYPE_ON},
-{0x1ffd, 0x1ffe, GRUB_BIDI_TYPE_ON},
-{0x2000, 0x200a, GRUB_BIDI_TYPE_WS},
-{0x200b, 0x200d, GRUB_BIDI_TYPE_BN},
-{0x200f, 0x200f, GRUB_BIDI_TYPE_R},
-{0x2010, 0x2027, GRUB_BIDI_TYPE_ON},
-{0x2028, 0x2028, GRUB_BIDI_TYPE_WS},
-{0x2029, 0x2029, GRUB_BIDI_TYPE_B},
-{0x202a, 0x202a, GRUB_BIDI_TYPE_LRE},
-{0x202b, 0x202b, GRUB_BIDI_TYPE_RLE},
-{0x202c, 0x202c, GRUB_BIDI_TYPE_PDF},
-{0x202d, 0x202d, GRUB_BIDI_TYPE_LRO},
-{0x202e, 0x202e, GRUB_BIDI_TYPE_RLO},
-{0x202f, 0x202f, GRUB_BIDI_TYPE_CS},
-{0x2030, 0x2034, GRUB_BIDI_TYPE_ET},
-{0x2035, 0x2043, GRUB_BIDI_TYPE_ON},
-{0x2044, 0x2044, GRUB_BIDI_TYPE_CS},
-{0x2045, 0x205e, GRUB_BIDI_TYPE_ON},
-{0x205f, 0x205f, GRUB_BIDI_TYPE_WS},
-{0x2060, 0x2064, GRUB_BIDI_TYPE_BN},
-{0x206a, 0x206f, GRUB_BIDI_TYPE_BN},
-{0x2070, 0x2070, GRUB_BIDI_TYPE_EN},
-{0x2074, 0x2079, GRUB_BIDI_TYPE_EN},
-{0x207a, 0x207b, GRUB_BIDI_TYPE_ES},
-{0x207c, 0x207e, GRUB_BIDI_TYPE_ON},
-{0x2080, 0x2089, GRUB_BIDI_TYPE_EN},
-{0x208a, 0x208b, GRUB_BIDI_TYPE_ES},
-{0x208c, 0x208e, GRUB_BIDI_TYPE_ON},
-{0x20a0, 0x20b5, GRUB_BIDI_TYPE_ET},
-{0x20d0, 0x20f0, GRUB_BIDI_TYPE_NSM},
-{0x2100, 0x2101, GRUB_BIDI_TYPE_ON},
-{0x2103, 0x2106, GRUB_BIDI_TYPE_ON},
-{0x2108, 0x2109, GRUB_BIDI_TYPE_ON},
-{0x2114, 0x2114, GRUB_BIDI_TYPE_ON},
-{0x2116, 0x2118, GRUB_BIDI_TYPE_ON},
-{0x211e, 0x2123, GRUB_BIDI_TYPE_ON},
-{0x2125, 0x2125, GRUB_BIDI_TYPE_ON},
-{0x2127, 0x2127, GRUB_BIDI_TYPE_ON},
-{0x2129, 0x2129, GRUB_BIDI_TYPE_ON},
-{0x212e, 0x212e, GRUB_BIDI_TYPE_ET},
-{0x213a, 0x213b, GRUB_BIDI_TYPE_ON},
-{0x2140, 0x2144, GRUB_BIDI_TYPE_ON},
-{0x214a, 0x214d, GRUB_BIDI_TYPE_ON},
-{0x2153, 0x215f, GRUB_BIDI_TYPE_ON},
-{0x2190, 0x2211, GRUB_BIDI_TYPE_ON},
-{0x2212, 0x2212, GRUB_BIDI_TYPE_ES},
-{0x2213, 0x2213, GRUB_BIDI_TYPE_ET},
-{0x2214, 0x2335, GRUB_BIDI_TYPE_ON},
-{0x237b, 0x2394, GRUB_BIDI_TYPE_ON},
-{0x2396, 0x23e7, GRUB_BIDI_TYPE_ON},
-{0x2400, 0x2426, GRUB_BIDI_TYPE_ON},
-{0x2440, 0x244a, GRUB_BIDI_TYPE_ON},
-{0x2460, 0x2487, GRUB_BIDI_TYPE_ON},
-{0x2488, 0x249b, GRUB_BIDI_TYPE_EN},
-{0x24ea, 0x269d, GRUB_BIDI_TYPE_ON},
-{0x26a0, 0x26ab, GRUB_BIDI_TYPE_ON},
-{0x26ad, 0x26bc, GRUB_BIDI_TYPE_ON},
-{0x26c0, 0x26c3, GRUB_BIDI_TYPE_ON},
-{0x2701, 0x2704, GRUB_BIDI_TYPE_ON},
-{0x2706, 0x2709, GRUB_BIDI_TYPE_ON},
-{0x270c, 0x2727, GRUB_BIDI_TYPE_ON},
-{0x2729, 0x274b, GRUB_BIDI_TYPE_ON},
-{0x274d, 0x274d, GRUB_BIDI_TYPE_ON},
-{0x274f, 0x2752, GRUB_BIDI_TYPE_ON},
-{0x2756, 0x2756, GRUB_BIDI_TYPE_ON},
-{0x2758, 0x275e, GRUB_BIDI_TYPE_ON},
-{0x2761, 0x2794, GRUB_BIDI_TYPE_ON},
-{0x2798, 0x27af, GRUB_BIDI_TYPE_ON},
-{0x27b1, 0x27be, GRUB_BIDI_TYPE_ON},
-{0x27c0, 0x27ca, GRUB_BIDI_TYPE_ON},
-{0x27cc, 0x27cc, GRUB_BIDI_TYPE_ON},
-{0x27d0, 0x27ff, GRUB_BIDI_TYPE_ON},
-{0x2900, 0x2b4c, GRUB_BIDI_TYPE_ON},
-{0x2b50, 0x2b54, GRUB_BIDI_TYPE_ON},
-{0x2ce5, 0x2cea, GRUB_BIDI_TYPE_ON},
-{0x2cf9, 0x2cff, GRUB_BIDI_TYPE_ON},
-{0x2de0, 0x2dff, GRUB_BIDI_TYPE_NSM},
-{0x2e00, 0x2e30, GRUB_BIDI_TYPE_ON},
-{0x2e80, 0x2e99, GRUB_BIDI_TYPE_ON},
-{0x2e9b, 0x2ef3, GRUB_BIDI_TYPE_ON},
-{0x2f00, 0x2fd5, GRUB_BIDI_TYPE_ON},
-{0x2ff0, 0x2ffb, GRUB_BIDI_TYPE_ON},
-{0x3000, 0x3000, GRUB_BIDI_TYPE_WS},
-{0x3001, 0x3004, GRUB_BIDI_TYPE_ON},
-{0x3008, 0x3020, GRUB_BIDI_TYPE_ON},
-{0x302a, 0x302f, GRUB_BIDI_TYPE_NSM},
-{0x3030, 0x3030, GRUB_BIDI_TYPE_ON},
-{0x3036, 0x3037, GRUB_BIDI_TYPE_ON},
-{0x303d, 0x303f, GRUB_BIDI_TYPE_ON},
-{0x3099, 0x309a, GRUB_BIDI_TYPE_NSM},
-{0x309b, 0x309c, GRUB_BIDI_TYPE_ON},
-{0x30a0, 0x30a0, GRUB_BIDI_TYPE_ON},
-{0x30fb, 0x30fb, GRUB_BIDI_TYPE_ON},
-{0x31c0, 0x31e3, GRUB_BIDI_TYPE_ON},
-{0x321d, 0x321e, GRUB_BIDI_TYPE_ON},
-{0x3250, 0x325f, GRUB_BIDI_TYPE_ON},
-{0x327c, 0x327e, GRUB_BIDI_TYPE_ON},
-{0x32b1, 0x32bf, GRUB_BIDI_TYPE_ON},
-{0x32cc, 0x32cf, GRUB_BIDI_TYPE_ON},
-{0x3377, 0x337a, GRUB_BIDI_TYPE_ON},
-{0x33de, 0x33df, GRUB_BIDI_TYPE_ON},
-{0x33ff, 0x33ff, GRUB_BIDI_TYPE_ON},
-{0x4dc0, 0x4dff, GRUB_BIDI_TYPE_ON},
-{0xa490, 0xa4c6, GRUB_BIDI_TYPE_ON},
-{0xa60d, 0xa60f, GRUB_BIDI_TYPE_ON},
-{0xa66f, 0xa672, GRUB_BIDI_TYPE_NSM},
-{0xa673, 0xa673, GRUB_BIDI_TYPE_ON},
-{0xa67c, 0xa67d, GRUB_BIDI_TYPE_NSM},
-{0xa67e, 0xa67f, GRUB_BIDI_TYPE_ON},
-{0xa700, 0xa721, GRUB_BIDI_TYPE_ON},
-{0xa788, 0xa788, GRUB_BIDI_TYPE_ON},
-{0xa802, 0xa802, GRUB_BIDI_TYPE_NSM},
-{0xa806, 0xa806, GRUB_BIDI_TYPE_NSM},
-{0xa80b, 0xa80b, GRUB_BIDI_TYPE_NSM},
-{0xa825, 0xa826, GRUB_BIDI_TYPE_NSM},
-{0xa828, 0xa82b, GRUB_BIDI_TYPE_ON},
-{0xa874, 0xa877, GRUB_BIDI_TYPE_ON},
-{0xa8c4, 0xa8c4, GRUB_BIDI_TYPE_NSM},
-{0xa926, 0xa92d, GRUB_BIDI_TYPE_NSM},
-{0xa947, 0xa951, GRUB_BIDI_TYPE_NSM},
-{0xaa29, 0xaa2e, GRUB_BIDI_TYPE_NSM},
-{0xaa31, 0xaa32, GRUB_BIDI_TYPE_NSM},
-{0xaa35, 0xaa36, GRUB_BIDI_TYPE_NSM},
-{0xaa43, 0xaa43, GRUB_BIDI_TYPE_NSM},
-{0xaa4c, 0xaa4c, GRUB_BIDI_TYPE_NSM},
-{0xfb1d, 0xfb1d, GRUB_BIDI_TYPE_R},
-{0xfb1e, 0xfb1e, GRUB_BIDI_TYPE_NSM},
-{0xfb1f, 0xfb28, GRUB_BIDI_TYPE_R},
-{0xfb29, 0xfb29, GRUB_BIDI_TYPE_ES},
-{0xfb2a, 0xfb36, GRUB_BIDI_TYPE_R},
-{0xfb38, 0xfb3c, GRUB_BIDI_TYPE_R},
-{0xfb3e, 0xfb3e, GRUB_BIDI_TYPE_R},
-{0xfb40, 0xfb41, GRUB_BIDI_TYPE_R},
-{0xfb43, 0xfb44, GRUB_BIDI_TYPE_R},
-{0xfb46, 0xfb4f, GRUB_BIDI_TYPE_R},
-{0xfb50, 0xfbb1, GRUB_BIDI_TYPE_AL},
-{0xfbd3, 0xfd3d, GRUB_BIDI_TYPE_AL},
-{0xfd3e, 0xfd3f, GRUB_BIDI_TYPE_ON},
-{0xfd50, 0xfd8f, GRUB_BIDI_TYPE_AL},
-{0xfd92, 0xfdc7, GRUB_BIDI_TYPE_AL},
-{0xfdf0, 0xfdfc, GRUB_BIDI_TYPE_AL},
-{0xfdfd, 0xfdfd, GRUB_BIDI_TYPE_ON},
-{0xfe00, 0xfe0f, GRUB_BIDI_TYPE_NSM},
-{0xfe10, 0xfe19, GRUB_BIDI_TYPE_ON},
-{0xfe20, 0xfe26, GRUB_BIDI_TYPE_NSM},
-{0xfe30, 0xfe4f, GRUB_BIDI_TYPE_ON},
-{0xfe50, 0xfe50, GRUB_BIDI_TYPE_CS},
-{0xfe51, 0xfe51, GRUB_BIDI_TYPE_ON},
-{0xfe52, 0xfe52, GRUB_BIDI_TYPE_CS},
-{0xfe54, 0xfe54, GRUB_BIDI_TYPE_ON},
-{0xfe55, 0xfe55, GRUB_BIDI_TYPE_CS},
-{0xfe56, 0xfe5e, GRUB_BIDI_TYPE_ON},
-{0xfe5f, 0xfe5f, GRUB_BIDI_TYPE_ET},
-{0xfe60, 0xfe61, GRUB_BIDI_TYPE_ON},
-{0xfe62, 0xfe63, GRUB_BIDI_TYPE_ES},
-{0xfe64, 0xfe66, GRUB_BIDI_TYPE_ON},
-{0xfe68, 0xfe68, GRUB_BIDI_TYPE_ON},
-{0xfe69, 0xfe6a, GRUB_BIDI_TYPE_ET},
-{0xfe6b, 0xfe6b, GRUB_BIDI_TYPE_ON},
-{0xfe70, 0xfe74, GRUB_BIDI_TYPE_AL},
-{0xfe76, 0xfefc, GRUB_BIDI_TYPE_AL},
-{0xfeff, 0xfeff, GRUB_BIDI_TYPE_BN},
-{0xff01, 0xff02, GRUB_BIDI_TYPE_ON},
-{0xff03, 0xff05, GRUB_BIDI_TYPE_ET},
-{0xff06, 0xff0a, GRUB_BIDI_TYPE_ON},
-{0xff0b, 0xff0b, GRUB_BIDI_TYPE_ES},
-{0xff0c, 0xff0c, GRUB_BIDI_TYPE_CS},
-{0xff0d, 0xff0d, GRUB_BIDI_TYPE_ES},
-{0xff0e, 0xff0f, GRUB_BIDI_TYPE_CS},
-{0xff10, 0xff19, GRUB_BIDI_TYPE_EN},
-{0xff1a, 0xff1a, GRUB_BIDI_TYPE_CS},
-{0xff1b, 0xff20, GRUB_BIDI_TYPE_ON},
-{0xff3b, 0xff40, GRUB_BIDI_TYPE_ON},
-{0xff5b, 0xff65, GRUB_BIDI_TYPE_ON},
-{0xffe0, 0xffe1, GRUB_BIDI_TYPE_ET},
-{0xffe2, 0xffe4, GRUB_BIDI_TYPE_ON},
-{0xffe5, 0xffe6, GRUB_BIDI_TYPE_ET},
-{0xffe8, 0xffee, GRUB_BIDI_TYPE_ON},
-{0xfff9, 0xfffd, GRUB_BIDI_TYPE_ON},
-{0x10101, 0x10101, GRUB_BIDI_TYPE_ON},
-{0x10140, 0x1018a, GRUB_BIDI_TYPE_ON},
-{0x10190, 0x1019b, GRUB_BIDI_TYPE_ON},
-{0x101fd, 0x101fd, GRUB_BIDI_TYPE_NSM},
-{0x10800, 0x10805, GRUB_BIDI_TYPE_R},
-{0x10808, 0x10808, GRUB_BIDI_TYPE_R},
-{0x1080a, 0x10835, GRUB_BIDI_TYPE_R},
-{0x10837, 0x10838, GRUB_BIDI_TYPE_R},
-{0x1083c, 0x1083c, GRUB_BIDI_TYPE_R},
-{0x1083f, 0x1083f, GRUB_BIDI_TYPE_R},
-{0x10900, 0x10919, GRUB_BIDI_TYPE_R},
-{0x1091f, 0x1091f, GRUB_BIDI_TYPE_ON},
-{0x10920, 0x10939, GRUB_BIDI_TYPE_R},
-{0x1093f, 0x1093f, GRUB_BIDI_TYPE_R},
-{0x10a00, 0x10a00, GRUB_BIDI_TYPE_R},
-{0x10a01, 0x10a03, GRUB_BIDI_TYPE_NSM},
-{0x10a05, 0x10a06, GRUB_BIDI_TYPE_NSM},
-{0x10a0c, 0x10a0f, GRUB_BIDI_TYPE_NSM},
-{0x10a10, 0x10a13, GRUB_BIDI_TYPE_R},
-{0x10a15, 0x10a17, GRUB_BIDI_TYPE_R},
-{0x10a19, 0x10a33, GRUB_BIDI_TYPE_R},
-{0x10a38, 0x10a3a, GRUB_BIDI_TYPE_NSM},
-{0x10a3f, 0x10a3f, GRUB_BIDI_TYPE_NSM},
-{0x10a40, 0x10a47, GRUB_BIDI_TYPE_R},
-{0x10a50, 0x10a58, GRUB_BIDI_TYPE_R},
-{0x1d167, 0x1d169, GRUB_BIDI_TYPE_NSM},
-{0x1d173, 0x1d17a, GRUB_BIDI_TYPE_BN},
-{0x1d17b, 0x1d182, GRUB_BIDI_TYPE_NSM},
-{0x1d185, 0x1d18b, GRUB_BIDI_TYPE_NSM},
-{0x1d1aa, 0x1d1ad, GRUB_BIDI_TYPE_NSM},
-{0x1d200, 0x1d241, GRUB_BIDI_TYPE_ON},
-{0x1d242, 0x1d244, GRUB_BIDI_TYPE_NSM},
-{0x1d245, 0x1d245, GRUB_BIDI_TYPE_ON},
-{0x1d300, 0x1d356, GRUB_BIDI_TYPE_ON},
-{0x1d7ce, 0x1d7ff, GRUB_BIDI_TYPE_EN},
-{0x1f000, 0x1f02b, GRUB_BIDI_TYPE_ON},
-{0x1f030, 0x1f093, GRUB_BIDI_TYPE_ON},
-{0xe0001, 0xe0001, GRUB_BIDI_TYPE_BN},
-{0xe0020, 0xe007f, GRUB_BIDI_TYPE_BN},
-{0xe0100, 0xe01ef, GRUB_BIDI_TYPE_NSM},
-{0, 0, 0},
+struct grub_unicode_compact_range grub_unicode_compact[] = {
+{0x0, 0x8, GRUB_BIDI_TYPE_BN, 0},
+{0x9, 0x9, GRUB_BIDI_TYPE_S, 0},
+{0xa, 0xa, GRUB_BIDI_TYPE_B, 0},
+{0xb, 0xb, GRUB_BIDI_TYPE_S, 0},
+{0xc, 0xc, GRUB_BIDI_TYPE_WS, 0},
+{0xd, 0xd, GRUB_BIDI_TYPE_B, 0},
+{0xe, 0x1b, GRUB_BIDI_TYPE_BN, 0},
+{0x1c, 0x1e, GRUB_BIDI_TYPE_B, 0},
+{0x1f, 0x1f, GRUB_BIDI_TYPE_S, 0},
+{0x20, 0x20, GRUB_BIDI_TYPE_WS, 0},
+{0x21, 0x22, GRUB_BIDI_TYPE_ON, 0},
+{0x23, 0x25, GRUB_BIDI_TYPE_ET, 0},
+{0x26, 0x2a, GRUB_BIDI_TYPE_ON, 0},
+{0x2b, 0x2b, GRUB_BIDI_TYPE_ES, 0},
+{0x2c, 0x2c, GRUB_BIDI_TYPE_CS, 0},
+{0x2d, 0x2d, GRUB_BIDI_TYPE_ES, 0},
+{0x2e, 0x2f, GRUB_BIDI_TYPE_CS, 0},
+{0x30, 0x39, GRUB_BIDI_TYPE_EN, 0},
+{0x3a, 0x3a, GRUB_BIDI_TYPE_CS, 0},
+{0x3b, 0x40, GRUB_BIDI_TYPE_ON, 0},
+{0x5b, 0x60, GRUB_BIDI_TYPE_ON, 0},
+{0x7b, 0x7e, GRUB_BIDI_TYPE_ON, 0},
+{0x7f, 0x84, GRUB_BIDI_TYPE_BN, 0},
+{0x85, 0x85, GRUB_BIDI_TYPE_B, 0},
+{0x86, 0x9f, GRUB_BIDI_TYPE_BN, 0},
+{0xa0, 0xa0, GRUB_BIDI_TYPE_CS, 0},
+{0xa1, 0xa1, GRUB_BIDI_TYPE_ON, 0},
+{0xa2, 0xa5, GRUB_BIDI_TYPE_ET, 0},
+{0xa6, 0xa9, GRUB_BIDI_TYPE_ON, 0},
+{0xab, 0xac, GRUB_BIDI_TYPE_ON, 0},
+{0xad, 0xad, GRUB_BIDI_TYPE_BN, 0},
+{0xae, 0xaf, GRUB_BIDI_TYPE_ON, 0},
+{0xb0, 0xb1, GRUB_BIDI_TYPE_ET, 0},
+{0xb2, 0xb3, GRUB_BIDI_TYPE_EN, 0},
+{0xb4, 0xb4, GRUB_BIDI_TYPE_ON, 0},
+{0xb6, 0xb8, GRUB_BIDI_TYPE_ON, 0},
+{0xb9, 0xb9, GRUB_BIDI_TYPE_EN, 0},
+{0xbb, 0xbf, GRUB_BIDI_TYPE_ON, 0},
+{0xd7, 0xd7, GRUB_BIDI_TYPE_ON, 0},
+{0xf7, 0xf7, GRUB_BIDI_TYPE_ON, 0},
+{0x2b9, 0x2ba, GRUB_BIDI_TYPE_ON, 0},
+{0x2c2, 0x2cf, GRUB_BIDI_TYPE_ON, 0},
+{0x2d2, 0x2df, GRUB_BIDI_TYPE_ON, 0},
+{0x2e5, 0x2ed, GRUB_BIDI_TYPE_ON, 0},
+{0x2ef, 0x2ff, GRUB_BIDI_TYPE_ON, 0},
+{0x300, 0x314, GRUB_BIDI_TYPE_NSM, 230},
+{0x315, 0x315, GRUB_BIDI_TYPE_NSM, 232},
+{0x316, 0x319, GRUB_BIDI_TYPE_NSM, 220},
+{0x31a, 0x31a, GRUB_BIDI_TYPE_NSM, 232},
+{0x31b, 0x31b, GRUB_BIDI_TYPE_NSM, 216},
+{0x31c, 0x320, GRUB_BIDI_TYPE_NSM, 220},
+{0x321, 0x322, GRUB_BIDI_TYPE_NSM, 202},
+{0x323, 0x326, GRUB_BIDI_TYPE_NSM, 220},
+{0x327, 0x328, GRUB_BIDI_TYPE_NSM, 202},
+{0x329, 0x333, GRUB_BIDI_TYPE_NSM, 220},
+{0x334, 0x338, GRUB_BIDI_TYPE_NSM, 1},
+{0x339, 0x33c, GRUB_BIDI_TYPE_NSM, 220},
+{0x33d, 0x344, GRUB_BIDI_TYPE_NSM, 230},
+{0x345, 0x345, GRUB_BIDI_TYPE_NSM, 240},
+{0x346, 0x346, GRUB_BIDI_TYPE_NSM, 230},
+{0x347, 0x349, GRUB_BIDI_TYPE_NSM, 220},
+{0x34a, 0x34c, GRUB_BIDI_TYPE_NSM, 230},
+{0x34d, 0x34e, GRUB_BIDI_TYPE_NSM, 220},
+{0x34f, 0x34f, GRUB_BIDI_TYPE_NSM, 255},
+{0x350, 0x352, GRUB_BIDI_TYPE_NSM, 230},
+{0x353, 0x356, GRUB_BIDI_TYPE_NSM, 220},
+{0x357, 0x357, GRUB_BIDI_TYPE_NSM, 230},
+{0x358, 0x358, GRUB_BIDI_TYPE_NSM, 232},
+{0x359, 0x35a, GRUB_BIDI_TYPE_NSM, 220},
+{0x35b, 0x35b, GRUB_BIDI_TYPE_NSM, 230},
+{0x35c, 0x35c, GRUB_BIDI_TYPE_NSM, 233},
+{0x35d, 0x35e, GRUB_BIDI_TYPE_NSM, 234},
+{0x35f, 0x35f, GRUB_BIDI_TYPE_NSM, 233},
+{0x360, 0x361, GRUB_BIDI_TYPE_NSM, 234},
+{0x362, 0x362, GRUB_BIDI_TYPE_NSM, 233},
+{0x363, 0x36f, GRUB_BIDI_TYPE_NSM, 230},
+{0x374, 0x375, GRUB_BIDI_TYPE_ON, 0},
+{0x37e, 0x37e, GRUB_BIDI_TYPE_ON, 0},
+{0x384, 0x385, GRUB_BIDI_TYPE_ON, 0},
+{0x387, 0x387, GRUB_BIDI_TYPE_ON, 0},
+{0x3f6, 0x3f6, GRUB_BIDI_TYPE_ON, 0},
+{0x483, 0x487, GRUB_BIDI_TYPE_NSM, 230},
+{0x488, 0x489, GRUB_BIDI_TYPE_NSM, 253},
+{0x58a, 0x58a, GRUB_BIDI_TYPE_ON, 0},
+{0x591, 0x591, GRUB_BIDI_TYPE_NSM, 220},
+{0x592, 0x595, GRUB_BIDI_TYPE_NSM, 230},
+{0x596, 0x596, GRUB_BIDI_TYPE_NSM, 220},
+{0x597, 0x599, GRUB_BIDI_TYPE_NSM, 230},
+{0x59a, 0x59a, GRUB_BIDI_TYPE_NSM, 222},
+{0x59b, 0x59b, GRUB_BIDI_TYPE_NSM, 220},
+{0x59c, 0x5a1, GRUB_BIDI_TYPE_NSM, 230},
+{0x5a2, 0x5a7, GRUB_BIDI_TYPE_NSM, 220},
+{0x5a8, 0x5a9, GRUB_BIDI_TYPE_NSM, 230},
+{0x5aa, 0x5aa, GRUB_BIDI_TYPE_NSM, 220},
+{0x5ab, 0x5ac, GRUB_BIDI_TYPE_NSM, 230},
+{0x5ad, 0x5ad, GRUB_BIDI_TYPE_NSM, 222},
+{0x5ae, 0x5ae, GRUB_BIDI_TYPE_NSM, 228},
+{0x5af, 0x5af, GRUB_BIDI_TYPE_NSM, 230},
+{0x5b0, 0x5b0, GRUB_BIDI_TYPE_NSM, 10},
+{0x5b1, 0x5b1, GRUB_BIDI_TYPE_NSM, 11},
+{0x5b2, 0x5b2, GRUB_BIDI_TYPE_NSM, 12},
+{0x5b3, 0x5b3, GRUB_BIDI_TYPE_NSM, 13},
+{0x5b4, 0x5b4, GRUB_BIDI_TYPE_NSM, 14},
+{0x5b5, 0x5b5, GRUB_BIDI_TYPE_NSM, 15},
+{0x5b6, 0x5b6, GRUB_BIDI_TYPE_NSM, 16},
+{0x5b7, 0x5b7, GRUB_BIDI_TYPE_NSM, 17},
+{0x5b8, 0x5b8, GRUB_BIDI_TYPE_NSM, 18},
+{0x5b9, 0x5ba, GRUB_BIDI_TYPE_NSM, 19},
+{0x5bb, 0x5bb, GRUB_BIDI_TYPE_NSM, 20},
+{0x5bc, 0x5bc, GRUB_BIDI_TYPE_NSM, 21},
+{0x5bd, 0x5bd, GRUB_BIDI_TYPE_NSM, 22},
+{0x5be, 0x5be, GRUB_BIDI_TYPE_R, 0},
+{0x5bf, 0x5bf, GRUB_BIDI_TYPE_NSM, 23},
+{0x5c0, 0x5c0, GRUB_BIDI_TYPE_R, 0},
+{0x5c1, 0x5c1, GRUB_BIDI_TYPE_NSM, 24},
+{0x5c2, 0x5c2, GRUB_BIDI_TYPE_NSM, 25},
+{0x5c3, 0x5c3, GRUB_BIDI_TYPE_R, 0},
+{0x5c4, 0x5c4, GRUB_BIDI_TYPE_NSM, 230},
+{0x5c5, 0x5c5, GRUB_BIDI_TYPE_NSM, 220},
+{0x5c6, 0x5c6, GRUB_BIDI_TYPE_R, 0},
+{0x5c7, 0x5c7, GRUB_BIDI_TYPE_NSM, 18},
+{0x5d0, 0x5ea, GRUB_BIDI_TYPE_R, 0},
+{0x5f0, 0x5f4, GRUB_BIDI_TYPE_R, 0},
+{0x600, 0x603, GRUB_BIDI_TYPE_AN, 0},
+{0x606, 0x607, GRUB_BIDI_TYPE_ON, 0},
+{0x608, 0x608, GRUB_BIDI_TYPE_AL, 0},
+{0x609, 0x60a, GRUB_BIDI_TYPE_ET, 0},
+{0x60b, 0x60b, GRUB_BIDI_TYPE_AL, 0},
+{0x60c, 0x60c, GRUB_BIDI_TYPE_CS, 0},
+{0x60d, 0x60d, GRUB_BIDI_TYPE_AL, 0},
+{0x60e, 0x60f, GRUB_BIDI_TYPE_ON, 0},
+{0x610, 0x617, GRUB_BIDI_TYPE_NSM, 230},
+{0x618, 0x618, GRUB_BIDI_TYPE_NSM, 30},
+{0x619, 0x619, GRUB_BIDI_TYPE_NSM, 31},
+{0x61a, 0x61a, GRUB_BIDI_TYPE_NSM, 32},
+{0x61b, 0x61b, GRUB_BIDI_TYPE_AL, 0},
+{0x61e, 0x61f, GRUB_BIDI_TYPE_AL, 0},
+{0x621, 0x64a, GRUB_BIDI_TYPE_AL, 0},
+{0x64b, 0x64b, GRUB_BIDI_TYPE_NSM, 27},
+{0x64c, 0x64c, GRUB_BIDI_TYPE_NSM, 28},
+{0x64d, 0x64d, GRUB_BIDI_TYPE_NSM, 29},
+{0x64e, 0x64e, GRUB_BIDI_TYPE_NSM, 30},
+{0x64f, 0x64f, GRUB_BIDI_TYPE_NSM, 31},
+{0x650, 0x650, GRUB_BIDI_TYPE_NSM, 32},
+{0x651, 0x651, GRUB_BIDI_TYPE_NSM, 33},
+{0x652, 0x652, GRUB_BIDI_TYPE_NSM, 34},
+{0x653, 0x654, GRUB_BIDI_TYPE_NSM, 230},
+{0x655, 0x656, GRUB_BIDI_TYPE_NSM, 220},
+{0x657, 0x65b, GRUB_BIDI_TYPE_NSM, 230},
+{0x65c, 0x65c, GRUB_BIDI_TYPE_NSM, 220},
+{0x65d, 0x65e, GRUB_BIDI_TYPE_NSM, 230},
+{0x660, 0x669, GRUB_BIDI_TYPE_AN, 0},
+{0x66a, 0x66a, GRUB_BIDI_TYPE_ET, 0},
+{0x66b, 0x66c, GRUB_BIDI_TYPE_AN, 0},
+{0x66d, 0x66f, GRUB_BIDI_TYPE_AL, 0},
+{0x670, 0x670, GRUB_BIDI_TYPE_NSM, 35},
+{0x671, 0x6d5, GRUB_BIDI_TYPE_AL, 0},
+{0x6d6, 0x6dc, GRUB_BIDI_TYPE_NSM, 230},
+{0x6dd, 0x6dd, GRUB_BIDI_TYPE_AN, 0},
+{0x6de, 0x6de, GRUB_BIDI_TYPE_NSM, 253},
+{0x6df, 0x6e2, GRUB_BIDI_TYPE_NSM, 230},
+{0x6e3, 0x6e3, GRUB_BIDI_TYPE_NSM, 220},
+{0x6e4, 0x6e4, GRUB_BIDI_TYPE_NSM, 230},
+{0x6e5, 0x6e6, GRUB_BIDI_TYPE_AL, 0},
+{0x6e7, 0x6e8, GRUB_BIDI_TYPE_NSM, 230},
+{0x6e9, 0x6e9, GRUB_BIDI_TYPE_ON, 0},
+{0x6ea, 0x6ea, GRUB_BIDI_TYPE_NSM, 220},
+{0x6eb, 0x6ec, GRUB_BIDI_TYPE_NSM, 230},
+{0x6ed, 0x6ed, GRUB_BIDI_TYPE_NSM, 220},
+{0x6ee, 0x6ef, GRUB_BIDI_TYPE_AL, 0},
+{0x6f0, 0x6f9, GRUB_BIDI_TYPE_EN, 0},
+{0x6fa, 0x70d, GRUB_BIDI_TYPE_AL, 0},
+{0x70f, 0x70f, GRUB_BIDI_TYPE_BN, 0},
+{0x710, 0x710, GRUB_BIDI_TYPE_AL, 0},
+{0x711, 0x711, GRUB_BIDI_TYPE_NSM, 36},
+{0x712, 0x72f, GRUB_BIDI_TYPE_AL, 0},
+{0x730, 0x730, GRUB_BIDI_TYPE_NSM, 230},
+{0x731, 0x731, GRUB_BIDI_TYPE_NSM, 220},
+{0x732, 0x733, GRUB_BIDI_TYPE_NSM, 230},
+{0x734, 0x734, GRUB_BIDI_TYPE_NSM, 220},
+{0x735, 0x736, GRUB_BIDI_TYPE_NSM, 230},
+{0x737, 0x739, GRUB_BIDI_TYPE_NSM, 220},
+{0x73a, 0x73a, GRUB_BIDI_TYPE_NSM, 230},
+{0x73b, 0x73c, GRUB_BIDI_TYPE_NSM, 220},
+{0x73d, 0x73d, GRUB_BIDI_TYPE_NSM, 230},
+{0x73e, 0x73e, GRUB_BIDI_TYPE_NSM, 220},
+{0x73f, 0x741, GRUB_BIDI_TYPE_NSM, 230},
+{0x742, 0x742, GRUB_BIDI_TYPE_NSM, 220},
+{0x743, 0x743, GRUB_BIDI_TYPE_NSM, 230},
+{0x744, 0x744, GRUB_BIDI_TYPE_NSM, 220},
+{0x745, 0x745, GRUB_BIDI_TYPE_NSM, 230},
+{0x746, 0x746, GRUB_BIDI_TYPE_NSM, 220},
+{0x747, 0x747, GRUB_BIDI_TYPE_NSM, 230},
+{0x748, 0x748, GRUB_BIDI_TYPE_NSM, 220},
+{0x749, 0x74a, GRUB_BIDI_TYPE_NSM, 230},
+{0x74d, 0x7a5, GRUB_BIDI_TYPE_AL, 0},
+{0x7a6, 0x7b0, GRUB_BIDI_TYPE_NSM, 255},
+{0x7b1, 0x7b1, GRUB_BIDI_TYPE_AL, 0},
+{0x7c0, 0x7ea, GRUB_BIDI_TYPE_R, 0},
+{0x7eb, 0x7f1, GRUB_BIDI_TYPE_NSM, 230},
+{0x7f2, 0x7f2, GRUB_BIDI_TYPE_NSM, 220},
+{0x7f3, 0x7f3, GRUB_BIDI_TYPE_NSM, 230},
+{0x7f4, 0x7f5, GRUB_BIDI_TYPE_R, 0},
+{0x7f6, 0x7f9, GRUB_BIDI_TYPE_ON, 0},
+{0x7fa, 0x7fa, GRUB_BIDI_TYPE_R, 0},
+{0x901, 0x902, GRUB_BIDI_TYPE_NSM, 255},
+{0x903, 0x903, GRUB_BIDI_TYPE_L, 254},
+{0x93c, 0x93c, GRUB_BIDI_TYPE_NSM, 7},
+{0x93e, 0x940, GRUB_BIDI_TYPE_L, 254},
+{0x941, 0x948, GRUB_BIDI_TYPE_NSM, 255},
+{0x949, 0x94c, GRUB_BIDI_TYPE_L, 254},
+{0x94d, 0x94d, GRUB_BIDI_TYPE_NSM, 9},
+{0x951, 0x951, GRUB_BIDI_TYPE_NSM, 230},
+{0x952, 0x952, GRUB_BIDI_TYPE_NSM, 220},
+{0x953, 0x954, GRUB_BIDI_TYPE_NSM, 230},
+{0x962, 0x963, GRUB_BIDI_TYPE_NSM, 255},
+{0x981, 0x981, GRUB_BIDI_TYPE_NSM, 255},
+{0x982, 0x983, GRUB_BIDI_TYPE_L, 254},
+{0x9bc, 0x9bc, GRUB_BIDI_TYPE_NSM, 7},
+{0x9be, 0x9c0, GRUB_BIDI_TYPE_L, 254},
+{0x9c1, 0x9c4, GRUB_BIDI_TYPE_NSM, 255},
+{0x9c7, 0x9c8, GRUB_BIDI_TYPE_L, 254},
+{0x9cb, 0x9cc, GRUB_BIDI_TYPE_L, 254},
+{0x9cd, 0x9cd, GRUB_BIDI_TYPE_NSM, 9},
+{0x9d7, 0x9d7, GRUB_BIDI_TYPE_L, 254},
+{0x9e2, 0x9e3, GRUB_BIDI_TYPE_NSM, 255},
+{0x9f2, 0x9f3, GRUB_BIDI_TYPE_ET, 0},
+{0xa01, 0xa02, GRUB_BIDI_TYPE_NSM, 255},
+{0xa03, 0xa03, GRUB_BIDI_TYPE_L, 254},
+{0xa3c, 0xa3c, GRUB_BIDI_TYPE_NSM, 7},
+{0xa3e, 0xa40, GRUB_BIDI_TYPE_L, 254},
+{0xa41, 0xa42, GRUB_BIDI_TYPE_NSM, 255},
+{0xa47, 0xa48, GRUB_BIDI_TYPE_NSM, 255},
+{0xa4b, 0xa4c, GRUB_BIDI_TYPE_NSM, 255},
+{0xa4d, 0xa4d, GRUB_BIDI_TYPE_NSM, 9},
+{0xa51, 0xa51, GRUB_BIDI_TYPE_NSM, 255},
+{0xa70, 0xa71, GRUB_BIDI_TYPE_NSM, 255},
+{0xa75, 0xa75, GRUB_BIDI_TYPE_NSM, 255},
+{0xa81, 0xa82, GRUB_BIDI_TYPE_NSM, 255},
+{0xa83, 0xa83, GRUB_BIDI_TYPE_L, 254},
+{0xabc, 0xabc, GRUB_BIDI_TYPE_NSM, 7},
+{0xabe, 0xac0, GRUB_BIDI_TYPE_L, 254},
+{0xac1, 0xac5, GRUB_BIDI_TYPE_NSM, 255},
+{0xac7, 0xac8, GRUB_BIDI_TYPE_NSM, 255},
+{0xac9, 0xac9, GRUB_BIDI_TYPE_L, 254},
+{0xacb, 0xacc, GRUB_BIDI_TYPE_L, 254},
+{0xacd, 0xacd, GRUB_BIDI_TYPE_NSM, 9},
+{0xae2, 0xae3, GRUB_BIDI_TYPE_NSM, 255},
+{0xaf1, 0xaf1, GRUB_BIDI_TYPE_ET, 0},
+{0xb01, 0xb01, GRUB_BIDI_TYPE_NSM, 255},
+{0xb02, 0xb03, GRUB_BIDI_TYPE_L, 254},
+{0xb3c, 0xb3c, GRUB_BIDI_TYPE_NSM, 7},
+{0xb3e, 0xb3e, GRUB_BIDI_TYPE_L, 254},
+{0xb3f, 0xb3f, GRUB_BIDI_TYPE_NSM, 255},
+{0xb40, 0xb40, GRUB_BIDI_TYPE_L, 254},
+{0xb41, 0xb44, GRUB_BIDI_TYPE_NSM, 255},
+{0xb47, 0xb48, GRUB_BIDI_TYPE_L, 254},
+{0xb4b, 0xb4c, GRUB_BIDI_TYPE_L, 254},
+{0xb4d, 0xb4d, GRUB_BIDI_TYPE_NSM, 9},
+{0xb56, 0xb56, GRUB_BIDI_TYPE_NSM, 255},
+{0xb57, 0xb57, GRUB_BIDI_TYPE_L, 254},
+{0xb62, 0xb63, GRUB_BIDI_TYPE_NSM, 255},
+{0xb82, 0xb82, GRUB_BIDI_TYPE_NSM, 255},
+{0xbbe, 0xbbf, GRUB_BIDI_TYPE_L, 254},
+{0xbc0, 0xbc0, GRUB_BIDI_TYPE_NSM, 255},
+{0xbc1, 0xbc2, GRUB_BIDI_TYPE_L, 254},
+{0xbc6, 0xbc8, GRUB_BIDI_TYPE_L, 254},
+{0xbca, 0xbcc, GRUB_BIDI_TYPE_L, 254},
+{0xbcd, 0xbcd, GRUB_BIDI_TYPE_NSM, 9},
+{0xbd7, 0xbd7, GRUB_BIDI_TYPE_L, 254},
+{0xbf3, 0xbf8, GRUB_BIDI_TYPE_ON, 0},
+{0xbf9, 0xbf9, GRUB_BIDI_TYPE_ET, 0},
+{0xbfa, 0xbfa, GRUB_BIDI_TYPE_ON, 0},
+{0xc01, 0xc03, GRUB_BIDI_TYPE_L, 254},
+{0xc3e, 0xc40, GRUB_BIDI_TYPE_NSM, 255},
+{0xc41, 0xc44, GRUB_BIDI_TYPE_L, 254},
+{0xc46, 0xc48, GRUB_BIDI_TYPE_NSM, 255},
+{0xc4a, 0xc4c, GRUB_BIDI_TYPE_NSM, 255},
+{0xc4d, 0xc4d, GRUB_BIDI_TYPE_NSM, 9},
+{0xc55, 0xc55, GRUB_BIDI_TYPE_NSM, 84},
+{0xc56, 0xc56, GRUB_BIDI_TYPE_NSM, 91},
+{0xc62, 0xc63, GRUB_BIDI_TYPE_NSM, 255},
+{0xc78, 0xc7e, GRUB_BIDI_TYPE_ON, 0},
+{0xc82, 0xc83, GRUB_BIDI_TYPE_L, 254},
+{0xcbc, 0xcbc, GRUB_BIDI_TYPE_NSM, 7},
+{0xcbe, 0xcbe, GRUB_BIDI_TYPE_L, 254},
+{0xcbf, 0xcbf, GRUB_BIDI_TYPE_L, 255},
+{0xcc0, 0xcc4, GRUB_BIDI_TYPE_L, 254},
+{0xcc6, 0xcc6, GRUB_BIDI_TYPE_L, 255},
+{0xcc7, 0xcc8, GRUB_BIDI_TYPE_L, 254},
+{0xcca, 0xccb, GRUB_BIDI_TYPE_L, 254},
+{0xccc, 0xccc, GRUB_BIDI_TYPE_NSM, 255},
+{0xccd, 0xccd, GRUB_BIDI_TYPE_NSM, 9},
+{0xcd5, 0xcd6, GRUB_BIDI_TYPE_L, 254},
+{0xce2, 0xce3, GRUB_BIDI_TYPE_NSM, 255},
+{0xcf1, 0xcf2, GRUB_BIDI_TYPE_ON, 0},
+{0xd02, 0xd03, GRUB_BIDI_TYPE_L, 254},
+{0xd3e, 0xd40, GRUB_BIDI_TYPE_L, 254},
+{0xd41, 0xd44, GRUB_BIDI_TYPE_NSM, 255},
+{0xd46, 0xd48, GRUB_BIDI_TYPE_L, 254},
+{0xd4a, 0xd4c, GRUB_BIDI_TYPE_L, 254},
+{0xd4d, 0xd4d, GRUB_BIDI_TYPE_NSM, 9},
+{0xd57, 0xd57, GRUB_BIDI_TYPE_L, 254},
+{0xd62, 0xd63, GRUB_BIDI_TYPE_NSM, 255},
+{0xd82, 0xd83, GRUB_BIDI_TYPE_L, 254},
+{0xdca, 0xdca, GRUB_BIDI_TYPE_NSM, 9},
+{0xdcf, 0xdd1, GRUB_BIDI_TYPE_L, 254},
+{0xdd2, 0xdd4, GRUB_BIDI_TYPE_NSM, 255},
+{0xdd6, 0xdd6, GRUB_BIDI_TYPE_NSM, 255},
+{0xdd8, 0xddf, GRUB_BIDI_TYPE_L, 254},
+{0xdf2, 0xdf3, GRUB_BIDI_TYPE_L, 254},
+{0xe31, 0xe31, GRUB_BIDI_TYPE_NSM, 255},
+{0xe34, 0xe37, GRUB_BIDI_TYPE_NSM, 255},
+{0xe38, 0xe39, GRUB_BIDI_TYPE_NSM, 103},
+{0xe3a, 0xe3a, GRUB_BIDI_TYPE_NSM, 9},
+{0xe3f, 0xe3f, GRUB_BIDI_TYPE_ET, 0},
+{0xe47, 0xe47, GRUB_BIDI_TYPE_NSM, 255},
+{0xe48, 0xe4b, GRUB_BIDI_TYPE_NSM, 107},
+{0xe4c, 0xe4e, GRUB_BIDI_TYPE_NSM, 255},
+{0xeb1, 0xeb1, GRUB_BIDI_TYPE_NSM, 255},
+{0xeb4, 0xeb7, GRUB_BIDI_TYPE_NSM, 255},
+{0xeb8, 0xeb9, GRUB_BIDI_TYPE_NSM, 118},
+{0xebb, 0xebc, GRUB_BIDI_TYPE_NSM, 255},
+{0xec8, 0xecb, GRUB_BIDI_TYPE_NSM, 122},
+{0xecc, 0xecd, GRUB_BIDI_TYPE_NSM, 255},
+{0xf18, 0xf19, GRUB_BIDI_TYPE_NSM, 220},
+{0xf35, 0xf35, GRUB_BIDI_TYPE_NSM, 220},
+{0xf37, 0xf37, GRUB_BIDI_TYPE_NSM, 220},
+{0xf39, 0xf39, GRUB_BIDI_TYPE_NSM, 216},
+{0xf3a, 0xf3d, GRUB_BIDI_TYPE_ON, 0},
+{0xf3e, 0xf3f, GRUB_BIDI_TYPE_L, 254},
+{0xf71, 0xf71, GRUB_BIDI_TYPE_NSM, 129},
+{0xf72, 0xf72, GRUB_BIDI_TYPE_NSM, 130},
+{0xf73, 0xf73, GRUB_BIDI_TYPE_NSM, 255},
+{0xf74, 0xf74, GRUB_BIDI_TYPE_NSM, 132},
+{0xf75, 0xf79, GRUB_BIDI_TYPE_NSM, 255},
+{0xf7a, 0xf7d, GRUB_BIDI_TYPE_NSM, 130},
+{0xf7e, 0xf7e, GRUB_BIDI_TYPE_NSM, 255},
+{0xf7f, 0xf7f, GRUB_BIDI_TYPE_L, 254},
+{0xf80, 0xf80, GRUB_BIDI_TYPE_NSM, 130},
+{0xf81, 0xf81, GRUB_BIDI_TYPE_NSM, 255},
+{0xf82, 0xf83, GRUB_BIDI_TYPE_NSM, 230},
+{0xf84, 0xf84, GRUB_BIDI_TYPE_NSM, 9},
+{0xf86, 0xf87, GRUB_BIDI_TYPE_NSM, 230},
+{0xf90, 0xf97, GRUB_BIDI_TYPE_NSM, 255},
+{0xf99, 0xfbc, GRUB_BIDI_TYPE_NSM, 255},
+{0xfc6, 0xfc6, GRUB_BIDI_TYPE_NSM, 220},
+{0x102b, 0x102c, GRUB_BIDI_TYPE_L, 254},
+{0x102d, 0x1030, GRUB_BIDI_TYPE_NSM, 255},
+{0x1031, 0x1031, GRUB_BIDI_TYPE_L, 254},
+{0x1032, 0x1036, GRUB_BIDI_TYPE_NSM, 255},
+{0x1037, 0x1037, GRUB_BIDI_TYPE_NSM, 7},
+{0x1038, 0x1038, GRUB_BIDI_TYPE_L, 254},
+{0x1039, 0x103a, GRUB_BIDI_TYPE_NSM, 9},
+{0x103b, 0x103c, GRUB_BIDI_TYPE_L, 254},
+{0x103d, 0x103e, GRUB_BIDI_TYPE_NSM, 255},
+{0x1056, 0x1057, GRUB_BIDI_TYPE_L, 254},
+{0x1058, 0x1059, GRUB_BIDI_TYPE_NSM, 255},
+{0x105e, 0x1060, GRUB_BIDI_TYPE_NSM, 255},
+{0x1062, 0x1064, GRUB_BIDI_TYPE_L, 254},
+{0x1067, 0x106d, GRUB_BIDI_TYPE_L, 254},
+{0x1071, 0x1074, GRUB_BIDI_TYPE_NSM, 255},
+{0x1082, 0x1082, GRUB_BIDI_TYPE_NSM, 255},
+{0x1083, 0x1084, GRUB_BIDI_TYPE_L, 254},
+{0x1085, 0x1086, GRUB_BIDI_TYPE_NSM, 255},
+{0x1087, 0x108c, GRUB_BIDI_TYPE_L, 254},
+{0x108d, 0x108d, GRUB_BIDI_TYPE_NSM, 220},
+{0x108f, 0x108f, GRUB_BIDI_TYPE_L, 254},
+{0x135f, 0x135f, GRUB_BIDI_TYPE_NSM, 230},
+{0x1390, 0x1399, GRUB_BIDI_TYPE_ON, 0},
+{0x1680, 0x1680, GRUB_BIDI_TYPE_WS, 0},
+{0x169b, 0x169c, GRUB_BIDI_TYPE_ON, 0},
+{0x1712, 0x1713, GRUB_BIDI_TYPE_NSM, 255},
+{0x1714, 0x1714, GRUB_BIDI_TYPE_NSM, 9},
+{0x1732, 0x1733, GRUB_BIDI_TYPE_NSM, 255},
+{0x1734, 0x1734, GRUB_BIDI_TYPE_NSM, 9},
+{0x1752, 0x1753, GRUB_BIDI_TYPE_NSM, 255},
+{0x1772, 0x1773, GRUB_BIDI_TYPE_NSM, 255},
+{0x17b6, 0x17b6, GRUB_BIDI_TYPE_L, 254},
+{0x17b7, 0x17bd, GRUB_BIDI_TYPE_NSM, 255},
+{0x17be, 0x17c5, GRUB_BIDI_TYPE_L, 254},
+{0x17c6, 0x17c6, GRUB_BIDI_TYPE_NSM, 255},
+{0x17c7, 0x17c8, GRUB_BIDI_TYPE_L, 254},
+{0x17c9, 0x17d1, GRUB_BIDI_TYPE_NSM, 255},
+{0x17d2, 0x17d2, GRUB_BIDI_TYPE_NSM, 9},
+{0x17d3, 0x17d3, GRUB_BIDI_TYPE_NSM, 255},
+{0x17db, 0x17db, GRUB_BIDI_TYPE_ET, 0},
+{0x17dd, 0x17dd, GRUB_BIDI_TYPE_NSM, 230},
+{0x17f0, 0x17f9, GRUB_BIDI_TYPE_ON, 0},
+{0x1800, 0x180a, GRUB_BIDI_TYPE_ON, 0},
+{0x180b, 0x180d, GRUB_BIDI_TYPE_NSM, 255},
+{0x180e, 0x180e, GRUB_BIDI_TYPE_WS, 0},
+{0x18a9, 0x18a9, GRUB_BIDI_TYPE_NSM, 228},
+{0x1920, 0x1922, GRUB_BIDI_TYPE_NSM, 255},
+{0x1923, 0x1926, GRUB_BIDI_TYPE_L, 254},
+{0x1927, 0x1928, GRUB_BIDI_TYPE_NSM, 255},
+{0x1929, 0x192b, GRUB_BIDI_TYPE_L, 254},
+{0x1930, 0x1931, GRUB_BIDI_TYPE_L, 254},
+{0x1932, 0x1932, GRUB_BIDI_TYPE_NSM, 255},
+{0x1933, 0x1938, GRUB_BIDI_TYPE_L, 254},
+{0x1939, 0x1939, GRUB_BIDI_TYPE_NSM, 222},
+{0x193a, 0x193a, GRUB_BIDI_TYPE_NSM, 230},
+{0x193b, 0x193b, GRUB_BIDI_TYPE_NSM, 220},
+{0x1940, 0x1940, GRUB_BIDI_TYPE_ON, 0},
+{0x1944, 0x1945, GRUB_BIDI_TYPE_ON, 0},
+{0x19b0, 0x19c0, GRUB_BIDI_TYPE_L, 254},
+{0x19c8, 0x19c9, GRUB_BIDI_TYPE_L, 254},
+{0x19de, 0x19ff, GRUB_BIDI_TYPE_ON, 0},
+{0x1a17, 0x1a17, GRUB_BIDI_TYPE_NSM, 230},
+{0x1a18, 0x1a18, GRUB_BIDI_TYPE_NSM, 220},
+{0x1a19, 0x1a1b, GRUB_BIDI_TYPE_L, 254},
+{0x1b00, 0x1b03, GRUB_BIDI_TYPE_NSM, 255},
+{0x1b04, 0x1b04, GRUB_BIDI_TYPE_L, 254},
+{0x1b34, 0x1b34, GRUB_BIDI_TYPE_NSM, 7},
+{0x1b35, 0x1b35, GRUB_BIDI_TYPE_L, 254},
+{0x1b36, 0x1b3a, GRUB_BIDI_TYPE_NSM, 255},
+{0x1b3b, 0x1b3b, GRUB_BIDI_TYPE_L, 254},
+{0x1b3c, 0x1b3c, GRUB_BIDI_TYPE_NSM, 255},
+{0x1b3d, 0x1b41, GRUB_BIDI_TYPE_L, 254},
+{0x1b42, 0x1b42, GRUB_BIDI_TYPE_NSM, 255},
+{0x1b43, 0x1b43, GRUB_BIDI_TYPE_L, 254},
+{0x1b44, 0x1b44, GRUB_BIDI_TYPE_L, 9},
+{0x1b6b, 0x1b6b, GRUB_BIDI_TYPE_NSM, 230},
+{0x1b6c, 0x1b6c, GRUB_BIDI_TYPE_NSM, 220},
+{0x1b6d, 0x1b73, GRUB_BIDI_TYPE_NSM, 230},
+{0x1b80, 0x1b81, GRUB_BIDI_TYPE_NSM, 255},
+{0x1b82, 0x1b82, GRUB_BIDI_TYPE_L, 254},
+{0x1ba1, 0x1ba1, GRUB_BIDI_TYPE_L, 254},
+{0x1ba2, 0x1ba5, GRUB_BIDI_TYPE_NSM, 255},
+{0x1ba6, 0x1ba7, GRUB_BIDI_TYPE_L, 254},
+{0x1ba8, 0x1ba9, GRUB_BIDI_TYPE_NSM, 255},
+{0x1baa, 0x1baa, GRUB_BIDI_TYPE_L, 9},
+{0x1c24, 0x1c2b, GRUB_BIDI_TYPE_L, 254},
+{0x1c2c, 0x1c33, GRUB_BIDI_TYPE_NSM, 255},
+{0x1c34, 0x1c35, GRUB_BIDI_TYPE_L, 254},
+{0x1c36, 0x1c36, GRUB_BIDI_TYPE_NSM, 255},
+{0x1c37, 0x1c37, GRUB_BIDI_TYPE_NSM, 7},
+{0x1dc0, 0x1dc1, GRUB_BIDI_TYPE_NSM, 230},
+{0x1dc2, 0x1dc2, GRUB_BIDI_TYPE_NSM, 220},
+{0x1dc3, 0x1dc9, GRUB_BIDI_TYPE_NSM, 230},
+{0x1dca, 0x1dca, GRUB_BIDI_TYPE_NSM, 220},
+{0x1dcb, 0x1dcc, GRUB_BIDI_TYPE_NSM, 230},
+{0x1dcd, 0x1dcd, GRUB_BIDI_TYPE_NSM, 234},
+{0x1dce, 0x1dce, GRUB_BIDI_TYPE_NSM, 214},
+{0x1dcf, 0x1dcf, GRUB_BIDI_TYPE_NSM, 220},
+{0x1dd0, 0x1dd0, GRUB_BIDI_TYPE_NSM, 202},
+{0x1dd1, 0x1de6, GRUB_BIDI_TYPE_NSM, 230},
+{0x1dfe, 0x1dfe, GRUB_BIDI_TYPE_NSM, 230},
+{0x1dff, 0x1dff, GRUB_BIDI_TYPE_NSM, 220},
+{0x1fbd, 0x1fbd, GRUB_BIDI_TYPE_ON, 0},
+{0x1fbf, 0x1fc1, GRUB_BIDI_TYPE_ON, 0},
+{0x1fcd, 0x1fcf, GRUB_BIDI_TYPE_ON, 0},
+{0x1fdd, 0x1fdf, GRUB_BIDI_TYPE_ON, 0},
+{0x1fed, 0x1fef, GRUB_BIDI_TYPE_ON, 0},
+{0x1ffd, 0x1ffe, GRUB_BIDI_TYPE_ON, 0},
+{0x2000, 0x200a, GRUB_BIDI_TYPE_WS, 0},
+{0x200b, 0x200d, GRUB_BIDI_TYPE_BN, 0},
+{0x200f, 0x200f, GRUB_BIDI_TYPE_R, 0},
+{0x2010, 0x2027, GRUB_BIDI_TYPE_ON, 0},
+{0x2028, 0x2028, GRUB_BIDI_TYPE_WS, 0},
+{0x2029, 0x2029, GRUB_BIDI_TYPE_B, 0},
+{0x202a, 0x202a, GRUB_BIDI_TYPE_LRE, 0},
+{0x202b, 0x202b, GRUB_BIDI_TYPE_RLE, 0},
+{0x202c, 0x202c, GRUB_BIDI_TYPE_PDF, 0},
+{0x202d, 0x202d, GRUB_BIDI_TYPE_LRO, 0},
+{0x202e, 0x202e, GRUB_BIDI_TYPE_RLO, 0},
+{0x202f, 0x202f, GRUB_BIDI_TYPE_CS, 0},
+{0x2030, 0x2034, GRUB_BIDI_TYPE_ET, 0},
+{0x2035, 0x2043, GRUB_BIDI_TYPE_ON, 0},
+{0x2044, 0x2044, GRUB_BIDI_TYPE_CS, 0},
+{0x2045, 0x205e, GRUB_BIDI_TYPE_ON, 0},
+{0x205f, 0x205f, GRUB_BIDI_TYPE_WS, 0},
+{0x2060, 0x2064, GRUB_BIDI_TYPE_BN, 0},
+{0x206a, 0x206f, GRUB_BIDI_TYPE_BN, 0},
+{0x2070, 0x2070, GRUB_BIDI_TYPE_EN, 0},
+{0x2074, 0x2079, GRUB_BIDI_TYPE_EN, 0},
+{0x207a, 0x207b, GRUB_BIDI_TYPE_ES, 0},
+{0x207c, 0x207e, GRUB_BIDI_TYPE_ON, 0},
+{0x2080, 0x2089, GRUB_BIDI_TYPE_EN, 0},
+{0x208a, 0x208b, GRUB_BIDI_TYPE_ES, 0},
+{0x208c, 0x208e, GRUB_BIDI_TYPE_ON, 0},
+{0x20a0, 0x20b5, GRUB_BIDI_TYPE_ET, 0},
+{0x20d0, 0x20d1, GRUB_BIDI_TYPE_NSM, 230},
+{0x20d2, 0x20d3, GRUB_BIDI_TYPE_NSM, 1},
+{0x20d4, 0x20d7, GRUB_BIDI_TYPE_NSM, 230},
+{0x20d8, 0x20da, GRUB_BIDI_TYPE_NSM, 1},
+{0x20db, 0x20dc, GRUB_BIDI_TYPE_NSM, 230},
+{0x20dd, 0x20e0, GRUB_BIDI_TYPE_NSM, 253},
+{0x20e1, 0x20e1, GRUB_BIDI_TYPE_NSM, 230},
+{0x20e2, 0x20e4, GRUB_BIDI_TYPE_NSM, 253},
+{0x20e5, 0x20e6, GRUB_BIDI_TYPE_NSM, 1},
+{0x20e7, 0x20e7, GRUB_BIDI_TYPE_NSM, 230},
+{0x20e8, 0x20e8, GRUB_BIDI_TYPE_NSM, 220},
+{0x20e9, 0x20e9, GRUB_BIDI_TYPE_NSM, 230},
+{0x20ea, 0x20eb, GRUB_BIDI_TYPE_NSM, 1},
+{0x20ec, 0x20ef, GRUB_BIDI_TYPE_NSM, 220},
+{0x20f0, 0x20f0, GRUB_BIDI_TYPE_NSM, 230},
+{0x2100, 0x2101, GRUB_BIDI_TYPE_ON, 0},
+{0x2103, 0x2106, GRUB_BIDI_TYPE_ON, 0},
+{0x2108, 0x2109, GRUB_BIDI_TYPE_ON, 0},
+{0x2114, 0x2114, GRUB_BIDI_TYPE_ON, 0},
+{0x2116, 0x2118, GRUB_BIDI_TYPE_ON, 0},
+{0x211e, 0x2123, GRUB_BIDI_TYPE_ON, 0},
+{0x2125, 0x2125, GRUB_BIDI_TYPE_ON, 0},
+{0x2127, 0x2127, GRUB_BIDI_TYPE_ON, 0},
+{0x2129, 0x2129, GRUB_BIDI_TYPE_ON, 0},
+{0x212e, 0x212e, GRUB_BIDI_TYPE_ET, 0},
+{0x213a, 0x213b, GRUB_BIDI_TYPE_ON, 0},
+{0x2140, 0x2144, GRUB_BIDI_TYPE_ON, 0},
+{0x214a, 0x214d, GRUB_BIDI_TYPE_ON, 0},
+{0x2153, 0x215f, GRUB_BIDI_TYPE_ON, 0},
+{0x2190, 0x2211, GRUB_BIDI_TYPE_ON, 0},
+{0x2212, 0x2212, GRUB_BIDI_TYPE_ES, 0},
+{0x2213, 0x2213, GRUB_BIDI_TYPE_ET, 0},
+{0x2214, 0x2335, GRUB_BIDI_TYPE_ON, 0},
+{0x237b, 0x2394, GRUB_BIDI_TYPE_ON, 0},
+{0x2396, 0x23e7, GRUB_BIDI_TYPE_ON, 0},
+{0x2400, 0x2426, GRUB_BIDI_TYPE_ON, 0},
+{0x2440, 0x244a, GRUB_BIDI_TYPE_ON, 0},
+{0x2460, 0x2487, GRUB_BIDI_TYPE_ON, 0},
+{0x2488, 0x249b, GRUB_BIDI_TYPE_EN, 0},
+{0x24ea, 0x269d, GRUB_BIDI_TYPE_ON, 0},
+{0x26a0, 0x26ab, GRUB_BIDI_TYPE_ON, 0},
+{0x26ad, 0x26bc, GRUB_BIDI_TYPE_ON, 0},
+{0x26c0, 0x26c3, GRUB_BIDI_TYPE_ON, 0},
+{0x2701, 0x2704, GRUB_BIDI_TYPE_ON, 0},
+{0x2706, 0x2709, GRUB_BIDI_TYPE_ON, 0},
+{0x270c, 0x2727, GRUB_BIDI_TYPE_ON, 0},
+{0x2729, 0x274b, GRUB_BIDI_TYPE_ON, 0},
+{0x274d, 0x274d, GRUB_BIDI_TYPE_ON, 0},
+{0x274f, 0x2752, GRUB_BIDI_TYPE_ON, 0},
+{0x2756, 0x2756, GRUB_BIDI_TYPE_ON, 0},
+{0x2758, 0x275e, GRUB_BIDI_TYPE_ON, 0},
+{0x2761, 0x2794, GRUB_BIDI_TYPE_ON, 0},
+{0x2798, 0x27af, GRUB_BIDI_TYPE_ON, 0},
+{0x27b1, 0x27be, GRUB_BIDI_TYPE_ON, 0},
+{0x27c0, 0x27ca, GRUB_BIDI_TYPE_ON, 0},
+{0x27cc, 0x27cc, GRUB_BIDI_TYPE_ON, 0},
+{0x27d0, 0x27ff, GRUB_BIDI_TYPE_ON, 0},
+{0x2900, 0x2b4c, GRUB_BIDI_TYPE_ON, 0},
+{0x2b50, 0x2b54, GRUB_BIDI_TYPE_ON, 0},
+{0x2ce5, 0x2cea, GRUB_BIDI_TYPE_ON, 0},
+{0x2cf9, 0x2cff, GRUB_BIDI_TYPE_ON, 0},
+{0x2de0, 0x2dff, GRUB_BIDI_TYPE_NSM, 230},
+{0x2e00, 0x2e30, GRUB_BIDI_TYPE_ON, 0},
+{0x2e80, 0x2e99, GRUB_BIDI_TYPE_ON, 0},
+{0x2e9b, 0x2ef3, GRUB_BIDI_TYPE_ON, 0},
+{0x2f00, 0x2fd5, GRUB_BIDI_TYPE_ON, 0},
+{0x2ff0, 0x2ffb, GRUB_BIDI_TYPE_ON, 0},
+{0x3000, 0x3000, GRUB_BIDI_TYPE_WS, 0},
+{0x3001, 0x3004, GRUB_BIDI_TYPE_ON, 0},
+{0x3008, 0x3020, GRUB_BIDI_TYPE_ON, 0},
+{0x302a, 0x302a, GRUB_BIDI_TYPE_NSM, 218},
+{0x302b, 0x302b, GRUB_BIDI_TYPE_NSM, 228},
+{0x302c, 0x302c, GRUB_BIDI_TYPE_NSM, 232},
+{0x302d, 0x302d, GRUB_BIDI_TYPE_NSM, 222},
+{0x302e, 0x302f, GRUB_BIDI_TYPE_NSM, 224},
+{0x3030, 0x3030, GRUB_BIDI_TYPE_ON, 0},
+{0x3036, 0x3037, GRUB_BIDI_TYPE_ON, 0},
+{0x303d, 0x303f, GRUB_BIDI_TYPE_ON, 0},
+{0x3099, 0x309a, GRUB_BIDI_TYPE_NSM, 8},
+{0x309b, 0x309c, GRUB_BIDI_TYPE_ON, 0},
+{0x30a0, 0x30a0, GRUB_BIDI_TYPE_ON, 0},
+{0x30fb, 0x30fb, GRUB_BIDI_TYPE_ON, 0},
+{0x31c0, 0x31e3, GRUB_BIDI_TYPE_ON, 0},
+{0x321d, 0x321e, GRUB_BIDI_TYPE_ON, 0},
+{0x3250, 0x325f, GRUB_BIDI_TYPE_ON, 0},
+{0x327c, 0x327e, GRUB_BIDI_TYPE_ON, 0},
+{0x32b1, 0x32bf, GRUB_BIDI_TYPE_ON, 0},
+{0x32cc, 0x32cf, GRUB_BIDI_TYPE_ON, 0},
+{0x3377, 0x337a, GRUB_BIDI_TYPE_ON, 0},
+{0x33de, 0x33df, GRUB_BIDI_TYPE_ON, 0},
+{0x33ff, 0x33ff, GRUB_BIDI_TYPE_ON, 0},
+{0x4dc0, 0x4dff, GRUB_BIDI_TYPE_ON, 0},
+{0xa490, 0xa4c6, GRUB_BIDI_TYPE_ON, 0},
+{0xa60d, 0xa60f, GRUB_BIDI_TYPE_ON, 0},
+{0xa66f, 0xa66f, GRUB_BIDI_TYPE_NSM, 230},
+{0xa670, 0xa672, GRUB_BIDI_TYPE_NSM, 253},
+{0xa673, 0xa673, GRUB_BIDI_TYPE_ON, 0},
+{0xa67c, 0xa67d, GRUB_BIDI_TYPE_NSM, 230},
+{0xa67e, 0xa67f, GRUB_BIDI_TYPE_ON, 0},
+{0xa700, 0xa721, GRUB_BIDI_TYPE_ON, 0},
+{0xa788, 0xa788, GRUB_BIDI_TYPE_ON, 0},
+{0xa802, 0xa802, GRUB_BIDI_TYPE_NSM, 255},
+{0xa806, 0xa806, GRUB_BIDI_TYPE_NSM, 9},
+{0xa80b, 0xa80b, GRUB_BIDI_TYPE_NSM, 255},
+{0xa823, 0xa824, GRUB_BIDI_TYPE_L, 254},
+{0xa825, 0xa826, GRUB_BIDI_TYPE_NSM, 255},
+{0xa827, 0xa827, GRUB_BIDI_TYPE_L, 254},
+{0xa828, 0xa82b, GRUB_BIDI_TYPE_ON, 0},
+{0xa874, 0xa877, GRUB_BIDI_TYPE_ON, 0},
+{0xa880, 0xa881, GRUB_BIDI_TYPE_L, 254},
+{0xa8b4, 0xa8c3, GRUB_BIDI_TYPE_L, 254},
+{0xa8c4, 0xa8c4, GRUB_BIDI_TYPE_NSM, 9},
+{0xa926, 0xa92a, GRUB_BIDI_TYPE_NSM, 255},
+{0xa92b, 0xa92d, GRUB_BIDI_TYPE_NSM, 220},
+{0xa947, 0xa951, GRUB_BIDI_TYPE_NSM, 255},
+{0xa952, 0xa952, GRUB_BIDI_TYPE_L, 254},
+{0xa953, 0xa953, GRUB_BIDI_TYPE_L, 9},
+{0xaa29, 0xaa2e, GRUB_BIDI_TYPE_NSM, 255},
+{0xaa2f, 0xaa30, GRUB_BIDI_TYPE_L, 254},
+{0xaa31, 0xaa32, GRUB_BIDI_TYPE_NSM, 255},
+{0xaa33, 0xaa34, GRUB_BIDI_TYPE_L, 254},
+{0xaa35, 0xaa36, GRUB_BIDI_TYPE_NSM, 255},
+{0xaa43, 0xaa43, GRUB_BIDI_TYPE_NSM, 255},
+{0xaa4c, 0xaa4c, GRUB_BIDI_TYPE_NSM, 255},
+{0xaa4d, 0xaa4d, GRUB_BIDI_TYPE_L, 254},
+{0xfb1d, 0xfb1d, GRUB_BIDI_TYPE_R, 0},
+{0xfb1e, 0xfb1e, GRUB_BIDI_TYPE_NSM, 26},
+{0xfb1f, 0xfb28, GRUB_BIDI_TYPE_R, 0},
+{0xfb29, 0xfb29, GRUB_BIDI_TYPE_ES, 0},
+{0xfb2a, 0xfb36, GRUB_BIDI_TYPE_R, 0},
+{0xfb38, 0xfb3c, GRUB_BIDI_TYPE_R, 0},
+{0xfb3e, 0xfb3e, GRUB_BIDI_TYPE_R, 0},
+{0xfb40, 0xfb41, GRUB_BIDI_TYPE_R, 0},
+{0xfb43, 0xfb44, GRUB_BIDI_TYPE_R, 0},
+{0xfb46, 0xfb4f, GRUB_BIDI_TYPE_R, 0},
+{0xfb50, 0xfbb1, GRUB_BIDI_TYPE_AL, 0},
+{0xfbd3, 0xfd3d, GRUB_BIDI_TYPE_AL, 0},
+{0xfd3e, 0xfd3f, GRUB_BIDI_TYPE_ON, 0},
+{0xfd50, 0xfd8f, GRUB_BIDI_TYPE_AL, 0},
+{0xfd92, 0xfdc7, GRUB_BIDI_TYPE_AL, 0},
+{0xfdf0, 0xfdfc, GRUB_BIDI_TYPE_AL, 0},
+{0xfdfd, 0xfdfd, GRUB_BIDI_TYPE_ON, 0},
+{0xfe00, 0xfe0f, GRUB_BIDI_TYPE_NSM, 255},
+{0xfe10, 0xfe19, GRUB_BIDI_TYPE_ON, 0},
+{0xfe20, 0xfe26, GRUB_BIDI_TYPE_NSM, 230},
+{0xfe30, 0xfe4f, GRUB_BIDI_TYPE_ON, 0},
+{0xfe50, 0xfe50, GRUB_BIDI_TYPE_CS, 0},
+{0xfe51, 0xfe51, GRUB_BIDI_TYPE_ON, 0},
+{0xfe52, 0xfe52, GRUB_BIDI_TYPE_CS, 0},
+{0xfe54, 0xfe54, GRUB_BIDI_TYPE_ON, 0},
+{0xfe55, 0xfe55, GRUB_BIDI_TYPE_CS, 0},
+{0xfe56, 0xfe5e, GRUB_BIDI_TYPE_ON, 0},
+{0xfe5f, 0xfe5f, GRUB_BIDI_TYPE_ET, 0},
+{0xfe60, 0xfe61, GRUB_BIDI_TYPE_ON, 0},
+{0xfe62, 0xfe63, GRUB_BIDI_TYPE_ES, 0},
+{0xfe64, 0xfe66, GRUB_BIDI_TYPE_ON, 0},
+{0xfe68, 0xfe68, GRUB_BIDI_TYPE_ON, 0},
+{0xfe69, 0xfe6a, GRUB_BIDI_TYPE_ET, 0},
+{0xfe6b, 0xfe6b, GRUB_BIDI_TYPE_ON, 0},
+{0xfe70, 0xfe74, GRUB_BIDI_TYPE_AL, 0},
+{0xfe76, 0xfefc, GRUB_BIDI_TYPE_AL, 0},
+{0xfeff, 0xfeff, GRUB_BIDI_TYPE_BN, 0},
+{0xff01, 0xff02, GRUB_BIDI_TYPE_ON, 0},
+{0xff03, 0xff05, GRUB_BIDI_TYPE_ET, 0},
+{0xff06, 0xff0a, GRUB_BIDI_TYPE_ON, 0},
+{0xff0b, 0xff0b, GRUB_BIDI_TYPE_ES, 0},
+{0xff0c, 0xff0c, GRUB_BIDI_TYPE_CS, 0},
+{0xff0d, 0xff0d, GRUB_BIDI_TYPE_ES, 0},
+{0xff0e, 0xff0f, GRUB_BIDI_TYPE_CS, 0},
+{0xff10, 0xff19, GRUB_BIDI_TYPE_EN, 0},
+{0xff1a, 0xff1a, GRUB_BIDI_TYPE_CS, 0},
+{0xff1b, 0xff20, GRUB_BIDI_TYPE_ON, 0},
+{0xff3b, 0xff40, GRUB_BIDI_TYPE_ON, 0},
+{0xff5b, 0xff65, GRUB_BIDI_TYPE_ON, 0},
+{0xffe0, 0xffe1, GRUB_BIDI_TYPE_ET, 0},
+{0xffe2, 0xffe4, GRUB_BIDI_TYPE_ON, 0},
+{0xffe5, 0xffe6, GRUB_BIDI_TYPE_ET, 0},
+{0xffe8, 0xffee, GRUB_BIDI_TYPE_ON, 0},
+{0xfff9, 0xfffd, GRUB_BIDI_TYPE_ON, 0},
+{0x10101, 0x10101, GRUB_BIDI_TYPE_ON, 0},
+{0x10140, 0x1018a, GRUB_BIDI_TYPE_ON, 0},
+{0x10190, 0x1019b, GRUB_BIDI_TYPE_ON, 0},
+{0x101fd, 0x101fd, GRUB_BIDI_TYPE_NSM, 220},
+{0x10800, 0x10805, GRUB_BIDI_TYPE_R, 0},
+{0x10808, 0x10808, GRUB_BIDI_TYPE_R, 0},
+{0x1080a, 0x10835, GRUB_BIDI_TYPE_R, 0},
+{0x10837, 0x10838, GRUB_BIDI_TYPE_R, 0},
+{0x1083c, 0x1083c, GRUB_BIDI_TYPE_R, 0},
+{0x1083f, 0x1083f, GRUB_BIDI_TYPE_R, 0},
+{0x10900, 0x10919, GRUB_BIDI_TYPE_R, 0},
+{0x1091f, 0x1091f, GRUB_BIDI_TYPE_ON, 0},
+{0x10920, 0x10939, GRUB_BIDI_TYPE_R, 0},
+{0x1093f, 0x1093f, GRUB_BIDI_TYPE_R, 0},
+{0x10a00, 0x10a00, GRUB_BIDI_TYPE_R, 0},
+{0x10a01, 0x10a03, GRUB_BIDI_TYPE_NSM, 255},
+{0x10a05, 0x10a06, GRUB_BIDI_TYPE_NSM, 255},
+{0x10a0c, 0x10a0c, GRUB_BIDI_TYPE_NSM, 255},
+{0x10a0d, 0x10a0d, GRUB_BIDI_TYPE_NSM, 220},
+{0x10a0e, 0x10a0e, GRUB_BIDI_TYPE_NSM, 255},
+{0x10a0f, 0x10a0f, GRUB_BIDI_TYPE_NSM, 230},
+{0x10a10, 0x10a13, GRUB_BIDI_TYPE_R, 0},
+{0x10a15, 0x10a17, GRUB_BIDI_TYPE_R, 0},
+{0x10a19, 0x10a33, GRUB_BIDI_TYPE_R, 0},
+{0x10a38, 0x10a38, GRUB_BIDI_TYPE_NSM, 230},
+{0x10a39, 0x10a39, GRUB_BIDI_TYPE_NSM, 1},
+{0x10a3a, 0x10a3a, GRUB_BIDI_TYPE_NSM, 220},
+{0x10a3f, 0x10a3f, GRUB_BIDI_TYPE_NSM, 9},
+{0x10a40, 0x10a47, GRUB_BIDI_TYPE_R, 0},
+{0x10a50, 0x10a58, GRUB_BIDI_TYPE_R, 0},
+{0x1d165, 0x1d166, GRUB_BIDI_TYPE_L, 216},
+{0x1d167, 0x1d169, GRUB_BIDI_TYPE_NSM, 1},
+{0x1d16d, 0x1d16d, GRUB_BIDI_TYPE_L, 226},
+{0x1d16e, 0x1d172, GRUB_BIDI_TYPE_L, 216},
+{0x1d173, 0x1d17a, GRUB_BIDI_TYPE_BN, 0},
+{0x1d17b, 0x1d182, GRUB_BIDI_TYPE_NSM, 220},
+{0x1d185, 0x1d189, GRUB_BIDI_TYPE_NSM, 230},
+{0x1d18a, 0x1d18b, GRUB_BIDI_TYPE_NSM, 220},
+{0x1d1aa, 0x1d1ad, GRUB_BIDI_TYPE_NSM, 230},
+{0x1d200, 0x1d241, GRUB_BIDI_TYPE_ON, 0},
+{0x1d242, 0x1d244, GRUB_BIDI_TYPE_NSM, 230},
+{0x1d245, 0x1d245, GRUB_BIDI_TYPE_ON, 0},
+{0x1d300, 0x1d356, GRUB_BIDI_TYPE_ON, 0},
+{0x1d7ce, 0x1d7ff, GRUB_BIDI_TYPE_EN, 0},
+{0x1f000, 0x1f02b, GRUB_BIDI_TYPE_ON, 0},
+{0x1f030, 0x1f093, GRUB_BIDI_TYPE_ON, 0},
+{0xe0001, 0xe0001, GRUB_BIDI_TYPE_BN, 0},
+{0xe0020, 0xe007f, GRUB_BIDI_TYPE_BN, 0},
+{0xe0100, 0xe01ef, GRUB_BIDI_TYPE_NSM, 255},
+{0, 0, 0, 0},
 };
\ No newline at end of file
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index a358ba5b0..2074c64b0 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -170,6 +170,9 @@ add_char (struct grub_font_info *font_info, FT_Face face,
   if ((*p_glyph) && ((*p_glyph)->char_code == char_code))
     return;
 
+  if (glyph->next)
+    printf ("%x\n", char_code);
+
   width = glyph->bitmap.width;
   height = glyph->bitmap.rows;
 
diff --git a/util/import_bidi.py b/util/import_bidi.py
deleted file mode 100644
index 543174ad9..000000000
--- a/util/import_bidi.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#*
-#*  GRUB  --  GRand Unified Bootloader
-#*  Copyright (C) 2010  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/>.
-#*
-
-import re
-import sys
-import os
-import datetime
-
-if len (sys.argv) < 3:
-    print ("Usage: %s SOURCE DESTINATION" % sys.argv[0])
-    exit (0)
-infile = open (sys.argv[1], "r")
-outfile = open (sys.argv[2], "w")
-outfile.write ("#include <grub/bidi.h>\n")
-outfile.write ("\n")
-outfile.write ("struct grub_bidi_compact_range grub_bidi_compact[] = {\n")
-
-begin = -2
-last = -2
-lasttype = "X"
-for line in infile:
-    sp = line.split (";")
-    cur = int (sp[0], 16)
-    curtype = sp[4]
-    if last + 1 != cur or curtype != lasttype:
-        if begin != -2 and lasttype != "L":
-            outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s},\n" \
-                                % (begin, last, lasttype)))
-        begin = cur
-    last = cur
-    lasttype = curtype
-if lasttype != "L":
-    outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s},\n" \
-                        % (begin, last, lasttype)))
-outfile.write ("{0, 0, 0},\n")
-
-outfile.write ("};")
diff --git a/util/import_unicode.py b/util/import_unicode.py
new file mode 100644
index 000000000..adba3f938
--- /dev/null
+++ b/util/import_unicode.py
@@ -0,0 +1,67 @@
+#*
+#*  GRUB  --  GRand Unified Bootloader
+#*  Copyright (C) 2010  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/>.
+#*
+
+import re
+import sys
+import os
+import datetime
+
+if len (sys.argv) < 3:
+    print ("Usage: %s SOURCE DESTINATION" % sys.argv[0])
+    exit (0)
+infile = open (sys.argv[1], "r")
+outfile = open (sys.argv[2], "w")
+outfile.write ("#include <grub/unicode.h>\n")
+outfile.write ("\n")
+outfile.write ("struct grub_unicode_compact_range grub_unicode_compact[] = {\n")
+
+begincode = -2
+lastcode = -2
+lastbiditype = "X"
+lastcombtype = -1
+for line in infile:
+    sp = line.split (";")
+    curcode = int (sp[0], 16)
+    curbiditype = sp[4]
+    curcombtype = int (sp[3], 10)
+    if curcombtype <= 255 and curcombtype >= 253:
+        print ("UnicodeData.txt uses combination type %d. Conflict." \
+                   % curcombtype)
+        raise
+    if curcombtype == 0 and sp[2] == "Me":
+        curcombtype = 253
+    if curcombtype == 0 and sp[2] == "Mc":
+        curcombtype = 254
+    if curcombtype == 0 and sp[2] == "Mn":
+        curcombtype = 255
+    if lastcode + 1 != curcode or curbiditype != lastbiditype \
+            or curcombtype != lastcombtype:
+        if begincode != -2 and (lastbiditype != "L" or lastcombtype != 0):
+            outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s, %d},\n" \
+                                % (begincode, lastcode, lastbiditype, \
+                                       lastcombtype)))
+        begincode = curcode
+    lastcode = curcode
+    lastbiditype = curbiditype
+    lastcombtype = curcombtype
+if lastbiditype != "L" or lastcombtype != 0:
+    outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s, %d},\n" \
+                        % (begincode, lastcode, lastbiditype, lastcombtype)))
+outfile.write ("{0, 0, 0, 0},\n")
+
+outfile.write ("};")

From c1b952d3d9a79ad03ded72d8abc58c0190f8a065 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Thu, 7 Jan 2010 18:20:11 +0000
Subject: [PATCH 0215/1628] 2010-01-07  Robert Millan  <rmh.grub@aybabtu.com>

	* util/grub.d/10_hurd.in: Add --class information to menuentries.
	* util/grub.d/10_kfreebsd.in: Likewise.
	* util/grub.d/10_linux.in: Likewise.
---
 ChangeLog.mkconfig         |  5 +++++
 util/grub.d/10_hurd.in     |  7 +++++--
 util/grub.d/10_kfreebsd.in | 16 ++++++++++++----
 util/grub.d/10_linux.in    |  7 +++++--
 4 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 ChangeLog.mkconfig

diff --git a/ChangeLog.mkconfig b/ChangeLog.mkconfig
new file mode 100644
index 000000000..665c938c7
--- /dev/null
+++ b/ChangeLog.mkconfig
@@ -0,0 +1,5 @@
+2010-01-07  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* util/grub.d/10_hurd.in: Add --class information to menuentries.
+	* util/grub.d/10_kfreebsd.in: Likewise.
+	* util/grub.d/10_linux.in: Likewise.
diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index c1871e07a..b56c585ee 100644
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # grub-mkconfig helper script.
-# Copyright (C) 2006,2007,2008  Free Software Foundation, Inc.
+# Copyright (C) 2006,2007,2008,2010  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
@@ -21,10 +21,13 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 . ${libdir}/grub/grub-mkconfig_lib
 
+CLASS="--class gnu --class os"
+
 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS=GNU
 else
   OS="${GRUB_DISTRIBUTOR} GNU/Hurd"
+  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}"
 fi
 
 at_least_one=false
@@ -69,7 +72,7 @@ if ${all_of_them} && test -e /lib/ld.so.1 ; then : ; else
 fi
 
 cat << EOF
-menuentry "${OS}" {
+menuentry "${OS}" ${CLASS} {
 EOF
 prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
 cat << EOF
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index 026f1d7ac..7eb26072c 100644
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # grub-mkconfig helper script.
-# Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 2006,2007,2008,2009,2010  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
@@ -26,9 +26,17 @@ libdir=@libdir@
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR=@LOCALEDIR@
 
+CLASS="--class os"
+
 case "${GRUB_DISTRIBUTOR}" in
-  Debian)	OS="${GRUB_DISTRIBUTOR} GNU/kFreeBSD" ;;
-  *)		OS="FreeBSD" ;;
+  Debian)
+	OS="${GRUB_DISTRIBUTOR} GNU/kFreeBSD"
+	CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') --class gnu-kfreebsd --class gnu ${CLASS}"
+  ;;
+  *)
+	OS="FreeBSD"
+	CLASS="--class freebsd --class bsd ${CLASS}"
+  ;;
 esac
 
 kfreebsd_entry ()
@@ -38,7 +46,7 @@ kfreebsd_entry ()
   recovery="$3"	# not used yet
   args="$4"	# not used yet
   title="$(gettext "%s, with kFreeBSD %s")"
-  printf "menuentry \"${title}\" {" ${os} ${version}
+  printf "menuentry \"${title}\" ${CLASS} {" ${os} ${version}
   save_default_entry | sed -e "s/^/\t/"
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index dc9696ec8..74d880641 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # grub-mkconfig helper script.
-# Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 2006,2007,2008,2009,2010  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
@@ -26,10 +26,13 @@ libdir=@libdir@
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR=@LOCALEDIR@
 
+CLASS="--class gnu-linux --class gnu --class os"
+
 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS=GNU/Linux
 else
   OS="${GRUB_DISTRIBUTOR} GNU/Linux"
+  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}"
 fi
 
 # loop-AES arranges things so that /dev/loop/X can be our root device, but
@@ -58,7 +61,7 @@ linux_entry ()
   else
     title="$(gettext "%s, with Linux %s")"
   fi
-  printf "menuentry \"${title}\" {" ${os} ${version}
+  printf "menuentry \"${title}\" ${CLASS} {" ${os} ${version}
   save_default_entry | sed -e "s/^/\t/"
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"

From 97ea65d432235ac23f93b8b2eb297e40fedda3f9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 7 Jan 2010 21:25:56 +0100
Subject: [PATCH 0216/1628] Add mirroring and stacked combining marks

---
 font/font.c            | 192 +++++++++--
 include/grub/font.h    |   2 +
 include/grub/unicode.h |   7 +-
 unidata.c              | 715 -----------------------------------------
 util/import_unicode.py |  23 +-
 5 files changed, 193 insertions(+), 746 deletions(-)
 delete mode 100644 unidata.c

diff --git a/font/font.c b/font/font.c
index 54b6a1048..6655a29ae 100644
--- a/font/font.c
+++ b/font/font.c
@@ -850,6 +850,13 @@ grub_font_get_descent (grub_font_t font)
   return font->descent;
 }
 
+/* FIXME: not correct for all fonts.  */
+int
+grub_font_get_xheight (grub_font_t font)
+{
+  return font->ascent / 2;
+}
+
 /* Get the *standard leading* of the font in pixel, which is the spacing
    between two lines of text.  Specifically, it is the space between the
    descent of one line and the ascent of the next line.  This is included
@@ -1041,6 +1048,40 @@ grub_font_blit_glyph (struct grub_font_glyph *target,
     }
 }
 
+static void
+grub_font_blit_glyph_mirror (struct grub_font_glyph *target,
+			     struct grub_font_glyph *src,
+			     unsigned dx, unsigned dy)
+{
+  unsigned tgt_bit, src_byte, tgt_byte;
+  signed src_bit;
+  unsigned i, j;
+  for (i = 0; i < src->height; i++)
+    {
+      src_bit = (src->width * i + src->width - 1) % 8;
+      src_byte = (src->width * i + src->width - 1) / 8;
+      tgt_bit = (target->width * (dy + i) + dx) % 8;
+      tgt_byte = (target->width * (dy + i) + dx) / 8;
+      for (j = 0; j < src->width; j++)
+	{
+	  target->bitmap[tgt_byte] |= ((src->bitmap[src_byte] << src_bit)
+				       & 0x80) >> tgt_bit;
+	  src_bit--;
+	  tgt_bit++;
+	  if (src_bit == -1)
+	    {
+	      src_byte--;
+	      src_bit = 7;
+	    }
+	  if (tgt_bit == 8)
+	    {
+	      tgt_byte++;
+	      tgt_bit = 0;
+	    }
+	}
+    }
+}
+
 static inline enum grub_comb_type
 get_comb_type (grub_uint32_t c)
 {
@@ -1079,6 +1120,7 @@ grub_font_construct_glyph (grub_font_t hinted_font,
   grub_uint16_t height;
   grub_int16_t offset_x;
   grub_int16_t offset_y;
+  grub_int16_t curtop, curbottom;
   grub_uint16_t device_width;
   struct grub_font_glyph *main_glyph;
   struct grub_font_glyph **combining_glyphs;
@@ -1093,12 +1135,12 @@ grub_font_construct_glyph (grub_font_t hinted_font,
       return grub_font_dup_glyph (unknown_glyph);
     }
 
-  if (!glyph_id->ncomb)
+  if (!glyph_id->ncomb && !glyph_id->attributes)
     return grub_font_dup_glyph (main_glyph);
 
   combining_glyphs = grub_malloc (sizeof (combining_glyphs[0])
 				  * glyph_id->ncomb);
-  if (!combining_glyphs)
+  if (glyph_id->ncomb && !combining_glyphs)
     {
       grub_errno = GRUB_ERR_NONE;
       return grub_font_dup_glyph (main_glyph);
@@ -1121,6 +1163,43 @@ grub_font_construct_glyph (grub_font_t hinted_font,
       combtype = get_comb_type (glyph_id->combining[i]);
       switch (combtype)
 	{
+	case GRUB_UNICODE_STACK_ABOVE:
+	  {
+	    grub_int16_t space;
+	    space = combining_glyphs[i]->offset_y
+	      - grub_font_get_xheight (combining_glyphs[i]->font);
+	    if (space < 1)
+	      space = 1;
+	    if (width < combining_glyphs[i]->width)
+	      {
+		offset_x -= (combining_glyphs[i]->width - width) / 2;
+		width = combining_glyphs[i]->width;
+	      }
+	    if (device_width < combining_glyphs[i]->width)
+	      device_width = combining_glyphs[i]->width;
+	    height += combining_glyphs[i]->height + space;
+	  }
+	  break;  
+
+	case GRUB_UNICODE_STACK_BELOW:
+	  {
+	    grub_int16_t space;
+	    space = -(combining_glyphs[i]->offset_y 
+		      + combining_glyphs[i]->height);
+	    if (space < 1)
+	      space = 1;
+	    if (width < combining_glyphs[i]->width)
+	      {
+		offset_x -= (combining_glyphs[i]->width - width) / 2;
+		width = combining_glyphs[i]->width;
+	      }
+	    if (device_width < combining_glyphs[i]->width)
+	      device_width = combining_glyphs[i]->width;
+	    height += combining_glyphs[i]->height + space;
+	    offset_y -= combining_glyphs[i]->height + space;
+	  }
+	  break;
+
 	default:
 	  {
 	    /* Default handling. Just draw combining character on top
@@ -1166,9 +1245,18 @@ grub_font_construct_glyph (grub_font_t hinted_font,
   glyph->offset_y = offset_y;
   glyph->device_width = device_width;
 
-  grub_font_blit_glyph (glyph, main_glyph, main_glyph->offset_x - offset_x,
-			(height + offset_y)
-			- (main_glyph->height + main_glyph->offset_y));
+  if (glyph_id->attributes & GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR)
+    grub_font_blit_glyph_mirror (glyph, main_glyph,
+				 main_glyph->offset_x - offset_x,
+				 (height + offset_y)
+				 - (main_glyph->height + main_glyph->offset_y));
+  else
+    grub_font_blit_glyph (glyph, main_glyph, main_glyph->offset_x - offset_x,
+			  (height + offset_y)
+			  - (main_glyph->height + main_glyph->offset_y));
+
+  curtop = main_glyph->height + main_glyph->offset_y;
+  curbottom = main_glyph->offset_y;
 
   for (i = 0; i < glyph_id->ncomb; i++)
     {
@@ -1178,6 +1266,37 @@ grub_font_construct_glyph (grub_font_t hinted_font,
       combtype = get_comb_type (glyph_id->combining[i]);
       switch (combtype)
 	{
+	case GRUB_UNICODE_STACK_ABOVE:
+	  {
+	    grub_int16_t space;
+	    space = combining_glyphs[i]->offset_y
+	      - grub_font_get_xheight (combining_glyphs[i]->font);
+	    if (space < 0)
+	      space = 1;
+
+	    curtop += combining_glyphs[i]->height + space;
+	    grub_font_blit_glyph (glyph, combining_glyphs[i],
+				  (width - combining_glyphs[i]->width) / 2,
+				  (height + offset_y) - curtop);
+	  }
+	  break;
+
+	case GRUB_UNICODE_STACK_BELOW:
+	  {
+	    grub_int16_t space;
+	    space = -(combining_glyphs[i]->offset_y 
+		      + combining_glyphs[i]->height);
+	    if (space < 0)
+	      space = 1;
+
+	    curbottom -= space;
+	    grub_font_blit_glyph (glyph, combining_glyphs[i],
+				  (width - combining_glyphs[i]->width) / 2,
+				  (height + offset_y) - curbottom);
+	    curbottom -= combining_glyphs[i]->height;
+	  }
+	  break;
+
 	default:
 	  {
 	    /* Default handling. Just draw combining character on top
@@ -1247,27 +1366,39 @@ grub_font_draw_glyph (struct grub_font_glyph *glyph,
                                  glyph->width, glyph->height);
 }
 
+static grub_uint8_t *bidi_types = NULL;
+
+static void
+unpack_bidi (void)
+{
+  unsigned i;
+  struct grub_unicode_compact_range *cur;
+
+  bidi_types = grub_zalloc (GRUB_UNICODE_MAX_CACHED_CHAR);
+  if (!bidi_types)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      return;
+    }
+  for (cur = grub_unicode_compact; cur->end; cur++)
+    for (i = cur->start; i <= cur->end
+	     && i < GRUB_UNICODE_MAX_CACHED_CHAR; i++)
+      if (cur->bidi_mirror)
+	bidi_types[i] = cur->bidi_type | 0x80;
+      else
+	bidi_types[i] = cur->bidi_type | 0x00;
+}
+
 static inline enum grub_bidi_type
 get_bidi_type (grub_uint32_t c)
 {
-  static grub_uint8_t *bidi_types = NULL;
   struct grub_unicode_compact_range *cur;
 
   if (!bidi_types)
-    {
-      unsigned i;
-      bidi_types = grub_zalloc (GRUB_UNICODE_MAX_CACHED_CHAR);
-      if (bidi_types)
-	for (cur = grub_unicode_compact; cur->end; cur++)
-	  for (i = cur->start; i <= cur->end
-		 && i < GRUB_UNICODE_MAX_CACHED_CHAR; i++)
-	    bidi_types[i] = cur->bidi_type;
-      else
-	grub_errno = GRUB_ERR_NONE;
-    }
+    unpack_bidi ();
 
   if (bidi_types && c < GRUB_UNICODE_MAX_CACHED_CHAR)
-    return bidi_types[c];
+    return bidi_types[c] & 0x7f;
 
   for (cur = grub_unicode_compact; cur->end; cur++)
     if (cur->start <= c && c <= cur->end)
@@ -1276,6 +1407,24 @@ get_bidi_type (grub_uint32_t c)
   return GRUB_BIDI_TYPE_L;
 }
 
+static inline int
+is_mirrored (grub_uint32_t c)
+{
+  struct grub_unicode_compact_range *cur;
+
+  if (!bidi_types)
+    unpack_bidi ();
+
+  if (bidi_types && c < GRUB_UNICODE_MAX_CACHED_CHAR)
+    return !!(bidi_types[c] & 0x80);
+
+  for (cur = grub_unicode_compact; cur->end; cur++)
+    if (cur->start <= c && c <= cur->end)
+      return cur->bidi_mirror;
+
+  return 0;
+}
+
 static grub_ssize_t
 grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
 				 grub_size_t logical_len,
@@ -1450,6 +1599,7 @@ grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
 	      resolved_types[visual_len] = type;
 	    visual[visual_len].base = logical[i];
 	    visual[visual_len].variant = 0;
+	    visual[visual_len].attributes = 0;
 	    visual[visual_len].ncomb = 0;
 	    visual[visual_len].combining = NULL;
 	    visual_len++;
@@ -1629,7 +1779,7 @@ grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
 	if (levels[i] > max_level)
 	  max_level = levels[i];
 	if (levels[i] < min_odd_level && (levels[i] & 1))
-	  min_odd_level = levels[i];	
+	  min_odd_level = levels[i];
       }
     for (j = max_level; j >= min_odd_level; j--)
       {
@@ -1644,6 +1794,10 @@ grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
       }
   }
 
+  for (i = 0; i < visual_len; i++)
+    if (is_mirrored (visual[i].base) && levels[i])
+      visual[i].attributes |= GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR;
+
   grub_free (levels);
 
   *visual_out = visual;
diff --git a/include/grub/font.h b/include/grub/font.h
index 8a5f3ac7d..f8bc4c4e2 100644
--- a/include/grub/font.h
+++ b/include/grub/font.h
@@ -96,6 +96,8 @@ int grub_font_get_leading (grub_font_t font);
 
 int grub_font_get_height (grub_font_t font);
 
+int grub_font_get_xheight (grub_font_t font);
+
 int grub_font_get_string_width (grub_font_t font, const char *str);
 
 struct grub_font_glyph *grub_font_get_glyph (grub_font_t font,
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 79d553eec..20c7c4167 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -27,6 +27,7 @@ struct grub_unicode_compact_range
   grub_uint32_t end:21;
   grub_uint8_t bidi_type:5;
   grub_uint8_t comb_type;
+  grub_uint8_t bidi_mirror:1;
 } __attribute__ ((packed));
 
 enum grub_bidi_type
@@ -67,13 +68,13 @@ enum grub_comb_type
 struct grub_unicode_glyph
 {
   grub_uint32_t base;
-  /* Unicode permits 256 variation selectors but since we need a value
-     for "default" we have to use grub_uint16_t.  */
-  grub_uint16_t variant;
+  grub_uint16_t variant:9;
+  grub_uint8_t attributes:1;
   grub_size_t ncomb;
   grub_uint32_t *combining;
 };
 
+#define GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR 0x1
 #define GRUB_UNICODE_VARIATION_SELECTOR_1 0xfe00
 #define GRUB_UNICODE_VARIATION_SELECTOR_16 0xfe0f
 #define GRUB_UNICODE_VARIATION_SELECTOR_17 0xe0100
diff --git a/unidata.c b/unidata.c
deleted file mode 100644
index 02d0f9712..000000000
--- a/unidata.c
+++ /dev/null
@@ -1,715 +0,0 @@
-#include <grub/unicode.h>
-
-struct grub_unicode_compact_range grub_unicode_compact[] = {
-{0x0, 0x8, GRUB_BIDI_TYPE_BN, 0},
-{0x9, 0x9, GRUB_BIDI_TYPE_S, 0},
-{0xa, 0xa, GRUB_BIDI_TYPE_B, 0},
-{0xb, 0xb, GRUB_BIDI_TYPE_S, 0},
-{0xc, 0xc, GRUB_BIDI_TYPE_WS, 0},
-{0xd, 0xd, GRUB_BIDI_TYPE_B, 0},
-{0xe, 0x1b, GRUB_BIDI_TYPE_BN, 0},
-{0x1c, 0x1e, GRUB_BIDI_TYPE_B, 0},
-{0x1f, 0x1f, GRUB_BIDI_TYPE_S, 0},
-{0x20, 0x20, GRUB_BIDI_TYPE_WS, 0},
-{0x21, 0x22, GRUB_BIDI_TYPE_ON, 0},
-{0x23, 0x25, GRUB_BIDI_TYPE_ET, 0},
-{0x26, 0x2a, GRUB_BIDI_TYPE_ON, 0},
-{0x2b, 0x2b, GRUB_BIDI_TYPE_ES, 0},
-{0x2c, 0x2c, GRUB_BIDI_TYPE_CS, 0},
-{0x2d, 0x2d, GRUB_BIDI_TYPE_ES, 0},
-{0x2e, 0x2f, GRUB_BIDI_TYPE_CS, 0},
-{0x30, 0x39, GRUB_BIDI_TYPE_EN, 0},
-{0x3a, 0x3a, GRUB_BIDI_TYPE_CS, 0},
-{0x3b, 0x40, GRUB_BIDI_TYPE_ON, 0},
-{0x5b, 0x60, GRUB_BIDI_TYPE_ON, 0},
-{0x7b, 0x7e, GRUB_BIDI_TYPE_ON, 0},
-{0x7f, 0x84, GRUB_BIDI_TYPE_BN, 0},
-{0x85, 0x85, GRUB_BIDI_TYPE_B, 0},
-{0x86, 0x9f, GRUB_BIDI_TYPE_BN, 0},
-{0xa0, 0xa0, GRUB_BIDI_TYPE_CS, 0},
-{0xa1, 0xa1, GRUB_BIDI_TYPE_ON, 0},
-{0xa2, 0xa5, GRUB_BIDI_TYPE_ET, 0},
-{0xa6, 0xa9, GRUB_BIDI_TYPE_ON, 0},
-{0xab, 0xac, GRUB_BIDI_TYPE_ON, 0},
-{0xad, 0xad, GRUB_BIDI_TYPE_BN, 0},
-{0xae, 0xaf, GRUB_BIDI_TYPE_ON, 0},
-{0xb0, 0xb1, GRUB_BIDI_TYPE_ET, 0},
-{0xb2, 0xb3, GRUB_BIDI_TYPE_EN, 0},
-{0xb4, 0xb4, GRUB_BIDI_TYPE_ON, 0},
-{0xb6, 0xb8, GRUB_BIDI_TYPE_ON, 0},
-{0xb9, 0xb9, GRUB_BIDI_TYPE_EN, 0},
-{0xbb, 0xbf, GRUB_BIDI_TYPE_ON, 0},
-{0xd7, 0xd7, GRUB_BIDI_TYPE_ON, 0},
-{0xf7, 0xf7, GRUB_BIDI_TYPE_ON, 0},
-{0x2b9, 0x2ba, GRUB_BIDI_TYPE_ON, 0},
-{0x2c2, 0x2cf, GRUB_BIDI_TYPE_ON, 0},
-{0x2d2, 0x2df, GRUB_BIDI_TYPE_ON, 0},
-{0x2e5, 0x2ed, GRUB_BIDI_TYPE_ON, 0},
-{0x2ef, 0x2ff, GRUB_BIDI_TYPE_ON, 0},
-{0x300, 0x314, GRUB_BIDI_TYPE_NSM, 230},
-{0x315, 0x315, GRUB_BIDI_TYPE_NSM, 232},
-{0x316, 0x319, GRUB_BIDI_TYPE_NSM, 220},
-{0x31a, 0x31a, GRUB_BIDI_TYPE_NSM, 232},
-{0x31b, 0x31b, GRUB_BIDI_TYPE_NSM, 216},
-{0x31c, 0x320, GRUB_BIDI_TYPE_NSM, 220},
-{0x321, 0x322, GRUB_BIDI_TYPE_NSM, 202},
-{0x323, 0x326, GRUB_BIDI_TYPE_NSM, 220},
-{0x327, 0x328, GRUB_BIDI_TYPE_NSM, 202},
-{0x329, 0x333, GRUB_BIDI_TYPE_NSM, 220},
-{0x334, 0x338, GRUB_BIDI_TYPE_NSM, 1},
-{0x339, 0x33c, GRUB_BIDI_TYPE_NSM, 220},
-{0x33d, 0x344, GRUB_BIDI_TYPE_NSM, 230},
-{0x345, 0x345, GRUB_BIDI_TYPE_NSM, 240},
-{0x346, 0x346, GRUB_BIDI_TYPE_NSM, 230},
-{0x347, 0x349, GRUB_BIDI_TYPE_NSM, 220},
-{0x34a, 0x34c, GRUB_BIDI_TYPE_NSM, 230},
-{0x34d, 0x34e, GRUB_BIDI_TYPE_NSM, 220},
-{0x34f, 0x34f, GRUB_BIDI_TYPE_NSM, 255},
-{0x350, 0x352, GRUB_BIDI_TYPE_NSM, 230},
-{0x353, 0x356, GRUB_BIDI_TYPE_NSM, 220},
-{0x357, 0x357, GRUB_BIDI_TYPE_NSM, 230},
-{0x358, 0x358, GRUB_BIDI_TYPE_NSM, 232},
-{0x359, 0x35a, GRUB_BIDI_TYPE_NSM, 220},
-{0x35b, 0x35b, GRUB_BIDI_TYPE_NSM, 230},
-{0x35c, 0x35c, GRUB_BIDI_TYPE_NSM, 233},
-{0x35d, 0x35e, GRUB_BIDI_TYPE_NSM, 234},
-{0x35f, 0x35f, GRUB_BIDI_TYPE_NSM, 233},
-{0x360, 0x361, GRUB_BIDI_TYPE_NSM, 234},
-{0x362, 0x362, GRUB_BIDI_TYPE_NSM, 233},
-{0x363, 0x36f, GRUB_BIDI_TYPE_NSM, 230},
-{0x374, 0x375, GRUB_BIDI_TYPE_ON, 0},
-{0x37e, 0x37e, GRUB_BIDI_TYPE_ON, 0},
-{0x384, 0x385, GRUB_BIDI_TYPE_ON, 0},
-{0x387, 0x387, GRUB_BIDI_TYPE_ON, 0},
-{0x3f6, 0x3f6, GRUB_BIDI_TYPE_ON, 0},
-{0x483, 0x487, GRUB_BIDI_TYPE_NSM, 230},
-{0x488, 0x489, GRUB_BIDI_TYPE_NSM, 253},
-{0x58a, 0x58a, GRUB_BIDI_TYPE_ON, 0},
-{0x591, 0x591, GRUB_BIDI_TYPE_NSM, 220},
-{0x592, 0x595, GRUB_BIDI_TYPE_NSM, 230},
-{0x596, 0x596, GRUB_BIDI_TYPE_NSM, 220},
-{0x597, 0x599, GRUB_BIDI_TYPE_NSM, 230},
-{0x59a, 0x59a, GRUB_BIDI_TYPE_NSM, 222},
-{0x59b, 0x59b, GRUB_BIDI_TYPE_NSM, 220},
-{0x59c, 0x5a1, GRUB_BIDI_TYPE_NSM, 230},
-{0x5a2, 0x5a7, GRUB_BIDI_TYPE_NSM, 220},
-{0x5a8, 0x5a9, GRUB_BIDI_TYPE_NSM, 230},
-{0x5aa, 0x5aa, GRUB_BIDI_TYPE_NSM, 220},
-{0x5ab, 0x5ac, GRUB_BIDI_TYPE_NSM, 230},
-{0x5ad, 0x5ad, GRUB_BIDI_TYPE_NSM, 222},
-{0x5ae, 0x5ae, GRUB_BIDI_TYPE_NSM, 228},
-{0x5af, 0x5af, GRUB_BIDI_TYPE_NSM, 230},
-{0x5b0, 0x5b0, GRUB_BIDI_TYPE_NSM, 10},
-{0x5b1, 0x5b1, GRUB_BIDI_TYPE_NSM, 11},
-{0x5b2, 0x5b2, GRUB_BIDI_TYPE_NSM, 12},
-{0x5b3, 0x5b3, GRUB_BIDI_TYPE_NSM, 13},
-{0x5b4, 0x5b4, GRUB_BIDI_TYPE_NSM, 14},
-{0x5b5, 0x5b5, GRUB_BIDI_TYPE_NSM, 15},
-{0x5b6, 0x5b6, GRUB_BIDI_TYPE_NSM, 16},
-{0x5b7, 0x5b7, GRUB_BIDI_TYPE_NSM, 17},
-{0x5b8, 0x5b8, GRUB_BIDI_TYPE_NSM, 18},
-{0x5b9, 0x5ba, GRUB_BIDI_TYPE_NSM, 19},
-{0x5bb, 0x5bb, GRUB_BIDI_TYPE_NSM, 20},
-{0x5bc, 0x5bc, GRUB_BIDI_TYPE_NSM, 21},
-{0x5bd, 0x5bd, GRUB_BIDI_TYPE_NSM, 22},
-{0x5be, 0x5be, GRUB_BIDI_TYPE_R, 0},
-{0x5bf, 0x5bf, GRUB_BIDI_TYPE_NSM, 23},
-{0x5c0, 0x5c0, GRUB_BIDI_TYPE_R, 0},
-{0x5c1, 0x5c1, GRUB_BIDI_TYPE_NSM, 24},
-{0x5c2, 0x5c2, GRUB_BIDI_TYPE_NSM, 25},
-{0x5c3, 0x5c3, GRUB_BIDI_TYPE_R, 0},
-{0x5c4, 0x5c4, GRUB_BIDI_TYPE_NSM, 230},
-{0x5c5, 0x5c5, GRUB_BIDI_TYPE_NSM, 220},
-{0x5c6, 0x5c6, GRUB_BIDI_TYPE_R, 0},
-{0x5c7, 0x5c7, GRUB_BIDI_TYPE_NSM, 18},
-{0x5d0, 0x5ea, GRUB_BIDI_TYPE_R, 0},
-{0x5f0, 0x5f4, GRUB_BIDI_TYPE_R, 0},
-{0x600, 0x603, GRUB_BIDI_TYPE_AN, 0},
-{0x606, 0x607, GRUB_BIDI_TYPE_ON, 0},
-{0x608, 0x608, GRUB_BIDI_TYPE_AL, 0},
-{0x609, 0x60a, GRUB_BIDI_TYPE_ET, 0},
-{0x60b, 0x60b, GRUB_BIDI_TYPE_AL, 0},
-{0x60c, 0x60c, GRUB_BIDI_TYPE_CS, 0},
-{0x60d, 0x60d, GRUB_BIDI_TYPE_AL, 0},
-{0x60e, 0x60f, GRUB_BIDI_TYPE_ON, 0},
-{0x610, 0x617, GRUB_BIDI_TYPE_NSM, 230},
-{0x618, 0x618, GRUB_BIDI_TYPE_NSM, 30},
-{0x619, 0x619, GRUB_BIDI_TYPE_NSM, 31},
-{0x61a, 0x61a, GRUB_BIDI_TYPE_NSM, 32},
-{0x61b, 0x61b, GRUB_BIDI_TYPE_AL, 0},
-{0x61e, 0x61f, GRUB_BIDI_TYPE_AL, 0},
-{0x621, 0x64a, GRUB_BIDI_TYPE_AL, 0},
-{0x64b, 0x64b, GRUB_BIDI_TYPE_NSM, 27},
-{0x64c, 0x64c, GRUB_BIDI_TYPE_NSM, 28},
-{0x64d, 0x64d, GRUB_BIDI_TYPE_NSM, 29},
-{0x64e, 0x64e, GRUB_BIDI_TYPE_NSM, 30},
-{0x64f, 0x64f, GRUB_BIDI_TYPE_NSM, 31},
-{0x650, 0x650, GRUB_BIDI_TYPE_NSM, 32},
-{0x651, 0x651, GRUB_BIDI_TYPE_NSM, 33},
-{0x652, 0x652, GRUB_BIDI_TYPE_NSM, 34},
-{0x653, 0x654, GRUB_BIDI_TYPE_NSM, 230},
-{0x655, 0x656, GRUB_BIDI_TYPE_NSM, 220},
-{0x657, 0x65b, GRUB_BIDI_TYPE_NSM, 230},
-{0x65c, 0x65c, GRUB_BIDI_TYPE_NSM, 220},
-{0x65d, 0x65e, GRUB_BIDI_TYPE_NSM, 230},
-{0x660, 0x669, GRUB_BIDI_TYPE_AN, 0},
-{0x66a, 0x66a, GRUB_BIDI_TYPE_ET, 0},
-{0x66b, 0x66c, GRUB_BIDI_TYPE_AN, 0},
-{0x66d, 0x66f, GRUB_BIDI_TYPE_AL, 0},
-{0x670, 0x670, GRUB_BIDI_TYPE_NSM, 35},
-{0x671, 0x6d5, GRUB_BIDI_TYPE_AL, 0},
-{0x6d6, 0x6dc, GRUB_BIDI_TYPE_NSM, 230},
-{0x6dd, 0x6dd, GRUB_BIDI_TYPE_AN, 0},
-{0x6de, 0x6de, GRUB_BIDI_TYPE_NSM, 253},
-{0x6df, 0x6e2, GRUB_BIDI_TYPE_NSM, 230},
-{0x6e3, 0x6e3, GRUB_BIDI_TYPE_NSM, 220},
-{0x6e4, 0x6e4, GRUB_BIDI_TYPE_NSM, 230},
-{0x6e5, 0x6e6, GRUB_BIDI_TYPE_AL, 0},
-{0x6e7, 0x6e8, GRUB_BIDI_TYPE_NSM, 230},
-{0x6e9, 0x6e9, GRUB_BIDI_TYPE_ON, 0},
-{0x6ea, 0x6ea, GRUB_BIDI_TYPE_NSM, 220},
-{0x6eb, 0x6ec, GRUB_BIDI_TYPE_NSM, 230},
-{0x6ed, 0x6ed, GRUB_BIDI_TYPE_NSM, 220},
-{0x6ee, 0x6ef, GRUB_BIDI_TYPE_AL, 0},
-{0x6f0, 0x6f9, GRUB_BIDI_TYPE_EN, 0},
-{0x6fa, 0x70d, GRUB_BIDI_TYPE_AL, 0},
-{0x70f, 0x70f, GRUB_BIDI_TYPE_BN, 0},
-{0x710, 0x710, GRUB_BIDI_TYPE_AL, 0},
-{0x711, 0x711, GRUB_BIDI_TYPE_NSM, 36},
-{0x712, 0x72f, GRUB_BIDI_TYPE_AL, 0},
-{0x730, 0x730, GRUB_BIDI_TYPE_NSM, 230},
-{0x731, 0x731, GRUB_BIDI_TYPE_NSM, 220},
-{0x732, 0x733, GRUB_BIDI_TYPE_NSM, 230},
-{0x734, 0x734, GRUB_BIDI_TYPE_NSM, 220},
-{0x735, 0x736, GRUB_BIDI_TYPE_NSM, 230},
-{0x737, 0x739, GRUB_BIDI_TYPE_NSM, 220},
-{0x73a, 0x73a, GRUB_BIDI_TYPE_NSM, 230},
-{0x73b, 0x73c, GRUB_BIDI_TYPE_NSM, 220},
-{0x73d, 0x73d, GRUB_BIDI_TYPE_NSM, 230},
-{0x73e, 0x73e, GRUB_BIDI_TYPE_NSM, 220},
-{0x73f, 0x741, GRUB_BIDI_TYPE_NSM, 230},
-{0x742, 0x742, GRUB_BIDI_TYPE_NSM, 220},
-{0x743, 0x743, GRUB_BIDI_TYPE_NSM, 230},
-{0x744, 0x744, GRUB_BIDI_TYPE_NSM, 220},
-{0x745, 0x745, GRUB_BIDI_TYPE_NSM, 230},
-{0x746, 0x746, GRUB_BIDI_TYPE_NSM, 220},
-{0x747, 0x747, GRUB_BIDI_TYPE_NSM, 230},
-{0x748, 0x748, GRUB_BIDI_TYPE_NSM, 220},
-{0x749, 0x74a, GRUB_BIDI_TYPE_NSM, 230},
-{0x74d, 0x7a5, GRUB_BIDI_TYPE_AL, 0},
-{0x7a6, 0x7b0, GRUB_BIDI_TYPE_NSM, 255},
-{0x7b1, 0x7b1, GRUB_BIDI_TYPE_AL, 0},
-{0x7c0, 0x7ea, GRUB_BIDI_TYPE_R, 0},
-{0x7eb, 0x7f1, GRUB_BIDI_TYPE_NSM, 230},
-{0x7f2, 0x7f2, GRUB_BIDI_TYPE_NSM, 220},
-{0x7f3, 0x7f3, GRUB_BIDI_TYPE_NSM, 230},
-{0x7f4, 0x7f5, GRUB_BIDI_TYPE_R, 0},
-{0x7f6, 0x7f9, GRUB_BIDI_TYPE_ON, 0},
-{0x7fa, 0x7fa, GRUB_BIDI_TYPE_R, 0},
-{0x901, 0x902, GRUB_BIDI_TYPE_NSM, 255},
-{0x903, 0x903, GRUB_BIDI_TYPE_L, 254},
-{0x93c, 0x93c, GRUB_BIDI_TYPE_NSM, 7},
-{0x93e, 0x940, GRUB_BIDI_TYPE_L, 254},
-{0x941, 0x948, GRUB_BIDI_TYPE_NSM, 255},
-{0x949, 0x94c, GRUB_BIDI_TYPE_L, 254},
-{0x94d, 0x94d, GRUB_BIDI_TYPE_NSM, 9},
-{0x951, 0x951, GRUB_BIDI_TYPE_NSM, 230},
-{0x952, 0x952, GRUB_BIDI_TYPE_NSM, 220},
-{0x953, 0x954, GRUB_BIDI_TYPE_NSM, 230},
-{0x962, 0x963, GRUB_BIDI_TYPE_NSM, 255},
-{0x981, 0x981, GRUB_BIDI_TYPE_NSM, 255},
-{0x982, 0x983, GRUB_BIDI_TYPE_L, 254},
-{0x9bc, 0x9bc, GRUB_BIDI_TYPE_NSM, 7},
-{0x9be, 0x9c0, GRUB_BIDI_TYPE_L, 254},
-{0x9c1, 0x9c4, GRUB_BIDI_TYPE_NSM, 255},
-{0x9c7, 0x9c8, GRUB_BIDI_TYPE_L, 254},
-{0x9cb, 0x9cc, GRUB_BIDI_TYPE_L, 254},
-{0x9cd, 0x9cd, GRUB_BIDI_TYPE_NSM, 9},
-{0x9d7, 0x9d7, GRUB_BIDI_TYPE_L, 254},
-{0x9e2, 0x9e3, GRUB_BIDI_TYPE_NSM, 255},
-{0x9f2, 0x9f3, GRUB_BIDI_TYPE_ET, 0},
-{0xa01, 0xa02, GRUB_BIDI_TYPE_NSM, 255},
-{0xa03, 0xa03, GRUB_BIDI_TYPE_L, 254},
-{0xa3c, 0xa3c, GRUB_BIDI_TYPE_NSM, 7},
-{0xa3e, 0xa40, GRUB_BIDI_TYPE_L, 254},
-{0xa41, 0xa42, GRUB_BIDI_TYPE_NSM, 255},
-{0xa47, 0xa48, GRUB_BIDI_TYPE_NSM, 255},
-{0xa4b, 0xa4c, GRUB_BIDI_TYPE_NSM, 255},
-{0xa4d, 0xa4d, GRUB_BIDI_TYPE_NSM, 9},
-{0xa51, 0xa51, GRUB_BIDI_TYPE_NSM, 255},
-{0xa70, 0xa71, GRUB_BIDI_TYPE_NSM, 255},
-{0xa75, 0xa75, GRUB_BIDI_TYPE_NSM, 255},
-{0xa81, 0xa82, GRUB_BIDI_TYPE_NSM, 255},
-{0xa83, 0xa83, GRUB_BIDI_TYPE_L, 254},
-{0xabc, 0xabc, GRUB_BIDI_TYPE_NSM, 7},
-{0xabe, 0xac0, GRUB_BIDI_TYPE_L, 254},
-{0xac1, 0xac5, GRUB_BIDI_TYPE_NSM, 255},
-{0xac7, 0xac8, GRUB_BIDI_TYPE_NSM, 255},
-{0xac9, 0xac9, GRUB_BIDI_TYPE_L, 254},
-{0xacb, 0xacc, GRUB_BIDI_TYPE_L, 254},
-{0xacd, 0xacd, GRUB_BIDI_TYPE_NSM, 9},
-{0xae2, 0xae3, GRUB_BIDI_TYPE_NSM, 255},
-{0xaf1, 0xaf1, GRUB_BIDI_TYPE_ET, 0},
-{0xb01, 0xb01, GRUB_BIDI_TYPE_NSM, 255},
-{0xb02, 0xb03, GRUB_BIDI_TYPE_L, 254},
-{0xb3c, 0xb3c, GRUB_BIDI_TYPE_NSM, 7},
-{0xb3e, 0xb3e, GRUB_BIDI_TYPE_L, 254},
-{0xb3f, 0xb3f, GRUB_BIDI_TYPE_NSM, 255},
-{0xb40, 0xb40, GRUB_BIDI_TYPE_L, 254},
-{0xb41, 0xb44, GRUB_BIDI_TYPE_NSM, 255},
-{0xb47, 0xb48, GRUB_BIDI_TYPE_L, 254},
-{0xb4b, 0xb4c, GRUB_BIDI_TYPE_L, 254},
-{0xb4d, 0xb4d, GRUB_BIDI_TYPE_NSM, 9},
-{0xb56, 0xb56, GRUB_BIDI_TYPE_NSM, 255},
-{0xb57, 0xb57, GRUB_BIDI_TYPE_L, 254},
-{0xb62, 0xb63, GRUB_BIDI_TYPE_NSM, 255},
-{0xb82, 0xb82, GRUB_BIDI_TYPE_NSM, 255},
-{0xbbe, 0xbbf, GRUB_BIDI_TYPE_L, 254},
-{0xbc0, 0xbc0, GRUB_BIDI_TYPE_NSM, 255},
-{0xbc1, 0xbc2, GRUB_BIDI_TYPE_L, 254},
-{0xbc6, 0xbc8, GRUB_BIDI_TYPE_L, 254},
-{0xbca, 0xbcc, GRUB_BIDI_TYPE_L, 254},
-{0xbcd, 0xbcd, GRUB_BIDI_TYPE_NSM, 9},
-{0xbd7, 0xbd7, GRUB_BIDI_TYPE_L, 254},
-{0xbf3, 0xbf8, GRUB_BIDI_TYPE_ON, 0},
-{0xbf9, 0xbf9, GRUB_BIDI_TYPE_ET, 0},
-{0xbfa, 0xbfa, GRUB_BIDI_TYPE_ON, 0},
-{0xc01, 0xc03, GRUB_BIDI_TYPE_L, 254},
-{0xc3e, 0xc40, GRUB_BIDI_TYPE_NSM, 255},
-{0xc41, 0xc44, GRUB_BIDI_TYPE_L, 254},
-{0xc46, 0xc48, GRUB_BIDI_TYPE_NSM, 255},
-{0xc4a, 0xc4c, GRUB_BIDI_TYPE_NSM, 255},
-{0xc4d, 0xc4d, GRUB_BIDI_TYPE_NSM, 9},
-{0xc55, 0xc55, GRUB_BIDI_TYPE_NSM, 84},
-{0xc56, 0xc56, GRUB_BIDI_TYPE_NSM, 91},
-{0xc62, 0xc63, GRUB_BIDI_TYPE_NSM, 255},
-{0xc78, 0xc7e, GRUB_BIDI_TYPE_ON, 0},
-{0xc82, 0xc83, GRUB_BIDI_TYPE_L, 254},
-{0xcbc, 0xcbc, GRUB_BIDI_TYPE_NSM, 7},
-{0xcbe, 0xcbe, GRUB_BIDI_TYPE_L, 254},
-{0xcbf, 0xcbf, GRUB_BIDI_TYPE_L, 255},
-{0xcc0, 0xcc4, GRUB_BIDI_TYPE_L, 254},
-{0xcc6, 0xcc6, GRUB_BIDI_TYPE_L, 255},
-{0xcc7, 0xcc8, GRUB_BIDI_TYPE_L, 254},
-{0xcca, 0xccb, GRUB_BIDI_TYPE_L, 254},
-{0xccc, 0xccc, GRUB_BIDI_TYPE_NSM, 255},
-{0xccd, 0xccd, GRUB_BIDI_TYPE_NSM, 9},
-{0xcd5, 0xcd6, GRUB_BIDI_TYPE_L, 254},
-{0xce2, 0xce3, GRUB_BIDI_TYPE_NSM, 255},
-{0xcf1, 0xcf2, GRUB_BIDI_TYPE_ON, 0},
-{0xd02, 0xd03, GRUB_BIDI_TYPE_L, 254},
-{0xd3e, 0xd40, GRUB_BIDI_TYPE_L, 254},
-{0xd41, 0xd44, GRUB_BIDI_TYPE_NSM, 255},
-{0xd46, 0xd48, GRUB_BIDI_TYPE_L, 254},
-{0xd4a, 0xd4c, GRUB_BIDI_TYPE_L, 254},
-{0xd4d, 0xd4d, GRUB_BIDI_TYPE_NSM, 9},
-{0xd57, 0xd57, GRUB_BIDI_TYPE_L, 254},
-{0xd62, 0xd63, GRUB_BIDI_TYPE_NSM, 255},
-{0xd82, 0xd83, GRUB_BIDI_TYPE_L, 254},
-{0xdca, 0xdca, GRUB_BIDI_TYPE_NSM, 9},
-{0xdcf, 0xdd1, GRUB_BIDI_TYPE_L, 254},
-{0xdd2, 0xdd4, GRUB_BIDI_TYPE_NSM, 255},
-{0xdd6, 0xdd6, GRUB_BIDI_TYPE_NSM, 255},
-{0xdd8, 0xddf, GRUB_BIDI_TYPE_L, 254},
-{0xdf2, 0xdf3, GRUB_BIDI_TYPE_L, 254},
-{0xe31, 0xe31, GRUB_BIDI_TYPE_NSM, 255},
-{0xe34, 0xe37, GRUB_BIDI_TYPE_NSM, 255},
-{0xe38, 0xe39, GRUB_BIDI_TYPE_NSM, 103},
-{0xe3a, 0xe3a, GRUB_BIDI_TYPE_NSM, 9},
-{0xe3f, 0xe3f, GRUB_BIDI_TYPE_ET, 0},
-{0xe47, 0xe47, GRUB_BIDI_TYPE_NSM, 255},
-{0xe48, 0xe4b, GRUB_BIDI_TYPE_NSM, 107},
-{0xe4c, 0xe4e, GRUB_BIDI_TYPE_NSM, 255},
-{0xeb1, 0xeb1, GRUB_BIDI_TYPE_NSM, 255},
-{0xeb4, 0xeb7, GRUB_BIDI_TYPE_NSM, 255},
-{0xeb8, 0xeb9, GRUB_BIDI_TYPE_NSM, 118},
-{0xebb, 0xebc, GRUB_BIDI_TYPE_NSM, 255},
-{0xec8, 0xecb, GRUB_BIDI_TYPE_NSM, 122},
-{0xecc, 0xecd, GRUB_BIDI_TYPE_NSM, 255},
-{0xf18, 0xf19, GRUB_BIDI_TYPE_NSM, 220},
-{0xf35, 0xf35, GRUB_BIDI_TYPE_NSM, 220},
-{0xf37, 0xf37, GRUB_BIDI_TYPE_NSM, 220},
-{0xf39, 0xf39, GRUB_BIDI_TYPE_NSM, 216},
-{0xf3a, 0xf3d, GRUB_BIDI_TYPE_ON, 0},
-{0xf3e, 0xf3f, GRUB_BIDI_TYPE_L, 254},
-{0xf71, 0xf71, GRUB_BIDI_TYPE_NSM, 129},
-{0xf72, 0xf72, GRUB_BIDI_TYPE_NSM, 130},
-{0xf73, 0xf73, GRUB_BIDI_TYPE_NSM, 255},
-{0xf74, 0xf74, GRUB_BIDI_TYPE_NSM, 132},
-{0xf75, 0xf79, GRUB_BIDI_TYPE_NSM, 255},
-{0xf7a, 0xf7d, GRUB_BIDI_TYPE_NSM, 130},
-{0xf7e, 0xf7e, GRUB_BIDI_TYPE_NSM, 255},
-{0xf7f, 0xf7f, GRUB_BIDI_TYPE_L, 254},
-{0xf80, 0xf80, GRUB_BIDI_TYPE_NSM, 130},
-{0xf81, 0xf81, GRUB_BIDI_TYPE_NSM, 255},
-{0xf82, 0xf83, GRUB_BIDI_TYPE_NSM, 230},
-{0xf84, 0xf84, GRUB_BIDI_TYPE_NSM, 9},
-{0xf86, 0xf87, GRUB_BIDI_TYPE_NSM, 230},
-{0xf90, 0xf97, GRUB_BIDI_TYPE_NSM, 255},
-{0xf99, 0xfbc, GRUB_BIDI_TYPE_NSM, 255},
-{0xfc6, 0xfc6, GRUB_BIDI_TYPE_NSM, 220},
-{0x102b, 0x102c, GRUB_BIDI_TYPE_L, 254},
-{0x102d, 0x1030, GRUB_BIDI_TYPE_NSM, 255},
-{0x1031, 0x1031, GRUB_BIDI_TYPE_L, 254},
-{0x1032, 0x1036, GRUB_BIDI_TYPE_NSM, 255},
-{0x1037, 0x1037, GRUB_BIDI_TYPE_NSM, 7},
-{0x1038, 0x1038, GRUB_BIDI_TYPE_L, 254},
-{0x1039, 0x103a, GRUB_BIDI_TYPE_NSM, 9},
-{0x103b, 0x103c, GRUB_BIDI_TYPE_L, 254},
-{0x103d, 0x103e, GRUB_BIDI_TYPE_NSM, 255},
-{0x1056, 0x1057, GRUB_BIDI_TYPE_L, 254},
-{0x1058, 0x1059, GRUB_BIDI_TYPE_NSM, 255},
-{0x105e, 0x1060, GRUB_BIDI_TYPE_NSM, 255},
-{0x1062, 0x1064, GRUB_BIDI_TYPE_L, 254},
-{0x1067, 0x106d, GRUB_BIDI_TYPE_L, 254},
-{0x1071, 0x1074, GRUB_BIDI_TYPE_NSM, 255},
-{0x1082, 0x1082, GRUB_BIDI_TYPE_NSM, 255},
-{0x1083, 0x1084, GRUB_BIDI_TYPE_L, 254},
-{0x1085, 0x1086, GRUB_BIDI_TYPE_NSM, 255},
-{0x1087, 0x108c, GRUB_BIDI_TYPE_L, 254},
-{0x108d, 0x108d, GRUB_BIDI_TYPE_NSM, 220},
-{0x108f, 0x108f, GRUB_BIDI_TYPE_L, 254},
-{0x135f, 0x135f, GRUB_BIDI_TYPE_NSM, 230},
-{0x1390, 0x1399, GRUB_BIDI_TYPE_ON, 0},
-{0x1680, 0x1680, GRUB_BIDI_TYPE_WS, 0},
-{0x169b, 0x169c, GRUB_BIDI_TYPE_ON, 0},
-{0x1712, 0x1713, GRUB_BIDI_TYPE_NSM, 255},
-{0x1714, 0x1714, GRUB_BIDI_TYPE_NSM, 9},
-{0x1732, 0x1733, GRUB_BIDI_TYPE_NSM, 255},
-{0x1734, 0x1734, GRUB_BIDI_TYPE_NSM, 9},
-{0x1752, 0x1753, GRUB_BIDI_TYPE_NSM, 255},
-{0x1772, 0x1773, GRUB_BIDI_TYPE_NSM, 255},
-{0x17b6, 0x17b6, GRUB_BIDI_TYPE_L, 254},
-{0x17b7, 0x17bd, GRUB_BIDI_TYPE_NSM, 255},
-{0x17be, 0x17c5, GRUB_BIDI_TYPE_L, 254},
-{0x17c6, 0x17c6, GRUB_BIDI_TYPE_NSM, 255},
-{0x17c7, 0x17c8, GRUB_BIDI_TYPE_L, 254},
-{0x17c9, 0x17d1, GRUB_BIDI_TYPE_NSM, 255},
-{0x17d2, 0x17d2, GRUB_BIDI_TYPE_NSM, 9},
-{0x17d3, 0x17d3, GRUB_BIDI_TYPE_NSM, 255},
-{0x17db, 0x17db, GRUB_BIDI_TYPE_ET, 0},
-{0x17dd, 0x17dd, GRUB_BIDI_TYPE_NSM, 230},
-{0x17f0, 0x17f9, GRUB_BIDI_TYPE_ON, 0},
-{0x1800, 0x180a, GRUB_BIDI_TYPE_ON, 0},
-{0x180b, 0x180d, GRUB_BIDI_TYPE_NSM, 255},
-{0x180e, 0x180e, GRUB_BIDI_TYPE_WS, 0},
-{0x18a9, 0x18a9, GRUB_BIDI_TYPE_NSM, 228},
-{0x1920, 0x1922, GRUB_BIDI_TYPE_NSM, 255},
-{0x1923, 0x1926, GRUB_BIDI_TYPE_L, 254},
-{0x1927, 0x1928, GRUB_BIDI_TYPE_NSM, 255},
-{0x1929, 0x192b, GRUB_BIDI_TYPE_L, 254},
-{0x1930, 0x1931, GRUB_BIDI_TYPE_L, 254},
-{0x1932, 0x1932, GRUB_BIDI_TYPE_NSM, 255},
-{0x1933, 0x1938, GRUB_BIDI_TYPE_L, 254},
-{0x1939, 0x1939, GRUB_BIDI_TYPE_NSM, 222},
-{0x193a, 0x193a, GRUB_BIDI_TYPE_NSM, 230},
-{0x193b, 0x193b, GRUB_BIDI_TYPE_NSM, 220},
-{0x1940, 0x1940, GRUB_BIDI_TYPE_ON, 0},
-{0x1944, 0x1945, GRUB_BIDI_TYPE_ON, 0},
-{0x19b0, 0x19c0, GRUB_BIDI_TYPE_L, 254},
-{0x19c8, 0x19c9, GRUB_BIDI_TYPE_L, 254},
-{0x19de, 0x19ff, GRUB_BIDI_TYPE_ON, 0},
-{0x1a17, 0x1a17, GRUB_BIDI_TYPE_NSM, 230},
-{0x1a18, 0x1a18, GRUB_BIDI_TYPE_NSM, 220},
-{0x1a19, 0x1a1b, GRUB_BIDI_TYPE_L, 254},
-{0x1b00, 0x1b03, GRUB_BIDI_TYPE_NSM, 255},
-{0x1b04, 0x1b04, GRUB_BIDI_TYPE_L, 254},
-{0x1b34, 0x1b34, GRUB_BIDI_TYPE_NSM, 7},
-{0x1b35, 0x1b35, GRUB_BIDI_TYPE_L, 254},
-{0x1b36, 0x1b3a, GRUB_BIDI_TYPE_NSM, 255},
-{0x1b3b, 0x1b3b, GRUB_BIDI_TYPE_L, 254},
-{0x1b3c, 0x1b3c, GRUB_BIDI_TYPE_NSM, 255},
-{0x1b3d, 0x1b41, GRUB_BIDI_TYPE_L, 254},
-{0x1b42, 0x1b42, GRUB_BIDI_TYPE_NSM, 255},
-{0x1b43, 0x1b43, GRUB_BIDI_TYPE_L, 254},
-{0x1b44, 0x1b44, GRUB_BIDI_TYPE_L, 9},
-{0x1b6b, 0x1b6b, GRUB_BIDI_TYPE_NSM, 230},
-{0x1b6c, 0x1b6c, GRUB_BIDI_TYPE_NSM, 220},
-{0x1b6d, 0x1b73, GRUB_BIDI_TYPE_NSM, 230},
-{0x1b80, 0x1b81, GRUB_BIDI_TYPE_NSM, 255},
-{0x1b82, 0x1b82, GRUB_BIDI_TYPE_L, 254},
-{0x1ba1, 0x1ba1, GRUB_BIDI_TYPE_L, 254},
-{0x1ba2, 0x1ba5, GRUB_BIDI_TYPE_NSM, 255},
-{0x1ba6, 0x1ba7, GRUB_BIDI_TYPE_L, 254},
-{0x1ba8, 0x1ba9, GRUB_BIDI_TYPE_NSM, 255},
-{0x1baa, 0x1baa, GRUB_BIDI_TYPE_L, 9},
-{0x1c24, 0x1c2b, GRUB_BIDI_TYPE_L, 254},
-{0x1c2c, 0x1c33, GRUB_BIDI_TYPE_NSM, 255},
-{0x1c34, 0x1c35, GRUB_BIDI_TYPE_L, 254},
-{0x1c36, 0x1c36, GRUB_BIDI_TYPE_NSM, 255},
-{0x1c37, 0x1c37, GRUB_BIDI_TYPE_NSM, 7},
-{0x1dc0, 0x1dc1, GRUB_BIDI_TYPE_NSM, 230},
-{0x1dc2, 0x1dc2, GRUB_BIDI_TYPE_NSM, 220},
-{0x1dc3, 0x1dc9, GRUB_BIDI_TYPE_NSM, 230},
-{0x1dca, 0x1dca, GRUB_BIDI_TYPE_NSM, 220},
-{0x1dcb, 0x1dcc, GRUB_BIDI_TYPE_NSM, 230},
-{0x1dcd, 0x1dcd, GRUB_BIDI_TYPE_NSM, 234},
-{0x1dce, 0x1dce, GRUB_BIDI_TYPE_NSM, 214},
-{0x1dcf, 0x1dcf, GRUB_BIDI_TYPE_NSM, 220},
-{0x1dd0, 0x1dd0, GRUB_BIDI_TYPE_NSM, 202},
-{0x1dd1, 0x1de6, GRUB_BIDI_TYPE_NSM, 230},
-{0x1dfe, 0x1dfe, GRUB_BIDI_TYPE_NSM, 230},
-{0x1dff, 0x1dff, GRUB_BIDI_TYPE_NSM, 220},
-{0x1fbd, 0x1fbd, GRUB_BIDI_TYPE_ON, 0},
-{0x1fbf, 0x1fc1, GRUB_BIDI_TYPE_ON, 0},
-{0x1fcd, 0x1fcf, GRUB_BIDI_TYPE_ON, 0},
-{0x1fdd, 0x1fdf, GRUB_BIDI_TYPE_ON, 0},
-{0x1fed, 0x1fef, GRUB_BIDI_TYPE_ON, 0},
-{0x1ffd, 0x1ffe, GRUB_BIDI_TYPE_ON, 0},
-{0x2000, 0x200a, GRUB_BIDI_TYPE_WS, 0},
-{0x200b, 0x200d, GRUB_BIDI_TYPE_BN, 0},
-{0x200f, 0x200f, GRUB_BIDI_TYPE_R, 0},
-{0x2010, 0x2027, GRUB_BIDI_TYPE_ON, 0},
-{0x2028, 0x2028, GRUB_BIDI_TYPE_WS, 0},
-{0x2029, 0x2029, GRUB_BIDI_TYPE_B, 0},
-{0x202a, 0x202a, GRUB_BIDI_TYPE_LRE, 0},
-{0x202b, 0x202b, GRUB_BIDI_TYPE_RLE, 0},
-{0x202c, 0x202c, GRUB_BIDI_TYPE_PDF, 0},
-{0x202d, 0x202d, GRUB_BIDI_TYPE_LRO, 0},
-{0x202e, 0x202e, GRUB_BIDI_TYPE_RLO, 0},
-{0x202f, 0x202f, GRUB_BIDI_TYPE_CS, 0},
-{0x2030, 0x2034, GRUB_BIDI_TYPE_ET, 0},
-{0x2035, 0x2043, GRUB_BIDI_TYPE_ON, 0},
-{0x2044, 0x2044, GRUB_BIDI_TYPE_CS, 0},
-{0x2045, 0x205e, GRUB_BIDI_TYPE_ON, 0},
-{0x205f, 0x205f, GRUB_BIDI_TYPE_WS, 0},
-{0x2060, 0x2064, GRUB_BIDI_TYPE_BN, 0},
-{0x206a, 0x206f, GRUB_BIDI_TYPE_BN, 0},
-{0x2070, 0x2070, GRUB_BIDI_TYPE_EN, 0},
-{0x2074, 0x2079, GRUB_BIDI_TYPE_EN, 0},
-{0x207a, 0x207b, GRUB_BIDI_TYPE_ES, 0},
-{0x207c, 0x207e, GRUB_BIDI_TYPE_ON, 0},
-{0x2080, 0x2089, GRUB_BIDI_TYPE_EN, 0},
-{0x208a, 0x208b, GRUB_BIDI_TYPE_ES, 0},
-{0x208c, 0x208e, GRUB_BIDI_TYPE_ON, 0},
-{0x20a0, 0x20b5, GRUB_BIDI_TYPE_ET, 0},
-{0x20d0, 0x20d1, GRUB_BIDI_TYPE_NSM, 230},
-{0x20d2, 0x20d3, GRUB_BIDI_TYPE_NSM, 1},
-{0x20d4, 0x20d7, GRUB_BIDI_TYPE_NSM, 230},
-{0x20d8, 0x20da, GRUB_BIDI_TYPE_NSM, 1},
-{0x20db, 0x20dc, GRUB_BIDI_TYPE_NSM, 230},
-{0x20dd, 0x20e0, GRUB_BIDI_TYPE_NSM, 253},
-{0x20e1, 0x20e1, GRUB_BIDI_TYPE_NSM, 230},
-{0x20e2, 0x20e4, GRUB_BIDI_TYPE_NSM, 253},
-{0x20e5, 0x20e6, GRUB_BIDI_TYPE_NSM, 1},
-{0x20e7, 0x20e7, GRUB_BIDI_TYPE_NSM, 230},
-{0x20e8, 0x20e8, GRUB_BIDI_TYPE_NSM, 220},
-{0x20e9, 0x20e9, GRUB_BIDI_TYPE_NSM, 230},
-{0x20ea, 0x20eb, GRUB_BIDI_TYPE_NSM, 1},
-{0x20ec, 0x20ef, GRUB_BIDI_TYPE_NSM, 220},
-{0x20f0, 0x20f0, GRUB_BIDI_TYPE_NSM, 230},
-{0x2100, 0x2101, GRUB_BIDI_TYPE_ON, 0},
-{0x2103, 0x2106, GRUB_BIDI_TYPE_ON, 0},
-{0x2108, 0x2109, GRUB_BIDI_TYPE_ON, 0},
-{0x2114, 0x2114, GRUB_BIDI_TYPE_ON, 0},
-{0x2116, 0x2118, GRUB_BIDI_TYPE_ON, 0},
-{0x211e, 0x2123, GRUB_BIDI_TYPE_ON, 0},
-{0x2125, 0x2125, GRUB_BIDI_TYPE_ON, 0},
-{0x2127, 0x2127, GRUB_BIDI_TYPE_ON, 0},
-{0x2129, 0x2129, GRUB_BIDI_TYPE_ON, 0},
-{0x212e, 0x212e, GRUB_BIDI_TYPE_ET, 0},
-{0x213a, 0x213b, GRUB_BIDI_TYPE_ON, 0},
-{0x2140, 0x2144, GRUB_BIDI_TYPE_ON, 0},
-{0x214a, 0x214d, GRUB_BIDI_TYPE_ON, 0},
-{0x2153, 0x215f, GRUB_BIDI_TYPE_ON, 0},
-{0x2190, 0x2211, GRUB_BIDI_TYPE_ON, 0},
-{0x2212, 0x2212, GRUB_BIDI_TYPE_ES, 0},
-{0x2213, 0x2213, GRUB_BIDI_TYPE_ET, 0},
-{0x2214, 0x2335, GRUB_BIDI_TYPE_ON, 0},
-{0x237b, 0x2394, GRUB_BIDI_TYPE_ON, 0},
-{0x2396, 0x23e7, GRUB_BIDI_TYPE_ON, 0},
-{0x2400, 0x2426, GRUB_BIDI_TYPE_ON, 0},
-{0x2440, 0x244a, GRUB_BIDI_TYPE_ON, 0},
-{0x2460, 0x2487, GRUB_BIDI_TYPE_ON, 0},
-{0x2488, 0x249b, GRUB_BIDI_TYPE_EN, 0},
-{0x24ea, 0x269d, GRUB_BIDI_TYPE_ON, 0},
-{0x26a0, 0x26ab, GRUB_BIDI_TYPE_ON, 0},
-{0x26ad, 0x26bc, GRUB_BIDI_TYPE_ON, 0},
-{0x26c0, 0x26c3, GRUB_BIDI_TYPE_ON, 0},
-{0x2701, 0x2704, GRUB_BIDI_TYPE_ON, 0},
-{0x2706, 0x2709, GRUB_BIDI_TYPE_ON, 0},
-{0x270c, 0x2727, GRUB_BIDI_TYPE_ON, 0},
-{0x2729, 0x274b, GRUB_BIDI_TYPE_ON, 0},
-{0x274d, 0x274d, GRUB_BIDI_TYPE_ON, 0},
-{0x274f, 0x2752, GRUB_BIDI_TYPE_ON, 0},
-{0x2756, 0x2756, GRUB_BIDI_TYPE_ON, 0},
-{0x2758, 0x275e, GRUB_BIDI_TYPE_ON, 0},
-{0x2761, 0x2794, GRUB_BIDI_TYPE_ON, 0},
-{0x2798, 0x27af, GRUB_BIDI_TYPE_ON, 0},
-{0x27b1, 0x27be, GRUB_BIDI_TYPE_ON, 0},
-{0x27c0, 0x27ca, GRUB_BIDI_TYPE_ON, 0},
-{0x27cc, 0x27cc, GRUB_BIDI_TYPE_ON, 0},
-{0x27d0, 0x27ff, GRUB_BIDI_TYPE_ON, 0},
-{0x2900, 0x2b4c, GRUB_BIDI_TYPE_ON, 0},
-{0x2b50, 0x2b54, GRUB_BIDI_TYPE_ON, 0},
-{0x2ce5, 0x2cea, GRUB_BIDI_TYPE_ON, 0},
-{0x2cf9, 0x2cff, GRUB_BIDI_TYPE_ON, 0},
-{0x2de0, 0x2dff, GRUB_BIDI_TYPE_NSM, 230},
-{0x2e00, 0x2e30, GRUB_BIDI_TYPE_ON, 0},
-{0x2e80, 0x2e99, GRUB_BIDI_TYPE_ON, 0},
-{0x2e9b, 0x2ef3, GRUB_BIDI_TYPE_ON, 0},
-{0x2f00, 0x2fd5, GRUB_BIDI_TYPE_ON, 0},
-{0x2ff0, 0x2ffb, GRUB_BIDI_TYPE_ON, 0},
-{0x3000, 0x3000, GRUB_BIDI_TYPE_WS, 0},
-{0x3001, 0x3004, GRUB_BIDI_TYPE_ON, 0},
-{0x3008, 0x3020, GRUB_BIDI_TYPE_ON, 0},
-{0x302a, 0x302a, GRUB_BIDI_TYPE_NSM, 218},
-{0x302b, 0x302b, GRUB_BIDI_TYPE_NSM, 228},
-{0x302c, 0x302c, GRUB_BIDI_TYPE_NSM, 232},
-{0x302d, 0x302d, GRUB_BIDI_TYPE_NSM, 222},
-{0x302e, 0x302f, GRUB_BIDI_TYPE_NSM, 224},
-{0x3030, 0x3030, GRUB_BIDI_TYPE_ON, 0},
-{0x3036, 0x3037, GRUB_BIDI_TYPE_ON, 0},
-{0x303d, 0x303f, GRUB_BIDI_TYPE_ON, 0},
-{0x3099, 0x309a, GRUB_BIDI_TYPE_NSM, 8},
-{0x309b, 0x309c, GRUB_BIDI_TYPE_ON, 0},
-{0x30a0, 0x30a0, GRUB_BIDI_TYPE_ON, 0},
-{0x30fb, 0x30fb, GRUB_BIDI_TYPE_ON, 0},
-{0x31c0, 0x31e3, GRUB_BIDI_TYPE_ON, 0},
-{0x321d, 0x321e, GRUB_BIDI_TYPE_ON, 0},
-{0x3250, 0x325f, GRUB_BIDI_TYPE_ON, 0},
-{0x327c, 0x327e, GRUB_BIDI_TYPE_ON, 0},
-{0x32b1, 0x32bf, GRUB_BIDI_TYPE_ON, 0},
-{0x32cc, 0x32cf, GRUB_BIDI_TYPE_ON, 0},
-{0x3377, 0x337a, GRUB_BIDI_TYPE_ON, 0},
-{0x33de, 0x33df, GRUB_BIDI_TYPE_ON, 0},
-{0x33ff, 0x33ff, GRUB_BIDI_TYPE_ON, 0},
-{0x4dc0, 0x4dff, GRUB_BIDI_TYPE_ON, 0},
-{0xa490, 0xa4c6, GRUB_BIDI_TYPE_ON, 0},
-{0xa60d, 0xa60f, GRUB_BIDI_TYPE_ON, 0},
-{0xa66f, 0xa66f, GRUB_BIDI_TYPE_NSM, 230},
-{0xa670, 0xa672, GRUB_BIDI_TYPE_NSM, 253},
-{0xa673, 0xa673, GRUB_BIDI_TYPE_ON, 0},
-{0xa67c, 0xa67d, GRUB_BIDI_TYPE_NSM, 230},
-{0xa67e, 0xa67f, GRUB_BIDI_TYPE_ON, 0},
-{0xa700, 0xa721, GRUB_BIDI_TYPE_ON, 0},
-{0xa788, 0xa788, GRUB_BIDI_TYPE_ON, 0},
-{0xa802, 0xa802, GRUB_BIDI_TYPE_NSM, 255},
-{0xa806, 0xa806, GRUB_BIDI_TYPE_NSM, 9},
-{0xa80b, 0xa80b, GRUB_BIDI_TYPE_NSM, 255},
-{0xa823, 0xa824, GRUB_BIDI_TYPE_L, 254},
-{0xa825, 0xa826, GRUB_BIDI_TYPE_NSM, 255},
-{0xa827, 0xa827, GRUB_BIDI_TYPE_L, 254},
-{0xa828, 0xa82b, GRUB_BIDI_TYPE_ON, 0},
-{0xa874, 0xa877, GRUB_BIDI_TYPE_ON, 0},
-{0xa880, 0xa881, GRUB_BIDI_TYPE_L, 254},
-{0xa8b4, 0xa8c3, GRUB_BIDI_TYPE_L, 254},
-{0xa8c4, 0xa8c4, GRUB_BIDI_TYPE_NSM, 9},
-{0xa926, 0xa92a, GRUB_BIDI_TYPE_NSM, 255},
-{0xa92b, 0xa92d, GRUB_BIDI_TYPE_NSM, 220},
-{0xa947, 0xa951, GRUB_BIDI_TYPE_NSM, 255},
-{0xa952, 0xa952, GRUB_BIDI_TYPE_L, 254},
-{0xa953, 0xa953, GRUB_BIDI_TYPE_L, 9},
-{0xaa29, 0xaa2e, GRUB_BIDI_TYPE_NSM, 255},
-{0xaa2f, 0xaa30, GRUB_BIDI_TYPE_L, 254},
-{0xaa31, 0xaa32, GRUB_BIDI_TYPE_NSM, 255},
-{0xaa33, 0xaa34, GRUB_BIDI_TYPE_L, 254},
-{0xaa35, 0xaa36, GRUB_BIDI_TYPE_NSM, 255},
-{0xaa43, 0xaa43, GRUB_BIDI_TYPE_NSM, 255},
-{0xaa4c, 0xaa4c, GRUB_BIDI_TYPE_NSM, 255},
-{0xaa4d, 0xaa4d, GRUB_BIDI_TYPE_L, 254},
-{0xfb1d, 0xfb1d, GRUB_BIDI_TYPE_R, 0},
-{0xfb1e, 0xfb1e, GRUB_BIDI_TYPE_NSM, 26},
-{0xfb1f, 0xfb28, GRUB_BIDI_TYPE_R, 0},
-{0xfb29, 0xfb29, GRUB_BIDI_TYPE_ES, 0},
-{0xfb2a, 0xfb36, GRUB_BIDI_TYPE_R, 0},
-{0xfb38, 0xfb3c, GRUB_BIDI_TYPE_R, 0},
-{0xfb3e, 0xfb3e, GRUB_BIDI_TYPE_R, 0},
-{0xfb40, 0xfb41, GRUB_BIDI_TYPE_R, 0},
-{0xfb43, 0xfb44, GRUB_BIDI_TYPE_R, 0},
-{0xfb46, 0xfb4f, GRUB_BIDI_TYPE_R, 0},
-{0xfb50, 0xfbb1, GRUB_BIDI_TYPE_AL, 0},
-{0xfbd3, 0xfd3d, GRUB_BIDI_TYPE_AL, 0},
-{0xfd3e, 0xfd3f, GRUB_BIDI_TYPE_ON, 0},
-{0xfd50, 0xfd8f, GRUB_BIDI_TYPE_AL, 0},
-{0xfd92, 0xfdc7, GRUB_BIDI_TYPE_AL, 0},
-{0xfdf0, 0xfdfc, GRUB_BIDI_TYPE_AL, 0},
-{0xfdfd, 0xfdfd, GRUB_BIDI_TYPE_ON, 0},
-{0xfe00, 0xfe0f, GRUB_BIDI_TYPE_NSM, 255},
-{0xfe10, 0xfe19, GRUB_BIDI_TYPE_ON, 0},
-{0xfe20, 0xfe26, GRUB_BIDI_TYPE_NSM, 230},
-{0xfe30, 0xfe4f, GRUB_BIDI_TYPE_ON, 0},
-{0xfe50, 0xfe50, GRUB_BIDI_TYPE_CS, 0},
-{0xfe51, 0xfe51, GRUB_BIDI_TYPE_ON, 0},
-{0xfe52, 0xfe52, GRUB_BIDI_TYPE_CS, 0},
-{0xfe54, 0xfe54, GRUB_BIDI_TYPE_ON, 0},
-{0xfe55, 0xfe55, GRUB_BIDI_TYPE_CS, 0},
-{0xfe56, 0xfe5e, GRUB_BIDI_TYPE_ON, 0},
-{0xfe5f, 0xfe5f, GRUB_BIDI_TYPE_ET, 0},
-{0xfe60, 0xfe61, GRUB_BIDI_TYPE_ON, 0},
-{0xfe62, 0xfe63, GRUB_BIDI_TYPE_ES, 0},
-{0xfe64, 0xfe66, GRUB_BIDI_TYPE_ON, 0},
-{0xfe68, 0xfe68, GRUB_BIDI_TYPE_ON, 0},
-{0xfe69, 0xfe6a, GRUB_BIDI_TYPE_ET, 0},
-{0xfe6b, 0xfe6b, GRUB_BIDI_TYPE_ON, 0},
-{0xfe70, 0xfe74, GRUB_BIDI_TYPE_AL, 0},
-{0xfe76, 0xfefc, GRUB_BIDI_TYPE_AL, 0},
-{0xfeff, 0xfeff, GRUB_BIDI_TYPE_BN, 0},
-{0xff01, 0xff02, GRUB_BIDI_TYPE_ON, 0},
-{0xff03, 0xff05, GRUB_BIDI_TYPE_ET, 0},
-{0xff06, 0xff0a, GRUB_BIDI_TYPE_ON, 0},
-{0xff0b, 0xff0b, GRUB_BIDI_TYPE_ES, 0},
-{0xff0c, 0xff0c, GRUB_BIDI_TYPE_CS, 0},
-{0xff0d, 0xff0d, GRUB_BIDI_TYPE_ES, 0},
-{0xff0e, 0xff0f, GRUB_BIDI_TYPE_CS, 0},
-{0xff10, 0xff19, GRUB_BIDI_TYPE_EN, 0},
-{0xff1a, 0xff1a, GRUB_BIDI_TYPE_CS, 0},
-{0xff1b, 0xff20, GRUB_BIDI_TYPE_ON, 0},
-{0xff3b, 0xff40, GRUB_BIDI_TYPE_ON, 0},
-{0xff5b, 0xff65, GRUB_BIDI_TYPE_ON, 0},
-{0xffe0, 0xffe1, GRUB_BIDI_TYPE_ET, 0},
-{0xffe2, 0xffe4, GRUB_BIDI_TYPE_ON, 0},
-{0xffe5, 0xffe6, GRUB_BIDI_TYPE_ET, 0},
-{0xffe8, 0xffee, GRUB_BIDI_TYPE_ON, 0},
-{0xfff9, 0xfffd, GRUB_BIDI_TYPE_ON, 0},
-{0x10101, 0x10101, GRUB_BIDI_TYPE_ON, 0},
-{0x10140, 0x1018a, GRUB_BIDI_TYPE_ON, 0},
-{0x10190, 0x1019b, GRUB_BIDI_TYPE_ON, 0},
-{0x101fd, 0x101fd, GRUB_BIDI_TYPE_NSM, 220},
-{0x10800, 0x10805, GRUB_BIDI_TYPE_R, 0},
-{0x10808, 0x10808, GRUB_BIDI_TYPE_R, 0},
-{0x1080a, 0x10835, GRUB_BIDI_TYPE_R, 0},
-{0x10837, 0x10838, GRUB_BIDI_TYPE_R, 0},
-{0x1083c, 0x1083c, GRUB_BIDI_TYPE_R, 0},
-{0x1083f, 0x1083f, GRUB_BIDI_TYPE_R, 0},
-{0x10900, 0x10919, GRUB_BIDI_TYPE_R, 0},
-{0x1091f, 0x1091f, GRUB_BIDI_TYPE_ON, 0},
-{0x10920, 0x10939, GRUB_BIDI_TYPE_R, 0},
-{0x1093f, 0x1093f, GRUB_BIDI_TYPE_R, 0},
-{0x10a00, 0x10a00, GRUB_BIDI_TYPE_R, 0},
-{0x10a01, 0x10a03, GRUB_BIDI_TYPE_NSM, 255},
-{0x10a05, 0x10a06, GRUB_BIDI_TYPE_NSM, 255},
-{0x10a0c, 0x10a0c, GRUB_BIDI_TYPE_NSM, 255},
-{0x10a0d, 0x10a0d, GRUB_BIDI_TYPE_NSM, 220},
-{0x10a0e, 0x10a0e, GRUB_BIDI_TYPE_NSM, 255},
-{0x10a0f, 0x10a0f, GRUB_BIDI_TYPE_NSM, 230},
-{0x10a10, 0x10a13, GRUB_BIDI_TYPE_R, 0},
-{0x10a15, 0x10a17, GRUB_BIDI_TYPE_R, 0},
-{0x10a19, 0x10a33, GRUB_BIDI_TYPE_R, 0},
-{0x10a38, 0x10a38, GRUB_BIDI_TYPE_NSM, 230},
-{0x10a39, 0x10a39, GRUB_BIDI_TYPE_NSM, 1},
-{0x10a3a, 0x10a3a, GRUB_BIDI_TYPE_NSM, 220},
-{0x10a3f, 0x10a3f, GRUB_BIDI_TYPE_NSM, 9},
-{0x10a40, 0x10a47, GRUB_BIDI_TYPE_R, 0},
-{0x10a50, 0x10a58, GRUB_BIDI_TYPE_R, 0},
-{0x1d165, 0x1d166, GRUB_BIDI_TYPE_L, 216},
-{0x1d167, 0x1d169, GRUB_BIDI_TYPE_NSM, 1},
-{0x1d16d, 0x1d16d, GRUB_BIDI_TYPE_L, 226},
-{0x1d16e, 0x1d172, GRUB_BIDI_TYPE_L, 216},
-{0x1d173, 0x1d17a, GRUB_BIDI_TYPE_BN, 0},
-{0x1d17b, 0x1d182, GRUB_BIDI_TYPE_NSM, 220},
-{0x1d185, 0x1d189, GRUB_BIDI_TYPE_NSM, 230},
-{0x1d18a, 0x1d18b, GRUB_BIDI_TYPE_NSM, 220},
-{0x1d1aa, 0x1d1ad, GRUB_BIDI_TYPE_NSM, 230},
-{0x1d200, 0x1d241, GRUB_BIDI_TYPE_ON, 0},
-{0x1d242, 0x1d244, GRUB_BIDI_TYPE_NSM, 230},
-{0x1d245, 0x1d245, GRUB_BIDI_TYPE_ON, 0},
-{0x1d300, 0x1d356, GRUB_BIDI_TYPE_ON, 0},
-{0x1d7ce, 0x1d7ff, GRUB_BIDI_TYPE_EN, 0},
-{0x1f000, 0x1f02b, GRUB_BIDI_TYPE_ON, 0},
-{0x1f030, 0x1f093, GRUB_BIDI_TYPE_ON, 0},
-{0xe0001, 0xe0001, GRUB_BIDI_TYPE_BN, 0},
-{0xe0020, 0xe007f, GRUB_BIDI_TYPE_BN, 0},
-{0xe0100, 0xe01ef, GRUB_BIDI_TYPE_NSM, 255},
-{0, 0, 0, 0},
-};
\ No newline at end of file
diff --git a/util/import_unicode.py b/util/import_unicode.py
index adba3f938..e2f0561f0 100644
--- a/util/import_unicode.py
+++ b/util/import_unicode.py
@@ -33,12 +33,14 @@ outfile.write ("struct grub_unicode_compact_range grub_unicode_compact[] = {\n")
 begincode = -2
 lastcode = -2
 lastbiditype = "X"
+lastmirrortype = False
 lastcombtype = -1
 for line in infile:
     sp = line.split (";")
     curcode = int (sp[0], 16)
-    curbiditype = sp[4]
     curcombtype = int (sp[3], 10)
+    curbiditype = sp[4]
+    curmirrortype = (sp[9] == "Y")
     if curcombtype <= 255 and curcombtype >= 253:
         print ("UnicodeData.txt uses combination type %d. Conflict." \
                    % curcombtype)
@@ -50,18 +52,21 @@ for line in infile:
     if curcombtype == 0 and sp[2] == "Mn":
         curcombtype = 255
     if lastcode + 1 != curcode or curbiditype != lastbiditype \
-            or curcombtype != lastcombtype:
-        if begincode != -2 and (lastbiditype != "L" or lastcombtype != 0):
-            outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s, %d},\n" \
+            or curcombtype != lastcombtype or curmirrortype != lastmirrortype:
+        if begincode != -2 and (lastbiditype != "L" or lastcombtype != 0 or \
+                                    lastmirrortype):
+            outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s, %d, %d},\n" \
                                 % (begincode, lastcode, lastbiditype, \
-                                       lastcombtype)))
+                                       lastcombtype, lastmirrortype)))
         begincode = curcode
     lastcode = curcode
     lastbiditype = curbiditype
     lastcombtype = curcombtype
-if lastbiditype != "L" or lastcombtype != 0:
-    outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s, %d},\n" \
-                        % (begincode, lastcode, lastbiditype, lastcombtype)))
-outfile.write ("{0, 0, 0, 0},\n")
+    lastmirrortype = curmirrortype
+if lastbiditype != "L" or lastcombtype != 0 or lastmirrortype:
+    outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s, %d, %d},\n" \
+                        % (begincode, lastcode, lastbiditype, lastcombtype, \
+                               lastmirrortype)))
+outfile.write ("{0, 0, 0, 0, 0},\n")
 
 outfile.write ("};")

From 82c5d8dcfce2ee144f55120c0f10f1d525c376e6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 8 Jan 2010 00:46:42 +0100
Subject: [PATCH 0217/1628] Support for 3 more combining marks types

---
 .bzrignore             |   1 +
 font/font.c            | 249 ++++++++++++++++++++++++-----------------
 include/grub/unicode.h |   3 +
 3 files changed, 149 insertions(+), 104 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index 8cdc9d12d..d313d0358 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -63,3 +63,4 @@ stamp-h1
 stamp-h.in
 symlist.c
 update-grub_lib
+unidata.c
diff --git a/font/font.c b/font/font.c
index 6655a29ae..172653c92 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1163,6 +1163,21 @@ grub_font_construct_glyph (grub_font_t hinted_font,
       combtype = get_comb_type (glyph_id->combining[i]);
       switch (combtype)
 	{
+	case GRUB_UNICODE_COMB_OVERLAY:
+	  if (height < combining_glyphs[i]->height)
+	    {
+	      offset_y -= (combining_glyphs[i]->height - height) / 2;
+	      height = combining_glyphs[i]->height;
+	    }
+	  if (width < combining_glyphs[i]->width)
+	    {
+	      offset_x -= (combining_glyphs[i]->width - width) / 2;
+	      width = combining_glyphs[i]->width;
+	    }
+	  if (device_width < combining_glyphs[i]->width)
+	    device_width = combining_glyphs[i]->width;
+	  break;
+
 	case GRUB_UNICODE_STACK_ABOVE:
 	  {
 	    grub_int16_t space;
@@ -1261,40 +1276,45 @@ grub_font_construct_glyph (grub_font_t hinted_font,
   for (i = 0; i < glyph_id->ncomb; i++)
     {
       enum grub_comb_type combtype;
+      grub_int16_t space = 0;
+
       if (!combining_glyphs[i])
 	continue;
       combtype = get_comb_type (glyph_id->combining[i]);
       switch (combtype)
 	{
-	case GRUB_UNICODE_STACK_ABOVE:
-	  {
-	    grub_int16_t space;
-	    space = combining_glyphs[i]->offset_y
-	      - grub_font_get_xheight (combining_glyphs[i]->font);
-	    if (space < 0)
-	      space = 1;
+	case GRUB_UNICODE_COMB_OVERLAY:
+	  grub_font_blit_glyph (glyph, combining_glyphs[i],
+				(width - combining_glyphs[i]->width) / 2,
+				(height - combining_glyphs[i]->height) / 2);
+	  break;
 
-	    curtop += combining_glyphs[i]->height + space;
-	    grub_font_blit_glyph (glyph, combining_glyphs[i],
-				  (width - combining_glyphs[i]->width) / 2,
-				  (height + offset_y) - curtop);
-	  }
+	case GRUB_UNICODE_STACK_ABOVE:
+	  space = combining_glyphs[i]->offset_y
+	    - grub_font_get_xheight (combining_glyphs[i]->font);
+	  if (space < 0)
+	    space = 1;
+
+	case GRUB_UNICODE_STACK_ATTACHED_ABOVE:
+	    
+	  curtop += combining_glyphs[i]->height + space;
+	  grub_font_blit_glyph (glyph, combining_glyphs[i],
+				(width - combining_glyphs[i]->width) / 2,
+				(height + offset_y) - curtop);
 	  break;
 
 	case GRUB_UNICODE_STACK_BELOW:
-	  {
-	    grub_int16_t space;
-	    space = -(combining_glyphs[i]->offset_y 
-		      + combining_glyphs[i]->height);
-	    if (space < 0)
-	      space = 1;
-
-	    curbottom -= space;
-	    grub_font_blit_glyph (glyph, combining_glyphs[i],
-				  (width - combining_glyphs[i]->width) / 2,
-				  (height + offset_y) - curbottom);
-	    curbottom -= combining_glyphs[i]->height;
-	  }
+	  space = -(combining_glyphs[i]->offset_y 
+		    + combining_glyphs[i]->height);
+	  if (space < 0)
+	    space = 1;
+	  
+	case GRUB_UNICODE_STACK_ATTACHED_BELOW:
+	  curbottom -= space;
+	  grub_font_blit_glyph (glyph, combining_glyphs[i],
+				(width - combining_glyphs[i]->width) / 2,
+				(height + offset_y) - curbottom);
+	  curbottom -= combining_glyphs[i]->height;
 	  break;
 
 	default:
@@ -1525,87 +1545,107 @@ grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
   
   cur_level = base_level;
   cur_override = OVERRIDE_NEUTRAL;
-  for (i = 0; i < logical_len; i++)
-    {
-      /* Variation selectors >= 17 are outside of BMP and SMP. 
-	 Handle variation selectors first to avoid potentially costly lookups.
-       */
-      if (logical[i] >= GRUB_UNICODE_VARIATION_SELECTOR_1
-	  && logical[i] <= GRUB_UNICODE_VARIATION_SELECTOR_16)
-	{
-	  if (!visual_len)
-	    continue;
-	  visual[visual_len - 1].variant
-	    = logical[i] - GRUB_UNICODE_VARIATION_SELECTOR_1 + 1;
-	}
-      if (logical[i] >= GRUB_UNICODE_VARIATION_SELECTOR_17
-	  && logical[i] <= GRUB_UNICODE_VARIATION_SELECTOR_256)
-	{
-	  if (!visual_len)
-	    continue;
-	  visual[visual_len - 1].variant
-	    = logical[i] - GRUB_UNICODE_VARIATION_SELECTOR_17 + 17;
-	  continue;
-	}
-
-      type = get_bidi_type (logical[i]);
-      switch (type)
-	{
-	case GRUB_BIDI_TYPE_RLE:
-	  push_stack (cur_override, (cur_level | 1) + 1);
-	  break;
-	case GRUB_BIDI_TYPE_RLO:
-	  push_stack (OVERRIDE_R, (cur_level | 1) + 1);
-	  break;
-	case GRUB_BIDI_TYPE_LRE:
-	  push_stack (cur_override, (cur_level & ~1) + 2);
-	  break;
-	case GRUB_BIDI_TYPE_LRO:
-	  push_stack (OVERRIDE_L, (cur_level & ~1) + 2);
-	  break;
-	case GRUB_BIDI_TYPE_PDF:
-	  pop_stack ();
-	  break;
-	case GRUB_BIDI_TYPE_BN:
-	  break;
-	default:
+  {
+    unsigned last_comb_pointer = 0;
+    for (i = 0; i < logical_len; i++)
+      {
+	/* Variation selectors >= 17 are outside of BMP and SMP. 
+	   Handle variation selectors first to avoid potentially costly lookups.
+	*/
+	if (logical[i] >= GRUB_UNICODE_VARIATION_SELECTOR_1
+	    && logical[i] <= GRUB_UNICODE_VARIATION_SELECTOR_16)
 	  {
-	    enum grub_comb_type comb_type;
-	    comb_type = get_comb_type (logical[i]);
-	    if (comb_type)
-	      {
-		grub_uint32_t *n;
-		if (!visual_len)
-		  break;
-		n = grub_realloc (visual[visual_len - 1].combining, 
-				  sizeof (grub_uint32_t)
-				  * (visual[visual_len - 1].ncomb + 1));
-		if (!n)
-		  {
-		    grub_errno = GRUB_ERR_NONE;
-		    break;
-		  }
-		visual[visual_len - 1].combining = n;
-		visual[visual_len - 1].combining[visual[visual_len - 1].ncomb]
-		  = logical[i];
-		visual[visual_len - 1].ncomb++;
-		break;
-	      }
-	    levels[visual_len] = cur_level;
-	    if (cur_override != OVERRIDE_NEUTRAL)
-	      resolved_types[visual_len] = 
-		(cur_override == OVERRIDE_L) ? GRUB_BIDI_TYPE_L : GRUB_BIDI_TYPE_R;
-	    else
-	      resolved_types[visual_len] = type;
-	    visual[visual_len].base = logical[i];
-	    visual[visual_len].variant = 0;
-	    visual[visual_len].attributes = 0;
-	    visual[visual_len].ncomb = 0;
-	    visual[visual_len].combining = NULL;
-	    visual_len++;
+	    if (!visual_len)
+	      continue;
+	    visual[visual_len - 1].variant
+	      = logical[i] - GRUB_UNICODE_VARIATION_SELECTOR_1 + 1;
 	  }
-	}
-    }
+	if (logical[i] >= GRUB_UNICODE_VARIATION_SELECTOR_17
+	    && logical[i] <= GRUB_UNICODE_VARIATION_SELECTOR_256)
+	  {
+	    if (!visual_len)
+	      continue;
+	    visual[visual_len - 1].variant
+	      = logical[i] - GRUB_UNICODE_VARIATION_SELECTOR_17 + 17;
+	    continue;
+	  }
+	
+	type = get_bidi_type (logical[i]);
+	switch (type)
+	  {
+	  case GRUB_BIDI_TYPE_RLE:
+	    push_stack (cur_override, (cur_level | 1) + 1);
+	    break;
+	  case GRUB_BIDI_TYPE_RLO:
+	    push_stack (OVERRIDE_R, (cur_level | 1) + 1);
+	    break;
+	  case GRUB_BIDI_TYPE_LRE:
+	    push_stack (cur_override, (cur_level & ~1) + 2);
+	    break;
+	  case GRUB_BIDI_TYPE_LRO:
+	    push_stack (OVERRIDE_L, (cur_level & ~1) + 2);
+	    break;
+	  case GRUB_BIDI_TYPE_PDF:
+	    pop_stack ();
+	    break;
+	  case GRUB_BIDI_TYPE_BN:
+	    break;
+	  default:
+	    {
+	      enum grub_comb_type comb_type;
+	      comb_type = get_comb_type (logical[i]);
+	      if (comb_type)
+		{
+		  grub_uint32_t *n;
+		  unsigned j;
+
+		  if (!visual_len)
+		    break;
+		  if (comb_type == GRUB_UNICODE_COMB_MC
+		      || comb_type == GRUB_UNICODE_COMB_ME
+		      || comb_type == GRUB_UNICODE_COMB_MN)
+		    last_comb_pointer = visual[visual_len - 1].ncomb;
+		  n = grub_realloc (visual[visual_len - 1].combining, 
+				    sizeof (grub_uint32_t)
+				    * (visual[visual_len - 1].ncomb + 1));
+		  if (!n)
+		    {
+		      grub_errno = GRUB_ERR_NONE;
+		      break;
+		    }
+
+		  for (j = last_comb_pointer;
+		       j < visual[visual_len - 1].ncomb; j++)
+		    if (get_comb_type (visual[visual_len - 1].combining[j])
+			> comb_type)
+		      break;
+		  grub_memmove (visual[visual_len - 1].combining + j + 1,
+				visual[visual_len - 1].combining + j,
+				(visual[visual_len - 1].ncomb - j)
+				* sizeof (visual[visual_len - 1].combining[0]));
+		  visual[visual_len - 1].combining = n;
+		  visual[visual_len - 1].combining[j] = logical[i];
+		  visual[visual_len - 1].ncomb++;
+		  break;
+		}
+	      last_comb_pointer = 0;
+	      levels[visual_len] = cur_level;
+	      if (cur_override != OVERRIDE_NEUTRAL)
+		resolved_types[visual_len] = 
+		  (cur_override == OVERRIDE_L) ? GRUB_BIDI_TYPE_L
+		  : GRUB_BIDI_TYPE_R;
+	      else
+		resolved_types[visual_len] = type;
+	      visual[visual_len].base = logical[i];
+	      visual[visual_len].variant = 0;
+	      visual[visual_len].attributes = 0;
+	      visual[visual_len].ncomb = 0;
+	      visual[visual_len].combining = NULL;
+	      visual_len++;
+	    }
+	  }
+      }
+  }
 
   for (run_start = 0; run_start < visual_len; run_start = run_end)
     {
@@ -1781,6 +1821,7 @@ grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
 	if (levels[i] < min_odd_level && (levels[i] & 1))
 	  min_odd_level = levels[i];
       }
+    /* FIXME: can be optimized.  */
     for (j = max_level; j >= min_odd_level; j--)
       {
 	unsigned in = 0;
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 20c7c4167..17932a4b1 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -55,6 +55,9 @@ enum grub_bidi_type
 
 enum grub_comb_type
   {
+    GRUB_UNICODE_COMB_OVERLAY = 1,
+    GRUB_UNICODE_STACK_ATTACHED_BELOW = 202,
+    GRUB_UNICODE_STACK_ATTACHED_ABOVE = 214,
     GRUB_UNICODE_STACK_BELOW = 220,
     GRUB_UNICODE_STACK_ABOVE = 230,
     /* If combining nature is indicated only by class and

From 4361ca1c37370766de26933b657570d654509686 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 8 Jan 2010 18:48:41 +0100
Subject: [PATCH 0218/1628] Restructure rendering to make extensions easier

---
 font/font.c            | 306 ++++++++++++++++++-----------------------
 include/grub/unicode.h |   4 +
 include/grub/video.h   |   9 ++
 3 files changed, 146 insertions(+), 173 deletions(-)

diff --git a/font/font.c b/font/font.c
index 172653c92..69dae08a0 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1111,20 +1111,129 @@ get_comb_type (grub_uint32_t c)
   return GRUB_BIDI_TYPE_L;
 }
 
+static void
+blit_comb (const struct grub_unicode_glyph *glyph_id,
+	   struct grub_font_glyph *glyph,
+	   struct grub_video_signed_rect *bounds_out,
+	   struct grub_font_glyph *main_glyph,
+	   struct grub_font_glyph **combining_glyphs)
+{
+  struct grub_video_signed_rect bounds;
+  unsigned i;
+  auto void NESTED_FUNC_ATTR do_blit (struct grub_font_glyph *src,
+				      signed dx, signed dy);
+  void NESTED_FUNC_ATTR do_blit (struct grub_font_glyph *src,
+				 signed dx, signed dy)
+  {
+    if (glyph)
+      grub_font_blit_glyph (glyph, src, dx - glyph->offset_x,
+			    (glyph->height + glyph->offset_y) + dy);
+    if (dx < bounds.x)
+      {
+	bounds.width += bounds.x - dx;
+	bounds.x = dx;
+      }
+    if (bounds.y > -src->height - dy)
+      {
+	bounds.height += bounds.y - (-src->height - dy);
+	bounds.y = (-src->height - dy);
+      }
+    if (dx + src->width - bounds.x >= (signed) bounds.width)
+      bounds.width = dx + src->width - bounds.x + 1;
+    if ((signed) bounds.height < src->height + (-src->height - dy) - bounds.y)
+      bounds.height = src->height + (-src->height - dy) - bounds.y;
+  }
+
+  auto void minimal_device_width (int val);
+  void minimal_device_width (int val)
+  {
+    if (glyph && glyph->device_width < val)
+      glyph->device_width = val;
+  }
+  auto void add_device_width (int val);
+  void add_device_width (int val)
+  {
+    if (glyph)
+      glyph->device_width += val;
+  }
+
+  bounds.x = main_glyph->offset_x;
+  bounds.y = main_glyph->offset_y;
+  bounds.width = main_glyph->width;
+  bounds.height = main_glyph->height;
+
+  for (i = 0; i < glyph_id->ncomb; i++)
+    {
+      enum grub_comb_type combtype;
+      grub_int16_t space = 0;
+      grub_int16_t centerx = (bounds.width - combining_glyphs[i]->width) / 2
+	+ bounds.x;
+      
+      if (!combining_glyphs[i])
+	continue;
+      combtype = get_comb_type (glyph_id->combining[i]);
+      switch (combtype)
+	{
+	case GRUB_UNICODE_COMB_OVERLAY:
+	  do_blit (combining_glyphs[i],
+		   centerx,
+		   (bounds.height - combining_glyphs[i]->height) / 2
+		   -(bounds.height + bounds.y));
+	  minimal_device_width (combining_glyphs[i]->width);
+	  break;
+
+	case GRUB_UNICODE_STACK_ABOVE:
+	  space = combining_glyphs[i]->offset_y
+	    - grub_font_get_xheight (combining_glyphs[i]->font);
+	  if (space < 0)
+	    space = 1 + (grub_font_get_xheight (main_glyph->font)) / 8;
+	    
+	case GRUB_UNICODE_STACK_ATTACHED_ABOVE:	    
+	  do_blit (combining_glyphs[i], centerx,
+		   -(bounds.height + bounds.y + space
+		     + combining_glyphs[i]->height));
+	  minimal_device_width (combining_glyphs[i]->width);
+	  break;
+
+	case GRUB_UNICODE_STACK_BELOW:
+	  space = -(combining_glyphs[i]->offset_y 
+		    + combining_glyphs[i]->height);
+	  if (space < 0)
+	    space = 1 + (grub_font_get_xheight (main_glyph->font)) / 8;
+	  
+	case GRUB_UNICODE_STACK_ATTACHED_BELOW:
+	  do_blit (combining_glyphs[i], centerx,
+		   -(bounds.y - space));
+	  minimal_device_width (combining_glyphs[i]->width);
+	  break;
+
+	default:
+	  {
+	    /* Default handling. Just draw combining character on top
+	       of base character.
+	       FIXME: support more unicode types correctly.
+	    */
+	    do_blit (combining_glyphs[i],
+		     main_glyph->device_width
+		     + combining_glyphs[i]->offset_x,  
+		     - (combining_glyphs[i]->height 
+			+ combining_glyphs[i]->offset_y));
+	    add_device_width (combining_glyphs[i]->device_width);
+	  }
+	}
+    }
+  if (bounds_out)
+    *bounds_out = bounds;
+}
+
 static struct grub_font_glyph *
 grub_font_construct_glyph (grub_font_t hinted_font,
 			   const struct grub_unicode_glyph *glyph_id)
 {
   grub_font_t font;
-  grub_uint16_t width;
-  grub_uint16_t height;
-  grub_int16_t offset_x;
-  grub_int16_t offset_y;
-  grub_int16_t curtop, curbottom;
-  grub_uint16_t device_width;
+  struct grub_video_signed_rect bounds;
   struct grub_font_glyph *main_glyph;
   struct grub_font_glyph **combining_glyphs;
-  unsigned i;
   struct grub_font_glyph *glyph;
 
   main_glyph = grub_font_get_glyph_with_fallback (hinted_font, glyph_id->base);
@@ -1147,106 +1256,17 @@ grub_font_construct_glyph (grub_font_t hinted_font,
     }
   
   font = main_glyph->font;
-  width = main_glyph->width;
-  height = main_glyph->height;
-  offset_x = main_glyph->offset_x;
-  offset_y = main_glyph->offset_y;
-  device_width = main_glyph->device_width;
 
-  for (i = 0; i < glyph_id->ncomb; i++)
-    {
-      enum grub_comb_type combtype;
+  {
+    unsigned i;
+    for (i = 0; i < glyph_id->ncomb; i++)
       combining_glyphs[i]
 	= grub_font_get_glyph_with_fallback (font, glyph_id->combining[i]);
-      if (!combining_glyphs[i])
-	continue;
-      combtype = get_comb_type (glyph_id->combining[i]);
-      switch (combtype)
-	{
-	case GRUB_UNICODE_COMB_OVERLAY:
-	  if (height < combining_glyphs[i]->height)
-	    {
-	      offset_y -= (combining_glyphs[i]->height - height) / 2;
-	      height = combining_glyphs[i]->height;
-	    }
-	  if (width < combining_glyphs[i]->width)
-	    {
-	      offset_x -= (combining_glyphs[i]->width - width) / 2;
-	      width = combining_glyphs[i]->width;
-	    }
-	  if (device_width < combining_glyphs[i]->width)
-	    device_width = combining_glyphs[i]->width;
-	  break;
+  }
 
-	case GRUB_UNICODE_STACK_ABOVE:
-	  {
-	    grub_int16_t space;
-	    space = combining_glyphs[i]->offset_y
-	      - grub_font_get_xheight (combining_glyphs[i]->font);
-	    if (space < 1)
-	      space = 1;
-	    if (width < combining_glyphs[i]->width)
-	      {
-		offset_x -= (combining_glyphs[i]->width - width) / 2;
-		width = combining_glyphs[i]->width;
-	      }
-	    if (device_width < combining_glyphs[i]->width)
-	      device_width = combining_glyphs[i]->width;
-	    height += combining_glyphs[i]->height + space;
-	  }
-	  break;  
+  blit_comb (glyph_id, NULL, &bounds, main_glyph, combining_glyphs);
 
-	case GRUB_UNICODE_STACK_BELOW:
-	  {
-	    grub_int16_t space;
-	    space = -(combining_glyphs[i]->offset_y 
-		      + combining_glyphs[i]->height);
-	    if (space < 1)
-	      space = 1;
-	    if (width < combining_glyphs[i]->width)
-	      {
-		offset_x -= (combining_glyphs[i]->width - width) / 2;
-		width = combining_glyphs[i]->width;
-	      }
-	    if (device_width < combining_glyphs[i]->width)
-	      device_width = combining_glyphs[i]->width;
-	    height += combining_glyphs[i]->height + space;
-	    offset_y -= combining_glyphs[i]->height + space;
-	  }
-	  break;
-
-	default:
-	  {
-	    /* Default handling. Just draw combining character on top
-	       of base character.
-	       FIXME: support more unicode types correctly.
-	    */
-	    grub_int16_t nx = main_glyph->device_width
-	      + combining_glyphs[i]->offset_x;
-
-	    device_width += combining_glyphs[i]->device_width;
-	    if (nx < offset_x)
-	      {
-		width += offset_x - nx;
-		offset_x = nx;
-	      }
-	    if (offset_y > combining_glyphs[i]->offset_y)
-	      {
-		height += offset_y - combining_glyphs[i]->offset_y;
-		offset_y = combining_glyphs[i]->offset_y;
-	      }
-	    if (nx + combining_glyphs[i]->width - offset_x >= width)
-	      width = nx + combining_glyphs[i]->width - offset_x + 1;
-	    if (height
-		< (combining_glyphs[i]->height 
-		   + combining_glyphs[i]->offset_y) - offset_y)
-	      height = (combining_glyphs[i]->height 
-			+ combining_glyphs[i]->offset_y) - offset_y;
-	  }
-	}
-    }
-
-  glyph = grub_zalloc (sizeof (*glyph) + (width * height + 7) / 8);
+  glyph = grub_zalloc (sizeof (*glyph) + (bounds.width * bounds.height + 7) / 8);
   if (!glyph)
     {
       grub_errno = GRUB_ERR_NONE;
@@ -1254,84 +1274,24 @@ grub_font_construct_glyph (grub_font_t hinted_font,
     }
 
   glyph->font = font;
-  glyph->width = width;
-  glyph->height = height;
-  glyph->offset_x = offset_x;
-  glyph->offset_y = offset_y;
-  glyph->device_width = device_width;
+  glyph->width = bounds.width;
+  glyph->height = bounds.height;
+  glyph->offset_x = bounds.x;
+  glyph->offset_y = bounds.y;
+  glyph->device_width = main_glyph->device_width;
 
   if (glyph_id->attributes & GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR)
     grub_font_blit_glyph_mirror (glyph, main_glyph,
-				 main_glyph->offset_x - offset_x,
-				 (height + offset_y)
+				 main_glyph->offset_x - glyph->offset_x,
+				 (glyph->height + glyph->offset_y)
 				 - (main_glyph->height + main_glyph->offset_y));
   else
-    grub_font_blit_glyph (glyph, main_glyph, main_glyph->offset_x - offset_x,
-			  (height + offset_y)
+    grub_font_blit_glyph (glyph, main_glyph,
+			  main_glyph->offset_x - glyph->offset_x,
+			  (glyph->height + glyph->offset_y)
 			  - (main_glyph->height + main_glyph->offset_y));
 
-  curtop = main_glyph->height + main_glyph->offset_y;
-  curbottom = main_glyph->offset_y;
-
-  for (i = 0; i < glyph_id->ncomb; i++)
-    {
-      enum grub_comb_type combtype;
-      grub_int16_t space = 0;
-
-      if (!combining_glyphs[i])
-	continue;
-      combtype = get_comb_type (glyph_id->combining[i]);
-      switch (combtype)
-	{
-	case GRUB_UNICODE_COMB_OVERLAY:
-	  grub_font_blit_glyph (glyph, combining_glyphs[i],
-				(width - combining_glyphs[i]->width) / 2,
-				(height - combining_glyphs[i]->height) / 2);
-	  break;
-
-	case GRUB_UNICODE_STACK_ABOVE:
-	  space = combining_glyphs[i]->offset_y
-	    - grub_font_get_xheight (combining_glyphs[i]->font);
-	  if (space < 0)
-	    space = 1;
-
-	case GRUB_UNICODE_STACK_ATTACHED_ABOVE:
-	    
-	  curtop += combining_glyphs[i]->height + space;
-	  grub_font_blit_glyph (glyph, combining_glyphs[i],
-				(width - combining_glyphs[i]->width) / 2,
-				(height + offset_y) - curtop);
-	  break;
-
-	case GRUB_UNICODE_STACK_BELOW:
-	  space = -(combining_glyphs[i]->offset_y 
-		    + combining_glyphs[i]->height);
-	  if (space < 0)
-	    space = 1;
-	  
-	case GRUB_UNICODE_STACK_ATTACHED_BELOW:
-	  curbottom -= space;
-	  grub_font_blit_glyph (glyph, combining_glyphs[i],
-				(width - combining_glyphs[i]->width) / 2,
-				(height + offset_y) - curbottom);
-	  curbottom -= combining_glyphs[i]->height;
-	  break;
-
-	default:
-	  {
-	    /* Default handling. Just draw combining character on top
-	       of base character.
-	       FIXME: support more unicode types correctly.
-	    */
-	    grub_font_blit_glyph (glyph, combining_glyphs[i],
-				  main_glyph->device_width
-				  + combining_glyphs[i]->offset_x - offset_x,
-				  (height + offset_y)
-				  - (combining_glyphs[i]->height 
-				     + combining_glyphs[i]->offset_y));
-	  }
-	}
-    }
+  blit_comb (glyph_id, glyph, NULL, main_glyph, combining_glyphs);
 
   return glyph;
 }
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 17932a4b1..6e455394d 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -57,9 +57,13 @@ enum grub_comb_type
   {
     GRUB_UNICODE_COMB_OVERLAY = 1,
     GRUB_UNICODE_STACK_ATTACHED_BELOW = 202,
+    GRUB_UNICODE_COMB_ATTACHED_BELOW_RIGHT = 204,
     GRUB_UNICODE_STACK_ATTACHED_ABOVE = 214,
+    GRUB_UNICODE_COMB_ATTACHED_ABOVE_RIGHT = 216,
     GRUB_UNICODE_STACK_BELOW = 220,
+    GRUB_UNICODE_COMB_BELOW_RIGHT = 222,
     GRUB_UNICODE_STACK_ABOVE = 230,
+    GRUB_UNICODE_COMB_ABOVE_RIGHT = 232,
     /* If combining nature is indicated only by class and
        not "combining type".  */
     GRUB_UNICODE_COMB_ME = 253,
diff --git a/include/grub/video.h b/include/grub/video.h
index 868e87871..0546706e4 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -167,6 +167,15 @@ struct grub_video_rect
 };
 typedef struct grub_video_rect grub_video_rect_t;
 
+struct grub_video_signed_rect
+{
+  signed x;
+  signed y;
+  unsigned width;
+  unsigned height;
+};
+typedef struct grub_video_signed_rect grub_video_signed_rect_t;
+
 struct grub_video_palette_data
 {
   grub_uint8_t r; /* Red color value (0-255).  */

From b5c72e3b0f2f09274cc67cbc335f1e3ca73f289e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 8 Jan 2010 19:15:49 +0100
Subject: [PATCH 0219/1628] Fix list scrollbar position miscalculation

---
 gfxmenu/gui_list.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfxmenu/gui_list.c b/gfxmenu/gui_list.c
index ccf360ad3..8377bf4bb 100644
--- a/gfxmenu/gui_list.c
+++ b/gfxmenu/gui_list.c
@@ -327,7 +327,7 @@ list_paint (void *vself, const grub_video_rect_t *region)
       draw_scrollbar (self,
 		      self->first_shown_index, num_shown_items,
 		      0, self->view->menu->size,
-		      content_rect.width - box_right_pad
+		      self->bounds.width - box_right_pad
 		      + self->scrollbar_width,
 		      box_top_pad + self->item_padding,
 		      content_rect.height - box_top_pad - box_bottom_pad);

From 2810a4ef1c2462f44da08a66b9337793a2b3fdd5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 9 Jan 2010 11:48:38 +0100
Subject: [PATCH 0220/1628] Fix scrollbar height

---
 gfxmenu/gui_list.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfxmenu/gui_list.c b/gfxmenu/gui_list.c
index 8377bf4bb..a78339385 100644
--- a/gfxmenu/gui_list.c
+++ b/gfxmenu/gui_list.c
@@ -330,7 +330,7 @@ list_paint (void *vself, const grub_video_rect_t *region)
 		      self->bounds.width - box_right_pad
 		      + self->scrollbar_width,
 		      box_top_pad + self->item_padding,
-		      content_rect.height - box_top_pad - box_bottom_pad);
+		      self->bounds.height - box_top_pad - box_bottom_pad);
   }
 
   grub_gui_restore_viewport (&vpsave);

From 21a99f580417062f9a79ee7ab4a05753f2a47571 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 9 Jan 2010 20:27:58 +0530
Subject: [PATCH 0221/1628] added grub-script-check tool

---
 conf/common.rmk          |  21 ++++
 util/grub-script-check.c | 254 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 275 insertions(+)
 create mode 100644 util/grub-script-check.c

diff --git a/conf/common.rmk b/conf/common.rmk
index c5e4fcecf..50a4d2111 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -88,11 +88,32 @@ endif
 bin_UTILITIES += grub-mkrelpath
 grub_mkrelpath_SOURCES = gnulib/progname.c util/grub-mkrelpath.c util/misc.c
 
+# For grub-script-check.
+bin_UTILITIES += grub-script-check
+util/grub-script-check.c_DEPENDENCIES = grub_script_check_init.h
+grub_script_check_SOURCES = gnulib/progname.c util/grub-script-check.c util/misc.c \
+	script/main.c script/script.c script/function.c script/lexer.c \
+	kern/handler.c kern/err.c kern/parser.c kern/list.c \
+	kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c
+
 # For the parser.
 grub_script.tab.c grub_script.tab.h: script/parser.y
 	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/parser.y
 DISTCLEANFILES += grub_script.tab.c grub_script.tab.h
 
+# For grub-check.
+grub_script_check_init.lst: geninit.sh $(filter-out grub_script_check_init.c,$(grub_script_check_SOURCES))
+	rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
+DISTCLEANFILES += grub_script_check_init.lst
+
+grub_script_check_init.h: grub_script_check_init.lst $(filter-out grub_script_check_init.c,$(grub_script_check_SOURCES)) geninitheader.sh
+	rm -f $@; sh $(srcdir)/geninitheader.sh $< > $@
+DISTCLEANFILES += grub_script_check_init.h
+
+grub_script_check_init.c: grub_script_check_init.lst $(filter-out grub_script_check_init.c,$(grub_script_check_SOURCES)) geninit.sh
+	rm -f $@; sh $(srcdir)/geninit.sh $< $(filter %.c,$^) > $@
+DISTCLEANFILES += grub_script_check_init.c
+
 # For grub-probe.
 grub_probe_init.lst: geninit.sh $(filter-out grub_probe_init.c,$(grub_probe_SOURCES))
 	rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
diff --git a/util/grub-script-check.c b/util/grub-script-check.c
new file mode 100644
index 000000000..3136c6530
--- /dev/null
+++ b/util/grub-script-check.c
@@ -0,0 +1,254 @@
+/* grub-script-check.c - check grub script file for syntax errors */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2003,2004,2005,2006,2007,2008,2009  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 <config.h>
+#include <grub/types.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/i18n.h>
+#include <grub/parser.h>
+#include <grub/script_sh.h>
+
+#include <grub_script_check_init.h>
+
+#define _GNU_SOURCE	1
+
+#include <ctype.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <getopt.h>
+
+#include "progname.h"
+
+void
+grub_putchar (int c)
+{
+  putchar (c);
+}
+
+int
+grub_getkey (void)
+{
+  return -1;
+}
+
+void
+grub_refresh (void)
+{
+  fflush (stdout);
+}
+
+struct grub_handler_class grub_term_input_class;
+struct grub_handler_class grub_term_output_class;
+
+char *
+grub_script_execute_argument_to_string (struct grub_script_arg *arg __attribute__ ((unused)))
+{
+  return 0;
+}
+
+grub_err_t
+grub_script_execute_cmdline (struct grub_script_cmd *cmd __attribute__ ((unused)))
+{
+  return 0;
+}
+
+grub_err_t
+grub_script_execute_cmdblock (struct grub_script_cmd *cmd __attribute__ ((unused)))
+{
+  return 0;
+}
+
+grub_err_t
+grub_script_execute_cmdif (struct grub_script_cmd *cmd __attribute__ ((unused)))
+{
+  return 0;
+}
+
+grub_err_t
+grub_script_execute_menuentry (struct grub_script_cmd *cmd)
+{
+  struct grub_script_cmd_menuentry *menu;
+  menu = (struct grub_script_cmd_menuentry *)cmd;
+
+  if (menu->sourcecode)
+    {
+      grub_free (menu->sourcecode);
+      menu->sourcecode = 0;
+    }
+  return 0;
+}
+
+grub_err_t
+grub_script_execute (struct grub_script *script)
+{
+  if (script == 0 || script->cmd == 0)
+    return 0;
+
+  return script->cmd->exec (script->cmd);
+}
+
+static struct option options[] =
+  {
+    {"help", no_argument, 0, 'h'},
+    {"version", no_argument, 0, 'V'},
+    {"verbose", no_argument, 0, 'v'},
+    {0, 0, 0, 0}
+  };
+
+static void
+usage (int status)
+{
+  if (status)
+    fprintf (stderr,
+	     "Try ``%s --help'' for more information.\n", program_name);
+  else
+    printf ("\
+Usage: %s [PATH]\n\
+\n\
+Checks GRUB script configuration file for syntax errors.\n\
+\n\
+  -h, --help                display this message and exit\n\
+  -V, --version             print version information and exit\n\
+  -v, --verbose             print script being processed\n\
+\n\
+Report bugs to <%s>.\n\
+", program_name,
+	    PACKAGE_BUGREPORT);
+  exit (status);
+}
+
+int
+main (int argc, char *argv[])
+{
+  char *argument;
+  char *input;
+  FILE *file = 0;
+  int verbose = 0;
+  struct grub_script *script;
+
+  auto grub_err_t get_config_line (char **line, int cont);
+  grub_err_t get_config_line (char **line, int cont __attribute__ ((unused)))
+  {
+    char *cmdline = 0;
+    size_t len = 0;
+    ssize_t read;
+
+    read = getline(&cmdline, &len, (file ?: stdin));
+    if (read == -1)
+      {
+	*line = 0;
+	grub_errno = GRUB_ERR_READ_ERROR;
+
+	if (cmdline)
+	  free (cmdline);
+	return grub_errno;
+      }
+
+    if (verbose)
+      grub_printf("%s", cmdline);
+
+    *line = grub_strdup (cmdline);
+
+    free (cmdline);
+    return 0;
+  }
+
+  set_program_name (argv[0]);
+  setlocale (LC_ALL, "");
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
+
+  /* Check for options.  */
+  while (1)
+    {
+      int c = getopt_long (argc, argv, "hvV", options, 0);
+
+      if (c == -1)
+	break;
+      else
+	switch (c)
+	  {
+	  case 'h':
+	    usage (0);
+	    break;
+
+	  case 'V':
+	    printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
+	    return 0;
+
+	  case 'v':
+	    verbose = 1;
+	    break;
+
+	  default:
+	    usage (1);
+	    break;
+	  }
+    }
+
+  /* Obtain ARGUMENT.  */
+  if (optind >= argc)
+    {
+      file = 0; // read from stdin
+    }
+  else if (optind + 1 != argc)
+    {
+      fprintf (stderr, "Unknown extra argument `%s'.\n", argv[optind + 1]);
+      usage (1);
+    }
+  else
+    {
+      argument = argv[optind];
+      file = fopen (argument, "r");
+      if (! file)
+	{
+	  fprintf (stderr, "%s: %s: %s\n", program_name, argument, strerror(errno));
+	  usage (1);
+	}
+    }
+
+  /* Initialize all modules.  */
+  grub_init_all ();
+
+  do
+    {
+      input = 0;
+      get_config_line(&input, 0);
+      if (! input) 
+	break;
+
+      script = grub_script_parse (input, get_config_line);
+      if (script)
+	{
+	  grub_script_execute (script);
+	  grub_script_free (script);
+	}
+
+      grub_free (input);
+    } while (script != 0);
+
+  /* Free resources.  */
+  grub_fini_all ();
+  if (file) fclose (file);
+
+  return (script == 0);
+}

From 58ad6b39c4f549eb6a268fba5ea25d48c25ebf43 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 9 Jan 2010 20:31:33 +0530
Subject: [PATCH 0222/1628] added changelog file

---
 conf/common.rmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index 50a4d2111..83464d3dd 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -101,7 +101,7 @@ grub_script.tab.c grub_script.tab.h: script/parser.y
 	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/parser.y
 DISTCLEANFILES += grub_script.tab.c grub_script.tab.h
 
-# For grub-check.
+# For grub-script-check.
 grub_script_check_init.lst: geninit.sh $(filter-out grub_script_check_init.c,$(grub_script_check_SOURCES))
 	rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
 DISTCLEANFILES += grub_script_check_init.lst

From 337470f1e1c427d52603e0ee3bb9e29aa886180b Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 9 Jan 2010 20:31:52 +0530
Subject: [PATCH 0223/1628] added changelog

---
 ChangeLog.grub-script-check | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 ChangeLog.grub-script-check

diff --git a/ChangeLog.grub-script-check b/ChangeLog.grub-script-check
new file mode 100644
index 000000000..6ed178d24
--- /dev/null
+++ b/ChangeLog.grub-script-check
@@ -0,0 +1,9 @@
+2010-01-09  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	Added new tool, grub-scrit-check to verify grub.cfg syntax.
+
+	* util/grub-script-check.c: grub-script-check tool.
+	* conf/common.rmk: Make rules for grub-script-check.
+
+
+

From 95c7fc3f55cca3c6fc75efe7cc098427dd433fef Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 10 Jan 2010 00:30:33 +0100
Subject: [PATCH 0224/1628] First compileable newreloc

---
 conf/i386-pc.rmk                 |   7 +-
 conf/i386.rmk                    |   3 +-
 include/grub/i386/relocator.h    |   6 +-
 include/grub/misc.h              |   2 +
 include/grub/mm_private.h        |  62 ++++
 include/grub/relocator.h         |  42 +++
 include/grub/relocator_private.h |  58 ++++
 kern/mm.c                        |  71 ++--
 lib/i386/relocator.c             | 162 ++++++----
 lib/i386/relocator32.S           | 158 +++++++++
 lib/i386/relocator_asm.S         | 216 ++-----------
 lib/relocator.c                  | 540 ++++++++++++++++++++++++++-----
 lib/x86_64/relocator_asm.S       |  85 +++++
 13 files changed, 1007 insertions(+), 405 deletions(-)
 create mode 100644 include/grub/mm_private.h
 create mode 100644 include/grub/relocator.h
 create mode 100644 include/grub/relocator_private.h
 create mode 100644 lib/i386/relocator32.S
 create mode 100644 lib/x86_64/relocator_asm.S

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index afdf47e5a..234d18193 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -64,7 +64,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
 	machine/biosdisk.h machine/boot.h machine/console.h machine/init.h \
 	machine/memory.h machine/loader.h machine/vga.h machine/vbe.h \
-	machine/kernel.h machine/pxe.h i386/pit.h list.h handler.h command.h i18n.h
+	machine/kernel.h machine/pxe.h i386/pit.h list.h handler.h command.h i18n.h mm_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
@@ -116,7 +116,7 @@ bin_SCRIPTS += grub-mkrescue
 grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 pkglib_MODULES = biosdisk.mod chain.mod 				\
-	multiboot.mod reboot.mod halt.mod				\
+	reboot.mod halt.mod				\
 	vbe.mod vbetest.mod vbeinfo.mod play.mod serial.mod		\
 	vga.mod memdisk.mod pci.mod lspci.mod				\
 	aout.mod bsd.mod pxe.mod pxecmd.mod datetime.mod date.mod 	\
@@ -179,7 +179,7 @@ linux_mod_SOURCES = loader/i386/linux.c
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-pkglib_MODULES += xnu.mod
+#pkglib_MODULES += xnu.mod
 xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/pc/xnu.c \
 	 loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
 xnu_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -202,6 +202,7 @@ serial_mod_CFLAGS = $(COMMON_CFLAGS)
 serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For multiboot.mod.
+#pkglib_MODULES += multiboot.mod
 multiboot_mod_SOURCES = loader/i386/multiboot.c \
 			loader/i386/multiboot_helper.S \
                         loader/i386/pc/multiboot2.c \
diff --git a/conf/i386.rmk b/conf/i386.rmk
index c3f036d0f..674170d01 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -16,7 +16,8 @@ vga_text_mod_CFLAGS = $(COMMON_CFLAGS)
 vga_text_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += relocator.mod
-relocator_mod_SOURCES = lib/i386/relocator.c lib/i386/relocator_asm.S lib/i386/relocator_backward.S
+relocator_mod_SOURCES = lib/relocator.c lib/i386/relocator32.S \
+	lib/i386/relocator_asm.S lib/i386/relocator.c
 relocator_mod_CFLAGS = $(COMMON_CFLAGS)
 relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
 relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/include/grub/i386/relocator.h b/include/grub/i386/relocator.h
index ef7fe23aa..2027a275c 100644
--- a/include/grub/i386/relocator.h
+++ b/include/grub/i386/relocator.h
@@ -21,6 +21,7 @@
 
 #include <grub/types.h>
 #include <grub/err.h>
+#include <grub/relocator.h>
 
 struct grub_relocator32_state
 {
@@ -32,10 +33,7 @@ struct grub_relocator32_state
   grub_uint32_t eip;
 };
 
-void *grub_relocator32_alloc (grub_size_t size);
-grub_err_t grub_relocator32_boot (void *relocator, grub_uint32_t dest,
+grub_err_t grub_relocator32_boot (struct grub_relocator *rel,
 				  struct grub_relocator32_state state);
-void *grub_relocator32_realloc (void *relocator, grub_size_t size);
-void grub_relocator32_free (void *relocator);
 
 #endif /* ! GRUB_RELOCATOR_CPU_HEADER */
diff --git a/include/grub/misc.h b/include/grub/misc.h
index c5eb953e2..b7af4afc4 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -43,6 +43,8 @@
 
 #define ALIGN_UP(addr, align) \
 	((addr + (typeof (addr)) align - 1) & ~((typeof (addr)) align - 1))
+#define ALIGN_DOWN(addr, align) \
+	((addr) & ~((typeof (addr)) align - 1))
 #define ARRAY_SIZE(array) (sizeof (array) / sizeof (array[0]))
 #define COMPILE_TIME_ASSERT(cond) switch (0) { case 1: case !(cond): ; }
 
diff --git a/include/grub/mm_private.h b/include/grub/mm_private.h
new file mode 100644
index 000000000..2927f16c4
--- /dev/null
+++ b/include/grub/mm_private.h
@@ -0,0 +1,62 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#ifndef GRUB_MM_PRIVATE_H
+#define GRUB_MM_PRIVATE_H	1
+
+#include <grub/mm.h>
+
+/* Magic words.  */
+#define GRUB_MM_FREE_MAGIC	0x2d3c2808
+#define GRUB_MM_ALLOC_MAGIC	0x6db08fa4
+
+typedef struct grub_mm_header
+{
+  struct grub_mm_header *next;
+  grub_size_t size;
+  grub_size_t magic;
+#if GRUB_CPU_SIZEOF_VOID_P == 4
+  char padding[4];
+#elif GRUB_CPU_SIZEOF_VOID_P == 8
+  char padding[8];
+#else
+# error "unknown word size"
+#endif
+}
+*grub_mm_header_t;
+
+#if GRUB_CPU_SIZEOF_VOID_P == 4
+# define GRUB_MM_ALIGN_LOG2	4
+#elif GRUB_CPU_SIZEOF_VOID_P == 8
+# define GRUB_MM_ALIGN_LOG2	5
+#endif
+
+#define GRUB_MM_ALIGN	(1 << GRUB_MM_ALIGN_LOG2)
+
+typedef struct grub_mm_region
+{
+  struct grub_mm_header *first;
+  struct grub_mm_region *next;
+  grub_size_t pre_size;
+  grub_size_t size;
+}
+*grub_mm_region_t;
+
+extern grub_mm_region_t EXPORT_VAR (grub_mm_base);
+
+#endif
diff --git a/include/grub/relocator.h b/include/grub/relocator.h
new file mode 100644
index 000000000..2ea74b775
--- /dev/null
+++ b/include/grub/relocator.h
@@ -0,0 +1,42 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/>.
+ */
+
+#ifndef GRUB_RELOCATOR_HEADER
+#define GRUB_RELOCATOR_HEADER	1
+
+#include <grub/types.h>
+#include <grub/err.h>
+
+struct grub_relocator;
+
+struct grub_relocator *grub_relocator_new (void);
+
+grub_err_t
+grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
+				 grub_addr_t target, grub_size_t size);
+
+grub_err_t
+grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src, 
+				  grub_addr_t *target,
+				  grub_addr_t min_addr, grub_addr_t max_addr,
+				  grub_size_t size, grub_size_t align);
+
+void
+grub_relocator_unload (struct grub_relocator *rel);
+
+#endif
diff --git a/include/grub/relocator_private.h b/include/grub/relocator_private.h
new file mode 100644
index 000000000..cc68305c8
--- /dev/null
+++ b/include/grub/relocator_private.h
@@ -0,0 +1,58 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/>.
+ */
+
+#ifndef GRUB_RELOCATOR_PRIVATE_HEADER
+#define GRUB_RELOCATOR_PRIVATE_HEADER	1
+
+#include <grub/types.h>
+#include <grub/err.h>
+
+extern grub_size_t grub_relocator_align;
+extern grub_size_t grub_relocator_forward_size;
+extern grub_size_t grub_relocator_backward_size;
+extern grub_size_t grub_relocator_jumper_size;
+
+struct grub_relocator
+{
+  struct grub_relocator_chunk *chunks;
+  grub_addr_t postchunks;
+  grub_addr_t highestaddr;
+  grub_addr_t highestnonpostaddr;
+  grub_size_t relocators_size;
+};
+
+struct grub_relocator_chunk
+{
+  struct grub_relocator_chunk *next;
+  grub_addr_t src;
+  grub_addr_t target;
+  grub_size_t size;
+};
+
+void
+grub_cpu_relocator_init (void);
+grub_err_t
+grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
+			       grub_addr_t *relstart);
+void grub_cpu_relocator_forward (void *rels, void *src, void *tgt,
+				 grub_size_t size);
+void grub_cpu_relocator_backward (void *rels, void *src, void *tgt,
+				 grub_size_t size);
+void grub_cpu_relocator_jumper (void *rels, grub_addr_t addr);
+
+#endif
diff --git a/kern/mm.c b/kern/mm.c
index ef97b018e..f1733f251 100644
--- a/kern/mm.c
+++ b/kern/mm.c
@@ -65,6 +65,7 @@
 #include <grub/types.h>
 #include <grub/disk.h>
 #include <grub/dl.h>
+#include <grub/mm_private.h>
 
 #ifdef MM_DEBUG
 # undef grub_malloc
@@ -74,45 +75,9 @@
 # undef grub_memalign
 #endif
 
-/* Magic words.  */
-#define GRUB_MM_FREE_MAGIC	0x2d3c2808
-#define GRUB_MM_ALLOC_MAGIC	0x6db08fa4
-
-typedef struct grub_mm_header
-{
-  struct grub_mm_header *next;
-  grub_size_t size;
-  grub_size_t magic;
-#if GRUB_CPU_SIZEOF_VOID_P == 4
-  char padding[4];
-#elif GRUB_CPU_SIZEOF_VOID_P == 8
-  char padding[8];
-#else
-# error "unknown word size"
-#endif
-}
-*grub_mm_header_t;
-
-#if GRUB_CPU_SIZEOF_VOID_P == 4
-# define GRUB_MM_ALIGN_LOG2	4
-#elif GRUB_CPU_SIZEOF_VOID_P == 8
-# define GRUB_MM_ALIGN_LOG2	5
-#endif
-
-#define GRUB_MM_ALIGN	(1 << GRUB_MM_ALIGN_LOG2)
-
-typedef struct grub_mm_region
-{
-  struct grub_mm_header *first;
-  struct grub_mm_region *next;
-  grub_addr_t addr;
-  grub_size_t size;
-}
-*grub_mm_region_t;
-
 
 
-static grub_mm_region_t base;
+grub_mm_region_t grub_mm_base;
 
 /* Get a header from the pointer PTR, and set *P and *R to a pointer
    to the header and a pointer to its region, respectively. PTR must
@@ -123,9 +88,9 @@ get_header_from_pointer (void *ptr, grub_mm_header_t *p, grub_mm_region_t *r)
   if ((grub_addr_t) ptr & (GRUB_MM_ALIGN - 1))
     grub_fatal ("unaligned pointer %p", ptr);
 
-  for (*r = base; *r; *r = (*r)->next)
-    if ((grub_addr_t) ptr > (*r)->addr
-	&& (grub_addr_t) ptr <= (*r)->addr + (*r)->size)
+  for (*r = grub_mm_base; *r; *r = (*r)->next)
+    if ((grub_addr_t) ptr > (grub_addr_t) ((*r) + 1)
+	&& (grub_addr_t) ptr <= (grub_addr_t) ((*r) + 1) + (*r)->size)
       break;
 
   if (! *r)
@@ -153,22 +118,21 @@ grub_mm_init_region (void *addr, grub_size_t size)
     return;
 
   /* Allocate a region from the head.  */
-  r = (grub_mm_region_t) (((grub_addr_t) addr + GRUB_MM_ALIGN - 1)
-			  & (~(GRUB_MM_ALIGN - 1)));
+  r = (grub_mm_region_t) ALIGN_UP ((grub_addr_t) addr, GRUB_MM_ALIGN);
   size -= (char *) r - (char *) addr + sizeof (*r);
 
-  h = (grub_mm_header_t) ((char *) r + GRUB_MM_ALIGN);
+  h = (grub_mm_header_t) (r + 1);
   h->next = h;
   h->magic = GRUB_MM_FREE_MAGIC;
   h->size = (size >> GRUB_MM_ALIGN_LOG2);
 
   r->first = h;
-  r->addr = (grub_addr_t) h;
+  r->pre_size = (grub_addr_t) r - (grub_addr_t) addr;
   r->size = (h->size << GRUB_MM_ALIGN_LOG2);
 
   /* Find where to insert this region. Put a smaller one before bigger ones,
      to prevent fragmentation.  */
-  for (p = &base, q = *p; q; p = &(q->next), q = *p)
+  for (p = &grub_mm_base, q = *p; q; p = &(q->next), q = *p)
     if (q->size > r->size)
       break;
 
@@ -268,13 +232,14 @@ grub_real_malloc (grub_mm_header_t *first, grub_size_t n, grub_size_t align)
 	       */
 	      grub_mm_header_t r;
 
+	      extra += (p->size - extra - n) & (~(align - 1));
 	      r = p + extra + n;
 	      r->magic = GRUB_MM_FREE_MAGIC;
 	      r->size = p->size - extra - n;
-	      r->next = p->next;
+	      r->next = p;
 
 	      p->size = extra;
-	      p->next = r;
+	      q->next = r;
 	      p += extra;
 	      p->size = n;
 	      p->magic = GRUB_MM_ALLOC_MAGIC;
@@ -310,7 +275,7 @@ grub_memalign (grub_size_t align, grub_size_t size)
 
  again:
 
-  for (r = base; r; r = r->next)
+  for (r = grub_mm_base; r; r = r->next)
     {
       void *p;
 
@@ -471,7 +436,7 @@ grub_mm_dump_free (void)
 {
   grub_mm_region_t r;
 
-  for (r = base; r; r = r->next)
+  for (r = grub_mm_base; r; r = r->next)
     {
       grub_mm_header_t p;
 
@@ -498,13 +463,13 @@ grub_mm_dump (unsigned lineno)
   grub_mm_region_t r;
 
   grub_printf ("called at line %u\n", lineno);
-  for (r = base; r; r = r->next)
+  for (r = grub_mm_base; r; r = r->next)
     {
       grub_mm_header_t p;
 
-      for (p = (grub_mm_header_t) ((r->addr + GRUB_MM_ALIGN - 1)
-				   & (~(GRUB_MM_ALIGN - 1)));
-	   (grub_addr_t) p < r->addr + r->size;
+      for (p = (grub_mm_header_t) ALIGN_UP ((grub_addr_t) (r + 1),
+					    GRUB_MM_ALIGN);
+	   (grub_addr_t) p < (grub_addr_t) (r+1) + r->size;
 	   p++)
 	{
 	  switch (p->magic)
diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index 453f73fdd..d4555e5f3 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -24,79 +24,115 @@
 #include <grub/err.h>
 
 #include <grub/i386/relocator.h>
+#include <grub/relocator_private.h>
 
-extern grub_uint8_t grub_relocator32_forward_start;
-extern grub_uint8_t grub_relocator32_forward_end;
-extern grub_uint8_t grub_relocator32_backward_start;
-extern grub_uint8_t grub_relocator32_backward_end;
+extern grub_uint8_t grub_relocator32_start;
+extern grub_uint8_t grub_relocator32_end;
+extern grub_uint8_t grub_relocator_forward_start;
+extern grub_uint8_t grub_relocator_forward_end;
+extern grub_uint8_t grub_relocator_backward_start;
+extern grub_uint8_t grub_relocator_backward_end;
 
-extern grub_uint32_t grub_relocator32_backward_dest;
-extern grub_uint32_t grub_relocator32_backward_size;
-extern grub_addr_t grub_relocator32_backward_src;
+extern void *grub_relocator_backward_dest;
+extern void *grub_relocator_backward_src;
+extern grub_size_t grub_relocator_backward_size;
 
-extern grub_uint32_t grub_relocator32_forward_dest;
-extern grub_uint32_t grub_relocator32_forward_size;
-extern grub_addr_t grub_relocator32_forward_src;
+extern void *grub_relocator_forward_dest;
+extern void *grub_relocator_forward_src;
+extern grub_size_t grub_relocator_forward_size;
 
-extern grub_uint32_t grub_relocator32_forward_eax;
-extern grub_uint32_t grub_relocator32_forward_ebx;
-extern grub_uint32_t grub_relocator32_forward_ecx;
-extern grub_uint32_t grub_relocator32_forward_edx;
-extern grub_uint32_t grub_relocator32_forward_eip;
-extern grub_uint32_t grub_relocator32_forward_esp;
+extern grub_uint32_t grub_relocator32_eax;
+extern grub_uint32_t grub_relocator32_ebx;
+extern grub_uint32_t grub_relocator32_ecx;
+extern grub_uint32_t grub_relocator32_edx;
+extern grub_uint32_t grub_relocator32_eip;
+extern grub_uint32_t grub_relocator32_esp;
 
-extern grub_uint32_t grub_relocator32_backward_eax;
-extern grub_uint32_t grub_relocator32_backward_ebx;
-extern grub_uint32_t grub_relocator32_backward_ecx;
-extern grub_uint32_t grub_relocator32_backward_edx;
-extern grub_uint32_t grub_relocator32_backward_eip;
-extern grub_uint32_t grub_relocator32_backward_esp;
+#define RELOCATOR_SIZEOF(x)	(&grub_relocator##x##_end - &grub_relocator##x##_start)
 
-#define RELOCATOR_SIZEOF(x)	(&grub_relocator32_##x##_end - &grub_relocator32_##x##_start)
-#define RELOCATOR_ALIGN 16
-#define PREFIX(x) grub_relocator32_ ## x
+grub_size_t grub_relocator_align = 1;
+grub_size_t grub_relocator_forward_size;
+grub_size_t grub_relocator_backward_size;
+grub_size_t grub_relocator_jumper_size = 10;
 
-static void
-write_call_relocator_bw (void *ptr, void *src, grub_uint32_t dest,
-			 grub_size_t size, struct grub_relocator32_state state)
+void
+grub_cpu_relocator_init (void)
 {
-  grub_relocator32_backward_dest = dest;
-  grub_relocator32_backward_src = PTR_TO_UINT64 (src);
-  grub_relocator32_backward_size = size;
-
-  grub_relocator32_backward_eax = state.eax;
-  grub_relocator32_backward_ebx = state.ebx;
-  grub_relocator32_backward_ecx = state.ecx;
-  grub_relocator32_backward_edx = state.edx;
-  grub_relocator32_backward_eip = state.eip;
-  grub_relocator32_backward_esp = state.esp;
-
-  grub_memmove (ptr,
-		&grub_relocator32_backward_start,
-		RELOCATOR_SIZEOF (backward));
-  ((void (*) (void)) ptr) ();
+  grub_relocator_forward_size = RELOCATOR_SIZEOF(_forward);
+  grub_relocator_backward_size = RELOCATOR_SIZEOF(_backward);
 }
 
-static void
-write_call_relocator_fw (void *ptr, void *src, grub_uint32_t dest,
-			 grub_size_t size, struct grub_relocator32_state state)
+void
+grub_cpu_relocator_jumper (void *rels, grub_addr_t addr)
 {
-
-  grub_relocator32_forward_dest = dest;
-  grub_relocator32_forward_src = PTR_TO_UINT64 (src);
-  grub_relocator32_forward_size = size;
-
-  grub_relocator32_forward_eax = state.eax;
-  grub_relocator32_forward_ebx = state.ebx;
-  grub_relocator32_forward_ecx = state.ecx;
-  grub_relocator32_forward_edx = state.edx;
-  grub_relocator32_forward_eip = state.eip;
-  grub_relocator32_forward_esp = state.esp;
-
-  grub_memmove (ptr,
-		&grub_relocator32_forward_start,
-		RELOCATOR_SIZEOF (forward));
-  ((void (*) (void)) ptr) ();
+  grub_uint8_t *ptr;
+  ptr = rels;
+  /* jmp $addr */
+  *(grub_uint8_t *) ptr = 0xe9;
+  ptr++;
+  *(grub_uint32_t *) ptr = addr - (grub_uint32_t) (ptr + 4);
+  ptr += 4;
+  /* movl $addr, %eax (for relocator) */
+  *(grub_uint8_t *) ptr = 0xb8;
+  ptr++;
+  *(grub_uint32_t *) ptr = addr;  
 }
 
-#include "../relocator.c"
+void
+grub_cpu_relocator_backward (void *ptr, void *src, void *dest,
+			     grub_size_t size)
+{
+  grub_relocator_backward_dest = dest;
+  grub_relocator_backward_src = src;
+  grub_relocator_backward_size = size;
+
+  grub_memmove (ptr,
+		&grub_relocator_backward_start,
+		RELOCATOR_SIZEOF (_backward));
+}
+
+void
+grub_cpu_relocator_forward (void *ptr, void *src, void *dest,
+			     grub_size_t size)
+{
+  grub_relocator_forward_dest = dest;
+  grub_relocator_forward_src = src;
+  grub_relocator_forward_size = size;
+
+  grub_memmove (ptr,
+		&grub_relocator_forward_start,
+		RELOCATOR_SIZEOF (_forward));
+}
+
+grub_err_t
+grub_relocator32_boot (struct grub_relocator *rel,
+		       struct grub_relocator32_state state)
+{
+  grub_addr_t target;
+  void *src;
+  grub_err_t err;
+  grub_addr_t relst;
+  err = grub_relocator_alloc_chunk_align (rel, &src, &target, 0,
+					  (0xffffffff - RELOCATOR_SIZEOF (32))
+					  + 1, RELOCATOR_SIZEOF (32), 16);
+  if (err)
+    return err;
+
+  grub_relocator32_eax = state.eax;
+  grub_relocator32_ebx = state.ebx;
+  grub_relocator32_ecx = state.ecx;
+  grub_relocator32_edx = state.edx;
+  grub_relocator32_eip = state.eip;
+  grub_relocator32_esp = state.esp;
+
+  grub_memmove (src, &grub_relocator32_start, RELOCATOR_SIZEOF (32));
+
+  err = grub_relocator_prepare_relocs (rel, target, &relst);
+  if (err)
+    return err;
+  asm volatile ("cli");
+  ((void (*) (void)) relst) ();
+
+  /* Not reached.  */
+  return GRUB_ERR_NONE;
+}
diff --git a/lib/i386/relocator32.S b/lib/i386/relocator32.S
new file mode 100644
index 000000000..f69e0bdc8
--- /dev/null
+++ b/lib/i386/relocator32.S
@@ -0,0 +1,158 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009,2010  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/symbol.h>
+#include <grub/i386/memory.h>
+
+#ifdef __x86_64__
+#define RAX %rax
+#define RSI %rdi
+#else
+#define RAX %eax
+#define RSI %esi
+#endif
+
+/* The code segment of the protected mode.  */
+#define CODE_SEGMENT	0x10
+
+/* The data segment of the protected mode.  */
+#define DATA_SEGMENT	0x18
+
+	.p2align	4	/* force 16-byte alignment */
+
+VARIABLE(grub_relocator32_start)
+LOCAL(base):
+	/* %rax contains now our new 'base'.  */
+	mov	RAX, RSI
+	add	$(LOCAL(cont0) - LOCAL(base)), RAX
+	jmp	*RAX
+LOCAL(cont0):
+	lea	(LOCAL(cont1) - LOCAL(base)) (RSI, 1), RAX
+	movl	%eax, (LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
+
+	lea	(LOCAL(gdt) - LOCAL(base)) (RSI, 1), RAX
+	mov	RAX, (LOCAL(gdt_addr) - LOCAL(base)) (RSI, 1)
+
+	/* Switch to compatibility mode. */
+
+	lgdt	(LOCAL(gdtdesc) - LOCAL(base)) (RSI, 1)
+
+	/* Update %cs.  */
+	ljmp	*(LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
+
+LOCAL(cont1):
+	.code32
+
+	/* Update other registers. */
+	movl	$DATA_SEGMENT, %eax
+	movl	%eax, %ds
+	movl	%eax, %es
+	movl	%eax, %fs
+	movl	%eax, %gs
+	movl	%eax, %ss
+
+	/* Disable paging. */
+	movl	%cr0, %eax
+	andl	$(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax
+	movl	%eax, %cr0
+
+	/* Disable amd64. */
+	movl	$GRUB_MEMORY_CPU_AMD64_MSR, %ecx
+	rdmsr
+	andl	$(~GRUB_MEMORY_CPU_AMD64_MSR_ON), %eax
+	wrmsr
+
+	/* Turn off PAE. */
+	movl	%cr4, %eax
+	andl	$GRUB_MEMORY_CPU_CR4_PAE_ON, %eax
+	movl	%eax, %cr4
+
+	jmp	LOCAL(cont2)
+LOCAL(cont2):
+	.code32
+
+	/* mov imm32, %eax */
+	.byte	0xb8
+VARIABLE(grub_relocator32_esp)
+	.long	0
+
+	movl	%eax, %esp
+
+	/* mov imm32, %eax */
+	.byte	0xb8
+VARIABLE(grub_relocator32_eax)
+	.long	0
+
+	/* mov imm32, %ebx */
+	.byte	0xbb
+VARIABLE(grub_relocator32_ebx)
+	.long	0
+
+	/* mov imm32, %ecx */
+	.byte	0xb9
+VARIABLE(grub_relocator32_ecx)
+	.long	0
+
+	/* mov imm32, %edx */
+	.byte	0xba
+VARIABLE(grub_relocator32_edx)
+	.long	0
+
+	/* Cleared direction flag is of no problem with any current
+	   payload and makes this implementation easier.  */
+	cld
+
+	.byte	0xea
+VARIABLE(grub_relocator32_eip)
+	.long	0
+	.word	CODE_SEGMENT
+
+	/* GDT. Copied from loader/i386/linux.c. */
+	.p2align	4
+LOCAL(gdt):
+	/* NULL.  */
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	/* Reserved.  */
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	/* Code segment.  */
+	.byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x9A, 0xCF, 0x00
+
+	/* Data segment.  */
+	.byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x92, 0xCF, 0x00
+
+	.p2align	4
+LOCAL(gdtdesc):
+	.word	0x27
+LOCAL(gdt_addr):
+#ifdef __x86_64__
+	/* Filled by the code. */
+	.quad	0
+#else
+	/* Filled by the code. */
+	.long	0
+#endif
+
+	.p2align	4
+LOCAL(jump_vector):
+	/* Jump location. Is filled by the code */
+	.long	0
+	.long	CODE_SEGMENT
+
+VARIABLE(grub_relocator32_end)
diff --git a/lib/i386/relocator_asm.S b/lib/i386/relocator_asm.S
index 6b803db13..f8fc0c08a 100644
--- a/lib/i386/relocator_asm.S
+++ b/lib/i386/relocator_asm.S
@@ -19,230 +19,60 @@
 #include <grub/symbol.h>
 #include <grub/i386/memory.h>
 
-#ifdef BACKWARD
-#define RELOCATOR_VARIABLE(x) VARIABLE(grub_relocator32_backward_ ## x)
-#else
-#define RELOCATOR_VARIABLE(x) VARIABLE(grub_relocator32_forward_ ## x)
-#endif
-#ifdef __x86_64__
-#define RAX %rax
-#define RCX %rcx
-#define RDI %rdi
-#define RSI %rdi
-#else
-#define RAX %eax
-#define RCX %ecx
-#define RDI %edi
-#define RSI %esi
-#endif
-
-/* The code segment of the protected mode.  */
-#define CODE_SEGMENT	0x10
-
-/* The data segment of the protected mode.  */
-#define DATA_SEGMENT	0x18
-
-	.p2align	4	/* force 16-byte alignment */
-
-RELOCATOR_VARIABLE(start)
-#ifdef BACKWARD
-LOCAL(base):
-#endif
-	cli
-
-#ifndef __x86_64__
+VARIABLE(grub_relocator_backward_start)
 	/* mov imm32, %eax */
 	.byte	0xb8
-RELOCATOR_VARIABLE(dest)
+VARIABLE(grub_relocator_backward_dest)
 	.long	0
 	movl	%eax, %edi
 
 	/* mov imm32, %eax */
 	.byte	0xb8
-RELOCATOR_VARIABLE(src)
+VARIABLE(grub_relocator_backward_src)
 	.long	0
 	movl	%eax, %esi
 
 	/* mov imm32, %ecx */
 	.byte	0xb9
-RELOCATOR_VARIABLE(size)
+VARIABLE(grub_relocator_backward_size)
 	.long	0
-#else
-	xorq	%rax, %rax
-
-	/* mov imm32, %eax */
-	.byte	0xb8
-RELOCATOR_VARIABLE(dest)
-	.long	0
-	movq	%rax, %rdi
-
-	/* mov imm64, %rax */
-	.byte	0x48
-	.byte	0xb8
-RELOCATOR_VARIABLE(src)
-	.long	0, 0
-	movq	%rax, %rsi
-
-	xorq	%rcx, %rcx
-	/* mov imm32, %ecx */
-	.byte	0xb9
-RELOCATOR_VARIABLE(size)
-	.long	0
-
-#endif
-
-	mov	RDI, RAX
-
-#ifdef BACKWARD
-	add	RCX, RSI
-	add	RCX, RDI
-#endif
-
-#ifndef BACKWARD
-	add	RCX, RAX
-#endif
-	add	$0x3, RCX
-	shr	$2, RCX
+	
+	add	%ecx, %esi
+	add	%ecx, %edi
 
 
-#ifdef BACKWARD
-	/* Backward movsl is implicitly off-by-four.  compensate that.  */
-	sub	$4,	RSI
-	sub	$4,	RDI
+	/* Backward movsb is implicitly off-by-one.  compensate that.  */
+	sub	$1,	%esi
+	sub	$1,	%edi
 
 	/* Backward copy.  */
 	std
 
 	rep
-	movsl
+	movsb
+VARIABLE(grub_relocator_backward_end)
 
-#else
-	/* Forward copy.  */
-	cld
-	rep
-	movsl
-#endif
-
-	/* %rax contains now our new 'base'.  */
-	mov	RAX, RSI
-	add	$(LOCAL(cont0) - LOCAL(base)), RAX
-	jmp	*RAX
-LOCAL(cont0):
-	lea	(LOCAL(cont1) - LOCAL(base)) (RSI, 1), RAX
-	movl	%eax, (LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
-
-	lea	(LOCAL(gdt) - LOCAL(base)) (RSI, 1), RAX
-	mov	RAX, (LOCAL(gdt_addr) - LOCAL(base)) (RSI, 1)
-
-	/* Switch to compatibility mode. */
-
-	lgdt	(LOCAL(gdtdesc) - LOCAL(base)) (RSI, 1)
-
-	/* Update %cs.  */
-	ljmp	*(LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
-
-LOCAL(cont1):
-	.code32
-
-	/* Update other registers. */
-	movl	$DATA_SEGMENT, %eax
-	movl	%eax, %ds
-	movl	%eax, %es
-	movl	%eax, %fs
-	movl	%eax, %gs
-	movl	%eax, %ss
-
-	/* Disable paging. */
-	movl	%cr0, %eax
-	andl	$(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax
-	movl	%eax, %cr0
-
-	/* Disable amd64. */
-	movl	$GRUB_MEMORY_CPU_AMD64_MSR, %ecx
-	rdmsr
-	andl	$(~GRUB_MEMORY_CPU_AMD64_MSR_ON), %eax
-	wrmsr
-
-	/* Turn off PAE. */
-	movl	%cr4, %eax
-	andl	$GRUB_MEMORY_CPU_CR4_PAE_ON, %eax
-	movl	%eax, %cr4
-
-	jmp	LOCAL(cont2)
-LOCAL(cont2):
-	.code32
 
+VARIABLE(grub_relocator_forward_start)
 	/* mov imm32, %eax */
 	.byte	0xb8
-RELOCATOR_VARIABLE (esp)
+VARIABLE(grub_relocator_forward_dest)
 	.long	0
+	movl	%eax, %edi
 
-	movl	%eax, %esp
-
-	/* mov imm32, %eax */
+	/* mov imm32, %rax */
 	.byte	0xb8
-RELOCATOR_VARIABLE (eax)
-	.long	0
-
-	/* mov imm32, %ebx */
-	.byte	0xbb
-RELOCATOR_VARIABLE (ebx)
+VARIABLE(grub_relocator_forward_src)
 	.long	0
+	movl	%eax, %esi
 
 	/* mov imm32, %ecx */
 	.byte	0xb9
-RELOCATOR_VARIABLE (ecx)
+VARIABLE(grub_relocator_forward_size)
 	.long	0
 
-	/* mov imm32, %edx */
-	.byte	0xba
-RELOCATOR_VARIABLE (edx)
-	.long	0
-
-	/* Cleared direction flag is of no problem with any current
-	   payload and makes this implementation easier.  */
+	/* Forward copy.  */
 	cld
-
-	.byte	0xea
-RELOCATOR_VARIABLE (eip)
-	.long	0
-	.word	CODE_SEGMENT
-
-	/* GDT. Copied from loader/i386/linux.c. */
-	.p2align	4
-LOCAL(gdt):
-	/* NULL.  */
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-	/* Reserved.  */
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-	/* Code segment.  */
-	.byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x9A, 0xCF, 0x00
-
-	/* Data segment.  */
-	.byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x92, 0xCF, 0x00
-
-	.p2align	4
-LOCAL(gdtdesc):
-	.word	0x27
-LOCAL(gdt_addr):
-#ifdef __x86_64__
-	/* Filled by the code. */
-	.quad	0
-#else
-	/* Filled by the code. */
-	.long	0
-#endif
-
-	.p2align	4
-LOCAL(jump_vector):
-	/* Jump location. Is filled by the code */
-	.long	0
-	.long	CODE_SEGMENT
-
-#ifndef BACKWARD
-LOCAL(base):
-#endif
-
-RELOCATOR_VARIABLE(end)
+	rep
+	movsb
+VARIABLE(grub_relocator_forward_end)
diff --git a/lib/relocator.c b/lib/relocator.c
index 6a5acc548..25ebd27bb 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -16,122 +16,486 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define MAX_OVERHEAD ((RELOCATOR_SIZEOF (forward) + RELOCATOR_ALIGN) \
-		      + (RELOCATOR_SIZEOF (backward) + RELOCATOR_ALIGN) \
-		      + (RELOCATOR_SIZEOF (forward) + RELOCATOR_ALIGN)	\
-		      + (RELOCATOR_SIZEOF (backward) + RELOCATOR_ALIGN))
-#define PRE_REGION_SIZE (RELOCATOR_SIZEOF (backward) + RELOCATOR_ALIGN)
+#include <grub/relocator.h>
+#include <grub/relocator_private.h>
+#include <grub/mm_private.h>
+#include <grub/misc.h>
 
-void *
-PREFIX (alloc) (grub_size_t size)
+/* TODO: use more efficient data structures if necessary.  */
+
+struct grub_relocator *
+grub_relocator_new (void)
 {
-  char *playground;
+  struct grub_relocator *ret;
 
-  playground = grub_malloc (size + MAX_OVERHEAD);
-  if (!playground)
-    return 0;
+  grub_cpu_relocator_init ();
 
-  *(grub_size_t *) playground = size;
-
-  return playground + PRE_REGION_SIZE;
+  ret = grub_zalloc (sizeof (struct grub_relocator));
+  if (!ret)
+    return NULL;
+    
+  ret->postchunks = ~(grub_addr_t) 0;
+  ret->relocators_size = grub_relocator_jumper_size;  
+  return ret;
 }
 
-void *
-PREFIX (realloc) (void *relocator, grub_size_t size)
+static grub_mm_header_t
+get_best_header (struct grub_relocator *rel,
+		 grub_addr_t start, grub_addr_t end, grub_addr_t align,
+		 grub_size_t size,
+		 grub_mm_region_t rb, grub_mm_header_t *prev,
+		 grub_addr_t *best_addr, int from_low_priv, int collisioncheck)
 {
-  char *playground;
+  grub_mm_header_t h, hp;
+  grub_mm_header_t hb = NULL, hbp = NULL;
 
-  if (!relocator)
-    return PREFIX (alloc) (size);
+  auto void try_addr (grub_addr_t allowable_start, grub_addr_t allowable_end);
+  void try_addr (grub_addr_t allowable_start, grub_addr_t allowable_end)
+  {
+    if (from_low_priv)
+      {
+	grub_addr_t addr;
 
-  playground = (char *) relocator - PRE_REGION_SIZE;
+	addr = ALIGN_UP (allowable_start, align);
 
-  playground = grub_realloc (playground, size + MAX_OVERHEAD);
-  if (!playground)
-    return 0;
+	if (addr < start)
+	  addr = ALIGN_UP (start, align);
 
-  *(grub_size_t *) playground = size;
+	if (collisioncheck)
+	  while (1)
+	    {
+	      struct grub_relocator_chunk *chunk;
+	      for (chunk = rel->chunks; chunk; chunk = chunk->next)
+		if ((chunk->target <= addr
+		     && addr < chunk->target + chunk->size)
+		    || (chunk->target <= addr + size
+			&& addr + size < chunk->target + chunk->size)
+		    || (addr <= chunk->target && chunk->target < addr + size)
+		    || (addr <= chunk->target + chunk->size
+			&& chunk->target + chunk->size < addr + size))
+		  {
+		    addr = ALIGN_UP (chunk->target + chunk->size, align);
+		    break;
+		  }
+	      if (!chunk)
+		break;
+	    }
 
-  return playground + PRE_REGION_SIZE;
+	if (allowable_end <= addr + size)
+	  return;
+
+	if (addr > end)
+	  return;
+
+	if (hb == NULL || *best_addr > addr)
+	  {
+	    hb = h;
+	    hbp = hp;
+	    *best_addr = addr;
+	  }
+      }
+    else
+      {
+	grub_addr_t addr;
+
+	addr = ALIGN_DOWN (allowable_end - size, align);
+
+	if (addr > end)
+	  addr = ALIGN_DOWN (end, align);
+
+	if (collisioncheck)
+	  while (1)
+	    {
+	      struct grub_relocator_chunk *chunk;
+	      for (chunk = rel->chunks; chunk; chunk = chunk->next)
+		if ((chunk->target <= addr
+		     && addr < chunk->target + chunk->size)
+		    || (chunk->target <= addr + size
+			&& addr + size < chunk->target + chunk->size)
+		    || (addr <= chunk->target && chunk->target < addr + size)
+		    || (addr <= chunk->target + chunk->size
+			&& chunk->target + chunk->size < addr + size))
+		  {
+		    addr = ALIGN_DOWN (chunk->target - size, align);
+		    break;
+		  }
+	      if (!chunk)
+		break;
+	    }
+
+	if (allowable_start > addr)
+	  return;
+
+	if (addr < start)
+	  return;
+
+	if (hb == NULL || *best_addr < addr)
+	  {
+	    hb = h;
+	    hbp = hp;
+	    *best_addr = addr;
+	  }
+      }
+  }
+  
+  for (hp = NULL, h = rb->first; h; hp = h, h = h->next)
+    {
+      grub_addr_t allowable_start, allowable_end;
+      allowable_start = (grub_addr_t) h;
+      allowable_end = (grub_addr_t) (h + 1 + h->size);
+      
+      try_addr (allowable_start, allowable_end);
+      
+      if ((grub_addr_t) h == (grub_addr_t) (rb + 1))
+	try_addr (allowable_start - sizeof (*rb) - rb->pre_size,
+		  allowable_end - sizeof (*rb));
+    }
+  *prev = hbp;
+  return hb;
 }
 
-void
-PREFIX(free) (void *relocator)
+static int
+malloc_in_range (struct grub_relocator *rel,
+		 grub_addr_t start, grub_addr_t end, grub_addr_t align,
+		 grub_size_t size, grub_addr_t *res, int from_low_priv,
+		 int collisioncheck)
 {
-  if (relocator)
-    grub_free ((char *) relocator - PRE_REGION_SIZE);
+  grub_mm_region_t rb = NULL, rbp = NULL;
+  grub_mm_header_t hb = NULL, hbp = NULL;
+  grub_addr_t best_addr;
+
+ again:
+  
+  {
+    grub_mm_region_t r, rp;
+    for (rp = NULL, r = grub_mm_base; r; rp = r, r = r->next)
+      {
+	if ((grub_addr_t) r + r->size + sizeof (*r) > start
+	    && (grub_addr_t) r <= end && r->size + sizeof (*r) >= size
+	    && (rb == NULL || from_low_priv ? rb > r : rb < r))
+	  {
+	    rb = r;
+	    rbp = rp;
+	  }
+      }
+  }
+
+  if (!rb)
+    return 0;
+
+  hb = get_best_header (rel, start, end, align, size, rb, &hbp, &best_addr,
+			from_low_priv, collisioncheck);
+  if (!hb)
+    {
+      if (from_low_priv)
+	start = (grub_addr_t) (rb + rb->size + sizeof (*rb));
+      else
+	end = (grub_addr_t) rb - 1;
+      goto again;
+    }
+
+  /* Special case: relocating region start.  */
+  if (best_addr < (grub_addr_t) hbp)
+    {
+      grub_addr_t newreg_start, newreg_raw_start = best_addr + size;
+      grub_addr_t newreg_size, newreg_presize;
+      grub_mm_header_t new_header;
+      newreg_start = ALIGN_UP (newreg_raw_start, GRUB_MM_ALIGN);
+      newreg_presize = newreg_start - newreg_raw_start;
+      newreg_size = rb->size - (newreg_start - (grub_addr_t) rb);
+      if ((hb->size << GRUB_MM_ALIGN_LOG2) >= newreg_start
+	  + (grub_addr_t) rb)
+	{
+	  grub_mm_header_t newhnext = hb->next;
+	  grub_size_t newhsize = ((hb->size << GRUB_MM_ALIGN_LOG2)
+				  - newreg_start
+				  - (grub_addr_t) rb) >> GRUB_MM_ALIGN_LOG2;
+	  new_header = (void *) (newreg_start + sizeof (*rb));
+	  new_header->next = newhnext;
+	  new_header->size = newhsize;
+	  new_header->magic = GRUB_MM_FREE_MAGIC;
+	}
+      else
+	{
+	  new_header = hb->next;
+	}
+      if (hbp || new_header)
+	{
+	  struct grub_mm_header *newregfirst = rb->first;
+	  struct grub_mm_region *newregnext = rb->next;
+	  struct grub_mm_region *newreg = (void *) newreg_start;
+	  if (hbp)
+	    hbp->next = new_header;
+	  else
+	    newregfirst = new_header;
+	  newreg->first = newregfirst;
+	  newreg->next = newregnext;
+	  newreg->pre_size = newreg_presize;
+	  newreg->size = newreg_size;
+	  if (rbp)
+	    rbp->next = newreg;
+	  else
+	    grub_mm_base = newreg;
+	}
+      else
+	{
+	  if (rbp)
+	    rbp->next = rb->next;
+	  else
+	    grub_mm_base = rb->next;
+	}
+      *res = best_addr;
+      return 1;
+    }
+  {
+    struct grub_mm_header *foll = NULL;
+    
+    if (best_addr + size <= (grub_addr_t) (hb + hb->size))
+      {
+	foll = (void *) ALIGN_UP (best_addr + size, GRUB_MM_ALIGN);
+	foll->magic = GRUB_MM_FREE_MAGIC;
+	foll->size = hb->size - (foll - hb);
+      }
+
+    if (best_addr - (grub_addr_t) hb >= sizeof (*hb))
+      {
+	hb->size = (best_addr - (grub_addr_t) hb) >> GRUB_MM_ALIGN_LOG2;
+	if (foll)
+	  {
+	    foll->next = hb;
+	    if (hbp)
+	      hbp->next = foll;
+	    else
+	      rb->first = foll;
+	  }
+      }
+    else
+      {
+	if (foll)
+	  foll->next = hb->next;
+	else
+	  foll = hb->next;
+	if (hbp)
+	  hbp->next = foll;
+	else
+	  rb->first = foll;
+      }
+    *res = best_addr;
+    return 1;
+  }
 }
 
 grub_err_t
-PREFIX (boot) (void *relocator, grub_uint32_t dest,
-	       struct grub_relocator32_state state)
+grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
+				 grub_addr_t target, grub_size_t size)
 {
-  grub_size_t size;
-  char *playground;
+  struct grub_relocator_chunk *chunk;
+  grub_addr_t start;
+  grub_addr_t min_addr = 0, max_addr;
 
-  playground = (char *) relocator - PRE_REGION_SIZE;
-  size = *(grub_size_t *) playground;
+  max_addr = rel->postchunks;
 
-  grub_dprintf ("relocator",
-		"Relocator: source: %p, destination: 0x%x, size: 0x%lx\n",
-		relocator, (unsigned) dest, (unsigned long) size);
-
-  /* Very unlikely condition: Relocator may risk overwrite itself.
-     Just move it a bit up.  */
-  if ((grub_addr_t) dest < (grub_addr_t) relocator
-      + (RELOCATOR_SIZEOF (backward) + RELOCATOR_ALIGN)
-      && (grub_addr_t) dest + (RELOCATOR_SIZEOF (forward) + RELOCATOR_ALIGN)
-      > (grub_addr_t) relocator)
+  /* Keep chunks in memory in the same order as they'll be after relocation.  */
+  for (chunk = rel->chunks; chunk; chunk = chunk->next)
     {
-      void *relocator_new = ((grub_uint8_t *) relocator)
-	+ (RELOCATOR_SIZEOF (forward) + RELOCATOR_ALIGN)
-	+ (RELOCATOR_SIZEOF (backward) + RELOCATOR_ALIGN);
-      grub_dprintf ("relocator", "Overwrite condition detected moving "
-		    "relocator from %p to %p\n", relocator, relocator_new);
-      grub_memmove (relocator_new, relocator,
-		    (RELOCATOR_SIZEOF (forward) + RELOCATOR_ALIGN)
-		    + size
-		    + (RELOCATOR_SIZEOF (backward) + RELOCATOR_ALIGN));
-      relocator = relocator_new;
+      if (chunk->target > target && chunk->src > max_addr)
+	max_addr = chunk->src;
+      if (chunk->target + chunk->size <= target
+	  && chunk->src + chunk->size < min_addr
+	  && chunk->src < rel->postchunks)
+	min_addr = chunk->src + chunk->size;
+      if ((chunk->target <= target && target < chunk->target + chunk->size)
+	  || (target <= chunk->target && chunk->target < target + size))
+	{
+	  return grub_error (GRUB_ERR_BAD_ARGUMENT, "overlap detected");
+	}
     }
 
-  if ((grub_addr_t) dest >= (grub_addr_t) relocator)
-    {
-      int overhead;
-      overhead = dest -
-	ALIGN_UP (dest - RELOCATOR_SIZEOF (backward) - RELOCATOR_ALIGN,
-		  RELOCATOR_ALIGN);
-      grub_dprintf ("relocator",
-		    "Backward relocator: code %p, source: %p, "
-		    "destination: 0x%x, size: 0x%lx\n",
-		    (char *) relocator - overhead,
-		    (char *) relocator - overhead,
-		    (unsigned) dest - overhead,
-		    (unsigned long) size + overhead);
+  chunk = grub_malloc (sizeof (struct grub_relocator_chunk));
+  if (!chunk)
+    return grub_errno;
 
-      write_call_relocator_bw ((char *) relocator - overhead,
-			       (char *) relocator - overhead,
-			       dest - overhead, size + overhead, state);
+  do
+    {
+      /* A trick to improve Linux allocation.  */
+#if defined (__i386__) || defined (__x86_64__)
+      if (target < 0x100000)
+	if (malloc_in_range (rel, rel->highestnonpostaddr, ~(grub_addr_t)0, 0,
+			     size, &start, 1, 0))
+	  {
+	    if (rel->postchunks < start)
+	      rel->postchunks = start;
+	    break;
+	  }
+#endif
+      if (malloc_in_range (rel, target, max_addr, 1, size, &start, 1, 0))
+	break;
+
+      if (malloc_in_range (rel, min_addr, target, 0, size, &start, 1, 0))
+	break;
+
+      grub_free (chunk);
+      return grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
     }
-  else
+  while (0);
+
+  if (rel->highestaddr < target + size)
+    rel->highestaddr = target + size;
+
+  if (rel->highestaddr < start + size)
+    rel->highestaddr = start + size;
+
+  if (start < rel->postchunks)
     {
-      int overhead;
-
-      overhead = ALIGN_UP (dest + size, RELOCATOR_ALIGN)
-	+ RELOCATOR_SIZEOF (forward) - (dest + size);
-      grub_dprintf ("relocator",
-		    "Forward relocator: code %p, source: %p, "
-		    "destination: 0x%x, size: 0x%lx\n",
-		    (char *) relocator + size + overhead
-		    - RELOCATOR_SIZEOF (forward),
-		    relocator, (unsigned) dest,
-		    (unsigned long) size + overhead);
-
-      write_call_relocator_fw ((char *) relocator + size + overhead
-			       - RELOCATOR_SIZEOF (forward),
-			       relocator, dest, size + overhead, state);
+      if (rel->highestnonpostaddr < target + size)
+	rel->highestnonpostaddr = target + size;
+      
+      if (rel->highestnonpostaddr < start + size)
+	rel->highestnonpostaddr = start + size;  
     }
 
-  /* Not reached.  */
+  if (start < target)
+    rel->relocators_size += grub_relocator_backward_size;
+  if (start > target)
+    rel->relocators_size += grub_relocator_forward_size;
+
+  chunk->src = start;
+  chunk->target = target;
+  chunk->size = size;
+  chunk->next = rel->chunks;
+  rel->chunks = chunk;
+  *src = (void *) start;
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
+				  grub_addr_t *target,
+				  grub_addr_t min_addr, grub_addr_t max_addr,
+				  grub_size_t size, grub_size_t align)
+{
+  grub_addr_t min_addr2 = 0, max_addr2;
+  struct grub_relocator_chunk *chunk;
+  grub_addr_t start;
+
+  chunk = grub_malloc (sizeof (struct grub_relocator_chunk));
+  if (!chunk)
+    return grub_errno;
+
+  if (malloc_in_range (rel, min_addr, max_addr, align,
+		       size, &start, 1, 1))
+    {
+      chunk->src = start;
+      chunk->target = start;
+      chunk->size = size;
+      chunk->next = rel->chunks;
+      rel->chunks = chunk;
+      *src = (void *) start;
+      *target = start;
+      return GRUB_ERR_NONE;
+    }
+
+  max_addr2 = rel->postchunks;
+  
+  /* Keep chunks in memory in the same order as they'll be after
+     relocation.  */
+  for (chunk = rel->chunks; chunk; chunk = chunk->next)
+    {
+      if (chunk->target > max_addr && chunk->src > max_addr2)
+	max_addr2 = chunk->src;
+      if (chunk->target + chunk->size <= min_addr
+	  && chunk->src + chunk->size < min_addr2
+	  && chunk->src < rel->postchunks)
+	min_addr2 = chunk->src + chunk->size;
+    }
+
+  if (!malloc_in_range (rel, min_addr2, max_addr2, align,
+			size, &start, 1, 1))
+    {
+      grub_free (chunk);
+      return grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
+    }
+  
+  chunk->target = ALIGN_UP (min_addr, align);
+  while (1)
+    {
+      struct grub_relocator_chunk *chunk2;
+      for (chunk2 = rel->chunks; chunk2; chunk2 = chunk2->next)
+	if ((chunk2->target <= chunk->target
+	     && chunk->target < chunk2->target + chunk2->size)
+	    || (chunk2->target <= chunk->target + size
+		&& chunk->target + size < chunk2->target + chunk2->size)
+	    || (chunk->target <= chunk2->target && chunk2->target
+		< chunk->target + size)
+	    || (chunk->target <= chunk2->target + chunk2->size
+		&& chunk2->target + chunk2->size < chunk->target + size))
+	  {
+	    chunk->target = ALIGN_UP (chunk2->target + chunk2->size, align);
+	    break;
+	  }
+      if (!chunk2)
+	break;
+    }
+
+  if (start < chunk->target)
+    rel->relocators_size += grub_relocator_backward_size;
+  if (start > chunk->target)
+    rel->relocators_size += grub_relocator_forward_size;
+
+  chunk->src = start;
+  chunk->size = size;
+  chunk->next = rel->chunks;
+  rel->chunks = chunk;
+  *src = (void *) start;
+  *target = chunk->target;
+  return GRUB_ERR_NONE;
+}
+
+void
+grub_relocator_unload (struct grub_relocator *rel)
+{
+  struct grub_relocator_chunk *chunk, *next;
+  for (chunk = rel->chunks; chunk; chunk = next)
+    {
+      grub_fatal ("Relocator unloading isn't implemented yet");
+      next = chunk->next;
+      grub_free (chunk);
+    }
+}
+
+grub_err_t
+grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
+			       grub_addr_t *relstart)
+{
+  struct grub_relocator_chunk *chunk;
+  grub_addr_t rels;
+  grub_addr_t rels0;
+
+  if (!malloc_in_range (rel, 0, ~(grub_addr_t)0, grub_relocator_align,
+			rel->relocators_size, &rels0, 1, 1))
+    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
+  rels = rels0;
+
+  for (chunk = rel->chunks; chunk; chunk = chunk->next)
+    {
+      if (chunk->src < chunk->target)
+	{
+	  grub_cpu_relocator_backward ((void *) rels,
+				       (void *) chunk->src,
+				       (void *) chunk->target,
+				       chunk->size);
+	  rels += grub_relocator_backward_size;
+	}
+      if (chunk->src > chunk->target)
+	{
+	  grub_cpu_relocator_forward ((void *) rels,
+				      (void *) chunk->src,
+				      (void *) chunk->target,
+				      chunk->size);
+	  rels += grub_relocator_forward_size;
+	}
+    }
+  grub_cpu_relocator_jumper ((void *) rels, addr);
+  *relstart = rels0;
   return GRUB_ERR_NONE;
 }
diff --git a/lib/x86_64/relocator_asm.S b/lib/x86_64/relocator_asm.S
new file mode 100644
index 000000000..6db44f2f7
--- /dev/null
+++ b/lib/x86_64/relocator_asm.S
@@ -0,0 +1,85 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  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/symbol.h>
+#include <grub/i386/memory.h>
+
+VARIABLE(grub_relocator_backward_start)
+	/* mov imm32, %rax */
+	.byte	0x48
+	.byte	0xb8
+RELOCATOR_VARIABLE(dest)
+	.long	0, 0
+	movq	%rax, %rdi
+
+	/* mov imm64, %rax */
+	.byte	0x48
+	.byte	0xb8
+RELOCATOR_VARIABLE(src)
+	.long	0, 0
+	movq	%rax, %rsi
+
+	/* mov imm32, %ecx */
+	.byte	0x48
+	.byte	0xb9
+RELOCATOR_VARIABLE(size)
+	.long	0, 0
+
+	add	%rcx, %rsi
+	add	%rcx, %rdi
+
+
+	/* Backward movsb is implicitly off-by-one.  compensate that.  */
+	sub	$1,	%rsi
+	sub	$1,	%rdi
+
+	/* Backward copy.  */
+	std
+
+	rep
+	movsb
+VARIABLE(grub_relocator_backward_end)
+
+
+VARIABLE(grub_relocator_forward_start)
+	/* mov imm64, %rax */
+	.byte	0x48
+	.byte	0xb8
+VARIABLE(grub_relocator_forward_dest)
+	.long	0, 0
+	movq	%rax, %rdi
+
+	/* mov imm64, %rax */
+	.byte	0x48
+	.byte	0xb8
+VARIABLE(grub_relocator_forward_src)
+	.long	0, 0
+	movq	%rax, %rsi
+
+	xorq	%rcx, %rcx
+	/* mov imm64, %rcx */
+	.byte	0x48
+	.byte	0xb9
+VARIABLE(grub_relocator_forward_size)
+	.long	0, 0
+
+	/* Forward copy.  */
+	cld
+	rep
+	movsb
+VARIABLE(grub_relocator_forward_end)

From 14e43c6e0258b844db41c2240df9fbee1ae6918c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 10 Jan 2010 15:06:17 +0100
Subject: [PATCH 0225/1628] First working newreloc

---
 conf/i386-pc.rmk              |  4 +-
 include/grub/i386/multiboot.h |  4 +-
 kern/i386/pc/init.c           |  8 +--
 lib/i386/relocator.c          | 13 +++--
 lib/relocator.c               | 62 +++++++++++++++++-------
 loader/i386/multiboot.c       | 91 ++++++++++++++++++++---------------
 loader/i386/multiboot_elfxx.c | 47 ++++++------------
 7 files changed, 127 insertions(+), 102 deletions(-)

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 1978c7caa..75e1ffdaa 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -202,14 +202,14 @@ serial_mod_CFLAGS = $(COMMON_CFLAGS)
 serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For multiboot.mod.
-#pkglib_MODULES += multiboot.mod
+pkglib_MODULES += multiboot.mod
 multiboot_mod_SOURCES = loader/i386/multiboot.c \
                         loader/multiboot_loader.c
 multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
 multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
 multiboot_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
-#pkglib_MODULES += multiboot2.mod
+pkglib_MODULES += multiboot2.mod
 multiboot2_mod_SOURCES = loader/i386/multiboot.c \
                         loader/multiboot_loader.c
 multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
diff --git a/include/grub/i386/multiboot.h b/include/grub/i386/multiboot.h
index 584955449..a3ff3f4da 100644
--- a/include/grub/i386/multiboot.h
+++ b/include/grub/i386/multiboot.h
@@ -27,9 +27,7 @@ void grub_multiboot2_real_boot (grub_addr_t entry,
 				struct multiboot_info *mbi)
      __attribute__ ((noreturn));
 
+extern struct grub_relocator *grub_multiboot_relocator;
 extern grub_uint32_t grub_multiboot_payload_eip;
-extern char *grub_multiboot_payload_orig;
-extern grub_addr_t grub_multiboot_payload_dest;
-extern grub_size_t grub_multiboot_payload_size;
 
 #endif /* ! GRUB_MULTIBOOT_CPU_HEADER */
diff --git a/kern/i386/pc/init.c b/kern/i386/pc/init.c
index 0f2374c6d..3885bba7a 100644
--- a/kern/i386/pc/init.c
+++ b/kern/i386/pc/init.c
@@ -190,7 +190,7 @@ grub_machine_init (void)
      from 1MB. This region is partially used for loading OS images.
      For now, 1/4 of this is added to free memory.  */
   for (i = 0; i < num_regions; i++)
-    if (mem_regions[i].addr == 0x100000)
+    /*    if (mem_regions[i].addr == 0x100000)
       {
 	grub_size_t quarter = mem_regions[i].size >> 2;
 
@@ -199,11 +199,11 @@ grub_machine_init (void)
 	grub_mm_init_region ((void *) (grub_os_area_addr + grub_os_area_size),
 			     quarter);
       }
-    else
+      else*/
       grub_mm_init_region ((void *) mem_regions[i].addr, mem_regions[i].size);
 
-  if (! grub_os_area_addr)
-    grub_fatal ("no upper memory");
+  //  if (! grub_os_area_addr)
+  //grub_fatal ("no upper memory");
 
   grub_tsc_init ();
 }
diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index d4555e5f3..1129ee8ef 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -19,9 +19,9 @@
 #include <grub/mm.h>
 #include <grub/misc.h>
 
-#include <grub/types.h>
 #include <grub/types.h>
 #include <grub/err.h>
+#include <grub/term.h>
 
 #include <grub/i386/relocator.h>
 #include <grub/relocator_private.h>
@@ -67,15 +67,16 @@ grub_cpu_relocator_jumper (void *rels, grub_addr_t addr)
 {
   grub_uint8_t *ptr;
   ptr = rels;
+  /* movl $addr, %eax (for relocator) */
+  *(grub_uint8_t *) ptr = 0xb8;
+  ptr++;
+  *(grub_uint32_t *) ptr = addr;
+  ptr += 4;
   /* jmp $addr */
   *(grub_uint8_t *) ptr = 0xe9;
   ptr++;
   *(grub_uint32_t *) ptr = addr - (grub_uint32_t) (ptr + 4);
   ptr += 4;
-  /* movl $addr, %eax (for relocator) */
-  *(grub_uint8_t *) ptr = 0xb8;
-  ptr++;
-  *(grub_uint32_t *) ptr = addr;  
 }
 
 void
@@ -112,6 +113,7 @@ grub_relocator32_boot (struct grub_relocator *rel,
   void *src;
   grub_err_t err;
   grub_addr_t relst;
+
   err = grub_relocator_alloc_chunk_align (rel, &src, &target, 0,
 					  (0xffffffff - RELOCATOR_SIZEOF (32))
 					  + 1, RELOCATOR_SIZEOF (32), 16);
@@ -130,6 +132,7 @@ grub_relocator32_boot (struct grub_relocator *rel,
   err = grub_relocator_prepare_relocs (rel, target, &relst);
   if (err)
     return err;
+
   asm volatile ("cli");
   ((void (*) (void)) relst) ();
 
diff --git a/lib/relocator.c b/lib/relocator.c
index 25ebd27bb..a2ebf99a7 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -68,12 +68,18 @@ get_best_header (struct grub_relocator *rel,
 	      for (chunk = rel->chunks; chunk; chunk = chunk->next)
 		if ((chunk->target <= addr
 		     && addr < chunk->target + chunk->size)
-		    || (chunk->target <= addr + size
+		    || (chunk->target < addr + size
 			&& addr + size < chunk->target + chunk->size)
 		    || (addr <= chunk->target && chunk->target < addr + size)
-		    || (addr <= chunk->target + chunk->size
+		    || (addr < chunk->target + chunk->size
 			&& chunk->target + chunk->size < addr + size))
 		  {
+		    grub_dprintf ("relocator",
+				  "collision 0x%llx+0x%llx, 0x%llx+0x%llx\n",
+				  (unsigned long long) chunk->target,
+				  (unsigned long long) chunk->size,
+				  (unsigned long long) addr,
+				  (unsigned long long) size);
 		    addr = ALIGN_UP (chunk->target + chunk->size, align);
 		    break;
 		  }
@@ -110,10 +116,10 @@ get_best_header (struct grub_relocator *rel,
 	      for (chunk = rel->chunks; chunk; chunk = chunk->next)
 		if ((chunk->target <= addr
 		     && addr < chunk->target + chunk->size)
-		    || (chunk->target <= addr + size
+		    || (chunk->target < addr + size
 			&& addr + size < chunk->target + chunk->size)
 		    || (addr <= chunk->target && chunk->target < addr + size)
-		    || (addr <= chunk->target + chunk->size
+		    || (addr < chunk->target + chunk->size
 			&& chunk->target + chunk->size < addr + size))
 		  {
 		    addr = ALIGN_DOWN (chunk->target - size, align);
@@ -138,18 +144,29 @@ get_best_header (struct grub_relocator *rel,
       }
   }
   
-  for (hp = NULL, h = rb->first; h; hp = h, h = h->next)
+  hp = rb->first;
+  h = hp->next;
+  grub_dprintf ("relocator", "alive\n");
+  do
     {
       grub_addr_t allowable_start, allowable_end;
       allowable_start = (grub_addr_t) h;
       allowable_end = (grub_addr_t) (h + 1 + h->size);
-      
+
       try_addr (allowable_start, allowable_end);
-      
+
       if ((grub_addr_t) h == (grub_addr_t) (rb + 1))
-	try_addr (allowable_start - sizeof (*rb) - rb->pre_size,
-		  allowable_end - sizeof (*rb));
+	{
+	  grub_dprintf ("relocator", "Trying region start 0x%llx\n",
+			(unsigned long long) (allowable_start 
+					      - sizeof (*rb) - rb->pre_size));
+	  try_addr (allowable_start - sizeof (*rb) - rb->pre_size,
+		    allowable_end - sizeof (*rb));
+	}
+      hp = h;
+      h = hp->next;
     }
+  while (hp && hp != rb->first);
   *prev = hbp;
   return hb;
 }
@@ -172,7 +189,7 @@ malloc_in_range (struct grub_relocator *rel,
       {
 	if ((grub_addr_t) r + r->size + sizeof (*r) > start
 	    && (grub_addr_t) r <= end && r->size + sizeof (*r) >= size
-	    && (rb == NULL || from_low_priv ? rb > r : rb < r))
+	    && (rb == NULL || (from_low_priv ? rb > r : rb < r)))
 	  {
 	    rb = r;
 	    rbp = rp;
@@ -183,8 +200,13 @@ malloc_in_range (struct grub_relocator *rel,
   if (!rb)
     return 0;
 
+  grub_dprintf ("relocator", "trying region %p - %p\n", rb, rb + rb->size + 1);
+
   hb = get_best_header (rel, start, end, align, size, rb, &hbp, &best_addr,
 			from_low_priv, collisioncheck);
+
+  grub_dprintf ("relocator", "best header %p\n", hb);
+
   if (!hb)
     {
       if (from_low_priv)
@@ -263,9 +285,8 @@ malloc_in_range (struct grub_relocator *rel,
 	if (foll)
 	  {
 	    foll->next = hb;
-	    if (hbp)
-	      hbp->next = foll;
-	    else
+	    hbp->next = foll;
+	    if (rb->first == hbp)
 	      rb->first = foll;
 	  }
       }
@@ -275,9 +296,7 @@ malloc_in_range (struct grub_relocator *rel,
 	  foll->next = hb->next;
 	else
 	  foll = hb->next;
-	if (hbp)
-	  hbp->next = foll;
-	else
+	if (rb->first == hbp)
 	  rb->first = foll;
       }
     *res = best_addr;
@@ -315,6 +334,9 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
   if (!chunk)
     return grub_errno;
 
+  grub_dprintf ("relocator", "min_addr = 0x%llx, max_addr = 0x%llx\n",
+		(unsigned long long) min_addr, (unsigned long long) max_addr);
+
   do
     {
       /* A trick to improve Linux allocation.  */
@@ -339,6 +361,9 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
     }
   while (0);
 
+  grub_dprintf ("relocator", "allocated 0x%llx/0x%llx\n",
+		(unsigned long long) start, (unsigned long long) target);
+
   if (rel->highestaddr < target + size)
     rel->highestaddr = target + size;
 
@@ -415,7 +440,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
       grub_free (chunk);
       return grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
     }
-  
+
+  /* FIXME: check memory map.  */
   chunk->target = ALIGN_UP (min_addr, align);
   while (1)
     {
@@ -455,6 +481,8 @@ void
 grub_relocator_unload (struct grub_relocator *rel)
 {
   struct grub_relocator_chunk *chunk, *next;
+  if (!rel)
+    return;
   for (chunk = rel->chunks; chunk; chunk = next)
     {
       grub_fatal ("Relocator unloading isn't implemented yet");
diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index f4869594e..5dbfc3bfd 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -28,7 +28,7 @@
  */
 
 /* The bits in the required part of flags field we don't support.  */
-#define UNSUPPORTED_FLAGS			0x0000fffc
+#define UNSUPPORTED_FLAGS			0x0000fff0
 
 #include <grub/loader.h>
 #include <grub/machine/loader.h>
@@ -55,12 +55,10 @@
 
 extern grub_dl_t my_mod;
 static struct multiboot_info *mbi, *mbi_dest;
+struct grub_relocator *grub_multiboot_relocator = NULL;
 
 static grub_size_t code_size;
 
-char *grub_multiboot_payload_orig;
-grub_addr_t grub_multiboot_payload_dest;
-grub_size_t grub_multiboot_payload_size;
 grub_uint32_t grub_multiboot_payload_eip;
 
 static grub_err_t
@@ -78,9 +76,7 @@ grub_multiboot_boot (void)
       .esp = 0x7ff00
     };
 
-  grub_relocator32_boot (grub_multiboot_payload_orig,
-			 grub_multiboot_payload_dest,
-			 state);
+  grub_relocator32_boot (grub_multiboot_relocator, state);
 
   /* Not reached.  */
   return GRUB_ERR_NONE;
@@ -101,10 +97,10 @@ grub_multiboot_unload (void)
 	}
       grub_free ((void *) mbi->mods_addr);
     }
-  grub_relocator32_free (grub_multiboot_payload_orig);
+  grub_relocator_unload (grub_multiboot_relocator);
+  grub_multiboot_relocator = NULL;
 
   mbi = NULL;
-  grub_multiboot_payload_orig = NULL;
   grub_dl_unref (my_mod);
 
   return GRUB_ERR_NONE;
@@ -224,6 +220,10 @@ grub_multiboot (int argc, char *argv[])
   int i;
   int cmdline_argc;
   char **cmdline_argv;
+  int mbichunk_size;
+  void *mbichunk;
+  grub_addr_t mbichunk_dest;
+  grub_err_t err;
 
   grub_loader_unset ();
 
@@ -271,8 +271,8 @@ grub_multiboot (int argc, char *argv[])
       goto fail;
     }
 
-  grub_relocator32_free (grub_multiboot_payload_orig);
-  grub_multiboot_payload_orig = NULL;
+  grub_relocator_unload (grub_multiboot_relocator);
+  grub_multiboot_relocator = NULL;
 
   mmap_length = grub_get_multiboot_mmap_len ();
 
@@ -289,68 +289,81 @@ grub_multiboot (int argc, char *argv[])
 
   boot_loader_name_length = sizeof(PACKAGE_STRING);
 
-#define cmdline_addr(x)		((void *) ((x) + code_size))
+#define cmdline_addr(x)		((void *) (((grub_uint8_t *) x)))
 #define boot_loader_name_addr(x) \
-				((void *) ((x) + code_size + cmdline_length))
-#define mbi_addr(x)		((void *) ((x) + code_size + cmdline_length + boot_loader_name_length))
-#define mmap_addr(x)		((void *) ((x) + code_size + cmdline_length + boot_loader_name_length + sizeof (struct multiboot_info)))
+				((void *) (((grub_uint8_t *) x) + cmdline_length))
+#define mbi_addr(x)		((void *) (((grub_uint8_t *) x) + cmdline_length + boot_loader_name_length))
+#define mmap_addr(x)		((void *) (((grub_uint8_t *) x) + cmdline_length + boot_loader_name_length + sizeof (struct multiboot_info)))
 
-  grub_multiboot_payload_size = cmdline_length
+  mbichunk_size = cmdline_length
     /* boot_loader_name_length might need to grow for mbi,etc to be aligned (see below) */
     + boot_loader_name_length + 3
     + sizeof (struct multiboot_info) + mmap_length;
 
+  grub_multiboot_relocator = grub_relocator_new ();
+
+  if (!grub_multiboot_relocator)
+    goto fail;
+
   if (header->flags & MULTIBOOT_AOUT_KLUDGE)
     {
       int offset = ((char *) header - buffer -
 		    (header->header_addr - header->load_addr));
       int load_size = ((header->load_end_addr == 0) ? file->size - offset :
 		       header->load_end_addr - header->load_addr);
+      void *source;
 
       if (header->bss_end_addr)
 	code_size = (header->bss_end_addr - header->load_addr);
       else
 	code_size = load_size;
-      grub_multiboot_payload_dest = header->load_addr;
 
-      grub_multiboot_payload_size += code_size;
-
-      grub_multiboot_payload_orig
-	= grub_relocator32_alloc (grub_multiboot_payload_size);
-
-      if (! grub_multiboot_payload_orig)
-	goto fail;
+      err = grub_relocator_alloc_chunk_addr (grub_multiboot_relocator, 
+					     &source, header->load_addr,
+					     code_size);
+      if (err)
+	{
+	  grub_dprintf ("multiboot_loader", "Error loading aout kludge\n");
+	  goto fail;
+	}
 
       if ((grub_file_seek (file, offset)) == (grub_off_t) -1)
 	goto fail;
 
-      grub_file_read (file, (void *) grub_multiboot_payload_orig, load_size);
+      grub_file_read (file, source, load_size);
       if (grub_errno)
 	goto fail;
 
       if (header->bss_end_addr)
-	grub_memset ((void *) (grub_multiboot_payload_orig + load_size), 0,
+	grub_memset ((grub_uint32_t *) source + load_size, 0,
 		     header->bss_end_addr - header->load_addr - load_size);
 
       grub_multiboot_payload_eip = header->entry_addr;
-
     }
   else if (grub_multiboot_load_elf (file, buffer) != GRUB_ERR_NONE)
     goto fail;
 
   /* This provides alignment for the MBI, the memory map and the backward relocator.  */
-  boot_loader_name_length += (0x04 - ((unsigned long) mbi_addr (grub_multiboot_payload_dest) & 0x03));
+  boot_loader_name_length += (0x04 - ((unsigned long) mbi_addr (0) & 0x03));
+
+  err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &mbichunk, 
+					  &mbichunk_dest,
+					  0, (0xffffffff - mbichunk_size) + 1,
+					  mbichunk_size, 4);
+  if (err)
+    {
+      grub_dprintf ("multiboot_loader", "Error allocating mbi chunk\n");
+      goto fail;
+    }
+  mbi = mbi_addr (mbichunk);
+  mbi_dest = mbi_addr (mbichunk_dest);
 
-  mbi = mbi_addr (grub_multiboot_payload_orig);
-  mbi_dest = mbi_addr (grub_multiboot_payload_dest);
   grub_memset (mbi, 0, sizeof (struct multiboot_info));
   mbi->mmap_length = mmap_length;
 
-  grub_fill_multiboot_mmap (mmap_addr (grub_multiboot_payload_orig));
+  grub_fill_multiboot_mmap (mmap_addr (mbichunk));
 
-  /* FIXME: grub_uint32_t will break for addresses above 4 GiB, but is mandated
-     by the spec.  Is there something we can do about it?  */
-  mbi->mmap_addr = (grub_uint32_t) mmap_addr (grub_multiboot_payload_dest);
+  mbi->mmap_addr = (grub_uint32_t) mmap_addr (mbichunk_dest);
   mbi->flags |= MULTIBOOT_INFO_MEM_MAP;
 
   /* Convert from bytes to kilobytes.  */
@@ -358,7 +371,7 @@ grub_multiboot (int argc, char *argv[])
   mbi->mem_upper = grub_mmap_get_upper () / 1024;
   mbi->flags |= MULTIBOOT_INFO_MEMORY;
 
-  cmdline = p = cmdline_addr (grub_multiboot_payload_orig);
+  cmdline = p = cmdline_addr (mbichunk);
   if (! cmdline)
     goto fail;
 
@@ -374,17 +387,17 @@ grub_multiboot (int argc, char *argv[])
   *p = 0;
 
   mbi->flags |= MULTIBOOT_INFO_CMDLINE;
-  mbi->cmdline = (grub_uint32_t) cmdline_addr (grub_multiboot_payload_dest);
+  mbi->cmdline = (grub_uint32_t) cmdline_addr (mbichunk_dest);
 
 
-  grub_strcpy (boot_loader_name_addr (grub_multiboot_payload_orig), PACKAGE_STRING);
+  grub_strcpy (boot_loader_name_addr (mbichunk), PACKAGE_STRING);
   mbi->flags |= MULTIBOOT_INFO_BOOT_LOADER_NAME;
-  mbi->boot_loader_name = (grub_uint32_t) boot_loader_name_addr (grub_multiboot_payload_dest);
+  mbi->boot_loader_name = (grub_uint32_t) boot_loader_name_addr (mbichunk_dest);
 
   if (grub_multiboot_get_bootdev (&mbi->boot_device))
     mbi->flags |= MULTIBOOT_INFO_BOOTDEV;
 
-  grub_loader_set (grub_multiboot_boot, grub_multiboot_unload, 1);
+  grub_loader_set (grub_multiboot_boot, grub_multiboot_unload, 0);
 
  fail:
   if (file)
diff --git a/loader/i386/multiboot_elfxx.c b/loader/i386/multiboot_elfxx.c
index 80db25144..155de5801 100644
--- a/loader/i386/multiboot_elfxx.c
+++ b/loader/i386/multiboot_elfxx.c
@@ -51,7 +51,6 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
 {
   Elf_Ehdr *ehdr = (Elf_Ehdr *) buffer;
   char *phdr_base;
-  int lowest_segment = -1, highest_segment = -1;
   int i;
 
   if (ehdr->e_ident[EI_CLASS] != ELFCLASSXX)
@@ -82,54 +81,38 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
   phdr_base = (char *) buffer + ehdr->e_phoff;
 #define phdr(i)			((Elf_Phdr *) (phdr_base + (i) * ehdr->e_phentsize))
 
-  for (i = 0; i < ehdr->e_phnum; i++)
-    if (phdr(i)->p_type == PT_LOAD && phdr(i)->p_filesz != 0)
-      {
-	/* Beware that segment 0 isn't necessarily loadable */
-	if (lowest_segment == -1
-	    || phdr(i)->p_paddr < phdr(lowest_segment)->p_paddr)
-	  lowest_segment = i;
-	if (highest_segment == -1
-	    || phdr(i)->p_paddr > phdr(highest_segment)->p_paddr)
-	  highest_segment = i;
-      }
-
-  if (lowest_segment == -1)
-    return grub_error (GRUB_ERR_BAD_OS, "ELF contains no loadable segments");
-
-  code_size = (phdr(highest_segment)->p_paddr + phdr(highest_segment)->p_memsz) - phdr(lowest_segment)->p_paddr;
-  grub_multiboot_payload_dest = phdr(lowest_segment)->p_paddr;
-
-  grub_multiboot_payload_size += code_size;
-
-  grub_multiboot_payload_orig
-    = grub_relocator32_alloc (grub_multiboot_payload_size);
-
-  if (!grub_multiboot_payload_orig)
-    return grub_errno;
-
   /* Load every loadable segment in memory.  */
   for (i = 0; i < ehdr->e_phnum; i++)
     {
       if (phdr(i)->p_type == PT_LOAD && phdr(i)->p_filesz != 0)
         {
-	  char *load_this_module_at = (char *) (grub_multiboot_payload_orig + (long) (phdr(i)->p_paddr - phdr(lowest_segment)->p_paddr));
+	  grub_err_t err;
+	  void *source;
 
 	  grub_dprintf ("multiboot_loader", "segment %d: paddr=0x%lx, memsz=0x%lx, vaddr=0x%lx\n",
 			i, (long) phdr(i)->p_paddr, (long) phdr(i)->p_memsz, (long) phdr(i)->p_vaddr);
 
+	  err = grub_relocator_alloc_chunk_addr (grub_multiboot_relocator, 
+						 &source, phdr(i)->p_paddr,
+						 phdr(i)->p_memsz);
+	  if (err)
+	    {
+	      grub_dprintf ("multiboot_loader", "Error loading phdr %d\n", i);
+	      return err;
+	    }
+
 	  if (grub_file_seek (file, (grub_off_t) phdr(i)->p_offset)
 	      == (grub_off_t) -1)
 	    return grub_error (GRUB_ERR_BAD_OS,
 			       "invalid offset in program header");
 
-          if (grub_file_read (file, load_this_module_at, phdr(i)->p_filesz)
+          if (grub_file_read (file, source, phdr(i)->p_filesz)
               != (grub_ssize_t) phdr(i)->p_filesz)
 	    return grub_error (GRUB_ERR_BAD_OS,
 			       "couldn't read segment from file");
 
           if (phdr(i)->p_filesz < phdr(i)->p_memsz)
-            grub_memset (load_this_module_at + phdr(i)->p_filesz, 0,
+            grub_memset ((grub_uint8_t *) source + phdr(i)->p_filesz, 0,
 			 phdr(i)->p_memsz - phdr(i)->p_filesz);
         }
     }
@@ -138,8 +121,8 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
     if (phdr(i)->p_vaddr <= ehdr->e_entry
 	&& phdr(i)->p_vaddr + phdr(i)->p_memsz > ehdr->e_entry)
       {
-	grub_multiboot_payload_eip = grub_multiboot_payload_dest
-	  + (ehdr->e_entry - phdr(i)->p_vaddr) + (phdr(i)->p_paddr  - phdr(lowest_segment)->p_paddr);
+	grub_multiboot_payload_eip = (ehdr->e_entry - phdr(i)->p_vaddr)
+	  + phdr(i)->p_paddr;
 	break;
       }
 

From 7e267737b6c6db0bac679e25404d6801aad5e8a6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 10 Jan 2010 18:59:31 +0100
Subject: [PATCH 0226/1628] Add align to .S files

---
 lib/i386/relocator_asm.S   | 2 ++
 lib/x86_64/relocator_asm.S | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/lib/i386/relocator_asm.S b/lib/i386/relocator_asm.S
index f8fc0c08a..a3530182a 100644
--- a/lib/i386/relocator_asm.S
+++ b/lib/i386/relocator_asm.S
@@ -19,6 +19,8 @@
 #include <grub/symbol.h>
 #include <grub/i386/memory.h>
 
+	.p2align	2
+
 VARIABLE(grub_relocator_backward_start)
 	/* mov imm32, %eax */
 	.byte	0xb8
diff --git a/lib/x86_64/relocator_asm.S b/lib/x86_64/relocator_asm.S
index 6db44f2f7..8d99f5224 100644
--- a/lib/x86_64/relocator_asm.S
+++ b/lib/x86_64/relocator_asm.S
@@ -19,6 +19,8 @@
 #include <grub/symbol.h>
 #include <grub/i386/memory.h>
 
+	.p2align	2
+
 VARIABLE(grub_relocator_backward_start)
 	/* mov imm32, %rax */
 	.byte	0x48

From 0b4de514913ce6e5f4f29fc274a499264d6d6586 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sun, 10 Jan 2010 23:13:53 +0100
Subject: [PATCH 0227/1628] 2010-01-10  Robert Millan  <rmh.grub@aybabtu.com>

        * conf/common.rmk (bin_UTILITIES): Add `grub-bin2h'.
        (grub_bin2h_SOURCES): New variable.
        * util/bin2h.c: New file.
---
 ChangeLog.kernel-font |  5 ++++
 conf/common.rmk       |  3 ++
 util/bin2h.c          | 69 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+)
 create mode 100644 ChangeLog.kernel-font
 create mode 100644 util/bin2h.c

diff --git a/ChangeLog.kernel-font b/ChangeLog.kernel-font
new file mode 100644
index 000000000..c21696db9
--- /dev/null
+++ b/ChangeLog.kernel-font
@@ -0,0 +1,5 @@
+2010-01-10  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* conf/common.rmk (bin_UTILITIES): Add `grub-bin2h'.
+	(grub_bin2h_SOURCES): New variable.
+	* util/bin2h.c: New file.
diff --git a/conf/common.rmk b/conf/common.rmk
index 3f1689370..0a67cf0cf 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -88,6 +88,9 @@ endif
 bin_UTILITIES += grub-mkrelpath
 grub_mkrelpath_SOURCES = gnulib/progname.c util/grub-mkrelpath.c util/misc.c
 
+bin_UTILITIES += grub-bin2h
+grub_bin2h_SOURCES = util/bin2h.c
+
 # For the parser.
 grub_script.tab.c grub_script.tab.h: script/parser.y
 	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/parser.y
diff --git a/util/bin2h.c b/util/bin2h.c
new file mode 100644
index 000000000..e93a89032
--- /dev/null
+++ b/util/bin2h.c
@@ -0,0 +1,69 @@
+/*
+ *  Copyright (C) 2008  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 <stdio.h>
+#include <stdlib.h>
+
+int
+main (int argc, char *argv[])
+{
+  int b, i;
+  char *sym;
+  unsigned int len;
+
+  if (argc != 3)
+    {
+      fprintf (stderr, "Usage: %s symbol_name length\n", argv[0]);
+      exit (1);
+    }
+
+  sym = argv[1];
+  len = atoi (argv[2]);
+
+  b = getchar ();
+  if (b == EOF)
+    goto abort;
+
+  printf ("/* THIS CHUNK OF BYTES IS AUTOMATICALY GENERATED */\n"
+	  "unsigned char %s[%u] =\n{\n", sym, len);
+
+  while (1)
+    {
+      printf ("0x%02x", b);
+
+      b = getchar ();
+      if (b == EOF)
+	goto end;
+
+      for (i = 0; i < 16 - 1; i++)
+	{
+	  printf (", 0x%02x", b);
+
+	  b = getchar ();
+	  if (b == EOF)
+	    goto end;
+	}
+
+      printf (",\n");
+    }
+
+end:
+  printf ("\n};\n");
+
+abort:
+  exit (0);
+}

From f40f890a124031ae3b2b3d02c12a8622625f4484 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Mon, 11 Jan 2010 00:03:42 +0100
Subject: [PATCH 0228/1628] Eliminate obnoxious length parameter

---
 util/bin2h.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/util/bin2h.c b/util/bin2h.c
index e93a89032..4139b52eb 100644
--- a/util/bin2h.c
+++ b/util/bin2h.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2008  Free Software Foundation, Inc.
+ *  Copyright (C) 2008,2010  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
@@ -23,23 +23,21 @@ main (int argc, char *argv[])
 {
   int b, i;
   char *sym;
-  unsigned int len;
 
-  if (argc != 3)
+  if (argc != 2)
     {
-      fprintf (stderr, "Usage: %s symbol_name length\n", argv[0]);
+      fprintf (stderr, "Usage: %s symbol_name\n", argv[0]);
       exit (1);
     }
 
   sym = argv[1];
-  len = atoi (argv[2]);
 
   b = getchar ();
   if (b == EOF)
     goto abort;
 
   printf ("/* THIS CHUNK OF BYTES IS AUTOMATICALY GENERATED */\n"
-	  "unsigned char %s[%u] =\n{\n", sym, len);
+	  "unsigned char %s[] =\n{\n", sym);
 
   while (1)
     {

From 26ba5c22623cce2dd1adc94a5aad950cace26062 Mon Sep 17 00:00:00 2001
From: carles <carles@pinux>
Date: Sun, 10 Jan 2010 23:33:57 +0000
Subject: [PATCH 0229/1628] 2010-01-10  Carles Pina i Estany  <carles@pina.cat>

	* font/font.c: Include `ascii.h'.
	(ASCII_BITMAP_SIZE): New macro.
	(ascii_font_glyph): Define.
	(ascii_glyph_lookup): New function.
	(grub_font_get_string_width): Change comment. If glyph not found, use
	ascii_glyph_lookup.
	(grub_font_get_glyph_with_fallback): If glyph not available returns
	ascii_glyph_lookup.
	* util/grub-mkfont.c (file_formats): New enum.
	(options): Add `ascii-bitmaps' new option.
	(usage): Add `asii-bitmaps' new option.
	(write_font_ascii_bitmap): New function.
	(write_font): Rename to ...
	(write_font_p2): ... this. Remove print_glyphs call.
	(main): Use file_format. Implement code for ranges if ascii-bitmaps is
	used. Call print_glyphs.
	* Makefile.in (pkgdata_DATA): Add `font/ascii.h'.
---
 ChangeLog.kernel-font | 20 +++++++++++
 Makefile.in           |  8 ++++-
 font/font.c           | 61 +++++++++++++++++++++++++++++++---
 util/grub-mkfont.c    | 77 +++++++++++++++++++++++++++++++++++++++----
 4 files changed, 154 insertions(+), 12 deletions(-)

diff --git a/ChangeLog.kernel-font b/ChangeLog.kernel-font
index c21696db9..9933c21a5 100644
--- a/ChangeLog.kernel-font
+++ b/ChangeLog.kernel-font
@@ -1,3 +1,23 @@
+2010-01-10  Carles Pina i Estany  <carles@pina.cat>
+
+	* font/font.c: Include `ascii.h'.
+	(ASCII_BITMAP_SIZE): New macro.
+	(ascii_font_glyph): Define.
+	(ascii_glyph_lookup): New function.
+	(grub_font_get_string_width): Change comment. If glyph not found, use
+	ascii_glyph_lookup.
+	(grub_font_get_glyph_with_fallback): If glyph not available returns
+	ascii_glyph_lookup.
+	* util/grub-mkfont.c (file_formats): New enum.
+	(options): Add `ascii-bitmaps' new option.
+	(usage): Add `asii-bitmaps' new option.
+	(write_font_ascii_bitmap): New function.
+	(write_font): Rename to ...
+	(write_font_p2): ... this. Remove print_glyphs call.
+	(main): Use file_format. Implement code for ranges if ascii-bitmaps is
+	used. Call print_glyphs.
+	* Makefile.in (pkgdata_DATA): Add `font/ascii.h'.
+
 2010-01-10  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* conf/common.rmk (bin_UTILITIES): Add `grub-bin2h'.
diff --git a/Makefile.in b/Makefile.in
index 79045ee64..f30264b00 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -234,7 +234,7 @@ else
 
 ifeq ($(enable_grub_mkfont),yes)
 
-pkgdata_DATA += unicode.pf2 ascii.pf2
+pkgdata_DATA += unicode.pf2 ascii.pf2 font/ascii.h
 
 # Arrows and lines are needed to draw the menu, so we always include them
 UNICODE_ARROWS=0x2190-0x2193
@@ -245,6 +245,12 @@ unicode.pf2: $(FONT_SOURCE) grub-mkfont
 
 ascii.pf2: $(FONT_SOURCE) grub-mkfont
 	$(builddir)/grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
+
+font/ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
+	$(builddir)/grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE)
+
+font/ascii.h: font/ascii.bitmaps grub-bin2h
+	$(builddir)/grub-bin2h ascii_bitmaps 2048 < font/ascii.bitmaps > font/ascii.h
 endif
 endif
 
diff --git a/font/font.c b/font/font.c
index 44827a9a1..9819958e3 100644
--- a/font/font.c
+++ b/font/font.c
@@ -17,6 +17,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define GENERATE_ASCII
+
 #include <grub/bufio.h>
 #include <grub/dl.h>
 #include <grub/file.h>
@@ -27,6 +29,10 @@
 #include <grub/video.h>
 #include <grub/bitmap.h>
 
+#ifdef GENERATE_ASCII
+#include "ascii.h"
+#endif
+
 #ifndef FONT_DEBUG
 #define FONT_DEBUG 0
 #endif
@@ -43,6 +49,7 @@ struct char_index_entry
 
 #define FONT_WEIGHT_NORMAL 100
 #define FONT_WEIGHT_BOLD 200
+#define ASCII_BITMAP_SIZE 16
 
 struct grub_font
 {
@@ -129,6 +136,48 @@ static struct grub_font null_font;
 /* Flag to ensure module is initialized only once.  */
 static grub_uint8_t font_loader_initialized;
 
+#ifdef GENERATE_ASCII
+static struct grub_font_glyph *ascii_font_glyph[0x80];
+#endif
+
+static struct grub_font_glyph *
+ascii_glyph_lookup (grub_uint32_t code)
+{
+#ifdef GENERATE_ASCII
+  static int ascii_failback_initialized = 0;
+
+  if (code >= 0x80)
+    return unknown_glyph;
+
+  if (ascii_failback_initialized == 0)
+    {
+      int current;
+      for (current = 0; current < 0x80; current++)
+        {
+	  ascii_font_glyph[current] = grub_malloc(sizeof(struct grub_font_glyph)
+	  			+ ASCII_BITMAP_SIZE);
+
+          ascii_font_glyph[current]->width = 8;
+          ascii_font_glyph[current]->height = 16; 
+          ascii_font_glyph[current]->offset_x = 0; 
+          ascii_font_glyph[current]->offset_y = -2; 
+	  ascii_font_glyph[current]->device_width = 8;
+
+	  grub_memcpy (ascii_font_glyph[current]->bitmap,
+		       &ascii_bitmaps[(0x7f - current) * ASCII_BITMAP_SIZE],
+		       ASCII_BITMAP_SIZE);
+	}
+
+      ascii_failback_initialized = 1;
+    }
+
+  return ascii_font_glyph[code];
+#else
+  (void) code;
+  return unknown_glyph;
+#endif
+}
+
 void
 grub_font_loader_init (void)
 {
@@ -865,15 +914,17 @@ grub_font_get_string_width (grub_font_t font, const char *str)
 }
 
 /* Get the glyph for FONT corresponding to the Unicode code point CODE.
-   Returns a pointer to an glyph indicating there is no glyph available
-   if CODE does not exist in the font.  The glyphs are cached once loaded.  */
+   Returns the ASCII glyph for the code if no other fonts are available. 
+   The glyphs are cached once loaded.  */
 struct grub_font_glyph *
 grub_font_get_glyph (grub_font_t font, grub_uint32_t code)
 {
   struct grub_font_glyph *glyph;
   glyph = grub_font_get_glyph_internal (font, code);
   if (glyph == 0)
-    glyph = unknown_glyph;
+    {
+      glyph = ascii_glyph_lookup (code);
+    }
   return glyph;
 }
 
@@ -968,8 +1019,8 @@ grub_font_get_glyph_with_fallback (grub_font_t font, grub_uint32_t code)
   if (best_glyph)
     return best_glyph;
   else
-    /* Glyph not available in any font.  Return unknown glyph.  */
-    return unknown_glyph;
+    /* Glyph not available in any font.  Return ASCII failback.  */
+    return ascii_glyph_lookup (code);
 }
 
 
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 3d1c6faac..e8e712f2c 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -49,6 +49,12 @@ struct grub_glyph_info
   grub_uint8_t bitmap[0];
 };
 
+enum file_formats
+{
+  PF2,
+  ASCII_BITMAPS 
+};
+
 #define GRUB_FONT_FLAG_BOLD		1
 #define GRUB_FONT_FLAG_NOBITMAP		2
 #define GRUB_FONT_FLAG_NOHINTING	4
@@ -87,6 +93,7 @@ static struct option options[] =
   {"help", no_argument, 0, 'h'},
   {"version", no_argument, 0, 'V'},
   {"verbose", no_argument, 0, 'v'},
+  {"ascii-bitmaps", no_argument, 0, 0x102},
   {0, 0, 0, 0}
 };
 
@@ -102,6 +109,7 @@ usage (int status)
 Usage: %s [OPTIONS] FONT_FILES\n\
 \nOptions:\n\
   -o, --output=FILE_NAME    set output file name\n\
+  --ascii-bitmaps           save only the ASCII bitmaps\n\
   -i, --index=N             set face index\n\
   -r, --range=A-B[,C-D]     set font range\n\
   -n, --name=S              set font family name\n\
@@ -337,7 +345,39 @@ print_glyphs (struct grub_font_info *font_info)
 }
 
 void
-write_font (struct grub_font_info *font_info, char *output_file)
+write_font_ascii_bitmap (struct grub_font_info *font_info, char *output_file)
+{
+  FILE *file;
+  struct grub_glyph_info *glyph;
+  int num; 
+  
+  file = fopen (output_file, "wb");
+  if (! file)
+    grub_util_error ("Can\'t write to file %s.", output_file);
+
+  int correct_size;
+  for (glyph = font_info->glyph, num = 0; glyph; glyph = glyph->next, num++)
+    {
+      correct_size = 1;
+      if (glyph->width != 8 || glyph->height != 16)
+      {
+        // printf ("Width or height from glyph U+%04x not supported, skipping.\n", glyph->char_code);
+	correct_size = 0;
+      }
+      int row;
+      for (row = 0; row < glyph->height; row++)
+        {
+	  if (correct_size)
+	    fwrite (&glyph->bitmap[row], sizeof(glyph->bitmap[row]), 1, file);
+	  else
+	    fwrite (&correct_size, 1, 1, file);
+        }
+    }
+    fclose (file);
+}
+
+void
+write_font_pf2 (struct grub_font_info *font_info, char *output_file)
 {
   FILE *file;
   grub_uint32_t leng, data;
@@ -473,9 +513,6 @@ write_font (struct grub_font_info *font_info, char *output_file)
       grub_util_write_image ((char *) &cur->bitmap[0], cur->bitmap_size, file);
     }
 
-  if (font_verbosity > 1)
-    print_glyphs (font_info);
-
   fclose (file);
 }
 
@@ -487,6 +524,7 @@ main (int argc, char *argv[])
   int font_index = 0;
   int font_size = 0;
   char *output_file = NULL;
+  enum file_formats file_format = PF2;
 
   memset (&font_info, 0, sizeof (font_info));
 
@@ -552,7 +590,7 @@ main (int argc, char *argv[])
 		    font_info.ranges = xrealloc (font_info.ranges,
 						 (font_info.num_range +
 						  GRUB_FONT_RANGE_BLOCK) *
-						 sizeof (int) * 2);
+						 sizeof (grub_uint32_t) * 2);
 
 		  font_info.ranges[font_info.num_range * 2] = a;
 		  font_info.ranges[font_info.num_range * 2 + 1] = b;
@@ -591,12 +629,33 @@ main (int argc, char *argv[])
 	    font_verbosity++;
 	    break;
 
+	  case 0x102:
+	     file_format = ASCII_BITMAPS;
+	     break;
+
 	  default:
 	    usage (1);
 	    break;
 	  }
     }
 
+  if (file_format == ASCII_BITMAPS && font_info.num_range > 0)
+    {
+      grub_util_error ("Option --ascii-bitmaps doesn't accept ranges (use ASCII).");
+      return 1;
+    }
+
+  else if (file_format == ASCII_BITMAPS)
+    {
+      font_info.ranges = xrealloc (font_info.ranges,
+				   GRUB_FONT_RANGE_BLOCK *
+				   sizeof (grub_uint32_t) * 2);
+
+      font_info.ranges[0] = (grub_uint32_t) 0x00;
+      font_info.ranges[1] = (grub_uint32_t) 0x7f;
+      font_info.num_range = 1;
+    }
+
   if (! output_file)
     grub_util_error ("No output file is specified.");
 
@@ -638,7 +697,13 @@ main (int argc, char *argv[])
 
   FT_Done_FreeType (ft_lib);
 
-  write_font (&font_info, output_file);
+  if (file_format == PF2)
+    write_font_pf2 (&font_info, output_file);
+  else if (file_format == ASCII_BITMAPS)
+    write_font_ascii_bitmap (&font_info, output_file);
+
+  if (font_verbosity > 1)
+    print_glyphs (&font_info);
 
   return 0;
 }

From d1fb0f65de960a99c3c1d918d1fb69167456b4d8 Mon Sep 17 00:00:00 2001
From: carles <carles@pinux>
Date: Mon, 11 Jan 2010 00:10:38 +0000
Subject: [PATCH 0230/1628] 2010-01-10  Carles Pina i Estany  <carles@pina.cat>

	* font/font.c: Update copyright years.
	* util/grub-mkfont.c (write_font_ascii_bitmap): Change comment format.
---
 ChangeLog.kernel-font | 5 +++++
 font/font.c           | 2 +-
 util/grub-mkfont.c    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.kernel-font b/ChangeLog.kernel-font
index 9933c21a5..e7ca2a374 100644
--- a/ChangeLog.kernel-font
+++ b/ChangeLog.kernel-font
@@ -1,3 +1,8 @@
+2010-01-10  Carles Pina i Estany  <carles@pina.cat>
+
+	* font/font.c: Update copyright years.
+	* util/grub-mkfont.c (write_font_ascii_bitmap): Change comment format.
+
 2010-01-10  Carles Pina i Estany  <carles@pina.cat>
 
 	* font/font.c: Include `ascii.h'.
diff --git a/font/font.c b/font/font.c
index 9819958e3..a00aef94f 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1,7 +1,7 @@
 /* font.c - Font API and font file loader.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2003,2005,2006,2007,2008,2009,2010  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
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index e8e712f2c..3dd0bafdd 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -361,7 +361,7 @@ write_font_ascii_bitmap (struct grub_font_info *font_info, char *output_file)
       correct_size = 1;
       if (glyph->width != 8 || glyph->height != 16)
       {
-        // printf ("Width or height from glyph U+%04x not supported, skipping.\n", glyph->char_code);
+        /* printf ("Width or height from glyph U+%04x not supported, skipping.\n", glyph->char_code);  */
 	correct_size = 0;
       }
       int row;

From 502dc3e5c4e36ac4c6fc3112c8afad79ab123342 Mon Sep 17 00:00:00 2001
From: Felix Zielcke <fzielcke@z-51.de>
Date: Mon, 11 Jan 2010 11:30:47 +0100
Subject: [PATCH 0231/1628] 2010-01-11  Felix Zielcke <fzielcke@z-51.de>

	* po/POTFILES: Replace `term/i386/pc/serial.c' with `term/serial.c'.
---
 ChangeLog.mips | 4 ++++
 po/POTFILES    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.mips b/ChangeLog.mips
index d12b0d180..1bbe1c273 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,7 @@
+2010-01-11  Felix Zielcke <fzielcke@z-51.de>
+
+	* po/POTFILES: Replace `term/i386/pc/serial.c' with `term/serial.c'.
+
 2009-12-10  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* include/grub/mips/libgcc.h: Only export symbols for functions
diff --git a/po/POTFILES b/po/POTFILES
index d6b20fef6..04a3516fa 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -75,7 +75,7 @@ normal/menu_entry.c
 normal/menu_text.c
 normal/misc.c
 
-term/i386/pc/serial.c
+term/serial.c
 
 util/grub-mkrawimage.c
 util/i386/pc/grub-setup.c

From d2601bb7bcf3aef6d435118e0200dc179f7b3e4d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 11 Jan 2010 11:32:41 +0100
Subject: [PATCH 0232/1628] decrease scope of code_size

---
 loader/i386/multiboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index 2a1411002..c5a7f7f9d 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -49,7 +49,6 @@
 
 extern grub_dl_t my_mod;
 struct grub_relocator *grub_multiboot_relocator = NULL;
-static grub_size_t code_size;
 grub_uint32_t grub_multiboot_payload_eip;
 
 static grub_err_t
@@ -182,6 +181,7 @@ grub_multiboot (int argc, char *argv[])
 		    (header->header_addr - header->load_addr));
       int load_size = ((header->load_end_addr == 0) ? file->size - offset :
 		       header->load_end_addr - header->load_addr);
+      grub_size_t code_size;
       void *source;
 
       if (header->bss_end_addr)

From b56495543a29c4df518aa2a68fed50cde96bce8d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 11 Jan 2010 13:40:59 +0100
Subject: [PATCH 0233/1628] Fix variable name collision

---
 lib/i386/relocator.c       | 8 ++++----
 lib/i386/relocator_asm.S   | 4 ++--
 lib/x86_64/relocator_asm.S | 9 ++++-----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index 1129ee8ef..2396999bb 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -35,11 +35,11 @@ extern grub_uint8_t grub_relocator_backward_end;
 
 extern void *grub_relocator_backward_dest;
 extern void *grub_relocator_backward_src;
-extern grub_size_t grub_relocator_backward_size;
+extern grub_size_t grub_relocator_backward_chunk_size;
 
 extern void *grub_relocator_forward_dest;
 extern void *grub_relocator_forward_src;
-extern grub_size_t grub_relocator_forward_size;
+extern grub_size_t grub_relocator_forward_chunk_size;
 
 extern grub_uint32_t grub_relocator32_eax;
 extern grub_uint32_t grub_relocator32_ebx;
@@ -85,7 +85,7 @@ grub_cpu_relocator_backward (void *ptr, void *src, void *dest,
 {
   grub_relocator_backward_dest = dest;
   grub_relocator_backward_src = src;
-  grub_relocator_backward_size = size;
+  grub_relocator_backward_chunk_size = size;
 
   grub_memmove (ptr,
 		&grub_relocator_backward_start,
@@ -98,7 +98,7 @@ grub_cpu_relocator_forward (void *ptr, void *src, void *dest,
 {
   grub_relocator_forward_dest = dest;
   grub_relocator_forward_src = src;
-  grub_relocator_forward_size = size;
+  grub_relocator_forward_chunk_size = size;
 
   grub_memmove (ptr,
 		&grub_relocator_forward_start,
diff --git a/lib/i386/relocator_asm.S b/lib/i386/relocator_asm.S
index a3530182a..f273586fe 100644
--- a/lib/i386/relocator_asm.S
+++ b/lib/i386/relocator_asm.S
@@ -36,7 +36,7 @@ VARIABLE(grub_relocator_backward_src)
 
 	/* mov imm32, %ecx */
 	.byte	0xb9
-VARIABLE(grub_relocator_backward_size)
+VARIABLE(grub_relocator_backward_chunk_size)
 	.long	0
 	
 	add	%ecx, %esi
@@ -70,7 +70,7 @@ VARIABLE(grub_relocator_forward_src)
 
 	/* mov imm32, %ecx */
 	.byte	0xb9
-VARIABLE(grub_relocator_forward_size)
+VARIABLE(grub_relocator_forward_chunk_size)
 	.long	0
 
 	/* Forward copy.  */
diff --git a/lib/x86_64/relocator_asm.S b/lib/x86_64/relocator_asm.S
index 8d99f5224..62b909f57 100644
--- a/lib/x86_64/relocator_asm.S
+++ b/lib/x86_64/relocator_asm.S
@@ -25,27 +25,26 @@ VARIABLE(grub_relocator_backward_start)
 	/* mov imm32, %rax */
 	.byte	0x48
 	.byte	0xb8
-RELOCATOR_VARIABLE(dest)
+VARIABLE(grub_relocator_backward_dest)
 	.long	0, 0
 	movq	%rax, %rdi
 
 	/* mov imm64, %rax */
 	.byte	0x48
 	.byte	0xb8
-RELOCATOR_VARIABLE(src)
+VARIABLE(grub_relocator_backward_src)
 	.long	0, 0
 	movq	%rax, %rsi
 
 	/* mov imm32, %ecx */
 	.byte	0x48
 	.byte	0xb9
-RELOCATOR_VARIABLE(size)
+VARIABLE(grub_relocator_backward_chunk_size)
 	.long	0, 0
 
 	add	%rcx, %rsi
 	add	%rcx, %rdi
 
-
 	/* Backward movsb is implicitly off-by-one.  compensate that.  */
 	sub	$1,	%rsi
 	sub	$1,	%rdi
@@ -77,7 +76,7 @@ VARIABLE(grub_relocator_forward_src)
 	/* mov imm64, %rcx */
 	.byte	0x48
 	.byte	0xb9
-VARIABLE(grub_relocator_forward_size)
+VARIABLE(grub_relocator_forward_chunk_size)
 	.long	0, 0
 
 	/* Forward copy.  */

From 796d2fa20e81702ba6c99a1d9b6a1b1aa0dbd713 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 11 Jan 2010 13:42:45 +0100
Subject: [PATCH 0234/1628] Remove uselees instruction

---
 lib/x86_64/relocator_asm.S | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/x86_64/relocator_asm.S b/lib/x86_64/relocator_asm.S
index 62b909f57..2ab6d8cb7 100644
--- a/lib/x86_64/relocator_asm.S
+++ b/lib/x86_64/relocator_asm.S
@@ -36,7 +36,7 @@ VARIABLE(grub_relocator_backward_src)
 	.long	0, 0
 	movq	%rax, %rsi
 
-	/* mov imm32, %ecx */
+	/* mov imm64, %rcx */
 	.byte	0x48
 	.byte	0xb9
 VARIABLE(grub_relocator_backward_chunk_size)
@@ -72,7 +72,6 @@ VARIABLE(grub_relocator_forward_src)
 	.long	0, 0
 	movq	%rax, %rsi
 
-	xorq	%rcx, %rcx
 	/* mov imm64, %rcx */
 	.byte	0x48
 	.byte	0xb9

From 669a1c01fb993f061cd41f9593018e1159fa3b36 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 11 Jan 2010 13:43:31 +0100
Subject: [PATCH 0235/1628] Fix various mistakes

---
 lib/relocator.c | 84 +++++++++++++++++++++++++++++--------------------
 1 file changed, 50 insertions(+), 34 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index a2ebf99a7..4b638cd66 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -35,7 +35,8 @@ grub_relocator_new (void)
     return NULL;
     
   ret->postchunks = ~(grub_addr_t) 0;
-  ret->relocators_size = grub_relocator_jumper_size;  
+  ret->relocators_size = grub_relocator_jumper_size;
+  grub_dprintf ("relocator", "relocators_size=%d\n", ret->relocators_size);
   return ret;
 }
 
@@ -198,14 +199,17 @@ malloc_in_range (struct grub_relocator *rel,
   }
 
   if (!rb)
-    return 0;
+    {
+      grub_dprintf ("relocator", "no suitable region found\n");
+      return 0;
+    }
 
   grub_dprintf ("relocator", "trying region %p - %p\n", rb, rb + rb->size + 1);
 
   hb = get_best_header (rel, start, end, align, size, rb, &hbp, &best_addr,
 			from_low_priv, collisioncheck);
 
-  grub_dprintf ("relocator", "best header %p\n", hb);
+  grub_dprintf ("relocator", "best header %p/%x\n", hb, best_addr);
 
   if (!hb)
     {
@@ -226,13 +230,15 @@ malloc_in_range (struct grub_relocator *rel,
       newreg_presize = newreg_start - newreg_raw_start;
       newreg_size = rb->size - (newreg_start - (grub_addr_t) rb);
       if ((hb->size << GRUB_MM_ALIGN_LOG2) >= newreg_start
-	  + (grub_addr_t) rb)
+	  - (grub_addr_t) rb)
 	{
 	  grub_mm_header_t newhnext = hb->next;
 	  grub_size_t newhsize = ((hb->size << GRUB_MM_ALIGN_LOG2)
-				  - newreg_start
-				  - (grub_addr_t) rb) >> GRUB_MM_ALIGN_LOG2;
+				  - (newreg_start
+				     - (grub_addr_t) rb)) >> GRUB_MM_ALIGN_LOG2;
 	  new_header = (void *) (newreg_start + sizeof (*rb));
+	  if (newhnext == hb->next)
+	    newhnext = newhnext;
 	  new_header->next = newhnext;
 	  new_header->size = newhsize;
 	  new_header->magic = GRUB_MM_FREE_MAGIC;
@@ -240,32 +246,25 @@ malloc_in_range (struct grub_relocator *rel,
       else
 	{
 	  new_header = hb->next;
+	  if (new_header == hb)
+	    new_header = (void *) (newreg_start + sizeof (*rb));	    
 	}
-      if (hbp || new_header)
-	{
-	  struct grub_mm_header *newregfirst = rb->first;
-	  struct grub_mm_region *newregnext = rb->next;
-	  struct grub_mm_region *newreg = (void *) newreg_start;
-	  if (hbp)
-	    hbp->next = new_header;
-	  else
-	    newregfirst = new_header;
-	  newreg->first = newregfirst;
-	  newreg->next = newregnext;
-	  newreg->pre_size = newreg_presize;
-	  newreg->size = newreg_size;
-	  if (rbp)
-	    rbp->next = newreg;
-	  else
-	    grub_mm_base = newreg;
-	}
-      else
-	{
-	  if (rbp)
-	    rbp->next = rb->next;
-	  else
-	    grub_mm_base = rb->next;
-	}
+      {
+	struct grub_mm_header *newregfirst = rb->first;
+	struct grub_mm_region *newregnext = rb->next;
+	struct grub_mm_region *newreg = (void *) newreg_start;
+	hbp->next = new_header;
+	if (newregfirst == hb)
+	  newregfirst = new_header;
+	newreg->first = newregfirst;
+	newreg->next = newregnext;
+	newreg->pre_size = newreg_presize;
+	newreg->size = newreg_size;
+	if (rbp)
+	  rbp->next = newreg;
+	else
+	  grub_mm_base = newreg;
+      }
       *res = best_addr;
       return 1;
     }
@@ -296,8 +295,12 @@ malloc_in_range (struct grub_relocator *rel,
 	  foll->next = hb->next;
 	else
 	  foll = hb->next;
-	if (rb->first == hbp)
+	
+	if (rb->first == hb)
 	  rb->first = foll;
+	if (rb->first == hb)
+	  rb->first = (void *) (rb + 1);
+	hbp->next = foll;
       }
     *res = best_addr;
     return 1;
@@ -320,7 +323,7 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
       if (chunk->target > target && chunk->src > max_addr)
 	max_addr = chunk->src;
       if (chunk->target + chunk->size <= target
-	  && chunk->src + chunk->size < min_addr
+	  && chunk->src + chunk->size > min_addr
 	  && chunk->src < rel->postchunks)
 	min_addr = chunk->src + chunk->size;
       if ((chunk->target <= target && target < chunk->target + chunk->size)
@@ -356,6 +359,7 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
       if (malloc_in_range (rel, min_addr, target, 0, size, &start, 1, 0))
 	break;
 
+      grub_dprintf ("relocator", "not allocated\n");
       grub_free (chunk);
       return grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
     }
@@ -379,11 +383,15 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
 	rel->highestnonpostaddr = start + size;  
     }
 
+  grub_dprintf ("relocator", "relocators_size=%d\n", rel->relocators_size);
+
   if (start < target)
     rel->relocators_size += grub_relocator_backward_size;
   if (start > target)
     rel->relocators_size += grub_relocator_forward_size;
 
+  grub_dprintf ("relocator", "relocators_size=%d\n", rel->relocators_size);
+
   chunk->src = start;
   chunk->target = target;
   chunk->size = size;
@@ -410,6 +418,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
   if (malloc_in_range (rel, min_addr, max_addr, align,
 		       size, &start, 1, 1))
     {
+      grub_dprintf ("relocator", "allocated 0x%llx/0x%llx\n",
+		    (unsigned long long) start, (unsigned long long) start);
       chunk->src = start;
       chunk->target = start;
       chunk->size = size;
@@ -499,11 +509,17 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
   grub_addr_t rels;
   grub_addr_t rels0;
 
-  if (!malloc_in_range (rel, 0, ~(grub_addr_t)0, grub_relocator_align,
+  grub_dprintf ("relocator", "Preparing relocs (size=%d)\n",
+		rel->relocators_size);
+
+  if (!malloc_in_range (rel, 0, ~(grub_addr_t)0 - rel->relocators_size + 1,
+			grub_relocator_align,
 			rel->relocators_size, &rels0, 1, 1))
     return grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
   rels = rels0;
 
+  grub_dprintf ("relocator", "Relocs allocated\n");
+
   for (chunk = rel->chunks; chunk; chunk = chunk->next)
     {
       if (chunk->src < chunk->target)

From cb1b2ad7e080849ef4c3c8e0a1cc9292d71e0949 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 11 Jan 2010 13:43:44 +0100
Subject: [PATCH 0236/1628] Reenable XNU

---
 conf/i386-pc.rmk        |   2 +-
 include/grub/i386/xnu.h |   1 -
 include/grub/xnu.h      |   9 +--
 loader/i386/xnu.c       |  99 ++++++++++++---------------
 loader/xnu.c            | 144 +++++++++++++++++++---------------------
 loader/xnu_resume.c     |  43 ++++++++----
 6 files changed, 148 insertions(+), 150 deletions(-)

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 6992d3edc..c155047f6 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -179,7 +179,7 @@ linux_mod_SOURCES = loader/i386/linux.c
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-#pkglib_MODULES += xnu.mod
+pkglib_MODULES += xnu.mod
 xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/pc/xnu.c \
 	 loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
 xnu_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/include/grub/i386/xnu.h b/include/grub/i386/xnu.h
index 3be2c3bcc..d3ac5ba0c 100644
--- a/include/grub/i386/xnu.h
+++ b/include/grub/i386/xnu.h
@@ -117,5 +117,4 @@ grub_err_t grub_xnu_boot (void);
 grub_err_t grub_xnu_set_video (struct grub_xnu_boot_params *bootparams_relloc);
 grub_err_t
 grub_cpu_xnu_fill_devicetree (void);
-extern grub_uint32_t grub_xnu_heap_will_be_at;
 #endif
diff --git a/include/grub/xnu.h b/include/grub/xnu.h
index 6ce17c25e..0b942d855 100644
--- a/include/grub/xnu.h
+++ b/include/grub/xnu.h
@@ -87,7 +87,7 @@ extern struct grub_xnu_devtree_key *grub_xnu_devtree_root;
 
 void grub_xnu_free_devtree (struct grub_xnu_devtree_key *cur);
 
-grub_err_t grub_xnu_writetree_toheap (void **start, grub_size_t *size);
+grub_err_t grub_xnu_writetree_toheap (grub_addr_t *target, grub_size_t *size);
 struct grub_xnu_devtree_key *grub_xnu_create_value (struct grub_xnu_devtree_key **parent,
 						    char *name);
 
@@ -102,11 +102,12 @@ grub_err_t grub_xnu_scan_dir_for_kexts (char *dirname, char *osbundlerequired,
 					int maxrecursion);
 grub_err_t grub_xnu_load_kext_from_dir (char *dirname, char *osbundlerequired,
 					int maxrecursion);
-void *grub_xnu_heap_malloc (int size);
+grub_err_t grub_xnu_heap_malloc (int size, void **src, grub_addr_t *target);
 grub_err_t grub_xnu_fill_devicetree (void);
-extern grub_uint32_t grub_xnu_heap_real_start;
+extern struct grub_relocator *grub_xnu_relocator;
+
 extern grub_size_t grub_xnu_heap_size;
-extern void *grub_xnu_heap_start;
 extern struct grub_video_bitmap *grub_xnu_bitmap;
 extern int grub_xnu_is_64bit;
+extern grub_addr_t grub_xnu_heap_target_start;
 #endif
diff --git a/loader/i386/xnu.c b/loader/i386/xnu.c
index 23a8a6f7b..ce520bcde 100644
--- a/loader/i386/xnu.c
+++ b/loader/i386/xnu.c
@@ -35,7 +35,6 @@
 #include <grub/i18n.h>
 
 char grub_xnu_cmdline[1024];
-grub_uint32_t grub_xnu_heap_will_be_at;
 grub_uint32_t grub_xnu_entry_point, grub_xnu_arg1, grub_xnu_stack;
 
 /* Aliases set for some tables. */
@@ -832,26 +831,25 @@ grub_xnu_boot_resume (void)
   state.eip = grub_xnu_entry_point;
   state.eax = grub_xnu_arg1;
 
-  return grub_relocator32_boot (grub_xnu_heap_start, grub_xnu_heap_will_be_at,
-				state); 
+  return grub_relocator32_boot (grub_xnu_relocator, state); 
 }
 
 /* Boot xnu. */
 grub_err_t
 grub_xnu_boot (void)
 {
-  struct grub_xnu_boot_params *bootparams_relloc;
-  grub_off_t bootparams_relloc_off;
-  grub_off_t mmap_relloc_off;
+  struct grub_xnu_boot_params *bootparams;
+  grub_addr_t bootparams_target;
   grub_err_t err;
   grub_efi_uintn_t memory_map_size = 0;
   grub_efi_memory_descriptor_t *memory_map;
+  grub_addr_t memory_map_target;
   grub_efi_uintn_t map_key = 0;
   grub_efi_uintn_t descriptor_size = 0;
   grub_efi_uint32_t descriptor_version = 0;
   grub_uint64_t firstruntimepage, lastruntimepage;
   grub_uint64_t curruntimepage;
-  void *devtree;
+  grub_addr_t devtree_target;
   grub_size_t devtreelen;
   int i;
   struct grub_relocator32_state state;
@@ -895,26 +893,25 @@ grub_xnu_boot (void)
     }
 
   /* Relocate the boot parameters to heap. */
-  bootparams_relloc = grub_xnu_heap_malloc (sizeof (*bootparams_relloc));
-  if (! bootparams_relloc)
-    return grub_errno;
-  bootparams_relloc_off = (grub_uint8_t *) bootparams_relloc
-    - (grub_uint8_t *) grub_xnu_heap_start;
+  err = grub_xnu_heap_malloc (sizeof (*bootparams),
+			      (void **) &bootparams, &bootparams_target);
+  if (err)
+    return err;
 
   /* Set video. */
-  err = grub_xnu_set_video (bootparams_relloc);
+  err = grub_xnu_set_video (bootparams);
   if (err != GRUB_ERR_NONE)
     {
       grub_print_error ();
       grub_errno = GRUB_ERR_NONE;
       grub_printf ("Booting in blind mode\n");
 
-      bootparams_relloc->lfb_mode = 0;
-      bootparams_relloc->lfb_width = 0;
-      bootparams_relloc->lfb_height = 0;
-      bootparams_relloc->lfb_depth = 0;
-      bootparams_relloc->lfb_line_len = 0;
-      bootparams_relloc->lfb_base = 0;
+      bootparams->lfb_mode = 0;
+      bootparams->lfb_width = 0;
+      bootparams->lfb_height = 0;
+      bootparams->lfb_depth = 0;
+      bootparams->lfb_line_len = 0;
+      bootparams->lfb_base = 0;
     }
 
   if (grub_autoefi_get_memory_map (&memory_map_size, memory_map,
@@ -925,38 +922,29 @@ grub_xnu_boot (void)
   /* We will do few allocations later. Reserve some space for possible
      memory map growth.  */
   memory_map_size += 20 * descriptor_size;
-  memory_map = grub_xnu_heap_malloc (memory_map_size);
-  if (! memory_map)
-    return grub_errno;
-  mmap_relloc_off = (grub_uint8_t *) memory_map
-    - (grub_uint8_t *) grub_xnu_heap_start;
-
-  err = grub_xnu_writetree_toheap (&devtree, &devtreelen);
+  err = grub_xnu_heap_malloc (memory_map_size,
+			      (void **) &memory_map, &memory_map_target);
   if (err)
     return err;
-  bootparams_relloc = (struct grub_xnu_boot_params *)
-    (bootparams_relloc_off + (grub_uint8_t *) grub_xnu_heap_start);
 
-  grub_memcpy (bootparams_relloc->cmdline, grub_xnu_cmdline,
-	       sizeof (bootparams_relloc->cmdline));
+  err = grub_xnu_writetree_toheap (&devtree_target, &devtreelen);
+  if (err)
+    return err;
 
-  bootparams_relloc->devtree
-    = ((grub_uint8_t *) devtree - (grub_uint8_t *) grub_xnu_heap_start)
-    + grub_xnu_heap_will_be_at;
-  bootparams_relloc->devtreelen = devtreelen;
+  grub_memcpy (bootparams->cmdline, grub_xnu_cmdline,
+	       sizeof (bootparams->cmdline));
 
-  memory_map = (grub_efi_memory_descriptor_t *)
-    ((grub_uint8_t *) grub_xnu_heap_start + mmap_relloc_off);
+  bootparams->devtree = devtree_target;
+  bootparams->devtreelen = devtreelen;
 
   if (grub_autoefi_get_memory_map (&memory_map_size, memory_map,
 				   &map_key, &descriptor_size,
 				   &descriptor_version) <= 0)
     return grub_errno;
 
-  bootparams_relloc->efi_system_table
-    = PTR_TO_UINT32 (grub_autoefi_system_table);
+  bootparams->efi_system_table = PTR_TO_UINT32 (grub_autoefi_system_table);
 
-  firstruntimepage = (((grub_addr_t) grub_xnu_heap_will_be_at
+  firstruntimepage = (((grub_addr_t) grub_xnu_heap_target_start
 		       + grub_xnu_heap_size + GRUB_XNU_PAGESIZE - 1)
 		      / GRUB_XNU_PAGESIZE) + 20;
   curruntimepage = firstruntimepage;
@@ -977,7 +965,7 @@ grub_xnu_boot (void)
 	      <= PTR_TO_UINT64 (grub_autoefi_system_table)
 	      && curdesc->physical_start + (curdesc->num_pages << 12)
 	      > PTR_TO_UINT64 (grub_autoefi_system_table))
-	    bootparams_relloc->efi_system_table
+	    bootparams->efi_system_table
 	      = PTR_TO_UINT64 (grub_autoefi_system_table)
 	      - curdesc->physical_start + curdesc->virtual_start;
 	  if (SIZEOF_OF_UINTN == 8 && grub_xnu_is_64bit)
@@ -987,25 +975,25 @@ grub_xnu_boot (void)
 
   lastruntimepage = curruntimepage;
 
-  bootparams_relloc->efi_mmap = grub_xnu_heap_will_be_at + mmap_relloc_off;
-  bootparams_relloc->efi_mmap_size = memory_map_size;
-  bootparams_relloc->efi_mem_desc_size = descriptor_size;
-  bootparams_relloc->efi_mem_desc_version = descriptor_version;
+  bootparams->efi_mmap = memory_map_target;
+  bootparams->efi_mmap_size = memory_map_size;
+  bootparams->efi_mem_desc_size = descriptor_size;
+  bootparams->efi_mem_desc_version = descriptor_version;
 
-  bootparams_relloc->heap_start = grub_xnu_heap_will_be_at;
-  bootparams_relloc->heap_size = grub_xnu_heap_size;
-  bootparams_relloc->efi_runtime_first_page = firstruntimepage;
+  bootparams->heap_start = grub_xnu_heap_target_start;
+  bootparams->heap_size = grub_xnu_heap_size;
+  bootparams->efi_runtime_first_page = firstruntimepage;
 
-  bootparams_relloc->efi_runtime_npages = lastruntimepage - firstruntimepage;
-  bootparams_relloc->efi_uintnbits = SIZEOF_OF_UINTN * 8;
+  bootparams->efi_runtime_npages = lastruntimepage - firstruntimepage;
+  bootparams->efi_uintnbits = SIZEOF_OF_UINTN * 8;
 
-  bootparams_relloc->verminor = GRUB_XNU_BOOTARGS_VERMINOR;
-  bootparams_relloc->vermajor = GRUB_XNU_BOOTARGS_VERMAJOR;
+  bootparams->verminor = GRUB_XNU_BOOTARGS_VERMINOR;
+  bootparams->vermajor = GRUB_XNU_BOOTARGS_VERMAJOR;
 
   /* Parameters for asm helper. */
-  grub_xnu_stack = bootparams_relloc->heap_start
-    + bootparams_relloc->heap_size + GRUB_XNU_PAGESIZE;
-  grub_xnu_arg1 = bootparams_relloc_off + grub_xnu_heap_will_be_at;
+  grub_xnu_stack = bootparams->heap_start
+    + bootparams->heap_size + GRUB_XNU_PAGESIZE;
+  grub_xnu_arg1 = bootparams_target;
 
   if (! grub_autoefi_exit_boot_services (map_key))
     return grub_error (GRUB_ERR_IO, "can't exit boot services");
@@ -1016,8 +1004,7 @@ grub_xnu_boot (void)
   state.eip = grub_xnu_entry_point;
   state.eax = grub_xnu_arg1;
   state.esp = grub_xnu_stack;
-  return grub_relocator32_boot (grub_xnu_heap_start, grub_xnu_heap_will_be_at,
-				state);
+  return grub_relocator32_boot (grub_xnu_relocator, state);
 }
 
 static grub_command_t cmd_devprop_load;
diff --git a/loader/xnu.c b/loader/xnu.c
index c3dcee3ed..07a0b726e 100644
--- a/loader/xnu.c
+++ b/loader/xnu.c
@@ -39,45 +39,28 @@ static int driverspackagenum = 0;
 static int driversnum = 0;
 int grub_xnu_is_64bit = 0;
 
-void *grub_xnu_heap_start = 0;
+grub_addr_t grub_xnu_heap_target_start = 0;
 grub_size_t grub_xnu_heap_size = 0;
-
-/* Allocate heap by 32MB-blocks. */
-#define GRUB_XNU_HEAP_ALLOC_BLOCK 0x2000000
+struct grub_relocator *grub_xnu_relocator;
 
 static grub_err_t
 grub_xnu_register_memory (char *prefix, int *suffix,
-			  void *addr, grub_size_t size);
-void *
-grub_xnu_heap_malloc (int size)
+			  grub_addr_t addr, grub_size_t size);
+grub_err_t
+grub_xnu_heap_malloc (int size, void **src, grub_addr_t *target)
 {
-  void *val;
-  int oldblknum, newblknum;
+  grub_err_t err;
+  
+  err = grub_relocator_alloc_chunk_addr (grub_xnu_relocator, src,
+					 grub_xnu_heap_target_start
+					 + grub_xnu_heap_size, size);
+  if (err)
+    return err;
 
-  /* The page after the heap is used for stack. Ensure it's usable. */
-  if (grub_xnu_heap_size)
-    oldblknum = (grub_xnu_heap_size + GRUB_XNU_PAGESIZE
-		 + GRUB_XNU_HEAP_ALLOC_BLOCK - 1) / GRUB_XNU_HEAP_ALLOC_BLOCK;
-  else
-    oldblknum = 0;
-  newblknum = (grub_xnu_heap_size + size + GRUB_XNU_PAGESIZE
-	       + GRUB_XNU_HEAP_ALLOC_BLOCK - 1) / GRUB_XNU_HEAP_ALLOC_BLOCK;
-  if (oldblknum != newblknum)
-    {
-      /* FIXME: instruct realloc to allocate at 1MB if possible once
-	 advanced mm is ready. */
-      grub_xnu_heap_start
-	= XNU_RELOCATOR (realloc) (grub_xnu_heap_start,
-				   newblknum
-				   * GRUB_XNU_HEAP_ALLOC_BLOCK);
-      if (!grub_xnu_heap_start)
-	return NULL;
-    }
-
-  val = (grub_uint8_t *) grub_xnu_heap_start + grub_xnu_heap_size;
+  *target = grub_xnu_heap_target_start + grub_xnu_heap_size;
   grub_xnu_heap_size += size;
-  grub_dprintf ("xnu", "val=%p\n", val);
-  return val;
+  grub_dprintf ("xnu", "val=%p\n", *src);
+  return GRUB_ERR_NONE;
 }
 
 /* Make sure next block of the heap will be aligned.
@@ -86,11 +69,9 @@ grub_xnu_heap_malloc (int size)
 grub_err_t
 grub_xnu_align_heap (int align)
 {
-  int align_overhead = align - grub_xnu_heap_size % align;
-  if (align_overhead == align)
-    return GRUB_ERR_NONE;
-  if (! grub_xnu_heap_malloc (align_overhead))
-    return grub_errno;
+  grub_xnu_heap_size
+    = ALIGN_UP (grub_xnu_heap_target_start+ grub_xnu_heap_size, align)
+    - grub_xnu_heap_target_start;
   return GRUB_ERR_NONE;
 }
 
@@ -206,13 +187,14 @@ grub_xnu_writetree_toheap_real (void *curptr,
 }
 
 grub_err_t
-grub_xnu_writetree_toheap (void **start, grub_size_t *size)
+grub_xnu_writetree_toheap (grub_addr_t *target, grub_size_t *size)
 {
   struct grub_xnu_devtree_key *chosen;
   struct grub_xnu_devtree_key *memorymap;
   struct grub_xnu_devtree_key *driverkey;
   struct grub_xnu_extdesc *extdesc;
   grub_err_t err;
+  void *src;
 
   err = grub_xnu_align_heap (GRUB_XNU_PAGESIZE);
   if (err)
@@ -243,16 +225,17 @@ grub_xnu_writetree_toheap (void **start, grub_size_t *size)
 
   /* Allocate the space based on the size with dummy value. */
   *size = grub_xnu_writetree_get_size (grub_xnu_devtree_root, "/");
-  *start = grub_xnu_heap_malloc (*size + GRUB_XNU_PAGESIZE
-				 - *size % GRUB_XNU_PAGESIZE);
+  err = grub_xnu_heap_malloc (ALIGN_UP (*size + 1, GRUB_XNU_PAGESIZE),
+			      &src, target);
+  if (err)
+    return err;
 
   /* Put real data in the dummy. */
-  extdesc->addr = (grub_uint8_t *) *start - (grub_uint8_t *) grub_xnu_heap_start
-    + grub_xnu_heap_will_be_at;
+  extdesc->addr = *target;
   extdesc->size = (grub_uint32_t) *size;
 
   /* Write the tree to heap. */
-  grub_xnu_writetree_toheap_real (*start, grub_xnu_devtree_root, "/");
+  grub_xnu_writetree_toheap_real (src, grub_xnu_devtree_root, "/");
   return GRUB_ERR_NONE;
 }
 
@@ -337,8 +320,9 @@ grub_xnu_unload (void)
   /* Free loaded image. */
   driversnum = 0;
   driverspackagenum = 0;
-  grub_free (grub_xnu_heap_start);
-  grub_xnu_heap_start = 0;
+  grub_relocator_unload (grub_xnu_relocator);
+  grub_xnu_relocator = NULL;
+  grub_xnu_heap_target_start = 0;
   grub_xnu_heap_size = 0;
   grub_xnu_unlock ();
   return GRUB_ERR_NONE;
@@ -353,6 +337,7 @@ grub_cmd_xnu_kernel (grub_command_t cmd __attribute__ ((unused)),
   grub_uint32_t startcode, endcode;
   int i;
   char *ptr, *loadaddr;
+  grub_addr_t loadaddr_target;
 
   if (argc < 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
@@ -380,15 +365,18 @@ grub_cmd_xnu_kernel (grub_command_t cmd __attribute__ ((unused)),
   grub_dprintf ("xnu", "endcode = %lx, startcode = %lx\n",
 		(unsigned long) endcode, (unsigned long) startcode);
 
-  loadaddr = grub_xnu_heap_malloc (endcode - startcode);
-  grub_xnu_heap_will_be_at = startcode;
+  grub_xnu_relocator = grub_relocator_new ();
+  if (!grub_xnu_relocator)
+    return grub_errno;
+  grub_xnu_heap_target_start = startcode;
+  err = grub_xnu_heap_malloc (endcode - startcode, (void **) &loadaddr,
+			      &loadaddr_target);
 
-  if (! loadaddr)
+  if (err)
     {
       grub_macho_close (macho);
       grub_xnu_unload ();
-      return grub_error (GRUB_ERR_OUT_OF_MEMORY,
-			 "not enough memory to load kernel");
+      return err;
     }
 
   /* Load kernel. */
@@ -451,6 +439,7 @@ grub_cmd_xnu_kernel64 (grub_command_t cmd __attribute__ ((unused)),
   grub_uint64_t startcode, endcode;
   int i;
   char *ptr, *loadaddr;
+  grub_addr_t loadaddr_target;
 
   if (argc < 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
@@ -481,15 +470,18 @@ grub_cmd_xnu_kernel64 (grub_command_t cmd __attribute__ ((unused)),
   grub_dprintf ("xnu", "endcode = %lx, startcode = %lx\n",
 		(unsigned long) endcode, (unsigned long) startcode);
 
-  loadaddr = grub_xnu_heap_malloc (endcode - startcode);
-  grub_xnu_heap_will_be_at = startcode;
+  grub_xnu_relocator = grub_relocator_new ();
+  if (!grub_xnu_relocator)
+    return grub_errno;
+  grub_xnu_heap_target_start = startcode;
+  err = grub_xnu_heap_malloc (endcode - startcode, (void **) &loadaddr,
+			      &loadaddr_target);
 
-  if (! loadaddr)
+  if (err)
     {
       grub_macho_close (macho);
       grub_xnu_unload ();
-      return grub_error (GRUB_ERR_OUT_OF_MEMORY,
-			 "not enough memory to load kernel");
+      return err;
     }
 
   /* Load kernel. */
@@ -547,7 +539,7 @@ grub_cmd_xnu_kernel64 (grub_command_t cmd __attribute__ ((unused)),
    and increment SUFFIX. */
 static grub_err_t
 grub_xnu_register_memory (char *prefix, int *suffix,
-			  void *addr, grub_size_t size)
+			  grub_addr_t addr, grub_size_t size)
 {
   struct grub_xnu_devtree_key *chosen;
   struct grub_xnu_devtree_key *memorymap;
@@ -585,8 +577,7 @@ grub_xnu_register_memory (char *prefix, int *suffix,
     = (struct grub_xnu_extdesc *) grub_malloc (sizeof (*extdesc));
   if (! driverkey->data)
     return grub_error (GRUB_ERR_OUT_OF_MEMORY, "can't register extension");
-  extdesc->addr = grub_xnu_heap_will_be_at +
-    ((grub_uint8_t *) addr - (grub_uint8_t *) grub_xnu_heap_start);
+  extdesc->addr = addr;
   extdesc->size = (grub_uint32_t) size;
   return GRUB_ERR_NONE;
 }
@@ -628,7 +619,8 @@ grub_xnu_load_driver (char *infoplistname, grub_file_t binaryfile)
   grub_file_t infoplist;
   struct grub_xnu_extheader *exthead;
   int neededspace = sizeof (*exthead);
-  grub_uint8_t *buf;
+  grub_uint8_t *buf, *buf0;
+  grub_addr_t buf_target;
   grub_size_t infoplistsize = 0, machosize = 0;
   char *name, *nameend;
   int namelen;
@@ -683,7 +675,10 @@ grub_xnu_load_driver (char *infoplistname, grub_file_t binaryfile)
   err = grub_xnu_align_heap (GRUB_XNU_PAGESIZE);
   if (err)
     return err;
-  buf = grub_xnu_heap_malloc (neededspace);
+  err = grub_xnu_heap_malloc (neededspace, (void **) &buf0, &buf_target);
+  if (err)
+    return err;
+  buf = buf0;
 
   exthead = (struct grub_xnu_extheader *) buf;
   grub_memset (exthead, 0, sizeof (*exthead));
@@ -692,8 +687,7 @@ grub_xnu_load_driver (char *infoplistname, grub_file_t binaryfile)
   /* Load the binary. */
   if (macho)
     {
-      exthead->binaryaddr = (buf - (grub_uint8_t *) grub_xnu_heap_start)
-	+ grub_xnu_heap_will_be_at;
+      exthead->binaryaddr = buf_target + (buf - buf0);
       exthead->binarysize = machosize;
       if (grub_xnu_is_64bit)
 	err = grub_macho_readfile64 (macho, buf);
@@ -712,8 +706,7 @@ grub_xnu_load_driver (char *infoplistname, grub_file_t binaryfile)
   /* Load the plist. */
   if (infoplist)
     {
-      exthead->infoplistaddr = (buf - (grub_uint8_t *) grub_xnu_heap_start)
-	+ grub_xnu_heap_will_be_at;
+      exthead->infoplistaddr = buf_target + (buf - buf0);
       exthead->infoplistsize = infoplistsize + 1;
       if (grub_file_read (infoplist, buf, infoplistsize)
 	  != (grub_ssize_t) (infoplistsize))
@@ -729,15 +722,14 @@ grub_xnu_load_driver (char *infoplistname, grub_file_t binaryfile)
     }
   grub_errno = GRUB_ERR_NONE;
 
-  exthead->nameaddr = (buf - (grub_uint8_t *) grub_xnu_heap_start)
-    + grub_xnu_heap_will_be_at;
+  exthead->nameaddr = (buf - buf0) + buf_target;
   exthead->namesize = namelen + 1;
   grub_memcpy (buf, name, namelen);
   buf[namelen] = 0;
   buf += namelen + 1;
 
   /* Announce to kernel */
-  return grub_xnu_register_memory ("Driver-", &driversnum, exthead,
+  return grub_xnu_register_memory ("Driver-", &driversnum, buf_target,
 				   neededspace);
 }
 
@@ -748,6 +740,7 @@ grub_cmd_xnu_mkext (grub_command_t cmd __attribute__ ((unused)),
 {
   grub_file_t file;
   void *loadto;
+  grub_addr_t loadto_target;
   grub_err_t err;
   grub_off_t readoff = 0;
   grub_ssize_t readlen = -1;
@@ -836,11 +829,11 @@ grub_cmd_xnu_mkext (grub_command_t cmd __attribute__ ((unused)),
       return err;
     }
 
-  loadto = grub_xnu_heap_malloc (readlen);
-  if (! loadto)
+  err = grub_xnu_heap_malloc (readlen, &loadto, &loadto_target);
+  if (err)
     {
       grub_file_close (file);
-      return grub_errno;
+      return err;
     }
 
   /* Read the file. */
@@ -855,7 +848,7 @@ grub_cmd_xnu_mkext (grub_command_t cmd __attribute__ ((unused)),
 
   /* Pass it to kernel. */
   return grub_xnu_register_memory ("DriversPackage-", &driverspackagenum,
-				   loadto, readlen);
+				   loadto_target, readlen);
 }
 
 static grub_err_t
@@ -864,6 +857,7 @@ grub_cmd_xnu_ramdisk (grub_command_t cmd __attribute__ ((unused)),
 {
   grub_file_t file;
   void *loadto;
+  grub_addr_t loadto_target;
   grub_err_t err;
   grub_size_t size;
 
@@ -884,9 +878,9 @@ grub_cmd_xnu_ramdisk (grub_command_t cmd __attribute__ ((unused)),
 
   size = grub_file_size (file);
 
-  loadto = grub_xnu_heap_malloc (size);
-  if (! loadto)
-    return grub_errno;
+  err = grub_xnu_heap_malloc (size, &loadto, &loadto_target);
+  if (err)
+    return err;
   if (grub_file_read (file, loadto, size)
       != (grub_ssize_t) (size))
     {
@@ -894,7 +888,7 @@ grub_cmd_xnu_ramdisk (grub_command_t cmd __attribute__ ((unused)),
       grub_error_push ();
       return grub_error (GRUB_ERR_BAD_OS, "couldn't read file %s", args[0]);
     }
-  return grub_xnu_register_memory ("RAMDisk", 0, loadto, size);
+  return grub_xnu_register_memory ("RAMDisk", 0, loadto_target, size);
 }
 
 /* Returns true if the kext should be loaded according to plist
diff --git a/loader/xnu_resume.c b/loader/xnu_resume.c
index e6620e7b7..a7d5fbad8 100644
--- a/loader/xnu_resume.c
+++ b/loader/xnu_resume.c
@@ -45,10 +45,12 @@ grub_xnu_resume (char *imagename)
   grub_file_t file;
   grub_size_t total_header_size;
   struct grub_xnu_hibernate_header hibhead;
-  grub_uint8_t *buf;
-
+  void *code;
+  void *image;
   grub_uint32_t codedest;
   grub_uint32_t codesize;
+  grub_addr_t target_image;
+  grub_err_t err;
 
   file = grub_file_open (imagename);
   if (! file)
@@ -94,18 +96,35 @@ grub_xnu_resume (char *imagename)
   /* Try to allocate necessary space.
      FIXME: mm isn't good enough yet to handle huge allocations.
    */
-  grub_xnu_hibernate_image = buf = XNU_RELOCATOR (alloc) (hibhead.image_size
-							  + codesize
-							  + GRUB_XNU_PAGESIZE);
-  if (! buf)
+  grub_xnu_relocator = grub_relocator_new ();
+  if (!grub_xnu_relocator)
     {
       grub_file_close (file);
       return grub_errno;
     }
 
+  err = grub_relocator_alloc_chunk_addr (grub_xnu_relocator, &code,
+					 codedest, codesize + GRUB_XNU_PAGESIZE);
+  if (err)
+    {
+      grub_file_close (file);
+      return err;
+    }
+
+  err = grub_relocator_alloc_chunk_align (grub_xnu_relocator, &image,
+					  &target_image, 0,
+					  (0xffffffff - hibhead.image_size) + 1,
+					  hibhead.image_size,
+					  GRUB_XNU_PAGESIZE);
+  if (err)
+    {
+      grub_file_close (file);
+      return err;
+    }
+
   /* Read code part. */
   if (grub_file_seek (file, total_header_size) == (grub_off_t) -1
-      || grub_file_read (file, buf, codesize)
+      || grub_file_read (file, code, codesize)
       != (grub_ssize_t) codesize)
     {
       grub_file_close (file);
@@ -114,8 +133,7 @@ grub_xnu_resume (char *imagename)
 
   /* Read image. */
   if (grub_file_seek (file, 0) == (grub_off_t) -1
-      || grub_file_read (file, buf + codesize + GRUB_XNU_PAGESIZE,
-			 hibhead.image_size)
+      || grub_file_read (file, image, hibhead.image_size)
       != (grub_ssize_t) hibhead.image_size)
     {
       grub_file_close (file);
@@ -124,12 +142,11 @@ grub_xnu_resume (char *imagename)
   grub_file_close (file);
 
   /* Setup variables needed by asm helper. */
-  grub_xnu_heap_will_be_at = codedest;
-  grub_xnu_heap_start = buf;
-  grub_xnu_heap_size = codesize + GRUB_XNU_PAGESIZE + hibhead.image_size;
+  grub_xnu_heap_target_start = codedest;
+  grub_xnu_heap_size = target_image + hibhead.image_size - codedest;
   grub_xnu_stack = (codedest + hibhead.stack);
   grub_xnu_entry_point = (codedest + hibhead.entry_point);
-  grub_xnu_arg1 = codedest + codesize + GRUB_XNU_PAGESIZE;
+  grub_xnu_arg1 = target_image;
 
   grub_dprintf ("xnu", "entry point 0x%x\n", codedest + hibhead.entry_point);
   grub_dprintf ("xnu", "image at 0x%x\n",

From 55b40bc68a08ab582d01251398ee65f2e377fc76 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 11 Jan 2010 14:59:01 +0100
Subject: [PATCH 0237/1628] Ported linux to relocator framework

---
 include/grub/i386/relocator.h |   1 +
 lib/i386/relocator.c          |   2 +
 lib/i386/relocator32.S        |   7 ++
 lib/relocator.c               |  26 ++++---
 loader/i386/linux.c           | 125 +++++++++++++++-------------------
 5 files changed, 83 insertions(+), 78 deletions(-)

diff --git a/include/grub/i386/relocator.h b/include/grub/i386/relocator.h
index 2027a275c..e4c9e7ca7 100644
--- a/include/grub/i386/relocator.h
+++ b/include/grub/i386/relocator.h
@@ -31,6 +31,7 @@ struct grub_relocator32_state
   grub_uint32_t ecx;
   grub_uint32_t edx;
   grub_uint32_t eip;
+  grub_uint32_t esi;
 };
 
 grub_err_t grub_relocator32_boot (struct grub_relocator *rel,
diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index 2396999bb..11e673cf7 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -47,6 +47,7 @@ extern grub_uint32_t grub_relocator32_ecx;
 extern grub_uint32_t grub_relocator32_edx;
 extern grub_uint32_t grub_relocator32_eip;
 extern grub_uint32_t grub_relocator32_esp;
+extern grub_uint32_t grub_relocator32_esi;
 
 #define RELOCATOR_SIZEOF(x)	(&grub_relocator##x##_end - &grub_relocator##x##_start)
 
@@ -126,6 +127,7 @@ grub_relocator32_boot (struct grub_relocator *rel,
   grub_relocator32_edx = state.edx;
   grub_relocator32_eip = state.eip;
   grub_relocator32_esp = state.esp;
+  grub_relocator32_esi = state.esi;
 
   grub_memmove (src, &grub_relocator32_start, RELOCATOR_SIZEOF (32));
 
diff --git a/lib/i386/relocator32.S b/lib/i386/relocator32.S
index f69e0bdc8..23bf65302 100644
--- a/lib/i386/relocator32.S
+++ b/lib/i386/relocator32.S
@@ -93,6 +93,13 @@ VARIABLE(grub_relocator32_esp)
 
 	movl	%eax, %esp
 
+	/* mov imm32, %eax */
+	.byte	0xb8
+VARIABLE(grub_relocator32_esi)
+	.long	0
+
+	movl	%eax, %esi
+	
 	/* mov imm32, %eax */
 	.byte	0xb8
 VARIABLE(grub_relocator32_eax)
diff --git a/lib/relocator.c b/lib/relocator.c
index 4b638cd66..71517d94b 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -99,6 +99,7 @@ get_best_header (struct grub_relocator *rel,
 	    hb = h;
 	    hbp = hp;
 	    *best_addr = addr;
+	    grub_dprintf ("relocator", "picked %p/%x\n", hb, addr);
 	  }
       }
     else
@@ -141,6 +142,7 @@ get_best_header (struct grub_relocator *rel,
 	    hb = h;
 	    hbp = hp;
 	    *best_addr = addr;
+	    grub_dprintf ("relocator", "picked %p/%x\n", hb, addr);
 	  }
       }
   }
@@ -188,8 +190,12 @@ malloc_in_range (struct grub_relocator *rel,
     grub_mm_region_t r, rp;
     for (rp = NULL, r = grub_mm_base; r; rp = r, r = r->next)
       {
-	if ((grub_addr_t) r + r->size + sizeof (*r) > start
-	    && (grub_addr_t) r <= end && r->size + sizeof (*r) >= size
+	grub_dprintf ("relocator", "region %p. %d %d %d\n", r,
+		      (grub_addr_t) r + r->size + sizeof (*r) >= start,
+		      (grub_addr_t) r < end && r->size + sizeof (*r) >= size,
+		      (rb == NULL || (from_low_priv ? rb > r : rb < r)));
+	if ((grub_addr_t) r + r->size + sizeof (*r) >= start
+	    && (grub_addr_t) r < end && r->size + sizeof (*r) >= size
 	    && (rb == NULL || (from_low_priv ? rb > r : rb < r)))
 	  {
 	    rb = r;
@@ -221,7 +227,7 @@ malloc_in_range (struct grub_relocator *rel,
     }
 
   /* Special case: relocating region start.  */
-  if (best_addr < (grub_addr_t) hbp)
+  if (best_addr < (grub_addr_t) hb)
     {
       grub_addr_t newreg_start, newreg_raw_start = best_addr + size;
       grub_addr_t newreg_size, newreg_presize;
@@ -320,7 +326,8 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
   /* Keep chunks in memory in the same order as they'll be after relocation.  */
   for (chunk = rel->chunks; chunk; chunk = chunk->next)
     {
-      if (chunk->target > target && chunk->src > max_addr)
+      if (chunk->target > target && chunk->src < max_addr
+	  && chunk->src < rel->postchunks)
 	max_addr = chunk->src;
       if (chunk->target + chunk->size <= target
 	  && chunk->src + chunk->size > min_addr
@@ -345,10 +352,10 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
       /* A trick to improve Linux allocation.  */
 #if defined (__i386__) || defined (__x86_64__)
       if (target < 0x100000)
-	if (malloc_in_range (rel, rel->highestnonpostaddr, ~(grub_addr_t)0, 0,
-			     size, &start, 1, 0))
+	if (malloc_in_range (rel, rel->highestnonpostaddr, ~(grub_addr_t)0, 1,
+			     size, &start, 0, 1))
 	  {
-	    if (rel->postchunks < start)
+	    if (rel->postchunks > start)
 	      rel->postchunks = start;
 	    break;
 	  }
@@ -356,7 +363,7 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
       if (malloc_in_range (rel, target, max_addr, 1, size, &start, 1, 0))
 	break;
 
-      if (malloc_in_range (rel, min_addr, target, 0, size, &start, 1, 0))
+      if (malloc_in_range (rel, min_addr, target, 1, size, &start, 0, 0))
 	break;
 
       grub_dprintf ("relocator", "not allocated\n");
@@ -436,7 +443,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
      relocation.  */
   for (chunk = rel->chunks; chunk; chunk = chunk->next)
     {
-      if (chunk->target > max_addr && chunk->src > max_addr2)
+      if (chunk->target > max_addr && chunk->src > max_addr2
+	  && chunk->src < rel->postchunks)
 	max_addr2 = chunk->src;
       if (chunk->target + chunk->size <= min_addr
 	  && chunk->src + chunk->size < min_addr2
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 43c455cd6..e8d06b0e7 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -34,6 +34,7 @@
 #include <grub/command.h>
 #include <grub/i386/pc/vbe.h>
 #include <grub/i386/pc/console.h>
+#include <grub/i386/relocator.h>
 #include <grub/i18n.h>
 
 #define GRUB_LINUX_CL_OFFSET		0x1000
@@ -44,36 +45,18 @@ static grub_dl_t my_mod;
 static grub_size_t linux_mem_size;
 static int loaded;
 static void *real_mode_mem;
+static grub_addr_t real_mode_target;
 static void *prot_mode_mem;
+static grub_addr_t prot_mode_target;
 static void *initrd_mem;
+static grub_addr_t initrd_mem_target;
 static grub_uint32_t real_mode_pages;
 static grub_uint32_t prot_mode_pages;
 static grub_uint32_t initrd_pages;
+static struct grub_relocator *relocator = NULL;
 
-static grub_uint8_t gdt[] __attribute__ ((aligned(16))) =
-  {
-    /* NULL.  */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    /* Reserved.  */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    /* Code segment.  */
-    0xFF, 0xFF, 0x00, 0x00, 0x00, 0x9A, 0xCF, 0x00,
-    /* Data segment.  */
-    0xFF, 0xFF, 0x00, 0x00, 0x00, 0x92, 0xCF, 0x00
-  };
-
-struct gdt_descriptor
-{
-  grub_uint16_t limit;
-  void *base;
-} __attribute__ ((packed));
-
-static struct gdt_descriptor gdt_desc =
-  {
-    sizeof (gdt) - 1,
-    gdt
-  };
-
+/* FIXME */
+#if 0
 struct idt_descriptor
 {
   grub_uint16_t limit;
@@ -85,6 +68,7 @@ static struct idt_descriptor idt_desc =
     0,
     0
   };
+#endif
 
 #ifdef GRUB_MACHINE_PCBIOS
 struct linux_vesafb_res
@@ -290,15 +274,19 @@ find_mmap_size (void)
 static void
 free_pages (void)
 {
+  grub_relocator_unload (relocator);
+  relocator = NULL;
   real_mode_mem = prot_mode_mem = initrd_mem = 0;
+  real_mode_target = prot_mode_target = initrd_mem_target = 0;
 }
 
 /* Allocate pages for the real mode code and the protected mode code
    for linux as well as a memory map buffer.  */
-static int
+static grub_err_t
 allocate_pages (grub_size_t prot_size)
 {
   grub_size_t real_size, mmap_size;
+  grub_err_t err;
 
   /* Make sure that each size is aligned to a page boundary.  */
   real_size = GRUB_LINUX_CL_END_OFFSET;
@@ -316,6 +304,13 @@ allocate_pages (grub_size_t prot_size)
   /* Initialize the memory pointers with NULL for convenience.  */
   free_pages ();
 
+  relocator = grub_relocator_new ();
+  if (!relocator)
+    {
+      err = grub_errno;
+      goto fail;
+    }
+
   /* FIXME: Should request low memory from the heap when this feature is
      implemented.  */
 
@@ -339,32 +334,42 @@ allocate_pages (grub_size_t prot_size)
 	  if (real_size + mmap_size > size)
 	    return 0;
 
-	  real_mode_mem =
-	    (void *) (grub_size_t) ((addr + size) - (real_size + mmap_size));
+	  real_mode_target = ((addr + size) - (real_size + mmap_size));
 	  return 1;
 	}
 
       return 0;
     }
   grub_mmap_iterate (hook);
-  if (! real_mode_mem)
+  if (! real_mode_target)
     {
-      grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate real mode pages");
+      err = grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate real mode pages");
       goto fail;
     }
 
-  prot_mode_mem = (void *) 0x100000;
+  err = grub_relocator_alloc_chunk_addr (relocator, &real_mode_mem,
+					 real_mode_target,
+					 (real_size + mmap_size));
+  if (err)
+    goto fail;
+
+  prot_mode_target = 0x100000;
+
+  err = grub_relocator_alloc_chunk_addr (relocator, &prot_mode_mem,
+					 prot_mode_target, prot_size);
+  if (err)
+    goto fail;
 
   grub_dprintf ("linux", "real_mode_mem = %lx, real_mode_pages = %x, "
                 "prot_mode_mem = %lx, prot_mode_pages = %x\n",
                 (unsigned long) real_mode_mem, (unsigned) real_mode_pages,
                 (unsigned long) prot_mode_mem, (unsigned) prot_mode_pages);
 
-  return 1;
+  return GRUB_ERR_NONE;
 
  fail:
   free_pages ();
-  return 0;
+  return err;
 }
 
 static void
@@ -460,16 +465,12 @@ grub_linux_boot (void)
   int e820_num;
   grub_err_t err = 0;
   char *modevar, *tmp;
+  struct grub_relocator32_state state;
 
   params = real_mode_mem;
 
-  grub_dprintf ("linux", "code32_start = %x, idt_desc = %lx, gdt_desc = %lx\n",
-		(unsigned) params->code32_start,
-                (unsigned long) &(idt_desc.limit),
-		(unsigned long) &(gdt_desc.limit));
-  grub_dprintf ("linux", "idt = %x:%lx, gdt = %x:%lx\n",
-		(unsigned) idt_desc.limit, (unsigned long) idt_desc.base,
-		(unsigned) gdt_desc.limit, (unsigned long) gdt_desc.base);
+  grub_dprintf ("linux", "code32_start = %x\n",
+		(unsigned) params->code32_start);
 
   auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
   int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
@@ -568,31 +569,12 @@ grub_linux_boot (void)
 	}
     }
 
-#ifdef __x86_64__
-
-  grub_memcpy ((char *) prot_mode_mem + (prot_mode_pages << 12),
-	       grub_linux_trampoline_start,
-	       grub_linux_trampoline_end - grub_linux_trampoline_start);
-
-  ((void (*) (unsigned long, void *)) ((char *) prot_mode_mem
-				       + (prot_mode_pages << 12)))
-    (params->code32_start, real_mode_mem);
-#else
-
-  /* Hardware interrupts are not safe any longer.  */
-  asm volatile ("cli" : : );
-
-  /* Load the IDT and the GDT for the bootstrap.  */
-  asm volatile ("lidt %0" : : "m" (idt_desc));
-  asm volatile ("lgdt %0" : : "m" (gdt_desc));
-
-  /* Enter Linux.  */
-  asm volatile ("jmp *%2" : : "b" (0), "S" (real_mode_mem), "g" (params->code32_start));
-
-#endif
-
-  /* Never reach here.  */
-  return GRUB_ERR_NONE;
+  /* FIXME.  */
+  /*  asm volatile ("lidt %0" : : "m" (idt_desc)); */
+  state.ebx = 0;
+  state.esi = real_mode_target;
+  state.eip = params->code32_start;
+  return grub_relocator32_boot (relocator, state);
 }
 
 static grub_err_t
@@ -678,7 +660,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   real_size = setup_sects << GRUB_DISK_SECTOR_BITS;
   prot_size = grub_file_size (file) - real_size - GRUB_DISK_SECTOR_SIZE;
 
-  if (! allocate_pages (prot_size))
+  if (allocate_pages (prot_size))
     goto fail;
 
   params = (struct linux_kernel_params *) real_mode_mem;
@@ -701,7 +683,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   params->cl_magic = GRUB_LINUX_CL_MAGIC;
   params->cl_offset = 0x1000;
 
-  params->cmd_line_ptr = (unsigned long) real_mode_mem + 0x1000;
+  params->cmd_line_ptr = real_mode_target + 0x1000;
   params->ramdisk_image = 0;
   params->ramdisk_size = 0;
 
@@ -910,6 +892,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   grub_ssize_t size;
   grub_addr_t addr_min, addr_max;
   grub_addr_t addr;
+  grub_err_t err;
   struct linux_kernel_header *lh;
 
   if (argc == 0)
@@ -957,7 +940,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   addr_max -= 0x10000;
 
   /* Usually, the compression ratio is about 50%.  */
-  addr_min = (grub_addr_t) prot_mode_mem + ((prot_mode_pages * 3) << 12)
+  addr_min = (grub_addr_t) prot_mode_target + ((prot_mode_pages * 3) << 12)
              + page_align (size);
 
   if (addr_max > grub_os_area_addr + grub_os_area_size)
@@ -972,7 +955,11 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
       goto fail;
     }
 
-  initrd_mem = (void *) addr;
+  err = grub_relocator_alloc_chunk_align (relocator, &initrd_mem,
+					  &initrd_mem_target,
+					  addr_min, addr, size, 0x1000);
+  if (err)
+    return err;
 
   if (grub_file_read (file, initrd_mem, size) != size)
     {
@@ -983,7 +970,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   grub_dprintf ("linux", "Initrd, addr=0x%x, size=0x%x\n",
 		(unsigned) addr, (unsigned) size);
 
-  lh->ramdisk_image = addr;
+  lh->ramdisk_image = initrd_mem_target;
   lh->ramdisk_size = size;
   lh->root_dev = 0x0100; /* XXX */
 

From 3b6f7ab75d3c4aa8bc59d56b71284ece7c809b5f Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Mon, 11 Jan 2010 19:19:24 +0100
Subject: [PATCH 0238/1628] Add missing menuviewer initialization.

---
 util/grub.d/00_header.in | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index da394783a..306bef3c3 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # grub-mkconfig helper script.
-# Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 2006,2007,2008,2009,2010  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
@@ -98,8 +98,11 @@ if [ x$GRUB_THEME != x ] && [ -f $GRUB_THEME ] \
 	&& is_path_readable_by_grub $GRUB_THEME; then
     echo "Found theme: $GRUB_THEME" >&2
     prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME`
-    echo "insmod gfxmenu"
-    echo "set theme=(\$root)/`make_system_path_relative_to_its_root $GRUB_THEME`"
+    cat << EOF
+insmod gfxmenu
+set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
+set menuviewer=gfxmenu
+EOF
 fi
     cat << EOF
 fi

From d0230c211973d781cb1fe9eefa6157290f09916e Mon Sep 17 00:00:00 2001
From: carles <carles@pinux>
Date: Mon, 11 Jan 2010 20:43:11 +0000
Subject: [PATCH 0239/1628] 2010-01-11  Carles Pina i Estany  <carles@pina.cat>

	* font/font.c (GENERATE_ASCII): Change the name to USE_ASCII_FAILBACK.
	By default: disabled.
	* Makefile.in (font/ascii.h): Remove the non-needed grub/bin2h size
	parameter.
---
 ChangeLog.kernel-font | 7 +++++++
 Makefile.in           | 2 +-
 font/font.c           | 8 ++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.kernel-font b/ChangeLog.kernel-font
index e7ca2a374..36c3b695b 100644
--- a/ChangeLog.kernel-font
+++ b/ChangeLog.kernel-font
@@ -1,3 +1,10 @@
+2010-01-11  Carles Pina i Estany  <carles@pina.cat>
+
+	* font/font.c (GENERATE_ASCII): Change the name to USE_ASCII_FAILBACK.
+	By default: disabled.
+	* Makefile.in (font/ascii.h): Remove the non-needed grub/bin2h size
+	parameter.
+
 2010-01-10  Carles Pina i Estany  <carles@pina.cat>
 
 	* font/font.c: Update copyright years.
diff --git a/Makefile.in b/Makefile.in
index f30264b00..ff59c4efd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -250,7 +250,7 @@ font/ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
 	$(builddir)/grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE)
 
 font/ascii.h: font/ascii.bitmaps grub-bin2h
-	$(builddir)/grub-bin2h ascii_bitmaps 2048 < font/ascii.bitmaps > font/ascii.h
+	$(builddir)/grub-bin2h ascii_bitmaps < font/ascii.bitmaps > font/ascii.h
 endif
 endif
 
diff --git a/font/font.c b/font/font.c
index a00aef94f..7aef1b163 100644
--- a/font/font.c
+++ b/font/font.c
@@ -17,7 +17,7 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define GENERATE_ASCII
+//#define USE_ASCII_FAILBACK 0
 
 #include <grub/bufio.h>
 #include <grub/dl.h>
@@ -29,7 +29,7 @@
 #include <grub/video.h>
 #include <grub/bitmap.h>
 
-#ifdef GENERATE_ASCII
+#ifdef USE_ASCII_FAILBACK
 #include "ascii.h"
 #endif
 
@@ -136,14 +136,14 @@ static struct grub_font null_font;
 /* Flag to ensure module is initialized only once.  */
 static grub_uint8_t font_loader_initialized;
 
-#ifdef GENERATE_ASCII
+#ifdef USE_ASCII_FAILBACK
 static struct grub_font_glyph *ascii_font_glyph[0x80];
 #endif
 
 static struct grub_font_glyph *
 ascii_glyph_lookup (grub_uint32_t code)
 {
-#ifdef GENERATE_ASCII
+#ifdef USE_ASCII_FAILBACK 
   static int ascii_failback_initialized = 0;
 
   if (code >= 0x80)

From d45dca5ab33950e15369158466088d24921bae66 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 11 Jan 2010 22:54:20 +0100
Subject: [PATCH 0240/1628] Fix few bugs in relocators

---
 lib/relocator.c | 96 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 33 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index 71517d94b..5d30b8ffe 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -313,6 +313,29 @@ malloc_in_range (struct grub_relocator *rel,
   }
 }
 
+static void
+adjust_limits (struct grub_relocator *rel, 
+	       grub_addr_t *min_addr, grub_addr_t *max_addr,
+	       grub_addr_t in_min, grub_addr_t in_max)
+{
+  struct grub_relocator_chunk *chunk;
+
+  *min_addr = 0;
+  *max_addr = rel->postchunks;
+
+  /* Keep chunks in memory in the same order as they'll be after relocation.  */
+  for (chunk = rel->chunks; chunk; chunk = chunk->next)
+    {
+      if (chunk->target > in_max && chunk->src < *max_addr
+	  && chunk->src < rel->postchunks)
+	*max_addr = chunk->src;
+      if (chunk->target + chunk->size <= in_min
+	  && chunk->src + chunk->size > *min_addr
+	  && chunk->src < rel->postchunks)
+	*min_addr = chunk->src + chunk->size;
+    }
+}
+
 grub_err_t
 grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
 				 grub_addr_t target, grub_size_t size)
@@ -321,24 +344,13 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
   grub_addr_t start;
   grub_addr_t min_addr = 0, max_addr;
 
-  max_addr = rel->postchunks;
+  adjust_limits (rel, &min_addr, &max_addr, target, target);
 
-  /* Keep chunks in memory in the same order as they'll be after relocation.  */
   for (chunk = rel->chunks; chunk; chunk = chunk->next)
-    {
-      if (chunk->target > target && chunk->src < max_addr
-	  && chunk->src < rel->postchunks)
-	max_addr = chunk->src;
-      if (chunk->target + chunk->size <= target
-	  && chunk->src + chunk->size > min_addr
-	  && chunk->src < rel->postchunks)
-	min_addr = chunk->src + chunk->size;
-      if ((chunk->target <= target && target < chunk->target + chunk->size)
-	  || (target <= chunk->target && chunk->target < target + size))
-	{
-	  return grub_error (GRUB_ERR_BAD_ARGUMENT, "overlap detected");
-	}
-    }
+    if ((chunk->target <= target && target < chunk->target + chunk->size)
+	|| (target <= chunk->target && chunk->target < target + size))
+      return grub_error (GRUB_ERR_BAD_ARGUMENT, "overlap detected");
+
 
   chunk = grub_malloc (sizeof (struct grub_relocator_chunk));
   if (!chunk)
@@ -366,6 +378,14 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
       if (malloc_in_range (rel, min_addr, target, 1, size, &start, 0, 0))
 	break;
 
+      if (malloc_in_range (rel, rel->highestnonpostaddr, ~(grub_addr_t)0, 1,
+			   size, &start, 0, 1))
+	{
+	  if (rel->postchunks > start)
+	    rel->postchunks = start;
+	  break;
+	}
+
       grub_dprintf ("relocator", "not allocated\n");
       grub_free (chunk);
       return grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
@@ -404,6 +424,9 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
   chunk->size = size;
   chunk->next = rel->chunks;
   rel->chunks = chunk;
+  grub_dprintf ("relocator", "cur = %p, next = %p\n", rel->chunks,
+		rel->chunks->next);
+
   *src = (void *) start;
   return GRUB_ERR_NONE;
 }
@@ -418,6 +441,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
   struct grub_relocator_chunk *chunk;
   grub_addr_t start;
 
+  grub_dprintf ("relocator", "chunks = %p\n", rel->chunks);
+
   chunk = grub_malloc (sizeof (struct grub_relocator_chunk));
   if (!chunk)
     return grub_errno;
@@ -427,6 +452,7 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
     {
       grub_dprintf ("relocator", "allocated 0x%llx/0x%llx\n",
 		    (unsigned long long) start, (unsigned long long) start);
+      grub_dprintf ("relocator", "chunks = %p\n", rel->chunks);
       chunk->src = start;
       chunk->target = start;
       chunk->size = size;
@@ -437,27 +463,27 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
       return GRUB_ERR_NONE;
     }
 
-  max_addr2 = rel->postchunks;
-  
-  /* Keep chunks in memory in the same order as they'll be after
-     relocation.  */
-  for (chunk = rel->chunks; chunk; chunk = chunk->next)
-    {
-      if (chunk->target > max_addr && chunk->src > max_addr2
-	  && chunk->src < rel->postchunks)
-	max_addr2 = chunk->src;
-      if (chunk->target + chunk->size <= min_addr
-	  && chunk->src + chunk->size < min_addr2
-	  && chunk->src < rel->postchunks)
-	min_addr2 = chunk->src + chunk->size;
-    }
+  adjust_limits (rel, &min_addr2, &max_addr2, min_addr, max_addr);
+  grub_dprintf ("relocator", "Adjusted limits from %x-%x to %x-%x\n",
+		min_addr, max_addr, min_addr2, max_addr2);
 
-  if (!malloc_in_range (rel, min_addr2, max_addr2, align,
-			size, &start, 1, 1))
+  do
     {
-      grub_free (chunk);
+      if (malloc_in_range (rel, min_addr2, max_addr2, align,
+			   size, &start, 1, 1))
+	break;
+
+      if (malloc_in_range (rel, rel->highestnonpostaddr, ~(grub_addr_t)0, 1,
+			   size, &start, 0, 1))
+	{
+	  if (rel->postchunks > start)
+	    rel->postchunks = start;
+	  break;
+	}
+
       return grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
     }
+  while (0);
 
   /* FIXME: check memory map.  */
   chunk->target = ALIGN_UP (min_addr, align);
@@ -490,6 +516,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
   chunk->size = size;
   chunk->next = rel->chunks;
   rel->chunks = chunk;
+  grub_dprintf ("relocator", "cur = %p, next = %p\n", rel->chunks,
+		rel->chunks->next);
   *src = (void *) start;
   *target = chunk->target;
   return GRUB_ERR_NONE;
@@ -530,6 +558,8 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
 
   for (chunk = rel->chunks; chunk; chunk = chunk->next)
     {
+      grub_dprintf ("relocator", "chunk %p->%p\n", 
+		    (void *) chunk->src, (void *) chunk->target);
       if (chunk->src < chunk->target)
 	{
 	  grub_cpu_relocator_backward ((void *) rels,

From 108408aa397171ba226e2a23166a71bdeb25510d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 11 Jan 2010 22:54:40 +0100
Subject: [PATCH 0241/1628] BSD on relocators

---
 include/grub/aout.h     |   4 +-
 include/grub/elfload.h  |   8 +
 include/grub/i386/bsd.h |   9 +-
 kern/elf.c              |   4 +-
 loader/aout.c           |  12 +-
 loader/i386/bsd.c       | 342 ++++++++++++++++++++++++++++++----------
 loader/i386/bsdXX.c     |  73 ++++++---
 7 files changed, 338 insertions(+), 114 deletions(-)

diff --git a/include/grub/aout.h b/include/grub/aout.h
index c5650ddf8..08aebba18 100644
--- a/include/grub/aout.h
+++ b/include/grub/aout.h
@@ -85,7 +85,7 @@ union grub_aout_header
 int EXPORT_FUNC(grub_aout_get_type) (union grub_aout_header *header);
 
 grub_err_t EXPORT_FUNC(grub_aout_load) (grub_file_t file, int offset,
-                                        grub_addr_t load_addr, int load_size,
-                                        grub_addr_t bss_end_addr);
+                                        void *load_addr, int load_size,
+                                        grub_size_t bss_size);
 
 #endif /* ! GRUB_AOUT_HEADER */
diff --git a/include/grub/elfload.h b/include/grub/elfload.h
index 6e09e0d05..1e640c198 100644
--- a/include/grub/elfload.h
+++ b/include/grub/elfload.h
@@ -54,5 +54,13 @@ int grub_elf_is_elf64 (grub_elf_t);
 grub_size_t grub_elf64_size (grub_elf_t);
 grub_err_t grub_elf64_load (grub_elf_t, grub_elf64_load_hook_t, grub_addr_t *,
 			    grub_size_t *);
+grub_err_t
+grub_elf32_phdr_iterate (grub_elf_t elf,
+			 int NESTED_FUNC_ATTR (*hook) (grub_elf_t, Elf32_Phdr *, void *),
+			 void *hook_arg);
+grub_err_t
+grub_elf64_phdr_iterate (grub_elf_t elf,
+			 int NESTED_FUNC_ATTR (*hook) (grub_elf_t, Elf64_Phdr *, void *),
+			 void *hook_arg);
 
 #endif /* ! GRUB_ELFLOAD_HEADER */
diff --git a/include/grub/i386/bsd.h b/include/grub/i386/bsd.h
index 8ffaf7d18..b37a86c7f 100644
--- a/include/grub/i386/bsd.h
+++ b/include/grub/i386/bsd.h
@@ -20,6 +20,7 @@
 #define GRUB_BSD_CPU_HEADER	1
 
 #include <grub/types.h>
+#include <grub/relocator.h>
 
 enum bsd_kernel_types
   {
@@ -197,7 +198,7 @@ struct grub_openbsd_bootargs
 struct grub_netbsd_bootinfo
 {
   grub_uint32_t bi_count;
-  void *bi_data[1];
+  grub_addr_t bi_data[1];
 };
 
 #define NETBSD_BTINFO_BOOTPATH		0
@@ -255,9 +256,11 @@ struct grub_netbsd_btinfo_bootdisk
 
 void grub_unix_real_boot (grub_addr_t entry, ...)
      __attribute__ ((cdecl,noreturn));
-grub_err_t grub_freebsd_load_elfmodule32 (grub_file_t file, int argc,
+grub_err_t grub_freebsd_load_elfmodule32 (struct grub_relocator *relocator,
+					  grub_file_t file, int argc,
 					  char *argv[], grub_addr_t *kern_end);
-grub_err_t grub_freebsd_load_elfmodule_obj64 (grub_file_t file, int argc,
+grub_err_t grub_freebsd_load_elfmodule_obj64 (struct grub_relocator *relocator,
+					      grub_file_t file, int argc,
 					      char *argv[],
 					      grub_addr_t *kern_end);
 grub_err_t grub_freebsd_load_elf_meta32 (grub_file_t file,
diff --git a/kern/elf.c b/kern/elf.c
index 7625f6acd..c70071d6e 100644
--- a/kern/elf.c
+++ b/kern/elf.c
@@ -140,7 +140,7 @@ grub_elf32_load_phdrs (grub_elf_t elf)
   return GRUB_ERR_NONE;
 }
 
-static grub_err_t
+grub_err_t
 grub_elf32_phdr_iterate (grub_elf_t elf,
 			 int NESTED_FUNC_ATTR (*hook) (grub_elf_t, Elf32_Phdr *, void *),
 			 void *hook_arg)
@@ -321,7 +321,7 @@ grub_elf64_load_phdrs (grub_elf_t elf)
   return GRUB_ERR_NONE;
 }
 
-static grub_err_t
+grub_err_t
 grub_elf64_phdr_iterate (grub_elf_t elf,
 			 int NESTED_FUNC_ATTR (*hook) (grub_elf_t, Elf64_Phdr *, void *),
 			 void *hook_arg)
diff --git a/loader/aout.c b/loader/aout.c
index 0254b6ae0..611960f92 100644
--- a/loader/aout.c
+++ b/loader/aout.c
@@ -39,9 +39,8 @@ grub_aout_get_type (union grub_aout_header *header)
 
 grub_err_t
 grub_aout_load (grub_file_t file, int offset,
-                grub_addr_t load_addr,
-		int load_size,
-                grub_addr_t bss_end_addr)
+                void *load_addr,
+		int load_size, grub_size_t bss_size)
 {
   if ((grub_file_seek (file, offset)) == (grub_off_t) - 1)
     return grub_errno;
@@ -49,14 +48,13 @@ grub_aout_load (grub_file_t file, int offset,
   if (!load_size)
     load_size = file->size - offset;
 
-  grub_file_read (file, (void *) load_addr, load_size);
+  grub_file_read (file, load_addr, load_size);
 
   if (grub_errno)
     return grub_errno;
 
-  if (bss_end_addr)
-    grub_memset ((char *) load_addr + load_size, 0,
-                 bss_end_addr - load_addr - load_size);
+  if (bss_size)
+    grub_memset ((char *) load_addr + load_size, 0, bss_size);
 
   return GRUB_ERR_NONE;
 }
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 0785a3fc1..9ee8a4b12 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -42,6 +42,8 @@
 #include <grub/disk.h>
 #include <grub/device.h>
 #include <grub/partition.h>
+#include <grub/relocator.h>
+#include <grub/cpu/relocator.h>
 
 #define ALIGN_DWORD(a)	ALIGN_UP (a, 4)
 #define ALIGN_QWORD(a)	ALIGN_UP (a, 8)
@@ -53,12 +55,14 @@
 static int kernel_type = KERNEL_TYPE_NONE;
 static grub_dl_t my_mod;
 static grub_addr_t entry, entry_hi, kern_start, kern_end;
+static void *kern_chunk_src;
 static grub_uint32_t bootflags;
 static char *mod_buf;
 static grub_uint32_t mod_buf_len, mod_buf_max, kern_end_mdofs;
 static int is_elf_kernel, is_64bit;
 static char *netbsd_root = NULL;
 static grub_uint32_t openbsd_root;
+struct grub_relocator *relocator = NULL;
 
 static const struct grub_arg_option freebsd_opts[] =
   {
@@ -442,24 +446,41 @@ static grub_err_t
 grub_freebsd_boot (void)
 {
   struct grub_freebsd_bootinfo bi;
-  char *p;
+  grub_uint8_t *p, *p0;
+  grub_addr_t p_target;
+  grub_size_t p_size = 0;
   grub_uint32_t bootdev, biosdev, unit, slice, part;
+  grub_err_t err;
 
   auto int iterate_env (struct grub_env_var *var);
   int iterate_env (struct grub_env_var *var)
   {
     if ((!grub_memcmp (var->name, "kFreeBSD.", sizeof("kFreeBSD.") - 1)) && (var->name[sizeof("kFreeBSD.") - 1]))
       {
-	grub_strcpy (p, &var->name[sizeof("kFreeBSD.") - 1]);
-	p += grub_strlen (p);
+	grub_strcpy ((char *) p, &var->name[sizeof("kFreeBSD.") - 1]);
+	p += grub_strlen ((char *) p);
 	*(p++) = '=';
-	grub_strcpy (p, var->value);
-	p += grub_strlen (p) + 1;
+	grub_strcpy ((char *) p, var->value);
+	p += grub_strlen ((char *) p) + 1;
       }
 
     return 0;
   }
 
+  auto int iterate_env_count (struct grub_env_var *var);
+  int iterate_env_count (struct grub_env_var *var)
+  {
+    if ((!grub_memcmp (var->name, "kFreeBSD.", sizeof("kFreeBSD.") - 1)) && (var->name[sizeof("kFreeBSD.") - 1]))
+      {
+	p_size += grub_strlen (&var->name[sizeof("kFreeBSD.") - 1]);
+	p_size++;
+	p_size += grub_strlen (var->value) + 1;
+      }
+
+    return 0;
+  }
+
+
   grub_memset (&bi, 0, sizeof (bi));
   bi.bi_version = FREEBSD_BOOTINFO_VERSION;
   bi.bi_size = sizeof (bi);
@@ -470,35 +491,50 @@ grub_freebsd_boot (void)
 
   bi.bi_bios_dev = biosdev;
 
-  p = (char *) kern_end;
+  p_size = 0;
+  grub_env_iterate (iterate_env_count);
+  if (p_size)
+    p_size = ALIGN_PAGE (kern_end + p_size + 1) - kern_end;
+  if (is_elf_kernel)
+    p_size = ALIGN_PAGE (kern_end + p_size + mod_buf_len) - kern_end;
+
+  if (is_64bit)
+    p_size += 4096 * 4;
+
+  err = grub_relocator_alloc_chunk_addr (relocator, (void **) &p,
+					 kern_end, p_size);
+  if (err)
+    return err;
+  kern_end += p_size;
+  p0 = p;
+  p_target = kern_end;
 
   grub_env_iterate (iterate_env);
 
-  if (p != (char *) kern_end)
+  if (p != p0)
     {
       *(p++) = 0;
 
-      bi.bi_envp = kern_end;
-      kern_end = ALIGN_PAGE ((grub_uint32_t) p);
+      bi.bi_envp = p_target;
     }
 
   if (is_elf_kernel)
     {
-      grub_addr_t md_ofs;
+      grub_uint8_t *md_ofs;
       int ofs;
 
       if (grub_freebsd_add_meta (FREEBSD_MODINFO_END, 0, 0))
 	return grub_errno;
 
-      grub_memcpy ((char *) kern_end, mod_buf, mod_buf_len);
-      bi.bi_modulep = kern_end;
+      grub_memcpy (p, mod_buf, mod_buf_len);
+      bi.bi_modulep = (p - p0) + p_target;
+      md_ofs = p + kern_end_mdofs;
 
-      kern_end = ALIGN_PAGE (kern_end + mod_buf_len);
+      p = (ALIGN_PAGE ((p - p0) + p_target) - p_target) + p0;
 
       if (is_64bit)
-	kern_end += 4096 * 4;
+	p += 4096 * 4;
 
-      md_ofs = bi.bi_modulep + kern_end_mdofs;
       ofs = (is_64bit) ? 16 : 12;
       *((grub_uint32_t *) md_ofs) = kern_end;
       md_ofs -= ofs;
@@ -519,11 +555,11 @@ grub_freebsd_boot (void)
 
       struct gdt_descriptor *gdtdesc;
 
-      pagetable = (grub_uint8_t *) (kern_end - 16384);
+      pagetable = p - 16384;
       fill_bsd64_pagetable (pagetable);
 
       /* Create GDT. */
-      gdt = (grub_uint32_t *) (kern_end - 4096);
+      gdt = (grub_uint32_t *) (p - 4096);
       gdt[0] = 0;
       gdt[1] = 0;
       gdt[2] = 0;
@@ -532,12 +568,12 @@ grub_freebsd_boot (void)
       gdt[5] = 0x00008000;
 
       /* Create GDT descriptor. */
-      gdtdesc = (struct gdt_descriptor *) (kern_end - 4096 + 24);
+      gdtdesc = (struct gdt_descriptor *) (p - 4096 + 24);
       gdtdesc->limit = 24;
       gdtdesc->base = gdt;
 
       /* Prepare trampoline. */
-      trampoline = (grub_uint8_t *) (kern_end - 4096 + 24
+      trampoline = (grub_uint8_t *) (p - 4096 + 24
 				     + sizeof (struct gdt_descriptor));
       launch_trampoline = (void  __attribute__ ((cdecl, regparm (0)))
 			   (*) (grub_addr_t entry_lo, ...)) trampoline;
@@ -556,8 +592,31 @@ grub_freebsd_boot (void)
 			 kern_end);
     }
   else
-    grub_unix_real_boot (entry, bootflags | FREEBSD_RB_BOOTINFO, bootdev,
-			 0, 0, 0, &bi, bi.bi_modulep, kern_end);
+    {
+      struct grub_relocator32_state state;
+      grub_uint32_t *stack;
+      grub_addr_t stack_target;
+      err = grub_relocator_alloc_chunk_align (relocator, (void **) &stack,
+					      &stack_target,
+					      0x10000, 0x90000,
+					      9 * sizeof (grub_uint32_t)
+					      + sizeof (bi), 4);
+      if (err)
+	return err;
+      grub_memcpy (&stack[8], &bi, sizeof (bi));
+      state.eip = entry;
+      state.esp = stack_target;
+      stack[0] = entry; /* "Return" address.  */
+      stack[1] = bootflags | FREEBSD_RB_BOOTINFO;
+      stack[2] = bootdev;
+      stack[3] = 0;
+      stack[4] = 0;
+      stack[5] = 0;
+      stack[6] = stack_target + 9 * sizeof (grub_uint32_t);
+      stack[7] = bi.bi_modulep;
+      stack[8] = kern_end;
+      return grub_relocator32_boot (relocator, state);
+    }
 
   /* Not reached.  */
   return GRUB_ERR_NONE;
@@ -566,9 +625,23 @@ grub_freebsd_boot (void)
 static grub_err_t
 grub_openbsd_boot (void)
 {
-  char *buf = (char *) GRUB_BSD_TEMP_BUFFER;
+  grub_uint8_t *buf, *buf0;
+  grub_uint32_t *stack;
+  grub_addr_t buf_target, argbuf_target_start, argbuf_target_end;
+  grub_size_t buf_size;
   struct grub_openbsd_bios_mmap *pm;
   struct grub_openbsd_bootargs *pa;
+  struct grub_relocator32_state state;
+  grub_err_t err;
+
+  auto int NESTED_FUNC_ATTR count_hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
+  int NESTED_FUNC_ATTR count_hook (grub_uint64_t addr __attribute__ ((unused)),
+				   grub_uint64_t size __attribute__ ((unused)),
+				   grub_uint32_t type __attribute__ ((unused)))
+  {
+    buf_size += sizeof (struct grub_openbsd_bios_mmap);
+    return 1;
+  }
 
   auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
   int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
@@ -599,6 +672,21 @@ grub_openbsd_boot (void)
       return 0;
     }
 
+  buf_target = GRUB_BSD_TEMP_BUFFER;
+  buf_size = sizeof (struct grub_openbsd_bootargs) + 9 * sizeof (grub_uint32_t);
+  grub_mmap_iterate (count_hook);
+  buf_size += sizeof (struct grub_openbsd_bootargs);
+
+  err = grub_relocator_alloc_chunk_addr (relocator, (void **) &buf,
+					 buf_target, buf_size);
+  if (err)
+    return err;
+  buf0 = buf;
+  stack = (grub_uint32_t *) buf;
+  buf = (grub_uint8_t *) (stack + 9);
+
+  argbuf_target_start = buf - buf0 + buf_target;
+
   pa = (struct grub_openbsd_bootargs *) buf;
 
   pa->ba_type = OPENBSD_BOOTARG_MMAP;
@@ -610,20 +698,29 @@ grub_openbsd_boot (void)
   pm->len = 0;
   pm->type = 0;
   pm++;
+  buf = (grub_uint8_t *) pm;
 
   pa->ba_size = (char *) pm - (char *) pa;
-  pa->ba_next = (struct grub_openbsd_bootargs *) pm;
+  pa->ba_next = (struct grub_openbsd_bootargs *) (buf - buf0 + buf_target);
   pa = pa->ba_next;
   pa->ba_type = OPENBSD_BOOTARG_END;
   pa++;
+  buf = (grub_uint8_t *) pa;
+  argbuf_target_end = buf - buf0 + buf_target;
 
-  grub_unix_real_boot (entry, bootflags, openbsd_root, OPENBSD_BOOTARG_APIVER,
-		       0, (grub_uint32_t) (grub_mmap_get_upper () >> 10),
-		       (grub_uint32_t) (grub_mmap_get_lower () >> 10),
-		       (char *) pa - buf, buf);
+  state.eip = entry;
+  state.esp = ((grub_uint8_t *) stack - buf0) + buf_target;
+  stack[0] = entry;
+  stack[1] = bootflags;
+  stack[2] = openbsd_root;
+  stack[3] = OPENBSD_BOOTARG_APIVER;
+  stack[4] = 0;
+  stack[5] = grub_mmap_get_upper () >> 10;
+  stack[6] = grub_mmap_get_lower () >> 10;
+  stack[7] = argbuf_target_end - argbuf_target_start;
+  stack[8] = argbuf_target_start;
 
-  /* Not reached.  */
-  return GRUB_ERR_NONE;
+  return grub_relocator32_boot (relocator, state);
 }
 
 static grub_err_t
@@ -633,7 +730,11 @@ grub_netbsd_boot (void)
   int count = 0;
   struct grub_netbsd_btinfo_mmap_header *mmap;
   struct grub_netbsd_btinfo_mmap_entry *pm;
-  void *curarg;
+  void *curarg, *arg0;
+  grub_addr_t arg_target, stack_target;
+  grub_uint32_t *stack;
+  grub_err_t err;
+  struct grub_relocator32_state state;
 
   auto int NESTED_FUNC_ATTR count_hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
   int NESTED_FUNC_ATTR count_hook (grub_uint64_t addr __attribute__ ((unused)),
@@ -675,14 +776,18 @@ grub_netbsd_boot (void)
 
   grub_mmap_iterate (count_hook);
 
-  if (kern_end + sizeof (struct grub_netbsd_btinfo_rootdevice)
-      + sizeof (struct grub_netbsd_bootinfo)
-      + sizeof (struct grub_netbsd_btinfo_mmap_header)
-      + count * sizeof (struct grub_netbsd_btinfo_mmap_entry)
-      > grub_os_area_addr + grub_os_area_size)
-    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
+  arg_target = kern_end;
+  err = grub_relocator_alloc_chunk_addr 
+    (relocator, &curarg, arg_target,
+     sizeof (struct grub_netbsd_btinfo_rootdevice)
+     + sizeof (struct grub_netbsd_bootinfo)
+     + sizeof (struct grub_netbsd_btinfo_mmap_header)
+     + count * sizeof (struct grub_netbsd_btinfo_mmap_entry));
+  if (err)
+    return err;
 
-  curarg = mmap = (struct grub_netbsd_btinfo_mmap_header *) kern_end;
+  arg0 = curarg;
+  mmap = curarg;
   pm = (struct grub_netbsd_btinfo_mmap_entry *) (mmap + 1);
 
   grub_mmap_iterate (fill_hook);
@@ -703,22 +808,36 @@ grub_netbsd_boot (void)
 
       bootinfo = (struct grub_netbsd_bootinfo *) (rootdev + 1);
       bootinfo->bi_count = 2;
-      bootinfo->bi_data[0] = mmap;
-      bootinfo->bi_data[1] = rootdev;
+      bootinfo->bi_data[0] = ((grub_uint8_t *) mmap - (grub_uint8_t *) arg0)
+	+ arg_target;
+      bootinfo->bi_data[1] = ((grub_uint8_t *) rootdev - (grub_uint8_t *) arg0)
+	+ arg_target;
     }
   else
     {
       bootinfo = (struct grub_netbsd_bootinfo *) curarg;
       bootinfo->bi_count = 1;
-      bootinfo->bi_data[0] = mmap;
+      bootinfo->bi_data[0] = ((grub_uint8_t *) mmap - (grub_uint8_t *) arg0)
+	+ arg_target;
     }
 
-  grub_unix_real_boot (entry, bootflags, 0, bootinfo,
-		       0, (grub_uint32_t) (grub_mmap_get_upper () >> 10),
-		       (grub_uint32_t) (grub_mmap_get_lower () >> 10));
+  err = grub_relocator_alloc_chunk_align (relocator, (void **) &stack,
+					  &stack_target, 0x10000, 0x90000,
+					  7 * sizeof (grub_uint32_t), 4);
+  if (err)
+    return err;
 
-  /* Not reached.  */
-  return GRUB_ERR_NONE;
+  state.eip = entry;
+  state.esp = stack_target;
+  stack[0] = entry;
+  stack[1] = bootflags;
+  stack[2] = 0;
+  stack[3] = ((grub_uint8_t *) bootinfo - (grub_uint8_t *) arg0) + arg_target;
+  stack[4] = 0;
+  stack[5] = grub_mmap_get_upper () >> 10;
+  stack[6] = grub_mmap_get_lower () >> 10;
+
+  return grub_relocator32_boot (relocator, state);
 }
 
 static grub_err_t
@@ -737,15 +856,20 @@ grub_bsd_unload (void)
   grub_free (netbsd_root);
   netbsd_root = NULL;
 
+  grub_relocator_unload (relocator);
+  relocator = NULL;
+
   return GRUB_ERR_NONE;
 }
 
 static grub_err_t
 grub_bsd_load_aout (grub_file_t file)
 {
-  grub_addr_t load_addr, bss_end_addr;
+  grub_addr_t load_addr, load_end;
   int ofs, align_page;
   union grub_aout_header ah;
+  grub_err_t err;
+  grub_size_t bss_size;
 
   if ((grub_file_seek (file, 0)) == (grub_off_t) - 1)
     return grub_errno;
@@ -775,7 +899,7 @@ grub_bsd_load_aout (grub_file_t file)
     return grub_error (GRUB_ERR_BAD_OS, "load address below 1M");
 
   kern_start = load_addr;
-  kern_end = load_addr + ah.aout32.a_text + ah.aout32.a_data;
+  load_end = kern_end = load_addr + ah.aout32.a_text + ah.aout32.a_data;
   if (align_page)
     kern_end = ALIGN_PAGE (kern_end);
 
@@ -785,13 +909,44 @@ grub_bsd_load_aout (grub_file_t file)
       if (align_page)
 	kern_end = ALIGN_PAGE (kern_end);
 
-      bss_end_addr = kern_end;
+      bss_size = kern_end - load_end;
     }
   else
-    bss_end_addr = 0;
+    bss_size = 0;
 
-  return grub_aout_load (file, ofs, load_addr,
-			 ah.aout32.a_text + ah.aout32.a_data, bss_end_addr);
+  relocator = grub_relocator_new ();
+  if (!relocator)
+    return grub_errno;
+
+  err = grub_relocator_alloc_chunk_addr (relocator, &kern_chunk_src,
+					 kern_start, kern_end - kern_start);
+  if (err)
+    return err;
+
+  return grub_aout_load (file, ofs, kern_chunk_src,
+			 ah.aout32.a_text + ah.aout32.a_data,
+			 bss_size);
+}
+
+static int NESTED_FUNC_ATTR
+grub_bsd_elf32_size_hook (grub_elf_t elf __attribute__ ((unused)),
+			  Elf32_Phdr *phdr, void *arg __attribute__ ((unused)))
+{
+  Elf32_Addr paddr;
+
+  if (phdr->p_type != PT_LOAD
+      && phdr->p_type != PT_DYNAMIC)
+      return 1;
+
+  paddr = phdr->p_paddr & 0xFFFFFF;
+
+  if (paddr < kern_start)
+    kern_start = paddr;
+
+  if (paddr + phdr->p_memsz > kern_end)
+    kern_end = paddr + phdr->p_memsz;
+
+  return 1;
 }
 
 static grub_err_t
@@ -810,20 +965,30 @@ grub_bsd_elf32_hook (Elf32_Phdr * phdr, grub_addr_t * addr, int *do_load)
   phdr->p_paddr &= 0xFFFFFF;
   paddr = phdr->p_paddr;
 
-  if ((paddr < grub_os_area_addr)
-      || (paddr + phdr->p_memsz > grub_os_area_addr + grub_os_area_size))
-    return grub_error (GRUB_ERR_OUT_OF_RANGE, "address 0x%x is out of range",
-		       paddr);
+  *addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
 
-  if ((!kern_start) || (paddr < kern_start))
+  return GRUB_ERR_NONE;
+}
+
+static int NESTED_FUNC_ATTR
+grub_bsd_elf64_size_hook (grub_elf_t elf __attribute__ ((unused)),
+			  Elf64_Phdr *phdr, void *arg __attribute__ ((unused)))
+{
+  Elf64_Addr paddr;
+
+  if (phdr->p_type != PT_LOAD
+      && phdr->p_type != PT_DYNAMIC)
+    return 1;
+
+  paddr = phdr->p_paddr & 0xffffff;
+
+  if (paddr < kern_start)
     kern_start = paddr;
 
   if (paddr + phdr->p_memsz > kern_end)
     kern_end = paddr + phdr->p_memsz;
 
-  *addr = paddr;
-
-  return GRUB_ERR_NONE;
+  return 1;
 }
 
 static grub_err_t
@@ -841,18 +1006,7 @@ grub_bsd_elf64_hook (Elf64_Phdr * phdr, grub_addr_t * addr, int *do_load)
   *do_load = 1;
   paddr = phdr->p_paddr & 0xffffff;
 
-  if ((paddr < grub_os_area_addr)
-      || (paddr + phdr->p_memsz > grub_os_area_addr + grub_os_area_size))
-    return grub_error (GRUB_ERR_OUT_OF_RANGE, "address 0x%x is out of range",
-		       paddr);
-
-  if ((!kern_start) || (paddr < kern_start))
-    kern_start = paddr;
-
-  if (paddr + phdr->p_memsz > kern_end)
-    kern_end = paddr + phdr->p_memsz;
-
-  *addr = paddr;
+  *addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
 
   return GRUB_ERR_NONE;
 }
@@ -860,11 +1014,22 @@ grub_bsd_elf64_hook (Elf64_Phdr * phdr, grub_addr_t * addr, int *do_load)
 static grub_err_t
 grub_bsd_load_elf (grub_elf_t elf)
 {
-  kern_start = kern_end = 0;
+  grub_err_t err;
+
+  kern_end = 0;
+  kern_start = ~0;
 
   if (grub_elf_is_elf32 (elf))
     {
       entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFF;
+      err = grub_elf32_phdr_iterate (elf, grub_bsd_elf32_size_hook, NULL);
+      if (err)
+	return err;
+      err = grub_relocator_alloc_chunk_addr (relocator, &kern_chunk_src,
+					     kern_start, kern_end - kern_start);
+      if (err)
+	return err;
+
       return grub_elf32_load (elf, grub_bsd_elf32_hook, 0, 0);
     }
   else if (grub_elf_is_elf64 (elf))
@@ -885,6 +1050,15 @@ grub_bsd_load_elf (grub_elf_t elf)
 	  entry = elf->ehdr.ehdr64.e_entry & 0x0fffffff;
 	  entry_hi = 0;
 	}
+
+      err = grub_elf64_phdr_iterate (elf, grub_bsd_elf64_size_hook, NULL);
+      if (err)
+	return err;
+      err = grub_relocator_alloc_chunk_addr (relocator, &kern_chunk_src,
+					     kern_start, kern_end - kern_start);
+      if (err)
+	return err;
+
       return grub_elf64_load (elf, grub_bsd_elf64_hook, 0, 0);
     }
   else
@@ -911,6 +1085,8 @@ grub_bsd_load (int argc, char *argv[])
   if (!file)
     goto fail;
 
+  relocator = grub_relocator_new ();
+
   elf = grub_elf_file (file);
   if (elf)
     {
@@ -1059,7 +1235,7 @@ grub_cmd_netbsd (grub_extcmd_t cmd, int argc, char *argv[])
 
   if (grub_bsd_load (argc, argv) == GRUB_ERR_NONE)
     {
-      grub_loader_set (grub_netbsd_boot, grub_bsd_unload, 1);
+      grub_loader_set (grub_netbsd_boot, grub_bsd_unload, 0);
       if (cmd->state[NETBSD_ROOT_ARG].set)
 	netbsd_root = grub_strdup (cmd->state[NETBSD_ROOT_ARG].arg);
     }
@@ -1164,10 +1340,11 @@ grub_cmd_freebsd_module (grub_command_t cmd __attribute__ ((unused)),
 			 int argc, char *argv[])
 {
   grub_file_t file = 0;
-  grub_err_t err;
   int modargc;
   char **modargv;
   char *type;
+  grub_err_t err;
+  void *src;
 
   if (kernel_type == KERNEL_TYPE_NONE)
     return grub_error (GRUB_ERR_BAD_ARGUMENT,
@@ -1192,13 +1369,12 @@ grub_cmd_freebsd_module (grub_command_t cmd __attribute__ ((unused)),
   if ((!file) || (!file->size))
     goto fail;
 
-  if (kern_end + file->size > grub_os_area_addr + grub_os_area_size)
-    {
-      grub_error (GRUB_ERR_OUT_OF_RANGE, "not enough memory for the module");
-      goto fail;
-    }
+  err = grub_relocator_alloc_chunk_addr (relocator, &src, kern_end, 
+					 file->size);
+  if (err)
+    goto fail;
 
-  grub_file_read (file, (void *) kern_end, file->size);
+  grub_file_read (file, src, file->size);
   if (grub_errno)
     goto fail;
 
@@ -1264,9 +1440,11 @@ grub_cmd_freebsd_module_elf (grub_command_t cmd __attribute__ ((unused)),
     }
 
   if (is_64bit)
-    err = grub_freebsd_load_elfmodule_obj64 (file, argc, argv, &kern_end);
+    err = grub_freebsd_load_elfmodule_obj64 (relocator, file,
+					     argc, argv, &kern_end);
   else
-    err = grub_freebsd_load_elfmodule32 (file, argc, argv, &kern_end);
+    err = grub_freebsd_load_elfmodule32 (relocator, file,
+					 argc, argv, &kern_end);
   grub_file_close (file);
 
   return err;
diff --git a/loader/i386/bsdXX.c b/loader/i386/bsdXX.c
index b4d574821..2622287f9 100644
--- a/loader/i386/bsdXX.c
+++ b/loader/i386/bsdXX.c
@@ -4,19 +4,16 @@
 #include <grub/elf.h>
 #include <grub/misc.h>
 #include <grub/i386/loader.h>
+#include <grub/cpu/relocator.h>
 
 #define ALIGN_PAGE(a)	ALIGN_UP (a, 4096)
 
 static inline grub_err_t
 load (grub_file_t file, void *where, grub_off_t off, grub_size_t size)
 {
-  if (PTR_TO_UINT32 (where) + size > grub_os_area_addr + grub_os_area_size)
-    return grub_error (GRUB_ERR_OUT_OF_RANGE,
-		       "not enough memory for the module");
   if (grub_file_seek (file, off) == (grub_off_t) -1)
     return grub_errno;
-  if (grub_file_read (file, where, size)
-      != (grub_ssize_t) size)
+  if (grub_file_read (file, where, size) != (grub_ssize_t) size)
     {
       if (grub_errno)
 	return grub_errno;
@@ -75,7 +72,8 @@ read_headers (grub_file_t file, Elf_Ehdr *e, char **shdr)
    platforms. So I keep both versions.  */
 #if OBJSYM
 grub_err_t
-SUFFIX (grub_freebsd_load_elfmodule_obj) (grub_file_t file, int argc,
+SUFFIX (grub_freebsd_load_elfmodule_obj) (struct grub_relocator *relocator,
+					  grub_file_t file, int argc,
 					  char *argv[], grub_addr_t *kern_end)
 {
   Elf_Ehdr e;
@@ -83,6 +81,8 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (grub_file_t file, int argc,
   char *shdr;
   grub_addr_t curload, module;
   grub_err_t err;
+  grub_size_t chunk_size = 0;
+  void *chunk_src;
 
   err = read_headers (file, &e, &shdr);
   if (err)
@@ -90,6 +90,25 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (grub_file_t file, int argc,
 
   curload = module = ALIGN_PAGE (*kern_end);
 
+  for (s = (Elf_Shdr *) shdr; s < (Elf_Shdr *) ((char *) shdr
+						+ e.e_shnum * e.e_shentsize);
+       s = (Elf_Shdr *) ((char *) s + e.e_shentsize))
+    {
+      if (s->sh_size == 0)
+	continue;
+
+      if (s->sh_addralign)
+	chunk_size = ALIGN_UP (chunk_size + *kern_end, s->sh_addralign)
+	  - *kern_end;
+
+      chunk_size += s->sh_size;
+    }
+
+  err = grub_relocator_alloc_chunk_addr (relocator, &chunk_src,
+					 module, chunk_size);
+  if (err)
+    return err;
+
   for (s = (Elf_Shdr *) shdr; s < (Elf_Shdr *) ((char *) shdr
 						+ e.e_shnum * e.e_shentsize);
        s = (Elf_Shdr *) ((char *) s + e.e_shentsize))
@@ -109,15 +128,14 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (grub_file_t file, int argc,
 	{
 	default:
 	case SHT_PROGBITS:
-	  err = load (file, UINT_TO_PTR (curload), s->sh_offset, s->sh_size);
+	  err = load (file, (grub_uint8_t *) chunk_src + curload - *kern_end,
+		      s->sh_offset, s->sh_size);
 	  if (err)
 	    return err;
 	  break;
 	case SHT_NOBITS:
-	  if (curload + s->sh_size > grub_os_area_addr + grub_os_area_size)
-	    return grub_error (GRUB_ERR_OUT_OF_RANGE,
-			       "not enough memory for the module");
-	  grub_memset (UINT_TO_PTR (curload), 0, s->sh_size);
+	  grub_memset ((grub_uint8_t *) chunk_src + curload - *kern_end, 0,
+		       s->sh_size);
 	  break;
 	}
       curload += s->sh_size;
@@ -143,7 +161,8 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (grub_file_t file, int argc,
 #else
 
 grub_err_t
-SUFFIX (grub_freebsd_load_elfmodule) (grub_file_t file, int argc, char *argv[],
+SUFFIX (grub_freebsd_load_elfmodule) (struct grub_relocator *relocator,
+				      grub_file_t file, int argc, char *argv[],
 				      grub_addr_t *kern_end)
 {
   Elf_Ehdr e;
@@ -151,6 +170,8 @@ SUFFIX (grub_freebsd_load_elfmodule) (grub_file_t file, int argc, char *argv[],
   char *shdr;
   grub_addr_t curload, module;
   grub_err_t err;
+  grub_size_t chunk_size = 0;
+  void *chunk_src;
 
   err = read_headers (file, &e, &shdr);
   if (err)
@@ -158,6 +179,24 @@ SUFFIX (grub_freebsd_load_elfmodule) (grub_file_t file, int argc, char *argv[],
 
   curload = module = ALIGN_PAGE (*kern_end);
 
+  for (s = (Elf_Shdr *) shdr; s < (Elf_Shdr *) ((char *) shdr
+						+ e.e_shnum * e.e_shentsize);
+       s = (Elf_Shdr *) ((char *) s + e.e_shentsize))
+    {
+      if (s->sh_size == 0)
+	continue;
+
+      if (! (s->sh_flags & SHF_ALLOC))
+	continue;
+      if (chunk_size < s->sh_addr + s->sh_size)
+	chunk_size = s->sh_addr + s->sh_size;
+    }
+
+  err = grub_relocator_alloc_chunk_addr (relocator, &chunk_src,
+					 module, chunk_size);
+  if (err)
+    return err;
+
   for (s = (Elf_Shdr *) shdr; s < (Elf_Shdr *) ((char *) shdr
 						+ e.e_shnum * e.e_shentsize);
        s = (Elf_Shdr *) ((char *) s + e.e_shentsize))
@@ -176,17 +215,15 @@ SUFFIX (grub_freebsd_load_elfmodule) (grub_file_t file, int argc, char *argv[],
 	{
 	default:
 	case SHT_PROGBITS:
-	  err = load (file, UINT_TO_PTR (module + s->sh_addr),
+	  err = load (file, (grub_uint8_t *) chunk_src + module
+		      + s->sh_addr - *kern_end,
 		      s->sh_offset, s->sh_size);
 	  if (err)
 	    return err;
 	  break;
 	case SHT_NOBITS:
-	  if (module + s->sh_addr + s->sh_size
-	      > grub_os_area_addr + grub_os_area_size)
-	    return grub_error (GRUB_ERR_OUT_OF_RANGE,
-			       "not enough memory for the module");
-	  grub_memset (UINT_TO_PTR (module + s->sh_addr), 0, s->sh_size);
+	  grub_memset ((grub_uint8_t *) chunk_src + module
+		      + s->sh_addr - *kern_end, 0, s->sh_size);
 	  break;
 	}
       if (curload < module + s->sh_addr + s->sh_size)

From 8468cbeccd5f544ca97517f2a12469ff401e52e9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 12 Jan 2010 17:46:17 +0100
Subject: [PATCH 0242/1628] Fix typo in relocator32.S

---
 lib/i386/relocator32.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/i386/relocator32.S b/lib/i386/relocator32.S
index 23bf65302..4e0553c03 100644
--- a/lib/i386/relocator32.S
+++ b/lib/i386/relocator32.S
@@ -79,7 +79,7 @@ LOCAL(cont1):
 
 	/* Turn off PAE. */
 	movl	%cr4, %eax
-	andl	$GRUB_MEMORY_CPU_CR4_PAE_ON, %eax
+	andl	$(~GRUB_MEMORY_CPU_CR4_PAE_ON), %eax
 	movl	%eax, %cr4
 
 	jmp	LOCAL(cont2)

From 1d24828f209ee2855ac0ff542856607d1f8b3e22 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 12 Jan 2010 17:47:14 +0100
Subject: [PATCH 0243/1628] Fix out of memory hang. Add sanity checks

---
 lib/relocator.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index 5d30b8ffe..3085932c5 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -22,6 +22,10 @@
 #include <grub/misc.h>
 
 /* TODO: use more efficient data structures if necessary.  */
+/* FIXME: implement unload. */
+/* FIXME: check memory map.  */ 
+/* FIXME: try to request memory from firmware.  */
+/* FIXME: sort chunk when programming relocators.  */
 
 struct grub_relocator *
 grub_relocator_new (void)
@@ -180,11 +184,13 @@ malloc_in_range (struct grub_relocator *rel,
 		 grub_size_t size, grub_addr_t *res, int from_low_priv,
 		 int collisioncheck)
 {
-  grub_mm_region_t rb = NULL, rbp = NULL;
+  grub_mm_region_t rb, rbp;
   grub_mm_header_t hb = NULL, hbp = NULL;
   grub_addr_t best_addr;
 
  again:
+
+  rb = NULL, rbp = NULL;
   
   {
     grub_mm_region_t r, rp;
@@ -344,6 +350,9 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
   grub_addr_t start;
   grub_addr_t min_addr = 0, max_addr;
 
+  if (target > ~size)
+    return grub_error (GRUB_ERR_OUT_OF_RANGE, "address is out of range");
+
   adjust_limits (rel, &min_addr, &max_addr, target, target);
 
   for (chunk = rel->chunks; chunk; chunk = chunk->next)
@@ -356,8 +365,10 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
   if (!chunk)
     return grub_errno;
 
-  grub_dprintf ("relocator", "min_addr = 0x%llx, max_addr = 0x%llx\n",
-		(unsigned long long) min_addr, (unsigned long long) max_addr);
+  grub_dprintf ("relocator",
+		"min_addr = 0x%llx, max_addr = 0x%llx, target = 0x%llx\n",
+		(unsigned long long) min_addr, (unsigned long long) max_addr,
+		(unsigned long long) target);
 
   do
     {
@@ -441,6 +452,9 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
   struct grub_relocator_chunk *chunk;
   grub_addr_t start;
 
+  if (max_addr > ~size)
+    max_addr = ~size;
+
   grub_dprintf ("relocator", "chunks = %p\n", rel->chunks);
 
   chunk = grub_malloc (sizeof (struct grub_relocator_chunk));

From 14933205d1109ea759949bfceced54553824a331 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 12 Jan 2010 17:48:51 +0100
Subject: [PATCH 0244/1628] Relocator64 support

---
 conf/i386.rmk                 |   1 +
 include/grub/i386/memory.h    |   3 +-
 include/grub/i386/relocator.h |  16 +++
 lib/i386/relocator.c          |  54 ++++++++-
 lib/i386/relocator64.S        | 206 ++++++++++++++++++++++++++++++++++
 5 files changed, 277 insertions(+), 3 deletions(-)
 create mode 100644 lib/i386/relocator64.S

diff --git a/conf/i386.rmk b/conf/i386.rmk
index 674170d01..72ea6d465 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -17,6 +17,7 @@ vga_text_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += relocator.mod
 relocator_mod_SOURCES = lib/relocator.c lib/i386/relocator32.S \
+	lib/i386/relocator64.S \
 	lib/i386/relocator_asm.S lib/i386/relocator.c
 relocator_mod_CFLAGS = $(COMMON_CFLAGS)
 relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
diff --git a/include/grub/i386/memory.h b/include/grub/i386/memory.h
index 466947cc6..fe2f6e4e1 100644
--- a/include/grub/i386/memory.h
+++ b/include/grub/i386/memory.h
@@ -22,7 +22,8 @@
 
 /* The flag for protected mode.  */
 #define GRUB_MEMORY_CPU_CR0_PE_ON		0x1
-#define GRUB_MEMORY_CPU_CR4_PAE_ON		0x00000040
+#define GRUB_MEMORY_CPU_CR4_PAE_ON		0x00000020
+#define GRUB_MEMORY_CPU_CR4_PSE_ON		0x00000010
 #define GRUB_MEMORY_CPU_CR0_PAGING_ON		0x80000000
 #define GRUB_MEMORY_CPU_AMD64_MSR		0xc0000080
 #define GRUB_MEMORY_CPU_AMD64_MSR_ON		0x00000100
diff --git a/include/grub/i386/relocator.h b/include/grub/i386/relocator.h
index e4c9e7ca7..ac49dd29e 100644
--- a/include/grub/i386/relocator.h
+++ b/include/grub/i386/relocator.h
@@ -34,7 +34,23 @@ struct grub_relocator32_state
   grub_uint32_t esi;
 };
 
+struct grub_relocator64_state
+{
+  grub_uint64_t rsp;
+  grub_uint64_t rax;
+  grub_uint64_t rbx;
+  grub_uint64_t rcx;
+  grub_uint64_t rdx;
+  grub_uint64_t rip;
+  grub_uint64_t rsi;
+  grub_addr_t cr3;
+};
+
 grub_err_t grub_relocator32_boot (struct grub_relocator *rel,
 				  struct grub_relocator32_state state);
 
+grub_err_t grub_relocator64_boot (struct grub_relocator *rel,
+				  struct grub_relocator64_state state,
+				  grub_addr_t min_addr, grub_addr_t max_addr);
+
 #endif /* ! GRUB_RELOCATOR_CPU_HEADER */
diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index 11e673cf7..e81dd8e1e 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -26,8 +26,6 @@
 #include <grub/i386/relocator.h>
 #include <grub/relocator_private.h>
 
-extern grub_uint8_t grub_relocator32_start;
-extern grub_uint8_t grub_relocator32_end;
 extern grub_uint8_t grub_relocator_forward_start;
 extern grub_uint8_t grub_relocator_forward_end;
 extern grub_uint8_t grub_relocator_backward_start;
@@ -41,6 +39,8 @@ extern void *grub_relocator_forward_dest;
 extern void *grub_relocator_forward_src;
 extern grub_size_t grub_relocator_forward_chunk_size;
 
+extern grub_uint8_t grub_relocator32_start;
+extern grub_uint8_t grub_relocator32_end;
 extern grub_uint32_t grub_relocator32_eax;
 extern grub_uint32_t grub_relocator32_ebx;
 extern grub_uint32_t grub_relocator32_ecx;
@@ -49,6 +49,18 @@ extern grub_uint32_t grub_relocator32_eip;
 extern grub_uint32_t grub_relocator32_esp;
 extern grub_uint32_t grub_relocator32_esi;
 
+extern grub_uint8_t grub_relocator64_start;
+extern grub_uint8_t grub_relocator64_end;
+extern grub_uint64_t grub_relocator64_rax;
+extern grub_uint64_t grub_relocator64_rbx;
+extern grub_uint64_t grub_relocator64_rcx;
+extern grub_uint64_t grub_relocator64_rdx;
+extern grub_uint64_t grub_relocator64_rip;
+extern grub_uint64_t grub_relocator64_rip_addr;
+extern grub_uint64_t grub_relocator64_rsp;
+extern grub_uint64_t grub_relocator64_rsi;
+extern grub_addr_t grub_relocator64_cr3;
+
 #define RELOCATOR_SIZEOF(x)	(&grub_relocator##x##_end - &grub_relocator##x##_start)
 
 grub_size_t grub_relocator_align = 1;
@@ -141,3 +153,41 @@ grub_relocator32_boot (struct grub_relocator *rel,
   /* Not reached.  */
   return GRUB_ERR_NONE;
 }
+
+grub_err_t
+grub_relocator64_boot (struct grub_relocator *rel,
+		       struct grub_relocator64_state state,
+		       grub_addr_t min_addr, grub_addr_t max_addr)
+{
+  grub_addr_t target;
+  void *src;
+  grub_err_t err;
+  grub_addr_t relst;
+
+  err = grub_relocator_alloc_chunk_align (rel, &src, &target, min_addr,
+					  max_addr - RELOCATOR_SIZEOF (64),
+					  RELOCATOR_SIZEOF (64), 16);
+  if (err)
+    return err;
+
+  grub_relocator64_rax = state.rax;
+  grub_relocator64_rbx = state.rbx;
+  grub_relocator64_rcx = state.rcx;
+  grub_relocator64_rdx = state.rdx;
+  grub_relocator64_rip = state.rip;
+  grub_relocator64_rsp = state.rsp;
+  grub_relocator64_rsi = state.rsi;
+  grub_relocator64_cr3 = state.cr3;
+
+  grub_memmove (src, &grub_relocator64_start, RELOCATOR_SIZEOF (64));
+
+  err = grub_relocator_prepare_relocs (rel, target, &relst);
+  if (err)
+    return err;
+
+  asm volatile ("cli");
+  ((void (*) (void)) relst) ();
+
+  /* Not reached.  */
+  return GRUB_ERR_NONE;
+}
diff --git a/lib/i386/relocator64.S b/lib/i386/relocator64.S
new file mode 100644
index 000000000..42f61e32e
--- /dev/null
+++ b/lib/i386/relocator64.S
@@ -0,0 +1,206 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009,2010  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/symbol.h>
+#include <grub/i386/memory.h>
+
+#ifdef __x86_64__
+#define RAX %rax
+#define RSI %rdi
+#else
+#define RAX %eax
+#define RSI %esi
+#endif
+
+#define CODE32_SEGMENT	0x18
+#define CODE64_SEGMENT	0x08
+
+/* The data segment of the protected mode.  */
+#define DATA_SEGMENT	0x10
+
+	.p2align	4	/* force 16-byte alignment */
+
+VARIABLE(grub_relocator64_start)
+LOCAL(base):
+	/* %rax contains now our new 'base'.  */
+	mov	RAX, RSI
+
+	add	$(LOCAL(cont0) - LOCAL(base)), RAX
+	jmp	*RAX
+LOCAL(cont0):
+	lea	(LOCAL(cont1) - LOCAL(base)) (RSI, 1), RAX
+	mov	RAX, (LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
+
+	lea	(LOCAL(gdt) - LOCAL(base)) (RSI, 1), RAX
+	mov	RAX, (LOCAL(gdt_addr) - LOCAL(base)) (RSI, 1)
+
+#ifndef __x86_64__
+	/* Disable paging. */
+	movl	%cr0, %eax
+	andl	$(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax
+	movl	%eax, %cr0
+
+	/* Turn on PAE. */
+	movl	%cr4, %eax
+	orl	$(GRUB_MEMORY_CPU_CR4_PAE_ON | GRUB_MEMORY_CPU_CR4_PSE_ON), %eax
+	movl	%eax, %cr4
+
+	/* mov imm32, %eax */
+	.byte	0xb8
+VARIABLE(grub_relocator64_cr3)
+	.long	0
+	movl	%eax, %cr3
+
+	/* Turn on amd64. */
+	movl	$GRUB_MEMORY_CPU_AMD64_MSR, %ecx
+	rdmsr
+	orl	$GRUB_MEMORY_CPU_AMD64_MSR_ON, %eax
+	wrmsr
+
+	/* Enable paging. */
+	movl	%cr0, %eax
+	orl	$GRUB_MEMORY_CPU_CR0_PAGING_ON, %eax
+	movl	%eax, %cr0
+#else
+	/* mov imm64, %rax */
+	.byte 	0x48
+	.byte	0xb8
+VARIABLE(grub_relocator64_cr3)
+	.quad	0
+	movl	%rax, %cr3
+#endif
+	/* Load GDT. */
+	lgdt	(LOCAL(gdtdesc) - LOCAL(base)) (RSI, 1)
+
+	/* Update %cs.  */
+	ljmp	*(LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
+
+LOCAL(cont1):
+	.code64
+
+	/* mov imm64, %rax */
+	.byte 	0x48
+	.byte	0xb8
+VARIABLE(grub_relocator64_rsp)
+	.quad	0
+
+	movq	%rax, %rsp
+
+	/* mov imm64, %rax */
+	.byte 	0x48
+	.byte	0xb8
+VARIABLE(grub_relocator64_rsi)
+	.quad	0
+
+	movq	%rax, %rsi
+	
+	/* mov imm64, %rax */
+	.byte 	0x48
+	.byte	0xb8
+VARIABLE(grub_relocator64_rax)
+	.quad	0
+
+	/* mov imm64, %rbx */
+	.byte 	0x48
+	.byte	0xbb
+VARIABLE(grub_relocator64_rbx)
+	.quad	0
+
+	/* mov imm64, %rcx */
+	.byte 	0x48
+	.byte	0xb9
+VARIABLE(grub_relocator64_rcx)
+	.quad	0
+
+	/* mov imm64, %rdx */
+	.byte 	0x48
+	.byte	0xba
+VARIABLE(grub_relocator64_rdx)
+	.quad	0
+
+	/* Cleared direction flag is of no problem with any current
+	   payload and makes this implementation easier.  */
+	cld
+
+	jmp *LOCAL(jump_addr) (%rip)
+
+LOCAL(jump_addr):
+VARIABLE(grub_relocator64_rip)
+	.quad	0
+
+	.p2align	4
+LOCAL(gdt):
+	/* NULL.  */
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+
+	/* 64-bit segment.  */
+	.word 0xffff /* Limit xffff.  */
+	.word 0x0000 /* Base xxxx0000.  */
+	.byte 0x00 /* Base xx00xxxx.  */
+	.byte (0x8 /* Type 8.  */ | (1 << 4) /* Code.  */ \
+	       | (0 << 5) /* Ring 0.  */ | (1 << 7) /* Present.  */)
+	.byte (0xf /* Limit fxxxx.  */ | (0 << 4) /* AVL flag.  */ \
+	       | (1 << 5) /* 64-bit.  */ | (0 << 6) \
+	       | (1 << 7) /* 4K granular.  */)
+	.byte 0x00 /* Base 00xxxxxx.  */
+
+	/* Data segment*/
+	.word 0xffff /* Limit xffff.  */
+	.word 0x0000 /* Base xxxx0000.  */
+	.byte 0x00 /* Base xx00xxxx.  */
+	.byte (0x0 /* Type 0.  */ | (0 << 4) /* Data.  */ \
+	       | (0 << 5) /* Ring 0.  */ | (1 << 7) /* Present.  */)
+	.byte (0xf /* Limit fxxxx.  */ | (0 << 4) /* AVL flag.  */ \
+	       | (0 << 5) /* Data.  */ | (0 << 6) \
+	       | (1 << 7) /* 4K granular.  */)
+	.byte 0x00 /* Base 00xxxxxx.  */
+
+	/* Compatibility segment.  */
+	.word 0xffff /* Limit xffff.  */
+	.word 0x0000 /* Base xxxx0000.  */
+	.byte 0x00 /* Base xx00xxxx.  */
+	.byte (0x8 /* Type 8.  */ | (1 << 4) /* Code.  */  \
+	       | (0 << 5) /* Ring 0.  */ | (1 << 7) /* Present.  */)
+	.byte (0xf /* Limit fxxxx.  */ | (0 << 4) /* AVL flag.  */ \
+	       | (0 << 5) /* 32-bit.  */ | (1 << 6) /* 32-bit.  */ \
+	       | (1 << 7) /* 4K granular.  */)
+	.byte 0x00 /* Base 00xxxxxx.  */
+
+	.p2align	4
+LOCAL(gdtdesc):
+	.word	0x20
+LOCAL(gdt_addr):
+#ifdef __x86_64__
+	/* Filled by the code. */
+	.quad	0
+#else
+	/* Filled by the code. */
+	.long	0
+#endif
+
+	.p2align	4
+LOCAL(jump_vector):
+	/* Jump location. Is filled by the code */
+#ifdef __x86_64__
+	.quad	0
+#else
+	.long	0
+#endif
+	.long	CODE64_SEGMENT
+
+VARIABLE(grub_relocator64_end)

From 73910decff8e257368636be617ee37d4c416b93b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 12 Jan 2010 17:50:11 +0100
Subject: [PATCH 0245/1628] Fix various bugs in *bsd. Freebsd64 on relocators

---
 include/grub/i386/bsd.h     |  6 ++-
 loader/i386/bsd.c           | 84 ++++++++++++++-----------------------
 loader/i386/bsdXX.c         | 46 +++++++++++---------
 loader/i386/bsd_pagetable.c | 19 +++++----
 4 files changed, 73 insertions(+), 82 deletions(-)

diff --git a/include/grub/i386/bsd.h b/include/grub/i386/bsd.h
index b37a86c7f..4f5d5d1ee 100644
--- a/include/grub/i386/bsd.h
+++ b/include/grub/i386/bsd.h
@@ -263,9 +263,11 @@ grub_err_t grub_freebsd_load_elfmodule_obj64 (struct grub_relocator *relocator,
 					      grub_file_t file, int argc,
 					      char *argv[],
 					      grub_addr_t *kern_end);
-grub_err_t grub_freebsd_load_elf_meta32 (grub_file_t file,
+grub_err_t grub_freebsd_load_elf_meta32 (struct grub_relocator *relocator,
+					 grub_file_t file,
 					 grub_addr_t *kern_end);
-grub_err_t grub_freebsd_load_elf_meta64 (grub_file_t file,
+grub_err_t grub_freebsd_load_elf_meta64 (struct grub_relocator *relocator,
+					 grub_file_t file,
 					 grub_addr_t *kern_end);
 
 grub_err_t grub_freebsd_add_meta (grub_uint32_t type, void *data,
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 9ee8a4b12..90cd8a9a4 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -436,12 +436,6 @@ grub_freebsd_list_modules (void)
 /* This function would be here but it's under different license. */
 #include "bsd_pagetable.c"
 
-struct gdt_descriptor
-{
-  grub_uint16_t limit;
-  void *base;
-} __attribute__ ((packed));
-
 static grub_err_t
 grub_freebsd_boot (void)
 {
@@ -499,15 +493,15 @@ grub_freebsd_boot (void)
     p_size = ALIGN_PAGE (kern_end + p_size + mod_buf_len) - kern_end;
 
   if (is_64bit)
-    p_size += 4096 * 4;
+    p_size += 4096 * 3;
 
   err = grub_relocator_alloc_chunk_addr (relocator, (void **) &p,
 					 kern_end, p_size);
   if (err)
     return err;
-  kern_end += p_size;
-  p0 = p;
   p_target = kern_end;
+  p0 = p;
+  kern_end += p_size;
 
   grub_env_iterate (iterate_env);
 
@@ -547,49 +541,30 @@ grub_freebsd_boot (void)
 
   if (is_64bit)
     {
-      grub_uint32_t *gdt;
-      grub_uint8_t *trampoline;
-      void (*launch_trampoline) (grub_addr_t entry_lo, ...)
-	__attribute__ ((cdecl, regparm (0)));
+      struct grub_relocator64_state state;
       grub_uint8_t *pagetable;
+      grub_uint32_t *stack;
+      grub_addr_t stack_target;
 
-      struct gdt_descriptor *gdtdesc;
+      err = grub_relocator_alloc_chunk_align (relocator, (void **) &stack,
+					      &stack_target,
+					      0x10000, 0x90000,
+					      3 * sizeof (grub_uint32_t)
+					      + sizeof (bi), 4);
+      if (err)
+	return err;
 
-      pagetable = p - 16384;
-      fill_bsd64_pagetable (pagetable);
+      pagetable = p - (4096 * 3);
+      fill_bsd64_pagetable (pagetable, (pagetable - p0) + p_target);
 
-      /* Create GDT. */
-      gdt = (grub_uint32_t *) (p - 4096);
-      gdt[0] = 0;
-      gdt[1] = 0;
-      gdt[2] = 0;
-      gdt[3] = 0x00209800;
-      gdt[4] = 0;
-      gdt[5] = 0x00008000;
+      state.cr3 = (pagetable - p0) + p_target;
+      state.rsp = stack_target;
+      state.rip = (((grub_uint64_t) entry_hi) << 32) | entry;
 
-      /* Create GDT descriptor. */
-      gdtdesc = (struct gdt_descriptor *) (p - 4096 + 24);
-      gdtdesc->limit = 24;
-      gdtdesc->base = gdt;
-
-      /* Prepare trampoline. */
-      trampoline = (grub_uint8_t *) (p - 4096 + 24
-				     + sizeof (struct gdt_descriptor));
-      launch_trampoline = (void  __attribute__ ((cdecl, regparm (0)))
-			   (*) (grub_addr_t entry_lo, ...)) trampoline;
-      grub_bsd64_trampoline_gdt = (grub_uint32_t) gdtdesc;
-      grub_bsd64_trampoline_selfjump
-	= (grub_uint32_t) (trampoline + 6
-			   + ((grub_uint8_t *) &grub_bsd64_trampoline_selfjump
-			      - &grub_bsd64_trampoline_start));
-
-      /* Copy trampoline. */
-      grub_memcpy (trampoline, &grub_bsd64_trampoline_start,
-		   &grub_bsd64_trampoline_end - &grub_bsd64_trampoline_start);
-
-      /* Launch trampoline. */
-      launch_trampoline (entry, entry_hi, pagetable, bi.bi_modulep,
-			 kern_end);
+      stack[0] = entry;
+      stack[1] = bi.bi_modulep;
+      stack[2] = kern_end;
+      return grub_relocator64_boot (relocator, state, 0, 0x40000000);
     }
   else
     {
@@ -936,7 +911,7 @@ grub_bsd_elf32_size_hook (grub_elf_t elf __attribute__ ((unused)),
 
   if (phdr->p_type != PT_LOAD
       && phdr->p_type != PT_DYNAMIC)
-      return 1;
+      return 0;
 
   paddr = phdr->p_paddr & 0xFFFFFF;
 
@@ -946,7 +921,7 @@ grub_bsd_elf32_size_hook (grub_elf_t elf __attribute__ ((unused)),
   if (paddr + phdr->p_memsz > kern_end)
     kern_end = paddr + phdr->p_memsz;
 
-  return 1;
+  return 0;
 }
 
 static grub_err_t
@@ -978,7 +953,7 @@ grub_bsd_elf64_size_hook (grub_elf_t elf __attribute__ ((unused)),
 
   if (phdr->p_type != PT_LOAD
       && phdr->p_type != PT_DYNAMIC)
-    return 1;
+    return 0;
 
   paddr = phdr->p_paddr & 0xffffff;
 
@@ -988,7 +963,7 @@ grub_bsd_elf64_size_hook (grub_elf_t elf __attribute__ ((unused)),
   if (paddr + phdr->p_memsz > kern_end)
     kern_end = paddr + phdr->p_memsz;
 
-  return 1;
+  return 0;
 }
 
 static grub_err_t
@@ -1054,6 +1029,9 @@ grub_bsd_load_elf (grub_elf_t elf)
       err = grub_elf64_phdr_iterate (elf, grub_bsd_elf64_size_hook, NULL);
       if (err)
 	return err;
+
+      grub_dprintf ("bsd", "kern_start = %x, kern_end = %x\n", kern_start,
+		    kern_end);
       err = grub_relocator_alloc_chunk_addr (relocator, &kern_chunk_src,
 					     kern_start, kern_end - kern_start);
       if (err)
@@ -1154,9 +1132,9 @@ grub_cmd_freebsd (grub_extcmd_t cmd, int argc, char *argv[])
 	    return grub_errno;
 
 	  if (is_64bit)
-	    err = grub_freebsd_load_elf_meta64 (file, &kern_end);
+	    err = grub_freebsd_load_elf_meta64 (relocator, file, &kern_end);
 	  else
-	    err = grub_freebsd_load_elf_meta32 (file, &kern_end);
+	    err = grub_freebsd_load_elf_meta32 (relocator, file, &kern_end);
 	  if (err)
 	    return err;
 
diff --git a/loader/i386/bsdXX.c b/loader/i386/bsdXX.c
index 2622287f9..8f5cfa750 100644
--- a/loader/i386/bsdXX.c
+++ b/loader/i386/bsdXX.c
@@ -249,24 +249,28 @@ SUFFIX (grub_freebsd_load_elfmodule) (struct grub_relocator *relocator,
   grub_freebsd_add_meta_module (argv[0], FREEBSD_MODTYPE_ELF_MODULE,
 				argc - 1, argv + 1, module,
 				curload - module);
-  return SUFFIX (grub_freebsd_load_elf_meta) (file, kern_end);
+  return SUFFIX (grub_freebsd_load_elf_meta) (relocator, file, kern_end);
 }
 
 #endif
 
 grub_err_t
-SUFFIX (grub_freebsd_load_elf_meta) (grub_file_t file, grub_addr_t *kern_end)
+SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator *relocator, 
+				     grub_file_t file, grub_addr_t *kern_end)
 {
   grub_err_t err;
   Elf_Ehdr e;
   Elf_Shdr *s;
   char *shdr;
   unsigned symoff, stroff, symsize, strsize;
-  grub_addr_t curload;
   grub_freebsd_addr_t symstart, symend, symentsize, dynamic;
   Elf_Sym *sym;
+  void *sym_chunk;
+  grub_uint8_t *curload;
+  grub_freebsd_addr_t symtarget;
   const char *str;
   unsigned i;
+  grub_size_t chunk_size;
 
   err = read_headers (file, &e, &shdr);
   if (err)
@@ -293,19 +297,24 @@ SUFFIX (grub_freebsd_load_elf_meta) (grub_file_t file, grub_addr_t *kern_end)
   stroff = s->sh_offset;
   strsize = s->sh_size;
 
-  if (*kern_end + 4 * sizeof (grub_freebsd_addr_t) + symsize + strsize
-      > grub_os_area_addr + grub_os_area_size)
-    return grub_error (GRUB_ERR_OUT_OF_RANGE,
-		       "not enough memory for kernel symbols");
+  chunk_size = 2 * sizeof (grub_freebsd_addr_t)
+    + ALIGN_UP (symsize + strsize, sizeof (grub_freebsd_addr_t));
+  symtarget = ALIGN_UP (*kern_end, sizeof (grub_freebsd_addr_t));
+  err = grub_relocator_alloc_chunk_addr (relocator, &sym_chunk,
+					 symtarget, chunk_size);
+  if (err)
+    return err;
 
-  symstart = curload = ALIGN_UP (*kern_end, sizeof (grub_freebsd_addr_t));
-  *((grub_freebsd_addr_t *) UINT_TO_PTR (curload)) = symsize;
+  symstart = symtarget;
+  symend = symstart + chunk_size;
+
+  curload = sym_chunk;
+  *((grub_freebsd_addr_t *) curload) = symsize;
   curload += sizeof (grub_freebsd_addr_t);
   if (grub_file_seek (file, symoff) == (grub_off_t) -1)
     return grub_errno;
-  sym = (Elf_Sym *) UINT_TO_PTR (curload);
-  if (grub_file_read (file, UINT_TO_PTR (curload), symsize) !=
-      (grub_ssize_t) symsize)
+  sym = (Elf_Sym *) curload;
+  if (grub_file_read (file, curload, symsize) != (grub_ssize_t) symsize)
     {
       if (! grub_errno)
 	return grub_error (GRUB_ERR_BAD_OS, "invalid ELF");
@@ -313,21 +322,17 @@ SUFFIX (grub_freebsd_load_elf_meta) (grub_file_t file, grub_addr_t *kern_end)
     }
   curload += symsize;
 
-  *((grub_freebsd_addr_t *) UINT_TO_PTR (curload)) = strsize;
+  *((grub_freebsd_addr_t *) curload) = strsize;
   curload += sizeof (grub_freebsd_addr_t);
   if (grub_file_seek (file, stroff) == (grub_off_t) -1)
     return grub_errno;
-  str = (char *) UINT_TO_PTR (curload);
-  if (grub_file_read (file, UINT_TO_PTR (curload), strsize)
-      != (grub_ssize_t) strsize)
+  str = (char *) curload;
+  if (grub_file_read (file, curload, strsize) != (grub_ssize_t) strsize)
     {
       if (! grub_errno)
 	return grub_error (GRUB_ERR_BAD_OS, "invalid ELF");
       return grub_errno;
     }
-  curload += strsize;
-  curload = ALIGN_UP (curload, sizeof (grub_freebsd_addr_t));
-  symend = curload;
 
   for (i = 0;
        i * symentsize < symsize;
@@ -360,7 +365,8 @@ SUFFIX (grub_freebsd_load_elf_meta) (grub_file_t file, grub_addr_t *kern_end)
 			       sizeof (symend));
   if (err)
     return err;
-  *kern_end = ALIGN_PAGE (curload);
+
+  *kern_end = ALIGN_PAGE (symend);
 
   return GRUB_ERR_NONE;
 }
diff --git a/loader/i386/bsd_pagetable.c b/loader/i386/bsd_pagetable.c
index 0fd393707..13348cc83 100644
--- a/loader/i386/bsd_pagetable.c
+++ b/loader/i386/bsd_pagetable.c
@@ -50,9 +50,10 @@
 
 
 static void
-fill_bsd64_pagetable (grub_uint8_t *target)
+fill_bsd64_pagetable (grub_uint8_t *src, grub_addr_t target)
 {
   grub_uint64_t *pt2, *pt3, *pt4;
+  grub_addr_t pt2t, pt3t, pt4t;
   int i;
 
 #define PG_V		0x001
@@ -60,11 +61,15 @@ fill_bsd64_pagetable (grub_uint8_t *target)
 #define PG_U		0x004
 #define PG_PS		0x080
 
-  pt4 = (grub_uint64_t *) target;
-  pt3 = (grub_uint64_t *) (target + 4096);
-  pt2 = (grub_uint64_t *) (target + 8192);
+  pt4 = (grub_uint64_t *) src;
+  pt3 = (grub_uint64_t *) (src + 4096);
+  pt2 = (grub_uint64_t *) (src + 8192);
 
-  grub_memset ((char *) target, 0, 4096 * 3);
+  pt4t = target;
+  pt3t = target + 4096;
+  pt2t = target + 8192;
+
+  grub_memset (src, 0, 4096 * 3);
 
   /*
    * This is kinda brutal, but every single 1GB VM memory segment points to
@@ -74,11 +79,11 @@ fill_bsd64_pagetable (grub_uint8_t *target)
   for (i = 0; i < 512; i++)
     {
       /* Each slot of the level 4 pages points to the same level 3 page */
-      pt4[i] = (grub_addr_t) &pt3[0];
+      pt4[i] = (grub_addr_t) pt3t;
       pt4[i] |= PG_V | PG_RW | PG_U;
 
       /* Each slot of the level 3 pages points to the same level 2 page */
-      pt3[i] = (grub_addr_t) &pt2[0];
+      pt3[i] = (grub_addr_t) pt2t;
       pt3[i] |= PG_V | PG_RW | PG_U;
 
       /* The level 2 page slots are mapped with 2MB pages for 1GB. */

From 611f8f0eb94204d907ef908d0301a6fd3c815594 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 12 Jan 2010 17:57:04 +0100
Subject: [PATCH 0246/1628] Remove unused BSD helpers

---
 conf/i386-coreboot.rmk       |   2 +-
 conf/i386-pc.rmk             |   2 +-
 loader/i386/bsd_helper.S     |  45 -------------
 loader/i386/bsd_trampoline.S | 124 -----------------------------------
 4 files changed, 2 insertions(+), 171 deletions(-)
 delete mode 100644 loader/i386/bsd_helper.S
 delete mode 100644 loader/i386/bsd_trampoline.S

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index d73c9f0e2..8676aaea3 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -163,7 +163,7 @@ aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For bsd.mod
 pkglib_MODULES += bsd.mod
-bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c loader/i386/bsd_helper.S loader/i386/bsd_trampoline.S
+bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c
 bsd_mod_CFLAGS = $(COMMON_CFLAGS)
 bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
 bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index c155047f6..36ca76950 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -264,7 +264,7 @@ aout_mod_CFLAGS = $(COMMON_CFLAGS)
 aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For bsd.mod
-bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c loader/i386/bsd_helper.S loader/i386/bsd_trampoline.S
+bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c
 bsd_mod_CFLAGS = $(COMMON_CFLAGS)
 bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
 bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
diff --git a/loader/i386/bsd_helper.S b/loader/i386/bsd_helper.S
deleted file mode 100644
index 25aee3a80..000000000
--- a/loader/i386/bsd_helper.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2005,2006,2007,2008, 2009 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/symbol.h>
-
-	.p2align	2
-
-
-	.code32
-
-/*
- * Use cdecl calling convention for *BSD kernels.
- */
-
-FUNCTION(grub_unix_real_boot)
-
-	/* Interrupts should be disabled.  */
-        cli
-
-	/* Discard `grub_unix_real_boot' return address.  */
-        popl    %eax
-
-        /* Fetch `entry' address ...  */
-        popl	%eax
-
-        /*
-         * ... and put our return address in its place. The kernel will
-         * ignore it, but it expects %esp to point to it.
-         */
-        call	*%eax
diff --git a/loader/i386/bsd_trampoline.S b/loader/i386/bsd_trampoline.S
deleted file mode 100644
index a568fff4d..000000000
--- a/loader/i386/bsd_trampoline.S
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (c) 2003  Peter Wemm <peter@FreeBSD.org>
- *  Copyright (C) 2009  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/>.
- */
-
-/* Based on the code from FreeBSD originally distributed under the
-   following terms: */
-
-/*-
- * Copyright (c) 2003  Peter Wemm <peter@FreeBSD.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-
-#define MSR_EFER	0xc0000080
-#define EFER_LME	0x00000100
-#define CR4_PAE		0x00000020
-#define CR4_PSE		0x00000010
-#define CR0_PG		0x80000000
-
-#include <grub/symbol.h>
-
-	.p2align	2
-
-	.code32
-
-
-VARIABLE(grub_bsd64_trampoline_start)
-
-	/* Discard `grub_unix_real_boot' return address.  */
-        popl    %eax
-
-        /* entry  */
-        popl	%edi
-
-        /* entry_hi  */
-        popl	%esi
-
-	cli
-
-	/* Turn on EFER.LME.  */
-	movl	$MSR_EFER, %ecx
-	rdmsr
-	orl	$EFER_LME, %eax
-        wrmsr
-
-	/* Turn on PAE.  */
-	movl	%cr4, %eax
-	orl	$(CR4_PAE | CR4_PSE), %eax
-	movl	%eax, %cr4
-
-	/* Set %cr3 for PT4.  */
-	popl	%eax
-	movl    %eax, %cr3
-
-	/* Push a dummy return address.  */
-	pushl	%eax
-
-	/* Turn on paging (implicitly sets EFER.LMA).  */
-	movl	%cr0, %eax
-	orl	$CR0_PG, %eax
-	movl	%eax, %cr0
-
-	/* Now we're in compatibility mode. set %cs for long mode.  */
-	/* lgdt */
-	.byte 0x0f
-	.byte 0x01
-	.byte 0x15
-VARIABLE (grub_bsd64_trampoline_gdt)
-	.long 0x0
-
-	/* ljmp */
-	.byte 0xea
-VARIABLE (grub_bsd64_trampoline_selfjump)
-	.long 0x0
-	.word 0x08
-
-	.code64
-
-bsd64_longmode:
-         /* We're still running V=P, jump to entry point.  */
-	movl	%esi, %eax
-	salq	$32, %rax
-	orq	%rdi, %rax
-	pushq	%rax
-	ret
-VARIABLE(grub_bsd64_trampoline_end)

From bd719e5a73757956671a640c5897a842a739d773 Mon Sep 17 00:00:00 2001
From: carles <carles@pinux>
Date: Tue, 12 Jan 2010 20:37:45 +0000
Subject: [PATCH 0247/1628] 2010-01-12  Carles Pina i Estany  <carles@pina.cat>

	* Makefile.in (DUSE_ASCII_FAILBACK): New macro.
---
 ChangeLog.kernel-font | 4 ++++
 Makefile.in           | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog.kernel-font b/ChangeLog.kernel-font
index 36c3b695b..69e3dafe8 100644
--- a/ChangeLog.kernel-font
+++ b/ChangeLog.kernel-font
@@ -1,3 +1,7 @@
+2010-01-12  Carles Pina i Estany  <carles@pina.cat>
+
+	* Makefile.in (DUSE_ASCII_FAILBACK): New macro.
+
 2010-01-11  Carles Pina i Estany  <carles@pina.cat>
 
 	* font/font.c (GENERATE_ASCII): Change the name to USE_ASCII_FAILBACK.
diff --git a/Makefile.in b/Makefile.in
index ff59c4efd..c551a0d79 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -251,6 +251,8 @@ font/ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
 
 font/ascii.h: font/ascii.bitmaps grub-bin2h
 	$(builddir)/grub-bin2h ascii_bitmaps < font/ascii.bitmaps > font/ascii.h
+
+TARGET_CFLAGS += -DUSE_ASCII_FAILBACK=1
 endif
 endif
 

From 49a716be3b0b089763745cb3322f05dbb1f7c65f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 12 Jan 2010 22:14:26 +0100
Subject: [PATCH 0248/1628] Possibility to prefer higher or lower chunks in
 relocator

---
 include/grub/relocator.h    |  7 ++++++-
 lib/i386/relocator.c        |  6 ++++--
 lib/relocator.c             | 21 +++++++++++++++++----
 loader/i386/bsd.c           |  9 ++++++---
 loader/i386/linux.c         |  6 ++----
 loader/i386/multiboot.c     |  3 ++-
 loader/i386/multiboot_mbi.c |  3 ++-
 loader/xnu_resume.c         |  3 ++-
 8 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/include/grub/relocator.h b/include/grub/relocator.h
index 2ea74b775..32bab7053 100644
--- a/include/grub/relocator.h
+++ b/include/grub/relocator.h
@@ -34,7 +34,12 @@ grub_err_t
 grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src, 
 				  grub_addr_t *target,
 				  grub_addr_t min_addr, grub_addr_t max_addr,
-				  grub_size_t size, grub_size_t align);
+				  grub_size_t size, grub_size_t align,
+				  int preference);
+
+#define GRUB_RELOCATOR_PREFERENCE_NONE 0
+#define GRUB_RELOCATOR_PREFERENCE_LOW 1
+#define GRUB_RELOCATOR_PREFERENCE_HIGH 2
 
 void
 grub_relocator_unload (struct grub_relocator *rel);
diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index e81dd8e1e..6e1e13b04 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -129,7 +129,8 @@ grub_relocator32_boot (struct grub_relocator *rel,
 
   err = grub_relocator_alloc_chunk_align (rel, &src, &target, 0,
 					  (0xffffffff - RELOCATOR_SIZEOF (32))
-					  + 1, RELOCATOR_SIZEOF (32), 16);
+					  + 1, RELOCATOR_SIZEOF (32), 16,
+					  GRUB_RELOCATOR_PREFERENCE_NONE);
   if (err)
     return err;
 
@@ -166,7 +167,8 @@ grub_relocator64_boot (struct grub_relocator *rel,
 
   err = grub_relocator_alloc_chunk_align (rel, &src, &target, min_addr,
 					  max_addr - RELOCATOR_SIZEOF (64),
-					  RELOCATOR_SIZEOF (64), 16);
+					  RELOCATOR_SIZEOF (64), 16,
+					  GRUB_RELOCATOR_PREFERENCE_NONE);
   if (err)
     return err;
 
diff --git a/lib/relocator.c b/lib/relocator.c
index 3085932c5..a5b3c6daf 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -446,7 +446,8 @@ grub_err_t
 grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
 				  grub_addr_t *target,
 				  grub_addr_t min_addr, grub_addr_t max_addr,
-				  grub_size_t size, grub_size_t align)
+				  grub_size_t size, grub_size_t align,
+				  int preference)
 {
   grub_addr_t min_addr2 = 0, max_addr2;
   struct grub_relocator_chunk *chunk;
@@ -455,6 +456,11 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
   if (max_addr > ~size)
     max_addr = ~size;
 
+#ifdef GRUB_MACHINE_PCBIOS
+  if (min_addr < 0x1000)
+    min_addr = 0x1000;
+#endif
+
   grub_dprintf ("relocator", "chunks = %p\n", rel->chunks);
 
   chunk = grub_malloc (sizeof (struct grub_relocator_chunk));
@@ -462,7 +468,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
     return grub_errno;
 
   if (malloc_in_range (rel, min_addr, max_addr, align,
-		       size, &start, 1, 1))
+		       size, &start,
+		       preference != GRUB_RELOCATOR_PREFERENCE_HIGH, 1))
     {
       grub_dprintf ("relocator", "allocated 0x%llx/0x%llx\n",
 		    (unsigned long long) start, (unsigned long long) start);
@@ -500,7 +507,10 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
   while (0);
 
   /* FIXME: check memory map.  */
-  chunk->target = ALIGN_UP (min_addr, align);
+  if (preference == GRUB_RELOCATOR_PREFERENCE_HIGH)
+    chunk->target = ALIGN_DOWN (max_addr, align);
+  else
+    chunk->target = ALIGN_UP (min_addr, align);    
   while (1)
     {
       struct grub_relocator_chunk *chunk2;
@@ -514,7 +524,10 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
 	    || (chunk->target <= chunk2->target + chunk2->size
 		&& chunk2->target + chunk2->size < chunk->target + size))
 	  {
-	    chunk->target = ALIGN_UP (chunk2->target + chunk2->size, align);
+	    if (preference == GRUB_RELOCATOR_PREFERENCE_HIGH)
+	      chunk->target = ALIGN_DOWN (chunk2->target, align);
+	    else
+	      chunk->target = ALIGN_UP (chunk2->target + chunk2->size, align);
 	    break;
 	  }
       if (!chunk2)
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 90cd8a9a4..28bcde15e 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -550,7 +550,8 @@ grub_freebsd_boot (void)
 					      &stack_target,
 					      0x10000, 0x90000,
 					      3 * sizeof (grub_uint32_t)
-					      + sizeof (bi), 4);
+					      + sizeof (bi), 4,
+					      GRUB_RELOCATOR_PREFERENCE_NONE);
       if (err)
 	return err;
 
@@ -575,7 +576,8 @@ grub_freebsd_boot (void)
 					      &stack_target,
 					      0x10000, 0x90000,
 					      9 * sizeof (grub_uint32_t)
-					      + sizeof (bi), 4);
+					      + sizeof (bi), 4,
+					      GRUB_RELOCATOR_PREFERENCE_NONE);
       if (err)
 	return err;
       grub_memcpy (&stack[8], &bi, sizeof (bi));
@@ -798,7 +800,8 @@ grub_netbsd_boot (void)
 
   err = grub_relocator_alloc_chunk_align (relocator, (void **) &stack,
 					  &stack_target, 0x10000, 0x90000,
-					  7 * sizeof (grub_uint32_t), 4);
+					  7 * sizeof (grub_uint32_t), 4,
+					  GRUB_RELOCATOR_PREFERENCE_NONE);
   if (err)
     return err;
 
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index e8d06b0e7..b6298d0bb 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -943,9 +943,6 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   addr_min = (grub_addr_t) prot_mode_target + ((prot_mode_pages * 3) << 12)
              + page_align (size);
 
-  if (addr_max > grub_os_area_addr + grub_os_area_size)
-    addr_max = grub_os_area_addr + grub_os_area_size;
-
   /* Put the initrd as high as possible, 4KiB aligned.  */
   addr = (addr_max - size) & ~0xFFF;
 
@@ -957,7 +954,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
 
   err = grub_relocator_alloc_chunk_align (relocator, &initrd_mem,
 					  &initrd_mem_target,
-					  addr_min, addr, size, 0x1000);
+					  addr_min, addr, size, 0x1000,
+					  GRUB_RELOCATOR_PREFERENCE_HIGH);
   if (err)
     return err;
 
diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index c5a7f7f9d..2f9cc73c9 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -259,7 +259,8 @@ grub_module  (int argc, char *argv[])
   err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &module, 
 					  &target,
 					  0, (0xffffffff - size) + 1,
-					  size, MULTIBOOT_MOD_ALIGN);
+					  size, MULTIBOOT_MOD_ALIGN,
+					  GRUB_RELOCATOR_PREFERENCE_NONE);
   if (err)
     goto fail;
 
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index ddaca7a1b..4fc9a7ac1 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -125,7 +125,8 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
   err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, 
 					  (void **) &ptrorig, &ptrdest,
 					  0, 0xffffffff - bufsize,
-					  bufsize, 4);
+					  bufsize, 4,
+					  GRUB_RELOCATOR_PREFERENCE_NONE);
   if (err)
     return err;
 
diff --git a/loader/xnu_resume.c b/loader/xnu_resume.c
index a7d5fbad8..2d47df601 100644
--- a/loader/xnu_resume.c
+++ b/loader/xnu_resume.c
@@ -115,7 +115,8 @@ grub_xnu_resume (char *imagename)
 					  &target_image, 0,
 					  (0xffffffff - hibhead.image_size) + 1,
 					  hibhead.image_size,
-					  GRUB_XNU_PAGESIZE);
+					  GRUB_XNU_PAGESIZE,
+					  GRUB_RELOCATOR_PREFERENCE_NONE);
   if (err)
     {
       grub_file_close (file);

From cdab631686052592b70daf341d0ccd783a598592 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 12 Jan 2010 22:15:50 +0100
Subject: [PATCH 0249/1628] Relocator16 support

---
 conf/i386.rmk                 |   2 +-
 include/grub/i386/relocator.h |  15 +++
 lib/i386/relocator.c          |  51 ++++++++
 lib/i386/relocator16.S        | 225 ++++++++++++++++++++++++++++++++++
 4 files changed, 292 insertions(+), 1 deletion(-)
 create mode 100644 lib/i386/relocator16.S

diff --git a/conf/i386.rmk b/conf/i386.rmk
index 72ea6d465..2efd9895a 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -17,7 +17,7 @@ vga_text_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += relocator.mod
 relocator_mod_SOURCES = lib/relocator.c lib/i386/relocator32.S \
-	lib/i386/relocator64.S \
+	lib/i386/relocator64.S lib/i386/relocator16.S \
 	lib/i386/relocator_asm.S lib/i386/relocator.c
 relocator_mod_CFLAGS = $(COMMON_CFLAGS)
 relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
diff --git a/include/grub/i386/relocator.h b/include/grub/i386/relocator.h
index ac49dd29e..f32413a1b 100644
--- a/include/grub/i386/relocator.h
+++ b/include/grub/i386/relocator.h
@@ -34,6 +34,18 @@ struct grub_relocator32_state
   grub_uint32_t esi;
 };
 
+struct grub_relocator16_state
+{
+  grub_uint16_t cs;
+  grub_uint16_t ds;
+  grub_uint16_t es;
+  grub_uint16_t fs;
+  grub_uint16_t gs;
+  grub_uint16_t ss;
+  grub_uint16_t sp;
+  grub_uint16_t ip;
+};
+
 struct grub_relocator64_state
 {
   grub_uint64_t rsp;
@@ -46,6 +58,9 @@ struct grub_relocator64_state
   grub_addr_t cr3;
 };
 
+grub_err_t grub_relocator16_boot (struct grub_relocator *rel,
+				  struct grub_relocator16_state state);
+
 grub_err_t grub_relocator32_boot (struct grub_relocator *rel,
 				  struct grub_relocator32_state state);
 
diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index 6e1e13b04..5757bb6df 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -39,6 +39,17 @@ extern void *grub_relocator_forward_dest;
 extern void *grub_relocator_forward_src;
 extern grub_size_t grub_relocator_forward_chunk_size;
 
+extern grub_uint8_t grub_relocator16_start;
+extern grub_uint8_t grub_relocator16_end;
+extern grub_uint16_t grub_relocator16_cs;
+extern grub_uint16_t grub_relocator16_ip;
+extern grub_uint16_t grub_relocator16_ds;
+extern grub_uint16_t grub_relocator16_es;
+extern grub_uint16_t grub_relocator16_fs;
+extern grub_uint16_t grub_relocator16_gs;
+extern grub_uint16_t grub_relocator16_ss;
+extern grub_uint16_t grub_relocator16_sp;
+
 extern grub_uint8_t grub_relocator32_start;
 extern grub_uint8_t grub_relocator32_end;
 extern grub_uint32_t grub_relocator32_eax;
@@ -155,6 +166,46 @@ grub_relocator32_boot (struct grub_relocator *rel,
   return GRUB_ERR_NONE;
 }
 
+grub_err_t
+grub_relocator16_boot (struct grub_relocator *rel,
+		       struct grub_relocator16_state state)
+{
+  grub_addr_t target;
+  void *src;
+  grub_err_t err;
+  grub_addr_t relst;
+
+  err = grub_relocator_alloc_chunk_align (rel, &src, &target, 0,
+					  0xa0000 - RELOCATOR_SIZEOF (16),
+					  RELOCATOR_SIZEOF (16), 16,
+					  GRUB_RELOCATOR_PREFERENCE_NONE);
+  if (err)
+    return err;
+
+  grub_relocator16_cs = state.cs;  
+  grub_relocator16_ip = state.ip;
+
+  grub_relocator16_ds = state.ds;
+  grub_relocator16_es = state.es;
+  grub_relocator16_fs = state.fs;
+  grub_relocator16_gs = state.gs;
+
+  grub_relocator16_ss = state.ss;
+  grub_relocator16_sp = state.sp;
+
+  grub_memmove (src, &grub_relocator16_start, RELOCATOR_SIZEOF (16));
+
+  err = grub_relocator_prepare_relocs (rel, target, &relst);
+  if (err)
+    return err;
+
+  asm volatile ("cli");
+  ((void (*) (void)) relst) ();
+
+  /* Not reached.  */
+  return GRUB_ERR_NONE;
+}
+
 grub_err_t
 grub_relocator64_boot (struct grub_relocator *rel,
 		       struct grub_relocator64_state state,
diff --git a/lib/i386/relocator16.S b/lib/i386/relocator16.S
new file mode 100644
index 000000000..d35adecd8
--- /dev/null
+++ b/lib/i386/relocator16.S
@@ -0,0 +1,225 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009,2010  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/symbol.h>
+#include <grub/i386/memory.h>
+
+#ifdef __x86_64__
+#define RAX %rax
+#define RSI %rdi
+#else
+#define RAX %eax
+#define RSI %esi
+#endif
+
+/* The code segment of the protected mode.  */
+#define CODE_SEGMENT	0x08
+
+/* The data segment of the protected mode.  */
+#define DATA_SEGMENT	0x10
+
+#define PSEUDO_REAL_CSEG 0x18
+
+#define PSEUDO_REAL_DSEG 0x20
+
+	.p2align	4	/* force 16-byte alignment */
+
+VARIABLE(grub_relocator16_start)
+LOCAL(base):
+	/* %rax contains now our new 'base'.  */
+	mov	RAX, RSI
+	add	$(LOCAL(cont0) - LOCAL(base)), RAX
+	jmp	*RAX
+LOCAL(cont0):
+	lea	(LOCAL(cont1) - LOCAL(base)) (RSI, 1), RAX
+	movl	%eax, (LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
+
+	lea	(LOCAL(gdt) - LOCAL(base)) (RSI, 1), RAX
+	mov	RAX, (LOCAL(gdt_addr) - LOCAL(base)) (RSI, 1)
+
+	movl 	%esi, %eax
+	movw	%ax, (LOCAL (cs_base_bytes12) - LOCAL (base)) (RSI, 1)
+	shrl	$16, %eax
+	movb	%al, (LOCAL (cs_base_byte3) - LOCAL (base)) (RSI, 1)
+
+	/* Switch to compatibility mode. */
+
+	lgdt	(LOCAL(gdtdesc) - LOCAL(base)) (RSI, 1)
+
+	/* Update %cs.  */
+	ljmp	*(LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
+
+LOCAL(cont1):
+	.code32
+
+	/* Disable paging. */
+	movl	%cr0, %eax
+	andl	$(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax
+	movl	%eax, %cr0
+
+	/* Disable amd64. */
+	movl	$GRUB_MEMORY_CPU_AMD64_MSR, %ecx
+	rdmsr
+	andl	$(~GRUB_MEMORY_CPU_AMD64_MSR_ON), %eax
+	wrmsr
+
+	/* Turn off PAE. */
+	movl	%cr4, %eax
+	andl	$GRUB_MEMORY_CPU_CR4_PAE_ON, %eax
+	movl	%eax, %cr4
+
+	/* Update other registers. */
+	movl	$PSEUDO_REAL_DSEG, %eax
+	movl	%eax, %ds
+	movl	%eax, %es
+	movl	%eax, %fs
+	movl	%eax, %gs
+	movl	%eax, %ss
+
+	movl 	%esi, %eax
+	shrl	$4, %eax
+	movw	%ax, (LOCAL (segment) - LOCAL (base)) (RSI, 1)
+	
+	/* jump to a 16 bit segment */
+	ljmp	$PSEUDO_REAL_CSEG, $(LOCAL (cont2) - LOCAL(base))
+LOCAL(cont2):
+	.code16
+
+	/* clear the PE bit of CR0 */
+	movl	%cr0, %eax
+	andl 	$(~GRUB_MEMORY_CPU_CR0_PE_ON), %eax
+	movl	%eax, %cr0
+
+	/* flush prefetch queue, reload %cs */
+	/* ljmp  */
+	.byte	0xea
+	.word 	LOCAL(cont3)-LOCAL(base)
+LOCAL(segment):
+	.word	0
+
+LOCAL(cont3):
+	/* we are in real mode now
+	 * set up the real mode segment registers : DS, SS, ES
+	 */
+	/* movw imm16, %ax.  */
+	.byte	0xb8
+VARIABLE(grub_relocator16_ds)
+	.word	0
+	movw	%ax, %ds
+
+	/* movw imm16, %ax.  */
+	.byte	0xb8
+VARIABLE(grub_relocator16_es)
+	.word	0
+	movw	%ax, %es
+
+	/* movw imm16, %ax.  */
+	.byte	0xb8
+VARIABLE(grub_relocator16_fs)
+	.word	0
+	movw	%ax, %fs
+
+	/* movw imm16, %ax.  */
+	.byte	0xb8
+VARIABLE(grub_relocator16_gs)
+	.word	0
+	movw	%ax, %gs
+
+	/* movw imm16, %ax.  */
+	.byte	0xb8
+VARIABLE(grub_relocator16_ss)
+	.word	0
+	movw	%ax, %ss
+
+	/* movw imm16, %ax.  */
+	.byte	0xb8
+VARIABLE(grub_relocator16_sp)
+	.word	0
+	movw	%ax, %ss
+	
+	/* Cleared direction flag is of no problem with any current
+	   payload and makes this implementation easier.  */
+	cld
+
+	/* ljmp */
+	.byte	0xea
+VARIABLE(grub_relocator16_ip)
+	.word	0
+VARIABLE(grub_relocator16_cs)
+	.word	0
+
+	.code32
+
+	/* GDT. Copied from loader/i386/linux.c. */
+	.p2align	4
+LOCAL(gdt):
+	.word	0, 0
+	.byte	0, 0, 0, 0
+
+	/* -- code segment --
+	 * base = 0x00000000, limit = 0xFFFFF (4 KiB Granularity), present
+	 * type = 32bit code execute/read, DPL = 0
+	 */
+	.word	0xFFFF, 0
+	.byte 	0, 0x9A, 0xCF, 0
+
+	/* -- data segment --
+	 * base = 0x00000000, limit 0xFFFFF (4 KiB Granularity), present
+	 * type = 32 bit data read/write, DPL = 0
+	 */
+	.word	0xFFFF, 0
+	.byte	0, 0x92, 0xCF, 0
+
+	/* -- 16 bit real mode CS --
+	 * base = 0x00000000, limit 0x0FFFF (1 B Granularity), present
+	 * type = 16 bit code execute/read only/conforming, DPL = 0
+	 */
+	.word	0xFFFF
+LOCAL(cs_base_bytes12):
+	.word	0
+LOCAL(cs_base_byte3):
+	.byte	0
+
+	.byte	0x9E, 0, 0
+
+	/* -- 16 bit real mode DS --
+	 * base = 0x00000000, limit 0x0FFFF (1 B Granularity), present
+	 * type = 16 bit data read/write, DPL = 0
+	 */
+	.word	0xFFFF, 0
+	.byte	0, 0x92, 0, 0
+
+	.p2align	4
+LOCAL(gdtdesc):
+	.word	0x27
+LOCAL(gdt_addr):
+#ifdef __x86_64__
+	/* Filled by the code. */
+	.quad	0
+#else
+	/* Filled by the code. */
+	.long	0
+#endif
+
+	.p2align	4
+LOCAL(jump_vector):
+	/* Jump location. Is filled by the code */
+	.long	0
+	.long	CODE_SEGMENT
+
+VARIABLE(grub_relocator16_end)

From 14dacc815aa9a923ffe68c9e355ea38e7c90ce15 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 12 Jan 2010 22:16:33 +0100
Subject: [PATCH 0250/1628] Clarify type of cmd_line_ptr

---
 include/grub/i386/linux.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
index 8a5a84da3..ecda4ed94 100644
--- a/include/grub/i386/linux.h
+++ b/include/grub/i386/linux.h
@@ -124,7 +124,7 @@ struct linux_kernel_header
   grub_uint32_t bootsect_kludge;	/* obsolete */
   grub_uint16_t heap_end_ptr;		/* Free memory after setup end */
   grub_uint16_t pad1;			/* Unused */
-  char *cmd_line_ptr;			/* Points to the kernel command line */
+  grub_uint32_t cmd_line_ptr;		/* Points to the kernel command line */
   grub_uint32_t initrd_addr_max;        /* Highest address for initrd */
 } __attribute__ ((packed));
 

From c911e8791afe1cca5610d3b06aa6815a9ed845a2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 12 Jan 2010 22:17:26 +0100
Subject: [PATCH 0251/1628] Port linux16 to relocator framework

---
 include/grub/i386/loader.h |  37 ----------
 loader/i386/pc/linux.c     | 144 ++++++++++++++++++++++++-------------
 2 files changed, 93 insertions(+), 88 deletions(-)

diff --git a/include/grub/i386/loader.h b/include/grub/i386/loader.h
index 0df5f757f..e69de29bb 100644
--- a/include/grub/i386/loader.h
+++ b/include/grub/i386/loader.h
@@ -1,37 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2003,2004,2007,2008,2009  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/>.
- */
-
-#ifndef GRUB_LOADER_CPU_HEADER
-#define GRUB_LOADER_CPU_HEADER	1
-
-#include <grub/types.h>
-#include <grub/err.h>
-#include <grub/symbol.h>
-
-extern grub_addr_t EXPORT_VAR(grub_os_area_addr);
-extern grub_size_t EXPORT_VAR(grub_os_area_size);
-
-#ifdef GRUB_MACHINE_PCBIOS
-extern grub_uint32_t EXPORT_VAR(grub_linux_prot_size);
-extern char *EXPORT_VAR(grub_linux_tmp_addr);
-extern char *EXPORT_VAR(grub_linux_real_addr);
-extern grub_int32_t EXPORT_VAR(grub_linux_is_bzimage);
-grub_err_t EXPORT_FUNC(grub_linux16_boot) (void);
-#endif
-
-#endif /* ! GRUB_LOADER_CPU_HEADER */
diff --git a/loader/i386/pc/linux.c b/loader/i386/pc/linux.c
index 24bb39555..6c29029f2 100644
--- a/loader/i386/pc/linux.c
+++ b/loader/i386/pc/linux.c
@@ -31,6 +31,8 @@
 #include <grub/cpu/linux.h>
 #include <grub/command.h>
 #include <grub/i18n.h>
+#include <grub/mm.h>
+#include <grub/cpu/relocator.h>
 
 #define GRUB_LINUX_CL_OFFSET		0x9000
 #define GRUB_LINUX_CL_END_OFFSET	0x90FF
@@ -39,12 +41,34 @@ static grub_dl_t my_mod;
 
 static grub_size_t linux_mem_size;
 static int loaded;
+static struct grub_relocator *relocator = NULL;
+static grub_addr_t grub_linux_real_target;
+static char *grub_linux_real_chunk;
+static grub_size_t grub_linux16_prot_size;
+
+static grub_err_t
+grub_linux16_boot (void)
+{
+  grub_uint16_t segment;
+  struct grub_relocator16_state state;
+
+  segment = grub_linux_real_target >> 4;
+  state.gs = state.fs = state.es = state.ds = state.ss = segment;
+  state.sp = GRUB_LINUX_SETUP_STACK;
+  state.cs = segment + 0x20;
+  state.ip = 0;
+  
+  return grub_relocator16_boot (relocator, state);
+}
+
 
 static grub_err_t
 grub_linux_unload (void)
 {
   grub_dl_unref (my_mod);
   loaded = 0;
+  grub_relocator_unload (relocator);
+  relocator = NULL;
   return GRUB_ERR_NONE;
 }
 
@@ -55,10 +79,14 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   grub_file_t file = 0;
   struct linux_kernel_header lh;
   grub_uint8_t setup_sects;
-  grub_size_t real_size, prot_size;
+  grub_size_t real_size;
   grub_ssize_t len;
   int i;
   char *dest;
+  char *grub_linux_prot_chunk;
+  int grub_linux_is_bzimage;
+  grub_addr_t grub_linux_prot_target;
+  grub_err_t err;
 
   grub_dl_ref (my_mod);
 
@@ -72,14 +100,6 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   if (! file)
     goto fail;
 
-  if ((grub_size_t) grub_file_size (file) > grub_os_area_size)
-    {
-      grub_error (GRUB_ERR_OUT_OF_RANGE, "too big kernel (0x%x > 0x%x)",
-		  (grub_size_t) grub_file_size (file),
-		  grub_os_area_size);
-      goto fail;
-    }
-
   if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
     {
       grub_error (GRUB_ERR_READ_ERROR, "cannot read the Linux header");
@@ -109,12 +129,11 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
       lh.type_of_loader = GRUB_LINUX_BOOT_LOADER_TYPE;
 
       /* Put the real mode part at as a high location as possible.  */
-      grub_linux_real_addr
-	= (char *) UINT_TO_PTR (grub_mmap_get_lower ()
-				- GRUB_LINUX_SETUP_MOVE_SIZE);
+      grub_linux_real_target = grub_mmap_get_lower () 
+	- GRUB_LINUX_SETUP_MOVE_SIZE;
       /* But it must not exceed the traditional area.  */
-      if (grub_linux_real_addr > (char *) GRUB_LINUX_OLD_REAL_MODE_ADDR)
-	grub_linux_real_addr = (char *) GRUB_LINUX_OLD_REAL_MODE_ADDR;
+      if (grub_linux_real_target > GRUB_LINUX_OLD_REAL_MODE_ADDR)
+	grub_linux_real_target = GRUB_LINUX_OLD_REAL_MODE_ADDR;
 
       if (grub_le_to_cpu16 (lh.version) >= 0x0201)
 	{
@@ -123,7 +142,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 	}
 
       if (grub_le_to_cpu16 (lh.version) >= 0x0202)
-	lh.cmd_line_ptr = grub_linux_real_addr + GRUB_LINUX_CL_OFFSET;
+	lh.cmd_line_ptr = grub_linux_real_target + GRUB_LINUX_CL_OFFSET;
       else
 	{
 	  lh.cl_magic = grub_cpu_to_le16 (GRUB_LINUX_CL_MAGIC);
@@ -139,7 +158,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 
       setup_sects = GRUB_LINUX_DEFAULT_SETUP_SECTS;
 
-      grub_linux_real_addr = (char *) GRUB_LINUX_OLD_REAL_MODE_ADDR;
+      grub_linux_real_target = GRUB_LINUX_OLD_REAL_MODE_ADDR;
     }
 
   /* If SETUP_SECTS is not set, set it to the default (4).  */
@@ -147,31 +166,36 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
     setup_sects = GRUB_LINUX_DEFAULT_SETUP_SECTS;
 
   real_size = setup_sects << GRUB_DISK_SECTOR_BITS;
-  prot_size = grub_file_size (file) - real_size - GRUB_DISK_SECTOR_SIZE;
-
-  grub_linux_tmp_addr = (char *) GRUB_LINUX_BZIMAGE_ADDR + prot_size;
+  grub_linux16_prot_size = grub_file_size (file)
+    - real_size - GRUB_DISK_SECTOR_SIZE;
 
   if (! grub_linux_is_bzimage
-      && ((char *) GRUB_LINUX_ZIMAGE_ADDR + prot_size > grub_linux_real_addr))
+      && GRUB_LINUX_ZIMAGE_ADDR + grub_linux16_prot_size
+      > grub_linux_real_target)
     {
       grub_error (GRUB_ERR_BAD_OS, "too big zImage (0x%x > 0x%x), use bzImage instead",
-		  (char *) GRUB_LINUX_ZIMAGE_ADDR + prot_size,
-		  (grub_size_t) grub_linux_real_addr);
+		  (char *) GRUB_LINUX_ZIMAGE_ADDR + grub_linux16_prot_size,
+		  (grub_size_t) grub_linux_real_target);
       goto fail;
     }
 
-  if (grub_linux_real_addr + GRUB_LINUX_SETUP_MOVE_SIZE
-      > (char *) UINT_TO_PTR (grub_mmap_get_lower ()))
+  if (grub_linux_real_target + GRUB_LINUX_SETUP_MOVE_SIZE
+      > grub_mmap_get_lower ())
     {
       grub_error (GRUB_ERR_OUT_OF_RANGE,
 		 "too small lower memory (0x%x > 0x%x)",
-		  grub_linux_real_addr + GRUB_LINUX_SETUP_MOVE_SIZE,
+		  grub_linux_real_target + GRUB_LINUX_SETUP_MOVE_SIZE,
 		  (int) grub_mmap_get_lower ());
       goto fail;
     }
 
   grub_printf ("   [Linux-%s, setup=0x%x, size=0x%x]\n",
-	       grub_linux_is_bzimage ? "bzImage" : "zImage", real_size, prot_size);
+	       grub_linux_is_bzimage ? "bzImage" : "zImage", real_size,
+	       grub_linux16_prot_size);
+
+  relocator = grub_relocator_new ();
+  if (!relocator)
+    goto fail;
 
   for (i = 1; i < argc; i++)
     if (grub_memcmp (argv[i], "vga=", 4) == 0)
@@ -229,11 +253,18 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 	  }
       }
 
+  err = grub_relocator_alloc_chunk_addr (relocator, (void **)
+					 &grub_linux_real_chunk,
+					 grub_linux_real_target,
+					 GRUB_LINUX_SETUP_MOVE_SIZE);
+  if (err)
+    return err;
+
   /* Put the real mode code at the temporary address.  */
-  grub_memmove (grub_linux_tmp_addr, &lh, sizeof (lh));
+  grub_memmove (grub_linux_real_chunk, &lh, sizeof (lh));
 
   len = real_size + GRUB_DISK_SECTOR_SIZE - sizeof (lh);
-  if (grub_file_read (file, grub_linux_tmp_addr + sizeof (lh), len) != len)
+  if (grub_file_read (file, grub_linux_real_chunk + sizeof (lh), len) != len)
     {
       grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file");
       goto fail;
@@ -242,21 +273,21 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   if (lh.header != grub_cpu_to_le32 (GRUB_LINUX_MAGIC_SIGNATURE)
       || grub_le_to_cpu16 (lh.version) < 0x0200)
     /* Clear the heap space.  */
-    grub_memset (grub_linux_tmp_addr
+    grub_memset (grub_linux_real_chunk
 		 + ((setup_sects + 1) << GRUB_DISK_SECTOR_BITS),
 		 0,
 		 ((GRUB_LINUX_MAX_SETUP_SECTS - setup_sects - 1)
 		  << GRUB_DISK_SECTOR_BITS));
 
   /* Specify the boot file.  */
-  dest = grub_stpcpy (grub_linux_tmp_addr + GRUB_LINUX_CL_OFFSET,
+  dest = grub_stpcpy (grub_linux_real_chunk + GRUB_LINUX_CL_OFFSET,
 		      "BOOT_IMAGE=");
   dest = grub_stpcpy (dest, argv[0]);
 
   /* Copy kernel parameters.  */
   for (i = 1;
        i < argc
-	 && dest + grub_strlen (argv[i]) + 1 < (grub_linux_tmp_addr
+	 && dest + grub_strlen (argv[i]) + 1 < (grub_linux_real_chunk
 						+ GRUB_LINUX_CL_END_OFFSET);
        i++)
     {
@@ -264,14 +295,25 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
       dest = grub_stpcpy (dest, argv[i]);
     }
 
-  len = prot_size;
-  if (grub_file_read (file, (void *) GRUB_LINUX_BZIMAGE_ADDR, len) != len)
+  if (grub_linux_is_bzimage)
+    grub_linux_prot_target = GRUB_LINUX_BZIMAGE_ADDR;
+  else
+    grub_linux_prot_target = GRUB_LINUX_ZIMAGE_ADDR;
+  err = grub_relocator_alloc_chunk_addr (relocator,
+					 (void **) &grub_linux_prot_chunk,
+					 grub_linux_prot_target,
+					 grub_linux16_prot_size);
+  if (err)
+    return err;
+
+  len = grub_linux16_prot_size;
+  if (grub_file_read (file, grub_linux_prot_chunk, grub_linux16_prot_size)
+      != (grub_ssize_t) grub_linux16_prot_size)
     grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file");
 
   if (grub_errno == GRUB_ERR_NONE)
     {
-      grub_linux_prot_size = prot_size;
-      grub_loader_set (grub_linux16_boot, grub_linux_unload, 1);
+      grub_loader_set (grub_linux16_boot, grub_linux_unload, 0);
       loaded = 1;
     }
 
@@ -284,6 +326,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
     {
       grub_dl_unref (my_mod);
       loaded = 0;
+      grub_relocator_unload (relocator);
     }
 
   return grub_errno;
@@ -295,8 +338,11 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
 {
   grub_file_t file = 0;
   grub_ssize_t size;
-  grub_addr_t addr_max, addr_min, addr;
+  grub_addr_t addr_max, addr_min;
   struct linux_kernel_header *lh;
+  grub_uint8_t *initrd_chunk;
+  grub_addr_t initrd_addr;
+  grub_err_t err;
 
   if (argc == 0)
     {
@@ -310,7 +356,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
       goto fail;
     }
 
-  lh = (struct linux_kernel_header *) grub_linux_tmp_addr;
+  lh = (struct linux_kernel_header *) grub_linux_real_chunk;
 
   if (!(lh->header == grub_cpu_to_le32 (GRUB_LINUX_MAGIC_SIGNATURE)
 	&& grub_le_to_cpu16 (lh->version) >= 0x0200))
@@ -342,10 +388,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
      worse than that of Linux 2.3.xx, so avoid the last 64kb.  */
   addr_max -= 0x10000;
 
-  if (addr_max > grub_os_area_addr + grub_os_area_size)
-    addr_max = grub_os_area_addr + grub_os_area_size;
-
-  addr_min = (grub_addr_t) grub_linux_tmp_addr + GRUB_LINUX_CL_END_OFFSET;
+  addr_min = GRUB_LINUX_BZIMAGE_ADDR + grub_linux16_prot_size;
 
   file = grub_file_open (argv[0]);
   if (!file)
@@ -353,22 +396,21 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
 
   size = grub_file_size (file);
 
-  /* Put the initrd as high as possible, 4KiB aligned.  */
-  addr = (addr_max - size) & ~0xFFF;
+  err = grub_relocator_alloc_chunk_align (relocator, (void **) &initrd_chunk,
+					  &initrd_addr,
+					  addr_min, addr_max - size,
+					  size, 0x1000,
+					  GRUB_RELOCATOR_PREFERENCE_HIGH);
+  if (err)
+    return err;
 
-  if (addr < addr_min)
-    {
-      grub_error (GRUB_ERR_OUT_OF_RANGE, "the initrd is too big");
-      goto fail;
-    }
-
-  if (grub_file_read (file, (void *) addr, size) != size)
+  if (grub_file_read (file, initrd_chunk, size) != size)
     {
       grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file");
       goto fail;
     }
 
-  lh->ramdisk_image = addr;
+  lh->ramdisk_image = initrd_addr;
   lh->ramdisk_size = size;
 
  fail:

From 1b86596ae19abef99da535cefc70305b64f501f7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 12 Jan 2010 22:17:44 +0100
Subject: [PATCH 0252/1628] Remove OS area

---
 kern/i386/pc/init.c | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/kern/i386/pc/init.c b/kern/i386/pc/init.c
index 3885bba7a..382e097e4 100644
--- a/kern/i386/pc/init.c
+++ b/kern/i386/pc/init.c
@@ -43,9 +43,6 @@ struct mem_region
 static struct mem_region mem_regions[MAX_REGIONS];
 static int num_regions;
 
-grub_addr_t grub_os_area_addr;
-grub_size_t grub_os_area_size;
-
 void
 grub_arch_sync_caches (void *address __attribute__ ((unused)),
 		       grub_size_t len __attribute__ ((unused)))
@@ -186,25 +183,9 @@ grub_machine_init (void)
 
   compact_mem_regions ();
 
-  /* Add the memory regions to free memory, except for the region starting
-     from 1MB. This region is partially used for loading OS images.
-     For now, 1/4 of this is added to free memory.  */
   for (i = 0; i < num_regions; i++)
-    /*    if (mem_regions[i].addr == 0x100000)
-      {
-	grub_size_t quarter = mem_regions[i].size >> 2;
-
-	grub_os_area_addr = mem_regions[i].addr;
-	grub_os_area_size = mem_regions[i].size - quarter;
-	grub_mm_init_region ((void *) (grub_os_area_addr + grub_os_area_size),
-			     quarter);
-      }
-      else*/
       grub_mm_init_region ((void *) mem_regions[i].addr, mem_regions[i].size);
 
-  //  if (! grub_os_area_addr)
-  //grub_fatal ("no upper memory");
-
   grub_tsc_init ();
 }
 

From e6e7b4ea1f4d29fd17a72cf891e604d4af0e1ad3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 12 Jan 2010 22:22:36 +0100
Subject: [PATCH 0253/1628] Remove i386/loader.h

---
 include/grub/i386/loader.h    | 0
 include/grub/i386/pc/loader.h | 1 -
 loader/i386/bsd.c             | 1 -
 loader/i386/bsdXX.c           | 1 -
 4 files changed, 3 deletions(-)
 delete mode 100644 include/grub/i386/loader.h

diff --git a/include/grub/i386/loader.h b/include/grub/i386/loader.h
deleted file mode 100644
index e69de29bb..000000000
diff --git a/include/grub/i386/pc/loader.h b/include/grub/i386/pc/loader.h
index 3e031413b..bfbcaac5a 100644
--- a/include/grub/i386/pc/loader.h
+++ b/include/grub/i386/pc/loader.h
@@ -20,7 +20,6 @@
 #define GRUB_LOADER_MACHINE_HEADER	1
 
 #include <grub/symbol.h>
-#include <grub/cpu/loader.h>
 
 /* This is an asm part of the chainloader.  */
 void EXPORT_FUNC(grub_chainloader_real_boot) (int drive, void *part_addr) __attribute__ ((noreturn));
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 28bcde15e..9c42f6a5c 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -17,7 +17,6 @@
  */
 
 #include <grub/loader.h>
-#include <grub/cpu/loader.h>
 #include <grub/cpu/bsd.h>
 #include <grub/i386/cpuid.h>
 #include <grub/machine/init.h>
diff --git a/loader/i386/bsdXX.c b/loader/i386/bsdXX.c
index 8f5cfa750..ad6c1bc75 100644
--- a/loader/i386/bsdXX.c
+++ b/loader/i386/bsdXX.c
@@ -3,7 +3,6 @@
 #include <grub/mm.h>
 #include <grub/elf.h>
 #include <grub/misc.h>
-#include <grub/i386/loader.h>
 #include <grub/cpu/relocator.h>
 
 #define ALIGN_PAGE(a)	ALIGN_UP (a, 4096)

From e39029dd1ea7c7aa9718940da2baecd3712bf21f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 12 Jan 2010 22:24:41 +0100
Subject: [PATCH 0254/1628] Remove i386/loader.S

---
 kern/i386/loader.S     | 120 -----------------------------------------
 kern/i386/pc/startup.S |   2 -
 2 files changed, 122 deletions(-)
 delete mode 100644 kern/i386/loader.S

diff --git a/kern/i386/loader.S b/kern/i386/loader.S
deleted file mode 100644
index 3e9c71327..000000000
--- a/kern/i386/loader.S
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2005,2006,2007,2008 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/>.
- */
-
-
-/*
- * Note: These functions defined in this file may be called from C.
- *       Be careful of that you must not modify some registers. Quote
- *       from gcc-2.95.2/gcc/config/i386/i386.h:
-
-   1 for registers not available across function calls.
-   These must include the FIXED_REGISTERS and also any
-   registers that can be used without being saved.
-   The latter must include the registers where values are returned
-   and the register where structure-value addresses are passed.
-   Aside from that, you can include as many other registers as you like.
-
-  ax,dx,cx,bx,si,di,bp,sp,st,st1,st2,st3,st4,st5,st6,st7,arg
-{  1, 1, 1, 0, 0, 0, 0, 1, 1,  1,  1,  1,  1,  1,  1,  1,  1 }
- */
-
-/*
- * Note: GRUB is compiled with the options -mrtd and -mregparm=3.
- *       So the first three arguments are passed in %eax, %edx, and %ecx,
- *       respectively, and if a function has a fixed number of arguments
- *       and the number if greater than three, the function must return
- *       with "ret $N" where N is ((the number of arguments) - 3) * 4.
- */
-
-/*
- *  This is the area for all of the special variables.
- */
-
-	.p2align	2	/* force 4-byte alignment */
-
-/*
- * void grub_linux_boot_zimage (void)
- */
-VARIABLE(grub_linux_prot_size)
-	.long	0
-VARIABLE(grub_linux_tmp_addr)
-	.long	0
-VARIABLE(grub_linux_real_addr)
-	.long	0
-VARIABLE(grub_linux_is_bzimage)
-	.long	0
-
-FUNCTION(grub_linux16_boot)
-	/* Must be done before zImage copy.  */
-	call	EXT_C(grub_dl_unload_all)
-
-	movl	EXT_C(grub_linux_is_bzimage), %ebx
-	test	%ebx, %ebx
-	jne bzimage
-
-	/* copy the kernel */
-	movl	EXT_C(grub_linux_prot_size), %ecx
-	addl	$3, %ecx
-	shrl	$2, %ecx
-	movl	$GRUB_LINUX_BZIMAGE_ADDR, %esi
-	movl	$GRUB_LINUX_ZIMAGE_ADDR, %edi
-	cld
-	rep
-	movsl
-
-bzimage:
-	movl	EXT_C(grub_linux_real_addr), %ebx
-
-	/* copy the real mode code */
-	movl	EXT_C(grub_linux_tmp_addr), %esi
-	movl	%ebx, %edi
-	movl	$GRUB_LINUX_SETUP_MOVE_SIZE, %ecx
-	cld
-	rep
-	movsb
-
-	/* change %ebx to the segment address */
-	shrl	$4, %ebx
-	movl	%ebx, %eax
-	addl	$0x20, %eax
-	movw	%ax, linux_setup_seg
-
-	/* XXX new stack pointer in safe area for calling functions */
-	movl	$0x4000, %esp
-	call	EXT_C(grub_stop_floppy)
-
-	/* final setup for linux boot */
-	call	prot_to_real
-	.code16
-
-	cli
-	movw	%bx, %ss
-	movw	$GRUB_LINUX_SETUP_STACK, %sp
-
-	movw	%bx, %ds
-	movw	%bx, %es
-	movw	%bx, %fs
-	movw	%bx, %gs
-
-	/* ljmp */
-	.byte	0xea
-	.word	0
-linux_setup_seg:
-	.word	0
-	.code32
-
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index 23f3f398e..1a44792d5 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -564,8 +564,6 @@ FUNCTION(grub_chainloader_real_boot)
 	ljmp	$0, $GRUB_MEMORY_MACHINE_BOOT_LOADER_ADDR
 	.code32
 
-#include "../loader.S"
-
 /*
  *   int grub_biosdisk_rw_int13_extensions (int ah, int drive, void *dap)
  *

From 11aadbadfbff8c8235494c466f07e66d62a8e2ef Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 12 Jan 2010 23:03:56 +0100
Subject: [PATCH 0255/1628] fix compilation on coreboot

---
 conf/i386-coreboot.rmk              |  8 ++++----
 conf/i386-efi.rmk                   |  4 ++--
 conf/i386-ieee1275.rmk              |  6 +++---
 conf/i386-pc.rmk                    |  2 +-
 conf/powerpc-ieee1275.rmk           |  4 ++--
 conf/sparc64-ieee1275.rmk           |  4 ++--
 conf/x86_64-efi.rmk                 |  2 +-
 include/grub/i386/coreboot/loader.h |  1 -
 include/grub/i386/qemu/loader.h     |  1 -
 kern/i386/coreboot/init.c           | 18 +-----------------
 loader/i386/linux.c                 |  1 -
 loader/i386/multiboot.c             |  1 -
 12 files changed, 16 insertions(+), 36 deletions(-)
 delete mode 100644 include/grub/i386/coreboot/loader.h
 delete mode 100644 include/grub/i386/qemu/loader.h

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 8676aaea3..6b3d32847 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -32,10 +32,10 @@ kernel_img_SOURCES = kern/i386/coreboot/startup.S \
 	term/i386/pc/vga_text.c term/i386/vga_common.c \
 	symlist.c
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
+	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
 	machine/boot.h machine/console.h machine/init.h \
-	machine/memory.h machine/loader.h list.h handler.h command.h i18n.h
+	machine/memory.h list.h handler.h command.h i18n.h mm_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR),-Bstatic
@@ -76,10 +76,10 @@ kernel_img_SOURCES = kern/i386/qemu/startup.S \
 	term/i386/pc/vga_text.c term/i386/vga_common.c \
 	symlist.c
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
+	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
 	machine/boot.h machine/console.h machine/init.h \
-	machine/memory.h machine/loader.h list.h handler.h command.h i18n.h
+	machine/memory.h list.h handler.h command.h i18n.h mm_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR)
diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index f3281a1bc..673349858 100644
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -49,9 +49,9 @@ kernel_img_SOURCES = kern/i386/efi/startup.S kern/main.c kern/device.c \
 	kern/generic/rtc_get_time_ms.c \
 	kern/generic/millisleep.c
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
+	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	efi/efi.h efi/time.h efi/disk.h i386/pit.h list.h handler.h command.h i18n.h
+	efi/efi.h efi/time.h efi/disk.h i386/pit.h list.h handler.h command.h i18n.h mm_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 5c3a5aaf6..b9e192796 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -30,10 +30,10 @@ kernel_img_SOURCES = kern/i386/ieee1275/startup.S \
 	disk/ieee1275/ofdisk.c \
 	symlist.c
 kernel_img_HEADERS = cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
+	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	ieee1275/ieee1275.h machine/kernel.h machine/loader.h machine/memory.h \
-	list.h handler.h command.h i18n.h
+	ieee1275/ieee1275.h machine/kernel.h machine/memory.h \
+	list.h handler.h command.h i18n.h mm_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x10000,-Bstatic
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 36ca76950..6f7b4f26c 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -60,7 +60,7 @@ kernel_img_SOURCES = kern/i386/pc/startup.S \
 	term/i386/pc/console.c term/i386/vga_common.c \
 	symlist.c
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
+	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
 	machine/biosdisk.h machine/boot.h machine/console.h machine/init.h \
 	machine/memory.h machine/loader.h machine/vga.h machine/vbe.h \
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 854ad50b7..fd6230771 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -15,9 +15,9 @@ DEFSYMFILES += kernel_syms.lst
 
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
-	symbol.h term.h time.h types.h powerpc/libgcc.h loader.h partition.h \
+	symbol.h term.h time.h types.h powerpc/libgcc.h partition.h \
 	msdos_partition.h ieee1275/ieee1275.h machine/kernel.h handler.h list.h \
-	command.h i18n.h
+	command.h i18n.h mm_private.h
 
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
 	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 4ba098619..a056ddc67 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -27,11 +27,11 @@ MOSTLYCLEANFILES += symlist.c kernel_syms.lst
 DEFSYMFILES += kernel_syms.lst
 
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
+	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
 	list.h handler.h command.h i18n.h \
 	sparc64/libgcc.h ieee1275/ieee1275.h machine/kernel.h \
-	sparc64/ieee1275/ieee1275.h
+	sparc64/ieee1275/ieee1275.h mm_private.h
 kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c	\
 	kern/ieee1275/ieee1275.c kern/main.c kern/device.c		\
 	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c		\
diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 4f6ace057..19220610d 100644
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -51,7 +51,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
 	efi/efi.h efi/time.h efi/disk.h machine/loader.h i386/pit.h list.h \
-	handler.h command.h i18n.h
+	handler.h command.h i18n.h mm_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/include/grub/i386/coreboot/loader.h b/include/grub/i386/coreboot/loader.h
deleted file mode 100644
index d3f36bba5..000000000
--- a/include/grub/i386/coreboot/loader.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <grub/cpu/loader.h>
diff --git a/include/grub/i386/qemu/loader.h b/include/grub/i386/qemu/loader.h
deleted file mode 100644
index d3f36bba5..000000000
--- a/include/grub/i386/qemu/loader.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <grub/cpu/loader.h>
diff --git a/kern/i386/coreboot/init.c b/kern/i386/coreboot/init.c
index 550a2a60a..7d8b1270b 100644
--- a/kern/i386/coreboot/init.c
+++ b/kern/i386/coreboot/init.c
@@ -41,9 +41,6 @@
 extern char _start[];
 extern char _end[];
 
-grub_addr_t grub_os_area_addr;
-grub_size_t grub_os_area_size;
-
 grub_uint32_t
 grub_get_rtc (void)
 {
@@ -105,20 +102,7 @@ grub_machine_init (void)
 	  }
       }
 
-    if (addr == GRUB_MEMORY_MACHINE_UPPER_START
-	|| (addr >= GRUB_MEMORY_MACHINE_LOWER_SIZE
-	    && addr <= GRUB_MEMORY_MACHINE_UPPER_START
-	    && (addr + size > GRUB_MEMORY_MACHINE_UPPER_START)))
-      {
-	grub_size_t quarter = size >> 2;
-
-	grub_os_area_addr = addr;
-	grub_os_area_size = size - quarter;
-	grub_mm_init_region ((void *) (grub_os_area_addr + grub_os_area_size),
-			     quarter);
-      }
-    else
-      grub_mm_init_region ((void *) (grub_addr_t) addr, (grub_size_t) size);
+    grub_mm_init_region ((void *) (grub_addr_t) addr, (grub_size_t) size);
 
     return 0;
   }
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index b6298d0bb..ec6a5bb3b 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -18,7 +18,6 @@
 
 #include <grub/loader.h>
 #include <grub/machine/memory.h>
-#include <grub/machine/loader.h>
 #include <grub/normal.h>
 #include <grub/file.h>
 #include <grub/disk.h>
diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index 2f9cc73c9..be11fe20b 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -31,7 +31,6 @@
 #define UNSUPPORTED_FLAGS			0x0000fff0
 
 #include <grub/loader.h>
-#include <grub/machine/loader.h>
 #include <grub/multiboot.h>
 #include <grub/machine/init.h>
 #include <grub/machine/memory.h>

From 73f6ce4ab24fe5b7e1965402e62b8811014a4588 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 12 Jan 2010 23:30:52 +0100
Subject: [PATCH 0256/1628] x86_64 support for relocator

---
 conf/i386.rmk          |  2 +-
 conf/x86_64-efi.rmk    |  4 +++-
 lib/i386/relocator.c   | 28 +++++++++++++++++++++-------
 lib/i386/relocator16.S |  4 ++--
 lib/i386/relocator32.S |  2 +-
 lib/i386/relocator64.S |  4 ++--
 lib/relocator.c        | 16 ++++++++--------
 7 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/conf/i386.rmk b/conf/i386.rmk
index 2efd9895a..d7417f444 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -18,7 +18,7 @@ vga_text_mod_LDFLAGS = $(COMMON_LDFLAGS)
 pkglib_MODULES += relocator.mod
 relocator_mod_SOURCES = lib/relocator.c lib/i386/relocator32.S \
 	lib/i386/relocator64.S lib/i386/relocator16.S \
-	lib/i386/relocator_asm.S lib/i386/relocator.c
+	lib/$(target_cpu)/relocator_asm.S lib/i386/relocator.c
 relocator_mod_CFLAGS = $(COMMON_CFLAGS)
 relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
 relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 19220610d..36d6579de 100644
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -167,7 +167,9 @@ xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
 xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
 pkglib_MODULES += relocator.mod
-relocator_mod_SOURCES = lib/i386/relocator.c lib/i386/relocator_asm.S lib/i386/relocator_backward.S
+relocator_mod_SOURCES = lib/relocator.c lib/i386/relocator32.S \
+	lib/i386/relocator64.S lib/i386/relocator16.S \
+	lib/$(target_cpu)/relocator_asm.S lib/i386/relocator.c
 relocator_mod_CFLAGS = $(COMMON_CFLAGS)
 relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
 relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index 5757bb6df..d040c80ab 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -77,7 +77,11 @@ extern grub_addr_t grub_relocator64_cr3;
 grub_size_t grub_relocator_align = 1;
 grub_size_t grub_relocator_forward_size;
 grub_size_t grub_relocator_backward_size;
-grub_size_t grub_relocator_jumper_size = 10;
+#ifdef __x86_64__
+grub_size_t grub_relocator_jumper_size = 12;
+#else
+grub_size_t grub_relocator_jumper_size = 7;
+#endif
 
 void
 grub_cpu_relocator_init (void)
@@ -91,16 +95,26 @@ grub_cpu_relocator_jumper (void *rels, grub_addr_t addr)
 {
   grub_uint8_t *ptr;
   ptr = rels;
-  /* movl $addr, %eax (for relocator) */
+#ifdef __x86_64__
+  /* movq imm64, %rax (for relocator) */
+  *(grub_uint8_t *) ptr = 0x48;
+  ptr++;
+  *(grub_uint8_t *) ptr = 0xb8;
+  ptr++;
+  *(grub_uint64_t *) ptr = addr;
+  ptr += sizeof (grub_uint64_t);
+#else
+  /* movl imm32, %eax (for relocator) */
   *(grub_uint8_t *) ptr = 0xb8;
   ptr++;
   *(grub_uint32_t *) ptr = addr;
-  ptr += 4;
-  /* jmp $addr */
-  *(grub_uint8_t *) ptr = 0xe9;
+  ptr += sizeof (grub_uint32_t);
+#endif
+  /* jmp $eax/$rax */
+  *(grub_uint8_t *) ptr = 0xff;
+  ptr++;
+  *(grub_uint8_t *) ptr = 0xe0;
   ptr++;
-  *(grub_uint32_t *) ptr = addr - (grub_uint32_t) (ptr + 4);
-  ptr += 4;
 }
 
 void
diff --git a/lib/i386/relocator16.S b/lib/i386/relocator16.S
index d35adecd8..7d65e4dbe 100644
--- a/lib/i386/relocator16.S
+++ b/lib/i386/relocator16.S
@@ -21,7 +21,7 @@
 
 #ifdef __x86_64__
 #define RAX %rax
-#define RSI %rdi
+#define RSI %rsi
 #else
 #define RAX %eax
 #define RSI %esi
@@ -93,7 +93,7 @@ LOCAL(cont1):
 
 	movl 	%esi, %eax
 	shrl	$4, %eax
-	movw	%ax, (LOCAL (segment) - LOCAL (base)) (RSI, 1)
+	movw	%ax, (LOCAL (segment) - LOCAL (base)) (%esi, 1)
 	
 	/* jump to a 16 bit segment */
 	ljmp	$PSEUDO_REAL_CSEG, $(LOCAL (cont2) - LOCAL(base))
diff --git a/lib/i386/relocator32.S b/lib/i386/relocator32.S
index 4e0553c03..4f79151e2 100644
--- a/lib/i386/relocator32.S
+++ b/lib/i386/relocator32.S
@@ -21,7 +21,7 @@
 
 #ifdef __x86_64__
 #define RAX %rax
-#define RSI %rdi
+#define RSI %rsi
 #else
 #define RAX %eax
 #define RSI %esi
diff --git a/lib/i386/relocator64.S b/lib/i386/relocator64.S
index 42f61e32e..05627fb90 100644
--- a/lib/i386/relocator64.S
+++ b/lib/i386/relocator64.S
@@ -21,7 +21,7 @@
 
 #ifdef __x86_64__
 #define RAX %rax
-#define RSI %rdi
+#define RSI %rsi
 #else
 #define RAX %eax
 #define RSI %esi
@@ -82,7 +82,7 @@ VARIABLE(grub_relocator64_cr3)
 	.byte	0xb8
 VARIABLE(grub_relocator64_cr3)
 	.quad	0
-	movl	%rax, %cr3
+	movq	%rax, %cr3
 #endif
 	/* Load GDT. */
 	lgdt	(LOCAL(gdtdesc) - LOCAL(base)) (RSI, 1)
diff --git a/lib/relocator.c b/lib/relocator.c
index a5b3c6daf..84ead99b1 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -40,7 +40,7 @@ grub_relocator_new (void)
     
   ret->postchunks = ~(grub_addr_t) 0;
   ret->relocators_size = grub_relocator_jumper_size;
-  grub_dprintf ("relocator", "relocators_size=%d\n", ret->relocators_size);
+  grub_dprintf ("relocator", "relocators_size=%ld\n", ret->relocators_size);
   return ret;
 }
 
@@ -103,7 +103,7 @@ get_best_header (struct grub_relocator *rel,
 	    hb = h;
 	    hbp = hp;
 	    *best_addr = addr;
-	    grub_dprintf ("relocator", "picked %p/%x\n", hb, addr);
+	    grub_dprintf ("relocator", "picked %p/%lx\n", hb, addr);
 	  }
       }
     else
@@ -146,7 +146,7 @@ get_best_header (struct grub_relocator *rel,
 	    hb = h;
 	    hbp = hp;
 	    *best_addr = addr;
-	    grub_dprintf ("relocator", "picked %p/%x\n", hb, addr);
+	    grub_dprintf ("relocator", "picked %p/%lx\n", hb, addr);
 	  }
       }
   }
@@ -221,7 +221,7 @@ malloc_in_range (struct grub_relocator *rel,
   hb = get_best_header (rel, start, end, align, size, rb, &hbp, &best_addr,
 			from_low_priv, collisioncheck);
 
-  grub_dprintf ("relocator", "best header %p/%x\n", hb, best_addr);
+  grub_dprintf ("relocator", "best header %p/%lx\n", hb, best_addr);
 
   if (!hb)
     {
@@ -421,14 +421,14 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
 	rel->highestnonpostaddr = start + size;  
     }
 
-  grub_dprintf ("relocator", "relocators_size=%d\n", rel->relocators_size);
+  grub_dprintf ("relocator", "relocators_size=%ld\n", rel->relocators_size);
 
   if (start < target)
     rel->relocators_size += grub_relocator_backward_size;
   if (start > target)
     rel->relocators_size += grub_relocator_forward_size;
 
-  grub_dprintf ("relocator", "relocators_size=%d\n", rel->relocators_size);
+  grub_dprintf ("relocator", "relocators_size=%ld\n", rel->relocators_size);
 
   chunk->src = start;
   chunk->target = target;
@@ -485,7 +485,7 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
     }
 
   adjust_limits (rel, &min_addr2, &max_addr2, min_addr, max_addr);
-  grub_dprintf ("relocator", "Adjusted limits from %x-%x to %x-%x\n",
+  grub_dprintf ("relocator", "Adjusted limits from %lx-%lx to %lx-%lx\n",
 		min_addr, max_addr, min_addr2, max_addr2);
 
   do
@@ -572,7 +572,7 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
   grub_addr_t rels;
   grub_addr_t rels0;
 
-  grub_dprintf ("relocator", "Preparing relocs (size=%d)\n",
+  grub_dprintf ("relocator", "Preparing relocs (size=%ld)\n",
 		rel->relocators_size);
 
   if (!malloc_in_range (rel, 0, ~(grub_addr_t)0 - rel->relocators_size + 1,

From 37480ee490b0f52d160f0f79fecbbbd0f07e6afd Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 13:41:15 +0100
Subject: [PATCH 0257/1628] Added needed casts

---
 lib/relocator.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index 84ead99b1..889497334 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -40,7 +40,8 @@ grub_relocator_new (void)
     
   ret->postchunks = ~(grub_addr_t) 0;
   ret->relocators_size = grub_relocator_jumper_size;
-  grub_dprintf ("relocator", "relocators_size=%ld\n", ret->relocators_size);
+  grub_dprintf ("relocator", "relocators_size=%lu\n",
+		(unsigned long) ret->relocators_size);
   return ret;
 }
 
@@ -103,7 +104,8 @@ get_best_header (struct grub_relocator *rel,
 	    hb = h;
 	    hbp = hp;
 	    *best_addr = addr;
-	    grub_dprintf ("relocator", "picked %p/%lx\n", hb, addr);
+	    grub_dprintf ("relocator", "picked %p/%lx\n", hb,
+			  (unsigned long) addr);
 	  }
       }
     else
@@ -146,7 +148,8 @@ get_best_header (struct grub_relocator *rel,
 	    hb = h;
 	    hbp = hp;
 	    *best_addr = addr;
-	    grub_dprintf ("relocator", "picked %p/%lx\n", hb, addr);
+	    grub_dprintf ("relocator", "picked %p/%lx\n", hb,
+			  (unsigned long) addr);
 	  }
       }
   }
@@ -221,7 +224,8 @@ malloc_in_range (struct grub_relocator *rel,
   hb = get_best_header (rel, start, end, align, size, rb, &hbp, &best_addr,
 			from_low_priv, collisioncheck);
 
-  grub_dprintf ("relocator", "best header %p/%lx\n", hb, best_addr);
+  grub_dprintf ("relocator", "best header %p/%lx\n", hb,
+		(unsigned long) best_addr);
 
   if (!hb)
     {
@@ -421,14 +425,16 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
 	rel->highestnonpostaddr = start + size;  
     }
 
-  grub_dprintf ("relocator", "relocators_size=%ld\n", rel->relocators_size);
+  grub_dprintf ("relocator", "relocators_size=%ld\n",
+		(unsigned long) rel->relocators_size);
 
   if (start < target)
     rel->relocators_size += grub_relocator_backward_size;
   if (start > target)
     rel->relocators_size += grub_relocator_forward_size;
 
-  grub_dprintf ("relocator", "relocators_size=%ld\n", rel->relocators_size);
+  grub_dprintf ("relocator", "relocators_size=%ld\n",
+		(unsigned long) rel->relocators_size);
 
   chunk->src = start;
   chunk->target = target;
@@ -486,7 +492,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
 
   adjust_limits (rel, &min_addr2, &max_addr2, min_addr, max_addr);
   grub_dprintf ("relocator", "Adjusted limits from %lx-%lx to %lx-%lx\n",
-		min_addr, max_addr, min_addr2, max_addr2);
+		(unsigned long) min_addr, (unsigned long) max_addr,
+		(unsigned long) min_addr2, (unsigned long) max_addr2);
 
   do
     {
@@ -573,7 +580,7 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
   grub_addr_t rels0;
 
   grub_dprintf ("relocator", "Preparing relocs (size=%ld)\n",
-		rel->relocators_size);
+		(unsigned long) rel->relocators_size);
 
   if (!malloc_in_range (rel, 0, ~(grub_addr_t)0 - rel->relocators_size + 1,
 			grub_relocator_align,

From 19eb83d4860cb688e357e47eaebfde475da6b8c9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 14:02:32 +0100
Subject: [PATCH 0258/1628] Include i386.rmk into x86_64-efi.rmk

---
 conf/x86_64-efi.rmk | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 36d6579de..235cf2b3d 100644
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -77,11 +77,6 @@ acpi_mod_SOURCES = commands/acpi.c commands/efi/acpi.c
 acpi_mod_CFLAGS = $(COMMON_CFLAGS)
 acpi_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For ata.mod
-ata_mod_SOURCES = disk/ata.c
-ata_mod_CFLAGS = $(COMMON_CFLAGS)
-ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For mmap.mod.
 mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c \
 		   mmap/efi/mmap.c
@@ -99,7 +94,7 @@ appleldr_mod_CFLAGS = $(COMMON_CFLAGS)
 appleldr_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For linux.mod.
-linux_mod_SOURCES = loader/i386/efi/linux.c loader/i386/linux_trampoline.S
+linux_mod_SOURCES = loader/i386/linux.c
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
@@ -166,12 +161,5 @@ xnu_mod_CFLAGS = $(COMMON_CFLAGS)
 xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
 xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
-pkglib_MODULES += relocator.mod
-relocator_mod_SOURCES = lib/relocator.c lib/i386/relocator32.S \
-	lib/i386/relocator64.S lib/i386/relocator16.S \
-	lib/$(target_cpu)/relocator_asm.S lib/i386/relocator.c
-relocator_mod_CFLAGS = $(COMMON_CFLAGS)
-relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
-relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
+include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk

From ca732b36c1e0dcc4d7eee64628374ecfe5f925d3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 14:03:18 +0100
Subject: [PATCH 0259/1628] Video driver ID.

---
 include/grub/video.h | 10 ++++++++++
 video/efi_gop.c      |  1 +
 video/efi_uga.c      |  1 +
 video/i386/pc/vbe.c  |  1 +
 video/video.c        |  8 ++++++++
 5 files changed, 21 insertions(+)

diff --git a/include/grub/video.h b/include/grub/video.h
index 4145db465..985fa9208 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -159,10 +159,19 @@ struct grub_video_palette_data
   grub_uint8_t a; /* Reserved bits value (0-255).  */
 };
 
+typedef enum grub_video_driver_id
+  {
+    GRUB_VIDEO_DRIVER_NONE,
+    GRUB_VIDEO_DRIVER_VBE,
+    GRUB_VIDEO_DRIVER_EFI_UGA,
+    GRUB_VIDEO_DRIVER_EFI_GOP
+  } grub_video_driver_id_t;
+
 struct grub_video_adapter
 {
   /* The video adapter name.  */
   const char *name;
+  grub_video_driver_id_t id;
 
   /* Initialize the video adapter.  */
   grub_err_t (*init) (void);
@@ -309,5 +318,6 @@ grub_err_t grub_video_get_active_render_target (struct grub_video_render_target
 grub_err_t grub_video_set_mode (const char *modestring,
 				int NESTED_FUNC_ATTR (*hook) (grub_video_adapter_t p,
 							      struct grub_video_mode_info *mode_info));
+grub_video_driver_id_t grub_video_get_driver_id (void);
 
 #endif /* ! GRUB_VIDEO_HEADER */
diff --git a/video/efi_gop.c b/video/efi_gop.c
index 30863c1ed..13ef0ddae 100644
--- a/video/efi_gop.c
+++ b/video/efi_gop.c
@@ -353,6 +353,7 @@ grub_video_gop_get_info_and_fini (struct grub_video_mode_info *mode_info,
 static struct grub_video_adapter grub_video_gop_adapter =
   {
     .name = "EFI GOP driver",
+    .id = GRUB_VIDEO_DRIVER_EFI_GOP,
 
     .init = grub_video_gop_init,
     .fini = grub_video_gop_fini,
diff --git a/video/efi_uga.c b/video/efi_uga.c
index 12ca35cde..7ef7594cc 100644
--- a/video/efi_uga.c
+++ b/video/efi_uga.c
@@ -300,6 +300,7 @@ grub_video_uga_get_info_and_fini (struct grub_video_mode_info *mode_info,
 static struct grub_video_adapter grub_video_uga_adapter =
   {
     .name = "EFI UGA driver",
+    .id = GRUB_VIDEO_DRIVER_EFI_UGA,
 
     .init = grub_video_uga_init,
     .fini = grub_video_uga_fini,
diff --git a/video/i386/pc/vbe.c b/video/i386/pc/vbe.c
index 17d9b3282..918bab0b0 100644
--- a/video/i386/pc/vbe.c
+++ b/video/i386/pc/vbe.c
@@ -557,6 +557,7 @@ grub_video_vbe_get_info_and_fini (struct grub_video_mode_info *mode_info,
 static struct grub_video_adapter grub_video_vbe_adapter =
   {
     .name = "VESA BIOS Extension Video Driver",
+    .id = GRUB_VIDEO_DRIVER_VBE,
 
     .init = grub_video_vbe_init,
     .fini = grub_video_vbe_fini,
diff --git a/video/video.c b/video/video.c
index 682bebcbf..e678c2982 100644
--- a/video/video.c
+++ b/video/video.c
@@ -93,6 +93,14 @@ grub_video_get_info (struct grub_video_mode_info *mode_info)
   return grub_video_adapter_active->get_info (mode_info);
 }
 
+grub_video_driver_id_t
+grub_video_get_driver_id (void)
+{
+  if (! grub_video_adapter_active)
+    return GRUB_VIDEO_DRIVER_NONE;
+  return grub_video_adapter_active->id;
+}
+
 /* Get information about active video mode.  */
 grub_err_t
 grub_video_get_info_and_fini (struct grub_video_mode_info *mode_info,

From c8142599fc5d26cbd22a5dae5cc23738ee65c2e5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 14:03:54 +0100
Subject: [PATCH 0260/1628] Merge i386/efi/linux.c into i386/linux.c

---
 include/grub/i386/linux.h |   6 +-
 loader/i386/linux.c       | 184 ++++++++++++++++++++++++++++++++------
 2 files changed, 162 insertions(+), 28 deletions(-)

diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
index ecda4ed94..f2c93e419 100644
--- a/include/grub/i386/linux.h
+++ b/include/grub/i386/linux.h
@@ -79,9 +79,9 @@ struct grub_e820_mmap
   grub_uint32_t type;
 } __attribute__((packed));
 
-#define GRUB_VIDEO_TYPE_TEXT	0x01
-#define GRUB_VIDEO_TYPE_VLFB	0x23    /* VESA VGA in graphic mode     */
-#define GRUB_VIDEO_TYPE_EFI	0x70
+#define GRUB_VIDEO_LINUX_TYPE_EGA_TEXT	 0x01
+#define GRUB_VIDEO_LINUX_TYPE_VLFB	 0x23    /* VESA VGA in graphic mode     */
+#define GRUB_VIDEO_LINUX_TYPE_SIMPLE_LFB 0x70    /* Linear framebuffer without any additional functions.  */
 
 /* For the Linux/i386 boot protocol version 2.03.  */
 struct linux_kernel_header
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index ec6a5bb3b..691d0912d 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -18,6 +18,7 @@
 
 #include <grub/loader.h>
 #include <grub/machine/memory.h>
+#include <grub/memory.h>
 #include <grub/normal.h>
 #include <grub/file.h>
 #include <grub/disk.h>
@@ -31,11 +32,20 @@
 #include <grub/video.h>
 #include <grub/video_fb.h>
 #include <grub/command.h>
-#include <grub/i386/pc/vbe.h>
-#include <grub/i386/pc/console.h>
 #include <grub/i386/relocator.h>
 #include <grub/i18n.h>
 
+#ifdef GRUB_MACHINE_EFI
+#include <grub/efi/efi.h>
+#define HAS_VGA_TEXT 0
+#define DEFAULT_VIDEO_MODE "800x600"
+#else
+#include <grub/i386/pc/vbe.h>
+#include <grub/i386/pc/console.h>
+#define HAS_VGA_TEXT 1
+#define DEFAULT_VIDEO_MODE "text"
+#endif
+
 #define GRUB_LINUX_CL_OFFSET		0x1000
 #define GRUB_LINUX_CL_END_OFFSET	0x2000
 
@@ -53,6 +63,8 @@ static grub_uint32_t real_mode_pages;
 static grub_uint32_t prot_mode_pages;
 static grub_uint32_t initrd_pages;
 static struct grub_relocator *relocator = NULL;
+static void *efi_mmap_buf;
+static grub_size_t efi_mmap_size;
 
 /* FIXME */
 #if 0
@@ -244,6 +256,48 @@ page_align (grub_size_t size)
   return (size + (1 << 12) - 1) & (~((1 << 12) - 1));
 }
 
+#ifdef GRUB_MACHINE_EFI
+/* Find the optimal number of pages for the memory map. Is it better to
+   move this code to efi/mm.c?  */
+static grub_efi_uintn_t
+find_efi_mmap_size (void)
+{
+  static grub_efi_uintn_t mmap_size = 0;
+
+  if (mmap_size != 0)
+    return mmap_size;
+
+  mmap_size = (1 << 12);
+  while (1)
+    {
+      int ret;
+      grub_efi_memory_descriptor_t *mmap;
+      grub_efi_uintn_t desc_size;
+
+      mmap = grub_malloc (mmap_size);
+      if (! mmap)
+	return 0;
+
+      ret = grub_efi_get_memory_map (&mmap_size, mmap, 0, &desc_size, 0);
+      grub_free (mmap);
+
+      if (ret < 0)
+	grub_fatal ("cannot get memory map");
+      else if (ret > 0)
+	break;
+
+      mmap_size += (1 << 12);
+    }
+
+  /* Increase the size a bit for safety, because GRUB allocates more on
+     later, and EFI itself may allocate more.  */
+  mmap_size += (1 << 12);
+
+  return page_align (mmap_size);
+}
+
+#endif
+
 /* Find the optimal number of pages for the memory map. */
 static grub_size_t
 find_mmap_size (void)
@@ -292,12 +346,18 @@ allocate_pages (grub_size_t prot_size)
   prot_size = page_align (prot_size);
   mmap_size = find_mmap_size ();
 
+#ifdef GRUB_MACHINE_EFI
+  efi_mmap_size = find_efi_mmap_size ();
+#else
+  efi_mmap_size = 0;
+#endif
+
   grub_dprintf ("linux", "real_size = %x, prot_size = %x, mmap_size = %x\n",
 		(unsigned) real_size, (unsigned) prot_size, (unsigned) mmap_size);
 
   /* Calculate the number of pages; Combine the real mode code with
      the memory map buffer for simplicity.  */
-  real_mode_pages = ((real_size + mmap_size) >> 12);
+  real_mode_pages = ((real_size + mmap_size + efi_mmap_size) >> 12);
   prot_mode_pages = (prot_size >> 12);
 
   /* Initialize the memory pointers with NULL for convenience.  */
@@ -330,10 +390,10 @@ allocate_pages (grub_size_t prot_size)
 	  if (addr + size > 0x90000)
 	    size = 0x90000 - addr;
 
-	  if (real_size + mmap_size > size)
+	  if (real_size + mmap_size + efi_mmap_size > size)
 	    return 0;
 
-	  real_mode_target = ((addr + size) - (real_size + mmap_size));
+	  real_mode_target = ((addr + size) - (real_size + mmap_size + efi_mmap_size));
 	  return 1;
 	}
 
@@ -348,11 +408,13 @@ allocate_pages (grub_size_t prot_size)
 
   err = grub_relocator_alloc_chunk_addr (relocator, &real_mode_mem,
 					 real_mode_target,
-					 (real_size + mmap_size));
+					 (real_size + mmap_size 
+					  + efi_mmap_size));
   if (err)
     goto fail;
+  efi_mmap_buf = (grub_uint8_t *) real_mode_mem + real_size + mmap_size;
 
-  prot_mode_target = 0x100000;
+  prot_mode_target = GRUB_LINUX_BZIMAGE_ADDR;
 
   err = grub_relocator_alloc_chunk_addr (relocator, &prot_mode_mem,
 					 prot_mode_target, prot_size);
@@ -393,17 +455,28 @@ grub_e820_add_region (struct grub_e820_mmap *e820_map, int *e820_num,
     }
 }
 
-static int
+static grub_err_t
 grub_linux_setup_video (struct linux_kernel_params *params)
 {
   struct grub_video_mode_info mode_info;
   void *framebuffer;
-  int ret;
+  grub_err_t err;
 
-  ret = grub_video_get_info_and_fini (&mode_info, &framebuffer);
+  switch (grub_video_get_driver_id ())
+    {
+    case GRUB_VIDEO_DRIVER_VBE:
+      params->have_vga = GRUB_VIDEO_LINUX_TYPE_VLFB;
+      break;
 
-  if (ret)
-    return 1;
+    default:
+      params->have_vga = GRUB_VIDEO_LINUX_TYPE_SIMPLE_LFB;
+      break;
+    }
+
+  err = grub_video_get_info_and_fini (&mode_info, &framebuffer);
+
+  if (err)
+    return err;
 
   params->lfb_width = mode_info.width;
   params->lfb_height = mode_info.height;
@@ -449,7 +522,7 @@ grub_linux_setup_video (struct linux_kernel_params *params)
     }
 #endif
 
-  return 0;
+  return GRUB_ERR_NONE;
 }
 
 #ifdef __x86_64__
@@ -520,15 +593,15 @@ grub_linux_boot (void)
   if (modevar && *modevar != 0)
     {
       tmp = grub_malloc (grub_strlen (modevar)
-			 + sizeof (";text"));
+			 + sizeof (";" DEFAULT_VIDEO_MODE));
       if (! tmp)
 	return grub_errno;
-      grub_sprintf (tmp, "%s;text", modevar);
+      grub_sprintf (tmp, "%s;" DEFAULT_VIDEO_MODE, modevar);
       err = grub_video_set_mode (tmp, 0);
       grub_free (tmp);
     }
   else
-    err = grub_video_set_mode ("text", 0);
+    err = grub_video_set_mode (DEFAULT_VIDEO_MODE, 0);
 
   if (err)
     {
@@ -537,17 +610,26 @@ grub_linux_boot (void)
       grub_errno = GRUB_ERR_NONE;
     }
 
-  if (! grub_linux_setup_video (params))
-    params->have_vga = GRUB_VIDEO_TYPE_VLFB;
-  else
+  err = grub_linux_setup_video (params);
+  if (err)
     {
-      params->have_vga = GRUB_VIDEO_TYPE_TEXT;
+      grub_print_error ();
+      grub_errno = GRUB_ERR_NONE;
+#if HAS_VGA_TEXT
+      params->have_vga = GRUB_VIDEO_LINUX_TYPE_EGA_TEXT;
+      params->video_mode = 0x3;
       params->video_width = 80;
       params->video_height = 25;
+#else
+      params->have_vga = 0;
+      params->video_mode = 0;
+      params->video_width = 0;
+      params->video_height = 0;
+#endif
     }
 
   /* Initialize these last, because terminal position could be affected by printfs above.  */
-  if (params->have_vga == GRUB_VIDEO_TYPE_TEXT)
+  if (params->have_vga == GRUB_VIDEO_LINUX_TYPE_EGA_TEXT)
     {
       grub_term_output_t term;
       int found = 0;
@@ -568,6 +650,40 @@ grub_linux_boot (void)
 	}
     }
 
+#ifdef GRUB_MACHINE_EFI
+  {
+    grub_efi_uintn_t efi_map_key, efi_desc_size;
+    grub_efi_uint32_t efi_desc_version;
+    if (grub_efi_get_memory_map (&efi_mmap_size, efi_mmap_buf, &efi_map_key,
+				 &efi_desc_size, &efi_desc_version) <= 0)
+      grub_fatal ("cannot get memory map");
+    
+    if (! grub_efi_exit_boot_services (efi_map_key))
+      grub_fatal ("cannot exit boot services");
+
+    /* Note that no boot services are available from here.  */
+
+    /* Pass EFI parameters.  */
+    if (grub_le_to_cpu16 (params->version) >= 0x0206)
+      {
+	params->v0206.efi_mem_desc_size = efi_desc_size;
+	params->v0206.efi_mem_desc_version = efi_desc_version;
+	params->v0206.efi_mmap = (grub_uint32_t) (unsigned long) efi_mmap_buf;
+	params->v0206.efi_mmap_size = efi_mmap_size;
+#ifdef __x86_64__
+	params->v0206.efi_mmap_hi = (grub_uint32_t) ((grub_uint64_t) efi_mmap_buf >> 32);
+#endif
+      }
+    else if (grub_le_to_cpu16 (params->version) >= 0x0204)
+      {
+	params->v0204.efi_mem_desc_size = efi_desc_size;
+	params->v0204.efi_mem_desc_version = efi_desc_version;
+	params->v0204.efi_mmap = (grub_uint32_t) (unsigned long) efi_mmap_buf;
+	params->v0204.efi_mmap_size = efi_mmap_size;
+      }
+  }
+#endif
+
   /* FIXME.  */
   /*  asm volatile ("lidt %0" : : "m" (idt_desc)); */
   state.ebx = 0;
@@ -675,7 +791,12 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
       goto fail;
     }
 
+#ifdef GRUB_MACHINE_EFI
+  /* XXX Linux assumes that only elilo can boot Linux on EFI!!!  */
+  params->type_of_loader = (LINUX_LOADER_ID_ELILO << 4);
+#else
   params->type_of_loader = (LINUX_LOADER_ID_GRUB << 4);
+#endif
 
   /* These two are used (instead of cmd_line_ptr) by older versions of Linux,
      and otherwise ignored.  */
@@ -698,14 +819,27 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   /* Ignored by Linux.  */
   params->video_page = 0;
 
-  /* Must be non-zero even in text mode, or Linux will think there's no VGA.  */
-  params->video_mode = 0x3;
-
   /* Only used when `video_mode == 0x7', otherwise ignored.  */
   params->video_ega_bx = 0;
 
   params->font_size = 16; /* XXX */
 
+#ifdef GRUB_MACHINE_EFI
+  if (grub_le_to_cpu16 (params->version) >= 0x0206)
+    {
+      params->v0206.efi_signature = GRUB_LINUX_EFI_SIGNATURE;
+      params->v0206.efi_system_table = (grub_uint32_t) (unsigned long) grub_efi_system_table;
+#ifdef __x86_64__
+      params->v0206.efi_system_table_hi = (grub_uint32_t) ((grub_uint64_t) grub_efi_system_table >> 32);
+#endif
+    }
+  else if (grub_le_to_cpu16 (params->version) >= 0x0204)
+    {
+      params->v0204.efi_signature = GRUB_LINUX_EFI_SIGNATURE_0204;
+      params->v0204.efi_system_table = (grub_uint32_t) (unsigned long) grub_efi_system_table;
+    }
+#endif
+
   /* The other parameters are filled when booting.  */
 
   grub_file_seek (file, real_size + GRUB_DISK_SECTOR_SIZE);
@@ -859,7 +993,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
     }
 
   len = prot_size;
-  if (grub_file_read (file, (void *) GRUB_LINUX_BZIMAGE_ADDR, len) != len)
+  if (grub_file_read (file, prot_mode_mem, len) != len)
     grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file");
 
   if (grub_errno == GRUB_ERR_NONE)

From 4d27140f7f8d94598c9182e73e3dff0c9d299ded Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 14:05:39 +0100
Subject: [PATCH 0261/1628] Removed efi linux loader (now it's in i386/linux.c)

---
 conf/i386-efi.rmk              |    2 +-
 loader/i386/efi/linux.c        | 1022 --------------------------------
 loader/i386/linux_trampoline.S |  129 ----
 3 files changed, 1 insertion(+), 1152 deletions(-)
 delete mode 100644 loader/i386/efi/linux.c
 delete mode 100644 loader/i386/linux_trampoline.S

diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index 673349858..fb5b11d04 100644
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -94,7 +94,7 @@ appleldr_mod_CFLAGS = $(COMMON_CFLAGS)
 appleldr_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For linux.mod.
-linux_mod_SOURCES = loader/i386/efi/linux.c
+linux_mod_SOURCES = loader/i386/linux.c
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c
deleted file mode 100644
index 1abcc06db..000000000
--- a/loader/i386/efi/linux.c
+++ /dev/null
@@ -1,1022 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2008,2009  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/loader.h>
-#include <grub/machine/loader.h>
-#include <grub/file.h>
-#include <grub/disk.h>
-#include <grub/err.h>
-#include <grub/misc.h>
-#include <grub/types.h>
-#include <grub/dl.h>
-#include <grub/mm.h>
-#include <grub/term.h>
-#include <grub/cpu/linux.h>
-#include <grub/efi/api.h>
-#include <grub/efi/efi.h>
-#include <grub/efi/uga_draw.h>
-#include <grub/pci.h>
-#include <grub/command.h>
-#include <grub/memory.h>
-#include <grub/i18n.h>
-
-#define GRUB_LINUX_CL_OFFSET		0x1000
-#define GRUB_LINUX_CL_END_OFFSET	0x2000
-
-#define NEXT_MEMORY_DESCRIPTOR(desc, size)      \
-  ((grub_efi_memory_descriptor_t *) ((char *) (desc) + (size)))
-
-static grub_dl_t my_mod;
-
-static grub_size_t linux_mem_size;
-static int loaded;
-static void *real_mode_mem;
-static void *prot_mode_mem;
-static void *initrd_mem;
-static grub_efi_uintn_t real_mode_pages;
-static grub_efi_uintn_t prot_mode_pages;
-static grub_efi_uintn_t initrd_pages;
-static void *mmap_buf;
-
-static grub_uint8_t gdt[] __attribute__ ((aligned(16))) =
-  {
-    /* NULL.  */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    /* Reserved.  */
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    /* Code segment.  */
-    0xFF, 0xFF, 0x00, 0x00, 0x00, 0x9A, 0xCF, 0x00,
-    /* Data segment.  */
-    0xFF, 0xFF, 0x00, 0x00, 0x00, 0x92, 0xCF, 0x00
-  };
-
-struct gdt_descriptor
-{
-  grub_uint16_t limit;
-  void *base;
-} __attribute__ ((packed));
-
-static struct gdt_descriptor gdt_desc =
-  {
-    sizeof (gdt) - 1,
-    gdt
-  };
-
-struct idt_descriptor
-{
-  grub_uint16_t limit;
-  void *base;
-} __attribute__ ((packed));
-
-static struct idt_descriptor idt_desc =
-  {
-    0,
-    0
-  };
-
-static inline grub_size_t
-page_align (grub_size_t size)
-{
-  return (size + (1 << 12) - 1) & (~((1 << 12) - 1));
-}
-
-/* Find the optimal number of pages for the memory map. Is it better to
-   move this code to efi/mm.c?  */
-static grub_efi_uintn_t
-find_mmap_size (void)
-{
-  static grub_efi_uintn_t mmap_size = 0;
-
-  if (mmap_size != 0)
-    return mmap_size;
-
-  mmap_size = (1 << 12);
-  while (1)
-    {
-      int ret;
-      grub_efi_memory_descriptor_t *mmap;
-      grub_efi_uintn_t desc_size;
-
-      mmap = grub_malloc (mmap_size);
-      if (! mmap)
-	return 0;
-
-      ret = grub_efi_get_memory_map (&mmap_size, mmap, 0, &desc_size, 0);
-      grub_free (mmap);
-
-      if (ret < 0)
-	grub_fatal ("cannot get memory map");
-      else if (ret > 0)
-	break;
-
-      mmap_size += (1 << 12);
-    }
-
-  /* Increase the size a bit for safety, because GRUB allocates more on
-     later, and EFI itself may allocate more.  */
-  mmap_size += (1 << 12);
-
-  return page_align (mmap_size);
-}
-
-static void
-free_pages (void)
-{
-  if (real_mode_mem)
-    {
-      grub_efi_free_pages ((grub_addr_t) real_mode_mem, real_mode_pages);
-      real_mode_mem = 0;
-    }
-
-  if (prot_mode_mem)
-    {
-      grub_efi_free_pages ((grub_addr_t) prot_mode_mem, prot_mode_pages);
-      prot_mode_mem = 0;
-    }
-
-  if (initrd_mem)
-    {
-      grub_efi_free_pages ((grub_addr_t) initrd_mem, initrd_pages);
-      initrd_mem = 0;
-    }
-}
-
-/* Allocate pages for the real mode code and the protected mode code
-   for linux as well as a memory map buffer.  */
-static int
-allocate_pages (grub_size_t prot_size)
-{
-  grub_efi_uintn_t desc_size;
-  grub_efi_memory_descriptor_t *mmap, *mmap_end;
-  grub_efi_uintn_t mmap_size, tmp_mmap_size;
-  grub_efi_memory_descriptor_t *desc;
-  grub_size_t real_size;
-
-  /* Make sure that each size is aligned to a page boundary.  */
-  real_size = GRUB_LINUX_CL_END_OFFSET;
-  prot_size = page_align (prot_size);
-  mmap_size = find_mmap_size ();
-
-  grub_dprintf ("linux", "real_size = %x, prot_size = %x, mmap_size = %x\n",
-		(unsigned) real_size, (unsigned) prot_size, (unsigned) mmap_size);
-
-  /* Calculate the number of pages; Combine the real mode code with
-     the memory map buffer for simplicity.  */
-  real_mode_pages = ((real_size + mmap_size) >> 12);
-  prot_mode_pages = (prot_size >> 12);
-
-  /* Initialize the memory pointers with NULL for convenience.  */
-  real_mode_mem = 0;
-  prot_mode_mem = 0;
-
-  /* Read the memory map temporarily, to find free space.  */
-  mmap = grub_malloc (mmap_size);
-  if (! mmap)
-    return 0;
-
-  tmp_mmap_size = mmap_size;
-  if (grub_efi_get_memory_map (&tmp_mmap_size, mmap, 0, &desc_size, 0) <= 0)
-    grub_fatal ("cannot get memory map");
-
-  mmap_end = NEXT_MEMORY_DESCRIPTOR (mmap, tmp_mmap_size);
-
-  /* First, find free pages for the real mode code
-     and the memory map buffer.  */
-  for (desc = mmap;
-       desc < mmap_end;
-       desc = NEXT_MEMORY_DESCRIPTOR (desc, desc_size))
-    {
-      /* Probably it is better to put the real mode code in the traditional
-	 space for safety.  */
-      if (desc->type == GRUB_EFI_CONVENTIONAL_MEMORY
-	  && desc->physical_start <= 0x90000
-	  && desc->num_pages >= real_mode_pages)
-	{
-	  grub_efi_physical_address_t physical_end;
-	  grub_efi_physical_address_t addr;
-
-	  physical_end = desc->physical_start + (desc->num_pages << 12);
-	  if (physical_end > 0x90000)
-	    physical_end = 0x90000;
-
-	  grub_dprintf ("linux", "physical_start = %x, physical_end = %x\n",
-			(unsigned) desc->physical_start,
-			(unsigned) physical_end);
-	  addr = physical_end - real_size - mmap_size;
-	  if (addr < 0x10000)
-	    continue;
-
-	  grub_dprintf ("linux", "trying to allocate %u pages at %lx\n",
-			(unsigned) real_mode_pages, (unsigned long) addr);
-	  real_mode_mem = grub_efi_allocate_pages (addr, real_mode_pages);
-	  if (! real_mode_mem)
-	    grub_fatal ("cannot allocate pages");
-
-	  desc->num_pages -= real_mode_pages;
-	  break;
-	}
-    }
-
-  if (! real_mode_mem)
-    {
-      grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate real mode pages");
-      goto fail;
-    }
-
-  mmap_buf = (void *) ((char *) real_mode_mem + real_size);
-
-  /* Next, find free pages for the protected mode code.  */
-  /* XXX what happens if anything is using this address?  */
-  prot_mode_mem = grub_efi_allocate_pages (0x100000, prot_mode_pages + 1);
-  if (! prot_mode_mem)
-    {
-      grub_error (GRUB_ERR_OUT_OF_MEMORY,
-		  "cannot allocate protected mode pages");
-      goto fail;
-    }
-
-  grub_dprintf ("linux", "real_mode_mem = %lx, real_mode_pages = %x, "
-		"prot_mode_mem = %lx, prot_mode_pages = %x\n",
-		(unsigned long) real_mode_mem, (unsigned) real_mode_pages,
-		(unsigned long) prot_mode_mem, (unsigned) prot_mode_pages);
-
-  grub_free (mmap);
-  return 1;
-
- fail:
-  grub_free (mmap);
-  free_pages ();
-  return 0;
-}
-
-static void
-grub_e820_add_region (struct grub_e820_mmap *e820_map, int *e820_num,
-		      grub_uint64_t start, grub_uint64_t size,
-		      grub_uint32_t type)
-{
-  int n = *e820_num;
-
-  if (n >= GRUB_E820_MAX_ENTRY)
-    grub_fatal ("Too many e820 memory map entries");
-
-  if ((n > 0) && (e820_map[n - 1].addr + e820_map[n - 1].size == start) &&
-      (e820_map[n - 1].type == type))
-      e820_map[n - 1].size += size;
-  else
-    {
-      e820_map[n].addr = start;
-      e820_map[n].size = size;
-      e820_map[n].type = type;
-      (*e820_num)++;
-    }
-}
-
-#ifdef __x86_64__
-extern grub_uint8_t grub_linux_trampoline_start[];
-extern grub_uint8_t grub_linux_trampoline_end[];
-#endif
-
-static grub_err_t
-grub_linux_boot (void)
-{
-  struct linux_kernel_params *params;
-  grub_efi_uintn_t mmap_size;
-  grub_efi_uintn_t map_key;
-  grub_efi_uintn_t desc_size;
-  grub_efi_uint32_t desc_version;
-  int e820_num;
-
-  params = real_mode_mem;
-
-  grub_dprintf ("linux", "code32_start = %x, idt_desc = %lx, gdt_desc = %lx\n",
-		(unsigned) params->code32_start,
-		(unsigned long) &(idt_desc.limit),
-		(unsigned long) &(gdt_desc.limit));
-  grub_dprintf ("linux", "idt = %x:%lx, gdt = %x:%lx\n",
-		(unsigned) idt_desc.limit, (unsigned long) idt_desc.base,
-		(unsigned) gdt_desc.limit, (unsigned long) gdt_desc.base);
-
-  auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
-  int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
-    {
-      switch (type)
-        {
-        case GRUB_MACHINE_MEMORY_AVAILABLE:
-	  grub_e820_add_region (params->e820_map, &e820_num,
-				addr, size, GRUB_E820_RAM);
-	  break;
-
-#ifdef GRUB_MACHINE_MEMORY_ACPI
-        case GRUB_MACHINE_MEMORY_ACPI:
-	  grub_e820_add_region (params->e820_map, &e820_num,
-				addr, size, GRUB_E820_ACPI);
-	  break;
-#endif
-
-#ifdef GRUB_MACHINE_MEMORY_NVS
-        case GRUB_MACHINE_MEMORY_NVS:
-	  grub_e820_add_region (params->e820_map, &e820_num,
-				addr, size, GRUB_E820_NVS);
-	  break;
-#endif
-
-#ifdef GRUB_MACHINE_MEMORY_CODE
-        case GRUB_MACHINE_MEMORY_CODE:
-	  grub_e820_add_region (params->e820_map, &e820_num,
-				addr, size, GRUB_E820_EXEC_CODE);
-	  break;
-#endif
-
-        default:
-          grub_e820_add_region (params->e820_map, &e820_num,
-                                addr, size, GRUB_E820_RESERVED);
-        }
-      return 0;
-    }
-
-  e820_num = 0;
-  grub_mmap_iterate (hook);
-  params->mmap_size = e820_num;
-
-  mmap_size = find_mmap_size ();
-  if (grub_efi_get_memory_map (&mmap_size, mmap_buf, &map_key,
-			       &desc_size, &desc_version) <= 0)
-    grub_fatal ("cannot get memory map");
-
-  if (! grub_efi_exit_boot_services (map_key))
-     grub_fatal ("cannot exit boot services");
-
-  /* Note that no boot services are available from here.  */
-
-  /* Pass EFI parameters.  */
-  if (grub_le_to_cpu16 (params->version) >= 0x0206)
-    {
-      params->v0206.efi_mem_desc_size = desc_size;
-      params->v0206.efi_mem_desc_version = desc_version;
-      params->v0206.efi_mmap = (grub_uint32_t) (unsigned long) mmap_buf;
-      params->v0206.efi_mmap_size = mmap_size;
-#ifdef __x86_64__
-      params->v0206.efi_mmap_hi = (grub_uint32_t) ((grub_uint64_t) mmap_buf >> 32);
-#endif
-    }
-  else if (grub_le_to_cpu16 (params->version) >= 0x0204)
-    {
-      params->v0204.efi_mem_desc_size = desc_size;
-      params->v0204.efi_mem_desc_version = desc_version;
-      params->v0204.efi_mmap = (grub_uint32_t) (unsigned long) mmap_buf;
-      params->v0204.efi_mmap_size = mmap_size;
-    }
-
-#ifdef __x86_64__
-
-  grub_memcpy ((char *) prot_mode_mem + (prot_mode_pages << 12),
-	       grub_linux_trampoline_start,
-	       grub_linux_trampoline_end - grub_linux_trampoline_start);
-
-  ((void (*) (unsigned long, void *)) ((char *) prot_mode_mem
-                                     + (prot_mode_pages << 12)))
-    (params->code32_start, real_mode_mem);
-
-#else
-
-  /* Hardware interrupts are not safe any longer.  */
-  asm volatile ("cli" : : );
-
-  /* Load the IDT and the GDT for the bootstrap.  */
-  asm volatile ("lidt %0" : : "m" (idt_desc));
-  asm volatile ("lgdt %0" : : "m" (gdt_desc));
-
-  /* Pass parameters.  */
-  asm volatile ("movl %0, %%ecx" : : "m" (params->code32_start));
-  asm volatile ("movl %0, %%esi" : : "m" (real_mode_mem));
-
-  asm volatile ("xorl %%ebx, %%ebx" : : );
-
-  /* Enter Linux.  */
-  asm volatile ("jmp *%%ecx" : : );
-
-#endif
-
-  /* Never reach here.  */
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_linux_unload (void)
-{
-  free_pages ();
-  grub_dl_unref (my_mod);
-  loaded = 0;
-  return GRUB_ERR_NONE;
-}
-
-static grub_efi_guid_t uga_draw_guid = GRUB_EFI_UGA_DRAW_GUID;
-
-
-#define RGB_MASK	0xffffff
-#define RGB_MAGIC	0x121314
-#define LINE_MIN	800
-#define LINE_MAX	4096
-#define FBTEST_STEP	(0x10000 >> 2)
-#define FBTEST_COUNT	8
-
-static int
-find_line_len (grub_uint32_t *fb_base, grub_uint32_t *line_len)
-{
-  grub_uint32_t *base = (grub_uint32_t *) (grub_target_addr_t) *fb_base;
-  int i;
-
-  for (i = 0; i < FBTEST_COUNT; i++, base += FBTEST_STEP)
-    {
-      if ((*base & RGB_MASK) == RGB_MAGIC)
-	{
-	  int j;
-
-	  for (j = LINE_MIN; j <= LINE_MAX; j++)
-	    {
-	      if ((base[j] & RGB_MASK) == RGB_MAGIC)
-		{
-		  *fb_base = (grub_uint32_t) (grub_target_addr_t) base;
-		  *line_len = j << 2;
-
-		  return 1;
-		}
-	    }
-
-	  break;
-	}
-    }
-
-  return 0;
-}
-
-static int
-find_framebuf (grub_uint32_t *fb_base, grub_uint32_t *line_len)
-{
-  int found = 0;
-
-  auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev,
-				       grub_pci_id_t pciid);
-
-  int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev,
-				  grub_pci_id_t pciid)
-    {
-      grub_pci_address_t addr;
-
-      addr = grub_pci_make_address (dev, 2);
-      if (grub_pci_read (addr) >> 24 == 0x3)
-	{
-	  int i;
-
-	  grub_printf ("Display controller: %d:%d.%d\nDevice id: %x\n",
-		       grub_pci_get_bus (dev), grub_pci_get_device (dev),
-		       grub_pci_get_function (dev), pciid);
-	  addr += 8;
-	  for (i = 0; i < 6; i++, addr += 4)
-	    {
-	      grub_uint32_t old_bar1, old_bar2, type;
-	      grub_uint64_t base64;
-
-	      old_bar1 = grub_pci_read (addr);
-	      if ((! old_bar1) || (old_bar1 & GRUB_PCI_ADDR_SPACE_IO))
-		continue;
-
-	      type = old_bar1 & GRUB_PCI_ADDR_MEM_TYPE_MASK;
-	      if (type == GRUB_PCI_ADDR_MEM_TYPE_64)
-		{
-		  if (i == 5)
-		    break;
-
-		  old_bar2 = grub_pci_read (addr + 4);
-		}
-	      else
-		old_bar2 = 0;
-
-	      base64 = old_bar2;
-	      base64 <<= 32;
-	      base64 |= (old_bar1 & GRUB_PCI_ADDR_MEM_MASK);
-
-	      grub_printf ("%s(%d): 0x%llx\n",
-			   ((old_bar1 & GRUB_PCI_ADDR_MEM_PREFETCH) ?
-			    "VMEM" : "MMIO"), i,
-			   (unsigned long long) base64);
-
-	      if ((old_bar1 & GRUB_PCI_ADDR_MEM_PREFETCH) && (! found))
-		{
-		  *fb_base = base64;
-		  if (find_line_len (fb_base, line_len))
-		    found++;
-		}
-
-	      if (type == GRUB_PCI_ADDR_MEM_TYPE_64)
-		{
-		  i++;
-		  addr += 4;
-		}
-	    }
-	}
-
-      return found;
-    }
-
-  grub_pci_iterate (find_card);
-  return found;
-}
-
-static int
-grub_linux_setup_video (struct linux_kernel_params *params)
-{
-  grub_efi_uga_draw_protocol_t *c;
-  grub_uint32_t width, height, depth, rate, pixel, fb_base, line_len;
-  int ret;
-
-  c = grub_efi_locate_protocol (&uga_draw_guid, 0);
-  if (! c)
-    return 1;
-
-  if (efi_call_5 (c->get_mode, c, &width, &height, &depth, &rate))
-    return 1;
-
-  grub_printf ("Video mode: %ux%u-%u@%u\n", width, height, depth, rate);
-
-  grub_efi_set_text_mode (0);
-  pixel = RGB_MAGIC;
-  efi_call_10 (c->blt, c, (struct grub_efi_uga_pixel *) &pixel,
-	       GRUB_EFI_UGA_VIDEO_FILL, 0, 0, 0, 0, 1, height, 0);
-  ret = find_framebuf (&fb_base, &line_len);
-  grub_efi_set_text_mode (1);
-
-  if (! ret)
-    {
-      grub_printf ("Can\'t find frame buffer address\n");
-      return 1;
-    }
-
-  grub_printf ("Frame buffer base: 0x%x\n", fb_base);
-  grub_printf ("Video line length: %d\n", line_len);
-
-  params->lfb_width = width;
-  params->lfb_height = height;
-  params->lfb_depth = depth;
-  params->lfb_line_len = line_len;
-
-  params->lfb_base = fb_base;
-  params->lfb_size = (line_len * params->lfb_height + 65535) >> 16;
-
-  params->red_mask_size = 8;
-  params->red_field_pos = 16;
-  params->green_mask_size = 8;
-  params->green_field_pos = 8;
-  params->blue_mask_size = 8;
-  params->blue_field_pos = 0;
-  params->reserved_mask_size = 8;
-  params->reserved_field_pos = 24;
-
-  params->have_vga = GRUB_VIDEO_TYPE_VLFB;
-  params->vid_mode = 0x338;  /* 1024x768x32  */
-
-  return 0;
-}
-
-static grub_err_t
-grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-		int argc, char *argv[])
-{
-  grub_file_t file = 0;
-  struct linux_kernel_header lh;
-  struct linux_kernel_params *params;
-  grub_uint8_t setup_sects;
-  grub_size_t real_size, prot_size;
-  grub_ssize_t len;
-  int i;
-  char *dest;
-
-  grub_dl_ref (my_mod);
-
-  if (argc == 0)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "no kernel specified");
-      goto fail;
-    }
-
-  file = grub_file_open (argv[0]);
-  if (! file)
-    goto fail;
-
-  if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
-    {
-      grub_error (GRUB_ERR_READ_ERROR, "cannot read the Linux header");
-      goto fail;
-    }
-
-  if (lh.boot_flag != grub_cpu_to_le16 (0xaa55))
-    {
-      grub_error (GRUB_ERR_BAD_OS, "invalid magic number");
-      goto fail;
-    }
-
-  if (lh.setup_sects > GRUB_LINUX_MAX_SETUP_SECTS)
-    {
-      grub_error (GRUB_ERR_BAD_OS, "too many setup sectors");
-      goto fail;
-    }
-
-  /* EFI support is quite new, so reject old versions.  */
-  if (lh.header != grub_cpu_to_le32 (GRUB_LINUX_MAGIC_SIGNATURE)
-      || grub_le_to_cpu16 (lh.version) < 0x0203)
-    {
-      grub_error (GRUB_ERR_BAD_OS, "too old version");
-      goto fail;
-    }
-
-  /* I'm not sure how to support zImage on EFI.  */
-  if (! (lh.loadflags & GRUB_LINUX_FLAG_BIG_KERNEL))
-    {
-      grub_error (GRUB_ERR_BAD_OS, "zImage is not supported");
-      goto fail;
-    }
-
-  setup_sects = lh.setup_sects;
-
-  /* If SETUP_SECTS is not set, set it to the default (4).  */
-  if (! setup_sects)
-    setup_sects = GRUB_LINUX_DEFAULT_SETUP_SECTS;
-
-  real_size = setup_sects << GRUB_DISK_SECTOR_BITS;
-  prot_size = grub_file_size (file) - real_size - GRUB_DISK_SECTOR_SIZE;
-
-  if (! allocate_pages (prot_size))
-    goto fail;
-
-  params = (struct linux_kernel_params *) real_mode_mem;
-  grub_memset (params, 0, GRUB_LINUX_CL_END_OFFSET);
-  grub_memcpy (&params->setup_sects, &lh.setup_sects, sizeof (lh) - 0x1F1);
-
-  params->ps_mouse = params->padding10 =  0;
-
-  len = 0x400 - sizeof (lh);
-  if (grub_file_read (file, (char *) real_mode_mem + sizeof (lh), len) != len)
-    {
-      grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file");
-      goto fail;
-    }
-
-  /* XXX Linux assumes that only elilo can boot Linux on EFI!!!  */
-  params->type_of_loader = (LINUX_LOADER_ID_ELILO << 4);
-
-  params->cl_magic = GRUB_LINUX_CL_MAGIC;
-  params->cl_offset = 0x1000;
-  params->cmd_line_ptr = (unsigned long) real_mode_mem + 0x1000;
-  params->ramdisk_image = 0;
-  params->ramdisk_size = 0;
-
-  params->heap_end_ptr = GRUB_LINUX_HEAP_END_OFFSET;
-  params->loadflags |= GRUB_LINUX_FLAG_CAN_USE_HEAP;
-
-  /* These are not needed to be precise, because Linux uses these values
-     only to raise an error when the decompression code cannot find good
-     space.  */
-  params->ext_mem = ((32 * 0x100000) >> 10);
-  params->alt_mem = ((32 * 0x100000) >> 10);
-
-  {
-    grub_term_output_t term;
-    int found = 0;
-    FOR_ACTIVE_TERM_OUTPUTS(term)
-      if (grub_strcmp (term->name, "vga_text") == 0
-	  || grub_strcmp (term->name, "console") == 0)
-	{
-	  grub_uint16_t pos = grub_term_getxy (term);
-	  params->video_cursor_x = pos >> 8;
-	  params->video_cursor_y = pos & 0xff;
-	  params->video_width = grub_term_width (term);
-	  params->video_height = grub_term_height (term);
-	  found = 1;
-	  break;
-	}
-    if (!found)
-      {
-	params->video_cursor_x = 0;
-	params->video_cursor_y = 0;
-	params->video_width = 80;
-	params->video_height = 25;
-      }
-  }
-  params->video_page = 0; /* ??? */
-  params->video_mode = grub_efi_system_table->con_out->mode->mode;
-  params->video_ega_bx = 0;
-  params->have_vga = 0;
-  params->font_size = 16; /* XXX */
-
-  if (grub_le_to_cpu16 (params->version) >= 0x0206)
-    {
-      params->v0206.efi_signature = GRUB_LINUX_EFI_SIGNATURE;
-      params->v0206.efi_system_table = (grub_uint32_t) (unsigned long) grub_efi_system_table;
-#ifdef __x86_64__
-      params->v0206.efi_system_table_hi = (grub_uint32_t) ((grub_uint64_t) grub_efi_system_table >> 32);
-#endif
-    }
-  else if (grub_le_to_cpu16 (params->version) >= 0x0204)
-    {
-      params->v0204.efi_signature = GRUB_LINUX_EFI_SIGNATURE_0204;
-      params->v0204.efi_system_table = (grub_uint32_t) (unsigned long) grub_efi_system_table;
-    }
-
-#if 0
-  /* The structure is zeroed already.  */
-
-  /* No VBE on EFI.  */
-  params->lfb_width = 0;
-  params->lfb_height = 0;
-  params->lfb_depth = 0;
-  params->lfb_base = 0;
-  params->lfb_size = 0;
-  params->lfb_line_len = 0;
-  params->red_mask_size = 0;
-  params->red_field_pos = 0;
-  params->green_mask_size = 0;
-  params->green_field_pos = 0;
-  params->blue_mask_size = 0;
-  params->blue_field_pos = 0;
-  params->reserved_mask_size = 0;
-  params->reserved_field_pos = 0;
-  params->vesapm_segment = 0;
-  params->vesapm_offset = 0;
-  params->lfb_pages = 0;
-  params->vesa_attrib = 0;
-
-  /* No APM on EFI.  */
-  params->apm_version = 0;
-  params->apm_code_segment = 0;
-  params->apm_entry = 0;
-  params->apm_16bit_code_segment = 0;
-  params->apm_data_segment = 0;
-  params->apm_flags = 0;
-  params->apm_code_len = 0;
-  params->apm_data_len = 0;
-
-  /* XXX is there any way to use SpeedStep on EFI?  */
-  params->ist_signature = 0;
-  params->ist_command = 0;
-  params->ist_event = 0;
-  params->ist_perf_level = 0;
-
-  /* Let the kernel probe the information.  */
-  grub_memset (params->hd0_drive_info, 0, sizeof (params->hd0_drive_info));
-  grub_memset (params->hd1_drive_info, 0, sizeof (params->hd1_drive_info));
-
-  /* No MCA on EFI.  */
-  params->rom_config_len = 0;
-
-  /* No need to fake the BIOS's memory map.  */
-  params->mmap_size = 0;
-
-  /* Let the kernel probe the information.  */
-  params->ps_mouse = 0;
-
-  /* Clear padding for future compatibility.  */
-  grub_memset (params->padding1, 0, sizeof (params->padding1));
-  grub_memset (params->padding2, 0, sizeof (params->padding2));
-  grub_memset (params->padding3, 0, sizeof (params->padding3));
-  grub_memset (params->padding4, 0, sizeof (params->padding4));
-  grub_memset (params->padding5, 0, sizeof (params->padding5));
-  grub_memset (params->padding6, 0, sizeof (params->padding6));
-  grub_memset (params->padding7, 0, sizeof (params->padding7));
-  grub_memset (params->padding8, 0, sizeof (params->padding8));
-  grub_memset (params->padding9, 0, sizeof (params->padding9));
-
-#endif
-
-  /* The other EFI parameters are filled when booting.  */
-
-  grub_file_seek (file, real_size + GRUB_DISK_SECTOR_SIZE);
-
-  /* XXX there is no way to know if the kernel really supports EFI.  */
-  grub_printf ("   [Linux-bzImage, setup=0x%x, size=0x%x]\n",
-	       (unsigned) real_size, (unsigned) prot_size);
-
-  grub_linux_setup_video (params);
-
-  /* Detect explicitly specified memory size, if any.  */
-  linux_mem_size = 0;
-  for (i = 1; i < argc; i++)
-    if (grub_memcmp (argv[i], "mem=", 4) == 0)
-      {
-	char *val = argv[i] + 4;
-
-	linux_mem_size = grub_strtoul (val, &val, 0);
-
-	if (grub_errno)
-	  {
-	    grub_errno = GRUB_ERR_NONE;
-	    linux_mem_size = 0;
-	  }
-	else
-	  {
-	    int shift = 0;
-
-	    switch (grub_tolower (val[0]))
-	      {
-	      case 'g':
-		shift += 10;
-	      case 'm':
-		shift += 10;
-	      case 'k':
-		shift += 10;
-	      default:
-		break;
-	      }
-
-	    /* Check an overflow.  */
-	    if (linux_mem_size > (~0UL >> shift))
-	      linux_mem_size = 0;
-	    else
-	      linux_mem_size <<= shift;
-	  }
-      }
-    else if (grub_memcmp (argv[i], "video=efifb", 11) == 0)
-      {
-	if (params->have_vga)
-	  params->have_vga = GRUB_VIDEO_TYPE_EFI;
-      }
-
-  /* Specify the boot file.  */
-  dest = grub_stpcpy ((char *) real_mode_mem + GRUB_LINUX_CL_OFFSET,
-		      "BOOT_IMAGE=");
-  dest = grub_stpcpy (dest, argv[0]);
-
-  /* Copy kernel parameters.  */
-  for (i = 1;
-       i < argc
-	 && dest + grub_strlen (argv[i]) + 1 < ((char *) real_mode_mem
-						+ GRUB_LINUX_CL_END_OFFSET);
-       i++)
-    {
-      *dest++ = ' ';
-      dest = grub_stpcpy (dest, argv[i]);
-    }
-
-  len = prot_size;
-  if (grub_file_read (file, (void *) GRUB_LINUX_BZIMAGE_ADDR, len) != len)
-    grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file");
-
-  if (grub_errno == GRUB_ERR_NONE)
-    {
-      grub_loader_set (grub_linux_boot, grub_linux_unload, 1);
-      loaded = 1;
-    }
-
- fail:
-
-  if (file)
-    grub_file_close (file);
-
-  if (grub_errno != GRUB_ERR_NONE)
-    {
-      grub_dl_unref (my_mod);
-      loaded = 0;
-    }
-
-  return grub_errno;
-}
-
-static grub_err_t
-grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
-		 int argc, char *argv[])
-{
-  grub_file_t file = 0;
-  grub_ssize_t size;
-  grub_addr_t addr_min, addr_max;
-  grub_addr_t addr;
-  grub_efi_uintn_t mmap_size;
-  grub_efi_memory_descriptor_t *desc;
-  grub_efi_uintn_t desc_size;
-  struct linux_kernel_header *lh;
-
-  if (argc == 0)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "no module specified");
-      goto fail;
-    }
-
-  if (! loaded)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "you need to load the kernel first");
-      goto fail;
-    }
-
-  file = grub_file_open (argv[0]);
-  if (! file)
-    goto fail;
-
-  size = grub_file_size (file);
-  initrd_pages = (page_align (size) >> 12);
-
-  lh = (struct linux_kernel_header *) real_mode_mem;
-
-  addr_max = (grub_cpu_to_le32 (lh->initrd_addr_max) << 10);
-  if (linux_mem_size != 0 && linux_mem_size < addr_max)
-    addr_max = linux_mem_size;
-
-  /* Linux 2.3.xx has a bug in the memory range check, so avoid
-     the last page.
-     Linux 2.2.xx has a bug in the memory range check, which is
-     worse than that of Linux 2.3.xx, so avoid the last 64kb.  */
-  addr_max -= 0x10000;
-
-  /* Usually, the compression ratio is about 50%.  */
-  addr_min = (grub_addr_t) prot_mode_mem + ((prot_mode_pages * 3) << 12)
-	     + page_align (size);
-
-  /* Find the highest address to put the initrd.  */
-  mmap_size = find_mmap_size ();
-  if (grub_efi_get_memory_map (&mmap_size, mmap_buf, 0, &desc_size, 0) <= 0)
-    grub_fatal ("cannot get memory map");
-
-  addr = 0;
-  for (desc = mmap_buf;
-       desc < NEXT_MEMORY_DESCRIPTOR (mmap_buf, mmap_size);
-       desc = NEXT_MEMORY_DESCRIPTOR (desc, desc_size))
-    {
-      if (desc->type == GRUB_EFI_CONVENTIONAL_MEMORY
-	  && desc->num_pages >= initrd_pages)
-	{
-	  grub_efi_physical_address_t physical_end;
-
-	  physical_end = desc->physical_start + (desc->num_pages << 12);
-	  if (physical_end > addr_max)
-	    physical_end = addr_max;
-
-	  if (physical_end < page_align (size))
-	    continue;
-
-	  physical_end -= page_align (size);
-
-	  if ((physical_end >= addr_min) &&
-	      (physical_end >= desc->physical_start) &&
-	      (physical_end > addr))
-	    addr = physical_end;
-	}
-    }
-
-  if (addr == 0)
-    {
-      grub_error (GRUB_ERR_OUT_OF_MEMORY, "no free pages available");
-      goto fail;
-    }
-
-  initrd_mem = grub_efi_allocate_pages (addr, initrd_pages);
-  if (! initrd_mem)
-    grub_fatal ("cannot allocate pages");
-
-  if (grub_file_read (file, initrd_mem, size) != size)
-    {
-      grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file");
-      goto fail;
-    }
-
-  grub_printf ("   [Initrd, addr=0x%x, size=0x%x]\n",
-	       (unsigned) addr, (unsigned) size);
-
-  lh->ramdisk_image = addr;
-  lh->ramdisk_size = size;
-  lh->root_dev = 0x0100; /* XXX */
-
- fail:
-  if (file)
-    grub_file_close (file);
-
-  return grub_errno;
-}
-
-static grub_command_t cmd_linux, cmd_initrd;
-
-GRUB_MOD_INIT(linux)
-{
-  cmd_linux = grub_register_command ("linux", grub_cmd_linux,
-				     0, N_("Load Linux."));
-  cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
-				      0, N_("Load initrd."));
-  my_mod = mod;
-}
-
-GRUB_MOD_FINI(linux)
-{
-  grub_unregister_command (cmd_linux);
-  grub_unregister_command (cmd_initrd);
-}
diff --git a/loader/i386/linux_trampoline.S b/loader/i386/linux_trampoline.S
deleted file mode 100644
index 4acea7b11..000000000
--- a/loader/i386/linux_trampoline.S
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  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/symbol.h>
-
-
-	.p2align	4	/* force 16-byte alignment */
-VARIABLE(grub_linux_trampoline_start)
-	cli
-	/* %rdi contains protected memory start and %rsi
-	contains real memory start. */
-
-	mov %rsi, %rbx
-
-	call base
-base:
-	pop %rsi
-
-#ifdef APPLE_CC
-	lea (cont1 - base) (%esi, 1), %rax
-	mov %eax, (jump_vector - base) (%esi, 1)
-
-	lea (gdt - base) (%esi, 1), %rax
-	mov %rax, (gdtaddr - base) (%esi, 1)
-
-	/* Switch to compatibility mode. */
-
-	lidt (idtdesc - base) (%esi, 1)
-	lgdt (gdtdesc - base) (%esi, 1)
-
-	/* Update %cs. Thanks to David Miller for pointing this mistake out. */
-	ljmp *(jump_vector - base) (%esi, 1)
-#else
-	lea (cont1 - base) (%rsi, 1), %rax
-	mov %eax, (jump_vector - base) (%rsi, 1)
-
-	lea (gdt - base) (%rsi, 1), %rax
-	mov %rax, (gdtaddr - base) (%rsi, 1)
-
-	/* Switch to compatibility mode. */
-
-	lidt (idtdesc - base) (%rsi, 1)
-	lgdt (gdtdesc - base) (%rsi, 1)
-
-	/* Update %cs. Thanks to David Miller for pointing this mistake out. */
-	ljmp *(jump_vector - base) (%rsi, 1)
-#endif
-
-cont1:
-	.code32
-
-	/* Update other registers. */
-	mov $0x18, %eax
-	mov %eax, %ds
-	mov %eax, %es
-	mov %eax, %fs
-	mov %eax, %gs
-	mov %eax, %ss
-
-	/* Disable paging. */
-	mov %cr0, %eax
-	and $0x7fffffff, %eax
-	mov %eax, %cr0
-
-	/* Disable amd64. */
-	mov $0xc0000080, %ecx
-	rdmsr
-	and $0xfffffeff, %eax
-	wrmsr
-
-	/* Turn off PAE. */
-	movl %cr4, %eax
-	and $0xffffffcf, %eax
-	mov %eax, %cr4
-
-	jmp cont2
-cont2:
-	.code32
-
-	mov %ebx, %esi
-
-	jmp *%edi
-
-	/* GDT. */
-	.p2align 4
-gdt:
-	/* NULL.  */
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-	/* Reserved.  */
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-	/* Code segment.  */
-	.byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x9A, 0xCF, 0x00
-
-	/* Data segment.  */
-	.byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x92, 0xCF, 0x00
-
-gdtdesc:
-	.word 31
-gdtaddr:
-	.quad gdt
-
-idtdesc:
-	.word 0
-idtaddr:
-	.quad 0
-
-	.p2align 4
-jump_vector:
-	/* Jump location. Is filled by the code */
-	.long 0
-	.long 0x10
-VARIABLE(grub_linux_trampoline_end)

From 8b889c332a127949f729e70bc0d06724413705a4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 17:25:49 +0100
Subject: [PATCH 0262/1628] Fix bug when whole region is free

---
 lib/relocator.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index 889497334..090a6c7e3 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -199,9 +199,9 @@ malloc_in_range (struct grub_relocator *rel,
     grub_mm_region_t r, rp;
     for (rp = NULL, r = grub_mm_base; r; rp = r, r = r->next)
       {
-	grub_dprintf ("relocator", "region %p. %d %d %d\n", r,
+	grub_dprintf ("relocator", "region %p. %d %d %d %d\n", r,
 		      (grub_addr_t) r + r->size + sizeof (*r) >= start,
-		      (grub_addr_t) r < end && r->size + sizeof (*r) >= size,
+		      (grub_addr_t) r < end, r->size + sizeof (*r) >= size,
 		      (rb == NULL || (from_low_priv ? rb > r : rb < r)));
 	if ((grub_addr_t) r + r->size + sizeof (*r) >= start
 	    && (grub_addr_t) r < end && r->size + sizeof (*r) >= size
@@ -224,7 +224,7 @@ malloc_in_range (struct grub_relocator *rel,
   hb = get_best_header (rel, start, end, align, size, rb, &hbp, &best_addr,
 			from_low_priv, collisioncheck);
 
-  grub_dprintf ("relocator", "best header %p/%lx\n", hb,
+  grub_dprintf ("relocator", "best header %p/%p/%lx\n", hb, hbp,
 		(unsigned long) best_addr);
 
   if (!hb)
@@ -253,8 +253,8 @@ malloc_in_range (struct grub_relocator *rel,
 				  - (newreg_start
 				     - (grub_addr_t) rb)) >> GRUB_MM_ALIGN_LOG2;
 	  new_header = (void *) (newreg_start + sizeof (*rb));
-	  if (newhnext == hb->next)
-	    newhnext = newhnext;
+	  if (newhnext == hb)
+	    newhnext = new_header;
 	  new_header->next = newhnext;
 	  new_header->size = newhsize;
 	  new_header->magic = GRUB_MM_FREE_MAGIC;
@@ -280,6 +280,18 @@ malloc_in_range (struct grub_relocator *rel,
 	  rbp->next = newreg;
 	else
 	  grub_mm_base = newreg;
+	{
+	  grub_mm_header_t h = newreg->first, hp = NULL;
+	  do
+	    {
+	      if ((void *) h < (void *) (newreg + 1))
+		grub_fatal ("Failed to adjust memory region: %p, %p, %p, %p, %p",
+			    newreg, newreg->first, h, hp, hb);
+	      hp = h;
+	      h = h->next;
+	    }
+	  while (h != newreg->first);
+	}
       }
       *res = best_addr;
       return 1;

From 8071fb79972a62d06a8bb61321b07aa52ec61adb Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 17:26:47 +0100
Subject: [PATCH 0263/1628] ieee1275 support in linux.c

---
 loader/i386/linux.c | 39 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 9fdf9b445..f7abcf094 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -39,6 +39,10 @@
 #include <grub/efi/efi.h>
 #define HAS_VGA_TEXT 0
 #define DEFAULT_VIDEO_MODE "800x600"
+#elif defined (GRUB_MACHINE_IEEE1275)
+#include <grub/ieee1275/ieee1275.h>
+#define HAS_VGA_TEXT 0
+#define DEFAULT_VIDEO_MODE "text"
 #else
 #include <grub/i386/pc/vbe.h>
 #include <grub/i386/pc/console.h>
@@ -541,6 +545,20 @@ grub_linux_boot (void)
 
   params = real_mode_mem;
 
+#ifdef GRUB_MACHINE_IEEE1275
+  {
+    char *bootpath;
+    grub_ssize_t len;
+
+    bootpath = grub_env_get ("root");
+    if (bootpath)
+      grub_ieee1275_set_property (grub_ieee1275_chosen,
+				  "bootpath", bootpath,
+				  grub_strlen (bootpath) + 1,
+				  &len);
+  }
+#endif
+
   grub_dprintf ("linux", "code32_start = %x\n",
 		(unsigned) params->code32_start);
 
@@ -618,8 +636,6 @@ grub_linux_boot (void)
 #if HAS_VGA_TEXT
       params->have_vga = GRUB_VIDEO_LINUX_TYPE_EGA_TEXT;
       params->video_mode = 0x3;
-      params->video_width = 80;
-      params->video_height = 25;
 #else
       params->have_vga = 0;
       params->video_mode = 0;
@@ -629,17 +645,22 @@ grub_linux_boot (void)
     }
 
   /* Initialize these last, because terminal position could be affected by printfs above.  */
+#ifndef GRUB_MACHINE_IEEE1275
   if (params->have_vga == GRUB_VIDEO_LINUX_TYPE_EGA_TEXT)
+#endif
     {
       grub_term_output_t term;
       int found = 0;
       FOR_ACTIVE_TERM_OUTPUTS(term)
 	if (grub_strcmp (term->name, "vga_text") == 0
-	    || grub_strcmp (term->name, "console") == 0)
+	    || grub_strcmp (term->name, "console") == 0
+	    || grub_strcmp (term->name, "ofconsole") == 0)
 	  {
 	    grub_uint16_t pos = grub_term_getxy (term);
 	    params->video_cursor_x = pos >> 8;
 	    params->video_cursor_y = pos & 0xff;
+	    params->video_width = grub_term_width (term);
+	    params->video_height = grub_term_height (term);
 	    found = 1;
 	    break;
 	  }
@@ -647,9 +668,20 @@ grub_linux_boot (void)
 	{
 	  params->video_cursor_x = 0;
 	  params->video_cursor_y = 0;
+	  params->video_width = 80;
+	  params->video_height = 25;
 	}
     }
 
+#ifdef GRUB_MACHINE_IEEE1275
+  {
+    params->ofw_signature = GRUB_LINUX_OFW_SIGNATURE;
+    params->ofw_num_items = 1;
+    params->ofw_cif_handler = (grub_uint32_t) grub_ieee1275_entry_fn;
+    params->ofw_idt = 0;
+  }
+#endif
+
 #ifdef GRUB_MACHINE_EFI
   {
     grub_efi_uintn_t efi_map_key, efi_desc_size;
@@ -688,6 +720,7 @@ grub_linux_boot (void)
   /*  asm volatile ("lidt %0" : : "m" (idt_desc)); */
   state.ebx = 0;
   state.esi = real_mode_target;
+  state.esp = real_mode_target;
   state.eip = params->code32_start;
   return grub_relocator32_boot (relocator, state);
 }

From 9efe1428614ef9d08bee26a4e739e87eaad07109 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 17:27:45 +0100
Subject: [PATCH 0264/1628] Use linux.c on i386-ieee1275

---
 conf/i386-ieee1275.rmk       |   2 +-
 loader/i386/ieee1275/linux.c | 311 -----------------------------------
 2 files changed, 1 insertion(+), 312 deletions(-)
 delete mode 100644 loader/i386/ieee1275/linux.c

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index b9e192796..28d454ffd 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -97,7 +97,7 @@ serial_mod_CFLAGS = $(COMMON_CFLAGS)
 serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For linux.mod.
-linux_mod_SOURCES = loader/i386/ieee1275/linux.c
+linux_mod_SOURCES = loader/i386/linux.c
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/loader/i386/ieee1275/linux.c b/loader/i386/ieee1275/linux.c
deleted file mode 100644
index 8780804fd..000000000
--- a/loader/i386/ieee1275/linux.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/* linux.c - boot Linux zImage or bzImage */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2010  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/loader.h>
-#include <grub/machine/loader.h>
-#include <grub/machine/memory.h>
-#include <grub/file.h>
-#include <grub/err.h>
-#include <grub/disk.h>
-#include <grub/misc.h>
-#include <grub/types.h>
-#include <grub/mm.h>
-#include <grub/dl.h>
-#include <grub/env.h>
-#include <grub/term.h>
-#include <grub/cpu/linux.h>
-#include <grub/ieee1275/ieee1275.h>
-#include <grub/command.h>
-#include <grub/i18n.h>
-
-#define GRUB_OFW_LINUX_PARAMS_ADDR	0x90000
-#define GRUB_OFW_LINUX_KERNEL_ADDR	0x100000
-#define GRUB_OFW_LINUX_INITRD_ADDR	0x800000
-
-#define GRUB_OFW_LINUX_CL_OFFSET	0x1e00
-#define GRUB_OFW_LINUX_CL_LENGTH	0x100
-
-static grub_dl_t my_mod;
-
-static grub_size_t kernel_size;
-static char *kernel_addr, *kernel_cmdline;
-static grub_size_t initrd_size;
-
-static grub_err_t
-grub_linux_unload (void)
-{
-  grub_free (kernel_cmdline);
-  grub_free (kernel_addr);
-  kernel_cmdline = 0;
-  kernel_addr = 0;
-  initrd_size = 0;
-
-  grub_dl_unref (my_mod);
-
-  return GRUB_ERR_NONE;
-}
-
-/*
-static int
-grub_ieee1275_debug (void)
-{
-  struct enter_args
-  {
-    struct grub_ieee1275_common_hdr common;
-  }
-  args;
-
-  INIT_IEEE1275_COMMON (&args.common, "enter", 0, 0);
-
-  if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
-    return -1;
-
-  return 0;
-}
-*/
-
-static grub_err_t
-grub_linux_boot (void)
-{
-  struct linux_kernel_params *params;
-  struct linux_kernel_header *lh;
-  char *prot_code;
-  char *bootpath;
-  grub_ssize_t len;
-
-  bootpath = grub_env_get ("root");
-  if (bootpath)
-    grub_ieee1275_set_property (grub_ieee1275_chosen,
-                                "bootpath", bootpath,
-                                grub_strlen (bootpath) + 1,
-                                &len);
-
-  params = (struct linux_kernel_params *) GRUB_OFW_LINUX_PARAMS_ADDR;
-  lh = (struct linux_kernel_header *) params;
-
-  grub_memset ((char *) params, 0, GRUB_OFW_LINUX_CL_OFFSET);
-
-  params->alt_mem = grub_mmap_get_upper () >> 10;
-  params->ext_mem = params->alt_mem;
-
-  lh->cmd_line_ptr = (char *)
-        (GRUB_OFW_LINUX_PARAMS_ADDR + GRUB_OFW_LINUX_CL_OFFSET);
-
-  params->cl_magic = GRUB_LINUX_CL_MAGIC;
-  params->cl_offset = GRUB_OFW_LINUX_CL_OFFSET;
-
-  {
-    grub_term_output_t term;
-    int found = 0;
-    FOR_ACTIVE_TERM_OUTPUTS(term)
-      if (grub_strcmp (term->name, "ofconsole") == 0)
-        {
-          grub_uint16_t pos = grub_term_getxy (term);
-          params->video_cursor_x = pos >> 8;
-          params->video_cursor_y = pos & 0xff;
-          params->video_width = grub_term_width (term);
-          params->video_height = grub_term_height (term);
-          found = 1;
-          break;
-        }
-    if (!found)
-      {
-        params->video_cursor_x = 0;
-        params->video_cursor_y = 0;
-        params->video_width = 80;
-        params->video_height = 25;
-      }
-  }
-
-  params->font_size = 16;
-
-  params->ofw_signature = GRUB_LINUX_OFW_SIGNATURE;
-  params->ofw_num_items = 1;
-  params->ofw_cif_handler = (grub_uint32_t) grub_ieee1275_entry_fn;
-  params->ofw_idt = 0;
-
-  if (initrd_size)
-    {
-      lh->type_of_loader = 1;
-      lh->ramdisk_image = GRUB_OFW_LINUX_INITRD_ADDR;
-      lh->ramdisk_size = initrd_size;
-    }
-
-  if (kernel_cmdline)
-    grub_strcpy (lh->cmd_line_ptr, kernel_cmdline);
-
-  prot_code = (char *) GRUB_OFW_LINUX_KERNEL_ADDR;
-  grub_memcpy (prot_code, kernel_addr, kernel_size);
-
-  asm volatile ("movl %0, %%esi" : : "m" (params));
-  asm volatile ("movl %%esi, %%esp" : : );
-  asm volatile ("movl %0, %%ecx" : : "m" (prot_code));
-  asm volatile ("xorl %%ebx, %%ebx" : : );
-  asm volatile ("jmp *%%ecx" : : );
-
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
-		int argc, char *argv[])
-{
-  grub_file_t file = 0;
-  struct linux_kernel_header lh;
-  grub_uint8_t setup_sects;
-  grub_size_t real_size, prot_size;
-  int i;
-  char *dest;
-
-  grub_dl_ref (my_mod);
-
-  if (argc == 0)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "no kernel specified");
-      goto fail;
-    }
-
-  file = grub_file_open (argv[0]);
-  if (! file)
-    goto fail;
-
-  if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
-    {
-      grub_error (GRUB_ERR_READ_ERROR, "cannot read the Linux header");
-      goto fail;
-    }
-
-  if ((lh.boot_flag != grub_cpu_to_le16 (0xaa55)) ||
-      (lh.header != grub_cpu_to_le32 (GRUB_LINUX_MAGIC_SIGNATURE)))
-    {
-      grub_error (GRUB_ERR_BAD_OS, "invalid magic number");
-      goto fail;
-    }
-
-  setup_sects = lh.setup_sects;
-  if (! setup_sects)
-    setup_sects = GRUB_LINUX_DEFAULT_SETUP_SECTS;
-
-  real_size = setup_sects << GRUB_DISK_SECTOR_BITS;
-  prot_size = grub_file_size (file) - real_size - GRUB_DISK_SECTOR_SIZE;
-
-  grub_printf ("   [Linux-%s, setup=0x%x, size=0x%x]\n",
-               "bzImage", real_size, prot_size);
-
-  grub_file_seek (file, real_size + GRUB_DISK_SECTOR_SIZE);
-  if (grub_errno)
-    goto fail;
-
-  kernel_cmdline = grub_malloc (GRUB_OFW_LINUX_CL_LENGTH);
-  if (! kernel_cmdline)
-    goto fail;
-
-  dest = kernel_cmdline;
-  for (i = 1;
-       i < argc
-       && dest + grub_strlen (argv[i]) + 1 < (kernel_cmdline
-                                              + GRUB_OFW_LINUX_CL_LENGTH);
-       i++)
-    {
-      *dest++ = ' ';
-      dest = grub_stpcpy (dest, argv[i]);
-    }
-
-  kernel_addr = grub_malloc (prot_size);
-  if (! kernel_addr)
-    goto fail;
-
-  kernel_size = prot_size;
-  if (grub_file_read (file, kernel_addr, prot_size) != (int) prot_size)
-    grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file");
-
-  if (grub_errno == GRUB_ERR_NONE)
-    grub_loader_set (grub_linux_boot, grub_linux_unload, 1);
-
-fail:
-
-  if (file)
-    grub_file_close (file);
-
-  if (grub_errno != GRUB_ERR_NONE)
-    {
-      grub_free (kernel_cmdline);
-      grub_free (kernel_addr);
-      kernel_cmdline = 0;
-      kernel_addr = 0;
-
-      grub_dl_unref (my_mod);
-    }
-
-  return grub_errno;
-}
-
-static grub_err_t
-grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
-		 int argc, char *argv[])
-{
-  grub_file_t file = 0;
-
-  if (argc == 0)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "no module specified");
-      goto fail;
-    }
-
-  if (! kernel_addr)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "you need to load the kernel first");
-      goto fail;
-    }
-
-  file = grub_file_open (argv[0]);
-  if (! file)
-    goto fail;
-
-  initrd_size = grub_file_size (file);
-  if (grub_file_read (file, (void *) GRUB_OFW_LINUX_INITRD_ADDR,
-                      initrd_size) != (int) initrd_size)
-    {
-      grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file");
-      goto fail;
-    }
-
-fail:
-  if (file)
-    grub_file_close (file);
-
-  return grub_errno;
-}
-
-static grub_command_t cmd_linux, cmd_initrd;
-
-GRUB_MOD_INIT(linux)
-{
-  cmd_linux = grub_register_command ("linux", grub_cmd_linux,
-				     0, N_("Load Linux."));
-  cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
-				      0, N_("Load initrd."));
-  my_mod = mod;
-}
-
-GRUB_MOD_FINI(linux)
-{
-  grub_unregister_command (cmd_linux);
-  grub_unregister_command (cmd_initrd);
-}

From 0599ad1507a99820019811320961c6e1e53e293d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 17:28:20 +0100
Subject: [PATCH 0265/1628] Fix compilation on i386-ieee127

---
 kern/i386/ieee1275/startup.S | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kern/i386/ieee1275/startup.S b/kern/i386/ieee1275/startup.S
index 35258adb6..c8e68215e 100644
--- a/kern/i386/ieee1275/startup.S
+++ b/kern/i386/ieee1275/startup.S
@@ -64,7 +64,3 @@ codestart:
  */
 #include "../realmode.S"
 
-/*
- *  Routines needed by Linux and Multiboot loaders.
- */
-#include "../loader.S"

From ad184204b25d0eae80911fe909e232acbf8a032f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 18:41:49 +0100
Subject: [PATCH 0266/1628] Remove leftover multiboot elpers

---
 include/grub/i386/multiboot.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/include/grub/i386/multiboot.h b/include/grub/i386/multiboot.h
index a3ff3f4da..02402e93d 100644
--- a/include/grub/i386/multiboot.h
+++ b/include/grub/i386/multiboot.h
@@ -19,14 +19,6 @@
 #ifndef GRUB_MULTIBOOT_CPU_HEADER
 #define GRUB_MULTIBOOT_CPU_HEADER	1
 
-/* The asm part of the multiboot loader.  */
-void grub_multiboot_real_boot (grub_addr_t entry,
-			       struct multiboot_info *mbi)
-     __attribute__ ((noreturn));
-void grub_multiboot2_real_boot (grub_addr_t entry,
-				struct multiboot_info *mbi)
-     __attribute__ ((noreturn));
-
 extern struct grub_relocator *grub_multiboot_relocator;
 extern grub_uint32_t grub_multiboot_payload_eip;
 

From 319fc3d2138fc54b2fd9941a4746b9cd27892c84 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 18:44:12 +0100
Subject: [PATCH 0267/1628] Remove became useless i386/multiboot.h

---
 include/grub/i386/multiboot.h | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 include/grub/i386/multiboot.h

diff --git a/include/grub/i386/multiboot.h b/include/grub/i386/multiboot.h
deleted file mode 100644
index 02402e93d..000000000
--- a/include/grub/i386/multiboot.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2003,2004,2007,2008,2009  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/>.
- */
-
-#ifndef GRUB_MULTIBOOT_CPU_HEADER
-#define GRUB_MULTIBOOT_CPU_HEADER	1
-
-extern struct grub_relocator *grub_multiboot_relocator;
-extern grub_uint32_t grub_multiboot_payload_eip;
-
-#endif /* ! GRUB_MULTIBOOT_CPU_HEADER */

From 4a86b371b4619abd3172adc8f2c333a04b669768 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 20:25:08 +0100
Subject: [PATCH 0268/1628] Fix coreboot compilation error

---
 kern/i386/coreboot/startup.S | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kern/i386/coreboot/startup.S b/kern/i386/coreboot/startup.S
index e94950aae..93921f8ba 100644
--- a/kern/i386/coreboot/startup.S
+++ b/kern/i386/coreboot/startup.S
@@ -83,7 +83,3 @@ codestart:
  */
 #include "../realmode.S"
 
-/*
- *  Routines needed by Linux and Multiboot loaders.
- */
-#include "../loader.S"

From 5ffb1b84948d70c1a62ef0ffb7611d604de0f331 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 20:47:05 +0100
Subject: [PATCH 0269/1628] Remove leftover grub_unix_real_boot

---
 include/grub/i386/bsd.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/grub/i386/bsd.h b/include/grub/i386/bsd.h
index 4f5d5d1ee..b431658fe 100644
--- a/include/grub/i386/bsd.h
+++ b/include/grub/i386/bsd.h
@@ -254,8 +254,6 @@ struct grub_netbsd_btinfo_bootdisk
   int partition;
 };
 
-void grub_unix_real_boot (grub_addr_t entry, ...)
-     __attribute__ ((cdecl,noreturn));
 grub_err_t grub_freebsd_load_elfmodule32 (struct grub_relocator *relocator,
 					  grub_file_t file, int argc,
 					  char *argv[], grub_addr_t *kern_end);

From 3f995850a4b794a4462f79322e3317cb3aa1161f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 20:49:13 +0100
Subject: [PATCH 0270/1628] declare grub_multiboot_relocator in multiboot.h.

---
 include/grub/multiboot.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/grub/multiboot.h b/include/grub/multiboot.h
index 75f39daa9..1df152056 100644
--- a/include/grub/multiboot.h
+++ b/include/grub/multiboot.h
@@ -32,6 +32,8 @@
 #include <grub/types.h>
 #include <grub/err.h>
 
+extern struct grub_relocator *grub_multiboot_relocator;
+
 void grub_multiboot (int argc, char *argv[]);
 void grub_module (int argc, char *argv[]);
 

From d3fbca98e126661bb95be7b35928d1d21cbf0395 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 20:50:04 +0100
Subject: [PATCH 0271/1628] Fix type problem

---
 loader/i386/linux.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index f7abcf094..a70798f8b 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -68,7 +68,11 @@ static grub_uint32_t prot_mode_pages;
 static grub_uint32_t initrd_pages;
 static struct grub_relocator *relocator = NULL;
 static void *efi_mmap_buf;
-static grub_size_t efi_mmap_size;
+#ifdef GRUB_MACHINE_EFI
+static grub_efi_uintn_t efi_mmap_size;
+#else
+static const grub_size_t efi_mmap_size = 0;
+#endif
 
 /* FIXME */
 #if 0
@@ -352,8 +356,6 @@ allocate_pages (grub_size_t prot_size)
 
 #ifdef GRUB_MACHINE_EFI
   efi_mmap_size = find_efi_mmap_size ();
-#else
-  efi_mmap_size = 0;
 #endif
 
   grub_dprintf ("linux", "real_size = %x, prot_size = %x, mmap_size = %x\n",

From 3a871558844fa14a1e5c6336b989ae06757fb2fc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 20:51:00 +0100
Subject: [PATCH 0272/1628] Propagate removing of cpu/multiboot.h

---
 loader/i386/multiboot_mbi.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index 4fc9a7ac1..675d4c283 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -22,7 +22,6 @@
 #include <grub/machine/biosnum.h>
 #endif
 #include <grub/multiboot.h>
-#include <grub/cpu/multiboot.h>
 #include <grub/disk.h>
 #include <grub/device.h>
 #include <grub/partition.h>

From c34a120a01730144d616636266b0da634e9a65b6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 20:55:34 +0100
Subject: [PATCH 0273/1628] Move linux.mod to conf/i386.rmk

---
 conf/i386-coreboot.rmk | 8 +-------
 conf/i386-efi.rmk      | 7 +------
 conf/i386-ieee1275.rmk | 7 +------
 conf/i386-pc.rmk       | 5 -----
 conf/i386.rmk          | 6 ++++++
 conf/x86_64-efi.rmk    | 8 +-------
 6 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 6b3d32847..ec67bb30f 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -102,8 +102,7 @@ bin_SCRIPTS += grub-mkrescue
 grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 # Modules.
-pkglib_MODULES = linux.mod 				\
-	aout.mod play.mod serial.mod 			\
+pkglib_MODULES = aout.mod play.mod serial.mod		\
 	memdisk.mod pci.mod lspci.mod reboot.mod	\
 	halt.mod datetime.mod date.mod datehook.mod	\
 	lsmmap.mod mmap.mod
@@ -120,11 +119,6 @@ mmap_mod_CFLAGS = $(COMMON_CFLAGS)
 mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For reboot.mod.
 reboot_mod_SOURCES = commands/reboot.c
 reboot_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index 3846fa9f2..959cc2355 100644
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -31,7 +31,7 @@ grub_install_SOURCES = util/i386/efi/grub-install.in
 
 # Modules.
 pkglib_MODULES = kernel.img chain.mod appleldr.mod \
-	linux.mod halt.mod reboot.mod pci.mod lspci.mod \
+	halt.mod reboot.mod pci.mod lspci.mod \
 	datetime.mod date.mod datehook.mod loadbios.mod \
 	fixvideo.mod mmap.mod acpi.mod
 
@@ -93,11 +93,6 @@ appleldr_mod_SOURCES = loader/efi/appleloader.c
 appleldr_mod_CFLAGS = $(COMMON_CFLAGS)
 appleldr_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod.
 halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 28d454ffd..c58547f49 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -55,7 +55,7 @@ grub_install_SOURCES = util/ieee1275/grub-install.in
 
 # Modules.
 pkglib_MODULES = halt.mod reboot.mod suspend.mod		\
-	aout.mod serial.mod linux.mod		\
+	aout.mod serial.mod 		\
 	nand.mod memdisk.mod pci.mod lspci.mod datetime.mod	\
 	date.mod datehook.mod lsmmap.mod mmap.mod
 
@@ -96,11 +96,6 @@ serial_mod_SOURCES = term/i386/pc/serial.c
 serial_mod_CFLAGS = $(COMMON_CFLAGS)
 serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For nand.mod.
 nand_mod_SOURCES = disk/ieee1275/nand.c
 nand_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 6c4f64f91..dbec54398 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -174,11 +174,6 @@ linux16_mod_SOURCES = loader/i386/pc/linux.c
 linux16_mod_CFLAGS = $(COMMON_CFLAGS)
 linux16_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-pkglib_MODULES += linux.mod
-linux_mod_SOURCES = loader/i386/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 pkglib_MODULES += xnu.mod
 xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c \
 	 loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
diff --git a/conf/i386.rmk b/conf/i386.rmk
index d7417f444..bf6d7425b 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -27,3 +27,9 @@ pkglib_MODULES += ata.mod
 ata_mod_SOURCES = disk/ata.c
 ata_mod_CFLAGS = $(COMMON_CFLAGS)
 ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For linux.mod.
+pkglib_MODULES += linux.mod
+linux_mod_SOURCES = loader/i386/linux.c
+linux_mod_CFLAGS = $(COMMON_CFLAGS)
+linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 0ee09655f..6db4c9569 100644
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -30,7 +30,7 @@ grub_install_SOURCES = util/i386/efi/grub-install.in
 
 # Modules.
 pkglib_MODULES = kernel.img chain.mod appleldr.mod 	\
-	halt.mod reboot.mod linux.mod pci.mod lspci.mod \
+	halt.mod reboot.mod pci.mod lspci.mod \
 	datetime.mod date.mod datehook.mod loadbios.mod \
 	fixvideo.mod mmap.mod acpi.mod ata.mod
 
@@ -93,12 +93,6 @@ appleldr_mod_SOURCES = loader/efi/appleloader.c
 appleldr_mod_CFLAGS = $(COMMON_CFLAGS)
 appleldr_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod.
 halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)

From 021f5a22157cf9773f570802bd0ab1975e914a41 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 20:56:57 +0100
Subject: [PATCH 0274/1628] Remove leftovers in multiboot.c

---
 loader/i386/multiboot.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index be11fe20b..f7bf2a774 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -32,9 +32,7 @@
 
 #include <grub/loader.h>
 #include <grub/multiboot.h>
-#include <grub/machine/init.h>
 #include <grub/machine/memory.h>
-#include <grub/cpu/multiboot.h>
 #include <grub/elf.h>
 #include <grub/aout.h>
 #include <grub/file.h>
@@ -48,7 +46,7 @@
 
 extern grub_dl_t my_mod;
 struct grub_relocator *grub_multiboot_relocator = NULL;
-grub_uint32_t grub_multiboot_payload_eip;
+static grub_uint32_t grub_multiboot_payload_eip;
 
 static grub_err_t
 grub_multiboot_boot (void)

From c30074e344b6a2e91a9d24eb2afe976a462779ad Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 21:00:46 +0100
Subject: [PATCH 0275/1628] Cleanup in bsd loaders

---
 loader/i386/bsd.c   | 16 ++++++++--------
 loader/i386/bsdXX.c |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 9c42f6a5c..f2ac4043d 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -17,9 +17,8 @@
  */
 
 #include <grub/loader.h>
-#include <grub/cpu/bsd.h>
+#include <grub/i386/bsd.h>
 #include <grub/i386/cpuid.h>
-#include <grub/machine/init.h>
 #include <grub/machine/memory.h>
 #include <grub/memory.h>
 #include <grub/file.h>
@@ -42,7 +41,7 @@
 #include <grub/device.h>
 #include <grub/partition.h>
 #include <grub/relocator.h>
-#include <grub/cpu/relocator.h>
+#include <grub/i386/relocator.h>
 
 #define ALIGN_DWORD(a)	ALIGN_UP (a, 4)
 #define ALIGN_QWORD(a)	ALIGN_UP (a, 8)
@@ -313,7 +312,7 @@ grub_freebsd_add_mmap (void)
 		  (unsigned long long) mmap_buf[i].addr,
 		  (unsigned long long) mmap_buf[i].size);
 
-  grub_dprintf ("bsd", "%d entries in smap\n", mmap - mmap_buf);
+  grub_dprintf ("bsd", "%ld entries in smap\n", (long) (mmap - mmap_buf));
   grub_freebsd_add_meta (FREEBSD_MODINFO_METADATA |
 			 FREEBSD_MODINFOMD_SMAP, mmap_buf, len);
 
@@ -413,9 +412,9 @@ grub_freebsd_list_modules (void)
 	  break;
 	case FREEBSD_MODINFO_ADDR:
 	  {
-	    grub_addr_t addr;
+	    grub_uint32_t addr;
 
-	    addr = *((grub_addr_t *) (mod_buf + pos));
+	    addr = *((grub_uint32_t *) (mod_buf + pos));
 	    grub_printf ("    0x%08x", addr);
 	    break;
 	  }
@@ -579,6 +578,7 @@ grub_freebsd_boot (void)
 					      GRUB_RELOCATOR_PREFERENCE_NONE);
       if (err)
 	return err;
+
       grub_memcpy (&stack[8], &bi, sizeof (bi));
       state.eip = entry;
       state.esp = stack_target;
@@ -1032,8 +1032,8 @@ grub_bsd_load_elf (grub_elf_t elf)
       if (err)
 	return err;
 
-      grub_dprintf ("bsd", "kern_start = %x, kern_end = %x\n", kern_start,
-		    kern_end);
+      grub_dprintf ("bsd", "kern_start = %lx, kern_end = %lx\n",
+		    (unsigned long) kern_start, (unsigned long) kern_end);
       err = grub_relocator_alloc_chunk_addr (relocator, &kern_chunk_src,
 					     kern_start, kern_end - kern_start);
       if (err)
diff --git a/loader/i386/bsdXX.c b/loader/i386/bsdXX.c
index ad6c1bc75..41dfe89e4 100644
--- a/loader/i386/bsdXX.c
+++ b/loader/i386/bsdXX.c
@@ -1,9 +1,9 @@
 #include <grub/loader.h>
-#include <grub/cpu/bsd.h>
+#include <grub/i386/bsd.h>
 #include <grub/mm.h>
 #include <grub/elf.h>
 #include <grub/misc.h>
-#include <grub/cpu/relocator.h>
+#include <grub/i386/relocator.h>
 
 #define ALIGN_PAGE(a)	ALIGN_UP (a, 4096)
 

From 8874cbbded80526db0e0049b1bd0f7a9a252e06a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 21:04:19 +0100
Subject: [PATCH 0276/1628] Initial multi-i386 support for *BSD

---
 conf/i386-coreboot.rmk | 14 +-------------
 conf/i386-pc.rmk       | 13 +------------
 conf/i386.rmk          | 13 +++++++++++++
 loader/i386/bsd.c      | 15 +++++++++++++++
 4 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index ec67bb30f..6ed6c54ac 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -102,7 +102,7 @@ bin_SCRIPTS += grub-mkrescue
 grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 # Modules.
-pkglib_MODULES = aout.mod play.mod serial.mod		\
+pkglib_MODULES = play.mod serial.mod		\
 	memdisk.mod pci.mod lspci.mod reboot.mod	\
 	halt.mod datetime.mod date.mod datehook.mod	\
 	lsmmap.mod mmap.mod
@@ -150,18 +150,6 @@ multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
 multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
-# For aout.mod.
-aout_mod_SOURCES = loader/aout.c
-aout_mod_CFLAGS = $(COMMON_CFLAGS)
-aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For bsd.mod
-pkglib_MODULES += bsd.mod
-bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c
-bsd_mod_CFLAGS = $(COMMON_CFLAGS)
-bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
 # For play.mod.
 play_mod_SOURCES = commands/i386/pc/play.c
 play_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index dbec54398..0a90bd746 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -119,7 +119,7 @@ pkglib_MODULES = biosdisk.mod chain.mod 				\
 	reboot.mod halt.mod				\
 	vbe.mod vbetest.mod vbeinfo.mod play.mod serial.mod		\
 	vga.mod memdisk.mod pci.mod lspci.mod				\
-	aout.mod bsd.mod pxe.mod pxecmd.mod datetime.mod date.mod 	\
+	pxe.mod pxecmd.mod datetime.mod date.mod 	\
 	datehook.mod lsmmap.mod ata_pthru.mod hdparm.mod 		\
 	usb.mod uhci.mod ohci.mod usbtest.mod usbms.mod usb_keyboard.mod \
 	efiemu.mod mmap.mod acpi.mod drivemap.mod
@@ -253,17 +253,6 @@ lspci_mod_SOURCES = commands/lspci.c
 lspci_mod_CFLAGS = $(COMMON_CFLAGS)
 lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For aout.mod
-aout_mod_SOURCES = loader/aout.c
-aout_mod_CFLAGS = $(COMMON_CFLAGS)
-aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For bsd.mod
-bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c
-bsd_mod_CFLAGS = $(COMMON_CFLAGS)
-bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
 # For usb.mod
 usb_mod_SOURCES = bus/usb/usb.c bus/usb/usbtrans.c bus/usb/usbhub.c
 usb_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/i386.rmk b/conf/i386.rmk
index bf6d7425b..cebe67eaf 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -33,3 +33,16 @@ pkglib_MODULES += linux.mod
 linux_mod_SOURCES = loader/i386/linux.c
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For aout.mod
+pkglib_MODULES += aout.mod
+aout_mod_SOURCES = loader/aout.c
+aout_mod_CFLAGS = $(COMMON_CFLAGS)
+aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For bsd.mod
+pkglib_MODULES += bsd.mod
+bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c
+bsd_mod_CFLAGS = $(COMMON_CFLAGS)
+bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
+bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index f2ac4043d..801eb9dfd 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -37,6 +37,9 @@
 #ifdef GRUB_MACHINE_PCBIOS
 #include <grub/machine/biosnum.h>
 #endif
+#ifdef GRUB_MACHINE_EFI
+#include <grub/efi/efi.h>
+#endif
 #include <grub/disk.h>
 #include <grub/device.h>
 #include <grub/partition.h>
@@ -553,6 +556,9 @@ grub_freebsd_boot (void)
       if (err)
 	return err;
 
+      if (! grub_efi_finish_boot_services ())
+	grub_fatal ("cannot exit boot services");
+
       pagetable = p - (4096 * 3);
       fill_bsd64_pagetable (pagetable, (pagetable - p0) + p_target);
 
@@ -579,6 +585,9 @@ grub_freebsd_boot (void)
       if (err)
 	return err;
 
+      if (! grub_efi_finish_boot_services ())
+	grub_fatal ("cannot exit boot services");
+
       grub_memcpy (&stack[8], &bi, sizeof (bi));
       state.eip = entry;
       state.esp = stack_target;
@@ -684,6 +693,9 @@ grub_openbsd_boot (void)
   buf = (grub_uint8_t *) pa;
   argbuf_target_end = buf - buf0 + buf_target;
 
+  if (! grub_efi_finish_boot_services ())
+    grub_fatal ("cannot exit boot services");
+
   state.eip = entry;
   state.esp = ((grub_uint8_t *) stack - buf0) + buf_target;
   stack[0] = entry;
@@ -804,6 +816,9 @@ grub_netbsd_boot (void)
   if (err)
     return err;
 
+  if (! grub_efi_finish_boot_services ())
+    grub_fatal ("cannot exit boot services");
+
   state.eip = entry;
   state.esp = stack_target;
   stack[0] = entry;

From 0c31c22bda4662340cbaf46c66a89213319d84e4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 21:06:49 +0100
Subject: [PATCH 0277/1628] Remove leftover aout.mod

---
 conf/i386-ieee1275.rmk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index c58547f49..4d652a504 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -54,8 +54,7 @@ sbin_SCRIPTS = grub-install
 grub_install_SOURCES = util/ieee1275/grub-install.in
 
 # Modules.
-pkglib_MODULES = halt.mod reboot.mod suspend.mod		\
-	aout.mod serial.mod 		\
+pkglib_MODULES = halt.mod reboot.mod suspend.mod serial.mod	\
 	nand.mod memdisk.mod pci.mod lspci.mod datetime.mod	\
 	date.mod datehook.mod lsmmap.mod mmap.mod
 
@@ -71,11 +70,6 @@ mmap_mod_CFLAGS = $(COMMON_CFLAGS)
 mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
-# For aout.mod.
-aout_mod_SOURCES = loader/aout.c
-aout_mod_CFLAGS = $(COMMON_CFLAGS)
-aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For suspend.mod
 suspend_mod_SOURCES = commands/ieee1275/suspend.c
 suspend_mod_CFLAGS = $(COMMON_CFLAGS)

From 6d8ebf76c412080434c47258a50475249f9f4faf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 13 Jan 2010 23:17:12 +0100
Subject: [PATCH 0278/1628] support relocator64 from x86_64 mode

---
 lib/i386/relocator64.S | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/lib/i386/relocator64.S b/lib/i386/relocator64.S
index 05627fb90..37a77b3b5 100644
--- a/lib/i386/relocator64.S
+++ b/lib/i386/relocator64.S
@@ -43,13 +43,13 @@ LOCAL(base):
 	add	$(LOCAL(cont0) - LOCAL(base)), RAX
 	jmp	*RAX
 LOCAL(cont0):
+#ifndef __x86_64__
 	lea	(LOCAL(cont1) - LOCAL(base)) (RSI, 1), RAX
 	mov	RAX, (LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
 
 	lea	(LOCAL(gdt) - LOCAL(base)) (RSI, 1), RAX
 	mov	RAX, (LOCAL(gdt_addr) - LOCAL(base)) (RSI, 1)
 
-#ifndef __x86_64__
 	/* Disable paging. */
 	movl	%cr0, %eax
 	andl	$(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax
@@ -76,6 +76,12 @@ VARIABLE(grub_relocator64_cr3)
 	movl	%cr0, %eax
 	orl	$GRUB_MEMORY_CPU_CR0_PAGING_ON, %eax
 	movl	%eax, %cr0
+
+	/* Load GDT. */
+	lgdt	(LOCAL(gdtdesc) - LOCAL(base)) (RSI, 1)
+
+	/* Update %cs.  */
+	ljmp	*(LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
 #else
 	/* mov imm64, %rax */
 	.byte 	0x48
@@ -84,11 +90,6 @@ VARIABLE(grub_relocator64_cr3)
 	.quad	0
 	movq	%rax, %cr3
 #endif
-	/* Load GDT. */
-	lgdt	(LOCAL(gdtdesc) - LOCAL(base)) (RSI, 1)
-
-	/* Update %cs.  */
-	ljmp	*(LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
 
 LOCAL(cont1):
 	.code64
@@ -143,6 +144,7 @@ LOCAL(jump_addr):
 VARIABLE(grub_relocator64_rip)
 	.quad	0
 
+#ifndef __x86_64__
 	.p2align	4
 LOCAL(gdt):
 	/* NULL.  */
@@ -185,22 +187,14 @@ LOCAL(gdt):
 LOCAL(gdtdesc):
 	.word	0x20
 LOCAL(gdt_addr):
-#ifdef __x86_64__
-	/* Filled by the code. */
-	.quad	0
-#else
 	/* Filled by the code. */
 	.long	0
-#endif
 
 	.p2align	4
 LOCAL(jump_vector):
 	/* Jump location. Is filled by the code */
-#ifdef __x86_64__
-	.quad	0
-#else
 	.long	0
-#endif
 	.long	CODE64_SEGMENT
+#endif
 
 VARIABLE(grub_relocator64_end)

From ea96d34596f92abfe7f52f4c24f74c0cea043aa1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 14 Jan 2010 13:40:17 +0100
Subject: [PATCH 0279/1628] Clarify type of bi_kernelname and bi_nfs_diskless

---
 include/grub/i386/bsd.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/grub/i386/bsd.h b/include/grub/i386/bsd.h
index b431658fe..f68539a3c 100644
--- a/include/grub/i386/bsd.h
+++ b/include/grub/i386/bsd.h
@@ -97,8 +97,8 @@ enum bsd_kernel_types
 struct grub_freebsd_bootinfo
 {
   grub_uint32_t bi_version;
-  grub_uint8_t *bi_kernelname;
-  struct nfs_diskless *bi_nfs_diskless;
+  grub_uint32_t bi_kernelname;
+  grub_uint32_t bi_nfs_diskless;
   grub_uint32_t bi_n_bios_used;
   grub_uint32_t bi_bios_geom[FREEBSD_N_BIOS_GEOM];
   grub_uint32_t bi_size;

From 6a42fe54db23e792738a931f5d4960ecab46a478 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 14 Jan 2010 19:12:24 +0100
Subject: [PATCH 0280/1628] Add missing #ifdef

---
 loader/i386/bsd.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 801eb9dfd..58af4eb7d 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -556,8 +556,10 @@ grub_freebsd_boot (void)
       if (err)
 	return err;
 
+#ifdef GRUB_MACHINE_EFI
       if (! grub_efi_finish_boot_services ())
 	grub_fatal ("cannot exit boot services");
+#endif
 
       pagetable = p - (4096 * 3);
       fill_bsd64_pagetable (pagetable, (pagetable - p0) + p_target);
@@ -585,8 +587,10 @@ grub_freebsd_boot (void)
       if (err)
 	return err;
 
+#ifdef GRUB_MACHINE_EFI
       if (! grub_efi_finish_boot_services ())
 	grub_fatal ("cannot exit boot services");
+#endif
 
       grub_memcpy (&stack[8], &bi, sizeof (bi));
       state.eip = entry;
@@ -693,8 +697,10 @@ grub_openbsd_boot (void)
   buf = (grub_uint8_t *) pa;
   argbuf_target_end = buf - buf0 + buf_target;
 
+#ifdef GRUB_MACHINE_EFI
   if (! grub_efi_finish_boot_services ())
     grub_fatal ("cannot exit boot services");
+#endif
 
   state.eip = entry;
   state.esp = ((grub_uint8_t *) stack - buf0) + buf_target;
@@ -816,8 +822,10 @@ grub_netbsd_boot (void)
   if (err)
     return err;
 
+#ifdef GRUB_MACHINE_EFI
   if (! grub_efi_finish_boot_services ())
     grub_fatal ("cannot exit boot services");
+#endif
 
   state.eip = entry;
   state.esp = stack_target;

From 4a04699258764201f3f5dffbd974740c4e4e5603 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 14 Jan 2010 19:14:04 +0100
Subject: [PATCH 0281/1628] Fix a mistake with size calculation

---
 lib/relocator.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index 090a6c7e3..b7fe404c3 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -308,12 +308,12 @@ malloc_in_range (struct grub_relocator *rel,
 
     if (best_addr - (grub_addr_t) hb >= sizeof (*hb))
       {
-	hb->size = (best_addr - (grub_addr_t) hb) >> GRUB_MM_ALIGN_LOG2;
+	hb->size = ((best_addr - (grub_addr_t) hb) >> GRUB_MM_ALIGN_LOG2) - 1;
 	if (foll)
 	  {
 	    foll->next = hb;
 	    hbp->next = foll;
-	    if (rb->first == hbp)
+	    if (rb->first == hb)
 	      rb->first = foll;
 	  }
       }

From 865a0f8aa7dfbc98d40cc3bda9bc816e2d1f5e3f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 14 Jan 2010 19:14:24 +0100
Subject: [PATCH 0282/1628] elf symbols

---
 include/grub/multiboot.h      |  3 ++
 loader/i386/multiboot_elfxx.c | 61 +++++++++++++++++++++++++++++++++++
 loader/i386/multiboot_mbi.c   | 32 +++++++++++++++++-
 3 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/include/grub/multiboot.h b/include/grub/multiboot.h
index 1df152056..830490170 100644
--- a/include/grub/multiboot.h
+++ b/include/grub/multiboot.h
@@ -43,6 +43,9 @@ grub_err_t grub_multiboot_init_mbi (int argc, char *argv[]);
 grub_err_t grub_multiboot_add_module (grub_addr_t start, grub_size_t size,
 				      int argc, char *argv[]);
 void grub_multiboot_set_bootdev (void);
+void
+grub_multiboot_add_elfsyms (grub_size_t num, grub_size_t entsize,
+			    unsigned shndx, void *data);
 
 
 #endif /* ! GRUB_MULTIBOOT_HEADER */
diff --git a/loader/i386/multiboot_elfxx.c b/loader/i386/multiboot_elfxx.c
index 155de5801..d996835a5 100644
--- a/loader/i386/multiboot_elfxx.c
+++ b/loader/i386/multiboot_elfxx.c
@@ -129,6 +129,67 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
   if (i == ehdr->e_phnum)
     return grub_error (GRUB_ERR_BAD_OS, "entry point isn't in a segment");
 
+  if (ehdr->e_shnum)
+    {
+      grub_uint8_t *shdr, *shdrptr;
+
+      shdr = grub_malloc (ehdr->e_shnum * ehdr->e_shentsize);
+      if (!shdr)
+	return grub_errno;
+      
+      if (grub_file_seek (file, ehdr->e_shoff) == (grub_off_t) -1)
+	return grub_error (GRUB_ERR_BAD_OS,
+			   "invalid offset to section headers");
+
+      if (grub_file_read (file, shdr, ehdr->e_shnum * ehdr->e_shentsize)
+              != (grub_ssize_t) ehdr->e_shnum * ehdr->e_shentsize)
+	return grub_error (GRUB_ERR_BAD_OS,
+			   "couldn't read sections headers from file");
+      
+      for (shdrptr = shdr, i = 0; i < ehdr->e_shnum;
+	   shdrptr += ehdr->e_shentsize, i++)
+	{
+	  Elf_Shdr *sh = (Elf_Shdr *) shdrptr;
+	  void *src;
+	  grub_addr_t target;
+	  grub_err_t err;
+
+	  /* This section is a loaded section,
+	     so we don't care.  */
+	  if (sh->sh_addr != 0)
+	    continue;
+		      
+	  /* This section is empty, so we don't care.  */
+	  if (sh->sh_size == 0)
+	    continue;
+
+	  err 
+	    = grub_relocator_alloc_chunk_align (grub_multiboot_relocator,
+						&src, &target, 0,
+						(0xffffffff - sh->sh_size) + 1,
+						sh->sh_size,
+						sh->sh_addralign,
+						GRUB_RELOCATOR_PREFERENCE_NONE);
+	  if (err)
+	    {
+	      grub_dprintf ("multiboot_loader", "Error loading shdr %d\n", i);
+	      return err;
+	    }
+
+	  if (grub_file_seek (file, sh->sh_offset) == (grub_off_t) -1)
+	    return grub_error (GRUB_ERR_BAD_OS,
+			       "invalid offset in section header");
+
+          if (grub_file_read (file, src, sh->sh_size)
+              != (grub_ssize_t) sh->sh_size)
+	    return grub_error (GRUB_ERR_BAD_OS,
+			       "couldn't read segment from file");
+	  sh->sh_addr = target;
+	}
+      grub_multiboot_add_elfsyms (ehdr->e_shnum, ehdr->e_shentsize,
+				  ehdr->e_shstrndx, shdr);
+    }
+
 #undef phdr
 
   return grub_errno;
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index 675d4c283..dbc8dcdfd 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -46,6 +46,9 @@ static unsigned modcnt;
 static char *cmdline = NULL;
 static grub_uint32_t bootdev;
 static int bootdev_set;
+static grub_size_t elf_sec_num, elf_sec_entsize;
+static unsigned elf_sec_shstrndx;
+static void *elf_sections;
 
 /* Return the length of the Multiboot mmap that will be needed to allocate
    our platform's map.  */
@@ -73,7 +76,8 @@ grub_multiboot_get_mbi_size (void)
 {
   return sizeof (struct multiboot_info) + ALIGN_UP (cmdline_size, 4)
     + modcnt * sizeof (struct multiboot_mod_list) + total_modcmd
-    + ALIGN_UP (sizeof(PACKAGE_STRING), 4) + grub_get_multiboot_mmap_len ();
+    + ALIGN_UP (sizeof(PACKAGE_STRING), 4) + grub_get_multiboot_mmap_len ()
+    + elf_sec_entsize * elf_sec_num;
 }
 
 /* Fill previously allocated Multiboot mmap.  */
@@ -192,9 +196,30 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
       mbi->flags |= MULTIBOOT_INFO_BOOTDEV;
     }
 
+  if (elf_sec_num)
+    {
+      mbi->u.elf_sec.addr = ptrdest;
+      grub_memcpy (ptrorig, elf_sections, elf_sec_entsize * elf_sec_num);
+      mbi->u.elf_sec.num = elf_sec_num;
+      mbi->u.elf_sec.size = elf_sec_entsize;
+      mbi->u.elf_sec.shndx = elf_sec_shstrndx;
+
+      mbi->flags |= MULTIBOOT_INFO_ELF_SHDR;
+    }
+
   return GRUB_ERR_NONE;
 }
 
+void
+grub_multiboot_add_elfsyms (grub_size_t num, grub_size_t entsize,
+			    unsigned shndx, void *data)
+{
+  elf_sec_num = num;
+  elf_sec_shstrndx = shndx;
+  elf_sec_entsize = entsize;
+  elf_sections = data;
+}
+
 void
 grub_multiboot_free_mbi (void)
 {
@@ -215,6 +240,11 @@ grub_multiboot_free_mbi (void)
     }
   modules = NULL;
   modules_last = NULL;
+
+  grub_free (elf_sections);
+  elf_sections = NULL;
+  elf_sec_entsize = 0;
+  elf_sec_num = 0;
 }
 
 grub_err_t

From 885d1a8d9090fe19e05dddea39ac5e689e75a7ec Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Thu, 14 Jan 2010 20:33:10 +0000
Subject: [PATCH 0283/1628] Support --help and --version in grub-bin2h.

---
 ChangeLog.kernel-font |  2 +-
 conf/common.rmk       |  2 +-
 util/bin2h.c          | 66 ++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.kernel-font b/ChangeLog.kernel-font
index 69e3dafe8..3842f9b51 100644
--- a/ChangeLog.kernel-font
+++ b/ChangeLog.kernel-font
@@ -34,7 +34,7 @@
 	used. Call print_glyphs.
 	* Makefile.in (pkgdata_DATA): Add `font/ascii.h'.
 
-2010-01-10  Robert Millan  <rmh.grub@aybabtu.com>
+2010-01-14  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* conf/common.rmk (bin_UTILITIES): Add `grub-bin2h'.
 	(grub_bin2h_SOURCES): New variable.
diff --git a/conf/common.rmk b/conf/common.rmk
index 0a67cf0cf..ee503f8b6 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -89,7 +89,7 @@ bin_UTILITIES += grub-mkrelpath
 grub_mkrelpath_SOURCES = gnulib/progname.c util/grub-mkrelpath.c util/misc.c
 
 bin_UTILITIES += grub-bin2h
-grub_bin2h_SOURCES = util/bin2h.c
+grub_bin2h_SOURCES = gnulib/progname.c util/bin2h.c
 
 # For the parser.
 grub_script.tab.c grub_script.tab.h: script/parser.y
diff --git a/util/bin2h.c b/util/bin2h.c
index 4139b52eb..5ce47f086 100644
--- a/util/bin2h.c
+++ b/util/bin2h.c
@@ -15,22 +15,80 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#define _GNU_SOURCE	1
+#include <getopt.h>
+
+#include "progname.h"
+
+static struct option options[] =
+  {
+    {"help", no_argument, 0, 'h' },
+    {"version", no_argument, 0, 'V' },
+    {0, 0, 0, 0 }
+  };
+
+static void
+usage (int status)
+{
+  if (status)
+    fprintf (stderr,
+	     "Try ``%s --help'' for more information.\n", program_name);
+  else
+    printf ("\
+Usage: %s [OPTIONS] SYMBOL-NAME\n\
+\n\
+  -h, --help                display this message and exit\n\
+  -V, --version             print version information and exit\n\
+\n\
+Report bugs to <%s>.\n\
+", program_name, PACKAGE_BUGREPORT);
+
+  exit (status);
+}
+
 int
 main (int argc, char *argv[])
 {
   int b, i;
   char *sym;
 
-  if (argc != 2)
+  set_program_name (argv[0]);
+
+  /* Check for options.  */
+  while (1)
     {
-      fprintf (stderr, "Usage: %s symbol_name\n", argv[0]);
-      exit (1);
+      int c = getopt_long (argc, argv, "snm:r:hVv", options, 0);
+
+      if (c == -1)
+	break;
+      else
+	switch (c)
+	  {
+	  case 'h':
+	    usage (0);
+	    break;
+
+	  case 'V':
+	    printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
+	    return 0;
+
+	  default:
+	    usage (1);
+	    break;
+	  }
     }
 
-  sym = argv[1];
+  if (optind >= argc)
+    usage (1);
+  
+  if (optind + 1 != argc)
+    usage (1);
+
+  sym = argv[optind];
 
   b = getchar ();
   if (b == EOF)

From 9205ac07e3a1a8c4214298f4a6507c6a5a8f549d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 14 Jan 2010 22:06:26 +0100
Subject: [PATCH 0284/1628] Fix off-by-one error

---
 lib/relocator.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index b7fe404c3..3e93abbaa 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -161,7 +161,7 @@ get_best_header (struct grub_relocator *rel,
     {
       grub_addr_t allowable_start, allowable_end;
       allowable_start = (grub_addr_t) h;
-      allowable_end = (grub_addr_t) (h + 1 + h->size);
+      allowable_end = (grub_addr_t) (h + h->size);
 
       try_addr (allowable_start, allowable_end);
 
@@ -308,7 +308,7 @@ malloc_in_range (struct grub_relocator *rel,
 
     if (best_addr - (grub_addr_t) hb >= sizeof (*hb))
       {
-	hb->size = ((best_addr - (grub_addr_t) hb) >> GRUB_MM_ALIGN_LOG2) - 1;
+	hb->size = ((best_addr - (grub_addr_t) hb) >> GRUB_MM_ALIGN_LOG2);
 	if (foll)
 	  {
 	    foll->next = hb;

From b4f58b4aec8455d5ea0162e7b1ff163c944ab0cf Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Thu, 14 Jan 2010 22:17:05 +0100
Subject: [PATCH 0285/1628] Fix $srcdir != $builddir build by moving ascii.h to
 top dir.

---
 ChangeLog.kernel-font | 4 ++--
 Makefile.in           | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.kernel-font b/ChangeLog.kernel-font
index 3842f9b51..576c85904 100644
--- a/ChangeLog.kernel-font
+++ b/ChangeLog.kernel-font
@@ -6,7 +6,7 @@
 
 	* font/font.c (GENERATE_ASCII): Change the name to USE_ASCII_FAILBACK.
 	By default: disabled.
-	* Makefile.in (font/ascii.h): Remove the non-needed grub/bin2h size
+	* Makefile.in (ascii.h): Remove the non-needed grub/bin2h size
 	parameter.
 
 2010-01-10  Carles Pina i Estany  <carles@pina.cat>
@@ -32,7 +32,7 @@
 	(write_font_p2): ... this. Remove print_glyphs call.
 	(main): Use file_format. Implement code for ranges if ascii-bitmaps is
 	used. Call print_glyphs.
-	* Makefile.in (pkgdata_DATA): Add `font/ascii.h'.
+	* Makefile.in (pkgdata_DATA): Add `ascii.h'.
 
 2010-01-14  Robert Millan  <rmh.grub@aybabtu.com>
 
diff --git a/Makefile.in b/Makefile.in
index c551a0d79..a3084c69a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -234,7 +234,7 @@ else
 
 ifeq ($(enable_grub_mkfont),yes)
 
-pkgdata_DATA += unicode.pf2 ascii.pf2 font/ascii.h
+pkgdata_DATA += unicode.pf2 ascii.pf2 ascii.h
 
 # Arrows and lines are needed to draw the menu, so we always include them
 UNICODE_ARROWS=0x2190-0x2193
@@ -246,11 +246,11 @@ unicode.pf2: $(FONT_SOURCE) grub-mkfont
 ascii.pf2: $(FONT_SOURCE) grub-mkfont
 	$(builddir)/grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
 
-font/ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
+ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
 	$(builddir)/grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE)
 
-font/ascii.h: font/ascii.bitmaps grub-bin2h
-	$(builddir)/grub-bin2h ascii_bitmaps < font/ascii.bitmaps > font/ascii.h
+ascii.h: ascii.bitmaps grub-bin2h
+	$(builddir)/grub-bin2h ascii_bitmaps < $< > $@
 
 TARGET_CFLAGS += -DUSE_ASCII_FAILBACK=1
 endif

From def6307401695e742fdf6eaf7b894c696684cd32 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 15 Jan 2010 11:34:22 +0100
Subject: [PATCH 0286/1628] Be paranoid in relocator allocations

---
 lib/relocator.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index 3e93abbaa..0064824a4 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -163,6 +163,9 @@ get_best_header (struct grub_relocator *rel,
       allowable_start = (grub_addr_t) h;
       allowable_end = (grub_addr_t) (h + h->size);
 
+      if (h->magic != GRUB_MM_FREE_MAGIC)
+	grub_fatal ("free magic is broken at %p: 0x%x", h, h->magic);
+
       try_addr (allowable_start, allowable_end);
 
       if ((grub_addr_t) h == (grub_addr_t) (rb + 1))
@@ -299,7 +302,8 @@ malloc_in_range (struct grub_relocator *rel,
   {
     struct grub_mm_header *foll = NULL;
     
-    if (best_addr + size <= (grub_addr_t) (hb + hb->size))
+    if (ALIGN_UP (best_addr + size, GRUB_MM_ALIGN) + GRUB_MM_ALIGN
+	<= (grub_addr_t) (hb + hb->size))
       {
 	foll = (void *) ALIGN_UP (best_addr + size, GRUB_MM_ALIGN);
 	foll->magic = GRUB_MM_FREE_MAGIC;
@@ -324,11 +328,11 @@ malloc_in_range (struct grub_relocator *rel,
 	else
 	  foll = hb->next;
 	
+	hbp->next = foll;
 	if (rb->first == hb)
 	  rb->first = foll;
 	if (rb->first == hb)
 	  rb->first = (void *) (rb + 1);
-	hbp->next = foll;
       }
     *res = best_addr;
     return 1;

From 2386d586b95df9553a64a1cd7a99cc0638bc0a52 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 15 Jan 2010 11:39:05 +0100
Subject: [PATCH 0287/1628] Merge some knetbsdcode into kfreebsd one. Serial
 supoort for knetbsd

---
 include/grub/i386/bsd.h |  54 ++--
 loader/i386/bsd.c       | 527 ++++++++++++++++++++++------------------
 loader/i386/bsdXX.c     |  38 +--
 3 files changed, 330 insertions(+), 289 deletions(-)

diff --git a/include/grub/i386/bsd.h b/include/grub/i386/bsd.h
index f68539a3c..aa19b2338 100644
--- a/include/grub/i386/bsd.h
+++ b/include/grub/i386/bsd.h
@@ -114,6 +114,12 @@ struct grub_freebsd_bootinfo
   grub_uint32_t bi_modulep;
 } __attribute__ ((packed));
 
+struct freebsd_tag_header
+{
+  grub_uint32_t type;
+  grub_uint32_t len;
+};
+
 #define OPENBSD_RB_ASKNAME	(1 << 0)  /* ask for file name to reboot from */
 #define OPENBSD_RB_SINGLE	(1 << 1)  /* reboot to single user only */
 #define OPENBSD_RB_NOSYNC	(1 << 2)  /* dont sync before reboot */
@@ -198,48 +204,21 @@ struct grub_openbsd_bootargs
 struct grub_netbsd_bootinfo
 {
   grub_uint32_t bi_count;
-  grub_addr_t bi_data[1];
+  grub_addr_t bi_data[0];
 };
 
 #define NETBSD_BTINFO_BOOTPATH		0
 #define NETBSD_BTINFO_ROOTDEVICE	1
-#define NETBSD_BTINFO_BOOTDISK		3
+#define NETBSD_BTINFO_CONSOLE		6
 #define NETBSD_BTINFO_MEMMAP		9
 
 struct grub_netbsd_btinfo_common
 {
-  int len;
-  int type;
-};
-
-struct grub_netbsd_btinfo_mmap_header
-{
-  struct grub_netbsd_btinfo_common common;
-  grub_uint32_t count;
-};
-
-struct grub_netbsd_btinfo_mmap_entry
-{
-  grub_uint64_t addr;
-  grub_uint64_t len;
-#define	NETBSD_MMAP_AVAILABLE	1
-#define	NETBSD_MMAP_RESERVED 	2
-#define	NETBSD_MMAP_ACPI	3
-#define	NETBSD_MMAP_NVS 	4
+  grub_uint32_t len;
   grub_uint32_t type;
 };
 
-struct grub_netbsd_btinfo_bootpath
-{
-  struct grub_netbsd_btinfo_common common;
-  char bootpath[80];
-};
-
-struct grub_netbsd_btinfo_rootdevice
-{
-  struct grub_netbsd_btinfo_common common;
-  char devname[16];
-};
+#define GRUB_NETBSD_MAX_BOOTPATH_LEN 80
 
 struct grub_netbsd_btinfo_bootdisk
 {
@@ -254,6 +233,15 @@ struct grub_netbsd_btinfo_bootdisk
   int partition;
 };
 
+struct grub_netbsd_btinfo_serial
+{
+  char devname[16];
+  grub_uint32_t addr;
+  grub_uint32_t speed;
+};
+
+#define GRUB_NETBSD_MAX_ROOTDEVICE_LEN 16
+
 grub_err_t grub_freebsd_load_elfmodule32 (struct grub_relocator *relocator,
 					  grub_file_t file, int argc,
 					  char *argv[], grub_addr_t *kern_end);
@@ -268,8 +256,8 @@ grub_err_t grub_freebsd_load_elf_meta64 (struct grub_relocator *relocator,
 					 grub_file_t file,
 					 grub_addr_t *kern_end);
 
-grub_err_t grub_freebsd_add_meta (grub_uint32_t type, void *data,
-				  grub_uint32_t len);
+grub_err_t grub_bsd_add_meta (grub_uint32_t type, 
+			      void *data, grub_uint32_t len);
 grub_err_t grub_freebsd_add_meta_module (char *filename, char *type,
 					 int argc, char **argv,
 					 grub_addr_t addr, grub_uint32_t size);
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 58af4eb7d..3565884d5 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -51,20 +51,29 @@
 #define ALIGN_VAR(a)	((is_64bit) ? (ALIGN_QWORD(a)) : (ALIGN_DWORD(a)))
 #define ALIGN_PAGE(a)	ALIGN_UP (a, 4096)
 
-#define MOD_BUF_ALLOC_UNIT	4096
-
 static int kernel_type = KERNEL_TYPE_NONE;
 static grub_dl_t my_mod;
 static grub_addr_t entry, entry_hi, kern_start, kern_end;
 static void *kern_chunk_src;
 static grub_uint32_t bootflags;
-static char *mod_buf;
-static grub_uint32_t mod_buf_len, mod_buf_max, kern_end_mdofs;
 static int is_elf_kernel, is_64bit;
-static char *netbsd_root = NULL;
 static grub_uint32_t openbsd_root;
 struct grub_relocator *relocator = NULL;
 
+struct bsd_tag
+{
+  struct bsd_tag *next;
+  grub_size_t len;
+  grub_uint32_t type;
+  union {
+    grub_uint8_t a;
+    grub_uint16_t b;
+    grub_uint32_t c;
+  } data[0];
+};
+
+struct bsd_tag *tags, *tags_last;
+
 static const struct grub_arg_option freebsd_opts[] =
   {
     {"dual", 'D', 0, N_("Display output on all consoles."), 0, 0},
@@ -127,6 +136,8 @@ static const struct grub_arg_option netbsd_opts[] =
     {"debug", 'x', 0, N_("Boot with debug messages."), 0, 0},
     {"silent", 'z', 0, N_("Supress normal output (warnings remain)."), 0, 0},
     {"root", 'r', 0, N_("Set root device."), N_("DEVICE"), ARG_TYPE_STRING},
+    {"serial", 'h', GRUB_ARG_OPTION_OPTIONAL, 
+     N_("Use serial console."), N_("ADDR,SPEED"), ARG_TYPE_STRING},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -139,6 +150,7 @@ static const grub_uint32_t netbsd_flags[] =
 };
 
 #define NETBSD_ROOT_ARG (ARRAY_SIZE (netbsd_flags) - 1)
+#define NETBSD_SERIAL_ARG (ARRAY_SIZE (netbsd_flags))
 
 static void
 grub_bsd_get_device (grub_uint32_t * biosdev,
@@ -180,36 +192,23 @@ grub_bsd_get_device (grub_uint32_t * biosdev,
 }
 
 grub_err_t
-grub_freebsd_add_meta (grub_uint32_t type, void *data, grub_uint32_t len)
+grub_bsd_add_meta (grub_uint32_t type, void *data, grub_uint32_t len)
 {
-  if (mod_buf_max < mod_buf_len + len + 8)
-    {
-      char *new_buf;
-
-      do
-	{
-	  mod_buf_max += MOD_BUF_ALLOC_UNIT;
-	}
-      while (mod_buf_max < mod_buf_len + len + 8);
-
-      new_buf = grub_malloc (mod_buf_max);
-      if (!new_buf)
-	return grub_errno;
-
-      grub_memcpy (new_buf, mod_buf, mod_buf_len);
-      grub_free (mod_buf);
-
-      mod_buf = new_buf;
-    }
-
-  *((grub_uint32_t *) (mod_buf + mod_buf_len)) = type;
-  *((grub_uint32_t *) (mod_buf + mod_buf_len + 4)) = len;
-  mod_buf_len += 8;
+  struct bsd_tag *newtag;
 
+  newtag = grub_malloc (len + sizeof (struct bsd_tag));
+  if (!newtag)
+    return grub_errno;
+  newtag->len = len;
+  newtag->type = type;
+  newtag->next = NULL;
   if (len)
-    grub_memcpy (mod_buf + mod_buf_len, data, len);
-
-  mod_buf_len = ALIGN_VAR (mod_buf_len + len);
+    grub_memcpy (newtag->data, data, len);
+  if (tags_last)
+    tags_last->next = newtag;
+  else
+    tags = newtag;
+  tags_last = newtag;
 
   return GRUB_ERR_NONE;
 }
@@ -226,13 +225,13 @@ struct grub_e820_mmap
 #define GRUB_E820_NVS        4
 #define GRUB_E820_EXEC_CODE  5
 
-static grub_err_t
-grub_freebsd_add_mmap (void)
+static void
+generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf)
 {
-  grub_size_t len = 0;
-  struct grub_e820_mmap *mmap_buf = 0;
-  struct grub_e820_mmap *mmap = 0;
+  int count = 0;
   int isfirstrun = 1;
+  struct grub_e820_mmap *mmap = buf;
+  struct grub_e820_mmap prev, cur;
 
   auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
   int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size,
@@ -240,86 +239,110 @@ grub_freebsd_add_mmap (void)
     {
       /* FreeBSD assumes that first 64KiB are available.
 	 Not always true but try to prevent panic somehow. */
-      if (isfirstrun && addr != 0)
+      if (kernel_type == KERNEL_TYPE_FREEBSD && isfirstrun && addr != 0)
 	{
+	  cur.addr = 0;
+	  cur.size = (addr < 0x10000) ? addr : 0x10000;
+	  cur.type = GRUB_E820_RAM;
 	  if (mmap)
-	    {
-	      mmap->addr = 0;
-	      mmap->size = (addr < 0x10000) ? addr : 0x10000;
-	      mmap->type = GRUB_E820_RAM;
-	      mmap++;
-	    }
-	  else
-	    len += sizeof (struct grub_e820_mmap);
+	    *mmap++ = cur;
+
+	  prev = cur;
+	  count++;
 	}
       isfirstrun = 0;
-      if (mmap)
+
+      cur.addr = addr;
+      cur.size = size;
+      switch (type)
 	{
-	  mmap->addr = addr;
-	  mmap->size = size;
-	  switch (type)
-	    {
-	    case GRUB_MACHINE_MEMORY_AVAILABLE:
-	      mmap->type = GRUB_E820_RAM;
-	      break;
+	case GRUB_MACHINE_MEMORY_AVAILABLE:
+	  cur.type = GRUB_E820_RAM;
+	  break;
 
 #ifdef GRUB_MACHINE_MEMORY_ACPI
-	    case GRUB_MACHINE_MEMORY_ACPI:
-	      mmap->type = GRUB_E820_ACPI;
-	      break;
+	case GRUB_MACHINE_MEMORY_ACPI:
+	  cur.type = GRUB_E820_ACPI;
+	  break;
 #endif
 
 #ifdef GRUB_MACHINE_MEMORY_NVS
-	    case GRUB_MACHINE_MEMORY_NVS:
-	      mmap->type = GRUB_E820_NVS;
-	      break;
+	case GRUB_MACHINE_MEMORY_NVS:
+	  cur.type = GRUB_E820_NVS;
+	  break;
 #endif
 
-	    default:
+	default:
 #ifdef GRUB_MACHINE_MEMORY_CODE
-	    case GRUB_MACHINE_MEMORY_CODE:
+	case GRUB_MACHINE_MEMORY_CODE:
 #endif
 #ifdef GRUB_MACHINE_MEMORY_RESERVED
-	    case GRUB_MACHINE_MEMORY_RESERVED:
+	case GRUB_MACHINE_MEMORY_RESERVED:
 #endif
-	      mmap->type = GRUB_E820_RESERVED;
-	      break;
-	    }
+	  cur.type = GRUB_E820_RESERVED;
+	  break;
+	}
 
-	  /* Merge regions if possible. */
-	  if (mmap != mmap_buf && mmap->type == mmap[-1].type &&
-	      mmap->addr == mmap[-1].addr + mmap[-1].size)
-	    mmap[-1].size += mmap->size;
-	  else
-	    mmap++;
+      /* Merge regions if possible. */
+      if (count && cur.type == prev.type && cur.addr == prev.addr + prev.size)
+	{
+	  prev.size += cur.size;
+	  if (mmap)
+	    mmap[-1] = cur;
 	}
       else
-	len += sizeof (struct grub_e820_mmap);
+	{
+	  if (mmap)
+	    *mmap++ = cur;
+	  prev = cur;
+	  count++;
+	}
 
       return 0;
     }
 
-  grub_mmap_iterate (hook);
-  mmap_buf = mmap = grub_malloc (len);
-  if (! mmap)
-    return grub_errno;
-
   isfirstrun = 1;
   grub_mmap_iterate (hook);
 
-  len = (mmap - mmap_buf) * sizeof (struct grub_e820_mmap);
-  int i;
-  for (i = 0; i < mmap - mmap_buf; i++)
-    grub_dprintf ("bsd", "smap %d, %d:%llx - %llx\n", i,
-		  mmap_buf[i].type,
-		  (unsigned long long) mmap_buf[i].addr,
-		  (unsigned long long) mmap_buf[i].size);
+  if (len)
+    *len = count * sizeof (struct grub_e820_mmap);
+  *cnt = count;
 
-  grub_dprintf ("bsd", "%ld entries in smap\n", (long) (mmap - mmap_buf));
-  grub_freebsd_add_meta (FREEBSD_MODINFO_METADATA |
-			 FREEBSD_MODINFOMD_SMAP, mmap_buf, len);
+  return;
+}
 
-  grub_free (mmap_buf);
+static grub_err_t
+grub_bsd_add_mmap (void)
+{
+  grub_size_t len, cnt;
+  void *buf = NULL, *buf0;
+
+  generate_e820_mmap (&len, &cnt, buf);
+
+  if (kernel_type == KERNEL_TYPE_NETBSD)
+    len += sizeof (grub_uint32_t);
+
+  buf = grub_malloc (len);
+  if (!buf)
+    return grub_errno;
+
+  buf0 = buf;
+  if (kernel_type == KERNEL_TYPE_NETBSD)
+    {
+      *(grub_uint32_t *) buf = cnt;
+      buf = ((grub_uint32_t *) buf + 1);
+    }
+
+  generate_e820_mmap (NULL, &cnt, buf);
+
+  grub_dprintf ("bsd", "%u entries in smap\n", cnt);
+  if (kernel_type == KERNEL_TYPE_NETBSD)
+    grub_bsd_add_meta (NETBSD_BTINFO_MEMMAP, buf0, len);
+  else
+    grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
+		       FREEBSD_MODINFOMD_SMAP, buf0, len);
+
+  grub_free (buf0);
 
   return grub_errno;
 }
@@ -337,29 +360,22 @@ grub_freebsd_add_meta_module (char *filename, char *type, int argc, char **argv,
   if (grub_strcmp (type, "/boot/zfs/zpool.cache") == 0)
     name = "/boot/zfs/zpool.cache";
 
-  if (grub_freebsd_add_meta (FREEBSD_MODINFO_NAME, name,
-			     grub_strlen (name) + 1))
+  if (grub_bsd_add_meta (FREEBSD_MODINFO_NAME, name, grub_strlen (name) + 1))
     return grub_errno;
 
   if (is_64bit)
     {
       grub_uint64_t addr64 = addr, size64 = size;
-      if ((grub_freebsd_add_meta (FREEBSD_MODINFO_TYPE, type,
-			      grub_strlen (type) + 1)) ||
-	  (grub_freebsd_add_meta (FREEBSD_MODINFO_ADDR, &addr64,
-				  sizeof (addr64))) ||
-	  (grub_freebsd_add_meta (FREEBSD_MODINFO_SIZE, &size64,
-				  sizeof (size64))))
+      if (grub_bsd_add_meta (FREEBSD_MODINFO_TYPE, type, grub_strlen (type) + 1)
+	  || grub_bsd_add_meta (FREEBSD_MODINFO_ADDR, &addr64, sizeof (addr64)) 
+	  || grub_bsd_add_meta (FREEBSD_MODINFO_SIZE, &size64, sizeof (size64)))
 	return grub_errno;
     }
   else
     {
-      if ((grub_freebsd_add_meta (FREEBSD_MODINFO_TYPE, type,
-				  grub_strlen (type) + 1)) ||
-	  (grub_freebsd_add_meta (FREEBSD_MODINFO_ADDR, &addr,
-				  sizeof (addr))) ||
-	  (grub_freebsd_add_meta (FREEBSD_MODINFO_SIZE, &size,
-				  sizeof (size))))
+      if (grub_bsd_add_meta (FREEBSD_MODINFO_TYPE, type, grub_strlen (type) + 1)
+	  || grub_bsd_add_meta (FREEBSD_MODINFO_ADDR, &addr, sizeof (addr))
+	  || grub_bsd_add_meta (FREEBSD_MODINFO_SIZE, &size, sizeof (size)))
 	return grub_errno;
     }
 
@@ -386,7 +402,7 @@ grub_freebsd_add_meta_module (char *filename, char *type, int argc, char **argv,
 	    }
 	  *p = 0;
 
-	  if (grub_freebsd_add_meta (FREEBSD_MODINFO_ARGS, cmdline, n))
+	  if (grub_bsd_add_meta (FREEBSD_MODINFO_ARGS, cmdline, n))
 	    return grub_errno;
 	}
     }
@@ -397,27 +413,23 @@ grub_freebsd_add_meta_module (char *filename, char *type, int argc, char **argv,
 static void
 grub_freebsd_list_modules (void)
 {
-  grub_uint32_t pos = 0;
+  struct bsd_tag *tag;
 
   grub_printf ("  %-18s  %-18s%14s%14s\n", "name", "type", "addr", "size");
-  while (pos < mod_buf_len)
-    {
-      grub_uint32_t type, size;
 
-      type = *((grub_uint32_t *) (mod_buf + pos));
-      size = *((grub_uint32_t *) (mod_buf + pos + 4));
-      pos += 8;
-      switch (type)
+  for (tag = tags; tag; tag = tag->next)
+    {
+      switch (tag->type)
 	{
 	case FREEBSD_MODINFO_NAME:
 	case FREEBSD_MODINFO_TYPE:
-	  grub_printf ("  %-18s", mod_buf + pos);
+	  grub_printf ("  %-18s", (char *) tag->data);
 	  break;
 	case FREEBSD_MODINFO_ADDR:
 	  {
 	    grub_uint32_t addr;
 
-	    addr = *((grub_uint32_t *) (mod_buf + pos));
+	    addr = *((grub_uint32_t *) tag->data);
 	    grub_printf ("    0x%08x", addr);
 	    break;
 	  }
@@ -425,12 +437,10 @@ grub_freebsd_list_modules (void)
 	  {
 	    grub_uint32_t len;
 
-	    len = *((grub_uint32_t *) (mod_buf + pos));
+	    len = *((grub_uint32_t *) tag->data);
 	    grub_printf ("    0x%08x\n", len);
 	  }
 	}
-
-      pos = ALIGN_VAR (pos + size);
     }
 }
 
@@ -446,6 +456,7 @@ grub_freebsd_boot (void)
   grub_size_t p_size = 0;
   grub_uint32_t bootdev, biosdev, unit, slice, part;
   grub_err_t err;
+  grub_size_t tag_buf_len = 0;
 
   auto int iterate_env (struct grub_env_var *var);
   int iterate_env (struct grub_env_var *var)
@@ -475,7 +486,6 @@ grub_freebsd_boot (void)
     return 0;
   }
 
-
   grub_memset (&bi, 0, sizeof (bi));
   bi.bi_version = FREEBSD_BOOTINFO_VERSION;
   bi.bi_size = sizeof (bi);
@@ -488,10 +498,29 @@ grub_freebsd_boot (void)
 
   p_size = 0;
   grub_env_iterate (iterate_env_count);
+
   if (p_size)
     p_size = ALIGN_PAGE (kern_end + p_size + 1) - kern_end;
+
   if (is_elf_kernel)
-    p_size = ALIGN_PAGE (kern_end + p_size + mod_buf_len) - kern_end;
+    {
+      struct bsd_tag *tag;
+
+      err = grub_bsd_add_mmap ();
+      if (err)
+	return err;
+
+      err = grub_bsd_add_meta (FREEBSD_MODINFO_END, 0, 0);
+      if (err)
+	return err;
+      
+      tag_buf_len = 0;
+      for (tag = tags; tag; tag = tag->next)
+	tag_buf_len = ALIGN_VAR (tag_buf_len
+				 + sizeof (struct freebsd_tag_header)
+				 + tag->len);
+      p_size = ALIGN_PAGE (kern_end + p_size + tag_buf_len) - kern_end;
+    }
 
   if (is_64bit)
     p_size += 4096 * 3;
@@ -515,27 +544,50 @@ grub_freebsd_boot (void)
 
   if (is_elf_kernel)
     {
-      grub_uint8_t *md_ofs;
-      int ofs;
+      grub_uint8_t *p_tag = p;
+      struct bsd_tag *tag;
+      
+      for (tag = tags; tag; tag = tag->next)
+	{
+	  struct freebsd_tag_header *head
+	    = (struct freebsd_tag_header *) p_tag;
+	  head->type = tag->type;
+	  head->len = tag->len;
+	  p_tag += sizeof (struct freebsd_tag_header);
+	  switch (tag->type)
+	    {
+	    case FREEBSD_MODINFO_METADATA | FREEBSD_MODINFOMD_HOWTO:
+	      if (is_64bit)
+		*(grub_uint64_t *) p_tag = bootflags;
+	      else
+		*(grub_uint32_t *) p_tag = bootflags;
+	      break;
 
-      if (grub_freebsd_add_meta (FREEBSD_MODINFO_END, 0, 0))
-	return grub_errno;
+	    case FREEBSD_MODINFO_METADATA | FREEBSD_MODINFOMD_ENVP:
+	      if (is_64bit)
+		*(grub_uint64_t *) p_tag = bi.bi_envp;
+	      else
+		*(grub_uint32_t *) p_tag = bi.bi_envp;
+	      break;
+
+	    case FREEBSD_MODINFO_METADATA | FREEBSD_MODINFOMD_KERNEND:
+	      if (is_64bit)
+		*(grub_uint64_t *) p_tag = kern_end;
+	      else
+		*(grub_uint32_t *) p_tag = kern_end;
+	      break;
+
+	    default:
+	      grub_memcpy (p_tag, tag->data, tag->len);
+	      break;
+	    }
+	  p_tag += tag->len;
+	  p_tag = ALIGN_VAR (p_tag - p) + p;
+	}
 
-      grub_memcpy (p, mod_buf, mod_buf_len);
       bi.bi_modulep = (p - p0) + p_target;
-      md_ofs = p + kern_end_mdofs;
 
-      p = (ALIGN_PAGE ((p - p0) + p_target) - p_target) + p0;
-
-      if (is_64bit)
-	p += 4096 * 4;
-
-      ofs = (is_64bit) ? 16 : 12;
-      *((grub_uint32_t *) md_ofs) = kern_end;
-      md_ofs -= ofs;
-      *((grub_uint32_t *) md_ofs) = bi.bi_envp;
-      md_ofs -= ofs;
-      *((grub_uint32_t *) md_ofs) = bootflags;
+      p = (ALIGN_PAGE ((p_tag - p0) + p_target) - p_target) + p0;
     }
 
   bi.bi_kernend = kern_end;
@@ -561,7 +613,7 @@ grub_freebsd_boot (void)
 	grub_fatal ("cannot exit boot services");
 #endif
 
-      pagetable = p - (4096 * 3);
+      pagetable = p;
       fill_bsd64_pagetable (pagetable, (pagetable - p0) + p_target);
 
       state.cr3 = (pagetable - p0) + p_target;
@@ -721,99 +773,57 @@ static grub_err_t
 grub_netbsd_boot (void)
 {
   struct grub_netbsd_bootinfo *bootinfo;
-  int count = 0;
-  struct grub_netbsd_btinfo_mmap_header *mmap;
-  struct grub_netbsd_btinfo_mmap_entry *pm;
   void *curarg, *arg0;
   grub_addr_t arg_target, stack_target;
   grub_uint32_t *stack;
   grub_err_t err;
   struct grub_relocator32_state state;
+  grub_size_t tag_buf_len = 0;
+  int tag_count = 0;
+
+  err = grub_bsd_add_mmap ();
+  if (err)
+    return err;
 
-  auto int NESTED_FUNC_ATTR count_hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
-  int NESTED_FUNC_ATTR count_hook (grub_uint64_t addr __attribute__ ((unused)),
-				   grub_uint64_t size __attribute__ ((unused)),
-				   grub_uint32_t type __attribute__ ((unused)))
   {
-    count++;
-    return 0;
-  }
-
-  auto int NESTED_FUNC_ATTR fill_hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
-  int NESTED_FUNC_ATTR fill_hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
-  {
-    pm->addr = addr;
-    pm->len = size;
-
-    switch (type)
+    struct bsd_tag *tag;
+    tag_buf_len = 0;
+    for (tag = tags; tag; tag = tag->next)
       {
-      case GRUB_MACHINE_MEMORY_AVAILABLE:
-	pm->type = NETBSD_MMAP_AVAILABLE;
-	break;
-
-      case GRUB_MACHINE_MEMORY_ACPI:
-	pm->type = NETBSD_MMAP_ACPI;
-	break;
-
-      case GRUB_MACHINE_MEMORY_NVS:
-	pm->type = NETBSD_MMAP_NVS;
-	break;
-
-      default:
-	pm->type = NETBSD_MMAP_RESERVED;
-	break;
+	tag_buf_len = ALIGN_VAR (tag_buf_len + 2 * sizeof (grub_uint32_t)
+				 + tag->len);
+	tag_count++;
       }
-    pm++;
-
-    return 0;
   }
 
-  grub_mmap_iterate (count_hook);
-
   arg_target = kern_end;
-  err = grub_relocator_alloc_chunk_addr 
-    (relocator, &curarg, arg_target,
-     sizeof (struct grub_netbsd_btinfo_rootdevice)
-     + sizeof (struct grub_netbsd_bootinfo)
-     + sizeof (struct grub_netbsd_btinfo_mmap_header)
-     + count * sizeof (struct grub_netbsd_btinfo_mmap_entry));
+  err = grub_relocator_alloc_chunk_addr (relocator, &curarg,
+					 arg_target, tag_buf_len
+					 + sizeof (struct grub_netbsd_bootinfo)
+					 + tag_count * sizeof (grub_addr_t));
   if (err)
     return err;
 
   arg0 = curarg;
-  mmap = curarg;
-  pm = (struct grub_netbsd_btinfo_mmap_entry *) (mmap + 1);
+  bootinfo = (void *) ((grub_uint8_t *) arg0 + tag_buf_len);
 
-  grub_mmap_iterate (fill_hook);
-  mmap->common.type = NETBSD_BTINFO_MEMMAP;
-  mmap->common.len = (char *) pm - (char *) mmap;
-  mmap->count = count;
-  curarg = pm;
+  {
+    struct bsd_tag *tag;
+    unsigned i;
 
-  if (netbsd_root)
-    {
-      struct grub_netbsd_btinfo_rootdevice *rootdev;
-
-      rootdev = (struct grub_netbsd_btinfo_rootdevice *) curarg;
-
-      rootdev->common.len = sizeof (struct grub_netbsd_btinfo_rootdevice);
-      rootdev->common.type = NETBSD_BTINFO_ROOTDEVICE;
-      grub_strncpy (rootdev->devname, netbsd_root, sizeof (rootdev->devname));
-
-      bootinfo = (struct grub_netbsd_bootinfo *) (rootdev + 1);
-      bootinfo->bi_count = 2;
-      bootinfo->bi_data[0] = ((grub_uint8_t *) mmap - (grub_uint8_t *) arg0)
-	+ arg_target;
-      bootinfo->bi_data[1] = ((grub_uint8_t *) rootdev - (grub_uint8_t *) arg0)
-	+ arg_target;
-    }
-  else
-    {
-      bootinfo = (struct grub_netbsd_bootinfo *) curarg;
-      bootinfo->bi_count = 1;
-      bootinfo->bi_data[0] = ((grub_uint8_t *) mmap - (grub_uint8_t *) arg0)
-	+ arg_target;
-    }
+    bootinfo->bi_count = tag_count;
+    for (tag = tags, i = 0; tag; i++, tag = tag->next)
+      {
+	struct grub_netbsd_btinfo_common *head = curarg;
+	bootinfo->bi_data[i] = ((grub_uint8_t *) curarg - (grub_uint8_t *) arg0)
+	  + arg_target;
+	head->type = tag->type;
+	head->len = tag->len + sizeof (*head);
+	curarg = head + 1;
+	grub_memcpy (curarg, tag->data, tag->len);
+	curarg = (grub_uint8_t *) curarg + tag->len;
+      }
+  }
 
   err = grub_relocator_alloc_chunk_align (relocator, (void **) &stack,
 					  &stack_target, 0x10000, 0x90000,
@@ -843,19 +853,18 @@ grub_netbsd_boot (void)
 static grub_err_t
 grub_bsd_unload (void)
 {
-  if (mod_buf)
+  struct bsd_tag *tag, *next;
+  for (tag = tags; tag; tag = next)
     {
-      grub_free (mod_buf);
-      mod_buf = 0;
-      mod_buf_max = 0;
+      next = tag->next;
+      grub_free (tag);
     }
+  tags = NULL;
+  tags_last = NULL;
 
   kernel_type = KERNEL_TYPE_NONE;
   grub_dl_unref (my_mod);
 
-  grub_free (netbsd_root);
-  netbsd_root = NULL;
-
   grub_relocator_unload (relocator);
   relocator = NULL;
 
@@ -1163,28 +1172,22 @@ grub_cmd_freebsd (grub_extcmd_t cmd, int argc, char *argv[])
 	  if (err)
 	    return err;
 
-	  err = grub_freebsd_add_meta (FREEBSD_MODINFO_METADATA |
-				       FREEBSD_MODINFOMD_HOWTO, &data, 4);
+	  err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
+				   FREEBSD_MODINFOMD_HOWTO, &data, 4);
 	  if (err)
 	    return err;
 
-	  err = grub_freebsd_add_meta (FREEBSD_MODINFO_METADATA |
+	  err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
 				       FREEBSD_MODINFOMD_ENVP, &data, len);
 	  if (err)
 	    return err;
 
-	  err = grub_freebsd_add_meta (FREEBSD_MODINFO_METADATA |
-				       FREEBSD_MODINFOMD_KERNEND, &data, len);
-	  if (err)
-	    return err;
-
-	  kern_end_mdofs = mod_buf_len - len;
-
-	  err = grub_freebsd_add_mmap ();
+	  err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
+				   FREEBSD_MODINFOMD_KERNEND, &data, len);
 	  if (err)
 	    return err;
 	}
-      grub_loader_set (grub_freebsd_boot, grub_bsd_unload, 1);
+      grub_loader_set (grub_freebsd_boot, grub_bsd_unload, 0);
     }
 
   return grub_errno;
@@ -1239,8 +1242,61 @@ grub_cmd_netbsd (grub_extcmd_t cmd, int argc, char *argv[])
   if (grub_bsd_load (argc, argv) == GRUB_ERR_NONE)
     {
       grub_loader_set (grub_netbsd_boot, grub_bsd_unload, 0);
+
+      {
+	char bootpath[GRUB_NETBSD_MAX_BOOTPATH_LEN];
+	char *name;
+	name = grub_strrchr (argv[0], '/');
+	if (name)
+	  name++;
+	else
+	  name = argv[0];
+	grub_memset (bootpath, 0, sizeof (bootpath));
+	grub_strncpy (bootpath, name, sizeof (bootpath) - 1);
+	grub_bsd_add_meta (NETBSD_BTINFO_BOOTPATH, bootpath, sizeof (bootpath));
+      }
+
       if (cmd->state[NETBSD_ROOT_ARG].set)
-	netbsd_root = grub_strdup (cmd->state[NETBSD_ROOT_ARG].arg);
+	{
+	  char root[GRUB_NETBSD_MAX_ROOTDEVICE_LEN];
+	  grub_memset (root, 0, sizeof (root));
+	  grub_strncpy (root, cmd->state[NETBSD_ROOT_ARG].arg,
+			sizeof (root) - 1);
+	  grub_bsd_add_meta (NETBSD_BTINFO_ROOTDEVICE, root, sizeof (root));
+	}
+      if (cmd->state[NETBSD_SERIAL_ARG].set)
+	{
+	  struct grub_netbsd_btinfo_serial serial;
+	  char *ptr;
+
+	  grub_memset (&serial, 0, sizeof (serial));
+	  grub_strcpy (serial.devname, "com");
+
+	  if (cmd->state[NETBSD_SERIAL_ARG].arg)
+	    {
+	      ptr = cmd->state[NETBSD_SERIAL_ARG].arg;
+	      serial.addr = grub_strtoul (ptr, &ptr, 0);
+	      if (grub_errno)
+		return grub_errno;
+	      if (*ptr != ',')
+		return grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid format");
+	      ptr++;
+	      serial.speed = grub_strtoul (ptr, &ptr, 0);
+	      if (grub_errno)
+		return grub_errno;
+	    }
+	  
+ 	  grub_bsd_add_meta (NETBSD_BTINFO_CONSOLE, &serial, sizeof (serial));
+	}
+      else
+	{
+	  struct grub_netbsd_btinfo_serial cons;
+
+	  grub_memset (&cons, 0, sizeof (cons));
+	  grub_strcpy (cons.devname, "pc");
+
+ 	  grub_bsd_add_meta (NETBSD_BTINFO_CONSOLE, &cons, sizeof (cons));
+	}
     }
 
   return grub_errno;
@@ -1495,10 +1551,5 @@ GRUB_MOD_FINI (bsd)
   grub_unregister_command (cmd_freebsd_module);
   grub_unregister_command (cmd_freebsd_module_elf);
 
-  if (mod_buf)
-    {
-      grub_free (mod_buf);
-      mod_buf = 0;
-      mod_buf_max = 0;
-    }
+  grub_bsd_unload ();
 }
diff --git a/loader/i386/bsdXX.c b/loader/i386/bsdXX.c
index 41dfe89e4..b76093ccf 100644
--- a/loader/i386/bsdXX.c
+++ b/loader/i386/bsdXX.c
@@ -146,13 +146,13 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (struct grub_relocator *relocator,
 				      argc - 1, argv + 1, module,
 				      curload - module);
   if (! err)
-    err = grub_freebsd_add_meta (FREEBSD_MODINFO_METADATA
-				 | FREEBSD_MODINFOMD_ELFHDR,
-				 &e, sizeof (e));
+    err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA 
+			     | FREEBSD_MODINFOMD_ELFHDR,
+			     &e, sizeof (e));
   if (! err)
-    err = grub_freebsd_add_meta (FREEBSD_MODINFO_METADATA
-				 | FREEBSD_MODINFOMD_SHDR,
-				 shdr, e.e_shnum * e.e_shentsize);
+    err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA
+			     | FREEBSD_MODINFOMD_SHDR,
+			     shdr, e.e_shnum * e.e_shentsize);
 
   return err;
 }
@@ -275,9 +275,9 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator *relocator,
   if (err)
     return err;
 
-  err = grub_freebsd_add_meta (FREEBSD_MODINFO_METADATA |
-			       FREEBSD_MODINFOMD_ELFHDR, &e,
-			       sizeof (e));
+  err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
+			   FREEBSD_MODINFOMD_ELFHDR, &e,
+			   sizeof (e));
   if (err)
     return err;
 
@@ -346,22 +346,22 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator *relocator,
     {
       dynamic = sym->st_value;
       grub_dprintf ("bsd", "dynamic = %llx\n", (unsigned long long) dynamic);
-      err = grub_freebsd_add_meta (FREEBSD_MODINFO_METADATA |
-				   FREEBSD_MODINFOMD_DYNAMIC, &dynamic,
-				   sizeof (dynamic));
+      err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
+			       FREEBSD_MODINFOMD_DYNAMIC, &dynamic,
+			       sizeof (dynamic));
       if (err)
 	return err;
     }
 
-  err = grub_freebsd_add_meta (FREEBSD_MODINFO_METADATA |
-			       FREEBSD_MODINFOMD_SSYM, &symstart,
-			       sizeof (symstart));
+  err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
+			   FREEBSD_MODINFOMD_SSYM, &symstart,
+			   sizeof (symstart));
   if (err)
     return err;
 
-  err = grub_freebsd_add_meta (FREEBSD_MODINFO_METADATA |
-			       FREEBSD_MODINFOMD_ESYM, &symend,
-			       sizeof (symend));
+  err = grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
+			   FREEBSD_MODINFOMD_ESYM, &symend,
+			   sizeof (symend));
   if (err)
     return err;
 
@@ -369,3 +369,5 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator *relocator,
 
   return GRUB_ERR_NONE;
 }
+
+

From 5fb5182f8ad3e2a02bd0f01134c26302a51bc702 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 15 Jan 2010 11:48:15 +0100
Subject: [PATCH 0288/1628] comX notation support

---
 include/grub/i386/pc/serial.h |  3 +++
 loader/i386/bsd.c             | 26 ++++++++++++++++++--------
 term/i386/pc/serial.c         |  8 ++++----
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/include/grub/i386/pc/serial.h b/include/grub/i386/pc/serial.h
index 0632ff79d..4038f50fb 100644
--- a/include/grub/i386/pc/serial.h
+++ b/include/grub/i386/pc/serial.h
@@ -64,4 +64,7 @@
 /* Turn on DTR, RTS, and OUT2.  */
 #define UART_ENABLE_MODEM	0x0B
 
+unsigned short
+grub_serial_hw_get_port (const unsigned int unit);
+
 #endif /* ! GRUB_SERIAL_MACHINE_HEADER */
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 3565884d5..49c846c31 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -33,6 +33,7 @@
 #include <grub/command.h>
 #include <grub/extcmd.h>
 #include <grub/i18n.h>
+#include <grub/i386/pc/serial.h>
 
 #ifdef GRUB_MACHINE_PCBIOS
 #include <grub/machine/biosnum.h>
@@ -137,7 +138,7 @@ static const struct grub_arg_option netbsd_opts[] =
     {"silent", 'z', 0, N_("Supress normal output (warnings remain)."), 0, 0},
     {"root", 'r', 0, N_("Set root device."), N_("DEVICE"), ARG_TYPE_STRING},
     {"serial", 'h', GRUB_ARG_OPTION_OPTIONAL, 
-     N_("Use serial console."), N_("ADDR,SPEED"), ARG_TYPE_STRING},
+     N_("Use serial console."), N_("[ADDR|comUNIT][,SPEED]"), ARG_TYPE_STRING},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -1275,15 +1276,24 @@ grub_cmd_netbsd (grub_extcmd_t cmd, int argc, char *argv[])
 	  if (cmd->state[NETBSD_SERIAL_ARG].arg)
 	    {
 	      ptr = cmd->state[NETBSD_SERIAL_ARG].arg;
-	      serial.addr = grub_strtoul (ptr, &ptr, 0);
-	      if (grub_errno)
-		return grub_errno;
-	      if (*ptr != ',')
-		return grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid format");
-	      ptr++;
-	      serial.speed = grub_strtoul (ptr, &ptr, 0);
+	      if (grub_memcmp (ptr, "com", sizeof ("com") - 1) == 0)
+		{
+		  ptr += sizeof ("com") - 1;
+		  serial.addr 
+		    = grub_serial_hw_get_port (grub_strtoul (ptr, &ptr, 0));
+		}
+	      else
+		serial.addr = grub_strtoul (ptr, &ptr, 0);
 	      if (grub_errno)
 		return grub_errno;
+
+	      if (*ptr == ',')
+		{
+		  ptr++;
+		  serial.speed = grub_strtoul (ptr, &ptr, 0);
+		  if (grub_errno)
+		    return grub_errno;
+		}
 	    }
 	  
  	  grub_bsd_add_meta (NETBSD_BTINFO_CONSOLE, &serial, sizeof (serial));
diff --git a/term/i386/pc/serial.c b/term/i386/pc/serial.c
index 8d09f6211..b94b09553 100644
--- a/term/i386/pc/serial.c
+++ b/term/i386/pc/serial.c
@@ -74,8 +74,8 @@ static const unsigned short serial_hw_io_addr[] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }
 #endif
 
 /* Return the port number for the UNITth serial device.  */
-static inline unsigned short
-serial_hw_get_port (const unsigned int unit)
+unsigned short
+grub_serial_hw_get_port (const unsigned int unit)
 {
   if (unit < GRUB_SERIAL_PORT_NUM)
     return serial_hw_io_addr[unit];
@@ -498,7 +498,7 @@ grub_cmd_serial (grub_extcmd_t cmd,
       unsigned int unit;
 
       unit = grub_strtoul (state[0].arg, 0, 0);
-      serial_settings.port = serial_hw_get_port (unit);
+      serial_settings.port = grub_serial_hw_get_port (unit);
       if (!serial_settings.port)
 	return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad unit number");
     }
@@ -608,7 +608,7 @@ GRUB_MOD_INIT(serial)
 			      N_("Configure serial port."), options);
 
   /* Set default settings.  */
-  serial_settings.port      = serial_hw_get_port (0);
+  serial_settings.port      = grub_serial_hw_get_port (0);
   serial_settings.divisor   = serial_get_divisor (9600);
   serial_settings.word_len  = UART_8BITS_WORD;
   serial_settings.parity    = UART_NO_PARITY;

From 9766dafa74d9d8a8116e623a07ff4d7fe846bf08 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 15 Jan 2010 12:31:06 +0100
Subject: [PATCH 0289/1628] symtab support for knetbsd

---
 include/grub/i386/bsd.h |  17 ++++-
 loader/i386/bsd.c       |  19 +++++-
 loader/i386/bsdXX.c     | 133 +++++++++++++++++++++++++++++++++++++++-
 3 files changed, 164 insertions(+), 5 deletions(-)

diff --git a/include/grub/i386/bsd.h b/include/grub/i386/bsd.h
index aa19b2338..f73dd7a31 100644
--- a/include/grub/i386/bsd.h
+++ b/include/grub/i386/bsd.h
@@ -210,6 +210,7 @@ struct grub_netbsd_bootinfo
 #define NETBSD_BTINFO_BOOTPATH		0
 #define NETBSD_BTINFO_ROOTDEVICE	1
 #define NETBSD_BTINFO_CONSOLE		6
+#define NETBSD_BTINFO_SYMTAB		8
 #define NETBSD_BTINFO_MEMMAP		9
 
 struct grub_netbsd_btinfo_common
@@ -222,7 +223,6 @@ struct grub_netbsd_btinfo_common
 
 struct grub_netbsd_btinfo_bootdisk
 {
-  struct grub_netbsd_btinfo_common common;
   int labelsector;  /* label valid if != -1 */
   struct
     {
@@ -233,6 +233,14 @@ struct grub_netbsd_btinfo_bootdisk
   int partition;
 };
 
+struct grub_netbsd_btinfo_symtab
+{
+  grub_uint32_t nsyms;
+  grub_uint32_t ssyms;
+  grub_uint32_t esyms;
+};
+
+
 struct grub_netbsd_btinfo_serial
 {
   char devname[16];
@@ -256,6 +264,13 @@ grub_err_t grub_freebsd_load_elf_meta64 (struct grub_relocator *relocator,
 					 grub_file_t file,
 					 grub_addr_t *kern_end);
 
+grub_err_t grub_netbsd_load_elf_meta32 (struct grub_relocator *relocator,
+					grub_file_t file,
+					grub_addr_t *kern_end);
+grub_err_t grub_netbsd_load_elf_meta64 (struct grub_relocator *relocator,
+					grub_file_t file,
+					grub_addr_t *kern_end);
+
 grub_err_t grub_bsd_add_meta (grub_uint32_t type, 
 			      void *data, grub_uint32_t len);
 grub_err_t grub_freebsd_add_meta_module (char *filename, char *type,
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 49c846c31..9bdefbba9 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -1237,12 +1237,27 @@ grub_cmd_openbsd (grub_extcmd_t cmd, int argc, char *argv[])
 static grub_err_t
 grub_cmd_netbsd (grub_extcmd_t cmd, int argc, char *argv[])
 {
+  grub_err_t err;
   kernel_type = KERNEL_TYPE_NETBSD;
   bootflags = grub_bsd_parse_flags (cmd->state, netbsd_flags);
 
   if (grub_bsd_load (argc, argv) == GRUB_ERR_NONE)
     {
-      grub_loader_set (grub_netbsd_boot, grub_bsd_unload, 0);
+      if (is_elf_kernel)
+	{
+	  grub_file_t file;
+
+	  file = grub_gzfile_open (argv[0], 1);
+	  if (! file)
+	    return grub_errno;
+
+	  if (is_64bit)
+	    err = grub_netbsd_load_elf_meta64 (relocator, file, &kern_end);
+	  else
+	    err = grub_netbsd_load_elf_meta32 (relocator, file, &kern_end);
+	  if (err)
+	    return err;
+	}
 
       {
 	char bootpath[GRUB_NETBSD_MAX_BOOTPATH_LEN];
@@ -1307,6 +1322,8 @@ grub_cmd_netbsd (grub_extcmd_t cmd, int argc, char *argv[])
 
  	  grub_bsd_add_meta (NETBSD_BTINFO_CONSOLE, &cons, sizeof (cons));
 	}
+
+      grub_loader_set (grub_netbsd_boot, grub_bsd_unload, 0);
     }
 
   return grub_errno;
diff --git a/loader/i386/bsdXX.c b/loader/i386/bsdXX.c
index b76093ccf..77d059921 100644
--- a/loader/i386/bsdXX.c
+++ b/loader/i386/bsdXX.c
@@ -254,7 +254,7 @@ SUFFIX (grub_freebsd_load_elfmodule) (struct grub_relocator *relocator,
 #endif
 
 grub_err_t
-SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator *relocator, 
+SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator *relocator,
 				     grub_file_t file, grub_addr_t *kern_end)
 {
   grub_err_t err;
@@ -296,8 +296,9 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator *relocator,
   stroff = s->sh_offset;
   strsize = s->sh_size;
 
-  chunk_size = 2 * sizeof (grub_freebsd_addr_t)
-    + ALIGN_UP (symsize + strsize, sizeof (grub_freebsd_addr_t));
+  chunk_size = ALIGN_UP (symsize + strsize, sizeof (grub_freebsd_addr_t))
+    + 2 * sizeof (grub_freebsd_addr_t);
+
   symtarget = ALIGN_UP (*kern_end, sizeof (grub_freebsd_addr_t));
   err = grub_relocator_alloc_chunk_addr (relocator, &sym_chunk,
 					 symtarget, chunk_size);
@@ -310,6 +311,7 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator *relocator,
   curload = sym_chunk;
   *((grub_freebsd_addr_t *) curload) = symsize;
   curload += sizeof (grub_freebsd_addr_t);
+
   if (grub_file_seek (file, symoff) == (grub_off_t) -1)
     return grub_errno;
   sym = (Elf_Sym *) curload;
@@ -370,4 +372,129 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator *relocator,
   return GRUB_ERR_NONE;
 }
 
+grub_err_t
+SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
+				    grub_file_t file, grub_addr_t *kern_end)
+{
+  grub_err_t err;
+  Elf_Ehdr e;
+  Elf_Shdr *s, *symsh, *strsh;
+  char *shdr;
+  unsigned symsize, strsize;
+  Elf_Sym *sym;
+  void *sym_chunk;
+  grub_uint8_t *curload;
+  const char *str;
+  grub_size_t chunk_size;
+  Elf_Ehdr *e2;
+  struct grub_netbsd_btinfo_symtab symtab;
+  grub_addr_t symtarget;
+
+  err = read_headers (file, &e, &shdr);
+  if (err)
+    return err;
+
+  for (s = (Elf_Shdr *) shdr; s < (Elf_Shdr *) (shdr
+						+ e.e_shnum * e.e_shentsize);
+       s = (Elf_Shdr *) ((char *) s + e.e_shentsize))
+      if (s->sh_type == SHT_SYMTAB)
+	break;
+  if (s >= (Elf_Shdr *) ((char *) shdr
+			+ e.e_shnum * e.e_shentsize))
+    return grub_error (GRUB_ERR_BAD_OS, "no symbol table");
+  symsize = s->sh_size;
+  symsh = s;
+  s = (Elf_Shdr *) (shdr + e.e_shentsize * s->sh_link);
+  strsize = s->sh_size;
+  strsh = s;
+
+  chunk_size = ALIGN_UP (symsize, sizeof (grub_freebsd_addr_t))
+    + ALIGN_UP (strsize, sizeof (grub_freebsd_addr_t))
+    + sizeof (e) + e.e_phnum * e.e_phentsize
+    + e.e_shnum * e.e_shentsize;
+
+  symtarget = ALIGN_UP (*kern_end, sizeof (grub_freebsd_addr_t));
+  err = grub_relocator_alloc_chunk_addr (relocator, &sym_chunk,
+					 symtarget, chunk_size);
+  if (err)
+    return err;
+
+  symtab.nsyms = chunk_size;
+  symtab.ssyms = symtarget;
+  symtab.esyms = symtarget + chunk_size;
+
+  curload = sym_chunk;
+  
+  e2 = (Elf_Ehdr *) curload;
+  grub_memcpy (curload, &e, sizeof (e));
+  e2->e_phoff = sizeof (e);
+  e2->e_shoff = sizeof (e) + e.e_phnum * e.e_phentsize;
+
+  curload += sizeof (e);
+  if (grub_file_seek (file, e.e_phoff) == (grub_off_t) -1)
+    return grub_errno;
+  if (grub_file_read (file, curload, e.e_phnum * e.e_phentsize) 
+      != (grub_ssize_t) (e.e_phnum * e.e_phentsize))
+    {
+      if (! grub_errno)
+	return grub_error (GRUB_ERR_BAD_OS, "invalid ELF");
+      return grub_errno;
+    }
+  curload += e.e_phnum * e.e_phentsize;
+
+  for (s = (Elf_Shdr *) shdr; s < (Elf_Shdr *) (shdr
+						+ e.e_shnum * e.e_shentsize);
+       s = (Elf_Shdr *) ((char *) s + e.e_shentsize))
+    {
+      Elf_Shdr *s2;
+      s2 = (Elf_Shdr *) curload;
+      grub_memcpy (curload, s, e.e_shentsize);
+      if (s == symsh)
+	{
+	  s2->sh_offset = sizeof (e) + e.e_phnum * e.e_phentsize
+	    + e.e_shnum * e.e_shentsize;
+	}
+      else if (s == strsh)
+	{
+	  s2->sh_offset = ALIGN_UP (symsize, sizeof (grub_freebsd_addr_t))
+	    + sizeof (e) + e.e_phnum * e.e_phentsize
+	    + e.e_shnum * e.e_shentsize;
+	}
+      else
+	s2->sh_offset = 0;
+      s2->sh_addr = s2->sh_offset;
+    }
+
+  if (grub_file_seek (file, symsh->sh_offset) == (grub_off_t) -1)
+    return grub_errno;
+  sym = (Elf_Sym *) curload;
+  if (grub_file_read (file, curload, symsize) != (grub_ssize_t) symsize)
+    {
+      if (! grub_errno)
+	return grub_error (GRUB_ERR_BAD_OS, "invalid ELF");
+      return grub_errno;
+    }
+  curload += ALIGN_UP (symsize, sizeof (grub_freebsd_addr_t));
+
+  if (grub_file_seek (file, strsh->sh_offset) == (grub_off_t) -1)
+    return grub_errno;
+  str = (char *) curload;
+  if (grub_file_read (file, curload, strsize) != (grub_ssize_t) strsize)
+    {
+      if (! grub_errno)
+	return grub_error (GRUB_ERR_BAD_OS, "invalid ELF");
+      return grub_errno;
+    }
+
+  err = grub_bsd_add_meta (NETBSD_BTINFO_SYMTAB, 
+			   &symtab,
+			   sizeof (symtab));
+  if (err)
+    return err;
+
+  *kern_end = ALIGN_PAGE (symtarget + chunk_size);
+
+  return GRUB_ERR_NONE;
+}
+
 

From 53fbae94a6d21f8f5938e5896f46e22f746553e7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 15 Jan 2010 13:40:37 +0100
Subject: [PATCH 0290/1628] netbsd framebuffer support

---
 include/grub/i386/bsd.h | 22 ++++++++++
 loader/i386/bsd.c       | 95 ++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 116 insertions(+), 1 deletion(-)

diff --git a/include/grub/i386/bsd.h b/include/grub/i386/bsd.h
index f73dd7a31..62c374c03 100644
--- a/include/grub/i386/bsd.h
+++ b/include/grub/i386/bsd.h
@@ -212,6 +212,7 @@ struct grub_netbsd_bootinfo
 #define NETBSD_BTINFO_CONSOLE		6
 #define NETBSD_BTINFO_SYMTAB		8
 #define NETBSD_BTINFO_MEMMAP		9
+#define NETBSD_BTINFO_FRAMEBUF		12
 
 struct grub_netbsd_btinfo_common
 {
@@ -248,6 +249,27 @@ struct grub_netbsd_btinfo_serial
   grub_uint32_t speed;
 };
 
+struct grub_netbsd_btinfo_framebuf
+{
+  grub_uint64_t fbaddr;
+  grub_uint32_t flags;
+  grub_uint32_t width;
+  grub_uint32_t height;
+  grub_uint16_t pitch;
+  grub_uint8_t bpp;
+
+  grub_uint8_t red_mask_size;
+  grub_uint8_t green_mask_size;
+  grub_uint8_t blue_mask_size;
+
+  grub_uint8_t red_field_pos;
+  grub_uint8_t green_field_pos;
+  grub_uint8_t blue_field_pos;
+
+  grub_uint8_t reserved[16];
+};
+
+
 #define GRUB_NETBSD_MAX_ROOTDEVICE_LEN 16
 
 grub_err_t grub_freebsd_load_elfmodule32 (struct grub_relocator *relocator,
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 9bdefbba9..1d66b08d1 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -40,7 +40,13 @@
 #endif
 #ifdef GRUB_MACHINE_EFI
 #include <grub/efi/efi.h>
+#define NETBSD_DEFAULT_VIDEO_MODE "800x600"
+#else
+#define NETBSD_DEFAULT_VIDEO_MODE "text"
+#include <grub/i386/pc/vbe.h>
 #endif
+#include <grub/video.h>
+
 #include <grub/disk.h>
 #include <grub/device.h>
 #include <grub/partition.h>
@@ -770,6 +776,85 @@ grub_openbsd_boot (void)
   return grub_relocator32_boot (relocator, state);
 }
 
+static grub_err_t
+grub_netbsd_setup_video (void)
+{
+  struct grub_video_mode_info mode_info;
+  void *framebuffer;
+  const char *modevar;
+  struct grub_netbsd_btinfo_framebuf params;
+  grub_err_t err;
+
+  modevar = grub_env_get ("gfxpayload");
+
+  /* Now all graphical modes are acceptable.
+     May change in future if we have modes without framebuffer.  */
+  if (modevar && *modevar != 0)
+    {
+      char *tmp;
+      tmp = grub_malloc (grub_strlen (modevar)
+			 + sizeof (";" NETBSD_DEFAULT_VIDEO_MODE));
+      if (! tmp)
+	return grub_errno;
+      grub_sprintf (tmp, "%s;" NETBSD_DEFAULT_VIDEO_MODE, modevar);
+      err = grub_video_set_mode (tmp, 0, 0);
+      grub_free (tmp);
+    }
+  else
+    err = grub_video_set_mode (NETBSD_DEFAULT_VIDEO_MODE, 0, 0);
+
+  if (err)
+    return err;
+
+  err = grub_video_get_info_and_fini (&mode_info, &framebuffer);
+
+  if (err)
+    return err;
+
+  params.width = mode_info.width;
+  params.height = mode_info.height;
+  params.bpp = mode_info.bpp;
+  params.pitch = mode_info.pitch;
+  params.flags = 0;
+
+  params.fbaddr = (grub_addr_t) framebuffer;
+
+  params.red_mask_size = mode_info.red_mask_size;
+  params.red_field_pos = mode_info.red_field_pos;
+  params.green_mask_size = mode_info.green_mask_size;
+  params.green_field_pos = mode_info.green_field_pos;
+  params.blue_mask_size = mode_info.blue_mask_size;
+  params.blue_field_pos = mode_info.blue_field_pos;
+
+#ifdef GRUB_MACHINE_PCBIOS
+  /* VESA packed modes may come with zeroed mask sizes, which need
+     to be set here according to DAC Palette width.  If we don't,
+     this results in Linux displaying a black screen.  */
+  if (mode_info.bpp <= 8)
+    {
+      struct grub_vbe_info_block controller_info;
+      int status;
+      int width = 8;
+
+      status = grub_vbe_bios_get_controller_info (&controller_info);
+
+      if (status == GRUB_VBE_STATUS_OK &&
+	  (controller_info.capabilities & GRUB_VBE_CAPABILITY_DACWIDTH))
+	status = grub_vbe_bios_set_dac_palette_width (&width);
+
+      if (status != GRUB_VBE_STATUS_OK)
+	/* 6 is default after mode reset.  */
+	width = 6;
+
+      params.red_mask_size = params.green_mask_size
+	= params.blue_mask_size = width;
+    }
+#endif
+
+  err = grub_bsd_add_meta (NETBSD_BTINFO_FRAMEBUF, &params, sizeof (params));
+  return err;
+}
+
 static grub_err_t
 grub_netbsd_boot (void)
 {
@@ -786,6 +871,14 @@ grub_netbsd_boot (void)
   if (err)
     return err;
 
+  err = grub_netbsd_setup_video ();
+  if (err)
+    {
+      grub_print_error ();
+      grub_printf ("Booting however\n");
+      grub_errno = GRUB_ERR_NONE;
+    }
+
   {
     struct bsd_tag *tag;
     tag_buf_len = 0;
@@ -1320,7 +1413,7 @@ grub_cmd_netbsd (grub_extcmd_t cmd, int argc, char *argv[])
 	  grub_memset (&cons, 0, sizeof (cons));
 	  grub_strcpy (cons.devname, "pc");
 
- 	  grub_bsd_add_meta (NETBSD_BTINFO_CONSOLE, &cons, sizeof (cons));
+	  grub_bsd_add_meta (NETBSD_BTINFO_CONSOLE, &cons, sizeof (cons));
 	}
 
       grub_loader_set (grub_netbsd_boot, grub_bsd_unload, 0);

From 820e8e55fd31f719c951ce9bcf56b15dfd578b82 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 16 Jan 2010 00:31:24 +0100
Subject: [PATCH 0291/1628] Avoid retrieving video info when no video is active

---
 loader/i386/bsd.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index e6c5273cd..de4a256de 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -789,6 +789,7 @@ grub_netbsd_setup_video (void)
   const char *modevar;
   struct grub_netbsd_btinfo_framebuf params;
   grub_err_t err;
+  grub_video_driver_id_t driv_id;
 
   modevar = grub_env_get ("gfxpayload");
 
@@ -811,6 +812,10 @@ grub_netbsd_setup_video (void)
   if (err)
     return err;
 
+  driv_id = grub_video_get_driver_id ();
+  if (driv_id == GRUB_VIDEO_DRIVER_NONE)
+    return GRUB_ERR_NONE;
+
   err = grub_video_get_info_and_fini (&mode_info, &framebuffer);
 
   if (err)
@@ -835,7 +840,7 @@ grub_netbsd_setup_video (void)
   /* VESA packed modes may come with zeroed mask sizes, which need
      to be set here according to DAC Palette width.  If we don't,
      this results in Linux displaying a black screen.  */
-  if (mode_info.bpp <= 8)
+  if (mode_info.bpp <= 8 && driv_id == GRUB_VIDEO_DRIVER_VBE)
     {
       struct grub_vbe_info_block controller_info;
       int status;

From 70a14d3d49985c98f60bcec788e9261ff5e2db16 Mon Sep 17 00:00:00 2001
From: carles <carles@pinux>
Date: Sat, 16 Jan 2010 00:26:52 +0000
Subject: [PATCH 0292/1628] 2010-01-16  Carles Pina i Estany  <carles@pina.cat>

	* util/misc.c (grub_util_warn): Gettextizze, print full stop after
	the message.
	(grub_util_info): Likewise.
	(grub_util_error): Likewise.
	* util/elf/grub-mkimage.c: Fix capitalisation, quotes, full stops
	and/or new lines in `grub_util_warna', `grub_util_info',
	`grub_util_error' calls.
	* util/getroot.c: Likewise.
	* util/grub-editenv.c: Likewise.
	* util/grub-emu.c: Likewise.
	* util/grub-fstest.c: Likewise.
	* util/grub-mkdevicemap.c: Likewise.
	* util/grub-mkfont.c: Likewise.
	* util/grub-mkpasswd-pbkdf2.c: Likewise.
	* util/grub-mkrelpath.c: Likewise.
	* util/grub-pe2elf.c: Likewise.
	* util/grub-probe.c: Likewise.
	* util/hostdisk.c: Likewise.
	* util/i386/efi/grub-mkimage.c: Likewise.
	* util/i386/pc/grub-mkimage.c: Likewise.
	* util/i386/pc/grub-setup.c: Likewise.
	* util/ieee1275/ofpath.c: Likewise.
	* util/mkisofs/eltorito.c: Likewise.
	* util/mkisofs/rock.c: Likewise.
	* util/mkisofs/write.c: Likewise.
	* util/raid.c: Likewise.
	* util/sparc64/ieee1275/grub-mkimage.c: Likewise.
	* util/sparc64/ieee1275/grub-setup.c: Likewise.
---
 ChangeLog                            | 31 +++++++++++++++++++++
 util/elf/grub-mkimage.c              |  2 +-
 util/getroot.c                       | 26 +++++++++---------
 util/grub-editenv.c                  |  2 +-
 util/grub-emu.c                      |  6 ++---
 util/grub-fstest.c                   | 34 +++++++++++------------
 util/grub-mkdevicemap.c              |  2 +-
 util/grub-mkfont.c                   | 12 ++++-----
 util/grub-mkpasswd-pbkdf2.c          | 22 +++++++--------
 util/grub-mkrelpath.c                |  2 +-
 util/grub-pe2elf.c                   | 14 +++++-----
 util/grub-probe.c                    | 12 ++++-----
 util/hostdisk.c                      |  4 +--
 util/i386/efi/grub-mkimage.c         |  4 +--
 util/i386/pc/grub-mkimage.c          |  4 +--
 util/i386/pc/grub-setup.c            | 40 ++++++++++++++--------------
 util/ieee1275/ofpath.c               | 12 ++++-----
 util/misc.c                          | 15 ++++++-----
 util/mkisofs/eltorito.c              |  6 ++---
 util/mkisofs/rock.c                  |  2 +-
 util/mkisofs/write.c                 |  2 +-
 util/raid.c                          |  6 ++---
 util/sparc64/ieee1275/grub-mkimage.c |  2 +-
 util/sparc64/ieee1275/grub-setup.c   | 40 ++++++++++++++--------------
 24 files changed, 168 insertions(+), 134 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3acc543d4..0effe5e10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2010-01-16  Carles Pina i Estany  <carles@pina.cat>
+
+	* util/misc.c (grub_util_warn): Gettextizze, print full stop after
+	the message.
+	(grub_util_info): Likewise.
+	(grub_util_error): Likewise.
+	* util/elf/grub-mkimage.c: Fix capitalisation, quotes, full stops
+	and/or new lines in `grub_util_warna', `grub_util_info',
+	`grub_util_error' calls.
+	* util/getroot.c: Likewise.
+	* util/grub-editenv.c: Likewise.
+	* util/grub-emu.c: Likewise.
+	* util/grub-fstest.c: Likewise.
+	* util/grub-mkdevicemap.c: Likewise.
+	* util/grub-mkfont.c: Likewise.
+	* util/grub-mkpasswd-pbkdf2.c: Likewise.
+	* util/grub-mkrelpath.c: Likewise.
+	* util/grub-pe2elf.c: Likewise.
+	* util/grub-probe.c: Likewise.
+	* util/hostdisk.c: Likewise.
+	* util/i386/efi/grub-mkimage.c: Likewise.
+	* util/i386/pc/grub-mkimage.c: Likewise.
+	* util/i386/pc/grub-setup.c: Likewise.
+	* util/ieee1275/ofpath.c: Likewise.
+	* util/mkisofs/eltorito.c: Likewise.
+	* util/mkisofs/rock.c: Likewise.
+	* util/mkisofs/write.c: Likewise.
+	* util/raid.c: Likewise.
+	* util/sparc64/ieee1275/grub-mkimage.c: Likewise.
+	* util/sparc64/ieee1275/grub-setup.c: Likewise.
+
 2010-01-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Enable multiboot on non-pc.
diff --git a/util/elf/grub-mkimage.c b/util/elf/grub-mkimage.c
index 6ba8b1ae2..c0736b83f 100644
--- a/util/elf/grub-mkimage.c
+++ b/util/elf/grub-mkimage.c
@@ -328,7 +328,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s -o FILE [OPTION]... [MODULES]\n\
diff --git a/util/getroot.c b/util/getroot.c
index 22ad7e967..6357c8a26 100644
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -115,14 +115,14 @@ grub_get_prefix (const char *dir)
   saved_cwd = xgetcwd ();
 
   if (chdir (dir) < 0)
-    grub_util_error ("Cannot change directory to `%s'", dir);
+    grub_util_error ("cannot change directory to `%s'", dir);
 
   abs_dir = xgetcwd ();
   strip_extra_slashes (abs_dir);
   prev_dir = xstrdup (abs_dir);
 
   if (stat (".", &prev_st) < 0)
-    grub_util_error ("Cannot stat `%s'", dir);
+    grub_util_error ("cannot stat `%s'", dir);
 
   if (! S_ISDIR (prev_st.st_mode))
     grub_util_error ("`%s' is not a directory", dir);
@@ -130,13 +130,13 @@ grub_get_prefix (const char *dir)
   while (1)
     {
       if (chdir ("..") < 0)
-	grub_util_error ("Cannot change directory to the parent");
+	grub_util_error ("cannot change directory to the parent");
 
       if (stat (".", &st) < 0)
-	grub_util_error ("Cannot stat current directory");
+	grub_util_error ("cannot stat current directory");
 
       if (! S_ISDIR (st.st_mode))
-	grub_util_error ("Current directory is not a directory???");
+	grub_util_error ("current directory is not a directory???");
 
       if (prev_st.st_dev != st.st_dev || prev_st.st_ino == st.st_ino)
 	break;
@@ -153,7 +153,7 @@ grub_get_prefix (const char *dir)
   strip_extra_slashes (prefix);
 
   if (chdir (saved_cwd) < 0)
-    grub_util_error ("Cannot change directory to `%s'", dir);
+    grub_util_error ("cannot change directory to `%s'", dir);
 
 #ifdef __CYGWIN__
   if (st.st_dev != (DEV_CYGDRIVE_MAJOR << 16))
@@ -236,7 +236,7 @@ find_root_device (const char *dir, dev_t dev)
 	  if (res)
 	    {
 	      if (chdir (saved_cwd) < 0)
-		grub_util_error ("Cannot restore the original directory");
+		grub_util_error ("cannot restore the original directory");
 
 	      free (saved_cwd);
 	      closedir (dp);
@@ -279,7 +279,7 @@ find_root_device (const char *dir, dev_t dev)
 		continue;
 
 	  if (chdir (saved_cwd) < 0)
-	    grub_util_error ("Cannot restore the original directory");
+	    grub_util_error ("cannot restore the original directory");
 
 	  free (saved_cwd);
 	  closedir (dp);
@@ -288,7 +288,7 @@ find_root_device (const char *dir, dev_t dev)
     }
 
   if (chdir (saved_cwd) < 0)
-    grub_util_error ("Cannot restore the original directory");
+    grub_util_error ("cannot restore the original directory");
 
   free (saved_cwd);
   closedir (dp);
@@ -445,7 +445,7 @@ grub_guess_root_device (const char *dir)
   struct stat st;
 
   if (stat (dir, &st) < 0)
-    grub_util_error ("Cannot stat `%s'", dir);
+    grub_util_error ("cannot stat `%s'", dir);
 
 #ifdef __CYGWIN__
   /* Cygwin specific function.  */
@@ -591,7 +591,7 @@ grub_util_get_grub_dev (const char *os_dev)
 	  free (p);
 	}
       else
-	grub_util_error ("Unknown kind of RAID device `%s'", os_dev);
+	grub_util_error ("unknown kind of RAID device `%s'", os_dev);
 
       break;
 
@@ -608,7 +608,7 @@ grub_util_check_block_device (const char *blk_dev)
   struct stat st;
 
   if (stat (blk_dev, &st) < 0)
-    grub_util_error ("Cannot stat `%s'", blk_dev);
+    grub_util_error ("cannot stat `%s'", blk_dev);
 
   if (S_ISBLK (st.st_mode))
     return (blk_dev);
@@ -622,7 +622,7 @@ grub_util_check_char_device (const char *blk_dev)
   struct stat st;
 
   if (stat (blk_dev, &st) < 0)
-    grub_util_error ("Cannot stat `%s'", blk_dev);
+    grub_util_error ("cannot stat `%s'", blk_dev);
 
   if (S_ISCHR (st.st_mode))
     return (blk_dev);
diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index 1fb1422df..ea0e4da19 100644
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -69,7 +69,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``grub-editenv --help'' for more information.\n");
+    fprintf (stderr, "Try `grub-editenv --help' for more information.\n");
   else
     printf ("\
 Usage: grub-editenv [OPTIONS] [FILENAME] COMMAND\n\
diff --git a/util/grub-emu.c b/util/grub-emu.c
index 3f2acaaec..a04aeae78 100644
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -129,7 +129,7 @@ usage (int status)
 {
   if (status)
     fprintf (stderr,
-	     "Try ``grub-emu --help'' for more information.\n");
+	     "Try `grub-emu --help' for more information.\n");
   else
     printf (
       "Usage: grub-emu [OPTION]...\n"
@@ -220,14 +220,14 @@ main (int argc, char *argv[])
     {
       char *device_name = grub_guess_root_device (dir);
       if (! device_name)
-        grub_util_error ("cannot find a device for %s.\n", dir);
+        grub_util_error ("cannot find a device for %s", dir);
 
       root_dev = grub_util_get_grub_dev (device_name);
       if (! root_dev)
 	{
 	  grub_util_info ("guessing the root device failed, because of `%s'",
 			  grub_errmsg);
-	  grub_util_error ("Cannot guess the root device. Specify the option ``--root-device''.");
+	  grub_util_error ("cannot guess the root device. Specify the option `--root-device'");
 	}
     }
 
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index 586dda0f9..4470cbfa5 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -71,7 +71,7 @@ execute_command (char *name, int n, char **args)
 
   cmd = grub_command_find (name);
   if (! cmd)
-    grub_util_error ("Can\'t find command %s", name);
+    grub_util_error ("can\'t find command %s", name);
 
   return (cmd->func) (cmd, n, args);
 }
@@ -100,9 +100,9 @@ read_file (char *pathname, int (*hook) (grub_off_t ofs, char *buf, int len))
 
       dev = grub_device_open (0);
       if ((! dev) || (! dev->disk))
-        grub_util_error ("Can\'t open device.");
+        grub_util_error ("can\'t open device");
 
-      grub_util_info ("total sectors : %lld.",
+      grub_util_info ("total sectors : %lld",
                       (unsigned long long) dev->disk->total_sectors);
 
       if (! leng)
@@ -115,7 +115,7 @@ read_file (char *pathname, int (*hook) (grub_off_t ofs, char *buf, int len))
           len = (leng > BUF_SIZE) ? BUF_SIZE : leng;
 
           if (grub_disk_read (dev->disk, 0, skip, len, buf))
-            grub_util_error ("Disk read fails at offset %lld, length %d.",
+            grub_util_error ("disk read fails at offset %lld, length %d",
                              skip, len);
 
           if (hook (skip, buf, len))
@@ -132,15 +132,15 @@ read_file (char *pathname, int (*hook) (grub_off_t ofs, char *buf, int len))
   file = grub_file_open (pathname);
   if (!file)
     {
-      grub_util_error ("cannot open file %s.", pathname);
+      grub_util_error ("cannot open file %s", pathname);
       return;
     }
 
-  grub_util_info ("file size : %lld.", (unsigned long long) file->size);
+  grub_util_info ("file size : %lld", (unsigned long long) file->size);
 
   if (skip > file->size)
     {
-      grub_util_error ("invalid skip value %lld.", (unsigned long long) skip);
+      grub_util_error ("invalid skip value %lld", (unsigned long long) skip);
       return;
     }
 
@@ -158,7 +158,7 @@ read_file (char *pathname, int (*hook) (grub_off_t ofs, char *buf, int len))
       sz = grub_file_read (file, buf, (len > BUF_SIZE) ? BUF_SIZE : len);
       if (sz < 0)
 	{
-	  grub_util_error ("read error at offset %llu.", ofs);
+	  grub_util_error ("read error at offset %llu", ofs);
 	  break;
 	}
 
@@ -184,7 +184,7 @@ cmd_cp (char *src, char *dest)
 
     if ((int) fwrite (buf, 1, len, ff) != len)
       {
-	grub_util_error ("write error.");
+	grub_util_error ("write error");
 	return 1;
       }
 
@@ -194,7 +194,7 @@ cmd_cp (char *src, char *dest)
   ff = fopen (dest, "wb");
   if (ff == NULL)
     {
-      grub_util_error ("open error.");
+      grub_util_error ("open error");
       return;
     }
   read_file (src, cp_hook);
@@ -212,7 +212,7 @@ cmd_cmp (char *src, char *dest)
   {
     if ((int) fread (buf_1, 1, len, ff) != len)
       {
-	grub_util_error ("read error at offset %llu.", ofs);
+	grub_util_error ("read error at offset %llu", ofs);
 	return 1;
       }
 
@@ -223,7 +223,7 @@ cmd_cmp (char *src, char *dest)
 	for (i = 0; i < len; i++, ofs++)
 	  if (buf_1[i] != buf[i])
 	    {
-	      grub_util_error ("compare fail at offset %llu.", ofs);
+	      grub_util_error ("compare fail at offset %llu", ofs);
 	      return 1;
 	    }
       }
@@ -233,12 +233,12 @@ cmd_cmp (char *src, char *dest)
   ff = fopen (dest, "rb");
   if (ff == NULL)
     {
-      grub_util_error ("open error.");
+      grub_util_error ("open error");
       return;
     }
 
   if ((skip) && (fseeko (ff, skip, SEEK_SET)))
-    grub_util_error ("seek error.");
+    grub_util_error ("seek error");
 
   read_file (src, cmp_hook);
   fclose (ff);
@@ -286,13 +286,13 @@ fstest (char **images, int num_disks, int cmd, int n, char **args)
   for (i = 0; i < num_disks; i++)
     {
       if (grub_strlen (images[i]) + 7 > sizeof (host_file))
-        grub_util_error ("Pathname %s too long.", images[i]);
+        grub_util_error ("pathname %s too long", images[i]);
 
       grub_sprintf (loop_name, "loop%d", i);
       grub_sprintf (host_file, "(host)%s", images[i]);
 
       if (execute_command ("loopback", 3, argv))
-        grub_util_error ("loopback command fails.");
+        grub_util_error ("loopback command fails");
     }
 
   grub_lvm_fini ();
@@ -349,7 +349,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s [OPTION]... IMAGE_PATH COMMANDS\n\
diff --git a/util/grub-mkdevicemap.c b/util/grub-mkdevicemap.c
index b4febbb8d..c68482af1 100644
--- a/util/grub-mkdevicemap.c
+++ b/util/grub-mkdevicemap.c
@@ -84,7 +84,7 @@ usage (int status)
 {
   if (status)
     fprintf (stderr,
-	     "Try ``%s --help'' for more information.\n", program_name);
+	     "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s [OPTION]...\n\
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 3d1c6faac..fcd35afd4 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -96,7 +96,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s [OPTIONS] FONT_FILES\n\
@@ -347,7 +347,7 @@ write_font (struct grub_font_info *font_info, char *output_file)
 
   file = fopen (output_file, "wb");
   if (! file)
-    grub_util_error ("Can\'t write to file %s.", output_file);
+    grub_util_error ("can\'t write to file %s.", output_file);
 
   offset = 0;
 
@@ -546,7 +546,7 @@ main (int argc, char *argv[])
 
 		  a = strtoul (p, &p, 0);
 		  if (*p != '-')
-		    grub_util_error ("Invalid font range");
+		    grub_util_error ("invalid font range");
 		  b = strtoul (p + 1, &p, 0);
 		  if ((font_info.num_range & (GRUB_FONT_RANGE_BLOCK - 1)) == 0)
 		    font_info.ranges = xrealloc (font_info.ranges,
@@ -561,7 +561,7 @@ main (int argc, char *argv[])
 		  if (*p)
 		    {
 		      if (*p != ',')
-			grub_util_error ("Invalid font range");
+			grub_util_error ("invalid font range");
 		      else
 			p++;
 		    }
@@ -598,7 +598,7 @@ main (int argc, char *argv[])
     }
 
   if (! output_file)
-    grub_util_error ("No output file is specified.");
+    grub_util_error ("no output file is specified");
 
   if (FT_Init_FreeType (&ft_lib))
     grub_util_error ("FT_Init_FreeType fails");
@@ -610,7 +610,7 @@ main (int argc, char *argv[])
 
       if (FT_New_Face (ft_lib, argv[optind], font_index, &ft_face))
 	{
-	  grub_util_info ("Can't open file %s, index %d\n", argv[optind],
+	  grub_util_info ("can't open file %s, index %d", argv[optind],
 			  font_index);
 	  continue;
 	}
diff --git a/util/grub-mkpasswd-pbkdf2.c b/util/grub-mkpasswd-pbkdf2.c
index b27a4e893..f5fdcca96 100644
--- a/util/grub-mkpasswd-pbkdf2.c
+++ b/util/grub-mkpasswd-pbkdf2.c
@@ -74,7 +74,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``grub-scrypt --help'' for more information.\n");
+    fprintf (stderr, "Try `grub-scrypt --help' for more information.\n");
   else
     printf ("\
 Usage: grub-scrypt [OPTIONS]\n\
@@ -165,12 +165,12 @@ main (int argc, char *argv[])
 
   bufhex = malloc (buflen * 2 + 1);
   if (!bufhex)
-    grub_util_error ("Out of memory");
+    grub_util_error ("out of memory");
   buf = malloc (buflen);
   if (!buf)
     {
       free (bufhex);
-      grub_util_error ("Out of memory");
+      grub_util_error ("out of memory");
     }
 
   salt = malloc (saltlen);
@@ -178,7 +178,7 @@ main (int argc, char *argv[])
     {
       free (bufhex);
       free (buf);
-      grub_util_error ("Out of memory");
+      grub_util_error ("out of memory");
     }
   salthex = malloc (saltlen * 2 + 1);
   if (!salthex)
@@ -186,7 +186,7 @@ main (int argc, char *argv[])
       free (salt);
       free (bufhex);
       free (buf);
-      grub_util_error ("Out of memory");
+      grub_util_error ("out of memory");
     }
 
   /* Disable echoing. Based on glibc.  */
@@ -225,7 +225,7 @@ main (int argc, char *argv[])
       /* Restore the original setting.  */
       if (tty_changed)
 	(void) tcsetattr (fileno (in), TCSAFLUSH, &s);
-      grub_util_error ("Failure to read password");
+      grub_util_error ("failure to read password");
     }
   if (nr >= 1 && pass1[nr-1] == '\n')
     pass1[nr-1] = 0;
@@ -249,7 +249,7 @@ main (int argc, char *argv[])
       free (bufhex);
       free (salthex);
       free (salt);
-      grub_util_error ("Failure to read password");
+      grub_util_error ("failure to read password");
     }
   if (nr >= 1 && pass2[nr-1] == '\n')
     pass2[nr-1] = 0;
@@ -264,7 +264,7 @@ main (int argc, char *argv[])
       free (bufhex);
       free (salthex);
       free (salt);
-      grub_util_error ("Passwords don't match");
+      grub_util_error ("passwords don't match");
     }
   memset (pass2, 0, strlen (pass2));
   free (pass2);
@@ -286,7 +286,7 @@ main (int argc, char *argv[])
 	free (salthex);
 	free (salt);
 	fclose (f);
-	grub_util_error ("Couldn't retrieve random data for salt");
+	grub_util_error ("couldn't retrieve random data for salt");
       }
     rd = fread (salt, 1, saltlen, f);
     if (rd != saltlen)
@@ -299,7 +299,7 @@ main (int argc, char *argv[])
 	free (salthex);
 	free (salt);
 	fclose (f);
-	grub_util_error ("Couldn't retrieve random data for salt");
+	grub_util_error ("couldn't retrieve random data for salt");
       }
     fclose (f);
   }
@@ -321,7 +321,7 @@ main (int argc, char *argv[])
       memset (salthex, 0, 2 * saltlen);
       free (salt);
       free (salthex);
-      grub_util_error ("Cryptographic error number %d", gcry_err);
+      grub_util_error ("cryptographic error number %d", gcry_err);
     }
 
   hexify (bufhex, buf, buflen);
diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c
index 62e400814..327f0c866 100644
--- a/util/grub-mkrelpath.c
+++ b/util/grub-mkrelpath.c
@@ -34,7 +34,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s [OPTIONS] PATH\n\
diff --git a/util/grub-pe2elf.c b/util/grub-pe2elf.c
index fb370d9ec..488ad9b23 100644
--- a/util/grub-pe2elf.c
+++ b/util/grub-pe2elf.c
@@ -40,7 +40,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s [OPTIONS] input [output]\n\
@@ -182,7 +182,7 @@ write_section_data (FILE* fp, char *image,
           char name[5 + strlen (pe_shdr->name)];
 
           if (num_sections >= MAX_SECTIONS)
-            grub_util_error ("Too many sections");
+            grub_util_error ("too many sections");
 
           sprintf (name, ".rel%s", pe_shdr->name);
 
@@ -230,14 +230,14 @@ write_reloc_section (FILE* fp, char *image,
 
           if ((pe_rel->symtab_index >= pe_chdr->num_symbols) ||
               (symtab_map[pe_rel->symtab_index] == -1))
-            grub_util_error ("Invalid symbol");
+            grub_util_error ("invalid symbol");
 
           if (pe_rel->type == GRUB_PE32_REL_I386_DIR32)
             type = R_386_32;
           else if (pe_rel->type == GRUB_PE32_REL_I386_REL32)
             type = R_386_PC32;
           else
-            grub_util_error ("Unknown pe relocation type %d\n", pe_rel->type);
+            grub_util_error ("unknown pe relocation type %d\n", pe_rel->type);
 
           ofs = pe_rel->offset - pe_sec->virtual_address;
           addr = (grub_uint32_t *)(image + pe_sec->raw_data_offset + ofs);
@@ -248,14 +248,14 @@ write_reloc_section (FILE* fp, char *image,
               code = image[pe_sec->raw_data_offset + ofs - 1];
 
               if (((code != 0xe8) && (code != 0xe9)) || (*addr))
-                grub_util_error ("Invalid relocation (%x %x)", code, *addr);
+                grub_util_error ("invalid relocation (%x %x)", code, *addr);
 
               modified = 1;
               if (symtab[symtab_map[pe_rel->symtab_index]].st_shndx)
                 {
                   if (symtab[symtab_map[pe_rel->symtab_index]].st_shndx
                       != shdr[i].sh_info)
-                    grub_util_error ("Cross section call is not allowed");
+                    grub_util_error ("cross section call is not allowed");
 
                   *addr = (symtab[symtab_map[pe_rel->symtab_index]].st_value
                            - ofs - 4);
@@ -440,7 +440,7 @@ convert_pe (FILE* fp, char *image)
 
   pe_chdr = (struct grub_pe32_coff_header *) image;
   if (grub_le_to_cpu16 (pe_chdr->machine) != GRUB_PE32_MACHINE_I386)
-    grub_util_error ("Invalid coff image");
+    grub_util_error ("invalid coff image");
 
   strtab = xmalloc (STRTAB_BLOCK);
   strtab_max = STRTAB_BLOCK;
diff --git a/util/grub-probe.c b/util/grub-probe.c
index 4ba8a98e5..879098542 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -84,7 +84,7 @@ probe_partmap (grub_disk_t disk)
 {
   if (disk->partition == NULL)
     {
-      grub_util_info ("No partition map found for %s", disk->name);
+      grub_util_info ("no partition map found for %s", disk->name);
       return;
     }
 
@@ -113,17 +113,17 @@ probe (const char *path, char *device_name)
     {
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
       if (! grub_util_check_char_device (device_name))
-        grub_util_error ("%s is not a character device.\n", device_name);
+        grub_util_error ("%s is not a character device", device_name);
 #else
       if (! grub_util_check_block_device (device_name))
-        grub_util_error ("%s is not a block device.\n", device_name);
+        grub_util_error ("%s is not a block device", device_name);
 #endif
     }
   else
     device_name = grub_guess_root_device (path);
 
   if (! device_name)
-    grub_util_error ("cannot find a device for %s (is /dev mounted?).\n", path);
+    grub_util_error ("cannot find a device for %s (is /dev mounted?)", path);
 
   if (print == PRINT_DEVICE)
     {
@@ -133,7 +133,7 @@ probe (const char *path, char *device_name)
 
   drive_name = grub_util_get_grub_dev (device_name);
   if (! drive_name)
-    grub_util_error ("Cannot find a GRUB drive for %s.  Check your device.map.\n", device_name);
+    grub_util_error ("cannot find a GRUB drive for %s.  Check your device.map", device_name);
 
   if (print == PRINT_DRIVE)
     {
@@ -309,7 +309,7 @@ usage (int status)
 {
   if (status)
     fprintf (stderr,
-	     "Try ``%s --help'' for more information.\n", program_name);
+	     "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s [OPTION]... [PATH|DEVICE]\n\
diff --git a/util/hostdisk.c b/util/hostdisk.c
index c94f4237e..603445801 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -568,7 +568,7 @@ read_device_map (const char *dev_map)
   fp = fopen (dev_map, "r");
   if (! fp)
     {
-      grub_util_info (_("Cannot open `%s'"), dev_map);
+      grub_util_info (_("cannot open `%s'"), dev_map);
       return;
     }
 
@@ -639,7 +639,7 @@ read_device_map (const char *dev_map)
 	 symbolic links.  */
       map[drive].device = xmalloc (PATH_MAX);
       if (! realpath (p, map[drive].device))
-	grub_util_error ("Cannot get the real path of `%s'", p);
+	grub_util_error ("cannot get the real path of `%s'", p);
 #else
       map[drive].device = xstrdup (p);
 #endif
diff --git a/util/i386/efi/grub-mkimage.c b/util/i386/efi/grub-mkimage.c
index 7f5141531..8fee3e8d9 100644
--- a/util/i386/efi/grub-mkimage.c
+++ b/util/i386/efi/grub-mkimage.c
@@ -778,7 +778,7 @@ make_reloc_section (FILE *out, Elf_Addr current_address, Elf_Ehdr *e,
 	    if ((ELF_R_TYPE (info) == R_X86_64_32) ||
                 (ELF_R_TYPE (info) == R_X86_64_32S))
 	      {
-		grub_util_error ("Can\'t add fixup entry for R_X86_64_32(S)");
+		grub_util_error ("can\'t add fixup entry for R_X86_64_32(S)");
 	      }
 	    else if (ELF_R_TYPE (info) == R_X86_64_64)
 	      {
@@ -1029,7 +1029,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``grub-mkimage --help'' for more information.\n");
+    fprintf (stderr, "Try `grub-mkimage --help' for more information.\n");
   else
     printf ("\
 Usage: grub-mkimage -o FILE [OPTION]... [MODULES]\n\
diff --git a/util/i386/pc/grub-mkimage.c b/util/i386/pc/grub-mkimage.c
index ebf1bc7ff..08807b4d1 100644
--- a/util/i386/pc/grub-mkimage.c
+++ b/util/i386/pc/grub-mkimage.c
@@ -289,7 +289,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
 #ifdef GRUB_MACHINE_PCBIOS
   if (GRUB_KERNEL_MACHINE_LINK_ADDR + core_size > GRUB_MEMORY_MACHINE_UPPER)
-    grub_util_error (_("Core image is too big (%p > %p)\n"),
+    grub_util_error (_("core image is too big (%p > %p)"),
  		     GRUB_KERNEL_MACHINE_LINK_ADDR + core_size, GRUB_MEMORY_MACHINE_UPPER);
 #endif
 
@@ -326,7 +326,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, _("Try ``%s --help'' for more information.\n"), program_name);
+    fprintf (stderr, _("Try `%s --help' for more information.\n"), program_name);
   else
     printf (_("\
 Usage: grub-mkimage [OPTION]... [MODULES]\n\
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 909a521eb..64b017296 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -156,7 +156,7 @@ setup (const char *dir,
 		      sector, offset, length);
 
       if (offset != 0 || length != GRUB_DISK_SECTOR_SIZE)
-	grub_util_error (_("The first sector of the core file is not sector-aligned"));
+	grub_util_error (_("the first sector of the core file is not sector-aligned"));
 
       first_sector = sector;
     }
@@ -170,7 +170,7 @@ setup (const char *dir,
 		      sector, offset, length, (unsigned) current_segment);
 
       if (offset != 0 || last_length != GRUB_DISK_SECTOR_SIZE)
-	grub_util_error (_("Non-sector-aligned data is found in the core file"));
+	grub_util_error (_("non-sector-aligned data is found in the core file"));
 
       if (block != first_block
 	  && (grub_le_to_cpu64 (prev->start)
@@ -184,7 +184,7 @@ setup (const char *dir,
 
 	  block--;
 	  if (block->len)
-	    grub_util_error (_("The sectors of the core file are too fragmented"));
+	    grub_util_error (_("the sectors of the core file are too fragmented"));
 	}
 
       last_length = length;
@@ -195,7 +195,7 @@ setup (const char *dir,
   boot_path = grub_util_get_path (dir, boot_file);
   boot_size = grub_util_get_image_size (boot_path);
   if (boot_size != GRUB_DISK_SECTOR_SIZE)
-    grub_util_error (_("The size of `%s' is not %u"),
+    grub_util_error (_("the size of `%s' is not %u"),
 		     boot_path, GRUB_DISK_SECTOR_SIZE);
   boot_img = grub_util_read_image (boot_path);
   free (boot_path);
@@ -212,9 +212,9 @@ setup (const char *dir,
   core_sectors = ((core_size + GRUB_DISK_SECTOR_SIZE - 1)
 		  >> GRUB_DISK_SECTOR_BITS);
   if (core_size < GRUB_DISK_SECTOR_SIZE)
-    grub_util_error (_("The size of `%s' is too small"), core_path);
+    grub_util_error (_("the size of `%s' is too small"), core_path);
   else if (core_size > 0xFFFF * GRUB_DISK_SECTOR_SIZE)
-    grub_util_error (_("The size of `%s' is too large"), core_path);
+    grub_util_error (_("the size of `%s' is too large"), core_path);
 
   core_img = grub_util_read_image (core_path);
 
@@ -251,7 +251,7 @@ setup (const char *dir,
       grub_fs_t fs;
       fs = grub_fs_probe (dest_dev);
       if (! fs)
-	grub_util_error (_("Unable to identify a filesystem in %s; safety check can't be performed"),
+	grub_util_error (_("unable to identify a filesystem in %s; safety check can't be performed"),
 			 dest_dev->disk->name);
 
       if (! fs->reserved_first_sector)
@@ -304,7 +304,7 @@ setup (const char *dir,
 	      bsd_part = -1;
 	    }
 	  else
-	    grub_util_error (_("No DOS-style partitions found"));
+	    grub_util_error (_("no DOS-style partitions found"));
 	}
       else
 	dos_part = bsd_part = -1;
@@ -413,14 +413,14 @@ setup (const char *dir,
 unable_to_embed:
 
   if (must_embed)
-    grub_util_error (_("Embedding is not possible, but this is required when "
-		       "the root device is on a RAID array or LVM volume."));
+    grub_util_error (_("embedding is not possible, but this is required when "
+		       "the root device is on a RAID array or LVM volume"));
 
   grub_util_warn (_("Embedding is not possible.  GRUB can only be installed in this "
 		    "setup by using blocklists.  However, blocklists are UNRELIABLE and "
 		    "its use is discouraged."));
   if (! force)
-    grub_util_error (_("If you really want blocklists, use --force."));
+    grub_util_error (_("if you really want blocklists, use --force"));
 
   /* Make sure that GRUB reads the identical image as the OS.  */
   tmp_img = xmalloc (core_size);
@@ -495,7 +495,7 @@ unable_to_embed:
     }
 
   if (i == MAX_TRIES)
-    grub_util_error (_("Cannot read `%s' correctly"), core_path_dev);
+    grub_util_error (_("cannot read `%s' correctly"), core_path_dev);
 
   /* Clean out the blocklists.  */
   block = first_block;
@@ -508,7 +508,7 @@ unable_to_embed:
       block--;
 
       if ((char *) block <= core_img)
-	grub_util_error (_("No terminator in the core image"));
+	grub_util_error (_("no terminator in the core image"));
     }
 
   /* Now read the core image to determine where the sectors are.  */
@@ -519,13 +519,13 @@ unable_to_embed:
   file->read_hook = save_first_sector;
   if (grub_file_read (file, tmp_img, GRUB_DISK_SECTOR_SIZE)
       != GRUB_DISK_SECTOR_SIZE)
-    grub_util_error (_("Failed to read the first sector of the core image"));
+    grub_util_error (_("failed to read the first sector of the core image"));
 
   block = first_block;
   file->read_hook = save_blocklists;
   if (grub_file_read (file, tmp_img, core_size - GRUB_DISK_SECTOR_SIZE)
       != (grub_ssize_t) core_size - GRUB_DISK_SECTOR_SIZE)
-    grub_util_error (_("Failed to read the rest sectors of the core image"));
+    grub_util_error (_("failed to read the rest sectors of the core image"));
 
   grub_file_close (file);
 
@@ -544,7 +544,7 @@ unable_to_embed:
   grub_util_info ("opening the core image `%s'", core_path);
   fp = fopen (core_path, "r+b");
   if (! fp)
-    grub_util_error (_("Cannot open `%s'"), core_path);
+    grub_util_error (_("cannot open `%s'"), core_path);
 
   grub_util_write_image (core_img, GRUB_DISK_SECTOR_SIZE * 2, fp);
   fclose (fp);
@@ -584,13 +584,13 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, _("Try ``%s --help'' for more information.\n"), program_name);
+    fprintf (stderr, _("Try `%s --help' for more information.\n"), program_name);
   else
     printf (_("\
 Usage: grub-setup [OPTION]... DEVICE\n\
 \n\
 Set up images to boot from DEVICE.\n\
-DEVICE must be a GRUB device (e.g. ``(hd0,1)'').\n\
+DEVICE must be a GRUB device (e.g. `(hd0,1)').\n\
 \n\
   -b, --boot-image=FILE   use FILE as the boot image [default=%s]\n\
   -c, --core-image=FILE   use FILE as the core image [default=%s]\n\
@@ -751,7 +751,7 @@ main (int argc, char *argv[])
       char *tmp = get_device_name (root_dev);
 
       if (! tmp)
-	grub_util_error (_("Invalid root device `%s'"), root_dev);
+	grub_util_error (_("invalid root device `%s'"), root_dev);
 
       tmp = xstrdup (tmp);
       free (root_dev);
@@ -764,7 +764,7 @@ main (int argc, char *argv[])
 	{
 	  grub_util_info ("guessing the root device failed, because of `%s'",
 			  grub_errmsg);
-	  grub_util_error (_("Cannot guess the root device. Specify the option ``--root-device''."));
+	  grub_util_error (_("cannot guess the root device. Specify the option `--root-device'"));
 	}
     }
 
diff --git a/util/ieee1275/ofpath.c b/util/ieee1275/ofpath.c
index e90488fc3..79a0e8be5 100644
--- a/util/ieee1275/ofpath.c
+++ b/util/ieee1275/ofpath.c
@@ -131,12 +131,12 @@ block_device_get_sysfs_path_and_link(const char *devicenode,
   snprintf(sysfs_path, sysfs_path_len, "/sys/block/%s", devicenode);
 
   if (!realpath (sysfs_path, rpath))
-    grub_util_error ("Cannot get the real path of `%s'", sysfs_path);
+    grub_util_error ("cannot get the real path of `%s'", sysfs_path);
 
   strcat(rpath, "/device");
 
   if (!realpath (rpath, sysfs_path))
-    grub_util_error ("Cannot get the real path of `%s'", rpath);
+    grub_util_error ("cannot get the real path of `%s'", rpath);
 
   free (rpath);
 }
@@ -247,12 +247,12 @@ vendor_is_ATA(const char *path)
   snprintf(buf, PATH_MAX, "%s/vendor", path);
   fd = open(buf, O_RDONLY);
   if (fd < 0)
-    grub_util_error ("Cannot open 'vendor' node of `%s'", path);
+    grub_util_error ("cannot open 'vendor' node of `%s'", path);
 
   memset(buf, 0, PATH_MAX);
   err = read(fd, buf, PATH_MAX);
   if (err < 0)
-    grub_util_error ("Cannot read 'vendor' node of `%s'", path);
+    grub_util_error ("cannot read 'vendor' node of `%s'", path);
 
   close(fd);
 
@@ -288,7 +288,7 @@ check_sas (char *sysfs_path, int *tgt)
 
   fd = open(path, O_RDONLY);
   if (fd < 0)
-    grub_util_error("Cannot open SAS PHY ID '%s'\n", path);
+    grub_util_error("cannot open SAS PHY ID `%s'\n", path);
 
   memset (phy, 0, sizeof (phy));
   read (fd, phy, sizeof (phy));
@@ -375,7 +375,7 @@ grub_util_devname_to_ofpath (char *devname)
   name_buf = xmalloc (PATH_MAX);
   name_buf = realpath (devname, name_buf);
   if (! name_buf)
-    grub_util_error ("Cannot get the real path of `%s'", devname);
+    grub_util_error ("cannot get the real path of `%s'", devname);
 
   device = get_basename (devname);
   devnode = strip_trailing_digits (devname);
diff --git a/util/misc.c b/util/misc.c
index 47dd8c78d..7f347c872 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -60,11 +60,12 @@ grub_util_warn (const char *fmt, ...)
 {
   va_list ap;
 
-  fprintf (stderr, "%s: warn: ", program_name);
+  fprintf (stderr, _("%s: warn:"), program_name);
+  fprintf (stderr, " ");
   va_start (ap, fmt);
   vfprintf (stderr, fmt, ap);
   va_end (ap);
-  fputc ('\n', stderr);
+  fprintf (stderr, ".\n");
   fflush (stderr);
 }
 
@@ -75,11 +76,12 @@ grub_util_info (const char *fmt, ...)
     {
       va_list ap;
 
-      fprintf (stderr, "%s: info: ", program_name);
+      fprintf (stderr, _("%s: info:"), program_name);
+      fprintf (stderr, " ");
       va_start (ap, fmt);
       vfprintf (stderr, fmt, ap);
       va_end (ap);
-      fputc ('\n', stderr);
+      fprintf (".\n", stderr);
       fflush (stderr);
     }
 }
@@ -89,11 +91,12 @@ grub_util_error (const char *fmt, ...)
 {
   va_list ap;
 
-  fprintf (stderr, "%s: error: ", program_name);
+  fprintf (stderr, _("%s: error:"), program_name);
+  fprintf (stderr, " ");
   va_start (ap, fmt);
   vfprintf (stderr, fmt, ap);
   va_end (ap);
-  fputc ('\n', stderr);
+  fprintf (stderr, ".\n");
   exit (1);
 }
 
diff --git a/util/mkisofs/eltorito.c b/util/mkisofs/eltorito.c
index a134dfc48..1d2a715e0 100644
--- a/util/mkisofs/eltorito.c
+++ b/util/mkisofs/eltorito.c
@@ -288,7 +288,7 @@ void FDECL1(get_torito_desc, struct eltorito_boot_descriptor *, boot_desc)
 	struct eltorito_boot_info bi_table;
 	bootimage = fopen (de->whole_name, "r+b");
 	if (bootimage == NULL)
-	  error (1, errno, _("Error opening boot image file '%s' for update"),
+	  error (1, errno, _("Error opening boot image file `%s' for update"),
 		 de->whole_name);
 	/* Compute checksum of boot image, sans 64 bytes */
 	total_len = 0;
@@ -296,7 +296,7 @@ void FDECL1(get_torito_desc, struct eltorito_boot_descriptor *, boot_desc)
 	while ((len = fread (csum_buffer, 1, SECTOR_SIZE, bootimage)) > 0)
 	  {
 	    if (total_len & 3)
-	      error (1, 0, _("Odd alignment at non-end-of-file in boot image '%s'"),
+	      error (1, 0, _("Odd alignment at non-end-of-file in boot image `%s'"),
 		     de->whole_name);
 	    if (total_len < 64)
 	      memset (csum_buffer, 0, 64 - total_len);
@@ -308,7 +308,7 @@ void FDECL1(get_torito_desc, struct eltorito_boot_descriptor *, boot_desc)
 	  }
 
 	if (total_len != de->size)
-	  error (1, 0, _("Boot image file '%s' changed unexpectedly"),
+	  error (1, 0, _("Boot image file `%s' changed unexpectedly"),
 		 de->whole_name);
 	/* End of file, set position to byte 8 */
 	fseeko (bootimage, (off_t) 8, SEEK_SET);
diff --git a/util/mkisofs/rock.c b/util/mkisofs/rock.c
index f18b0bd83..a7a39f774 100644
--- a/util/mkisofs/rock.c
+++ b/util/mkisofs/rock.c
@@ -306,7 +306,7 @@ int deep_opt;
 	     * the symbolic link won't fit into one SL System Use Field
 	     * print an error message and continue with splited one
 	     */
-	    fprintf (stderr, _("symbolic link ``%s'' too long for one SL System Use Field, splitting"), cpnt);
+	    fprintf (stderr, _("symbolic link `%s' too long for one SL System Use Field, splitting"), cpnt);
 	  }
        if(MAYBE_ADD_CE_ENTRY(SL_SIZE + sl_bytes)) add_CE_entry();
      }
diff --git a/util/mkisofs/write.c b/util/mkisofs/write.c
index 5447229c8..e1cdd213e 100644
--- a/util/mkisofs/write.c
+++ b/util/mkisofs/write.c
@@ -158,7 +158,7 @@ void FDECL4(xfwrite, void *, buffer, uint64_t, count, uint64_t, size, FILE *, fi
 		sprintf(nbuf, "%s_%02d", outfile, idx++);
 		file = freopen(nbuf, "wb", file);
 		if (file == NULL)
-		  error (1, errno, _("Cannot open '%s'"), nbuf);
+		  error (1, errno, _("Cannot open `%s'"), nbuf);
 
 	}
      while(count)
diff --git a/util/raid.c b/util/raid.c
index 83a0ee6e2..ec3ecd26e 100644
--- a/util/raid.c
+++ b/util/raid.c
@@ -50,7 +50,7 @@ grub_util_getdiskname (int major, int minor)
   else if (major == SCSI_DISK0_MAJOR)
     sprintf (name, "/dev/sd%c", 'a' + minor / 16);
   else
-    grub_util_error ("Unknown device number: %d, %d", major, minor);
+    grub_util_error ("unknown device number: %d, %d", major, minor);
 
   return name;
 }
@@ -72,7 +72,7 @@ grub_util_raid_getmembers (char *name)
   fd = open (devname, O_RDONLY);
 
   if (fd == -1)
-    grub_util_error ("Can't open %s: %s", devname, strerror (errno));
+    grub_util_error ("can't open %s: %s", devname, strerror (errno));
 
   free (devname);
 
@@ -81,7 +81,7 @@ grub_util_raid_getmembers (char *name)
     grub_util_error ("ioctl RAID_VERSION error: %s", strerror (errno));
 
   if (version.major != 0 || version.minor != 90)
-    grub_util_error ("Unsupported RAID version: %d.%d",
+    grub_util_error ("unsupported RAID version: %d.%d",
 		     version.major, version.minor);
 
   ret = ioctl (fd, GET_ARRAY_INFO, &info);
diff --git a/util/sparc64/ieee1275/grub-mkimage.c b/util/sparc64/ieee1275/grub-mkimage.c
index 96ddfe3d7..6907b8d8a 100644
--- a/util/sparc64/ieee1275/grub-mkimage.c
+++ b/util/sparc64/ieee1275/grub-mkimage.c
@@ -191,7 +191,7 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s [OPTION]... [MODULES]\n\
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index 9d8e67562..c39ea853f 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -161,7 +161,7 @@ setup (const char *prefix, const char *dir,
       grub_util_info ("first sector is <%llu,%u,%u>", sector, offset, length);
 
       if (offset != 0 || length != GRUB_DISK_SECTOR_SIZE)
-	grub_util_error ("The first sector of the core file "
+	grub_util_error ("the first sector of the core file "
 			 "is not sector-aligned");
 
       first_sector = sector;
@@ -176,7 +176,7 @@ setup (const char *prefix, const char *dir,
       grub_util_info ("saving <%llu,%u,%u>", sector, offset, length);
 
       if (offset != 0 || last_length != GRUB_DISK_SECTOR_SIZE)
-	grub_util_error ("Non-sector-aligned data is found in the core file");
+	grub_util_error ("non-sector-aligned data is found in the core file");
 
       if (block != first_block
 	  && (grub_be_to_cpu64 (prev->start)
@@ -189,7 +189,7 @@ setup (const char *prefix, const char *dir,
 
 	  block--;
 	  if (block->len)
-	    grub_util_error ("The sectors of the core file are too fragmented");
+	    grub_util_error ("the sectors of the core file are too fragmented");
 	}
 
       last_length = length;
@@ -201,7 +201,7 @@ setup (const char *prefix, const char *dir,
   boot_path = grub_util_get_path (dir, boot_file);
   boot_size = grub_util_get_image_size (boot_path);
   if (boot_size != GRUB_DISK_SECTOR_SIZE)
-    grub_util_error ("The size of `%s' is not %d",
+    grub_util_error ("the size of `%s' is not %d",
 		     boot_path, GRUB_DISK_SECTOR_SIZE);
   boot_img = grub_util_read_image (boot_path);
   free (boot_path);
@@ -219,7 +219,7 @@ setup (const char *prefix, const char *dir,
   core_sectors = ((core_size + GRUB_DISK_SECTOR_SIZE - 1)
 		  >> GRUB_DISK_SECTOR_BITS);
   if (core_size < GRUB_DISK_SECTOR_SIZE)
-    grub_util_error ("The size of `%s' is too small", core_path);
+    grub_util_error ("the size of `%s' is too small", core_path);
 
   core_img = grub_util_read_image (core_path);
   free (core_path);
@@ -229,7 +229,7 @@ setup (const char *prefix, const char *dir,
 					   + GRUB_DISK_SECTOR_SIZE
 					   - sizeof (*block));
 
-  grub_util_info ("root is '%s', dest is '%s', and dest_ofpath is '%s'",
+  grub_util_info ("root is `%s', dest is `%s', and dest_ofpath is `%s'",
 		  root, dest, dest_ofpath);
 
   /* Open the root device and the destination device.  */
@@ -320,7 +320,7 @@ setup (const char *prefix, const char *dir,
     }
 
   if (i == MAX_TRIES)
-    grub_util_error ("Cannot read `%s' correctly", core_path);
+    grub_util_error ("cannot read `%s' correctly", core_path);
 
   /* Clean out the blocklists.  */
   block = first_block;
@@ -332,7 +332,7 @@ setup (const char *prefix, const char *dir,
       block--;
 
       if ((char *) block <= core_img)
-	grub_util_error ("No terminator in the core image");
+	grub_util_error ("no terminator in the core image");
     }
 
   /* Now read the core image to determine where the sectors are.  */
@@ -343,13 +343,13 @@ setup (const char *prefix, const char *dir,
   file->read_hook = save_first_sector;
   if (grub_file_read (file, tmp_img, GRUB_DISK_SECTOR_SIZE)
       != GRUB_DISK_SECTOR_SIZE)
-    grub_util_error ("Failed to read the first sector of the core image");
+    grub_util_error ("failed to read the first sector of the core image");
 
   block = first_block;
   file->read_hook = save_blocklists;
   if (grub_file_read (file, tmp_img, core_size - GRUB_DISK_SECTOR_SIZE)
       != (grub_ssize_t) core_size - GRUB_DISK_SECTOR_SIZE)
-    grub_util_error ("Failed to read the rest sectors of the core image");
+    grub_util_error ("failed to read the rest sectors of the core image");
 
   grub_file_close (file);
 
@@ -368,7 +368,7 @@ setup (const char *prefix, const char *dir,
   grub_util_info ("opening the core image `%s'", core_path);
   fp = fopen (core_path, "r+b");
   if (! fp)
-    grub_util_error ("Cannot open `%s'", core_path);
+    grub_util_error ("cannot open `%s'", core_path);
 
   grub_util_write_image (core_img, GRUB_DISK_SECTOR_SIZE, fp);
   fclose (fp);
@@ -404,13 +404,13 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try ``%s --help'' for more information.\n", program_name);
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
 Usage: %s [OPTION]... DEVICE\n\
 \n\
 Set up images to boot from DEVICE.\n\
-DEVICE must be a GRUB device (e.g. ``(hd0,1)'').\n\
+DEVICE must be a GRUB device (e.g. `(hd0,1)').\n\
 \n\
   -b, --boot-image=FILE   use FILE as the boot image [default=%s]\n\
   -c, --core-image=FILE   use FILE as the core image [default=%s]\n\
@@ -559,14 +559,14 @@ find_dest_dev (struct grub_setup_info *gp, char *argv[])
 	  fprintf (stderr, "Invalid device `%s'.\n", argv[optind]);
 	  usage (1);
 	}
-      grub_util_info ("transformed OS device '%s' into GRUB device '%s'",
+      grub_util_info ("transformed OS device `%s' into GRUB device `%s'",
 		      argv[optind], gp->dest_dev);
     }
   else
     {
       /* For simplicity.  */
       gp->dest_dev = xstrdup (gp->dest_dev);
-      grub_util_info ("Using '%s' as GRUB device", gp->dest_dev);
+      grub_util_info ("Using `%s' as GRUB device", gp->dest_dev);
     }
 }
 
@@ -578,7 +578,7 @@ check_root_dev (struct grub_setup_info *gp)
       char *tmp = get_device_name (gp->root_dev);
 
       if (! tmp)
-	grub_util_error ("Invalid root device `%s'", gp->root_dev);
+	grub_util_error ("invalid root device `%s'", gp->root_dev);
 
       tmp = xstrdup (tmp);
       free (gp->root_dev);
@@ -594,11 +594,11 @@ check_root_dev (struct grub_setup_info *gp)
 	{
 	  grub_util_info ("guessing the root device failed, because of `%s'",
 			  grub_errmsg);
-	  grub_util_error ("Cannot guess the root device. "
-			   "Specify the option ``--root-device''.");
+	  grub_util_error ("cannot guess the root device. "
+			   "Specify the option `--root-device'");
 	}
-      grub_util_info ("Guessed root device '%s' and root_dev '%s' from "
-		      "dir '%s'", root_device, gp->root_dev, dir);
+      grub_util_info ("guessed root device `%s' and root_dev `%s' from "
+		      "dir `%s'", root_device, gp->root_dev, dir);
     }
 }
 

From 409ae1c92a9eb99a653adc3dba377ae2ed7b024e Mon Sep 17 00:00:00 2001
From: carles <carles@pinux>
Date: Sat, 16 Jan 2010 00:39:14 +0000
Subject: [PATCH 0293/1628] 2010-01-16  Carles Pina i Estany  <carles@pina.cat>

	* util/grub-editenv.c (usage): Use `program_name' instead of hardcoded
	string.
	* util/grub-emu.c (usage): Likewise.
	* util/grub-mkpasswd-pbkdf2.c (usage): Likewise.
	* util/i386/efi/grub-mkimage.c (usage): Likewise.
	* util/i386/pc/grub-mkimage.c (usage): Likewise.
	* util/i386/pc/grub-setup.c (usage): Likewise.
---
 ChangeLog                    | 10 ++++++++++
 util/grub-editenv.c          |  6 +++---
 util/grub-emu.c              |  6 +++---
 util/grub-mkpasswd-pbkdf2.c  |  6 +++---
 util/i386/efi/grub-mkimage.c |  6 +++---
 util/i386/pc/grub-mkimage.c  |  4 ++--
 util/i386/pc/grub-setup.c    |  3 ++-
 7 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0effe5e10..793746986 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-16  Carles Pina i Estany  <carles@pina.cat>
+
+	* util/grub-editenv.c (usage): Use `program_name' instead of hardcoded
+	string.
+	* util/grub-emu.c (usage): Likewise.
+	* util/grub-mkpasswd-pbkdf2.c (usage): Likewise.
+	* util/i386/efi/grub-mkimage.c (usage): Likewise.
+	* util/i386/pc/grub-mkimage.c (usage): Likewise.
+	* util/i386/pc/grub-setup.c (usage): Likewise.
+
 2010-01-16  Carles Pina i Estany  <carles@pina.cat>
 
 	* util/misc.c (grub_util_warn): Gettextizze, print full stop after
diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index ea0e4da19..f21042c97 100644
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -69,10 +69,10 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try `grub-editenv --help' for more information.\n");
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
-Usage: grub-editenv [OPTIONS] [FILENAME] COMMAND\n\
+Usage: %s [OPTIONS] [FILENAME] COMMAND\n\
 \n\
 Tool to edit environment block.\n\
 \nCommands:\n\
@@ -88,7 +88,7 @@ Tool to edit environment block.\n\
 If not given explicitly, FILENAME defaults to %s.\n\
 \n\
 Report bugs to <%s>.\n",
-DEFAULT_DIRECTORY "/" GRUB_ENVBLK_DEFCFG, PACKAGE_BUGREPORT);
+program_name, DEFAULT_DIRECTORY "/" GRUB_ENVBLK_DEFCFG, PACKAGE_BUGREPORT);
 
   exit (status);
 }
diff --git a/util/grub-emu.c b/util/grub-emu.c
index a04aeae78..21fc6fa09 100644
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -129,10 +129,10 @@ usage (int status)
 {
   if (status)
     fprintf (stderr,
-	     "Try `grub-emu --help' for more information.\n");
+	     "Try `%s --help' for more information.\n", program_name);
   else
     printf (
-      "Usage: grub-emu [OPTION]...\n"
+      "Usage: %s [OPTION]...\n"
       "\n"
       "GRUB emulator.\n"
       "\n"
@@ -144,7 +144,7 @@ usage (int status)
       "  -h, --help                display this message and exit\n"
       "  -V, --version             print version information and exit\n"
       "\n"
-      "Report bugs to <%s>.\n", DEFAULT_DEVICE_MAP, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
+      "Report bugs to <%s>.\n", program_name, DEFAULT_DEVICE_MAP, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
   return status;
 }
 
diff --git a/util/grub-mkpasswd-pbkdf2.c b/util/grub-mkpasswd-pbkdf2.c
index f5fdcca96..82437fdca 100644
--- a/util/grub-mkpasswd-pbkdf2.c
+++ b/util/grub-mkpasswd-pbkdf2.c
@@ -74,16 +74,16 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try `grub-scrypt --help' for more information.\n");
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
-Usage: grub-scrypt [OPTIONS]\n\
+Usage: %s [OPTIONS]\n\
 \nOptions:\n\
      -c number, --iteration-count=number  Number of PBKDF2 iterations\n\
      -l number, --buflen=number           Length of generated hash\n\
      -s number, --salt=number             Length of salt\n\
 \n\
-Report bugs to <%s>.\n", PACKAGE_BUGREPORT);
+Report bugs to <%s>.\n", program_name, PACKAGE_BUGREPORT);
 
   exit (status);
 }
diff --git a/util/i386/efi/grub-mkimage.c b/util/i386/efi/grub-mkimage.c
index 8fee3e8d9..f8c0f152e 100644
--- a/util/i386/efi/grub-mkimage.c
+++ b/util/i386/efi/grub-mkimage.c
@@ -1029,10 +1029,10 @@ static void
 usage (int status)
 {
   if (status)
-    fprintf (stderr, "Try `grub-mkimage --help' for more information.\n");
+    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
   else
     printf ("\
-Usage: grub-mkimage -o FILE [OPTION]... [MODULES]\n\
+Usage: %s -o FILE [OPTION]... [MODULES]\n\
 \n\
 Make a bootable image of GRUB.\n\
 \n\
@@ -1044,7 +1044,7 @@ Make a bootable image of GRUB.\n\
   -v, --verbose           print verbose messages\n\
 \n\
 Report bugs to <%s>.\n\
-", GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
+", program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
 
   exit (status);
 }
diff --git a/util/i386/pc/grub-mkimage.c b/util/i386/pc/grub-mkimage.c
index 08807b4d1..16b2c6619 100644
--- a/util/i386/pc/grub-mkimage.c
+++ b/util/i386/pc/grub-mkimage.c
@@ -329,7 +329,7 @@ usage (int status)
     fprintf (stderr, _("Try `%s --help' for more information.\n"), program_name);
   else
     printf (_("\
-Usage: grub-mkimage [OPTION]... [MODULES]\n\
+Usage: %s [OPTION]... [MODULES]\n\
 \n\
 Make a bootable image of GRUB.\n\
 \n\
@@ -343,7 +343,7 @@ Make a bootable image of GRUB.\n\
   -v, --verbose           print verbose messages\n\
 \n\
 Report bugs to <%s>.\n\
-"), GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
+"), program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
 
   exit (status);
 }
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 64b017296..4e2517ef2 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -587,7 +587,7 @@ usage (int status)
     fprintf (stderr, _("Try `%s --help' for more information.\n"), program_name);
   else
     printf (_("\
-Usage: grub-setup [OPTION]... DEVICE\n\
+Usage: %s [OPTION]... DEVICE\n\
 \n\
 Set up images to boot from DEVICE.\n\
 DEVICE must be a GRUB device (e.g. `(hd0,1)').\n\
@@ -605,6 +605,7 @@ DEVICE must be a GRUB device (e.g. `(hd0,1)').\n\
 \n\
 Report bugs to <%s>.\n\
 "),
+	    program_name,
 	    DEFAULT_BOOT_FILE, DEFAULT_CORE_FILE, DEFAULT_DIRECTORY,
 	    DEFAULT_DEVICE_MAP, PACKAGE_BUGREPORT);
 

From cefe39c94ba4e921c325fd275996426257e94d36 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 16 Jan 2010 11:06:55 +0100
Subject: [PATCH 0294/1628] Fix knetbsd symbols

---
 loader/i386/bsdXX.c | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/loader/i386/bsdXX.c b/loader/i386/bsdXX.c
index 77d059921..ccf386440 100644
--- a/loader/i386/bsdXX.c
+++ b/loader/i386/bsdXX.c
@@ -410,8 +410,7 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
 
   chunk_size = ALIGN_UP (symsize, sizeof (grub_freebsd_addr_t))
     + ALIGN_UP (strsize, sizeof (grub_freebsd_addr_t))
-    + sizeof (e) + e.e_phnum * e.e_phentsize
-    + e.e_shnum * e.e_shentsize;
+    + sizeof (e) + e.e_shnum * e.e_shentsize;
 
   symtarget = ALIGN_UP (*kern_end, sizeof (grub_freebsd_addr_t));
   err = grub_relocator_alloc_chunk_addr (relocator, &sym_chunk,
@@ -419,7 +418,7 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
   if (err)
     return err;
 
-  symtab.nsyms = chunk_size;
+  symtab.nsyms = 1;
   symtab.ssyms = symtarget;
   symtab.esyms = symtarget + chunk_size;
 
@@ -427,20 +426,13 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
   
   e2 = (Elf_Ehdr *) curload;
   grub_memcpy (curload, &e, sizeof (e));
-  e2->e_phoff = sizeof (e);
-  e2->e_shoff = sizeof (e) + e.e_phnum * e.e_phentsize;
+  e2->e_phoff = 0;
+  e2->e_phnum = 0;
+  e2->e_phentsize = 0;
+  e2->e_shstrndx = 0;
+  e2->e_shoff = sizeof (e);
 
   curload += sizeof (e);
-  if (grub_file_seek (file, e.e_phoff) == (grub_off_t) -1)
-    return grub_errno;
-  if (grub_file_read (file, curload, e.e_phnum * e.e_phentsize) 
-      != (grub_ssize_t) (e.e_phnum * e.e_phentsize))
-    {
-      if (! grub_errno)
-	return grub_error (GRUB_ERR_BAD_OS, "invalid ELF");
-      return grub_errno;
-    }
-  curload += e.e_phnum * e.e_phentsize;
 
   for (s = (Elf_Shdr *) shdr; s < (Elf_Shdr *) (shdr
 						+ e.e_shnum * e.e_shentsize);
@@ -450,19 +442,14 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
       s2 = (Elf_Shdr *) curload;
       grub_memcpy (curload, s, e.e_shentsize);
       if (s == symsh)
-	{
-	  s2->sh_offset = sizeof (e) + e.e_phnum * e.e_phentsize
-	    + e.e_shnum * e.e_shentsize;
-	}
+	s2->sh_offset = sizeof (e) + e.e_shnum * e.e_shentsize;
       else if (s == strsh)
-	{
-	  s2->sh_offset = ALIGN_UP (symsize, sizeof (grub_freebsd_addr_t))
-	    + sizeof (e) + e.e_phnum * e.e_phentsize
-	    + e.e_shnum * e.e_shentsize;
-	}
+	s2->sh_offset = ALIGN_UP (symsize, sizeof (grub_freebsd_addr_t))
+	  + sizeof (e) + e.e_shnum * e.e_shentsize;
       else
 	s2->sh_offset = 0;
       s2->sh_addr = s2->sh_offset;
+      curload += e.e_shentsize;
     }
 
   if (grub_file_seek (file, symsh->sh_offset) == (grub_off_t) -1)

From ae9eb98c7d91aaef28362008dc2fe92043b6199f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 16 Jan 2010 11:47:12 +0100
Subject: [PATCH 0295/1628] NetBSD module support

---
 include/grub/i386/bsd.h |  16 ++++
 loader/i386/bsd.c       | 167 ++++++++++++++++++++++++++++++++++++++--
 2 files changed, 176 insertions(+), 7 deletions(-)

diff --git a/include/grub/i386/bsd.h b/include/grub/i386/bsd.h
index 62c374c03..870287371 100644
--- a/include/grub/i386/bsd.h
+++ b/include/grub/i386/bsd.h
@@ -212,6 +212,7 @@ struct grub_netbsd_bootinfo
 #define NETBSD_BTINFO_CONSOLE		6
 #define NETBSD_BTINFO_SYMTAB		8
 #define NETBSD_BTINFO_MEMMAP		9
+#define NETBSD_BTINFO_MODULES		11
 #define NETBSD_BTINFO_FRAMEBUF		12
 
 struct grub_netbsd_btinfo_common
@@ -249,6 +250,21 @@ struct grub_netbsd_btinfo_serial
   grub_uint32_t speed;
 };
 
+struct grub_netbsd_btinfo_modules
+{
+  grub_uint32_t num;
+  grub_uint32_t last_addr;
+  struct grub_netbsd_btinfo_module
+  {
+    char name[80];
+#define GRUB_NETBSD_MODULE_RAW 0
+#define GRUB_NETBSD_MODULE_ELF 1
+    grub_uint32_t type;
+    grub_uint32_t size;
+    grub_uint32_t addr;
+  } mods[0];
+};
+
 struct grub_netbsd_btinfo_framebuf
 {
   grub_uint64_t fbaddr;
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index de4a256de..f93c87cf0 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -82,6 +82,14 @@ struct bsd_tag
 
 struct bsd_tag *tags, *tags_last;
 
+struct netbsd_module
+{
+  struct netbsd_module *next;
+  struct grub_netbsd_btinfo_module mod;
+};
+
+struct netbsd_module *netbsd_mods, *netbsd_mods_last;
+
 static const struct grub_arg_option freebsd_opts[] =
   {
     {"dual", 'D', 0, N_("Display output on all consoles."), 0, 0},
@@ -452,6 +460,49 @@ grub_freebsd_list_modules (void)
     }
 }
 
+static grub_err_t
+grub_netbsd_add_meta_module (char *filename, grub_uint32_t type,
+			     grub_addr_t addr, grub_uint32_t size)
+{
+  char *name;
+  struct netbsd_module *mod;
+  name = grub_strrchr (filename, '/');
+
+  if (name)
+    name++;
+  else
+    name = filename;
+
+  mod = grub_zalloc (sizeof (*mod));
+  if (!mod)
+    return grub_errno;
+
+  grub_strncpy (mod->mod.name, name, sizeof (mod->mod.name) - 1);
+  mod->mod.addr = addr;
+  mod->mod.type = type;
+  mod->mod.size = size;
+
+  if (netbsd_mods_last)
+    netbsd_mods_last->next = mod;
+  else
+    netbsd_mods = mod;
+  netbsd_mods_last = mod;
+
+  return GRUB_ERR_NONE;
+}
+
+static void
+grub_netbsd_list_modules (void)
+{
+  struct netbsd_module *mod;
+
+  grub_printf ("  %-18s%14s%14s%14s\n", "name", "type", "addr", "size");
+
+  for (mod = netbsd_mods; mod; mod = mod->next)
+    grub_printf ("  %-18s  0x%08x  0x%08x  0x%08x", mod->mod.name,
+		 mod->mod.type, mod->mod.addr, mod->mod.size);
+}
+
 /* This function would be here but it's under different license. */
 #include "bsd_pagetable.c"
 
@@ -865,6 +916,38 @@ grub_netbsd_setup_video (void)
   return err;
 }
 
+static grub_err_t
+grub_netbsd_add_modules (void)
+{
+  struct netbsd_module *mod;
+  unsigned modcnt = 0;
+  struct grub_netbsd_btinfo_modules *mods;
+  grub_addr_t last_addr = 0;
+  unsigned i;
+  grub_err_t err;
+
+  for (mod = netbsd_mods; mod; mod = mod->next)
+    {
+      if (mod->mod.addr + mod->mod.size > last_addr)
+	last_addr = mod->mod.addr + mod->mod.size;
+      modcnt++;
+    }
+
+  mods = grub_malloc (sizeof (*mods) + sizeof (mods->mods[0]) * modcnt);
+  if (!mods)
+    return grub_errno;
+
+  mods->num = modcnt;
+  mods->last_addr = last_addr;
+  for (mod = netbsd_mods, i = 0; mod; i++, mod = mod->next)
+    mods->mods[i] = mod->mod;
+
+  err = grub_bsd_add_meta (NETBSD_BTINFO_MODULES, mods,
+			   sizeof (*mods) + sizeof (mods->mods[0]) * modcnt);
+  grub_free (mods);
+  return err;
+}
+
 static grub_err_t
 grub_netbsd_boot (void)
 {
@@ -889,6 +972,10 @@ grub_netbsd_boot (void)
       grub_errno = GRUB_ERR_NONE;
     }
 
+  err = grub_netbsd_add_modules ();
+  if (err)
+    return err;
+
   {
     struct bsd_tag *tag;
     tag_buf_len = 0;
@@ -1535,13 +1622,8 @@ grub_cmd_freebsd_module (grub_command_t cmd __attribute__ ((unused)),
   grub_err_t err;
   void *src;
 
-  if (kernel_type == KERNEL_TYPE_NONE)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT,
-		       "you need to load the kernel first");
-
   if (kernel_type != KERNEL_TYPE_FREEBSD)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT,
-		       "only FreeBSD supports module");
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no FreeBSD loaded");
 
   if (!is_elf_kernel)
     return grub_error (GRUB_ERR_BAD_ARGUMENT,
@@ -1593,6 +1675,68 @@ fail:
   return grub_errno;
 }
 
+static grub_err_t
+grub_netbsd_module_load (char *filename, grub_uint32_t type)
+{
+  grub_file_t file = 0;
+  void *src;
+  grub_err_t err;
+
+  file = grub_gzfile_open (filename, 1);
+  if ((!file) || (!file->size))
+    goto fail;
+
+  err = grub_relocator_alloc_chunk_addr (relocator, &src, kern_end, 
+					 file->size);
+  if (err)
+    goto fail;
+
+  grub_file_read (file, src, file->size);
+  if (grub_errno)
+    goto fail;
+
+  err = grub_netbsd_add_meta_module (filename, type, kern_end, file->size);
+
+  if (err)
+    goto fail;
+
+  kern_end = ALIGN_PAGE (kern_end + file->size);
+
+fail:
+  if (file)
+    grub_file_close (file);
+
+  return grub_errno;
+}
+
+static grub_err_t
+grub_cmd_netbsd_module (grub_command_t cmd,
+			int argc, char *argv[])
+{
+  grub_uint32_t type;
+
+  if (kernel_type != KERNEL_TYPE_NETBSD)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no NetBSD loaded");
+
+  if (!is_elf_kernel)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+		       "only ELF kernel supports module");
+
+  /* List the current modules if no parameter.  */
+  if (!argc)
+    {
+      grub_netbsd_list_modules ();
+      return 0;
+    }
+
+  if (grub_strcmp (cmd->name, "knetbsd_module_elf") == 0)
+    type = GRUB_NETBSD_MODULE_ELF;
+  else
+    type = GRUB_NETBSD_MODULE_RAW;
+
+  return grub_netbsd_module_load (argv[0], type);
+}
+
 static grub_err_t
 grub_cmd_freebsd_module_elf (grub_command_t cmd __attribute__ ((unused)),
 			     int argc, char *argv[])
@@ -1642,7 +1786,8 @@ grub_cmd_freebsd_module_elf (grub_command_t cmd __attribute__ ((unused)),
 
 static grub_extcmd_t cmd_freebsd, cmd_openbsd, cmd_netbsd;
 static grub_command_t cmd_freebsd_loadenv, cmd_freebsd_module;
-static grub_command_t cmd_freebsd_module_elf;
+static grub_command_t cmd_netbsd_module, cmd_freebsd_module_elf;
+static grub_command_t cmd_netbsd_module_elf;
 
 GRUB_MOD_INIT (bsd)
 {
@@ -1664,6 +1809,12 @@ GRUB_MOD_INIT (bsd)
   cmd_freebsd_module =
     grub_register_command ("kfreebsd_module", grub_cmd_freebsd_module,
 			   0, N_("Load FreeBSD kernel module."));
+  cmd_netbsd_module =
+    grub_register_command ("knetbsd_module", grub_cmd_netbsd_module,
+			   0, N_("Load NetBSD kernel module."));
+  cmd_netbsd_module_elf =
+    grub_register_command ("knetbsd_module_elf", grub_cmd_netbsd_module,
+			   0, N_("Load NetBSD kernel module (ELF)."));
   cmd_freebsd_module_elf =
     grub_register_command ("kfreebsd_module_elf", grub_cmd_freebsd_module_elf,
 			   0, N_("Load FreeBSD kernel module (ELF)."));
@@ -1679,7 +1830,9 @@ GRUB_MOD_FINI (bsd)
 
   grub_unregister_command (cmd_freebsd_loadenv);
   grub_unregister_command (cmd_freebsd_module);
+  grub_unregister_command (cmd_netbsd_module);
   grub_unregister_command (cmd_freebsd_module_elf);
+  grub_unregister_command (cmd_netbsd_module_elf);
 
   grub_bsd_unload ();
 }

From e15c215ebd8df7096d114e84167b25a19f0fd9d0 Mon Sep 17 00:00:00 2001
From: Felix Zielcke <fzielcke@z-51.de>
Date: Sat, 16 Jan 2010 11:57:47 +0100
Subject: [PATCH 0296/1628] =?UTF-8?q?2010-01-16=20=20Gr=C3=A9goire=20Sutre?=
 =?UTF-8?q?=20<gregoire.sutre@gmail.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* genmk.rb (class SCRIPT): Replace option -i of sed by a pipe.
---
 ChangeLog | 4 ++++
 genmk.rb  | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 793746986..e71c4ec0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-16  Grégoire Sutre <gregoire.sutre@gmail.com>
+
+	* genmk.rb (class SCRIPT): Replace option -i of sed by a pipe.
+
 2010-01-16  Carles Pina i Estany  <carles@pina.cat>
 
 	* util/grub-editenv.c (usage): Use `program_name' instead of hardcoded
diff --git a/genmk.rb b/genmk.rb
index 810a2f1be..afd1582aa 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -370,8 +370,7 @@ class Script
     "CLEANFILES += #{@name}
 
 #{@name}: #{src} $(#{src}_DEPENDENCIES) config.status
-	./config.status --file=#{name}:#{src}
-	sed -i -e 's,@pkglib_DATA@,$(pkglib_DATA),g' $@
+	./config.status --file=-:#{src} | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
 	chmod +x $@
 
 "

From d92b0c01d42236af68839e0c6360b3a44478b0a0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 16 Jan 2010 12:55:52 +0100
Subject: [PATCH 0297/1628] Fixed knetbsd misbehaviour when no module is loaded

---
 loader/i386/bsd.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index f93c87cf0..43c2c129b 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -922,23 +922,18 @@ grub_netbsd_add_modules (void)
   struct netbsd_module *mod;
   unsigned modcnt = 0;
   struct grub_netbsd_btinfo_modules *mods;
-  grub_addr_t last_addr = 0;
   unsigned i;
   grub_err_t err;
 
   for (mod = netbsd_mods; mod; mod = mod->next)
-    {
-      if (mod->mod.addr + mod->mod.size > last_addr)
-	last_addr = mod->mod.addr + mod->mod.size;
-      modcnt++;
-    }
+    modcnt++;
 
   mods = grub_malloc (sizeof (*mods) + sizeof (mods->mods[0]) * modcnt);
   if (!mods)
     return grub_errno;
 
   mods->num = modcnt;
-  mods->last_addr = last_addr;
+  mods->last_addr = kern_end;
   for (mod = netbsd_mods, i = 0; mod; i++, mod = mod->next)
     mods->mods[i] = mod->mod;
 

From 5408044f4c6805bfbec81a6a166218b37899d9fd Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 16 Jan 2010 16:25:43 +0100
Subject: [PATCH 0298/1628] Multiboot 2 tags support

---
 ChangeLog.tag                 |  40 +++
 conf/i386.rmk                 |   2 +-
 include/grub/i386/multiboot.h |   8 -
 include/grub/multiboot.h      |  21 +-
 include/multiboot2.h          | 257 ++++++++-----------
 loader/i386/multiboot.c       | 138 +++++++++-
 loader/i386/multiboot_mbi.c   | 210 ++++-----------
 loader/i386/multiboot_mbi2.c  | 468 ++++++++++++++++++++++++++++++++++
 8 files changed, 827 insertions(+), 317 deletions(-)
 create mode 100644 ChangeLog.tag
 create mode 100644 loader/i386/multiboot_mbi2.c

diff --git a/ChangeLog.tag b/ChangeLog.tag
new file mode 100644
index 000000000..dbeea1017
--- /dev/null
+++ b/ChangeLog.tag
@@ -0,0 +1,40 @@
+2010-01-16  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Multiboot2 tag support
+
+	* conf/i386.rmk (multiboot2_mod_SOURCES): Replace
+	loader/i386/multiboot_mbi.c with loader/i386/multiboot_mbi2.c.
+	* include/grub/i386/multiboot.h (grub_multiboot_real_boot): Removed.
+	(grub_multiboot2_real_boot): Likewise.
+	* include/grub/multiboot.h (grub_multiboot_set_accepts_video): Removed.
+	(grub_get_multiboot_mmap_len): New proto.
+	(grub_fill_multiboot_mmap): Likewise.
+	(grub_multiboot_set_video_mode): Likewise.
+	(grub_multiboot_fill_vbe_info_real): Likewise.
+	* include/multiboot2.h: Resynced with specification.
+	* loader/i386/multiboot_mbi.c (DEFAULT_VIDEO_MODE): Moved from here...
+	* loader/i386/multiboot.c (DEFAULT_VIDEO_MODE): ... here.
+	* loader/i386/multiboot_mbi.c (HAS_VGA_TEXT): Moved from here ..
+	* include/grub/multiboot.h (GRUB_MACHINE_HAS_VGA_TEXT): ... here. All
+	users updated.
+	* loader/i386/multiboot_mbi.c (HAS_VBE): Moved from here ..
+	* include/grub/multiboot.h (GRUB_MACHINE_HAS_VBE): ... here. All
+	users updated.
+	* loader/i386/multiboot_mbi.c (accepts_video): Moved from here...
+	* loader/i386/multiboot.c (accepts_video): ... here. All users updated.
+	* loader/i386/multiboot_mbi.c (grub_multiboot_set_accepts_video):
+	Removed.
+	* loader/i386/multiboot_mbi.c (grub_get_multiboot_mmap_len):
+	Moved from here...
+	* loader/i386/multiboot.c (grub_get_multiboot_mmap_len): ... here.
+	* loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap):
+	Moved from here...
+	* loader/i386/multiboot.c (grub_fill_multiboot_mmap): ... here.
+	* loader/i386/multiboot_mbi.c (set_video_mode): Moved from here...
+	* loader/i386/multiboot.c (grub_multiboot_set_video_mode): ... here.
+	All users updated.
+	* loader/i386/multiboot_mbi.c (fill_vbe_info): Moved generic parts
+	from here...
+	* loader/i386/multiboot.c (grub_multiboot_fill_vbe_info_real): ... here.
+	All users updated.
+	* loader/i386/multiboot_mbi2.c: New file.
diff --git a/conf/i386.rmk b/conf/i386.rmk
index 7ef337c61..064ee3ab4 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -36,7 +36,7 @@ multiboot_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
 pkglib_MODULES += multiboot2.mod
 multiboot2_mod_SOURCES = loader/i386/multiboot.c \
-			 loader/i386/multiboot_mbi.c \
+			 loader/i386/multiboot_mbi2.c \
                          loader/multiboot_loader.c
 multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
 multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/include/grub/i386/multiboot.h b/include/grub/i386/multiboot.h
index 584955449..8131e9477 100644
--- a/include/grub/i386/multiboot.h
+++ b/include/grub/i386/multiboot.h
@@ -19,14 +19,6 @@
 #ifndef GRUB_MULTIBOOT_CPU_HEADER
 #define GRUB_MULTIBOOT_CPU_HEADER	1
 
-/* The asm part of the multiboot loader.  */
-void grub_multiboot_real_boot (grub_addr_t entry,
-			       struct multiboot_info *mbi)
-     __attribute__ ((noreturn));
-void grub_multiboot2_real_boot (grub_addr_t entry,
-				struct multiboot_info *mbi)
-     __attribute__ ((noreturn));
-
 extern grub_uint32_t grub_multiboot_payload_eip;
 extern char *grub_multiboot_payload_orig;
 extern grub_addr_t grub_multiboot_payload_dest;
diff --git a/include/grub/multiboot.h b/include/grub/multiboot.h
index 665292e33..8a7289820 100644
--- a/include/grub/multiboot.h
+++ b/include/grub/multiboot.h
@@ -35,8 +35,6 @@
 void grub_multiboot (int argc, char *argv[]);
 void grub_module (int argc, char *argv[]);
 
-void grub_multiboot_set_accepts_video (int val);
-
 grub_size_t grub_multiboot_get_mbi_size (void);
 grub_err_t grub_multiboot_make_mbi (void *orig, grub_uint32_t dest,
 				    grub_off_t buf_off, grub_size_t bufsize);
@@ -46,5 +44,24 @@ grub_err_t grub_multiboot_add_module (grub_addr_t start, grub_size_t size,
 				      int argc, char *argv[]);
 void grub_multiboot_set_bootdev (void);
 
+grub_uint32_t grub_get_multiboot_mmap_len (void);
+void grub_fill_multiboot_mmap (struct multiboot_mmap_entry *first_entry);
+grub_err_t grub_multiboot_set_video_mode (void);
+
+#if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
+#include <grub/i386/pc/vbe.h>
+grub_err_t
+grub_multiboot_fill_vbe_info_real (struct grub_vbe_info_block *vbe_control_info,
+				   struct grub_vbe_mode_info_block *vbe_mode_info,
+				   multiboot_uint16_t *vbe_mode,
+				   multiboot_uint16_t *vbe_interface_seg,
+				   multiboot_uint16_t *vbe_interface_off,
+				   multiboot_uint16_t *vbe_interface_len);
+#define GRUB_MACHINE_HAS_VBE 1
+#define GRUB_MACHINE_HAS_VGA_TEXT 1
+#else
+#define GRUB_MACHINE_HAS_VBE 0
+#define GRUB_MACHINE_HAS_VGA_TEXT 0
+#endif
 
 #endif /* ! GRUB_MULTIBOOT_HEADER */
diff --git a/include/multiboot2.h b/include/multiboot2.h
index a241a70ad..a76364fa7 100644
--- a/include/multiboot2.h
+++ b/include/multiboot2.h
@@ -51,42 +51,15 @@
 /* This flag indicates the use of the address fields in the header.  */
 #define MULTIBOOT_AOUT_KLUDGE			0x00010000
 
-/* Flags to be set in the 'flags' member of the multiboot info structure.  */
-
-/* is there basic lower/upper memory information? */
-#define MULTIBOOT_INFO_MEMORY			0x00000001
-/* is there a boot device set? */
-#define MULTIBOOT_INFO_BOOTDEV			0x00000002
-/* is the command-line defined? */
-#define MULTIBOOT_INFO_CMDLINE			0x00000004
-/* are there modules to do something with? */
-#define MULTIBOOT_INFO_MODS			0x00000008
-
-/* These next two are mutually exclusive */
-
-/* is there a symbol table loaded? */
-#define MULTIBOOT_INFO_AOUT_SYMS		0x00000010
-/* is there an ELF section header table? */
-#define MULTIBOOT_INFO_ELF_SHDR			0X00000020
-
-/* is there a full memory map? */
-#define MULTIBOOT_INFO_MEM_MAP			0x00000040
-
-/* Is there drive info?  */
-#define MULTIBOOT_INFO_DRIVE_INFO		0x00000080
-
-/* Is there a config table?  */
-#define MULTIBOOT_INFO_CONFIG_TABLE		0x00000100
-
-/* Is there a boot loader name?  */
-#define MULTIBOOT_INFO_BOOT_LOADER_NAME		0x00000200
-
-/* Is there a APM table?  */
-#define MULTIBOOT_INFO_APM_TABLE		0x00000400
-
-/* Is there video information?  */
-#define MULTIBOOT_INFO_VBE_INFO		        0x00000800
-#define MULTIBOOT_INFO_FRAMEBUFFER_INFO	        0x00001000
+#define MULTIBOOT_TAG_TYPE_END               0
+#define MULTIBOOT_TAG_TYPE_CMDLINE           1
+#define MULTIBOOT_TAG_TYPE_BOOT_LOADER_NAME  2
+#define MULTIBOOT_TAG_TYPE_MODULE            3
+#define MULTIBOOT_TAG_TYPE_BASIC_MEMINFO     4
+#define MULTIBOOT_TAG_TYPE_BOOTDEV           5
+#define MULTIBOOT_TAG_TYPE_MMAP              6
+#define MULTIBOOT_TAG_TYPE_VBE               7
+#define MULTIBOOT_TAG_TYPE_FRAMEBUFFER       8
 
 #ifndef ASM_FILE
 
@@ -120,105 +93,6 @@ struct multiboot_header
   multiboot_uint32_t depth;
 };
 
-/* The symbol table for a.out.  */
-struct multiboot_aout_symbol_table
-{
-  multiboot_uint32_t tabsize;
-  multiboot_uint32_t strsize;
-  multiboot_uint32_t addr;
-  multiboot_uint32_t reserved;
-};
-typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t;
-
-/* The section header table for ELF.  */
-struct multiboot_elf_section_header_table
-{
-  multiboot_uint32_t num;
-  multiboot_uint32_t size;
-  multiboot_uint32_t addr;
-  multiboot_uint32_t shndx;
-};
-typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t;
-
-struct multiboot_info
-{
-  /* Multiboot info version number */
-  multiboot_uint32_t flags;
-
-  /* Available memory from BIOS */
-  multiboot_uint32_t mem_lower;
-  multiboot_uint32_t mem_upper;
-
-  /* "root" partition */
-  multiboot_uint32_t boot_device;
-
-  /* Kernel command line */
-  multiboot_uint32_t cmdline;
-
-  /* Boot-Module list */
-  multiboot_uint32_t mods_count;
-  multiboot_uint32_t mods_addr;
-
-  union
-  {
-    multiboot_aout_symbol_table_t aout_sym;
-    multiboot_elf_section_header_table_t elf_sec;
-  } u;
-
-  /* Memory Mapping buffer */
-  multiboot_uint32_t mmap_length;
-  multiboot_uint32_t mmap_addr;
-
-  /* Drive Info buffer */
-  multiboot_uint32_t drives_length;
-  multiboot_uint32_t drives_addr;
-
-  /* ROM configuration table */
-  multiboot_uint32_t config_table;
-
-  /* Boot Loader Name */
-  multiboot_uint32_t boot_loader_name;
-
-  /* APM table */
-  multiboot_uint32_t apm_table;
-
-  /* Video */
-  multiboot_uint32_t vbe_control_info;
-  multiboot_uint32_t vbe_mode_info;
-  multiboot_uint16_t vbe_mode;
-  multiboot_uint16_t vbe_interface_seg;
-  multiboot_uint16_t vbe_interface_off;
-  multiboot_uint16_t vbe_interface_len;
-
-  multiboot_uint64_t framebuffer_addr;
-  multiboot_uint32_t framebuffer_pitch;
-  multiboot_uint32_t framebuffer_width;
-  multiboot_uint32_t framebuffer_height;
-  multiboot_uint8_t framebuffer_bpp;
-#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0
-#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB     1
-#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT	2
-  multiboot_uint8_t framebuffer_type;
-  union
-  {
-    struct
-    {
-      multiboot_uint32_t framebuffer_palette_addr;
-      multiboot_uint16_t framebuffer_palette_num_colors;
-    };
-    struct
-    {
-      multiboot_uint8_t framebuffer_red_field_position;
-      multiboot_uint8_t framebuffer_red_mask_size;
-      multiboot_uint8_t framebuffer_green_field_position;
-      multiboot_uint8_t framebuffer_green_mask_size;
-      multiboot_uint8_t framebuffer_blue_field_position;
-      multiboot_uint8_t framebuffer_blue_mask_size;
-    };
-  };
-};
-typedef struct multiboot_info multiboot_info_t;
-
 struct multiboot_color
 {
   multiboot_uint8_t red;
@@ -237,19 +111,114 @@ struct multiboot_mmap_entry
 } __attribute__((packed));
 typedef struct multiboot_mmap_entry multiboot_memory_map_t;
 
-struct multiboot_mod_list
+struct multiboot_tag
 {
-  /* the memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+};
+
+struct multiboot_tag_string
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  char string[0];
+};
+
+struct multiboot_tag_module
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
   multiboot_uint32_t mod_start;
   multiboot_uint32_t mod_end;
-
-  /* Module command line */
-  multiboot_uint32_t cmdline;
-
-  /* padding to take it to 16 bytes (must be zero) */
-  multiboot_uint32_t pad;
+  char cmdline[0];
+};
+
+struct multiboot_tag_basic_meminfo
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint32_t mem_lower;
+  multiboot_uint32_t mem_upper;
+};
+
+struct multiboot_tag_bootdev
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint32_t biosdev;
+  multiboot_uint32_t slice;
+  multiboot_uint32_t part;
+};
+
+struct multiboot_tag_mmap
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  struct multiboot_mmap_entry entries[0];  
+};
+
+struct multiboot_vbe_info_block
+{
+  multiboot_uint8_t external_specification[512];
+};
+
+struct multiboot_vbe_mode_info_block
+{
+  multiboot_uint8_t external_specification[256];
+};
+
+struct multiboot_tag_vbe
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+
+  multiboot_uint16_t vbe_mode;
+  multiboot_uint16_t vbe_interface_seg;
+  multiboot_uint16_t vbe_interface_off;
+  multiboot_uint16_t vbe_interface_len;
+
+  struct multiboot_vbe_info_block vbe_control_info;
+  struct multiboot_vbe_mode_info_block vbe_mode_info;
+};
+
+struct multiboot_tag_framebuffer_common
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+
+  multiboot_uint64_t framebuffer_addr;
+  multiboot_uint32_t framebuffer_pitch;
+  multiboot_uint32_t framebuffer_width;
+  multiboot_uint32_t framebuffer_height;
+  multiboot_uint8_t framebuffer_bpp;
+#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0
+#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB     1
+#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT	2
+  multiboot_uint8_t framebuffer_type;
+};
+
+struct multiboot_tag_framebuffer
+{
+  struct multiboot_tag_framebuffer_common common;
+
+  union
+  {
+    struct
+    {
+      multiboot_uint16_t framebuffer_palette_num_colors;
+      struct multiboot_color framebuffer_palette[0];
+    };
+    struct
+    {
+      multiboot_uint8_t framebuffer_red_field_position;
+      multiboot_uint8_t framebuffer_red_mask_size;
+      multiboot_uint8_t framebuffer_green_field_position;
+      multiboot_uint8_t framebuffer_green_mask_size;
+      multiboot_uint8_t framebuffer_blue_field_position;
+      multiboot_uint8_t framebuffer_blue_mask_size;
+    };
+  };
 };
-typedef struct multiboot_mod_list multiboot_module_t;
 
 #endif /* ! ASM_FILE */
 
diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index 0ac3ca339..86bb91ec8 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -44,11 +44,18 @@
 #include <grub/env.h>
 #include <grub/i386/relocator.h>
 #include <grub/video.h>
+#include <grub/memory.h>
 
 #ifdef GRUB_MACHINE_EFI
 #include <grub/efi/efi.h>
 #endif
 
+#if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
+#define DEFAULT_VIDEO_MODE "text"
+#else
+#define DEFAULT_VIDEO_MODE "auto"
+#endif
+
 extern grub_dl_t my_mod;
 static grub_size_t code_size, alloc_mbi;
 
@@ -56,6 +63,135 @@ char *grub_multiboot_payload_orig;
 grub_addr_t grub_multiboot_payload_dest;
 grub_size_t grub_multiboot_pure_size;
 grub_uint32_t grub_multiboot_payload_eip;
+static int accepts_video;
+
+/* Return the length of the Multiboot mmap that will be needed to allocate
+   our platform's map.  */
+grub_uint32_t
+grub_get_multiboot_mmap_len (void)
+{
+  grub_size_t count = 0;
+
+  auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
+  int NESTED_FUNC_ATTR hook (grub_uint64_t addr __attribute__ ((unused)),
+			     grub_uint64_t size __attribute__ ((unused)),
+			     grub_uint32_t type __attribute__ ((unused)))
+    {
+      count++;
+      return 0;
+    }
+
+  grub_mmap_iterate (hook);
+
+  return count * sizeof (struct multiboot_mmap_entry);
+}
+
+/* Fill previously allocated Multiboot mmap.  */
+void
+grub_fill_multiboot_mmap (struct multiboot_mmap_entry *first_entry)
+{
+  struct multiboot_mmap_entry *mmap_entry = (struct multiboot_mmap_entry *) first_entry;
+
+  auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
+  int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
+    {
+      mmap_entry->addr = addr;
+      mmap_entry->len = size;
+      switch (type)
+	{
+	case GRUB_MACHINE_MEMORY_AVAILABLE:
+ 	  mmap_entry->type = MULTIBOOT_MEMORY_AVAILABLE;
+ 	  break;
+	  
+ 	default:
+ 	  mmap_entry->type = MULTIBOOT_MEMORY_RESERVED;
+ 	  break;
+ 	}
+      mmap_entry->size = sizeof (struct multiboot_mmap_entry) - sizeof (mmap_entry->size);
+      mmap_entry++;
+
+      return 0;
+    }
+
+  grub_mmap_iterate (hook);
+}
+
+grub_err_t
+grub_multiboot_set_video_mode (void)
+{
+  grub_err_t err;
+  const char *modevar;
+
+  if (accepts_video || !GRUB_MACHINE_HAS_VGA_TEXT)
+    {
+      modevar = grub_env_get ("gfxpayload");
+      if (! modevar || *modevar == 0)
+	err = grub_video_set_mode (DEFAULT_VIDEO_MODE, 0);
+      else
+	{
+	  char *tmp;
+	  tmp = grub_malloc (grub_strlen (modevar)
+			     + sizeof (DEFAULT_VIDEO_MODE) + 1);
+	  if (! tmp)
+	    return grub_errno;
+	  grub_sprintf (tmp, "%s;" DEFAULT_VIDEO_MODE, modevar);
+	  err = grub_video_set_mode (tmp, 0);
+	  grub_free (tmp);
+	}
+    }
+  else
+    err = grub_video_set_mode ("text", 0);
+
+  return err;
+}
+
+#if GRUB_MACHINE_HAS_VBE
+grub_err_t
+grub_multiboot_fill_vbe_info_real (struct grub_vbe_info_block *vbe_control_info,
+				   struct grub_vbe_mode_info_block *vbe_mode_info,
+				   multiboot_uint16_t *vbe_mode,
+				   multiboot_uint16_t *vbe_interface_seg,
+				   multiboot_uint16_t *vbe_interface_off,
+				   multiboot_uint16_t *vbe_interface_len)
+{
+  grub_vbe_status_t status;
+  void *scratch = (void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
+    
+  status = grub_vbe_bios_get_controller_info (scratch);
+  if (status != GRUB_VBE_STATUS_OK)
+    return grub_error (GRUB_ERR_IO, "Can't get controller info.");  
+  grub_memcpy (vbe_control_info, scratch, sizeof (struct grub_vbe_info_block));
+  
+  status = grub_vbe_bios_get_mode (scratch);
+  *vbe_mode = *(grub_uint32_t *) scratch;
+  if (status != GRUB_VBE_STATUS_OK)
+    return grub_error (GRUB_ERR_IO, "can't get VBE mode");
+
+  /* get_mode_info isn't available for mode 3.  */
+  if (*vbe_mode == 3)
+    {
+      grub_memset (vbe_mode_info, 0, sizeof (struct grub_vbe_mode_info_block));
+      vbe_mode_info->memory_model = GRUB_VBE_MEMORY_MODEL_TEXT;
+      vbe_mode_info->x_resolution = 80;
+      vbe_mode_info->y_resolution = 25;
+    }
+  else
+    {
+      status = grub_vbe_bios_get_mode_info (*vbe_mode, scratch);
+      if (status != GRUB_VBE_STATUS_OK)
+	return grub_error (GRUB_ERR_IO, "can't get mode info");
+      grub_memcpy (vbe_mode_info, scratch,
+		   sizeof (struct grub_vbe_mode_info_block));
+    }
+      
+  /* FIXME: retrieve those.  */
+  *vbe_interface_seg = 0;
+  *vbe_interface_off = 0;
+  *vbe_interface_len = 0;
+  
+  return GRUB_ERR_NONE;
+}
+#endif
 
 static grub_err_t
 grub_multiboot_boot (void)
@@ -265,7 +401,7 @@ grub_multiboot (int argc, char *argv[])
 	}
     }
 
-  grub_multiboot_set_accepts_video (!!(header->flags & MULTIBOOT_VIDEO_MODE));
+  accepts_video = !!(header->flags & MULTIBOOT_VIDEO_MODE);
 
   grub_multiboot_set_bootdev ();
 
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index ddbbf3cfd..9c45b3352 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -31,17 +31,6 @@
 #include <grub/env.h>
 #include <grub/video.h>
 
-#if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
-#include <grub/i386/pc/vbe.h>
-#define DEFAULT_VIDEO_MODE "text"
-#define HAS_VGA_TEXT 1
-#define HAS_VBE 1
-#else
-#define DEFAULT_VIDEO_MODE "auto"
-#define HAS_VGA_TEXT 0
-#define HAS_VBE 0
-#endif
-
 struct module
 {
   struct module *next;
@@ -58,34 +47,6 @@ static unsigned modcnt;
 static char *cmdline = NULL;
 static grub_uint32_t bootdev;
 static int bootdev_set;
-static int accepts_video;
-
-void
-grub_multiboot_set_accepts_video (int val)
-{
-  accepts_video = val;
-}
-
-/* Return the length of the Multiboot mmap that will be needed to allocate
-   our platform's map.  */
-static grub_uint32_t
-grub_get_multiboot_mmap_len (void)
-{
-  grub_size_t count = 0;
-
-  auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
-  int NESTED_FUNC_ATTR hook (grub_uint64_t addr __attribute__ ((unused)),
-			     grub_uint64_t size __attribute__ ((unused)),
-			     grub_uint32_t type __attribute__ ((unused)))
-    {
-      count++;
-      return 0;
-    }
-
-  grub_mmap_iterate (hook);
-
-  return count * sizeof (struct multiboot_mmap_entry);
-}
 
 grub_size_t
 grub_multiboot_get_mbi_size (void)
@@ -93,142 +54,45 @@ grub_multiboot_get_mbi_size (void)
   return sizeof (struct multiboot_info) + ALIGN_UP (cmdline_size, 4)
     + modcnt * sizeof (struct multiboot_mod_list) + total_modcmd
     + ALIGN_UP (sizeof(PACKAGE_STRING), 4) + grub_get_multiboot_mmap_len ()
-#if HAS_VBE
+#if GRUB_MACHINE_HAS_VBE
     + sizeof (struct grub_vbe_info_block)
     + sizeof (struct grub_vbe_mode_info_block)
 #endif
     + 256 * sizeof (struct multiboot_color);
 }
 
-/* Fill previously allocated Multiboot mmap.  */
-static void
-grub_fill_multiboot_mmap (struct multiboot_mmap_entry *first_entry)
-{
-  struct multiboot_mmap_entry *mmap_entry = (struct multiboot_mmap_entry *) first_entry;
-
-  auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
-  int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
-    {
-      mmap_entry->addr = addr;
-      mmap_entry->len = size;
-      switch (type)
-	{
-	case GRUB_MACHINE_MEMORY_AVAILABLE:
- 	  mmap_entry->type = MULTIBOOT_MEMORY_AVAILABLE;
- 	  break;
-	  
- 	default:
- 	  mmap_entry->type = MULTIBOOT_MEMORY_RESERVED;
- 	  break;
- 	}
-      mmap_entry->size = sizeof (struct multiboot_mmap_entry) - sizeof (mmap_entry->size);
-      mmap_entry++;
-
-      return 0;
-    }
-
-  grub_mmap_iterate (hook);
-}
-
+#if GRUB_MACHINE_HAS_VBE
 static grub_err_t
-set_video_mode (void)
+fill_vbe_info (struct multiboot_info *mbi,
+	       struct grub_vbe_mode_info_block **vbe_mode_info_out,
+	       grub_uint8_t *ptrorig, grub_addr_t ptrdest)
 {
+  struct grub_vbe_info_block *vbe_control_info;
+  struct grub_vbe_mode_info_block *vbe_mode_info;
   grub_err_t err;
-  const char *modevar;
 
-  if (accepts_video || !HAS_VGA_TEXT)
-    {
-      modevar = grub_env_get ("gfxpayload");
-      if (! modevar || *modevar == 0)
-	err = grub_video_set_mode (DEFAULT_VIDEO_MODE, 0);
-      else
-	{
-	  char *tmp;
-	  tmp = grub_malloc (grub_strlen (modevar)
-			     + sizeof (DEFAULT_VIDEO_MODE) + 1);
-	  if (! tmp)
-	    return grub_errno;
-	  grub_sprintf (tmp, "%s;" DEFAULT_VIDEO_MODE, modevar);
-	  err = grub_video_set_mode (tmp, 0);
-	  grub_free (tmp);
-	}
-    }
-  else
-    err = grub_video_set_mode ("text", 0);
-
-  return err;
-}
-
-#if HAS_VBE
-static grub_err_t
-fill_vbe_info (struct multiboot_info *mbi, grub_uint8_t *ptrorig,
-	       grub_uint32_t ptrdest, int fill_generic)
-{
-  grub_vbe_status_t status;
-  grub_uint32_t vbe_mode;
-  void *scratch = (void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
-  struct grub_vbe_mode_info_block *mode_info;
-    
-  status = grub_vbe_bios_get_controller_info (scratch);
-  if (status != GRUB_VBE_STATUS_OK)
-    return grub_error (GRUB_ERR_IO, "Can't get controller info.");
-  
+  vbe_control_info = (struct grub_vbe_info_block *) ptrorig;
   mbi->vbe_control_info = ptrdest;
-  grub_memcpy (ptrorig, scratch, sizeof (struct grub_vbe_info_block));
   ptrorig += sizeof (struct grub_vbe_info_block);
   ptrdest += sizeof (struct grub_vbe_info_block);
-  
-  status = grub_vbe_bios_get_mode (scratch);
-  vbe_mode = *(grub_uint32_t *) scratch;
-  if (status != GRUB_VBE_STATUS_OK)
-    return grub_error (GRUB_ERR_IO, "can't get VBE mode");
-  mbi->vbe_mode = vbe_mode;
-
-  mode_info = (struct grub_vbe_mode_info_block *) ptrorig;
+  vbe_mode_info = (struct grub_vbe_mode_info_block *) ptrorig;
   mbi->vbe_mode_info = ptrdest;
-  /* get_mode_info isn't available for mode 3.  */
-  if (vbe_mode == 3)
-    {
-      grub_memset (mode_info, 0, sizeof (struct grub_vbe_mode_info_block));
-      mode_info->memory_model = GRUB_VBE_MEMORY_MODEL_TEXT;
-      mode_info->x_resolution = 80;
-      mode_info->y_resolution = 25;
-    }
-  else
-    {
-      status = grub_vbe_bios_get_mode_info (vbe_mode, scratch);
-      if (status != GRUB_VBE_STATUS_OK)
-	return grub_error (GRUB_ERR_IO, "can't get mode info");
-      grub_memcpy (mode_info, scratch,
-		   sizeof (struct grub_vbe_mode_info_block));
-    }
   ptrorig += sizeof (struct grub_vbe_mode_info_block);
   ptrdest += sizeof (struct grub_vbe_mode_info_block);
-      
-  /* FIXME: retrieve those.  */
-  mbi->vbe_interface_seg = 0;
-  mbi->vbe_interface_off = 0;
-  mbi->vbe_interface_len = 0;
   
+  err = grub_multiboot_fill_vbe_info_real (vbe_control_info, vbe_mode_info,
+					   &mbi->vbe_mode,
+					   &mbi->vbe_interface_seg,
+					   &mbi->vbe_interface_off,
+					   &mbi->vbe_interface_len);
+  if (err)
+    return err;
   mbi->flags |= MULTIBOOT_INFO_VBE_INFO;
-
-  if (fill_generic && mode_info->memory_model == GRUB_VBE_MEMORY_MODEL_TEXT)
-    {
-      mbi->framebuffer_addr = 0xb8000;
-
-      mbi->framebuffer_pitch = 2 * mode_info->x_resolution;	
-      mbi->framebuffer_width = mode_info->x_resolution;
-      mbi->framebuffer_height = mode_info->y_resolution;
-
-      mbi->framebuffer_bpp = 16;
-
-      mbi->framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT;
-
-      mbi->flags |= MULTIBOOT_INFO_FRAMEBUFFER_INFO;
-    }
-
+  if (vbe_mode_info_out)
+    *vbe_mode_info_out = vbe_mode_info;
   return GRUB_ERR_NONE;
 }
+
 #endif
 
 static grub_err_t
@@ -241,7 +105,7 @@ retrieve_video_parameters (struct multiboot_info *mbi,
   grub_video_driver_id_t driv_id;
   struct grub_video_palette_data palette[256];
 
-  err = set_video_mode ();
+  err = grub_multiboot_set_video_mode ();
   if (err)
     {
       grub_print_error ();
@@ -251,9 +115,29 @@ retrieve_video_parameters (struct multiboot_info *mbi,
   grub_video_get_palette (0, ARRAY_SIZE (palette), palette);
 
   driv_id = grub_video_get_driver_id ();
-#if HAS_VGA_TEXT
+#if GRUB_MACHINE_HAS_VGA_TEXT
   if (driv_id == GRUB_VIDEO_DRIVER_NONE)
-    return fill_vbe_info (mbi, ptrorig, ptrdest, 1);
+    {
+      struct grub_vbe_mode_info_block *vbe_mode_info;
+      err = fill_vbe_info (mbi, &vbe_mode_info, ptrorig, ptrdest);
+      if (err)
+	return err;
+      if (vbe_mode_info->memory_model == GRUB_VBE_MEMORY_MODEL_TEXT)
+	{
+	  mbi->framebuffer_addr = 0xb8000;
+	  
+	  mbi->framebuffer_pitch = 2 * vbe_mode_info->x_resolution;	
+	  mbi->framebuffer_width = vbe_mode_info->x_resolution;
+	  mbi->framebuffer_height = vbe_mode_info->y_resolution;
+
+	  mbi->framebuffer_bpp = 16;
+	  
+	  mbi->framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT;
+
+	  mbi->flags |= MULTIBOOT_INFO_FRAMEBUFFER_INFO;
+	}
+      return GRUB_ERR_NONE;
+    }
 #else
   if (driv_id == GRUB_VIDEO_DRIVER_NONE)
     return GRUB_ERR_NONE;
@@ -305,9 +189,13 @@ retrieve_video_parameters (struct multiboot_info *mbi,
 
   mbi->flags |= MULTIBOOT_INFO_FRAMEBUFFER_INFO;
 
-#if HAS_VBE
+#if GRUB_MACHINE_HAS_VBE
   if (driv_id == GRUB_VIDEO_DRIVER_VBE)
-    return fill_vbe_info (mbi, ptrorig, ptrdest, 0);
+    {
+      err = fill_vbe_info (mbi, NULL, ptrorig, ptrdest);
+      if (err)
+	return err;
+    }
 #endif
 
   return GRUB_ERR_NONE;
@@ -396,7 +284,7 @@ grub_multiboot_make_mbi (void *orig, grub_uint32_t dest, grub_off_t buf_off,
       grub_print_error ();
       grub_errno = GRUB_ERR_NONE;
     }
-#if HAS_VBE
+#if GRUB_MACHINE_HAS_VBE
   ptrorig += sizeof (struct grub_vbe_info_block);
   ptrdest += sizeof (struct grub_vbe_info_block);
   ptrorig += sizeof (struct grub_vbe_mode_info_block);
diff --git a/loader/i386/multiboot_mbi2.c b/loader/i386/multiboot_mbi2.c
new file mode 100644
index 000000000..031d4c0eb
--- /dev/null
+++ b/loader/i386/multiboot_mbi2.c
@@ -0,0 +1,468 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2007,2008,2009  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/machine/memory.h>
+#include <grub/memory.h>
+#ifdef GRUB_MACHINE_PCBIOS
+#include <grub/machine/biosnum.h>
+#endif
+#include <grub/multiboot.h>
+#include <grub/cpu/multiboot.h>
+#include <grub/disk.h>
+#include <grub/device.h>
+#include <grub/partition.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/env.h>
+#include <grub/video.h>
+
+#if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
+#include <grub/i386/pc/vbe.h>
+#define DEFAULT_VIDEO_MODE "text"
+#define HAS_VGA_TEXT 1
+#define HAS_VBE 1
+#else
+#define DEFAULT_VIDEO_MODE "auto"
+#define HAS_VGA_TEXT 0
+#define HAS_VBE 0
+#endif
+
+struct module
+{
+  struct module *next;
+  grub_addr_t start;
+  grub_size_t size;
+  char *cmdline;
+  int cmdline_size;
+};
+
+struct module *modules, *modules_last;
+static grub_size_t cmdline_size;
+static grub_size_t total_modcmd;
+static unsigned modcnt;
+static char *cmdline = NULL;
+static int bootdev_set;
+static grub_uint32_t biosdev, slice, part;
+
+grub_size_t
+grub_multiboot_get_mbi_size (void)
+{
+  return sizeof (struct multiboot_tag)
+    + (sizeof (struct multiboot_tag_string) + ALIGN_UP (cmdline_size, 4))
+    + (sizeof (struct multiboot_tag_string)
+       + ALIGN_UP (sizeof (PACKAGE_STRING), 4))
+    + (modcnt * sizeof (struct multiboot_tag_module) + total_modcmd)
+    + sizeof (struct multiboot_tag_basic_meminfo)
+    + sizeof (struct multiboot_tag_bootdev)
+    + (sizeof (struct multiboot_tag_mmap) + grub_get_multiboot_mmap_len ())
+    + sizeof (struct multiboot_tag_vbe);
+}
+
+#ifdef GRUB_MACHINE_HAS_VBE
+
+static grub_err_t
+fill_vbe_info (struct grub_vbe_mode_info_block **vbe_mode_info_out,
+	       grub_uint8_t **ptrorig)
+{
+  struct multiboot_tag_vbe *tag = (struct multiboot_tag_vbe *) *ptrorig;
+  grub_err_t err;
+
+  tag->type = MULTIBOOT_TAG_TYPE_VBE;
+  tag->size = 0;
+  err = grub_multiboot_fill_vbe_info_real ((struct grub_vbe_info_block *)
+					   &(tag->vbe_control_info),
+					   (struct grub_vbe_mode_info_block *) 
+					   &(tag->vbe_mode_info),
+					   &(tag->vbe_mode),
+					   &(tag->vbe_interface_seg),
+					   &(tag->vbe_interface_off),
+					   &(tag->vbe_interface_len));
+  if (err)
+    return err;
+  if (vbe_mode_info_out)
+    *vbe_mode_info_out = (struct grub_vbe_mode_info_block *) 
+      &(tag->vbe_mode_info);
+  tag->size = sizeof (struct multiboot_tag_vbe);
+  *ptrorig += tag->size;
+  return GRUB_ERR_NONE;
+}
+
+#endif
+
+static grub_err_t
+retrieve_video_parameters (grub_uint8_t **ptrorig)
+{
+  grub_err_t err;
+  struct grub_video_mode_info mode_info;
+  void *framebuffer;
+  grub_video_driver_id_t driv_id;
+  struct grub_video_palette_data palette[256];
+  struct multiboot_tag_framebuffer *tag
+    = (struct multiboot_tag_framebuffer *) *ptrorig;
+
+  err = grub_multiboot_set_video_mode ();
+  if (err)
+    {
+      grub_print_error ();
+      grub_errno = GRUB_ERR_NONE;
+    }
+
+  grub_video_get_palette (0, ARRAY_SIZE (palette), palette);
+
+  driv_id = grub_video_get_driver_id ();
+#if HAS_VGA_TEXT
+  if (driv_id == GRUB_VIDEO_DRIVER_NONE)
+    {
+      struct grub_vbe_mode_info_block *vbe_mode_info;
+      err = fill_vbe_info (&vbe_mode_info, ptrorig);
+      if (err)
+	return err;
+      if (vbe_mode_info->memory_model == GRUB_VBE_MEMORY_MODEL_TEXT)
+	{
+	  tag = (struct multiboot_tag_framebuffer *) *ptrorig;
+	  tag->common.type = MULTIBOOT_TAG_TYPE_FRAMEBUFFER;
+	  tag->common.size = 0;
+
+	  tag->common.framebuffer_addr = 0xb8000;
+	  
+	  tag->common.framebuffer_pitch = 2 * vbe_mode_info->x_resolution;	
+	  tag->common.framebuffer_width = vbe_mode_info->x_resolution;
+	  tag->common.framebuffer_height = vbe_mode_info->y_resolution;
+
+	  tag->common.framebuffer_bpp = 16;
+	  
+	  tag->common.framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT;
+	  tag->common.size = sizeof (tag->common);
+	  *ptrorig += tag->common.size;
+	}
+      return GRUB_ERR_NONE;
+    }
+#else
+  if (driv_id == GRUB_VIDEO_DRIVER_NONE)
+    return GRUB_ERR_NONE;
+#endif
+
+  err = grub_video_get_info_and_fini (&mode_info, &framebuffer);
+  if (err)
+    return err;
+
+  tag = (struct multiboot_tag_framebuffer *) *ptrorig;
+  tag->common.type = MULTIBOOT_TAG_TYPE_FRAMEBUFFER;
+  tag->common.size = 0;
+
+  tag->common.framebuffer_addr = (grub_addr_t) framebuffer;
+  tag->common.framebuffer_pitch = mode_info.pitch;
+
+  tag->common.framebuffer_width = mode_info.width;
+  tag->common.framebuffer_height = mode_info.height;
+
+  tag->common.framebuffer_bpp = mode_info.bpp;
+      
+  if (mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_INDEX_COLOR)
+    {
+      unsigned i;
+      tag->common.framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED;
+      tag->framebuffer_palette_num_colors = mode_info.number_of_colors;
+      if (tag->framebuffer_palette_num_colors > ARRAY_SIZE (palette))
+	tag->framebuffer_palette_num_colors = ARRAY_SIZE (palette);
+      tag->common.size = sizeof (struct multiboot_tag_framebuffer_common)
+	+ sizeof (multiboot_uint16_t) + tag->framebuffer_palette_num_colors
+	* sizeof (struct multiboot_color);
+      for (i = 0; i < tag->framebuffer_palette_num_colors; i++)
+	{
+	  tag->framebuffer_palette[i].red = palette[i].r;
+	  tag->framebuffer_palette[i].green = palette[i].g;
+	  tag->framebuffer_palette[i].blue = palette[i].b;
+	}
+      *ptrorig += tag->common.size;
+    }
+  else
+    {
+      tag->common.framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_RGB;
+      tag->common.framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_RGB;
+      tag->framebuffer_red_field_position = mode_info.green_field_pos;
+      tag->framebuffer_red_mask_size = mode_info.green_mask_size;
+      tag->framebuffer_green_field_position = mode_info.green_field_pos;
+      tag->framebuffer_green_mask_size = mode_info.green_mask_size;
+      tag->framebuffer_blue_field_position = mode_info.blue_field_pos;
+      tag->framebuffer_blue_mask_size = mode_info.blue_mask_size;
+
+      tag->common.size = sizeof (struct multiboot_tag_framebuffer_common) + 6;
+    }
+
+#if HAS_VBE
+  if (driv_id == GRUB_VIDEO_DRIVER_VBE)
+    {
+      err = fill_vbe_info (NULL, ptrorig);
+      if (err)
+	return err;
+    }
+#endif
+
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_multiboot_make_mbi (void *orig, grub_uint32_t dest, grub_off_t buf_off,
+			 grub_size_t bufsize)
+{
+  grub_uint8_t *ptrorig = (grub_uint8_t *) orig + buf_off;
+  grub_err_t err;
+
+  if (bufsize < grub_multiboot_get_mbi_size ())
+    return grub_error (GRUB_ERR_OUT_OF_MEMORY, "mbi buffer is too small");
+
+  {
+    struct multiboot_tag_string *tag = (struct multiboot_tag_string *) ptrorig;
+    tag->type = MULTIBOOT_TAG_TYPE_CMDLINE;
+    tag->size = sizeof (struct multiboot_tag_string)
+      + ALIGN_UP (cmdline_size, 4); 
+    grub_memcpy (tag->string, cmdline, cmdline_size);
+    ptrorig += tag->size;
+  }
+
+  {
+    struct multiboot_tag_string *tag = (struct multiboot_tag_string *) ptrorig;
+    tag->type = MULTIBOOT_TAG_TYPE_BOOT_LOADER_NAME;
+    tag->size = sizeof (struct multiboot_tag_string)
+      + ALIGN_UP (sizeof (PACKAGE_STRING), 4); 
+    grub_memcpy (tag->string, PACKAGE_STRING, sizeof (PACKAGE_STRING));
+    ptrorig += tag->size;
+  }
+
+  {
+    unsigned i;
+    struct module *cur;
+
+    for (i = 0, cur = modules; i < modcnt; i++, cur = cur->next)
+      {
+	struct multiboot_tag_module *tag
+	  = (struct multiboot_tag_module *) ptrorig;
+	tag->type = MULTIBOOT_TAG_TYPE_MODULE;
+	tag->size = sizeof (struct multiboot_tag_module)
+	  + ALIGN_UP (sizeof (cur->cmdline_size), 4); 
+
+	tag->mod_start = dest + cur->start;
+	tag->mod_end = tag->mod_start + cur->size;
+	grub_memcpy (tag->cmdline, cur->cmdline, cur->cmdline_size);
+	ptrorig += tag->size;
+      }
+  }
+
+  {
+    struct multiboot_tag_mmap *tag = (struct multiboot_tag_mmap *) ptrorig;
+    tag->type = MULTIBOOT_TAG_TYPE_MMAP;
+    tag->size = sizeof (struct multiboot_tag_mmap) 
+      + grub_get_multiboot_mmap_len (); 
+    grub_fill_multiboot_mmap (tag->entries);
+    ptrorig += tag->size;
+  }
+
+  {
+    struct multiboot_tag_basic_meminfo *tag
+      = (struct multiboot_tag_basic_meminfo *) ptrorig;
+    tag->type = MULTIBOOT_TAG_TYPE_BASIC_MEMINFO;
+    tag->size = sizeof (struct multiboot_tag_basic_meminfo); 
+
+    /* Convert from bytes to kilobytes.  */
+    tag->mem_lower = grub_mmap_get_lower () / 1024;
+    tag->mem_upper = grub_mmap_get_upper () / 1024;
+    ptrorig += tag->size;
+  }
+
+  if (bootdev_set)
+    {
+      struct multiboot_tag_bootdev *tag
+	= (struct multiboot_tag_bootdev *) ptrorig;
+      tag->type = MULTIBOOT_TAG_TYPE_BOOTDEV;
+      tag->size = sizeof (struct multiboot_tag_bootdev); 
+
+      tag->biosdev = biosdev;
+      tag->slice = slice;
+      tag->part = part;
+      ptrorig += tag->size;
+    }
+
+  {
+    err = retrieve_video_parameters (&ptrorig);
+    if (err)
+      {
+	grub_print_error ();
+	grub_errno = GRUB_ERR_NONE;
+      }
+  }
+  
+  {
+    struct multiboot_tag *tag = (struct multiboot_tag *) ptrorig;
+    tag->type = MULTIBOOT_TAG_TYPE_END;
+    tag->size = sizeof (struct multiboot_tag);
+    ptrorig += tag->size;
+  }
+
+  return GRUB_ERR_NONE;
+}
+
+void
+grub_multiboot_free_mbi (void)
+{
+  struct module *cur, *next;
+
+  cmdline_size = 0;
+  total_modcmd = 0;
+  modcnt = 0;
+  grub_free (cmdline);
+  cmdline = NULL;
+  bootdev_set = 0;
+
+  for (cur = modules; cur; cur = next)
+    {
+      next = cur->next;
+      grub_free (cur->cmdline);
+      grub_free (cur);
+    }
+  modules = NULL;
+  modules_last = NULL;
+}
+
+grub_err_t
+grub_multiboot_init_mbi (int argc, char *argv[])
+{
+  grub_ssize_t len = 0;
+  char *p;
+  int i;
+
+  grub_multiboot_free_mbi ();
+
+  for (i = 0; i < argc; i++)
+    len += grub_strlen (argv[i]) + 1;
+  if (len == 0)
+    len = 1;
+
+  cmdline = p = grub_malloc (len);
+  if (! cmdline)
+    return grub_errno;
+  cmdline_size = len;
+
+  for (i = 0; i < argc; i++)
+    {
+      p = grub_stpcpy (p, argv[i]);
+      *(p++) = ' ';
+    }
+
+  /* Remove the space after the last word.  */
+  if (p != cmdline)
+    p--;
+  *p = '\0';
+
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_multiboot_add_module (grub_addr_t start, grub_size_t size,
+			   int argc, char *argv[])
+{
+  struct module *newmod;
+  char *p;
+  grub_ssize_t len = 0;
+  int i;
+
+  newmod = grub_malloc (sizeof (*newmod));
+  if (!newmod)
+    return grub_errno;
+  newmod->start = start;
+  newmod->size = size;
+
+  for (i = 0; i < argc; i++)
+    len += grub_strlen (argv[i]) + 1;
+
+  if (len == 0)
+    len = 1;
+
+  newmod->cmdline = p = grub_malloc (len);
+  if (! newmod->cmdline)
+    {
+      grub_free (newmod);
+      return grub_errno;
+    }
+  newmod->cmdline_size = len;
+  total_modcmd += ALIGN_UP (len, 4);
+
+  for (i = 0; i < argc; i++)
+    {
+      p = grub_stpcpy (p, argv[i]);
+      *(p++) = ' ';
+    }
+
+  /* Remove the space after the last word.  */
+  if (p != newmod->cmdline)
+    p--;
+  *p = '\0';
+
+  if (modules_last)
+    modules_last->next = newmod;
+  else
+    {
+      modules = newmod;
+      modules_last->next = NULL;
+    }
+  modules_last = newmod;
+
+  modcnt++;
+
+  return GRUB_ERR_NONE;
+}
+
+void
+grub_multiboot_set_bootdev (void)
+{
+  char *p;
+  grub_device_t dev;
+
+  slice = ~0;
+  part = ~0;
+
+#ifdef GRUB_MACHINE_PCBIOS
+  biosdev = grub_get_root_biosnumber ();
+#else
+  biosdev = 0xffffffff;
+#endif
+
+  dev = grub_device_open (0);
+  if (dev && dev->disk && dev->disk->partition)
+    {
+
+      p = dev->disk->partition->partmap->get_name (dev->disk->partition);
+      if (p)
+	{
+	  if ((p[0] >= '0') && (p[0] <= '9'))
+	    {
+	      slice = grub_strtoul (p, &p, 0) - 1;
+
+	      if ((p) && (p[0] == ','))
+		p++;
+	    }
+
+	  if ((p[0] >= 'a') && (p[0] <= 'z'))
+	    part = p[0] - 'a';
+	}
+    }
+  if (dev)
+    grub_device_close (dev);
+
+  bootdev_set = 1;
+}

From 234328552802a698c7dc66c0d5f204975cd62a64 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 16 Jan 2010 16:36:42 +0100
Subject: [PATCH 0299/1628] Don't pass biosdev if not booted from BIOS disk

---
 loader/i386/multiboot_mbi.c  | 3 +++
 loader/i386/multiboot_mbi2.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index 9c45b3352..3e63b3456 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -417,6 +417,9 @@ grub_multiboot_set_bootdev (void)
   biosdev = 0xffffffff;
 #endif
 
+  if (biosdev == 0xffffffff)
+    return;
+
   dev = grub_device_open (0);
   if (dev && dev->disk && dev->disk->partition)
     {
diff --git a/loader/i386/multiboot_mbi2.c b/loader/i386/multiboot_mbi2.c
index 031d4c0eb..de234727b 100644
--- a/loader/i386/multiboot_mbi2.c
+++ b/loader/i386/multiboot_mbi2.c
@@ -442,6 +442,9 @@ grub_multiboot_set_bootdev (void)
   biosdev = 0xffffffff;
 #endif
 
+  if (biosdev == 0xffffffff)
+    return;
+
   dev = grub_device_open (0);
   if (dev && dev->disk && dev->disk->partition)
     {

From 1c4ad986aa89b41f8478ae94689557f362c9fe82 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 16 Jan 2010 17:18:02 +0100
Subject: [PATCH 0300/1628] size field in tagged mbi

---
 loader/i386/multiboot_mbi2.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/loader/i386/multiboot_mbi2.c b/loader/i386/multiboot_mbi2.c
index de234727b..636b63923 100644
--- a/loader/i386/multiboot_mbi2.c
+++ b/loader/i386/multiboot_mbi2.c
@@ -62,7 +62,7 @@ static grub_uint32_t biosdev, slice, part;
 grub_size_t
 grub_multiboot_get_mbi_size (void)
 {
-  return sizeof (struct multiboot_tag)
+  return sizeof (grub_uint32_t) + sizeof (struct multiboot_tag)
     + (sizeof (struct multiboot_tag_string) + ALIGN_UP (cmdline_size, 4))
     + (sizeof (struct multiboot_tag_string)
        + ALIGN_UP (sizeof (PACKAGE_STRING), 4))
@@ -221,12 +221,15 @@ grub_err_t
 grub_multiboot_make_mbi (void *orig, grub_uint32_t dest, grub_off_t buf_off,
 			 grub_size_t bufsize)
 {
-  grub_uint8_t *ptrorig = (grub_uint8_t *) orig + buf_off;
+  grub_uint8_t *ptrorig;
+  grub_uint8_t *mbistart = (grub_uint8_t *) orig + buf_off;
   grub_err_t err;
 
   if (bufsize < grub_multiboot_get_mbi_size ())
     return grub_error (GRUB_ERR_OUT_OF_MEMORY, "mbi buffer is too small");
 
+  ptrorig = (grub_uint8_t *) orig + buf_off + sizeof (grub_uint32_t);
+
   {
     struct multiboot_tag_string *tag = (struct multiboot_tag_string *) ptrorig;
     tag->type = MULTIBOOT_TAG_TYPE_CMDLINE;
@@ -314,6 +317,8 @@ grub_multiboot_make_mbi (void *orig, grub_uint32_t dest, grub_off_t buf_off,
     ptrorig += tag->size;
   }
 
+  *(grub_uint32_t *) mbistart = ptrorig - mbistart;
+
   return GRUB_ERR_NONE;
 }
 

From 72ebf8b87cd4bbfa9a18563bfcbe218b4943662c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 17 Jan 2010 12:42:28 +0100
Subject: [PATCH 0301/1628] Sort chunks

---
 include/grub/relocator_private.h | 17 ------
 lib/relocator.c                  | 99 +++++++++++++++++++++++++++-----
 2 files changed, 86 insertions(+), 30 deletions(-)

diff --git a/include/grub/relocator_private.h b/include/grub/relocator_private.h
index cc68305c8..7a3ef2bd7 100644
--- a/include/grub/relocator_private.h
+++ b/include/grub/relocator_private.h
@@ -27,23 +27,6 @@ extern grub_size_t grub_relocator_forward_size;
 extern grub_size_t grub_relocator_backward_size;
 extern grub_size_t grub_relocator_jumper_size;
 
-struct grub_relocator
-{
-  struct grub_relocator_chunk *chunks;
-  grub_addr_t postchunks;
-  grub_addr_t highestaddr;
-  grub_addr_t highestnonpostaddr;
-  grub_size_t relocators_size;
-};
-
-struct grub_relocator_chunk
-{
-  struct grub_relocator_chunk *next;
-  grub_addr_t src;
-  grub_addr_t target;
-  grub_size_t size;
-};
-
 void
 grub_cpu_relocator_init (void);
 grub_err_t
diff --git a/lib/relocator.c b/lib/relocator.c
index 0064824a4..a02bca332 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -25,7 +25,23 @@
 /* FIXME: implement unload. */
 /* FIXME: check memory map.  */ 
 /* FIXME: try to request memory from firmware.  */
-/* FIXME: sort chunk when programming relocators.  */
+
+struct grub_relocator
+{
+  struct grub_relocator_chunk *chunks;
+  grub_addr_t postchunks;
+  grub_addr_t highestaddr;
+  grub_addr_t highestnonpostaddr;
+  grub_size_t relocators_size;
+};
+
+struct grub_relocator_chunk
+{
+  struct grub_relocator_chunk *next;
+  grub_addr_t src;
+  grub_addr_t target;
+  grub_size_t size;
+};
 
 struct grub_relocator *
 grub_relocator_new (void)
@@ -591,9 +607,11 @@ grub_err_t
 grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
 			       grub_addr_t *relstart)
 {
-  struct grub_relocator_chunk *chunk;
   grub_addr_t rels;
   grub_addr_t rels0;
+  struct grub_relocator_chunk *sorted;
+  grub_size_t nchunks = 0;
+  unsigned j;
 
   grub_dprintf ("relocator", "Preparing relocs (size=%ld)\n",
 		(unsigned long) rel->relocators_size);
@@ -605,29 +623,84 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
   rels = rels0;
 
   grub_dprintf ("relocator", "Relocs allocated\n");
+  
+  {
+    unsigned i;
+    grub_size_t count[257];
+    struct grub_relocator_chunk *from, *to, *tmp;
+
+    grub_memset (count, 0, sizeof (count));
 
-  for (chunk = rel->chunks; chunk; chunk = chunk->next)
     {
-      grub_dprintf ("relocator", "chunk %p->%p\n", 
-		    (void *) chunk->src, (void *) chunk->target);
-      if (chunk->src < chunk->target)
+        struct grub_relocator_chunk *chunk;
+	for (chunk = rel->chunks; chunk; chunk = chunk->next)
+	  {
+	    grub_dprintf ("relocator", "chunk %p->%p, 0x%x\n", 
+			  (void *) chunk->src, (void *) chunk->target,
+			  chunk->size);
+	    nchunks++;
+	    count[(chunk->src & 0xff) + 1]++;
+	  }
+    }
+    from = grub_malloc (nchunks * sizeof (sorted[0]));
+    to = grub_malloc (nchunks * sizeof (sorted[0]));
+    if (!from || !to)
+      {
+	grub_free (from);
+	grub_free (to);
+	return grub_errno;
+      }
+
+    for (j = 0; j < 256; j++)
+      count[j+1] += count[j];
+
+    {
+      struct grub_relocator_chunk *chunk;
+      for (chunk = rel->chunks; chunk; chunk = chunk->next)
+	from[count[chunk->src & 0xff]++] = *chunk;
+    }
+
+    for (i = 1; i < GRUB_CPU_SIZEOF_VOID_P; i++)
+      {
+	grub_memset (count, 0, sizeof (count));
+	for (j = 0; j < nchunks; j++)
+	  count[((from[j].src >> (8 * i)) & 0xff) + 1]++;
+	for (j = 0; j < 256; j++)
+	  count[j+1] += count[j];
+	for (j = 0; j < nchunks; j++)
+	  to[count[(from[j].src >> (8 * i)) & 0xff]++] = from[j];
+	tmp = to;
+	to = from;
+	from = tmp;
+      }
+    sorted = from;
+    grub_free (to);
+  }
+
+  for (j = 0; j < nchunks; j++)
+    {
+      grub_dprintf ("relocator", "sorted chunk %p->%p, 0x%x\n", 
+		    (void *) sorted[j].src, (void *) sorted[j].target,
+		    sorted[j].size);
+      if (sorted[j].src < sorted[j].target)
 	{
 	  grub_cpu_relocator_backward ((void *) rels,
-				       (void *) chunk->src,
-				       (void *) chunk->target,
-				       chunk->size);
+				       (void *) sorted[j].src,
+				       (void *) sorted[j].target,
+				       sorted[j].size);
 	  rels += grub_relocator_backward_size;
 	}
-      if (chunk->src > chunk->target)
+      if (sorted[j].src > sorted[j].target)
 	{
 	  grub_cpu_relocator_forward ((void *) rels,
-				      (void *) chunk->src,
-				      (void *) chunk->target,
-				      chunk->size);
+				      (void *) sorted[j].src,
+				      (void *) sorted[j].target,
+				      sorted[j].size);
 	  rels += grub_relocator_forward_size;
 	}
     }
   grub_cpu_relocator_jumper ((void *) rels, addr);
   *relstart = rels0;
+  grub_free (sorted);
   return GRUB_ERR_NONE;
 }

From ea379330f97a1a2157bb5165a94d72fb83d3ca29 Mon Sep 17 00:00:00 2001
From: carles <carles@pinux>
Date: Sun, 17 Jan 2010 14:42:19 +0000
Subject: [PATCH 0302/1628] 2010-01-17  Carles Pina i Estany  <carles@pina.cat>

	* util/misc.c (grub_util_info): Fix the order of the parameters in a
	fprintf call.
---
 ChangeLog   | 5 +++++
 util/misc.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e71c4ec0e..748a55565 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-17  Carles Pina i Estany  <carles@pina.cat>
+
+	* util/misc.c (grub_util_info): Fix the order of the parameters in a
+	fprintf call.
+
 2010-01-16  Grégoire Sutre <gregoire.sutre@gmail.com>
 
 	* genmk.rb (class SCRIPT): Replace option -i of sed by a pipe.
diff --git a/util/misc.c b/util/misc.c
index 7f347c872..0b682c445 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -81,7 +81,7 @@ grub_util_info (const char *fmt, ...)
       va_start (ap, fmt);
       vfprintf (stderr, fmt, ap);
       va_end (ap);
-      fprintf (".\n", stderr);
+      fprintf (stderr, ".\n");
       fflush (stderr);
     }
 }

From a0c2a0f6ff17b99fc8de9a0e13dbdae31ba1533a Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sun, 17 Jan 2010 17:29:57 +0000
Subject: [PATCH 0303/1628] 2010-01-17  Robert Millan  <rmh.grub@aybabtu.com>

	* include/grub/test.h: Add license header.
	* tests/example_functional_test.c: Likewise.
	* tests/example_unit_test.c: Likewise.
	* tests/lib/functional_test.c: Likewise.
	* tests/lib/test.c: Likewise.
	* tests/lib/unit_test.c: Likewise.
---
 ChangeLog                       |  9 +++++++++
 include/grub/test.h             | 18 ++++++++++++++++++
 tests/example_functional_test.c | 18 ++++++++++++++++++
 tests/example_unit_test.c       | 18 ++++++++++++++++++
 tests/lib/functional_test.c     | 18 ++++++++++++++++++
 tests/lib/test.c                | 18 ++++++++++++++++++
 tests/lib/unit_test.c           | 18 ++++++++++++++++++
 7 files changed, 117 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 41f9aeaa4..9ef3d3d42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-17  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* include/grub/test.h: Add license header.
+	* tests/example_functional_test.c: Likewise.
+	* tests/example_unit_test.c: Likewise.
+	* tests/lib/functional_test.c: Likewise.
+	* tests/lib/test.c: Likewise.
+	* tests/lib/unit_test.c: Likewise.
+
 2010-01-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Use flag-based instead of hook-based video mode selection and "auto"
diff --git a/include/grub/test.h b/include/grub/test.h
index 544e1c817..a7d3a2399 100644
--- a/include/grub/test.h
+++ b/include/grub/test.h
@@ -1,3 +1,21 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010 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/>.
+ */
+
 #ifndef GRUB_TEST_HEADER
 #define GRUB_TEST_HEADER
 
diff --git a/tests/example_functional_test.c b/tests/example_functional_test.c
index 475d1c7f0..f43c0f1ce 100644
--- a/tests/example_functional_test.c
+++ b/tests/example_functional_test.c
@@ -1,3 +1,21 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010 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/>.
+ */
+
 /* All tests need to include test.h for GRUB testing framework.  */
 #include <grub/test.h>
 
diff --git a/tests/example_unit_test.c b/tests/example_unit_test.c
index e2fad06ff..4999f1412 100644
--- a/tests/example_unit_test.c
+++ b/tests/example_unit_test.c
@@ -1,3 +1,21 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010 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/>.
+ */
+
 /* Unit tests are normal programs, so they can include C library.  */
 #include <string.h>
 
diff --git a/tests/lib/functional_test.c b/tests/lib/functional_test.c
index 8ad034503..8ff08cf8a 100644
--- a/tests/lib/functional_test.c
+++ b/tests/lib/functional_test.c
@@ -1,3 +1,21 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010 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/mm.h>
 #include <grub/misc.h>
 #include <grub/extcmd.h>
diff --git a/tests/lib/test.c b/tests/lib/test.c
index aba2f4415..cd0799f56 100644
--- a/tests/lib/test.c
+++ b/tests/lib/test.c
@@ -1,3 +1,21 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010 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/mm.h>
 #include <grub/misc.h>
 #include <grub/test.h>
diff --git a/tests/lib/unit_test.c b/tests/lib/unit_test.c
index 2ca011433..e461150de 100644
--- a/tests/lib/unit_test.c
+++ b/tests/lib/unit_test.c
@@ -1,3 +1,21 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010 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 <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>

From b14620812f8af7a2f9e5f740e2ae047b321d3197 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 17 Jan 2010 19:22:36 +0100
Subject: [PATCH 0304/1628] Enable serial on all i386.rmk

---
 conf/i386-coreboot.rmk | 8 +-------
 conf/i386-pc.rmk       | 7 +------
 conf/i386.rmk          | 6 ++++++
 term/i386/pc/serial.c  | 3 +--
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 2c1174459..2e835e814 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -102,7 +102,7 @@ bin_SCRIPTS += grub-mkrescue
 grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 # Modules.
-pkglib_MODULES = play.mod serial.mod		\
+pkglib_MODULES = play.mod		\
 	memdisk.mod pci.mod lspci.mod reboot.mod	\
 	halt.mod datetime.mod date.mod datehook.mod	\
 	lsmmap.mod mmap.mod
@@ -129,12 +129,6 @@ halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For serial.mod.
-serial_mod_SOURCES = term/i386/pc/serial.c
-serial_mod_CFLAGS = $(COMMON_CFLAGS)
-serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-
 # For play.mod.
 play_mod_SOURCES = commands/i386/pc/play.c
 play_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 8de04e283..24d7a7cf2 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -117,7 +117,7 @@ grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 pkglib_MODULES = biosdisk.mod chain.mod 				\
 	reboot.mod halt.mod				\
-	vbe.mod vbetest.mod vbeinfo.mod play.mod serial.mod		\
+	vbe.mod vbetest.mod vbeinfo.mod play.mod 		\
 	vga.mod memdisk.mod pci.mod lspci.mod				\
 	pxe.mod pxecmd.mod datetime.mod date.mod 	\
 	datehook.mod lsmmap.mod ata_pthru.mod hdparm.mod 		\
@@ -191,11 +191,6 @@ halt_mod_SOURCES = commands/i386/pc/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For serial.mod.
-serial_mod_SOURCES = term/i386/pc/serial.c
-serial_mod_CFLAGS = $(COMMON_CFLAGS)
-serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For vbe.mod.
 vbe_mod_SOURCES = video/i386/pc/vbe.c
 vbe_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/i386.rmk b/conf/i386.rmk
index 73ca95764..110a40ef4 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -62,3 +62,9 @@ multiboot2_mod_SOURCES = loader/i386/multiboot.c \
 multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
 multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
+
+# For serial.mod.
+pkglib_MODULES += serial.mod
+serial_mod_SOURCES = term/i386/pc/serial.c
+serial_mod_CFLAGS = $(COMMON_CFLAGS)
+serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/term/i386/pc/serial.c b/term/i386/pc/serial.c
index b94b09553..135bb6cc5 100644
--- a/term/i386/pc/serial.c
+++ b/term/i386/pc/serial.c
@@ -17,8 +17,7 @@
  */
 
 #include <grub/machine/memory.h>
-#include <grub/machine/serial.h>
-#include <grub/machine/console.h>
+#include <grub/i386/pc/serial.h>
 #include <grub/term.h>
 #include <grub/types.h>
 #include <grub/dl.h>

From 1453b2ec7fe961363320392cfff6d7e15bbb3cfe Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 17 Jan 2010 21:16:05 +0100
Subject: [PATCH 0305/1628] add extended regs support in bios_interrupt

---
 disk/i386/pc/biosdisk.c    |  28 ++++-----
 include/grub/i386/pc/int.h |  18 +++---
 kern/i386/pc/startup.S     | 123 ++++++++++++++++++++++---------------
 3 files changed, 97 insertions(+), 72 deletions(-)

diff --git a/disk/i386/pc/biosdisk.c b/disk/i386/pc/biosdisk.c
index 0f75dba5f..92198e591 100644
--- a/disk/i386/pc/biosdisk.c
+++ b/disk/i386/pc/biosdisk.c
@@ -33,29 +33,29 @@ static int grub_biosdisk_rw_int13_extensions (int ah, int drive, void *dap);
 
 static int grub_biosdisk_get_num_floppies (void)
 {
-  struct grub_cpu_int_registers regs;
+  struct grub_bios_int_registers regs;
   int drive;
 
   /* reset the disk system first */
-  regs.ax = 0;
-  regs.dx = 0;
+  regs.eax = 0;
+  regs.edx = 0;
   regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
 
-  grub_cpu_interrupt (0x13, &regs);
+  grub_bios_interrupt (0x13, &regs);
 
   for (drive = 0; drive < 2; drive++)
     {
       regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT | GRUB_CPU_INT_FLAGS_CARRY;
-      regs.dx = drive;
+      regs.edx = drive;
 
       /* call GET DISK TYPE */
-      regs.ax = 0x1500;
-      grub_cpu_interrupt (0x13, &regs);
+      regs.eax = 0x1500;
+      grub_bios_interrupt (0x13, &regs);
       if (regs.flags & GRUB_CPU_INT_FLAGS_CARRY)
 	break;
 
       /* check if this drive exists */
-      if (!(regs.ax & 0x300))
+      if (!(regs.eax & 0x300))
 	break;
     }
 
@@ -71,16 +71,16 @@ static int grub_biosdisk_get_num_floppies (void)
 static int 
 grub_biosdisk_rw_int13_extensions (int ah, int drive, void *dap)
 {
-  struct grub_cpu_int_registers regs;
-  regs.ax = ah << 8;
+  struct grub_bios_int_registers regs;
+  regs.eax = ah << 8;
   /* compute the address of disk_address_packet */
   regs.ds = (((grub_addr_t) dap) & 0xffff0000) >> 4;
-  regs.si = (((grub_addr_t) dap) & 0xffff);
-  regs.dx = drive;
+  regs.esi = (((grub_addr_t) dap) & 0xffff);
+  regs.edx = drive;
   regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
 
-  grub_cpu_interrupt (0x13, &regs);
-  return regs.ax >> 8;
+  grub_bios_interrupt (0x13, &regs);
+  return (regs.eax >> 8) & 0xff;
 }
 
 static int
diff --git a/include/grub/i386/pc/int.h b/include/grub/i386/pc/int.h
index b8cbe3260..e1c463925 100644
--- a/include/grub/i386/pc/int.h
+++ b/include/grub/i386/pc/int.h
@@ -21,17 +21,18 @@
 
 #include <grub/symbol.h>
 
-struct grub_cpu_int_registers
+struct grub_bios_int_registers
 {
-  grub_uint16_t bx;
+  grub_uint32_t eax;
   grub_uint16_t es;
-  grub_uint16_t cx;
-  grub_uint16_t ax;
-  grub_uint16_t dx;
   grub_uint16_t ds;
-  grub_uint16_t di;
   grub_uint16_t flags;
-  grub_uint16_t si;
+  grub_uint16_t dummy;
+  grub_uint32_t ebx;
+  grub_uint32_t ecx;
+  grub_uint32_t edi;
+  grub_uint32_t esi;
+  grub_uint32_t edx;
 };
 
 #define  GRUB_CPU_INT_FLAGS_CARRY     0x1
@@ -45,6 +46,7 @@ struct grub_cpu_int_registers
 #define  GRUB_CPU_INT_FLAGS_OVERFLOW  0x800
 #define  GRUB_CPU_INT_FLAGS_DEFAULT   GRUB_CPU_INT_FLAGS_INTERRUPT
 
-void EXPORT_FUNC (grub_cpu_interrupt) (grub_uint8_t intno, struct grub_cpu_int_registers *regs);
+void EXPORT_FUNC (grub_bios_interrupt) (grub_uint8_t intno,
+					struct grub_bios_int_registers *regs);
 
 #endif
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index 815686502..cb6ef32a6 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -2068,73 +2068,96 @@ FUNCTION(grub_pxe_call)
 	popl	%ebp
 	ret
 
-FUNCTION(grub_cpu_interrupt)
+FUNCTION(grub_bios_interrupt)
 	pushl    %ebp
-	pushl    %esi
-	pushl    %edi
-	pushl    %ebx
+	pushl    %ecx
+	pushl    %eax
 	pushl    %edx
+	
 	movb     %al, intno
-	movl     %edx, %esi
+	movl	 (%edx), %eax
+	movl	 %eax, LOCAL(bios_register_eax)
+	movw	 4(%edx), %ax
+	movw	 %ax, LOCAL(bios_register_es)
+	movw	 6(%edx), %ax
+	movw	 %ax, LOCAL(bios_register_ds)
+	movw	 8(%edx), %ax
+	movw	 %ax, LOCAL(bios_register_flags)
 
-	movl     0(%esi), %ebx
-	movl	 4(%esi), %ecx
-	movl     8(%esi), %edx
-	movl     12(%esi), %edi
-	movw     16(%esi), %si
+	movl 	12(%edx), %ebx
+	movl 	16(%edx), %ecx
+	movl 	20(%edx), %edi
+	movl 	24(%edx), %esi
+	movl 	28(%edx), %edx
 
 	call    prot_to_real
 	.code16
-	movl    %edi, %eax
-	shrl    $16, %eax
-	push    %ax
 
-	movl    %ebx, %eax
-	shrl    $16, %eax
-	movw    %ax, %es
-	
-	movl    %edx, %eax
-	shrl    $16, %eax
-	movw    %ax, %ds
+	mov	%ds, %ax
+	push	%ax
 
-	movl    %ecx, %eax
-	shrl    $16, %eax
+	/* movw imm16, %ax*/
+	.byte	0xb8
+LOCAL(bios_register_es):
+	.short 	0
+	movw	%ax, %es
+	/* movw imm16, %ax*/
+	.byte	0xb8
+LOCAL(bios_register_ds):
+	.short 	0
+	movw	%ax, %ds
 
+	/* movw imm16, %ax*/
+	.byte	0xb8
+LOCAL(bios_register_flags):
+	.short 	0
+	push	%ax
 	popf
+
+	/* movl imm32, %eax*/
+	.byte	0x66, 0xb8
+LOCAL(bios_register_eax):
+	.long 	0
+	
+	/* int imm8.  */
 	.byte   0xcd
 intno:	
 	.byte   0
 
+	movl 	%eax, %cs:LOCAL(bios_register_eax)
+	movw	%ds, %ax
+	movw 	%ax, %cs:LOCAL(bios_register_ds)
+	pop 	%ax
+	mov	%ax, %ds
 	pushf
-	andl    $0xffff, %ebx
-	andl    $0xffff, %ecx
-	andl    $0xffff, %edx
-	andl    $0xffff, %edi
-
-	shll    $16, %eax
-	orl     %eax, %ecx
-
-	movw    %ds, %ax
-	shll    $16, %eax
-	orl     %eax, %edx
-
-	pop     %ax
-	shll    $16, %eax
-	orl     %eax, %edi
+	pop	%ax
+	movw	%ax, LOCAL(bios_register_flags)
+	mov 	%es, %ax
+	movw	%ax, LOCAL(bios_register_es)
 
 	DATA32  call	real_to_prot
 	.code32
-	pushl    %esi
-	movl     4(%esp), %esi
-	movl     %ebx, 0(%esi)
-	movl     %ecx, 4(%esi)
-	movl     %edx, 8(%esi)
-	movl     %edi, 12(%esi)
-	popl     %eax
-	movw     %ax, 16(%esi)
-	popl     %eax
-	popl	 %ebx
-	popl	 %edi
-	popl	 %esi
-	popl     %ebp
+
+	popl    %eax
+
+	movl 	%ebx, 12(%eax)
+	movl 	%ecx, 16(%eax)
+	movl 	%edi, 20(%eax)
+	movl 	%esi, 24(%eax)
+	movl 	%edx, 28(%eax)
+
+	movl     %eax, %edx
+
+	movl	 LOCAL(bios_register_eax), %eax
+	movl	 %eax, (%edx)
+	movw	 LOCAL(bios_register_es), %ax
+	movw	 %ax, 4(%edx)
+	movw	 LOCAL(bios_register_ds), %ax
+	movw	 %ax, 6(%edx)
+	movw	 LOCAL(bios_register_flags), %ax
+	movw	 %ax, 8(%edx)
+
+	popl    %eax
+	popl    %ecx
+	popl    %ebp
 	ret

From ad8e99ec20d8bcddbdb772751b08e8758a1be587 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 17 Jan 2010 23:36:45 +0100
Subject: [PATCH 0306/1628] bootcheck support

---
 conf/common.rmk               |  5 +++
 conf/i386-pc.rmk              | 10 ++++++
 conf/i386.rmk                 | 21 +++++++++++++
 tests/boot/linux.cfg          |  3 ++
 tests/boot/linux16.cfg        |  3 ++
 tests/boot/linuxinit-i386.S   | 55 +++++++++++++++++++++++++++++++++
 tests/boot/linuxinit-x86_64.S | 54 +++++++++++++++++++++++++++++++++
 tests/util/grub-shell.in      | 57 +++++++++++++++++++++--------------
 8 files changed, 185 insertions(+), 23 deletions(-)
 create mode 100644 tests/boot/linux.cfg
 create mode 100644 tests/boot/linux16.cfg
 create mode 100644 tests/boot/linuxinit-i386.S
 create mode 100644 tests/boot/linuxinit-x86_64.S

diff --git a/conf/common.rmk b/conf/common.rmk
index 31b62892b..905024a55 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -695,4 +695,9 @@ bin_UTILITIES += grub-mkpasswd-pbkdf2
 grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c
 grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap -DGRUB_MKPASSWD=1
 
+# Randomly generated
+SUCCESSFUL_BOOT_STRING=3e49994fd5d82b7c9298d672d774080d
+
+bootcheck: $(BOOTCHECKS)
+
 include $(srcdir)/conf/gcry.mk
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index a89203dea..33575a87c 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -368,5 +368,15 @@ pkglib_DATA += efiemu32.o efiemu64.o
 
 endif
 
+BOOTTARGET=bios-cd
+
+bootcheck-linux16-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg grub-shell
+	timeout -s KILL 30s ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-linux16-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg grub-shell
+	timeout -s KILL 30s ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+BOOTCHECKS+=bootcheck-linux16-i386 bootcheck-linux16-x86_64
+
 include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk
diff --git a/conf/i386.rmk b/conf/i386.rmk
index 7ef337c61..9305bf09c 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -41,3 +41,24 @@ multiboot2_mod_SOURCES = loader/i386/multiboot.c \
 multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
 multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
+
+linuxinit.x86_64: $(srcdir)/tests/boot/linuxinit-x86_64.S
+	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+
+linuxinit.i386: $(srcdir)/tests/boot/linuxinit-i386.S
+	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+
+linux-initramfs.%: linuxinit.% Makefile
+	TDIR=`mktemp -d`; (cp $< $$TDIR/init; cd $$TDIR; echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@; rm -rf $$TDIR
+
+CLEANFILES += linuxinit.i386 linuxinit.x86_64 linux-initramfs.i386 linux-initramfs.x86_64
+
+bootcheck-linux-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg grub-shell
+	timeout -s KILL 30s ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-linux-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg grub-shell
+	timeout -s KILL 30s ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+BOOTCHECKS+=bootcheck-linux-i386 bootcheck-linux-x86_64
+
+.PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64
diff --git a/tests/boot/linux.cfg b/tests/boot/linux.cfg
new file mode 100644
index 000000000..201de99fd
--- /dev/null
+++ b/tests/boot/linux.cfg
@@ -0,0 +1,3 @@
+linux /linux console=ttyS0 root=/dev/ram0
+initrd /initrd
+boot
diff --git a/tests/boot/linux16.cfg b/tests/boot/linux16.cfg
new file mode 100644
index 000000000..ed0a50872
--- /dev/null
+++ b/tests/boot/linux16.cfg
@@ -0,0 +1,3 @@
+linux16 /linux console=ttyS0 root=/dev/ram0
+initrd16 /initrd
+boot
diff --git a/tests/boot/linuxinit-i386.S b/tests/boot/linuxinit-i386.S
new file mode 100644
index 000000000..a79a5787e
--- /dev/null
+++ b/tests/boot/linuxinit-i386.S
@@ -0,0 +1,55 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#define SYSCALL_WRITE 4
+#define SYSCALL_RESET 88
+#define SYSCALL_EXIT 1
+#define SYSCALL_INT 0x80
+
+#define STDOUT 1
+#define SHUTDOWN_MAGIC1 0xfee1dead
+#define SHUTDOWN_MAGIC2 0x28121969
+#define SHUTDOWN_MAGIC3 0x4321fedc
+
+	.text
+	.global start, _start
+_start:
+start:
+	/* write.  */
+	movl $SYSCALL_WRITE, %eax
+	movl $STDOUT, %ebx
+	leal message, %ecx
+	movl $(messageend-message), %edx
+	int $SYSCALL_INT
+
+	/* shutdown.  */
+	movl $SYSCALL_RESET, %eax
+	movl $SHUTDOWN_MAGIC1, %ebx
+	movl $SHUTDOWN_MAGIC2, %ecx
+	movl $SHUTDOWN_MAGIC3, %edx
+	int $SYSCALL_INT
+
+	/* exit (1). Shouldn't be reached.  */
+	movl $SYSCALL_EXIT, %eax
+	movl $1, %ebx
+	int $SYSCALL_INT
+	.data
+message:
+	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
+messageend:
+	
\ No newline at end of file
diff --git a/tests/boot/linuxinit-x86_64.S b/tests/boot/linuxinit-x86_64.S
new file mode 100644
index 000000000..17ba8040c
--- /dev/null
+++ b/tests/boot/linuxinit-x86_64.S
@@ -0,0 +1,54 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#define SYSCALL_WRITE 1
+#define SYSCALL_RESET 169
+#define SYSCALL_EXIT 60
+
+#define STDOUT 1
+#define SHUTDOWN_MAGIC1 0xfee1dead
+#define SHUTDOWN_MAGIC2 0x28121969
+#define SHUTDOWN_MAGIC3 0x4321fedc
+
+	.text
+	.global start, _start
+_start:
+start:
+	/* write.  */
+	movq $SYSCALL_WRITE, %rax
+	movq $STDOUT, %rdi
+	leaq message, %rsi
+	movq $(messageend-message), %rdx
+	syscall
+
+	/* shutdown.  */
+	movq $SYSCALL_RESET, %rax
+	movq $SHUTDOWN_MAGIC1, %rdi
+	movq $SHUTDOWN_MAGIC2, %rsi
+	movq $SHUTDOWN_MAGIC3, %rdx
+	syscall
+
+	/* exit(1). Shouldn't be reached.  */
+	movq $SYSCALL_EXIT, %rax
+	movq $1, %rdi
+	syscall
+	.data
+message:
+	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
+messageend:
+	
\ No newline at end of file
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index e6fef8313..ee0cded55 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -44,7 +44,9 @@ Run GRUB script in a Qemu instance.
   -v, --version           print the version information and exit
   --boot=[fd|hd|cd]       boot method for Qemu instance
   --modules=MODULES       pre-load specified modules MODULES
+  --qemu=FILE             Name of qemu binary
   --qemu-opts=OPTIONS     extra options to pass to Qemu instance
+  --files=FILES           add files to the image
 
 $0 runs input GRUB script or SOURCE file in a Qemu instance and prints
 its output.
@@ -53,6 +55,9 @@ Report bugs to <bug-grub@gnu.org>.
 EOF
 }
 
+boot=bios-hd
+qemu=qemu-system-i386
+
 # Check the arguments.
 for option in "$@"; do
     case "$option" in
@@ -65,14 +70,19 @@ for option in "$@"; do
     --modules=*)
 	ms=`echo "$option" | sed -e 's/--modules=//' -e 's/,/ /g'`
 	modules="$modules $ms" ;;
+    --files=*)
+	fls=`echo "$option" | sed -e 's/--files=//' -e 's/,/ /g'`
+	files="$files $fls" ;;
+    --qemu=*)
+	qemu=`echo "$option" | sed -e 's/--qemu=//' -e 's/,/ /g'`;;
     --qemu-opts=*)
         qs=`echo "$option" | sed -e 's/--qemu-opts=//'`
         qemuopts="$qemuopts $qs" ;;
     --boot=*)
         dev=`echo "$option" | sed -e 's/--boot=//'`
-	if   [ "$dev" = "fd" ] ; then bootdev=a;
-	elif [ "$dev" = "hd" ] ; then bootdev=c;
-	elif [ "$dev" = "cd" ] ; then bootdev=d;
+	if   [ "$dev" = "bios-fd" ] ; then boot=bios-fd;
+	elif [ "$dev" = "bios-hd" ] ; then boot=bios-hd;
+	elif [ "$dev" = "bios-cd" ] ; then boot=bios-cd;
 	else
 	    echo "Unrecognized boot method \`$dev'" 1>&2
 	    usage
@@ -100,10 +110,6 @@ if [ "x${source}" = x ] ; then
     source=${tmpfile}
 fi
 
-if [ "x${bootdev}" = x ] ; then
-    bootdev=c # default is boot as disk image
-fi
-
 cfgfile=`mktemp`
 cat <<EOF >${cfgfile}
 grubshell=yes
@@ -123,23 +129,28 @@ source /boot/grub/testcase.cfg
 halt
 EOF
 
-isofile=`mktemp`
-grub-mkrescue --output=${isofile} --override-directory=${builddir} \
-  /boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \
-  >/dev/null 2>&1
+if [ x$boot = xbios-hd ] || [ x$boot = xbios-fd ] || [ x$boot = xbios-cd ]; then
+    isofile=`mktemp`
+    grub-mkrescue --output=${isofile} --override-directory=${builddir} \
+	/boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \
+	${files} >/dev/null 2>&1
+    if [ x$boot = xbios-hd ]; then
+	device=hda
+	bootdev=c
+    fi
+    if [ x$boot = xbios-cd ]; then
+	device=cdrom
+	bootdev=d
+    fi
+    if [ x$boot = xbios-fd ]; then
+	device=fda
+	bootdev=a
+    fi
+    ${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} -boot ${bootdev} | tr -d "\r"
+    rm -f ${isofile}
+fi
 
-hdafile=`mktemp`
-cp ${isofile} ${hdafile}
-
-fdafile=`mktemp`
-cp ${isofile} ${fdafile}
-
-outfile=`mktemp`
-qemu-system-i386 ${qemuopts} -nographic -serial stdio -hda ${hdafile} -fda ${fdafile} -cdrom ${isofile} -boot ${bootdev} | tr -d "\r" >${outfile}
-
-cat $outfile
-
-rm -f ${tmpfile} ${outfile} ${cfgfile} ${isofile} ${hdafile} ${fdafile}
+rm -f ${tmpfile} ${cfgfile}
 exit 0
 
 

From 8040619d881d40059292ff7e8f92882eea77ac7d Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Mon, 18 Jan 2010 07:49:50 +0000
Subject: [PATCH 0307/1628] 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>

	* include/grub/i386/linux.h (GRUB_VIDEO_TYPE_TEXT): Rename to ...
	(GRUB_VIDEO_LINUX_TYPE_TEXT): ... this.  Update all users.
	(GRUB_VIDEO_TYPE_VLFB): Rename to ...
	(GRUB_VIDEO_LINUX_TYPE_VESA): ... this.  Update all users.
	(GRUB_VIDEO_TYPE_EFI): Rename to ...
	(GRUB_VIDEO_LINUX_TYPE_SIMPLE): ... this.  Update all users.
---
 ChangeLog                 | 9 +++++++++
 include/grub/i386/linux.h | 6 +++---
 loader/i386/efi/linux.c   | 4 ++--
 loader/i386/linux.c       | 6 +++---
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9ef3d3d42..a53cf9279 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* include/grub/i386/linux.h (GRUB_VIDEO_TYPE_TEXT): Rename to ...
+	(GRUB_VIDEO_LINUX_TYPE_TEXT): ... this.  Update all users.
+	(GRUB_VIDEO_TYPE_VLFB): Rename to ...
+	(GRUB_VIDEO_LINUX_TYPE_VESA): ... this.  Update all users.
+	(GRUB_VIDEO_TYPE_EFI): Rename to ...
+	(GRUB_VIDEO_LINUX_TYPE_SIMPLE): ... this.  Update all users.
+
 2010-01-17  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* include/grub/test.h: Add license header.
diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
index 8a5a84da3..f02a722d6 100644
--- a/include/grub/i386/linux.h
+++ b/include/grub/i386/linux.h
@@ -79,9 +79,9 @@ struct grub_e820_mmap
   grub_uint32_t type;
 } __attribute__((packed));
 
-#define GRUB_VIDEO_TYPE_TEXT	0x01
-#define GRUB_VIDEO_TYPE_VLFB	0x23    /* VESA VGA in graphic mode     */
-#define GRUB_VIDEO_TYPE_EFI	0x70
+#define GRUB_VIDEO_LINUX_TYPE_TEXT	0x01
+#define GRUB_VIDEO_LINUX_TYPE_VESA	0x23    /* VESA VGA in graphic mode.  */
+#define GRUB_VIDEO_LINUX_TYPE_SIMPLE	0x70    /* Linear framebuffer without any additional functions.  */
 
 /* For the Linux/i386 boot protocol version 2.03.  */
 struct linux_kernel_header
diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c
index 1abcc06db..2e26f3929 100644
--- a/loader/i386/efi/linux.c
+++ b/loader/i386/efi/linux.c
@@ -587,7 +587,7 @@ grub_linux_setup_video (struct linux_kernel_params *params)
   params->reserved_mask_size = 8;
   params->reserved_field_pos = 24;
 
-  params->have_vga = GRUB_VIDEO_TYPE_VLFB;
+  params->have_vga = GRUB_VIDEO_LINUX_TYPE_VESA;
   params->vid_mode = 0x338;  /* 1024x768x32  */
 
   return 0;
@@ -852,7 +852,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
     else if (grub_memcmp (argv[i], "video=efifb", 11) == 0)
       {
 	if (params->have_vga)
-	  params->have_vga = GRUB_VIDEO_TYPE_EFI;
+	  params->have_vga = GRUB_VIDEO_LINUX_TYPE_SIMPLE;
       }
 
   /* Specify the boot file.  */
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 7712bf2bf..a81e84135 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -538,16 +538,16 @@ grub_linux_boot (void)
     }
 
   if (! grub_linux_setup_video (params))
-    params->have_vga = GRUB_VIDEO_TYPE_VLFB;
+    params->have_vga = GRUB_VIDEO_LINUX_TYPE_VESA;
   else
     {
-      params->have_vga = GRUB_VIDEO_TYPE_TEXT;
+      params->have_vga = GRUB_VIDEO_LINUX_TYPE_TEXT;
       params->video_width = 80;
       params->video_height = 25;
     }
 
   /* Initialize these last, because terminal position could be affected by printfs above.  */
-  if (params->have_vga == GRUB_VIDEO_TYPE_TEXT)
+  if (params->have_vga == GRUB_VIDEO_LINUX_TYPE_TEXT)
     {
       grub_term_output_t term;
       int found = 0;

From 5d615a77ce6af16ce4ee36f1ff54992df311d853 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 18 Jan 2010 11:14:04 +0100
Subject: [PATCH 0308/1628] kfreebsd-i386 boot test support

---
 conf/common.rmk                               |  1 +
 conf/i386-pc.rmk                              |  4 +-
 conf/i386.rmk                                 | 26 +++++--
 tests/boot/kfreebsd.cfg                       |  6 ++
 tests/boot/kfreebsd.init-i386.S               | 74 +++++++++++++++++++
 tests/boot/linux.cfg                          |  2 +
 .../{linuxinit-i386.S => linux.init-i386.S}   |  0
 tests/boot/linux16.cfg                        |  2 +
 8 files changed, 105 insertions(+), 10 deletions(-)
 create mode 100644 tests/boot/kfreebsd.cfg
 create mode 100644 tests/boot/kfreebsd.init-i386.S
 rename tests/boot/{linuxinit-i386.S => linux.init-i386.S} (100%)

diff --git a/conf/common.rmk b/conf/common.rmk
index 905024a55..14fe54200 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -697,6 +697,7 @@ grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(sr
 
 # Randomly generated
 SUCCESSFUL_BOOT_STRING=3e49994fd5d82b7c9298d672d774080d
+BOOTCHECK_TIMEOUT=60
 
 bootcheck: $(BOOTCHECKS)
 
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 33575a87c..f01cba620 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -371,10 +371,10 @@ endif
 BOOTTARGET=bios-cd
 
 bootcheck-linux16-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg grub-shell
-	timeout -s KILL 30s ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 bootcheck-linux16-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg grub-shell
-	timeout -s KILL 30s ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 BOOTCHECKS+=bootcheck-linux16-i386 bootcheck-linux16-x86_64
 
diff --git a/conf/i386.rmk b/conf/i386.rmk
index 9305bf09c..3743191be 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -45,20 +45,30 @@ multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
 linuxinit.x86_64: $(srcdir)/tests/boot/linuxinit-x86_64.S
 	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 
-linuxinit.i386: $(srcdir)/tests/boot/linuxinit-i386.S
+linux.init.i386: $(srcdir)/tests/boot/linux.init-i386.S
 	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 
-linux-initramfs.%: linuxinit.% Makefile
-	TDIR=`mktemp -d`; (cp $< $$TDIR/init; cd $$TDIR; echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@; rm -rf $$TDIR
+kfreebsd.init.i386: $(srcdir)/tests/boot/kfreebsd.init-i386.S
+	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
+
+linux-initramfs.%: linux.init.% Makefile
+	TDIR=`mktemp -d`; cp $< $$TDIR/init; (cd $$TDIR; echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@; rm -rf $$TDIR
+
+kfreebsd-mfsroot.%: kfreebsd.init.% Makefile
+	TDIR=`mktemp -d`; mkdir $$TDIR/dev; mkdir $$TDIR/sbin; cp $< $$TDIR/sbin/init; makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR; rm -rf $$TDIR
+
+CLEANFILES += linux.init.i386 kfreebsd.init.i386 linux.init.x86_64 linux-initramfs.i386 linux-initramfs.x86_64
+
+bootcheck-kfreebsd-i386: kfreebsd-mfsroot.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/mfsroot=kfreebsd-mfsroot.i386 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.i386 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
-CLEANFILES += linuxinit.i386 linuxinit.x86_64 linux-initramfs.i386 linux-initramfs.x86_64
 
 bootcheck-linux-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg grub-shell
-	timeout -s KILL 30s ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 bootcheck-linux-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg grub-shell
-	timeout -s KILL 30s ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
-BOOTCHECKS+=bootcheck-linux-i386 bootcheck-linux-x86_64
+BOOTCHECKS+=bootcheck-linux-i386 bootcheck-linux-x86_64 bootcheck-kfreebsd-i386
 
-.PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64
+.PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 bootcheck-kfreebsd-i386
diff --git a/tests/boot/kfreebsd.cfg b/tests/boot/kfreebsd.cfg
new file mode 100644
index 000000000..71b97b67e
--- /dev/null
+++ b/tests/boot/kfreebsd.cfg
@@ -0,0 +1,6 @@
+kfreebsd /kfreebsd -h
+kfreebsd_loadenv /kfreebsd_env
+kfreebsd_module /mfsroot type=mfs_root
+boot
+# Shouln't happen
+halt
diff --git a/tests/boot/kfreebsd.init-i386.S b/tests/boot/kfreebsd.init-i386.S
new file mode 100644
index 000000000..8812b650b
--- /dev/null
+++ b/tests/boot/kfreebsd.init-i386.S
@@ -0,0 +1,74 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#define MODE_RDRW 2
+#define FLAGS_NONE 0
+#define SYSCALL_OPEN 5
+#define SYSCALL_WRITE 4
+#define SYSCALL_RESET 55
+#define SYSCALL_EXIT 1
+#define SYSCALL_INT 0x80
+
+#define RESET_NOSYNC 0x4
+#define RESET_HALT 0x8
+#define RESET_POWEROFF 0x4000
+
+	.section ".init", "ax"
+	.global start,_start
+start:
+_start:
+	/* open.  */
+	movl $SYSCALL_OPEN, %eax
+	pushl $FLAGS_NONE
+	pushl $MODE_RDRW
+	leal device, %ebx
+	pushl %ebx
+	pushl $0
+	int $SYSCALL_INT
+	addl $16, %esp
+	movl %eax, %ecx
+
+	/* write.  */
+	movl $SYSCALL_WRITE, %eax
+	pushl $(messageend-message)
+	leal message, %ebx
+	pushl %ebx
+	pushl %ecx
+	pushl $0
+	int $SYSCALL_INT
+	addl $16, %esp
+	
+	/* shutdown.  */
+	movl $SYSCALL_RESET, %eax
+	pushl $(RESET_POWEROFF|RESET_HALT|RESET_NOSYNC)
+	pushl $0
+	int $SYSCALL_INT
+	addl $8, %esp
+
+	/* exit (1). Shouldn't be reached.  */
+	movl $SYSCALL_EXIT, %eax
+	pushl $1
+	pushl $0
+	int $SYSCALL_INT
+device:
+	.ascii "/dev/console"
+	.byte 0
+message:
+	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
+messageend:
+	
\ No newline at end of file
diff --git a/tests/boot/linux.cfg b/tests/boot/linux.cfg
index 201de99fd..f5bf6ac7d 100644
--- a/tests/boot/linux.cfg
+++ b/tests/boot/linux.cfg
@@ -1,3 +1,5 @@
 linux /linux console=ttyS0 root=/dev/ram0
 initrd /initrd
 boot
+# Shouln't happen
+halt
diff --git a/tests/boot/linuxinit-i386.S b/tests/boot/linux.init-i386.S
similarity index 100%
rename from tests/boot/linuxinit-i386.S
rename to tests/boot/linux.init-i386.S
diff --git a/tests/boot/linux16.cfg b/tests/boot/linux16.cfg
index ed0a50872..d7fbf961c 100644
--- a/tests/boot/linux16.cfg
+++ b/tests/boot/linux16.cfg
@@ -1,3 +1,5 @@
 linux16 /linux console=ttyS0 root=/dev/ram0
 initrd16 /initrd
 boot
+# Shouln't happen
+halt

From 0db3ae3ce643451359c42515149c576be11177e9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 18 Jan 2010 11:38:28 +0100
Subject: [PATCH 0309/1628] Add bootcheck for kfreebsd-x86_64

---
 conf/i386.rmk                                 | 11 +++-
 tests/boot/kfreebsd.init-x86_64.S             | 62 +++++++++++++++++++
 ...linuxinit-x86_64.S => linux.init-x86_64.S} |  0
 3 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 tests/boot/kfreebsd.init-x86_64.S
 rename tests/boot/{linuxinit-x86_64.S => linux.init-x86_64.S} (100%)

diff --git a/conf/i386.rmk b/conf/i386.rmk
index 3743191be..919337e2a 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -48,6 +48,9 @@ linuxinit.x86_64: $(srcdir)/tests/boot/linuxinit-x86_64.S
 linux.init.i386: $(srcdir)/tests/boot/linux.init-i386.S
 	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 
+kfreebsd.init.x86_64: $(srcdir)/tests/boot/kfreebsd.init-x86_64.S
+	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
+
 kfreebsd.init.i386: $(srcdir)/tests/boot/kfreebsd.init-i386.S
 	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
 
@@ -62,6 +65,8 @@ CLEANFILES += linux.init.i386 kfreebsd.init.i386 linux.init.x86_64 linux-initram
 bootcheck-kfreebsd-i386: kfreebsd-mfsroot.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/mfsroot=kfreebsd-mfsroot.i386 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.i386 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
+bootcheck-kfreebsd-x86_64: kfreebsd-mfsroot.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/mfsroot=kfreebsd-mfsroot.x86_64 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 bootcheck-linux-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
@@ -69,6 +74,8 @@ bootcheck-linux-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(src
 bootcheck-linux-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
-BOOTCHECKS+=bootcheck-linux-i386 bootcheck-linux-x86_64 bootcheck-kfreebsd-i386
+BOOTCHECKS+=bootcheck-linux-i386 bootcheck-linux-x86_64 \
+	bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64
 
-.PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 bootcheck-kfreebsd-i386
+.PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
+	bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64
diff --git a/tests/boot/kfreebsd.init-x86_64.S b/tests/boot/kfreebsd.init-x86_64.S
new file mode 100644
index 000000000..edff0d782
--- /dev/null
+++ b/tests/boot/kfreebsd.init-x86_64.S
@@ -0,0 +1,62 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#define MODE_RDRW 2
+#define FLAGS_NONE 0
+#define SYSCALL_OPEN 5
+#define SYSCALL_WRITE 4
+#define SYSCALL_RESET 55
+#define SYSCALL_EXIT 1
+
+#define RESET_NOSYNC 0x4
+#define RESET_HALT 0x8
+#define RESET_POWEROFF 0x4000
+
+	.section ".init", "ax"
+	.global start,_start
+start:
+_start:
+	/* open.  */
+	movq $SYSCALL_OPEN, %rax
+	leaq device, %rdi
+	movq $MODE_RDRW, %rsi
+	movq $FLAGS_NONE, %rdx
+	syscall
+	movq %rax, %rdi
+
+	/* write.  */
+	movq $SYSCALL_WRITE, %rax
+	leaq message, %rsi
+	movq $(messageend-message), %rdx
+	syscall
+	
+	/* shutdown.  */
+	movq $SYSCALL_RESET, %rax
+	movq $(RESET_POWEROFF|RESET_HALT|RESET_NOSYNC), %rdi
+	syscall
+
+	/* exit (1). Shouldn't be reached.  */
+	movq $SYSCALL_EXIT, %rax
+	movq $1, %rdi
+	syscall
+device:
+	.ascii "/dev/console"
+	.byte 0
+message:
+	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
+messageend:
diff --git a/tests/boot/linuxinit-x86_64.S b/tests/boot/linux.init-x86_64.S
similarity index 100%
rename from tests/boot/linuxinit-x86_64.S
rename to tests/boot/linux.init-x86_64.S

From c5545cf8baa2220d20fe6b861bf3dd47e08b5c9a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 18 Jan 2010 12:00:00 +0100
Subject: [PATCH 0310/1628] Fix linux-x86_64 bootchecks

---
 conf/i386.rmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/i386.rmk b/conf/i386.rmk
index 919337e2a..515c50fc6 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -42,7 +42,7 @@ multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
 multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
-linuxinit.x86_64: $(srcdir)/tests/boot/linuxinit-x86_64.S
+linux.init.x86_64: $(srcdir)/tests/boot/linux.init-x86_64.S
 	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 
 linux.init.i386: $(srcdir)/tests/boot/linux.init-i386.S

From 3de254033ca9d010fbaedb0ea12f4e84e049e46b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 18 Jan 2010 12:01:13 +0100
Subject: [PATCH 0311/1628] Fix x86_64-efi compilation

---
 lib/relocator.c   | 8 ++++----
 loader/i386/bsd.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index a02bca332..0644691cd 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -635,9 +635,9 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
         struct grub_relocator_chunk *chunk;
 	for (chunk = rel->chunks; chunk; chunk = chunk->next)
 	  {
-	    grub_dprintf ("relocator", "chunk %p->%p, 0x%x\n", 
+	    grub_dprintf ("relocator", "chunk %p->%p, 0x%lx\n", 
 			  (void *) chunk->src, (void *) chunk->target,
-			  chunk->size);
+			  (unsigned long) chunk->size);
 	    nchunks++;
 	    count[(chunk->src & 0xff) + 1]++;
 	  }
@@ -679,9 +679,9 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
 
   for (j = 0; j < nchunks; j++)
     {
-      grub_dprintf ("relocator", "sorted chunk %p->%p, 0x%x\n", 
+      grub_dprintf ("relocator", "sorted chunk %p->%p, 0x%lx\n", 
 		    (void *) sorted[j].src, (void *) sorted[j].target,
-		    sorted[j].size);
+		    (unsigned long) sorted[j].size);
       if (sorted[j].src < sorted[j].target)
 	{
 	  grub_cpu_relocator_backward ((void *) rels,
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 28f1c685a..d019f21db 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -351,7 +351,7 @@ grub_bsd_add_mmap (void)
 
   generate_e820_mmap (NULL, &cnt, buf);
 
-  grub_dprintf ("bsd", "%u entries in smap\n", cnt);
+  grub_dprintf ("bsd", "%u entries in smap\n", (unsigned) cnt);
   if (kernel_type == KERNEL_TYPE_NETBSD)
     grub_bsd_add_meta (NETBSD_BTINFO_MEMMAP, buf0, len);
   else

From 2997c41ffd1bb3c27e9ed3dd0b3ae25da4986e39 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 18 Jan 2010 16:58:31 +0530
Subject: [PATCH 0312/1628] update copyright year

---
 util/grub-script-check.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index bfb44c511..3bfd6a425 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -1,7 +1,7 @@
 /* grub-script-check.c - check grub script file for syntax errors */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2003,2004,2005,2006,2007,2008,2009,2010  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

From 5756bfe137343d93af6d1bad4f065be725808a63 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 18 Jan 2010 12:45:28 +0100
Subject: [PATCH 0313/1628] Fix regression in kfreebsd-i386

---
 loader/i386/bsd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index d019f21db..73fe8cc77 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -705,7 +705,7 @@ grub_freebsd_boot (void)
 	grub_fatal ("cannot exit boot services");
 #endif
 
-      grub_memcpy (&stack[8], &bi, sizeof (bi));
+      grub_memcpy (&stack[9], &bi, sizeof (bi));
       state.eip = entry;
       state.esp = stack_target;
       stack[0] = entry; /* "Return" address.  */

From 935842dd5666058010967e85b7522c256ace0234 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 18 Jan 2010 13:32:56 +0100
Subject: [PATCH 0314/1628] Always put smap after kern_end for freebsd

---
 loader/i386/bsd.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 73fe8cc77..7f9617543 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -220,6 +220,25 @@ grub_bsd_add_meta (grub_uint32_t type, void *data, grub_uint32_t len)
   newtag->next = NULL;
   if (len)
     grub_memcpy (newtag->data, data, len);
+
+  if (kernel_type == KERNEL_TYPE_FREEBSD 
+      && type == (FREEBSD_MODINFO_METADATA | FREEBSD_MODINFOMD_SMAP))
+    {
+      struct bsd_tag *p;
+      for (p = tags;
+	   p->type != (FREEBSD_MODINFO_METADATA | FREEBSD_MODINFOMD_KERNEND);
+	   p = p->next);
+
+      if (p)
+	{
+	  newtag->next = p->next;
+	  p->next = newtag;
+	  if (newtag->next == NULL)
+	    tags_last = newtag;
+	  return GRUB_ERR_NONE;
+	}
+    }
+
   if (tags_last)
     tags_last->next = newtag;
   else

From 88d170128f13c6cd31c9e164fe6bc656d94ffb7c Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Mon, 18 Jan 2010 13:45:40 +0000
Subject: [PATCH 0315/1628] 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>

	Fix annoying UI bug in rescue mode.  Thanks to Tristan Gingold for
	spotting it back in 2008.  Shame on me for forgetting he did.

	* kern/rescue_reader.c (grub_rescue_run): Skip zero-length lines.
---
 ChangeLog            | 7 +++++++
 kern/rescue_reader.c | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a53cf9279..df7f90587 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+
+	Fix annoying UI bug in rescue mode.  Thanks to Tristan Gingold for
+	spotting it back in 2008.  Shame on me for forgetting he did.
+
+	* kern/rescue_reader.c (grub_rescue_run): Skip zero-length lines.
+
 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* include/grub/i386/linux.h (GRUB_VIDEO_TYPE_TEXT): Rename to ...
diff --git a/kern/rescue_reader.c b/kern/rescue_reader.c
index 732124b1a..f573cf41f 100644
--- a/kern/rescue_reader.c
+++ b/kern/rescue_reader.c
@@ -1,7 +1,7 @@
 /* rescue_reader.c - rescue mode reader  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2009,2010  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
@@ -83,7 +83,7 @@ grub_rescue_run (void)
       grub_errno = GRUB_ERR_NONE;
 
       grub_rescue_read_line (&line, 0);
-      if (! line)
+      if (! line || line[0] == '\0')
 	continue;
 
       grub_parser_get_current ()->parse_line (line, grub_rescue_read_line);

From a2eaee157c8ccab8e7200fe1fb248dcf8dd74218 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 18 Jan 2010 19:49:19 +0530
Subject: [PATCH 0316/1628] Add missing ChangeLog entry for -r2078

---
 ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index df7f90587..963d91514 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-18  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	Added new tool, grub-scrit-check to verify grub.cfg syntax.
+
+	* util/grub-script-check.c: grub-script-check tool.
+	* conf/common.rmk: Make rules for grub-script-check.
+
 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
 
 	Fix annoying UI bug in rescue mode.  Thanks to Tristan Gingold for

From 1ef7e2992dd55808333ad1acc8ebe77bd962e5a7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 18 Jan 2010 16:03:57 +0100
Subject: [PATCH 0317/1628] =?UTF-8?q?Fix=20mismerge=20resulting=20in=20gho?=
 =?UTF-8?q?st=20multiboot=20module.=20Reported=20by:=20Gr=C3=A9goire=20Sut?=
 =?UTF-8?q?re.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 loader/i386/multiboot.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index 8186e8cca..3c743c85f 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -303,11 +303,6 @@ grub_module  (int argc, char *argv[])
   if (err)
     goto fail;
 
-  err = grub_multiboot_add_module ((grub_addr_t) module, size,
-				   argc - 1, argv + 1);
-  if (err)
-    goto fail;
-
   if (grub_file_read (file, module, size) != size)
     {
       grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file");

From 2cb6be4bc2f0b4e5ab366116698451f2d862c899 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Mon, 18 Jan 2010 16:08:25 +0000
Subject: [PATCH 0318/1628] 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>

	* loader/i386/efi/linux.c (grub_cmd_linux): Stop pretending we're
	ELILO.  This is no longer necessary.
---
 ChangeLog               | 5 +++++
 loader/i386/efi/linux.c | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 963d91514..f44ecc714 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* loader/i386/efi/linux.c (grub_cmd_linux): Stop pretending we're
+	ELILO.  This is no longer necessary.
+
 2010-01-18  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Added new tool, grub-scrit-check to verify grub.cfg syntax.
diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c
index 2e26f3929..053c3ed22 100644
--- a/loader/i386/efi/linux.c
+++ b/loader/i386/efi/linux.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2006,2007,2008,2009,2010  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
@@ -676,8 +676,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
       goto fail;
     }
 
-  /* XXX Linux assumes that only elilo can boot Linux on EFI!!!  */
-  params->type_of_loader = (LINUX_LOADER_ID_ELILO << 4);
+  params->type_of_loader = (LINUX_LOADER_ID_GRUB << 4);
 
   params->cl_magic = GRUB_LINUX_CL_MAGIC;
   params->cl_offset = 0x1000;

From b2cab848777f66daa9fab089575805639d9eb213 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Mon, 18 Jan 2010 16:22:03 +0000
Subject: [PATCH 0319/1628] 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>

	* acinclude.m4: Remove `nop' assembly instruction; it's not
	implemented by all architectures.
---
 ChangeLog    | 5 +++++
 acinclude.m4 | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f44ecc714..8d117a5c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* acinclude.m4: Remove `nop' assembly instruction; it's not
+	implemented by all architectures.
+
 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* loader/i386/efi/linux.c (grub_cmd_linux): Stop pretending we're
diff --git a/acinclude.m4 b/acinclude.m4
index 6f9baf18f..36a3b3e08 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -18,7 +18,7 @@ AC_DEFUN(grub_PROG_TARGET_CC,
 [AC_MSG_CHECKING([whether target compiler is working])
 AC_CACHE_VAL(grub_cv_prog_target_cc,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-asm (".globl start; start: nop");
+asm (".globl start; start:");
 int main (void);
 ]], [[]])],
   		[grub_cv_prog_target_cc=yes],

From 262bff8d83bed88171cc2002d700a6bae75ba885 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 18 Jan 2010 17:40:23 +0100
Subject: [PATCH 0320/1628] 2010-01-18  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Add missing *BSD copyright headers.

	* include/grub/aout.h: Add BSD licence.
	* include/grub/i386/bsd.h: Parts under different licences moved to ...
	* include/grub/i386/freebsd_linker.h: ... here,
	* include/grub/i386/freebsd_reboot.h: ... here,
	* include/grub/i386/netbsd_bootinfo.h: ... here,
	* include/grub/i386/netbsd_reboot.h: ... here,
	* include/grub/i386/openbsd_bootarg.h: ... here,
	* include/grub/i386/openbsd_reboot.h: ... and here. Added appropriate
	licence to each file.
---
 ChangeLog                           |  14 ++
 include/grub/aout.h                 |  32 +++++
 include/grub/i386/bsd.h             | 193 ++--------------------------
 include/grub/i386/freebsd_linker.h  |  74 +++++++++++
 include/grub/i386/freebsd_reboot.h  |  77 +++++++++++
 include/grub/i386/netbsd_bootinfo.h | 112 ++++++++++++++++
 include/grub/i386/netbsd_reboot.h   |  81 ++++++++++++
 include/grub/i386/openbsd_bootarg.h |  72 +++++++++++
 include/grub/i386/openbsd_reboot.h  |  79 ++++++++++++
 9 files changed, 553 insertions(+), 181 deletions(-)
 create mode 100644 include/grub/i386/freebsd_linker.h
 create mode 100644 include/grub/i386/freebsd_reboot.h
 create mode 100644 include/grub/i386/netbsd_bootinfo.h
 create mode 100644 include/grub/i386/netbsd_reboot.h
 create mode 100644 include/grub/i386/openbsd_bootarg.h
 create mode 100644 include/grub/i386/openbsd_reboot.h

diff --git a/ChangeLog b/ChangeLog
index 8d117a5c4..633ebd62a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Add missing *BSD copyright headers.
+
+	* include/grub/aout.h: Add BSD licence.
+	* include/grub/i386/bsd.h: Parts under different licences moved to ...
+	* include/grub/i386/freebsd_linker.h: ... here,
+	* include/grub/i386/freebsd_reboot.h: ... here,
+	* include/grub/i386/netbsd_bootinfo.h: ... here,
+	* include/grub/i386/netbsd_reboot.h: ... here,
+	* include/grub/i386/openbsd_bootarg.h: ... here,
+	* include/grub/i386/openbsd_reboot.h: ... and here. Added appropriate
+	licence to each file.
+
 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* acinclude.m4: Remove `nop' assembly instruction; it's not
diff --git a/include/grub/aout.h b/include/grub/aout.h
index c5650ddf8..04e85f8b0 100644
--- a/include/grub/aout.h
+++ b/include/grub/aout.h
@@ -16,6 +16,38 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*-
+ * Copyright (c) 1992, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      from: @(#)exec.h        8.1 (Berkeley) 6/11/93
+ * $FreeBSD$
+ */
+
 #ifndef GRUB_AOUT_HEADER
 #define GRUB_AOUT_HEADER 1
 
diff --git a/include/grub/i386/bsd.h b/include/grub/i386/bsd.h
index 8ffaf7d18..53db09e61 100644
--- a/include/grub/i386/bsd.h
+++ b/include/grub/i386/bsd.h
@@ -20,6 +20,13 @@
 #define GRUB_BSD_CPU_HEADER	1
 
 #include <grub/types.h>
+#include <grub/freebsd_reboot.h>
+#include <grub/netbsd_reboot.h>
+#include <grub/openbsd_reboot.h>
+#include <grub/freebsd_linker.h>
+#include <grub/netbsd_bootinfo.h>
+#include <grub/openbsd_bootarg.h>
+
 
 enum bsd_kernel_types
   {
@@ -31,62 +38,15 @@ enum bsd_kernel_types
 
 #define GRUB_BSD_TEMP_BUFFER   0x80000
 
-#define FREEBSD_RB_ASKNAME	(1 << 0)  /* ask for file name to reboot from */
-#define FREEBSD_RB_SINGLE       (1 << 1)  /* reboot to single user only */
-#define FREEBSD_RB_NOSYNC       (1 << 2)  /* dont sync before reboot */
-#define FREEBSD_RB_HALT         (1 << 3)  /* don't reboot, just halt */
-#define FREEBSD_RB_INITNAME     (1 << 4)  /* name given for /etc/init (unused) */
-#define FREEBSD_RB_DFLTROOT     (1 << 5)  /* use compiled-in rootdev */
-#define FREEBSD_RB_KDB          (1 << 6)  /* give control to kernel debugger */
-#define FREEBSD_RB_RDONLY       (1 << 7)  /* mount root fs read-only */
-#define FREEBSD_RB_DUMP         (1 << 8)  /* dump kernel memory before reboot */
-#define FREEBSD_RB_MINIROOT     (1 << 9)  /* mini-root present in memory at boot time */
-#define FREEBSD_RB_CONFIG       (1 << 10) /* invoke user configuration routing */
-#define FREEBSD_RB_VERBOSE      (1 << 11) /* print all potentially useful info */
-#define FREEBSD_RB_SERIAL       (1 << 12) /* user serial port as console */
-#define FREEBSD_RB_CDROM        (1 << 13) /* use cdrom as root */
-#define FREEBSD_RB_GDB		(1 << 15) /* use GDB remote debugger instead of DDB */
-#define FREEBSD_RB_MUTE		(1 << 16) /* Come up with the console muted */
-#define FREEBSD_RB_PAUSE	(1 << 20)
-#define FREEBSD_RB_QUIET	(1 << 21)
-#define FREEBSD_RB_NOINTR	(1 << 28)
-#define FREENSD_RB_MULTIPLE	(1 << 29)  /* Use multiple consoles */
-#define FREEBSD_RB_DUAL		FREENSD_RB_MULTIPLE
-#define FREEBSD_RB_BOOTINFO     (1 << 31) /* have `struct bootinfo *' arg */
-
-#define FREEBSD_B_DEVMAGIC	0xa0000000
-#define FREEBSD_B_SLICESHIFT	20
-#define FREEBSD_B_UNITSHIFT	16
-#define FREEBSD_B_PARTSHIFT	8
-#define FREEBSD_B_TYPESHIFT	0
+#define FREEBSD_B_DEVMAGIC	OPENBSD_B_DEVMAGIC
+#define FREEBSD_B_SLICESHIFT	OPENBSD_B_CTRLSHIFT
+#define FREEBSD_B_UNITSHIFT	OPENBSD_B_UNITSHIFT
+#define FREEBSD_B_PARTSHIFT	OPENBSD_B_PARTSHIFT
+#define FREEBSD_B_TYPESHIFT	OPENBSD_B_TYPESHIFT
 
 #define FREEBSD_BOOTINFO_VERSION 1
 #define FREEBSD_N_BIOS_GEOM	8
 
-#define FREEBSD_MODINFO_END		0x0000	/* End of list */
-#define FREEBSD_MODINFO_NAME		0x0001	/* Name of module (string) */
-#define FREEBSD_MODINFO_TYPE		0x0002	/* Type of module (string) */
-#define FREEBSD_MODINFO_ADDR		0x0003	/* Loaded address */
-#define FREEBSD_MODINFO_SIZE		0x0004	/* Size of module */
-#define FREEBSD_MODINFO_EMPTY		0x0005	/* Has been deleted */
-#define FREEBSD_MODINFO_ARGS		0x0006	/* Parameters string */
-#define FREEBSD_MODINFO_METADATA	0x8000	/* Module-specfic */
-
-#define FREEBSD_MODINFOMD_AOUTEXEC	0x0001	/* a.out exec header */
-#define FREEBSD_MODINFOMD_ELFHDR	0x0002	/* ELF header */
-#define FREEBSD_MODINFOMD_SSYM		0x0003	/* start of symbols */
-#define FREEBSD_MODINFOMD_ESYM		0x0004	/* end of symbols */
-#define FREEBSD_MODINFOMD_DYNAMIC	0x0005	/* _DYNAMIC pointer */
-#define FREEBSD_MODINFOMD_ENVP		0x0006	/* envp[] */
-#define FREEBSD_MODINFOMD_HOWTO		0x0007	/* boothowto */
-#define FREEBSD_MODINFOMD_KERNEND	0x0008	/* kernend */
-#define FREEBSD_MODINFOMD_SHDR		0x0009	/* section header table */
-#define FREEBSD_MODINFOMD_NOCOPY	0x8000	/* don't copy this metadata to the kernel */
-
-#define FREEBSD_MODINFOMD_SMAP		0x1001
-
-#define FREEBSD_MODINFOMD_DEPLIST	(0x4001 | FREEBSD_MODINFOMD_NOCOPY)  /* depends on */
-
 #define FREEBSD_MODTYPE_KERNEL		"elf kernel"
 #define FREEBSD_MODTYPE_KERNEL64	"elf64 kernel"
 #define FREEBSD_MODTYPE_ELF_MODULE	"elf module"
@@ -113,44 +73,6 @@ struct grub_freebsd_bootinfo
   grub_uint32_t bi_modulep;
 } __attribute__ ((packed));
 
-#define OPENBSD_RB_ASKNAME	(1 << 0)  /* ask for file name to reboot from */
-#define OPENBSD_RB_SINGLE	(1 << 1)  /* reboot to single user only */
-#define OPENBSD_RB_NOSYNC	(1 << 2)  /* dont sync before reboot */
-#define OPENBSD_RB_HALT		(1 << 3)  /* don't reboot, just halt */
-#define OPENBSD_RB_INITNAME	(1 << 4)  /* name given for /etc/init (unused) */
-#define OPENBSD_RB_DFLTROOT	(1 << 5)  /* use compiled-in rootdev */
-#define OPENBSD_RB_KDB		(1 << 6)  /* give control to kernel debugger */
-#define OPENBSD_RB_RDONLY	(1 << 7)  /* mount root fs read-only */
-#define OPENBSD_RB_DUMP		(1 << 8)  /* dump kernel memory before reboot */
-#define OPENBSD_RB_MINIROOT	(1 << 9)  /* mini-root present in memory at boot time */
-#define OPENBSD_RB_CONFIG	(1 << 10) /* change configured devices */
-#define OPENBSD_RB_TIMEBAD	(1 << 11) /* don't call resettodr() in boot() */
-#define OPENBSD_RB_POWERDOWN	(1 << 12) /* attempt to power down machine */
-#define OPENBSD_RB_SERCONS	(1 << 13) /* use serial console if available */
-#define OPENBSD_RB_USERREQ	(1 << 14) /* boot() called at user request (e.g. ddb) */
-
-#define OPENBSD_B_DEVMAGIC	0xa0000000
-#define OPENBSD_B_ADAPTORSHIFT	24
-#define OPENBSD_B_CTRLSHIFT	20
-#define OPENBSD_B_UNITSHIFT	16
-#define OPENBSD_B_PARTSHIFT	8
-#define OPENBSD_B_TYPESHIFT	0
-
-#define OPENBSD_BOOTARG_APIVER	(OPENBSD_BAPIV_VECTOR | \
-                                 OPENBSD_BAPIV_ENV | \
-                                 OPENBSD_BAPIV_BMEMMAP)
-
-#define OPENBSD_BAPIV_ANCIENT	0x0  /* MD old i386 bootblocks */
-#define OPENBSD_BAPIV_VARS	0x1  /* MD structure w/ add info passed */
-#define OPENBSD_BAPIV_VECTOR	0x2  /* MI vector of MD structures passed */
-#define OPENBSD_BAPIV_ENV	0x4  /* MI environment vars vector */
-#define OPENBSD_BAPIV_BMEMMAP	0x8  /* MI memory map passed is in bytes */
-
-#define OPENBSD_BOOTARG_ENV	0x1000
-#define OPENBSD_BOOTARG_END	-1
-
-#define	OPENBSD_BOOTARG_MMAP	0
-
 struct grub_openbsd_bios_mmap
 {
   grub_uint64_t addr;
@@ -162,97 +84,6 @@ struct grub_openbsd_bios_mmap
   grub_uint32_t type;
 };
 
-struct grub_openbsd_bootargs
-{
-  int ba_type;
-  int ba_size;
-  struct grub_openbsd_bootargs *ba_next;
-} __attribute__ ((packed));
-
-#define NETBSD_RB_AUTOBOOT	0  /* flags for system auto-booting itself */
-
-#define NETBSD_RB_ASKNAME	(1 << 0)  /* ask for file name to reboot from */
-#define NETBSD_RB_SINGLE	(1 << 1)  /* reboot to single user only */
-#define NETBSD_RB_NOSYNC	(1 << 2)  /* dont sync before reboot */
-#define NETBSD_RB_HALT		(1 << 3)  /* don't reboot, just halt */
-#define NETBSD_RB_INITNAME	(1 << 4)  /* name given for /etc/init (unused) */
-#define NETBSD_RB_UNUSED1	(1 << 5)  /* was RB_DFLTROOT, obsolete */
-#define NETBSD_RB_KDB		(1 << 6)  /* give control to kernel debugger */
-#define NETBSD_RB_RDONLY	(1 << 7)  /* mount root fs read-only */
-#define NETBSD_RB_DUMP		(1 << 8)  /* dump kernel memory before reboot */
-#define NETBSD_RB_MINIROOT	(1 << 9)  /* mini-root present in memory at boot time */
-#define NETBSD_RB_STRING	(1 << 10) /* use provided bootstr */
-#define NETBSD_RB_POWERDOWN     ((1 << 11) | RB_HALT) /* turn power off (or at least halt) */
-#define NETBSD_RB_USERCONFIG	(1 << 12) /* change configured devices */
-
-#define NETBSD_AB_NORMAL	0  /* boot normally (default) */
-
-#define NETBSD_AB_QUIET		(1 << 16) /* boot quietly */
-#define NETBSD_AB_VERBOSE	(1 << 17) /* boot verbosely */
-#define NETBSD_AB_SILENT	(1 << 18) /* boot silently */
-#define NETBSD_AB_DEBUG		(1 << 19) /* boot with debug messages */
-#define NETBSD_AB_NOSMP		(1 << 28) /* Boot without SMP support.  */
-#define NETBSD_AB_NOACPI        (1 << 29) /* Boot without ACPI support.  */
-
-struct grub_netbsd_bootinfo
-{
-  grub_uint32_t bi_count;
-  void *bi_data[1];
-};
-
-#define NETBSD_BTINFO_BOOTPATH		0
-#define NETBSD_BTINFO_ROOTDEVICE	1
-#define NETBSD_BTINFO_BOOTDISK		3
-#define NETBSD_BTINFO_MEMMAP		9
-
-struct grub_netbsd_btinfo_common
-{
-  int len;
-  int type;
-};
-
-struct grub_netbsd_btinfo_mmap_header
-{
-  struct grub_netbsd_btinfo_common common;
-  grub_uint32_t count;
-};
-
-struct grub_netbsd_btinfo_mmap_entry
-{
-  grub_uint64_t addr;
-  grub_uint64_t len;
-#define	NETBSD_MMAP_AVAILABLE	1
-#define	NETBSD_MMAP_RESERVED 	2
-#define	NETBSD_MMAP_ACPI	3
-#define	NETBSD_MMAP_NVS 	4
-  grub_uint32_t type;
-};
-
-struct grub_netbsd_btinfo_bootpath
-{
-  struct grub_netbsd_btinfo_common common;
-  char bootpath[80];
-};
-
-struct grub_netbsd_btinfo_rootdevice
-{
-  struct grub_netbsd_btinfo_common common;
-  char devname[16];
-};
-
-struct grub_netbsd_btinfo_bootdisk
-{
-  struct grub_netbsd_btinfo_common common;
-  int labelsector;  /* label valid if != -1 */
-  struct
-    {
-      grub_uint16_t type, checksum;
-      char packname[16];
-    } label;
-  int biosdev;
-  int partition;
-};
-
 void grub_unix_real_boot (grub_addr_t entry, ...)
      __attribute__ ((cdecl,noreturn));
 grub_err_t grub_freebsd_load_elfmodule32 (grub_file_t file, int argc,
diff --git a/include/grub/i386/freebsd_linker.h b/include/grub/i386/freebsd_linker.h
new file mode 100644
index 000000000..3c1eb64b6
--- /dev/null
+++ b/include/grub/i386/freebsd_linker.h
@@ -0,0 +1,74 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/>.
+ */
+
+/*-
+ * Copyright (c) 1997-2000 Doug Rabson
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: stable/8/sys/sys/linker.h 199583 2009-11-20 15:27:52Z jhb $
+ */
+
+#ifndef GRUB_FREEBSD_LINKER_CPU_HEADER
+#define GRUB_FREEBSD_LINKER_CPU_HEADER	1
+
+#define FREEBSD_MODINFO_END		0x0000	/* End of list */
+#define FREEBSD_MODINFO_NAME		0x0001	/* Name of module (string) */
+#define FREEBSD_MODINFO_TYPE		0x0002	/* Type of module (string) */
+#define FREEBSD_MODINFO_ADDR		0x0003	/* Loaded address */
+#define FREEBSD_MODINFO_SIZE		0x0004	/* Size of module */
+#define FREEBSD_MODINFO_EMPTY		0x0005	/* Has been deleted */
+#define FREEBSD_MODINFO_ARGS		0x0006	/* Parameters string */
+#define FREEBSD_MODINFO_METADATA	0x8000	/* Module-specfic */
+
+#define FREEBSD_MODINFOMD_AOUTEXEC	0x0001	/* a.out exec header */
+#define FREEBSD_MODINFOMD_ELFHDR	0x0002	/* ELF header */
+#define FREEBSD_MODINFOMD_SSYM		0x0003	/* start of symbols */
+#define FREEBSD_MODINFOMD_ESYM		0x0004	/* end of symbols */
+#define FREEBSD_MODINFOMD_DYNAMIC	0x0005	/* _DYNAMIC pointer */
+#define FREEBSD_MODINFOMD_ENVP		0x0006	/* envp[] */
+#define FREEBSD_MODINFOMD_HOWTO		0x0007	/* boothowto */
+#define FREEBSD_MODINFOMD_KERNEND	0x0008	/* kernend */
+#define FREEBSD_MODINFOMD_SHDR		0x0009	/* section header table */
+#define FREEBSD_MODINFOMD_NOCOPY	0x8000	/* don't copy this metadata to the kernel */
+
+#define FREEBSD_MODINFOMD_SMAP		0x1001
+
+#define FREEBSD_MODINFOMD_DEPLIST	(0x4001 | FREEBSD_MODINFOMD_NOCOPY)  /* depends on */
+
+#endif
diff --git a/include/grub/i386/freebsd_reboot.h b/include/grub/i386/freebsd_reboot.h
new file mode 100644
index 000000000..9c17f6efa
--- /dev/null
+++ b/include/grub/i386/freebsd_reboot.h
@@ -0,0 +1,77 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/>.
+ */
+
+/*-
+ * Copyright (c) 1982, 1986, 1988, 1993, 1994
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      @(#)reboot.h    8.3 (Berkeley) 12/13/94
+ * $FreeBSD: stable/8/sys/sys/reboot.h 199583 2009-11-20 15:27:52Z jhb $
+ */
+
+#ifndef GRUB_FREEBSD_REBOOT_CPU_HEADER
+#define GRUB_FREEBSD_REBOOT_CPU_HEADER	1
+
+#define FREEBSD_RB_ASKNAME	(1 << 0)  /* ask for file name to reboot from */
+#define FREEBSD_RB_SINGLE       (1 << 1)  /* reboot to single user only */
+#define FREEBSD_RB_NOSYNC       (1 << 2)  /* dont sync before reboot */
+#define FREEBSD_RB_HALT         (1 << 3)  /* don't reboot, just halt */
+#define FREEBSD_RB_INITNAME     (1 << 4)  /* name given for /etc/init (unused) */
+#define FREEBSD_RB_DFLTROOT     (1 << 5)  /* use compiled-in rootdev */
+#define FREEBSD_RB_KDB          (1 << 6)  /* give control to kernel debugger */
+#define FREEBSD_RB_RDONLY       (1 << 7)  /* mount root fs read-only */
+#define FREEBSD_RB_DUMP         (1 << 8)  /* dump kernel memory before reboot */
+#define FREEBSD_RB_MINIROOT     (1 << 9)  /* mini-root present in memory at boot time */
+#define FREEBSD_RB_CONFIG       (1 << 10) /* invoke user configuration routing */
+#define FREEBSD_RB_VERBOSE      (1 << 11) /* print all potentially useful info */
+#define FREEBSD_RB_SERIAL       (1 << 12) /* user serial port as console */
+#define FREEBSD_RB_CDROM        (1 << 13) /* use cdrom as root */
+#define FREEBSD_RB_GDB		(1 << 15) /* use GDB remote debugger instead of DDB */
+#define FREEBSD_RB_MUTE		(1 << 16) /* Come up with the console muted */
+#define FREEBSD_RB_PAUSE	(1 << 20)
+#define FREEBSD_RB_QUIET	(1 << 21)
+#define FREEBSD_RB_NOINTR	(1 << 28)
+#define FREENSD_RB_MULTIPLE	(1 << 29)  /* Use multiple consoles */
+#define FREEBSD_RB_DUAL		FREENSD_RB_MULTIPLE
+#define FREEBSD_RB_BOOTINFO     (1 << 31) /* have `struct bootinfo *' arg */
+
+#endif
diff --git a/include/grub/i386/netbsd_bootinfo.h b/include/grub/i386/netbsd_bootinfo.h
new file mode 100644
index 000000000..776ecf3b0
--- /dev/null
+++ b/include/grub/i386/netbsd_bootinfo.h
@@ -0,0 +1,112 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/>.
+ */
+
+/*	$NetBSD: bootinfo.h,v 1.16 2009/08/24 02:15:46 jmcneill Exp $	*/
+
+/*
+ * Copyright (c) 1997
+ *	Matthias Drochner.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef GRUB_NETBSD_BOOTINFO_CPU_HEADER
+#define GRUB_NETBSD_BOOTINFO_CPU_HEADER	1
+
+#include <grub/types.h>
+
+
+#define NETBSD_BTINFO_BOOTPATH		0
+#define NETBSD_BTINFO_ROOTDEVICE	1
+#define NETBSD_BTINFO_BOOTDISK		3
+#define NETBSD_BTINFO_MEMMAP		9
+
+struct grub_netbsd_btinfo_common
+{
+  int len;
+  int type;
+};
+
+struct grub_netbsd_btinfo_mmap_header
+{
+  struct grub_netbsd_btinfo_common common;
+  grub_uint32_t count;
+};
+
+struct grub_netbsd_btinfo_mmap_entry
+{
+  grub_uint64_t addr;
+  grub_uint64_t len;
+#define	NETBSD_MMAP_AVAILABLE	1
+#define	NETBSD_MMAP_RESERVED 	2
+#define	NETBSD_MMAP_ACPI	3
+#define	NETBSD_MMAP_NVS 	4
+  grub_uint32_t type;
+};
+
+struct grub_netbsd_btinfo_bootpath
+{
+  struct grub_netbsd_btinfo_common common;
+  char bootpath[80];
+};
+
+struct grub_netbsd_btinfo_rootdevice
+{
+  struct grub_netbsd_btinfo_common common;
+  char devname[16];
+};
+
+struct grub_netbsd_btinfo_bootdisk
+{
+  struct grub_netbsd_btinfo_common common;
+  int labelsector;  /* label valid if != -1 */
+  struct
+    {
+      grub_uint16_t type, checksum;
+      char packname[16];
+    } label;
+  int biosdev;
+  int partition;
+};
+
+struct grub_netbsd_bootinfo
+{
+  grub_uint32_t bi_count;
+  void *bi_data[1];
+};
+
+#endif
diff --git a/include/grub/i386/netbsd_reboot.h b/include/grub/i386/netbsd_reboot.h
new file mode 100644
index 000000000..ee82455bc
--- /dev/null
+++ b/include/grub/i386/netbsd_reboot.h
@@ -0,0 +1,81 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/>.
+ */
+
+/*	$NetBSD: reboot.h,v 1.25 2007/12/25 18:33:48 perry Exp $	*/
+
+/*
+ * Copyright (c) 1982, 1986, 1988, 1993, 1994
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)reboot.h	8.3 (Berkeley) 12/13/94
+ */
+
+#ifndef GRUB_NETBSD_REBOOT_CPU_HEADER
+#define GRUB_NETBSD_REBOOT_CPU_HEADER	1
+
+#define NETBSD_RB_AUTOBOOT	0  /* flags for system auto-booting itself */
+
+#define NETBSD_RB_ASKNAME	(1 << 0)  /* ask for file name to reboot from */
+#define NETBSD_RB_SINGLE	(1 << 1)  /* reboot to single user only */
+#define NETBSD_RB_NOSYNC	(1 << 2)  /* dont sync before reboot */
+#define NETBSD_RB_HALT		(1 << 3)  /* don't reboot, just halt */
+#define NETBSD_RB_INITNAME	(1 << 4)  /* name given for /etc/init (unused) */
+#define NETBSD_RB_UNUSED1	(1 << 5)  /* was RB_DFLTROOT, obsolete */
+#define NETBSD_RB_KDB		(1 << 6)  /* give control to kernel debugger */
+#define NETBSD_RB_RDONLY	(1 << 7)  /* mount root fs read-only */
+#define NETBSD_RB_DUMP		(1 << 8)  /* dump kernel memory before reboot */
+#define NETBSD_RB_MINIROOT	(1 << 9)  /* mini-root present in memory at boot time */
+#define NETBSD_RB_STRING	(1 << 10) /* use provided bootstr */
+#define NETBSD_RB_POWERDOWN     ((1 << 11) | RB_HALT) /* turn power off (or at least halt) */
+#define NETBSD_RB_USERCONFIG	(1 << 12) /* change configured devices */
+
+#define NETBSD_AB_NORMAL	0  /* boot normally (default) */
+
+#define NETBSD_AB_QUIET		(1 << 16) /* boot quietly */
+#define NETBSD_AB_VERBOSE	(1 << 17) /* boot verbosely */
+#define NETBSD_AB_SILENT	(1 << 18) /* boot silently */
+#define NETBSD_AB_DEBUG		(1 << 19) /* boot with debug messages */
+#define NETBSD_AB_NOSMP		(1 << 28) /* Boot without SMP support.  */
+#define NETBSD_AB_NOACPI        (1 << 29) /* Boot without ACPI support.  */
+
+
+#endif
diff --git a/include/grub/i386/openbsd_bootarg.h b/include/grub/i386/openbsd_bootarg.h
new file mode 100644
index 000000000..ccbe1ca12
--- /dev/null
+++ b/include/grub/i386/openbsd_bootarg.h
@@ -0,0 +1,72 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/>.
+ */
+
+/*      $OpenBSD: bootarg.h,v 1.11 2003/06/02 20:20:54 mickey Exp $     */
+     
+/*
+ * Copyright (c) 1996-1999 Michael Shalayeff
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GRUB_OPENBSD_BOOTARG_CPU_HEADER
+#define GRUB_OPENBSD_BOOTARG_CPU_HEADER	1
+
+#define OPENBSD_BOOTARG_APIVER	(OPENBSD_BAPIV_VECTOR | \
+                                 OPENBSD_BAPIV_ENV | \
+                                 OPENBSD_BAPIV_BMEMMAP)
+
+#define OPENBSD_BAPIV_ANCIENT	0x0  /* MD old i386 bootblocks */
+#define OPENBSD_BAPIV_VARS	0x1  /* MD structure w/ add info passed */
+#define OPENBSD_BAPIV_VECTOR	0x2  /* MI vector of MD structures passed */
+#define OPENBSD_BAPIV_ENV	0x4  /* MI environment vars vector */
+#define OPENBSD_BAPIV_BMEMMAP	0x8  /* MI memory map passed is in bytes */
+
+#define OPENBSD_BOOTARG_ENV	0x1000
+#define OPENBSD_BOOTARG_END	-1
+
+#define	OPENBSD_BOOTARG_MMAP	0
+
+struct grub_openbsd_bootargs
+{
+  int ba_type;
+  int ba_size;
+  struct grub_openbsd_bootargs *ba_next;
+} __attribute__ ((packed));
+
+#endif
diff --git a/include/grub/i386/openbsd_reboot.h b/include/grub/i386/openbsd_reboot.h
new file mode 100644
index 000000000..3f6571a44
--- /dev/null
+++ b/include/grub/i386/openbsd_reboot.h
@@ -0,0 +1,79 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/>.
+ */
+
+/*      $OpenBSD: reboot.h,v 1.13 2004/03/10 23:02:53 tom Exp $ */
+/*      $NetBSD: reboot.h,v 1.9 1996/04/22 01:23:25 christos Exp $      */
+
+/*
+ * Copyright (c) 1982, 1986, 1988, 1993, 1994
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *      @(#)reboot.h    8.2 (Berkeley) 7/10/94
+ */
+
+#ifndef GRUB_OPENBSD_REBOOT_CPU_HEADER
+#define GRUB_OPENBSD_REBOOT_CPU_HEADER	1
+
+#define OPENBSD_RB_ASKNAME	(1 << 0)  /* ask for file name to reboot from */
+#define OPENBSD_RB_SINGLE	(1 << 1)  /* reboot to single user only */
+#define OPENBSD_RB_NOSYNC	(1 << 2)  /* dont sync before reboot */
+#define OPENBSD_RB_HALT		(1 << 3)  /* don't reboot, just halt */
+#define OPENBSD_RB_INITNAME	(1 << 4)  /* name given for /etc/init (unused) */
+#define OPENBSD_RB_DFLTROOT	(1 << 5)  /* use compiled-in rootdev */
+#define OPENBSD_RB_KDB		(1 << 6)  /* give control to kernel debugger */
+#define OPENBSD_RB_RDONLY	(1 << 7)  /* mount root fs read-only */
+#define OPENBSD_RB_DUMP		(1 << 8)  /* dump kernel memory before reboot */
+#define OPENBSD_RB_MINIROOT	(1 << 9)  /* mini-root present in memory at boot time */
+#define OPENBSD_RB_CONFIG	(1 << 10) /* change configured devices */
+#define OPENBSD_RB_TIMEBAD	(1 << 11) /* don't call resettodr() in boot() */
+#define OPENBSD_RB_POWERDOWN	(1 << 12) /* attempt to power down machine */
+#define OPENBSD_RB_SERCONS	(1 << 13) /* use serial console if available */
+#define OPENBSD_RB_USERREQ	(1 << 14) /* boot() called at user request (e.g. ddb) */
+
+#define OPENBSD_B_DEVMAGIC	0xa0000000
+#define OPENBSD_B_ADAPTORSHIFT	24
+#define OPENBSD_B_CTRLSHIFT	20
+#define OPENBSD_B_UNITSHIFT	16
+#define OPENBSD_B_PARTSHIFT	8
+#define OPENBSD_B_TYPESHIFT	0
+
+#endif

From 6f7db5d676bee808d78e9775747d06abebb280b6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 18 Jan 2010 19:25:20 +0100
Subject: [PATCH 0321/1628] 2010-01-18  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* include/grub/i386/bsd.h: Fix include pathes.
---
 ChangeLog               |  4 ++++
 include/grub/i386/bsd.h | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 633ebd62a..7b22a6aea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/i386/bsd.h: Fix include pathes.
+
 2010-01-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Add missing *BSD copyright headers.
diff --git a/include/grub/i386/bsd.h b/include/grub/i386/bsd.h
index 53db09e61..e26c35652 100644
--- a/include/grub/i386/bsd.h
+++ b/include/grub/i386/bsd.h
@@ -20,12 +20,12 @@
 #define GRUB_BSD_CPU_HEADER	1
 
 #include <grub/types.h>
-#include <grub/freebsd_reboot.h>
-#include <grub/netbsd_reboot.h>
-#include <grub/openbsd_reboot.h>
-#include <grub/freebsd_linker.h>
-#include <grub/netbsd_bootinfo.h>
-#include <grub/openbsd_bootarg.h>
+#include <grub/i386/freebsd_reboot.h>
+#include <grub/i386/netbsd_reboot.h>
+#include <grub/i386/openbsd_reboot.h>
+#include <grub/i386/freebsd_linker.h>
+#include <grub/i386/netbsd_bootinfo.h>
+#include <grub/i386/openbsd_bootarg.h>
 
 
 enum bsd_kernel_types

From cba98e8dbc6744c7c947d7fa81949ec30f40442e Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Mon, 18 Jan 2010 19:31:10 +0000
Subject: [PATCH 0322/1628] 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>

	* commands/terminal.c (grub_cmd_terminal_input)
	(grub_cmd_terminal_output): Check return of terminal init()
	routines, and abort if errors are raised.
---
 ChangeLog           |  6 ++++++
 commands/terminal.c | 20 ++++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7b22a6aea..3111a9381 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* commands/terminal.c (grub_cmd_terminal_input)
+	(grub_cmd_terminal_output): Check return of terminal init()
+	routines, and abort if errors are raised.
+
 2010-01-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/i386/bsd.h: Fix include pathes.
diff --git a/commands/terminal.c b/commands/terminal.c
index b30f43130..bf4187180 100644
--- a/commands/terminal.c
+++ b/commands/terminal.c
@@ -112,10 +112,11 @@ grub_cmd_terminal_input (grub_command_t cmd __attribute__ ((unused)),
 	      break;
 	  if (term)
 	    {
+              if (term->init && term->init () != GRUB_ERR_NONE)
+                return grub_errno;
+
 	      grub_list_remove (GRUB_AS_LIST_P (&(grub_term_inputs_disabled)),
 				GRUB_AS_LIST (term));
-	      if (term->init)
-		term->init ();
 	      grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs),
 			      GRUB_AS_LIST (term));
 	    }
@@ -152,10 +153,11 @@ grub_cmd_terminal_input (grub_command_t cmd __attribute__ ((unused)),
 	  break;
       if (term)
 	{
+	  if (term->init && term->init () != GRUB_ERR_NONE)
+	    return grub_errno;
+
 	  grub_list_remove (GRUB_AS_LIST_P (&(grub_term_inputs_disabled)),
 			    GRUB_AS_LIST (term));
-	  if (term->init)
-	    term->init ();
 	  grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs),
 			  GRUB_AS_LIST (term));
 	}	
@@ -269,10 +271,11 @@ grub_cmd_terminal_output (grub_command_t cmd __attribute__ ((unused)),
 	      break;
 	  if (term)
 	    {
+              if (term->init && term->init () != GRUB_ERR_NONE)
+                return grub_errno;
+
 	      grub_list_remove (GRUB_AS_LIST_P (&(grub_term_outputs_disabled)),
 				GRUB_AS_LIST (term));
-	      if (term->init)
-		term->init ();
 	      grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs),
 			      GRUB_AS_LIST (term));
 	    }
@@ -310,10 +313,11 @@ grub_cmd_terminal_output (grub_command_t cmd __attribute__ ((unused)),
 	  break;
       if (term)
 	{
+	  if (term->init && term->init () != GRUB_ERR_NONE)
+	    return grub_errno;
+
 	  grub_list_remove (GRUB_AS_LIST_P (&(grub_term_outputs_disabled)),
 			    GRUB_AS_LIST (term));
-	  if (term->init)
-	    term->init ();
 	  grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs),
 			  GRUB_AS_LIST (term));
 	}	

From 9444b678a11af01e6432353f0f456f8640d0aeb0 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Mon, 18 Jan 2010 19:43:39 +0000
Subject: [PATCH 0323/1628] 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>

	* include/grub/term.h (grub_term_register_input,
	grub_term_register_output): Check return of terminal init()
	routines, and abort if errors are raised.

	* commands/terminal.c: Update copyright year.
---
 ChangeLog           |  8 ++++++++
 commands/terminal.c |  2 +-
 include/grub/term.h | 12 +++++-------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3111a9381..40984c187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* include/grub/term.h (grub_term_register_input,
+	grub_term_register_output): Check return of terminal init()
+	routines, and abort if errors are raised.
+
+	* commands/terminal.c: Update copyright year.
+
 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* commands/terminal.c (grub_cmd_terminal_input)
diff --git a/commands/terminal.c b/commands/terminal.c
index bf4187180..e725123b8 100644
--- a/commands/terminal.c
+++ b/commands/terminal.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2009,2010  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
diff --git a/include/grub/term.h b/include/grub/term.h
index 3d644b848..143aabe1e 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -208,9 +208,8 @@ grub_term_register_input (const char *name __attribute__ ((unused)),
   else
     {
       /* If this is the first terminal, enable automatically.  */
-      if (term->init)
-        term->init ();
-      grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs), GRUB_AS_LIST (term));
+      if (! term->init || term->init () == GRUB_ERR_NONE)
+	grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs), GRUB_AS_LIST (term));
     }
 }
 
@@ -224,10 +223,9 @@ grub_term_register_output (const char *name __attribute__ ((unused)),
   else
     {
       /* If this is the first terminal, enable automatically.  */
-      if (term->init)
-	term->init ();
-      grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs),
-		      GRUB_AS_LIST (term));
+      if (! term->init || term->init () == GRUB_ERR_NONE)
+	grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs),
+			GRUB_AS_LIST (term));
     }
 }
 

From 41f683d45610aaa7e9da629a5388c386b7f2dd31 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Mon, 18 Jan 2010 20:20:34 +0000
Subject: [PATCH 0324/1628] 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>

	* include/grub/term.h (grub_term_register_input,
	grub_term_register_output): Check return of terminal init()
	routines, and abort if errors are raised.

	* commands/terminal.c: Update copyright year.
---
 ChangeLog.kernel-font | 7 +++++++
 conf/common.rmk       | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.kernel-font b/ChangeLog.kernel-font
index 576c85904..73f8a895e 100644
--- a/ChangeLog.kernel-font
+++ b/ChangeLog.kernel-font
@@ -1,3 +1,10 @@
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+
+	Fix parallel builds.
+
+	* conf/common.rmk (font/font.c_DEPENDENCIES): New variable (makes
+	font.c depend on ascii.h).
+
 2010-01-12  Carles Pina i Estany  <carles@pina.cat>
 
 	* Makefile.in (DUSE_ASCII_FAILBACK): New macro.
diff --git a/conf/common.rmk b/conf/common.rmk
index a83bd0fca..956ed8ec3 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -600,7 +600,7 @@ sh_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # Common Video Subsystem specific modules.
 pkglib_MODULES += video.mod videotest.mod bitmap.mod tga.mod jpeg.mod	\
-	png.mod	font.mod gfxterm.mod video_fb.mod
+	png.mod	gfxterm.mod video_fb.mod
 
 # For video.mod.
 video_mod_SOURCES = video/video.c
@@ -637,7 +637,8 @@ png_mod_SOURCES = video/readers/png.c
 png_mod_CFLAGS = $(COMMON_CFLAGS)
 png_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For font.mod.
+pkglib_MODULES += font.mod
+font/font.c_DEPENDENCIES = ascii.h
 font_mod_SOURCES = font/font_cmd.c font/font.c
 font_mod_CFLAGS = $(COMMON_CFLAGS)
 font_mod_LDFLAGS = $(COMMON_LDFLAGS)

From 5a6ff7ad4aa4c5d8637d1b5cb549758b620ede2c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 18 Jan 2010 22:29:25 +0100
Subject: [PATCH 0325/1628] kfreebsd-i386 bootcheck

---
 conf/i386.rmk                  |  20 ++++-
 tests/boot/knetbsd.cfg         |   5 ++
 tests/boot/knetbsd.init-i386.S | 134 +++++++++++++++++++++++++++++++++
 3 files changed, 156 insertions(+), 3 deletions(-)
 create mode 100644 tests/boot/knetbsd.cfg
 create mode 100644 tests/boot/knetbsd.init-i386.S

diff --git a/conf/i386.rmk b/conf/i386.rmk
index b1adb13d9..c9ba18b11 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -81,14 +81,26 @@ kfreebsd.init.x86_64: $(srcdir)/tests/boot/kfreebsd.init-x86_64.S
 kfreebsd.init.i386: $(srcdir)/tests/boot/kfreebsd.init-i386.S
 	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
 
-linux-initramfs.%: linux.init.% Makefile
+knetbsd.init.i386: $(srcdir)/tests/boot/knetbsd.init-i386.S
+	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+
+linux-initramfs.%: linux.init.%
 	TDIR=`mktemp -d`; cp $< $$TDIR/init; (cd $$TDIR; echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@; rm -rf $$TDIR
 
-kfreebsd-mfsroot.%: kfreebsd.init.% Makefile
+kfreebsd-mfsroot.%: kfreebsd.init.%
 	TDIR=`mktemp -d`; mkdir $$TDIR/dev; mkdir $$TDIR/sbin; cp $< $$TDIR/sbin/init; makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR; rm -rf $$TDIR
 
+knetbsd.image.%: knetbsd.init.%
+	TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
+
+knetbsd.miniroot-image.i386: knetbsd.image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386
+	$(OBJCOPY) --add-section=miniroot=$< $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386 $@
+
 CLEANFILES += linux.init.i386 kfreebsd.init.i386 linux.init.x86_64 linux-initramfs.i386 linux-initramfs.x86_64
 
+bootcheck-knetbsd-i386: knetbsd.miniroot-image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg knetbsd.miniroot-image.i386 grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/miniroot=knetbsd.miniroot-image.i386 --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
 bootcheck-kfreebsd-i386: kfreebsd-mfsroot.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/mfsroot=kfreebsd-mfsroot.i386 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.i386 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
@@ -102,7 +114,9 @@ bootcheck-linux-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 BOOTCHECKS+=bootcheck-linux-i386 bootcheck-linux-x86_64 \
-	bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64
+	bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \
+	bootcheck-knetbsd-i386
 
 .PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
 	bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64
+	bootcheck-knetbsd-i386
\ No newline at end of file
diff --git a/tests/boot/knetbsd.cfg b/tests/boot/knetbsd.cfg
new file mode 100644
index 000000000..ad2258dce
--- /dev/null
+++ b/tests/boot/knetbsd.cfg
@@ -0,0 +1,5 @@
+knetbsd /knetbsd -h
+knetbsd_module_elf /miniroot
+boot
+# Shouln't happen
+halt
diff --git a/tests/boot/knetbsd.init-i386.S b/tests/boot/knetbsd.init-i386.S
new file mode 100644
index 000000000..200aed01f
--- /dev/null
+++ b/tests/boot/knetbsd.init-i386.S
@@ -0,0 +1,134 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#define MODE_RDRW 2
+#define FLAGS_NONE 0
+#define SYSCALL_OPEN 5
+#define SYSCALL_WRITE 4
+#define SYSCALL_RESET 208
+#define SYSCALL_EXIT 1
+#define SYSCALL_MKNOD 14
+#define SYSCALL_MOUNT 410
+#define SYSCALL_INT 0x80
+
+#define RESET_NOSYNC 0x4
+#define RESET_HALT 0x8
+#define RESET_POWEROFF 0x800
+
+	.section ".init", "ax"
+	.global start,_start
+start:
+_start:
+	/* mount.  */
+	movl $SYSCALL_MOUNT, %eax
+	push $(tmpfs_args_end - tmpfs_args)
+	push $tmpfs_args
+	push $0
+	push $devfsdir
+	push $devfstype
+	pushl $0
+	int $SYSCALL_INT
+	addl $20, %esp
+
+	/* mknod.  */
+	movl $SYSCALL_MKNOD, %eax
+	pushl $0
+	pushl $0x2140
+	leal device, %ebx
+	pushl %ebx
+	pushl $0
+	int $SYSCALL_INT
+	addl $16, %esp
+
+	/* open.  */
+	movl $SYSCALL_OPEN, %eax
+	pushl $FLAGS_NONE
+	pushl $MODE_RDRW
+	leal device, %ebx
+	pushl %ebx
+	pushl $0
+	int $SYSCALL_INT
+	addl $16, %esp
+	movl %eax, %ecx
+
+	/* write.  */
+	movl $SYSCALL_WRITE, %eax
+	pushl $(messageend-message)
+	leal message, %ebx
+	pushl %ebx
+	pushl %ecx
+	pushl $0
+	int $SYSCALL_INT
+	addl $16, %esp
+
+	/* shutdown.  */
+	movl $SYSCALL_RESET, %eax
+	pushl $haltmsg
+	pushl $(RESET_POWEROFF|RESET_HALT|RESET_NOSYNC)
+	pushl $0
+	int $SYSCALL_INT
+	addl $8, %esp
+
+	/* exit (1). Shouldn't be reached.  */
+	movl $SYSCALL_EXIT, %eax
+	pushl $1
+	pushl $0
+	int $SYSCALL_INT
+	.section ".fini", "ax"
+1:	jmp 1b
+	.section ".text", "ax"
+1:	jmp 1b
+	/* This section is needed for NetBSD to identify the binary.  */
+	.section ".note.netbsd.ident", "a"
+	.long 0x7
+	.long 0x4
+	.long 0x1
+	.ascii "NetBSD"
+	.byte 0
+	.data
+device:
+	.ascii "/dev/console"
+	.byte 0
+message:
+	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
+messageend:
+haltmsg:
+	.ascii "Machine halted"
+	.byte 0
+devfstype:
+	.ascii "tmpfs"
+	.byte 0
+devfsdir:
+	.ascii "/dev"
+	.byte 0
+tmpfs_args:
+	/* Version.  */
+	.long 1
+
+	/* Maximum inodes.  */
+	.quad 	0
+	/* Maximum size.  */
+	.quad   0
+
+	/* UID */
+	.long		0
+	/* GID */
+	.long 		0
+	/* Mode */
+	.long		0777
+tmpfs_args_end:	
\ No newline at end of file

From 4df7b90f9434e341fd0402acb578d11b44eb5de3 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Mon, 18 Jan 2010 22:07:05 +0000
Subject: [PATCH 0326/1628] Add (unused) mode_mask parameter to
 grub_video_sm712_setup()

---
 video/sm712.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/video/sm712.c b/video/sm712.c
index 5383b695e..1e0f59b9d 100644
--- a/video/sm712.c
+++ b/video/sm712.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2005,2006,2007,2008,2009,2010  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
@@ -62,7 +62,7 @@ grub_video_sm712_video_fini (void)
 
 static grub_err_t
 grub_video_sm712_setup (unsigned int width, unsigned int height,
-			unsigned int mode_type)
+			unsigned int mode_type, unsigned int mode_mask __attribute__ ((unused)))
 {
   int depth;
   grub_err_t err;

From 96c713b69da081ad76f1c6cca2bcd9123b54e956 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 18 Jan 2010 23:37:11 +0100
Subject: [PATCH 0327/1628] Eliminate variable-length types in parameters

---
 include/grub/i386/netbsd_bootinfo.h | 8 ++++----
 include/grub/i386/openbsd_bootarg.h | 6 +++---
 loader/i386/bsd.c                   | 6 ++++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/include/grub/i386/netbsd_bootinfo.h b/include/grub/i386/netbsd_bootinfo.h
index 5cda9d570..fd429a251 100644
--- a/include/grub/i386/netbsd_bootinfo.h
+++ b/include/grub/i386/netbsd_bootinfo.h
@@ -60,7 +60,7 @@
 struct grub_netbsd_bootinfo
 {
   grub_uint32_t bi_count;
-  grub_addr_t bi_data[0];
+  grub_uint32_t bi_data[0];
 };
 
 struct grub_netbsd_btinfo_common
@@ -73,14 +73,14 @@ struct grub_netbsd_btinfo_common
 
 struct grub_netbsd_btinfo_bootdisk
 {
-  int labelsector;  /* label valid if != -1 */
+  grub_uint32_t labelsector;  /* label valid if != 0xffffffff */
   struct
     {
       grub_uint16_t type, checksum;
       char packname[16];
     } label;
-  int biosdev;
-  int partition;
+  grub_uint32_t biosdev;
+  grub_uint32_t partition;
 };
 
 struct grub_netbsd_btinfo_symtab
diff --git a/include/grub/i386/openbsd_bootarg.h b/include/grub/i386/openbsd_bootarg.h
index ccbe1ca12..cd99b14f2 100644
--- a/include/grub/i386/openbsd_bootarg.h
+++ b/include/grub/i386/openbsd_bootarg.h
@@ -64,9 +64,9 @@
 
 struct grub_openbsd_bootargs
 {
-  int ba_type;
-  int ba_size;
-  struct grub_openbsd_bootargs *ba_next;
+  grub_uint32_t ba_type;
+  grub_uint32_t ba_size;
+  grub_uint32_t ba_next;
 } __attribute__ ((packed));
 
 #endif
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 7f9617543..ed9a1dbae 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -822,9 +822,11 @@ grub_openbsd_boot (void)
   buf = (grub_uint8_t *) pm;
 
   pa->ba_size = (char *) pm - (char *) pa;
-  pa->ba_next = (struct grub_openbsd_bootargs *) (buf - buf0 + buf_target);
-  pa = pa->ba_next;
+  pa->ba_next = buf - buf0 + buf_target;
+  pa = (struct grub_openbsd_bootargs *) buf;
   pa->ba_type = OPENBSD_BOOTARG_END;
+  pa->ba_size = 0;
+  pa->ba_next = 0;
   pa++;
 
   buf = (grub_uint8_t *) pa;

From 839aec66c9ea917276bb533e41a315c9a2e0e74e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 18 Jan 2010 23:57:10 +0100
Subject: [PATCH 0328/1628] make netbsd kernel symbols non-mandatory (not
 present on netbsd64)

---
 loader/i386/bsdXX.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/loader/i386/bsdXX.c b/loader/i386/bsdXX.c
index ccf386440..734633704 100644
--- a/loader/i386/bsdXX.c
+++ b/loader/i386/bsdXX.c
@@ -401,7 +401,7 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
 	break;
   if (s >= (Elf_Shdr *) ((char *) shdr
 			+ e.e_shnum * e.e_shentsize))
-    return grub_error (GRUB_ERR_BAD_OS, "no symbol table");
+    return GRUB_ERR_NONE;
   symsize = s->sh_size;
   symsh = s;
   s = (Elf_Shdr *) (shdr + e.e_shentsize * s->sh_link);

From a3e99e1a45ff211b6d2ec220ef477372672cd961 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 19 Jan 2010 09:16:26 +0100
Subject: [PATCH 0329/1628] Align kern_end on page boundary as a precaution

---
 loader/i386/bsd.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index ed9a1dbae..1d616c7b2 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -1008,7 +1008,7 @@ grub_netbsd_boot (void)
   err = grub_relocator_alloc_chunk_addr (relocator, &curarg,
 					 arg_target, tag_buf_len
 					 + sizeof (struct grub_netbsd_bootinfo)
-					 + tag_count * sizeof (grub_addr_t));
+					 + tag_count * sizeof (grub_uint32_t));
   if (err)
     return err;
 
@@ -1322,6 +1322,8 @@ grub_bsd_load (int argc, char *argv[])
       grub_file_close (file);
     }
 
+  kern_end = ALIGN_PAGE (kern_end);
+
 fail:
 
   if (grub_errno != GRUB_ERR_NONE)

From 2b9885e16bb2889baa42a9a782b8a10c4e735f4b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 19 Jan 2010 09:17:23 +0100
Subject: [PATCH 0330/1628] bootcheck-kfreebsd-x86_64

---
 conf/i386.rmk                    |  19 +++--
 tests/boot/knetbsd.init-x86_64.S | 124 +++++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+), 5 deletions(-)
 create mode 100644 tests/boot/knetbsd.init-x86_64.S

diff --git a/conf/i386.rmk b/conf/i386.rmk
index c9ba18b11..690194261 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -84,23 +84,32 @@ kfreebsd.init.i386: $(srcdir)/tests/boot/kfreebsd.init-i386.S
 knetbsd.init.i386: $(srcdir)/tests/boot/knetbsd.init-i386.S
 	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 
+knetbsd.init.x86_64: $(srcdir)/tests/boot/knetbsd.init-x86_64.S
+	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+
 linux-initramfs.%: linux.init.%
 	TDIR=`mktemp -d`; cp $< $$TDIR/init; (cd $$TDIR; echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@; rm -rf $$TDIR
 
 kfreebsd-mfsroot.%: kfreebsd.init.%
-	TDIR=`mktemp -d`; mkdir $$TDIR/dev; mkdir $$TDIR/sbin; cp $< $$TDIR/sbin/init; makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR; rm -rf $$TDIR
+	TDIR=`mktemp -d`; mkdir $$TDIR/dev; mkdir $$TDIR/sbin; cp $< $$TDIR/sbin/init; makefs -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR; rm -rf $$TDIR
 
 knetbsd.image.%: knetbsd.init.%
-	TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
+	TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
 
 knetbsd.miniroot-image.i386: knetbsd.image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386
 	$(OBJCOPY) --add-section=miniroot=$< $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386 $@
 
+knetbsd.miniroot-image.x86_64: knetbsd.image.x86_64 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.x86_64
+	$(OBJCOPY) --add-section=miniroot=$< $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.x86_64 $@
+
 CLEANFILES += linux.init.i386 kfreebsd.init.i386 linux.init.x86_64 linux-initramfs.i386 linux-initramfs.x86_64
 
 bootcheck-knetbsd-i386: knetbsd.miniroot-image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg knetbsd.miniroot-image.i386 grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/miniroot=knetbsd.miniroot-image.i386 --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
+bootcheck-knetbsd-x86_64: knetbsd.miniroot-image.x86_64 $(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/tests/boot/knetbsd.cfg knetbsd.miniroot-image.x86_64 grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/miniroot=knetbsd.miniroot-image.x86_64 --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
 bootcheck-kfreebsd-i386: kfreebsd-mfsroot.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/mfsroot=kfreebsd-mfsroot.i386 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.i386 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
@@ -115,8 +124,8 @@ bootcheck-linux-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64
 
 BOOTCHECKS+=bootcheck-linux-i386 bootcheck-linux-x86_64 \
 	bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \
-	bootcheck-knetbsd-i386
+	bootcheck-knetbsd-i386 bootcheck-knetbsd-x86_64
 
 .PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
-	bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64
-	bootcheck-knetbsd-i386
\ No newline at end of file
+	bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \
+	bootcheck-knetbsd-i386 bootcheck-knetbsd-x86_64
diff --git a/tests/boot/knetbsd.init-x86_64.S b/tests/boot/knetbsd.init-x86_64.S
new file mode 100644
index 000000000..e56174f9c
--- /dev/null
+++ b/tests/boot/knetbsd.init-x86_64.S
@@ -0,0 +1,124 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#define MODE_RDRW 2
+#define FLAGS_NONE 0
+#define SYSCALL_OPEN 5
+#define SYSCALL_WRITE 4
+#define SYSCALL_RESET 208
+#define SYSCALL_EXIT 1
+#define SYSCALL_MKNOD 14
+#define SYSCALL_MOUNT 410
+#define SYSCALL_INT 0x80
+
+#define RESET_NOSYNC 0x4
+#define RESET_HALT 0x8
+#define RESET_POWEROFF 0x800
+
+	.section ".init", "ax"
+	.global start,_start
+start:
+_start:
+	/* mount.  */
+	movq $SYSCALL_MOUNT, %rax
+	movq $devfstype, %rdi
+	movq $devfsdir, %rsi
+	movq $0, %rdx
+	movq $tmpfs_args, %r10
+	movq $(tmpfs_args_end - tmpfs_args), %r8
+	syscall
+
+	/* mknod.  */
+	movq $SYSCALL_MKNOD, %rax
+	leaq device, %rdi
+	movq $0x2140, %rsi
+	movq $0, %rdx
+	syscall
+
+	/* open.  */
+	movq $SYSCALL_OPEN, %rax
+	leaq device, %rdi
+	movq $MODE_RDRW, %rsi
+	movq $FLAGS_NONE, %rdx
+	syscall
+	movq %rax, %rdi
+
+	/* write.  */
+	movq $SYSCALL_WRITE, %rax
+	movq $(messageend-message), %rdx
+	leaq message, %rsi
+	syscall
+
+	/* shutdown.  */
+	movq $SYSCALL_RESET, %rax
+	movq $(RESET_POWEROFF|RESET_HALT|RESET_NOSYNC), %rdi
+	movq $haltmsg, %rsi
+	syscall
+
+	/* exit (1). Shouldn't be reached.  */
+	movq $SYSCALL_EXIT, %rax
+	movq $1, %rdi
+	syscall
+	.section ".fini", "ax"
+1:	jmp 1b
+	.section ".text", "ax"
+1:	jmp 1b
+	/* This section is needed for NetBSD to identify the binary.  */
+	.section ".note.netbsd.ident", "a"
+	.long 0x7
+	.long 0x4
+	.long 0x1
+	.ascii "NetBSD"
+	.byte 0
+	.data
+device:
+	.ascii "/dev/console"
+	.byte 0
+message:
+	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
+messageend:
+haltmsg:
+	.ascii "Machine halted"
+	.byte 0
+devfstype:
+	.ascii "tmpfs"
+	.byte 0
+devfsdir:
+	.ascii "/dev"
+	.byte 0
+tmpfs_args:
+	/* Version.  */
+	.long 1
+
+	/* Alignment long.  */
+	.long 0
+
+	/* Maximum inodes.  */
+	.quad 	0
+	/* Maximum size.  */
+	.quad   0
+
+	/* UID */
+	.long		0
+	/* GID */
+	.long 		0
+	/* Mode */
+	.long		0777
+	/* Alignment long.  */
+	.long 0
+tmpfs_args_end:	
\ No newline at end of file

From 5b512173a30af58caff6a07940072b33188039d1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 19 Jan 2010 10:32:57 +0100
Subject: [PATCH 0331/1628] Tags for OpenBSD

---
 include/grub/i386/bsd.h |  13 ----
 loader/i386/bsd.c       | 134 +++++++++++++++++-----------------------
 2 files changed, 55 insertions(+), 92 deletions(-)

diff --git a/include/grub/i386/bsd.h b/include/grub/i386/bsd.h
index 8fd284bfc..f0cce840e 100644
--- a/include/grub/i386/bsd.h
+++ b/include/grub/i386/bsd.h
@@ -80,19 +80,6 @@ struct freebsd_tag_header
   grub_uint32_t len;
 };
 
-struct grub_openbsd_bios_mmap
-{
-  grub_uint64_t addr;
-  grub_uint64_t len;
-#define	OPENBSD_MMAP_AVAILABLE	1
-#define	OPENBSD_MMAP_RESERVED 2
-#define	OPENBSD_MMAP_ACPI	3
-#define	OPENBSD_MMAP_NVS 	4
-  grub_uint32_t type;
-};
-
-
-
 grub_err_t grub_freebsd_load_elfmodule32 (struct grub_relocator *relocator,
 					  grub_file_t file, int argc,
 					  char *argv[], grub_addr_t *kern_end);
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 1d616c7b2..6643513b1 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -357,6 +357,9 @@ grub_bsd_add_mmap (void)
   if (kernel_type == KERNEL_TYPE_NETBSD)
     len += sizeof (grub_uint32_t);
 
+  if (kernel_type == KERNEL_TYPE_OPENBSD)
+    len += sizeof (struct grub_e820_mmap);
+
   buf = grub_malloc (len);
   if (!buf)
     return grub_errno;
@@ -370,9 +373,15 @@ grub_bsd_add_mmap (void)
 
   generate_e820_mmap (NULL, &cnt, buf);
 
+  if (kernel_type == KERNEL_TYPE_OPENBSD)
+    grub_memset ((grub_uint8_t *) buf + len - sizeof (struct grub_e820_mmap), 0,
+		 sizeof (struct grub_e820_mmap));
+
   grub_dprintf ("bsd", "%u entries in smap\n", (unsigned) cnt);
   if (kernel_type == KERNEL_TYPE_NETBSD)
     grub_bsd_add_meta (NETBSD_BTINFO_MEMMAP, buf0, len);
+  else if (kernel_type == KERNEL_TYPE_OPENBSD)
+    grub_bsd_add_meta (OPENBSD_BOOTARG_MMAP, buf0, len);
   else
     grub_bsd_add_meta (FREEBSD_MODINFO_METADATA |
 		       FREEBSD_MODINFOMD_SMAP, buf0, len);
@@ -746,91 +755,59 @@ grub_freebsd_boot (void)
 static grub_err_t
 grub_openbsd_boot (void)
 {
-  grub_uint8_t *buf, *buf0;
   grub_uint32_t *stack;
-  grub_addr_t buf_target, argbuf_target_start, argbuf_target_end;
-  grub_size_t buf_size;
-  struct grub_openbsd_bios_mmap *pm;
-  struct grub_openbsd_bootargs *pa;
   struct grub_relocator32_state state;
+  void *curarg, *buf0, *arg0;
+  grub_addr_t buf_target;
   grub_err_t err;
+  grub_size_t tag_buf_len;
 
-  auto int NESTED_FUNC_ATTR count_hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
-  int NESTED_FUNC_ATTR count_hook (grub_uint64_t addr __attribute__ ((unused)),
-				   grub_uint64_t size __attribute__ ((unused)),
-				   grub_uint32_t type __attribute__ ((unused)))
-  {
-    buf_size += sizeof (struct grub_openbsd_bios_mmap);
-    return 1;
-  }
-
-  auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
-  int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
-    {
-      pm->addr = addr;
-      pm->len = size;
-
-      switch (type)
-        {
-        case GRUB_MACHINE_MEMORY_AVAILABLE:
-	  pm->type = OPENBSD_MMAP_AVAILABLE;
-	  break;
-
-        case GRUB_MACHINE_MEMORY_ACPI:
-	  pm->type = OPENBSD_MMAP_ACPI;
-	  break;
-
-        case GRUB_MACHINE_MEMORY_NVS:
-	  pm->type = OPENBSD_MMAP_NVS;
-	  break;
-
-	default:
-	  pm->type = OPENBSD_MMAP_RESERVED;
-	  break;
-	}
-      pm++;
-
-      return 0;
-    }
-
-  buf_target = GRUB_BSD_TEMP_BUFFER;
-  buf_size = sizeof (struct grub_openbsd_bootargs) + 9 * sizeof (grub_uint32_t);
-  grub_mmap_iterate (count_hook);
-  buf_size += sizeof (struct grub_openbsd_bootargs);
-
-  err = grub_relocator_alloc_chunk_addr (relocator, (void **) &buf,
-					 buf_target, buf_size);
+  err = grub_bsd_add_mmap ();
   if (err)
     return err;
-  buf0 = buf;
-  stack = (grub_uint32_t *) buf;
-  buf = (grub_uint8_t *) (stack + 9);
 
-  argbuf_target_start = buf - buf0 + buf_target;
+  {
+    struct bsd_tag *tag;
+    tag_buf_len = 0;
+    for (tag = tags; tag; tag = tag->next)
+      tag_buf_len = ALIGN_VAR (tag_buf_len
+			       + sizeof (struct grub_openbsd_bootargs)
+			       + tag->len);
+  }
 
-  pa = (struct grub_openbsd_bootargs *) buf;
+  buf_target = GRUB_BSD_TEMP_BUFFER - 9 * sizeof (grub_uint32_t);
+  err = grub_relocator_alloc_chunk_addr (relocator, &buf0,
+					 buf_target, tag_buf_len
+					 + sizeof (struct grub_openbsd_bootargs)
+					 + 9 * sizeof (grub_uint32_t));
+  if (err)
+    return err;
 
-  pa->ba_type = OPENBSD_BOOTARG_MMAP;
-  pm = (struct grub_openbsd_bios_mmap *) (pa + 1);
-  grub_mmap_iterate (hook);
+  stack = (grub_uint32_t *) buf0;
+  arg0 = curarg = stack + 9;
 
-  /* Memory map terminator.  */
-  pm->addr = 0;
-  pm->len = 0;
-  pm->type = 0;
-  pm++;
-  buf = (grub_uint8_t *) pm;
+  {
+    struct bsd_tag *tag;
+    struct grub_openbsd_bootargs *head;
 
-  pa->ba_size = (char *) pm - (char *) pa;
-  pa->ba_next = buf - buf0 + buf_target;
-  pa = (struct grub_openbsd_bootargs *) buf;
-  pa->ba_type = OPENBSD_BOOTARG_END;
-  pa->ba_size = 0;
-  pa->ba_next = 0;
-  pa++;
+    for (tag = tags; tag; tag = tag->next)
+      {
+	head = curarg;
+	head->ba_type = tag->type;
+	head->ba_size = tag->len + sizeof (*head);
+	curarg = head + 1;
+	grub_memcpy (curarg, tag->data, tag->len);
+	curarg = (grub_uint8_t *) curarg + tag->len;
+	head->ba_next = (grub_uint8_t *) curarg - (grub_uint8_t *) buf0
+	  + buf_target;
+      }
+    head = curarg;
+    head->ba_type = OPENBSD_BOOTARG_END;
+    head->ba_size = 0;
+    head->ba_next = 0;
+  }
 
-  buf = (grub_uint8_t *) pa;
-  argbuf_target_end = buf - buf0 + buf_target;
+  grub_video_set_mode ("text", 0, 0);
 
 #ifdef GRUB_MACHINE_EFI
   if (! grub_efi_finish_boot_services ())
@@ -838,7 +815,7 @@ grub_openbsd_boot (void)
 #endif
 
   state.eip = entry;
-  state.esp = ((grub_uint8_t *) stack - buf0) + buf_target;
+  state.esp = ((grub_uint8_t *) stack - (grub_uint8_t *) buf0) + buf_target;
   stack[0] = entry;
   stack[1] = bootflags;
   stack[2] = openbsd_root;
@@ -846,10 +823,8 @@ grub_openbsd_boot (void)
   stack[4] = 0;
   stack[5] = grub_mmap_get_upper () >> 10;
   stack[6] = grub_mmap_get_lower () >> 10;
-  stack[7] = argbuf_target_end - argbuf_target_start;
-  stack[8] = argbuf_target_start;
-
-  grub_video_set_mode ("text", 0, 0);
+  stack[7] = (grub_uint8_t *) curarg - (grub_uint8_t *) arg0;
+  stack[8] = ((grub_uint8_t *) arg0 - (grub_uint8_t *) buf0) + buf_target;
 
   return grub_relocator32_boot (relocator, state);
 }
@@ -998,7 +973,8 @@ grub_netbsd_boot (void)
     tag_buf_len = 0;
     for (tag = tags; tag; tag = tag->next)
       {
-	tag_buf_len = ALIGN_VAR (tag_buf_len + 2 * sizeof (grub_uint32_t)
+	tag_buf_len = ALIGN_VAR (tag_buf_len
+				 + sizeof (struct grub_netbsd_btinfo_common)
 				 + tag->len);
 	tag_count++;
       }

From b5b6745c874f3e8f6fb0546af72eb64f98b83f1a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 19 Jan 2010 14:29:02 +0100
Subject: [PATCH 0332/1628] kopenbsd serial support

---
 include/grub/i386/openbsd_bootarg.h | 10 ++++++
 loader/i386/bsd.c                   | 48 +++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/include/grub/i386/openbsd_bootarg.h b/include/grub/i386/openbsd_bootarg.h
index cd99b14f2..935dfc0c8 100644
--- a/include/grub/i386/openbsd_bootarg.h
+++ b/include/grub/i386/openbsd_bootarg.h
@@ -61,6 +61,7 @@
 #define OPENBSD_BOOTARG_END	-1
 
 #define	OPENBSD_BOOTARG_MMAP	0
+#define	OPENBSD_BOOTARG_CONSOLE 5
 
 struct grub_openbsd_bootargs
 {
@@ -69,4 +70,13 @@ struct grub_openbsd_bootargs
   grub_uint32_t ba_next;
 } __attribute__ ((packed));
 
+struct grub_openbsd_bootarg_console
+{
+  grub_uint32_t device;
+  grub_uint32_t speed;
+};
+
+#define GRUB_OPENBSD_COM_MAJOR 8
+#define GRUB_OPENBSD_VGA_MAJOR 12
+
 #endif
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 6643513b1..7a8ddb89a 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -126,6 +126,8 @@ static const struct grub_arg_option openbsd_opts[] =
     {"single", 's', 0, N_("Boot into single mode."), 0, 0},
     {"kdb", 'd', 0, N_("Enter in KDB on boot."), 0, 0},
     {"root", 'r', 0, N_("Set root device."), "wdXY", ARG_TYPE_STRING},
+    {"serial", 'h', GRUB_ARG_OPTION_OPTIONAL, 
+     N_("Use serial console."), N_("comUNIT[,SPEED]"), ARG_TYPE_STRING},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -136,6 +138,7 @@ static const grub_uint32_t openbsd_flags[] =
 };
 
 #define OPENBSD_ROOT_ARG (ARRAY_SIZE (openbsd_flags) - 1)
+#define OPENBSD_SERIAL_ARG (ARRAY_SIZE (openbsd_flags))
 
 static const struct grub_arg_option netbsd_opts[] =
   {
@@ -1410,6 +1413,51 @@ grub_cmd_openbsd (grub_extcmd_t cmd, int argc, char *argv[])
   else
     bootdev = 0;
 
+  if (cmd->state[OPENBSD_SERIAL_ARG].set)
+    {
+      struct grub_openbsd_bootarg_console serial;
+      char *ptr;
+      unsigned port = 0;
+      unsigned speed = 9600;
+
+      grub_memset (&serial, 0, sizeof (serial));
+
+      if (cmd->state[OPENBSD_SERIAL_ARG].arg)
+	{
+	  ptr = cmd->state[OPENBSD_SERIAL_ARG].arg;
+	  if (grub_memcmp (ptr, "com", sizeof ("com") - 1) != 0)
+	    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+			       "only com0-com3 are supported");
+	  ptr += sizeof ("com") - 1;
+	  port = grub_strtoul (ptr, &ptr, 0);
+	  if (port >= 4)
+	    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+			       "only com0-com3 are supported");
+	  if (*ptr == ',')
+	    {
+	      ptr++; 
+	      speed = grub_strtoul (ptr, &ptr, 0);
+	      if (grub_errno)
+		return grub_errno;
+	    }
+	}
+
+      serial.device = (GRUB_OPENBSD_COM_MAJOR << 8) | port;
+      serial.speed = speed;
+	  
+      grub_bsd_add_meta (OPENBSD_BOOTARG_CONSOLE, &serial, sizeof (serial));
+      bootflags |= OPENBSD_RB_SERCONS;
+    }
+  else
+    {
+      struct grub_openbsd_bootarg_console serial;
+
+      grub_memset (&serial, 0, sizeof (serial));
+      serial.device = (GRUB_OPENBSD_VGA_MAJOR << 8);
+      grub_bsd_add_meta (OPENBSD_BOOTARG_CONSOLE, &serial, sizeof (serial));
+      bootflags &= ~OPENBSD_RB_SERCONS;
+    }
+
   if (grub_bsd_load (argc, argv) == GRUB_ERR_NONE)
     {
       grub_loader_set (grub_openbsd_boot, grub_bsd_unload, 1);

From 915fc1b8bfa683a1cb456d4c4e38806d2631f4ed Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 01:08:46 +0100
Subject: [PATCH 0333/1628] 2010-01-20  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* include/multiboot.h: Resynced with spec.
	* include/multiboot2.h: Likewise.
	* loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap): Handle
	GRUB_MACHINE_MEMORY_ACPI_RECLAIMABLE and GRUB_MACHINE_MEMORY_NVS.
---
 ChangeLog                   |  7 +++++++
 include/multiboot.h         |  2 ++
 include/multiboot2.h        |  2 ++
 loader/i386/multiboot_mbi.c | 12 ++++++++++++
 4 files changed, 23 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 40984c187..9097153e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/multiboot.h: Resynced with spec.
+	* include/multiboot2.h: Likewise.
+	* loader/i386/multiboot_mbi.c (grub_fill_multiboot_mmap): Handle
+	GRUB_MACHINE_MEMORY_ACPI_RECLAIMABLE and GRUB_MACHINE_MEMORY_NVS.
+
 2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* include/grub/term.h (grub_term_register_input,
diff --git a/include/multiboot.h b/include/multiboot.h
index 57c154c98..c529c5c5f 100644
--- a/include/multiboot.h
+++ b/include/multiboot.h
@@ -233,6 +233,8 @@ struct multiboot_mmap_entry
   multiboot_uint64_t len;
 #define MULTIBOOT_MEMORY_AVAILABLE		1
 #define MULTIBOOT_MEMORY_RESERVED		2
+#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE       3
+#define MULTIBOOT_MEMORY_NVS                    4
   multiboot_uint32_t type;
 } __attribute__((packed));
 typedef struct multiboot_mmap_entry multiboot_memory_map_t;
diff --git a/include/multiboot2.h b/include/multiboot2.h
index a241a70ad..1b649d514 100644
--- a/include/multiboot2.h
+++ b/include/multiboot2.h
@@ -233,6 +233,8 @@ struct multiboot_mmap_entry
   multiboot_uint64_t len;
 #define MULTIBOOT_MEMORY_AVAILABLE		1
 #define MULTIBOOT_MEMORY_RESERVED		2
+#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE       3
+#define MULTIBOOT_MEMORY_NVS                    4
   multiboot_uint32_t type;
 } __attribute__((packed));
 typedef struct multiboot_mmap_entry multiboot_memory_map_t;
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index 58bb68323..5154a64df 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -110,6 +110,18 @@ grub_fill_multiboot_mmap (struct multiboot_mmap_entry *first_entry)
 	case GRUB_MACHINE_MEMORY_AVAILABLE:
  	  mmap_entry->type = MULTIBOOT_MEMORY_AVAILABLE;
  	  break;
+
+#ifdef GRUB_MACHINE_MEMORY_ACPI_RECLAIMABLE
+	case GRUB_MACHINE_MEMORY_ACPI_RECLAIMABLE:
+ 	  mmap_entry->type = MULTIBOOT_MEMORY_ACPI_RECLAIMABLE;
+ 	  break;
+#endif
+
+#ifdef GRUB_MACHINE_MEMORY_NVS
+	case GRUB_MACHINE_MEMORY_NVS:
+ 	  mmap_entry->type = MULTIBOOT_MEMORY_NVS;
+ 	  break;
+#endif	  
 	  
  	default:
  	  mmap_entry->type = MULTIBOOT_MEMORY_RESERVED;

From 7a988ee134edafbd460fc455798b02217bb5bd71 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 20 Jan 2010 00:34:57 +0000
Subject: [PATCH 0334/1628] Remove a debug comment.

---
 font/font.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/font/font.c b/font/font.c
index 7aef1b163..9f8e0f5c6 100644
--- a/font/font.c
+++ b/font/font.c
@@ -17,8 +17,6 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//#define USE_ASCII_FAILBACK 0
-
 #include <grub/bufio.h>
 #include <grub/dl.h>
 #include <grub/file.h>

From e3538adaea469c20a2ab77d97891b068bb5b6013 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 20 Jan 2010 01:19:53 +0000
Subject: [PATCH 0335/1628] 2009-12-20  Robert Millan  <rmh.grub@aybabtu.com>

	* kern/mips/yeeloong/init.c (grub_video_sm712_init)
	(grub_video_video_init, grub_video_bitmap_init)
	(grub_font_manager_init, grub_term_gfxterm_init)
	(grub_at_keyboard_init): New extern declarations.
	(grub_machine_init): Initialize gfxterm and at_keyboard.

	* kern/main.c (grub_main): Revert grub_printf delay kludge.

	* util/grub-install.in: Revert embed of `at_keyboard.mod' and
	`gfxterm.mod' into core image.

	* conf/mips.rmk (pkglib_IMAGES, kernel_img_SOURCES)
	(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
	(kernel_img_FORMAT): Copy to ...

	* conf/mips-qemu-mips.rmk (pkglib_IMAGES, kernel_img_SOURCES)
	(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
	(kernel_img_FORMAT): ... here, and ...

	* conf/mips-yeeloong.rmk (pkglib_IMAGES, kernel_img_SOURCES)
	(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
	(kernel_img_FORMAT): ... here.

	(kernel_img_SOURCES): Add files necessary for output (gfxterm)
	and input (at_keyboard) terminals in kernel.
	(kernel_img_CFLAGS): Add `-DUSE_ASCII_FAILBACK'.

	(pkglib_MODULES): Remove `pci.mod'.
	(pci_mod_SOURCES, pci_mod_CFLAGS, pci_mod_LDFLAGS)
	(sm712_mod_SOURCES, sm712_mod_CFLAGS, sm712_mod_LDFLAGS)
	(at_keyboard_mod_SOURCES, at_keyboard_mod_CFLAGS)
	(at_keyboard_mod_LDFLAGS): Remove variables.
---
 ChangeLog.mips            | 35 +++++++++++++++++++++++++++++++++
 conf/mips-qemu-mips.rmk   | 17 ++++++++++++++++
 conf/mips-yeeloong.rmk    | 41 +++++++++++++++++++++++----------------
 conf/mips.rmk             | 18 -----------------
 kern/main.c               | 12 ++++++------
 kern/mips/yeeloong/init.c | 19 +++++++++++++++++-
 util/grub-install.in      |  4 ----
 7 files changed, 100 insertions(+), 46 deletions(-)

diff --git a/ChangeLog.mips b/ChangeLog.mips
index 1bbe1c273..12797095d 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,38 @@
+2009-12-20  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* kern/mips/yeeloong/init.c (grub_video_sm712_init)
+	(grub_video_video_init, grub_video_bitmap_init)
+	(grub_font_manager_init, grub_term_gfxterm_init)
+	(grub_at_keyboard_init): New extern declarations.
+	(grub_machine_init): Initialize gfxterm and at_keyboard.
+
+	* kern/main.c (grub_main): Revert grub_printf delay kludge.
+
+	* util/grub-install.in: Revert embed of `at_keyboard.mod' and
+	`gfxterm.mod' into core image.
+
+	* conf/mips.rmk (pkglib_IMAGES, kernel_img_SOURCES)
+	(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
+	(kernel_img_FORMAT): Copy to ...
+
+	* conf/mips-qemu-mips.rmk (pkglib_IMAGES, kernel_img_SOURCES)
+	(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
+	(kernel_img_FORMAT): ... here, and ...
+
+	* conf/mips-yeeloong.rmk (pkglib_IMAGES, kernel_img_SOURCES)
+	(kernel_img_CFLAGS, kernel_img_ASFLAGS, kernel_img_LDFLAGS)
+	(kernel_img_FORMAT): ... here.
+
+	(kernel_img_SOURCES): Add files necessary for output (gfxterm)
+	and input (at_keyboard) terminals in kernel.
+	(kernel_img_CFLAGS): Add `-DUSE_ASCII_FAILBACK'.
+
+	(pkglib_MODULES): Remove `pci.mod'.
+	(pci_mod_SOURCES, pci_mod_CFLAGS, pci_mod_LDFLAGS)
+	(sm712_mod_SOURCES, sm712_mod_CFLAGS, sm712_mod_LDFLAGS)
+	(at_keyboard_mod_SOURCES, at_keyboard_mod_CFLAGS)
+	(at_keyboard_mod_LDFLAGS): Remove variables.
+
 2010-01-11  Felix Zielcke <fzielcke@z-51.de>
 
 	* po/POTFILES: Replace `term/i386/pc/serial.c' with `term/serial.c'.
diff --git a/conf/mips-qemu-mips.rmk b/conf/mips-qemu-mips.rmk
index d5a985a13..e06370122 100644
--- a/conf/mips-qemu-mips.rmk
+++ b/conf/mips-qemu-mips.rmk
@@ -4,3 +4,20 @@ target_machine=qemu-mips
 COMMON_CFLAGS += -march=mips3
 COMMON_ASFLAGS += -march=mips3
 include $(srcdir)/conf/mips.mk
+
+pkglib_IMAGES = kernel.img
+kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
+	kern/main.c kern/device.c kern/$(target_cpu)/init.c \
+	kern/$(target_cpu)/$(target_machine)/init.c 		\
+	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c 		\
+	kern/misc.c kern/mm.c kern/term.c 	\
+	kern/rescue_parser.c kern/rescue_reader.c \
+	kern/list.c kern/handler.c kern/command.c kern/corecmd.c	\
+	kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c 	\
+	kern/generic/millisleep.c kern/generic/rtc_get_time_ms.c kern/time.c    \
+	symlist.c kern/$(target_cpu)/cache.S
+kernel_img_CFLAGS = $(COMMON_CFLAGS)
+kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
+kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
+	-Wl,-N,-S,-Ttext,$(LINK_BASE),-Bstatic
+kernel_img_FORMAT = binary
diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 4257bba74..964f29384 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -5,11 +5,30 @@ COMMON_CFLAGS += -march=mips3
 COMMON_ASFLAGS += -march=mips3
 include $(srcdir)/conf/mips.mk
 
-# For pci.mod.
-pkglib_MODULES += pci.mod
-pci_mod_SOURCES = bus/pci.c bus/bonito.c
-pci_mod_CFLAGS = $(COMMON_CFLAGS)
-pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
+pkglib_IMAGES = kernel.img
+kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
+	kern/main.c kern/device.c kern/$(target_cpu)/init.c \
+	kern/$(target_cpu)/$(target_machine)/init.c 		\
+	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c 		\
+	kern/misc.c kern/mm.c kern/term.c 	\
+	kern/rescue_parser.c kern/rescue_reader.c \
+	kern/list.c kern/handler.c kern/command.c kern/corecmd.c	\
+	kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c 	\
+	kern/generic/millisleep.c kern/generic/rtc_get_time_ms.c kern/time.c    \
+	kern/$(target_cpu)/cache.S \
+	\
+	term/at_keyboard.c \
+	font/font_cmd.c font/font.c io/bufio.c \
+	video/video.c video/fb/video_fb.c video/fb/fbblit.c \
+	video/fb/fbfill.c video/fb/fbutil.c video/bitmap.c \
+	video/sm712.c bus/pci.c bus/bonito.c \
+	term/gfxterm.c commands/extcmd.c lib/arg.c \
+	symlist.c
+kernel_img_CFLAGS = $(COMMON_CFLAGS) -DUSE_ASCII_FAILBACK
+kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
+kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
+	-Wl,-N,-S,-Ttext,$(LINK_BASE),-Bstatic
+kernel_img_FORMAT = binary
 
 # For ata.mod.
 pkglib_MODULES += ata.mod
@@ -17,24 +36,12 @@ ata_mod_SOURCES = disk/ata.c
 ata_mod_CFLAGS = $(COMMON_CFLAGS)
 ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For pci.mod.
-pkglib_MODULES += sm712.mod
-sm712_mod_SOURCES = video/sm712.c 
-sm712_mod_CFLAGS = $(COMMON_CFLAGS)
-sm712_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For lspci.mod
 pkglib_MODULES += lspci.mod
 lspci_mod_SOURCES = commands/lspci.c
 lspci_mod_CFLAGS = $(COMMON_CFLAGS)
 lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For at_keyboard.mod.
-pkglib_MODULES += at_keyboard.mod
-at_keyboard_mod_SOURCES = term/at_keyboard.c
-at_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
-at_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For ata_pthru.mod.
 pkglib_MODULES += ata_pthru.mod
 ata_pthru_mod_SOURCES = disk/ata_pthru.c
diff --git a/conf/mips.rmk b/conf/mips.rmk
index 55fd83d73..fedfb4c54 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -25,24 +25,6 @@ symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.
 kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
 	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
 
-# Programs
-pkglib_IMAGES = kernel.img
-kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
-	kern/main.c kern/device.c kern/$(target_cpu)/init.c \
-	kern/$(target_cpu)/$(target_machine)/init.c 		\
-	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c 		\
-	kern/misc.c kern/mm.c kern/term.c 	\
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/list.c kern/handler.c kern/command.c kern/corecmd.c	\
-	kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c 	\
-	kern/generic/millisleep.c kern/generic/rtc_get_time_ms.c kern/time.c    \
-	symlist.c kern/$(target_cpu)/cache.S
-kernel_img_CFLAGS = $(COMMON_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
-	-Wl,-N,-S,-Ttext,$(LINK_BASE),-Bstatic
-kernel_img_FORMAT = binary
-
 # Scripts.
 sbin_SCRIPTS = 
 bin_SCRIPTS = 
diff --git a/kern/main.c b/kern/main.c
index ae32d47f6..57a0f4a3d 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -152,6 +152,12 @@ grub_main (void)
   /* First of all, initialize the machine.  */
   grub_machine_init ();
 
+  /* Hello.  */
+  grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
+  grub_printf ("Welcome to GRUB!\n\n");
+  grub_refresh ();
+  grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
+
   /* Load pre-loaded modules and free the space.  */
   grub_register_exported_symbols ();
 #ifdef GRUB_LINKER_HAVE_INIT
@@ -159,12 +165,6 @@ grub_main (void)
 #endif  
   grub_load_modules ();
 
-  /* Hello.  */
-  grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
-  grub_printf ("Welcome to GRUB!\n\n");
-  grub_refresh ();
-  grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
-
   /* It is better to set the root device as soon as possible,
      for convenience.  */
   grub_machine_set_prefix ();
diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 8b93ac18f..14e8a39a2 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2009,2010  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
@@ -28,6 +28,13 @@
 #include <grub/machine/memory.h>
 #include <grub/cpu/kernel.h>
 
+extern void grub_video_sm712_init (void);
+extern void grub_video_video_init (void);
+extern void grub_video_bitmap_init (void);
+extern void grub_font_manager_init (void);
+extern void grub_term_gfxterm_init (void);
+extern void grub_at_keyboard_init (void);
+
 /* FIXME: use interrupt to count high.  */
 grub_uint64_t
 grub_get_rtc (void)
@@ -87,6 +94,16 @@ grub_machine_init (void)
 		       - (((grub_addr_t) modend) - GRUB_ARCH_LOWMEMVSTART));
   /* FIXME: use upper memory as well.  */
   grub_install_get_time_ms (grub_rtc_get_time_ms);
+
+  /* Initialize output terminal (can't be done earlier, as gfxterm
+     relies on a working heap.  */
+  grub_video_sm712_init ();
+  grub_video_video_init ();
+  grub_video_bitmap_init ();
+  grub_font_manager_init ();
+  grub_term_gfxterm_init ();
+
+  grub_at_keyboard_init ();
 }
 
 void
diff --git a/util/grub-install.in b/util/grub-install.in
index 509593d63..bb323d706 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -292,10 +292,6 @@ partmap_module=`$grub_probe --target=partmap --device ${grub_device} 2> /dev/nul
 # Device abstraction module, if any (lvm, raid).
 devabstraction_module=`$grub_probe --target=abstraction --device ${grub_device}`
 
-if [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
-    modules="sm712 gfxterm at_keyboard $modules"
-fi
-
 # The order in this list is critical.  Be careful when modifying it.
 modules="$modules $disk_module"
 modules="$modules $fs_module $partmap_module $devabstraction_module"

From ff9890710e5f06fa93e856acf61ab1a6366d8a87 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 20 Jan 2010 01:29:06 +0000
Subject: [PATCH 0336/1628] 2009-12-20  Robert Millan  <rmh.grub@aybabtu.com>

	* loader/mips/linux.c (grub_cmd_initrd)
	(GRUB_MOD_INIT(linux)): Adjust and gettextize a few strings.
---
 ChangeLog.mips      |  5 +++++
 loader/mips/linux.c | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.mips b/ChangeLog.mips
index 12797095d..274bf7dc4 100644
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,8 @@
+2009-12-20  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* loader/mips/linux.c (grub_cmd_initrd)
+	(GRUB_MOD_INIT(linux)): Adjust and gettextize a few strings.
+
 2009-12-20  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* kern/mips/yeeloong/init.c (grub_video_sm712_init)
diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index 8d7cda0ed..b52f098ac 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -1,7 +1,7 @@
 /* linux.c - boot Linux */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003, 2004, 2005, 2007, 2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2003,2004,2005,2007,2009,2010  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
@@ -318,10 +318,10 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   grub_size_t overhead;
 
   if (argc == 0)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no initrd specified");
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "No initrd specified");
 
   if (!loaded)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "You need to load the kernel first.");
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "You need to load Linux first.");
 
   if (initrd_loaded)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "Only one initrd can be loaded.");
@@ -376,9 +376,9 @@ static grub_command_t cmd_linux, cmd_initrd;
 GRUB_MOD_INIT(linux)
 {
   cmd_linux = grub_register_command ("linux", grub_cmd_linux,
-				     0, "load a linux kernel");
+				     0, N_("Load Linux."));
   cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
-				      0, "load an initrd");
+				      0, N_("Load initrd."));
   my_mod = mod;
 }
 

From 917dd370404a540884a8216a1c3c94a4504867f9 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 20 Jan 2010 02:11:07 +0000
Subject: [PATCH 0337/1628] 2010-01-20  Dan Merillat  <debian@dan.merillat.org>

	* kern/device.c (grub_device_iterate): Allocate new part_ent
	structure based on sizeof (*p) rather than sizeof (p->next), to
	account for structure padding.

	* util/grub-probe.c (probe_raid_level): Return -1 immediately if
	disk is NULL, which might happen for LVM physical volumes with no
	LVM signature.
---
 ChangeLog         | 10 ++++++++++
 kern/device.c     |  2 +-
 util/grub-probe.c |  5 +++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3b31a527f..08c2851d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-20  Dan Merillat  <debian@dan.merillat.org>
+
+	* kern/device.c (grub_device_iterate): Allocate new part_ent
+	structure based on sizeof (*p) rather than sizeof (p->next), to
+	account for structure padding.
+
+	* util/grub-probe.c (probe_raid_level): Return -1 immediately if
+	disk is NULL, which might happen for LVM physical volumes with no
+	LVM signature.
+
 2009-12-20  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* loader/mips/linux.c (grub_cmd_initrd)
diff --git a/kern/device.c b/kern/device.c
index f519c63b2..7d3577051 100644
--- a/kern/device.c
+++ b/kern/device.c
@@ -138,7 +138,7 @@ grub_device_iterate (int (*hook) (const char *name))
       if (! partition_name)
 	return 1;
 
-      p = grub_malloc (sizeof (p->next) + grub_strlen (disk->name) + 1 +
+      p = grub_malloc (sizeof (*p) + grub_strlen (disk->name) + 1 +
 		       grub_strlen (partition_name) + 1);
       if (!p)
 	{
diff --git a/util/grub-probe.c b/util/grub-probe.c
index 879098542..ba2fe4c35 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -94,6 +94,11 @@ probe_partmap (grub_disk_t disk)
 static int
 probe_raid_level (grub_disk_t disk)
 {
+  /* disk might be NULL in the case of a LVM physical volume with no LVM
+     signature.  Ignore such cases here.  */
+  if (!disk)
+    return -1;
+
   if (disk->dev->id != GRUB_DISK_DEVICE_RAID_ID)
     return -1;
 

From c893cc87fc45f7ae6385793021a0d1ac200ec992 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 20 Jan 2010 02:43:19 +0000
Subject: [PATCH 0338/1628] 2009-12-20  Robert Millan  <rmh.grub@aybabtu.com>

	* commands/loadenv.c (check_blocklists): Use `grub_err_t' as
	return value (and revert all return statements).  Update users.
---
 ChangeLog          |  5 +++++
 commands/loadenv.c | 21 ++++++++-------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 08c2851d5..bac4c317a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-20  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* commands/loadenv.c (check_blocklists): Use `grub_err_t' as
+	return value (and revert all return statements).  Update users.
+
 2010-01-20  Dan Merillat  <debian@dan.merillat.org>
 
 	* kern/device.c (grub_device_iterate): Allocate new part_ent
diff --git a/commands/loadenv.c b/commands/loadenv.c
index 910392614..51b88cbc9 100644
--- a/commands/loadenv.c
+++ b/commands/loadenv.c
@@ -1,7 +1,7 @@
 /* loadenv.c - command to load/save environment variable.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2008,2009,2010  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
@@ -196,7 +196,7 @@ free_blocklists (struct blocklist *p)
     }
 }
 
-static int
+static grub_err_t
 check_blocklists (grub_envblk_t envblk, struct blocklist *blocklists,
                   grub_file_t file)
 {
@@ -219,8 +219,7 @@ check_blocklists (grub_envblk_t envblk, struct blocklist *blocklists,
             {
               /* This might be actually valid, but it is unbelievable that
                  any filesystem makes such a silly allocation.  */
-              grub_error (GRUB_ERR_BAD_FS, "malformed file");
-              return 0;
+              return grub_error (GRUB_ERR_BAD_FS, "malformed file");
             }
         }
 
@@ -230,8 +229,7 @@ check_blocklists (grub_envblk_t envblk, struct blocklist *blocklists,
   if (total_length != grub_file_size (file))
     {
       /* Maybe sparse, unallocated sectors. No way in GRUB.  */
-      grub_error (GRUB_ERR_BAD_FILE_TYPE, "sparse file not allowed");
-      return 0;
+      return grub_error (GRUB_ERR_BAD_FILE_TYPE, "sparse file not allowed");
     }
 
   /* One more sanity check. Re-read all sectors by blocklists, and compare
@@ -249,16 +247,13 @@ check_blocklists (grub_envblk_t envblk, struct blocklist *blocklists,
 
       if (grub_disk_read (disk, p->sector - part_start,
                           p->offset, p->length, blockbuf))
-        return 0;
+        return grub_errno;
 
       if (grub_memcmp (buf + index, blockbuf, p->length) != 0)
-        {
-          grub_error (GRUB_ERR_FILE_READ_ERROR, "invalid blocklist");
-          return 0;
-        }
+	return grub_error (GRUB_ERR_FILE_READ_ERROR, "invalid blocklist");
     }
 
-  return 1;
+  return GRUB_ERR_NONE;
 }
 
 static int
@@ -347,7 +342,7 @@ grub_cmd_save_env (grub_extcmd_t cmd, int argc, char **args)
   if (! envblk)
     goto fail;
 
-  if (! check_blocklists (envblk, head, file))
+  if (check_blocklists (envblk, head, file))
     goto fail;
 
   while (argc)

From 55ff526642883e65ee690825750a1d76df843a1f Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 20 Jan 2010 02:50:36 +0000
Subject: [PATCH 0339/1628] 2009-12-20  Robert Millan  <rmh.grub@aybabtu.com>

	* normal/menu.c (notify_execution_failure): Clarify error message.
---
 ChangeLog     | 4 ++++
 normal/menu.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bac4c317a..3fac1bd6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-20  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* normal/menu.c (notify_execution_failure): Clarify error message.
+
 2009-12-20  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* commands/loadenv.c (check_blocklists): Use `grub_err_t' as
diff --git a/normal/menu.c b/normal/menu.c
index 17730eff3..5e79d9405 100644
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -1,7 +1,7 @@
 /* menu.c - General supporting functionality for menus.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2003,2004,2005,2006,2007,2008,2009,2010  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
@@ -519,7 +519,7 @@ notify_execution_failure (void *userdata __attribute__((unused)))
       grub_errno = GRUB_ERR_NONE;
     }
   grub_printf ("\n  ");
-  grub_printf_ (N_("Failed to boot default entries.\n"));
+  grub_printf_ (N_("Failed to boot both default and fallback entries.\n"));
   grub_wait_after_message ();
 }
 

From 47d5f3c1c2238eb6bcd55215dfdbfd356b879f97 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 08:01:48 +0100
Subject: [PATCH 0340/1628] 2010-01-20  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* loader/mips/linux.c: Include missing grub/i18n.h.
---
 ChangeLog           | 4 ++++
 loader/mips/linux.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 3fac1bd6a..772e1620b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/mips/linux.c: Include missing grub/i18n.h.
+
 2009-12-20  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* normal/menu.c (notify_execution_failure): Clarify error message.
diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index b52f098ac..1eb747c3b 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -27,6 +27,7 @@
 #include <grub/command.h>
 #include <grub/mips/relocator.h>
 #include <grub/machine/memory.h>
+#include <grub/i18n.h>
 
 /* For frequencies.  */
 #include <grub/pci.h>

From 119c50eab3e43d7bc66c6c533dd837f1d1429855 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 08:02:45 +0100
Subject: [PATCH 0341/1628] 2010-01-20  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* include/grub/x86_64/at_keyboard.h: New file.
---
 ChangeLog                         | 4 ++++
 include/grub/x86_64/at_keyboard.h | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 include/grub/x86_64/at_keyboard.h

diff --git a/ChangeLog b/ChangeLog
index 772e1620b..192054e7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/x86_64/at_keyboard.h: New file.
+
 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/mips/linux.c: Include missing grub/i18n.h.
diff --git a/include/grub/x86_64/at_keyboard.h b/include/grub/x86_64/at_keyboard.h
new file mode 100644
index 000000000..c632aa85c
--- /dev/null
+++ b/include/grub/x86_64/at_keyboard.h
@@ -0,0 +1 @@
+#include <grub/i386/at_keyboard.h>

From f80927cadb4181fed6c7215fe24e3ea69c800789 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 08:04:01 +0100
Subject: [PATCH 0342/1628] 2010-01-20  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* conf/mips.rmk (kernel_img_HEADERS) [yeeloong]: Add pci.h.
---
 ChangeLog     | 4 ++++
 conf/mips.rmk | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 192054e7b..add252622 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* conf/mips.rmk (kernel_img_HEADERS) [yeeloong]: Add pci.h.
+
 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/x86_64/at_keyboard.h: New file.
diff --git a/conf/mips.rmk b/conf/mips.rmk
index fedfb4c54..d0b1c484c 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -19,6 +19,10 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	msdos_partition.h machine/kernel.h handler.h list.h \
 	command.h machine/memory.h cpu/libgcc.h cpu/cache.h i18n.h
 
+ifeq ($(platform), yeeloong)
+kernel_img_HEADERS += pci.h
+endif
+
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
 	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
 

From 7ee92c32e1cd3e8156e9838f5ca052e52a8e5aa2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 08:04:39 +0100
Subject: [PATCH 0343/1628] 2010-01-20  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* include/grub/font.h (grub_font_load): Fix prototype.
---
 ChangeLog           | 4 ++++
 include/grub/font.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index add252622..d7118325c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/font.h (grub_font_load): Fix prototype.
+
 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* conf/mips.rmk (kernel_img_HEADERS) [yeeloong]: Add pci.h.
diff --git a/include/grub/font.h b/include/grub/font.h
index 2129c30b3..1816e3570 100644
--- a/include/grub/font.h
+++ b/include/grub/font.h
@@ -75,7 +75,7 @@ void grub_font_loader_init (void);
 
 /* Load a font and add it to the beginning of the global font list.
    Returns: 0 upon success; nonzero upon failure.  */
-int grub_font_load (grub_file_t file);
+int grub_font_load (const char *filename);
 
 /* Get the font that has the specified name.  Font names are in the form
    "Family Name Bold Italic 14", where Bold and Italic are optional.

From aca655fd208845e1eaa9bef406d3f7c7630e6d3f Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 20 Jan 2010 12:48:35 +0530
Subject: [PATCH 0344/1628] fix grub-script-check warnings

---
 ChangeLog                | 5 +++++
 include/grub/script_sh.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d7118325c..0c8b841e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-20  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* include/grub/script_sh.h (sourcecode): Remove const qualifier to
+	fix grub-script-check warning.
+
 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/font.h (grub_font_load): Fix prototype.
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index f6177b02a..0bd14abcd 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -112,7 +112,7 @@ struct grub_script_cmd_menuentry
   struct grub_script_arglist *arglist;
 
   /* The sourcecode the entry will be generated from.  */
-  const char *sourcecode;
+  char *sourcecode;
 
   /* Options.  XXX: Not used yet.  */
   int options;

From b09a4a8dff41f224a8ddf96039c50ae3c526bd64 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 09:01:25 +0100
Subject: [PATCH 0345/1628] add missing error handling

---
 normal/main.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/normal/main.c b/normal/main.c
index 555d56aba..0c192712f 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -570,6 +570,9 @@ grub_normal_read_line_real (char **line, int cont, int nested)
   else
     prompt = grub_asprintf ("%s>", parser->name);
 
+  if (!prompt)
+    return grub_errno;
+
   while (1)
     {
       *line = grub_cmdline_get (prompt);

From adb893f2ae22bab455665ed861388812f0288aaf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 09:02:01 +0100
Subject: [PATCH 0346/1628] use correct size strings in mips/linux.c

---
 loader/mips/linux.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index 2d3e1ca5d..51060c4fb 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -281,7 +281,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   linux_envp = extra;
   envp_off = (grub_uint8_t *) linux_envp - (grub_uint8_t *) playground;
   linux_envs = (char *) (linux_envp + 5);
-  grub_snprintf (linux_envs, sizeof ("memsize=XXXXXXXXXXXXXXXXXXXX"), 
+  grub_snprintf (linux_envs, sizeof ("memsize=XXXXXXXXXXXXXXXXXXXX"),
 		 "memsize=%lld",
 		 (unsigned long long) grub_mmap_get_lower () >> 20);
   linux_envp[0] = (grub_uint8_t *) linux_envs - (grub_uint8_t *) playground
@@ -294,12 +294,12 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
     + target_addr;
   linux_envs += ALIGN_UP (grub_strlen (linux_envs) + 1, 4);
 
-  grub_snprintf (linux_envs, sizeof ("busclock=XXXXXXXXXXXXXXXXXXXX"),
+  grub_snprintf (linux_envs, sizeof ("busclock=XXXXXXXXXX"),
 		 "busclock=%d", grub_arch_busclock);
   linux_envp[2] = (grub_uint8_t *) linux_envs - (grub_uint8_t *) playground
     + target_addr;
   linux_envs += ALIGN_UP (grub_strlen (linux_envs) + 1, 4);
-  grub_snprintf (linux_envs, sizeof ("cpuclock=XXXXXXXXXXXXXXXXXXXX"),
+  grub_snprintf (linux_envs, sizeof ("cpuclock=XXXXXXXXXX"),
 		 "cpuclock=%d", grub_arch_cpuclock);
   linux_envp[3] = (grub_uint8_t *) linux_envs - (grub_uint8_t *) playground
     + target_addr;
@@ -360,14 +360,14 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
     }
 
   grub_snprintf ((char *) playground + rd_addr_arg_off,
-		 sizeof ("rd_start=XXXXXXXXXXXXXXXXXXXX"), "rd_start=0x%llx",
+		 sizeof ("rd_start=0xXXXXXXXXXXXXXXXX"), "rd_start=0x%llx",
 		(unsigned long long) target_addr + linux_size  + overhead);
   ((grub_uint32_t *) (playground + argv_off))[linux_argc]
     = target_addr + rd_addr_arg_off;
   linux_argc++;
 
   grub_snprintf ((char *) playground + rd_size_arg_off,
-		sizeof ("rd_size=XXXXXXXXXXXXXXXXXXXX"), "rd_size=0x%llx",
+		sizeof ("rd_size=0xXXXXXXXXXXXXXXXXX"), "rd_size=0x%llx",
 		(unsigned long long) size);
   ((grub_uint32_t *) (playground + argv_off))[linux_argc]
     = target_addr + rd_size_arg_off;

From 61eb45eee720cb9ccf3e794f6a0b1d4e7adff225 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 09:12:47 +0100
Subject: [PATCH 0347/1628] Rename asprint into xasprintf and avsprintf into
 xvasprintf

---
 commands/hashsum.c           |  2 +-
 commands/help.c              |  2 +-
 commands/ls.c                |  4 ++--
 commands/parttool.c          |  2 +-
 commands/search.c            |  2 +-
 disk/efi/efidisk.c           |  2 +-
 disk/raid.c                  |  2 +-
 disk/scsi.c                  |  2 +-
 disk/usbms.c                 |  2 +-
 efiemu/main.c                |  2 +-
 fs/ext2.c                    |  2 +-
 fs/fat.c                     |  2 +-
 fs/hfs.c                     |  2 +-
 fs/hfsplus.c                 |  2 +-
 fs/i386/pc/pxe.c             |  6 +++---
 fs/iso9660.c                 |  2 +-
 fs/jfs.c                     |  2 +-
 fs/ntfs.c                    |  2 +-
 fs/reiserfs.c                |  2 +-
 fs/ufs.c                     |  2 +-
 fs/xfs.c                     |  2 +-
 gettext/gettext.c            |  4 ++--
 include/grub/misc.h          |  4 ++--
 kern/device.c                |  2 +-
 kern/dl.c                    |  2 +-
 kern/efi/init.c              |  2 +-
 kern/env.c                   |  2 +-
 kern/ieee1275/init.c         |  2 +-
 kern/ieee1275/openfw.c       |  8 ++++----
 kern/misc.c                  |  6 +++---
 kern/sparc64/ieee1275/init.c |  2 +-
 loader/i386/bsd.c            |  2 +-
 loader/i386/linux.c          |  4 ++--
 loader/i386/multiboot.c      |  4 ++--
 loader/i386/multiboot_mbi.c  |  2 +-
 loader/i386/pc/xnu.c         |  2 +-
 loader/xnu.c                 |  2 +-
 normal/autofs.c              |  2 +-
 normal/completion.c          |  6 +++---
 normal/crypto.c              |  2 +-
 normal/dyncmd.c              |  2 +-
 normal/handler.c             |  2 +-
 normal/main.c                | 10 +++++-----
 normal/menu_text.c           |  4 ++--
 normal/term.c                |  2 +-
 partmap/acorn.c              |  2 +-
 partmap/amiga.c              |  2 +-
 partmap/apple.c              |  2 +-
 partmap/gpt.c                |  2 +-
 partmap/msdos.c              |  6 +++---
 partmap/sun.c                |  2 +-
 term/gfxterm.c               |  2 +-
 term/ieee1275/ofconsole.c    |  4 ++--
 tests/lib/test.c             |  2 +-
 util/grub-fstest.c           |  6 +++---
 55 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/commands/hashsum.c b/commands/hashsum.c
index a098ab7af..a4e71b844 100644
--- a/commands/hashsum.c
+++ b/commands/hashsum.c
@@ -111,7 +111,7 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename,
 	{
 	  char *filename;
 	  
-	  filename = grub_asprintf ("%s/%s", prefix, p);
+	  filename = grub_xasprintf ("%s/%s", prefix, p);
 	  if (!filename)
 	    return grub_errno;
 	  file = grub_file_open (filename);
diff --git a/commands/help.c b/commands/help.c
index a19b395cd..1181c3bfb 100644
--- a/commands/help.c
+++ b/commands/help.c
@@ -47,7 +47,7 @@ grub_cmd_help (grub_extcmd_t ext __attribute__ ((unused)), int argc,
 	  grub_uint32_t *unicode_command_help;
 	  grub_uint32_t *unicode_last_position;
 	  			      
-	  command_help = grub_asprintf ("%s %s", cmd->name, summary_translated);
+	  command_help = grub_xasprintf ("%s %s", cmd->name, summary_translated);
 	  if (!command_help)
 	    return 1;
 
diff --git a/commands/ls.c b/commands/ls.c
index cfa46ec6e..8a8319ac8 100644
--- a/commands/ls.c
+++ b/commands/ls.c
@@ -97,9 +97,9 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
 	  grub_file_t file;
 
 	  if (dirname[grub_strlen (dirname) - 1] == '/')
-	    pathname = grub_asprintf ("%s%s", dirname, filename);
+	    pathname = grub_xasprintf ("%s%s", dirname, filename);
 	  else
-	    pathname = grub_asprintf ("%s/%s", dirname, filename);
+	    pathname = grub_xasprintf ("%s/%s", dirname, filename);
 
 	  if (!pathname)
 	    return 1;
diff --git a/commands/parttool.c b/commands/parttool.c
index 3bffb8eb0..5ad6133ca 100644
--- a/commands/parttool.c
+++ b/commands/parttool.c
@@ -183,7 +183,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
       {
 	char *filename;
 
-	filename = grub_asprintf ("%s/parttool.lst", prefix);
+	filename = grub_xasprintf ("%s/parttool.lst", prefix);
 	if (filename)
 	  {
 	    grub_file_t file;
diff --git a/commands/search.c b/commands/search.c
index 51b7794fc..afb2e98e8 100644
--- a/commands/search.c
+++ b/commands/search.c
@@ -50,7 +50,7 @@ FUNC_NAME (const char *key, const char *var, int no_floppy)
 	char *buf;
 	grub_file_t file;
 
-	buf = grub_asprintf ("(%s)%s", name, key);
+	buf = grub_xasprintf ("(%s)%s", name, key);
 	if (! buf)
 	  return 1;
 
diff --git a/disk/efi/efidisk.c b/disk/efi/efidisk.c
index 0b5731c0f..58300a0d2 100644
--- a/disk/efi/efidisk.c
+++ b/disk/efi/efidisk.c
@@ -805,7 +805,7 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
 	  return 0;
 	}
 
-      device_name = grub_asprintf ("%s,%s", parent->name, partition_name);
+      device_name = grub_xasprintf ("%s,%s", parent->name, partition_name);
       grub_free (partition_name);
       grub_disk_close (parent);
 
diff --git a/disk/raid.c b/disk/raid.c
index 3d25c1747..2d544afdc 100644
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -556,7 +556,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
             }
         }
 
-      array->name = grub_asprintf ("md%d", array->number);
+      array->name = grub_xasprintf ("md%d", array->number);
       if (! array->name)
         {
           grub_free (array->uuid);
diff --git a/disk/scsi.c b/disk/scsi.c
index 2afdc1a15..6f3233b29 100644
--- a/disk/scsi.c
+++ b/disk/scsi.c
@@ -208,7 +208,7 @@ grub_scsi_iterate (int (*hook) (const char *name))
       for (i = 0; i < luns; i++)
 	{
 	  char *sname;
-	  sname = grub_asprintf ("%s%c", name, 'a' + i);
+	  sname = grub_xasprintf ("%s%c", name, 'a' + i);
 	  if (!sname)
 	    return 1;
 	  if (hook (sname))
diff --git a/disk/usbms.c b/disk/usbms.c
index 708168e81..8554b224f 100644
--- a/disk/usbms.c
+++ b/disk/usbms.c
@@ -201,7 +201,7 @@ grub_usbms_iterate (int (*hook) (const char *name, int luns))
   for (p = grub_usbms_dev_list; p; p = p->next)
     {
       char *devname;
-      devname = grub_asprintf ("usb%d", cnt);
+      devname = grub_xasprintf ("usb%d", cnt);
 
       if (hook (devname, p->luns))
 	{
diff --git a/efiemu/main.c b/efiemu/main.c
index 70a12080f..9480bfc4d 100644
--- a/efiemu/main.c
+++ b/efiemu/main.c
@@ -255,7 +255,7 @@ grub_efiemu_autocore (void)
 
   suffix = grub_efiemu_get_default_core_name ();
 
-  filename = grub_asprintf ("%s/%s", prefix, suffix);
+  filename = grub_xasprintf ("%s/%s", prefix, suffix);
   if (! filename)
     return grub_error (GRUB_ERR_OUT_OF_MEMORY,
 		       "couldn't allocate temporary space");
diff --git a/fs/ext2.c b/fs/ext2.c
index 4339b981b..ac36b329b 100644
--- a/fs/ext2.c
+++ b/fs/ext2.c
@@ -875,7 +875,7 @@ grub_ext2_uuid (grub_device_t device, char **uuid)
   data = grub_ext2_mount (disk);
   if (data)
     {
-      *uuid = grub_asprintf ("%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
+      *uuid = grub_xasprintf ("%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
 			     grub_be_to_cpu16 (data->sblock.uuid[0]),
 			     grub_be_to_cpu16 (data->sblock.uuid[1]),
 			     grub_be_to_cpu16 (data->sblock.uuid[2]),
diff --git a/fs/fat.c b/fs/fat.c
index a0a40cfab..d008dc10d 100644
--- a/fs/fat.c
+++ b/fs/fat.c
@@ -833,7 +833,7 @@ grub_fat_uuid (grub_device_t device, char **uuid)
   data = grub_fat_mount (disk);
   if (data)
     {
-      *uuid = grub_asprintf ("%04x-%04x",
+      *uuid = grub_xasprintf ("%04x-%04x",
 			     (grub_uint16_t) (data->uuid >> 16),
 			     (grub_uint16_t) data->uuid);
     }
diff --git a/fs/hfs.c b/fs/hfs.c
index 701b09468..cef856326 100644
--- a/fs/hfs.c
+++ b/fs/hfs.c
@@ -1082,7 +1082,7 @@ grub_hfs_uuid (grub_device_t device, char **uuid)
   data = grub_hfs_mount (device->disk);
   if (data && data->sblock.num_serial != 0)
     {
-      *uuid = grub_asprintf ("%016llx",
+      *uuid = grub_xasprintf ("%016llx",
 			     (unsigned long long)
 			     grub_be_to_cpu64 (data->sblock.num_serial));
     }
diff --git a/fs/hfsplus.c b/fs/hfsplus.c
index 6556bedaa..bcb8e9584 100644
--- a/fs/hfsplus.c
+++ b/fs/hfsplus.c
@@ -995,7 +995,7 @@ grub_hfsplus_uuid (grub_device_t device, char **uuid)
   data = grub_hfsplus_mount (disk);
   if (data)
     {
-      *uuid = grub_asprintf ("%016llx",
+      *uuid = grub_xasprintf ("%016llx",
 			     (unsigned long long)
 			     grub_be_to_cpu64 (data->volheader.num_serial));
     }
diff --git a/fs/i386/pc/pxe.c b/fs/i386/pc/pxe.c
index 60a49fc53..8bfe17594 100644
--- a/fs/i386/pc/pxe.c
+++ b/fs/i386/pc/pxe.c
@@ -501,7 +501,7 @@ write_ip_env (grub_uint32_t *ip, const char *val)
     return 0;
 
   /* Normalize the IP.  */
-  buf = grub_asprintf ("%d.%d.%d.%d", (newip & 0xff), (newip >> 8) & 0xff,
+  buf = grub_xasprintf ("%d.%d.%d.%d", (newip & 0xff), (newip >> 8) & 0xff,
 		       (newip >> 16) & 0xff, (newip >> 24) & 0xff);
   if (!buf)
     return 0;
@@ -543,7 +543,7 @@ grub_env_write_pxe_blocksize (struct grub_env_var *var __attribute__ ((unused)),
   else if (size > GRUB_PXE_MAX_BLKSIZE)
     size = GRUB_PXE_MAX_BLKSIZE;
   
-  buf = grub_asprintf ("%d", size);
+  buf = grub_xasprintf ("%d", size);
   if (!buf)
     return 0;
 
@@ -560,7 +560,7 @@ GRUB_MOD_INIT(pxe)
     {
       char *buf;
 
-      buf = grub_asprintf ("%d", grub_pxe_blksize);
+      buf = grub_xasprintf ("%d", grub_pxe_blksize);
       if (buf)
 	grub_env_set ("net_pxe_blksize", buf);
       grub_free (buf);
diff --git a/fs/iso9660.c b/fs/iso9660.c
index 928e1f984..a8a310f50 100644
--- a/fs/iso9660.c
+++ b/fs/iso9660.c
@@ -840,7 +840,7 @@ grub_iso9660_uuid (grub_device_t device, char **uuid)
 	}
       else
 	{
-	  *uuid = grub_asprintf ("%c%c%c%c-%c%c-%c%c-%c%c-%c%c-%c%c-%c%c",
+	  *uuid = grub_xasprintf ("%c%c%c%c-%c%c-%c%c-%c%c-%c%c-%c%c-%c%c",
 				 data->voldesc.modified.year[0],
 				 data->voldesc.modified.year[1],
 				 data->voldesc.modified.year[2],
diff --git a/fs/jfs.c b/fs/jfs.c
index 1bc3c7758..c9839a22f 100644
--- a/fs/jfs.c
+++ b/fs/jfs.c
@@ -842,7 +842,7 @@ grub_jfs_uuid (grub_device_t device, char **uuid)
   data = grub_jfs_mount (disk);
   if (data)
     {
-      *uuid = grub_asprintf ("%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-"
+      *uuid = grub_xasprintf ("%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-"
 			     "%02x%02x%02x%02x%02x%02x",
 			     data->sblock.uuid[0], data->sblock.uuid[1],
 			     data->sblock.uuid[2], data->sblock.uuid[3],
diff --git a/fs/ntfs.c b/fs/ntfs.c
index 63c1eeb82..dd041e23a 100644
--- a/fs/ntfs.c
+++ b/fs/ntfs.c
@@ -1072,7 +1072,7 @@ grub_ntfs_uuid (grub_device_t device, char **uuid)
   data = grub_ntfs_mount (disk);
   if (data)
     {
-      *uuid = grub_asprintf ("%016llx", (unsigned long long) data->uuid);
+      *uuid = grub_xasprintf ("%016llx", (unsigned long long) data->uuid);
     }
   else
     *uuid = NULL;
diff --git a/fs/reiserfs.c b/fs/reiserfs.c
index d5a20ee6c..444bf3120 100644
--- a/fs/reiserfs.c
+++ b/fs/reiserfs.c
@@ -1335,7 +1335,7 @@ grub_reiserfs_uuid (grub_device_t device, char **uuid)
   data = grub_reiserfs_mount (disk);
   if (data)
     {
-      *uuid = grub_asprintf ("%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
+      *uuid = grub_xasprintf ("%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
 			     grub_be_to_cpu16 (data->superblock.uuid[0]),
 			     grub_be_to_cpu16 (data->superblock.uuid[1]),
 			     grub_be_to_cpu16 (data->superblock.uuid[2]),
diff --git a/fs/ufs.c b/fs/ufs.c
index e8d48852b..40cf068e6 100644
--- a/fs/ufs.c
+++ b/fs/ufs.c
@@ -732,7 +732,7 @@ grub_ufs_uuid (grub_device_t device, char **uuid)
 
   data = grub_ufs_mount (disk);
   if (data && (data->sblock.uuidhi != 0 || data->sblock.uuidlow != 0))
-    *uuid = grub_asprintf ("%08x%08x",
+    *uuid = grub_xasprintf ("%08x%08x",
 			   (unsigned) grub_le_to_cpu32 (data->sblock.uuidhi),
 			   (unsigned) grub_le_to_cpu32 (data->sblock.uuidlow));
   else
diff --git a/fs/xfs.c b/fs/xfs.c
index 309460b61..9dffe31d1 100644
--- a/fs/xfs.c
+++ b/fs/xfs.c
@@ -777,7 +777,7 @@ grub_xfs_uuid (grub_device_t device, char **uuid)
   data = grub_xfs_mount (disk);
   if (data)
     {
-      *uuid = grub_asprintf ("%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
+      *uuid = grub_xasprintf ("%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
 			     grub_be_to_cpu16 (data->sblock.uuid[0]),
 			     grub_be_to_cpu16 (data->sblock.uuid[1]),
 			     grub_be_to_cpu16 (data->sblock.uuid[2]),
diff --git a/gettext/gettext.c b/gettext/gettext.c
index e835b0e1a..9a1756be7 100644
--- a/gettext/gettext.c
+++ b/gettext/gettext.c
@@ -286,7 +286,7 @@ grub_gettext_init_ext (const char *lang)
   /* Warning: if changing some paths in the below line, change the grub_malloc
      contents below.  */
 
-  mo_file = grub_asprintf ("%s/%s.mo", locale_dir, lang);
+  mo_file = grub_xasprintf ("%s/%s.mo", locale_dir, lang);
   if (!mo_file)
     return;
 
@@ -296,7 +296,7 @@ grub_gettext_init_ext (const char *lang)
   if (fd_mo == NULL)
     {
       grub_free (mo_file);
-      mo_file = grub_asprintf ("%s.gz", mo_file);
+      mo_file = grub_xasprintf ("%s.gz", mo_file);
       if (!mo_file)
 	return;
       fd_mo = grub_mofile_open (mo_file);
diff --git a/include/grub/misc.h b/include/grub/misc.h
index 2c1817492..221734a22 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -199,9 +199,9 @@ int EXPORT_FUNC(grub_snprintf) (char *str, grub_size_t n, const char *fmt, ...)
      __attribute__ ((format (printf, 3, 4)));
 int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt,
 				 va_list args);
-char *EXPORT_FUNC(grub_asprintf) (const char *fmt, ...)
+char *EXPORT_FUNC(grub_xasprintf) (const char *fmt, ...)
      __attribute__ ((format (printf, 1, 2)));
-char *EXPORT_FUNC(grub_avsprintf) (const char *fmt, va_list args);
+char *EXPORT_FUNC(grub_xvasprintf) (const char *fmt, va_list args);
 void EXPORT_FUNC(grub_exit) (void) __attribute__ ((noreturn));
 void EXPORT_FUNC(grub_abort) (void) __attribute__ ((noreturn));
 grub_size_t EXPORT_FUNC(grub_utf8_to_ucs4) (grub_uint32_t *dest,
diff --git a/kern/device.c b/kern/device.c
index 3727ddcd9..5cfd190f3 100644
--- a/kern/device.c
+++ b/kern/device.c
@@ -146,7 +146,7 @@ grub_device_iterate (int (*hook) (const char *name))
 	  return 1;
 	}
 
-      p->name = grub_asprintf ("%s,%s", disk->name, partition_name);
+      p->name = grub_xasprintf ("%s,%s", disk->name, partition_name);
       if (!p->name)
 	{
 	  grub_free (partition_name);
diff --git a/kern/dl.c b/kern/dl.c
index ce134a34f..4735a004a 100644
--- a/kern/dl.c
+++ b/kern/dl.c
@@ -627,7 +627,7 @@ grub_dl_load (const char *name)
     return 0;
   }
 
-  filename = grub_asprintf ("%s/%s.mod", grub_dl_dir, name);
+  filename = grub_xasprintf ("%s/%s.mod", grub_dl_dir, name);
   if (! filename)
     return 0;
 
diff --git a/kern/efi/init.c b/kern/efi/init.c
index 7f5f4ddd2..a0b4ff779 100644
--- a/kern/efi/init.c
+++ b/kern/efi/init.c
@@ -63,7 +63,7 @@ grub_efi_set_prefix (void)
 	  if (p)
 	    *p = '\0';
 
-	  prefix = grub_asprintf ("(%s)%s", device, file);
+	  prefix = grub_xasprintf ("(%s)%s", device, file);
 	  if (prefix)
 	    {
 	      
diff --git a/kern/env.c b/kern/env.c
index 49a8db362..cebb4eeff 100644
--- a/kern/env.c
+++ b/kern/env.c
@@ -357,7 +357,7 @@ grub_register_variable_hook (const char *name,
 static char *
 mangle_data_slot_name (const char *name)
 {
-  return grub_asprintf ("\e%s", name);
+  return grub_xasprintf ("\e%s", name);
 }
 
 grub_err_t
diff --git a/kern/ieee1275/init.c b/kern/ieee1275/init.c
index b09623f1b..04e4e2dca 100644
--- a/kern/ieee1275/init.c
+++ b/kern/ieee1275/init.c
@@ -111,7 +111,7 @@ grub_machine_set_prefix (void)
 	  *lastslash = '\0';
 	  grub_translate_ieee1275_path (filename);
 
-	  newprefix = grub_asprintf ("%s%s", prefix, filename);
+	  newprefix = grub_xasprintf ("%s%s", prefix, filename);
 	  if (newprefix)
 	    {
 	      grub_free (prefix);
diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index 50bd9557a..5f0aad119 100644
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -82,7 +82,7 @@ grub_children_iterate (char *devpath,
 				      IEEE1275_MAX_PROP_LEN, &actual))
 	continue;
 
-      fullname = grub_asprintf ("%s/%s", devpath, childname);
+      fullname = grub_xasprintf ("%s/%s", devpath, childname);
       if (!fullname)
 	{
 	  grub_free (childname);
@@ -332,7 +332,7 @@ grub_ieee1275_parse_args (const char *path, enum grub_ieee1275_parse_type ptype)
 
 	      /* Make sure filepath has leading backslash.  */
 	      if (filepath[0] != '\\')
-		ret = grub_asprintf ("\\%s", filepath);
+		ret = grub_xasprintf ("\\%s", filepath);
 	      else
 		ret = grub_strdup (filepath);
 	    }
@@ -382,10 +382,10 @@ grub_ieee1275_encode_devname (const char *path)
 	/* GRUB partition 1 is OF partition 0.  */
 	partno++;
 
-      encoding = grub_asprintf ("(%s,%d)", device, partno);
+      encoding = grub_xasprintf ("(%s,%d)", device, partno);
     }
   else
-    encoding = grub_asprintf ("(%s)", device);
+    encoding = grub_xasprintf ("(%s)", device);
 
   grub_free (partition);
   grub_free (device);
diff --git a/kern/misc.c b/kern/misc.c
index b1446de5c..ba31d24bb 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -913,7 +913,7 @@ grub_snprintf (char *str, grub_size_t n, const char *fmt, ...)
 #define PREALLOC_SIZE 255
 
 char *
-grub_avsprintf (const char *fmt, va_list ap)
+grub_xvasprintf (const char *fmt, va_list ap)
 {
   grub_size_t s, as = PREALLOC_SIZE;
   char *ret;
@@ -934,13 +934,13 @@ grub_avsprintf (const char *fmt, va_list ap)
 }
 
 char *
-grub_asprintf (const char *fmt, ...)
+grub_xasprintf (const char *fmt, ...)
 {
   va_list ap;
   char *ret;
 
   va_start (ap, fmt);
-  ret = grub_avsprintf (fmt, ap);
+  ret = grub_xvasprintf (fmt, ap);
   va_end (ap);
 
   return ret;
diff --git a/kern/sparc64/ieee1275/init.c b/kern/sparc64/ieee1275/init.c
index 339d836a3..115328f40 100644
--- a/kern/sparc64/ieee1275/init.c
+++ b/kern/sparc64/ieee1275/init.c
@@ -90,7 +90,7 @@ grub_machine_set_prefix (void)
 	}
       prefix = grub_ieee1275_encode_devname (bootpath);
 
-      path = grub_asprintf("%s%s", prefix, grub_prefix);
+      path = grub_xasprintf("%s%s", prefix, grub_prefix);
 
       grub_strcpy (grub_prefix, path);
 
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 7215c4e82..2598371b7 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -1150,7 +1150,7 @@ grub_cmd_freebsd_loadenv (grub_command_t cmd __attribute__ ((unused)),
 	  if (*p == '"')
 	    p++;
 
-	  name = grub_asprintf ("kFreeBSD.%s", curr);
+	  name = grub_xasprintf ("kFreeBSD.%s", curr);
 	  if (!name)
 	    goto fail;
 	  if (grub_env_set (name, p))
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index c764dad25..5d9edbe7d 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -519,7 +519,7 @@ grub_linux_boot (void)
      May change in future if we have modes without framebuffer.  */
   if (modevar && *modevar != 0)
     {
-      tmp = grub_asprintf ("%s;text", modevar);
+      tmp = grub_xasprintf ("%s;text", modevar);
       if (! tmp)
 	return grub_errno;
       err = grub_video_set_mode (tmp, 0, 0);
@@ -797,7 +797,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 	    linux_mode
 	      = &linux_vesafb_modes[vid_mode - GRUB_LINUX_VID_MODE_VESA_START];
 
-	    buf = grub_asprintf ("%ux%ux%u,%ux%u",
+	    buf = grub_xasprintf ("%ux%ux%u,%ux%u",
 				 linux_vesafb_res[linux_mode->res_index].width,
 				 linux_vesafb_res[linux_mode->res_index].height,
 				 linux_mode->depth,
diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index 16c19b6d1..fc9588269 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -252,11 +252,11 @@ grub_multiboot (int argc, char *argv[])
 	  {
 	    char *buf;
 	    if (header->depth && header->width && header->height)
-	      buf = grub_asprintf ("%dx%dx%d,%dx%d,auto", header->width,
+	      buf = grub_xasprintf ("%dx%dx%d,%dx%d,auto", header->width,
 				   header->height, header->depth, header->width,
 				   header->height);
 	    else if (header->width && header->height)
-	      buf = grub_asprintf ("%dx%d,auto", header->width, header->height);
+	      buf = grub_xasprintf ("%dx%d,auto", header->width, header->height);
 	    else
 	      buf = grub_strdup ("auto");
 
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index 4493c03c7..a154d1b23 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -150,7 +150,7 @@ set_video_mode (void)
       else
 	{
 	  char *tmp;
-	  tmp = grub_asprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
+	  tmp = grub_xasprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
 	  if (! tmp)
 	    return grub_errno;
 	  err = grub_video_set_mode (tmp, 0, 0);
diff --git a/loader/i386/pc/xnu.c b/loader/i386/pc/xnu.c
index 1c8b1ddec..c683dd0f9 100644
--- a/loader/i386/pc/xnu.c
+++ b/loader/i386/pc/xnu.c
@@ -47,7 +47,7 @@ grub_xnu_set_video (struct grub_xnu_boot_params *params)
 			       32 << GRUB_VIDEO_MODE_TYPE_DEPTH_POS);
   else
     {
-      tmp = grub_asprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
+      tmp = grub_xasprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
       if (! tmp)
 	return grub_error (GRUB_ERR_OUT_OF_MEMORY,
 			   "couldn't allocate temporary storag");
diff --git a/loader/xnu.c b/loader/xnu.c
index 30ce95b3f..e0a2dfe8b 100644
--- a/loader/xnu.c
+++ b/loader/xnu.c
@@ -569,7 +569,7 @@ grub_xnu_register_memory (char *prefix, int *suffix,
     return grub_error (GRUB_ERR_OUT_OF_MEMORY, "can't register memory");
   if (suffix)
     {
-      driverkey->name = grub_asprintf ("%s%d", prefix, (*suffix)++);
+      driverkey->name = grub_xasprintf ("%s%d", prefix, (*suffix)++);
       if (!driverkey->name)
 	return grub_error (GRUB_ERR_OUT_OF_MEMORY, "can't register memory");
     }
diff --git a/normal/autofs.c b/normal/autofs.c
index 94c08c59e..57e43fdf4 100644
--- a/normal/autofs.c
+++ b/normal/autofs.c
@@ -57,7 +57,7 @@ read_fs_list (void)
     {
       char *filename;
 
-      filename = grub_asprintf ("%s/fs.lst", prefix);
+      filename = grub_xasprintf ("%s/fs.lst", prefix);
       if (filename)
 	{
 	  grub_file_t file;
diff --git a/normal/completion.c b/normal/completion.c
index aed4c4787..13e8f7a6b 100644
--- a/normal/completion.c
+++ b/normal/completion.c
@@ -107,7 +107,7 @@ iterate_partition (grub_disk_t disk, const grub_partition_t p)
   if (! partition_name)
     return 1;
 
-  name = grub_asprintf ("%s,%s", disk_name, partition_name);
+  name = grub_xasprintf ("%s,%s", disk_name, partition_name);
   grub_free (partition_name);
 
   if (! name)
@@ -138,7 +138,7 @@ iterate_dir (const char *filename, const struct grub_dirhook_info *info)
     {
       char *fname;
 
-      fname = grub_asprintf ("%s/", filename);
+      fname = grub_xasprintf ("%s/", filename);
       if (add_completion (fname, "", GRUB_COMPLETION_TYPE_FILE))
 	{
 	  grub_free (fname);
@@ -359,7 +359,7 @@ complete_arguments (char *command)
       if (!option->longarg)
 	continue;
 
-      longarg = grub_asprintf ("--%s", option->longarg);
+      longarg = grub_xasprintf ("--%s", option->longarg);
       if (!longarg)
 	return 1;
 
diff --git a/normal/crypto.c b/normal/crypto.c
index 7ca0de900..932f26f97 100644
--- a/normal/crypto.c
+++ b/normal/crypto.c
@@ -80,7 +80,7 @@ read_crypto_list (void)
       return;
     }
   
-  filename = grub_asprintf ("%s/crypto.lst", prefix);
+  filename = grub_xasprintf ("%s/crypto.lst", prefix);
   if (!filename)
     {
       grub_errno = GRUB_ERR_NONE;
diff --git a/normal/dyncmd.c b/normal/dyncmd.c
index 8f324626c..ca9a82289 100644
--- a/normal/dyncmd.c
+++ b/normal/dyncmd.c
@@ -69,7 +69,7 @@ read_command_list (void)
     {
       char *filename;
 
-      filename = grub_asprintf ("%s/command.lst", prefix);
+      filename = grub_xasprintf ("%s/command.lst", prefix);
       if (filename)
 	{
 	  grub_file_t file;
diff --git a/normal/handler.c b/normal/handler.c
index 034be77d1..686626929 100644
--- a/normal/handler.c
+++ b/normal/handler.c
@@ -172,7 +172,7 @@ read_handler_list (void)
     {
       char *filename;
 
-      filename = grub_asprintf ("%s/handler.lst", prefix);
+      filename = grub_xasprintf ("%s/handler.lst", prefix);
       if (filename)
 	{
 	  grub_file_t file;
diff --git a/normal/main.c b/normal/main.c
index 0c192712f..6e3518a59 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -412,7 +412,7 @@ grub_normal_init_page (struct grub_term_output *term)
  
   grub_term_cls (term);
 
-  msg_formatted = grub_asprintf (msg, PACKAGE_VERSION);
+  msg_formatted = grub_xasprintf (msg, PACKAGE_VERSION);
   if (!msg_formatted)
     return;
  
@@ -502,7 +502,7 @@ grub_cmd_normal (struct grub_command *cmd __attribute__ ((unused)),
       prefix = grub_env_get ("prefix");
       if (prefix)
 	{
-	  config = grub_asprintf ("%s/grub.cfg", prefix);
+	  config = grub_xasprintf ("%s/grub.cfg", prefix);
 	  if (! config)
 	    goto quit;
 
@@ -541,7 +541,7 @@ grub_normal_reader_init (int nested)
   const char *msg_esc = _("ESC at any time exits.");
   char *msg_formatted;
 
-  msg_formatted = grub_asprintf (msg, nested ? msg_esc : "");
+  msg_formatted = grub_xasprintf (msg, nested ? msg_esc : "");
   if (!msg_formatted)
     return grub_errno;
 
@@ -566,9 +566,9 @@ grub_normal_read_line_real (char **line, int cont, int nested)
   char *prompt;
 
   if (cont)
-    prompt = grub_asprintf (">");
+    prompt = grub_xasprintf (">");
   else
-    prompt = grub_asprintf ("%s>", parser->name);
+    prompt = grub_xasprintf ("%s>", parser->name);
 
   if (!prompt)
     return grub_errno;
diff --git a/normal/menu_text.c b/normal/menu_text.c
index f7a1358f4..b39f57512 100644
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -187,7 +187,7 @@ command-line or ESC to return menu."), STANDARD_MARGIN, STANDARD_MARGIN,
 			  "entry is highlighted.\n");
       char *msg_translated;
 
-      msg_translated = grub_asprintf (msg, (grub_uint32_t) GRUB_TERM_DISP_UP,
+      msg_translated = grub_xasprintf (msg, (grub_uint32_t) GRUB_TERM_DISP_UP,
 				     (grub_uint32_t) GRUB_TERM_DISP_DOWN);
       if (!msg_translated)
 	return;
@@ -367,7 +367,7 @@ menu_text_print_timeout (int timeout, void *dataptr)
 
   grub_term_gotoxy (data->term, 0, grub_term_height (data->term) - 3);
 
-  msg_translated = grub_asprintf (msg, timeout);
+  msg_translated = grub_xasprintf (msg, timeout);
   if (!msg_translated)
     {
       grub_print_error ();
diff --git a/normal/term.c b/normal/term.c
index 86902c7a1..42201fbb3 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -167,7 +167,7 @@ read_terminal_list (void)
       return;
     }
   
-  filename = grub_asprintf ("%s/terminal.lst", prefix);
+  filename = grub_xasprintf ("%s/terminal.lst", prefix);
   if (!filename)
     {
       grub_errno = GRUB_ERR_NONE;
diff --git a/partmap/acorn.c b/partmap/acorn.c
index aead5ff85..081b6ee94 100644
--- a/partmap/acorn.c
+++ b/partmap/acorn.c
@@ -175,7 +175,7 @@ fail:
 static char *
 acorn_partition_map_get_name (const grub_partition_t p)
 {
-  return grub_asprintf ("%d", p->index + 1);
+  return grub_xasprintf ("%d", p->index + 1);
 }
 
 
diff --git a/partmap/amiga.c b/partmap/amiga.c
index 691bd4c3e..f832db354 100644
--- a/partmap/amiga.c
+++ b/partmap/amiga.c
@@ -184,7 +184,7 @@ amiga_partition_map_probe (grub_disk_t disk, const char *str)
 static char *
 amiga_partition_map_get_name (const grub_partition_t p)
 {
-  return grub_asprintf ("%d", p->index + 1);
+  return grub_xasprintf ("%d", p->index + 1);
 }
 
 
diff --git a/partmap/apple.c b/partmap/apple.c
index 18dbef586..a1a645acf 100644
--- a/partmap/apple.c
+++ b/partmap/apple.c
@@ -227,7 +227,7 @@ apple_partition_map_probe (grub_disk_t disk, const char *str)
 static char *
 apple_partition_map_get_name (const grub_partition_t p)
 {
-  return grub_asprintf ("%d", p->index + 1);
+  return grub_xasprintf ("%d", p->index + 1);
 }
 
 
diff --git a/partmap/gpt.c b/partmap/gpt.c
index ed583e0a3..cb1229bee 100644
--- a/partmap/gpt.c
+++ b/partmap/gpt.c
@@ -162,7 +162,7 @@ gpt_partition_map_probe (grub_disk_t disk, const char *str)
 static char *
 gpt_partition_map_get_name (const grub_partition_t p)
 {
-  return grub_asprintf ("%d", p->index + 1);
+  return grub_xasprintf ("%d", p->index + 1);
 }
 
 
diff --git a/partmap/msdos.c b/partmap/msdos.c
index ea3266605..1c3861cc7 100644
--- a/partmap/msdos.c
+++ b/partmap/msdos.c
@@ -303,11 +303,11 @@ pc_partition_map_get_name (const grub_partition_t p)
   struct grub_msdos_partition *pcdata = p->data;
 
   if (pcdata->bsd_part < 0)
-    return grub_asprintf ("%d", pcdata->dos_part + 1);
+    return grub_xasprintf ("%d", pcdata->dos_part + 1);
   else if (pcdata->dos_part < 0)
-    return grub_asprintf ("%c", pcdata->bsd_part + 'a');
+    return grub_xasprintf ("%c", pcdata->bsd_part + 'a');
   else
-    return grub_asprintf ("%d,%c", pcdata->dos_part + 1,
+    return grub_xasprintf ("%d,%c", pcdata->dos_part + 1,
 			  pcdata->bsd_part + 'a');
 }
 
diff --git a/partmap/sun.c b/partmap/sun.c
index 89d0c5303..42cf0d598 100644
--- a/partmap/sun.c
+++ b/partmap/sun.c
@@ -184,7 +184,7 @@ sun_partition_map_probe (grub_disk_t disk, const char *str)
 static char *
 sun_partition_map_get_name (const grub_partition_t p)
 {
-  return grub_asprintf ("%d", p->index + 1);
+  return grub_xasprintf ("%d", p->index + 1);
 }
 
 /* Partition map type.  */
diff --git a/term/gfxterm.c b/term/gfxterm.c
index 50752bf89..a8aca7820 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -270,7 +270,7 @@ grub_gfxterm_init (void)
 			       GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
   else
     {
-      tmp = grub_asprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
+      tmp = grub_xasprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
       if (!tmp)
 	return grub_errno;
       err = grub_video_set_mode (tmp, GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index b6be80cbe..dd4270eff 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -128,7 +128,7 @@ grub_ofconsole_setcolorstate (grub_term_color_state state)
       return;
     }
 
-  setcol = grub_asprintf ("\e[3%dm\e[4%dm", fg, bg);
+  setcol = grub_xasprintf ("\e[3%dm\e[4%dm", fg, bg);
   if (setcol)
     grub_ofconsole_writeesc (setcol);
   grub_free (setcol);
@@ -301,7 +301,7 @@ grub_ofconsole_gotoxy (grub_uint8_t x, grub_uint8_t y)
       grub_curr_x = x;
       grub_curr_y = y;
 
-      s = grub_asprintf ("\e[%d;%dH", y + 1, x + 1);
+      s = grub_xasprintf ("\e[%d;%dH", y + 1, x + 1);
       if (s)
 	grub_ofconsole_writeesc (s);
       grub_free (s);
diff --git a/tests/lib/test.c b/tests/lib/test.c
index a90a9972c..b5c054370 100644
--- a/tests/lib/test.c
+++ b/tests/lib/test.c
@@ -56,7 +56,7 @@ add_failure (const char *file,
   failure->file = grub_strdup (file ? : "<unknown_file>");
   failure->funp = grub_strdup (funp ? : "<unknown_function>");
   failure->line = line;
-  failure->message = grub_avsprintf (fmt, args);
+  failure->message = grub_xvasprintf (fmt, args);
 
   grub_list_push (GRUB_AS_LIST_P (&failure_list), GRUB_AS_LIST (failure));
 }
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index e249920fe..bf30286a4 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -285,8 +285,8 @@ fstest (char **images, int num_disks, int cmd, int n, char **args)
 
   for (i = 0; i < num_disks; i++)
     {
-      loop_name = grub_asprintf ("loop%d", i);
-      host_file = grub_asprintf ("(host)%s", images[i]);
+      loop_name = grub_xasprintf ("loop%d", i);
+      host_file = grub_xasprintf ("(host)%s", images[i]);
 
       if (!loop_name || !host_file)
 	{
@@ -337,7 +337,7 @@ fstest (char **images, int num_disks, int cmd, int n, char **args)
   for (i = 0; i < num_disks; i++)
     {
       grub_free (loop_name);
-      loop_name = grub_asprintf ("loop%d", i);
+      loop_name = grub_xasprintf ("loop%d", i);
       if (!loop_name)
 	{
 	  grub_free (host_file);

From 93079f9f96d045d22ed610de34bdd20680592765 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 09:28:35 +0100
Subject: [PATCH 0348/1628] ChangeLog

---
 ChangeLog.xasprintf | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 ChangeLog.xasprintf

diff --git a/ChangeLog.xasprintf b/ChangeLog.xasprintf
new file mode 100644
index 000000000..0aeefe93c
--- /dev/null
+++ b/ChangeLog.xasprintf
@@ -0,0 +1,17 @@
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/misc.h (grub_sprintf): Removed. All users switched to
+	grub_xasprintf or grub_snprintf.
+	(grub_vsprintf): Likewise.
+	(grub_snprintf): New proto.
+	(grub_vsnprintf): Likewise.
+	(grub_xasprintf): Likewise.
+	(grub_xvasprintf): Likewise.
+	* kern/misc.c (grub_vprintf): Use grub_vsnprintf_real.
+	(grub_sprintf): Removed.
+	(grub_vsnprintf): New function.
+	(grub_snprintf): Likewise.
+	(grub_xvasprintf): Likewise.
+	(grub_xasprintf): Likewise.
+	(grub_vsprintf): Renamed to ...
+	(grub_vsnprintf_real): ...this. New argument max_len.

From 327dbcd7b93721524508b806bec9198f18ff71fd Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 10:59:15 +0100
Subject: [PATCH 0349/1628] 2010-01-20  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Don't try to generate lists for kernel.img.

	* conf/i386-efi.rmk (pkglib_PROGRAMS): New variable.
	(pkglib_MODULES): Remove kernel.img.
	(kernel_img_EXPORTS): Removed.
	(kernel_img_RELOCATABLE): New variable.
	* conf/x86_64-efi.rmk: Likewise.
	* genmk.rb: Remove *_EXPORTS support and add *_RELOCATABLE support.
---
 ChangeLog           | 11 +++++++++++
 conf/i386-efi.rmk   |  5 +++--
 conf/x86_64-efi.rmk |  5 +++--
 genmk.rb            | 10 ++++++----
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7c842e777..f814b940d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Don't try to generate lists for kernel.img.
+
+	* conf/i386-efi.rmk (pkglib_PROGRAMS): New variable.
+	(pkglib_MODULES): Remove kernel.img.
+	(kernel_img_EXPORTS): Removed.
+	(kernel_img_RELOCATABLE): New variable.
+	* conf/x86_64-efi.rmk: Likewise.
+	* genmk.rb: Remove *_EXPORTS support and add *_RELOCATABLE support.
+
 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/misc.h (grub_sprintf): Removed. All users switched to
diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index f3281a1bc..cbadc7e1a 100644
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -30,13 +30,14 @@ sbin_SCRIPTS = grub-install
 grub_install_SOURCES = util/i386/efi/grub-install.in
 
 # Modules.
-pkglib_MODULES = kernel.img chain.mod appleldr.mod \
+pkglib_PROGRAMS = kernel.img
+pkglib_MODULES = chain.mod appleldr.mod \
 	linux.mod halt.mod reboot.mod pci.mod lspci.mod \
 	datetime.mod date.mod datehook.mod loadbios.mod \
 	fixvideo.mod mmap.mod acpi.mod
 
 # For kernel.img.
-kernel_img_EXPORTS = no
+kernel_img_RELOCATABLE = yes
 kernel_img_SOURCES = kern/i386/efi/startup.S kern/main.c kern/device.c \
 	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
 	kern/misc.c kern/mm.c kern/term.c \
diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 122700711..e5b3aec25 100644
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -29,13 +29,14 @@ sbin_SCRIPTS = grub-install
 grub_install_SOURCES = util/i386/efi/grub-install.in
 
 # Modules.
-pkglib_MODULES = kernel.img chain.mod appleldr.mod 	\
+pkglib_PROGRAMS = kernel.img
+pkglib_MODULES = chain.mod appleldr.mod 	\
 	halt.mod reboot.mod linux.mod pci.mod lspci.mod \
 	datetime.mod date.mod datehook.mod loadbios.mod \
 	fixvideo.mod mmap.mod acpi.mod
 
 # For kernel.img.
-kernel_img_EXPORTS = no
+kernel_img_RELOCATABLE = yes
 kernel_img_SOURCES = kern/x86_64/efi/startup.S kern/x86_64/efi/callwrap.S \
 	kern/main.c kern/device.c \
 	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
diff --git a/genmk.rb b/genmk.rb
index 1ce064022..df03e1dfe 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -132,13 +132,11 @@ clean-module-#{@name}.#{@rule_count}:
 
 CLEAN_MODULE_TARGETS += clean-module-#{@name}.#{@rule_count}
 
-ifneq ($(#{prefix}_EXPORTS),no)
 clean-module-#{@name}-symbol.#{@rule_count}:
 	rm -f #{defsym}
 
 CLEAN_MODULE_TARGETS += clean-module-#{@name}-symbol.#{@rule_count}
 DEFSYMFILES += #{defsym}
-endif
 mostlyclean-module-#{@name}.#{@rule_count}:
 	rm -f #{deps_str}
 
@@ -170,7 +168,6 @@ endif
 #{mod_src}: $(builddir)/moddep.lst $(srcdir)/genmodsrc.sh
 	sh $(srcdir)/genmodsrc.sh '#{mod_name}' $< > $@ || (rm -f $@; exit 1)
 
-ifneq ($(#{prefix}_EXPORTS),no)
 ifneq ($(TARGET_APPLE_CC),1)
 #{defsym}: #{pre_obj}
 	$(NM) -g --defined-only -P -p $< | sed 's/^\\([^ ]*\\).*/\\1 #{mod_name}/' > $@
@@ -178,7 +175,6 @@ else
 #{defsym}: #{pre_obj}
 	$(NM) -g -P -p $< | grep -E '^[a-zA-Z0-9_]* [TDS]'  | sed 's/^\\([^ ]*\\).*/\\1 #{mod_name}/' > $@
 endif
-endif
 
 #{undsym}: #{pre_obj}
 	echo '#{mod_name}' > $@
@@ -331,9 +327,15 @@ class Program
     "CLEANFILES += #{@name} #{objs_str}
 MOSTLYCLEANFILES += #{deps_str}
 
+ifeq ($(#{prefix}_RELOCATABLE),yes)
+#{@name}: $(#{prefix}_DEPENDENCIES) #{objs_str}
+	$(TARGET_CC) -Wl,-r,-d -o $@ #{objs_str} $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS)
+	$(STRIP) --strip-unneeded -K start -R .note -R .comment $@
+else
 #{@name}: $(#{prefix}_DEPENDENCIES) #{objs_str}
 	$(TARGET_CC) -o $@ #{objs_str} $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS)
 	$(STRIP) -R .rel.dyn -R .reginfo -R .note -R .comment $@
+endif
 
 " + objs.collect_with_index do |obj, i|
       src = sources[i]

From 69a30a6e8e01247536ababf08c57ec92969f2a57 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 11:12:45 +0100
Subject: [PATCH 0350/1628] Pass NULL as second argument to netbsd reboot
 syscall

---
 tests/boot/knetbsd.init-i386.S   | 5 +----
 tests/boot/knetbsd.init-x86_64.S | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/tests/boot/knetbsd.init-i386.S b/tests/boot/knetbsd.init-i386.S
index 200aed01f..c751421ba 100644
--- a/tests/boot/knetbsd.init-i386.S
+++ b/tests/boot/knetbsd.init-i386.S
@@ -78,7 +78,7 @@ _start:
 
 	/* shutdown.  */
 	movl $SYSCALL_RESET, %eax
-	pushl $haltmsg
+	pushl $0
 	pushl $(RESET_POWEROFF|RESET_HALT|RESET_NOSYNC)
 	pushl $0
 	int $SYSCALL_INT
@@ -107,9 +107,6 @@ device:
 message:
 	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
 messageend:
-haltmsg:
-	.ascii "Machine halted"
-	.byte 0
 devfstype:
 	.ascii "tmpfs"
 	.byte 0
diff --git a/tests/boot/knetbsd.init-x86_64.S b/tests/boot/knetbsd.init-x86_64.S
index e56174f9c..dfc64e99d 100644
--- a/tests/boot/knetbsd.init-x86_64.S
+++ b/tests/boot/knetbsd.init-x86_64.S
@@ -67,7 +67,7 @@ _start:
 	/* shutdown.  */
 	movq $SYSCALL_RESET, %rax
 	movq $(RESET_POWEROFF|RESET_HALT|RESET_NOSYNC), %rdi
-	movq $haltmsg, %rsi
+	movq $0, %rsi
 	syscall
 
 	/* exit (1). Shouldn't be reached.  */
@@ -92,9 +92,6 @@ device:
 message:
 	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
 messageend:
-haltmsg:
-	.ascii "Machine halted"
-	.byte 0
 devfstype:
 	.ascii "tmpfs"
 	.byte 0

From 02cf98ca8d6d7663864adbb5e44a8c76c9ab4096 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 13:27:23 +0100
Subject: [PATCH 0351/1628] 2010-01-20  Vladimir Serbinenko 
 <phcoder@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* configure.ac: Add /usr/share/fonts/unifont/unifont.pcf.gz
	as possible unifont location (Gentoo).
	Reported by: Alexander Brüning
---
 ChangeLog    | 6 ++++++
 configure.ac | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f814b940d..9883b5f02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Add /usr/share/fonts/unifont/unifont.pcf.gz
+	as possible unifont location (Gentoo).
+	Reported by: Alexander Brüning
+
 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Don't try to generate lists for kernel.img.
diff --git a/configure.ac b/configure.ac
index a8e137b90..b1435de44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,7 +168,7 @@ if test "x$YACC" = x; then
   AC_MSG_ERROR([bison is not found])
 fi
 
-for file in /usr/src/unifont.bdf /usr/share/fonts/X11/misc/unifont.pcf.gz ; do
+for file in /usr/src/unifont.bdf /usr/share/fonts/X11/misc/unifont.pcf.gz /usr/share/fonts/unifont/unifont.pcf.gz; do
   if test -e $file ; then
     AC_SUBST([FONT_SOURCE], [$file])
     break

From 94fabf587a791d77daf7eeee4c2442d469348e06 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 20 Jan 2010 13:55:30 +0000
Subject: [PATCH 0352/1628] 2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>

	* util/grub.d/00_header.in: Fix handling of locale_dir.
---
 ChangeLog                | 4 ++++
 util/grub.d/00_header.in | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9883b5f02..fbd2a37db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* util/grub.d/00_header.in: Fix handling of locale_dir.
+
 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Add /usr/share/fonts/unifont/unifont.pcf.gz
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 0048ebed1..0610792c6 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # grub-mkconfig helper script.
-# Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 2006,2007,2008,2009,2010  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
@@ -122,7 +122,9 @@ esac
 
 # Gettext variables and module
 if [ "x${LANG}" != "xC" ] ; then
+    prepare_grub_to_access_device $(${grub_probe} --target=device ${locale_dir})
   cat << EOF
+set locale_dir=(\$root)$(make_system_path_relative_to_its_root ${locale_dir})
 set locale_dir=${locale_dir}
 set lang=${grub_lang}
 insmod gettext

From 6419c43e4f767cd5f3dcf4258c45bd3edcb60efa Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 20 Jan 2010 13:56:45 +0000
Subject: [PATCH 0353/1628] Fix indentation in util/grub.d/00_header.in output

---
 util/grub.d/00_header.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 306bef3c3..7cee825d2 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -97,11 +97,11 @@ EOF
 if [ x$GRUB_THEME != x ] && [ -f $GRUB_THEME ] \
 	&& is_path_readable_by_grub $GRUB_THEME; then
     echo "Found theme: $GRUB_THEME" >&2
-    prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME`
+    prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME` | sed -e "s/^/  /"
     cat << EOF
-insmod gfxmenu
-set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
-set menuviewer=gfxmenu
+  insmod gfxmenu
+  set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
+  set menuviewer=gfxmenu
 EOF
 fi
     cat << EOF

From 34a66d995b3fc6222cdbfaa2c3cf48398de3034c Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 20 Jan 2010 14:10:46 +0000
Subject: [PATCH 0354/1628] 2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>

	* util/grub.d/00_header.in: Fix stupid mistake from last commit.
---
 ChangeLog                | 4 ++++
 util/grub.d/00_header.in | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fbd2a37db..547070e8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* util/grub.d/00_header.in: Fix stupid mistake from last commit.
+
 2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* util/grub.d/00_header.in: Fix handling of locale_dir.
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 0610792c6..23e0cb569 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -125,7 +125,6 @@ if [ "x${LANG}" != "xC" ] ; then
     prepare_grub_to_access_device $(${grub_probe} --target=device ${locale_dir})
   cat << EOF
 set locale_dir=(\$root)$(make_system_path_relative_to_its_root ${locale_dir})
-set locale_dir=${locale_dir}
 set lang=${grub_lang}
 insmod gettext
 EOF

From cbca0ada6273773415e192fb53e9e987f17b05f5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 15:26:31 +0100
Subject: [PATCH 0355/1628] 2010-01-20  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Fix any-emu compilation.

	* conf/any-emu.rmk (bin_UTILITIES): Add grub-bin2h.
	* grub_bin2h_SOURCES: New variable.
---
 ChangeLog        | 7 +++++++
 conf/any-emu.rmk | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 547070e8a..7274a9920 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Fix any-emu compilation.
+
+	* conf/any-emu.rmk (bin_UTILITIES): Add grub-bin2h.
+	* grub_bin2h_SOURCES: New variable.
+
 2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* util/grub.d/00_header.in: Fix stupid mistake from last commit.
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index cee9e8338..5aa923893 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -98,3 +98,6 @@ endif
 grub_script.tab.c grub_script.tab.h: script/parser.y
 	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/parser.y
 DISTCLEANFILES += grub_script.tab.c grub_script.tab.h
+
+bin_UTILITIES += grub-bin2h
+grub_bin2h_SOURCES = gnulib/progname.c util/bin2h.c

From f66924a414b5440c06d73d0a4d74ded3cb580637 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 20 Jan 2010 14:40:00 +0000
Subject: [PATCH 0356/1628] 2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>

	* util/misc.c (make_system_path_relative_to_its_root): Work around
	special-casing of "/", as previous incarnation of this routine did.
---
 ChangeLog   | 5 +++++
 util/misc.c | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 7274a9920..c4048a66e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* util/misc.c (make_system_path_relative_to_its_root): Work around
+	special-casing of "/", as previous incarnation of this routine did.
+
 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix any-emu compilation.
diff --git a/util/misc.c b/util/misc.c
index 0b682c445..c5ab62e42 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -577,6 +577,13 @@ make_system_path_relative_to_its_root (const char *path)
       len--;
     }
 
+  /* This works around special-casing of "/" in Un*x.  This function never
+     prints trailing slashes (so that its output can be appended a slash
+     unconditionally).  Each slash in is considered a preceding slash, and
+     therefore the root directory is an empty string.  */
+  if (!strcmp (buf3, "/"))
+    buf3[0] = '\0';
+
   return buf3;
 }
 

From 00308ecfe8d536340a319ae5a33dc001589bf843 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 15:43:21 +0100
Subject: [PATCH 0357/1628] 2010-01-20  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* conf/common.rmk (font/font.c_DEPENDENCIES): Condition on FONT_SOURCE.
---
 ChangeLog       | 4 ++++
 conf/common.rmk | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index c4048a66e..c6b4d7baf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* conf/common.rmk (font/font.c_DEPENDENCIES): Condition on FONT_SOURCE.
+
 2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* util/misc.c (make_system_path_relative_to_its_root): Work around
diff --git a/conf/common.rmk b/conf/common.rmk
index 956ed8ec3..4e5ed9c73 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -638,7 +638,9 @@ png_mod_CFLAGS = $(COMMON_CFLAGS)
 png_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += font.mod
+ifneq (, $(FONT_SOURCE))
 font/font.c_DEPENDENCIES = ascii.h
+endif
 font_mod_SOURCES = font/font_cmd.c font/font.c
 font_mod_CFLAGS = $(COMMON_CFLAGS)
 font_mod_LDFLAGS = $(COMMON_LDFLAGS)

From d44844828a137c0325c46aedb56c2946ccb30aa0 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 20 Jan 2010 16:30:20 +0000
Subject: [PATCH 0358/1628] 2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>

	* loader/i386/linux.c (grub_cmd_linux): If `vga=' was used, write down
	that VESA is supported.
	(grub_linux_boot): Use generic framebuffer unless VESA is known to be
	supported.
---
 ChangeLog           |  7 +++++++
 loader/i386/linux.c | 10 +++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c6b4d7baf..f96b99f77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* loader/i386/linux.c (grub_cmd_linux): If `vga=' was used, write down
+	that VESA is supported.
+	(grub_linux_boot): Use generic framebuffer unless VESA is known to be
+	supported.
+
 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* conf/common.rmk (font/font.c_DEPENDENCIES): Condition on FONT_SOURCE.
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 5d9edbe7d..831d8b25a 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -536,7 +536,11 @@ grub_linux_boot (void)
     }
 
   if (! grub_linux_setup_video (params))
-    params->have_vga = GRUB_VIDEO_LINUX_TYPE_VESA;
+    {
+      /* Use generic framebuffer unless VESA is known to be supported.  */
+      if (params->have_vga != GRUB_VIDEO_LINUX_TYPE_VESA)
+	params->have_vga = GRUB_VIDEO_LINUX_TYPE_SIMPLE;
+    }
   else
     {
       params->have_vga = GRUB_VIDEO_LINUX_TYPE_TEXT;
@@ -794,6 +798,10 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 		break;
 	      }
 
+	    /* We can't detect VESA, but user is implicitly telling us that it
+	       is built-in because `vga=' parameter was used.  */
+	    params->have_vga = GRUB_VIDEO_LINUX_TYPE_VESA;
+
 	    linux_mode
 	      = &linux_vesafb_modes[vid_mode - GRUB_LINUX_VID_MODE_VESA_START];
 

From 96d73208a17dea7455a9dee49fc57270bd41919c Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 20 Jan 2010 17:01:12 +0000
Subject: [PATCH 0359/1628] 2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>

	* util/grub.d/10_linux.in (linux_entry): Set gfxpayload=keep when it
	can be reliably determined to be supported.
---
 ChangeLog               | 5 +++++
 util/grub.d/10_linux.in | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f96b99f77..4ef13e931 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* util/grub.d/10_linux.in (linux_entry): Set gfxpayload=keep when it
+	can be reliably determined to be supported.
+
 2010-01-20  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* loader/i386/linux.c (grub_cmd_linux): If `vga=' was used, write down
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 3ecf454e2..90a6e83e7 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -60,6 +60,15 @@ linux_entry ()
   fi
   printf "menuentry \"${title}\" {\n" "${os}" "${version}"
   save_default_entry | sed -e "s/^/\t/"
+
+  # Use ELILO's generic "efifb" when it's known to be available.
+  # FIXME: We need an interface to select vesafb in case efifb can't be used.
+  if grep -qx "CONFIG_FB_EFI=y" /boot/config-${version} 2> /dev/null ; then
+    cat << EOF
+	set gfxpayload=keep
+EOF
+  fi
+
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi

From 61c8e880e455d4c129ab06cae7f79f98e1014256 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 20:33:01 +0100
Subject: [PATCH 0360/1628] Add comments to loadbios.c

---
 commands/efi/loadbios.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/commands/efi/loadbios.c b/commands/efi/loadbios.c
index 183ba7e85..f48e4c5cb 100644
--- a/commands/efi/loadbios.c
+++ b/commands/efi/loadbios.c
@@ -50,6 +50,7 @@ enable_rom_area (void)
       return 0;
     }
 
+  /* FIXME: should be macroified.  */
   addr = grub_pci_make_address (dev, 144);
   grub_pci_write_byte (addr++, 0x30);
   grub_pci_write_byte (addr++, 0x33);
@@ -76,6 +77,7 @@ lock_rom_area (void)
   grub_pci_address_t addr;
   grub_pci_device_t dev = { .bus = 0, .device = 0, .function = 0};
 
+  /* FIXME: should be macroified.  */
   addr = grub_pci_make_address (dev, 144);
   grub_pci_write_byte (addr++, 0x10);
   grub_pci_write_byte (addr++, 0x11);

From fdb1b2ea4e9eba8272b47e07029b05ffa6af5984 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 20:49:18 +0100
Subject: [PATCH 0361/1628] 2010-01-20  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* video/sm712.c (grub_video_sm712_setup): Use GRUB_PCI_REG_CLASS.
---
 ChangeLog     | 1 +
 video/sm712.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b54f6aeec..d789f821e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,7 @@
 	* loader/i386/efi/linux.c (find_framebuf): Use GRUB_PCI_REG_CLASS.
 	* loader/i386/efi/xnu.c (find_framebuf): Likewise.
 	* video/efi_uga.c (find_framebuf): Likewise.
+	* video/sm712.c (grub_video_sm712_setup): Likewise.
 	* util/pci.c (grub_pci_make_address): Use byte-addressed configuration
 	space.
 
diff --git a/video/sm712.c b/video/sm712.c
index 1e0f59b9d..a86470b7d 100644
--- a/video/sm712.c
+++ b/video/sm712.c
@@ -74,7 +74,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
       grub_pci_address_t addr;
       grub_uint32_t class;
 
-      addr = grub_pci_make_address (dev, 2);
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
       class = grub_pci_read (addr);
 
       if (((class >> 16) & 0xffff) != 0x0300 || pciid != 0x0712126f)
@@ -82,7 +82,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
       
       found = 1;
 
-      addr = grub_pci_make_address (dev, 4);
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
       framebuffer.base = grub_pci_read (addr);
       framebuffer.dev = dev;
 

From baccdb23a716413b74faaae556e7fbad5eb2c951 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 20:54:58 +0100
Subject: [PATCH 0362/1628] Use grub_snprintf in commands/setpci.c

---
 commands/setpci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commands/setpci.c b/commands/setpci.c
index aa5e51de9..f780547a2 100644
--- a/commands/setpci.c
+++ b/commands/setpci.c
@@ -118,7 +118,7 @@ grub_setpci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)
   if (varname)
     {
       char buf[sizeof ("XXXXXXXX")];
-      grub_sprintf (buf, "%x", regval);
+      grub_snprintf (buf, sizeof (buf), "%x", regval);
       grub_env_set (varname, buf);
       return 1;
     }

From a9ed4ff36fde7c285cdeb80879dd70659190b7a5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 22:21:08 +0100
Subject: [PATCH 0363/1628] 2010-01-20  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* conf/mips.rmk (kernel_img_HEADERS): Add env_private.h
---
 ChangeLog     | 6 +++++-
 conf/mips.rmk | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bb66685b1..64aa9d593 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2009-11-29  Vladimir Serbinenko  <phcoder@gmail.com>
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* conf/mips.rmk (kernel_img_HEADERS): Add env_private.h
+
+2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Optimise glyph lookup by Basic Multilingual Plane lookup array.
 
diff --git a/conf/mips.rmk b/conf/mips.rmk
index d0b1c484c..1ef4fc395 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -17,7 +17,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
 	symbol.h term.h time.h types.h loader.h partition.h \
 	msdos_partition.h machine/kernel.h handler.h list.h \
-	command.h machine/memory.h cpu/libgcc.h cpu/cache.h i18n.h
+	command.h machine/memory.h cpu/libgcc.h cpu/cache.h i18n.h env_private.h
 
 ifeq ($(platform), yeeloong)
 kernel_img_HEADERS += pci.h

From 67eb14272d46340bae6f69b35138d9c8996ecd00 Mon Sep 17 00:00:00 2001
From: Felix Zielcke <fzielcke@z-51.de>
Date: Wed, 20 Jan 2010 23:53:53 +0100
Subject: [PATCH 0364/1628] 2010-01-20  Felix Zielcke <fzielcke@z-51.de>

	* util/misc.c (make_system_path_relative_to_its_root): Change the work
	around for handling "/" to the correct fix.  Fix a memory leak.  Use
	xstrdup instead of strdup.
---
 ChangeLog   |  6 ++++++
 util/misc.c | 31 ++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 64aa9d593..e69ead80d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-20  Felix Zielcke <fzielcke@z-51.de>
+
+	* util/misc.c (make_system_path_relative_to_its_root): Change the work
+	around for handling "/" to the correct fix.  Fix a memory leak.  Use
+	xstrdup instead of strdup.
+
 2010-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* conf/mips.rmk (kernel_img_HEADERS): Add env_private.h
diff --git a/util/misc.c b/util/misc.c
index c5ab62e42..b4960087e 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -513,13 +513,13 @@ make_system_path_relative_to_its_root (const char *path)
     grub_util_error ("failed to get canonical path of %s", path);
 
   len = strlen (p) + 1;
-  buf = strdup (p);
+  buf = xstrdup (p);
   free (p);
 
   if (stat (buf, &st) < 0)
     grub_util_error ("cannot stat %s: %s", buf, strerror (errno));
 
-  buf2 = strdup (buf);
+  buf2 = xstrdup (buf);
   num = st.st_dev;
 
   /* This loop sets offset to the number of chars of the root
@@ -541,12 +541,16 @@ make_system_path_relative_to_its_root (const char *path)
       /* buf is another filesystem; we found it.  */
       if (st.st_dev != num)
 	{
-	  /* offset == 0 means path given is the mount point.  */
+	  /* offset == 0 means path given is the mount point.
+	     This works around special-casing of "/" in Un*x.  This function never
+	     prints trailing slashes (so that its output can be appended a slash
+	     unconditionally).  Each slash in is considered a preceding slash, and
+	     therefore the root directory is an empty string.  */
 	  if (offset == 0)
 	    {
 	      free (buf);
 	      free (buf2);
-	      return strdup ("/");
+	      return xstrdup ("");
 	    }
 	  else
 	    break;
@@ -563,11 +567,19 @@ make_system_path_relative_to_its_root (const char *path)
 	      buf2[len - 1] = '\0';
 	      len--;
 	    }
-	  return buf2;
+	  if (len > 1)
+	    return buf2;
+	  else
+	    {
+	      /* This means path given is just a backslash.  As above
+		 we have to return an empty string.  */
+	      free (buf2);
+	      return xtrdup ("");
+	    }
 	}
     }
   free (buf);
-  buf3 = strdup (buf2 + offset);
+  buf3 = xstrdup (buf2 + offset);
   free (buf2);
 
   len = strlen (buf3);
@@ -577,13 +589,6 @@ make_system_path_relative_to_its_root (const char *path)
       len--;
     }
 
-  /* This works around special-casing of "/" in Un*x.  This function never
-     prints trailing slashes (so that its output can be appended a slash
-     unconditionally).  Each slash in is considered a preceding slash, and
-     therefore the root directory is an empty string.  */
-  if (!strcmp (buf3, "/"))
-    buf3[0] = '\0';
-
   return buf3;
 }
 

From caab4fd6ca335f1b2b397f77f5816a3785685a6b Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Thu, 21 Jan 2010 08:04:49 +0000
Subject: [PATCH 0365/1628] 2010-01-21  Robert Millan  <rmh.grub@aybabtu.com>

	* po/POTFILES: Remove mkisofs-related files.  They have their own TLP
	domain now.
---
 ChangeLog   | 5 +++++
 po/POTFILES | 9 ---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e69ead80d..d1e146bca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-21  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* po/POTFILES: Remove mkisofs-related files.  They have their own TLP
+	domain now.
+
 2010-01-20  Felix Zielcke <fzielcke@z-51.de>
 
 	* util/misc.c (make_system_path_relative_to_its_root): Change the work
diff --git a/po/POTFILES b/po/POTFILES
index 04a3516fa..5fabb0634 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -79,12 +79,3 @@ term/serial.c
 
 util/grub-mkrawimage.c
 util/i386/pc/grub-setup.c
-
-util/mkisofs/eltorito.c
-util/mkisofs/joliet.c
-util/mkisofs/mkisofs.c
-util/mkisofs/mkisofs.h
-util/mkisofs/multi.c
-util/mkisofs/rock.c
-util/mkisofs/tree.c
-util/mkisofs/write.c

From 01fc7054b953ee43611fb160038f9db33835f962 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 21 Jan 2010 13:58:40 +0100
Subject: [PATCH 0366/1628] 2010-01-21  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* util/misc.c (make_system_path_relative_to_its_root): Fix typo.
---
 ChangeLog   | 4 ++++
 util/misc.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d1e146bca..7f872f71a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/misc.c (make_system_path_relative_to_its_root): Fix typo.
+
 2010-01-21  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* po/POTFILES: Remove mkisofs-related files.  They have their own TLP
diff --git a/util/misc.c b/util/misc.c
index b4960087e..8f66e4350 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -574,7 +574,7 @@ make_system_path_relative_to_its_root (const char *path)
 	      /* This means path given is just a backslash.  As above
 		 we have to return an empty string.  */
 	      free (buf2);
-	      return xtrdup ("");
+	      return xstrdup ("");
 	    }
 	}
     }

From f9ab2e25d3655a4401daa0f92ed1033c77d7c307 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 21 Jan 2010 17:35:14 +0100
Subject: [PATCH 0367/1628] 2010-01-21  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* include/grub/i386/bsd.h (FREEBSD_N_BIOS_GEOM): Removed.
	(grub_freebsd_bootinfo): Rewritten.
	* loader/i386/bsd.c (grub_freebsd_boot): Use new grub_freebsd_bootinfo.
---
 ChangeLog               |  6 ++++++
 include/grub/i386/bsd.h | 30 +++++++++++-------------------
 loader/i386/bsd.c       | 20 ++++++++++----------
 3 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f872f71a..f5bb1617b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/i386/bsd.h (FREEBSD_N_BIOS_GEOM): Removed.
+	(grub_freebsd_bootinfo): Rewritten.
+	* loader/i386/bsd.c (grub_freebsd_boot): Use new grub_freebsd_bootinfo.
+
 2010-01-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/misc.c (make_system_path_relative_to_its_root): Fix typo.
diff --git a/include/grub/i386/bsd.h b/include/grub/i386/bsd.h
index e26c35652..4d55f04fb 100644
--- a/include/grub/i386/bsd.h
+++ b/include/grub/i386/bsd.h
@@ -44,33 +44,25 @@ enum bsd_kernel_types
 #define FREEBSD_B_PARTSHIFT	OPENBSD_B_PARTSHIFT
 #define FREEBSD_B_TYPESHIFT	OPENBSD_B_TYPESHIFT
 
-#define FREEBSD_BOOTINFO_VERSION 1
-#define FREEBSD_N_BIOS_GEOM	8
-
 #define FREEBSD_MODTYPE_KERNEL		"elf kernel"
 #define FREEBSD_MODTYPE_KERNEL64	"elf64 kernel"
 #define FREEBSD_MODTYPE_ELF_MODULE	"elf module"
 #define FREEBSD_MODTYPE_ELF_MODULE_OBJ	"elf obj module"
 #define FREEBSD_MODTYPE_RAW		"raw"
 
+#define FREEBSD_BOOTINFO_VERSION 1
+
 struct grub_freebsd_bootinfo
 {
-  grub_uint32_t bi_version;
-  grub_uint8_t *bi_kernelname;
-  struct nfs_diskless *bi_nfs_diskless;
-  grub_uint32_t bi_n_bios_used;
-  grub_uint32_t bi_bios_geom[FREEBSD_N_BIOS_GEOM];
-  grub_uint32_t bi_size;
-  grub_uint8_t bi_memsizes_valid;
-  grub_uint8_t bi_bios_dev;
-  grub_uint8_t bi_pad[2];
-  grub_uint32_t bi_basemem;
-  grub_uint32_t bi_extmem;
-  grub_uint32_t bi_symtab;
-  grub_uint32_t bi_esymtab;
-  grub_uint32_t bi_kernend;
-  grub_uint32_t bi_envp;
-  grub_uint32_t bi_modulep;
+  grub_uint32_t version;
+  grub_uint8_t unused1[44];
+  grub_uint32_t length;
+  grub_uint8_t unused2;
+  grub_uint8_t boot_device;
+  grub_uint8_t unused3[18];
+  grub_uint32_t kern_end;
+  grub_uint32_t environment;
+  grub_uint32_t tags;
 } __attribute__ ((packed));
 
 struct grub_openbsd_bios_mmap
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 2598371b7..3dd3c70c5 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -461,14 +461,14 @@ grub_freebsd_boot (void)
   }
 
   grub_memset (&bi, 0, sizeof (bi));
-  bi.bi_version = FREEBSD_BOOTINFO_VERSION;
-  bi.bi_size = sizeof (bi);
+  bi.version = FREEBSD_BOOTINFO_VERSION;
+  bi.length = sizeof (bi);
 
   grub_bsd_get_device (&biosdev, &unit, &slice, &part);
   bootdev = (FREEBSD_B_DEVMAGIC + ((slice + 1) << FREEBSD_B_SLICESHIFT) +
 	     (unit << FREEBSD_B_UNITSHIFT) + (part << FREEBSD_B_PARTSHIFT));
 
-  bi.bi_bios_dev = biosdev;
+  bi.boot_device = biosdev;
 
   p = (char *) kern_end;
 
@@ -478,7 +478,7 @@ grub_freebsd_boot (void)
     {
       *(p++) = 0;
 
-      bi.bi_envp = kern_end;
+      bi.environment = kern_end;
       kern_end = ALIGN_PAGE ((grub_uint32_t) p);
     }
 
@@ -491,23 +491,23 @@ grub_freebsd_boot (void)
 	return grub_errno;
 
       grub_memcpy ((char *) kern_end, mod_buf, mod_buf_len);
-      bi.bi_modulep = kern_end;
+      bi.tags = kern_end;
 
       kern_end = ALIGN_PAGE (kern_end + mod_buf_len);
 
       if (is_64bit)
 	kern_end += 4096 * 4;
 
-      md_ofs = bi.bi_modulep + kern_end_mdofs;
+      md_ofs = bi.tags + kern_end_mdofs;
       ofs = (is_64bit) ? 16 : 12;
       *((grub_uint32_t *) md_ofs) = kern_end;
       md_ofs -= ofs;
-      *((grub_uint32_t *) md_ofs) = bi.bi_envp;
+      *((grub_uint32_t *) md_ofs) = bi.environment;
       md_ofs -= ofs;
       *((grub_uint32_t *) md_ofs) = bootflags;
     }
 
-  bi.bi_kernend = kern_end;
+  bi.kern_end = kern_end;
 
   grub_video_set_mode ("text", 0, 0);
 
@@ -554,12 +554,12 @@ grub_freebsd_boot (void)
 		   &grub_bsd64_trampoline_end - &grub_bsd64_trampoline_start);
 
       /* Launch trampoline. */
-      launch_trampoline (entry, entry_hi, pagetable, bi.bi_modulep,
+      launch_trampoline (entry, entry_hi, pagetable, bi.tags,
 			 kern_end);
     }
   else
     grub_unix_real_boot (entry, bootflags | FREEBSD_RB_BOOTINFO, bootdev,
-			 0, 0, 0, &bi, bi.bi_modulep, kern_end);
+			 0, 0, 0, &bi, bi.tags, kern_end);
 
   /* Not reached.  */
   return GRUB_ERR_NONE;

From d645e0f8e8e9243ad193df4fd2b4bbc97ec79121 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 22 Jan 2010 00:07:28 +0100
Subject: [PATCH 0368/1628] 2010-01-21  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* term/ieee1275/ofconsole.c (grub_ofconsole_dimensions): Allocate on
	stack since heap is unavailable at that point.
---
 ChangeLog                 |  5 +++++
 term/ieee1275/ofconsole.c | 33 ++++++++++++---------------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f5bb1617b..f227f5dbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* term/ieee1275/ofconsole.c (grub_ofconsole_dimensions): Allocate on
+	stack since heap is unavailable at that point.
+
 2010-01-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/i386/bsd.h (FREEBSD_N_BIOS_GEOM): Removed.
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index dd4270eff..3799e2e27 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -245,37 +245,28 @@ static void
 grub_ofconsole_dimensions (void)
 {
   grub_ieee1275_ihandle_t options;
-  char *val;
   grub_ssize_t lval;
 
   if (! grub_ieee1275_finddevice ("/options", &options)
       && options != (grub_ieee1275_ihandle_t) -1)
     {
       if (! grub_ieee1275_get_property_length (options, "screen-#columns",
-					       &lval) && lval != -1)
+					       &lval)
+	  && lval >= 0 && lval < 1024)
 	{
-	  val = grub_malloc (lval);
-	  if (val)
-	    {
-	      if (! grub_ieee1275_get_property (options, "screen-#columns",
-						val, lval, 0))
-		grub_ofconsole_width = (grub_uint8_t) grub_strtoul (val, 0, 10);
+	  char val[lval];
 
-	      grub_free (val);
-	    }
+	  if (! grub_ieee1275_get_property (options, "screen-#columns",
+					    val, lval, 0))
+	    grub_ofconsole_width = (grub_uint8_t) grub_strtoul (val, 0, 10);
 	}
-      if (! grub_ieee1275_get_property_length (options, "screen-#rows",
-					       &lval) && lval != -1)
+      if (! grub_ieee1275_get_property_length (options, "screen-#rows", &lval)
+	  && lval >= 0 && lval < 1024)
 	{
-	  val = grub_malloc (lval);
-	  if (val)
-	    {
-	      if (! grub_ieee1275_get_property (options, "screen-#rows",
-						val, lval, 0))
-		grub_ofconsole_height = (grub_uint8_t) grub_strtoul (val, 0, 10);
-
-	      grub_free (val);
-	    }
+	  char val[lval];
+	  if (! grub_ieee1275_get_property (options, "screen-#rows",
+					    val, lval, 0))
+	    grub_ofconsole_height = (grub_uint8_t) grub_strtoul (val, 0, 10);
 	}
     }
 

From bf86e59a76c3731e2b68c20ce5915ed4c07571a7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 22 Jan 2010 00:33:07 +0100
Subject: [PATCH 0369/1628] 2010-01-22  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* kern/ieee1275/init.c (grub_machine_set_prefix): Don't check for
	presence of "prefix" variable as it breaks when normal.mod is
	embedded.
---
 ChangeLog            | 6 ++++++
 kern/ieee1275/init.c | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f227f5dbc..5eef8a821 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/ieee1275/init.c (grub_machine_set_prefix): Don't check for
+	presence of "prefix" variable as it breaks when normal.mod is
+	embedded.
+
 2010-01-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* term/ieee1275/ofconsole.c (grub_ofconsole_dimensions): Allocate on
diff --git a/kern/ieee1275/init.c b/kern/ieee1275/init.c
index 04e4e2dca..f3a4f4d81 100644
--- a/kern/ieee1275/init.c
+++ b/kern/ieee1275/init.c
@@ -75,10 +75,6 @@ grub_machine_set_prefix (void)
   char *filename;
   char *prefix;
 
-  if (grub_env_get ("prefix"))
-    /* We already set prefix in grub_machine_init().  */
-    return;
-
   if (grub_prefix[0])
     {
       grub_env_set ("prefix", grub_prefix);

From 547e494f1bb81037efd44ec4fed7bac264764d3f Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 22 Jan 2010 19:07:27 +0530
Subject: [PATCH 0370/1628] lexer-rewrite rebase commit

---
 ChangeLog.lexer-rewrite            |  70 ++++
 conf/any-emu.rmk                   |  10 +-
 conf/common.rmk                    |  12 +-
 conf/i386-coreboot.rmk             |   2 +-
 conf/i386-efi.rmk                  |   2 +-
 conf/i386-ieee1275.rmk             |   2 +-
 conf/i386-pc.rmk                   |   2 +-
 conf/powerpc-ieee1275.rmk          |   2 +-
 conf/sparc64-ieee1275.rmk          |   2 +-
 conf/tests.rmk                     |  24 +-
 conf/x86_64-efi.rmk                |   2 +-
 configure.ac                       |   5 +
 include/grub/script_sh.h           |  60 +--
 script/execute.c                   | 218 ++++++----
 script/function.c                  |   4 +-
 script/lexer.c                     | 612 ++++++++++++-----------------
 script/parser.y                    | 311 ++++++++-------
 script/script.c                    | 110 +++---
 script/yylex.l                     | 331 ++++++++++++++++
 tests/grub_script_echo1.in         |  32 ++
 tests/grub_script_echo_keywords.in |   3 +
 tests/grub_script_vars1.in         |  34 ++
 tests/util/grub-shell-tester.in    |   2 +-
 tests/util/grub-shell.in           |   2 +-
 util/grub-script-check.c           |  12 +-
 25 files changed, 1214 insertions(+), 652 deletions(-)
 create mode 100644 ChangeLog.lexer-rewrite
 create mode 100644 script/yylex.l
 create mode 100644 tests/grub_script_echo1.in
 create mode 100644 tests/grub_script_echo_keywords.in
 create mode 100644 tests/grub_script_vars1.in

diff --git a/ChangeLog.lexer-rewrite b/ChangeLog.lexer-rewrite
new file mode 100644
index 000000000..56c637976
--- /dev/null
+++ b/ChangeLog.lexer-rewrite
@@ -0,0 +1,70 @@
+2010-01-10  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* conf/any-emu.rmk: Build rule updates.
+	* conf/common.rmk: Likewise.
+	* conf/i386-coreboot.rmk: Likewise.
+	* conf/i386-efi.rmk: Likewise.
+	* conf/i386-ieee1275.rmk: Likewise.
+	* conf/i386-pc.rmk: Likewise.
+	* conf/powerpc-ieee1275.rmk: Likewise.
+	* conf/x86_64-efi.rmk: Likewise.
+
+	* configure.ac: Configure check for flex.
+
+	* include/grub/script_sh.h (grub_script_arg_type_t): More argument
+	types.
+	(grub_lexer_param): Struct member updates.
+	(grub_parser_param): Likewise.
+	(GRUB_LEXER_TOKEN_MAX): Maximum token size.
+	(GRUB_LEXER_RECORD_INCREMENT): Memory increments' size.
+	(grub_script_lexer_init): Prototype update.
+	(grub_script_lexer_record_start): Likewise.
+	(grub_script_lexer_record_stop): Likewise.
+	(grub_script_lexer_yywrap): New function prototype.
+	(grub_script_lexer_fini): Likewise.
+	(grub_script_execute_argument_to_string): Removed by...
+	(grub_script_execute_argument_to_argv): ...better version.
+
+	* script/execute.c (ROUND_UPTO): New macro.
+	(grub_script_execute_cmdline): Out of memory fixes.
+	(grub_script_execute_menuentry): Likewise.
+	(grub_script_execute_argument_to_string): Removed. Update all
+	users by...
+	(grub_script_execute_argument_to_argv): ...better version.
+	* script/function.c (grub_script_function_create): Use
+	grub_script_execute_argument_to_argv instead of
+	grub_script_execute_argument_to_string.
+
+	* script/lexer.c (check_varstate): Removed.
+	(check_textstate): Removed.
+	(grub_script_lexer_record_start): Likewise.
+	(grub_script_lexer_record_stop): Likewise.
+	(recordchar): Replaced with...
+	(grub_script_lexer_record): ...new function.
+	(nextchar): Removed.
+	(grub_script_lexer_init): Rewritten.
+	(grub_script_yylex): Rewritten.
+	(append_newline): New function.
+	(grub_script_lexer_yywrap): New function.
+	(grub_script_lexer_fini): New function.
+	(grub_script_yyerror): Sets error flag.
+
+	* script/yylex.l: New file.
+	(grub_lexer_yyfree): Wrapper for flex yyffre.
+	(grub_lexer_yyalloc): Likewise.
+	(grub_lexer_yyrealloc): Likewise.
+	* script/parser.y: Refactored.
+
+	* script/script.c (grub_script_arg_add): Out of memory fixes.
+	(grub_script_add_arglist): Likewise.
+	(grub_script_create_cmdline): Likewise.
+	(grub_script_create_cmdmenu): Likewise.
+	(grub_script_add_cmd): Likewise.
+	(grub_script_parse): Use grub_script_lexer_fini to deallocated.
+	* util/grub-script-check.c (grub_script_execute_menuentry): Remove
+	unnecessary code.
+
+	* tests/grub_script_echo1.in: New testcase.
+	* tests/grub_script_vars1.in: New testcase.
+	* tests/grub_script_echo_keywords.in: New testcase.
+
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 1277af791..cf343e61f 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -1,7 +1,7 @@
 # -*- makefile -*-
 
 # Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h grub_script.yy.h
 
 sbin_UTILITIES += grub-emu
 util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
@@ -33,6 +33,8 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 	commands/terminal.c normal/context.c lib/charset.c \
 	script/main.c script/execute.c script/function.c		\
 	script/lexer.c script/script.c grub_script.tab.c		\
+	grub_script.yy.c						\
+	\
 	partmap/amiga.c	partmap/apple.c partmap/msdos.c partmap/sun.c	\
 	partmap/acorn.c partmap/gpt.c					\
 	\
@@ -99,5 +101,11 @@ grub_script.tab.c grub_script.tab.h: script/parser.y
 	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/parser.y
 DISTCLEANFILES += grub_script.tab.c grub_script.tab.h
 
+grub_script.yy.c grub_script.yy.h: script/yylex.l
+	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(srcdir)/script/yylex.l
+	sed -i 's/^#include.*\(<stdio\.h>\|<string\.h>\|<errno\.h>\|<stdlib\.h>\|<unistd\.h>\)//g' grub_script.yy.h
+	sed -i 's/^#include.*\(<stdio\.h>\|<string\.h>\|<errno\.h>\|<stdlib\.h>\|<unistd\.h>\)//g' grub_script.yy.c
+DISTCLEANFILES += grub_script.yy.c grub_script.yy.h
+
 bin_UTILITIES += grub-bin2h
 grub_bin2h_SOURCES = gnulib/progname.c util/bin2h.c
diff --git a/conf/common.rmk b/conf/common.rmk
index 2ea8ebd5a..52491d530 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -91,13 +91,21 @@ grub_mkrelpath_SOURCES = gnulib/progname.c util/grub-mkrelpath.c util/misc.c
 bin_UTILITIES += grub-bin2h
 grub_bin2h_SOURCES = gnulib/progname.c util/bin2h.c
 
+# For the lexer.
+grub_script.yy.c grub_script.yy.h: script/yylex.l
+	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(srcdir)/script/yylex.l
+	sed -i 's/^#include.*\(<stdio\.h>\|<string\.h>\|<errno\.h>\|<stdlib\.h>\|<unistd\.h>\)//g' grub_script.yy.h
+	sed -i 's/^#include.*\(<stdio\.h>\|<string\.h>\|<errno\.h>\|<stdlib\.h>\|<unistd\.h>\)//g' grub_script.yy.c
+DISTCLEANFILES += grub_script.yy.c grub_script.yy.h
+
 # For grub-script-check.
 bin_UTILITIES += grub-script-check
 util/grub-script-check.c_DEPENDENCIES = grub_script_check_init.h
 grub_script_check_SOURCES = gnulib/progname.c util/grub-script-check.c util/misc.c \
 	script/main.c script/script.c script/function.c script/lexer.c \
 	kern/handler.c kern/err.c kern/parser.c kern/list.c \
-	kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c
+	kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c \
+	grub_script.yy.c
 
 # For the parser.
 grub_script.tab.c grub_script.tab.h: script/parser.y
@@ -594,7 +602,7 @@ normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For sh.mod.
 sh_mod_SOURCES = script/main.c script/script.c script/execute.c \
-	script/function.c script/lexer.c grub_script.tab.c
+	script/function.c script/lexer.c grub_script.tab.c grub_script.yy.c
 sh_mod_CFLAGS = $(COMMON_CFLAGS)
 sh_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 9563c0b2b..c9703d082 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -5,7 +5,7 @@ COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
 COMMON_LDFLAGS	= -m32 -nostdlib
 
 # Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h grub_script.yy.h
 
 # Images.
 
diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index c03abb429..4314c15eb 100644
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -5,7 +5,7 @@ COMMON_CFLAGS = -fno-builtin -m32
 COMMON_LDFLAGS = -melf_i386 -nostdlib
 
 # Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h grub_script.yy.h
 
 # Utilities.
 bin_UTILITIES = grub-mkimage
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index e19f6e9a1..7c6520323 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -5,7 +5,7 @@ COMMON_CFLAGS	= -ffreestanding -mrtd -mregparm=3
 COMMON_LDFLAGS	= -nostdlib
 
 # Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h grub_script.yy.h
 
 # Images.
 pkglib_PROGRAMS = kernel.img
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 580bfea0a..9cae817ff 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -7,7 +7,7 @@ COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
 COMMON_LDFLAGS = -m32 -nostdlib
 
 # Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h grub_script.yy.h
 
 # Images.
 pkglib_IMAGES = boot.img cdboot.img diskboot.img kernel.img lnxboot.img \
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 23bd2d620..90afb0b8b 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -6,7 +6,7 @@ COMMON_CFLAGS = -ffreestanding
 COMMON_LDFLAGS += -nostdlib
 
 # Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h grub_script.yy.h
 
 # Images.
 
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index befc7dce5..946c1f06b 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -6,7 +6,7 @@ COMMON_CFLAGS = -ffreestanding -m64 -mno-app-regs
 COMMON_LDFLAGS = -melf64_sparc -nostdlib -mno-relax
 
 # Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h grub_script.yy.h
 
 # Images.
 pkglib_IMAGES = boot.img diskboot.img kernel.img
diff --git a/conf/tests.rmk b/conf/tests.rmk
index 18b23ff5a..c5080f58c 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -37,12 +37,28 @@ example_scripted_test_SOURCES = tests/example_scripted_test.in
 check_SCRIPTS += example_grub_script_test
 example_grub_script_test_SOURCES = tests/example_grub_script_test.in
 
+#
+# Rules for real tests
+#
+
+check_SCRIPTS += grub_script_echo1
+grub_script_echo1_SOURCES = tests/grub_script_echo1.in
+
+check_SCRIPTS += grub_script_echo_keywords
+grub_script_echo_keywords_SOURCES = tests/grub_script_echo_keywords.in
+
+check_SCRIPTS += grub_script_vars1
+grub_script_vars1_SOURCES = tests/grub_script_vars1.in
 
 # List of tests to execute on "make check"
-SCRIPTED_TESTS    = example_scripted_test
-SCRIPTED_TESTS   += example_grub_script_test
-UNIT_TESTS        = example_unit_test
-FUNCTIONAL_TESTS  = example_functional_test.mod
+# SCRIPTED_TESTS    = example_scripted_test
+# SCRIPTED_TESTS   += example_grub_script_test
+# UNIT_TESTS        = example_unit_test
+# FUNCTIONAL_TESTS  = example_functional_test.mod
+
+SCRIPTED_TESTS  = grub_script_echo1
+SCRIPTED_TESTS += grub_script_echo_keywords
+SCRIPTED_TESTS += grub_script_vars1
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index d5c3c24cb..b46236ade 100644
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -5,7 +5,7 @@ COMMON_CFLAGS = -fno-builtin -m64
 COMMON_LDFLAGS = -melf_x86_64 -nostdlib
 
 # Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
+script/lexer.c_DEPENDENCIES = grub_script.tab.h grub_script.yy.h
 
 # Utilities.
 bin_UTILITIES = grub-mkimage
diff --git a/configure.ac b/configure.ac
index b1435de44..ea2218d9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,6 +163,11 @@ if test "x$CMP" = x; then
   AC_MSG_ERROR([cmp is not found])
 fi
 
+AC_CHECK_PROGS([LEX], [flex])
+if test "x$LEX" = x; then
+  AC_MSG_ERROR([flex is not found])
+fi
+
 AC_CHECK_PROGS([YACC], [bison])
 if test "x$YACC" = x; then
   AC_MSG_ERROR([bison is not found])
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 0bd14abcd..889017d2a 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -1,7 +1,7 @@
 /* normal_parser.h  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2005,2007,2009,2010  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
@@ -45,8 +45,11 @@ struct grub_script
 
 typedef enum
 {
-  GRUB_SCRIPT_ARG_TYPE_STR,
-  GRUB_SCRIPT_ARG_TYPE_VAR
+  GRUB_SCRIPT_ARG_TYPE_VAR,
+  GRUB_SCRIPT_ARG_TYPE_TEXT,
+  GRUB_SCRIPT_ARG_TYPE_DQVAR,
+  GRUB_SCRIPT_ARG_TYPE_DQSTR,
+  GRUB_SCRIPT_ARG_TYPE_SQSTR
 } grub_script_arg_type_t;
 
 /* A part of an argument.  */
@@ -121,12 +124,6 @@ struct grub_script_cmd_menuentry
 /* State of the lexer as passed to the lexer.  */
 struct grub_lexer_param
 {
-  /* Set to 0 when the lexer is done.  */
-  int done;
-
-  /* State of the state machine.  */
-  grub_parser_state_t state;
-
   /* Function used by the lexer to get a new line when more input is
      expected, but not available.  */
   grub_reader_getline_t getline;
@@ -137,10 +134,6 @@ struct grub_lexer_param
      depleted.  */
   int refs;
 
-  /* The character stream that has to be parsed.  */
-  char *script;
-  char *newscript; /* XXX */
-
   /* While walking through the databuffer, `record' the characters to
      this other buffer.  It can be used to edit the menu entry at a
      later moment.  */
@@ -157,13 +150,32 @@ struct grub_lexer_param
   /* Size of RECORDING.  */
   int recordlen;
 
-  /* The token that is already parsed but not yet returned. */
-  int tokenonhold;
+  /* End of file reached.  */
+  int eof;
 
-  /* Was the last token a newline? */
-  int was_newline;
+  /* Merge multiple word tokens.  */
+  int merge_start;
+  int merge_end;
+
+  /* Text of current token.  */
+  char *text;
+
+  /* Type of text.  */
+  grub_script_arg_type_t type;
+
+  /* Flex scanner.  */
+  void *yyscanner;
+
+  /* Flex scanner buffer.  */
+  void *buffer;
+
+  /* Length of current token text.  */
+  unsigned size;
 };
 
+#define GRUB_LEXER_TOKEN_MAX        256
+#define GRUB_LEXER_RECORD_INCREMENT 256
+
 /* State of the parser as passes to the parser.  */
 struct grub_parser_param
 {
@@ -223,12 +235,16 @@ void grub_script_free (struct grub_script *script);
 struct grub_script *grub_script_create (struct grub_script_cmd *cmd,
 					struct grub_script_mem *mem);
 
-struct grub_lexer_param *grub_script_lexer_init (char *s,
+struct grub_lexer_param *grub_script_lexer_init (struct grub_parser_param *parser,
+						 char *script,
 						 grub_reader_getline_t getline);
+void grub_script_lexer_fini (struct grub_lexer_param *);
 void grub_script_lexer_ref (struct grub_lexer_param *);
 void grub_script_lexer_deref (struct grub_lexer_param *);
-void grub_script_lexer_record_start (struct grub_lexer_param *);
-char *grub_script_lexer_record_stop (struct grub_lexer_param *);
+void grub_script_lexer_record_start (struct grub_parser_param *);
+char *grub_script_lexer_record_stop (struct grub_parser_param *);
+int  grub_script_lexer_yywrap (struct grub_parser_param *);
+void grub_script_lexer_record (struct grub_parser_param *, char *);
 
 /* Functions to track allocated memory.  */
 struct grub_script_mem *grub_script_mem_record (struct grub_parser_param *state);
@@ -284,7 +300,7 @@ int grub_script_function_iterate (int (*iterate) (grub_script_function_t));
 int grub_script_function_call (grub_script_function_t func,
 			       int argc, char **args);
 
-char *
-grub_script_execute_argument_to_string (struct grub_script_arg *arg);
+char **
+grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist);
 
 #endif /* ! GRUB_NORMAL_PARSER_HEADER */
diff --git a/script/execute.c b/script/execute.c
index ee7e099bc..83b6649ce 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -1,7 +1,7 @@
 /* execute.c -- Execute a GRUB script.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2005,2007,2008,2009,2010  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
@@ -35,49 +35,146 @@ grub_script_execute_cmd (struct grub_script_cmd *cmd)
   return cmd->exec (cmd);
 }
 
-/* Parse ARG and return the textual representation.  Add strings are
-   concatenated and all values of the variables are filled in.  */
-char *
-grub_script_execute_argument_to_string (struct grub_script_arg *arg)
+#define ROUND_UPTO(sz,up) (((sz) + (up) - 1) / (up) *  (up))
+
+/* Expand arguments in ARGLIST into multiple arguments.  */
+char **
+grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist)
 {
-  int size = 0;
-  char *val;
-  char *chararg;
-  struct grub_script_arg *argi;
+  int i;
+  int oom;
+  int argc;
+  int empty;
+  char *ptr;
+  char **argv;
+  char *value;
+  struct grub_script_arg *arg;
 
-  /* First determine the size of the argument.  */
-  for (argi = arg; argi; argi = argi->next)
+  auto void push (char *str);
+  void push (char *str)
+  {
+    char **p;
+
+    if (oom)
+      return;
+
+    p = grub_realloc (argv, ROUND_UPTO (sizeof(char*) * (argc + 1), 32));
+    if (!p)
+      oom = 1;
+    else
+      {
+	p[argc++] = str;
+	argv = p;
+      }
+  }
+
+  auto char* append (const char *str, grub_size_t nchar);
+  char* append (const char *str, grub_size_t nchar)
+  {
+    int len;
+    int old;
+    char *p;
+
+    if (oom || !str)
+      return 0;
+
+    len = nchar ?: grub_strlen (str);
+    old = argv[argc - 1] ? grub_strlen (argv[argc - 1]) : 0;
+    p = grub_realloc (argv[argc - 1], ROUND_UPTO(old + len + 1, 32));
+
+    if (p)
+      {
+	grub_strncpy (p + old, str, len);
+	p[old + len] = '\0';
+      }
+    else
+      {
+	oom = 1;
+	grub_free (argv[argc - 1]);
+      }
+    argv[argc - 1] = p;
+    return argv[argc - 1];
+  }
+
+  /* Move *STR to the begining of next word, but return current word.  */
+  auto char* move_to_next (char **str);
+  char* move_to_next (char **str)
+  {
+    char *end;
+    char *start;
+
+    if (oom || !str || !*str)
+      return 0;
+
+    start = *str;
+    while (*start && grub_isspace (*start)) start++;
+    if (*start == '\0')
+      return 0;
+
+    end = start + 1;
+    while (*end && !grub_isspace (*end)) end++;
+
+    *str = end;
+    return start;
+  }
+
+  oom = 0;
+  argv = 0;
+  argc = 0;
+  push (0);
+  for (; arglist; arglist = arglist->next)
     {
-      if (argi->type == 1)
+      empty = 1;
+      arg = arglist->arg;
+      while (arg)
 	{
-	  val = grub_env_get (argi->str);
-	  if (val)
-	    size += grub_strlen (val);
+	  switch (arg->type)
+	    {
+	    case GRUB_SCRIPT_ARG_TYPE_VAR:
+	      value = grub_env_get (arg->str);
+	      while (*value && (ptr = move_to_next(&value)))
+		{
+		  empty = 0;
+		  append (ptr, value - ptr);
+		  if (*value) push(0);
+		}
+	      break;
+
+	    case GRUB_SCRIPT_ARG_TYPE_TEXT:
+	      if (grub_strlen (arg->str) > 0)
+		{
+		  empty = 0;
+		  append (arg->str, 0);
+		}
+	      break;
+
+	    case GRUB_SCRIPT_ARG_TYPE_DQSTR:
+	    case GRUB_SCRIPT_ARG_TYPE_SQSTR:
+	      empty = 0;
+	      append (arg->str, 0);
+	      break;
+
+	    case GRUB_SCRIPT_ARG_TYPE_DQVAR:
+	      empty = 0;
+	      append (grub_env_get (arg->str), 0);
+	      break;
+	    }
+	  arg = arg->next;
 	}
-      else
-	size += grub_strlen (argi->str);
+      if (!empty)
+	push (0);
+    }
+  push (0); /* Ensure argv[argc] == 0.  */
+
+  if (oom)
+    {
+      for (i = 0; i < argc; i++)
+	grub_free (argv[i]);
+      grub_free (argv);
+      argv = 0;
     }
 
-  /* Create the argument.  */
-  chararg = grub_malloc (size + 1);
-  if (! chararg)
-    return 0;
-
-  *chararg = '\0';
-  /* First determine the size of the argument.  */
-  for (argi = arg; argi; argi = argi->next)
-    {
-      if (argi->type == 1)
-	{
-	  val = grub_env_get (argi->str);
-	  if (val)
-	    grub_strcat (chararg, val);
-	}
-      else
-	grub_strcat (chararg, argi->str);
-    }
-
-  return chararg;
+  return argv;
 }
 
 /* Execute a single command line.  */
@@ -85,7 +182,6 @@ grub_err_t
 grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 {
   struct grub_script_cmdline *cmdline = (struct grub_script_cmdline *) cmd;
-  struct grub_script_arglist *arglist;
   char **args = 0;
   int i = 0;
   grub_command_t grubcmd;
@@ -96,7 +192,11 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
   char *cmdname;
 
   /* Lookup the command.  */
-  cmdname = grub_script_execute_argument_to_string (cmdline->arglist->arg);
+  args = grub_script_execute_arglist_to_argv (cmdline->arglist);
+  if (!args)
+    return grub_errno;
+
+  cmdname = args[0];
   grubcmd = grub_command_find (cmdname);
   if (! grubcmd)
     {
@@ -129,27 +229,15 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 	  return 0;
 	}
     }
-  grub_free (cmdname);
 
-  if (cmdline->arglist->next)
-    {
-      argcount = cmdline->arglist->argcount - 1;
-
-      /* Create argv from the arguments.  */
-      args = grub_malloc (sizeof (char *) * argcount);
-      for (arglist = cmdline->arglist->next; arglist; arglist = arglist->next)
-	{
-	  char *str;
-	  str = grub_script_execute_argument_to_string (arglist->arg);
-	  args[i++] = str;
-	}
-    }
+  /* Count argv size.  */
+  for (argcount = 0; args[argcount]; argcount++);
 
   /* Execute the GRUB command or function.  */
   if (grubcmd)
-    ret = (grubcmd->func) (grubcmd, argcount, args);
+    ret = (grubcmd->func) (grubcmd, argcount - 1, args + 1);
   else
-    ret = grub_script_function_call (func, argcount, args);
+    ret = grub_script_function_call (func, argcount - 1, args + 1);
 
   /* Free arguments.  */
   for (i = 0; i < argcount; i++)
@@ -202,7 +290,6 @@ grub_err_t
 grub_script_execute_menuentry (struct grub_script_cmd *cmd)
 {
   struct grub_script_cmd_menuentry *cmd_menuentry;
-  struct grub_script_arglist *arglist;
   char **args = 0;
   int argcount = 0;
   int i = 0;
@@ -211,22 +298,11 @@ grub_script_execute_menuentry (struct grub_script_cmd *cmd)
 
   if (cmd_menuentry->arglist)
     {
-      argcount = cmd_menuentry->arglist->argcount;
+      args = grub_script_execute_arglist_to_argv (cmd_menuentry->arglist);
+      if (!args)
+	return grub_errno;
 
-      /* Create argv from the arguments.  */
-      args = grub_malloc (sizeof (char *) * argcount);
-
-      if (! args)
-	{
-	  return grub_errno;
-	}
-
-      for (arglist = cmd_menuentry->arglist; arglist; arglist = arglist->next)
-	{
-	  char *str;
-	  str = grub_script_execute_argument_to_string (arglist->arg);
-	  args[i++] = str;
-	}
+      for (argcount = 0; args[argcount]; argcount++);
     }
 
   grub_normal_add_menu_entry (argcount, (const char **) args,
diff --git a/script/function.c b/script/function.c
index a3950a8a0..ded470c4e 100644
--- a/script/function.c
+++ b/script/function.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2005,2007,2009,2010  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
@@ -34,7 +34,7 @@ grub_script_function_create (struct grub_script_arg *functionname_arg,
   if (! func)
     return 0;
 
-  func->name = grub_script_execute_argument_to_string (functionname_arg);
+  func->name = grub_strdup (functionname_arg->str);
   if (! func->name)
     {
       grub_free (func);
diff --git a/script/lexer.c b/script/lexer.c
index 5bcdf628b..d43c9f157 100644
--- a/script/lexer.c
+++ b/script/lexer.c
@@ -1,7 +1,7 @@
 /* lexer.c - The scripting lexer.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2005,2006,2007,2008,2009,2010  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
@@ -23,42 +23,7 @@
 #include <grub/script_sh.h>
 
 #include "grub_script.tab.h"
-
-static int
-check_varstate (grub_parser_state_t state)
-{
-  return (state == GRUB_PARSER_STATE_VARNAME
-	  || state == GRUB_PARSER_STATE_VAR
-	  || state == GRUB_PARSER_STATE_QVAR
-	  || state == GRUB_PARSER_STATE_VARNAME2
-	  || state == GRUB_PARSER_STATE_QVARNAME
-	  || state == GRUB_PARSER_STATE_QVARNAME2);
-}
-
-static int
-check_textstate (grub_parser_state_t state)
-{
-  return (state == GRUB_PARSER_STATE_TEXT
-	  || state == GRUB_PARSER_STATE_ESC
-	  || state == GRUB_PARSER_STATE_QUOTE
-	  || state == GRUB_PARSER_STATE_DQUOTE);
-}
-
-struct grub_lexer_param *
-grub_script_lexer_init (char *script, grub_reader_getline_t getline)
-{
-  struct grub_lexer_param *param;
-
-  param = grub_zalloc (sizeof (*param));
-  if (! param)
-    return 0;
-
-  param->state = GRUB_PARSER_STATE_TEXT;
-  param->getline = getline;
-  param->script = script;
-
-  return param;
-}
+#include "grub_script.yy.h"
 
 void
 grub_script_lexer_ref (struct grub_lexer_param *state)
@@ -74,360 +39,305 @@ grub_script_lexer_deref (struct grub_lexer_param *state)
 
 /* Start recording all characters passing through the lexer.  */
 void
-grub_script_lexer_record_start (struct grub_lexer_param *state)
+grub_script_lexer_record_start (struct grub_parser_param *parser)
 {
-  state->record = 1;
-  state->recordlen = 100;
-  state->recording = grub_malloc (state->recordlen);
-  state->recordpos = 0;
+  struct grub_lexer_param *lexer = parser->lexerstate;
+
+  lexer->record = 1;
+  lexer->recordpos = 0;
+  if (lexer->recording)		/* reuse last record */
+    return;
+
+  lexer->recordlen = GRUB_LEXER_RECORD_INCREMENT;
+  lexer->recording = grub_malloc (lexer->recordlen);
+
+  if (!lexer->recording)
+    {
+      grub_script_yyerror (parser, 0);
+      lexer->record = 0;
+      lexer->recordlen = 0;
+    }
 }
 
 char *
-grub_script_lexer_record_stop (struct grub_lexer_param *state)
+grub_script_lexer_record_stop (struct grub_parser_param *parser)
 {
-  state->record = 0;
+  char *ptr;
+  char *result;
+  struct grub_lexer_param *lexer = parser->lexerstate;
 
-  /* Delete the last character, it is a `}'.  */
-  if (state->recordpos > 0)
-    {
-      if (state->recording[--state->recordpos] != '}')
-	{
-	  grub_printf ("Internal error while parsing menu entry");
-	  for (;;); /* XXX */
-	}
-      state->recording[state->recordpos] = '\0';
-    }
+  auto char *compact (char *start, char *end);
+  char *compact (char *start, char *end)
+  {
+    /* Delete '{' and '}' characters and whitespaces.  */
+    while (*start && grub_isspace (*start)) start++;
+    if (*start == '{') start++;
+    while (*start && grub_isspace (*start)) start++;
 
-  return state->recording;
+    while (*end && grub_isspace (*end)) end--;
+    if (*end == '}') end--;
+    while (*end && grub_isspace (*end)) end--;
+    *end = '\0';
+
+    return start;
+  }
+
+  if (!lexer->record || !lexer->recording)
+    return 0;
+
+  /* XXX This is not necessary in BASH.  */
+
+  ptr = compact (lexer->recording, lexer->recording + lexer->recordpos - 1);
+  lexer->record = 0;
+  lexer->recordpos = 0;
+
+  /* This memory would be freed by, grub_script_free.  */
+  result = grub_script_malloc (parser, grub_strlen (ptr) + 1);
+  if (result)
+    grub_strcpy (result, ptr);
+
+  return result;
 }
 
-/* When recording is enabled, record the character C as the next item
-   in the character stream.  */
-static void
-recordchar (struct grub_lexer_param *state, char c)
+
+/* Record STR if input recording is enabled.  */
+void
+grub_script_lexer_record (struct grub_parser_param *parser, char *str)
 {
-  if (state->recordpos == state->recordlen)
+  int len;
+  struct grub_lexer_param *lexer = parser->lexerstate;
+
+  if (!lexer->record)
+    return;
+
+  len = grub_strlen (str);
+  if (lexer->recordpos + len >= lexer->recordlen - 1)
     {
-      char *old = state->recording;
-      state->recordlen += 100;
-      state->recording = grub_realloc (state->recording, state->recordlen);
-      if (! state->recording)
+      char *old = lexer->recording;
+      lexer->recordlen += GRUB_LEXER_RECORD_INCREMENT;
+      lexer->recording = grub_realloc (lexer->recording, lexer->recordlen);
+      if (!lexer->recording)
 	{
 	  grub_free (old);
-	  state->record = 0;
+	  lexer->record = 0;
+	  grub_script_yyerror (parser, 0);
+	  return;
 	}
     }
-  state->recording[state->recordpos++] = c;
+  grub_strcpy (lexer->recording + lexer->recordpos, str);
+  lexer->recordpos += len;
 }
 
-/* Fetch the next character for the lexer.  */
-static void
-nextchar (struct grub_lexer_param *state)
+/* Append '\n' to SRC, before '\0'  */
+static char *
+append_newline (const char *src)
 {
-  if (state->record)
-    recordchar (state, *state->script);
-  state->script++;
+  char *line;
+  grub_size_t len;
+
+  len = grub_strlen (src);
+  line = grub_malloc (len + 1);
+  if (!line)
+    return 0;
+
+  grub_strcpy (line, src);
+
+  line[len] = '\n';
+  line[len + 1] = '\0';
+  return line;
 }
 
+/* Read next line of input if necessary, and set yyscanner buffers.  */
 int
-grub_script_yylex (union YYSTYPE *yylval, struct grub_parser_param *parsestate)
+grub_script_lexer_yywrap (struct grub_parser_param *parserstate)
 {
-  grub_parser_state_t newstate;
-  char use;
-  struct grub_lexer_param *state = parsestate->lexerstate;
-  int firstrun = 1;
+  int len;
+  char *line;
+  char *line2;
+  YY_BUFFER_STATE buffer;
+  struct grub_lexer_param *lexerstate = parserstate->lexerstate;
 
-  yylval->arg = 0;
+  if (!lexerstate->refs)
+    return 0;
 
-  if (state->tokenonhold)
+  if (!lexerstate->getline)
     {
-      int token = state->tokenonhold;
-      state->tokenonhold = 0;
-      return token;
+      grub_script_yyerror (parserstate, "unexpected end of file");
+      return 0;
     }
 
-  for (;! state->done; firstrun = 0)
+  line = 0;
+  buffer = 0;
+  lexerstate->getline (&line, 1);
+  if (!line)
     {
-      if (! state->script || ! *state->script)
+      grub_script_yyerror (parserstate, 0); /* XXX this could be for ^C case? */
+      return 0;
+    }
+
+  len = grub_strlen (line);
+  if (line[len - 1] == '\n')
+    {
+      buffer = yy_scan_string (line, lexerstate->yyscanner);
+    }
+  else
+    {
+      line2 = append_newline (line);
+      if (line2)
 	{
-	  /* Check if more tokens are requested by the parser.  */
-	  if (((state->refs && ! parsestate->err)
-	       || state->state == GRUB_PARSER_STATE_ESC
-	       || state->state == GRUB_PARSER_STATE_QUOTE
-	       || state->state == GRUB_PARSER_STATE_DQUOTE)
-	      && state->getline)
-	    {
-	      int doexit = 0;
-	      if (state->state != GRUB_PARSER_STATE_ESC
-		  && state->state != GRUB_PARSER_STATE_QUOTE
-		  && state->state != GRUB_PARSER_STATE_DQUOTE
-		  && ! state->was_newline)
-		{
-		  state->was_newline = 1;
-		  state->tokenonhold = '\n';
-		  break;
-		}
-	      while (! state->script || ! *state->script)
-		{
-		  grub_free (state->newscript);
-		  state->newscript = 0;
-		  state->getline (&state->newscript, 1);
-		  state->script = state->newscript;
-		  if (! state->script)
-		    {
-		      doexit = 1;
-		      break;
-		    }
-		}
-	      if (doexit)
-		break;
-	      grub_dprintf ("scripting", "token=`\\n'\n");
-	      recordchar (state, '\n');
-	      if (state->state == GRUB_PARSER_STATE_VARNAME)
-		state->state = GRUB_PARSER_STATE_TEXT;
-	      if (state->state == GRUB_PARSER_STATE_QVARNAME)
-		state->state = GRUB_PARSER_STATE_DQUOTE;
-	      if (state->state == GRUB_PARSER_STATE_DQUOTE
-		  || state->state == GRUB_PARSER_STATE_QUOTE)
-		yylval->arg = grub_script_arg_add (parsestate, yylval->arg,
-						   GRUB_SCRIPT_ARG_TYPE_STR,
-						   "\n");
-	    }
-	  else
-	    {
-	      grub_free (state->newscript);
-	      state->newscript = 0;
-	      state->done = 1;
-	      grub_dprintf ("scripting", "token=`\\n'\n");
-	      state->tokenonhold = '\n';
-	      break;
-	    }
-	}
-      state->was_newline = 0;
-
-      newstate = grub_parser_cmdline_state (state->state, *state->script, &use);
-
-      /* Check if it is a text.  */
-      if (check_textstate (newstate))
-	{
-	  char *buffer = NULL;
-	  int bufpos = 0;
-	  /* Buffer is initially large enough to hold most commands
-	     but extends automatically when needed.  */
-	  int bufsize = 128;
-
-	  buffer = grub_malloc (bufsize);
-
-	  /* In case the string is not quoted, this can be a one char
-	     length symbol.  */
-	  if (newstate == GRUB_PARSER_STATE_TEXT)
-	    {
-	      int doexit = 0;
-	      switch (*state->script)
-		{
-		case ' ':
-		  while (*state->script)
-		    {
-		      newstate = grub_parser_cmdline_state (state->state,
-							    *state->script, &use);
-		      if (! (state->state == GRUB_PARSER_STATE_TEXT
-			     && *state->script == ' '))
-			{
-			  grub_dprintf ("scripting", "token=` '\n");
-			  if (! firstrun)
-			    doexit = 1;
-			  break;
-			}
-		      state->state = newstate;
-		      nextchar (state);
-		    }
-		  grub_dprintf ("scripting", "token=` '\n");
-		  if (! firstrun)
-		    doexit = 1;
-		  break;
-		case '{':
-		case '}':
-		case ';':
-		case '\n':
-		  {
-		    char c;
-		    grub_dprintf ("scripting", "token=`%c'\n", *state->script);
-		    c = *state->script;
-		    nextchar (state);
-		    state->tokenonhold = c;
-		    doexit = 1;
-		    break;
-		  }
-		}
-	      if (doexit)
-		{
-		  grub_free (buffer);
-		  break;
-		}
-	    }
-
-	  /* Read one token, possible quoted.  */
-	  while (*state->script)
-	    {
-	      newstate = grub_parser_cmdline_state (state->state,
-						    *state->script, &use);
-
-	      /* Check if a variable name starts.  */
-	      if (check_varstate (newstate))
-		break;
-
-	      /* If the string is not quoted or escaped, stop processing
-		 when a special token was found.  It will be recognized
-		 next time when this function is called.  */
-	      if (newstate == GRUB_PARSER_STATE_TEXT
-		  && state->state != GRUB_PARSER_STATE_ESC
-		  && state->state != GRUB_PARSER_STATE_QUOTE
-		  && state->state != GRUB_PARSER_STATE_DQUOTE)
-		{
-		  int breakout = 0;
-
-		  switch (use)
-		    {
-		    case ' ':
-		    case '{':
-		    case '}':
-		    case ';':
-		    case '\n':
-		      breakout = 1;
-		    }
-		  if (breakout)
-		    break;
-		}
-
-	      if (use)
-		{
-		  if (bufsize <= bufpos + 1)
-		    {
-		      bufsize <<= 1;
-		      buffer = grub_realloc (buffer, bufsize);
-		    }
-		  buffer[bufpos++] = use;
-		}
-
-	      state->state = newstate;
-	      nextchar (state);
-	    }
-
-	  /* A string of text was read in.  */
-	  if (bufsize <= bufpos + 1)
-	    {
-	      bufsize <<= 1;
-	      buffer = grub_realloc (buffer, bufsize);
-	    }
-
-	  buffer[bufpos++] = 0;
-
-	  grub_dprintf ("scripting", "token=`%s'\n", buffer);
-	  yylval->arg = grub_script_arg_add (parsestate, yylval->arg,
-					     GRUB_SCRIPT_ARG_TYPE_STR, buffer);
-
-	  grub_free (buffer);
-	}
-      else if (newstate == GRUB_PARSER_STATE_VAR
-	       || newstate == GRUB_PARSER_STATE_QVAR)
-	{
-	  char *buffer = NULL;
-	  int bufpos = 0;
-	  /* Buffer is initially large enough to hold most commands
-	     but extends automatically when needed.  */
-	  int bufsize = 128;
-
-	  buffer = grub_malloc (bufsize);
-
-	  /* This is a variable, read the variable name.  */
-	  while (*state->script)
-	    {
-	      newstate = grub_parser_cmdline_state (state->state,
-						    *state->script, &use);
-
-	      /* Check if this character is not part of the variable name
-		 anymore.  */
-	      if (! (check_varstate (newstate)))
-		{
-		  if (state->state == GRUB_PARSER_STATE_VARNAME2
-		  || state->state == GRUB_PARSER_STATE_QVARNAME2)
-		    nextchar (state);
-		  state->state = newstate;
-		  break;
-		}
-
-	      if (use)
-		{
-		  if (bufsize <= bufpos + 1)
-		    {
-		      bufsize <<= 1;
-		      buffer = grub_realloc (buffer, bufsize);
-		    }
-		  buffer[bufpos++] = use;
-		}
-
-	      nextchar (state);
-	      state->state = newstate;
-	    }
-
-	  if (bufsize <= bufpos + 1)
-	    {
-	      bufsize <<= 1;
-	      buffer = grub_realloc (buffer, bufsize);
-	    }
-
-	  buffer[bufpos++] = 0;
-
-	  state->state = newstate;
-	  yylval->arg = grub_script_arg_add (parsestate, yylval->arg,
-					     GRUB_SCRIPT_ARG_TYPE_VAR, buffer);
-	  grub_dprintf ("scripting", "vartoken=`%s'\n", buffer);
-
-	  grub_free (buffer);
-	}
-      else
-	{
-	  /* There is either text or a variable name.  In the case you
-	 arrive here there is a serious problem with the lexer.  */
-	  grub_error (GRUB_ERR_BAD_ARGUMENT, "internal error");
-	  return 0;
+	  buffer = yy_scan_string (line2, lexerstate->yyscanner);
+	  grub_free (line2);
 	}
     }
 
-  if (yylval->arg == 0)
+  grub_free (line);
+  if (!buffer)
     {
-      int token = state->tokenonhold;
-      state->tokenonhold = 0;
-      return token;
+      grub_script_yyerror (parserstate, 0);
+      return 0;
     }
 
-  if (yylval->arg->next == 0 && yylval->arg->type == GRUB_SCRIPT_ARG_TYPE_STR)
+  return 1;
+}
+
+struct grub_lexer_param *
+grub_script_lexer_init (struct grub_parser_param *parser, char *script,
+			grub_reader_getline_t getline)
+{
+  int len;
+  char *script2;
+  YY_BUFFER_STATE buffer;
+  struct grub_lexer_param *lexerstate;
+
+  lexerstate = grub_zalloc (sizeof (*lexerstate));
+  if (!lexerstate)
+    return 0;
+
+  lexerstate->text = grub_malloc (GRUB_LEXER_TOKEN_MAX);
+  if (!lexerstate->text)
     {
-      /* Detect some special tokens.  */
-      if (! grub_strcmp (yylval->arg->str, "while"))
-	return GRUB_PARSER_TOKEN_WHILE;
-      else if (! grub_strcmp (yylval->arg->str, "if"))
-	return GRUB_PARSER_TOKEN_IF;
-      else if (! grub_strcmp (yylval->arg->str, "function"))
-	return GRUB_PARSER_TOKEN_FUNCTION;
-      else if (! grub_strcmp (yylval->arg->str, "menuentry"))
-	return GRUB_PARSER_TOKEN_MENUENTRY;
-      else if (! grub_strcmp (yylval->arg->str, "@"))
-	return GRUB_PARSER_TOKEN_MENUENTRY;
-      else if (! grub_strcmp (yylval->arg->str, "else"))
-	return GRUB_PARSER_TOKEN_ELSE;
-      else if (! grub_strcmp (yylval->arg->str, "then"))
-	return GRUB_PARSER_TOKEN_THEN;
-      else if (! grub_strcmp (yylval->arg->str, "fi"))
-	return GRUB_PARSER_TOKEN_FI;
+      grub_free (lexerstate);
+      return 0;
     }
 
-  return GRUB_PARSER_TOKEN_ARG;
+  lexerstate->getline = getline;	/* rest are all zeros already */
+  if (yylex_init (&lexerstate->yyscanner))
+    {
+      grub_free (lexerstate->text);
+      grub_free (lexerstate);
+      return 0;
+    }
+
+  buffer = 0;
+  script = script ? : "\n";
+  len = grub_strlen (script);
+
+  if (script[len - 1] == '\n')
+    {
+      buffer = yy_scan_string (script, lexerstate->yyscanner);
+    }
+  else
+    {
+      script2 = append_newline (script);
+      if (script2)
+	{
+	  buffer = yy_scan_string (script2, lexerstate->yyscanner);
+	  grub_free (script2);
+	}
+    }
+
+  if (!buffer)
+    {
+      yylex_destroy (lexerstate->yyscanner);
+      grub_free (lexerstate->yyscanner);
+
+      grub_free (lexerstate->text);
+      grub_free (lexerstate);
+      return 0;
+    }
+  yyset_extra (parser, lexerstate->yyscanner);
+
+  return lexerstate;
 }
 
 void
-grub_script_yyerror (struct grub_parser_param *lex __attribute__ ((unused)),
-		     char const *err)
+grub_script_lexer_fini (struct grub_lexer_param *lexerstate)
 {
-  grub_printf ("%s\n", err);
+  if (!lexerstate)
+    return;
+
+  yylex_destroy (lexerstate->yyscanner);
+
+  grub_free (lexerstate->recording);
+  grub_free (lexerstate->text);
+  grub_free (lexerstate);
+}
+
+int
+grub_script_yylex (union YYSTYPE *value,
+		   struct grub_parser_param *parserstate)
+{
+  char *str;
+  int token;
+  grub_script_arg_type_t type;
+  struct grub_lexer_param *lexerstate = parserstate->lexerstate;
+
+  value->arg = 0;
+  if (parserstate->err)
+    return GRUB_PARSER_TOKEN_BAD;
+
+  if (lexerstate->eof)
+    return GRUB_PARSER_TOKEN_EOF;
+
+  /* 
+   * Words with environment variables, like foo${bar}baz needs
+   * multiple tokens to be merged into a single grub_script_arg.  We
+   * use two variables to achieve this: lexerstate->merge_start and
+   * lexerstate->merge_end
+   */
+
+  lexerstate->merge_start = 0;
+  lexerstate->merge_end = 0;
+  do
+    {
+      /* Empty lexerstate->text.  */
+      lexerstate->size = 0;
+      lexerstate->text[0] = '\0';
+
+      token = yylex (value, lexerstate->yyscanner);
+      if (token == GRUB_PARSER_TOKEN_BAD)
+	break;
+
+      /* Merging feature uses lexerstate->text instead of yytext.  */
+      if (lexerstate->merge_start)
+	{
+	  lexerstate->text[lexerstate->size] = '\0';
+	  str = lexerstate->text;
+	  type = lexerstate->type;
+	}
+      else
+	{
+	  str = yyget_text (lexerstate->yyscanner);
+	  type = GRUB_SCRIPT_ARG_TYPE_TEXT;
+	}
+      /* grub_printf ("tok %u, txt [%s] size %u\n", token, str, lexerstate->size); */
+
+      value->arg = grub_script_arg_add (parserstate, value->arg, type, str);
+    }
+  while (lexerstate->merge_start && !lexerstate->merge_end);
+
+  if (!value->arg || parserstate->err)
+    return GRUB_PARSER_TOKEN_BAD;
+
+  return token;
+}
+
+void
+grub_script_yyerror (struct grub_parser_param *state, char const *err)
+{
+  if (err)
+    grub_error (GRUB_ERR_INVALID_COMMAND, err);
+
+  grub_print_error ();
+  state->err++;
 }
diff --git a/script/parser.y b/script/parser.y
index 094a8856e..6d1b5bdbc 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -1,7 +1,7 @@
 /* parser.y - The scripting parser.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2005,2006,2007,2008,2009,2010  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
@@ -21,10 +21,10 @@
 #include <grub/script_sh.h>
 #include <grub/mm.h>
 
-#define YYFREE		grub_free
-#define YYMALLOC	grub_malloc
+#define YYFREE          grub_free
+#define YYMALLOC        grub_malloc
 #define YYLTYPE_IS_TRIVIAL      0
-#define YYENABLE_NLS	0
+#define YYENABLE_NLS    0
 
 %}
 
@@ -35,163 +35,208 @@
   char *string;
 }
 
-%token GRUB_PARSER_TOKEN_IF		"if"
-%token GRUB_PARSER_TOKEN_WHILE		"while"
-%token GRUB_PARSER_TOKEN_FUNCTION	"function"
-%token GRUB_PARSER_TOKEN_MENUENTRY	"menuentry"
-%token GRUB_PARSER_TOKEN_ELSE		"else"
-%token GRUB_PARSER_TOKEN_THEN		"then"
-%token GRUB_PARSER_TOKEN_FI		"fi"
-%token GRUB_PARSER_TOKEN_ARG
-%type <cmd> script_init script grubcmd command commands commandblock menuentry if
-%type <arglist> arguments;
-%type <arg> GRUB_PARSER_TOKEN_ARG;
+%token GRUB_PARSER_TOKEN_BAD
+%token GRUB_PARSER_TOKEN_EOF 0 "end-of-input"
+
+%token GRUB_PARSER_TOKEN_NEWLINE "\n"
+%token GRUB_PARSER_TOKEN_AND     "&&"
+%token GRUB_PARSER_TOKEN_OR      "||"
+%token GRUB_PARSER_TOKEN_SEMI2   ";;"
+%token GRUB_PARSER_TOKEN_PIPE    "|"
+%token GRUB_PARSER_TOKEN_AMP     "&"
+%token GRUB_PARSER_TOKEN_SEMI    ";"
+%token GRUB_PARSER_TOKEN_LPAR    "("
+%token GRUB_PARSER_TOKEN_RPAR    ")"
+%token GRUB_PARSER_TOKEN_LBR     "{"
+%token GRUB_PARSER_TOKEN_RBR     "}"
+%token GRUB_PARSER_TOKEN_NOT     "!"
+%token GRUB_PARSER_TOKEN_LSQBR2  "["
+%token GRUB_PARSER_TOKEN_RSQBR2  "]"
+%token GRUB_PARSER_TOKEN_LT      "<"
+%token GRUB_PARSER_TOKEN_GT      ">"
+
+%token <arg> GRUB_PARSER_TOKEN_CASE      "case"
+%token <arg> GRUB_PARSER_TOKEN_DO        "do"
+%token <arg> GRUB_PARSER_TOKEN_DONE      "done"
+%token <arg> GRUB_PARSER_TOKEN_ELIF      "elif"
+%token <arg> GRUB_PARSER_TOKEN_ELSE      "else"
+%token <arg> GRUB_PARSER_TOKEN_ESAC      "esac"
+%token <arg> GRUB_PARSER_TOKEN_FI        "fi"
+%token <arg> GRUB_PARSER_TOKEN_FOR       "for"
+%token <arg> GRUB_PARSER_TOKEN_IF        "if"
+%token <arg> GRUB_PARSER_TOKEN_IN        "in"
+%token <arg> GRUB_PARSER_TOKEN_SELECT    "select"
+%token <arg> GRUB_PARSER_TOKEN_THEN      "then"
+%token <arg> GRUB_PARSER_TOKEN_UNTIL     "until"
+%token <arg> GRUB_PARSER_TOKEN_WHILE     "while"
+%token <arg> GRUB_PARSER_TOKEN_TIME      "time"
+%token <arg> GRUB_PARSER_TOKEN_FUNCTION  "function"
+%token <arg> GRUB_PARSER_TOKEN_MENUENTRY "menuentry"
+%token <arg> GRUB_PARSER_TOKEN_NAME      "name"
+%token <arg> GRUB_PARSER_TOKEN_WORD      "word"
+
+%type <arglist> word argument arguments0 arguments1
+%type <cmd> script_init script grubcmd ifcmd command
+%type <cmd> commands1 menuentry statement
 
 %pure-parser
-%lex-param { struct grub_parser_param *state };
+%error-verbose
+
+%lex-param   { struct grub_parser_param *state };
 %parse-param { struct grub_parser_param *state };
 
+%start script_init
+
 %%
 /* It should be possible to do this in a clean way...  */
-script_init:	{ state->err = 0; } script
-		  {
-		    state->parsed = $2;
-		  }
+script_init: { state->err = 0; } script { state->parsed = $2; state->err = 0; }
 ;
 
-script:		{ $$ = 0; }
-                | '\n' { $$ = 0; }
-                | commands { $$ = $1; }
-		| function '\n' { $$ = 0; }
-		| menuentry '\n' { $$ = $1; }
-		| error
-		  {
-		    $$ = 0;
-		    yyerror (state, "Incorrect command");
-		    state->err = 1;
-		    yyerrok;
-		  }
+script: newlines0
+        {
+          $$ = 0;
+        }
+      | script statement delimiter
+        {
+          struct grub_script_cmdblock *cmdblock;
+          cmdblock = (struct grub_script_cmdblock *) $1;
+          $$ = grub_script_add_cmd (state, cmdblock, $2);
+        }
+      | error
+        {
+          $$ = 0;
+          yyerror (state, "Incorrect command");
+          yyerrok;
+        }
 ;
 
-delimiter:	'\n'
-		| ';'
-		| delimiter '\n'
+newlines0: /* Empty */ | newlines1 ;
+newlines1: newlines0 "\n" ;
+
+delimiter: ";"
+         | "\n"
+;
+delimiters0: /* Empty */ | delimiters1 ;
+delimiters1: delimiter
+          | delimiters1 "\n"
 ;
 
-newlines:	/* Empty */
-		| newlines '\n'
+word: GRUB_PARSER_TOKEN_NAME { $$ = grub_script_add_arglist (state, 0, $1); }
+    | GRUB_PARSER_TOKEN_WORD { $$ = grub_script_add_arglist (state, 0, $1); }
 ;
 
+statement: command   { $$ = $1; }
+         | function  { $$ = 0;  }
+         | menuentry { $$ = $1; }
 
-
-arguments:	GRUB_PARSER_TOKEN_ARG
-		  {
-		    $$ = grub_script_add_arglist (state, 0, $1);
-		  }
-		| arguments GRUB_PARSER_TOKEN_ARG
-		  {
-		    $$ = grub_script_add_arglist (state, $1, $2);
-		  }
+argument : "case"      { $$ = grub_script_add_arglist (state, 0, $1); }
+         | "do"        { $$ = grub_script_add_arglist (state, 0, $1); }
+         | "done"      { $$ = grub_script_add_arglist (state, 0, $1); }
+         | "elif"      { $$ = grub_script_add_arglist (state, 0, $1); }
+         | "else"      { $$ = grub_script_add_arglist (state, 0, $1); }
+         | "esac"      { $$ = grub_script_add_arglist (state, 0, $1); }
+         | "fi"        { $$ = grub_script_add_arglist (state, 0, $1); }
+         | "for"       { $$ = grub_script_add_arglist (state, 0, $1); }
+         | "if"        { $$ = grub_script_add_arglist (state, 0, $1); }
+         | "in"        { $$ = grub_script_add_arglist (state, 0, $1); }
+         | "select"    { $$ = grub_script_add_arglist (state, 0, $1); }
+         | "then"      { $$ = grub_script_add_arglist (state, 0, $1); }
+         | "until"     { $$ = grub_script_add_arglist (state, 0, $1); }
+         | "while"     { $$ = grub_script_add_arglist (state, 0, $1); }
+         | "function"  { $$ = grub_script_add_arglist (state, 0, $1); }
+         | "menuentry" { $$ = grub_script_add_arglist (state, 0, $1); }
+         | word { $$ = $1; }
 ;
 
-grubcmd:	arguments
-		  {
-		    $$ = grub_script_create_cmdline (state, $1);
-		  }
+arguments0: /* Empty */ { $$ = 0; }
+          | arguments1  { $$ = $1; }
+;
+arguments1: argument arguments0
+            {
+	      if ($1 && $2)
+		{
+		  $1->next = $2;
+		  $1->argcount += $2->argcount;
+		  $2->argcount = 0;
+		}
+	      $$ = $1;
+            }
+;
+
+grubcmd: word arguments0
+         {
+           if ($1 && $2) {
+             $1->next = $2;
+             $1->argcount += $2->argcount;
+             $2->argcount = 0;
+           }
+           $$ = grub_script_create_cmdline (state, $1);
+         }
 ;
 
 /* A single command.  */
-command:	grubcmd delimiter { $$ = $1; }
-		| if delimiter 	{ $$ = $1; }
-		| commandblock delimiter { $$ = $1; }
+command: grubcmd { $$ = $1; }
+       | ifcmd   { $$ = $1; }
 ;
 
-/* A block of commands.  */
-commands:	command
-		  {
-		    $$ = grub_script_add_cmd (state, 0, $1);
-		  }
-		| command commands
-		  {
-		    struct grub_script_cmdblock *cmd;
-		    cmd = (struct grub_script_cmdblock *) $2;
-		    $$ = grub_script_add_cmd (state, cmd, $1);
-		  }
+/* A list of commands. */
+commands1: newlines0 command
+           {
+             $$ = grub_script_add_cmd (state, 0, $2);
+           }
+         | commands1 delimiters1 command
+           {
+             struct grub_script_cmdblock *cmdblock;
+	     cmdblock = (struct grub_script_cmdblock *) $1;
+	     $$ = grub_script_add_cmd (state, cmdblock, $3);
+           }
 ;
 
-/* A function.  Carefully save the memory that is allocated.  Don't
-   change any stuff because it might seem like a fun thing to do!
-   Special care was take to make sure the mid-rule actions are
-   executed on the right moment.  So the `commands' rule should be
-   recognized after executing the `grub_script_mem_record; and before
-   `grub_script_mem_record_stop'.  */
-function:	"function" GRUB_PARSER_TOKEN_ARG
-		  {
-		    grub_script_lexer_ref (state->lexerstate);
-		  } newlines '{'
-		  {
-		    /* The first part of the function was recognized.
-		       Now start recording the memory usage to store
-		       this function.  */
-		    state->func_mem = grub_script_mem_record (state);
-		  } newlines commands '}'
-		  {
-		    struct grub_script *script;
+function: "function" "name" 
+          {
+            grub_script_lexer_ref (state->lexerstate);
+            state->func_mem = grub_script_mem_record (state);
+          }
+          delimiters0 "{" commands1 delimiters1 "}"
+          {
+            struct grub_script *script;
+            state->func_mem = grub_script_mem_record_stop (state,
+                                                           state->func_mem);
+            script = grub_script_create ($6, state->func_mem);
+            if (script)
+              grub_script_function_create ($2, script);
 
-		    /* All the memory usage for parsing this function
-		       was recorded.  */
-		    state->func_mem = grub_script_mem_record_stop (state,
-								   state->func_mem);
-		    script = grub_script_create ($8, state->func_mem);
-		    if (script)
-		      grub_script_function_create ($2, script);
-		    grub_script_lexer_deref (state->lexerstate);
-		  }
+            grub_script_lexer_deref (state->lexerstate);
+          }
 ;
 
-/* Carefully designed, together with `menuentry' so everything happens
-   just in the expected order.  */
-commandblock:	'{'
-		  {
-		    grub_script_lexer_ref (state->lexerstate);
-		  }
-                newlines commands '}'
-                  {
-		    grub_script_lexer_deref (state->lexerstate);
-		    $$ = $4;
-		  }
+menuentry: "menuentry"
+           {
+             grub_script_lexer_ref (state->lexerstate);
+           }
+           arguments1
+           {
+             grub_script_lexer_record_start (state);
+           }
+           delimiters0 "{" commands1 delimiters1 "}"
+           {
+             char *menu_entry;
+             menu_entry = grub_script_lexer_record_stop (state);
+             grub_script_lexer_deref (state->lexerstate);
+             $$ = grub_script_create_cmdmenu (state, $3, menu_entry, 0);
+           }
 ;
 
-/* A menu entry.  Carefully save the memory that is allocated.  */
-menuentry:	"menuentry"
-		  {
-		    grub_script_lexer_ref (state->lexerstate);
-		  } arguments newlines '{'
-		  {
-		    grub_script_lexer_record_start (state->lexerstate);
-		  } newlines commands '}'
-		  {
-		    char *menu_entry;
-		    menu_entry = grub_script_lexer_record_stop (state->lexerstate);
-		    grub_script_lexer_deref (state->lexerstate);
-		    $$ = grub_script_create_cmdmenu (state, $3, menu_entry, 0);
-		  }
+if: "if" { grub_script_lexer_ref (state->lexerstate); }
 ;
-
-/* The first part of the if statement.  It's used to switch the lexer
-   to a state in which it demands more tokens.  */
-if_statement:	"if" { grub_script_lexer_ref (state->lexerstate); }
-;
-
-/* The if statement.  */
-if:		 if_statement commands "then" newlines commands "fi"
-		  {
-		    $$ = grub_script_create_cmdif (state, $2, $5, 0);
-		    grub_script_lexer_deref (state->lexerstate);
-		  }
-		 | if_statement commands "then" newlines commands "else" newlines commands  "fi"
-		  {
-		    $$ = grub_script_create_cmdif (state, $2, $5, $8);
-		    grub_script_lexer_deref (state->lexerstate);
-		  }
+ifcmd: if commands1 delimiters1 "then" commands1 delimiters1 "fi"
+       {
+         $$ = grub_script_create_cmdif (state, $2, $5, 0);
+         grub_script_lexer_deref (state->lexerstate);
+       }
+     | if commands1 delimiters1 "then" commands1 delimiters1 "else" commands1 delimiters1 "fi"
+       {
+         $$ = grub_script_create_cmdif (state, $2, $5, $8);
+         grub_script_lexer_deref (state->lexerstate);
+       }
 ;
diff --git a/script/script.c b/script/script.c
index c04a44966..b2d870745 100644
--- a/script/script.c
+++ b/script/script.c
@@ -1,7 +1,7 @@
 /* script.c -- Functions to create an in memory description of the script. */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2006,2007,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2005,2006,2007,2009,2010  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
@@ -24,12 +24,10 @@
 
 /* It is not possible to deallocate the memory when a syntax error was
    found.  Because of that it is required to keep track of all memory
-   allocations.  The memory is freed in case of an error, or
-   assigned to the parsed script when parsing was successful.  */
+   allocations.  The memory is freed in case of an error, or assigned
+   to the parsed script when parsing was successful.
 
-/* XXX */
-
-/* In case of the normal malloc, some additional bytes are allocated
+   In case of the normal malloc, some additional bytes are allocated
    for this datastructure.  All reserved memory is stored in a linked
    list so it can be easily freed.  The original memory can be found
    from &mem.  */
@@ -46,6 +44,8 @@ grub_script_malloc (struct grub_parser_param *state, grub_size_t size)
   struct grub_script_mem *mem;
   mem = (struct grub_script_mem *) grub_malloc (size + sizeof (*mem)
 						- sizeof (char));
+  if (!mem)
+    return 0;
 
   grub_dprintf ("scripting", "malloc %p\n", mem);
   mem->next = state->memused;
@@ -94,32 +94,40 @@ grub_script_mem_record_stop (struct grub_parser_param *state,
 void
 grub_script_free (struct grub_script *script)
 {
-  if (! script)
+  if (!script)
     return;
   grub_script_mem_free (script->mem);
   grub_free (script);
 }
-
 
 
+
 /* Extend the argument arg with a variable or string of text.  If ARG
    is zero a new list is created.  */
 struct grub_script_arg *
-grub_script_arg_add (struct grub_parser_param *state, struct grub_script_arg *arg,
-		     grub_script_arg_type_t type, char *str)
+grub_script_arg_add (struct grub_parser_param *state,
+		     struct grub_script_arg *arg, grub_script_arg_type_t type,
+		     char *str)
 {
   struct grub_script_arg *argpart;
   struct grub_script_arg *ll;
   int len;
 
-  argpart = (struct grub_script_arg *) grub_script_malloc (state, sizeof (*arg));
+  argpart =
+    (struct grub_script_arg *) grub_script_malloc (state, sizeof (*arg));
+  if (!argpart)
+    return arg;
+
   argpart->type = type;
   len = grub_strlen (str) + 1;
   argpart->str = grub_script_malloc (state, len);
+  if (!argpart->str)
+    return arg; /* argpart is freed later, during grub_script_free.  */
+
   grub_memcpy (argpart->str, str, len);
   argpart->next = 0;
 
-  if (! arg)
+  if (!arg)
     return argpart;
 
   for (ll = arg; ll->next; ll = ll->next);
@@ -132,19 +140,24 @@ grub_script_arg_add (struct grub_parser_param *state, struct grub_script_arg *ar
    is zero, a new list will be created.  */
 struct grub_script_arglist *
 grub_script_add_arglist (struct grub_parser_param *state,
-			 struct grub_script_arglist *list, struct grub_script_arg *arg)
+			 struct grub_script_arglist *list,
+			 struct grub_script_arg *arg)
 {
   struct grub_script_arglist *link;
   struct grub_script_arglist *ll;
 
   grub_dprintf ("scripting", "arglist\n");
 
-  link = (struct grub_script_arglist *) grub_script_malloc (state, sizeof (*link));
+  link =
+    (struct grub_script_arglist *) grub_script_malloc (state, sizeof (*link));
+  if (!link)
+    return list;
+
   link->next = 0;
   link->arg = arg;
   link->argcount = 0;
 
-  if (! list)
+  if (!list)
     {
       link->argcount++;
       return link;
@@ -171,6 +184,9 @@ grub_script_create_cmdline (struct grub_parser_param *state,
   grub_dprintf ("scripting", "cmdline\n");
 
   cmd = grub_script_malloc (state, sizeof (*cmd));
+  if (!cmd)
+    return 0;
+
   cmd->cmd.exec = grub_script_execute_cmdline;
   cmd->cmd.next = 0;
   cmd->arglist = arglist;
@@ -193,6 +209,9 @@ grub_script_create_cmdif (struct grub_parser_param *state,
   grub_dprintf ("scripting", "cmdif\n");
 
   cmd = grub_script_malloc (state, sizeof (*cmd));
+  if (!cmd)
+    return 0;
+
   cmd->cmd.exec = grub_script_execute_cmdif;
   cmd->cmd.next = 0;
   cmd->exec_to_evaluate = exec_to_evaluate;
@@ -209,30 +228,16 @@ grub_script_create_cmdif (struct grub_parser_param *state,
 struct grub_script_cmd *
 grub_script_create_cmdmenu (struct grub_parser_param *state,
 			    struct grub_script_arglist *arglist,
-			    char *sourcecode,
-			    int options)
+			    char *sourcecode, int options)
 {
   struct grub_script_cmd_menuentry *cmd;
-  int i;
-
-  /* Skip leading newlines to make the sourcecode better readable when
-     using the editor.  */
-  while (*sourcecode == '\n')
-    sourcecode++;
-
-  /* Having trailing returns can some some annoying conflicts, remove
-     them.  XXX: Can the parser be improved to handle this?  */
-  for (i = grub_strlen (sourcecode) - 1; i > 0; i--)
-    {
-      if (sourcecode[i] != '\n')
-	break;
-      sourcecode[i] = '\0';
-    }
 
   cmd = grub_script_malloc (state, sizeof (*cmd));
+  if (!cmd)
+    return 0;
+    
   cmd->cmd.exec = grub_script_execute_menuentry;
   cmd->cmd.next = 0;
-  /* XXX: Check if this memory is properly freed.  */
   cmd->sourcecode = sourcecode;
   cmd->arglist = arglist;
   cmd->options = options;
@@ -248,15 +253,19 @@ grub_script_add_cmd (struct grub_parser_param *state,
 		     struct grub_script_cmdblock *cmdblock,
 		     struct grub_script_cmd *cmd)
 {
+  struct grub_script_cmd *ptr;
+
   grub_dprintf ("scripting", "cmdblock\n");
 
-  if (! cmd)
+  if (!cmd)
     return (struct grub_script_cmd *) cmdblock;
 
-  if (! cmdblock)
+  if (!cmdblock)
     {
-      cmdblock = (struct grub_script_cmdblock *) grub_script_malloc (state,
-								     sizeof (*cmdblock));
+      cmdblock = grub_script_malloc (state, sizeof (*cmdblock));
+      if (!cmdblock)
+	return 0;
+
       cmdblock->cmd.exec = grub_script_execute_cmdblock;
       cmdblock->cmd.next = 0;
       cmdblock->cmdlist = cmd;
@@ -264,22 +273,29 @@ grub_script_add_cmd (struct grub_parser_param *state,
     }
   else
     {
-      cmd->next = cmdblock->cmdlist;
-      cmdblock->cmdlist = cmd;
+      if (!cmdblock->cmdlist)
+	cmdblock->cmdlist = cmd;
+      else
+	{
+	  ptr = cmdblock->cmdlist;
+	  while (ptr->next)
+	    ptr = ptr->next;
+	  ptr->next = cmd;
+	}
     }
 
   return (struct grub_script_cmd *) cmdblock;
 }
-
 
 
+
 struct grub_script *
 grub_script_create (struct grub_script_cmd *cmd, struct grub_script_mem *mem)
 {
   struct grub_script *parsed;
 
   parsed = grub_malloc (sizeof (*parsed));
-  if (! parsed)
+  if (!parsed)
     {
       grub_script_mem_free (mem);
       grub_free (cmd);
@@ -304,16 +320,16 @@ grub_script_parse (char *script, grub_reader_getline_t getline)
   struct grub_parser_param *parsestate;
 
   parsed = grub_malloc (sizeof (*parsed));
-  if (! parsed)
+  if (!parsed)
     return 0;
 
   parsestate = grub_zalloc (sizeof (*parsestate));
-  if (! parsestate)
+  if (!parsestate)
     return 0;
 
   /* Initialize the lexer.  */
-  lexstate = grub_script_lexer_init (script, getline);
-  if (! lexstate)
+  lexstate = grub_script_lexer_init (parsestate, script, getline);
+  if (!lexstate)
     {
       grub_free (parsed);
       grub_free (parsestate);
@@ -330,7 +346,7 @@ grub_script_parse (char *script, grub_reader_getline_t getline)
       struct grub_script_mem *memfree;
       memfree = grub_script_mem_record_stop (parsestate, membackup);
       grub_script_mem_free (memfree);
-      grub_free (lexstate);
+      grub_script_lexer_fini (lexstate);
       grub_free (parsestate);
       return 0;
     }
@@ -338,7 +354,7 @@ grub_script_parse (char *script, grub_reader_getline_t getline)
   parsed->mem = grub_script_mem_record_stop (parsestate, membackup);
   parsed->cmd = parsestate->parsed;
 
-  grub_free (lexstate);
+  grub_script_lexer_fini (lexstate);
   grub_free (parsestate);
 
   return parsed;
diff --git a/script/yylex.l b/script/yylex.l
new file mode 100644
index 000000000..4f6c00e21
--- /dev/null
+++ b/script/yylex.l
@@ -0,0 +1,331 @@
+%{
+/* yylex.l  The scripting lexer.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009,2010  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/parser.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/script_sh.h>
+#include "grub_script.tab.h"
+
+#define yyfree    grub_lexer_yyfree
+#define yyalloc   grub_lexer_yyalloc
+#define yyrealloc grub_lexer_yyrealloc
+
+/* 
+ * As we don't have access to yyscanner, we cannot do much except to
+ * print the fatal error.
+ */
+#define YY_FATAL_ERROR(msg)                     \
+  do {                                          \
+    grub_printf ("fatal error: %s\n", msg);     \
+  } while (0)
+
+#define PUSH(c)								\
+  do {									\
+    if (yyextra->lexerstate->size >= GRUB_LEXER_TOKEN_MAX - 1)		\
+      grub_script_yyerror (yyextra, "token too long");			\
+    else								\
+      yyextra->lexerstate->text[yyextra->lexerstate->size++] = c;	\
+  } while (0)
+      
+#define COPY(str)				\
+  do {						\
+    char *ptr = str;				\
+    while (*ptr && ! yyextra->err)		\
+      {						\
+        PUSH (*ptr);				\
+	ptr++;					\
+      }						\
+  } while (0)
+
+#define RECORD					\
+  do {						\
+    grub_script_lexer_record (yyextra, yytext);	\
+  } while (0)
+
+#define ARG(t)			      \
+  do {				      \
+    yyextra->lexerstate->type = t;    \
+    return GRUB_PARSER_TOKEN_WORD;    \
+  } while (0)
+
+/* We don't need YY_INPUT, as we rely on yy_scan_strings */
+#define YY_INPUT(buf,res,max) do { res = 0; } while (0)
+
+/* forward declarations */
+static void  grub_lexer_yyfree (void *, yyscan_t yyscanner);
+static void* grub_lexer_yyalloc (yy_size_t, yyscan_t yyscanner);
+static void* grub_lexer_yyrealloc (void*, yy_size_t, yyscan_t yyscanner);
+
+%}
+
+%top{
+
+/* 
+ * Some flex hacks for -nostdinc; XXX We need to fix these when libc
+ * support becomes availble in GRUB.
+ */
+
+#include <grub/types.h>
+
+typedef grub_size_t size_t;
+typedef grub_size_t yy_size_t;
+#define YY_TYPEDEF_YY_SIZE_T 1
+
+#define FILE   void
+#define stdin  0
+#define stdout 0
+#define EOF    0
+
+#define errno  grub_errno
+#define EINVAL GRUB_ERR_BAD_NUMBER
+#define ENOMEM GRUB_ERR_OUT_OF_MEMORY
+
+#define strlen grub_strlen
+#define memset grub_memset
+
+#define fprintf(...) 0
+#define exit(...)
+
+#pragma GCC diagnostic warning "-Wunused-variable"
+#pragma GCC diagnostic warning "-Wunused-function"
+#pragma GCC diagnostic warning "-Wunused-parameter"
+#pragma GCC diagnostic warning "-Wstrict-prototypes"
+#pragma GCC diagnostic warning "-Wmissing-prototypes"
+
+}
+
+%option ecs
+%option meta-ecs
+
+%option warn
+%option array
+%option stack
+%option reentrant
+%option bison-bridge
+%option never-interactive
+
+%option noyyfree noyyalloc noyyrealloc
+%option nounistd nostdinit nodefault noyylineno noyywrap
+
+/* Reduce lexer size, by not defining these.  */
+%option noyy_top_state
+%option noinput nounput
+%option noyyget_in noyyset_in
+%option noyyget_out noyyset_out
+%option noyyget_debug noyyset_debug
+%option noyyget_lineno noyyset_lineno
+
+%option extra-type="struct grub_parser_param*"
+
+BLANK           [ \t]
+COMMENT         ^[ \t]*#.*$
+
+CHAR            [^|&;()<> \t\n\'\"]
+DIGITS          [[:digit:]]+
+NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
+
+ESC             \\.
+VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|$\?|$\{\?\}
+DQSTR           \"([^\"]|\\\")*\"
+SQSTR           \'[^\']*\'
+WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
+
+%x              SPLIT
+%x              DQUOTE
+%x              SQUOTE
+%x              VAR
+
+%%
+
+ /* White spaces */
+{BLANK}+        { RECORD; }
+{COMMENT}       { RECORD; }
+
+ /* Special symbols */
+"\n"            { RECORD; return GRUB_PARSER_TOKEN_NEWLINE; }
+"||"            { RECORD; return GRUB_PARSER_TOKEN_OR;      }
+"&&"            { RECORD; return GRUB_PARSER_TOKEN_AND;     }
+";;"            { RECORD; return GRUB_PARSER_TOKEN_SEMI2;   }
+"|"             { RECORD; return GRUB_PARSER_TOKEN_PIPE;    }
+"&"             { RECORD; return GRUB_PARSER_TOKEN_AMP;     }
+";"             { RECORD; return GRUB_PARSER_TOKEN_SEMI;    }
+"("             { RECORD; return GRUB_PARSER_TOKEN_LPAR;    }
+")"             { RECORD; return GRUB_PARSER_TOKEN_RPAR;    }
+"<"             { RECORD; return GRUB_PARSER_TOKEN_LT;      }
+">"             { RECORD; return GRUB_PARSER_TOKEN_GT;      }
+
+ /* Reserved words */
+"!"             { RECORD; return GRUB_PARSER_TOKEN_NOT;       }
+"{"             { RECORD; return GRUB_PARSER_TOKEN_LBR;       }
+"}"             { RECORD; return GRUB_PARSER_TOKEN_RBR;       }
+"[["            { RECORD; return GRUB_PARSER_TOKEN_RSQBR2;    }
+"]]"            { RECORD; return GRUB_PARSER_TOKEN_LSQBR2;    }
+"time"          { RECORD; return GRUB_PARSER_TOKEN_TIME;      }
+"case"          { RECORD; return GRUB_PARSER_TOKEN_CASE;      }
+"do"            { RECORD; return GRUB_PARSER_TOKEN_DO;        }
+"done"          { RECORD; return GRUB_PARSER_TOKEN_DONE;      }
+"elif"          { RECORD; return GRUB_PARSER_TOKEN_ELIF;      }
+"else"          { RECORD; return GRUB_PARSER_TOKEN_ELSE;      }
+"esac"          { RECORD; return GRUB_PARSER_TOKEN_ESAC;      }
+"fi"            { RECORD; return GRUB_PARSER_TOKEN_FI;        }
+"for"           { RECORD; return GRUB_PARSER_TOKEN_FOR;       }
+"if"            { RECORD; return GRUB_PARSER_TOKEN_IF;        }
+"in"            { RECORD; return GRUB_PARSER_TOKEN_IN;        }
+"select"        { RECORD; return GRUB_PARSER_TOKEN_SELECT;    }
+"then"          { RECORD; return GRUB_PARSER_TOKEN_THEN;      }
+"until"         { RECORD; return GRUB_PARSER_TOKEN_UNTIL;     }
+"while"         { RECORD; return GRUB_PARSER_TOKEN_WHILE;     }
+"function"      { RECORD; return GRUB_PARSER_TOKEN_FUNCTION;  }
+"menuentry"     { RECORD; return GRUB_PARSER_TOKEN_MENUENTRY; }
+
+{NAME}          { RECORD; return GRUB_PARSER_TOKEN_NAME; }
+{WORD}          {
+                  RECORD;
+                  /* resplit yytext */
+                  yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner);
+		  if (yy_scan_string (yytext, yyscanner))
+		    {
+		      yyextra->lexerstate->merge_start = 1;
+		      yy_push_state (SPLIT, yyscanner);
+		    }
+		  else
+		    {
+		      grub_script_yyerror (yyextra, 0);
+		      yypop_buffer_state (yyscanner);
+		      return GRUB_PARSER_TOKEN_WORD;
+		    }
+                }
+
+.|\n            {
+                  grub_script_yyerror (yyextra, "unrecognized token");
+		  return GRUB_PARSER_TOKEN_BAD;
+                }
+
+
+ /* Split word into multiple args */
+
+<SPLIT>{
+  \\.           { PUSH (yytext[1]); }
+  \"            {
+		  yy_push_state (DQUOTE, yyscanner);
+                  ARG (GRUB_SCRIPT_ARG_TYPE_TEXT);
+                }
+  \'            {
+		  yy_push_state (SQUOTE, yyscanner);
+                  ARG (GRUB_SCRIPT_ARG_TYPE_TEXT);
+                }
+  \$            {
+                  yy_push_state (VAR, yyscanner);
+                  ARG (GRUB_SCRIPT_ARG_TYPE_TEXT);
+		}
+  {CHAR}        { PUSH (yytext[0]); }
+  .|\n          {
+                  /* This cannot happen.  */
+		  grub_script_yyerror (yyextra, "internal error: unexpected characters in a word");
+                  return GRUB_PARSER_TOKEN_BAD;
+		}
+
+  <<EOF>>       {
+		  yy_pop_state (yyscanner);
+		  yypop_buffer_state (yyscanner);
+		  yyextra->lexerstate->merge_end = 1;
+                  ARG (GRUB_SCRIPT_ARG_TYPE_TEXT);
+                }
+}
+
+<VAR>{
+  \?            |
+  {DIGITS}      |
+  {NAME}        {
+                  COPY (yytext);
+		  yy_pop_state (yyscanner);
+		  if (YY_START == SPLIT)
+		    ARG (GRUB_SCRIPT_ARG_TYPE_VAR);
+		  else
+		    ARG (GRUB_SCRIPT_ARG_TYPE_DQVAR);
+		}
+  \{\?\}        |
+  \{{DIGITS}\}  |
+  \{{NAME}\}    {
+                  yytext[yyleng - 1] = '\0';
+		  COPY (yytext + 1);
+                  yy_pop_state (yyscanner);
+		  if (YY_START == SPLIT)
+		    ARG (GRUB_SCRIPT_ARG_TYPE_VAR);
+		  else
+		    ARG (GRUB_SCRIPT_ARG_TYPE_DQVAR);
+                }
+  .|\n          { return GRUB_PARSER_TOKEN_BAD; }
+}
+
+<SQUOTE>{
+  \'            {
+                  yy_pop_state (yyscanner);
+		  ARG (GRUB_SCRIPT_ARG_TYPE_SQSTR);
+                }
+  (.|\n)        { PUSH (yytext[0]); }
+}
+
+<DQUOTE>{
+  \"            {
+                  yy_pop_state (yyscanner);
+		  ARG (GRUB_SCRIPT_ARG_TYPE_DQSTR);
+                }
+  \$            {
+                  yy_push_state (VAR, yyscanner);
+		  ARG (GRUB_SCRIPT_ARG_TYPE_DQSTR);
+		}
+  \\\\          { PUSH ('\\'); }
+  \\\"          { PUSH ('\"'); }
+  \\\n          { /* ignore */ }
+  (.|\n)        { PUSH (yytext[0]); }
+}
+
+<<EOF>>         {
+		  yypop_buffer_state (yyscanner);
+		  if (! grub_script_lexer_yywrap (yyextra))
+		    {
+		      yyextra->lexerstate->eof = 1;
+		      return GRUB_PARSER_TOKEN_EOF;
+		    }
+                }
+
+%%
+
+static void
+grub_lexer_yyfree (void *ptr, yyscan_t yyscanner __attribute__ ((unused)))
+{
+  grub_free(ptr);
+}
+
+static void*
+grub_lexer_yyalloc (yy_size_t size, yyscan_t yyscanner __attribute__ ((unused)))
+{
+  return grub_malloc (size);
+}
+
+static void*
+grub_lexer_yyrealloc (void *ptr, yy_size_t size,
+                      yyscan_t yyscanner __attribute__ ((unused)))
+{
+  return grub_realloc (ptr, size);
+}
+
diff --git a/tests/grub_script_echo1.in b/tests/grub_script_echo1.in
new file mode 100644
index 000000000..048907a76
--- /dev/null
+++ b/tests/grub_script_echo1.in
@@ -0,0 +1,32 @@
+#! @builddir@/grub-shell-tester
+
+# Run GRUB script in a Qemu instance
+# Copyright (C) 2010  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/>.
+
+foo=bar
+echo $foo ${foo}
+echo "$foo" "${foo}"
+echo '$foo' '${foo}'
+echo a$foob a${foo}b
+echo ab"cd"ef$foo'gh'ij${foo}kl\ mn\"op\'qr\$st\(uv\<wx\>yz\)
+
+foo=c
+bar=h
+echo e"$foo"${bar}o
+e"$foo"${bar}o hello world
+
+foo=echo
+$foo 1234
diff --git a/tests/grub_script_echo_keywords.in b/tests/grub_script_echo_keywords.in
new file mode 100644
index 000000000..a6383f0e2
--- /dev/null
+++ b/tests/grub_script_echo_keywords.in
@@ -0,0 +1,3 @@
+#! @builddir@/grub-shell-tester
+
+echo if then else fi for do done
diff --git a/tests/grub_script_vars1.in b/tests/grub_script_vars1.in
new file mode 100644
index 000000000..9ff897627
--- /dev/null
+++ b/tests/grub_script_vars1.in
@@ -0,0 +1,34 @@
+#! @builddir@/grub-shell-tester
+
+# Run GRUB script in a Qemu instance
+# Copyright (C) 2010  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/>.
+
+var=foo
+echo $var
+echo "$var"
+echo ${var}
+echo "${var}"
+
+echo $1 $2 $?
+
+foo=foo
+echo "" $foo
+
+echo $bar $foo
+ 
+bar=""
+echo $bar $foo
+
diff --git a/tests/util/grub-shell-tester.in b/tests/util/grub-shell-tester.in
index 6ed4ebcac..e9507c8f5 100644
--- a/tests/util/grub-shell-tester.in
+++ b/tests/util/grub-shell-tester.in
@@ -1,7 +1,7 @@
 #! /bin/bash -e
 
 # Compares GRUB script output with BASH output.
-# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 2009,2010  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
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index e6fef8313..2b9131547 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -1,7 +1,7 @@
 #! /bin/bash -e
 
 # Run GRUB script in a Qemu instance
-# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 2009,2010  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
diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index 3bfd6a425..0ad24186d 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -1,7 +1,7 @@
 /* grub-script-check.c - check grub script file for syntax errors */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003,2004,2005,2006,2007,2008,2009,2010  Free Software Foundation, Inc.
+ *  Copyright (C) 2009,2010  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
@@ -82,16 +82,8 @@ grub_script_execute_cmdif (struct grub_script_cmd *cmd __attribute__ ((unused)))
 }
 
 grub_err_t
-grub_script_execute_menuentry (struct grub_script_cmd *cmd)
+grub_script_execute_menuentry (struct grub_script_cmd *cmd __attribute__ ((unused)))
 {
-  struct grub_script_cmd_menuentry *menu;
-  menu = (struct grub_script_cmd_menuentry *)cmd;
-
-  if (menu->sourcecode)
-    {
-      grub_free (menu->sourcecode);
-      menu->sourcecode = 0;
-    }
   return 0;
 }
 

From 566863ca1973b0cb39d469e46a384e59bcc437b4 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Fri, 22 Jan 2010 17:12:40 +0000
Subject: [PATCH 0371/1628] 2010-01-22  Robert Millan  <rmh.grub@aybabtu.com>

	Use generic grub_reboot() for i386-efi.

	* kern/efi/efi.c [__i386__] (grub_reboot): Remove.
	* kern/i386/efi/startup.S: Include `"../realmode.S"'.
	* kern/i386/realmode.S: Include `<grub/i386/pc/memory.h>'.
---
 ChangeLog               | 8 ++++++++
 kern/efi/efi.c          | 5 ++++-
 kern/i386/efi/startup.S | 4 +++-
 kern/i386/realmode.S    | 3 ++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5eef8a821..e559f218e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-22  Robert Millan  <rmh.grub@aybabtu.com>
+
+	Use generic grub_reboot() for i386-efi.
+
+	* kern/efi/efi.c [__i386__] (grub_reboot): Remove.
+	* kern/i386/efi/startup.S: Include `"../realmode.S"'.
+	* kern/i386/realmode.S: Include `<grub/i386/pc/memory.h>'.
+
 2010-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/ieee1275/init.c (grub_machine_set_prefix): Don't check for
diff --git a/kern/efi/efi.c b/kern/efi/efi.c
index c6ce04c5e..d8b225535 100644
--- a/kern/efi/efi.c
+++ b/kern/efi/efi.c
@@ -1,7 +1,7 @@
 /* efi.c - generic EFI support */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2006,2007,2008,2009,2010  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
@@ -162,6 +162,8 @@ grub_exit (void)
   for (;;) ;
 }
 
+/* On i386, a firmware-independant grub_reboot() is provided by realmode.S.  */
+#ifndef __i386__
 void
 grub_reboot (void)
 {
@@ -169,6 +171,7 @@ grub_reboot (void)
   efi_call_4 (grub_efi_system_table->runtime_services->reset_system,
               GRUB_EFI_RESET_COLD, GRUB_EFI_SUCCESS, 0, NULL);
 }
+#endif
 
 void
 grub_halt (void)
diff --git a/kern/i386/efi/startup.S b/kern/i386/efi/startup.S
index b88628010..5b464ab83 100644
--- a/kern/i386/efi/startup.S
+++ b/kern/i386/efi/startup.S
@@ -1,7 +1,7 @@
 /* startup.S - bootstrap GRUB itself */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007  Free Software Foundation, Inc.
+ *  Copyright (C) 2006,2007,2010  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
@@ -62,3 +62,5 @@ codestart:
 	movl	%eax, EXT_C(grub_efi_system_table)
 	call	EXT_C(grub_main)
 	ret
+
+#include "../realmode.S"
diff --git a/kern/i386/realmode.S b/kern/i386/realmode.S
index a74eb1217..578c8d2a8 100644
--- a/kern/i386/realmode.S
+++ b/kern/i386/realmode.S
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2005,2006,2007,2009 Free Software Foundation, Inc.
+ *  Copyright (C) 1999,2000,2001,2002,2003,2005,2006,2007,2009,2010 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
@@ -16,6 +16,7 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <grub/i386/pc/memory.h>
 
 /*
  * Note: These functions defined in this file may be called from C.

From df6dc2113acd4db226e7a5066916096775656222 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 23 Jan 2010 00:14:00 +0530
Subject: [PATCH 0372/1628] removed arbitrary limit on token size

---
 include/grub/script_sh.h |   9 +--
 script/lexer.c           |   6 +-
 script/yylex.l           | 155 +++++++++++++++++++++------------------
 3 files changed, 89 insertions(+), 81 deletions(-)

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 889017d2a..1eb6d0bb8 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -157,8 +157,10 @@ struct grub_lexer_param
   int merge_start;
   int merge_end;
 
-  /* Text of current token.  */
+  /* Part of a multi-part token.  */
   char *text;
+  unsigned used;
+  unsigned size;
 
   /* Type of text.  */
   grub_script_arg_type_t type;
@@ -168,12 +170,9 @@ struct grub_lexer_param
 
   /* Flex scanner buffer.  */
   void *buffer;
-
-  /* Length of current token text.  */
-  unsigned size;
 };
 
-#define GRUB_LEXER_TOKEN_MAX        256
+#define GRUB_LEXER_INITIAL_TEXT_SIZE 32
 #define GRUB_LEXER_RECORD_INCREMENT 256
 
 /* State of the parser as passes to the parser.  */
diff --git a/script/lexer.c b/script/lexer.c
index d43c9f157..179e1d1d2 100644
--- a/script/lexer.c
+++ b/script/lexer.c
@@ -213,7 +213,8 @@ grub_script_lexer_init (struct grub_parser_param *parser, char *script,
   if (!lexerstate)
     return 0;
 
-  lexerstate->text = grub_malloc (GRUB_LEXER_TOKEN_MAX);
+  lexerstate->size = GRUB_LEXER_INITIAL_TEXT_SIZE;
+  lexerstate->text = grub_malloc (lexerstate->size);
   if (!lexerstate->text)
     {
       grub_free (lexerstate);
@@ -301,7 +302,7 @@ grub_script_yylex (union YYSTYPE *value,
   do
     {
       /* Empty lexerstate->text.  */
-      lexerstate->size = 0;
+      lexerstate->used = 1;
       lexerstate->text[0] = '\0';
 
       token = yylex (value, lexerstate->yyscanner);
@@ -311,7 +312,6 @@ grub_script_yylex (union YYSTYPE *value,
       /* Merging feature uses lexerstate->text instead of yytext.  */
       if (lexerstate->merge_start)
 	{
-	  lexerstate->text[lexerstate->size] = '\0';
 	  str = lexerstate->text;
 	  type = lexerstate->type;
 	}
diff --git a/script/yylex.l b/script/yylex.l
index 4f6c00e21..c19461c9a 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -37,31 +37,19 @@
     grub_printf ("fatal error: %s\n", msg);     \
   } while (0)
 
-#define PUSH(c)								\
-  do {									\
-    if (yyextra->lexerstate->size >= GRUB_LEXER_TOKEN_MAX - 1)		\
-      grub_script_yyerror (yyextra, "token too long");			\
-    else								\
-      yyextra->lexerstate->text[yyextra->lexerstate->size++] = c;	\
-  } while (0)
-      
-#define COPY(str)				\
-  do {						\
-    char *ptr = str;				\
-    while (*ptr && ! yyextra->err)		\
-      {						\
-        PUSH (*ptr);				\
-	ptr++;					\
-      }						\
+#define COPY(str, hint)                         \
+  do {                                          \
+    copy_string (yyextra, str, hint);           \
   } while (0)
 
-#define RECORD					\
-  do {						\
-    grub_script_lexer_record (yyextra, yytext);	\
+
+#define RECORD                                  \
+  do {                                          \
+    grub_script_lexer_record (yyextra, yytext); \
   } while (0)
 
-#define ARG(t)			      \
-  do {				      \
+#define ARG(t)                        \
+  do {                                \
     yyextra->lexerstate->type = t;    \
     return GRUB_PARSER_TOKEN_WORD;    \
   } while (0)
@@ -73,6 +61,8 @@
 static void  grub_lexer_yyfree (void *, yyscan_t yyscanner);
 static void* grub_lexer_yyalloc (yy_size_t, yyscan_t yyscanner);
 static void* grub_lexer_yyrealloc (void*, yy_size_t, yyscan_t yyscanner);
+static void  copy_string (struct grub_parser_param *, const char *,
+                          unsigned hint);
 
 %}
 
@@ -201,52 +191,47 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
                   RECORD;
                   /* resplit yytext */
                   yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner);
-		  if (yy_scan_string (yytext, yyscanner))
-		    {
-		      yyextra->lexerstate->merge_start = 1;
-		      yy_push_state (SPLIT, yyscanner);
-		    }
-		  else
-		    {
-		      grub_script_yyerror (yyextra, 0);
-		      yypop_buffer_state (yyscanner);
-		      return GRUB_PARSER_TOKEN_WORD;
-		    }
+                  if (yy_scan_string (yytext, yyscanner))
+                    {
+                      yyextra->lexerstate->merge_start = 1;
+                      yy_push_state (SPLIT, yyscanner);
+                    }
+                  else
+                    {
+                      grub_script_yyerror (yyextra, 0);
+                      yypop_buffer_state (yyscanner);
+                      return GRUB_PARSER_TOKEN_WORD;
+                    }
                 }
 
 .|\n            {
                   grub_script_yyerror (yyextra, "unrecognized token");
-		  return GRUB_PARSER_TOKEN_BAD;
+                  return GRUB_PARSER_TOKEN_BAD;
                 }
 
 
  /* Split word into multiple args */
 
 <SPLIT>{
-  \\.           { PUSH (yytext[1]); }
+  \\.           { COPY (yytext + 1, yyleng - 1); }
   \"            {
-		  yy_push_state (DQUOTE, yyscanner);
+                  yy_push_state (DQUOTE, yyscanner);
                   ARG (GRUB_SCRIPT_ARG_TYPE_TEXT);
                 }
   \'            {
-		  yy_push_state (SQUOTE, yyscanner);
+                  yy_push_state (SQUOTE, yyscanner);
                   ARG (GRUB_SCRIPT_ARG_TYPE_TEXT);
                 }
   \$            {
                   yy_push_state (VAR, yyscanner);
                   ARG (GRUB_SCRIPT_ARG_TYPE_TEXT);
-		}
-  {CHAR}        { PUSH (yytext[0]); }
-  .|\n          {
-                  /* This cannot happen.  */
-		  grub_script_yyerror (yyextra, "internal error: unexpected characters in a word");
-                  return GRUB_PARSER_TOKEN_BAD;
-		}
-
+                }
+  \\            |
+  [^\"\'$\\]+   { COPY (yytext, yyleng); }
   <<EOF>>       {
-		  yy_pop_state (yyscanner);
-		  yypop_buffer_state (yyscanner);
-		  yyextra->lexerstate->merge_end = 1;
+                  yy_pop_state (yyscanner);
+                  yypop_buffer_state (yyscanner);
+                  yyextra->lexerstate->merge_end = 1;
                   ARG (GRUB_SCRIPT_ARG_TYPE_TEXT);
                 }
 }
@@ -255,23 +240,23 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
   \?            |
   {DIGITS}      |
   {NAME}        {
-                  COPY (yytext);
-		  yy_pop_state (yyscanner);
-		  if (YY_START == SPLIT)
-		    ARG (GRUB_SCRIPT_ARG_TYPE_VAR);
-		  else
-		    ARG (GRUB_SCRIPT_ARG_TYPE_DQVAR);
-		}
+                  COPY (yytext, yyleng);
+                  yy_pop_state (yyscanner);
+                  if (YY_START == SPLIT)
+                    ARG (GRUB_SCRIPT_ARG_TYPE_VAR);
+                  else
+                    ARG (GRUB_SCRIPT_ARG_TYPE_DQVAR);
+                }
   \{\?\}        |
   \{{DIGITS}\}  |
   \{{NAME}\}    {
                   yytext[yyleng - 1] = '\0';
-		  COPY (yytext + 1);
+                  COPY (yytext + 1, yyleng - 2);
                   yy_pop_state (yyscanner);
-		  if (YY_START == SPLIT)
-		    ARG (GRUB_SCRIPT_ARG_TYPE_VAR);
-		  else
-		    ARG (GRUB_SCRIPT_ARG_TYPE_DQVAR);
+                  if (YY_START == SPLIT)
+                    ARG (GRUB_SCRIPT_ARG_TYPE_VAR);
+                  else
+                    ARG (GRUB_SCRIPT_ARG_TYPE_DQVAR);
                 }
   .|\n          { return GRUB_PARSER_TOKEN_BAD; }
 }
@@ -279,33 +264,34 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
 <SQUOTE>{
   \'            {
                   yy_pop_state (yyscanner);
-		  ARG (GRUB_SCRIPT_ARG_TYPE_SQSTR);
+                  ARG (GRUB_SCRIPT_ARG_TYPE_SQSTR);
                 }
-  (.|\n)        { PUSH (yytext[0]); }
+  [^\']+        { COPY (yytext, yyleng); }
 }
 
 <DQUOTE>{
   \"            {
                   yy_pop_state (yyscanner);
-		  ARG (GRUB_SCRIPT_ARG_TYPE_DQSTR);
+                  ARG (GRUB_SCRIPT_ARG_TYPE_DQSTR);
                 }
   \$            {
                   yy_push_state (VAR, yyscanner);
-		  ARG (GRUB_SCRIPT_ARG_TYPE_DQSTR);
-		}
-  \\\\          { PUSH ('\\'); }
-  \\\"          { PUSH ('\"'); }
+                  ARG (GRUB_SCRIPT_ARG_TYPE_DQSTR);
+                }
+  \\\\          { COPY ("\\", 1); }
+  \\\"          { COPY ("\"", 1); }
   \\\n          { /* ignore */ }
-  (.|\n)        { PUSH (yytext[0]); }
+  [^\"$\\\n]+   { COPY (yytext, yyleng); }
+  (.|\n)        { COPY (yytext, yyleng); }
 }
 
 <<EOF>>         {
-		  yypop_buffer_state (yyscanner);
-		  if (! grub_script_lexer_yywrap (yyextra))
-		    {
-		      yyextra->lexerstate->eof = 1;
-		      return GRUB_PARSER_TOKEN_EOF;
-		    }
+                  yypop_buffer_state (yyscanner);
+                  if (! grub_script_lexer_yywrap (yyextra))
+                    {
+                      yyextra->lexerstate->eof = 1;
+                      return GRUB_PARSER_TOKEN_EOF;
+                    }
                 }
 
 %%
@@ -329,3 +315,26 @@ grub_lexer_yyrealloc (void *ptr, yy_size_t size,
   return grub_realloc (ptr, size);
 }
 
+static void copy_string (struct grub_parser_param *parser, const char *str, unsigned hint)
+{
+  int len;
+  int size;
+  char *ptr;
+
+  len = hint ? hint : grub_strlen (str);
+  if (parser->lexerstate->used + len >= parser->lexerstate->size)
+    {
+      size = parser->lexerstate->size * 2;
+      ptr = grub_realloc (parser->lexerstate->text, size);
+      if (!ptr)
+        {
+          grub_script_yyerror (parser, 0);
+          return;
+        }
+
+      parser->lexerstate->text = ptr;
+      parser->lexerstate->size = size;
+    }
+  grub_strcpy (parser->lexerstate->text + parser->lexerstate->used - 1, str);
+  parser->lexerstate->used += len;
+}

From bae09d0d47418def5585a22a0a8af50ebfae327a Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 23 Jan 2010 00:42:55 +0530
Subject: [PATCH 0373/1628] remove arbitrary limit on menuentry recording

---
 include/grub/script_sh.h |  4 ++--
 script/lexer.c           | 15 +++++++++------
 script/yylex.l           |  6 ++++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 1eb6d0bb8..5ada7c7e5 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -172,8 +172,8 @@ struct grub_lexer_param
   void *buffer;
 };
 
-#define GRUB_LEXER_INITIAL_TEXT_SIZE 32
-#define GRUB_LEXER_RECORD_INCREMENT 256
+#define GRUB_LEXER_INITIAL_TEXT_SIZE   32
+#define GRUB_LEXER_INITIAL_RECORD_SIZE 256
 
 /* State of the parser as passes to the parser.  */
 struct grub_parser_param
diff --git a/script/lexer.c b/script/lexer.c
index 179e1d1d2..834ca1e91 100644
--- a/script/lexer.c
+++ b/script/lexer.c
@@ -45,12 +45,11 @@ grub_script_lexer_record_start (struct grub_parser_param *parser)
 
   lexer->record = 1;
   lexer->recordpos = 0;
-  if (lexer->recording)		/* reuse last record */
+  if (lexer->recording) /* reuse last record */
     return;
 
-  lexer->recordlen = GRUB_LEXER_RECORD_INCREMENT;
+  lexer->recordlen = GRUB_LEXER_INITIAL_RECORD_SIZE;
   lexer->recording = grub_malloc (lexer->recordlen);
-
   if (!lexer->recording)
     {
       grub_script_yyerror (parser, 0);
@@ -99,27 +98,31 @@ grub_script_lexer_record_stop (struct grub_parser_param *parser)
   return result;
 }
 
+#define MAX(a,b) ((a) < (b) ? (b) : (a))
 
 /* Record STR if input recording is enabled.  */
 void
 grub_script_lexer_record (struct grub_parser_param *parser, char *str)
 {
   int len;
+  char *old;
   struct grub_lexer_param *lexer = parser->lexerstate;
 
   if (!lexer->record)
     return;
 
   len = grub_strlen (str);
-  if (lexer->recordpos + len >= lexer->recordlen - 1)
+  if (lexer->recordpos + len + 1 > lexer->recordlen)
     {
-      char *old = lexer->recording;
-      lexer->recordlen += GRUB_LEXER_RECORD_INCREMENT;
+      old = lexer->recording;
+      lexer->recordlen = MAX (len, lexer->recordlen) * 2;
       lexer->recording = grub_realloc (lexer->recording, lexer->recordlen);
       if (!lexer->recording)
 	{
 	  grub_free (old);
 	  lexer->record = 0;
+	  lexer->recordpos = 0;
+	  lexer->recordlen /= 2;
 	  grub_script_yyerror (parser, 0);
 	  return;
 	}
diff --git a/script/yylex.l b/script/yylex.l
index c19461c9a..9cafba5c2 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -315,16 +315,18 @@ grub_lexer_yyrealloc (void *ptr, yy_size_t size,
   return grub_realloc (ptr, size);
 }
 
+#define MAX(a,b) ((a) < (b) ? (b) : (a))
+
 static void copy_string (struct grub_parser_param *parser, const char *str, unsigned hint)
 {
-  int len;
   int size;
   char *ptr;
+  unsigned len;
 
   len = hint ? hint : grub_strlen (str);
   if (parser->lexerstate->used + len >= parser->lexerstate->size)
     {
-      size = parser->lexerstate->size * 2;
+      size = MAX (len, parser->lexerstate->size) * 2;
       ptr = grub_realloc (parser->lexerstate->text, size);
       if (!ptr)
         {

From 454fcd1c9bd5229c2fccabb1e34cbf0b1693ba92 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 22 Jan 2010 20:40:21 +0100
Subject: [PATCH 0374/1628] 2010-01-22  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* configure.ac: Check for _restgpr_14_x.
	* include/grub/powerpc/libgcc.h [HAVE__RESTGPR_14_X]: Add _restgpr_*_x
	and _savegpr_* prototypes.
---
 ChangeLog                     |  6 ++++++
 configure.ac                  |  2 +-
 include/grub/powerpc/libgcc.h | 39 +++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e559f218e..a44d1f66e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Check for _restgpr_14_x.
+	* include/grub/powerpc/libgcc.h [HAVE__RESTGPR_14_X]: Add _restgpr_*_x
+	and _savegpr_* prototypes.
+
 2010-01-22  Robert Millan  <rmh.grub@aybabtu.com>
 
 	Use generic grub_reboot() for i386-efi.
diff --git a/configure.ac b/configure.ac
index b1435de44..f621b5648 100644
--- a/configure.ac
+++ b/configure.ac
@@ -439,7 +439,7 @@ AC_SUBST(TARGET_CPPFLAGS)
 AC_SUBST(TARGET_LDFLAGS)
 
 # Check for libgcc symbols (must be performed before we add -nostdlib to LDFLAGS)
-AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __trampoline_setup __ucmpdi2)
+AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __trampoline_setup __ucmpdi2 _restgpr_14_x)
 
 # Set them to their new values for the tests below.
 CC="$TARGET_CC"
diff --git a/include/grub/powerpc/libgcc.h b/include/grub/powerpc/libgcc.h
index 452ad4366..6be122308 100644
--- a/include/grub/powerpc/libgcc.h
+++ b/include/grub/powerpc/libgcc.h
@@ -33,3 +33,42 @@ void EXPORT_FUNC (__trampoline_setup) (void);
 #ifdef HAVE___UCMPDI2
 void EXPORT_FUNC (__ucmpdi2) (void);
 #endif
+
+#ifdef HAVE__RESTGPR_14_X
+void EXPORT_FUNC (_restgpr_14_x) (void);
+void EXPORT_FUNC (_restgpr_15_x) (void);
+void EXPORT_FUNC (_restgpr_16_x) (void);
+void EXPORT_FUNC (_restgpr_17_x) (void);
+void EXPORT_FUNC (_restgpr_18_x) (void);
+void EXPORT_FUNC (_restgpr_19_x) (void);
+void EXPORT_FUNC (_restgpr_20_x) (void);
+void EXPORT_FUNC (_restgpr_21_x) (void);
+void EXPORT_FUNC (_restgpr_22_x) (void);
+void EXPORT_FUNC (_restgpr_23_x) (void);
+void EXPORT_FUNC (_restgpr_24_x) (void);
+void EXPORT_FUNC (_restgpr_25_x) (void);
+void EXPORT_FUNC (_restgpr_26_x) (void);
+void EXPORT_FUNC (_restgpr_27_x) (void);
+void EXPORT_FUNC (_restgpr_28_x) (void);
+void EXPORT_FUNC (_restgpr_29_x) (void);
+void EXPORT_FUNC (_restgpr_30_x) (void);
+void EXPORT_FUNC (_restgpr_31_x) (void);
+void EXPORT_FUNC (_savegpr_14) (void);
+void EXPORT_FUNC (_savegpr_15) (void);
+void EXPORT_FUNC (_savegpr_16) (void);
+void EXPORT_FUNC (_savegpr_17) (void);
+void EXPORT_FUNC (_savegpr_18) (void);
+void EXPORT_FUNC (_savegpr_19) (void);
+void EXPORT_FUNC (_savegpr_20) (void);
+void EXPORT_FUNC (_savegpr_21) (void);
+void EXPORT_FUNC (_savegpr_22) (void);
+void EXPORT_FUNC (_savegpr_23) (void);
+void EXPORT_FUNC (_savegpr_24) (void);
+void EXPORT_FUNC (_savegpr_25) (void);
+void EXPORT_FUNC (_savegpr_26) (void);
+void EXPORT_FUNC (_savegpr_27) (void);
+void EXPORT_FUNC (_savegpr_28) (void);
+void EXPORT_FUNC (_savegpr_29) (void);
+void EXPORT_FUNC (_savegpr_30) (void);
+void EXPORT_FUNC (_savegpr_31) (void);
+#endif

From 4b358c0a56edfcd90e52a1fb6334408ffa6909fa Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 22 Jan 2010 20:42:02 +0100
Subject: [PATCH 0375/1628] 2010-01-22  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* term/ieee1275/ofconsole.c (grub_ofconsole_setcolorstate): Allocate on
	stack since heap may be unavailable at that point.
	(grub_ofconsole_gotoxy): Likewise.
---
 ChangeLog                 |  6 ++++++
 term/ieee1275/ofconsole.c | 16 ++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a44d1f66e..d700466fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* term/ieee1275/ofconsole.c (grub_ofconsole_setcolorstate): Allocate on
+	stack since heap may be unavailable at that point.
+	(grub_ofconsole_gotoxy): Likewise.
+
 2010-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Check for _restgpr_14_x.
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index 3799e2e27..51dca7a53 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -109,7 +109,7 @@ grub_ofconsole_getcharwidth (grub_uint32_t c __attribute__((unused)))
 static void
 grub_ofconsole_setcolorstate (grub_term_color_state state)
 {
-  char *setcol;
+  char setcol[256];
   int fg;
   int bg;
 
@@ -128,10 +128,8 @@ grub_ofconsole_setcolorstate (grub_term_color_state state)
       return;
     }
 
-  setcol = grub_xasprintf ("\e[3%dm\e[4%dm", fg, bg);
-  if (setcol)
-    grub_ofconsole_writeesc (setcol);
-  grub_free (setcol);
+  grub_snprintf (setcol, sizeof (setcol), "\e[3%dm\e[4%dm", fg, bg);
+  grub_ofconsole_writeesc (setcol);
 }
 
 static void
@@ -288,14 +286,12 @@ grub_ofconsole_gotoxy (grub_uint8_t x, grub_uint8_t y)
 {
   if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_ANSI))
     {
-      char *s;
+      char s[256];
       grub_curr_x = x;
       grub_curr_y = y;
 
-      s = grub_xasprintf ("\e[%d;%dH", y + 1, x + 1);
-      if (s)
-	grub_ofconsole_writeesc (s);
-      grub_free (s);
+      grub_snprintf (s, sizeof (s), "\e[%d;%dH", y + 1, x + 1);
+      grub_ofconsole_writeesc (s);
     }
   else
     {

From 345dd552add27340079e6b3458dcb2c2866ee9fa Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 23 Jan 2010 08:57:26 +0530
Subject: [PATCH 0376/1628] replace ROUND_UPTO with ALIGN_UP

---
 script/execute.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/script/execute.c b/script/execute.c
index 83b6649ce..4197598fb 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -35,8 +35,6 @@ grub_script_execute_cmd (struct grub_script_cmd *cmd)
   return cmd->exec (cmd);
 }
 
-#define ROUND_UPTO(sz,up) (((sz) + (up) - 1) / (up) *  (up))
-
 /* Expand arguments in ARGLIST into multiple arguments.  */
 char **
 grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist)
@@ -58,7 +56,7 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist)
     if (oom)
       return;
 
-    p = grub_realloc (argv, ROUND_UPTO (sizeof(char*) * (argc + 1), 32));
+    p = grub_realloc (argv, ALIGN_UP (sizeof(char*) * (argc + 1), 32));
     if (!p)
       oom = 1;
     else
@@ -80,7 +78,7 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist)
 
     len = nchar ?: grub_strlen (str);
     old = argv[argc - 1] ? grub_strlen (argv[argc - 1]) : 0;
-    p = grub_realloc (argv[argc - 1], ROUND_UPTO(old + len + 1, 32));
+    p = grub_realloc (argv[argc - 1], ALIGN_UP(old + len + 1, 32));
 
     if (p)
       {

From 1fb08ed515591c2da70227cc9958f6aaa2311ac0 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 23 Jan 2010 09:12:46 +0530
Subject: [PATCH 0377/1628] return arg count from
 grub_script_execute_arglist_to_argv

---
 include/grub/script_sh.h |  2 +-
 script/execute.c         | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 5ada7c7e5..c8c610d7b 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -300,6 +300,6 @@ int grub_script_function_call (grub_script_function_t func,
 			       int argc, char **args);
 
 char **
-grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist);
+grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *count);
 
 #endif /* ! GRUB_NORMAL_PARSER_HEADER */
diff --git a/script/execute.c b/script/execute.c
index 4197598fb..5d60e9f8c 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -37,7 +37,7 @@ grub_script_execute_cmd (struct grub_script_cmd *cmd)
 
 /* Expand arguments in ARGLIST into multiple arguments.  */
 char **
-grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist)
+grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *count)
 {
   int i;
   int oom;
@@ -162,7 +162,6 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist)
       if (!empty)
 	push (0);
     }
-  push (0); /* Ensure argv[argc] == 0.  */
 
   if (oom)
     {
@@ -172,6 +171,9 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist)
       argv = 0;
     }
 
+  if (argv)
+    *count = argc - 1;
+
   return argv;
 }
 
@@ -190,7 +192,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
   char *cmdname;
 
   /* Lookup the command.  */
-  args = grub_script_execute_arglist_to_argv (cmdline->arglist);
+  args = grub_script_execute_arglist_to_argv (cmdline->arglist, &argcount);
   if (!args)
     return grub_errno;
 
@@ -228,9 +230,6 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 	}
     }
 
-  /* Count argv size.  */
-  for (argcount = 0; args[argcount]; argcount++);
-
   /* Execute the GRUB command or function.  */
   if (grubcmd)
     ret = (grubcmd->func) (grubcmd, argcount - 1, args + 1);
@@ -296,11 +295,9 @@ grub_script_execute_menuentry (struct grub_script_cmd *cmd)
 
   if (cmd_menuentry->arglist)
     {
-      args = grub_script_execute_arglist_to_argv (cmd_menuentry->arglist);
+      args = grub_script_execute_arglist_to_argv (cmd_menuentry->arglist, &argcount);
       if (!args)
 	return grub_errno;
-
-      for (argcount = 0; args[argcount]; argcount++);
     }
 
   grub_normal_add_menu_entry (argcount, (const char **) args,

From 836727564e7b27462d0dffc9ea41a2463370f5d1 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 23 Jan 2010 09:18:13 +0530
Subject: [PATCH 0378/1628] replace grub_printf with grub_dprintf

---
 script/lexer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/lexer.c b/script/lexer.c
index 834ca1e91..17c38a353 100644
--- a/script/lexer.c
+++ b/script/lexer.c
@@ -323,7 +323,7 @@ grub_script_yylex (union YYSTYPE *value,
 	  str = yyget_text (lexerstate->yyscanner);
 	  type = GRUB_SCRIPT_ARG_TYPE_TEXT;
 	}
-      /* grub_printf ("tok %u, txt [%s] size %u\n", token, str, lexerstate->size); */
+      grub_dprintf("lexer", "token %u text [%s]\n", token, str);
 
       value->arg = grub_script_arg_add (parserstate, value->arg, type, str);
     }

From 1a0c3b4809152c876e15c2196a1ea1084f131f27 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 23 Jan 2010 10:14:32 +0530
Subject: [PATCH 0379/1628] some bug fixes

---
 script/lexer.c | 2 +-
 script/yylex.l | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/script/lexer.c b/script/lexer.c
index 17c38a353..caefdb7a7 100644
--- a/script/lexer.c
+++ b/script/lexer.c
@@ -139,7 +139,7 @@ append_newline (const char *src)
   grub_size_t len;
 
   len = grub_strlen (src);
-  line = grub_malloc (len + 1);
+  line = grub_malloc (len + 2);
   if (!line)
     return 0;
 
diff --git a/script/yylex.l b/script/yylex.l
index 9cafba5c2..7cef8496b 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -128,13 +128,13 @@ typedef grub_size_t yy_size_t;
 BLANK           [ \t]
 COMMENT         ^[ \t]*#.*$
 
-CHAR            [^|&;()<> \t\n\'\"]
+CHAR            [^|&$;()<> \t\n\'\"\\]
 DIGITS          [[:digit:]]+
 NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
 
 ESC             \\.
 VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|$\?|$\{\?\}
-DQSTR           \"([^\"]|\\\")*\"
+DQSTR           \"([^\\\"]|{ESC})*\"
 SQSTR           \'[^\']*\'
 WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
 
@@ -190,6 +190,7 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
 {WORD}          {
                   RECORD;
                   /* resplit yytext */
+		  grub_dprintf ("lexer", "word: [%s]\n", yytext);
                   yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner);
                   if (yy_scan_string (yytext, yyscanner))
                     {
@@ -209,7 +210,6 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
                   return GRUB_PARSER_TOKEN_BAD;
                 }
 
-
  /* Split word into multiple args */
 
 <SPLIT>{

From d63cdb6e704c4006b1aabe94a2f04a925414fa2e Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 23 Jan 2010 10:16:05 +0530
Subject: [PATCH 0380/1628] removed error-verbose to reduce resulting sh.mod
 size

---
 script/parser.y | 2 --
 1 file changed, 2 deletions(-)

diff --git a/script/parser.y b/script/parser.y
index 6d1b5bdbc..b8d981866 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -80,8 +80,6 @@
 %type <cmd> commands1 menuentry statement
 
 %pure-parser
-%error-verbose
-
 %lex-param   { struct grub_parser_param *state };
 %parse-param { struct grub_parser_param *state };
 

From 1368740e693e3030319ae064eecc9e21fe8e6018 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 23 Jan 2010 10:28:52 +0530
Subject: [PATCH 0381/1628] one more bug fix in
 grub_script_execute_arglist_to_argv

---
 script/execute.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/execute.c b/script/execute.c
index 5d60e9f8c..c956960da 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -130,7 +130,7 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *c
 	    {
 	    case GRUB_SCRIPT_ARG_TYPE_VAR:
 	      value = grub_env_get (arg->str);
-	      while (*value && (ptr = move_to_next(&value)))
+	      while (value && *value && (ptr = move_to_next(&value)))
 		{
 		  empty = 0;
 		  append (ptr, value - ptr);

From 4e6a305be4782194a1aaf83e962f54b313db2ac8 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 23 Jan 2010 11:03:41 +0530
Subject: [PATCH 0382/1628] for loop support to grub script

---
 ChangeLog.for-loop        | 13 +++++++++++++
 conf/tests.rmk            |  4 ++++
 include/grub/script_sh.h  | 22 ++++++++++++++++++++++
 script/execute.c          | 26 ++++++++++++++++++++++++++
 script/parser.y           | 14 +++++++++++++-
 script/script.c           | 24 ++++++++++++++++++++++++
 tests/grub_script_for1.in | 27 +++++++++++++++++++++++++++
 util/grub-script-check.c  |  6 ++++++
 8 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100644 ChangeLog.for-loop
 create mode 100644 tests/grub_script_for1.in

diff --git a/ChangeLog.for-loop b/ChangeLog.for-loop
new file mode 100644
index 000000000..0fbb9d04a
--- /dev/null
+++ b/ChangeLog.for-loop
@@ -0,0 +1,13 @@
+2010-01-12  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	For loop support to GRUB script.
+
+	* include/grub/script_sh.h (grub_script_cmdfor): New struct.
+	(grub_script_create_cmdfor): New function prototype.
+	(grub_script_execute_cmdfor): New function prototype.
+	* script/execute.c (grub_script_execute_cmdfor): New function.
+	* script/parser.y (command): New for command.
+	(forcmd): New grammar rule.
+	* script/script.c (grub_script_create_cmdfor): New function.
+	* util/grub-script-check.c (grub_script_execute_cmdfor): New
+	function.
diff --git a/conf/tests.rmk b/conf/tests.rmk
index c5080f58c..92f14797d 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -50,6 +50,9 @@ grub_script_echo_keywords_SOURCES = tests/grub_script_echo_keywords.in
 check_SCRIPTS += grub_script_vars1
 grub_script_vars1_SOURCES = tests/grub_script_vars1.in
 
+check_SCRIPTS += grub_script_for1
+grub_script_for1_SOURCES = tests/grub_script_for1.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -59,6 +62,7 @@ grub_script_vars1_SOURCES = tests/grub_script_vars1.in
 SCRIPTED_TESTS  = grub_script_echo1
 SCRIPTED_TESTS += grub_script_echo_keywords
 SCRIPTED_TESTS += grub_script_vars1
+SCRIPTED_TESTS += grub_script_for1
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index c8c610d7b..4436afbf1 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -106,6 +106,21 @@ struct grub_script_cmdif
   struct grub_script_cmd *exec_on_false;
 };
 
+/* A for statement.  */
+struct grub_script_cmdfor
+{
+  struct grub_script_cmd cmd;
+
+  /* The name used as looping variable.  */
+  struct grub_script_arg *name;
+
+  /* The words loop iterates over.  */
+  struct grub_script_arglist *words;
+
+  /* The command list executed in each loop.  */
+  struct grub_script_cmd *list;
+};
+
 /* A menu entry generate statement.  */
 struct grub_script_cmd_menuentry
 {
@@ -213,6 +228,12 @@ grub_script_create_cmdif (struct grub_parser_param *state,
 			  struct grub_script_cmd *exec_on_true,
 			  struct grub_script_cmd *exec_on_false);
 
+struct grub_script_cmd *
+grub_script_create_cmdfor (struct grub_parser_param *state,
+			   struct grub_script_arg *name,
+			   struct grub_script_arglist *words,
+			   struct grub_script_cmd *list);
+
 struct grub_script_cmd *
 grub_script_create_cmdmenu (struct grub_parser_param *state,
 			    struct grub_script_arglist *arglist,
@@ -261,6 +282,7 @@ void grub_script_yyerror (struct grub_parser_param *, char const *);
 grub_err_t grub_script_execute_cmdline (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdblock (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdif (struct grub_script_cmd *cmd);
+grub_err_t grub_script_execute_cmdfor (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_menuentry (struct grub_script_cmd *cmd);
 
 /* Execute any GRUB pre-parsed command or script.  */
diff --git a/script/execute.c b/script/execute.c
index c956960da..aa6975fdd 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -282,6 +282,32 @@ grub_script_execute_cmdif (struct grub_script_cmd *cmd)
     return grub_script_execute_cmd (cmdif->exec_on_false);
 }
 
+/* Execute a for statement.  */
+grub_err_t
+grub_script_execute_cmdfor (struct grub_script_cmd *cmd)
+{
+  int i;
+  int result;
+  char **args;
+  int argcount;
+  struct grub_script_cmdfor *cmdfor = (struct grub_script_cmdfor *) cmd;
+
+  args = grub_script_execute_arglist_to_argv (cmdfor->words, &argcount);
+  if (!args)
+    return grub_errno;
+
+  result = 0;
+  for (i = 0; i < argcount; i++)
+    {
+      grub_env_set (cmdfor->name->str, args[i]);
+      result = grub_script_execute_cmd (cmdfor->list);
+      grub_free (args[i]);
+    }
+
+  grub_free (args);
+  return result;
+}
+
 /* Execute the menu entry generate statement.  */
 grub_err_t
 grub_script_execute_menuentry (struct grub_script_cmd *cmd)
diff --git a/script/parser.y b/script/parser.y
index b8d981866..26a6e3735 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -76,7 +76,7 @@
 %token <arg> GRUB_PARSER_TOKEN_WORD      "word"
 
 %type <arglist> word argument arguments0 arguments1
-%type <cmd> script_init script grubcmd ifcmd command
+%type <cmd> script_init script grubcmd ifcmd forcmd command
 %type <cmd> commands1 menuentry statement
 
 %pure-parser
@@ -175,6 +175,7 @@ grubcmd: word arguments0
 /* A single command.  */
 command: grubcmd { $$ = $1; }
        | ifcmd   { $$ = $1; }
+       | forcmd  { $$ = $1; }
 ;
 
 /* A list of commands. */
@@ -238,3 +239,14 @@ ifcmd: if commands1 delimiters1 "then" commands1 delimiters1 "fi"
          grub_script_lexer_deref (state->lexerstate);
        }
 ;
+
+forcmd: "for" "name"
+        {
+	  grub_script_lexer_ref (state->lexerstate);
+        }
+        "in" arguments0 delimiters1 "do" commands1 delimiters1 "done"
+	{
+	  $$ = grub_script_create_cmdfor (state, $2, $5, $8);
+	  grub_script_lexer_deref (state->lexerstate);
+	}
+;
diff --git a/script/script.c b/script/script.c
index b2d870745..9142a8245 100644
--- a/script/script.c
+++ b/script/script.c
@@ -221,6 +221,30 @@ grub_script_create_cmdif (struct grub_parser_param *state,
   return (struct grub_script_cmd *) cmd;
 }
 
+/* Create a command that functions as a for statement.  */
+struct grub_script_cmd *
+grub_script_create_cmdfor (struct grub_parser_param *state,
+			   struct grub_script_arg *name,
+			   struct grub_script_arglist *words,
+			   struct grub_script_cmd *list)
+{
+  struct grub_script_cmdfor *cmd;
+
+  grub_dprintf ("scripting", "cmdfor\n");
+
+  cmd = grub_script_malloc (state, sizeof (*cmd));
+  if (! cmd)
+    return 0;
+
+  cmd->cmd.exec = grub_script_execute_cmdfor;
+  cmd->cmd.next = 0;
+  cmd->name = name;
+  cmd->words = words;
+  cmd->list = list;
+
+  return (struct grub_script_cmd *) cmd;
+}
+
 /* Create a command that adds a menu entry to the menu.  Title is an
    argument that is parsed to generate a string that can be used as
    the title.  The sourcecode for this entry is passed in SOURCECODE.
diff --git a/tests/grub_script_for1.in b/tests/grub_script_for1.in
new file mode 100644
index 000000000..e39a7664d
--- /dev/null
+++ b/tests/grub_script_for1.in
@@ -0,0 +1,27 @@
+#! @builddir@/grub-shell-tester
+
+for x in one two 'three 3' "four 4" five six-6; do echo $x; done
+
+for x in one two 'three 3' "four 4" five six-6
+do
+	echo $x
+done
+
+foo="1 2"
+for x in ab${foo}cd; do echo $x; done
+for x in "ab${foo}cd"; do echo $x; done
+
+a="one two three"
+y=foo
+echo $y
+for y in $a; do
+    echo $y
+done
+echo $y
+
+
+b="one two three"
+for z in $b; do
+    echo $z
+done
+echo $z
diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index 0ad24186d..3b3f5bd47 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -81,6 +81,12 @@ grub_script_execute_cmdif (struct grub_script_cmd *cmd __attribute__ ((unused)))
   return 0;
 }
 
+grub_err_t
+grub_script_execute_cmdfor (struct grub_script_cmd *cmd __attribute__ ((unused)))
+{
+  return 0;
+}
+
 grub_err_t
 grub_script_execute_menuentry (struct grub_script_cmd *cmd __attribute__ ((unused)))
 {

From 10523df4781740c499113bed7f1827f627f82cbf Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 23 Jan 2010 11:19:26 +0530
Subject: [PATCH 0383/1628] while and until loops support

---
 include/grub/script_sh.h | 22 ++++++++++++++++++++++
 script/execute.c         | 20 ++++++++++++++++++++
 script/parser.y          | 35 ++++++++++++++++++++++++++++++-----
 script/script.c          | 22 ++++++++++++++++++++++
 util/grub-script-check.c |  6 ++++++
 5 files changed, 100 insertions(+), 5 deletions(-)

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 4436afbf1..207b5fcbc 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -121,6 +121,21 @@ struct grub_script_cmdfor
   struct grub_script_cmd *list;
 };
 
+/* A while/until command.  */
+struct grub_script_cmdwhile
+{
+  struct grub_script_cmd cmd;
+
+  /* The command list used as condition.  */
+  struct grub_script_cmd *cond;
+
+  /* The command list executed in each loop.  */
+  struct grub_script_cmd *list;
+
+  /* The flag to indicate this as "until" loop.  */
+  int until;
+};
+
 /* A menu entry generate statement.  */
 struct grub_script_cmd_menuentry
 {
@@ -234,6 +249,12 @@ grub_script_create_cmdfor (struct grub_parser_param *state,
 			   struct grub_script_arglist *words,
 			   struct grub_script_cmd *list);
 
+struct grub_script_cmd *
+grub_script_create_cmdwhile (struct grub_parser_param *state,
+			     struct grub_script_cmd *cond,
+			     struct grub_script_cmd *list,
+			     int is_an_until_loop);
+
 struct grub_script_cmd *
 grub_script_create_cmdmenu (struct grub_parser_param *state,
 			    struct grub_script_arglist *arglist,
@@ -283,6 +304,7 @@ grub_err_t grub_script_execute_cmdline (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdblock (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdif (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdfor (struct grub_script_cmd *cmd);
+grub_err_t grub_script_execute_cmdwhile (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_menuentry (struct grub_script_cmd *cmd);
 
 /* Execute any GRUB pre-parsed command or script.  */
diff --git a/script/execute.c b/script/execute.c
index aa6975fdd..b905de46f 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -308,6 +308,26 @@ grub_script_execute_cmdfor (struct grub_script_cmd *cmd)
   return result;
 }
 
+/* Execute a "while" or "until" command.  */
+grub_err_t
+grub_script_execute_cmdwhile (struct grub_script_cmd *cmd)
+{
+  int cond;
+  int result;
+  struct grub_script_cmdwhile *cmdwhile = (struct grub_script_cmdwhile *) cmd;
+
+  result = 0;
+  do {
+    cond = grub_script_execute_cmd (cmdwhile->cond);
+    if ((cmdwhile->until && !cond) || (!cmdwhile->until && cond))
+      break;
+
+    result = grub_script_execute_cmd (cmdwhile->list);
+  } while (1); /* XXX Put a check for ^C here */
+
+  return result;
+}
+
 /* Execute the menu entry generate statement.  */
 grub_err_t
 grub_script_execute_menuentry (struct grub_script_cmd *cmd)
diff --git a/script/parser.y b/script/parser.y
index 26a6e3735..4d22ae400 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -76,8 +76,9 @@
 %token <arg> GRUB_PARSER_TOKEN_WORD      "word"
 
 %type <arglist> word argument arguments0 arguments1
-%type <cmd> script_init script grubcmd ifcmd forcmd command
-%type <cmd> commands1 menuentry statement
+%type <cmd> script_init script
+%type <cmd> grubcmd ifcmd forcmd whilecmd untilcmd
+%type <cmd> command commands1 menuentry statement
 
 %pure-parser
 %lex-param   { struct grub_parser_param *state };
@@ -173,9 +174,11 @@ grubcmd: word arguments0
 ;
 
 /* A single command.  */
-command: grubcmd { $$ = $1; }
-       | ifcmd   { $$ = $1; }
-       | forcmd  { $$ = $1; }
+command: grubcmd  { $$ = $1; }
+       | ifcmd    { $$ = $1; }
+       | forcmd   { $$ = $1; }
+       | whilecmd { $$ = $1; }
+       | untilcmd { $$ = $1; }
 ;
 
 /* A list of commands. */
@@ -250,3 +253,25 @@ forcmd: "for" "name"
 	  grub_script_lexer_deref (state->lexerstate);
 	}
 ;
+
+whilecmd: "while"
+          {
+	    grub_script_lexer_ref (state->lexerstate);
+          }
+          commands1 delimiters1 "do" commands1 delimiters1 "done"
+	  {
+	    $$ = grub_script_create_cmdwhile (state, $3, $6, 0);
+	    grub_script_lexer_deref (state->lexerstate);
+	  }
+;
+
+untilcmd: "until"
+          {
+	    grub_script_lexer_ref (state->lexerstate);
+          }
+          commands1 delimiters1 "do" commands1 delimiters1 "done"
+	  {
+	    $$ = grub_script_create_cmdwhile (state, $3, $6, 1);
+	    grub_script_lexer_deref (state->lexerstate);
+	  }
+;
diff --git a/script/script.c b/script/script.c
index 9142a8245..4c87d9491 100644
--- a/script/script.c
+++ b/script/script.c
@@ -245,6 +245,28 @@ grub_script_create_cmdfor (struct grub_parser_param *state,
   return (struct grub_script_cmd *) cmd;
 }
 
+/* Create a "while" or "until" command.  */
+struct grub_script_cmd *
+grub_script_create_cmdwhile (struct grub_parser_param *state,
+			     struct grub_script_cmd *cond,
+			     struct grub_script_cmd *list,
+			     int is_an_until_loop)
+{
+  struct grub_script_cmdwhile *cmd;
+
+  cmd = grub_script_malloc (state, sizeof (*cmd));
+  if (! cmd)
+    return 0;
+
+  cmd->cmd.exec = grub_script_execute_cmdwhile;
+  cmd->cmd.next = 0;
+  cmd->cond = cond;
+  cmd->list = list;
+  cmd->until = is_an_until_loop;
+
+  return (struct grub_script_cmd *) cmd;
+}
+
 /* Create a command that adds a menu entry to the menu.  Title is an
    argument that is parsed to generate a string that can be used as
    the title.  The sourcecode for this entry is passed in SOURCECODE.
diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index 3b3f5bd47..eb11988e3 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -87,6 +87,12 @@ grub_script_execute_cmdfor (struct grub_script_cmd *cmd __attribute__ ((unused))
   return 0;
 }
 
+grub_err_t
+grub_script_execute_cmdwhile (struct grub_script_cmd *cmd __attribute__ ((unused)))
+{
+  return 0;
+}
+
 grub_err_t
 grub_script_execute_menuentry (struct grub_script_cmd *cmd __attribute__ ((unused)))
 {

From 7d8c9ec63df5396df0bdc9843675ed56876525fd Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 23 Jan 2010 13:30:24 +0100
Subject: [PATCH 0384/1628] newreloc on yeeloong

---
 conf/mips.rmk                    |   4 +-
 include/grub/mips/relocator.h    |   9 ++-
 include/grub/relocator_private.h |   2 +-
 lib/i386/relocator.c             |   6 +-
 lib/mips/relocator.c             | 111 ++++++++++++++++++++-----------
 lib/mips/relocator_asm.S         |   8 +--
 lib/relocator.c                  |   8 ++-
 loader/mips/linux.c              |  60 +++++++++--------
 8 files changed, 126 insertions(+), 82 deletions(-)

diff --git a/conf/mips.rmk b/conf/mips.rmk
index d0b1c484c..0e96caeb4 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -17,7 +17,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
 	symbol.h term.h time.h types.h loader.h partition.h \
 	msdos_partition.h machine/kernel.h handler.h list.h \
-	command.h machine/memory.h cpu/libgcc.h cpu/cache.h i18n.h
+	command.h machine/memory.h cpu/libgcc.h cpu/cache.h i18n.h mm_private.h
 
 ifeq ($(platform), yeeloong)
 kernel_img_HEADERS += pci.h
@@ -68,7 +68,7 @@ serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For relocator.mod.
 pkglib_MODULES += relocator.mod
-relocator_mod_SOURCES = lib/$(target_cpu)/relocator.c lib/$(target_cpu)/relocator_asm.S
+relocator_mod_SOURCES = lib/$(target_cpu)/relocator.c lib/relocator.c lib/$(target_cpu)/relocator_asm.S
 relocator_mod_CFLAGS = $(COMMON_CFLAGS)
 relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
 relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/include/grub/mips/relocator.h b/include/grub/mips/relocator.h
index 838ef832f..67b0a4c43 100644
--- a/include/grub/mips/relocator.h
+++ b/include/grub/mips/relocator.h
@@ -21,6 +21,7 @@
 
 #include <grub/types.h>
 #include <grub/err.h>
+#include <grub/relocator.h>
 
 struct grub_relocator32_state
 {
@@ -30,10 +31,8 @@ struct grub_relocator32_state
   int jumpreg;
 };
 
-void *grub_relocator32_alloc (grub_size_t size);
-grub_err_t grub_relocator32_boot (void *relocator, grub_uint32_t dest,
-				  struct grub_relocator32_state state);
-void *grub_relocator32_realloc (void *relocator, grub_size_t size);
-void grub_relocator32_free (void *relocator);
+grub_err_t
+grub_relocator32_boot (struct grub_relocator *rel,
+		       struct grub_relocator32_state state);
 
 #endif /* ! GRUB_RELOCATOR_CPU_HEADER */
diff --git a/include/grub/relocator_private.h b/include/grub/relocator_private.h
index 7a3ef2bd7..f9e76468e 100644
--- a/include/grub/relocator_private.h
+++ b/include/grub/relocator_private.h
@@ -31,7 +31,7 @@ void
 grub_cpu_relocator_init (void);
 grub_err_t
 grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
-			       grub_addr_t *relstart);
+			       grub_addr_t *relstart, grub_size_t *relsize);
 void grub_cpu_relocator_forward (void *rels, void *src, void *tgt,
 				 grub_size_t size);
 void grub_cpu_relocator_backward (void *rels, void *src, void *tgt,
diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index d040c80ab..4eaa66890 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -169,7 +169,7 @@ grub_relocator32_boot (struct grub_relocator *rel,
 
   grub_memmove (src, &grub_relocator32_start, RELOCATOR_SIZEOF (32));
 
-  err = grub_relocator_prepare_relocs (rel, target, &relst);
+  err = grub_relocator_prepare_relocs (rel, target, &relst, NULL);
   if (err)
     return err;
 
@@ -209,7 +209,7 @@ grub_relocator16_boot (struct grub_relocator *rel,
 
   grub_memmove (src, &grub_relocator16_start, RELOCATOR_SIZEOF (16));
 
-  err = grub_relocator_prepare_relocs (rel, target, &relst);
+  err = grub_relocator_prepare_relocs (rel, target, &relst, NULL);
   if (err)
     return err;
 
@@ -248,7 +248,7 @@ grub_relocator64_boot (struct grub_relocator *rel,
 
   grub_memmove (src, &grub_relocator64_start, RELOCATOR_SIZEOF (64));
 
-  err = grub_relocator_prepare_relocs (rel, target, &relst);
+  err = grub_relocator_prepare_relocs (rel, target, &relst, NULL);
   if (err)
     return err;
 
diff --git a/lib/mips/relocator.c b/lib/mips/relocator.c
index 118ddbd6f..410b68b8b 100644
--- a/lib/mips/relocator.c
+++ b/lib/mips/relocator.c
@@ -25,26 +25,33 @@
 #include <grub/cache.h>
 
 #include <grub/mips/relocator.h>
+#include <grub/relocator_private.h>
 
-/* Remark: doesn't work with source outside of 4G.
-   Use relocator64 in this case. 
- */
+/* Do we need mips64? */
 
-extern grub_uint8_t grub_relocator32_forward_start;
-extern grub_uint8_t grub_relocator32_forward_end;
-extern grub_uint8_t grub_relocator32_backward_start;
-extern grub_uint8_t grub_relocator32_backward_end;
+extern grub_uint8_t grub_relocator_forward_start;
+extern grub_uint8_t grub_relocator_forward_end;
+extern grub_uint8_t grub_relocator_backward_start;
+extern grub_uint8_t grub_relocator_backward_end;
 
 #define REGW_SIZEOF (2 * sizeof (grub_uint32_t))
 #define JUMP_SIZEOF (2 * sizeof (grub_uint32_t))
 
-#define RELOCATOR_SRC_SIZEOF(x) (&grub_relocator32_##x##_end \
-				 - &grub_relocator32_##x##_start)
+#define RELOCATOR_SRC_SIZEOF(x) (&grub_relocator_##x##_end \
+				 - &grub_relocator_##x##_start)
 #define RELOCATOR_SIZEOF(x)	(RELOCATOR_SRC_SIZEOF(x) \
-				 + REGW_SIZEOF * (31 + 3) + JUMP_SIZEOF)
-#define RELOCATOR_ALIGN 16
+				 + REGW_SIZEOF * 3)
+grub_size_t grub_relocator_align = sizeof (grub_uint32_t);
+grub_size_t grub_relocator_forward_size;
+grub_size_t grub_relocator_backward_size;
+grub_size_t grub_relocator_jumper_size = JUMP_SIZEOF + REGW_SIZEOF;
 
-#define PREFIX(x) grub_relocator32_ ## x
+void
+grub_cpu_relocator_init (void)
+{
+  grub_relocator_forward_size = RELOCATOR_SIZEOF(forward);
+  grub_relocator_backward_size = RELOCATOR_SIZEOF(backward);
+}
 
 static void
 write_reg (int regn, grub_uint32_t val, void **target)
@@ -69,44 +76,70 @@ write_jump (int regn, void **target)
   *target = ((grub_uint32_t *) *target) + 1;
 }
 
-static void
-write_call_relocator_bw (void *ptr0, void *src, grub_uint32_t dest,
-			 grub_size_t size, struct grub_relocator32_state state)
+void
+grub_cpu_relocator_jumper (void *rels, grub_addr_t addr)
+{
+  write_reg (1, addr, &rels);
+  write_jump (1, &rels);
+}
+
+void
+grub_cpu_relocator_backward (void *ptr0, void *src, void *dest,
+			     grub_size_t size)
 {
   void *ptr = ptr0;
-  int i;
   write_reg (8, (grub_uint32_t) src, &ptr);
-  write_reg (9, dest, &ptr);
-  write_reg (10, size, &ptr);
-  grub_memcpy (ptr, &grub_relocator32_backward_start,
+  write_reg (9, (grub_uint32_t) dest, &ptr);
+  write_reg (10, (grub_uint32_t) size, &ptr);
+  grub_memcpy (ptr, &grub_relocator_backward_start,
 	       RELOCATOR_SRC_SIZEOF (backward));
-  ptr = (grub_uint8_t *) ptr + RELOCATOR_SRC_SIZEOF (backward);
-  for (i = 1; i < 32; i++)
-    write_reg (i, state.gpr[i], &ptr);
-  write_jump (state.jumpreg, &ptr);
-  grub_arch_sync_caches (ptr0, (grub_uint8_t *) ptr -  (grub_uint8_t *) ptr0);
-  grub_dprintf ("relocator", "Backward relocator: about to jump to %p\n", ptr0);
-  ((void (*) (void)) ptr0) ();
 }
 
-static void
-write_call_relocator_fw (void *ptr0, void *src, grub_uint32_t dest,
-			 grub_size_t size, struct grub_relocator32_state state)
+void
+grub_cpu_relocator_forward (void *ptr0, void *src, void *dest,
+			     grub_size_t size)
 {
   void *ptr = ptr0;
-  int i;
   write_reg (8, (grub_uint32_t) src, &ptr);
-  write_reg (9, dest, &ptr);
-  write_reg (10, size, &ptr);
-  grub_memcpy (ptr, &grub_relocator32_forward_start,
+  write_reg (9, (grub_uint32_t) dest, &ptr);
+  write_reg (10, (grub_uint32_t) size, &ptr);
+  grub_memcpy (ptr, &grub_relocator_forward_start, 
 	       RELOCATOR_SRC_SIZEOF (forward));
-  ptr = (grub_uint8_t *) ptr + RELOCATOR_SRC_SIZEOF (forward);
+}
+
+grub_err_t
+grub_relocator32_boot (struct grub_relocator *rel,
+		       struct grub_relocator32_state state)
+{
+  grub_addr_t target;
+  void *src, *ptr;
+  grub_err_t err;
+  grub_addr_t relst;
+  grub_size_t relsize;
+  grub_size_t stateset_size = 31 * REGW_SIZEOF + JUMP_SIZEOF;
+  unsigned i;
+
+  err = grub_relocator_alloc_chunk_align (rel, &src, &target, 0,
+					  (0xffffffff - stateset_size)
+					  + 1, stateset_size,
+					  sizeof (grub_uint32_t),
+					  GRUB_RELOCATOR_PREFERENCE_NONE);
+  if (err)
+    return err;
+
+  ptr = src;
   for (i = 1; i < 32; i++)
     write_reg (i, state.gpr[i], &ptr);
   write_jump (state.jumpreg, &ptr);
-  grub_arch_sync_caches (ptr0, (grub_uint8_t *) ptr -  (grub_uint8_t *) ptr0);
-  grub_dprintf ("relocator", "Forward relocator: about to jump to %p\n", ptr0);
-  ((void (*) (void)) ptr0) ();
-}
 
-#include "../relocator.c"
+  err = grub_relocator_prepare_relocs (rel, target, &relst, &relsize);
+  if (err)
+    return err;
+
+  grub_arch_sync_caches ((void *) relst, relsize);
+
+  ((void (*) (void)) relst) ();
+
+  /* Not reached.  */
+  return GRUB_ERR_NONE;
+}
diff --git a/lib/mips/relocator_asm.S b/lib/mips/relocator_asm.S
index ff4fa31e0..8ffab99b7 100644
--- a/lib/mips/relocator_asm.S
+++ b/lib/mips/relocator_asm.S
@@ -20,7 +20,7 @@
 	
 	.p2align	4	/* force 16-byte alignment */
 
-VARIABLE (grub_relocator32_forward_start)
+VARIABLE (grub_relocator_forward_start)
 	move $a0, $9
 	move $a1, $10
 
@@ -34,9 +34,9 @@ copycont1:
 
 #include "../../kern/mips/cache_flush.S"
 
-VARIABLE (grub_relocator32_forward_end)
+VARIABLE (grub_relocator_forward_end)
 
-VARIABLE (grub_relocator32_backward_start)
+VARIABLE (grub_relocator_backward_start)
 	move $a0, $9
 	move $a1, $10
 
@@ -55,4 +55,4 @@ copycont2:
 
 #include "../../kern/mips/cache_flush.S"
 
-VARIABLE (grub_relocator32_backward_end)
+VARIABLE (grub_relocator_backward_end)
diff --git a/lib/relocator.c b/lib/relocator.c
index 0644691cd..dad0ec70c 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -20,6 +20,7 @@
 #include <grub/relocator_private.h>
 #include <grub/mm_private.h>
 #include <grub/misc.h>
+#include <grub/cache.h>
 
 /* TODO: use more efficient data structures if necessary.  */
 /* FIXME: implement unload. */
@@ -605,7 +606,7 @@ grub_relocator_unload (struct grub_relocator *rel)
 
 grub_err_t
 grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
-			       grub_addr_t *relstart)
+			       grub_addr_t *relstart, grub_size_t *relsize)
 {
   grub_addr_t rels;
   grub_addr_t rels0;
@@ -622,6 +623,9 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
     return grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
   rels = rels0;
 
+  if (relsize)
+    *relsize = rel->relocators_size;
+
   grub_dprintf ("relocator", "Relocs allocated\n");
   
   {
@@ -698,6 +702,8 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
 				      sorted[j].size);
 	  rels += grub_relocator_forward_size;
 	}
+      if (sorted[j].src == sorted[j].target)
+	grub_arch_sync_caches ((void *) sorted[j].src, sorted[j].size);
     }
   grub_cpu_relocator_jumper ((void *) rels, addr);
   *relstart = rels0;
diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index 51060c4fb..09c7f1275 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -42,6 +42,7 @@ static int loaded;
 
 static grub_size_t linux_size;
 
+static struct grub_relocator *relocator;
 static grub_uint8_t *playground;
 static grub_addr_t target_addr, entry_addr;
 static int linux_argc;
@@ -60,15 +61,7 @@ grub_linux_boot (void)
   state.gpr[5] = target_addr + argv_off;
   state.gpr[6] = target_addr + envp_off;
   state.jumpreg = 1;
-  grub_relocator32_boot (playground, target_addr, state);
-
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_linux_release_mem (void)
-{
-  grub_relocator32_free (playground);
+  grub_relocator32_boot (relocator, state);
 
   return GRUB_ERR_NONE;
 }
@@ -76,14 +69,12 @@ grub_linux_release_mem (void)
 static grub_err_t
 grub_linux_unload (void)
 {
-  grub_err_t err;
-
-  err = grub_linux_release_mem ();
+  grub_relocator_unload (relocator);
   grub_dl_unref (my_mod);
 
   loaded = 0;
 
-  return err;
+  return GRUB_ERR_NONE;
 }
 
 static grub_err_t
@@ -91,6 +82,7 @@ grub_linux_load32 (grub_elf_t elf, void **extra_mem, grub_size_t extra_size)
 {
   Elf32_Addr base;
   int extraoff;
+  grub_err_t err;
 
   /* Linux's entry point incorrectly contains a virtual address.  */
   entry_addr = elf->ehdr.ehdr32.e_entry & ~ELF32_LOADMASK;
@@ -105,10 +97,15 @@ grub_linux_load32 (grub_elf_t elf, void **extra_mem, grub_size_t extra_size)
   extraoff = linux_size;
   linux_size += extra_size;
 
-  playground = grub_relocator32_alloc (linux_size);
-  if (!playground)
+  relocator = grub_relocator_new ();
+  if (!relocator)
     return grub_errno;
 
+  err = grub_relocator_alloc_chunk_addr (relocator, (void **) &playground,
+					 target_addr, linux_size);
+  if (err)
+    return err;
+
   *extra_mem = playground + extraoff;
 
   /* Now load the segments into the area we claimed.  */
@@ -135,6 +132,7 @@ grub_linux_load64 (grub_elf_t elf, void **extra_mem, grub_size_t extra_size)
 {
   Elf64_Addr base;
   int extraoff;
+  grub_err_t err;
 
   /* Linux's entry point incorrectly contains a virtual address.  */
   entry_addr = elf->ehdr.ehdr64.e_entry & ~ELF64_LOADMASK;
@@ -149,10 +147,15 @@ grub_linux_load64 (grub_elf_t elf, void **extra_mem, grub_size_t extra_size)
   extraoff = linux_size;
   linux_size += extra_size;
 
-  playground = grub_relocator32_alloc (linux_size);
-  if (!playground)
+  relocator = grub_relocator_new ();
+  if (!relocator)
     return grub_errno;
 
+  err = grub_relocator_alloc_chunk_addr (relocator, (void **) &playground,
+					 target_addr, linux_size);
+  if (err)
+    return err;
+
   *extra_mem = playground + extraoff;
 
   /* Now load the segments into the area we claimed.  */
@@ -322,7 +325,9 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
 {
   grub_file_t file = 0;
   grub_ssize_t size;
-  grub_size_t overhead;
+  void *initrd_src;
+  grub_addr_t initrd_dest;
+  grub_err_t err;
 
   if (argc == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "No initrd specified");
@@ -339,19 +344,20 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
 
   size = grub_file_size (file);
 
-  overhead = ALIGN_UP (target_addr + linux_size + 0x10000, 0x10000)
-    - (target_addr + linux_size);
+  err = grub_relocator_alloc_chunk_align (relocator, &initrd_src, 
+					  &initrd_dest,
+					  target_addr + linux_size + 0x10000,
+					  (0xffffffff - size) + 1,
+					  size, 0x10000,
+					  GRUB_RELOCATOR_PREFERENCE_NONE);
 
-  playground = grub_relocator32_realloc (playground,
-					 linux_size + overhead + size);
-
-  if (!playground)
+  if (err)
     {
       grub_file_close (file);
-      return grub_errno;
+      return err;
     }
 
-  if (grub_file_read (file, playground + linux_size + overhead, size) != size)
+  if (grub_file_read (file, initrd_src, size) != size)
     {
       grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file");
       grub_file_close (file);
@@ -361,7 +367,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
 
   grub_snprintf ((char *) playground + rd_addr_arg_off,
 		 sizeof ("rd_start=0xXXXXXXXXXXXXXXXX"), "rd_start=0x%llx",
-		(unsigned long long) target_addr + linux_size  + overhead);
+		(unsigned long long) initrd_dest);
   ((grub_uint32_t *) (playground + argv_off))[linux_argc]
     = target_addr + rd_addr_arg_off;
   linux_argc++;

From ddf23b9d81ea8cb0c2c06542caf7efb2d8f6e818 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 23 Jan 2010 14:30:06 +0100
Subject: [PATCH 0385/1628] relocator unloading support

---
 lib/relocator.c | 128 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 86 insertions(+), 42 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index dad0ec70c..298c13d06 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -23,7 +23,6 @@
 #include <grub/cache.h>
 
 /* TODO: use more efficient data structures if necessary.  */
-/* FIXME: implement unload. */
 /* FIXME: check memory map.  */ 
 /* FIXME: try to request memory from firmware.  */
 
@@ -42,6 +41,8 @@ struct grub_relocator_chunk
   grub_addr_t src;
   grub_addr_t target;
   grub_size_t size;
+  enum {CHUNK_TYPE_IN_REGION, CHUNK_TYPE_REGION_START} type;
+  grub_addr_t host_start;
 };
 
 struct grub_relocator *
@@ -204,8 +205,8 @@ get_best_header (struct grub_relocator *rel,
 static int
 malloc_in_range (struct grub_relocator *rel,
 		 grub_addr_t start, grub_addr_t end, grub_addr_t align,
-		 grub_size_t size, grub_addr_t *res, int from_low_priv,
-		 int collisioncheck)
+		 grub_size_t size, struct grub_relocator_chunk *res,
+		 int from_low_priv, int collisioncheck)
 {
   grub_mm_region_t rb, rbp;
   grub_mm_header_t hb = NULL, hbp = NULL;
@@ -262,6 +263,11 @@ malloc_in_range (struct grub_relocator *rel,
       grub_addr_t newreg_start, newreg_raw_start = best_addr + size;
       grub_addr_t newreg_size, newreg_presize;
       grub_mm_header_t new_header;
+
+      res->src = best_addr;
+      res->type = CHUNK_TYPE_REGION_START;
+      res->host_start = (grub_addr_t) rb - rb->pre_size;
+
       newreg_start = ALIGN_UP (newreg_raw_start, GRUB_MM_ALIGN);
       newreg_presize = newreg_start - newreg_raw_start;
       newreg_size = rb->size - (newreg_start - (grub_addr_t) rb);
@@ -313,11 +319,13 @@ malloc_in_range (struct grub_relocator *rel,
 	  while (h != newreg->first);
 	}
       }
-      *res = best_addr;
       return 1;
     }
   {
     struct grub_mm_header *foll = NULL;
+
+    res->src = best_addr;
+    res->type = CHUNK_TYPE_IN_REGION;
     
     if (ALIGN_UP (best_addr + size, GRUB_MM_ALIGN) + GRUB_MM_ALIGN
 	<= (grub_addr_t) (hb + hb->size))
@@ -351,7 +359,6 @@ malloc_in_range (struct grub_relocator *rel,
 	if (rb->first == hb)
 	  rb->first = (void *) (rb + 1);
       }
-    *res = best_addr;
     return 1;
   }
 }
@@ -384,7 +391,6 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
 				 grub_addr_t target, grub_size_t size)
 {
   struct grub_relocator_chunk *chunk;
-  grub_addr_t start;
   grub_addr_t min_addr = 0, max_addr;
 
   if (target > ~size)
@@ -413,24 +419,24 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
 #if defined (__i386__) || defined (__x86_64__)
       if (target < 0x100000)
 	if (malloc_in_range (rel, rel->highestnonpostaddr, ~(grub_addr_t)0, 1,
-			     size, &start, 0, 1))
+			     size, chunk, 0, 1))
 	  {
-	    if (rel->postchunks > start)
-	      rel->postchunks = start;
+	    if (rel->postchunks > chunk->src)
+	      rel->postchunks = chunk->src;
 	    break;
 	  }
 #endif
-      if (malloc_in_range (rel, target, max_addr, 1, size, &start, 1, 0))
+      if (malloc_in_range (rel, target, max_addr, 1, size, chunk, 1, 0))
 	break;
 
-      if (malloc_in_range (rel, min_addr, target, 1, size, &start, 0, 0))
+      if (malloc_in_range (rel, min_addr, target, 1, size, chunk, 0, 0))
 	break;
 
       if (malloc_in_range (rel, rel->highestnonpostaddr, ~(grub_addr_t)0, 1,
-			   size, &start, 0, 1))
+			   size, chunk, 0, 1))
 	{
-	  if (rel->postchunks > start)
-	    rel->postchunks = start;
+	  if (rel->postchunks > chunk->src)
+	    rel->postchunks = chunk->src;
 	  break;
 	}
 
@@ -441,35 +447,34 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
   while (0);
 
   grub_dprintf ("relocator", "allocated 0x%llx/0x%llx\n",
-		(unsigned long long) start, (unsigned long long) target);
+		(unsigned long long) chunk->src, (unsigned long long) target);
 
   if (rel->highestaddr < target + size)
     rel->highestaddr = target + size;
 
-  if (rel->highestaddr < start + size)
-    rel->highestaddr = start + size;
+  if (rel->highestaddr < chunk->src + size)
+    rel->highestaddr = chunk->src + size;
 
-  if (start < rel->postchunks)
+  if (chunk->src < rel->postchunks)
     {
       if (rel->highestnonpostaddr < target + size)
 	rel->highestnonpostaddr = target + size;
       
-      if (rel->highestnonpostaddr < start + size)
-	rel->highestnonpostaddr = start + size;  
+      if (rel->highestnonpostaddr < chunk->src + size)
+	rel->highestnonpostaddr = chunk->src + size;  
     }
 
   grub_dprintf ("relocator", "relocators_size=%ld\n",
 		(unsigned long) rel->relocators_size);
 
-  if (start < target)
+  if (chunk->src < target)
     rel->relocators_size += grub_relocator_backward_size;
-  if (start > target)
+  if (chunk->src > target)
     rel->relocators_size += grub_relocator_forward_size;
 
   grub_dprintf ("relocator", "relocators_size=%ld\n",
 		(unsigned long) rel->relocators_size);
 
-  chunk->src = start;
   chunk->target = target;
   chunk->size = size;
   chunk->next = rel->chunks;
@@ -477,7 +482,7 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
   grub_dprintf ("relocator", "cur = %p, next = %p\n", rel->chunks,
 		rel->chunks->next);
 
-  *src = (void *) start;
+  *src = (void *) chunk->src;
   return GRUB_ERR_NONE;
 }
 
@@ -490,7 +495,6 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
 {
   grub_addr_t min_addr2 = 0, max_addr2;
   struct grub_relocator_chunk *chunk;
-  grub_addr_t start;
 
   if (max_addr > ~size)
     max_addr = ~size;
@@ -507,19 +511,19 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
     return grub_errno;
 
   if (malloc_in_range (rel, min_addr, max_addr, align,
-		       size, &start,
+		       size, chunk,
 		       preference != GRUB_RELOCATOR_PREFERENCE_HIGH, 1))
     {
       grub_dprintf ("relocator", "allocated 0x%llx/0x%llx\n",
-		    (unsigned long long) start, (unsigned long long) start);
+		    (unsigned long long) chunk->src,
+		    (unsigned long long) chunk->src);
       grub_dprintf ("relocator", "chunks = %p\n", rel->chunks);
-      chunk->src = start;
-      chunk->target = start;
+      chunk->target = chunk->src;
       chunk->size = size;
       chunk->next = rel->chunks;
       rel->chunks = chunk;
-      *src = (void *) start;
-      *target = start;
+      *src = (void *) chunk->src;
+      *target = chunk->target;
       return GRUB_ERR_NONE;
     }
 
@@ -531,14 +535,14 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
   do
     {
       if (malloc_in_range (rel, min_addr2, max_addr2, align,
-			   size, &start, 1, 1))
+			   size, chunk, 1, 1))
 	break;
 
       if (malloc_in_range (rel, rel->highestnonpostaddr, ~(grub_addr_t)0, 1,
-			   size, &start, 0, 1))
+			   size, chunk, 0, 1))
 	{
-	  if (rel->postchunks > start)
-	    rel->postchunks = start;
+	  if (rel->postchunks > chunk->src)
+	    rel->postchunks = chunk->src;
 	  break;
 	}
 
@@ -574,18 +578,17 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
 	break;
     }
 
-  if (start < chunk->target)
+  if (chunk->src < chunk->target)
     rel->relocators_size += grub_relocator_backward_size;
-  if (start > chunk->target)
+  if (chunk->src > chunk->target)
     rel->relocators_size += grub_relocator_forward_size;
 
-  chunk->src = start;
   chunk->size = size;
   chunk->next = rel->chunks;
   rel->chunks = chunk;
   grub_dprintf ("relocator", "cur = %p, next = %p\n", rel->chunks,
 		rel->chunks->next);
-  *src = (void *) start;
+  *src = (void *) chunk->src;
   *target = chunk->target;
   return GRUB_ERR_NONE;
 }
@@ -598,7 +601,47 @@ grub_relocator_unload (struct grub_relocator *rel)
     return;
   for (chunk = rel->chunks; chunk; chunk = next)
     {
-      grub_fatal ("Relocator unloading isn't implemented yet");
+      switch (chunk->type)
+	{
+	case CHUNK_TYPE_REGION_START:
+	  {
+	    grub_mm_region_t r1, r2, *rp;
+	    grub_mm_header_t h;
+	    grub_size_t pre_size;
+	    r1 = (grub_mm_region_t) ALIGN_UP (chunk->src + chunk->size,
+					      GRUB_MM_ALIGN);
+	    r2 = (grub_mm_region_t) ALIGN_UP (chunk->host_start, GRUB_MM_ALIGN);
+	    for (rp = &grub_mm_base; *rp && *rp != r2; rp = &((*rp)->next));
+	    if (!*rp)
+	      grub_fatal ("Anomaly in region alocations detected. "
+			  "Simultaneous relocators?");
+	    pre_size = ALIGN_UP (chunk->host_start, GRUB_MM_ALIGN)
+	      - chunk->host_start;
+	    r2->first = r1->first;
+	    r2->next = r1->next;
+	    r2->pre_size = pre_size;
+	    r2->size = r1->size + (r2 - r1) * sizeof (*r2);
+	    *rp = r1;
+	    h = (grub_mm_header_t) (r1 + 1);
+	    h->next = h;
+	    h->magic = GRUB_MM_ALLOC_MAGIC;
+	    h->size = (r2 - r1);
+	    grub_free (h + 1);
+	    break;
+	  }
+	case CHUNK_TYPE_IN_REGION:
+	  {
+	    grub_mm_header_t h = (grub_mm_header_t) ALIGN_DOWN (chunk->src,
+								GRUB_MM_ALIGN);
+	    h->size = (chunk->src / GRUB_MM_ALIGN)
+	      - ((chunk->src + chunk->size + GRUB_MM_ALIGN - 1) 
+		 / GRUB_MM_ALIGN);
+	    h->next = h;
+	    h->magic = GRUB_MM_ALLOC_MAGIC;
+	    grub_free (h + 1);
+	    break;
+	  }
+	}
       next = chunk->next;
       grub_free (chunk);
     }
@@ -613,15 +656,16 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
   struct grub_relocator_chunk *sorted;
   grub_size_t nchunks = 0;
   unsigned j;
+  struct grub_relocator_chunk movers_chunk;
 
   grub_dprintf ("relocator", "Preparing relocs (size=%ld)\n",
 		(unsigned long) rel->relocators_size);
 
   if (!malloc_in_range (rel, 0, ~(grub_addr_t)0 - rel->relocators_size + 1,
 			grub_relocator_align,
-			rel->relocators_size, &rels0, 1, 1))
+			rel->relocators_size, &movers_chunk, 1, 1))
     return grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
-  rels = rels0;
+  rels = rels0 = movers_chunk.src;
 
   if (relsize)
     *relsize = rel->relocators_size;

From f4c499f86f3ea8e3e3cedbc70ca53e15c480725d Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 23 Jan 2010 19:46:28 +0530
Subject: [PATCH 0386/1628] replaced magic numbers with macros

---
 script/execute.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/script/execute.c b/script/execute.c
index c956960da..d42918f50 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -35,6 +35,9 @@ grub_script_execute_cmd (struct grub_script_cmd *cmd)
   return cmd->exec (cmd);
 }
 
+#define ARG_ALLOCATION_UNIT  (32 * sizeof (char))
+#define ARGV_ALLOCATION_UNIT (8 * sizeof (void*))
+
 /* Expand arguments in ARGLIST into multiple arguments.  */
 char **
 grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *count)
@@ -56,7 +59,7 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *c
     if (oom)
       return;
 
-    p = grub_realloc (argv, ALIGN_UP (sizeof(char*) * (argc + 1), 32));
+    p = grub_realloc (argv, ALIGN_UP (sizeof(char*) * (argc + 1), ARGV_ALLOCATION_UNIT));
     if (!p)
       oom = 1;
     else
@@ -78,7 +81,7 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *c
 
     len = nchar ?: grub_strlen (str);
     old = argv[argc - 1] ? grub_strlen (argv[argc - 1]) : 0;
-    p = grub_realloc (argv[argc - 1], ALIGN_UP(old + len + 1, 32));
+    p = grub_realloc (argv[argc - 1], ALIGN_UP(old + len + 1, ARG_ALLOCATION_UNIT));
 
     if (p)
       {

From fc9e58104a1a99e0bc2956a77b365820d035fb39 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 23 Jan 2010 22:38:10 +0530
Subject: [PATCH 0387/1628] fix underquoted AC_DEFUN parameters

---
 ChangeLog    |  4 ++++
 acinclude.m4 | 32 ++++++++++++++++----------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d700466fa..9bb6b1c01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-23  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* acinclude.m4: Quote underquoted AC_DEFUN parameters.
+
 2010-01-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* term/ieee1275/ofconsole.c (grub_ofconsole_setcolorstate): Allocate on
diff --git a/acinclude.m4 b/acinclude.m4
index 36a3b3e08..692404e20 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -14,7 +14,7 @@ $2
 
 
 dnl Check whether target compiler is working
-AC_DEFUN(grub_PROG_TARGET_CC,
+AC_DEFUN([grub_PROG_TARGET_CC],
 [AC_MSG_CHECKING([whether target compiler is working])
 AC_CACHE_VAL(grub_cv_prog_target_cc,
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@@ -36,7 +36,7 @@ dnl grub_ASM_USCORE checks if C symbols get an underscore after
 dnl compiling to assembler.
 dnl Written by Pavel Roskin. Based on grub_ASM_EXT_C written by
 dnl Erich Boleyn and modified by Yoshinori K. Okuji.
-AC_DEFUN(grub_ASM_USCORE,
+AC_DEFUN([grub_ASM_USCORE],
 [AC_REQUIRE([AC_PROG_CC])
 AC_MSG_CHECKING([if C symbols get an underscore after compilation])
 AC_CACHE_VAL(grub_cv_asm_uscore,
@@ -75,7 +75,7 @@ AC_MSG_RESULT([$grub_cv_asm_uscore])
 
 dnl Some versions of `objcopy -O binary' vary their output depending
 dnl on the link address.
-AC_DEFUN(grub_PROG_OBJCOPY_ABSOLUTE,
+AC_DEFUN([grub_PROG_OBJCOPY_ABSOLUTE],
 [AC_MSG_CHECKING([whether ${OBJCOPY} works for absolute addresses])
 AC_CACHE_VAL(grub_cv_prog_objcopy_absolute,
 [cat > conftest.c <<\EOF
@@ -119,7 +119,7 @@ fi
 
 dnl Supply --build-id=none to ld if building modules.
 dnl This suppresses warnings from ld on some systems
-AC_DEFUN(grub_PROG_LD_BUILD_ID_NONE,
+AC_DEFUN([grub_PROG_LD_BUILD_ID_NONE],
 [AC_MSG_CHECKING([whether linker accepts --build-id=none])
 AC_CACHE_VAL(grub_cv_prog_ld_build_id_none,
 [save_LDFLAGS="$LDFLAGS"
@@ -150,7 +150,7 @@ 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_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])
@@ -178,7 +178,7 @@ 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_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,
@@ -193,7 +193,7 @@ 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_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,
@@ -210,7 +210,7 @@ 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_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])
@@ -246,7 +246,7 @@ AC_MSG_RESULT([$grub_cv_i386_asm_prefix_requirement])])
 
 dnl Older versions of GAS require that absolute indirect calls/jumps are
 dnl not prefixed with `*', while later versions warn if not prefixed.
-AC_DEFUN(grub_I386_ASM_ABSOLUTE_WITHOUT_ASTERISK,
+AC_DEFUN([grub_I386_ASM_ABSOLUTE_WITHOUT_ASTERISK],
 [AC_REQUIRE([AC_PROG_CC])
 AC_MSG_CHECKING(dnl
 [whether an absolute indirect call/jump must not be prefixed with an asterisk])
@@ -276,7 +276,7 @@ AC_MSG_RESULT([$grub_cv_i386_asm_absolute_without_asterisk])])
 
 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_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,
@@ -320,7 +320,7 @@ fi
 
 dnl Check what symbol is defined as an end symbol.
 dnl Written by Yoshinori K. Okuji.
-AC_DEFUN(grub_CHECK_END_SYMBOL,
+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,
@@ -352,7 +352,7 @@ fi
 ])
 
 dnl Check if the C compiler generates calls to `__enable_execute_stack()'.
-AC_DEFUN(grub_CHECK_ENABLE_EXECUTE_STACK,[
+AC_DEFUN([grub_CHECK_ENABLE_EXECUTE_STACK],[
 AC_MSG_CHECKING([whether `$CC' generates calls to `__enable_execute_stack()'])
 AC_LANG_CONFTEST([[
 void f (int (*p) (void));
@@ -379,7 +379,7 @@ rm -f conftest*
 
 
 dnl Check if the C compiler supports `-fstack-protector'.
-AC_DEFUN(grub_CHECK_STACK_PROTECTOR,[
+AC_DEFUN([grub_CHECK_STACK_PROTECTOR],[
 [# Smashing stack protector.
 ssp_possible=yes]
 AC_MSG_CHECKING([whether `$CC' accepts `-fstack-protector'])
@@ -398,7 +398,7 @@ else
 ])
 
 dnl Check if the C compiler supports `-mstack-arg-probe' (Cygwin).
-AC_DEFUN(grub_CHECK_STACK_ARG_PROBE,[
+AC_DEFUN([grub_CHECK_STACK_ARG_PROBE],[
 [# Smashing stack arg probe.
 sap_possible=yes]
 AC_MSG_CHECKING([whether `$CC' accepts `-mstack-arg-probe'])
@@ -414,7 +414,7 @@ else
 ])
 
 dnl Check if ln can handle directories properly (mingw).
-AC_DEFUN(grub_CHECK_LINK_DIR,[
+AC_DEFUN([grub_CHECK_LINK_DIR],[
 AC_MSG_CHECKING([whether ln can handle directories properly])
 [mkdir testdir 2>/dev/null
 case $srcdir in
@@ -432,7 +432,7 @@ rm -rf testdir]
 ])
 
 dnl Check if the C compiler supports `-fPIE'.
-AC_DEFUN(grub_CHECK_PIE,[
+AC_DEFUN([grub_CHECK_PIE],[
 [# Position independent executable.
 pie_possible=yes]
 AC_MSG_CHECKING([whether `$CC' has `-fPIE' as default])

From 69be5b74be62f112d9e4afc10c1ede8c42cb502c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 23 Jan 2010 22:56:08 +0100
Subject: [PATCH 0388/1628] 2010-01-23  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* configure.ac: Check for libgcc symbols with -nostdlib.
---
 ChangeLog    |  4 ++++
 configure.ac | 17 ++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9bb6b1c01..cec7af8a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Check for libgcc symbols with -nostdlib.
+
 2010-01-23  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* acinclude.m4: Quote underquoted AC_DEFUN parameters.
diff --git a/configure.ac b/configure.ac
index f621b5648..012aef96e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -438,18 +438,25 @@ AC_SUBST(TARGET_ASFLAGS)
 AC_SUBST(TARGET_CPPFLAGS)
 AC_SUBST(TARGET_LDFLAGS)
 
-# Check for libgcc symbols (must be performed before we add -nostdlib to LDFLAGS)
-AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __trampoline_setup __ucmpdi2 _restgpr_14_x)
-
 # Set them to their new values for the tests below.
 CC="$TARGET_CC"
+if test "x$TARGET_APPLE_CC" = x1 ; then
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wno-error"
+else
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100 -Wl,--defsym,abort=main -Wno-error"
+fi
+CPPFLAGS="$TARGET_CPPFLAGS"
+LDFLAGS="$TARGET_LDFLAGS"
+LIBS=-lgcc
+
+# Check for libgcc symbols
+AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __trampoline_setup __ucmpdi2 _restgpr_14_x)
+
 if test "x$TARGET_APPLE_CC" = x1 ; then
 CFLAGS="$TARGET_CFLAGS -nostdlib"
 else
 CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100"
 fi
-CPPFLAGS="$TARGET_CPPFLAGS"
-LDFLAGS="$TARGET_LDFLAGS"
 
 # Defined in aclocal.m4.
 grub_PROG_TARGET_CC

From c273d4cea97158122d3eb9baad6497efac8e9126 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 24 Jan 2010 14:30:10 +0100
Subject: [PATCH 0389/1628] 2010-01-24  Samuel Thibault 
 <samuel.thibault@ens-lyon.org>

	* util/grub.d/10_hurd.in: Add a recovery mode.
---
 ChangeLog              |  4 ++++
 util/grub.d/10_hurd.in | 22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index cec7af8a5..ee582693f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-24  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* util/grub.d/10_hurd.in: Add a recovery mode.
+
 2010-01-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Check for libgcc symbols with -nostdlib.
diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index 65a9a70b1..8c9060932 100644
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -89,3 +89,25 @@ cat << EOF
 	module		/lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)'
 }
 EOF
+
+cat << EOF
+menuentry "${OS} (recovery mode)" {
+EOF
+prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
+cat << EOF
+	echo		$(gettext "Loading GNU Mach ...")
+	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/} -s
+EOF
+save_default_entry | sed -e "s/^/\t/"
+prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
+cat << EOF
+	echo		$(gettext "Loading the Hurd ...")
+	module		/hurd/${hurd_fs}.static ${hurd_fs} \\
+			--multiboot-command-line='\${kernel-command-line}' \\
+			--host-priv-port='\${host-port}' \\
+			--device-master-port='\${device-port}' \\
+			--exec-server-task='\${exec-task}' -T typed '\${root}' \\
+			'\$(task-create)' '\$(task-resume)'
+	module		/lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)'
+}
+EOF

From 67951a534f282c5463cb0274f4ec14d38a91eff7 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sun, 24 Jan 2010 21:04:29 +0000
Subject: [PATCH 0390/1628] 2010-01-24  Robert Millan  <rmh.grub@aybabtu.com>

	* loader/mips/linux.c (grub_cmd_linux, grub_cmd_initrd): Don't
	capitalize error strings.
---
 ChangeLog           |  5 +++++
 loader/mips/linux.c | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ee582693f..7367d9679 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-24  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* loader/mips/linux.c (grub_cmd_linux, grub_cmd_initrd): Don't
+	capitalize error strings.
+
 2010-01-24  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* util/grub.d/10_hurd.in: Add a recovery mode.
diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index 51060c4fb..64497f466 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -196,7 +196,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
     {
       grub_elf_close (elf);
       return grub_error (GRUB_ERR_UNKNOWN_OS,
-			 "This ELF file is not of the right type\n");
+			 "this ELF file is not of the right type\n");
     }
 
   /* Release the previously used memory.  */
@@ -236,7 +236,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   if (grub_elf_is_elf64 (elf))
     err = grub_linux_load64 (elf, &extra, size);
   else
-    err = grub_error (GRUB_ERR_BAD_FILE_TYPE, "Unknown ELF class");
+    err = grub_error (GRUB_ERR_BAD_FILE_TYPE, "unknown ELF class");
 
   grub_elf_close (elf);
 
@@ -325,13 +325,13 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   grub_size_t overhead;
 
   if (argc == 0)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "No initrd specified");
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no initrd specified");
 
   if (!loaded)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "You need to load Linux first.");
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "you need to load Linux first.");
 
   if (initrd_loaded)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "Only one initrd can be loaded.");
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "only one initrd can be loaded.");
 
   file = grub_file_open (argv[0]);
   if (! file)
@@ -353,7 +353,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
 
   if (grub_file_read (file, playground + linux_size + overhead, size) != size)
     {
-      grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file");
+      grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file");
       grub_file_close (file);
 
       return grub_errno;

From ea4a7e35ebb262325dc194832530ae9bc4f30184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Mon, 25 Jan 2010 10:06:55 +0100
Subject: [PATCH 0391/1628] =?UTF-8?q?2010-01-25=20=20Gr=C3=A9goire=20Sutre?=
 =?UTF-8?q?=20=20<gregoire.sutre@gmail.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* configure.ac: Check for `limits.h'.
	* util/misc.c: Include `<limits.h>' (for PATH_MAX).
---
 ChangeLog    | 5 +++++
 configure.ac | 2 +-
 util/misc.c  | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7367d9679..ab11ad50f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-25  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* configure.ac: Check for `limits.h'.
+	* util/misc.c: Include `<limits.h>' (for PATH_MAX).
+
 2010-01-24  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* loader/mips/linux.c (grub_cmd_linux, grub_cmd_initrd): Don't
diff --git a/configure.ac b/configure.ac
index 012aef96e..be498be8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,7 +221,7 @@ AC_HEADER_MAJOR
 AC_HEADER_DIRENT
 AC_CHECK_FUNCS(memmove sbrk strdup lstat getuid getgid)
 AC_CHECK_HEADERS(sys/mkdev.h sys/sysmacros.h malloc.h termios.h sys/types.h)
-AC_CHECK_HEADERS(unistd.h string.h strings.h sys/stat.h sys/fcntl.h)
+AC_CHECK_HEADERS(unistd.h string.h strings.h sys/stat.h sys/fcntl.h limits.h)
 
 #
 # Check for target programs.
diff --git a/util/misc.c b/util/misc.c
index 8f66e4350..371e7cc14 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -30,6 +30,9 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include <time.h>
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
 
 #include <grub/kernel.h>
 #include <grub/misc.h>

From 37effddaf3687c8099669b38d9d2fbaa79076bac Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 25 Jan 2010 22:01:14 +0530
Subject: [PATCH 0392/1628] make parenthesis as valid word characters

---
 ChangeLog.lexer-rewrite | 5 +++++
 script/parser.y         | 2 --
 script/yylex.l          | 4 +---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.lexer-rewrite b/ChangeLog.lexer-rewrite
index 56c637976..9b2ab9e2f 100644
--- a/ChangeLog.lexer-rewrite
+++ b/ChangeLog.lexer-rewrite
@@ -1,3 +1,8 @@
+2010-01-25  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* script/yylex.l: Accept parenthesis as part of word.
+	* script/parser.y: Remove GRUB_PARSER_TOKEN_{LPAR,RPAR} tokens.
+
 2010-01-10  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* conf/any-emu.rmk: Build rule updates.
diff --git a/script/parser.y b/script/parser.y
index b8d981866..baf1fd9b5 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -45,8 +45,6 @@
 %token GRUB_PARSER_TOKEN_PIPE    "|"
 %token GRUB_PARSER_TOKEN_AMP     "&"
 %token GRUB_PARSER_TOKEN_SEMI    ";"
-%token GRUB_PARSER_TOKEN_LPAR    "("
-%token GRUB_PARSER_TOKEN_RPAR    ")"
 %token GRUB_PARSER_TOKEN_LBR     "{"
 %token GRUB_PARSER_TOKEN_RBR     "}"
 %token GRUB_PARSER_TOKEN_NOT     "!"
diff --git a/script/yylex.l b/script/yylex.l
index 7cef8496b..db276ef61 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -128,7 +128,7 @@ typedef grub_size_t yy_size_t;
 BLANK           [ \t]
 COMMENT         ^[ \t]*#.*$
 
-CHAR            [^|&$;()<> \t\n\'\"\\]
+CHAR            [^|&$;<> \t\n\'\"\\]
 DIGITS          [[:digit:]]+
 NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
 
@@ -157,8 +157,6 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
 "|"             { RECORD; return GRUB_PARSER_TOKEN_PIPE;    }
 "&"             { RECORD; return GRUB_PARSER_TOKEN_AMP;     }
 ";"             { RECORD; return GRUB_PARSER_TOKEN_SEMI;    }
-"("             { RECORD; return GRUB_PARSER_TOKEN_LPAR;    }
-")"             { RECORD; return GRUB_PARSER_TOKEN_RPAR;    }
 "<"             { RECORD; return GRUB_PARSER_TOKEN_LT;      }
 ">"             { RECORD; return GRUB_PARSER_TOKEN_GT;      }
 

From 847effd8bf38e04839db3b673f7827f4bd781de0 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 25 Jan 2010 17:04:22 +0000
Subject: [PATCH 0393/1628] 2010-01-25  Colin Watson  <cjwatson@ubuntu.com>

	* util/hostdisk.c (open_device): Add trailing newline to debug
	message.
---
 ChangeLog       | 5 +++++
 util/hostdisk.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ab11ad50f..12b7ccb31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-25  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/hostdisk.c (open_device): Add trailing newline to debug
+	message.
+
 2010-01-25  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* configure.ac: Check for `limits.h'.
diff --git a/util/hostdisk.c b/util/hostdisk.c
index 603445801..a594f75ec 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -340,7 +340,7 @@ open_device (const grub_disk_t disk, grub_disk_addr_t sector, int flags)
       is_partition = linux_find_partition (dev, disk->partition->start);
 
     /* Open the partition.  */
-    grub_dprintf ("hostdisk", "opening the device `%s' in open_device()", dev);
+    grub_dprintf ("hostdisk", "opening the device `%s' in open_device()\n", dev);
     fd = open (dev, flags);
     if (fd < 0)
       {

From 7181e2281f559317133fa9e3c5924451872061fd Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 25 Jan 2010 17:47:51 +0000
Subject: [PATCH 0394/1628] 2010-01-25  Colin Watson  <cjwatson@ubuntu.com>

	* configure.ac: Check for Linux device-mapper support.
	* util/hostdisk.c (device_is_mapped): New function.
	(find_partition_start): New function, partly broken out from
	linux_find_partition and grub_util_biosdisk_get_grub_dev but with
	device-mapper support added.
	(linux_find_partition): Use find_partition_start.
	(convert_system_partition_to_system_disk): Add `st' argument.
	Support Linux /dev/mapper/* devices if device-mapper support is
	available; only DM-RAID devices are understood at present.
	(find_system_device): Add `st' argument.  Pass it to
	convert_system_partition_to_system_disk.
	(grub_util_biosdisk_get_grub_dev): Pass stat result to
	find_system_device and convert_system_partition_to_system_disk.  Use
	find_partition_start.
---
 ChangeLog.dmraid-probe |  16 +++
 configure.ac           |  17 +++
 util/hostdisk.c        | 243 +++++++++++++++++++++++++++++++++++------
 3 files changed, 242 insertions(+), 34 deletions(-)
 create mode 100644 ChangeLog.dmraid-probe

diff --git a/ChangeLog.dmraid-probe b/ChangeLog.dmraid-probe
new file mode 100644
index 000000000..8b8f25533
--- /dev/null
+++ b/ChangeLog.dmraid-probe
@@ -0,0 +1,16 @@
+2010-01-25  Colin Watson  <cjwatson@ubuntu.com>
+
+	* configure.ac: Check for Linux device-mapper support.
+	* util/hostdisk.c (device_is_mapped): New function.
+	(find_partition_start): New function, partly broken out from
+	linux_find_partition and grub_util_biosdisk_get_grub_dev but with
+	device-mapper support added.
+	(linux_find_partition): Use find_partition_start.
+	(convert_system_partition_to_system_disk): Add `st' argument.
+	Support Linux /dev/mapper/* devices if device-mapper support is
+	available; only DM-RAID devices are understood at present.
+	(find_system_device): Add `st' argument.  Pass it to
+	convert_system_partition_to_system_disk.
+	(grub_util_biosdisk_get_grub_dev): Pass stat result to
+	find_system_device and convert_system_partition_to_system_disk.  Use
+	find_partition_start.
diff --git a/configure.ac b/configure.ac
index be498be8b..4f1a6dffe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -659,6 +659,23 @@ AC_SUBST([enable_grub_mkfont])
 AC_SUBST([freetype_cflags])
 AC_SUBST([freetype_libs])
 
+AC_ARG_ENABLE([device-mapper],
+              [AS_HELP_STRING([--enable-device-mapper],
+                              [enable Linux device-mapper support (default=guessed)])])
+if test x"$enable_device_mapper" = xno ; then
+  device_mapper_excuse="explicitly disabled"
+fi
+
+if test x"$device_mapper_excuse" = x ; then
+  # Check for device-mapper library.
+  AC_CHECK_LIB([devmapper], [dm_task_create],
+               [LDFLAGS="$LDFLAGS -ldevmapper"
+                AC_DEFINE([HAVE_DEVICE_MAPPER], [1],
+                          [Define to 1 if you have the devmapper library.])],
+               [device_mapper_excuse="need devmapper library"])
+  AC_SUBST([LIBDEVMAPPER])
+fi
+
 AC_SUBST(ASFLAGS)
 
 # Output files.
diff --git a/util/hostdisk.c b/util/hostdisk.c
index a594f75ec..309e112bf 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -97,6 +97,10 @@ struct hd_geometry
 # include <sys/disk.h>
 #endif
 
+#ifdef HAVE_DEVICE_MAPPER
+# include <libdevmapper.h>
+#endif
+
 struct
 {
   char *drive;
@@ -253,6 +257,115 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
   return GRUB_ERR_NONE;
 }
 
+#ifdef HAVE_DEVICE_MAPPER
+static int
+device_is_mapped (const char *dev)
+{
+  struct stat st;
+
+  if (stat (dev, &st) < 0)
+    return 0;
+
+  return dm_is_dm_major (major (st.st_rdev));
+}
+#endif /* HAVE_DEVICE_MAPPER */
+
+#if defined(__linux__) || defined(__CYGWIN__)
+static grub_disk_addr_t
+find_partition_start (const char *dev)
+{
+  int fd;
+  struct hd_geometry hdg;
+
+#ifdef HAVE_DEVICE_MAPPER
+  if (device_is_mapped (dev)) {
+    struct dm_task *task = NULL;
+    grub_uint64_t start, length;
+    char *target_type, *params, *space;
+    grub_disk_addr_t partition_start;
+
+    /* If any device-mapper operation fails, we fall back silently to
+       HDIO_GETGEO.  */
+    task = dm_task_create (DM_DEVICE_TABLE);
+    if (! task)
+      {
+	grub_dprintf ("hostdisk", "dm_task_create failed\n");
+	goto devmapper_fail;
+      }
+
+    if (! dm_task_set_name (task, dev))
+      {
+	grub_dprintf ("hostdisk", "dm_task_set_name failed\n");
+	goto devmapper_fail;
+      }
+
+    if (! dm_task_run (task))
+      {
+	grub_dprintf ("hostdisk", "dm_task_run failed\n");
+	goto devmapper_fail;
+      }
+
+    dm_get_next_target (task, NULL, &start, &length, &target_type, &params);
+    if (! target_type)
+      {
+	grub_dprintf ("hostdisk", "no dm target\n");
+	goto devmapper_fail;
+      }
+    if (strcmp (target_type, "linear") != 0)
+      {
+	grub_dprintf ("hostdisk", "ignoring dm target %s (not linear)\n",
+		      target_type);
+	goto devmapper_fail;
+      }
+    if (! params)
+      {
+	grub_dprintf ("hostdisk", "no dm params\n");
+	goto devmapper_fail;
+      }
+
+    /* The params string for a linear target looks like this:
+         DEVICE-NAME START-SECTOR
+       Parse this out.  */
+    space = strchr (params, ' ');
+    if (! space)
+      goto devmapper_fail;
+    errno = 0;
+    partition_start = strtoull (space + 1, NULL, 10);
+    if (errno == 0)
+      {
+	grub_dprintf ("hostdisk", "dm %s starts at %llu\n",
+		      dev, partition_start);
+	dm_task_destroy (task);
+	return partition_start;
+      }
+
+devmapper_fail:
+    if (task)
+      dm_task_destroy (task);
+  }
+#endif /* HAVE_DEVICE_MAPPER */
+
+  fd = open (dev, O_RDONLY);
+  if (fd == -1)
+    {
+      grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' while attempting to get disk geometry", dev);
+      return 0;
+    }
+
+  if (ioctl (fd, HDIO_GETGEO, &hdg))
+    {
+      grub_error (GRUB_ERR_BAD_DEVICE,
+		  "cannot get geometry of `%s'", dev);
+      close (fd);
+      return 0;
+    }
+
+  close (fd);
+
+  return hdg.start;
+}
+#endif /* __linux__ || __CYGWIN__ */
+
 #ifdef __linux__
 static int
 linux_find_partition (char *dev, unsigned long sector)
@@ -284,22 +397,20 @@ linux_find_partition (char *dev, unsigned long sector)
   for (i = 1; i < 10000; i++)
     {
       int fd;
-      struct hd_geometry hdg;
+      grub_disk_addr_t start;
 
       sprintf (p, format, i);
+
       fd = open (real_dev, O_RDONLY);
       if (fd == -1)
 	return 0;
-
-      if (ioctl (fd, HDIO_GETGEO, &hdg))
-	{
-	  close (fd);
-	  return 0;
-	}
-
       close (fd);
 
-      if (hdg.start == sector)
+      start = find_partition_start (real_dev);
+      /* We don't care about errors here.  */
+      grub_errno = GRUB_ERR_NONE;
+
+      if (start == sector)
 	{
 	  strcpy (dev, real_dev);
 	  return 1;
@@ -699,7 +810,7 @@ make_device_name (int drive, int dos_part, int bsd_part)
 }
 
 static char *
-convert_system_partition_to_system_disk (const char *os_dev)
+convert_system_partition_to_system_disk (const char *os_dev, struct stat *st)
 {
 #if defined(__linux__)
   char *path = xmalloc (PATH_MAX);
@@ -817,6 +928,83 @@ convert_system_partition_to_system_disk (const char *os_dev)
 	  p[4] = '\0';
 	  return path;
 	}
+
+#ifdef HAVE_DEVICE_MAPPER
+      /* If this is a DM-RAID device.  */
+      if ((strncmp ("mapper/", p, 7) == 0))
+	{
+	  static struct dm_tree *tree = NULL;
+	  uint32_t maj, min;
+	  struct dm_tree_node *node, *child;
+	  void *handle;
+	  const char *node_uuid, *child_uuid, *child_name;
+
+	  if (! tree)
+	    tree = dm_tree_create ();
+
+	  if (! tree)
+	    {
+	      grub_dprintf ("hostdisk", "dm_tree_create failed\n");
+	      return NULL;
+	    }
+
+	  maj = major (st->st_rdev);
+	  min = minor (st->st_rdev);
+	  if (! dm_tree_add_dev (tree, maj, min))
+	    {
+	      grub_dprintf ("hostdisk", "dm_tree_add_dev failed\n");
+	      return NULL;
+	    }
+
+	  node = dm_tree_find_node (tree, maj, min);
+	  if (! node)
+	    {
+	      grub_dprintf ("hostdisk", "dm_tree_find_node failed\n");
+	      return NULL;
+	    }
+	  node_uuid = dm_tree_node_get_uuid (node);
+	  if (! node_uuid)
+	    {
+	      grub_dprintf ("hostdisk", "%s has no DM uuid\n", path);
+	      return NULL;
+	    }
+	  else if (strncmp (node_uuid, "DMRAID-", 7) != 0)
+	    {
+	      grub_dprintf ("hostdisk", "%s is not DM-RAID\n", path);
+	      return NULL;
+	    }
+
+	  handle = NULL;
+	  /* Counter-intuitively, device-mapper refers to the disk-like
+	     device containing a DM-RAID partition device as a "child" of
+	     the partition device.  */
+	  child = dm_tree_next_child (&handle, node, 0);
+	  if (! child)
+	    {
+	      grub_dprintf ("hostdisk", "%s has no DM children\n", path);
+	      return NULL;
+	    }
+	  child_uuid = dm_tree_node_get_uuid (child);
+	  if (! child_uuid)
+	    {
+	      grub_dprintf ("hostdisk", "%s child has no DM uuid\n", path);
+	      return NULL;
+	    }
+	  else if (strncmp (child_uuid, "DMRAID-", 7) != 0)
+	    {
+	      grub_dprintf ("hostdisk", "%s child is not DM-RAID\n", path);
+	      return NULL;
+	    }
+	  child_name = dm_tree_node_get_name (child);
+	  if (! child_name)
+	    {
+	      grub_dprintf ("hostdisk", "%s child has no DM name\n", path);
+	      return NULL;
+	    }
+
+	  return xasprintf ("/dev/mapper/%s", child_name);
+	}
+#endif /* HAVE_DEVICE_MAPPER */
     }
 
   return path;
@@ -872,12 +1060,12 @@ device_is_wholedisk (const char *os_dev)
 #endif
 
 static int
-find_system_device (const char *os_dev)
+find_system_device (const char *os_dev, struct stat *st)
 {
   unsigned int i;
   char *os_disk;
 
-  os_disk = convert_system_partition_to_system_disk (os_dev);
+  os_disk = convert_system_partition_to_system_disk (os_dev, st);
   if (! os_disk)
     return -1;
 
@@ -911,7 +1099,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
       return 0;
     }
 
-  drive = find_system_device (os_dev);
+  drive = find_system_device (os_dev, &st);
   if (drive < 0)
     {
       grub_error (GRUB_ERR_BAD_DEVICE,
@@ -919,8 +1107,8 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
       return 0;
     }
 
-  if (grub_strcmp (os_dev, convert_system_partition_to_system_disk (os_dev))
-      == 0)
+  if (grub_strcmp (os_dev,
+		   convert_system_partition_to_system_disk (os_dev, &st)) == 0)
     return make_device_name (drive, -1, -1);
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
@@ -942,8 +1130,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
   {
     char *name;
     grub_disk_t disk;
-    int fd;
-    struct hd_geometry hdg;
+    grub_disk_addr_t start;
     int dos_part = -1;
     int bsd_part = -1;
     auto int find_partition (grub_disk_t disk,
@@ -973,7 +1160,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
 			      partition->index, partition->start);
 	  }
 
-	if (hdg.start == partition->start)
+	if (start == partition->start)
 	  {
 	    if (pcdata)
 	      {
@@ -996,28 +1183,16 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
     if (MAJOR (st.st_rdev) == FLOPPY_MAJOR)
       return name;
 
-    fd = open (os_dev, O_RDONLY);
-    if (fd == -1)
+    start = find_partition_start (os_dev);
+    if (grub_errno != GRUB_ERR_NONE)
       {
-	grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' while attempting to get disk geometry", os_dev);
 	free (name);
 	return 0;
       }
 
-    if (ioctl (fd, HDIO_GETGEO, &hdg))
-      {
-	grub_error (GRUB_ERR_BAD_DEVICE,
-		    "cannot get geometry of `%s'", os_dev);
-	close (fd);
-	free (name);
-	return 0;
-      }
+    grub_util_info ("%s starts from %lu", os_dev, start);
 
-    close (fd);
-
-    grub_util_info ("%s starts from %lu", os_dev, hdg.start);
-
-    if (hdg.start == 0 && device_is_wholedisk (os_dev))
+    if (start == 0 && device_is_wholedisk (os_dev))
       return name;
 
     grub_util_info ("opening the device %s", name);

From 42e0cba3af386ae4e5df2e82c759d833bae1ae47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Tue, 26 Jan 2010 01:57:56 +0100
Subject: [PATCH 0395/1628] Reset LIBS after check for libgcc symbols in
 configure.ac.

---
 ChangeLog    | 4 ++++
 configure.ac | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 12b7ccb31..e66e2d403 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-26  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Reset LIBS after check for libgcc symbols.
+
 2010-01-25  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/hostdisk.c (open_device): Add trailing newline to debug
diff --git a/configure.ac b/configure.ac
index be498be8b..e6751e5cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -457,6 +457,7 @@ CFLAGS="$TARGET_CFLAGS -nostdlib"
 else
 CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100"
 fi
+LIBS=""
 
 # Defined in aclocal.m4.
 grub_PROG_TARGET_CC

From c1273662b92bb745d7b1dbdcc247fea7b918e25e Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 26 Jan 2010 09:39:51 +0530
Subject: [PATCH 0396/1628] added change log file

---
 ChangeLog.while-until-loops | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 ChangeLog.while-until-loops

diff --git a/ChangeLog.while-until-loops b/ChangeLog.while-until-loops
new file mode 100644
index 000000000..33a3a839d
--- /dev/null
+++ b/ChangeLog.while-until-loops
@@ -0,0 +1,15 @@
+2010-01-26  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	While and until loops support to GRUB script.
+
+	* include/grub/script_sh.h (grub_script_cmdwhile): New struct.
+	(grub_script_create_cmdwhile): New function prototype.
+	(grub_script_execute_cmdwhile): New function prototype.
+	* script/execute.c (grub_script_execute_cmdwhile): New function.
+	* script/parser.y (command): New commands.
+	(whilecmd): New grammar rule.
+	(untilcmd): New grammar rule.
+	* script/script.c (grub_script_create_cmdwhile): New function.
+	* util/grub-script-check.c (grub_script_execute_cmdwhile): New
+	function.
+

From 3342306cec42aed344501adaeb13571a3dc4c1ae Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 26 Jan 2010 12:32:24 +0530
Subject: [PATCH 0397/1628] several fixes in return value handling

---
 ChangeLog.while-until-loops |  5 +++++
 commands/test.c             |  3 +--
 commands/true.c             |  2 +-
 conf/tests.rmk              |  4 ++++
 script/execute.c            | 28 ++++++++++++++++------------
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/ChangeLog.while-until-loops b/ChangeLog.while-until-loops
index 33a3a839d..ac54b8cd9 100644
--- a/ChangeLog.while-until-loops
+++ b/ChangeLog.while-until-loops
@@ -13,3 +13,8 @@
 	* util/grub-script-check.c (grub_script_execute_cmdwhile): New
 	function.
 
+	* tests/grub_script_while1.in: New testcase.
+	* conf/tests.rmk: New testcase make rule.
+
+	* commands/true.c (grub_cmd_false): Remove printing error message.
+	* commands/test.c (grub_cmd_test): Likewise.
diff --git a/commands/test.c b/commands/test.c
index 6995165cf..64ad69522 100644
--- a/commands/test.c
+++ b/commands/test.c
@@ -412,8 +412,7 @@ grub_cmd_test (grub_command_t cmd __attribute__ ((unused)),
   if (argc >= 1 && grub_strcmp (args[argc - 1], "]") == 0)
     argc--;
 
-  return test_parse (args, &argn, argc) ? GRUB_ERR_NONE
-    : grub_error (GRUB_ERR_TEST_FAILURE, "false");
+  return test_parse (args, &argn, argc) ? 0 : 1;
 }
 
 static grub_command_t cmd_1, cmd_2;
diff --git a/commands/true.c b/commands/true.c
index aa8125853..20403c588 100644
--- a/commands/true.c
+++ b/commands/true.c
@@ -34,7 +34,7 @@ grub_cmd_false (struct grub_command *cmd __attribute__ ((unused)),
 		int argc __attribute__ ((unused)),
 		char *argv[] __attribute__ ((unused)))
 {
-  return grub_error (GRUB_ERR_TEST_FAILURE, "false");
+  return 1;
 }
 
 static grub_command_t cmd_true, cmd_false;
diff --git a/conf/tests.rmk b/conf/tests.rmk
index 92f14797d..442beb0d3 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -53,6 +53,9 @@ grub_script_vars1_SOURCES = tests/grub_script_vars1.in
 check_SCRIPTS += grub_script_for1
 grub_script_for1_SOURCES = tests/grub_script_for1.in
 
+check_SCRIPTS += grub_script_while1
+grub_script_while1_SOURCES = tests/grub_script_while1.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -63,6 +66,7 @@ SCRIPTED_TESTS  = grub_script_echo1
 SCRIPTED_TESTS += grub_script_echo_keywords
 SCRIPTED_TESTS += grub_script_vars1
 SCRIPTED_TESTS += grub_script_for1
+SCRIPTED_TESTS += grub_script_while1
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/script/execute.c b/script/execute.c
index b905de46f..37686627d 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -26,13 +26,24 @@
 #include <grub/lib/arg.h>
 #include <grub/normal.h>
 
+/* Max digits for a char is 3 (0xFF is 255), similarly for an int it
+   is sizeof (int) * 3, and one extra for a possible -ve sign.  */
+#define ERRNO_DIGITS_MAX  (sizeof (int) * 3 + 1)
+
 static grub_err_t
 grub_script_execute_cmd (struct grub_script_cmd *cmd)
 {
+  int ret;
+  char errnobuf[ERRNO_DIGITS_MAX + 1];
+
   if (cmd == 0)
     return 0;
 
-  return cmd->exec (cmd);
+  ret = cmd->exec (cmd);
+
+  grub_snprintf (errnobuf, sizeof (errnobuf), "%d", ret);
+  grub_env_set ("?", errnobuf);
+  return ret;
 }
 
 /* Expand arguments in ARGLIST into multiple arguments.  */
@@ -188,7 +199,6 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
   grub_err_t ret = 0;
   int argcount = 0;
   grub_script_function_t func = 0;
-  char errnobuf[18];
   char *cmdname;
 
   /* Lookup the command.  */
@@ -222,11 +232,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 	      grub_env_set (assign, eq);
 	    }
 	  grub_free (assign);
-
-	  grub_snprintf (errnobuf, sizeof (errnobuf), "%d", grub_errno);
-	  grub_env_set ("?", errnobuf);
-
-	  return 0;
+	  return grub_errno;
 	}
     }
 
@@ -241,9 +247,6 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
     grub_free (args[i]);
   grub_free (args);
 
-  grub_snprintf (errnobuf, sizeof (errnobuf), "%d", ret);
-  grub_env_set ("?", errnobuf);
-
   return ret;
 }
 
@@ -251,13 +254,14 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 grub_err_t
 grub_script_execute_cmdblock (struct grub_script_cmd *cmd)
 {
+  int ret = 0;
   struct grub_script_cmdblock *cmdblock = (struct grub_script_cmdblock *) cmd;
 
   /* Loop over every command and execute it.  */
   for (cmd = cmdblock->cmdlist; cmd; cmd = cmd->next)
-    grub_script_execute_cmd (cmd);
+    ret = grub_script_execute_cmd (cmd);
 
-  return 0;
+  return ret;
 }
 
 /* Execute an if statement.  */

From 2aa1646307cc44f4ae31d340d24f70fdc226b0fa Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 26 Jan 2010 12:32:47 +0530
Subject: [PATCH 0398/1628] new testcase for while and until loops

---
 tests/grub_script_while1.in | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 tests/grub_script_while1.in

diff --git a/tests/grub_script_while1.in b/tests/grub_script_while1.in
new file mode 100644
index 000000000..554247f76
--- /dev/null
+++ b/tests/grub_script_while1.in
@@ -0,0 +1,32 @@
+#! @builddir@/grub-shell-tester
+
+echo one
+foo=""
+while test "$foo" != "1111"; do foo="${foo}1"; echo "$foo"; done
+
+echo two
+foo=""
+while test "$foo" != "aaaa"
+do
+  foo="${foo}a"
+  echo $foo
+done
+
+foo=""
+until test "$foo" = "1111"; do foo="${foo}1"; echo $foo; done
+foo=""
+until test "$foo" = "aaaa"
+do
+  foo="${foo}a"
+  echo $foo
+done
+
+# check "$?" in condition gets its value from while body commands
+foo=""
+false
+while test "$?" != "0"
+do
+    echo $foo
+    foo="${foo}1"
+    test "$foo" = "111111"
+done

From b5c5144ab11c3b9168949abe2c52a069ba58e862 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 26 Jan 2010 14:33:23 +0530
Subject: [PATCH 0399/1628] made while/until loop condition check more readable

---
 script/execute.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/execute.c b/script/execute.c
index 37686627d..cdfe47337 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -323,7 +323,7 @@ grub_script_execute_cmdwhile (struct grub_script_cmd *cmd)
   result = 0;
   do {
     cond = grub_script_execute_cmd (cmdwhile->cond);
-    if ((cmdwhile->until && !cond) || (!cmdwhile->until && cond))
+    if (cmdwhile->until ? !cond : cond)
       break;
 
     result = grub_script_execute_cmd (cmdwhile->list);

From b769a37b6ea0593c865e8a3ec501dd03757e44eb Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 26 Jan 2010 14:26:16 +0000
Subject: [PATCH 0400/1628] 2010-01-26  Colin Watson  <cjwatson@ubuntu.com>

	* conf/common.rmk (grub_mkdevicemap_SOURCES): Add kern/env.c,
	kern/err.c, kern/list.c, and kern/misc.c.
	* util/deviceiter.c [__linux__]: Define MINOR.
	(grub_util_iterate_devices): Add support for DM-RAID disk devices.
	* util/mkdevicemap.c (grub_putchar): New function.
	(grub_getkey): New function.
	(grub_refresh): New function.
	(main): Set debug=all if -v -v is used.
---
 ChangeLog.dmraid-probe  |  12 +++-
 conf/common.rmk         |   3 +-
 util/deviceiter.c       | 140 ++++++++++++++++++++++++++++++++++++++++
 util/grub-mkdevicemap.c |  22 +++++++
 4 files changed, 175 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.dmraid-probe b/ChangeLog.dmraid-probe
index 8b8f25533..505cf7ba4 100644
--- a/ChangeLog.dmraid-probe
+++ b/ChangeLog.dmraid-probe
@@ -1,6 +1,7 @@
-2010-01-25  Colin Watson  <cjwatson@ubuntu.com>
+2010-01-26  Colin Watson  <cjwatson@ubuntu.com>
 
 	* configure.ac: Check for Linux device-mapper support.
+
 	* util/hostdisk.c (device_is_mapped): New function.
 	(find_partition_start): New function, partly broken out from
 	linux_find_partition and grub_util_biosdisk_get_grub_dev but with
@@ -14,3 +15,12 @@
 	(grub_util_biosdisk_get_grub_dev): Pass stat result to
 	find_system_device and convert_system_partition_to_system_disk.  Use
 	find_partition_start.
+
+	* conf/common.rmk (grub_mkdevicemap_SOURCES): Add kern/env.c,
+	kern/err.c, kern/list.c, and kern/misc.c.
+	* util/deviceiter.c [__linux__]: Define MINOR.
+	(grub_util_iterate_devices): Add support for DM-RAID disk devices.
+	* util/mkdevicemap.c (grub_putchar): New function.
+	(grub_getkey): New function.
+	(grub_refresh): New function.
+	(main): Set debug=all if -v -v is used.
diff --git a/conf/common.rmk b/conf/common.rmk
index 2ea8ebd5a..94a96a313 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -3,7 +3,8 @@
 sbin_UTILITIES += grub-mkdevicemap
 grub_mkdevicemap_SOURCES = gnulib/progname.c util/grub-mkdevicemap.c \
 	util/deviceiter.c \
-	util/misc.c
+	util/misc.c \
+	kern/env.c kern/err.c kern/list.c kern/misc.c
 
 ifeq ($(target_cpu)-$(platform), sparc64-ieee1275)
 grub_mkdevicemap_SOURCES += util/ieee1275/ofpath.c util/ieee1275/devicemap.c
diff --git a/util/deviceiter.c b/util/deviceiter.c
index b0a9e1388..03813bc7d 100644
--- a/util/deviceiter.c
+++ b/util/deviceiter.c
@@ -31,6 +31,8 @@
 
 #include <grub/util/misc.h>
 #include <grub/util/deviceiter.h>
+#include <grub/list.h>
+#include <grub/misc.h>
 
 #ifdef __linux__
 # if !defined(__GLIBC__) || \
@@ -62,12 +64,23 @@ struct hd_geometry
                  | ((unsigned int) (__dev >> 32) & ~0xfff); \
   })
 # endif /* ! MAJOR */
+# ifndef MINOR
+#  define MINOR(dev)	\
+  ({ \
+     unsigned long long __dev = (dev); \
+     (unsigned) (__dev & 0xff) | ((unsigned int) (__dev >> 12) & ~0xff); \
+  })
+# endif /* ! MINOR */
 # ifndef CDROM_GET_CAPABILITY
 #  define CDROM_GET_CAPABILITY	0x5331	/* get capabilities */
 # endif /* ! CDROM_GET_CAPABILITY */
 # ifndef BLKGETSIZE
 #  define BLKGETSIZE	_IO(0x12,96)	/* return device size */
 # endif /* ! BLKGETSIZE */
+
+#ifdef HAVE_DEVICE_MAPPER
+# include <libdevmapper.h>
+#endif
 #endif /* __linux__ */
 
 /* Use __FreeBSD_kernel__ instead of __FreeBSD__ for compatibility with
@@ -411,6 +424,16 @@ check_device (const char *device)
   return 1;
 }
 
+#ifdef __linux__
+# ifdef HAVE_DEVICE_MAPPER
+struct dmraid_seen
+{
+  struct dmraid_seen *next;
+  const char *name;
+};
+# endif /* HAVE_DEVICE_MAPPER */
+#endif /* __linux__ */
+
 void
 grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 			   int floppy_disks)
@@ -643,6 +666,123 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 	    return;
 	}
     }
+
+# ifdef HAVE_DEVICE_MAPPER
+#  define dmraid_check(cond, ...) \
+  if (! (cond)) \
+    { \
+      grub_dprintf ("deviceiter", __VA_ARGS__); \
+      goto dmraid_end; \
+    }
+
+  /* DM-RAID.  */
+  {
+    struct dm_tree *tree = NULL;
+    struct dm_task *task = NULL;
+    struct dm_names *names = NULL;
+    unsigned int next = 0;
+    void *top_handle, *second_handle;
+    struct dm_tree_node *root, *top, *second;
+    struct dmraid_seen *seen = NULL;
+
+    /* Build DM tree for all devices.  */
+    tree = dm_tree_create ();
+    dmraid_check (tree, "dm_tree_create failed\n");
+    task = dm_task_create (DM_DEVICE_LIST);
+    dmraid_check (task, "dm_task_create failed\n");
+    dmraid_check (dm_task_run (task), "dm_task_run failed\n");
+    names = dm_task_get_names (task);
+    dmraid_check (names, "dm_task_get_names failed\n");
+    dmraid_check (names->dev, "No DM devices found\n");
+    do
+      {
+	names = (void *) names + next;
+	dmraid_check (dm_tree_add_dev (tree, MAJOR (names->dev),
+				       MINOR (names->dev)),
+			 "dm_tree_add_dev (%s) failed\n", names->name);
+	next = names->next;
+      }
+    while (next);
+
+    /* Walk the second-level children of the inverted tree; that is, devices
+       which are directly composed of non-DM devices such as hard disks.
+       This class includes all DM-RAID disks and excludes all DM-RAID
+       partitions.  */
+    root = dm_tree_find_node (tree, 0, 0);
+    top_handle = NULL;
+    top = dm_tree_next_child (&top_handle, root, 1);
+    while (top)
+      {
+	second_handle = NULL;
+	second = dm_tree_next_child (&second_handle, top, 1);
+	while (second)
+	  {
+	    const char *node_name, *node_uuid;
+	    char *name;
+	    struct dmraid_seen *seen_elt;
+
+	    node_name = dm_tree_node_get_name (second);
+	    dmraid_check (node_name, "dm_tree_node_get_name failed\n");
+	    node_uuid = dm_tree_node_get_uuid (second);
+	    dmraid_check (node_uuid, "dm_tree_node_get_uuid failed\n");
+	    if (strncmp (node_uuid, "DMRAID-", 7) != 0)
+	      {
+		grub_dprintf ("deviceiter", "%s is not DM-RAID\n", node_name);
+		goto dmraid_next_child;
+	      }
+
+	    /* Have we already seen this node?  There are typically very few
+	       DM-RAID disks, so a list should be fast enough.  */
+	    if (grub_named_list_find (GRUB_AS_NAMED_LIST (seen), node_name))
+	      {
+		grub_dprintf ("deviceiter", "Already seen DM device %s\n",
+			      node_name);
+		goto dmraid_next_child;
+	      }
+
+	    name = xasprintf ("/dev/mapper/%s", node_name);
+	    if (check_device (name))
+	      {
+		if (hook (name, 0))
+		  {
+		    free (name);
+		    while (seen)
+		      {
+			struct dmraid_seen *seen_elt =
+			  grub_list_pop (GRUB_AS_LIST_P (&seen));
+			free (seen_elt);
+		      }
+		    if (task)
+		      dm_task_destroy (task);
+		    if (tree)
+		      dm_tree_free (tree);
+		    return;
+		  }
+	      }
+	    free (name);
+
+	    seen_elt = xmalloc (sizeof *seen_elt);
+	    seen_elt->name = node_name;
+	    grub_list_push (GRUB_AS_LIST_P (&seen), GRUB_AS_LIST (seen_elt));
+
+dmraid_next_child:
+	    second = dm_tree_next_child (&second_handle, top, 1);
+	  }
+	top = dm_tree_next_child (&top_handle, root, 1);
+      }
+
+dmraid_end:
+    while (seen)
+      {
+	struct dmraid_seen *seen_elt = grub_list_pop (GRUB_AS_LIST_P (&seen));
+	free (seen_elt);
+      }
+    if (task)
+      dm_task_destroy (task);
+    if (tree)
+      dm_tree_free (tree);
+  }
+# endif /* HAVE_DEVICE_MAPPER */
 #endif /* __linux__ */
 }
 
diff --git a/util/grub-mkdevicemap.c b/util/grub-mkdevicemap.c
index c68482af1..db37f99e6 100644
--- a/util/grub-mkdevicemap.c
+++ b/util/grub-mkdevicemap.c
@@ -31,6 +31,7 @@
 
 #include <grub/util/misc.h>
 #include <grub/util/deviceiter.h>
+#include <grub/env.h>
 #include <grub/i18n.h>
 
 #define _GNU_SOURCE	1
@@ -38,6 +39,24 @@
 
 #include "progname.h"
 
+void
+grub_putchar (int c)
+{
+  putchar (c);
+}
+
+int
+grub_getkey (void)
+{
+  return -1;
+}
+
+void
+grub_refresh (void)
+{
+  fflush (stdout);
+}
+
 static void
 make_device_map (const char *device_map, int floppy_disks)
 {
@@ -158,6 +177,9 @@ main (int argc, char *argv[])
 	  }
     }
 
+  if (verbosity > 1)
+    grub_env_set ("debug", "all");
+
   make_device_map (dev_map ? : DEFAULT_DEVICE_MAP, floppy_disks);
 
   free (dev_map);

From 59cad637aec20e1a5122c6a0a7f30ed48b5b4b2a Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Tue, 26 Jan 2010 16:45:16 +0100
Subject: [PATCH 0401/1628] Update my email address

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e66e2d403..aabc66370 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23847,7 +23847,7 @@
 
 	* genmk.rb (PModule#rule): Make sure to get only symbol names
 	from the output of nm.
-	Reported by Robert Millan <zeratul2@wanadoo.es>.
+	Reported by Robert Millan <rmh.grub@aybabtu.com>.
 
 2003-09-25  Yoshinori K. Okuji  <okuji@enbug.org>
 

From 3973a59a3476cb9201f70446e03b6e5301b3c3bf Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Tue, 26 Jan 2010 16:39:37 +0000
Subject: [PATCH 0402/1628] 2010-01-26  Robert Millan  <rmh.grub@aybabtu.com>

	* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_PXE_DL): New macro.

	* boot/i386/pc/pxeboot.S: Include `<grub/machine/boot.h>'.
	(_start): Macroify `0x7F'.

	* kern/i386/pc/init.c: Include `<grub/machine/boot.h>'.
	(make_install_device): Use "(pxe)" as fallback prefix when booting
	via PXE.
---
 ChangeLog                   | 11 +++++++++++
 boot/i386/pc/pxeboot.S      |  6 ++++--
 include/grub/i386/pc/boot.h |  2 ++
 kern/i386/pc/init.c         | 37 ++++++++++++++++++++++---------------
 4 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aabc66370..293e40a40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-26  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_PXE_DL): New macro.
+
+	* boot/i386/pc/pxeboot.S: Include `<grub/machine/boot.h>'.
+	(_start): Macroify `0x7F'.
+
+	* kern/i386/pc/init.c: Include `<grub/machine/boot.h>'.
+	(make_install_device): Use "(pxe)" as fallback prefix when booting
+	via PXE.
+
 2010-01-26  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Reset LIBS after check for libgcc symbols.
diff --git a/boot/i386/pc/pxeboot.S b/boot/i386/pc/pxeboot.S
index 28c90e29b..446bfc781 100644
--- a/boot/i386/pc/pxeboot.S
+++ b/boot/i386/pc/pxeboot.S
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2000,2005,2007,2008,2009   Free Software Foundation, Inc.
+ *  Copyright (C) 2000,2005,2007,2008,2009,2010   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
@@ -16,6 +16,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <grub/machine/boot.h>
+
 	.file	"pxeboot.S"
 	.text
 
@@ -28,7 +30,7 @@ _start:
 start:
 
 	/* Use drive number 0x7F for PXE */
-        movb	$0x7F, %dl
+        movb	$GRUB_BOOT_MACHINE_PXE_DL, %dl
 
 	/* Jump to the real world */
 	ljmp	$0, $0x8200
diff --git a/include/grub/i386/pc/boot.h b/include/grub/i386/pc/boot.h
index 508b10742..e88c62b71 100644
--- a/include/grub/i386/pc/boot.h
+++ b/include/grub/i386/pc/boot.h
@@ -66,6 +66,8 @@
 /* The size of a block list used in the kernel startup code.  */
 #define GRUB_BOOT_MACHINE_LIST_SIZE	12
 
+#define GRUB_BOOT_MACHINE_PXE_DL	0x7f
+
 #ifndef ASM_FILE
 
 /* This is the blocklist used in the diskboot image.  */
diff --git a/kern/i386/pc/init.c b/kern/i386/pc/init.c
index e45ad3971..1707049fe 100644
--- a/kern/i386/pc/init.c
+++ b/kern/i386/pc/init.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010  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
@@ -18,6 +18,7 @@
 
 #include <grub/kernel.h>
 #include <grub/mm.h>
+#include <grub/machine/boot.h>
 #include <grub/machine/init.h>
 #include <grub/machine/memory.h>
 #include <grub/machine/console.h>
@@ -62,22 +63,28 @@ make_install_device (void)
     {
       /* No hardcoded root partition - make it from the boot drive and the
 	 partition number encoded at the install time.  */
-      grub_snprintf (dev, sizeof (dev),
-		    "(%cd%u", (grub_boot_drive & 0x80) ? 'h' : 'f',
-		    grub_boot_drive & 0x7f);
-      ptr += grub_strlen (ptr);
+      if (grub_boot_drive == GRUB_BOOT_MACHINE_PXE_DL)
+	{
+	  grub_strcpy (dev, "(pxe");
+	  ptr += sizeof ("(pxe") - 1;
+	}
+      else
+	{
+	  grub_snprintf (dev, sizeof (dev),
+			 "(%cd%u", (grub_boot_drive & 0x80) ? 'h' : 'f',
+			 grub_boot_drive & 0x7f);
+	  ptr += grub_strlen (ptr);
 
-      if (grub_install_dos_part >= 0)
-	grub_snprintf (ptr, sizeof (dev) - (ptr - dev),
-		       ",%u", grub_install_dos_part + 1);
+	  if (grub_install_dos_part >= 0)
+	    grub_snprintf (ptr, sizeof (dev) - (ptr - dev),
+			   ",%u", grub_install_dos_part + 1);
+	  ptr += grub_strlen (ptr);
 
-      ptr += grub_strlen (ptr);
-
-      if (grub_install_bsd_part >= 0)
-	grub_snprintf (ptr, sizeof (dev) - (ptr - dev), ",%c",
-		       grub_install_bsd_part + 'a');
-
-      ptr += grub_strlen (ptr);
+	  if (grub_install_bsd_part >= 0)
+	    grub_snprintf (ptr, sizeof (dev) - (ptr - dev), ",%c",
+			   grub_install_bsd_part + 'a');
+	  ptr += grub_strlen (ptr);
+	}
 
       grub_snprintf (ptr, sizeof (dev) - (ptr - dev), ")%s", grub_prefix);
       grub_strcpy (grub_prefix, dev);

From 94e7e712819fa4a320b013fb850341679a9fa71d Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Tue, 26 Jan 2010 18:12:49 +0000
Subject: [PATCH 0403/1628] 2010-01-26  Robert Millan  <rmh.grub@aybabtu.com>

	* util/bin2h.c (usage): Make --help actually explain what `grub-bin2h'
	does.
---
 ChangeLog    | 5 +++++
 util/bin2h.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 293e40a40..097d6b217 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-26  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* util/bin2h.c (usage): Make --help actually explain what `grub-bin2h'
+	does.
+
 2010-01-26  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_PXE_DL): New macro.
diff --git a/util/bin2h.c b/util/bin2h.c
index 5ce47f086..3a0723ea3 100644
--- a/util/bin2h.c
+++ b/util/bin2h.c
@@ -41,6 +41,8 @@ usage (int status)
     printf ("\
 Usage: %s [OPTIONS] SYMBOL-NAME\n\
 \n\
+Convert a binary file to a C header.\n\
+\n\ 
   -h, --help                display this message and exit\n\
   -V, --version             print version information and exit\n\
 \n\

From de0b7a4ed1e72ea5e66027d80c6a708418980b70 Mon Sep 17 00:00:00 2001
From: carles <carles@pinux>
Date: Tue, 26 Jan 2010 20:16:08 +0000
Subject: [PATCH 0404/1628] 2010-01-25  Carles Pina i Estany  <carles@pina.cat>

	* font/font.c: Include `grub/fontformat.h.
	Remove font file format constants.
	(grub_font_load): Use the new macros.
	* include/grub/fontformat.h: New file.
	* util/grub-mkfont.c: Include `grub/fontformat.c'.
	(write_font_pf2): Use the new macros.
---
 ChangeLog                 |  9 +++++++
 font/font.c               | 51 +++++++++++++++++++++------------------
 include/grub/fontformat.h | 38 +++++++++++++++++++++++++++++
 util/grub-mkfont.c        | 38 +++++++++++++++++++----------
 4 files changed, 99 insertions(+), 37 deletions(-)
 create mode 100644 include/grub/fontformat.h

diff --git a/ChangeLog b/ChangeLog
index 097d6b217..a0628fd7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-25  Carles Pina i Estany  <carles@pina.cat>
+
+	* font/font.c: Include `grub/fontformat.h.
+	Remove font file format constants.
+	(grub_font_load): Use the new macros.
+	* include/grub/fontformat.h: New file.
+	* util/grub-mkfont.c: Include `grub/fontformat.c'.
+	(write_font_pf2): Use the new macros.
+
 2010-01-26  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* util/bin2h.c (usage): Make --help actually explain what `grub-bin2h'
diff --git a/font/font.c b/font/font.c
index 587e418cc..639f4d720 100644
--- a/font/font.c
+++ b/font/font.c
@@ -26,6 +26,7 @@
 #include <grub/types.h>
 #include <grub/video.h>
 #include <grub/bitmap.h>
+#include <grub/fontformat.h>
 
 #ifdef USE_ASCII_FAILBACK
 #include "ascii.h"
@@ -89,19 +90,6 @@ struct font_file_section
   int eof;
 };
 
-/* Font file format constants.  */
-static const char pff2_magic[4] = { 'P', 'F', 'F', '2' };
-static const char section_names_file[4] = { 'F', 'I', 'L', 'E' };
-static const char section_names_font_name[4] = { 'N', 'A', 'M', 'E' };
-static const char section_names_point_size[4] = { 'P', 'T', 'S', 'Z' };
-static const char section_names_weight[4] = { 'W', 'E', 'I', 'G' };
-static const char section_names_max_char_width[4] = { 'M', 'A', 'X', 'W' };
-static const char section_names_max_char_height[4] = { 'M', 'A', 'X', 'H' };
-static const char section_names_ascent[4] = { 'A', 'S', 'C', 'E' };
-static const char section_names_descent[4] = { 'D', 'E', 'S', 'C' };
-static const char section_names_char_index[4] = { 'C', 'H', 'I', 'X' };
-static const char section_names_data[4] = { 'D', 'A', 'T', 'A' };
-
 /* Replace unknown glyphs with a rounded question mark.  */
 static grub_uint8_t unknown_glyph_bitmap[] =
 {
@@ -460,7 +448,8 @@ grub_font_load (const char *filename)
 #if FONT_DEBUG >= 3
   grub_printf("opened FILE section\n");
 #endif
-  if (grub_memcmp (section.name, section_names_file, 4) != 0)
+  if (grub_memcmp (section.name, FONT_FORMAT_SECTION_NAMES_FILE,
+  		   sizeof(FONT_FORMAT_SECTION_NAMES_FILE) - 1) != 0)
     {
       grub_error (GRUB_ERR_BAD_FONT,
                   "font file format error: 1st section must be FILE");
@@ -489,7 +478,7 @@ grub_font_load (const char *filename)
   grub_printf("read magic ok\n");
 #endif
 
-  if (grub_memcmp (magic, pff2_magic, 4) != 0)
+  if (grub_memcmp (magic, FONT_FORMAT_PFF2_MAGIC, 4) != 0)
     {
       grub_error (GRUB_ERR_BAD_FONT, "invalid font magic %x %x %x %x",
                   magic[0], magic[1], magic[2], magic[3]);
@@ -529,18 +518,22 @@ grub_font_load (const char *filename)
                   section.name[2], section.name[3]);
 #endif
 
-      if (grub_memcmp (section.name, section_names_font_name, 4) == 0)
+      if (grub_memcmp (section.name, FONT_FORMAT_SECTION_NAMES_FONT_NAME,
+      		       sizeof(FONT_FORMAT_SECTION_NAMES_FONT_NAME) - 1) == 0)
         {
           font->name = read_section_as_string (&section);
           if (!font->name)
             goto fail;
         }
-      else if (grub_memcmp (section.name, section_names_point_size, 4) == 0)
+      else if (grub_memcmp (section.name,
+      			    FONT_FORMAT_SECTION_NAMES_POINT_SIZE,
+			    sizeof(FONT_FORMAT_SECTION_NAMES_POINT_SIZE) - 1) == 0)
         {
           if (read_section_as_short (&section, &font->point_size) != 0)
             goto fail;
         }
-      else if (grub_memcmp (section.name, section_names_weight, 4) == 0)
+      else if (grub_memcmp (section.name, FONT_FORMAT_SECTION_NAMES_WEIGHT,
+      			    sizeof(FONT_FORMAT_SECTION_NAMES_WEIGHT) - 1) == 0)
         {
           char *wt;
           wt = read_section_as_string (&section);
@@ -553,32 +546,42 @@ grub_font_load (const char *filename)
             font->weight = FONT_WEIGHT_BOLD;
           grub_free (wt);
         }
-      else if (grub_memcmp (section.name, section_names_max_char_width, 4) == 0)
+      else if (grub_memcmp (section.name,
+      	       FONT_FORMAT_SECTION_NAMES_MAX_CHAR_WIDTH,
+	       sizeof(FONT_FORMAT_SECTION_NAMES_MAX_CHAR_WIDTH) - 1) == 0)
         {
           if (read_section_as_short (&section, &font->max_char_width) != 0)
             goto fail;
         }
-      else if (grub_memcmp (section.name, section_names_max_char_height, 4) == 0)
+      else if (grub_memcmp (section.name,
+      	       FONT_FORMAT_SECTION_NAMES_MAX_CHAR_HEIGHT,
+	       sizeof(FONT_FORMAT_SECTION_NAMES_MAX_CHAR_HEIGHT) - 1) == 0)
         {
           if (read_section_as_short (&section, &font->max_char_height) != 0)
             goto fail;
         }
-      else if (grub_memcmp (section.name, section_names_ascent, 4) == 0)
+      else if (grub_memcmp (section.name,
+      	       FONT_FORMAT_SECTION_NAMES_ASCENT,
+	       sizeof(FONT_FORMAT_SECTION_NAMES_ASCENT) - 1) == 0)
         {
           if (read_section_as_short (&section, &font->ascent) != 0)
             goto fail;
         }
-      else if (grub_memcmp (section.name, section_names_descent, 4) == 0)
+      else if (grub_memcmp (section.name, FONT_FORMAT_SECTION_NAMES_DESCENT,
+      			    sizeof(FONT_FORMAT_SECTION_NAMES_DESCENT) - 1) == 0)
         {
           if (read_section_as_short (&section, &font->descent) != 0)
             goto fail;
         }
-      else if (grub_memcmp (section.name, section_names_char_index, 4) == 0)
+      else if (grub_memcmp (section.name,
+      			    FONT_FORMAT_SECTION_NAMES_CHAR_INDEX,
+			    sizeof(FONT_FORMAT_SECTION_NAMES_CHAR_INDEX) - 1) == 0)
         {
           if (load_font_index (file, section.length, font) != 0)
             goto fail;
         }
-      else if (grub_memcmp (section.name, section_names_data, 4) == 0)
+      else if (grub_memcmp (section.name, FONT_FORMAT_SECTION_NAMES_DATA,
+      			    sizeof(FONT_FORMAT_SECTION_NAMES_DATA) - 1) == 0)
         {
           /* When the DATA section marker is reached, we stop reading.  */
           break;
diff --git a/include/grub/fontformat.h b/include/grub/fontformat.h
new file mode 100644
index 000000000..b5060588c
--- /dev/null
+++ b/include/grub/fontformat.h
@@ -0,0 +1,38 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010 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/>.
+ */
+
+#ifndef GRUB_FONT_FORMAT_HEADER
+#define GRUB_FONT_FORMAT_HEADER	1
+
+/* FONT_FORMAT_PFF2_MAGIC use only 4 relevants bytes and the \0.  */
+#define FONT_FORMAT_PFF2_MAGIC "PFF2"
+#define FONT_FORMAT_SECTION_NAMES_FILE "FILE"
+#define FONT_FORMAT_SECTION_NAMES_FONT_NAME "NAME"
+#define FONT_FORMAT_SECTION_NAMES_POINT_SIZE "PTSZ"
+#define FONT_FORMAT_SECTION_NAMES_WEIGHT "WEIG"
+#define FONT_FORMAT_SECTION_NAMES_MAX_CHAR_WIDTH "MAXW"
+#define FONT_FORMAT_SECTION_NAMES_MAX_CHAR_HEIGHT "MAXH"
+#define FONT_FORMAT_SECTION_NAMES_ASCENT "ASCE"
+#define FONT_FORMAT_SECTION_NAMES_DESCENT "DESC"
+#define FONT_FORMAT_SECTION_NAMES_CHAR_INDEX "CHIX"
+#define FONT_FORMAT_SECTION_NAMES_DATA "DATA"
+#define FONT_FORMAT_SECTION_NAMES_FAMILY "FAMI"
+#define FONT_FORMAT_SECTION_NAMES_SLAN "SLAN"
+
+#endif /* ! GRUB_FONT_FORMAT_HEADER */
+
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 38906a70e..51e2e494c 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -20,6 +20,7 @@
 #include <grub/types.h>
 #include <grub/util/misc.h>
 #include <grub/i18n.h>
+#include <grub/fontformat.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -392,9 +393,10 @@ write_font_pf2 (struct grub_font_info *font_info, char *output_file)
   offset = 0;
 
   leng = grub_cpu_to_be32 (4);
-  grub_util_write_image ("FILE", 4, file);
+  grub_util_write_image (FONT_FORMAT_SECTION_NAMES_FILE,
+  			 sizeof(FONT_FORMAT_SECTION_NAMES_FILE) - 1, file);
   grub_util_write_image ((char *) &leng, 4, file);
-  grub_util_write_image ("PFF2", 4, file);
+  grub_util_write_image (FONT_FORMAT_PFF2_MAGIC, 4, file);
   offset += 12;
 
   if (! font_info->name)
@@ -416,20 +418,25 @@ write_font_pf2 (struct grub_font_info *font_info, char *output_file)
   font_name = xasprintf ("%s %s %d", font_info->name, &style_name[1],
 			 font_info->size);
 
-  write_string_section ("NAME", font_name, &offset, file);
-  write_string_section ("FAMI", font_info->name, &offset, file);
-  write_string_section ("WEIG",
+  write_string_section (FONT_FORMAT_SECTION_NAMES_FONT_NAME,
+  			font_name, &offset, file);
+  write_string_section (FONT_FORMAT_SECTION_NAMES_FAMILY,
+  			font_info->name, &offset, file);
+  write_string_section (FONT_FORMAT_SECTION_NAMES_WEIGHT,
 			(font_info->style & FT_STYLE_FLAG_BOLD) ?
 			"bold" : "normal",
 			&offset, file);
-  write_string_section ("SLAN",
+  write_string_section (FONT_FORMAT_SECTION_NAMES_SLAN,
 			(font_info->style & FT_STYLE_FLAG_ITALIC) ?
 			"italic" : "normal",
 			&offset, file);
 
-  write_be16_section ("PTSZ", font_info->size, &offset, file);
-  write_be16_section ("MAXW", font_info->max_width, &offset, file);
-  write_be16_section ("MAXH", font_info->max_height, &offset, file);
+  write_be16_section (FONT_FORMAT_SECTION_NAMES_POINT_SIZE,
+  		      font_info->size, &offset, file);
+  write_be16_section (FONT_FORMAT_SECTION_NAMES_MAX_CHAR_WIDTH,
+  		      font_info->max_width, &offset, file);
+  write_be16_section (FONT_FORMAT_SECTION_NAMES_MAX_CHAR_HEIGHT,
+  		      font_info->max_height, &offset, file);
 
   if (! font_info->desc)
     {
@@ -447,8 +454,10 @@ write_font_pf2 (struct grub_font_info *font_info, char *output_file)
 	font_info->asce = font_info->max_y;
     }
 
-  write_be16_section ("ASCE", font_info->asce, &offset, file);
-  write_be16_section ("DESC", font_info->desc, &offset, file);
+  write_be16_section (FONT_FORMAT_SECTION_NAMES_ASCENT,
+  		      font_info->asce, &offset, file);
+  write_be16_section (FONT_FORMAT_SECTION_NAMES_DESCENT,
+  		      font_info->desc, &offset, file);
 
   if (font_verbosity > 0)
     {
@@ -479,7 +488,9 @@ write_font_pf2 (struct grub_font_info *font_info, char *output_file)
     printf ("Number of glyph: %d\n", num);
 
   leng = grub_cpu_to_be32 (num * 9);
-  grub_util_write_image ("CHIX", 4, file);
+  grub_util_write_image (FONT_FORMAT_SECTION_NAMES_CHAR_INDEX,
+  			 sizeof(FONT_FORMAT_SECTION_NAMES_CHAR_INDEX) - 1,
+			 file);
   grub_util_write_image ((char *) &leng, 4, file);
   offset += 8 + num * 9 + 8;
 
@@ -495,7 +506,8 @@ write_font_pf2 (struct grub_font_info *font_info, char *output_file)
     }
 
   leng = 0xffffffff;
-  grub_util_write_image ("DATA", 4, file);
+  grub_util_write_image (FONT_FORMAT_SECTION_NAMES_DATA,
+  			 sizeof(FONT_FORMAT_SECTION_NAMES_DATA) - 1, file);
   grub_util_write_image ((char *) &leng, 4, file);
 
   for (cur = font_info->glyph; cur; cur = cur->next)

From b510928c3857245d4415cab78b87279ce6bcfbd3 Mon Sep 17 00:00:00 2001
From: carles <carles@pinux>
Date: Tue, 26 Jan 2010 21:23:59 +0000
Subject: [PATCH 0405/1628] 2010-01-26  Carles Pina i Estany  <carles@pina.cat>

	* util/bin2h.c (usage): Fix warning (space after backslash).
---
 ChangeLog    | 4 ++++
 util/bin2h.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a0628fd7d..ca129a3be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-26  Carles Pina i Estany  <carles@pina.cat>
+
+	* util/bin2h.c (usage): Fix warning (space after backslash).
+
 2010-01-25  Carles Pina i Estany  <carles@pina.cat>
 
 	* font/font.c: Include `grub/fontformat.h.
diff --git a/util/bin2h.c b/util/bin2h.c
index 3a0723ea3..e81ede8c6 100644
--- a/util/bin2h.c
+++ b/util/bin2h.c
@@ -42,7 +42,7 @@ usage (int status)
 Usage: %s [OPTIONS] SYMBOL-NAME\n\
 \n\
 Convert a binary file to a C header.\n\
-\n\ 
+\n\
   -h, --help                display this message and exit\n\
   -V, --version             print version information and exit\n\
 \n\

From aa2f9dd26d5dac1f64a5a08417c4638f47e7f564 Mon Sep 17 00:00:00 2001
From: carles <carles@pinux>
Date: Tue, 26 Jan 2010 23:07:37 +0000
Subject: [PATCH 0406/1628] Correct ChangeLog entry date.

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ca129a3be..b54d3bcbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 
 	* util/bin2h.c (usage): Fix warning (space after backslash).
 
-2010-01-25  Carles Pina i Estany  <carles@pina.cat>
+2010-01-26  Carles Pina i Estany  <carles@pina.cat>
 
 	* font/font.c: Include `grub/fontformat.h.
 	Remove font file format constants.

From 254e2ce59664771f59f8698b1dd62429caccbda0 Mon Sep 17 00:00:00 2001
From: carles <carles@pinux>
Date: Wed, 27 Jan 2010 00:19:46 +0000
Subject: [PATCH 0407/1628] 2010-01-27  Carles Pina i Estany  <carles@pina.cat>

	* util/lvm.c: New macro LVM_DEV_MAPPER_STRING.
	(grub_util_lvm_isvolume): Use LVM_DEV_MAPPER_STRING.
---
 ChangeLog  | 5 +++++
 util/lvm.c | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b54d3bcbc..e3988f150 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-27  Carles Pina i Estany  <carles@pina.cat>
+
+	* util/lvm.c: New macro LVM_DEV_MAPPER_STRING.
+	(grub_util_lvm_isvolume): Use LVM_DEV_MAPPER_STRING.
+
 2010-01-26  Carles Pina i Estany  <carles@pina.cat>
 
 	* util/bin2h.c (usage): Fix warning (space after backslash).
diff --git a/util/lvm.c b/util/lvm.c
index 8a8ed1e4c..0a0916344 100644
--- a/util/lvm.c
+++ b/util/lvm.c
@@ -26,6 +26,8 @@
 #include <string.h>
 #include <sys/stat.h>
 
+#define LVM_DEV_MAPPER_STRING "/dev/mapper/"
+
 int
 grub_util_lvm_isvolume (char *name)
 {
@@ -33,10 +35,10 @@ grub_util_lvm_isvolume (char *name)
   struct stat st;
   int err;
 
-  devname = xmalloc (strlen (name) + 13);
+  devname = xmalloc (strlen (name) + sizeof (LVM_DEV_MAPPER_STRING));
 
-  strcpy (devname, "/dev/mapper/");
-  strcpy (devname+12, name);
+  strcpy (devname, LVM_DEV_MAPPER_STRING);
+  strcpy (devname + sizeof(LVM_DEV_MAPPER_STRING) - 1, name);
 
   err = stat (devname, &st);
   free (devname);

From af75a9f19a81c2c5fada0c44779a491fae388e96 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 27 Jan 2010 01:49:11 +0000
Subject: [PATCH 0408/1628] 2010-01-27  Robert Millan  <rmh.grub@aybabtu.com>

	* util/grub-fstest.c (fstest): Rewrite allocation, fixing a few
	memleak conditions.
---
 ChangeLog          |  5 +++++
 util/grub-fstest.c | 37 ++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e3988f150..c4930acb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-27  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* util/grub-fstest.c (fstest): Rewrite allocation, fixing a few
+	memleak conditions.
+
 2010-01-27  Carles Pina i Estany  <carles@pina.cat>
 
 	* util/lvm.c: New macro LVM_DEV_MAPPER_STRING.
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index bf30286a4..c03c43451 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -280,27 +280,29 @@ fstest (char **images, int num_disks, int cmd, int n, char **args)
 {
   char *host_file;
   char *loop_name;
-  char *argv[3] = { "-p" };
+  char *argv[3];
   int i;
 
+  argv[0] = "-p";
+
   for (i = 0; i < num_disks; i++)
     {
       loop_name = grub_xasprintf ("loop%d", i);
-      host_file = grub_xasprintf ("(host)%s", images[i]);
+      if (!loop_name)
+	grub_util_error (grub_errmsg);
 
-      if (!loop_name || !host_file)
-	{
-	  grub_free (loop_name);
-	  grub_free (host_file);
-	  grub_util_error (grub_errmsg);
-	  return;
-	}
+      host_file = grub_xasprintf ("(host)%s", images[i]);
+      if (!host_file)
+	grub_util_error (grub_errmsg);
 
       argv[1] = loop_name;
       argv[2] = host_file;
 
       if (execute_command ("loopback", 3, argv))
         grub_util_error ("loopback command fails");
+
+      grub_free (loop_name);
+      grub_free (host_file);
     }
 
   grub_lvm_fini ();
@@ -336,19 +338,16 @@ fstest (char **images, int num_disks, int cmd, int n, char **args)
 
   for (i = 0; i < num_disks; i++)
     {
-      grub_free (loop_name);
       loop_name = grub_xasprintf ("loop%d", i);
       if (!loop_name)
-	{
-	  grub_free (host_file);
-	  grub_util_error (grub_errmsg);
-	  return;
-	}
-      execute_command ("loopback", 2, argv);
-    }
+	grub_util_error (grub_errmsg);
 
-  grub_free (loop_name);
-  grub_free (host_file);
+      argv[1] = loop_name;
+
+      execute_command ("loopback", 2, argv);
+
+      grub_free (loop_name);
+    }
 }
 
 static struct option options[] = {

From c294d9d8123c85abaebbc48a169e88f0cff08c39 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 27 Jan 2010 03:11:20 +0000
Subject: [PATCH 0409/1628] 2010-01-27  Robert Millan  <rmh.grub@aybabtu.com>

	Remove unused parameter.

	* fs/iso9660.c (struct grub_iso9660_data): Remove `length' parameter.
	(grub_iso9660_open): Remove initialization of `data->length'.
---
 ChangeLog    | 7 +++++++
 fs/iso9660.c | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c4930acb8..6c79d2b30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-27  Robert Millan  <rmh.grub@aybabtu.com>
+
+	Remove unused parameter.
+
+	* fs/iso9660.c (struct grub_iso9660_data): Remove `length' parameter.
+	(grub_iso9660_open): Remove initialization of `data->length'.
+
 2010-01-27  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* util/grub-fstest.c (fstest): Rewrite allocation, fixing a few
diff --git a/fs/iso9660.c b/fs/iso9660.c
index a8a310f50..cadfbba2b 100644
--- a/fs/iso9660.c
+++ b/fs/iso9660.c
@@ -136,7 +136,6 @@ struct grub_iso9660_data
   struct grub_iso9660_primary_voldesc voldesc;
   grub_disk_t disk;
   unsigned int first_sector;
-  unsigned int length;
   int rockridge;
   int susp_skip;
   int joliet;
@@ -744,7 +743,6 @@ grub_iso9660_open (struct grub_file *file, const char *name)
     goto fail;
 
   data->first_sector = foundnode->blk;
-  data->length = foundnode->size;
 
   file->data = data;
   file->size = foundnode->size;

From 67667b9ced0abf5d0931c551d29a6faab2e1623e Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 27 Jan 2010 03:15:03 +0000
Subject: [PATCH 0410/1628] 2010-01-27  Robert Millan  <rmh.grub@aybabtu.com>

	* kern/disk.c (grub_disk_read): Fix bug that would cause infinite
	loop when using read hooks on files whose size isn't sector-aligned.
---
 ChangeLog   |  5 +++++
 kern/disk.c | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6c79d2b30..e0ee80d22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-27  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* kern/disk.c (grub_disk_read): Fix bug that would cause infinite
+	loop when using read hooks on files whose size isn't sector-aligned.
+
 2010-01-27  Robert Millan  <rmh.grub@aybabtu.com>
 
 	Remove unused parameter.
diff --git a/kern/disk.c b/kern/disk.c
index 544896f2f..075838d1e 100644
--- a/kern/disk.c
+++ b/kern/disk.c
@@ -464,12 +464,14 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
 	      if (disk->read_hook)
 		while (size)
 		  {
+		    grub_size_t to_read = (size > GRUB_DISK_SECTOR_SIZE) ? GRUB_DISK_SECTOR_SIZE : size;
 		    (disk->read_hook) (sector, real_offset,
-				       ((size > GRUB_DISK_SECTOR_SIZE)
-					? GRUB_DISK_SECTOR_SIZE
-					: size));
+				       to_read);
+		    if (grub_errno != GRUB_ERR_NONE)
+		      goto finish;
+
 		    sector++;
-		    size -= GRUB_DISK_SECTOR_SIZE - real_offset;
+		    size -= to_read - real_offset;
 		    real_offset = 0;
 		  }
 

From 27dea7eda42de98a181a799ee52cd74f1cb201bd Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 27 Jan 2010 03:18:14 +0000
Subject: [PATCH 0411/1628] 2010-01-27  Robert Millan  <rmh.grub@aybabtu.com>

	* util/hostfs.c: Include `<errno.h>'.
	(grub_hostfs_read): Handle errors from fseeko() and fread().
---
 ChangeLog     |  5 +++++
 util/hostfs.c | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e0ee80d22..60ce328bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-27  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* util/hostfs.c: Include `<errno.h>'.
+	(grub_hostfs_read): Handle errors from fseeko() and fread().
+
 2010-01-27  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* kern/disk.c (grub_disk_read): Fix bug that would cause infinite
diff --git a/util/hostfs.c b/util/hostfs.c
index df930b42e..501ad4664 100644
--- a/util/hostfs.c
+++ b/util/hostfs.c
@@ -1,7 +1,7 @@
 /* hostfs.c - Dummy filesystem to provide access to the hosts filesystem  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2007,2008,2009,2010  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
@@ -26,6 +26,7 @@
 
 #include <dirent.h>
 #include <stdio.h>
+#include <errno.h>
 
 
 /* dirent.d_type is a BSD extension, not part of POSIX */
@@ -118,10 +119,17 @@ grub_hostfs_read (grub_file_t file, char *buf, grub_size_t len)
   FILE *f;
 
   f = (FILE *) file->data;
-  fseeko (f, file->offset, SEEK_SET);
-  int s = fread (buf, 1, len, f);
+  if (fseeko (f, file->offset, SEEK_SET) != 0)
+    {
+      grub_error (GRUB_ERR_OUT_OF_RANGE, "fseeko: %s", strerror (errno));
+      return -1;
+    }
 
-  return s;
+  unsigned int s = fread (buf, 1, len, f);
+  if (s != len)
+    grub_error (GRUB_ERR_FILE_READ_ERROR, "fread: %s", strerror (errno));
+
+  return (signed) s;
 }
 
 static grub_err_t

From e709ebe2ef8fc4b64fcf092744a3edd6bba2c9eb Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 27 Jan 2010 16:29:21 +0100
Subject: [PATCH 0412/1628] 2010-01-27  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* commands/hashsum.c (hash_file): Avoid possible stack overflow by
	having a 4KiB and not 32KiB buffer size.
---
 ChangeLog          | 5 +++++
 commands/hashsum.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 60ce328bf..aceb55009 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* commands/hashsum.c (hash_file): Avoid possible stack overflow by
+	having a 4KiB and not 32KiB buffer size.
+
 2010-01-27  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* util/hostfs.c: Include `<errno.h>'.
diff --git a/commands/hashsum.c b/commands/hashsum.c
index a4e71b844..951479fa7 100644
--- a/commands/hashsum.c
+++ b/commands/hashsum.c
@@ -57,7 +57,7 @@ static grub_err_t
 hash_file (grub_file_t file, const gcry_md_spec_t *hash, void *result)
 {
   grub_uint8_t context[hash->contextsize];
-  char *readbuf[4096];
+  grub_uint8_t readbuf[4096];
 
   grub_memset (context, 0, sizeof (context));
   hash->init (context);

From 989e1f934b0d612ea9e06d0af61ad0f5586cb2e4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 27 Jan 2010 17:30:03 +0100
Subject: [PATCH 0413/1628] 2010-01-27  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* kern/disk.c (grub_disk_read): Fix offset computation when reading
	last sectors.
---
 ChangeLog   | 5 +++++
 kern/disk.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aceb55009..ba4a7d7e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/disk.c (grub_disk_read): Fix offset computation when reading
+	last sectors.
+
 2010-01-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* commands/hashsum.c (hash_file): Avoid possible stack overflow by
diff --git a/kern/disk.c b/kern/disk.c
index 075838d1e..a01373072 100644
--- a/kern/disk.c
+++ b/kern/disk.c
@@ -441,7 +441,7 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
 
 	      grub_errno = GRUB_ERR_NONE;
 
-	      num = ((size + GRUB_DISK_SECTOR_SIZE - 1)
+	      num = ((size + real_offset + pos + GRUB_DISK_SECTOR_SIZE - 1)
 		     >> GRUB_DISK_SECTOR_BITS);
 
 	      p = grub_realloc (tmp_buf, num << GRUB_DISK_SECTOR_BITS);
@@ -458,7 +458,7 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
 		  goto finish;
 		}
 
-	      grub_memcpy (buf, tmp_buf + real_offset, size);
+	      grub_memcpy (buf, tmp_buf + pos + real_offset, size);
 
 	      /* Call the read hook, if any.  */
 	      if (disk->read_hook)

From 63533ab09361a8a623ec95cecdc20cc098fbca51 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 27 Jan 2010 17:47:36 +0100
Subject: [PATCH 0414/1628] 2010-01-27  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* normal/cmdline.c (grub_cmdline_get): Fix completion in the middle
	of the line.
---
 ChangeLog        |  5 +++++
 normal/cmdline.c | 18 ++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ba4a7d7e3..a7f995e29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* normal/cmdline.c (grub_cmdline_get): Fix completion in the middle
+	of the line.
+
 2010-01-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/disk.c (grub_disk_read): Fix offset computation when reading
diff --git a/normal/cmdline.c b/normal/cmdline.c
index bcffffeab..997965fca 100644
--- a/normal/cmdline.c
+++ b/normal/cmdline.c
@@ -419,10 +419,13 @@ grub_cmdline_get (const char *prompt)
 	    int restore;
 	    char *insertu8;
 	    char *bufu8;
+	    grub_uint32_t c;
 
+	    c = buf[lpos];
 	    buf[lpos] = '\0';
 
 	    bufu8 = grub_ucs4_to_utf8_alloc (buf, lpos);
+	    buf[lpos] = c;
 	    if (!bufu8)
 	      {
 		grub_print_error ();
@@ -462,8 +465,19 @@ grub_cmdline_get (const char *prompt)
 				       insertlen, 0);
 		if (t > 0)
 		  {
-		    insert[t] = 0;
-		    cl_insert (insert);
+		    if (insert[t-1] == ' ' && buf[lpos] == ' ')
+		      {
+			insert[t-1] = 0;
+			if (t != 1)
+			  cl_insert (insert);
+			lpos++;
+			cl_set_pos_all ();			
+		      }
+		    else
+		      {
+			insert[t] = 0;
+			cl_insert (insert);
+		      }
 		  }
 
 		grub_free (insertu8);

From 2e1cb9bbbf3e5d6ee800037b26f9ae9707787d68 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 28 Jan 2010 12:49:40 +0000
Subject: [PATCH 0415/1628] 2010-01-28  Colin Watson  <cjwatson@ubuntu.com>

	* util/grub.d/10_linux.in: This script does not use any of the
	contents of gettext.sh, only the external command `gettext', so stop
	sourcing it.  (Moreover, gettext.sh isn't necessarily installed in
	the same prefix as GRUB.)
	* util/grub.d/10_kfreebsd.in: Likewise.
---
 ChangeLog                  | 8 ++++++++
 util/grub.d/10_kfreebsd.in | 1 -
 util/grub.d/10_linux.in    | 1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a7f995e29..59e46f124 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-28  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub.d/10_linux.in: This script does not use any of the
+	contents of gettext.sh, only the external command `gettext', so stop
+	sourcing it.  (Moreover, gettext.sh isn't necessarily installed in
+	the same prefix as GRUB.)
+	* util/grub.d/10_kfreebsd.in: Likewise.
+
 2010-01-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* normal/cmdline.c (grub_cmdline_get): Fix completion in the middle
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index b84b90a33..62d2fe321 100644
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -22,7 +22,6 @@ bindir=@bindir@
 libdir=@libdir@
 . ${libdir}/grub/grub-mkconfig_lib
 
-. ${bindir}/gettext.sh
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR=@localedir@
 
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 90a6e83e7..b1c75a25b 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -22,7 +22,6 @@ bindir=@bindir@
 libdir=@libdir@
 . ${libdir}/grub/grub-mkconfig_lib
 
-. ${bindir}/gettext.sh
 export TEXTDOMAIN=@PACKAGE@
 export TEXTDOMAINDIR=@localedir@
 

From ec1444e6dffc8bf907439f1e0bd97c1fb53f78f0 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Thu, 28 Jan 2010 15:27:41 +0000
Subject: [PATCH 0416/1628] 2010-01-28  Robert Millan  <rmh.grub@aybabtu.com>

	* Makefile.in (check): Exit with fail status when one of the tests
	fails.
	* tests/example_functional_test.c (example_test): Fix reversed assert.
	* tests/example_unit_test.c (example_test): Likewise.
---
 ChangeLog                       |  7 +++++++
 Makefile.in                     | 10 ++++------
 tests/example_functional_test.c |  2 +-
 tests/example_unit_test.c       |  2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 59e46f124..d40f765a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-28  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* Makefile.in (check): Exit with fail status when one of the tests
+	fails.
+	* tests/example_functional_test.c (example_test): Fix reversed assert.
+	* tests/example_unit_test.c (example_test): Likewise.
+
 2010-01-28  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub.d/10_linux.in: This script does not use any of the
diff --git a/Makefile.in b/Makefile.in
index d0bbe3b25..aa03002f4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -473,23 +473,21 @@ distcheck: dist
 
 check: all $(UNIT_TESTS) $(FUNCTIONAL_TESTS) $(SCRIPTED_TESTS)
 	@list="$(UNIT_TESTS)"; \
+	set -e; \
 	for file in $$list; do \
 	  $(builddir)/$$file; \
 	done
 	@list="$(FUNCTIONAL_TESTS)"; \
+	set -e; \
 	for file in $$list; do \
 	  mod=`basename $$file .mod`; \
 	  echo "insmod functional_test; insmod $$mod; functional_test" \
 	    | $(builddir)/grub-shell; \
 	done
 	@list="$(SCRIPTED_TESTS)"; \
+	set -e; \
 	for file in $$list; do \
-	  echo "$$file:"; \
-	  if $(builddir)/$$file; then \
-	    echo "$$file: PASS"; \
-	  else \
-	    echo "$$file: FAIL"; \
-	  fi; \
+	  $(builddir)/$$file; \
 	done
 
 .SUFFIX:
diff --git a/tests/example_functional_test.c b/tests/example_functional_test.c
index f43c0f1ce..6802d2d53 100644
--- a/tests/example_functional_test.c
+++ b/tests/example_functional_test.c
@@ -28,7 +28,7 @@ example_test (void)
 
   /* Check if 1st argument is true and report with custom error message.  */
   grub_test_assert (2 == 2, "2 equal 2 expected");
-  grub_test_assert (2 == 3, "2 is not equal to %d", 3);
+  grub_test_assert (2 != 3, "2 matches %d", 3);
 }
 
 /* Register example_test method as a functional test.  */
diff --git a/tests/example_unit_test.c b/tests/example_unit_test.c
index 4999f1412..d721a9d0a 100644
--- a/tests/example_unit_test.c
+++ b/tests/example_unit_test.c
@@ -31,7 +31,7 @@ example_test (void)
 
   /* Check if 1st argument is true and report with custom error message.  */
   grub_test_assert (2 == 2, "2 equal 2 expected");
-  grub_test_assert (2 == 3, "2 is not equal to %d", 3);
+  grub_test_assert (2 != 3, "2 matches %d", 3);
 }
 
 /* Register example_test method as a unit test.  */

From 275d6f6bd44f85d2b91a53cfe0622c26034fae8a Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 28 Jan 2010 21:43:28 +0530
Subject: [PATCH 0417/1628] fix grub-script-check

---
 include/grub/script_sh.h |  2 +-
 util/grub-script-check.c | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 0bd14abcd..f6177b02a 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -112,7 +112,7 @@ struct grub_script_cmd_menuentry
   struct grub_script_arglist *arglist;
 
   /* The sourcecode the entry will be generated from.  */
-  char *sourcecode;
+  const char *sourcecode;
 
   /* Options.  XXX: Not used yet.  */
   int options;
diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index 3bfd6a425..5bc5df1c1 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -82,16 +82,8 @@ grub_script_execute_cmdif (struct grub_script_cmd *cmd __attribute__ ((unused)))
 }
 
 grub_err_t
-grub_script_execute_menuentry (struct grub_script_cmd *cmd)
+grub_script_execute_menuentry (struct grub_script_cmd *cmd __attribute__ ((unused)))
 {
-  struct grub_script_cmd_menuentry *menu;
-  menu = (struct grub_script_cmd_menuentry *)cmd;
-
-  if (menu->sourcecode)
-    {
-      grub_free (menu->sourcecode);
-      menu->sourcecode = 0;
-    }
   return 0;
 }
 
@@ -146,6 +138,7 @@ main (int argc, char *argv[])
   auto grub_err_t get_config_line (char **line, int cont);
   grub_err_t get_config_line (char **line, int cont __attribute__ ((unused)))
   {
+    int i;
     char *cmdline = 0;
     size_t len = 0;
     ssize_t read;
@@ -164,6 +157,17 @@ main (int argc, char *argv[])
     if (verbose)
       grub_printf("%s", cmdline);
 
+    for (i = 0; cmdline[i] != '\0'; i++)
+      {
+	/* Replace tabs and carriage returns with spaces.  */
+	if (cmdline[i] == '\t' || cmdline[i] == '\r')
+	  cmdline[i] = ' ';
+
+	/* Replace '\n' with '\0'.  */
+	if (cmdline[i] == '\n')
+	  cmdline[i] = '\0';
+      }
+
     *line = grub_strdup (cmdline);
 
     free (cmdline);

From f45d2663b08b4df452e054261cbf229d9c4779a5 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 28 Jan 2010 21:46:59 +0530
Subject: [PATCH 0418/1628] add changelog

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a7f995e29..c000b38d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-28  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* include/grub/script_sh.h (sourcecode): Add const qualifier.
+	* util/grub-script-check.c (getline): Fix empty lines case.
+
 2010-01-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* normal/cmdline.c (grub_cmdline_get): Fix completion in the middle

From bf7fcba2d7665e01c6bd6f5c2fd9da4ce69d9674 Mon Sep 17 00:00:00 2001
From: Christian Schmitt <chris@ilovelinux.de>
Date: Thu, 28 Jan 2010 23:10:37 +0100
Subject: [PATCH 0419/1628] 2010-01-28  Christian Schmitt 
 <chris@ilovelinux.de>

        * util/ieee1275/grub-install.in: Fix nvsetenv arguments.
---
 ChangeLog                     |  4 ++++
 util/ieee1275/grub-install.in | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4e30a39a8..f0d881599 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-28  Christian Schmitt  <chris@ilovelinux.de>
+
+        * util/ieee1275/grub-install.in: Fix nvsetenv arguments.
+
 2010-01-28  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* include/grub/script_sh.h (sourcecode): Add const qualifier.
diff --git a/util/ieee1275/grub-install.in b/util/ieee1275/grub-install.in
index 9a26b0dca..97c485d55 100644
--- a/util/ieee1275/grub-install.in
+++ b/util/ieee1275/grub-install.in
@@ -46,8 +46,8 @@ install_device=
 debug=no
 update_nvram=yes
 
-ofpathname=/usr/sbin/ofpathname
-nvsetenv=/sbin/nvsetenv
+ofpathname=`which ofpathname`
+nvsetenv=`which nvsetenv`
 
 # Usage: usage
 # Print the usage.
@@ -216,11 +216,11 @@ if test $update_nvram = yes; then
     }
 
     # Point boot-device at the new grub install
-    boot_device="boot-device $ofpath:$partno,\\grub"
-    "$nvsetenv" "$boot_device" || {
+    boot_device="$ofpath:$partno,\\grub"
+    "$nvsetenv" boot-device "$boot_device" || {
 	echo "$nvsetenv failed."
 	echo "You will have to set boot-device manually.  At the Open Firmware prompt, type:"
-	echo "  setenv $boot_device"
+	echo "  setenv boot-device $boot_device"
 	exit 1
     }
 fi

From 61e89d9db65c78389111b5e5e8696145a3eb1b82 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 31 Jan 2010 01:26:11 +0100
Subject: [PATCH 0420/1628] 2010-01-31  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* font/font.c (find_glyph): Check that bmp_idx is available before
	using it.
	(grub_font_get_string_width): Never call grub_font_get_glyph_internal
	with (font == NULL).
---
 ChangeLog   | 7 +++++++
 font/font.c | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f0d881599..eced79d59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* font/font.c (find_glyph): Check that bmp_idx is available before
+	using it.
+	(grub_font_get_string_width): Never call grub_font_get_glyph_internal
+	with (font == NULL).
+
 2010-01-28  Christian Schmitt  <chris@ilovelinux.de>
 
         * util/ieee1275/grub-install.in: Fix nvsetenv arguments.
diff --git a/font/font.c b/font/font.c
index 639f4d720..16f2ed35b 100644
--- a/font/font.c
+++ b/font/font.c
@@ -668,7 +668,7 @@ find_glyph (const grub_font_t font, grub_uint32_t code)
   table = font->char_index;
 
   /* Use BMP index if possible.  */
-  if (code < 0x10000)
+  if (code < 0x10000 && font->bmp_idx)
     {
       if (font->bmp_idx[code] == 0xffff)
 	return 0;
@@ -942,8 +942,9 @@ grub_font_get_string_width (grub_font_t font, const char *str)
 struct grub_font_glyph *
 grub_font_get_glyph (grub_font_t font, grub_uint32_t code)
 {
-  struct grub_font_glyph *glyph;
-  glyph = grub_font_get_glyph_internal (font, code);
+  struct grub_font_glyph *glyph = 0;
+  if (font)
+    glyph = grub_font_get_glyph_internal (font, code);
   if (glyph == 0)
     {
       glyph = ascii_glyph_lookup (code);

From fbab7b0794256f5b44c5f9769ea272e55cb6bcc1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 31 Jan 2010 01:57:17 +0100
Subject: [PATCH 0421/1628] Framebuffer on PowerPC-based macs

---
 conf/powerpc-ieee1275.rmk        |   5 +
 include/grub/ieee1275/ieee1275.h |   4 +
 kern/ieee1275/openfw.c           |  23 ++-
 video/ieee1275.c                 | 298 +++++++++++++++++++++++++++++++
 4 files changed, 327 insertions(+), 3 deletions(-)
 create mode 100644 video/ieee1275.c

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 23bd2d620..8622293ab 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -70,6 +70,11 @@ boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
 boot_mod_CFLAGS = $(COMMON_CFLAGS)
 boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += ieee1275_fb.mod 
+ieee1275_fb_mod_SOURCES = video/ieee1275.c
+ieee1275_fb_mod_CFLAGS = $(COMMON_CFLAGS)
+ieee1275_fb_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # For linux.mod.
 linux_mod_SOURCES = loader/powerpc/ieee1275/linux.c
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
index 8b31e32e2..2aad199da 100644
--- a/include/grub/ieee1275/ieee1275.h
+++ b/include/grub/ieee1275/ieee1275.h
@@ -176,4 +176,8 @@ int EXPORT_FUNC(grub_claimmap) (grub_addr_t addr, grub_size_t size);
 char *EXPORT_FUNC(grub_ieee1275_encode_devname) (const char *path);
 char *EXPORT_FUNC(grub_ieee1275_get_filename) (const char *path);
 
+int EXPORT_FUNC(grub_ieee1275_devices_iterate) (int (*hook)
+						(struct grub_ieee1275_devalias *
+						 alias));
+
 #endif /* ! GRUB_IEEE1275_HEADER */
diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index 5f0aad119..684680231 100644
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -72,7 +72,7 @@ grub_children_iterate (char *devpath,
 
       if (grub_ieee1275_get_property (child, "device_type", childtype,
 				      IEEE1275_MAX_PROP_LEN, &actual))
-	continue;
+	childtype[0] = 0;
 
       if (grub_ieee1275_package_to_path (child, childpath,
 					 IEEE1275_MAX_PATH_LEN, &actual))
@@ -82,7 +82,10 @@ grub_children_iterate (char *devpath,
 				      IEEE1275_MAX_PROP_LEN, &actual))
 	continue;
 
-      fullname = grub_xasprintf ("%s/%s", devpath, childname);
+      if (devpath[0] == '/' && devpath[1] == 0)
+	fullname = grub_xasprintf ("/%s", childname);
+      else
+	fullname = grub_xasprintf ("%s/%s", devpath, childname);
       if (!fullname)
 	{
 	  grub_free (childname);
@@ -99,7 +102,7 @@ grub_children_iterate (char *devpath,
       if (ret)
 	break;
     }
-  while (grub_ieee1275_peer (child, &child));
+  while (grub_ieee1275_peer (child, &child) != -1);
 
   grub_free (childname);
   grub_free (childpath);
@@ -108,6 +111,20 @@ grub_children_iterate (char *devpath,
   return ret;
 }
 
+int
+grub_ieee1275_devices_iterate (int (*hook) (struct grub_ieee1275_devalias *alias))
+{
+  auto int it_through (struct grub_ieee1275_devalias *alias);
+  int it_through (struct grub_ieee1275_devalias *alias)
+  {
+    if (hook (alias))
+      return 1;
+    return grub_children_iterate (alias->name, it_through);
+  }
+
+  return grub_children_iterate ("/", it_through);
+}
+
 /* Iterate through all device aliases.  This function can be used to
    find a device of a specific type.  */
 int
diff --git a/video/ieee1275.c b/video/ieee1275.c
new file mode 100644
index 000000000..a9fc16a0f
--- /dev/null
+++ b/video/ieee1275.c
@@ -0,0 +1,298 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2005,2006,2007,2008,2009  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/>.
+ */
+
+#define grub_video_render_target grub_video_fbrender_target
+
+#include <grub/err.h>
+#include <grub/types.h>
+#include <grub/dl.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/video.h>
+#include <grub/video_fb.h>
+#include <grub/ieee1275/ieee1275.h>
+
+/* Only 8-bit indexed color is supported for now.  */
+
+static unsigned old_width, old_height;
+static int restore_needed;
+static char *display;
+
+static struct
+{
+  struct grub_video_mode_info mode_info;
+  struct grub_video_render_target *render_target;
+  grub_uint8_t *ptr;
+} framebuffer;
+
+static grub_err_t
+grub_video_ieee1275_set_palette (unsigned int start, unsigned int count,
+				 struct grub_video_palette_data *palette_data);
+
+static void
+set_video_mode (unsigned width __attribute__ ((unused)),
+		unsigned height __attribute__ ((unused)))
+{
+  /* TODO */
+}
+
+static void
+find_display (void)
+{
+  auto int hook (struct grub_ieee1275_devalias *alias);
+  int hook (struct grub_ieee1275_devalias *alias)
+  {
+    if (grub_strcmp (alias->type, "display") == 0)
+      {
+	grub_dprintf ("video", "Found display %s\n", alias->name);
+	display = grub_strdup (alias->name);
+	return 1;
+      }
+    return 0;
+  }
+  
+  grub_ieee1275_devices_iterate (hook);
+}
+
+static grub_err_t
+grub_video_ieee1275_init (void)
+{
+  grub_memset (&framebuffer, 0, sizeof(framebuffer));
+  return grub_video_fb_init ();
+}
+
+static grub_err_t
+grub_video_ieee1275_fini (void)
+{
+  if (restore_needed)
+    {
+      set_video_mode (old_width, old_height);
+      restore_needed = 0;
+    }
+  return grub_video_fb_fini ();
+}
+
+static grub_err_t
+grub_video_ieee1275_fill_mode_info (grub_ieee1275_phandle_t dev,
+				    struct grub_video_mode_info *out)
+{
+  grub_uint32_t tmp;
+
+  grub_memset (out, 0, sizeof (*out));
+
+  if (grub_ieee1275_get_integer_property (dev, "width", &tmp,
+					  sizeof (tmp), 0))
+    return grub_error (GRUB_ERR_IO, "Couldn't retrieve display width.");
+  out->width = tmp;
+
+  if (grub_ieee1275_get_integer_property (dev, "height", &tmp,
+					  sizeof (tmp), 0))
+    return grub_error (GRUB_ERR_IO, "Couldn't retrieve display height.");
+  out->height = tmp;
+
+  if (grub_ieee1275_get_integer_property (dev, "linebytes", &tmp,
+					  sizeof (tmp), 0))
+    return grub_error (GRUB_ERR_IO, "Couldn't retrieve display pitch.");
+  out->pitch = tmp;
+
+  out->mode_type = GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
+  out->bpp = 8;
+  out->bytes_per_pixel = 1;
+  out->number_of_colors = 256;
+
+  out->blit_format = grub_video_get_blit_format (out);
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_video_ieee1275_setup (unsigned int width, unsigned int height,
+			   unsigned int mode_type __attribute__ ((unused)),
+			   unsigned int mode_mask __attribute__ ((unused)))
+{
+  grub_uint32_t current_width, current_height, address;
+  grub_err_t err;
+  grub_ieee1275_phandle_t dev;
+
+  if (!display)
+    return grub_error (GRUB_ERR_IO, "Couldn't find display device.");
+
+  if (grub_ieee1275_finddevice (display, &dev))
+    return grub_error (GRUB_ERR_IO, "Couldn't open display device.");
+
+  if (grub_ieee1275_get_integer_property (dev, "width", &current_width,
+					  sizeof (current_width), 0))
+    return grub_error (GRUB_ERR_IO, "Couldn't retrieve display width.");
+
+  if (grub_ieee1275_get_integer_property (dev, "height", &current_height,
+					  sizeof (current_width), 0))
+    return grub_error (GRUB_ERR_IO, "Couldn't retrieve display height.");
+
+  if ((width == current_width && height == current_height)
+      || (width == 0 && height == 0))
+    {
+      grub_dprintf ("video", "IEEE1275: keeping current mode %dx%d\n",
+		    current_width, current_height);
+    }
+  else
+    {
+      grub_dprintf ("video", "IEEE1275: Setting mode %dx%d\n", width, height);
+      /* TODO. */
+    }
+  
+  err = grub_video_ieee1275_fill_mode_info (dev, &framebuffer.mode_info);
+  if (err)
+    {
+      grub_dprintf ("video", "IEEE1275: couldn't fill mode info\n");
+      return err;
+    }
+
+  if (grub_ieee1275_get_integer_property (dev, "address", &address,
+					  sizeof (address), 0))
+    return grub_error (GRUB_ERR_IO, "Couldn't retrieve display address.");
+
+  framebuffer.ptr = (void *) address;
+
+  grub_video_ieee1275_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
+				   grub_video_fbstd_colors);
+
+  grub_dprintf ("video", "IEEE1275: initialising FB @ %p %dx%dx%d\n",
+		framebuffer.ptr, framebuffer.mode_info.width,
+		framebuffer.mode_info.height, framebuffer.mode_info.bpp);
+  
+  err = grub_video_fb_create_render_target_from_pointer 
+    (&framebuffer.render_target, &framebuffer.mode_info, framebuffer.ptr);
+
+  if (err)
+    {
+      grub_dprintf ("video", "IEEE1275: Couldn't create FB target\n");
+      return err;
+    }
+  
+  err = grub_video_fb_set_active_render_target (framebuffer.render_target);
+  
+  if (err)
+    {
+      grub_dprintf ("video", "IEEE1275: Couldn't set FB target\n");
+      return err;
+    }
+  
+  err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
+				   grub_video_fbstd_colors);
+
+  if (err)
+    grub_dprintf ("video", "IEEE1275: Couldn't set palette\n");
+  else
+    grub_dprintf ("video", "IEEE1275: Success\n");
+  
+  return err;
+}
+
+static grub_err_t
+grub_video_ieee1275_swap_buffers (void)
+{
+  /* TODO: Implement buffer swapping.  */
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_video_ieee1275_set_active_render_target (struct grub_video_render_target *target)
+{
+  if (target == GRUB_VIDEO_RENDER_TARGET_DISPLAY)
+    target = framebuffer.render_target;
+
+  return grub_video_fb_set_active_render_target (target);
+}
+
+static grub_err_t
+grub_video_ieee1275_get_info_and_fini (struct grub_video_mode_info *mode_info,
+				  void **framebuf)
+{
+  grub_memcpy (mode_info, &(framebuffer.mode_info), sizeof (*mode_info));
+  *framebuf = (char *) framebuffer.ptr;
+
+  grub_video_fb_fini ();
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_video_ieee1275_set_palette (unsigned int start, unsigned int count,
+				 struct grub_video_palette_data *palette_data)
+{
+  grub_err_t err;
+  struct grub_video_palette_data fb_palette_data[256];
+
+  err = grub_video_fb_set_palette (start, count, palette_data);
+  if (err)
+    return err;
+
+  grub_video_fb_get_palette (0, 256, fb_palette_data);
+
+  /* TODO. */
+
+  return GRUB_ERR_NONE;
+}
+
+static struct grub_video_adapter grub_video_ieee1275_adapter =
+  {
+    .name = "IEEE1275 video driver",
+
+    .init = grub_video_ieee1275_init,
+    .fini = grub_video_ieee1275_fini,
+    .setup = grub_video_ieee1275_setup,
+    .get_info = grub_video_fb_get_info,
+    .get_info_and_fini = grub_video_ieee1275_get_info_and_fini,
+    .set_palette = grub_video_ieee1275_set_palette,
+    .get_palette = grub_video_fb_get_palette,
+    .set_viewport = grub_video_fb_set_viewport,
+    .get_viewport = grub_video_fb_get_viewport,
+    .map_color = grub_video_fb_map_color,
+    .map_rgb = grub_video_fb_map_rgb,
+    .map_rgba = grub_video_fb_map_rgba,
+    .unmap_color = grub_video_fb_unmap_color,
+    .fill_rect = grub_video_fb_fill_rect,
+    .blit_bitmap = grub_video_fb_blit_bitmap,
+    .blit_render_target = grub_video_fb_blit_render_target,
+    .scroll = grub_video_fb_scroll,
+    .swap_buffers = grub_video_ieee1275_swap_buffers,
+    .create_render_target = grub_video_fb_create_render_target,
+    .delete_render_target = grub_video_fb_delete_render_target,
+    .set_active_render_target = grub_video_ieee1275_set_active_render_target,
+    .get_active_render_target = grub_video_fb_get_active_render_target,
+
+    .next = 0
+  };
+
+GRUB_MOD_INIT(ieee1275_fb)
+{
+  find_display ();
+  if (display)
+    grub_video_register (&grub_video_ieee1275_adapter);
+}
+
+GRUB_MOD_FINI(ieee1275_fb)
+{
+  if (restore_needed)
+    {
+      set_video_mode (old_width, old_height);
+      restore_needed = 0;
+    }
+  if (display)
+    grub_video_unregister (&grub_video_ieee1275_adapter);
+  grub_free (display);
+}

From 3b205d4ddf7c61363f9868dba14e8b95c22c95b4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 31 Jan 2010 11:11:03 +0100
Subject: [PATCH 0422/1628] 2010-01-31  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* disk/ieee1275/ofdisk.c (grub_ofdisk_iterate): Fix off-by-one error.
---
 ChangeLog              | 4 ++++
 disk/ieee1275/ofdisk.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index eced79d59..4598e1b74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* disk/ieee1275/ofdisk.c (grub_ofdisk_iterate): Fix off-by-one error.
+
 2010-01-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* font/font.c (find_glyph): Check that bmp_idx is available before
diff --git a/disk/ieee1275/ofdisk.c b/disk/ieee1275/ofdisk.c
index c8c4d1a4e..051ece0b9 100644
--- a/disk/ieee1275/ofdisk.c
+++ b/disk/ieee1275/ofdisk.c
@@ -118,7 +118,7 @@ grub_ofdisk_iterate (int (*hook) (const char *name))
 static char *
 compute_dev_path (const char *name)
 {
-  char *devpath = grub_malloc (grub_strlen (name) + 2);
+  char *devpath = grub_malloc (grub_strlen (name) + 3);
   char *p, c;
 
   if (!devpath)

From b9c4f55b6fb10c07d96c4dd983d3e58a4ba09504 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sun, 31 Jan 2010 19:37:37 +0000
Subject: [PATCH 0423/1628] handle DM-RAID disks in
 convert_system_partition_to_system_disk

---
 ChangeLog.dmraid-probe |  2 +-
 util/hostdisk.c        | 25 +++++++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/ChangeLog.dmraid-probe b/ChangeLog.dmraid-probe
index 505cf7ba4..c52436bb5 100644
--- a/ChangeLog.dmraid-probe
+++ b/ChangeLog.dmraid-probe
@@ -1,4 +1,4 @@
-2010-01-26  Colin Watson  <cjwatson@ubuntu.com>
+2010-01-31  Colin Watson  <cjwatson@ubuntu.com>
 
 	* configure.ac: Check for Linux device-mapper support.
 
diff --git a/util/hostdisk.c b/util/hostdisk.c
index 309e112bf..464977978 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -937,7 +937,7 @@ convert_system_partition_to_system_disk (const char *os_dev, struct stat *st)
 	  uint32_t maj, min;
 	  struct dm_tree_node *node, *child;
 	  void *handle;
-	  const char *node_uuid, *child_uuid, *child_name;
+	  const char *node_uuid, *mapper_name, *child_uuid, *child_name;
 
 	  if (! tree)
 	    tree = dm_tree_create ();
@@ -975,6 +975,7 @@ convert_system_partition_to_system_disk (const char *os_dev, struct stat *st)
 	    }
 
 	  handle = NULL;
+	  mapper_name = NULL;
 	  /* Counter-intuitively, device-mapper refers to the disk-like
 	     device containing a DM-RAID partition device as a "child" of
 	     the partition device.  */
@@ -982,27 +983,39 @@ convert_system_partition_to_system_disk (const char *os_dev, struct stat *st)
 	  if (! child)
 	    {
 	      grub_dprintf ("hostdisk", "%s has no DM children\n", path);
-	      return NULL;
+	      goto devmapper_out;
 	    }
 	  child_uuid = dm_tree_node_get_uuid (child);
 	  if (! child_uuid)
 	    {
 	      grub_dprintf ("hostdisk", "%s child has no DM uuid\n", path);
-	      return NULL;
+	      goto devmapper_out;
 	    }
 	  else if (strncmp (child_uuid, "DMRAID-", 7) != 0)
 	    {
 	      grub_dprintf ("hostdisk", "%s child is not DM-RAID\n", path);
-	      return NULL;
+	      goto devmapper_out;
 	    }
 	  child_name = dm_tree_node_get_name (child);
 	  if (! child_name)
 	    {
 	      grub_dprintf ("hostdisk", "%s child has no DM name\n", path);
-	      return NULL;
+	      goto devmapper_out;
 	    }
+	  mapper_name = child_name;
 
-	  return xasprintf ("/dev/mapper/%s", child_name);
+devmapper_out:
+	  if (! mapper_name)
+	    {
+	      /* This is a DM-RAID disk, not a partition.  */
+	      mapper_name = dm_tree_node_get_name (node);
+	      if (! mapper_name)
+		{
+		  grub_dprintf ("hostdisk", "%s has no DM name\n", path);
+		  return NULL;
+		}
+	    }
+	  return xasprintf ("/dev/mapper/%s", mapper_name);
 	}
 #endif /* HAVE_DEVICE_MAPPER */
     }

From 996649b073c98b4f13d2908cf887f4bd52d2ce5f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 3 Feb 2010 00:43:55 +0100
Subject: [PATCH 0424/1628] 2010-02-03  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* disk/i386/pc/biosdisk.c (grub_biosdisk_read): Handle non-2048 aligned
	CDROM reads.
	(grub_biosdisk_write): Refuse to write to CDROM.
---
 ChangeLog               |  6 ++++++
 disk/i386/pc/biosdisk.c | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 4598e1b74..83d0c58a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* disk/i386/pc/biosdisk.c (grub_biosdisk_read): Handle non-2048 aligned
+	CDROM reads.
+	(grub_biosdisk_write): Refuse to write to CDROM.
+
 2010-01-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* disk/ieee1275/ofdisk.c (grub_ofdisk_iterate): Fix off-by-one error.
diff --git a/disk/i386/pc/biosdisk.c b/disk/i386/pc/biosdisk.c
index 682474b1a..94d0e3708 100644
--- a/disk/i386/pc/biosdisk.c
+++ b/disk/i386/pc/biosdisk.c
@@ -307,8 +307,17 @@ grub_biosdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
   while (size)
     {
       grub_size_t len;
+      grub_size_t cdoff = 0;
 
       len = get_safe_sectors (sector, data->sectors);
+
+      if (data->flags & GRUB_BIOSDISK_FLAG_CDROM)
+	{
+	  cdoff = (sector & 3) << GRUB_DISK_SECTOR_BITS;
+	  len = ALIGN_UP (sector + len, 4) - (sector & ~3);
+	  sector &= ~3;
+	}
+
       if (len > size)
 	len = size;
 
@@ -316,7 +325,7 @@ grub_biosdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
 			    GRUB_MEMORY_MACHINE_SCRATCH_SEG))
 	return grub_errno;
 
-      grub_memcpy (buf, (void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR,
+      grub_memcpy (buf, (void *) (GRUB_MEMORY_MACHINE_SCRATCH_ADDR + cdoff),
 		   len << GRUB_DISK_SECTOR_BITS);
       buf += len << GRUB_DISK_SECTOR_BITS;
       sector += len;
@@ -332,6 +341,9 @@ grub_biosdisk_write (grub_disk_t disk, grub_disk_addr_t sector,
 {
   struct grub_biosdisk_data *data = disk->data;
 
+  if (data->flags & GRUB_BIOSDISK_FLAG_CDROM)
+    return grub_error (GRUB_ERR_IO, "can't write to CDROM");
+
   while (size)
     {
       grub_size_t len;

From 399f6e4d9cf9c1a3aedf2a113f81680e03395c08 Mon Sep 17 00:00:00 2001
From: Torsten Landschoff <torsten@debian.org>
Date: Wed, 3 Feb 2010 00:46:55 +0100
Subject: [PATCH 0425/1628] 2010-02-03  Torsten Landschoff  
 <torsten@debian.org>

	* kern/disk.c (grub_disk_read): Fix offset computation when reading
	last sectors.
---
 ChangeLog   | 5 +++++
 kern/disk.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83d0c58a8..d7ae963dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-03  Torsten Landschoff   <torsten@debian.org>
+
+	* kern/disk.c (grub_disk_read): Fix offset computation when reading
+	last sectors.
+
 2010-02-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* disk/i386/pc/biosdisk.c (grub_biosdisk_read): Handle non-2048 aligned
diff --git a/kern/disk.c b/kern/disk.c
index a01373072..5c30e1727 100644
--- a/kern/disk.c
+++ b/kern/disk.c
@@ -441,7 +441,7 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
 
 	      grub_errno = GRUB_ERR_NONE;
 
-	      num = ((size + real_offset + pos + GRUB_DISK_SECTOR_SIZE - 1)
+	      num = ((size + real_offset + GRUB_DISK_SECTOR_SIZE - 1)
 		     >> GRUB_DISK_SECTOR_BITS);
 
 	      p = grub_realloc (tmp_buf, num << GRUB_DISK_SECTOR_BITS);
@@ -458,7 +458,7 @@ grub_disk_read (grub_disk_t disk, grub_disk_addr_t sector,
 		  goto finish;
 		}
 
-	      grub_memcpy (buf, tmp_buf + pos + real_offset, size);
+	      grub_memcpy (buf, tmp_buf + real_offset, size);
 
 	      /* Call the read hook, if any.  */
 	      if (disk->read_hook)

From 2b4068e99251e7e6e123b8440375b6f64fe73291 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 3 Feb 2010 00:49:35 +0100
Subject: [PATCH 0426/1628] 2010-02-03  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* util/hostdisk.c (open_device): Don't use partition device when reading
	before the partition.
	(grub_util_biosdisk_read): Don't read from partition and before the
	partition in single operation.
	(grub_util_biosdisk_write): Don't write to partition and before the
	partition in single operation.
---
 ChangeLog       |  9 +++++++++
 util/hostdisk.c | 37 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d7ae963dd..54a51afc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/hostdisk.c (open_device): Don't use partition device when reading
+	before the partition.
+	(grub_util_biosdisk_read): Don't read from partition and before the
+	partition in single operation.
+	(grub_util_biosdisk_write): Don't write to partition and before the
+	partition in single operation.
+
 2010-02-03  Torsten Landschoff   <torsten@debian.org>
 
 	* kern/disk.c (grub_disk_read): Fix offset computation when reading
diff --git a/util/hostdisk.c b/util/hostdisk.c
index a594f75ec..5c56b7579 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -336,7 +336,8 @@ open_device (const grub_disk_t disk, grub_disk_addr_t sector, int flags)
     char dev[PATH_MAX];
 
     strcpy (dev, map[disk->id].device);
-    if (disk->partition && strncmp (map[disk->id].device, "/dev/", 5) == 0)
+    if (disk->partition && sector >= disk->partition->start
+	&& strncmp (map[disk->id].device, "/dev/", 5) == 0)
       is_partition = linux_find_partition (dev, disk->partition->start);
 
     /* Open the partition.  */
@@ -490,6 +491,23 @@ grub_util_biosdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
 {
   int fd;
 
+  /* Split pre-partition and partition reads.  */
+  if (disk->partition && sector < disk->partition->start
+      && sector + size > disk->partition->start)
+    {
+      grub_err_t err;
+      err = grub_util_biosdisk_read (disk, sector,
+				     disk->partition->start - sector,
+				     buf);
+      if (err)
+	return err;
+
+      return grub_util_biosdisk_read (disk, disk->partition->start,
+				      size - (disk->partition->start - sector),
+				      buf + ((disk->partition->start - sector)
+					     << GRUB_DISK_SECTOR_BITS));
+    }
+
   fd = open_device (disk, sector, O_RDONLY);
   if (fd < 0)
     return grub_errno;
@@ -527,6 +545,23 @@ grub_util_biosdisk_write (grub_disk_t disk, grub_disk_addr_t sector,
 {
   int fd;
 
+  /* Split pre-partition and partition writes.  */
+  if (disk->partition && sector < disk->partition->start
+      && sector + size > disk->partition->start)
+    {
+      grub_err_t err;
+      err = grub_util_biosdisk_write (disk, sector,
+				      disk->partition->start - sector,
+				      buf);
+      if (err)
+	return err;
+
+      return grub_util_biosdisk_write (disk, disk->partition->start,
+				       size - (disk->partition->start - sector),
+				       buf + ((disk->partition->start - sector)
+					      << GRUB_DISK_SECTOR_BITS));
+    }
+
   fd = open_device (disk, sector, O_WRONLY);
   if (fd < 0)
     return grub_errno;

From 98f5714739f9978b4e2c16941ba0b75a9b9bb826 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 3 Feb 2010 01:34:55 +0100
Subject: [PATCH 0427/1628] Fix mips compilation

---
 conf/mips-yeeloong.rmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 964f29384..eb0dc9676 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -21,7 +21,7 @@ kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
 	font/font_cmd.c font/font.c io/bufio.c \
 	video/video.c video/fb/video_fb.c video/fb/fbblit.c \
 	video/fb/fbfill.c video/fb/fbutil.c video/bitmap.c \
-	video/sm712.c bus/pci.c bus/bonito.c \
+	video/bitmap_scale.c video/sm712.c bus/pci.c bus/bonito.c \
 	term/gfxterm.c commands/extcmd.c lib/arg.c \
 	symlist.c
 kernel_img_CFLAGS = $(COMMON_CFLAGS) -DUSE_ASCII_FAILBACK

From a800277e8d63dbab8de3f8bd2e8c56ad3e9d5778 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 5 Feb 2010 09:08:22 -0800
Subject: [PATCH 0428/1628] remove left-over LIBDEVMAPPER substitution

---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 4f1a6dffe..8e412f001 100644
--- a/configure.ac
+++ b/configure.ac
@@ -673,7 +673,6 @@ if test x"$device_mapper_excuse" = x ; then
                 AC_DEFINE([HAVE_DEVICE_MAPPER], [1],
                           [Define to 1 if you have the devmapper library.])],
                [device_mapper_excuse="need devmapper library"])
-  AC_SUBST([LIBDEVMAPPER])
 fi
 
 AC_SUBST(ASFLAGS)

From 473fc1a0623169dba7025ad5dbeccab4d02d28ac Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 5 Feb 2010 21:02:24 +0100
Subject: [PATCH 0429/1628] Make mips/relocator_asm.S more readable

---
 lib/mips/relocator_asm.S | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/mips/relocator_asm.S b/lib/mips/relocator_asm.S
index 8ffab99b7..3408b59e1 100644
--- a/lib/mips/relocator_asm.S
+++ b/lib/mips/relocator_asm.S
@@ -27,9 +27,9 @@ VARIABLE (grub_relocator_forward_start)
 copycont1:	
 	lb $11,0($8)
 	sb $11,0($9)
-	addiu $8, $8, 0x1
-	addiu $9, $9, 0x1
-	addiu $10, $10, 0xffff
+	addiu $8, $8, 1
+	addiu $9, $9, 1
+	addiu $10, $10, -1
 	bne $10, $0, copycont1
 
 #include "../../kern/mips/cache_flush.S"
@@ -43,14 +43,14 @@ VARIABLE (grub_relocator_backward_start)
 	addu $9, $9, $10
 	addu $8, $8, $10
 	/* Backward movsl is implicitly off-by-one.  compensate that.  */
-	addiu $9, $9, 0xffff
-	addiu $8, $8, 0xffff
+	addiu $9, $9, -1
+	addiu $8, $8, -1
 copycont2:	
 	lb $11,0($8)
 	sb $11,0($9)
-	addiu $8, $8, 0xffff
-	addiu $9, $9, 0xffff
-	addiu $10, 0xffff
+	addiu $8, $8, -1
+	addiu $9, $9, -1
+	addiu $10, $10, -1
 	bne $10, $0, copycont2
 
 #include "../../kern/mips/cache_flush.S"

From 58b78c121d96defe92ea8e60fe6b730cbd0f496d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 5 Feb 2010 23:04:09 +0100
Subject: [PATCH 0430/1628] error on unsupported resolution

---
 video/ieee1275.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/video/ieee1275.c b/video/ieee1275.c
index a9fc16a0f..21b65bd32 100644
--- a/video/ieee1275.c
+++ b/video/ieee1275.c
@@ -152,6 +152,7 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height,
     {
       grub_dprintf ("video", "IEEE1275: Setting mode %dx%d\n", width, height);
       /* TODO. */
+      return grub_error (GRUB_ERR_IO, "can't set mode %dx%d", width, height);
     }
   
   err = grub_video_ieee1275_fill_mode_info (dev, &framebuffer.mode_info);

From 4f8528fc2b30a7ef05f7896f54cec961ce49276b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 00:30:25 +0100
Subject: [PATCH 0431/1628] 2010-02-06  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* kern/ieee1275/openfw.c (grub_devalias_iterate): Stop iterating on
	error.
---
 ChangeLog              | 5 +++++
 kern/ieee1275/openfw.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 54a51afc0..d92d92117 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/ieee1275/openfw.c (grub_devalias_iterate): Stop iterating on
+	error.
+
 2010-02-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/hostdisk.c (open_device): Don't use partition device when reading
diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index 5f0aad119..39432c584 100644
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -135,7 +135,7 @@ grub_devalias_iterate (int (*hook) (struct grub_ieee1275_devalias *alias))
   /* Find the first property.  */
   aliasname[0] = '\0';
 
-  while (grub_ieee1275_next_property (aliases, aliasname, aliasname))
+  while (grub_ieee1275_next_property (aliases, aliasname, aliasname) > 0)
     {
       grub_ieee1275_phandle_t dev;
       grub_ssize_t pathlen;

From 5562834e18004d4639dc6bcf1b9a20d925d9869c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 00:32:07 +0100
Subject: [PATCH 0432/1628] 2010-02-06  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* kern/ieee1275/openfw.c (grub_ieee1275_encode_devname): Support whole
	disk devices.
---
 ChangeLog              | 5 +++++
 kern/ieee1275/openfw.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d92d92117..e2a8f7575 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/ieee1275/openfw.c (grub_ieee1275_encode_devname): Support whole
+	disk devices.
+
 2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/ieee1275/openfw.c (grub_devalias_iterate): Stop iterating on
diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index 39432c584..dd9a9138f 100644
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -374,7 +374,7 @@ grub_ieee1275_encode_devname (const char *path)
   char *partition = grub_ieee1275_parse_args (path, GRUB_PARSE_PARTITION);
   char *encoding;
 
-  if (partition)
+  if (partition && partition[0])
     {
       unsigned int partno = grub_strtoul (partition, 0, 0);
 

From d1de6ed1dc4eb9783e3dfd2f08d0cb0c2d40b82d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 00:33:20 +0100
Subject: [PATCH 0433/1628] First compiling newreloc for ppc (not yet tested)

---
 conf/powerpc-ieee1275.rmk        |   7 ++
 include/grub/powerpc/relocator.h |  37 ++++++++
 kern/powerpc/cache.S             |  26 +-----
 kern/powerpc/cache_flush.S       |  43 ++++++++++
 lib/powerpc/relocator.c          | 141 +++++++++++++++++++++++++++++++
 lib/powerpc/relocator_asm.S      |  60 +++++++++++++
 6 files changed, 290 insertions(+), 24 deletions(-)
 create mode 100644 include/grub/powerpc/relocator.h
 create mode 100644 kern/powerpc/cache_flush.S
 create mode 100644 lib/powerpc/relocator.c
 create mode 100644 lib/powerpc/relocator_asm.S

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 2a3334a4f..91f705bb4 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -100,4 +100,11 @@ lsmmap_mod_SOURCES = commands/lsmmap.c
 lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
 lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For relocator.mod.
+pkglib_MODULES += relocator.mod
+relocator_mod_SOURCES = lib/$(target_cpu)/relocator.c lib/relocator.c lib/$(target_cpu)/relocator_asm.S
+relocator_mod_CFLAGS = $(COMMON_CFLAGS)
+relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
+relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 include $(srcdir)/conf/common.mk
diff --git a/include/grub/powerpc/relocator.h b/include/grub/powerpc/relocator.h
new file mode 100644
index 000000000..c2780bbca
--- /dev/null
+++ b/include/grub/powerpc/relocator.h
@@ -0,0 +1,37 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009,2010  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/>.
+ */
+
+#ifndef GRUB_RELOCATOR_CPU_HEADER
+#define GRUB_RELOCATOR_CPU_HEADER	1
+
+#include <grub/types.h>
+#include <grub/err.h>
+#include <grub/relocator.h>
+
+#define GRUB_PPC_JUMP_REGISTER 31
+
+struct grub_relocator32_state
+{
+  grub_uint32_t gpr[32];
+};
+
+grub_err_t
+grub_relocator32_boot (struct grub_relocator *rel,
+		       struct grub_relocator32_state state);
+
+#endif /* ! GRUB_RELOCATOR_CPU_HEADER */
diff --git a/kern/powerpc/cache.S b/kern/powerpc/cache.S
index da982afa0..d85e68d42 100644
--- a/kern/powerpc/cache.S
+++ b/kern/powerpc/cache.S
@@ -1,7 +1,7 @@
 /* cache.S - Flush the processor cache for a specific region.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2004,2007  Free Software Foundation, Inc.
+ *  Copyright (C) 2004,2007,2010  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
@@ -17,32 +17,10 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define CACHE_LINE_BYTES 32
-
 	.text
 
 	.align 2
 	.globl grub_arch_sync_caches
 grub_arch_sync_caches:
-	/* `address' may not be CACHE_LINE_BYTES-aligned.  */
-	andi. 6, 3, CACHE_LINE_BYTES - 1 /* Find the misalignment.  */
-	add 4, 4, 6 /* Adjust `size' to compensate.  */
-
-	/* Force the dcache lines to memory.  */
-	li 5, 0
-1:	dcbst 5, 3
-	addi 5, 5, CACHE_LINE_BYTES
-	cmpw 5, 4
-	blt 1b
-	sync            /* Force all dcbsts to complete.  */
-
-	/* Invalidate the icache lines.  */
-	li 5, 0
-1:	icbi 5, 3
-	addi 5, 5, CACHE_LINE_BYTES
-	cmpw 5, 4
-	blt 1b
-	sync            /* Force all icbis to complete.  */
-	isync           /* Discard partially executed instructions that were
-		           loaded from the invalid icache.  */
+#include "cache_flush.S"
 	blr
diff --git a/kern/powerpc/cache_flush.S b/kern/powerpc/cache_flush.S
new file mode 100644
index 000000000..1410f78b1
--- /dev/null
+++ b/kern/powerpc/cache_flush.S
@@ -0,0 +1,43 @@
+/* cache.S - Flush the processor cache for a specific region.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2004,2007,2010  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/>.
+ */
+
+#undef CACHE_LINE_BYTES
+#define CACHE_LINE_BYTES 32
+
+	/* `address' may not be CACHE_LINE_BYTES-aligned.  */
+	andi. 6, 3, CACHE_LINE_BYTES - 1 /* Find the misalignment.  */
+	add 4, 4, 6 /* Adjust `size' to compensate.  */
+
+	/* Force the dcache lines to memory.  */
+	li 5, 0
+1:	dcbst 5, 3
+	addi 5, 5, CACHE_LINE_BYTES
+	cmpw 5, 4
+	blt 1b
+	sync            /* Force all dcbsts to complete.  */
+
+	/* Invalidate the icache lines.  */
+	li 5, 0
+1:	icbi 5, 3
+	addi 5, 5, CACHE_LINE_BYTES
+	cmpw 5, 4
+	blt 1b
+	sync            /* Force all icbis to complete.  */
+	isync           /* Discard partially executed instructions that were
+		           loaded from the invalid icache.  */
diff --git a/lib/powerpc/relocator.c b/lib/powerpc/relocator.c
new file mode 100644
index 000000000..9f5fc1c7f
--- /dev/null
+++ b/lib/powerpc/relocator.c
@@ -0,0 +1,141 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009,2010  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/mm.h>
+#include <grub/misc.h>
+
+#include <grub/types.h>
+#include <grub/types.h>
+#include <grub/err.h>
+#include <grub/cache.h>
+
+#include <grub/powerpc/relocator.h>
+#include <grub/relocator_private.h>
+
+extern grub_uint8_t grub_relocator_forward_start;
+extern grub_uint8_t grub_relocator_forward_end;
+extern grub_uint8_t grub_relocator_backward_start;
+extern grub_uint8_t grub_relocator_backward_end;
+
+#define REGW_SIZEOF (2 * sizeof (grub_uint32_t))
+#define JUMP_SIZEOF (sizeof (grub_uint32_t))
+
+#define RELOCATOR_SRC_SIZEOF(x) (&grub_relocator_##x##_end \
+				 - &grub_relocator_##x##_start)
+#define RELOCATOR_SIZEOF(x)	(RELOCATOR_SRC_SIZEOF(x) \
+				 + REGW_SIZEOF * 3)
+grub_size_t grub_relocator_align = sizeof (grub_uint32_t);
+grub_size_t grub_relocator_forward_size;
+grub_size_t grub_relocator_backward_size;
+grub_size_t grub_relocator_jumper_size = JUMP_SIZEOF + REGW_SIZEOF;
+
+void
+grub_cpu_relocator_init (void)
+{
+  grub_relocator_forward_size = RELOCATOR_SIZEOF(forward);
+  grub_relocator_backward_size = RELOCATOR_SIZEOF(backward);
+}
+
+static void
+write_reg (int regn, grub_uint32_t val, void **target)
+{
+  /* lis r, val >> 16  */
+  *(grub_uint32_t *) *target = 
+    ((0x3c00 | (regn << 5)) << 16) | (val >> 16);
+  *target = ((grub_uint32_t *) *target) + 1;
+  /* ori r, r, val & 0xffff. */
+  *(grub_uint32_t *) *target = (((0x6000 | regn << 5 | regn) << 16)
+				| (val & 0xffff));
+  *target = ((grub_uint32_t *) *target) + 1;
+}
+
+static void
+write_jump (void **target)
+{
+  /* blr.  */
+  *(grub_uint32_t *) *target = 0x4e800020;
+  *target = ((grub_uint32_t *) *target) + 1;
+}
+
+void
+grub_cpu_relocator_jumper (void *rels, grub_addr_t addr)
+{
+  write_reg (GRUB_PPC_JUMP_REGISTER, addr, &rels);
+  write_jump (&rels);
+}
+
+void
+grub_cpu_relocator_backward (void *ptr0, void *src, void *dest,
+			     grub_size_t size)
+{
+  void *ptr = ptr0;
+  write_reg (8, (grub_uint32_t) src, &ptr);
+  write_reg (9, (grub_uint32_t) dest, &ptr);
+  write_reg (10, (grub_uint32_t) size, &ptr);
+  grub_memcpy (ptr, &grub_relocator_backward_start,
+	       RELOCATOR_SRC_SIZEOF (backward));
+}
+
+void
+grub_cpu_relocator_forward (void *ptr0, void *src, void *dest,
+			     grub_size_t size)
+{
+  void *ptr = ptr0;
+  write_reg (8, (grub_uint32_t) src, &ptr);
+  write_reg (9, (grub_uint32_t) dest, &ptr);
+  write_reg (10, (grub_uint32_t) size, &ptr);
+  grub_memcpy (ptr, &grub_relocator_forward_start, 
+	       RELOCATOR_SRC_SIZEOF (forward));
+}
+
+grub_err_t
+grub_relocator32_boot (struct grub_relocator *rel,
+		       struct grub_relocator32_state state)
+{
+  grub_addr_t target;
+  void *src, *ptr;
+  grub_err_t err;
+  grub_addr_t relst;
+  grub_size_t relsize;
+  grub_size_t stateset_size = 32 * REGW_SIZEOF + JUMP_SIZEOF;
+  unsigned i;
+
+  err = grub_relocator_alloc_chunk_align (rel, &src, &target, 0,
+					  (0xffffffff - stateset_size)
+					  + 1, stateset_size,
+					  sizeof (grub_uint32_t),
+					  GRUB_RELOCATOR_PREFERENCE_NONE);
+  if (err)
+    return err;
+
+  ptr = src;
+  for (i = 0; i < 32; i++)
+    write_reg (i, state.gpr[i], &ptr);
+  write_jump (&ptr);
+
+  err = grub_relocator_prepare_relocs (rel, target, &relst, &relsize);
+  if (err)
+    return err;
+
+  grub_arch_sync_caches ((void *) relst, relsize);
+
+  ((void (*) (void)) relst) ();
+
+  /* Not reached.  */
+  return GRUB_ERR_NONE;
+}
diff --git a/lib/powerpc/relocator_asm.S b/lib/powerpc/relocator_asm.S
new file mode 100644
index 000000000..355e9c8b4
--- /dev/null
+++ b/lib/powerpc/relocator_asm.S
@@ -0,0 +1,60 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009,2010  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/symbol.h>
+	
+	.p2align	4	/* force 16-byte alignment */
+
+VARIABLE (grub_relocator_forward_start)
+	mr 3, 9
+	mr 4, 10
+
+copycont1:	
+	lbz 11,0(8)
+	stb 11,0(9)
+	addi 8, 8, 0x1
+	addi 9, 9, 0x1
+	addi 10, 10, -1
+	cmpwi 10, 0
+	bne copycont1
+
+#include "../../kern/powerpc/cache_flush.S"
+
+VARIABLE (grub_relocator_forward_end)
+
+VARIABLE (grub_relocator_backward_start)
+	mr 3, 9
+	mr 4, 10
+
+	add 9, 9, 10
+	add 8, 8, 10
+	/* Backward movsl is implicitly off-by-one.  compensate that.  */
+	addi 9, 9, -1
+	addi 8, 8, -1
+copycont2:	
+	lbz 11,0(8)
+	stb 11,0(9)
+	addi 8, 8, -1
+	addi 9, 9, -1
+	addi 10, 10, -1
+	cmpwi 10, 0
+	bne copycont2
+
+#include "../../kern/powerpc/cache_flush.S"
+
+VARIABLE (grub_relocator_backward_end)

From 1c1261d985a938e7f525287fd8b50e78bbebeaaf Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 6 Feb 2010 14:29:42 +0530
Subject: [PATCH 0434/1628] fixed grub-install.in

---
 util/grub-install.in | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/util/grub-install.in b/util/grub-install.in
index bb323d706..5016a2a17 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -105,7 +105,11 @@ EOF
 }
 
 # Check the arguments.
-for option in "$@"; do
+while test $# -gt 0
+do
+    option=$1
+    shift
+
     case "$option" in
     -h | --help)
 	usage
@@ -113,33 +117,62 @@ for option in "$@"; do
     -v | --version)
 	echo "grub-install (GNU GRUB ${PACKAGE_VERSION})"
 	exit 0 ;;
+
+    --modules)
+	modules=$1; shift;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
+
+    --font)
+	font=$1; shift;;
     --font=*)
 	font=`echo "$option" | sed 's/--font=//'` ;;
+
+    --root-directory)
+	rootdir=$1; shift;;
     --root-directory=*)
 	rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
+
+    --grub-setup)
+	grub_setup=$1; shift;;
     --grub-setup=*)
 	grub_setup=`echo "$option" | sed 's/--grub-setup=//'` ;;
+
+    --grub-mkimage)
+	grub_mkimage=$1; shift;;
     --grub-mkimage=*)
 	grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
+
+    --grub-mkdevicemap)
+	grub_mkdevicemap=$1; shift;;
     --grub-mkdevicemap=*)
 	grub_mkdevicemap=`echo "$option" | sed 's/--grub-mkdevicemap=//'` ;;
+
+    --grub-probe)
+	grub_probe=$1; shift;;
     --grub-probe=*)
 	grub_probe=`echo "$option" | sed 's/--grub-probe=//'` ;;
+
     --no-floppy)
 	no_floppy="--no-floppy" ;;
     --recheck)
 	recheck=yes ;;
+
+    --disk-module)
+	if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
+	    disk_module=$1; shift;
+	fi ;;
     --disk-module=*)
 	if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
            disk_module=`echo "$option" | sed 's/--disk-module=//'`
         fi ;;
+
     # This is an undocumented feature...
     --debug)
 	debug=yes ;;
     -f | --force)
         setup_force="--force" ;;
+
     -*)
 	echo "Unrecognized option \`$option'" 1>&2
 	usage

From 3746a6bc3191c93a41216d03f8436c838dba6d99 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 15:25:59 +0100
Subject: [PATCH 0435/1628] 2010-02-06  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* fs/i386/pc/pxe.c (grub_pxefs_dir): Return with failure on
	non-pxe disk.
	(grub_pxefs_open): Likewise.
---
 ChangeLog        | 6 ++++++
 fs/i386/pc/pxe.c | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 117933d07..eed0f93bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* fs/i386/pc/pxe.c (grub_pxefs_dir): Return with failure on
+	non-pxe disk.
+	(grub_pxefs_open): Likewise.
+
 2010-02-06  Colin D Bennett  <colin@gibibit.com>
 
 	* conf/common.rmk (pkglib_MODULES): Add gfxmenu.mod.
diff --git a/fs/i386/pc/pxe.c b/fs/i386/pc/pxe.c
index 8bfe17594..92529883e 100644
--- a/fs/i386/pc/pxe.c
+++ b/fs/i386/pc/pxe.c
@@ -173,12 +173,15 @@ static struct grub_disk_dev grub_pxe_dev =
   };
 
 static grub_err_t
-grub_pxefs_dir (grub_device_t device __attribute__ ((unused)),
+grub_pxefs_dir (grub_device_t device,
 		const char *path  __attribute__ ((unused)),
 		int (*hook) (const char *filename,
 			     const struct grub_dirhook_info *info)
 		__attribute__ ((unused)))
 {
+  if (device->disk->dev->id != GRUB_DISK_DEVICE_PXE_ID)
+    return grub_error (GRUB_ERR_IO, "not a pxe disk");
+
   return GRUB_ERR_NONE;
 }
 
@@ -194,6 +197,9 @@ grub_pxefs_open (struct grub_file *file, const char *name)
   struct grub_pxe_disk_data *disk_data = file->device->disk->data;
   grub_file_t file_int, bufio;
 
+  if (file->device->disk->dev->id != GRUB_DISK_DEVICE_PXE_ID)
+    return grub_error (GRUB_ERR_IO, "not a pxe disk");
+
   if (curr_file != 0)
     {
       grub_pxe_call (GRUB_PXENV_TFTP_CLOSE, &c.c2);

From 911df80c54af99b2e83a6ab1e51e813f7a9f81f0 Mon Sep 17 00:00:00 2001
From: Yves Blusseau <blusseau@zetam.org>
Date: Sat, 6 Feb 2010 15:37:23 +0100
Subject: [PATCH 0436/1628] 2010-02-06  Yves Blusseau  <blusseau@zetam.org>

    * conf/common.rmk (grub_script_check_SOURCES): add missing dependencies.
    (grub_mkpasswd_pbkdf2_SOURCES): Likewise.
---
 ChangeLog       | 5 +++++
 conf/common.rmk | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eed0f93bc..ba2561819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-06  Yves Blusseau  <blusseau@zetam.org>
+
+	* conf/common.rmk (grub_script_check_SOURCES): add missing dependencies.
+	(grub_mkpasswd_pbkdf2_SOURCES): Likewise.
+
 2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* fs/i386/pc/pxe.c (grub_pxefs_dir): Return with failure on
diff --git a/conf/common.rmk b/conf/common.rmk
index 13ca431ba..6cce36395 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -94,7 +94,8 @@ grub_bin2h_SOURCES = gnulib/progname.c util/bin2h.c
 # For grub-script-check.
 bin_UTILITIES += grub-script-check
 util/grub-script-check.c_DEPENDENCIES = grub_script_check_init.h
-grub_script_check_SOURCES = gnulib/progname.c util/grub-script-check.c util/misc.c \
+grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c \
+	util/grub-script-check.c util/misc.c \
 	script/main.c script/script.c script/function.c script/lexer.c \
 	kern/handler.c kern/err.c kern/parser.c kern/list.c \
 	kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c
@@ -759,7 +760,7 @@ password_pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
 password_pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 bin_UTILITIES += grub-mkpasswd-pbkdf2
-grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c
+grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c
 grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap -DGRUB_MKPASSWD=1
 
 include $(srcdir)/conf/gcry.mk

From 89494cb55c887e7b3150dbcfed50fd360521a67b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 15:51:22 +0100
Subject: [PATCH 0437/1628] 2010-02-06  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Correct error handling.
---
 ChangeLog              | 4 ++++
 disk/ieee1275/ofdisk.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ba2561819..72d5bd899 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* conf/common.rmk (grub_script_check_SOURCES): add missing dependencies.
 	(grub_mkpasswd_pbkdf2_SOURCES): Likewise.
 
+2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Correct error handling.
+
 2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* fs/i386/pc/pxe.c (grub_pxefs_dir): Return with failure on
diff --git a/disk/ieee1275/ofdisk.c b/disk/ieee1275/ofdisk.c
index 051ece0b9..238cff33d 100644
--- a/disk/ieee1275/ofdisk.c
+++ b/disk/ieee1275/ofdisk.c
@@ -248,7 +248,7 @@ grub_ofdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
 		       (long long) sector);
   grub_ieee1275_read ((grub_ieee1275_ihandle_t) (unsigned long) disk->data,
 		      buf, size * 512UL, &actual);
-  if (actual != actual)
+  if (actual != (grub_ssize_t) (size * 512UL))
     return grub_error (GRUB_ERR_READ_ERROR, "read error on block: %llu",
 		       (long long) sector);
 

From 7b5d0fe4440c8a061ab9a9cb3089b546cb9f88f6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 15:53:39 +0100
Subject: [PATCH 0438/1628] Increase heap limit

---
 kern/ieee1275/init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kern/ieee1275/init.c b/kern/ieee1275/init.c
index f3a4f4d81..75f261a71 100644
--- a/kern/ieee1275/init.c
+++ b/kern/ieee1275/init.c
@@ -38,11 +38,11 @@
 #define HEAP_MIN_SIZE		(unsigned long) (2 * 1024 * 1024)
 
 /* The maximum heap size we're going to claim */
-#define HEAP_MAX_SIZE		(unsigned long) (4 * 1024 * 1024)
+#define HEAP_MAX_SIZE		(unsigned long) (32 * 1024 * 1024)
 
 /* If possible, we will avoid claiming heap above this address, because it
    seems to cause relocation problems with OSes that link at 4 MiB */
-#define HEAP_MAX_ADDR		(unsigned long) (4 * 1024 * 1024)
+#define HEAP_MAX_ADDR		(unsigned long) (32 * 1024 * 1024)
 
 extern char _start[];
 extern char _end[];

From 09706ce58a85af4ba3b9306c02ebf8f560f857a0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 16:00:29 +0100
Subject: [PATCH 0439/1628] Fixed ChangeLog

---
 ChangeLog          | 14 ++++++++++----
 ChangeLog.gfxmenu  |  0
 ChangeLog.mkconfig |  5 -----
 3 files changed, 10 insertions(+), 9 deletions(-)
 delete mode 100644 ChangeLog.gfxmenu
 delete mode 100644 ChangeLog.mkconfig

diff --git a/ChangeLog b/ChangeLog
index 72d5bd899..c0c15024e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,24 @@
+2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Correct error handling.
+
 2010-02-06  Yves Blusseau  <blusseau@zetam.org>
 
 	* conf/common.rmk (grub_script_check_SOURCES): add missing dependencies.
 	(grub_mkpasswd_pbkdf2_SOURCES): Likewise.
 
-2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
-
-	* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Correct error handling.
-
 2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* fs/i386/pc/pxe.c (grub_pxefs_dir): Return with failure on
 	non-pxe disk.
 	(grub_pxefs_open): Likewise.
 
+2010-02-06  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* util/grub.d/10_hurd.in: Add --class information to menuentries.
+	* util/grub.d/10_kfreebsd.in: Likewise.
+	* util/grub.d/10_linux.in: Likewise.
+
 2010-02-06  Colin D Bennett  <colin@gibibit.com>
 
 	* conf/common.rmk (pkglib_MODULES): Add gfxmenu.mod.
diff --git a/ChangeLog.gfxmenu b/ChangeLog.gfxmenu
deleted file mode 100644
index e69de29bb..000000000
diff --git a/ChangeLog.mkconfig b/ChangeLog.mkconfig
deleted file mode 100644
index 665c938c7..000000000
--- a/ChangeLog.mkconfig
+++ /dev/null
@@ -1,5 +0,0 @@
-2010-01-07  Robert Millan  <rmh.grub@aybabtu.com>
-
-	* util/grub.d/10_hurd.in: Add --class information to menuentries.
-	* util/grub.d/10_kfreebsd.in: Likewise.
-	* util/grub.d/10_linux.in: Likewise.

From e0a3000a5cab9e6d306e8af82301f9b0f1087940 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 16:00:56 +0100
Subject: [PATCH 0440/1628] ChangeLog

---
 ChangeLog.ofwfb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 ChangeLog.ofwfb

diff --git a/ChangeLog.ofwfb b/ChangeLog.ofwfb
new file mode 100644
index 000000000..49063b54d
--- /dev/null
+++ b/ChangeLog.ofwfb
@@ -0,0 +1,16 @@
+2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* conf/powerpc-ieee1275.rmk (pkglib_MODULES): Add ieee1275_fb.mod.
+	(ieee1275_fb_mod_SOURCES): New variable.
+	(ieee1275_fb_mod_CFLAGS): Likewise.
+	(ieee1275_fb_mod_LDFLAGS): Likewise.
+	* include/grub/ieee1275/ieee1275.h (grub_ieee1275_devices_iterate):
+	New proto.
+	* kern/ieee1275/init.c (HEAP_MAX_SIZE): Increased.
+	(HEAP_MAX_ADDR): Likewise.
+	* kern/ieee1275/openfw.c (grub_children_iterate): Don't skip empty
+	type.
+	Correct stop condition.
+	(grub_ieee1275_devices_iterate): New function.
+	* video/ieee1275.c: New file.
+

From 51906b8c8a774ce75737fec2396472e0827f9186 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 16:32:45 +0100
Subject: [PATCH 0441/1628] 2010-02-06  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* loader/i386/pc/xnu.c (grub_xnu_set_video): Add const qualifier to
	modevar.
	Return grub_errno on allocation error.
---
 ChangeLog            | 6 ++++++
 loader/i386/pc/xnu.c | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c0c15024e..6da224094 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/i386/pc/xnu.c (grub_xnu_set_video): Add const qualifier to
+	modevar.
+	Return grub_errno on allocation error.
+
 2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Correct error handling.
diff --git a/loader/i386/pc/xnu.c b/loader/i386/pc/xnu.c
index 57937946b..39a595d9b 100644
--- a/loader/i386/pc/xnu.c
+++ b/loader/i386/pc/xnu.c
@@ -35,7 +35,8 @@ grub_xnu_set_video (struct grub_xnu_boot_params *params)
 {
   struct grub_video_mode_info mode_info;
   int ret;
-  char *tmp, *modevar;
+  char *tmp;
+  const char *modevar;
   void *framebuffer;
   grub_err_t err;
   struct grub_video_bitmap *bitmap = NULL;
@@ -51,8 +52,7 @@ grub_xnu_set_video (struct grub_xnu_boot_params *params)
     {
       tmp = grub_xasprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
       if (! tmp)
-	return grub_error (GRUB_ERR_OUT_OF_MEMORY,
-			   "couldn't allocate temporary storag");
+	return grub_errno;
       err = grub_video_set_mode (tmp,
 				 GRUB_VIDEO_MODE_TYPE_PURE_TEXT
 				 | GRUB_VIDEO_MODE_TYPE_DEPTH_MASK,

From 15cb7d433feada360f1a25a22bace90badaf7c00 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 18:43:37 +0100
Subject: [PATCH 0442/1628] Reimport nestpart

---
 ChangeLog.nestpart             |  73 ++++++++++++
 commands/blocklist.c           |   3 +-
 commands/loadenv.c             |  11 +-
 conf/any-emu.rmk               |   2 +-
 conf/common.rmk                |  12 +-
 conf/i386-pc.rmk               |   2 +-
 conf/sparc64-ieee1275.rmk      |   4 +-
 include/grub/bsdlabel.h        |  89 ++++++++++++++
 include/grub/msdos_partition.h |  94 ---------------
 include/grub/partition.h       |  21 ++--
 kern/disk.c                    |  18 ++-
 kern/partition.c               | 164 +++++++++++++++++++++++---
 loader/i386/bsd.c              |  19 +--
 loader/i386/multiboot_mbi.c    |  21 +---
 loader/i386/pc/chainloader.c   |  21 +++-
 partmap/acorn.c                |  61 +---------
 partmap/amiga.c                |  67 +----------
 partmap/apple.c                |  72 ++----------
 partmap/bsdlabel.c             |  97 ++++++++++++++++
 partmap/gpt.c                  |  80 +++----------
 partmap/msdos.c                | 205 +++------------------------------
 partmap/sun.c                  |  59 +---------
 parttool/msdospart.c           |   4 +-
 util/grub-probe.c              |   5 +-
 util/hostdisk.c                |  41 +++----
 util/i386/pc/grub-setup.c      |  36 +++---
 26 files changed, 561 insertions(+), 720 deletions(-)
 create mode 100644 ChangeLog.nestpart
 create mode 100644 include/grub/bsdlabel.h
 create mode 100644 partmap/bsdlabel.c

diff --git a/ChangeLog.nestpart b/ChangeLog.nestpart
new file mode 100644
index 000000000..a2726181b
--- /dev/null
+++ b/ChangeLog.nestpart
@@ -0,0 +1,73 @@
+2009-06-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Nested partitions
+
+	* commands/blocklist.c (grub_cmd_blocklist): Don't check whether
+	'partition' is NULL, grub_partition_get_start already does that.
+	* commands/loadenv.c (check_blocklists): Likewise.
+	(write_blocklists): Likewise.
+	* conf/common.rmk (grub_probe_SOURCES): Add partmap/bsdlabel.c.
+	(grub_fstest_SOURCES): Likewise.
+	(pkglib_MODULES): Add bsdlabel.mod.
+	(bsdlabel_mod_SOURCES): New variable.
+	(bsdlabel_mod_CFLAGS): Likewise.
+	(bsdlabel_mod_LDFLAGS): Likewise.
+	* conf/i386-coreboot.rmk (grub_emu_SOURCES): Add partmap/bsdlabel.c.
+	* conf/i386-pc.rmk (grub_setup_SOURCES): Likewise.
+	(grub_emu_SOURCES): Likewise.
+	* conf/powerpc-ieee1275.rmk (grub_emu_SOURCES): Likewise.
+	* conf/sparc64-ieee1275.rmk (grub_emu_SOURCES): Likewise.
+	* include/grub/bsdlabel.h: New file.
+	* include/grub/partition.h (grub_partition_map): Remove 'probe' and
+	'get_name'.
+	(grub_partition): Add 'parent' and 'number'.
+	(grub_partition_get_start): Handle nested partitions.
+	* include/grub/pc_partition.h: Remove bsd-related entries.
+	(grub_pc_partition): Remove.
+	* kern/disk.c (grub_disk_close): Free partition data.
+	(grub_disk_adjust_range): Handle nested partitions.
+	* kern/partition.c (grub_partition_map_probe): New function.
+	(grub_partition_probe): Parse name to number, handle subpartitions.
+	(get_partmap): New function.
+	(grub_partition_iterate): Handle subpartitions.
+	(grub_partition_get_name): Likewise.
+	* loader/i386/pc/bsd.c (grub_bsd_get_device): Likewise.
+	* loader/i386/multiboot.c (grub_multiboot_get_bootdev): Likewise.
+	* loader/i386/pc/chainloader.c (grub_chainloader_cmd): Likewise.
+	* partmap/acorn.c (acorn_partition_map_iterate): Don't force raw access.
+	Set 'number'.
+	(acorn_partition_map_probe): Remove.
+	(acorn_partition_map_get_name): Likewise.
+	* partmap/amiga.c (amiga_partition_map_iterate): Don't force raw access.
+	Set 'number'.
+	Set 'index' to 0 since there can be only one partition entry per sector.
+	(amiga_partition_map_probe): Remove.
+	(amiga_partition_map_get_name): Likewise.
+	* partmap/apple.c (apple_partition_map_iterate): Don't force raw access.
+	Set 'number'.
+	Set 'offset' and 'index' to real positions of partitions.
+	(apple_partition_map_probe): Remove.
+	(apple_partition_map_get_name): Likewise.
+	* partmap/bsdlabel.c: New file.
+	* partmap/gpt.c (gpt_partition_map_iterate): Don't force raw access.
+	Set 'number'.
+	Allocate 'data' so it can be correctly freed.
+	Set 'index' to offset inside sector.
+	(gpt_partition_map_probe): Remove.
+	(gpt_partition_map_get_name): Likewise.
+	* partmap/pc.c (grub_partition_parse): Remove.
+	(pc_partition_map_iterate): Don't force raw access.
+	Set 'number'.
+	Make 'ext_offset' a local variable.
+	(pc_partition_map_probe): Remove.
+	(pc_partition_map_get_name): Remove.
+	* partmap/sun.c (sun_partition_map_iterate): Don't force raw access.
+	Set 'number'.
+	(sun_partition_map_probe): Remove.
+	(sun_partition_map_get_name): Likewise.
+	* parttool/pcpart.c (grub_pcpart_boot): Handle nested partitions.
+	(grub_pcpart_type): Likewise.
+	* util/hostdisk.c (open_device): Handle new numbering scheme.
+	(grub_util_biosdisk_get_grub_dev): Handle nested partitions.
+	* util/i386/pc/grub-setup.c (setup): Handle new numbering scheme.
+	* util/grub-probe.c (probe_partmap): Handle nested paritions.
diff --git a/commands/blocklist.c b/commands/blocklist.c
index fec59a828..cace31113 100644
--- a/commands/blocklist.c
+++ b/commands/blocklist.c
@@ -90,8 +90,7 @@ grub_cmd_blocklist (grub_command_t cmd __attribute__ ((unused)),
     return grub_error (GRUB_ERR_BAD_DEVICE,
 		       "this command is available only for disk devices");
 
-  if (file->device->disk->partition)
-    part_start = grub_partition_get_start (file->device->disk->partition);
+  part_start = grub_partition_get_start (file->device->disk->partition);
 
   file->read_hook = read_blocklist;
 
diff --git a/commands/loadenv.c b/commands/loadenv.c
index 51b88cbc9..d763b2d5e 100644
--- a/commands/loadenv.c
+++ b/commands/loadenv.c
@@ -235,10 +235,8 @@ check_blocklists (grub_envblk_t envblk, struct blocklist *blocklists,
   /* One more sanity check. Re-read all sectors by blocklists, and compare
      those with the data read via a file.  */
   disk = file->device->disk;
-  if (disk->partition)
-    part_start = grub_partition_get_start (disk->partition);
-  else
-    part_start = 0;
+
+  part_start = grub_partition_get_start (disk->partition);
 
   buf = grub_envblk_buffer (envblk);
   for (p = blocklists, index = 0; p; index += p->length, p = p->next)
@@ -268,10 +266,7 @@ write_blocklists (grub_envblk_t envblk, struct blocklist *blocklists,
 
   buf = grub_envblk_buffer (envblk);
   disk = file->device->disk;
-  if (disk->partition)
-    part_start = grub_partition_get_start (disk->partition);
-  else
-    part_start = 0;
+  part_start = grub_partition_get_start (disk->partition);
 
   index = 0;
   for (p = blocklists; p; index += p->length, p = p->next)
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 1277af791..aaee3ec53 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -34,7 +34,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 	script/main.c script/execute.c script/function.c		\
 	script/lexer.c script/script.c grub_script.tab.c		\
 	partmap/amiga.c	partmap/apple.c partmap/msdos.c partmap/sun.c	\
-	partmap/acorn.c partmap/gpt.c					\
+	partmap/acorn.c partmap/gpt.c partmap/bsd.c			\
 	\
 	fs/affs.c fs/cpio.c  fs/fat.c fs/ext2.c fs/hfs.c		\
 	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c		\
diff --git a/conf/common.rmk b/conf/common.rmk
index 2ea8ebd5a..4cf20463c 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -32,7 +32,8 @@ grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c	\
 	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c	\
 	fs/befs.c fs/befs_be.c fs/tar.c		\
 	\
-	partmap/msdos.c partmap/apple.c partmap/sun.c partmap/gpt.c\
+	partmap/msdos.c partmap/bsdlabel.c partmap/apple.c \
+	partmap/sun.c partmap/gpt.c\
 	kern/fs.c kern/env.c fs/fshelp.c			\
 	disk/raid.c disk/mdraid_linux.c disk/lvm.c grub_probe_init.c
 
@@ -69,8 +70,8 @@ grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c util/hostfs.c \
 	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c fs/befs.c 	\
 	fs/befs_be.c fs/tar.c			\
 	\
-	kern/partition.c partmap/msdos.c partmap/apple.c partmap/sun.c	\
-	partmap/gpt.c							\
+	kern/partition.c partmap/msdos.c partmap/bsdlabel.c		\
+	partmap/apple.c partmap/sun.c partmap/gpt.c			\
 	kern/fs.c kern/env.c fs/fshelp.c disk/raid.c			\
 	disk/raid5_recover.c disk/raid6_recover.c 			\
 	disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c 		\
@@ -376,6 +377,11 @@ part_gpt_mod_SOURCES = partmap/gpt.c
 part_gpt_mod_CFLAGS = $(COMMON_CFLAGS)
 part_gpt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += part_bsd.mod
+part_bsd_mod_SOURCES = partmap/bsdlabel.c
+part_bsd_mod_CFLAGS = $(COMMON_CFLAGS)
+part_bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # Special disk structures and generic drivers
 
 pkglib_MODULES += raid.mod raid5rec.mod raid6rec.mod mdraid.mod dm_nv.mod \
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 580bfea0a..efbf5bfa2 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -104,7 +104,7 @@ grub_setup_SOURCES = gnulib/progname.c \
 	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c	\
 	fs/befs.c fs/befs_be.c fs/tar.c			\
 	\
-	partmap/msdos.c partmap/gpt.c				\
+	partmap/msdos.c partmap/bsdlabel.c partmap/gpt.c		\
 	\
 	disk/raid.c disk/mdraid_linux.c disk/lvm.c		\
 	util/raid.c util/lvm.c					\
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index befc7dce5..9ec8dd22c 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -78,8 +78,8 @@ grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c	\
 	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c	\
 	fs/befs.c fs/befs_be.c fs/tar.c			\
 	\
-	partmap/amiga.c	partmap/apple.c partmap/msdos.c		\
-	partmap/sun.c partmap/acorn.c				\
+	partmap/amiga.c	partmap/apple.c partmap/msdos.c 	\
+	partmap/bsdlabel.c partmap/sun.c partmap/acorn.c	\
 	\
 	disk/raid.c disk/mdraid_linux.c disk/lvm.c		\
 	util/raid.c util/lvm.c gnulib/progname.c		\
diff --git a/include/grub/bsdlabel.h b/include/grub/bsdlabel.h
new file mode 100644
index 000000000..d88b25353
--- /dev/null
+++ b/include/grub/bsdlabel.h
@@ -0,0 +1,89 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 1999,2000,2001,2002,2004,2007  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/>.
+ */
+
+#ifndef GRUB_BSDLABEL_PARTITION_HEADER
+#define GRUB_BSDLABEL_PARTITION_HEADER	1
+
+/* Constants for BSD disk label.  */
+#define GRUB_PC_PARTITION_BSD_LABEL_SECTOR	1
+#define GRUB_PC_PARTITION_BSD_LABEL_MAGIC	0x82564557
+
+/* BSD partition types.  */
+#define GRUB_PC_PARTITION_BSD_TYPE_UNUSED	0
+#define GRUB_PC_PARTITION_BSD_TYPE_SWAP		1
+#define GRUB_PC_PARTITION_BSD_TYPE_V6		2
+#define GRUB_PC_PARTITION_BSD_TYPE_V7		3
+#define GRUB_PC_PARTITION_BSD_TYPE_SYSV		4
+#define GRUB_PC_PARTITION_BSD_TYPE_V71K		5
+#define GRUB_PC_PARTITION_BSD_TYPE_V8		6
+#define GRUB_PC_PARTITION_BSD_TYPE_BSDFFS	7
+#define GRUB_PC_PARTITION_BSD_TYPE_MSDOS	8
+#define GRUB_PC_PARTITION_BSD_TYPE_BSDLFS	9
+#define GRUB_PC_PARTITION_BSD_TYPE_OTHER	10
+#define GRUB_PC_PARTITION_BSD_TYPE_HPFS		11
+#define GRUB_PC_PARTITION_BSD_TYPE_ISO9660	12
+#define GRUB_PC_PARTITION_BSD_TYPE_BOOT		13
+
+/* FreeBSD-specific types.  */
+#define GRUB_PC_PARTITION_FREEBSD_TYPE_VINUM	14
+#define GRUB_PC_PARTITION_FREEBSD_TYPE_RAID	15
+#define GRUB_PC_PARTITION_FREEBSD_TYPE_JFS2	21
+
+/* NetBSD-specific types.  */
+#define	GRUB_PC_PARTITION_NETBSD_TYPE_ADOS	14
+#define	GRUB_PC_PARTITION_NETBSD_TYPE_HFS	15
+#define	GRUB_PC_PARTITION_NETBSD_TYPE_FILECORE	16
+#define	GRUB_PC_PARTITION_NETBSD_TYPE_EXT2FS	17
+#define	GRUB_PC_PARTITION_NETBSD_TYPE_NTFS	18
+#define	GRUB_PC_PARTITION_NETBSD_TYPE_RAID	19
+#define	GRUB_PC_PARTITION_NETBSD_TYPE_CCD	20
+#define	GRUB_PC_PARTITION_NETBSD_TYPE_JFS2	21
+#define	GRUB_PC_PARTITION_NETBSD_TYPE_APPLEUFS	22
+
+/* OpenBSD-specific types.  */
+#define	GRUB_PC_PARTITION_OPENBSD_TYPE_ADOS	14
+#define	GRUB_PC_PARTITION_OPENBSD_TYPE_HFS	15
+#define	GRUB_PC_PARTITION_OPENBSD_TYPE_FILECORE	16
+#define	GRUB_PC_PARTITION_OPENBSD_TYPE_EXT2FS	17
+#define	GRUB_PC_PARTITION_OPENBSD_TYPE_NTFS	18
+#define	GRUB_PC_PARTITION_OPENBSD_TYPE_RAID	19
+
+/* The BSD partition entry.  */
+struct grub_partition_bsd_entry
+{
+  grub_uint32_t size;
+  grub_uint32_t offset;
+  grub_uint32_t fragment_size;
+  grub_uint8_t fs_type;
+  grub_uint8_t fs_fragments;
+  grub_uint16_t fs_cylinders;
+} __attribute__ ((packed));
+
+/* The BSD disk label. Only define members useful for GRUB.  */
+struct grub_partition_bsd_disk_label
+{
+  grub_uint32_t magic;
+  grub_uint8_t padding[128];
+  grub_uint32_t magic2;
+  grub_uint16_t checksum;
+  grub_uint16_t num_partitions;
+  grub_uint32_t boot_size;
+  grub_uint32_t superblock_size;
+} __attribute__ ((packed));
+
+#endif /* ! GRUB_PC_PARTITION_HEADER */
diff --git a/include/grub/msdos_partition.h b/include/grub/msdos_partition.h
index 273d8c95e..650d78493 100644
--- a/include/grub/msdos_partition.h
+++ b/include/grub/msdos_partition.h
@@ -53,75 +53,6 @@
 #define GRUB_PC_PARTITION_TYPE_GPT_DISK		0xee
 #define GRUB_PC_PARTITION_TYPE_LINUX_RAID	0xfd
 
-/* Constants for BSD disk label.  */
-#define GRUB_PC_PARTITION_BSD_LABEL_SECTOR	1
-#define GRUB_PC_PARTITION_BSD_LABEL_MAGIC	0x82564557
-#define GRUB_PC_PARTITION_BSD_MAX_ENTRIES	8
-
-/* BSD partition types.  */
-#define GRUB_PC_PARTITION_BSD_TYPE_UNUSED	0
-#define GRUB_PC_PARTITION_BSD_TYPE_SWAP		1
-#define GRUB_PC_PARTITION_BSD_TYPE_V6		2
-#define GRUB_PC_PARTITION_BSD_TYPE_V7		3
-#define GRUB_PC_PARTITION_BSD_TYPE_SYSV		4
-#define GRUB_PC_PARTITION_BSD_TYPE_V71K		5
-#define GRUB_PC_PARTITION_BSD_TYPE_V8		6
-#define GRUB_PC_PARTITION_BSD_TYPE_BSDFFS	7
-#define GRUB_PC_PARTITION_BSD_TYPE_MSDOS	8
-#define GRUB_PC_PARTITION_BSD_TYPE_BSDLFS	9
-#define GRUB_PC_PARTITION_BSD_TYPE_OTHER	10
-#define GRUB_PC_PARTITION_BSD_TYPE_HPFS		11
-#define GRUB_PC_PARTITION_BSD_TYPE_ISO9660	12
-#define GRUB_PC_PARTITION_BSD_TYPE_BOOT		13
-
-/* FreeBSD-specific types.  */
-#define GRUB_PC_PARTITION_FREEBSD_TYPE_VINUM	14
-#define GRUB_PC_PARTITION_FREEBSD_TYPE_RAID	15
-#define GRUB_PC_PARTITION_FREEBSD_TYPE_JFS2	21
-
-/* NetBSD-specific types.  */
-#define	GRUB_PC_PARTITION_NETBSD_TYPE_ADOS	14
-#define	GRUB_PC_PARTITION_NETBSD_TYPE_HFS	15
-#define	GRUB_PC_PARTITION_NETBSD_TYPE_FILECORE	16
-#define	GRUB_PC_PARTITION_NETBSD_TYPE_EXT2FS	17
-#define	GRUB_PC_PARTITION_NETBSD_TYPE_NTFS	18
-#define	GRUB_PC_PARTITION_NETBSD_TYPE_RAID	19
-#define	GRUB_PC_PARTITION_NETBSD_TYPE_CCD	20
-#define	GRUB_PC_PARTITION_NETBSD_TYPE_JFS2	21
-#define	GRUB_PC_PARTITION_NETBSD_TYPE_APPLEUFS	22
-
-/* OpenBSD-specific types.  */
-#define	GRUB_PC_PARTITION_OPENBSD_TYPE_ADOS	14
-#define	GRUB_PC_PARTITION_OPENBSD_TYPE_HFS	15
-#define	GRUB_PC_PARTITION_OPENBSD_TYPE_FILECORE	16
-#define	GRUB_PC_PARTITION_OPENBSD_TYPE_EXT2FS	17
-#define	GRUB_PC_PARTITION_OPENBSD_TYPE_NTFS	18
-#define	GRUB_PC_PARTITION_OPENBSD_TYPE_RAID	19
-
-/* The BSD partition entry.  */
-struct grub_msdos_partition_bsd_entry
-{
-  grub_uint32_t size;
-  grub_uint32_t offset;
-  grub_uint32_t fragment_size;
-  grub_uint8_t fs_type;
-  grub_uint8_t fs_fragments;
-  grub_uint16_t fs_cylinders;
-} __attribute__ ((packed));
-
-/* The BSD disk label. Only define members useful for GRUB.  */
-struct grub_msdos_partition_disk_label
-{
-  grub_uint32_t magic;
-  grub_uint8_t padding[128];
-  grub_uint32_t magic2;
-  grub_uint16_t checksum;
-  grub_uint16_t num_partitions;
-  grub_uint32_t boot_size;
-  grub_uint32_t superblock_size;
-  struct grub_msdos_partition_bsd_entry entries[GRUB_PC_PARTITION_BSD_MAX_ENTRIES];
-} __attribute__ ((packed));
-
 /* The partition entry.  */
 struct grub_msdos_partition_entry
 {
@@ -168,23 +99,6 @@ struct grub_msdos_partition_mbr
 } __attribute__ ((packed));
 
 
-struct grub_msdos_partition
-{
-    /* The DOS partition number.  */
-  int dos_part;
-
-  /* The BSD partition number (a == 0).  */
-  int bsd_part;
-
-  /* The DOS partition type.  */
-  int dos_type;
-
-  /* The BSD partition type.  */
-  int bsd_type;
-
-  /* The offset of the extended partition.  */
-  unsigned long ext_offset;
-};
 
 static inline int
 grub_msdos_partition_is_empty (int type)
@@ -200,12 +114,4 @@ grub_msdos_partition_is_extended (int type)
 	  || type == GRUB_PC_PARTITION_TYPE_LINUX_EXTENDED);
 }
 
-static inline int
-grub_msdos_partition_is_bsd (int type)
-{
-  return (type == GRUB_PC_PARTITION_TYPE_FREEBSD
-	  || type == GRUB_PC_PARTITION_TYPE_OPENBSD
-	  || type == GRUB_PC_PARTITION_TYPE_NETBSD);
-}
-
 #endif /* ! GRUB_PC_PARTITION_HEADER */
diff --git a/include/grub/partition.h b/include/grub/partition.h
index d35658cdd..5e8c476e0 100644
--- a/include/grub/partition.h
+++ b/include/grub/partition.h
@@ -36,13 +36,6 @@ struct grub_partition_map
 			 int (*hook) (struct grub_disk *disk,
 				      const grub_partition_t partition));
 
-  /* Return the partition named STR on the disk DISK.  */
-  grub_partition_t (*probe) (struct grub_disk *disk,
-			     const char *str);
-
-  /* Return the name of the partition PARTITION.  */
-  char *(*get_name) (const grub_partition_t partition);
-
   /* The next partition map type.  */
   struct grub_partition_map *next;
 };
@@ -51,6 +44,9 @@ typedef struct grub_partition_map *grub_partition_map_t;
 /* Partition description.  */
 struct grub_partition
 {
+  /* The partition number.  */
+  int number;
+
   /* The start sector.  */
   grub_disk_addr_t start;
 
@@ -66,6 +62,9 @@ struct grub_partition
   /* Partition map type specific data.  */
   void *data;
 
+  /* Parent partition map.  */
+  struct grub_partition *parent;
+
   /* The type partition map.  */
   grub_partition_map_t partmap;
 };
@@ -101,7 +100,13 @@ void grub_apple_partition_map_fini (void);
 static inline grub_disk_addr_t
 grub_partition_get_start (const grub_partition_t p)
 {
-  return p->start;
+  grub_partition_t part;
+  grub_uint64_t part_start = 0;
+
+  for (part = p; part; part = part->parent)
+    part_start += part->start;
+
+  return part_start;
 }
 
 static inline grub_uint64_t
diff --git a/kern/disk.c b/kern/disk.c
index a01373072..ffd6039f7 100644
--- a/kern/disk.c
+++ b/kern/disk.c
@@ -330,6 +330,7 @@ grub_disk_open (const char *name)
 void
 grub_disk_close (grub_disk_t disk)
 {
+  grub_partition_t part;
   grub_dprintf ("disk", "Closing `%s'.\n", disk->name);
 
   if (disk->dev && disk->dev->close)
@@ -338,7 +339,13 @@ grub_disk_close (grub_disk_t disk)
   /* Reset the timer.  */
   grub_last_time = grub_get_time_ms ();
 
-  grub_free (disk->partition);
+  while (disk->partition)
+    {
+      part = disk->partition->parent;
+      grub_free (disk->partition->data);
+      grub_free (disk->partition);
+      disk->partition = part;
+    }
   grub_free ((void *) disk->name);
   grub_free (disk);
 }
@@ -349,18 +356,19 @@ grub_disk_close (grub_disk_t disk)
    - Verify that the range is inside the partition.  */
 static grub_err_t
 grub_disk_adjust_range (grub_disk_t disk, grub_disk_addr_t *sector,
-		       grub_off_t *offset, grub_size_t size)
+			grub_off_t *offset, grub_size_t size)
 {
+  grub_partition_t part;
   *sector += *offset >> GRUB_DISK_SECTOR_BITS;
   *offset &= GRUB_DISK_SECTOR_SIZE - 1;
 
-  if (disk->partition)
+  for (part = disk->partition; part; part = part->parent)
     {
       grub_disk_addr_t start;
       grub_uint64_t len;
 
-      start = grub_partition_get_start (disk->partition);
-      len = grub_partition_get_len (disk->partition);
+      start = part->start;
+      len = part->len;
 
       if (*sector >= len
 	  || len - *sector < ((*offset + size + GRUB_DISK_SECTOR_SIZE - 1)
diff --git a/kern/partition.c b/kern/partition.c
index 4d5c63a95..1f3f6556d 100644
--- a/kern/partition.c
+++ b/kern/partition.c
@@ -17,6 +17,7 @@
  */
 
 #include <grub/misc.h>
+#include <grub/mm.h>
 #include <grub/partition.h>
 #include <grub/disk.h>
 
@@ -54,17 +55,58 @@ grub_partition_map_iterate (int (*hook) (const grub_partition_map_t partmap))
   return 0;
 }
 
+static grub_partition_t
+grub_partition_map_probe (const grub_partition_map_t partmap,
+			  grub_disk_t disk, int partnum)
+{
+  grub_partition_t p = 0;
+
+  auto int find_func (grub_disk_t d, const grub_partition_t partition);
+
+  int find_func (grub_disk_t d __attribute__ ((unused)),
+		 const grub_partition_t partition)
+    {
+      if (partnum == partition->number)
+	{
+	  p = (grub_partition_t) grub_malloc (sizeof (*p));
+	  if (! p)
+	    return 1;
+
+	  grub_memcpy (p, partition, sizeof (*p));
+	  return 1;
+	}
+
+      return 0;
+    }
+
+  partmap->iterate (disk, find_func);
+  if (grub_errno)
+    goto fail;
+
+  return p;
+
+ fail:
+  grub_free (p);
+  return 0;
+}
+
 grub_partition_t
 grub_partition_probe (struct grub_disk *disk, const char *str)
 {
   grub_partition_t part = 0;
+  grub_partition_t curpart = 0;
+  grub_partition_t tail;
+  const char *ptr;
+  int num;
 
   auto int part_map_probe (const grub_partition_map_t partmap);
 
   int part_map_probe (const grub_partition_map_t partmap)
     {
-      part = partmap->probe (disk, str);
-      if (part)
+      disk->partition = part;
+      curpart = grub_partition_map_probe (partmap, disk, num);
+      disk->partition = tail;
+      if (curpart)
 	return 1;
 
       if (grub_errno == GRUB_ERR_BAD_PART_TABLE)
@@ -77,27 +119,54 @@ grub_partition_probe (struct grub_disk *disk, const char *str)
       return 1;
     }
 
-  /* Use the first partition map type found.  */
-  grub_partition_map_iterate (part_map_probe);
+  part = tail = disk->partition;
+
+  for (ptr = str; *ptr;)
+    {
+      /* BSD-like partition specification.  */
+      if (*ptr >= 'a' && *ptr <= 'z')
+	num = *(ptr++) - 'a';
+      else
+	num = grub_strtoul (ptr, (char **) &ptr, 0) - 1;
+
+      curpart = 0;
+      /* Use the first partition map type found.  */
+      grub_partition_map_iterate (part_map_probe);
+
+      if (! curpart)
+	{
+	  while (part)
+	    {
+	      curpart = part->parent;
+	      grub_free (part);
+	      part = curpart;
+	    }
+	  return 0;
+	}
+      curpart->parent = part;
+      part = curpart;
+      if (! ptr || *ptr != ',')
+	break;
+      ptr++;
+    }
 
   return part;
 }
 
-int
-grub_partition_iterate (struct grub_disk *disk,
-			int (*hook) (grub_disk_t disk,
-				     const grub_partition_t partition))
+static grub_partition_map_t
+get_partmap (struct grub_disk *disk)
 {
   grub_partition_map_t partmap = 0;
-  int ret = 0;
-
+  struct grub_partition part;
+  int found = 0;
   auto int part_map_iterate (const grub_partition_map_t p);
   auto int part_map_iterate_hook (grub_disk_t d,
 				  const grub_partition_t partition);
-
   int part_map_iterate_hook (grub_disk_t d __attribute__ ((unused)),
-			     const grub_partition_t partition __attribute__ ((unused)))
+			     const grub_partition_t partition)
     {
+      found = 1;
+      part = *partition;
       return 1;
     }
 
@@ -106,22 +175,58 @@ grub_partition_iterate (struct grub_disk *disk,
       grub_dprintf ("partition", "Detecting %s...\n", p->name);
       p->iterate (disk, part_map_iterate_hook);
 
-      if (grub_errno != GRUB_ERR_NONE)
+      if (grub_errno != GRUB_ERR_NONE || ! found)
 	{
 	  /* Continue to next partition map type.  */
 	  grub_dprintf ("partition", "%s detection failed.\n", p->name);
 	  grub_errno = GRUB_ERR_NONE;
 	  return 0;
 	}
+      grub_free (part.data);
 
       grub_dprintf ("partition", "%s detection succeeded.\n", p->name);
       partmap = p;
       return 1;
     }
-
   grub_partition_map_iterate (part_map_iterate);
-  if (partmap)
-    ret = partmap->iterate (disk, hook);
+  return partmap;
+}
+
+int
+grub_partition_iterate (struct grub_disk *disk,
+			int (*hook) (grub_disk_t disk,
+				     const grub_partition_t partition))
+{
+  int ret = 0;
+
+  auto int part_iterate (grub_disk_t dsk, const grub_partition_t p);
+
+  int part_iterate (grub_disk_t dsk,
+		    const grub_partition_t partition)
+    {
+      struct grub_partition p = *partition;
+      grub_partition_map_t partmap = 0;
+      p.parent = dsk->partition;
+      dsk->partition = 0;
+      if (hook (dsk, &p))
+	  return 1;
+      if (p.start != 0)
+	{
+	  dsk->partition = &p;
+	  partmap = get_partmap (dsk);
+	  if (partmap)
+	    ret = partmap->iterate (dsk, part_iterate);
+	}
+      dsk->partition = p.parent;
+      return ret;
+    }
+
+  {
+    grub_partition_map_t partmap = 0;
+    partmap = get_partmap (disk);
+    if (partmap)
+      ret = partmap->iterate (disk, part_iterate);
+  }
 
   return ret;
 }
@@ -129,5 +234,30 @@ grub_partition_iterate (struct grub_disk *disk,
 char *
 grub_partition_get_name (const grub_partition_t partition)
 {
-  return partition->partmap->get_name (partition);
+  char *out = 0;
+  /* Even on 64-bit machines this buffer is enough to hold longest number.  */
+  char buf[25];
+  int curlen = 0;
+  grub_partition_t part;
+  for (part = partition; part; part = part->parent)
+    {
+      int strl;
+      grub_snprintf (buf, sizeof (buf), "%d", part->number + 1);
+      strl = grub_strlen (buf);
+      if (curlen)
+	{
+	  out = grub_realloc (out, curlen + strl + 2);
+	  grub_memcpy (out + strl + 1, out, curlen);
+	  out[curlen + 1 + strl] = 0;
+	  grub_memcpy (out, buf, strl);
+	  out[strl] = ',';
+	  curlen = curlen + 1 + strl;
+	}
+      else
+	{
+	  curlen = strl;
+	  out = grub_strdup (buf);
+	}
+    }
+  return out;
 }
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 3dd3c70c5..3c7fe2fee 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -140,7 +140,6 @@ grub_bsd_get_device (grub_uint32_t * biosdev,
 		     grub_uint32_t * unit,
 		     grub_uint32_t * slice, grub_uint32_t * part)
 {
-  char *p;
   grub_device_t dev;
 
 #ifdef GRUB_MACHINE_PCBIOS
@@ -154,21 +153,13 @@ grub_bsd_get_device (grub_uint32_t * biosdev,
   dev = grub_device_open (0);
   if (dev && dev->disk && dev->disk->partition)
     {
-
-      p = dev->disk->partition->partmap->get_name (dev->disk->partition);
-      if (p)
+      if (dev->disk->partition->parent)
 	{
-	  if ((p[0] >= '0') && (p[0] <= '9'))
-	    {
-	      *slice = grub_strtoul (p, &p, 0);
-
-	      if ((p) && (p[0] == ','))
-		p++;
-	    }
-
-	  if ((p[0] >= 'a') && (p[0] <= 'z'))
-	    *part = p[0] - 'a';
+	  *part = dev->disk->partition->number;
+	  *slice = dev->disk->partition->parent->number + 1;
 	}
+      else
+	*slice = dev->disk->partition->number + 1;
     }
   if (dev)
     grub_device_close (dev);
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index a154d1b23..928677512 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -435,7 +435,6 @@ grub_multiboot_add_module (grub_addr_t start, grub_size_t size,
 void
 grub_multiboot_set_bootdev (void)
 {
-  char *p;
   grub_uint32_t biosdev, slice = ~0, part = ~0;
   grub_device_t dev;
 
@@ -448,21 +447,13 @@ grub_multiboot_set_bootdev (void)
   dev = grub_device_open (0);
   if (dev && dev->disk && dev->disk->partition)
     {
-
-      p = dev->disk->partition->partmap->get_name (dev->disk->partition);
-      if (p)
-	{
-	  if ((p[0] >= '0') && (p[0] <= '9'))
-	    {
-	      slice = grub_strtoul (p, &p, 0) - 1;
-
-	      if ((p) && (p[0] == ','))
-		p++;
-	    }
-
-	  if ((p[0] >= 'a') && (p[0] <= 'z'))
-	    part = p[0] - 'a';
+      if (dev->disk->partition->parent)
+ 	{
+	  part = dev->disk->partition->number;
+	  slice = dev->disk->partition->parent->number;
 	}
+      else
+	slice = dev->disk->partition->number;
     }
   if (dev)
     grub_device_close (dev);
diff --git a/loader/i386/pc/chainloader.c b/loader/i386/pc/chainloader.c
index fbc356895..935f5a6d1 100644
--- a/loader/i386/pc/chainloader.c
+++ b/loader/i386/pc/chainloader.c
@@ -31,6 +31,7 @@
 #include <grub/machine/memory.h>
 #include <grub/dl.h>
 #include <grub/command.h>
+#include <grub/msdos_partition.h>
 #include <grub/machine/biosnum.h>
 #include <grub/i18n.h>
 #include <grub/video.h>
@@ -98,10 +99,22 @@ grub_chainloader_cmd (const char *filename, grub_chainloader_flags_t flags)
   dev = grub_device_open (0);
   if (dev && dev->disk && dev->disk->partition)
     {
-      grub_disk_read (dev->disk, dev->disk->partition->offset, 446, 64,
-		      (void *) GRUB_MEMORY_MACHINE_PART_TABLE_ADDR);
-      part_addr = (void *) (GRUB_MEMORY_MACHINE_PART_TABLE_ADDR
-			    + (dev->disk->partition->index << 4));
+      grub_disk_t disk = dev->disk;
+
+      if (disk)
+	{
+	  grub_partition_t p = disk->partition;
+
+	  if (p && grub_strcmp (p->partmap->name, "part_msdos") == 0)
+	    {
+	      disk->partition = p->parent;
+	      grub_disk_read (disk, p->offset, 446, 64,
+			      (void *) GRUB_MEMORY_MACHINE_PART_TABLE_ADDR);
+	      part_addr = (void *) (GRUB_MEMORY_MACHINE_PART_TABLE_ADDR
+				    + (p->index << 4));
+	      disk->partition = p;
+	    }
+	}
     }
 
   if (dev)
diff --git a/partmap/acorn.c b/partmap/acorn.c
index 081b6ee94..12ef9c781 100644
--- a/partmap/acorn.c
+++ b/partmap/acorn.c
@@ -96,21 +96,17 @@ acorn_partition_map_iterate (grub_disk_t disk,
 					  const grub_partition_t partition))
 {
   struct grub_partition part;
-  struct grub_disk raw;
   struct linux_part map[LINUX_MAP_ENTRIES];
   int i;
-  grub_disk_addr_t sector;
+  grub_disk_addr_t sector = 0;
   grub_err_t err;
 
-  /* Enforce raw disk access.  */
-  raw = *disk;
-  raw.partition = 0;
-
-  err = acorn_partition_map_find (&raw, map, &sector);
+  err = acorn_partition_map_find (disk, map, &sector);
   if (err)
     return err;
 
   part.partmap = &grub_acorn_partition_map;
+  part.data = 0;
 
   for (i = 0; i != LINUX_MAP_ENTRIES; ++i)
     {
@@ -121,7 +117,7 @@ acorn_partition_map_iterate (grub_disk_t disk,
       part.start = sector + map[i].start;
       part.len = map[i].size;
       part.offset = 6;
-      part.index = i;
+      part.number = part.index = i;
 
       if (hook (disk, &part))
 	return grub_errno;
@@ -130,53 +126,6 @@ acorn_partition_map_iterate (grub_disk_t disk,
   return GRUB_ERR_NONE;
 }
 
-
-static grub_partition_t
-acorn_partition_map_probe (grub_disk_t disk, const char *str)
-{
-  struct linux_part map[LINUX_MAP_ENTRIES];
-  struct grub_disk raw = *disk;
-  unsigned long partnum = grub_strtoul (str, 0, 10) - 1;
-  grub_disk_addr_t sector;
-  grub_err_t err;
-  grub_partition_t p;
-
-  /* Enforce raw disk access.  */
-  raw.partition = 0;
-
-  /* Get the partition number.  */
-  if (partnum > LINUX_MAP_ENTRIES)
-    goto fail;
-
-  err = acorn_partition_map_find (&raw, map, &sector);
-  if (err)
-    return 0;
-
-  if (map[partnum].magic != LINUX_NATIVE_MAGIC
-      && map[partnum].magic != LINUX_SWAP_MAGIC)
-    goto fail;
-
-  p = grub_malloc (sizeof (struct grub_partition));
-  if (! p)
-    return 0;
-
-  p->start = sector + map[partnum].start;
-  p->len = map[partnum].size;
-  p->offset = 6;
-  p->index = partnum;
-  return p;
-
-fail:
-  grub_error (GRUB_ERR_BAD_FILENAME, "invalid partition");
-  return 0;
-}
-
-
-static char *
-acorn_partition_map_get_name (const grub_partition_t p)
-{
-  return grub_xasprintf ("%d", p->index + 1);
-}
 
 
 /* Partition map type.  */
@@ -184,8 +133,6 @@ static struct grub_partition_map grub_acorn_partition_map =
 {
   .name = "part_acorn",
   .iterate = acorn_partition_map_iterate,
-  .probe = acorn_partition_map_probe,
-  .get_name = acorn_partition_map_get_name
 };
 
 GRUB_MOD_INIT(acorn_partition_map)
diff --git a/partmap/amiga.c b/partmap/amiga.c
index f832db354..2c6a5afa2 100644
--- a/partmap/amiga.c
+++ b/partmap/amiga.c
@@ -76,20 +76,15 @@ amiga_partition_map_iterate (grub_disk_t disk,
 {
   struct grub_partition part;
   struct grub_amiga_rdsk rdsk;
-  struct grub_disk raw;
   int partno = 0;
   int next = -1;
   unsigned pos;
 
-  /* Enforce raw disk access.  */
-  raw = *disk;
-  raw.partition = 0;
-
   /* The RDSK block is one of the first 15 blocks.  */
   for (pos = 0; pos < 15; pos++)
     {
       /* Read the RDSK block which is a descriptor for the entire disk.  */
-      if (grub_disk_read (&raw, pos, 0, sizeof (rdsk), &rdsk))
+      if (grub_disk_read (disk, pos, 0, sizeof (rdsk), &rdsk))
 	return grub_errno;
 
       if (grub_strcmp ((char *) rdsk.magic, "RDSK") == 0)
@@ -104,13 +99,15 @@ amiga_partition_map_iterate (grub_disk_t disk,
     return grub_error (GRUB_ERR_BAD_PART_TABLE,
 		       "Amiga partition map not found");
 
+  part.data = 0;
+
   /* The end of the partition list is marked using "-1".  */
   while (next != -1)
     {
       struct grub_amiga_partition apart;
 
       /* Read the RDSK block which is a descriptor for the entire disk.  */
-      if (grub_disk_read (&raw, next, 0, sizeof (apart), &apart))
+      if (grub_disk_read (disk, next, 0, sizeof (apart), &apart))
 	return grub_errno;
 
       /* Calculate the first block and the size of the partition.  */
@@ -123,7 +120,8 @@ amiga_partition_map_iterate (grub_disk_t disk,
 		  * grub_be_to_cpu32 (apart.block_per_track));
 
       part.offset = (grub_off_t) next * 512;
-      part.index = partno;
+      part.number = partno;
+      part.index = 0;
       part.partmap = &grub_amiga_partition_map;
 
       if (hook (disk, &part))
@@ -136,65 +134,12 @@ amiga_partition_map_iterate (grub_disk_t disk,
   return 0;
 }
 
-
-static grub_partition_t
-amiga_partition_map_probe (grub_disk_t disk, const char *str)
-{
-  grub_partition_t p = 0;
-  int partnum = 0;
-  char *s = (char *) str;
-
-  auto int find_func (grub_disk_t d, const grub_partition_t partition);
-
-  int find_func (grub_disk_t d __attribute__ ((unused)),
-		 const grub_partition_t partition)
-    {
-      if (partnum == partition->index)
-	{
-	  p = (grub_partition_t) grub_malloc (sizeof (*p));
-	  if (! p)
-	    return 1;
-
-	  grub_memcpy (p, partition, sizeof (*p));
-	  return 1;
-	}
-
-      return 0;
-    }
-
-  /* Get the partition number.  */
-  partnum = grub_strtoul (s, 0, 10) - 1;
-  if (grub_errno)
-    {
-      grub_error (GRUB_ERR_BAD_FILENAME, "invalid partition");
-      return 0;
-    }
-
-  if (amiga_partition_map_iterate (disk, find_func))
-    goto fail;
-
-  return p;
-
- fail:
-  grub_free (p);
-  return 0;
-}
-
-
-static char *
-amiga_partition_map_get_name (const grub_partition_t p)
-{
-  return grub_xasprintf ("%d", p->index + 1);
-}
-
 
 /* Partition map type.  */
 static struct grub_partition_map grub_amiga_partition_map =
   {
     .name = "part_amiga",
     .iterate = amiga_partition_map_iterate,
-    .probe = amiga_partition_map_probe,
-    .get_name = amiga_partition_map_get_name
   };
 
 GRUB_MOD_INIT(amiga_partition_map)
diff --git a/partmap/apple.c b/partmap/apple.c
index a1a645acf..40c59f517 100644
--- a/partmap/apple.c
+++ b/partmap/apple.c
@@ -105,17 +105,12 @@ apple_partition_map_iterate (grub_disk_t disk,
   struct grub_partition part;
   struct grub_apple_header aheader;
   struct grub_apple_part apart;
-  struct grub_disk raw;
   int partno = 0, partnum = 0;
   unsigned pos;
 
-  /* Enforce raw disk access.  */
-  raw = *disk;
-  raw.partition = 0;
-
   part.partmap = &grub_apple_partition_map;
 
-  if (grub_disk_read (&raw, 0, 0, sizeof (aheader), &aheader))
+  if (grub_disk_read (disk, 0, 0, sizeof (aheader), &aheader))
     return grub_errno;
 
   if (grub_be_to_cpu16 (aheader.magic) != GRUB_APPLE_HEADER_MAGIC)
@@ -127,14 +122,17 @@ apple_partition_map_iterate (grub_disk_t disk,
       goto fail;
     }
 
+  part.data = 0;
   pos = grub_be_to_cpu16 (aheader.blocksize);
 
   do
     {
-      if (grub_disk_read (&raw, pos / GRUB_DISK_SECTOR_SIZE,
-			  pos % GRUB_DISK_SECTOR_SIZE,
-			  sizeof (struct grub_apple_part),  &apart))
-	return grub_errno;
+       part.offset = pos / GRUB_DISK_SECTOR_SIZE;
+       part.index = pos % GRUB_DISK_SECTOR_SIZE;
+
+       if (grub_disk_read (disk, part.offset, part.index,
+			   sizeof (struct grub_apple_part),  &apart))
+	 return grub_errno;
 
       if (grub_be_to_cpu16 (apart.magic) != GRUB_APPLE_PART_MAGIC)
 	{
@@ -156,6 +154,7 @@ apple_partition_map_iterate (grub_disk_t disk,
 	/ GRUB_DISK_SECTOR_SIZE;
       part.offset = pos;
       part.index = partno;
+      part.number = partno;
 
       grub_dprintf ("partition",
 		    "partition %d: name %s, type %s, start 0x%x, len 0x%x\n",
@@ -179,65 +178,12 @@ apple_partition_map_iterate (grub_disk_t disk,
 		     "Apple partition map not found");
 }
 
-
-static grub_partition_t
-apple_partition_map_probe (grub_disk_t disk, const char *str)
-{
-  grub_partition_t p = 0;
-  int partnum = 0;
-  char *s = (char *) str;
-
-  auto int find_func (grub_disk_t d, const grub_partition_t partition);
-
-  int find_func (grub_disk_t d __attribute__ ((unused)),
-		 const grub_partition_t partition)
-    {
-      if (partnum == partition->index)
-	{
-	  p = (grub_partition_t) grub_malloc (sizeof (*p));
-	  if (! p)
-	    return 1;
-
-	  grub_memcpy (p, partition, sizeof (*p));
-	  return 1;
-	}
-
-      return 0;
-    }
-
-  /* Get the partition number.  */
-  partnum = grub_strtoul (s, 0, 10) - 1;
-  if (grub_errno)
-    {
-      grub_error (GRUB_ERR_BAD_FILENAME, "invalid partition");
-      return 0;
-    }
-
-  if (apple_partition_map_iterate (disk, find_func))
-    goto fail;
-
-  return p;
-
- fail:
-  grub_free (p);
-  return 0;
-}
-
-
-static char *
-apple_partition_map_get_name (const grub_partition_t p)
-{
-  return grub_xasprintf ("%d", p->index + 1);
-}
-
 
 /* Partition map type.  */
 static struct grub_partition_map grub_apple_partition_map =
   {
     .name = "part_apple",
     .iterate = apple_partition_map_iterate,
-    .probe = apple_partition_map_probe,
-    .get_name = apple_partition_map_get_name
   };
 
 GRUB_MOD_INIT(apple_partition_map)
diff --git a/partmap/bsdlabel.c b/partmap/bsdlabel.c
new file mode 100644
index 000000000..861388164
--- /dev/null
+++ b/partmap/bsdlabel.c
@@ -0,0 +1,97 @@
+/* bsdlabel.c - Read BSD style partition tables.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2004,2005,2006,2007,2008,2009  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/partition.h>
+#include <grub/bsdlabel.h>
+#include <grub/disk.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/dl.h>
+
+static struct grub_partition_map grub_bsdlabel_partition_map;
+
+
+static grub_err_t
+bsdlabel_partition_map_iterate (grub_disk_t disk,
+				int (*hook) (grub_disk_t disk,
+					     const grub_partition_t partition))
+{
+  struct grub_partition_bsd_disk_label label;
+  struct grub_partition p;
+  grub_disk_addr_t delta = 0;
+  unsigned pos;
+
+  /* BSDLabel offsets are absolute even when it's embed inside partition.  */
+  delta = grub_partition_get_start (disk->partition);
+
+  /* Read the BSD label.  */
+  if (grub_disk_read (disk, GRUB_PC_PARTITION_BSD_LABEL_SECTOR,
+		      0, sizeof (label), &label))
+    return grub_errno;
+
+  /* Check if it is valid.  */
+  if (label.magic != grub_cpu_to_le32 (GRUB_PC_PARTITION_BSD_LABEL_MAGIC))
+    return grub_error (GRUB_ERR_BAD_PART_TABLE, "no signature");
+
+  pos = sizeof (label) + GRUB_PC_PARTITION_BSD_LABEL_SECTOR
+    * GRUB_DISK_SECTOR_SIZE;
+
+  for (p.number = 0;
+       p.number < grub_cpu_to_le16 (label.num_partitions);
+       p.number++)
+    {
+      struct grub_partition_bsd_entry be;
+
+      p.offset = pos / GRUB_DISK_SECTOR_SIZE;
+      p.index = pos % GRUB_DISK_SECTOR_SIZE;
+
+      if (grub_disk_read (disk, p.offset, p.index, sizeof (be),  &be))
+	return grub_errno;
+
+      p.start = grub_le_to_cpu32 (be.offset) - delta;
+      p.len = grub_le_to_cpu32 (be.size);
+      p.partmap = &grub_bsdlabel_partition_map;
+
+      if (be.fs_type != GRUB_PC_PARTITION_BSD_TYPE_UNUSED)
+	if (hook (disk, &p))
+	  return grub_errno;
+
+      pos += sizeof (struct grub_partition_bsd_entry);
+    }
+
+  return GRUB_ERR_NONE;
+}
+
+
+/* Partition map type.  */
+static struct grub_partition_map grub_bsdlabel_partition_map =
+  {
+    .name = "part_bsd",
+    .iterate = bsdlabel_partition_map_iterate,
+  };
+
+GRUB_MOD_INIT(bsd_partition_map)
+{
+  grub_partition_map_register (&grub_bsdlabel_partition_map);
+}
+
+GRUB_MOD_FINI(bsd_partition_map)
+{
+  grub_partition_map_unregister (&grub_bsdlabel_partition_map);
+}
diff --git a/partmap/gpt.c b/partmap/gpt.c
index cb1229bee..922a7303b 100644
--- a/partmap/gpt.c
+++ b/partmap/gpt.c
@@ -44,18 +44,13 @@ gpt_partition_map_iterate (grub_disk_t disk,
   struct grub_partition part;
   struct grub_gpt_header gpt;
   struct grub_gpt_partentry entry;
-  struct grub_disk raw;
   struct grub_msdos_partition_mbr mbr;
   grub_uint64_t entries;
   unsigned int i;
   int last_offset = 0;
 
-  /* Enforce raw disk access.  */
-  raw = *disk;
-  raw.partition = 0;
-
   /* Read the protective MBR.  */
-  if (grub_disk_read (&raw, 0, 0, sizeof (mbr), &mbr))
+  if (grub_disk_read (disk, 0, 0, sizeof (mbr), &mbr))
     return grub_errno;
 
   /* Check if it is valid.  */
@@ -67,7 +62,7 @@ gpt_partition_map_iterate (grub_disk_t disk,
     return grub_error (GRUB_ERR_BAD_PART_TABLE, "no GPT partition map found");
 
   /* Read the GPT header.  */
-  if (grub_disk_read (&raw, 1, 0, sizeof (gpt), &gpt))
+  if (grub_disk_read (disk, 1, 0, sizeof (gpt), &gpt))
     return grub_errno;
 
   if (grub_memcmp (gpt.magic, grub_gpt_magic, sizeof (grub_gpt_magic)))
@@ -76,11 +71,15 @@ gpt_partition_map_iterate (grub_disk_t disk,
   grub_dprintf ("gpt", "Read a valid GPT header\n");
 
   entries = grub_le_to_cpu64 (gpt.partitions);
+  part.data = grub_malloc (sizeof (entry));
   for (i = 0; i < grub_le_to_cpu32 (gpt.maxpart); i++)
     {
-      if (grub_disk_read (&raw, entries, last_offset,
+      if (grub_disk_read (disk, entries, last_offset,
 			  sizeof (entry), &entry))
-	return grub_errno;
+	{
+	  grub_free (part.data);
+	  return grub_errno;
+	}
 
       if (grub_memcmp (&grub_gpt_partition_type_empty, &entry.type,
 		       sizeof (grub_gpt_partition_type_empty)))
@@ -90,16 +89,17 @@ gpt_partition_map_iterate (grub_disk_t disk,
 	  part.len = (grub_le_to_cpu64 (entry.end)
 		      - grub_le_to_cpu64 (entry.start) + 1);
 	  part.offset = entries;
-	  part.index = i;
+	  part.number = i;
+	  part.index = last_offset;
 	  part.partmap = &grub_gpt_partition_map;
-	  part.data = &entry;
+	  grub_memcpy (part.data, &entry, sizeof (entry));
 
 	  grub_dprintf ("gpt", "GPT entry %d: start=%lld, length=%lld\n", i,
 			(unsigned long long) part.start,
 			(unsigned long long) part.len);
 
 	  if (hook (disk, &part))
-	    return 1;
+	    return grub_errno;
 	}
 
       last_offset += grub_le_to_cpu32 (gpt.partentry_size);
@@ -110,59 +110,9 @@ gpt_partition_map_iterate (grub_disk_t disk,
 	}
     }
 
-  return 0;
-}
+  grub_free (part.data);
 
-
-static grub_partition_t
-gpt_partition_map_probe (grub_disk_t disk, const char *str)
-{
-  grub_partition_t p = 0;
-  int partnum = 0;
-  char *s = (char *) str;
-
-  auto int find_func (grub_disk_t d, const grub_partition_t partition);
-
-  int find_func (grub_disk_t d __attribute__ ((unused)),
-		 const grub_partition_t partition)
-    {
-      if (partnum == partition->index)
-	{
-	  p = (grub_partition_t) grub_malloc (sizeof (*p));
-	  if (! p)
-	    return 1;
-
-	  grub_memcpy (p, partition, sizeof (*p));
-	  return 1;
-	}
-
-      return 0;
-    }
-
-  /* Get the partition number.  */
-  partnum = grub_strtoul (s, 0, 10) - 1;
-  if (grub_errno)
-    {
-      grub_error (GRUB_ERR_BAD_FILENAME, "invalid partition");
-      return 0;
-    }
-
-  gpt_partition_map_iterate (disk, find_func);
-  if (grub_errno)
-    goto fail;
-
-  return p;
-
- fail:
-  grub_free (p);
-  return 0;
-}
-
-
-static char *
-gpt_partition_map_get_name (const grub_partition_t p)
-{
-  return grub_xasprintf ("%d", p->index + 1);
+  return GRUB_ERR_NONE;
 }
 
 
@@ -171,8 +121,6 @@ static struct grub_partition_map grub_gpt_partition_map =
   {
     .name = "part_gpt",
     .iterate = gpt_partition_map_iterate,
-    .probe = gpt_partition_map_probe,
-    .get_name = gpt_partition_map_get_name
   };
 
 GRUB_MOD_INIT(gpt_partition_map)
diff --git a/partmap/msdos.c b/partmap/msdos.c
index 1c3861cc7..0fbf7ef3d 100644
--- a/partmap/msdos.c
+++ b/partmap/msdos.c
@@ -27,87 +27,21 @@
 static struct grub_partition_map grub_msdos_partition_map;
 
 
-/* Parse the partition representation in STR and return a partition.  */
-static grub_partition_t
-grub_partition_parse (const char *str)
-{
-  grub_partition_t p;
-  struct grub_msdos_partition *pcdata;
-
-  char *s = (char *) str;
-
-  p = (grub_partition_t) grub_malloc (sizeof (*p));
-  if (! p)
-    return 0;
-
-  pcdata = (struct grub_msdos_partition *) grub_malloc (sizeof (*pcdata));
-  if (! pcdata)
-    goto fail;
-
-  p->data = pcdata;
-  p->partmap = &grub_msdos_partition_map;
-
-  /* Initialize some of the fields with invalid values.  */
-  pcdata->bsd_part = pcdata->dos_type = pcdata->bsd_type = p->index = -1;
-
-  /* Get the DOS partition number. The number is counted from one for
-     the user interface, and from zero internally.  */
-  pcdata->dos_part = grub_strtoul (s, &s, 0) - 1;
-
-  if (grub_errno)
-    {
-      /* Not found. Maybe only a BSD label is specified.  */
-      pcdata->dos_part = -1;
-      grub_errno = GRUB_ERR_NONE;
-    }
-  else if (*s == ',')
-    s++;
-
-  if (*s)
-    {
-      if (*s >= 'a' && *s <= 'h')
-	{
-	  pcdata->bsd_part = *s - 'a';
-	  s++;
-	}
-
-      if (*s)
-	goto fail;
-    }
-
-  if (pcdata->dos_part == -1 && pcdata->bsd_part == -1)
-    goto fail;
-
-  return p;
-
- fail:
-  grub_free (p);
-  grub_free (pcdata);
-  grub_error (GRUB_ERR_BAD_FILENAME, "invalid partition");
-  return 0;
-}
-
 static grub_err_t
 pc_partition_map_iterate (grub_disk_t disk,
 			  int (*hook) (grub_disk_t disk,
 				       const grub_partition_t partition))
 {
   struct grub_partition p;
-  struct grub_msdos_partition pcdata;
   struct grub_msdos_partition_mbr mbr;
-  struct grub_msdos_partition_disk_label label;
-  struct grub_disk raw;
   int labeln = 0;
   grub_disk_addr_t lastaddr;
-
-  /* Enforce raw disk access.  */
-  raw = *disk;
-  raw.partition = 0;
+  grub_disk_addr_t ext_offset;
 
   p.offset = 0;
-  pcdata.ext_offset = 0;
-  pcdata.dos_part = -1;
-  p.data = &pcdata;
+  ext_offset = 0;
+  p.data = 0;
+  p.number = -1;
   p.partmap = &grub_msdos_partition_map;
 
   /* Any value different than `p.offset' will satisfy the check during
@@ -120,7 +54,7 @@ pc_partition_map_iterate (grub_disk_t disk,
       struct grub_msdos_partition_entry *e;
 
       /* Read the MBR.  */
-      if (grub_disk_read (&raw, p.offset, 0, sizeof (mbr), &mbr))
+      if (grub_disk_read (disk, p.offset, 0, sizeof (mbr), &mbr))
 	goto finish;
 
       /* This is our loop-detection algorithm. It works the following way:
@@ -150,13 +84,10 @@ pc_partition_map_iterate (grub_disk_t disk,
 
 	  p.start = p.offset + grub_le_to_cpu32 (e->start);
 	  p.len = grub_le_to_cpu32 (e->length);
-	  pcdata.bsd_part = -1;
-	  pcdata.dos_type = e->type;
-	  pcdata.bsd_type = -1;
 
 	  grub_dprintf ("partition",
 			"partition %d: flag 0x%x, type 0x%x, start 0x%llx, len 0x%llx\n",
-			p.index, e->flag, pcdata.dos_type,
+			p.index, e->flag, e->type,
 			(unsigned long long) p.start,
 			(unsigned long long) p.len);
 
@@ -168,59 +99,15 @@ pc_partition_map_iterate (grub_disk_t disk,
 	  if (! grub_msdos_partition_is_empty (e->type)
 	      && ! grub_msdos_partition_is_extended (e->type))
 	    {
-	      pcdata.dos_part++;
+	      p.number++;
 
 	      if (hook (disk, &p))
-		return 1;
-
-	      /* Check if this is a BSD partition.  */
-	      if (grub_msdos_partition_is_bsd (e->type))
-		{
-		  /* Check if the BSD label is within the DOS partition.  */
-		  if (p.len <= GRUB_PC_PARTITION_BSD_LABEL_SECTOR)
-		    {
-		      grub_dprintf ("partition", "no space for disk label\n");
-		      continue;
-		    }
-		  /* Read the BSD label.  */
-		  if (grub_disk_read (&raw,
-				      (p.start
-				       + GRUB_PC_PARTITION_BSD_LABEL_SECTOR),
-				      0,
-				      sizeof (label),
-				      &label))
-		    goto finish;
-
-		  /* Check if it is valid.  */
-		  if (label.magic
-		      != grub_cpu_to_le32 (GRUB_PC_PARTITION_BSD_LABEL_MAGIC))
-		    {
-		      grub_dprintf ("partition",
-				    "invalid disk label magic 0x%x on partition %d\n",
-				    label.magic, p.index);
-		      continue;
-		    }
-		  for (pcdata.bsd_part = 0;
-		       pcdata.bsd_part < grub_cpu_to_le16 (label.num_partitions);
-		       pcdata.bsd_part++)
-		    {
-		      struct grub_msdos_partition_bsd_entry *be
-			= label.entries + pcdata.bsd_part;
-
-		      p.start = grub_le_to_cpu32 (be->offset);
-		      p.len = grub_le_to_cpu32 (be->size);
-		      pcdata.bsd_type = be->fs_type;
-
-		      if (be->fs_type != GRUB_PC_PARTITION_BSD_TYPE_UNUSED)
-			if (hook (disk, &p))
-			  return 1;
-		    }
-		}
+		return grub_errno;
 	    }
-	  else if (pcdata.dos_part < 4)
+	  else if (p.number < 4)
 	    /* If this partition is a logical one, shouldn't increase the
 	       partition number.  */
-	    pcdata.dos_part++;
+	    p.number++;
 	}
 
       /* Find an extended partition.  */
@@ -230,9 +117,9 @@ pc_partition_map_iterate (grub_disk_t disk,
 
 	  if (grub_msdos_partition_is_extended (e->type))
 	    {
-	      p.offset = pcdata.ext_offset + grub_le_to_cpu32 (e->start);
-	      if (! pcdata.ext_offset)
-		pcdata.ext_offset = p.offset;
+	      p.offset = ext_offset + grub_le_to_cpu32 (e->start);
+	      if (! ext_offset)
+		ext_offset = p.offset;
 
 	      break;
 	    }
@@ -247,78 +134,12 @@ pc_partition_map_iterate (grub_disk_t disk,
   return grub_errno;
 }
 
-
-static grub_partition_t
-pc_partition_map_probe (grub_disk_t disk, const char *str)
-{
-  grub_partition_t p;
-  struct grub_msdos_partition *pcdata;
-
-  auto int find_func (grub_disk_t d, const grub_partition_t partition);
-
-  int find_func (grub_disk_t d __attribute__ ((unused)),
-		 const grub_partition_t partition)
-    {
-      struct grub_msdos_partition *partdata = partition->data;
-
-      if ((pcdata->dos_part == partdata->dos_part || pcdata->dos_part == -1)
-	  && pcdata->bsd_part == partdata->bsd_part)
-	{
-	  grub_memcpy (p, partition, sizeof (*p));
-	  p->data = pcdata;
-	  grub_memcpy (pcdata, partdata, sizeof (*pcdata));
-	  return 1;
-	}
-
-      return 0;
-    }
-
-  p = grub_partition_parse (str);
-  if (! p)
-    return 0;
-
-  pcdata = p->data;
-  pc_partition_map_iterate (disk, find_func);
-  if (grub_errno)
-    goto fail;
-
-  if (p->index < 0)
-    {
-      grub_error (GRUB_ERR_BAD_DEVICE, "no such partition");
-      goto fail;
-    }
-
-  return p;
-
- fail:
-  grub_free (p);
-  grub_free (pcdata);
-  return 0;
-}
-
-
-static char *
-pc_partition_map_get_name (const grub_partition_t p)
-{
-  struct grub_msdos_partition *pcdata = p->data;
-
-  if (pcdata->bsd_part < 0)
-    return grub_xasprintf ("%d", pcdata->dos_part + 1);
-  else if (pcdata->dos_part < 0)
-    return grub_xasprintf ("%c", pcdata->bsd_part + 'a');
-  else
-    return grub_xasprintf ("%d,%c", pcdata->dos_part + 1,
-			  pcdata->bsd_part + 'a');
-}
-
 
 /* Partition map type.  */
 static struct grub_partition_map grub_msdos_partition_map =
   {
     .name = "part_msdos",
     .iterate = pc_partition_map_iterate,
-    .probe = pc_partition_map_probe,
-    .get_name = pc_partition_map_get_name
   };
 
 GRUB_MOD_INIT(pc_partition_map)
diff --git a/partmap/sun.c b/partmap/sun.c
index 42cf0d598..ff01d1018 100644
--- a/partmap/sun.c
+++ b/partmap/sun.c
@@ -88,19 +88,15 @@ sun_partition_map_iterate (grub_disk_t disk,
 					const grub_partition_t partition))
 {
   grub_partition_t p;
-  struct grub_disk raw;
   struct grub_sun_block block;
   int partnum;
 
-  raw = *disk;
-  raw.partition = 0;
-
   p = (grub_partition_t) grub_zalloc (sizeof (struct grub_partition));
   if (! p)
     return grub_errno;
 
   p->partmap = &grub_sun_partition_map;
-  if (grub_disk_read (&raw, 0, 0, sizeof (struct grub_sun_block),
+  if (grub_disk_read (disk, 0, 0, sizeof (struct grub_sun_block),
 		      &block) == GRUB_ERR_NONE)
     {
       if (GRUB_PARTMAP_SUN_MAGIC != grub_be_to_cpu16 (block.magic))
@@ -124,7 +120,7 @@ sun_partition_map_iterate (grub_disk_t disk,
 		      * grub_be_to_cpu16 (block.ntrks)
 		      * grub_be_to_cpu16 (block.nsect));
 	  p->len = grub_be_to_cpu32 (desc->num_sectors);
-	  p->index = partnum;
+	  p->number = p->index = partnum;
 	  if (p->len)
 	    {
 	      if (hook (disk, p))
@@ -138,62 +134,11 @@ sun_partition_map_iterate (grub_disk_t disk,
   return grub_errno;
 }
 
-static grub_partition_t
-sun_partition_map_probe (grub_disk_t disk, const char *str)
-{
-  grub_partition_t p = 0;
-  int partnum = 0;
-  char *s = (char *) str;
-
-  auto int find_func (grub_disk_t d, const grub_partition_t partition);
-
-  int find_func (grub_disk_t d __attribute__ ((unused)),
-		 const grub_partition_t partition)
-    {
-      if (partnum == partition->index)
-        {
-          p = (grub_partition_t) grub_malloc (sizeof (*p));
-          if (p)
-            grub_memcpy (p, partition, sizeof (*p));
-
-          return 1;
-        }
-
-      return 0;
-    }
-
-  grub_errno = GRUB_ERR_NONE;
-  partnum = grub_strtoul (s, 0, 10) - 1;
-  if (grub_errno == GRUB_ERR_NONE)
-    {
-      if (sun_partition_map_iterate (disk, find_func))
-        {
-          grub_free (p);
-          p = 0;
-        }
-    }
-  else
-    {
-      grub_error (GRUB_ERR_BAD_FILENAME, "invalid partition");
-      p = 0;
-    }
-
-  return p;
-}
-
-static char *
-sun_partition_map_get_name (const grub_partition_t p)
-{
-  return grub_xasprintf ("%d", p->index + 1);
-}
-
 /* Partition map type.  */
 static struct grub_partition_map grub_sun_partition_map =
   {
     .name = "part_sun",
     .iterate = sun_partition_map_iterate,
-    .probe = sun_partition_map_probe,
-    .get_name = sun_partition_map_get_name
   };
 
 GRUB_MOD_INIT(sun_partition_map)
diff --git a/parttool/msdospart.c b/parttool/msdospart.c
index dbb25bc52..b1fe689f4 100644
--- a/parttool/msdospart.c
+++ b/parttool/msdospart.c
@@ -49,7 +49,7 @@ static grub_err_t grub_pcpart_boot (const grub_device_t dev,
 
   index = dev->disk->partition->index;
   part = dev->disk->partition;
-  dev->disk->partition = 0;
+  dev->disk->partition = part->parent;
 
   /* Read the MBR.  */
   if (grub_disk_read (dev->disk, 0, 0, sizeof (mbr), &mbr))
@@ -96,7 +96,7 @@ static grub_err_t grub_pcpart_type (const grub_device_t dev,
 
   index = dev->disk->partition->index;
   part = dev->disk->partition;
-  dev->disk->partition = 0;
+  dev->disk->partition = part->parent;
 
   /* Read the parttable.  */
   if (grub_disk_read (dev->disk, part->offset, 0,
diff --git a/util/grub-probe.c b/util/grub-probe.c
index ba2fe4c35..948f10dcf 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -82,13 +82,16 @@ grub_refresh (void)
 static void
 probe_partmap (grub_disk_t disk)
 {
+  grub_partition_t part;
+
   if (disk->partition == NULL)
     {
       grub_util_info ("no partition map found for %s", disk->name);
       return;
     }
 
-  printf ("%s\n", disk->partition->partmap->name);
+  for (part = disk->partition; part; part = part->parent)
+    printf ("%s\n", part->partmap->name);
 }
 
 static int
diff --git a/util/hostdisk.c b/util/hostdisk.c
index a594f75ec..0bccf4ca7 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -334,10 +334,13 @@ open_device (const grub_disk_t disk, grub_disk_addr_t sector, int flags)
   {
     int is_partition = 0;
     char dev[PATH_MAX];
+    grub_disk_addr_t part_start = 0;
+
+    part_start = grub_partition_get_start (disk->partition);
 
     strcpy (dev, map[disk->id].device);
     if (disk->partition && strncmp (map[disk->id].device, "/dev/", 5) == 0)
-      is_partition = linux_find_partition (dev, disk->partition->start);
+      is_partition = linux_find_partition (dev, part_start);
 
     /* Open the partition.  */
     grub_dprintf ("hostdisk", "opening the device `%s' in open_device()\n", dev);
@@ -353,7 +356,7 @@ open_device (const grub_disk_t disk, grub_disk_addr_t sector, int flags)
     ioctl (fd, BLKFLSBUF, 0);
 
     if (is_partition)
-      sector -= disk->partition->start;
+      sector -= part_start;
   }
 #else /* ! __linux__ */
 #if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
@@ -952,39 +955,25 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
     int find_partition (grub_disk_t disk __attribute__ ((unused)),
 			const grub_partition_t partition)
       {
- 	struct grub_msdos_partition *pcdata = NULL;
+	grub_disk_addr_t part_start = 0;
+	grub_util_info ("Partition %d starts from %lu",
+			partition->number, partition->start);
 
-	if (strcmp (partition->partmap->name, "part_msdos") == 0)
-	  pcdata = partition->data;
+	part_start = grub_partition_get_start (partition);
 
-	if (pcdata)
+	if (hdg.start == part_start)
 	  {
-	    if (pcdata->bsd_part < 0)
-	      grub_util_info ("DOS partition %d starts from %lu",
-			      pcdata->dos_part, partition->start);
-	    else
-	      grub_util_info ("BSD partition %d,%c starts from %lu",
-			      pcdata->dos_part, pcdata->bsd_part + 'a',
-			      partition->start);
-	  }
-	else
-	  {
-	      grub_util_info ("Partition %d starts from %lu",
-			      partition->index, partition->start);
-	  }
-
-	if (hdg.start == partition->start)
-	  {
-	    if (pcdata)
+	    if (partition->parent)
 	      {
-		dos_part = pcdata->dos_part;
-		bsd_part = pcdata->bsd_part;
+		dos_part = partition->parent->number;
+		bsd_part = partition->number;
 	      }
 	    else
 	      {
-		dos_part = partition->index;
+		dos_part = partition->number;
 		bsd_part = -1;
 	      }
+
 	    return 1;
 	  }
 
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 4e2517ef2..15351ca5a 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -116,15 +116,10 @@ setup (const char *dir,
   int NESTED_FUNC_ATTR find_usable_region_msdos (grub_disk_t disk __attribute__ ((unused)),
 						 const grub_partition_t p)
     {
-      struct grub_msdos_partition *pcdata = p->data;
-
       /* There's always an embed region, and it starts right after the MBR.  */
       embed_region.start = 1;
 
-      /* For its end offset, include as many dummy partitions as we can.  */
-      if (! grub_msdos_partition_is_empty (pcdata->dos_type)
-	  && ! grub_msdos_partition_is_bsd (pcdata->dos_type)
-	  && embed_region.end > p->start)
+      if (embed_region.end > p->start)
 	embed_region.end = p->start;
 
       return 0;
@@ -289,22 +284,19 @@ setup (const char *dir,
       /* Embed information about the installed location.  */
       if (root_dev->disk->partition)
 	{
-	  if (strcmp (root_dev->disk->partition->partmap->name,
-		      "part_msdos") == 0)
-	    {
-	      struct grub_msdos_partition *pcdata =
-		root_dev->disk->partition->data;
-	      dos_part = pcdata->dos_part;
-	      bsd_part = pcdata->bsd_part;
-	    }
-	  else if (strcmp (root_dev->disk->partition->partmap->name,
-			   "part_gpt") == 0)
-	    {
-	      dos_part = root_dev->disk->partition->index;
-	      bsd_part = -1;
-	    }
+	  if (root_dev->disk->partition->parent)
+ 	    {
+	      if (root_dev->disk->partition->parent->parent)
+		grub_util_error ("Installing on doubly nested partitions is "
+				 "not supported");
+	      dos_part = root_dev->disk->partition->parent->number;
+	      bsd_part = root_dev->disk->partition->number;
+ 	    }
 	  else
-	    grub_util_error (_("no DOS-style partitions found"));
+ 	    {
+	      dos_part = root_dev->disk->partition->number;
+ 	      bsd_part = -1;
+ 	    }
 	}
       else
 	dos_part = bsd_part = -1;
@@ -337,6 +329,8 @@ setup (const char *dir,
   int NESTED_FUNC_ATTR identify_partmap (grub_disk_t disk __attribute__ ((unused)),
 					 const grub_partition_t p)
     {
+      if (p->parent)
+	return 0;
       dest_partmap = p->partmap->name;
       return 1;
     }

From 85f90358b1cec1276994594e9def1cd4ce1de6f7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 19:33:53 +0100
Subject: [PATCH 0443/1628] Remove part_ prefix

---
 loader/i386/pc/chainloader.c  | 2 +-
 partmap/acorn.c               | 2 +-
 partmap/amiga.c               | 2 +-
 partmap/apple.c               | 2 +-
 partmap/bsdlabel.c            | 2 +-
 partmap/gpt.c                 | 2 +-
 partmap/msdos.c               | 2 +-
 partmap/sun.c                 | 2 +-
 parttool/msdospart.c          | 4 ++--
 util/grub-install.in          | 5 ++++-
 util/i386/efi/grub-install.in | 5 ++++-
 util/i386/pc/grub-setup.c     | 6 +++---
 util/ieee1275/grub-install.in | 5 ++++-
 13 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/loader/i386/pc/chainloader.c b/loader/i386/pc/chainloader.c
index 935f5a6d1..502031d0e 100644
--- a/loader/i386/pc/chainloader.c
+++ b/loader/i386/pc/chainloader.c
@@ -105,7 +105,7 @@ grub_chainloader_cmd (const char *filename, grub_chainloader_flags_t flags)
 	{
 	  grub_partition_t p = disk->partition;
 
-	  if (p && grub_strcmp (p->partmap->name, "part_msdos") == 0)
+	  if (p && grub_strcmp (p->partmap->name, "msdos") == 0)
 	    {
 	      disk->partition = p->parent;
 	      grub_disk_read (disk, p->offset, 446, 64,
diff --git a/partmap/acorn.c b/partmap/acorn.c
index 12ef9c781..0c3abf11d 100644
--- a/partmap/acorn.c
+++ b/partmap/acorn.c
@@ -131,7 +131,7 @@ acorn_partition_map_iterate (grub_disk_t disk,
 /* Partition map type.  */
 static struct grub_partition_map grub_acorn_partition_map =
 {
-  .name = "part_acorn",
+  .name = "acorn",
   .iterate = acorn_partition_map_iterate,
 };
 
diff --git a/partmap/amiga.c b/partmap/amiga.c
index 2c6a5afa2..5b6a4598f 100644
--- a/partmap/amiga.c
+++ b/partmap/amiga.c
@@ -138,7 +138,7 @@ amiga_partition_map_iterate (grub_disk_t disk,
 /* Partition map type.  */
 static struct grub_partition_map grub_amiga_partition_map =
   {
-    .name = "part_amiga",
+    .name = "amiga",
     .iterate = amiga_partition_map_iterate,
   };
 
diff --git a/partmap/apple.c b/partmap/apple.c
index 40c59f517..35bdcc8d7 100644
--- a/partmap/apple.c
+++ b/partmap/apple.c
@@ -182,7 +182,7 @@ apple_partition_map_iterate (grub_disk_t disk,
 /* Partition map type.  */
 static struct grub_partition_map grub_apple_partition_map =
   {
-    .name = "part_apple",
+    .name = "apple",
     .iterate = apple_partition_map_iterate,
   };
 
diff --git a/partmap/bsdlabel.c b/partmap/bsdlabel.c
index 861388164..f4df7e1fa 100644
--- a/partmap/bsdlabel.c
+++ b/partmap/bsdlabel.c
@@ -82,7 +82,7 @@ bsdlabel_partition_map_iterate (grub_disk_t disk,
 /* Partition map type.  */
 static struct grub_partition_map grub_bsdlabel_partition_map =
   {
-    .name = "part_bsd",
+    .name = "bsd",
     .iterate = bsdlabel_partition_map_iterate,
   };
 
diff --git a/partmap/gpt.c b/partmap/gpt.c
index 922a7303b..2c942e164 100644
--- a/partmap/gpt.c
+++ b/partmap/gpt.c
@@ -119,7 +119,7 @@ gpt_partition_map_iterate (grub_disk_t disk,
 /* Partition map type.  */
 static struct grub_partition_map grub_gpt_partition_map =
   {
-    .name = "part_gpt",
+    .name = "gpt",
     .iterate = gpt_partition_map_iterate,
   };
 
diff --git a/partmap/msdos.c b/partmap/msdos.c
index 0fbf7ef3d..accf3fdba 100644
--- a/partmap/msdos.c
+++ b/partmap/msdos.c
@@ -138,7 +138,7 @@ pc_partition_map_iterate (grub_disk_t disk,
 /* Partition map type.  */
 static struct grub_partition_map grub_msdos_partition_map =
   {
-    .name = "part_msdos",
+    .name = "msdos",
     .iterate = pc_partition_map_iterate,
   };
 
diff --git a/partmap/sun.c b/partmap/sun.c
index ff01d1018..6f8945026 100644
--- a/partmap/sun.c
+++ b/partmap/sun.c
@@ -137,7 +137,7 @@ sun_partition_map_iterate (grub_disk_t disk,
 /* Partition map type.  */
 static struct grub_partition_map grub_sun_partition_map =
   {
-    .name = "part_sun",
+    .name = "sun",
     .iterate = sun_partition_map_iterate,
   };
 
diff --git a/parttool/msdospart.c b/parttool/msdospart.c
index b1fe689f4..57921f35f 100644
--- a/parttool/msdospart.c
+++ b/parttool/msdospart.c
@@ -140,10 +140,10 @@ static grub_err_t grub_pcpart_type (const grub_device_t dev,
 
 GRUB_MOD_INIT (pcpart)
 {
-  activate_table_handle = grub_parttool_register ("part_msdos",
+  activate_table_handle = grub_parttool_register ("msdos",
 						  grub_pcpart_boot,
 						  grub_pcpart_bootargs);
-  type_table_handle = grub_parttool_register ("part_msdos",
+  type_table_handle = grub_parttool_register ("msdos",
 					      grub_pcpart_type,
 					      grub_pcpart_typeargs);
 
diff --git a/util/grub-install.in b/util/grub-install.in
index bb323d706..6672067b7 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -287,7 +287,10 @@ fi
 # Then the partition map module.  In order to support partition-less media,
 # this command is allowed to fail (--target=fs already grants us that the
 # filesystem will be accessible).
-partmap_module=`$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`
+partmap_module=
+for x in `$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`; do
+   partmap_module="$partmap_module part_$x";
+done
 
 # Device abstraction module, if any (lvm, raid).
 devabstraction_module=`$grub_probe --target=abstraction --device ${grub_device}`
diff --git a/util/i386/efi/grub-install.in b/util/i386/efi/grub-install.in
index caa7be7e4..b04bc59bd 100644
--- a/util/i386/efi/grub-install.in
+++ b/util/i386/efi/grub-install.in
@@ -194,7 +194,10 @@ fi
 # Then the partition map module.  In order to support partition-less media,
 # this command is allowed to fail (--target=fs already grants us that the
 # filesystem will be accessible).
-partmap_module=`$grub_probe --target=partmap --device-map=${device_map} ${grubdir} 2> /dev/null`
+partmap_module=
+for x in `$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`; do
+   partmap_module="$partmap_module part_$x";
+done
 
 # Device abstraction module, if any (lvm, raid).
 devabstraction_module=`$grub_probe --target=abstraction --device-map=${device_map} ${grubdir}`
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 15351ca5a..27c9cd434 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -343,16 +343,16 @@ setup (const char *dir,
       goto unable_to_embed;
     }
 
-  if (strcmp (dest_partmap, "part_msdos") == 0)
+  if (strcmp (dest_partmap, "msdos") == 0)
     grub_partition_iterate (dest_dev->disk, find_usable_region_msdos);
-  else if (strcmp (dest_partmap, "part_gpt") == 0)
+  else if (strcmp (dest_partmap, "gpt") == 0)
     grub_partition_iterate (dest_dev->disk, find_usable_region_gpt);
   else
     grub_util_error (_("No DOS-style partitions found"));
 
   if (embed_region.end == embed_region.start)
     {
-      if (! strcmp (dest_partmap, "part_msdos"))
+      if (! strcmp (dest_partmap, "msdos"))
 	grub_util_warn (_("This msdos-style partition label has no post-MBR gap; embedding won't be possible!"));
       else
 	grub_util_warn (_("This GPT partition label has no BIOS Boot Partition; embedding won't be possible!"));
diff --git a/util/ieee1275/grub-install.in b/util/ieee1275/grub-install.in
index 97c485d55..be4053542 100644
--- a/util/ieee1275/grub-install.in
+++ b/util/ieee1275/grub-install.in
@@ -179,7 +179,10 @@ fi
 # Then the partition map module.  In order to support partition-less media,
 # this command is allowed to fail (--target=fs already grants us that the
 # filesystem will be accessible).
-partmap_module=`$grub_probe --target=partmap --device-map=${device_map} ${grubdir} 2> /dev/null`
+partmap_module=
+for x in `$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`; do
+   partmap_module="$partmap_module part_$x";
+done
 
 # Device abstraction module, if any (lvm, raid).
 devabstraction_module=`$grub_probe --target=abstraction --device-map=${device_map} ${grubdir}`

From 468d69fec23203f110f1ae3610c123c58e929d4f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 20:49:57 +0100
Subject: [PATCH 0444/1628] 2010-02-06  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* fs/fat.c (grub_fat_iterate_dir): Free unibuf at exit.
---
 ChangeLog | 4 ++++
 fs/fat.c  | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6da224094..b9dfd7e73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* fs/fat.c (grub_fat_iterate_dir): Free unibuf at exit.
+
 2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/i386/pc/xnu.c (grub_xnu_set_video): Add const qualifier to
diff --git a/fs/fat.c b/fs/fat.c
index d008dc10d..89050943c 100644
--- a/fs/fat.c
+++ b/fs/fat.c
@@ -592,6 +592,7 @@ grub_fat_iterate_dir (grub_disk_t disk, struct grub_fat_data *data,
     }
 
   grub_free (filename);
+  grub_free (unibuf);
 
   return grub_errno;
 }

From 6846cec5f76a14d2ca98f87e909d23e170e2da62 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 20:52:11 +0100
Subject: [PATCH 0445/1628] 2010-02-06  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* commands/ls.c (grub_ls_list_files): Free pathname on exit.
---
 ChangeLog     | 4 ++++
 commands/ls.c | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b9dfd7e73..e60191a7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* commands/ls.c (grub_ls_list_files): Free pathname on exit.
+
 2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* fs/fat.c (grub_fat_iterate_dir): Free unibuf at exit.
diff --git a/commands/ls.c b/commands/ls.c
index 8a8319ac8..eb1049617 100644
--- a/commands/ls.c
+++ b/commands/ls.c
@@ -87,14 +87,13 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
   int print_files_long (const char *filename,
 			const struct grub_dirhook_info *info)
     {
-      char *pathname;
-
       if ((! all) && (filename[0] == '.'))
 	return 0;
 
       if (! info->dir)
 	{
 	  grub_file_t file;
+	  char *pathname;
 
 	  if (dirname[grub_strlen (dirname) - 1] == '/')
 	    pathname = grub_xasprintf ("%s%s", dirname, filename);
@@ -110,6 +109,7 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
 	  if (! file)
 	    {
 	      grub_errno = 0;
+	      grub_free (pathname);
 	      return 0;
 	    }
 
@@ -144,6 +144,7 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
 
 	    }
 	  grub_file_close (file);
+	  grub_free (pathname);
 	}
       else
 	grub_printf ("%-12s", "DIR");

From f51a90d0cff937298dcd754282235fb70f210663 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 20:59:56 +0100
Subject: [PATCH 0446/1628] 2010-02-06  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* partmap/sun.c (sun_partition_map_iterate): Restructure flow to fix
	buggy hook call and memory leak.
---
 ChangeLog     |  5 ++++
 partmap/sun.c | 64 ++++++++++++++++++++++++++++++---------------------
 2 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e60191a7d..8de063bf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* partmap/sun.c (sun_partition_map_iterate): Restructure flow to fix
+	buggy hook call and memory leak.
+
 2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* commands/ls.c (grub_ls_list_files): Free pathname on exit.
diff --git a/partmap/sun.c b/partmap/sun.c
index 42cf0d598..df9adb0c0 100644
--- a/partmap/sun.c
+++ b/partmap/sun.c
@@ -91,6 +91,7 @@ sun_partition_map_iterate (grub_disk_t disk,
   struct grub_disk raw;
   struct grub_sun_block block;
   int partnum;
+  grub_err_t err;
 
   raw = *disk;
   raw.partition = 0;
@@ -100,36 +101,47 @@ sun_partition_map_iterate (grub_disk_t disk,
     return grub_errno;
 
   p->partmap = &grub_sun_partition_map;
-  if (grub_disk_read (&raw, 0, 0, sizeof (struct grub_sun_block),
-		      &block) == GRUB_ERR_NONE)
+  err = grub_disk_read (&raw, 0, 0, sizeof (struct grub_sun_block),
+			&block);
+  if (err)
     {
-      if (GRUB_PARTMAP_SUN_MAGIC != grub_be_to_cpu16 (block.magic))
-	grub_error (GRUB_ERR_BAD_PART_TABLE, "not a sun partition table");
+      grub_free (p);
+      return err;
+    }
 
-      if (! grub_sun_is_valid (&block))
-	grub_error (GRUB_ERR_BAD_PART_TABLE, "invalid checksum");
+  if (GRUB_PARTMAP_SUN_MAGIC != grub_be_to_cpu16 (block.magic))
+    {
+      grub_free (p);
+      return grub_error (GRUB_ERR_BAD_PART_TABLE,
+			 "not a sun partition table");
+    }
 
-      /* Maybe another error value would be better, because partition
-	 table _is_ recognized but invalid.  */
-      for (partnum = 0; partnum < GRUB_PARTMAP_SUN_MAX_PARTS; partnum++)
+  if (! grub_sun_is_valid (&block))
+    {
+      grub_free (p);
+      return grub_error (GRUB_ERR_BAD_PART_TABLE, "invalid checksum");
+    }
+
+  /* Maybe another error value would be better, because partition
+     table _is_ recognized but invalid.  */
+  for (partnum = 0; partnum < GRUB_PARTMAP_SUN_MAX_PARTS; partnum++)
+    {
+      struct grub_sun_partition_descriptor *desc;
+      
+      if (block.infos[partnum].id == 0
+	  || block.infos[partnum].id == GRUB_PARTMAP_SUN_WHOLE_DISK_ID)
+	continue;
+
+      desc = &block.partitions[partnum];
+      p->start = ((grub_uint64_t) grub_be_to_cpu32 (desc->start_cylinder)
+		  * grub_be_to_cpu16 (block.ntrks)
+		  * grub_be_to_cpu16 (block.nsect));
+      p->len = grub_be_to_cpu32 (desc->num_sectors);
+      p->index = partnum;
+      if (p->len)
 	{
-	  struct grub_sun_partition_descriptor *desc;
-
-	  if (block.infos[partnum].id == 0
-	      || block.infos[partnum].id == GRUB_PARTMAP_SUN_WHOLE_DISK_ID)
-	    continue;
-
-	  desc = &block.partitions[partnum];
-	  p->start = ((grub_uint64_t) grub_be_to_cpu32 (desc->start_cylinder)
-		      * grub_be_to_cpu16 (block.ntrks)
-		      * grub_be_to_cpu16 (block.nsect));
-	  p->len = grub_be_to_cpu32 (desc->num_sectors);
-	  p->index = partnum;
-	  if (p->len)
-	    {
-	      if (hook (disk, p))
-		partnum = GRUB_PARTMAP_SUN_MAX_PARTS;
-	    }
+	  if (hook (disk, p))
+	    partnum = GRUB_PARTMAP_SUN_MAX_PARTS;
 	}
     }
 

From f3e309ad7dc2c07d2a6b5f4e0d86fc80cd46f755 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 21:00:53 +0100
Subject: [PATCH 0447/1628] Use (hd0,msdos1) syntax. Eliminate partmap_iterate

---
 conf/any-emu.rmk          |   2 +-
 conf/common.rmk           |   2 +-
 conf/i386-pc.rmk          |  14 ++--
 conf/sparc64-ieee1275.rmk |   6 +-
 include/grub/partition.h  |  26 ++++--
 kern/partition.c          | 170 ++++++++++++++------------------------
 6 files changed, 92 insertions(+), 128 deletions(-)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 53d4d1be7..9038aa45d 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -34,7 +34,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 	script/main.c script/execute.c script/function.c		\
 	script/lexer.c script/script.c grub_script.tab.c		\
 	partmap/amiga.c	partmap/apple.c partmap/msdos.c partmap/sun.c	\
-	partmap/acorn.c partmap/gpt.c partmap/bsd.c			\
+	partmap/acorn.c partmap/gpt.c partmap/bsdlabel.c		\
 	\
 	fs/affs.c fs/cpio.c  fs/fat.c fs/ext2.c fs/hfs.c		\
 	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c		\
diff --git a/conf/common.rmk b/conf/common.rmk
index 2033d2478..009db2907 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -24,7 +24,7 @@ util/grub-probe.c_DEPENDENCIES = grub_probe_init.h
 grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c	\
 	util/hostdisk.c	util/misc.c util/getroot.c		\
 	kern/device.c kern/disk.c kern/err.c kern/misc.c	\
-	kern/parser.c kern/partition.c kern/file.c		\
+	kern/parser.c kern/partition.c kern/file.c kern/list.c  \
 	\
 	fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c		\
 	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	\
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index efbf5bfa2..02675be91 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -94,14 +94,14 @@ util/grub-mkrawimage.c_DEPENDENCIES = Makefile
 util/i386/pc/grub-setup.c_DEPENDENCIES = grub_setup_init.h
 grub_setup_SOURCES = gnulib/progname.c \
 	util/i386/pc/grub-setup.c util/hostdisk.c	\
-	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
-	kern/err.c kern/misc.c kern/parser.c kern/partition.c	\
-	kern/file.c kern/fs.c kern/env.c fs/fshelp.c		\
+	util/misc.c util/getroot.c kern/device.c kern/disk.c	 \
+	kern/err.c kern/misc.c kern/parser.c kern/partition.c	 \
+	kern/file.c kern/list.c kern/fs.c kern/env.c fs/fshelp.c \
 	\
-	fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c		\
-	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	\
-	fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c		\
-	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c	\
+	fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c		 \
+	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	 \
+	fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c		 \
+	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c	 \
 	fs/befs.c fs/befs_be.c fs/tar.c			\
 	\
 	partmap/msdos.c partmap/bsdlabel.c partmap/gpt.c		\
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 9ec8dd22c..a428c14d1 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -68,9 +68,9 @@ grub_mkimage_SOURCES = util/sparc64/ieee1275/grub-mkimage.c util/misc.c \
 # For grub-setup.
 util/sparc64/ieee1275/grub-setup.c_DEPENDENCIES = grub_setup_init.h
 grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c	\
-	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
-	kern/err.c kern/misc.c kern/parser.c kern/partition.c	\
-	kern/file.c kern/fs.c kern/env.c fs/fshelp.c		\
+	util/misc.c util/getroot.c kern/device.c kern/disk.c	 \
+	kern/err.c kern/misc.c kern/parser.c kern/partition.c	 \
+	kern/file.c kern/fs.c kern/env.c kern/list.c fs/fshelp.c \
 	\
 	fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c		\
 	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	\
diff --git a/include/grub/partition.h b/include/grub/partition.h
index 5e8c476e0..bd97144c9 100644
--- a/include/grub/partition.h
+++ b/include/grub/partition.h
@@ -20,6 +20,7 @@
 #define GRUB_PART_HEADER	1
 
 #include <grub/dl.h>
+#include <grub/list.h>
 
 struct grub_disk;
 
@@ -28,6 +29,9 @@ typedef struct grub_partition *grub_partition_t;
 /* Partition map type.  */
 struct grub_partition_map
 {
+  /* The next partition map type.  */
+  struct grub_partition_map *next;
+
   /* The name of the partition map type.  */
   const char *name;
 
@@ -35,9 +39,6 @@ struct grub_partition_map
   grub_err_t (*iterate) (struct grub_disk *disk,
 			 int (*hook) (struct grub_disk *disk,
 				      const grub_partition_t partition));
-
-  /* The next partition map type.  */
-  struct grub_partition_map *next;
 };
 typedef struct grub_partition_map *grub_partition_map_t;
 
@@ -76,11 +77,24 @@ int EXPORT_FUNC(grub_partition_iterate) (struct grub_disk *disk,
 						      const grub_partition_t partition));
 char *EXPORT_FUNC(grub_partition_get_name) (const grub_partition_t partition);
 
-int EXPORT_FUNC(grub_partition_map_iterate) (int (*hook) (const grub_partition_map_t partmap));
 
-void EXPORT_FUNC(grub_partition_map_register) (grub_partition_map_t partmap);
+extern grub_partition_map_t EXPORT_VAR(grub_partition_map_list);
 
-void EXPORT_FUNC(grub_partition_map_unregister) (grub_partition_map_t partmap);
+static inline void
+grub_partition_map_register (grub_partition_map_t partmap)
+{
+  grub_list_push (GRUB_AS_LIST_P (&grub_partition_map_list),
+		  GRUB_AS_LIST (partmap));
+}
+
+static inline void
+grub_partition_map_unregister (grub_partition_map_t partmap)
+{
+  grub_list_remove (GRUB_AS_LIST_P (&grub_partition_map_list),
+		    GRUB_AS_LIST (partmap));
+}
+
+#define FOR_PARTITION_MAPS(var) for (var = grub_partition_map_list; var; var = var->next)
 
 #ifdef GRUB_UTIL
 void grub_msdos_partition_map_init (void);
diff --git a/kern/partition.c b/kern/partition.c
index 1f3f6556d..2a33ac329 100644
--- a/kern/partition.c
+++ b/kern/partition.c
@@ -21,39 +21,7 @@
 #include <grub/partition.h>
 #include <grub/disk.h>
 
-static grub_partition_map_t grub_partition_map_list;
-
-void
-grub_partition_map_register (grub_partition_map_t partmap)
-{
-  partmap->next = grub_partition_map_list;
-  grub_partition_map_list = partmap;
-}
-
-void
-grub_partition_map_unregister (grub_partition_map_t partmap)
-{
-  grub_partition_map_t *p, q;
-
-  for (p = &grub_partition_map_list, q = *p; q; p = &(q->next), q = q->next)
-    if (q == partmap)
-      {
-        *p = q->next;
-	break;
-      }
-}
-
-int
-grub_partition_map_iterate (int (*hook) (const grub_partition_map_t partmap))
-{
-  grub_partition_map_t p;
-
-  for (p = grub_partition_map_list; p; p = p->next)
-    if (hook (p))
-      return 1;
-
-  return 0;
-}
+grub_partition_map_t grub_partition_map_list;
 
 static grub_partition_t
 grub_partition_map_probe (const grub_partition_map_t partmap,
@@ -97,41 +65,45 @@ grub_partition_probe (struct grub_disk *disk, const char *str)
   grub_partition_t curpart = 0;
   grub_partition_t tail;
   const char *ptr;
-  int num;
-
-  auto int part_map_probe (const grub_partition_map_t partmap);
-
-  int part_map_probe (const grub_partition_map_t partmap)
-    {
-      disk->partition = part;
-      curpart = grub_partition_map_probe (partmap, disk, num);
-      disk->partition = tail;
-      if (curpart)
-	return 1;
-
-      if (grub_errno == GRUB_ERR_BAD_PART_TABLE)
-	{
-	  /* Continue to next partition map type.  */
-	  grub_errno = GRUB_ERR_NONE;
-	  return 0;
-	}
-
-      return 1;
-    }
 
   part = tail = disk->partition;
 
   for (ptr = str; *ptr;)
     {
-      /* BSD-like partition specification.  */
-      if (*ptr >= 'a' && *ptr <= 'z')
-	num = *(ptr++) - 'a';
-      else
-	num = grub_strtoul (ptr, (char **) &ptr, 0) - 1;
+      grub_partition_map_t partmap;
+      int num;
+      const char *partname, *partname_end;
+
+      partname = ptr;
+      while (*ptr && grub_isalpha (*ptr))
+	ptr++;
+      partname_end = ptr; 
+      num = grub_strtoul (ptr, (char **) &ptr, 0) - 1;
 
       curpart = 0;
       /* Use the first partition map type found.  */
-      grub_partition_map_iterate (part_map_probe);
+      FOR_PARTITION_MAPS(partmap)
+      {
+	if (partname_end != partname &&
+	    (grub_strncmp (partmap->name, partname, partname_end - partname)
+	     != 0 || partmap->name[partname_end - partname] != 0))
+	  continue;
+
+	disk->partition = part;
+	curpart = grub_partition_map_probe (partmap, disk, num);
+	disk->partition = tail;
+	if (curpart)
+	  break;
+
+	if (grub_errno == GRUB_ERR_BAD_PART_TABLE)
+	  {
+	    /* Continue to next partition map type.  */
+	    grub_errno = GRUB_ERR_NONE;
+	    continue;
+	  }
+
+	break;
+      }
 
       if (! curpart)
 	{
@@ -153,45 +125,6 @@ grub_partition_probe (struct grub_disk *disk, const char *str)
   return part;
 }
 
-static grub_partition_map_t
-get_partmap (struct grub_disk *disk)
-{
-  grub_partition_map_t partmap = 0;
-  struct grub_partition part;
-  int found = 0;
-  auto int part_map_iterate (const grub_partition_map_t p);
-  auto int part_map_iterate_hook (grub_disk_t d,
-				  const grub_partition_t partition);
-  int part_map_iterate_hook (grub_disk_t d __attribute__ ((unused)),
-			     const grub_partition_t partition)
-    {
-      found = 1;
-      part = *partition;
-      return 1;
-    }
-
-  int part_map_iterate (const grub_partition_map_t p)
-    {
-      grub_dprintf ("partition", "Detecting %s...\n", p->name);
-      p->iterate (disk, part_map_iterate_hook);
-
-      if (grub_errno != GRUB_ERR_NONE || ! found)
-	{
-	  /* Continue to next partition map type.  */
-	  grub_dprintf ("partition", "%s detection failed.\n", p->name);
-	  grub_errno = GRUB_ERR_NONE;
-	  return 0;
-	}
-      grub_free (part.data);
-
-      grub_dprintf ("partition", "%s detection succeeded.\n", p->name);
-      partmap = p;
-      return 1;
-    }
-  grub_partition_map_iterate (part_map_iterate);
-  return partmap;
-}
-
 int
 grub_partition_iterate (struct grub_disk *disk,
 			int (*hook) (grub_disk_t disk,
@@ -205,27 +138,42 @@ grub_partition_iterate (struct grub_disk *disk,
 		    const grub_partition_t partition)
     {
       struct grub_partition p = *partition;
-      grub_partition_map_t partmap = 0;
       p.parent = dsk->partition;
       dsk->partition = 0;
       if (hook (dsk, &p))
+	{
+	  ret = 1;
 	  return 1;
+	}
       if (p.start != 0)
 	{
+	  const struct grub_partition_map *partmap;
 	  dsk->partition = &p;
-	  partmap = get_partmap (dsk);
-	  if (partmap)
-	    ret = partmap->iterate (dsk, part_iterate);
+	  FOR_PARTITION_MAPS(partmap)
+	  {
+	    grub_err_t err;
+	    err = partmap->iterate (dsk, part_iterate);
+	    if (err)
+	      grub_errno = GRUB_ERR_NONE;
+	    if (ret)
+	      break;
+	  }
 	}
       dsk->partition = p.parent;
       return ret;
     }
 
   {
-    grub_partition_map_t partmap = 0;
-    partmap = get_partmap (disk);
-    if (partmap)
-      ret = partmap->iterate (disk, part_iterate);
+    const struct grub_partition_map *partmap;
+    FOR_PARTITION_MAPS(partmap)
+    {
+      grub_err_t err;
+      err = partmap->iterate (disk, part_iterate);
+      if (err)
+	grub_errno = GRUB_ERR_NONE;
+      if (ret)
+	break;
+    }
   }
 
   return ret;
@@ -235,14 +183,16 @@ char *
 grub_partition_get_name (const grub_partition_t partition)
 {
   char *out = 0;
-  /* Even on 64-bit machines this buffer is enough to hold longest number.  */
-  char buf[25];
   int curlen = 0;
   grub_partition_t part;
   for (part = partition; part; part = part->parent)
     {
+      /* Even on 64-bit machines this buffer is enough to hold
+	 longest number.  */
+      char buf[grub_strlen (part->partmap->name) + 25];
       int strl;
-      grub_snprintf (buf, sizeof (buf), "%d", part->number + 1);
+      grub_snprintf (buf, sizeof (buf), "%s%d", part->partmap->name,
+		     part->number + 1);
       strl = grub_strlen (buf);
       if (curlen)
 	{

From 05d4e36ff618034f037fa91345627ff721926d2e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 21:36:24 +0100
Subject: [PATCH 0448/1628] reimport sunpc

---
 conf/any-emu.rmk |   3 +-
 conf/common.rmk  |  11 +++-
 conf/i386-pc.rmk |   3 +-
 partmap/sunpc.c  | 144 +++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 156 insertions(+), 5 deletions(-)
 create mode 100644 partmap/sunpc.c

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 9038aa45d..33cb001a5 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -34,7 +34,8 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 	script/main.c script/execute.c script/function.c		\
 	script/lexer.c script/script.c grub_script.tab.c		\
 	partmap/amiga.c	partmap/apple.c partmap/msdos.c partmap/sun.c	\
-	partmap/acorn.c partmap/gpt.c partmap/bsdlabel.c		\
+	partmap/acorn.c partmap/gpt.c partmap/bsdlabel.c 		\
+	partmap/sunpc.c		\
 	\
 	fs/affs.c fs/cpio.c  fs/fat.c fs/ext2.c fs/hfs.c		\
 	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c		\
diff --git a/conf/common.rmk b/conf/common.rmk
index 009db2907..aefb5ac6f 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -33,7 +33,7 @@ grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c	\
 	fs/befs.c fs/befs_be.c fs/tar.c		\
 	\
 	partmap/msdos.c partmap/bsdlabel.c partmap/apple.c \
-	partmap/sun.c partmap/gpt.c\
+	partmap/sun.c partmap/sunpc.c partmap/gpt.c \
 	kern/fs.c kern/env.c fs/fshelp.c			\
 	disk/raid.c disk/mdraid_linux.c disk/lvm.c grub_probe_init.c
 
@@ -70,8 +70,8 @@ grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c util/hostfs.c \
 	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c fs/befs.c 	\
 	fs/befs_be.c fs/tar.c			\
 	\
-	kern/partition.c partmap/msdos.c partmap/bsdlabel.c		\
-	partmap/apple.c partmap/sun.c partmap/gpt.c			\
+	kern/partition.c partmap/msdos.c partmap/bsdlabel.c 		\
+	partmap/apple.c partmap/sun.c partmap/sunpc.c partmap/gpt.c	\
 	kern/fs.c kern/env.c fs/fshelp.c disk/raid.c			\
 	disk/raid5_recover.c disk/raid6_recover.c 			\
 	disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c 		\
@@ -383,6 +383,11 @@ part_bsd_mod_SOURCES = partmap/bsdlabel.c
 part_bsd_mod_CFLAGS = $(COMMON_CFLAGS)
 part_bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += part_sunpc.mod
+part_sunpc_mod_SOURCES = partmap/sunpc.c
+part_sunpc_mod_CFLAGS = $(COMMON_CFLAGS)
+part_sunpc_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # Special disk structures and generic drivers
 
 pkglib_MODULES += raid.mod raid5rec.mod raid6rec.mod mdraid.mod dm_nv.mod \
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 02675be91..4cdc819bd 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -104,7 +104,8 @@ grub_setup_SOURCES = gnulib/progname.c \
 	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c	 \
 	fs/befs.c fs/befs_be.c fs/tar.c			\
 	\
-	partmap/msdos.c partmap/bsdlabel.c partmap/gpt.c		\
+	partmap/msdos.c partmap/bsdlabel.c partmap/sunpc.c	\
+	partmap/gpt.c		\
 	\
 	disk/raid.c disk/mdraid_linux.c disk/lvm.c		\
 	util/raid.c util/lvm.c					\
diff --git a/partmap/sunpc.c b/partmap/sunpc.c
new file mode 100644
index 000000000..e3b16f00c
--- /dev/null
+++ b/partmap/sunpc.c
@@ -0,0 +1,144 @@
+/* sunpc.c - Read SUN PC style partition tables.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2005,2006,2007,2009  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/partition.h>
+#include <grub/disk.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/dl.h>
+#include <grub/symbol.h>
+#include <grub/types.h>
+#include <grub/err.h>
+
+#define GRUB_PARTMAP_SUN_PC_MAGIC 0xDABE
+#define GRUB_PARTMAP_SUN_PC_MAX_PARTS 16
+#define GRUB_PARTMAP_SUN_PC_WHOLE_DISK_ID 0x05
+
+struct grub_sun_pc_partition_descriptor
+{
+  grub_uint16_t id;
+  grub_uint16_t unused;
+  grub_uint32_t start_sector;
+  grub_uint32_t num_sectors;
+} __attribute__ ((packed));
+
+struct grub_sun_pc_block
+{
+  grub_uint8_t unused[72];
+  struct grub_sun_pc_partition_descriptor partitions[GRUB_PARTMAP_SUN_PC_MAX_PARTS];
+  grub_uint8_t unused2[244];
+  grub_uint16_t  magic;         /* Magic number.  */
+  grub_uint16_t  csum;          /* Label xor'd checksum.  */
+} __attribute__ ((packed));
+
+static struct grub_partition_map grub_sun_pc_partition_map;
+
+/* Verify checksum (true=ok).  */
+static int
+grub_sun_is_valid (struct grub_sun_pc_block *label)
+{
+  grub_uint16_t *pos;
+  grub_uint16_t sum = 0;
+
+  for (pos = (grub_uint16_t *) label;
+       pos < (grub_uint16_t *) (label + 1);
+       pos++)
+    sum ^= *pos;
+
+  return ! sum;
+}
+
+static grub_err_t
+sun_pc_partition_map_iterate (grub_disk_t disk,
+			      int (*hook) (grub_disk_t disk,
+					   const grub_partition_t partition))
+{
+  grub_partition_t p;
+  struct grub_sun_pc_block block;
+  int partnum;
+  grub_err_t err;
+
+  p = (grub_partition_t) grub_zalloc (sizeof (struct grub_partition));
+  if (! p)
+    return grub_errno;
+
+  p->partmap = &grub_sun_pc_partition_map;
+  err = grub_disk_read (disk, 1, 0, sizeof (struct grub_sun_pc_block), &block);
+  if (err)
+    {
+      grub_free (p);
+      return err;
+    }
+  
+  if (GRUB_PARTMAP_SUN_PC_MAGIC != grub_le_to_cpu16 (block.magic))
+    {
+      grub_free (p);
+      return grub_error (GRUB_ERR_BAD_PART_TABLE, 
+			 "not a sun_pc partition table");
+    }
+
+  if (! grub_sun_is_valid (&block))
+    {
+      grub_free (p);
+      return grub_error (GRUB_ERR_BAD_PART_TABLE, "invalid checksum");
+    }
+
+  /* Maybe another error value would be better, because partition
+     table _is_ recognized but invalid.  */
+  for (partnum = 0; partnum < GRUB_PARTMAP_SUN_PC_MAX_PARTS; partnum++)
+    {
+      struct grub_sun_pc_partition_descriptor *desc;
+
+      if (block.partitions[partnum].id == 0
+	  || block.partitions[partnum].id == GRUB_PARTMAP_SUN_PC_WHOLE_DISK_ID)
+	continue;
+
+      desc = &block.partitions[partnum];
+      p->start = grub_le_to_cpu32 (desc->start_sector);
+      p->len = grub_le_to_cpu32 (desc->num_sectors);
+      p->number = partnum;
+      if (p->len)
+	{
+	  if (hook (disk, p))
+	    partnum = GRUB_PARTMAP_SUN_PC_MAX_PARTS;
+	}
+    }
+
+  grub_free (p);
+
+  return grub_errno;
+}
+
+/* Partition map type.  */
+static struct grub_partition_map grub_sun_pc_partition_map =
+  {
+    .name = "sunpc",
+    .iterate = sun_pc_partition_map_iterate,
+  };
+
+GRUB_MOD_INIT(sun_pc_partition_map)
+{
+  grub_partition_map_register (&grub_sun_pc_partition_map);
+}
+
+GRUB_MOD_FINI(sun_pc_partition_map)
+{
+  grub_partition_map_unregister (&grub_sun_pc_partition_map);
+}
+

From b6c0d9c2019996754e8a04b53a328c43c85f5c73 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Feb 2010 23:39:14 +0100
Subject: [PATCH 0449/1628] 2010-02-06  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* kern/misc.c (grub_utf8_to_ucs4): Don't eat valid characters preceeded
	by non-valid ones.
	* kern/term.c (grub_putchar): Likewise.
---
 ChangeLog   | 6 ++++++
 kern/misc.c | 4 ++++
 kern/term.c | 9 +++++----
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8de063bf2..e71065338 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/misc.c (grub_utf8_to_ucs4): Don't eat valid characters preceeded
+	by non-valid ones.
+	* kern/term.c (grub_putchar): Likewise.
+
 2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* partmap/sun.c (sun_partition_map_iterate): Restructure flow to fix
diff --git a/kern/misc.c b/kern/misc.c
index 309267786..f45991d96 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -971,6 +971,10 @@ grub_utf8_to_ucs4 (grub_uint32_t *dest, grub_size_t destsize,
 	    {
 	      /* invalid */
 	      code = '?';
+	      /* Character c may be valid, don't eat it.  */
+	      src--;
+	      if (srcsize != (grub_size_t)-1)
+		srcsize++;
 	      count = 0;
 	    }
 	  else
diff --git a/kern/term.c b/kern/term.c
index b381d9336..6e3a2b454 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -57,16 +57,17 @@ grub_putchar (int c)
 {
   static grub_size_t size = 0;
   static grub_uint8_t buf[6];
+  grub_uint8_t *rest;
   grub_uint32_t code;
-  grub_size_t ret;
 
   buf[size++] = c;
-  ret = grub_utf8_to_ucs4 (&code, 1, buf, size, 0);
 
-  if (ret != 0)
+  while (grub_utf8_to_ucs4 (&code, 1, buf, size, (const grub_uint8_t **) &rest) 
+	 != 0)
     {
       struct grub_term_output *term;
-      size = 0;
+      size -= rest - buf;
+      grub_memmove (buf, rest, size);
       FOR_ACTIVE_TERM_OUTPUTS(term)
 	grub_putcode (code, term);
       if (code == '\n' && grub_newline_hook)

From 007d0695e2f4a60f2a1919f002c6fda589f1750b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 00:36:18 +0100
Subject: [PATCH 0450/1628] 2010-02-07  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* include/grub/i18n.h (grub_gettext_dummy): Removed.
	* kern/misc.c (grub_gettext_dummy): Make static.
---
 ChangeLog           | 5 +++++
 include/grub/i18n.h | 1 -
 kern/misc.c         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e71065338..b6b74e8a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/i18n.h (grub_gettext_dummy): Removed.
+	* kern/misc.c (grub_gettext_dummy): Make static.
+
 2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/misc.c (grub_utf8_to_ucs4): Don't eat valid characters preceeded
diff --git a/include/grub/i18n.h b/include/grub/i18n.h
index 4d4a0b7bd..0cba54765 100644
--- a/include/grub/i18n.h
+++ b/include/grub/i18n.h
@@ -22,7 +22,6 @@
 #include <config.h>
 #include <grub/symbol.h>
 
-const char *EXPORT_FUNC(grub_gettext_dummy) (const char *s);
 extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
 
 /* NLS can be disabled through the configure --disable-nls option.  */
diff --git a/kern/misc.c b/kern/misc.c
index f45991d96..4772e22b0 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -35,7 +35,7 @@ grub_iswordseparator (int c)
 }
 
 /* grub_gettext_dummy is not translating anything.  */
-const char *
+static const char *
 grub_gettext_dummy (const char *s)
 {
   return s;

From a4bced7752d6be5c367c46f1322c93b642f3e4f1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 00:40:17 +0100
Subject: [PATCH 0451/1628] 2010-02-07  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* include/grub/dl.h (grub_dl_register_symbol): Don't export.
---
 ChangeLog         | 4 ++++
 include/grub/dl.h | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b6b74e8a3..1f1b1c2e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/dl.h (grub_dl_register_symbol): Don't export.
+
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/i18n.h (grub_gettext_dummy): Removed.
diff --git a/include/grub/dl.h b/include/grub/dl.h
index 9340b6ce4..ac0ecd336 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -110,8 +110,8 @@ int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);
 #endif
 void EXPORT_FUNC(grub_dl_iterate) (int (*hook) (grub_dl_t mod));
 grub_dl_t EXPORT_FUNC(grub_dl_get) (const char *name);
-grub_err_t EXPORT_FUNC(grub_dl_register_symbol) (const char *name, void *addr,
-					    grub_dl_t mod);
+grub_err_t grub_dl_register_symbol (const char *name, void *addr,
+				    grub_dl_t mod);
 
 grub_err_t grub_arch_dl_check_header (void *ehdr);
 grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);

From 74b45184e47b791abac5324241aa887ce74310ab Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 00:46:09 +0100
Subject: [PATCH 0452/1628] 2010-02-07  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* include/grub/err.h (grub_err_printf): Don't export.
---
 ChangeLog          | 4 ++++
 include/grub/err.h | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f1b1c2e2..22c14424e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/err.h (grub_err_printf): Don't export.
+
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/dl.h (grub_dl_register_symbol): Don't export.
diff --git a/include/grub/err.h b/include/grub/err.h
index 7a5ce1ae0..e44705389 100644
--- a/include/grub/err.h
+++ b/include/grub/err.h
@@ -66,7 +66,7 @@ void EXPORT_FUNC(grub_fatal) (const char *fmt, ...) __attribute__ ((noreturn));
 void EXPORT_FUNC(grub_error_push) (void);
 int EXPORT_FUNC(grub_error_pop) (void);
 void EXPORT_FUNC(grub_print_error) (void);
-int EXPORT_FUNC(grub_err_printf) (const char *fmt, ...)
-__attribute__ ((format (printf, 1, 2)));
+int grub_err_printf (const char *fmt, ...)
+     __attribute__ ((format (printf, 1, 2)));
 
 #endif /* ! GRUB_ERR_HEADER */

From 8f891adc6f193b70915635418c2b73b5450b1546 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 00:52:31 +0100
Subject: [PATCH 0453/1628] 2010-02-07  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* include/grub/cache.h (grub_arch_sync_caches) [i386 || x86_64]: Inline.
	* kern/i386/coreboot/init.c (grub_arch_sync_caches): Remove.
	* kern/i386/efi/init.c (grub_arch_sync_caches): Likewise.
	* kern/i386/ieee1275/init.c (grub_arch_sync_caches): Likewise.
	* kern/i386/pc/init.c (grub_arch_sync_caches): Likewise.
	* util/misc.c (grub_arch_sync_caches) [i386 || x86_64]: Likewise.
---
 ChangeLog                 | 9 +++++++++
 include/grub/cache.h      | 8 ++++++++
 kern/i386/coreboot/init.c | 6 ------
 kern/i386/efi/init.c      | 6 ------
 kern/i386/ieee1275/init.c | 6 ------
 kern/i386/pc/init.c       | 6 ------
 util/misc.c               | 2 ++
 7 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 22c14424e..c91b4a042 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/cache.h (grub_arch_sync_caches) [i386 || x86_64]: Inline.
+	* kern/i386/coreboot/init.c (grub_arch_sync_caches): Remove.
+	* kern/i386/efi/init.c (grub_arch_sync_caches): Likewise.
+	* kern/i386/ieee1275/init.c (grub_arch_sync_caches): Likewise.
+	* kern/i386/pc/init.c (grub_arch_sync_caches): Likewise.
+	* util/misc.c (grub_arch_sync_caches) [i386 || x86_64]: Likewise.
+
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/err.h (grub_err_printf): Don't export.
diff --git a/include/grub/cache.h b/include/grub/cache.h
index 745af43c3..27e44f0a2 100644
--- a/include/grub/cache.h
+++ b/include/grub/cache.h
@@ -23,6 +23,14 @@
 #include <grub/symbol.h>
 #include <grub/types.h>
 
+#if defined (__i386__) || defined (__x86_64__)
+static inline void
+grub_arch_sync_caches (void *address __attribute__ ((unused)),
+		       grub_size_t len __attribute__ ((unused)))
+{
+}
+#else
 void EXPORT_FUNC(grub_arch_sync_caches) (void *address, grub_size_t len);
+#endif
 
 #endif /* ! GRUB_CACHE_HEADER */
diff --git a/kern/i386/coreboot/init.c b/kern/i386/coreboot/init.c
index 550a2a60a..5f80f28c1 100644
--- a/kern/i386/coreboot/init.c
+++ b/kern/i386/coreboot/init.c
@@ -67,12 +67,6 @@ grub_exit (void)
     grub_cpu_idle ();
 }
 
-void
-grub_arch_sync_caches (void *address __attribute__ ((unused)),
-		       grub_size_t len __attribute__ ((unused)))
-{
-}
-
 void
 grub_machine_init (void)
 {
diff --git a/kern/i386/efi/init.c b/kern/i386/efi/init.c
index e1950d758..f73f828c6 100644
--- a/kern/i386/efi/init.c
+++ b/kern/i386/efi/init.c
@@ -45,9 +45,3 @@ grub_machine_set_prefix (void)
 {
   grub_efi_set_prefix ();
 }
-
-void
-grub_arch_sync_caches (void *address __attribute__ ((unused)),
-                       grub_size_t len __attribute__ ((unused)))
-{
-}
diff --git a/kern/i386/ieee1275/init.c b/kern/i386/ieee1275/init.c
index 7658ee1a7..9fb98739b 100644
--- a/kern/i386/ieee1275/init.c
+++ b/kern/i386/ieee1275/init.c
@@ -26,9 +26,3 @@ void
 grub_stop_floppy (void)
 {
 }
-
-void
-grub_arch_sync_caches (void *address __attribute__ ((unused)),
-		       grub_size_t len __attribute__ ((unused)))
-{
-}
diff --git a/kern/i386/pc/init.c b/kern/i386/pc/init.c
index 1707049fe..fa646df19 100644
--- a/kern/i386/pc/init.c
+++ b/kern/i386/pc/init.c
@@ -47,12 +47,6 @@ static int num_regions;
 grub_addr_t grub_os_area_addr;
 grub_size_t grub_os_area_size;
 
-void
-grub_arch_sync_caches (void *address __attribute__ ((unused)),
-		       grub_size_t len __attribute__ ((unused)))
-{
-}
-
 static char *
 make_install_device (void)
 {
diff --git a/util/misc.c b/util/misc.c
index 371e7cc14..4e8eec323 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -371,11 +371,13 @@ grub_millisleep (grub_uint32_t ms)
 
 #endif
 
+#if !(defined (__i386__) || defined (__x86_64__))
 void
 grub_arch_sync_caches (void *address __attribute__ ((unused)),
 		       grub_size_t len __attribute__ ((unused)))
 {
 }
+#endif
 
 #ifndef HAVE_VASPRINTF
 

From 6b2ad14b7aeb2c168859889c2aa54da5a24f8cbb Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 01:33:37 +0100
Subject: [PATCH 0454/1628] 2010-02-07  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* fs/reiserfs.c (grub_reiserfs_read): Use #if 0 instead of commenting
	code out.
---
 ChangeLog     | 5 +++++
 fs/reiserfs.c | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c91b4a042..771ba8e04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* fs/reiserfs.c (grub_reiserfs_read): Use #if 0 instead of commenting
+	code out.
+
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/cache.h (grub_arch_sync_caches) [i386 || x86_64]: Inline.
diff --git a/fs/reiserfs.c b/fs/reiserfs.c
index 444bf3120..c3db52f60 100644
--- a/fs/reiserfs.c
+++ b/fs/reiserfs.c
@@ -1189,7 +1189,8 @@ grub_reiserfs_read (grub_file_t file, char *buf, grub_size_t len)
 		(unsigned long long) (current_position - initial_position),
 		(unsigned long) len);
   return current_position - initial_position;
-/*
+
+#if 0
   switch (found.type)
     {
       case GRUB_REISERFS_DIRECT:
@@ -1232,7 +1233,8 @@ grub_reiserfs_read (grub_file_t file, char *buf, grub_size_t len)
         goto fail;
     }
 
-  return read_length;*/
+  return read_length;
+#endif
 
  fail:
   grub_free (indirect_block_ptr);

From 74e31b5ca20e3cf62d2233e4efcc82dd5ab3df05 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 01:41:23 +0100
Subject: [PATCH 0455/1628] 2010-02-07  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* loader/i386/linux.c (grub_linux_setup_video): Handle error
	appropriately.
---
 ChangeLog           |  5 +++++
 loader/i386/linux.c | 11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 771ba8e04..46c96bdb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/i386/linux.c (grub_linux_setup_video): Handle error
+	appropriately.
+
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* fs/reiserfs.c (grub_reiserfs_read): Use #if 0 instead of commenting
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 831d8b25a..630aec6f4 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -394,12 +394,15 @@ grub_linux_setup_video (struct linux_kernel_params *params)
 {
   struct grub_video_mode_info mode_info;
   void *framebuffer;
-  int ret;
+  grub_err_t err;
 
-  ret = grub_video_get_info_and_fini (&mode_info, &framebuffer);
+  err = grub_video_get_info_and_fini (&mode_info, &framebuffer);
 
-  if (ret)
-    return 1;
+  if (err)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      return 1;
+    }
 
   params->lfb_width = mode_info.width;
   params->lfb_height = mode_info.height;

From 58548abbc3c738c27bba25e45aeaaa2fdba1a992 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 01:48:38 +0100
Subject: [PATCH 0456/1628] Remove data member in partition structure

---
 include/grub/partition.h  |  3 ---
 kern/disk.c               |  1 -
 partmap/acorn.c           |  1 -
 partmap/amiga.c           |  2 --
 partmap/apple.c           | 11 +++++------
 partmap/gpt.c             |  9 +--------
 partmap/msdos.c           |  1 -
 util/i386/pc/grub-setup.c | 10 +++++++---
 8 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/include/grub/partition.h b/include/grub/partition.h
index bd97144c9..9feb9459d 100644
--- a/include/grub/partition.h
+++ b/include/grub/partition.h
@@ -60,9 +60,6 @@ struct grub_partition
   /* The index of this partition in the partition table.  */
   int index;
 
-  /* Partition map type specific data.  */
-  void *data;
-
   /* Parent partition map.  */
   struct grub_partition *parent;
 
diff --git a/kern/disk.c b/kern/disk.c
index 514f28c15..ccd5f200f 100644
--- a/kern/disk.c
+++ b/kern/disk.c
@@ -342,7 +342,6 @@ grub_disk_close (grub_disk_t disk)
   while (disk->partition)
     {
       part = disk->partition->parent;
-      grub_free (disk->partition->data);
       grub_free (disk->partition);
       disk->partition = part;
     }
diff --git a/partmap/acorn.c b/partmap/acorn.c
index 0c3abf11d..f3b36106e 100644
--- a/partmap/acorn.c
+++ b/partmap/acorn.c
@@ -106,7 +106,6 @@ acorn_partition_map_iterate (grub_disk_t disk,
     return err;
 
   part.partmap = &grub_acorn_partition_map;
-  part.data = 0;
 
   for (i = 0; i != LINUX_MAP_ENTRIES; ++i)
     {
diff --git a/partmap/amiga.c b/partmap/amiga.c
index 5b6a4598f..b5fba0dbc 100644
--- a/partmap/amiga.c
+++ b/partmap/amiga.c
@@ -99,8 +99,6 @@ amiga_partition_map_iterate (grub_disk_t disk,
     return grub_error (GRUB_ERR_BAD_PART_TABLE,
 		       "Amiga partition map not found");
 
-  part.data = 0;
-
   /* The end of the partition list is marked using "-1".  */
   while (next != -1)
     {
diff --git a/partmap/apple.c b/partmap/apple.c
index 35bdcc8d7..b9d3e9174 100644
--- a/partmap/apple.c
+++ b/partmap/apple.c
@@ -122,17 +122,16 @@ apple_partition_map_iterate (grub_disk_t disk,
       goto fail;
     }
 
-  part.data = 0;
   pos = grub_be_to_cpu16 (aheader.blocksize);
 
   do
     {
-       part.offset = pos / GRUB_DISK_SECTOR_SIZE;
-       part.index = pos % GRUB_DISK_SECTOR_SIZE;
+      part.offset = pos / GRUB_DISK_SECTOR_SIZE;
+      part.index = pos % GRUB_DISK_SECTOR_SIZE;
 
-       if (grub_disk_read (disk, part.offset, part.index,
-			   sizeof (struct grub_apple_part),  &apart))
-	 return grub_errno;
+      if (grub_disk_read (disk, part.offset, part.index,
+			  sizeof (struct grub_apple_part),  &apart))
+	return grub_errno;
 
       if (grub_be_to_cpu16 (apart.magic) != GRUB_APPLE_PART_MAGIC)
 	{
diff --git a/partmap/gpt.c b/partmap/gpt.c
index 2c942e164..8b799d4d5 100644
--- a/partmap/gpt.c
+++ b/partmap/gpt.c
@@ -71,15 +71,11 @@ gpt_partition_map_iterate (grub_disk_t disk,
   grub_dprintf ("gpt", "Read a valid GPT header\n");
 
   entries = grub_le_to_cpu64 (gpt.partitions);
-  part.data = grub_malloc (sizeof (entry));
   for (i = 0; i < grub_le_to_cpu32 (gpt.maxpart); i++)
     {
       if (grub_disk_read (disk, entries, last_offset,
 			  sizeof (entry), &entry))
-	{
-	  grub_free (part.data);
-	  return grub_errno;
-	}
+	return grub_errno;
 
       if (grub_memcmp (&grub_gpt_partition_type_empty, &entry.type,
 		       sizeof (grub_gpt_partition_type_empty)))
@@ -92,7 +88,6 @@ gpt_partition_map_iterate (grub_disk_t disk,
 	  part.number = i;
 	  part.index = last_offset;
 	  part.partmap = &grub_gpt_partition_map;
-	  grub_memcpy (part.data, &entry, sizeof (entry));
 
 	  grub_dprintf ("gpt", "GPT entry %d: start=%lld, length=%lld\n", i,
 			(unsigned long long) part.start,
@@ -110,8 +105,6 @@ gpt_partition_map_iterate (grub_disk_t disk,
 	}
     }
 
-  grub_free (part.data);
-
   return GRUB_ERR_NONE;
 }
 
diff --git a/partmap/msdos.c b/partmap/msdos.c
index accf3fdba..bafd86eb6 100644
--- a/partmap/msdos.c
+++ b/partmap/msdos.c
@@ -40,7 +40,6 @@ pc_partition_map_iterate (grub_disk_t disk,
 
   p.offset = 0;
   ext_offset = 0;
-  p.data = 0;
   p.number = -1;
   p.partmap = &grub_msdos_partition_map;
 
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 27c9cd434..af0217d10 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -130,17 +130,21 @@ setup (const char *dir,
   int NESTED_FUNC_ATTR find_usable_region_gpt (grub_disk_t disk __attribute__ ((unused)),
 					       const grub_partition_t p)
     {
-      struct grub_gpt_partentry *gptdata = p->data;
+      struct grub_gpt_partentry gptdata;
+
+      disk->partition = p->parent;
+      if (grub_disk_read (disk, p->offset, p->index,
+			  sizeof (gptdata), &gptdata))
+	return 0;
 
       /* If there's an embed region, it is in a dedicated partition.  */
-      if (! memcmp (&gptdata->type, &grub_gpt_partition_type_bios_boot, 16))
+      if (! memcmp (&gptdata.type, &grub_gpt_partition_type_bios_boot, 16))
 	{
 	  embed_region.start = p->start;
 	  embed_region.end = p->start + p->len;
 
 	  return 1;
 	}
-
       return 0;
     }
 

From 909301af11e312a64fba7929bbb53f48b9460615 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 02:07:35 +0100
Subject: [PATCH 0457/1628] First try at generating grub-emu from modules

---
 Makefile.in          |   2 +-
 commands/sleep.c     |   1 -
 conf/any-emu.rmk     | 113 ++++++++++++++++++++-----------------------
 configure.ac         |   1 +
 disk/loopback.c      |   4 +-
 font/font_cmd.c      |   4 +-
 genemuinit.sh        |  68 ++++++++++++++++++++++++++
 genemuinitheader.sh  |  48 ++++++++++++++++++
 include/grub/i18n.h  |   8 +--
 partmap/acorn.c      |   4 +-
 partmap/amiga.c      |   4 +-
 partmap/apple.c      |   4 +-
 partmap/gpt.c        |   4 +-
 partmap/msdos.c      |   4 +-
 partmap/sun.c        |   4 +-
 parttool/msdospart.c |   4 +-
 term/gfxterm.c       |  12 ++---
 util/grub-emu.c      |   6 +--
 video/bitmap.c       |   4 +-
 video/readers/jpeg.c |   4 +-
 video/readers/png.c  |   4 +-
 video/readers/tga.c  |   4 +-
 video/video.c        |   4 +-
 23 files changed, 209 insertions(+), 106 deletions(-)
 create mode 100644 genemuinit.sh
 create mode 100644 genemuinitheader.sh

diff --git a/Makefile.in b/Makefile.in
index 46b380cd5..faf13a134 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -84,7 +84,7 @@ TARGET_ASFLAGS = @TARGET_ASFLAGS@
 TARGET_MODULE_FORMAT = @TARGET_MODULE_FORMAT@
 TARGET_APPLE_CC = @TARGET_APPLE_CC@
 OBJCONV = @OBJCONV@
-TARGET_CPPFLAGS = @TARGET_CPPFLAGS@ -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include) -I$(srcdir)/include -I$(builddir) -I$(builddir)/include \
+TARGET_CPPFLAGS = @TARGET_CPPFLAGS@ -I$(srcdir)/include -I$(builddir) -I$(builddir)/include \
 	-Wall -W
 TARGET_LDFLAGS = @TARGET_LDFLAGS@
 TARGET_IMG_LDSCRIPT = @TARGET_IMG_LDSCRIPT@
diff --git a/commands/sleep.c b/commands/sleep.c
index 9207b60a7..cb208c96f 100644
--- a/commands/sleep.c
+++ b/commands/sleep.c
@@ -22,7 +22,6 @@
 #include <grub/time.h>
 #include <grub/types.h>
 #include <grub/misc.h>
-#include <grub/machine/time.h>
 #include <grub/extcmd.h>
 
 static const struct grub_arg_option options[] =
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index fb97de0a0..310076345 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -1,94 +1,85 @@
 # -*- makefile -*-
 
+COMMON_LDFLAGS += -nostdlib
+COMMON_CFLAGS += -DGRUB_UTIL=1
+
 # Used by various components.  These rules need to precede them.
 script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
-sbin_UTILITIES += grub-emu
+#sbin_UTILITIES += grub-emu
 util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
-grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
-	commands/configfile.c commands/echo.c commands/help.c		\
-	commands/handler.c commands/ls.c commands/test.c 		\
-	commands/search.c commands/blocklist.c commands/hexdump.c	\
-	lib/hexdump.c commands/halt.c commands/reboot.c			\
-	lib/envblk.c commands/loadenv.c					\
-	commands/gptsync.c commands/probe.c commands/xnu_uuid.c		\
-	commands/password.c commands/keystatus.c			\
-	disk/host.c disk/loopback.c disk/scsi.c				\
-	fs/fshelp.c 							\
-	\
-	io/gzio.c							\
-	kern/device.c kern/disk.c kern/dl.c kern/elf.c kern/env.c	\
+pkglib_MODULES += main.mod
+main_mod_SOURCES = kern/device.c kern/disk.c kern/dl.c  kern/env.c	\
 	kern/err.c kern/list.c kern/handler.c				\
-	kern/command.c kern/corecmd.c commands/extcmd.c	kern/file.c	\
+	kern/command.c kern/corecmd.c kern/file.c			\
 	kern/fs.c commands/boot.c kern/main.c kern/misc.c kern/parser.c	\
 	kern/partition.c kern/reader.c kern/term.c			\
 	kern/rescue_reader.c kern/rescue_parser.c			\
-	lib/arg.c normal/cmdline.c normal/datetime.c normal/misc.c	\
-	normal/handler.c normal/auth.c normal/autofs.c			\
-	normal/completion.c normal/main.c normal/color.c		\
-	normal/menu.c normal/menu_entry.c normal/menu_viewer.c		\
-	normal/menu_text.c						\
-	script/main.c script/execute.c script/function.c		\
-	script/lexer.c script/script.c grub_script.tab.c		\
-	partmap/amiga.c	partmap/apple.c partmap/msdos.c partmap/sun.c	\
-	partmap/acorn.c partmap/gpt.c					\
 	\
-	fs/affs.c fs/cpio.c  fs/fat.c fs/ext2.c fs/hfs.c		\
-	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c		\
-	fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c			\
-	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c		\
-	fs/befs.c fs/befs_be.c fs/tar.c					\
-	\
-	util/console.c util/hostfs.c util/grub-emu.c util/misc.c	\
+	util/console.c  util/grub-emu.c util/misc.c			\
 	util/hostdisk.c util/getroot.c					\
 	\
-	disk/raid.c disk/raid5_recover.c disk/raid6_recover.c		\
-	disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c		\
-	commands/parttool.c parttool/msdospart.c			\
 	grub_emu_init.c gnulib/progname.c
+main_mod_CFLAGS = $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
+main_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For hostfs.mod.
+pkglib_MODULES += hostfs.mod
+hostfs_mod_SOURCES = util/hostfs.c
+hostfs_mod_CFLAGS = $(COMMON_CFLAGS)
+hostfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For host.mod.
+pkglib_MODULES += host.mod
+host_mod_SOURCES = disk/host.c
+host_mod_CFLAGS = $(COMMON_CFLAGS)
+host_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For reboot.mod.
+pkglib_MODULES += reboot.mod
+reboot_mod_SOURCES = commands/reboot.c
+reboot_mod_CFLAGS = $(COMMON_CFLAGS)
+reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For halt.mod.
+pkglib_MODULES += halt.mod
+halt_mod_SOURCES = commands/halt.c
+halt_mod_CFLAGS = $(COMMON_CFLAGS)
+halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 ifeq ($(target_cpu), i386)
-grub_emu_SOURCES += commands/i386/cpuid.c
+pkglib_MODULES += cpuid.mod
+cpuid_mod_SOURCES = commands/i386/cpuid.c
+cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
+cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
 endif
 
 grub_emu_LDFLAGS = $(LIBCURSES)
 
 ifeq ($(enable_grub_emu_usb), yes)
-grub_emu_SOURCES += disk/usbms.c util/usb.c bus/usb/usb.c	\
+pkglib_MODULES += usb.mod
+usb_mod_SOURCES = disk/usbms.c util/usb.c bus/usb/usb.c	\
 		commands/usbtest.c
-grub_emu_LDFLAGS += $(LIBCURSES) $(LIBUSB)
+cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
+usb_mod_LDFLAGS = $(COMMON_LDFLAGS) $(LIBUSB)
 endif
 
 ifeq ($(enable_grub_emu_pci), yes)
-grub_emu_SOURCES += util/pci.c commands/lspci.c
-grub_emu_LDFLAGS += $(LIBPCIACCESS)
+pkglib_MODULES += pci.mod
+pci_mod_SOURCES = util/pci.c commands/lspci.c
+pci_mod_LDFLAGS = $(LIBPCIACCESS)
 endif
 
-grub_emu_init.lst: geninit.sh $(filter-out grub_emu_init.c,$(grub_emu_SOURCES))
-	rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
-DISTCLEANFILES += grub_emu_init.lst
 
-grub_emu_init.h: grub_emu_init.lst $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninitheader.sh
-	rm -f $@; sh $(srcdir)/geninitheader.sh $< > $@
+grub_emu_init.h: genemuinitheader.sh
+	rm -f $@; echo $(pkglib_MODULES) |sh $(srcdir)/genemuinitheader.sh  > $@
 DISTCLEANFILES += grub_emu_init.h
 
-grub_emu_init.c: grub_emu_init.lst $(filter-out grub_emu_init.c,$(grub_emu_SOURCES)) geninit.sh grub_emu_init.h
-	rm -f $@; sh $(srcdir)/geninit.sh $< $(filter %.c,$^) > $@
+grub_emu_init.c: genemuinit.sh
+	rm -f $@; echo $(pkglib_MODULES) |sed 's,elf.mod,,;s,extcmd.mod,,;s,main.mod,,;s,gzio.mod,,;s,fshelp.mod,,;s,bufio.mod,,;s,setjmp.mod,,;'|sh $(srcdir)/genemuinit.sh > $@
 DISTCLEANFILES += grub_emu_init.c
 
+include $(srcdir)/conf/common.mk
 
-
-
-# FIXME: this could be shared with common.rmk
-
-# For grub-mkfont.
-ifeq ($(enable_grub_mkfont), yes)
-bin_UTILITIES += grub-mkfont
-grub_mkfont_SOURCES = gnulib/progname.c util/grub-mkfont.c util/misc.c
-grub_mkfont_CFLAGS = $(freetype_cflags)
-grub_mkfont_LDFLAGS = $(freetype_libs)
-endif
-
-grub_script.tab.c grub_script.tab.h: script/parser.y
-	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/parser.y
-DISTCLEANFILES += grub_script.tab.c grub_script.tab.h
+grub-emu: $(pkglib_MODULES)
+	$(CC) -o $@ $(pkglib_MODULES) $(grub_emu_LDFLAGS) $(LDFLAGS) $(grub_emu_SOURCES)
diff --git a/configure.ac b/configure.ac
index 6560d3e31..098e4524e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,7 @@ fi
 if test -z "$target_alias"; then
   case "$target_cpu"-"$platform" in
     x86_64-efi) ;;
+    x86_64-emu) ;;
     x86_64-*) target_cpu=i386 ;;
     powerpc64-ieee1275) target_cpu=powerpc ;;
   esac
diff --git a/disk/loopback.c b/disk/loopback.c
index 29805182e..a8bc25d8c 100644
--- a/disk/loopback.c
+++ b/disk/loopback.c
@@ -241,7 +241,7 @@ static struct grub_disk_dev grub_loopback_dev =
 
 static grub_extcmd_t cmd;
 
-GRUB_MOD_INIT(loop)
+GRUB_MOD_INIT(loopback)
 {
   cmd = grub_register_extcmd ("loopback", grub_cmd_loopback,
 			      GRUB_COMMAND_FLAG_BOTH,
@@ -250,7 +250,7 @@ GRUB_MOD_INIT(loop)
   grub_disk_dev_register (&grub_loopback_dev);
 }
 
-GRUB_MOD_FINI(loop)
+GRUB_MOD_FINI(loopback)
 {
   grub_unregister_extcmd (cmd);
   grub_disk_dev_unregister (&grub_loopback_dev);
diff --git a/font/font_cmd.c b/font/font_cmd.c
index 0402b8d77..b3eeb4dca 100644
--- a/font/font_cmd.c
+++ b/font/font_cmd.c
@@ -56,7 +56,7 @@ lsfonts_command (grub_command_t cmd __attribute__ ((unused)),
 
 static grub_command_t cmd_loadfont, cmd_lsfonts;
 
-GRUB_MOD_INIT(font_manager)
+GRUB_MOD_INIT(font)
 {
   grub_font_loader_init ();
 
@@ -69,7 +69,7 @@ GRUB_MOD_INIT(font_manager)
 			   0, "List the loaded fonts.");
 }
 
-GRUB_MOD_FINI(font_manager)
+GRUB_MOD_FINI(font)
 {
   /* TODO: Determine way to free allocated resources.
      Warning: possible pointer references could be in use.  */
diff --git a/genemuinit.sh b/genemuinit.sh
new file mode 100644
index 000000000..e40a683af
--- /dev/null
+++ b/genemuinit.sh
@@ -0,0 +1,68 @@
+#! /bin/sh
+#
+# Copyright (C) 2002,2005,2007  Free Software Foundation, Inc.
+#
+# This gensymlist.sh is free software; the author
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+lst="$1"
+shift
+
+cat <<EOF
+/* This file is automatically generated by geninit.sh. DO NOT EDIT! */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2005,2007  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_emu_init.h"
+
+EOF
+
+cat <<EOF
+void
+grub_init_all (void)
+{
+EOF
+
+read mods
+for line in $mods; do
+  echo "grub_${line}_init ();" | sed 's,\.mod,,g;'
+done
+
+cat <<EOF
+}
+EOF
+
+cat <<EOF
+void
+grub_fini_all (void)
+{
+EOF
+
+for line in $mods; do
+  echo "grub_${line}_fini ();" | sed 's,\.mod,,g;'
+done
+
+cat <<EOF
+}
+EOF
diff --git a/genemuinitheader.sh b/genemuinitheader.sh
new file mode 100644
index 000000000..eac86fc82
--- /dev/null
+++ b/genemuinitheader.sh
@@ -0,0 +1,48 @@
+#! /bin/sh
+#
+# Copyright (C) 2005,2007  Free Software Foundation, Inc.
+#
+# This gensymlist.sh is free software; the author
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+lst="$1"
+shift
+
+cat <<EOF
+/* This file is automatically generated by gensymlist.sh. DO NOT EDIT! */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2005,2007  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/>.
+ */
+
+EOF
+
+cat <<EOF
+void grub_init_all (void);
+void grub_fini_all (void);
+EOF
+
+read mods
+for line in $mods; do
+  echo "void grub_${line}_init (void);" | sed 's,\.mod,,g;'
+  echo "void grub_${line}_fini (void);" | sed 's,\.mod,,g;'
+done
diff --git a/include/grub/i18n.h b/include/grub/i18n.h
index f6f468744..11bb30af9 100644
--- a/include/grub/i18n.h
+++ b/include/grub/i18n.h
@@ -19,17 +19,17 @@
 #ifndef	GRUB_I18N_H
 #define	GRUB_I18N_H	1
 
-#ifdef GRUB_UTIL
+//#ifdef GRUB_UTIL
 # include <locale.h>
 # include <libintl.h>
-# define _(str) gettext(str)
-#else
+//# define _(str) gettext(str)
+//#else
 # define _(str) grub_gettext(str)
 
 const char *EXPORT_FUNC(grub_gettext_dummy) (const char *s);
 extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
 
-#endif
+					    //#endif
 
 #define N_(str) str
 
diff --git a/partmap/acorn.c b/partmap/acorn.c
index e005975c0..ed8738755 100644
--- a/partmap/acorn.c
+++ b/partmap/acorn.c
@@ -195,12 +195,12 @@ static struct grub_partition_map grub_acorn_partition_map =
   .get_name = acorn_partition_map_get_name
 };
 
-GRUB_MOD_INIT(acorn_partition_map)
+GRUB_MOD_INIT(part_acorn)
 {
   grub_partition_map_register (&grub_acorn_partition_map);
 }
 
-GRUB_MOD_FINI(acorn_partition_map)
+GRUB_MOD_FINI(part_acorn)
 {
   grub_partition_map_unregister (&grub_acorn_partition_map);
 }
diff --git a/partmap/amiga.c b/partmap/amiga.c
index dce9f4f1f..f769d4048 100644
--- a/partmap/amiga.c
+++ b/partmap/amiga.c
@@ -204,12 +204,12 @@ static struct grub_partition_map grub_amiga_partition_map =
     .get_name = amiga_partition_map_get_name
   };
 
-GRUB_MOD_INIT(amiga_partition_map)
+GRUB_MOD_INIT(part_amiga)
 {
   grub_partition_map_register (&grub_amiga_partition_map);
 }
 
-GRUB_MOD_FINI(amiga_partition_map)
+GRUB_MOD_FINI(part_amiga)
 {
   grub_partition_map_unregister (&grub_amiga_partition_map);
 }
diff --git a/partmap/apple.c b/partmap/apple.c
index 4dea55a32..6208ebcea 100644
--- a/partmap/apple.c
+++ b/partmap/apple.c
@@ -247,12 +247,12 @@ static struct grub_partition_map grub_apple_partition_map =
     .get_name = apple_partition_map_get_name
   };
 
-GRUB_MOD_INIT(apple_partition_map)
+GRUB_MOD_INIT(part_apple)
 {
   grub_partition_map_register (&grub_apple_partition_map);
 }
 
-GRUB_MOD_FINI(apple_partition_map)
+GRUB_MOD_FINI(part_apple)
 {
   grub_partition_map_unregister (&grub_apple_partition_map);
 }
diff --git a/partmap/gpt.c b/partmap/gpt.c
index 4a4957437..46f3f0a37 100644
--- a/partmap/gpt.c
+++ b/partmap/gpt.c
@@ -182,12 +182,12 @@ static struct grub_partition_map grub_gpt_partition_map =
     .get_name = gpt_partition_map_get_name
   };
 
-GRUB_MOD_INIT(gpt_partition_map)
+GRUB_MOD_INIT(part_gpt)
 {
   grub_partition_map_register (&grub_gpt_partition_map);
 }
 
-GRUB_MOD_FINI(gpt_partition_map)
+GRUB_MOD_FINI(part_gpt)
 {
   grub_partition_map_unregister (&grub_gpt_partition_map);
 }
diff --git a/partmap/msdos.c b/partmap/msdos.c
index 6ba7fb927..bae7ced9b 100644
--- a/partmap/msdos.c
+++ b/partmap/msdos.c
@@ -327,12 +327,12 @@ static struct grub_partition_map grub_msdos_partition_map =
     .get_name = pc_partition_map_get_name
   };
 
-GRUB_MOD_INIT(pc_partition_map)
+GRUB_MOD_INIT(part_msdos)
 {
   grub_partition_map_register (&grub_msdos_partition_map);
 }
 
-GRUB_MOD_FINI(pc_partition_map)
+GRUB_MOD_FINI(part_msdos)
 {
   grub_partition_map_unregister (&grub_msdos_partition_map);
 }
diff --git a/partmap/sun.c b/partmap/sun.c
index e816ec17a..39cd29969 100644
--- a/partmap/sun.c
+++ b/partmap/sun.c
@@ -202,12 +202,12 @@ static struct grub_partition_map grub_sun_partition_map =
     .get_name = sun_partition_map_get_name
   };
 
-GRUB_MOD_INIT(sun_partition_map)
+GRUB_MOD_INIT(part_sun)
 {
   grub_partition_map_register (&grub_sun_partition_map);
 }
 
-GRUB_MOD_FINI(sun_partition_map)
+GRUB_MOD_FINI(part_sun)
 {
   grub_partition_map_unregister (&grub_sun_partition_map);
 }
diff --git a/parttool/msdospart.c b/parttool/msdospart.c
index dbb25bc52..6ce48a977 100644
--- a/parttool/msdospart.c
+++ b/parttool/msdospart.c
@@ -138,7 +138,7 @@ static grub_err_t grub_pcpart_type (const grub_device_t dev,
   return GRUB_ERR_NONE;
 }
 
-GRUB_MOD_INIT (pcpart)
+GRUB_MOD_INIT (msdospart)
 {
   activate_table_handle = grub_parttool_register ("part_msdos",
 						  grub_pcpart_boot,
@@ -148,7 +148,7 @@ GRUB_MOD_INIT (pcpart)
 					      grub_pcpart_typeargs);
 
 }
-GRUB_MOD_FINI(pcpart)
+GRUB_MOD_FINI(msdospart)
 {
   grub_parttool_unregister (activate_table_handle);
   grub_parttool_unregister (type_table_handle);
diff --git a/term/gfxterm.c b/term/gfxterm.c
index f161499e6..5c94a6b9a 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -251,7 +251,7 @@ static int NESTED_FUNC_ATTR video_hook (grub_video_adapter_t p __attribute__ ((u
 }
 
 static grub_err_t
-grub_gfxterm_init (void)
+grub_gfxterm_term_init (void)
 {
   char *font_name;
   char *modevar;
@@ -312,7 +312,7 @@ grub_gfxterm_init (void)
 }
 
 static grub_err_t
-grub_gfxterm_fini (void)
+grub_gfxterm_term_fini (void)
 {
   if (bitmap)
     {
@@ -932,8 +932,8 @@ grub_gfxterm_background_image_cmd (grub_command_t cmd __attribute__ ((unused)),
 static struct grub_term_output grub_video_term =
   {
     .name = "gfxterm",
-    .init = grub_gfxterm_init,
-    .fini = grub_gfxterm_fini,
+    .init = grub_gfxterm_term_init,
+    .fini = grub_gfxterm_term_fini,
     .putchar = grub_gfxterm_putchar,
     .getcharwidth = grub_gfxterm_getcharwidth,
     .getwh = grub_virtual_screen_getwh,
@@ -951,7 +951,7 @@ static struct grub_term_output grub_video_term =
 
 static grub_command_t cmd;
 
-GRUB_MOD_INIT(term_gfxterm)
+GRUB_MOD_INIT(gfxterm)
 {
   grub_term_register_output ("gfxterm", &grub_video_term);
   cmd = grub_register_command ("background_image",
@@ -959,7 +959,7 @@ GRUB_MOD_INIT(term_gfxterm)
 			       0, "Load background image for active terminal");
 }
 
-GRUB_MOD_FINI(term_gfxterm)
+GRUB_MOD_FINI(gfxterm)
 {
   grub_unregister_command (cmd);
   grub_term_unregister_output (&grub_video_term);
diff --git a/util/grub-emu.c b/util/grub-emu.c
index e65c8585e..b3117ab53 100644
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -51,7 +51,7 @@ static char *prefix = NULL;
 grub_addr_t
 grub_arch_modules_addr (void)
 {
-  return NULL;
+  return 0;
 }
 
 grub_err_t
@@ -106,10 +106,6 @@ grub_machine_fini (void)
   grub_console_fini ();
 }
 
-void
-read_command_list (void)
-{
-}
 
 
 static struct option options[] =
diff --git a/video/bitmap.c b/video/bitmap.c
index 7b135a5dc..02ded85c6 100644
--- a/video/bitmap.c
+++ b/video/bitmap.c
@@ -243,11 +243,11 @@ void *grub_video_bitmap_get_data (struct grub_video_bitmap *bitmap)
 }
 
 /* Initialize bitmap module.  */
-GRUB_MOD_INIT(video_bitmap)
+GRUB_MOD_INIT(bitmap)
 {
 }
 
 /* Finalize bitmap module.  */
-GRUB_MOD_FINI(video_bitmap)
+GRUB_MOD_FINI(bitmap)
 {
 }
diff --git a/video/readers/jpeg.c b/video/readers/jpeg.c
index 460a52872..8b7398c39 100644
--- a/video/readers/jpeg.c
+++ b/video/readers/jpeg.c
@@ -725,7 +725,7 @@ static struct grub_video_bitmap_reader jpeg_reader = {
   .next = 0
 };
 
-GRUB_MOD_INIT (video_reader_jpeg)
+GRUB_MOD_INIT (jpeg)
 {
   grub_video_bitmap_reader_register (&jpg_reader);
   grub_video_bitmap_reader_register (&jpeg_reader);
@@ -736,7 +736,7 @@ GRUB_MOD_INIT (video_reader_jpeg)
 #endif
 }
 
-GRUB_MOD_FINI (video_reader_jpeg)
+GRUB_MOD_FINI (jpeg)
 {
 #if defined(JPEG_DEBUG)
   grub_unregister_command ("jpegtest");
diff --git a/video/readers/png.c b/video/readers/png.c
index c2008aeb2..7acce2145 100644
--- a/video/readers/png.c
+++ b/video/readers/png.c
@@ -890,7 +890,7 @@ static struct grub_video_bitmap_reader png_reader = {
   .next = 0
 };
 
-GRUB_MOD_INIT (video_reader_png)
+GRUB_MOD_INIT (png)
 {
   grub_video_bitmap_reader_register (&png_reader);
 #if defined(PNG_DEBUG)
@@ -900,7 +900,7 @@ GRUB_MOD_INIT (video_reader_png)
 #endif
 }
 
-GRUB_MOD_FINI (video_reader_png)
+GRUB_MOD_FINI (png)
 {
 #if defined(PNG_DEBUG)
   grub_unregister_command ("pngtest");
diff --git a/video/readers/tga.c b/video/readers/tga.c
index d0ca2770f..5f0a7f890 100644
--- a/video/readers/tga.c
+++ b/video/readers/tga.c
@@ -476,7 +476,7 @@ static struct grub_video_bitmap_reader tga_reader = {
   .next = 0
 };
 
-GRUB_MOD_INIT(video_reader_tga)
+GRUB_MOD_INIT(tga)
 {
   grub_video_bitmap_reader_register (&tga_reader);
 #if defined(TGA_DEBUG)
@@ -485,7 +485,7 @@ GRUB_MOD_INIT(video_reader_tga)
 #endif
 }
 
-GRUB_MOD_FINI(video_reader_tga)
+GRUB_MOD_FINI(tga)
 {
 #if defined(TGA_DEBUG)
   grub_unregister_command ("tgatest");
diff --git a/video/video.c b/video/video.c
index c1d66bdd0..5dcca7c7e 100644
--- a/video/video.c
+++ b/video/video.c
@@ -713,11 +713,11 @@ grub_video_set_mode (const char *modestring,
 }
 
 /* Initialize Video API module.  */
-GRUB_MOD_INIT(video_video)
+GRUB_MOD_INIT(video)
 {
 }
 
 /* Finalize Video API module.  */
-GRUB_MOD_FINI(video_video)
+GRUB_MOD_FINI(video)
 {
 }

From 98e6959dead1c97d77e3b6dc8dc25cf1bd6cd173 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 02:37:48 +0100
Subject: [PATCH 0458/1628] 2010-02-07  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Fix warnings in grub-emu when compiling with maximum warning options.

	* util/grub-emu.c (ENABLE_RELOCATABLE): New definition.
	(grub_arch_modules_addr): Return 0 and not NULL.
	* util/misc.c (ENABLE_RELOCATABLE): New definition.
	(xstrdup): USe newstr instead of dup.
---
 ChangeLog       | 9 +++++++++
 util/grub-emu.c | 3 ++-
 util/misc.c     | 9 +++++----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 46c96bdb2..33b0ea3bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Fix warnings in grub-emu when compiling with maximum warning options.
+
+	* util/grub-emu.c (ENABLE_RELOCATABLE): New definition.
+	(grub_arch_modules_addr): Return 0 and not NULL.
+	* util/misc.c (ENABLE_RELOCATABLE): New definition.
+	(xstrdup): USe newstr instead of dup.
+
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/i386/linux.c (grub_linux_setup_video): Handle error
diff --git a/util/grub-emu.c b/util/grub-emu.c
index 21fc6fa09..554556ae8 100644
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -40,6 +40,7 @@
 
 #include <grub_emu_init.h>
 
+#define ENABLE_RELOCATABLE 0
 #include "progname.h"
 
 /* Used for going back to the main function.  */
@@ -51,7 +52,7 @@ static char *prefix = NULL;
 grub_addr_t
 grub_arch_modules_addr (void)
 {
-  return NULL;
+  return 0;
 }
 
 grub_err_t
diff --git a/util/misc.c b/util/misc.c
index 4e8eec323..8c79e8d9b 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -43,6 +43,7 @@
 #include <grub/time.h>
 #include <grub/i18n.h>
 
+#define ENABLE_RELOCATABLE 0
 #include "progname.h"
 
 /* Include malloc.h, only if memalign is available. It is known that
@@ -142,13 +143,13 @@ char *
 xstrdup (const char *str)
 {
   size_t len;
-  char *dup;
+  char *newstr;
 
   len = strlen (str);
-  dup = (char *) xmalloc (len + 1);
-  memcpy (dup, str, len + 1);
+  newstr = (char *) xmalloc (len + 1);
+  memcpy (newstr, str, len + 1);
 
-  return dup;
+  return newstr;
 }
 
 char *

From f88d801b1733c5decb09cfcce3ead23455894fc7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 02:44:47 +0100
Subject: [PATCH 0459/1628] 2010-02-07  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Fix warnings in grub-emu when compiling with maximum warning options.

	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Rename one instance
	of disk to dsk to avoid shadowing.
---
 ChangeLog       | 2 ++
 util/hostdisk.c | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 33b0ea3bd..4de8073ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 	(grub_arch_modules_addr): Return 0 and not NULL.
 	* util/misc.c (ENABLE_RELOCATABLE): New definition.
 	(xstrdup): USe newstr instead of dup.
+	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Rename one instance
+	of disk to dsk to avoid shadowing.
 
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
diff --git a/util/hostdisk.c b/util/hostdisk.c
index 5c56b7579..9a3f30ce0 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -981,10 +981,10 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
     struct hd_geometry hdg;
     int dos_part = -1;
     int bsd_part = -1;
-    auto int find_partition (grub_disk_t disk,
+    auto int find_partition (grub_disk_t dsk,
 			     const grub_partition_t partition);
 
-    int find_partition (grub_disk_t disk __attribute__ ((unused)),
+    int find_partition (grub_disk_t dsk __attribute__ ((unused)),
 			const grub_partition_t partition)
       {
  	struct grub_msdos_partition *pcdata = NULL;

From 74e4934e1c8147e622a843a7ca7a3b7c98a0783e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 02:47:18 +0100
Subject: [PATCH 0460/1628] 2010-02-07  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Rename one instance
	of disk to dsk to avoid shadowing.
	(find_free_slot): Fix prototype.
	* util/getroot.c (grub_util_is_dmraid): Make static.
	* include/grub/time.h (grub_get_rtc) [GRUB_MACHINE_EMU || GRUB_UTIL]:
	Add missing prototype.
	* util/sdl.c (grub_video_sdl_set_viewport): Remove.
---
 ChangeLog           |  7 ++++++-
 include/grub/time.h |  2 ++
 util/getroot.c      |  3 ++-
 util/hostdisk.c     |  2 +-
 util/sdl.c          | 26 --------------------------
 5 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4de8073ee..ec3318c5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,9 +5,14 @@
 	* util/grub-emu.c (ENABLE_RELOCATABLE): New definition.
 	(grub_arch_modules_addr): Return 0 and not NULL.
 	* util/misc.c (ENABLE_RELOCATABLE): New definition.
-	(xstrdup): USe newstr instead of dup.
+	(xstrdup): Use newstr instead of dup.
 	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Rename one instance
 	of disk to dsk to avoid shadowing.
+	(find_free_slot): Fix prototype.
+	* util/getroot.c (grub_util_is_dmraid): Make static.
+	* include/grub/time.h (grub_get_rtc) [GRUB_MACHINE_EMU || GRUB_UTIL]:
+	Add missing prototype.
+	* util/sdl.c (grub_video_sdl_set_viewport): Remove.
 
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
diff --git a/include/grub/time.h b/include/grub/time.h
index 5aafdc9ed..ae2617edb 100644
--- a/include/grub/time.h
+++ b/include/grub/time.h
@@ -25,6 +25,8 @@
 
 #if defined (GRUB_MACHINE_EMU) || defined (GRUB_UTIL)
 #define GRUB_TICKS_PER_SECOND 100000
+/* Return the real time in ticks.  */
+grub_uint32_t EXPORT_FUNC (grub_get_rtc) (void);
 #else
 #include <grub/machine/time.h>
 #endif
diff --git a/util/getroot.c b/util/getroot.c
index 6357c8a26..82393635c 100644
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -460,7 +460,8 @@ grub_guess_root_device (const char *dir)
 
   return os_dev;
 }
-int
+
+static int
 grub_util_is_dmraid (const char *os_dev)
 {
   if (! strncmp (os_dev, "/dev/mapper/nvidia_", 19))
diff --git a/util/hostdisk.c b/util/hostdisk.c
index 9a3f30ce0..98d3d53ae 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -137,7 +137,7 @@ find_grub_drive (const char *name)
 }
 
 static int
-find_free_slot ()
+find_free_slot (void)
 {
   unsigned int i;
 
diff --git a/util/sdl.c b/util/sdl.c
index a5a310518..d261db6b0 100644
--- a/util/sdl.c
+++ b/util/sdl.c
@@ -179,32 +179,6 @@ grub_video_sdl_set_palette (unsigned int start, unsigned int count,
   return grub_video_fb_set_palette (start, count, palette_data);
 }
 
-grub_err_t
-grub_video_sdl_set_viewport (unsigned int x, unsigned int y,
-			     unsigned int width, unsigned int height)
-{
-  /* Make sure viewport is withing screen dimensions.  If viewport was set
-     to be out of the region, mark its size as zero.  */
-  if (x > (unsigned) window->w)
-    {
-      x = 0;
-      width = 0;
-    }
-
-  if (y > (unsigned) window->h)
-    {
-      y = 0;
-      height = 0;
-    }
-
-  if (x + width > (unsigned) window->w)
-    width = window->w - x;
-
-  if (y + height > (unsigned) window->h)
-    height = window->h - y;
-  return grub_video_fb_set_viewport (x, y, width, height);
-}
-
 static grub_err_t
 grub_video_sdl_swap_buffers (void)
 {

From dcb3f497be11f052e794385fed50b1d8367c5fb0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 03:29:59 +0100
Subject: [PATCH 0461/1628] Rename main.mod to kernel.img

---
 conf/any-emu.rmk | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 2fc8daf45..ebcc9087c 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -8,8 +8,9 @@ script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 #sbin_UTILITIES += grub-emu
 util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
-pkglib_MODULES += main.mod
-main_mod_SOURCES = kern/device.c kern/disk.c kern/dl.c  kern/env.c	\
+kernel_img_RELOCATABLE = yes
+pkglib_PROGRAMS = kernel.img
+kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c  kern/env.c	\
 	kern/err.c kern/list.c kern/handler.c				\
 	kern/command.c kern/corecmd.c kern/file.c			\
 	kern/fs.c commands/boot.c kern/main.c kern/misc.c kern/parser.c	\
@@ -20,8 +21,8 @@ main_mod_SOURCES = kern/device.c kern/disk.c kern/dl.c  kern/env.c	\
 	util/hostdisk.c util/getroot.c					\
 	\
 	grub_emu_init.c gnulib/progname.c
-main_mod_CFLAGS = $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
-main_mod_LDFLAGS = $(COMMON_LDFLAGS)
+kernel_img_CFLAGS = $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
+kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For hostfs.mod.
 pkglib_MODULES += hostfs.mod
@@ -85,11 +86,11 @@ grub_emu_init.h: genemuinitheader.sh
 DISTCLEANFILES += grub_emu_init.h
 
 grub_emu_init.c: genemuinit.sh
-	rm -f $@; echo $(pkglib_MODULES) |sed 's,elf.mod,,;s,extcmd.mod,,;s,main.mod,,;s,gzio.mod,,;s,fshelp.mod,,;s,bufio.mod,,;s,setjmp.mod,,;s,crypto.mod,,;s,pbkdf2.mod,,;s,trig.mod,,;s,bitmap_scale.mod,,;s,charset.mod,,;'|sh $(srcdir)/genemuinit.sh > $@
+	rm -f $@; echo $(pkglib_MODULES) |sed 's,elf.mod,,;s,extcmd.mod,,;s,gzio.mod,,;s,fshelp.mod,,;s,bufio.mod,,;s,setjmp.mod,,;s,crypto.mod,,;s,pbkdf2.mod,,;s,trig.mod,,;s,bitmap_scale.mod,,;s,charset.mod,,;'|sh $(srcdir)/genemuinit.sh > $@
 DISTCLEANFILES += grub_emu_init.c
 
 include $(srcdir)/conf/common.mk
 
-grub-emu: $(pkglib_MODULES)
-	$(CC) -o $@ $(pkglib_MODULES) $(grub_emu_LDFLAGS) $(LDFLAGS)
+grub-emu: $(pkglib_MODULES) $(pkglib_PROGRAMS)
+	$(CC) -o $@ $(pkglib_MODULES) $(pkglib_PROGRAMS) $(grub_emu_LDFLAGS) $(LDFLAGS)
 

From c5160d75c4efaa62f8d57f180c6d544b44096ca1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 03:43:07 +0100
Subject: [PATCH 0462/1628] Don't strip on any-emu

---
 conf/any-emu.rmk | 1 +
 genmk.rb         | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index ebcc9087c..983dc2c1f 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -23,6 +23,7 @@ kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c  kern/env.c	\
 	grub_emu_init.c gnulib/progname.c
 kernel_img_CFLAGS = $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
+TARGET_NO_STRIP = yes
 
 # For hostfs.mod.
 pkglib_MODULES += hostfs.mod
diff --git a/genmk.rb b/genmk.rb
index df03e1dfe..65bcb3ddd 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -148,7 +148,7 @@ ifneq ($(TARGET_APPLE_CC),1)
 	-rm -f $@
 	$(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ #{pre_obj} #{mod_obj}
 	if test ! -z \"$(TARGET_OBJ2ELF)\"; then ./$(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi
-	$(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K _grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
+	if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K _grub_mod_init -K _grub_mod_fini -R .note -R .comment $@; fi
 else
 #{@name}: #{pre_obj} #{mod_obj} $(TARGET_OBJ2ELF)
 	-rm -f $@
@@ -330,11 +330,11 @@ MOSTLYCLEANFILES += #{deps_str}
 ifeq ($(#{prefix}_RELOCATABLE),yes)
 #{@name}: $(#{prefix}_DEPENDENCIES) #{objs_str}
 	$(TARGET_CC) -Wl,-r,-d -o $@ #{objs_str} $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS)
-	$(STRIP) --strip-unneeded -K start -R .note -R .comment $@
+	if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) --strip-unneeded -K start -R .note -R .comment $@; fi
 else
 #{@name}: $(#{prefix}_DEPENDENCIES) #{objs_str}
 	$(TARGET_CC) -o $@ #{objs_str} $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS)
-	$(STRIP) -R .rel.dyn -R .reginfo -R .note -R .comment $@
+	if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) -R .rel.dyn -R .reginfo -R .note -R .comment $@; fi
 endif
 
 " + objs.collect_with_index do |obj, i|

From ebe841ad55b15f9920675b567c02bb6661e5bd18 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 03:48:38 +0100
Subject: [PATCH 0463/1628] Don't try to generate moddep.lst on any-emu.rmk

---
 conf/any-emu.rmk | 1 +
 genmk.rb         | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 983dc2c1f..7ed5fa74b 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -24,6 +24,7 @@ kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c  kern/env.c	\
 kernel_img_CFLAGS = $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 TARGET_NO_STRIP = yes
+TARGET_NO_DYNAMIC_MODULES = yes
 
 # For hostfs.mod.
 pkglib_MODULES += hostfs.mod
diff --git a/genmk.rb b/genmk.rb
index 65bcb3ddd..7df15043a 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -143,6 +143,13 @@ mostlyclean-module-#{@name}.#{@rule_count}:
 MOSTLYCLEAN_MODULE_TARGETS += mostlyclean-module-#{@name}.#{@rule_count}
 UNDSYMFILES += #{undsym}
 
+ifeq ($(TARGET_NO_DYNAMIC_MODULES), yes)
+#{@name}: #{pre_obj} $(TARGET_OBJ2ELF)
+	-rm -f $@
+	$(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ #{pre_obj}
+	if test ! -z \"$(TARGET_OBJ2ELF)\"; then ./$(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi
+	if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K _grub_mod_init -K _grub_mod_fini -R .note -R .comment $@; fi
+else
 ifneq ($(TARGET_APPLE_CC),1)
 #{@name}: #{pre_obj} #{mod_obj} $(TARGET_OBJ2ELF)
 	-rm -f $@
@@ -157,6 +164,7 @@ else
 	$(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -nu -nd $@.bin $@
 	-rm -f $@.bin
 endif
+endif
 
 #{pre_obj}: $(#{prefix}_DEPENDENCIES) #{objs_str}
 	-rm -f $@

From 285505d3fc59db1fc760e1d459809c7d282ac309 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 03:58:14 +0100
Subject: [PATCH 0464/1628] Eliminate blacklist of modules w/o init

---
 conf/any-emu.rmk    |  6 +++---
 genemuinit.sh       | 10 +++++++---
 genemuinitheader.sh | 10 +++++++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 7ed5fa74b..3e92cbe73 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -84,11 +84,11 @@ endif
 
 
 grub_emu_init.h: genemuinitheader.sh
-	rm -f $@; echo $(pkglib_MODULES) |sh $(srcdir)/genemuinitheader.sh  > $@
+	rm -f $@; echo $(pkglib_MODULES) | sh $(srcdir)/genemuinitheader.sh $(NM)  > $@
 DISTCLEANFILES += grub_emu_init.h
 
-grub_emu_init.c: genemuinit.sh
-	rm -f $@; echo $(pkglib_MODULES) |sed 's,elf.mod,,;s,extcmd.mod,,;s,gzio.mod,,;s,fshelp.mod,,;s,bufio.mod,,;s,setjmp.mod,,;s,crypto.mod,,;s,pbkdf2.mod,,;s,trig.mod,,;s,bitmap_scale.mod,,;s,charset.mod,,;'|sh $(srcdir)/genemuinit.sh > $@
+grub_emu_init.c: genemuinit.sh $(pkglib_MODULES)
+	rm -f $@; echo $(pkglib_MODULES) | sh $(srcdir)/genemuinit.sh $(NM) > $@
 DISTCLEANFILES += grub_emu_init.c
 
 include $(srcdir)/conf/common.mk
diff --git a/genemuinit.sh b/genemuinit.sh
index e40a683af..45c15ecb9 100644
--- a/genemuinit.sh
+++ b/genemuinit.sh
@@ -11,7 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-lst="$1"
+nm="$1"
 shift
 
 cat <<EOF
@@ -46,7 +46,9 @@ EOF
 
 read mods
 for line in $mods; do
-  echo "grub_${line}_init ();" | sed 's,\.mod,,g;'
+  if ${nm} --defined-only -P -p ${line} | grep grub_mod_init > /dev/null; then
+      echo "grub_${line}_init ();" | sed 's,\.mod,,g;'
+  fi
 done
 
 cat <<EOF
@@ -60,7 +62,9 @@ grub_fini_all (void)
 EOF
 
 for line in $mods; do
-  echo "grub_${line}_fini ();" | sed 's,\.mod,,g;'
+  if ${nm} --defined-only -P -p ${line} | grep grub_mod_fini > /dev/null; then
+      echo "grub_${line}_fini ();" | sed 's,\.mod,,g;'
+  fi
 done
 
 cat <<EOF
diff --git a/genemuinitheader.sh b/genemuinitheader.sh
index eac86fc82..6b83f5993 100644
--- a/genemuinitheader.sh
+++ b/genemuinitheader.sh
@@ -11,7 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-lst="$1"
+nm="$1"
 shift
 
 cat <<EOF
@@ -43,6 +43,10 @@ EOF
 
 read mods
 for line in $mods; do
-  echo "void grub_${line}_init (void);" | sed 's,\.mod,,g;'
-  echo "void grub_${line}_fini (void);" | sed 's,\.mod,,g;'
+  if ${nm} --defined-only -P -p ${line} | grep grub_mod_init > /dev/null; then
+      echo "void grub_${line}_init (void);" | sed 's,\.mod,,g;'
+  fi
+  if ${nm} --defined-only -P -p ${line} | grep grub_mod_fini > /dev/null; then
+      echo "void grub_${line}_fini (void);" | sed 's,\.mod,,g;'
+  fi
 done

From 1eebb21608647883706de5fe9022652eed5a7e01 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 04:01:22 +0100
Subject: [PATCH 0465/1628] Add missing dependency

---
 conf/any-emu.rmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 3e92cbe73..542cd9bd1 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -83,7 +83,7 @@ grub_emu_LDFLAGS += $(LIBPCIACCESS)
 endif
 
 
-grub_emu_init.h: genemuinitheader.sh
+grub_emu_init.h: genemuinitheader.sh $(pkglib_MODULES)
 	rm -f $@; echo $(pkglib_MODULES) | sh $(srcdir)/genemuinitheader.sh $(NM)  > $@
 DISTCLEANFILES += grub_emu_init.h
 

From 2083672af13f98a2efcd467b1a818eff5669b942 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 04:23:44 +0100
Subject: [PATCH 0466/1628] Remove -DGRUB_UTIL when compiling grub-emu

---
 commands/parttool.c       |  2 +-
 conf/any-emu.rmk          |  4 +--
 efiemu/main.c             |  4 +--
 efiemu/mm.c               |  4 +--
 include/grub/dl.h         |  9 +++--
 include/grub/mm.h         |  2 +-
 include/grub/multiboot2.h | 70 ---------------------------------------
 include/grub/normal.h     | 33 ------------------
 include/grub/partition.h  | 14 --------
 include/grub/pci.h        |  2 +-
 kern/dl.c                 |  2 +-
 loader/xnu.c              |  6 ++--
 util/grub-emu.c           |  2 --
 util/misc.c               |  4 +++
 14 files changed, 24 insertions(+), 134 deletions(-)
 delete mode 100644 include/grub/multiboot2.h

diff --git a/commands/parttool.c b/commands/parttool.c
index 5ad6133ca..0850c5e1d 100644
--- a/commands/parttool.c
+++ b/commands/parttool.c
@@ -175,7 +175,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
     }
 
   /* Load modules. */
-#ifndef GRUB_UTIL
+#if GRUB_NO_MODULES
   {
     const char *prefix;
     prefix = grub_env_get ("prefix");
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 542cd9bd1..0f717c59c 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -1,7 +1,7 @@
 # -*- makefile -*-
 
 COMMON_LDFLAGS += -nostdlib
-COMMON_CFLAGS += -DGRUB_UTIL=1
+COMMON_CFLAGS +=
 
 # Used by various components.  These rules need to precede them.
 script/lexer.c_DEPENDENCIES = grub_script.tab.h
@@ -21,7 +21,7 @@ kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c  kern/env.c	\
 	util/hostdisk.c util/getroot.c					\
 	\
 	grub_emu_init.c gnulib/progname.c
-kernel_img_CFLAGS = $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
+kernel_img_CFLAGS = $(CPPFLAGS) $(CFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 TARGET_NO_STRIP = yes
 TARGET_NO_DYNAMIC_MODULES = yes
diff --git a/efiemu/main.c b/efiemu/main.c
index 9480bfc4d..8a8a508fa 100644
--- a/efiemu/main.c
+++ b/efiemu/main.c
@@ -265,7 +265,7 @@ grub_efiemu_autocore (void)
   grub_free (filename);
   if (err)
     return err;
-#ifndef GRUB_UTIL
+#ifndef GRUB_MACHINE_EMU
   err = grub_machine_efiemu_init_tables ();
   if (err)
     return err;
@@ -313,7 +313,7 @@ grub_cmd_efiemu_load (grub_command_t cmd __attribute__ ((unused)),
   err = grub_efiemu_load_file (args[0]);
   if (err)
     return err;
-#ifndef GRUB_UTIL
+#ifndef GRUB_MACHINE_EMU
   err = grub_machine_efiemu_init_tables ();
   if (err)
     return err;
diff --git a/efiemu/mm.c b/efiemu/mm.c
index 6099a14ee..4b293606f 100644
--- a/efiemu/mm.c
+++ b/efiemu/mm.c
@@ -281,7 +281,7 @@ grub_efiemu_mmap_init (void)
   // the place for memory used by efiemu itself
   mmap_reserved_size = GRUB_EFI_MAX_MEMORY_TYPE + 1;
 
-#ifndef GRUB_UTIL
+#ifndef GRUB_MACHINE_EMU
   grub_machine_mmap_iterate (bounds_hook);
 #endif
 
@@ -394,7 +394,7 @@ grub_efiemu_mmap_fill (void)
 	}
     }
 
-#ifndef GRUB_UTIL
+#ifndef GRUB_MACHINE_EMU
   grub_machine_mmap_iterate (fill_hook);
 #endif
 
diff --git a/include/grub/dl.h b/include/grub/dl.h
index ac0ecd336..17e03f400 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -91,7 +91,12 @@ grub_dl_t grub_dl_load_core (void *addr, grub_size_t size);
 int EXPORT_FUNC(grub_dl_unload) (grub_dl_t mod);
 void grub_dl_unload_unneeded (void);
 void grub_dl_unload_all (void);
-#ifdef GRUB_UTIL
+#if defined (GRUB_MACHINE_EMU) || defined (GRUB_UTIL)
+#define GRUB_NO_MODULES 1
+#else
+#define GRUB_NO_MODULES 0
+#endif
+#if GRUB_NO_MODULES
 static inline int
 grub_dl_ref (grub_dl_t mod)
 {
@@ -116,7 +121,7 @@ grub_err_t grub_dl_register_symbol (const char *name, void *addr,
 grub_err_t grub_arch_dl_check_header (void *ehdr);
 grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
 
-#if defined (_mips) && ! defined (GRUB_UTIL)
+#if defined (_mips) && ! defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)
 #define GRUB_LINKER_HAVE_INIT 1
 void grub_arch_dl_init_linker (void);
 #endif
diff --git a/include/grub/mm.h b/include/grub/mm.h
index 4caf80511..4f443ee25 100644
--- a/include/grub/mm.h
+++ b/include/grub/mm.h
@@ -36,7 +36,7 @@ void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t size);
 void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);
 
 /* For debugging.  */
-#if defined(MM_DEBUG) && !defined(GRUB_UTIL)
+#if defined(MM_DEBUG) && !defined(GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)
 /* Set this variable to 1 when you want to trace all memory function calls.  */
 extern int EXPORT_VAR(grub_mm_debug);
 
diff --git a/include/grub/multiboot2.h b/include/grub/multiboot2.h
deleted file mode 100644
index af10cdc21..000000000
--- a/include/grub/multiboot2.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* multiboot2.h - multiboot2 header file with grub definitions. */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007  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/>.
- */
-
-#ifndef GRUB_MULTIBOOT2_HEADER
-#define GRUB_MULTIBOOT2_HEADER 1
-
-#include <grub/types.h>
-#include <grub/err.h>
-#include <grub/elf.h>
-
-#ifndef GRUB_UTIL
-typedef grub_uint32_t uint32_t;
-typedef grub_uint64_t uint64_t;
-#define __WORDSIZE GRUB_TARGET_WORDSIZE
-#endif
-
-struct multiboot2_tag_header;
-
-grub_err_t
-grub_mb2_tag_alloc (grub_addr_t *addr, int key, grub_size_t len);
-
-grub_err_t
-grub_mb2_tags_arch_create (void);
-
-void
-grub_mb2_arch_boot (grub_addr_t entry, void *tags);
-
-void
-grub_mb2_arch_unload (struct multiboot2_tag_header *tags);
-
-grub_err_t
-grub_mb2_arch_elf32_hook (Elf32_Phdr *phdr, grub_addr_t *addr, int *do_load);
-
-grub_err_t
-grub_mb2_arch_elf64_hook (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load);
-
-grub_err_t
-grub_mb2_arch_module_alloc (grub_size_t size, grub_addr_t *addr);
-
-grub_err_t
-grub_mb2_arch_module_free (grub_addr_t addr, grub_size_t size);
-
-void
-grub_multiboot2 (int argc, char *argv[]);
-
-void
-grub_module2 (int argc, char *argv[]);
-
-#define for_each_tag(tag, tags) \
-  for (tag = tags; \
-       tag && tag->key != MULTIBOOT2_TAG_END; \
-       tag = (struct multiboot2_tag_header *)((char *)tag + tag->len))
-
-#endif /* ! GRUB_MULTIBOOT2_HEADER */
diff --git a/include/grub/normal.h b/include/grub/normal.h
index e804fde77..fad1a41ba 100644
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -110,37 +110,4 @@ void read_terminal_list (void);
 
 void grub_set_more (int onoff);
 
-#ifdef GRUB_UTIL
-void grub_normal_init (void);
-void grub_normal_fini (void);
-void grub_hello_init (void);
-void grub_hello_fini (void);
-void grub_ls_init (void);
-void grub_ls_fini (void);
-void grub_cat_init (void);
-void grub_cat_fini (void);
-void grub_boot_init (void);
-void grub_boot_fini (void);
-void grub_cmp_init (void);
-void grub_cmp_fini (void);
-void grub_terminal_init (void);
-void grub_terminal_fini (void);
-void grub_loop_init (void);
-void grub_loop_fini (void);
-void grub_help_init (void);
-void grub_help_fini (void);
-void grub_halt_init (void);
-void grub_halt_fini (void);
-void grub_reboot_init (void);
-void grub_reboot_fini (void);
-void grub_configfile_init (void);
-void grub_configfile_fini (void);
-void grub_search_init (void);
-void grub_search_fini (void);
-void grub_test_init (void);
-void grub_test_fini (void);
-void grub_blocklist_init (void);
-void grub_blocklist_fini (void);
-#endif
-
 #endif /* ! GRUB_NORMAL_HEADER */
diff --git a/include/grub/partition.h b/include/grub/partition.h
index d35658cdd..faa89cea6 100644
--- a/include/grub/partition.h
+++ b/include/grub/partition.h
@@ -83,20 +83,6 @@ void EXPORT_FUNC(grub_partition_map_register) (grub_partition_map_t partmap);
 
 void EXPORT_FUNC(grub_partition_map_unregister) (grub_partition_map_t partmap);
 
-#ifdef GRUB_UTIL
-void grub_msdos_partition_map_init (void);
-void grub_msdos_partition_map_fini (void);
-void grub_amiga_partition_map_init (void);
-void grub_amiga_partition_map_fini (void);
-void grub_apple_partition_map_init (void);
-void grub_apple_partition_map_fini (void);
-void grub_sun_partition_map_init (void);
-void grub_sun_partition_map_fini (void);
-void grub_gpt_partition_map_init (void);
-void grub_gpt_partition_map_fini (void);
-void grub_apple_partition_map_init (void);
-void grub_apple_partition_map_fini (void);
-#endif
 
 static inline grub_disk_addr_t
 grub_partition_get_start (const grub_partition_t p)
diff --git a/include/grub/pci.h b/include/grub/pci.h
index 1f3ac7fc7..89bd1034a 100644
--- a/include/grub/pci.h
+++ b/include/grub/pci.h
@@ -68,7 +68,7 @@
 
 typedef grub_uint32_t grub_pci_id_t;
 
-#ifdef GRUB_UTIL
+#ifdef GRUB_MACHINE_EMU
 #include <grub/pciutils.h>
 #else
 typedef grub_uint32_t grub_pci_address_t;
diff --git a/kern/dl.c b/kern/dl.c
index 4735a004a..278d5b568 100644
--- a/kern/dl.c
+++ b/kern/dl.c
@@ -469,7 +469,7 @@ grub_dl_resolve_dependencies (grub_dl_t mod, Elf_Ehdr *e)
   return GRUB_ERR_NONE;
 }
 
-#ifndef GRUB_UTIL
+#if !GRUB_NO_MODULES
 int
 grub_dl_ref (grub_dl_t mod)
 {
diff --git a/loader/xnu.c b/loader/xnu.c
index cf9fa740b..8f1d0c641 100644
--- a/loader/xnu.c
+++ b/loader/xnu.c
@@ -1390,7 +1390,7 @@ grub_cmd_xnu_splash (grub_extcmd_t cmd,
 }
 
 
-#ifndef GRUB_UTIL
+#ifndef GRUB_MACHINE_EMU
 static grub_err_t
 grub_cmd_xnu_resume (grub_command_t cmd __attribute__ ((unused)),
 		     int argc, char *args[])
@@ -1444,7 +1444,7 @@ GRUB_MOD_INIT(xnu)
 				     N_("Load a splash image for XNU."),
 				     xnu_splash_cmd_options);
 
-#ifndef GRUB_UTIL
+#ifndef GRUB_MACHINE_EMU
   cmd_resume = grub_register_command ("xnu_resume", grub_cmd_xnu_resume,
 				      0, N_("Load XNU hibernate image."));
 #endif
@@ -1456,7 +1456,7 @@ GRUB_MOD_INIT(xnu)
 
 GRUB_MOD_FINI(xnu)
 {
-#ifndef GRUB_UTIL
+#ifndef GRUB_MACHINE_EMU
   grub_unregister_command (cmd_resume);
 #endif
   grub_unregister_command (cmd_mkext);
diff --git a/util/grub-emu.c b/util/grub-emu.c
index f64e66c5f..08ae19836 100644
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -157,8 +157,6 @@ main (int argc, char *argv[])
 
   set_program_name (argv[0]);
 
-  grub_util_init_nls ();
-
   while ((opt = getopt_long (argc, argv, "r:d:m:vH:hV", options, 0)) != -1)
     switch (opt)
       {
diff --git a/util/misc.c b/util/misc.c
index 8c79e8d9b..7381c8fdd 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -104,6 +104,7 @@ grub_util_error (const char *fmt, ...)
   exit (1);
 }
 
+#ifdef GRUB_UTIL
 int
 grub_err_printf (const char *fmt, ...)
 {
@@ -116,6 +117,7 @@ grub_err_printf (const char *fmt, ...)
 
   return ret;
 }
+#endif
 
 void *
 xmalloc (size_t size)
@@ -598,6 +600,7 @@ make_system_path_relative_to_its_root (const char *path)
   return buf3;
 }
 
+#ifdef GRUB_UTIL
 void
 grub_util_init_nls (void)
 {
@@ -607,3 +610,4 @@ grub_util_init_nls (void)
   textdomain (PACKAGE);
 #endif /* ENABLE_NLS */
 }
+#endif

From 19987ffa0249acd32cb76eff5e4aeef33f3a1076 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 04:45:54 +0100
Subject: [PATCH 0467/1628] Remove the need for explicit make grub-emu

---
 Makefile.in      | 11 +++++++----
 conf/any-emu.rmk |  5 +++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 853eea9db..e69c18b40 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -178,7 +178,10 @@ endif
 ### General targets.
 
 CLEANFILES += $(pkglib_DATA) $(pkgdata_DATA) po/*.mo
-pkglib_DATA += moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst
+pkglib_DATA += command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst
+ifneq ($(platform), emu)
+pkglib_DATA += moddep.lst
+endif
 moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep.awk
 	cat $(DEFSYMFILES) /dev/null \
 	  | $(AWK) -f $(srcdir)/genmoddep.awk $(UNDSYMFILES) > $@ \
@@ -278,7 +281,7 @@ build_env.mk: Makefile
 	) > $@
 pkglib_BUILDDIR += config.h grub_script.tab.h
 
-all-local: $(PROGRAMS) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(INFOS) $(MKFILES) $(foreach lang, $(LINGUAS), po/$(lang).mo)
+all-local: $(PROGRAMS) $(GRUB_EMU) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(INFOS) $(MKFILES) $(foreach lang, $(LINGUAS), po/$(lang).mo)
 
 install: install-local
 
@@ -299,7 +302,7 @@ install-local: all
 	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkgdatadir)/$$dest; \
 	done
 	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
-	@list='$(bin_UTILITIES)'; for file in $$list; do \
+	@list='$(bin_UTILITIES) $(GRUB_EMU)'; for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
@@ -375,7 +378,7 @@ uninstall:
 	  dest="`echo $$file | sed 's,.*/,,'`"; \
 	  rm -f $(DESTDIR)$(pkgdatadir)/$$dest; \
 	done
-	@list='$(bin_UTILITIES) $(bin_SCRIPTS)'; for file in $$list; do \
+	@list='$(bin_UTILITIES) $(bin_SCRIPTS) $(GRUB_EMU)'; for file in $$list; do \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  rm -f $(DESTDIR)$(bindir)/$$dest; \
 	  rm -f $(DESTDIR)$(mandir)/man1/$$dest.1; \
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 0f717c59c..7e9e34920 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -82,6 +82,7 @@ pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 grub_emu_LDFLAGS += $(LIBPCIACCESS)
 endif
 
+include $(srcdir)/conf/common.mk
 
 grub_emu_init.h: genemuinitheader.sh $(pkglib_MODULES)
 	rm -f $@; echo $(pkglib_MODULES) | sh $(srcdir)/genemuinitheader.sh $(NM)  > $@
@@ -91,8 +92,8 @@ grub_emu_init.c: genemuinit.sh $(pkglib_MODULES)
 	rm -f $@; echo $(pkglib_MODULES) | sh $(srcdir)/genemuinit.sh $(NM) > $@
 DISTCLEANFILES += grub_emu_init.c
 
-include $(srcdir)/conf/common.mk
-
+CLEANFILES += grub-emu
 grub-emu: $(pkglib_MODULES) $(pkglib_PROGRAMS)
 	$(CC) -o $@ $(pkglib_MODULES) $(pkglib_PROGRAMS) $(grub_emu_LDFLAGS) $(LDFLAGS)
+GRUB_EMU=grub-emu
 

From ceb294b7eef0d0bd14376e9f2bfb32f909975771 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 04:47:46 +0100
Subject: [PATCH 0468/1628] Don't create useless .lst

---
 Makefile.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index e69c18b40..820bfa946 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -178,9 +178,8 @@ endif
 ### General targets.
 
 CLEANFILES += $(pkglib_DATA) $(pkgdata_DATA) po/*.mo
-pkglib_DATA += command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst
 ifneq ($(platform), emu)
-pkglib_DATA += moddep.lst
+pkglib_DATA += moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst
 endif
 moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep.awk
 	cat $(DEFSYMFILES) /dev/null \

From c3e6233987018f036f54c92f0e303db57a364529 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 04:50:30 +0100
Subject: [PATCH 0469/1628] REmove the need for disable-werror

---
 conf/any-emu.rmk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 7e9e34920..77092454b 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -20,12 +20,18 @@ kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c  kern/env.c	\
 	util/console.c  util/grub-emu.c util/misc.c			\
 	util/hostdisk.c util/getroot.c					\
 	\
-	grub_emu_init.c gnulib/progname.c
+	grub_emu_init.c
 kernel_img_CFLAGS = $(CPPFLAGS) $(CFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 TARGET_NO_STRIP = yes
 TARGET_NO_DYNAMIC_MODULES = yes
 
+# progname.c always has warnings. Compile it separately.
+pkglib_MODULES += progname.mod
+progname_mod_SOURCES = gnulib/progname.c
+progname_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-error
+progname_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # For hostfs.mod.
 pkglib_MODULES += hostfs.mod
 hostfs_mod_SOURCES = util/hostfs.c

From 7a64e28d0e1726f539041bc7562ff9498554f333 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sun, 7 Feb 2010 10:14:50 +0530
Subject: [PATCH 0470/1628] fixed mkconfig and mkrescue scripts

---
 util/grub-mkconfig.in | 10 +++++++---
 util/grub-mkrescue.in | 21 +++++++++++++++++++--
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 49e52b313..34e46605c 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -50,7 +50,11 @@ EOF
 }
 
 # Check the arguments.
-for option in "$@"; do
+while test $# -gt 0
+do
+    option=$1
+    shift
+
     case "$option" in
     -h | --help)
 	usage
@@ -58,9 +62,9 @@ for option in "$@"; do
     -v | --version)
 	echo "$0 (GNU GRUB ${package_version})"
 	exit 0 ;;
-    -o)
-	shift
+    -o | --output)
 	grub_cfg=$1
+	shift
 	;;
     --output=*)
 	grub_cfg=`echo "$option" | sed 's/--output=//'`
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 6b3c9ecb8..b9ef3219b 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -42,8 +42,8 @@ Make GRUB rescue image.
 
   -h, --help              print this message and exit
   -v, --version           print the version information and exit
+  -o, --output=FILE       save output in FILE [required]
   --modules=MODULES       pre-load specified modules MODULES
-  --output=FILE           save output in FILE [required]
 
 $0 generates a bootable rescue image with specified source files or directories.
 
@@ -52,7 +52,11 @@ EOF
 }
 
 # Check the arguments.
-for option in "$@"; do
+while test $# -gt 0
+do
+    option=$1
+    shift
+
     case "$option" in
     -h | --help)
 	usage
@@ -60,11 +64,24 @@ for option in "$@"; do
     -v | --version)
 	echo "$0 (GNU GRUB ${PACKAGE_VERSION})"
 	exit 0 ;;
+
+    --modules)
+        modules=$1; shift ;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
+
+    -o | --output)
+	output_image=$1; shift ;;
     --output=*)
 	output_image=`echo "$option" | sed 's/--output=//'` ;;
+
     # Intentionally undocumented
+    --override-directory)
+        override_dir=$1
+	shift
+	PATH=${override_dir}:$PATH
+	export PATH
+	;;
     --override-directory=*)
 	override_dir=`echo "${option}/" | sed 's/--override-directory=//'`
 	PATH=${override_dir}:$PATH

From 09f38ecd5a8dcd5e7cde3640e3355aaac766a5de Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sun, 7 Feb 2010 10:31:04 +0530
Subject: [PATCH 0471/1628] fix remaining scripts

---
 util/grub-reboot.in                    | 10 +++++++++-
 util/grub-set-default.in               | 10 +++++++++-
 util/i386/efi/grub-install.in          | 22 +++++++++++++++++++++-
 util/ieee1275/grub-install.in          | 22 +++++++++++++++++++++-
 util/powerpc/ieee1275/grub-mkrescue.in | 16 +++++++++++++++-
 5 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/util/grub-reboot.in b/util/grub-reboot.in
index 20f2b10bc..eb7073e02 100644
--- a/util/grub-reboot.in
+++ b/util/grub-reboot.in
@@ -45,7 +45,11 @@ EOF
 }
 
 # Check the arguments.
-for option in "$@"; do
+while test $# -gt 0
+do
+    option=$1
+    shift
+
     case "$option" in
     -h | --help)
 	usage
@@ -53,8 +57,12 @@ for option in "$@"; do
     -v | --version)
 	echo "grub-reboot (GNU GRUB ${PACKAGE_VERSION})"
 	exit 0 ;;
+
+    --root-directory)
+	rootdir=$1; shift ;;
     --root-directory=*)
 	rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
+
     -*)
 	echo "Unrecognized option \`$option'" 1>&2
 	usage
diff --git a/util/grub-set-default.in b/util/grub-set-default.in
index 4d7c10e8e..2636543c3 100644
--- a/util/grub-set-default.in
+++ b/util/grub-set-default.in
@@ -45,7 +45,11 @@ EOF
 }
 
 # Check the arguments.
-for option in "$@"; do
+while test $# -gt 0
+do
+    option=$1
+    shift
+
     case "$option" in
     -h | --help)
 	usage
@@ -53,8 +57,12 @@ for option in "$@"; do
     -v | --version)
 	echo "grub-set-default (GNU GRUB ${PACKAGE_VERSION})"
 	exit 0 ;;
+
+    --root-directory)
+	rootdir=$1; shift ;;
     --root-directory=*)
 	rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
+
     -*)
 	echo "Unrecognized option \`$option'" 1>&2
 	usage
diff --git a/util/i386/efi/grub-install.in b/util/i386/efi/grub-install.in
index caa7be7e4..b93525e3e 100644
--- a/util/i386/efi/grub-install.in
+++ b/util/i386/efi/grub-install.in
@@ -71,7 +71,11 @@ EOF
 }
 
 # Check the arguments.
-for option in "$@"; do
+while test $# -gt 0
+do
+    option=$1
+    shift
+
     case "$option" in
     -h | --help)
 	usage
@@ -79,16 +83,32 @@ for option in "$@"; do
     -v | --version)
 	echo "grub-install (GNU GRUB ${PACKAGE_VERSION})"
 	exit 0 ;;
+
+    --modules)
+        modules=$1; shift ;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
+
+    --root-directory)
+	rootdir=$1; shift ;;
     --root-directory=*)
 	rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
+
+    --grub-mkimage)
+	grub_mkimage=$1; shift ;;
     --grub-mkimage=*)
 	grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
+
+    --grub-mkdevicemap)
+	grub_mkdevicemap=$1; shift ;;
     --grub-mkdevicemap=*)
 	grub_mkdevicemap=`echo "$option" | sed 's/--grub-mkdevicemap=//'` ;;
+
+    --grub-probe)
+	grub_probe=$1; shift ;;
     --grub-probe=*)
 	grub_probe=`echo "$option" | sed 's/--grub-probe=//'` ;;
+
     --no-floppy)
 	no_floppy="--no-floppy" ;;
     --recheck)
diff --git a/util/ieee1275/grub-install.in b/util/ieee1275/grub-install.in
index 97c485d55..63dde62b3 100644
--- a/util/ieee1275/grub-install.in
+++ b/util/ieee1275/grub-install.in
@@ -75,7 +75,11 @@ EOF
 }
 
 # Check the arguments.
-for option in "$@"; do
+while test $# -gt 0
+do
+    option=$1
+    shift
+
     case "$option" in
     -h | --help)
 	usage
@@ -83,16 +87,32 @@ for option in "$@"; do
     -v | --version)
 	echo "grub-install (GNU GRUB ${PACKAGE_VERSION})"
 	exit 0 ;;
+
+    --modules)
+	modules=$1; shift ;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
+
+    --root-directory)
+	rootdir=$1; shift ;;
     --root-directory=*)
 	rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
+
+    --grub-mkdevicemap)
+	grub_mkdevicemap=$1; shift ;;
     --grub-mkdevicemap=*)
 	grub_mkdevicemap=`echo "$option" | sed 's/--grub-mkdevicemap=//'` ;;
+
+    --grub-mkimage)
+	grub_mkimage=$1; shift ;;
     --grub-mkimage=*)
 	grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
+
+    --grub-probe)
+	grub_probe=$1; shift ;;
     --grub-probe=*)
 	grub_probe=`echo "$option" | sed 's/--grub-probe=//'` ;;
+
     --no-nvram)
 	update_nvram=no ;;
     # This is an undocumented feature...
diff --git a/util/powerpc/ieee1275/grub-mkrescue.in b/util/powerpc/ieee1275/grub-mkrescue.in
index 0110e799c..375adb0cb 100644
--- a/util/powerpc/ieee1275/grub-mkrescue.in
+++ b/util/powerpc/ieee1275/grub-mkrescue.in
@@ -55,7 +55,11 @@ EOF
 input_dir=${pkglibdir}
 
 # Check the arguments.
-for option in "$@"; do
+while test $# -gt 0
+do
+    option=$1
+    shift
+
     case "$option" in
     -h | --help)
 	usage
@@ -63,12 +67,22 @@ for option in "$@"; do
     -v | --version)
 	echo "grub-mkrescue (GNU GRUB ${PACKAGE_VERSION})"
 	exit 0 ;;
+
+    --modules)
+	modules=$1; shift ;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
+
+    --pkglibdir)
+	input_dir=$1; shift ;;
     --pkglibdir=*)
 	input_dir=`echo "$option" | sed 's/--pkglibdir=//'` ;;
+
+    --grub-mkimage)
+	grub_mkimage=$1; shift ;;
     --grub-mkimage=*)
 	grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
+
     -*)
 	echo "Unrecognized option \`$option'" 1>&2
 	usage

From f38873b80b1c55d0f8020500adf3351589294365 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 15:17:26 +0100
Subject: [PATCH 0472/1628] Build system support for grub-emu modules

---
 Makefile.in        |  8 +++++++-
 conf/any-emu.rmk   | 46 ++++++++++++++++++++++++++++++++--------------
 configure.ac       | 16 ++++++++++++++++
 genmk.rb           | 34 ++++++++++++++++++++--------------
 genmoddep.awk      |  4 ++--
 include/grub/dl.h  |  4 ++--
 include/grub/sdl.h | 24 ++++++++++++++++++++++++
 util/grub-emu.c    |  9 +++++++++
 util/misc.c        |  2 ++
 9 files changed, 114 insertions(+), 33 deletions(-)
 create mode 100644 include/grub/sdl.h

diff --git a/Makefile.in b/Makefile.in
index 820bfa946..8eaf17a7a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,6 +43,7 @@ pkglibdir =  $(libdir)/`echo @PACKAGE_TARNAME@/$(target_cpu)-$(platform) | sed '
 
 # Internationalization library.
 LIBINTL = @LIBINTL@
+TARGET_NO_MODULES = @TARGET_NO_MODULES@
 
 XGETTEXT = @XGETTEXT@
 MSGMERGE = @MSGMERGE@
@@ -175,10 +176,15 @@ include $(srcdir)/conf/tests.mk
 -include $(wildcard $(GRUB_CONTRIB)/*/conf/common.mk)
 endif
 
+ifeq ($(TARGET_NO_MODULES), yes)
+	TARGET_CFLAGS += -DGRUB_TARGET_NO_MODULES=1
+	CFLAGS += -DGRUB_TARGET_NO_MODULES=1
+endif
+
 ### General targets.
 
 CLEANFILES += $(pkglib_DATA) $(pkgdata_DATA) po/*.mo
-ifneq ($(platform), emu)
+ifneq ($(TARGET_NO_MODULES), yes)
 pkglib_DATA += moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst
 endif
 moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep.awk
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 77092454b..009f1079b 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -13,30 +13,33 @@ pkglib_PROGRAMS = kernel.img
 kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c  kern/env.c	\
 	kern/err.c kern/list.c kern/handler.c				\
 	kern/command.c kern/corecmd.c kern/file.c			\
-	kern/fs.c commands/boot.c kern/main.c kern/misc.c kern/parser.c	\
+	kern/fs.c kern/main.c kern/misc.c kern/parser.c	\
 	kern/partition.c kern/term.c					\
 	kern/rescue_reader.c kern/rescue_parser.c			\
 	\
 	util/console.c  util/grub-emu.c util/misc.c			\
 	util/hostdisk.c util/getroot.c					\
 	\
-	grub_emu_init.c
-kernel_img_CFLAGS = $(CPPFLAGS) $(CFLAGS)
+	gnulib/progname.c util/hostfs.c
+kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
+	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
+	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
+	list.h handler.h command.h i18n.h env_private.h
+kernel_img_CFLAGS = $(CPPFLAGS) $(CFLAGS) -Wno-undef
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 TARGET_NO_STRIP = yes
-TARGET_NO_DYNAMIC_MODULES = yes
 
-# progname.c always has warnings. Compile it separately.
-pkglib_MODULES += progname.mod
-progname_mod_SOURCES = gnulib/progname.c
-progname_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-error
-progname_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ifneq ($(TARGET_NO_MODULES), yes)
+kernel_img_SOURCES += symlist.c
+else
+kernel_img_SOURCES += grub_emu_init.c
+endif
 
-# For hostfs.mod.
-pkglib_MODULES += hostfs.mod
-hostfs_mod_SOURCES = util/hostfs.c
-hostfs_mod_CFLAGS = $(COMMON_CFLAGS)
-hostfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+# For boot.mod.
+pkglib_MODULES += boot.mod
+boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
+boot_mod_CFLAGS = $(COMMON_CFLAGS)
+boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For host.mod.
 pkglib_MODULES += host.mod
@@ -77,8 +80,10 @@ endif
 ifeq ($(enable_grub_emu_sdl), yes)
 pkglib_MODULES += sdl.mod
 sdl_mod_SOURCES = util/sdl.c
+sdl_mod_CFLAGS = $(COMMON_CFLAGS)
 sdl_mod_LDFLAGS = $(COMMON_LDFLAGS)
 grub_emu_LDFLAGS += $(LIBSDL)
+kernel_img_HEADERS += sdl.h
 endif
 
 ifeq ($(enable_grub_emu_pci), yes)
@@ -90,6 +95,14 @@ endif
 
 include $(srcdir)/conf/common.mk
 
+MOSTLYCLEANFILES += symlist.c kernel_syms.lst
+DEFSYMFILES += kernel_syms.lst
+symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
+	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
+
+kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
+	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
+
 grub_emu_init.h: genemuinitheader.sh $(pkglib_MODULES)
 	rm -f $@; echo $(pkglib_MODULES) | sh $(srcdir)/genemuinitheader.sh $(NM)  > $@
 DISTCLEANFILES += grub_emu_init.h
@@ -99,7 +112,12 @@ grub_emu_init.c: genemuinit.sh $(pkglib_MODULES)
 DISTCLEANFILES += grub_emu_init.c
 
 CLEANFILES += grub-emu
+ifneq ($(TARGET_NO_MODULES), yes)
+grub-emu: $(pkglib_PROGRAMS)
+	$(CC) -o $@ $(pkglib_PROGRAMS) $(grub_emu_LDFLAGS) $(LDFLAGS)
+else
 grub-emu: $(pkglib_MODULES) $(pkglib_PROGRAMS)
 	$(CC) -o $@ $(pkglib_MODULES) $(pkglib_PROGRAMS) $(grub_emu_LDFLAGS) $(LDFLAGS)
+endif
 GRUB_EMU=grub-emu
 
diff --git a/configure.ac b/configure.ac
index f3fcd8c48..7c8bdb62c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -548,6 +548,10 @@ AC_ARG_ENABLE([grub-emu-pci],
 	      [AS_HELP_STRING([--enable-grub-emu-pci],
                              [build and install the `grub-emu' debugging utility with PCI support (potentially dangerous) (default=no)])])
 
+AC_ARG_ENABLE([grub-emu-modules],
+	      [AS_HELP_STRING([--enable-grub-emu-modules],
+                             [Support module loading in `grub-emu' debugging utility (default=no)])])
+
 if test "$platform" = emu; then
   missing_ncurses=
 [# Check for curses libraries.]
@@ -566,6 +570,13 @@ if test x"$missing_ncurses" = xtrue ; then
   AC_MSG_ERROR([grub-emu can't be compiled without ncurses])
 fi
 
+if test x"$enable_grub_emu_modules" = xyes ; then
+  TARGET_NO_MODULES=no
+else
+  TARGET_NO_MODULES=yes
+fi
+AC_SUBST(TARGET_NO_MODULES)
+
 if test x"$enable_grub_emu_usb" = xno ; then
   grub_emu_usb_excuse="explicitly disabled"
 fi
@@ -733,6 +744,11 @@ echo PCI support for grub-emu: Yes
 else
 echo PCI support for grub-emu: No "($grub_emu_pci_excuse)"
 fi
+if [ x"$TARGET_NO_MODULES" = xno ]; then
+echo Module support for grub-emu: Yes
+else
+echo Module support for grub-emu: No
+fi
 fi
 if [ x"$enable_mm_debug" = xyes ]; then
 echo With memory debugging: Yes
diff --git a/genmk.rb b/genmk.rb
index 7df15043a..5cecc5d16 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -143,7 +143,7 @@ mostlyclean-module-#{@name}.#{@rule_count}:
 MOSTLYCLEAN_MODULE_TARGETS += mostlyclean-module-#{@name}.#{@rule_count}
 UNDSYMFILES += #{undsym}
 
-ifeq ($(TARGET_NO_DYNAMIC_MODULES), yes)
+ifeq ($(TARGET_NO_MODULES), yes)
 #{@name}: #{pre_obj} $(TARGET_OBJ2ELF)
 	-rm -f $@
 	$(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ #{pre_obj}
@@ -322,28 +322,32 @@ class Program
   end
   attr_reader :dir, :name
 
+  def print_tail()
+    prefix = @name.to_var
+    print "CLEANFILES += #{@name} $(#{prefix}_OBJECTS)
+ifeq ($(#{prefix}_RELOCATABLE),yes)
+#{@name}: $(#{prefix}_DEPENDENCIES) $(#{prefix}_OBJECTS)
+	$(TARGET_CC) -Wl,-r,-d -o $@ $(#{prefix}_OBJECTS) $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS)
+	if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) --strip-unneeded -K start -R .note -R .comment $@; fi
+else
+#{@name}: $(#{prefix}_DEPENDENCIES) $(#{prefix}_OBJECTS)
+	$(TARGET_CC) -o $@ $(#{prefix}_OBJECTS) $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS)
+	if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) -R .rel.dyn -R .reginfo -R .note -R .comment $@; fi
+endif
+
+"
+  end
+
   def rule(sources)
     prefix = @name.to_var
     objs = sources.collect do |src|
       raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
       prefix + '-' + src.to_obj
     end
-    objs_str = objs.join(' ');
     deps = objs.collect {|obj| obj.suffix('d')}
     deps_str = deps.join(' ');
 
-    "CLEANFILES += #{@name} #{objs_str}
-MOSTLYCLEANFILES += #{deps_str}
-
-ifeq ($(#{prefix}_RELOCATABLE),yes)
-#{@name}: $(#{prefix}_DEPENDENCIES) #{objs_str}
-	$(TARGET_CC) -Wl,-r,-d -o $@ #{objs_str} $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS)
-	if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) --strip-unneeded -K start -R .note -R .comment $@; fi
-else
-#{@name}: $(#{prefix}_DEPENDENCIES) #{objs_str}
-	$(TARGET_CC) -o $@ #{objs_str} $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS)
-	if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) -R .rel.dyn -R .reginfo -R .note -R .comment $@; fi
-endif
+    "MOSTLYCLEANFILES += #{deps_str}
 
 " + objs.collect_with_index do |obj, i|
       src = sources[i]
@@ -358,6 +362,7 @@ endif
 
 -include #{dep}
 
+#{prefix}_OBJECTS += #{obj}
 "
     end.join('')
   end
@@ -466,4 +471,5 @@ while l = gets
 
 end
 utils.each {|util| util.print_tail()}
+programs.each {|program| program.print_tail()}
 
diff --git a/genmoddep.awk b/genmoddep.awk
index 19ac80c71..9f751389b 100644
--- a/genmoddep.awk
+++ b/genmoddep.awk
@@ -32,13 +32,13 @@ FNR == 1 {
   else if ($1 != "__gnu_local_gp") {
     printf "%s in %s is not defined\n", $1, module >"/dev/stderr";
     error++;
-    exit;
+#    exit;
   }
 }
 
 # Output the result.
 END {
-  if (error == 1)
+  if (error != 0)
     exit 1;
 
   for (mod in modtab) {
diff --git a/include/grub/dl.h b/include/grub/dl.h
index 17e03f400..cfb7c2f99 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -91,7 +91,7 @@ grub_dl_t grub_dl_load_core (void *addr, grub_size_t size);
 int EXPORT_FUNC(grub_dl_unload) (grub_dl_t mod);
 void grub_dl_unload_unneeded (void);
 void grub_dl_unload_all (void);
-#if defined (GRUB_MACHINE_EMU) || defined (GRUB_UTIL)
+#if defined (GRUB_UTIL) || defined (GRUB_TARGET_NO_MODULES)
 #define GRUB_NO_MODULES 1
 #else
 #define GRUB_NO_MODULES 0
@@ -121,7 +121,7 @@ grub_err_t grub_dl_register_symbol (const char *name, void *addr,
 grub_err_t grub_arch_dl_check_header (void *ehdr);
 grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
 
-#if defined (_mips) && ! defined (GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)
+#if defined (_mips) && ! GRUB_NO_MODULES
 #define GRUB_LINKER_HAVE_INIT 1
 void grub_arch_dl_init_linker (void);
 #endif
diff --git a/include/grub/sdl.h b/include/grub/sdl.h
new file mode 100644
index 000000000..e4efdc9b1
--- /dev/null
+++ b/include/grub/sdl.h
@@ -0,0 +1,24 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+void EXPORT_FUNC (SDL_Quit) (void);
+void EXPORT_FUNC (SDL_SetColors) (void);
+void EXPORT_FUNC (SDL_Init) (void);
+void EXPORT_FUNC (SDL_GetError) (void);
+void EXPORT_FUNC (SDL_Flip) (void);
+void EXPORT_FUNC (SDL_SetVideoMode) (void);
diff --git a/util/grub-emu.c b/util/grub-emu.c
index 08ae19836..3ad6e406c 100644
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -146,6 +146,9 @@ usage (int status)
 }
 
 
+void grub_hostfs_init (void);
+void grub_hostfs_fini (void);
+
 int
 main (int argc, char *argv[])
 {
@@ -204,11 +207,14 @@ main (int argc, char *argv[])
 
   signal (SIGINT, SIG_IGN);
   grub_console_init ();
+  grub_hostfs_init ();
 
   /* XXX: This is a bit unportable.  */
   grub_util_biosdisk_init (dev_map);
 
+#if GRUB_NO_MODULES
   grub_init_all ();
+#endif
 
   /* Make sure that there is a root device.  */
   if (! root_dev)
@@ -235,7 +241,10 @@ main (int argc, char *argv[])
   if (setjmp (main_env) == 0)
     grub_main ();
 
+#if GRUB_NO_MODULES
   grub_fini_all ();
+#endif
+  grub_hostfs_fini ();
 
   grub_machine_fini ();
 
diff --git a/util/misc.c b/util/misc.c
index 7381c8fdd..16a8b234b 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -319,10 +319,12 @@ grub_mm_init_region (void *addr __attribute__ ((unused)),
 {
 }
 
+#if GRUB_NO_MODULES
 void
 grub_register_exported_symbols (void)
 {
 }
+#endif
 
 void
 grub_exit (void)

From b255e9cfb3939bd36f039e269d30e718ac00d62d Mon Sep 17 00:00:00 2001
From: Yves Blusseau <blusseau@zetam.org>
Date: Sun, 7 Feb 2010 16:02:51 +0100
Subject: [PATCH 0473/1628] 2010-02-07  Yves Blusseau  <blusseau@zetam.org>

    * gnulib/getdelim.c: add missing header (type ssize_t must be defined).
---
 ChangeLog         | 4 ++++
 gnulib/getdelim.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ec3318c5b..540639220 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-07  Yves Blusseau  <blusseau@zetam.org>
+
+    * gnulib/getdelim.c: add missing header (type ssize_t must be defined).
+
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix warnings in grub-emu when compiling with maximum warning options.
diff --git a/gnulib/getdelim.c b/gnulib/getdelim.c
index 12f2167c9..85818b565 100644
--- a/gnulib/getdelim.c
+++ b/gnulib/getdelim.c
@@ -27,6 +27,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <unistd.h>
 
 #ifndef SSIZE_MAX
 # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))

From 3dca5319c6a1f6bee442e29e82866aefd0da6056 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 16:13:59 +0100
Subject: [PATCH 0474/1628] module support in grub-emu

---
 conf/any-emu.rmk | 19 +++++++++---------
 conf/common.rmk  | 10 +++++-----
 util/grub-emu.c  | 13 +++++++++---
 util/hostdisk.c  |  4 ++--
 util/misc.c      | 52 +-----------------------------------------------
 5 files changed, 27 insertions(+), 71 deletions(-)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 009f1079b..ad71f06bd 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -7,7 +7,6 @@ COMMON_CFLAGS +=
 script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 #sbin_UTILITIES += grub-emu
-util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
 kernel_img_RELOCATABLE = yes
 pkglib_PROGRAMS = kernel.img
 kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c  kern/env.c	\
@@ -18,9 +17,9 @@ kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c  kern/env.c	\
 	kern/rescue_reader.c kern/rescue_parser.c			\
 	\
 	util/console.c  util/grub-emu.c util/misc.c			\
-	util/hostdisk.c util/getroot.c					\
+	util/hostdisk.c util/getroot.c util/mm.c			\
 	\
-	gnulib/progname.c util/hostfs.c
+	gnulib/progname.c util/hostfs.c disk/host.c
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
@@ -30,9 +29,15 @@ kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 TARGET_NO_STRIP = yes
 
 ifneq ($(TARGET_NO_MODULES), yes)
-kernel_img_SOURCES += symlist.c
+kernel_img_SOURCES += symlist.c kern/$(target_cpu)/dl.c
+ifneq ($(target_cpu), i386)
+ifneq ($(target_cpu), x86_64)
+kernel_img_SOURCES += kern/$(target_cpu)/cache.S
+endif
+endif
 else
 kernel_img_SOURCES += grub_emu_init.c
+grub_emu_init.c_DEPENDENCIES = grub_emu_init.h
 endif
 
 # For boot.mod.
@@ -41,12 +46,6 @@ boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
 boot_mod_CFLAGS = $(COMMON_CFLAGS)
 boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For host.mod.
-pkglib_MODULES += host.mod
-host_mod_SOURCES = disk/host.c
-host_mod_CFLAGS = $(COMMON_CFLAGS)
-host_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For reboot.mod.
 pkglib_MODULES += reboot.mod
 reboot_mod_SOURCES = commands/reboot.c
diff --git a/conf/common.rmk b/conf/common.rmk
index 6cce36395..a77512643 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -22,7 +22,7 @@ util/elf/grub-mkimage.c_DEPENDENCIES = Makefile
 sbin_UTILITIES += grub-probe
 util/grub-probe.c_DEPENDENCIES = grub_probe_init.h
 grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c	\
-	util/hostdisk.c	util/misc.c util/getroot.c		\
+	util/hostdisk.c	util/misc.c util/getroot.c util/mm.c	\
 	kern/device.c kern/disk.c kern/err.c kern/misc.c	\
 	kern/parser.c kern/partition.c kern/file.c		\
 	\
@@ -57,7 +57,7 @@ grub_mkisofs_CFLAGS = -D_FILE_OFFSET_BITS=64 				\
 # For grub-fstest.
 util/grub-fstest.c_DEPENDENCIES = grub_fstest_init.h
 grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c util/hostfs.c \
-	util/misc.c 	\
+	util/misc.c util/mm.c 	\
 	kern/file.c kern/device.c kern/disk.c kern/err.c kern/misc.c	\
 	disk/host.c disk/loopback.c kern/list.c kern/command.c		\
 	lib/arg.c commands/extcmd.c normal/datetime.c normal/misc.c	\
@@ -95,7 +95,7 @@ grub_bin2h_SOURCES = gnulib/progname.c util/bin2h.c
 bin_UTILITIES += grub-script-check
 util/grub-script-check.c_DEPENDENCIES = grub_script_check_init.h
 grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c \
-	util/grub-script-check.c util/misc.c \
+	util/grub-script-check.c util/misc.c util/mm.c \
 	script/main.c script/script.c script/function.c script/lexer.c \
 	kern/handler.c kern/err.c kern/parser.c kern/list.c \
 	kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c
@@ -159,7 +159,7 @@ DISTCLEANFILES += grub_fstest_init.c
 
 # for grub-editenv
 bin_UTILITIES += grub-editenv
-grub_editenv_SOURCES = gnulib/progname.c util/grub-editenv.c lib/envblk.c util/misc.c kern/misc.c kern/err.c
+grub_editenv_SOURCES = gnulib/progname.c util/grub-editenv.c lib/envblk.c util/misc.c util/mm.c kern/misc.c kern/err.c
 CLEANFILES += grub-editenv
 
 # Needed for genmk.rb to work
@@ -760,7 +760,7 @@ password_pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
 password_pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 bin_UTILITIES += grub-mkpasswd-pbkdf2
-grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c
+grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c util/mm.c kern/err.c
 grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap -DGRUB_MKPASSWD=1
 
 include $(srcdir)/conf/gcry.mk
diff --git a/util/grub-emu.c b/util/grub-emu.c
index 3ad6e406c..fadb79385 100644
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -38,8 +38,6 @@
 #include <grub/partition.h>
 #include <grub/i18n.h>
 
-#include <grub_emu_init.h>
-
 #define ENABLE_RELOCATABLE 0
 #include "progname.h"
 
@@ -55,6 +53,7 @@ grub_arch_modules_addr (void)
   return 0;
 }
 
+#if GRUB_NO_MODULES
 grub_err_t
 grub_arch_dl_check_header (void *ehdr)
 {
@@ -71,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 
   return GRUB_ERR_BAD_MODULE;
 }
+#endif
 
 void
 grub_reboot (void)
@@ -148,6 +148,8 @@ usage (int status)
 
 void grub_hostfs_init (void);
 void grub_hostfs_fini (void);
+void grub_host_init (void);
+void grub_host_fini (void);
 
 int
 main (int argc, char *argv[])
@@ -207,6 +209,7 @@ main (int argc, char *argv[])
 
   signal (SIGINT, SIG_IGN);
   grub_console_init ();
+  grub_host_init ();
   grub_hostfs_init ();
 
   /* XXX: This is a bit unportable.  */
@@ -232,7 +235,10 @@ main (int argc, char *argv[])
 	}
     }
 
-  dir = grub_get_prefix (dir);
+  if (strcmp (root_dev, "host") == 0)
+    dir = xstrdup (dir);
+  else
+    dir = grub_get_prefix (dir);
   prefix = xmalloc (strlen (root_dev) + 2 + strlen (dir) + 1);
   sprintf (prefix, "(%s)%s", root_dev, dir);
   free (dir);
@@ -245,6 +251,7 @@ main (int argc, char *argv[])
   grub_fini_all ();
 #endif
   grub_hostfs_fini ();
+  grub_host_fini ();
 
   grub_machine_fini ();
 
diff --git a/util/hostdisk.c b/util/hostdisk.c
index 98d3d53ae..0b22e0ad3 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -168,7 +168,7 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
 
   drive = find_grub_drive (name);
   if (drive < 0)
-    return grub_error (GRUB_ERR_BAD_DEVICE,
+    return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
 		       "no mapping exists for `%s'", name);
 
   disk->has_partitions = 1;
@@ -949,7 +949,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
   drive = find_system_device (os_dev);
   if (drive < 0)
     {
-      grub_error (GRUB_ERR_BAD_DEVICE,
+      grub_error (GRUB_ERR_UNKNOWN_DEVICE,
 		  "no mapping exists for `%s'", os_dev);
       return 0;
     }
diff --git a/util/misc.c b/util/misc.c
index 16a8b234b..6182f138e 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -262,56 +262,6 @@ grub_util_write_image (const char *img, size_t size, FILE *out)
     grub_util_error ("write failed");
 }
 
-void *
-grub_malloc (grub_size_t size)
-{
-  return xmalloc (size);
-}
-
-void *
-grub_zalloc (grub_size_t size)
-{
-  void *ret;
-
-  ret = xmalloc (size);
-  memset (ret, 0, size);
-  return ret;
-}
-
-void
-grub_free (void *ptr)
-{
-  free (ptr);
-}
-
-void *
-grub_realloc (void *ptr, grub_size_t size)
-{
-  return xrealloc (ptr, size);
-}
-
-void *
-grub_memalign (grub_size_t align, grub_size_t size)
-{
-  void *p;
-
-#if defined(HAVE_POSIX_MEMALIGN)
-  if (posix_memalign (&p, align, size) != 0)
-    p = 0;
-#elif defined(HAVE_MEMALIGN)
-  p = memalign (align, size);
-#else
-  (void) align;
-  (void) size;
-  grub_util_error ("grub_memalign is not supported");
-#endif
-
-  if (! p)
-    grub_util_error ("out of memory");
-
-  return p;
-}
-
 /* Some functions that we don't use.  */
 void
 grub_mm_init_region (void *addr __attribute__ ((unused)),
@@ -376,7 +326,7 @@ grub_millisleep (grub_uint32_t ms)
 
 #endif
 
-#if !(defined (__i386__) || defined (__x86_64__))
+#if !(defined (__i386__) || defined (__x86_64__)) && GRUB_NO_MODULES
 void
 grub_arch_sync_caches (void *address __attribute__ ((unused)),
 		       grub_size_t len __attribute__ ((unused)))

From ac307b2ae4e58d2854281bf4a00527b778a4dd2b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 16:47:50 +0100
Subject: [PATCH 0475/1628] Cleanup

---
 Makefile.in      | 6 ++++--
 conf/any-emu.rmk | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 820bfa946..7af2df1f0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,8 +89,10 @@ TARGET_ASFLAGS = @TARGET_ASFLAGS@
 TARGET_MODULE_FORMAT = @TARGET_MODULE_FORMAT@
 TARGET_APPLE_CC = @TARGET_APPLE_CC@
 OBJCONV = @OBJCONV@
-TARGET_CPPFLAGS = @TARGET_CPPFLAGS@ -I$(srcdir)/include -I$(builddir) -I$(builddir)/include \
-	-Wall -W
+TARGET_CPPFLAGS = @TARGET_CPPFLAGS@ -I$(srcdir)/include -I$(builddir) -I$(builddir)/include -Wall -W
+ifneq ($(platform), emu)
+TARGET_CPPFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include)
+endif
 TARGET_LDFLAGS = @TARGET_LDFLAGS@
 TARGET_IMG_LDSCRIPT = @TARGET_IMG_LDSCRIPT@
 TARGET_IMG_LDFLAGS = @TARGET_IMG_LDFLAGS@
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 77092454b..529174bc3 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -6,7 +6,6 @@ COMMON_CFLAGS +=
 # Used by various components.  These rules need to precede them.
 script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
-#sbin_UTILITIES += grub-emu
 util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
 kernel_img_RELOCATABLE = yes
 pkglib_PROGRAMS = kernel.img

From 62853e73e5b455f2208d3ba410736a4bd0b407d9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 16:48:11 +0100
Subject: [PATCH 0476/1628] ChangeLog

---
 ChangeLog.emu-mod | 57 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 ChangeLog.emu-mod

diff --git a/ChangeLog.emu-mod b/ChangeLog.emu-mod
new file mode 100644
index 000000000..7ebdecdd8
--- /dev/null
+++ b/ChangeLog.emu-mod
@@ -0,0 +1,57 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Compile parts of grub-emu as modules.
+
+	* Makefile.in (TARGET_CPPFLAGS) [emu]: Remove -nostdinc -isystem.
+	(pkglib_DATA) [emu]: Remove moddep.lst command.lst fs.lst
+	partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst.
+	(all-local): Add $(GRUB_EMU).
+	(install-local): Install $(GRUB_EMU).
+	(uninstall): Uninstall $(GRUB_EMU).
+	* commands/parttool.c: Replace GRUB_UTIL with GRUB_NO_MODULES.
+	* kern/dl.c: Likewise.
+	* commands/sleep.c: Not include machine/time.h.
+	* conf/any-emu.rmk (COMMON_LDFLAGS): New variable.
+	(COMMON_CFLAGS): Likewise.
+	(sbin_UTILITIES): Remove grub-emu.
+	(grub_emu_SOURCES): Removed.
+	(kernel_img_RELOCATABLE): New variable.
+	(pkglib_PROGRAMS): Add kernel.img.
+	(kernel_img_SOURCES): New variable
+	(kernel_img_CFLAGS): Likewise.
+	(kernel_img_LDFLAGS): Likewise.
+	(TARGET_NO_STRIP): Likewise.
+	(TARGET_NO_DYNAMIC_MODULES): Likewise.
+	(pkglib_MODULES): Add progname.mod, hostfs.mod, host.mod, reboot.mod,
+	halt.mod, cpuid.mod, usb.mod, sdl.mod and pci.mod.
+	(grub-emu): New target.
+	(GRUB_EMU): New variable.
+	* configure.ac: Whitelist -emu as possible x86_64 architecture.
+	* efiemu/main.c: Replace GRUB_UTIL with GRUB_MACHINE_EMU.
+	* loader/xnu.c: Likewise.
+	* include/grub/pci.h: Likewise.
+	* genemuinit.sh: New file.
+	* genemuinitheader.sh: Likewise.
+	* genmk.rb: Don't strip if TARGET_NO_STRIP is yes.
+	Support TARGET_NO_DYNAMIC_MODULES.
+	* include/grub/dl.h (GRUB_NO_MODULES): New variable.
+	* commands/search.c: Fix GRUB_MOD_INIT and GRUB_MOD_FINI arguments.
+	* disk/loopback.c: Likewise.
+	* font/font_cmd.c: Likewise.
+	* partmap/acorn.c: Likewise.
+	* partmap/amiga.c: Likewise.
+	* partmap/apple.c: Likewise.
+	* partmap/gpt.c: Likewise.
+	* partmap/msdos.c: Likewise.
+	* partmap/sun.c: Likewise.
+	* parttool/msdospart.c: Likewise.
+	* term/gfxterm.c: Likewise.
+	* video/bitmap.c: Likewise.
+	* video/readers/jpeg.c: Likewise.
+	* video/readers/png.c: Likewise.
+	* video/readers/tga.c: Likewise.
+	* video/video.c: Likewise.
+	* util/grub-emu.c (read_command_list): Removed.
+	(main): Don't call util_init_nls.
+	* util/misc.c (grub_err_printf) [!GRUB_UTIL]: Removed.
+	(grub_util_init_nls) [!GRUB_UTIL]: Likewise.

From 6e14234c874224e88345492373c77eee34d00e18 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 16:51:16 +0100
Subject: [PATCH 0477/1628] 2010-02-07  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* include/grub/multiboot2.h: Remove leftover file.
---
 ChangeLog                 |  6 +++-
 include/grub/multiboot2.h | 70 ---------------------------------------
 2 files changed, 5 insertions(+), 71 deletions(-)
 delete mode 100644 include/grub/multiboot2.h

diff --git a/ChangeLog b/ChangeLog
index 540639220..7e9e18348 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/multiboot2.h: Remove leftover file.
+
 2010-02-07  Yves Blusseau  <blusseau@zetam.org>
 
-    * gnulib/getdelim.c: add missing header (type ssize_t must be defined).
+	* gnulib/getdelim.c: add missing header (type ssize_t must be defined).
 
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
diff --git a/include/grub/multiboot2.h b/include/grub/multiboot2.h
deleted file mode 100644
index af10cdc21..000000000
--- a/include/grub/multiboot2.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* multiboot2.h - multiboot2 header file with grub definitions. */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007  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/>.
- */
-
-#ifndef GRUB_MULTIBOOT2_HEADER
-#define GRUB_MULTIBOOT2_HEADER 1
-
-#include <grub/types.h>
-#include <grub/err.h>
-#include <grub/elf.h>
-
-#ifndef GRUB_UTIL
-typedef grub_uint32_t uint32_t;
-typedef grub_uint64_t uint64_t;
-#define __WORDSIZE GRUB_TARGET_WORDSIZE
-#endif
-
-struct multiboot2_tag_header;
-
-grub_err_t
-grub_mb2_tag_alloc (grub_addr_t *addr, int key, grub_size_t len);
-
-grub_err_t
-grub_mb2_tags_arch_create (void);
-
-void
-grub_mb2_arch_boot (grub_addr_t entry, void *tags);
-
-void
-grub_mb2_arch_unload (struct multiboot2_tag_header *tags);
-
-grub_err_t
-grub_mb2_arch_elf32_hook (Elf32_Phdr *phdr, grub_addr_t *addr, int *do_load);
-
-grub_err_t
-grub_mb2_arch_elf64_hook (Elf64_Phdr *phdr, grub_addr_t *addr, int *do_load);
-
-grub_err_t
-grub_mb2_arch_module_alloc (grub_size_t size, grub_addr_t *addr);
-
-grub_err_t
-grub_mb2_arch_module_free (grub_addr_t addr, grub_size_t size);
-
-void
-grub_multiboot2 (int argc, char *argv[]);
-
-void
-grub_module2 (int argc, char *argv[]);
-
-#define for_each_tag(tag, tags) \
-  for (tag = tags; \
-       tag && tag->key != MULTIBOOT2_TAG_END; \
-       tag = (struct multiboot2_tag_header *)((char *)tag + tag->len))
-
-#endif /* ! GRUB_MULTIBOOT2_HEADER */

From e28e32ae51c75a64333deffbd78f1cda9c376fc8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 16:52:47 +0100
Subject: [PATCH 0478/1628] 2010-02-07  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* include/grub/normal.h [GRUB_UTIL]: Remove leftover declarations.
	* include/grub/partition.h [GRUB_UTIL]: Likewise.
---
 ChangeLog                |  2 ++
 include/grub/normal.h    | 33 ---------------------------------
 include/grub/partition.h | 14 --------------
 3 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7e9e18348..dede0af2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/multiboot2.h: Remove leftover file.
+	* include/grub/normal.h [GRUB_UTIL]: Remove leftover declarations.
+	* include/grub/partition.h [GRUB_UTIL]: Likewise.
 
 2010-02-07  Yves Blusseau  <blusseau@zetam.org>
 
diff --git a/include/grub/normal.h b/include/grub/normal.h
index e804fde77..fad1a41ba 100644
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -110,37 +110,4 @@ void read_terminal_list (void);
 
 void grub_set_more (int onoff);
 
-#ifdef GRUB_UTIL
-void grub_normal_init (void);
-void grub_normal_fini (void);
-void grub_hello_init (void);
-void grub_hello_fini (void);
-void grub_ls_init (void);
-void grub_ls_fini (void);
-void grub_cat_init (void);
-void grub_cat_fini (void);
-void grub_boot_init (void);
-void grub_boot_fini (void);
-void grub_cmp_init (void);
-void grub_cmp_fini (void);
-void grub_terminal_init (void);
-void grub_terminal_fini (void);
-void grub_loop_init (void);
-void grub_loop_fini (void);
-void grub_help_init (void);
-void grub_help_fini (void);
-void grub_halt_init (void);
-void grub_halt_fini (void);
-void grub_reboot_init (void);
-void grub_reboot_fini (void);
-void grub_configfile_init (void);
-void grub_configfile_fini (void);
-void grub_search_init (void);
-void grub_search_fini (void);
-void grub_test_init (void);
-void grub_test_fini (void);
-void grub_blocklist_init (void);
-void grub_blocklist_fini (void);
-#endif
-
 #endif /* ! GRUB_NORMAL_HEADER */
diff --git a/include/grub/partition.h b/include/grub/partition.h
index d35658cdd..faa89cea6 100644
--- a/include/grub/partition.h
+++ b/include/grub/partition.h
@@ -83,20 +83,6 @@ void EXPORT_FUNC(grub_partition_map_register) (grub_partition_map_t partmap);
 
 void EXPORT_FUNC(grub_partition_map_unregister) (grub_partition_map_t partmap);
 
-#ifdef GRUB_UTIL
-void grub_msdos_partition_map_init (void);
-void grub_msdos_partition_map_fini (void);
-void grub_amiga_partition_map_init (void);
-void grub_amiga_partition_map_fini (void);
-void grub_apple_partition_map_init (void);
-void grub_apple_partition_map_fini (void);
-void grub_sun_partition_map_init (void);
-void grub_sun_partition_map_fini (void);
-void grub_gpt_partition_map_init (void);
-void grub_gpt_partition_map_fini (void);
-void grub_apple_partition_map_init (void);
-void grub_apple_partition_map_fini (void);
-#endif
 
 static inline grub_disk_addr_t
 grub_partition_get_start (const grub_partition_t p)

From a1a8d38a5862ec296e5940be1f38af8804118f09 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 17:30:16 +0100
Subject: [PATCH 0479/1628] Use nostdinc

---
 conf/any-emu.rmk | 25 ++++---------------------
 util/grub-emu.c  |  9 +++++++++
 util/hostdisk.c  |  6 +++---
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 529174bc3..d3d2c2f2f 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -1,7 +1,7 @@
 # -*- makefile -*-
 
 COMMON_LDFLAGS += -nostdlib
-COMMON_CFLAGS +=
+COMMON_CFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include)
 
 # Used by various components.  These rules need to precede them.
 script/lexer.c_DEPENDENCIES = grub_script.tab.h
@@ -19,30 +19,12 @@ kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c  kern/env.c	\
 	util/console.c  util/grub-emu.c util/misc.c			\
 	util/hostdisk.c util/getroot.c					\
 	\
-	grub_emu_init.c
-kernel_img_CFLAGS = $(CPPFLAGS) $(CFLAGS)
+	grub_emu_init.c gnulib/progname.c util/hostfs.c disk/host.c
+kernel_img_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-undef -I$(srcdir)/gnulib
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 TARGET_NO_STRIP = yes
 TARGET_NO_DYNAMIC_MODULES = yes
 
-# progname.c always has warnings. Compile it separately.
-pkglib_MODULES += progname.mod
-progname_mod_SOURCES = gnulib/progname.c
-progname_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-error
-progname_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For hostfs.mod.
-pkglib_MODULES += hostfs.mod
-hostfs_mod_SOURCES = util/hostfs.c
-hostfs_mod_CFLAGS = $(COMMON_CFLAGS)
-hostfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For host.mod.
-pkglib_MODULES += host.mod
-host_mod_SOURCES = disk/host.c
-host_mod_CFLAGS = $(COMMON_CFLAGS)
-host_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For reboot.mod.
 pkglib_MODULES += reboot.mod
 reboot_mod_SOURCES = commands/reboot.c
@@ -76,6 +58,7 @@ endif
 ifeq ($(enable_grub_emu_sdl), yes)
 pkglib_MODULES += sdl.mod
 sdl_mod_SOURCES = util/sdl.c
+sdl_mod_CFLAGS = 
 sdl_mod_LDFLAGS = $(COMMON_LDFLAGS)
 grub_emu_LDFLAGS += $(LIBSDL)
 endif
diff --git a/util/grub-emu.c b/util/grub-emu.c
index 08ae19836..7d4544509 100644
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -146,6 +146,11 @@ usage (int status)
 }
 
 
+void grub_hostfs_init (void);
+void grub_hostfs_fini (void);
+void grub_host_init (void);
+void grub_host_fini (void);
+
 int
 main (int argc, char *argv[])
 {
@@ -204,6 +209,8 @@ main (int argc, char *argv[])
 
   signal (SIGINT, SIG_IGN);
   grub_console_init ();
+  grub_host_init ();
+  grub_hostfs_init ();
 
   /* XXX: This is a bit unportable.  */
   grub_util_biosdisk_init (dev_map);
@@ -236,6 +243,8 @@ main (int argc, char *argv[])
     grub_main ();
 
   grub_fini_all ();
+  grub_hostfs_fini ();
+  grub_host_fini ();
 
   grub_machine_fini ();
 
diff --git a/util/hostdisk.c b/util/hostdisk.c
index 98d3d53ae..be5d05afc 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -168,7 +168,7 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
 
   drive = find_grub_drive (name);
   if (drive < 0)
-    return grub_error (GRUB_ERR_BAD_DEVICE,
+    return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
 		       "no mapping exists for `%s'", name);
 
   disk->has_partitions = 1;
@@ -198,7 +198,7 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
 
     fd = open (map[drive].device, O_RDONLY);
     if (fd == -1)
-      return grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' while attempting to get disk size", map[drive].device);
+      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "cannot open `%s' while attempting to get disk size", map[drive].device);
 
 # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
     if (fstat (fd, &st) < 0 || ! S_ISCHR (st.st_mode))
@@ -244,7 +244,7 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
 # warning "No special routine to get the size of a block device is implemented for your OS. This is not possibly fatal."
 #endif
   if (stat (map[drive].device, &st) < 0)
-    return grub_error (GRUB_ERR_BAD_DEVICE, "cannot stat `%s'", map[drive].device);
+    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "cannot stat `%s'", map[drive].device);
 
   disk->total_sectors = st.st_size >> GRUB_DISK_SECTOR_BITS;
 

From b4674703a12144315b2d725c40bc490645727712 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 17:39:52 +0100
Subject: [PATCH 0480/1628] Add fno-builtin

---
 conf/any-emu.rmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index d3d2c2f2f..a4ee9b755 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -1,7 +1,7 @@
 # -*- makefile -*-
 
 COMMON_LDFLAGS += -nostdlib
-COMMON_CFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include)
+COMMON_CFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include) -fno-builtin
 
 # Used by various components.  These rules need to precede them.
 script/lexer.c_DEPENDENCIES = grub_script.tab.h

From 7eed9925e2b2a0bf59a26b4947ee0cd603b4d885 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 18:10:36 +0100
Subject: [PATCH 0481/1628] missing files

---
 ChangeLog.emu-modload | 18 +++++++++
 util/mm.c             | 85 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 ChangeLog.emu-modload
 create mode 100644 util/mm.c

diff --git a/ChangeLog.emu-modload b/ChangeLog.emu-modload
new file mode 100644
index 000000000..dd0ea6bf0
--- /dev/null
+++ b/ChangeLog.emu-modload
@@ -0,0 +1,18 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	grub-emu module load support.
+
+	* Makefile.in (TARGET_NO_MODULES): New variable. All users of
+	NO_DYNAMIC_MODULES switched to this.
+	(TARGET_CFLAGS): Add -DGRUB_TARGET_NO_MODULES=1 if applicable.
+	(CFLAGS): Likewise.
+	* conf/any-emu.rmk: Generate symlist.
+	* configure.ac (grub-emu-modules): New option.
+	* genmk.rb: Handle multiple source lists.
+	* genmoddep.awk: Output all undefined symbols.
+	* include/grub/sdl.h: New file.
+	* util/grub-emu.c (main): Hanle (host) root.
+	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Error with
+	GRUB_ERR_UNKNOWN_DEVICE.
+	* util/misc.c: Move mm functions to ...
+	* util/mm.c: ... here. All users updated.
diff --git a/util/mm.c b/util/mm.c
new file mode 100644
index 000000000..0e9e9f3a8
--- /dev/null
+++ b/util/mm.c
@@ -0,0 +1,85 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2003,2005,2006,2007,2008,2009,2010  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/err.h>
+#include <grub/mm.h>
+#include <stdlib.h>
+#include <string.h>
+
+void *
+grub_malloc (grub_size_t size)
+{
+  void *ret;
+  ret = malloc (size);
+  if (!ret)
+    grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
+  return ret;
+}
+
+void *
+grub_zalloc (grub_size_t size)
+{
+  void *ret;
+
+  ret = grub_malloc (size);
+  if (!ret)
+    return NULL;
+  memset (ret, 0, size);
+  return ret;
+}
+
+void
+grub_free (void *ptr)
+{
+  free (ptr);
+}
+
+void *
+grub_realloc (void *ptr, grub_size_t size)
+{
+  void *ret;
+  ret = realloc (ptr, size);
+  if (!ret)
+    grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
+  return ret;
+}
+
+void *
+grub_memalign (grub_size_t align, grub_size_t size)
+{
+  void *p;
+
+#if defined(HAVE_POSIX_MEMALIGN)
+  if (align < sizeof (void *))
+    align = sizeof (void *);
+  if (posix_memalign (&p, align, size) != 0)
+    p = 0;
+#elif defined(HAVE_MEMALIGN)
+  p = memalign (align, size);
+#else
+  (void) align;
+  (void) size;
+  grub_util_error ("grub_memalign is not supported");
+#endif
+
+  if (!p)
+    grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
+
+  return p;
+}

From c98d2a13c20f4e5bd75b500d7cbbd739c4b71a61 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sun, 7 Feb 2010 10:27:03 -0800
Subject: [PATCH 0482/1628] 2010-02-07  Colin Watson  <cjwatson@ubuntu.com>

	* NEWS: Update.
---
 ChangeLog |  4 ++++
 NEWS      | 15 +++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index dede0af2e..37081a9e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-07  Colin Watson  <cjwatson@ubuntu.com>
+
+	* NEWS: Update.
+
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/multiboot2.h: Remove leftover file.
diff --git a/NEWS b/NEWS
index cc725fd3b..828eea081 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,20 @@
 New in 1.98:
 
+* Graphical menu support.
+
+* MIPS support.
+
+* Saved default menu entry support, with new utilities `grub-reboot' and
+  `grub-set-default'.
+
+* Unit testing framework.
+
+* Support for multiple terminals.
+
+* Encrypted password support, with a new utility `grub-mkpasswd-pbkdf2'.
+
+* `grub-mkfloppy' removed; use `grub-mkrescue' to create floppy images.
+
 * Add grub-probe support for GNU/Hurd.
 
 * Add support for gettext.

From 473df63dc0fa943ab4b3bdbbabc224dd63a1a45d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 19:57:55 +0100
Subject: [PATCH 0483/1628] 2010-02-07  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* genkernsyms.sh.in: Use TARGET_CC.
---
 ChangeLog         | 4 ++++
 genkernsyms.sh.in | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 37081a9e4..f7b2ce8bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* genkernsyms.sh.in: Use TARGET_CC.
+
 2010-02-07  Colin Watson  <cjwatson@ubuntu.com>
 
 	* NEWS: Update.
diff --git a/genkernsyms.sh.in b/genkernsyms.sh.in
index b2f3f7af9..c5c63b2d5 100644
--- a/genkernsyms.sh.in
+++ b/genkernsyms.sh.in
@@ -14,7 +14,7 @@
 ### The configure script will replace these variables.
 
 : ${srcdir=@srcdir@}
-: ${CC=@CC@}
+: ${CC=@TARGET_CC@}
 
 u=
 grep "^#define HAVE_ASM_USCORE" config.h >/dev/null 2>&1 && u="_"

From 56e33364c54611d68cce355bdf1c191c3d69b157 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 19:59:19 +0100
Subject: [PATCH 0484/1628] Fix yeeloong compilation

---
 kern/mips/yeeloong/init.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 14e8a39a2..d48a7341a 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -29,10 +29,10 @@
 #include <grub/cpu/kernel.h>
 
 extern void grub_video_sm712_init (void);
-extern void grub_video_video_init (void);
-extern void grub_video_bitmap_init (void);
-extern void grub_font_manager_init (void);
-extern void grub_term_gfxterm_init (void);
+extern void grub_video_init (void);
+extern void grub_bitmap_init (void);
+extern void grub_font_init (void);
+extern void grub_gfxterm_init (void);
 extern void grub_at_keyboard_init (void);
 
 /* FIXME: use interrupt to count high.  */
@@ -98,10 +98,10 @@ grub_machine_init (void)
   /* Initialize output terminal (can't be done earlier, as gfxterm
      relies on a working heap.  */
   grub_video_sm712_init ();
-  grub_video_video_init ();
-  grub_video_bitmap_init ();
-  grub_font_manager_init ();
-  grub_term_gfxterm_init ();
+  grub_video_init ();
+  grub_bitmap_init ();
+  grub_font_init ();
+  grub_gfxterm_init ();
 
   grub_at_keyboard_init ();
 }

From 62509f04348a468b9db6894ae15e9dc14bbff484 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 22:49:45 +0100
Subject: [PATCH 0485/1628] 2010-02-07  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* kern/ieee1275/openfw.c (grub_halt): Try executing "poweroff".
---
 ChangeLog              | 4 ++++
 kern/ieee1275/openfw.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f7b2ce8bf..ff8f3d41c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/ieee1275/openfw.c (grub_halt): Try executing "poweroff".
+
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* genkernsyms.sh.in: Use TARGET_CC.
diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index dd9a9138f..e5f565c4c 100644
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -405,8 +405,9 @@ grub_reboot (void)
 void
 grub_halt (void)
 {
-  /* Not standardized.  We try both known commands.  */
+  /* Not standardized.  We try three known commands.  */
 
   grub_ieee1275_interpret ("shut-down", 0);
   grub_ieee1275_interpret ("power-off", 0);
+  grub_ieee1275_interpret ("poweroff", 0);
 }

From f84dc56090d055077b4c9bc222e665b20bf22094 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 22:56:25 +0100
Subject: [PATCH 0486/1628] Initial implementation of ofwclock

---
 ChangeLog.ofwclock        |  15 ++++
 conf/powerpc-ieee1275.rmk |  17 +++++
 conf/sparc64-ieee1275.rmk |  17 +++++
 lib/ieee1275/datetime.c   | 142 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 191 insertions(+)
 create mode 100644 ChangeLog.ofwclock
 create mode 100644 lib/ieee1275/datetime.c

diff --git a/ChangeLog.ofwclock b/ChangeLog.ofwclock
new file mode 100644
index 000000000..1cdd99cd4
--- /dev/null
+++ b/ChangeLog.ofwclock
@@ -0,0 +1,15 @@
+2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* conf/powerpc-ieee1275.rmk (pkglib_MODULES): Add datetime.mod,
+	date.mod, datehook.mod.
+	(datetime_mod_SOURCES): New variable.
+	(datetime_mod_CFLAGS): Likewise.
+	(datetime_mod_LDFLAGS): Likewise.
+	(date_mod_SOURCES): Likewise.
+	(date_mod_CFLAGS): Likewise.
+	(date_mod_LDFLAGS): Likewise.
+	(datehook_mod_SOURCES): Likewise.
+	(datehook_mod_CFLAGS): Likewise.
+	(datehook_mod_LDFLAGS): Likewise.
+	* conf/sparc64-ieee1275.rmk: Likewise.
+	* lib/ieee1275/datetime.c: New file.
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 8622293ab..73e56e66f 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -105,4 +105,21 @@ lsmmap_mod_SOURCES = commands/lsmmap.c
 lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
 lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += datetime.mod date.mod datehook.mod
+
+# For datetime.mod
+datetime_mod_SOURCES = lib/ieee1275/datetime.c
+datetime_mod_CFLAGS = $(COMMON_CFLAGS)
+datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For date.mod
+date_mod_SOURCES = commands/date.c
+date_mod_CFLAGS = $(COMMON_CFLAGS)
+date_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For datehook.mod
+datehook_mod_SOURCES = hook/datehook.c
+datehook_mod_CFLAGS = $(COMMON_CFLAGS)
+datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 include $(srcdir)/conf/common.mk
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index befc7dce5..6210826e2 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -133,4 +133,21 @@ lsmmap_mod_SOURCES = commands/lsmmap.c
 lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
 lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += datetime.mod date.mod datehook.mod
+
+# For datetime.mod
+datetime_mod_SOURCES = lib/ieee1275/datetime.c
+datetime_mod_CFLAGS = $(COMMON_CFLAGS)
+datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For date.mod
+date_mod_SOURCES = commands/date.c
+date_mod_CFLAGS = $(COMMON_CFLAGS)
+date_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For datehook.mod
+datehook_mod_SOURCES = hook/datehook.c
+datehook_mod_CFLAGS = $(COMMON_CFLAGS)
+datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 include $(srcdir)/conf/common.mk
diff --git a/lib/ieee1275/datetime.c b/lib/ieee1275/datetime.c
new file mode 100644
index 000000000..aaf17b0fa
--- /dev/null
+++ b/lib/ieee1275/datetime.c
@@ -0,0 +1,142 @@
+/* kern/cmos_datetime.c - CMOS datetime function.
+ *
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008,2009  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/datetime.h>
+#include <grub/ieee1275/ieee1275.h>
+#include <grub/misc.h>
+
+static char *rtc = 0;
+
+static void
+find_rtc (void)
+{
+  auto int hook (struct grub_ieee1275_devalias *alias);
+  int hook (struct grub_ieee1275_devalias *alias)
+  {
+    if (grub_strcmp (alias->type, "rtc") == 0)
+      {
+	grub_dprintf ("datetime", "Found RTC %s\n", alias->name);
+	rtc = grub_strdup (alias->name);
+	return 1;
+      }
+    return 0;
+  }
+  
+  grub_ieee1275_devices_iterate (hook);
+}
+
+grub_err_t
+grub_get_datetime (struct grub_datetime *datetime)
+{
+  struct get_time_args
+  {
+    struct grub_ieee1275_common_hdr common;
+    grub_ieee1275_cell_t method;
+    grub_ieee1275_cell_t device;
+    grub_ieee1275_cell_t catch_result;
+    grub_ieee1275_cell_t year;
+    grub_ieee1275_cell_t month;
+    grub_ieee1275_cell_t day;
+    grub_ieee1275_cell_t hour;
+    grub_ieee1275_cell_t minute;
+    grub_ieee1275_cell_t second;
+  }
+  args;
+  int status;
+  grub_ieee1275_ihandle_t ihandle;
+
+  if (!rtc)
+    find_rtc ();
+  if (!rtc)
+    return grub_error (GRUB_ERR_IO, "no RTC found");
+
+  status = grub_ieee1275_open (rtc, &ihandle);
+  if (status == -1)
+    return grub_error (GRUB_ERR_IO, "couldn't open RTC");
+
+  INIT_IEEE1275_COMMON (&args.common, "call-method", 2, 7);
+  args.device = (grub_ieee1275_cell_t) ihandle;
+  args.method = (grub_ieee1275_cell_t) "get-time";
+
+  status = IEEE1275_CALL_ENTRY_FN (&args);
+
+  grub_ieee1275_close (ihandle);
+
+  if (status == -1)
+    return grub_error (GRUB_ERR_IO, "get-time failed");
+
+  datetime->year = args.year;
+  datetime->month = args.month;
+  datetime->day = args.day;
+  datetime->hour = args.hour;
+  datetime->minute = args.minute;
+  datetime->second = args.second;
+
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_set_datetime (struct grub_datetime *datetime)
+{
+  struct get_time_args
+  {
+    struct grub_ieee1275_common_hdr common;
+    grub_ieee1275_cell_t method;
+    grub_ieee1275_cell_t device;
+    grub_ieee1275_cell_t year;
+    grub_ieee1275_cell_t month;
+    grub_ieee1275_cell_t day;
+    grub_ieee1275_cell_t hour;
+    grub_ieee1275_cell_t minute;
+    grub_ieee1275_cell_t second;
+    grub_ieee1275_cell_t catch_result;
+  }
+  args;
+  int status;
+  grub_ieee1275_ihandle_t ihandle;
+
+  if (!rtc)
+    find_rtc ();
+  if (!rtc)
+    return grub_error (GRUB_ERR_IO, "no RTC found");
+
+  status = grub_ieee1275_open (rtc, &ihandle);
+  if (status == -1)
+    return grub_error (GRUB_ERR_IO, "couldn't open RTC");
+
+  INIT_IEEE1275_COMMON (&args.common, "call-method", 8, 1);
+  args.device = (grub_ieee1275_cell_t) ihandle;
+  args.method = (grub_ieee1275_cell_t) "set-time";
+
+  args.year = datetime->year;
+  args.month = datetime->month;
+  args.day = datetime->day;
+  args.hour = datetime->hour;
+  args.minute = datetime->minute;
+  args.second = datetime->second;
+
+  status = IEEE1275_CALL_ENTRY_FN (&args);
+
+  grub_ieee1275_close (ihandle);
+
+  if (status == -1)
+    return grub_error (GRUB_ERR_IO, "set-time failed");
+
+  return GRUB_ERR_NONE;
+}

From ec0be08d40bf33e612f152d0d58324cce4800afe Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Feb 2010 23:49:49 +0100
Subject: [PATCH 0487/1628] Clean building system

---
 commands/lsmmap.c                |   4 ++
 conf/any-emu.rmk                 |  10 +--
 conf/common.rmk                  |  36 +++++++++++
 conf/i386-coreboot.rmk           | 108 +------------------------------
 conf/i386-efi.rmk                |  35 +---------
 conf/i386-ieee1275.rmk           |  54 ++--------------
 conf/i386-pc.rmk                 |  63 ++----------------
 conf/i386-qemu.rmk               | 108 ++++++++++++++++++++++++++++++-
 conf/i386.rmk                    |  25 +++++++
 conf/mips-yeeloong.rmk           |  13 ----
 conf/mips.rmk                    |  20 ------
 conf/powerpc-ieee1275.rmk        |  44 ++-----------
 conf/sparc64-ieee1275.rmk        |  47 +++-----------
 conf/x86_64-efi.rmk              |  35 +---------
 disk/memdisk.c                   |   1 -
 hook/datehook.c                  |   4 +-
 include/grub/datetime.h          |   7 ++
 include/grub/i386/efi/serial.h   |   1 +
 include/grub/x86_64/efi/serial.h |   1 +
 util/time.c                      |  46 +++++++++++++
 video/ieee1275.c                 |   5 +-
 21 files changed, 261 insertions(+), 406 deletions(-)
 create mode 100644 include/grub/i386/efi/serial.h
 create mode 100644 include/grub/x86_64/efi/serial.h
 create mode 100644 util/time.c

diff --git a/commands/lsmmap.c b/commands/lsmmap.c
index d5eef1ce9..2755df9c4 100644
--- a/commands/lsmmap.c
+++ b/commands/lsmmap.c
@@ -16,7 +16,9 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef GRUB_MACHINE_EMU
 #include <grub/machine/memory.h>
+#endif
 #include <grub/dl.h>
 #include <grub/misc.h>
 #include <grub/command.h>
@@ -34,7 +36,9 @@ grub_cmd_lsmmap (grub_command_t cmd __attribute__ ((unused)),
 		   (long long) addr, (long long) size, type);
       return 0;
     }
+#ifndef GRUB_MACHINE_EMU
   grub_machine_mmap_iterate (hook);
+#endif
 
   return 0;
 }
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index a4ee9b755..ee5ab3cd4 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -12,12 +12,12 @@ pkglib_PROGRAMS = kernel.img
 kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c  kern/env.c	\
 	kern/err.c kern/list.c kern/handler.c				\
 	kern/command.c kern/corecmd.c kern/file.c			\
-	kern/fs.c commands/boot.c kern/main.c kern/misc.c kern/parser.c	\
+	kern/fs.c kern/main.c kern/misc.c kern/parser.c			\
 	kern/partition.c kern/term.c					\
 	kern/rescue_reader.c kern/rescue_parser.c			\
 	\
 	util/console.c  util/grub-emu.c util/misc.c			\
-	util/hostdisk.c util/getroot.c					\
+	util/hostdisk.c util/getroot.c util/time.c			\
 	\
 	grub_emu_init.c gnulib/progname.c util/hostfs.c disk/host.c
 kernel_img_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-undef -I$(srcdir)/gnulib
@@ -25,12 +25,6 @@ kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 TARGET_NO_STRIP = yes
 TARGET_NO_DYNAMIC_MODULES = yes
 
-# For reboot.mod.
-pkglib_MODULES += reboot.mod
-reboot_mod_SOURCES = commands/reboot.c
-reboot_mod_CFLAGS = $(COMMON_CFLAGS)
-reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod.
 pkglib_MODULES += halt.mod
 halt_mod_SOURCES = commands/halt.c
diff --git a/conf/common.rmk b/conf/common.rmk
index 6cce36395..f3c85d971 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -759,6 +759,42 @@ password_pbkdf2_mod_SOURCES = commands/password_pbkdf2.c
 password_pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
 password_pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For memdisk.mod.
+pkglib_MODULES += memdisk.mod
+memdisk_mod_SOURCES = disk/memdisk.c
+memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
+memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For reboot.mod.
+pkglib_MODULES += reboot.mod
+reboot_mod_SOURCES = commands/reboot.c
+reboot_mod_CFLAGS = $(COMMON_CFLAGS)
+reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For date.mod
+pkglib_MODULES += date.mod
+date_mod_SOURCES = commands/date.c
+date_mod_CFLAGS = $(COMMON_CFLAGS)
+date_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For datehook.mod
+pkglib_MODULES += datehook.mod
+datehook_mod_SOURCES = hook/datehook.c
+datehook_mod_CFLAGS = $(COMMON_CFLAGS)
+datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For lsmmap.mod
+pkglib_MODULES += lsmmap.mod
+lsmmap_mod_SOURCES = commands/lsmmap.c
+lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
+lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For boot.mod.
+pkglib_MODULES += boot.mod
+boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
+boot_mod_CFLAGS = $(COMMON_CFLAGS)
+boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 bin_UTILITIES += grub-mkpasswd-pbkdf2
 grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/err.c
 grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap -DGRUB_MKPASSWD=1
diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 9563c0b2b..85407b47e 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -11,8 +11,6 @@ script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 GRUB_KERNEL_MACHINE_LINK_ADDR	= 0x8200
 
-ifeq ($(platform), coreboot)
-
 pkglib_PROGRAMS += kernel.img
 kernel_img_SOURCES = kern/i386/coreboot/startup.S \
 	kern/i386/misc.S \
@@ -41,55 +39,6 @@ kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR),-Bstatic
 
-endif
-
-ifeq ($(platform), qemu)
-
-GRUB_BOOT_MACHINE_LINK_ADDR	= 0xffe00
-
-pkglib_IMAGES += boot.img
-boot_img_SOURCES = boot/i386/qemu/boot.S
-boot_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
-boot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_BOOT_MACHINE_LINK_ADDR)
-boot_img_FORMAT = binary
-
-bin_UTILITIES += grub-mkimage
-grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
-	util/resolve.c gnulib/progname.c
-grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-util/grub-mkrawimage.c_DEPENDENCIES = Makefile
-
-
-pkglib_IMAGES += kernel.img
-kernel_img_SOURCES = kern/i386/qemu/startup.S \
-	kern/i386/misc.S \
-	kern/i386/coreboot/init.c \
-	kern/i386/qemu/mmap.c \
-	kern/i386/halt.c \
-	kern/main.c kern/device.c \
-	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-	kern/misc.c kern/mm.c kern/term.c \
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
-	kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
-	kern/i386/tsc.c kern/i386/pit.c \
-	kern/generic/rtc_get_time_ms.c \
-	kern/generic/millisleep.c \
-	kern/env.c \
-	term/i386/pc/vga_text.c term/i386/vga_common.c \
-	symlist.c
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	machine/boot.h machine/console.h machine/init.h \
-	machine/memory.h machine/loader.h list.h handler.h command.h i18n.h \
-	env_private.h
-kernel_img_CFLAGS = $(COMMON_CFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-kernel_img_FORMAT = binary
-endif
-
 MOSTLYCLEANFILES += symlist.c kernel_syms.lst
 DEFSYMFILES += kernel_syms.lst
 
@@ -106,17 +55,7 @@ bin_SCRIPTS += grub-mkrescue
 grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 # Modules.
-pkglib_MODULES = linux.mod 				\
-	aout.mod play.mod serial.mod 			\
-	memdisk.mod pci.mod lspci.mod reboot.mod	\
-	halt.mod datetime.mod date.mod datehook.mod	\
-	lsmmap.mod mmap.mod
-
-# For boot.mod.
-pkglib_MODULES += boot.mod
-boot_mod_SOURCES = commands/boot.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+pkglib_MODULES = linux.mod aout.mod halt.mod datetime.mod mmap.mod
 
 # For mmap.mod.
 mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
@@ -129,21 +68,11 @@ linux_mod_SOURCES = loader/i386/linux.c
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For reboot.mod.
-reboot_mod_SOURCES = commands/reboot.c
-reboot_mod_CFLAGS = $(COMMON_CFLAGS)
-reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod.
 halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For serial.mod.
-serial_mod_SOURCES = term/serial.c
-serial_mod_CFLAGS = $(COMMON_CFLAGS)
-serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For aout.mod.
 aout_mod_SOURCES = loader/aout.c
 aout_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -156,45 +85,10 @@ bsd_mod_CFLAGS = $(COMMON_CFLAGS)
 bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
 bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
-# For play.mod.
-play_mod_SOURCES = commands/i386/pc/play.c
-play_mod_CFLAGS = $(COMMON_CFLAGS)
-play_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pci.mod
-pci_mod_SOURCES = bus/pci.c
-pci_mod_CFLAGS = $(COMMON_CFLAGS)
-pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lspci.mod
-lspci_mod_SOURCES = commands/lspci.c
-lspci_mod_CFLAGS = $(COMMON_CFLAGS)
-lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For datetime.mod
 datetime_mod_SOURCES = lib/cmos_datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For date.mod
-date_mod_SOURCES = commands/date.c
-date_mod_CFLAGS = $(COMMON_CFLAGS)
-date_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datehook.mod
-datehook_mod_SOURCES = hook/datehook.c
-datehook_mod_CFLAGS = $(COMMON_CFLAGS)
-datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lsmmap.mod
-lsmmap_mod_SOURCES = commands/lsmmap.c
-lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
-lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk
diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index c03abb429..345350406 100644
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -32,8 +32,8 @@ grub_install_SOURCES = util/i386/efi/grub-install.in
 # Modules.
 pkglib_PROGRAMS = kernel.img
 pkglib_MODULES = chain.mod appleldr.mod \
-	linux.mod halt.mod reboot.mod pci.mod lspci.mod \
-	datetime.mod date.mod datehook.mod loadbios.mod \
+	linux.mod halt.mod  \
+	datetime.mod loadbios.mod \
 	fixvideo.mod mmap.mod acpi.mod
 
 # For kernel.img.
@@ -68,12 +68,6 @@ symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.
 kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
 	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
 
-# For boot.mod.
-pkglib_MODULES += boot.mod
-boot_mod_SOURCES = commands/boot.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For acpi.mod.
 acpi_mod_SOURCES = commands/acpi.c commands/efi/acpi.c
 acpi_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -105,36 +99,11 @@ halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For reboot.mod.
-reboot_mod_SOURCES = commands/reboot.c
-reboot_mod_CFLAGS = $(COMMON_CFLAGS)
-reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pci.mod
-pci_mod_SOURCES = bus/pci.c
-pci_mod_CFLAGS = $(COMMON_CFLAGS)
-pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lspci.mod
-lspci_mod_SOURCES = commands/lspci.c
-lspci_mod_CFLAGS = $(COMMON_CFLAGS)
-lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For datetime.mod
 datetime_mod_SOURCES = lib/efi/datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For date.mod
-date_mod_SOURCES = commands/date.c
-date_mod_CFLAGS = $(COMMON_CFLAGS)
-date_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datehook.mod
-datehook_mod_SOURCES = hook/datehook.c
-datehook_mod_CFLAGS = $(COMMON_CFLAGS)
-datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For loadbios.mod
 loadbios_mod_SOURCES = commands/efi/loadbios.c
 loadbios_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index e19f6e9a1..6e5fd3055 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -54,16 +54,10 @@ sbin_SCRIPTS = grub-install
 grub_install_SOURCES = util/ieee1275/grub-install.in
 
 # Modules.
-pkglib_MODULES = halt.mod reboot.mod suspend.mod		\
-	aout.mod serial.mod linux.mod		\
-	nand.mod memdisk.mod pci.mod lspci.mod datetime.mod	\
-	date.mod datehook.mod lsmmap.mod mmap.mod
-
-# For boot.mod.
-pkglib_MODULES += boot.mod
-boot_mod_SOURCES = commands/boot.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+pkglib_MODULES = halt.mod suspend.mod		\
+	aout.mod linux.mod	\
+	nand.mod datetime.mod	\
+	mmap.mod
 
 # For mmap.mod.
 mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
@@ -81,21 +75,11 @@ suspend_mod_SOURCES = commands/ieee1275/suspend.c
 suspend_mod_CFLAGS = $(COMMON_CFLAGS)
 suspend_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For reboot.mod
-reboot_mod_SOURCES = commands/reboot.c
-reboot_mod_CFLAGS = $(COMMON_CFLAGS)
-reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod
 halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For serial.mod.
-serial_mod_SOURCES = term/serial.c
-serial_mod_CFLAGS = $(COMMON_CFLAGS)
-serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For linux.mod.
 linux_mod_SOURCES = loader/i386/ieee1275/linux.c
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -106,40 +90,10 @@ nand_mod_SOURCES = disk/ieee1275/nand.c
 nand_mod_CFLAGS = $(COMMON_CFLAGS)
 nand_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pci.mod
-pci_mod_SOURCES = bus/pci.c
-pci_mod_CFLAGS = $(COMMON_CFLAGS)
-pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lspci.mod
-lspci_mod_SOURCES = commands/lspci.c
-lspci_mod_CFLAGS = $(COMMON_CFLAGS)
-lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For datetime.mod
 datetime_mod_SOURCES = lib/cmos_datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For date.mod
-date_mod_SOURCES = commands/date.c
-date_mod_CFLAGS = $(COMMON_CFLAGS)
-date_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datehook.mod
-datehook_mod_SOURCES = hook/datehook.c
-datehook_mod_CFLAGS = $(COMMON_CFLAGS)
-datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lsmmap.mod
-lsmmap_mod_SOURCES = commands/lsmmap.c
-lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
-lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 580bfea0a..b30863812 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -107,7 +107,7 @@ grub_setup_SOURCES = gnulib/progname.c \
 	partmap/msdos.c partmap/gpt.c				\
 	\
 	disk/raid.c disk/mdraid_linux.c disk/lvm.c		\
-	util/raid.c util/lvm.c					\
+	util/raid.c util/lvm.c			\
 	grub_setup_init.c
 
 sbin_SCRIPTS += grub-install
@@ -117,20 +117,14 @@ bin_SCRIPTS += grub-mkrescue
 grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 pkglib_MODULES = biosdisk.mod chain.mod 				\
-	reboot.mod halt.mod				\
-	vbe.mod vbetest.mod vbeinfo.mod play.mod serial.mod		\
-	vga.mod memdisk.mod pci.mod lspci.mod				\
-	aout.mod bsd.mod pxe.mod pxecmd.mod datetime.mod date.mod 	\
-	datehook.mod lsmmap.mod ata_pthru.mod hdparm.mod 		\
+	halt.mod				\
+	vbe.mod vbetest.mod vbeinfo.mod 		\
+	vga.mod				\
+	aout.mod bsd.mod pxe.mod pxecmd.mod datetime.mod  	\
+	ata_pthru.mod hdparm.mod 		\
 	usb.mod uhci.mod ohci.mod usbtest.mod usbms.mod usb_keyboard.mod \
 	efiemu.mod mmap.mod acpi.mod drivemap.mod
 
-# For boot.mod.
-pkglib_MODULES += boot.mod
-boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For drivemap.mod.
 drivemap_mod_SOURCES = commands/i386/pc/drivemap.c \
                        commands/i386/pc/drivemap_int13h.S
@@ -187,21 +181,11 @@ xnu_mod_CFLAGS = $(COMMON_CFLAGS)
 xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
 xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
-# For reboot.mod.
-reboot_mod_SOURCES = commands/reboot.c
-reboot_mod_CFLAGS = $(COMMON_CFLAGS)
-reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod.
 halt_mod_SOURCES = commands/i386/pc/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For serial.mod.
-serial_mod_SOURCES = term/serial.c
-serial_mod_CFLAGS = $(COMMON_CFLAGS)
-serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For vbe.mod.
 vbe_mod_SOURCES = video/i386/pc/vbe.c
 vbe_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -217,31 +201,11 @@ vbetest_mod_SOURCES = commands/i386/pc/vbetest.c
 vbetest_mod_CFLAGS = $(COMMON_CFLAGS)
 vbetest_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For play.mod.
-play_mod_SOURCES = commands/i386/pc/play.c
-play_mod_CFLAGS = $(COMMON_CFLAGS)
-play_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For vga.mod.
 vga_mod_SOURCES = term/i386/pc/vga.c
 vga_mod_CFLAGS = $(COMMON_CFLAGS)
 vga_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pci.mod
-pci_mod_SOURCES = bus/pci.c
-pci_mod_CFLAGS = $(COMMON_CFLAGS)
-pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lspci.mod
-lspci_mod_SOURCES = commands/lspci.c
-lspci_mod_CFLAGS = $(COMMON_CFLAGS)
-lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For aout.mod
 aout_mod_SOURCES = loader/aout.c
 aout_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -298,21 +262,6 @@ datetime_mod_SOURCES = lib/cmos_datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For date.mod
-date_mod_SOURCES = commands/date.c
-date_mod_CFLAGS = $(COMMON_CFLAGS)
-date_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datehook.mod
-datehook_mod_SOURCES = hook/datehook.c
-datehook_mod_CFLAGS = $(COMMON_CFLAGS)
-datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lsmmap.mod
-lsmmap_mod_SOURCES = commands/lsmmap.c
-lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
-lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For ata_pthru.mod.
 ata_pthru_mod_SOURCES = disk/ata_pthru.c
 ata_pthru_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index 573a5d0f3..17e4f1129 100644
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -1,2 +1,108 @@
 # -*- makefile -*-
-include $(srcdir)/conf/i386-coreboot.mk
+
+COMMON_ASFLAGS	= -nostdinc -fno-builtin -m32
+COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
+COMMON_LDFLAGS	= -m32 -nostdlib
+
+# Used by various components.  These rules need to precede them.
+script/lexer.c_DEPENDENCIES = grub_script.tab.h
+
+# Images.
+
+GRUB_KERNEL_MACHINE_LINK_ADDR	= 0x8200
+GRUB_BOOT_MACHINE_LINK_ADDR	= 0xffe00
+
+pkglib_IMAGES += boot.img
+boot_img_SOURCES = boot/i386/qemu/boot.S
+boot_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
+boot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_BOOT_MACHINE_LINK_ADDR)
+boot_img_FORMAT = binary
+
+bin_UTILITIES += grub-mkimage
+grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
+	util/resolve.c gnulib/progname.c
+grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
+util/grub-mkrawimage.c_DEPENDENCIES = Makefile
+
+pkglib_IMAGES += kernel.img
+kernel_img_SOURCES = kern/i386/qemu/startup.S \
+	kern/i386/misc.S \
+	kern/i386/coreboot/init.c \
+	kern/i386/qemu/mmap.c \
+	kern/i386/halt.c \
+	kern/main.c kern/device.c \
+	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
+	kern/misc.c kern/mm.c kern/term.c \
+	kern/rescue_parser.c kern/rescue_reader.c \
+	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
+	kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
+	kern/i386/tsc.c kern/i386/pit.c \
+	kern/generic/rtc_get_time_ms.c \
+	kern/generic/millisleep.c \
+	kern/env.c \
+	term/i386/pc/vga_text.c term/i386/vga_common.c \
+	symlist.c
+kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
+	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
+	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
+	machine/boot.h machine/console.h machine/init.h \
+	machine/memory.h machine/loader.h list.h handler.h command.h i18n.h \
+	env_private.h
+kernel_img_CFLAGS = $(COMMON_CFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
+kernel_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
+kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR)
+kernel_img_FORMAT = binary
+
+MOSTLYCLEANFILES += symlist.c kernel_syms.lst
+DEFSYMFILES += kernel_syms.lst
+
+symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
+	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
+
+kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
+	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
+
+sbin_SCRIPTS += grub-install
+grub_install_SOURCES = util/grub-install.in
+
+bin_SCRIPTS += grub-mkrescue
+grub_mkrescue_SOURCES = util/grub-mkrescue.in
+
+# Modules.
+pkglib_MODULES = linux.mod aout.mod halt.mod datetime.mod mmap.mod
+
+# For mmap.mod.
+mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
+mmap_mod_CFLAGS = $(COMMON_CFLAGS)
+mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
+mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
+
+# For linux.mod.
+linux_mod_SOURCES = loader/i386/linux.c
+linux_mod_CFLAGS = $(COMMON_CFLAGS)
+linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For halt.mod.
+halt_mod_SOURCES = commands/halt.c
+halt_mod_CFLAGS = $(COMMON_CFLAGS)
+halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For aout.mod.
+aout_mod_SOURCES = loader/aout.c
+aout_mod_CFLAGS = $(COMMON_CFLAGS)
+aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For bsd.mod
+pkglib_MODULES += bsd.mod
+bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c loader/i386/bsd_helper.S loader/i386/bsd_trampoline.S
+bsd_mod_CFLAGS = $(COMMON_CFLAGS)
+bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
+bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
+
+# For datetime.mod
+datetime_mod_SOURCES = lib/cmos_datetime.c
+datetime_mod_CFLAGS = $(COMMON_CFLAGS)
+datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+include $(srcdir)/conf/i386.mk
+include $(srcdir)/conf/common.mk
diff --git a/conf/i386.rmk b/conf/i386.rmk
index d240858fe..86b6fd795 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -47,3 +47,28 @@ multiboot2_mod_SOURCES = loader/i386/multiboot.c \
 multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
 multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
+
+# For serial.mod.
+pkglib_MODULES += serial.mod
+serial_mod_SOURCES = term/serial.c
+serial_mod_CFLAGS = $(COMMON_CFLAGS)
+serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For pci.mod
+pkglib_MODULES += pci.mod
+pci_mod_SOURCES = bus/pci.c
+pci_mod_CFLAGS = $(COMMON_CFLAGS)
+pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For lspci.mod
+pkglib_MODULES += lspci.mod
+lspci_mod_SOURCES = commands/lspci.c
+lspci_mod_CFLAGS = $(COMMON_CFLAGS)
+lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For play.mod.
+pkglib_MODULES += play.mod
+play_mod_SOURCES = commands/i386/pc/play.c
+play_mod_CFLAGS = $(COMMON_CFLAGS)
+play_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index eb0dc9676..d5e1d1c5d 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -61,19 +61,6 @@ datetime_mod_SOURCES = lib/cmos_datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For date.mod
-pkglib_MODULES += date.mod
-date_mod_SOURCES = commands/date.c
-date_mod_CFLAGS = $(COMMON_CFLAGS)
-date_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datehook.mod
-pkglib_MODULES += datehook.mod
-datehook_mod_SOURCES = hook/datehook.c
-datehook_mod_CFLAGS = $(COMMON_CFLAGS)
-datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-
 sbin_SCRIPTS += grub-install
 grub_install_SOURCES = util/grub-install.in
 
diff --git a/conf/mips.rmk b/conf/mips.rmk
index 1ef4fc395..e04b0adf2 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -40,26 +40,6 @@ grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(LINK_BASE)
 util/grub-mkrawimage.c_DEPENDENCIES = Makefile
 
-# Modules.
-pkglib_MODULES = memdisk.mod \
-	lsmmap.mod
-
-# For boot.mod.
-pkglib_MODULES += boot.mod 
-boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lsmmap.mod
-lsmmap_mod_SOURCES = commands/lsmmap.c
-lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
-lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For serial.mod.
 pkglib_MODULES += serial.mod
 serial_mod_SOURCES = term/serial.c
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 73e56e66f..a22c38ec1 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -57,69 +57,33 @@ grub_install_SOURCES = util/ieee1275/grub-install.in
 grub_mkrescue_SOURCES = util/powerpc/ieee1275/grub-mkrescue.in
 
 # Modules.
-pkglib_MODULES = halt.mod \
-	linux.mod \
-	reboot.mod \
-	suspend.mod \
-	memdisk.mod \
-	lsmmap.mod
-
-# For boot.mod.
-pkglib_MODULES += boot.mod
-boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 pkglib_MODULES += ieee1275_fb.mod 
 ieee1275_fb_mod_SOURCES = video/ieee1275.c
 ieee1275_fb_mod_CFLAGS = $(COMMON_CFLAGS)
 ieee1275_fb_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For linux.mod.
+pkglib_MODULES += linux.mod
 linux_mod_SOURCES = loader/powerpc/ieee1275/linux.c
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For suspend.mod
+pkglib_MODULES += suspend.mod
 suspend_mod_SOURCES = commands/ieee1275/suspend.c
 suspend_mod_CFLAGS = $(COMMON_CFLAGS)
 suspend_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For reboot.mod
-reboot_mod_SOURCES = commands/reboot.c
-reboot_mod_CFLAGS = $(COMMON_CFLAGS)
-reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod
+pkglib_MODULES += halt.mod
 halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lsmmap.mod
-lsmmap_mod_SOURCES = commands/lsmmap.c
-lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
-lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += datetime.mod date.mod datehook.mod
-
 # For datetime.mod
+pkglib_MODULES += datetime.mod
 datetime_mod_SOURCES = lib/ieee1275/datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For date.mod
-date_mod_SOURCES = commands/date.c
-date_mod_CFLAGS = $(COMMON_CFLAGS)
-date_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datehook.mod
-datehook_mod_SOURCES = hook/datehook.c
-datehook_mod_CFLAGS = $(COMMON_CFLAGS)
-datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 include $(srcdir)/conf/common.mk
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 6210826e2..69ed325b2 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -82,7 +82,7 @@ grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c	\
 	partmap/sun.c partmap/acorn.c				\
 	\
 	disk/raid.c disk/mdraid_linux.c disk/lvm.c		\
-	util/raid.c util/lvm.c gnulib/progname.c		\
+	util/raid.c util/lvm.c gnulib/progname.c	\
 	grub_setup_init.c
 
 # For grub-ofpathname.
@@ -96,58 +96,27 @@ sbin_SCRIPTS = grub-install
 grub_install_SOURCES = util/grub-install.in
 
 # Modules.
-pkglib_MODULES = halt.mod \
-	linux.mod \
-	reboot.mod \
-	memdisk.mod \
-	lsmmap.mod
-
-# For boot.mod.
-pkglib_MODULES += boot.mod
-boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+pkglib_MODULES += ieee1275_fb.mod 
+ieee1275_fb_mod_SOURCES = video/ieee1275.c
+ieee1275_fb_mod_CFLAGS = $(COMMON_CFLAGS)
+ieee1275_fb_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For linux.mod.
+pkglib_MODULES += linux.mod 
 linux_mod_SOURCES = loader/sparc64/ieee1275/linux.c
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For reboot.mod.
-reboot_mod_SOURCES = commands/reboot.c
-reboot_mod_CFLAGS = $(COMMON_CFLAGS)
-reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod.
+pkglib_MODULES += halt.mod
 halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lsmmap.mod
-lsmmap_mod_SOURCES = commands/lsmmap.c
-lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
-lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += datetime.mod date.mod datehook.mod
-
 # For datetime.mod
+pkglib_MODULES += datetime.mod
 datetime_mod_SOURCES = lib/ieee1275/datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For date.mod
-date_mod_SOURCES = commands/date.c
-date_mod_CFLAGS = $(COMMON_CFLAGS)
-date_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datehook.mod
-datehook_mod_SOURCES = hook/datehook.c
-datehook_mod_CFLAGS = $(COMMON_CFLAGS)
-datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 include $(srcdir)/conf/common.mk
diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index d5c3c24cb..4116894f4 100644
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -31,8 +31,8 @@ grub_install_SOURCES = util/i386/efi/grub-install.in
 # Modules.
 pkglib_PROGRAMS = kernel.img
 pkglib_MODULES = chain.mod appleldr.mod 	\
-	halt.mod reboot.mod linux.mod pci.mod lspci.mod \
-	datetime.mod date.mod datehook.mod loadbios.mod \
+	halt.mod linux.mod  \
+	datetime.mod loadbios.mod \
 	fixvideo.mod mmap.mod acpi.mod
 
 # For kernel.img.
@@ -67,12 +67,6 @@ symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.
 kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
 	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
 
-# For boot.mod.
-pkglib_MODULES += boot.mod
-boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For acpi.mod.
 acpi_mod_SOURCES = commands/acpi.c commands/efi/acpi.c
 acpi_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -105,36 +99,11 @@ halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For reboot.mod.
-reboot_mod_SOURCES = commands/reboot.c
-reboot_mod_CFLAGS = $(COMMON_CFLAGS)
-reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pci.mod
-pci_mod_SOURCES = bus/pci.c
-pci_mod_CFLAGS = $(COMMON_CFLAGS)
-pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lspci.mod
-lspci_mod_SOURCES = commands/lspci.c
-lspci_mod_CFLAGS = $(COMMON_CFLAGS)
-lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For datetime.mod
 datetime_mod_SOURCES = lib/efi/datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For date.mod
-date_mod_SOURCES = commands/date.c
-date_mod_CFLAGS = $(COMMON_CFLAGS)
-date_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datehook.mod
-datehook_mod_SOURCES = hook/datehook.c
-datehook_mod_CFLAGS = $(COMMON_CFLAGS)
-datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For loadbios.mod
 loadbios_mod_SOURCES = commands/efi/loadbios.c
 loadbios_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/disk/memdisk.c b/disk/memdisk.c
index 4a0470837..2e8885020 100644
--- a/disk/memdisk.c
+++ b/disk/memdisk.c
@@ -23,7 +23,6 @@
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/types.h>
-#include <grub/machine/kernel.h>
 
 static char *memdisk_addr;
 static grub_off_t memdisk_size = 0;
diff --git a/hook/datehook.c b/hook/datehook.c
index 4876e1198..9b5b54bf3 100644
--- a/hook/datehook.c
+++ b/hook/datehook.c
@@ -84,7 +84,7 @@ grub_read_hook_datetime (struct grub_env_var *var,
   return buf;
 }
 
-GRUB_MOD_INIT(datetime)
+GRUB_MOD_INIT(datehook)
 {
   int i;
 
@@ -93,7 +93,7 @@ GRUB_MOD_INIT(datetime)
                                  grub_read_hook_datetime, 0);
 }
 
-GRUB_MOD_FINI(datetime)
+GRUB_MOD_FINI(datehook)
 {
   int i;
 
diff --git a/include/grub/datetime.h b/include/grub/datetime.h
index 2dbba55e2..e721e89af 100644
--- a/include/grub/datetime.h
+++ b/include/grub/datetime.h
@@ -33,10 +33,17 @@ struct grub_datetime
 };
 
 /* Return date and time.  */
+#ifdef GRUB_MACHINE_EMU
+grub_err_t EXPORT_FUNC(grub_get_datetime) (struct grub_datetime *datetime);
+
+/* Set date and time.  */
+grub_err_t EXPORT_FUNC(grub_set_datetime) (struct grub_datetime *datetime);
+#else
 grub_err_t grub_get_datetime (struct grub_datetime *datetime);
 
 /* Set date and time.  */
 grub_err_t grub_set_datetime (struct grub_datetime *datetime);
+#endif
 
 int grub_get_weekday (struct grub_datetime *datetime);
 char *grub_get_weekday_name (struct grub_datetime *datetime);
diff --git a/include/grub/i386/efi/serial.h b/include/grub/i386/efi/serial.h
new file mode 100644
index 000000000..2d8563414
--- /dev/null
+++ b/include/grub/i386/efi/serial.h
@@ -0,0 +1 @@
+#include <grub/i386/coreboot/serial.h>
diff --git a/include/grub/x86_64/efi/serial.h b/include/grub/x86_64/efi/serial.h
new file mode 100644
index 000000000..2d8563414
--- /dev/null
+++ b/include/grub/x86_64/efi/serial.h
@@ -0,0 +1 @@
+#include <grub/i386/coreboot/serial.h>
diff --git a/util/time.c b/util/time.c
new file mode 100644
index 000000000..5da8092a9
--- /dev/null
+++ b/util/time.c
@@ -0,0 +1,46 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/datetime.h>
+#include <time.h>
+
+grub_err_t
+grub_get_datetime (struct grub_datetime *datetime)
+{
+  struct tm *mytm;
+  time_t mytime;
+
+  mytime = time (&mytime);
+  mytm = gmtime (&mytime);
+
+  datetime->year = mytm->tm_year + 1900;
+  datetime->month = mytm->tm_mon + 1;
+  datetime->day = mytm->tm_mday;
+  datetime->hour = mytm->tm_hour;
+  datetime->minute = mytm->tm_min;
+  datetime->second = mytm->tm_sec;
+
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_set_datetime (struct grub_datetime *datetime __attribute__ ((unused)))
+{
+  return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+		     "no clock setting routine available");
+}
diff --git a/video/ieee1275.c b/video/ieee1275.c
index 21b65bd32..0cf47a1a8 100644
--- a/video/ieee1275.c
+++ b/video/ieee1275.c
@@ -124,7 +124,8 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height,
 			   unsigned int mode_type __attribute__ ((unused)),
 			   unsigned int mode_mask __attribute__ ((unused)))
 {
-  grub_uint32_t current_width, current_height, address;
+  grub_uint32_t current_width, current_height;
+  grub_addr_t address;
   grub_err_t err;
   grub_ieee1275_phandle_t dev;
 
@@ -162,7 +163,7 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height,
       return err;
     }
 
-  if (grub_ieee1275_get_integer_property (dev, "address", &address,
+  if (grub_ieee1275_get_integer_property (dev, "address", (void *) &address,
 					  sizeof (address), 0))
     return grub_error (GRUB_ERR_IO, "Couldn't retrieve display address.");
 

From 09d708c68ac6ccee9a7550b9638faa08a1261ebd Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 8 Feb 2010 00:38:09 +0100
Subject: [PATCH 0488/1628] Support above_right diacritics

---
 font/font.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/font/font.c b/font/font.c
index 69dae08a0..ff64111a9 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1120,6 +1120,7 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 {
   struct grub_video_signed_rect bounds;
   unsigned i;
+  signed above_rightx, above_righty;
   auto void NESTED_FUNC_ATTR do_blit (struct grub_font_glyph *src,
 				      signed dx, signed dy);
   void NESTED_FUNC_ATTR do_blit (struct grub_font_glyph *src,
@@ -1162,6 +1163,9 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
   bounds.width = main_glyph->width;
   bounds.height = main_glyph->height;
 
+  above_rightx = bounds.x + bounds.width;
+  above_righty = bounds.y + bounds.height;
+
   for (i = 0; i < glyph_id->ncomb; i++)
     {
       enum grub_comb_type combtype;
@@ -1182,6 +1186,14 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	  minimal_device_width (combining_glyphs[i]->width);
 	  break;
 
+	case GRUB_UNICODE_COMB_ABOVE_RIGHT:
+	  do_blit (combining_glyphs[i], above_rightx,
+		   -(above_righty + space
+		     + combining_glyphs[i]->height));
+	  above_rightx += combining_glyphs[i]->width;
+	  minimal_device_width (above_rightx);
+	  break;
+
 	case GRUB_UNICODE_STACK_ABOVE:
 	  space = combining_glyphs[i]->offset_y
 	    - grub_font_get_xheight (combining_glyphs[i]->font);

From ed32b24af62fa80f0ca0c6b97c4f971083700cc7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 8 Feb 2010 01:21:54 +0100
Subject: [PATCH 0489/1628] Save forgotten registers

---
 kern/i386/pc/startup.S | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index e62fc0526..059905bd4 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -2072,6 +2072,9 @@ FUNCTION(grub_bios_interrupt)
 	pushl    %ebp
 	pushl    %ecx
 	pushl    %eax
+	pushl    %ebx
+	pushl    %esi
+	pushl    %edi	
 	pushl    %edx
 	
 	movb     %al, intno
@@ -2157,6 +2160,9 @@ intno:
 	movw	 LOCAL(bios_register_flags), %ax
 	movw	 %ax, 8(%edx)
 
+	popl 	%edi
+	popl 	%esi
+	popl    %ebx
 	popl    %eax
 	popl    %ecx
 	popl    %ebp

From 0a71a0972ceac391185ac7f6b54f15a46cf1fef6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 8 Feb 2010 01:26:59 +0100
Subject: [PATCH 0490/1628] Type 216

---
 font/font.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/font/font.c b/font/font.c
index ff64111a9..5d307c0a1 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1186,10 +1186,15 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	  minimal_device_width (combining_glyphs[i]->width);
 	  break;
 
+	case GRUB_UNICODE_COMB_ATTACHED_ABOVE_RIGHT:
+	  do_blit (combining_glyphs[i], above_rightx, -above_righty);
+	  above_rightx += combining_glyphs[i]->width;
+	  minimal_device_width (above_rightx);
+	  break;
+
 	case GRUB_UNICODE_COMB_ABOVE_RIGHT:
 	  do_blit (combining_glyphs[i], above_rightx,
-		   -(above_righty + space
-		     + combining_glyphs[i]->height));
+		   -(above_righty + combining_glyphs[i]->height));
 	  above_rightx += combining_glyphs[i]->width;
 	  minimal_device_width (above_rightx);
 	  break;

From 9d9dca02d9a4a99495c1e8b9121a3039172e05c5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 8 Feb 2010 01:44:06 +0100
Subject: [PATCH 0491/1628] Type 240

---
 font/font.c            | 2 ++
 include/grub/unicode.h | 1 +
 2 files changed, 3 insertions(+)

diff --git a/font/font.c b/font/font.c
index 5d307c0a1..5cda443e7 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1212,6 +1212,8 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	  minimal_device_width (combining_glyphs[i]->width);
 	  break;
 
+	  /* I don't know how ypogegrammeni differs from subscript. */
+	case GRUB_UNICODE_COMB_YPOGEGRAMMENI:
 	case GRUB_UNICODE_STACK_BELOW:
 	  space = -(combining_glyphs[i]->offset_y 
 		    + combining_glyphs[i]->height);
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 6e455394d..93f9f147d 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -64,6 +64,7 @@ enum grub_comb_type
     GRUB_UNICODE_COMB_BELOW_RIGHT = 222,
     GRUB_UNICODE_STACK_ABOVE = 230,
     GRUB_UNICODE_COMB_ABOVE_RIGHT = 232,
+    GRUB_UNICODE_COMB_YPOGEGRAMMENI = 240,
     /* If combining nature is indicated only by class and
        not "combining type".  */
     GRUB_UNICODE_COMB_ME = 253,

From 1876cfdb56719ddd65eed9e52c0e6ecfeea30a9e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 8 Feb 2010 02:01:10 +0100
Subject: [PATCH 0492/1628] GCJ

---
 font/font.c            | 3 +++
 include/grub/unicode.h | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/font/font.c b/font/font.c
index 5cda443e7..fa619c4cd 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1175,6 +1175,9 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
       
       if (!combining_glyphs[i])
 	continue;
+      /* CGJ is to avoid diacritics reordering. */
+      if (glyph_id->combining[i] == GRUB_UNICODE_COMBINING_GRAPHEME_JOINER)
+	continue;
       combtype = get_comb_type (glyph_id->combining[i]);
       switch (combtype)
 	{
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 93f9f147d..59649c3b5 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -57,11 +57,9 @@ enum grub_comb_type
   {
     GRUB_UNICODE_COMB_OVERLAY = 1,
     GRUB_UNICODE_STACK_ATTACHED_BELOW = 202,
-    GRUB_UNICODE_COMB_ATTACHED_BELOW_RIGHT = 204,
     GRUB_UNICODE_STACK_ATTACHED_ABOVE = 214,
     GRUB_UNICODE_COMB_ATTACHED_ABOVE_RIGHT = 216,
     GRUB_UNICODE_STACK_BELOW = 220,
-    GRUB_UNICODE_COMB_BELOW_RIGHT = 222,
     GRUB_UNICODE_STACK_ABOVE = 230,
     GRUB_UNICODE_COMB_ABOVE_RIGHT = 232,
     GRUB_UNICODE_COMB_YPOGEGRAMMENI = 240,
@@ -83,6 +81,7 @@ struct grub_unicode_glyph
 };
 
 #define GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR 0x1
+#define GRUB_UNICODE_COMBINING_GRAPHEME_JOINER 0x34f
 #define GRUB_UNICODE_VARIATION_SELECTOR_1 0xfe00
 #define GRUB_UNICODE_VARIATION_SELECTOR_16 0xfe0f
 #define GRUB_UNICODE_VARIATION_SELECTOR_17 0xe0100

From 660960d6972a1ea59f2fb23fbadd2529b5a72620 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 9 Feb 2010 14:09:08 +0100
Subject: [PATCH 0493/1628] 2010-02-09  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* configure.ac: Check for ft2build.h.
---
 ChangeLog    |  4 ++++
 configure.ac | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ff8f3d41c..793018ca9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Check for ft2build.h.
+
 2010-02-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/ieee1275/openfw.c (grub_halt): Try executing "poweroff".
diff --git a/configure.ac b/configure.ac
index b4323e24f..48702afd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -679,6 +679,16 @@ if test x"$grub_mkfont_excuse" = x ; then
   freetype_cflags=`freetype-config --cflags`
   freetype_libs=`freetype-config --libs`
 fi
+
+if test x"$grub_mkfont_excuse" = x ; then
+  # Check for freetype libraries.
+  SAVED_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS $freetype_cflags"
+  AC_CHECK_HEADERS([ft2build.h], [],
+  	[grub_mkfont_excuse=["need freetype2 headers"]])
+  CFLAGS="$SAVED_CFLAGS"
+fi
+
 if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; then
   AC_MSG_ERROR([grub-mkfont was explicitly requested but can't be compiled])
 fi

From 2d2a9cd5b6c3b886efc73213a53726ab50f1c3a9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 9 Feb 2010 15:32:42 +0100
Subject: [PATCH 0494/1628] GRUB_FILE implementation

---
 ChangeLog.grub-file              | 13 +++++++++++++
 fs/reiserfs.c                    |  2 +-
 genmk.rb                         | 10 +++++-----
 include/grub/list.h              |  2 +-
 include/grub/misc.h              |  2 +-
 include/grub/mm.h                | 10 +++++-----
 include/grub/test.h              |  2 +-
 kern/mm.c                        |  2 +-
 lib/libgcrypt_wrap/cipher_wrap.h |  2 +-
 9 files changed, 29 insertions(+), 16 deletions(-)
 create mode 100644 ChangeLog.grub-file

diff --git a/ChangeLog.grub-file b/ChangeLog.grub-file
new file mode 100644
index 000000000..6b3126a16
--- /dev/null
+++ b/ChangeLog.grub-file
@@ -0,0 +1,13 @@
+2010-02-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Don't use __FILE__.
+
+	* genmk.rb: Add -DGRUB_FILE to all C targets.
+	* fs/reiserfs.c: Replace __FILE__ with GRUB_FILE.
+	* include/grub/list.h: Likewise.
+	* include/grub/misc.h: Likewise.
+	* include/grub/mm.h: Likewise.
+	* include/grub/test.h: Likewise.
+	* kern/mm.c: Likewise.
+	* lib/libgcrypt_wrap/cipher_wrap.h: Likewise.
+
diff --git a/fs/reiserfs.c b/fs/reiserfs.c
index c3db52f60..5acd339c5 100644
--- a/fs/reiserfs.c
+++ b/fs/reiserfs.c
@@ -62,7 +62,7 @@
 
 static grub_dl_t my_mod;
 
-#define assert(boolean) real_assert (boolean, __FILE__, __LINE__)
+#define assert(boolean) real_assert (boolean, GRUB_FILE, __LINE__)
 static inline void
 real_assert (int boolean, const char *file, const int line)
 {
diff --git a/genmk.rb b/genmk.rb
index df03e1dfe..ac5252412 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -91,7 +91,7 @@ endif
       dir = File.dirname(src)
 
       "#{obj}: #{src} $(#{src}_DEPENDENCIES)
-	$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -MD -c -o $@ $<
+	$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -DGRUB_FILE=\\\"#{src}\\\" -MD -c -o $@ $<
 -include #{dep}
 
 "
@@ -163,7 +163,7 @@ endif
 	$(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ #{objs_str}
 
 #{mod_obj}: #{mod_src}
-	$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(#{prefix}_CFLAGS) -c -o $@ $<
+	$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(#{prefix}_CFLAGS) -DGRUB_FILE=\\\"#{mod_src}\\\" -c -o $@ $<
 
 #{mod_src}: $(builddir)/moddep.lst $(srcdir)/genmodsrc.sh
 	sh $(srcdir)/genmodsrc.sh '#{mod_name}' $< > $@ || (rm -f $@; exit 1)
@@ -197,7 +197,7 @@ endif
       dir = File.dirname(src)
 
       "#{obj}: #{src} $(#{src}_DEPENDENCIES)
-	$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -MD -c -o $@ $<
+	$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -DGRUB_FILE=\\\"#{src}\\\" -MD -c -o $@ $<
 -include #{dep}
 
 clean-module-#{extra_target}.#{@rule_count}:
@@ -299,7 +299,7 @@ MOSTLYCLEAN_UTILITY_TARGETS += mostlyclean-utility-#{@name}.#{@rule_count}
       dir = File.dirname(src)
 
       "#{obj}: #{src} $(#{src}_DEPENDENCIES)
-	$(CC) -I#{dir} -I$(srcdir)/#{dir} $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(#{prefix}_CFLAGS) -MD -c -o $@ $<
+	$(CC) -I#{dir} -I$(srcdir)/#{dir} $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(#{prefix}_CFLAGS) -DGRUB_FILE=\\\"#{src}\\\" -MD -c -o $@ $<
 -include #{dep}
 
 "
@@ -346,7 +346,7 @@ endif
       dir = File.dirname(src)
 
       "#{obj}: #{src} $(#{src}_DEPENDENCIES)
-	$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -MD -c -o $@ $<
+	$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -DGRUB_FILE=\\\"#{src}\\\" -MD -c -o $@ $<
 
 -include #{dep}
 
diff --git a/include/grub/list.h b/include/grub/list.h
index b7703e214..5559158dc 100644
--- a/include/grub/list.h
+++ b/include/grub/list.h
@@ -52,7 +52,7 @@ grub_bad_type_cast_real (int line, const char *file)
   return 0;
 }
 
-#define grub_bad_type_cast() grub_bad_type_cast_real(__LINE__, __FILE__)
+#define grub_bad_type_cast() grub_bad_type_cast_real(__LINE__, GRUB_FILE)
 
 #define GRUB_FIELD_MATCH(ptr, type, field) \
   ((char *) &(ptr)->field == (char *) &((type) (ptr))->field)
diff --git a/include/grub/misc.h b/include/grub/misc.h
index dcbafba87..5b1477ed4 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -46,7 +46,7 @@
 #define ARRAY_SIZE(array) (sizeof (array) / sizeof (array[0]))
 #define COMPILE_TIME_ASSERT(cond) switch (0) { case 1: case !(cond): ; }
 
-#define grub_dprintf(condition, fmt, args...) grub_real_dprintf(__FILE__, __LINE__, condition, fmt, ## args)
+#define grub_dprintf(condition, fmt, args...) grub_real_dprintf(GRUB_FILE, __LINE__, condition, fmt, ## args)
 /* XXX: If grub_memmove is too slow, we must implement grub_memcpy.  */
 #define grub_memcpy(d,s,n)	grub_memmove ((d), (s), (n))
 
diff --git a/include/grub/mm.h b/include/grub/mm.h
index 4caf80511..acefd2ea7 100644
--- a/include/grub/mm.h
+++ b/include/grub/mm.h
@@ -44,19 +44,19 @@ void grub_mm_dump_free (void);
 void grub_mm_dump (unsigned lineno);
 
 #define grub_malloc(size)	\
-  grub_debug_malloc (__FILE__, __LINE__, size)
+  grub_debug_malloc (GRUB_FILE, __LINE__, size)
 
 #define grub_zalloc(size)	\
-  grub_debug_zalloc (__FILE__, __LINE__, size)
+  grub_debug_zalloc (GRUB_FILE, __LINE__, size)
 
 #define grub_realloc(ptr,size)	\
-  grub_debug_realloc (__FILE__, __LINE__, ptr, size)
+  grub_debug_realloc (GRUB_FILE, __LINE__, ptr, size)
 
 #define grub_memalign(align,size)	\
-  grub_debug_memalign (__FILE__, __LINE__, align, size)
+  grub_debug_memalign (GRUB_FILE, __LINE__, align, size)
 
 #define grub_free(ptr)	\
-  grub_debug_free (__FILE__, __LINE__, ptr)
+  grub_debug_free (GRUB_FILE, __LINE__, ptr)
 
 void *EXPORT_FUNC(grub_debug_malloc) (const char *file, int line,
 				      grub_size_t size);
diff --git a/include/grub/test.h b/include/grub/test.h
index a7d3a2399..27591cca2 100644
--- a/include/grub/test.h
+++ b/include/grub/test.h
@@ -54,7 +54,7 @@ void grub_test_nonzero (int cond, const char *file,
 
 /* Macro to fill in location details and an optional error message.  */
 #define grub_test_assert(cond, ...)				\
-  grub_test_nonzero(cond, __FILE__, __FUNCTION__, __LINE__,	\
+  grub_test_nonzero(cond, GRUB_FILE, __FUNCTION__, __LINE__,	\
 		    ## __VA_ARGS__,				\
 		    "assert failed: %s", #cond)
 
diff --git a/kern/mm.c b/kern/mm.c
index ef97b018e..3237b040c 100644
--- a/kern/mm.c
+++ b/kern/mm.c
@@ -388,7 +388,7 @@ grub_free (void *ptr)
       do
 	{
 	  grub_printf ("%s:%d: q=%p, q->size=0x%x, q->magic=0x%x\n",
-		       __FILE__, __LINE__, q, q->size, q->magic);
+		       GRUB_FILE, __LINE__, q, q->size, q->magic);
 	  q = q->next;
 	}
       while (q != r->first);
diff --git a/lib/libgcrypt_wrap/cipher_wrap.h b/lib/libgcrypt_wrap/cipher_wrap.h
index e05f0cda9..b4530c112 100644
--- a/lib/libgcrypt_wrap/cipher_wrap.h
+++ b/lib/libgcrypt_wrap/cipher_wrap.h
@@ -59,7 +59,7 @@ typedef union {
     double g;
 } PROPERLY_ALIGNED_TYPE;
 
-#define gcry_assert(x) grub_assert_real(__FILE__, __LINE__, x)
+#define gcry_assert(x) grub_assert_real(GRUB_FILE, __LINE__, x)
 
 static inline void
 grub_assert_real (const char *file, int line, int cond)

From a3df209041d587f7dd50958bd1f8b20fae42a68f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 9 Feb 2010 21:16:17 +0100
Subject: [PATCH 0495/1628] Fix libusb compilation

---
 conf/any-emu.rmk | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index a4ee9b755..2ded20e2e 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -47,11 +47,29 @@ endif
 grub_emu_LDFLAGS = $(LIBCURSES)
 
 ifeq ($(enable_grub_emu_usb), yes)
+pkglib_MODULES += libusb.mod
+libusb_mod_SOURCES = util/usb.c
+libusb_mod_CFLAGS = 
+libusb_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usb.mod
 pkglib_MODULES += usb.mod
-usb_mod_SOURCES = disk/usbms.c util/usb.c bus/usb/usb.c	\
-		commands/usbtest.c
+usb_mod_SOURCES = bus/usb/usb.c
 usb_mod_CFLAGS = $(COMMON_CFLAGS)
 usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usbtest.mod
+pkglib_MODULES += usbtest.mod
+usbtest_mod_SOURCES = commands/usbtest.c
+usbtest_mod_CFLAGS = $(COMMON_CFLAGS)
+usbtest_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usbms.mod
+pkglib_MODULES += usbms.mod
+usbms_mod_SOURCES = disk/usbms.c
+usbms_mod_CFLAGS = $(COMMON_CFLAGS)
+usbms_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 grub_emu_LDFLAGS += $(LIBUSB)
 endif
 

From 38c95667d6e4e16aa273be18b5d405972352a23f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 10 Feb 2010 00:05:19 +0100
Subject: [PATCH 0496/1628] Unify efi rmk

---
 conf/i386-efi.rmk   | 130 +----------------------------------------
 conf/x86-efi.rmk    | 138 ++++++++++++++++++++++++++++++++++++++++++++
 conf/x86_64-efi.rmk | 130 +----------------------------------------
 3 files changed, 140 insertions(+), 258 deletions(-)
 create mode 100644 conf/x86-efi.rmk

diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index 345350406..b6e6821f4 100644
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -4,132 +4,4 @@ COMMON_ASFLAGS = -nostdinc -fno-builtin -m32
 COMMON_CFLAGS = -fno-builtin -m32
 COMMON_LDFLAGS = -melf_i386 -nostdlib
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
-# Utilities.
-bin_UTILITIES = grub-mkimage
-
-# For grub-mkimage.
-grub_mkimage_SOURCES = gnulib/progname.c util/i386/efi/grub-mkimage.c \
-	util/misc.c util/resolve.c
-util/i386/efi/grub-mkimage.c_DEPENDENCIES = Makefile
-
-# For grub-setup.
-#grub_setup_SOURCES = util/i386/pc/grub-setup.c util/hostdisk.c	\
-#	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
-#	kern/err.c kern/misc.c fs/fat.c fs/ext2.c fs/xfs.c fs/affs.c	\
-#	fs/sfs.c kern/parser.c kern/partition.c partmap/msdos.c		\
-#	fs/ufs.c fs/ufs2.c fs/minix.c fs/hfs.c fs/jfs.c fs/hfsplus.c kern/file.c	\
-#	kern/fs.c kern/env.c fs/fshelp.c
-
-# Scripts.
-sbin_SCRIPTS = grub-install
-
-# For grub-install.
-grub_install_SOURCES = util/i386/efi/grub-install.in
-
-# Modules.
-pkglib_PROGRAMS = kernel.img
-pkglib_MODULES = chain.mod appleldr.mod \
-	linux.mod halt.mod  \
-	datetime.mod loadbios.mod \
-	fixvideo.mod mmap.mod acpi.mod
-
-# For kernel.img.
-kernel_img_RELOCATABLE = yes
-kernel_img_SOURCES = kern/i386/efi/startup.S kern/main.c kern/device.c \
-	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-	kern/misc.c kern/mm.c kern/term.c \
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/$(target_cpu)/dl.c kern/i386/efi/init.c kern/parser.c kern/partition.c \
-	kern/env.c symlist.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c \
-	term/efi/console.c disk/efi/efidisk.c \
-	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
-	kern/i386/tsc.c kern/i386/pit.c \
-	kern/generic/rtc_get_time_ms.c \
-	kern/generic/millisleep.c
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	efi/efi.h efi/time.h efi/disk.h i386/pit.h list.h handler.h command.h \
-	i18n.h env_private.h
-kernel_img_CFLAGS = $(COMMON_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
-
-MOSTLYCLEANFILES += symlist.c
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-# For acpi.mod.
-acpi_mod_SOURCES = commands/acpi.c commands/efi/acpi.c
-acpi_mod_CFLAGS = $(COMMON_CFLAGS)
-acpi_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For mmap.mod.
-mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c \
-		   mmap/efi/mmap.c
-mmap_mod_CFLAGS = $(COMMON_CFLAGS)
-mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For chain.mod.
-chain_mod_SOURCES = loader/efi/chainloader.c
-chain_mod_CFLAGS = $(COMMON_CFLAGS)
-chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For appleldr.mod.
-appleldr_mod_SOURCES = loader/efi/appleloader.c
-appleldr_mod_CFLAGS = $(COMMON_CFLAGS)
-appleldr_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/efi/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For halt.mod.
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datetime.mod
-datetime_mod_SOURCES = lib/efi/datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For loadbios.mod
-loadbios_mod_SOURCES = commands/efi/loadbios.c
-loadbios_mod_CFLAGS = $(COMMON_CFLAGS)
-loadbios_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For fixvideo.mod
-fixvideo_mod_SOURCES = commands/efi/fixvideo.c
-fixvideo_mod_CFLAGS = $(COMMON_CFLAGS)
-fixvideo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += efi_uga.mod
-efi_uga_mod_SOURCES = video/efi_uga.c
-efi_uga_mod_CFLAGS = $(COMMON_CFLAGS)
-efi_uga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += efi_gop.mod
-efi_gop_mod_SOURCES = video/efi_gop.c
-efi_gop_mod_CFLAGS = $(COMMON_CFLAGS)
-efi_gop_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += xnu.mod
-xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c \
-	loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
-xnu_mod_CFLAGS = $(COMMON_CFLAGS)
-xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
-xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-include $(srcdir)/conf/i386.mk
-include $(srcdir)/conf/common.mk
+include $(srcdir)/conf/x86-efi.mk
\ No newline at end of file
diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
new file mode 100644
index 000000000..b115d174b
--- /dev/null
+++ b/conf/x86-efi.rmk
@@ -0,0 +1,138 @@
+# -*- makefile -*-
+
+# Used by various components.  These rules need to precede them.
+script/lexer.c_DEPENDENCIES = grub_script.tab.h
+
+# Utilities.
+bin_UTILITIES = grub-mkimage
+
+# For grub-mkimage.
+grub_mkimage_SOURCES = gnulib/progname.c util/i386/efi/grub-mkimage.c \
+	util/misc.c util/resolve.c
+util/i386/efi/grub-mkimage.c_DEPENDENCIES = Makefile
+
+# For grub-setup.
+#grub_setup_SOURCES = util/i386/pc/grub-setup.c util/hostdisk.c	\
+#	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
+#	kern/err.c kern/misc.c fs/fat.c fs/ext2.c fs/xfs.c fs/affs.c	\
+#	fs/sfs.c kern/parser.c kern/partition.c partmap/msdos.c		\
+#	fs/ufs.c fs/ufs2.c fs/minix.c fs/hfs.c fs/jfs.c fs/hfsplus.c kern/file.c	\
+#	kern/fs.c kern/env.c fs/fshelp.c
+
+# Scripts.
+sbin_SCRIPTS = grub-install
+
+# For grub-install.
+grub_install_SOURCES = util/i386/efi/grub-install.in
+
+# Modules.
+pkglib_PROGRAMS = kernel.img
+pkglib_MODULES = chain.mod appleldr.mod \
+	linux.mod halt.mod  \
+	datetime.mod loadbios.mod \
+	fixvideo.mod mmap.mod acpi.mod
+
+# For kernel.img.
+kernel_img_RELOCATABLE = yes
+kernel_img_SOURCES = kern/$(target_cpu)/efi/startup.S kern/main.c kern/device.c \
+	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
+	kern/misc.c kern/mm.c kern/term.c \
+	kern/rescue_parser.c kern/rescue_reader.c \
+	kern/$(target_cpu)/dl.c kern/i386/efi/init.c kern/parser.c kern/partition.c \
+	kern/env.c symlist.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c \
+	term/efi/console.c disk/efi/efidisk.c \
+	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
+	kern/i386/tsc.c kern/i386/pit.c \
+	kern/generic/rtc_get_time_ms.c \
+	kern/generic/millisleep.c
+ifeq ($(target_cpu),x86_64)
+kernel_img_SOURCES += kern/x86_64/efi/callwrap.S
+endif
+kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
+	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
+	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
+	efi/efi.h efi/time.h efi/disk.h i386/pit.h list.h handler.h command.h \
+	i18n.h env_private.h
+kernel_img_CFLAGS = $(COMMON_CFLAGS)
+kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
+kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
+
+MOSTLYCLEANFILES += symlist.c
+MOSTLYCLEANFILES += symlist.c kernel_syms.lst
+DEFSYMFILES += kernel_syms.lst
+
+symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
+	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
+
+kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
+	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
+
+# For acpi.mod.
+acpi_mod_SOURCES = commands/acpi.c commands/efi/acpi.c
+acpi_mod_CFLAGS = $(COMMON_CFLAGS)
+acpi_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For mmap.mod.
+mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c \
+		   mmap/efi/mmap.c
+mmap_mod_CFLAGS = $(COMMON_CFLAGS)
+mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For chain.mod.
+chain_mod_SOURCES = loader/efi/chainloader.c
+chain_mod_CFLAGS = $(COMMON_CFLAGS)
+chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For appleldr.mod.
+appleldr_mod_SOURCES = loader/efi/appleloader.c
+appleldr_mod_CFLAGS = $(COMMON_CFLAGS)
+appleldr_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For linux.mod.
+linux_mod_SOURCES = loader/i386/efi/linux.c
+ifeq ($(target_cpu), x86_64)
+linux_mod_SOURCES += loader/i386/linux_trampoline.S
+endif
+linux_mod_CFLAGS = $(COMMON_CFLAGS)
+linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
+linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For halt.mod.
+halt_mod_SOURCES = commands/halt.c
+halt_mod_CFLAGS = $(COMMON_CFLAGS)
+halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For datetime.mod
+datetime_mod_SOURCES = lib/efi/datetime.c
+datetime_mod_CFLAGS = $(COMMON_CFLAGS)
+datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For loadbios.mod
+loadbios_mod_SOURCES = commands/efi/loadbios.c
+loadbios_mod_CFLAGS = $(COMMON_CFLAGS)
+loadbios_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For fixvideo.mod
+fixvideo_mod_SOURCES = commands/efi/fixvideo.c
+fixvideo_mod_CFLAGS = $(COMMON_CFLAGS)
+fixvideo_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+pkglib_MODULES += efi_uga.mod
+efi_uga_mod_SOURCES = video/efi_uga.c
+efi_uga_mod_CFLAGS = $(COMMON_CFLAGS)
+efi_uga_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+pkglib_MODULES += efi_gop.mod
+efi_gop_mod_SOURCES = video/efi_gop.c
+efi_gop_mod_CFLAGS = $(COMMON_CFLAGS)
+efi_gop_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+pkglib_MODULES += xnu.mod
+xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c \
+	loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
+xnu_mod_CFLAGS = $(COMMON_CFLAGS)
+xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
+xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
+
+include $(srcdir)/conf/i386.mk
+include $(srcdir)/conf/common.mk
diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 4116894f4..816cce34e 100644
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -4,132 +4,4 @@ COMMON_ASFLAGS = -nostdinc -fno-builtin -m64
 COMMON_CFLAGS = -fno-builtin -m64
 COMMON_LDFLAGS = -melf_x86_64 -nostdlib
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
-# Utilities.
-bin_UTILITIES = grub-mkimage
-
-# For grub-mkimage.
-grub_mkimage_SOURCES = gnulib/progname.c util/i386/efi/grub-mkimage.c \
-	util/misc.c util/resolve.c
-
-# For grub-setup.
-#grub_setup_SOURCES = util/i386/pc/grub-setup.c util/hostdisk.c	\
-#	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
-#	kern/err.c kern/misc.c fs/fat.c fs/ext2.c fs/xfs.c fs/affs.c	\
-#	fs/sfs.c kern/parser.c kern/partition.c partmap/msdos.c		\
-#	fs/ufs.c fs/ufs2.c fs/minix.c fs/hfs.c fs/jfs.c fs/hfsplus.c kern/file.c	\
-#	kern/fs.c kern/env.c fs/fshelp.c
-
-# Scripts.
-sbin_SCRIPTS = grub-install
-
-# For grub-install.
-grub_install_SOURCES = util/i386/efi/grub-install.in
-
-# Modules.
-pkglib_PROGRAMS = kernel.img
-pkglib_MODULES = chain.mod appleldr.mod 	\
-	halt.mod linux.mod  \
-	datetime.mod loadbios.mod \
-	fixvideo.mod mmap.mod acpi.mod
-
-# For kernel.img.
-kernel_img_RELOCATABLE = yes
-kernel_img_SOURCES = kern/x86_64/efi/startup.S kern/x86_64/efi/callwrap.S \
-	kern/main.c kern/device.c \
-	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-	kern/misc.c kern/mm.c kern/term.c \
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/$(target_cpu)/dl.c kern/i386/efi/init.c kern/parser.c kern/partition.c \
-	kern/env.c symlist.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c \
-	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
-	kern/i386/tsc.c kern/i386/pit.c \
-	kern/generic/millisleep.c kern/generic/rtc_get_time_ms.c \
-	term/efi/console.c disk/efi/efidisk.c
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	efi/efi.h efi/time.h efi/disk.h machine/loader.h i386/pit.h list.h \
-	handler.h command.h i18n.h env_private.h
-kernel_img_CFLAGS = $(COMMON_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
-
-MOSTLYCLEANFILES += symlist.c
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-# For acpi.mod.
-acpi_mod_SOURCES = commands/acpi.c commands/efi/acpi.c
-acpi_mod_CFLAGS = $(COMMON_CFLAGS)
-acpi_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For mmap.mod.
-mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c \
-		   mmap/efi/mmap.c
-mmap_mod_CFLAGS = $(COMMON_CFLAGS)
-mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For chain.mod.
-chain_mod_SOURCES = loader/efi/chainloader.c
-chain_mod_CFLAGS = $(COMMON_CFLAGS)
-chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For appleldr.mod.
-appleldr_mod_SOURCES = loader/efi/appleloader.c
-appleldr_mod_CFLAGS = $(COMMON_CFLAGS)
-appleldr_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/efi/linux.c loader/i386/linux_trampoline.S
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For halt.mod.
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datetime.mod
-datetime_mod_SOURCES = lib/efi/datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For loadbios.mod
-loadbios_mod_SOURCES = commands/efi/loadbios.c
-loadbios_mod_CFLAGS = $(COMMON_CFLAGS)
-loadbios_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For fixvideo.mod
-fixvideo_mod_SOURCES = commands/efi/fixvideo.c
-fixvideo_mod_CFLAGS = $(COMMON_CFLAGS)
-fixvideo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += efi_uga.mod
-efi_uga_mod_SOURCES = video/efi_uga.c
-efi_uga_mod_CFLAGS = $(COMMON_CFLAGS)
-efi_uga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += efi_gop.mod
-efi_gop_mod_SOURCES = video/efi_gop.c
-efi_gop_mod_CFLAGS = $(COMMON_CFLAGS)
-efi_gop_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += xnu.mod
-xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c \
-	loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
-xnu_mod_CFLAGS = $(COMMON_CFLAGS)
-xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
-xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-include $(srcdir)/conf/i386.mk
-include $(srcdir)/conf/common.mk
+include $(srcdir)/conf/x86-efi.mk

From ed4e9b07a4a3bcf2c89079e450f80bc9db5a5de7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 10 Feb 2010 00:16:28 +0100
Subject: [PATCH 0497/1628] unify symlist.c

---
 conf/common.rmk           |  9 +++++++++
 conf/i386-coreboot.rmk    |  9 ---------
 conf/i386-ieee1275.rmk    |  9 ---------
 conf/i386-pc.rmk          |  9 ---------
 conf/i386-qemu.rmk        |  9 ---------
 conf/mips.rmk             | 10 ----------
 conf/powerpc-ieee1275.rmk |  9 ---------
 conf/sparc64-ieee1275.rmk |  9 ---------
 conf/x86-efi.rmk          | 10 ----------
 9 files changed, 9 insertions(+), 74 deletions(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index f3c85d971..4133e7c97 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -100,6 +100,15 @@ grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c
 	kern/handler.c kern/err.c kern/parser.c kern/list.c \
 	kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c
 
+MOSTLYCLEANFILES += symlist.c kernel_syms.lst
+DEFSYMFILES += kernel_syms.lst
+
+symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
+	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
+
+kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
+	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
+
 # For the parser.
 grub_script.tab.c grub_script.tab.h: script/parser.y
 	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/parser.y
diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 85407b47e..dbcba7f6b 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -39,15 +39,6 @@ kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR),-Bstatic
 
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
 sbin_SCRIPTS += grub-install
 grub_install_SOURCES = util/grub-install.in
 
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 6e5fd3055..ebcde000c 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -38,15 +38,6 @@ kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x10000,-Bstatic
 
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
 # Scripts.
 sbin_SCRIPTS = grub-install
 
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index b30863812..535c91109 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -71,15 +71,6 @@ kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
 kernel_img_FORMAT = binary
 
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
 # Utilities.
 bin_UTILITIES = grub-mkimage
 sbin_UTILITIES = grub-setup
diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index 17e4f1129..af150932f 100644
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -53,15 +53,6 @@ kernel_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KE
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 kernel_img_FORMAT = binary
 
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
 sbin_SCRIPTS += grub-install
 grub_install_SOURCES = util/grub-install.in
 
diff --git a/conf/mips.rmk b/conf/mips.rmk
index e04b0adf2..32d945734 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -9,10 +9,6 @@ COMMON_LDFLAGS += -nostdlib
 script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Images.
-
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
 	symbol.h term.h time.h types.h loader.h partition.h \
@@ -23,12 +19,6 @@ ifeq ($(platform), yeeloong)
 kernel_img_HEADERS += pci.h
 endif
 
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
 # Scripts.
 sbin_SCRIPTS = 
 bin_SCRIPTS = 
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index a22c38ec1..d5d6d3bd2 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -10,21 +10,12 @@ script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Images.
 
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
 	symbol.h term.h time.h types.h powerpc/libgcc.h loader.h partition.h \
 	msdos_partition.h ieee1275/ieee1275.h machine/kernel.h handler.h list.h \
 	command.h i18n.h env_private.h
 
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
 # Programs
 pkglib_PROGRAMS = kernel.img
 
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 69ed325b2..2668f1060 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -23,9 +23,6 @@ diskboot_img_ASFLAGS = $(COMMON_ASFLAGS)
 diskboot_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-Ttext,0x4200
 diskboot_img_FORMAT = binary
 
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
@@ -51,12 +48,6 @@ kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,0x200000,-Bstatic,-melf64_sparc -static-libgcc -lgcc
 kernel_img_FORMAT = binary
 
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
 # Utilities.
 bin_UTILITIES = grub-mkimage
 sbin_UTILITIES = grub-setup grub-ofpathname
diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index b115d174b..58918e145 100644
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -57,16 +57,6 @@ kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 
-MOSTLYCLEANFILES += symlist.c
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
 # For acpi.mod.
 acpi_mod_SOURCES = commands/acpi.c commands/efi/acpi.c
 acpi_mod_CFLAGS = $(COMMON_CFLAGS)

From efca454179d415fea918ee6f3d565cd5d9bb3af8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 10 Feb 2010 01:05:40 +0100
Subject: [PATCH 0498/1628] Merge kernel_img_HEADERS

---
 conf/common.rmk           |  6 ++++++
 conf/i386-coreboot.rmk    |  6 ------
 conf/i386-ieee1275.rmk    |  6 +-----
 conf/i386-pc.rmk          |  9 ++-------
 conf/i386-qemu.rmk        |  6 ------
 conf/mips-yeeloong.rmk    |  1 +
 conf/mips.rmk             | 10 +---------
 conf/powerpc-ieee1275.rmk |  6 +-----
 conf/sparc64-ieee1275.rmk |  7 +------
 conf/x86-efi.rmk          |  6 +-----
 gensymlist.sh.in          |  1 +
 11 files changed, 15 insertions(+), 49 deletions(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index 4133e7c97..b97de8e22 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -103,6 +103,12 @@ grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c
 MOSTLYCLEANFILES += symlist.c kernel_syms.lst
 DEFSYMFILES += kernel_syms.lst
 
+kernel_img_HEADERS += boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
+	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
+	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
+	machine/memory.h machine/loader.h machine/kernel.h \
+	list.h handler.h command.h i18n.h env_private.h
+
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
 	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
 
diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index dbcba7f6b..44b80761e 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -29,12 +29,6 @@ kernel_img_SOURCES = kern/i386/coreboot/startup.S \
 	kern/env.c \
 	term/i386/pc/vga_text.c term/i386/vga_common.c \
 	symlist.c
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	machine/boot.h machine/console.h machine/init.h \
-	machine/memory.h machine/loader.h list.h handler.h command.h i18n.h \
-	env_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR),-Bstatic
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index ebcde000c..d23ba4c0e 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -29,11 +29,7 @@ kernel_img_SOURCES = kern/i386/ieee1275/startup.S \
 	term/ieee1275/ofconsole.c \
 	disk/ieee1275/ofdisk.c \
 	symlist.c
-kernel_img_HEADERS = cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	ieee1275/ieee1275.h machine/kernel.h machine/loader.h machine/memory.h \
-	list.h handler.h command.h i18n.h env_private.h
+kernel_img_HEADERS += ieee1275/ieee1275.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x10000,-Bstatic
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 535c91109..b620c43af 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -59,13 +59,8 @@ kernel_img_SOURCES = kern/i386/pc/startup.S \
 	kern/env.c \
 	term/i386/pc/console.c term/i386/vga_common.c \
 	symlist.c
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	machine/biosdisk.h machine/boot.h machine/console.h machine/init.h \
-	machine/memory.h machine/loader.h machine/vga.h machine/vbe.h \
-	machine/kernel.h machine/pxe.h i386/pit.h list.h handler.h command.h \
-	i18n.h env_private.h
+kernel_img_HEADERS += machine/biosdisk.h machine/vga.h machine/vbe.h \
+	machine/pxe.h i386/pit.h machine/init.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index af150932f..355870c89 100644
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -42,12 +42,6 @@ kernel_img_SOURCES = kern/i386/qemu/startup.S \
 	kern/env.c \
 	term/i386/pc/vga_text.c term/i386/vga_common.c \
 	symlist.c
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	machine/boot.h machine/console.h machine/init.h \
-	machine/memory.h machine/loader.h list.h handler.h command.h i18n.h \
-	env_private.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR)
diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index d5e1d1c5d..8b6c0426a 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -24,6 +24,7 @@ kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
 	video/bitmap_scale.c video/sm712.c bus/pci.c bus/bonito.c \
 	term/gfxterm.c commands/extcmd.c lib/arg.c \
 	symlist.c
+kernel_img_HEADERS += pci.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS) -DUSE_ASCII_FAILBACK
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
diff --git a/conf/mips.rmk b/conf/mips.rmk
index 32d945734..6948d8d66 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -9,15 +9,7 @@ COMMON_LDFLAGS += -nostdlib
 script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Images.
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
-	symbol.h term.h time.h types.h loader.h partition.h \
-	msdos_partition.h machine/kernel.h handler.h list.h \
-	command.h machine/memory.h cpu/libgcc.h cpu/cache.h i18n.h env_private.h
-
-ifeq ($(platform), yeeloong)
-kernel_img_HEADERS += pci.h
-endif
+kernel_img_HEADERS += cpu/libgcc.h cpu/cache.h
 
 # Scripts.
 sbin_SCRIPTS = 
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index d5d6d3bd2..59cde4efe 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -10,11 +10,7 @@ script/lexer.c_DEPENDENCIES = grub_script.tab.h
 
 # Images.
 
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
-	symbol.h term.h time.h types.h powerpc/libgcc.h loader.h partition.h \
-	msdos_partition.h ieee1275/ieee1275.h machine/kernel.h handler.h list.h \
-	command.h i18n.h env_private.h
+kernel_img_HEADERS += cpu/libgcc.h ieee1275/ieee1275.h
 
 # Programs
 pkglib_PROGRAMS = kernel.img
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 2668f1060..dbca42e58 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -23,12 +23,7 @@ diskboot_img_ASFLAGS = $(COMMON_ASFLAGS)
 diskboot_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-Ttext,0x4200
 diskboot_img_FORMAT = binary
 
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	list.h handler.h command.h i18n.h \
-	sparc64/libgcc.h ieee1275/ieee1275.h machine/kernel.h \
-	sparc64/ieee1275/ieee1275.h env_private.h
+kernel_img_HEADERS += cpu/libgcc.h ieee1275/ieee1275.h cpu/ieee1275/ieee1275.h
 kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c	\
 	kern/ieee1275/ieee1275.c kern/main.c kern/device.c		\
 	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c		\
diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index 58918e145..94f305506 100644
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -48,11 +48,7 @@ kernel_img_SOURCES = kern/$(target_cpu)/efi/startup.S kern/main.c kern/device.c
 ifeq ($(target_cpu),x86_64)
 kernel_img_SOURCES += kern/x86_64/efi/callwrap.S
 endif
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	efi/efi.h efi/time.h efi/disk.h i386/pit.h list.h handler.h command.h \
-	i18n.h env_private.h
+kernel_img_HEADERS += efi/efi.h efi/time.h efi/disk.h i386/pit.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/gensymlist.sh.in b/gensymlist.sh.in
index 27fc5e61a..087d0072f 100644
--- a/gensymlist.sh.in
+++ b/gensymlist.sh.in
@@ -37,6 +37,7 @@ cat <<EOF
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <grub/symbol.h>
 EOF
 
 for i in $*; do

From 428b0b2edd213d8c966a8afb0a91154dac514dc6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 10 Feb 2010 01:09:23 +0100
Subject: [PATCH 0499/1628] Unify lexer.c_DEPENDENCIES

---
 conf/any-emu.rmk          | 3 ---
 conf/common.rmk           | 3 +++
 conf/i386-coreboot.rmk    | 3 ---
 conf/i386-ieee1275.rmk    | 3 ---
 conf/i386-pc.rmk          | 3 ---
 conf/i386-qemu.rmk        | 3 ---
 conf/mips.rmk             | 3 ---
 conf/powerpc-ieee1275.rmk | 3 ---
 conf/sparc64-ieee1275.rmk | 3 ---
 conf/x86-efi.rmk          | 3 ---
 10 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index ee5ab3cd4..95f44844c 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -3,9 +3,6 @@
 COMMON_LDFLAGS += -nostdlib
 COMMON_CFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include) -fno-builtin
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
 kernel_img_RELOCATABLE = yes
 pkglib_PROGRAMS = kernel.img
diff --git a/conf/common.rmk b/conf/common.rmk
index b97de8e22..55a430572 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -1,5 +1,8 @@
 # -*- makefile -*-
 
+# Used by various components.  These rules need to precede them.
+script/lexer.c_DEPENDENCIES = grub_script.tab.h
+
 sbin_UTILITIES += grub-mkdevicemap
 grub_mkdevicemap_SOURCES = gnulib/progname.c util/grub-mkdevicemap.c \
 	util/deviceiter.c \
diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 44b80761e..048356a53 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -4,9 +4,6 @@ COMMON_ASFLAGS	= -nostdinc -fno-builtin -m32
 COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
 COMMON_LDFLAGS	= -m32 -nostdlib
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 # Images.
 
 GRUB_KERNEL_MACHINE_LINK_ADDR	= 0x8200
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index d23ba4c0e..c65e2f7de 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -4,9 +4,6 @@ COMMON_ASFLAGS	= -m32 -nostdinc -fno-builtin
 COMMON_CFLAGS	= -ffreestanding -mrtd -mregparm=3
 COMMON_LDFLAGS	= -nostdlib
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 # Images.
 pkglib_PROGRAMS = kernel.img
 
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index b620c43af..57904b265 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -6,9 +6,6 @@ COMMON_ASFLAGS = -nostdinc -fno-builtin -m32
 COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
 COMMON_LDFLAGS = -m32 -nostdlib
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 # Images.
 pkglib_IMAGES = boot.img cdboot.img diskboot.img kernel.img lnxboot.img \
 	pxeboot.img
diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index 355870c89..c7209f348 100644
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -4,9 +4,6 @@ COMMON_ASFLAGS	= -nostdinc -fno-builtin -m32
 COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
 COMMON_LDFLAGS	= -m32 -nostdlib
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 # Images.
 
 GRUB_KERNEL_MACHINE_LINK_ADDR	= 0x8200
diff --git a/conf/mips.rmk b/conf/mips.rmk
index 6948d8d66..84eed8805 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -5,9 +5,6 @@ COMMON_ASFLAGS += -nostdinc
 COMMON_CFLAGS += -ffreestanding -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
 COMMON_LDFLAGS += -nostdlib
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 # Images.
 kernel_img_HEADERS += cpu/libgcc.h cpu/cache.h
 
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 59cde4efe..ce54ca494 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -5,9 +5,6 @@ COMMON_ASFLAGS = -nostdinc -D__ASSEMBLY__
 COMMON_CFLAGS = -ffreestanding
 COMMON_LDFLAGS += -nostdlib
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 # Images.
 
 kernel_img_HEADERS += cpu/libgcc.h ieee1275/ieee1275.h
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index dbca42e58..ffa8c1e7c 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -5,9 +5,6 @@ COMMON_ASFLAGS = -nostdinc -m64
 COMMON_CFLAGS = -ffreestanding -m64 -mno-app-regs
 COMMON_LDFLAGS = -melf64_sparc -nostdlib -mno-relax
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 # Images.
 pkglib_IMAGES = boot.img diskboot.img kernel.img
 
diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index 94f305506..b27855aa4 100644
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -1,8 +1,5 @@
 # -*- makefile -*-
 
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h
-
 # Utilities.
 bin_UTILITIES = grub-mkimage
 

From c395ad834ea17c3bf75cf84ae09a57806b43f718 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 10 Feb 2010 01:10:09 +0100
Subject: [PATCH 0500/1628] Remove leftover __ASSEMBLY__

---
 conf/powerpc-ieee1275.rmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index ce54ca494..e7668fc5d 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -1,7 +1,7 @@
 
 # -*- makefile -*-
 
-COMMON_ASFLAGS = -nostdinc -D__ASSEMBLY__
+COMMON_ASFLAGS = -nostdinc
 COMMON_CFLAGS = -ffreestanding
 COMMON_LDFLAGS += -nostdlib
 

From 5c2ee77128083e2b53ec0fd4f4916322c13c0399 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 10 Feb 2010 01:39:23 +0100
Subject: [PATCH 0501/1628] Share common compilation flags

---
 Makefile.in               | 8 ++++----
 conf/any-emu.rmk          | 1 -
 conf/i386-coreboot.rmk    | 4 +---
 conf/i386-efi.rmk         | 4 +---
 conf/i386-ieee1275.rmk    | 4 +---
 conf/i386-pc.rmk          | 4 +---
 conf/i386-qemu.rmk        | 4 +---
 conf/mips.rmk             | 4 +---
 conf/powerpc-ieee1275.rmk | 4 ----
 conf/sparc64-ieee1275.rmk | 7 +++----
 conf/x86_64-efi.rmk       | 4 +---
 configure.ac              | 2 ++
 12 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 7af2df1f0..c4059e58e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -84,8 +84,8 @@ LDFLAGS = @LDFLAGS@ $(LIBS)
 CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/gnulib -I$(srcdir)/include -Wall -W \
 	 -DGRUB_LIBDIR=\"$(pkglibdir)\" -DLOCALEDIR=\"$(localedir)\"
 TARGET_CC = @TARGET_CC@
-TARGET_CFLAGS = @TARGET_CFLAGS@
-TARGET_ASFLAGS = @TARGET_ASFLAGS@
+TARGET_CFLAGS = -ffreestanding @TARGET_CFLAGS@
+TARGET_ASFLAGS = -nostdinc -fno-builtin @TARGET_ASFLAGS@
 TARGET_MODULE_FORMAT = @TARGET_MODULE_FORMAT@
 TARGET_APPLE_CC = @TARGET_APPLE_CC@
 OBJCONV = @OBJCONV@
@@ -93,9 +93,9 @@ TARGET_CPPFLAGS = @TARGET_CPPFLAGS@ -I$(srcdir)/include -I$(builddir) -I$(buildd
 ifneq ($(platform), emu)
 TARGET_CPPFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include)
 endif
-TARGET_LDFLAGS = @TARGET_LDFLAGS@
+TARGET_LDFLAGS = -nostdlib @TARGET_LDFLAGS@
 TARGET_IMG_LDSCRIPT = @TARGET_IMG_LDSCRIPT@
-TARGET_IMG_LDFLAGS = @TARGET_IMG_LDFLAGS@
+TARGET_IMG_LDFLAGS = -nostdlib @TARGET_IMG_LDFLAGS@
 TARGET_IMG_CFLAGS = @TARGET_IMG_CFLAGS@
 TARGET_OBJ2ELF = @TARGET_OBJ2ELF@
 EXEEXT = @EXEEXT@
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 95f44844c..c06e7758a 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -1,6 +1,5 @@
 # -*- makefile -*-
 
-COMMON_LDFLAGS += -nostdlib
 COMMON_CFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include) -fno-builtin
 
 util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 048356a53..3cef9313f 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -1,8 +1,6 @@
 # -*- makefile -*-
 
-COMMON_ASFLAGS	= -nostdinc -fno-builtin -m32
-COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
-COMMON_LDFLAGS	= -m32 -nostdlib
+COMMON_CFLAGS = -mrtd -mregparm=3 
 
 # Images.
 
diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index b6e6821f4..a92cff224 100644
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -1,7 +1,5 @@
 # -*- makefile -*-
 
-COMMON_ASFLAGS = -nostdinc -fno-builtin -m32
-COMMON_CFLAGS = -fno-builtin -m32
-COMMON_LDFLAGS = -melf_i386 -nostdlib
+COMMON_LDFLAGS = -melf_i386
 
 include $(srcdir)/conf/x86-efi.mk
\ No newline at end of file
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index c65e2f7de..d4a459b3e 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -1,8 +1,6 @@
 # -*- makefile -*-
 
-COMMON_ASFLAGS	= -m32 -nostdinc -fno-builtin
-COMMON_CFLAGS	= -ffreestanding -mrtd -mregparm=3
-COMMON_LDFLAGS	= -nostdlib
+COMMON_CFLAGS	= -mrtd -mregparm=3
 
 # Images.
 pkglib_PROGRAMS = kernel.img
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 57904b265..19c996543 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -2,9 +2,7 @@
 
 GRUB_KERNEL_MACHINE_LINK_ADDR = 0x8200
 
-COMMON_ASFLAGS = -nostdinc -fno-builtin -m32
-COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
-COMMON_LDFLAGS = -m32 -nostdlib
+COMMON_CFLAGS = -mrtd -mregparm=3
 
 # Images.
 pkglib_IMAGES = boot.img cdboot.img diskboot.img kernel.img lnxboot.img \
diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index c7209f348..97273e1ce 100644
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -1,8 +1,6 @@
 # -*- makefile -*-
 
-COMMON_ASFLAGS	= -nostdinc -fno-builtin -m32
-COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
-COMMON_LDFLAGS	= -m32 -nostdlib
+COMMON_CFLAGS = -mrtd -mregparm=3
 
 # Images.
 
diff --git a/conf/mips.rmk b/conf/mips.rmk
index 84eed8805..b43edbf69 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -1,9 +1,7 @@
 
 # -*- makefile -*-
 
-COMMON_ASFLAGS += -nostdinc
-COMMON_CFLAGS += -ffreestanding -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
-COMMON_LDFLAGS += -nostdlib
+COMMON_CFLAGS += -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
 
 # Images.
 kernel_img_HEADERS += cpu/libgcc.h cpu/cache.h
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index e7668fc5d..86f6ddcb3 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -1,10 +1,6 @@
 
 # -*- makefile -*-
 
-COMMON_ASFLAGS = -nostdinc
-COMMON_CFLAGS = -ffreestanding
-COMMON_LDFLAGS += -nostdlib
-
 # Images.
 
 kernel_img_HEADERS += cpu/libgcc.h ieee1275/ieee1275.h
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index ffa8c1e7c..507a05ab9 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -1,9 +1,8 @@
 
 # -*- makefile -*-
 
-COMMON_ASFLAGS = -nostdinc -m64
-COMMON_CFLAGS = -ffreestanding -m64 -mno-app-regs
-COMMON_LDFLAGS = -melf64_sparc -nostdlib -mno-relax
+COMMON_CFLAGS = -mno-app-regs
+COMMON_LDFLAGS = -melf64_sparc -mno-relax
 
 # Images.
 pkglib_IMAGES = boot.img diskboot.img kernel.img
@@ -37,7 +36,7 @@ kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c	\
 	symlist.c kern/$(target_cpu)/cache.S
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,0x200000,-Bstatic,-melf64_sparc -static-libgcc -lgcc
+kernel_img_LDFLAGS = -Wl,-N,-Ttext,0x200000,-Bstatic,-melf64_sparc -static-libgcc -lgcc
 kernel_img_FORMAT = binary
 
 # Utilities.
diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 816cce34e..200621280 100644
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -1,7 +1,5 @@
 # -*- makefile -*-
 
-COMMON_ASFLAGS = -nostdinc -fno-builtin -m64
-COMMON_CFLAGS = -fno-builtin -m64
-COMMON_LDFLAGS = -melf_x86_64 -nostdlib
+COMMON_LDFLAGS = -melf_x86_64
 
 include $(srcdir)/conf/x86-efi.mk
diff --git a/configure.ac b/configure.ac
index f3fcd8c48..462fca225 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,6 +353,7 @@ AC_MSG_RESULT([$TARGET_OBJ2ELF])
 if test "x$target_m32" = x1; then
   # Force 32-bit mode.
   TARGET_CFLAGS="$TARGET_CFLAGS -m32"
+  TARGET_ASFLAGS="$TARGET_CFLAGS -m32"
   TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
   TARGET_MODULE_FORMAT="elf32"
 fi
@@ -360,6 +361,7 @@ fi
 if test "x$target_m64" = x1; then
   # Force 64-bit mode.
   TARGET_CFLAGS="$TARGET_CFLAGS -m64"
+  TARGET_ASFLAGS="$TARGET_ASFLAGS -m64"
   TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
   TARGET_MODULE_FORMAT="elf64"
 fi

From 9a31b3a79763b6080327741a8f86618016c5ddbf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 10 Feb 2010 01:49:47 +0100
Subject: [PATCH 0502/1628] Fix yeeloong compilation

---
 conf/mips-yeeloong.rmk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 8b6c0426a..0d57a2884 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -3,6 +3,8 @@ LINK_BASE = 0x80200000
 target_machine=yeeloong
 COMMON_CFLAGS += -march=mips3
 COMMON_ASFLAGS += -march=mips3
+
+kernel_img_HEADERS += pci.h
 include $(srcdir)/conf/mips.mk
 
 pkglib_IMAGES = kernel.img
@@ -24,7 +26,6 @@ kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
 	video/bitmap_scale.c video/sm712.c bus/pci.c bus/bonito.c \
 	term/gfxterm.c commands/extcmd.c lib/arg.c \
 	symlist.c
-kernel_img_HEADERS += pci.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS) -DUSE_ASCII_FAILBACK
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
@@ -64,4 +65,3 @@ datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 sbin_SCRIPTS += grub-install
 grub_install_SOURCES = util/grub-install.in
-

From 52d45a32d3d51ddd8d62c42ab374c15b0f13ac98 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 10 Feb 2010 01:50:40 +0100
Subject: [PATCH 0503/1628] Add missing tailing newline

---
 conf/i386-efi.rmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index a92cff224..e826cb333 100644
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -2,4 +2,4 @@
 
 COMMON_LDFLAGS = -melf_i386
 
-include $(srcdir)/conf/x86-efi.mk
\ No newline at end of file
+include $(srcdir)/conf/x86-efi.mk

From 67443b0d684a8485cdf8706b01ceac6b67180793 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 10 Feb 2010 01:51:02 +0100
Subject: [PATCH 0504/1628] Remove useless efi grub-setup

---
 conf/x86-efi.rmk | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index b27855aa4..5cb472168 100644
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -8,14 +8,6 @@ grub_mkimage_SOURCES = gnulib/progname.c util/i386/efi/grub-mkimage.c \
 	util/misc.c util/resolve.c
 util/i386/efi/grub-mkimage.c_DEPENDENCIES = Makefile
 
-# For grub-setup.
-#grub_setup_SOURCES = util/i386/pc/grub-setup.c util/hostdisk.c	\
-#	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
-#	kern/err.c kern/misc.c fs/fat.c fs/ext2.c fs/xfs.c fs/affs.c	\
-#	fs/sfs.c kern/parser.c kern/partition.c partmap/msdos.c		\
-#	fs/ufs.c fs/ufs2.c fs/minix.c fs/hfs.c fs/jfs.c fs/hfsplus.c kern/file.c	\
-#	kern/fs.c kern/env.c fs/fshelp.c
-
 # Scripts.
 sbin_SCRIPTS = grub-install
 

From dd01d3970f99a644f03baa09cbd8e85618d2545d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 10 Feb 2010 18:09:44 +0100
Subject: [PATCH 0505/1628] 2010-02-10  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* script/execute.c (grub_script_execute_cmdline): Use grub_print_error
	to show messages instead of discarding them.
	Process errors after executing command and not before. Keep old method
	too as precaution.
---
 ChangeLog        | 7 +++++++
 script/execute.c | 9 +++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 793018ca9..b3e77335b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* script/execute.c (grub_script_execute_cmdline): Use grub_print_error
+	to show messages instead of discarding them.
+	Process errors after executing command and not before. Keep old method
+	too as precaution.
+
 2010-02-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Check for ft2build.h.
diff --git a/script/execute.c b/script/execute.c
index ee7e099bc..a0773c191 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -100,8 +100,8 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
   grubcmd = grub_command_find (cmdname);
   if (! grubcmd)
     {
-      /* Ignore errors.  */
-      grub_errno = GRUB_ERR_NONE;
+      /* Shouldn't happen but precaution is good.  */
+      grub_print_error ();
 
       /* It's not a GRUB command, try all functions.  */
       func = grub_script_function_find (cmdname);
@@ -156,6 +156,11 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
     grub_free (args[i]);
   grub_free (args);
 
+  if (grub_errno == GRUB_ERR_TEST_FAILURE)
+    grub_errno = GRUB_ERR_NONE;
+
+  grub_print_error ();
+
   grub_snprintf (errnobuf, sizeof (errnobuf), "%d", ret);
   grub_env_set ("?", errnobuf);
 

From 65a533e78a4e79b59f24b792bc7dd80c9d1afefb Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 10 Feb 2010 19:53:13 +0100
Subject: [PATCH 0506/1628] 2010-02-10  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Support GRUB_GFXPAYLOAD_LINUX.

	* util/grub-mkconfig.in: Export GRUB_GFXPAYLOAD_LINUX.
	* util/grub.d/10_linux.in (linux_entry): Handle GRUB_GFXPAYLOAD_LINUX.
---
 ChangeLog               |  7 +++++++
 util/grub-mkconfig.in   |  1 +
 util/grub.d/10_linux.in | 10 ++++++++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b3e77335b..b4eb12a54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Support GRUB_GFXPAYLOAD_LINUX.
+
+	* util/grub-mkconfig.in: Export GRUB_GFXPAYLOAD_LINUX.
+	* util/grub.d/10_linux.in (linux_entry): Handle GRUB_GFXPAYLOAD_LINUX.
+
 2010-02-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* script/execute.c (grub_script_execute_cmdline): Use grub_print_error
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 7e667fb3e..1363f479a 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -221,6 +221,7 @@ export GRUB_DEFAULT \
   GRUB_DISABLE_LINUX_RECOVERY \
   GRUB_GFXMODE \
   GRUB_THEME \
+  GRUB_GFXPAYLOAD_LINUX \
   GRUB_DISABLE_OS_PROBER
 
 if test "x${grub_cfg}" != "x"; then
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 8d5379fd6..046874ef0 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -65,9 +65,15 @@ linux_entry ()
 
   # Use ELILO's generic "efifb" when it's known to be available.
   # FIXME: We need an interface to select vesafb in case efifb can't be used.
-  if grep -qx "CONFIG_FB_EFI=y" /boot/config-${version} 2> /dev/null ; then
-    cat << EOF
+  if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then
+      if grep -qx "CONFIG_FB_EFI=y" /boot/config-${version} 2> /dev/null ; then
+	  cat << EOF
 	set gfxpayload=keep
+EOF
+      fi
+  else
+	  cat << EOF
+	set gfxpayload=$GRUB_GFXPAYLOAD_LINUX
 EOF
   fi
 

From 7cae4377a2cccea05d6b40a69cd8ac0ad4af4702 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 10 Feb 2010 20:27:12 +0100
Subject: [PATCH 0507/1628] 2010-02-10  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Pass SIMPLE framebuffer size in bytes and not 64K blocks.

	* loader/i386/efi/linux.c (grub_linux_setup_video): Don't divide by 64K.
	* loader/i386/linux.c (grub_linux_setup_video): Likewise.
	(grub_linux_boot): Divide by 64K when on VESA.
---
 ChangeLog               | 8 ++++++++
 loader/i386/efi/linux.c | 2 +-
 loader/i386/linux.c     | 4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b4eb12a54..70353ec0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Pass SIMPLE framebuffer size in bytes and not 64K blocks.
+
+	* loader/i386/efi/linux.c (grub_linux_setup_video): Don't divide by 64K.
+	* loader/i386/linux.c (grub_linux_setup_video): Likewise.
+	(grub_linux_boot): Divide by 64K when on VESA.
+
 2010-02-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Support GRUB_GFXPAYLOAD_LINUX.
diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c
index ebaf89743..a6db22e22 100644
--- a/loader/i386/efi/linux.c
+++ b/loader/i386/efi/linux.c
@@ -576,7 +576,7 @@ grub_linux_setup_video (struct linux_kernel_params *params)
   params->lfb_line_len = line_len;
 
   params->lfb_base = fb_base;
-  params->lfb_size = (line_len * params->lfb_height + 65535) >> 16;
+  params->lfb_size = ALIGN_UP (line_len * params->lfb_height, 65536);
 
   params->red_mask_size = 8;
   params->red_field_pos = 16;
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 630aec6f4..d3d935182 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -410,7 +410,7 @@ grub_linux_setup_video (struct linux_kernel_params *params)
   params->lfb_line_len = mode_info.pitch;
 
   params->lfb_base = (grub_size_t) framebuffer;
-  params->lfb_size = (params->lfb_line_len * params->lfb_height + 65535) >> 16;
+  params->lfb_size = ALIGN_UP (params->lfb_line_len * params->lfb_height, 65536);
 
   params->red_mask_size = mode_info.red_mask_size;
   params->red_field_pos = mode_info.red_field_pos;
@@ -543,6 +543,8 @@ grub_linux_boot (void)
       /* Use generic framebuffer unless VESA is known to be supported.  */
       if (params->have_vga != GRUB_VIDEO_LINUX_TYPE_VESA)
 	params->have_vga = GRUB_VIDEO_LINUX_TYPE_SIMPLE;
+      else
+	params->lfb_size >>= 16;
     }
   else
     {

From a929c8cd1efbd4322ca6118d25fb4b0c63c77564 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 11 Feb 2010 18:49:57 +0530
Subject: [PATCH 0508/1628] fix off-by-one error in menuentry cmd

---
 ChangeLog.lexer-rewrite | 5 +++++
 script/lexer.c          | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.lexer-rewrite b/ChangeLog.lexer-rewrite
index 9b2ab9e2f..24d009d14 100644
--- a/ChangeLog.lexer-rewrite
+++ b/ChangeLog.lexer-rewrite
@@ -1,3 +1,8 @@
+2010-02-10  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* script/lexer.c (grub_script_lexer_record_stop): Fix off-by-one
+	bug.
+
 2010-01-25  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* script/yylex.l: Accept parenthesis as part of word.
diff --git a/script/lexer.c b/script/lexer.c
index caefdb7a7..42a570348 100644
--- a/script/lexer.c
+++ b/script/lexer.c
@@ -76,7 +76,7 @@ grub_script_lexer_record_stop (struct grub_parser_param *parser)
     while (*end && grub_isspace (*end)) end--;
     if (*end == '}') end--;
     while (*end && grub_isspace (*end)) end--;
-    *end = '\0';
+    end[1] = '\0';
 
     return start;
   }

From 6bea3f8983a193bb26933556e12d5544d3aac75b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 12 Feb 2010 20:08:56 +0100
Subject: [PATCH 0509/1628] merge sparc grub-mkimage into grub-mkrawimage

---
 conf/sparc64-ieee1275.rmk              |   2 +-
 configure.ac                           |   9 +-
 include/grub/sparc64/ieee1275/kernel.h |   2 +
 util/grub-mkrawimage.c                 |  26 ++-
 util/sparc64/ieee1275/grub-mkimage.c   | 300 -------------------------
 5 files changed, 35 insertions(+), 304 deletions(-)
 delete mode 100644 util/sparc64/ieee1275/grub-mkimage.c

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index befc7dce5..6a91b40ee 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -62,7 +62,7 @@ bin_UTILITIES = grub-mkimage
 sbin_UTILITIES = grub-setup grub-ofpathname
 
 # For grub-mkimage.
-grub_mkimage_SOURCES = util/sparc64/ieee1275/grub-mkimage.c util/misc.c \
+grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
         util/resolve.c gnulib/progname.c
 
 # For grub-setup.
diff --git a/configure.ac b/configure.ac
index 48702afd6..b5db67b7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,9 +138,14 @@ case "$platform" in
   qemu)		machine_CFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
   pc)		machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
   emu)		machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
-  yeeloong)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
-  qemu-mips)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  yeeloong)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  qemu-mips)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
 esac
+case "$target_cpu" in
+  mips)      	machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_MIPS=1" ;;
+  sparc64)      machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
+esac
+
 CFLAGS="$CFLAGS $machine_CFLAGS"
 TARGET_ASFLAGS="$TARGET_ASFLAGS $machine_CFLAGS"
 TARGET_CFLAGS="$TARGET_CFLAGS $machine_CFLAGS"
diff --git a/include/grub/sparc64/ieee1275/kernel.h b/include/grub/sparc64/ieee1275/kernel.h
index e63e1f616..8eb1671a8 100644
--- a/include/grub/sparc64/ieee1275/kernel.h
+++ b/include/grub/sparc64/ieee1275/kernel.h
@@ -39,6 +39,8 @@
 /* End of the data section. */
 #define GRUB_KERNEL_MACHINE_DATA_END		0x114
 
+#define GRUB_KERNEL_MACHINE_RAW_SIZE                   0
+
 #ifndef ASM_FILE
 
 #include <grub/symbol.h>
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 2316479e9..e17446f78 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -142,7 +142,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
     }
 
   for (p = path_list; p; p = p->next)
-    total_module_size += (grub_util_get_image_size (p->name)
+    total_module_size += (ALIGN_UP (grub_util_get_image_size (p->name), 4)
 			  + sizeof (struct grub_module_header));
 
   grub_util_info ("the total module size is 0x%x", total_module_size);
@@ -295,6 +295,30 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
     core_img = rom_img;
     core_size = rom_size;
 
+    free (boot_img);
+    free (boot_path);
+  }
+#elif defined (GRUB_MACHINE_SPARC64)
+  {
+    unsigned int num;
+    char *boot_path, *boot_img;
+    size_t boot_size;
+
+    num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
+    num <<= GRUB_DISK_SECTOR_BITS;
+
+    boot_path = grub_util_get_path (dir, "diskboot.img");
+    boot_size = grub_util_get_image_size (boot_path);
+    if (boot_size != GRUB_DISK_SECTOR_SIZE)
+      grub_util_error ("diskboot.img is not one sector size");
+
+    boot_img = grub_util_read_image (boot_path);
+
+    *((grub_uint32_t *) (boot_img + GRUB_DISK_SECTOR_SIZE
+			 - GRUB_BOOT_MACHINE_LIST_SIZE + 8))
+      = grub_host_to_target32 (num);
+
+    grub_util_write_image (boot_img, boot_size, out);
     free (boot_img);
     free (boot_path);
   }
diff --git a/util/sparc64/ieee1275/grub-mkimage.c b/util/sparc64/ieee1275/grub-mkimage.c
deleted file mode 100644
index 6907b8d8a..000000000
--- a/util/sparc64/ieee1275/grub-mkimage.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/* grub-mkimage.c - make a bootable image */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008,2009,2010  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 <config.h>
-#include <grub/types.h>
-#include <grub/machine/boot.h>
-#include <grub/machine/kernel.h>
-#include <grub/kernel.h>
-#include <grub/i18n.h>
-#include <grub/disk.h>
-#include <grub/util/misc.h>
-#include <grub/util/resolve.h>
-#include <grub/misc.h>
-
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-
-#define _GNU_SOURCE	1
-#include <getopt.h>
-
-#include "progname.h"
-
-static void
-compress_kernel (char *kernel_img, size_t kernel_size,
-		 char **core_img, size_t *core_size)
-{
-  /* No compression support yet.  */
-  grub_util_info ("kernel_img=%p, kernel_size=0x%x", kernel_img, kernel_size);
-  *core_img = xmalloc (kernel_size);
-  memcpy (*core_img, kernel_img, kernel_size);
-  *core_size = kernel_size;
-}
-
-static void
-generate_image (const char *dir, const char *prefix, FILE *out, char *mods[], char *memdisk_path)
-{
-  size_t kernel_size, total_module_size, memdisk_size, core_size, boot_size, offset;
-  char *kernel_path, *kernel_img, *core_img, *boot_path, *boot_img;
-  struct grub_util_path_list *path_list, *p;
-  struct grub_module_info *modinfo;
-  grub_addr_t module_addr;
-  unsigned int num;
-
-  path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods);
-
-  kernel_path = grub_util_get_path (dir, "kernel.img");
-  kernel_size = grub_util_get_image_size (kernel_path);
-
-  total_module_size = sizeof (struct grub_module_info);
-  for (p = path_list; p; p = p->next)
-    total_module_size += (grub_util_get_image_size (p->name)
-			  + sizeof (struct grub_module_header));
-
-  memdisk_size = 0;
-  if (memdisk_path)
-    {
-      memdisk_size = ALIGN_UP(grub_util_get_image_size (memdisk_path), 512);
-      grub_util_info ("the size of memory disk is 0x%x", memdisk_size);
-      total_module_size += memdisk_size + sizeof (struct grub_module_header);
-    }
-
-  grub_util_info ("the total module size is 0x%x", total_module_size);
-
-  kernel_img = xmalloc (kernel_size + total_module_size);
-  grub_util_load_image (kernel_path, kernel_img);
-
-  if ((GRUB_KERNEL_MACHINE_PREFIX + strlen (prefix) + 1)
-      > GRUB_KERNEL_MACHINE_DATA_END)
-    grub_util_error ("prefix too long");
-  strcpy (kernel_img + GRUB_KERNEL_MACHINE_PREFIX, prefix);
-
-  /* Fill in the grub_module_info structure.  */
-  modinfo = (struct grub_module_info *) (kernel_img + kernel_size);
-  modinfo->magic = GRUB_MODULE_MAGIC;
-  modinfo->offset = sizeof (struct grub_module_info);
-  modinfo->size = total_module_size;
-
-  offset = kernel_size + sizeof (struct grub_module_info);
-  for (p = path_list; p; p = p->next)
-    {
-      struct grub_module_header *header;
-      size_t mod_size;
-
-      mod_size = grub_util_get_image_size (p->name);
-
-      header = (struct grub_module_header *) (kernel_img + offset);
-      header->type = OBJ_TYPE_ELF;
-      header->size = grub_host_to_target32 (mod_size + sizeof (*header));
-      offset += sizeof (*header);
-
-      grub_util_load_image (p->name, kernel_img + offset);
-      offset += mod_size;
-    }
-
-  if (memdisk_path)
-    {
-      struct grub_module_header *header;
-
-      header = (struct grub_module_header *) (kernel_img + offset);
-      header->type = OBJ_TYPE_MEMDISK;
-      header->size = grub_host_to_target32 (memdisk_size + sizeof (*header));
-      offset += sizeof (*header);
-
-      grub_util_load_image (memdisk_path, kernel_img + offset);
-      offset += memdisk_size;
-    }
-
-  compress_kernel (kernel_img, kernel_size + total_module_size,
-		   &core_img, &core_size);
-
-  grub_util_info ("the core size is 0x%x", core_size);
-
-  num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
-  num <<= GRUB_DISK_SECTOR_BITS;
-
-  boot_path = grub_util_get_path (dir, "diskboot.img");
-  boot_size = grub_util_get_image_size (boot_path);
-  if (boot_size != GRUB_DISK_SECTOR_SIZE)
-    grub_util_error ("diskboot.img is not one sector size");
-
-  boot_img = grub_util_read_image (boot_path);
-
-  /* sparc is a big endian architecture.  */
-  *((grub_uint32_t *) (boot_img + GRUB_DISK_SECTOR_SIZE
-		       - GRUB_BOOT_MACHINE_LIST_SIZE + 8))
-    = grub_cpu_to_be32 (num);
-
-  grub_util_write_image (boot_img, boot_size, out);
-  free (boot_img);
-  free (boot_path);
-
-  module_addr = (path_list
-		 ? (GRUB_BOOT_MACHINE_IMAGE_ADDRESS + kernel_size)
-		 : 0);
-
-  grub_util_info ("the first module address is 0x%x", module_addr);
-
-  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE))
-    = grub_cpu_to_be32 (total_module_size);
-  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE))
-    = grub_cpu_to_be32 (kernel_size);
-
-  /* No compression support yet.  */
-  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_COMPRESSED_SIZE))
-    = grub_cpu_to_be32 (0);
-
-  grub_util_write_image (core_img, core_size, out);
-  free (kernel_img);
-  free (core_img);
-  free (kernel_path);
-
-  while (path_list)
-    {
-      struct grub_util_path_list *next = path_list->next;
-      free ((void *) path_list->name);
-      free (path_list);
-      path_list = next;
-    }
-}
-
-static struct option options[] =
-  {
-    {"directory", required_argument, 0, 'd'},
-    {"prefix", required_argument, 0, 'p'},
-    {"memdisk", required_argument, 0, 'm'},
-    {"output", required_argument, 0, 'o'},
-    {"help", no_argument, 0, 'h'},
-    {"version", no_argument, 0, 'V'},
-    {"verbose", no_argument, 0, 'v'},
-    {0, 0, 0, 0}
-  };
-
-static void
-usage (int status)
-{
-  if (status)
-    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
-  else
-    printf ("\
-Usage: %s [OPTION]... [MODULES]\n\
-\n\
-Make a bootable image of GRUB.\n\
-\n\
-  -d, --directory=DIR     use images and modules under DIR [default=%s]\n\
-  -p, --prefix=DIR        set grub_prefix directory [default=%s]\n\
-  -m, --memdisk=FILE      embed FILE as a memdisk image\n\
-  -o, --output=FILE       output a generated image to FILE [default=stdout]\n\
-  -h, --help              display this message and exit\n\
-  -V, --version           print version information and exit\n\
-  -v, --verbose           print verbose messages\n\
-\n\
-Report bugs to <%s>.\n\
-", program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
-
-  exit (status);
-}
-
-int
-main (int argc, char *argv[])
-{
-  char *output = NULL;
-  char *dir = NULL;
-  char *prefix = NULL;
-  char *memdisk = NULL;
-  FILE *fp = stdout;
-
-  set_program_name (argv[0]);
-
-  grub_util_init_nls ();
-
-  while (1)
-    {
-      int c = getopt_long (argc, argv, "d:p:m:o:hVv", options, 0);
-
-      if (c == -1)
-	break;
-      else
-	switch (c)
-	  {
-	  case 'o':
-	    if (output)
-	      free (output);
-	    output = xstrdup (optarg);
-	    break;
-
-	  case 'd':
-	    if (dir)
-	      free (dir);
-	    dir = xstrdup (optarg);
-	    break;
-
-	  case 'm':
-	    if (memdisk)
-	      free (memdisk);
-	    memdisk = xstrdup (optarg);
-
-	    if (prefix)
-	      free (prefix);
-	    prefix = xstrdup ("(memdisk)/boot/grub");
-	    break;
-
-	  case 'h':
-	    usage (0);
-	    break;
-
-	  case 'p':
-	    if (prefix)
-	      free (prefix);
-	    prefix = xstrdup (optarg);
-	    break;
-
-	  case 'V':
-	    printf ("grub-mkimage (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
-	    return 0;
-
-	  case 'v':
-	    verbosity++;
-	    break;
-
-	  default:
-	    usage (1);
-	    break;
-	  }
-    }
-
-  if (output)
-    {
-      fp = fopen (output, "wb");
-      if (! fp)
-	grub_util_error ("cannot open %s", output);
-    }
-
-  generate_image (dir ? : GRUB_LIBDIR,
-		  prefix ? : DEFAULT_DIRECTORY, fp,
-		  argv + optind, memdisk);
-
-  fclose (fp);
-
-  if (dir)
-    free (dir);
-
-  return 0;
-}

From 82da2062d83a2ce5a7c7657c910a051cc47ba809 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 13 Feb 2010 15:25:37 +0100
Subject: [PATCH 0510/1628] 2010-02-13  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* util/grub-mkrawimage.c (generate_image): Add forgotten ALIGN_UP.
---
 ChangeLog              | 4 ++++
 util/grub-mkrawimage.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 70353ec0c..ddbccd1be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkrawimage.c (generate_image): Add forgotten ALIGN_UP.
+
 2010-02-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Pass SIMPLE framebuffer size in bytes and not 64K blocks.
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 2316479e9..5e8948c27 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -142,7 +142,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
     }
 
   for (p = path_list; p; p = p->next)
-    total_module_size += (grub_util_get_image_size (p->name)
+    total_module_size += (ALIGN_UP (grub_util_get_image_size (p->name), 4)
 			  + sizeof (struct grub_module_header));
 
   grub_util_info ("the total module size is 0x%x", total_module_size);

From b274d734f3c82897f7a6337b0a2d055f29421e20 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 13 Feb 2010 15:40:13 +0100
Subject: [PATCH 0511/1628] 2010-02-13  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Properly create cross-endian images.

	* include/grub/types.h (grub_host_to_target_addr): New macro
	* util/grub-mkrawimage.c (generate_image): Add missing host_to_target.
---
 ChangeLog              |  7 +++++++
 include/grub/types.h   |  6 ++++++
 util/grub-mkrawimage.c | 14 +++++++-------
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ddbccd1be..0d84d9340 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Properly create cross-endian images.
+
+	* include/grub/types.h (grub_host_to_target_addr): New macro
+	* util/grub-mkrawimage.c (generate_image): Add missing host_to_target.
+
 2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkrawimage.c (generate_image): Add forgotten ALIGN_UP.
diff --git a/include/grub/types.h b/include/grub/types.h
index 93174b424..9eaafd0c1 100644
--- a/include/grub/types.h
+++ b/include/grub/types.h
@@ -223,4 +223,10 @@ static inline grub_uint64_t grub_swap_bytes64(grub_uint64_t x)
 # endif
 #endif /* ! WORDS_BIGENDIAN */
 
+#if GRUB_TARGET_SIZEOF_VOID_P == 8
+#  define grub_host_to_target_addr(x) grub_host_to_target64(x)
+#else
+#  define grub_host_to_target_addr(x) grub_host_to_target32(x)
+#endif
+
 #endif /* ! GRUB_TYPES_HEADER */
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 5e8948c27..023854c0c 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -157,9 +157,9 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
   /* Fill in the grub_module_info structure.  */
   modinfo = (struct grub_module_info *) (kernel_img + kernel_size);
   memset (modinfo, 0, sizeof (struct grub_module_info));
-  modinfo->magic = GRUB_MODULE_MAGIC;
-  modinfo->offset = sizeof (struct grub_module_info);
-  modinfo->size = total_module_size;
+  modinfo->magic = grub_host_to_target32 (GRUB_MODULE_MAGIC);
+  modinfo->offset = grub_host_to_target_addr (sizeof (struct grub_module_info));
+  modinfo->size = grub_host_to_target_addr (total_module_size);
 
   offset = kernel_size + sizeof (struct grub_module_info);
   for (p = path_list; p; p = p->next)
@@ -172,7 +172,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
       header = (struct grub_module_header *) (kernel_img + offset);
       memset (header, 0, sizeof (struct grub_module_header));
-      header->type = OBJ_TYPE_ELF;
+      header->type = grub_host_to_target32 (OBJ_TYPE_ELF);
       header->size = grub_host_to_target32 (mod_size + sizeof (*header));
       offset += sizeof (*header);
       memset (kernel_img + offset + orig_size, 0, mod_size - orig_size);
@@ -187,7 +187,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
       header = (struct grub_module_header *) (kernel_img + offset);
       memset (header, 0, sizeof (struct grub_module_header));
-      header->type = OBJ_TYPE_MEMDISK;
+      header->type = grub_host_to_target32 (OBJ_TYPE_MEMDISK);
       header->size = grub_host_to_target32 (memdisk_size + sizeof (*header));
       offset += sizeof (*header);
 
@@ -201,7 +201,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
       header = (struct grub_module_header *) (kernel_img + offset);
       memset (header, 0, sizeof (struct grub_module_header));
-      header->type = OBJ_TYPE_FONT;
+      header->type = grub_host_to_target32 (OBJ_TYPE_FONT);
       header->size = grub_host_to_target32 (font_size + sizeof (*header));
       offset += sizeof (*header);
 
@@ -215,7 +215,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
       header = (struct grub_module_header *) (kernel_img + offset);
       memset (header, 0, sizeof (struct grub_module_header));
-      header->type = OBJ_TYPE_CONFIG;
+      header->type = grub_host_to_target32 (OBJ_TYPE_CONFIG);
       header->size = grub_host_to_target32 (config_size + sizeof (*header));
       offset += sizeof (*header);
 

From da278c4d348bbc0ce2c3e812282c6f82c234b08d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 13 Feb 2010 15:54:27 +0100
Subject: [PATCH 0512/1628] 2010-02-13  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Properly align 64-bit targets.

	* util/grub-mkrawimage.c (ALIGN_ADDR): New macro.
	(generate_image): Use ALIGN_ADDR.
---
 ChangeLog              |  7 +++++++
 util/grub-mkrawimage.c | 12 +++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0d84d9340..9591c45a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Properly align 64-bit targets.
+
+	* util/grub-mkrawimage.c (ALIGN_ADDR): New macro.
+	(generate_image): Use ALIGN_ADDR.
+
 2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Properly create cross-endian images.
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 023854c0c..4ed29744f 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -41,6 +41,8 @@
 
 #include "progname.h"
 
+#define ALIGN_ADDR(x) (ALIGN_UP((x), GRUB_TARGET_SIZEOF_VOID_P))
+
 #ifdef ENABLE_LZMA
 #include <grub/lib/LzmaEnc.h>
 
@@ -129,20 +131,20 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
   if (font_path)
     {
-      font_size = ALIGN_UP(grub_util_get_image_size (font_path), 4);
+      font_size = ALIGN_ADDR (grub_util_get_image_size (font_path));
       total_module_size += font_size + sizeof (struct grub_module_header);
     }
 
   if (config_path)
     {
       config_size_pure = grub_util_get_image_size (config_path) + 1;
-      config_size = ALIGN_UP(config_size_pure, 4);
+      config_size = ALIGN_ADDR (config_size_pure);
       grub_util_info ("the size of config file is 0x%x", config_size);
       total_module_size += config_size + sizeof (struct grub_module_header);
     }
 
   for (p = path_list; p; p = p->next)
-    total_module_size += (ALIGN_UP (grub_util_get_image_size (p->name), 4)
+    total_module_size += (ALIGN_ADDR (grub_util_get_image_size (p->name))
 			  + sizeof (struct grub_module_header));
 
   grub_util_info ("the total module size is 0x%x", total_module_size);
@@ -168,7 +170,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       size_t mod_size, orig_size;
 
       orig_size = grub_util_get_image_size (p->name);
-      mod_size = ALIGN_UP(orig_size, 4);
+      mod_size = ALIGN_ADDR (orig_size);
 
       header = (struct grub_module_header *) (kernel_img + offset);
       memset (header, 0, sizeof (struct grub_module_header));
@@ -339,7 +341,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       Elf32_Phdr *phdr;
       grub_uint32_t target_addr;
 
-      program_size = ALIGN_UP (core_size, 4);
+      program_size = ALIGN_ADDR (core_size);
 
       elf_img = xmalloc (program_size + sizeof (*ehdr) + sizeof (*phdr));
       memset (elf_img, 0, program_size + sizeof (*ehdr) + sizeof (*phdr));

From bdca260795fdc2b58a7ca83d46a9ce97aedbd7e4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 13 Feb 2010 15:57:42 +0100
Subject: [PATCH 0513/1628] 2010-02-13  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* util/grub-mkrawimage.c (main): Call set_program_name.
---
 ChangeLog              | 4 ++++
 util/grub-mkrawimage.c | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9591c45a9..760ac720c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkrawimage.c (main): Call set_program_name.
+
 2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Properly align 64-bit targets.
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 4ed29744f..83bb51c02 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -476,6 +476,8 @@ main (int argc, char *argv[])
   grub_platform_image_format_t format = GRUB_PLATFORM_IMAGE_DEFAULT;
 #endif
 
+  set_program_name (argv[0]);
+
   grub_util_init_nls ();
 
   while (1)

From ca62070b698ab3acc91eb1594b77d404dd1c1546 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 13 Feb 2010 16:13:28 +0100
Subject: [PATCH 0514/1628] 2010-02-13  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Fix over-4GiB seek on sparc64.

	* include/grub/ieee1275/ieee1275.h (grub_ieee1275_seek):
	Replace pos_i and pos_lo with pos. All users updated.
	* include/grub/powerpc/ieee1275/ieee1275.h (GRUB_IEEE1275_CELL_SIZEOF):
	New constant.
	* include/grub/sparc64/ieee1275/ieee1275.h (GRUB_IEEE1275_CELL_SIZEOF):
	Likewise.
	* kern/ieee1275/ieee1275.c (grub_ieee1275_seek): Split pos into pos_hi
	and pos_lo.
---
 ChangeLog                                | 13 +++++++++++++
 disk/ieee1275/ofdisk.c                   |  2 +-
 include/grub/ieee1275/ieee1275.h         |  2 +-
 include/grub/powerpc/ieee1275/ieee1275.h |  1 +
 include/grub/sparc64/ieee1275/ieee1275.h |  1 +
 kern/ieee1275/ieee1275.c                 | 15 +++++++++++----
 6 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 760ac720c..6f1820d5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Fix over-4GiB seek on sparc64.
+
+	* include/grub/ieee1275/ieee1275.h (grub_ieee1275_seek):
+	Replace pos_i and pos_lo with pos. All users updated.
+	* include/grub/powerpc/ieee1275/ieee1275.h (GRUB_IEEE1275_CELL_SIZEOF):
+	New constant.
+	* include/grub/sparc64/ieee1275/ieee1275.h (GRUB_IEEE1275_CELL_SIZEOF):
+	Likewise.
+	* kern/ieee1275/ieee1275.c (grub_ieee1275_seek): Split pos into pos_hi
+	and pos_lo.
+
 2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkrawimage.c (main): Call set_program_name.
diff --git a/disk/ieee1275/ofdisk.c b/disk/ieee1275/ofdisk.c
index 238cff33d..0adedf33f 100644
--- a/disk/ieee1275/ofdisk.c
+++ b/disk/ieee1275/ofdisk.c
@@ -241,7 +241,7 @@ grub_ofdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
   pos = sector * 512UL;
 
   grub_ieee1275_seek ((grub_ieee1275_ihandle_t) (unsigned long) disk->data,
-		      (int) (pos >> 32), (int) pos & 0xFFFFFFFFUL, &status);
+		      pos, &status);
   if (status < 0)
     return grub_error (GRUB_ERR_READ_ERROR,
 		       "seek error, can't seek block %llu",
diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
index 8b31e32e2..a852a7b61 100644
--- a/include/grub/ieee1275/ieee1275.h
+++ b/include/grub/ieee1275/ieee1275.h
@@ -138,7 +138,7 @@ int EXPORT_FUNC(grub_ieee1275_read) (grub_ieee1275_ihandle_t ihandle,
 				     void *buffer, grub_size_t len,
 				     grub_ssize_t *actualp);
 int EXPORT_FUNC(grub_ieee1275_seek) (grub_ieee1275_ihandle_t ihandle,
-				     int pos_hi, int pos_lo,
+				     grub_disk_addr_t pos,
 				     grub_ssize_t *result);
 int EXPORT_FUNC(grub_ieee1275_peer) (grub_ieee1275_phandle_t node,
 				     grub_ieee1275_phandle_t *result);
diff --git a/include/grub/powerpc/ieee1275/ieee1275.h b/include/grub/powerpc/ieee1275/ieee1275.h
index 7e93055c9..3c7683fad 100644
--- a/include/grub/powerpc/ieee1275/ieee1275.h
+++ b/include/grub/powerpc/ieee1275/ieee1275.h
@@ -22,6 +22,7 @@
 
 #include <grub/types.h>
 
+#define GRUB_IEEE1275_CELL_SIZEOF 4
 typedef grub_uint32_t grub_ieee1275_cell_t;
 
 #endif /* ! GRUB_IEEE1275_MACHINE_HEADER */
diff --git a/include/grub/sparc64/ieee1275/ieee1275.h b/include/grub/sparc64/ieee1275/ieee1275.h
index b25e98a6d..1619510fb 100644
--- a/include/grub/sparc64/ieee1275/ieee1275.h
+++ b/include/grub/sparc64/ieee1275/ieee1275.h
@@ -22,6 +22,7 @@
 
 #include <grub/types.h>
 
+#define GRUB_IEEE1275_CELL_SIZEOF 8
 typedef grub_uint64_t grub_ieee1275_cell_t;
 
 /* Encoding of 'mode' argument to grub_ieee1275_map_physical() */
diff --git a/kern/ieee1275/ieee1275.c b/kern/ieee1275/ieee1275.c
index 8a5773c23..9e2919172 100644
--- a/kern/ieee1275/ieee1275.c
+++ b/kern/ieee1275/ieee1275.c
@@ -284,8 +284,8 @@ grub_ieee1275_read (grub_ieee1275_ihandle_t ihandle, void *buffer,
 }
 
 int
-grub_ieee1275_seek (grub_ieee1275_ihandle_t ihandle, int pos_hi,
-		    int pos_lo, grub_ssize_t *result)
+grub_ieee1275_seek (grub_ieee1275_ihandle_t ihandle, grub_disk_addr_t pos,
+		    grub_ssize_t *result)
 {
   struct write_args
   {
@@ -299,8 +299,15 @@ grub_ieee1275_seek (grub_ieee1275_ihandle_t ihandle, int pos_hi,
 
   INIT_IEEE1275_COMMON (&args.common, "seek", 3, 1);
   args.ihandle = ihandle;
-  args.pos_hi = (grub_ieee1275_cell_t) pos_hi;
-  args.pos_lo = (grub_ieee1275_cell_t) pos_lo;
+  /* To prevent stupid gcc warning.  */
+#if GRUB_IEEE1275_CELL_SIZEOF >= 8
+  args.pos_hi = 0;
+  args.pos_lo = pos;
+#else
+  args.pos_hi = (grub_ieee1275_cell_t) (pos >> (8 * GRUB_IEEE1275_CELL_SIZEOF));
+  args.pos_lo = (grub_ieee1275_cell_t) 
+    (pos & ((1ULL << (8 * GRUB_IEEE1275_CELL_SIZEOF)) - 1));
+#endif
 
   if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
     return -1;

From e0128bbdc4243cb676156cca5c1a31f216d562f6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 13 Feb 2010 16:16:40 +0100
Subject: [PATCH 0515/1628] 2010-02-13  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Remove excessively
	verbose dprintf.
---
 ChangeLog              | 5 +++++
 disk/ieee1275/ofdisk.c | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6f1820d5e..6690f7f81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Remove excessively
+	verbose dprintf.
+
 2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix over-4GiB seek on sparc64.
diff --git a/disk/ieee1275/ofdisk.c b/disk/ieee1275/ofdisk.c
index 0adedf33f..05c0dd04d 100644
--- a/disk/ieee1275/ofdisk.c
+++ b/disk/ieee1275/ofdisk.c
@@ -234,10 +234,6 @@ grub_ofdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
   grub_ssize_t status, actual;
   unsigned long long pos;
 
-  grub_dprintf ("disk",
-		"Reading handle %p: sector 0x%llx, size 0x%lx, buf %p.\n",
-		(void *) disk->data, (long long) sector, (long) size, buf);
-
   pos = sector * 512UL;
 
   grub_ieee1275_seek ((grub_ieee1275_ihandle_t) (unsigned long) disk->data,

From 17cec782c4463f8c92d130eca1f0e2439803c1e2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 13 Feb 2010 16:23:20 +0100
Subject: [PATCH 0516/1628] 2010-02-13  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* kern/sparc64/ieee1275/crt0.S (codestart): Move modules backwards.
---
 ChangeLog                    | 4 ++++
 kern/sparc64/ieee1275/crt0.S | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6690f7f81..47da5ccf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/sparc64/ieee1275/crt0.S (codestart): Move modules backwards.
+
 2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* disk/ieee1275/ofdisk.c (grub_ofdisk_read): Remove excessively
diff --git a/kern/sparc64/ieee1275/crt0.S b/kern/sparc64/ieee1275/crt0.S
index 4e67cbc19..3749f3005 100644
--- a/kern/sparc64/ieee1275/crt0.S
+++ b/kern/sparc64/ieee1275/crt0.S
@@ -53,12 +53,16 @@ codestart:
 	or	%o3, %lo(_end), %o3
 	sethi	%hi(grub_total_module_size), %o4
 	lduw	[%o4 + %lo(grub_total_module_size)], %o4
+	add     %o2, %o4, %o2
+	add     %o3, %o4, %o3
+	sub	%o2, 4, %o2
+	sub	%o3, 4, %o3
 1:	lduw	[%o2], %o5
 	stw	%o5, [%o3]
 	subcc	%o4, 4, %o4
-	add	%o2, 4, %o2
+	sub	%o2, 4, %o2
 	bne,pt	%icc, 1b
-	 add	%o3, 4, %o3
+	  sub	%o3, 4, %o3
 
 	/* Now it's safe to clear out the BSS.  */
 	sethi	%hi(__bss_start), %o2

From a49217cff7157395f3770f84fd5b1f01d107cce3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 13 Feb 2010 16:26:50 +0100
Subject: [PATCH 0517/1628] aout image support

---
 boot/sparc64/ieee1275/diskboot.S       |   2 +-
 conf/sparc64-ieee1275.rmk              |   2 +-
 include/grub/aout.h                    |   5 +
 include/grub/kernel.h                  |   2 +
 include/grub/sparc64/ieee1275/kernel.h |  13 +++
 kern/main.c                            |  19 ++++
 kern/mips/yeeloong/init.c              |  28 +-----
 kern/sparc64/ieee1275/crt0.S           |   2 +-
 kern/sparc64/ieee1275/init.c           |   2 +-
 util/grub-mkrawimage.c                 | 128 +++++++++++++++----------
 10 files changed, 122 insertions(+), 81 deletions(-)

diff --git a/boot/sparc64/ieee1275/diskboot.S b/boot/sparc64/ieee1275/diskboot.S
index 68ed0eee0..5016bf9e0 100644
--- a/boot/sparc64/ieee1275/diskboot.S
+++ b/boot/sparc64/ieee1275/diskboot.S
@@ -129,7 +129,7 @@ bootit:
 	 mov	NOTIFICATION_DONE_LEN, %o3
 	sethi	%hi(GRUB_BOOT_MACHINE_IMAGE_ADDRESS), %o2
 	jmpl	%o2 + %lo(GRUB_BOOT_MACHINE_IMAGE_ADDRESS), %o7
-	 mov	CIF_REG, %o0
+	 mov	CIF_REG, %o4
 1:	ba,a	1b
 
 lastlist:
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 6a91b40ee..4b51a5c3e 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -48,7 +48,7 @@ kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c	\
 	symlist.c kern/$(target_cpu)/cache.S
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,0x200000,-Bstatic,-melf64_sparc -static-libgcc -lgcc
+kernel_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,0x4400,-Bstatic,-melf64_sparc -static-libgcc -lgcc
 kernel_img_FORMAT = binary
 
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
diff --git a/include/grub/aout.h b/include/grub/aout.h
index 04e85f8b0..f962a97b3 100644
--- a/include/grub/aout.h
+++ b/include/grub/aout.h
@@ -102,6 +102,7 @@ union grub_aout_header
 #define AOUT_MID_I386		134	/* i386 BSD binary */
 #define AOUT_MID_SPARC		138	/* sparc */
 #define	AOUT_MID_HP200		200	/* hp200 (68010) BSD binary */
+#define	AOUT_MID_SUN            0x103
 #define	AOUT_MID_HP300		300	/* hp300 (68020+68881) BSD binary */
 #define	AOUT_MID_HPUX		0x20C	/* hp200/300 HP-UX binary */
 #define	AOUT_MID_HPUX800	0x20B	/* hp800 HP-UX binary */
@@ -114,10 +115,14 @@ union grub_aout_header
 #define AOUT_GETMID(header) ((header).a_midmag >> 16) & 0x03ff)
 #define AOUT_GETFLAG(header) ((header).a_midmag >> 26) & 0x3f)
 
+#ifndef GRUB_UTIL
+
 int EXPORT_FUNC(grub_aout_get_type) (union grub_aout_header *header);
 
 grub_err_t EXPORT_FUNC(grub_aout_load) (grub_file_t file, int offset,
                                         grub_addr_t load_addr, int load_size,
                                         grub_addr_t bss_end_addr);
 
+#endif
+
 #endif /* ! GRUB_AOUT_HEADER */
diff --git a/include/grub/kernel.h b/include/grub/kernel.h
index 9586a90b9..bf52ffcb4 100644
--- a/include/grub/kernel.h
+++ b/include/grub/kernel.h
@@ -59,6 +59,8 @@ extern grub_addr_t grub_arch_modules_addr (void);
 
 extern void EXPORT_FUNC(grub_module_iterate) (int (*hook) (struct grub_module_header *));
 
+grub_addr_t grub_modules_get_end (void);
+
 /* The start point of the C code.  */
 void grub_main (void);
 
diff --git a/include/grub/sparc64/ieee1275/kernel.h b/include/grub/sparc64/ieee1275/kernel.h
index 8eb1671a8..78e039bc5 100644
--- a/include/grub/sparc64/ieee1275/kernel.h
+++ b/include/grub/sparc64/ieee1275/kernel.h
@@ -41,8 +41,21 @@
 
 #define GRUB_KERNEL_MACHINE_RAW_SIZE                   0
 
+#define GRUB_PLATFORM_IMAGE_FORMATS     "raw, aout"
+#define GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT     "raw"
+
+#define GRUB_PLATFORM_IMAGE_DEFAULT GRUB_PLATFORM_IMAGE_RAW
+
 #ifndef ASM_FILE
 
+typedef enum {
+  GRUB_PLATFORM_IMAGE_RAW,
+  GRUB_PLATFORM_IMAGE_AOUT
+}
+  grub_platform_image_format_t;
+#define GRUB_PLATFORM_IMAGE_RAW GRUB_PLATFORM_IMAGE_RAW
+#define GRUB_PLATFORM_IMAGE_AOUT GRUB_PLATFORM_IMAGE_AOUT
+
 #include <grub/symbol.h>
 #include <grub/types.h>
 
diff --git a/kern/main.c b/kern/main.c
index 456105378..54235821d 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -53,6 +53,25 @@ grub_module_iterate (int (*hook) (struct grub_module_header *header))
     }
 }
 
+/* This is actualy platform-independant but used only on yeeloong and sparc.  */
+#if defined (GRUB_MACHINE_MIPS_YEELOONG) || defined (GRUB_MACHINE_SPARC64)
+grub_addr_t
+grub_modules_get_end (void)
+{
+  struct grub_module_info *modinfo;
+  grub_addr_t modbase;
+
+  modbase = grub_arch_modules_addr ();
+  modinfo = (struct grub_module_info *) modbase;
+
+  /* Check if there are any modules.  */
+  if ((modinfo == 0) || modinfo->magic != GRUB_MODULE_MAGIC)
+    return modbase;
+
+  return modbase + modinfo->size;
+}
+#endif
+
 /* Load all modules in core.  */
 static void
 grub_load_modules (void)
diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 14e8a39a2..d148d08dc 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -63,35 +63,13 @@ grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
   return GRUB_ERR_NONE;
 }
 
-
-static void *
-get_modules_end (void)
-{
-  struct grub_module_info *modinfo;
-  struct grub_module_header *header;
-  grub_addr_t modbase;
-
-  modbase = grub_arch_modules_addr ();
-  modinfo = (struct grub_module_info *) modbase;
-
-  /* Check if there are any modules.  */
-  if ((modinfo == 0) || modinfo->magic != GRUB_MODULE_MAGIC)
-    return modinfo;
-
-  for (header = (struct grub_module_header *) (modbase + modinfo->offset);
-       header < (struct grub_module_header *) (modbase + modinfo->size);
-       header = (struct grub_module_header *) ((char *) header + header->size));
-
-  return header;
-}
-
 void
 grub_machine_init (void)
 {
-  void *modend;
-  modend = get_modules_end ();
+  grub_addr_t modend;
+  modend = grub_modules_get_end ();
   grub_mm_init_region (modend, (grub_arch_memsize << 20)
-		       - (((grub_addr_t) modend) - GRUB_ARCH_LOWMEMVSTART));
+		       - (modend - GRUB_ARCH_LOWMEMVSTART));
   /* FIXME: use upper memory as well.  */
   grub_install_get_time_ms (grub_rtc_get_time_ms);
 
diff --git a/kern/sparc64/ieee1275/crt0.S b/kern/sparc64/ieee1275/crt0.S
index 4e67cbc19..1dc65dc64 100644
--- a/kern/sparc64/ieee1275/crt0.S
+++ b/kern/sparc64/ieee1275/crt0.S
@@ -24,7 +24,7 @@
 	.globl	_start
 _start:
 	ba	codestart
-	 nop
+	 mov  %o4, %o0
 
 	. = EXT_C(_start) + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
 
diff --git a/kern/sparc64/ieee1275/init.c b/kern/sparc64/ieee1275/init.c
index 115328f40..5827be658 100644
--- a/kern/sparc64/ieee1275/init.c
+++ b/kern/sparc64/ieee1275/init.c
@@ -104,7 +104,7 @@ grub_machine_set_prefix (void)
 static void
 grub_heap_init (void)
 {
-  grub_mm_init_region ((void *)(long)0x4000UL, 0x200000 - 0x4000);
+  grub_mm_init_region ((void *) grub_modules_get_end (), 0x200000);
 }
 
 static void
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index e17446f78..26ccd7d94 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -23,6 +23,7 @@
 #include <grub/machine/kernel.h>
 #include <grub/machine/memory.h>
 #include <grub/elf.h>
+#include <grub/aout.h>
 #include <grub/i18n.h>
 #include <grub/kernel.h>
 #include <grub/disk.h>
@@ -230,6 +231,36 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
   grub_util_info ("the core size is 0x%x", core_size);
 
+#ifdef GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
+  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE))
+    = grub_host_to_target32 (total_module_size);
+#endif
+  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE))
+    = grub_host_to_target32 (kernel_size);
+#ifdef GRUB_KERNEL_MACHINE_COMPRESSED_SIZE
+  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_COMPRESSED_SIZE))
+    = grub_host_to_target32 (core_size - GRUB_KERNEL_MACHINE_RAW_SIZE);
+#endif
+
+#if defined(GRUB_KERNEL_MACHINE_INSTALL_DOS_PART) && defined(GRUB_KERNEL_MACHINE_INSTALL_BSD_PART)
+  /* If we included a drive in our prefix, let GRUB know it doesn't have to
+     prepend the drive told by BIOS.  */
+  if (prefix[0] == '(')
+    {
+      *((grub_int32_t *) (core_img + GRUB_KERNEL_MACHINE_INSTALL_DOS_PART))
+	= grub_host_to_target32 (-2);
+      *((grub_int32_t *) (core_img + GRUB_KERNEL_MACHINE_INSTALL_BSD_PART))
+	= grub_host_to_target32 (-2);
+    }
+#endif
+
+#ifdef GRUB_MACHINE_PCBIOS
+  if (GRUB_KERNEL_MACHINE_LINK_ADDR + core_size > GRUB_MEMORY_MACHINE_UPPER)
+    grub_util_error (_("core image is too big (%p > %p)"),
+ 		     GRUB_KERNEL_MACHINE_LINK_ADDR + core_size,
+		     GRUB_MEMORY_MACHINE_UPPER);
+#endif
+
 #if defined(GRUB_MACHINE_PCBIOS)
   {
     unsigned num;
@@ -299,62 +330,50 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
     free (boot_path);
   }
 #elif defined (GRUB_MACHINE_SPARC64)
-  {
-    unsigned int num;
-    char *boot_path, *boot_img;
-    size_t boot_size;
-
-    num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
-    num <<= GRUB_DISK_SECTOR_BITS;
-
-    boot_path = grub_util_get_path (dir, "diskboot.img");
-    boot_size = grub_util_get_image_size (boot_path);
-    if (boot_size != GRUB_DISK_SECTOR_SIZE)
-      grub_util_error ("diskboot.img is not one sector size");
-
-    boot_img = grub_util_read_image (boot_path);
-
-    *((grub_uint32_t *) (boot_img + GRUB_DISK_SECTOR_SIZE
-			 - GRUB_BOOT_MACHINE_LIST_SIZE + 8))
-      = grub_host_to_target32 (num);
-
-    grub_util_write_image (boot_img, boot_size, out);
-    free (boot_img);
-    free (boot_path);
-  }
-#endif
-
-#ifdef GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
-  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE))
-    = grub_host_to_target32 (total_module_size);
-#endif
-  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE))
-    = grub_host_to_target32 (kernel_size);
-#ifdef GRUB_KERNEL_MACHINE_COMPRESSED_SIZE
-  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_COMPRESSED_SIZE))
-    = grub_host_to_target32 (core_size - GRUB_KERNEL_MACHINE_RAW_SIZE);
-#endif
-
-#if defined(GRUB_KERNEL_MACHINE_INSTALL_DOS_PART) && defined(GRUB_KERNEL_MACHINE_INSTALL_BSD_PART)
-  /* If we included a drive in our prefix, let GRUB know it doesn't have to
-     prepend the drive told by BIOS.  */
-  if (prefix[0] == '(')
+  if (format == GRUB_PLATFORM_IMAGE_AOUT)
     {
-      *((grub_int32_t *) (core_img + GRUB_KERNEL_MACHINE_INSTALL_DOS_PART))
-	= grub_host_to_target32 (-2);
-      *((grub_int32_t *) (core_img + GRUB_KERNEL_MACHINE_INSTALL_BSD_PART))
-	= grub_host_to_target32 (-2);
+      void *aout_img;
+      size_t aout_size;
+      struct grub_aout32_header *aout_head;
+
+      aout_size = core_size + sizeof (*aout_head);
+      aout_img = xmalloc (aout_size);
+      aout_head = aout_img;
+      aout_head->a_midmag = grub_host_to_target32 ((AOUT_MID_SUN << 16)
+						   | AOUT32_OMAGIC);
+      aout_head->a_text = grub_host_to_target32 (core_size);
+      aout_head->a_entry = grub_host_to_target32 (0x4400);
+      memcpy (aout_img + sizeof (*aout_head), core_img, core_size);
+
+      free (core_img);
+      core_img = aout_img;
+      core_size = aout_size;
     }
-#endif
+  else
+    {
+      unsigned int num;
+      char *boot_path, *boot_img;
+      size_t boot_size;
 
-#ifdef GRUB_MACHINE_PCBIOS
-  if (GRUB_KERNEL_MACHINE_LINK_ADDR + core_size > GRUB_MEMORY_MACHINE_UPPER)
-    grub_util_error (_("core image is too big (%p > %p)"),
- 		     GRUB_KERNEL_MACHINE_LINK_ADDR + core_size,
-		     GRUB_MEMORY_MACHINE_UPPER);
-#endif
+      num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
+      num <<= GRUB_DISK_SECTOR_BITS;
 
-#if defined(GRUB_MACHINE_MIPS)
+      boot_path = grub_util_get_path (dir, "diskboot.img");
+      boot_size = grub_util_get_image_size (boot_path);
+      if (boot_size != GRUB_DISK_SECTOR_SIZE)
+	grub_util_error ("diskboot.img is not one sector size");
+
+      boot_img = grub_util_read_image (boot_path);
+
+      *((grub_uint32_t *) (boot_img + GRUB_DISK_SECTOR_SIZE
+			   - GRUB_BOOT_MACHINE_LIST_SIZE + 8))
+	= grub_host_to_target32 (num);
+
+      grub_util_write_image (boot_img, boot_size, out);
+      free (boot_img);
+      free (boot_path);
+    }
+#elif defined(GRUB_MACHINE_MIPS)
   if (format == GRUB_PLATFORM_IMAGE_ELF)
     {
       char *elf_img;
@@ -527,6 +546,11 @@ main (int argc, char *argv[])
 	    if (strcmp (optarg, "elf") == 0)
 	      format = GRUB_PLATFORM_IMAGE_ELF;
 	    else 
+#endif
+#ifdef GRUB_PLATFORM_IMAGE_AOUT
+	    if (strcmp (optarg, "aout") == 0)
+	      format = GRUB_PLATFORM_IMAGE_AOUT;
+	    else 
 #endif
 	      usage (1);
 	    break;

From 8c6052cea547d2d6960d22b19b75a75870cb98bc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 13 Feb 2010 16:30:22 +0100
Subject: [PATCH 0518/1628] 2010-02-13  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* loader/sparc64/ieee1275/linux.c (alloc_phys): Correct bounds checking.
---
 ChangeLog                       |  4 ++++
 loader/sparc64/ieee1275/linux.c | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 47da5ccf2..c9f64df01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/sparc64/ieee1275/linux.c (alloc_phys): Correct bounds checking.
+
 2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/sparc64/ieee1275/crt0.S (codestart): Move modules backwards.
diff --git a/loader/sparc64/ieee1275/linux.c b/loader/sparc64/ieee1275/linux.c
index 42bae6bb8..51d82ddcc 100644
--- a/loader/sparc64/ieee1275/linux.c
+++ b/loader/sparc64/ieee1275/linux.c
@@ -193,20 +193,20 @@ alloc_phys (grub_addr_t size)
       return 0;
 
     addr = align_addr (addr, FOUR_MB);
-    if (addr >= end)
+    if (addr + size >= end)
       return 0;
 
     if (addr >= grub_phys_start && addr < grub_phys_end)
       {
 	addr = align_addr (grub_phys_end, FOUR_MB);
-	if (addr >= end)
+	if (addr + size >= end)
 	  return 0;
       }
     if ((addr + size) >= grub_phys_start
 	&& (addr + size) < grub_phys_end)
       {
 	addr = align_addr (grub_phys_end, FOUR_MB);
-	if (addr >= end)
+	if (addr + size >= end)
 	  return 0;
       }
 
@@ -217,14 +217,14 @@ alloc_phys (grub_addr_t size)
 	if (addr >= linux_paddr && addr < linux_end)
 	  {
 	    addr = linux_end;
-	    if (addr >= end)
+	    if (addr + size >= end)
 	      return 0;
 	  }
 	if ((addr + size) >= linux_paddr
 	    && (addr + size) < linux_end)
 	  {
 	    addr = linux_end;
-	    if (addr >= end)
+	    if (addr + size >= end)
 	      return 0;
 	  }
       }

From 2c0fcc366632cbbf9bf14a6ded41088a0a72f4df Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 13 Feb 2010 16:32:24 +0100
Subject: [PATCH 0519/1628] 2010-02-13  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* loader/sparc64/ieee1275/linux.c (align_addr): Remove.
	(alloc_phys): Use ALIGN_UP instead of align_addr.
---
 ChangeLog                       |  5 +++++
 loader/sparc64/ieee1275/linux.c | 14 ++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c9f64df01..01067182f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/sparc64/ieee1275/linux.c (align_addr): Remove.
+	(alloc_phys): Use ALIGN_UP instead of align_addr.
+
 2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/sparc64/ieee1275/linux.c (alloc_phys): Correct bounds checking.
diff --git a/loader/sparc64/ieee1275/linux.c b/loader/sparc64/ieee1275/linux.c
index 51d82ddcc..65f334ab3 100644
--- a/loader/sparc64/ieee1275/linux.c
+++ b/loader/sparc64/ieee1275/linux.c
@@ -173,12 +173,6 @@ grub_linux_unload (void)
 
 #define FOUR_MB	(4 * 1024 * 1024)
 
-static grub_addr_t
-align_addr(grub_addr_t val, grub_addr_t align)
-{
-  return (val + (align - 1)) & ~(align - 1);
-}
-
 static grub_addr_t
 alloc_phys (grub_addr_t size)
 {
@@ -192,27 +186,27 @@ alloc_phys (grub_addr_t size)
     if (type != 1)
       return 0;
 
-    addr = align_addr (addr, FOUR_MB);
+    addr = ALIGN_UP (addr, FOUR_MB);
     if (addr + size >= end)
       return 0;
 
     if (addr >= grub_phys_start && addr < grub_phys_end)
       {
-	addr = align_addr (grub_phys_end, FOUR_MB);
+	addr = ALIGN_UP (grub_phys_end, FOUR_MB);
 	if (addr + size >= end)
 	  return 0;
       }
     if ((addr + size) >= grub_phys_start
 	&& (addr + size) < grub_phys_end)
       {
-	addr = align_addr (grub_phys_end, FOUR_MB);
+	addr = ALIGN_UP (grub_phys_end, FOUR_MB);
 	if (addr + size >= end)
 	  return 0;
       }
 
     if (loaded)
       {
-	grub_addr_t linux_end = align_addr (linux_paddr + linux_size, FOUR_MB);
+	grub_addr_t linux_end = ALIGN_UP (linux_paddr + linux_size, FOUR_MB);
 
 	if (addr >= linux_paddr && addr < linux_end)
 	  {

From 69e137e819725cd86617aa3de826c4b19f390f5a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 13 Feb 2010 16:40:29 +0100
Subject: [PATCH 0520/1628] 2010-02-13  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Macroify
	constants.
---
 ChangeLog                 |  5 +++++
 term/ieee1275/ofconsole.c | 18 +++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 01067182f..ff5621a56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Macroify
+	constants.
+
 2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/sparc64/ieee1275/linux.c (align_addr): Remove.
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index 51dca7a53..6073e25d2 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -165,7 +165,7 @@ grub_ofconsole_readkey (int *key)
 	  return 1;
 	}
 
-      if (c != 91)
+      if (c != '[')
 	return 0;
 
       grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
@@ -174,21 +174,21 @@ grub_ofconsole_readkey (int *key)
 
       switch (c)
 	{
-	case 65:
+	case 'A':
 	  /* Up: Ctrl-p.  */
-	  c = 16;
+	  c = GRUB_TERM_UP;
 	  break;
-	case 66:
+	case 'B':
 	  /* Down: Ctrl-n.  */
-	  c = 14;
+	  c = GRUB_TERM_DOWN;
 	  break;
-	case 67:
+	case 'C':
 	  /* Right: Ctrl-f.  */
-	  c = 6;
+	  c = GRUB_TERM_RIGHT;
 	  break;
-	case 68:
+	case 'D':
 	  /* Left: Ctrl-b.  */
-	  c = 2;
+	  c = GRUB_TERM_LEFT;
 	  break;
 	}
     }

From 5b59a4e367fc4510e0ae4f4181c0c71841233783 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 13 Feb 2010 16:44:34 +0100
Subject: [PATCH 0521/1628] 2010-02-13  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* disk/ieee1275/ofdisk.c (grub_ofdisk_open): Check device type before
	opening and not after.
---
 ChangeLog              |  5 +++++
 disk/ieee1275/ofdisk.c | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ff5621a56..eb937f97e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* disk/ieee1275/ofdisk.c (grub_ofdisk_open): Check device type before
+	opening and not after.
+
 2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Macroify
diff --git a/disk/ieee1275/ofdisk.c b/disk/ieee1275/ofdisk.c
index 05c0dd04d..e5a4a67fa 100644
--- a/disk/ieee1275/ofdisk.c
+++ b/disk/ieee1275/ofdisk.c
@@ -172,16 +172,6 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
 
   grub_dprintf ("disk", "Opening `%s'.\n", op->devpath);
 
-  grub_ieee1275_open (op->devpath, &dev_ihandle);
-  if (! dev_ihandle)
-    {
-      grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
-      goto fail;
-    }
-
-  grub_dprintf ("disk", "Opened `%s' as handle %p.\n", op->devpath,
-		(void *) (unsigned long) dev_ihandle);
-
   if (grub_ieee1275_finddevice (op->devpath, &dev))
     {
       grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't read device properties");
@@ -201,6 +191,16 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
       goto fail;
     }
 
+  grub_ieee1275_open (op->devpath, &dev_ihandle);
+  if (! dev_ihandle)
+    {
+      grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
+      goto fail;
+    }
+
+  grub_dprintf ("disk", "Opened `%s' as handle %p.\n", op->devpath,
+		(void *) (unsigned long) dev_ihandle);
+
   /* XXX: There is no property to read the number of blocks.  There
      should be a property `#blocks', but it is not there.  Perhaps it
      is possible to use seek for this.  */

From 904935c3effb50738589b6d52d7219e6534a8a0f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 13 Feb 2010 16:48:22 +0100
Subject: [PATCH 0522/1628] 2010-02-13  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Merge grub_ieee1275_map_physical into grub_map and rename to
	grub_ieee1275_map

	* include/grub/ieee1275/ieee1275.h (grub_ieee1275_map): New proto.
	* include/grub/sparc64/ieee1275/ieee1275.h (grub_ieee1275_map_physical):
	Remove.
	* kern/ieee1275/openfw.c (grub_map): Rename to ...
	(grub_ieee1275_map): ... this. All users updated. Add phys_lo when
	necessary.
	* kern/sparc64/ieee1275/ieee1275.c (grub_ieee1275_map_physical): Remove.
---
 ChangeLog                                | 13 ++++++++++
 include/grub/ieee1275/ieee1275.h         |  4 +++
 include/grub/sparc64/ieee1275/ieee1275.h |  4 ---
 kern/ieee1275/openfw.c                   | 27 ++++++++++++++-----
 kern/sparc64/ieee1275/ieee1275.c         | 33 ------------------------
 loader/sparc64/ieee1275/linux.c          |  6 ++---
 6 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eb937f97e..bd8165647 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Merge grub_ieee1275_map_physical into grub_map and rename to
+	grub_ieee1275_map
+
+	* include/grub/ieee1275/ieee1275.h (grub_ieee1275_map): New proto.
+	* include/grub/sparc64/ieee1275/ieee1275.h (grub_ieee1275_map_physical):
+	Remove.
+	* kern/ieee1275/openfw.c (grub_map): Rename to ...
+	(grub_ieee1275_map): ... this. All users updated. Add phys_lo when
+	necessary.
+	* kern/sparc64/ieee1275/ieee1275.c (grub_ieee1275_map_physical): Remove.
+
 2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* disk/ieee1275/ofdisk.c (grub_ofdisk_open): Check device type before
diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
index a852a7b61..62e8f3812 100644
--- a/include/grub/ieee1275/ieee1275.h
+++ b/include/grub/ieee1275/ieee1275.h
@@ -173,6 +173,10 @@ grub_err_t EXPORT_FUNC(grub_machine_mmap_iterate)
      (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
 int EXPORT_FUNC(grub_claimmap) (grub_addr_t addr, grub_size_t size);
 
+int
+EXPORT_FUNC(grub_ieee1275_map) (grub_addr_t phys, grub_addr_t virt,
+				grub_size_t size, grub_uint32_t mode);
+
 char *EXPORT_FUNC(grub_ieee1275_encode_devname) (const char *path);
 char *EXPORT_FUNC(grub_ieee1275_get_filename) (const char *path);
 
diff --git a/include/grub/sparc64/ieee1275/ieee1275.h b/include/grub/sparc64/ieee1275/ieee1275.h
index 1619510fb..527c46ae7 100644
--- a/include/grub/sparc64/ieee1275/ieee1275.h
+++ b/include/grub/sparc64/ieee1275/ieee1275.h
@@ -37,10 +37,6 @@ typedef grub_uint64_t grub_ieee1275_cell_t;
 #define IEEE1275_MAP_DEFAULT	(IEEE1275_MAP_WRITE | IEEE1275_MAP_READ | \
 				 IEEE1275_MAP_EXEC | IEEE1275_MAP_CACHED)
 
-extern int EXPORT_FUNC(grub_ieee1275_map_physical) (grub_addr_t paddr,
-						    grub_addr_t vaddr,
-						    grub_size_t size,
-						    grub_uint32_t mode);
 extern int EXPORT_FUNC(grub_ieee1275_claim_vaddr) (grub_addr_t vaddr,
 						   grub_size_t size);
 extern int EXPORT_FUNC(grub_ieee1275_alloc_physmem) (grub_addr_t *paddr,
diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index e5f565c4c..13fccbf9a 100644
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -199,9 +199,9 @@ nextprop:
 }
 
 /* Call the "map" method of /chosen/mmu.  */
-static int
-grub_map (grub_addr_t phys, grub_addr_t virt, grub_uint32_t size,
-		   grub_uint8_t mode)
+int
+grub_ieee1275_map (grub_addr_t phys, grub_addr_t virt, grub_size_t size,
+		   grub_uint32_t mode)
 {
   struct map_args {
     struct grub_ieee1275_common_hdr common;
@@ -210,17 +210,30 @@ grub_map (grub_addr_t phys, grub_addr_t virt, grub_uint32_t size,
     grub_ieee1275_cell_t mode;
     grub_ieee1275_cell_t size;
     grub_ieee1275_cell_t virt;
-    grub_ieee1275_cell_t phys;
+#ifdef GRUB_MACHINE_SPARC64
+    grub_ieee1275_cell_t phys_high;
+#endif
+    grub_ieee1275_cell_t phys_low;
     grub_ieee1275_cell_t catch_result;
   } args;
 
-  INIT_IEEE1275_COMMON (&args.common, "call-method", 6, 1);
+  INIT_IEEE1275_COMMON (&args.common, "call-method",
+#ifdef GRUB_MACHINE_SPARC64
+			7,
+#else
+			6,
+#endif
+			1);
   args.method = (grub_ieee1275_cell_t) "map";
   args.ihandle = grub_ieee1275_mmu;
-  args.phys = phys;
+#ifdef GRUB_MACHINE_SPARC64
+  args.phys_high = 0;
+#endif
+  args.phys_low = phys;
   args.virt = virt;
   args.size = size;
   args.mode = mode; /* Format is WIMG0PP.  */
+  args.catch_result = (grub_ieee1275_cell_t) -1;
 
   if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
     return -1;
@@ -235,7 +248,7 @@ grub_claimmap (grub_addr_t addr, grub_size_t size)
     return -1;
 
   if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_REAL_MODE)
-      && grub_map (addr, addr, size, 0x00))
+      && grub_ieee1275_map (addr, addr, size, 0x00))
     {
       grub_printf ("map failed: address 0x%llx, size 0x%llx\n",
 		   (long long) addr, (long long) size);
diff --git a/kern/sparc64/ieee1275/ieee1275.c b/kern/sparc64/ieee1275/ieee1275.c
index 438a171ca..53be692c3 100644
--- a/kern/sparc64/ieee1275/ieee1275.c
+++ b/kern/sparc64/ieee1275/ieee1275.c
@@ -21,39 +21,6 @@
 
 /* Sun specific ieee1275 interfaces used by GRUB.  */
 
-int
-grub_ieee1275_map_physical (grub_addr_t paddr, grub_addr_t vaddr,
-			    grub_size_t size, grub_uint32_t mode)
-{
-  struct map_physical_args
-  {
-    struct grub_ieee1275_common_hdr common;
-    grub_ieee1275_cell_t method;
-    grub_ieee1275_cell_t ihandle;
-    grub_ieee1275_cell_t mode;
-    grub_ieee1275_cell_t size;
-    grub_ieee1275_cell_t virt;
-    grub_ieee1275_cell_t phys_high;
-    grub_ieee1275_cell_t phys_low;
-    grub_ieee1275_cell_t catch_result;
-  }
-  args;
-
-  INIT_IEEE1275_COMMON (&args.common, "call-method", 7, 1);
-  args.method = (grub_ieee1275_cell_t) "map";
-  args.ihandle = grub_ieee1275_mmu;
-  args.mode = mode;
-  args.size = size;
-  args.virt = vaddr;
-  args.phys_high = 0;
-  args.phys_low = paddr;
-  args.catch_result = (grub_ieee1275_cell_t) -1;
-
-  if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
-    return -1;
-  return args.catch_result;
-}
-
 int
 grub_ieee1275_claim_vaddr (grub_addr_t vaddr, grub_size_t size)
 {
diff --git a/loader/sparc64/ieee1275/linux.c b/loader/sparc64/ieee1275/linux.c
index 65f334ab3..24a6849a6 100644
--- a/loader/sparc64/ieee1275/linux.c
+++ b/loader/sparc64/ieee1275/linux.c
@@ -252,8 +252,8 @@ grub_linux_load64 (grub_elf_t elf)
   if (paddr == (grub_addr_t) -1)
     return grub_error (GRUB_ERR_OUT_OF_MEMORY,
 		       "couldn't allocate physical memory");
-  ret = grub_ieee1275_map_physical (paddr, linux_addr - off,
-				    linux_size + off, IEEE1275_MAP_DEFAULT);
+  ret = grub_ieee1275_map (paddr, linux_addr - off,
+			   linux_size + off, IEEE1275_MAP_DEFAULT);
   if (ret)
     return grub_error (GRUB_ERR_OUT_OF_MEMORY,
 		       "couldn't map physical memory");
@@ -403,7 +403,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
 		  "couldn't allocate physical memory");
       goto fail;
     }
-  ret = grub_ieee1275_map_physical (paddr, addr, size, IEEE1275_MAP_DEFAULT);
+  ret = grub_ieee1275_map (paddr, addr, size, IEEE1275_MAP_DEFAULT);
   if (ret)
     {
       grub_error (GRUB_ERR_OUT_OF_MEMORY,

From 10f6389453e746a5235e5db6c70b4b55dc0355a6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 13 Feb 2010 18:48:33 +0100
Subject: [PATCH 0523/1628] Fix raw image addresses

---
 boot/sparc64/ieee1275/boot.S         | 2 +-
 boot/sparc64/ieee1275/diskboot.S     | 2 +-
 include/grub/sparc64/ieee1275/boot.h | 5 +++--
 util/grub-mkrawimage.c               | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/boot/sparc64/ieee1275/boot.S b/boot/sparc64/ieee1275/boot.S
index 74f4ee014..167406017 100644
--- a/boot/sparc64/ieee1275/boot.S
+++ b/boot/sparc64/ieee1275/boot.S
@@ -118,7 +118,7 @@ prom_call:
 
 boot_continue:
 	mov	%o7, PIC_REG		/* PIC base */
-	sethi	%hi(SCRATCH_PAD), %l1	/* OF argument slots */
+	sethi	%hi(SCRATCH_PAD_BOOT), %l1	/* OF argument slots */
 
 	/* Find the /chosen node so we can fetch the stdout handle,
 	 * and thus perform console output.
diff --git a/boot/sparc64/ieee1275/diskboot.S b/boot/sparc64/ieee1275/diskboot.S
index 5016bf9e0..a4d4b5bf9 100644
--- a/boot/sparc64/ieee1275/diskboot.S
+++ b/boot/sparc64/ieee1275/diskboot.S
@@ -81,7 +81,7 @@ prom_call:
 
 
 after_info_block:
-	sethi	%hi(SCRATCH_PAD), %l1	/* OF argument slots */
+	sethi	%hi(SCRATCH_PAD_DISKBOOT), %l1	/* OF argument slots */
 
 	GET_ABS(notification_string, %o2)
 	call	console_write
diff --git a/include/grub/sparc64/ieee1275/boot.h b/include/grub/sparc64/ieee1275/boot.h
index 95f311ce5..e1c1aa675 100644
--- a/include/grub/sparc64/ieee1275/boot.h
+++ b/include/grub/sparc64/ieee1275/boot.h
@@ -25,7 +25,8 @@
 #define BOOTDEV_REG			%l6
 #define PIC_REG				%l7
 
-#define	SCRATCH_PAD			0x10000
+#define	SCRATCH_PAD_BOOT		0x5000
+#define	SCRATCH_PAD_DISKBOOT		0x4000
 
 #define GET_ABS(symbol, reg)	\
 	add	PIC_REG, (symbol - pic_base), reg
@@ -51,7 +52,7 @@
 
 #define GRUB_BOOT_MACHINE_LIST_SIZE	12
 
-#define GRUB_BOOT_MACHINE_IMAGE_ADDRESS	0x200000
+#define GRUB_BOOT_MACHINE_IMAGE_ADDRESS	0x4400
 
 #define GRUB_BOOT_MACHINE_KERNEL_ADDR 0x4200
 
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index d0be7149c..933c46963 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -344,7 +344,8 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       aout_head->a_midmag = grub_host_to_target32 ((AOUT_MID_SUN << 16)
 						   | AOUT32_OMAGIC);
       aout_head->a_text = grub_host_to_target32 (core_size);
-      aout_head->a_entry = grub_host_to_target32 (0x4400);
+      aout_head->a_entry
+	= grub_host_to_target32 (GRUB_BOOT_MACHINE_IMAGE_ADDRESS);
       memcpy (aout_img + sizeof (*aout_head), core_img, core_size);
 
       free (core_img);

From 8c717950104035bb2d9f70bb8f31cdcaee4fb8bb Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Feb 2010 02:10:46 +0100
Subject: [PATCH 0524/1628] 2010-02-13  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* io/gzio.c (grub_gzio_open): Use grub_zalloc.
---
 ChangeLog | 4 ++++
 io/gzio.c | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bd8165647..2084735e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* io/gzio.c (grub_gzio_open): Use grub_zalloc.
+
 2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Merge grub_ieee1275_map_physical into grub_map and rename to
diff --git a/io/gzio.c b/io/gzio.c
index 39f6d7b13..9bf609105 100644
--- a/io/gzio.c
+++ b/io/gzio.c
@@ -1121,14 +1121,13 @@ grub_gzio_open (grub_file_t io, int transparent)
   if (! file)
     return 0;
 
-  gzio = grub_malloc (sizeof (*gzio));
+  gzio = grub_zalloc (sizeof (*gzio));
   if (! gzio)
     {
       grub_free (file);
       return 0;
     }
 
-  grub_memset (gzio, 0, sizeof (*gzio));
   gzio->file = io;
 
   file->device = io->device;

From 095f5f82f7c68f8bfabf1b35c1204626fa4dddf6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Feb 2010 13:18:33 +0100
Subject: [PATCH 0525/1628] 2010-02-14  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* fs/i386/pc/pxe.c (GRUB_MOD_INIT): Fix typo.
	Reported by: Pavel Pisa.
---
 ChangeLog        | 5 +++++
 fs/i386/pc/pxe.c | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2084735e0..1dfaca669 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* fs/i386/pc/pxe.c (GRUB_MOD_INIT): Fix typo.
+	Reported by: Pavel Pisa.
+
 2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* io/gzio.c (grub_gzio_open): Use grub_zalloc.
diff --git a/fs/i386/pc/pxe.c b/fs/i386/pc/pxe.c
index 92529883e..82d8ee583 100644
--- a/fs/i386/pc/pxe.c
+++ b/fs/i386/pc/pxe.c
@@ -568,21 +568,21 @@ GRUB_MOD_INIT(pxe)
 
       buf = grub_xasprintf ("%d", grub_pxe_blksize);
       if (buf)
-	grub_env_set ("net_pxe_blksize", buf);
+	grub_env_set ("pxe_blksize", buf);
       grub_free (buf);
 
       set_ip_env ("pxe_default_server", grub_pxe_default_server_ip);
       set_ip_env ("pxe_default_gateway", grub_pxe_default_gateway_ip);
       set_ip_env ("net_pxe_ip", grub_pxe_your_ip);
-      grub_register_variable_hook ("net_pxe_default_server", 0,
+      grub_register_variable_hook ("pxe_default_server", 0,
 				   grub_env_write_pxe_default_server);
-      grub_register_variable_hook ("net_pxe_default_gateway", 0,
+      grub_register_variable_hook ("pxe_default_gateway", 0,
 				   grub_env_write_pxe_default_gateway);
 
       /* XXX: Is it possible to change IP in PXE?  */
       grub_register_variable_hook ("net_pxe_ip", 0,
 				   grub_env_write_readonly);
-      grub_register_variable_hook ("net_pxe_blksize", 0,
+      grub_register_variable_hook ("pxe_blksize", 0,
 				   grub_env_write_pxe_blocksize);
       grub_disk_dev_register (&grub_pxe_dev);
       grub_fs_register (&grub_pxefs_fs);

From 320dd174b5efd6dd7fde6636180f0547aaaae889 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Feb 2010 14:32:21 +0100
Subject: [PATCH 0526/1628] Increase stack size on sparc

---
 include/grub/sparc64/ieee1275/ieee1275.h |  2 ++
 include/grub/sparc64/ieee1275/kernel.h   |  1 +
 kern/sparc64/ieee1275/crt0.S             | 16 +++++++++++++---
 kern/sparc64/ieee1275/init.c             |  6 +++++-
 loader/sparc64/ieee1275/linux.c          | 17 +++++++++++------
 5 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/include/grub/sparc64/ieee1275/ieee1275.h b/include/grub/sparc64/ieee1275/ieee1275.h
index 527c46ae7..32c77f80f 100644
--- a/include/grub/sparc64/ieee1275/ieee1275.h
+++ b/include/grub/sparc64/ieee1275/ieee1275.h
@@ -43,4 +43,6 @@ extern int EXPORT_FUNC(grub_ieee1275_alloc_physmem) (grub_addr_t *paddr,
 						     grub_size_t size,
 						     grub_uint32_t align);
 
+extern grub_addr_t EXPORT_VAR (grub_ieee1275_original_stack);
+
 #endif /* ! GRUB_IEEE1275_MACHINE_HEADER */
diff --git a/include/grub/sparc64/ieee1275/kernel.h b/include/grub/sparc64/ieee1275/kernel.h
index 78e039bc5..a16fb88e7 100644
--- a/include/grub/sparc64/ieee1275/kernel.h
+++ b/include/grub/sparc64/ieee1275/kernel.h
@@ -40,6 +40,7 @@
 #define GRUB_KERNEL_MACHINE_DATA_END		0x114
 
 #define GRUB_KERNEL_MACHINE_RAW_SIZE                   0
+#define GRUB_KERNEL_MACHINE_STACK_SIZE          0x40000
 
 #define GRUB_PLATFORM_IMAGE_FORMATS     "raw, aout"
 #define GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT     "raw"
diff --git a/kern/sparc64/ieee1275/crt0.S b/kern/sparc64/ieee1275/crt0.S
index f1ff6b466..d5a172296 100644
--- a/kern/sparc64/ieee1275/crt0.S
+++ b/kern/sparc64/ieee1275/crt0.S
@@ -53,8 +53,17 @@ codestart:
 	or	%o3, %lo(_end), %o3
 	sethi	%hi(grub_total_module_size), %o4
 	lduw	[%o4 + %lo(grub_total_module_size)], %o4
+
 	add     %o2, %o4, %o2
 	add     %o3, %o4, %o3
+
+	/* Save ieee1275 stack for future use by booter.  */
+	mov     %o6, %o1
+	/* Our future stack.  */
+	sethi	%hi(GRUB_KERNEL_MACHINE_STACK_SIZE - 2047), %o5
+	or	%o5, %lo(GRUB_KERNEL_MACHINE_STACK_SIZE - 2047), %o5
+	add     %o3, %o5, %o6
+	
 	sub	%o2, 4, %o2
 	sub	%o3, 4, %o3
 1:	lduw	[%o2], %o5
@@ -62,7 +71,7 @@ codestart:
 	subcc	%o4, 4, %o4
 	sub	%o2, 4, %o2
 	bne,pt	%icc, 1b
-	  sub	%o3, 4, %o3
+	 sub	%o3, 4, %o3
 
 	/* Now it's safe to clear out the BSS.  */
 	sethi	%hi(__bss_start), %o2
@@ -74,8 +83,9 @@ codestart:
 	cmp	%o2, %o3
 	blt,pt	%xcc, 1b
 	 nop
+	sethi	%hi(grub_ieee1275_original_stack), %o2
+	stx	%o1, [%o2 + %lo(grub_ieee1275_original_stack)]
 	sethi	%hi(grub_ieee1275_entry_fn), %o2
-	stx	%o0, [%o2 + %lo(grub_ieee1275_entry_fn)]
 	call	grub_main
-	 nop
+	 stx	%o0, [%o2 + %lo(grub_ieee1275_entry_fn)]
 1:	ba,a	1b
diff --git a/kern/sparc64/ieee1275/init.c b/kern/sparc64/ieee1275/init.c
index 5827be658..a995217bc 100644
--- a/kern/sparc64/ieee1275/init.c
+++ b/kern/sparc64/ieee1275/init.c
@@ -23,12 +23,15 @@
 #include <grub/err.h>
 #include <grub/misc.h>
 #include <grub/time.h>
+#include <grub/machine/boot.h>
 #include <grub/machine/console.h>
 #include <grub/machine/kernel.h>
 #include <grub/machine/time.h>
 #include <grub/ieee1275/ofdisk.h>
 #include <grub/ieee1275/ieee1275.h>
 
+grub_addr_t grub_ieee1275_original_stack;
+
 void
 grub_exit (void)
 {
@@ -104,7 +107,8 @@ grub_machine_set_prefix (void)
 static void
 grub_heap_init (void)
 {
-  grub_mm_init_region ((void *) grub_modules_get_end (), 0x200000);
+  grub_mm_init_region ((void *) (grub_modules_get_end ()
+				 + GRUB_KERNEL_MACHINE_STACK_SIZE), 0x200000);
 }
 
 static void
diff --git a/loader/sparc64/ieee1275/linux.c b/loader/sparc64/ieee1275/linux.c
index 24a6849a6..f55b4fa2a 100644
--- a/loader/sparc64/ieee1275/linux.c
+++ b/loader/sparc64/ieee1275/linux.c
@@ -58,9 +58,6 @@ static grub_size_t linux_size;
 
 static char *linux_args;
 
-typedef void (*kernel_entry_t) (unsigned long, unsigned long,
-				unsigned long, unsigned long, int (void *));
-
 struct linux_bootstr_info {
 	int len, valid;
 	char buf[];
@@ -92,7 +89,6 @@ static grub_err_t
 grub_linux_boot (void)
 {
   struct linux_bootstr_info *bp;
-  kernel_entry_t linuxmain;
   struct linux_hdrs *hp;
   grub_addr_t addr;
 
@@ -141,8 +137,17 @@ grub_linux_boot (void)
   grub_dprintf ("loader", "Jumping to Linux...\n");
 
   /* Boot the kernel.  */
-  linuxmain = (kernel_entry_t) linux_addr;
-  linuxmain (0, 0, 0, 0, grub_ieee1275_entry_fn);
+  asm volatile ("sethi	%hi(grub_ieee1275_entry_fn), %o1\n"
+		"ldx	[%o1 + %lo(grub_ieee1275_entry_fn)], %o4\n"
+		"sethi	%hi(grub_ieee1275_original_stack), %o1\n"
+		"ldx	[%o1 + %lo(grub_ieee1275_original_stack)], %o6\n"
+		"sethi	%hi(linux_addr), %o1\n"
+		"ldx	[%o1 + %lo(linux_addr)], %o5\n"
+		"mov    %g0, %o0\n"
+		"mov    %g0, %o2\n"
+		"mov    %g0, %o3\n"
+		"jmp    %o5\n"
+	        "mov    %g0, %o1\n");
 
   return GRUB_ERR_NONE;
 }

From bc028f2f86ad3fa97afc0262fe414190717a988f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Feb 2010 14:46:19 +0100
Subject: [PATCH 0527/1628] 2010-02-14  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Prevent unknown commands from stopping menuentry execution.

	* script/execute.c (grub_script_execute_cmdline): Print error after
	unknown command.
---
 ChangeLog        | 7 +++++++
 script/execute.c | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1dfaca669..7c8e0a988 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Prevent unknown commands from stopping menuentry execution.
+
+	* script/execute.c (grub_script_execute_cmdline): Print error after
+	unknown command.
+
 2010-02-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* fs/i386/pc/pxe.c (GRUB_MOD_INIT): Fix typo.
diff --git a/script/execute.c b/script/execute.c
index a0773c191..6e914aeeb 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -100,8 +100,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
   grubcmd = grub_command_find (cmdname);
   if (! grubcmd)
     {
-      /* Shouldn't happen but precaution is good.  */
-      grub_print_error ();
+      grub_errno = GRUB_ERR_NONE;
 
       /* It's not a GRUB command, try all functions.  */
       func = grub_script_function_find (cmdname);
@@ -126,6 +125,8 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 	  grub_snprintf (errnobuf, sizeof (errnobuf), "%d", grub_errno);
 	  grub_env_set ("?", errnobuf);
 
+	  grub_print_error ();
+
 	  return 0;
 	}
     }

From d27859b2eccc98d3c5e0ce50d4dfd58b253e6df0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Feb 2010 14:47:50 +0100
Subject: [PATCH 0528/1628] 2010-02-14  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Enclose
	set root in single quotes to prevent \, from being unescaped.
---
 ChangeLog                 | 5 +++++
 util/grub-mkconfig_lib.in | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7c8e0a988..403394560 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Enclose
+	set root in single quotes to prevent \, from being unescaped.
+
 2010-02-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Prevent unknown commands from stopping menuentry execution.
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index fc24c7b70..45354041a 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -120,7 +120,7 @@ prepare_grub_to_access_device ()
 
   # If there's a filesystem UUID that GRUB is capable of identifying, use it;
   # otherwise set root as per value in device.map.
-  echo "set root=`${grub_probe} --device ${device} --target=drive`"
+  echo "set root='`${grub_probe} --device ${device} --target=drive`'"
   if fs_uuid="`${grub_probe} --device ${device} --target=fs_uuid 2> /dev/null`" ; then
     echo "search --no-floppy --fs-uuid --set ${fs_uuid}"
   fi

From e29f95dc538733358ed22678a75198c3281bc696 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Feb 2010 14:51:06 +0100
Subject: [PATCH 0529/1628] 2010-02-14  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* term/ieee1275/ofconsole.c (grub_ofconsole_putchar): Don't output
	non-ASCII characters.
---
 ChangeLog                 |  5 +++++
 term/ieee1275/ofconsole.c | 47 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 403394560..a75dd8636 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* term/ieee1275/ofconsole.c (grub_ofconsole_putchar): Don't output
+	non-ASCII characters.
+
 2010-02-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Enclose
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index 6073e25d2..86b150a33 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -77,7 +77,52 @@ grub_ofconsole_writeesc (const char *str)
 static void
 grub_ofconsole_putchar (grub_uint32_t c)
 {
-  char chr = c;
+  char chr;
+
+  if (c > 0x7F)
+    {
+      /* Better than nothing.  */
+      switch (c)
+	{
+	case GRUB_TERM_DISP_LEFT:
+	  c = '<';
+	  break;
+	  
+	case GRUB_TERM_DISP_UP:
+	  c = '^';
+	  break;
+
+	case GRUB_TERM_DISP_RIGHT:
+	  c = '>';
+	  break;
+
+	case GRUB_TERM_DISP_DOWN:
+	  c = 'v';
+	  break;
+
+	case GRUB_TERM_DISP_HLINE:
+	  c = '-';
+	  break;
+
+	case GRUB_TERM_DISP_VLINE:
+	  c = '|';
+	  break;
+
+	case GRUB_TERM_DISP_UL:
+	case GRUB_TERM_DISP_UR:
+	case GRUB_TERM_DISP_LL:
+	case GRUB_TERM_DISP_LR:
+	  c = '+';
+	  break;
+
+	default:
+	  c = '?';
+	  break;
+	}
+    }
+
+  chr = c;
+
   if (c == '\n')
     {
       grub_curr_y++;

From a08769434f565d7ef0ad1cffb5050e4894ff115e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Feb 2010 14:52:10 +0100
Subject: [PATCH 0530/1628] 2010-02-14  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Wait for possible
	escape sequence after \e.
---
 ChangeLog                 |  5 +++++
 term/ieee1275/ofconsole.c | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a75dd8636..8d654ce88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Wait for possible
+	escape sequence after \e.
+
 2010-02-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* term/ieee1275/ofconsole.c (grub_ofconsole_putchar): Don't output
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index 86b150a33..82108022a 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -21,6 +21,7 @@
 #include <grub/types.h>
 #include <grub/misc.h>
 #include <grub/mm.h>
+#include <grub/time.h>
 #include <grub/machine/console.h>
 #include <grub/ieee1275/ieee1275.h>
 
@@ -203,7 +204,14 @@ grub_ofconsole_readkey (int *key)
 
   if (actual > 0 && c == '\e')
     {
+      grub_uint64_t start;
       grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+
+      /* On 9600 we have to wait up to 12 milliseconds.  */
+      start = grub_get_time_ms ();
+      while (actual <= 0 && grub_get_time_ms () - start < 12)
+	grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+
       if (actual <= 0)
 	{
 	  *key = '\e';
@@ -214,6 +222,10 @@ grub_ofconsole_readkey (int *key)
 	return 0;
 
       grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+      /* On 9600 we have to wait up to 12 milliseconds.  */
+      start = grub_get_time_ms ();
+      while (actual <= 0 && grub_get_time_ms () - start < 12)
+	grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
       if (actual <= 0)
 	return 0;
 

From 04459e70a353d59a83b10e0135e6e0b27e104b48 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 14 Feb 2010 17:07:34 +0100
Subject: [PATCH 0531/1628] 2010-02-07  Samuel Thibault 
 <samuel.thibault@ens-lyon.org>

	* commands/i386/pc/play.c (BASE_TEMPO): Set to 60 *
	GRUB_TICKS_PER_SECOND instead of 120.
---
 ChangeLog               | 5 +++++
 commands/i386/pc/play.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8d654ce88..03388c7f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-07  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* commands/i386/pc/play.c (BASE_TEMPO): Set to 60 *
+	GRUB_TICKS_PER_SECOND instead of 120.
+
 2010-02-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Wait for possible
diff --git a/commands/i386/pc/play.c b/commands/i386/pc/play.c
index 1151dddf4..04bf8625d 100644
--- a/commands/i386/pc/play.c
+++ b/commands/i386/pc/play.c
@@ -29,7 +29,7 @@
 #include <grub/command.h>
 #include <grub/i18n.h>
 
-#define BASE_TEMPO 120
+#define BASE_TEMPO (60 * GRUB_TICKS_PER_SECOND)
 
 /* The speaker port.  */
 #define SPEAKER			0x61

From 14da0fb7e81cc5f46903201563f8d3302d25a88c Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 14 Feb 2010 17:25:52 +0100
Subject: [PATCH 0532/1628] 2010-02-14  Samuel Thibault 
 <samuel.thibault@ens-lyon.org>

	* commands/i386/pc/play.c (T_REST, T_FINE, struct note, beep_on): Use
	grub_uint16_t instead of short.
	(grub_cmd_play): Use grub_uint32_t instead of int, convert data from
	disk from little endian to cpu endianness.
---
 ChangeLog               |  7 +++++++
 commands/i386/pc/play.c | 22 ++++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 03388c7f3..950a26f3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-14  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* commands/i386/pc/play.c (T_REST, T_FINE, struct note, beep_on): Use
+	grub_uint16_t instead of short.
+	(grub_cmd_play): Use grub_uint32_t instead of int, convert data from
+	disk from little endian to cpu endianness.
+
 2010-02-07  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* commands/i386/pc/play.c (BASE_TEMPO): Set to 60 *
diff --git a/commands/i386/pc/play.c b/commands/i386/pc/play.c
index 04bf8625d..84819b551 100644
--- a/commands/i386/pc/play.c
+++ b/commands/i386/pc/play.c
@@ -101,13 +101,13 @@
 #define PIT_CTRL_COUNT_BINARY	0x00	/* 16-bit binary counter.  */
 #define PIT_CTRL_COUNT_BCD	0x01	/* 4-decade BCD counter.  */
 
-#define T_REST			((short) 0)
-#define T_FINE			((short) -1)
+#define T_REST			((grub_uint16_t) 0)
+#define T_FINE			((grub_uint16_t) -1)
 
 struct note
 {
-  short pitch;
-  short duration;
+  grub_uint16_t pitch;
+  grub_uint16_t duration;
 };
 
 static void
@@ -120,7 +120,7 @@ beep_off (void)
 }
 
 static void
-beep_on (short pitch)
+beep_on (grub_uint16_t pitch)
 {
   unsigned char status;
   unsigned int counter;
@@ -149,7 +149,7 @@ grub_cmd_play (grub_command_t cmd __attribute__ ((unused)),
 {
   grub_file_t file;
   struct note buf;
-  int tempo;
+  grub_uint32_t tempo;
   unsigned int to;
 
   if (argc != 1)
@@ -166,12 +166,18 @@ grub_cmd_play (grub_command_t cmd __attribute__ ((unused)),
                          "file doesn't even contains a full tempo record");
     }
 
+  tempo = grub_le_to_cpu32(tempo);
+
   grub_dprintf ("play","tempo = %d\n", tempo);
 
   while (grub_file_read (file, &buf,
-                         sizeof (struct note)) == sizeof (struct note)
-         && buf.pitch != T_FINE && grub_checkkey () < 0)
+                         sizeof (struct note)) == sizeof (struct note))
     {
+      buf.pitch = grub_le_to_cpu16(buf.pitch);
+      buf.duration = grub_le_to_cpu16(buf.duration);
+
+      if (buf.pitch == T_FINE || grub_checkkey () >= 0)
+        break;
 
       grub_dprintf ("play", "pitch = %d, duration = %d\n", buf.pitch,
                     buf.duration);

From 37c8483b9756d3ea161d0f7a123c4bd57e1cddaf Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 14 Feb 2010 18:14:16 +0100
Subject: [PATCH 0533/1628] 2010-02-14  Samuel Thibault 
 <samuel.thibault@ens-lyon.org>

	* commands/i386/pc/play.c (grub_cmd_play): If grub_file_open fails,
	parse arguments as inline tempo and notes.  Move code for playing notes
	to...
	(play): ... new function.
---
 ChangeLog               |   7 +++
 commands/i386/pc/play.c | 125 +++++++++++++++++++++++++++-------------
 2 files changed, 92 insertions(+), 40 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 950a26f3d..60a1f5db3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-14  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* commands/i386/pc/play.c (grub_cmd_play): If grub_file_open fails,
+	parse arguments as inline tempo and notes.  Move code for playing notes
+	to...
+	(play): ... new function.
+
 2010-02-14  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* commands/i386/pc/play.c (T_REST, T_FINE, struct note, beep_on): Use
diff --git a/commands/i386/pc/play.c b/commands/i386/pc/play.c
index 84819b551..1bca3d763 100644
--- a/commands/i386/pc/play.c
+++ b/commands/i386/pc/play.c
@@ -143,66 +143,111 @@ beep_on (grub_uint16_t pitch)
   grub_outb (status | SPEAKER_TMR2 | SPEAKER_DATA, SPEAKER);
 }
 
+/* Returns whether playing should continue.  */
+static int
+play (unsigned tempo, struct note *note)
+{
+  unsigned int to;
+
+  if (note->pitch == T_FINE || grub_checkkey () >= 0)
+    return 1;
+
+  grub_dprintf ("play", "pitch = %d, duration = %d\n", note->pitch,
+                note->duration);
+
+  switch (note->pitch)
+    {
+      case T_REST:
+        beep_off ();
+        break;
+
+      default:
+        beep_on (note->pitch);
+        break;
+    }
+
+  to = grub_get_rtc () + BASE_TEMPO * note->duration / tempo;
+  while (((unsigned int) grub_get_rtc () <= to) && (grub_checkkey () < 0))
+    ;
+
+  return 0;
+}
+
 static grub_err_t
 grub_cmd_play (grub_command_t cmd __attribute__ ((unused)),
 	       int argc, char **args)
 {
   grub_file_t file;
-  struct note buf;
-  grub_uint32_t tempo;
-  unsigned int to;
 
-  if (argc != 1)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
+  if (argc < 1)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name or tempo and notes required");
 
   file = grub_file_open (args[0]);
-  if (! file)
-    return grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
-
-  if (grub_file_read (file, &tempo, sizeof(tempo)) != sizeof(tempo))
+  if (file)
     {
-      grub_file_close (file);
-      return grub_error (GRUB_ERR_FILE_READ_ERROR,
-                         "file doesn't even contains a full tempo record");
-    }
+      struct note buf;
+      grub_uint32_t tempo;
 
-  tempo = grub_le_to_cpu32(tempo);
-
-  grub_dprintf ("play","tempo = %d\n", tempo);
-
-  while (grub_file_read (file, &buf,
-                         sizeof (struct note)) == sizeof (struct note))
-    {
-      buf.pitch = grub_le_to_cpu16(buf.pitch);
-      buf.duration = grub_le_to_cpu16(buf.duration);
-
-      if (buf.pitch == T_FINE || grub_checkkey () >= 0)
-        break;
-
-      grub_dprintf ("play", "pitch = %d, duration = %d\n", buf.pitch,
-                    buf.duration);
-
-      switch (buf.pitch)
+      if (grub_file_read (file, &tempo, sizeof (tempo)) != sizeof (tempo))
         {
-          case T_REST:
-            beep_off ();
-            break;
+          grub_file_close (file);
+          return grub_error (GRUB_ERR_FILE_READ_ERROR,
+                             "file doesn't even contains a full tempo record");
+        }
 
-          default:
-            beep_on (buf.pitch);
+      tempo = grub_le_to_cpu32 (tempo);
+      grub_dprintf ("play","tempo = %d\n", tempo);
+
+      while (grub_file_read (file, &buf,
+                             sizeof (struct note)) == sizeof (struct note))
+        {
+          buf.pitch = grub_le_to_cpu16 (buf.pitch);
+          buf.duration = grub_le_to_cpu16 (buf.duration);
+
+          if (play (tempo, &buf))
             break;
         }
 
-      to = grub_get_rtc () + BASE_TEMPO * buf.duration / tempo;
-      while (((unsigned int) grub_get_rtc () <= to) && (grub_checkkey () < 0))
-        ;
+      grub_file_close (file);
+    }
+  else
+    {
+      char *end;
+      unsigned tempo;
+      struct note note;
+      int i;
 
+      tempo = grub_strtoul (args[0], &end, 0);
+
+      if (*end)
+        /* Was not a number either, assume it was supposed to be a file name.  */
+        return grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
+
+      grub_dprintf ("play","tempo = %d\n", tempo);
+
+      for (i = 1; i + 1 < argc; i += 2)
+        {
+          note.pitch = grub_strtoul (args[i], &end, 0);
+          if (*end)
+            {
+              grub_error (GRUB_ERR_BAD_NUMBER, "bogus pitch number");
+              break;
+            }
+
+          note.duration = grub_strtoul (args[i + 1], &end, 0);
+          if (*end)
+            {
+              grub_error (GRUB_ERR_BAD_NUMBER, "bogus duration number");
+              break;
+            }
+
+          if (play (tempo, &note))
+            break;
+        }
     }
 
   beep_off ();
 
-  grub_file_close (file);
-
   while (grub_checkkey () > 0)
     grub_getkey ();
 

From 6fa7cfce657a2862ffd65d581b77443e77bf70b5 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 14 Feb 2010 18:36:26 +0100
Subject: [PATCH 0534/1628] 2010-02-14  Samuel Thibault 
 <samuel.thibault@ens-lyon.org>

	* commands/i386/pc/play.c (GRUB_MOD_INIT(play)): Fix help.
	* docs/grub.texi (Command-line and menu entry commands): Document play
	command.
---
 ChangeLog               |  6 ++++++
 commands/i386/pc/play.c |  3 ++-
 docs/grub.texi          | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 60a1f5db3..74f4380f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-14  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* commands/i386/pc/play.c (GRUB_MOD_INIT(play)): Fix help.
+	* docs/grub.texi (Command-line and menu entry commands): Document play
+	command.
+
 2010-02-14  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* commands/i386/pc/play.c (grub_cmd_play): If grub_file_open fails,
diff --git a/commands/i386/pc/play.c b/commands/i386/pc/play.c
index 1bca3d763..44d98a1f0 100644
--- a/commands/i386/pc/play.c
+++ b/commands/i386/pc/play.c
@@ -259,7 +259,8 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(play)
 {
   cmd = grub_register_command ("play", grub_cmd_play,
-			       N_("FILE"), N_("Play a tune."));
+			       N_("FILE | TEMPO [PITCH1 DURATION1] [PITCH2 DURATION2] ... "),
+			       N_("Play a tune."));
 }
 
 GRUB_MOD_FINI(play)
diff --git a/docs/grub.texi b/docs/grub.texi
index 4fa44462e..f8a9bc414 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1126,6 +1126,7 @@ you forget a command, you can run the command @command{help}
 * insmod::                      Insert a module
 * keystatus::                   Check key modifier status
 * ls::                          List devices or files
+* play::                        Play a tune
 * reboot::                      Reboot your computer
 * set::                         Set an environment variable
 * unset::                       Unset an environment variable
@@ -1364,6 +1365,24 @@ name syntax}), then list the contents of that directory.
 @end deffn
 
 
+@node play
+@subsection play
+
+@deffn Command play file | tempo [pitch1 duration1] [pitch2 duration2] ...
+Plays a tune
+
+If the argument is a file name (@pxref{File name syntax}), play the tune
+recorded in it.  The file format is first the tempo as an unsigned 32bit
+little-endian number, then pairs of unsigned 16bit little-endian numbers for
+pitch and duration pairs.
+
+If the arguments are a series of numbers, play the inline tune.
+
+The tempo is the base for all note durations. 60 gives a 1-second base, 120
+gives a half-second base, etc.  Pitches are Hz.
+@end deffn
+
+
 @node reboot
 @subsection reboot
 

From a3334e79e8dbba33491e6cdee540f20bc7eebd80 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Feb 2010 20:03:19 +0100
Subject: [PATCH 0535/1628] Revert gratuituos change of alias.name

---
 kern/ieee1275/openfw.c | 18 ++----------------
 video/ieee1275.c       |  4 ++--
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index 92ab2f683..ee8520359 100644
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -68,7 +68,6 @@ grub_children_iterate (char *devpath,
     {
       struct grub_ieee1275_devalias alias;
       grub_ssize_t actual;
-      char *fullname;
 
       if (grub_ieee1275_get_property (child, "device_type", childtype,
 				      IEEE1275_MAX_PROP_LEN, &actual))
@@ -82,23 +81,10 @@ grub_children_iterate (char *devpath,
 				      IEEE1275_MAX_PROP_LEN, &actual))
 	continue;
 
-      if (devpath[0] == '/' && devpath[1] == 0)
-	fullname = grub_xasprintf ("/%s", childname);
-      else
-	fullname = grub_xasprintf ("%s/%s", devpath, childname);
-      if (!fullname)
-	{
-	  grub_free (childname);
-	  grub_free (childpath);
-	  grub_free (childtype);
-	  return 0;
-	}
-
       alias.type = childtype;
       alias.path = childpath;
-      alias.name = fullname;
+      alias.name = childname;
       ret = hook (&alias);
-      grub_free (fullname);
       if (ret)
 	break;
     }
@@ -119,7 +105,7 @@ grub_ieee1275_devices_iterate (int (*hook) (struct grub_ieee1275_devalias *alias
   {
     if (hook (alias))
       return 1;
-    return grub_children_iterate (alias->name, it_through);
+    return grub_children_iterate (alias->path, it_through);
   }
 
   return grub_children_iterate ("/", it_through);
diff --git a/video/ieee1275.c b/video/ieee1275.c
index 21b65bd32..3f0b93fb8 100644
--- a/video/ieee1275.c
+++ b/video/ieee1275.c
@@ -59,8 +59,8 @@ find_display (void)
   {
     if (grub_strcmp (alias->type, "display") == 0)
       {
-	grub_dprintf ("video", "Found display %s\n", alias->name);
-	display = grub_strdup (alias->name);
+	grub_dprintf ("video", "Found display %s\n", alias->path);
+	display = grub_strdup (alias->path);
 	return 1;
       }
     return 0;

From 8886d76d245b68d63c11a98038ba2000b83c0919 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Feb 2010 20:04:26 +0100
Subject: [PATCH 0536/1628] Rename get_time_args to set_time_args

---
 lib/ieee1275/datetime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ieee1275/datetime.c b/lib/ieee1275/datetime.c
index aaf17b0fa..ef37724ed 100644
--- a/lib/ieee1275/datetime.c
+++ b/lib/ieee1275/datetime.c
@@ -94,7 +94,7 @@ grub_get_datetime (struct grub_datetime *datetime)
 grub_err_t
 grub_set_datetime (struct grub_datetime *datetime)
 {
-  struct get_time_args
+  struct set_time_args
   {
     struct grub_ieee1275_common_hdr common;
     grub_ieee1275_cell_t method;

From 07096a4f27bdc9f66e239b2e938a8634b55d00eb Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Feb 2010 20:05:09 +0100
Subject: [PATCH 0537/1628] Use alias->path

---
 lib/ieee1275/datetime.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ieee1275/datetime.c b/lib/ieee1275/datetime.c
index ef37724ed..7e6f8d1f1 100644
--- a/lib/ieee1275/datetime.c
+++ b/lib/ieee1275/datetime.c
@@ -31,8 +31,8 @@ find_rtc (void)
   {
     if (grub_strcmp (alias->type, "rtc") == 0)
       {
-	grub_dprintf ("datetime", "Found RTC %s\n", alias->name);
-	rtc = grub_strdup (alias->name);
+	grub_dprintf ("datetime", "Found RTC %s\n", alias->path);
+	rtc = grub_strdup (alias->path);
 	return 1;
       }
     return 0;

From 0dd1e0dd38107f60c8281ea9b9eb912bbf575aff Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 15 Feb 2010 18:59:40 +0100
Subject: [PATCH 0538/1628] 2010-02-15  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* gensymlist.sh.in: Use TARGET_CC instead of CC.
---
 ChangeLog        | 4 ++++
 gensymlist.sh.in | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 74f4380f6..a080c450c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* gensymlist.sh.in: Use TARGET_CC instead of CC.
+
 2010-02-14  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* commands/i386/pc/play.c (GRUB_MOD_INIT(play)): Fix help.
diff --git a/gensymlist.sh.in b/gensymlist.sh.in
index 27fc5e61a..7cd3b48e3 100644
--- a/gensymlist.sh.in
+++ b/gensymlist.sh.in
@@ -14,7 +14,7 @@
 ### The configure script will replace these variables.
 
 : ${srcdir=@srcdir@}
-: ${CC=@CC@}
+: ${CC=@TARGET_CC@}
 
 
 cat <<EOF

From 402e3779923b9dffad7b5aa27e14dfe49004f8db Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 15 Feb 2010 19:01:38 +0100
Subject: [PATCH 0539/1628] 2010-02-15  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* term/serial.c (serial_get_divisor) [GRUB_MACHINE_MIPS_YEELOONG]:
	Double divisor.
	(serial_hw_init) [GRUB_MACHINE_MIPS_YEELOONG]: Don't enable advanced
	features.
	(GRUB_MOD_INIT) [GRUB_MACHINE_MIPS_YEELOONG]: Default to 115200.
---
 ChangeLog     |  8 ++++++++
 term/serial.c | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a080c450c..c2948b20b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* term/serial.c (serial_get_divisor) [GRUB_MACHINE_MIPS_YEELOONG]:
+	Double divisor.
+	(serial_hw_init) [GRUB_MACHINE_MIPS_YEELOONG]: Don't enable advanced
+	features.
+	(GRUB_MOD_INIT) [GRUB_MACHINE_MIPS_YEELOONG]: Default to 115200.
+
 2010-02-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* gensymlist.sh.in: Use TARGET_CC instead of CC.
diff --git a/term/serial.c b/term/serial.c
index 62cd11fee..05497ce40 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -232,7 +232,12 @@ serial_get_divisor (unsigned int speed)
   /* Set the baud rate.  */
   for (i = 0; i < sizeof (divisor_tab) / sizeof (divisor_tab[0]); i++)
     if (divisor_tab[i].speed == speed)
+  /* UART in Yeeloong runs twice the usual rate.  */
+#ifdef GRUB_MACHINE_MIPS_YEELOONG
+      return 2 * divisor_tab[i].div;
+#else
       return divisor_tab[i].div;
+#endif
   return 0;
 }
 
@@ -292,11 +297,14 @@ serial_hw_init (void)
 	     | serial_settings.stop_bits);
   grub_outb (status, serial_settings.port + UART_LCR);
 
+  /* In Yeeloong serial port has only 3 wires.  */
+#ifndef GRUB_MACHINE_MIPS_YEELOONG
   /* Enable the FIFO.  */
   grub_outb (UART_ENABLE_FIFO, serial_settings.port + UART_FCR);
 
   /* Turn on DTR, RTS, and OUT2.  */
   grub_outb (UART_ENABLE_MODEM, serial_settings.port + UART_MCR);
+#endif
 
   /* Drain the input buffer.  */
   while (grub_serial_checkkey () != -1)
@@ -613,7 +621,11 @@ GRUB_MOD_INIT(serial)
 
   /* Set default settings.  */
   serial_settings.port      = serial_hw_get_port (0);
+#ifdef GRUB_MACHINE_MIPS_YEELOONG
+  serial_settings.divisor   = serial_get_divisor (115200);
+#else
   serial_settings.divisor   = serial_get_divisor (9600);
+#endif
   serial_settings.word_len  = UART_8BITS_WORD;
   serial_settings.parity    = UART_NO_PARITY;
   serial_settings.stop_bits = UART_1_STOP_BIT;

From 13b6d963eaf38d6029b5c3a2f696a573a55a97b3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 15 Feb 2010 19:03:07 +0100
Subject: [PATCH 0540/1628] Fix yeeloong compilation

---
 kern/mips/yeeloong/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index d148d08dc..1a29a9af6 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -68,7 +68,7 @@ grub_machine_init (void)
 {
   grub_addr_t modend;
   modend = grub_modules_get_end ();
-  grub_mm_init_region (modend, (grub_arch_memsize << 20)
+  grub_mm_init_region ((void *) modend, (grub_arch_memsize << 20)
 		       - (modend - GRUB_ARCH_LOWMEMVSTART));
   /* FIXME: use upper memory as well.  */
   grub_install_get_time_ms (grub_rtc_get_time_ms);

From 2793c71ea948b5849723f578984950e546a805ca Mon Sep 17 00:00:00 2001
From: Georgy Buranov <gburanov@gmail.com>
Date: Tue, 16 Feb 2010 13:13:02 +0100
Subject: [PATCH 0541/1628] 2010-02-16  Georgy Buranov <gburanov@gmail.com>

	* disk/efi/efidisk.c (grub_efidisk_get_device_name): Fix a typo.
---
 ChangeLog          | 4 ++++
 disk/efi/efidisk.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c2948b20b..d6925f0dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-16  Georgy Buranov <gburanov@gmail.com>
+
+	* disk/efi/efidisk.c (grub_efidisk_get_device_name): Fix a typo.
+
 2010-02-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* term/serial.c (serial_get_divisor) [GRUB_MACHINE_MIPS_YEELOONG]:
diff --git a/disk/efi/efidisk.c b/disk/efi/efidisk.c
index 58300a0d2..f9c6f3153 100644
--- a/disk/efi/efidisk.c
+++ b/disk/efi/efidisk.c
@@ -825,7 +825,7 @@ grub_efidisk_get_device_name (grub_efi_handle_t *handle)
 	  if (! disk)
 	    return 1;
 
-	  if (disk->id == GRUB_DISK_DEVICE_EFIDISK_ID)
+	  if (disk->dev->id == GRUB_DISK_DEVICE_EFIDISK_ID)
 	    {
 	      struct grub_efidisk_data *d;
 

From d9f31a41ca6acb44a0f4d0ee78e0d464e3167fef Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Feb 2010 13:23:08 +0100
Subject: [PATCH 0542/1628] 2010-02-16  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Remove any reference to non-free fonts.

	* commands/videotest.c (grub_cmd_videotest): Use unifont by default.
	* docs/gfxmenu-theme-example.txt: Removed. It's both outdated and
	uses non-free components.
	* font/font.c (grub_font_get_name): Remove example name.
	* gfxmenu/gui_label.c (grub_gui_label_new): Use unifont by default.
	* gfxmenu/gui_list.c (grub_gui_list_new): Likewise.
	* gfxmenu/gui_progress_bar.c (grub_gui_progress_bar_new): Likewise.
	* gfxmenu/view.c (grub_gfxmenu_view_new): Likewise.
---
 ChangeLog                      |  13 ++++
 commands/videotest.c           |  11 +--
 docs/gfxmenu-theme-example.txt | 128 ---------------------------------
 font/font.c                    |   2 +-
 gfxmenu/gui_label.c            |   2 +-
 gfxmenu/gui_list.c             |   2 +-
 gfxmenu/gui_progress_bar.c     |   2 +-
 gfxmenu/view.c                 |   2 +-
 8 files changed, 21 insertions(+), 141 deletions(-)
 delete mode 100644 docs/gfxmenu-theme-example.txt

diff --git a/ChangeLog b/ChangeLog
index d6925f0dd..1817ad732 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-16  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Remove any reference to non-free fonts.
+
+	* commands/videotest.c (grub_cmd_videotest): Use unifont by default.
+	* docs/gfxmenu-theme-example.txt: Removed. It's both outdated and
+	uses non-free components.
+	* font/font.c (grub_font_get_name): Remove example name.
+	* gfxmenu/gui_label.c (grub_gui_label_new): Use unifont by default.
+	* gfxmenu/gui_list.c (grub_gui_list_new): Likewise.
+	* gfxmenu/gui_progress_bar.c (grub_gui_progress_bar_new): Likewise.
+	* gfxmenu/view.c (grub_gfxmenu_view_new): Likewise.
+
 2010-02-16  Georgy Buranov <gburanov@gmail.com>
 
 	* disk/efi/efidisk.c (grub_efidisk_get_device_name): Fix a typo.
diff --git a/commands/videotest.c b/commands/videotest.c
index 1730a2031..390811a71 100644
--- a/commands/videotest.c
+++ b/commands/videotest.c
@@ -69,9 +69,9 @@ grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),
   color = grub_video_map_rgb (0, 255, 255);
   grub_video_fill_rect (color, 100, 100, 100, 100);
 
-  sansbig = grub_font_get ("Helvetica Bold 24");
-  sans = grub_font_get ("Helvetica Bold 14");
-  sanssmall = grub_font_get ("Helvetica 8");
+  sansbig = grub_font_get ("Unknown Regular 16");
+  sans = grub_font_get ("Unknown Regular 16");
+  sanssmall = grub_font_get ("Unknown Regular 16");
   fixed = grub_font_get ("Fixed 20");
   if (! sansbig || ! sans || ! sanssmall || ! fixed)
     return grub_error (GRUB_ERR_BAD_FONT, "no font loaded");
@@ -126,11 +126,6 @@ grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),
   grub_font_draw_string (str, fixed, color, 16, texty);
   texty += grub_font_get_descent (fixed) + grub_font_get_leading (fixed);
 
-  /* Some character don't exist in the Helvetica font, so the font engine
-     will fall back to using glyphs from another font that does contain them.
-     TODO The font engine should be smart about selecting a replacement font
-     and prioritize fonts with similar sizes.  */
-
   texty += grub_font_get_ascent(sansbig);
   grub_font_draw_string (str, sansbig, color, 16, texty);
   texty += grub_font_get_descent (sansbig) + grub_font_get_leading (sansbig);
diff --git a/docs/gfxmenu-theme-example.txt b/docs/gfxmenu-theme-example.txt
deleted file mode 100644
index 4363dc8df..000000000
--- a/docs/gfxmenu-theme-example.txt
+++ /dev/null
@@ -1,128 +0,0 @@
-# GRUB gfxmenu theme "winter".
-# Uses background image from:
-# http://www.cyberpunkcafe.com/e107_plugins/autogallery/autogallery.php?show=1.Open%20Source%20Wallpaper
-# "without-leaves.png" was called "Without Leafs in Winter.png"
-
-lua-script: "winter.lua"
-title-text: ""
-title-font: "Helvetica Bold 18"
-status-font: "Helvetica 8"
-terminal-font: "Fixed 9"
-title-color: "40, 40, 40"
-status-color: "#FFF"
-status-bg-color: "0, 166, 183, 128"
-desktop-image: "without-leaves.png"
-desktop-color: "0, 154, 183"
-terminal-box: "terminal_*.png"
-
-+ boot_menu {
-   position = (120, 60)
-   preferred_size = (400, -1)
-   item_font = "Helvetica Bold 14"
-   selected_item_font = "Helvetica Bold 14"
-   item_color = "0, 0, 0"
-   selected_item_color = "203, 251, 255"
-   menu_pixmap_style = "menu_*.png"
-   selected_item_pixmap_style = "select_*.png"
-   icon_width = 44
-   icon_height = 44
-   item_height = 32
-   item_padding = 0
-   item_icon_space = 3
-   item_spacing = 11
-}
-
-# You can add text at arbitrary locations on the screen.
-# The specification within the "+label {...}" block is free-form,
-# so you can use as much or as little white space as you like.
-
-+ label {
-   position = (170, 50)
-   font = "smoothansi 13"
-   color = "0,0,128"
-   text = "This is the Winter theme ... brought to you by GRUB!"
-}
-
-# Show the text alignment supported by labels.
-+ vbox {
-   position = (220, 347)
-   preferred_size = (200, -1)     # A preferred size of -1 means automatic.
-   + label { text="Text alignment demo" align="center" font="aqui 11" }
-   + label { text="Left" align="left" font="cure 11" }
-   + label { text="Center" align="center" font="cure 11" }
-   + label { text="Right" align="right" font="cure 11" }
-}
-
-+ vbox {
-   position = (580, 10)
-   + label { text="GNU" font="gelly 11" color="0, 0, 0" }
-   + label { text="GRUB" font="aqui 11" color="0, 0, 0" }
-   + label { text="boot loader" font="cure 11" color="0, 0, 0" }
-}
-
-+ hbox {
-   position = (80, 10)
-   + label { text="GNU" font="gelly 11" color="0, 0, 0" }
-   + label { text="GRUB" font="aqui 11" color="0, 0, 0" }
-   + label { text="boot loader" font="cure 11" color="0, 0, 0" }
-}
-
-# Demonstration of a compound layout: boxes within boxes.
-+ hbox
-{
-   position = (480, 3)
-
-   + vbox
-   {
-      # Note: We can't just use 'size' to set the image's size,
-      #       since the vbox will resize the component according to its
-      #       preferred size, which for images is the native image size.
-
-      + image { file="/boot/grub/themes/icons/ubuntu.png"
-                preferred_size = (20, 20) }
-      + image { file="/boot/grub/themes/icons/gentoo.png"
-                preferred_size = (20, 20) }
-   }
-
-   + vbox
-   {
-      + label { text="GRand" font="cure 11" color=#99F }
-      + label { text="Unified" font="cure 11" color=#BBF }
-      + label { text="Bootloader" font="cure 11" color=#DDF }
-   }
-}
-
-# By defining a 'progress_bar' type component with an ID of '__timeout__',
-# the progress bar will be used to display the time remaining before an
-# the default entry is automatically booted.
-+ progress_bar
-{
-   id = "__timeout__"
-   position = (80, 393)
-   preferred_size = (500, 24)
-   font = "cure 11"
-   text_color = #000
-   fg_color = #CCF
-   bg_color = #66B
-   border_color = #006
-   show_text = false
-}
-
-# Although the progress_bar component is normally used to indicate the
-# time remaining, it's also possible to create other components with an ID
-# of '__timeout__'.  All components with and ID of 'timeout_bar' will have
-# the following properties set based on the timeout value:
-#   text, value, start, end, visible.
-# In this case, we have set 'show_text=false' on the progress bar, and use
-# the following label's 'text' property to display the message.
-+ label
-{
-   id = "__timeout__"
-   position = (80, 420)
-   preferred_size = (500, 24)
-   font = "lime 11"
-   color = #117
-   align = "center"
-}
-
-
diff --git a/font/font.c b/font/font.c
index 16f2ed35b..1b3dc6387 100644
--- a/font/font.c
+++ b/font/font.c
@@ -862,7 +862,7 @@ grub_font_get (const char *font_name)
     return &null_font;
 }
 
-/* Get the full name of the font.  For instance, "Helvetica Bold 12".  */
+/* Get the full name of the font.  */
 const char *
 grub_font_get_name (grub_font_t font)
 {
diff --git a/gfxmenu/gui_label.c b/gfxmenu/gui_label.c
index b2835ea1a..a9dd575ac 100644
--- a/gfxmenu/gui_label.c
+++ b/gfxmenu/gui_label.c
@@ -216,7 +216,7 @@ grub_gui_label_new (void)
   label->comp.ops = &label_ops;
   label->visible = 1;
   label->text = grub_strdup ("");
-  label->font = grub_font_get ("Helvetica 10");
+  label->font = grub_font_get ("Unknown Regular 16");
   label->color.red = 0;
   label->color.green = 0;
   label->color.blue = 0;
diff --git a/gfxmenu/gui_list.c b/gfxmenu/gui_list.c
index a78339385..0d771413f 100644
--- a/gfxmenu/gui_list.c
+++ b/gfxmenu/gui_list.c
@@ -566,7 +566,7 @@ grub_gui_list_new (void)
 
   self->visible = 1;
 
-  default_font = grub_font_get ("Helvetica 12");
+  default_font = grub_font_get ("Unknown Regular 16");
   default_fg_color = grub_gui_color_rgb (0, 0, 0);
   default_bg_color = grub_gui_color_rgb (255, 255, 255);
 
diff --git a/gfxmenu/gui_progress_bar.c b/gfxmenu/gui_progress_bar.c
index 4fda61d49..d786aae31 100644
--- a/gfxmenu/gui_progress_bar.c
+++ b/gfxmenu/gui_progress_bar.c
@@ -371,7 +371,7 @@ grub_gui_progress_bar_new (void)
   self->progress.ops = &progress_bar_pb_ops;
   self->progress.component.ops = &progress_bar_ops;
   self->visible = 1;
-  self->font = grub_font_get ("Helvetica 10");
+  self->font = grub_font_get ("Unknown Regular 16");
   grub_gui_color_t black = { .red = 0, .green = 0, .blue = 0, .alpha = 255 };
   grub_gui_color_t gray = { .red = 128, .green = 128, .blue = 128, .alpha = 255 };
   grub_gui_color_t lightgray = { .red = 200, .green = 200, .blue = 200, .alpha = 255 };
diff --git a/gfxmenu/view.c b/gfxmenu/view.c
index 611c01e1b..bf637a96d 100644
--- a/gfxmenu/view.c
+++ b/gfxmenu/view.c
@@ -66,7 +66,7 @@ grub_gfxmenu_view_new (const char *theme_path,
   view->screen.width = width;
   view->screen.height = height;
 
-  default_font = grub_font_get ("Helvetica 12");
+  default_font = grub_font_get ("Unknown Regular 16");
   default_fg_color = grub_gui_color_rgb (0, 0, 0);
   default_bg_color = grub_gui_color_rgb (255, 255, 255);
 

From 232f7e29c95654932f3ad291dcb7194c27a45be4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Feb 2010 22:39:59 +0100
Subject: [PATCH 0543/1628] SMBus on CS5536 support

---
 bus/cs5536.c                   | 213 +++++++++++++++++++++++++++++++++
 commands/mips/yeeloong/lsspd.c |  92 ++++++++++++++
 conf/mips-yeeloong.rmk         |  11 ++
 disk/ata.c                     |   3 +-
 include/grub/cs5536.h          |  62 ++++++++++
 include/grub/smbus.h           |  39 ++++++
 6 files changed, 419 insertions(+), 1 deletion(-)
 create mode 100644 bus/cs5536.c
 create mode 100644 commands/mips/yeeloong/lsspd.c
 create mode 100644 include/grub/cs5536.h
 create mode 100644 include/grub/smbus.h

diff --git a/bus/cs5536.c b/bus/cs5536.c
new file mode 100644
index 000000000..3a7ac2bb1
--- /dev/null
+++ b/bus/cs5536.c
@@ -0,0 +1,213 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/cs5536.h>
+#include <grub/pci.h>
+#include <grub/time.h>
+
+int
+grub_cs5536_find (grub_pci_device_t *devp)
+{
+  int found = 0;
+  auto int NESTED_FUNC_ATTR hook (grub_pci_device_t dev,
+				  grub_pci_id_t pciid);
+
+  int NESTED_FUNC_ATTR hook (grub_pci_device_t dev,
+			     grub_pci_id_t pciid)
+  {
+    if (pciid == GRUB_CS5536_PCIID)
+      {
+	*devp = dev;
+	found = 1;
+	return 1;
+      }
+    return 0;
+  }
+
+  grub_pci_iterate (hook);
+
+  return found;
+}
+
+grub_uint64_t
+grub_cs5536_read_msr (grub_pci_device_t dev, grub_uint32_t addr)
+{
+  grub_uint64_t ret = 0;
+  grub_pci_write (grub_pci_make_address (dev, GRUB_CS5536_MSR_MAILBOX_ADDR),
+		  addr);
+  ret = (grub_uint64_t)
+    grub_pci_read (grub_pci_make_address (dev, GRUB_CS5536_MSR_MAILBOX_DATA0));
+  ret |= (((grub_uint64_t) 
+	  grub_pci_read (grub_pci_make_address (dev,
+						GRUB_CS5536_MSR_MAILBOX_DATA1)))
+	  << 32);
+  return ret;
+}
+
+void
+grub_cs5536_write_msr (grub_pci_device_t dev, grub_uint32_t addr,
+		       grub_uint64_t val)
+{
+  grub_pci_write (grub_pci_make_address (dev, GRUB_CS5536_MSR_MAILBOX_ADDR),
+		  addr);
+  grub_pci_write (grub_pci_make_address (dev, GRUB_CS5536_MSR_MAILBOX_DATA0),
+		  val & 0xffffffff);
+  grub_pci_write (grub_pci_make_address (dev, GRUB_CS5536_MSR_MAILBOX_DATA1),
+		  val >> 32);
+}
+
+grub_err_t
+grub_cs5536_smbus_wait (grub_port_t smbbase)
+{
+  grub_uint64_t start = grub_get_time_ms ();
+  while (1)
+    {
+      grub_uint8_t status;
+      status = grub_inb (smbbase + GRUB_CS5536_SMB_REG_STATUS);
+      if (status & (1 << 6))
+	return GRUB_ERR_NONE;	
+      if (status & (1 << 5))
+	return grub_error (GRUB_ERR_IO, "SM bus error");
+      if (status & (1 << 4))
+	return grub_error (GRUB_ERR_IO, "NACK received");
+      if (grub_get_time_ms () > start + 40)
+	return grub_error (GRUB_ERR_IO, "SM stalled");
+    }
+
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_cs5536_read_spd_byte (grub_port_t smbbase, grub_uint8_t dev,
+			   grub_uint8_t addr, grub_uint8_t *res)
+{
+  grub_err_t err;
+
+  /* Send START.  */
+  grub_outb (grub_inb (smbbase + GRUB_CS5536_SMB_REG_CTRL1)
+	     | GRUB_CS5536_SMB_REG_CTRL1_START,
+	     smbbase + GRUB_CS5536_SMB_REG_CTRL1);
+
+  /* Send device address.  */
+  err = grub_cs5536_smbus_wait (smbbase); 
+  if (err) 
+    return err;
+  grub_outb (dev << 1, smbbase + GRUB_CS5536_SMB_REG_DATA);
+
+  /* Send ACK.  */
+  err = grub_cs5536_smbus_wait (smbbase);
+  if (err)
+    return err;
+  grub_outb (grub_inb (smbbase + GRUB_CS5536_SMB_REG_CTRL1)
+	     | GRUB_CS5536_SMB_REG_CTRL1_ACK,
+	     smbbase + GRUB_CS5536_SMB_REG_CTRL1);
+
+  /* Send byte address.  */
+  grub_outb (addr, smbbase + GRUB_CS5536_SMB_REG_DATA);
+
+  /* Send START.  */
+  err = grub_cs5536_smbus_wait (smbbase); 
+  if (err) 
+    return err;
+  grub_outb (grub_inb (smbbase + GRUB_CS5536_SMB_REG_CTRL1)
+	     | GRUB_CS5536_SMB_REG_CTRL1_START,
+	     smbbase + GRUB_CS5536_SMB_REG_CTRL1);
+
+  /* Send device address.  */
+  err = grub_cs5536_smbus_wait (smbbase);
+  if (err)
+    return err;
+  grub_outb ((dev << 1) | 1, smbbase + GRUB_CS5536_SMB_REG_DATA);
+
+  /* Send STOP.  */
+  err = grub_cs5536_smbus_wait (smbbase);
+  if (err)
+    return err;
+  grub_outb (grub_inb (smbbase + GRUB_CS5536_SMB_REG_CTRL1)
+	     | GRUB_CS5536_SMB_REG_CTRL1_STOP,
+	     smbbase + GRUB_CS5536_SMB_REG_CTRL1);
+
+  err = grub_cs5536_smbus_wait (smbbase);
+  if (err) 
+    return err;
+  *res = grub_inb (smbbase + GRUB_CS5536_SMB_REG_DATA);
+
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_cs5536_init_smbus (grub_pci_device_t dev, grub_uint16_t divisor,
+			grub_port_t *smbbase)
+{
+  grub_uint64_t smbbar;
+
+  smbbar = grub_cs5536_read_msr (dev, GRUB_CS5536_MSR_SMB_BAR);
+
+  /* FIXME  */
+  if (!(smbbar & GRUB_CS5536_LBAR_ENABLE))
+    return grub_error(GRUB_ERR_IO, "SMB controller not enabled\n");
+  *smbbase = (smbbar & GRUB_CS5536_LBAR_ADDR_MASK) + GRUB_MACHINE_PCI_IO_BASE;
+
+  if (divisor < 8)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid divisor");
+
+  /* Disable SMB.  */
+  grub_outb (0, *smbbase + GRUB_CS5536_SMB_REG_CTRL2);
+
+  /* Disable interrupts.  */
+  grub_outb (0, *smbbase + GRUB_CS5536_SMB_REG_CTRL1);
+
+  /* Set as master.  */
+  grub_outb (GRUB_CS5536_SMB_REG_ADDR_MASTER,
+  	     *smbbase + GRUB_CS5536_SMB_REG_ADDR);
+
+  /* Launch.  */
+  grub_outb (((divisor >> 7) & 0xff), *smbbase + GRUB_CS5536_SMB_REG_CTRL3);
+  grub_outb (((divisor << 1) & 0xfe) | GRUB_CS5536_SMB_REG_CTRL2_ENABLE,
+	     *smbbase + GRUB_CS5536_SMB_REG_CTRL2);
+  
+  return GRUB_ERR_NONE; 
+}
+
+grub_err_t
+grub_cs5536_read_spd (grub_port_t smbbase, grub_uint8_t dev,
+		      struct grub_smbus_spd *res)
+{
+  grub_err_t err;
+  grub_size_t size;
+  grub_uint8_t b;
+  grub_size_t ptr;
+
+  err = grub_cs5536_read_spd_byte (smbbase, dev, 0, &b);
+  if (err)
+    return err;
+  if (b == 0)
+    return grub_error (GRUB_ERR_IO, "no SPD found");
+  size = b;
+  
+  ((grub_uint8_t *) res)[0] = b;
+  for (ptr = 1; ptr < size; ptr++)
+    {
+      err = grub_cs5536_read_spd_byte (smbbase, dev, ptr,
+				       &((grub_uint8_t *) res)[ptr]);
+      if (err)
+	return err;
+    }
+  return GRUB_ERR_NONE;
+}
diff --git a/commands/mips/yeeloong/lsspd.c b/commands/mips/yeeloong/lsspd.c
new file mode 100644
index 000000000..539cda34c
--- /dev/null
+++ b/commands/mips/yeeloong/lsspd.c
@@ -0,0 +1,92 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/mm.h>
+#include <grub/err.h>
+#include <grub/dl.h>
+#include <grub/command.h>
+#include <grub/cs5536.h>
+
+static grub_err_t
+grub_cmd_lsspd (grub_command_t cmd __attribute__ ((unused)),
+		int argc __attribute__ ((unused)),
+		char **args __attribute__ ((unused)))
+{
+  grub_pci_device_t dev;
+  grub_port_t smbbase;
+  int i;
+  grub_err_t err;
+
+  if (!grub_cs5536_find (&dev))
+    {
+      grub_printf ("No CS5536 found\n");
+      return GRUB_ERR_NONE;
+    }
+  grub_printf ("CS5536 at %d:%d.%d\n", grub_pci_get_bus (dev),
+	       grub_pci_get_device (dev), grub_pci_get_function (dev));
+  
+  err = grub_cs5536_init_smbus (dev, 0x7fff, &smbbase);
+  if (err)
+    return err;
+
+  grub_printf ("SMB base = 0x%x\n", smbbase);
+
+  for (i = GRUB_SMB_RAM_START_ADDR;
+       i < GRUB_SMB_RAM_START_ADDR + GRUB_SMB_RAM_NUM_MAX; i++)
+    {
+      struct grub_smbus_spd spd;
+      grub_memset (&spd, 0, sizeof (spd));
+      grub_printf ("Device %d\n", i);
+      err = grub_cs5536_read_spd (smbbase, i, &spd);
+      if (err)
+	{
+	  grub_print_error ();
+	  continue;
+	}
+      grub_printf ("Written SPD bytes: %d B.\n", spd.written_size);
+      grub_printf ("Total flash size: %d B.\n", 1 << spd.log_total_flash_size);
+      if (spd.memory_type == GRUB_SMBUS_SPD_MEMORY_TYPE_DDR2)
+	{
+	  char str[sizeof (spd.ddr2.part_number) + 1];
+	  grub_printf ("Memory type: DDR2.\n");
+	  grub_memcpy (str, spd.ddr2.part_number,
+		       sizeof (spd.ddr2.part_number));
+	  str[sizeof (spd.ddr2.part_number)] = 0;
+	  grub_printf ("Part no: %s.\n", str);
+	}
+      else
+	grub_printf ("Memory type: Unknown.\n");
+    }
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_command_t cmd;
+
+GRUB_MOD_INIT(lsspd)
+{
+  cmd = grub_register_command ("lsspd", grub_cmd_lsspd, 0,
+			       "Print Memory information.");
+}
+
+GRUB_MOD_FINI(lsspd)
+{
+  grub_unregister_command (cmd);
+}
diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index eb0dc9676..901a63dd0 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -73,6 +73,17 @@ datehook_mod_SOURCES = hook/datehook.c
 datehook_mod_CFLAGS = $(COMMON_CFLAGS)
 datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For lsspd.mod
+pkglib_MODULES += lsspd.mod
+lsspd_mod_SOURCES = commands/mips/yeeloong/lsspd.c
+lsspd_mod_CFLAGS = $(COMMON_CFLAGS)
+lsspd_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For cs5536.mod
+pkglib_MODULES += cs5536.mod
+cs5536_mod_SOURCES = bus/cs5536.c
+cs5536_mod_CFLAGS = $(COMMON_CFLAGS)
+cs5536_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 sbin_SCRIPTS += grub-install
 grub_install_SOURCES = util/grub-install.in
diff --git a/disk/ata.c b/disk/ata.c
index 687ed9378..662fe71a7 100644
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -24,6 +24,7 @@
 #include <grub/time.h>
 #include <grub/pci.h>
 #include <grub/scsi.h>
+#include <grub/cs5536.h>
 
 /* At the moment, only two IDE ports are supported.  */
 static const grub_port_t grub_ata_ioaddress[] = { 0x1f0, 0x170 };
@@ -408,7 +409,7 @@ grub_ata_pciinit (grub_pci_device_t dev,
   class = grub_pci_read (addr);
 
   /* AMD CS5536 Southbridge.  */
-  if (pciid == 0x208f1022)
+  if (pciid == GRUB_CS5536_PCIID)
     {
       cs5536 = 1;
       nports = 1;
diff --git a/include/grub/cs5536.h b/include/grub/cs5536.h
new file mode 100644
index 000000000..233362160
--- /dev/null
+++ b/include/grub/cs5536.h
@@ -0,0 +1,62 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#ifndef GRUB_CS5536_HEADER
+#define GRUB_CS5536_HEADER 1
+
+#include <grub/pci.h>
+#include <grub/err.h>
+#include <grub/smbus.h>
+
+#define GRUB_CS5536_PCIID 0x208f1022
+#define GRUB_CS5536_MSR_MAILBOX_ADDR  0xf4
+#define GRUB_CS5536_MSR_MAILBOX_DATA0 0xf8
+#define GRUB_CS5536_MSR_MAILBOX_DATA1 0xfc
+#define GRUB_CS5536_MSR_SMB_BAR 0x8000000b
+#define GRUB_CS5536_SMB_REG_DATA 0x0
+#define GRUB_CS5536_SMB_REG_STATUS 0x1
+#define GRUB_CS5536_SMB_REG_CTRL1 0x3
+#define GRUB_CS5536_SMB_REG_CTRL1_START 0x01
+#define GRUB_CS5536_SMB_REG_CTRL1_STOP  0x02
+#define GRUB_CS5536_SMB_REG_CTRL1_ACK   0x10
+#define GRUB_CS5536_SMB_REG_ADDR 0x4
+#define GRUB_CS5536_SMB_REG_ADDR_MASTER 0x0
+#define GRUB_CS5536_SMB_REG_CTRL2 0x5
+#define GRUB_CS5536_SMB_REG_CTRL2_ENABLE 0x1
+#define GRUB_CS5536_SMB_REG_CTRL3 0x6
+
+#define GRUB_CS5536_LBAR_ADDR_MASK 0x000000000000fff8ULL
+#define GRUB_CS5536_LBAR_ADDR_OFF 3
+#define GRUB_CS5536_LBAR_ENABLE 0x0000000100000000ULL
+#define GRUB_SMB_RAM_START_ADDR 0x50
+#define GRUB_SMB_RAM_NUM_MAX 0x08
+
+int grub_cs5536_find (grub_pci_device_t *devp);
+
+grub_uint64_t grub_cs5536_read_msr (grub_pci_device_t dev, grub_uint32_t addr);
+void grub_cs5536_write_msr (grub_pci_device_t dev, grub_uint32_t addr,
+			    grub_uint64_t val);
+grub_err_t grub_cs5536_read_spd_byte (grub_port_t smbbase, grub_uint8_t dev,
+				      grub_uint8_t addr, grub_uint8_t *res);
+grub_err_t grub_cs5536_read_spd (grub_port_t smbbase, grub_uint8_t dev,
+				 struct grub_smbus_spd *res);
+grub_err_t grub_cs5536_smbus_wait (grub_port_t smbbase);
+grub_err_t grub_cs5536_init_smbus (grub_pci_device_t dev, grub_uint16_t divisor,
+				   grub_port_t *smbbase);
+
+#endif
diff --git a/include/grub/smbus.h b/include/grub/smbus.h
new file mode 100644
index 000000000..6e9b5005c
--- /dev/null
+++ b/include/grub/smbus.h
@@ -0,0 +1,39 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#ifndef GRUB_SMBUS_HEADER
+#define GRUB_SMBUS_HEADER 1
+
+struct grub_smbus_spd
+{
+  grub_uint8_t written_size;
+  grub_uint8_t log_total_flash_size;
+#define GRUB_SMBUS_SPD_MEMORY_TYPE_DDR2 8
+  grub_uint8_t memory_type;
+  union
+  {
+    grub_uint8_t unknown[253];
+    struct {
+      grub_uint8_t unused1[70];
+      grub_uint8_t part_number[18];
+      grub_uint8_t unused2[165];
+    } ddr2;
+  };
+};
+
+#endif

From 1eb746f2749f09ab7e1f8e83bc5cda7fb24bafbc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Feb 2010 22:40:53 +0100
Subject: [PATCH 0544/1628] Initialise remaining UART registers on Yeeloong

---
 include/grub/serial.h | 10 ++++++++--
 term/serial.c         | 11 +++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/include/grub/serial.h b/include/grub/serial.h
index 1c35b4093..758b6fb3e 100644
--- a/include/grub/serial.h
+++ b/include/grub/serial.h
@@ -59,9 +59,15 @@
 #define UART_DLAB	0x80
 
 /* Enable the FIFO.  */
-#define UART_ENABLE_FIFO	0xC7
+#define UART_ENABLE_FIFO_TRIGGER14	0xC7
+
+/* Enable the FIFO.  */
+#define UART_ENABLE_FIFO_TRIGGER1       0x07
 
 /* Turn on DTR, RTS, and OUT2.  */
-#define UART_ENABLE_MODEM	0x0B
+#define UART_ENABLE_DTRRTS	0x03
+
+/* Turn on DTR, RTS, and OUT2.  */
+#define UART_ENABLE_OUT2	0x08
 
 #endif /* ! GRUB_SERIAL_MACHINE_HEADER */
diff --git a/term/serial.c b/term/serial.c
index 05497ce40..2dbebc2f1 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -300,10 +300,17 @@ serial_hw_init (void)
   /* In Yeeloong serial port has only 3 wires.  */
 #ifndef GRUB_MACHINE_MIPS_YEELOONG
   /* Enable the FIFO.  */
-  grub_outb (UART_ENABLE_FIFO, serial_settings.port + UART_FCR);
+  grub_outb (UART_ENABLE_FIFO_TRIGGER1, serial_settings.port + UART_FCR);
+
+  /* Turn on DTR and RTS.  */
+  grub_outb (UART_ENABLE_DTRRTS, serial_settings.port + UART_MCR);
+#else
+  /* Enable the FIFO.  */
+  grub_outb (UART_ENABLE_FIFO_TRIGGER14, serial_settings.port + UART_FCR);
 
   /* Turn on DTR, RTS, and OUT2.  */
-  grub_outb (UART_ENABLE_MODEM, serial_settings.port + UART_MCR);
+  grub_outb (UART_ENABLE_DTRRTS | UART_ENABLE_OUT2,
+	     serial_settings.port + UART_MCR);
 #endif
 
   /* Drain the input buffer.  */

From a1efcc79d346648871c976543d43ed1e9ad38f7a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Feb 2010 22:41:29 +0100
Subject: [PATCH 0545/1628] Firmware startup block (for now just output a
 string on console)

---
 include/grub/mips/yeeloong/serial.h |  5 ++
 kern/mips/yeeloong/fwstart.S        | 81 +++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 kern/mips/yeeloong/fwstart.S

diff --git a/include/grub/mips/yeeloong/serial.h b/include/grub/mips/yeeloong/serial.h
index 9390ea18a..bced102b6 100644
--- a/include/grub/mips/yeeloong/serial.h
+++ b/include/grub/mips/yeeloong/serial.h
@@ -19,6 +19,11 @@
 #ifndef GRUB_MACHINE_SERIAL_HEADER
 #define GRUB_MACHINE_SERIAL_HEADER	1
 
+#ifndef ASM_FILE
 #define GRUB_MACHINE_SERIAL_PORTS { 0xbff003f8 }
+#else
+#define GRUB_MACHINE_SERIAL_PORT_HI  0xbff0
+#define GRUB_MACHINE_SERIAL_PORT_LO  0x03f8 
+#endif
 
 #endif 
diff --git a/kern/mips/yeeloong/fwstart.S b/kern/mips/yeeloong/fwstart.S
new file mode 100644
index 000000000..5132d7584
--- /dev/null
+++ b/kern/mips/yeeloong/fwstart.S
@@ -0,0 +1,81 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2000,2001,2002,2003,2004,2005,2007,2008,2009,2010  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/mips/yeeloong/serial.h>
+#include <grub/serial.h>
+
+	.set noreorder
+	.set noat
+	.set nomacro
+
+	bal serial_hw_init
+	 nop
+self:	
+	b self
+	 nop
+
+	/* Same as similarly named C function but in asm since
+	   we need it early.  */
+	/* In: none. Out: none. Clobbered: $t0, $t1, $a0.  */
+serial_hw_init:
+	lui $t0, GRUB_MACHINE_SERIAL_PORT_HI
+
+	/* Turn off the interrupt.  */
+	sb $zero, (GRUB_MACHINE_SERIAL_PORT_LO + UART_IER)($t0)
+
+	/* Set DLAB.  */
+	ori $t1, $zero, UART_DLAB
+	sb  $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_LCR)($t0)
+
+	/* Set the baud rate 115200.  */
+	ori $t1, $zero, 2
+	sb $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_DLL)($t0) 
+	sb $zero, (GRUB_MACHINE_SERIAL_PORT_LO + UART_DLH)($t0) 
+
+	/* Set the line status.  */
+	ori $t1, $zero, (UART_NO_PARITY | UART_8BITS_WORD | UART_1_STOP_BIT)
+        sb  $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_LCR)($t0)
+
+	/* Enable the FIFO.  */
+	ori $t1, $zero, UART_ENABLE_FIFO_TRIGGER1
+	sb $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_FCR)($t0)
+
+	/* Turn on DTR and RTS.  */
+	ori $t1, $zero, UART_ENABLE_DTRRTS
+	sb  $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_MCR)($t0)
+
+	lui $t0, 0xbff0
+	addiu $t0, $t0, 0x03f8	
+
+	/* Let message return to original caller.  */
+	lui  $a0, %hi(notification_string)
+	addiu $a0, $a0, %lo(notification_string)
+
+	/* Print message on serial console.  */
+	/* In: $a0 = asciiz message. Out: none. Clobbered: $t0, $t1, $a0.  */
+message:
+	lui $t0, GRUB_MACHINE_SERIAL_PORT_HI
+1:	
+	lb  $t1, 0($a0)
+	addiu $a0, $a0, 1
+	bne $t1, $zero, 1b
+	 sb  $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_TX)($t0)
+	jr  $ra
+	 nop
+
+notification_string:	.asciz "GRUB "

From 7517048135ddc577be71751bca56dedfe37f00e6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 17 Feb 2010 21:10:58 +0100
Subject: [PATCH 0546/1628] Working SPD reading in fwstart.img

---
 bus/cs5536.c                      |   6 +-
 conf/mips-yeeloong.rmk            |   8 +
 include/grub/cs5536.h             |  21 ++-
 include/grub/mips/yeeloong/boot.h |  27 ++++
 include/grub/mips/yeeloong/pci.h  |  10 ++
 include/grub/pci.h                |   4 +
 include/grub/smbus.h              |   3 +
 kern/mips/yeeloong/fwstart.S      | 254 +++++++++++++++++++++++++++++-
 8 files changed, 321 insertions(+), 12 deletions(-)

diff --git a/bus/cs5536.c b/bus/cs5536.c
index 3a7ac2bb1..f481397b7 100644
--- a/bus/cs5536.c
+++ b/bus/cs5536.c
@@ -80,11 +80,11 @@ grub_cs5536_smbus_wait (grub_port_t smbbase)
     {
       grub_uint8_t status;
       status = grub_inb (smbbase + GRUB_CS5536_SMB_REG_STATUS);
-      if (status & (1 << 6))
+      if (status & GRUB_CS5536_SMB_REG_STATUS_SDAST)
 	return GRUB_ERR_NONE;	
-      if (status & (1 << 5))
+      if (status & GRUB_CS5536_SMB_REG_STATUS_BER)
 	return grub_error (GRUB_ERR_IO, "SM bus error");
-      if (status & (1 << 4))
+      if (status & GRUB_CS5536_SMB_REG_STATUS_NACK)
 	return grub_error (GRUB_ERR_IO, "NACK received");
       if (grub_get_time_ms () > start + 40)
 	return grub_error (GRUB_ERR_IO, "SM stalled");
diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 901a63dd0..aa3e96fa0 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -30,6 +30,14 @@ kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
 	-Wl,-N,-S,-Ttext,$(LINK_BASE),-Bstatic
 kernel_img_FORMAT = binary
 
+pkglib_IMAGES += fwstart.img
+fwstart_img_SOURCES = kern/$(target_cpu)/$(target_machine)/fwstart.S
+fwstart_img_CFLAGS = $(COMMON_CFLAGS)
+fwstart_img_ASFLAGS = $(COMMON_ASFLAGS)
+fwstart_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
+	-Wl,-N,-S,-Ttext,0xbfc00000,-Bstatic
+fwstart_img_FORMAT = binary
+
 # For ata.mod.
 pkglib_MODULES += ata.mod
 ata_mod_SOURCES = disk/ata.c
diff --git a/include/grub/cs5536.h b/include/grub/cs5536.h
index 233362160..51a21eb6e 100644
--- a/include/grub/cs5536.h
+++ b/include/grub/cs5536.h
@@ -19,17 +19,23 @@
 #ifndef GRUB_CS5536_HEADER
 #define GRUB_CS5536_HEADER 1
 
+#ifndef ASM_FILE
 #include <grub/pci.h>
 #include <grub/err.h>
 #include <grub/smbus.h>
+#endif
 
 #define GRUB_CS5536_PCIID 0x208f1022
 #define GRUB_CS5536_MSR_MAILBOX_ADDR  0xf4
 #define GRUB_CS5536_MSR_MAILBOX_DATA0 0xf8
 #define GRUB_CS5536_MSR_MAILBOX_DATA1 0xfc
 #define GRUB_CS5536_MSR_SMB_BAR 0x8000000b
+#define GRUB_CS5536_MSR_GPIO_BAR 0x8000000c
 #define GRUB_CS5536_SMB_REG_DATA 0x0
 #define GRUB_CS5536_SMB_REG_STATUS 0x1
+#define GRUB_CS5536_SMB_REG_STATUS_SDAST (1 << 6)
+#define GRUB_CS5536_SMB_REG_STATUS_BER (1 << 5)
+#define GRUB_CS5536_SMB_REG_STATUS_NACK (1 << 4)
 #define GRUB_CS5536_SMB_REG_CTRL1 0x3
 #define GRUB_CS5536_SMB_REG_CTRL1_START 0x01
 #define GRUB_CS5536_SMB_REG_CTRL1_STOP  0x02
@@ -41,11 +47,19 @@
 #define GRUB_CS5536_SMB_REG_CTRL3 0x6
 
 #define GRUB_CS5536_LBAR_ADDR_MASK 0x000000000000fff8ULL
-#define GRUB_CS5536_LBAR_ADDR_OFF 3
 #define GRUB_CS5536_LBAR_ENABLE 0x0000000100000000ULL
-#define GRUB_SMB_RAM_START_ADDR 0x50
-#define GRUB_SMB_RAM_NUM_MAX 0x08
 
+/* PMON-compatible LBARs.  */
+#define GRUB_CS5536_LBAR_GPIO      0x0b000
+#define GRUB_CS5536_LBAR_SMBUS     0x0b390
+
+#define GRUB_GPIO_SMBUS_PINS ((1 << 14) | (1 << 15))
+#define GRUB_GPIO_REG_OUT_EN 0x4
+#define GRUB_GPIO_REG_OUT_AUX1 0x10
+#define GRUB_GPIO_REG_IN_EN 0x20
+#define GRUB_GPIO_REG_IN_AUX1 0x34
+
+#ifndef ASM_FILE
 int grub_cs5536_find (grub_pci_device_t *devp);
 
 grub_uint64_t grub_cs5536_read_msr (grub_pci_device_t dev, grub_uint32_t addr);
@@ -58,5 +72,6 @@ grub_err_t grub_cs5536_read_spd (grub_port_t smbbase, grub_uint8_t dev,
 grub_err_t grub_cs5536_smbus_wait (grub_port_t smbbase);
 grub_err_t grub_cs5536_init_smbus (grub_pci_device_t dev, grub_uint16_t divisor,
 				   grub_port_t *smbbase);
+#endif
 
 #endif
diff --git a/include/grub/mips/yeeloong/boot.h b/include/grub/mips/yeeloong/boot.h
index e69de29bb..205c557fe 100644
--- a/include/grub/mips/yeeloong/boot.h
+++ b/include/grub/mips/yeeloong/boot.h
@@ -0,0 +1,27 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#ifndef GRUB_BOOT_MACHINE_HEADER
+#define GRUB_BOOT_MACHINE_HEADER	1
+
+#define GRUB_MACHINE_FLASH_START            0xbfc00000
+#define GRUB_MACHINE_FLASH_TLB_REFILL       0xbfc00200
+#define GRUB_MACHINE_FLASH_CACHE_ERROR      0xbfc00300
+#define GRUB_MACHINE_FLASH_OTHER_EXCEPTION  0xbfc00380
+
+#endif
diff --git a/include/grub/mips/yeeloong/pci.h b/include/grub/mips/yeeloong/pci.h
index c7bd31d4f..f50cdcb35 100644
--- a/include/grub/mips/yeeloong/pci.h
+++ b/include/grub/mips/yeeloong/pci.h
@@ -19,16 +19,24 @@
 #ifndef	GRUB_MACHINE_PCI_H
 #define	GRUB_MACHINE_PCI_H	1
 
+#ifndef ASM_FILE
 #include <grub/types.h>
 #include <grub/cpu/io.h>
+#endif
 
 #define GRUB_PCI_NUM_BUS        1
 #define GRUB_PCI_NUM_DEVICES    16
 
 #define GRUB_MACHINE_PCI_IO_BASE          0xbfd00000
 #define GRUB_MACHINE_PCI_CONFSPACE        0xbfe80000
+
+#ifndef ASM_FILE
 #define GRUB_MACHINE_PCI_CONF_CTRL_REG    (*(volatile grub_uint32_t *) 0xbfe00118)
 #define GRUB_MACHINE_PCI_IO_CTRL_REG      (*(volatile grub_uint32_t *) 0xbfe00110)
+#else
+#define GRUB_MACHINE_PCI_CONF_CTRL_REG_HI    0xbfe0
+#define GRUB_MACHINE_PCI_CONF_CTRL_REG_LO    0x0118
+#endif
 #define GRUB_MACHINE_PCI_WIN_MASK_SIZE    6
 #define GRUB_MACHINE_PCI_WIN_MASK         ((1 << GRUB_MACHINE_PCI_WIN_MASK_SIZE) - 1)
 
@@ -46,6 +54,7 @@
 #define GRUB_MACHINE_PCI_WIN2_ADDR        0xb4000000
 #define GRUB_MACHINE_PCI_WIN3_ADDR        0xb8000000
 
+#ifndef ASM_FILE
 static inline grub_uint32_t
 grub_pci_read (grub_pci_address_t addr)
 {
@@ -101,5 +110,6 @@ void
 grub_pci_device_unmap_range (grub_pci_device_t dev __attribute__ ((unused)),
 			     volatile void *mem,
 			     grub_size_t size __attribute__ ((unused)));
+#endif
 
 #endif /* GRUB_MACHINE_PCI_H */
diff --git a/include/grub/pci.h b/include/grub/pci.h
index 1f3ac7fc7..17f769f4c 100644
--- a/include/grub/pci.h
+++ b/include/grub/pci.h
@@ -19,8 +19,10 @@
 #ifndef	GRUB_PCI_H
 #define	GRUB_PCI_H	1
 
+#ifndef ASM_FILE
 #include <grub/types.h>
 #include <grub/symbol.h>
+#endif
 
 #define  GRUB_PCI_ADDR_SPACE_MASK	0x01
 #define  GRUB_PCI_ADDR_SPACE_MEMORY	0x00
@@ -66,6 +68,7 @@
 #define  GRUB_PCI_REG_MIN_GNT      0x3e
 #define  GRUB_PCI_REG_MAX_LAT      0x3f
 
+#ifndef ASM_FILE
 typedef grub_uint32_t grub_pci_id_t;
 
 #ifdef GRUB_UTIL
@@ -106,5 +109,6 @@ grub_pci_address_t EXPORT_FUNC(grub_pci_make_address) (grub_pci_device_t dev,
 						       int reg);
 
 void EXPORT_FUNC(grub_pci_iterate) (grub_pci_iteratefunc_t hook);
+#endif
 
 #endif /* GRUB_PCI_H */
diff --git a/include/grub/smbus.h b/include/grub/smbus.h
index 6e9b5005c..b9cc6ab9e 100644
--- a/include/grub/smbus.h
+++ b/include/grub/smbus.h
@@ -19,6 +19,9 @@
 #ifndef GRUB_SMBUS_HEADER
 #define GRUB_SMBUS_HEADER 1
 
+#define GRUB_SMB_RAM_START_ADDR 0x50
+#define GRUB_SMB_RAM_NUM_MAX 0x08
+
 struct grub_smbus_spd
 {
   grub_uint8_t written_size;
diff --git a/kern/mips/yeeloong/fwstart.S b/kern/mips/yeeloong/fwstart.S
index 5132d7584..59fe4d3e6 100644
--- a/kern/mips/yeeloong/fwstart.S
+++ b/kern/mips/yeeloong/fwstart.S
@@ -17,17 +17,107 @@
  */
 
 #include <grub/mips/yeeloong/serial.h>
+#include <grub/mips/yeeloong/pci.h>
+#include <grub/mips/yeeloong/boot.h>
+#include <grub/pci.h>
 #include <grub/serial.h>
+#include <grub/cs5536.h>
 
 	.set noreorder
 	.set noat
 	.set nomacro
 
+	.global start,_start,__start
+start:
+_start:
+__start:	
 	bal serial_hw_init
 	 nop
-self:	
-	b self
-	 nop
+	/* Find CS5536 controller.  */
+	/* $t4 chooses device in priority encoding.  */
+	/* Resulting value is kept in GRUB_MACHINE_PCI_CONF_CTRL_REG.
+	   This way we don't need to sacrifice a register for it.  */
+	/* We have only one bus (0). Function is 0.  */
+	lui $t0, GRUB_MACHINE_PCI_CONF_CTRL_REG_HI
+	lui $t1, %hi(GRUB_MACHINE_PCI_CONFSPACE)
+	lui $t3, %hi(GRUB_CS5536_PCIID)
+	addiu $t3, $t3, %lo(GRUB_CS5536_PCIID)
+	ori $t4, $zero, 1
+	lui $a0, %hi(no_cs5536)
+1:
+	andi $t4, $t4, 0xffff
+	beql  $t4, $zero, fatal
+	 addiu $a0, $a0, %lo(no_cs5536)
+	sw   $t4, GRUB_MACHINE_PCI_CONF_CTRL_REG_LO($t0)
+	lw   $t2, (%lo(GRUB_MACHINE_PCI_CONFSPACE) + GRUB_PCI_REG_PCI_ID) ($t1)
+	bnel  $t2, $t3, 1b
+	 sll $t4, $t4, 1
+
+	bal message
+	 addiu $a0, $a0, %lo(cs5536_found)
+	bal printhex
+	 move $a0, $t4
+
+	/* Initialise SMBus controller.  */
+	/* Set GPIO LBAR.  */
+	lui $a0, %hi(GRUB_CS5536_MSR_GPIO_BAR)
+	addiu $a0, $a0, %lo(GRUB_CS5536_MSR_GPIO_BAR)
+	ori $a1, $zero, GRUB_CS5536_LBAR_GPIO
+	/* Set mask to 0xf and enabled bit to 1.  */
+	bal wrmsr
+	 ori $a2, $zero, 0xf001
+
+	/* Set SMBUS LBAR.  */
+	lui $a0, %hi(GRUB_CS5536_MSR_SMB_BAR)
+	addiu $a0, $a0, %lo(GRUB_CS5536_MSR_SMB_BAR)
+	ori $a1, $zero, GRUB_CS5536_LBAR_SMBUS
+	/* Set mask to 0xf and enabled bit to 1.  */
+	bal wrmsr
+	 ori $a2, $zero, 0xf001
+
+	lui $a0, %hi(smbus_enabled)
+	bal message
+	  addiu $a0, $a0, %lo(smbus_enabled)
+
+	/* Enable SMBus controller pins.  */
+	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO)
+	ori $t1, $zero, GRUB_GPIO_SMBUS_PINS
+	sw  $t1, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO + GRUB_GPIO_REG_OUT_EN) ($t0)
+	sw  $t1, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO + GRUB_GPIO_REG_OUT_AUX1) ($t0)
+	sw  $t1, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO + GRUB_GPIO_REG_IN_EN) ($t0)
+	sw  $t1, %lo(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_GPIO + GRUB_GPIO_REG_IN_AUX1) ($t0)
+
+	lui $t0, %hi(GRUB_MACHINE_PCI_IO_BASE + GRUB_CS5536_LBAR_SMBUS)
+
+	/* Disable SMB.  */
+	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 + GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_CTRL1) ($t0)
+
+	/* Set as master.  */
+	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 + 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)
+
+	ori $a0, $zero, 0x50
+	bal read_spd
+	 move $a1, $zero
+	bal printhex
+	 move $a0, $v0
+
+	ori $a0, $zero, 0x50
+	bal read_spd
+	 ori $a1, $zero, 2
+	bal printhex
+	 move $a0, $v0
+	
+	lui $a0, %hi(not_implemented)
+	b fatal
+	 addiu $a0, $a0, %lo(not_implemented)
 
 	/* Same as similarly named C function but in asm since
 	   we need it early.  */
@@ -70,12 +160,164 @@ serial_hw_init:
 	/* In: $a0 = asciiz message. Out: none. Clobbered: $t0, $t1, $a0.  */
 message:
 	lui $t0, GRUB_MACHINE_SERIAL_PORT_HI
-1:	
+1:
+	lb $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_LSR)($t0)
+	andi $t1, $t1, UART_EMPTY_TRANSMITTER
+	beq $t1, $zero, 1b
+	 nop
 	lb  $t1, 0($a0)
-	addiu $a0, $a0, 1
+	sb  $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_TX)($t0)
 	bne $t1, $zero, 1b
-	 sb  $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_TX)($t0)
+	 addiu $a0, $a0, 1
 	jr  $ra
 	 nop
 
+	/* Print 32-bit hexadecimal on serial.
+           In:	$a0. Out: None. Clobbered: $a0, $t0, $t1, $t2
+	*/
+printhex:
+	lui $t0, GRUB_MACHINE_SERIAL_PORT_HI
+	ori $t2, $zero, 8
+1:
+	lb $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_LSR)($t0)
+	andi $t1, $t1, UART_EMPTY_TRANSMITTER
+	beq $t1, $zero, 1b
+	 nop
+	srl  $t1, $a0, 28
+	addiu $t1, $t1, -10
+	blt  $t1, $zero, 2f
+	 sll  $a0, $a0, 4
+	addiu $t1, $t1, 'A'-10-'0' 
+2:	addiu $t1, $t1, '0'+10
+	sb  $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_TX)($t0)
+	addiu $t2, $t2, -1
+	bne $t2, $zero, 1b
+	 nop
+	jr  $ra
+	 nop
+
+fatal:
+	bal message
+	 nop
+self:
+	b self
+	 nop
+
+	. = start + GRUB_MACHINE_FLASH_TLB_REFILL - GRUB_MACHINE_FLASH_START
+tlb_refill:	
+	lui $a0, %hi(unhandled_tlb_refill)
+	b fatal
+	 addiu $a0, $a0, %lo(unhandled_tlb_refill)
+
+	. = start + GRUB_MACHINE_FLASH_CACHE_ERROR - GRUB_MACHINE_FLASH_START
+cache_error:
+	lui $a0, %hi(unhandled_cache_error)
+	b fatal
+	 addiu $a0, $a0, %lo(unhandled_cache_error)
+
+	. = start + GRUB_MACHINE_FLASH_OTHER_EXCEPTION - GRUB_MACHINE_FLASH_START
+other_exception:
+	lui $a0, %hi(unhandled_exception)
+	b fatal
+	 addiu $a0, $a0, %lo(unhandled_exception)
+
+	/* Write CS5536 MSR.
+           In:   $a0 address, $a1 lower word, $a2 upper word.
+           Out:	 None
+           Clobbered:	 $t0
+	*/
+wrmsr:
+	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) + 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)
+	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
+	andi $t1, $t0, (GRUB_CS5536_SMB_REG_STATUS_BER | GRUB_CS5536_SMB_REG_STATUS_NACK)
+	beq $t1, $zero, 1b
+	 nop
+	jr $a0
+	 nop
+return:
+	jr $ra
+	 nop
+	
+	/* Read SPD byte. In: $a0 device, $a1 byte. Out: $v0 read byte (0x100 on failure).
+           Clobbered: $t0, $t1, $t2, $t3, $a0. */
+read_spd:
+	move $t2, $a0
+	move $t3, $ra
+	lui $a0, %hi(read_spd_fail)
+	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)
+	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) ($t0)
+	
+	/* Send device address.  */
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
+	sll $t1, $t2, 1
+	bal smbus_wait
+	 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)
+	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) ($t0)
+
+	/* Send byte address.  */
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
+	bal smbus_wait
+	 sb $a1, %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)
+	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) ($t0)
+
+	/* Send device address.  */
+	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
+	sll $t1, $t2, 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) ($t0)
+
+	/* Send STOP.  */
+	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) ($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:
+	jr $t3
+	 ori $v0, $v0, 0x100
+
 notification_string:	.asciz "GRUB "
+no_cs5536:	.asciz "No CS5536 found.\n\r"
+cs5536_found:	.asciz "CS5536 at "
+sm_failed: .asciz "SM transaction failed.\n\r"
+not_implemented: .asciz "Nothing more is implemented. Bye.\n\r"
+unhandled_tlb_refill:	.asciz "Unhandled TLB refill.\n\r"
+unhandled_cache_error:	.asciz "Unhandled cache error.\n\r"
+unhandled_exception:	.asciz "Unhandled exception.\n\r"
+smbus_enabled:	.asciz "SMBus controller enabled.\n\r"

From 0a39de87d9371ce8d1a844a6f52bdc81ae257420 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 18 Feb 2010 08:56:31 +0100
Subject: [PATCH 0547/1628] 2010-02-14  Samuel Thibault 
 <samuel.thibault@ens-lyon.org>

	* util/grub-mkconfig.in: Export GRUB_INIT_TUNE.
	* util/grub.d/00_header.in: Handle GRUB_INIT_TUNE.
---
 ChangeLog                | 5 +++++
 util/grub-mkconfig.in    | 3 ++-
 util/grub.d/00_header.in | 8 ++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1817ad732..38bb39ac9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-14  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* util/grub-mkconfig.in: Export GRUB_INIT_TUNE.
+	* util/grub.d/00_header.in: Handle GRUB_INIT_TUNE.
+
 2010-02-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Remove any reference to non-free fonts.
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 1363f479a..fb1dd4544 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -222,7 +222,8 @@ export GRUB_DEFAULT \
   GRUB_GFXMODE \
   GRUB_THEME \
   GRUB_GFXPAYLOAD_LINUX \
-  GRUB_DISABLE_OS_PROBER
+  GRUB_DISABLE_OS_PROBER \
+  GRUB_INIT_TUNE
 
 if test "x${grub_cfg}" != "x"; then
   rm -f ${grub_cfg}.new
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index a7b051daf..c86f7b867 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -158,3 +158,11 @@ else
 set timeout=${GRUB_TIMEOUT}
 EOF
 fi
+
+# Play an initial tune
+if [ "x${GRUB_INIT_TUNE}" != "x" ] ; then
+  cat << EOF
+insmod play
+play ${GRUB_INIT_TUNE}
+EOF
+fi

From 42b1d186858987e2672ac0c483fe47d864193f87 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 20 Feb 2010 11:15:51 +0100
Subject: [PATCH 0548/1628] 2010-02-20  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* video/fb/video_fb.c (grub_video_fb_scroll): Fix a pixel size bug.
	Reported by: Michael Suchanek.
---
 ChangeLog           | 7 ++++++-
 video/fb/video_fb.c | 6 ++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 38bb39ac9..ca8e3c3fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2010-02-14  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+2010-02-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* video/fb/video_fb.c (grub_video_fb_scroll): Fix a pixel size bug.
+	Reported by: Michael Suchanek.
+
+2010-02-18  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* util/grub-mkconfig.in: Export GRUB_INIT_TUNE.
 	* util/grub.d/00_header.in: Handle GRUB_INIT_TUNE.
diff --git a/video/fb/video_fb.c b/video/fb/video_fb.c
index 65652c3cf..9c5577bb9 100644
--- a/video/fb/video_fb.c
+++ b/video/fb/video_fb.c
@@ -1006,11 +1006,13 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy)
 	{                                                            \
 	  /* 3b. Move data downwards.  */                            \
 	  dst = (void *) grub_video_fb_get_video_ptr (&target,	     \
-					     dst_x + width - 1,      \
+					              dst_x + width, \
 					     dst_y + height - 1);    \
 	  src = (void *) grub_video_fb_get_video_ptr (&target,	     \
-					     src_x + width - 1,      \
+					              src_x + width, \
 					     src_y + height - 1);    \
+	  dst--;                                                     \
+          src--;                                                     \
 	  for (j = 0; j < height; j++)                               \
 	    {                                                        \
 	      for (i = 0; i < linelen; i++)                          \

From d1484a422ec7d94394e17277584a28730f92ff4e Mon Sep 17 00:00:00 2001
From: Manoel Rebelo Abranches <mrabran@br.ibm.com>
Date: Sat, 20 Feb 2010 11:23:13 +0100
Subject: [PATCH 0549/1628] 2010-02-20  Manoel Rebelo Abranches
 <mrabran@br.ibm.com>

	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Add delete and
	backspace keys.
---
 ChangeLog                 |   5 ++
 term/ieee1275/ofconsole.c | 119 ++++++++++++++++++++++++--------------
 2 files changed, 79 insertions(+), 45 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ca8e3c3fd..95dcd51a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-20  Manoel Rebelo Abranches <mrabran@br.ibm.com>
+
+	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Add delete and
+	backspace keys.
+
 2010-02-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* video/fb/video_fb.c (grub_video_fb_scroll): Fix a pixel size bug.
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index 82108022a..a4ffdcd23 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -202,53 +202,82 @@ grub_ofconsole_readkey (int *key)
 
   grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
 
-  if (actual > 0 && c == '\e')
-    {
-      grub_uint64_t start;
-      grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
-
-      /* On 9600 we have to wait up to 12 milliseconds.  */
-      start = grub_get_time_ms ();
-      while (actual <= 0 && grub_get_time_ms () - start < 12)
-	grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
-
-      if (actual <= 0)
+  if (actual > 0)
+    switch(c)
+      {
+      case 0x7f:
+        /* Backspace: Ctrl-h.  */
+        c = '\b'; 
+        break;
+      case '\e':
 	{
-	  *key = '\e';
-	  return 1;
+	  grub_uint64_t start;
+	  grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+
+	  /* On 9600 we have to wait up to 12 milliseconds.  */
+	  start = grub_get_time_ms ();
+	  while (actual <= 0 && grub_get_time_ms () - start < 12)
+	    grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+
+	  if (actual <= 0)
+	    {
+	      *key = '\e';
+	      return 1;
+	    }
+
+	  if (c != '[')
+	    return 0;
+	  
+	  grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+
+	  /* On 9600 we have to wait up to 12 milliseconds.  */
+	  start = grub_get_time_ms ();
+	  while (actual <= 0 && grub_get_time_ms () - start < 12)
+	    grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+	  if (actual <= 0)
+	    return 0;
+
+	  switch (c)
+	    {
+	    case 'A':
+	      /* Up: Ctrl-p.  */
+	      c = GRUB_TERM_UP;
+	      break;
+	    case 'B':
+	      /* Down: Ctrl-n.  */
+	      c = GRUB_TERM_DOWN;
+	      break;
+	    case 'C':
+	      /* Right: Ctrl-f.  */
+	      c = GRUB_TERM_RIGHT;
+	      break;
+	    case 'D':
+	      /* Left: Ctrl-b.  */
+	      c = GRUB_TERM_LEFT;
+	      break;
+	    case '3':
+	      {
+		grub_uint64_t start;		
+		grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+		/* On 9600 we have to wait up to 12 milliseconds.  */
+		start = grub_get_time_ms ();
+		while (actual <= 0 && grub_get_time_ms () - start < 12)
+		  grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+		
+		if (actual <= 0)
+		  return 0;
+  	    
+		/* Delete: Ctrl-d.  */
+		if (c == '~')
+		  c = GRUB_TERM_DC;
+		else
+		  return 0;
+		break;
+	      }
+	      break;
+	    }
 	}
-
-      if (c != '[')
-	return 0;
-
-      grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
-      /* On 9600 we have to wait up to 12 milliseconds.  */
-      start = grub_get_time_ms ();
-      while (actual <= 0 && grub_get_time_ms () - start < 12)
-	grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
-      if (actual <= 0)
-	return 0;
-
-      switch (c)
-	{
-	case 'A':
-	  /* Up: Ctrl-p.  */
-	  c = GRUB_TERM_UP;
-	  break;
-	case 'B':
-	  /* Down: Ctrl-n.  */
-	  c = GRUB_TERM_DOWN;
-	  break;
-	case 'C':
-	  /* Right: Ctrl-f.  */
-	  c = GRUB_TERM_RIGHT;
-	  break;
-	case 'D':
-	  /* Left: Ctrl-b.  */
-	  c = GRUB_TERM_LEFT;
-	  break;
-	}
-    }
+      }
 
   *key = c;
   return actual > 0;

From 7dd05b96dcda4ad27b3d3a4d3025d1e9a3bce1e6 Mon Sep 17 00:00:00 2001
From: carles <carles@pinux>
Date: Sat, 20 Feb 2010 23:31:35 +0000
Subject: [PATCH 0550/1628] 2010-02-20  Carles Pina i Estany  <carles@pina.cat>

	* util/grub-mkrawimage.c (usage): Change string formatting to
	improve gettext.
---
 ChangeLog              |  5 +++++
 util/grub-mkrawimage.c | 13 ++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 95dcd51a7..fbfe0ef6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-20  Carles Pina i Estany  <carles@pina.cat>
+
+	* util/grub-mkrawimage.c (usage): Change string formatting to
+	improve gettext.
+
 2010-02-20  Manoel Rebelo Abranches <mrabran@br.ibm.com>
 
 	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Add delete and
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 83bb51c02..dd84f2d81 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -446,10 +446,8 @@ Make a bootable image of GRUB.\n\
   -o, --output=FILE       output a generated image to FILE [default=stdout]\n"
 #ifdef GRUB_PLATFORM_IMAGE_DEFAULT
 	    "\
-  -O, --format=FORMAT     generate an image in format [default=" 
-	    GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT "]\n	\
-	                available formats: "
-	    GRUB_PLATFORM_IMAGE_FORMATS "\n"
+  -O, --format=FORMAT     generate an image in format [default=%s]\n\
+                          available formats: %s\n"
 #endif
 	    "\
   -h, --help              display this message and exit\n\
@@ -457,7 +455,12 @@ Make a bootable image of GRUB.\n\
   -v, --verbose           print verbose messages\n\
 \n\
 Report bugs to <%s>.\n\
-"), program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
+"), 
+program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY,
+#ifdef GRUB_PLATFORM_IMAGE_DEFAULT
+  GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT, GRUB_PLATFORM_IMAGE_FORMATS,
+#endif
+PACKAGE_BUGREPORT);
 
   exit (status);
 }

From 618307dd08e2a1e710ed2d3122b1ae6146c0850f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 22 Feb 2010 09:18:59 +0100
Subject: [PATCH 0551/1628] 2010-02-20  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* fs/iso9660.c (grub_iso9660_iterate_dir): Strip version from joliet
	filename.
	Reported by: Georgy Buranov
---
 ChangeLog    | 6 ++++++
 fs/iso9660.c | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fbfe0ef6a..509870f95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* fs/iso9660.c (grub_iso9660_iterate_dir): Strip version from joliet
+	filename.
+	Reported by: Georgy Buranov
+
 2010-02-20  Carles Pina i Estany  <carles@pina.cat>
 
 	* util/grub-mkrawimage.c (usage): Change string formatting to
diff --git a/fs/iso9660.c b/fs/iso9660.c
index cadfbba2b..6dc465f25 100644
--- a/fs/iso9660.c
+++ b/fs/iso9660.c
@@ -629,12 +629,16 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
 
         if (dir->data->joliet)
           {
-            char *oldname;
+            char *oldname, *semicolon;
 
             oldname = filename;
             filename = grub_iso9660_convert_string
                   ((grub_uint16_t *) oldname, dirent.namelen >> 1);
 
+	    semicolon = grub_strrchr (filename, ';');
+	    if (semicolon)
+	      *semicolon = '\0';
+
             if (filename_alloc)
               grub_free (oldname);
 

From 33dfc52f44114ec268eba26e18bcb19668b729d8 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 22 Feb 2010 12:42:13 +0000
Subject: [PATCH 0552/1628] 2010-02-10  Colin King  <colin.king@ubuntu.com>
 2010-02-10  Colin Watson  <cjwatson@ubuntu.com>

	Shrink the pre-partition-table part of boot.img by eight bytes.

	* boot/i386/pc/boot.S (ERR): New macro.
	(chs_mode): Use ERR.
	(geometry_error): Likewise.
	(hd_probe_error): Remove.  This is only used once, so we wrwite
	it inline instead.
	(read_error): Instead of printing read_error_string, just set up
	%si and fall through to ...
	(error_message): ... this new function, also used by ERR.
---
 ChangeLog.trim-boot-img | 13 +++++++++++++
 boot/i386/pc/boot.S     | 18 ++++++------------
 2 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 ChangeLog.trim-boot-img

diff --git a/ChangeLog.trim-boot-img b/ChangeLog.trim-boot-img
new file mode 100644
index 000000000..26408af25
--- /dev/null
+++ b/ChangeLog.trim-boot-img
@@ -0,0 +1,13 @@
+2010-02-10  Colin King  <colin.king@ubuntu.com>
+2010-02-10  Colin Watson  <cjwatson@ubuntu.com>
+
+	Shrink the pre-partition-table part of boot.img by eight bytes.
+
+	* boot/i386/pc/boot.S (ERR): New macro.
+	(chs_mode): Use ERR.
+	(geometry_error): Likewise.
+	(hd_probe_error): Remove.  This is only used once, so we wrwite
+	it inline instead.
+	(read_error): Instead of printing read_error_string, just set up
+	%si and fall through to ...
+	(error_message): ... this new function, also used by ERR.
diff --git a/boot/i386/pc/boot.S b/boot/i386/pc/boot.S
index 257f9044e..4afc57349 100644
--- a/boot/i386/pc/boot.S
+++ b/boot/i386/pc/boot.S
@@ -27,6 +27,7 @@
 
 	/* Print message string */
 #define MSG(x)	movw $x, %si; call LOCAL(message)
+#define ERR(x)	movw $x, %si; jmp LOCAL(error_message)
 
 	.file	"boot.S"
 
@@ -233,7 +234,7 @@ LOCAL(chs_mode):
 	jz	LOCAL(floppy_probe)
 
 	/* Nope, we definitely have a hard disk, and we're screwed. */
-	jmp	LOCAL(hd_probe_error)
+	ERR(hd_probe_error_string)
 
 LOCAL(final_init):
 	/* set the mode to zero */
@@ -360,22 +361,15 @@ LOCAL(copy_buffer):
  * BIOS Geometry translation error (past the end of the disk geometry!).
  */
 LOCAL(geometry_error):
-	MSG(geometry_error_string)
-	jmp	LOCAL(general_error)
-
-/*
- * Disk probe failure.
- */
-LOCAL(hd_probe_error):
-	MSG(hd_probe_error_string)
-	jmp	LOCAL(general_error)
+	ERR(geometry_error_string)
 
 /*
  * Read error on the disk.
  */
 LOCAL(read_error):
-	MSG(read_error_string)
-
+	movw	$read_error_string, %si
+LOCAL(error_message):
+	call	LOCAL(message)
 LOCAL(general_error):
 	MSG(general_error_string)
 

From 2b8fa975d4fc8b4759b947b1dc7559ce8e95ff0a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 24 Feb 2010 10:02:16 +0000
Subject: [PATCH 0553/1628] 2010-02-24  Joey Korkames 
 <joey+lists@kidfixit.com>

	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Remove
	duplicate declaration of `start'.
---
 ChangeLog                 | 5 +++++
 term/ieee1275/ofconsole.c | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 509870f95..fb5c42dce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-24  Joey Korkames  <joey+lists@kidfixit.com>
+
+	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Remove
+	duplicate declaration of `start'.
+
 2010-02-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* fs/iso9660.c (grub_iso9660_iterate_dir): Strip version from joliet
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index a4ffdcd23..c0f895a15 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -257,7 +257,6 @@ grub_ofconsole_readkey (int *key)
 	      break;
 	    case '3':
 	      {
-		grub_uint64_t start;		
 		grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
 		/* On 9600 we have to wait up to 12 milliseconds.  */
 		start = grub_get_time_ms ();

From f17d332e493775a5ef3ef3e9140d7cf3b9337816 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 24 Feb 2010 11:29:11 +0100
Subject: [PATCH 0554/1628] Remove trailing spaces in kern/device.c

---
 kern/device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kern/device.c b/kern/device.c
index 5cfd190f3..cd019fdaf 100644
--- a/kern/device.c
+++ b/kern/device.c
@@ -152,7 +152,7 @@ grub_device_iterate (int (*hook) (const char *name))
 	  grub_free (partition_name);
 	  grub_free (p);
 	  return 1;
-	}      
+	}
       grub_free (partition_name);
 
       p->next = ents;

From 607ffde2caa0d6f9734e519b17040fe4bcaf8995 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 24 Feb 2010 15:21:36 +0100
Subject: [PATCH 0555/1628] 2010-02-24  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* loader/i386/multiboot_mbi.c (grub_multiboot_set_bootdev): Fix a
	memory leak.
	Reported by: Seth Goldberg.
---
 ChangeLog                   | 6 ++++++
 loader/i386/multiboot_mbi.c | 1 +
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index fb5c42dce..35ecc7073 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/i386/multiboot_mbi.c (grub_multiboot_set_bootdev): Fix a
+	memory leak.
+	Reported by: Seth Goldberg.
+
 2010-02-24  Joey Korkames  <joey+lists@kidfixit.com>
 
 	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Remove
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index a154d1b23..3f937c446 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -463,6 +463,7 @@ grub_multiboot_set_bootdev (void)
 	  if ((p[0] >= 'a') && (p[0] <= 'z'))
 	    part = p[0] - 'a';
 	}
+      grub_free (p);
     }
   if (dev)
     grub_device_close (dev);

From 4a8a763c7b03814e70ba26b09c2e0c1108b9164a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 24 Feb 2010 15:24:21 +0100
Subject: [PATCH 0556/1628] 2010-02-24  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* normal/crypto.c (read_crypto_list): Fix a memory leak.
	* normal/term.c (read_terminal_list): Likewise.
	* normal/main.c (grub_normal_init_page): Likewise.
	(grub_normal_read_line_real): Likewise.
---
 ChangeLog       | 7 +++++++
 normal/crypto.c | 1 +
 normal/main.c   | 4 ++++
 normal/term.c   | 1 +
 4 files changed, 13 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 35ecc7073..24981a5fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* normal/crypto.c (read_crypto_list): Fix a memory leak.
+	* normal/term.c (read_terminal_list): Likewise.
+	* normal/main.c (grub_normal_init_page): Likewise.
+	(grub_normal_read_line_real): Likewise.
+
 2010-02-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/i386/multiboot_mbi.c (grub_multiboot_set_bootdev): Fix a
diff --git a/normal/crypto.c b/normal/crypto.c
index 932f26f97..95899fbd5 100644
--- a/normal/crypto.c
+++ b/normal/crypto.c
@@ -88,6 +88,7 @@ read_crypto_list (void)
     }
 
   file = grub_file_open (filename);
+  grub_free (filename);
   if (!file)
     {
       grub_errno = GRUB_ERR_NONE;
diff --git a/normal/main.c b/normal/main.c
index 9f8c12773..2306427fc 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -418,6 +418,7 @@ grub_normal_init_page (struct grub_term_output *term)
  
   msg_len = grub_utf8_to_ucs4_alloc (msg_formatted,
   				     &unicode_msg, &last_position);
+  grub_free (msg_formatted);
  
   if (msg_len < 0)
     {
@@ -582,10 +583,13 @@ grub_normal_read_line_real (char **line, int cont, int nested)
       if (cont || nested)
 	{
 	  grub_free (*line);
+	  grub_free (prompt);
 	  *line = 0;
 	  return grub_errno;
 	}
     }
+  
+  grub_free (prompt);
 
   return 0;
 }
diff --git a/normal/term.c b/normal/term.c
index 42201fbb3..e31d403ee 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -175,6 +175,7 @@ read_terminal_list (void)
     }
 
   file = grub_file_open (filename);
+  grub_free (filename);
   if (!file)
     {
       grub_errno = GRUB_ERR_NONE;

From a0ca21c2d2ccf7cb6985507b0cef6e676234fd67 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 25 Feb 2010 13:30:50 +0000
Subject: [PATCH 0557/1628] 2010-02-25  Jordan Uggla  <jordan.uggla@gmail.com>

	* util/grub-mkconfig.in (GRUB_SAVEDEFAULT): Export new variable.
	* util/grub-mkconfig_lib.in (save_default_entry): Only save a new
	default entry if GRUB_SAVEDEFAULT=true.  This allows using
	GRUB_DEFAULT=saved on its own to let grub-reboot work, without
	saving a new default on every boot.
---
 ChangeLog                 | 8 ++++++++
 util/grub-mkconfig.in     | 3 ++-
 util/grub-mkconfig_lib.in | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 24981a5fc..b8f6ba35d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-25  Jordan Uggla  <jordan.uggla@gmail.com>
+
+	* util/grub-mkconfig.in (GRUB_SAVEDEFAULT): Export new variable.
+	* util/grub-mkconfig_lib.in (save_default_entry): Only save a new
+	default entry if GRUB_SAVEDEFAULT=true.  This allows using
+	GRUB_DEFAULT=saved on its own to let grub-reboot work, without
+	saving a new default on every boot.
+
 2010-02-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* normal/crypto.c (read_crypto_list): Fix a memory leak.
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index fb1dd4544..daa110be7 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -223,7 +223,8 @@ export GRUB_DEFAULT \
   GRUB_THEME \
   GRUB_GFXPAYLOAD_LINUX \
   GRUB_DISABLE_OS_PROBER \
-  GRUB_INIT_TUNE
+  GRUB_INIT_TUNE \
+  GRUB_SAVEDEFAULT
 
 if test "x${grub_cfg}" != "x"; then
   rm -f ${grub_cfg}.new
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 45354041a..bcd6baffb 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -96,7 +96,7 @@ convert_system_path_to_grub_path ()
 
 save_default_entry ()
 {
-  if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then
+  if [ "x${GRUB_SAVEDEFAULT}" = "xtrue" ] ; then
     cat << EOF
 savedefault
 EOF

From c140a1803787036762faec8f76d931b11f66148a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 25 Feb 2010 15:10:18 +0100
Subject: [PATCH 0558/1628] 2010-02-25  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Don't compile video modules on yeeloong since video subsystem is part
	of kernel.

	* conf/common.rmk (pkglib_MODULES) [yeeloong]: Remove video.mod,
	video_fb.mod, bitmap.mod, font.mod, gfxterm.mod and bufio.mod
	* conf/mips-yeeloong.rmk (kernel_img_HEADERS): Add bitmap.h,
	video.h, gfxterm.h, font.h, bitmap_scale.h and bufio.h.
	* conf/mips.rmk (kernel_img_HEADERS): Add values instead of overwriting.
	* include/grub/bitmap.h: Add EXPORT_FUNC and EXPORT_VAR.
	* include/grub/bitmap_scale.h: Likewise.
	* include/grub/bufio.h: Likewise.
	* include/grub/font.h: Likewise.
	* include/grub/gfxterm.h: Likewise.
	* include/grub/video.h: Likewise.
	* include/grub/vbe.h: Don't include video_fb.h.
	* video/i386/pc/vbe.c: Include video_fb.h.
	* commands/i386/pc/vbetest.c: Include video.h.
---
 ChangeLog                   | 20 +++++++++
 commands/i386/pc/vbetest.c  |  1 +
 conf/common.rmk             | 68 +++++++++++++++++-----------
 conf/mips-yeeloong.rmk      |  3 ++
 conf/mips.rmk               |  2 +-
 include/grub/bitmap.h       | 26 +++++------
 include/grub/bitmap_scale.h | 11 ++---
 include/grub/bufio.h        |  4 +-
 include/grub/font.h         | 40 +++++++++--------
 include/grub/gfxterm.h      | 14 +++---
 include/grub/i386/pc/vbe.h  |  2 -
 include/grub/video.h        | 88 +++++++++++++++++++++----------------
 video/i386/pc/vbe.c         |  1 +
 13 files changed, 168 insertions(+), 112 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b8f6ba35d..233e1fc2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2010-02-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Don't compile video modules on yeeloong since video subsystem is part
+	of kernel.
+
+	* conf/common.rmk (pkglib_MODULES) [yeeloong]: Remove video.mod,
+	video_fb.mod, bitmap.mod, font.mod, gfxterm.mod and bufio.mod
+	* conf/mips-yeeloong.rmk (kernel_img_HEADERS): Add bitmap.h,
+	video.h, gfxterm.h, font.h, bitmap_scale.h and bufio.h.
+	* conf/mips.rmk (kernel_img_HEADERS): Add values instead of overwriting.
+	* include/grub/bitmap.h: Add EXPORT_FUNC and EXPORT_VAR.
+	* include/grub/bitmap_scale.h: Likewise.
+	* include/grub/bufio.h: Likewise.
+	* include/grub/font.h: Likewise.
+	* include/grub/gfxterm.h: Likewise.
+	* include/grub/video.h: Likewise.
+	* include/grub/vbe.h: Don't include video_fb.h.
+	* video/i386/pc/vbe.c: Include video_fb.h.
+	* commands/i386/pc/vbetest.c: Include video.h.
+
 2010-02-25  Jordan Uggla  <jordan.uggla@gmail.com>
 
 	* util/grub-mkconfig.in (GRUB_SAVEDEFAULT): Export new variable.
diff --git a/commands/i386/pc/vbetest.c b/commands/i386/pc/vbetest.c
index d97323087..d2921c09d 100644
--- a/commands/i386/pc/vbetest.c
+++ b/commands/i386/pc/vbetest.c
@@ -24,6 +24,7 @@
 #include <grub/term.h>
 #include <grub/machine/init.h>
 #include <grub/machine/vbe.h>
+#include <grub/video.h>
 #include <grub/err.h>
 #include <grub/i18n.h>
 
diff --git a/conf/common.rmk b/conf/common.rmk
index 6cce36395..7effa8af3 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -621,26 +621,28 @@ sh_mod_SOURCES = script/main.c script/script.c script/execute.c \
 sh_mod_CFLAGS = $(COMMON_CFLAGS)
 sh_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+ifneq (, $(FONT_SOURCE))
+font/font.c_DEPENDENCIES = ascii.h
+endif
+
 # Common Video Subsystem specific modules.
-pkglib_MODULES += video.mod videotest.mod bitmap.mod tga.mod jpeg.mod	\
-	png.mod	gfxterm.mod video_fb.mod
+# On Yeeloong it's part of kernel
+ifneq ($(platform), yeeloong)
 
 # For video.mod.
+pkglib_MODULES += video.mod
 video_mod_SOURCES = video/video.c
 video_mod_CFLAGS = $(COMMON_CFLAGS)
 video_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += video_fb.mod
 video_fb_mod_SOURCES = video/fb/video_fb.c video/fb/fbblit.c \
 		  video/fb/fbfill.c video/fb/fbutil.c
 video_fb_mod_CFLAGS = $(COMMON_CFLAGS)
 video_fb_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For videotest.mod.
-videotest_mod_SOURCES = commands/videotest.c
-videotest_mod_CFLAGS = $(COMMON_CFLAGS)
-videotest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For bitmap.mod
+pkglib_MODULES += bitmap.mod
 bitmap_mod_SOURCES = video/bitmap.c
 bitmap_mod_CFLAGS = $(COMMON_CFLAGS)
 bitmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
@@ -651,36 +653,46 @@ bitmap_scale_mod_SOURCES = video/bitmap_scale.c
 bitmap_scale_mod_CFLAGS = $(COMMON_CFLAGS)
 bitmap_scale_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For tga.mod
-tga_mod_SOURCES = video/readers/tga.c
-tga_mod_CFLAGS = $(COMMON_CFLAGS)
-tga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For jpeg.mod.
-jpeg_mod_SOURCES = video/readers/jpeg.c
-jpeg_mod_CFLAGS = $(COMMON_CFLAGS)
-jpeg_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For png.mod.
-png_mod_SOURCES = video/readers/png.c
-png_mod_CFLAGS = $(COMMON_CFLAGS)
-png_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 pkglib_MODULES += font.mod
-ifneq (, $(FONT_SOURCE))
-font/font.c_DEPENDENCIES = ascii.h
-endif
 font_mod_SOURCES = font/font_cmd.c font/font.c
 font_mod_CFLAGS = $(COMMON_CFLAGS)
 font_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For gfxterm.mod.
+pkglib_MODULES += gfxterm.mod
 gfxterm_mod_SOURCES = term/gfxterm.c
 gfxterm_mod_CFLAGS = $(COMMON_CFLAGS)
 gfxterm_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+endif
+
+# For videotest.mod.
+pkglib_MODULES += videotest.mod
+videotest_mod_SOURCES = commands/videotest.c
+videotest_mod_CFLAGS = $(COMMON_CFLAGS)
+videotest_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For tga.mod
+pkglib_MODULES += tga.mod
+tga_mod_SOURCES = video/readers/tga.c
+tga_mod_CFLAGS = $(COMMON_CFLAGS)
+tga_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For jpeg.mod.
+pkglib_MODULES += jpeg.mod
+jpeg_mod_SOURCES = video/readers/jpeg.c
+jpeg_mod_CFLAGS = $(COMMON_CFLAGS)
+jpeg_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For png.mod.
+pkglib_MODULES += png.mod
+png_mod_SOURCES = video/readers/png.c
+png_mod_CFLAGS = $(COMMON_CFLAGS)
+png_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+
 # Misc.
-pkglib_MODULES += gzio.mod bufio.mod elf.mod
+pkglib_MODULES += gzio.mod elf.mod
 
 # For elf.mod.
 elf_mod_SOURCES = kern/elf.c
@@ -692,10 +704,14 @@ gzio_mod_SOURCES = io/gzio.c
 gzio_mod_CFLAGS = $(COMMON_CFLAGS)
 gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# On Yeeloong it's part of kernel
+ifneq ($(platform), yeeloong)
 # For bufio.mod.
+pkglib_MODULES += bufio.mod
 bufio_mod_SOURCES = io/bufio.c
 bufio_mod_CFLAGS = $(COMMON_CFLAGS)
 bufio_mod_LDFLAGS = $(COMMON_LDFLAGS)
+endif
 
 # For gettext.mod.
 pkglib_MODULES += gettext.mod
diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index eb0dc9676..0d9a4c1bb 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -3,6 +3,9 @@ LINK_BASE = 0x80200000
 target_machine=yeeloong
 COMMON_CFLAGS += -march=mips3
 COMMON_ASFLAGS += -march=mips3
+
+kernel_img_HEADERS += bitmap.h video.h gfxterm.h font.h bitmap_scale.h bufio.h
+
 include $(srcdir)/conf/mips.mk
 
 pkglib_IMAGES = kernel.img
diff --git a/conf/mips.rmk b/conf/mips.rmk
index 1ef4fc395..c7c80a26d 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -13,7 +13,7 @@ script/lexer.c_DEPENDENCIES = grub_script.tab.h
 MOSTLYCLEANFILES += symlist.c kernel_syms.lst
 DEFSYMFILES += kernel_syms.lst
 
-kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
+kernel_img_HEADERS += boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
 	symbol.h term.h time.h types.h loader.h partition.h \
 	msdos_partition.h machine/kernel.h handler.h list.h \
diff --git a/include/grub/bitmap.h b/include/grub/bitmap.h
index 42c439d69..6e300391a 100644
--- a/include/grub/bitmap.h
+++ b/include/grub/bitmap.h
@@ -47,24 +47,24 @@ struct grub_video_bitmap_reader
 };
 typedef struct grub_video_bitmap_reader *grub_video_bitmap_reader_t;
 
-void grub_video_bitmap_reader_register (grub_video_bitmap_reader_t reader);
-void grub_video_bitmap_reader_unregister (grub_video_bitmap_reader_t reader);
+void EXPORT_FUNC (grub_video_bitmap_reader_register) (grub_video_bitmap_reader_t reader);
+void EXPORT_FUNC (grub_video_bitmap_reader_unregister) (grub_video_bitmap_reader_t reader);
 
-grub_err_t grub_video_bitmap_create (struct grub_video_bitmap **bitmap,
-                                     unsigned int width, unsigned int height,
-                                     enum grub_video_blit_format blit_format);
+grub_err_t EXPORT_FUNC (grub_video_bitmap_create) (struct grub_video_bitmap **bitmap,
+						   unsigned int width, unsigned int height,
+						   enum grub_video_blit_format blit_format);
 
-grub_err_t grub_video_bitmap_destroy (struct grub_video_bitmap *bitmap);
+grub_err_t EXPORT_FUNC (grub_video_bitmap_destroy) (struct grub_video_bitmap *bitmap);
 
-grub_err_t grub_video_bitmap_load (struct grub_video_bitmap **bitmap,
-                                   const char *filename);
+grub_err_t EXPORT_FUNC (grub_video_bitmap_load) (struct grub_video_bitmap **bitmap,
+						 const char *filename);
 
-unsigned int grub_video_bitmap_get_width (struct grub_video_bitmap *bitmap);
-unsigned int grub_video_bitmap_get_height (struct grub_video_bitmap *bitmap);
+unsigned int EXPORT_FUNC (grub_video_bitmap_get_width) (struct grub_video_bitmap *bitmap);
+unsigned int EXPORT_FUNC (grub_video_bitmap_get_height) (struct grub_video_bitmap *bitmap);
 
-void grub_video_bitmap_get_mode_info (struct grub_video_bitmap *bitmap,
-                                      struct grub_video_mode_info *mode_info);
+void EXPORT_FUNC (grub_video_bitmap_get_mode_info) (struct grub_video_bitmap *bitmap,
+						    struct grub_video_mode_info *mode_info);
 
-void *grub_video_bitmap_get_data (struct grub_video_bitmap *bitmap);
+void *EXPORT_FUNC (grub_video_bitmap_get_data) (struct grub_video_bitmap *bitmap);
 
 #endif /* ! GRUB_BITMAP_HEADER */
diff --git a/include/grub/bitmap_scale.h b/include/grub/bitmap_scale.h
index 7ea9d7914..dce9fbbf2 100644
--- a/include/grub/bitmap_scale.h
+++ b/include/grub/bitmap_scale.h
@@ -39,10 +39,11 @@ enum grub_video_bitmap_scale_method
 };
 
 grub_err_t
-grub_video_bitmap_create_scaled (struct grub_video_bitmap **dst,
-                                 int dst_width, int dst_height,
-                                 struct grub_video_bitmap *src,
-                                 enum
-                                 grub_video_bitmap_scale_method scale_method);
+EXPORT_FUNC (grub_video_bitmap_create_scaled) (struct grub_video_bitmap **dst,
+					       int dst_width, int dst_height,
+					       struct grub_video_bitmap *src,
+					       enum 
+					       grub_video_bitmap_scale_method
+					       scale_method);
 
 #endif /* ! GRUB_BITMAP_SCALE_HEADER */
diff --git a/include/grub/bufio.h b/include/grub/bufio.h
index 9a2294c26..acdd0c882 100644
--- a/include/grub/bufio.h
+++ b/include/grub/bufio.h
@@ -22,7 +22,7 @@
 
 #include <grub/file.h>
 
-grub_file_t grub_bufio_open (grub_file_t io, int size);
-grub_file_t grub_buffile_open (const char *name, int size);
+grub_file_t EXPORT_FUNC (grub_bufio_open) (grub_file_t io, int size);
+grub_file_t EXPORT_FUNC (grub_buffile_open) (const char *name, int size);
 
 #endif /* ! GRUB_BUFIO_H */
diff --git a/include/grub/font.h b/include/grub/font.h
index 1816e3570..7c5c17403 100644
--- a/include/grub/font.h
+++ b/include/grub/font.h
@@ -81,36 +81,38 @@ int grub_font_load (const char *filename);
    "Family Name Bold Italic 14", where Bold and Italic are optional.
    If no font matches the name specified, the most recently loaded font
    is returned as a fallback.  */
-grub_font_t grub_font_get (const char *font_name);
+grub_font_t EXPORT_FUNC (grub_font_get) (const char *font_name);
 
-const char *grub_font_get_name (grub_font_t font);
+const char *EXPORT_FUNC (grub_font_get_name) (grub_font_t font);
 
-int grub_font_get_max_char_width (grub_font_t font);
+int EXPORT_FUNC (grub_font_get_max_char_width) (grub_font_t font);
 
-int grub_font_get_max_char_height (grub_font_t font);
+int EXPORT_FUNC (grub_font_get_max_char_height) (grub_font_t font);
 
-int grub_font_get_ascent (grub_font_t font);
+int EXPORT_FUNC (grub_font_get_ascent) (grub_font_t font);
 
-int grub_font_get_descent (grub_font_t font);
+int EXPORT_FUNC (grub_font_get_descent) (grub_font_t font);
 
-int grub_font_get_leading (grub_font_t font);
+int EXPORT_FUNC (grub_font_get_leading) (grub_font_t font);
 
-int grub_font_get_height (grub_font_t font);
+int EXPORT_FUNC (grub_font_get_height) (grub_font_t font);
 
-int grub_font_get_string_width (grub_font_t font, const char *str);
+int EXPORT_FUNC (grub_font_get_string_width) (grub_font_t font,
+					      const char *str);
 
-struct grub_font_glyph *grub_font_get_glyph (grub_font_t font,
-                                             grub_uint32_t code);
+struct grub_font_glyph *EXPORT_FUNC (grub_font_get_glyph) (grub_font_t font,
+							   grub_uint32_t code);
 
-struct grub_font_glyph *grub_font_get_glyph_with_fallback (grub_font_t font,
-                                                           grub_uint32_t code);
+struct grub_font_glyph *EXPORT_FUNC (grub_font_get_glyph_with_fallback) (grub_font_t font,
+									 grub_uint32_t code);
 
-grub_err_t grub_font_draw_glyph (struct grub_font_glyph *glyph,
-                                        grub_video_color_t color,
-                                        int left_x, int baseline_y);
+grub_err_t EXPORT_FUNC (grub_font_draw_glyph) (struct grub_font_glyph *glyph,
+					       grub_video_color_t color,
+					       int left_x, int baseline_y);
 
-grub_err_t grub_font_draw_string (const char *str, grub_font_t font,
-                                  grub_video_color_t color,
-                                  int left_x, int baseline_y);
+grub_err_t EXPORT_FUNC (grub_font_draw_string) (const char *str,
+						grub_font_t font,
+						grub_video_color_t color,
+						int left_x, int baseline_y);
 
 #endif /* ! GRUB_FONT_HEADER */
diff --git a/include/grub/gfxterm.h b/include/grub/gfxterm.h
index fe3da7409..295354baf 100644
--- a/include/grub/gfxterm.h
+++ b/include/grub/gfxterm.h
@@ -25,20 +25,20 @@
 #include <grub/video.h>
 
 grub_err_t
-grub_gfxterm_set_window (struct grub_video_render_target *target,
-			 int x, int y, int width, int height,
-			 int double_repaint,
-			 const char *font_name, int border_width);
+EXPORT_FUNC (grub_gfxterm_set_window) (struct grub_video_render_target *target,
+				       int x, int y, int width, int height,
+				       int double_repaint,
+				       const char *font_name, int border_width);
 
 typedef void (*grub_gfxterm_repaint_callback_t)(int x, int y,
                                                 int width, int height);
 
 void grub_gfxterm_set_repaint_callback (grub_gfxterm_repaint_callback_t func);
 
-void grub_gfxterm_schedule_repaint (void);
+void EXPORT_FUNC (grub_gfxterm_schedule_repaint) (void);
 
-grub_err_t grub_gfxterm_fullscreen (void);
+grub_err_t EXPORT_FUNC (grub_gfxterm_fullscreen) (void);
 
-extern void (*grub_gfxterm_decorator_hook) (void);
+extern void (*EXPORT_VAR (grub_gfxterm_decorator_hook)) (void);
 
 #endif /* ! GRUB_GFXTERM_HEADER */
diff --git a/include/grub/i386/pc/vbe.h b/include/grub/i386/pc/vbe.h
index 9c4c4dd3d..abf246fa1 100644
--- a/include/grub/i386/pc/vbe.h
+++ b/include/grub/i386/pc/vbe.h
@@ -19,8 +19,6 @@
 #ifndef GRUB_VBE_MACHINE_HEADER
 #define GRUB_VBE_MACHINE_HEADER	1
 
-#include <grub/video_fb.h>
-
 /* Default video mode to be used.  */
 #define GRUB_VBE_DEFAULT_VIDEO_MODE     0x101
 
diff --git a/include/grub/video.h b/include/grub/video.h
index fa459aebd..57f2b37f2 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -259,13 +259,13 @@ struct grub_video_adapter
 };
 typedef struct grub_video_adapter *grub_video_adapter_t;
 
-void grub_video_register (grub_video_adapter_t adapter);
+void EXPORT_FUNC (grub_video_register) (grub_video_adapter_t adapter);
 void grub_video_unregister (grub_video_adapter_t adapter);
 void grub_video_iterate (int (*hook) (grub_video_adapter_t adapter));
 
-grub_err_t grub_video_restore (void);
+grub_err_t EXPORT_FUNC (grub_video_restore) (void);
 
-grub_err_t grub_video_get_info (struct grub_video_mode_info *mode_info);
+grub_err_t EXPORT_FUNC (grub_video_get_info) (struct grub_video_mode_info *mode_info);
 
 /* Framebuffer address may change as a part of normal operation
    (e.g. double buffering). That's why you need to stop video subsystem to be
@@ -283,57 +283,71 @@ grub_err_t grub_video_set_palette (unsigned int start, unsigned int count,
 grub_err_t grub_video_get_palette (unsigned int start, unsigned int count,
                                    struct grub_video_palette_data *palette_data);
 
-grub_err_t grub_video_set_viewport (unsigned int x, unsigned int y,
-                                    unsigned int width, unsigned int height);
+grub_err_t EXPORT_FUNC (grub_video_set_viewport) (unsigned int x,
+						  unsigned int y,
+						  unsigned int width,
+						  unsigned int height);
 
-grub_err_t grub_video_get_viewport (unsigned int *x, unsigned int *y,
-                                    unsigned int *width, unsigned int *height);
+grub_err_t EXPORT_FUNC (grub_video_get_viewport) (unsigned int *x,
+						  unsigned int *y,
+						  unsigned int *width,
+						  unsigned int *height);
 
-grub_video_color_t grub_video_map_color (grub_uint32_t color_name);
+grub_video_color_t EXPORT_FUNC (grub_video_map_color) (grub_uint32_t color_name);
 
-grub_video_color_t grub_video_map_rgb (grub_uint8_t red, grub_uint8_t green,
-                                       grub_uint8_t blue);
+grub_video_color_t EXPORT_FUNC (grub_video_map_rgb) (grub_uint8_t red,
+						     grub_uint8_t green,
+						     grub_uint8_t blue);
 
-grub_video_color_t grub_video_map_rgba (grub_uint8_t red, grub_uint8_t green,
-                                        grub_uint8_t blue, grub_uint8_t alpha);
+grub_video_color_t EXPORT_FUNC (grub_video_map_rgba) (grub_uint8_t red,
+						      grub_uint8_t green,
+						      grub_uint8_t blue,
+						      grub_uint8_t alpha);
 
-grub_err_t grub_video_unmap_color (grub_video_color_t color,
-                                   grub_uint8_t *red, grub_uint8_t *green,
-                                   grub_uint8_t *blue, grub_uint8_t *alpha);
+grub_err_t EXPORT_FUNC (grub_video_unmap_color) (grub_video_color_t color,
+						 grub_uint8_t *red,
+						 grub_uint8_t *green,
+						 grub_uint8_t *blue,
+						 grub_uint8_t *alpha);
 
-grub_err_t grub_video_fill_rect (grub_video_color_t color, int x, int y,
-                                 unsigned int width, unsigned int height);
+grub_err_t EXPORT_FUNC (grub_video_fill_rect) (grub_video_color_t color, 
+					       int x, int y,
+					       unsigned int width,
+					       unsigned int height);
 
-grub_err_t grub_video_blit_bitmap (struct grub_video_bitmap *bitmap,
-                                   enum grub_video_blit_operators oper,
-                                   int x, int y, int offset_x, int offset_y,
-                                   unsigned int width, unsigned int height);
+grub_err_t EXPORT_FUNC (grub_video_blit_bitmap) (struct grub_video_bitmap *bitmap,
+						 enum grub_video_blit_operators oper,
+						 int x, int y,
+						 int offset_x, int offset_y,
+						 unsigned int width,
+						 unsigned int height);
 
-grub_err_t grub_video_blit_render_target (struct grub_video_render_target *source,
-                                          enum grub_video_blit_operators oper,
-                                          int x, int y,
-                                          int offset_x, int offset_y,
-                                          unsigned int width,
-                                          unsigned int height);
+grub_err_t EXPORT_FUNC (grub_video_blit_render_target) (struct grub_video_render_target *source,
+							enum grub_video_blit_operators oper,
+							int x, int y,
+							int offset_x,
+							int offset_y,
+							unsigned int width,
+							unsigned int height);
 
 grub_err_t grub_video_scroll (grub_video_color_t color, int dx, int dy);
 
-grub_err_t grub_video_swap_buffers (void);
+grub_err_t EXPORT_FUNC (grub_video_swap_buffers) (void);
 
-grub_err_t grub_video_create_render_target (struct grub_video_render_target **result,
-                                            unsigned int width,
-                                            unsigned int height,
-                                            unsigned int mode_type);
+grub_err_t EXPORT_FUNC (grub_video_create_render_target) (struct grub_video_render_target **result,
+							  unsigned int width,
+							  unsigned int height,
+							  unsigned int mode_type);
 
-grub_err_t grub_video_delete_render_target (struct grub_video_render_target *target);
+grub_err_t EXPORT_FUNC (grub_video_delete_render_target) (struct grub_video_render_target *target);
 
-grub_err_t grub_video_set_active_render_target (struct grub_video_render_target *target);
+grub_err_t EXPORT_FUNC (grub_video_set_active_render_target) (struct grub_video_render_target *target);
 
 grub_err_t grub_video_get_active_render_target (struct grub_video_render_target **target);
 
-grub_err_t grub_video_set_mode (const char *modestring,
-				unsigned int modemask,
-				unsigned int modevalue);
+grub_err_t EXPORT_FUNC (grub_video_set_mode) (const char *modestring,
+					      unsigned int modemask,
+					      unsigned int modevalue);
 
 static inline int
 grub_video_check_mode_flag (unsigned int flags, unsigned int mask,
diff --git a/video/i386/pc/vbe.c b/video/i386/pc/vbe.c
index 0107cc297..72b8f1831 100644
--- a/video/i386/pc/vbe.c
+++ b/video/i386/pc/vbe.c
@@ -22,6 +22,7 @@
 #include <grub/machine/memory.h>
 #include <grub/machine/vga.h>
 #include <grub/machine/vbe.h>
+#include <grub/video_fb.h>
 #include <grub/types.h>
 #include <grub/dl.h>
 #include <grub/misc.h>

From 72b286313ab2c1e94f115b04bda5c17f99150484 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 26 Feb 2010 14:32:24 +0100
Subject: [PATCH 0559/1628] 2010-02-26  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* util/grub.d/10_linux.in (linux_entry): Don't default to
	gfxpayload=keep if Linux doesn't support video handover.
---
 ChangeLog               | 5 +++++
 util/grub.d/10_linux.in | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 233e1fc2d..e7617dc1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-26  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub.d/10_linux.in (linux_entry): Don't default to
+	gfxpayload=keep if Linux doesn't support video handover.
+
 2010-02-25  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Don't compile video modules on yeeloong since video subsystem is part
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 046874ef0..2c60bc681 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -66,7 +66,8 @@ linux_entry ()
   # Use ELILO's generic "efifb" when it's known to be available.
   # FIXME: We need an interface to select vesafb in case efifb can't be used.
   if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then
-      if grep -qx "CONFIG_FB_EFI=y" /boot/config-${version} 2> /dev/null ; then
+      if grep -qx "CONFIG_FB_EFI=y" /boot/config-${version} 2> /dev/null \
+	  && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" /boot/config-${version} 2> /dev/null; then
 	  cat << EOF
 	set gfxpayload=keep
 EOF

From 813a5f2d33cd81da080daba410543f68aa7382e0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 1 Mar 2010 18:53:34 +0100
Subject: [PATCH 0560/1628] Init DDR2 controller

---
 include/grub/mips/yeeloong/boot.h |   3 +
 include/grub/smbus.h              |  34 +++-
 kern/mips/yeeloong/fwstart.S      | 279 ++++++++++++++++++++++++++----
 util/grub-mkrawimage.c            |  26 ++-
 4 files changed, 307 insertions(+), 35 deletions(-)

diff --git a/include/grub/mips/yeeloong/boot.h b/include/grub/mips/yeeloong/boot.h
index 205c557fe..6a4189ede 100644
--- a/include/grub/mips/yeeloong/boot.h
+++ b/include/grub/mips/yeeloong/boot.h
@@ -24,4 +24,7 @@
 #define GRUB_MACHINE_FLASH_CACHE_ERROR      0xbfc00300
 #define GRUB_MACHINE_FLASH_OTHER_EXCEPTION  0xbfc00380
 
+#define GRUB_MACHINE_DDR2_BASE              0xaffffe00
+#define GRUB_MACHINE_DDR2_REG1_HI_8BANKS    0x00000001
+
 #endif
diff --git a/include/grub/smbus.h b/include/grub/smbus.h
index b9cc6ab9e..0b8e6718f 100644
--- a/include/grub/smbus.h
+++ b/include/grub/smbus.h
@@ -22,21 +22,49 @@
 #define GRUB_SMB_RAM_START_ADDR 0x50
 #define GRUB_SMB_RAM_NUM_MAX 0x08
 
+#define GRUB_SMBUS_SPD_MEMORY_TYPE_ADDR 2
+#define GRUB_SMBUS_SPD_MEMORY_TYPE_DDR2 8
+#define GRUB_SMBUS_SPD_MEMORY_NUM_BANKS_ADDR 17
+#define GRUB_SMBUS_SPD_MEMORY_NUM_ROWS_ADDR 3
+#define GRUB_SMBUS_SPD_MEMORY_NUM_COLUMNS_ADDR 4
+#define GRUB_SMBUS_SPD_MEMORY_NUM_OF_RANKS_ADDR 5
+#define GRUB_SMBUS_SPD_MEMORY_NUM_OF_RANKS_MASK 0x7
+#define GRUB_SMBUS_SPD_MEMORY_CAS_LATENCY_ADDR 18
+#define GRUB_SMBUS_SPD_MEMORY_CAS_LATENCY_MIN_VALUE 5
+#define GRUB_SMBUS_SPD_MEMORY_TRAS_ADDR 30
+#define GRUB_SMBUS_SPD_MEMORY_TRTP_ADDR 38
+
+#ifndef ASM_FILE
+
 struct grub_smbus_spd
 {
   grub_uint8_t written_size;
   grub_uint8_t log_total_flash_size;
-#define GRUB_SMBUS_SPD_MEMORY_TYPE_DDR2 8
   grub_uint8_t memory_type;
   union
   {
     grub_uint8_t unknown[253];
     struct {
-      grub_uint8_t unused1[70];
+      grub_uint8_t num_rows;
+      grub_uint8_t num_columns;
+      grub_uint8_t num_of_ranks;
+      grub_uint8_t unused1[12];
+      grub_uint8_t num_of_banks;
+      grub_uint8_t unused2[2];
+      grub_uint8_t cas_latency;
+      grub_uint8_t unused3[9];
+      grub_uint8_t rank_capacity;
+      grub_uint8_t unused4[1];
+      grub_uint8_t tras;
+      grub_uint8_t unused5[7];
+      grub_uint8_t trtp;
+      grub_uint8_t unused6[31];
       grub_uint8_t part_number[18];
-      grub_uint8_t unused2[165];
+      grub_uint8_t unused7[165];
     } ddr2;
   };
 };
 
 #endif
+
+#endif
diff --git a/kern/mips/yeeloong/fwstart.S b/kern/mips/yeeloong/fwstart.S
index 59fe4d3e6..3dccb65fd 100644
--- a/kern/mips/yeeloong/fwstart.S
+++ b/kern/mips/yeeloong/fwstart.S
@@ -22,6 +22,7 @@
 #include <grub/pci.h>
 #include <grub/serial.h>
 #include <grub/cs5536.h>
+#include <grub/smbus.h>
 
 	.set noreorder
 	.set noat
@@ -103,21 +104,102 @@ __start:
 	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)
 
-	ori $a0, $zero, 0x50
+	/* Yeeloong has only one memory slot.  */
+	/* Output first byte on serial for debugging.  */
+	ori $a1, $zero, GRUB_SMB_RAM_START_ADDR
 	bal read_spd
-	 move $a1, $zero
+	 move $a0, $zero
 	bal printhex
 	 move $a0, $v0
 
-	ori $a0, $zero, 0x50
 	bal read_spd
-	 ori $a1, $zero, 2
+	 ori $a0, $zero, 2
+	ori $t0, $zero, GRUB_SMBUS_SPD_MEMORY_TYPE_DDR2
+	lui $a0, %hi(unimplemented_memory_type)
+	bne $t0, $v0, fatal
+	 addiu $a0, $a0, %hi(unimplemented_memory_type)
+
+	/* And here is our goal: DDR2 controller initialisation.  */
+        lui	$t0, 0xbfe0
+        ld	$t1, 0x0180($t0)
+	andi	$t1, $t1, 0x4ff
+        sd	$t1, 0x0180($t0)
+
+	b continue
+
+	. = start + GRUB_MACHINE_FLASH_TLB_REFILL - GRUB_MACHINE_FLASH_START
+tlb_refill:	
+	mfc0 $s1, $14
+	mfc0 $s2, $8
+	move $s3, $ra
+	lui $a0, %hi(epc)
+	bal message
+	 addiu $a0, $a0, %lo(epc)
+
 	bal printhex
-	 move $a0, $v0
+	 move $a0, $s1
+
+	lui $a0, %hi(badvaddr)
+	bal message
+	 addiu $a0, $a0, %lo(badvaddr)
+
+	bal printhex
+	 move $a0, $s2
+
+	lui $a0, %hi(return_msg)
+	bal message
+	 addiu $a0, $a0, %lo(return_msg)
+
+	bal printhex
+	 move $a0, $s3
 	
-	lui $a0, %hi(not_implemented)
+	lui $a0, %hi(newline)
+	bal message
+	 addiu $a0, $a0, %lo(newline)
+
+	lui $a0, %hi(unhandled_tlb_refill)
 	b fatal
-	 addiu $a0, $a0, %lo(not_implemented)
+	 addiu $a0, $a0, %lo(unhandled_tlb_refill)
+
+	. = start + GRUB_MACHINE_FLASH_CACHE_ERROR - GRUB_MACHINE_FLASH_START
+cache_error:
+	lui $a0, %hi(unhandled_cache_error)
+	b fatal
+	 addiu $a0, $a0, %lo(unhandled_cache_error)
+
+	. = start + GRUB_MACHINE_FLASH_OTHER_EXCEPTION - GRUB_MACHINE_FLASH_START
+other_exception:
+	mfc0 $s0, $13
+	mfc0 $s1, $14
+	mfc0 $s2, $8
+	lui $a0, %hi(cause)
+	bal message
+	 addiu $a0, $a0, %lo(cause)
+
+	bal printhex
+	 move $a0, $s0
+
+	lui $a0, %hi(epc)
+	bal message
+	 addiu $a0, $a0, %lo(epc)
+
+	bal printhex
+	 move $a0, $s1
+
+	lui $a0, %hi(badvaddr)
+	bal message
+	 addiu $a0, $a0, %lo(badvaddr)
+
+	bal printhex
+	 move $a0, $s2
+	
+	lui $a0, %hi(newline)
+	bal message
+	 addiu $a0, $a0, %lo(newline)
+	
+	lui $a0, %hi(unhandled_exception)
+	b fatal
+	 addiu $a0, $a0, %lo(unhandled_exception)
 
 	/* Same as similarly named C function but in asm since
 	   we need it early.  */
@@ -171,7 +253,7 @@ message:
 	 addiu $a0, $a0, 1
 	jr  $ra
 	 nop
-
+	
 	/* Print 32-bit hexadecimal on serial.
            In:	$a0. Out: None. Clobbered: $a0, $t0, $t1, $t2
 	*/
@@ -202,25 +284,7 @@ fatal:
 self:
 	b self
 	 nop
-
-	. = start + GRUB_MACHINE_FLASH_TLB_REFILL - GRUB_MACHINE_FLASH_START
-tlb_refill:	
-	lui $a0, %hi(unhandled_tlb_refill)
-	b fatal
-	 addiu $a0, $a0, %lo(unhandled_tlb_refill)
-
-	. = start + GRUB_MACHINE_FLASH_CACHE_ERROR - GRUB_MACHINE_FLASH_START
-cache_error:
-	lui $a0, %hi(unhandled_cache_error)
-	b fatal
-	 addiu $a0, $a0, %lo(unhandled_cache_error)
-
-	. = start + GRUB_MACHINE_FLASH_OTHER_EXCEPTION - GRUB_MACHINE_FLASH_START
-other_exception:
-	lui $a0, %hi(unhandled_exception)
-	b fatal
-	 addiu $a0, $a0, %lo(unhandled_exception)
-
+	
 	/* Write CS5536 MSR.
            In:   $a0 address, $a1 lower word, $a2 upper word.
            Out:	 None
@@ -251,7 +315,7 @@ return:
 	jr $ra
 	 nop
 	
-	/* Read SPD byte. In: $a0 device, $a1 byte. Out: $v0 read byte (0x100 on failure).
+	/* Read SPD byte. In: $a0 byte, $a1 device. Out: $v0 read byte (0x100 on failure).
            Clobbered: $t0, $t1, $t2, $t3, $a0. */
 read_spd:
 	move $t2, $a0
@@ -268,7 +332,7 @@ read_spd:
 	
 	/* Send device address.  */
 	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
-	sll $t1, $t2, 1
+	sll $t1, $a1, 1
 	bal smbus_wait
 	 sb $t1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE) ($t0)
 
@@ -281,7 +345,7 @@ read_spd:
 	/* Send byte address.  */
 	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
 	bal smbus_wait
-	 sb $a1, %lo(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE) ($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)
@@ -292,7 +356,7 @@ read_spd:
 
 	/* Send device address.  */
 	lui $t0, %hi(GRUB_CS5536_LBAR_SMBUS + GRUB_CS5536_SMB_REG_DATA + GRUB_MACHINE_PCI_IO_BASE)
-	sll $t1, $t2, 1
+	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) ($t0)
@@ -321,3 +385,156 @@ unhandled_tlb_refill:	.asciz "Unhandled TLB refill.\n\r"
 unhandled_cache_error:	.asciz "Unhandled cache error.\n\r"
 unhandled_exception:	.asciz "Unhandled exception.\n\r"
 smbus_enabled:	.asciz "SMBus controller enabled.\n\r"
+unimplemented_memory_type:	.asciz "non-DDR2 memory isn't supported.\n\r"
+no_cas_latency:		.asciz "Couldn't determine CAS latency.\n\r"
+cause:	 .asciz "Cause: "
+epc:	.asciz "\n\rEPC: "
+badvaddr:	.asciz "\n\rBadVaddr: "
+newline:	.asciz "\n\r"
+return_msg:	  .asciz "\n\rReturn address: "
+
+	.p2align 3
+
+regdump:
+	.quad 0x0100010000000101 /* 0 */
+	.quad 0x0100010100000000 /* 2 */
+	.quad 0x0101000001000000 /* 3 */
+	.quad 0x0100020200010101 /* 4 */
+	.quad 0x0a04030603050203 /* 6 */
+	.quad 0x0f0e040000010a0b /* 7 */
+	.quad 0x0000010200000102 /* 8 */
+	.quad 0x0000060c00000000 /* 9 */
+	.quad 0x2323233f3f1f0200 /* a */
+	.quad 0x5f7f232323232323 /* b */
+	.quad 0x002a3c0615000000 /* c */
+	.quad 0x002a002a002a002a /* d */
+	.quad 0x002a002a002a002a /* e */
+	.quad 0x00b40020006d0004 /* f */
+	.quad 0x070007ff00000087 /* 10 */
+	.quad 0x000000000016101f /* 11 */
+	.quad 0x001c000000000000 /* 12 */
+	.quad 0x28e1000200c8006b /* 13 */
+	.quad 0x0000204200c8002f /* 14 */
+	.quad 0x0000000000030d40 /* 15 */
+	.quad 0 /* 16 */
+	.quad 0 /* 17 */
+	.quad 0 /* 18 */
+	.quad 0 /* 19 */
+	.quad 0 /* 1a */
+	.quad 0 /* 1b */
+	.quad 0 /* 1c */
+
+	.p2align
+
+write_dumpreg:	
+	ld $t2, 0($t6)
+	sd $t2, 0($t4)
+	addiu $t4, $t4, 0x10
+	jr $ra
+	 addiu $t6, $t6, 0x8
+
+continue:
+	lui $t4, %hi(GRUB_MACHINE_DDR2_BASE)
+	addiu $t4, $t4, %lo(GRUB_MACHINE_DDR2_BASE)
+	lui $t6, %hi(regdump)
+
+	/* 0 */
+	bal write_dumpreg
+	 addiu $t6, $t6, %lo(regdump)
+
+	/* 1 */
+	ori $a1, $a1, 0x50
+	move $t8, $zero
+	lui  $t5, 0x0001
+	bal read_spd
+	 ori $a0, $zero, GRUB_SMBUS_SPD_MEMORY_NUM_BANKS_ADDR
+	ori $t7, $zero, 8
+	bne $v0, $t7, 1f
+	 ori $t5, $t5, 0x0001
+	ori $t8, $t8, GRUB_MACHINE_DDR2_REG1_HI_8BANKS
+1:
+	dsll $t8, $t8, 32
+	or $t5, $t5, $t8
+	sd  $t5, 0 ($t4)
+	addiu $t4, $t4, 0x10
+
+	/* 2 */
+	bal write_dumpreg
+	 nop
+
+	/* 3 */
+	bal write_dumpreg
+	 nop
+
+	/* 4 */
+	bal write_dumpreg
+	 nop
+
+	/* 5 */
+	/* FIXME: figure termination resistance.  */
+	ori $t5, $zero, 0x2
+	bal read_spd
+	 ori $a0, $zero, GRUB_SMBUS_SPD_MEMORY_NUM_ROWS_ADDR
+	/* $v0 = 15 - $v0.  */
+	xori $v0, $v0, 0xf
+	andi $v0, $v0, 0x7
+	sll $v0, $v0, 8
+	or $t5, $t5, $v0
+
+	/* Find the fastest supported CAS latency.  */
+	bal read_spd
+	 ori $a0, $zero, GRUB_SMBUS_SPD_MEMORY_CAS_LATENCY_ADDR
+	ori $t0, $zero, GRUB_SMBUS_SPD_MEMORY_CAS_LATENCY_MIN_VALUE
+	ori $t1, $zero, (1 << GRUB_SMBUS_SPD_MEMORY_CAS_LATENCY_MIN_VALUE)
+2:	
+	and $t2, $t1, $v0
+	bne $t2, $zero, 1f
+	 ori $t3, $zero, 8
+	lui $a0, %hi(no_cas_latency)
+	beq $t0, $t3, fatal
+	 addiu $a0, $a0, %lo(no_cas_latency)
+	addiu $t0, $t0, 1
+	b 2b
+	 sll $t1, $t1, 1
+1:
+	sll $t0, $t0, 16
+	or $t5, $t5, $t0
+	
+	bal read_spd
+	 ori $a0, $zero, GRUB_SMBUS_SPD_MEMORY_NUM_COLUMNS_ADDR
+	/* $v0 = 15 - ($v0 + 1) = 14 - $v0.  */
+	addiu $v0, $v0, 1
+	xori $v0, $v0, 0xf
+	andi $v0, $v0, 0x7
+	sll $v0, 24
+	or $t5, $t5, $v0
+	sd  $t5, 0 ($t4)
+
+	addiu $t4, $t4, 0x10
+	
+	ori $t7, $zero, 0x16
+
+1:	
+	ld $t2, 0($t6)
+	sd $t2, 0($t4)
+	addiu $t4, $t4, 0x10
+	addiu $t7, $t7, -1
+	bne $t7, $zero, 1b
+	 addiu $t6, $t6, 0x8
+	
+	lui $t4, %hi(GRUB_MACHINE_DDR2_BASE)
+	ld  $t5, (%lo(GRUB_MACHINE_DDR2_BASE) + 0x30) ($t4)
+	ori $t0, $zero, 1
+	dsll $t0, $t0, 40
+	or $t5, $t5, $t0
+	sd  $t5, (%lo(GRUB_MACHINE_DDR2_BASE) + 0x30) ($t4)
+
+	/* Desactivate DDR2 registers.  */
+        lui	$t0, 0xbfe0
+        ld	$t1, 0x0180($t0)
+	ori	$t1, $t1, 0x100
+        sd	$t1, 0x0180($t0)
+
+	addiu $a0, $zero, -1
+	addiu $a1, $zero, -1
+	addiu $a2, $zero, -1
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 83bb51c02..2f721f6ed 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -391,7 +391,31 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       free (core_img);
       core_img = elf_img;
       core_size = program_size  + sizeof (*ehdr) + sizeof (*phdr);
-  }
+    }
+  else
+    {
+      char *rom_img;
+      size_t rom_size;
+      char *boot_path, *boot_img;
+      size_t boot_size;
+      
+      boot_path = grub_util_get_path (dir, "fwstart.img");
+      boot_size = grub_util_get_image_size (boot_path);
+      boot_img = grub_util_read_image (boot_path);
+
+      rom_size = core_size + boot_size;
+
+      rom_img = xmalloc (rom_size);
+      memset (rom_img, 0, rom_size); 
+
+      memcpy (rom_img, boot_img, boot_size);
+
+      memcpy (rom_img + boot_size, core_img, core_size);      
+
+      free (core_img);
+      core_img = rom_img;
+      core_size = rom_size;
+    }
 #endif
 
   grub_util_write_image (core_img, core_size, out);

From 5dd8753cc0351adbeb5eb271e2a34d2d0ba73329 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 1 Mar 2010 18:57:31 +0100
Subject: [PATCH 0561/1628] Properly init even without pmon parameters

---
 kern/mips/startup.S       |  9 ++++++-
 kern/mips/yeeloong/init.c | 56 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/kern/mips/startup.S b/kern/mips/startup.S
index 5e3fb7ad5..e3ba131aa 100644
--- a/kern/mips/startup.S
+++ b/kern/mips/startup.S
@@ -48,8 +48,15 @@ codestart:
 	/* Parse arguments. Has to be done before relocation.
 	So need to do it in asm.  */
 #ifdef GRUB_MACHINE_MIPS_YEELOONG
+	move $s2, $zero
+	move $s3, $zero
+	move $s4, $zero
+	move $s5, $zero
+
 	/* $a2 has the environment.  */
-	move $t0, $a2
+	addiu $t0, $a2, 1
+	beq $t0, $zero, argdone
+	move $t0, $a2	
 argcont:	
 	lw $t1, 0($t0)
 	beq $t1, $zero, argdone
diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 14e8a39a2..f35605f63 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -27,6 +27,7 @@
 #include <grub/machine/kernel.h>
 #include <grub/machine/memory.h>
 #include <grub/cpu/kernel.h>
+#include <grub/cs5536.h>
 
 extern void grub_video_sm712_init (void);
 extern void grub_video_video_init (void);
@@ -89,16 +90,67 @@ void
 grub_machine_init (void)
 {
   void *modend;
+
+  /* FIXME: measure this.  */
+  if (grub_arch_busclock == 0)
+    {
+      grub_arch_busclock = 66000000;
+      grub_arch_cpuclock = 797000000;
+    }
+
+  grub_install_get_time_ms (grub_rtc_get_time_ms);
+
+  if (grub_arch_memsize == 0)
+    {
+      grub_port_t smbbase;
+      grub_err_t err;
+      grub_pci_device_t dev;
+      struct grub_smbus_spd spd;
+      unsigned totalmem;
+      int i;
+
+      if (!grub_cs5536_find (&dev))
+	grub_fatal ("No CS5536 found\n");
+
+      err = grub_cs5536_init_smbus (dev, 0x7ff, &smbbase);
+      if (err)
+	grub_fatal ("Couldn't init SMBus: %s\n", grub_errmsg);
+
+      /* Yeeloong has only one memory slot.  */
+      err = grub_cs5536_read_spd (smbbase, GRUB_SMB_RAM_START_ADDR, &spd);
+      if (err)
+	grub_fatal ("Couldn't read SPD: %s\n", grub_errmsg);
+      for (i = 5; i < 13; i++)
+	if (spd.ddr2.rank_capacity & (1 << (i & 7)))
+	  break;
+      /* Something is wrong.  */
+      if (i == 13)
+	totalmem = 256;
+      else
+	totalmem = ((spd.ddr2.num_of_ranks
+		     & GRUB_SMBUS_SPD_MEMORY_NUM_OF_RANKS_MASK) + 1) << (i + 2);
+      
+      if (totalmem >= 256)
+	{
+	  grub_arch_memsize = 256;
+	  grub_arch_highmemsize = totalmem - 256;
+	}
+      else
+	{
+	  grub_arch_memsize = (totalmem >> 20);
+	  grub_arch_highmemsize = 0;
+	}
+    }
+
   modend = get_modules_end ();
   grub_mm_init_region (modend, (grub_arch_memsize << 20)
 		       - (((grub_addr_t) modend) - GRUB_ARCH_LOWMEMVSTART));
   /* FIXME: use upper memory as well.  */
-  grub_install_get_time_ms (grub_rtc_get_time_ms);
 
   /* Initialize output terminal (can't be done earlier, as gfxterm
      relies on a working heap.  */
-  grub_video_sm712_init ();
   grub_video_video_init ();
+  grub_video_sm712_init ();
   grub_video_bitmap_init ();
   grub_font_manager_init ();
   grub_term_gfxterm_init ();

From 5519963bf6ae5804f98b4828b6c9687f9f31a9cf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 1 Mar 2010 19:07:48 +0100
Subject: [PATCH 0562/1628] 2010-03-01  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* configure.ac: Update version to 1.98.
---
 ChangeLog    | 4 ++++
 configure.ac | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e7617dc1d..3812610d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Update version to 1.98.
+
 2010-02-26  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub.d/10_linux.in (linux_entry): Don't default to
diff --git a/configure.ac b/configure.ac
index 48702afd6..ac3f0d196 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target
 dnl type.
 
 
-AC_INIT([GRUB],[1.97],[bug-grub@gnu.org])
+AC_INIT([GRUB],[1.98],[bug-grub@gnu.org])
 AM_INIT_AUTOMAKE()
 AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR([include/grub/dl.h])

From 5382b1e4a899b713f3fd50a123e7bfb380e3beef Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 1 Mar 2010 20:24:34 +0100
Subject: [PATCH 0563/1628] 2010-03-01  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* commands/cat.c (grub_cmd_cat): Propagate grub_gzfile_open error.
---
 ChangeLog      | 4 ++++
 commands/cat.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3812610d7..2010872b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* commands/cat.c (grub_cmd_cat): Propagate grub_gzfile_open error.
+
 2010-03-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Update version to 1.98.
diff --git a/commands/cat.c b/commands/cat.c
index 844034777..3bdafc4c6 100644
--- a/commands/cat.c
+++ b/commands/cat.c
@@ -41,7 +41,7 @@ grub_cmd_cat (grub_command_t cmd __attribute__ ((unused)),
 
   file = grub_gzfile_open (args[0], 1);
   if (! file)
-    return 0;
+    return grub_errno;
 
   while ((size = grub_file_read (file, buf, sizeof (buf))) > 0
 	 && key != GRUB_TERM_ESC)

From c6f2fe52f185525c64980321449e07637ade222f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 1 Mar 2010 20:58:45 +0100
Subject: [PATCH 0564/1628] 2010-03-01  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Wait for user entry basing on presence of output rather than on errors.

	* include/grub/normal.h (grub_normal_get_line_counter): New proto.
	(grub_install_newline_hook): Likewise.
	* normal/main.c (GRUB_MOD_INIT): Call grub_install_newline_hook.
	* normal/menu.c (show_menu): Check line_counter to determine presence
	of output.
	* normal/term.c (grub_normal_line_counter): New variable.
	(grub_normal_get_line_counter): New function.
	(grub_install_newline_hook): Likewise.
---
 ChangeLog             | 13 +++++++++++++
 include/grub/normal.h |  3 +++
 normal/main.c         |  1 +
 normal/menu.c         | 12 ++++++------
 normal/term.c         | 16 +++++++++++++++-
 5 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2010872b1..5ba6dd4eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Wait for user entry basing on presence of output rather than on errors.
+
+	* include/grub/normal.h (grub_normal_get_line_counter): New proto.
+	(grub_install_newline_hook): Likewise.
+	* normal/main.c (GRUB_MOD_INIT): Call grub_install_newline_hook.
+	* normal/menu.c (show_menu): Check line_counter to determine presence
+	of output.
+	* normal/term.c (grub_normal_line_counter): New variable.
+	(grub_normal_get_line_counter): New function.
+	(grub_install_newline_hook): Likewise.
+
 2010-03-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* commands/cat.c (grub_cmd_cat): Propagate grub_gzfile_open error.
diff --git a/include/grub/normal.h b/include/grub/normal.h
index fad1a41ba..fe45ddf71 100644
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -110,4 +110,7 @@ void read_terminal_list (void);
 
 void grub_set_more (int onoff);
 
+int grub_normal_get_line_counter (void);
+void grub_install_newline_hook (void);
+
 #endif /* ! GRUB_NORMAL_HEADER */
diff --git a/normal/main.c b/normal/main.c
index 2306427fc..5a5467485 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -654,6 +654,7 @@ GRUB_MOD_INIT(normal)
 
   grub_set_history (GRUB_DEFAULT_HISTORY_SIZE);
 
+  grub_install_newline_hook ();
   grub_register_variable_hook ("pager", 0, grub_env_write_pager);
 
   /* Register a command "normal" for the rescue mode.  */
diff --git a/normal/menu.c b/normal/menu.c
index c47e83bc2..07951dacc 100644
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -559,14 +559,14 @@ show_menu (grub_menu_t menu, int nested)
         }
       else
         {
+	  int lines_before = grub_normal_get_line_counter ();
           grub_errno = GRUB_ERR_NONE;
           grub_menu_execute_entry (e);
-          if (grub_errno != GRUB_ERR_NONE)
-            {
-              grub_print_error ();
-              grub_errno = GRUB_ERR_NONE;
-              grub_wait_after_message ();
-            }
+	  grub_print_error ();
+	  grub_errno = GRUB_ERR_NONE;
+
+          if (lines_before != grub_normal_get_line_counter ())
+	    grub_wait_after_message ();
         }
     }
 
diff --git a/normal/term.c b/normal/term.c
index e31d403ee..7bedd6799 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -30,6 +30,14 @@ static unsigned grub_more_lines;
 /* If the more pager is active.  */
 static int grub_more;
 
+static int grub_normal_line_counter = 0;
+
+int
+grub_normal_get_line_counter (void)
+{
+  return grub_normal_line_counter;
+}
+
 static void
 process_newline (void)
 {
@@ -41,6 +49,8 @@ process_newline (void)
       height = grub_term_height (cur);
   grub_more_lines++;
 
+  grub_normal_line_counter++;
+
   if (grub_more && grub_more_lines >= height - 1)
     {
       char key;
@@ -76,6 +86,11 @@ grub_set_more (int onoff)
     grub_more--;
 
   grub_more_lines = 0;
+}
+
+void
+grub_install_newline_hook (void)
+{
   grub_newline_hook = process_newline;
 }
 
@@ -150,7 +165,6 @@ grub_terminal_autoload_free (void)
   grub_term_output_autoload = NULL;
 }
 
-
 /* Read the file terminal.lst for auto-loading.  */
 void
 read_terminal_list (void)

From c4d0b332c54e34b6a40fcda05183943ee192f24c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 1 Mar 2010 21:00:02 +0100
Subject: [PATCH 0565/1628] 2010-03-01  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* fs/ext2.c (grub_ext2_read_block): Fix an integer overflow.
---
 ChangeLog | 4 ++++
 fs/ext2.c | 9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5ba6dd4eb..90bbce0e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* fs/ext2.c (grub_ext2_read_block): Fix an integer overflow.
+
 2010-03-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Wait for user entry basing on presence of output rather than on errors.
diff --git a/fs/ext2.c b/fs/ext2.c
index ac36b329b..f2fec828a 100644
--- a/fs/ext2.c
+++ b/fs/ext2.c
@@ -436,7 +436,8 @@ grub_ext2_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
       grub_uint32_t indir[blksz / 4];
 
       if (grub_disk_read (data->disk,
-			  grub_le_to_cpu32 (inode->blocks.indir_block)
+			  ((grub_disk_addr_t)
+			   grub_le_to_cpu32 (inode->blocks.indir_block))
 			  << log2_blksz,
 			  0, blksz, indir))
 	return grub_errno;
@@ -452,13 +453,15 @@ grub_ext2_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
       grub_uint32_t indir[blksz / 4];
 
       if (grub_disk_read (data->disk,
-			  grub_le_to_cpu32 (inode->blocks.double_indir_block)
+			  ((grub_disk_addr_t)
+			   grub_le_to_cpu32 (inode->blocks.double_indir_block))
 			  << log2_blksz,
 			  0, blksz, indir))
 	return grub_errno;
 
       if (grub_disk_read (data->disk,
-			  grub_le_to_cpu32 (indir[rblock / perblock])
+			  ((grub_disk_addr_t)
+			   grub_le_to_cpu32 (indir[rblock / perblock]))
 			  << log2_blksz,
 			  0, blksz, indir))
 	return grub_errno;

From 22d7b6137a3b362b6230af23dc1009f4ed87a208 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 3 Mar 2010 10:44:12 +0000
Subject: [PATCH 0566/1628] 2010-03-03  Colin Watson  <cjwatson@ubuntu.com>

	* util/hostdisk.c (struct grub_util_biosdisk_data): New structure.
	(grub_util_biosdisk_open): Initialise disk->data.
	(struct linux_partition_cache): New structure.
	(linux_find_partition): Cache partition start positions; these are
	expensive to compute on every read and write.
	(open_device): Cache open file descriptor in disk->data, so that we
	don't have to reopen it and flush the buffer cache for consecutive
	operations on the same device.
	(grub_util_biosdisk_close): New function.
	(grub_util_biosdisk_dev): Set `close' member.

	* conf/common.rmk (grub_probe_SOURCES): Add kern/list.c.
	* conf/i386-efi.rmk (grub_setup_SOURCES): Likewise.
	* conf/i386-pc.rmk (grub_setup_SOURCES): Likewise.
	* conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Likewise.
	* conf/x86_64-efi.rmk (grub_setup_SOURCES): Likewise.
---
 ChangeLog.hostdisk-speedup |  18 +++++++
 conf/common.rmk            |   2 +-
 conf/i386-efi.rmk          |   2 +-
 conf/i386-pc.rmk           |   3 +-
 conf/sparc64-ieee1275.rmk  |   3 +-
 conf/x86_64-efi.rmk        |   2 +-
 util/hostdisk.c            | 104 ++++++++++++++++++++++++++++++++-----
 7 files changed, 116 insertions(+), 18 deletions(-)
 create mode 100644 ChangeLog.hostdisk-speedup

diff --git a/ChangeLog.hostdisk-speedup b/ChangeLog.hostdisk-speedup
new file mode 100644
index 000000000..ef48978a4
--- /dev/null
+++ b/ChangeLog.hostdisk-speedup
@@ -0,0 +1,18 @@
+2010-03-03  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/hostdisk.c (struct grub_util_biosdisk_data): New structure.
+	(grub_util_biosdisk_open): Initialise disk->data.
+	(struct linux_partition_cache): New structure.
+	(linux_find_partition): Cache partition start positions; these are
+	expensive to compute on every read and write.
+	(open_device): Cache open file descriptor in disk->data, so that we
+	don't have to reopen it and flush the buffer cache for consecutive
+	operations on the same device.
+	(grub_util_biosdisk_close): New function.
+	(grub_util_biosdisk_dev): Set `close' member.
+
+	* conf/common.rmk (grub_probe_SOURCES): Add kern/list.c.
+	* conf/i386-efi.rmk (grub_setup_SOURCES): Likewise.
+	* conf/i386-pc.rmk (grub_setup_SOURCES): Likewise.
+	* conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Likewise.
+	* conf/x86_64-efi.rmk (grub_setup_SOURCES): Likewise.
diff --git a/conf/common.rmk b/conf/common.rmk
index 7effa8af3..8f63e2db8 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -24,7 +24,7 @@ util/grub-probe.c_DEPENDENCIES = grub_probe_init.h
 grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c	\
 	util/hostdisk.c	util/misc.c util/getroot.c		\
 	kern/device.c kern/disk.c kern/err.c kern/misc.c	\
-	kern/parser.c kern/partition.c kern/file.c		\
+	kern/parser.c kern/partition.c kern/file.c kern/list.c	\
 	\
 	fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c		\
 	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	\
diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index c03abb429..8f159e9c0 100644
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -21,7 +21,7 @@ util/i386/efi/grub-mkimage.c_DEPENDENCIES = Makefile
 #	kern/err.c kern/misc.c fs/fat.c fs/ext2.c fs/xfs.c fs/affs.c	\
 #	fs/sfs.c kern/parser.c kern/partition.c partmap/msdos.c		\
 #	fs/ufs.c fs/ufs2.c fs/minix.c fs/hfs.c fs/jfs.c fs/hfsplus.c kern/file.c	\
-#	kern/fs.c kern/env.c fs/fshelp.c
+#	kern/fs.c kern/env.c kern/list.c fs/fshelp.c
 
 # Scripts.
 sbin_SCRIPTS = grub-install
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 580bfea0a..610f4791b 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -96,7 +96,8 @@ grub_setup_SOURCES = gnulib/progname.c \
 	util/i386/pc/grub-setup.c util/hostdisk.c	\
 	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
 	kern/err.c kern/misc.c kern/parser.c kern/partition.c	\
-	kern/file.c kern/fs.c kern/env.c fs/fshelp.c		\
+	kern/file.c kern/fs.c kern/env.c kern/list.c		\
+	fs/fshelp.c						\
 	\
 	fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c		\
 	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	\
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index befc7dce5..e8bdccb2d 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -70,7 +70,8 @@ util/sparc64/ieee1275/grub-setup.c_DEPENDENCIES = grub_setup_init.h
 grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c	\
 	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
 	kern/err.c kern/misc.c kern/parser.c kern/partition.c	\
-	kern/file.c kern/fs.c kern/env.c fs/fshelp.c		\
+	kern/file.c kern/fs.c kern/env.c kern/list.c		\
+	fs/fshelp.c						\
 	\
 	fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c		\
 	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	\
diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index d5c3c24cb..e17777e0a 100644
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -20,7 +20,7 @@ grub_mkimage_SOURCES = gnulib/progname.c util/i386/efi/grub-mkimage.c \
 #	kern/err.c kern/misc.c fs/fat.c fs/ext2.c fs/xfs.c fs/affs.c	\
 #	fs/sfs.c kern/parser.c kern/partition.c partmap/msdos.c		\
 #	fs/ufs.c fs/ufs2.c fs/minix.c fs/hfs.c fs/jfs.c fs/hfsplus.c kern/file.c	\
-#	kern/fs.c kern/env.c fs/fshelp.c
+#	kern/fs.c kern/env.c kern/list.c fs/fshelp.c
 
 # Scripts.
 sbin_SCRIPTS = grub-install
diff --git a/util/hostdisk.c b/util/hostdisk.c
index 98d3d53ae..9ece36885 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -26,6 +26,7 @@
 #include <grub/util/hostdisk.h>
 #include <grub/misc.h>
 #include <grub/i18n.h>
+#include <grub/list.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -103,6 +104,12 @@ struct
   char *device;
 } map[256];
 
+struct grub_util_biosdisk_data
+{
+  char *dev;
+  int fd;
+};
+
 #ifdef __linux__
 /* Check if we have devfs support.  */
 static int
@@ -165,6 +172,7 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
 {
   int drive;
   struct stat st;
+  struct grub_util_biosdisk_data *data;
 
   drive = find_grub_drive (name);
   if (drive < 0)
@@ -173,6 +181,9 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
 
   disk->has_partitions = 1;
   disk->id = drive;
+  disk->data = data = xmalloc (sizeof (struct grub_util_biosdisk_data));
+  data->dev = NULL;
+  data->fd = -1;
 
   /* Get the size.  */
 #if defined(__MINGW32__)
@@ -254,6 +265,17 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
 }
 
 #ifdef __linux__
+/* Cache of partition start sectors for each disk.  */
+struct linux_partition_cache
+{
+  struct linux_partition_cache *next;
+  char *dev;
+  unsigned long start;
+  int partno;
+};
+
+struct linux_partition_cache *linux_partition_cache_list;
+
 static int
 linux_find_partition (char *dev, unsigned long sector)
 {
@@ -262,6 +284,7 @@ linux_find_partition (char *dev, unsigned long sector)
   char *p;
   int i;
   char real_dev[PATH_MAX];
+  struct linux_partition_cache *cache;
 
   strcpy(real_dev, dev);
 
@@ -281,6 +304,16 @@ linux_find_partition (char *dev, unsigned long sector)
       format = "%d";
     }
 
+  for (cache = linux_partition_cache_list; cache; cache = cache->next)
+    {
+      if (strcmp (cache->dev, dev) == 0 && cache->start == sector)
+	{
+	  sprintf (p, format, cache->partno);
+	  strcpy (dev, real_dev);
+	  return 1;
+	}
+    }
+
   for (i = 1; i < 10000; i++)
     {
       int fd;
@@ -301,6 +334,15 @@ linux_find_partition (char *dev, unsigned long sector)
 
       if (hdg.start == sector)
 	{
+	  struct linux_partition_cache *new_cache_item;
+
+	  new_cache_item = xmalloc (sizeof *new_cache_item);
+	  new_cache_item->dev = xstrdup (dev);
+	  new_cache_item->start = hdg.start;
+	  new_cache_item->partno = i;
+	  grub_list_push (GRUB_AS_LIST_P (&linux_partition_cache_list),
+			  GRUB_AS_LIST (new_cache_item));
+
 	  strcpy (dev, real_dev);
 	  return 1;
 	}
@@ -314,6 +356,7 @@ static int
 open_device (const grub_disk_t disk, grub_disk_addr_t sector, int flags)
 {
   int fd;
+  struct grub_util_biosdisk_data *data = disk->data;
 
 #ifdef O_LARGEFILE
   flags |= O_LARGEFILE;
@@ -340,18 +383,30 @@ open_device (const grub_disk_t disk, grub_disk_addr_t sector, int flags)
 	&& strncmp (map[disk->id].device, "/dev/", 5) == 0)
       is_partition = linux_find_partition (dev, disk->partition->start);
 
-    /* Open the partition.  */
-    grub_dprintf ("hostdisk", "opening the device `%s' in open_device()\n", dev);
-    fd = open (dev, flags);
-    if (fd < 0)
+    if (data->dev && strcmp (data->dev, dev) == 0)
       {
-	grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s'", dev);
-	return -1;
+	grub_dprintf ("hostdisk", "reusing open device `%s'\n", dev);
+	fd = data->fd;
       }
+    else
+      {
+	/* Open the partition.  */
+	grub_dprintf ("hostdisk", "opening the device `%s' in open_device()\n", dev);
+	fd = open (dev, flags);
+	if (fd < 0)
+	  {
+	    grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s'", dev);
+	    return -1;
+	  }
 
-    /* Flush the buffer cache to the physical disk.
-       XXX: This also empties the buffer cache.  */
-    ioctl (fd, BLKFLSBUF, 0);
+	/* Flush the buffer cache to the physical disk.
+	   XXX: This also empties the buffer cache.  */
+	ioctl (fd, BLKFLSBUF, 0);
+
+	free (data->dev);
+	data->dev = xstrdup (dev);
+	data->fd = fd;
+      }
 
     if (is_partition)
       sector -= disk->partition->start;
@@ -375,7 +430,21 @@ open_device (const grub_disk_t disk, grub_disk_addr_t sector, int flags)
     }
 #endif
 
-  fd = open (map[disk->id].device, flags);
+  if (data->dev && strcmp (data->dev, map[disk->id].device) == 0)
+    {
+      grub_dprintf ("hostdisk", "reusing open device `%s'\n", data->dev);
+      fd = data->fd;
+    }
+  else
+    {
+      fd = open (map[disk->id].device, flags);
+      if (fd >= 0)
+	{
+	  free (data->dev);
+	  data->dev = xstrdup (map[disk->id].device);
+	  data->fd = fd;
+	}
+    }
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
   if (! (sysctl_oldflags & 0x10)
@@ -535,7 +604,6 @@ grub_util_biosdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
       != (ssize_t) (size << GRUB_DISK_SECTOR_BITS))
     grub_error (GRUB_ERR_READ_ERROR, "cannot read from `%s'", map[disk->id].device);
 
-  close (fd);
   return grub_errno;
 }
 
@@ -570,17 +638,27 @@ grub_util_biosdisk_write (grub_disk_t disk, grub_disk_addr_t sector,
       != (ssize_t) (size << GRUB_DISK_SECTOR_BITS))
     grub_error (GRUB_ERR_WRITE_ERROR, "cannot write to `%s'", map[disk->id].device);
 
-  close (fd);
   return grub_errno;
 }
 
+static void
+grub_util_biosdisk_close (struct grub_disk *disk)
+{
+  struct grub_util_biosdisk_data *data = disk->data;
+
+  free (data->dev);
+  if (data->fd != -1)
+    close (data->fd);
+  free (data);
+}
+
 static struct grub_disk_dev grub_util_biosdisk_dev =
   {
     .name = "biosdisk",
     .id = GRUB_DISK_DEVICE_BIOSDISK_ID,
     .iterate = grub_util_biosdisk_iterate,
     .open = grub_util_biosdisk_open,
-    .close = 0,
+    .close = grub_util_biosdisk_close,
     .read = grub_util_biosdisk_read,
     .write = grub_util_biosdisk_write,
     .next = 0

From c6293875f961046e9d961db56fbf6082a5d955cc Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 3 Mar 2010 20:03:50 +0000
Subject: [PATCH 0567/1628] reopen device when the requested access mode
 changes

---
 util/hostdisk.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/util/hostdisk.c b/util/hostdisk.c
index 9ece36885..b8f3129f0 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -107,6 +107,7 @@ struct
 struct grub_util_biosdisk_data
 {
   char *dev;
+  int access_mode;
   int fd;
 };
 
@@ -183,6 +184,7 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
   disk->id = drive;
   disk->data = data = xmalloc (sizeof (struct grub_util_biosdisk_data));
   data->dev = NULL;
+  data->access_mode = 0;
   data->fd = -1;
 
   /* Get the size.  */
@@ -383,13 +385,18 @@ open_device (const grub_disk_t disk, grub_disk_addr_t sector, int flags)
 	&& strncmp (map[disk->id].device, "/dev/", 5) == 0)
       is_partition = linux_find_partition (dev, disk->partition->start);
 
-    if (data->dev && strcmp (data->dev, dev) == 0)
+    if (data->dev && strcmp (data->dev, dev) == 0 &&
+	data->access_mode == (flags & O_ACCMODE))
       {
 	grub_dprintf ("hostdisk", "reusing open device `%s'\n", dev);
 	fd = data->fd;
       }
     else
       {
+	free (data->dev);
+	if (data->fd != -1)
+	  close (data->fd);
+
 	/* Open the partition.  */
 	grub_dprintf ("hostdisk", "opening the device `%s' in open_device()\n", dev);
 	fd = open (dev, flags);
@@ -403,8 +410,8 @@ open_device (const grub_disk_t disk, grub_disk_addr_t sector, int flags)
 	   XXX: This also empties the buffer cache.  */
 	ioctl (fd, BLKFLSBUF, 0);
 
-	free (data->dev);
 	data->dev = xstrdup (dev);
+	data->access_mode = (flags & O_ACCMODE);
 	data->fd = fd;
       }
 
@@ -430,18 +437,23 @@ open_device (const grub_disk_t disk, grub_disk_addr_t sector, int flags)
     }
 #endif
 
-  if (data->dev && strcmp (data->dev, map[disk->id].device) == 0)
+  if (data->dev && strcmp (data->dev, map[disk->id].device) == 0 &&
+      data->access_mode == (flags & O_ACCMODE))
     {
       grub_dprintf ("hostdisk", "reusing open device `%s'\n", data->dev);
       fd = data->fd;
     }
   else
     {
+      free (data->dev);
+      if (data->fd != -1)
+	close (data->fd);
+
       fd = open (map[disk->id].device, flags);
       if (fd >= 0)
 	{
-	  free (data->dev);
 	  data->dev = xstrdup (map[disk->id].device);
+	  data->access_mode = (flags & O_ACCMODE);
 	  data->fd = fd;
 	}
     }

From 08dcd91370183936b9a58882991564afc674a9b7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 4 Mar 2010 15:12:34 +0100
Subject: [PATCH 0568/1628] 2010-03-04  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* util/i386/efi/grub-install.in: Copy gettext files.
---
 ChangeLog                     | 4 ++++
 util/i386/efi/grub-install.in | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 90bbce0e2..6eb0d5377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/i386/efi/grub-install.in: Copy gettext files.
+
 2010-03-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* fs/ext2.c (grub_ext2_read_block): Fix an integer overflow.
diff --git a/util/i386/efi/grub-install.in b/util/i386/efi/grub-install.in
index caa7be7e4..6a8573e81 100644
--- a/util/i386/efi/grub-install.in
+++ b/util/i386/efi/grub-install.in
@@ -180,6 +180,14 @@ for file in ${pkglibdir}/*.mod ${pkglibdir}/*.lst; do
     cp -f $file ${grubdir} || exit 1
 done
 
+# Copy gettext files
+mkdir -p ${grubdir}/locale/
+for file in ${grubdir}/locale/*.mo ${pkglibdir}/locale/*.mo; do
+    if test -f "$file"; then
+        cp -f "$file" ${grubdir}/locale/
+    fi
+done
+
 if ! test -f ${grubdir}/grubenv; then
     $grub_editenv ${grubdir}/grubenv create
 fi

From a8efbf649e9fbacf850cee6c80f8b6aea9b691a5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 4 Mar 2010 15:41:32 +0100
Subject: [PATCH 0569/1628] 2010-03-04  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* genmk.rb: Remove terminal*.lst in make clean.
---
 ChangeLog | 4 ++++
 genmk.rb  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6eb0d5377..e3b704c76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* genmk.rb: Remove terminal*.lst in make clean.
+
 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/i386/efi/grub-install.in: Copy gettext files.
diff --git a/genmk.rb b/genmk.rb
index df03e1dfe..efea16412 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -201,7 +201,7 @@ endif
 -include #{dep}
 
 clean-module-#{extra_target}.#{@rule_count}:
-	rm -f #{command} #{fs} #{partmap} #{handler} #{parttool} #{video}
+	rm -f #{command} #{fs} #{partmap} #{handler} #{parttool} #{video} #{terminal}
 
 CLEAN_MODULE_TARGETS += clean-module-#{extra_target}.#{@rule_count}
 

From c0ee0385c9bc3a84aaa5de95aacefaff47dd07d6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 4 Mar 2010 15:50:57 +0100
Subject: [PATCH 0570/1628] 2010-03-04  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* Makefile.in (CLEANFILES) [FONT_SOURCE && grub_mkfont]: Add
	ascii.bitmaps.
---
 ChangeLog   | 5 +++++
 Makefile.in | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e3b704c76..413622c32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* Makefile.in (CLEANFILES) [FONT_SOURCE && grub_mkfont]: Add
+	ascii.bitmaps.
+
 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* genmk.rb: Remove terminal*.lst in make clean.
diff --git a/Makefile.in b/Makefile.in
index 539cde397..5a4ef459f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -239,6 +239,7 @@ else
 ifeq ($(enable_grub_mkfont),yes)
 
 pkgdata_DATA += unicode.pf2 ascii.pf2 ascii.h
+CLEANFILES += ascii.bitmaps
 
 # Arrows and lines are needed to draw the menu, so we always include them
 UNICODE_ARROWS=0x2190-0x2193

From b4b7be98dbfa11240c59ba06df51e4baf68253da Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 4 Mar 2010 16:08:46 +0100
Subject: [PATCH 0571/1628] 2010-03-04  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* Makefile.in (DISTCLEANFILES): Add stamp-h1.
---
 ChangeLog   | 4 ++++
 Makefile.in | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 413622c32..255d3422c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* Makefile.in (DISTCLEANFILES): Add stamp-h1.
+
 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* Makefile.in (CLEANFILES) [FONT_SOURCE && grub_mkfont]: Add
diff --git a/Makefile.in b/Makefile.in
index 5a4ef459f..4144dfb5a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -147,7 +147,7 @@ INFOS = $(info_INFOS)
 CLEANFILES =
 MOSTLYCLEANFILES =
 DISTCLEANFILES = config.status config.cache config.log config.h \
-	Makefile stamp-h include/grub/cpu include/grub/machine \
+	Makefile stamp-h stamp-h1 include/grub/cpu include/grub/machine \
 	gensymlist.sh genkernsyms.sh build_env.mk \
 	docs/grub.info docs/version.texi docs/stamp-vti
 

From f209b5b2305bdbed24bf9eb215e9625b7ea878be Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 4 Mar 2010 16:13:35 +0100
Subject: [PATCH 0572/1628] 2010-03-04  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* normal/crypto.c (read_crypto_list): Fix a typo.
	Reported by: Seth Goldberg.
---
 ChangeLog       | 7 +++++++
 normal/crypto.c | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 255d3422c..9246179f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* normal/crypto.c (read_crypto_list): Fix a typo.
+	Reported by: Seth Goldberg.
+
 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* Makefile.in (DISTCLEANFILES): Add stamp-h1.
+	Reported by: Seth Goldberg.
 
 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
@@ -10,6 +16,7 @@
 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* genmk.rb: Remove terminal*.lst in make clean.
+	Reported by: Seth Goldberg.
 
 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
diff --git a/normal/crypto.c b/normal/crypto.c
index 95899fbd5..f051e2c4c 100644
--- a/normal/crypto.c
+++ b/normal/crypto.c
@@ -95,7 +95,7 @@ read_crypto_list (void)
       return;
     }
 
-  /* Override previous commands.lst.  */
+  /* Override previous crypto.lst.  */
   grub_crypto_spec_free ();
 
   for (;; grub_free (buf))

From 4760f97911b1c2ba2e98efc3e467381d8dc94af0 Mon Sep 17 00:00:00 2001
From: Christian Franke <franke@computer.org>
Date: Thu, 4 Mar 2010 16:25:26 +0100
Subject: [PATCH 0573/1628] 2010-03-04  Christian Franke  <franke@computer.org>

	* util/grub-pe2elf.c: Add missing include "progname.h".
---
 ChangeLog          | 4 ++++
 util/grub-pe2elf.c | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9246179f4..634193596 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-04  Christian Franke  <franke@computer.org>
+
+	* util/grub-pe2elf.c: Add missing include "progname.h".
+
 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* normal/crypto.c (read_crypto_list): Fix a typo.
diff --git a/util/grub-pe2elf.c b/util/grub-pe2elf.c
index 488ad9b23..f370bbfa8 100644
--- a/util/grub-pe2elf.c
+++ b/util/grub-pe2elf.c
@@ -29,6 +29,8 @@
 #include <stdlib.h>
 #include <getopt.h>
 
+#include "progname.h"
+
 static struct option options[] = {
   {"help", no_argument, 0, 'h'},
   {"version", no_argument, 0, 'V'},

From fc8345da984282291928da32f02f4317e7808a45 Mon Sep 17 00:00:00 2001
From: Jordan Uggla <jordan.uggla@gmail.com>
Date: Thu, 4 Mar 2010 16:28:57 +0100
Subject: [PATCH 0574/1628] 2010-03-04  Jordan Uggla  <jordan.uggla@gmail.com>

	* INSTALL: Add gettext as a dependency and add qemu to a new section
	"Prerequisites for make-check".
---
 ChangeLog | 5 +++++
 INSTALL   | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 634193596..d3d939985 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-04  Jordan Uggla  <jordan.uggla@gmail.com>
+
+	* INSTALL: Add gettext as a dependency and add qemu to a new section
+	"Prerequisites for make-check".
+
 2010-03-04  Christian Franke  <franke@computer.org>
 
 	* util/grub-pe2elf.c: Add missing include "progname.h".
diff --git a/INSTALL b/INSTALL
index cfade2026..0dd408bcc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -14,6 +14,7 @@ configuring the GRUB.
 * GCC 4.1.3 or later
 * GNU Make
 * GNU Bison 2.3 or later
+* GNU gettext 0.17 or later
 * GNU binutils 2.9.1.0.23 or later
 * Other standard GNU/Unix tools
 
@@ -25,6 +26,10 @@ need the following.
 * Autoconf 2.60 or later
 * Automake 1.10.1 or later
 
+Prerequisites for make-check:
+
+* qemu, specifically the binary 'qemu-system-i386'
+
 Configuring the GRUB
 ====================
 

From b54d93ac1ba60ddee1a697e2f0b16d848385752f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 4 Mar 2010 17:03:43 +0100
Subject: [PATCH 0575/1628] 2010-03-04  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Disable linux.mod on qemu-mips since it's not functional and leads
	to compilation failure.

	* conf/mips.rmk (pkglib_MODULES): Remove linux.mod.
	* conf/mips-yeeloong.rmk (pkglib_MODULES): Add linux.mod.
	* conf/mips.rmk (linux_mod_SOURCES): Move from here ...
	* conf/mips-yeeloong.rmk (linux_mod_SOURCES): ... here
	* conf/mips.rmk (linux_mod_CFLAGS): Move from here ...
	* conf/mips-yeeloong.rmk (linux_mod_CFLAGS): ... here
	* conf/mips.rmk (linux_mod_ASFLAGS): Move from here ...
	* conf/mips-yeeloong.rmk (linux_mod_ASFLAGS): ... here
	* conf/mips.rmk (linux_mod_LDFLAGS): Move from here ...
	* conf/mips-yeeloong.rmk (linux_mod_LDFLAGS): ... here
	Reported by: BVK Chaitanya
---
 ChangeLog              | 17 +++++++++++++++++
 conf/mips-yeeloong.rmk |  5 +++++
 conf/mips.rmk          |  6 ------
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d3d939985..039a80a59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Disable linux.mod on qemu-mips since it's not functional and leads
+	to compilation failure.
+
+	* conf/mips.rmk (pkglib_MODULES): Remove linux.mod.
+	* conf/mips-yeeloong.rmk (pkglib_MODULES): Add linux.mod.
+	* conf/mips.rmk (linux_mod_SOURCES): Move from here ...
+	* conf/mips-yeeloong.rmk (linux_mod_SOURCES): ... here
+	* conf/mips.rmk (linux_mod_CFLAGS): Move from here ...
+	* conf/mips-yeeloong.rmk (linux_mod_CFLAGS): ... here
+	* conf/mips.rmk (linux_mod_ASFLAGS): Move from here ...
+	* conf/mips-yeeloong.rmk (linux_mod_ASFLAGS): ... here
+	* conf/mips.rmk (linux_mod_LDFLAGS): Move from here ...
+	* conf/mips-yeeloong.rmk (linux_mod_LDFLAGS): ... here
+	Reported by: BVK Chaitanya
+
 2010-03-04  Jordan Uggla  <jordan.uggla@gmail.com>
 
 	* INSTALL: Add gettext as a dependency and add qemu to a new section
diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 0d9a4c1bb..9977f7881 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -76,6 +76,11 @@ datehook_mod_SOURCES = hook/datehook.c
 datehook_mod_CFLAGS = $(COMMON_CFLAGS)
 datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += linux.mod
+linux_mod_SOURCES = loader/$(target_cpu)/linux.c
+linux_mod_CFLAGS = $(COMMON_CFLAGS)
+linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
+linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 sbin_SCRIPTS += grub-install
 grub_install_SOURCES = util/grub-install.in
diff --git a/conf/mips.rmk b/conf/mips.rmk
index c7c80a26d..536d35cac 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -73,10 +73,4 @@ relocator_mod_CFLAGS = $(COMMON_CFLAGS)
 relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
 relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-pkglib_MODULES += linux.mod
-linux_mod_SOURCES = loader/$(target_cpu)/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 include $(srcdir)/conf/common.mk

From 41168ea49c613eec088ffb3dae7e301a86bce8b0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 4 Mar 2010 21:30:58 +0100
Subject: [PATCH 0576/1628] 2010-03-04  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* normal/autofs.c (autoload_fs_module): Handle errors.
---
 ChangeLog       | 4 ++++
 normal/autofs.c | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 039a80a59..f72f71783 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* normal/autofs.c (autoload_fs_module): Handle errors.
+
 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Disable linux.mod on qemu-mips since it's not functional and leads
diff --git a/normal/autofs.c b/normal/autofs.c
index 57e43fdf4..11b3fc1be 100644
--- a/normal/autofs.c
+++ b/normal/autofs.c
@@ -38,6 +38,9 @@ autoload_fs_module (void)
       if (! grub_dl_get (p->name) && grub_dl_load (p->name))
 	return 1;
 
+      if (grub_errno)
+	grub_print_error ();
+
       fs_module_list = p->next;
       grub_free (p->name);
       grub_free (p);

From d07803630846b2afda23b926bb28b0523fed8adc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 4 Mar 2010 21:32:11 +0100
Subject: [PATCH 0577/1628] 2010-03-04  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* kern/main.c (grub_load_modules): Handle errors from init functions of
	embeded modules.
---
 ChangeLog   | 5 +++++
 kern/main.c | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f72f71783..f3a6a12f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/main.c (grub_load_modules): Handle errors from init functions of
+	embeded modules.
+
 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* normal/autofs.c (autoload_fs_module): Handle errors.
diff --git a/kern/main.c b/kern/main.c
index 456105378..e7566fab9 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -68,6 +68,9 @@ grub_load_modules (void)
 			       (header->size - sizeof (struct grub_module_header))))
 	grub_fatal ("%s", grub_errmsg);
 
+      if (grub_errno)
+	grub_print_error ();
+
       return 0;
     }
 

From fcee14ed5fad3455597ac9672c48368b9e324b79 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 4 Mar 2010 21:35:36 +0100
Subject: [PATCH 0578/1628] 2010-03-04  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* NEWS: mention multiboot on EFI.
---
 ChangeLog | 4 ++++
 NEWS      | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f3a6a12f5..bb3637911 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* NEWS: mention multiboot on EFI.
+
 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/main.c (grub_load_modules): Handle errors from init functions of
diff --git a/NEWS b/NEWS
index 828eea081..66ac67904 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 New in 1.98:
 
+* Multiboot on EFI support.
+
 * Graphical menu support.
 
 * MIPS support.

From c7ef54aab162ffa2b8aeb27dd9885686f4c08432 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 4 Mar 2010 22:33:49 +0100
Subject: [PATCH 0579/1628] 2010-03-04  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* configure.ac: Alias amd64 to x86_64.
---
 ChangeLog    | 4 ++++
 configure.ac | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index bb3637911..e5f1186a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Alias amd64 to x86_64.
+
 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* NEWS: mention multiboot on EFI.
diff --git a/configure.ac b/configure.ac
index ac3f0d196..1f7d6125c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,7 @@ fi
 
 case "$target_cpu" in
   i[[3456]]86)	target_cpu=i386 ;;
+  amd64)	target_cpu=x86_64 ;;
   sparc)	target_cpu=sparc64 ;;
   mipsel|mips64el)
                 target_cpu=mips;    

From d116e0d8d1a8ac94ee8564e565f002f215452e0d Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh.grub@aybabtu.com>
Date: Thu, 4 Mar 2010 23:16:34 +0100
Subject: [PATCH 0580/1628] 2010-03-04  Robert Millan  <rmh.grub@aybabtu.com>

	Support relative image path in theme file.

	* gfxmenu/gui_image.c (grub_gui_image): New member theme_dir.
	(image_set_property): Handle theme_dir and relative path.
---
 ChangeLog           |  7 +++++++
 gfxmenu/gui_image.c | 25 +++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e5f1186a9..ae4a19108 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-04  Robert Millan  <rmh.grub@aybabtu.com>
+
+	Support relative image path in theme file.
+
+	* gfxmenu/gui_image.c (grub_gui_image): New member theme_dir.
+	(image_set_property): Handle theme_dir and relative path.
+
 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Alias amd64 to x86_64.
diff --git a/gfxmenu/gui_image.c b/gfxmenu/gui_image.c
index ef8bcbe9a..3988f4ba8 100644
--- a/gfxmenu/gui_image.c
+++ b/gfxmenu/gui_image.c
@@ -31,6 +31,7 @@ struct grub_gui_image
   grub_gui_container_t parent;
   grub_video_rect_t bounds;
   char *id;
+  char *theme_dir;
   struct grub_video_bitmap *raw_bitmap;
   struct grub_video_bitmap *bitmap;
 };
@@ -208,8 +209,28 @@ static grub_err_t
 image_set_property (void *vself, const char *name, const char *value)
 {
   grub_gui_image_t self = vself;
-  if (grub_strcmp (name, "file") == 0)
-    return load_image (self, value);
+  if (grub_strcmp (name, "theme_dir") == 0)
+    {
+      grub_free (self->theme_dir);
+      self->theme_dir = grub_strdup (value);
+    }
+  else if (grub_strcmp (name, "file") == 0)
+    {
+      char *absvalue;
+      grub_err_t err;
+
+      /* Resolve to an absolute path.  */
+      if (! self->theme_dir)
+	return grub_error (GRUB_ERR_BAD_ARGUMENT, "unspecified theme_dir");
+      absvalue = grub_resolve_relative_path (self->theme_dir, value);
+      if (! absvalue)
+	return grub_errno;
+
+      err = load_image (self, absvalue);
+      grub_free (absvalue);
+
+      return err;
+    }
   else if (grub_strcmp (name, "id") == 0)
     {
       grub_free (self->id);

From 3ab4bd77dd3cf74bbe9e304a0c43835cfc4be314 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 5 Mar 2010 15:29:28 +0100
Subject: [PATCH 0581/1628] 2010-03-04  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* disk/scsi.c (grub_scsi_iterate): Fix a memory leak.
---
 ChangeLog   | 4 ++++
 disk/scsi.c | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ae4a19108..db2c8855e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* disk/scsi.c (grub_scsi_iterate): Fix a memory leak.
+
 2010-03-04  Robert Millan  <rmh.grub@aybabtu.com>
 
 	Support relative image path in theme file.
diff --git a/disk/scsi.c b/disk/scsi.c
index 6f3233b29..eba237287 100644
--- a/disk/scsi.c
+++ b/disk/scsi.c
@@ -208,12 +208,14 @@ grub_scsi_iterate (int (*hook) (const char *name))
       for (i = 0; i < luns; i++)
 	{
 	  char *sname;
+	  int ret;
 	  sname = grub_xasprintf ("%s%c", name, 'a' + i);
 	  if (!sname)
 	    return 1;
-	  if (hook (sname))
-	    return 1;
+	  ret = hook (sname);
 	  grub_free (sname);
+	  if (ret)
+	    return 1;
 	}
       return 0;
     }

From 48a5a769a2b7df4544a3883f4c57aaff72031db2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 5 Mar 2010 15:30:44 +0100
Subject: [PATCH 0582/1628] 2010-03-04  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* gettext/gettext.c (grub_gettext_init_ext): Fix a memory leak.
---
 ChangeLog         | 4 ++++
 gettext/gettext.c | 7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db2c8855e..df53d39ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* gettext/gettext.c (grub_gettext_init_ext): Fix a memory leak.
+
 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* disk/scsi.c (grub_scsi_iterate): Fix a memory leak.
diff --git a/gettext/gettext.c b/gettext/gettext.c
index 9a1756be7..0aa8decbd 100644
--- a/gettext/gettext.c
+++ b/gettext/gettext.c
@@ -279,13 +279,6 @@ grub_gettext_init_ext (const char *lang)
 
   /* mo_file e.g.: /boot/grub/locale/ca.mo   */
 
-  mo_file =
-    grub_malloc (grub_strlen (locale_dir) + grub_strlen ("/") +
-		 grub_strlen (lang) + grub_strlen (".mo") + 1);
-
-  /* Warning: if changing some paths in the below line, change the grub_malloc
-     contents below.  */
-
   mo_file = grub_xasprintf ("%s/%s.mo", locale_dir, lang);
   if (!mo_file)
     return;

From 60b03859e891684f20c287197f9016231bafbd60 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 5 Mar 2010 15:38:04 +0100
Subject: [PATCH 0583/1628] 2010-03-05  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* util/import_gcry.py: Add autogenerated files to MAINTAINER_CLEANFILES.
---
 ChangeLog           | 4 ++++
 util/import_gcry.py | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index df53d39ad..fa2f1ff05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/import_gcry.py: Add autogenerated files to MAINTAINER_CLEANFILES.
+
 2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* gettext/gettext.c (grub_gettext_init_ext): Fix a memory leak.
diff --git a/util/import_gcry.py b/util/import_gcry.py
index d71924d53..b9c3edcde 100644
--- a/util/import_gcry.py
+++ b/util/import_gcry.py
@@ -62,6 +62,7 @@ mdblocksizes = {"_gcry_digest_spec_crc32" : 64,
                 "_gcry_digest_spec_whirlpool" : 64}
 
 cryptolist = open (os.path.join (cipher_dir_out, "crypto.lst"), "w")
+conf.write ("MAINTAINER_CLEANFILES += $(srcdir)/conf/gcry.rmk $(srcdir)/lib/libgcrypt-grub/cipher/ChangeLog $(srcdir)/lib/libgcrypt-grub/cipher/cipher.h $(srcdir)/lib/libgcrypt-grub/cipher/crypto.lst $(srcdir)/lib/libgcrypt-grub/cipher/g10lib.h $(srcdir)/lib/libgcrypt-grub/cipher/memory.h $(srcdir)/lib/libgcrypt-grub/cipher/types.h\n");
 
 # rijndael is the only cipher using aliases. So no need for mangling, just
 # hardcode it
@@ -87,6 +88,7 @@ for cipher_file in cipher_files:
         continue
     nch = False
     if re.match (".*\.[ch]$", cipher_file):
+        conf.write ("MAINTAINER_CLEANFILES += $(srcdir)/lib/libgcrypt-grub/cipher/" + cipher_file + "\n");
         isc = re.match (".*\.c$", cipher_file)
         f = open (infile, "r")
         fw = open (outfile, "w")

From 8f9a632b96321457a61c03ddff1faf2a373d52bc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Mar 2010 17:22:04 +0100
Subject: [PATCH 0584/1628] 2010-03-05  Vladimir Serbinenko 
 <phcoder@gmail.com>

	Fix FreeBSD compilation.

	* Makefile.in (TARGET_CPPFLAGS): Remove -nostdinc -isystem.
	* configure.ac: Add -nostdinc -isystem to TARGET_CPPFLAGS if it works.
---
 ChangeLog    |  7 +++++++
 Makefile.in  |  2 +-
 configure.ac | 13 +++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fa2f1ff05..c9356b222 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Fix FreeBSD compilation.
+
+	* Makefile.in (TARGET_CPPFLAGS): Remove -nostdinc -isystem.
+	* configure.ac: Add -nostdinc -isystem to TARGET_CPPFLAGS if it works.
+
 2010-03-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/import_gcry.py: Add autogenerated files to MAINTAINER_CLEANFILES.
diff --git a/Makefile.in b/Makefile.in
index 4144dfb5a..47584cdde 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,7 +89,7 @@ TARGET_ASFLAGS = @TARGET_ASFLAGS@
 TARGET_MODULE_FORMAT = @TARGET_MODULE_FORMAT@
 TARGET_APPLE_CC = @TARGET_APPLE_CC@
 OBJCONV = @OBJCONV@
-TARGET_CPPFLAGS = @TARGET_CPPFLAGS@ -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include) -I$(srcdir)/include -I$(builddir) -I$(builddir)/include \
+TARGET_CPPFLAGS = @TARGET_CPPFLAGS@ -I$(srcdir)/include -I$(builddir) -I$(builddir)/include \
 	-Wall -W
 TARGET_LDFLAGS = @TARGET_LDFLAGS@
 TARGET_IMG_LDSCRIPT = @TARGET_IMG_LDSCRIPT@
diff --git a/configure.ac b/configure.ac
index 1f7d6125c..cf43608d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -517,6 +517,19 @@ enable_efiemu=no
 fi
 AC_SUBST([enable_efiemu])
 
+AC_CACHE_CHECK([whether -nostdinc -isystem works], [grub_cv_cc_isystem], [
+  SAVED_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+int va_arg_func (int fixed, va_list args);]], [[]])],
+      [grub_cv_cc_isystem=yes],
+      [grub_cv_cc_isystem=no])
+  CPPFLAGS="$SAVED_CPPFLAGS"
+])
+
+if test x"$grub_cv_cc_isystem" = xyes ; then
+  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
+fi
 
 # Restore the flags.
 CC="$tmp_CC"

From 2ac227c7f4262618bddc7f3e1a8bbf347bb48af6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Mar 2010 17:25:40 +0100
Subject: [PATCH 0585/1628] 2010-03-06  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* loader/i386/multiboot_mbi.c (grub_multiboot_set_bootdev): Free the
	right pointer.
---
 ChangeLog                   | 5 +++++
 loader/i386/multiboot_mbi.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c9356b222..a7717dfae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/i386/multiboot_mbi.c (grub_multiboot_set_bootdev): Free the
+	right pointer.
+
 2010-03-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix FreeBSD compilation.
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index 3f937c446..6391564d6 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -448,8 +448,8 @@ grub_multiboot_set_bootdev (void)
   dev = grub_device_open (0);
   if (dev && dev->disk && dev->disk->partition)
     {
-
-      p = dev->disk->partition->partmap->get_name (dev->disk->partition);
+      char *p0;
+      p = p0 = dev->disk->partition->partmap->get_name (dev->disk->partition);
       if (p)
 	{
 	  if ((p[0] >= '0') && (p[0] <= '9'))
@@ -463,7 +463,7 @@ grub_multiboot_set_bootdev (void)
 	  if ((p[0] >= 'a') && (p[0] <= 'z'))
 	    part = p[0] - 'a';
 	}
-      grub_free (p);
+      grub_free (p0);
     }
   if (dev)
     grub_device_close (dev);

From b1f6d291adc857f385ff7b6d33547cc4e3fad119 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Mar 2010 17:27:28 +0100
Subject: [PATCH 0586/1628] 2010-03-06  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* loader/i386/bsd.c (grub_bsd_get_device): Fix a memory leak.
---
 ChangeLog         | 4 ++++
 loader/i386/bsd.c | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a7717dfae..f444fe349 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/i386/bsd.c (grub_bsd_get_device): Fix a memory leak.
+
 2010-03-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/i386/multiboot_mbi.c (grub_multiboot_set_bootdev): Free the
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 3dd3c70c5..949de408d 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -154,8 +154,8 @@ grub_bsd_get_device (grub_uint32_t * biosdev,
   dev = grub_device_open (0);
   if (dev && dev->disk && dev->disk->partition)
     {
-
-      p = dev->disk->partition->partmap->get_name (dev->disk->partition);
+      char *p0;
+      p0 = p = dev->disk->partition->partmap->get_name (dev->disk->partition);
       if (p)
 	{
 	  if ((p[0] >= '0') && (p[0] <= '9'))
@@ -169,6 +169,7 @@ grub_bsd_get_device (grub_uint32_t * biosdev,
 	  if ((p[0] >= 'a') && (p[0] <= 'z'))
 	    *part = p[0] - 'a';
 	}
+      grub_free (p0);
     }
   if (dev)
     grub_device_close (dev);

From 33e2e6f3735eca22021165c5f556b4d8aaafa0bf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Mar 2010 17:28:25 +0100
Subject: [PATCH 0587/1628] 2010-03-06  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* util/grub-mkrescue.in: Use mktemp with explicit template.
---
 ChangeLog             |  4 ++++
 util/grub-mkrescue.in | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f444fe349..f42395304 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkrescue.in: Use mktemp with explicit template.
+
 2010-03-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/i386/bsd.c (grub_bsd_get_device): Fix a memory leak.
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 6b3c9ecb8..592cf2df6 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -86,7 +86,15 @@ if [ "x${output_image}" = x ] ; then
   exit 1
 fi
 
-iso9660_dir=`mktemp -d`
+if test "x$TMP" != x; then
+  MKTEMP_TEMPLATE="$TMP/grub-mkrescue.XXXXXXXXXX"
+elif test "x$TEMP" != x; then
+  MKTEMP_TEMPLATE="$TEMP/grub-mkrescue.XXXXXXXXXX"
+else
+  MKTEMP_TEMPLATE="/tmp/grub-mkrescue.XXXXXXXXXX"
+fi
+
+iso9660_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
 mkdir -p ${iso9660_dir}/boot/grub
 
 process_input_dir ()
@@ -133,8 +141,8 @@ fi
 # build coreboot core.img
 if test -e "${coreboot_dir}" ; then
     echo "Enabling coreboot support ..."
-    memdisk_img=`mktemp`
-    memdisk_dir=`mktemp -d`
+    memdisk_img=`mktemp "$MKTEMP_TEMPLATE"`
+    memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
     mkdir -p ${memdisk_dir}/boot/grub
     # obtain date-based UUID
     iso_uuid=$(date +%Y-%m-%d-%H-%M-%S-00)
@@ -162,12 +170,12 @@ fi
 # build BIOS core.img
 if test -e "${pc_dir}" ; then
     echo "Enabling BIOS support ..."
-    core_img=`mktemp`
+    core_img=`mktemp "$MKTEMP_TEMPLATE"`
     grub-mkimage -d ${pc_dir}/ -o ${core_img} --prefix=/boot/grub/i386-pc \
         iso9660 biosdisk
     cat ${pc_dir}/cdboot.img ${core_img} > ${iso9660_dir}/boot/grub/i386-pc/eltorito.img
 
-    embed_img=`mktemp`
+    embed_img=`mktemp "$MKTEMP_TEMPLATE"`
     cat ${pc_dir}/boot.img ${core_img} > ${embed_img}
 
     rm -f ${core_img}

From 696fd607c61b87309c0911744d266ef74514e6d9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Mar 2010 17:48:15 +0100
Subject: [PATCH 0588/1628] 2010-03-06  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* normal/cmdline.c (grub_cmdline_get): Fix gabled line after
	completition in the middle of string.
---
 ChangeLog        | 5 +++++
 normal/cmdline.c | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f42395304..4792506a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* normal/cmdline.c (grub_cmdline_get): Fix gabled line after
+	completition in the middle of string.
+
 2010-03-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkrescue.in: Use mktemp with explicit template.
diff --git a/normal/cmdline.c b/normal/cmdline.c
index f63953944..05d665411 100644
--- a/normal/cmdline.c
+++ b/normal/cmdline.c
@@ -303,8 +303,9 @@ grub_cmdline_get (const char *prompt)
 	  grub_memmove (buf + lpos, str, len * sizeof (grub_uint32_t));
 
 	  llen += len;
+	  cl_set_pos_all ();
+	  cl_print_all (lpos, 0);
 	  lpos += len;
-	  cl_print_all (lpos - len, 0);
 	  cl_set_pos_all ();
 	}
     }
@@ -473,7 +474,6 @@ grub_cmdline_get (const char *prompt)
 			if (t != 1)
 			  cl_insert (insert);
 			lpos++;
-			cl_set_pos_all ();			
 		      }
 		    else
 		      {
@@ -485,6 +485,7 @@ grub_cmdline_get (const char *prompt)
 		grub_free (insertu8);
 		grub_free (insert);
 	      }
+	    cl_set_pos_all ();
 	  }
 	  break;
 

From d1e8a02f11bdbd11b9e69c5e7b66ed5671b60125 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Mar 2010 21:27:04 +0100
Subject: [PATCH 0589/1628] 2010-03-06  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* configure.ac: Update CPPFLAGS and not CFLAGS when checking for
	ft2build.h.
---
 ChangeLog    | 5 +++++
 configure.ac | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4792506a9..33e87f310 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Update CPPFLAGS and not CFLAGS when checking for
+	ft2build.h.
+
 2010-03-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* normal/cmdline.c (grub_cmdline_get): Fix gabled line after
diff --git a/configure.ac b/configure.ac
index cf43608d1..6deac6c6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -696,11 +696,11 @@ fi
 
 if test x"$grub_mkfont_excuse" = x ; then
   # Check for freetype libraries.
-  SAVED_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $freetype_cflags"
+  SAVED_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $freetype_cflags"
   AC_CHECK_HEADERS([ft2build.h], [],
   	[grub_mkfont_excuse=["need freetype2 headers"]])
-  CFLAGS="$SAVED_CFLAGS"
+  CPPFLAGS="$SAVED_CPPFLAGS"
 fi
 
 if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; then

From fce5d8ff62d3deb264ba5916b62df69998caf916 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 6 Mar 2010 21:49:59 +0100
Subject: [PATCH 0590/1628] 2010-03-06  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* NEWS: Put the date of 1.98 release.
---
 ChangeLog | 4 ++++
 NEWS      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 33e87f310..56f19acde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* NEWS: Put the date of 1.98 release.
+
 2010-03-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Update CPPFLAGS and not CFLAGS when checking for
diff --git a/NEWS b/NEWS
index 66ac67904..1e3334f18 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.98:
+New in 1.98 - 2010-03-06:
 
 * Multiboot on EFI support.
 

From 8eb567e6629c892428c1a563afb6aa40d1a74f64 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Mar 2010 14:59:15 +0100
Subject: [PATCH 0591/1628] Update with newest mbtag spec

---
 include/grub/multiboot.h     |  2 +-
 include/multiboot2.h         | 33 ++++++++++++++-
 loader/i386/multiboot.c      |  4 +-
 loader/i386/multiboot_mbi.c  |  6 ++-
 loader/i386/multiboot_mbi2.c | 78 +++++++++++++++++++-----------------
 5 files changed, 81 insertions(+), 42 deletions(-)

diff --git a/include/grub/multiboot.h b/include/grub/multiboot.h
index 27d4d816d..c108e5eef 100644
--- a/include/grub/multiboot.h
+++ b/include/grub/multiboot.h
@@ -44,7 +44,7 @@ grub_err_t grub_multiboot_add_module (grub_addr_t start, grub_size_t size,
 				      int argc, char *argv[]);
 void grub_multiboot_set_bootdev (void);
 
-grub_uint32_t grub_get_multiboot_mmap_len (void);
+grub_uint32_t grub_get_multiboot_mmap_count (void);
 grub_err_t grub_multiboot_set_video_mode (void);
 
 #if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
diff --git a/include/multiboot2.h b/include/multiboot2.h
index 20c5c5696..36710ddf6 100644
--- a/include/multiboot2.h
+++ b/include/multiboot2.h
@@ -51,6 +51,7 @@
 /* This flag indicates the use of the address fields in the header.  */
 #define MULTIBOOT_AOUT_KLUDGE			0x00010000
 
+#define MULTIBOOT_TAG_ALIGN                  8
 #define MULTIBOOT_TAG_TYPE_END               0
 #define MULTIBOOT_TAG_TYPE_CMDLINE           1
 #define MULTIBOOT_TAG_TYPE_BOOT_LOADER_NAME  2
@@ -102,7 +103,6 @@ struct multiboot_color
 
 struct multiboot_mmap_entry
 {
-  multiboot_uint32_t size;
   multiboot_uint64_t addr;
   multiboot_uint64_t len;
 #define MULTIBOOT_MEMORY_AVAILABLE		1
@@ -110,6 +110,7 @@ struct multiboot_mmap_entry
 #define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE       3
 #define MULTIBOOT_MEMORY_NVS                    4
   multiboot_uint32_t type;
+  multiboot_uint32_t zero;
 } __attribute__((packed));
 typedef struct multiboot_mmap_entry multiboot_memory_map_t;
 
@@ -123,6 +124,8 @@ struct multiboot_tag_string
 {
   multiboot_uint32_t type;
   multiboot_uint32_t size;
+  multiboot_uint32_t entry_size;
+  multiboot_uint32_t entry_version;
   char string[0];
 };
 
@@ -156,6 +159,8 @@ struct multiboot_tag_mmap
 {
   multiboot_uint32_t type;
   multiboot_uint32_t size;
+  multiboot_uint32_t entry_size;
+  multiboot_uint32_t entry_version;
   struct multiboot_mmap_entry entries[0];  
 };
 
@@ -197,6 +202,7 @@ struct multiboot_tag_framebuffer_common
 #define MULTIBOOT_FRAMEBUFFER_TYPE_RGB     1
 #define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT	2
   multiboot_uint8_t framebuffer_type;
+  multiboot_uint16_t reserved;
 };
 
 struct multiboot_tag_framebuffer
@@ -222,6 +228,31 @@ struct multiboot_tag_framebuffer
   };
 };
 
+struct multiboot_tag_elf_sections
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint32_t num;
+  multiboot_uint32_t entsize;
+  multiboot_uint32_t shndx;
+  char sections[0];
+};
+
+struct multiboot_tag_apm
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint16_t version;
+  multiboot_uint16_t cseg;
+  multiboot_uint32_t offset;
+  multiboot_uint16_t cseg_16;
+  multiboot_uint16_t dseg;
+  multiboot_uint16_t flags;
+  multiboot_uint16_t cseg_len;
+  multiboot_uint16_t cseg_16_len;
+  multiboot_uint16_t dseg_len;
+};
+
 #endif /* ! ASM_FILE */
 
 #endif /* ! MULTIBOOT_HEADER */
diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index 5f9751f33..dab81dc8c 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -68,7 +68,7 @@ static int accepts_video;
 /* Return the length of the Multiboot mmap that will be needed to allocate
    our platform's map.  */
 grub_uint32_t
-grub_get_multiboot_mmap_len (void)
+grub_get_multiboot_mmap_count (void)
 {
   grub_size_t count = 0;
 
@@ -83,7 +83,7 @@ grub_get_multiboot_mmap_len (void)
 
   grub_mmap_iterate (hook);
 
-  return count * sizeof (struct multiboot_mmap_entry);
+  return count;
 }
 
 grub_err_t
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index a8133a705..0d5db3c13 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -53,7 +53,8 @@ grub_multiboot_get_mbi_size (void)
 {
   return sizeof (struct multiboot_info) + ALIGN_UP (cmdline_size, 4)
     + modcnt * sizeof (struct multiboot_mod_list) + total_modcmd
-    + ALIGN_UP (sizeof(PACKAGE_STRING), 4) + grub_get_multiboot_mmap_len ()
+    + ALIGN_UP (sizeof(PACKAGE_STRING), 4) 
+    + grub_get_multiboot_mmap_count () * sizeof (struct multiboot_mmap_entry)
 #if GRUB_MACHINE_HAS_VBE
     + sizeof (struct grub_vbe_info_block)
     + sizeof (struct grub_vbe_mode_info_block)
@@ -233,7 +234,8 @@ grub_multiboot_make_mbi (void *orig, grub_uint32_t dest, grub_off_t buf_off,
       mbi->mods_count = 0;
     }
 
-  mmap_size = grub_get_multiboot_mmap_len (); 
+  mmap_size = grub_get_multiboot_mmap_count () 
+    * sizeof (struct multiboot_mmap_entry);
   grub_fill_multiboot_mmap ((struct multiboot_mmap_entry *) ptrorig);
   mbi->mmap_length = mmap_size;
   mbi->mmap_addr = ptrdest;
diff --git a/loader/i386/multiboot_mbi2.c b/loader/i386/multiboot_mbi2.c
index a53bbe50a..ab803734f 100644
--- a/loader/i386/multiboot_mbi2.c
+++ b/loader/i386/multiboot_mbi2.c
@@ -62,15 +62,17 @@ static grub_uint32_t biosdev, slice, part;
 grub_size_t
 grub_multiboot_get_mbi_size (void)
 {
-  return sizeof (grub_uint32_t) + sizeof (struct multiboot_tag)
-    + (sizeof (struct multiboot_tag_string) + ALIGN_UP (cmdline_size, 4))
+  return 2 * sizeof (grub_uint32_t) + sizeof (struct multiboot_tag)
     + (sizeof (struct multiboot_tag_string)
-       + ALIGN_UP (sizeof (PACKAGE_STRING), 4))
+       + ALIGN_UP (cmdline_size, MULTIBOOT_TAG_ALIGN))
+    + (sizeof (struct multiboot_tag_string)
+       + ALIGN_UP (sizeof (PACKAGE_STRING), MULTIBOOT_TAG_ALIGN))
     + (modcnt * sizeof (struct multiboot_tag_module) + total_modcmd)
     + sizeof (struct multiboot_tag_basic_meminfo)
-    + sizeof (struct multiboot_tag_bootdev)
-    + (sizeof (struct multiboot_tag_mmap) + grub_get_multiboot_mmap_len ())
-    + sizeof (struct multiboot_tag_vbe);
+    + ALIGN_UP (sizeof (struct multiboot_tag_bootdev), MULTIBOOT_TAG_ALIGN)
+    + (sizeof (struct multiboot_tag_mmap) + grub_get_multiboot_mmap_count ()
+       * sizeof (struct multiboot_mmap_entry))
+    + sizeof (struct multiboot_tag_vbe) + MULTIBOOT_TAG_ALIGN - 1;
 }
 
 #ifdef GRUB_MACHINE_HAS_VBE
@@ -98,7 +100,7 @@ fill_vbe_info (struct grub_vbe_mode_info_block **vbe_mode_info_out,
     *vbe_mode_info_out = (struct grub_vbe_mode_info_block *) 
       &(tag->vbe_mode_info);
   tag->size = sizeof (struct multiboot_tag_vbe);
-  *ptrorig += tag->size;
+  *ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN);
   return GRUB_ERR_NONE;
 }
 
@@ -106,9 +108,9 @@ fill_vbe_info (struct grub_vbe_mode_info_block **vbe_mode_info_out,
 
 /* Fill previously allocated Multiboot mmap.  */
 static void
-grub_fill_multiboot_mmap (struct multiboot_mmap_entry *first_entry)
+grub_fill_multiboot_mmap (struct multiboot_tag_mmap *tag)
 {
-  struct multiboot_mmap_entry *mmap_entry = (struct multiboot_mmap_entry *) first_entry;
+  struct multiboot_mmap_entry *mmap_entry = tag->entries;
 
   auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
   int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
@@ -137,12 +139,17 @@ grub_fill_multiboot_mmap (struct multiboot_mmap_entry *first_entry)
  	  mmap_entry->type = MULTIBOOT_MEMORY_RESERVED;
  	  break;
  	}
-      mmap_entry->size = sizeof (struct multiboot_mmap_entry) - sizeof (mmap_entry->size);
       mmap_entry++;
 
       return 0;
     }
 
+  tag->type = MULTIBOOT_TAG_TYPE_MMAP;
+  tag->size = sizeof (struct multiboot_tag_mmap)
+    + sizeof (struct multiboot_mmap_entry) * grub_get_multiboot_mmap_count (); 
+  tag->entry_size = sizeof (struct multiboot_mmap_entry);
+  tag->entry_version = 0;
+
   grub_mmap_iterate (hook);
 }
 
@@ -190,7 +197,8 @@ retrieve_video_parameters (grub_uint8_t **ptrorig)
 	  
 	  tag->common.framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT;
 	  tag->common.size = sizeof (tag->common);
-	  *ptrorig += tag->common.size;
+	  tag->common.reserved = 0;
+	  *ptrorig += ALIGN_UP (tag->common.size, MULTIBOOT_TAG_ALIGN);
 	}
       return GRUB_ERR_NONE;
     }
@@ -214,6 +222,8 @@ retrieve_video_parameters (grub_uint8_t **ptrorig)
   tag->common.framebuffer_height = mode_info.height;
 
   tag->common.framebuffer_bpp = mode_info.bpp;
+
+  tag->common.reserved = 0;
       
   if (mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_INDEX_COLOR)
     {
@@ -231,7 +241,6 @@ retrieve_video_parameters (grub_uint8_t **ptrorig)
 	  tag->framebuffer_palette[i].green = palette[i].g;
 	  tag->framebuffer_palette[i].blue = palette[i].b;
 	}
-      *ptrorig += tag->common.size;
     }
   else
     {
@@ -246,6 +255,7 @@ retrieve_video_parameters (grub_uint8_t **ptrorig)
 
       tag->common.size = sizeof (struct multiboot_tag_framebuffer_common) + 6;
     }
+  *ptrorig += ALIGN_UP (tag->common.size, MULTIBOOT_TAG_ALIGN);
 
 #if HAS_VBE
   if (driv_id == GRUB_VIDEO_DRIVER_VBE)
@@ -264,30 +274,29 @@ grub_multiboot_make_mbi (void *orig, grub_uint32_t dest, grub_off_t buf_off,
 			 grub_size_t bufsize)
 {
   grub_uint8_t *ptrorig;
-  grub_uint8_t *mbistart = (grub_uint8_t *) orig + buf_off;
+  grub_uint8_t *mbistart = (grub_uint8_t *) orig + buf_off 
+    + (ALIGN_UP (dest + buf_off, MULTIBOOT_TAG_ALIGN) - (dest + buf_off));
   grub_err_t err;
 
   if (bufsize < grub_multiboot_get_mbi_size ())
     return grub_error (GRUB_ERR_OUT_OF_MEMORY, "mbi buffer is too small");
 
-  ptrorig = (grub_uint8_t *) orig + buf_off + sizeof (grub_uint32_t);
+  ptrorig = mbistart + 2 * sizeof (grub_uint32_t);
 
   {
     struct multiboot_tag_string *tag = (struct multiboot_tag_string *) ptrorig;
     tag->type = MULTIBOOT_TAG_TYPE_CMDLINE;
-    tag->size = sizeof (struct multiboot_tag_string)
-      + ALIGN_UP (cmdline_size, 4); 
+    tag->size = sizeof (struct multiboot_tag_string) + cmdline_size; 
     grub_memcpy (tag->string, cmdline, cmdline_size);
-    ptrorig += tag->size;
+    ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN);
   }
 
   {
     struct multiboot_tag_string *tag = (struct multiboot_tag_string *) ptrorig;
     tag->type = MULTIBOOT_TAG_TYPE_BOOT_LOADER_NAME;
-    tag->size = sizeof (struct multiboot_tag_string)
-      + ALIGN_UP (sizeof (PACKAGE_STRING), 4); 
+    tag->size = sizeof (struct multiboot_tag_string) + sizeof (PACKAGE_STRING); 
     grub_memcpy (tag->string, PACKAGE_STRING, sizeof (PACKAGE_STRING));
-    ptrorig += tag->size;
+    ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN);
   }
 
   {
@@ -299,23 +308,18 @@ grub_multiboot_make_mbi (void *orig, grub_uint32_t dest, grub_off_t buf_off,
 	struct multiboot_tag_module *tag
 	  = (struct multiboot_tag_module *) ptrorig;
 	tag->type = MULTIBOOT_TAG_TYPE_MODULE;
-	tag->size = sizeof (struct multiboot_tag_module)
-	  + ALIGN_UP (sizeof (cur->cmdline_size), 4); 
-
+	tag->size = sizeof (struct multiboot_tag_module) + cur->cmdline_size;
 	tag->mod_start = dest + cur->start;
 	tag->mod_end = tag->mod_start + cur->size;
 	grub_memcpy (tag->cmdline, cur->cmdline, cur->cmdline_size);
-	ptrorig += tag->size;
+	ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN);
       }
   }
 
   {
     struct multiboot_tag_mmap *tag = (struct multiboot_tag_mmap *) ptrorig;
-    tag->type = MULTIBOOT_TAG_TYPE_MMAP;
-    tag->size = sizeof (struct multiboot_tag_mmap) 
-      + grub_get_multiboot_mmap_len (); 
-    grub_fill_multiboot_mmap (tag->entries);
-    ptrorig += tag->size;
+    grub_fill_multiboot_mmap (tag);
+    ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN);
   }
 
   {
@@ -327,7 +331,7 @@ grub_multiboot_make_mbi (void *orig, grub_uint32_t dest, grub_off_t buf_off,
     /* Convert from bytes to kilobytes.  */
     tag->mem_lower = grub_mmap_get_lower () / 1024;
     tag->mem_upper = grub_mmap_get_upper () / 1024;
-    ptrorig += tag->size;
+    ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN);
   }
 
   if (bootdev_set)
@@ -340,7 +344,7 @@ grub_multiboot_make_mbi (void *orig, grub_uint32_t dest, grub_off_t buf_off,
       tag->biosdev = biosdev;
       tag->slice = slice;
       tag->part = part;
-      ptrorig += tag->size;
+      ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN);
     }
 
   {
@@ -356,10 +360,11 @@ grub_multiboot_make_mbi (void *orig, grub_uint32_t dest, grub_off_t buf_off,
     struct multiboot_tag *tag = (struct multiboot_tag *) ptrorig;
     tag->type = MULTIBOOT_TAG_TYPE_END;
     tag->size = sizeof (struct multiboot_tag);
-    ptrorig += tag->size;
+    ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN);
   }
 
-  *(grub_uint32_t *) mbistart = ptrorig - mbistart;
+  ((grub_uint32_t *) mbistart)[0] = ptrorig - mbistart;
+  ((grub_uint32_t *) mbistart)[1] = 0;
 
   return GRUB_ERR_NONE;
 }
@@ -447,7 +452,7 @@ grub_multiboot_add_module (grub_addr_t start, grub_size_t size,
       return grub_errno;
     }
   newmod->cmdline_size = len;
-  total_modcmd += ALIGN_UP (len, 4);
+  total_modcmd += ALIGN_UP (len, MULTIBOOT_TAG_ALIGN);
 
   for (i = 0; i < argc; i++)
     {
@@ -495,8 +500,8 @@ grub_multiboot_set_bootdev (void)
   dev = grub_device_open (0);
   if (dev && dev->disk && dev->disk->partition)
     {
-
-      p = dev->disk->partition->partmap->get_name (dev->disk->partition);
+      char *p0;
+      p = p0 = dev->disk->partition->partmap->get_name (dev->disk->partition);
       if (p)
 	{
 	  if ((p[0] >= '0') && (p[0] <= '9'))
@@ -510,6 +515,7 @@ grub_multiboot_set_bootdev (void)
 	  if ((p[0] >= 'a') && (p[0] <= 'z'))
 	    part = p[0] - 'a';
 	}
+      grub_free (p0);
     }
   if (dev)
     grub_device_close (dev);

From 1f15fc1e0a37ec338d37ff4ef361a81514098f6a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 7 Mar 2010 23:02:13 +0100
Subject: [PATCH 0592/1628] 2010-03-07  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* genmoddep.awk: Output all missing symbols and not only first.
---
 ChangeLog     | 4 ++++
 genmoddep.awk | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 56f19acde..667ff0c1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* genmoddep.awk: Output all missing symbols and not only first.
+
 2010-03-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* NEWS: Put the date of 1.98 release.
diff --git a/genmoddep.awk b/genmoddep.awk
index 19ac80c71..48419a091 100644
--- a/genmoddep.awk
+++ b/genmoddep.awk
@@ -32,13 +32,12 @@ FNR == 1 {
   else if ($1 != "__gnu_local_gp") {
     printf "%s in %s is not defined\n", $1, module >"/dev/stderr";
     error++;
-    exit;
   }
 }
 
 # Output the result.
 END {
-  if (error == 1)
+  if (error >= 1)
     exit 1;
 
   for (mod in modtab) {

From b1f6f35ae91d6ee413b8d319e73b7be172a56491 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 8 Mar 2010 15:40:57 +0100
Subject: [PATCH 0593/1628] Preparation for mbh tag

---
 conf/i386.rmk                 |   6 +-
 include/grub/multiboot.h      |  16 +++
 include/multiboot.h           |   1 +
 include/multiboot2.h          |  78 ++++++++++-
 loader/i386/multiboot.c       | 236 ++++++++++++++--------------------
 loader/i386/multiboot_elfxx.c |   5 +-
 loader/i386/multiboot_mbi.c   | 131 +++++++++++++++++++
 loader/multiboot_loader.c     | 150 ---------------------
 8 files changed, 318 insertions(+), 305 deletions(-)
 delete mode 100644 loader/multiboot_loader.c

diff --git a/conf/i386.rmk b/conf/i386.rmk
index e5bd27265..076da3bb2 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -34,16 +34,14 @@ setpci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += multiboot.mod
 multiboot_mod_SOURCES = loader/i386/multiboot.c \
-			loader/i386/multiboot_mbi.c \
-                        loader/multiboot_loader.c
+			loader/i386/multiboot_mbi.c
 multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
 multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
 multiboot_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
 pkglib_MODULES += multiboot2.mod
 multiboot2_mod_SOURCES = loader/i386/multiboot.c \
-			 loader/i386/multiboot_mbi2.c \
-                         loader/multiboot_loader.c
+			 loader/i386/multiboot_mbi2.c
 multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
 multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
diff --git a/include/grub/multiboot.h b/include/grub/multiboot.h
index c108e5eef..89efbc6dd 100644
--- a/include/grub/multiboot.h
+++ b/include/grub/multiboot.h
@@ -20,6 +20,8 @@
 #ifndef GRUB_MULTIBOOT_HEADER
 #define GRUB_MULTIBOOT_HEADER 1
 
+#include <grub/file.h>
+
 #ifdef GRUB_USE_MULTIBOOT2
 #include <multiboot2.h>
 /* Same thing as far as our loader is concerned.  */
@@ -63,4 +65,18 @@ grub_multiboot_fill_vbe_info_real (struct grub_vbe_info_block *vbe_control_info,
 #define GRUB_MACHINE_HAS_VGA_TEXT 0
 #endif
 
+#define GRUB_MULTIBOOT_CONSOLE_EGA_TEXT 1
+#define GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER 2 
+
+grub_err_t
+grub_multiboot_set_console (int console_type, int accepted_consoles,
+			    int width, int height, int depth);
+grub_err_t
+grub_multiboot_load (grub_file_t file);
+/* Load ELF32 or ELF64.  */
+grub_err_t
+grub_multiboot_load_elf (grub_file_t file, void *buffer);
+extern grub_size_t grub_multiboot_pure_size;
+extern grub_size_t grub_multiboot_alloc_mbi;
+
 #endif /* ! GRUB_MULTIBOOT_HEADER */
diff --git a/include/multiboot.h b/include/multiboot.h
index c529c5c5f..fda863e85 100644
--- a/include/multiboot.h
+++ b/include/multiboot.h
@@ -24,6 +24,7 @@
 
 /* How many bytes from the start of the file we search for the header.  */
 #define MULTIBOOT_SEARCH			8192
+#define MULTIBOOT_HEADER_ALIGN			4
 
 /* The magic field should contain this.  */
 #define MULTIBOOT_HEADER_MAGIC			0x1BADB002
diff --git a/include/multiboot2.h b/include/multiboot2.h
index 36710ddf6..dae05a7a3 100644
--- a/include/multiboot2.h
+++ b/include/multiboot2.h
@@ -23,7 +23,8 @@
 #define MULTIBOOT_HEADER 1
 
 /* How many bytes from the start of the file we search for the header.  */
-#define MULTIBOOT_SEARCH			8192
+#define MULTIBOOT_SEARCH			32768
+#define MULTIBOOT_HEADER_ALIGN			8
 
 /* The magic field should contain this.  */
 #define MULTIBOOT2_HEADER_MAGIC			0xe85250d6
@@ -62,6 +63,17 @@
 #define MULTIBOOT_TAG_TYPE_VBE               7
 #define MULTIBOOT_TAG_TYPE_FRAMEBUFFER       8
 
+#define MULTIBOOT_HEADER_TAG_END  0
+#define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST  1
+#define MULTIBOOT_HEADER_TAG_ADDRESS  2
+#define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS  3
+#define MULTIBOOT_HEADER_TAG_CONSOLE_FLAGS  4
+#define MULTIBOOT_HEADER_TAG_FRAMEBUFFER  5
+#define MULTIBOOT_HEADER_TAG_MODULE_ALIGN  6
+
+#define GRUB_MULTIBOOT_ARCHITECTURE_I386  0
+#define MULTIBOOT_HEADER_TAG_OPTIONAL 1
+
 #ifndef ASM_FILE
 
 typedef unsigned char		multiboot_uint8_t;
@@ -74,21 +86,73 @@ struct multiboot_header
   /* Must be MULTIBOOT_MAGIC - see above.  */
   multiboot_uint32_t magic;
 
-  /* Feature flags.  */
-  multiboot_uint32_t flags;
+  /* ISA */
+  multiboot_uint32_t architecture;
+
+  /* Total header length.  */
+  multiboot_uint32_t header_length;
 
   /* The above fields plus this one must equal 0 mod 2^32. */
   multiboot_uint32_t checksum;
+};
 
-  /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set.  */
+struct multiboot_header_tag
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint32_t flags;
+};
+
+struct multiboot_header_tag_information_request
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint32_t flags;
+  multiboot_uint32_t requests[0];
+};
+
+struct multiboot_header_tag_address
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint32_t flags;
   multiboot_uint32_t header_addr;
   multiboot_uint32_t load_addr;
   multiboot_uint32_t load_end_addr;
   multiboot_uint32_t bss_end_addr;
-  multiboot_uint32_t entry_addr;
+};
 
-  /* These are only valid if MULTIBOOT_VIDEO_MODE is set.  */
-  multiboot_uint32_t mode_type;
+struct multiboot_header_tag_entry_address
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint32_t flags;
+  multiboot_uint32_t entry_addr;
+};
+
+struct multiboot_header_tag_console_flags
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint32_t flags;
+  multiboot_uint32_t console_flags;
+};
+
+struct multiboot_header_tag_framebuffer
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint32_t flags;
+  multiboot_uint32_t width;
+  multiboot_uint32_t height;
+  multiboot_uint32_t depth;
+};
+
+struct multiboot_header_tag_module_align
+{
+  multiboot_uint32_t type;
+  multiboot_uint32_t size;
+  multiboot_uint32_t flags;
   multiboot_uint32_t width;
   multiboot_uint32_t height;
   multiboot_uint32_t depth;
diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index dab81dc8c..17fefc85a 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -26,10 +26,8 @@
  *  - APM table
  */
 
-/* The bits in the required part of flags field we don't support.  */
-#define UNSUPPORTED_FLAGS			0x0000fff8
-
 #include <grub/loader.h>
+#include <grub/command.h>
 #include <grub/machine/loader.h>
 #include <grub/multiboot.h>
 #include <grub/cpu/multiboot.h>
@@ -45,6 +43,7 @@
 #include <grub/i386/relocator.h>
 #include <grub/video.h>
 #include <grub/memory.h>
+#include <grub/i18n.h>
 
 #ifdef GRUB_MACHINE_EFI
 #include <grub/efi/efi.h>
@@ -56,14 +55,15 @@
 #define DEFAULT_VIDEO_MODE "auto"
 #endif
 
-extern grub_dl_t my_mod;
-static grub_size_t code_size, alloc_mbi;
+grub_size_t grub_multiboot_alloc_mbi;
 
 char *grub_multiboot_payload_orig;
 grub_addr_t grub_multiboot_payload_dest;
 grub_size_t grub_multiboot_pure_size;
 grub_uint32_t grub_multiboot_payload_eip;
 static int accepts_video;
+static grub_dl_t my_mod;
+
 
 /* Return the length of the Multiboot mmap that will be needed to allocate
    our platform's map.  */
@@ -178,14 +178,14 @@ grub_multiboot_boot (void)
     };
 
   mbi_size = grub_multiboot_get_mbi_size ();
-  if (alloc_mbi < mbi_size)
+  if (grub_multiboot_alloc_mbi < mbi_size)
     {
       grub_multiboot_payload_orig
 	= grub_relocator32_realloc (grub_multiboot_payload_orig,
 				    grub_multiboot_pure_size + mbi_size);
       if (!grub_multiboot_payload_orig)
 	return grub_errno;
-      alloc_mbi = mbi_size;
+      grub_multiboot_alloc_mbi = mbi_size;
     }
 
   state.ebx = grub_multiboot_payload_dest + grub_multiboot_pure_size;
@@ -215,7 +215,7 @@ grub_multiboot_unload (void)
 
   grub_relocator32_free (grub_multiboot_payload_orig);
 
-  alloc_mbi = 0;
+  grub_multiboot_alloc_mbi = 0;
 
   grub_multiboot_payload_orig = NULL;
   grub_dl_unref (my_mod);
@@ -232,7 +232,7 @@ grub_multiboot_unload (void)
 #undef MULTIBOOT_LOAD_ELF32
 
 /* Load ELF32 or ELF64.  */
-static grub_err_t
+grub_err_t
 grub_multiboot_load_elf (grub_file_t file, void *buffer)
 {
   if (grub_multiboot_is_elf32 (buffer))
@@ -243,137 +243,61 @@ grub_multiboot_load_elf (grub_file_t file, void *buffer)
   return grub_error (GRUB_ERR_UNKNOWN_OS, "unknown ELF class");
 }
 
-void
-grub_multiboot (int argc, char *argv[])
+grub_err_t
+grub_multiboot_set_console (int console_type, int accepted_consoles,
+			    int width, int height, int depth)
+{
+  if (console_type == GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER)
+    {
+      char *buf;
+      if (depth && width && height)
+	buf = grub_xasprintf ("%dx%dx%d,%dx%d,auto", width,
+			      height, depth, width, height);
+      else if (width && height)
+	buf = grub_xasprintf ("%dx%d,auto", width, height);
+      else
+	buf = grub_strdup ("auto");
+
+      if (!buf)
+	return grub_errno;
+      grub_env_set ("gfxpayload", buf);
+      grub_free (buf);
+    }
+ else
+   grub_env_set ("gfxpayload", "text");
+
+  accepts_video = !!(accepted_consoles & GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER);
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_cmd_multiboot (grub_command_t cmd __attribute__ ((unused)),
+		    int argc, char *argv[])
 {
   grub_file_t file = 0;
-  char buffer[MULTIBOOT_SEARCH];
-  struct multiboot_header *header;
-  grub_ssize_t len;
+  grub_err_t err;
 
   grub_loader_unset ();
 
   if (argc == 0)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "no kernel specified");
-      goto fail;
-    }
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no kernel specified");
 
   file = grub_gzfile_open (argv[0], 1);
   if (! file)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "couldn't open file");
-      goto fail;
-    }
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "couldn't open file");
 
-  len = grub_file_read (file, buffer, MULTIBOOT_SEARCH);
-  if (len < 32)
-    {
-      grub_error (GRUB_ERR_BAD_OS, "file too small");
-      goto fail;
-    }
-
-  /* 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 = (struct multiboot_header *) buffer;
-       ((char *) header <= buffer + len - 12) || (header = 0);
-       header = (struct multiboot_header *) ((char *) header + 4))
-    {
-      if (header->magic == MULTIBOOT_HEADER_MAGIC
-	  && !(header->magic + header->flags + header->checksum))
-	break;
-    }
-
-  if (header == 0)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "no multiboot header found");
-      goto fail;
-    }
-
-  if (header->flags & UNSUPPORTED_FLAGS)
-    {
-      grub_error (GRUB_ERR_UNKNOWN_OS,
-		  "unsupported flag: 0x%x", header->flags);
-      goto fail;
-    }
-
-  grub_relocator32_free (grub_multiboot_payload_orig);
-  grub_multiboot_payload_orig = NULL;
+  grub_dl_ref (my_mod);
 
   /* Skip filename.  */
   grub_multiboot_init_mbi (argc - 1, argv + 1);
 
-  if (header->flags & MULTIBOOT_AOUT_KLUDGE)
-    {
-      int offset = ((char *) header - buffer -
-		    (header->header_addr - header->load_addr));
-      int load_size = ((header->load_end_addr == 0) ? file->size - offset :
-		       header->load_end_addr - header->load_addr);
+  grub_relocator32_free (grub_multiboot_payload_orig);
+  grub_multiboot_payload_orig = NULL;
 
-      if (header->bss_end_addr)
-	code_size = (header->bss_end_addr - header->load_addr);
-      else
-	code_size = load_size;
-      grub_multiboot_payload_dest = header->load_addr;
-
-      grub_multiboot_pure_size += code_size;
-
-      /* Allocate a bit more to avoid relocations in most cases.  */
-      alloc_mbi = grub_multiboot_get_mbi_size () + 65536;
-      grub_multiboot_payload_orig
-	= grub_relocator32_alloc (grub_multiboot_pure_size + alloc_mbi);
-
-      if (! grub_multiboot_payload_orig)
-	goto fail;
-
-      if ((grub_file_seek (file, offset)) == (grub_off_t) -1)
-	goto fail;
-
-      grub_file_read (file, (void *) grub_multiboot_payload_orig, load_size);
-      if (grub_errno)
-	goto fail;
-
-      if (header->bss_end_addr)
-	grub_memset ((void *) (grub_multiboot_payload_orig + load_size), 0,
-		     header->bss_end_addr - header->load_addr - load_size);
-
-      grub_multiboot_payload_eip = header->entry_addr;
-
-    }
-  else if (grub_multiboot_load_elf (file, buffer) != GRUB_ERR_NONE)
+  err = grub_multiboot_load (file);
+  if (err)
     goto fail;
 
-  if (header->flags & MULTIBOOT_VIDEO_MODE)
-    {
-      switch (header->mode_type)
-	{
-	case 1:
-	  grub_env_set ("gfxpayload", "text");
-	  break;
-
-	case 0:
-	  {
-	    char *buf;
-	    if (header->depth && header->width && header->height)
-	      buf = grub_xasprintf ("%dx%dx%d,%dx%d,auto", header->width,
-				   header->height, header->depth, header->width,
-				   header->height);
-	    else if (header->width && header->height)
-	      buf = grub_xasprintf ("%dx%d,auto", header->width, header->height);
-	    else
-	      buf = grub_strdup ("auto");
-
-	    if (!buf)
-	      goto fail;
-	    grub_env_set ("gfxpayload", buf);
-	    grub_free (buf);
-	    break;
-	  }
-	}
-    }
-
-  accepts_video = !!(header->flags & MULTIBOOT_VIDEO_MODE);
-
   grub_multiboot_set_bootdev ();
 
   grub_loader_set (grub_multiboot_boot, grub_multiboot_unload, 0);
@@ -385,12 +309,16 @@ grub_multiboot (int argc, char *argv[])
   if (grub_errno != GRUB_ERR_NONE)
     {
       grub_relocator32_free (grub_multiboot_payload_orig);
+      grub_multiboot_free_mbi ();
       grub_dl_unref (my_mod);
     }
+
+  return grub_errno;
 }
 
-void
-grub_module  (int argc, char *argv[])
+static grub_err_t
+grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
+		 int argc, char *argv[])
 {
   grub_file_t file = 0;
   grub_ssize_t size;
@@ -398,40 +326,64 @@ grub_module  (int argc, char *argv[])
   grub_err_t err;
 
   if (argc == 0)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "no module specified");
-      goto fail;
-    }
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no module specified");
 
   if (!grub_multiboot_payload_orig)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT,
-		  "you need to load the multiboot kernel first");
-      goto fail;
-    }
+    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+		       "you need to load the multiboot kernel first");
 
   file = grub_gzfile_open (argv[0], 1);
   if (! file)
-    goto fail;
+    return grub_errno;
 
   size = grub_file_size (file);
   module = grub_memalign (MULTIBOOT_MOD_ALIGN, size);
   if (! module)
-    goto fail;
+    {
+      grub_file_close (file);
+      return grub_errno;
+    }
 
   err = grub_multiboot_add_module ((grub_addr_t) module, size,
 				   argc - 1, argv + 1);
   if (err)
-    goto fail;
+    {
+      grub_file_close (file);
+      return err;
+    }
 
   if (grub_file_read (file, module, size) != size)
     {
-      grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file");
-      goto fail;
+      grub_file_close (file);
+      return grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file");
     }
 
- fail:
-  if (file)
-    grub_file_close (file);
+  grub_file_close (file);
+  return GRUB_ERR_NONE;;
 }
 
+static grub_command_t cmd_multiboot, cmd_module;
+
+GRUB_MOD_INIT(multiboot)
+{
+  cmd_multiboot =
+#ifdef GRUB_USE_MULTIBOOT2
+    grub_register_command ("multiboot2", grub_cmd_multiboot,
+			   0, N_("Load a multiboot 2 kernel."));
+#else
+    grub_register_command ("multiboot", grub_cmd_multiboot,
+			   0, N_("Load a multiboot kernel."));
+#endif
+
+  cmd_module =
+    grub_register_command ("module", grub_cmd_module,
+			   0, N_("Load a multiboot module."));
+
+  my_mod = mod;
+}
+
+GRUB_MOD_FINI(multiboot)
+{
+  grub_unregister_command (cmd_multiboot);
+  grub_unregister_command (cmd_module);
+}
diff --git a/loader/i386/multiboot_elfxx.c b/loader/i386/multiboot_elfxx.c
index 2e35183a4..05fb2c1c1 100644
--- a/loader/i386/multiboot_elfxx.c
+++ b/loader/i386/multiboot_elfxx.c
@@ -53,6 +53,7 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
   char *phdr_base;
   int lowest_segment = -1, highest_segment = -1;
   int i;
+  grub_size_t code_size;
 
   if (ehdr->e_ident[EI_CLASS] != ELFCLASSXX)
     return grub_error (GRUB_ERR_UNKNOWN_OS, "invalid ELF class");
@@ -102,9 +103,9 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
 
   grub_multiboot_pure_size += code_size;
 
-  alloc_mbi = grub_multiboot_get_mbi_size ();
+  grub_multiboot_alloc_mbi = grub_multiboot_get_mbi_size () + 65536;
   grub_multiboot_payload_orig
-    = grub_relocator32_alloc (grub_multiboot_pure_size + alloc_mbi + 65536);
+    = grub_relocator32_alloc (grub_multiboot_pure_size + grub_multiboot_alloc_mbi);
 
   if (!grub_multiboot_payload_orig)
     return grub_errno;
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index 0d5db3c13..e273e29ca 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -23,6 +23,7 @@
 #endif
 #include <grub/multiboot.h>
 #include <grub/cpu/multiboot.h>
+#include <grub/cpu/relocator.h>
 #include <grub/disk.h>
 #include <grub/device.h>
 #include <grub/partition.h>
@@ -30,6 +31,10 @@
 #include <grub/misc.h>
 #include <grub/env.h>
 #include <grub/video.h>
+#include <grub/file.h>
+
+/* The bits in the required part of flags field we don't support.  */
+#define UNSUPPORTED_FLAGS			0x0000fff8
 
 struct module
 {
@@ -48,6 +53,132 @@ static char *cmdline = NULL;
 static grub_uint32_t bootdev;
 static int bootdev_set;
 
+grub_err_t
+grub_multiboot_load (grub_file_t file)
+{
+  char *buffer;
+  grub_ssize_t len;
+  struct multiboot_header *header;
+  grub_err_t err;
+
+  buffer = grub_malloc (MULTIBOOT_SEARCH);
+  if (!buffer)
+    return grub_errno;
+
+  len = grub_file_read (file, buffer, MULTIBOOT_SEARCH);
+  if (len < 32)
+    {
+      grub_free (buffer);
+      return grub_error (GRUB_ERR_BAD_OS, "file too small");
+    }
+
+  /* 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 = (struct multiboot_header *) buffer;
+       ((char *) header <= buffer + len - 12) || (header = 0);
+       header = (struct multiboot_header *) ((char *) header + MULTIBOOT_HEADER_ALIGN))
+    {
+      if (header->magic == MULTIBOOT_HEADER_MAGIC
+	  && !(header->magic + header->flags + header->checksum))
+	break;
+    }
+
+  if (header == 0)
+    {
+      grub_free (buffer);
+      return grub_error (GRUB_ERR_BAD_ARGUMENT, "no multiboot header found");
+    }
+
+  if (header->flags & UNSUPPORTED_FLAGS)
+    {
+      grub_free (buffer);
+      return grub_error (GRUB_ERR_UNKNOWN_OS,
+			 "unsupported flag: 0x%x", header->flags);
+    }
+
+  if (header->flags & MULTIBOOT_AOUT_KLUDGE)
+    {
+      int offset = ((char *) header - buffer -
+		    (header->header_addr - header->load_addr));
+      int load_size = ((header->load_end_addr == 0) ? file->size - offset :
+		       header->load_end_addr - header->load_addr);
+      grub_size_t code_size;
+
+      if (header->bss_end_addr)
+	code_size = (header->bss_end_addr - header->load_addr);
+      else
+	code_size = load_size;
+      grub_multiboot_payload_dest = header->load_addr;
+
+      grub_multiboot_pure_size += code_size;
+
+      /* Allocate a bit more to avoid relocations in most cases.  */
+      grub_multiboot_alloc_mbi = grub_multiboot_get_mbi_size () + 65536;
+      grub_multiboot_payload_orig
+	= grub_relocator32_alloc (grub_multiboot_pure_size + grub_multiboot_alloc_mbi);
+
+      if (! grub_multiboot_payload_orig)
+	{
+	  grub_free (buffer);
+	  return grub_errno;
+	}
+
+      if ((grub_file_seek (file, offset)) == (grub_off_t) -1)
+	{
+	  grub_free (buffer);
+	  return grub_errno;
+	}
+
+      grub_file_read (file, (void *) grub_multiboot_payload_orig, load_size);
+      if (grub_errno)
+	{
+	  grub_free (buffer);
+	  return grub_errno;
+	}
+
+      if (header->bss_end_addr)
+	grub_memset ((void *) (grub_multiboot_payload_orig + load_size), 0,
+		     header->bss_end_addr - header->load_addr - load_size);
+
+      grub_multiboot_payload_eip = header->entry_addr;
+
+    }
+  else
+    {
+      err = grub_multiboot_load_elf (file, buffer);
+      if (err)
+	{
+	  grub_free (buffer);
+	  return err;
+	}
+    }
+
+  if (header->flags & MULTIBOOT_VIDEO_MODE)
+    {
+      switch (header->mode_type)
+	{
+	case 1:
+	  err = grub_multiboot_set_console (GRUB_MULTIBOOT_CONSOLE_EGA_TEXT, 
+					    GRUB_MULTIBOOT_CONSOLE_EGA_TEXT
+					    | GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER,
+					    0, 0, 0);
+	  break;
+	case 0:
+	  err = grub_multiboot_set_console (GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER,
+					    GRUB_MULTIBOOT_CONSOLE_EGA_TEXT
+					    | GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER,
+					    header->width, header->height,
+					    header->depth);
+	  break;
+	}
+    }
+  else
+    err = grub_multiboot_set_console (GRUB_MULTIBOOT_CONSOLE_EGA_TEXT, 
+				      GRUB_MULTIBOOT_CONSOLE_EGA_TEXT,
+				      0, 0, 0);
+  return err;
+}
+
 grub_size_t
 grub_multiboot_get_mbi_size (void)
 {
diff --git a/loader/multiboot_loader.c b/loader/multiboot_loader.c
deleted file mode 100644
index 6d042fa81..000000000
--- a/loader/multiboot_loader.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* multiboot_loader.c - boot multiboot kernel image */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2007,2008,2009,2010  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/multiboot.h>
-#include <grub/elf.h>
-#include <grub/file.h>
-#include <grub/err.h>
-#include <grub/dl.h>
-#include <grub/mm.h>
-#include <grub/misc.h>
-#include <grub/gzio.h>
-#include <grub/command.h>
-#include <grub/i18n.h>
-
-grub_dl_t my_mod;
-
-static int
-find_multi_boot1_header (grub_file_t file)
-{
-  struct multiboot_header *header;
-  char buffer[MULTIBOOT_SEARCH];
-  int found_status = 0;
-  grub_ssize_t len;
-
-  len = grub_file_read (file, buffer, MULTIBOOT_SEARCH);
-  if (len < 32)
-    return found_status;
-
-  /* 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 = (struct multiboot_header *) buffer;
-      ((char *) header <= buffer + len - 12) || (header = 0);
-      header = (struct multiboot_header *) ((char *) header + 4))
-    {
-      if (header->magic == MULTIBOOT_HEADER_MAGIC
-          && !(header->magic + header->flags + header->checksum))
-        {
-           found_status = 1;
-           break;
-        }
-     }
-
-   return found_status;
-}
-
-static grub_err_t
-grub_cmd_multiboot_loader (grub_command_t cmd __attribute__ ((unused)),
-			   int argc, char *argv[])
-{
-  grub_file_t file = 0;
-  int header_multi_ver_found = 0;
-
-  grub_dl_ref (my_mod);
-
-  if (argc == 0)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "no kernel specified");
-      goto fail;
-    }
-
-  file = grub_gzfile_open (argv[0], 1);
-  if (! file)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "couldn't open file");
-      goto fail;
-    }
-
-  /* find which header is in the file */
-  if (find_multi_boot1_header (file))
-    header_multi_ver_found = 1;
-  else
-    {
-      grub_error (GRUB_ERR_BAD_OS, "multiboot header not found");
-      goto fail;
-    }
-
-  /* close file before calling functions */
-  if (file)
-    grub_file_close (file);
-
-  /* Launch multi boot with header */
-
-  grub_dprintf ("multiboot_loader",
-		"Launching multiboot 1 grub_multiboot() function\n");
-  grub_multiboot (argc, argv);
-
-  return grub_errno;
-
-fail:
-  if (file)
-    grub_file_close (file);
-
-  grub_dl_unref (my_mod);
-
-  return grub_errno;
-}
-
-static grub_err_t
-grub_cmd_module_loader (grub_command_t cmd __attribute__ ((unused)),
-			int argc, char *argv[])
-{
-
-  grub_dprintf("multiboot_loader",
-	       "Launching multiboot 1 grub_module() function\n");
-  grub_module (argc, argv);
-
-  return grub_errno;
-}
-
-static grub_command_t cmd_multiboot, cmd_module;
-
-GRUB_MOD_INIT(multiboot)
-{
-  cmd_multiboot =
-#ifdef GRUB_USE_MULTIBOOT2
-    grub_register_command ("multiboot2", grub_cmd_multiboot_loader,
-			   0, N_("Load a multiboot 2 kernel."));
-#else
-    grub_register_command ("multiboot", grub_cmd_multiboot_loader,
-			   0, N_("Load a multiboot kernel."));
-#endif
-
-  cmd_module =
-    grub_register_command ("module", grub_cmd_module_loader,
-			   0, N_("Load a multiboot module."));
-
-  my_mod = mod;
-}
-
-GRUB_MOD_FINI(multiboot)
-{
-  grub_unregister_command (cmd_multiboot);
-  grub_unregister_command (cmd_module);
-}

From 4e02ed5014cc2c88a857581ff17f3de5ebb9b61f Mon Sep 17 00:00:00 2001
From: Matt Kraai <kraai@ftbfs.org>
Date: Mon, 8 Mar 2010 22:20:02 +0000
Subject: [PATCH 0594/1628] 2010-03-08  Matt Kraai  <kraai@ftbfs.org>

	* util/i386/pc/grub-setup.c (setup): Fix a grammatical error (Debian
	bug #559005).
---
 ChangeLog                 | 5 +++++
 util/i386/pc/grub-setup.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 667ff0c1e..18eb66b51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-08  Matt Kraai  <kraai@ftbfs.org>
+
+	* util/i386/pc/grub-setup.c (setup): Fix a grammatical error (Debian
+	bug #559005).
+
 2010-03-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* genmoddep.awk: Output all missing symbols and not only first.
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 4e2517ef2..ace577f37 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -418,7 +418,7 @@ unable_to_embed:
 
   grub_util_warn (_("Embedding is not possible.  GRUB can only be installed in this "
 		    "setup by using blocklists.  However, blocklists are UNRELIABLE and "
-		    "its use is discouraged."));
+		    "their use is discouraged."));
   if (! force)
     grub_util_error (_("if you really want blocklists, use --force"));
 

From c3a8dfc8b750e3bebd731aefdcf9788fe2a22f77 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 10 Mar 2010 11:40:20 +0100
Subject: [PATCH 0595/1628] Tagged header support

---
 include/grub/multiboot.h     |   3 +-
 include/multiboot2.h         |   5 +
 loader/i386/multiboot.c      |  20 +++-
 loader/i386/multiboot_mbi.c  |   6 +-
 loader/i386/multiboot_mbi2.c | 196 +++++++++++++++++++++++++++++++++++
 5 files changed, 225 insertions(+), 5 deletions(-)

diff --git a/include/grub/multiboot.h b/include/grub/multiboot.h
index 89efbc6dd..70241ec3c 100644
--- a/include/grub/multiboot.h
+++ b/include/grub/multiboot.h
@@ -70,7 +70,8 @@ grub_multiboot_fill_vbe_info_real (struct grub_vbe_info_block *vbe_control_info,
 
 grub_err_t
 grub_multiboot_set_console (int console_type, int accepted_consoles,
-			    int width, int height, int depth);
+			    int width, int height, int depth,
+			    int console_required);
 grub_err_t
 grub_multiboot_load (grub_file_t file);
 /* Load ELF32 or ELF64.  */
diff --git a/include/multiboot2.h b/include/multiboot2.h
index dae05a7a3..820479425 100644
--- a/include/multiboot2.h
+++ b/include/multiboot2.h
@@ -62,6 +62,8 @@
 #define MULTIBOOT_TAG_TYPE_MMAP              6
 #define MULTIBOOT_TAG_TYPE_VBE               7
 #define MULTIBOOT_TAG_TYPE_FRAMEBUFFER       8
+#define MULTIBOOT_TAG_TYPE_ELF_SECTIONS      9
+#define MULTIBOOT_TAG_TYPE_APM               10
 
 #define MULTIBOOT_HEADER_TAG_END  0
 #define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST  1
@@ -74,6 +76,9 @@
 #define GRUB_MULTIBOOT_ARCHITECTURE_I386  0
 #define MULTIBOOT_HEADER_TAG_OPTIONAL 1
 
+#define MULTIBOOT_CONSOLE_FLAGS_CONSOLE_REQUIRED 1
+#define MULTIBOOT_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED 2
+
 #ifndef ASM_FILE
 
 typedef unsigned char		multiboot_uint8_t;
diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index 17fefc85a..a89233431 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -62,6 +62,8 @@ grub_addr_t grub_multiboot_payload_dest;
 grub_size_t grub_multiboot_pure_size;
 grub_uint32_t grub_multiboot_payload_eip;
 static int accepts_video;
+static int accepts_ega_text;
+static int console_required;
 static grub_dl_t my_mod;
 
 
@@ -245,8 +247,23 @@ grub_multiboot_load_elf (grub_file_t file, void *buffer)
 
 grub_err_t
 grub_multiboot_set_console (int console_type, int accepted_consoles,
-			    int width, int height, int depth)
+			    int width, int height, int depth,
+			    int console_req)
 {
+  console_required = console_req;
+  if (!(accepted_consoles 
+	& (GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER
+	   | (GRUB_MACHINE_HAS_VGA_TEXT ? GRUB_MULTIBOOT_CONSOLE_EGA_TEXT : 0))))
+    {
+      if (console_required)
+	return grub_error (GRUB_ERR_BAD_OS,
+			   "OS requires a console but none is available");
+      grub_printf ("WARNING: no console will be available to OS");
+      accepts_video = 0;
+      accepts_ega_text = 0;
+      return GRUB_ERR_NONE;
+    }
+
   if (console_type == GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER)
     {
       char *buf;
@@ -267,6 +284,7 @@ grub_multiboot_set_console (int console_type, int accepted_consoles,
    grub_env_set ("gfxpayload", "text");
 
   accepts_video = !!(accepted_consoles & GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER);
+  accepts_ega_text = !!(accepted_consoles & GRUB_MULTIBOOT_CONSOLE_EGA_TEXT);
   return GRUB_ERR_NONE;
 }
 
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index e273e29ca..6d104ed1c 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -161,21 +161,21 @@ grub_multiboot_load (grub_file_t file)
 	  err = grub_multiboot_set_console (GRUB_MULTIBOOT_CONSOLE_EGA_TEXT, 
 					    GRUB_MULTIBOOT_CONSOLE_EGA_TEXT
 					    | GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER,
-					    0, 0, 0);
+					    0, 0, 0, 0);
 	  break;
 	case 0:
 	  err = grub_multiboot_set_console (GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER,
 					    GRUB_MULTIBOOT_CONSOLE_EGA_TEXT
 					    | GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER,
 					    header->width, header->height,
-					    header->depth);
+					    header->depth, 0);
 	  break;
 	}
     }
   else
     err = grub_multiboot_set_console (GRUB_MULTIBOOT_CONSOLE_EGA_TEXT, 
 				      GRUB_MULTIBOOT_CONSOLE_EGA_TEXT,
-				      0, 0, 0);
+				      0, 0, 0, 0);
   return err;
 }
 
diff --git a/loader/i386/multiboot_mbi2.c b/loader/i386/multiboot_mbi2.c
index ab803734f..d07ce92f3 100644
--- a/loader/i386/multiboot_mbi2.c
+++ b/loader/i386/multiboot_mbi2.c
@@ -23,6 +23,7 @@
 #endif
 #include <grub/multiboot.h>
 #include <grub/cpu/multiboot.h>
+#include <grub/cpu/relocator.h>
 #include <grub/disk.h>
 #include <grub/device.h>
 #include <grub/partition.h>
@@ -59,6 +60,201 @@ static char *cmdline = NULL;
 static int bootdev_set;
 static grub_uint32_t biosdev, slice, part;
 
+grub_err_t
+grub_multiboot_load (grub_file_t file)
+{
+  char *buffer;
+  grub_ssize_t len;
+  struct multiboot_header *header;
+  grub_err_t err;
+  struct multiboot_header_tag *tag;
+  struct multiboot_header_tag_address *addr_tag = NULL;
+  int entry_specified = 0;
+  grub_addr_t entry = 0;
+  grub_uint32_t console_required = 0;
+  struct multiboot_header_tag_framebuffer *fbtag = NULL;
+  int accepted_consoles = GRUB_MULTIBOOT_CONSOLE_EGA_TEXT;
+
+  buffer = grub_malloc (MULTIBOOT_SEARCH);
+  if (!buffer)
+    return grub_errno;
+
+  len = grub_file_read (file, buffer, MULTIBOOT_SEARCH);
+  if (len < 32)
+    {
+      grub_free (buffer);
+      return grub_error (GRUB_ERR_BAD_OS, "file too small");
+    }
+
+  /* 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 = (struct multiboot_header *) buffer;
+       ((char *) header <= buffer + len - 12) || (header = 0);
+       header = (struct multiboot_header *) ((char *) header + MULTIBOOT_HEADER_ALIGN))
+    {
+      if (header->magic == MULTIBOOT_HEADER_MAGIC
+	  && !(header->magic + header->architecture
+	       + header->header_length + header->checksum))
+	break;
+    }
+
+  if (header == 0)
+    {
+      grub_free (buffer);
+      return grub_error (GRUB_ERR_BAD_ARGUMENT, "no multiboot header found");
+    }
+
+  for (tag = (struct multiboot_header_tag *) (header + 1);
+       tag->type != MULTIBOOT_TAG_TYPE_END;
+       tag = (struct multiboot_header_tag *) ((char *) tag + tag->size))
+    switch (tag->type)
+      {
+      case MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST:
+	{
+	  unsigned i;
+	  struct multiboot_header_tag_information_request *request_tag
+	    = (struct multiboot_header_tag_information_request *) tag;
+	  if (request_tag->flags & MULTIBOOT_HEADER_TAG_OPTIONAL)
+	    break;
+	  for (i = 0; i < (request_tag->size - sizeof (request_tag))
+		 / sizeof (request_tag->requests[0]); i++)
+	    switch (request_tag->requests[i])
+	      {
+	      case MULTIBOOT_TAG_TYPE_END:
+	      case MULTIBOOT_TAG_TYPE_CMDLINE:
+	      case MULTIBOOT_TAG_TYPE_BOOT_LOADER_NAME:
+	      case MULTIBOOT_TAG_TYPE_MODULE:
+	      case MULTIBOOT_TAG_TYPE_BASIC_MEMINFO:
+	      case MULTIBOOT_TAG_TYPE_BOOTDEV:
+	      case MULTIBOOT_TAG_TYPE_MMAP:
+	      case MULTIBOOT_TAG_TYPE_VBE:
+	      case MULTIBOOT_TAG_TYPE_FRAMEBUFFER:
+		break;
+
+	      case MULTIBOOT_TAG_TYPE_ELF_SECTIONS:
+	      case MULTIBOOT_TAG_TYPE_APM:
+	      default:
+		grub_free (buffer);
+		return grub_error (GRUB_ERR_UNKNOWN_OS,
+				   "unsupported information tag: 0x%x",
+				   request_tag->requests[i]);
+	      }
+	  break;
+	}
+	       
+      case MULTIBOOT_HEADER_TAG_ADDRESS:
+	addr_tag = (struct multiboot_header_tag_address *) tag;
+	break;
+
+      case MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS:
+	entry_specified = 1;
+	entry = ((struct multiboot_header_tag_entry_address *) tag)->entry_addr;
+	break;
+
+      case MULTIBOOT_HEADER_TAG_CONSOLE_FLAGS:
+	if (!(((struct multiboot_header_tag_console_flags *) tag)->console_flags
+	    & MULTIBOOT_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED))
+	  accepted_consoles &= ~GRUB_MULTIBOOT_CONSOLE_EGA_TEXT;
+	if (((struct multiboot_header_tag_console_flags *) tag)->console_flags
+	    & MULTIBOOT_CONSOLE_FLAGS_CONSOLE_REQUIRED)
+	  console_required = 1;
+	break;
+
+      case MULTIBOOT_HEADER_TAG_FRAMEBUFFER:
+	fbtag = (struct multiboot_header_tag_framebuffer *) tag;
+	accepted_consoles |= GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER;
+	break;
+
+	/* GRUB always page-aligns modules.  */
+      case MULTIBOOT_HEADER_TAG_MODULE_ALIGN:
+	break;
+
+      default:
+	if (! (tag->flags & MULTIBOOT_HEADER_TAG_OPTIONAL))
+	  {
+	    grub_free (buffer);
+	    return grub_error (GRUB_ERR_UNKNOWN_OS,
+			       "unsupported tag: 0x%x", tag->type);
+	  }
+	break;
+      }
+
+  if (addr_tag && !entry_specified)
+    {
+      grub_free (buffer);
+      return grub_error (GRUB_ERR_UNKNOWN_OS,
+			 "load address tag without entry address tag");
+    }
+ 
+  if (addr_tag)
+    {
+      int offset = ((char *) header - buffer -
+		    (addr_tag->header_addr - addr_tag->load_addr));
+      int load_size = ((addr_tag->load_end_addr == 0) ? file->size - offset :
+		       addr_tag->load_end_addr - addr_tag->load_addr);
+      grub_size_t code_size;
+
+      if (addr_tag->bss_end_addr)
+	code_size = (addr_tag->bss_end_addr - addr_tag->load_addr);
+      else
+	code_size = load_size;
+      grub_multiboot_payload_dest = addr_tag->load_addr;
+
+      grub_multiboot_pure_size += code_size;
+
+      /* Allocate a bit more to avoid relocations in most cases.  */
+      grub_multiboot_alloc_mbi = grub_multiboot_get_mbi_size () + 65536;
+      grub_multiboot_payload_orig
+	= grub_relocator32_alloc (grub_multiboot_pure_size + grub_multiboot_alloc_mbi);
+
+      if (! grub_multiboot_payload_orig)
+	{
+	  grub_free (buffer);
+	  return grub_errno;
+	}
+
+      if ((grub_file_seek (file, offset)) == (grub_off_t) -1)
+	{
+	  grub_free (buffer);
+	  return grub_errno;
+	}
+
+      grub_file_read (file, (void *) grub_multiboot_payload_orig, load_size);
+      if (grub_errno)
+	{
+	  grub_free (buffer);
+	  return grub_errno;
+	}
+
+      if (addr_tag->bss_end_addr)
+	grub_memset ((void *) (grub_multiboot_payload_orig + load_size), 0,
+		     addr_tag->bss_end_addr - addr_tag->load_addr - load_size);
+    }
+  else
+    {
+      err = grub_multiboot_load_elf (file, buffer);
+      if (err)
+	{
+	  grub_free (buffer);
+	  return err;
+	}
+    }
+
+  if (entry_specified)
+    grub_multiboot_payload_eip = entry;
+
+  if (fbtag)
+    err = grub_multiboot_set_console (GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER,
+				      accepted_consoles,
+				      fbtag->width, fbtag->height,
+				      fbtag->depth, console_required);
+  else
+    err = grub_multiboot_set_console (GRUB_MULTIBOOT_CONSOLE_EGA_TEXT,
+				      accepted_consoles,
+				      0, 0, 0, console_required);
+  return err;
+}
+
 grub_size_t
 grub_multiboot_get_mbi_size (void)
 {

From 32f86589a6c13fe3e90d100bf7625970f1e1dfb8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 10 Mar 2010 22:09:06 +0100
Subject: [PATCH 0596/1628] Video support in firmware

---
 video/sm712.c      |  70 +++++-
 video/sm712_init.c | 546 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 607 insertions(+), 9 deletions(-)
 create mode 100644 video/sm712_init.c

diff --git a/video/sm712.c b/video/sm712.c
index a86470b7d..f0d0f29c4 100644
--- a/video/sm712.c
+++ b/video/sm712.c
@@ -27,6 +27,10 @@
 #include <grub/video_fb.h>
 #include <grub/pci.h>
 
+#include "sm712_init.c"
+
+#define GRUB_SM712_TOTAL_MEMORY_SPACE  0x700400
+
 static struct
 {
   struct grub_video_mode_info mode_info;
@@ -55,7 +59,7 @@ grub_video_sm712_video_fini (void)
 {
   if (framebuffer.mapped)
     grub_pci_device_unmap_range (framebuffer.dev, framebuffer.ptr,
-				 1024 * 600 * 2);
+				 GRUB_SM712_TOTAL_MEMORY_SPACE);
 
   return grub_video_fb_fini ();
 }
@@ -67,6 +71,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
   int depth;
   grub_err_t err;
   int found = 0;
+  unsigned i;
 
   auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)));
   int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)))
@@ -102,11 +107,6 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
   if (!found)
     return grub_error (GRUB_ERR_IO, "Couldn't find graphics card");
 
-  if (found && framebuffer.base == 0)
-    {
-      /* FIXME: change framebuffer base */
-    }
-
   /* Fill mode info details.  */
   framebuffer.mode_info.width = 1024;
   framebuffer.mode_info.height = 600;
@@ -124,12 +124,64 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
   framebuffer.mode_info.reserved_mask_size = 0;
   framebuffer.mode_info.reserved_field_pos = 0;
   framebuffer.mode_info.blit_format = grub_video_get_blit_format (&framebuffer.mode_info);
+
+  if (found && framebuffer.base == 0)
+    {
+      grub_pci_address_t addr;
+      /* FIXME: choose address dynamically if needed.   */
+      framebuffer.base = 0x04000000;
+
+      addr = grub_pci_make_address (framebuffer.dev, GRUB_PCI_REG_ADDRESS_REG0);
+      grub_pci_write (addr, framebuffer.base);
+
+      /* Set latency.  */
+      addr = grub_pci_make_address (framebuffer.dev, GRUB_PCI_REG_CACHELINE);
+      grub_pci_write (addr, 0x8);
+
+      /* Enable address spaces.  */
+      addr = grub_pci_make_address (framebuffer.dev, GRUB_PCI_REG_COMMAND);
+      grub_pci_write (addr, 0x7);
+    }
+
   /* We can safely discard volatile attribute.  */
-  framebuffer.ptr = (void *) grub_pci_device_map_range (framebuffer.dev,
-							framebuffer.base,
-							1024 * 600 * 2);
+  framebuffer.ptr
+    = (void *) grub_pci_device_map_range (framebuffer.dev,
+					  framebuffer.base,
+					  GRUB_SM712_TOTAL_MEMORY_SPACE);
   framebuffer.mapped = 1;
 
+  /* Initialise SM712.  */
+  grub_outb (0x18, GRUB_MACHINE_PCI_IO_BASE + 0x3c4);
+  grub_outb (0x11, GRUB_MACHINE_PCI_IO_BASE + 0x3c5);
+
+  /* Prevent garbage from appearing on the screen.  */
+  grub_memset (framebuffer.ptr, 0, 
+	       framebuffer.mode_info.height * framebuffer.mode_info.pitch);
+
+  for (i = 0; i < ARRAY_SIZE (sm712_init); i++)
+    switch (sm712_init[i].directive)
+      {
+      case 1:
+	*(volatile grub_uint8_t *) ((char *) framebuffer.ptr 
+				    + sm712_init[i].addr) = sm712_init[i].val;
+	break;
+      case -1:
+	{
+	  grub_uint8_t val = *(volatile grub_uint8_t *) 
+	    ((char *) framebuffer.ptr + sm712_init[i].addr);
+	  (void) val;
+	}
+	break;
+      case 2:
+	*(volatile grub_uint16_t *) ((char *) framebuffer.ptr 
+				     + sm712_init[i].addr) = sm712_init[i].val;
+	break;
+      case 4:
+	*(volatile grub_uint32_t *) ((char *) framebuffer.ptr 
+				     + sm712_init[i].addr) = sm712_init[i].val;
+	break;
+      }
+
   err = grub_video_fb_create_render_target_from_pointer (&framebuffer.render_target, &framebuffer.mode_info, framebuffer.ptr);
 
   if (err)
diff --git a/video/sm712_init.c b/video/sm712_init.c
new file mode 100644
index 000000000..02c64c453
--- /dev/null
+++ b/video/sm712_init.c
@@ -0,0 +1,546 @@
+/* Following sequence is a capture of sm712 initialisation sequence.  */
+static struct 
+{
+  int directive;
+  grub_uint32_t addr;
+  grub_uint32_t val;
+} sm712_init[] =
+{
+  {1, 0x7003c4, 0x21},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x62},
+  {1, 0x7003c5, 0x7a},
+  {1, 0x7003c4, 0x6a},
+  {1, 0x7003c5, 0x16},
+  {1, 0x7003c4, 0x6b},
+  {1, 0x7003c5, 0x2},
+  {1, 0x7003c6, 0x0},
+  {1, 0x7003c4, 0x0},
+  {1, 0x7003c5, 0x1},
+  {1, 0x7003c2, 0xeb},
+  {1, 0x7003c4, 0x0},
+  {1, 0x7003c5, 0x3},
+  {1, 0x7003c4, 0x1},
+  {1, 0x7003c5, 0x1},
+  {1, 0x7003c4, 0x2},
+  {1, 0x7003c5, 0xf},
+  {1, 0x7003c4, 0x3},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x4},
+  {1, 0x7003c5, 0xe},
+  {1, 0x7003c4, 0x10},
+  {1, 0x7003c5, 0xc8},
+  {1, 0x7003c4, 0x11},
+  {1, 0x7003c5, 0x40},
+  {1, 0x7003c4, 0x12},
+  {1, 0x7003c5, 0x14},
+  {1, 0x7003c4, 0x13},
+  {1, 0x7003c5, 0x60},
+  {1, 0x7003c4, 0x14},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x15},
+  {1, 0x7003c5, 0xa},
+  {1, 0x7003c4, 0x16},
+  {1, 0x7003c5, 0x92},
+  {1, 0x7003c4, 0x17},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x18},
+  {1, 0x7003c5, 0x51},
+  {1, 0x7003c4, 0x19},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x1a},
+  {1, 0x7003c5, 0x1},
+  {1, 0x7003c4, 0x1b},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x1c},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x1d},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x1e},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x1f},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x20},
+  {1, 0x7003c5, 0xc4},
+  {1, 0x7003c4, 0x21},
+  {1, 0x7003c5, 0x30},
+  {1, 0x7003c4, 0x22},
+  {1, 0x7003c5, 0x2},
+  {1, 0x7003c4, 0x23},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x24},
+  {1, 0x7003c5, 0x1},
+  {1, 0x7003c4, 0x30},
+  {1, 0x7003c5, 0x28},
+  {1, 0x7003c4, 0x31},
+  {1, 0x7003c5, 0x3},
+  {1, 0x7003c4, 0x32},
+  {1, 0x7003c5, 0x24},
+  {1, 0x7003c4, 0x33},
+  {1, 0x7003c5, 0x9},
+  {1, 0x7003c4, 0x34},
+  {1, 0x7003c5, 0xc0},
+  {1, 0x7003c4, 0x35},
+  {1, 0x7003c5, 0x3a},
+  {1, 0x7003c4, 0x36},
+  {1, 0x7003c5, 0x3a},
+  {1, 0x7003c4, 0x37},
+  {1, 0x7003c5, 0x3a},
+  {1, 0x7003c4, 0x38},
+  {1, 0x7003c5, 0x3a},
+  {1, 0x7003c4, 0x39},
+  {1, 0x7003c5, 0x3a},
+  {1, 0x7003c4, 0x3a},
+  {1, 0x7003c5, 0x3a},
+  {1, 0x7003c4, 0x3b},
+  {1, 0x7003c5, 0x3a},
+  {1, 0x7003c4, 0x3c},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x3d},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x3e},
+  {1, 0x7003c5, 0x3},
+  {1, 0x7003c4, 0x3f},
+  {1, 0x7003c5, 0xff},
+  {1, 0x7003c4, 0x40},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x41},
+  {1, 0x7003c5, 0xfc},
+  {1, 0x7003c4, 0x42},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x43},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x44},
+  {1, 0x7003c5, 0x20},
+  {1, 0x7003c4, 0x45},
+  {1, 0x7003c5, 0x18},
+  {1, 0x7003c4, 0x46},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x47},
+  {1, 0x7003c5, 0xfc},
+  {1, 0x7003c4, 0x48},
+  {1, 0x7003c5, 0x20},
+  {1, 0x7003c4, 0x49},
+  {1, 0x7003c5, 0xc},
+  {1, 0x7003c4, 0x4a},
+  {1, 0x7003c5, 0x44},
+  {1, 0x7003c4, 0x4b},
+  {1, 0x7003c5, 0x20},
+  {1, 0x7003c4, 0x4c},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x4d},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x4e},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x4f},
+  {1, 0x7003c5, 0x3a},
+  {1, 0x7003c4, 0x50},
+  {1, 0x7003c5, 0x6},
+  {1, 0x7003c4, 0x51},
+  {1, 0x7003c5, 0x68},
+  {1, 0x7003c4, 0x52},
+  {1, 0x7003c5, 0xa7},
+  {1, 0x7003c4, 0x53},
+  {1, 0x7003c5, 0x7f},
+  {1, 0x7003c4, 0x54},
+  {1, 0x7003c5, 0x83},
+  {1, 0x7003c4, 0x55},
+  {1, 0x7003c5, 0x24},
+  {1, 0x7003c4, 0x56},
+  {1, 0x7003c5, 0xff},
+  {1, 0x7003c4, 0x57},
+  {1, 0x7003c5, 0x3},
+  {1, 0x7003c4, 0x58},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x59},
+  {1, 0x7003c5, 0x60},
+  {1, 0x7003c4, 0x5a},
+  {1, 0x7003c5, 0x59},
+  {1, 0x7003c4, 0x5b},
+  {1, 0x7003c5, 0x3a},
+  {1, 0x7003c4, 0x5c},
+  {1, 0x7003c5, 0x3a},
+  {1, 0x7003c4, 0x5d},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x5e},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x5f},
+  {1, 0x7003c5, 0x3a},
+  {1, 0x7003c4, 0x60},
+  {1, 0x7003c5, 0x1},
+  {1, 0x7003c4, 0x61},
+  {1, 0x7003c5, 0x80},
+  {1, 0x7003c4, 0x63},
+  {1, 0x7003c5, 0x1a},
+  {1, 0x7003c4, 0x64},
+  {1, 0x7003c5, 0x1a},
+  {1, 0x7003c4, 0x65},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x66},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x67},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x68},
+  {1, 0x7003c5, 0x50},
+  {1, 0x7003c4, 0x69},
+  {1, 0x7003c5, 0x3},
+  {1, 0x7003c4, 0x6c},
+  {1, 0x7003c5, 0x52},
+  {1, 0x7003c4, 0x6d},
+  {1, 0x7003c5, 0x89},
+  {1, 0x7003c4, 0x6e},
+  {1, 0x7003c5, 0x9},
+  {1, 0x7003c4, 0x6f},
+  {1, 0x7003c5, 0x2},
+  {1, 0x7003c4, 0x70},
+  {1, 0x7003c5, 0x4},
+  {1, 0x7003c4, 0x71},
+  {1, 0x7003c5, 0x45},
+  {1, 0x7003c4, 0x72},
+  {1, 0x7003c5, 0x30},
+  {1, 0x7003c4, 0x73},
+  {1, 0x7003c5, 0x30},
+  {1, 0x7003c4, 0x74},
+  {1, 0x7003c5, 0x40},
+  {1, 0x7003c4, 0x75},
+  {1, 0x7003c5, 0x20},
+  {1, 0x7003c4, 0x80},
+  {1, 0x7003c5, 0xff},
+  {1, 0x7003c4, 0x81},
+  {1, 0x7003c5, 0x7},
+  {1, 0x7003c4, 0x82},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x83},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x84},
+  {1, 0x7003c5, 0x8},
+  {1, 0x7003c4, 0x85},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x86},
+  {1, 0x7003c5, 0x42},
+  {1, 0x7003c4, 0x87},
+  {1, 0x7003c5, 0x3a},
+  {1, 0x7003c4, 0x88},
+  {1, 0x7003c5, 0x59},
+  {1, 0x7003c4, 0x89},
+  {1, 0x7003c5, 0x2},
+  {1, 0x7003c4, 0x8a},
+  {1, 0x7003c5, 0x44},
+  {1, 0x7003c4, 0x8b},
+  {1, 0x7003c5, 0x2},
+  {1, 0x7003c4, 0x8c},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x8d},
+  {1, 0x7003c5, 0xff},
+  {1, 0x7003c4, 0x8e},
+  {1, 0x7003c5, 0x3a},
+  {1, 0x7003c4, 0x8f},
+  {1, 0x7003c5, 0x3a},
+  {1, 0x7003c4, 0x90},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x91},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x92},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0x93},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0xa0},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0xa1},
+  {1, 0x7003c5, 0x10},
+  {1, 0x7003c4, 0xa2},
+  {1, 0x7003c5, 0x8},
+  {1, 0x7003c4, 0xa3},
+  {1, 0x7003c5, 0x0},
+  {1, 0x7003c4, 0xa4},
+  {1, 0x7003c5, 0x2},
+  {1, 0x7003c4, 0xa5},
+  {1, 0x7003c5, 0xed},
+  {1, 0x7003c4, 0xa6},
+  {1, 0x7003c5, 0xed},
+  {1, 0x7003c4, 0xa7},
+  {1, 0x7003c5, 0xed},
+  {1, 0x7003c4, 0xa8},
+  {1, 0x7003c5, 0x7b},
+  {1, 0x7003c4, 0xa9},
+  {1, 0x7003c5, 0xfb},
+  {1, 0x7003c4, 0xaa},
+  {1, 0x7003c5, 0xff},
+  {1, 0x7003c4, 0xab},
+  {1, 0x7003c5, 0xff},
+  {1, 0x7003c4, 0xac},
+  {1, 0x7003c5, 0x97},
+  {1, 0x7003c4, 0xad},
+  {1, 0x7003c5, 0xef},
+  {1, 0x7003c4, 0xae},
+  {1, 0x7003c5, 0xbf},
+  {1, 0x7003c4, 0xaf},
+  {1, 0x7003c5, 0xdf},
+  {1, 0x7003ce, 0x0},
+  {1, 0x7003cf, 0x0},
+  {1, 0x7003ce, 0x1},
+  {1, 0x7003cf, 0x0},
+  {1, 0x7003ce, 0x2},
+  {1, 0x7003cf, 0x0},
+  {1, 0x7003ce, 0x3},
+  {1, 0x7003cf, 0x0},
+  {1, 0x7003ce, 0x4},
+  {1, 0x7003cf, 0x0},
+  {1, 0x7003ce, 0x5},
+  {1, 0x7003cf, 0x40},
+  {1, 0x7003ce, 0x6},
+  {1, 0x7003cf, 0x5},
+  {1, 0x7003ce, 0x7},
+  {1, 0x7003cf, 0xf},
+  {1, 0x7003ce, 0x8},
+  {1, 0x7003cf, 0xff},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0x0},
+  {-1, 0x7003c1, 0x3e},
+  {1, 0x7003c0, 0x0},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0x1},
+  {-1, 0x7003c1, 0x3b},
+  {1, 0x7003c0, 0x1},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0x2},
+  {-1, 0x7003c1, 0x3f},
+  {1, 0x7003c0, 0x2},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0x3},
+  {-1, 0x7003c1, 0x3f},
+  {1, 0x7003c0, 0x3},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0x4},
+  {-1, 0x7003c1, 0x3b},
+  {1, 0x7003c0, 0x4},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0x5},
+  {-1, 0x7003c1, 0x2f},
+  {1, 0x7003c0, 0x5},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0x6},
+  {-1, 0x7003c1, 0x3f},
+  {1, 0x7003c0, 0x6},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0x7},
+  {-1, 0x7003c1, 0x3f},
+  {1, 0x7003c0, 0x7},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0x8},
+  {-1, 0x7003c1, 0x3f},
+  {1, 0x7003c0, 0x8},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0x9},
+  {-1, 0x7003c1, 0x3d},
+  {1, 0x7003c0, 0x9},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0xa},
+  {-1, 0x7003c1, 0x1f},
+  {1, 0x7003c0, 0xa},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0xb},
+  {-1, 0x7003c1, 0x1f},
+  {1, 0x7003c0, 0xb},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0xc},
+  {-1, 0x7003c1, 0x3f},
+  {1, 0x7003c0, 0xc},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0xd},
+  {-1, 0x7003c1, 0x3f},
+  {1, 0x7003c0, 0xd},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0xe},
+  {-1, 0x7003c1, 0x3f},
+  {1, 0x7003c0, 0xe},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0xf},
+  {-1, 0x7003c1, 0x2e},
+  {1, 0x7003c0, 0xf},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0x10},
+  {-1, 0x7003c1, 0x0},
+  {1, 0x7003c0, 0x41},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0x11},
+  {-1, 0x7003c1, 0x0},
+  {1, 0x7003c0, 0x0},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0x12},
+  {-1, 0x7003c1, 0x0},
+  {1, 0x7003c0, 0xf},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0x13},
+  {-1, 0x7003c1, 0x0},
+  {1, 0x7003c0, 0x0},
+  {-1, 0x7003da, 0x5},
+  {1, 0x7003c0, 0x14},
+  {-1, 0x7003c1, 0x0},
+  {1, 0x7003c0, 0x0},
+  {1, 0x7003d4, 0x0},
+  {1, 0x7003d5, 0xa3},
+  {1, 0x7003d4, 0x1},
+  {1, 0x7003d5, 0x7f},
+  {1, 0x7003d4, 0x2},
+  {1, 0x7003d5, 0x7f},
+  {1, 0x7003d4, 0x3},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x4},
+  {1, 0x7003d5, 0x85},
+  {1, 0x7003d4, 0x5},
+  {1, 0x7003d5, 0x16},
+  {1, 0x7003d4, 0x6},
+  {1, 0x7003d5, 0x24},
+  {1, 0x7003d4, 0x7},
+  {1, 0x7003d5, 0xf5},
+  {1, 0x7003d4, 0x8},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x9},
+  {1, 0x7003d5, 0x60},
+  {1, 0x7003d4, 0xa},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0xb},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0xc},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0xd},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0xe},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0xf},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x10},
+  {1, 0x7003d5, 0x3},
+  {1, 0x7003d4, 0x11},
+  {1, 0x7003d5, 0x9},
+  {1, 0x7003d4, 0x12},
+  {1, 0x7003d5, 0xff},
+  {1, 0x7003d4, 0x13},
+  {1, 0x7003d5, 0x80},
+  {1, 0x7003d4, 0x14},
+  {1, 0x7003d5, 0x40},
+  {1, 0x7003d4, 0x15},
+  {1, 0x7003d5, 0xff},
+  {1, 0x7003d4, 0x16},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x17},
+  {1, 0x7003d5, 0xe3},
+  {1, 0x7003d4, 0x18},
+  {1, 0x7003d5, 0xff},
+  {1, 0x7003d4, 0x30},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x31},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x32},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x33},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x34},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x35},
+  {1, 0x7003d5, 0x80},
+  {1, 0x7003d4, 0x36},
+  {1, 0x7003d5, 0x2},
+  {1, 0x7003d4, 0x37},
+  {1, 0x7003d5, 0x20},
+  {1, 0x7003d4, 0x38},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x39},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x3a},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x3b},
+  {1, 0x7003d5, 0x40},
+  {1, 0x7003d4, 0x3c},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x3d},
+  {1, 0x7003d5, 0xff},
+  {1, 0x7003d4, 0x3e},
+  {1, 0x7003d5, 0x46},
+  {1, 0x7003d4, 0x3f},
+  {1, 0x7003d5, 0x91},
+  {1, 0x7003d4, 0x40},
+  {1, 0x7003d5, 0xa3},
+  {1, 0x7003d4, 0x41},
+  {1, 0x7003d5, 0x7f},
+  {1, 0x7003d4, 0x42},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x43},
+  {1, 0x7003d5, 0x86},
+  {1, 0x7003d4, 0x44},
+  {1, 0x7003d5, 0x15},
+  {1, 0x7003d4, 0x45},
+  {1, 0x7003d5, 0x24},
+  {1, 0x7003d4, 0x46},
+  {1, 0x7003d5, 0xff},
+  {1, 0x7003d4, 0x47},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x48},
+  {1, 0x7003d5, 0x1},
+  {1, 0x7003d4, 0x49},
+  {1, 0x7003d5, 0x7},
+  {1, 0x7003d4, 0x4a},
+  {1, 0x7003d5, 0xe5},
+  {1, 0x7003d4, 0x4b},
+  {1, 0x7003d5, 0x20},
+  {1, 0x7003d4, 0x4c},
+  {1, 0x7003d5, 0x7f},
+  {1, 0x7003d4, 0x4d},
+  {1, 0x7003d5, 0x57},
+  {1, 0x7003d4, 0x90},
+  {1, 0x7003d5, 0x55},
+  {1, 0x7003d4, 0x91},
+  {1, 0x7003d5, 0xd5},
+  {1, 0x7003d4, 0x92},
+  {1, 0x7003d5, 0x5d},
+  {1, 0x7003d4, 0x93},
+  {1, 0x7003d5, 0xdd},
+  {1, 0x7003d4, 0x94},
+  {1, 0x7003d5, 0x86},
+  {1, 0x7003d4, 0x95},
+  {1, 0x7003d5, 0x17},
+  {1, 0x7003d4, 0x96},
+  {1, 0x7003d5, 0x8e},
+  {1, 0x7003d4, 0x97},
+  {1, 0x7003d5, 0xaa},
+  {1, 0x7003d4, 0x98},
+  {1, 0x7003d5, 0x8a},
+  {1, 0x7003d4, 0x99},
+  {1, 0x7003d5, 0xa3},
+  {1, 0x7003d4, 0x9a},
+  {1, 0x7003d5, 0xde},
+  {1, 0x7003d4, 0x9b},
+  {1, 0x7003d5, 0xab},
+  {1, 0x7003d4, 0x9c},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x9d},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x9e},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0x9f},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0xa0},
+  {1, 0x7003d5, 0x2},
+  {1, 0x7003d4, 0xa1},
+  {1, 0x7003d5, 0x2},
+  {1, 0x7003d4, 0xa2},
+  {1, 0x7003d5, 0x2},
+  {1, 0x7003d4, 0xa3},
+  {1, 0x7003d5, 0x15},
+  {1, 0x7003d4, 0xa4},
+  {1, 0x7003d5, 0x2},
+  {1, 0x7003d4, 0xa5},
+  {1, 0x7003d5, 0x6},
+  {1, 0x7003d4, 0xa6},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003d4, 0xa7},
+  {1, 0x7003d5, 0x0},
+  {1, 0x7003c2, 0x67},
+  {4, 0x40c00c, 0x0},
+  {4, 0x40c040, 0x0},
+  {4, 0x40c000, 0x20000},
+  {4, 0x40c010, 0x1020100},
+  {1, 0x7003c4, 0x16},
+  {-1, 0x7003c5, 0x17}
+};

From bf8b8ab72558b490130666f1cc1f119607ff9f6f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 11 Mar 2010 02:47:08 +0100
Subject: [PATCH 0597/1628] Enable caches on yeeloong

---
 include/grub/mips/loongson.h | 57 +++++++++++++++++++++++++++
 kern/mips/yeeloong/fwstart.S | 75 ++++++++++++++++++++++++++++++++++++
 2 files changed, 132 insertions(+)
 create mode 100644 include/grub/mips/loongson.h

diff --git a/include/grub/mips/loongson.h b/include/grub/mips/loongson.h
new file mode 100644
index 000000000..9c1ba6da9
--- /dev/null
+++ b/include/grub/mips/loongson.h
@@ -0,0 +1,57 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#ifndef GRUB_LOONGSON_CPU_HEADER
+#define GRUB_LOONGSON_CPU_HEADER	1
+
+#define GRUB_CPU_LOONGSON_COP0_CACHE_CONFIG $16
+#define GRUB_CPU_LOONGSON_COP0_CACHE_CONFIG_ILINESIZE 0x10
+#define GRUB_CPU_LOONGSON_COP0_CACHE_CONFIG_DLINESIZE 0x8
+#define GRUB_CPU_LOONGSON_COP0_CACHE_DSIZE_SHIFT 6
+#define GRUB_CPU_LOONGSON_COP0_CACHE_ISIZE_SHIFT 9
+#define GRUB_CPU_LOONGSON_COP0_CACHE_SIZE_MASK  0x7
+#define GRUB_CPU_LOONGSON_COP0_CACHE_SIZE_OFFSET 12
+
+#define GRUB_CPU_LOONGSON_COP0_I_INDEX_INVALIDATE 0
+#define GRUB_CPU_LOONGSON_COP0_D_INDEX_TAG_STORE  9
+#define GRUB_CPU_LOONGSON_COP0_S_INDEX_TAG_STORE  11
+
+#define GRUB_CPU_LOONGSON_COP0_I_INDEX_BIT_OFFSET 5
+#define GRUB_CPU_LOONGSON_COP0_D_INDEX_BIT_OFFSET 5
+#define GRUB_CPU_LOONGSON_COP0_S_INDEX_BIT_OFFSET 5
+
+#define GRUB_CPU_LOONGSON_CACHE_ACCELERATED 7
+#define GRUB_CPU_LOONGSON_CACHE_UNCACHED 2
+#define GRUB_CPU_LOONGSON_CACHE_CACHED 3
+#define GRUB_CPU_LOONGSON_CACHE_TYPE_MASK 7
+#define GRUB_CPU_LOONGSON_CACHE_LINE_SIZE_LOG_SMALL 4
+#define GRUB_CPU_LOONGSON_CACHE_LINE_SIZE_LOG_BIG 5
+#define GRUB_CPU_LOONGSON_CACHE_LINE_SIZE_SMALL 16
+#define GRUB_CPU_LOONGSON_CACHE_LINE_SIZE_BIG 32
+
+#define GRUB_CPU_LOONGSON_I_CACHE_LOG_WAYS 2
+#define GRUB_CPU_LOONGSON_D_CACHE_LOG_WAYS 2
+#define GRUB_CPU_LOONGSON_S_CACHE_LOG_WAYS 2
+
+/* Fixme: determine dynamically.  */
+#define GRUB_CPU_LOONGSON_SECONDARY_CACHE_LOG_SIZE 19
+
+#define GRUB_CPU_LOONGSON_COP0_CACHE_TAGLO $28
+#define GRUB_CPU_LOONGSON_COP0_CACHE_TAGHI $29
+
+#endif
diff --git a/kern/mips/yeeloong/fwstart.S b/kern/mips/yeeloong/fwstart.S
index 3dccb65fd..dc5dabc6c 100644
--- a/kern/mips/yeeloong/fwstart.S
+++ b/kern/mips/yeeloong/fwstart.S
@@ -19,6 +19,7 @@
 #include <grub/mips/yeeloong/serial.h>
 #include <grub/mips/yeeloong/pci.h>
 #include <grub/mips/yeeloong/boot.h>
+#include <grub/mips/loongson.h>
 #include <grub/pci.h>
 #include <grub/serial.h>
 #include <grub/cs5536.h>
@@ -392,6 +393,7 @@ epc:	.asciz "\n\rEPC: "
 badvaddr:	.asciz "\n\rBadVaddr: "
 newline:	.asciz "\n\r"
 return_msg:	  .asciz "\n\rReturn address: "
+caches_enabled:	.asciz "Caches enabled\n\r"
 
 	.p2align 3
 
@@ -535,6 +537,79 @@ continue:
 	ori	$t1, $t1, 0x100
         sd	$t1, 0x0180($t0)
 
+	/* Enable cache.  */
+	mfc0	$t0, GRUB_CPU_LOONGSON_COP0_CACHE_CONFIG
+	addiu 	$t1, $zero, ~GRUB_CPU_LOONGSON_CACHE_TYPE_MASK
+	and     $t0, $t1, $t1
+	/* Set line size to 32 bytes and disabled cache.  */
+	ori   	$t0, $t0, (GRUB_CPU_LOONGSON_COP0_CACHE_CONFIG_ILINESIZE \
+	                   | GRUB_CPU_LOONGSON_COP0_CACHE_CONFIG_DLINESIZE \
+	                   | GRUB_CPU_LOONGSON_CACHE_ACCELERATED)
+	mtc0	$t0, GRUB_CPU_LOONGSON_COP0_CACHE_CONFIG
+
+	/* Invalidate all I-cache entries.  */
+	srl $t1, $t0, GRUB_CPU_LOONGSON_COP0_CACHE_ISIZE_SHIFT
+	andi $t1, $t1, GRUB_CPU_LOONGSON_COP0_CACHE_SIZE_MASK
+	ori $t2, $zero, (1 << (GRUB_CPU_LOONGSON_COP0_CACHE_SIZE_OFFSET \
+	                       - GRUB_CPU_LOONGSON_CACHE_LINE_SIZE_LOG_BIG \
+	                       - GRUB_CPU_LOONGSON_I_CACHE_LOG_WAYS))
+	sll $t1, $t2, $t1
+	lui $t2, 0x8000
+
+1:	
+	cache GRUB_CPU_LOONGSON_COP0_I_INDEX_INVALIDATE, 0($t2)
+	addiu $t1, $t1, -1
+	bne $t1, $zero, 1b
+	 addiu $t2, $t2, (1 << GRUB_CPU_LOONGSON_COP0_I_INDEX_BIT_OFFSET)
+
+	/* Invalidate all D-cache entries.  */
+	srl $t1, $t0, GRUB_CPU_LOONGSON_COP0_CACHE_DSIZE_SHIFT
+	andi $t1, $t1, GRUB_CPU_LOONGSON_COP0_CACHE_SIZE_MASK
+	ori $t2, $zero, (1 << (GRUB_CPU_LOONGSON_COP0_CACHE_SIZE_OFFSET \
+	                       - GRUB_CPU_LOONGSON_CACHE_LINE_SIZE_LOG_BIG \
+	                       - GRUB_CPU_LOONGSON_D_CACHE_LOG_WAYS))
+	sll $t1, $t2, $t1
+	lui $t2, 0x8000
+	mtc0 $zero, GRUB_CPU_LOONGSON_COP0_CACHE_TAGLO
+	mtc0 $zero, GRUB_CPU_LOONGSON_COP0_CACHE_TAGHI
+1:
+	/* All four ways.  */
+	cache GRUB_CPU_LOONGSON_COP0_D_INDEX_TAG_STORE, 0($t2)
+	cache GRUB_CPU_LOONGSON_COP0_D_INDEX_TAG_STORE, 1($t2)
+	cache GRUB_CPU_LOONGSON_COP0_D_INDEX_TAG_STORE, 2($t2)
+	cache GRUB_CPU_LOONGSON_COP0_D_INDEX_TAG_STORE, 3($t2)
+	addiu $t1, $t1, -1
+	bne $t1, $zero, 1b
+	 addiu $t2, $t2, (1 << GRUB_CPU_LOONGSON_COP0_D_INDEX_BIT_OFFSET)
+
+	/* Invalidate all S-cache entries.  */
+	ori $t1, $zero, (1 << (GRUB_CPU_LOONGSON_SECONDARY_CACHE_LOG_SIZE \
+	                       - GRUB_CPU_LOONGSON_CACHE_LINE_SIZE_LOG_BIG \
+	                       - GRUB_CPU_LOONGSON_S_CACHE_LOG_WAYS))
+	lui $t2, 0x8000
+	mtc0 $zero, GRUB_CPU_LOONGSON_COP0_CACHE_TAGLO
+	mtc0 $zero, GRUB_CPU_LOONGSON_COP0_CACHE_TAGHI
+1:
+	/* All four ways.  */
+	cache GRUB_CPU_LOONGSON_COP0_S_INDEX_TAG_STORE, 0($t2)
+	cache GRUB_CPU_LOONGSON_COP0_S_INDEX_TAG_STORE, 1($t2)
+	cache GRUB_CPU_LOONGSON_COP0_S_INDEX_TAG_STORE, 2($t2)
+	cache GRUB_CPU_LOONGSON_COP0_S_INDEX_TAG_STORE, 3($t2)
+	addiu $t1, $t1, -1
+	bne $t1, $zero, 1b
+	 addiu $t2, $t2, (1 << GRUB_CPU_LOONGSON_COP0_D_INDEX_BIT_OFFSET)
+	
+	/* Finally enable cache.  */
+	mfc0	$t0, GRUB_CPU_LOONGSON_COP0_CACHE_CONFIG
+	addiu 	$t1, $zero, ~GRUB_CPU_LOONGSON_CACHE_TYPE_MASK
+	and     $t0, $t1, $t1
+	ori   	$t0, $t0, GRUB_CPU_LOONGSON_CACHE_CACHED
+	mtc0	$t0, GRUB_CPU_LOONGSON_COP0_CACHE_CONFIG
+
+	lui $a0, %hi(caches_enabled)
+	bal message
+	  addiu $a0, $a0, %lo(caches_enabled)
+	
 	addiu $a0, $zero, -1
 	addiu $a1, $zero, -1
 	addiu $a2, $zero, -1

From 21eecb8e83fd5bca74b1c5a694e1f89f11b4d4d6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 11 Mar 2010 03:21:10 +0100
Subject: [PATCH 0598/1628] Set ROM delay to 1

---
 include/grub/mips/loongson.h | 4 ++++
 kern/mips/yeeloong/fwstart.S | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/include/grub/mips/loongson.h b/include/grub/mips/loongson.h
index 9c1ba6da9..8441b6c0f 100644
--- a/include/grub/mips/loongson.h
+++ b/include/grub/mips/loongson.h
@@ -54,4 +54,8 @@
 #define GRUB_CPU_LOONGSON_COP0_CACHE_TAGLO $28
 #define GRUB_CPU_LOONGSON_COP0_CACHE_TAGHI $29
 
+#define GRUB_CPU_LOONGSON_LIOCFG   0xbfe00108
+#define GRUB_CPU_LOONGSON_ROM_DELAY_OFFSET 2
+#define GRUB_CPU_LOONGSON_ROM_DELAY_MASK 0x1f
+
 #endif
diff --git a/kern/mips/yeeloong/fwstart.S b/kern/mips/yeeloong/fwstart.S
index dc5dabc6c..d48acabc8 100644
--- a/kern/mips/yeeloong/fwstart.S
+++ b/kern/mips/yeeloong/fwstart.S
@@ -609,6 +609,15 @@ continue:
 	lui $a0, %hi(caches_enabled)
 	bal message
 	  addiu $a0, $a0, %lo(caches_enabled)
+
+	/* Set ROM delay cycles to 1.  */
+	lui $t0, %hi(GRUB_CPU_LOONGSON_LIOCFG)
+	lw  $t1, %lo(GRUB_CPU_LOONGSON_LIOCFG) ($t0)
+	addiu $t2, $zero, ~(GRUB_CPU_LOONGSON_ROM_DELAY_MASK \
+	                    << GRUB_CPU_LOONGSON_ROM_DELAY_OFFSET)
+	and $t1, $t1, $t2
+	ori $t1, $t1, (1 << GRUB_CPU_LOONGSON_ROM_DELAY_OFFSET)
+	sw  $t1, %lo(GRUB_CPU_LOONGSON_LIOCFG) ($t0)
 	
 	addiu $a0, $zero, -1
 	addiu $a1, $zero, -1

From edf717f5cb173c215c48dce454264637b048de3e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 11 Mar 2010 13:59:56 +0100
Subject: [PATCH 0599/1628] Macroify CP0 registers

---
 include/grub/mips/loongson.h | 16 +++++++++++++---
 kern/mips/yeeloong/fwstart.S | 10 +++++-----
 kern/mips/yeeloong/init.c    |  3 ++-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/include/grub/mips/loongson.h b/include/grub/mips/loongson.h
index 8441b6c0f..2c69e6c3d 100644
--- a/include/grub/mips/loongson.h
+++ b/include/grub/mips/loongson.h
@@ -19,7 +19,13 @@
 #ifndef GRUB_LOONGSON_CPU_HEADER
 #define GRUB_LOONGSON_CPU_HEADER	1
 
-#define GRUB_CPU_LOONGSON_COP0_CACHE_CONFIG $16
+#ifdef ASM_FILE
+#define GRUB_CPU_REGISTER_WRAP(x) x
+#else
+#define GRUB_CPU_REGISTER_WRAP(x) #x
+#endif
+
+#define GRUB_CPU_LOONGSON_COP0_CACHE_CONFIG GRUB_CPU_REGISTER_WRAP($16)
 #define GRUB_CPU_LOONGSON_COP0_CACHE_CONFIG_ILINESIZE 0x10
 #define GRUB_CPU_LOONGSON_COP0_CACHE_CONFIG_DLINESIZE 0x8
 #define GRUB_CPU_LOONGSON_COP0_CACHE_DSIZE_SHIFT 6
@@ -51,8 +57,12 @@
 /* Fixme: determine dynamically.  */
 #define GRUB_CPU_LOONGSON_SECONDARY_CACHE_LOG_SIZE 19
 
-#define GRUB_CPU_LOONGSON_COP0_CACHE_TAGLO $28
-#define GRUB_CPU_LOONGSON_COP0_CACHE_TAGHI $29
+#define GRUB_CPU_LOONGSON_COP0_BADVADDR GRUB_CPU_REGISTER_WRAP($8)
+#define GRUB_CPU_LOONGSON_COP0_TIMER_COUNT GRUB_CPU_REGISTER_WRAP($9)
+#define GRUB_CPU_LOONGSON_COP0_CAUSE GRUB_CPU_REGISTER_WRAP($13)
+#define GRUB_CPU_LOONGSON_COP0_EPC GRUB_CPU_REGISTER_WRAP($14)
+#define GRUB_CPU_LOONGSON_COP0_CACHE_TAGLO GRUB_CPU_REGISTER_WRAP($28)
+#define GRUB_CPU_LOONGSON_COP0_CACHE_TAGHI GRUB_CPU_REGISTER_WRAP($29)
 
 #define GRUB_CPU_LOONGSON_LIOCFG   0xbfe00108
 #define GRUB_CPU_LOONGSON_ROM_DELAY_OFFSET 2
diff --git a/kern/mips/yeeloong/fwstart.S b/kern/mips/yeeloong/fwstart.S
index d48acabc8..e00da8933 100644
--- a/kern/mips/yeeloong/fwstart.S
+++ b/kern/mips/yeeloong/fwstart.S
@@ -130,8 +130,8 @@ __start:
 
 	. = start + GRUB_MACHINE_FLASH_TLB_REFILL - GRUB_MACHINE_FLASH_START
 tlb_refill:	
-	mfc0 $s1, $14
-	mfc0 $s2, $8
+	mfc0 $s1, GRUB_CPU_LOONGSON_COP0_EPC
+	mfc0 $s2, GRUB_CPU_LOONGSON_COP0_BADVADDR
 	move $s3, $ra
 	lui $a0, %hi(epc)
 	bal message
@@ -170,9 +170,9 @@ cache_error:
 
 	. = start + GRUB_MACHINE_FLASH_OTHER_EXCEPTION - GRUB_MACHINE_FLASH_START
 other_exception:
-	mfc0 $s0, $13
-	mfc0 $s1, $14
-	mfc0 $s2, $8
+	mfc0 $s0, GRUB_CPU_LOONGSON_COP0_CAUSE
+	mfc0 $s1, GRUB_CPU_LOONGSON_COP0_EPC
+	mfc0 $s2, GRUB_CPU_LOONGSON_COP0_BADVADDR
 	lui $a0, %hi(cause)
 	bal message
 	 addiu $a0, $a0, %lo(cause)
diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index f35605f63..f931cdb57 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -26,6 +26,7 @@
 #include <grub/time.h>
 #include <grub/machine/kernel.h>
 #include <grub/machine/memory.h>
+#include <grub/mips/loongson.h>
 #include <grub/cpu/kernel.h>
 #include <grub/cs5536.h>
 
@@ -44,7 +45,7 @@ grub_get_rtc (void)
   static grub_uint32_t last = 0;
   grub_uint32_t low;
 
-  asm volatile ("mfc0 %0, $9": "=r" (low));
+  asm volatile ("mfc0 %0, " GRUB_CPU_LOONGSON_COP0_TIMER_COUNT : "=r" (low));
   if (low < last)
     high++;
   last = low;

From d0c7485824f6052c9f425bdb821f30de892edd54 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 11 Mar 2010 15:21:06 +0100
Subject: [PATCH 0600/1628] Macroify serial and PCI constants

---
 include/grub/mips/yeeloong/serial.h |  6 ++---
 kern/mips/yeeloong/fwstart.S        | 34 ++++++++++++++---------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/include/grub/mips/yeeloong/serial.h b/include/grub/mips/yeeloong/serial.h
index bced102b6..b22352f5a 100644
--- a/include/grub/mips/yeeloong/serial.h
+++ b/include/grub/mips/yeeloong/serial.h
@@ -19,11 +19,11 @@
 #ifndef GRUB_MACHINE_SERIAL_HEADER
 #define GRUB_MACHINE_SERIAL_HEADER	1
 
+#define GRUB_MACHINE_SERIAL_PORT  0xbff003f8
+
 #ifndef ASM_FILE
-#define GRUB_MACHINE_SERIAL_PORTS { 0xbff003f8 }
+#define GRUB_MACHINE_SERIAL_PORTS { GRUB_MACHINE_SERIAL_PORT }
 #else
-#define GRUB_MACHINE_SERIAL_PORT_HI  0xbff0
-#define GRUB_MACHINE_SERIAL_PORT_LO  0x03f8 
 #endif
 
 #endif 
diff --git a/kern/mips/yeeloong/fwstart.S b/kern/mips/yeeloong/fwstart.S
index e00da8933..838becb1b 100644
--- a/kern/mips/yeeloong/fwstart.S
+++ b/kern/mips/yeeloong/fwstart.S
@@ -47,7 +47,7 @@ __start:
 	ori $t4, $zero, 1
 	lui $a0, %hi(no_cs5536)
 1:
-	andi $t4, $t4, 0xffff
+	andi $t4, $t4, ((1 << GRUB_PCI_NUM_DEVICES) - 1)
 	beql  $t4, $zero, fatal
 	 addiu $a0, $a0, %lo(no_cs5536)
 	sw   $t4, GRUB_MACHINE_PCI_CONF_CTRL_REG_LO($t0)
@@ -206,34 +206,34 @@ other_exception:
 	   we need it early.  */
 	/* In: none. Out: none. Clobbered: $t0, $t1, $a0.  */
 serial_hw_init:
-	lui $t0, GRUB_MACHINE_SERIAL_PORT_HI
+	lui $t0, %hi (GRUB_MACHINE_SERIAL_PORT)
 
 	/* Turn off the interrupt.  */
-	sb $zero, (GRUB_MACHINE_SERIAL_PORT_LO + UART_IER)($t0)
+	sb $zero, (%lo (GRUB_MACHINE_SERIAL_PORT) + UART_IER)($t0)
 
 	/* Set DLAB.  */
 	ori $t1, $zero, UART_DLAB
-	sb  $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_LCR)($t0)
+	sb  $t1, (%lo (GRUB_MACHINE_SERIAL_PORT) + UART_LCR)($t0)
 
 	/* Set the baud rate 115200.  */
 	ori $t1, $zero, 2
-	sb $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_DLL)($t0) 
-	sb $zero, (GRUB_MACHINE_SERIAL_PORT_LO + UART_DLH)($t0) 
+	sb $t1, (%lo (GRUB_MACHINE_SERIAL_PORT) + UART_DLL)($t0) 
+	sb $zero, (%lo (GRUB_MACHINE_SERIAL_PORT) + UART_DLH)($t0) 
 
 	/* Set the line status.  */
 	ori $t1, $zero, (UART_NO_PARITY | UART_8BITS_WORD | UART_1_STOP_BIT)
-        sb  $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_LCR)($t0)
+        sb  $t1, (%lo (GRUB_MACHINE_SERIAL_PORT) + UART_LCR)($t0)
 
 	/* Enable the FIFO.  */
 	ori $t1, $zero, UART_ENABLE_FIFO_TRIGGER1
-	sb $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_FCR)($t0)
+	sb $t1, (%lo (GRUB_MACHINE_SERIAL_PORT) + UART_FCR)($t0)
 
 	/* Turn on DTR and RTS.  */
 	ori $t1, $zero, UART_ENABLE_DTRRTS
-	sb  $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_MCR)($t0)
+	sb  $t1, (%lo (GRUB_MACHINE_SERIAL_PORT) + UART_MCR)($t0)
 
-	lui $t0, 0xbff0
-	addiu $t0, $t0, 0x03f8	
+	lui $t0, %hi (GRUB_MACHINE_SERIAL_PORT)
+	addiu $t0, $t0, %lo (GRUB_MACHINE_SERIAL_PORT)
 
 	/* Let message return to original caller.  */
 	lui  $a0, %hi(notification_string)
@@ -242,14 +242,14 @@ serial_hw_init:
 	/* Print message on serial console.  */
 	/* In: $a0 = asciiz message. Out: none. Clobbered: $t0, $t1, $a0.  */
 message:
-	lui $t0, GRUB_MACHINE_SERIAL_PORT_HI
+	lui $t0, %hi (GRUB_MACHINE_SERIAL_PORT)
 1:
-	lb $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_LSR)($t0)
+	lb $t1, (%lo (GRUB_MACHINE_SERIAL_PORT) + UART_LSR)($t0)
 	andi $t1, $t1, UART_EMPTY_TRANSMITTER
 	beq $t1, $zero, 1b
 	 nop
 	lb  $t1, 0($a0)
-	sb  $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_TX)($t0)
+	sb  $t1, (%lo (GRUB_MACHINE_SERIAL_PORT) + UART_TX)($t0)
 	bne $t1, $zero, 1b
 	 addiu $a0, $a0, 1
 	jr  $ra
@@ -259,10 +259,10 @@ message:
            In:	$a0. Out: None. Clobbered: $a0, $t0, $t1, $t2
 	*/
 printhex:
-	lui $t0, GRUB_MACHINE_SERIAL_PORT_HI
+	lui $t0, %hi  (GRUB_MACHINE_SERIAL_PORT)
 	ori $t2, $zero, 8
 1:
-	lb $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_LSR)($t0)
+	lb $t1, (%lo (GRUB_MACHINE_SERIAL_PORT) + UART_LSR)($t0)
 	andi $t1, $t1, UART_EMPTY_TRANSMITTER
 	beq $t1, $zero, 1b
 	 nop
@@ -272,7 +272,7 @@ printhex:
 	 sll  $a0, $a0, 4
 	addiu $t1, $t1, 'A'-10-'0' 
 2:	addiu $t1, $t1, '0'+10
-	sb  $t1, (GRUB_MACHINE_SERIAL_PORT_LO + UART_TX)($t0)
+	sb  $t1, (%lo (GRUB_MACHINE_SERIAL_PORT) + UART_TX)($t0)
 	addiu $t2, $t2, -1
 	bne $t2, $zero, 1b
 	 nop

From 144d0913f3d60c59517f0f6005ec61f816775c48 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 11 Mar 2010 15:22:04 +0100
Subject: [PATCH 0601/1628] Remove leftover

---
 kern/mips/yeeloong/fwstart.S | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/kern/mips/yeeloong/fwstart.S b/kern/mips/yeeloong/fwstart.S
index 838becb1b..17fe78f40 100644
--- a/kern/mips/yeeloong/fwstart.S
+++ b/kern/mips/yeeloong/fwstart.S
@@ -232,9 +232,6 @@ serial_hw_init:
 	ori $t1, $zero, UART_ENABLE_DTRRTS
 	sb  $t1, (%lo (GRUB_MACHINE_SERIAL_PORT) + UART_MCR)($t0)
 
-	lui $t0, %hi (GRUB_MACHINE_SERIAL_PORT)
-	addiu $t0, $t0, %lo (GRUB_MACHINE_SERIAL_PORT)
-
 	/* Let message return to original caller.  */
 	lui  $a0, %hi(notification_string)
 	addiu $a0, $a0, %lo(notification_string)

From 8d15b3f817ab60a994df97063c96121e9c9478e7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 11 Mar 2010 20:47:22 +0100
Subject: [PATCH 0602/1628] Use cached address when running from ROM

---
 kern/mips/yeeloong/fwstart.S | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/kern/mips/yeeloong/fwstart.S b/kern/mips/yeeloong/fwstart.S
index 17fe78f40..c7ed420a4 100644
--- a/kern/mips/yeeloong/fwstart.S
+++ b/kern/mips/yeeloong/fwstart.S
@@ -618,4 +618,11 @@ continue:
 	
 	addiu $a0, $zero, -1
 	addiu $a1, $zero, -1
-	addiu $a2, $zero, -1
+
+	/* Take advantage of cache.  */
+	lui $t0, %hi(cached_continue - 0x20000000)
+	addiu $t0, $t0, %lo(cached_continue - 0x20000000)
+	jr $t0
+	 addiu $a2, $zero, -1
+
+cached_continue:
\ No newline at end of file

From f9ef05770a365f5ba498329eafc5bb186a64e5ca Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 12 Mar 2010 14:07:33 +0100
Subject: [PATCH 0603/1628] Shutdown and reboot on yeeloong

---
 conf/mips-yeeloong.rmk          | 12 ++++++++++
 include/grub/mips/loongson.h    |  3 +++
 include/grub/mips/yeeloong/ec.h | 41 +++++++++++++++++++++++++++++++++
 include/grub/misc.h             |  4 ++--
 kern/mips/yeeloong/init.c       | 17 +++++++++++---
 5 files changed, 72 insertions(+), 5 deletions(-)
 create mode 100644 include/grub/mips/yeeloong/ec.h

diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 91a2283e8..001bae966 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -98,6 +98,18 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For halt.mod.
+pkglib_MODULES += halt.mod
+halt_mod_SOURCES = commands/halt.c
+halt_mod_CFLAGS = $(COMMON_CFLAGS)
+halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For reboot.mod.
+pkglib_MODULES += reboot.mod
+reboot_mod_SOURCES = commands/reboot.c
+reboot_mod_CFLAGS = $(COMMON_CFLAGS)
+reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 sbin_SCRIPTS += grub-install
 grub_install_SOURCES = util/grub-install.in
 
diff --git a/include/grub/mips/loongson.h b/include/grub/mips/loongson.h
index 2c69e6c3d..c2aa276a2 100644
--- a/include/grub/mips/loongson.h
+++ b/include/grub/mips/loongson.h
@@ -68,4 +68,7 @@
 #define GRUB_CPU_LOONGSON_ROM_DELAY_OFFSET 2
 #define GRUB_CPU_LOONGSON_ROM_DELAY_MASK 0x1f
 
+#define GRUB_CPU_LOONGSON_GPIOCFG  0xbfe00120
+#define GRUB_CPU_LOONGSON_SHUTDOWN_GPIO 1
+
 #endif
diff --git a/include/grub/mips/yeeloong/ec.h b/include/grub/mips/yeeloong/ec.h
new file mode 100644
index 000000000..62d1d33d9
--- /dev/null
+++ b/include/grub/mips/yeeloong/ec.h
@@ -0,0 +1,41 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#ifndef GRUB_EC_MACHINE_HEADER
+#define GRUB_EC_MACHINE_HEADER	1
+
+#define GRUB_MACHINE_EC_MAGIC_PORT1 0x381
+#define GRUB_MACHINE_EC_MAGIC_PORT2 0x382
+#define GRUB_MACHINE_EC_DATA_PORT 0x383
+
+#define GRUB_MACHINE_EC_MAGIC_VAL1 0xf4
+#define GRUB_MACHINE_EC_MAGIC_VAL2 0xec
+
+#define GRUB_MACHINE_EC_COMMAND_REBOOT 1
+
+static inline void
+grub_write_ec (grub_uint8_t value)
+{
+  grub_outb (GRUB_MACHINE_EC_MAGIC_VAL1,
+	     GRUB_MACHINE_PCI_IO_BASE + GRUB_MACHINE_EC_MAGIC_PORT1);
+  grub_outb (GRUB_MACHINE_EC_MAGIC_VAL2,
+	     GRUB_MACHINE_PCI_IO_BASE + GRUB_MACHINE_EC_MAGIC_PORT2);
+  grub_outb (value, GRUB_MACHINE_PCI_IO_BASE + GRUB_MACHINE_EC_DATA_PORT);
+}
+
+#endif
diff --git a/include/grub/misc.h b/include/grub/misc.h
index dcbafba87..1a2105549 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -298,9 +298,9 @@ void EXPORT_FUNC (grub_reboot) (void);
 #ifdef GRUB_MACHINE_PCBIOS
 /* Halt the system, using APM if possible. If NO_APM is true, don't
  * use APM even if it is available.  */
-void EXPORT_FUNC (grub_halt) (int no_apm);
+void EXPORT_FUNC (grub_halt) (int no_apm) __attribute__ ((noreturn));
 #else
-void EXPORT_FUNC (grub_halt) (void);
+void EXPORT_FUNC (grub_halt) (void) __attribute__ ((noreturn));
 #endif
 
 #endif /* ! GRUB_MISC_HEADER */
diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index f931cdb57..8a29be8eb 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -29,6 +29,8 @@
 #include <grub/mips/loongson.h>
 #include <grub/cpu/kernel.h>
 #include <grub/cs5536.h>
+#include <grub/term.h>
+#include <grub/machine/ec.h>
 
 extern void grub_video_sm712_init (void);
 extern void grub_video_video_init (void);
@@ -165,20 +167,29 @@ grub_machine_fini (void)
 }
 
 void
-grub_exit (void)
+grub_halt (void)
 {
+  grub_outb (grub_inb (GRUB_CPU_LOONGSON_GPIOCFG)
+	     & ~GRUB_CPU_LOONGSON_SHUTDOWN_GPIO, GRUB_CPU_LOONGSON_GPIOCFG);
+
+  grub_printf ("Shutdown failed\n");
+  grub_refresh ();
   while (1);
 }
 
 void
-grub_halt (void)
+grub_exit (void)
 {
-  while (1);
+  grub_halt ();
 }
 
 void
 grub_reboot (void)
 {
+  grub_write_ec (GRUB_MACHINE_EC_COMMAND_REBOOT);
+
+  grub_printf ("Reboot failed\n");
+  grub_refresh ();
   while (1);
 }
 

From 5dbb0fc055bddb0083ad9b5ede4265a4c4d1629f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 12 Mar 2010 14:08:26 +0100
Subject: [PATCH 0604/1628] Another round of macrofication

---
 include/grub/cs5536.h             | 11 +++++++++--
 include/grub/mips/yeeloong/boot.h |  2 ++
 include/grub/mips/yeeloong/pci.h  |  8 ++++----
 kern/mips/yeeloong/fwstart.S      | 22 ++++++++++++----------
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/include/grub/cs5536.h b/include/grub/cs5536.h
index 3f06bdb68..ec554f002 100644
--- a/include/grub/cs5536.h
+++ b/include/grub/cs5536.h
@@ -46,8 +46,15 @@
 #define GRUB_CS5536_SMB_REG_CTRL2_ENABLE 0x1
 #define GRUB_CS5536_SMB_REG_CTRL3 0x6
 
-#define GRUB_CS5536_LBAR_ADDR_MASK 0x000000000000fff8ULL
-#define GRUB_CS5536_LBAR_ENABLE 0x0000000100000000ULL
+#ifdef ASM_FILE
+#define GRUB_ULL(x) x
+#else
+#define GRUB_ULL(x) x ## ULL
+#endif
+
+#define GRUB_CS5536_LBAR_ADDR_MASK GRUB_ULL (0x000000000000fff8)
+#define GRUB_CS5536_LBAR_ENABLE GRUB_ULL (0x0000000100000000)
+#define GRUB_CS5536_LBAR_MASK_MASK GRUB_ULL (0x0000f00000000000)
 
 /* PMON-compatible LBARs.  */
 #define GRUB_CS5536_LBAR_GPIO      0x0b000
diff --git a/include/grub/mips/yeeloong/boot.h b/include/grub/mips/yeeloong/boot.h
index 6a4189ede..eda9c6ad5 100644
--- a/include/grub/mips/yeeloong/boot.h
+++ b/include/grub/mips/yeeloong/boot.h
@@ -26,5 +26,7 @@
 
 #define GRUB_MACHINE_DDR2_BASE              0xaffffe00
 #define GRUB_MACHINE_DDR2_REG1_HI_8BANKS    0x00000001
+#define GRUB_MACHINE_DDR2_REG_SIZE          0x8
+#define GRUB_MACHINE_DDR2_REG_STEP          0x10
 
 #endif
diff --git a/include/grub/mips/yeeloong/pci.h b/include/grub/mips/yeeloong/pci.h
index f50cdcb35..aa5e0bbea 100644
--- a/include/grub/mips/yeeloong/pci.h
+++ b/include/grub/mips/yeeloong/pci.h
@@ -30,12 +30,12 @@
 #define GRUB_MACHINE_PCI_IO_BASE          0xbfd00000
 #define GRUB_MACHINE_PCI_CONFSPACE        0xbfe80000
 
+#define GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR 0xbfe00118
+
 #ifndef ASM_FILE
-#define GRUB_MACHINE_PCI_CONF_CTRL_REG    (*(volatile grub_uint32_t *) 0xbfe00118)
+#define GRUB_MACHINE_PCI_CONF_CTRL_REG    (*(volatile grub_uint32_t *) \
+					   GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR)
 #define GRUB_MACHINE_PCI_IO_CTRL_REG      (*(volatile grub_uint32_t *) 0xbfe00110)
-#else
-#define GRUB_MACHINE_PCI_CONF_CTRL_REG_HI    0xbfe0
-#define GRUB_MACHINE_PCI_CONF_CTRL_REG_LO    0x0118
 #endif
 #define GRUB_MACHINE_PCI_WIN_MASK_SIZE    6
 #define GRUB_MACHINE_PCI_WIN_MASK         ((1 << GRUB_MACHINE_PCI_WIN_MASK_SIZE) - 1)
diff --git a/kern/mips/yeeloong/fwstart.S b/kern/mips/yeeloong/fwstart.S
index c7ed420a4..4a9a749f7 100644
--- a/kern/mips/yeeloong/fwstart.S
+++ b/kern/mips/yeeloong/fwstart.S
@@ -40,7 +40,7 @@ __start:
 	/* Resulting value is kept in GRUB_MACHINE_PCI_CONF_CTRL_REG.
 	   This way we don't need to sacrifice a register for it.  */
 	/* We have only one bus (0). Function is 0.  */
-	lui $t0, GRUB_MACHINE_PCI_CONF_CTRL_REG_HI
+	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)
@@ -50,7 +50,7 @@ __start:
 	andi $t4, $t4, ((1 << GRUB_PCI_NUM_DEVICES) - 1)
 	beql  $t4, $zero, fatal
 	 addiu $a0, $a0, %lo(no_cs5536)
-	sw   $t4, GRUB_MACHINE_PCI_CONF_CTRL_REG_LO($t0)
+	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
@@ -67,7 +67,8 @@ __start:
 	ori $a1, $zero, GRUB_CS5536_LBAR_GPIO
 	/* Set mask to 0xf and enabled bit to 1.  */
 	bal wrmsr
-	 ori $a2, $zero, 0xf001
+	 ori $a2, $zero, ((GRUB_CS5536_LBAR_MASK_MASK \
+	                  | GRUB_CS5536_LBAR_ENABLE) >> 32)
 
 	/* Set SMBUS LBAR.  */
 	lui $a0, %hi(GRUB_CS5536_MSR_SMB_BAR)
@@ -75,7 +76,8 @@ __start:
 	ori $a1, $zero, GRUB_CS5536_LBAR_SMBUS
 	/* Set mask to 0xf and enabled bit to 1.  */
 	bal wrmsr
-	 ori $a2, $zero, 0xf001
+	 ori $a2, $zero, ((GRUB_CS5536_LBAR_MASK_MASK \
+	                   | GRUB_CS5536_LBAR_ENABLE) >> 32)
 
 	lui $a0, %hi(smbus_enabled)
 	bal message
@@ -430,7 +432,7 @@ write_dumpreg:
 	sd $t2, 0($t4)
 	addiu $t4, $t4, 0x10
 	jr $ra
-	 addiu $t6, $t6, 0x8
+	 addiu $t6, $t6, GRUB_MACHINE_DDR2_REG_SIZE
 
 continue:
 	lui $t4, %hi(GRUB_MACHINE_DDR2_BASE)
@@ -442,7 +444,7 @@ continue:
 	 addiu $t6, $t6, %lo(regdump)
 
 	/* 1 */
-	ori $a1, $a1, 0x50
+	ori $a1, $a1, GRUB_SMB_RAM_START_ADDR
 	move $t8, $zero
 	lui  $t5, 0x0001
 	bal read_spd
@@ -455,7 +457,7 @@ continue:
 	dsll $t8, $t8, 32
 	or $t5, $t5, $t8
 	sd  $t5, 0 ($t4)
-	addiu $t4, $t4, 0x10
+	addiu $t4, $t4, GRUB_MACHINE_DDR2_REG_STEP
 
 	/* 2 */
 	bal write_dumpreg
@@ -509,17 +511,17 @@ continue:
 	or $t5, $t5, $v0
 	sd  $t5, 0 ($t4)
 
-	addiu $t4, $t4, 0x10
+	addiu $t4, $t4, GRUB_MACHINE_DDR2_REG_STEP
 	
 	ori $t7, $zero, 0x16
 
 1:	
 	ld $t2, 0($t6)
 	sd $t2, 0($t4)
-	addiu $t4, $t4, 0x10
+	addiu $t4, $t4, GRUB_MACHINE_DDR2_REG_STEP
 	addiu $t7, $t7, -1
 	bne $t7, $zero, 1b
-	 addiu $t6, $t6, 0x8
+	 addiu $t6, $t6, GRUB_MACHINE_DDR2_REG_SIZE
 	
 	lui $t4, %hi(GRUB_MACHINE_DDR2_BASE)
 	ld  $t5, (%lo(GRUB_MACHINE_DDR2_BASE) + 0x30) ($t4)

From d68b491ee2428b3160516d5f35a4eddf904ee114 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sun, 14 Mar 2010 13:48:55 +0100
Subject: [PATCH 0605/1628] * util/grub-mkrescue.in: Base ISO UUID on UTC.

---
 ChangeLog             | 4 ++++
 util/grub-mkrescue.in | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 18eb66b51..1977f24ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-14  Thorsten Glaser <tg@mirbsd.org>
+
+	* util/grub-mkrescue.in: Base ISO UUID on UTC.
+
 2010-03-08  Matt Kraai  <kraai@ftbfs.org>
 
 	* util/i386/pc/grub-setup.c (setup): Fix a grammatical error (Debian
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 592cf2df6..db29b0899 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -145,7 +145,7 @@ if test -e "${coreboot_dir}" ; then
     memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
     mkdir -p ${memdisk_dir}/boot/grub
     # obtain date-based UUID
-    iso_uuid=$(date +%Y-%m-%d-%H-%M-%S-00)
+    iso_uuid=$(date -u +%Y-%m-%d-%H-%M-%S-00)
 
     modules="$(cat ${coreboot_dir}/partmap.lst) ${modules}"
     cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg

From 18d4c6f0ce0c4021dcadf6275f6208502eb281ff Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Mar 2010 16:32:50 +0100
Subject: [PATCH 0606/1628] Fix address size in ofwfb on sparc64 (based on info
 by bvk)

---
 video/ieee1275.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/video/ieee1275.c b/video/ieee1275.c
index 99c54f5ed..5c6bc1594 100644
--- a/video/ieee1275.c
+++ b/video/ieee1275.c
@@ -124,8 +124,7 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height,
 			   unsigned int mode_type __attribute__ ((unused)),
 			   unsigned int mode_mask __attribute__ ((unused)))
 {
-  grub_uint32_t current_width, current_height;
-  grub_addr_t address;
+  grub_uint32_t current_width, current_height, address;
   grub_err_t err;
   grub_ieee1275_phandle_t dev;
 
@@ -167,7 +166,8 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height,
 					  sizeof (address), 0))
     return grub_error (GRUB_ERR_IO, "Couldn't retrieve display address.");
 
-  framebuffer.ptr = (void *) address;
+  /* For some reason sparc64 uses 32-bit pointer too.  */
+  framebuffer.ptr = (void *) (grub_addr_t) address;
 
   grub_video_ieee1275_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
 				   grub_video_fbstd_colors);

From 8d7f2981d06ab50e7aef4084ce56e33b1f3ed4c7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Mar 2010 16:55:51 +0100
Subject: [PATCH 0607/1628] Remove leftover date*.mo on sparc64

---
 conf/sparc64-ieee1275.rmk | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index c29f15d14..f8a160e40 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -101,21 +101,4 @@ datetime_mod_SOURCES = lib/ieee1275/datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-pkglib_MODULES += datetime.mod date.mod datehook.mod
-
-# For datetime.mod
-datetime_mod_SOURCES = lib/ieee1275/datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For date.mod
-date_mod_SOURCES = commands/date.c
-date_mod_CFLAGS = $(COMMON_CFLAGS)
-date_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datehook.mod
-datehook_mod_SOURCES = hook/datehook.c
-datehook_mod_CFLAGS = $(COMMON_CFLAGS)
-datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 include $(srcdir)/conf/common.mk

From 9b6e10bbbfc52a2a5f121e3b999e836114fa5417 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Mar 2010 23:18:13 +0100
Subject: [PATCH 0608/1628] Handle defered device registration

---
 disk/ata.c | 92 +++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 29 deletions(-)

diff --git a/disk/ata.c b/disk/ata.c
index 662fe71a7..b2291cd53 100644
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -332,11 +332,38 @@ grub_ata_identify (struct grub_ata_device *dev)
   return 0;
 }
 
+static grub_err_t
+check_device (struct grub_ata_device *dev)
+{
+  grub_ata_regset (dev, GRUB_ATA_REG_DISK, dev->device << 4);
+  grub_ata_wait ();
+
+  /* Try to detect if the port is in use by writing to it,
+     waiting for a while and reading it again.  If the value
+     was preserved, there is a device connected.  */
+  grub_ata_regset (dev, GRUB_ATA_REG_SECTORS, 0x5A);
+  grub_ata_wait ();
+  grub_uint8_t sec = grub_ata_regget (dev, GRUB_ATA_REG_SECTORS);
+  grub_dprintf ("ata", "sectors=0x%x\n", sec);
+  if (sec != 0x5A)
+    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no device connected");
+
+  /* The above test may detect a second (slave) device
+     connected to a SATA controller which supports only one
+     (master) device.  It is not safe to use the status register
+     READY bit to check for controller channel existence.  Some
+     ATAPI commands (RESET, DIAGNOSTIC) may clear this bit.  */
+
+  /* Use the IDENTIFY DEVICE command to query the device.  */
+  return grub_ata_identify (dev);
+}
+
 static grub_err_t
 grub_ata_device_initialize (int port, int device, int addr, int addr2)
 {
   struct grub_ata_device *dev;
   struct grub_ata_device **devp;
+  grub_err_t err;
 
   grub_dprintf ("ata", "detecting device %d,%d (0x%x, 0x%x)\n",
 		port, device, addr, addr2);
@@ -352,39 +379,14 @@ grub_ata_device_initialize (int port, int device, int addr, int addr2)
   dev->ioaddress2 = addr2 + GRUB_MACHINE_PCI_IO_BASE;
   dev->next = NULL;
 
-  grub_ata_regset (dev, GRUB_ATA_REG_DISK, dev->device << 4);
-  grub_ata_wait ();
-
-  /* Try to detect if the port is in use by writing to it,
-     waiting for a while and reading it again.  If the value
-     was preserved, there is a device connected.  */
-  grub_ata_regset (dev, GRUB_ATA_REG_SECTORS, 0x5A);
-  grub_ata_wait ();
-  grub_uint8_t sec = grub_ata_regget (dev, GRUB_ATA_REG_SECTORS);
-  grub_dprintf ("ata", "sectors=0x%x\n", sec);
-  if (sec != 0x5A)
-    {
-      grub_free(dev);
-      return 0;
-    }
-
-  /* The above test may detect a second (slave) device
-     connected to a SATA controller which supports only one
-     (master) device.  It is not safe to use the status register
-     READY bit to check for controller channel existence.  Some
-     ATAPI commands (RESET, DIAGNOSTIC) may clear this bit.  */
-
-  /* Use the IDENTIFY DEVICE command to query the device.  */
-  if (grub_ata_identify (dev))
-    {
-      grub_free (dev);
-      return 0;
-    }
-
   /* Register the device.  */
   for (devp = &grub_ata_devices; *devp; devp = &(*devp)->next);
   *devp = dev;
 
+  err = check_device (dev);
+  if (err)
+    grub_print_error ();
+
   return 0;
 }
 
@@ -667,6 +669,14 @@ grub_ata_iterate (int (*hook) (const char *name))
   for (dev = grub_ata_devices; dev; dev = dev->next)
     {
       char devname[10];
+      grub_err_t err;
+
+      err = check_device (dev);
+      if (err)
+	{
+	  grub_errno = GRUB_ERR_NONE;
+	  continue;
+	}
 
       if (dev->atapi)
 	continue;
@@ -685,6 +695,7 @@ static grub_err_t
 grub_ata_open (const char *name, grub_disk_t disk)
 {
   struct grub_ata_device *dev;
+  grub_err_t err;
 
   for (dev = grub_ata_devices; dev; dev = dev->next)
     {
@@ -701,6 +712,11 @@ grub_ata_open (const char *name, grub_disk_t disk)
   if (dev->atapi)
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not an ATA harddisk");
 
+  err = check_device (dev);
+
+  if (err)
+    return err;
+
   disk->total_sectors = dev->size;
 
   disk->id = (unsigned long) dev;
@@ -757,6 +773,16 @@ grub_atapi_iterate (int (*hook) (const char *name, int luns))
   for (dev = grub_ata_devices; dev; dev = dev->next)
     {
       char devname[10];
+
+      grub_err_t err;
+
+      err = check_device (dev);
+      if (err)
+	{
+	  grub_errno = GRUB_ERR_NONE;
+	  continue;
+	}
+
       grub_snprintf (devname, sizeof (devname),
 		     "ata%d", dev->port * 2 + dev->device);
 
@@ -827,6 +853,7 @@ grub_atapi_open (const char *name, struct grub_scsi *scsi)
 {
   struct grub_ata_device *dev;
   struct grub_ata_device *devfnd = 0;
+  grub_err_t err;
 
   for (dev = grub_ata_devices; dev; dev = dev->next)
     {
@@ -846,6 +873,13 @@ grub_atapi_open (const char *name, struct grub_scsi *scsi)
   if (! devfnd)
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no such ATAPI device");
 
+  err = check_device (devfnd);
+  if (err)
+    return err;
+
+  if (! devfnd->atapi)
+    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no such ATAPI device");
+
   scsi->data = devfnd;
 
   return GRUB_ERR_NONE;

From 1159bdce4a53adba09be544cfe87a02bfe0dea21 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 14 Mar 2010 23:56:13 +0100
Subject: [PATCH 0609/1628] 	* kern/mm.c (grub_real_malloc): Satisfy
 alignment requirement when         extra == 0.

---
 ChangeLog.memalign_fix |  4 ++++
 kern/mm.c              | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 ChangeLog.memalign_fix

diff --git a/ChangeLog.memalign_fix b/ChangeLog.memalign_fix
new file mode 100644
index 000000000..3dac2e51c
--- /dev/null
+++ b/ChangeLog.memalign_fix
@@ -0,0 +1,4 @@
+2010-03-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/mm.c (grub_real_malloc): Satisfy alignment requirement when
+        extra == 0.
\ No newline at end of file
diff --git a/kern/mm.c b/kern/mm.c
index ef97b018e..9720a8b9d 100644
--- a/kern/mm.c
+++ b/kern/mm.c
@@ -223,7 +223,7 @@ grub_real_malloc (grub_mm_header_t *first, grub_size_t n, grub_size_t align)
 	      q->next = p->next;
 	      p->magic = GRUB_MM_ALLOC_MAGIC;
 	    }
-	  else if (extra == 0 || p->size == n + extra)
+	  else if (align == 1 || p->size == n + extra)
 	    {
 	      /* There might be alignment requirement, when taking it into
 	         account memory block fits in.
@@ -240,11 +240,25 @@ grub_real_malloc (grub_mm_header_t *first, grub_size_t n, grub_size_t align)
 	         | alloc, size=n |        |
 	         +---------------+        v
 	       */
+
 	      p->size -= n;
 	      p += p->size;
 	      p->size = n;
 	      p->magic = GRUB_MM_ALLOC_MAGIC;
 	    }
+	  else if (extra == 0)
+	    {
+	      grub_mm_header_t r;
+
+	      p->magic = GRUB_MM_ALLOC_MAGIC;
+	      p->size = n;
+	      
+	      r = p + extra + n;
+	      r->magic = GRUB_MM_FREE_MAGIC;
+	      r->size = p->size - extra - n;
+	      r->next = p->next;
+	      q->next = r;
+	    }
 	  else
 	    {
 	      /* There is alignment requirement and there is room in memory

From dfed5c6bb4d16a453139a058487f7767b37b5478 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 15 Mar 2010 11:49:27 +0100
Subject: [PATCH 0610/1628] Removed grub_putchar

---
 commands/cat.c            |   4 +-
 commands/handler.c        |   2 +-
 commands/ls.c             |   4 +-
 commands/minicmd.c        |   8 +-
 commands/read.c           |   2 +-
 font/font.c               |   2 +-
 include/grub/charset.h    |   6 ++
 include/grub/misc.h       |  19 +++--
 include/grub/term.h       |  18 ++++-
 kern/corecmd.c            |   4 +-
 kern/misc.c               | 151 ++++++++------------------------------
 kern/rescue_reader.c      |  15 ++--
 kern/term.c               |  30 +++-----
 lib/arg.c                 |  17 +----
 lib/charset.c             |  94 ++++++++++++++++++++++++
 lib/crypto.c              |   2 +-
 normal/auth.c             |   4 +-
 normal/cmdline.c          |   2 +-
 normal/menu.c             |   4 +-
 normal/menu_entry.c       |   3 +-
 normal/menu_text.c        |   2 +-
 normal/misc.c             |  12 +--
 normal/term.c             |   1 +
 term/gfxterm.c            |   2 +-
 term/i386/pc/vga.c        |   2 +-
 term/serial.c             |   4 +-
 util/grub-editenv.c       |  14 ++--
 util/grub-fstest.c        |   8 +-
 util/grub-probe.c         |   8 +-
 util/grub-script-check.c  |   8 +-
 util/i386/pc/grub-setup.c |   8 +-
 31 files changed, 241 insertions(+), 219 deletions(-)

diff --git a/commands/cat.c b/commands/cat.c
index 3bdafc4c6..427da14e3 100644
--- a/commands/cat.c
+++ b/commands/cat.c
@@ -53,7 +53,7 @@ grub_cmd_cat (grub_command_t cmd __attribute__ ((unused)),
 	  unsigned char c = buf[i];
 
 	  if ((grub_isprint (c) || grub_isspace (c)) && c != '\r')
-	    grub_putchar (c);
+	    grub_printf ("%c", c);
 	  else
 	    {
 	      grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
@@ -67,7 +67,7 @@ grub_cmd_cat (grub_command_t cmd __attribute__ ((unused)),
 	;
     }
 
-  grub_putchar ('\n');
+  grub_xputs ("\n");
   grub_refresh ();
   grub_file_close (file);
 
diff --git a/commands/handler.c b/commands/handler.c
index f9270972b..1e24f2091 100644
--- a/commands/handler.c
+++ b/commands/handler.c
@@ -36,7 +36,7 @@ grub_cmd_handler (struct grub_command *cmd __attribute__ ((unused)),
   int list_item (grub_named_list_t item)
     {
       if (item == curr_item)
-	grub_putchar ('*');
+	grub_xputs ("*");
 
       grub_printf ("%s\n", item->name);
 
diff --git a/commands/ls.c b/commands/ls.c
index eb1049617..9ee0a7a31 100644
--- a/commands/ls.c
+++ b/commands/ls.c
@@ -57,7 +57,7 @@ grub_ls_list_devices (int longlist)
     }
 
   grub_device_iterate (grub_ls_print_devices);
-  grub_putchar ('\n');
+  grub_xputs ("\n");
   grub_refresh ();
 
   return 0;
@@ -233,7 +233,7 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
 	}
 
       if (grub_errno == GRUB_ERR_NONE)
-	grub_putchar ('\n');
+	grub_xputs ("\n");
 
       grub_refresh ();
     }
diff --git a/commands/minicmd.c b/commands/minicmd.c
index 4ea9efead..4d0ae19b4 100644
--- a/commands/minicmd.c
+++ b/commands/minicmd.c
@@ -54,7 +54,7 @@ grub_mini_cmd_cat (struct grub_command *cmd __attribute__ ((unused)),
 	  unsigned char c = buf[i];
 
 	  if ((grub_isprint (c) || grub_isspace (c)) && c != '\r')
-	    grub_putchar (c);
+	    grub_printf ("%c", c);
 	  else
 	    {
 	      grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
@@ -64,7 +64,7 @@ grub_mini_cmd_cat (struct grub_command *cmd __attribute__ ((unused)),
 	}
     }
 
-  grub_putchar ('\n');
+  grub_xputs ("\n");
   grub_refresh ();
   grub_file_close (file);
 
@@ -311,11 +311,11 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
       for (dep = mod->dep; dep; dep = dep->next)
 	{
 	  if (dep != mod->dep)
-	    grub_putchar (',');
+	    grub_xputs (",");
 
 	  grub_printf ("%s", dep->mod->name);
 	}
-      grub_putchar ('\n');
+      grub_xputs ("\n");
 
       return 0;
     }
diff --git a/commands/read.c b/commands/read.c
index 8a7c4a01f..6a187fc3e 100644
--- a/commands/read.c
+++ b/commands/read.c
@@ -47,7 +47,7 @@ grub_getline (void)
 
       line[i] = c;
       if (grub_isprint (c))
-	grub_putchar (c);
+	grub_printf ("%c", c);
       i++;
       tmp = grub_realloc (line, 1 + i + sizeof('\0'));
       if (! tmp)
diff --git a/font/font.c b/font/font.c
index 0da22d011..c4e7093d6 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1315,7 +1315,7 @@ grub_font_construct_glyph (grub_font_t hinted_font,
 
   /* Glyph not available in any font.  Use ASCII fallback.  */
   if (!main_glyph)
-    main_glyph = ascii_glyph_lookup (code);
+    main_glyph = ascii_glyph_lookup (glyph_id->base);
 
   /* Glyph not available in any font.  Return unknown glyph.  */
   if (!main_glyph)
diff --git a/include/grub/charset.h b/include/grub/charset.h
index fc050da24..834705a99 100644
--- a/include/grub/charset.h
+++ b/include/grub/charset.h
@@ -118,4 +118,10 @@ grub_is_valid_utf8 (const grub_uint8_t *src, grub_size_t srcsize);
 int grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg,
 			     grub_uint32_t **last_position);
 
+grub_size_t grub_utf8_to_ucs4 (grub_uint32_t *dest,
+			       grub_size_t destsize,
+			       const grub_uint8_t *src,
+			       grub_size_t srcsize,
+			       const grub_uint8_t **srcend);
+
 #endif
diff --git a/include/grub/misc.h b/include/grub/misc.h
index dcbafba87..424026109 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -237,7 +237,19 @@ void *EXPORT_FUNC(grub_memset) (void *s, int c, grub_size_t n);
 grub_size_t EXPORT_FUNC(grub_strlen) (const char *s);
 int EXPORT_FUNC(grub_printf) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
 int EXPORT_FUNC(grub_printf_) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
-int EXPORT_FUNC(grub_puts) (const char *s);
+
+extern void (*EXPORT_VAR (grub_xputs)) (const char *str);
+
+static inline int
+grub_puts (const char *s)
+{
+  const char nl[2] = "\n";
+  grub_xputs (s);
+  grub_xputs (nl);
+
+  return 1;	/* Cannot fail.  */
+}
+
 int EXPORT_FUNC(grub_puts_) (const char *s);
 void EXPORT_FUNC(grub_real_dprintf) (const char *file,
                                      const int line,
@@ -253,11 +265,6 @@ char *EXPORT_FUNC(grub_xasprintf) (const char *fmt, ...)
 char *EXPORT_FUNC(grub_xvasprintf) (const char *fmt, va_list args);
 void EXPORT_FUNC(grub_exit) (void) __attribute__ ((noreturn));
 void EXPORT_FUNC(grub_abort) (void) __attribute__ ((noreturn));
-grub_size_t EXPORT_FUNC(grub_utf8_to_ucs4) (grub_uint32_t *dest,
-					    grub_size_t destsize,
-					    const grub_uint8_t *src,
-					    grub_size_t srcsize,
-					    const grub_uint8_t **srcend);
 grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
 					  grub_uint32_t d, grub_uint32_t *r);
 
diff --git a/include/grub/term.h b/include/grub/term.h
index 143aabe1e..319196b7b 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -63,11 +63,22 @@ grub_term_color_state;
    to NULL.  */
 
 /* Set when input characters shouldn't be echoed back.  */
-#define GRUB_TERM_NO_ECHO	(1 << 0)
+#define GRUB_TERM_NO_ECHO	        (1 << 0)
 /* Set when the editing feature should be disabled.  */
-#define GRUB_TERM_NO_EDIT	(1 << 1)
+#define GRUB_TERM_NO_EDIT	        (1 << 1)
 /* Set when the terminal cannot do fancy things.  */
-#define GRUB_TERM_DUMB		(1 << 2)
+#define GRUB_TERM_DUMB		        (1 << 2)
+/* Which encoding does terminal expect stream to be.  */
+#define GRUB_TERM_CODE_TYPE_MASK	        ((1 << 5) | (1 << 4) | (1 << 3))
+/* Only ASCII characters accepted.  */
+#define GRUB_TERM_CODE_TYPE_ASCII	        0
+/* Expects VGA characters (ASCII + pseudographics).  */
+#define GRUB_TERM_CODE_TYPE_VGA	                (1 << 3)
+/* UTF-8 stream in logical order. Usually used for terminals
+   which just forward the stream to another computer.  */
+#define GRUB_TERM_CODE_TYPE_UTF8_LOGICAL	(1 << 4)
+/* UCS-4 in visual order.  */
+#define GRUB_TERM_CODE_TYPE_UCS4_VISUAL	        ((1 << 4) | (1 << 3))
 
 
 /* Bitmasks for modifier keys returned by grub_getkeystatus.  */
@@ -250,7 +261,6 @@ grub_term_unregister_output (grub_term_output_t term)
 #define FOR_ACTIVE_TERM_OUTPUTS(var) for (var = grub_term_outputs; var; var = var->next)
 #define FOR_DISABLED_TERM_OUTPUTS(var) for (var = grub_term_outputs_disabled; var; var = var->next)
 
-void EXPORT_FUNC(grub_putchar) (int c);
 void EXPORT_FUNC(grub_putcode) (grub_uint32_t code,
 				struct grub_term_output *term);
 int EXPORT_FUNC(grub_getkey) (void);
diff --git a/kern/corecmd.c b/kern/corecmd.c
index 8b8df63cb..81b4d5f25 100644
--- a/kern/corecmd.c
+++ b/kern/corecmd.c
@@ -121,7 +121,7 @@ grub_core_cmd_ls (struct grub_command *cmd __attribute__ ((unused)),
   if (argc < 1)
     {
       grub_device_iterate (grub_mini_print_devices);
-      grub_putchar ('\n');
+      grub_xputs ("\n");
       grub_refresh ();
     }
   else
@@ -160,7 +160,7 @@ grub_core_cmd_ls (struct grub_command *cmd __attribute__ ((unused)),
       else if (fs)
 	{
 	  (fs->dir) (dev, path, grub_mini_print_files);
-	  grub_putchar ('\n');
+	  grub_xputs ("\n");
 	  grub_refresh ();
 	}
 
diff --git a/kern/misc.c b/kern/misc.c
index 4772e22b0..156b0650c 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -142,19 +142,6 @@ grub_printf_ (const char *fmt, ...)
   return ret;
 }
 
-int
-grub_puts (const char *s)
-{
-  while (*s)
-    {
-      grub_putchar (*s);
-      s++;
-    }
-  grub_putchar ('\n');
-
-  return 1;	/* Cannot fail.  */
-}
-
 int
 grub_puts_ (const char *s)
 {
@@ -200,13 +187,37 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
     }
 }
 
+#define PREALLOC_SIZE 255
+
 int
 grub_vprintf (const char *fmt, va_list args)
 {
-  int ret;
+  grub_size_t s;
+  static char buf[PREALLOC_SIZE + 1];
+  char *curbuf = buf;
 
-  ret = grub_vsnprintf_real (0, 0, fmt, args);
-  return ret;
+  s = grub_vsnprintf_real (buf, PREALLOC_SIZE, fmt, args);
+  if (s > PREALLOC_SIZE)
+    {
+      curbuf = grub_malloc (s + 1);
+      if (!curbuf)
+	{
+	  grub_errno = GRUB_ERR_NONE;
+	  buf[PREALLOC_SIZE - 3] = '.';
+	  buf[PREALLOC_SIZE - 2] = '.';
+	  buf[PREALLOC_SIZE - 1] = '.';
+	  buf[PREALLOC_SIZE] = 0;
+	}
+      else
+	s = grub_vsnprintf_real (curbuf, s, fmt, args);
+    }
+
+  grub_xputs (curbuf);
+
+  if (curbuf != buf)
+    grub_free (curbuf);
+  
+  return s;
 }
 
 int
@@ -649,13 +660,8 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt, va_list ar
 
   void write_char (unsigned char ch)
     {
-      if (str)
-	{
-	  if (count < max_len)
-	    *str++ = ch;
-	}
-      else
-	grub_putchar (ch);
+      if (count < max_len)
+	*str++ = ch;
 
       count++;
     }
@@ -872,8 +878,7 @@ grub_vsnprintf_real (char *str, grub_size_t max_len, const char *fmt, va_list ar
 	}
     }
 
-  if (str)
-    *str = '\0';
+  *str = '\0';
 
   return count;
 }
@@ -906,8 +911,6 @@ grub_snprintf (char *str, grub_size_t n, const char *fmt, ...)
   return ret;
 }
 
-#define PREALLOC_SIZE 255
-
 char *
 grub_xvasprintf (const char *fmt, va_list ap)
 {
@@ -942,100 +945,6 @@ grub_xasprintf (const char *fmt, ...)
   return ret;
 }
 
-/* Convert a (possibly null-terminated) UTF-8 string of at most SRCSIZE
-   bytes (if SRCSIZE is -1, it is ignored) in length to a UCS-4 string.
-   Return the number of characters converted. DEST must be able to hold
-   at least DESTSIZE characters.
-   If SRCEND is not NULL, then *SRCEND is set to the next byte after the
-   last byte used in SRC.  */
-grub_size_t
-grub_utf8_to_ucs4 (grub_uint32_t *dest, grub_size_t destsize,
-		   const grub_uint8_t *src, grub_size_t srcsize,
-		   const grub_uint8_t **srcend)
-{
-  grub_uint32_t *p = dest;
-  int count = 0;
-  grub_uint32_t code = 0;
-
-  if (srcend)
-    *srcend = src;
-
-  while (srcsize && destsize)
-    {
-      grub_uint32_t c = *src++;
-      if (srcsize != (grub_size_t)-1)
-	srcsize--;
-      if (count)
-	{
-	  if ((c & 0xc0) != 0x80)
-	    {
-	      /* invalid */
-	      code = '?';
-	      /* Character c may be valid, don't eat it.  */
-	      src--;
-	      if (srcsize != (grub_size_t)-1)
-		srcsize++;
-	      count = 0;
-	    }
-	  else
-	    {
-	      code <<= 6;
-	      code |= (c & 0x3f);
-	      count--;
-	    }
-	}
-      else
-	{
-	  if (c == 0)
-	    break;
-
-	  if ((c & 0x80) == 0x00)
-	    code = c;
-	  else if ((c & 0xe0) == 0xc0)
-	    {
-	      count = 1;
-	      code = c & 0x1f;
-	    }
-	  else if ((c & 0xf0) == 0xe0)
-	    {
-	      count = 2;
-	      code = c & 0x0f;
-	    }
-	  else if ((c & 0xf8) == 0xf0)
-	    {
-	      count = 3;
-	      code = c & 0x07;
-	    }
-	  else if ((c & 0xfc) == 0xf8)
-	    {
-	      count = 4;
-	      code = c & 0x03;
-	    }
-	  else if ((c & 0xfe) == 0xfc)
-	    {
-	      count = 5;
-	      code = c & 0x01;
-	    }
-	  else
-	    {
-	      /* invalid */
-	      code = '?';
-	      count = 0;
-	    }
-	}
-
-      if (count == 0)
-	{
-	  *p++ = code;
-	  destsize--;
-	}
-    }
-
-  if (srcend)
-    *srcend = src;
-  return p - dest;
-}
-
 /* Abort GRUB. This function does not return.  */
 void
 grub_abort (void)
diff --git a/kern/rescue_reader.c b/kern/rescue_reader.c
index f573cf41f..28e43cbfd 100644
--- a/kern/rescue_reader.c
+++ b/kern/rescue_reader.c
@@ -34,6 +34,7 @@ grub_rescue_read_line (char **line, int cont)
 {
   int c;
   int pos = 0;
+  char str[4];
 
   grub_printf ((cont) ? "> " : "grub rescue> ");
   grub_memset (linebuf, 0, GRUB_RESCUE_BUF_SIZE);
@@ -44,24 +45,28 @@ grub_rescue_read_line (char **line, int cont)
 	{
 	  if (pos < GRUB_RESCUE_BUF_SIZE - 1)
 	    {
+	      str[0] = c;
+	      str[1] = 0;
 	      linebuf[pos++] = c;
-	      grub_putchar (c);
+	      grub_xputs (str);
 	    }
 	}
       else if (c == '\b')
 	{
 	  if (pos > 0)
 	    {
+	      str[0] = c;
+	      str[1] = ' ';
+	      str[2] = c;
+	      str[3] = 0;
 	      linebuf[--pos] = 0;
-	      grub_putchar (c);
-	      grub_putchar (' ');
-	      grub_putchar (c);
+	      grub_xputs (str);
 	    }
 	}
       grub_refresh ();
     }
 
-  grub_putchar ('\n');
+  grub_xputs ("\n");
   grub_refresh ();
 
   *line = grub_strdup (linebuf);
diff --git a/kern/term.c b/kern/term.c
index 6e3a2b454..bd1dfc65f 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -50,31 +50,23 @@ grub_putcode (grub_uint32_t code, struct grub_term_output *term)
     (term->putchar) ('\r');
 }
 
-/* Put a character. C is one byte of a UTF-8 stream.
-   This function gathers bytes until a valid Unicode character is found.  */
-void
-grub_putchar (int c)
+static void
+grub_xputs_dumb (const char *str)
 {
-  static grub_size_t size = 0;
-  static grub_uint8_t buf[6];
-  grub_uint8_t *rest;
-  grub_uint32_t code;
-
-  buf[size++] = c;
-
-  while (grub_utf8_to_ucs4 (&code, 1, buf, size, (const grub_uint8_t **) &rest) 
-	 != 0)
+  for (; *str; str++)
     {
-      struct grub_term_output *term;
-      size -= rest - buf;
-      grub_memmove (buf, rest, size);
+      grub_term_output_t term;
+
+      char c = *str;
+      if ((unsigned char) c > 0x7f)
+	c = '?';
       FOR_ACTIVE_TERM_OUTPUTS(term)
-	grub_putcode (code, term);
-      if (code == '\n' && grub_newline_hook)
-	grub_newline_hook ();
+	grub_putcode (c, term);
     }
 }
 
+void (*grub_xputs) (const char *str) = grub_xputs_dumb;
+
 int
 grub_getkey (void)
 {
diff --git a/lib/arg.c b/lib/arg.c
index 6a7bb8beb..400314d30 100644
--- a/lib/arg.c
+++ b/lib/arg.c
@@ -144,21 +144,8 @@ grub_arg_show_help (grub_extcmd_t cmd)
 		}
 	    }
 
-	  const char *doc = _(opt->doc);
-	  for (;;)
-	    {
-	      while (spacing-- > 0)
-		grub_putchar (' ');
-
-	      while (*doc && *doc != '\n')
-		grub_putchar (*doc++);
-	      grub_putchar ('\n');
-
-	      if (! *doc)
-		break;
-	      doc++;
-	      spacing = 4 + 20;
-	    }
+	  /* FIXME: add spacing back.  */
+	  grub_xputs (_(opt->doc));
 
 	  switch (opt->shortarg)
 	    {
diff --git a/lib/charset.c b/lib/charset.c
index f2e1b036d..52810da48 100644
--- a/lib/charset.c
+++ b/lib/charset.c
@@ -267,3 +267,97 @@ grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg,
 
   return msg_len;
 }
+
+/* Convert a (possibly null-terminated) UTF-8 string of at most SRCSIZE
+   bytes (if SRCSIZE is -1, it is ignored) in length to a UCS-4 string.
+   Return the number of characters converted. DEST must be able to hold
+   at least DESTSIZE characters.
+   If SRCEND is not NULL, then *SRCEND is set to the next byte after the
+   last byte used in SRC.  */
+grub_size_t
+grub_utf8_to_ucs4 (grub_uint32_t *dest, grub_size_t destsize,
+		   const grub_uint8_t *src, grub_size_t srcsize,
+		   const grub_uint8_t **srcend)
+{
+  grub_uint32_t *p = dest;
+  int count = 0;
+  grub_uint32_t code = 0;
+
+  if (srcend)
+    *srcend = src;
+
+  while (srcsize && destsize)
+    {
+      grub_uint32_t c = *src++;
+      if (srcsize != (grub_size_t)-1)
+	srcsize--;
+      if (count)
+	{
+	  if ((c & 0xc0) != 0x80)
+	    {
+	      /* invalid */
+	      code = '?';
+	      /* Character c may be valid, don't eat it.  */
+	      src--;
+	      if (srcsize != (grub_size_t)-1)
+		srcsize++;
+	      count = 0;
+	    }
+	  else
+	    {
+	      code <<= 6;
+	      code |= (c & 0x3f);
+	      count--;
+	    }
+	}
+      else
+	{
+	  if (c == 0)
+	    break;
+
+	  if ((c & 0x80) == 0x00)
+	    code = c;
+	  else if ((c & 0xe0) == 0xc0)
+	    {
+	      count = 1;
+	      code = c & 0x1f;
+	    }
+	  else if ((c & 0xf0) == 0xe0)
+	    {
+	      count = 2;
+	      code = c & 0x0f;
+	    }
+	  else if ((c & 0xf8) == 0xf0)
+	    {
+	      count = 3;
+	      code = c & 0x07;
+	    }
+	  else if ((c & 0xfc) == 0xf8)
+	    {
+	      count = 4;
+	      code = c & 0x03;
+	    }
+	  else if ((c & 0xfe) == 0xfc)
+	    {
+	      count = 5;
+	      code = c & 0x01;
+	    }
+	  else
+	    {
+	      /* invalid */
+	      code = '?';
+	      count = 0;
+	    }
+	}
+
+      if (count == 0)
+	{
+	  *p++ = code;
+	  destsize--;
+	}
+    }
+
+  if (srcend)
+    *srcend = src;
+  return p - dest;
+}
diff --git a/lib/crypto.c b/lib/crypto.c
index d11f0994f..6bd038168 100644
--- a/lib/crypto.c
+++ b/lib/crypto.c
@@ -445,7 +445,7 @@ grub_password_get (char buf[], unsigned buf_size)
 
   grub_memset (buf + cur_len, 0, buf_size - cur_len);
 
-  grub_putchar ('\n');
+  grub_xputs ("\n");
   grub_refresh ();
 
   return (key != '\e');
diff --git a/normal/auth.c b/normal/auth.c
index 156b84c37..6a7963458 100644
--- a/normal/auth.c
+++ b/normal/auth.c
@@ -185,13 +185,13 @@ grub_username_get (char buf[], unsigned buf_size)
       if (cur_len + 2 < buf_size)
 	{
 	  buf[cur_len++] = key;
-	  grub_putchar (key);
+	  grub_printf ("%c", key);
 	}
     }
 
   grub_memset (buf + cur_len, 0, buf_size - cur_len);
 
-  grub_putchar ('\n');
+  grub_xputs ("\n");
   grub_refresh ();
 
   return (key != '\e');
diff --git a/normal/cmdline.c b/normal/cmdline.c
index 05d665411..f10dc47fe 100644
--- a/normal/cmdline.c
+++ b/normal/cmdline.c
@@ -614,7 +614,7 @@ grub_cmdline_get (const char *prompt)
       grub_refresh ();
     }
 
-  grub_putchar ('\n');
+  grub_xputs ("\n");
   grub_refresh ();
 
   /* Remove leading spaces.  */
diff --git a/normal/menu.c b/normal/menu.c
index 07951dacc..2e722c0a6 100644
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -42,10 +42,10 @@ grub_err_t (*grub_gfxmenu_try_hook) (int entry, grub_menu_t menu,
 void
 grub_wait_after_message (void)
 {
-  grub_putchar ('\n');
+  grub_xputs ("\n");
   grub_printf_ (N_("Press any key to continue..."));
   (void) grub_getkey ();
-  grub_putchar ('\n');
+  grub_xputs ("\n");
 }
 
 /* Get a menu entry by its index in the entry list.  */
diff --git a/normal/menu_entry.c b/normal/menu_entry.c
index 644fe90fd..74887b8ab 100644
--- a/normal/menu_entry.c
+++ b/normal/menu_entry.c
@@ -25,6 +25,7 @@
 #include <grub/parser.h>
 #include <grub/auth.h>
 #include <grub/i18n.h>
+#include <grub/charset.h>
 
 enum update_mode
   {
@@ -1393,7 +1394,7 @@ grub_menu_entry_run (grub_menu_entry_t entry)
   grub_cls ();
   grub_print_error ();
   grub_errno = GRUB_ERR_NONE;
-  grub_putchar ('\n');
+  grub_xputs ("\n");
   grub_printf_ (N_("Press any key to continue..."));
   (void) grub_getkey ();
 }
diff --git a/normal/menu_text.c b/normal/menu_text.c
index b39f57512..53aed35b7 100644
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -191,7 +191,7 @@ command-line or ESC to return menu."), STANDARD_MARGIN, STANDARD_MARGIN,
 				     (grub_uint32_t) GRUB_TERM_DISP_DOWN);
       if (!msg_translated)
 	return;
-      grub_putchar ('\n');
+      grub_xputs ("\n");
       grub_print_message_indented (msg_translated, STANDARD_MARGIN,
 				   STANDARD_MARGIN, term);
 
diff --git a/normal/misc.c b/normal/misc.c
index 17ba372ce..2b84b1c82 100644
--- a/normal/misc.c
+++ b/normal/misc.c
@@ -37,14 +37,14 @@ grub_normal_print_device_info (const char *name)
   p = grub_strchr (name, ',');
   if (p)
     {
-      grub_putchar ('\t');
+      grub_xputs ("\t");
       grub_printf_ (N_("Partition %s:"), name);
-      grub_putchar (' ');
+      grub_xputs (" ");
     }
   else
     {
       grub_printf_ (N_("Device %s:"), name);
-      grub_putchar (' ');
+      grub_xputs (" ");
     }
 
   dev = grub_device_open (name);
@@ -69,7 +69,7 @@ grub_normal_print_device_info (const char *name)
 		{
 		  if (label && grub_strlen (label))
 		    {
-		      grub_putchar (' ');
+		      grub_xputs (" ");
 		      grub_printf_ (N_("- Label \"%s\""), label);
 		    }
 		  grub_free (label);
@@ -84,7 +84,7 @@ grub_normal_print_device_info (const char *name)
 	      if (grub_errno == GRUB_ERR_NONE)
 		{
 		  grub_unixtime2datetime (tm, &datetime);
-		  grub_putchar (' ');
+		  grub_xputs (" ");
 		  grub_printf_ (N_("- Last modification time %d-%02d-%02d "
 			       "%02d:%02d:%02d %s"),
 			       datetime.year, datetime.month, datetime.day,
@@ -115,6 +115,6 @@ grub_normal_print_device_info (const char *name)
       grub_device_close (dev);
     }
 
-  grub_putchar ('\n');
+  grub_xputs ("\n");
   return grub_errno;
 }
diff --git a/normal/term.c b/normal/term.c
index 7bedd6799..8a974d035 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -23,6 +23,7 @@
 #include <grub/dl.h>
 #include <grub/env.h>
 #include <grub/normal.h>
+#include <grub/charset.h>
 
 /* The amount of lines counted by the pager.  */
 static unsigned grub_more_lines;
diff --git a/term/gfxterm.c b/term/gfxterm.c
index a1409980b..e9d343317 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -840,7 +840,7 @@ grub_gfxterm_putchar (grub_uint32_t c)
 
       /* If we are about to exceed line length, wrap to next line.  */
       if (virtual_screen.cursor_x + char_width > virtual_screen.columns)
-        grub_putchar ('\n');
+        grub_gfxterm_putchar ('\n');
 
       /* Find position on virtual screen, and fill information.  */
       p = (virtual_screen.text_buffer +
diff --git a/term/i386/pc/vga.c b/term/i386/pc/vga.c
index 402b30fe6..addb0bcbb 100644
--- a/term/i386/pc/vga.c
+++ b/term/i386/pc/vga.c
@@ -334,7 +334,7 @@ grub_vga_putchar (grub_uint32_t c)
       glyph = grub_font_get_glyph(font, c);
 
       if (xpos + char_width > TEXT_WIDTH)
-	grub_putchar ('\n');
+	grub_vga_putchar ('\n');
 
       p = text_buf + xpos + ypos * TEXT_WIDTH;
       p->code = c;
diff --git a/term/serial.c b/term/serial.c
index 05497ce40..1ef881f63 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -388,8 +388,8 @@ grub_serial_putchar (grub_uint32_t c)
 	default:
 	  if (xpos >= TEXT_WIDTH)
 	    {
-	      grub_putchar ('\r');
-	      grub_putchar ('\n');
+	      grub_serial_putchar ('\r');
+	      grub_serial_putchar ('\n');
 	    }
 	  xpos++;
 	  break;
diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index f21042c97..cb2eaf823 100644
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -34,12 +34,6 @@
 
 #define DEFAULT_ENVBLK_SIZE	1024
 
-void
-grub_putchar (int c)
-{
-  putchar (c);
-}
-
 void
 grub_refresh (void)
 {
@@ -52,6 +46,14 @@ grub_getkey (void)
   return 0;
 }
 
+void 
+grub_xputs_real (const char *str)
+{
+  fputs (str, stdout);
+}
+
+void (*grub_xputs) (const char *str) = grub_xputs_real;
+
 char *
 grub_env_get (const char *name __attribute__ ((unused)))
 {
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index c03c43451..5a773ad75 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -43,12 +43,14 @@
 
 #include "progname.h"
 
-void
-grub_putchar (int c)
+void 
+grub_xputs_real (const char *str)
 {
-  putchar (c);
+  fputs (str, stdout);
 }
 
+void (*grub_xputs) (const char *str) = grub_xputs_real;
+
 int
 grub_getkey (void)
 {
diff --git a/util/grub-probe.c b/util/grub-probe.c
index ba2fe4c35..782cd0367 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -58,12 +58,14 @@ enum {
 int print = PRINT_FS;
 static unsigned int argument_is_device = 0;
 
-void
-grub_putchar (int c)
+void 
+grub_xputs_real (const char *str)
 {
-  putchar (c);
+  fputs (str, stdout);
 }
 
+void (*grub_xputs) (const char *str) = grub_xputs_real;
+
 int
 grub_getkey (void)
 {
diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index 0acf3077f..42ff2da85 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -39,12 +39,14 @@
 
 #include "progname.h"
 
-void
-grub_putchar (int c)
+void 
+grub_xputs_real (const char *str)
 {
-  putchar (c);
+  fputs (str, stdout);
 }
 
+void (*grub_xputs) (const char *str) = grub_xputs_real;
+
 int
 grub_getkey (void)
 {
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index ace577f37..1c00837e0 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -57,12 +57,14 @@ static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_P
 #define DEFAULT_BOOT_FILE	"boot.img"
 #define DEFAULT_CORE_FILE	"core.img"
 
-void
-grub_putchar (int c)
+void 
+grub_xputs_real (const char *str)
 {
-  putchar (c);
+  fputs (str, stdout);
 }
 
+void (*grub_xputs) (const char *str) = grub_xputs_real;
+
 int
 grub_getkey (void)
 {

From 0a239a8211b54a38b4ed428b562f6e66d0daeab2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 15 Mar 2010 21:14:11 +0100
Subject: [PATCH 0611/1628] bidi works in terminal in grub-emu

---
 commands/help.c                |  19 +-
 conf/common.rmk                |   7 +-
 font/font.c                    | 576 +++---------------------
 include/grub/charset.h         |   6 +-
 include/grub/font.h            |   8 +
 include/grub/i386/vga_common.h |   6 +-
 include/grub/normal.h          |   2 +
 include/grub/term.h            |  11 +-
 include/grub/unicode.h         |  18 +
 kern/term.c                    |  30 +-
 lib/charset.c                  | 783 +++++++++++++++++++++++++++++++++
 normal/main.c                  |   7 +
 normal/menu_text.c             |  74 ++--
 term/gfxterm.c                 |  86 ++--
 term/i386/pc/console.c         |   3 +-
 term/i386/pc/vesafb.c          |  42 +-
 term/i386/pc/vga.c             |  26 +-
 term/i386/pc/vga_text.c        |   1 +
 term/i386/vga_common.c         |  54 +--
 term/serial.c                  |  60 +--
 term/terminfo.c                |  12 +-
 util/console.c                 |  50 +--
 util/grub-emu.c                |  19 +-
 23 files changed, 1101 insertions(+), 799 deletions(-)

diff --git a/commands/help.c b/commands/help.c
index 1181c3bfb..d56ad49a1 100644
--- a/commands/help.c
+++ b/commands/help.c
@@ -53,23 +53,27 @@ grub_cmd_help (grub_extcmd_t ext __attribute__ ((unused)), int argc,
 
 	  grub_utf8_to_ucs4_alloc (command_help, &unicode_command_help,
 	  			   &unicode_last_position);
-
 	  FOR_ACTIVE_TERM_OUTPUTS(term)
 	  {
 	    unsigned stringwidth;
 	    grub_uint32_t *unicode_last_screen_position;
-
+	    
 	    unicode_last_screen_position = unicode_command_help;
-
+	    
 	    stringwidth = 0;
-
+	    
 	    while (unicode_last_screen_position < unicode_last_position && 
 		   stringwidth < ((grub_term_width (term) / 2) - 2))
 	      {
+		struct grub_unicode_glyph glyph;
+		unicode_last_screen_position 
+		  += grub_unicode_aglomerate_comb (unicode_last_screen_position,
+						   unicode_last_position
+						   - unicode_last_screen_position,
+						   &glyph);
+
 		stringwidth
-		  += grub_term_getcharwidth (term,
-					     *unicode_last_screen_position);
-		unicode_last_screen_position++;
+		  += grub_term_getcharwidth (term, &glyph);
 	      }
 
 	    grub_print_ucs4 (unicode_command_help,
@@ -78,6 +82,7 @@ grub_cmd_help (grub_extcmd_t ext __attribute__ ((unused)), int argc,
 	      grub_print_spaces (term, grub_term_width (term) / 2
 				 - stringwidth);
 	  }
+
 	  if (cnt % 2)
 	    grub_printf ("\n");
 	  cnt++;
diff --git a/conf/common.rmk b/conf/common.rmk
index 80d97706e..3a7dd4f6c 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -636,7 +636,7 @@ keystatus_mod_LDFLAGS = $(COMMON_LDFLAGS)
 normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
 	normal/auth.c normal/autofs.c normal/handler.c \
 	normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
-	normal/menu_entry.c normal/menu_text.c \
+	normal/menu_entry.c normal/menu_text.c lib/charset.c \
 	normal/misc.c normal/crypto.c normal/term.c normal/context.c
 normal_mod_CFLAGS = $(COMMON_CFLAGS)
 normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
@@ -769,11 +769,6 @@ setjmp_mod_SOURCES = lib/$(target_cpu)/setjmp.S
 setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
 setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-pkglib_MODULES += charset.mod
-charset_mod_SOURCES = lib/charset.c
-charset_mod_CFLAGS = $(COMMON_CFLAGS)
-charset_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 pkglib_MODULES += terminal.mod
 terminal_mod_SOURCES = commands/terminal.c
 terminal_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/font/font.c b/font/font.c
index c4e7093d6..a94fe8ed1 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1135,41 +1135,13 @@ grub_font_blit_glyph_mirror (struct grub_font_glyph *target,
     }
 }
 
-static inline enum grub_comb_type
-get_comb_type (grub_uint32_t c)
-{
-  static grub_uint8_t *comb_types = NULL;
-  struct grub_unicode_compact_range *cur;
-
-  if (!comb_types)
-    {
-      unsigned i;
-      comb_types = grub_zalloc (GRUB_UNICODE_MAX_CACHED_CHAR);
-      if (comb_types)
-	for (cur = grub_unicode_compact; cur->end; cur++)
-	  for (i = cur->start; i <= cur->end
-		 && i < GRUB_UNICODE_MAX_CACHED_CHAR; i++)
-	    comb_types[i] = cur->comb_type;
-      else
-	grub_errno = GRUB_ERR_NONE;
-    }
-
-  if (comb_types && c < GRUB_UNICODE_MAX_CACHED_CHAR)
-    return comb_types[c];
-
-  for (cur = grub_unicode_compact; cur->end; cur++)
-    if (cur->start <= c && c <= cur->end)
-      return cur->comb_type;
-
-  return GRUB_BIDI_TYPE_L;
-}
-
 static void
 blit_comb (const struct grub_unicode_glyph *glyph_id,
 	   struct grub_font_glyph *glyph,
 	   struct grub_video_signed_rect *bounds_out,
 	   struct grub_font_glyph *main_glyph,
-	   struct grub_font_glyph **combining_glyphs)
+	   struct grub_font_glyph **combining_glyphs,
+	   int *device_width)
 {
   struct grub_video_signed_rect bounds;
   unsigned i;
@@ -1203,14 +1175,23 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
   {
     if (glyph && glyph->device_width < val)
       glyph->device_width = val;
+    if (device_width && *device_width < val)
+      *device_width = val;
   }
   auto void add_device_width (int val);
   void add_device_width (int val)
   {
     if (glyph)
       glyph->device_width += val;
+    if (device_width)
+      *device_width += val;
   }
 
+  if (glyph)
+    glyph->device_width = main_glyph->device_width;
+  if (device_width)
+    *device_width = main_glyph->device_width;
+
   bounds.x = main_glyph->offset_x;
   bounds.y = main_glyph->offset_y;
   bounds.width = main_glyph->width;
@@ -1231,7 +1212,7 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
       /* CGJ is to avoid diacritics reordering. */
       if (glyph_id->combining[i] == GRUB_UNICODE_COMBINING_GRAPHEME_JOINER)
 	continue;
-      combtype = get_comb_type (glyph_id->combining[i]);
+      combtype = grub_unicode_get_comb_type (glyph_id->combining[i]);
       switch (combtype)
 	{
 	case GRUB_UNICODE_COMB_OVERLAY:
@@ -1302,14 +1283,17 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 }
 
 static struct grub_font_glyph *
-grub_font_construct_glyph (grub_font_t hinted_font,
-			   const struct grub_unicode_glyph *glyph_id)
+grub_font_construct_dry_run (grub_font_t hinted_font,
+			     const struct grub_unicode_glyph *glyph_id,
+			     struct grub_video_signed_rect *bounds,
+			     struct grub_font_glyph ***combining_glyphs_out,
+			     int *device_width)
 {
-  grub_font_t font;
-  struct grub_video_signed_rect bounds;
   struct grub_font_glyph *main_glyph;
   struct grub_font_glyph **combining_glyphs;
-  struct grub_font_glyph *glyph;
+
+  if (combining_glyphs_out)
+    *combining_glyphs_out = NULL;
 
   main_glyph = grub_font_get_glyph_with_fallback (hinted_font, glyph_id->base);
 
@@ -1319,30 +1303,70 @@ grub_font_construct_glyph (grub_font_t hinted_font,
 
   /* Glyph not available in any font.  Return unknown glyph.  */
   if (!main_glyph)
-    return grub_font_dup_glyph (unknown_glyph);
+    return NULL;
+
+  if (device_width)
+    *device_width = main_glyph->device_width;
 
   if (!glyph_id->ncomb && !glyph_id->attributes)
-    return grub_font_dup_glyph (main_glyph);
+    return main_glyph;
 
   combining_glyphs = grub_malloc (sizeof (combining_glyphs[0])
 				  * glyph_id->ncomb);
   if (glyph_id->ncomb && !combining_glyphs)
     {
       grub_errno = GRUB_ERR_NONE;
-      return grub_font_dup_glyph (main_glyph);
+      return main_glyph;
     }
   
-  font = main_glyph->font;
-
   {
     unsigned i;
     for (i = 0; i < glyph_id->ncomb; i++)
       combining_glyphs[i]
-	= grub_font_get_glyph_with_fallback (font, glyph_id->combining[i]);
+	= grub_font_get_glyph_with_fallback (main_glyph->font,
+					     glyph_id->combining[i]);
   }
 
-  blit_comb (glyph_id, NULL, &bounds, main_glyph, combining_glyphs);
+  blit_comb (glyph_id, NULL, bounds, main_glyph, combining_glyphs, device_width);
+  if (combining_glyphs_out)
+    *combining_glyphs_out = combining_glyphs;
+  else
+    grub_free (combining_glyphs);
 
+  return main_glyph;
+}
+
+int
+grub_font_get_constructed_device_width (grub_font_t hinted_font,
+					const struct grub_unicode_glyph *glyph_id)
+{
+  int ret;
+  struct grub_font_glyph *main_glyph;
+  main_glyph = grub_font_construct_dry_run (hinted_font, glyph_id, NULL,
+					    NULL, &ret);
+  if (!main_glyph)
+    return unknown_glyph->device_width;
+  return ret;
+}
+
+struct grub_font_glyph *
+grub_font_construct_glyph (grub_font_t hinted_font,
+			   const struct grub_unicode_glyph *glyph_id)
+{
+  struct grub_font_glyph *main_glyph;
+  struct grub_video_signed_rect bounds;
+  struct grub_font_glyph *glyph;
+  struct grub_font_glyph **combining_glyphs;
+
+  main_glyph = grub_font_construct_dry_run (hinted_font, glyph_id,
+					    &bounds, &combining_glyphs, NULL);
+
+  if (!main_glyph)
+    return grub_font_dup_glyph (unknown_glyph);
+
+  if (!combining_glyphs)
+    return grub_font_dup_glyph (main_glyph);
+  
   glyph = grub_zalloc (sizeof (*glyph) + (bounds.width * bounds.height + 7) / 8);
   if (!glyph)
     {
@@ -1350,12 +1374,11 @@ grub_font_construct_glyph (grub_font_t hinted_font,
       return grub_font_dup_glyph (main_glyph);
     }
 
-  glyph->font = font;
+  glyph->font = main_glyph->font;
   glyph->width = bounds.width;
   glyph->height = bounds.height;
   glyph->offset_x = bounds.x;
   glyph->offset_y = bounds.y;
-  glyph->device_width = main_glyph->device_width;
 
   if (glyph_id->attributes & GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR)
     grub_font_blit_glyph_mirror (glyph, main_glyph,
@@ -1368,7 +1391,7 @@ grub_font_construct_glyph (grub_font_t hinted_font,
 			  (glyph->height + glyph->offset_y)
 			  - (main_glyph->height + main_glyph->offset_y));
 
-  blit_comb (glyph_id, glyph, NULL, main_glyph, combining_glyphs);
+  blit_comb (glyph_id, glyph, NULL, main_glyph, combining_glyphs, NULL);
 
   return glyph;
 }
@@ -1423,465 +1446,6 @@ grub_font_draw_glyph (struct grub_font_glyph *glyph,
                                  glyph->width, glyph->height);
 }
 
-static grub_uint8_t *bidi_types = NULL;
-
-static void
-unpack_bidi (void)
-{
-  unsigned i;
-  struct grub_unicode_compact_range *cur;
-
-  bidi_types = grub_zalloc (GRUB_UNICODE_MAX_CACHED_CHAR);
-  if (!bidi_types)
-    {
-      grub_errno = GRUB_ERR_NONE;
-      return;
-    }
-  for (cur = grub_unicode_compact; cur->end; cur++)
-    for (i = cur->start; i <= cur->end
-	     && i < GRUB_UNICODE_MAX_CACHED_CHAR; i++)
-      if (cur->bidi_mirror)
-	bidi_types[i] = cur->bidi_type | 0x80;
-      else
-	bidi_types[i] = cur->bidi_type | 0x00;
-}
-
-static inline enum grub_bidi_type
-get_bidi_type (grub_uint32_t c)
-{
-  struct grub_unicode_compact_range *cur;
-
-  if (!bidi_types)
-    unpack_bidi ();
-
-  if (bidi_types && c < GRUB_UNICODE_MAX_CACHED_CHAR)
-    return bidi_types[c] & 0x7f;
-
-  for (cur = grub_unicode_compact; cur->end; cur++)
-    if (cur->start <= c && c <= cur->end)
-      return cur->bidi_type;
-
-  return GRUB_BIDI_TYPE_L;
-}
-
-static inline int
-is_mirrored (grub_uint32_t c)
-{
-  struct grub_unicode_compact_range *cur;
-
-  if (!bidi_types)
-    unpack_bidi ();
-
-  if (bidi_types && c < GRUB_UNICODE_MAX_CACHED_CHAR)
-    return !!(bidi_types[c] & 0x80);
-
-  for (cur = grub_unicode_compact; cur->end; cur++)
-    if (cur->start <= c && c <= cur->end)
-      return cur->bidi_mirror;
-
-  return 0;
-}
-
-static grub_ssize_t
-grub_err_bidi_logical_to_visual (grub_uint32_t *logical,
-				 grub_size_t logical_len,
-				 struct grub_unicode_glyph **visual_out)
-{
-  enum grub_bidi_type type = GRUB_BIDI_TYPE_L;
-  enum override_status {OVERRIDE_NEUTRAL = 0, OVERRIDE_R, OVERRIDE_L};
-  unsigned *levels;
-  enum grub_bidi_type *resolved_types;
-  unsigned base_level;
-  enum override_status cur_override;
-  unsigned i;
-  unsigned stack_level[GRUB_BIDI_MAX_EXPLICIT_LEVEL + 3];
-  enum override_status stack_override[GRUB_BIDI_MAX_EXPLICIT_LEVEL + 3];
-  unsigned stack_depth = 0;
-  unsigned invalid_pushes = 0;
-  unsigned visual_len = 0;
-  unsigned run_start, run_end;
-  struct grub_unicode_glyph *visual;
-  unsigned cur_level;
-
-  auto void push_stack (unsigned new_override, unsigned new_level);
-  void push_stack (unsigned new_override, unsigned new_level)
-  {
-    if (new_level > GRUB_BIDI_MAX_EXPLICIT_LEVEL)
-      {
-	invalid_pushes++;
-	return;
-      }
-    stack_level[stack_depth] = cur_level;
-    stack_override[stack_depth] = cur_override;
-    stack_depth++;
-    cur_level = new_level;
-    cur_override = new_override;
-  }
-
-  auto void pop_stack (void);
-  void pop_stack (void)
-  {
-    if (invalid_pushes)
-      {
-	invalid_pushes--;
-	return;
-      }
-    if (!stack_depth)
-      return;
-    stack_depth--;
-    cur_level = stack_level[stack_depth];
-    cur_override = stack_override[stack_depth];
-  }
-
-  auto void revert (unsigned start, unsigned end);
-  void revert (unsigned start, unsigned end)
-  {
-    struct grub_unicode_glyph t;
-    unsigned k, tl;
-    for (k = 0; k <= (end - start) / 2; k++)
-      {
-	t = visual[start+k];
-	visual[start+k] = visual[end-k];
-	visual[end-k] = t;
-	tl = levels[start+k];
-	levels[start+k] = levels[end-k];
-	levels[end-k] = tl;
-      }
-  }
-
-  levels = grub_malloc (sizeof (levels[0]) * logical_len);
-  if (!levels)
-    return -1;
-
-  resolved_types = grub_malloc (sizeof (resolved_types[0]) * logical_len);
-  if (!resolved_types)
-    {
-      grub_free (levels);
-      return -1;
-    }
-
-  visual = grub_malloc (sizeof (visual[0]) * logical_len);
-  if (!visual)
-    {
-      grub_free (resolved_types);
-      grub_free (levels);
-      return -1;
-    }
-
-  for (i = 0; i < logical_len; i++)
-    {
-      type = get_bidi_type (logical[i]);
-      if (type == GRUB_BIDI_TYPE_L || type == GRUB_BIDI_TYPE_AL
-	  || type == GRUB_BIDI_TYPE_R)
-	break;
-    }
-  if (type == GRUB_BIDI_TYPE_R || type == GRUB_BIDI_TYPE_AL)
-    base_level = 1;
-  else
-    base_level = 0;
-  
-  cur_level = base_level;
-  cur_override = OVERRIDE_NEUTRAL;
-  {
-    unsigned last_comb_pointer = 0;
-    for (i = 0; i < logical_len; i++)
-      {
-	/* Variation selectors >= 17 are outside of BMP and SMP. 
-	   Handle variation selectors first to avoid potentially costly lookups.
-	*/
-	if (logical[i] >= GRUB_UNICODE_VARIATION_SELECTOR_1
-	    && logical[i] <= GRUB_UNICODE_VARIATION_SELECTOR_16)
-	  {
-	    if (!visual_len)
-	      continue;
-	    visual[visual_len - 1].variant
-	      = logical[i] - GRUB_UNICODE_VARIATION_SELECTOR_1 + 1;
-	  }
-	if (logical[i] >= GRUB_UNICODE_VARIATION_SELECTOR_17
-	    && logical[i] <= GRUB_UNICODE_VARIATION_SELECTOR_256)
-	  {
-	    if (!visual_len)
-	      continue;
-	    visual[visual_len - 1].variant
-	      = logical[i] - GRUB_UNICODE_VARIATION_SELECTOR_17 + 17;
-	    continue;
-	  }
-	
-	type = get_bidi_type (logical[i]);
-	switch (type)
-	  {
-	  case GRUB_BIDI_TYPE_RLE:
-	    push_stack (cur_override, (cur_level | 1) + 1);
-	    break;
-	  case GRUB_BIDI_TYPE_RLO:
-	    push_stack (OVERRIDE_R, (cur_level | 1) + 1);
-	    break;
-	  case GRUB_BIDI_TYPE_LRE:
-	    push_stack (cur_override, (cur_level & ~1) + 2);
-	    break;
-	  case GRUB_BIDI_TYPE_LRO:
-	    push_stack (OVERRIDE_L, (cur_level & ~1) + 2);
-	    break;
-	  case GRUB_BIDI_TYPE_PDF:
-	    pop_stack ();
-	    break;
-	  case GRUB_BIDI_TYPE_BN:
-	    break;
-	  default:
-	    {
-	      enum grub_comb_type comb_type;
-	      comb_type = get_comb_type (logical[i]);
-	      if (comb_type)
-		{
-		  grub_uint32_t *n;
-		  unsigned j;
-
-		  if (!visual_len)
-		    break;
-		  if (comb_type == GRUB_UNICODE_COMB_MC
-		      || comb_type == GRUB_UNICODE_COMB_ME
-		      || comb_type == GRUB_UNICODE_COMB_MN)
-		    last_comb_pointer = visual[visual_len - 1].ncomb;
-		  n = grub_realloc (visual[visual_len - 1].combining, 
-				    sizeof (grub_uint32_t)
-				    * (visual[visual_len - 1].ncomb + 1));
-		  if (!n)
-		    {
-		      grub_errno = GRUB_ERR_NONE;
-		      break;
-		    }
-
-		  for (j = last_comb_pointer;
-		       j < visual[visual_len - 1].ncomb; j++)
-		    if (get_comb_type (visual[visual_len - 1].combining[j])
-			> comb_type)
-		      break;
-		  grub_memmove (visual[visual_len - 1].combining + j + 1,
-				visual[visual_len - 1].combining + j,
-				(visual[visual_len - 1].ncomb - j)
-				* sizeof (visual[visual_len - 1].combining[0]));
-		  visual[visual_len - 1].combining = n;
-		  visual[visual_len - 1].combining[j] = logical[i];
-		  visual[visual_len - 1].ncomb++;
-		  break;
-		}
-	      last_comb_pointer = 0;
-	      levels[visual_len] = cur_level;
-	      if (cur_override != OVERRIDE_NEUTRAL)
-		resolved_types[visual_len] = 
-		  (cur_override == OVERRIDE_L) ? GRUB_BIDI_TYPE_L
-		  : GRUB_BIDI_TYPE_R;
-	      else
-		resolved_types[visual_len] = type;
-	      visual[visual_len].base = logical[i];
-	      visual[visual_len].variant = 0;
-	      visual[visual_len].attributes = 0;
-	      visual[visual_len].ncomb = 0;
-	      visual[visual_len].combining = NULL;
-	      visual_len++;
-	    }
-	  }
-      }
-  }
-
-  for (run_start = 0; run_start < visual_len; run_start = run_end)
-    {
-      unsigned prev_level, next_level, cur_run_level;
-      unsigned last_type, last_strong_type;
-      for (run_end = run_start; run_end < visual_len &&
-	     levels[run_end] == levels[run_start]; run_end++);
-      if (run_start == 0)
-	prev_level = base_level;
-      else
-	prev_level = levels[run_start - 1];
-      if (run_end == visual_len)
-	next_level = base_level;
-      else
-	next_level = levels[run_end];
-      cur_run_level = levels[run_start];
-      if (prev_level & 1)
-	last_type = GRUB_BIDI_TYPE_R;
-      else
-	last_type = GRUB_BIDI_TYPE_L;
-      last_strong_type = last_type;
-      for (i = run_start; i < run_end; i++)
-	{
-	  switch (resolved_types[i])
-	    {
-	    case GRUB_BIDI_TYPE_NSM:
-	      resolved_types[i] = last_type;
-	      break;
-	    case GRUB_BIDI_TYPE_EN:
-	      if (last_strong_type == GRUB_BIDI_TYPE_AL)
-		resolved_types[i] = GRUB_BIDI_TYPE_AN;
-	      break;
-	    case GRUB_BIDI_TYPE_L:
-	    case GRUB_BIDI_TYPE_R:
-	      last_strong_type = resolved_types[i];
-	      break;
-	    case GRUB_BIDI_TYPE_ES:
-	      if (last_type == GRUB_BIDI_TYPE_EN
-		  && i + 1 < run_end 
-		  && resolved_types[i + 1] == GRUB_BIDI_TYPE_EN)
-		resolved_types[i] = GRUB_BIDI_TYPE_EN;
-	      else
-		resolved_types[i] = GRUB_BIDI_TYPE_ON;
-	      break;
-	    case GRUB_BIDI_TYPE_ET:
-	      {
-		unsigned j;
-		if (last_type == GRUB_BIDI_TYPE_EN)
-		  {
-		    resolved_types[i] = GRUB_BIDI_TYPE_EN;
-		    break;
-		  }
-		for (j = i; j < run_end
-		       && resolved_types[j] == GRUB_BIDI_TYPE_ET; j++);
-		if (j != run_end && resolved_types[j] == GRUB_BIDI_TYPE_EN)
-		  {
-		    for (; i < run_end
-			   && resolved_types[i] == GRUB_BIDI_TYPE_ET; i++)
-		      resolved_types[i] = GRUB_BIDI_TYPE_EN;
-		    i--;
-		    break;
-		  }
-		for (; i < run_end
-		       && resolved_types[i] == GRUB_BIDI_TYPE_ET; i++)
-		  resolved_types[i] = GRUB_BIDI_TYPE_ON;
-		i--;
-		break;		
-	      }
-	      break;
-	    case GRUB_BIDI_TYPE_CS:
-	      if (last_type == GRUB_BIDI_TYPE_EN
-		  && i + 1 < run_end 
-		  && resolved_types[i + 1] == GRUB_BIDI_TYPE_EN)
-		{
-		  resolved_types[i] = GRUB_BIDI_TYPE_EN;
-		  break;
-		}
-	      if (last_type == GRUB_BIDI_TYPE_AN
-		  && i + 1 < run_end 
-		  && (resolved_types[i + 1] == GRUB_BIDI_TYPE_AN
-		      || (resolved_types[i + 1] == GRUB_BIDI_TYPE_EN
-			  && last_strong_type == GRUB_BIDI_TYPE_AL)))
-		{
-		  resolved_types[i] = GRUB_BIDI_TYPE_EN;
-		  break;
-		}
-	      resolved_types[i] = GRUB_BIDI_TYPE_ON;
-	      break;
-	    case GRUB_BIDI_TYPE_AL:
-	      last_strong_type = resolved_types[i];
-	      resolved_types[i] = GRUB_BIDI_TYPE_R;
-	      break;
-	    default: /* Make GCC happy.  */
-	      break;
-	    }
-	  last_type = resolved_types[i];
-	  if (resolved_types[i] == GRUB_BIDI_TYPE_EN
-	      && last_strong_type == GRUB_BIDI_TYPE_L)
-	    resolved_types[i] = GRUB_BIDI_TYPE_L;
-	}
-      if (prev_level & 1)
-	last_type = GRUB_BIDI_TYPE_R;
-      else
-	last_type = GRUB_BIDI_TYPE_L;
-      for (i = run_start; i < run_end; )
-	{
-	  unsigned j;
-	  unsigned next_type;
-	  for (j = i; j < run_end &&
-	  	 (resolved_types[j] == GRUB_BIDI_TYPE_B
-	  	  || resolved_types[j] == GRUB_BIDI_TYPE_S
-	  	  || resolved_types[j] == GRUB_BIDI_TYPE_WS
-	  	  || resolved_types[j] == GRUB_BIDI_TYPE_ON); j++);
-	  if (j == i)
-	    {
-	      if (resolved_types[i] == GRUB_BIDI_TYPE_L)
-		last_type = GRUB_BIDI_TYPE_L;
-	      else
-		last_type = GRUB_BIDI_TYPE_R;
-	      i++;
-	      continue;
-	    }
-	  if (j == run_end)
-	    next_type = (next_level & 1) ? GRUB_BIDI_TYPE_R : GRUB_BIDI_TYPE_L;
-	  else
-	    {
-	      if (resolved_types[j] == GRUB_BIDI_TYPE_L)
-		next_type = GRUB_BIDI_TYPE_L;
-	      else
-		next_type = GRUB_BIDI_TYPE_R;
-	    }
-	  if (next_type == last_type)
-	    for (; i < j; i++)
-	      resolved_types[i] = last_type;
-	  else
-	    for (; i < j; i++)
-	      resolved_types[i] = (cur_run_level & 1) ? GRUB_BIDI_TYPE_R
-		: GRUB_BIDI_TYPE_L;
-	}
-    }
-
-  for (i = 0; i < visual_len; i++)
-    {
-      if (!(levels[i] & 1) && resolved_types[i] == GRUB_BIDI_TYPE_R)
-	{
-	  levels[i]++;
-	  continue;
-	}
-      if (!(levels[i] & 1) && (resolved_types[i] == GRUB_BIDI_TYPE_AN
-			       || resolved_types[i] == GRUB_BIDI_TYPE_EN))
-	{
-	  levels[i] += 2;
-	  continue;
-	}
-      if ((levels[i] & 1) && (resolved_types[i] == GRUB_BIDI_TYPE_L
-			      || resolved_types[i] == GRUB_BIDI_TYPE_AN
-			      || resolved_types[i] == GRUB_BIDI_TYPE_EN))
-	{
-	  levels[i]++;
-	  continue;
-	}
-    }
-  grub_free (resolved_types);
-  /* TODO: put line-wrapping here.  */
-  {
-    unsigned min_odd_level = 0xffffffff;
-    unsigned max_level = 0;
-    unsigned j;
-    for (i = 0; i < visual_len; i++)
-      {
-	if (levels[i] > max_level)
-	  max_level = levels[i];
-	if (levels[i] < min_odd_level && (levels[i] & 1))
-	  min_odd_level = levels[i];
-      }
-    /* FIXME: can be optimized.  */
-    for (j = max_level; j >= min_odd_level; j--)
-      {
-	unsigned in = 0;
-	for (i = 0; i < visual_len; i++)
-	  {
-	    if (i != 0 && levels[i] >= j && levels[i-1] < j)
-	      in = i;
-	    if (levels[i] >= j && (i + 1 == visual_len || levels[i+1] < j))
-	      revert (in, i);
-	  }
-      }
-  }
-
-  for (i = 0; i < visual_len; i++)
-    if (is_mirrored (visual[i].base) && levels[i])
-      visual[i].attributes |= GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR;
-
-  grub_free (levels);
-
-  *visual_out = visual;
-  return visual_len;
-}
-
 /* Draw a UTF-8 string of text on the current video render target.
    The x coordinate specifies the starting x position for the first character,
    while the y coordinate specifies the baseline position.
@@ -1902,7 +1466,7 @@ grub_font_draw_string (const char *str, grub_font_t font,
   if (logical_len < 0)
     return grub_errno;
 
-  visual_len = grub_err_bidi_logical_to_visual (logical, logical_len, &visual);
+  visual_len = grub_bidi_logical_to_visual (logical, logical_len, &visual, 0, 0);
   grub_free (logical);
   if (visual_len < 0)
     return grub_errno;
diff --git a/include/grub/charset.h b/include/grub/charset.h
index 834705a99..6fdc2aa37 100644
--- a/include/grub/charset.h
+++ b/include/grub/charset.h
@@ -118,10 +118,8 @@ grub_is_valid_utf8 (const grub_uint8_t *src, grub_size_t srcsize);
 int grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg,
 			     grub_uint32_t **last_position);
 
-grub_size_t grub_utf8_to_ucs4 (grub_uint32_t *dest,
-			       grub_size_t destsize,
-			       const grub_uint8_t *src,
-			       grub_size_t srcsize,
+grub_size_t grub_utf8_to_ucs4 (grub_uint32_t *dest, grub_size_t destsize,
+			       const grub_uint8_t *src, grub_size_t srcsize,
 			       const grub_uint8_t **srcend);
 
 #endif
diff --git a/include/grub/font.h b/include/grub/font.h
index 54314936a..4df4c2279 100644
--- a/include/grub/font.h
+++ b/include/grub/font.h
@@ -22,6 +22,7 @@
 #include <grub/types.h>
 #include <grub/video.h>
 #include <grub/file.h>
+#include <grub/unicode.h>
 
 /* Forward declaration of opaque structure grub_font.
    Users only pass struct grub_font pointers to the font module functions,
@@ -117,4 +118,11 @@ grub_err_t EXPORT_FUNC (grub_font_draw_string) (const char *str,
 						grub_video_color_t color,
 						int left_x, int baseline_y);
 
+int
+EXPORT_FUNC (grub_font_get_constructed_device_width) (grub_font_t hinted_font,
+					const struct grub_unicode_glyph *glyph_id);
+struct grub_font_glyph *
+EXPORT_FUNC (grub_font_construct_glyph) (grub_font_t hinted_font,
+			   const struct grub_unicode_glyph *glyph_id);
+
 #endif /* ! GRUB_FONT_HEADER */
diff --git a/include/grub/i386/vga_common.h b/include/grub/i386/vga_common.h
index f17fc018a..19f14ebed 100644
--- a/include/grub/i386/vga_common.h
+++ b/include/grub/i386/vga_common.h
@@ -25,8 +25,10 @@
 
 extern grub_uint8_t grub_console_cur_color;
 
-void grub_console_putchar (grub_uint32_t c);
-grub_ssize_t grub_console_getcharwidth (grub_uint32_t c);
+void
+grub_console_putchar (const struct grub_unicode_glyph *c);
+grub_ssize_t
+grub_console_getcharwidth (const struct grub_unicode_glyph *c);
 grub_uint16_t grub_console_getwh (void);
 void grub_console_setcolorstate (grub_term_color_state state);
 void grub_console_setcolor (grub_uint8_t normal_color, grub_uint8_t highlight_color);
diff --git a/include/grub/normal.h b/include/grub/normal.h
index fe45ddf71..b53c6c121 100644
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -113,4 +113,6 @@ void grub_set_more (int onoff);
 int grub_normal_get_line_counter (void);
 void grub_install_newline_hook (void);
 
+void grub_xputs_normal (const char *str);
+
 #endif /* ! GRUB_NORMAL_HEADER */
diff --git a/include/grub/term.h b/include/grub/term.h
index 319196b7b..c999b2bd3 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -39,6 +39,7 @@
 #include <grub/symbol.h>
 #include <grub/types.h>
 #include <grub/handler.h>
+#include <grub/unicode.h>
 
 /* These are used to represent the various color states we use.  */
 typedef enum
@@ -164,11 +165,11 @@ struct grub_term_output
   grub_err_t (*fini) (void);
 
   /* Put a character. C is encoded in Unicode.  */
-  void (*putchar) (grub_uint32_t c);
+  void (*putchar) (const struct grub_unicode_glyph *c);
 
   /* Get the number of columns occupied by a given character C. C is
      encoded in Unicode.  */
-  grub_ssize_t (*getcharwidth) (grub_uint32_t c);
+  grub_ssize_t (*getcharwidth) (const struct grub_unicode_glyph *c);
 
   /* Get the screen size. The return value is ((Width << 8) | Height).  */
   grub_uint16_t (*getwh) (void);
@@ -261,8 +262,7 @@ grub_term_unregister_output (grub_term_output_t term)
 #define FOR_ACTIVE_TERM_OUTPUTS(var) for (var = grub_term_outputs; var; var = var->next)
 #define FOR_DISABLED_TERM_OUTPUTS(var) for (var = grub_term_outputs_disabled; var; var = var->next)
 
-void EXPORT_FUNC(grub_putcode) (grub_uint32_t code,
-				struct grub_term_output *term);
+void grub_putcode (grub_uint32_t code, struct grub_term_output *term);
 int EXPORT_FUNC(grub_getkey) (void);
 int EXPORT_FUNC(grub_checkkey) (void);
 int EXPORT_FUNC(grub_getkeystatus) (void);
@@ -379,7 +379,8 @@ grub_term_cls (struct grub_term_output *term)
 }
 
 static inline grub_ssize_t 
-grub_term_getcharwidth (struct grub_term_output *term, grub_uint32_t c)
+grub_term_getcharwidth (struct grub_term_output *term,
+			const struct grub_unicode_glyph *c)
 {
   if (term->getcharwidth)
     return term->getcharwidth (c);
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 59649c3b5..1f6c4df38 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -55,6 +55,7 @@ enum grub_bidi_type
 
 enum grub_comb_type
   {
+    GRUB_UNICODE_COMB_NONE = 0,
     GRUB_UNICODE_COMB_OVERLAY = 1,
     GRUB_UNICODE_STACK_ATTACHED_BELOW = 202,
     GRUB_UNICODE_STACK_ATTACHED_ABOVE = 214,
@@ -93,4 +94,21 @@ extern struct grub_unicode_compact_range grub_unicode_compact[];
 /*  Unicode mandates an arbitrary limit.  */
 #define GRUB_BIDI_MAX_EXPLICIT_LEVEL 61
 
+grub_ssize_t
+grub_bidi_logical_to_visual (const grub_uint32_t *logical,
+			     grub_size_t logical_len,
+			     struct grub_unicode_glyph **visual_out,
+			     grub_ssize_t (*getcharwidth) (const struct grub_unicode_glyph *visual),
+			     grub_size_t max_length);
+
+enum grub_comb_type
+grub_unicode_get_comb_type (grub_uint32_t c);
+grub_size_t
+grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen,
+			      struct grub_unicode_glyph *out);
+struct grub_unicode_glyph *
+grub_unicode_glyph_from_code (grub_uint32_t code);
+struct grub_unicode_glyph *
+grub_unicode_glyph_dup (const struct grub_unicode_glyph *in);
+
 #endif
diff --git a/kern/term.c b/kern/term.c
index bd1dfc65f..8139e8118 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -31,23 +31,33 @@ struct grub_term_input *grub_term_inputs;
 void (*grub_newline_hook) (void) = NULL;
 
 /* Put a Unicode character.  */
-void
-grub_putcode (grub_uint32_t code, struct grub_term_output *term)
+static void
+grub_putcode_dumb (grub_uint32_t code,
+		   struct grub_term_output *term)
 {
+  struct grub_unicode_glyph c =
+    {
+      .base = code,
+      .variant = 0,
+      .attributes = 0,
+      .ncomb = 0,
+      .combining = 0
+    };
+
   if (code == '\t' && term->getxy)
     {
       int n;
 
       n = 8 - ((term->getxy () >> 8) & 7);
       while (n--)
-	grub_putcode (' ', term);
+	grub_putcode_dumb (' ', term);
 
       return;
     }
 
-  (term->putchar) (code);
+  (term->putchar) (&c);
   if (code == '\n')
-    (term->putchar) ('\r');
+    grub_putcode_dumb ('\r', term);
 }
 
 static void
@@ -56,12 +66,12 @@ grub_xputs_dumb (const char *str)
   for (; *str; str++)
     {
       grub_term_output_t term;
+      grub_uint32_t code = *str;
+      if (code > 0x7f)
+	code = '?';
 
-      char c = *str;
-      if ((unsigned char) c > 0x7f)
-	c = '?';
       FOR_ACTIVE_TERM_OUTPUTS(term)
-	grub_putcode (c, term);
+	grub_putcode_dumb (code, term);
     }
 }
 
@@ -126,7 +136,7 @@ grub_cls (void)
   {
     if ((term->flags & GRUB_TERM_DUMB) || (grub_env_get ("debug")))
       {
-	grub_putcode ('\n', term);
+	grub_putcode_dumb ('\n', term);
 	grub_term_refresh (term);
       }
     else
diff --git a/lib/charset.c b/lib/charset.c
index 52810da48..c71de7b5a 100644
--- a/lib/charset.c
+++ b/lib/charset.c
@@ -26,6 +26,9 @@
 #include <grub/charset.h>
 #include <grub/mm.h>
 #include <grub/misc.h>
+#include <grub/unicode.h>
+#include <grub/term.h>
+#include <grub/normal.h>
 
 grub_ssize_t
 grub_utf8_to_utf16 (grub_uint16_t *dest, grub_size_t destsize,
@@ -361,3 +364,783 @@ grub_utf8_to_ucs4 (grub_uint32_t *dest, grub_size_t destsize,
     *srcend = src;
   return p - dest;
 }
+
+static grub_uint8_t *bidi_types = NULL;
+
+static void
+unpack_bidi (void)
+{
+  unsigned i;
+  struct grub_unicode_compact_range *cur;
+
+  bidi_types = grub_zalloc (GRUB_UNICODE_MAX_CACHED_CHAR);
+  if (!bidi_types)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      return;
+    }
+  for (cur = grub_unicode_compact; cur->end; cur++)
+    for (i = cur->start; i <= cur->end
+	     && i < GRUB_UNICODE_MAX_CACHED_CHAR; i++)
+      if (cur->bidi_mirror)
+	bidi_types[i] = cur->bidi_type | 0x80;
+      else
+	bidi_types[i] = cur->bidi_type | 0x00;
+}
+
+static inline enum grub_bidi_type
+get_bidi_type (grub_uint32_t c)
+{
+  struct grub_unicode_compact_range *cur;
+
+  if (!bidi_types)
+    unpack_bidi ();
+
+  if (bidi_types && c < GRUB_UNICODE_MAX_CACHED_CHAR)
+    return bidi_types[c] & 0x7f;
+
+  for (cur = grub_unicode_compact; cur->end; cur++)
+    if (cur->start <= c && c <= cur->end)
+      return cur->bidi_type;
+
+  return GRUB_BIDI_TYPE_L;
+}
+
+static inline int
+is_mirrored (grub_uint32_t c)
+{
+  struct grub_unicode_compact_range *cur;
+
+  if (!bidi_types)
+    unpack_bidi ();
+
+  if (bidi_types && c < GRUB_UNICODE_MAX_CACHED_CHAR)
+    return !!(bidi_types[c] & 0x80);
+
+  for (cur = grub_unicode_compact; cur->end; cur++)
+    if (cur->start <= c && c <= cur->end)
+      return cur->bidi_mirror;
+
+  return 0;
+}
+
+enum grub_comb_type
+grub_unicode_get_comb_type (grub_uint32_t c)
+{
+  static grub_uint8_t *comb_types = NULL;
+  struct grub_unicode_compact_range *cur;
+
+  if (!comb_types)
+    {
+      unsigned i;
+      comb_types = grub_zalloc (GRUB_UNICODE_MAX_CACHED_CHAR);
+      if (comb_types)
+	for (cur = grub_unicode_compact; cur->end; cur++)
+	  for (i = cur->start; i <= cur->end
+		 && i < GRUB_UNICODE_MAX_CACHED_CHAR; i++)
+	    comb_types[i] = cur->comb_type;
+      else
+	grub_errno = GRUB_ERR_NONE;
+    }
+
+  if (comb_types && c < GRUB_UNICODE_MAX_CACHED_CHAR)
+    return comb_types[c];
+
+  for (cur = grub_unicode_compact; cur->end; cur++)
+    if (cur->start <= c && c <= cur->end)
+      return cur->comb_type;
+
+  return GRUB_UNICODE_COMB_NONE;
+}
+
+grub_size_t
+grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen,
+			      struct grub_unicode_glyph *out)
+{
+  int haveout = 0;
+  const grub_uint32_t *ptr;
+  unsigned last_comb_pointer = 0;
+
+  grub_memset (out, 0, sizeof (*out));
+
+  for (ptr = in; ptr < in + inlen; ptr++)
+    {
+      /* Variation selectors >= 17 are outside of BMP and SMP. 
+	 Handle variation selectors first to avoid potentially costly lookups.
+      */
+      if (*ptr >= GRUB_UNICODE_VARIATION_SELECTOR_1
+	  && *ptr <= GRUB_UNICODE_VARIATION_SELECTOR_16)
+	{
+	  if (haveout)
+	    out->variant = *ptr - GRUB_UNICODE_VARIATION_SELECTOR_1 + 1;
+	  continue;
+
+	}
+      if (*ptr >= GRUB_UNICODE_VARIATION_SELECTOR_17
+	  && *ptr <= GRUB_UNICODE_VARIATION_SELECTOR_256)
+	{
+	  if (haveout)
+	    out->variant = *ptr - GRUB_UNICODE_VARIATION_SELECTOR_17 + 17;
+	  continue;
+	}
+	
+      enum grub_comb_type comb_type;
+      comb_type = grub_unicode_get_comb_type (*ptr);
+      if (comb_type)
+	{
+	  grub_uint32_t *n;
+	  unsigned j;
+
+	  if (!haveout)
+	    continue;
+
+	  if (comb_type == GRUB_UNICODE_COMB_MC
+	      || comb_type == GRUB_UNICODE_COMB_ME
+	      || comb_type == GRUB_UNICODE_COMB_MN)
+	    last_comb_pointer = out->ncomb;
+	  n = grub_realloc (out->combining, 
+			    sizeof (grub_uint32_t) * (out->ncomb + 1));
+	  if (!n)
+	    {
+	      grub_errno = GRUB_ERR_NONE;
+	      continue;
+	    }
+
+	  for (j = last_comb_pointer; j < out->ncomb; j++)
+	    if (grub_unicode_get_comb_type (out->combining[j]) > comb_type)
+	      break;
+	  grub_memmove (out->combining + j + 1,
+			out->combining + j,
+			(out->ncomb - j)
+			* sizeof (out->combining[0]));
+	  out->combining = n;
+	  out->combining[j] = *ptr;
+	  out->ncomb++;
+	  continue;
+	}
+      if (haveout)
+	return ptr - in;
+      haveout = 1;
+      out->base = *ptr;
+      out->variant = 0;
+      out->attributes = 0;
+      out->ncomb = 0;
+      out->combining = NULL;
+    }
+  return ptr - in;
+}
+
+static grub_ssize_t
+grub_bidi_line_logical_to_visual (const grub_uint32_t *logical,
+				  grub_size_t logical_len,
+				  struct grub_unicode_glyph *visual_out,
+				  grub_ssize_t (*getcharwidth) (const struct grub_unicode_glyph *visual),
+				  grub_size_t maxwidth)
+{
+  enum grub_bidi_type type = GRUB_BIDI_TYPE_L;
+  enum override_status {OVERRIDE_NEUTRAL = 0, OVERRIDE_R, OVERRIDE_L};
+  unsigned *levels;
+  enum grub_bidi_type *resolved_types;
+  unsigned base_level;
+  enum override_status cur_override;
+  unsigned i;
+  unsigned stack_level[GRUB_BIDI_MAX_EXPLICIT_LEVEL + 3];
+  enum override_status stack_override[GRUB_BIDI_MAX_EXPLICIT_LEVEL + 3];
+  unsigned stack_depth = 0;
+  unsigned invalid_pushes = 0;
+  unsigned visual_len = 0;
+  unsigned run_start, run_end;
+  struct grub_unicode_glyph *visual;
+  unsigned cur_level;
+
+  auto void push_stack (unsigned new_override, unsigned new_level);
+  void push_stack (unsigned new_override, unsigned new_level)
+  {
+    if (new_level > GRUB_BIDI_MAX_EXPLICIT_LEVEL)
+      {
+	invalid_pushes++;
+	return;
+      }
+    stack_level[stack_depth] = cur_level;
+    stack_override[stack_depth] = cur_override;
+    stack_depth++;
+    cur_level = new_level;
+    cur_override = new_override;
+  }
+
+  auto void pop_stack (void);
+  void pop_stack (void)
+  {
+    if (invalid_pushes)
+      {
+	invalid_pushes--;
+	return;
+      }
+    if (!stack_depth)
+      return;
+    stack_depth--;
+    cur_level = stack_level[stack_depth];
+    cur_override = stack_override[stack_depth];
+  }
+
+  auto void revert (unsigned start, unsigned end);
+  void revert (unsigned start, unsigned end)
+  {
+    struct grub_unicode_glyph t;
+    unsigned k, tl;
+    for (k = 0; k <= (end - start) / 2; k++)
+      {
+	t = visual[start+k];
+	visual[start+k] = visual[end-k];
+	visual[end-k] = t;
+	tl = levels[start+k];
+	levels[start+k] = levels[end-k];
+	levels[end-k] = tl;
+      }
+  }
+
+  levels = grub_malloc (sizeof (levels[0]) * logical_len);
+  if (!levels)
+    return -1;
+
+  resolved_types = grub_malloc (sizeof (resolved_types[0]) * logical_len);
+  if (!resolved_types)
+    {
+      grub_free (levels);
+      return -1;
+    }
+
+  visual = grub_malloc (sizeof (visual[0]) * logical_len);
+  if (!visual)
+    {
+      grub_free (resolved_types);
+      grub_free (levels);
+      return -1;
+    }
+
+  for (i = 0; i < logical_len; i++)
+    {
+      type = get_bidi_type (logical[i]);
+      if (type == GRUB_BIDI_TYPE_L || type == GRUB_BIDI_TYPE_AL
+	  || type == GRUB_BIDI_TYPE_R)
+	break;
+    }
+  if (type == GRUB_BIDI_TYPE_R || type == GRUB_BIDI_TYPE_AL)
+    base_level = 1;
+  else
+    base_level = 0;
+  
+  cur_level = base_level;
+  cur_override = OVERRIDE_NEUTRAL;
+  {
+    const grub_uint32_t *lptr;
+    for (lptr = logical; lptr < logical + logical_len;)
+      {
+	grub_size_t p = grub_unicode_aglomerate_comb (lptr, logical 
+						      + logical_len - lptr, 
+						      &visual[visual_len]);
+	
+	type = get_bidi_type (visual[visual_len].base);
+	switch (type)
+	  {
+	  case GRUB_BIDI_TYPE_RLE:
+	    push_stack (cur_override, (cur_level | 1) + 1);
+	    break;
+	  case GRUB_BIDI_TYPE_RLO:
+	    push_stack (OVERRIDE_R, (cur_level | 1) + 1);
+	    break;
+	  case GRUB_BIDI_TYPE_LRE:
+	    push_stack (cur_override, (cur_level & ~1) + 2);
+	    break;
+	  case GRUB_BIDI_TYPE_LRO:
+	    push_stack (OVERRIDE_L, (cur_level & ~1) + 2);
+	    break;
+	  case GRUB_BIDI_TYPE_PDF:
+	    pop_stack ();
+	    break;
+	  case GRUB_BIDI_TYPE_BN:
+	    break;
+	  default:
+	    {
+	      levels[visual_len] = cur_level;
+	      if (cur_override != OVERRIDE_NEUTRAL)
+		resolved_types[visual_len] = 
+		  (cur_override == OVERRIDE_L) ? GRUB_BIDI_TYPE_L
+		  : GRUB_BIDI_TYPE_R;
+	      else
+		resolved_types[visual_len] = type;
+	      visual_len++;
+	    }
+	  }
+	lptr += p;
+      }
+  }
+
+  for (run_start = 0; run_start < visual_len; run_start = run_end)
+    {
+      unsigned prev_level, next_level, cur_run_level;
+      unsigned last_type, last_strong_type;
+      for (run_end = run_start; run_end < visual_len &&
+	     levels[run_end] == levels[run_start]; run_end++);
+      if (run_start == 0)
+	prev_level = base_level;
+      else
+	prev_level = levels[run_start - 1];
+      if (run_end == visual_len)
+	next_level = base_level;
+      else
+	next_level = levels[run_end];
+      cur_run_level = levels[run_start];
+      if (prev_level & 1)
+	last_type = GRUB_BIDI_TYPE_R;
+      else
+	last_type = GRUB_BIDI_TYPE_L;
+      last_strong_type = last_type;
+      for (i = run_start; i < run_end; i++)
+	{
+	  switch (resolved_types[i])
+	    {
+	    case GRUB_BIDI_TYPE_NSM:
+	      resolved_types[i] = last_type;
+	      break;
+	    case GRUB_BIDI_TYPE_EN:
+	      if (last_strong_type == GRUB_BIDI_TYPE_AL)
+		resolved_types[i] = GRUB_BIDI_TYPE_AN;
+	      break;
+	    case GRUB_BIDI_TYPE_L:
+	    case GRUB_BIDI_TYPE_R:
+	      last_strong_type = resolved_types[i];
+	      break;
+	    case GRUB_BIDI_TYPE_ES:
+	      if (last_type == GRUB_BIDI_TYPE_EN
+		  && i + 1 < run_end 
+		  && resolved_types[i + 1] == GRUB_BIDI_TYPE_EN)
+		resolved_types[i] = GRUB_BIDI_TYPE_EN;
+	      else
+		resolved_types[i] = GRUB_BIDI_TYPE_ON;
+	      break;
+	    case GRUB_BIDI_TYPE_ET:
+	      {
+		unsigned j;
+		if (last_type == GRUB_BIDI_TYPE_EN)
+		  {
+		    resolved_types[i] = GRUB_BIDI_TYPE_EN;
+		    break;
+		  }
+		for (j = i; j < run_end
+		       && resolved_types[j] == GRUB_BIDI_TYPE_ET; j++);
+		if (j != run_end && resolved_types[j] == GRUB_BIDI_TYPE_EN)
+		  {
+		    for (; i < run_end
+			   && resolved_types[i] == GRUB_BIDI_TYPE_ET; i++)
+		      resolved_types[i] = GRUB_BIDI_TYPE_EN;
+		    i--;
+		    break;
+		  }
+		for (; i < run_end
+		       && resolved_types[i] == GRUB_BIDI_TYPE_ET; i++)
+		  resolved_types[i] = GRUB_BIDI_TYPE_ON;
+		i--;
+		break;		
+	      }
+	      break;
+	    case GRUB_BIDI_TYPE_CS:
+	      if (last_type == GRUB_BIDI_TYPE_EN
+		  && i + 1 < run_end 
+		  && resolved_types[i + 1] == GRUB_BIDI_TYPE_EN)
+		{
+		  resolved_types[i] = GRUB_BIDI_TYPE_EN;
+		  break;
+		}
+	      if (last_type == GRUB_BIDI_TYPE_AN
+		  && i + 1 < run_end 
+		  && (resolved_types[i + 1] == GRUB_BIDI_TYPE_AN
+		      || (resolved_types[i + 1] == GRUB_BIDI_TYPE_EN
+			  && last_strong_type == GRUB_BIDI_TYPE_AL)))
+		{
+		  resolved_types[i] = GRUB_BIDI_TYPE_EN;
+		  break;
+		}
+	      resolved_types[i] = GRUB_BIDI_TYPE_ON;
+	      break;
+	    case GRUB_BIDI_TYPE_AL:
+	      last_strong_type = resolved_types[i];
+	      resolved_types[i] = GRUB_BIDI_TYPE_R;
+	      break;
+	    default: /* Make GCC happy.  */
+	      break;
+	    }
+	  last_type = resolved_types[i];
+	  if (resolved_types[i] == GRUB_BIDI_TYPE_EN
+	      && last_strong_type == GRUB_BIDI_TYPE_L)
+	    resolved_types[i] = GRUB_BIDI_TYPE_L;
+	}
+      if (prev_level & 1)
+	last_type = GRUB_BIDI_TYPE_R;
+      else
+	last_type = GRUB_BIDI_TYPE_L;
+      for (i = run_start; i < run_end; )
+	{
+	  unsigned j;
+	  unsigned next_type;
+	  for (j = i; j < run_end &&
+	  	 (resolved_types[j] == GRUB_BIDI_TYPE_B
+	  	  || resolved_types[j] == GRUB_BIDI_TYPE_S
+	  	  || resolved_types[j] == GRUB_BIDI_TYPE_WS
+	  	  || resolved_types[j] == GRUB_BIDI_TYPE_ON); j++);
+	  if (j == i)
+	    {
+	      if (resolved_types[i] == GRUB_BIDI_TYPE_L)
+		last_type = GRUB_BIDI_TYPE_L;
+	      else
+		last_type = GRUB_BIDI_TYPE_R;
+	      i++;
+	      continue;
+	    }
+	  if (j == run_end)
+	    next_type = (next_level & 1) ? GRUB_BIDI_TYPE_R : GRUB_BIDI_TYPE_L;
+	  else
+	    {
+	      if (resolved_types[j] == GRUB_BIDI_TYPE_L)
+		next_type = GRUB_BIDI_TYPE_L;
+	      else
+		next_type = GRUB_BIDI_TYPE_R;
+	    }
+	  if (next_type == last_type)
+	    for (; i < j; i++)
+	      resolved_types[i] = last_type;
+	  else
+	    for (; i < j; i++)
+	      resolved_types[i] = (cur_run_level & 1) ? GRUB_BIDI_TYPE_R
+		: GRUB_BIDI_TYPE_L;
+	}
+    }
+
+  for (i = 0; i < visual_len; i++)
+    {
+      if (!(levels[i] & 1) && resolved_types[i] == GRUB_BIDI_TYPE_R)
+	{
+	  levels[i]++;
+	  continue;
+	}
+      if (!(levels[i] & 1) && (resolved_types[i] == GRUB_BIDI_TYPE_AN
+			       || resolved_types[i] == GRUB_BIDI_TYPE_EN))
+	{
+	  levels[i] += 2;
+	  continue;
+	}
+      if ((levels[i] & 1) && (resolved_types[i] == GRUB_BIDI_TYPE_L
+			      || resolved_types[i] == GRUB_BIDI_TYPE_AN
+			      || resolved_types[i] == GRUB_BIDI_TYPE_EN))
+	{
+	  levels[i]++;
+	  continue;
+	}
+    }
+  grub_free (resolved_types);
+
+  if (!visual_len)
+    {
+      grub_free (levels);
+      grub_free (visual);
+      return 0;
+    }
+  {
+    struct grub_unicode_glyph *outptr = visual_out;
+    unsigned line_start = 0;
+    grub_ssize_t line_width = 0;
+    unsigned k;
+
+    for (k = 0; k <= visual_len; k++)
+      {
+	grub_ssize_t last_width = 0;
+	if (getcharwidth && k != visual_len)
+	  line_width += last_width = getcharwidth (&visual[k]);
+	if (((grub_ssize_t) maxwidth > 0 
+	     && line_width > (grub_ssize_t) maxwidth) || k == visual_len)
+	  {
+	    unsigned min_odd_level = 0xffffffff;
+	    unsigned max_level = 0;
+	    unsigned j;
+	    for (i = line_start; i < k; i++)
+	      {
+		if (levels[i] > max_level)
+		  max_level = levels[i];
+		if (levels[i] < min_odd_level && (levels[i] & 1))
+		  min_odd_level = levels[i];
+	      }
+	    /* FIXME: can be optimized.  */
+	    for (j = max_level; j >= min_odd_level; j--)
+	      {
+		unsigned in = 0;
+		for (i = line_start; i < k; i++)
+		  {
+		    if (i != line_start && levels[i] >= j && levels[i-1] < j)
+		      in = i;
+		    if (levels[i] >= j && (i + 1 == k || levels[i+1] < j))
+		      revert (in, i);
+		  }
+	      }
+
+	    for (i = line_start; i < k; i++)
+	      if (is_mirrored (visual[i].base) && levels[i])
+		visual[i].attributes |= GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR;
+
+	    grub_memcpy (outptr, &visual[line_start],
+			 (k - line_start) * sizeof (visual[0]));
+	    outptr += k - line_start;
+	    if (k != visual_len)
+	      {
+		grub_memset (outptr, 0, sizeof (visual[0]));
+		outptr->base = '\n';
+		outptr++;
+	      }
+	    
+	    line_start = k;
+	    line_width = last_width;
+	  }
+      }
+    grub_free (levels);
+    grub_free (visual);
+
+    return outptr - visual_out;
+  }
+}
+
+grub_ssize_t
+grub_bidi_logical_to_visual (const grub_uint32_t *logical,
+			     grub_size_t logical_len,
+			     struct grub_unicode_glyph **visual_out,
+			     grub_ssize_t (*getcharwidth) (const struct grub_unicode_glyph *visual),
+			     grub_size_t max_length)
+{
+  const grub_uint32_t *line_start = logical, *ptr;
+  struct grub_unicode_glyph *visual_ptr;
+  *visual_out = visual_ptr = grub_malloc (2 * sizeof (visual_ptr[0])
+					  * logical_len);
+  for (ptr = logical; ptr <= logical + logical_len; ptr++)
+    {
+      if (ptr == logical + logical_len || *ptr == '\n')
+	{
+	  grub_ssize_t ret;
+	  ret = grub_bidi_line_logical_to_visual (line_start,
+						  ptr - line_start,
+						  visual_ptr,
+						  getcharwidth,
+						  max_length);
+	  if (ret < 0)
+	    {
+	      grub_free (*visual_out);
+	      return ret;
+	    }
+	  visual_ptr += ret; 
+	  line_start = ptr;
+	  if (ptr != logical + logical_len)
+	    {
+	      grub_memset (visual_ptr, 0, sizeof (visual_ptr[0]));
+	      visual_ptr->base = '\n';
+	      visual_ptr++;
+	    }
+	}
+    }
+  return visual_ptr - *visual_out;
+}
+
+struct grub_unicode_glyph *
+grub_unicode_glyph_dup (const struct grub_unicode_glyph *in)
+{
+  struct grub_unicode_glyph *out = grub_malloc (sizeof (*out));
+  if (!out)
+    return NULL;
+  grub_memcpy (out, in, sizeof (*in));
+  out->combining = grub_malloc (in->ncomb * sizeof (*in));
+  if (!out->combining)
+    {
+      grub_free (out);
+      return NULL;
+    }
+  grub_memcpy (out->combining, in->combining, in->ncomb * sizeof (*in));
+  return out;
+}
+
+struct grub_unicode_glyph *
+grub_unicode_glyph_from_code (grub_uint32_t code)
+{
+  struct grub_unicode_glyph *ret;
+  ret = grub_malloc (sizeof (*ret));
+  if (!ret)
+    return NULL;
+
+  ret->base = code;
+  ret->variant = 0;
+  ret->attributes = 0;
+  ret->ncomb = 0;
+  ret->combining = 0;
+
+  return ret;
+}
+
+static grub_uint32_t
+map_code (grub_uint32_t in, struct grub_term_output *term)
+{
+  if (in <= 0x7f)
+    return in;
+
+  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) == GRUB_TERM_CODE_TYPE_VGA)
+    {
+      switch (in)
+	{
+	case GRUB_TERM_DISP_LEFT:
+	  return 0x1b;
+	case GRUB_TERM_DISP_UP:
+	  return 0x18;
+	case GRUB_TERM_DISP_RIGHT:
+	  return 0x1a;
+	case GRUB_TERM_DISP_DOWN:
+	  return 0x19;
+	case GRUB_TERM_DISP_HLINE:
+	  return 0xc4;
+	case GRUB_TERM_DISP_VLINE:
+	  return 0xb3;
+	case GRUB_TERM_DISP_UL:
+	  return 0xda;
+	case GRUB_TERM_DISP_UR:
+	  return 0xbf;
+	case GRUB_TERM_DISP_LL:
+	  return  0xc0;
+	case GRUB_TERM_DISP_LR:
+	  return 0xd9;
+	}
+      return '?';
+    }
+  else
+    {
+      /* Better than nothing.  */
+      switch (in)
+	{
+	case GRUB_TERM_DISP_LEFT:
+	  return '<';
+		
+	case GRUB_TERM_DISP_UP:
+	  return '^';
+		
+	case GRUB_TERM_DISP_RIGHT:
+	  return '>';
+		
+	case GRUB_TERM_DISP_DOWN:
+	  return 'v';
+		  
+	case GRUB_TERM_DISP_HLINE:
+	  return '-';
+		  
+	case GRUB_TERM_DISP_VLINE:
+	  return '|';
+		  
+	case GRUB_TERM_DISP_UL:
+	case GRUB_TERM_DISP_UR:
+	case GRUB_TERM_DISP_LL:
+	case GRUB_TERM_DISP_LR:
+	  return '+';
+		
+	}
+      return '?';
+    }
+  return in;
+}
+
+/* Put a Unicode character.  */
+void
+grub_putcode (grub_uint32_t code,
+	      struct grub_term_output *term)
+{
+  struct grub_unicode_glyph c =
+    {
+      .variant = 0,
+      .attributes = 0,
+      .ncomb = 0,
+      .combining = 0
+    };
+
+  if (grub_unicode_get_comb_type (code) != GRUB_UNICODE_COMB_NONE)
+    return;
+
+  if (code == '\t' && term->getxy)
+    {
+      int n;
+
+      n = 8 - ((term->getxy () >> 8) & 7);
+      while (n--)
+	grub_putcode (' ', term);
+
+      return;
+    }
+
+  c.base = map_code (code, term);
+
+  (term->putchar) (&c);
+  if (code == '\n')
+    grub_putcode ('\r', term);
+}
+
+
+void
+grub_print_ucs4 (const grub_uint32_t * str,
+		 const grub_uint32_t * last_position,
+		 struct grub_term_output *term)
+{
+  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
+      == GRUB_TERM_CODE_TYPE_UCS4_VISUAL)
+    {
+      grub_ssize_t visual_len;
+      struct grub_unicode_glyph *visual;
+      struct grub_unicode_glyph *visual_ptr;
+      visual_len = grub_bidi_logical_to_visual (str,
+						last_position - str,
+						&visual,
+						term->getcharwidth,
+						grub_term_width (term));
+      if (visual_len < 0)
+	{
+	  grub_print_error ();
+	  return;
+	}
+      for (visual_ptr = visual; visual_ptr < visual + visual_len; visual_ptr++)
+	{
+	  struct grub_unicode_glyph glyph_r = {
+	    .base = '\r',
+	    .variant = 0,
+	    .attributes = 0,
+	    .ncomb = 0,
+	    .combining = 0
+	  };
+	  term->putchar (visual_ptr);
+	  if (visual_ptr->base == '\n')
+	    term->putchar (&glyph_r);
+	  grub_free (visual_ptr->combining);
+	}
+      grub_free (visual);
+      return;
+    }
+
+  /* FIXME: UTF-8 terminals.  */
+  {
+    const grub_uint32_t *ptr;
+    for (ptr = str; ptr < last_position; ptr++)
+      grub_putcode (*ptr, term);
+  }
+}
+
+void
+grub_xputs_normal (const char *str)
+{
+  grub_term_output_t term;
+
+  FOR_ACTIVE_TERM_OUTPUTS(term)
+  {
+    grub_uint32_t *unicode_str, *unicode_last_position;
+    grub_utf8_to_ucs4_alloc (str, &unicode_str,
+			     &unicode_last_position);
+    grub_print_ucs4 (unicode_str, unicode_last_position, term);
+    grub_free (unicode_str);
+  }
+}
diff --git a/normal/main.c b/normal/main.c
index 5a5467485..334be00e9 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -644,10 +644,15 @@ grub_env_write_pager (struct grub_env_var *var __attribute__ ((unused)),
   return grub_strdup (val);
 }
 
+static void (*grub_xputs_saved) (const char *str);
+
 GRUB_MOD_INIT(normal)
 {
   grub_context_init ();
 
+  grub_xputs_saved = grub_xputs;
+  grub_xputs = grub_xputs_normal;
+
   /* Normal mode shouldn't be unloaded.  */
   if (mod)
     grub_dl_ref (mod);
@@ -676,6 +681,8 @@ GRUB_MOD_FINI(normal)
 {
   grub_context_fini ();
 
+  grub_xputs = grub_xputs_saved;
+
   grub_set_history (0);
   grub_register_variable_hook ("pager", 0, 0);
   grub_fs_autoload_hook = 0;
diff --git a/normal/menu_text.c b/normal/menu_text.c
index 53aed35b7..1504a8e60 100644
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -46,18 +46,6 @@ print_spaces (int number_spaces, struct grub_term_output *term)
     grub_putcode (' ', term);
 }
 
-void
-grub_print_ucs4 (const grub_uint32_t * str,
-		 const grub_uint32_t * last_position,
-		 struct grub_term_output *term)
-{
-  while (str < last_position)
-    {
-      grub_putcode (*str, term);
-      str++;
-    }
-}
-
 grub_ssize_t
 grub_getstringwidth (grub_uint32_t * str, const grub_uint32_t * last_position,
 		     struct grub_term_output *term)
@@ -66,8 +54,9 @@ grub_getstringwidth (grub_uint32_t * str, const grub_uint32_t * last_position,
 
   while (str < last_position)
     {
-      width += grub_term_getcharwidth (term, *str);
-      str++;
+      struct grub_unicode_glyph glyph;
+      str += grub_unicode_aglomerate_comb (str, last_position - str, &glyph);
+      width += grub_term_getcharwidth (term, &glyph);
     }
   return width;
 }
@@ -83,8 +72,18 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,
 
   int msg_len;
 
-  line_len = grub_term_width (term) - grub_term_getcharwidth (term, 'm') *
-    (margin_left + margin_right);
+  {
+    struct grub_unicode_glyph pseudo_glyph = {
+      .base = ' ',
+      .variant = 0,
+      .attributes = 0,
+      .ncomb = 0,
+      .combining = 0
+      };
+    line_len = grub_term_width (term)
+      - grub_term_getcharwidth (term, &pseudo_glyph) 
+      * (margin_left + margin_right);
+  }
 
   msg_len = grub_utf8_to_ucs4_alloc (msg, &unicode_msg, &last_position);
 
@@ -252,34 +251,53 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
 
   grub_term_gotoxy (term, GRUB_TERM_LEFT_BORDER_X + GRUB_TERM_MARGIN, y);
 
+  int last_printed = 0;
   for (x = GRUB_TERM_LEFT_BORDER_X + GRUB_TERM_MARGIN + 1, i = 0;
        x < (int) (GRUB_TERM_LEFT_BORDER_X + grub_term_border_width (term)
-		  - GRUB_TERM_MARGIN);
-       i++)
+		  - GRUB_TERM_MARGIN);)
     {
       if (i < len
 	  && x <= (int) (GRUB_TERM_LEFT_BORDER_X + grub_term_border_width (term)
 			 - GRUB_TERM_MARGIN - 1))
 	{
 	  grub_ssize_t width;
+	  struct grub_unicode_glyph glyph;
 
-	  width = grub_term_getcharwidth (term, unicode_title[i]);
+	  i += grub_unicode_aglomerate_comb (unicode_title + i,
+					     len - i, &glyph);
 
-	  if (x + width > (int) (GRUB_TERM_LEFT_BORDER_X 
+	  width = grub_term_getcharwidth (term, &glyph);
+
+	  if (x + width <= (int) (GRUB_TERM_LEFT_BORDER_X 
 				 + grub_term_border_width (term)
 				 - GRUB_TERM_MARGIN - 1))
-	    grub_putcode (GRUB_TERM_DISP_RIGHT, term);
-	  else
-	    grub_putcode (unicode_title[i], term);
-
+	    last_printed = i;
 	  x += width;
 	}
       else
-	{
-	  grub_putcode (' ', term);
-	  x++;
-	}
+	break;
     }
+
+  grub_print_ucs4 (unicode_title,
+		   unicode_title + last_printed, term);
+
+  if (last_printed != len)
+    {
+      grub_putcode (GRUB_TERM_DISP_RIGHT, term);
+      struct grub_unicode_glyph pseudo_glyph = {
+	.base = GRUB_TERM_DISP_RIGHT,
+	.variant = 0,
+	.attributes = 0,
+	.ncomb = 0,
+	.combining = 0
+      };
+      x += grub_term_getcharwidth (term, &pseudo_glyph);
+    }
+
+  for (; x < (int) (GRUB_TERM_LEFT_BORDER_X + grub_term_border_width (term)
+		    - GRUB_TERM_MARGIN); x++)
+    grub_putcode (' ', term);
+
   grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
   grub_putcode (' ', term);
 
diff --git a/term/gfxterm.c b/term/gfxterm.c
index e9d343317..797e714d2 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -48,7 +48,7 @@ struct grub_dirty_region
 struct grub_colored_char
 {
   /* An Unicode codepoint.  */
-  grub_uint32_t code;
+  struct grub_unicode_glyph *code;
 
   /* Color values.  */
   grub_video_color_t fg_color;
@@ -147,6 +147,9 @@ static unsigned char calculate_character_width (struct grub_font_glyph *glyph);
 
 static void grub_gfxterm_refresh (void);
 
+static grub_ssize_t
+grub_gfxterm_getcharwidth (const struct grub_unicode_glyph *c);
+
 static void
 set_term_color (grub_uint8_t term_color)
 {
@@ -176,7 +179,10 @@ set_term_color (grub_uint8_t term_color)
 static void
 clear_char (struct grub_colored_char *c)
 {
-  c->code = ' ';
+  grub_free (c->code);
+  c->code = grub_unicode_glyph_from_code (' ');
+  if (!c->code)
+    grub_errno = GRUB_ERR_NONE;
   c->fg_color = virtual_screen.fg_color;
   c->bg_color = virtual_screen.bg_color;
   c->width = 0;
@@ -265,7 +271,10 @@ grub_virtual_screen_setup (unsigned int x, unsigned int y,
 
   /* Clear out text buffer. */
   for (i = 0; i < virtual_screen.columns * virtual_screen.rows; i++)
-    clear_char (&(virtual_screen.text_buffer[i]));
+    {
+      virtual_screen.text_buffer[i].code = 0;
+      clear_char (&(virtual_screen.text_buffer[i]));
+    }
 
   return grub_errno;
 }
@@ -610,7 +619,12 @@ paint_char (unsigned cx, unsigned cy)
   p -= p->index;
 
   /* Get glyph for character.  */
-  glyph = grub_font_get_glyph (virtual_screen.font, p->code);
+  glyph = grub_font_construct_glyph (virtual_screen.font, p->code);
+  if (!glyph)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      return;
+    }
   ascent = grub_font_get_ascent (virtual_screen.font);
 
   width = virtual_screen.normal_char_width * calculate_character_width(glyph);
@@ -631,6 +645,7 @@ paint_char (unsigned cx, unsigned cy)
   /* Mark character to be drawn.  */
   dirty_region_add (virtual_screen.offset_x + x, virtual_screen.offset_y + y,
                     width, height);
+  grub_free (glyph);
 }
 
 static inline void
@@ -777,6 +792,15 @@ scroll_up (void)
 {
   unsigned int i;
 
+  /* Clear first line in text buffer.  */
+  for (i = 0;
+       i < virtual_screen.columns;
+       i++)
+    {
+      virtual_screen.text_buffer[i].code = 0;
+      clear_char (&(virtual_screen.text_buffer[i]));
+    }
+
   /* Scroll text buffer with one line to up.  */
   grub_memmove (virtual_screen.text_buffer,
                 virtual_screen.text_buffer + virtual_screen.columns,
@@ -788,15 +812,18 @@ scroll_up (void)
   for (i = virtual_screen.columns * (virtual_screen.rows - 1);
        i < virtual_screen.columns * virtual_screen.rows;
        i++)
-    clear_char (&(virtual_screen.text_buffer[i]));
+    {
+      virtual_screen.text_buffer[i].code = 0;
+      clear_char (&(virtual_screen.text_buffer[i]));
+    }
 
   virtual_screen.total_scroll++;
 }
 
 static void
-grub_gfxterm_putchar (grub_uint32_t c)
+grub_gfxterm_putchar (const struct grub_unicode_glyph *c)
 {
-  if (c == '\a')
+  if (c->base == '\a')
     /* FIXME */
     return;
 
@@ -804,9 +831,9 @@ grub_gfxterm_putchar (grub_uint32_t c)
   if (virtual_screen.cursor_state)
     draw_cursor (0);
 
-  if (c == '\b' || c == '\n' || c == '\r')
+  if (c->base == '\b' || c->base == '\n' || c->base == '\r')
     {
-      switch (c)
+      switch (c->base)
         {
         case '\b':
           if (virtual_screen.cursor_x > 0)
@@ -827,26 +854,30 @@ grub_gfxterm_putchar (grub_uint32_t c)
     }
   else
     {
-      struct grub_font_glyph *glyph;
       struct grub_colored_char *p;
       unsigned char char_width;
 
-      /* Get properties of the character.  */
-      glyph = grub_font_get_glyph (virtual_screen.font, c);
-
       /* Calculate actual character width for glyph. This is number of
          times of normal_font_width.  */
-      char_width = calculate_character_width(glyph);
+      char_width = grub_gfxterm_getcharwidth (c);
 
       /* If we are about to exceed line length, wrap to next line.  */
       if (virtual_screen.cursor_x + char_width > virtual_screen.columns)
-        grub_gfxterm_putchar ('\n');
+	{
+          if (virtual_screen.cursor_y >= virtual_screen.rows - 1)
+            scroll_up ();
+          else
+            virtual_screen.cursor_y++;
+	}
 
       /* Find position on virtual screen, and fill information.  */
       p = (virtual_screen.text_buffer +
            virtual_screen.cursor_x +
            virtual_screen.cursor_y * virtual_screen.columns);
-      p->code = c;
+      grub_free (p->code);
+      p->code = grub_unicode_glyph_dup (c);
+      if (!p->code)
+	grub_errno = GRUB_ERR_NONE;
       p->fg_color = virtual_screen.fg_color;
       p->bg_color = virtual_screen.bg_color;
       p->width = char_width - 1;
@@ -859,7 +890,10 @@ grub_gfxterm_putchar (grub_uint32_t c)
 
           for (i = 1; i < char_width; i++)
             {
-              p[i].code = ' ';
+	      grub_free (p[i].code);
+              p[i].code = grub_unicode_glyph_from_code (' ');
+	      if (!p[i].code)
+		grub_errno = GRUB_ERR_NONE;
               p[i].width = char_width - 1;
               p[i].index = i;
             }
@@ -924,18 +958,16 @@ calculate_character_width (struct grub_font_glyph *glyph)
 }
 
 static grub_ssize_t
-grub_gfxterm_getcharwidth (grub_uint32_t c)
+grub_gfxterm_getcharwidth (const struct grub_unicode_glyph *c)
 {
-  struct grub_font_glyph *glyph;
-  unsigned char char_width;
+  int dev_width;
+  dev_width = grub_font_get_constructed_device_width (virtual_screen.font, c);
 
-  /* Get properties of the character.  */
-  glyph = grub_font_get_glyph (virtual_screen.font, c);
+  if (dev_width == 0)
+    return 1;
 
-  /* Calculate actual character width for glyph.  */
-  char_width = calculate_character_width (glyph);
-
-  return char_width;
+  return (dev_width + (virtual_screen.normal_char_width - 1))
+    / virtual_screen.normal_char_width;
 }
 
 static grub_uint16_t
@@ -1174,7 +1206,7 @@ static struct grub_term_output grub_video_term =
     .getcolor = grub_virtual_screen_getcolor,
     .setcursor = grub_gfxterm_setcursor,
     .refresh = grub_gfxterm_refresh,
-    .flags = 0,
+    .flags = GRUB_TERM_CODE_TYPE_UCS4_VISUAL,
     .next = 0
   };
 
diff --git a/term/i386/pc/console.c b/term/i386/pc/console.c
index 43cfe2f2a..5def6fca0 100644
--- a/term/i386/pc/console.c
+++ b/term/i386/pc/console.c
@@ -65,7 +65,8 @@ static struct grub_term_output grub_console_term_output =
     .setcolorstate = grub_console_setcolorstate,
     .setcolor = grub_console_setcolor,
     .getcolor = grub_console_getcolor,
-    .setcursor = grub_console_setcursor
+    .setcursor = grub_console_setcursor,
+    .flags = GRUB_TERM_CODE_TYPE_VGA
   };
 
 void
diff --git a/term/i386/pc/vesafb.c b/term/i386/pc/vesafb.c
index 52694ed10..31333d7ea 100644
--- a/term/i386/pc/vesafb.c
+++ b/term/i386/pc/vesafb.c
@@ -214,45 +214,7 @@ grub_virtual_screen_get_glyph (grub_uint32_t code,
 			       unsigned *width)
 {
   if (code > 0x7f)
-    {
-      /* Map some unicode characters to the VGA font, if possible.  */
-      switch (code)
-	{
-	case 0x2190:	/* left arrow */
-	  code = 0x1b;
-	  break;
-	case 0x2191:	/* up arrow */
-	  code = 0x18;
-	  break;
-	case 0x2192:	/* right arrow */
-	  code = 0x1a;
-	  break;
-	case 0x2193:	/* down arrow */
-	  code = 0x19;
-	  break;
-	case 0x2501:	/* horizontal line */
-	  code = 0xc4;
-	  break;
-	case 0x2503:	/* vertical line */
-	  code = 0xb3;
-	  break;
-	case 0x250F:	/* upper-left corner */
-	  code = 0xda;
-	  break;
-	case 0x2513:	/* upper-right corner */
-	  code = 0xbf;
-	  break;
-	case 0x2517:	/* lower-left corner */
-	  code = 0xc0;
-	  break;
-	case 0x251B:	/* lower-right corner */
-	  code = 0xd9;
-	  break;
-
-	default:
-	  return grub_font_get_glyph_any (code, bitmap, width);
-	}
-    }
+    return grub_font_get_glyph_any (code, bitmap, width);
 
   /* TODO This is wrong for the new font module.  Should it be fixed?  */
   if (bitmap)
@@ -592,7 +554,7 @@ static struct grub_term_output grub_vesafb_term =
     .cls = grub_vesafb_cls,
     .setcolorstate = grub_virtual_screen_setcolorstate,
     .setcursor = grub_vesafb_setcursor,
-    .flags = 0,
+    .flags = GRUB_TERM_CODE_TYPE_VGA
   };
 
 GRUB_MOD_INIT(vesafb)
diff --git a/term/i386/pc/vga.c b/term/i386/pc/vga.c
index addb0bcbb..448a773ef 100644
--- a/term/i386/pc/vga.c
+++ b/term/i386/pc/vga.c
@@ -287,23 +287,23 @@ scroll_up (void)
 }
 
 static void
-grub_vga_putchar (grub_uint32_t c)
+grub_vga_putchar (const struct grub_unicode_glyph *c)
 {
 #if DEBUG_VGA
   static int show = 1;
 #endif
 
-  if (c == '\a')
+  if (c->base == '\a')
     /* FIXME */
     return;
 
-  if (c == '\b' || c == '\n' || c == '\r')
+  if (c->base == '\b' || c->base == '\n' || c->base == '\r')
     {
       /* Erase current cursor, if any.  */
       if (cursor_state)
 	write_char ();
 
-      switch (c)
+      switch (c->base)
 	{
 	case '\b':
 	  if (xpos > 0)
@@ -331,13 +331,19 @@ grub_vga_putchar (grub_uint32_t c)
       struct colored_char *p;
       unsigned char_width = 1;
 
-      glyph = grub_font_get_glyph(font, c);
+      glyph = grub_font_get_glyph(font, c->base);
 
       if (xpos + char_width > TEXT_WIDTH)
-	grub_vga_putchar ('\n');
+	{
+	  xpos = 0;
+	  if (ypos >= TEXT_HEIGHT - 1)
+	    scroll_up ();
+	  else
+	    ypos++;
+	}
 
       p = text_buf + xpos + ypos * TEXT_WIDTH;
-      p->code = c;
+      p->code = c->base;
       p->fg_color = fg_color;
       p->bg_color = bg_color;
       p->width = char_width - 1;
@@ -387,12 +393,12 @@ grub_vga_putchar (grub_uint32_t c)
 }
 
 static grub_ssize_t
-grub_vga_getcharwidth (grub_uint32_t c)
+grub_vga_getcharwidth (const struct grub_unicode_glyph *c)
 {
 #if 0
   struct grub_font_glyph glyph;
 
-  glyph = grub_font_get_glyph (c);
+  glyph = grub_font_get_glyph (c->base);
 
   return glyph.char_width;
 #else
@@ -499,7 +505,7 @@ static struct grub_term_output grub_vga_term =
     .cls = grub_vga_cls,
     .setcolorstate = grub_vga_setcolorstate,
     .setcursor = grub_vga_setcursor,
-    .flags = 0,
+    .flags = GRUB_TERM_CODE_TYPE_UCS4_VISUAL,
   };
 
 GRUB_MOD_INIT(vga)
diff --git a/term/i386/pc/vga_text.c b/term/i386/pc/vga_text.c
index f954cab43..82cc11967 100644
--- a/term/i386/pc/vga_text.c
+++ b/term/i386/pc/vga_text.c
@@ -164,6 +164,7 @@ static struct grub_term_output grub_vga_text_term =
     .setcolor = grub_console_setcolor,
     .getcolor = grub_console_getcolor,
     .setcursor = grub_vga_text_setcursor,
+    .flags = GRUB_TERM_CODE_TYPE_VGA
   };
 
 GRUB_MOD_INIT(vga_text)
diff --git a/term/i386/vga_common.c b/term/i386/vga_common.c
index 131b43ab6..30458b034 100644
--- a/term/i386/vga_common.c
+++ b/term/i386/vga_common.c
@@ -25,62 +25,14 @@ static grub_uint8_t grub_console_standard_color = 0x7;
 static grub_uint8_t grub_console_normal_color = 0x7;
 static grub_uint8_t grub_console_highlight_color = 0x70;
 
-static grub_uint32_t
-map_char (grub_uint32_t c)
-{
-  if (c > 0x7f)
-    {
-      /* Map some unicode characters to the VGA font, if possible.  */
-      switch (c)
-	{
-	case 0x2190:	/* left arrow */
-	  c = 0x1b;
-	  break;
-	case 0x2191:	/* up arrow */
-	  c = 0x18;
-	  break;
-	case 0x2192:	/* right arrow */
-	  c = 0x1a;
-	  break;
-	case 0x2193:	/* down arrow */
-	  c = 0x19;
-	  break;
-	case 0x2501:	/* horizontal line */
-	  c = 0xc4;
-	  break;
-	case 0x2503:	/* vertical line */
-	  c = 0xb3;
-	  break;
-	case 0x250F:	/* upper-left corner */
-	  c = 0xda;
-	  break;
-	case 0x2513:	/* upper-right corner */
-	  c = 0xbf;
-	  break;
-	case 0x2517:	/* lower-left corner */
-	  c = 0xc0;
-	  break;
-	case 0x251B:	/* lower-right corner */
-	  c = 0xd9;
-	  break;
-
-	default:
-	  c = '?';
-	  break;
-	}
-    }
-
-  return c;
-}
-
 void
-grub_console_putchar (grub_uint32_t c)
+grub_console_putchar (const struct grub_unicode_glyph *c)
 {
-  grub_console_real_putchar (map_char (c));
+  grub_console_real_putchar (c->base);
 }
 
 grub_ssize_t
-grub_console_getcharwidth (grub_uint32_t c __attribute__ ((unused)))
+grub_console_getcharwidth (const struct grub_unicode_glyph *c __attribute__ ((unused)))
 {
   /* For now, every printable character has the width 1.  */
   return 1;
diff --git a/term/serial.c b/term/serial.c
index 1ef881f63..d98ca4c9e 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -317,55 +317,12 @@ serial_hw_init (void)
 
 /* The serial version of putchar.  */
 static void
-grub_serial_putchar (grub_uint32_t c)
+grub_serial_putchar (const struct grub_unicode_glyph *c)
 {
   /* Keep track of the cursor.  */
   if (keep_track)
     {
-      /* The serial terminal does not have VGA fonts.  */
-      if (c > 0x7F)
-	{
-	  /* Better than nothing.  */
-	  switch (c)
-	    {
-	    case GRUB_TERM_DISP_LEFT:
-	      c = '<';
-	      break;
-
-	    case GRUB_TERM_DISP_UP:
-	      c = '^';
-	      break;
-
-	    case GRUB_TERM_DISP_RIGHT:
-	      c = '>';
-	      break;
-
-	    case GRUB_TERM_DISP_DOWN:
-	      c = 'v';
-	      break;
-
-	    case GRUB_TERM_DISP_HLINE:
-	      c = '-';
-	      break;
-
-	    case GRUB_TERM_DISP_VLINE:
-	      c = '|';
-	      break;
-
-	    case GRUB_TERM_DISP_UL:
-	    case GRUB_TERM_DISP_UR:
-	    case GRUB_TERM_DISP_LL:
-	    case GRUB_TERM_DISP_LR:
-	      c = '+';
-	      break;
-
-	    default:
-	      c = '?';
-	      break;
-	    }
-	}
-
-      switch (c)
+      switch (c->base)
 	{
 	case '\a':
 	  break;
@@ -388,19 +345,22 @@ grub_serial_putchar (grub_uint32_t c)
 	default:
 	  if (xpos >= TEXT_WIDTH)
 	    {
-	      grub_serial_putchar ('\r');
-	      grub_serial_putchar ('\n');
+	      xpos = 0;
+	      if (ypos < TEXT_HEIGHT - 1)
+		ypos++;
+	      serial_hw_put ('\r');
+	      serial_hw_put ('\n');
 	    }
 	  xpos++;
 	  break;
 	}
     }
 
-  serial_hw_put (c);
+  serial_hw_put (c->base);
 }
 
 static grub_ssize_t
-grub_serial_getcharwidth (grub_uint32_t c __attribute__ ((unused)))
+grub_serial_getcharwidth (const struct grub_unicode_glyph *c __attribute__ ((unused)))
 {
   return 1;
 }
@@ -491,7 +451,7 @@ static struct grub_term_output grub_serial_term_output =
   .cls = grub_serial_cls,
   .setcolorstate = grub_serial_setcolorstate,
   .setcursor = grub_serial_setcursor,
-  .flags = 0,
+  .flags = GRUB_TERM_CODE_TYPE_UTF8_LOGICAL,
 };
 
 
diff --git a/term/terminfo.c b/term/terminfo.c
index 9a5979b1c..48a49f092 100644
--- a/term/terminfo.c
+++ b/term/terminfo.c
@@ -111,7 +111,17 @@ static void
 putstr (const char *str, grub_term_output_t oterm)
 {
   while (*str)
-    grub_putcode (*str++, oterm);
+    {
+      struct grub_unicode_glyph c =
+	{
+	  .base = *str++,
+	  .variant = 0,
+	  .attributes = 0,
+	  .ncomb = 0,
+	  .combining = 0
+	};
+      oterm->putchar (&c);
+    }
 }
 
 /* Move the cursor to the given position starting with "0".  */
diff --git a/util/console.c b/util/console.c
index 382fd7f89..91480a810 100644
--- a/util/console.c
+++ b/util/console.c
@@ -64,54 +64,13 @@ static grub_uint8_t color_map[NUM_COLORS] =
 static int use_color;
 
 static void
-grub_ncurses_putchar (grub_uint32_t c)
+grub_ncurses_putchar (const struct grub_unicode_glyph *c)
 {
-  /* Better than nothing.  */
-  switch (c)
-    {
-    case GRUB_TERM_DISP_LEFT:
-      c = '<';
-      break;
-
-    case GRUB_TERM_DISP_UP:
-      c = '^';
-      break;
-
-    case GRUB_TERM_DISP_RIGHT:
-      c = '>';
-      break;
-
-    case GRUB_TERM_DISP_DOWN:
-      c = 'v';
-      break;
-
-    case GRUB_TERM_DISP_HLINE:
-      c = '-';
-      break;
-
-    case GRUB_TERM_DISP_VLINE:
-      c = '|';
-      break;
-
-    case GRUB_TERM_DISP_UL:
-    case GRUB_TERM_DISP_UR:
-    case GRUB_TERM_DISP_LL:
-    case GRUB_TERM_DISP_LR:
-      c = '+';
-      break;
-
-    default:
-      /* ncurses does not support Unicode.  */
-      if (c > 0x7f)
-	c = '?';
-      break;
-    }
-
-  addch (c | grub_console_attr);
+  addch (c->base | grub_console_attr);
 }
 
 static grub_ssize_t
-grub_ncurses_getcharwidth (grub_uint32_t code __attribute__ ((unused)))
+grub_ncurses_getcharwidth (const struct grub_unicode_glyph * c __attribute__ ((unused)))
 {
   return 1;
 }
@@ -367,7 +326,8 @@ static struct grub_term_output grub_ncurses_term_output =
     .setcolor = grub_ncurses_setcolor,
     .getcolor = grub_ncurses_getcolor,
     .setcursor = grub_ncurses_setcursor,
-    .refresh = grub_ncurses_refresh
+    .refresh = grub_ncurses_refresh,
+    .flags = GRUB_TERM_CODE_TYPE_ASCII
   };
 
 void
diff --git a/util/grub-emu.c b/util/grub-emu.c
index 7d4544509..debf53b1d 100644
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -63,6 +63,11 @@ grub_arch_dl_check_header (void *ehdr)
   return GRUB_ERR_BAD_MODULE;
 }
 
+void grub_hostfs_init (void);
+void grub_hostfs_fini (void);
+void grub_host_init (void);
+void grub_host_fini (void);
+
 grub_err_t
 grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 {
@@ -75,7 +80,14 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 void
 grub_reboot (void)
 {
-  longjmp (main_env, 1);
+  grub_fini_all ();
+  grub_hostfs_fini ();
+  grub_host_fini ();
+
+  grub_machine_fini ();
+
+  exit (0);
+  //  longjmp (main_env, 1);
 }
 
 void
@@ -146,11 +158,6 @@ usage (int status)
 }
 
 
-void grub_hostfs_init (void);
-void grub_hostfs_fini (void);
-void grub_host_init (void);
-void grub_host_fini (void);
-
 int
 main (int argc, char *argv[])
 {

From 7f837ea536c3a6cf2409984482b28460b242dddf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 15 Mar 2010 21:34:50 +0100
Subject: [PATCH 0612/1628] Fixed circular dependency

---
 conf/common.rmk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index 3a7dd4f6c..2d9f2c763 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -637,7 +637,8 @@ normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
 	normal/auth.c normal/autofs.c normal/handler.c \
 	normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
 	normal/menu_entry.c normal/menu_text.c lib/charset.c \
-	normal/misc.c normal/crypto.c normal/term.c normal/context.c
+	normal/misc.c normal/crypto.c normal/term.c normal/context.c \
+	unidata.c
 normal_mod_CFLAGS = $(COMMON_CFLAGS)
 normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
@@ -680,7 +681,7 @@ bitmap_scale_mod_CFLAGS = $(COMMON_CFLAGS)
 bitmap_scale_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += font.mod
-font_mod_SOURCES = font/font_cmd.c font/font.c unidata.c
+font_mod_SOURCES = font/font_cmd.c font/font.c
 font_mod_CFLAGS = $(COMMON_CFLAGS)
 font_mod_LDFLAGS = $(COMMON_LDFLAGS)
 

From 53c648d2eb0bc290248918ef1ceff96e10a8f834 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 15 Mar 2010 22:12:34 +0100
Subject: [PATCH 0613/1628] Break few dependencies on normal

---
 conf/common.rmk        |   3 +-
 font/font.c            |  75 ++---------------------------
 gfxmenu/font.c         | 107 +++++++++++++++++++++++++++++++++++++++++
 include/grub/unicode.h |  45 +++++++++++++++--
 lib/charset.c          |  43 ++---------------
 normal/menu_text.c     |   1 +
 6 files changed, 158 insertions(+), 116 deletions(-)
 create mode 100644 gfxmenu/font.c

diff --git a/conf/common.rmk b/conf/common.rmk
index 2d9f2c763..84f9c9fe4 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -496,7 +496,8 @@ gfxmenu_mod_SOURCES = \
 	gfxmenu/gui_progress_bar.c \
 	gfxmenu/gui_util.c \
 	gfxmenu/gui_string_util.c \
-	gfxmenu/named_colors.c
+	gfxmenu/named_colors.c \
+	gfxmenu/font.c
 gfxmenu_mod_CFLAGS = $(COMMON_CFLAGS)
 gfxmenu_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/font/font.c b/font/font.c
index a94fe8ed1..6209b60d2 100644
--- a/font/font.c
+++ b/font/font.c
@@ -924,30 +924,6 @@ grub_font_get_height (grub_font_t font)
   return font->ascent + font->descent + font->leading;
 }
 
-/* Get the width in pixels of the specified UTF-8 string, when rendered in
-   in the specified font (but falling back on other fonts for glyphs that
-   are missing).  */
-int
-grub_font_get_string_width (grub_font_t font, const char *str)
-{
-  int width;
-  struct grub_font_glyph *glyph;
-  grub_uint32_t code;
-  const grub_uint8_t *ptr;
-
-  for (ptr = (const grub_uint8_t *) str, width = 0;
-       grub_utf8_to_ucs4 (&code, 1, ptr, -1, &ptr) > 0; )
-    {
-      glyph = grub_font_get_glyph_with_fallback (font, code);
-      if (glyph)
-	width += glyph->device_width;
-      else
-	width += unknown_glyph->device_width;
-    }
-
-  return width;
-}
-
 /* Get the glyph for FONT corresponding to the Unicode code point CODE.
    Returns the ASCII glyph for the code if no other fonts are available. 
    The glyphs are cached once loaded.  */
@@ -1202,7 +1178,6 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 
   for (i = 0; i < glyph_id->ncomb; i++)
     {
-      enum grub_comb_type combtype;
       grub_int16_t space = 0;
       grub_int16_t centerx = (bounds.width - combining_glyphs[i]->width) / 2
 	+ bounds.x;
@@ -1210,10 +1185,9 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
       if (!combining_glyphs[i])
 	continue;
       /* CGJ is to avoid diacritics reordering. */
-      if (glyph_id->combining[i] == GRUB_UNICODE_COMBINING_GRAPHEME_JOINER)
+      if (glyph_id->combining[i].code == GRUB_UNICODE_COMBINING_GRAPHEME_JOINER)
 	continue;
-      combtype = grub_unicode_get_comb_type (glyph_id->combining[i]);
-      switch (combtype)
+      switch (glyph_id->combining[i].type)
 	{
 	case GRUB_UNICODE_COMB_OVERLAY:
 	  do_blit (combining_glyphs[i],
@@ -1324,7 +1298,7 @@ grub_font_construct_dry_run (grub_font_t hinted_font,
     for (i = 0; i < glyph_id->ncomb; i++)
       combining_glyphs[i]
 	= grub_font_get_glyph_with_fallback (main_glyph->font,
-					     glyph_id->combining[i]);
+					     glyph_id->combining[i].code);
   }
 
   blit_comb (glyph_id, NULL, bounds, main_glyph, combining_glyphs, device_width);
@@ -1446,46 +1420,3 @@ grub_font_draw_glyph (struct grub_font_glyph *glyph,
                                  glyph->width, glyph->height);
 }
 
-/* Draw a UTF-8 string of text on the current video render target.
-   The x coordinate specifies the starting x position for the first character,
-   while the y coordinate specifies the baseline position.
-   If the string contains a character that FONT does not contain, then
-   a glyph from another loaded font may be used instead.  */
-grub_err_t
-grub_font_draw_string (const char *str, grub_font_t font,
-                       grub_video_color_t color,
-                       int left_x, int baseline_y)
-{
-  int x;
-  struct grub_font_glyph *glyph;
-  grub_uint32_t *logical;
-  grub_ssize_t logical_len, visual_len;
-  struct grub_unicode_glyph *visual, *ptr;
-
-  logical_len = grub_utf8_to_ucs4_alloc (str, &logical, 0);
-  if (logical_len < 0)
-    return grub_errno;
-
-  visual_len = grub_bidi_logical_to_visual (logical, logical_len, &visual, 0, 0);
-  grub_free (logical);
-  if (visual_len < 0)
-    return grub_errno;
-
-  for (ptr = visual, x = left_x; ptr < visual + visual_len; ptr++)
-    {
-      grub_err_t err;
-      glyph = grub_font_construct_glyph (font, ptr);
-      if (!glyph)
-	return grub_errno;
-      err = grub_font_draw_glyph (glyph, color, x, baseline_y);
-      grub_free (glyph);
-      if (err)
-	return err;
-      x += glyph->device_width;
-    }
-
-  grub_free (visual);
-
-  return GRUB_ERR_NONE;
-}
-
diff --git a/gfxmenu/font.c b/gfxmenu/font.c
new file mode 100644
index 000000000..9209cbaa5
--- /dev/null
+++ b/gfxmenu/font.c
@@ -0,0 +1,107 @@
+/* font.c - Font API and font file loader.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2003,2005,2006,2007,2008,2009,2010  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/bufio.h>
+#include <grub/dl.h>
+#include <grub/file.h>
+#include <grub/font.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/types.h>
+#include <grub/video.h>
+#include <grub/bitmap.h>
+#include <grub/charset.h>
+#include <grub/unicode.h>
+#include <grub/fontformat.h>
+
+/* Draw a UTF-8 string of text on the current video render target.
+   The x coordinate specifies the starting x position for the first character,
+   while the y coordinate specifies the baseline position.
+   If the string contains a character that FONT does not contain, then
+   a glyph from another loaded font may be used instead.  */
+grub_err_t
+grub_font_draw_string (const char *str, grub_font_t font,
+                       grub_video_color_t color,
+                       int left_x, int baseline_y)
+{
+  int x;
+  struct grub_font_glyph *glyph;
+  grub_uint32_t *logical;
+  grub_ssize_t logical_len, visual_len;
+  struct grub_unicode_glyph *visual, *ptr;
+
+  logical_len = grub_utf8_to_ucs4_alloc (str, &logical, 0);
+  if (logical_len < 0)
+    return grub_errno;
+
+  visual_len = grub_bidi_logical_to_visual (logical, logical_len, &visual, 0, 0);
+  grub_free (logical);
+  if (visual_len < 0)
+    return grub_errno;
+
+  for (ptr = visual, x = left_x; ptr < visual + visual_len; ptr++)
+    {
+      grub_err_t err;
+      glyph = grub_font_construct_glyph (font, ptr);
+      if (!glyph)
+	return grub_errno;
+      err = grub_font_draw_glyph (glyph, color, x, baseline_y);
+      grub_free (glyph);
+      if (err)
+	return err;
+      x += glyph->device_width;
+    }
+
+  grub_free (visual);
+
+  return GRUB_ERR_NONE;
+}
+
+/* Get the width in pixels of the specified UTF-8 string, when rendered in
+   in the specified font (but falling back on other fonts for glyphs that
+   are missing).  */
+int
+grub_font_get_string_width (grub_font_t font, const char *str)
+{
+  int width = 0;
+  grub_uint32_t *ptr;
+  grub_ssize_t logical_len;
+  grub_uint32_t *logical;
+
+  logical_len = grub_utf8_to_ucs4_alloc (str, &logical, 0);
+  if (logical_len < 0)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      return 0;
+    }
+
+  for (ptr = logical; ptr < logical + logical_len;)
+    {
+      struct grub_unicode_glyph glyph;
+
+      ptr += grub_unicode_aglomerate_comb (ptr,
+					   logical_len - (ptr - logical),
+					   &glyph);
+      width += grub_font_get_constructed_device_width (font, &glyph);
+
+      grub_free (glyph.combining);
+    }
+
+  return width;
+}
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 1f6c4df38..733bb0279 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -20,6 +20,8 @@
 #define GRUB_BIDI_HEADER	1
 
 #include <grub/types.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
 
 struct grub_unicode_compact_range
 {
@@ -78,7 +80,10 @@ struct grub_unicode_glyph
   grub_uint16_t variant:9;
   grub_uint8_t attributes:1;
   grub_size_t ncomb;
-  grub_uint32_t *combining;
+  struct grub_unicode_combining {
+    grub_uint32_t code;
+    enum grub_comb_type type;
+  } *combining;
 };
 
 #define GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR 0x1
@@ -106,9 +111,39 @@ grub_unicode_get_comb_type (grub_uint32_t c);
 grub_size_t
 grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen,
 			      struct grub_unicode_glyph *out);
-struct grub_unicode_glyph *
-grub_unicode_glyph_from_code (grub_uint32_t code);
-struct grub_unicode_glyph *
-grub_unicode_glyph_dup (const struct grub_unicode_glyph *in);
+
+static inline struct grub_unicode_glyph *
+grub_unicode_glyph_dup (const struct grub_unicode_glyph *in)
+{
+  struct grub_unicode_glyph *out = grub_malloc (sizeof (*out));
+  if (!out)
+    return NULL;
+  grub_memcpy (out, in, sizeof (*in));
+  out->combining = grub_malloc (in->ncomb * sizeof (*in));
+  if (!out->combining)
+    {
+      grub_free (out);
+      return NULL;
+    }
+  grub_memcpy (out->combining, in->combining, in->ncomb * sizeof (*in));
+  return out;
+}
+
+static inline struct grub_unicode_glyph *
+grub_unicode_glyph_from_code (grub_uint32_t code)
+{
+  struct grub_unicode_glyph *ret;
+  ret = grub_malloc (sizeof (*ret));
+  if (!ret)
+    return NULL;
+
+  ret->base = code;
+  ret->variant = 0;
+  ret->attributes = 0;
+  ret->ncomb = 0;
+  ret->combining = 0;
+
+  return ret;
+}
 
 #endif
diff --git a/lib/charset.c b/lib/charset.c
index c71de7b5a..db72a9026 100644
--- a/lib/charset.c
+++ b/lib/charset.c
@@ -488,7 +488,7 @@ grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen,
       comb_type = grub_unicode_get_comb_type (*ptr);
       if (comb_type)
 	{
-	  grub_uint32_t *n;
+	  struct grub_unicode_combining *n;
 	  unsigned j;
 
 	  if (!haveout)
@@ -499,7 +499,7 @@ grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen,
 	      || comb_type == GRUB_UNICODE_COMB_MN)
 	    last_comb_pointer = out->ncomb;
 	  n = grub_realloc (out->combining, 
-			    sizeof (grub_uint32_t) * (out->ncomb + 1));
+			    sizeof (n[0]) * (out->ncomb + 1));
 	  if (!n)
 	    {
 	      grub_errno = GRUB_ERR_NONE;
@@ -507,14 +507,15 @@ grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen,
 	    }
 
 	  for (j = last_comb_pointer; j < out->ncomb; j++)
-	    if (grub_unicode_get_comb_type (out->combining[j]) > comb_type)
+	    if (out->combining[j].type > comb_type)
 	      break;
 	  grub_memmove (out->combining + j + 1,
 			out->combining + j,
 			(out->ncomb - j)
 			* sizeof (out->combining[0]));
 	  out->combining = n;
-	  out->combining[j] = *ptr;
+	  out->combining[j].code = *ptr;
+	  out->combining[j].type = comb_type;
 	  out->ncomb++;
 	  continue;
 	}
@@ -946,40 +947,6 @@ grub_bidi_logical_to_visual (const grub_uint32_t *logical,
   return visual_ptr - *visual_out;
 }
 
-struct grub_unicode_glyph *
-grub_unicode_glyph_dup (const struct grub_unicode_glyph *in)
-{
-  struct grub_unicode_glyph *out = grub_malloc (sizeof (*out));
-  if (!out)
-    return NULL;
-  grub_memcpy (out, in, sizeof (*in));
-  out->combining = grub_malloc (in->ncomb * sizeof (*in));
-  if (!out->combining)
-    {
-      grub_free (out);
-      return NULL;
-    }
-  grub_memcpy (out->combining, in->combining, in->ncomb * sizeof (*in));
-  return out;
-}
-
-struct grub_unicode_glyph *
-grub_unicode_glyph_from_code (grub_uint32_t code)
-{
-  struct grub_unicode_glyph *ret;
-  ret = grub_malloc (sizeof (*ret));
-  if (!ret)
-    return NULL;
-
-  ret->base = code;
-  ret->variant = 0;
-  ret->attributes = 0;
-  ret->ncomb = 0;
-  ret->combining = 0;
-
-  return ret;
-}
-
 static grub_uint32_t
 map_code (grub_uint32_t in, struct grub_term_output *term)
 {
diff --git a/normal/menu_text.c b/normal/menu_text.c
index 1504a8e60..5b75f29fd 100644
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -267,6 +267,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
 					     len - i, &glyph);
 
 	  width = grub_term_getcharwidth (term, &glyph);
+	  grub_free (glyph.combining);
 
 	  if (x + width <= (int) (GRUB_TERM_LEFT_BORDER_X 
 				 + grub_term_border_width (term)

From 023e3a5ca790fd47e678b5946f0fe322d61b4eff Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 15 Mar 2010 22:17:26 +0100
Subject: [PATCH 0614/1628] Move charset to normal/

---
 conf/common.rmk           | 2 +-
 {lib => normal}/charset.c | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {lib => normal}/charset.c (100%)

diff --git a/conf/common.rmk b/conf/common.rmk
index 84f9c9fe4..acbb990da 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -637,7 +637,7 @@ keystatus_mod_LDFLAGS = $(COMMON_LDFLAGS)
 normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
 	normal/auth.c normal/autofs.c normal/handler.c \
 	normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
-	normal/menu_entry.c normal/menu_text.c lib/charset.c \
+	normal/menu_entry.c normal/menu_text.c normal/charset.c \
 	normal/misc.c normal/crypto.c normal/term.c normal/context.c \
 	unidata.c
 normal_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/lib/charset.c b/normal/charset.c
similarity index 100%
rename from lib/charset.c
rename to normal/charset.c

From 9a3355cfde2f444dc84b2769906e84728133bf49 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 00:23:49 +0100
Subject: [PATCH 0615/1628] Fix EFI and IEEE1275

---
 term/efi/console.c        | 27 +++++++++++------
 term/ieee1275/ofconsole.c | 64 ++++++++-------------------------------
 2 files changed, 30 insertions(+), 61 deletions(-)

diff --git a/term/efi/console.c b/term/efi/console.c
index 264770cae..875a23a25 100644
--- a/term/efi/console.c
+++ b/term/efi/console.c
@@ -85,29 +85,35 @@ map_char (grub_uint32_t c)
 }
 
 static void
-grub_console_putchar (grub_uint32_t c)
+grub_console_putchar (const struct grub_unicode_glyph *c)
 {
-  grub_efi_char16_t str[2];
+  grub_efi_char16_t str[2 + c->ncomb];
   grub_efi_simple_text_output_interface_t *o;
+  unsigned i, j;
 
   o = grub_efi_system_table->con_out;
 
   /* For now, do not try to use a surrogate pair.  */
-  if (c > 0xffff)
-    c = '?';
-
-  str[0] = (grub_efi_char16_t)  map_char (c & 0xffff);
-  str[1] = 0;
+  if (c->base > 0xffff)
+    str[0] = '?';
+  else
+    str[0] = (grub_efi_char16_t)  map_char (c->base & 0xffff);
+  j = 1;
+  for (i = 0; i < c->ncomb; i++)
+    if (c->base < 0xffff)
+      str[j++] = c->combining[i].code;
+  str[j] = 0;
 
   /* Should this test be cached?  */
-  if (c > 0x7f && efi_call_2 (o->test_string, o, str) != GRUB_EFI_SUCCESS)
+  if ((c->base > 0x7f || c->ncomb)
+      && efi_call_2 (o->test_string, o, str) != GRUB_EFI_SUCCESS)
     return;
 
   efi_call_2 (o->output_string, o, str);
 }
 
 static grub_ssize_t
-grub_console_getcharwidth (grub_uint32_t c __attribute__ ((unused)))
+grub_console_getcharwidth (const struct grub_unicode_glyph *c __attribute__ ((unused)))
 {
   /* For now, every printable character has the width 1.  */
   return 1;
@@ -351,7 +357,8 @@ static struct grub_term_output grub_console_term_output =
     .setcolorstate = grub_console_setcolorstate,
     .setcolor = grub_console_setcolor,
     .getcolor = grub_console_getcolor,
-    .setcursor = grub_console_setcursor
+    .setcursor = grub_console_setcursor,
+    .flags = GRUB_TERM_CODE_TYPE_UCS4_VISUAL
   };
 
 void
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index c0f895a15..81e7e7b20 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -76,60 +76,18 @@ grub_ofconsole_writeesc (const char *str)
 }
 
 static void
-grub_ofconsole_putchar (grub_uint32_t c)
+grub_ofconsole_putchar (const struct grub_unicode_glyph *c)
 {
   char chr;
 
-  if (c > 0x7F)
-    {
-      /* Better than nothing.  */
-      switch (c)
-	{
-	case GRUB_TERM_DISP_LEFT:
-	  c = '<';
-	  break;
-	  
-	case GRUB_TERM_DISP_UP:
-	  c = '^';
-	  break;
+  chr = c->base;
 
-	case GRUB_TERM_DISP_RIGHT:
-	  c = '>';
-	  break;
-
-	case GRUB_TERM_DISP_DOWN:
-	  c = 'v';
-	  break;
-
-	case GRUB_TERM_DISP_HLINE:
-	  c = '-';
-	  break;
-
-	case GRUB_TERM_DISP_VLINE:
-	  c = '|';
-	  break;
-
-	case GRUB_TERM_DISP_UL:
-	case GRUB_TERM_DISP_UR:
-	case GRUB_TERM_DISP_LL:
-	case GRUB_TERM_DISP_LR:
-	  c = '+';
-	  break;
-
-	default:
-	  c = '?';
-	  break;
-	}
-    }
-
-  chr = c;
-
-  if (c == '\n')
+  if (chr == '\n')
     {
       grub_curr_y++;
       grub_curr_x = 0;
     }
-  else if (c == '\r')
+  else if (chr == '\r')
     {
       grub_curr_x = 0;
     }
@@ -138,16 +96,19 @@ grub_ofconsole_putchar (grub_uint32_t c)
       grub_curr_x++;
       if (grub_curr_x >= grub_ofconsole_width)
         {
-          grub_ofconsole_putchar ('\n');
-          grub_ofconsole_putchar ('\r');
-          grub_curr_x++;
+	  chr = '\n';
+	  grub_ieee1275_write (stdout_ihandle, &chr, 1, 0);
+	  chr = '\r';
+	  grub_ieee1275_write (stdout_ihandle, &chr, 1, 0);
+	  grub_curr_y++;
+	  grub_curr_x = 1;
         }
     }
   grub_ieee1275_write (stdout_ihandle, &chr, 1, 0);
 }
 
 static grub_ssize_t
-grub_ofconsole_getcharwidth (grub_uint32_t c __attribute__((unused)))
+grub_ofconsole_getcharwidth (const struct grub_unicode_glyph *c __attribute__((unused)))
 {
   return 1;
 }
@@ -497,7 +458,8 @@ static struct grub_term_output grub_ofconsole_term_output =
     .setcolor = grub_ofconsole_setcolor,
     .getcolor = grub_ofconsole_getcolor,
     .setcursor = grub_ofconsole_setcursor,
-    .refresh = grub_ofconsole_refresh
+    .refresh = grub_ofconsole_refresh,
+    .flags = GRUB_TERM_CODE_TYPE_ASCII
   };
 
 void

From f10331edf26977b789f1de1ac4f963a8fdfeafad Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 00:48:34 +0100
Subject: [PATCH 0616/1628] Preliminary support for UTF-8 console

---
 include/grub/charset.h |   4 +-
 normal/charset.c       | 102 ++++++++++++++++++++++++++---------------
 term/serial.c          |   2 +
 3 files changed, 69 insertions(+), 39 deletions(-)

diff --git a/include/grub/charset.h b/include/grub/charset.h
index 6fdc2aa37..1d79d5d2c 100644
--- a/include/grub/charset.h
+++ b/include/grub/charset.h
@@ -117,7 +117,9 @@ grub_is_valid_utf8 (const grub_uint8_t *src, grub_size_t srcsize);
 
 int grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg,
 			     grub_uint32_t **last_position);
-
+void
+grub_ucs4_to_utf8 (grub_uint32_t *src, grub_size_t size,
+		   grub_uint8_t *dest, grub_size_t destsize);
 grub_size_t grub_utf8_to_ucs4 (grub_uint32_t *dest, grub_size_t destsize,
 			       const grub_uint8_t *src, grub_size_t srcsize,
 			       const grub_uint8_t **srcend);
diff --git a/normal/charset.c b/normal/charset.c
index db72a9026..20c47e2ba 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -120,6 +120,45 @@ grub_utf8_to_utf16 (grub_uint16_t *dest, grub_size_t destsize,
   return p - dest;
 }
 
+/* Convert UCS-4 to UTF-8.  */
+void
+grub_ucs4_to_utf8 (grub_uint32_t *src, grub_size_t size,
+		   grub_uint8_t *dest, grub_size_t destsize)
+{
+  /* Keep last char for \0.  */
+  grub_uint8_t *destend = dest + destsize - 1;
+
+  while (size-- && dest < destend)
+    {
+      grub_uint32_t code = *src++;
+
+      if (code <= 0x007F)
+	*dest++ = code;
+      else if (code <= 0x07FF)
+	{
+	  if (dest + 1 >= destend)
+	    break;
+	  *dest++ = (code >> 6) | 0xC0;
+	  *dest++ = (code & 0x3F) | 0x80;
+	}
+      else if ((code >= 0xDC00 && code <= 0xDFFF)
+	       || (code >= 0xD800 && code <= 0xDBFF))
+	{
+	  /* No surrogates in UCS-4... */
+	  *dest++ = '?';
+	}
+      else
+	{
+	  if (dest + 2 >= destend)
+	    break;
+	  *dest++ = (code >> 12) | 0xE0;
+	  *dest++ = ((code >> 6) & 0x3F) | 0x80;
+	  *dest++ = (code & 0x3F) | 0x80;
+	}
+    }
+  *dest = 0;
+}
+
 /* Convert UCS-4 to UTF-8.  */
 char *
 grub_ucs4_to_utf8_alloc (grub_uint32_t *src, grub_size_t size)
@@ -127,7 +166,7 @@ grub_ucs4_to_utf8_alloc (grub_uint32_t *src, grub_size_t size)
   grub_size_t remaining;
   grub_uint32_t *ptr;
   grub_size_t cnt = 0;
-  grub_uint8_t *ret, *dest;
+  grub_uint8_t *ret;
 
   remaining = size;
   ptr = src;
@@ -152,34 +191,7 @@ grub_ucs4_to_utf8_alloc (grub_uint32_t *src, grub_size_t size)
   if (!ret)
     return 0;
 
-  dest = ret;
-  remaining = size;
-  ptr = src;
-  while (remaining--)
-    {
-      grub_uint32_t code = *ptr++;
-
-      if (code <= 0x007F)
-	*dest++ = code;
-      else if (code <= 0x07FF)
-	{
-	  *dest++ = (code >> 6) | 0xC0;
-	  *dest++ = (code & 0x3F) | 0x80;
-	}
-      else if ((code >= 0xDC00 && code <= 0xDFFF)
-	       || (code >= 0xD800 && code <= 0xDBFF))
-	{
-	  /* No surrogates in UCS-4... */
-	  *dest++ = '?';
-	}
-      else
-	{
-	  *dest++ = (code >> 12) | 0xE0;
-	  *dest++ = ((code >> 6) & 0x3F) | 0x80;
-	  *dest++ = (code & 0x3F) | 0x80;
-	}
-    }
-  *dest = 0;
+  grub_ucs4_to_utf8 (src, size, ret, cnt);
 
   return (char *) ret;
 }
@@ -953,8 +965,9 @@ map_code (grub_uint32_t in, struct grub_term_output *term)
   if (in <= 0x7f)
     return in;
 
-  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) == GRUB_TERM_CODE_TYPE_VGA)
+  switch (term->flags & GRUB_TERM_CODE_TYPE_MASK)
     {
+    case GRUB_TERM_CODE_TYPE_VGA:
       switch (in)
 	{
 	case GRUB_TERM_DISP_LEFT:
@@ -979,9 +992,7 @@ map_code (grub_uint32_t in, struct grub_term_output *term)
 	  return 0xd9;
 	}
       return '?';
-    }
-  else
-    {
+    case GRUB_TERM_CODE_TYPE_ASCII:
       /* Better than nothing.  */
       switch (in)
 	{
@@ -990,7 +1001,7 @@ map_code (grub_uint32_t in, struct grub_term_output *term)
 		
 	case GRUB_TERM_DISP_UP:
 	  return '^';
-		
+	  
 	case GRUB_TERM_DISP_RIGHT:
 	  return '>';
 		
@@ -1017,8 +1028,7 @@ map_code (grub_uint32_t in, struct grub_term_output *term)
 
 /* Put a Unicode character.  */
 void
-grub_putcode (grub_uint32_t code,
-	      struct grub_term_output *term)
+grub_putcode (grub_uint32_t code, struct grub_term_output *term)
 {
   struct grub_unicode_glyph c =
     {
@@ -1042,9 +1052,25 @@ grub_putcode (grub_uint32_t code,
       return;
     }
 
-  c.base = map_code (code, term);
+  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
+      == GRUB_TERM_CODE_TYPE_UTF8_LOGICAL)
+    {
+      grub_uint8_t str[20], *ptr;
+
+      grub_ucs4_to_utf8 (&code, 1, str, sizeof (str));
+
+      for (ptr = str; *ptr; ptr++)
+	{
+	  c.base = *ptr;
+	  (term->putchar) (&c);
+	}
+    }
+  else
+    {
+      c.base = map_code (code, term);
+      (term->putchar) (&c);
+    }
 
-  (term->putchar) (&c);
   if (code == '\n')
     grub_putcode ('\r', term);
 }
diff --git a/term/serial.c b/term/serial.c
index d98ca4c9e..14d1f4501 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -343,6 +343,8 @@ grub_serial_putchar (const struct grub_unicode_glyph *c)
 	  break;
 
 	default:
+	  if ((c->base & 0xC0) == 0xC0)
+	    break;
 	  if (xpos >= TEXT_WIDTH)
 	    {
 	      xpos = 0;

From 4f501d31ae11a92a98d0481d4237001a8a0506fd Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 00:55:11 +0100
Subject: [PATCH 0617/1628] Fix length miscomputing

---
 term/serial.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/term/serial.c b/term/serial.c
index 14d1f4501..a1e70a79c 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -343,7 +343,7 @@ grub_serial_putchar (const struct grub_unicode_glyph *c)
 	  break;
 
 	default:
-	  if ((c->base & 0xC0) == 0xC0)
+	  if ((c->base & 0xC0) == 0x80)
 	    break;
 	  if (xpos >= TEXT_WIDTH)
 	    {

From 05c15154a2976d9ad5b47569c4cbae08aff6bbe6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 10:39:18 +0100
Subject: [PATCH 0618/1628] Visual(sic) UTF-8 support

---
 include/grub/term.h |  1 +
 normal/charset.c    | 43 +++++++++++++++++++++++++++++++++++--------
 term/serial.c       |  2 +-
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/include/grub/term.h b/include/grub/term.h
index c999b2bd3..d715755cc 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -80,6 +80,7 @@ grub_term_color_state;
 #define GRUB_TERM_CODE_TYPE_UTF8_LOGICAL	(1 << 4)
 /* UCS-4 in visual order.  */
 #define GRUB_TERM_CODE_TYPE_UCS4_VISUAL	        ((1 << 4) | (1 << 3))
+#define GRUB_TERM_CODE_TYPE_UTF8_VISUAL	        ((1 << 5) | (1 << 4))
 
 
 /* Bitmasks for modifier keys returned by grub_getkeystatus.  */
diff --git a/normal/charset.c b/normal/charset.c
index 20c47e2ba..ddedeaa61 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -1053,7 +1053,9 @@ grub_putcode (grub_uint32_t code, struct grub_term_output *term)
     }
 
   if ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
-      == GRUB_TERM_CODE_TYPE_UTF8_LOGICAL)
+      == GRUB_TERM_CODE_TYPE_UTF8_LOGICAL 
+      || (term->flags & GRUB_TERM_CODE_TYPE_MASK)
+      == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
     {
       grub_uint8_t str[20], *ptr;
 
@@ -1081,8 +1083,10 @@ grub_print_ucs4 (const grub_uint32_t * str,
 		 const grub_uint32_t * last_position,
 		 struct grub_term_output *term)
 {
-  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
-      == GRUB_TERM_CODE_TYPE_UCS4_VISUAL)
+  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
+      == GRUB_TERM_CODE_TYPE_UCS4_VISUAL 
+      || (term->flags & GRUB_TERM_CODE_TYPE_MASK) 
+      == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
     {
       grub_ssize_t visual_len;
       struct grub_unicode_glyph *visual;
@@ -1099,23 +1103,46 @@ grub_print_ucs4 (const grub_uint32_t * str,
 	}
       for (visual_ptr = visual; visual_ptr < visual + visual_len; visual_ptr++)
 	{
-	  struct grub_unicode_glyph glyph_r = {
-	    .base = '\r',
+	  struct grub_unicode_glyph c = {
 	    .variant = 0,
 	    .attributes = 0,
 	    .ncomb = 0,
 	    .combining = 0
 	  };
-	  term->putchar (visual_ptr);
+	  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
+	      == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
+	    {
+	      int i;
+	      for (i = -1; i < (int) visual_ptr->ncomb; i++)
+		{
+		  grub_uint8_t u8[20], *ptr;
+	      
+		  if (i == -1)
+		    grub_ucs4_to_utf8 (&visual_ptr->base, 1, u8, sizeof (u8));
+		  else
+		    grub_ucs4_to_utf8 (&visual_ptr->combining[i].code,
+				       1, u8, sizeof (u8));
+
+		  for (ptr = u8; *ptr; ptr++)
+		    {
+		      c.base = *ptr;
+		      (term->putchar) (&c);
+		    }
+		}
+	    }
+	  else
+	    term->putchar (visual_ptr);
 	  if (visual_ptr->base == '\n')
-	    term->putchar (&glyph_r);
+	    {
+	      c.base = '\r';
+	      term->putchar (&c);
+	    }
 	  grub_free (visual_ptr->combining);
 	}
       grub_free (visual);
       return;
     }
 
-  /* FIXME: UTF-8 terminals.  */
   {
     const grub_uint32_t *ptr;
     for (ptr = str; ptr < last_position; ptr++)
diff --git a/term/serial.c b/term/serial.c
index a1e70a79c..53ba65ac9 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -453,7 +453,7 @@ static struct grub_term_output grub_serial_term_output =
   .cls = grub_serial_cls,
   .setcolorstate = grub_serial_setcolorstate,
   .setcursor = grub_serial_setcursor,
-  .flags = GRUB_TERM_CODE_TYPE_UTF8_LOGICAL,
+  .flags = GRUB_TERM_CODE_TYPE_UTF8_VISUAL,
 };
 
 

From 97b3fbb87209e9f7fe1cd2f65ae42747f0b33678 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 10:55:06 +0100
Subject: [PATCH 0619/1628] Handle initial position in bidi

---
 gfxmenu/font.c         |  3 ++-
 include/grub/unicode.h |  3 ++-
 normal/charset.c       | 14 +++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/gfxmenu/font.c b/gfxmenu/font.c
index 9209cbaa5..0c973620a 100644
--- a/gfxmenu/font.c
+++ b/gfxmenu/font.c
@@ -50,7 +50,8 @@ grub_font_draw_string (const char *str, grub_font_t font,
   if (logical_len < 0)
     return grub_errno;
 
-  visual_len = grub_bidi_logical_to_visual (logical, logical_len, &visual, 0, 0);
+  visual_len = grub_bidi_logical_to_visual (logical, logical_len, &visual,
+					    0, 0, 0);
   grub_free (logical);
   if (visual_len < 0)
     return grub_errno;
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 733bb0279..e7f176d0f 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -104,7 +104,8 @@ grub_bidi_logical_to_visual (const grub_uint32_t *logical,
 			     grub_size_t logical_len,
 			     struct grub_unicode_glyph **visual_out,
 			     grub_ssize_t (*getcharwidth) (const struct grub_unicode_glyph *visual),
-			     grub_size_t max_length);
+			     grub_size_t max_width,
+			     grub_size_t start_width);
 
 enum grub_comb_type
 grub_unicode_get_comb_type (grub_uint32_t c);
diff --git a/normal/charset.c b/normal/charset.c
index ddedeaa61..98d89ff4e 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -548,7 +548,7 @@ grub_bidi_line_logical_to_visual (const grub_uint32_t *logical,
 				  grub_size_t logical_len,
 				  struct grub_unicode_glyph *visual_out,
 				  grub_ssize_t (*getcharwidth) (const struct grub_unicode_glyph *visual),
-				  grub_size_t maxwidth)
+				  grub_size_t maxwidth, grub_size_t startwidth)
 {
   enum grub_bidi_type type = GRUB_BIDI_TYPE_L;
   enum override_status {OVERRIDE_NEUTRAL = 0, OVERRIDE_R, OVERRIDE_L};
@@ -861,7 +861,7 @@ grub_bidi_line_logical_to_visual (const grub_uint32_t *logical,
   {
     struct grub_unicode_glyph *outptr = visual_out;
     unsigned line_start = 0;
-    grub_ssize_t line_width = 0;
+    grub_ssize_t line_width = startwidth;
     unsigned k;
 
     for (k = 0; k <= visual_len; k++)
@@ -925,7 +925,7 @@ grub_bidi_logical_to_visual (const grub_uint32_t *logical,
 			     grub_size_t logical_len,
 			     struct grub_unicode_glyph **visual_out,
 			     grub_ssize_t (*getcharwidth) (const struct grub_unicode_glyph *visual),
-			     grub_size_t max_length)
+			     grub_size_t max_length, grub_size_t startwidth)
 {
   const grub_uint32_t *line_start = logical, *ptr;
   struct grub_unicode_glyph *visual_ptr;
@@ -940,7 +940,10 @@ grub_bidi_logical_to_visual (const grub_uint32_t *logical,
 						  ptr - line_start,
 						  visual_ptr,
 						  getcharwidth,
-						  max_length);
+						  max_length,
+						  startwidth);
+	  startwidth = 0;
+
 	  if (ret < 0)
 	    {
 	      grub_free (*visual_out);
@@ -1095,7 +1098,8 @@ grub_print_ucs4 (const grub_uint32_t * str,
 						last_position - str,
 						&visual,
 						term->getcharwidth,
-						grub_term_width (term));
+						grub_term_width (term),
+						(term->getxy () >> 8) & 0xff);
       if (visual_len < 0)
 	{
 	  grub_print_error ();

From eb67952309169ad38ec9344cbd59b6f3ccb85fe3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 11:23:49 +0100
Subject: [PATCH 0620/1628] Separate line-wrapping function

---
 normal/charset.c | 170 +++++++++++++++++++++++++----------------------
 1 file changed, 92 insertions(+), 78 deletions(-)

diff --git a/normal/charset.c b/normal/charset.c
index 98d89ff4e..d8a80510f 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -543,6 +543,94 @@ grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen,
   return ptr - in;
 }
 
+static grub_ssize_t
+line_wrap (struct grub_unicode_glyph *visual_out,
+	   struct grub_unicode_glyph *visual,
+	   grub_size_t visual_len, unsigned *levels,
+	   grub_ssize_t (*getcharwidth) (const struct grub_unicode_glyph *visual),
+	   grub_size_t maxwidth, grub_size_t startwidth)
+{
+  struct grub_unicode_glyph *outptr = visual_out;
+  unsigned line_start = 0;
+  grub_ssize_t line_width = startwidth;
+
+  auto void revert (unsigned start, unsigned end);
+  void revert (unsigned start, unsigned end)
+  {
+    struct grub_unicode_glyph t;
+    unsigned k, tl;
+    for (k = 0; k <= (end - start) / 2; k++)
+      {
+	t = visual[start + k];
+	visual[start + k] = visual[end - k];
+	visual[end - k] = t;
+	tl = levels[start + k];
+	levels[start + k] = levels[end - k];
+	levels[end - k] = tl;
+      }
+  }
+
+  unsigned k;
+
+  if (!visual_len)
+    return 0;
+
+  for (k = 0; k <= visual_len; k++)
+    {
+      grub_ssize_t last_width = 0;
+      if (getcharwidth && k != visual_len)
+	line_width += last_width = getcharwidth (&visual[k]);
+      if (((grub_ssize_t) maxwidth > 0 
+	   && line_width > (grub_ssize_t) maxwidth) || k == visual_len)
+	{
+	  unsigned min_odd_level = 0xffffffff;
+	  unsigned max_level = 0;
+	  unsigned i, j;
+	  for (i = line_start; i < k; i++)
+	    {
+	      if (levels[i] > max_level)
+		max_level = levels[i];
+	      if (levels[i] < min_odd_level && (levels[i] & 1))
+		min_odd_level = levels[i];
+	    }
+	  
+	  if (levels)
+	    {
+	      /* FIXME: can be optimized.  */
+	      for (j = max_level; j >= min_odd_level; j--)
+		{
+		  unsigned in = 0;
+		  for (i = line_start; i < k; i++)
+		    {
+		      if (i != line_start && levels[i] >= j && levels[i-1] < j)
+			in = i;
+		      if (levels[i] >= j && (i + 1 == k || levels[i+1] < j))
+			revert (in, i);
+		    }
+		}
+	      
+	      for (i = line_start; i < k; i++)
+		if (is_mirrored (visual[i].base) && levels[i])
+		  visual[i].attributes |= GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR;
+	    }
+
+	  outptr += k - line_start;
+	  if (k != visual_len)
+	    {
+	      grub_memset (outptr, 0, sizeof (visual[0]));
+	      outptr->base = '\n';
+	      outptr++;
+	    }
+	    
+	  line_start = k;
+	  line_width = last_width;
+	}
+    }
+
+  return outptr - visual_out;
+}
+
+
 static grub_ssize_t
 grub_bidi_line_logical_to_visual (const grub_uint32_t *logical,
 				  grub_size_t logical_len,
@@ -596,22 +684,6 @@ grub_bidi_line_logical_to_visual (const grub_uint32_t *logical,
     cur_override = stack_override[stack_depth];
   }
 
-  auto void revert (unsigned start, unsigned end);
-  void revert (unsigned start, unsigned end)
-  {
-    struct grub_unicode_glyph t;
-    unsigned k, tl;
-    for (k = 0; k <= (end - start) / 2; k++)
-      {
-	t = visual[start+k];
-	visual[start+k] = visual[end-k];
-	visual[end-k] = t;
-	tl = levels[start+k];
-	levels[start+k] = levels[end-k];
-	levels[end-k] = tl;
-      }
-  }
-
   levels = grub_malloc (sizeof (levels[0]) * logical_len);
   if (!levels)
     return -1;
@@ -852,71 +924,13 @@ grub_bidi_line_logical_to_visual (const grub_uint32_t *logical,
     }
   grub_free (resolved_types);
 
-  if (!visual_len)
-    {
-      grub_free (levels);
-      grub_free (visual);
-      return 0;
-    }
   {
-    struct grub_unicode_glyph *outptr = visual_out;
-    unsigned line_start = 0;
-    grub_ssize_t line_width = startwidth;
-    unsigned k;
-
-    for (k = 0; k <= visual_len; k++)
-      {
-	grub_ssize_t last_width = 0;
-	if (getcharwidth && k != visual_len)
-	  line_width += last_width = getcharwidth (&visual[k]);
-	if (((grub_ssize_t) maxwidth > 0 
-	     && line_width > (grub_ssize_t) maxwidth) || k == visual_len)
-	  {
-	    unsigned min_odd_level = 0xffffffff;
-	    unsigned max_level = 0;
-	    unsigned j;
-	    for (i = line_start; i < k; i++)
-	      {
-		if (levels[i] > max_level)
-		  max_level = levels[i];
-		if (levels[i] < min_odd_level && (levels[i] & 1))
-		  min_odd_level = levels[i];
-	      }
-	    /* FIXME: can be optimized.  */
-	    for (j = max_level; j >= min_odd_level; j--)
-	      {
-		unsigned in = 0;
-		for (i = line_start; i < k; i++)
-		  {
-		    if (i != line_start && levels[i] >= j && levels[i-1] < j)
-		      in = i;
-		    if (levels[i] >= j && (i + 1 == k || levels[i+1] < j))
-		      revert (in, i);
-		  }
-	      }
-
-	    for (i = line_start; i < k; i++)
-	      if (is_mirrored (visual[i].base) && levels[i])
-		visual[i].attributes |= GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR;
-
-	    grub_memcpy (outptr, &visual[line_start],
-			 (k - line_start) * sizeof (visual[0]));
-	    outptr += k - line_start;
-	    if (k != visual_len)
-	      {
-		grub_memset (outptr, 0, sizeof (visual[0]));
-		outptr->base = '\n';
-		outptr++;
-	      }
-	    
-	    line_start = k;
-	    line_width = last_width;
-	  }
-      }
+    grub_ssize_t ret;
+    ret = line_wrap (visual_out, visual, visual_len, levels, 
+		     getcharwidth, maxwidth, startwidth);
     grub_free (levels);
     grub_free (visual);
-
-    return outptr - visual_out;
+    return ret;
   }
 }
 

From cacd173d3eb9ca0a6128840bafd03d28d2173c9b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 11:31:05 +0100
Subject: [PATCH 0621/1628] Fix linewrapper when levels=NULL

---
 normal/charset.c | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/normal/charset.c b/normal/charset.c
index d8a80510f..490a70383 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -553,25 +553,24 @@ line_wrap (struct grub_unicode_glyph *visual_out,
   struct grub_unicode_glyph *outptr = visual_out;
   unsigned line_start = 0;
   grub_ssize_t line_width = startwidth;
+  unsigned k;
 
   auto void revert (unsigned start, unsigned end);
   void revert (unsigned start, unsigned end)
   {
     struct grub_unicode_glyph t;
-    unsigned k, tl;
-    for (k = 0; k <= (end - start) / 2; k++)
+    unsigned i, tl;
+    for (i = 0; i <= (end - start) / 2; i++)
       {
-	t = visual[start + k];
-	visual[start + k] = visual[end - k];
-	visual[end - k] = t;
-	tl = levels[start + k];
-	levels[start + k] = levels[end - k];
-	levels[end - k] = tl;
+	t = visual[start + i];
+	visual[start + i] = visual[end - i];
+	visual[end - i] = t;
+	tl = levels[start + i];
+	levels[start + i] = levels[end - i];
+	levels[end - i] = tl;
       }
   }
 
-  unsigned k;
-
   if (!visual_len)
     return 0;
 
@@ -582,20 +581,22 @@ line_wrap (struct grub_unicode_glyph *visual_out,
 	line_width += last_width = getcharwidth (&visual[k]);
       if (((grub_ssize_t) maxwidth > 0 
 	   && line_width > (grub_ssize_t) maxwidth) || k == visual_len)
-	{
-	  unsigned min_odd_level = 0xffffffff;
-	  unsigned max_level = 0;
-	  unsigned i, j;
-	  for (i = line_start; i < k; i++)
-	    {
-	      if (levels[i] > max_level)
-		max_level = levels[i];
-	      if (levels[i] < min_odd_level && (levels[i] & 1))
-		min_odd_level = levels[i];
-	    }
-	  
+	{	  
 	  if (levels)
 	    {
+	      unsigned min_odd_level = 0xffffffff;
+	      unsigned max_level = 0;
+	      unsigned j;
+
+	      unsigned i;
+	      for (i = line_start; i < k; i++)
+		{
+		  if (levels[i] > max_level)
+		    max_level = levels[i];
+		  if (levels[i] < min_odd_level && (levels[i] & 1))
+		    min_odd_level = levels[i];
+		}
+
 	      /* FIXME: can be optimized.  */
 	      for (j = max_level; j >= min_odd_level; j--)
 		{

From f588f1c8b6a890bf04207be34669120ebc9d3e49 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 14:13:32 +0100
Subject: [PATCH 0622/1628] Add simple line wrapping

---
 commands/help.c       |   2 +-
 include/grub/normal.h |   8 ++-
 normal/charset.c      | 144 ++++++++++++++++++++++++++++--------------
 normal/main.c         |   2 +-
 normal/menu_text.c    |  35 +++-------
 5 files changed, 113 insertions(+), 78 deletions(-)

diff --git a/commands/help.c b/commands/help.c
index d56ad49a1..b9e1a9145 100644
--- a/commands/help.c
+++ b/commands/help.c
@@ -77,7 +77,7 @@ grub_cmd_help (grub_extcmd_t ext __attribute__ ((unused)), int argc,
 	      }
 
 	    grub_print_ucs4 (unicode_command_help,
-			     unicode_last_screen_position, term);
+			     unicode_last_screen_position, 0, 0, term);
 	    if (!(cnt % 2))
 	      grub_print_spaces (term, grub_term_width (term) / 2
 				 - stringwidth);
diff --git a/include/grub/normal.h b/include/grub/normal.h
index b53c6c121..6ec14d31a 100644
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -77,9 +77,11 @@ void grub_parse_color_name_pair (grub_uint8_t *ret, const char *name);
 
 /* Defined in `menu_text.c'.  */
 void grub_wait_after_message (void);
-void grub_print_ucs4 (const grub_uint32_t * str,
-		      const grub_uint32_t * last_position,
-		      struct grub_term_output *term);
+void
+grub_print_ucs4 (const grub_uint32_t * str,
+		 const grub_uint32_t * last_position,
+		 int margin_left, int margin_right,
+		 struct grub_term_output *term);
 grub_ssize_t grub_getstringwidth (grub_uint32_t * str,
 				  const grub_uint32_t * last_position,
 				  struct grub_term_output *term);
diff --git a/normal/charset.c b/normal/charset.c
index 490a70383..383f2c458 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -544,11 +544,11 @@ grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen,
 }
 
 static grub_ssize_t
-line_wrap (struct grub_unicode_glyph *visual_out,
-	   struct grub_unicode_glyph *visual,
-	   grub_size_t visual_len, unsigned *levels,
-	   grub_ssize_t (*getcharwidth) (const struct grub_unicode_glyph *visual),
-	   grub_size_t maxwidth, grub_size_t startwidth)
+bidi_line_wrap (struct grub_unicode_glyph *visual_out,
+		struct grub_unicode_glyph *visual,
+		grub_size_t visual_len, unsigned *levels,
+		grub_ssize_t (*getcharwidth) (const struct grub_unicode_glyph *visual),
+		grub_size_t maxwidth, grub_size_t startwidth)
 {
   struct grub_unicode_glyph *outptr = visual_out;
   unsigned line_start = 0;
@@ -582,38 +582,35 @@ line_wrap (struct grub_unicode_glyph *visual_out,
       if (((grub_ssize_t) maxwidth > 0 
 	   && line_width > (grub_ssize_t) maxwidth) || k == visual_len)
 	{	  
-	  if (levels)
+	  unsigned min_odd_level = 0xffffffff;
+	  unsigned max_level = 0;
+	  unsigned j;
+	  
+	  unsigned i;
+	  for (i = line_start; i < k; i++)
 	    {
-	      unsigned min_odd_level = 0xffffffff;
-	      unsigned max_level = 0;
-	      unsigned j;
-
-	      unsigned i;
-	      for (i = line_start; i < k; i++)
-		{
-		  if (levels[i] > max_level)
-		    max_level = levels[i];
-		  if (levels[i] < min_odd_level && (levels[i] & 1))
-		    min_odd_level = levels[i];
-		}
-
-	      /* FIXME: can be optimized.  */
-	      for (j = max_level; j >= min_odd_level; j--)
-		{
-		  unsigned in = 0;
-		  for (i = line_start; i < k; i++)
-		    {
-		      if (i != line_start && levels[i] >= j && levels[i-1] < j)
-			in = i;
-		      if (levels[i] >= j && (i + 1 == k || levels[i+1] < j))
-			revert (in, i);
-		    }
-		}
-	      
-	      for (i = line_start; i < k; i++)
-		if (is_mirrored (visual[i].base) && levels[i])
-		  visual[i].attributes |= GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR;
+	      if (levels[i] > max_level)
+		max_level = levels[i];
+	      if (levels[i] < min_odd_level && (levels[i] & 1))
+		min_odd_level = levels[i];
 	    }
+	  
+	  /* FIXME: can be optimized.  */
+	  for (j = max_level; j >= min_odd_level; j--)
+	    {
+	      unsigned in = 0;
+	      for (i = line_start; i < k; i++)
+		{
+		  if (i != line_start && levels[i] >= j && levels[i-1] < j)
+		    in = i;
+		  if (levels[i] >= j && (i + 1 == k || levels[i+1] < j))
+		    revert (in, i);
+		}
+	    }
+	  
+	  for (i = line_start; i < k; i++)
+	    if (is_mirrored (visual[i].base) && levels[i])
+	      visual[i].attributes |= GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR;
 
 	  outptr += k - line_start;
 	  if (k != visual_len)
@@ -927,8 +924,8 @@ grub_bidi_line_logical_to_visual (const grub_uint32_t *logical,
 
   {
     grub_ssize_t ret;
-    ret = line_wrap (visual_out, visual, visual_len, levels, 
-		     getcharwidth, maxwidth, startwidth);
+    ret = bidi_line_wrap (visual_out, visual, visual_len, levels, 
+			  getcharwidth, maxwidth, startwidth);
     grub_free (levels);
     grub_free (visual);
     return ret;
@@ -1056,7 +1053,11 @@ grub_putcode (grub_uint32_t code, struct grub_term_output *term)
       .combining = 0
     };
 
-  if (grub_unicode_get_comb_type (code) != GRUB_UNICODE_COMB_NONE)
+  if (grub_unicode_get_comb_type (code) != GRUB_UNICODE_COMB_NONE
+      && ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
+	  != GRUB_TERM_CODE_TYPE_UTF8_LOGICAL 
+	  && (term->flags & GRUB_TERM_CODE_TYPE_MASK)
+	  != GRUB_TERM_CODE_TYPE_UTF8_VISUAL))
     return;
 
   if (code == '\t' && term->getxy)
@@ -1095,12 +1096,33 @@ grub_putcode (grub_uint32_t code, struct grub_term_output *term)
     grub_putcode ('\r', term);
 }
 
-
 void
 grub_print_ucs4 (const grub_uint32_t * str,
 		 const grub_uint32_t * last_position,
+		 int margin_left, int margin_right,
 		 struct grub_term_output *term)
 {
+  grub_size_t line_len;
+  grub_ssize_t startwidth;
+
+  {
+    struct grub_unicode_glyph space_glyph = {
+      .base = ' ',
+      .variant = 0,
+      .attributes = 0,
+      .ncomb = 0,
+      .combining = 0
+      };
+    line_len = grub_term_width (term)
+      - grub_term_getcharwidth (term, &space_glyph) 
+      * (margin_left + margin_right) - 1;
+  }
+
+  if (((term->getxy () >> 8) & 0xff) < margin_left)
+    grub_print_spaces (term, margin_left - ((term->getxy () >> 8) & 0xff));
+
+  startwidth = ((term->getxy () >> 8) & 0xff) - margin_left;
+
   if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
       == GRUB_TERM_CODE_TYPE_UCS4_VISUAL 
       || (term->flags & GRUB_TERM_CODE_TYPE_MASK) 
@@ -1109,12 +1131,9 @@ grub_print_ucs4 (const grub_uint32_t * str,
       grub_ssize_t visual_len;
       struct grub_unicode_glyph *visual;
       struct grub_unicode_glyph *visual_ptr;
-      visual_len = grub_bidi_logical_to_visual (str,
-						last_position - str,
-						&visual,
-						term->getcharwidth,
-						grub_term_width (term),
-						(term->getxy () >> 8) & 0xff);
+      visual_len = grub_bidi_logical_to_visual (str, last_position - str,
+						&visual, term->getcharwidth,
+						line_len, startwidth);
       if (visual_len < 0)
 	{
 	  grub_print_error ();
@@ -1128,6 +1147,8 @@ grub_print_ucs4 (const grub_uint32_t * str,
 	    .ncomb = 0,
 	    .combining = 0
 	  };
+	  if (visual_ptr->base == '\n')
+	    grub_print_spaces (term, margin_right);
 	  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
 	      == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
 	    {
@@ -1155,6 +1176,7 @@ grub_print_ucs4 (const grub_uint32_t * str,
 	    {
 	      c.base = '\r';
 	      term->putchar (&c);
+	      grub_print_spaces (term, margin_left);
 	    }
 	  grub_free (visual_ptr->combining);
 	}
@@ -1164,8 +1186,36 @@ grub_print_ucs4 (const grub_uint32_t * str,
 
   {
     const grub_uint32_t *ptr;
+    grub_ssize_t line_width = startwidth;
+    grub_ssize_t maxwidth = line_len;
+
     for (ptr = str; ptr < last_position; ptr++)
-      grub_putcode (*ptr, term);
+      {
+	struct grub_unicode_glyph c = {
+	  .variant = 0,
+	  .attributes = 0,
+	  .ncomb = 0,
+	  .combining = 0
+	};
+	grub_ssize_t last_width = 0;
+	if (grub_unicode_get_comb_type (*ptr) == GRUB_UNICODE_COMB_NONE)
+	  {
+	    c.base = *ptr;
+	    line_width += last_width = term->getcharwidth (&c);
+	  }
+
+	if (line_width > maxwidth || *ptr == '\n')
+	  {
+	    grub_print_spaces (term, margin_right);
+	    grub_putcode ('\n', term);
+	    grub_putcode ('\r', term);
+	    line_width = last_width;
+	    grub_print_spaces (term, margin_left);
+	  }
+	  
+	if (*ptr != '\n')
+	  grub_putcode (*ptr, term);
+      }
   }
 }
 
@@ -1179,7 +1229,7 @@ grub_xputs_normal (const char *str)
     grub_uint32_t *unicode_str, *unicode_last_position;
     grub_utf8_to_ucs4_alloc (str, &unicode_str,
 			     &unicode_last_position);
-    grub_print_ucs4 (unicode_str, unicode_last_position, term);
+    grub_print_ucs4 (unicode_str, unicode_last_position, 0, 0, term);
     grub_free (unicode_str);
   }
 }
diff --git a/normal/main.c b/normal/main.c
index 334be00e9..ab28609cd 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -429,7 +429,7 @@ grub_normal_init_page (struct grub_term_output *term)
   posx = (grub_term_width (term) - posx) / 2;
   grub_term_gotoxy (term, posx, 1);
 
-  grub_print_ucs4 (unicode_msg, last_position, term);
+  grub_print_ucs4 (unicode_msg, last_position, 0, 0, term);
   grub_printf("\n\n");
   grub_free (unicode_msg);
 }
diff --git a/normal/menu_text.c b/normal/menu_text.c
index 5b75f29fd..61ddd2490 100644
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -38,14 +38,6 @@ struct menu_viewer_data
   struct grub_term_output *term;
 };
 
-static void
-print_spaces (int number_spaces, struct grub_term_output *term)
-{
-  int i;
-  for (i = 0; i < number_spaces; i++)
-    grub_putcode (' ', term);
-}
-
 grub_ssize_t
 grub_getstringwidth (grub_uint32_t * str, const grub_uint32_t * last_position,
 		     struct grub_term_output *term)
@@ -65,26 +57,11 @@ void
 grub_print_message_indented (const char *msg, int margin_left, int margin_right,
 			     struct grub_term_output *term)
 {
-  int line_len;
-
   grub_uint32_t *unicode_msg;
   grub_uint32_t *last_position;
 
   int msg_len;
 
-  {
-    struct grub_unicode_glyph pseudo_glyph = {
-      .base = ' ',
-      .variant = 0,
-      .attributes = 0,
-      .ncomb = 0,
-      .combining = 0
-      };
-    line_len = grub_term_width (term)
-      - grub_term_getcharwidth (term, &pseudo_glyph) 
-      * (margin_left + margin_right);
-  }
-
   msg_len = grub_utf8_to_ucs4_alloc (msg, &unicode_msg, &last_position);
 
   if (msg_len < 0)
@@ -92,6 +69,11 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,
       return;
     }
 
+  grub_print_ucs4 (unicode_msg, last_position, margin_left, margin_right, term);
+
+#if 0
+  int line_len;
+
   grub_uint32_t *current_position = unicode_msg;
 
   grub_uint32_t *next_new_line = unicode_msg;
@@ -126,6 +108,7 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,
       current_position = next_new_line;
       first_loop = 0;
     }
+#endif
   grub_free (unicode_msg);
 }
 
@@ -280,7 +263,7 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
     }
 
   grub_print_ucs4 (unicode_title,
-		   unicode_title + last_printed, term);
+		   unicode_title + last_printed, 0, 0, term);
 
   if (last_printed != len)
     {
@@ -397,7 +380,7 @@ menu_text_print_timeout (int timeout, void *dataptr)
   grub_print_message_indented (msg_translated, 3, 0, data->term);
  
   posx = grub_term_getxy (data->term) >> 8;
-  print_spaces (grub_term_width (data->term) - posx - 1, data->term);
+  grub_print_spaces (data->term, grub_term_width (data->term) - posx - 1);
 
   grub_term_gotoxy (data->term,
 		    grub_term_cursor_x (data->term),
@@ -455,7 +438,7 @@ menu_text_clear_timeout (void *dataptr)
   struct menu_viewer_data *data = dataptr;
 
   grub_term_gotoxy (data->term, 0, grub_term_height (data->term) - 3);
-  print_spaces (grub_term_width (data->term) - 1, data->term);
+  grub_print_spaces (data->term, grub_term_width (data->term) - 1);
   grub_term_gotoxy (data->term, grub_term_cursor_x (data->term),
 		    GRUB_TERM_FIRST_ENTRY_Y + data->offset);
   grub_term_refresh (data->term);

From 8b4ca088684b625f9dbbf251e2373b77bde4b9e3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 14:48:14 +0100
Subject: [PATCH 0623/1628] better line wrapping

---
 normal/charset.c | 78 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 60 insertions(+), 18 deletions(-)

diff --git a/normal/charset.c b/normal/charset.c
index 383f2c458..1a9afa4be 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -554,6 +554,8 @@ bidi_line_wrap (struct grub_unicode_glyph *visual_out,
   unsigned line_start = 0;
   grub_ssize_t line_width = startwidth;
   unsigned k;
+  grub_ssize_t last_space = -1;
+  grub_ssize_t last_space_width = 0;
 
   auto void revert (unsigned start, unsigned end);
   void revert (unsigned start, unsigned end)
@@ -577,16 +579,29 @@ bidi_line_wrap (struct grub_unicode_glyph *visual_out,
   for (k = 0; k <= visual_len; k++)
     {
       grub_ssize_t last_width = 0;
+
       if (getcharwidth && k != visual_len)
 	line_width += last_width = getcharwidth (&visual[k]);
+
+      if (k != visual_len && visual[k].base == ' ')
+	{
+	  last_space = k;
+	  last_space_width = line_width;
+	}
+
       if (((grub_ssize_t) maxwidth > 0 
 	   && line_width > (grub_ssize_t) maxwidth) || k == visual_len)
 	{	  
 	  unsigned min_odd_level = 0xffffffff;
 	  unsigned max_level = 0;
 	  unsigned j;
-	  
 	  unsigned i;
+
+	  if (last_space > (signed) line_start)
+	    k = last_space;
+	  else
+	    line_width -= last_width;
+
 	  for (i = line_start; i < k; i++)
 	    {
 	      if (levels[i] > max_level)
@@ -619,9 +634,12 @@ bidi_line_wrap (struct grub_unicode_glyph *visual_out,
 	      outptr->base = '\n';
 	      outptr++;
 	    }
-	    
+
+	  if ((signed) k == last_space)
+	    k++;
+
 	  line_start = k;
-	  line_width = last_width;
+	  line_width -= last_space_width;
 	}
     }
 
@@ -1102,7 +1120,7 @@ grub_print_ucs4 (const grub_uint32_t * str,
 		 int margin_left, int margin_right,
 		 struct grub_term_output *term)
 {
-  grub_size_t line_len;
+  grub_ssize_t max_width;
   grub_ssize_t startwidth;
 
   {
@@ -1113,7 +1131,7 @@ grub_print_ucs4 (const grub_uint32_t * str,
       .ncomb = 0,
       .combining = 0
       };
-    line_len = grub_term_width (term)
+    max_width = grub_term_width (term)
       - grub_term_getcharwidth (term, &space_glyph) 
       * (margin_left + margin_right) - 1;
   }
@@ -1122,6 +1140,7 @@ grub_print_ucs4 (const grub_uint32_t * str,
     grub_print_spaces (term, margin_left - ((term->getxy () >> 8) & 0xff));
 
   startwidth = ((term->getxy () >> 8) & 0xff) - margin_left;
+  startwidth = 0;
 
   if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
       == GRUB_TERM_CODE_TYPE_UCS4_VISUAL 
@@ -1133,7 +1152,7 @@ grub_print_ucs4 (const grub_uint32_t * str,
       struct grub_unicode_glyph *visual_ptr;
       visual_len = grub_bidi_logical_to_visual (str, last_position - str,
 						&visual, term->getcharwidth,
-						line_len, startwidth);
+						max_width, startwidth);
       if (visual_len < 0)
 	{
 	  grub_print_error ();
@@ -1187,35 +1206,58 @@ grub_print_ucs4 (const grub_uint32_t * str,
   {
     const grub_uint32_t *ptr;
     grub_ssize_t line_width = startwidth;
-    grub_ssize_t maxwidth = line_len;
+    grub_ssize_t lastspacewidth = 0;
+    const grub_uint32_t *line_start = str, *last_space = str - 1;
 
     for (ptr = str; ptr < last_position; ptr++)
       {
-	struct grub_unicode_glyph c = {
-	  .variant = 0,
-	  .attributes = 0,
-	  .ncomb = 0,
-	  .combining = 0
-	};
 	grub_ssize_t last_width = 0;
 	if (grub_unicode_get_comb_type (*ptr) == GRUB_UNICODE_COMB_NONE)
 	  {
+	    struct grub_unicode_glyph c = {
+	      .variant = 0,
+	      .attributes = 0,
+	      .ncomb = 0,
+	      .combining = 0
+	    };
 	    c.base = *ptr;
 	    line_width += last_width = term->getcharwidth (&c);
 	  }
 
-	if (line_width > maxwidth || *ptr == '\n')
+	if (*ptr == ' ')
 	  {
+	    lastspacewidth = line_width;
+	    last_space = ptr;
+	  }
+
+	if (line_width > max_width || *ptr == '\n')
+	  {
+	    const grub_uint32_t *ptr2;
+
+	    if (line_width > max_width && last_space > line_start)
+	      ptr = last_space;
+	    else
+	      lastspacewidth = line_width - last_width;
+
+	    for (ptr2 = line_start; ptr2 < ptr; ptr2++)
+	      grub_putcode (*ptr2, term);	      
+
 	    grub_print_spaces (term, margin_right);
 	    grub_putcode ('\n', term);
 	    grub_putcode ('\r', term);
-	    line_width = last_width;
+	    line_width -= lastspacewidth;
 	    grub_print_spaces (term, margin_left);
+	    if (ptr == last_space || *ptr == '\n')
+	      ptr++;
+	    line_start = ptr;
 	  }
-	  
-	if (*ptr != '\n')
-	  grub_putcode (*ptr, term);
       }
+
+    {
+      const grub_uint32_t *ptr2;
+      for (ptr2 = line_start; ptr2 < last_position; ptr2++)
+	grub_putcode (*ptr2, term);
+    }
   }
 }
 

From 3830c087bb1d384572bbdeb8ba9958f8bc635aac Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 15:21:50 +0100
Subject: [PATCH 0624/1628] Fix few wrapping problems

---
 normal/charset.c | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/normal/charset.c b/normal/charset.c
index 1a9afa4be..03e04fc5b 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -597,10 +597,15 @@ bidi_line_wrap (struct grub_unicode_glyph *visual_out,
 	  unsigned j;
 	  unsigned i;
 
-	  if (last_space > (signed) line_start)
+	  if (k != visual_len && last_space > (signed) line_start)
 	    k = last_space;
+	  else if (k != visual_len && line_start == 0 && startwidth != 0)
+	    {
+	      k = 0;
+	      last_space_width = startwidth;
+	    }
 	  else
-	    line_width -= last_width;
+	    last_space_width = line_width - last_width;
 
 	  for (i = line_start; i < k; i++)
 	    {
@@ -627,6 +632,8 @@ bidi_line_wrap (struct grub_unicode_glyph *visual_out,
 	    if (is_mirrored (visual[i].base) && levels[i])
 	      visual[i].attributes |= GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR;
 
+	  grub_memcpy (outptr, &visual[line_start],
+		       (k - line_start) * sizeof (visual[0]));
 	  outptr += k - line_start;
 	  if (k != visual_len)
 	    {
@@ -986,6 +993,7 @@ grub_bidi_logical_to_visual (const grub_uint32_t *logical,
 	      grub_memset (visual_ptr, 0, sizeof (visual_ptr[0]));
 	      visual_ptr->base = '\n';
 	      visual_ptr++;
+	      line_start++;
 	    }
 	}
     }
@@ -1140,7 +1148,6 @@ grub_print_ucs4 (const grub_uint32_t * str,
     grub_print_spaces (term, margin_left - ((term->getxy () >> 8) & 0xff));
 
   startwidth = ((term->getxy () >> 8) & 0xff) - margin_left;
-  startwidth = 0;
 
   if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
       == GRUB_TERM_CODE_TYPE_UCS4_VISUAL 
@@ -1236,6 +1243,12 @@ grub_print_ucs4 (const grub_uint32_t * str,
 
 	    if (line_width > max_width && last_space > line_start)
 	      ptr = last_space;
+	    else if (line_width > max_width 
+		     && line_start == str && startwidth != 0)
+	      {
+		ptr = str;
+		lastspacewidth = startwidth;
+	      }
 	    else
 	      lastspacewidth = line_width - last_width;
 

From 7a476ba0a3598839af7300ca3ed289dd4e0fcf1e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 19:04:08 +0100
Subject: [PATCH 0625/1628] Dedup remapping code

---
 normal/charset.c | 128 ++++++++++++++++++++++++-----------------------
 1 file changed, 66 insertions(+), 62 deletions(-)

diff --git a/normal/charset.c b/normal/charset.c
index 03e04fc5b..24413ee76 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -1067,11 +1067,10 @@ map_code (grub_uint32_t in, struct grub_term_output *term)
   return in;
 }
 
-/* Put a Unicode character.  */
-void
-grub_putcode (grub_uint32_t code, struct grub_term_output *term)
+static void
+putglyph (const struct grub_unicode_glyph *c, struct grub_term_output *term)
 {
-  struct grub_unicode_glyph c =
+  struct grub_unicode_glyph c2 =
     {
       .variant = 0,
       .attributes = 0,
@@ -1079,20 +1078,14 @@ grub_putcode (grub_uint32_t code, struct grub_term_output *term)
       .combining = 0
     };
 
-  if (grub_unicode_get_comb_type (code) != GRUB_UNICODE_COMB_NONE
-      && ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
-	  != GRUB_TERM_CODE_TYPE_UTF8_LOGICAL 
-	  && (term->flags & GRUB_TERM_CODE_TYPE_MASK)
-	  != GRUB_TERM_CODE_TYPE_UTF8_VISUAL))
-    return;
-
-  if (code == '\t' && term->getxy)
+  if (c->base == '\t' && term->getxy)
     {
       int n;
 
       n = 8 - ((term->getxy () >> 8) & 7);
+      c2.base = ' ';
       while (n--)
-	grub_putcode (' ', term);
+	(term->putchar) (&c2);
 
       return;
     }
@@ -1102,24 +1095,60 @@ grub_putcode (grub_uint32_t code, struct grub_term_output *term)
       || (term->flags & GRUB_TERM_CODE_TYPE_MASK)
       == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
     {
-      grub_uint8_t str[20], *ptr;
-
-      grub_ucs4_to_utf8 (&code, 1, str, sizeof (str));
-
-      for (ptr = str; *ptr; ptr++)
+      int i;
+      for (i = -1; i < (int) c->ncomb; i++)
 	{
-	  c.base = *ptr;
-	  (term->putchar) (&c);
+	  grub_uint8_t u8[20], *ptr;
+	  grub_uint32_t code;
+	      
+	  if (i == -1)
+	    code = c->base;
+	  else
+	    code = c->combining[i].code;
+
+	  grub_ucs4_to_utf8 (&code, 1, u8, sizeof (u8));
+
+	  for (ptr = u8; *ptr; ptr++)
+	    {
+	      c2.base = *ptr;
+	      (term->putchar) (&c2);
+	    }
 	}
     }
   else
-    {
-      c.base = map_code (code, term);
-      (term->putchar) (&c);
-    }
+    (term->putchar) (c);
 
-  if (code == '\n')
-    grub_putcode ('\r', term);
+  if (c->base == '\n')
+    {
+      c2.base = '\r';
+      (term->putchar) (&c2);
+    }
+}
+
+static void
+putcode_real (grub_uint32_t code, struct grub_term_output *term)
+{
+  struct grub_unicode_glyph c =
+    {
+      .variant = 0,
+      .attributes = 0,
+      .ncomb = 0,
+      .combining = 0
+    };
+
+  c.base = map_code (code, term);
+  putglyph (&c, term);
+}
+
+/* Put a Unicode character.  */
+void
+grub_putcode (grub_uint32_t code, struct grub_term_output *term)
+{
+  /* Combining character by itself?  */
+  if (grub_unicode_get_comb_type (code) != GRUB_UNICODE_COMB_NONE)
+    return;
+
+  putcode_real (code, term);
 }
 
 void
@@ -1167,43 +1196,11 @@ grub_print_ucs4 (const grub_uint32_t * str,
 	}
       for (visual_ptr = visual; visual_ptr < visual + visual_len; visual_ptr++)
 	{
-	  struct grub_unicode_glyph c = {
-	    .variant = 0,
-	    .attributes = 0,
-	    .ncomb = 0,
-	    .combining = 0
-	  };
 	  if (visual_ptr->base == '\n')
 	    grub_print_spaces (term, margin_right);
-	  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
-	      == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
-	    {
-	      int i;
-	      for (i = -1; i < (int) visual_ptr->ncomb; i++)
-		{
-		  grub_uint8_t u8[20], *ptr;
-	      
-		  if (i == -1)
-		    grub_ucs4_to_utf8 (&visual_ptr->base, 1, u8, sizeof (u8));
-		  else
-		    grub_ucs4_to_utf8 (&visual_ptr->combining[i].code,
-				       1, u8, sizeof (u8));
-
-		  for (ptr = u8; *ptr; ptr++)
-		    {
-		      c.base = *ptr;
-		      (term->putchar) (&c);
-		    }
-		}
-	    }
-	  else
-	    term->putchar (visual_ptr);
+	  putglyph (visual_ptr, term);
 	  if (visual_ptr->base == '\n')
-	    {
-	      c.base = '\r';
-	      term->putchar (&c);
-	      grub_print_spaces (term, margin_left);
-	    }
+	    grub_print_spaces (term, margin_left);
 	  grub_free (visual_ptr->combining);
 	}
       grub_free (visual);
@@ -1253,11 +1250,18 @@ grub_print_ucs4 (const grub_uint32_t * str,
 	      lastspacewidth = line_width - last_width;
 
 	    for (ptr2 = line_start; ptr2 < ptr; ptr2++)
-	      grub_putcode (*ptr2, term);	      
+	      {
+		/* Skip combining characters on non-UTF8 terminals.  */
+		if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
+		    != GRUB_TERM_CODE_TYPE_UTF8_LOGICAL
+		    && grub_unicode_get_comb_type (*ptr2)
+		    != GRUB_UNICODE_COMB_NONE)
+		  continue;
+		putcode_real (*ptr2, term);
+	      }
 
 	    grub_print_spaces (term, margin_right);
 	    grub_putcode ('\n', term);
-	    grub_putcode ('\r', term);
 	    line_width -= lastspacewidth;
 	    grub_print_spaces (term, margin_left);
 	    if (ptr == last_space || *ptr == '\n')

From d6e0e85bf491e7b87617626330cee428e65982ad Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 19:16:15 +0100
Subject: [PATCH 0626/1628] Disable UTF-8 serial by default

---
 term/serial.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/term/serial.c b/term/serial.c
index 53ba65ac9..18978911f 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -49,6 +49,9 @@ static const struct grub_arg_option options[] =
   {"word",   'w', 0, N_("Set the serial port word length."), 0, ARG_TYPE_INT},
   {"parity", 'r', 0, N_("Set the serial port parity."),      0, ARG_TYPE_STRING},
   {"stop",   't', 0, N_("Set the serial port stop bits."),   0, ARG_TYPE_INT},
+  {"ascii",  'a', 0, N_("Terminal is ASCII-only."),   0, ARG_TYPE_NONE},
+  {"utf8",   'l', 0, N_("Terminal is logical-ordered UTF-8."), 0, ARG_TYPE_NONE},
+  {"visual-utf8",   'v', 0, N_("Terminal is visually-ordered UTF-8."), 0, ARG_TYPE_NONE},
   {0, 0, 0, 0, 0, 0}
 };
 
@@ -453,7 +456,7 @@ static struct grub_term_output grub_serial_term_output =
   .cls = grub_serial_cls,
   .setcolorstate = grub_serial_setcolorstate,
   .setcursor = grub_serial_setcursor,
-  .flags = GRUB_TERM_CODE_TYPE_UTF8_VISUAL,
+  .flags = GRUB_TERM_CODE_TYPE_ASCII,
 };
 
 
@@ -538,6 +541,15 @@ grub_cmd_serial (grub_extcmd_t cmd,
 	}
     }
 
+  grub_serial_term_output.flags &= ~GRUB_TERM_CODE_TYPE_MASK;
+
+  if (state[7].set)
+    grub_serial_term_output.flags |= GRUB_TERM_CODE_TYPE_UTF8_LOGICAL;
+  else if (state[8].set)
+    grub_serial_term_output.flags |= GRUB_TERM_CODE_TYPE_UTF8_VISUAL;
+  else
+    grub_serial_term_output.flags |= GRUB_TERM_CODE_TYPE_ASCII;
+
   /* Initialize with new settings.  */
   hwiniterr = serial_hw_init ();
 

From bf17ef45d66d1e14770832c6271bbd60f66e86de Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 19:23:21 +0100
Subject: [PATCH 0627/1628] Rename UCS4 to glyph description

---
 include/grub/term.h | 7 ++++---
 normal/charset.c    | 2 +-
 term/gfxterm.c      | 2 +-
 term/i386/pc/vga.c  | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/grub/term.h b/include/grub/term.h
index d715755cc..573f20331 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -78,9 +78,10 @@ grub_term_color_state;
 /* UTF-8 stream in logical order. Usually used for terminals
    which just forward the stream to another computer.  */
 #define GRUB_TERM_CODE_TYPE_UTF8_LOGICAL	(1 << 4)
-/* UCS-4 in visual order.  */
-#define GRUB_TERM_CODE_TYPE_UCS4_VISUAL	        ((1 << 4) | (1 << 3))
-#define GRUB_TERM_CODE_TYPE_UTF8_VISUAL	        ((1 << 5) | (1 << 4))
+/* UTF-8 in visual order. Like UTF-8 logical but for buggy endpoints.  */
+#define GRUB_TERM_CODE_TYPE_UTF8_VISUAL	        ((1 << 4) | (1 << 3))
+/* Glyph description in visual order.  */
+#define GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS       (1 << 5)
 
 
 /* Bitmasks for modifier keys returned by grub_getkeystatus.  */
diff --git a/normal/charset.c b/normal/charset.c
index 24413ee76..53b9578e5 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -1179,7 +1179,7 @@ grub_print_ucs4 (const grub_uint32_t * str,
   startwidth = ((term->getxy () >> 8) & 0xff) - margin_left;
 
   if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
-      == GRUB_TERM_CODE_TYPE_UCS4_VISUAL 
+      == GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS
       || (term->flags & GRUB_TERM_CODE_TYPE_MASK) 
       == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
     {
diff --git a/term/gfxterm.c b/term/gfxterm.c
index 797e714d2..7e35148d4 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -1206,7 +1206,7 @@ static struct grub_term_output grub_video_term =
     .getcolor = grub_virtual_screen_getcolor,
     .setcursor = grub_gfxterm_setcursor,
     .refresh = grub_gfxterm_refresh,
-    .flags = GRUB_TERM_CODE_TYPE_UCS4_VISUAL,
+    .flags = GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS,
     .next = 0
   };
 
diff --git a/term/i386/pc/vga.c b/term/i386/pc/vga.c
index 448a773ef..036ac592a 100644
--- a/term/i386/pc/vga.c
+++ b/term/i386/pc/vga.c
@@ -505,7 +505,7 @@ static struct grub_term_output grub_vga_term =
     .cls = grub_vga_cls,
     .setcolorstate = grub_vga_setcolorstate,
     .setcursor = grub_vga_setcursor,
-    .flags = GRUB_TERM_CODE_TYPE_UCS4_VISUAL,
+    .flags = GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS,
   };
 
 GRUB_MOD_INIT(vga)

From 50186d826d63c0298353e8377b2f1a130b454958 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 19:55:09 +0100
Subject: [PATCH 0628/1628] Fix combining characters messing with width counter

---
 include/grub/unicode.h |  9 ++++-----
 kern/term.c            |  3 ++-
 normal/charset.c       | 10 ++++++++--
 normal/menu_text.c     |  3 ++-
 term/serial.c          |  2 +-
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index e7f176d0f..2bc9753ed 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -84,6 +84,9 @@ struct grub_unicode_glyph
     grub_uint32_t code;
     enum grub_comb_type type;
   } *combining;
+  /* Hint by unicode subsystem how wide this character usually is.
+     Real width is determined by font. Set only in UTF-8 stream.  */
+  int estimated_width;
 };
 
 #define GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR 0x1
@@ -134,15 +137,11 @@ static inline struct grub_unicode_glyph *
 grub_unicode_glyph_from_code (grub_uint32_t code)
 {
   struct grub_unicode_glyph *ret;
-  ret = grub_malloc (sizeof (*ret));
+  ret = grub_zalloc (sizeof (*ret));
   if (!ret)
     return NULL;
 
   ret->base = code;
-  ret->variant = 0;
-  ret->attributes = 0;
-  ret->ncomb = 0;
-  ret->combining = 0;
 
   return ret;
 }
diff --git a/kern/term.c b/kern/term.c
index 8139e8118..a65d67196 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -41,7 +41,8 @@ grub_putcode_dumb (grub_uint32_t code,
       .variant = 0,
       .attributes = 0,
       .ncomb = 0,
-      .combining = 0
+      .combining = 0,
+      .estimated_width = 1
     };
 
   if (code == '\t' && term->getxy)
diff --git a/normal/charset.c b/normal/charset.c
index 53b9578e5..af53b3134 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -538,6 +538,7 @@ grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen,
       out->variant = 0;
       out->attributes = 0;
       out->ncomb = 0;
+      out->estimated_width = 1;
       out->combining = NULL;
     }
   return ptr - in;
@@ -1075,7 +1076,8 @@ putglyph (const struct grub_unicode_glyph *c, struct grub_term_output *term)
       .variant = 0,
       .attributes = 0,
       .ncomb = 0,
-      .combining = 0
+      .combining = 0,
+      .estimated_width = 1
     };
 
   if (c->base == '\t' && term->getxy)
@@ -1096,6 +1098,7 @@ putglyph (const struct grub_unicode_glyph *c, struct grub_term_output *term)
       == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
     {
       int i;
+      c2.estimated_width = 1;
       for (i = -1; i < (int) c->ncomb; i++)
 	{
 	  grub_uint8_t u8[20], *ptr;
@@ -1112,8 +1115,10 @@ putglyph (const struct grub_unicode_glyph *c, struct grub_term_output *term)
 	    {
 	      c2.base = *ptr;
 	      (term->putchar) (&c2);
+	      c2.estimated_width = 0;
 	    }
 	}
+      c2.estimated_width = 1;
     }
   else
     (term->putchar) (c);
@@ -1133,7 +1138,8 @@ putcode_real (grub_uint32_t code, struct grub_term_output *term)
       .variant = 0,
       .attributes = 0,
       .ncomb = 0,
-      .combining = 0
+      .combining = 0,
+      .estimated_width = 1
     };
 
   c.base = map_code (code, term);
diff --git a/normal/menu_text.c b/normal/menu_text.c
index 61ddd2490..2e2cf0e0c 100644
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -273,7 +273,8 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
 	.variant = 0,
 	.attributes = 0,
 	.ncomb = 0,
-	.combining = 0
+	.combining = 0,
+	.estimated_width = 1
       };
       x += grub_term_getcharwidth (term, &pseudo_glyph);
     }
diff --git a/term/serial.c b/term/serial.c
index 18978911f..666606fcc 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -356,7 +356,7 @@ grub_serial_putchar (const struct grub_unicode_glyph *c)
 	      serial_hw_put ('\r');
 	      serial_hw_put ('\n');
 	    }
-	  xpos++;
+	  xpos += c->estimated_width;
 	  break;
 	}
     }

From 8a0b074f39a2c91003f5e80231a7998fbf24d1b7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 19:56:33 +0100
Subject: [PATCH 0629/1628] Fix combining characters messing with width counter

---
 term/serial.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/term/serial.c b/term/serial.c
index 666606fcc..b1c5accd1 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -348,7 +348,7 @@ grub_serial_putchar (const struct grub_unicode_glyph *c)
 	default:
 	  if ((c->base & 0xC0) == 0x80)
 	    break;
-	  if (xpos >= TEXT_WIDTH)
+	  if (xpos + c->estimated_width >= TEXT_WIDTH + 1)
 	    {
 	      xpos = 0;
 	      if (ypos < TEXT_HEIGHT - 1)

From 2b5af23fa50d1307e20af234c0bf001cfb96dbc8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 20:01:19 +0100
Subject: [PATCH 0630/1628] Remove leftover

---
 normal/menu_text.c | 38 --------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/normal/menu_text.c b/normal/menu_text.c
index 2e2cf0e0c..884eb2c30 100644
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -71,44 +71,6 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,
 
   grub_print_ucs4 (unicode_msg, last_position, margin_left, margin_right, term);
 
-#if 0
-  int line_len;
-
-  grub_uint32_t *current_position = unicode_msg;
-
-  grub_uint32_t *next_new_line = unicode_msg;
-
-  int first_loop = 1;
-
-  while (current_position < last_position)
-    {
-      if (! first_loop)
-        grub_putcode ('\n', term);
-     
-      next_new_line = (grub_uint32_t *) last_position;
-
-      while (grub_getstringwidth (current_position, next_new_line,term) 
-	     > line_len
-            || (next_new_line != last_position && *next_new_line != ' '
-		&& next_new_line > current_position))
-       {
-         next_new_line--;
-       }
-
-      if (next_new_line == current_position)
-       {
-         next_new_line = (next_new_line + line_len > last_position) ?
-           (grub_uint32_t *) last_position : next_new_line + line_len;
-       }
-
-      print_spaces (margin_left, term);
-      grub_print_ucs4 (current_position, next_new_line, term);
-
-      next_new_line++;
-      current_position = next_new_line;
-      first_loop = 0;
-    }
-#endif
   grub_free (unicode_msg);
 }
 

From 6c363dfd54a0abdd6ec8d1a322bbb25a3be80082 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 21:29:15 +0100
Subject: [PATCH 0631/1628] Fix doublewidth character handling

---
 Makefile.in         |  8 ++++++-
 conf/common.rmk     |  4 ++++
 include/grub/term.h | 24 ++++++++++++++++++++
 normal/charset.c    | 42 +++++++++++++++++++++++++++++++----
 term/serial.c       |  7 ------
 util/grub-mkfont.c  | 53 ++++++++++++++++++++++++++++++++++++++++-----
 6 files changed, 121 insertions(+), 17 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 07fe6219a..dd2fedbf4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -259,7 +259,13 @@ ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
 ascii.h: ascii.bitmaps grub-bin2h
 	$(builddir)/grub-bin2h ascii_bitmaps < $< > $@
 
-TARGET_CFLAGS += -DUSE_ASCII_FAILBACK=1
+widthspec.bin: $(FONT_SOURCE) grub-mkfont
+	$(builddir)/grub-mkfont --width-spec -o $@ $(FONT_SOURCE)
+
+widthspec.h: widthspec.bin grub-bin2h
+	$(builddir)/grub-bin2h widthspec < $< > $@
+
+TARGET_CFLAGS += -DUSE_ASCII_FAILBACK=1 -DHAVE_UNIFONT_WIDTHSPEC=1
 endif
 endif
 
diff --git a/conf/common.rmk b/conf/common.rmk
index acbb990da..98daa0839 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -640,6 +640,10 @@ normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
 	normal/menu_entry.c normal/menu_text.c normal/charset.c \
 	normal/misc.c normal/crypto.c normal/term.c normal/context.c \
 	unidata.c
+ifneq (, $(FONT_SOURCE))
+normal/charset.c_SOURCES += widthspec.h
+endif
+
 normal_mod_CFLAGS = $(COMMON_CFLAGS)
 normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/include/grub/term.h b/include/grub/term.h
index 573f20331..8a9218635 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -380,12 +380,36 @@ grub_term_cls (struct grub_term_output *term)
     }
 }
 
+#ifdef HAVE_UNIFONT_WIDTHSPEC
+
+grub_ssize_t
+grub_unicode_estimate_width (const struct grub_unicode_glyph *c);
+
+#else
+
+static inline grub_ssize_t
+grub_unicode_estimate_width (const struct grub_unicode_glyph *c __attribute__ ((unused)))
+{
+  if (grub_unicode_get_comb_type (c->base))
+    return 0;
+  return 1;
+}
+
+#endif
+
 static inline grub_ssize_t 
 grub_term_getcharwidth (struct grub_term_output *term,
 			const struct grub_unicode_glyph *c)
 {
   if (term->getcharwidth)
     return term->getcharwidth (c);
+  else if (((term->flags & GRUB_TERM_CODE_TYPE_MASK)
+	    == GRUB_TERM_CODE_TYPE_UTF8_LOGICAL)
+	   || ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
+	       == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
+	   || ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
+	       == GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS))
+    return grub_unicode_estimate_width (c);
   else
     return 1;
 }
diff --git a/normal/charset.c b/normal/charset.c
index af53b3134..143836bf2 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -30,6 +30,10 @@
 #include <grub/term.h>
 #include <grub/normal.h>
 
+#ifdef HAVE_UNIFONT_WIDTHSPEC
+#include "widthspec.h"
+#endif
+
 grub_ssize_t
 grub_utf8_to_utf16 (grub_uint16_t *dest, grub_size_t destsize,
 		    const grub_uint8_t *src, grub_size_t srcsize,
@@ -465,6 +469,21 @@ grub_unicode_get_comb_type (grub_uint32_t c)
   return GRUB_UNICODE_COMB_NONE;
 }
 
+#ifdef HAVE_UNIFONT_WIDTHSPEC
+
+grub_ssize_t
+grub_unicode_estimate_width (const struct grub_unicode_glyph *c)
+{
+  if (grub_unicode_get_comb_type (c->base))
+    return 0;
+  if (widthspec[c->base >> 3] & (1 << (c->base & 7)))
+    return 2;
+  else
+    return 1;
+}
+
+#endif
+
 grub_size_t
 grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen,
 			      struct grub_unicode_glyph *out)
@@ -1098,7 +1117,7 @@ putglyph (const struct grub_unicode_glyph *c, struct grub_term_output *term)
       == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
     {
       int i;
-      c2.estimated_width = 1;
+      c2.estimated_width = grub_term_getcharwidth (term, c);
       for (i = -1; i < (int) c->ncomb; i++)
 	{
 	  grub_uint8_t u8[20], *ptr;
@@ -1192,8 +1211,15 @@ grub_print_ucs4 (const grub_uint32_t * str,
       grub_ssize_t visual_len;
       struct grub_unicode_glyph *visual;
       struct grub_unicode_glyph *visual_ptr;
+
+      auto grub_ssize_t getcharwidth (const struct grub_unicode_glyph *c);
+      grub_ssize_t getcharwidth (const struct grub_unicode_glyph *c)
+      {
+	return grub_term_getcharwidth (term, c);
+      }
+
       visual_len = grub_bidi_logical_to_visual (str, last_position - str,
-						&visual, term->getcharwidth,
+						&visual, getcharwidth,
 						max_width, startwidth);
       if (visual_len < 0)
 	{
@@ -1231,7 +1257,7 @@ grub_print_ucs4 (const grub_uint32_t * str,
 	      .combining = 0
 	    };
 	    c.base = *ptr;
-	    line_width += last_width = term->getcharwidth (&c);
+	    line_width += last_width = grub_term_getcharwidth (term, &c);
 	  }
 
 	if (*ptr == ' ')
@@ -1279,7 +1305,15 @@ grub_print_ucs4 (const grub_uint32_t * str,
     {
       const grub_uint32_t *ptr2;
       for (ptr2 = line_start; ptr2 < last_position; ptr2++)
-	grub_putcode (*ptr2, term);
+	{
+	  /* Skip combining characters on non-UTF8 terminals.  */
+	  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
+	      != GRUB_TERM_CODE_TYPE_UTF8_LOGICAL
+	      && grub_unicode_get_comb_type (*ptr2)
+	      != GRUB_UNICODE_COMB_NONE)
+	    continue;
+	  putcode_real (*ptr2, term);
+	}
     }
   }
 }
diff --git a/term/serial.c b/term/serial.c
index b1c5accd1..8b32396ee 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -364,12 +364,6 @@ grub_serial_putchar (const struct grub_unicode_glyph *c)
   serial_hw_put (c->base);
 }
 
-static grub_ssize_t
-grub_serial_getcharwidth (const struct grub_unicode_glyph *c __attribute__ ((unused)))
-{
-  return 1;
-}
-
 static grub_uint16_t
 grub_serial_getwh (void)
 {
@@ -449,7 +443,6 @@ static struct grub_term_output grub_serial_term_output =
 {
   .name = "serial",
   .putchar = grub_serial_putchar,
-  .getcharwidth = grub_serial_getcharwidth,
   .getwh = grub_serial_getwh,
   .getxy = grub_serial_getxy,
   .gotoxy = grub_serial_gotoxy,
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 9d94b687b..c7969011c 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -53,7 +53,8 @@ struct grub_glyph_info
 enum file_formats
 {
   PF2,
-  ASCII_BITMAPS 
+  ASCII_BITMAPS,
+  WIDTH_SPEC
 };
 
 #define GRUB_FONT_FLAG_BOLD		1
@@ -95,6 +96,7 @@ static struct option options[] =
   {"version", no_argument, 0, 'V'},
   {"verbose", no_argument, 0, 'v'},
   {"ascii-bitmaps", no_argument, 0, 0x102},
+  {"width-spec", no_argument, 0, 0x103},
   {0, 0, 0, 0}
 };
 
@@ -111,6 +113,7 @@ Usage: %s [OPTIONS] FONT_FILES\n\
 \nOptions:\n\
   -o, --output=FILE_NAME    set output file name\n\
   --ascii-bitmaps           save only the ASCII bitmaps\n\
+  --width-spec              create width summary file\n\
   -i, --index=N             set face index\n\
   -r, --range=A-B[,C-D]     set font range\n\
   -n, --name=S              set font family name\n\
@@ -380,6 +383,32 @@ write_font_ascii_bitmap (struct grub_font_info *font_info, char *output_file)
     fclose (file);
 }
 
+void
+write_font_width_spec (struct grub_font_info *font_info, char *output_file)
+{
+  FILE *file;
+  struct grub_glyph_info *glyph;
+  grub_uint8_t *out;
+  grub_uint8_t *rle;
+  int rle_size;
+  int i, j;
+
+  out = xmalloc (8192);
+  memset (out, 0, 8192);
+  
+  file = fopen (output_file, "wb");
+  if (! file)
+    grub_util_error ("Can\'t write to file %s.", output_file);
+
+  for (glyph = font_info->glyph; glyph; glyph = glyph->next)
+    if (glyph->width > 12)
+      out[glyph->char_code >> 3] |= (1 << (glyph->char_code & 7));
+
+  fwrite (out, 8192, 1, file);
+  fclose (file);
+  free (out);
+}
+
 void
 write_font_pf2 (struct grub_font_info *font_info, char *output_file)
 {
@@ -648,6 +677,10 @@ main (int argc, char *argv[])
 	     file_format = ASCII_BITMAPS;
 	     break;
 
+	  case 0x103:
+	     file_format = WIDTH_SPEC;
+	     break;
+
 	  default:
 	    usage (1);
 	    break;
@@ -712,10 +745,20 @@ main (int argc, char *argv[])
 
   FT_Done_FreeType (ft_lib);
 
-  if (file_format == PF2)
-    write_font_pf2 (&font_info, output_file);
-  else if (file_format == ASCII_BITMAPS)
-    write_font_ascii_bitmap (&font_info, output_file);
+  switch (file_format)
+    {
+    case PF2:
+      write_font_pf2 (&font_info, output_file);
+      break;
+
+    case ASCII_BITMAPS:
+      write_font_ascii_bitmap (&font_info, output_file);
+      break;
+
+    case WIDTH_SPEC:
+      write_font_width_spec (&font_info, output_file);
+      break;
+    }
 
   if (font_verbosity > 1)
     print_glyphs (&font_info);

From 703cbe63d64e3b5b09afb9357522003585ede4cf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 21:33:23 +0100
Subject: [PATCH 0632/1628] Remove trivial getcharwidth (now implicit)

---
 term/efi/console.c        | 8 --------
 term/i386/pc/console.c    | 1 -
 term/i386/pc/vga_text.c   | 1 -
 term/i386/vga_common.c    | 7 -------
 term/ieee1275/ofconsole.c | 7 -------
 util/console.c            | 7 -------
 6 files changed, 31 deletions(-)

diff --git a/term/efi/console.c b/term/efi/console.c
index 875a23a25..35b265ddb 100644
--- a/term/efi/console.c
+++ b/term/efi/console.c
@@ -112,13 +112,6 @@ grub_console_putchar (const struct grub_unicode_glyph *c)
   efi_call_2 (o->output_string, o, str);
 }
 
-static grub_ssize_t
-grub_console_getcharwidth (const struct grub_unicode_glyph *c __attribute__ ((unused)))
-{
-  /* For now, every printable character has the width 1.  */
-  return 1;
-}
-
 static int
 grub_console_checkkey (void)
 {
@@ -349,7 +342,6 @@ static struct grub_term_output grub_console_term_output =
   {
     .name = "console",
     .putchar = grub_console_putchar,
-    .getcharwidth = grub_console_getcharwidth,
     .getwh = grub_console_getwh,
     .getxy = grub_console_getxy,
     .gotoxy = grub_console_gotoxy,
diff --git a/term/i386/pc/console.c b/term/i386/pc/console.c
index 5def6fca0..146e16643 100644
--- a/term/i386/pc/console.c
+++ b/term/i386/pc/console.c
@@ -57,7 +57,6 @@ static struct grub_term_output grub_console_term_output =
   {
     .name = "console",
     .putchar = grub_console_putchar,
-    .getcharwidth = grub_console_getcharwidth,
     .getwh = grub_console_getwh,
     .getxy = grub_console_getxy,
     .gotoxy = grub_console_gotoxy,
diff --git a/term/i386/pc/vga_text.c b/term/i386/pc/vga_text.c
index 82cc11967..379eb3579 100644
--- a/term/i386/pc/vga_text.c
+++ b/term/i386/pc/vga_text.c
@@ -155,7 +155,6 @@ static struct grub_term_output grub_vga_text_term =
     .init = grub_vga_text_init_fini,
     .fini = grub_vga_text_init_fini,
     .putchar = grub_console_putchar,
-    .getcharwidth = grub_console_getcharwidth,
     .getwh = grub_console_getwh,
     .getxy = grub_vga_text_getxy,
     .gotoxy = grub_vga_text_gotoxy,
diff --git a/term/i386/vga_common.c b/term/i386/vga_common.c
index 30458b034..f88dbb04e 100644
--- a/term/i386/vga_common.c
+++ b/term/i386/vga_common.c
@@ -31,13 +31,6 @@ grub_console_putchar (const struct grub_unicode_glyph *c)
   grub_console_real_putchar (c->base);
 }
 
-grub_ssize_t
-grub_console_getcharwidth (const struct grub_unicode_glyph *c __attribute__ ((unused)))
-{
-  /* For now, every printable character has the width 1.  */
-  return 1;
-}
-
 grub_uint16_t
 grub_console_getwh (void)
 {
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index 81e7e7b20..926f5e028 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -107,12 +107,6 @@ grub_ofconsole_putchar (const struct grub_unicode_glyph *c)
   grub_ieee1275_write (stdout_ihandle, &chr, 1, 0);
 }
 
-static grub_ssize_t
-grub_ofconsole_getcharwidth (const struct grub_unicode_glyph *c __attribute__((unused)))
-{
-  return 1;
-}
-
 static void
 grub_ofconsole_setcolorstate (grub_term_color_state state)
 {
@@ -449,7 +443,6 @@ static struct grub_term_output grub_ofconsole_term_output =
     .init = grub_ofconsole_init_output,
     .fini = grub_ofconsole_fini,
     .putchar = grub_ofconsole_putchar,
-    .getcharwidth = grub_ofconsole_getcharwidth,
     .getxy = grub_ofconsole_getxy,
     .getwh = grub_ofconsole_getwh,
     .gotoxy = grub_ofconsole_gotoxy,
diff --git a/util/console.c b/util/console.c
index 91480a810..b4316042e 100644
--- a/util/console.c
+++ b/util/console.c
@@ -69,12 +69,6 @@ grub_ncurses_putchar (const struct grub_unicode_glyph *c)
   addch (c->base | grub_console_attr);
 }
 
-static grub_ssize_t
-grub_ncurses_getcharwidth (const struct grub_unicode_glyph * c __attribute__ ((unused)))
-{
-  return 1;
-}
-
 static void
 grub_ncurses_setcolorstate (grub_term_color_state state)
 {
@@ -317,7 +311,6 @@ static struct grub_term_output grub_ncurses_term_output =
     .init = grub_ncurses_init,
     .fini = grub_ncurses_fini,
     .putchar = grub_ncurses_putchar,
-    .getcharwidth = grub_ncurses_getcharwidth,
     .getxy = grub_ncurses_getxy,
     .getwh = grub_ncurses_getwh,
     .gotoxy = grub_ncurses_gotoxy,

From 6f5568ed67eca6d5acd13652f87a399818842921 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 21:57:34 +0100
Subject: [PATCH 0633/1628] Add mirroring for visual UTF-8

---
 autogen.sh             |  2 +-
 include/grub/unicode.h |  7 +++++++
 normal/charset.c       | 16 +++++++++++++++-
 util/import_unicode.py | 24 ++++++++++++++++++++++--
 4 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 5d0b5a282..524b908f5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,7 +13,7 @@ echo timestamp > stamp-h.in
 
 python util/import_gcry.py lib/libgcrypt/ .
 
-python util/import_unicode.py util/UnicodeData.txt unidata.c
+python util/import_unicode.py util/UnicodeData.txt util/BidiMirroring.txt unidata.c
 
 for rmk in conf/*.rmk ${GRUB_CONTRIB}/*/conf/*.rmk; do
   if test -e $rmk ; then
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 2bc9753ed..c96d8854d 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -23,6 +23,12 @@
 #include <grub/mm.h>
 #include <grub/misc.h>
 
+struct grub_unicode_bidi_pair
+{
+  grub_uint32_t key;
+  grub_uint32_t replace;
+};
+
 struct grub_unicode_compact_range
 {
   grub_uint32_t start:21;
@@ -97,6 +103,7 @@ struct grub_unicode_glyph
 #define GRUB_UNICODE_VARIATION_SELECTOR_256 0xe01ef
 
 extern struct grub_unicode_compact_range grub_unicode_compact[];
+extern struct grub_unicode_bidi_pair grub_unicode_bidi_pairs[];
 
 #define GRUB_UNICODE_MAX_CACHED_CHAR 0x20000
 /*  Unicode mandates an arbitrary limit.  */
diff --git a/normal/charset.c b/normal/charset.c
index 143836bf2..8b81910dc 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -1087,6 +1087,16 @@ map_code (grub_uint32_t in, struct grub_term_output *term)
   return in;
 }
 
+static grub_uint32_t
+mirror_code (grub_uint32_t in)
+{
+  int i;
+  for (i = 0; grub_unicode_bidi_pairs[i].key; i++)
+    if (grub_unicode_bidi_pairs[i].key == in)
+      return grub_unicode_bidi_pairs[i].replace;
+  return in;
+}
+
 static void
 putglyph (const struct grub_unicode_glyph *c, struct grub_term_output *term)
 {
@@ -1124,7 +1134,11 @@ putglyph (const struct grub_unicode_glyph *c, struct grub_term_output *term)
 	  grub_uint32_t code;
 	      
 	  if (i == -1)
-	    code = c->base;
+	    {
+	      code = c->base;
+	      if (c->attributes & GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR)
+		code = mirror_code (code);
+	    }
 	  else
 	    code = c->combining[i].code;
 
diff --git a/util/import_unicode.py b/util/import_unicode.py
index e2f0561f0..0fc36c5c2 100644
--- a/util/import_unicode.py
+++ b/util/import_unicode.py
@@ -25,7 +25,7 @@ if len (sys.argv) < 3:
     print ("Usage: %s SOURCE DESTINATION" % sys.argv[0])
     exit (0)
 infile = open (sys.argv[1], "r")
-outfile = open (sys.argv[2], "w")
+outfile = open (sys.argv[3], "w")
 outfile.write ("#include <grub/unicode.h>\n")
 outfile.write ("\n")
 outfile.write ("struct grub_unicode_compact_range grub_unicode_compact[] = {\n")
@@ -69,4 +69,24 @@ if lastbiditype != "L" or lastcombtype != 0 or lastmirrortype:
                                lastmirrortype)))
 outfile.write ("{0, 0, 0, 0, 0},\n")
 
-outfile.write ("};")
+outfile.write ("};\n")
+
+infile.close ()
+
+infile = open (sys.argv[2], "r")
+
+outfile.write ("struct grub_unicode_bidi_pair grub_unicode_bidi_pairs[] = {\n")
+
+for line in infile:
+    line = re.sub ("#.*$", "", line)
+    line = line.replace ("\n", "")
+    line = line.replace (" ", "")
+    if len (line) == 0 or line[0] == '\n':
+        continue
+    sp = line.split (";")
+    code1 = int (sp[0], 16)
+    code2 = int (sp[1], 16)
+    outfile.write ("{0x%x, 0x%x},\n" % (code1, code2))
+outfile.write ("{0, 0},\n")
+outfile.write ("};\n")
+

From bb7f4dbe3ba5ee5169c3e79c617b6c06ff1ea932 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 22:05:50 +0100
Subject: [PATCH 0634/1628] Explicitly check that terminal is in visual UTF-8
 before mirroring code

---
 normal/charset.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/normal/charset.c b/normal/charset.c
index 8b81910dc..452057174 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -1136,7 +1136,9 @@ putglyph (const struct grub_unicode_glyph *c, struct grub_term_output *term)
 	  if (i == -1)
 	    {
 	      code = c->base;
-	      if (c->attributes & GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR)
+	      if ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
+		  == GRUB_TERM_CODE_TYPE_UTF8_VISUAL
+		  && (c->attributes & GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR))
 		code = mirror_code (code);
 	    }
 	  else

From 701f1df9618e9af81e2b04ae4a109e83c3c9ef8d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 22:34:13 +0100
Subject: [PATCH 0635/1628] Fix junk newline on second console

---
 normal/main.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/normal/main.c b/normal/main.c
index ab28609cd..52d9b36fe 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -430,7 +430,8 @@ grub_normal_init_page (struct grub_term_output *term)
   grub_term_gotoxy (term, posx, 1);
 
   grub_print_ucs4 (unicode_msg, last_position, 0, 0, term);
-  grub_printf("\n\n");
+  grub_putcode ('\n', term);
+  grub_putcode ('\n', term);
   grub_free (unicode_msg);
 }
 
@@ -550,9 +551,10 @@ grub_normal_reader_init (int nested)
   {
     grub_normal_init_page (term);
     grub_term_setcursor (term, 1);
-    
+
     grub_print_message_indented (msg_formatted, 3, STANDARD_MARGIN, term);
-    grub_puts ("\n");
+    grub_putcode ('\n', term);
+    grub_putcode ('\n', term);
   }
   grub_free (msg_formatted);
  

From 7c464a1ec55403c08f239aefd3786c45499e1888 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 23:02:48 +0100
Subject: [PATCH 0636/1628] Don't show gfxmenu error

---
 normal/menu.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/normal/menu.c b/normal/menu.c
index 2e722c0a6..e96c99efd 100644
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -246,7 +246,6 @@ menu_init (int entry, grub_menu_t menu, int nested)
 	err = grub_gfxmenu_try_hook (entry, menu, nested);
 	if(!err)
 	  continue;
-	grub_print_error ();
 	grub_errno = GRUB_ERR_NONE;
       }
 

From eaa1f9a64b83aaa87fae52fe3bbda2457bd1c993 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 16 Mar 2010 23:03:08 +0100
Subject: [PATCH 0637/1628] Fix few memory errors

---
 gfxmenu/font.c         |  2 +-
 include/grub/unicode.h | 13 ++++++++-----
 normal/charset.c       |  6 ++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/gfxmenu/font.c b/gfxmenu/font.c
index 0c973620a..a11b31875 100644
--- a/gfxmenu/font.c
+++ b/gfxmenu/font.c
@@ -63,10 +63,10 @@ grub_font_draw_string (const char *str, grub_font_t font,
       if (!glyph)
 	return grub_errno;
       err = grub_font_draw_glyph (glyph, color, x, baseline_y);
+      x += glyph->device_width;
       grub_free (glyph);
       if (err)
 	return err;
-      x += glyph->device_width;
     }
 
   grub_free (visual);
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index c96d8854d..b68c7faf5 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -130,13 +130,16 @@ grub_unicode_glyph_dup (const struct grub_unicode_glyph *in)
   if (!out)
     return NULL;
   grub_memcpy (out, in, sizeof (*in));
-  out->combining = grub_malloc (in->ncomb * sizeof (*in));
-  if (!out->combining)
+  if (in->combining)
     {
-      grub_free (out);
-      return NULL;
+      out->combining = grub_malloc (in->ncomb * sizeof (*in));
+      if (!out->combining)
+	{
+	  grub_free (out);
+	  return NULL;
+	}
+      grub_memcpy (out->combining, in->combining, in->ncomb * sizeof (*in));
     }
-  grub_memcpy (out->combining, in->combining, in->ncomb * sizeof (*in));
   return out;
 }
 
diff --git a/normal/charset.c b/normal/charset.c
index 452057174..2473f1b52 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -282,7 +282,8 @@ grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg,
   msg_len = grub_utf8_to_ucs4 (*unicode_msg, msg_len,
   			      (grub_uint8_t *) msg, -1, 0);
 
-  *last_position = *unicode_msg + msg_len;
+  if (last_position)
+    *last_position = *unicode_msg + msg_len;
 
   return msg_len;
 }
@@ -529,13 +530,14 @@ grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen,
 	      || comb_type == GRUB_UNICODE_COMB_ME
 	      || comb_type == GRUB_UNICODE_COMB_MN)
 	    last_comb_pointer = out->ncomb;
-	  n = grub_realloc (out->combining, 
+	  n = grub_realloc (out->combining,
 			    sizeof (n[0]) * (out->ncomb + 1));
 	  if (!n)
 	    {
 	      grub_errno = GRUB_ERR_NONE;
 	      continue;
 	    }
+	  out->combining = n;
 
 	  for (j = last_comb_pointer; j < out->ncomb; j++)
 	    if (out->combining[j].type > comb_type)

From 0ea81d98458645a6ce6830db16f82122b34e4141 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 17 Mar 2010 00:16:11 +0100
Subject: [PATCH 0638/1628] 	* video/fb/fbblit.c
 (grub_video_fbblit_blend_XXXA8888_1bit): Handle 	alpha_mask_size == 0
 case.

---
 ChangeLog         |  5 +++++
 video/fb/fbblit.c | 11 ++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3f9d82987..d811fb381 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* video/fb/fbblit.c (grub_video_fbblit_blend_XXXA8888_1bit): Handle
+	alpha_mask_size == 0 case.
+
 2010-03-14  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	GRUB shell lexer and parser improvements.
diff --git a/video/fb/fbblit.c b/video/fb/fbblit.c
index a0f44d268..15797be97 100644
--- a/video/fb/fbblit.c
+++ b/video/fb/fbblit.c
@@ -1170,10 +1170,15 @@ grub_video_fbblit_blend_XXXA8888_1bit (struct grub_video_fbblit_info *dst,
 	  grub_uint8_t a;
 
 	  if (*srcptr & srcmask)
-	    color = fgcolor;
+	    {
+	      color = fgcolor;
+	      a = src->mode_info->fg_alpha;
+	    }
 	  else
-	    color = bgcolor;
-	  a = (color >> 24) & 0xff;
+	    {
+	      color = bgcolor;
+	      a = src->mode_info->bg_alpha;
+	    }
 
 	  if (a == 255)
 	    *(grub_uint32_t *) dstptr = color;

From c2bd1d182e92d1417bdd1a6cb349c4d979a9a5f1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 17 Mar 2010 00:23:23 +0100
Subject: [PATCH 0639/1628] Fix sporadious newline

---
 normal/menu_text.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/normal/menu_text.c b/normal/menu_text.c
index 884eb2c30..47b7e11f9 100644
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -135,7 +135,7 @@ command-line or ESC to return menu."), STANDARD_MARGIN, STANDARD_MARGIN,
 				     (grub_uint32_t) GRUB_TERM_DISP_DOWN);
       if (!msg_translated)
 	return;
-      grub_xputs ("\n");
+      grub_putcode ('\n', term);
       grub_print_message_indented (msg_translated, STANDARD_MARGIN,
 				   STANDARD_MARGIN, term);
 

From ed0e3d30cd3a2284c6209b278a9e6dd126901886 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 17 Mar 2010 08:22:45 +0100
Subject: [PATCH 0640/1628] 	* term/i386/pc/vesafb.c: Removed (orphaned,
 deprecated and broken).

---
 ChangeLog             |   4 +
 term/i386/pc/vesafb.c | 606 ------------------------------------------
 2 files changed, 4 insertions(+), 606 deletions(-)
 delete mode 100644 term/i386/pc/vesafb.c

diff --git a/ChangeLog b/ChangeLog
index d811fb381..475d92eca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* term/i386/pc/vesafb.c: Removed (orphaned, deprecated and broken).
+
 2010-03-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* video/fb/fbblit.c (grub_video_fbblit_blend_XXXA8888_1bit): Handle
diff --git a/term/i386/pc/vesafb.c b/term/i386/pc/vesafb.c
deleted file mode 100644
index 52694ed10..000000000
--- a/term/i386/pc/vesafb.c
+++ /dev/null
@@ -1,606 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007,2009  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/>.
- */
-
-// TODO: Deprecated and broken. Scheduled for removal as there is VBE driver in Video subsystem.
-
-#include <grub/machine/memory.h>
-#include <grub/machine/vga.h>
-#include <grub/machine/vbe.h>
-#include <grub/machine/console.h>
-#include <grub/term.h>
-#include <grub/types.h>
-#include <grub/dl.h>
-#include <grub/misc.h>
-#include <grub/normal.h>
-#include <grub/font.h>
-#include <grub/mm.h>
-#include <grub/env.h>
-
-#define DEFAULT_CHAR_WIDTH  8
-#define DEFAULT_CHAR_HEIGHT 16
-
-#define DEFAULT_FG_COLOR    0xa
-#define DEFAULT_BG_COLOR    0x0
-
-struct grub_colored_char
-{
-  /* An Unicode codepoint.  */
-  grub_uint32_t code;
-
-  /* Color indexes.  */
-  unsigned char fg_color;
-  unsigned char bg_color;
-
-  /* The width of this character minus one.  */
-  unsigned char width;
-
-  /* The column index of this character.  */
-  unsigned char index;
-};
-
-struct grub_virtual_screen
-{
-  /* Dimensions of the virtual screen.  */
-  grub_uint32_t width;
-  grub_uint32_t height;
-
-  /* Offset in the display.  */
-  grub_uint32_t offset_x;
-  grub_uint32_t offset_y;
-
-  /* TTY Character sizes.  */
-  grub_uint32_t char_width;
-  grub_uint32_t char_height;
-
-  /* Virtual screen TTY size.  */
-  grub_uint32_t columns;
-  grub_uint32_t rows;
-
-  /* Current cursor details.  */
-  grub_uint32_t cursor_x;
-  grub_uint32_t cursor_y;
-  grub_uint8_t cursor_state;
-  grub_uint8_t fg_color;
-  grub_uint8_t bg_color;
-
-  /* Text buffer for virtual screen. Contains (columns * rows) number
-     of entries.  */
-  struct grub_colored_char *text_buffer;
-};
-
-/* Make sure text buffer is not marked as allocated.  */
-static struct grub_virtual_screen virtual_screen =
-  {
-    .text_buffer = 0
-  };
-
-static unsigned char *vga_font = 0;
-static grub_uint32_t old_mode = 0;
-
-static struct grub_vbe_mode_info_block mode_info;
-static grub_uint8_t *framebuffer = 0;
-static grub_uint32_t bytes_per_scan_line = 0;
-
-static void
-grub_virtual_screen_free (void)
-{
-  /* If virtual screen has been allocated, free it.  */
-  if (virtual_screen.text_buffer != 0)
-    grub_free (virtual_screen.text_buffer);
-
-  /* Reset virtual screen data.  */
-  grub_memset (&virtual_screen, 0, sizeof (virtual_screen));
-}
-
-static grub_err_t
-grub_virtual_screen_setup (grub_uint32_t width,
-			   grub_uint32_t height)
-{
-  /* Free old virtual screen.  */
-  grub_virtual_screen_free ();
-
-  /* Initialize with default data.  */
-  virtual_screen.width = width;
-  virtual_screen.height = height;
-  virtual_screen.offset_x = 0;
-  virtual_screen.offset_y = 0;
-  virtual_screen.char_width = DEFAULT_CHAR_WIDTH;
-  virtual_screen.char_height = DEFAULT_CHAR_HEIGHT;
-  virtual_screen.cursor_x = 0;
-  virtual_screen.cursor_y = 0;
-  virtual_screen.cursor_state = 1;
-  virtual_screen.fg_color = DEFAULT_FG_COLOR;
-  virtual_screen.bg_color = DEFAULT_BG_COLOR;
-
-  /* Calculate size of text buffer.  */
-  virtual_screen.columns = virtual_screen.width / virtual_screen.char_width;
-  virtual_screen.rows = virtual_screen.height / virtual_screen.char_height;
-
-  /* Allocate memory for text buffer.  */
-  virtual_screen.text_buffer =
-    (struct grub_colored_char *) grub_malloc (virtual_screen.columns
-					      * virtual_screen.rows
-					      * sizeof (*virtual_screen.text_buffer));
-
-  return grub_errno;
-}
-
-static grub_err_t
-grub_vesafb_mod_init (void)
-{
-  grub_uint32_t use_mode = GRUB_VBE_DEFAULT_VIDEO_MODE;
-  struct grub_vbe_info_block controller_info;
-  char *modevar;
-
-  /* Use fonts from VGA bios.  */
-  vga_font = grub_vga_get_font ();
-
-  /* Check if we have VESA BIOS installed.  */
-  if (grub_vbe_probe (&controller_info) != GRUB_ERR_NONE)
-    return grub_errno;
-
-  /* Check existence of vbe_mode environment variable.  */
-  modevar = grub_env_get ("vbe_mode");
-
-  if (modevar != 0)
-    {
-      unsigned long value;
-
-      value = grub_strtoul (modevar, 0, 0);
-      if (grub_errno == GRUB_ERR_NONE)
-	use_mode = value;
-    }
-
-  /* Store initial video mode.  */
-  if (grub_vbe_get_video_mode (&old_mode) != GRUB_ERR_NONE)
-    return grub_errno;
-
-  /* Setup desired graphics mode.  */
-  if (grub_vbe_set_video_mode (use_mode, &mode_info) != GRUB_ERR_NONE)
-    return grub_errno;
-
-  /* Determine framebuffer and bytes per scan line.  */
-  framebuffer = (grub_uint8_t *) mode_info.phys_base_addr;
-
-  if (controller_info.version >= 0x300)
-    bytes_per_scan_line = mode_info.lin_bytes_per_scan_line;
-  else
-    bytes_per_scan_line = mode_info.bytes_per_scan_line;
-
-  /* Create virtual screen.  */
-  if (grub_virtual_screen_setup (mode_info.x_resolution,
-				 mode_info.y_resolution) != GRUB_ERR_NONE)
-    {
-      grub_vbe_set_video_mode (old_mode, 0);
-      return grub_errno;
-    }
-
-  /* Make sure frame buffer is black.  */
-  grub_memset (framebuffer,
-	       0,
-	       bytes_per_scan_line * mode_info.y_resolution);
-
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_vesafb_mod_fini (void)
-{
-  grub_virtual_screen_free ();
-
-  grub_vbe_set_video_mode (old_mode, 0);
-
-  return GRUB_ERR_NONE;
-}
-
-static int
-grub_virtual_screen_get_glyph (grub_uint32_t code,
-			       unsigned char bitmap[32],
-			       unsigned *width)
-{
-  if (code > 0x7f)
-    {
-      /* Map some unicode characters to the VGA font, if possible.  */
-      switch (code)
-	{
-	case 0x2190:	/* left arrow */
-	  code = 0x1b;
-	  break;
-	case 0x2191:	/* up arrow */
-	  code = 0x18;
-	  break;
-	case 0x2192:	/* right arrow */
-	  code = 0x1a;
-	  break;
-	case 0x2193:	/* down arrow */
-	  code = 0x19;
-	  break;
-	case 0x2501:	/* horizontal line */
-	  code = 0xc4;
-	  break;
-	case 0x2503:	/* vertical line */
-	  code = 0xb3;
-	  break;
-	case 0x250F:	/* upper-left corner */
-	  code = 0xda;
-	  break;
-	case 0x2513:	/* upper-right corner */
-	  code = 0xbf;
-	  break;
-	case 0x2517:	/* lower-left corner */
-	  code = 0xc0;
-	  break;
-	case 0x251B:	/* lower-right corner */
-	  code = 0xd9;
-	  break;
-
-	default:
-	  return grub_font_get_glyph_any (code, bitmap, width);
-	}
-    }
-
-  /* TODO This is wrong for the new font module.  Should it be fixed?  */
-  if (bitmap)
-    grub_memcpy (bitmap,
-		 vga_font + code * virtual_screen.char_height,
-		 virtual_screen.char_height);
-  *width = 1;
-  return 1;
-}
-
-static void
-grub_virtual_screen_invalidate_char (struct grub_colored_char *p)
-{
-  p->code = 0xFFFF;
-
-  if (p->width)
-    {
-      struct grub_colored_char *q;
-
-      for (q = p + 1; q <= p + p->width; q++)
-	{
-	  q->code = 0xFFFF;
-	  q->width = 0;
-	  q->index = 0;
-	}
-    }
-
-  p->width = 0;
-}
-
-static void
-write_char (void)
-{
-  struct grub_colored_char *p;
-  unsigned char bitmap[32];
-  unsigned width;
-  unsigned y;
-  unsigned offset;
-
-  p = (virtual_screen.text_buffer
-       + virtual_screen.cursor_x
-       + (virtual_screen.cursor_y * virtual_screen.columns));
-
-  p -= p->index;
-
-  if (! grub_virtual_screen_get_glyph (p->code, bitmap, &width))
-    {
-      grub_virtual_screen_invalidate_char (p);
-      width = 0;
-    }
-
-  for (y = 0, offset = 0;
-       y < virtual_screen.char_height;
-       y++, offset++)
-    {
-      unsigned i;
-
-      for (i = 0;
-	   (i < width * virtual_screen.char_width) && (offset < 32);
-	   i++)
-	{
-	  unsigned char color;
-
-	  if (bitmap[offset] & (1 << (8-i)))
-	    {
-	      color = p->fg_color;
-	    }
-	  else
-	    {
-	      color = p->bg_color;
-	    }
-
-          grub_vbe_set_pixel_index(i + (virtual_screen.cursor_x
-                                        * virtual_screen.char_width),
-                                   y + (virtual_screen.cursor_y
-                                        * virtual_screen.char_height),
-                                   color);
-	}
-    }
-}
-
-static void
-write_cursor (void)
-{
-  grub_uint32_t x;
-  grub_uint32_t y;
-
-  for (y = ((virtual_screen.cursor_y + 1) * virtual_screen.char_height) - 3;
-       y < ((virtual_screen.cursor_y + 1) * virtual_screen.char_height) - 1;
-       y++)
-    {
-      for (x = virtual_screen.cursor_x * virtual_screen.char_width;
-	   x < (virtual_screen.cursor_x + 1) * virtual_screen.char_width;
-	   x++)
-	{
-	  grub_vbe_set_pixel_index(x, y, 10);
-	}
-    }
-}
-
-static void
-scroll_up (void)
-{
-  grub_uint32_t i;
-
-  /* Scroll text buffer with one line to up.  */
-  grub_memmove (virtual_screen.text_buffer,
-		virtual_screen.text_buffer + virtual_screen.columns,
-                sizeof (*virtual_screen.text_buffer)
-                * virtual_screen.columns
-                * (virtual_screen.rows - 1));
-
-  /* Clear last line in text buffer.  */
-  for (i = virtual_screen.columns * (virtual_screen.rows - 1);
-       i < virtual_screen.columns * virtual_screen.rows;
-       i++)
-    {
-      virtual_screen.text_buffer[i].code = ' ';
-      virtual_screen.text_buffer[i].fg_color = 0;
-      virtual_screen.text_buffer[i].bg_color = 0;
-      virtual_screen.text_buffer[i].width = 0;
-      virtual_screen.text_buffer[i].index = 0;
-    }
-
-  /* Scroll framebuffer with one line to up.  */
-  grub_memmove (framebuffer,
-                framebuffer
-                + bytes_per_scan_line * virtual_screen.char_height,
-                bytes_per_scan_line
-                * (mode_info.y_resolution - virtual_screen.char_height));
-
-  /* Clear last line in framebuffer.  */
-  grub_memset (framebuffer
-               + (bytes_per_scan_line
-                  * (mode_info.y_resolution - virtual_screen.char_height)),
-               0,
-               bytes_per_scan_line * virtual_screen.char_height);
-}
-
-static void
-grub_vesafb_putchar (grub_uint32_t c)
-{
-  if (c == '\a')
-    /* FIXME */
-    return;
-
-  if (c == '\b' || c == '\n' || c == '\r')
-    {
-      /* Erase current cursor, if any.  */
-      if (virtual_screen.cursor_state)
-	write_char ();
-
-      switch (c)
-	{
-	case '\b':
-	  if (virtual_screen.cursor_x > 0)
-	    virtual_screen.cursor_x--;
-	  break;
-
-	case '\n':
-	  if (virtual_screen.cursor_y >= virtual_screen.rows - 1)
-	    scroll_up ();
-	  else
-	    virtual_screen.cursor_y++;
-	  break;
-
-	case '\r':
-	  virtual_screen.cursor_x = 0;
-	  break;
-	}
-
-      if (virtual_screen.cursor_state)
-	write_cursor ();
-    }
-  else
-    {
-      unsigned width;
-      struct grub_colored_char *p;
-
-      grub_virtual_screen_get_glyph (c, 0, &width);
-
-      if (virtual_screen.cursor_x + width > virtual_screen.columns)
-	grub_putchar ('\n');
-
-      p = (virtual_screen.text_buffer +
-	   virtual_screen.cursor_x +
-	   virtual_screen.cursor_y * virtual_screen.columns);
-      p->code = c;
-      p->fg_color = virtual_screen.fg_color;
-      p->bg_color = virtual_screen.bg_color;
-      p->width = width - 1;
-      p->index = 0;
-
-      if (width > 1)
-	{
-	  unsigned i;
-
-	  for (i = 1; i < width; i++)
-	    {
-	      p[i].code = ' ';
-	      p[i].width = width - 1;
-	      p[i].index = i;
-	    }
-	}
-
-      write_char ();
-
-      virtual_screen.cursor_x += width;
-      if (virtual_screen.cursor_x >= virtual_screen.columns)
-	{
-	  virtual_screen.cursor_x = 0;
-
-	  if (virtual_screen.cursor_y >= virtual_screen.rows - 1)
-	    scroll_up ();
-	  else
-	    virtual_screen.cursor_y++;
-	}
-
-      if (virtual_screen.cursor_state)
-	write_cursor ();
-    }
-}
-
-static grub_ssize_t
-grub_vesafb_getcharwidth (grub_uint32_t c)
-{
-  unsigned width;
-
-  if (! grub_virtual_screen_get_glyph (c, 0, &width))
-    return 0;
-
-  return width;
-}
-
-static grub_uint16_t
-grub_virtual_screen_getwh (void)
-{
-  return (virtual_screen.columns << 8) | virtual_screen.rows;
-}
-
-static grub_uint16_t
-grub_virtual_screen_getxy (void)
-{
-  return ((virtual_screen.cursor_x << 8) | virtual_screen.cursor_y);
-}
-
-static void
-grub_vesafb_gotoxy (grub_uint8_t x, grub_uint8_t y)
-{
-  if (x >= virtual_screen.columns || y >= virtual_screen.rows)
-    {
-      grub_error (GRUB_ERR_OUT_OF_RANGE, "invalid point (%u,%u)",
-		  (unsigned) x, (unsigned) y);
-      return;
-    }
-
-  if (virtual_screen.cursor_state)
-    write_char ();
-
-  virtual_screen.cursor_x = x;
-  virtual_screen.cursor_y = y;
-
-  if (virtual_screen.cursor_state)
-    write_cursor ();
-}
-
-static void
-grub_virtual_screen_cls (void)
-{
-  grub_uint32_t i;
-
-  for (i = 0; i < virtual_screen.columns * virtual_screen.rows; i++)
-    {
-      virtual_screen.text_buffer[i].code = ' ';
-      virtual_screen.text_buffer[i].fg_color = 0;
-      virtual_screen.text_buffer[i].bg_color = 0;
-      virtual_screen.text_buffer[i].width = 0;
-      virtual_screen.text_buffer[i].index = 0;
-    }
-
-  virtual_screen.cursor_x = virtual_screen.cursor_y = 0;
-}
-
-static void
-grub_vesafb_cls (void)
-{
-  grub_virtual_screen_cls ();
-
-  grub_memset (framebuffer,
-               0,
-	       mode_info.y_resolution * bytes_per_scan_line);
-}
-
-static void
-grub_virtual_screen_setcolorstate (grub_term_color_state state)
-{
-  switch (state)
-    {
-    case GRUB_TERM_COLOR_STANDARD:
-    case GRUB_TERM_COLOR_NORMAL:
-      virtual_screen.fg_color = DEFAULT_FG_COLOR;
-      virtual_screen.bg_color = DEFAULT_BG_COLOR;
-      break;
-    case GRUB_TERM_COLOR_HIGHLIGHT:
-      virtual_screen.fg_color = DEFAULT_BG_COLOR;
-      virtual_screen.bg_color = DEFAULT_FG_COLOR;
-      break;
-    default:
-      break;
-    }
-}
-
-static void
-grub_vesafb_setcursor (int on)
-{
-  if (virtual_screen.cursor_state != on)
-    {
-      if (virtual_screen.cursor_state)
-	write_char ();
-      else
-	write_cursor ();
-
-      virtual_screen.cursor_state = on;
-    }
-}
-
-static struct grub_term_output grub_vesafb_term =
-  {
-    .name = "vesafb",
-    .init = grub_vesafb_mod_init,
-    .fini = grub_vesafb_mod_fini,
-    .putchar = grub_vesafb_putchar,
-    .getcharwidth = grub_vesafb_getcharwidth,
-    .getwh = grub_virtual_screen_getwh,
-    .getxy = grub_virtual_screen_getxy,
-    .gotoxy = grub_vesafb_gotoxy,
-    .cls = grub_vesafb_cls,
-    .setcolorstate = grub_virtual_screen_setcolorstate,
-    .setcursor = grub_vesafb_setcursor,
-    .flags = 0,
-  };
-
-GRUB_MOD_INIT(vesafb)
-{
-  grub_term_register_output ("vesafb", &grub_vesafb_term);
-}
-
-GRUB_MOD_FINI(vesafb)
-{
-  grub_term_unregister_output (&grub_vesafb_term);
-}

From 34fac099a5f48c81669d7363cdb43122046bf366 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 17 Mar 2010 08:37:48 +0100
Subject: [PATCH 0641/1628] Make grub_console_real_putchar grub_console_putchar

---
 include/grub/i386/pc/console.h |  1 +
 include/grub/i386/vga_common.h |  9 ---------
 kern/i386/pc/startup.S         |  7 ++++---
 term/i386/pc/vga_text.c        | 12 ++++++------
 term/i386/vga_common.c         |  6 ------
 5 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/include/grub/i386/pc/console.h b/include/grub/i386/pc/console.h
index 2a74d152c..b677bb886 100644
--- a/include/grub/i386/pc/console.h
+++ b/include/grub/i386/pc/console.h
@@ -46,6 +46,7 @@ grub_uint16_t grub_console_getxy (void);
 void grub_console_gotoxy (grub_uint8_t x, grub_uint8_t y);
 void grub_console_cls (void);
 void grub_console_setcursor (int on);
+void grub_console_putchar (const struct grub_unicode_glyph *c);
 
 /* Initialize the console system.  */
 void grub_console_init (void);
diff --git a/include/grub/i386/vga_common.h b/include/grub/i386/vga_common.h
index 19f14ebed..7df2b9e9e 100644
--- a/include/grub/i386/vga_common.h
+++ b/include/grub/i386/vga_common.h
@@ -25,18 +25,9 @@
 
 extern grub_uint8_t grub_console_cur_color;
 
-void
-grub_console_putchar (const struct grub_unicode_glyph *c);
-grub_ssize_t
-grub_console_getcharwidth (const struct grub_unicode_glyph *c);
 grub_uint16_t grub_console_getwh (void);
 void grub_console_setcolorstate (grub_term_color_state state);
 void grub_console_setcolor (grub_uint8_t normal_color, grub_uint8_t highlight_color);
 void grub_console_getcolor (grub_uint8_t *normal_color, grub_uint8_t *highlight_color);
 
-/* Implemented in both kern/i386/pc/startup.S and vga_text.c;  this symbol
-   is not exported, so there's no collision, but vga_common.c expects this
-   prototype to be the same.  */
-void grub_console_real_putchar (int c);
-
 #endif /* ! GRUB_VGA_COMMON_CPU_HEADER */
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index 23f3f398e..c12dfbb57 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -1064,7 +1064,7 @@ xsmap:
 
 
 /*
- * void grub_console_real_putchar (int c)
+ * void grub_console_putchar (const struct grub_unicode_glyph *c)
  *
  * Put the character C on the console. Because GRUB wants to write a
  * character with an attribute, this implementation is a bit tricky.
@@ -1077,8 +1077,9 @@ xsmap:
  * get the height of the screen, and the TELETYPE OUTPUT BIOS call doesn't
  * support setting a background attribute.
  */
-FUNCTION(grub_console_real_putchar)
-	movl	%eax, %edx
+FUNCTION(grub_console_putchar)
+	/* Retrieve the base character.  */
+	movl	0(%eax), %edx
 	pusha
 	movb	EXT_C(grub_console_cur_color), %bl
 
diff --git a/term/i386/pc/vga_text.c b/term/i386/pc/vga_text.c
index 379eb3579..3f352afb4 100644
--- a/term/i386/pc/vga_text.c
+++ b/term/i386/pc/vga_text.c
@@ -83,10 +83,10 @@ inc_x (void)
     grub_curr_x++;
 }
 
-void
-grub_console_real_putchar (int c)
+static void
+grub_vga_text_putchar (const struct grub_unicode_glyph *c)
 {
-  switch (c)
+  switch (c->base)
     {
       case '\b':
 	if (grub_curr_x != 0)
@@ -99,8 +99,8 @@ grub_console_real_putchar (int c)
 	grub_curr_x = 0;
 	break;
       default:
-	screen_write_char (grub_curr_x,
-			   grub_curr_y, c | (grub_console_cur_color << 8));
+	screen_write_char (grub_curr_x, grub_curr_y,
+			   c->base | (grub_console_cur_color << 8));
 	inc_x ();
     }
 
@@ -154,7 +154,7 @@ static struct grub_term_output grub_vga_text_term =
     .name = "vga_text",
     .init = grub_vga_text_init_fini,
     .fini = grub_vga_text_init_fini,
-    .putchar = grub_console_putchar,
+    .putchar = grub_vga_text_putchar,
     .getwh = grub_console_getwh,
     .getxy = grub_vga_text_getxy,
     .gotoxy = grub_vga_text_gotoxy,
diff --git a/term/i386/vga_common.c b/term/i386/vga_common.c
index f88dbb04e..894c5d911 100644
--- a/term/i386/vga_common.c
+++ b/term/i386/vga_common.c
@@ -25,12 +25,6 @@ static grub_uint8_t grub_console_standard_color = 0x7;
 static grub_uint8_t grub_console_normal_color = 0x7;
 static grub_uint8_t grub_console_highlight_color = 0x70;
 
-void
-grub_console_putchar (const struct grub_unicode_glyph *c)
-{
-  grub_console_real_putchar (c->base);
-}
-
 grub_uint16_t
 grub_console_getwh (void)
 {

From abe8f24a4757bc7c24ec2f84fab615181b144829 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 17 Mar 2010 08:49:48 +0100
Subject: [PATCH 0642/1628] Fix widthspec.h dependency

---
 conf/common.rmk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index 98daa0839..d790abade 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -634,15 +634,15 @@ keystatus_mod_CFLAGS = $(COMMON_CFLAGS)
 keystatus_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For normal.mod.
+ifneq (, $(FONT_SOURCE))
+normal/charset.c_DEPENDENCIES = widthspec.h
+endif
 normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
 	normal/auth.c normal/autofs.c normal/handler.c \
 	normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
 	normal/menu_entry.c normal/menu_text.c normal/charset.c \
 	normal/misc.c normal/crypto.c normal/term.c normal/context.c \
 	unidata.c
-ifneq (, $(FONT_SOURCE))
-normal/charset.c_SOURCES += widthspec.h
-endif
 
 normal_mod_CFLAGS = $(COMMON_CFLAGS)
 normal_mod_LDFLAGS = $(COMMON_LDFLAGS)

From 09f9aa3b2e5df81d73fd803ee2e88c653b3e74ec Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 17 Mar 2010 08:57:23 +0100
Subject: [PATCH 0643/1628] Move terminal-related function from
 normal/charset.c to normal/term.c

---
 include/grub/unicode.h |   3 +
 normal/charset.c       | 323 +----------------------------------------
 normal/term.c          | 319 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 324 insertions(+), 321 deletions(-)

diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index b68c7faf5..249297863 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -156,4 +156,7 @@ grub_unicode_glyph_from_code (grub_uint32_t code)
   return ret;
 }
 
+grub_uint32_t
+grub_unicode_mirror_code (grub_uint32_t in);
+
 #endif
diff --git a/normal/charset.c b/normal/charset.c
index 2473f1b52..7c455a357 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -1022,75 +1022,8 @@ grub_bidi_logical_to_visual (const grub_uint32_t *logical,
   return visual_ptr - *visual_out;
 }
 
-static grub_uint32_t
-map_code (grub_uint32_t in, struct grub_term_output *term)
-{
-  if (in <= 0x7f)
-    return in;
-
-  switch (term->flags & GRUB_TERM_CODE_TYPE_MASK)
-    {
-    case GRUB_TERM_CODE_TYPE_VGA:
-      switch (in)
-	{
-	case GRUB_TERM_DISP_LEFT:
-	  return 0x1b;
-	case GRUB_TERM_DISP_UP:
-	  return 0x18;
-	case GRUB_TERM_DISP_RIGHT:
-	  return 0x1a;
-	case GRUB_TERM_DISP_DOWN:
-	  return 0x19;
-	case GRUB_TERM_DISP_HLINE:
-	  return 0xc4;
-	case GRUB_TERM_DISP_VLINE:
-	  return 0xb3;
-	case GRUB_TERM_DISP_UL:
-	  return 0xda;
-	case GRUB_TERM_DISP_UR:
-	  return 0xbf;
-	case GRUB_TERM_DISP_LL:
-	  return  0xc0;
-	case GRUB_TERM_DISP_LR:
-	  return 0xd9;
-	}
-      return '?';
-    case GRUB_TERM_CODE_TYPE_ASCII:
-      /* Better than nothing.  */
-      switch (in)
-	{
-	case GRUB_TERM_DISP_LEFT:
-	  return '<';
-		
-	case GRUB_TERM_DISP_UP:
-	  return '^';
-	  
-	case GRUB_TERM_DISP_RIGHT:
-	  return '>';
-		
-	case GRUB_TERM_DISP_DOWN:
-	  return 'v';
-		  
-	case GRUB_TERM_DISP_HLINE:
-	  return '-';
-		  
-	case GRUB_TERM_DISP_VLINE:
-	  return '|';
-		  
-	case GRUB_TERM_DISP_UL:
-	case GRUB_TERM_DISP_UR:
-	case GRUB_TERM_DISP_LL:
-	case GRUB_TERM_DISP_LR:
-	  return '+';
-		
-	}
-      return '?';
-    }
-  return in;
-}
-
-static grub_uint32_t
-mirror_code (grub_uint32_t in)
+grub_uint32_t
+grub_unicode_mirror_code (grub_uint32_t in)
 {
   int i;
   for (i = 0; grub_unicode_bidi_pairs[i].key; i++)
@@ -1098,255 +1031,3 @@ mirror_code (grub_uint32_t in)
       return grub_unicode_bidi_pairs[i].replace;
   return in;
 }
-
-static void
-putglyph (const struct grub_unicode_glyph *c, struct grub_term_output *term)
-{
-  struct grub_unicode_glyph c2 =
-    {
-      .variant = 0,
-      .attributes = 0,
-      .ncomb = 0,
-      .combining = 0,
-      .estimated_width = 1
-    };
-
-  if (c->base == '\t' && term->getxy)
-    {
-      int n;
-
-      n = 8 - ((term->getxy () >> 8) & 7);
-      c2.base = ' ';
-      while (n--)
-	(term->putchar) (&c2);
-
-      return;
-    }
-
-  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
-      == GRUB_TERM_CODE_TYPE_UTF8_LOGICAL 
-      || (term->flags & GRUB_TERM_CODE_TYPE_MASK)
-      == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
-    {
-      int i;
-      c2.estimated_width = grub_term_getcharwidth (term, c);
-      for (i = -1; i < (int) c->ncomb; i++)
-	{
-	  grub_uint8_t u8[20], *ptr;
-	  grub_uint32_t code;
-	      
-	  if (i == -1)
-	    {
-	      code = c->base;
-	      if ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
-		  == GRUB_TERM_CODE_TYPE_UTF8_VISUAL
-		  && (c->attributes & GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR))
-		code = mirror_code (code);
-	    }
-	  else
-	    code = c->combining[i].code;
-
-	  grub_ucs4_to_utf8 (&code, 1, u8, sizeof (u8));
-
-	  for (ptr = u8; *ptr; ptr++)
-	    {
-	      c2.base = *ptr;
-	      (term->putchar) (&c2);
-	      c2.estimated_width = 0;
-	    }
-	}
-      c2.estimated_width = 1;
-    }
-  else
-    (term->putchar) (c);
-
-  if (c->base == '\n')
-    {
-      c2.base = '\r';
-      (term->putchar) (&c2);
-    }
-}
-
-static void
-putcode_real (grub_uint32_t code, struct grub_term_output *term)
-{
-  struct grub_unicode_glyph c =
-    {
-      .variant = 0,
-      .attributes = 0,
-      .ncomb = 0,
-      .combining = 0,
-      .estimated_width = 1
-    };
-
-  c.base = map_code (code, term);
-  putglyph (&c, term);
-}
-
-/* Put a Unicode character.  */
-void
-grub_putcode (grub_uint32_t code, struct grub_term_output *term)
-{
-  /* Combining character by itself?  */
-  if (grub_unicode_get_comb_type (code) != GRUB_UNICODE_COMB_NONE)
-    return;
-
-  putcode_real (code, term);
-}
-
-void
-grub_print_ucs4 (const grub_uint32_t * str,
-		 const grub_uint32_t * last_position,
-		 int margin_left, int margin_right,
-		 struct grub_term_output *term)
-{
-  grub_ssize_t max_width;
-  grub_ssize_t startwidth;
-
-  {
-    struct grub_unicode_glyph space_glyph = {
-      .base = ' ',
-      .variant = 0,
-      .attributes = 0,
-      .ncomb = 0,
-      .combining = 0
-      };
-    max_width = grub_term_width (term)
-      - grub_term_getcharwidth (term, &space_glyph) 
-      * (margin_left + margin_right) - 1;
-  }
-
-  if (((term->getxy () >> 8) & 0xff) < margin_left)
-    grub_print_spaces (term, margin_left - ((term->getxy () >> 8) & 0xff));
-
-  startwidth = ((term->getxy () >> 8) & 0xff) - margin_left;
-
-  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
-      == GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS
-      || (term->flags & GRUB_TERM_CODE_TYPE_MASK) 
-      == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
-    {
-      grub_ssize_t visual_len;
-      struct grub_unicode_glyph *visual;
-      struct grub_unicode_glyph *visual_ptr;
-
-      auto grub_ssize_t getcharwidth (const struct grub_unicode_glyph *c);
-      grub_ssize_t getcharwidth (const struct grub_unicode_glyph *c)
-      {
-	return grub_term_getcharwidth (term, c);
-      }
-
-      visual_len = grub_bidi_logical_to_visual (str, last_position - str,
-						&visual, getcharwidth,
-						max_width, startwidth);
-      if (visual_len < 0)
-	{
-	  grub_print_error ();
-	  return;
-	}
-      for (visual_ptr = visual; visual_ptr < visual + visual_len; visual_ptr++)
-	{
-	  if (visual_ptr->base == '\n')
-	    grub_print_spaces (term, margin_right);
-	  putglyph (visual_ptr, term);
-	  if (visual_ptr->base == '\n')
-	    grub_print_spaces (term, margin_left);
-	  grub_free (visual_ptr->combining);
-	}
-      grub_free (visual);
-      return;
-    }
-
-  {
-    const grub_uint32_t *ptr;
-    grub_ssize_t line_width = startwidth;
-    grub_ssize_t lastspacewidth = 0;
-    const grub_uint32_t *line_start = str, *last_space = str - 1;
-
-    for (ptr = str; ptr < last_position; ptr++)
-      {
-	grub_ssize_t last_width = 0;
-	if (grub_unicode_get_comb_type (*ptr) == GRUB_UNICODE_COMB_NONE)
-	  {
-	    struct grub_unicode_glyph c = {
-	      .variant = 0,
-	      .attributes = 0,
-	      .ncomb = 0,
-	      .combining = 0
-	    };
-	    c.base = *ptr;
-	    line_width += last_width = grub_term_getcharwidth (term, &c);
-	  }
-
-	if (*ptr == ' ')
-	  {
-	    lastspacewidth = line_width;
-	    last_space = ptr;
-	  }
-
-	if (line_width > max_width || *ptr == '\n')
-	  {
-	    const grub_uint32_t *ptr2;
-
-	    if (line_width > max_width && last_space > line_start)
-	      ptr = last_space;
-	    else if (line_width > max_width 
-		     && line_start == str && startwidth != 0)
-	      {
-		ptr = str;
-		lastspacewidth = startwidth;
-	      }
-	    else
-	      lastspacewidth = line_width - last_width;
-
-	    for (ptr2 = line_start; ptr2 < ptr; ptr2++)
-	      {
-		/* Skip combining characters on non-UTF8 terminals.  */
-		if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
-		    != GRUB_TERM_CODE_TYPE_UTF8_LOGICAL
-		    && grub_unicode_get_comb_type (*ptr2)
-		    != GRUB_UNICODE_COMB_NONE)
-		  continue;
-		putcode_real (*ptr2, term);
-	      }
-
-	    grub_print_spaces (term, margin_right);
-	    grub_putcode ('\n', term);
-	    line_width -= lastspacewidth;
-	    grub_print_spaces (term, margin_left);
-	    if (ptr == last_space || *ptr == '\n')
-	      ptr++;
-	    line_start = ptr;
-	  }
-      }
-
-    {
-      const grub_uint32_t *ptr2;
-      for (ptr2 = line_start; ptr2 < last_position; ptr2++)
-	{
-	  /* Skip combining characters on non-UTF8 terminals.  */
-	  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
-	      != GRUB_TERM_CODE_TYPE_UTF8_LOGICAL
-	      && grub_unicode_get_comb_type (*ptr2)
-	      != GRUB_UNICODE_COMB_NONE)
-	    continue;
-	  putcode_real (*ptr2, term);
-	}
-    }
-  }
-}
-
-void
-grub_xputs_normal (const char *str)
-{
-  grub_term_output_t term;
-
-  FOR_ACTIVE_TERM_OUTPUTS(term)
-  {
-    grub_uint32_t *unicode_str, *unicode_last_position;
-    grub_utf8_to_ucs4_alloc (str, &unicode_str,
-			     &unicode_last_position);
-    grub_print_ucs4 (unicode_str, unicode_last_position, 0, 0, term);
-    grub_free (unicode_str);
-  }
-}
diff --git a/normal/term.c b/normal/term.c
index 8a974d035..a2a313779 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -95,6 +95,73 @@ grub_install_newline_hook (void)
   grub_newline_hook = process_newline;
 }
 
+static grub_uint32_t
+map_code (grub_uint32_t in, struct grub_term_output *term)
+{
+  if (in <= 0x7f)
+    return in;
+
+  switch (term->flags & GRUB_TERM_CODE_TYPE_MASK)
+    {
+    case GRUB_TERM_CODE_TYPE_VGA:
+      switch (in)
+	{
+	case GRUB_TERM_DISP_LEFT:
+	  return 0x1b;
+	case GRUB_TERM_DISP_UP:
+	  return 0x18;
+	case GRUB_TERM_DISP_RIGHT:
+	  return 0x1a;
+	case GRUB_TERM_DISP_DOWN:
+	  return 0x19;
+	case GRUB_TERM_DISP_HLINE:
+	  return 0xc4;
+	case GRUB_TERM_DISP_VLINE:
+	  return 0xb3;
+	case GRUB_TERM_DISP_UL:
+	  return 0xda;
+	case GRUB_TERM_DISP_UR:
+	  return 0xbf;
+	case GRUB_TERM_DISP_LL:
+	  return  0xc0;
+	case GRUB_TERM_DISP_LR:
+	  return 0xd9;
+	}
+      return '?';
+    case GRUB_TERM_CODE_TYPE_ASCII:
+      /* Better than nothing.  */
+      switch (in)
+	{
+	case GRUB_TERM_DISP_LEFT:
+	  return '<';
+		
+	case GRUB_TERM_DISP_UP:
+	  return '^';
+	  
+	case GRUB_TERM_DISP_RIGHT:
+	  return '>';
+		
+	case GRUB_TERM_DISP_DOWN:
+	  return 'v';
+		  
+	case GRUB_TERM_DISP_HLINE:
+	  return '-';
+		  
+	case GRUB_TERM_DISP_VLINE:
+	  return '|';
+		  
+	case GRUB_TERM_DISP_UL:
+	case GRUB_TERM_DISP_UR:
+	case GRUB_TERM_DISP_LL:
+	case GRUB_TERM_DISP_LR:
+	  return '+';
+		
+	}
+      return '?';
+    }
+  return in;
+}
+
 void
 grub_puts_terminal (const char *str, struct grub_term_output *term)
 {
@@ -265,3 +332,255 @@ read_terminal_list (void)
 
   grub_errno = GRUB_ERR_NONE;
 }
+
+static void
+putglyph (const struct grub_unicode_glyph *c, struct grub_term_output *term)
+{
+  struct grub_unicode_glyph c2 =
+    {
+      .variant = 0,
+      .attributes = 0,
+      .ncomb = 0,
+      .combining = 0,
+      .estimated_width = 1
+    };
+
+  if (c->base == '\t' && term->getxy)
+    {
+      int n;
+
+      n = 8 - ((term->getxy () >> 8) & 7);
+      c2.base = ' ';
+      while (n--)
+	(term->putchar) (&c2);
+
+      return;
+    }
+
+  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
+      == GRUB_TERM_CODE_TYPE_UTF8_LOGICAL 
+      || (term->flags & GRUB_TERM_CODE_TYPE_MASK)
+      == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
+    {
+      int i;
+      c2.estimated_width = grub_term_getcharwidth (term, c);
+      for (i = -1; i < (int) c->ncomb; i++)
+	{
+	  grub_uint8_t u8[20], *ptr;
+	  grub_uint32_t code;
+	      
+	  if (i == -1)
+	    {
+	      code = c->base;
+	      if ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
+		  == GRUB_TERM_CODE_TYPE_UTF8_VISUAL
+		  && (c->attributes & GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR))
+		code = grub_unicode_mirror_code (code);
+	    }
+	  else
+	    code = c->combining[i].code;
+
+	  grub_ucs4_to_utf8 (&code, 1, u8, sizeof (u8));
+
+	  for (ptr = u8; *ptr; ptr++)
+	    {
+	      c2.base = *ptr;
+	      (term->putchar) (&c2);
+	      c2.estimated_width = 0;
+	    }
+	}
+      c2.estimated_width = 1;
+    }
+  else
+    (term->putchar) (c);
+
+  if (c->base == '\n')
+    {
+      c2.base = '\r';
+      (term->putchar) (&c2);
+    }
+}
+
+static void
+putcode_real (grub_uint32_t code, struct grub_term_output *term)
+{
+  struct grub_unicode_glyph c =
+    {
+      .variant = 0,
+      .attributes = 0,
+      .ncomb = 0,
+      .combining = 0,
+      .estimated_width = 1
+    };
+
+  c.base = map_code (code, term);
+  putglyph (&c, term);
+}
+
+/* Put a Unicode character.  */
+void
+grub_putcode (grub_uint32_t code, struct grub_term_output *term)
+{
+  /* Combining character by itself?  */
+  if (grub_unicode_get_comb_type (code) != GRUB_UNICODE_COMB_NONE)
+    return;
+
+  putcode_real (code, term);
+}
+
+void
+grub_print_ucs4 (const grub_uint32_t * str,
+		 const grub_uint32_t * last_position,
+		 int margin_left, int margin_right,
+		 struct grub_term_output *term)
+{
+  grub_ssize_t max_width;
+  grub_ssize_t startwidth;
+
+  {
+    struct grub_unicode_glyph space_glyph = {
+      .base = ' ',
+      .variant = 0,
+      .attributes = 0,
+      .ncomb = 0,
+      .combining = 0
+      };
+    max_width = grub_term_width (term)
+      - grub_term_getcharwidth (term, &space_glyph) 
+      * (margin_left + margin_right) - 1;
+  }
+
+  if (((term->getxy () >> 8) & 0xff) < margin_left)
+    grub_print_spaces (term, margin_left - ((term->getxy () >> 8) & 0xff));
+
+  startwidth = ((term->getxy () >> 8) & 0xff) - margin_left;
+
+  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
+      == GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS
+      || (term->flags & GRUB_TERM_CODE_TYPE_MASK) 
+      == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
+    {
+      grub_ssize_t visual_len;
+      struct grub_unicode_glyph *visual;
+      struct grub_unicode_glyph *visual_ptr;
+
+      auto grub_ssize_t getcharwidth (const struct grub_unicode_glyph *c);
+      grub_ssize_t getcharwidth (const struct grub_unicode_glyph *c)
+      {
+	return grub_term_getcharwidth (term, c);
+      }
+
+      visual_len = grub_bidi_logical_to_visual (str, last_position - str,
+						&visual, getcharwidth,
+						max_width, startwidth);
+      if (visual_len < 0)
+	{
+	  grub_print_error ();
+	  return;
+	}
+      for (visual_ptr = visual; visual_ptr < visual + visual_len; visual_ptr++)
+	{
+	  if (visual_ptr->base == '\n')
+	    grub_print_spaces (term, margin_right);
+	  putglyph (visual_ptr, term);
+	  if (visual_ptr->base == '\n')
+	    grub_print_spaces (term, margin_left);
+	  grub_free (visual_ptr->combining);
+	}
+      grub_free (visual);
+      return;
+    }
+
+  {
+    const grub_uint32_t *ptr;
+    grub_ssize_t line_width = startwidth;
+    grub_ssize_t lastspacewidth = 0;
+    const grub_uint32_t *line_start = str, *last_space = str - 1;
+
+    for (ptr = str; ptr < last_position; ptr++)
+      {
+	grub_ssize_t last_width = 0;
+	if (grub_unicode_get_comb_type (*ptr) == GRUB_UNICODE_COMB_NONE)
+	  {
+	    struct grub_unicode_glyph c = {
+	      .variant = 0,
+	      .attributes = 0,
+	      .ncomb = 0,
+	      .combining = 0
+	    };
+	    c.base = *ptr;
+	    line_width += last_width = grub_term_getcharwidth (term, &c);
+	  }
+
+	if (*ptr == ' ')
+	  {
+	    lastspacewidth = line_width;
+	    last_space = ptr;
+	  }
+
+	if (line_width > max_width || *ptr == '\n')
+	  {
+	    const grub_uint32_t *ptr2;
+
+	    if (line_width > max_width && last_space > line_start)
+	      ptr = last_space;
+	    else if (line_width > max_width 
+		     && line_start == str && startwidth != 0)
+	      {
+		ptr = str;
+		lastspacewidth = startwidth;
+	      }
+	    else
+	      lastspacewidth = line_width - last_width;
+
+	    for (ptr2 = line_start; ptr2 < ptr; ptr2++)
+	      {
+		/* Skip combining characters on non-UTF8 terminals.  */
+		if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
+		    != GRUB_TERM_CODE_TYPE_UTF8_LOGICAL
+		    && grub_unicode_get_comb_type (*ptr2)
+		    != GRUB_UNICODE_COMB_NONE)
+		  continue;
+		putcode_real (*ptr2, term);
+	      }
+
+	    grub_print_spaces (term, margin_right);
+	    grub_putcode ('\n', term);
+	    line_width -= lastspacewidth;
+	    grub_print_spaces (term, margin_left);
+	    if (ptr == last_space || *ptr == '\n')
+	      ptr++;
+	    line_start = ptr;
+	  }
+      }
+
+    {
+      const grub_uint32_t *ptr2;
+      for (ptr2 = line_start; ptr2 < last_position; ptr2++)
+	{
+	  /* Skip combining characters on non-UTF8 terminals.  */
+	  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
+	      != GRUB_TERM_CODE_TYPE_UTF8_LOGICAL
+	      && grub_unicode_get_comb_type (*ptr2)
+	      != GRUB_UNICODE_COMB_NONE)
+	    continue;
+	  putcode_real (*ptr2, term);
+	}
+    }
+  }
+}
+
+void
+grub_xputs_normal (const char *str)
+{
+  grub_term_output_t term;
+
+  FOR_ACTIVE_TERM_OUTPUTS(term)
+  {
+    grub_uint32_t *unicode_str, *unicode_last_position;
+    grub_utf8_to_ucs4_alloc (str, &unicode_str,
+			     &unicode_last_position);
+    grub_print_ucs4 (unicode_str, unicode_last_position, 0, 0, term);
+    grub_free (unicode_str);
+  }
+}

From f84afb2775f07c5265cfae8cb57bbd9a564da4fd Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 18 Mar 2010 00:19:30 +0100
Subject: [PATCH 0644/1628] 	* kern/parser.c: Indented.

---
 ChangeLog     |   4 ++
 kern/parser.c | 140 +++++++++++++++++++++++++-------------------------
 2 files changed, 74 insertions(+), 70 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 475d92eca..c5cab1533 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/parser.c: Indented.
+
 2010-03-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* term/i386/pc/vesafb.c: Removed (orphaned, deprecated and broken).
diff --git a/kern/parser.c b/kern/parser.c
index dd4608ba9..80312b9b4 100644
--- a/kern/parser.c
+++ b/kern/parser.c
@@ -26,32 +26,31 @@
 /* All the possible state transitions on the command line.  If a
    transition can not be found, it is assumed that there is no
    transition and keep_value is assumed to be 1.  */
-static struct grub_parser_state_transition state_transitions[] =
-{
-  { GRUB_PARSER_STATE_TEXT, GRUB_PARSER_STATE_QUOTE, '\'', 0},
-  { GRUB_PARSER_STATE_TEXT, GRUB_PARSER_STATE_DQUOTE, '\"', 0},
-  { GRUB_PARSER_STATE_TEXT, GRUB_PARSER_STATE_VAR, '$', 0},
-  { GRUB_PARSER_STATE_TEXT, GRUB_PARSER_STATE_ESC, '\\', 0},
+static struct grub_parser_state_transition state_transitions[] = {
+  {GRUB_PARSER_STATE_TEXT, GRUB_PARSER_STATE_QUOTE, '\'', 0},
+  {GRUB_PARSER_STATE_TEXT, GRUB_PARSER_STATE_DQUOTE, '\"', 0},
+  {GRUB_PARSER_STATE_TEXT, GRUB_PARSER_STATE_VAR, '$', 0},
+  {GRUB_PARSER_STATE_TEXT, GRUB_PARSER_STATE_ESC, '\\', 0},
 
-  { GRUB_PARSER_STATE_ESC, GRUB_PARSER_STATE_TEXT, 0, 1},
+  {GRUB_PARSER_STATE_ESC, GRUB_PARSER_STATE_TEXT, 0, 1},
 
-  { GRUB_PARSER_STATE_QUOTE, GRUB_PARSER_STATE_TEXT, '\'', 0},
+  {GRUB_PARSER_STATE_QUOTE, GRUB_PARSER_STATE_TEXT, '\'', 0},
 
-  { GRUB_PARSER_STATE_DQUOTE, GRUB_PARSER_STATE_TEXT, '\"', 0},
-  { GRUB_PARSER_STATE_DQUOTE, GRUB_PARSER_STATE_QVAR, '$', 0},
+  {GRUB_PARSER_STATE_DQUOTE, GRUB_PARSER_STATE_TEXT, '\"', 0},
+  {GRUB_PARSER_STATE_DQUOTE, GRUB_PARSER_STATE_QVAR, '$', 0},
 
-  { GRUB_PARSER_STATE_VAR, GRUB_PARSER_STATE_VARNAME2, '{', 0},
-  { GRUB_PARSER_STATE_VAR, GRUB_PARSER_STATE_VARNAME, 0, 1},
-  { GRUB_PARSER_STATE_VARNAME, GRUB_PARSER_STATE_TEXT, ' ', 1},
-  { GRUB_PARSER_STATE_VARNAME2, GRUB_PARSER_STATE_TEXT, '}', 0},
+  {GRUB_PARSER_STATE_VAR, GRUB_PARSER_STATE_VARNAME2, '{', 0},
+  {GRUB_PARSER_STATE_VAR, GRUB_PARSER_STATE_VARNAME, 0, 1},
+  {GRUB_PARSER_STATE_VARNAME, GRUB_PARSER_STATE_TEXT, ' ', 1},
+  {GRUB_PARSER_STATE_VARNAME2, GRUB_PARSER_STATE_TEXT, '}', 0},
 
-  { GRUB_PARSER_STATE_QVAR, GRUB_PARSER_STATE_QVARNAME2, '{', 0},
-  { GRUB_PARSER_STATE_QVAR, GRUB_PARSER_STATE_QVARNAME, 0, 1},
-  { GRUB_PARSER_STATE_QVARNAME, GRUB_PARSER_STATE_TEXT, '\"', 0},
-  { GRUB_PARSER_STATE_QVARNAME, GRUB_PARSER_STATE_DQUOTE, ' ', 1},
-  { GRUB_PARSER_STATE_QVARNAME2, GRUB_PARSER_STATE_DQUOTE, '}', 0},
+  {GRUB_PARSER_STATE_QVAR, GRUB_PARSER_STATE_QVARNAME2, '{', 0},
+  {GRUB_PARSER_STATE_QVAR, GRUB_PARSER_STATE_QVARNAME, 0, 1},
+  {GRUB_PARSER_STATE_QVARNAME, GRUB_PARSER_STATE_TEXT, '\"', 0},
+  {GRUB_PARSER_STATE_QVARNAME, GRUB_PARSER_STATE_DQUOTE, ' ', 1},
+  {GRUB_PARSER_STATE_QVARNAME2, GRUB_PARSER_STATE_DQUOTE, '}', 0},
 
-  { 0, 0, 0, 0}
+  {0, 0, 0, 0}
 };
 
 
@@ -74,17 +73,17 @@ grub_parser_cmdline_state (grub_parser_state_t state, char c, char *result)
       if (transition->input == c)
 	break;
 
-      if (transition->input == ' ' && ! grub_isalpha (c)
-	  && ! grub_isdigit (c) && c != '_')
+      if (transition->input == ' ' && !grub_isalpha (c)
+	  && !grub_isdigit (c) && c != '_')
 	break;
 
       /* A less perfect match was found, use this one if no exact
-	 match can be found.  */
+         match can be found.  */
       if (transition->input == 0)
 	break;
     }
 
-  if (! transition->from_state)
+  if (!transition->from_state)
     transition = &default_transition;
 
   if (transition->keep_value)
@@ -113,43 +112,44 @@ grub_parser_split_cmdline (const char *cmdline, grub_reader_getline_t getline,
   auto int check_varstate (grub_parser_state_t s);
 
   int check_varstate (grub_parser_state_t s)
-    {
-      return (s == GRUB_PARSER_STATE_VARNAME
-	      || s == GRUB_PARSER_STATE_VARNAME2
-	      || s == GRUB_PARSER_STATE_QVARNAME
-	      || s == GRUB_PARSER_STATE_QVARNAME2);
-    }
+  {
+    return (s == GRUB_PARSER_STATE_VARNAME
+	    || s == GRUB_PARSER_STATE_VARNAME2
+	    || s == GRUB_PARSER_STATE_QVARNAME
+	    || s == GRUB_PARSER_STATE_QVARNAME2);
+  }
 
   auto void add_var (grub_parser_state_t newstate);
 
   void add_var (grub_parser_state_t newstate)
-    {
-      char *val;
+  {
+    char *val;
 
-      /* Check if a variable was being read in and the end of the name
-	 was reached.  */
-      if (! (check_varstate (state) && !check_varstate (newstate)))
-	return;
+    /* Check if a variable was being read in and the end of the name
+       was reached.  */
+    if (!(check_varstate (state) && !check_varstate (newstate)))
+      return;
 
-      *(vp++) = '\0';
-      val = grub_env_get (varname);
-      vp = varname;
-      if (! val)
-	return;
+    *(vp++) = '\0';
+    val = grub_env_get (varname);
+    vp = varname;
+    if (!val)
+      return;
 
-      /* Insert the contents of the variable in the buffer.  */
-      for (; *val; val++)
-	*(bp++) = *val;
-    }
+    /* Insert the contents of the variable in the buffer.  */
+    for (; *val; val++)
+      *(bp++) = *val;
+  }
 
   *argc = 0;
   do
     {
-      if (! rd || !*rd)
+      if (!rd || !*rd)
 	{
 	  if (getline)
 	    getline (&rd, 1);
-	  else break;
+	  else
+	    break;
 	}
 
       if (!rd)
@@ -190,7 +190,8 @@ grub_parser_split_cmdline (const char *cmdline, grub_reader_getline_t getline,
 	    }
 	  state = newstate;
 	}
-    } while (state != GRUB_PARSER_STATE_TEXT && !check_varstate (state));
+    }
+  while (state != GRUB_PARSER_STATE_TEXT && !check_varstate (state));
 
   /* A special case for when the last character was part of a
      variable.  */
@@ -204,12 +205,12 @@ grub_parser_split_cmdline (const char *cmdline, grub_reader_getline_t getline,
 
   /* Reserve memory for the return values.  */
   args = grub_malloc (bp - buffer);
-  if (! args)
+  if (!args)
     return grub_errno;
   grub_memcpy (args, buffer, bp - buffer);
 
   *argv = grub_malloc (sizeof (char *) * (*argc + 1));
-  if (! *argv)
+  if (!*argv)
     {
       grub_free (args);
       return grub_errno;
@@ -229,35 +230,34 @@ grub_parser_split_cmdline (const char *cmdline, grub_reader_getline_t getline,
   return 0;
 }
 
-struct grub_handler_class grub_parser_class =
-  {
-    .name = "parser"
-  };
+struct grub_handler_class grub_parser_class = {
+  .name = "parser"
+};
 
 grub_err_t
 grub_parser_execute (char *source)
 {
   auto grub_err_t getline (char **line, int cont);
   grub_err_t getline (char **line, int cont __attribute__ ((unused)))
-    {
-      char *p;
+  {
+    char *p;
 
-      if (! source)
-	{
-	  *line = 0;
-	  return 0;
-	}
+    if (!source)
+      {
+	*line = 0;
+	return 0;
+      }
 
-      p = grub_strchr (source, '\n');
-      if (p)
-	*p = 0;
+    p = grub_strchr (source, '\n');
+    if (p)
+      *p = 0;
 
-      *line = grub_strdup (source);
-      if (p)
-	*p = '\n';
-      source = p ? p + 1 : 0;
-      return 0;
-    }
+    *line = grub_strdup (source);
+    if (p)
+      *p = '\n';
+    source = p ? p + 1 : 0;
+    return 0;
+  }
 
   while (source)
     {

From c9f58427522fb1e8172561aea9154c32b91a43df Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 19 Mar 2010 11:28:05 +0000
Subject: [PATCH 0645/1628] * .bzrignore: Add gentrigtables, grub-script-check,
 grub_script_check_init.c, grub_script_check_init.h, and trigtables.c.

---
 .bzrignore | 5 +++++
 ChangeLog  | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/.bzrignore b/.bzrignore
index 8cdc9d12d..5a1443d09 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -25,6 +25,7 @@ docs/version.texi
 *.exec
 genkernsyms.sh
 gensymlist.sh
+gentrigtables
 grub-dumpbios
 grub-editenv
 grub-emu
@@ -40,6 +41,9 @@ grub-pe2elf
 grub-probe
 grub_probe_init.c
 grub_probe_init.h
+grub-script-check
+grub_script_check_init.c
+grub_script_check_init.h
 grub_script.tab.c
 grub_script.tab.h
 grub-setup
@@ -62,4 +66,5 @@ stamp-h
 stamp-h1
 stamp-h.in
 symlist.c
+trigtables.c
 update-grub_lib
diff --git a/ChangeLog b/ChangeLog
index c5cab1533..6875f1afe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-19  Colin Watson  <cjwatson@ubuntu.com>
+
+	* .bzrignore: Add gentrigtables, grub-script-check,
+	grub_script_check_init.c, grub_script_check_init.h, and
+	trigtables.c.
+
 2010-03-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/parser.c: Indented.

From 0f3a3e3ece624cc267900771798069cc8e9339a5 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sun, 21 Mar 2010 10:27:21 +0530
Subject: [PATCH 0646/1628] added elif patch from Deepak Vankadaru

---
 conf/tests.rmk          |  4 ++++
 script/parser.y         | 34 ++++++++++++++++++++++------------
 tests/grub_script_if.in | 31 +++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 12 deletions(-)
 create mode 100644 tests/grub_script_if.in

diff --git a/conf/tests.rmk b/conf/tests.rmk
index 92f14797d..427720e82 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -53,6 +53,9 @@ grub_script_vars1_SOURCES = tests/grub_script_vars1.in
 check_SCRIPTS += grub_script_for1
 grub_script_for1_SOURCES = tests/grub_script_for1.in
 
+check_SCRIPTS += grub_script_if
+grub_script_if_SOURCES = tests/grub_script_if.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -63,6 +66,7 @@ SCRIPTED_TESTS  = grub_script_echo1
 SCRIPTED_TESTS += grub_script_echo_keywords
 SCRIPTED_TESTS += grub_script_vars1
 SCRIPTED_TESTS += grub_script_for1
+SCRIPTED_TESTS += grub_script_if
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/script/parser.y b/script/parser.y
index caba0f433..4ed58b4f2 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -74,7 +74,7 @@
 %token <arg> GRUB_PARSER_TOKEN_WORD      "word"
 
 %type <arglist> word argument arguments0 arguments1
-%type <cmd> script_init script grubcmd ifcmd forcmd command
+%type <cmd> script_init script grubcmd ifclause ifcmd forcmd command
 %type <cmd> commands1 menuentry statement
 
 %pure-parser
@@ -224,18 +224,28 @@ menuentry: "menuentry"
            }
 ;
 
-if: "if" { grub_script_lexer_ref (state->lexerstate); }
+ifcmd: "if"
+	{
+	  grub_script_lexer_ref (state->lexerstate);
+	}
+	ifclause "fi"
+	{
+	  $$ = $3;
+	  grub_script_lexer_deref (state->lexerstate);
+	}
 ;
-ifcmd: if commands1 delimiters1 "then" commands1 delimiters1 "fi"
-       {
-         $$ = grub_script_create_cmdif (state, $2, $5, 0);
-         grub_script_lexer_deref (state->lexerstate);
-       }
-     | if commands1 delimiters1 "then" commands1 delimiters1 "else" commands1 delimiters1 "fi"
-       {
-         $$ = grub_script_create_cmdif (state, $2, $5, $8);
-         grub_script_lexer_deref (state->lexerstate);
-       }
+ifclause: commands1 delimiters1 "then" commands1 delimiters1
+	  {
+	    $$ = grub_script_create_cmdif (state, $1, $4, 0);
+	  }
+	| commands1 delimiters1 "then" commands1 delimiters1 "else" commands1 delimiters1
+	  {
+	    $$ = grub_script_create_cmdif (state, $1, $4, $7);
+	  }
+	| commands1 delimiters1 "then" commands1 delimiters1 "elif" ifclause
+	  {
+	    $$ = grub_script_create_cmdif (state, $1, $4, $7);
+	  }
 ;
 
 forcmd: "for" "name"
diff --git a/tests/grub_script_if.in b/tests/grub_script_if.in
new file mode 100644
index 000000000..fb17eaf70
--- /dev/null
+++ b/tests/grub_script_if.in
@@ -0,0 +1,31 @@
+#! @builddir@/grub-shell-tester
+
+#basic if, execute
+if true; then echo yes; fi
+
+#basic if, no execution
+if false; then echo no; fi
+
+#if else, execute if path
+if true; then echo yes; else echo no; fi
+
+#if else, execute else path
+if false; then echo no; else echo yes; fi
+
+#if elif, execute elif
+if false; then echo no; elif true; then echo yes; fi
+
+#if elif else, execute else
+if false; then echo no; elif false; then echo no; else echo yes; fi
+
+#if elif(1) elif(2), execute elif(2)
+if false; then echo no; elif false; then echo no; elif true; then echo yes; fi
+
+#if elif(1) elif(2) else, execute else
+if false; then echo no; elif false; then echo no; elif false; then echo no; else echo yes; fi
+
+#if {if elif else}, execute elif
+if true; then if false; then echo no; elif true; then echo yes; else echo no; fi; fi
+
+#if {if elif} else, execute elif. ofcourse no dangling-else problem due to "fi"
+if true; then if false; then echo no; elif true; then echo yes; fi; else echo no; fi

From bed1d3524efa70ede47428f9a59f669188e0d2aa Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sun, 21 Mar 2010 23:04:02 +0000
Subject: [PATCH 0647/1628] * util/grub-install.in: Copy .mo files from
 @datadir@/locale, to match where 'make install' puts them. *
 util/i386/efi/grub-install.in: Likewise.

---
 ChangeLog                     | 6 ++++++
 util/grub-install.in          | 7 ++++---
 util/i386/efi/grub-install.in | 7 ++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6875f1afe..55c45af87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-21  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-install.in: Copy .mo files from @datadir@/locale, to
+	match where 'make install' puts them.
+	* util/i386/efi/grub-install.in: Likewise.
+
 2010-03-19  Colin Watson  <cjwatson@ubuntu.com>
 
 	* .bzrignore: Add gentrigtables, grub-script-check,
diff --git a/util/grub-install.in b/util/grub-install.in
index bb323d706..872dde4a2 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -32,6 +32,7 @@ platform=@platform@
 host_os=@host_os@
 font=@datadir@/@PACKAGE_TARNAME@/ascii.pf2
 pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
+localedir=@datadir@/locale
 
 grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
 if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] || [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
@@ -263,9 +264,9 @@ fi
 
 # Copy gettext files
 mkdir -p ${grubdir}/locale/
-for file in ${grubdir}/locale/*.mo ${pkglibdir}/locale/*.mo; do
-    if test -f "$file"; then
-        cp -f "$file" ${grubdir}/locale/
+for dir in ${localedir}/*; do
+    if test -f "$dir/LC_MESSAGES/grub.mo"; then
+        cp -f "$dir/LC_MESSAGES/grub.mo" "${grubdir}/locale/${dir##*/}.mo"
     fi
 done
 
diff --git a/util/i386/efi/grub-install.in b/util/i386/efi/grub-install.in
index 6a8573e81..a97960562 100644
--- a/util/i386/efi/grub-install.in
+++ b/util/i386/efi/grub-install.in
@@ -31,6 +31,7 @@ target_cpu=@target_cpu@
 platform=@platform@
 host_os=@host_os@
 pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
+localedir=@datadir@/locale
 
 grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
 grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
@@ -182,9 +183,9 @@ done
 
 # Copy gettext files
 mkdir -p ${grubdir}/locale/
-for file in ${grubdir}/locale/*.mo ${pkglibdir}/locale/*.mo; do
-    if test -f "$file"; then
-        cp -f "$file" ${grubdir}/locale/
+for dir in ${localedir}/*; do
+    if test -f "$dir/LC_MESSAGES/grub.mo"; then
+        cp -f "$dir/LC_MESSAGES/grub.mo" "${grubdir}/locale/${dir##*/}.mo"
     fi
 done
 

From ba4be5af25221d974e23801c3ae445d5d0d95f54 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 22 Mar 2010 13:25:09 +0530
Subject: [PATCH 0648/1628] fixed help message for grub-script-check

---
 util/grub-script-check.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index 0acf3077f..3c0c62f20 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -118,7 +118,7 @@ Checks GRUB script configuration file for syntax errors.\n\
 \n\
   -h, --help                display this message and exit\n\
   -V, --version             print version information and exit\n\
-  -v, --verbose             print script being processed\n\
+  -v, --verbose             print the script as it is being processed\n\
 \n\
 Report bugs to <%s>.\n\
 ", program_name,

From 8507a6ccdf7442fdac4344577007d238ddcdb6f7 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 22 Mar 2010 13:54:45 +0530
Subject: [PATCH 0649/1628] testcase for blanklines in grub script

---
 conf/tests.rmk                  |  4 ++++
 tests/grub_script_blanklines.in | 14 ++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 tests/grub_script_blanklines.in

diff --git a/conf/tests.rmk b/conf/tests.rmk
index c5080f58c..47dea7fb1 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -50,6 +50,9 @@ grub_script_echo_keywords_SOURCES = tests/grub_script_echo_keywords.in
 check_SCRIPTS += grub_script_vars1
 grub_script_vars1_SOURCES = tests/grub_script_vars1.in
 
+check_SCRIPTS += grub_script_blanklines
+grub_script_blanklines_SOURCES = tests/grub_script_blanklines.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -59,6 +62,7 @@ grub_script_vars1_SOURCES = tests/grub_script_vars1.in
 SCRIPTED_TESTS  = grub_script_echo1
 SCRIPTED_TESTS += grub_script_echo_keywords
 SCRIPTED_TESTS += grub_script_vars1
+SCRIPTED_TESTS += grub_script_blanklines
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/tests/grub_script_blanklines.in b/tests/grub_script_blanklines.in
new file mode 100644
index 000000000..71b869bd3
--- /dev/null
+++ b/tests/grub_script_blanklines.in
@@ -0,0 +1,14 @@
+#! /bin/sh -e
+
+@builddir@/grub-script-check <<EOF
+# comment 1
+
+command1 arg1
+
+command2 arg2
+
+
+
+last command
+# comment 2
+EOF

From 3e6b777ba7e84ec7cef0492908058d575dae24a2 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 22 Mar 2010 14:02:48 +0530
Subject: [PATCH 0650/1628] testcase for the last semicolon behavior

---
 conf/tests.rmk                       |  4 ++++
 tests/grub_script_final_semicolon.in | 10 ++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 tests/grub_script_final_semicolon.in

diff --git a/conf/tests.rmk b/conf/tests.rmk
index c5080f58c..fdf554a15 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -50,6 +50,9 @@ grub_script_echo_keywords_SOURCES = tests/grub_script_echo_keywords.in
 check_SCRIPTS += grub_script_vars1
 grub_script_vars1_SOURCES = tests/grub_script_vars1.in
 
+check_SCRIPTS += grub_script_final_semicolon
+grub_script_final_semicolon_SOURCES = tests/grub_script_final_semicolon.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -59,6 +62,7 @@ grub_script_vars1_SOURCES = tests/grub_script_vars1.in
 SCRIPTED_TESTS  = grub_script_echo1
 SCRIPTED_TESTS += grub_script_echo_keywords
 SCRIPTED_TESTS += grub_script_vars1
+SCRIPTED_TESTS += grub_script_final_semicolon
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/tests/grub_script_final_semicolon.in b/tests/grub_script_final_semicolon.in
new file mode 100644
index 000000000..99e55e545
--- /dev/null
+++ b/tests/grub_script_final_semicolon.in
@@ -0,0 +1,10 @@
+#! /bin/sh -e
+
+@builddir@/grub-script-check <<EOF
+echo one;
+echo one; echo two
+echo one; echo two;
+echo one ; echo two ; 
+echo one ; echo two ; echo three 
+echo one; echo two ; echo three;   
+EOF

From a7447ca6e10fef9ab0a64f91c16ee13d87dd5f30 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 22 Mar 2010 14:03:20 +0530
Subject: [PATCH 0651/1628] fix for grub_script_final_semicolon test

---
 script/parser.y | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/parser.y b/script/parser.y
index baf1fd9b5..e8a4cdd2c 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -92,7 +92,7 @@ script: newlines0
         {
           $$ = 0;
         }
-      | script statement delimiter
+      | script statement delimiter newlines0
         {
           struct grub_script_cmdblock *cmdblock;
           cmdblock = (struct grub_script_cmdblock *) $1;

From ce04e79272a9d782bdd69c59dfa61508357fd02d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 23 Mar 2010 16:02:06 +0100
Subject: [PATCH 0652/1628] Remove leftover variables

---
 util/grub-mkfont.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index c7969011c..49c5095ac 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -389,9 +389,6 @@ write_font_width_spec (struct grub_font_info *font_info, char *output_file)
   FILE *file;
   struct grub_glyph_info *glyph;
   grub_uint8_t *out;
-  grub_uint8_t *rle;
-  int rle_size;
-  int i, j;
 
   out = xmalloc (8192);
   memset (out, 0, 8192);

From 81b0623a6c86e314b50041f0648f76f6f168add6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 23 Mar 2010 16:28:35 +0100
Subject: [PATCH 0653/1628] Make few more points bidi-clean

---
 normal/menu_entry.c |  6 +++---
 normal/term.c       | 23 +++++++++--------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/normal/menu_entry.c b/normal/menu_entry.c
index 74887b8ab..be2d18fc9 100644
--- a/normal/menu_entry.c
+++ b/normal/menu_entry.c
@@ -1094,10 +1094,10 @@ complete (struct screen *screen, int continuous, int update)
 	else
 	  grub_putcode (' ', screen->terms[i].term);
 
-	while (*p && p < endp)
-	  grub_putcode (*p++, screen->terms[i].term);
+	grub_print_ucs4 (p, ucs4 + ucs4len < endp ? ucs4 + ucs4len : endp,
+			 0, 0, screen->terms[i].term);
 
-	if (*p)
+	if (ucs4 + ucs4len > endp)
 	  grub_putcode (GRUB_TERM_DISP_RIGHT, screen->terms[i].term);
 	grub_term_gotoxy (screen->terms[i].term, pos >> 8, pos & 0xFF);
       }
diff --git a/normal/term.c b/normal/term.c
index a2a313779..9488f68bc 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -165,17 +165,12 @@ map_code (grub_uint32_t in, struct grub_term_output *term)
 void
 grub_puts_terminal (const char *str, struct grub_term_output *term)
 {
-  grub_uint32_t code;
-  grub_ssize_t ret;
-  const grub_uint8_t *ptr = (const grub_uint8_t *) str;
-  const grub_uint8_t *end;
-  end = (const grub_uint8_t *) (str + grub_strlen (str));
+  grub_uint32_t *unicode_str, *unicode_last_position;
+  grub_utf8_to_ucs4_alloc (str, &unicode_str,
+			   &unicode_last_position);
 
-  while (*ptr)
-    {
-      ret = grub_utf8_to_ucs4 (&code, 1, ptr, end - ptr, &ptr);
-      grub_putcode (code, term);	
-    }
+  grub_print_ucs4 (unicode_str, unicode_last_position, 0, 0, term);
+  grub_free (unicode_str);
 }
 
 grub_uint16_t *
@@ -574,13 +569,13 @@ void
 grub_xputs_normal (const char *str)
 {
   grub_term_output_t term;
+  grub_uint32_t *unicode_str, *unicode_last_position;
+  grub_utf8_to_ucs4_alloc (str, &unicode_str,
+			   &unicode_last_position);
 
   FOR_ACTIVE_TERM_OUTPUTS(term)
   {
-    grub_uint32_t *unicode_str, *unicode_last_position;
-    grub_utf8_to_ucs4_alloc (str, &unicode_str,
-			     &unicode_last_position);
     grub_print_ucs4 (unicode_str, unicode_last_position, 0, 0, term);
-    grub_free (unicode_str);
   }
+  grub_free (unicode_str);
 }

From 36b71abfaa4de0f1f4e75085c64c5a7ddf8a4d93 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 23 Mar 2010 16:46:45 +0100
Subject: [PATCH 0654/1628] Fix few memory bugs

---
 normal/menu_entry.c | 162 +++++++++++++++++++++++---------------------
 1 file changed, 85 insertions(+), 77 deletions(-)

diff --git a/normal/menu_entry.c b/normal/menu_entry.c
index be2d18fc9..20d602597 100644
--- a/normal/menu_entry.c
+++ b/normal/menu_entry.c
@@ -243,6 +243,9 @@ update_screen (struct screen *screen, struct per_term_screen *term_screen,
 	{
 	  int column;
 
+	  if (linep >= screen->lines + screen->num_lines)
+	    break;
+
 	  for (column = 0;
 	       column <= linep->len
 		 && y < grub_term_num_entries (term_screen->term);
@@ -337,7 +340,7 @@ insert_string (struct screen *screen, char *s, int update)
 	  screen->num_lines++;
 	  screen->lines = grub_realloc (screen->lines,
 					screen->num_lines
-					* sizeof (struct line));
+					* sizeof (screen->lines[0]));
 	  if (! screen->lines)
 	    return 0;
 
@@ -1020,87 +1023,92 @@ complete (struct screen *screen, int continuous, int update)
   insert = grub_normal_do_completion (linep->buf, &restore, store_completion);
 
   linep->buf[screen->column] = saved_char;
-
-  buflen = grub_strlen (completion_buffer.buf);
-  ucs4 = grub_malloc (sizeof (grub_uint32_t) * (buflen + 1));
-
-  if (!ucs4)
+  
+  if (completion_buffer.buf)
     {
-      grub_print_error ();
-      grub_errno = GRUB_ERR_NONE;
-      return 1;
-    }
+      buflen = grub_strlen (completion_buffer.buf);
+      ucs4 = grub_malloc (sizeof (grub_uint32_t) * (buflen + 1));
+      
+      if (!ucs4)
+	{
+	  grub_print_error ();
+	  grub_errno = GRUB_ERR_NONE;
+	  return 1;
+	}
 
-  ucs4len = grub_utf8_to_ucs4 (ucs4, buflen,
-			       (grub_uint8_t *) completion_buffer.buf,
-			       buflen, 0);
-  ucs4[ucs4len] = 0;
+      ucs4len = grub_utf8_to_ucs4 (ucs4, buflen,
+				   (grub_uint8_t *) completion_buffer.buf,
+				   buflen, 0);
+      ucs4[ucs4len] = 0;
 
-  if (restore)
-    for (i = 0; i < screen->nterms; i++)
-      {
-	int num_sections = ((completion_buffer.len
-			     + grub_term_width (screen->terms[i].term) - 8 - 1)
-			    / (grub_term_width (screen->terms[i].term) - 8));
-	grub_uint32_t *endp;
-	grub_uint16_t pos;
-	grub_uint32_t *p = ucs4;
-
-	pos = grub_term_getxy (screen->terms[i].term);
-	grub_term_gotoxy (screen->terms[i].term, 0,
-			  grub_term_height (screen->terms[i].term) - 3);
-
-	screen->completion_shown = 1;
-
-	grub_term_gotoxy (screen->terms[i].term, 0,
-			  grub_term_height (screen->terms[i].term) - 3);
-	grub_puts_terminal ("   ", screen->terms[i].term);
-	switch (completion_type)
+      if (restore)
+	for (i = 0; i < screen->nterms; i++)
 	  {
-	  case GRUB_COMPLETION_TYPE_COMMAND:
-	    grub_puts_terminal (_("Possible commands are:"),
-				screen->terms[i].term);
-	    break;
-	  case GRUB_COMPLETION_TYPE_DEVICE:
-	    grub_puts_terminal (_("Possible devices are:"),
-				screen->terms[i].term);
-	    break;
-	  case GRUB_COMPLETION_TYPE_FILE:
-	    grub_puts_terminal (_("Possible files are:"),
-				screen->terms[i].term);
-	    break;
-	  case GRUB_COMPLETION_TYPE_PARTITION:
-	    grub_puts_terminal (_("Possible partitions are:"),
-				screen->terms[i].term);
-	    break;
-	  case GRUB_COMPLETION_TYPE_ARGUMENT:
-	    grub_puts_terminal (_("Possible arguments are:"),
-				screen->terms[i].term);
-	    break;
-	  default:
-	    grub_puts_terminal (_("Possible things are:"),
-				screen->terms[i].term);
-	    break;
+	    int num_sections = ((completion_buffer.len
+				 + grub_term_width (screen->terms[i].term) 
+				 - 8 - 1)
+				/ (grub_term_width (screen->terms[i].term)
+				   - 8));
+	    grub_uint32_t *endp;
+	    grub_uint16_t pos;
+	    grub_uint32_t *p = ucs4;
+
+	    pos = grub_term_getxy (screen->terms[i].term);
+	    grub_term_gotoxy (screen->terms[i].term, 0,
+			      grub_term_height (screen->terms[i].term) - 3);
+
+	    screen->completion_shown = 1;
+
+	    grub_term_gotoxy (screen->terms[i].term, 0,
+			      grub_term_height (screen->terms[i].term) - 3);
+	    grub_puts_terminal ("   ", screen->terms[i].term);
+	    switch (completion_type)
+	      {
+	      case GRUB_COMPLETION_TYPE_COMMAND:
+		grub_puts_terminal (_("Possible commands are:"),
+				    screen->terms[i].term);
+		break;
+	      case GRUB_COMPLETION_TYPE_DEVICE:
+		grub_puts_terminal (_("Possible devices are:"),
+				    screen->terms[i].term);
+		break;
+	      case GRUB_COMPLETION_TYPE_FILE:
+		grub_puts_terminal (_("Possible files are:"),
+				    screen->terms[i].term);
+		break;
+	      case GRUB_COMPLETION_TYPE_PARTITION:
+		grub_puts_terminal (_("Possible partitions are:"),
+				    screen->terms[i].term);
+		break;
+	      case GRUB_COMPLETION_TYPE_ARGUMENT:
+		grub_puts_terminal (_("Possible arguments are:"),
+				    screen->terms[i].term);
+		break;
+	      default:
+		grub_puts_terminal (_("Possible things are:"),
+				    screen->terms[i].term);
+		break;
+	      }
+
+	    grub_puts_terminal ("\n    ", screen->terms[i].term);
+
+	    p += (count % num_sections)
+	      * (grub_term_width (screen->terms[i].term) - 8);
+	    endp = p + (grub_term_width (screen->terms[i].term) - 8);
+
+	    if (p != ucs4)
+	      grub_putcode (GRUB_TERM_DISP_LEFT, screen->terms[i].term);
+	    else
+	      grub_putcode (' ', screen->terms[i].term);
+
+	    grub_print_ucs4 (p, ucs4 + ucs4len < endp ? ucs4 + ucs4len : endp,
+			     0, 0, screen->terms[i].term);
+
+	    if (ucs4 + ucs4len > endp)
+	      grub_putcode (GRUB_TERM_DISP_RIGHT, screen->terms[i].term);
+	    grub_term_gotoxy (screen->terms[i].term, pos >> 8, pos & 0xFF);
 	  }
-
-	grub_puts_terminal ("\n    ", screen->terms[i].term);
-
-	p += (count % num_sections)
-	  * (grub_term_width (screen->terms[i].term) - 8);
-	endp = p + (grub_term_width (screen->terms[i].term) - 8);
-
-	if (p != ucs4)
-	  grub_putcode (GRUB_TERM_DISP_LEFT, screen->terms[i].term);
-	else
-	  grub_putcode (' ', screen->terms[i].term);
-
-	grub_print_ucs4 (p, ucs4 + ucs4len < endp ? ucs4 + ucs4len : endp,
-			 0, 0, screen->terms[i].term);
-
-	if (ucs4 + ucs4len > endp)
-	  grub_putcode (GRUB_TERM_DISP_RIGHT, screen->terms[i].term);
-	grub_term_gotoxy (screen->terms[i].term, pos >> 8, pos & 0xFF);
-      }
+    }
 
   if (insert)
     {

From 6fcebedeeda11d284a35ca231e7cce95be9e6d49 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 23 Mar 2010 16:51:53 +0100
Subject: [PATCH 0655/1628] Replace line counter with char counter

---
 include/grub/normal.h |  2 +-
 normal/menu.c         |  4 ++--
 normal/term.c         | 18 +++++++++++++-----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/include/grub/normal.h b/include/grub/normal.h
index 6ec14d31a..a5352cdcf 100644
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -112,7 +112,7 @@ void read_terminal_list (void);
 
 void grub_set_more (int onoff);
 
-int grub_normal_get_line_counter (void);
+int grub_normal_get_char_counter (void);
 void grub_install_newline_hook (void);
 
 void grub_xputs_normal (const char *str);
diff --git a/normal/menu.c b/normal/menu.c
index e96c99efd..60311970f 100644
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -558,13 +558,13 @@ show_menu (grub_menu_t menu, int nested)
         }
       else
         {
-	  int lines_before = grub_normal_get_line_counter ();
+	  int chars_before = grub_normal_get_char_counter ();
           grub_errno = GRUB_ERR_NONE;
           grub_menu_execute_entry (e);
 	  grub_print_error ();
 	  grub_errno = GRUB_ERR_NONE;
 
-          if (lines_before != grub_normal_get_line_counter ())
+          if (chars_before != grub_normal_get_char_counter ())
 	    grub_wait_after_message ();
         }
     }
diff --git a/normal/term.c b/normal/term.c
index 9488f68bc..493127b65 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -25,18 +25,26 @@
 #include <grub/normal.h>
 #include <grub/charset.h>
 
+struct term_state
+{
+  struct term_state *next;
+  struct grub_unicode_glyph *backlog;
+  int numlines;
+  char *term_name;
+};
+
 /* The amount of lines counted by the pager.  */
 static unsigned grub_more_lines;
 
 /* If the more pager is active.  */
 static int grub_more;
 
-static int grub_normal_line_counter = 0;
+static int grub_normal_char_counter = 0;
 
 int
-grub_normal_get_line_counter (void)
+grub_normal_get_char_counter (void)
 {
-  return grub_normal_line_counter;
+  return grub_normal_char_counter;
 }
 
 static void
@@ -50,8 +58,6 @@ process_newline (void)
       height = grub_term_height (cur);
   grub_more_lines++;
 
-  grub_normal_line_counter++;
-
   if (grub_more && grub_more_lines >= height - 1)
     {
       char key;
@@ -340,6 +346,8 @@ putglyph (const struct grub_unicode_glyph *c, struct grub_term_output *term)
       .estimated_width = 1
     };
 
+  grub_normal_char_counter++;
+
   if (c->base == '\t' && term->getxy)
     {
       int n;

From 3c69fb81e14cfa6d222b32185bf227532185a990 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 23 Mar 2010 17:54:31 +0100
Subject: [PATCH 0656/1628] Restore and enhance pager functionality

---
 include/grub/normal.h |   1 -
 normal/main.c         |   1 -
 normal/term.c         | 465 ++++++++++++++++++++++++++++--------------
 3 files changed, 316 insertions(+), 151 deletions(-)

diff --git a/include/grub/normal.h b/include/grub/normal.h
index a5352cdcf..dbc2be327 100644
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -113,7 +113,6 @@ void read_terminal_list (void);
 void grub_set_more (int onoff);
 
 int grub_normal_get_char_counter (void);
-void grub_install_newline_hook (void);
 
 void grub_xputs_normal (const char *str);
 
diff --git a/normal/main.c b/normal/main.c
index 52d9b36fe..9e4d5eb30 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -661,7 +661,6 @@ GRUB_MOD_INIT(normal)
 
   grub_set_history (GRUB_DEFAULT_HISTORY_SIZE);
 
-  grub_install_newline_hook ();
   grub_register_variable_hook ("pager", 0, grub_env_write_pager);
 
   /* Register a command "normal" for the rescue mode.  */
diff --git a/normal/term.c b/normal/term.c
index 493127b65..a8a3e63de 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -28,11 +28,17 @@
 struct term_state
 {
   struct term_state *next;
-  struct grub_unicode_glyph *backlog;
-  int numlines;
+  const struct grub_unicode_glyph *backlog_glyphs;
+  const grub_uint32_t *backlog_ucs4;
+  grub_size_t backlog_len;
+
+  void *free;
+  int num_lines;
   char *term_name;
 };
 
+static struct term_state *term_states = NULL;
+
 /* The amount of lines counted by the pager.  */
 static unsigned grub_more_lines;
 
@@ -48,40 +54,52 @@ grub_normal_get_char_counter (void)
 }
 
 static void
-process_newline (void)
+print_more (void)
 {
-  struct grub_term_output *cur;
-  unsigned height = -1;
+  char key;
+  grub_uint16_t *pos;
+  grub_term_output_t term;
+  grub_uint32_t *unicode_str, *unicode_last_position;
 
-  FOR_ACTIVE_TERM_OUTPUTS(cur)
-    if (grub_term_height (cur) < height)
-      height = grub_term_height (cur);
-  grub_more_lines++;
+  pos = grub_term_save_pos ();
 
-  if (grub_more && grub_more_lines >= height - 1)
+  grub_utf8_to_ucs4_alloc ("--MORE--", &unicode_str,
+			   &unicode_last_position);
+
+  if (!unicode_str)
     {
-      char key;
-      grub_uint16_t *pos;
-
-      pos = grub_term_save_pos ();
-
-      grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
-      grub_printf ("--MORE--");
-      grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
-
-      key = grub_getkey ();
-
-      /* Remove the message.  */
-      grub_term_restore_pos (pos);
-      grub_printf ("        ");
-      grub_term_restore_pos (pos);
-
-      /* Scroll one lines or an entire page, depending on the key.  */
-      if (key == '\r' || key =='\n')
-	grub_more_lines = height - 2;
-      else
-	grub_more_lines = 0;
+      grub_errno = GRUB_ERR_NONE;
+      return;
     }
+
+  grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
+
+  FOR_ACTIVE_TERM_OUTPUTS(term)
+  {
+    grub_print_ucs4 (unicode_str, unicode_last_position, 0, 0, term);
+  }
+  grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
+
+  grub_free (unicode_str);
+  
+  key = grub_getkey ();
+
+  /* Remove the message.  */
+  grub_term_restore_pos (pos);
+  FOR_ACTIVE_TERM_OUTPUTS(term)
+    grub_print_spaces (term, 8);
+  grub_term_restore_pos (pos);
+
+  /* Scroll one lines or an entire page, depending on the key.  */
+
+  {
+    static struct term_state *state;
+    for (state = term_states; state; state = state->next)
+      if (key == '\r' || key =='\n')
+	state->num_lines = 0;
+      else
+	state->num_lines -= 2;
+  }
 }
 
 void
@@ -95,12 +113,6 @@ grub_set_more (int onoff)
   grub_more_lines = 0;
 }
 
-void
-grub_install_newline_hook (void)
-{
-  grub_newline_hook = process_newline;
-}
-
 static grub_uint32_t
 map_code (grub_uint32_t in, struct grub_term_output *term)
 {
@@ -431,33 +443,230 @@ grub_putcode (grub_uint32_t code, struct grub_term_output *term)
   putcode_real (code, term);
 }
 
-void
-grub_print_ucs4 (const grub_uint32_t * str,
-		 const grub_uint32_t * last_position,
-		 int margin_left, int margin_right,
-		 struct grub_term_output *term)
+static grub_ssize_t
+get_maxwidth (struct grub_term_output *term,
+	      int margin_left, int margin_right)
 {
-  grub_ssize_t max_width;
-  grub_ssize_t startwidth;
+  struct grub_unicode_glyph space_glyph = {
+    .base = ' ',
+    .variant = 0,
+    .attributes = 0,
+    .ncomb = 0,
+    .combining = 0
+  };
+  return (grub_term_width (term)
+	  - grub_term_getcharwidth (term, &space_glyph) 
+	  * (margin_left + margin_right) - 1);
+}
+
+static grub_ssize_t
+get_startwidth (struct grub_term_output *term,
+		int margin_left)
+{
+  return ((term->getxy () >> 8) & 0xff) - margin_left;
+}
+
+static int
+print_ucs4_terminal (const grub_uint32_t * str,
+		     const grub_uint32_t * last_position,
+		     int margin_left, int margin_right,
+		     struct grub_term_output *term,
+		     struct term_state *state)
+{
+  const grub_uint32_t *ptr;
+  grub_ssize_t startwidth = get_startwidth (term, margin_left);
+  grub_ssize_t line_width = startwidth;
+  grub_ssize_t lastspacewidth = 0;
+  grub_ssize_t max_width = get_maxwidth (term, margin_left, margin_right);
+  const grub_uint32_t *line_start = str, *last_space = str - 1;
+
+  for (ptr = str; ptr < last_position; ptr++)
+    {
+      grub_ssize_t last_width = 0;
+      if (grub_unicode_get_comb_type (*ptr) == GRUB_UNICODE_COMB_NONE)
+	{
+	  struct grub_unicode_glyph c = {
+	    .variant = 0,
+	    .attributes = 0,
+	    .ncomb = 0,
+	    .combining = 0
+	  };
+	  c.base = *ptr;
+	  line_width += last_width = grub_term_getcharwidth (term, &c);
+	}
+
+      if (*ptr == ' ')
+	{
+	  lastspacewidth = line_width;
+	  last_space = ptr;
+	}
+
+      if (line_width > max_width || *ptr == '\n')
+	{
+	  const grub_uint32_t *ptr2;
+
+	  if (line_width > max_width && last_space > line_start)
+	    ptr = last_space;
+	  else if (line_width > max_width 
+		   && line_start == str && startwidth != 0)
+	    {
+	      ptr = str;
+	      lastspacewidth = startwidth;
+	    }
+	  else
+	    lastspacewidth = line_width - last_width;
+
+	  for (ptr2 = line_start; ptr2 < ptr; ptr2++)
+	    {
+	      /* Skip combining characters on non-UTF8 terminals.  */
+	      if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
+		  != GRUB_TERM_CODE_TYPE_UTF8_LOGICAL
+		  && grub_unicode_get_comb_type (*ptr2)
+		  != GRUB_UNICODE_COMB_NONE)
+		continue;
+	      putcode_real (*ptr2, term);
+	    }
+
+	  grub_print_spaces (term, margin_right);
+	  grub_putcode ('\n', term);
+	  if (state && state->num_lines++
+	      >= (grub_ssize_t) grub_term_height (term))
+	    {
+	      state->backlog_ucs4 = (ptr == last_space || *ptr == '\n') 
+		? ptr + 1 : ptr;
+	      state->backlog_len = last_position - state->backlog_ucs4;
+	      return 1;
+	    }
+
+	  line_width -= lastspacewidth;
+	  grub_print_spaces (term, margin_left);
+	  if (ptr == last_space || *ptr == '\n')
+	    ptr++;
+	  line_start = ptr;
+	}
+    }
 
   {
-    struct grub_unicode_glyph space_glyph = {
-      .base = ' ',
-      .variant = 0,
-      .attributes = 0,
-      .ncomb = 0,
-      .combining = 0
-      };
-    max_width = grub_term_width (term)
-      - grub_term_getcharwidth (term, &space_glyph) 
-      * (margin_left + margin_right) - 1;
+    const grub_uint32_t *ptr2;
+    for (ptr2 = line_start; ptr2 < last_position; ptr2++)
+      {
+	/* Skip combining characters on non-UTF8 terminals.  */
+	if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
+	    != GRUB_TERM_CODE_TYPE_UTF8_LOGICAL
+	    && grub_unicode_get_comb_type (*ptr2)
+	    != GRUB_UNICODE_COMB_NONE)
+	  continue;
+	putcode_real (*ptr2, term);
+      }
   }
+  return 0;
+}
+
+static struct term_state *
+find_term_state (struct grub_term_output *term)
+{
+  struct term_state *state;
+  for (state = term_states; state; state = state->next)
+    if (grub_strcmp (state->term_name, term->name) == 0)
+      return state;
+
+  state = grub_zalloc (sizeof (*state));
+  if (!state)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      return NULL;
+    }
+
+  state->term_name = grub_strdup (term->name);
+  state->next = term_states;
+  term_states = state;
+
+  return state;
+}
+
+static int
+put_glyphs_terminal (const struct grub_unicode_glyph *visual,
+		     grub_ssize_t visual_len,
+		     int margin_left, int margin_right,
+		     struct grub_term_output *term,
+		     struct term_state *state)
+{
+  const struct grub_unicode_glyph *visual_ptr;
+  for (visual_ptr = visual; visual_ptr < visual + visual_len; visual_ptr++)
+    {
+      if (visual_ptr->base == '\n')
+	grub_print_spaces (term, margin_right);
+      putglyph (visual_ptr, term);
+      if (state && state->num_lines++ >= (grub_ssize_t) grub_term_height (term))
+      {
+	state->backlog_glyphs = visual_ptr + 1;
+	state->backlog_len = visual_len - (visual - visual_ptr) - 1;
+	return 1;
+      }
+
+      if (visual_ptr->base == '\n')
+	grub_print_spaces (term, margin_left);
+      grub_free (visual_ptr->combining);
+    }
+  return 0;
+}
+
+static int
+print_backlog (struct grub_term_output *term,
+	       int margin_left, int margin_right)
+{
+  struct term_state *state = find_term_state (term);
+
+  if (!state)
+    return 0;
+
+  if (state->backlog_ucs4)
+    {
+      int ret;
+      ret = print_ucs4_terminal (state->backlog_ucs4,
+				 state->backlog_ucs4 + state->backlog_len,
+				 margin_left, margin_right, term, state);
+      if (!ret)
+	{
+	  grub_free (state->free);
+	  state->free = NULL;
+	  state->backlog_len = 0;
+	}
+      return ret;
+    }
+
+  if (state->backlog_glyphs)
+    {
+      int ret;
+      ret = put_glyphs_terminal (state->backlog_glyphs,
+				 state->backlog_len,
+				 margin_left, margin_right, term, state);
+      if (!ret)
+	{
+	  grub_free (state->free);
+	  state->free = NULL;
+	  state->backlog_len = 0;
+	}
+      return ret;
+    }
+
+  return 0;
+}
+
+static int
+print_ucs4_real (const grub_uint32_t * str,
+		 const grub_uint32_t * last_position,
+		 int margin_left, int margin_right,
+		 struct grub_term_output *term, int backlog)
+{
+  struct term_state *state = NULL;
+
+  if (backlog)
+    state = find_term_state (term);
 
   if (((term->getxy () >> 8) & 0xff) < margin_left)
     grub_print_spaces (term, margin_left - ((term->getxy () >> 8) & 0xff));
 
-  startwidth = ((term->getxy () >> 8) & 0xff) - margin_left;
-
   if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
       == GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS
       || (term->flags & GRUB_TERM_CODE_TYPE_MASK) 
@@ -465,7 +674,7 @@ grub_print_ucs4 (const grub_uint32_t * str,
     {
       grub_ssize_t visual_len;
       struct grub_unicode_glyph *visual;
-      struct grub_unicode_glyph *visual_ptr;
+      int ret;
 
       auto grub_ssize_t getcharwidth (const struct grub_unicode_glyph *c);
       grub_ssize_t getcharwidth (const struct grub_unicode_glyph *c)
@@ -475,115 +684,73 @@ grub_print_ucs4 (const grub_uint32_t * str,
 
       visual_len = grub_bidi_logical_to_visual (str, last_position - str,
 						&visual, getcharwidth,
-						max_width, startwidth);
+						get_maxwidth (term, 
+							      margin_left,
+							      margin_right),
+						get_startwidth (term, 
+								margin_left));
       if (visual_len < 0)
 	{
 	  grub_print_error ();
-	  return;
+	  return 0;
 	}
-      for (visual_ptr = visual; visual_ptr < visual + visual_len; visual_ptr++)
-	{
-	  if (visual_ptr->base == '\n')
-	    grub_print_spaces (term, margin_right);
-	  putglyph (visual_ptr, term);
-	  if (visual_ptr->base == '\n')
-	    grub_print_spaces (term, margin_left);
-	  grub_free (visual_ptr->combining);
-	}
-      grub_free (visual);
-      return;
+      ret = put_glyphs_terminal (visual, visual_len, margin_left, margin_right,
+				 term, state);
+      if (!ret)
+	grub_free (visual);
+      else
+	state->free = visual;
+      return ret;
     }
-
-  {
-    const grub_uint32_t *ptr;
-    grub_ssize_t line_width = startwidth;
-    grub_ssize_t lastspacewidth = 0;
-    const grub_uint32_t *line_start = str, *last_space = str - 1;
-
-    for (ptr = str; ptr < last_position; ptr++)
-      {
-	grub_ssize_t last_width = 0;
-	if (grub_unicode_get_comb_type (*ptr) == GRUB_UNICODE_COMB_NONE)
-	  {
-	    struct grub_unicode_glyph c = {
-	      .variant = 0,
-	      .attributes = 0,
-	      .ncomb = 0,
-	      .combining = 0
-	    };
-	    c.base = *ptr;
-	    line_width += last_width = grub_term_getcharwidth (term, &c);
-	  }
-
-	if (*ptr == ' ')
-	  {
-	    lastspacewidth = line_width;
-	    last_space = ptr;
-	  }
-
-	if (line_width > max_width || *ptr == '\n')
-	  {
-	    const grub_uint32_t *ptr2;
-
-	    if (line_width > max_width && last_space > line_start)
-	      ptr = last_space;
-	    else if (line_width > max_width 
-		     && line_start == str && startwidth != 0)
-	      {
-		ptr = str;
-		lastspacewidth = startwidth;
-	      }
-	    else
-	      lastspacewidth = line_width - last_width;
-
-	    for (ptr2 = line_start; ptr2 < ptr; ptr2++)
-	      {
-		/* Skip combining characters on non-UTF8 terminals.  */
-		if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
-		    != GRUB_TERM_CODE_TYPE_UTF8_LOGICAL
-		    && grub_unicode_get_comb_type (*ptr2)
-		    != GRUB_UNICODE_COMB_NONE)
-		  continue;
-		putcode_real (*ptr2, term);
-	      }
-
-	    grub_print_spaces (term, margin_right);
-	    grub_putcode ('\n', term);
-	    line_width -= lastspacewidth;
-	    grub_print_spaces (term, margin_left);
-	    if (ptr == last_space || *ptr == '\n')
-	      ptr++;
-	    line_start = ptr;
-	  }
-      }
-
-    {
-      const grub_uint32_t *ptr2;
-      for (ptr2 = line_start; ptr2 < last_position; ptr2++)
-	{
-	  /* Skip combining characters on non-UTF8 terminals.  */
-	  if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
-	      != GRUB_TERM_CODE_TYPE_UTF8_LOGICAL
-	      && grub_unicode_get_comb_type (*ptr2)
-	      != GRUB_UNICODE_COMB_NONE)
-	    continue;
-	  putcode_real (*ptr2, term);
-	}
-    }
-  }
+  return print_ucs4_terminal (str, last_position, margin_left, margin_right,
+			      term, state);
 }
 
+void
+grub_print_ucs4 (const grub_uint32_t * str,
+		 const grub_uint32_t * last_position,
+		 int margin_left, int margin_right,
+		 struct grub_term_output *term)
+{
+  print_ucs4_real (str, last_position, margin_left, margin_right,
+		   term, 0);
+}
+
+
 void
 grub_xputs_normal (const char *str)
 {
   grub_term_output_t term;
   grub_uint32_t *unicode_str, *unicode_last_position;
+  int backlog = 0;
   grub_utf8_to_ucs4_alloc (str, &unicode_str,
 			   &unicode_last_position);
 
+  if (!unicode_str)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      return;
+    }
+
   FOR_ACTIVE_TERM_OUTPUTS(term)
   {
-    grub_print_ucs4 (unicode_str, unicode_last_position, 0, 0, term);
+    int cur;
+    cur = print_ucs4_real (unicode_str, unicode_last_position, 0, 0,
+			   term, 1);
+    if (cur)
+      backlog = 1;
   }
+  while (backlog)
+    {
+      print_more ();
+      backlog = 0;
+      FOR_ACTIVE_TERM_OUTPUTS(term)
+      {
+	int cur;
+	cur = print_backlog (term, 0, 0);
+	if (cur)
+	  backlog = 1;
+      }
+    }
   grub_free (unicode_str);
 }

From 5c56cac95f5597ebfb598db9c974b0525233a265 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 23 Mar 2010 18:06:49 +0100
Subject: [PATCH 0657/1628] Fix few pager bugs

---
 include/grub/normal.h |  1 +
 normal/cmdline.c      |  3 +++
 normal/term.c         | 37 +++++++++++++++++++++----------------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/include/grub/normal.h b/include/grub/normal.h
index dbc2be327..ca5bd759a 100644
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -113,6 +113,7 @@ void read_terminal_list (void);
 void grub_set_more (int onoff);
 
 int grub_normal_get_char_counter (void);
+void grub_normal_reset_more (void);
 
 void grub_xputs_normal (const char *str);
 
diff --git a/normal/cmdline.c b/normal/cmdline.c
index f10dc47fe..daa0a1adb 100644
--- a/normal/cmdline.c
+++ b/normal/cmdline.c
@@ -362,6 +362,7 @@ grub_cmdline_get (const char *prompt)
 	grub_putcode ('\n', term);
   }
   grub_printf ("%s ", prompt_translated);
+  grub_normal_reset_more ();
 
   {
     struct cmdline_term *cl_term_cur;
@@ -440,6 +441,8 @@ grub_cmdline_get (const char *prompt)
 						  print_completion);
 	    grub_free (bufu8);
 
+	    grub_normal_reset_more ();
+
 	    if (restore)
 	      {
 		/* Restore the prompt.  */
diff --git a/normal/term.c b/normal/term.c
index a8a3e63de..09299f647 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -39,9 +39,6 @@ struct term_state
 
 static struct term_state *term_states = NULL;
 
-/* The amount of lines counted by the pager.  */
-static unsigned grub_more_lines;
-
 /* If the more pager is active.  */
 static int grub_more;
 
@@ -53,6 +50,14 @@ grub_normal_get_char_counter (void)
   return grub_normal_char_counter;
 }
 
+void
+grub_normal_reset_more (void)
+{
+  static struct term_state *state;
+  for (state = term_states; state; state = state->next)
+    state->num_lines = 0;
+}
+
 static void
 print_more (void)
 {
@@ -92,14 +97,14 @@ print_more (void)
 
   /* Scroll one lines or an entire page, depending on the key.  */
 
-  {
-    static struct term_state *state;
-    for (state = term_states; state; state = state->next)
-      if (key == '\r' || key =='\n')
-	state->num_lines = 0;
-      else
+  if (key == '\r' || key =='\n')
+    grub_normal_reset_more ();
+  else
+    {
+      static struct term_state *state;
+      for (state = term_states; state; state = state->next)
 	state->num_lines -= 2;
-  }
+    }
 }
 
 void
@@ -109,8 +114,7 @@ grub_set_more (int onoff)
     grub_more++;
   else
     grub_more--;
-
-  grub_more_lines = 0;
+  grub_normal_reset_more ();
 }
 
 static grub_uint32_t
@@ -529,8 +533,8 @@ print_ucs4_terminal (const grub_uint32_t * str,
 
 	  grub_print_spaces (term, margin_right);
 	  grub_putcode ('\n', term);
-	  if (state && state->num_lines++
-	      >= (grub_ssize_t) grub_term_height (term))
+	  if (state && ++state->num_lines
+	      >= (grub_ssize_t) grub_term_height (term) - 2)
 	    {
 	      state->backlog_ucs4 = (ptr == last_space || *ptr == '\n') 
 		? ptr + 1 : ptr;
@@ -597,7 +601,8 @@ put_glyphs_terminal (const struct grub_unicode_glyph *visual,
       if (visual_ptr->base == '\n')
 	grub_print_spaces (term, margin_right);
       putglyph (visual_ptr, term);
-      if (state && state->num_lines++ >= (grub_ssize_t) grub_term_height (term))
+      if (state && ++state->num_lines
+	  >= (grub_ssize_t) grub_term_height (term) - 2)
       {
 	state->backlog_glyphs = visual_ptr + 1;
 	state->backlog_len = visual_len - (visual - visual_ptr) - 1;
@@ -736,7 +741,7 @@ grub_xputs_normal (const char *str)
   {
     int cur;
     cur = print_ucs4_real (unicode_str, unicode_last_position, 0, 0,
-			   term, 1);
+			   term, grub_more);
     if (cur)
       backlog = 1;
   }

From 1f22d20c8cbfc9bd9dd4d24d675a13d2aceea045 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 23 Mar 2010 18:17:54 +0100
Subject: [PATCH 0658/1628] Fix yeeloong compilation

---
 commands/videotest.c        | 1 +
 gfxmenu/font.c              | 1 +
 include/grub/font.h         | 8 --------
 include/grub/gfxmenu_view.h | 8 ++++++++
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/commands/videotest.c b/commands/videotest.c
index 390811a71..77a63a322 100644
--- a/commands/videotest.c
+++ b/commands/videotest.c
@@ -25,6 +25,7 @@
 #include <grub/term.h>
 #include <grub/command.h>
 #include <grub/i18n.h>
+#include <grub/gfxmenu_view.h>
 
 static grub_err_t
 grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),
diff --git a/gfxmenu/font.c b/gfxmenu/font.c
index a11b31875..3c15e19fa 100644
--- a/gfxmenu/font.c
+++ b/gfxmenu/font.c
@@ -29,6 +29,7 @@
 #include <grub/charset.h>
 #include <grub/unicode.h>
 #include <grub/fontformat.h>
+#include <grub/gfxmenu_view.h>
 
 /* Draw a UTF-8 string of text on the current video render target.
    The x coordinate specifies the starting x position for the first character,
diff --git a/include/grub/font.h b/include/grub/font.h
index 4df4c2279..b896159c2 100644
--- a/include/grub/font.h
+++ b/include/grub/font.h
@@ -100,9 +100,6 @@ int EXPORT_FUNC (grub_font_get_height) (grub_font_t font);
 
 int EXPORT_FUNC (grub_font_get_xheight) (grub_font_t font);
 
-int EXPORT_FUNC (grub_font_get_string_width) (grub_font_t font,
-					      const char *str);
-
 struct grub_font_glyph *EXPORT_FUNC (grub_font_get_glyph) (grub_font_t font,
 							   grub_uint32_t code);
 
@@ -113,11 +110,6 @@ grub_err_t EXPORT_FUNC (grub_font_draw_glyph) (struct grub_font_glyph *glyph,
 					       grub_video_color_t color,
 					       int left_x, int baseline_y);
 
-grub_err_t EXPORT_FUNC (grub_font_draw_string) (const char *str,
-						grub_font_t font,
-						grub_video_color_t color,
-						int left_x, int baseline_y);
-
 int
 EXPORT_FUNC (grub_font_get_constructed_device_width) (grub_font_t hinted_font,
 					const struct grub_unicode_glyph *glyph_id);
diff --git a/include/grub/gfxmenu_view.h b/include/grub/gfxmenu_view.h
index 7cbfa89d3..c52a3c71c 100644
--- a/include/grub/gfxmenu_view.h
+++ b/include/grub/gfxmenu_view.h
@@ -62,6 +62,14 @@ grub_gfxmenu_print_timeout (int timeout, void *data);
 void
 grub_gfxmenu_set_chosen_entry (int entry, void *data);
 
+grub_err_t grub_font_draw_string (const char *str,
+				  grub_font_t font,
+				  grub_video_color_t color,
+				  int left_x, int baseline_y);
+int grub_font_get_string_width (grub_font_t font,
+				const char *str);
+
+
 /* Implementation details -- this should not be used outside of the
    view itself.  */
 

From 45511ee976feb5016dc32bed47748696896a6259 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 23 Mar 2010 18:39:02 +0100
Subject: [PATCH 0659/1628] below right support

---
 font/font.c            | 11 +++++++++++
 include/grub/unicode.h |  1 +
 2 files changed, 12 insertions(+)

diff --git a/font/font.c b/font/font.c
index 6209b60d2..5b573b852 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1122,6 +1122,7 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
   struct grub_video_signed_rect bounds;
   unsigned i;
   signed above_rightx, above_righty;
+  signed below_rightx, below_righty;
   auto void NESTED_FUNC_ATTR do_blit (struct grub_font_glyph *src,
 				      signed dx, signed dy);
   void NESTED_FUNC_ATTR do_blit (struct grub_font_glyph *src,
@@ -1176,6 +1177,9 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
   above_rightx = bounds.x + bounds.width;
   above_righty = bounds.y + bounds.height;
 
+  below_rightx = bounds.x + bounds.width;
+  below_righty = bounds.y;
+
   for (i = 0; i < glyph_id->ncomb; i++)
     {
       grub_int16_t space = 0;
@@ -1210,6 +1214,13 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	  minimal_device_width (above_rightx);
 	  break;
 
+	case GRUB_UNICODE_COMB_BELOW_RIGHT:
+	  do_blit (combining_glyphs[i], below_rightx,
+		   below_righty);
+	  below_rightx += combining_glyphs[i]->width;
+	  minimal_device_width (below_rightx);
+	  break;
+
 	case GRUB_UNICODE_STACK_ABOVE:
 	  space = combining_glyphs[i]->offset_y
 	    - grub_font_get_xheight (combining_glyphs[i]->font);
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 249297863..ac8911827 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -69,6 +69,7 @@ enum grub_comb_type
     GRUB_UNICODE_STACK_ATTACHED_ABOVE = 214,
     GRUB_UNICODE_COMB_ATTACHED_ABOVE_RIGHT = 216,
     GRUB_UNICODE_STACK_BELOW = 220,
+    GRUB_UNICODE_COMB_BELOW_RIGHT = 222,
     GRUB_UNICODE_STACK_ABOVE = 230,
     GRUB_UNICODE_COMB_ABOVE_RIGHT = 232,
     GRUB_UNICODE_COMB_YPOGEGRAMMENI = 240,

From 7624beba471049c85d5f05094a4555a724022616 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 23 Mar 2010 19:13:46 +0100
Subject: [PATCH 0660/1628] Above left support. Various fixups

---
 font/font.c            | 41 ++++++++++++++++++++++++++---------------
 include/grub/unicode.h |  1 +
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/font/font.c b/font/font.c
index 5b573b852..992871c1e 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1122,7 +1122,9 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
   struct grub_video_signed_rect bounds;
   unsigned i;
   signed above_rightx, above_righty;
+  signed above_leftx, above_lefty;
   signed below_rightx, below_righty;
+  signed min_devwidth = 0;
   auto void NESTED_FUNC_ATTR do_blit (struct grub_font_glyph *src,
 				      signed dx, signed dy);
   void NESTED_FUNC_ATTR do_blit (struct grub_font_glyph *src,
@@ -1147,14 +1149,6 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
       bounds.height = src->height + (-src->height - dy) - bounds.y;
   }
 
-  auto void minimal_device_width (int val);
-  void minimal_device_width (int val)
-  {
-    if (glyph && glyph->device_width < val)
-      glyph->device_width = val;
-    if (device_width && *device_width < val)
-      *device_width = val;
-  }
   auto void add_device_width (int val);
   void add_device_width (int val)
   {
@@ -1174,9 +1168,12 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
   bounds.width = main_glyph->width;
   bounds.height = main_glyph->height;
 
-  above_rightx = bounds.x + bounds.width;
+  above_rightx = main_glyph->offset_x + main_glyph->width;
   above_righty = bounds.y + bounds.height;
 
+  above_leftx = main_glyph->offset_x;
+  above_lefty = bounds.y + bounds.height;
+
   below_rightx = bounds.x + bounds.width;
   below_righty = bounds.y;
 
@@ -1198,27 +1195,31 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 		   centerx,
 		   (bounds.height - combining_glyphs[i]->height) / 2
 		   -(bounds.height + bounds.y));
-	  minimal_device_width (combining_glyphs[i]->width);
+	  if (min_devwidth < combining_glyphs[i]->width)
+	    min_devwidth = combining_glyphs[i]->width;
 	  break;
 
 	case GRUB_UNICODE_COMB_ATTACHED_ABOVE_RIGHT:
 	  do_blit (combining_glyphs[i], above_rightx, -above_righty);
 	  above_rightx += combining_glyphs[i]->width;
-	  minimal_device_width (above_rightx);
 	  break;
 
 	case GRUB_UNICODE_COMB_ABOVE_RIGHT:
 	  do_blit (combining_glyphs[i], above_rightx,
 		   -(above_righty + combining_glyphs[i]->height));
 	  above_rightx += combining_glyphs[i]->width;
-	  minimal_device_width (above_rightx);
+	  break;
+
+	case GRUB_UNICODE_COMB_ABOVE_LEFT:
+	  above_leftx -= combining_glyphs[i]->width;
+	  do_blit (combining_glyphs[i], above_leftx,
+		   -(above_lefty + combining_glyphs[i]->height));
 	  break;
 
 	case GRUB_UNICODE_COMB_BELOW_RIGHT:
 	  do_blit (combining_glyphs[i], below_rightx,
 		   below_righty);
 	  below_rightx += combining_glyphs[i]->width;
-	  minimal_device_width (below_rightx);
 	  break;
 
 	case GRUB_UNICODE_STACK_ABOVE:
@@ -1231,7 +1232,8 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	  do_blit (combining_glyphs[i], centerx,
 		   -(bounds.height + bounds.y + space
 		     + combining_glyphs[i]->height));
-	  minimal_device_width (combining_glyphs[i]->width);
+	  if (min_devwidth < combining_glyphs[i]->width)
+	    min_devwidth = combining_glyphs[i]->width;
 	  break;
 
 	  /* I don't know how ypogegrammeni differs from subscript. */
@@ -1245,7 +1247,8 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	case GRUB_UNICODE_STACK_ATTACHED_BELOW:
 	  do_blit (combining_glyphs[i], centerx,
 		   -(bounds.y - space));
-	  minimal_device_width (combining_glyphs[i]->width);
+	  if (min_devwidth < combining_glyphs[i]->width)
+	    min_devwidth = combining_glyphs[i]->width;
 	  break;
 
 	default:
@@ -1263,6 +1266,14 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	  }
 	}
     }
+  add_device_width ((above_rightx > below_rightx ? above_rightx : below_rightx) 
+		    - (main_glyph->offset_x + main_glyph->width));
+  add_device_width (above_leftx - main_glyph->offset_x);
+  if (glyph && glyph->device_width < min_devwidth)
+      glyph->device_width = min_devwidth;
+  if (device_width && *device_width < min_devwidth)
+    *device_width = min_devwidth;
+
   if (bounds_out)
     *bounds_out = bounds;
 }
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index ac8911827..4e40d4648 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -70,6 +70,7 @@ enum grub_comb_type
     GRUB_UNICODE_COMB_ATTACHED_ABOVE_RIGHT = 216,
     GRUB_UNICODE_STACK_BELOW = 220,
     GRUB_UNICODE_COMB_BELOW_RIGHT = 222,
+    GRUB_UNICODE_COMB_ABOVE_LEFT = 228,
     GRUB_UNICODE_STACK_ABOVE = 230,
     GRUB_UNICODE_COMB_ABOVE_RIGHT = 232,
     GRUB_UNICODE_COMB_YPOGEGRAMMENI = 240,

From 832d13705c41a399130e90f85de007eb2c009577 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 23 Mar 2010 21:50:27 +0100
Subject: [PATCH 0661/1628] Most hebrew diacritics support (except dagesh and
 final kaf rules)

---
 font/font.c            | 52 +++++++++++++++++++++++++++++++++++++-----
 include/grub/unicode.h | 18 +++++++++++++++
 2 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/font/font.c b/font/font.c
index 992871c1e..1fc10aa91 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1180,7 +1180,8 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
   for (i = 0; i < glyph_id->ncomb; i++)
     {
       grub_int16_t space = 0;
-      grub_int16_t centerx = (bounds.width - combining_glyphs[i]->width) / 2
+      /* Center by default.  */
+      grub_int16_t targetx = (bounds.width - combining_glyphs[i]->width) / 2
 	+ bounds.x;
       
       if (!combining_glyphs[i])
@@ -1192,7 +1193,7 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	{
 	case GRUB_UNICODE_COMB_OVERLAY:
 	  do_blit (combining_glyphs[i],
-		   centerx,
+		   targetx,
 		   (bounds.height - combining_glyphs[i]->height) / 2
 		   -(bounds.height + bounds.y));
 	  if (min_devwidth < combining_glyphs[i]->width)
@@ -1222,20 +1223,59 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	  below_rightx += combining_glyphs[i]->width;
 	  break;
 
+	case GRUB_UNICODE_COMB_HEBREW_HOLAM:
+	  if (glyph_id->base != GRUB_UNICODE_HEBREW_WAW)
+	    targetx = main_glyph->offset_x - combining_glyphs[i]->width - (combining_glyphs[i]->width + 3) / 4;
+	  goto above_on_main;
+
+	case GRUB_UNICODE_COMB_HEBREW_SIN_DOT:
+	  targetx = main_glyph->offset_x + combining_glyphs[i]->width / 4;
+	  goto above_on_main;
+
+	case GRUB_UNICODE_COMB_HEBREW_SHIN_DOT:
+	  targetx = main_glyph->width + main_glyph->offset_x - combining_glyphs[i]->width;
+	above_on_main:
+	  space = combining_glyphs[i]->offset_y
+	    - grub_font_get_xheight (combining_glyphs[i]->font) - 1;
+	  if (space <= 0)
+	    space = 1 + (grub_font_get_xheight (main_glyph->font)) / 8;
+	  do_blit (combining_glyphs[i], targetx,
+		   -(main_glyph->height + main_glyph->offset_y + space
+		     + combining_glyphs[i]->height));
+	  if (min_devwidth < combining_glyphs[i]->width)
+	    min_devwidth = combining_glyphs[i]->width;
+	  break;
+
+	case GRUB_UNICODE_COMB_HEBREW_RAFE:
 	case GRUB_UNICODE_STACK_ABOVE:
 	  space = combining_glyphs[i]->offset_y
-	    - grub_font_get_xheight (combining_glyphs[i]->font);
-	  if (space < 0)
+	    - grub_font_get_xheight (combining_glyphs[i]->font) - 1;
+	  if (space <= 0)
 	    space = 1 + (grub_font_get_xheight (main_glyph->font)) / 8;
 	    
 	case GRUB_UNICODE_STACK_ATTACHED_ABOVE:	    
-	  do_blit (combining_glyphs[i], centerx,
+	  do_blit (combining_glyphs[i], targetx,
 		   -(bounds.height + bounds.y + space
 		     + combining_glyphs[i]->height));
 	  if (min_devwidth < combining_glyphs[i]->width)
 	    min_devwidth = combining_glyphs[i]->width;
 	  break;
 
+	case GRUB_UNICODE_COMB_HEBREW_SHEVA:
+	case GRUB_UNICODE_COMB_HEBREW_HIRIQ:
+	case GRUB_UNICODE_COMB_HEBREW_QAMATS:
+	case GRUB_UNICODE_COMB_HEBREW_TSERE:
+	case GRUB_UNICODE_COMB_HEBREW_SEGOL:
+	  /* , 
+	     GRUB_UNICODE_COMB_HEBREW_DAGESH = 21*/
+	  /* TODO: placement in final kaf and under reish.  */
+
+	case GRUB_UNICODE_COMB_HEBREW_HATAF_SEGOL:
+	case GRUB_UNICODE_COMB_HEBREW_HATAF_PATAH:
+	case GRUB_UNICODE_COMB_HEBREW_HATAF_QAMATS:
+	case GRUB_UNICODE_COMB_HEBREW_PATAH:
+	case GRUB_UNICODE_COMB_HEBREW_QUBUTS:
+	case GRUB_UNICODE_COMB_HEBREW_METEG:
 	  /* I don't know how ypogegrammeni differs from subscript. */
 	case GRUB_UNICODE_COMB_YPOGEGRAMMENI:
 	case GRUB_UNICODE_STACK_BELOW:
@@ -1245,7 +1285,7 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	    space = 1 + (grub_font_get_xheight (main_glyph->font)) / 8;
 	  
 	case GRUB_UNICODE_STACK_ATTACHED_BELOW:
-	  do_blit (combining_glyphs[i], centerx,
+	  do_blit (combining_glyphs[i], targetx,
 		   -(bounds.y - space));
 	  if (min_devwidth < combining_glyphs[i]->width)
 	    min_devwidth = combining_glyphs[i]->width;
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 4e40d4648..457bcd93b 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -65,6 +65,23 @@ enum grub_comb_type
   {
     GRUB_UNICODE_COMB_NONE = 0,
     GRUB_UNICODE_COMB_OVERLAY = 1,
+    GRUB_UNICODE_COMB_HEBREW_SHEVA = 10,
+    GRUB_UNICODE_COMB_HEBREW_HATAF_SEGOL = 11,
+    GRUB_UNICODE_COMB_HEBREW_HATAF_PATAH = 12,
+    GRUB_UNICODE_COMB_HEBREW_HATAF_QAMATS = 13,
+    GRUB_UNICODE_COMB_HEBREW_HIRIQ = 14,
+    GRUB_UNICODE_COMB_HEBREW_TSERE = 15,
+    GRUB_UNICODE_COMB_HEBREW_SEGOL = 16,
+    GRUB_UNICODE_COMB_HEBREW_PATAH = 17,
+    GRUB_UNICODE_COMB_HEBREW_QAMATS = 18,
+    GRUB_UNICODE_COMB_HEBREW_HOLAM = 19,
+    GRUB_UNICODE_COMB_HEBREW_QUBUTS = 20,
+    GRUB_UNICODE_COMB_HEBREW_DAGESH = 21,
+    GRUB_UNICODE_COMB_HEBREW_METEG = 22,
+    GRUB_UNICODE_COMB_HEBREW_RAFE = 23,
+    GRUB_UNICODE_COMB_HEBREW_SHIN_DOT = 24,
+    GRUB_UNICODE_COMB_HEBREW_SIN_DOT = 25,
+    GRUB_UNICODE_COMB_HEBREW_VARIKA = 26,
     GRUB_UNICODE_STACK_ATTACHED_BELOW = 202,
     GRUB_UNICODE_STACK_ATTACHED_ABOVE = 214,
     GRUB_UNICODE_COMB_ATTACHED_ABOVE_RIGHT = 216,
@@ -103,6 +120,7 @@ struct grub_unicode_glyph
 #define GRUB_UNICODE_VARIATION_SELECTOR_16 0xfe0f
 #define GRUB_UNICODE_VARIATION_SELECTOR_17 0xe0100
 #define GRUB_UNICODE_VARIATION_SELECTOR_256 0xe01ef
+#define GRUB_UNICODE_HEBREW_WAW  0x05d5
 
 extern struct grub_unicode_compact_range grub_unicode_compact[];
 extern struct grub_unicode_bidi_pair grub_unicode_bidi_pairs[];

From 521bf3018f6e8927c451824fa08a041b169c6cf9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 23 Mar 2010 23:19:27 +0100
Subject: [PATCH 0662/1628] Add character properties checking and a comment
 about problematic characters

---
 normal/charset.c       | 19 +++++++++++++++++++
 util/import_unicode.py | 23 +++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/normal/charset.c b/normal/charset.c
index 7c455a357..00bbcb815 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -16,6 +16,25 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+  Current problems with Unicode rendering: 
+  - B and BN bidi type characters (ignored)
+  - Mc type characters with combining class 0 (treated as non-combining)
+  - Mn type characters with combining class 0 (treated as non-combining)
+  - Me type characters with combining class 0 (treated as non-combining)
+  - Cf type characters (ignored)
+  - Cc type characters (ignored)
+  - Line-breaking rules (e.g. Zs type characters)
+  - Indic languages
+  - Arabic shaping
+  - Zl and Zp characters
+  - Combining characters of types 7, 8, 9, 21, 27, 28, 29, 30, 31,
+  32, 33, 34, 35, 36, 84, 91, 103, 107, 118, 122, 129, 130, 132,
+  218, 224, 226, 233, 234
+  - Private use surrogates
+  - Private use characters (not really a problem)
+ */
+
 /* Convert a (possibly null-terminated) UTF-8 string of at most SRCSIZE
    bytes (if SRCSIZE is -1, it is ignored) in length to a UTF-16 string.
    Return the number of characters converted. DEST must be able to hold
diff --git a/util/import_unicode.py b/util/import_unicode.py
index 0fc36c5c2..e0e53b655 100644
--- a/util/import_unicode.py
+++ b/util/import_unicode.py
@@ -45,12 +45,35 @@ for line in infile:
         print ("UnicodeData.txt uses combination type %d. Conflict." \
                    % curcombtype)
         raise
+    if sp[2] != "Lu" and sp[2] != "Ll" and sp[2] != "Lt" and sp[2] != "Lm" \
+            and sp[2] != "Lo"\
+            and sp[2] != "Me" and sp[2] != "Mc" and sp[2] != "Mn" \
+            and sp[2] != "Nd" and sp[2] != "Nl" and sp[2] != "No" \
+            and sp[2] != "Pc" and sp[2] != "Pd" and sp[2] != "Ps" \
+            and sp[2] != "Pe" and sp[2] != "Pi" and sp[2] != "Pf" \
+            and sp[2] != "Po" \
+            and sp[2] != "Sm" and sp[2] != "Sc" and sp[2] != "Sk" \
+            and sp[2] != "So"\
+            and sp[2] != "Zs" and sp[2] != "Zl" and sp[2] != "Zp" \
+            and sp[2] != "Cc" and sp[2] != "Cf" and sp[2] != "Cs" \
+            and sp[2] != "Co":
+        print ("WARNING: Unknown type %s" % sp[2])
     if curcombtype == 0 and sp[2] == "Me":
         curcombtype = 253
     if curcombtype == 0 and sp[2] == "Mc":
         curcombtype = 254
     if curcombtype == 0 and sp[2] == "Mn":
         curcombtype = 255
+    if (curcombtype >= 2 and curcombtype <= 6) \
+            or (curcombtype >= 37 and curcombtype != 84 and curcombtype != 91  and curcombtype != 103 and curcombtype != 107 and curcombtype != 118 and curcombtype != 122 and curcombtype != 129 and curcombtype != 130 and curcombtype != 132 and curcombtype != 202 and \
+                curcombtype != 214 and curcombtype != 216 and \
+                curcombtype != 218 and curcombtype != 220 and \
+                curcombtype != 222 and curcombtype != 224 and curcombtype != 226 and curcombtype != 228 and \
+                curcombtype != 230 and curcombtype != 232 and curcombtype != 233 and \
+                curcombtype != 234 and \
+                curcombtype != 240 and curcombtype != 253 and \
+                curcombtype != 254 and curcombtype != 255):
+        print ("WARNING: Unknown combining type %d" % curcombtype)
     if lastcode + 1 != curcode or curbiditype != lastbiditype \
             or curcombtype != lastcombtype or curmirrortype != lastmirrortype:
         if begincode != -2 and (lastbiditype != "L" or lastcombtype != 0 or \

From 6fd346ea6c74028c7b9d8ab554ecc9898b2eff06 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 23 Mar 2010 23:20:35 +0100
Subject: [PATCH 0663/1628] Update UnicodeData.txt

---
 util/UnicodeData.txt | 3377 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 2935 insertions(+), 442 deletions(-)

diff --git a/util/UnicodeData.txt b/util/UnicodeData.txt
index 77db788cf..6b01d90a7 100644
--- a/util/UnicodeData.txt
+++ b/util/UnicodeData.txt
@@ -169,7 +169,7 @@
 00A8;DIAERESIS;Sk;0;ON;<compat> 0020 0308;;;;N;SPACING DIAERESIS;;;;
 00A9;COPYRIGHT SIGN;So;0;ON;;;;;N;;;;;
 00AA;FEMININE ORDINAL INDICATOR;Ll;0;L;<super> 0061;;;;N;;;;;
-00AB;LEFT-POINTING DOUBLE ANGLE QUOTATION MARK;Pi;0;ON;;;;;Y;LEFT POINTING GUILLEMET;*;;;
+00AB;LEFT-POINTING DOUBLE ANGLE QUOTATION MARK;Pi;0;ON;;;;;Y;LEFT POINTING GUILLEMET;;;;
 00AC;NOT SIGN;Sm;0;ON;;;;;N;;;;;
 00AD;SOFT HYPHEN;Cf;0;BN;;;;;N;;;;;
 00AE;REGISTERED SIGN;So;0;ON;;;;;N;REGISTERED TRADE MARK SIGN;;;;
@@ -185,7 +185,7 @@
 00B8;CEDILLA;Sk;0;ON;<compat> 0020 0327;;;;N;SPACING CEDILLA;;;;
 00B9;SUPERSCRIPT ONE;No;0;EN;<super> 0031;;1;1;N;SUPERSCRIPT DIGIT ONE;;;;
 00BA;MASCULINE ORDINAL INDICATOR;Ll;0;L;<super> 006F;;;;N;;;;;
-00BB;RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK;Pf;0;ON;;;;;Y;RIGHT POINTING GUILLEMET;*;;;
+00BB;RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK;Pf;0;ON;;;;;Y;RIGHT POINTING GUILLEMET;;;;
 00BC;VULGAR FRACTION ONE QUARTER;No;0;ON;<fraction> 0031 2044 0034;;;1/4;N;FRACTION ONE QUARTER;;;;
 00BD;VULGAR FRACTION ONE HALF;No;0;ON;<fraction> 0031 2044 0032;;;1/2;N;FRACTION ONE HALF;;;;
 00BE;VULGAR FRACTION THREE QUARTERS;No;0;ON;<fraction> 0033 2044 0034;;;3/4;N;FRACTION THREE QUARTERS;;;;
@@ -196,7 +196,7 @@
 00C3;LATIN CAPITAL LETTER A WITH TILDE;Lu;0;L;0041 0303;;;;N;LATIN CAPITAL LETTER A TILDE;;;00E3;
 00C4;LATIN CAPITAL LETTER A WITH DIAERESIS;Lu;0;L;0041 0308;;;;N;LATIN CAPITAL LETTER A DIAERESIS;;;00E4;
 00C5;LATIN CAPITAL LETTER A WITH RING ABOVE;Lu;0;L;0041 030A;;;;N;LATIN CAPITAL LETTER A RING;;;00E5;
-00C6;LATIN CAPITAL LETTER AE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER A E;ash *;;00E6;
+00C6;LATIN CAPITAL LETTER AE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER A E;;;00E6;
 00C7;LATIN CAPITAL LETTER C WITH CEDILLA;Lu;0;L;0043 0327;;;;N;LATIN CAPITAL LETTER C CEDILLA;;;00E7;
 00C8;LATIN CAPITAL LETTER E WITH GRAVE;Lu;0;L;0045 0300;;;;N;LATIN CAPITAL LETTER E GRAVE;;;00E8;
 00C9;LATIN CAPITAL LETTER E WITH ACUTE;Lu;0;L;0045 0301;;;;N;LATIN CAPITAL LETTER E ACUTE;;;00E9;
@@ -206,7 +206,7 @@
 00CD;LATIN CAPITAL LETTER I WITH ACUTE;Lu;0;L;0049 0301;;;;N;LATIN CAPITAL LETTER I ACUTE;;;00ED;
 00CE;LATIN CAPITAL LETTER I WITH CIRCUMFLEX;Lu;0;L;0049 0302;;;;N;LATIN CAPITAL LETTER I CIRCUMFLEX;;;00EE;
 00CF;LATIN CAPITAL LETTER I WITH DIAERESIS;Lu;0;L;0049 0308;;;;N;LATIN CAPITAL LETTER I DIAERESIS;;;00EF;
-00D0;LATIN CAPITAL LETTER ETH;Lu;0;L;;;;;N;;Icelandic;;00F0;
+00D0;LATIN CAPITAL LETTER ETH;Lu;0;L;;;;;N;;;;00F0;
 00D1;LATIN CAPITAL LETTER N WITH TILDE;Lu;0;L;004E 0303;;;;N;LATIN CAPITAL LETTER N TILDE;;;00F1;
 00D2;LATIN CAPITAL LETTER O WITH GRAVE;Lu;0;L;004F 0300;;;;N;LATIN CAPITAL LETTER O GRAVE;;;00F2;
 00D3;LATIN CAPITAL LETTER O WITH ACUTE;Lu;0;L;004F 0301;;;;N;LATIN CAPITAL LETTER O ACUTE;;;00F3;
@@ -220,15 +220,15 @@
 00DB;LATIN CAPITAL LETTER U WITH CIRCUMFLEX;Lu;0;L;0055 0302;;;;N;LATIN CAPITAL LETTER U CIRCUMFLEX;;;00FB;
 00DC;LATIN CAPITAL LETTER U WITH DIAERESIS;Lu;0;L;0055 0308;;;;N;LATIN CAPITAL LETTER U DIAERESIS;;;00FC;
 00DD;LATIN CAPITAL LETTER Y WITH ACUTE;Lu;0;L;0059 0301;;;;N;LATIN CAPITAL LETTER Y ACUTE;;;00FD;
-00DE;LATIN CAPITAL LETTER THORN;Lu;0;L;;;;;N;;Icelandic;;00FE;
-00DF;LATIN SMALL LETTER SHARP S;Ll;0;L;;;;;N;;German;;;
+00DE;LATIN CAPITAL LETTER THORN;Lu;0;L;;;;;N;;;;00FE;
+00DF;LATIN SMALL LETTER SHARP S;Ll;0;L;;;;;N;;;;;
 00E0;LATIN SMALL LETTER A WITH GRAVE;Ll;0;L;0061 0300;;;;N;LATIN SMALL LETTER A GRAVE;;00C0;;00C0
 00E1;LATIN SMALL LETTER A WITH ACUTE;Ll;0;L;0061 0301;;;;N;LATIN SMALL LETTER A ACUTE;;00C1;;00C1
 00E2;LATIN SMALL LETTER A WITH CIRCUMFLEX;Ll;0;L;0061 0302;;;;N;LATIN SMALL LETTER A CIRCUMFLEX;;00C2;;00C2
 00E3;LATIN SMALL LETTER A WITH TILDE;Ll;0;L;0061 0303;;;;N;LATIN SMALL LETTER A TILDE;;00C3;;00C3
 00E4;LATIN SMALL LETTER A WITH DIAERESIS;Ll;0;L;0061 0308;;;;N;LATIN SMALL LETTER A DIAERESIS;;00C4;;00C4
 00E5;LATIN SMALL LETTER A WITH RING ABOVE;Ll;0;L;0061 030A;;;;N;LATIN SMALL LETTER A RING;;00C5;;00C5
-00E6;LATIN SMALL LETTER AE;Ll;0;L;;;;;N;LATIN SMALL LETTER A E;ash *;00C6;;00C6
+00E6;LATIN SMALL LETTER AE;Ll;0;L;;;;;N;LATIN SMALL LETTER A E;;00C6;;00C6
 00E7;LATIN SMALL LETTER C WITH CEDILLA;Ll;0;L;0063 0327;;;;N;LATIN SMALL LETTER C CEDILLA;;00C7;;00C7
 00E8;LATIN SMALL LETTER E WITH GRAVE;Ll;0;L;0065 0300;;;;N;LATIN SMALL LETTER E GRAVE;;00C8;;00C8
 00E9;LATIN SMALL LETTER E WITH ACUTE;Ll;0;L;0065 0301;;;;N;LATIN SMALL LETTER E ACUTE;;00C9;;00C9
@@ -238,7 +238,7 @@
 00ED;LATIN SMALL LETTER I WITH ACUTE;Ll;0;L;0069 0301;;;;N;LATIN SMALL LETTER I ACUTE;;00CD;;00CD
 00EE;LATIN SMALL LETTER I WITH CIRCUMFLEX;Ll;0;L;0069 0302;;;;N;LATIN SMALL LETTER I CIRCUMFLEX;;00CE;;00CE
 00EF;LATIN SMALL LETTER I WITH DIAERESIS;Ll;0;L;0069 0308;;;;N;LATIN SMALL LETTER I DIAERESIS;;00CF;;00CF
-00F0;LATIN SMALL LETTER ETH;Ll;0;L;;;;;N;;Icelandic;00D0;;00D0
+00F0;LATIN SMALL LETTER ETH;Ll;0;L;;;;;N;;;00D0;;00D0
 00F1;LATIN SMALL LETTER N WITH TILDE;Ll;0;L;006E 0303;;;;N;LATIN SMALL LETTER N TILDE;;00D1;;00D1
 00F2;LATIN SMALL LETTER O WITH GRAVE;Ll;0;L;006F 0300;;;;N;LATIN SMALL LETTER O GRAVE;;00D2;;00D2
 00F3;LATIN SMALL LETTER O WITH ACUTE;Ll;0;L;006F 0301;;;;N;LATIN SMALL LETTER O ACUTE;;00D3;;00D3
@@ -252,7 +252,7 @@
 00FB;LATIN SMALL LETTER U WITH CIRCUMFLEX;Ll;0;L;0075 0302;;;;N;LATIN SMALL LETTER U CIRCUMFLEX;;00DB;;00DB
 00FC;LATIN SMALL LETTER U WITH DIAERESIS;Ll;0;L;0075 0308;;;;N;LATIN SMALL LETTER U DIAERESIS;;00DC;;00DC
 00FD;LATIN SMALL LETTER Y WITH ACUTE;Ll;0;L;0079 0301;;;;N;LATIN SMALL LETTER Y ACUTE;;00DD;;00DD
-00FE;LATIN SMALL LETTER THORN;Ll;0;L;;;;;N;;Icelandic;00DE;;00DE
+00FE;LATIN SMALL LETTER THORN;Ll;0;L;;;;;N;;;00DE;;00DE
 00FF;LATIN SMALL LETTER Y WITH DIAERESIS;Ll;0;L;0079 0308;;;;N;LATIN SMALL LETTER Y DIAERESIS;;0178;;0178
 0100;LATIN CAPITAL LETTER A WITH MACRON;Lu;0;L;0041 0304;;;;N;LATIN CAPITAL LETTER A MACRON;;;0101;
 0101;LATIN SMALL LETTER A WITH MACRON;Ll;0;L;0061 0304;;;;N;LATIN SMALL LETTER A MACRON;;0100;;0100
@@ -310,7 +310,7 @@
 0135;LATIN SMALL LETTER J WITH CIRCUMFLEX;Ll;0;L;006A 0302;;;;N;LATIN SMALL LETTER J CIRCUMFLEX;;0134;;0134
 0136;LATIN CAPITAL LETTER K WITH CEDILLA;Lu;0;L;004B 0327;;;;N;LATIN CAPITAL LETTER K CEDILLA;;;0137;
 0137;LATIN SMALL LETTER K WITH CEDILLA;Ll;0;L;006B 0327;;;;N;LATIN SMALL LETTER K CEDILLA;;0136;;0136
-0138;LATIN SMALL LETTER KRA;Ll;0;L;;;;;N;;Greenlandic;;;
+0138;LATIN SMALL LETTER KRA;Ll;0;L;;;;;N;;;;;
 0139;LATIN CAPITAL LETTER L WITH ACUTE;Lu;0;L;004C 0301;;;;N;LATIN CAPITAL LETTER L ACUTE;;;013A;
 013A;LATIN SMALL LETTER L WITH ACUTE;Ll;0;L;006C 0301;;;;N;LATIN SMALL LETTER L ACUTE;;0139;;0139
 013B;LATIN CAPITAL LETTER L WITH CEDILLA;Lu;0;L;004C 0327;;;;N;LATIN CAPITAL LETTER L CEDILLA;;;013C;
@@ -328,8 +328,8 @@
 0147;LATIN CAPITAL LETTER N WITH CARON;Lu;0;L;004E 030C;;;;N;LATIN CAPITAL LETTER N HACEK;;;0148;
 0148;LATIN SMALL LETTER N WITH CARON;Ll;0;L;006E 030C;;;;N;LATIN SMALL LETTER N HACEK;;0147;;0147
 0149;LATIN SMALL LETTER N PRECEDED BY APOSTROPHE;Ll;0;L;<compat> 02BC 006E;;;;N;LATIN SMALL LETTER APOSTROPHE N;;;;
-014A;LATIN CAPITAL LETTER ENG;Lu;0;L;;;;;N;;Sami;;014B;
-014B;LATIN SMALL LETTER ENG;Ll;0;L;;;;;N;;Sami;014A;;014A
+014A;LATIN CAPITAL LETTER ENG;Lu;0;L;;;;;N;;;;014B;
+014B;LATIN SMALL LETTER ENG;Ll;0;L;;;;;N;;;014A;;014A
 014C;LATIN CAPITAL LETTER O WITH MACRON;Lu;0;L;004F 0304;;;;N;LATIN CAPITAL LETTER O MACRON;;;014D;
 014D;LATIN SMALL LETTER O WITH MACRON;Ll;0;L;006F 0304;;;;N;LATIN SMALL LETTER O MACRON;;014C;;014C
 014E;LATIN CAPITAL LETTER O WITH BREVE;Lu;0;L;004F 0306;;;;N;LATIN CAPITAL LETTER O BREVE;;;014F;
@@ -348,12 +348,12 @@
 015B;LATIN SMALL LETTER S WITH ACUTE;Ll;0;L;0073 0301;;;;N;LATIN SMALL LETTER S ACUTE;;015A;;015A
 015C;LATIN CAPITAL LETTER S WITH CIRCUMFLEX;Lu;0;L;0053 0302;;;;N;LATIN CAPITAL LETTER S CIRCUMFLEX;;;015D;
 015D;LATIN SMALL LETTER S WITH CIRCUMFLEX;Ll;0;L;0073 0302;;;;N;LATIN SMALL LETTER S CIRCUMFLEX;;015C;;015C
-015E;LATIN CAPITAL LETTER S WITH CEDILLA;Lu;0;L;0053 0327;;;;N;LATIN CAPITAL LETTER S CEDILLA;*;;015F;
-015F;LATIN SMALL LETTER S WITH CEDILLA;Ll;0;L;0073 0327;;;;N;LATIN SMALL LETTER S CEDILLA;*;015E;;015E
+015E;LATIN CAPITAL LETTER S WITH CEDILLA;Lu;0;L;0053 0327;;;;N;LATIN CAPITAL LETTER S CEDILLA;;;015F;
+015F;LATIN SMALL LETTER S WITH CEDILLA;Ll;0;L;0073 0327;;;;N;LATIN SMALL LETTER S CEDILLA;;015E;;015E
 0160;LATIN CAPITAL LETTER S WITH CARON;Lu;0;L;0053 030C;;;;N;LATIN CAPITAL LETTER S HACEK;;;0161;
 0161;LATIN SMALL LETTER S WITH CARON;Ll;0;L;0073 030C;;;;N;LATIN SMALL LETTER S HACEK;;0160;;0160
-0162;LATIN CAPITAL LETTER T WITH CEDILLA;Lu;0;L;0054 0327;;;;N;LATIN CAPITAL LETTER T CEDILLA;*;;0163;
-0163;LATIN SMALL LETTER T WITH CEDILLA;Ll;0;L;0074 0327;;;;N;LATIN SMALL LETTER T CEDILLA;*;0162;;0162
+0162;LATIN CAPITAL LETTER T WITH CEDILLA;Lu;0;L;0054 0327;;;;N;LATIN CAPITAL LETTER T CEDILLA;;;0163;
+0163;LATIN SMALL LETTER T WITH CEDILLA;Ll;0;L;0074 0327;;;;N;LATIN SMALL LETTER T CEDILLA;;0162;;0162
 0164;LATIN CAPITAL LETTER T WITH CARON;Lu;0;L;0054 030C;;;;N;LATIN CAPITAL LETTER T HACEK;;;0165;
 0165;LATIN SMALL LETTER T WITH CARON;Ll;0;L;0074 030C;;;;N;LATIN SMALL LETTER T HACEK;;0164;;0164
 0166;LATIN CAPITAL LETTER T WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER T BAR;;;0167;
@@ -391,7 +391,7 @@
 0186;LATIN CAPITAL LETTER OPEN O;Lu;0;L;;;;;N;;;;0254;
 0187;LATIN CAPITAL LETTER C WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER C HOOK;;;0188;
 0188;LATIN SMALL LETTER C WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER C HOOK;;0187;;0187
-0189;LATIN CAPITAL LETTER AFRICAN D;Lu;0;L;;;;;N;;*;;0256;
+0189;LATIN CAPITAL LETTER AFRICAN D;Lu;0;L;;;;;N;;;;0256;
 018A;LATIN CAPITAL LETTER D WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D HOOK;;;0257;
 018B;LATIN CAPITAL LETTER D WITH TOPBAR;Lu;0;L;;;;;N;LATIN CAPITAL LETTER D TOPBAR;;;018C;
 018C;LATIN SMALL LETTER D WITH TOPBAR;Ll;0;L;;;;;N;LATIN SMALL LETTER D TOPBAR;;018B;;018B
@@ -403,7 +403,7 @@
 0192;LATIN SMALL LETTER F WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT F;;0191;;0191
 0193;LATIN CAPITAL LETTER G WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER G HOOK;;;0260;
 0194;LATIN CAPITAL LETTER GAMMA;Lu;0;L;;;;;N;;;;0263;
-0195;LATIN SMALL LETTER HV;Ll;0;L;;;;;N;LATIN SMALL LETTER H V;hwair;01F6;;01F6
+0195;LATIN SMALL LETTER HV;Ll;0;L;;;;;N;LATIN SMALL LETTER H V;;01F6;;01F6
 0196;LATIN CAPITAL LETTER IOTA;Lu;0;L;;;;;N;;;;0269;
 0197;LATIN CAPITAL LETTER I WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER BARRED I;;;0268;
 0198;LATIN CAPITAL LETTER K WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER K HOOK;;;0199;
@@ -413,14 +413,14 @@
 019C;LATIN CAPITAL LETTER TURNED M;Lu;0;L;;;;;N;;;;026F;
 019D;LATIN CAPITAL LETTER N WITH LEFT HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER N HOOK;;;0272;
 019E;LATIN SMALL LETTER N WITH LONG RIGHT LEG;Ll;0;L;;;;;N;;;0220;;0220
-019F;LATIN CAPITAL LETTER O WITH MIDDLE TILDE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER BARRED O;*;;0275;
+019F;LATIN CAPITAL LETTER O WITH MIDDLE TILDE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER BARRED O;;;0275;
 01A0;LATIN CAPITAL LETTER O WITH HORN;Lu;0;L;004F 031B;;;;N;LATIN CAPITAL LETTER O HORN;;;01A1;
 01A1;LATIN SMALL LETTER O WITH HORN;Ll;0;L;006F 031B;;;;N;LATIN SMALL LETTER O HORN;;01A0;;01A0
-01A2;LATIN CAPITAL LETTER OI;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O I;gha;;01A3;
-01A3;LATIN SMALL LETTER OI;Ll;0;L;;;;;N;LATIN SMALL LETTER O I;gha;01A2;;01A2
+01A2;LATIN CAPITAL LETTER OI;Lu;0;L;;;;;N;LATIN CAPITAL LETTER O I;;;01A3;
+01A3;LATIN SMALL LETTER OI;Ll;0;L;;;;;N;LATIN SMALL LETTER O I;;01A2;;01A2
 01A4;LATIN CAPITAL LETTER P WITH HOOK;Lu;0;L;;;;;N;LATIN CAPITAL LETTER P HOOK;;;01A5;
 01A5;LATIN SMALL LETTER P WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER P HOOK;;01A4;;01A4
-01A6;LATIN LETTER YR;Lu;0;L;;;;;N;LATIN LETTER Y R;*;;0280;
+01A6;LATIN LETTER YR;Lu;0;L;;;;;N;LATIN LETTER Y R;;;0280;
 01A7;LATIN CAPITAL LETTER TONE TWO;Lu;0;L;;;;;N;;;;01A8;
 01A8;LATIN SMALL LETTER TONE TWO;Ll;0;L;;;;;N;;;01A7;;01A7
 01A9;LATIN CAPITAL LETTER ESH;Lu;0;L;;;;;N;;;;0283;
@@ -480,8 +480,8 @@
 01DF;LATIN SMALL LETTER A WITH DIAERESIS AND MACRON;Ll;0;L;00E4 0304;;;;N;LATIN SMALL LETTER A DIAERESIS MACRON;;01DE;;01DE
 01E0;LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON;Lu;0;L;0226 0304;;;;N;LATIN CAPITAL LETTER A DOT MACRON;;;01E1;
 01E1;LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON;Ll;0;L;0227 0304;;;;N;LATIN SMALL LETTER A DOT MACRON;;01E0;;01E0
-01E2;LATIN CAPITAL LETTER AE WITH MACRON;Lu;0;L;00C6 0304;;;;N;LATIN CAPITAL LETTER A E MACRON;ash *;;01E3;
-01E3;LATIN SMALL LETTER AE WITH MACRON;Ll;0;L;00E6 0304;;;;N;LATIN SMALL LETTER A E MACRON;ash *;01E2;;01E2
+01E2;LATIN CAPITAL LETTER AE WITH MACRON;Lu;0;L;00C6 0304;;;;N;LATIN CAPITAL LETTER A E MACRON;;;01E3;
+01E3;LATIN SMALL LETTER AE WITH MACRON;Ll;0;L;00E6 0304;;;;N;LATIN SMALL LETTER A E MACRON;;01E2;;01E2
 01E4;LATIN CAPITAL LETTER G WITH STROKE;Lu;0;L;;;;;N;LATIN CAPITAL LETTER G BAR;;;01E5;
 01E5;LATIN SMALL LETTER G WITH STROKE;Ll;0;L;;;;;N;LATIN SMALL LETTER G BAR;;01E4;;01E4
 01E6;LATIN CAPITAL LETTER G WITH CARON;Lu;0;L;0047 030C;;;;N;LATIN CAPITAL LETTER G HACEK;;;01E7;
@@ -506,8 +506,8 @@
 01F9;LATIN SMALL LETTER N WITH GRAVE;Ll;0;L;006E 0300;;;;N;;;01F8;;01F8
 01FA;LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE;Lu;0;L;00C5 0301;;;;N;;;;01FB;
 01FB;LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE;Ll;0;L;00E5 0301;;;;N;;;01FA;;01FA
-01FC;LATIN CAPITAL LETTER AE WITH ACUTE;Lu;0;L;00C6 0301;;;;N;;ash *;;01FD;
-01FD;LATIN SMALL LETTER AE WITH ACUTE;Ll;0;L;00E6 0301;;;;N;;ash *;01FC;;01FC
+01FC;LATIN CAPITAL LETTER AE WITH ACUTE;Lu;0;L;00C6 0301;;;;N;;;;01FD;
+01FD;LATIN SMALL LETTER AE WITH ACUTE;Ll;0;L;00E6 0301;;;;N;;;01FC;;01FC
 01FE;LATIN CAPITAL LETTER O WITH STROKE AND ACUTE;Lu;0;L;00D8 0301;;;;N;;;;01FF;
 01FF;LATIN SMALL LETTER O WITH STROKE AND ACUTE;Ll;0;L;00F8 0301;;;;N;;;01FE;;01FE
 0200;LATIN CAPITAL LETTER A WITH DOUBLE GRAVE;Lu;0;L;0041 030F;;;;N;;;;0201;
@@ -534,10 +534,10 @@
 0215;LATIN SMALL LETTER U WITH DOUBLE GRAVE;Ll;0;L;0075 030F;;;;N;;;0214;;0214
 0216;LATIN CAPITAL LETTER U WITH INVERTED BREVE;Lu;0;L;0055 0311;;;;N;;;;0217;
 0217;LATIN SMALL LETTER U WITH INVERTED BREVE;Ll;0;L;0075 0311;;;;N;;;0216;;0216
-0218;LATIN CAPITAL LETTER S WITH COMMA BELOW;Lu;0;L;0053 0326;;;;N;;*;;0219;
-0219;LATIN SMALL LETTER S WITH COMMA BELOW;Ll;0;L;0073 0326;;;;N;;*;0218;;0218
-021A;LATIN CAPITAL LETTER T WITH COMMA BELOW;Lu;0;L;0054 0326;;;;N;;*;;021B;
-021B;LATIN SMALL LETTER T WITH COMMA BELOW;Ll;0;L;0074 0326;;;;N;;*;021A;;021A
+0218;LATIN CAPITAL LETTER S WITH COMMA BELOW;Lu;0;L;0053 0326;;;;N;;;;0219;
+0219;LATIN SMALL LETTER S WITH COMMA BELOW;Ll;0;L;0073 0326;;;;N;;;0218;;0218
+021A;LATIN CAPITAL LETTER T WITH COMMA BELOW;Lu;0;L;0054 0326;;;;N;;;;021B;
+021B;LATIN SMALL LETTER T WITH COMMA BELOW;Ll;0;L;0074 0326;;;;N;;;021A;;021A
 021C;LATIN CAPITAL LETTER YOGH;Lu;0;L;;;;;N;;;;021D;
 021D;LATIN SMALL LETTER YOGH;Ll;0;L;;;;;N;;;021C;;021C
 021E;LATIN CAPITAL LETTER H WITH CARON;Lu;0;L;0048 030C;;;;N;;;;021F;
@@ -573,8 +573,8 @@
 023C;LATIN SMALL LETTER C WITH STROKE;Ll;0;L;;;;;N;;;023B;;023B
 023D;LATIN CAPITAL LETTER L WITH BAR;Lu;0;L;;;;;N;;;;019A;
 023E;LATIN CAPITAL LETTER T WITH DIAGONAL STROKE;Lu;0;L;;;;;N;;;;2C66;
-023F;LATIN SMALL LETTER S WITH SWASH TAIL;Ll;0;L;;;;;N;;;;;
-0240;LATIN SMALL LETTER Z WITH SWASH TAIL;Ll;0;L;;;;;N;;;;;
+023F;LATIN SMALL LETTER S WITH SWASH TAIL;Ll;0;L;;;;;N;;;2C7E;;2C7E
+0240;LATIN SMALL LETTER Z WITH SWASH TAIL;Ll;0;L;;;;;N;;;2C7F;;2C7F
 0241;LATIN CAPITAL LETTER GLOTTAL STOP;Lu;0;L;;;;;N;;;;0242;
 0242;LATIN SMALL LETTER GLOTTAL STOP;Ll;0;L;;;;;N;;;0241;;0241
 0243;LATIN CAPITAL LETTER B WITH STROKE;Lu;0;L;;;;;N;;;;0180;
@@ -592,7 +592,7 @@
 024F;LATIN SMALL LETTER Y WITH STROKE;Ll;0;L;;;;;N;;;024E;;024E
 0250;LATIN SMALL LETTER TURNED A;Ll;0;L;;;;;N;;;2C6F;;2C6F
 0251;LATIN SMALL LETTER ALPHA;Ll;0;L;;;;;N;LATIN SMALL LETTER SCRIPT A;;2C6D;;2C6D
-0252;LATIN SMALL LETTER TURNED ALPHA;Ll;0;L;;;;;N;LATIN SMALL LETTER TURNED SCRIPT A;;;;
+0252;LATIN SMALL LETTER TURNED ALPHA;Ll;0;L;;;;;N;LATIN SMALL LETTER TURNED SCRIPT A;;2C70;;2C70
 0253;LATIN SMALL LETTER B WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER B HOOK;;0181;;0181
 0254;LATIN SMALL LETTER OPEN O;Ll;0;L;;;;;N;;;0186;;0186
 0255;LATIN SMALL LETTER C WITH CURL;Ll;0;L;;;;;N;LATIN SMALL LETTER C CURL;;;;
@@ -638,7 +638,7 @@
 027D;LATIN SMALL LETTER R WITH TAIL;Ll;0;L;;;;;N;LATIN SMALL LETTER R HOOK;;2C64;;2C64
 027E;LATIN SMALL LETTER R WITH FISHHOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER FISHHOOK R;;;;
 027F;LATIN SMALL LETTER REVERSED R WITH FISHHOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER REVERSED FISHHOOK R;;;;
-0280;LATIN LETTER SMALL CAPITAL R;Ll;0;L;;;;;N;;*;01A6;;01A6
+0280;LATIN LETTER SMALL CAPITAL R;Ll;0;L;;;;;N;;;01A6;;01A6
 0281;LATIN LETTER SMALL CAPITAL INVERTED R;Ll;0;L;;;;;N;;;;;
 0282;LATIN SMALL LETTER S WITH HOOK;Ll;0;L;;;;;N;LATIN SMALL LETTER S HOOK;;;;
 0283;LATIN SMALL LETTER ESH;Ll;0;L;;;;;N;;;01A9;;01A9
@@ -709,11 +709,11 @@
 02C4;MODIFIER LETTER UP ARROWHEAD;Sk;0;ON;;;;;N;;;;;
 02C5;MODIFIER LETTER DOWN ARROWHEAD;Sk;0;ON;;;;;N;;;;;
 02C6;MODIFIER LETTER CIRCUMFLEX ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER CIRCUMFLEX;;;;
-02C7;CARON;Lm;0;ON;;;;;N;MODIFIER LETTER HACEK;Mandarin Chinese third tone;;;
+02C7;CARON;Lm;0;ON;;;;;N;MODIFIER LETTER HACEK;;;;
 02C8;MODIFIER LETTER VERTICAL LINE;Lm;0;ON;;;;;N;;;;;
-02C9;MODIFIER LETTER MACRON;Lm;0;ON;;;;;N;;Mandarin Chinese first tone;;;
-02CA;MODIFIER LETTER ACUTE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER ACUTE;Mandarin Chinese second tone;;;
-02CB;MODIFIER LETTER GRAVE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER GRAVE;Mandarin Chinese fourth tone;;;
+02C9;MODIFIER LETTER MACRON;Lm;0;ON;;;;;N;;;;;
+02CA;MODIFIER LETTER ACUTE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER ACUTE;;;;
+02CB;MODIFIER LETTER GRAVE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER GRAVE;;;;
 02CC;MODIFIER LETTER LOW VERTICAL LINE;Lm;0;ON;;;;;N;;;;;
 02CD;MODIFIER LETTER LOW MACRON;Lm;0;ON;;;;;N;;;;;
 02CE;MODIFIER LETTER LOW GRAVE ACCENT;Lm;0;ON;;;;;N;MODIFIER LETTER LOW GRAVE;;;;
@@ -727,7 +727,7 @@
 02D6;MODIFIER LETTER PLUS SIGN;Sk;0;ON;;;;;N;;;;;
 02D7;MODIFIER LETTER MINUS SIGN;Sk;0;ON;;;;;N;;;;;
 02D8;BREVE;Sk;0;ON;<compat> 0020 0306;;;;N;SPACING BREVE;;;;
-02D9;DOT ABOVE;Sk;0;ON;<compat> 0020 0307;;;;N;SPACING DOT ABOVE;Mandarin Chinese light tone;;;
+02D9;DOT ABOVE;Sk;0;ON;<compat> 0020 0307;;;;N;SPACING DOT ABOVE;;;;
 02DA;RING ABOVE;Sk;0;ON;<compat> 0020 030A;;;;N;SPACING RING ABOVE;;;;
 02DB;OGONEK;Sk;0;ON;<compat> 0020 0328;;;;N;SPACING OGONEK;;;;
 02DC;SMALL TILDE;Sk;0;ON;<compat> 0020 0303;;;;N;SPACING TILDE;;;;
@@ -766,15 +766,15 @@
 02FD;MODIFIER LETTER SHELF;Sk;0;ON;;;;;N;;;;;
 02FE;MODIFIER LETTER OPEN SHELF;Sk;0;ON;;;;;N;;;;;
 02FF;MODIFIER LETTER LOW LEFT ARROW;Sk;0;ON;;;;;N;;;;;
-0300;COMBINING GRAVE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING GRAVE;Varia;;;
-0301;COMBINING ACUTE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING ACUTE;Oxia, Tonos;;;
+0300;COMBINING GRAVE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING GRAVE;;;;
+0301;COMBINING ACUTE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING ACUTE;;;;
 0302;COMBINING CIRCUMFLEX ACCENT;Mn;230;NSM;;;;;N;NON-SPACING CIRCUMFLEX;;;;
 0303;COMBINING TILDE;Mn;230;NSM;;;;;N;NON-SPACING TILDE;;;;
 0304;COMBINING MACRON;Mn;230;NSM;;;;;N;NON-SPACING MACRON;;;;
 0305;COMBINING OVERLINE;Mn;230;NSM;;;;;N;NON-SPACING OVERSCORE;;;;
-0306;COMBINING BREVE;Mn;230;NSM;;;;;N;NON-SPACING BREVE;Vrachy;;;
+0306;COMBINING BREVE;Mn;230;NSM;;;;;N;NON-SPACING BREVE;;;;
 0307;COMBINING DOT ABOVE;Mn;230;NSM;;;;;N;NON-SPACING DOT ABOVE;;;;
-0308;COMBINING DIAERESIS;Mn;230;NSM;;;;;N;NON-SPACING DIAERESIS;Dialytika;;;
+0308;COMBINING DIAERESIS;Mn;230;NSM;;;;;N;NON-SPACING DIAERESIS;;;;
 0309;COMBINING HOOK ABOVE;Mn;230;NSM;;;;;N;NON-SPACING HOOK ABOVE;;;;
 030A;COMBINING RING ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RING ABOVE;;;;
 030B;COMBINING DOUBLE ACUTE ACCENT;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE ACUTE;;;;
@@ -785,8 +785,8 @@
 0310;COMBINING CANDRABINDU;Mn;230;NSM;;;;;N;NON-SPACING CANDRABINDU;;;;
 0311;COMBINING INVERTED BREVE;Mn;230;NSM;;;;;N;NON-SPACING INVERTED BREVE;;;;
 0312;COMBINING TURNED COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING TURNED COMMA ABOVE;;;;
-0313;COMBINING COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING COMMA ABOVE;Psili;;;
-0314;COMBINING REVERSED COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING REVERSED COMMA ABOVE;Dasia;;;
+0313;COMBINING COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING COMMA ABOVE;;;;
+0314;COMBINING REVERSED COMMA ABOVE;Mn;230;NSM;;;;;N;NON-SPACING REVERSED COMMA ABOVE;;;;
 0315;COMBINING COMMA ABOVE RIGHT;Mn;232;NSM;;;;;N;NON-SPACING COMMA ABOVE RIGHT;;;;
 0316;COMBINING GRAVE ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING GRAVE BELOW;;;;
 0317;COMBINING ACUTE ACCENT BELOW;Mn;220;NSM;;;;;N;NON-SPACING ACUTE BELOW;;;;
@@ -830,8 +830,8 @@
 033D;COMBINING X ABOVE;Mn;230;NSM;;;;;N;NON-SPACING X ABOVE;;;;
 033E;COMBINING VERTICAL TILDE;Mn;230;NSM;;;;;N;NON-SPACING VERTICAL TILDE;;;;
 033F;COMBINING DOUBLE OVERLINE;Mn;230;NSM;;;;;N;NON-SPACING DOUBLE OVERSCORE;;;;
-0340;COMBINING GRAVE TONE MARK;Mn;230;NSM;0300;;;;N;NON-SPACING GRAVE TONE MARK;Vietnamese;;;
-0341;COMBINING ACUTE TONE MARK;Mn;230;NSM;0301;;;;N;NON-SPACING ACUTE TONE MARK;Vietnamese;;;
+0340;COMBINING GRAVE TONE MARK;Mn;230;NSM;0300;;;;N;NON-SPACING GRAVE TONE MARK;;;;
+0341;COMBINING ACUTE TONE MARK;Mn;230;NSM;0301;;;;N;NON-SPACING ACUTE TONE MARK;;;;
 0342;COMBINING GREEK PERISPOMENI;Mn;230;NSM;;;;;N;;;;;
 0343;COMBINING GREEK KORONIS;Mn;230;NSM;0313;;;;N;;;;;
 0344;COMBINING GREEK DIALYTIKA TONOS;Mn;230;NSM;0308 0301;;;;N;GREEK NON-SPACING DIAERESIS TONOS;;;;
@@ -882,15 +882,15 @@
 0371;GREEK SMALL LETTER HETA;Ll;0;L;;;;;N;;;0370;;0370
 0372;GREEK CAPITAL LETTER ARCHAIC SAMPI;Lu;0;L;;;;;N;;;;0373;
 0373;GREEK SMALL LETTER ARCHAIC SAMPI;Ll;0;L;;;;;N;;;0372;;0372
-0374;GREEK NUMERAL SIGN;Lm;0;ON;02B9;;;;N;GREEK UPPER NUMERAL SIGN;Dexia keraia;;;
-0375;GREEK LOWER NUMERAL SIGN;Sk;0;ON;;;;;N;;Aristeri keraia;;;
+0374;GREEK NUMERAL SIGN;Lm;0;ON;02B9;;;;N;GREEK UPPER NUMERAL SIGN;;;;
+0375;GREEK LOWER NUMERAL SIGN;Sk;0;ON;;;;;N;;;;;
 0376;GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA;Lu;0;L;;;;;N;;;;0377;
 0377;GREEK SMALL LETTER PAMPHYLIAN DIGAMMA;Ll;0;L;;;;;N;;;0376;;0376
 037A;GREEK YPOGEGRAMMENI;Lm;0;L;<compat> 0020 0345;;;;N;GREEK SPACING IOTA BELOW;;;;
 037B;GREEK SMALL REVERSED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FD;;03FD
 037C;GREEK SMALL DOTTED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FE;;03FE
 037D;GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL;Ll;0;L;;;;;N;;;03FF;;03FF
-037E;GREEK QUESTION MARK;Po;0;ON;003B;;;;N;;Erotimatiko;;;
+037E;GREEK QUESTION MARK;Po;0;ON;003B;;;;N;;;;;
 0384;GREEK TONOS;Sk;0;ON;<compat> 0020 0301;;;;N;GREEK SPACING TONOS;;;;
 0385;GREEK DIALYTIKA TONOS;Sk;0;ON;00A8 0301;;;;N;GREEK SPACING DIAERESIS TONOS;;;;
 0386;GREEK CAPITAL LETTER ALPHA WITH TONOS;Lu;0;L;0391 0301;;;;N;GREEK CAPITAL LETTER ALPHA TONOS;;;03AC;
@@ -972,8 +972,8 @@
 03D5;GREEK PHI SYMBOL;Ll;0;L;<compat> 03C6;;;;N;GREEK SMALL LETTER SCRIPT PHI;;03A6;;03A6
 03D6;GREEK PI SYMBOL;Ll;0;L;<compat> 03C0;;;;N;GREEK SMALL LETTER OMEGA PI;;03A0;;03A0
 03D7;GREEK KAI SYMBOL;Ll;0;L;;;;;N;;;03CF;;03CF
-03D8;GREEK LETTER ARCHAIC KOPPA;Lu;0;L;;;;;N;;*;;03D9;
-03D9;GREEK SMALL LETTER ARCHAIC KOPPA;Ll;0;L;;;;;N;;*;03D8;;03D8
+03D8;GREEK LETTER ARCHAIC KOPPA;Lu;0;L;;;;;N;;;;03D9;
+03D9;GREEK SMALL LETTER ARCHAIC KOPPA;Ll;0;L;;;;;N;;;03D8;;03D8
 03DA;GREEK LETTER STIGMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER STIGMA;;;03DB;
 03DB;GREEK SMALL LETTER STIGMA;Ll;0;L;;;;;N;;;03DA;;03DA
 03DC;GREEK LETTER DIGAMMA;Lu;0;L;;;;;N;GREEK CAPITAL LETTER DIGAMMA;;;03DD;
@@ -1014,19 +1014,19 @@
 03FF;GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL;Lu;0;L;;;;;N;;;;037D;
 0400;CYRILLIC CAPITAL LETTER IE WITH GRAVE;Lu;0;L;0415 0300;;;;N;;;;0450;
 0401;CYRILLIC CAPITAL LETTER IO;Lu;0;L;0415 0308;;;;N;;;;0451;
-0402;CYRILLIC CAPITAL LETTER DJE;Lu;0;L;;;;;N;;Serbocroatian;;0452;
+0402;CYRILLIC CAPITAL LETTER DJE;Lu;0;L;;;;;N;;;;0452;
 0403;CYRILLIC CAPITAL LETTER GJE;Lu;0;L;0413 0301;;;;N;;;;0453;
 0404;CYRILLIC CAPITAL LETTER UKRAINIAN IE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER E;;;0454;
 0405;CYRILLIC CAPITAL LETTER DZE;Lu;0;L;;;;;N;;;;0455;
 0406;CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER I;;;0456;
-0407;CYRILLIC CAPITAL LETTER YI;Lu;0;L;0406 0308;;;;N;;Ukrainian;;0457;
+0407;CYRILLIC CAPITAL LETTER YI;Lu;0;L;0406 0308;;;;N;;;;0457;
 0408;CYRILLIC CAPITAL LETTER JE;Lu;0;L;;;;;N;;;;0458;
 0409;CYRILLIC CAPITAL LETTER LJE;Lu;0;L;;;;;N;;;;0459;
 040A;CYRILLIC CAPITAL LETTER NJE;Lu;0;L;;;;;N;;;;045A;
-040B;CYRILLIC CAPITAL LETTER TSHE;Lu;0;L;;;;;N;;Serbocroatian;;045B;
+040B;CYRILLIC CAPITAL LETTER TSHE;Lu;0;L;;;;;N;;;;045B;
 040C;CYRILLIC CAPITAL LETTER KJE;Lu;0;L;041A 0301;;;;N;;;;045C;
 040D;CYRILLIC CAPITAL LETTER I WITH GRAVE;Lu;0;L;0418 0300;;;;N;;;;045D;
-040E;CYRILLIC CAPITAL LETTER SHORT U;Lu;0;L;0423 0306;;;;N;;Byelorussian;;045E;
+040E;CYRILLIC CAPITAL LETTER SHORT U;Lu;0;L;0423 0306;;;;N;;;;045E;
 040F;CYRILLIC CAPITAL LETTER DZHE;Lu;0;L;;;;;N;;;;045F;
 0410;CYRILLIC CAPITAL LETTER A;Lu;0;L;;;;;N;;;;0430;
 0411;CYRILLIC CAPITAL LETTER BE;Lu;0;L;;;;;N;;;;0431;
@@ -1094,19 +1094,19 @@
 044F;CYRILLIC SMALL LETTER YA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER IA;;042F;;042F
 0450;CYRILLIC SMALL LETTER IE WITH GRAVE;Ll;0;L;0435 0300;;;;N;;;0400;;0400
 0451;CYRILLIC SMALL LETTER IO;Ll;0;L;0435 0308;;;;N;;;0401;;0401
-0452;CYRILLIC SMALL LETTER DJE;Ll;0;L;;;;;N;;Serbocroatian;0402;;0402
+0452;CYRILLIC SMALL LETTER DJE;Ll;0;L;;;;;N;;;0402;;0402
 0453;CYRILLIC SMALL LETTER GJE;Ll;0;L;0433 0301;;;;N;;;0403;;0403
 0454;CYRILLIC SMALL LETTER UKRAINIAN IE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER E;;0404;;0404
 0455;CYRILLIC SMALL LETTER DZE;Ll;0;L;;;;;N;;;0405;;0405
 0456;CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER I;;0406;;0406
-0457;CYRILLIC SMALL LETTER YI;Ll;0;L;0456 0308;;;;N;;Ukrainian;0407;;0407
+0457;CYRILLIC SMALL LETTER YI;Ll;0;L;0456 0308;;;;N;;;0407;;0407
 0458;CYRILLIC SMALL LETTER JE;Ll;0;L;;;;;N;;;0408;;0408
 0459;CYRILLIC SMALL LETTER LJE;Ll;0;L;;;;;N;;;0409;;0409
 045A;CYRILLIC SMALL LETTER NJE;Ll;0;L;;;;;N;;;040A;;040A
-045B;CYRILLIC SMALL LETTER TSHE;Ll;0;L;;;;;N;;Serbocroatian;040B;;040B
+045B;CYRILLIC SMALL LETTER TSHE;Ll;0;L;;;;;N;;;040B;;040B
 045C;CYRILLIC SMALL LETTER KJE;Ll;0;L;043A 0301;;;;N;;;040C;;040C
 045D;CYRILLIC SMALL LETTER I WITH GRAVE;Ll;0;L;0438 0300;;;;N;;;040D;;040D
-045E;CYRILLIC SMALL LETTER SHORT U;Ll;0;L;0443 0306;;;;N;;Byelorussian;040E;;040E
+045E;CYRILLIC SMALL LETTER SHORT U;Ll;0;L;0443 0306;;;;N;;;040E;;040E
 045F;CYRILLIC SMALL LETTER DZHE;Ll;0;L;;;;;N;;;040F;;040F
 0460;CYRILLIC CAPITAL LETTER OMEGA;Lu;0;L;;;;;N;;;;0461;
 0461;CYRILLIC SMALL LETTER OMEGA;Ll;0;L;;;;;N;;;0460;;0460
@@ -1178,8 +1178,8 @@
 04A3;CYRILLIC SMALL LETTER EN WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN WITH RIGHT DESCENDER;;04A2;;04A2
 04A4;CYRILLIC CAPITAL LIGATURE EN GHE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER EN GE;;;04A5;
 04A5;CYRILLIC SMALL LIGATURE EN GHE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER EN GE;;04A4;;04A4
-04A6;CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER PE HOOK;Abkhasian;;04A7;
-04A7;CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER PE HOOK;Abkhasian;04A6;;04A6
+04A6;CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER PE HOOK;;;04A7;
+04A7;CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER PE HOOK;;04A6;;04A6
 04A8;CYRILLIC CAPITAL LETTER ABKHASIAN HA;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER O HOOK;;;04A9;
 04A9;CYRILLIC SMALL LETTER ABKHASIAN HA;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER O HOOK;;04A8;;04A8
 04AA;CYRILLIC CAPITAL LETTER ES WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER ES CEDILLA;;;04AB;
@@ -1192,8 +1192,8 @@
 04B1;CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER STRAIGHT U BAR;;04B0;;04B0
 04B2;CYRILLIC CAPITAL LETTER HA WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER KHA WITH RIGHT DESCENDER;;;04B3;
 04B3;CYRILLIC SMALL LETTER HA WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER KHA WITH RIGHT DESCENDER;;04B2;;04B2
-04B4;CYRILLIC CAPITAL LIGATURE TE TSE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER TE TSE;Abkhasian;;04B5;
-04B5;CYRILLIC SMALL LIGATURE TE TSE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER TE TSE;Abkhasian;04B4;;04B4
+04B4;CYRILLIC CAPITAL LIGATURE TE TSE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER TE TSE;;;04B5;
+04B5;CYRILLIC SMALL LIGATURE TE TSE;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER TE TSE;;04B4;;04B4
 04B6;CYRILLIC CAPITAL LETTER CHE WITH DESCENDER;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE WITH RIGHT DESCENDER;;;04B7;
 04B7;CYRILLIC SMALL LETTER CHE WITH DESCENDER;Ll;0;L;;;;;N;CYRILLIC SMALL LETTER CHE WITH RIGHT DESCENDER;;04B6;;04B6
 04B8;CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE;Lu;0;L;;;;;N;CYRILLIC CAPITAL LETTER CHE VERTICAL BAR;;;04B9;
@@ -1304,6 +1304,8 @@
 0521;CYRILLIC SMALL LETTER EL WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;0520;;0520
 0522;CYRILLIC CAPITAL LETTER EN WITH MIDDLE HOOK;Lu;0;L;;;;;N;;;;0523;
 0523;CYRILLIC SMALL LETTER EN WITH MIDDLE HOOK;Ll;0;L;;;;;N;;;0522;;0522
+0524;CYRILLIC CAPITAL LETTER PE WITH DESCENDER;Lu;0;L;;;;;N;;;;0525;
+0525;CYRILLIC SMALL LETTER PE WITH DESCENDER;Ll;0;L;;;;;N;;;0524;;0524
 0531;ARMENIAN CAPITAL LETTER AYB;Lu;0;L;;;;;N;;;;0561;
 0532;ARMENIAN CAPITAL LETTER BEN;Lu;0;L;;;;;N;;;;0562;
 0533;ARMENIAN CAPITAL LETTER GIM;Lu;0;L;;;;;N;;;;0563;
@@ -1395,9 +1397,9 @@
 0593;HEBREW ACCENT SHALSHELET;Mn;230;NSM;;;;;N;;;;;
 0594;HEBREW ACCENT ZAQEF QATAN;Mn;230;NSM;;;;;N;;;;;
 0595;HEBREW ACCENT ZAQEF GADOL;Mn;230;NSM;;;;;N;;;;;
-0596;HEBREW ACCENT TIPEHA;Mn;220;NSM;;;;;N;;*;;;
+0596;HEBREW ACCENT TIPEHA;Mn;220;NSM;;;;;N;;;;;
 0597;HEBREW ACCENT REVIA;Mn;230;NSM;;;;;N;;;;;
-0598;HEBREW ACCENT ZARQA;Mn;230;NSM;;;;;N;;*;;;
+0598;HEBREW ACCENT ZARQA;Mn;230;NSM;;;;;N;;;;;
 0599;HEBREW ACCENT PASHTA;Mn;230;NSM;;;;;N;;;;;
 059A;HEBREW ACCENT YETIV;Mn;222;NSM;;;;;N;;;;;
 059B;HEBREW ACCENT TEVIR;Mn;220;NSM;;;;;N;;;;;
@@ -1410,12 +1412,12 @@
 05A2;HEBREW ACCENT ATNAH HAFUKH;Mn;220;NSM;;;;;N;;;;;
 05A3;HEBREW ACCENT MUNAH;Mn;220;NSM;;;;;N;;;;;
 05A4;HEBREW ACCENT MAHAPAKH;Mn;220;NSM;;;;;N;;;;;
-05A5;HEBREW ACCENT MERKHA;Mn;220;NSM;;;;;N;;*;;;
+05A5;HEBREW ACCENT MERKHA;Mn;220;NSM;;;;;N;;;;;
 05A6;HEBREW ACCENT MERKHA KEFULA;Mn;220;NSM;;;;;N;;;;;
 05A7;HEBREW ACCENT DARGA;Mn;220;NSM;;;;;N;;;;;
-05A8;HEBREW ACCENT QADMA;Mn;230;NSM;;;;;N;;*;;;
+05A8;HEBREW ACCENT QADMA;Mn;230;NSM;;;;;N;;;;;
 05A9;HEBREW ACCENT TELISHA QETANA;Mn;230;NSM;;;;;N;;;;;
-05AA;HEBREW ACCENT YERAH BEN YOMO;Mn;220;NSM;;;;;N;;*;;;
+05AA;HEBREW ACCENT YERAH BEN YOMO;Mn;220;NSM;;;;;N;;;;;
 05AB;HEBREW ACCENT OLE;Mn;230;NSM;;;;;N;;;;;
 05AC;HEBREW ACCENT ILUY;Mn;230;NSM;;;;;N;;;;;
 05AD;HEBREW ACCENT DEHI;Mn;222;NSM;;;;;N;;;;;
@@ -1433,14 +1435,14 @@
 05B9;HEBREW POINT HOLAM;Mn;19;NSM;;;;;N;;;;;
 05BA;HEBREW POINT HOLAM HASER FOR VAV;Mn;19;NSM;;;;;N;;;;;
 05BB;HEBREW POINT QUBUTS;Mn;20;NSM;;;;;N;;;;;
-05BC;HEBREW POINT DAGESH OR MAPIQ;Mn;21;NSM;;;;;N;HEBREW POINT DAGESH;or shuruq;;;
-05BD;HEBREW POINT METEG;Mn;22;NSM;;;;;N;;*;;;
+05BC;HEBREW POINT DAGESH OR MAPIQ;Mn;21;NSM;;;;;N;HEBREW POINT DAGESH;;;;
+05BD;HEBREW POINT METEG;Mn;22;NSM;;;;;N;;;;;
 05BE;HEBREW PUNCTUATION MAQAF;Pd;0;R;;;;;N;;;;;
 05BF;HEBREW POINT RAFE;Mn;23;NSM;;;;;N;;;;;
-05C0;HEBREW PUNCTUATION PASEQ;Po;0;R;;;;;N;HEBREW POINT PASEQ;*;;;
+05C0;HEBREW PUNCTUATION PASEQ;Po;0;R;;;;;N;HEBREW POINT PASEQ;;;;
 05C1;HEBREW POINT SHIN DOT;Mn;24;NSM;;;;;N;;;;;
 05C2;HEBREW POINT SIN DOT;Mn;25;NSM;;;;;N;;;;;
-05C3;HEBREW PUNCTUATION SOF PASUQ;Po;0;R;;;;;N;;*;;;
+05C3;HEBREW PUNCTUATION SOF PASUQ;Po;0;R;;;;;N;;;;;
 05C4;HEBREW MARK UPPER DOT;Mn;230;NSM;;;;;N;;;;;
 05C5;HEBREW MARK LOWER DOT;Mn;220;NSM;;;;;N;;;;;
 05C6;HEBREW PUNCTUATION NUN HAFUKHA;Po;0;R;;;;;N;;;;;
@@ -1646,7 +1648,7 @@
 06AC;ARABIC LETTER KAF WITH DOT ABOVE;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH DOT ABOVE;;;;
 06AD;ARABIC LETTER NG;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH THREE DOTS ABOVE;;;;
 06AE;ARABIC LETTER KAF WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER CAF WITH THREE DOTS BELOW;;;;
-06AF;ARABIC LETTER GAF;Lo;0;AL;;;;;N;;*;;;
+06AF;ARABIC LETTER GAF;Lo;0;AL;;;;;N;;;;;
 06B0;ARABIC LETTER GAF WITH RING;Lo;0;AL;;;;;N;;;;;
 06B1;ARABIC LETTER NGOEH;Lo;0;AL;;;;;N;ARABIC LETTER GAF WITH TWO DOTS ABOVE;;;;
 06B2;ARABIC LETTER GAF WITH TWO DOTS BELOW;Lo;0;AL;;;;;N;;;;;
@@ -1679,7 +1681,7 @@
 06CD;ARABIC LETTER YEH WITH TAIL;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH TAIL;;;;
 06CE;ARABIC LETTER YEH WITH SMALL V;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH SMALL V;;;;
 06CF;ARABIC LETTER WAW WITH DOT ABOVE;Lo;0;AL;;;;;N;;;;;
-06D0;ARABIC LETTER E;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH TWO DOTS VERTICAL BELOW;*;;;
+06D0;ARABIC LETTER E;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH TWO DOTS VERTICAL BELOW;;;;
 06D1;ARABIC LETTER YEH WITH THREE DOTS BELOW;Lo;0;AL;;;;;N;ARABIC LETTER YA WITH THREE DOTS BELOW;;;;
 06D2;ARABIC LETTER YEH BARREE;Lo;0;AL;;;;;N;ARABIC LETTER YA BARREE;;;;
 06D3;ARABIC LETTER YEH BARREE WITH HAMZA ABOVE;Lo;0;AL;06D2 0654;;;;N;ARABIC LETTER HAMZAH ON YA BARREE;;;;
@@ -1961,6 +1963,68 @@
 07F8;NKO COMMA;Po;0;ON;;;;;N;;;;;
 07F9;NKO EXCLAMATION MARK;Po;0;ON;;;;;N;;;;;
 07FA;NKO LAJANYALAN;Lm;0;R;;;;;N;;;;;
+0800;SAMARITAN LETTER ALAF;Lo;0;R;;;;;N;;;;;
+0801;SAMARITAN LETTER BIT;Lo;0;R;;;;;N;;;;;
+0802;SAMARITAN LETTER GAMAN;Lo;0;R;;;;;N;;;;;
+0803;SAMARITAN LETTER DALAT;Lo;0;R;;;;;N;;;;;
+0804;SAMARITAN LETTER IY;Lo;0;R;;;;;N;;;;;
+0805;SAMARITAN LETTER BAA;Lo;0;R;;;;;N;;;;;
+0806;SAMARITAN LETTER ZEN;Lo;0;R;;;;;N;;;;;
+0807;SAMARITAN LETTER IT;Lo;0;R;;;;;N;;;;;
+0808;SAMARITAN LETTER TIT;Lo;0;R;;;;;N;;;;;
+0809;SAMARITAN LETTER YUT;Lo;0;R;;;;;N;;;;;
+080A;SAMARITAN LETTER KAAF;Lo;0;R;;;;;N;;;;;
+080B;SAMARITAN LETTER LABAT;Lo;0;R;;;;;N;;;;;
+080C;SAMARITAN LETTER MIM;Lo;0;R;;;;;N;;;;;
+080D;SAMARITAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+080E;SAMARITAN LETTER SINGAAT;Lo;0;R;;;;;N;;;;;
+080F;SAMARITAN LETTER IN;Lo;0;R;;;;;N;;;;;
+0810;SAMARITAN LETTER FI;Lo;0;R;;;;;N;;;;;
+0811;SAMARITAN LETTER TSAADIY;Lo;0;R;;;;;N;;;;;
+0812;SAMARITAN LETTER QUF;Lo;0;R;;;;;N;;;;;
+0813;SAMARITAN LETTER RISH;Lo;0;R;;;;;N;;;;;
+0814;SAMARITAN LETTER SHAN;Lo;0;R;;;;;N;;;;;
+0815;SAMARITAN LETTER TAAF;Lo;0;R;;;;;N;;;;;
+0816;SAMARITAN MARK IN;Mn;230;NSM;;;;;N;;;;;
+0817;SAMARITAN MARK IN-ALAF;Mn;230;NSM;;;;;N;;;;;
+0818;SAMARITAN MARK OCCLUSION;Mn;230;NSM;;;;;N;;;;;
+0819;SAMARITAN MARK DAGESH;Mn;230;NSM;;;;;N;;;;;
+081A;SAMARITAN MODIFIER LETTER EPENTHETIC YUT;Lm;0;R;;;;;N;;;;;
+081B;SAMARITAN MARK EPENTHETIC YUT;Mn;230;NSM;;;;;N;;;;;
+081C;SAMARITAN VOWEL SIGN LONG E;Mn;230;NSM;;;;;N;;;;;
+081D;SAMARITAN VOWEL SIGN E;Mn;230;NSM;;;;;N;;;;;
+081E;SAMARITAN VOWEL SIGN OVERLONG AA;Mn;230;NSM;;;;;N;;;;;
+081F;SAMARITAN VOWEL SIGN LONG AA;Mn;230;NSM;;;;;N;;;;;
+0820;SAMARITAN VOWEL SIGN AA;Mn;230;NSM;;;;;N;;;;;
+0821;SAMARITAN VOWEL SIGN OVERLONG A;Mn;230;NSM;;;;;N;;;;;
+0822;SAMARITAN VOWEL SIGN LONG A;Mn;230;NSM;;;;;N;;;;;
+0823;SAMARITAN VOWEL SIGN A;Mn;230;NSM;;;;;N;;;;;
+0824;SAMARITAN MODIFIER LETTER SHORT A;Lm;0;R;;;;;N;;;;;
+0825;SAMARITAN VOWEL SIGN SHORT A;Mn;230;NSM;;;;;N;;;;;
+0826;SAMARITAN VOWEL SIGN LONG U;Mn;230;NSM;;;;;N;;;;;
+0827;SAMARITAN VOWEL SIGN U;Mn;230;NSM;;;;;N;;;;;
+0828;SAMARITAN MODIFIER LETTER I;Lm;0;R;;;;;N;;;;;
+0829;SAMARITAN VOWEL SIGN LONG I;Mn;230;NSM;;;;;N;;;;;
+082A;SAMARITAN VOWEL SIGN I;Mn;230;NSM;;;;;N;;;;;
+082B;SAMARITAN VOWEL SIGN O;Mn;230;NSM;;;;;N;;;;;
+082C;SAMARITAN VOWEL SIGN SUKUN;Mn;230;NSM;;;;;N;;;;;
+082D;SAMARITAN MARK NEQUDAA;Mn;230;NSM;;;;;N;;;;;
+0830;SAMARITAN PUNCTUATION NEQUDAA;Po;0;R;;;;;N;;;;;
+0831;SAMARITAN PUNCTUATION AFSAAQ;Po;0;R;;;;;N;;;;;
+0832;SAMARITAN PUNCTUATION ANGED;Po;0;R;;;;;N;;;;;
+0833;SAMARITAN PUNCTUATION BAU;Po;0;R;;;;;N;;;;;
+0834;SAMARITAN PUNCTUATION ATMAAU;Po;0;R;;;;;N;;;;;
+0835;SAMARITAN PUNCTUATION SHIYYAALAA;Po;0;R;;;;;N;;;;;
+0836;SAMARITAN ABBREVIATION MARK;Po;0;R;;;;;N;;;;;
+0837;SAMARITAN PUNCTUATION MELODIC QITSA;Po;0;R;;;;;N;;;;;
+0838;SAMARITAN PUNCTUATION ZIQAA;Po;0;R;;;;;N;;;;;
+0839;SAMARITAN PUNCTUATION QITSA;Po;0;R;;;;;N;;;;;
+083A;SAMARITAN PUNCTUATION ZAEF;Po;0;R;;;;;N;;;;;
+083B;SAMARITAN PUNCTUATION TURU;Po;0;R;;;;;N;;;;;
+083C;SAMARITAN PUNCTUATION ARKAANU;Po;0;R;;;;;N;;;;;
+083D;SAMARITAN PUNCTUATION SOF MASHFAAT;Po;0;R;;;;;N;;;;;
+083E;SAMARITAN PUNCTUATION ANNAAU;Po;0;R;;;;;N;;;;;
+0900;DEVANAGARI SIGN INVERTED CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
 0901;DEVANAGARI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
 0902;DEVANAGARI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
 0903;DEVANAGARI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
@@ -2036,11 +2100,13 @@
 094B;DEVANAGARI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
 094C;DEVANAGARI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
 094D;DEVANAGARI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+094E;DEVANAGARI VOWEL SIGN PRISHTHAMATRA E;Mc;0;L;;;;;N;;;;;
 0950;DEVANAGARI OM;Lo;0;L;;;;;N;;;;;
 0951;DEVANAGARI STRESS SIGN UDATTA;Mn;230;NSM;;;;;N;;;;;
 0952;DEVANAGARI STRESS SIGN ANUDATTA;Mn;220;NSM;;;;;N;;;;;
 0953;DEVANAGARI GRAVE ACCENT;Mn;230;NSM;;;;;N;;;;;
 0954;DEVANAGARI ACUTE ACCENT;Mn;230;NSM;;;;;N;;;;;
+0955;DEVANAGARI VOWEL SIGN CANDRA LONG E;Mn;0;NSM;;;;;N;;;;;
 0958;DEVANAGARI LETTER QA;Lo;0;L;0915 093C;;;;N;;;;;
 0959;DEVANAGARI LETTER KHHA;Lo;0;L;0916 093C;;;;N;;;;;
 095A;DEVANAGARI LETTER GHHA;Lo;0;L;0917 093C;;;;N;;;;;
@@ -2068,6 +2134,8 @@
 0970;DEVANAGARI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
 0971;DEVANAGARI SIGN HIGH SPACING DOT;Lm;0;L;;;;;N;;;;;
 0972;DEVANAGARI LETTER CANDRA A;Lo;0;L;;;;;N;;;;;
+0979;DEVANAGARI LETTER ZHA;Lo;0;L;;;;;N;;;;;
+097A;DEVANAGARI LETTER HEAVY YA;Lo;0;L;;;;;N;;;;;
 097B;DEVANAGARI LETTER GGA;Lo;0;L;;;;;N;;;;;
 097C;DEVANAGARI LETTER JJA;Lo;0;L;;;;;N;;;;;
 097D;DEVANAGARI LETTER GLOTTAL STOP;Lo;0;L;;;;;N;;;;;
@@ -2153,17 +2221,18 @@
 09ED;BENGALI DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
 09EE;BENGALI DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
 09EF;BENGALI DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-09F0;BENGALI LETTER RA WITH MIDDLE DIAGONAL;Lo;0;L;;;;;N;;Assamese;;;
-09F1;BENGALI LETTER RA WITH LOWER DIAGONAL;Lo;0;L;;;;;N;BENGALI LETTER VA WITH LOWER DIAGONAL;Assamese;;;
+09F0;BENGALI LETTER RA WITH MIDDLE DIAGONAL;Lo;0;L;;;;;N;;;;;
+09F1;BENGALI LETTER RA WITH LOWER DIAGONAL;Lo;0;L;;;;;N;BENGALI LETTER VA WITH LOWER DIAGONAL;;;;
 09F2;BENGALI RUPEE MARK;Sc;0;ET;;;;;N;;;;;
 09F3;BENGALI RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
-09F4;BENGALI CURRENCY NUMERATOR ONE;No;0;L;;;;1;N;;;;;
-09F5;BENGALI CURRENCY NUMERATOR TWO;No;0;L;;;;2;N;;;;;
-09F6;BENGALI CURRENCY NUMERATOR THREE;No;0;L;;;;3;N;;;;;
-09F7;BENGALI CURRENCY NUMERATOR FOUR;No;0;L;;;;4;N;;;;;
-09F8;BENGALI CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR;No;0;L;;;;;N;;;;;
+09F4;BENGALI CURRENCY NUMERATOR ONE;No;0;L;;;;1/16;N;;;;;
+09F5;BENGALI CURRENCY NUMERATOR TWO;No;0;L;;;;1/8;N;;;;;
+09F6;BENGALI CURRENCY NUMERATOR THREE;No;0;L;;;;3/16;N;;;;;
+09F7;BENGALI CURRENCY NUMERATOR FOUR;No;0;L;;;;1/4;N;;;;;
+09F8;BENGALI CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR;No;0;L;;;;3/4;N;;;;;
 09F9;BENGALI CURRENCY DENOMINATOR SIXTEEN;No;0;L;;;;16;N;;;;;
 09FA;BENGALI ISSHAR;So;0;L;;;;;N;;;;;
+09FB;BENGALI GANDA MARK;Sc;0;ET;;;;;N;;;;;
 0A01;GURMUKHI SIGN ADAK BINDI;Mn;0;NSM;;;;;N;;;;;
 0A02;GURMUKHI SIGN BINDI;Mn;0;NSM;;;;;N;;;;;
 0A03;GURMUKHI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
@@ -2474,14 +2543,14 @@
 0BF0;TAMIL NUMBER TEN;No;0;L;;;;10;N;;;;;
 0BF1;TAMIL NUMBER ONE HUNDRED;No;0;L;;;;100;N;;;;;
 0BF2;TAMIL NUMBER ONE THOUSAND;No;0;L;;;;1000;N;;;;;
-0BF3;TAMIL DAY SIGN;So;0;ON;;;;;N;;Naal;;;
-0BF4;TAMIL MONTH SIGN;So;0;ON;;;;;N;;Maatham;;;
-0BF5;TAMIL YEAR SIGN;So;0;ON;;;;;N;;Varudam;;;
-0BF6;TAMIL DEBIT SIGN;So;0;ON;;;;;N;;Patru;;;
-0BF7;TAMIL CREDIT SIGN;So;0;ON;;;;;N;;Varavu;;;
-0BF8;TAMIL AS ABOVE SIGN;So;0;ON;;;;;N;;Merpadi;;;
-0BF9;TAMIL RUPEE SIGN;Sc;0;ET;;;;;N;;Rupai;;;
-0BFA;TAMIL NUMBER SIGN;So;0;ON;;;;;N;;Enn;;;
+0BF3;TAMIL DAY SIGN;So;0;ON;;;;;N;;;;;
+0BF4;TAMIL MONTH SIGN;So;0;ON;;;;;N;;;;;
+0BF5;TAMIL YEAR SIGN;So;0;ON;;;;;N;;;;;
+0BF6;TAMIL DEBIT SIGN;So;0;ON;;;;;N;;;;;
+0BF7;TAMIL CREDIT SIGN;So;0;ON;;;;;N;;;;;
+0BF8;TAMIL AS ABOVE SIGN;So;0;ON;;;;;N;;;;;
+0BF9;TAMIL RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
+0BFA;TAMIL NUMBER SIGN;So;0;ON;;;;;N;;;;;
 0C01;TELUGU SIGN CANDRABINDU;Mc;0;L;;;;;N;;;;;
 0C02;TELUGU SIGN ANUSVARA;Mc;0;L;;;;;N;;;;;
 0C03;TELUGU SIGN VISARGA;Mc;0;L;;;;;N;;;;;
@@ -2882,7 +2951,7 @@
 0E2C;THAI CHARACTER LO CHULA;Lo;0;L;;;;;N;THAI LETTER LO CHULA;;;;
 0E2D;THAI CHARACTER O ANG;Lo;0;L;;;;;N;THAI LETTER O ANG;;;;
 0E2E;THAI CHARACTER HO NOKHUK;Lo;0;L;;;;;N;THAI LETTER HO NOK HUK;;;;
-0E2F;THAI CHARACTER PAIYANNOI;Lo;0;L;;;;;N;THAI PAI YAN NOI;paiyan noi;;;
+0E2F;THAI CHARACTER PAIYANNOI;Lo;0;L;;;;;N;THAI PAI YAN NOI;;;;
 0E30;THAI CHARACTER SARA A;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA A;;;;
 0E31;THAI CHARACTER MAI HAN-AKAT;Mn;0;NSM;;;;;N;THAI VOWEL SIGN MAI HAN-AKAT;;;;
 0E32;THAI CHARACTER SARA AA;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA AA;;;;
@@ -2890,7 +2959,7 @@
 0E34;THAI CHARACTER SARA I;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA I;;;;
 0E35;THAI CHARACTER SARA II;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA II;;;;
 0E36;THAI CHARACTER SARA UE;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA UE;;;;
-0E37;THAI CHARACTER SARA UEE;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA UEE;sara uue;;;
+0E37;THAI CHARACTER SARA UEE;Mn;0;NSM;;;;;N;THAI VOWEL SIGN SARA UEE;;;;
 0E38;THAI CHARACTER SARA U;Mn;103;NSM;;;;;N;THAI VOWEL SIGN SARA U;;;;
 0E39;THAI CHARACTER SARA UU;Mn;103;NSM;;;;;N;THAI VOWEL SIGN SARA UU;;;;
 0E3A;THAI CHARACTER PHINTHU;Mn;9;NSM;;;;;N;THAI VOWEL SIGN PHINTHU;;;;
@@ -2898,17 +2967,17 @@
 0E40;THAI CHARACTER SARA E;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA E;;;;
 0E41;THAI CHARACTER SARA AE;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA AE;;;;
 0E42;THAI CHARACTER SARA O;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA O;;;;
-0E43;THAI CHARACTER SARA AI MAIMUAN;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA MAI MUAN;sara ai mai muan;;;
-0E44;THAI CHARACTER SARA AI MAIMALAI;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA MAI MALAI;sara ai mai malai;;;
-0E45;THAI CHARACTER LAKKHANGYAO;Lo;0;L;;;;;N;THAI LAK KHANG YAO;lakkhang yao;;;
-0E46;THAI CHARACTER MAIYAMOK;Lm;0;L;;;;;N;THAI MAI YAMOK;mai yamok;;;
-0E47;THAI CHARACTER MAITAIKHU;Mn;0;NSM;;;;;N;THAI VOWEL SIGN MAI TAI KHU;mai taikhu;;;
+0E43;THAI CHARACTER SARA AI MAIMUAN;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA MAI MUAN;;;;
+0E44;THAI CHARACTER SARA AI MAIMALAI;Lo;0;L;;;;;N;THAI VOWEL SIGN SARA MAI MALAI;;;;
+0E45;THAI CHARACTER LAKKHANGYAO;Lo;0;L;;;;;N;THAI LAK KHANG YAO;;;;
+0E46;THAI CHARACTER MAIYAMOK;Lm;0;L;;;;;N;THAI MAI YAMOK;;;;
+0E47;THAI CHARACTER MAITAIKHU;Mn;0;NSM;;;;;N;THAI VOWEL SIGN MAI TAI KHU;;;;
 0E48;THAI CHARACTER MAI EK;Mn;107;NSM;;;;;N;THAI TONE MAI EK;;;;
 0E49;THAI CHARACTER MAI THO;Mn;107;NSM;;;;;N;THAI TONE MAI THO;;;;
 0E4A;THAI CHARACTER MAI TRI;Mn;107;NSM;;;;;N;THAI TONE MAI TRI;;;;
 0E4B;THAI CHARACTER MAI CHATTAWA;Mn;107;NSM;;;;;N;THAI TONE MAI CHATTAWA;;;;
 0E4C;THAI CHARACTER THANTHAKHAT;Mn;0;NSM;;;;;N;THAI THANTHAKHAT;;;;
-0E4D;THAI CHARACTER NIKHAHIT;Mn;0;NSM;;;;;N;THAI NIKKHAHIT;nikkhahit;;;
+0E4D;THAI CHARACTER NIKHAHIT;Mn;0;NSM;;;;;N;THAI NIKKHAHIT;;;;
 0E4E;THAI CHARACTER YAMAKKAN;Mn;0;NSM;;;;;N;THAI YAMAKKAN;;;;
 0E4F;THAI CHARACTER FONGMAN;Po;0;L;;;;;N;THAI FONGMAN;;;;
 0E50;THAI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
@@ -2989,37 +3058,37 @@
 0EDC;LAO HO NO;Lo;0;L;<compat> 0EAB 0E99;;;;N;;;;;
 0EDD;LAO HO MO;Lo;0;L;<compat> 0EAB 0EA1;;;;N;;;;;
 0F00;TIBETAN SYLLABLE OM;Lo;0;L;;;;;N;;;;;
-0F01;TIBETAN MARK GTER YIG MGO TRUNCATED A;So;0;L;;;;;N;;ter yik go a thung;;;
-0F02;TIBETAN MARK GTER YIG MGO -UM RNAM BCAD MA;So;0;L;;;;;N;;ter yik go wum nam chey ma;;;
-0F03;TIBETAN MARK GTER YIG MGO -UM GTER TSHEG MA;So;0;L;;;;;N;;ter yik go wum ter tsek ma;;;
-0F04;TIBETAN MARK INITIAL YIG MGO MDUN MA;Po;0;L;;;;;N;TIBETAN SINGLE ORNAMENT;yik go dun ma;;;
-0F05;TIBETAN MARK CLOSING YIG MGO SGAB MA;Po;0;L;;;;;N;;yik go kab ma;;;
-0F06;TIBETAN MARK CARET YIG MGO PHUR SHAD MA;Po;0;L;;;;;N;;yik go pur shey ma;;;
-0F07;TIBETAN MARK YIG MGO TSHEG SHAD MA;Po;0;L;;;;;N;;yik go tsek shey ma;;;
-0F08;TIBETAN MARK SBRUL SHAD;Po;0;L;;;;;N;TIBETAN RGYANSHAD;drul shey;;;
-0F09;TIBETAN MARK BSKUR YIG MGO;Po;0;L;;;;;N;;kur yik go;;;
-0F0A;TIBETAN MARK BKA- SHOG YIG MGO;Po;0;L;;;;;N;;ka sho yik go;;;
-0F0B;TIBETAN MARK INTERSYLLABIC TSHEG;Po;0;L;;;;;N;TIBETAN TSEG;tsek;;;
-0F0C;TIBETAN MARK DELIMITER TSHEG BSTAR;Po;0;L;<noBreak> 0F0B;;;;N;;tsek tar;;;
-0F0D;TIBETAN MARK SHAD;Po;0;L;;;;;N;TIBETAN SHAD;shey;;;
-0F0E;TIBETAN MARK NYIS SHAD;Po;0;L;;;;;N;TIBETAN DOUBLE SHAD;nyi shey;;;
-0F0F;TIBETAN MARK TSHEG SHAD;Po;0;L;;;;;N;;tsek shey;;;
-0F10;TIBETAN MARK NYIS TSHEG SHAD;Po;0;L;;;;;N;;nyi tsek shey;;;
-0F11;TIBETAN MARK RIN CHEN SPUNGS SHAD;Po;0;L;;;;;N;TIBETAN RINCHANPHUNGSHAD;rinchen pung shey;;;
-0F12;TIBETAN MARK RGYA GRAM SHAD;Po;0;L;;;;;N;;gya tram shey;;;
-0F13;TIBETAN MARK CARET -DZUD RTAGS ME LONG CAN;So;0;L;;;;;N;;dzu ta me long chen;;;
-0F14;TIBETAN MARK GTER TSHEG;So;0;L;;;;;N;TIBETAN COMMA;ter tsek;;;
-0F15;TIBETAN LOGOTYPE SIGN CHAD RTAGS;So;0;L;;;;;N;;che ta;;;
-0F16;TIBETAN LOGOTYPE SIGN LHAG RTAGS;So;0;L;;;;;N;;hlak ta;;;
-0F17;TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS;So;0;L;;;;;N;;trachen char ta;;;
-0F18;TIBETAN ASTROLOGICAL SIGN -KHYUD PA;Mn;220;NSM;;;;;N;;kyu pa;;;
-0F19;TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS;Mn;220;NSM;;;;;N;;dong tsu;;;
-0F1A;TIBETAN SIGN RDEL DKAR GCIG;So;0;L;;;;;N;;deka chig;;;
-0F1B;TIBETAN SIGN RDEL DKAR GNYIS;So;0;L;;;;;N;;deka nyi;;;
-0F1C;TIBETAN SIGN RDEL DKAR GSUM;So;0;L;;;;;N;;deka sum;;;
-0F1D;TIBETAN SIGN RDEL NAG GCIG;So;0;L;;;;;N;;dena chig;;;
-0F1E;TIBETAN SIGN RDEL NAG GNYIS;So;0;L;;;;;N;;dena nyi;;;
-0F1F;TIBETAN SIGN RDEL DKAR RDEL NAG;So;0;L;;;;;N;;deka dena;;;
+0F01;TIBETAN MARK GTER YIG MGO TRUNCATED A;So;0;L;;;;;N;;;;;
+0F02;TIBETAN MARK GTER YIG MGO -UM RNAM BCAD MA;So;0;L;;;;;N;;;;;
+0F03;TIBETAN MARK GTER YIG MGO -UM GTER TSHEG MA;So;0;L;;;;;N;;;;;
+0F04;TIBETAN MARK INITIAL YIG MGO MDUN MA;Po;0;L;;;;;N;TIBETAN SINGLE ORNAMENT;;;;
+0F05;TIBETAN MARK CLOSING YIG MGO SGAB MA;Po;0;L;;;;;N;;;;;
+0F06;TIBETAN MARK CARET YIG MGO PHUR SHAD MA;Po;0;L;;;;;N;;;;;
+0F07;TIBETAN MARK YIG MGO TSHEG SHAD MA;Po;0;L;;;;;N;;;;;
+0F08;TIBETAN MARK SBRUL SHAD;Po;0;L;;;;;N;TIBETAN RGYANSHAD;;;;
+0F09;TIBETAN MARK BSKUR YIG MGO;Po;0;L;;;;;N;;;;;
+0F0A;TIBETAN MARK BKA- SHOG YIG MGO;Po;0;L;;;;;N;;;;;
+0F0B;TIBETAN MARK INTERSYLLABIC TSHEG;Po;0;L;;;;;N;TIBETAN TSEG;;;;
+0F0C;TIBETAN MARK DELIMITER TSHEG BSTAR;Po;0;L;<noBreak> 0F0B;;;;N;;;;;
+0F0D;TIBETAN MARK SHAD;Po;0;L;;;;;N;TIBETAN SHAD;;;;
+0F0E;TIBETAN MARK NYIS SHAD;Po;0;L;;;;;N;TIBETAN DOUBLE SHAD;;;;
+0F0F;TIBETAN MARK TSHEG SHAD;Po;0;L;;;;;N;;;;;
+0F10;TIBETAN MARK NYIS TSHEG SHAD;Po;0;L;;;;;N;;;;;
+0F11;TIBETAN MARK RIN CHEN SPUNGS SHAD;Po;0;L;;;;;N;TIBETAN RINCHANPHUNGSHAD;;;;
+0F12;TIBETAN MARK RGYA GRAM SHAD;Po;0;L;;;;;N;;;;;
+0F13;TIBETAN MARK CARET -DZUD RTAGS ME LONG CAN;So;0;L;;;;;N;;;;;
+0F14;TIBETAN MARK GTER TSHEG;So;0;L;;;;;N;TIBETAN COMMA;;;;
+0F15;TIBETAN LOGOTYPE SIGN CHAD RTAGS;So;0;L;;;;;N;;;;;
+0F16;TIBETAN LOGOTYPE SIGN LHAG RTAGS;So;0;L;;;;;N;;;;;
+0F17;TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS;So;0;L;;;;;N;;;;;
+0F18;TIBETAN ASTROLOGICAL SIGN -KHYUD PA;Mn;220;NSM;;;;;N;;;;;
+0F19;TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS;Mn;220;NSM;;;;;N;;;;;
+0F1A;TIBETAN SIGN RDEL DKAR GCIG;So;0;L;;;;;N;;;;;
+0F1B;TIBETAN SIGN RDEL DKAR GNYIS;So;0;L;;;;;N;;;;;
+0F1C;TIBETAN SIGN RDEL DKAR GSUM;So;0;L;;;;;N;;;;;
+0F1D;TIBETAN SIGN RDEL NAG GCIG;So;0;L;;;;;N;;;;;
+0F1E;TIBETAN SIGN RDEL NAG GNYIS;So;0;L;;;;;N;;;;;
+0F1F;TIBETAN SIGN RDEL DKAR RDEL NAG;So;0;L;;;;;N;;;;;
 0F20;TIBETAN DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
 0F21;TIBETAN DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
 0F22;TIBETAN DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
@@ -3040,18 +3109,18 @@
 0F31;TIBETAN DIGIT HALF EIGHT;No;0;L;;;;15/2;N;;;;;
 0F32;TIBETAN DIGIT HALF NINE;No;0;L;;;;17/2;N;;;;;
 0F33;TIBETAN DIGIT HALF ZERO;No;0;L;;;;-1/2;N;;;;;
-0F34;TIBETAN MARK BSDUS RTAGS;So;0;L;;;;;N;;du ta;;;
-0F35;TIBETAN MARK NGAS BZUNG NYI ZLA;Mn;220;NSM;;;;;N;TIBETAN HONORIFIC UNDER RING;nge zung nyi da;;;
-0F36;TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN;So;0;L;;;;;N;;dzu ta shi mig chen;;;
-0F37;TIBETAN MARK NGAS BZUNG SGOR RTAGS;Mn;220;NSM;;;;;N;TIBETAN UNDER RING;nge zung gor ta;;;
-0F38;TIBETAN MARK CHE MGO;So;0;L;;;;;N;;che go;;;
-0F39;TIBETAN MARK TSA -PHRU;Mn;216;NSM;;;;;N;TIBETAN LENITION MARK;tsa tru;;;
-0F3A;TIBETAN MARK GUG RTAGS GYON;Ps;0;ON;;;;;Y;;gug ta yun;;;
-0F3B;TIBETAN MARK GUG RTAGS GYAS;Pe;0;ON;;;;;Y;;gug ta ye;;;
-0F3C;TIBETAN MARK ANG KHANG GYON;Ps;0;ON;;;;;Y;TIBETAN LEFT BRACE;ang kang yun;;;
-0F3D;TIBETAN MARK ANG KHANG GYAS;Pe;0;ON;;;;;Y;TIBETAN RIGHT BRACE;ang kang ye;;;
-0F3E;TIBETAN SIGN YAR TSHES;Mc;0;L;;;;;N;;yar tse;;;
-0F3F;TIBETAN SIGN MAR TSHES;Mc;0;L;;;;;N;;mar tse;;;
+0F34;TIBETAN MARK BSDUS RTAGS;So;0;L;;;;;N;;;;;
+0F35;TIBETAN MARK NGAS BZUNG NYI ZLA;Mn;220;NSM;;;;;N;TIBETAN HONORIFIC UNDER RING;;;;
+0F36;TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN;So;0;L;;;;;N;;;;;
+0F37;TIBETAN MARK NGAS BZUNG SGOR RTAGS;Mn;220;NSM;;;;;N;TIBETAN UNDER RING;;;;
+0F38;TIBETAN MARK CHE MGO;So;0;L;;;;;N;;;;;
+0F39;TIBETAN MARK TSA -PHRU;Mn;216;NSM;;;;;N;TIBETAN LENITION MARK;;;;
+0F3A;TIBETAN MARK GUG RTAGS GYON;Ps;0;ON;;;;;Y;;;;;
+0F3B;TIBETAN MARK GUG RTAGS GYAS;Pe;0;ON;;;;;Y;;;;;
+0F3C;TIBETAN MARK ANG KHANG GYON;Ps;0;ON;;;;;Y;TIBETAN LEFT BRACE;;;;
+0F3D;TIBETAN MARK ANG KHANG GYAS;Pe;0;ON;;;;;Y;TIBETAN RIGHT BRACE;;;;
+0F3E;TIBETAN SIGN YAR TSHES;Mc;0;L;;;;;N;;;;;
+0F3F;TIBETAN SIGN MAR TSHES;Mc;0;L;;;;;N;;;;;
 0F40;TIBETAN LETTER KA;Lo;0;L;;;;;N;;;;;
 0F41;TIBETAN LETTER KHA;Lo;0;L;;;;;N;;;;;
 0F42;TIBETAN LETTER GA;Lo;0;L;;;;;N;;;;;
@@ -3085,7 +3154,7 @@
 0F5F;TIBETAN LETTER ZA;Lo;0;L;;;;;N;;;;;
 0F60;TIBETAN LETTER -A;Lo;0;L;;;;;N;TIBETAN LETTER AA;;;;
 0F61;TIBETAN LETTER YA;Lo;0;L;;;;;N;;;;;
-0F62;TIBETAN LETTER RA;Lo;0;L;;;;;N;;*;;;
+0F62;TIBETAN LETTER RA;Lo;0;L;;;;;N;;;;;
 0F63;TIBETAN LETTER LA;Lo;0;L;;;;;N;;;;;
 0F64;TIBETAN LETTER SHA;Lo;0;L;;;;;N;;;;;
 0F65;TIBETAN LETTER SSA;Lo;0;L;;;;;N;TIBETAN LETTER REVERSED SHA;;;;
@@ -3093,7 +3162,7 @@
 0F67;TIBETAN LETTER HA;Lo;0;L;;;;;N;;;;;
 0F68;TIBETAN LETTER A;Lo;0;L;;;;;N;;;;;
 0F69;TIBETAN LETTER KSSA;Lo;0;L;0F40 0FB5;;;;N;;;;;
-0F6A;TIBETAN LETTER FIXED-FORM RA;Lo;0;L;;;;;N;;*;;;
+0F6A;TIBETAN LETTER FIXED-FORM RA;Lo;0;L;;;;;N;;;;;
 0F6B;TIBETAN LETTER KKA;Lo;0;L;;;;;N;;;;;
 0F6C;TIBETAN LETTER RRA;Lo;0;L;;;;;N;;;;;
 0F71;TIBETAN VOWEL SIGN AA;Mn;129;NSM;;;;;N;;;;;
@@ -3109,20 +3178,20 @@
 0F7B;TIBETAN VOWEL SIGN EE;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN AI;;;;
 0F7C;TIBETAN VOWEL SIGN O;Mn;130;NSM;;;;;N;;;;;
 0F7D;TIBETAN VOWEL SIGN OO;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN AU;;;;
-0F7E;TIBETAN SIGN RJES SU NGA RO;Mn;0;NSM;;;;;N;TIBETAN ANUSVARA;je su nga ro;;;
-0F7F;TIBETAN SIGN RNAM BCAD;Mc;0;L;;;;;N;TIBETAN VISARGA;nam chey;;;
+0F7E;TIBETAN SIGN RJES SU NGA RO;Mn;0;NSM;;;;;N;TIBETAN ANUSVARA;;;;
+0F7F;TIBETAN SIGN RNAM BCAD;Mc;0;L;;;;;N;TIBETAN VISARGA;;;;
 0F80;TIBETAN VOWEL SIGN REVERSED I;Mn;130;NSM;;;;;N;TIBETAN VOWEL SIGN SHORT I;;;;
 0F81;TIBETAN VOWEL SIGN REVERSED II;Mn;0;NSM;0F71 0F80;;;;N;;;;;
-0F82;TIBETAN SIGN NYI ZLA NAA DA;Mn;230;NSM;;;;;N;TIBETAN CANDRABINDU WITH ORNAMENT;nyi da na da;;;
-0F83;TIBETAN SIGN SNA LDAN;Mn;230;NSM;;;;;N;TIBETAN CANDRABINDU;nan de;;;
+0F82;TIBETAN SIGN NYI ZLA NAA DA;Mn;230;NSM;;;;;N;TIBETAN CANDRABINDU WITH ORNAMENT;;;;
+0F83;TIBETAN SIGN SNA LDAN;Mn;230;NSM;;;;;N;TIBETAN CANDRABINDU;;;;
 0F84;TIBETAN MARK HALANTA;Mn;9;NSM;;;;;N;TIBETAN VIRAMA;;;;
 0F85;TIBETAN MARK PALUTA;Po;0;L;;;;;N;TIBETAN CHUCHENYIGE;;;;
-0F86;TIBETAN SIGN LCI RTAGS;Mn;230;NSM;;;;;N;;ji ta;;;
-0F87;TIBETAN SIGN YANG RTAGS;Mn;230;NSM;;;;;N;;yang ta;;;
-0F88;TIBETAN SIGN LCE TSA CAN;Lo;0;L;;;;;N;;che tsa chen;;;
-0F89;TIBETAN SIGN MCHU CAN;Lo;0;L;;;;;N;;chu chen;;;
-0F8A;TIBETAN SIGN GRU CAN RGYINGS;Lo;0;L;;;;;N;;tru chen ging;;;
-0F8B;TIBETAN SIGN GRU MED RGYINGS;Lo;0;L;;;;;N;;tru me ging;;;
+0F86;TIBETAN SIGN LCI RTAGS;Mn;230;NSM;;;;;N;;;;;
+0F87;TIBETAN SIGN YANG RTAGS;Mn;230;NSM;;;;;N;;;;;
+0F88;TIBETAN SIGN LCE TSA CAN;Lo;0;L;;;;;N;;;;;
+0F89;TIBETAN SIGN MCHU CAN;Lo;0;L;;;;;N;;;;;
+0F8A;TIBETAN SIGN GRU CAN RGYINGS;Lo;0;L;;;;;N;;;;;
+0F8B;TIBETAN SIGN GRU MED RGYINGS;Lo;0;L;;;;;N;;;;;
 0F90;TIBETAN SUBJOINED LETTER KA;Mn;0;NSM;;;;;N;;;;;
 0F91;TIBETAN SUBJOINED LETTER KHA;Mn;0;NSM;;;;;N;;;;;
 0F92;TIBETAN SUBJOINED LETTER GA;Mn;0;NSM;;;;;N;;;;;
@@ -3151,12 +3220,12 @@
 0FAA;TIBETAN SUBJOINED LETTER TSHA;Mn;0;NSM;;;;;N;;;;;
 0FAB;TIBETAN SUBJOINED LETTER DZA;Mn;0;NSM;;;;;N;;;;;
 0FAC;TIBETAN SUBJOINED LETTER DZHA;Mn;0;NSM;0FAB 0FB7;;;;N;;;;;
-0FAD;TIBETAN SUBJOINED LETTER WA;Mn;0;NSM;;;;;N;;*;;;
+0FAD;TIBETAN SUBJOINED LETTER WA;Mn;0;NSM;;;;;N;;;;;
 0FAE;TIBETAN SUBJOINED LETTER ZHA;Mn;0;NSM;;;;;N;;;;;
 0FAF;TIBETAN SUBJOINED LETTER ZA;Mn;0;NSM;;;;;N;;;;;
 0FB0;TIBETAN SUBJOINED LETTER -A;Mn;0;NSM;;;;;N;;;;;
-0FB1;TIBETAN SUBJOINED LETTER YA;Mn;0;NSM;;;;;N;;*;;;
-0FB2;TIBETAN SUBJOINED LETTER RA;Mn;0;NSM;;;;;N;;*;;;
+0FB1;TIBETAN SUBJOINED LETTER YA;Mn;0;NSM;;;;;N;;;;;
+0FB2;TIBETAN SUBJOINED LETTER RA;Mn;0;NSM;;;;;N;;;;;
 0FB3;TIBETAN SUBJOINED LETTER LA;Mn;0;NSM;;;;;N;;;;;
 0FB4;TIBETAN SUBJOINED LETTER SHA;Mn;0;NSM;;;;;N;;;;;
 0FB5;TIBETAN SUBJOINED LETTER SSA;Mn;0;NSM;;;;;N;;;;;
@@ -3164,31 +3233,35 @@
 0FB7;TIBETAN SUBJOINED LETTER HA;Mn;0;NSM;;;;;N;;;;;
 0FB8;TIBETAN SUBJOINED LETTER A;Mn;0;NSM;;;;;N;;;;;
 0FB9;TIBETAN SUBJOINED LETTER KSSA;Mn;0;NSM;0F90 0FB5;;;;N;;;;;
-0FBA;TIBETAN SUBJOINED LETTER FIXED-FORM WA;Mn;0;NSM;;;;;N;;*;;;
-0FBB;TIBETAN SUBJOINED LETTER FIXED-FORM YA;Mn;0;NSM;;;;;N;;*;;;
-0FBC;TIBETAN SUBJOINED LETTER FIXED-FORM RA;Mn;0;NSM;;;;;N;;*;;;
-0FBE;TIBETAN KU RU KHA;So;0;L;;;;;N;;kuruka;;;
-0FBF;TIBETAN KU RU KHA BZHI MIG CAN;So;0;L;;;;;N;;kuruka shi mik chen;;;
+0FBA;TIBETAN SUBJOINED LETTER FIXED-FORM WA;Mn;0;NSM;;;;;N;;;;;
+0FBB;TIBETAN SUBJOINED LETTER FIXED-FORM YA;Mn;0;NSM;;;;;N;;;;;
+0FBC;TIBETAN SUBJOINED LETTER FIXED-FORM RA;Mn;0;NSM;;;;;N;;;;;
+0FBE;TIBETAN KU RU KHA;So;0;L;;;;;N;;;;;
+0FBF;TIBETAN KU RU KHA BZHI MIG CAN;So;0;L;;;;;N;;;;;
 0FC0;TIBETAN CANTILLATION SIGN HEAVY BEAT;So;0;L;;;;;N;;;;;
 0FC1;TIBETAN CANTILLATION SIGN LIGHT BEAT;So;0;L;;;;;N;;;;;
-0FC2;TIBETAN CANTILLATION SIGN CANG TE-U;So;0;L;;;;;N;;chang tyu;;;
-0FC3;TIBETAN CANTILLATION SIGN SBUB -CHAL;So;0;L;;;;;N;;bub chey;;;
-0FC4;TIBETAN SYMBOL DRIL BU;So;0;L;;;;;N;;drilbu;;;
-0FC5;TIBETAN SYMBOL RDO RJE;So;0;L;;;;;N;;dorje;;;
-0FC6;TIBETAN SYMBOL PADMA GDAN;Mn;220;NSM;;;;;N;;pema den;;;
-0FC7;TIBETAN SYMBOL RDO RJE RGYA GRAM;So;0;L;;;;;N;;dorje gya dram;;;
-0FC8;TIBETAN SYMBOL PHUR PA;So;0;L;;;;;N;;phurba;;;
-0FC9;TIBETAN SYMBOL NOR BU;So;0;L;;;;;N;;norbu;;;
-0FCA;TIBETAN SYMBOL NOR BU NYIS -KHYIL;So;0;L;;;;;N;;norbu nyi khyi;;;
-0FCB;TIBETAN SYMBOL NOR BU GSUM -KHYIL;So;0;L;;;;;N;;norbu sum khyi;;;
-0FCC;TIBETAN SYMBOL NOR BU BZHI -KHYIL;So;0;L;;;;;N;;norbu shi khyi;;;
-0FCE;TIBETAN SIGN RDEL NAG RDEL DKAR;So;0;L;;;;;N;;dena deka;;;
-0FCF;TIBETAN SIGN RDEL NAG GSUM;So;0;L;;;;;N;;dena sum;;;
-0FD0;TIBETAN MARK BSKA- SHOG GI MGO RGYAN;Po;0;L;;;;;N;;ka shog gi go gyen;;;
-0FD1;TIBETAN MARK MNYAM YIG GI MGO RGYAN;Po;0;L;;;;;N;;nyam yig gi go gyen;;;
-0FD2;TIBETAN MARK NYIS TSHEG;Po;0;L;;;;;N;;nyi tsek;;;
-0FD3;TIBETAN MARK INITIAL BRDA RNYING YIG MGO MDUN MA;Po;0;L;;;;;N;;da nying yik go dun ma;;;
-0FD4;TIBETAN MARK CLOSING BRDA RNYING YIG MGO SGAB MA;Po;0;L;;;;;N;;da nying yik go kab ma;;;
+0FC2;TIBETAN CANTILLATION SIGN CANG TE-U;So;0;L;;;;;N;;;;;
+0FC3;TIBETAN CANTILLATION SIGN SBUB -CHAL;So;0;L;;;;;N;;;;;
+0FC4;TIBETAN SYMBOL DRIL BU;So;0;L;;;;;N;;;;;
+0FC5;TIBETAN SYMBOL RDO RJE;So;0;L;;;;;N;;;;;
+0FC6;TIBETAN SYMBOL PADMA GDAN;Mn;220;NSM;;;;;N;;;;;
+0FC7;TIBETAN SYMBOL RDO RJE RGYA GRAM;So;0;L;;;;;N;;;;;
+0FC8;TIBETAN SYMBOL PHUR PA;So;0;L;;;;;N;;;;;
+0FC9;TIBETAN SYMBOL NOR BU;So;0;L;;;;;N;;;;;
+0FCA;TIBETAN SYMBOL NOR BU NYIS -KHYIL;So;0;L;;;;;N;;;;;
+0FCB;TIBETAN SYMBOL NOR BU GSUM -KHYIL;So;0;L;;;;;N;;;;;
+0FCC;TIBETAN SYMBOL NOR BU BZHI -KHYIL;So;0;L;;;;;N;;;;;
+0FCE;TIBETAN SIGN RDEL NAG RDEL DKAR;So;0;L;;;;;N;;;;;
+0FCF;TIBETAN SIGN RDEL NAG GSUM;So;0;L;;;;;N;;;;;
+0FD0;TIBETAN MARK BSKA- SHOG GI MGO RGYAN;Po;0;L;;;;;N;;;;;
+0FD1;TIBETAN MARK MNYAM YIG GI MGO RGYAN;Po;0;L;;;;;N;;;;;
+0FD2;TIBETAN MARK NYIS TSHEG;Po;0;L;;;;;N;;;;;
+0FD3;TIBETAN MARK INITIAL BRDA RNYING YIG MGO MDUN MA;Po;0;L;;;;;N;;;;;
+0FD4;TIBETAN MARK CLOSING BRDA RNYING YIG MGO SGAB MA;Po;0;L;;;;;N;;;;;
+0FD5;RIGHT-FACING SVASTI SIGN;So;0;L;;;;;N;;;;;
+0FD6;LEFT-FACING SVASTI SIGN;So;0;L;;;;;N;;;;;
+0FD7;RIGHT-FACING SVASTI SIGN WITH DOTS;So;0;L;;;;;N;;;;;
+0FD8;LEFT-FACING SVASTI SIGN WITH DOTS;So;0;L;;;;;N;;;;;
 1000;MYANMAR LETTER KA;Lo;0;L;;;;;N;;;;;
 1001;MYANMAR LETTER KHA;Lo;0;L;;;;;N;;;;;
 1002;MYANMAR LETTER GA;Lo;0;L;;;;;N;;;;;
@@ -3343,46 +3416,50 @@
 1097;MYANMAR SHAN DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
 1098;MYANMAR SHAN DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
 1099;MYANMAR SHAN DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+109A;MYANMAR SIGN KHAMTI TONE-1;Mc;0;L;;;;;N;;;;;
+109B;MYANMAR SIGN KHAMTI TONE-3;Mc;0;L;;;;;N;;;;;
+109C;MYANMAR VOWEL SIGN AITON A;Mc;0;L;;;;;N;;;;;
+109D;MYANMAR VOWEL SIGN AITON AI;Mn;0;NSM;;;;;N;;;;;
 109E;MYANMAR SYMBOL SHAN ONE;So;0;L;;;;;N;;;;;
 109F;MYANMAR SYMBOL SHAN EXCLAMATION;So;0;L;;;;;N;;;;;
-10A0;GEORGIAN CAPITAL LETTER AN;Lu;0;L;;;;;N;;Khutsuri;;2D00;
-10A1;GEORGIAN CAPITAL LETTER BAN;Lu;0;L;;;;;N;;Khutsuri;;2D01;
-10A2;GEORGIAN CAPITAL LETTER GAN;Lu;0;L;;;;;N;;Khutsuri;;2D02;
-10A3;GEORGIAN CAPITAL LETTER DON;Lu;0;L;;;;;N;;Khutsuri;;2D03;
-10A4;GEORGIAN CAPITAL LETTER EN;Lu;0;L;;;;;N;;Khutsuri;;2D04;
-10A5;GEORGIAN CAPITAL LETTER VIN;Lu;0;L;;;;;N;;Khutsuri;;2D05;
-10A6;GEORGIAN CAPITAL LETTER ZEN;Lu;0;L;;;;;N;;Khutsuri;;2D06;
-10A7;GEORGIAN CAPITAL LETTER TAN;Lu;0;L;;;;;N;;Khutsuri;;2D07;
-10A8;GEORGIAN CAPITAL LETTER IN;Lu;0;L;;;;;N;;Khutsuri;;2D08;
-10A9;GEORGIAN CAPITAL LETTER KAN;Lu;0;L;;;;;N;;Khutsuri;;2D09;
-10AA;GEORGIAN CAPITAL LETTER LAS;Lu;0;L;;;;;N;;Khutsuri;;2D0A;
-10AB;GEORGIAN CAPITAL LETTER MAN;Lu;0;L;;;;;N;;Khutsuri;;2D0B;
-10AC;GEORGIAN CAPITAL LETTER NAR;Lu;0;L;;;;;N;;Khutsuri;;2D0C;
-10AD;GEORGIAN CAPITAL LETTER ON;Lu;0;L;;;;;N;;Khutsuri;;2D0D;
-10AE;GEORGIAN CAPITAL LETTER PAR;Lu;0;L;;;;;N;;Khutsuri;;2D0E;
-10AF;GEORGIAN CAPITAL LETTER ZHAR;Lu;0;L;;;;;N;;Khutsuri;;2D0F;
-10B0;GEORGIAN CAPITAL LETTER RAE;Lu;0;L;;;;;N;;Khutsuri;;2D10;
-10B1;GEORGIAN CAPITAL LETTER SAN;Lu;0;L;;;;;N;;Khutsuri;;2D11;
-10B2;GEORGIAN CAPITAL LETTER TAR;Lu;0;L;;;;;N;;Khutsuri;;2D12;
-10B3;GEORGIAN CAPITAL LETTER UN;Lu;0;L;;;;;N;;Khutsuri;;2D13;
-10B4;GEORGIAN CAPITAL LETTER PHAR;Lu;0;L;;;;;N;;Khutsuri;;2D14;
-10B5;GEORGIAN CAPITAL LETTER KHAR;Lu;0;L;;;;;N;;Khutsuri;;2D15;
-10B6;GEORGIAN CAPITAL LETTER GHAN;Lu;0;L;;;;;N;;Khutsuri;;2D16;
-10B7;GEORGIAN CAPITAL LETTER QAR;Lu;0;L;;;;;N;;Khutsuri;;2D17;
-10B8;GEORGIAN CAPITAL LETTER SHIN;Lu;0;L;;;;;N;;Khutsuri;;2D18;
-10B9;GEORGIAN CAPITAL LETTER CHIN;Lu;0;L;;;;;N;;Khutsuri;;2D19;
-10BA;GEORGIAN CAPITAL LETTER CAN;Lu;0;L;;;;;N;;Khutsuri;;2D1A;
-10BB;GEORGIAN CAPITAL LETTER JIL;Lu;0;L;;;;;N;;Khutsuri;;2D1B;
-10BC;GEORGIAN CAPITAL LETTER CIL;Lu;0;L;;;;;N;;Khutsuri;;2D1C;
-10BD;GEORGIAN CAPITAL LETTER CHAR;Lu;0;L;;;;;N;;Khutsuri;;2D1D;
-10BE;GEORGIAN CAPITAL LETTER XAN;Lu;0;L;;;;;N;;Khutsuri;;2D1E;
-10BF;GEORGIAN CAPITAL LETTER JHAN;Lu;0;L;;;;;N;;Khutsuri;;2D1F;
-10C0;GEORGIAN CAPITAL LETTER HAE;Lu;0;L;;;;;N;;Khutsuri;;2D20;
-10C1;GEORGIAN CAPITAL LETTER HE;Lu;0;L;;;;;N;;Khutsuri;;2D21;
-10C2;GEORGIAN CAPITAL LETTER HIE;Lu;0;L;;;;;N;;Khutsuri;;2D22;
-10C3;GEORGIAN CAPITAL LETTER WE;Lu;0;L;;;;;N;;Khutsuri;;2D23;
-10C4;GEORGIAN CAPITAL LETTER HAR;Lu;0;L;;;;;N;;Khutsuri;;2D24;
-10C5;GEORGIAN CAPITAL LETTER HOE;Lu;0;L;;;;;N;;Khutsuri;;2D25;
+10A0;GEORGIAN CAPITAL LETTER AN;Lu;0;L;;;;;N;;;;2D00;
+10A1;GEORGIAN CAPITAL LETTER BAN;Lu;0;L;;;;;N;;;;2D01;
+10A2;GEORGIAN CAPITAL LETTER GAN;Lu;0;L;;;;;N;;;;2D02;
+10A3;GEORGIAN CAPITAL LETTER DON;Lu;0;L;;;;;N;;;;2D03;
+10A4;GEORGIAN CAPITAL LETTER EN;Lu;0;L;;;;;N;;;;2D04;
+10A5;GEORGIAN CAPITAL LETTER VIN;Lu;0;L;;;;;N;;;;2D05;
+10A6;GEORGIAN CAPITAL LETTER ZEN;Lu;0;L;;;;;N;;;;2D06;
+10A7;GEORGIAN CAPITAL LETTER TAN;Lu;0;L;;;;;N;;;;2D07;
+10A8;GEORGIAN CAPITAL LETTER IN;Lu;0;L;;;;;N;;;;2D08;
+10A9;GEORGIAN CAPITAL LETTER KAN;Lu;0;L;;;;;N;;;;2D09;
+10AA;GEORGIAN CAPITAL LETTER LAS;Lu;0;L;;;;;N;;;;2D0A;
+10AB;GEORGIAN CAPITAL LETTER MAN;Lu;0;L;;;;;N;;;;2D0B;
+10AC;GEORGIAN CAPITAL LETTER NAR;Lu;0;L;;;;;N;;;;2D0C;
+10AD;GEORGIAN CAPITAL LETTER ON;Lu;0;L;;;;;N;;;;2D0D;
+10AE;GEORGIAN CAPITAL LETTER PAR;Lu;0;L;;;;;N;;;;2D0E;
+10AF;GEORGIAN CAPITAL LETTER ZHAR;Lu;0;L;;;;;N;;;;2D0F;
+10B0;GEORGIAN CAPITAL LETTER RAE;Lu;0;L;;;;;N;;;;2D10;
+10B1;GEORGIAN CAPITAL LETTER SAN;Lu;0;L;;;;;N;;;;2D11;
+10B2;GEORGIAN CAPITAL LETTER TAR;Lu;0;L;;;;;N;;;;2D12;
+10B3;GEORGIAN CAPITAL LETTER UN;Lu;0;L;;;;;N;;;;2D13;
+10B4;GEORGIAN CAPITAL LETTER PHAR;Lu;0;L;;;;;N;;;;2D14;
+10B5;GEORGIAN CAPITAL LETTER KHAR;Lu;0;L;;;;;N;;;;2D15;
+10B6;GEORGIAN CAPITAL LETTER GHAN;Lu;0;L;;;;;N;;;;2D16;
+10B7;GEORGIAN CAPITAL LETTER QAR;Lu;0;L;;;;;N;;;;2D17;
+10B8;GEORGIAN CAPITAL LETTER SHIN;Lu;0;L;;;;;N;;;;2D18;
+10B9;GEORGIAN CAPITAL LETTER CHIN;Lu;0;L;;;;;N;;;;2D19;
+10BA;GEORGIAN CAPITAL LETTER CAN;Lu;0;L;;;;;N;;;;2D1A;
+10BB;GEORGIAN CAPITAL LETTER JIL;Lu;0;L;;;;;N;;;;2D1B;
+10BC;GEORGIAN CAPITAL LETTER CIL;Lu;0;L;;;;;N;;;;2D1C;
+10BD;GEORGIAN CAPITAL LETTER CHAR;Lu;0;L;;;;;N;;;;2D1D;
+10BE;GEORGIAN CAPITAL LETTER XAN;Lu;0;L;;;;;N;;;;2D1E;
+10BF;GEORGIAN CAPITAL LETTER JHAN;Lu;0;L;;;;;N;;;;2D1F;
+10C0;GEORGIAN CAPITAL LETTER HAE;Lu;0;L;;;;;N;;;;2D20;
+10C1;GEORGIAN CAPITAL LETTER HE;Lu;0;L;;;;;N;;;;2D21;
+10C2;GEORGIAN CAPITAL LETTER HIE;Lu;0;L;;;;;N;;;;2D22;
+10C3;GEORGIAN CAPITAL LETTER WE;Lu;0;L;;;;;N;;;;2D23;
+10C4;GEORGIAN CAPITAL LETTER HAR;Lu;0;L;;;;;N;;;;2D24;
+10C5;GEORGIAN CAPITAL LETTER HOE;Lu;0;L;;;;;N;;;;2D25;
 10D0;GEORGIAN LETTER AN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER AN;;;;
 10D1;GEORGIAN LETTER BAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER BAN;;;;
 10D2;GEORGIAN LETTER GAN;Lo;0;L;;;;;N;GEORGIAN SMALL LETTER GAN;;;;
@@ -3428,25 +3505,25 @@
 10FA;GEORGIAN LETTER AIN;Lo;0;L;;;;;N;;;;;
 10FB;GEORGIAN PARAGRAPH SEPARATOR;Po;0;L;;;;;N;;;;;
 10FC;MODIFIER LETTER GEORGIAN NAR;Lm;0;L;<super> 10DC;;;;N;;;;;
-1100;HANGUL CHOSEONG KIYEOK;Lo;0;L;;;;;N;;g *;;;
-1101;HANGUL CHOSEONG SSANGKIYEOK;Lo;0;L;;;;;N;;gg *;;;
-1102;HANGUL CHOSEONG NIEUN;Lo;0;L;;;;;N;;n *;;;
-1103;HANGUL CHOSEONG TIKEUT;Lo;0;L;;;;;N;;d *;;;
-1104;HANGUL CHOSEONG SSANGTIKEUT;Lo;0;L;;;;;N;;dd *;;;
-1105;HANGUL CHOSEONG RIEUL;Lo;0;L;;;;;N;;r *;;;
-1106;HANGUL CHOSEONG MIEUM;Lo;0;L;;;;;N;;m *;;;
-1107;HANGUL CHOSEONG PIEUP;Lo;0;L;;;;;N;;b *;;;
-1108;HANGUL CHOSEONG SSANGPIEUP;Lo;0;L;;;;;N;;bb *;;;
-1109;HANGUL CHOSEONG SIOS;Lo;0;L;;;;;N;;s *;;;
-110A;HANGUL CHOSEONG SSANGSIOS;Lo;0;L;;;;;N;;ss *;;;
+1100;HANGUL CHOSEONG KIYEOK;Lo;0;L;;;;;N;;;;;
+1101;HANGUL CHOSEONG SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
+1102;HANGUL CHOSEONG NIEUN;Lo;0;L;;;;;N;;;;;
+1103;HANGUL CHOSEONG TIKEUT;Lo;0;L;;;;;N;;;;;
+1104;HANGUL CHOSEONG SSANGTIKEUT;Lo;0;L;;;;;N;;;;;
+1105;HANGUL CHOSEONG RIEUL;Lo;0;L;;;;;N;;;;;
+1106;HANGUL CHOSEONG MIEUM;Lo;0;L;;;;;N;;;;;
+1107;HANGUL CHOSEONG PIEUP;Lo;0;L;;;;;N;;;;;
+1108;HANGUL CHOSEONG SSANGPIEUP;Lo;0;L;;;;;N;;;;;
+1109;HANGUL CHOSEONG SIOS;Lo;0;L;;;;;N;;;;;
+110A;HANGUL CHOSEONG SSANGSIOS;Lo;0;L;;;;;N;;;;;
 110B;HANGUL CHOSEONG IEUNG;Lo;0;L;;;;;N;;;;;
-110C;HANGUL CHOSEONG CIEUC;Lo;0;L;;;;;N;;j *;;;
-110D;HANGUL CHOSEONG SSANGCIEUC;Lo;0;L;;;;;N;;jj *;;;
-110E;HANGUL CHOSEONG CHIEUCH;Lo;0;L;;;;;N;;c *;;;
-110F;HANGUL CHOSEONG KHIEUKH;Lo;0;L;;;;;N;;k *;;;
-1110;HANGUL CHOSEONG THIEUTH;Lo;0;L;;;;;N;;t *;;;
-1111;HANGUL CHOSEONG PHIEUPH;Lo;0;L;;;;;N;;p *;;;
-1112;HANGUL CHOSEONG HIEUH;Lo;0;L;;;;;N;;h *;;;
+110C;HANGUL CHOSEONG CIEUC;Lo;0;L;;;;;N;;;;;
+110D;HANGUL CHOSEONG SSANGCIEUC;Lo;0;L;;;;;N;;;;;
+110E;HANGUL CHOSEONG CHIEUCH;Lo;0;L;;;;;N;;;;;
+110F;HANGUL CHOSEONG KHIEUKH;Lo;0;L;;;;;N;;;;;
+1110;HANGUL CHOSEONG THIEUTH;Lo;0;L;;;;;N;;;;;
+1111;HANGUL CHOSEONG PHIEUPH;Lo;0;L;;;;;N;;;;;
+1112;HANGUL CHOSEONG HIEUH;Lo;0;L;;;;;N;;;;;
 1113;HANGUL CHOSEONG NIEUN-KIYEOK;Lo;0;L;;;;;N;;;;;
 1114;HANGUL CHOSEONG SSANGNIEUN;Lo;0;L;;;;;N;;;;;
 1115;HANGUL CHOSEONG NIEUN-TIKEUT;Lo;0;L;;;;;N;;;;;
@@ -3518,6 +3595,11 @@
 1157;HANGUL CHOSEONG KAPYEOUNPHIEUPH;Lo;0;L;;;;;N;;;;;
 1158;HANGUL CHOSEONG SSANGHIEUH;Lo;0;L;;;;;N;;;;;
 1159;HANGUL CHOSEONG YEORINHIEUH;Lo;0;L;;;;;N;;;;;
+115A;HANGUL CHOSEONG KIYEOK-TIKEUT;Lo;0;L;;;;;N;;;;;
+115B;HANGUL CHOSEONG NIEUN-SIOS;Lo;0;L;;;;;N;;;;;
+115C;HANGUL CHOSEONG NIEUN-CIEUC;Lo;0;L;;;;;N;;;;;
+115D;HANGUL CHOSEONG NIEUN-HIEUH;Lo;0;L;;;;;N;;;;;
+115E;HANGUL CHOSEONG TIKEUT-RIEUL;Lo;0;L;;;;;N;;;;;
 115F;HANGUL CHOSEONG FILLER;Lo;0;L;;;;;N;;;;;
 1160;HANGUL JUNGSEONG FILLER;Lo;0;L;;;;;N;;;;;
 1161;HANGUL JUNGSEONG A;Lo;0;L;;;;;N;;;;;
@@ -3586,33 +3668,38 @@
 11A0;HANGUL JUNGSEONG ARAEA-U;Lo;0;L;;;;;N;;;;;
 11A1;HANGUL JUNGSEONG ARAEA-I;Lo;0;L;;;;;N;;;;;
 11A2;HANGUL JUNGSEONG SSANGARAEA;Lo;0;L;;;;;N;;;;;
-11A8;HANGUL JONGSEONG KIYEOK;Lo;0;L;;;;;N;;g *;;;
-11A9;HANGUL JONGSEONG SSANGKIYEOK;Lo;0;L;;;;;N;;gg *;;;
-11AA;HANGUL JONGSEONG KIYEOK-SIOS;Lo;0;L;;;;;N;;gs *;;;
-11AB;HANGUL JONGSEONG NIEUN;Lo;0;L;;;;;N;;n *;;;
-11AC;HANGUL JONGSEONG NIEUN-CIEUC;Lo;0;L;;;;;N;;nj *;;;
-11AD;HANGUL JONGSEONG NIEUN-HIEUH;Lo;0;L;;;;;N;;nh *;;;
-11AE;HANGUL JONGSEONG TIKEUT;Lo;0;L;;;;;N;;d *;;;
-11AF;HANGUL JONGSEONG RIEUL;Lo;0;L;;;;;N;;l *;;;
-11B0;HANGUL JONGSEONG RIEUL-KIYEOK;Lo;0;L;;;;;N;;lg *;;;
-11B1;HANGUL JONGSEONG RIEUL-MIEUM;Lo;0;L;;;;;N;;lm *;;;
-11B2;HANGUL JONGSEONG RIEUL-PIEUP;Lo;0;L;;;;;N;;lb *;;;
-11B3;HANGUL JONGSEONG RIEUL-SIOS;Lo;0;L;;;;;N;;ls *;;;
-11B4;HANGUL JONGSEONG RIEUL-THIEUTH;Lo;0;L;;;;;N;;lt *;;;
-11B5;HANGUL JONGSEONG RIEUL-PHIEUPH;Lo;0;L;;;;;N;;lp *;;;
-11B6;HANGUL JONGSEONG RIEUL-HIEUH;Lo;0;L;;;;;N;;lh *;;;
-11B7;HANGUL JONGSEONG MIEUM;Lo;0;L;;;;;N;;m *;;;
-11B8;HANGUL JONGSEONG PIEUP;Lo;0;L;;;;;N;;b *;;;
-11B9;HANGUL JONGSEONG PIEUP-SIOS;Lo;0;L;;;;;N;;bs *;;;
-11BA;HANGUL JONGSEONG SIOS;Lo;0;L;;;;;N;;s *;;;
-11BB;HANGUL JONGSEONG SSANGSIOS;Lo;0;L;;;;;N;;ss *;;;
-11BC;HANGUL JONGSEONG IEUNG;Lo;0;L;;;;;N;;ng *;;;
-11BD;HANGUL JONGSEONG CIEUC;Lo;0;L;;;;;N;;j *;;;
-11BE;HANGUL JONGSEONG CHIEUCH;Lo;0;L;;;;;N;;c *;;;
-11BF;HANGUL JONGSEONG KHIEUKH;Lo;0;L;;;;;N;;k *;;;
-11C0;HANGUL JONGSEONG THIEUTH;Lo;0;L;;;;;N;;t *;;;
-11C1;HANGUL JONGSEONG PHIEUPH;Lo;0;L;;;;;N;;p *;;;
-11C2;HANGUL JONGSEONG HIEUH;Lo;0;L;;;;;N;;h *;;;
+11A3;HANGUL JUNGSEONG A-EU;Lo;0;L;;;;;N;;;;;
+11A4;HANGUL JUNGSEONG YA-U;Lo;0;L;;;;;N;;;;;
+11A5;HANGUL JUNGSEONG YEO-YA;Lo;0;L;;;;;N;;;;;
+11A6;HANGUL JUNGSEONG O-YA;Lo;0;L;;;;;N;;;;;
+11A7;HANGUL JUNGSEONG O-YAE;Lo;0;L;;;;;N;;;;;
+11A8;HANGUL JONGSEONG KIYEOK;Lo;0;L;;;;;N;;;;;
+11A9;HANGUL JONGSEONG SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
+11AA;HANGUL JONGSEONG KIYEOK-SIOS;Lo;0;L;;;;;N;;;;;
+11AB;HANGUL JONGSEONG NIEUN;Lo;0;L;;;;;N;;;;;
+11AC;HANGUL JONGSEONG NIEUN-CIEUC;Lo;0;L;;;;;N;;;;;
+11AD;HANGUL JONGSEONG NIEUN-HIEUH;Lo;0;L;;;;;N;;;;;
+11AE;HANGUL JONGSEONG TIKEUT;Lo;0;L;;;;;N;;;;;
+11AF;HANGUL JONGSEONG RIEUL;Lo;0;L;;;;;N;;;;;
+11B0;HANGUL JONGSEONG RIEUL-KIYEOK;Lo;0;L;;;;;N;;;;;
+11B1;HANGUL JONGSEONG RIEUL-MIEUM;Lo;0;L;;;;;N;;;;;
+11B2;HANGUL JONGSEONG RIEUL-PIEUP;Lo;0;L;;;;;N;;;;;
+11B3;HANGUL JONGSEONG RIEUL-SIOS;Lo;0;L;;;;;N;;;;;
+11B4;HANGUL JONGSEONG RIEUL-THIEUTH;Lo;0;L;;;;;N;;;;;
+11B5;HANGUL JONGSEONG RIEUL-PHIEUPH;Lo;0;L;;;;;N;;;;;
+11B6;HANGUL JONGSEONG RIEUL-HIEUH;Lo;0;L;;;;;N;;;;;
+11B7;HANGUL JONGSEONG MIEUM;Lo;0;L;;;;;N;;;;;
+11B8;HANGUL JONGSEONG PIEUP;Lo;0;L;;;;;N;;;;;
+11B9;HANGUL JONGSEONG PIEUP-SIOS;Lo;0;L;;;;;N;;;;;
+11BA;HANGUL JONGSEONG SIOS;Lo;0;L;;;;;N;;;;;
+11BB;HANGUL JONGSEONG SSANGSIOS;Lo;0;L;;;;;N;;;;;
+11BC;HANGUL JONGSEONG IEUNG;Lo;0;L;;;;;N;;;;;
+11BD;HANGUL JONGSEONG CIEUC;Lo;0;L;;;;;N;;;;;
+11BE;HANGUL JONGSEONG CHIEUCH;Lo;0;L;;;;;N;;;;;
+11BF;HANGUL JONGSEONG KHIEUKH;Lo;0;L;;;;;N;;;;;
+11C0;HANGUL JONGSEONG THIEUTH;Lo;0;L;;;;;N;;;;;
+11C1;HANGUL JONGSEONG PHIEUPH;Lo;0;L;;;;;N;;;;;
+11C2;HANGUL JONGSEONG HIEUH;Lo;0;L;;;;;N;;;;;
 11C3;HANGUL JONGSEONG KIYEOK-RIEUL;Lo;0;L;;;;;N;;;;;
 11C4;HANGUL JONGSEONG KIYEOK-SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
 11C5;HANGUL JONGSEONG NIEUN-KIYEOK;Lo;0;L;;;;;N;;;;;
@@ -3668,6 +3755,12 @@
 11F7;HANGUL JONGSEONG HIEUH-MIEUM;Lo;0;L;;;;;N;;;;;
 11F8;HANGUL JONGSEONG HIEUH-PIEUP;Lo;0;L;;;;;N;;;;;
 11F9;HANGUL JONGSEONG YEORINHIEUH;Lo;0;L;;;;;N;;;;;
+11FA;HANGUL JONGSEONG KIYEOK-NIEUN;Lo;0;L;;;;;N;;;;;
+11FB;HANGUL JONGSEONG KIYEOK-PIEUP;Lo;0;L;;;;;N;;;;;
+11FC;HANGUL JONGSEONG KIYEOK-CHIEUCH;Lo;0;L;;;;;N;;;;;
+11FD;HANGUL JONGSEONG KIYEOK-KHIEUKH;Lo;0;L;;;;;N;;;;;
+11FE;HANGUL JONGSEONG KIYEOK-HIEUH;Lo;0;L;;;;;N;;;;;
+11FF;HANGUL JONGSEONG SSANGNIEUN;Lo;0;L;;;;;N;;;;;
 1200;ETHIOPIC SYLLABLE HA;Lo;0;L;;;;;N;;;;;
 1201;ETHIOPIC SYLLABLE HU;Lo;0;L;;;;;N;;;;;
 1202;ETHIOPIC SYLLABLE HI;Lo;0;L;;;;;N;;;;;
@@ -4135,6 +4228,7 @@
 13F2;CHEROKEE LETTER YO;Lo;0;L;;;;;N;;;;;
 13F3;CHEROKEE LETTER YU;Lo;0;L;;;;;N;;;;;
 13F4;CHEROKEE LETTER YV;Lo;0;L;;;;;N;;;;;
+1400;CANADIAN SYLLABICS HYPHEN;Pd;0;ON;;;;;N;;;;;
 1401;CANADIAN SYLLABICS E;Lo;0;L;;;;;N;;;;;
 1402;CANADIAN SYLLABICS AAI;Lo;0;L;;;;;N;;;;;
 1403;CANADIAN SYLLABICS I;Lo;0;L;;;;;N;;;;;
@@ -4765,6 +4859,15 @@
 1674;CANADIAN SYLLABICS NNGOO;Lo;0;L;;;;;N;;;;;
 1675;CANADIAN SYLLABICS NNGA;Lo;0;L;;;;;N;;;;;
 1676;CANADIAN SYLLABICS NNGAA;Lo;0;L;;;;;N;;;;;
+1677;CANADIAN SYLLABICS WOODS-CREE THWEE;Lo;0;L;;;;;N;;;;;
+1678;CANADIAN SYLLABICS WOODS-CREE THWI;Lo;0;L;;;;;N;;;;;
+1679;CANADIAN SYLLABICS WOODS-CREE THWII;Lo;0;L;;;;;N;;;;;
+167A;CANADIAN SYLLABICS WOODS-CREE THWO;Lo;0;L;;;;;N;;;;;
+167B;CANADIAN SYLLABICS WOODS-CREE THWOO;Lo;0;L;;;;;N;;;;;
+167C;CANADIAN SYLLABICS WOODS-CREE THWA;Lo;0;L;;;;;N;;;;;
+167D;CANADIAN SYLLABICS WOODS-CREE THWAA;Lo;0;L;;;;;N;;;;;
+167E;CANADIAN SYLLABICS WOODS-CREE FINAL TH;Lo;0;L;;;;;N;;;;;
+167F;CANADIAN SYLLABICS BLACKFOOT W;Lo;0;L;;;;;N;;;;;
 1680;OGHAM SPACE MARK;Zs;0;WS;;;;;N;;;;;
 1681;OGHAM LETTER BEITH;Lo;0;L;;;;;N;;;;;
 1682;OGHAM LETTER LUIS;Lo;0;L;;;;;N;;;;;
@@ -4872,9 +4975,9 @@
 16EB;RUNIC SINGLE PUNCTUATION;Po;0;L;;;;;N;;;;;
 16EC;RUNIC MULTIPLE PUNCTUATION;Po;0;L;;;;;N;;;;;
 16ED;RUNIC CROSS PUNCTUATION;Po;0;L;;;;;N;;;;;
-16EE;RUNIC ARLAUG SYMBOL;Nl;0;L;;;;17;N;;golden number 17;;;
-16EF;RUNIC TVIMADUR SYMBOL;Nl;0;L;;;;18;N;;golden number 18;;;
-16F0;RUNIC BELGTHOR SYMBOL;Nl;0;L;;;;19;N;;golden number 19;;;
+16EE;RUNIC ARLAUG SYMBOL;Nl;0;L;;;;17;N;;;;;
+16EF;RUNIC TVIMADUR SYMBOL;Nl;0;L;;;;18;N;;;;;
+16F0;RUNIC BELGTHOR SYMBOL;Nl;0;L;;;;19;N;;;;;
 1700;TAGALOG LETTER A;Lo;0;L;;;;;N;;;;;
 1701;TAGALOG LETTER I;Lo;0;L;;;;;N;;;;;
 1702;TAGALOG LETTER U;Lo;0;L;;;;;N;;;;;
@@ -4991,8 +5094,8 @@
 17A0;KHMER LETTER HA;Lo;0;L;;;;;N;;;;;
 17A1;KHMER LETTER LA;Lo;0;L;;;;;N;;;;;
 17A2;KHMER LETTER QA;Lo;0;L;;;;;N;;;;;
-17A3;KHMER INDEPENDENT VOWEL QAQ;Lo;0;L;;;;;N;;*;;;
-17A4;KHMER INDEPENDENT VOWEL QAA;Lo;0;L;;;;;N;;*;;;
+17A3;KHMER INDEPENDENT VOWEL QAQ;Lo;0;L;;;;;N;;;;;
+17A4;KHMER INDEPENDENT VOWEL QAA;Lo;0;L;;;;;N;;;;;
 17A5;KHMER INDEPENDENT VOWEL QI;Lo;0;L;;;;;N;;;;;
 17A6;KHMER INDEPENDENT VOWEL QII;Lo;0;L;;;;;N;;;;;
 17A7;KHMER INDEPENDENT VOWEL QU;Lo;0;L;;;;;N;;;;;
@@ -5008,8 +5111,8 @@
 17B1;KHMER INDEPENDENT VOWEL QOO TYPE ONE;Lo;0;L;;;;;N;;;;;
 17B2;KHMER INDEPENDENT VOWEL QOO TYPE TWO;Lo;0;L;;;;;N;;;;;
 17B3;KHMER INDEPENDENT VOWEL QAU;Lo;0;L;;;;;N;;;;;
-17B4;KHMER VOWEL INHERENT AQ;Cf;0;L;;;;;N;;*;;;
-17B5;KHMER VOWEL INHERENT AA;Cf;0;L;;;;;N;;*;;;
+17B4;KHMER VOWEL INHERENT AQ;Cf;0;L;;;;;N;;;;;
+17B5;KHMER VOWEL INHERENT AA;Cf;0;L;;;;;N;;;;;
 17B6;KHMER VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
 17B7;KHMER VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
 17B8;KHMER VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
@@ -5039,12 +5142,12 @@
 17D0;KHMER SIGN SAMYOK SANNYA;Mn;0;NSM;;;;;N;;;;;
 17D1;KHMER SIGN VIRIAM;Mn;0;NSM;;;;;N;;;;;
 17D2;KHMER SIGN COENG;Mn;9;NSM;;;;;N;;;;;
-17D3;KHMER SIGN BATHAMASAT;Mn;0;NSM;;;;;N;;*;;;
+17D3;KHMER SIGN BATHAMASAT;Mn;0;NSM;;;;;N;;;;;
 17D4;KHMER SIGN KHAN;Po;0;L;;;;;N;;;;;
 17D5;KHMER SIGN BARIYOOSAN;Po;0;L;;;;;N;;;;;
 17D6;KHMER SIGN CAMNUC PII KUUH;Po;0;L;;;;;N;;;;;
 17D7;KHMER SIGN LEK TOO;Lm;0;L;;;;;N;;;;;
-17D8;KHMER SIGN BEYYAL;Po;0;L;;;;;N;;*;;;
+17D8;KHMER SIGN BEYYAL;Po;0;L;;;;;N;;;;;
 17D9;KHMER SIGN PHNAEK MUAN;Po;0;L;;;;;N;;;;;
 17DA;KHMER SIGN KOOMUUT;Po;0;L;;;;;N;;;;;
 17DB;KHMER CURRENCY SYMBOL RIEL;Sc;0;ET;;;;;N;;;;;
@@ -5226,6 +5329,76 @@
 18A8;MONGOLIAN LETTER MANCHU ALI GALI BHA;Lo;0;L;;;;;N;;;;;
 18A9;MONGOLIAN LETTER ALI GALI DAGALGA;Mn;228;NSM;;;;;N;;;;;
 18AA;MONGOLIAN LETTER MANCHU ALI GALI LHA;Lo;0;L;;;;;N;;;;;
+18B0;CANADIAN SYLLABICS OY;Lo;0;L;;;;;N;;;;;
+18B1;CANADIAN SYLLABICS AY;Lo;0;L;;;;;N;;;;;
+18B2;CANADIAN SYLLABICS AAY;Lo;0;L;;;;;N;;;;;
+18B3;CANADIAN SYLLABICS WAY;Lo;0;L;;;;;N;;;;;
+18B4;CANADIAN SYLLABICS POY;Lo;0;L;;;;;N;;;;;
+18B5;CANADIAN SYLLABICS PAY;Lo;0;L;;;;;N;;;;;
+18B6;CANADIAN SYLLABICS PWOY;Lo;0;L;;;;;N;;;;;
+18B7;CANADIAN SYLLABICS TAY;Lo;0;L;;;;;N;;;;;
+18B8;CANADIAN SYLLABICS KAY;Lo;0;L;;;;;N;;;;;
+18B9;CANADIAN SYLLABICS KWAY;Lo;0;L;;;;;N;;;;;
+18BA;CANADIAN SYLLABICS MAY;Lo;0;L;;;;;N;;;;;
+18BB;CANADIAN SYLLABICS NOY;Lo;0;L;;;;;N;;;;;
+18BC;CANADIAN SYLLABICS NAY;Lo;0;L;;;;;N;;;;;
+18BD;CANADIAN SYLLABICS LAY;Lo;0;L;;;;;N;;;;;
+18BE;CANADIAN SYLLABICS SOY;Lo;0;L;;;;;N;;;;;
+18BF;CANADIAN SYLLABICS SAY;Lo;0;L;;;;;N;;;;;
+18C0;CANADIAN SYLLABICS SHOY;Lo;0;L;;;;;N;;;;;
+18C1;CANADIAN SYLLABICS SHAY;Lo;0;L;;;;;N;;;;;
+18C2;CANADIAN SYLLABICS SHWOY;Lo;0;L;;;;;N;;;;;
+18C3;CANADIAN SYLLABICS YOY;Lo;0;L;;;;;N;;;;;
+18C4;CANADIAN SYLLABICS YAY;Lo;0;L;;;;;N;;;;;
+18C5;CANADIAN SYLLABICS RAY;Lo;0;L;;;;;N;;;;;
+18C6;CANADIAN SYLLABICS NWI;Lo;0;L;;;;;N;;;;;
+18C7;CANADIAN SYLLABICS OJIBWAY NWI;Lo;0;L;;;;;N;;;;;
+18C8;CANADIAN SYLLABICS NWII;Lo;0;L;;;;;N;;;;;
+18C9;CANADIAN SYLLABICS OJIBWAY NWII;Lo;0;L;;;;;N;;;;;
+18CA;CANADIAN SYLLABICS NWO;Lo;0;L;;;;;N;;;;;
+18CB;CANADIAN SYLLABICS OJIBWAY NWO;Lo;0;L;;;;;N;;;;;
+18CC;CANADIAN SYLLABICS NWOO;Lo;0;L;;;;;N;;;;;
+18CD;CANADIAN SYLLABICS OJIBWAY NWOO;Lo;0;L;;;;;N;;;;;
+18CE;CANADIAN SYLLABICS RWEE;Lo;0;L;;;;;N;;;;;
+18CF;CANADIAN SYLLABICS RWI;Lo;0;L;;;;;N;;;;;
+18D0;CANADIAN SYLLABICS RWII;Lo;0;L;;;;;N;;;;;
+18D1;CANADIAN SYLLABICS RWO;Lo;0;L;;;;;N;;;;;
+18D2;CANADIAN SYLLABICS RWOO;Lo;0;L;;;;;N;;;;;
+18D3;CANADIAN SYLLABICS RWA;Lo;0;L;;;;;N;;;;;
+18D4;CANADIAN SYLLABICS OJIBWAY P;Lo;0;L;;;;;N;;;;;
+18D5;CANADIAN SYLLABICS OJIBWAY T;Lo;0;L;;;;;N;;;;;
+18D6;CANADIAN SYLLABICS OJIBWAY K;Lo;0;L;;;;;N;;;;;
+18D7;CANADIAN SYLLABICS OJIBWAY C;Lo;0;L;;;;;N;;;;;
+18D8;CANADIAN SYLLABICS OJIBWAY M;Lo;0;L;;;;;N;;;;;
+18D9;CANADIAN SYLLABICS OJIBWAY N;Lo;0;L;;;;;N;;;;;
+18DA;CANADIAN SYLLABICS OJIBWAY S;Lo;0;L;;;;;N;;;;;
+18DB;CANADIAN SYLLABICS OJIBWAY SH;Lo;0;L;;;;;N;;;;;
+18DC;CANADIAN SYLLABICS EASTERN W;Lo;0;L;;;;;N;;;;;
+18DD;CANADIAN SYLLABICS WESTERN W;Lo;0;L;;;;;N;;;;;
+18DE;CANADIAN SYLLABICS FINAL SMALL RING;Lo;0;L;;;;;N;;;;;
+18DF;CANADIAN SYLLABICS FINAL RAISED DOT;Lo;0;L;;;;;N;;;;;
+18E0;CANADIAN SYLLABICS R-CREE RWE;Lo;0;L;;;;;N;;;;;
+18E1;CANADIAN SYLLABICS WEST-CREE LOO;Lo;0;L;;;;;N;;;;;
+18E2;CANADIAN SYLLABICS WEST-CREE LAA;Lo;0;L;;;;;N;;;;;
+18E3;CANADIAN SYLLABICS THWE;Lo;0;L;;;;;N;;;;;
+18E4;CANADIAN SYLLABICS THWA;Lo;0;L;;;;;N;;;;;
+18E5;CANADIAN SYLLABICS TTHWE;Lo;0;L;;;;;N;;;;;
+18E6;CANADIAN SYLLABICS TTHOO;Lo;0;L;;;;;N;;;;;
+18E7;CANADIAN SYLLABICS TTHAA;Lo;0;L;;;;;N;;;;;
+18E8;CANADIAN SYLLABICS TLHWE;Lo;0;L;;;;;N;;;;;
+18E9;CANADIAN SYLLABICS TLHOO;Lo;0;L;;;;;N;;;;;
+18EA;CANADIAN SYLLABICS SAYISI SHWE;Lo;0;L;;;;;N;;;;;
+18EB;CANADIAN SYLLABICS SAYISI SHOO;Lo;0;L;;;;;N;;;;;
+18EC;CANADIAN SYLLABICS SAYISI HOO;Lo;0;L;;;;;N;;;;;
+18ED;CANADIAN SYLLABICS CARRIER GWU;Lo;0;L;;;;;N;;;;;
+18EE;CANADIAN SYLLABICS CARRIER DENE GEE;Lo;0;L;;;;;N;;;;;
+18EF;CANADIAN SYLLABICS CARRIER GAA;Lo;0;L;;;;;N;;;;;
+18F0;CANADIAN SYLLABICS CARRIER GWA;Lo;0;L;;;;;N;;;;;
+18F1;CANADIAN SYLLABICS SAYISI JUU;Lo;0;L;;;;;N;;;;;
+18F2;CANADIAN SYLLABICS CARRIER JWA;Lo;0;L;;;;;N;;;;;
+18F3;CANADIAN SYLLABICS BEAVER DENE L;Lo;0;L;;;;;N;;;;;
+18F4;CANADIAN SYLLABICS BEAVER DENE R;Lo;0;L;;;;;N;;;;;
+18F5;CANADIAN SYLLABICS CARRIER DENTAL S;Lo;0;L;;;;;N;;;;;
 1900;LIMBU VOWEL-CARRIER LETTER;Lo;0;L;;;;;N;;;;;
 1901;LIMBU LETTER KA;Lo;0;L;;;;;N;;;;;
 1902;LIMBU LETTER KHA;Lo;0;L;;;;;N;;;;;
@@ -5369,6 +5542,8 @@
 19A7;NEW TAI LUE LETTER HIGH XVA;Lo;0;L;;;;;N;;;;;
 19A8;NEW TAI LUE LETTER LOW KVA;Lo;0;L;;;;;N;;;;;
 19A9;NEW TAI LUE LETTER LOW XVA;Lo;0;L;;;;;N;;;;;
+19AA;NEW TAI LUE LETTER HIGH SUA;Lo;0;L;;;;;N;;;;;
+19AB;NEW TAI LUE LETTER LOW SUA;Lo;0;L;;;;;N;;;;;
 19B0;NEW TAI LUE VOWEL SIGN VOWEL SHORTENER;Mc;0;L;;;;;N;;;;;
 19B1;NEW TAI LUE VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
 19B2;NEW TAI LUE VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
@@ -5405,6 +5580,7 @@
 19D7;NEW TAI LUE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
 19D8;NEW TAI LUE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
 19D9;NEW TAI LUE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+19DA;NEW TAI LUE THAM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
 19DE;NEW TAI LUE SIGN LAE;Po;0;ON;;;;;N;;;;;
 19DF;NEW TAI LUE SIGN LAEV;Po;0;ON;;;;;N;;;;;
 19E0;KHMER SYMBOL PATHAMASAT;So;0;ON;;;;;N;;;;;
@@ -5469,75 +5645,202 @@
 1A1B;BUGINESE VOWEL SIGN AE;Mc;0;L;;;;;N;;;;;
 1A1E;BUGINESE PALLAWA;Po;0;L;;;;;N;;;;;
 1A1F;BUGINESE END OF SECTION;Po;0;L;;;;;N;;;;;
-1B00;BALINESE SIGN ULU RICEM;Mn;0;NSM;;;;;N;;ardhacandra;;;
-1B01;BALINESE SIGN ULU CANDRA;Mn;0;NSM;;;;;N;;candrabindu;;;
-1B02;BALINESE SIGN CECEK;Mn;0;NSM;;;;;N;;anusvara;;;
-1B03;BALINESE SIGN SURANG;Mn;0;NSM;;;;;N;;repha;;;
-1B04;BALINESE SIGN BISAH;Mc;0;L;;;;;N;;visarga;;;
-1B05;BALINESE LETTER AKARA;Lo;0;L;;;;;N;;a;;;
-1B06;BALINESE LETTER AKARA TEDUNG;Lo;0;L;1B05 1B35;;;;N;;aa;;;
-1B07;BALINESE LETTER IKARA;Lo;0;L;;;;;N;;i;;;
-1B08;BALINESE LETTER IKARA TEDUNG;Lo;0;L;1B07 1B35;;;;N;;ii;;;
-1B09;BALINESE LETTER UKARA;Lo;0;L;;;;;N;;u;;;
-1B0A;BALINESE LETTER UKARA TEDUNG;Lo;0;L;1B09 1B35;;;;N;;uu;;;
-1B0B;BALINESE LETTER RA REPA;Lo;0;L;;;;;N;;vocalic r;;;
-1B0C;BALINESE LETTER RA REPA TEDUNG;Lo;0;L;1B0B 1B35;;;;N;;vocalic rr;;;
-1B0D;BALINESE LETTER LA LENGA;Lo;0;L;;;;;N;;vocalic l;;;
-1B0E;BALINESE LETTER LA LENGA TEDUNG;Lo;0;L;1B0D 1B35;;;;N;;vocalic ll;;;
-1B0F;BALINESE LETTER EKARA;Lo;0;L;;;;;N;;e;;;
-1B10;BALINESE LETTER AIKARA;Lo;0;L;;;;;N;;ai;;;
-1B11;BALINESE LETTER OKARA;Lo;0;L;;;;;N;;o;;;
-1B12;BALINESE LETTER OKARA TEDUNG;Lo;0;L;1B11 1B35;;;;N;;au;;;
+1A20;TAI THAM LETTER HIGH KA;Lo;0;L;;;;;N;;;;;
+1A21;TAI THAM LETTER HIGH KHA;Lo;0;L;;;;;N;;;;;
+1A22;TAI THAM LETTER HIGH KXA;Lo;0;L;;;;;N;;;;;
+1A23;TAI THAM LETTER LOW KA;Lo;0;L;;;;;N;;;;;
+1A24;TAI THAM LETTER LOW KXA;Lo;0;L;;;;;N;;;;;
+1A25;TAI THAM LETTER LOW KHA;Lo;0;L;;;;;N;;;;;
+1A26;TAI THAM LETTER NGA;Lo;0;L;;;;;N;;;;;
+1A27;TAI THAM LETTER HIGH CA;Lo;0;L;;;;;N;;;;;
+1A28;TAI THAM LETTER HIGH CHA;Lo;0;L;;;;;N;;;;;
+1A29;TAI THAM LETTER LOW CA;Lo;0;L;;;;;N;;;;;
+1A2A;TAI THAM LETTER LOW SA;Lo;0;L;;;;;N;;;;;
+1A2B;TAI THAM LETTER LOW CHA;Lo;0;L;;;;;N;;;;;
+1A2C;TAI THAM LETTER NYA;Lo;0;L;;;;;N;;;;;
+1A2D;TAI THAM LETTER RATA;Lo;0;L;;;;;N;;;;;
+1A2E;TAI THAM LETTER HIGH RATHA;Lo;0;L;;;;;N;;;;;
+1A2F;TAI THAM LETTER DA;Lo;0;L;;;;;N;;;;;
+1A30;TAI THAM LETTER LOW RATHA;Lo;0;L;;;;;N;;;;;
+1A31;TAI THAM LETTER RANA;Lo;0;L;;;;;N;;;;;
+1A32;TAI THAM LETTER HIGH TA;Lo;0;L;;;;;N;;;;;
+1A33;TAI THAM LETTER HIGH THA;Lo;0;L;;;;;N;;;;;
+1A34;TAI THAM LETTER LOW TA;Lo;0;L;;;;;N;;;;;
+1A35;TAI THAM LETTER LOW THA;Lo;0;L;;;;;N;;;;;
+1A36;TAI THAM LETTER NA;Lo;0;L;;;;;N;;;;;
+1A37;TAI THAM LETTER BA;Lo;0;L;;;;;N;;;;;
+1A38;TAI THAM LETTER HIGH PA;Lo;0;L;;;;;N;;;;;
+1A39;TAI THAM LETTER HIGH PHA;Lo;0;L;;;;;N;;;;;
+1A3A;TAI THAM LETTER HIGH FA;Lo;0;L;;;;;N;;;;;
+1A3B;TAI THAM LETTER LOW PA;Lo;0;L;;;;;N;;;;;
+1A3C;TAI THAM LETTER LOW FA;Lo;0;L;;;;;N;;;;;
+1A3D;TAI THAM LETTER LOW PHA;Lo;0;L;;;;;N;;;;;
+1A3E;TAI THAM LETTER MA;Lo;0;L;;;;;N;;;;;
+1A3F;TAI THAM LETTER LOW YA;Lo;0;L;;;;;N;;;;;
+1A40;TAI THAM LETTER HIGH YA;Lo;0;L;;;;;N;;;;;
+1A41;TAI THAM LETTER RA;Lo;0;L;;;;;N;;;;;
+1A42;TAI THAM LETTER RUE;Lo;0;L;;;;;N;;;;;
+1A43;TAI THAM LETTER LA;Lo;0;L;;;;;N;;;;;
+1A44;TAI THAM LETTER LUE;Lo;0;L;;;;;N;;;;;
+1A45;TAI THAM LETTER WA;Lo;0;L;;;;;N;;;;;
+1A46;TAI THAM LETTER HIGH SHA;Lo;0;L;;;;;N;;;;;
+1A47;TAI THAM LETTER HIGH SSA;Lo;0;L;;;;;N;;;;;
+1A48;TAI THAM LETTER HIGH SA;Lo;0;L;;;;;N;;;;;
+1A49;TAI THAM LETTER HIGH HA;Lo;0;L;;;;;N;;;;;
+1A4A;TAI THAM LETTER LLA;Lo;0;L;;;;;N;;;;;
+1A4B;TAI THAM LETTER A;Lo;0;L;;;;;N;;;;;
+1A4C;TAI THAM LETTER LOW HA;Lo;0;L;;;;;N;;;;;
+1A4D;TAI THAM LETTER I;Lo;0;L;;;;;N;;;;;
+1A4E;TAI THAM LETTER II;Lo;0;L;;;;;N;;;;;
+1A4F;TAI THAM LETTER U;Lo;0;L;;;;;N;;;;;
+1A50;TAI THAM LETTER UU;Lo;0;L;;;;;N;;;;;
+1A51;TAI THAM LETTER EE;Lo;0;L;;;;;N;;;;;
+1A52;TAI THAM LETTER OO;Lo;0;L;;;;;N;;;;;
+1A53;TAI THAM LETTER LAE;Lo;0;L;;;;;N;;;;;
+1A54;TAI THAM LETTER GREAT SA;Lo;0;L;;;;;N;;;;;
+1A55;TAI THAM CONSONANT SIGN MEDIAL RA;Mc;0;L;;;;;N;;;;;
+1A56;TAI THAM CONSONANT SIGN MEDIAL LA;Mn;0;NSM;;;;;N;;;;;
+1A57;TAI THAM CONSONANT SIGN LA TANG LAI;Mc;0;L;;;;;N;;;;;
+1A58;TAI THAM SIGN MAI KANG LAI;Mn;0;NSM;;;;;N;;;;;
+1A59;TAI THAM CONSONANT SIGN FINAL NGA;Mn;0;NSM;;;;;N;;;;;
+1A5A;TAI THAM CONSONANT SIGN LOW PA;Mn;0;NSM;;;;;N;;;;;
+1A5B;TAI THAM CONSONANT SIGN HIGH RATHA OR LOW PA;Mn;0;NSM;;;;;N;;;;;
+1A5C;TAI THAM CONSONANT SIGN MA;Mn;0;NSM;;;;;N;;;;;
+1A5D;TAI THAM CONSONANT SIGN BA;Mn;0;NSM;;;;;N;;;;;
+1A5E;TAI THAM CONSONANT SIGN SA;Mn;0;NSM;;;;;N;;;;;
+1A60;TAI THAM SIGN SAKOT;Mn;9;NSM;;;;;N;;;;;
+1A61;TAI THAM VOWEL SIGN A;Mc;0;L;;;;;N;;;;;
+1A62;TAI THAM VOWEL SIGN MAI SAT;Mn;0;NSM;;;;;N;;;;;
+1A63;TAI THAM VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+1A64;TAI THAM VOWEL SIGN TALL AA;Mc;0;L;;;;;N;;;;;
+1A65;TAI THAM VOWEL SIGN I;Mn;0;NSM;;;;;N;;;;;
+1A66;TAI THAM VOWEL SIGN II;Mn;0;NSM;;;;;N;;;;;
+1A67;TAI THAM VOWEL SIGN UE;Mn;0;NSM;;;;;N;;;;;
+1A68;TAI THAM VOWEL SIGN UUE;Mn;0;NSM;;;;;N;;;;;
+1A69;TAI THAM VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+1A6A;TAI THAM VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+1A6B;TAI THAM VOWEL SIGN O;Mn;0;NSM;;;;;N;;;;;
+1A6C;TAI THAM VOWEL SIGN OA BELOW;Mn;0;NSM;;;;;N;;;;;
+1A6D;TAI THAM VOWEL SIGN OY;Mc;0;L;;;;;N;;;;;
+1A6E;TAI THAM VOWEL SIGN E;Mc;0;L;;;;;N;;;;;
+1A6F;TAI THAM VOWEL SIGN AE;Mc;0;L;;;;;N;;;;;
+1A70;TAI THAM VOWEL SIGN OO;Mc;0;L;;;;;N;;;;;
+1A71;TAI THAM VOWEL SIGN AI;Mc;0;L;;;;;N;;;;;
+1A72;TAI THAM VOWEL SIGN THAM AI;Mc;0;L;;;;;N;;;;;
+1A73;TAI THAM VOWEL SIGN OA ABOVE;Mn;0;NSM;;;;;N;;;;;
+1A74;TAI THAM SIGN MAI KANG;Mn;0;NSM;;;;;N;;;;;
+1A75;TAI THAM SIGN TONE-1;Mn;230;NSM;;;;;N;;;;;
+1A76;TAI THAM SIGN TONE-2;Mn;230;NSM;;;;;N;;;;;
+1A77;TAI THAM SIGN KHUEN TONE-3;Mn;230;NSM;;;;;N;;;;;
+1A78;TAI THAM SIGN KHUEN TONE-4;Mn;230;NSM;;;;;N;;;;;
+1A79;TAI THAM SIGN KHUEN TONE-5;Mn;230;NSM;;;;;N;;;;;
+1A7A;TAI THAM SIGN RA HAAM;Mn;230;NSM;;;;;N;;;;;
+1A7B;TAI THAM SIGN MAI SAM;Mn;230;NSM;;;;;N;;;;;
+1A7C;TAI THAM SIGN KHUEN-LUE KARAN;Mn;230;NSM;;;;;N;;;;;
+1A7F;TAI THAM COMBINING CRYPTOGRAMMIC DOT;Mn;220;NSM;;;;;N;;;;;
+1A80;TAI THAM HORA DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1A81;TAI THAM HORA DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1A82;TAI THAM HORA DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1A83;TAI THAM HORA DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1A84;TAI THAM HORA DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1A85;TAI THAM HORA DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1A86;TAI THAM HORA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1A87;TAI THAM HORA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1A88;TAI THAM HORA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1A89;TAI THAM HORA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1A90;TAI THAM THAM DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+1A91;TAI THAM THAM DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+1A92;TAI THAM THAM DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+1A93;TAI THAM THAM DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+1A94;TAI THAM THAM DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+1A95;TAI THAM THAM DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+1A96;TAI THAM THAM DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+1A97;TAI THAM THAM DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+1A98;TAI THAM THAM DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+1A99;TAI THAM THAM DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+1AA0;TAI THAM SIGN WIANG;Po;0;L;;;;;N;;;;;
+1AA1;TAI THAM SIGN WIANGWAAK;Po;0;L;;;;;N;;;;;
+1AA2;TAI THAM SIGN SAWAN;Po;0;L;;;;;N;;;;;
+1AA3;TAI THAM SIGN KEOW;Po;0;L;;;;;N;;;;;
+1AA4;TAI THAM SIGN HOY;Po;0;L;;;;;N;;;;;
+1AA5;TAI THAM SIGN DOKMAI;Po;0;L;;;;;N;;;;;
+1AA6;TAI THAM SIGN REVERSED ROTATED RANA;Po;0;L;;;;;N;;;;;
+1AA7;TAI THAM SIGN MAI YAMOK;Lm;0;L;;;;;N;;;;;
+1AA8;TAI THAM SIGN KAAN;Po;0;L;;;;;N;;;;;
+1AA9;TAI THAM SIGN KAANKUU;Po;0;L;;;;;N;;;;;
+1AAA;TAI THAM SIGN SATKAAN;Po;0;L;;;;;N;;;;;
+1AAB;TAI THAM SIGN SATKAANKUU;Po;0;L;;;;;N;;;;;
+1AAC;TAI THAM SIGN HANG;Po;0;L;;;;;N;;;;;
+1AAD;TAI THAM SIGN CAANG;Po;0;L;;;;;N;;;;;
+1B00;BALINESE SIGN ULU RICEM;Mn;0;NSM;;;;;N;;;;;
+1B01;BALINESE SIGN ULU CANDRA;Mn;0;NSM;;;;;N;;;;;
+1B02;BALINESE SIGN CECEK;Mn;0;NSM;;;;;N;;;;;
+1B03;BALINESE SIGN SURANG;Mn;0;NSM;;;;;N;;;;;
+1B04;BALINESE SIGN BISAH;Mc;0;L;;;;;N;;;;;
+1B05;BALINESE LETTER AKARA;Lo;0;L;;;;;N;;;;;
+1B06;BALINESE LETTER AKARA TEDUNG;Lo;0;L;1B05 1B35;;;;N;;;;;
+1B07;BALINESE LETTER IKARA;Lo;0;L;;;;;N;;;;;
+1B08;BALINESE LETTER IKARA TEDUNG;Lo;0;L;1B07 1B35;;;;N;;;;;
+1B09;BALINESE LETTER UKARA;Lo;0;L;;;;;N;;;;;
+1B0A;BALINESE LETTER UKARA TEDUNG;Lo;0;L;1B09 1B35;;;;N;;;;;
+1B0B;BALINESE LETTER RA REPA;Lo;0;L;;;;;N;;;;;
+1B0C;BALINESE LETTER RA REPA TEDUNG;Lo;0;L;1B0B 1B35;;;;N;;;;;
+1B0D;BALINESE LETTER LA LENGA;Lo;0;L;;;;;N;;;;;
+1B0E;BALINESE LETTER LA LENGA TEDUNG;Lo;0;L;1B0D 1B35;;;;N;;;;;
+1B0F;BALINESE LETTER EKARA;Lo;0;L;;;;;N;;;;;
+1B10;BALINESE LETTER AIKARA;Lo;0;L;;;;;N;;;;;
+1B11;BALINESE LETTER OKARA;Lo;0;L;;;;;N;;;;;
+1B12;BALINESE LETTER OKARA TEDUNG;Lo;0;L;1B11 1B35;;;;N;;;;;
 1B13;BALINESE LETTER KA;Lo;0;L;;;;;N;;;;;
-1B14;BALINESE LETTER KA MAHAPRANA;Lo;0;L;;;;;N;;kha;;;
+1B14;BALINESE LETTER KA MAHAPRANA;Lo;0;L;;;;;N;;;;;
 1B15;BALINESE LETTER GA;Lo;0;L;;;;;N;;;;;
-1B16;BALINESE LETTER GA GORA;Lo;0;L;;;;;N;;gha;;;
+1B16;BALINESE LETTER GA GORA;Lo;0;L;;;;;N;;;;;
 1B17;BALINESE LETTER NGA;Lo;0;L;;;;;N;;;;;
 1B18;BALINESE LETTER CA;Lo;0;L;;;;;N;;;;;
-1B19;BALINESE LETTER CA LACA;Lo;0;L;;;;;N;;cha;;;
+1B19;BALINESE LETTER CA LACA;Lo;0;L;;;;;N;;;;;
 1B1A;BALINESE LETTER JA;Lo;0;L;;;;;N;;;;;
-1B1B;BALINESE LETTER JA JERA;Lo;0;L;;;;;N;;jha;;;
+1B1B;BALINESE LETTER JA JERA;Lo;0;L;;;;;N;;;;;
 1B1C;BALINESE LETTER NYA;Lo;0;L;;;;;N;;;;;
-1B1D;BALINESE LETTER TA LATIK;Lo;0;L;;;;;N;;tta;;;
-1B1E;BALINESE LETTER TA MURDA MAHAPRANA;Lo;0;L;;;;;N;;ttha;;;
-1B1F;BALINESE LETTER DA MURDA ALPAPRANA;Lo;0;L;;;;;N;;dda;;;
-1B20;BALINESE LETTER DA MURDA MAHAPRANA;Lo;0;L;;;;;N;;ddha;;;
-1B21;BALINESE LETTER NA RAMBAT;Lo;0;L;;;;;N;;nna;;;
+1B1D;BALINESE LETTER TA LATIK;Lo;0;L;;;;;N;;;;;
+1B1E;BALINESE LETTER TA MURDA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+1B1F;BALINESE LETTER DA MURDA ALPAPRANA;Lo;0;L;;;;;N;;;;;
+1B20;BALINESE LETTER DA MURDA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+1B21;BALINESE LETTER NA RAMBAT;Lo;0;L;;;;;N;;;;;
 1B22;BALINESE LETTER TA;Lo;0;L;;;;;N;;;;;
-1B23;BALINESE LETTER TA TAWA;Lo;0;L;;;;;N;;tha;;;
+1B23;BALINESE LETTER TA TAWA;Lo;0;L;;;;;N;;;;;
 1B24;BALINESE LETTER DA;Lo;0;L;;;;;N;;;;;
-1B25;BALINESE LETTER DA MADU;Lo;0;L;;;;;N;;dha;;;
+1B25;BALINESE LETTER DA MADU;Lo;0;L;;;;;N;;;;;
 1B26;BALINESE LETTER NA;Lo;0;L;;;;;N;;;;;
 1B27;BALINESE LETTER PA;Lo;0;L;;;;;N;;;;;
-1B28;BALINESE LETTER PA KAPAL;Lo;0;L;;;;;N;;pha;;;
+1B28;BALINESE LETTER PA KAPAL;Lo;0;L;;;;;N;;;;;
 1B29;BALINESE LETTER BA;Lo;0;L;;;;;N;;;;;
-1B2A;BALINESE LETTER BA KEMBANG;Lo;0;L;;;;;N;;bha;;;
+1B2A;BALINESE LETTER BA KEMBANG;Lo;0;L;;;;;N;;;;;
 1B2B;BALINESE LETTER MA;Lo;0;L;;;;;N;;;;;
 1B2C;BALINESE LETTER YA;Lo;0;L;;;;;N;;;;;
 1B2D;BALINESE LETTER RA;Lo;0;L;;;;;N;;;;;
 1B2E;BALINESE LETTER LA;Lo;0;L;;;;;N;;;;;
 1B2F;BALINESE LETTER WA;Lo;0;L;;;;;N;;;;;
-1B30;BALINESE LETTER SA SAGA;Lo;0;L;;;;;N;;sha;;;
-1B31;BALINESE LETTER SA SAPA;Lo;0;L;;;;;N;;ssa;;;
+1B30;BALINESE LETTER SA SAGA;Lo;0;L;;;;;N;;;;;
+1B31;BALINESE LETTER SA SAPA;Lo;0;L;;;;;N;;;;;
 1B32;BALINESE LETTER SA;Lo;0;L;;;;;N;;;;;
 1B33;BALINESE LETTER HA;Lo;0;L;;;;;N;;;;;
-1B34;BALINESE SIGN REREKAN;Mn;7;NSM;;;;;N;;nukta;;;
-1B35;BALINESE VOWEL SIGN TEDUNG;Mc;0;L;;;;;N;;aa;;;
-1B36;BALINESE VOWEL SIGN ULU;Mn;0;NSM;;;;;N;;i;;;
-1B37;BALINESE VOWEL SIGN ULU SARI;Mn;0;NSM;;;;;N;;ii;;;
-1B38;BALINESE VOWEL SIGN SUKU;Mn;0;NSM;;;;;N;;u;;;
-1B39;BALINESE VOWEL SIGN SUKU ILUT;Mn;0;NSM;;;;;N;;uu;;;
-1B3A;BALINESE VOWEL SIGN RA REPA;Mn;0;NSM;;;;;N;;vocalic r;;;
-1B3B;BALINESE VOWEL SIGN RA REPA TEDUNG;Mc;0;L;1B3A 1B35;;;;N;;vocalic rr;;;
-1B3C;BALINESE VOWEL SIGN LA LENGA;Mn;0;NSM;;;;;N;;vocalic l;;;
-1B3D;BALINESE VOWEL SIGN LA LENGA TEDUNG;Mc;0;L;1B3C 1B35;;;;N;;vocalic ll;;;
-1B3E;BALINESE VOWEL SIGN TALING;Mc;0;L;;;;;N;;e;;;
-1B3F;BALINESE VOWEL SIGN TALING REPA;Mc;0;L;;;;;N;;ai;;;
-1B40;BALINESE VOWEL SIGN TALING TEDUNG;Mc;0;L;1B3E 1B35;;;;N;;o;;;
-1B41;BALINESE VOWEL SIGN TALING REPA TEDUNG;Mc;0;L;1B3F 1B35;;;;N;;au;;;
-1B42;BALINESE VOWEL SIGN PEPET;Mn;0;NSM;;;;;N;;ae;;;
-1B43;BALINESE VOWEL SIGN PEPET TEDUNG;Mc;0;L;1B42 1B35;;;;N;;oe;;;
-1B44;BALINESE ADEG ADEG;Mc;9;L;;;;;N;;virama;;;
+1B34;BALINESE SIGN REREKAN;Mn;7;NSM;;;;;N;;;;;
+1B35;BALINESE VOWEL SIGN TEDUNG;Mc;0;L;;;;;N;;;;;
+1B36;BALINESE VOWEL SIGN ULU;Mn;0;NSM;;;;;N;;;;;
+1B37;BALINESE VOWEL SIGN ULU SARI;Mn;0;NSM;;;;;N;;;;;
+1B38;BALINESE VOWEL SIGN SUKU;Mn;0;NSM;;;;;N;;;;;
+1B39;BALINESE VOWEL SIGN SUKU ILUT;Mn;0;NSM;;;;;N;;;;;
+1B3A;BALINESE VOWEL SIGN RA REPA;Mn;0;NSM;;;;;N;;;;;
+1B3B;BALINESE VOWEL SIGN RA REPA TEDUNG;Mc;0;L;1B3A 1B35;;;;N;;;;;
+1B3C;BALINESE VOWEL SIGN LA LENGA;Mn;0;NSM;;;;;N;;;;;
+1B3D;BALINESE VOWEL SIGN LA LENGA TEDUNG;Mc;0;L;1B3C 1B35;;;;N;;;;;
+1B3E;BALINESE VOWEL SIGN TALING;Mc;0;L;;;;;N;;;;;
+1B3F;BALINESE VOWEL SIGN TALING REPA;Mc;0;L;;;;;N;;;;;
+1B40;BALINESE VOWEL SIGN TALING TEDUNG;Mc;0;L;1B3E 1B35;;;;N;;;;;
+1B41;BALINESE VOWEL SIGN TALING REPA TEDUNG;Mc;0;L;1B3F 1B35;;;;N;;;;;
+1B42;BALINESE VOWEL SIGN PEPET;Mn;0;NSM;;;;;N;;;;;
+1B43;BALINESE VOWEL SIGN PEPET TEDUNG;Mc;0;L;1B42 1B35;;;;N;;;;;
+1B44;BALINESE ADEG ADEG;Mc;9;L;;;;;N;;;;;
 1B45;BALINESE LETTER KAF SASAK;Lo;0;L;;;;;N;;;;;
 1B46;BALINESE LETTER KHOT SASAK;Lo;0;L;;;;;N;;;;;
 1B47;BALINESE LETTER TZIR SASAK;Lo;0;L;;;;;N;;;;;
@@ -5555,13 +5858,13 @@
 1B57;BALINESE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
 1B58;BALINESE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
 1B59;BALINESE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
-1B5A;BALINESE PANTI;Po;0;L;;;;;N;;section;;;
-1B5B;BALINESE PAMADA;Po;0;L;;;;;N;;honorific section;;;
-1B5C;BALINESE WINDU;Po;0;L;;;;;N;;punctuation ring;;;
-1B5D;BALINESE CARIK PAMUNGKAH;Po;0;L;;;;;N;;colon;;;
-1B5E;BALINESE CARIK SIKI;Po;0;L;;;;;N;;danda;;;
-1B5F;BALINESE CARIK PAREREN;Po;0;L;;;;;N;;double danda;;;
-1B60;BALINESE PAMENENG;Po;0;L;;;;;N;;line-breaking hyphen;;;
+1B5A;BALINESE PANTI;Po;0;L;;;;;N;;;;;
+1B5B;BALINESE PAMADA;Po;0;L;;;;;N;;;;;
+1B5C;BALINESE WINDU;Po;0;L;;;;;N;;;;;
+1B5D;BALINESE CARIK PAMUNGKAH;Po;0;L;;;;;N;;;;;
+1B5E;BALINESE CARIK SIKI;Po;0;L;;;;;N;;;;;
+1B5F;BALINESE CARIK PAREREN;Po;0;L;;;;;N;;;;;
+1B60;BALINESE PAMENENG;Po;0;L;;;;;N;;;;;
 1B61;BALINESE MUSICAL SYMBOL DONG;So;0;L;;;;;N;;;;;
 1B62;BALINESE MUSICAL SYMBOL DENG;So;0;L;;;;;N;;;;;
 1B63;BALINESE MUSICAL SYMBOL DUNG;So;0;L;;;;;N;;;;;
@@ -5767,6 +6070,41 @@
 1C7D;OL CHIKI AHAD;Lm;0;L;;;;;N;;;;;
 1C7E;OL CHIKI PUNCTUATION MUCAAD;Po;0;L;;;;;N;;;;;
 1C7F;OL CHIKI PUNCTUATION DOUBLE MUCAAD;Po;0;L;;;;;N;;;;;
+1CD0;VEDIC TONE KARSHANA;Mn;230;NSM;;;;;N;;;;;
+1CD1;VEDIC TONE SHARA;Mn;230;NSM;;;;;N;;;;;
+1CD2;VEDIC TONE PRENKHA;Mn;230;NSM;;;;;N;;;;;
+1CD3;VEDIC SIGN NIHSHVASA;Po;0;L;;;;;N;;;;;
+1CD4;VEDIC SIGN YAJURVEDIC MIDLINE SVARITA;Mn;1;NSM;;;;;N;;;;;
+1CD5;VEDIC TONE YAJURVEDIC AGGRAVATED INDEPENDENT SVARITA;Mn;220;NSM;;;;;N;;;;;
+1CD6;VEDIC TONE YAJURVEDIC INDEPENDENT SVARITA;Mn;220;NSM;;;;;N;;;;;
+1CD7;VEDIC TONE YAJURVEDIC KATHAKA INDEPENDENT SVARITA;Mn;220;NSM;;;;;N;;;;;
+1CD8;VEDIC TONE CANDRA BELOW;Mn;220;NSM;;;;;N;;;;;
+1CD9;VEDIC TONE YAJURVEDIC KATHAKA INDEPENDENT SVARITA SCHROEDER;Mn;220;NSM;;;;;N;;;;;
+1CDA;VEDIC TONE DOUBLE SVARITA;Mn;230;NSM;;;;;N;;;;;
+1CDB;VEDIC TONE TRIPLE SVARITA;Mn;230;NSM;;;;;N;;;;;
+1CDC;VEDIC TONE KATHAKA ANUDATTA;Mn;220;NSM;;;;;N;;;;;
+1CDD;VEDIC TONE DOT BELOW;Mn;220;NSM;;;;;N;;;;;
+1CDE;VEDIC TONE TWO DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+1CDF;VEDIC TONE THREE DOTS BELOW;Mn;220;NSM;;;;;N;;;;;
+1CE0;VEDIC TONE RIGVEDIC KASHMIRI INDEPENDENT SVARITA;Mn;230;NSM;;;;;N;;;;;
+1CE1;VEDIC TONE ATHARVAVEDIC INDEPENDENT SVARITA;Mc;0;L;;;;;N;;;;;
+1CE2;VEDIC SIGN VISARGA SVARITA;Mn;1;NSM;;;;;N;;;;;
+1CE3;VEDIC SIGN VISARGA UDATTA;Mn;1;NSM;;;;;N;;;;;
+1CE4;VEDIC SIGN REVERSED VISARGA UDATTA;Mn;1;NSM;;;;;N;;;;;
+1CE5;VEDIC SIGN VISARGA ANUDATTA;Mn;1;NSM;;;;;N;;;;;
+1CE6;VEDIC SIGN REVERSED VISARGA ANUDATTA;Mn;1;NSM;;;;;N;;;;;
+1CE7;VEDIC SIGN VISARGA UDATTA WITH TAIL;Mn;1;NSM;;;;;N;;;;;
+1CE8;VEDIC SIGN VISARGA ANUDATTA WITH TAIL;Mn;1;NSM;;;;;N;;;;;
+1CE9;VEDIC SIGN ANUSVARA ANTARGOMUKHA;Lo;0;L;;;;;N;;;;;
+1CEA;VEDIC SIGN ANUSVARA BAHIRGOMUKHA;Lo;0;L;;;;;N;;;;;
+1CEB;VEDIC SIGN ANUSVARA VAMAGOMUKHA;Lo;0;L;;;;;N;;;;;
+1CEC;VEDIC SIGN ANUSVARA VAMAGOMUKHA WITH TAIL;Lo;0;L;;;;;N;;;;;
+1CED;VEDIC SIGN TIRYAK;Mn;220;NSM;;;;;N;;;;;
+1CEE;VEDIC SIGN HEXIFORM LONG ANUSVARA;Lo;0;L;;;;;N;;;;;
+1CEF;VEDIC SIGN LONG ANUSVARA;Lo;0;L;;;;;N;;;;;
+1CF0;VEDIC SIGN RTHANG LONG ANUSVARA;Lo;0;L;;;;;N;;;;;
+1CF1;VEDIC SIGN ANUSVARA UBHAYATO MUKHA;Lo;0;L;;;;;N;;;;;
+1CF2;VEDIC SIGN ARDHAVISARGA;Mc;0;L;;;;;N;;;;;
 1D00;LATIN LETTER SMALL CAPITAL A;Ll;0;L;;;;;N;;;;;
 1D01;LATIN LETTER SMALL CAPITAL AE;Ll;0;L;;;;;N;;;;;
 1D02;LATIN SMALL LETTER TURNED AE;Ll;0;L;;;;;N;;;;;
@@ -5998,6 +6336,7 @@
 1DE4;COMBINING LATIN SMALL LETTER S;Mn;230;NSM;;;;;N;;;;;
 1DE5;COMBINING LATIN SMALL LETTER LONG S;Mn;230;NSM;;;;;N;;;;;
 1DE6;COMBINING LATIN SMALL LETTER Z;Mn;230;NSM;;;;;N;;;;;
+1DFD;COMBINING ALMOST EQUAL TO BELOW;Mn;220;NSM;;;;;N;;;;;
 1DFE;COMBINING LEFT ARROWHEAD ABOVE;Mn;230;NSM;;;;;N;;;;;
 1DFF;COMBINING RIGHT ARROWHEAD AND DOWN ARROWHEAD BELOW;Mn;220;NSM;;;;;N;;;;;
 1E00;LATIN CAPITAL LETTER A WITH RING BELOW;Lu;0;L;0041 0325;;;;N;;;;1E01;
@@ -6552,7 +6891,7 @@
 203C;DOUBLE EXCLAMATION MARK;Po;0;ON;<compat> 0021 0021;;;;N;;;;;
 203D;INTERROBANG;Po;0;ON;;;;;N;;;;;
 203E;OVERLINE;Po;0;ON;<compat> 0020 0305;;;;N;SPACING OVERSCORE;;;;
-203F;UNDERTIE;Pc;0;ON;;;;;N;;Enotikon;;;
+203F;UNDERTIE;Pc;0;ON;;;;;N;;;;;
 2040;CHARACTER TIE;Pc;0;ON;;;;;N;;;;;
 2041;CARET INSERTION POINT;Po;0;ON;;;;;N;;;;;
 2042;ASTERISM;Po;0;ON;;;;;N;;;;;
@@ -6597,7 +6936,7 @@
 206E;NATIONAL DIGIT SHAPES;Cf;0;BN;;;;;N;;;;;
 206F;NOMINAL DIGIT SHAPES;Cf;0;BN;;;;;N;;;;;
 2070;SUPERSCRIPT ZERO;No;0;EN;<super> 0030;;0;0;N;SUPERSCRIPT DIGIT ZERO;;;;
-2071;SUPERSCRIPT LATIN SMALL LETTER I;Ll;0;L;<super> 0069;;;;N;;;;;
+2071;SUPERSCRIPT LATIN SMALL LETTER I;Lm;0;L;<super> 0069;;;;N;;;;;
 2074;SUPERSCRIPT FOUR;No;0;EN;<super> 0034;;4;4;N;SUPERSCRIPT DIGIT FOUR;;;;
 2075;SUPERSCRIPT FIVE;No;0;EN;<super> 0035;;5;5;N;SUPERSCRIPT DIGIT FIVE;;;;
 2076;SUPERSCRIPT SIX;No;0;EN;<super> 0036;;6;6;N;SUPERSCRIPT DIGIT SIX;;;;
@@ -6609,7 +6948,7 @@
 207C;SUPERSCRIPT EQUALS SIGN;Sm;0;ON;<super> 003D;;;;N;;;;;
 207D;SUPERSCRIPT LEFT PARENTHESIS;Ps;0;ON;<super> 0028;;;;Y;SUPERSCRIPT OPENING PARENTHESIS;;;;
 207E;SUPERSCRIPT RIGHT PARENTHESIS;Pe;0;ON;<super> 0029;;;;Y;SUPERSCRIPT CLOSING PARENTHESIS;;;;
-207F;SUPERSCRIPT LATIN SMALL LETTER N;Ll;0;L;<super> 006E;;;;N;;;;;
+207F;SUPERSCRIPT LATIN SMALL LETTER N;Lm;0;L;<super> 006E;;;;N;;;;;
 2080;SUBSCRIPT ZERO;No;0;EN;<sub> 0030;;0;0;N;SUBSCRIPT DIGIT ZERO;;;;
 2081;SUBSCRIPT ONE;No;0;EN;<sub> 0031;;1;1;N;SUBSCRIPT DIGIT ONE;;;;
 2082;SUBSCRIPT TWO;No;0;EN;<sub> 0032;;2;2;N;SUBSCRIPT DIGIT TWO;;;;
@@ -6652,6 +6991,9 @@
 20B3;AUSTRAL SIGN;Sc;0;ET;;;;;N;;;;;
 20B4;HRYVNIA SIGN;Sc;0;ET;;;;;N;;;;;
 20B5;CEDI SIGN;Sc;0;ET;;;;;N;;;;;
+20B6;LIVRE TOURNOIS SIGN;Sc;0;ET;;;;;N;;;;;
+20B7;SPESMILO SIGN;Sc;0;ET;;;;;N;;;;;
+20B8;TENGE SIGN;Sc;0;ET;;;;;N;;;;;
 20D0;COMBINING LEFT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT HARPOON ABOVE;;;;
 20D1;COMBINING RIGHT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT HARPOON ABOVE;;;;
 20D2;COMBINING LONG VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG VERTICAL BAR OVERLAY;;;;
@@ -6765,6 +7107,9 @@
 214D;AKTIESELSKAB;So;0;ON;;;;;N;;;;;
 214E;TURNED SMALL F;Ll;0;L;;;;;N;;;2132;;2132
 214F;SYMBOL FOR SAMARITAN SOURCE;So;0;L;;;;;N;;;;;
+2150;VULGAR FRACTION ONE SEVENTH;No;0;ON;<fraction> 0031 2044 0037;;;1/7;N;;;;;
+2151;VULGAR FRACTION ONE NINTH;No;0;ON;<fraction> 0031 2044 0039;;;1/9;N;;;;;
+2152;VULGAR FRACTION ONE TENTH;No;0;ON;<fraction> 0031 2044 0031 0030;;;1/10;N;;;;;
 2153;VULGAR FRACTION ONE THIRD;No;0;ON;<fraction> 0031 2044 0033;;;1/3;N;FRACTION ONE THIRD;;;;
 2154;VULGAR FRACTION TWO THIRDS;No;0;ON;<fraction> 0032 2044 0033;;;2/3;N;FRACTION TWO THIRDS;;;;
 2155;VULGAR FRACTION ONE FIFTH;No;0;ON;<fraction> 0031 2044 0035;;;1/5;N;FRACTION ONE FIFTH;;;;
@@ -6819,6 +7164,7 @@
 2186;ROMAN NUMERAL FIFTY EARLY FORM;Nl;0;L;;;;50;N;;;;;
 2187;ROMAN NUMERAL FIFTY THOUSAND;Nl;0;L;;;;50000;N;;;;;
 2188;ROMAN NUMERAL ONE HUNDRED THOUSAND;Nl;0;L;;;;100000;N;;;;;
+2189;VULGAR FRACTION ZERO THIRDS;No;0;ON;<fraction> 0030 2044 0033;;;0;N;;;;;
 2190;LEFTWARDS ARROW;Sm;0;ON;;;;;N;LEFT ARROW;;;;
 2191;UPWARDS ARROW;Sm;0;ON;;;;;N;UP ARROW;;;;
 2192;RIGHTWARDS ARROW;Sm;0;ON;;;;;N;RIGHT ARROW;;;;
@@ -6992,7 +7338,7 @@
 223A;GEOMETRIC PROPORTION;Sm;0;ON;;;;;N;;;;;
 223B;HOMOTHETIC;Sm;0;ON;;;;;Y;;;;;
 223C;TILDE OPERATOR;Sm;0;ON;;;;;Y;;;;;
-223D;REVERSED TILDE;Sm;0;ON;;;;;Y;;lazy S;;;
+223D;REVERSED TILDE;Sm;0;ON;;;;;Y;;;;;
 223E;INVERTED LAZY S;Sm;0;ON;;;;;Y;;;;;
 223F;SINE WAVE;Sm;0;ON;;;;;Y;;;;;
 2240;WREATH PRODUCT;Sm;0;ON;;;;;Y;;;;;
@@ -7261,18 +7607,18 @@
 2347;APL FUNCTIONAL SYMBOL QUAD LEFTWARDS ARROW;So;0;L;;;;;N;;;;;
 2348;APL FUNCTIONAL SYMBOL QUAD RIGHTWARDS ARROW;So;0;L;;;;;N;;;;;
 2349;APL FUNCTIONAL SYMBOL CIRCLE BACKSLASH;So;0;L;;;;;N;;;;;
-234A;APL FUNCTIONAL SYMBOL DOWN TACK UNDERBAR;So;0;L;;;;;N;;*;;;
+234A;APL FUNCTIONAL SYMBOL DOWN TACK UNDERBAR;So;0;L;;;;;N;;;;;
 234B;APL FUNCTIONAL SYMBOL DELTA STILE;So;0;L;;;;;N;;;;;
 234C;APL FUNCTIONAL SYMBOL QUAD DOWN CARET;So;0;L;;;;;N;;;;;
 234D;APL FUNCTIONAL SYMBOL QUAD DELTA;So;0;L;;;;;N;;;;;
-234E;APL FUNCTIONAL SYMBOL DOWN TACK JOT;So;0;L;;;;;N;;*;;;
+234E;APL FUNCTIONAL SYMBOL DOWN TACK JOT;So;0;L;;;;;N;;;;;
 234F;APL FUNCTIONAL SYMBOL UPWARDS VANE;So;0;L;;;;;N;;;;;
 2350;APL FUNCTIONAL SYMBOL QUAD UPWARDS ARROW;So;0;L;;;;;N;;;;;
-2351;APL FUNCTIONAL SYMBOL UP TACK OVERBAR;So;0;L;;;;;N;;*;;;
+2351;APL FUNCTIONAL SYMBOL UP TACK OVERBAR;So;0;L;;;;;N;;;;;
 2352;APL FUNCTIONAL SYMBOL DEL STILE;So;0;L;;;;;N;;;;;
 2353;APL FUNCTIONAL SYMBOL QUAD UP CARET;So;0;L;;;;;N;;;;;
 2354;APL FUNCTIONAL SYMBOL QUAD DEL;So;0;L;;;;;N;;;;;
-2355;APL FUNCTIONAL SYMBOL UP TACK JOT;So;0;L;;;;;N;;*;;;
+2355;APL FUNCTIONAL SYMBOL UP TACK JOT;So;0;L;;;;;N;;;;;
 2356;APL FUNCTIONAL SYMBOL DOWNWARDS VANE;So;0;L;;;;;N;;;;;
 2357;APL FUNCTIONAL SYMBOL QUAD DOWNWARDS ARROW;So;0;L;;;;;N;;;;;
 2358;APL FUNCTIONAL SYMBOL QUOTE UNDERBAR;So;0;L;;;;;N;;;;;
@@ -7284,7 +7630,7 @@
 235E;APL FUNCTIONAL SYMBOL QUOTE QUAD;So;0;L;;;;;N;;;;;
 235F;APL FUNCTIONAL SYMBOL CIRCLE STAR;So;0;L;;;;;N;;;;;
 2360;APL FUNCTIONAL SYMBOL QUAD COLON;So;0;L;;;;;N;;;;;
-2361;APL FUNCTIONAL SYMBOL UP TACK DIAERESIS;So;0;L;;;;;N;;*;;;
+2361;APL FUNCTIONAL SYMBOL UP TACK DIAERESIS;So;0;L;;;;;N;;;;;
 2362;APL FUNCTIONAL SYMBOL DEL DIAERESIS;So;0;L;;;;;N;;;;;
 2363;APL FUNCTIONAL SYMBOL STAR DIAERESIS;So;0;L;;;;;N;;;;;
 2364;APL FUNCTIONAL SYMBOL JOT DIAERESIS;So;0;L;;;;;N;;;;;
@@ -7324,9 +7670,9 @@
 2386;ENTER SYMBOL;So;0;ON;;;;;N;;;;;
 2387;ALTERNATIVE KEY SYMBOL;So;0;ON;;;;;N;;;;;
 2388;HELM SYMBOL;So;0;ON;;;;;N;;;;;
-2389;CIRCLED HORIZONTAL BAR WITH NOTCH;So;0;ON;;;;;N;;pause;;;
-238A;CIRCLED TRIANGLE DOWN;So;0;ON;;;;;N;;break;;;
-238B;BROKEN CIRCLE WITH NORTHWEST ARROW;So;0;ON;;;;;N;;escape;;;
+2389;CIRCLED HORIZONTAL BAR WITH NOTCH;So;0;ON;;;;;N;;;;;
+238A;CIRCLED TRIANGLE DOWN;So;0;ON;;;;;N;;;;;
+238B;BROKEN CIRCLE WITH NORTHWEST ARROW;So;0;ON;;;;;N;;;;;
 238C;UNDO SYMBOL;So;0;ON;;;;;N;;;;;
 238D;MONOSTABLE SYMBOL;So;0;ON;;;;;N;;;;;
 238E;HYSTERESIS SYMBOL;So;0;ON;;;;;N;;;;;
@@ -7407,18 +7753,19 @@
 23D9;METRICAL PENTASEME;So;0;ON;;;;;N;;;;;
 23DA;EARTH GROUND;So;0;ON;;;;;N;;;;;
 23DB;FUSE;So;0;ON;;;;;N;;;;;
-23DC;TOP PARENTHESIS;Sm;0;ON;;;;;N;;mathematical use;;;
-23DD;BOTTOM PARENTHESIS;Sm;0;ON;;;;;N;;mathematical use;;;
-23DE;TOP CURLY BRACKET;Sm;0;ON;;;;;N;;mathematical use;;;
-23DF;BOTTOM CURLY BRACKET;Sm;0;ON;;;;;N;;mathematical use;;;
-23E0;TOP TORTOISE SHELL BRACKET;Sm;0;ON;;;;;N;;mathematical use;;;
-23E1;BOTTOM TORTOISE SHELL BRACKET;Sm;0;ON;;;;;N;;mathematical use;;;
+23DC;TOP PARENTHESIS;Sm;0;ON;;;;;N;;;;;
+23DD;BOTTOM PARENTHESIS;Sm;0;ON;;;;;N;;;;;
+23DE;TOP CURLY BRACKET;Sm;0;ON;;;;;N;;;;;
+23DF;BOTTOM CURLY BRACKET;Sm;0;ON;;;;;N;;;;;
+23E0;TOP TORTOISE SHELL BRACKET;Sm;0;ON;;;;;N;;;;;
+23E1;BOTTOM TORTOISE SHELL BRACKET;Sm;0;ON;;;;;N;;;;;
 23E2;WHITE TRAPEZIUM;So;0;ON;;;;;N;;;;;
 23E3;BENZENE RING WITH CIRCLE;So;0;ON;;;;;N;;;;;
 23E4;STRAIGHTNESS;So;0;ON;;;;;N;;;;;
 23E5;FLATNESS;So;0;ON;;;;;N;;;;;
 23E6;AC CURRENT;So;0;ON;;;;;N;;;;;
 23E7;ELECTRICAL INTERSECTION;So;0;ON;;;;;N;;;;;
+23E8;DECIMAL EXPONENT SYMBOL;So;0;ON;;;;;N;;;;;
 2400;SYMBOL FOR NULL;So;0;ON;;;;;N;GRAPHIC FOR NULL;;;;
 2401;SYMBOL FOR START OF HEADING;So;0;ON;;;;;N;GRAPHIC FOR START OF HEADING;;;;
 2402;SYMBOL FOR START OF TEXT;So;0;ON;;;;;N;GRAPHIC FOR START OF TEXT;;;;
@@ -8000,13 +8347,13 @@
 2670;WEST SYRIAC CROSS;So;0;ON;;;;;N;;;;;
 2671;EAST SYRIAC CROSS;So;0;ON;;;;;N;;;;;
 2672;UNIVERSAL RECYCLING SYMBOL;So;0;ON;;;;;N;;;;;
-2673;RECYCLING SYMBOL FOR TYPE-1 PLASTICS;So;0;ON;;;;;N;;pete;;;
-2674;RECYCLING SYMBOL FOR TYPE-2 PLASTICS;So;0;ON;;;;;N;;hdpe;;;
-2675;RECYCLING SYMBOL FOR TYPE-3 PLASTICS;So;0;ON;;;;;N;;pvc;;;
-2676;RECYCLING SYMBOL FOR TYPE-4 PLASTICS;So;0;ON;;;;;N;;ldpe;;;
-2677;RECYCLING SYMBOL FOR TYPE-5 PLASTICS;So;0;ON;;;;;N;;pp;;;
-2678;RECYCLING SYMBOL FOR TYPE-6 PLASTICS;So;0;ON;;;;;N;;ps;;;
-2679;RECYCLING SYMBOL FOR TYPE-7 PLASTICS;So;0;ON;;;;;N;;other;;;
+2673;RECYCLING SYMBOL FOR TYPE-1 PLASTICS;So;0;ON;;;;;N;;;;;
+2674;RECYCLING SYMBOL FOR TYPE-2 PLASTICS;So;0;ON;;;;;N;;;;;
+2675;RECYCLING SYMBOL FOR TYPE-3 PLASTICS;So;0;ON;;;;;N;;;;;
+2676;RECYCLING SYMBOL FOR TYPE-4 PLASTICS;So;0;ON;;;;;N;;;;;
+2677;RECYCLING SYMBOL FOR TYPE-5 PLASTICS;So;0;ON;;;;;N;;;;;
+2678;RECYCLING SYMBOL FOR TYPE-6 PLASTICS;So;0;ON;;;;;N;;;;;
+2679;RECYCLING SYMBOL FOR TYPE-7 PLASTICS;So;0;ON;;;;;N;;;;;
 267A;RECYCLING SYMBOL FOR GENERIC MATERIALS;So;0;ON;;;;;N;;;;;
 267B;BLACK UNIVERSAL RECYCLING SYMBOL;So;0;ON;;;;;N;;;;;
 267C;RECYCLED PAPER SYMBOL;So;0;ON;;;;;N;;;;;
@@ -8043,6 +8390,8 @@
 269B;ATOM SYMBOL;So;0;ON;;;;;N;;;;;
 269C;FLEUR-DE-LIS;So;0;ON;;;;;N;;;;;
 269D;OUTLINED WHITE STAR;So;0;ON;;;;;N;;;;;
+269E;THREE LINES CONVERGING RIGHT;So;0;ON;;;;;N;;;;;
+269F;THREE LINES CONVERGING LEFT;So;0;ON;;;;;N;;;;;
 26A0;WARNING SIGN;So;0;ON;;;;;N;;;;;
 26A1;HIGH VOLTAGE SIGN;So;0;ON;;;;;N;;;;;
 26A2;DOUBLED FEMALE SIGN;So;0;ON;;;;;N;;;;;
@@ -8072,10 +8421,67 @@
 26BA;SEMISEXTILE;So;0;ON;;;;;N;;;;;
 26BB;QUINCUNX;So;0;ON;;;;;N;;;;;
 26BC;SESQUIQUADRATE;So;0;ON;;;;;N;;;;;
+26BD;SOCCER BALL;So;0;ON;;;;;N;;;;;
+26BE;BASEBALL;So;0;ON;;;;;N;;;;;
+26BF;SQUARED KEY;So;0;ON;;;;;N;;;;;
 26C0;WHITE DRAUGHTS MAN;So;0;ON;;;;;N;;;;;
 26C1;WHITE DRAUGHTS KING;So;0;ON;;;;;N;;;;;
 26C2;BLACK DRAUGHTS MAN;So;0;ON;;;;;N;;;;;
 26C3;BLACK DRAUGHTS KING;So;0;ON;;;;;N;;;;;
+26C4;SNOWMAN WITHOUT SNOW;So;0;ON;;;;;N;;;;;
+26C5;SUN BEHIND CLOUD;So;0;ON;;;;;N;;;;;
+26C6;RAIN;So;0;ON;;;;;N;;;;;
+26C7;BLACK SNOWMAN;So;0;ON;;;;;N;;;;;
+26C8;THUNDER CLOUD AND RAIN;So;0;ON;;;;;N;;;;;
+26C9;TURNED WHITE SHOGI PIECE;So;0;ON;;;;;N;;;;;
+26CA;TURNED BLACK SHOGI PIECE;So;0;ON;;;;;N;;;;;
+26CB;WHITE DIAMOND IN SQUARE;So;0;ON;;;;;N;;;;;
+26CC;CROSSING LANES;So;0;ON;;;;;N;;;;;
+26CD;DISABLED CAR;So;0;ON;;;;;N;;;;;
+26CF;PICK;So;0;ON;;;;;N;;;;;
+26D0;CAR SLIDING;So;0;ON;;;;;N;;;;;
+26D1;HELMET WITH WHITE CROSS;So;0;ON;;;;;N;;;;;
+26D2;CIRCLED CROSSING LANES;So;0;ON;;;;;N;;;;;
+26D3;CHAINS;So;0;ON;;;;;N;;;;;
+26D4;NO ENTRY;So;0;ON;;;;;N;;;;;
+26D5;ALTERNATE ONE-WAY LEFT WAY TRAFFIC;So;0;ON;;;;;N;;;;;
+26D6;BLACK TWO-WAY LEFT WAY TRAFFIC;So;0;ON;;;;;N;;;;;
+26D7;WHITE TWO-WAY LEFT WAY TRAFFIC;So;0;ON;;;;;N;;;;;
+26D8;BLACK LEFT LANE MERGE;So;0;ON;;;;;N;;;;;
+26D9;WHITE LEFT LANE MERGE;So;0;ON;;;;;N;;;;;
+26DA;DRIVE SLOW SIGN;So;0;ON;;;;;N;;;;;
+26DB;HEAVY WHITE DOWN-POINTING TRIANGLE;So;0;ON;;;;;N;;;;;
+26DC;LEFT CLOSED ENTRY;So;0;ON;;;;;N;;;;;
+26DD;SQUARED SALTIRE;So;0;ON;;;;;N;;;;;
+26DE;FALLING DIAGONAL IN WHITE CIRCLE IN BLACK SQUARE;So;0;ON;;;;;N;;;;;
+26DF;BLACK TRUCK;So;0;ON;;;;;N;;;;;
+26E0;RESTRICTED LEFT ENTRY-1;So;0;ON;;;;;N;;;;;
+26E1;RESTRICTED LEFT ENTRY-2;So;0;ON;;;;;N;;;;;
+26E3;HEAVY CIRCLE WITH STROKE AND TWO DOTS ABOVE;So;0;ON;;;;;N;;;;;
+26E8;BLACK CROSS ON SHIELD;So;0;ON;;;;;N;;;;;
+26E9;SHINTO SHRINE;So;0;ON;;;;;N;;;;;
+26EA;CHURCH;So;0;ON;;;;;N;;;;;
+26EB;CASTLE;So;0;ON;;;;;N;;;;;
+26EC;HISTORIC SITE;So;0;ON;;;;;N;;;;;
+26ED;GEAR WITHOUT HUB;So;0;ON;;;;;N;;;;;
+26EE;GEAR WITH HANDLES;So;0;ON;;;;;N;;;;;
+26EF;MAP SYMBOL FOR LIGHTHOUSE;So;0;ON;;;;;N;;;;;
+26F0;MOUNTAIN;So;0;ON;;;;;N;;;;;
+26F1;UMBRELLA ON GROUND;So;0;ON;;;;;N;;;;;
+26F2;FOUNTAIN;So;0;ON;;;;;N;;;;;
+26F3;FLAG IN HOLE;So;0;ON;;;;;N;;;;;
+26F4;FERRY;So;0;ON;;;;;N;;;;;
+26F5;SAILBOAT;So;0;ON;;;;;N;;;;;
+26F6;SQUARE FOUR CORNERS;So;0;ON;;;;;N;;;;;
+26F7;SKIER;So;0;ON;;;;;N;;;;;
+26F8;ICE SKATE;So;0;ON;;;;;N;;;;;
+26F9;PERSON WITH BALL;So;0;ON;;;;;N;;;;;
+26FA;TENT;So;0;ON;;;;;N;;;;;
+26FB;JAPANESE BANK SYMBOL;So;0;ON;;;;;N;;;;;
+26FC;HEADSTONE GRAVEYARD SYMBOL;So;0;ON;;;;;N;;;;;
+26FD;FUEL PUMP;So;0;ON;;;;;N;;;;;
+26FE;CUP ON BLACK SQUARE;So;0;ON;;;;;N;;;;;
+26FF;WHITE FLAG WITH HORIZONTAL MIDDLE BLACK STRIPE;So;0;ON;;;;;N;;;;;
 2701;UPPER BLADE SCISSORS;So;0;ON;;;;;N;;;;;
 2702;BLACK SCISSORS;So;0;ON;;;;;N;;;;;
 2703;LOWER BLADE SCISSORS;So;0;ON;;;;;N;;;;;
@@ -8153,6 +8559,7 @@
 2751;LOWER RIGHT SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
 2752;UPPER RIGHT SHADOWED WHITE SQUARE;So;0;ON;;;;;N;;;;;
 2756;BLACK DIAMOND MINUS WHITE X;So;0;ON;;;;;N;;;;;
+2757;HEAVY EXCLAMATION MARK SYMBOL;So;0;ON;;;;;N;;;;;
 2758;LIGHT VERTICAL BAR;So;0;ON;;;;;N;;;;;
 2759;MEDIUM VERTICAL BAR;So;0;ON;;;;;N;;;;;
 275A;HEAVY VERTICAL BAR;So;0;ON;;;;;N;;;;;
@@ -9042,8 +9449,8 @@
 2AD9;ELEMENT OF OPENING DOWNWARDS;Sm;0;ON;;;;;N;;;;;
 2ADA;PITCHFORK WITH TEE TOP;Sm;0;ON;;;;;N;;;;;
 2ADB;TRANSVERSAL INTERSECTION;Sm;0;ON;;;;;N;;;;;
-2ADC;FORKING;Sm;0;ON;2ADD 0338;;;;Y;;not independent;;;
-2ADD;NONFORKING;Sm;0;ON;;;;;N;;independent;;;
+2ADC;FORKING;Sm;0;ON;2ADD 0338;;;;Y;;;;;
+2ADD;NONFORKING;Sm;0;ON;;;;;N;;;;;
 2ADE;SHORT LEFT TACK;Sm;0;ON;;;;;Y;;;;;
 2ADF;SHORT DOWN TACK;Sm;0;ON;;;;;N;;;;;
 2AE0;SHORT UP TACK;Sm;0;ON;;;;;N;;;;;
@@ -9160,6 +9567,11 @@
 2B52;WHITE SMALL STAR;So;0;ON;;;;;N;;;;;
 2B53;BLACK RIGHT-POINTING PENTAGON;So;0;ON;;;;;N;;;;;
 2B54;WHITE RIGHT-POINTING PENTAGON;So;0;ON;;;;;N;;;;;
+2B55;HEAVY LARGE CIRCLE;So;0;ON;;;;;N;;;;;
+2B56;HEAVY OVAL WITH OVAL INSIDE;So;0;ON;;;;;N;;;;;
+2B57;HEAVY CIRCLE WITH CIRCLE INSIDE;So;0;ON;;;;;N;;;;;
+2B58;HEAVY CIRCLE;So;0;ON;;;;;N;;;;;
+2B59;HEAVY CIRCLED SALTIRE;So;0;ON;;;;;N;;;;;
 2C00;GLAGOLITIC CAPITAL LETTER AZU;Lu;0;L;;;;;N;;;;2C30;
 2C01;GLAGOLITIC CAPITAL LETTER BUKY;Lu;0;L;;;;;N;;;;2C31;
 2C02;GLAGOLITIC CAPITAL LETTER VEDE;Lu;0;L;;;;;N;;;;2C32;
@@ -9270,6 +9682,7 @@
 2C6D;LATIN CAPITAL LETTER ALPHA;Lu;0;L;;;;;N;;;;0251;
 2C6E;LATIN CAPITAL LETTER M WITH HOOK;Lu;0;L;;;;;N;;;;0271;
 2C6F;LATIN CAPITAL LETTER TURNED A;Lu;0;L;;;;;N;;;;0250;
+2C70;LATIN CAPITAL LETTER TURNED ALPHA;Lu;0;L;;;;;N;;;;0252;
 2C71;LATIN SMALL LETTER V WITH RIGHT HOOK;Ll;0;L;;;;;N;;;;;
 2C72;LATIN CAPITAL LETTER W WITH HOOK;Lu;0;L;;;;;N;;;;2C73;
 2C73;LATIN SMALL LETTER W WITH HOOK;Ll;0;L;;;;;N;;;2C72;;2C72
@@ -9283,6 +9696,8 @@
 2C7B;LATIN LETTER SMALL CAPITAL TURNED E;Ll;0;L;;;;;N;;;;;
 2C7C;LATIN SUBSCRIPT SMALL LETTER J;Ll;0;L;<sub> 006A;;;;N;;;;;
 2C7D;MODIFIER LETTER CAPITAL V;Lm;0;L;<super> 0056;;;;N;;;;;
+2C7E;LATIN CAPITAL LETTER S WITH SWASH TAIL;Lu;0;L;;;;;N;;;;023F;
+2C7F;LATIN CAPITAL LETTER Z WITH SWASH TAIL;Lu;0;L;;;;;N;;;;0240;
 2C80;COPTIC CAPITAL LETTER ALFA;Lu;0;L;;;;;N;;;;2C81;
 2C81;COPTIC SMALL LETTER ALFA;Ll;0;L;;;;;N;;;2C80;;2C80
 2C82;COPTIC CAPITAL LETTER VIDA;Lu;0;L;;;;;N;;;;2C83;
@@ -9390,6 +9805,13 @@
 2CE8;COPTIC SYMBOL TAU RO;So;0;ON;;;;;N;;;;;
 2CE9;COPTIC SYMBOL KHI RO;So;0;ON;;;;;N;;;;;
 2CEA;COPTIC SYMBOL SHIMA SIMA;So;0;ON;;;;;N;;;;;
+2CEB;COPTIC CAPITAL LETTER CRYPTOGRAMMIC SHEI;Lu;0;L;;;;;N;;;;2CEC;
+2CEC;COPTIC SMALL LETTER CRYPTOGRAMMIC SHEI;Ll;0;L;;;;;N;;;2CEB;;2CEB
+2CED;COPTIC CAPITAL LETTER CRYPTOGRAMMIC GANGIA;Lu;0;L;;;;;N;;;;2CEE;
+2CEE;COPTIC SMALL LETTER CRYPTOGRAMMIC GANGIA;Ll;0;L;;;;;N;;;2CED;;2CED
+2CEF;COPTIC COMBINING NI ABOVE;Mn;230;NSM;;;;;N;;;;;
+2CF0;COPTIC COMBINING SPIRITUS ASPER;Mn;230;NSM;;;;;N;;;;;
+2CF1;COPTIC COMBINING SPIRITUS LENIS;Mn;230;NSM;;;;;N;;;;;
 2CF9;COPTIC OLD NUBIAN FULL STOP;Po;0;ON;;;;;N;;;;;
 2CFA;COPTIC OLD NUBIAN DIRECT QUESTION MARK;Po;0;ON;;;;;N;;;;;
 2CFB;COPTIC OLD NUBIAN INDIRECT QUESTION MARK;Po;0;ON;;;;;N;;;;;
@@ -9397,44 +9819,44 @@
 2CFD;COPTIC FRACTION ONE HALF;No;0;ON;;;;1/2;N;;;;;
 2CFE;COPTIC FULL STOP;Po;0;ON;;;;;N;;;;;
 2CFF;COPTIC MORPHOLOGICAL DIVIDER;Po;0;ON;;;;;N;;;;;
-2D00;GEORGIAN SMALL LETTER AN;Ll;0;L;;;;;N;;Khutsuri;10A0;;10A0
-2D01;GEORGIAN SMALL LETTER BAN;Ll;0;L;;;;;N;;Khutsuri;10A1;;10A1
-2D02;GEORGIAN SMALL LETTER GAN;Ll;0;L;;;;;N;;Khutsuri;10A2;;10A2
-2D03;GEORGIAN SMALL LETTER DON;Ll;0;L;;;;;N;;Khutsuri;10A3;;10A3
-2D04;GEORGIAN SMALL LETTER EN;Ll;0;L;;;;;N;;Khutsuri;10A4;;10A4
-2D05;GEORGIAN SMALL LETTER VIN;Ll;0;L;;;;;N;;Khutsuri;10A5;;10A5
-2D06;GEORGIAN SMALL LETTER ZEN;Ll;0;L;;;;;N;;Khutsuri;10A6;;10A6
-2D07;GEORGIAN SMALL LETTER TAN;Ll;0;L;;;;;N;;Khutsuri;10A7;;10A7
-2D08;GEORGIAN SMALL LETTER IN;Ll;0;L;;;;;N;;Khutsuri;10A8;;10A8
-2D09;GEORGIAN SMALL LETTER KAN;Ll;0;L;;;;;N;;Khutsuri;10A9;;10A9
-2D0A;GEORGIAN SMALL LETTER LAS;Ll;0;L;;;;;N;;Khutsuri;10AA;;10AA
-2D0B;GEORGIAN SMALL LETTER MAN;Ll;0;L;;;;;N;;Khutsuri;10AB;;10AB
-2D0C;GEORGIAN SMALL LETTER NAR;Ll;0;L;;;;;N;;Khutsuri;10AC;;10AC
-2D0D;GEORGIAN SMALL LETTER ON;Ll;0;L;;;;;N;;Khutsuri;10AD;;10AD
-2D0E;GEORGIAN SMALL LETTER PAR;Ll;0;L;;;;;N;;Khutsuri;10AE;;10AE
-2D0F;GEORGIAN SMALL LETTER ZHAR;Ll;0;L;;;;;N;;Khutsuri;10AF;;10AF
-2D10;GEORGIAN SMALL LETTER RAE;Ll;0;L;;;;;N;;Khutsuri;10B0;;10B0
-2D11;GEORGIAN SMALL LETTER SAN;Ll;0;L;;;;;N;;Khutsuri;10B1;;10B1
-2D12;GEORGIAN SMALL LETTER TAR;Ll;0;L;;;;;N;;Khutsuri;10B2;;10B2
-2D13;GEORGIAN SMALL LETTER UN;Ll;0;L;;;;;N;;Khutsuri;10B3;;10B3
-2D14;GEORGIAN SMALL LETTER PHAR;Ll;0;L;;;;;N;;Khutsuri;10B4;;10B4
-2D15;GEORGIAN SMALL LETTER KHAR;Ll;0;L;;;;;N;;Khutsuri;10B5;;10B5
-2D16;GEORGIAN SMALL LETTER GHAN;Ll;0;L;;;;;N;;Khutsuri;10B6;;10B6
-2D17;GEORGIAN SMALL LETTER QAR;Ll;0;L;;;;;N;;Khutsuri;10B7;;10B7
-2D18;GEORGIAN SMALL LETTER SHIN;Ll;0;L;;;;;N;;Khutsuri;10B8;;10B8
-2D19;GEORGIAN SMALL LETTER CHIN;Ll;0;L;;;;;N;;Khutsuri;10B9;;10B9
-2D1A;GEORGIAN SMALL LETTER CAN;Ll;0;L;;;;;N;;Khutsuri;10BA;;10BA
-2D1B;GEORGIAN SMALL LETTER JIL;Ll;0;L;;;;;N;;Khutsuri;10BB;;10BB
-2D1C;GEORGIAN SMALL LETTER CIL;Ll;0;L;;;;;N;;Khutsuri;10BC;;10BC
-2D1D;GEORGIAN SMALL LETTER CHAR;Ll;0;L;;;;;N;;Khutsuri;10BD;;10BD
-2D1E;GEORGIAN SMALL LETTER XAN;Ll;0;L;;;;;N;;Khutsuri;10BE;;10BE
-2D1F;GEORGIAN SMALL LETTER JHAN;Ll;0;L;;;;;N;;Khutsuri;10BF;;10BF
-2D20;GEORGIAN SMALL LETTER HAE;Ll;0;L;;;;;N;;Khutsuri;10C0;;10C0
-2D21;GEORGIAN SMALL LETTER HE;Ll;0;L;;;;;N;;Khutsuri;10C1;;10C1
-2D22;GEORGIAN SMALL LETTER HIE;Ll;0;L;;;;;N;;Khutsuri;10C2;;10C2
-2D23;GEORGIAN SMALL LETTER WE;Ll;0;L;;;;;N;;Khutsuri;10C3;;10C3
-2D24;GEORGIAN SMALL LETTER HAR;Ll;0;L;;;;;N;;Khutsuri;10C4;;10C4
-2D25;GEORGIAN SMALL LETTER HOE;Ll;0;L;;;;;N;;Khutsuri;10C5;;10C5
+2D00;GEORGIAN SMALL LETTER AN;Ll;0;L;;;;;N;;;10A0;;10A0
+2D01;GEORGIAN SMALL LETTER BAN;Ll;0;L;;;;;N;;;10A1;;10A1
+2D02;GEORGIAN SMALL LETTER GAN;Ll;0;L;;;;;N;;;10A2;;10A2
+2D03;GEORGIAN SMALL LETTER DON;Ll;0;L;;;;;N;;;10A3;;10A3
+2D04;GEORGIAN SMALL LETTER EN;Ll;0;L;;;;;N;;;10A4;;10A4
+2D05;GEORGIAN SMALL LETTER VIN;Ll;0;L;;;;;N;;;10A5;;10A5
+2D06;GEORGIAN SMALL LETTER ZEN;Ll;0;L;;;;;N;;;10A6;;10A6
+2D07;GEORGIAN SMALL LETTER TAN;Ll;0;L;;;;;N;;;10A7;;10A7
+2D08;GEORGIAN SMALL LETTER IN;Ll;0;L;;;;;N;;;10A8;;10A8
+2D09;GEORGIAN SMALL LETTER KAN;Ll;0;L;;;;;N;;;10A9;;10A9
+2D0A;GEORGIAN SMALL LETTER LAS;Ll;0;L;;;;;N;;;10AA;;10AA
+2D0B;GEORGIAN SMALL LETTER MAN;Ll;0;L;;;;;N;;;10AB;;10AB
+2D0C;GEORGIAN SMALL LETTER NAR;Ll;0;L;;;;;N;;;10AC;;10AC
+2D0D;GEORGIAN SMALL LETTER ON;Ll;0;L;;;;;N;;;10AD;;10AD
+2D0E;GEORGIAN SMALL LETTER PAR;Ll;0;L;;;;;N;;;10AE;;10AE
+2D0F;GEORGIAN SMALL LETTER ZHAR;Ll;0;L;;;;;N;;;10AF;;10AF
+2D10;GEORGIAN SMALL LETTER RAE;Ll;0;L;;;;;N;;;10B0;;10B0
+2D11;GEORGIAN SMALL LETTER SAN;Ll;0;L;;;;;N;;;10B1;;10B1
+2D12;GEORGIAN SMALL LETTER TAR;Ll;0;L;;;;;N;;;10B2;;10B2
+2D13;GEORGIAN SMALL LETTER UN;Ll;0;L;;;;;N;;;10B3;;10B3
+2D14;GEORGIAN SMALL LETTER PHAR;Ll;0;L;;;;;N;;;10B4;;10B4
+2D15;GEORGIAN SMALL LETTER KHAR;Ll;0;L;;;;;N;;;10B5;;10B5
+2D16;GEORGIAN SMALL LETTER GHAN;Ll;0;L;;;;;N;;;10B6;;10B6
+2D17;GEORGIAN SMALL LETTER QAR;Ll;0;L;;;;;N;;;10B7;;10B7
+2D18;GEORGIAN SMALL LETTER SHIN;Ll;0;L;;;;;N;;;10B8;;10B8
+2D19;GEORGIAN SMALL LETTER CHIN;Ll;0;L;;;;;N;;;10B9;;10B9
+2D1A;GEORGIAN SMALL LETTER CAN;Ll;0;L;;;;;N;;;10BA;;10BA
+2D1B;GEORGIAN SMALL LETTER JIL;Ll;0;L;;;;;N;;;10BB;;10BB
+2D1C;GEORGIAN SMALL LETTER CIL;Ll;0;L;;;;;N;;;10BC;;10BC
+2D1D;GEORGIAN SMALL LETTER CHAR;Ll;0;L;;;;;N;;;10BD;;10BD
+2D1E;GEORGIAN SMALL LETTER XAN;Ll;0;L;;;;;N;;;10BE;;10BE
+2D1F;GEORGIAN SMALL LETTER JHAN;Ll;0;L;;;;;N;;;10BF;;10BF
+2D20;GEORGIAN SMALL LETTER HAE;Ll;0;L;;;;;N;;;10C0;;10C0
+2D21;GEORGIAN SMALL LETTER HE;Ll;0;L;;;;;N;;;10C1;;10C1
+2D22;GEORGIAN SMALL LETTER HIE;Ll;0;L;;;;;N;;;10C2;;10C2
+2D23;GEORGIAN SMALL LETTER WE;Ll;0;L;;;;;N;;;10C3;;10C3
+2D24;GEORGIAN SMALL LETTER HAR;Ll;0;L;;;;;N;;;10C4;;10C4
+2D25;GEORGIAN SMALL LETTER HOE;Ll;0;L;;;;;N;;;10C5;;10C5
 2D30;TIFINAGH LETTER YA;Lo;0;L;;;;;N;;;;;
 2D31;TIFINAGH LETTER YAB;Lo;0;L;;;;;N;;;;;
 2D32;TIFINAGH LETTER YABH;Lo;0;L;;;;;N;;;;;
@@ -9451,7 +9873,7 @@
 2D3D;TIFINAGH LETTER YAK;Lo;0;L;;;;;N;;;;;
 2D3E;TIFINAGH LETTER TUAREG YAK;Lo;0;L;;;;;N;;;;;
 2D3F;TIFINAGH LETTER YAKHH;Lo;0;L;;;;;N;;;;;
-2D40;TIFINAGH LETTER YAH;Lo;0;L;;;;;N;;Tuareg yab;;;
+2D40;TIFINAGH LETTER YAH;Lo;0;L;;;;;N;;;;;
 2D41;TIFINAGH LETTER BERBER ACADEMY YAH;Lo;0;L;;;;;N;;;;;
 2D42;TIFINAGH LETTER TUAREG YAH;Lo;0;L;;;;;N;;;;;
 2D43;TIFINAGH LETTER YAHH;Lo;0;L;;;;;N;;;;;
@@ -9470,12 +9892,12 @@
 2D50;TIFINAGH LETTER TUAREG YAGN;Lo;0;L;;;;;N;;;;;
 2D51;TIFINAGH LETTER TUAREG YANG;Lo;0;L;;;;;N;;;;;
 2D52;TIFINAGH LETTER YAP;Lo;0;L;;;;;N;;;;;
-2D53;TIFINAGH LETTER YU;Lo;0;L;;;;;N;;Tuareg yaw;;;
+2D53;TIFINAGH LETTER YU;Lo;0;L;;;;;N;;;;;
 2D54;TIFINAGH LETTER YAR;Lo;0;L;;;;;N;;;;;
 2D55;TIFINAGH LETTER YARR;Lo;0;L;;;;;N;;;;;
 2D56;TIFINAGH LETTER YAGH;Lo;0;L;;;;;N;;;;;
 2D57;TIFINAGH LETTER TUAREG YAGH;Lo;0;L;;;;;N;;;;;
-2D58;TIFINAGH LETTER AYER YAGH;Lo;0;L;;;;;N;;Adrar yaj;;;
+2D58;TIFINAGH LETTER AYER YAGH;Lo;0;L;;;;;N;;;;;
 2D59;TIFINAGH LETTER YAS;Lo;0;L;;;;;N;;;;;
 2D5A;TIFINAGH LETTER YASS;Lo;0;L;;;;;N;;;;;
 2D5B;TIFINAGH LETTER YASH;Lo;0;L;;;;;N;;;;;
@@ -9487,9 +9909,9 @@
 2D61;TIFINAGH LETTER YAW;Lo;0;L;;;;;N;;;;;
 2D62;TIFINAGH LETTER YAY;Lo;0;L;;;;;N;;;;;
 2D63;TIFINAGH LETTER YAZ;Lo;0;L;;;;;N;;;;;
-2D64;TIFINAGH LETTER TAWELLEMET YAZ;Lo;0;L;;;;;N;;harpoon yaz;;;
+2D64;TIFINAGH LETTER TAWELLEMET YAZ;Lo;0;L;;;;;N;;;;;
 2D65;TIFINAGH LETTER YAZZ;Lo;0;L;;;;;N;;;;;
-2D6F;TIFINAGH MODIFIER LETTER LABIALIZATION MARK;Lm;0;L;<super> 2D61;;;;N;;tamatart;;;
+2D6F;TIFINAGH MODIFIER LETTER LABIALIZATION MARK;Lm;0;L;<super> 2D61;;;;N;;;;;
 2D80;ETHIOPIC SYLLABLE LOA;Lo;0;L;;;;;N;;;;;
 2D81;ETHIOPIC SYLLABLE MOA;Lo;0;L;;;;;N;;;;;
 2D82;ETHIOPIC SYLLABLE ROA;Lo;0;L;;;;;N;;;;;
@@ -9650,6 +10072,7 @@
 2E2E;REVERSED QUESTION MARK;Po;0;ON;;;;;N;;;;;
 2E2F;VERTICAL TILDE;Lm;0;ON;;;;;N;;;;;
 2E30;RING POINT;Po;0;ON;;;;;N;;;;;
+2E31;WORD SEPARATOR MIDDLE DOT;Po;0;ON;;;;;N;;;;;
 2E80;CJK RADICAL REPEAT;So;0;ON;;;;;N;;;;;
 2E81;CJK RADICAL CLIFF;So;0;ON;;;;;N;;;;;
 2E82;CJK RADICAL SECOND ONE;So;0;ON;;;;;N;;;;;
@@ -10379,22 +10802,22 @@
 318C;HANGUL LETTER YU-I;Lo;0;L;<compat> 1194;;;;N;HANGUL LETTER YUI;;;;
 318D;HANGUL LETTER ARAEA;Lo;0;L;<compat> 119E;;;;N;HANGUL LETTER ALAE A;;;;
 318E;HANGUL LETTER ARAEAE;Lo;0;L;<compat> 11A1;;;;N;HANGUL LETTER ALAE AE;;;;
-3190;IDEOGRAPHIC ANNOTATION LINKING MARK;So;0;L;;;;;N;KANBUN TATETEN;Kanbun Tateten;;;
-3191;IDEOGRAPHIC ANNOTATION REVERSE MARK;So;0;L;;;;;N;KAERITEN RE;Kaeriten;;;
-3192;IDEOGRAPHIC ANNOTATION ONE MARK;No;0;L;<super> 4E00;;;1;N;KAERITEN ITI;Kaeriten;;;
-3193;IDEOGRAPHIC ANNOTATION TWO MARK;No;0;L;<super> 4E8C;;;2;N;KAERITEN NI;Kaeriten;;;
-3194;IDEOGRAPHIC ANNOTATION THREE MARK;No;0;L;<super> 4E09;;;3;N;KAERITEN SAN;Kaeriten;;;
-3195;IDEOGRAPHIC ANNOTATION FOUR MARK;No;0;L;<super> 56DB;;;4;N;KAERITEN SI;Kaeriten;;;
-3196;IDEOGRAPHIC ANNOTATION TOP MARK;So;0;L;<super> 4E0A;;;;N;KAERITEN ZYOU;Kaeriten;;;
-3197;IDEOGRAPHIC ANNOTATION MIDDLE MARK;So;0;L;<super> 4E2D;;;;N;KAERITEN TYUU;Kaeriten;;;
-3198;IDEOGRAPHIC ANNOTATION BOTTOM MARK;So;0;L;<super> 4E0B;;;;N;KAERITEN GE;Kaeriten;;;
-3199;IDEOGRAPHIC ANNOTATION FIRST MARK;So;0;L;<super> 7532;;;;N;KAERITEN KOU;Kaeriten;;;
-319A;IDEOGRAPHIC ANNOTATION SECOND MARK;So;0;L;<super> 4E59;;;;N;KAERITEN OTU;Kaeriten;;;
-319B;IDEOGRAPHIC ANNOTATION THIRD MARK;So;0;L;<super> 4E19;;;;N;KAERITEN HEI;Kaeriten;;;
-319C;IDEOGRAPHIC ANNOTATION FOURTH MARK;So;0;L;<super> 4E01;;;;N;KAERITEN TEI;Kaeriten;;;
-319D;IDEOGRAPHIC ANNOTATION HEAVEN MARK;So;0;L;<super> 5929;;;;N;KAERITEN TEN;Kaeriten;;;
-319E;IDEOGRAPHIC ANNOTATION EARTH MARK;So;0;L;<super> 5730;;;;N;KAERITEN TI;Kaeriten;;;
-319F;IDEOGRAPHIC ANNOTATION MAN MARK;So;0;L;<super> 4EBA;;;;N;KAERITEN ZIN;Kaeriten;;;
+3190;IDEOGRAPHIC ANNOTATION LINKING MARK;So;0;L;;;;;N;KANBUN TATETEN;;;;
+3191;IDEOGRAPHIC ANNOTATION REVERSE MARK;So;0;L;;;;;N;KAERITEN RE;;;;
+3192;IDEOGRAPHIC ANNOTATION ONE MARK;No;0;L;<super> 4E00;;;1;N;KAERITEN ITI;;;;
+3193;IDEOGRAPHIC ANNOTATION TWO MARK;No;0;L;<super> 4E8C;;;2;N;KAERITEN NI;;;;
+3194;IDEOGRAPHIC ANNOTATION THREE MARK;No;0;L;<super> 4E09;;;3;N;KAERITEN SAN;;;;
+3195;IDEOGRAPHIC ANNOTATION FOUR MARK;No;0;L;<super> 56DB;;;4;N;KAERITEN SI;;;;
+3196;IDEOGRAPHIC ANNOTATION TOP MARK;So;0;L;<super> 4E0A;;;;N;KAERITEN ZYOU;;;;
+3197;IDEOGRAPHIC ANNOTATION MIDDLE MARK;So;0;L;<super> 4E2D;;;;N;KAERITEN TYUU;;;;
+3198;IDEOGRAPHIC ANNOTATION BOTTOM MARK;So;0;L;<super> 4E0B;;;;N;KAERITEN GE;;;;
+3199;IDEOGRAPHIC ANNOTATION FIRST MARK;So;0;L;<super> 7532;;;;N;KAERITEN KOU;;;;
+319A;IDEOGRAPHIC ANNOTATION SECOND MARK;So;0;L;<super> 4E59;;;;N;KAERITEN OTU;;;;
+319B;IDEOGRAPHIC ANNOTATION THIRD MARK;So;0;L;<super> 4E19;;;;N;KAERITEN HEI;;;;
+319C;IDEOGRAPHIC ANNOTATION FOURTH MARK;So;0;L;<super> 4E01;;;;N;KAERITEN TEI;;;;
+319D;IDEOGRAPHIC ANNOTATION HEAVEN MARK;So;0;L;<super> 5929;;;;N;KAERITEN TEN;;;;
+319E;IDEOGRAPHIC ANNOTATION EARTH MARK;So;0;L;<super> 5730;;;;N;KAERITEN TI;;;;
+319F;IDEOGRAPHIC ANNOTATION MAN MARK;So;0;L;<super> 4EBA;;;;N;KAERITEN ZIN;;;;
 31A0;BOPOMOFO LETTER BU;Lo;0;L;;;;;N;;;;;
 31A1;BOPOMOFO LETTER ZI;Lo;0;L;;;;;N;;;;;
 31A2;BOPOMOFO LETTER JI;Lo;0;L;;;;;N;;;;;
@@ -10538,6 +10961,18 @@
 3241;PARENTHESIZED IDEOGRAPH REST;So;0;L;<compat> 0028 4F11 0029;;;;N;;;;;
 3242;PARENTHESIZED IDEOGRAPH SELF;So;0;L;<compat> 0028 81EA 0029;;;;N;;;;;
 3243;PARENTHESIZED IDEOGRAPH REACH;So;0;L;<compat> 0028 81F3 0029;;;;N;;;;;
+3244;CIRCLED IDEOGRAPH QUESTION;So;0;L;<circle> 554F;;;;N;;;;;
+3245;CIRCLED IDEOGRAPH KINDERGARTEN;So;0;L;<circle> 5E7C;;;;N;;;;;
+3246;CIRCLED IDEOGRAPH SCHOOL;So;0;L;<circle> 6587;;;;N;;;;;
+3247;CIRCLED IDEOGRAPH KOTO;So;0;L;<circle> 7B8F;;;;N;;;;;
+3248;CIRCLED NUMBER TEN ON BLACK SQUARE;So;0;L;;;;;N;;;;;
+3249;CIRCLED NUMBER TWENTY ON BLACK SQUARE;So;0;L;;;;;N;;;;;
+324A;CIRCLED NUMBER THIRTY ON BLACK SQUARE;So;0;L;;;;;N;;;;;
+324B;CIRCLED NUMBER FORTY ON BLACK SQUARE;So;0;L;;;;;N;;;;;
+324C;CIRCLED NUMBER FIFTY ON BLACK SQUARE;So;0;L;;;;;N;;;;;
+324D;CIRCLED NUMBER SIXTY ON BLACK SQUARE;So;0;L;;;;;N;;;;;
+324E;CIRCLED NUMBER SEVENTY ON BLACK SQUARE;So;0;L;;;;;N;;;;;
+324F;CIRCLED NUMBER EIGHTY ON BLACK SQUARE;So;0;L;;;;;N;;;;;
 3250;PARTNERSHIP SIGN;So;0;ON;<square> 0050 0054 0045;;;;N;;;;;
 3251;CIRCLED NUMBER TWENTY ONE;No;0;ON;<circle> 0032 0031;;;21;N;;;;;
 3252;CIRCLED NUMBER TWENTY TWO;No;0;ON;<circle> 0032 0032;;;22;N;;;;;
@@ -11036,7 +11471,7 @@
 4DFE;HEXAGRAM FOR AFTER COMPLETION;So;0;ON;;;;;N;;;;;
 4DFF;HEXAGRAM FOR BEFORE COMPLETION;So;0;ON;;;;;N;;;;;
 4E00;<CJK Ideograph, First>;Lo;0;L;;;;;N;;;;;
-9FC3;<CJK Ideograph, Last>;Lo;0;L;;;;;N;;;;;
+9FCB;<CJK Ideograph, Last>;Lo;0;L;;;;;N;;;;;
 A000;YI SYLLABLE IT;Lo;0;L;;;;;N;;;;;
 A001;YI SYLLABLE IX;Lo;0;L;;;;;N;;;;;
 A002;YI SYLLABLE I;Lo;0;L;;;;;N;;;;;
@@ -12257,6 +12692,54 @@ A4C3;YI RADICAL CHE;So;0;ON;;;;;N;;;;;
 A4C4;YI RADICAL ZZIET;So;0;ON;;;;;N;;;;;
 A4C5;YI RADICAL NBIE;So;0;ON;;;;;N;;;;;
 A4C6;YI RADICAL KE;So;0;ON;;;;;N;;;;;
+A4D0;LISU LETTER BA;Lo;0;L;;;;;N;;;;;
+A4D1;LISU LETTER PA;Lo;0;L;;;;;N;;;;;
+A4D2;LISU LETTER PHA;Lo;0;L;;;;;N;;;;;
+A4D3;LISU LETTER DA;Lo;0;L;;;;;N;;;;;
+A4D4;LISU LETTER TA;Lo;0;L;;;;;N;;;;;
+A4D5;LISU LETTER THA;Lo;0;L;;;;;N;;;;;
+A4D6;LISU LETTER GA;Lo;0;L;;;;;N;;;;;
+A4D7;LISU LETTER KA;Lo;0;L;;;;;N;;;;;
+A4D8;LISU LETTER KHA;Lo;0;L;;;;;N;;;;;
+A4D9;LISU LETTER JA;Lo;0;L;;;;;N;;;;;
+A4DA;LISU LETTER CA;Lo;0;L;;;;;N;;;;;
+A4DB;LISU LETTER CHA;Lo;0;L;;;;;N;;;;;
+A4DC;LISU LETTER DZA;Lo;0;L;;;;;N;;;;;
+A4DD;LISU LETTER TSA;Lo;0;L;;;;;N;;;;;
+A4DE;LISU LETTER TSHA;Lo;0;L;;;;;N;;;;;
+A4DF;LISU LETTER MA;Lo;0;L;;;;;N;;;;;
+A4E0;LISU LETTER NA;Lo;0;L;;;;;N;;;;;
+A4E1;LISU LETTER LA;Lo;0;L;;;;;N;;;;;
+A4E2;LISU LETTER SA;Lo;0;L;;;;;N;;;;;
+A4E3;LISU LETTER ZHA;Lo;0;L;;;;;N;;;;;
+A4E4;LISU LETTER ZA;Lo;0;L;;;;;N;;;;;
+A4E5;LISU LETTER NGA;Lo;0;L;;;;;N;;;;;
+A4E6;LISU LETTER HA;Lo;0;L;;;;;N;;;;;
+A4E7;LISU LETTER XA;Lo;0;L;;;;;N;;;;;
+A4E8;LISU LETTER HHA;Lo;0;L;;;;;N;;;;;
+A4E9;LISU LETTER FA;Lo;0;L;;;;;N;;;;;
+A4EA;LISU LETTER WA;Lo;0;L;;;;;N;;;;;
+A4EB;LISU LETTER SHA;Lo;0;L;;;;;N;;;;;
+A4EC;LISU LETTER YA;Lo;0;L;;;;;N;;;;;
+A4ED;LISU LETTER GHA;Lo;0;L;;;;;N;;;;;
+A4EE;LISU LETTER A;Lo;0;L;;;;;N;;;;;
+A4EF;LISU LETTER AE;Lo;0;L;;;;;N;;;;;
+A4F0;LISU LETTER E;Lo;0;L;;;;;N;;;;;
+A4F1;LISU LETTER EU;Lo;0;L;;;;;N;;;;;
+A4F2;LISU LETTER I;Lo;0;L;;;;;N;;;;;
+A4F3;LISU LETTER O;Lo;0;L;;;;;N;;;;;
+A4F4;LISU LETTER U;Lo;0;L;;;;;N;;;;;
+A4F5;LISU LETTER UE;Lo;0;L;;;;;N;;;;;
+A4F6;LISU LETTER UH;Lo;0;L;;;;;N;;;;;
+A4F7;LISU LETTER OE;Lo;0;L;;;;;N;;;;;
+A4F8;LISU LETTER TONE MYA TI;Lm;0;L;;;;;N;;;;;
+A4F9;LISU LETTER TONE NA PO;Lm;0;L;;;;;N;;;;;
+A4FA;LISU LETTER TONE MYA CYA;Lm;0;L;;;;;N;;;;;
+A4FB;LISU LETTER TONE MYA BO;Lm;0;L;;;;;N;;;;;
+A4FC;LISU LETTER TONE MYA NA;Lm;0;L;;;;;N;;;;;
+A4FD;LISU LETTER TONE MYA JEU;Lm;0;L;;;;;N;;;;;
+A4FE;LISU PUNCTUATION COMMA;Po;0;L;;;;;N;;;;;
+A4FF;LISU PUNCTUATION FULL STOP;Po;0;L;;;;;N;;;;;
 A500;VAI SYLLABLE EE;Lo;0;L;;;;;N;;;;;
 A501;VAI SYLLABLE EEN;Lo;0;L;;;;;N;;;;;
 A502;VAI SYLLABLE HEE;Lo;0;L;;;;;N;;;;;
@@ -12635,6 +13118,94 @@ A694;CYRILLIC CAPITAL LETTER HWE;Lu;0;L;;;;;N;;;;A695;
 A695;CYRILLIC SMALL LETTER HWE;Ll;0;L;;;;;N;;;A694;;A694
 A696;CYRILLIC CAPITAL LETTER SHWE;Lu;0;L;;;;;N;;;;A697;
 A697;CYRILLIC SMALL LETTER SHWE;Ll;0;L;;;;;N;;;A696;;A696
+A6A0;BAMUM LETTER A;Lo;0;L;;;;;N;;;;;
+A6A1;BAMUM LETTER KA;Lo;0;L;;;;;N;;;;;
+A6A2;BAMUM LETTER U;Lo;0;L;;;;;N;;;;;
+A6A3;BAMUM LETTER KU;Lo;0;L;;;;;N;;;;;
+A6A4;BAMUM LETTER EE;Lo;0;L;;;;;N;;;;;
+A6A5;BAMUM LETTER REE;Lo;0;L;;;;;N;;;;;
+A6A6;BAMUM LETTER TAE;Lo;0;L;;;;;N;;;;;
+A6A7;BAMUM LETTER O;Lo;0;L;;;;;N;;;;;
+A6A8;BAMUM LETTER NYI;Lo;0;L;;;;;N;;;;;
+A6A9;BAMUM LETTER I;Lo;0;L;;;;;N;;;;;
+A6AA;BAMUM LETTER LA;Lo;0;L;;;;;N;;;;;
+A6AB;BAMUM LETTER PA;Lo;0;L;;;;;N;;;;;
+A6AC;BAMUM LETTER RII;Lo;0;L;;;;;N;;;;;
+A6AD;BAMUM LETTER RIEE;Lo;0;L;;;;;N;;;;;
+A6AE;BAMUM LETTER LEEEE;Lo;0;L;;;;;N;;;;;
+A6AF;BAMUM LETTER MEEEE;Lo;0;L;;;;;N;;;;;
+A6B0;BAMUM LETTER TAA;Lo;0;L;;;;;N;;;;;
+A6B1;BAMUM LETTER NDAA;Lo;0;L;;;;;N;;;;;
+A6B2;BAMUM LETTER NJAEM;Lo;0;L;;;;;N;;;;;
+A6B3;BAMUM LETTER M;Lo;0;L;;;;;N;;;;;
+A6B4;BAMUM LETTER SUU;Lo;0;L;;;;;N;;;;;
+A6B5;BAMUM LETTER MU;Lo;0;L;;;;;N;;;;;
+A6B6;BAMUM LETTER SHII;Lo;0;L;;;;;N;;;;;
+A6B7;BAMUM LETTER SI;Lo;0;L;;;;;N;;;;;
+A6B8;BAMUM LETTER SHEUX;Lo;0;L;;;;;N;;;;;
+A6B9;BAMUM LETTER SEUX;Lo;0;L;;;;;N;;;;;
+A6BA;BAMUM LETTER KYEE;Lo;0;L;;;;;N;;;;;
+A6BB;BAMUM LETTER KET;Lo;0;L;;;;;N;;;;;
+A6BC;BAMUM LETTER NUAE;Lo;0;L;;;;;N;;;;;
+A6BD;BAMUM LETTER NU;Lo;0;L;;;;;N;;;;;
+A6BE;BAMUM LETTER NJUAE;Lo;0;L;;;;;N;;;;;
+A6BF;BAMUM LETTER YOQ;Lo;0;L;;;;;N;;;;;
+A6C0;BAMUM LETTER SHU;Lo;0;L;;;;;N;;;;;
+A6C1;BAMUM LETTER YUQ;Lo;0;L;;;;;N;;;;;
+A6C2;BAMUM LETTER YA;Lo;0;L;;;;;N;;;;;
+A6C3;BAMUM LETTER NSHA;Lo;0;L;;;;;N;;;;;
+A6C4;BAMUM LETTER KEUX;Lo;0;L;;;;;N;;;;;
+A6C5;BAMUM LETTER PEUX;Lo;0;L;;;;;N;;;;;
+A6C6;BAMUM LETTER NJEE;Lo;0;L;;;;;N;;;;;
+A6C7;BAMUM LETTER NTEE;Lo;0;L;;;;;N;;;;;
+A6C8;BAMUM LETTER PUE;Lo;0;L;;;;;N;;;;;
+A6C9;BAMUM LETTER WUE;Lo;0;L;;;;;N;;;;;
+A6CA;BAMUM LETTER PEE;Lo;0;L;;;;;N;;;;;
+A6CB;BAMUM LETTER FEE;Lo;0;L;;;;;N;;;;;
+A6CC;BAMUM LETTER RU;Lo;0;L;;;;;N;;;;;
+A6CD;BAMUM LETTER LU;Lo;0;L;;;;;N;;;;;
+A6CE;BAMUM LETTER MI;Lo;0;L;;;;;N;;;;;
+A6CF;BAMUM LETTER NI;Lo;0;L;;;;;N;;;;;
+A6D0;BAMUM LETTER REUX;Lo;0;L;;;;;N;;;;;
+A6D1;BAMUM LETTER RAE;Lo;0;L;;;;;N;;;;;
+A6D2;BAMUM LETTER KEN;Lo;0;L;;;;;N;;;;;
+A6D3;BAMUM LETTER NGKWAEN;Lo;0;L;;;;;N;;;;;
+A6D4;BAMUM LETTER NGGA;Lo;0;L;;;;;N;;;;;
+A6D5;BAMUM LETTER NGA;Lo;0;L;;;;;N;;;;;
+A6D6;BAMUM LETTER SHO;Lo;0;L;;;;;N;;;;;
+A6D7;BAMUM LETTER PUAE;Lo;0;L;;;;;N;;;;;
+A6D8;BAMUM LETTER FU;Lo;0;L;;;;;N;;;;;
+A6D9;BAMUM LETTER FOM;Lo;0;L;;;;;N;;;;;
+A6DA;BAMUM LETTER WA;Lo;0;L;;;;;N;;;;;
+A6DB;BAMUM LETTER NA;Lo;0;L;;;;;N;;;;;
+A6DC;BAMUM LETTER LI;Lo;0;L;;;;;N;;;;;
+A6DD;BAMUM LETTER PI;Lo;0;L;;;;;N;;;;;
+A6DE;BAMUM LETTER LOQ;Lo;0;L;;;;;N;;;;;
+A6DF;BAMUM LETTER KO;Lo;0;L;;;;;N;;;;;
+A6E0;BAMUM LETTER MBEN;Lo;0;L;;;;;N;;;;;
+A6E1;BAMUM LETTER REN;Lo;0;L;;;;;N;;;;;
+A6E2;BAMUM LETTER MEN;Lo;0;L;;;;;N;;;;;
+A6E3;BAMUM LETTER MA;Lo;0;L;;;;;N;;;;;
+A6E4;BAMUM LETTER TI;Lo;0;L;;;;;N;;;;;
+A6E5;BAMUM LETTER KI;Lo;0;L;;;;;N;;;;;
+A6E6;BAMUM LETTER MO;Nl;0;L;;;;1;N;;;;;
+A6E7;BAMUM LETTER MBAA;Nl;0;L;;;;2;N;;;;;
+A6E8;BAMUM LETTER TET;Nl;0;L;;;;3;N;;;;;
+A6E9;BAMUM LETTER KPA;Nl;0;L;;;;4;N;;;;;
+A6EA;BAMUM LETTER TEN;Nl;0;L;;;;5;N;;;;;
+A6EB;BAMUM LETTER NTUU;Nl;0;L;;;;6;N;;;;;
+A6EC;BAMUM LETTER SAMBA;Nl;0;L;;;;7;N;;;;;
+A6ED;BAMUM LETTER FAAMAE;Nl;0;L;;;;8;N;;;;;
+A6EE;BAMUM LETTER KOVUU;Nl;0;L;;;;9;N;;;;;
+A6EF;BAMUM LETTER KOGHOM;Nl;0;L;;;;0;N;;;;;
+A6F0;BAMUM COMBINING MARK KOQNDON;Mn;230;NSM;;;;;N;;;;;
+A6F1;BAMUM COMBINING MARK TUKWENTIS;Mn;230;NSM;;;;;N;;;;;
+A6F2;BAMUM NJAEMLI;Po;0;L;;;;;N;;;;;
+A6F3;BAMUM FULL STOP;Po;0;L;;;;;N;;;;;
+A6F4;BAMUM COLON;Po;0;L;;;;;N;;;;;
+A6F5;BAMUM COMMA;Po;0;L;;;;;N;;;;;
+A6F6;BAMUM SEMICOLON;Po;0;L;;;;;N;;;;;
+A6F7;BAMUM QUESTION MARK;Po;0;L;;;;;N;;;;;
 A700;MODIFIER LETTER CHINESE TONE YIN PING;Sk;0;ON;;;;;N;;;;;
 A701;MODIFIER LETTER CHINESE TONE YANG PING;Sk;0;ON;;;;;N;;;;;
 A702;MODIFIER LETTER CHINESE TONE YIN SHANG;Sk;0;ON;;;;;N;;;;;
@@ -12825,6 +13396,16 @@ A828;SYLOTI NAGRI POETRY MARK-1;So;0;ON;;;;;N;;;;;
 A829;SYLOTI NAGRI POETRY MARK-2;So;0;ON;;;;;N;;;;;
 A82A;SYLOTI NAGRI POETRY MARK-3;So;0;ON;;;;;N;;;;;
 A82B;SYLOTI NAGRI POETRY MARK-4;So;0;ON;;;;;N;;;;;
+A830;NORTH INDIC FRACTION ONE QUARTER;No;0;L;;;;1/4;N;;;;;
+A831;NORTH INDIC FRACTION ONE HALF;No;0;L;;;;1/2;N;;;;;
+A832;NORTH INDIC FRACTION THREE QUARTERS;No;0;L;;;;3/4;N;;;;;
+A833;NORTH INDIC FRACTION ONE SIXTEENTH;No;0;L;;;;1/16;N;;;;;
+A834;NORTH INDIC FRACTION ONE EIGHTH;No;0;L;;;;1/8;N;;;;;
+A835;NORTH INDIC FRACTION THREE SIXTEENTHS;No;0;L;;;;3/16;N;;;;;
+A836;NORTH INDIC QUARTER MARK;So;0;L;;;;;N;;;;;
+A837;NORTH INDIC PLACEHOLDER MARK;So;0;L;;;;;N;;;;;
+A838;NORTH INDIC RUPEE MARK;Sc;0;ET;;;;;N;;;;;
+A839;NORTH INDIC QUANTITY MARK;So;0;ET;;;;;N;;;;;
 A840;PHAGS-PA LETTER KA;Lo;0;L;;;;;N;;;;;
 A841;PHAGS-PA LETTER KHA;Lo;0;L;;;;;N;;;;;
 A842;PHAGS-PA LETTER GA;Lo;0;L;;;;;N;;;;;
@@ -12962,6 +13543,34 @@ A8D6;SAURASHTRA DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
 A8D7;SAURASHTRA DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
 A8D8;SAURASHTRA DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
 A8D9;SAURASHTRA DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+A8E0;COMBINING DEVANAGARI DIGIT ZERO;Mn;230;NSM;;;;;N;;;;;
+A8E1;COMBINING DEVANAGARI DIGIT ONE;Mn;230;NSM;;;;;N;;;;;
+A8E2;COMBINING DEVANAGARI DIGIT TWO;Mn;230;NSM;;;;;N;;;;;
+A8E3;COMBINING DEVANAGARI DIGIT THREE;Mn;230;NSM;;;;;N;;;;;
+A8E4;COMBINING DEVANAGARI DIGIT FOUR;Mn;230;NSM;;;;;N;;;;;
+A8E5;COMBINING DEVANAGARI DIGIT FIVE;Mn;230;NSM;;;;;N;;;;;
+A8E6;COMBINING DEVANAGARI DIGIT SIX;Mn;230;NSM;;;;;N;;;;;
+A8E7;COMBINING DEVANAGARI DIGIT SEVEN;Mn;230;NSM;;;;;N;;;;;
+A8E8;COMBINING DEVANAGARI DIGIT EIGHT;Mn;230;NSM;;;;;N;;;;;
+A8E9;COMBINING DEVANAGARI DIGIT NINE;Mn;230;NSM;;;;;N;;;;;
+A8EA;COMBINING DEVANAGARI LETTER A;Mn;230;NSM;;;;;N;;;;;
+A8EB;COMBINING DEVANAGARI LETTER U;Mn;230;NSM;;;;;N;;;;;
+A8EC;COMBINING DEVANAGARI LETTER KA;Mn;230;NSM;;;;;N;;;;;
+A8ED;COMBINING DEVANAGARI LETTER NA;Mn;230;NSM;;;;;N;;;;;
+A8EE;COMBINING DEVANAGARI LETTER PA;Mn;230;NSM;;;;;N;;;;;
+A8EF;COMBINING DEVANAGARI LETTER RA;Mn;230;NSM;;;;;N;;;;;
+A8F0;COMBINING DEVANAGARI LETTER VI;Mn;230;NSM;;;;;N;;;;;
+A8F1;COMBINING DEVANAGARI SIGN AVAGRAHA;Mn;230;NSM;;;;;N;;;;;
+A8F2;DEVANAGARI SIGN SPACING CANDRABINDU;Lo;0;L;;;;;N;;;;;
+A8F3;DEVANAGARI SIGN CANDRABINDU VIRAMA;Lo;0;L;;;;;N;;;;;
+A8F4;DEVANAGARI SIGN DOUBLE CANDRABINDU VIRAMA;Lo;0;L;;;;;N;;;;;
+A8F5;DEVANAGARI SIGN CANDRABINDU TWO;Lo;0;L;;;;;N;;;;;
+A8F6;DEVANAGARI SIGN CANDRABINDU THREE;Lo;0;L;;;;;N;;;;;
+A8F7;DEVANAGARI SIGN CANDRABINDU AVAGRAHA;Lo;0;L;;;;;N;;;;;
+A8F8;DEVANAGARI SIGN PUSHPIKA;Po;0;L;;;;;N;;;;;
+A8F9;DEVANAGARI GAP FILLER;Po;0;L;;;;;N;;;;;
+A8FA;DEVANAGARI CARET;Po;0;L;;;;;N;;;;;
+A8FB;DEVANAGARI HEADSTROKE;Lo;0;L;;;;;N;;;;;
 A900;KAYAH LI DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
 A901;KAYAH LI DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
 A902;KAYAH LI DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
@@ -13047,6 +13656,126 @@ A951;REJANG CONSONANT SIGN R;Mn;0;NSM;;;;;N;;;;;
 A952;REJANG CONSONANT SIGN H;Mc;0;L;;;;;N;;;;;
 A953;REJANG VIRAMA;Mc;9;L;;;;;N;;;;;
 A95F;REJANG SECTION MARK;Po;0;L;;;;;N;;;;;
+A960;HANGUL CHOSEONG TIKEUT-MIEUM;Lo;0;L;;;;;N;;;;;
+A961;HANGUL CHOSEONG TIKEUT-PIEUP;Lo;0;L;;;;;N;;;;;
+A962;HANGUL CHOSEONG TIKEUT-SIOS;Lo;0;L;;;;;N;;;;;
+A963;HANGUL CHOSEONG TIKEUT-CIEUC;Lo;0;L;;;;;N;;;;;
+A964;HANGUL CHOSEONG RIEUL-KIYEOK;Lo;0;L;;;;;N;;;;;
+A965;HANGUL CHOSEONG RIEUL-SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
+A966;HANGUL CHOSEONG RIEUL-TIKEUT;Lo;0;L;;;;;N;;;;;
+A967;HANGUL CHOSEONG RIEUL-SSANGTIKEUT;Lo;0;L;;;;;N;;;;;
+A968;HANGUL CHOSEONG RIEUL-MIEUM;Lo;0;L;;;;;N;;;;;
+A969;HANGUL CHOSEONG RIEUL-PIEUP;Lo;0;L;;;;;N;;;;;
+A96A;HANGUL CHOSEONG RIEUL-SSANGPIEUP;Lo;0;L;;;;;N;;;;;
+A96B;HANGUL CHOSEONG RIEUL-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+A96C;HANGUL CHOSEONG RIEUL-SIOS;Lo;0;L;;;;;N;;;;;
+A96D;HANGUL CHOSEONG RIEUL-CIEUC;Lo;0;L;;;;;N;;;;;
+A96E;HANGUL CHOSEONG RIEUL-KHIEUKH;Lo;0;L;;;;;N;;;;;
+A96F;HANGUL CHOSEONG MIEUM-KIYEOK;Lo;0;L;;;;;N;;;;;
+A970;HANGUL CHOSEONG MIEUM-TIKEUT;Lo;0;L;;;;;N;;;;;
+A971;HANGUL CHOSEONG MIEUM-SIOS;Lo;0;L;;;;;N;;;;;
+A972;HANGUL CHOSEONG PIEUP-SIOS-THIEUTH;Lo;0;L;;;;;N;;;;;
+A973;HANGUL CHOSEONG PIEUP-KHIEUKH;Lo;0;L;;;;;N;;;;;
+A974;HANGUL CHOSEONG PIEUP-HIEUH;Lo;0;L;;;;;N;;;;;
+A975;HANGUL CHOSEONG SSANGSIOS-PIEUP;Lo;0;L;;;;;N;;;;;
+A976;HANGUL CHOSEONG IEUNG-RIEUL;Lo;0;L;;;;;N;;;;;
+A977;HANGUL CHOSEONG IEUNG-HIEUH;Lo;0;L;;;;;N;;;;;
+A978;HANGUL CHOSEONG SSANGCIEUC-HIEUH;Lo;0;L;;;;;N;;;;;
+A979;HANGUL CHOSEONG SSANGTHIEUTH;Lo;0;L;;;;;N;;;;;
+A97A;HANGUL CHOSEONG PHIEUPH-HIEUH;Lo;0;L;;;;;N;;;;;
+A97B;HANGUL CHOSEONG HIEUH-SIOS;Lo;0;L;;;;;N;;;;;
+A97C;HANGUL CHOSEONG SSANGYEORINHIEUH;Lo;0;L;;;;;N;;;;;
+A980;JAVANESE SIGN PANYANGGA;Mn;0;NSM;;;;;N;;;;;
+A981;JAVANESE SIGN CECAK;Mn;0;NSM;;;;;N;;;;;
+A982;JAVANESE SIGN LAYAR;Mn;0;NSM;;;;;N;;;;;
+A983;JAVANESE SIGN WIGNYAN;Mc;0;L;;;;;N;;;;;
+A984;JAVANESE LETTER A;Lo;0;L;;;;;N;;;;;
+A985;JAVANESE LETTER I KAWI;Lo;0;L;;;;;N;;;;;
+A986;JAVANESE LETTER I;Lo;0;L;;;;;N;;;;;
+A987;JAVANESE LETTER II;Lo;0;L;;;;;N;;;;;
+A988;JAVANESE LETTER U;Lo;0;L;;;;;N;;;;;
+A989;JAVANESE LETTER PA CEREK;Lo;0;L;;;;;N;;;;;
+A98A;JAVANESE LETTER NGA LELET;Lo;0;L;;;;;N;;;;;
+A98B;JAVANESE LETTER NGA LELET RASWADI;Lo;0;L;;;;;N;;;;;
+A98C;JAVANESE LETTER E;Lo;0;L;;;;;N;;;;;
+A98D;JAVANESE LETTER AI;Lo;0;L;;;;;N;;;;;
+A98E;JAVANESE LETTER O;Lo;0;L;;;;;N;;;;;
+A98F;JAVANESE LETTER KA;Lo;0;L;;;;;N;;;;;
+A990;JAVANESE LETTER KA SASAK;Lo;0;L;;;;;N;;;;;
+A991;JAVANESE LETTER KA MURDA;Lo;0;L;;;;;N;;;;;
+A992;JAVANESE LETTER GA;Lo;0;L;;;;;N;;;;;
+A993;JAVANESE LETTER GA MURDA;Lo;0;L;;;;;N;;;;;
+A994;JAVANESE LETTER NGA;Lo;0;L;;;;;N;;;;;
+A995;JAVANESE LETTER CA;Lo;0;L;;;;;N;;;;;
+A996;JAVANESE LETTER CA MURDA;Lo;0;L;;;;;N;;;;;
+A997;JAVANESE LETTER JA;Lo;0;L;;;;;N;;;;;
+A998;JAVANESE LETTER NYA MURDA;Lo;0;L;;;;;N;;;;;
+A999;JAVANESE LETTER JA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+A99A;JAVANESE LETTER NYA;Lo;0;L;;;;;N;;;;;
+A99B;JAVANESE LETTER TTA;Lo;0;L;;;;;N;;;;;
+A99C;JAVANESE LETTER TTA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+A99D;JAVANESE LETTER DDA;Lo;0;L;;;;;N;;;;;
+A99E;JAVANESE LETTER DDA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+A99F;JAVANESE LETTER NA MURDA;Lo;0;L;;;;;N;;;;;
+A9A0;JAVANESE LETTER TA;Lo;0;L;;;;;N;;;;;
+A9A1;JAVANESE LETTER TA MURDA;Lo;0;L;;;;;N;;;;;
+A9A2;JAVANESE LETTER DA;Lo;0;L;;;;;N;;;;;
+A9A3;JAVANESE LETTER DA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+A9A4;JAVANESE LETTER NA;Lo;0;L;;;;;N;;;;;
+A9A5;JAVANESE LETTER PA;Lo;0;L;;;;;N;;;;;
+A9A6;JAVANESE LETTER PA MURDA;Lo;0;L;;;;;N;;;;;
+A9A7;JAVANESE LETTER BA;Lo;0;L;;;;;N;;;;;
+A9A8;JAVANESE LETTER BA MURDA;Lo;0;L;;;;;N;;;;;
+A9A9;JAVANESE LETTER MA;Lo;0;L;;;;;N;;;;;
+A9AA;JAVANESE LETTER YA;Lo;0;L;;;;;N;;;;;
+A9AB;JAVANESE LETTER RA;Lo;0;L;;;;;N;;;;;
+A9AC;JAVANESE LETTER RA AGUNG;Lo;0;L;;;;;N;;;;;
+A9AD;JAVANESE LETTER LA;Lo;0;L;;;;;N;;;;;
+A9AE;JAVANESE LETTER WA;Lo;0;L;;;;;N;;;;;
+A9AF;JAVANESE LETTER SA MURDA;Lo;0;L;;;;;N;;;;;
+A9B0;JAVANESE LETTER SA MAHAPRANA;Lo;0;L;;;;;N;;;;;
+A9B1;JAVANESE LETTER SA;Lo;0;L;;;;;N;;;;;
+A9B2;JAVANESE LETTER HA;Lo;0;L;;;;;N;;;;;
+A9B3;JAVANESE SIGN CECAK TELU;Mn;7;NSM;;;;;N;;;;;
+A9B4;JAVANESE VOWEL SIGN TARUNG;Mc;0;L;;;;;N;;;;;
+A9B5;JAVANESE VOWEL SIGN TOLONG;Mc;0;L;;;;;N;;;;;
+A9B6;JAVANESE VOWEL SIGN WULU;Mn;0;NSM;;;;;N;;;;;
+A9B7;JAVANESE VOWEL SIGN WULU MELIK;Mn;0;NSM;;;;;N;;;;;
+A9B8;JAVANESE VOWEL SIGN SUKU;Mn;0;NSM;;;;;N;;;;;
+A9B9;JAVANESE VOWEL SIGN SUKU MENDUT;Mn;0;NSM;;;;;N;;;;;
+A9BA;JAVANESE VOWEL SIGN TALING;Mc;0;L;;;;;N;;;;;
+A9BB;JAVANESE VOWEL SIGN DIRGA MURE;Mc;0;L;;;;;N;;;;;
+A9BC;JAVANESE VOWEL SIGN PEPET;Mn;0;NSM;;;;;N;;;;;
+A9BD;JAVANESE CONSONANT SIGN KERET;Mc;0;L;;;;;N;;;;;
+A9BE;JAVANESE CONSONANT SIGN PENGKAL;Mc;0;L;;;;;N;;;;;
+A9BF;JAVANESE CONSONANT SIGN CAKRA;Mc;0;L;;;;;N;;;;;
+A9C0;JAVANESE PANGKON;Mc;9;L;;;;;N;;;;;
+A9C1;JAVANESE LEFT RERENGGAN;Po;0;L;;;;;N;;;;;
+A9C2;JAVANESE RIGHT RERENGGAN;Po;0;L;;;;;N;;;;;
+A9C3;JAVANESE PADA ANDAP;Po;0;L;;;;;N;;;;;
+A9C4;JAVANESE PADA MADYA;Po;0;L;;;;;N;;;;;
+A9C5;JAVANESE PADA LUHUR;Po;0;L;;;;;N;;;;;
+A9C6;JAVANESE PADA WINDU;Po;0;L;;;;;N;;;;;
+A9C7;JAVANESE PADA PANGKAT;Po;0;L;;;;;N;;;;;
+A9C8;JAVANESE PADA LINGSA;Po;0;L;;;;;N;;;;;
+A9C9;JAVANESE PADA LUNGSI;Po;0;L;;;;;N;;;;;
+A9CA;JAVANESE PADA ADEG;Po;0;L;;;;;N;;;;;
+A9CB;JAVANESE PADA ADEG ADEG;Po;0;L;;;;;N;;;;;
+A9CC;JAVANESE PADA PISELEH;Po;0;L;;;;;N;;;;;
+A9CD;JAVANESE TURNED PADA PISELEH;Po;0;L;;;;;N;;;;;
+A9CF;JAVANESE PANGRANGKEP;Lm;0;L;;;;;N;;;;;
+A9D0;JAVANESE DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+A9D1;JAVANESE DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+A9D2;JAVANESE DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+A9D3;JAVANESE DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+A9D4;JAVANESE DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+A9D5;JAVANESE DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+A9D6;JAVANESE DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+A9D7;JAVANESE DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+A9D8;JAVANESE DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+A9D9;JAVANESE DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
+A9DE;JAVANESE PADA TIRTA TUMETES;Po;0;L;;;;;N;;;;;
+A9DF;JAVANESE PADA ISEN-ISEN;Po;0;L;;;;;N;;;;;
 AA00;CHAM LETTER A;Lo;0;L;;;;;N;;;;;
 AA01;CHAM LETTER I;Lo;0;L;;;;;N;;;;;
 AA02;CHAM LETTER U;Lo;0;L;;;;;N;;;;;
@@ -13130,8 +13859,236 @@ AA5C;CHAM PUNCTUATION SPIRAL;Po;0;L;;;;;N;;;;;
 AA5D;CHAM PUNCTUATION DANDA;Po;0;L;;;;;N;;;;;
 AA5E;CHAM PUNCTUATION DOUBLE DANDA;Po;0;L;;;;;N;;;;;
 AA5F;CHAM PUNCTUATION TRIPLE DANDA;Po;0;L;;;;;N;;;;;
+AA60;MYANMAR LETTER KHAMTI GA;Lo;0;L;;;;;N;;;;;
+AA61;MYANMAR LETTER KHAMTI CA;Lo;0;L;;;;;N;;;;;
+AA62;MYANMAR LETTER KHAMTI CHA;Lo;0;L;;;;;N;;;;;
+AA63;MYANMAR LETTER KHAMTI JA;Lo;0;L;;;;;N;;;;;
+AA64;MYANMAR LETTER KHAMTI JHA;Lo;0;L;;;;;N;;;;;
+AA65;MYANMAR LETTER KHAMTI NYA;Lo;0;L;;;;;N;;;;;
+AA66;MYANMAR LETTER KHAMTI TTA;Lo;0;L;;;;;N;;;;;
+AA67;MYANMAR LETTER KHAMTI TTHA;Lo;0;L;;;;;N;;;;;
+AA68;MYANMAR LETTER KHAMTI DDA;Lo;0;L;;;;;N;;;;;
+AA69;MYANMAR LETTER KHAMTI DDHA;Lo;0;L;;;;;N;;;;;
+AA6A;MYANMAR LETTER KHAMTI DHA;Lo;0;L;;;;;N;;;;;
+AA6B;MYANMAR LETTER KHAMTI NA;Lo;0;L;;;;;N;;;;;
+AA6C;MYANMAR LETTER KHAMTI SA;Lo;0;L;;;;;N;;;;;
+AA6D;MYANMAR LETTER KHAMTI HA;Lo;0;L;;;;;N;;;;;
+AA6E;MYANMAR LETTER KHAMTI HHA;Lo;0;L;;;;;N;;;;;
+AA6F;MYANMAR LETTER KHAMTI FA;Lo;0;L;;;;;N;;;;;
+AA70;MYANMAR MODIFIER LETTER KHAMTI REDUPLICATION;Lm;0;L;;;;;N;;;;;
+AA71;MYANMAR LETTER KHAMTI XA;Lo;0;L;;;;;N;;;;;
+AA72;MYANMAR LETTER KHAMTI ZA;Lo;0;L;;;;;N;;;;;
+AA73;MYANMAR LETTER KHAMTI RA;Lo;0;L;;;;;N;;;;;
+AA74;MYANMAR LOGOGRAM KHAMTI OAY;Lo;0;L;;;;;N;;;;;
+AA75;MYANMAR LOGOGRAM KHAMTI QN;Lo;0;L;;;;;N;;;;;
+AA76;MYANMAR LOGOGRAM KHAMTI HM;Lo;0;L;;;;;N;;;;;
+AA77;MYANMAR SYMBOL AITON EXCLAMATION;So;0;L;;;;;N;;;;;
+AA78;MYANMAR SYMBOL AITON ONE;So;0;L;;;;;N;;;;;
+AA79;MYANMAR SYMBOL AITON TWO;So;0;L;;;;;N;;;;;
+AA7A;MYANMAR LETTER AITON RA;Lo;0;L;;;;;N;;;;;
+AA7B;MYANMAR SIGN PAO KAREN TONE;Mc;0;L;;;;;N;;;;;
+AA80;TAI VIET LETTER LOW KO;Lo;0;L;;;;;N;;;;;
+AA81;TAI VIET LETTER HIGH KO;Lo;0;L;;;;;N;;;;;
+AA82;TAI VIET LETTER LOW KHO;Lo;0;L;;;;;N;;;;;
+AA83;TAI VIET LETTER HIGH KHO;Lo;0;L;;;;;N;;;;;
+AA84;TAI VIET LETTER LOW KHHO;Lo;0;L;;;;;N;;;;;
+AA85;TAI VIET LETTER HIGH KHHO;Lo;0;L;;;;;N;;;;;
+AA86;TAI VIET LETTER LOW GO;Lo;0;L;;;;;N;;;;;
+AA87;TAI VIET LETTER HIGH GO;Lo;0;L;;;;;N;;;;;
+AA88;TAI VIET LETTER LOW NGO;Lo;0;L;;;;;N;;;;;
+AA89;TAI VIET LETTER HIGH NGO;Lo;0;L;;;;;N;;;;;
+AA8A;TAI VIET LETTER LOW CO;Lo;0;L;;;;;N;;;;;
+AA8B;TAI VIET LETTER HIGH CO;Lo;0;L;;;;;N;;;;;
+AA8C;TAI VIET LETTER LOW CHO;Lo;0;L;;;;;N;;;;;
+AA8D;TAI VIET LETTER HIGH CHO;Lo;0;L;;;;;N;;;;;
+AA8E;TAI VIET LETTER LOW SO;Lo;0;L;;;;;N;;;;;
+AA8F;TAI VIET LETTER HIGH SO;Lo;0;L;;;;;N;;;;;
+AA90;TAI VIET LETTER LOW NYO;Lo;0;L;;;;;N;;;;;
+AA91;TAI VIET LETTER HIGH NYO;Lo;0;L;;;;;N;;;;;
+AA92;TAI VIET LETTER LOW DO;Lo;0;L;;;;;N;;;;;
+AA93;TAI VIET LETTER HIGH DO;Lo;0;L;;;;;N;;;;;
+AA94;TAI VIET LETTER LOW TO;Lo;0;L;;;;;N;;;;;
+AA95;TAI VIET LETTER HIGH TO;Lo;0;L;;;;;N;;;;;
+AA96;TAI VIET LETTER LOW THO;Lo;0;L;;;;;N;;;;;
+AA97;TAI VIET LETTER HIGH THO;Lo;0;L;;;;;N;;;;;
+AA98;TAI VIET LETTER LOW NO;Lo;0;L;;;;;N;;;;;
+AA99;TAI VIET LETTER HIGH NO;Lo;0;L;;;;;N;;;;;
+AA9A;TAI VIET LETTER LOW BO;Lo;0;L;;;;;N;;;;;
+AA9B;TAI VIET LETTER HIGH BO;Lo;0;L;;;;;N;;;;;
+AA9C;TAI VIET LETTER LOW PO;Lo;0;L;;;;;N;;;;;
+AA9D;TAI VIET LETTER HIGH PO;Lo;0;L;;;;;N;;;;;
+AA9E;TAI VIET LETTER LOW PHO;Lo;0;L;;;;;N;;;;;
+AA9F;TAI VIET LETTER HIGH PHO;Lo;0;L;;;;;N;;;;;
+AAA0;TAI VIET LETTER LOW FO;Lo;0;L;;;;;N;;;;;
+AAA1;TAI VIET LETTER HIGH FO;Lo;0;L;;;;;N;;;;;
+AAA2;TAI VIET LETTER LOW MO;Lo;0;L;;;;;N;;;;;
+AAA3;TAI VIET LETTER HIGH MO;Lo;0;L;;;;;N;;;;;
+AAA4;TAI VIET LETTER LOW YO;Lo;0;L;;;;;N;;;;;
+AAA5;TAI VIET LETTER HIGH YO;Lo;0;L;;;;;N;;;;;
+AAA6;TAI VIET LETTER LOW RO;Lo;0;L;;;;;N;;;;;
+AAA7;TAI VIET LETTER HIGH RO;Lo;0;L;;;;;N;;;;;
+AAA8;TAI VIET LETTER LOW LO;Lo;0;L;;;;;N;;;;;
+AAA9;TAI VIET LETTER HIGH LO;Lo;0;L;;;;;N;;;;;
+AAAA;TAI VIET LETTER LOW VO;Lo;0;L;;;;;N;;;;;
+AAAB;TAI VIET LETTER HIGH VO;Lo;0;L;;;;;N;;;;;
+AAAC;TAI VIET LETTER LOW HO;Lo;0;L;;;;;N;;;;;
+AAAD;TAI VIET LETTER HIGH HO;Lo;0;L;;;;;N;;;;;
+AAAE;TAI VIET LETTER LOW O;Lo;0;L;;;;;N;;;;;
+AAAF;TAI VIET LETTER HIGH O;Lo;0;L;;;;;N;;;;;
+AAB0;TAI VIET MAI KANG;Mn;230;NSM;;;;;N;;;;;
+AAB1;TAI VIET VOWEL AA;Lo;0;L;;;;;N;;;;;
+AAB2;TAI VIET VOWEL I;Mn;230;NSM;;;;;N;;;;;
+AAB3;TAI VIET VOWEL UE;Mn;230;NSM;;;;;N;;;;;
+AAB4;TAI VIET VOWEL U;Mn;220;NSM;;;;;N;;;;;
+AAB5;TAI VIET VOWEL E;Lo;0;L;;;;;N;;;;;
+AAB6;TAI VIET VOWEL O;Lo;0;L;;;;;N;;;;;
+AAB7;TAI VIET MAI KHIT;Mn;230;NSM;;;;;N;;;;;
+AAB8;TAI VIET VOWEL IA;Mn;230;NSM;;;;;N;;;;;
+AAB9;TAI VIET VOWEL UEA;Lo;0;L;;;;;N;;;;;
+AABA;TAI VIET VOWEL UA;Lo;0;L;;;;;N;;;;;
+AABB;TAI VIET VOWEL AUE;Lo;0;L;;;;;N;;;;;
+AABC;TAI VIET VOWEL AY;Lo;0;L;;;;;N;;;;;
+AABD;TAI VIET VOWEL AN;Lo;0;L;;;;;N;;;;;
+AABE;TAI VIET VOWEL AM;Mn;230;NSM;;;;;N;;;;;
+AABF;TAI VIET TONE MAI EK;Mn;230;NSM;;;;;N;;;;;
+AAC0;TAI VIET TONE MAI NUENG;Lo;0;L;;;;;N;;;;;
+AAC1;TAI VIET TONE MAI THO;Mn;230;NSM;;;;;N;;;;;
+AAC2;TAI VIET TONE MAI SONG;Lo;0;L;;;;;N;;;;;
+AADB;TAI VIET SYMBOL KON;Lo;0;L;;;;;N;;;;;
+AADC;TAI VIET SYMBOL NUENG;Lo;0;L;;;;;N;;;;;
+AADD;TAI VIET SYMBOL SAM;Lm;0;L;;;;;N;;;;;
+AADE;TAI VIET SYMBOL HO HOI;Po;0;L;;;;;N;;;;;
+AADF;TAI VIET SYMBOL KOI KOI;Po;0;L;;;;;N;;;;;
+ABC0;MEETEI MAYEK LETTER KOK;Lo;0;L;;;;;N;;;;;
+ABC1;MEETEI MAYEK LETTER SAM;Lo;0;L;;;;;N;;;;;
+ABC2;MEETEI MAYEK LETTER LAI;Lo;0;L;;;;;N;;;;;
+ABC3;MEETEI MAYEK LETTER MIT;Lo;0;L;;;;;N;;;;;
+ABC4;MEETEI MAYEK LETTER PA;Lo;0;L;;;;;N;;;;;
+ABC5;MEETEI MAYEK LETTER NA;Lo;0;L;;;;;N;;;;;
+ABC6;MEETEI MAYEK LETTER CHIL;Lo;0;L;;;;;N;;;;;
+ABC7;MEETEI MAYEK LETTER TIL;Lo;0;L;;;;;N;;;;;
+ABC8;MEETEI MAYEK LETTER KHOU;Lo;0;L;;;;;N;;;;;
+ABC9;MEETEI MAYEK LETTER NGOU;Lo;0;L;;;;;N;;;;;
+ABCA;MEETEI MAYEK LETTER THOU;Lo;0;L;;;;;N;;;;;
+ABCB;MEETEI MAYEK LETTER WAI;Lo;0;L;;;;;N;;;;;
+ABCC;MEETEI MAYEK LETTER YANG;Lo;0;L;;;;;N;;;;;
+ABCD;MEETEI MAYEK LETTER HUK;Lo;0;L;;;;;N;;;;;
+ABCE;MEETEI MAYEK LETTER UN;Lo;0;L;;;;;N;;;;;
+ABCF;MEETEI MAYEK LETTER I;Lo;0;L;;;;;N;;;;;
+ABD0;MEETEI MAYEK LETTER PHAM;Lo;0;L;;;;;N;;;;;
+ABD1;MEETEI MAYEK LETTER ATIYA;Lo;0;L;;;;;N;;;;;
+ABD2;MEETEI MAYEK LETTER GOK;Lo;0;L;;;;;N;;;;;
+ABD3;MEETEI MAYEK LETTER JHAM;Lo;0;L;;;;;N;;;;;
+ABD4;MEETEI MAYEK LETTER RAI;Lo;0;L;;;;;N;;;;;
+ABD5;MEETEI MAYEK LETTER BA;Lo;0;L;;;;;N;;;;;
+ABD6;MEETEI MAYEK LETTER JIL;Lo;0;L;;;;;N;;;;;
+ABD7;MEETEI MAYEK LETTER DIL;Lo;0;L;;;;;N;;;;;
+ABD8;MEETEI MAYEK LETTER GHOU;Lo;0;L;;;;;N;;;;;
+ABD9;MEETEI MAYEK LETTER DHOU;Lo;0;L;;;;;N;;;;;
+ABDA;MEETEI MAYEK LETTER BHAM;Lo;0;L;;;;;N;;;;;
+ABDB;MEETEI MAYEK LETTER KOK LONSUM;Lo;0;L;;;;;N;;;;;
+ABDC;MEETEI MAYEK LETTER LAI LONSUM;Lo;0;L;;;;;N;;;;;
+ABDD;MEETEI MAYEK LETTER MIT LONSUM;Lo;0;L;;;;;N;;;;;
+ABDE;MEETEI MAYEK LETTER PA LONSUM;Lo;0;L;;;;;N;;;;;
+ABDF;MEETEI MAYEK LETTER NA LONSUM;Lo;0;L;;;;;N;;;;;
+ABE0;MEETEI MAYEK LETTER TIL LONSUM;Lo;0;L;;;;;N;;;;;
+ABE1;MEETEI MAYEK LETTER NGOU LONSUM;Lo;0;L;;;;;N;;;;;
+ABE2;MEETEI MAYEK LETTER I LONSUM;Lo;0;L;;;;;N;;;;;
+ABE3;MEETEI MAYEK VOWEL SIGN ONAP;Mc;0;L;;;;;N;;;;;
+ABE4;MEETEI MAYEK VOWEL SIGN INAP;Mc;0;L;;;;;N;;;;;
+ABE5;MEETEI MAYEK VOWEL SIGN ANAP;Mn;0;NSM;;;;;N;;;;;
+ABE6;MEETEI MAYEK VOWEL SIGN YENAP;Mc;0;L;;;;;N;;;;;
+ABE7;MEETEI MAYEK VOWEL SIGN SOUNAP;Mc;0;L;;;;;N;;;;;
+ABE8;MEETEI MAYEK VOWEL SIGN UNAP;Mn;0;NSM;;;;;N;;;;;
+ABE9;MEETEI MAYEK VOWEL SIGN CHEINAP;Mc;0;L;;;;;N;;;;;
+ABEA;MEETEI MAYEK VOWEL SIGN NUNG;Mc;0;L;;;;;N;;;;;
+ABEB;MEETEI MAYEK CHEIKHEI;Po;0;L;;;;;N;;;;;
+ABEC;MEETEI MAYEK LUM IYEK;Mc;0;L;;;;;N;;;;;
+ABED;MEETEI MAYEK APUN IYEK;Mn;9;NSM;;;;;N;;;;;
+ABF0;MEETEI MAYEK DIGIT ZERO;Nd;0;L;;0;0;0;N;;;;;
+ABF1;MEETEI MAYEK DIGIT ONE;Nd;0;L;;1;1;1;N;;;;;
+ABF2;MEETEI MAYEK DIGIT TWO;Nd;0;L;;2;2;2;N;;;;;
+ABF3;MEETEI MAYEK DIGIT THREE;Nd;0;L;;3;3;3;N;;;;;
+ABF4;MEETEI MAYEK DIGIT FOUR;Nd;0;L;;4;4;4;N;;;;;
+ABF5;MEETEI MAYEK DIGIT FIVE;Nd;0;L;;5;5;5;N;;;;;
+ABF6;MEETEI MAYEK DIGIT SIX;Nd;0;L;;6;6;6;N;;;;;
+ABF7;MEETEI MAYEK DIGIT SEVEN;Nd;0;L;;7;7;7;N;;;;;
+ABF8;MEETEI MAYEK DIGIT EIGHT;Nd;0;L;;8;8;8;N;;;;;
+ABF9;MEETEI MAYEK DIGIT NINE;Nd;0;L;;9;9;9;N;;;;;
 AC00;<Hangul Syllable, First>;Lo;0;L;;;;;N;;;;;
 D7A3;<Hangul Syllable, Last>;Lo;0;L;;;;;N;;;;;
+D7B0;HANGUL JUNGSEONG O-YEO;Lo;0;L;;;;;N;;;;;
+D7B1;HANGUL JUNGSEONG O-O-I;Lo;0;L;;;;;N;;;;;
+D7B2;HANGUL JUNGSEONG YO-A;Lo;0;L;;;;;N;;;;;
+D7B3;HANGUL JUNGSEONG YO-AE;Lo;0;L;;;;;N;;;;;
+D7B4;HANGUL JUNGSEONG YO-EO;Lo;0;L;;;;;N;;;;;
+D7B5;HANGUL JUNGSEONG U-YEO;Lo;0;L;;;;;N;;;;;
+D7B6;HANGUL JUNGSEONG U-I-I;Lo;0;L;;;;;N;;;;;
+D7B7;HANGUL JUNGSEONG YU-AE;Lo;0;L;;;;;N;;;;;
+D7B8;HANGUL JUNGSEONG YU-O;Lo;0;L;;;;;N;;;;;
+D7B9;HANGUL JUNGSEONG EU-A;Lo;0;L;;;;;N;;;;;
+D7BA;HANGUL JUNGSEONG EU-EO;Lo;0;L;;;;;N;;;;;
+D7BB;HANGUL JUNGSEONG EU-E;Lo;0;L;;;;;N;;;;;
+D7BC;HANGUL JUNGSEONG EU-O;Lo;0;L;;;;;N;;;;;
+D7BD;HANGUL JUNGSEONG I-YA-O;Lo;0;L;;;;;N;;;;;
+D7BE;HANGUL JUNGSEONG I-YAE;Lo;0;L;;;;;N;;;;;
+D7BF;HANGUL JUNGSEONG I-YEO;Lo;0;L;;;;;N;;;;;
+D7C0;HANGUL JUNGSEONG I-YE;Lo;0;L;;;;;N;;;;;
+D7C1;HANGUL JUNGSEONG I-O-I;Lo;0;L;;;;;N;;;;;
+D7C2;HANGUL JUNGSEONG I-YO;Lo;0;L;;;;;N;;;;;
+D7C3;HANGUL JUNGSEONG I-YU;Lo;0;L;;;;;N;;;;;
+D7C4;HANGUL JUNGSEONG I-I;Lo;0;L;;;;;N;;;;;
+D7C5;HANGUL JUNGSEONG ARAEA-A;Lo;0;L;;;;;N;;;;;
+D7C6;HANGUL JUNGSEONG ARAEA-E;Lo;0;L;;;;;N;;;;;
+D7CB;HANGUL JONGSEONG NIEUN-RIEUL;Lo;0;L;;;;;N;;;;;
+D7CC;HANGUL JONGSEONG NIEUN-CHIEUCH;Lo;0;L;;;;;N;;;;;
+D7CD;HANGUL JONGSEONG SSANGTIKEUT;Lo;0;L;;;;;N;;;;;
+D7CE;HANGUL JONGSEONG SSANGTIKEUT-PIEUP;Lo;0;L;;;;;N;;;;;
+D7CF;HANGUL JONGSEONG TIKEUT-PIEUP;Lo;0;L;;;;;N;;;;;
+D7D0;HANGUL JONGSEONG TIKEUT-SIOS;Lo;0;L;;;;;N;;;;;
+D7D1;HANGUL JONGSEONG TIKEUT-SIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+D7D2;HANGUL JONGSEONG TIKEUT-CIEUC;Lo;0;L;;;;;N;;;;;
+D7D3;HANGUL JONGSEONG TIKEUT-CHIEUCH;Lo;0;L;;;;;N;;;;;
+D7D4;HANGUL JONGSEONG TIKEUT-THIEUTH;Lo;0;L;;;;;N;;;;;
+D7D5;HANGUL JONGSEONG RIEUL-SSANGKIYEOK;Lo;0;L;;;;;N;;;;;
+D7D6;HANGUL JONGSEONG RIEUL-KIYEOK-HIEUH;Lo;0;L;;;;;N;;;;;
+D7D7;HANGUL JONGSEONG SSANGRIEUL-KHIEUKH;Lo;0;L;;;;;N;;;;;
+D7D8;HANGUL JONGSEONG RIEUL-MIEUM-HIEUH;Lo;0;L;;;;;N;;;;;
+D7D9;HANGUL JONGSEONG RIEUL-PIEUP-TIKEUT;Lo;0;L;;;;;N;;;;;
+D7DA;HANGUL JONGSEONG RIEUL-PIEUP-PHIEUPH;Lo;0;L;;;;;N;;;;;
+D7DB;HANGUL JONGSEONG RIEUL-YESIEUNG;Lo;0;L;;;;;N;;;;;
+D7DC;HANGUL JONGSEONG RIEUL-YEORINHIEUH-HIEUH;Lo;0;L;;;;;N;;;;;
+D7DD;HANGUL JONGSEONG KAPYEOUNRIEUL;Lo;0;L;;;;;N;;;;;
+D7DE;HANGUL JONGSEONG MIEUM-NIEUN;Lo;0;L;;;;;N;;;;;
+D7DF;HANGUL JONGSEONG MIEUM-SSANGNIEUN;Lo;0;L;;;;;N;;;;;
+D7E0;HANGUL JONGSEONG SSANGMIEUM;Lo;0;L;;;;;N;;;;;
+D7E1;HANGUL JONGSEONG MIEUM-PIEUP-SIOS;Lo;0;L;;;;;N;;;;;
+D7E2;HANGUL JONGSEONG MIEUM-CIEUC;Lo;0;L;;;;;N;;;;;
+D7E3;HANGUL JONGSEONG PIEUP-TIKEUT;Lo;0;L;;;;;N;;;;;
+D7E4;HANGUL JONGSEONG PIEUP-RIEUL-PHIEUPH;Lo;0;L;;;;;N;;;;;
+D7E5;HANGUL JONGSEONG PIEUP-MIEUM;Lo;0;L;;;;;N;;;;;
+D7E6;HANGUL JONGSEONG SSANGPIEUP;Lo;0;L;;;;;N;;;;;
+D7E7;HANGUL JONGSEONG PIEUP-SIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
+D7E8;HANGUL JONGSEONG PIEUP-CIEUC;Lo;0;L;;;;;N;;;;;
+D7E9;HANGUL JONGSEONG PIEUP-CHIEUCH;Lo;0;L;;;;;N;;;;;
+D7EA;HANGUL JONGSEONG SIOS-MIEUM;Lo;0;L;;;;;N;;;;;
+D7EB;HANGUL JONGSEONG SIOS-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+D7EC;HANGUL JONGSEONG SSANGSIOS-KIYEOK;Lo;0;L;;;;;N;;;;;
+D7ED;HANGUL JONGSEONG SSANGSIOS-TIKEUT;Lo;0;L;;;;;N;;;;;
+D7EE;HANGUL JONGSEONG SIOS-PANSIOS;Lo;0;L;;;;;N;;;;;
+D7EF;HANGUL JONGSEONG SIOS-CIEUC;Lo;0;L;;;;;N;;;;;
+D7F0;HANGUL JONGSEONG SIOS-CHIEUCH;Lo;0;L;;;;;N;;;;;
+D7F1;HANGUL JONGSEONG SIOS-THIEUTH;Lo;0;L;;;;;N;;;;;
+D7F2;HANGUL JONGSEONG SIOS-HIEUH;Lo;0;L;;;;;N;;;;;
+D7F3;HANGUL JONGSEONG PANSIOS-PIEUP;Lo;0;L;;;;;N;;;;;
+D7F4;HANGUL JONGSEONG PANSIOS-KAPYEOUNPIEUP;Lo;0;L;;;;;N;;;;;
+D7F5;HANGUL JONGSEONG YESIEUNG-MIEUM;Lo;0;L;;;;;N;;;;;
+D7F6;HANGUL JONGSEONG YESIEUNG-HIEUH;Lo;0;L;;;;;N;;;;;
+D7F7;HANGUL JONGSEONG CIEUC-PIEUP;Lo;0;L;;;;;N;;;;;
+D7F8;HANGUL JONGSEONG CIEUC-SSANGPIEUP;Lo;0;L;;;;;N;;;;;
+D7F9;HANGUL JONGSEONG SSANGCIEUC;Lo;0;L;;;;;N;;;;;
+D7FA;HANGUL JONGSEONG PHIEUPH-SIOS;Lo;0;L;;;;;N;;;;;
+D7FB;HANGUL JONGSEONG PHIEUPH-THIEUTH;Lo;0;L;;;;;N;;;;;
 D800;<Non Private Use High Surrogate, First>;Cs;0;L;;;;;N;;;;;
 DB7F;<Non Private Use High Surrogate, Last>;Cs;0;L;;;;;N;;;;;
 DB80;<Private Use High Surrogate, First>;Cs;0;L;;;;;N;;;;;
@@ -13427,11 +14384,11 @@ FA1B;CJK COMPATIBILITY IDEOGRAPH-FA1B;Lo;0;L;798F;;;;N;;;;;
 FA1C;CJK COMPATIBILITY IDEOGRAPH-FA1C;Lo;0;L;9756;;;;N;;;;;
 FA1D;CJK COMPATIBILITY IDEOGRAPH-FA1D;Lo;0;L;7CBE;;;;N;;;;;
 FA1E;CJK COMPATIBILITY IDEOGRAPH-FA1E;Lo;0;L;7FBD;;;;N;;;;;
-FA1F;CJK COMPATIBILITY IDEOGRAPH-FA1F;Lo;0;L;;;;;N;;*;;;
+FA1F;CJK COMPATIBILITY IDEOGRAPH-FA1F;Lo;0;L;;;;;N;;;;;
 FA20;CJK COMPATIBILITY IDEOGRAPH-FA20;Lo;0;L;8612;;;;N;;;;;
 FA21;CJK COMPATIBILITY IDEOGRAPH-FA21;Lo;0;L;;;;;N;;;;;
 FA22;CJK COMPATIBILITY IDEOGRAPH-FA22;Lo;0;L;8AF8;;;;N;;;;;
-FA23;CJK COMPATIBILITY IDEOGRAPH-FA23;Lo;0;L;;;;;N;;*;;;
+FA23;CJK COMPATIBILITY IDEOGRAPH-FA23;Lo;0;L;;;;;N;;;;;
 FA24;CJK COMPATIBILITY IDEOGRAPH-FA24;Lo;0;L;;;;;N;;;;;
 FA25;CJK COMPATIBILITY IDEOGRAPH-FA25;Lo;0;L;9038;;;;N;;;;;
 FA26;CJK COMPATIBILITY IDEOGRAPH-FA26;Lo;0;L;90FD;;;;N;;;;;
@@ -13501,6 +14458,9 @@ FA67;CJK COMPATIBILITY IDEOGRAPH-FA67;Lo;0;L;9038;;;;N;;;;;
 FA68;CJK COMPATIBILITY IDEOGRAPH-FA68;Lo;0;L;96E3;;;;N;;;;;
 FA69;CJK COMPATIBILITY IDEOGRAPH-FA69;Lo;0;L;97FF;;;;N;;;;;
 FA6A;CJK COMPATIBILITY IDEOGRAPH-FA6A;Lo;0;L;983B;;;;N;;;;;
+FA6B;CJK COMPATIBILITY IDEOGRAPH-FA6B;Lo;0;L;6075;;;;N;;;;;
+FA6C;CJK COMPATIBILITY IDEOGRAPH-FA6C;Lo;0;L;242EE;;;;N;;;;;
+FA6D;CJK COMPATIBILITY IDEOGRAPH-FA6D;Lo;0;L;8218;;;;N;;;;;
 FA70;CJK COMPATIBILITY IDEOGRAPH-FA70;Lo;0;L;4E26;;;;N;;;;;
 FA71;CJK COMPATIBILITY IDEOGRAPH-FA71;Lo;0;L;51B5;;;;N;;;;;
 FA72;CJK COMPATIBILITY IDEOGRAPH-FA72;Lo;0;L;5168;;;;N;;;;;
@@ -14586,8 +15546,8 @@ FF5B;FULLWIDTH LEFT CURLY BRACKET;Ps;0;ON;<wide> 007B;;;;Y;FULLWIDTH OPENING CUR
 FF5C;FULLWIDTH VERTICAL LINE;Sm;0;ON;<wide> 007C;;;;N;FULLWIDTH VERTICAL BAR;;;;
 FF5D;FULLWIDTH RIGHT CURLY BRACKET;Pe;0;ON;<wide> 007D;;;;Y;FULLWIDTH CLOSING CURLY BRACKET;;;;
 FF5E;FULLWIDTH TILDE;Sm;0;ON;<wide> 007E;;;;N;FULLWIDTH SPACING TILDE;;;;
-FF5F;FULLWIDTH LEFT WHITE PARENTHESIS;Ps;0;ON;<wide> 2985;;;;Y;;*;;;
-FF60;FULLWIDTH RIGHT WHITE PARENTHESIS;Pe;0;ON;<wide> 2986;;;;Y;;*;;;
+FF5F;FULLWIDTH LEFT WHITE PARENTHESIS;Ps;0;ON;<wide> 2985;;;;Y;;;;;
+FF60;FULLWIDTH RIGHT WHITE PARENTHESIS;Pe;0;ON;<wide> 2986;;;;Y;;;;;
 FF61;HALFWIDTH IDEOGRAPHIC FULL STOP;Po;0;ON;<narrow> 3002;;;;N;HALFWIDTH IDEOGRAPHIC PERIOD;;;;
 FF62;HALFWIDTH LEFT CORNER BRACKET;Ps;0;ON;<narrow> 300C;;;;Y;HALFWIDTH OPENING CORNER BRACKET;;;;
 FF63;HALFWIDTH RIGHT CORNER BRACKET;Pe;0;ON;<narrow> 300D;;;;Y;HALFWIDTH CLOSING CORNER BRACKET;;;;
@@ -14649,8 +15609,8 @@ FF9A;HALFWIDTH KATAKANA LETTER RE;Lo;0;L;<narrow> 30EC;;;;N;;;;;
 FF9B;HALFWIDTH KATAKANA LETTER RO;Lo;0;L;<narrow> 30ED;;;;N;;;;;
 FF9C;HALFWIDTH KATAKANA LETTER WA;Lo;0;L;<narrow> 30EF;;;;N;;;;;
 FF9D;HALFWIDTH KATAKANA LETTER N;Lo;0;L;<narrow> 30F3;;;;N;;;;;
-FF9E;HALFWIDTH KATAKANA VOICED SOUND MARK;Lm;0;L;<narrow> 3099;;;;N;;halfwidth katakana-hiragana voiced sound mark;;;
-FF9F;HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK;Lm;0;L;<narrow> 309A;;;;N;;halfwidth katakana-hiragana semi-voiced sound mark;;;
+FF9E;HALFWIDTH KATAKANA VOICED SOUND MARK;Lm;0;L;<narrow> 3099;;;;N;;;;;
+FF9F;HALFWIDTH KATAKANA SEMI-VOICED SOUND MARK;Lm;0;L;<narrow> 309A;;;;N;;;;;
 FFA0;HALFWIDTH HANGUL FILLER;Lo;0;L;<narrow> 3164;;;;N;HALFWIDTH HANGUL CAE OM;;;;
 FFA1;HALFWIDTH HANGUL LETTER KIYEOK;Lo;0;L;<narrow> 3131;;;;N;HALFWIDTH HANGUL LETTER GIYEOG;;;;
 FFA2;HALFWIDTH HANGUL LETTER SSANGKIYEOK;Lo;0;L;<narrow> 3132;;;;N;HALFWIDTH HANGUL LETTER SSANG GIYEOG;;;;
@@ -14706,7 +15666,7 @@ FFDC;HALFWIDTH HANGUL LETTER I;Lo;0;L;<narrow> 3163;;;;N;;;;;
 FFE0;FULLWIDTH CENT SIGN;Sc;0;ET;<wide> 00A2;;;;N;;;;;
 FFE1;FULLWIDTH POUND SIGN;Sc;0;ET;<wide> 00A3;;;;N;;;;;
 FFE2;FULLWIDTH NOT SIGN;Sm;0;ON;<wide> 00AC;;;;N;;;;;
-FFE3;FULLWIDTH MACRON;Sk;0;ON;<wide> 00AF;;;;N;FULLWIDTH SPACING MACRON;*;;;
+FFE3;FULLWIDTH MACRON;Sk;0;ON;<wide> 00AF;;;;N;FULLWIDTH SPACING MACRON;;;;
 FFE4;FULLWIDTH BROKEN BAR;So;0;ON;<wide> 00A6;;;;N;FULLWIDTH BROKEN VERTICAL BAR;;;;
 FFE5;FULLWIDTH YEN SIGN;Sc;0;ET;<wide> 00A5;;;;N;;;;;
 FFE6;FULLWIDTH WON SIGN;Sc;0;ET;<wide> 20A9;;;;N;;;;;
@@ -14883,9 +15843,9 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 100C6;LINEAR B IDEOGRAM B230 SPEAR;Lo;0;L;;;;;N;;;;;
 100C7;LINEAR B IDEOGRAM B231 ARROW;Lo;0;L;;;;;N;;;;;
 100C8;LINEAR B IDEOGRAM B232;Lo;0;L;;;;;N;;;;;
-100C9;LINEAR B IDEOGRAM B233 SWORD;Lo;0;L;;;;;N;;pug;;;
+100C9;LINEAR B IDEOGRAM B233 SWORD;Lo;0;L;;;;;N;;;;;
 100CA;LINEAR B IDEOGRAM B234;Lo;0;L;;;;;N;;;;;
-100CB;LINEAR B IDEOGRAM B236;Lo;0;L;;;;;N;;gup;;;
+100CB;LINEAR B IDEOGRAM B236;Lo;0;L;;;;;N;;;;;
 100CC;LINEAR B IDEOGRAM B240 WHEELED CHARIOT;Lo;0;L;;;;;N;;;;;
 100CD;LINEAR B IDEOGRAM B241 CHARIOT;Lo;0;L;;;;;N;;;;;
 100CE;LINEAR B IDEOGRAM B242 CHARIOT FRAME;Lo;0;L;;;;;N;;;;;
@@ -15216,7 +16176,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1030C;OLD ITALIC LETTER EM;Lo;0;L;;;;;N;;;;;
 1030D;OLD ITALIC LETTER EN;Lo;0;L;;;;;N;;;;;
 1030E;OLD ITALIC LETTER ESH;Lo;0;L;;;;;N;;;;;
-1030F;OLD ITALIC LETTER O;Lo;0;L;;;;;N;;Faliscan;;;
+1030F;OLD ITALIC LETTER O;Lo;0;L;;;;;N;;;;;
 10310;OLD ITALIC LETTER PE;Lo;0;L;;;;;N;;;;;
 10311;OLD ITALIC LETTER SHE;Lo;0;L;;;;;N;;;;;
 10312;OLD ITALIC LETTER KU;Lo;0;L;;;;;N;;;;;
@@ -15224,14 +16184,14 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 10314;OLD ITALIC LETTER ES;Lo;0;L;;;;;N;;;;;
 10315;OLD ITALIC LETTER TE;Lo;0;L;;;;;N;;;;;
 10316;OLD ITALIC LETTER U;Lo;0;L;;;;;N;;;;;
-10317;OLD ITALIC LETTER EKS;Lo;0;L;;;;;N;;Faliscan;;;
+10317;OLD ITALIC LETTER EKS;Lo;0;L;;;;;N;;;;;
 10318;OLD ITALIC LETTER PHE;Lo;0;L;;;;;N;;;;;
 10319;OLD ITALIC LETTER KHE;Lo;0;L;;;;;N;;;;;
 1031A;OLD ITALIC LETTER EF;Lo;0;L;;;;;N;;;;;
-1031B;OLD ITALIC LETTER ERS;Lo;0;L;;;;;N;;Umbrian;;;
-1031C;OLD ITALIC LETTER CHE;Lo;0;L;;;;;N;;Umbrian;;;
-1031D;OLD ITALIC LETTER II;Lo;0;L;;;;;N;;Oscan;;;
-1031E;OLD ITALIC LETTER UU;Lo;0;L;;;;;N;;Oscan;;;
+1031B;OLD ITALIC LETTER ERS;Lo;0;L;;;;;N;;;;;
+1031C;OLD ITALIC LETTER CHE;Lo;0;L;;;;;N;;;;;
+1031D;OLD ITALIC LETTER II;Lo;0;L;;;;;N;;;;;
+1031E;OLD ITALIC LETTER UU;Lo;0;L;;;;;N;;;;;
 10320;OLD ITALIC NUMERAL ONE;No;0;L;;;;1;N;;;;;
 10321;OLD ITALIC NUMERAL FIVE;No;0;L;;;;5;N;;;;;
 10322;OLD ITALIC NUMERAL TEN;No;0;L;;;;10;N;;;;;
@@ -15567,6 +16527,37 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 10838;CYPRIOT SYLLABLE XE;Lo;0;R;;;;;N;;;;;
 1083C;CYPRIOT SYLLABLE ZA;Lo;0;R;;;;;N;;;;;
 1083F;CYPRIOT SYLLABLE ZO;Lo;0;R;;;;;N;;;;;
+10840;IMPERIAL ARAMAIC LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10841;IMPERIAL ARAMAIC LETTER BETH;Lo;0;R;;;;;N;;;;;
+10842;IMPERIAL ARAMAIC LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10843;IMPERIAL ARAMAIC LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10844;IMPERIAL ARAMAIC LETTER HE;Lo;0;R;;;;;N;;;;;
+10845;IMPERIAL ARAMAIC LETTER WAW;Lo;0;R;;;;;N;;;;;
+10846;IMPERIAL ARAMAIC LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10847;IMPERIAL ARAMAIC LETTER HETH;Lo;0;R;;;;;N;;;;;
+10848;IMPERIAL ARAMAIC LETTER TETH;Lo;0;R;;;;;N;;;;;
+10849;IMPERIAL ARAMAIC LETTER YODH;Lo;0;R;;;;;N;;;;;
+1084A;IMPERIAL ARAMAIC LETTER KAPH;Lo;0;R;;;;;N;;;;;
+1084B;IMPERIAL ARAMAIC LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+1084C;IMPERIAL ARAMAIC LETTER MEM;Lo;0;R;;;;;N;;;;;
+1084D;IMPERIAL ARAMAIC LETTER NUN;Lo;0;R;;;;;N;;;;;
+1084E;IMPERIAL ARAMAIC LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+1084F;IMPERIAL ARAMAIC LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10850;IMPERIAL ARAMAIC LETTER PE;Lo;0;R;;;;;N;;;;;
+10851;IMPERIAL ARAMAIC LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10852;IMPERIAL ARAMAIC LETTER QOPH;Lo;0;R;;;;;N;;;;;
+10853;IMPERIAL ARAMAIC LETTER RESH;Lo;0;R;;;;;N;;;;;
+10854;IMPERIAL ARAMAIC LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10855;IMPERIAL ARAMAIC LETTER TAW;Lo;0;R;;;;;N;;;;;
+10857;IMPERIAL ARAMAIC SECTION SIGN;Po;0;R;;;;;N;;;;;
+10858;IMPERIAL ARAMAIC NUMBER ONE;No;0;R;;;;1;N;;;;;
+10859;IMPERIAL ARAMAIC NUMBER TWO;No;0;R;;;;2;N;;;;;
+1085A;IMPERIAL ARAMAIC NUMBER THREE;No;0;R;;;;3;N;;;;;
+1085B;IMPERIAL ARAMAIC NUMBER TEN;No;0;R;;;;10;N;;;;;
+1085C;IMPERIAL ARAMAIC NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+1085D;IMPERIAL ARAMAIC NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+1085E;IMPERIAL ARAMAIC NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+1085F;IMPERIAL ARAMAIC NUMBER TEN THOUSAND;No;0;R;;;;10000;N;;;;;
 10900;PHOENICIAN LETTER ALF;Lo;0;R;;;;;N;;;;;
 10901;PHOENICIAN LETTER BET;Lo;0;R;;;;;N;;;;;
 10902;PHOENICIAN LETTER GAML;Lo;0;R;;;;;N;;;;;
@@ -15593,6 +16584,8 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 10917;PHOENICIAN NUMBER TEN;No;0;R;;;;10;N;;;;;
 10918;PHOENICIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
 10919;PHOENICIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+1091A;PHOENICIAN NUMBER TWO;No;0;R;;;;2;N;;;;;
+1091B;PHOENICIAN NUMBER THREE;No;0;R;;;;3;N;;;;;
 1091F;PHOENICIAN WORD SEPARATOR;Po;0;ON;;;;;N;;;;;
 10920;LYDIAN LETTER A;Lo;0;R;;;;;N;;;;;
 10921;LYDIAN LETTER B;Lo;0;R;;;;;N;;;;;
@@ -15686,6 +16679,326 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 10A56;KHAROSHTHI PUNCTUATION DANDA;Po;0;R;;;;;N;;;;;
 10A57;KHAROSHTHI PUNCTUATION DOUBLE DANDA;Po;0;R;;;;;N;;;;;
 10A58;KHAROSHTHI PUNCTUATION LINES;Po;0;R;;;;;N;;;;;
+10A60;OLD SOUTH ARABIAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10A61;OLD SOUTH ARABIAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10A62;OLD SOUTH ARABIAN LETTER HETH;Lo;0;R;;;;;N;;;;;
+10A63;OLD SOUTH ARABIAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+10A64;OLD SOUTH ARABIAN LETTER QOPH;Lo;0;R;;;;;N;;;;;
+10A65;OLD SOUTH ARABIAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+10A66;OLD SOUTH ARABIAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10A67;OLD SOUTH ARABIAN LETTER RESH;Lo;0;R;;;;;N;;;;;
+10A68;OLD SOUTH ARABIAN LETTER BETH;Lo;0;R;;;;;N;;;;;
+10A69;OLD SOUTH ARABIAN LETTER TAW;Lo;0;R;;;;;N;;;;;
+10A6A;OLD SOUTH ARABIAN LETTER SAT;Lo;0;R;;;;;N;;;;;
+10A6B;OLD SOUTH ARABIAN LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10A6C;OLD SOUTH ARABIAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+10A6D;OLD SOUTH ARABIAN LETTER KHETH;Lo;0;R;;;;;N;;;;;
+10A6E;OLD SOUTH ARABIAN LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10A6F;OLD SOUTH ARABIAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10A70;OLD SOUTH ARABIAN LETTER FE;Lo;0;R;;;;;N;;;;;
+10A71;OLD SOUTH ARABIAN LETTER ALEF;Lo;0;R;;;;;N;;;;;
+10A72;OLD SOUTH ARABIAN LETTER AYN;Lo;0;R;;;;;N;;;;;
+10A73;OLD SOUTH ARABIAN LETTER DHADHE;Lo;0;R;;;;;N;;;;;
+10A74;OLD SOUTH ARABIAN LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10A75;OLD SOUTH ARABIAN LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10A76;OLD SOUTH ARABIAN LETTER GHAYN;Lo;0;R;;;;;N;;;;;
+10A77;OLD SOUTH ARABIAN LETTER TETH;Lo;0;R;;;;;N;;;;;
+10A78;OLD SOUTH ARABIAN LETTER ZAYN;Lo;0;R;;;;;N;;;;;
+10A79;OLD SOUTH ARABIAN LETTER DHALETH;Lo;0;R;;;;;N;;;;;
+10A7A;OLD SOUTH ARABIAN LETTER YODH;Lo;0;R;;;;;N;;;;;
+10A7B;OLD SOUTH ARABIAN LETTER THAW;Lo;0;R;;;;;N;;;;;
+10A7C;OLD SOUTH ARABIAN LETTER THETH;Lo;0;R;;;;;N;;;;;
+10A7D;OLD SOUTH ARABIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10A7E;OLD SOUTH ARABIAN NUMBER FIFTY;No;0;R;;;;50;N;;;;;
+10A7F;OLD SOUTH ARABIAN NUMERIC INDICATOR;Po;0;R;;;;;N;;;;;
+10B00;AVESTAN LETTER A;Lo;0;R;;;;;N;;;;;
+10B01;AVESTAN LETTER AA;Lo;0;R;;;;;N;;;;;
+10B02;AVESTAN LETTER AO;Lo;0;R;;;;;N;;;;;
+10B03;AVESTAN LETTER AAO;Lo;0;R;;;;;N;;;;;
+10B04;AVESTAN LETTER AN;Lo;0;R;;;;;N;;;;;
+10B05;AVESTAN LETTER AAN;Lo;0;R;;;;;N;;;;;
+10B06;AVESTAN LETTER AE;Lo;0;R;;;;;N;;;;;
+10B07;AVESTAN LETTER AEE;Lo;0;R;;;;;N;;;;;
+10B08;AVESTAN LETTER E;Lo;0;R;;;;;N;;;;;
+10B09;AVESTAN LETTER EE;Lo;0;R;;;;;N;;;;;
+10B0A;AVESTAN LETTER O;Lo;0;R;;;;;N;;;;;
+10B0B;AVESTAN LETTER OO;Lo;0;R;;;;;N;;;;;
+10B0C;AVESTAN LETTER I;Lo;0;R;;;;;N;;;;;
+10B0D;AVESTAN LETTER II;Lo;0;R;;;;;N;;;;;
+10B0E;AVESTAN LETTER U;Lo;0;R;;;;;N;;;;;
+10B0F;AVESTAN LETTER UU;Lo;0;R;;;;;N;;;;;
+10B10;AVESTAN LETTER KE;Lo;0;R;;;;;N;;;;;
+10B11;AVESTAN LETTER XE;Lo;0;R;;;;;N;;;;;
+10B12;AVESTAN LETTER XYE;Lo;0;R;;;;;N;;;;;
+10B13;AVESTAN LETTER XVE;Lo;0;R;;;;;N;;;;;
+10B14;AVESTAN LETTER GE;Lo;0;R;;;;;N;;;;;
+10B15;AVESTAN LETTER GGE;Lo;0;R;;;;;N;;;;;
+10B16;AVESTAN LETTER GHE;Lo;0;R;;;;;N;;;;;
+10B17;AVESTAN LETTER CE;Lo;0;R;;;;;N;;;;;
+10B18;AVESTAN LETTER JE;Lo;0;R;;;;;N;;;;;
+10B19;AVESTAN LETTER TE;Lo;0;R;;;;;N;;;;;
+10B1A;AVESTAN LETTER THE;Lo;0;R;;;;;N;;;;;
+10B1B;AVESTAN LETTER DE;Lo;0;R;;;;;N;;;;;
+10B1C;AVESTAN LETTER DHE;Lo;0;R;;;;;N;;;;;
+10B1D;AVESTAN LETTER TTE;Lo;0;R;;;;;N;;;;;
+10B1E;AVESTAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10B1F;AVESTAN LETTER FE;Lo;0;R;;;;;N;;;;;
+10B20;AVESTAN LETTER BE;Lo;0;R;;;;;N;;;;;
+10B21;AVESTAN LETTER BHE;Lo;0;R;;;;;N;;;;;
+10B22;AVESTAN LETTER NGE;Lo;0;R;;;;;N;;;;;
+10B23;AVESTAN LETTER NGYE;Lo;0;R;;;;;N;;;;;
+10B24;AVESTAN LETTER NGVE;Lo;0;R;;;;;N;;;;;
+10B25;AVESTAN LETTER NE;Lo;0;R;;;;;N;;;;;
+10B26;AVESTAN LETTER NYE;Lo;0;R;;;;;N;;;;;
+10B27;AVESTAN LETTER NNE;Lo;0;R;;;;;N;;;;;
+10B28;AVESTAN LETTER ME;Lo;0;R;;;;;N;;;;;
+10B29;AVESTAN LETTER HME;Lo;0;R;;;;;N;;;;;
+10B2A;AVESTAN LETTER YYE;Lo;0;R;;;;;N;;;;;
+10B2B;AVESTAN LETTER YE;Lo;0;R;;;;;N;;;;;
+10B2C;AVESTAN LETTER VE;Lo;0;R;;;;;N;;;;;
+10B2D;AVESTAN LETTER RE;Lo;0;R;;;;;N;;;;;
+10B2E;AVESTAN LETTER LE;Lo;0;R;;;;;N;;;;;
+10B2F;AVESTAN LETTER SE;Lo;0;R;;;;;N;;;;;
+10B30;AVESTAN LETTER ZE;Lo;0;R;;;;;N;;;;;
+10B31;AVESTAN LETTER SHE;Lo;0;R;;;;;N;;;;;
+10B32;AVESTAN LETTER ZHE;Lo;0;R;;;;;N;;;;;
+10B33;AVESTAN LETTER SHYE;Lo;0;R;;;;;N;;;;;
+10B34;AVESTAN LETTER SSHE;Lo;0;R;;;;;N;;;;;
+10B35;AVESTAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10B39;AVESTAN ABBREVIATION MARK;Po;0;ON;;;;;N;;;;;
+10B3A;TINY TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B3B;SMALL TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B3C;LARGE TWO DOTS OVER ONE DOT PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B3D;LARGE ONE DOT OVER TWO DOTS PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B3E;LARGE TWO RINGS OVER ONE RING PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B3F;LARGE ONE RING OVER TWO RINGS PUNCTUATION;Po;0;ON;;;;;N;;;;;
+10B40;INSCRIPTIONAL PARTHIAN LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10B41;INSCRIPTIONAL PARTHIAN LETTER BETH;Lo;0;R;;;;;N;;;;;
+10B42;INSCRIPTIONAL PARTHIAN LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10B43;INSCRIPTIONAL PARTHIAN LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10B44;INSCRIPTIONAL PARTHIAN LETTER HE;Lo;0;R;;;;;N;;;;;
+10B45;INSCRIPTIONAL PARTHIAN LETTER WAW;Lo;0;R;;;;;N;;;;;
+10B46;INSCRIPTIONAL PARTHIAN LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10B47;INSCRIPTIONAL PARTHIAN LETTER HETH;Lo;0;R;;;;;N;;;;;
+10B48;INSCRIPTIONAL PARTHIAN LETTER TETH;Lo;0;R;;;;;N;;;;;
+10B49;INSCRIPTIONAL PARTHIAN LETTER YODH;Lo;0;R;;;;;N;;;;;
+10B4A;INSCRIPTIONAL PARTHIAN LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10B4B;INSCRIPTIONAL PARTHIAN LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10B4C;INSCRIPTIONAL PARTHIAN LETTER MEM;Lo;0;R;;;;;N;;;;;
+10B4D;INSCRIPTIONAL PARTHIAN LETTER NUN;Lo;0;R;;;;;N;;;;;
+10B4E;INSCRIPTIONAL PARTHIAN LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10B4F;INSCRIPTIONAL PARTHIAN LETTER AYIN;Lo;0;R;;;;;N;;;;;
+10B50;INSCRIPTIONAL PARTHIAN LETTER PE;Lo;0;R;;;;;N;;;;;
+10B51;INSCRIPTIONAL PARTHIAN LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10B52;INSCRIPTIONAL PARTHIAN LETTER QOPH;Lo;0;R;;;;;N;;;;;
+10B53;INSCRIPTIONAL PARTHIAN LETTER RESH;Lo;0;R;;;;;N;;;;;
+10B54;INSCRIPTIONAL PARTHIAN LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10B55;INSCRIPTIONAL PARTHIAN LETTER TAW;Lo;0;R;;;;;N;;;;;
+10B58;INSCRIPTIONAL PARTHIAN NUMBER ONE;No;0;R;;;;1;N;;;;;
+10B59;INSCRIPTIONAL PARTHIAN NUMBER TWO;No;0;R;;;;2;N;;;;;
+10B5A;INSCRIPTIONAL PARTHIAN NUMBER THREE;No;0;R;;;;3;N;;;;;
+10B5B;INSCRIPTIONAL PARTHIAN NUMBER FOUR;No;0;R;;;;4;N;;;;;
+10B5C;INSCRIPTIONAL PARTHIAN NUMBER TEN;No;0;R;;;;10;N;;;;;
+10B5D;INSCRIPTIONAL PARTHIAN NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10B5E;INSCRIPTIONAL PARTHIAN NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10B5F;INSCRIPTIONAL PARTHIAN NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+10B60;INSCRIPTIONAL PAHLAVI LETTER ALEPH;Lo;0;R;;;;;N;;;;;
+10B61;INSCRIPTIONAL PAHLAVI LETTER BETH;Lo;0;R;;;;;N;;;;;
+10B62;INSCRIPTIONAL PAHLAVI LETTER GIMEL;Lo;0;R;;;;;N;;;;;
+10B63;INSCRIPTIONAL PAHLAVI LETTER DALETH;Lo;0;R;;;;;N;;;;;
+10B64;INSCRIPTIONAL PAHLAVI LETTER HE;Lo;0;R;;;;;N;;;;;
+10B65;INSCRIPTIONAL PAHLAVI LETTER WAW-AYIN-RESH;Lo;0;R;;;;;N;;;;;
+10B66;INSCRIPTIONAL PAHLAVI LETTER ZAYIN;Lo;0;R;;;;;N;;;;;
+10B67;INSCRIPTIONAL PAHLAVI LETTER HETH;Lo;0;R;;;;;N;;;;;
+10B68;INSCRIPTIONAL PAHLAVI LETTER TETH;Lo;0;R;;;;;N;;;;;
+10B69;INSCRIPTIONAL PAHLAVI LETTER YODH;Lo;0;R;;;;;N;;;;;
+10B6A;INSCRIPTIONAL PAHLAVI LETTER KAPH;Lo;0;R;;;;;N;;;;;
+10B6B;INSCRIPTIONAL PAHLAVI LETTER LAMEDH;Lo;0;R;;;;;N;;;;;
+10B6C;INSCRIPTIONAL PAHLAVI LETTER MEM-QOPH;Lo;0;R;;;;;N;;;;;
+10B6D;INSCRIPTIONAL PAHLAVI LETTER NUN;Lo;0;R;;;;;N;;;;;
+10B6E;INSCRIPTIONAL PAHLAVI LETTER SAMEKH;Lo;0;R;;;;;N;;;;;
+10B6F;INSCRIPTIONAL PAHLAVI LETTER PE;Lo;0;R;;;;;N;;;;;
+10B70;INSCRIPTIONAL PAHLAVI LETTER SADHE;Lo;0;R;;;;;N;;;;;
+10B71;INSCRIPTIONAL PAHLAVI LETTER SHIN;Lo;0;R;;;;;N;;;;;
+10B72;INSCRIPTIONAL PAHLAVI LETTER TAW;Lo;0;R;;;;;N;;;;;
+10B78;INSCRIPTIONAL PAHLAVI NUMBER ONE;No;0;R;;;;1;N;;;;;
+10B79;INSCRIPTIONAL PAHLAVI NUMBER TWO;No;0;R;;;;2;N;;;;;
+10B7A;INSCRIPTIONAL PAHLAVI NUMBER THREE;No;0;R;;;;3;N;;;;;
+10B7B;INSCRIPTIONAL PAHLAVI NUMBER FOUR;No;0;R;;;;4;N;;;;;
+10B7C;INSCRIPTIONAL PAHLAVI NUMBER TEN;No;0;R;;;;10;N;;;;;
+10B7D;INSCRIPTIONAL PAHLAVI NUMBER TWENTY;No;0;R;;;;20;N;;;;;
+10B7E;INSCRIPTIONAL PAHLAVI NUMBER ONE HUNDRED;No;0;R;;;;100;N;;;;;
+10B7F;INSCRIPTIONAL PAHLAVI NUMBER ONE THOUSAND;No;0;R;;;;1000;N;;;;;
+10C00;OLD TURKIC LETTER ORKHON A;Lo;0;R;;;;;N;;;;;
+10C01;OLD TURKIC LETTER YENISEI A;Lo;0;R;;;;;N;;;;;
+10C02;OLD TURKIC LETTER YENISEI AE;Lo;0;R;;;;;N;;;;;
+10C03;OLD TURKIC LETTER ORKHON I;Lo;0;R;;;;;N;;;;;
+10C04;OLD TURKIC LETTER YENISEI I;Lo;0;R;;;;;N;;;;;
+10C05;OLD TURKIC LETTER YENISEI E;Lo;0;R;;;;;N;;;;;
+10C06;OLD TURKIC LETTER ORKHON O;Lo;0;R;;;;;N;;;;;
+10C07;OLD TURKIC LETTER ORKHON OE;Lo;0;R;;;;;N;;;;;
+10C08;OLD TURKIC LETTER YENISEI OE;Lo;0;R;;;;;N;;;;;
+10C09;OLD TURKIC LETTER ORKHON AB;Lo;0;R;;;;;N;;;;;
+10C0A;OLD TURKIC LETTER YENISEI AB;Lo;0;R;;;;;N;;;;;
+10C0B;OLD TURKIC LETTER ORKHON AEB;Lo;0;R;;;;;N;;;;;
+10C0C;OLD TURKIC LETTER YENISEI AEB;Lo;0;R;;;;;N;;;;;
+10C0D;OLD TURKIC LETTER ORKHON AG;Lo;0;R;;;;;N;;;;;
+10C0E;OLD TURKIC LETTER YENISEI AG;Lo;0;R;;;;;N;;;;;
+10C0F;OLD TURKIC LETTER ORKHON AEG;Lo;0;R;;;;;N;;;;;
+10C10;OLD TURKIC LETTER YENISEI AEG;Lo;0;R;;;;;N;;;;;
+10C11;OLD TURKIC LETTER ORKHON AD;Lo;0;R;;;;;N;;;;;
+10C12;OLD TURKIC LETTER YENISEI AD;Lo;0;R;;;;;N;;;;;
+10C13;OLD TURKIC LETTER ORKHON AED;Lo;0;R;;;;;N;;;;;
+10C14;OLD TURKIC LETTER ORKHON EZ;Lo;0;R;;;;;N;;;;;
+10C15;OLD TURKIC LETTER YENISEI EZ;Lo;0;R;;;;;N;;;;;
+10C16;OLD TURKIC LETTER ORKHON AY;Lo;0;R;;;;;N;;;;;
+10C17;OLD TURKIC LETTER YENISEI AY;Lo;0;R;;;;;N;;;;;
+10C18;OLD TURKIC LETTER ORKHON AEY;Lo;0;R;;;;;N;;;;;
+10C19;OLD TURKIC LETTER YENISEI AEY;Lo;0;R;;;;;N;;;;;
+10C1A;OLD TURKIC LETTER ORKHON AEK;Lo;0;R;;;;;N;;;;;
+10C1B;OLD TURKIC LETTER YENISEI AEK;Lo;0;R;;;;;N;;;;;
+10C1C;OLD TURKIC LETTER ORKHON OEK;Lo;0;R;;;;;N;;;;;
+10C1D;OLD TURKIC LETTER YENISEI OEK;Lo;0;R;;;;;N;;;;;
+10C1E;OLD TURKIC LETTER ORKHON AL;Lo;0;R;;;;;N;;;;;
+10C1F;OLD TURKIC LETTER YENISEI AL;Lo;0;R;;;;;N;;;;;
+10C20;OLD TURKIC LETTER ORKHON AEL;Lo;0;R;;;;;N;;;;;
+10C21;OLD TURKIC LETTER ORKHON ELT;Lo;0;R;;;;;N;;;;;
+10C22;OLD TURKIC LETTER ORKHON EM;Lo;0;R;;;;;N;;;;;
+10C23;OLD TURKIC LETTER ORKHON AN;Lo;0;R;;;;;N;;;;;
+10C24;OLD TURKIC LETTER ORKHON AEN;Lo;0;R;;;;;N;;;;;
+10C25;OLD TURKIC LETTER YENISEI AEN;Lo;0;R;;;;;N;;;;;
+10C26;OLD TURKIC LETTER ORKHON ENT;Lo;0;R;;;;;N;;;;;
+10C27;OLD TURKIC LETTER YENISEI ENT;Lo;0;R;;;;;N;;;;;
+10C28;OLD TURKIC LETTER ORKHON ENC;Lo;0;R;;;;;N;;;;;
+10C29;OLD TURKIC LETTER YENISEI ENC;Lo;0;R;;;;;N;;;;;
+10C2A;OLD TURKIC LETTER ORKHON ENY;Lo;0;R;;;;;N;;;;;
+10C2B;OLD TURKIC LETTER YENISEI ENY;Lo;0;R;;;;;N;;;;;
+10C2C;OLD TURKIC LETTER YENISEI ANG;Lo;0;R;;;;;N;;;;;
+10C2D;OLD TURKIC LETTER ORKHON ENG;Lo;0;R;;;;;N;;;;;
+10C2E;OLD TURKIC LETTER YENISEI AENG;Lo;0;R;;;;;N;;;;;
+10C2F;OLD TURKIC LETTER ORKHON EP;Lo;0;R;;;;;N;;;;;
+10C30;OLD TURKIC LETTER ORKHON OP;Lo;0;R;;;;;N;;;;;
+10C31;OLD TURKIC LETTER ORKHON IC;Lo;0;R;;;;;N;;;;;
+10C32;OLD TURKIC LETTER ORKHON EC;Lo;0;R;;;;;N;;;;;
+10C33;OLD TURKIC LETTER YENISEI EC;Lo;0;R;;;;;N;;;;;
+10C34;OLD TURKIC LETTER ORKHON AQ;Lo;0;R;;;;;N;;;;;
+10C35;OLD TURKIC LETTER YENISEI AQ;Lo;0;R;;;;;N;;;;;
+10C36;OLD TURKIC LETTER ORKHON IQ;Lo;0;R;;;;;N;;;;;
+10C37;OLD TURKIC LETTER YENISEI IQ;Lo;0;R;;;;;N;;;;;
+10C38;OLD TURKIC LETTER ORKHON OQ;Lo;0;R;;;;;N;;;;;
+10C39;OLD TURKIC LETTER YENISEI OQ;Lo;0;R;;;;;N;;;;;
+10C3A;OLD TURKIC LETTER ORKHON AR;Lo;0;R;;;;;N;;;;;
+10C3B;OLD TURKIC LETTER YENISEI AR;Lo;0;R;;;;;N;;;;;
+10C3C;OLD TURKIC LETTER ORKHON AER;Lo;0;R;;;;;N;;;;;
+10C3D;OLD TURKIC LETTER ORKHON AS;Lo;0;R;;;;;N;;;;;
+10C3E;OLD TURKIC LETTER ORKHON AES;Lo;0;R;;;;;N;;;;;
+10C3F;OLD TURKIC LETTER ORKHON ASH;Lo;0;R;;;;;N;;;;;
+10C40;OLD TURKIC LETTER YENISEI ASH;Lo;0;R;;;;;N;;;;;
+10C41;OLD TURKIC LETTER ORKHON ESH;Lo;0;R;;;;;N;;;;;
+10C42;OLD TURKIC LETTER YENISEI ESH;Lo;0;R;;;;;N;;;;;
+10C43;OLD TURKIC LETTER ORKHON AT;Lo;0;R;;;;;N;;;;;
+10C44;OLD TURKIC LETTER YENISEI AT;Lo;0;R;;;;;N;;;;;
+10C45;OLD TURKIC LETTER ORKHON AET;Lo;0;R;;;;;N;;;;;
+10C46;OLD TURKIC LETTER YENISEI AET;Lo;0;R;;;;;N;;;;;
+10C47;OLD TURKIC LETTER ORKHON OT;Lo;0;R;;;;;N;;;;;
+10C48;OLD TURKIC LETTER ORKHON BASH;Lo;0;R;;;;;N;;;;;
+10E60;RUMI DIGIT ONE;No;0;AN;;;1;1;N;;;;;
+10E61;RUMI DIGIT TWO;No;0;AN;;;2;2;N;;;;;
+10E62;RUMI DIGIT THREE;No;0;AN;;;3;3;N;;;;;
+10E63;RUMI DIGIT FOUR;No;0;AN;;;4;4;N;;;;;
+10E64;RUMI DIGIT FIVE;No;0;AN;;;5;5;N;;;;;
+10E65;RUMI DIGIT SIX;No;0;AN;;;6;6;N;;;;;
+10E66;RUMI DIGIT SEVEN;No;0;AN;;;7;7;N;;;;;
+10E67;RUMI DIGIT EIGHT;No;0;AN;;;8;8;N;;;;;
+10E68;RUMI DIGIT NINE;No;0;AN;;;9;9;N;;;;;
+10E69;RUMI NUMBER TEN;No;0;AN;;;;10;N;;;;;
+10E6A;RUMI NUMBER TWENTY;No;0;AN;;;;20;N;;;;;
+10E6B;RUMI NUMBER THIRTY;No;0;AN;;;;30;N;;;;;
+10E6C;RUMI NUMBER FORTY;No;0;AN;;;;40;N;;;;;
+10E6D;RUMI NUMBER FIFTY;No;0;AN;;;;50;N;;;;;
+10E6E;RUMI NUMBER SIXTY;No;0;AN;;;;60;N;;;;;
+10E6F;RUMI NUMBER SEVENTY;No;0;AN;;;;70;N;;;;;
+10E70;RUMI NUMBER EIGHTY;No;0;AN;;;;80;N;;;;;
+10E71;RUMI NUMBER NINETY;No;0;AN;;;;90;N;;;;;
+10E72;RUMI NUMBER ONE HUNDRED;No;0;AN;;;;100;N;;;;;
+10E73;RUMI NUMBER TWO HUNDRED;No;0;AN;;;;200;N;;;;;
+10E74;RUMI NUMBER THREE HUNDRED;No;0;AN;;;;300;N;;;;;
+10E75;RUMI NUMBER FOUR HUNDRED;No;0;AN;;;;400;N;;;;;
+10E76;RUMI NUMBER FIVE HUNDRED;No;0;AN;;;;500;N;;;;;
+10E77;RUMI NUMBER SIX HUNDRED;No;0;AN;;;;600;N;;;;;
+10E78;RUMI NUMBER SEVEN HUNDRED;No;0;AN;;;;700;N;;;;;
+10E79;RUMI NUMBER EIGHT HUNDRED;No;0;AN;;;;800;N;;;;;
+10E7A;RUMI NUMBER NINE HUNDRED;No;0;AN;;;;900;N;;;;;
+10E7B;RUMI FRACTION ONE HALF;No;0;AN;;;;1/2;N;;;;;
+10E7C;RUMI FRACTION ONE QUARTER;No;0;AN;;;;1/4;N;;;;;
+10E7D;RUMI FRACTION ONE THIRD;No;0;AN;;;;1/3;N;;;;;
+10E7E;RUMI FRACTION TWO THIRDS;No;0;AN;;;;2/3;N;;;;;
+11080;KAITHI SIGN CANDRABINDU;Mn;0;NSM;;;;;N;;;;;
+11081;KAITHI SIGN ANUSVARA;Mn;0;NSM;;;;;N;;;;;
+11082;KAITHI SIGN VISARGA;Mc;0;L;;;;;N;;;;;
+11083;KAITHI LETTER A;Lo;0;L;;;;;N;;;;;
+11084;KAITHI LETTER AA;Lo;0;L;;;;;N;;;;;
+11085;KAITHI LETTER I;Lo;0;L;;;;;N;;;;;
+11086;KAITHI LETTER II;Lo;0;L;;;;;N;;;;;
+11087;KAITHI LETTER U;Lo;0;L;;;;;N;;;;;
+11088;KAITHI LETTER UU;Lo;0;L;;;;;N;;;;;
+11089;KAITHI LETTER E;Lo;0;L;;;;;N;;;;;
+1108A;KAITHI LETTER AI;Lo;0;L;;;;;N;;;;;
+1108B;KAITHI LETTER O;Lo;0;L;;;;;N;;;;;
+1108C;KAITHI LETTER AU;Lo;0;L;;;;;N;;;;;
+1108D;KAITHI LETTER KA;Lo;0;L;;;;;N;;;;;
+1108E;KAITHI LETTER KHA;Lo;0;L;;;;;N;;;;;
+1108F;KAITHI LETTER GA;Lo;0;L;;;;;N;;;;;
+11090;KAITHI LETTER GHA;Lo;0;L;;;;;N;;;;;
+11091;KAITHI LETTER NGA;Lo;0;L;;;;;N;;;;;
+11092;KAITHI LETTER CA;Lo;0;L;;;;;N;;;;;
+11093;KAITHI LETTER CHA;Lo;0;L;;;;;N;;;;;
+11094;KAITHI LETTER JA;Lo;0;L;;;;;N;;;;;
+11095;KAITHI LETTER JHA;Lo;0;L;;;;;N;;;;;
+11096;KAITHI LETTER NYA;Lo;0;L;;;;;N;;;;;
+11097;KAITHI LETTER TTA;Lo;0;L;;;;;N;;;;;
+11098;KAITHI LETTER TTHA;Lo;0;L;;;;;N;;;;;
+11099;KAITHI LETTER DDA;Lo;0;L;;;;;N;;;;;
+1109A;KAITHI LETTER DDDHA;Lo;0;L;11099 110BA;;;;N;;;;;
+1109B;KAITHI LETTER DDHA;Lo;0;L;;;;;N;;;;;
+1109C;KAITHI LETTER RHA;Lo;0;L;1109B 110BA;;;;N;;;;;
+1109D;KAITHI LETTER NNA;Lo;0;L;;;;;N;;;;;
+1109E;KAITHI LETTER TA;Lo;0;L;;;;;N;;;;;
+1109F;KAITHI LETTER THA;Lo;0;L;;;;;N;;;;;
+110A0;KAITHI LETTER DA;Lo;0;L;;;;;N;;;;;
+110A1;KAITHI LETTER DHA;Lo;0;L;;;;;N;;;;;
+110A2;KAITHI LETTER NA;Lo;0;L;;;;;N;;;;;
+110A3;KAITHI LETTER PA;Lo;0;L;;;;;N;;;;;
+110A4;KAITHI LETTER PHA;Lo;0;L;;;;;N;;;;;
+110A5;KAITHI LETTER BA;Lo;0;L;;;;;N;;;;;
+110A6;KAITHI LETTER BHA;Lo;0;L;;;;;N;;;;;
+110A7;KAITHI LETTER MA;Lo;0;L;;;;;N;;;;;
+110A8;KAITHI LETTER YA;Lo;0;L;;;;;N;;;;;
+110A9;KAITHI LETTER RA;Lo;0;L;;;;;N;;;;;
+110AA;KAITHI LETTER LA;Lo;0;L;;;;;N;;;;;
+110AB;KAITHI LETTER VA;Lo;0;L;110A5 110BA;;;;N;;;;;
+110AC;KAITHI LETTER SHA;Lo;0;L;;;;;N;;;;;
+110AD;KAITHI LETTER SSA;Lo;0;L;;;;;N;;;;;
+110AE;KAITHI LETTER SA;Lo;0;L;;;;;N;;;;;
+110AF;KAITHI LETTER HA;Lo;0;L;;;;;N;;;;;
+110B0;KAITHI VOWEL SIGN AA;Mc;0;L;;;;;N;;;;;
+110B1;KAITHI VOWEL SIGN I;Mc;0;L;;;;;N;;;;;
+110B2;KAITHI VOWEL SIGN II;Mc;0;L;;;;;N;;;;;
+110B3;KAITHI VOWEL SIGN U;Mn;0;NSM;;;;;N;;;;;
+110B4;KAITHI VOWEL SIGN UU;Mn;0;NSM;;;;;N;;;;;
+110B5;KAITHI VOWEL SIGN E;Mn;0;NSM;;;;;N;;;;;
+110B6;KAITHI VOWEL SIGN AI;Mn;0;NSM;;;;;N;;;;;
+110B7;KAITHI VOWEL SIGN O;Mc;0;L;;;;;N;;;;;
+110B8;KAITHI VOWEL SIGN AU;Mc;0;L;;;;;N;;;;;
+110B9;KAITHI SIGN VIRAMA;Mn;9;NSM;;;;;N;;;;;
+110BA;KAITHI SIGN NUKTA;Mn;7;NSM;;;;;N;;;;;
+110BB;KAITHI ABBREVIATION SIGN;Po;0;L;;;;;N;;;;;
+110BC;KAITHI ENUMERATION SIGN;Po;0;L;;;;;N;;;;;
+110BD;KAITHI NUMBER SIGN;Cf;0;L;;;;;N;;;;;
+110BE;KAITHI SECTION MARK;Po;0;L;;;;;N;;;;;
+110BF;KAITHI DOUBLE SECTION MARK;Po;0;L;;;;;N;;;;;
+110C0;KAITHI DANDA;Po;0;L;;;;;N;;;;;
+110C1;KAITHI DOUBLE DANDA;Po;0;L;;;;;N;;;;;
 12000;CUNEIFORM SIGN A;Lo;0;L;;;;;N;;;;;
 12001;CUNEIFORM SIGN A TIMES A;Lo;0;L;;;;;N;;;;;
 12002;CUNEIFORM SIGN A TIMES BAD;Lo;0;L;;;;;N;;;;;
@@ -16668,6 +17981,1077 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 12471;CUNEIFORM PUNCTUATION SIGN VERTICAL COLON;Po;0;L;;;;;N;;;;;
 12472;CUNEIFORM PUNCTUATION SIGN DIAGONAL COLON;Po;0;L;;;;;N;;;;;
 12473;CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON;Po;0;L;;;;;N;;;;;
+13000;EGYPTIAN HIEROGLYPH A001;Lo;0;L;;;;;N;;;;;
+13001;EGYPTIAN HIEROGLYPH A002;Lo;0;L;;;;;N;;;;;
+13002;EGYPTIAN HIEROGLYPH A003;Lo;0;L;;;;;N;;;;;
+13003;EGYPTIAN HIEROGLYPH A004;Lo;0;L;;;;;N;;;;;
+13004;EGYPTIAN HIEROGLYPH A005;Lo;0;L;;;;;N;;;;;
+13005;EGYPTIAN HIEROGLYPH A005A;Lo;0;L;;;;;N;;;;;
+13006;EGYPTIAN HIEROGLYPH A006;Lo;0;L;;;;;N;;;;;
+13007;EGYPTIAN HIEROGLYPH A006A;Lo;0;L;;;;;N;;;;;
+13008;EGYPTIAN HIEROGLYPH A006B;Lo;0;L;;;;;N;;;;;
+13009;EGYPTIAN HIEROGLYPH A007;Lo;0;L;;;;;N;;;;;
+1300A;EGYPTIAN HIEROGLYPH A008;Lo;0;L;;;;;N;;;;;
+1300B;EGYPTIAN HIEROGLYPH A009;Lo;0;L;;;;;N;;;;;
+1300C;EGYPTIAN HIEROGLYPH A010;Lo;0;L;;;;;N;;;;;
+1300D;EGYPTIAN HIEROGLYPH A011;Lo;0;L;;;;;N;;;;;
+1300E;EGYPTIAN HIEROGLYPH A012;Lo;0;L;;;;;N;;;;;
+1300F;EGYPTIAN HIEROGLYPH A013;Lo;0;L;;;;;N;;;;;
+13010;EGYPTIAN HIEROGLYPH A014;Lo;0;L;;;;;N;;;;;
+13011;EGYPTIAN HIEROGLYPH A014A;Lo;0;L;;;;;N;;;;;
+13012;EGYPTIAN HIEROGLYPH A015;Lo;0;L;;;;;N;;;;;
+13013;EGYPTIAN HIEROGLYPH A016;Lo;0;L;;;;;N;;;;;
+13014;EGYPTIAN HIEROGLYPH A017;Lo;0;L;;;;;N;;;;;
+13015;EGYPTIAN HIEROGLYPH A017A;Lo;0;L;;;;;N;;;;;
+13016;EGYPTIAN HIEROGLYPH A018;Lo;0;L;;;;;N;;;;;
+13017;EGYPTIAN HIEROGLYPH A019;Lo;0;L;;;;;N;;;;;
+13018;EGYPTIAN HIEROGLYPH A020;Lo;0;L;;;;;N;;;;;
+13019;EGYPTIAN HIEROGLYPH A021;Lo;0;L;;;;;N;;;;;
+1301A;EGYPTIAN HIEROGLYPH A022;Lo;0;L;;;;;N;;;;;
+1301B;EGYPTIAN HIEROGLYPH A023;Lo;0;L;;;;;N;;;;;
+1301C;EGYPTIAN HIEROGLYPH A024;Lo;0;L;;;;;N;;;;;
+1301D;EGYPTIAN HIEROGLYPH A025;Lo;0;L;;;;;N;;;;;
+1301E;EGYPTIAN HIEROGLYPH A026;Lo;0;L;;;;;N;;;;;
+1301F;EGYPTIAN HIEROGLYPH A027;Lo;0;L;;;;;N;;;;;
+13020;EGYPTIAN HIEROGLYPH A028;Lo;0;L;;;;;N;;;;;
+13021;EGYPTIAN HIEROGLYPH A029;Lo;0;L;;;;;N;;;;;
+13022;EGYPTIAN HIEROGLYPH A030;Lo;0;L;;;;;N;;;;;
+13023;EGYPTIAN HIEROGLYPH A031;Lo;0;L;;;;;N;;;;;
+13024;EGYPTIAN HIEROGLYPH A032;Lo;0;L;;;;;N;;;;;
+13025;EGYPTIAN HIEROGLYPH A032A;Lo;0;L;;;;;N;;;;;
+13026;EGYPTIAN HIEROGLYPH A033;Lo;0;L;;;;;N;;;;;
+13027;EGYPTIAN HIEROGLYPH A034;Lo;0;L;;;;;N;;;;;
+13028;EGYPTIAN HIEROGLYPH A035;Lo;0;L;;;;;N;;;;;
+13029;EGYPTIAN HIEROGLYPH A036;Lo;0;L;;;;;N;;;;;
+1302A;EGYPTIAN HIEROGLYPH A037;Lo;0;L;;;;;N;;;;;
+1302B;EGYPTIAN HIEROGLYPH A038;Lo;0;L;;;;;N;;;;;
+1302C;EGYPTIAN HIEROGLYPH A039;Lo;0;L;;;;;N;;;;;
+1302D;EGYPTIAN HIEROGLYPH A040;Lo;0;L;;;;;N;;;;;
+1302E;EGYPTIAN HIEROGLYPH A040A;Lo;0;L;;;;;N;;;;;
+1302F;EGYPTIAN HIEROGLYPH A041;Lo;0;L;;;;;N;;;;;
+13030;EGYPTIAN HIEROGLYPH A042;Lo;0;L;;;;;N;;;;;
+13031;EGYPTIAN HIEROGLYPH A042A;Lo;0;L;;;;;N;;;;;
+13032;EGYPTIAN HIEROGLYPH A043;Lo;0;L;;;;;N;;;;;
+13033;EGYPTIAN HIEROGLYPH A043A;Lo;0;L;;;;;N;;;;;
+13034;EGYPTIAN HIEROGLYPH A044;Lo;0;L;;;;;N;;;;;
+13035;EGYPTIAN HIEROGLYPH A045;Lo;0;L;;;;;N;;;;;
+13036;EGYPTIAN HIEROGLYPH A045A;Lo;0;L;;;;;N;;;;;
+13037;EGYPTIAN HIEROGLYPH A046;Lo;0;L;;;;;N;;;;;
+13038;EGYPTIAN HIEROGLYPH A047;Lo;0;L;;;;;N;;;;;
+13039;EGYPTIAN HIEROGLYPH A048;Lo;0;L;;;;;N;;;;;
+1303A;EGYPTIAN HIEROGLYPH A049;Lo;0;L;;;;;N;;;;;
+1303B;EGYPTIAN HIEROGLYPH A050;Lo;0;L;;;;;N;;;;;
+1303C;EGYPTIAN HIEROGLYPH A051;Lo;0;L;;;;;N;;;;;
+1303D;EGYPTIAN HIEROGLYPH A052;Lo;0;L;;;;;N;;;;;
+1303E;EGYPTIAN HIEROGLYPH A053;Lo;0;L;;;;;N;;;;;
+1303F;EGYPTIAN HIEROGLYPH A054;Lo;0;L;;;;;N;;;;;
+13040;EGYPTIAN HIEROGLYPH A055;Lo;0;L;;;;;N;;;;;
+13041;EGYPTIAN HIEROGLYPH A056;Lo;0;L;;;;;N;;;;;
+13042;EGYPTIAN HIEROGLYPH A057;Lo;0;L;;;;;N;;;;;
+13043;EGYPTIAN HIEROGLYPH A058;Lo;0;L;;;;;N;;;;;
+13044;EGYPTIAN HIEROGLYPH A059;Lo;0;L;;;;;N;;;;;
+13045;EGYPTIAN HIEROGLYPH A060;Lo;0;L;;;;;N;;;;;
+13046;EGYPTIAN HIEROGLYPH A061;Lo;0;L;;;;;N;;;;;
+13047;EGYPTIAN HIEROGLYPH A062;Lo;0;L;;;;;N;;;;;
+13048;EGYPTIAN HIEROGLYPH A063;Lo;0;L;;;;;N;;;;;
+13049;EGYPTIAN HIEROGLYPH A064;Lo;0;L;;;;;N;;;;;
+1304A;EGYPTIAN HIEROGLYPH A065;Lo;0;L;;;;;N;;;;;
+1304B;EGYPTIAN HIEROGLYPH A066;Lo;0;L;;;;;N;;;;;
+1304C;EGYPTIAN HIEROGLYPH A067;Lo;0;L;;;;;N;;;;;
+1304D;EGYPTIAN HIEROGLYPH A068;Lo;0;L;;;;;N;;;;;
+1304E;EGYPTIAN HIEROGLYPH A069;Lo;0;L;;;;;N;;;;;
+1304F;EGYPTIAN HIEROGLYPH A070;Lo;0;L;;;;;N;;;;;
+13050;EGYPTIAN HIEROGLYPH B001;Lo;0;L;;;;;N;;;;;
+13051;EGYPTIAN HIEROGLYPH B002;Lo;0;L;;;;;N;;;;;
+13052;EGYPTIAN HIEROGLYPH B003;Lo;0;L;;;;;N;;;;;
+13053;EGYPTIAN HIEROGLYPH B004;Lo;0;L;;;;;N;;;;;
+13054;EGYPTIAN HIEROGLYPH B005;Lo;0;L;;;;;N;;;;;
+13055;EGYPTIAN HIEROGLYPH B005A;Lo;0;L;;;;;N;;;;;
+13056;EGYPTIAN HIEROGLYPH B006;Lo;0;L;;;;;N;;;;;
+13057;EGYPTIAN HIEROGLYPH B007;Lo;0;L;;;;;N;;;;;
+13058;EGYPTIAN HIEROGLYPH B008;Lo;0;L;;;;;N;;;;;
+13059;EGYPTIAN HIEROGLYPH B009;Lo;0;L;;;;;N;;;;;
+1305A;EGYPTIAN HIEROGLYPH C001;Lo;0;L;;;;;N;;;;;
+1305B;EGYPTIAN HIEROGLYPH C002;Lo;0;L;;;;;N;;;;;
+1305C;EGYPTIAN HIEROGLYPH C002A;Lo;0;L;;;;;N;;;;;
+1305D;EGYPTIAN HIEROGLYPH C002B;Lo;0;L;;;;;N;;;;;
+1305E;EGYPTIAN HIEROGLYPH C002C;Lo;0;L;;;;;N;;;;;
+1305F;EGYPTIAN HIEROGLYPH C003;Lo;0;L;;;;;N;;;;;
+13060;EGYPTIAN HIEROGLYPH C004;Lo;0;L;;;;;N;;;;;
+13061;EGYPTIAN HIEROGLYPH C005;Lo;0;L;;;;;N;;;;;
+13062;EGYPTIAN HIEROGLYPH C006;Lo;0;L;;;;;N;;;;;
+13063;EGYPTIAN HIEROGLYPH C007;Lo;0;L;;;;;N;;;;;
+13064;EGYPTIAN HIEROGLYPH C008;Lo;0;L;;;;;N;;;;;
+13065;EGYPTIAN HIEROGLYPH C009;Lo;0;L;;;;;N;;;;;
+13066;EGYPTIAN HIEROGLYPH C010;Lo;0;L;;;;;N;;;;;
+13067;EGYPTIAN HIEROGLYPH C010A;Lo;0;L;;;;;N;;;;;
+13068;EGYPTIAN HIEROGLYPH C011;Lo;0;L;;;;;N;;;;;
+13069;EGYPTIAN HIEROGLYPH C012;Lo;0;L;;;;;N;;;;;
+1306A;EGYPTIAN HIEROGLYPH C013;Lo;0;L;;;;;N;;;;;
+1306B;EGYPTIAN HIEROGLYPH C014;Lo;0;L;;;;;N;;;;;
+1306C;EGYPTIAN HIEROGLYPH C015;Lo;0;L;;;;;N;;;;;
+1306D;EGYPTIAN HIEROGLYPH C016;Lo;0;L;;;;;N;;;;;
+1306E;EGYPTIAN HIEROGLYPH C017;Lo;0;L;;;;;N;;;;;
+1306F;EGYPTIAN HIEROGLYPH C018;Lo;0;L;;;;;N;;;;;
+13070;EGYPTIAN HIEROGLYPH C019;Lo;0;L;;;;;N;;;;;
+13071;EGYPTIAN HIEROGLYPH C020;Lo;0;L;;;;;N;;;;;
+13072;EGYPTIAN HIEROGLYPH C021;Lo;0;L;;;;;N;;;;;
+13073;EGYPTIAN HIEROGLYPH C022;Lo;0;L;;;;;N;;;;;
+13074;EGYPTIAN HIEROGLYPH C023;Lo;0;L;;;;;N;;;;;
+13075;EGYPTIAN HIEROGLYPH C024;Lo;0;L;;;;;N;;;;;
+13076;EGYPTIAN HIEROGLYPH D001;Lo;0;L;;;;;N;;;;;
+13077;EGYPTIAN HIEROGLYPH D002;Lo;0;L;;;;;N;;;;;
+13078;EGYPTIAN HIEROGLYPH D003;Lo;0;L;;;;;N;;;;;
+13079;EGYPTIAN HIEROGLYPH D004;Lo;0;L;;;;;N;;;;;
+1307A;EGYPTIAN HIEROGLYPH D005;Lo;0;L;;;;;N;;;;;
+1307B;EGYPTIAN HIEROGLYPH D006;Lo;0;L;;;;;N;;;;;
+1307C;EGYPTIAN HIEROGLYPH D007;Lo;0;L;;;;;N;;;;;
+1307D;EGYPTIAN HIEROGLYPH D008;Lo;0;L;;;;;N;;;;;
+1307E;EGYPTIAN HIEROGLYPH D008A;Lo;0;L;;;;;N;;;;;
+1307F;EGYPTIAN HIEROGLYPH D009;Lo;0;L;;;;;N;;;;;
+13080;EGYPTIAN HIEROGLYPH D010;Lo;0;L;;;;;N;;;;;
+13081;EGYPTIAN HIEROGLYPH D011;Lo;0;L;;;;;N;;;;;
+13082;EGYPTIAN HIEROGLYPH D012;Lo;0;L;;;;;N;;;;;
+13083;EGYPTIAN HIEROGLYPH D013;Lo;0;L;;;;;N;;;;;
+13084;EGYPTIAN HIEROGLYPH D014;Lo;0;L;;;;;N;;;;;
+13085;EGYPTIAN HIEROGLYPH D015;Lo;0;L;;;;;N;;;;;
+13086;EGYPTIAN HIEROGLYPH D016;Lo;0;L;;;;;N;;;;;
+13087;EGYPTIAN HIEROGLYPH D017;Lo;0;L;;;;;N;;;;;
+13088;EGYPTIAN HIEROGLYPH D018;Lo;0;L;;;;;N;;;;;
+13089;EGYPTIAN HIEROGLYPH D019;Lo;0;L;;;;;N;;;;;
+1308A;EGYPTIAN HIEROGLYPH D020;Lo;0;L;;;;;N;;;;;
+1308B;EGYPTIAN HIEROGLYPH D021;Lo;0;L;;;;;N;;;;;
+1308C;EGYPTIAN HIEROGLYPH D022;Lo;0;L;;;;;N;;;;;
+1308D;EGYPTIAN HIEROGLYPH D023;Lo;0;L;;;;;N;;;;;
+1308E;EGYPTIAN HIEROGLYPH D024;Lo;0;L;;;;;N;;;;;
+1308F;EGYPTIAN HIEROGLYPH D025;Lo;0;L;;;;;N;;;;;
+13090;EGYPTIAN HIEROGLYPH D026;Lo;0;L;;;;;N;;;;;
+13091;EGYPTIAN HIEROGLYPH D027;Lo;0;L;;;;;N;;;;;
+13092;EGYPTIAN HIEROGLYPH D027A;Lo;0;L;;;;;N;;;;;
+13093;EGYPTIAN HIEROGLYPH D028;Lo;0;L;;;;;N;;;;;
+13094;EGYPTIAN HIEROGLYPH D029;Lo;0;L;;;;;N;;;;;
+13095;EGYPTIAN HIEROGLYPH D030;Lo;0;L;;;;;N;;;;;
+13096;EGYPTIAN HIEROGLYPH D031;Lo;0;L;;;;;N;;;;;
+13097;EGYPTIAN HIEROGLYPH D031A;Lo;0;L;;;;;N;;;;;
+13098;EGYPTIAN HIEROGLYPH D032;Lo;0;L;;;;;N;;;;;
+13099;EGYPTIAN HIEROGLYPH D033;Lo;0;L;;;;;N;;;;;
+1309A;EGYPTIAN HIEROGLYPH D034;Lo;0;L;;;;;N;;;;;
+1309B;EGYPTIAN HIEROGLYPH D034A;Lo;0;L;;;;;N;;;;;
+1309C;EGYPTIAN HIEROGLYPH D035;Lo;0;L;;;;;N;;;;;
+1309D;EGYPTIAN HIEROGLYPH D036;Lo;0;L;;;;;N;;;;;
+1309E;EGYPTIAN HIEROGLYPH D037;Lo;0;L;;;;;N;;;;;
+1309F;EGYPTIAN HIEROGLYPH D038;Lo;0;L;;;;;N;;;;;
+130A0;EGYPTIAN HIEROGLYPH D039;Lo;0;L;;;;;N;;;;;
+130A1;EGYPTIAN HIEROGLYPH D040;Lo;0;L;;;;;N;;;;;
+130A2;EGYPTIAN HIEROGLYPH D041;Lo;0;L;;;;;N;;;;;
+130A3;EGYPTIAN HIEROGLYPH D042;Lo;0;L;;;;;N;;;;;
+130A4;EGYPTIAN HIEROGLYPH D043;Lo;0;L;;;;;N;;;;;
+130A5;EGYPTIAN HIEROGLYPH D044;Lo;0;L;;;;;N;;;;;
+130A6;EGYPTIAN HIEROGLYPH D045;Lo;0;L;;;;;N;;;;;
+130A7;EGYPTIAN HIEROGLYPH D046;Lo;0;L;;;;;N;;;;;
+130A8;EGYPTIAN HIEROGLYPH D046A;Lo;0;L;;;;;N;;;;;
+130A9;EGYPTIAN HIEROGLYPH D047;Lo;0;L;;;;;N;;;;;
+130AA;EGYPTIAN HIEROGLYPH D048;Lo;0;L;;;;;N;;;;;
+130AB;EGYPTIAN HIEROGLYPH D048A;Lo;0;L;;;;;N;;;;;
+130AC;EGYPTIAN HIEROGLYPH D049;Lo;0;L;;;;;N;;;;;
+130AD;EGYPTIAN HIEROGLYPH D050;Lo;0;L;;;;;N;;;;;
+130AE;EGYPTIAN HIEROGLYPH D050A;Lo;0;L;;;;;N;;;;;
+130AF;EGYPTIAN HIEROGLYPH D050B;Lo;0;L;;;;;N;;;;;
+130B0;EGYPTIAN HIEROGLYPH D050C;Lo;0;L;;;;;N;;;;;
+130B1;EGYPTIAN HIEROGLYPH D050D;Lo;0;L;;;;;N;;;;;
+130B2;EGYPTIAN HIEROGLYPH D050E;Lo;0;L;;;;;N;;;;;
+130B3;EGYPTIAN HIEROGLYPH D050F;Lo;0;L;;;;;N;;;;;
+130B4;EGYPTIAN HIEROGLYPH D050G;Lo;0;L;;;;;N;;;;;
+130B5;EGYPTIAN HIEROGLYPH D050H;Lo;0;L;;;;;N;;;;;
+130B6;EGYPTIAN HIEROGLYPH D050I;Lo;0;L;;;;;N;;;;;
+130B7;EGYPTIAN HIEROGLYPH D051;Lo;0;L;;;;;N;;;;;
+130B8;EGYPTIAN HIEROGLYPH D052;Lo;0;L;;;;;N;;;;;
+130B9;EGYPTIAN HIEROGLYPH D052A;Lo;0;L;;;;;N;;;;;
+130BA;EGYPTIAN HIEROGLYPH D053;Lo;0;L;;;;;N;;;;;
+130BB;EGYPTIAN HIEROGLYPH D054;Lo;0;L;;;;;N;;;;;
+130BC;EGYPTIAN HIEROGLYPH D054A;Lo;0;L;;;;;N;;;;;
+130BD;EGYPTIAN HIEROGLYPH D055;Lo;0;L;;;;;N;;;;;
+130BE;EGYPTIAN HIEROGLYPH D056;Lo;0;L;;;;;N;;;;;
+130BF;EGYPTIAN HIEROGLYPH D057;Lo;0;L;;;;;N;;;;;
+130C0;EGYPTIAN HIEROGLYPH D058;Lo;0;L;;;;;N;;;;;
+130C1;EGYPTIAN HIEROGLYPH D059;Lo;0;L;;;;;N;;;;;
+130C2;EGYPTIAN HIEROGLYPH D060;Lo;0;L;;;;;N;;;;;
+130C3;EGYPTIAN HIEROGLYPH D061;Lo;0;L;;;;;N;;;;;
+130C4;EGYPTIAN HIEROGLYPH D062;Lo;0;L;;;;;N;;;;;
+130C5;EGYPTIAN HIEROGLYPH D063;Lo;0;L;;;;;N;;;;;
+130C6;EGYPTIAN HIEROGLYPH D064;Lo;0;L;;;;;N;;;;;
+130C7;EGYPTIAN HIEROGLYPH D065;Lo;0;L;;;;;N;;;;;
+130C8;EGYPTIAN HIEROGLYPH D066;Lo;0;L;;;;;N;;;;;
+130C9;EGYPTIAN HIEROGLYPH D067;Lo;0;L;;;;;N;;;;;
+130CA;EGYPTIAN HIEROGLYPH D067A;Lo;0;L;;;;;N;;;;;
+130CB;EGYPTIAN HIEROGLYPH D067B;Lo;0;L;;;;;N;;;;;
+130CC;EGYPTIAN HIEROGLYPH D067C;Lo;0;L;;;;;N;;;;;
+130CD;EGYPTIAN HIEROGLYPH D067D;Lo;0;L;;;;;N;;;;;
+130CE;EGYPTIAN HIEROGLYPH D067E;Lo;0;L;;;;;N;;;;;
+130CF;EGYPTIAN HIEROGLYPH D067F;Lo;0;L;;;;;N;;;;;
+130D0;EGYPTIAN HIEROGLYPH D067G;Lo;0;L;;;;;N;;;;;
+130D1;EGYPTIAN HIEROGLYPH D067H;Lo;0;L;;;;;N;;;;;
+130D2;EGYPTIAN HIEROGLYPH E001;Lo;0;L;;;;;N;;;;;
+130D3;EGYPTIAN HIEROGLYPH E002;Lo;0;L;;;;;N;;;;;
+130D4;EGYPTIAN HIEROGLYPH E003;Lo;0;L;;;;;N;;;;;
+130D5;EGYPTIAN HIEROGLYPH E004;Lo;0;L;;;;;N;;;;;
+130D6;EGYPTIAN HIEROGLYPH E005;Lo;0;L;;;;;N;;;;;
+130D7;EGYPTIAN HIEROGLYPH E006;Lo;0;L;;;;;N;;;;;
+130D8;EGYPTIAN HIEROGLYPH E007;Lo;0;L;;;;;N;;;;;
+130D9;EGYPTIAN HIEROGLYPH E008;Lo;0;L;;;;;N;;;;;
+130DA;EGYPTIAN HIEROGLYPH E008A;Lo;0;L;;;;;N;;;;;
+130DB;EGYPTIAN HIEROGLYPH E009;Lo;0;L;;;;;N;;;;;
+130DC;EGYPTIAN HIEROGLYPH E009A;Lo;0;L;;;;;N;;;;;
+130DD;EGYPTIAN HIEROGLYPH E010;Lo;0;L;;;;;N;;;;;
+130DE;EGYPTIAN HIEROGLYPH E011;Lo;0;L;;;;;N;;;;;
+130DF;EGYPTIAN HIEROGLYPH E012;Lo;0;L;;;;;N;;;;;
+130E0;EGYPTIAN HIEROGLYPH E013;Lo;0;L;;;;;N;;;;;
+130E1;EGYPTIAN HIEROGLYPH E014;Lo;0;L;;;;;N;;;;;
+130E2;EGYPTIAN HIEROGLYPH E015;Lo;0;L;;;;;N;;;;;
+130E3;EGYPTIAN HIEROGLYPH E016;Lo;0;L;;;;;N;;;;;
+130E4;EGYPTIAN HIEROGLYPH E016A;Lo;0;L;;;;;N;;;;;
+130E5;EGYPTIAN HIEROGLYPH E017;Lo;0;L;;;;;N;;;;;
+130E6;EGYPTIAN HIEROGLYPH E017A;Lo;0;L;;;;;N;;;;;
+130E7;EGYPTIAN HIEROGLYPH E018;Lo;0;L;;;;;N;;;;;
+130E8;EGYPTIAN HIEROGLYPH E019;Lo;0;L;;;;;N;;;;;
+130E9;EGYPTIAN HIEROGLYPH E020;Lo;0;L;;;;;N;;;;;
+130EA;EGYPTIAN HIEROGLYPH E020A;Lo;0;L;;;;;N;;;;;
+130EB;EGYPTIAN HIEROGLYPH E021;Lo;0;L;;;;;N;;;;;
+130EC;EGYPTIAN HIEROGLYPH E022;Lo;0;L;;;;;N;;;;;
+130ED;EGYPTIAN HIEROGLYPH E023;Lo;0;L;;;;;N;;;;;
+130EE;EGYPTIAN HIEROGLYPH E024;Lo;0;L;;;;;N;;;;;
+130EF;EGYPTIAN HIEROGLYPH E025;Lo;0;L;;;;;N;;;;;
+130F0;EGYPTIAN HIEROGLYPH E026;Lo;0;L;;;;;N;;;;;
+130F1;EGYPTIAN HIEROGLYPH E027;Lo;0;L;;;;;N;;;;;
+130F2;EGYPTIAN HIEROGLYPH E028;Lo;0;L;;;;;N;;;;;
+130F3;EGYPTIAN HIEROGLYPH E028A;Lo;0;L;;;;;N;;;;;
+130F4;EGYPTIAN HIEROGLYPH E029;Lo;0;L;;;;;N;;;;;
+130F5;EGYPTIAN HIEROGLYPH E030;Lo;0;L;;;;;N;;;;;
+130F6;EGYPTIAN HIEROGLYPH E031;Lo;0;L;;;;;N;;;;;
+130F7;EGYPTIAN HIEROGLYPH E032;Lo;0;L;;;;;N;;;;;
+130F8;EGYPTIAN HIEROGLYPH E033;Lo;0;L;;;;;N;;;;;
+130F9;EGYPTIAN HIEROGLYPH E034;Lo;0;L;;;;;N;;;;;
+130FA;EGYPTIAN HIEROGLYPH E034A;Lo;0;L;;;;;N;;;;;
+130FB;EGYPTIAN HIEROGLYPH E036;Lo;0;L;;;;;N;;;;;
+130FC;EGYPTIAN HIEROGLYPH E037;Lo;0;L;;;;;N;;;;;
+130FD;EGYPTIAN HIEROGLYPH E038;Lo;0;L;;;;;N;;;;;
+130FE;EGYPTIAN HIEROGLYPH F001;Lo;0;L;;;;;N;;;;;
+130FF;EGYPTIAN HIEROGLYPH F001A;Lo;0;L;;;;;N;;;;;
+13100;EGYPTIAN HIEROGLYPH F002;Lo;0;L;;;;;N;;;;;
+13101;EGYPTIAN HIEROGLYPH F003;Lo;0;L;;;;;N;;;;;
+13102;EGYPTIAN HIEROGLYPH F004;Lo;0;L;;;;;N;;;;;
+13103;EGYPTIAN HIEROGLYPH F005;Lo;0;L;;;;;N;;;;;
+13104;EGYPTIAN HIEROGLYPH F006;Lo;0;L;;;;;N;;;;;
+13105;EGYPTIAN HIEROGLYPH F007;Lo;0;L;;;;;N;;;;;
+13106;EGYPTIAN HIEROGLYPH F008;Lo;0;L;;;;;N;;;;;
+13107;EGYPTIAN HIEROGLYPH F009;Lo;0;L;;;;;N;;;;;
+13108;EGYPTIAN HIEROGLYPH F010;Lo;0;L;;;;;N;;;;;
+13109;EGYPTIAN HIEROGLYPH F011;Lo;0;L;;;;;N;;;;;
+1310A;EGYPTIAN HIEROGLYPH F012;Lo;0;L;;;;;N;;;;;
+1310B;EGYPTIAN HIEROGLYPH F013;Lo;0;L;;;;;N;;;;;
+1310C;EGYPTIAN HIEROGLYPH F013A;Lo;0;L;;;;;N;;;;;
+1310D;EGYPTIAN HIEROGLYPH F014;Lo;0;L;;;;;N;;;;;
+1310E;EGYPTIAN HIEROGLYPH F015;Lo;0;L;;;;;N;;;;;
+1310F;EGYPTIAN HIEROGLYPH F016;Lo;0;L;;;;;N;;;;;
+13110;EGYPTIAN HIEROGLYPH F017;Lo;0;L;;;;;N;;;;;
+13111;EGYPTIAN HIEROGLYPH F018;Lo;0;L;;;;;N;;;;;
+13112;EGYPTIAN HIEROGLYPH F019;Lo;0;L;;;;;N;;;;;
+13113;EGYPTIAN HIEROGLYPH F020;Lo;0;L;;;;;N;;;;;
+13114;EGYPTIAN HIEROGLYPH F021;Lo;0;L;;;;;N;;;;;
+13115;EGYPTIAN HIEROGLYPH F021A;Lo;0;L;;;;;N;;;;;
+13116;EGYPTIAN HIEROGLYPH F022;Lo;0;L;;;;;N;;;;;
+13117;EGYPTIAN HIEROGLYPH F023;Lo;0;L;;;;;N;;;;;
+13118;EGYPTIAN HIEROGLYPH F024;Lo;0;L;;;;;N;;;;;
+13119;EGYPTIAN HIEROGLYPH F025;Lo;0;L;;;;;N;;;;;
+1311A;EGYPTIAN HIEROGLYPH F026;Lo;0;L;;;;;N;;;;;
+1311B;EGYPTIAN HIEROGLYPH F027;Lo;0;L;;;;;N;;;;;
+1311C;EGYPTIAN HIEROGLYPH F028;Lo;0;L;;;;;N;;;;;
+1311D;EGYPTIAN HIEROGLYPH F029;Lo;0;L;;;;;N;;;;;
+1311E;EGYPTIAN HIEROGLYPH F030;Lo;0;L;;;;;N;;;;;
+1311F;EGYPTIAN HIEROGLYPH F031;Lo;0;L;;;;;N;;;;;
+13120;EGYPTIAN HIEROGLYPH F031A;Lo;0;L;;;;;N;;;;;
+13121;EGYPTIAN HIEROGLYPH F032;Lo;0;L;;;;;N;;;;;
+13122;EGYPTIAN HIEROGLYPH F033;Lo;0;L;;;;;N;;;;;
+13123;EGYPTIAN HIEROGLYPH F034;Lo;0;L;;;;;N;;;;;
+13124;EGYPTIAN HIEROGLYPH F035;Lo;0;L;;;;;N;;;;;
+13125;EGYPTIAN HIEROGLYPH F036;Lo;0;L;;;;;N;;;;;
+13126;EGYPTIAN HIEROGLYPH F037;Lo;0;L;;;;;N;;;;;
+13127;EGYPTIAN HIEROGLYPH F037A;Lo;0;L;;;;;N;;;;;
+13128;EGYPTIAN HIEROGLYPH F038;Lo;0;L;;;;;N;;;;;
+13129;EGYPTIAN HIEROGLYPH F038A;Lo;0;L;;;;;N;;;;;
+1312A;EGYPTIAN HIEROGLYPH F039;Lo;0;L;;;;;N;;;;;
+1312B;EGYPTIAN HIEROGLYPH F040;Lo;0;L;;;;;N;;;;;
+1312C;EGYPTIAN HIEROGLYPH F041;Lo;0;L;;;;;N;;;;;
+1312D;EGYPTIAN HIEROGLYPH F042;Lo;0;L;;;;;N;;;;;
+1312E;EGYPTIAN HIEROGLYPH F043;Lo;0;L;;;;;N;;;;;
+1312F;EGYPTIAN HIEROGLYPH F044;Lo;0;L;;;;;N;;;;;
+13130;EGYPTIAN HIEROGLYPH F045;Lo;0;L;;;;;N;;;;;
+13131;EGYPTIAN HIEROGLYPH F045A;Lo;0;L;;;;;N;;;;;
+13132;EGYPTIAN HIEROGLYPH F046;Lo;0;L;;;;;N;;;;;
+13133;EGYPTIAN HIEROGLYPH F046A;Lo;0;L;;;;;N;;;;;
+13134;EGYPTIAN HIEROGLYPH F047;Lo;0;L;;;;;N;;;;;
+13135;EGYPTIAN HIEROGLYPH F047A;Lo;0;L;;;;;N;;;;;
+13136;EGYPTIAN HIEROGLYPH F048;Lo;0;L;;;;;N;;;;;
+13137;EGYPTIAN HIEROGLYPH F049;Lo;0;L;;;;;N;;;;;
+13138;EGYPTIAN HIEROGLYPH F050;Lo;0;L;;;;;N;;;;;
+13139;EGYPTIAN HIEROGLYPH F051;Lo;0;L;;;;;N;;;;;
+1313A;EGYPTIAN HIEROGLYPH F051A;Lo;0;L;;;;;N;;;;;
+1313B;EGYPTIAN HIEROGLYPH F051B;Lo;0;L;;;;;N;;;;;
+1313C;EGYPTIAN HIEROGLYPH F051C;Lo;0;L;;;;;N;;;;;
+1313D;EGYPTIAN HIEROGLYPH F052;Lo;0;L;;;;;N;;;;;
+1313E;EGYPTIAN HIEROGLYPH F053;Lo;0;L;;;;;N;;;;;
+1313F;EGYPTIAN HIEROGLYPH G001;Lo;0;L;;;;;N;;;;;
+13140;EGYPTIAN HIEROGLYPH G002;Lo;0;L;;;;;N;;;;;
+13141;EGYPTIAN HIEROGLYPH G003;Lo;0;L;;;;;N;;;;;
+13142;EGYPTIAN HIEROGLYPH G004;Lo;0;L;;;;;N;;;;;
+13143;EGYPTIAN HIEROGLYPH G005;Lo;0;L;;;;;N;;;;;
+13144;EGYPTIAN HIEROGLYPH G006;Lo;0;L;;;;;N;;;;;
+13145;EGYPTIAN HIEROGLYPH G006A;Lo;0;L;;;;;N;;;;;
+13146;EGYPTIAN HIEROGLYPH G007;Lo;0;L;;;;;N;;;;;
+13147;EGYPTIAN HIEROGLYPH G007A;Lo;0;L;;;;;N;;;;;
+13148;EGYPTIAN HIEROGLYPH G007B;Lo;0;L;;;;;N;;;;;
+13149;EGYPTIAN HIEROGLYPH G008;Lo;0;L;;;;;N;;;;;
+1314A;EGYPTIAN HIEROGLYPH G009;Lo;0;L;;;;;N;;;;;
+1314B;EGYPTIAN HIEROGLYPH G010;Lo;0;L;;;;;N;;;;;
+1314C;EGYPTIAN HIEROGLYPH G011;Lo;0;L;;;;;N;;;;;
+1314D;EGYPTIAN HIEROGLYPH G011A;Lo;0;L;;;;;N;;;;;
+1314E;EGYPTIAN HIEROGLYPH G012;Lo;0;L;;;;;N;;;;;
+1314F;EGYPTIAN HIEROGLYPH G013;Lo;0;L;;;;;N;;;;;
+13150;EGYPTIAN HIEROGLYPH G014;Lo;0;L;;;;;N;;;;;
+13151;EGYPTIAN HIEROGLYPH G015;Lo;0;L;;;;;N;;;;;
+13152;EGYPTIAN HIEROGLYPH G016;Lo;0;L;;;;;N;;;;;
+13153;EGYPTIAN HIEROGLYPH G017;Lo;0;L;;;;;N;;;;;
+13154;EGYPTIAN HIEROGLYPH G018;Lo;0;L;;;;;N;;;;;
+13155;EGYPTIAN HIEROGLYPH G019;Lo;0;L;;;;;N;;;;;
+13156;EGYPTIAN HIEROGLYPH G020;Lo;0;L;;;;;N;;;;;
+13157;EGYPTIAN HIEROGLYPH G020A;Lo;0;L;;;;;N;;;;;
+13158;EGYPTIAN HIEROGLYPH G021;Lo;0;L;;;;;N;;;;;
+13159;EGYPTIAN HIEROGLYPH G022;Lo;0;L;;;;;N;;;;;
+1315A;EGYPTIAN HIEROGLYPH G023;Lo;0;L;;;;;N;;;;;
+1315B;EGYPTIAN HIEROGLYPH G024;Lo;0;L;;;;;N;;;;;
+1315C;EGYPTIAN HIEROGLYPH G025;Lo;0;L;;;;;N;;;;;
+1315D;EGYPTIAN HIEROGLYPH G026;Lo;0;L;;;;;N;;;;;
+1315E;EGYPTIAN HIEROGLYPH G026A;Lo;0;L;;;;;N;;;;;
+1315F;EGYPTIAN HIEROGLYPH G027;Lo;0;L;;;;;N;;;;;
+13160;EGYPTIAN HIEROGLYPH G028;Lo;0;L;;;;;N;;;;;
+13161;EGYPTIAN HIEROGLYPH G029;Lo;0;L;;;;;N;;;;;
+13162;EGYPTIAN HIEROGLYPH G030;Lo;0;L;;;;;N;;;;;
+13163;EGYPTIAN HIEROGLYPH G031;Lo;0;L;;;;;N;;;;;
+13164;EGYPTIAN HIEROGLYPH G032;Lo;0;L;;;;;N;;;;;
+13165;EGYPTIAN HIEROGLYPH G033;Lo;0;L;;;;;N;;;;;
+13166;EGYPTIAN HIEROGLYPH G034;Lo;0;L;;;;;N;;;;;
+13167;EGYPTIAN HIEROGLYPH G035;Lo;0;L;;;;;N;;;;;
+13168;EGYPTIAN HIEROGLYPH G036;Lo;0;L;;;;;N;;;;;
+13169;EGYPTIAN HIEROGLYPH G036A;Lo;0;L;;;;;N;;;;;
+1316A;EGYPTIAN HIEROGLYPH G037;Lo;0;L;;;;;N;;;;;
+1316B;EGYPTIAN HIEROGLYPH G037A;Lo;0;L;;;;;N;;;;;
+1316C;EGYPTIAN HIEROGLYPH G038;Lo;0;L;;;;;N;;;;;
+1316D;EGYPTIAN HIEROGLYPH G039;Lo;0;L;;;;;N;;;;;
+1316E;EGYPTIAN HIEROGLYPH G040;Lo;0;L;;;;;N;;;;;
+1316F;EGYPTIAN HIEROGLYPH G041;Lo;0;L;;;;;N;;;;;
+13170;EGYPTIAN HIEROGLYPH G042;Lo;0;L;;;;;N;;;;;
+13171;EGYPTIAN HIEROGLYPH G043;Lo;0;L;;;;;N;;;;;
+13172;EGYPTIAN HIEROGLYPH G043A;Lo;0;L;;;;;N;;;;;
+13173;EGYPTIAN HIEROGLYPH G044;Lo;0;L;;;;;N;;;;;
+13174;EGYPTIAN HIEROGLYPH G045;Lo;0;L;;;;;N;;;;;
+13175;EGYPTIAN HIEROGLYPH G045A;Lo;0;L;;;;;N;;;;;
+13176;EGYPTIAN HIEROGLYPH G046;Lo;0;L;;;;;N;;;;;
+13177;EGYPTIAN HIEROGLYPH G047;Lo;0;L;;;;;N;;;;;
+13178;EGYPTIAN HIEROGLYPH G048;Lo;0;L;;;;;N;;;;;
+13179;EGYPTIAN HIEROGLYPH G049;Lo;0;L;;;;;N;;;;;
+1317A;EGYPTIAN HIEROGLYPH G050;Lo;0;L;;;;;N;;;;;
+1317B;EGYPTIAN HIEROGLYPH G051;Lo;0;L;;;;;N;;;;;
+1317C;EGYPTIAN HIEROGLYPH G052;Lo;0;L;;;;;N;;;;;
+1317D;EGYPTIAN HIEROGLYPH G053;Lo;0;L;;;;;N;;;;;
+1317E;EGYPTIAN HIEROGLYPH G054;Lo;0;L;;;;;N;;;;;
+1317F;EGYPTIAN HIEROGLYPH H001;Lo;0;L;;;;;N;;;;;
+13180;EGYPTIAN HIEROGLYPH H002;Lo;0;L;;;;;N;;;;;
+13181;EGYPTIAN HIEROGLYPH H003;Lo;0;L;;;;;N;;;;;
+13182;EGYPTIAN HIEROGLYPH H004;Lo;0;L;;;;;N;;;;;
+13183;EGYPTIAN HIEROGLYPH H005;Lo;0;L;;;;;N;;;;;
+13184;EGYPTIAN HIEROGLYPH H006;Lo;0;L;;;;;N;;;;;
+13185;EGYPTIAN HIEROGLYPH H006A;Lo;0;L;;;;;N;;;;;
+13186;EGYPTIAN HIEROGLYPH H007;Lo;0;L;;;;;N;;;;;
+13187;EGYPTIAN HIEROGLYPH H008;Lo;0;L;;;;;N;;;;;
+13188;EGYPTIAN HIEROGLYPH I001;Lo;0;L;;;;;N;;;;;
+13189;EGYPTIAN HIEROGLYPH I002;Lo;0;L;;;;;N;;;;;
+1318A;EGYPTIAN HIEROGLYPH I003;Lo;0;L;;;;;N;;;;;
+1318B;EGYPTIAN HIEROGLYPH I004;Lo;0;L;;;;;N;;;;;
+1318C;EGYPTIAN HIEROGLYPH I005;Lo;0;L;;;;;N;;;;;
+1318D;EGYPTIAN HIEROGLYPH I005A;Lo;0;L;;;;;N;;;;;
+1318E;EGYPTIAN HIEROGLYPH I006;Lo;0;L;;;;;N;;;;;
+1318F;EGYPTIAN HIEROGLYPH I007;Lo;0;L;;;;;N;;;;;
+13190;EGYPTIAN HIEROGLYPH I008;Lo;0;L;;;;;N;;;;;
+13191;EGYPTIAN HIEROGLYPH I009;Lo;0;L;;;;;N;;;;;
+13192;EGYPTIAN HIEROGLYPH I009A;Lo;0;L;;;;;N;;;;;
+13193;EGYPTIAN HIEROGLYPH I010;Lo;0;L;;;;;N;;;;;
+13194;EGYPTIAN HIEROGLYPH I010A;Lo;0;L;;;;;N;;;;;
+13195;EGYPTIAN HIEROGLYPH I011;Lo;0;L;;;;;N;;;;;
+13196;EGYPTIAN HIEROGLYPH I011A;Lo;0;L;;;;;N;;;;;
+13197;EGYPTIAN HIEROGLYPH I012;Lo;0;L;;;;;N;;;;;
+13198;EGYPTIAN HIEROGLYPH I013;Lo;0;L;;;;;N;;;;;
+13199;EGYPTIAN HIEROGLYPH I014;Lo;0;L;;;;;N;;;;;
+1319A;EGYPTIAN HIEROGLYPH I015;Lo;0;L;;;;;N;;;;;
+1319B;EGYPTIAN HIEROGLYPH K001;Lo;0;L;;;;;N;;;;;
+1319C;EGYPTIAN HIEROGLYPH K002;Lo;0;L;;;;;N;;;;;
+1319D;EGYPTIAN HIEROGLYPH K003;Lo;0;L;;;;;N;;;;;
+1319E;EGYPTIAN HIEROGLYPH K004;Lo;0;L;;;;;N;;;;;
+1319F;EGYPTIAN HIEROGLYPH K005;Lo;0;L;;;;;N;;;;;
+131A0;EGYPTIAN HIEROGLYPH K006;Lo;0;L;;;;;N;;;;;
+131A1;EGYPTIAN HIEROGLYPH K007;Lo;0;L;;;;;N;;;;;
+131A2;EGYPTIAN HIEROGLYPH K008;Lo;0;L;;;;;N;;;;;
+131A3;EGYPTIAN HIEROGLYPH L001;Lo;0;L;;;;;N;;;;;
+131A4;EGYPTIAN HIEROGLYPH L002;Lo;0;L;;;;;N;;;;;
+131A5;EGYPTIAN HIEROGLYPH L002A;Lo;0;L;;;;;N;;;;;
+131A6;EGYPTIAN HIEROGLYPH L003;Lo;0;L;;;;;N;;;;;
+131A7;EGYPTIAN HIEROGLYPH L004;Lo;0;L;;;;;N;;;;;
+131A8;EGYPTIAN HIEROGLYPH L005;Lo;0;L;;;;;N;;;;;
+131A9;EGYPTIAN HIEROGLYPH L006;Lo;0;L;;;;;N;;;;;
+131AA;EGYPTIAN HIEROGLYPH L006A;Lo;0;L;;;;;N;;;;;
+131AB;EGYPTIAN HIEROGLYPH L007;Lo;0;L;;;;;N;;;;;
+131AC;EGYPTIAN HIEROGLYPH L008;Lo;0;L;;;;;N;;;;;
+131AD;EGYPTIAN HIEROGLYPH M001;Lo;0;L;;;;;N;;;;;
+131AE;EGYPTIAN HIEROGLYPH M001A;Lo;0;L;;;;;N;;;;;
+131AF;EGYPTIAN HIEROGLYPH M001B;Lo;0;L;;;;;N;;;;;
+131B0;EGYPTIAN HIEROGLYPH M002;Lo;0;L;;;;;N;;;;;
+131B1;EGYPTIAN HIEROGLYPH M003;Lo;0;L;;;;;N;;;;;
+131B2;EGYPTIAN HIEROGLYPH M003A;Lo;0;L;;;;;N;;;;;
+131B3;EGYPTIAN HIEROGLYPH M004;Lo;0;L;;;;;N;;;;;
+131B4;EGYPTIAN HIEROGLYPH M005;Lo;0;L;;;;;N;;;;;
+131B5;EGYPTIAN HIEROGLYPH M006;Lo;0;L;;;;;N;;;;;
+131B6;EGYPTIAN HIEROGLYPH M007;Lo;0;L;;;;;N;;;;;
+131B7;EGYPTIAN HIEROGLYPH M008;Lo;0;L;;;;;N;;;;;
+131B8;EGYPTIAN HIEROGLYPH M009;Lo;0;L;;;;;N;;;;;
+131B9;EGYPTIAN HIEROGLYPH M010;Lo;0;L;;;;;N;;;;;
+131BA;EGYPTIAN HIEROGLYPH M010A;Lo;0;L;;;;;N;;;;;
+131BB;EGYPTIAN HIEROGLYPH M011;Lo;0;L;;;;;N;;;;;
+131BC;EGYPTIAN HIEROGLYPH M012;Lo;0;L;;;;;N;;;;;
+131BD;EGYPTIAN HIEROGLYPH M012A;Lo;0;L;;;;;N;;;;;
+131BE;EGYPTIAN HIEROGLYPH M012B;Lo;0;L;;;;;N;;;;;
+131BF;EGYPTIAN HIEROGLYPH M012C;Lo;0;L;;;;;N;;;;;
+131C0;EGYPTIAN HIEROGLYPH M012D;Lo;0;L;;;;;N;;;;;
+131C1;EGYPTIAN HIEROGLYPH M012E;Lo;0;L;;;;;N;;;;;
+131C2;EGYPTIAN HIEROGLYPH M012F;Lo;0;L;;;;;N;;;;;
+131C3;EGYPTIAN HIEROGLYPH M012G;Lo;0;L;;;;;N;;;;;
+131C4;EGYPTIAN HIEROGLYPH M012H;Lo;0;L;;;;;N;;;;;
+131C5;EGYPTIAN HIEROGLYPH M013;Lo;0;L;;;;;N;;;;;
+131C6;EGYPTIAN HIEROGLYPH M014;Lo;0;L;;;;;N;;;;;
+131C7;EGYPTIAN HIEROGLYPH M015;Lo;0;L;;;;;N;;;;;
+131C8;EGYPTIAN HIEROGLYPH M015A;Lo;0;L;;;;;N;;;;;
+131C9;EGYPTIAN HIEROGLYPH M016;Lo;0;L;;;;;N;;;;;
+131CA;EGYPTIAN HIEROGLYPH M016A;Lo;0;L;;;;;N;;;;;
+131CB;EGYPTIAN HIEROGLYPH M017;Lo;0;L;;;;;N;;;;;
+131CC;EGYPTIAN HIEROGLYPH M017A;Lo;0;L;;;;;N;;;;;
+131CD;EGYPTIAN HIEROGLYPH M018;Lo;0;L;;;;;N;;;;;
+131CE;EGYPTIAN HIEROGLYPH M019;Lo;0;L;;;;;N;;;;;
+131CF;EGYPTIAN HIEROGLYPH M020;Lo;0;L;;;;;N;;;;;
+131D0;EGYPTIAN HIEROGLYPH M021;Lo;0;L;;;;;N;;;;;
+131D1;EGYPTIAN HIEROGLYPH M022;Lo;0;L;;;;;N;;;;;
+131D2;EGYPTIAN HIEROGLYPH M022A;Lo;0;L;;;;;N;;;;;
+131D3;EGYPTIAN HIEROGLYPH M023;Lo;0;L;;;;;N;;;;;
+131D4;EGYPTIAN HIEROGLYPH M024;Lo;0;L;;;;;N;;;;;
+131D5;EGYPTIAN HIEROGLYPH M024A;Lo;0;L;;;;;N;;;;;
+131D6;EGYPTIAN HIEROGLYPH M025;Lo;0;L;;;;;N;;;;;
+131D7;EGYPTIAN HIEROGLYPH M026;Lo;0;L;;;;;N;;;;;
+131D8;EGYPTIAN HIEROGLYPH M027;Lo;0;L;;;;;N;;;;;
+131D9;EGYPTIAN HIEROGLYPH M028;Lo;0;L;;;;;N;;;;;
+131DA;EGYPTIAN HIEROGLYPH M028A;Lo;0;L;;;;;N;;;;;
+131DB;EGYPTIAN HIEROGLYPH M029;Lo;0;L;;;;;N;;;;;
+131DC;EGYPTIAN HIEROGLYPH M030;Lo;0;L;;;;;N;;;;;
+131DD;EGYPTIAN HIEROGLYPH M031;Lo;0;L;;;;;N;;;;;
+131DE;EGYPTIAN HIEROGLYPH M031A;Lo;0;L;;;;;N;;;;;
+131DF;EGYPTIAN HIEROGLYPH M032;Lo;0;L;;;;;N;;;;;
+131E0;EGYPTIAN HIEROGLYPH M033;Lo;0;L;;;;;N;;;;;
+131E1;EGYPTIAN HIEROGLYPH M033A;Lo;0;L;;;;;N;;;;;
+131E2;EGYPTIAN HIEROGLYPH M033B;Lo;0;L;;;;;N;;;;;
+131E3;EGYPTIAN HIEROGLYPH M034;Lo;0;L;;;;;N;;;;;
+131E4;EGYPTIAN HIEROGLYPH M035;Lo;0;L;;;;;N;;;;;
+131E5;EGYPTIAN HIEROGLYPH M036;Lo;0;L;;;;;N;;;;;
+131E6;EGYPTIAN HIEROGLYPH M037;Lo;0;L;;;;;N;;;;;
+131E7;EGYPTIAN HIEROGLYPH M038;Lo;0;L;;;;;N;;;;;
+131E8;EGYPTIAN HIEROGLYPH M039;Lo;0;L;;;;;N;;;;;
+131E9;EGYPTIAN HIEROGLYPH M040;Lo;0;L;;;;;N;;;;;
+131EA;EGYPTIAN HIEROGLYPH M040A;Lo;0;L;;;;;N;;;;;
+131EB;EGYPTIAN HIEROGLYPH M041;Lo;0;L;;;;;N;;;;;
+131EC;EGYPTIAN HIEROGLYPH M042;Lo;0;L;;;;;N;;;;;
+131ED;EGYPTIAN HIEROGLYPH M043;Lo;0;L;;;;;N;;;;;
+131EE;EGYPTIAN HIEROGLYPH M044;Lo;0;L;;;;;N;;;;;
+131EF;EGYPTIAN HIEROGLYPH N001;Lo;0;L;;;;;N;;;;;
+131F0;EGYPTIAN HIEROGLYPH N002;Lo;0;L;;;;;N;;;;;
+131F1;EGYPTIAN HIEROGLYPH N003;Lo;0;L;;;;;N;;;;;
+131F2;EGYPTIAN HIEROGLYPH N004;Lo;0;L;;;;;N;;;;;
+131F3;EGYPTIAN HIEROGLYPH N005;Lo;0;L;;;;;N;;;;;
+131F4;EGYPTIAN HIEROGLYPH N006;Lo;0;L;;;;;N;;;;;
+131F5;EGYPTIAN HIEROGLYPH N007;Lo;0;L;;;;;N;;;;;
+131F6;EGYPTIAN HIEROGLYPH N008;Lo;0;L;;;;;N;;;;;
+131F7;EGYPTIAN HIEROGLYPH N009;Lo;0;L;;;;;N;;;;;
+131F8;EGYPTIAN HIEROGLYPH N010;Lo;0;L;;;;;N;;;;;
+131F9;EGYPTIAN HIEROGLYPH N011;Lo;0;L;;;;;N;;;;;
+131FA;EGYPTIAN HIEROGLYPH N012;Lo;0;L;;;;;N;;;;;
+131FB;EGYPTIAN HIEROGLYPH N013;Lo;0;L;;;;;N;;;;;
+131FC;EGYPTIAN HIEROGLYPH N014;Lo;0;L;;;;;N;;;;;
+131FD;EGYPTIAN HIEROGLYPH N015;Lo;0;L;;;;;N;;;;;
+131FE;EGYPTIAN HIEROGLYPH N016;Lo;0;L;;;;;N;;;;;
+131FF;EGYPTIAN HIEROGLYPH N017;Lo;0;L;;;;;N;;;;;
+13200;EGYPTIAN HIEROGLYPH N018;Lo;0;L;;;;;N;;;;;
+13201;EGYPTIAN HIEROGLYPH N018A;Lo;0;L;;;;;N;;;;;
+13202;EGYPTIAN HIEROGLYPH N018B;Lo;0;L;;;;;N;;;;;
+13203;EGYPTIAN HIEROGLYPH N019;Lo;0;L;;;;;N;;;;;
+13204;EGYPTIAN HIEROGLYPH N020;Lo;0;L;;;;;N;;;;;
+13205;EGYPTIAN HIEROGLYPH N021;Lo;0;L;;;;;N;;;;;
+13206;EGYPTIAN HIEROGLYPH N022;Lo;0;L;;;;;N;;;;;
+13207;EGYPTIAN HIEROGLYPH N023;Lo;0;L;;;;;N;;;;;
+13208;EGYPTIAN HIEROGLYPH N024;Lo;0;L;;;;;N;;;;;
+13209;EGYPTIAN HIEROGLYPH N025;Lo;0;L;;;;;N;;;;;
+1320A;EGYPTIAN HIEROGLYPH N025A;Lo;0;L;;;;;N;;;;;
+1320B;EGYPTIAN HIEROGLYPH N026;Lo;0;L;;;;;N;;;;;
+1320C;EGYPTIAN HIEROGLYPH N027;Lo;0;L;;;;;N;;;;;
+1320D;EGYPTIAN HIEROGLYPH N028;Lo;0;L;;;;;N;;;;;
+1320E;EGYPTIAN HIEROGLYPH N029;Lo;0;L;;;;;N;;;;;
+1320F;EGYPTIAN HIEROGLYPH N030;Lo;0;L;;;;;N;;;;;
+13210;EGYPTIAN HIEROGLYPH N031;Lo;0;L;;;;;N;;;;;
+13211;EGYPTIAN HIEROGLYPH N032;Lo;0;L;;;;;N;;;;;
+13212;EGYPTIAN HIEROGLYPH N033;Lo;0;L;;;;;N;;;;;
+13213;EGYPTIAN HIEROGLYPH N033A;Lo;0;L;;;;;N;;;;;
+13214;EGYPTIAN HIEROGLYPH N034;Lo;0;L;;;;;N;;;;;
+13215;EGYPTIAN HIEROGLYPH N034A;Lo;0;L;;;;;N;;;;;
+13216;EGYPTIAN HIEROGLYPH N035;Lo;0;L;;;;;N;;;;;
+13217;EGYPTIAN HIEROGLYPH N035A;Lo;0;L;;;;;N;;;;;
+13218;EGYPTIAN HIEROGLYPH N036;Lo;0;L;;;;;N;;;;;
+13219;EGYPTIAN HIEROGLYPH N037;Lo;0;L;;;;;N;;;;;
+1321A;EGYPTIAN HIEROGLYPH N037A;Lo;0;L;;;;;N;;;;;
+1321B;EGYPTIAN HIEROGLYPH N038;Lo;0;L;;;;;N;;;;;
+1321C;EGYPTIAN HIEROGLYPH N039;Lo;0;L;;;;;N;;;;;
+1321D;EGYPTIAN HIEROGLYPH N040;Lo;0;L;;;;;N;;;;;
+1321E;EGYPTIAN HIEROGLYPH N041;Lo;0;L;;;;;N;;;;;
+1321F;EGYPTIAN HIEROGLYPH N042;Lo;0;L;;;;;N;;;;;
+13220;EGYPTIAN HIEROGLYPH NL001;Lo;0;L;;;;;N;;;;;
+13221;EGYPTIAN HIEROGLYPH NL002;Lo;0;L;;;;;N;;;;;
+13222;EGYPTIAN HIEROGLYPH NL003;Lo;0;L;;;;;N;;;;;
+13223;EGYPTIAN HIEROGLYPH NL004;Lo;0;L;;;;;N;;;;;
+13224;EGYPTIAN HIEROGLYPH NL005;Lo;0;L;;;;;N;;;;;
+13225;EGYPTIAN HIEROGLYPH NL005A;Lo;0;L;;;;;N;;;;;
+13226;EGYPTIAN HIEROGLYPH NL006;Lo;0;L;;;;;N;;;;;
+13227;EGYPTIAN HIEROGLYPH NL007;Lo;0;L;;;;;N;;;;;
+13228;EGYPTIAN HIEROGLYPH NL008;Lo;0;L;;;;;N;;;;;
+13229;EGYPTIAN HIEROGLYPH NL009;Lo;0;L;;;;;N;;;;;
+1322A;EGYPTIAN HIEROGLYPH NL010;Lo;0;L;;;;;N;;;;;
+1322B;EGYPTIAN HIEROGLYPH NL011;Lo;0;L;;;;;N;;;;;
+1322C;EGYPTIAN HIEROGLYPH NL012;Lo;0;L;;;;;N;;;;;
+1322D;EGYPTIAN HIEROGLYPH NL013;Lo;0;L;;;;;N;;;;;
+1322E;EGYPTIAN HIEROGLYPH NL014;Lo;0;L;;;;;N;;;;;
+1322F;EGYPTIAN HIEROGLYPH NL015;Lo;0;L;;;;;N;;;;;
+13230;EGYPTIAN HIEROGLYPH NL016;Lo;0;L;;;;;N;;;;;
+13231;EGYPTIAN HIEROGLYPH NL017;Lo;0;L;;;;;N;;;;;
+13232;EGYPTIAN HIEROGLYPH NL017A;Lo;0;L;;;;;N;;;;;
+13233;EGYPTIAN HIEROGLYPH NL018;Lo;0;L;;;;;N;;;;;
+13234;EGYPTIAN HIEROGLYPH NL019;Lo;0;L;;;;;N;;;;;
+13235;EGYPTIAN HIEROGLYPH NL020;Lo;0;L;;;;;N;;;;;
+13236;EGYPTIAN HIEROGLYPH NU001;Lo;0;L;;;;;N;;;;;
+13237;EGYPTIAN HIEROGLYPH NU002;Lo;0;L;;;;;N;;;;;
+13238;EGYPTIAN HIEROGLYPH NU003;Lo;0;L;;;;;N;;;;;
+13239;EGYPTIAN HIEROGLYPH NU004;Lo;0;L;;;;;N;;;;;
+1323A;EGYPTIAN HIEROGLYPH NU005;Lo;0;L;;;;;N;;;;;
+1323B;EGYPTIAN HIEROGLYPH NU006;Lo;0;L;;;;;N;;;;;
+1323C;EGYPTIAN HIEROGLYPH NU007;Lo;0;L;;;;;N;;;;;
+1323D;EGYPTIAN HIEROGLYPH NU008;Lo;0;L;;;;;N;;;;;
+1323E;EGYPTIAN HIEROGLYPH NU009;Lo;0;L;;;;;N;;;;;
+1323F;EGYPTIAN HIEROGLYPH NU010;Lo;0;L;;;;;N;;;;;
+13240;EGYPTIAN HIEROGLYPH NU010A;Lo;0;L;;;;;N;;;;;
+13241;EGYPTIAN HIEROGLYPH NU011;Lo;0;L;;;;;N;;;;;
+13242;EGYPTIAN HIEROGLYPH NU011A;Lo;0;L;;;;;N;;;;;
+13243;EGYPTIAN HIEROGLYPH NU012;Lo;0;L;;;;;N;;;;;
+13244;EGYPTIAN HIEROGLYPH NU013;Lo;0;L;;;;;N;;;;;
+13245;EGYPTIAN HIEROGLYPH NU014;Lo;0;L;;;;;N;;;;;
+13246;EGYPTIAN HIEROGLYPH NU015;Lo;0;L;;;;;N;;;;;
+13247;EGYPTIAN HIEROGLYPH NU016;Lo;0;L;;;;;N;;;;;
+13248;EGYPTIAN HIEROGLYPH NU017;Lo;0;L;;;;;N;;;;;
+13249;EGYPTIAN HIEROGLYPH NU018;Lo;0;L;;;;;N;;;;;
+1324A;EGYPTIAN HIEROGLYPH NU018A;Lo;0;L;;;;;N;;;;;
+1324B;EGYPTIAN HIEROGLYPH NU019;Lo;0;L;;;;;N;;;;;
+1324C;EGYPTIAN HIEROGLYPH NU020;Lo;0;L;;;;;N;;;;;
+1324D;EGYPTIAN HIEROGLYPH NU021;Lo;0;L;;;;;N;;;;;
+1324E;EGYPTIAN HIEROGLYPH NU022;Lo;0;L;;;;;N;;;;;
+1324F;EGYPTIAN HIEROGLYPH NU022A;Lo;0;L;;;;;N;;;;;
+13250;EGYPTIAN HIEROGLYPH O001;Lo;0;L;;;;;N;;;;;
+13251;EGYPTIAN HIEROGLYPH O001A;Lo;0;L;;;;;N;;;;;
+13252;EGYPTIAN HIEROGLYPH O002;Lo;0;L;;;;;N;;;;;
+13253;EGYPTIAN HIEROGLYPH O003;Lo;0;L;;;;;N;;;;;
+13254;EGYPTIAN HIEROGLYPH O004;Lo;0;L;;;;;N;;;;;
+13255;EGYPTIAN HIEROGLYPH O005;Lo;0;L;;;;;N;;;;;
+13256;EGYPTIAN HIEROGLYPH O005A;Lo;0;L;;;;;N;;;;;
+13257;EGYPTIAN HIEROGLYPH O006;Lo;0;L;;;;;N;;;;;
+13258;EGYPTIAN HIEROGLYPH O006A;Lo;0;L;;;;;N;;;;;
+13259;EGYPTIAN HIEROGLYPH O006B;Lo;0;L;;;;;N;;;;;
+1325A;EGYPTIAN HIEROGLYPH O006C;Lo;0;L;;;;;N;;;;;
+1325B;EGYPTIAN HIEROGLYPH O006D;Lo;0;L;;;;;N;;;;;
+1325C;EGYPTIAN HIEROGLYPH O006E;Lo;0;L;;;;;N;;;;;
+1325D;EGYPTIAN HIEROGLYPH O006F;Lo;0;L;;;;;N;;;;;
+1325E;EGYPTIAN HIEROGLYPH O007;Lo;0;L;;;;;N;;;;;
+1325F;EGYPTIAN HIEROGLYPH O008;Lo;0;L;;;;;N;;;;;
+13260;EGYPTIAN HIEROGLYPH O009;Lo;0;L;;;;;N;;;;;
+13261;EGYPTIAN HIEROGLYPH O010;Lo;0;L;;;;;N;;;;;
+13262;EGYPTIAN HIEROGLYPH O010A;Lo;0;L;;;;;N;;;;;
+13263;EGYPTIAN HIEROGLYPH O010B;Lo;0;L;;;;;N;;;;;
+13264;EGYPTIAN HIEROGLYPH O010C;Lo;0;L;;;;;N;;;;;
+13265;EGYPTIAN HIEROGLYPH O011;Lo;0;L;;;;;N;;;;;
+13266;EGYPTIAN HIEROGLYPH O012;Lo;0;L;;;;;N;;;;;
+13267;EGYPTIAN HIEROGLYPH O013;Lo;0;L;;;;;N;;;;;
+13268;EGYPTIAN HIEROGLYPH O014;Lo;0;L;;;;;N;;;;;
+13269;EGYPTIAN HIEROGLYPH O015;Lo;0;L;;;;;N;;;;;
+1326A;EGYPTIAN HIEROGLYPH O016;Lo;0;L;;;;;N;;;;;
+1326B;EGYPTIAN HIEROGLYPH O017;Lo;0;L;;;;;N;;;;;
+1326C;EGYPTIAN HIEROGLYPH O018;Lo;0;L;;;;;N;;;;;
+1326D;EGYPTIAN HIEROGLYPH O019;Lo;0;L;;;;;N;;;;;
+1326E;EGYPTIAN HIEROGLYPH O019A;Lo;0;L;;;;;N;;;;;
+1326F;EGYPTIAN HIEROGLYPH O020;Lo;0;L;;;;;N;;;;;
+13270;EGYPTIAN HIEROGLYPH O020A;Lo;0;L;;;;;N;;;;;
+13271;EGYPTIAN HIEROGLYPH O021;Lo;0;L;;;;;N;;;;;
+13272;EGYPTIAN HIEROGLYPH O022;Lo;0;L;;;;;N;;;;;
+13273;EGYPTIAN HIEROGLYPH O023;Lo;0;L;;;;;N;;;;;
+13274;EGYPTIAN HIEROGLYPH O024;Lo;0;L;;;;;N;;;;;
+13275;EGYPTIAN HIEROGLYPH O024A;Lo;0;L;;;;;N;;;;;
+13276;EGYPTIAN HIEROGLYPH O025;Lo;0;L;;;;;N;;;;;
+13277;EGYPTIAN HIEROGLYPH O025A;Lo;0;L;;;;;N;;;;;
+13278;EGYPTIAN HIEROGLYPH O026;Lo;0;L;;;;;N;;;;;
+13279;EGYPTIAN HIEROGLYPH O027;Lo;0;L;;;;;N;;;;;
+1327A;EGYPTIAN HIEROGLYPH O028;Lo;0;L;;;;;N;;;;;
+1327B;EGYPTIAN HIEROGLYPH O029;Lo;0;L;;;;;N;;;;;
+1327C;EGYPTIAN HIEROGLYPH O029A;Lo;0;L;;;;;N;;;;;
+1327D;EGYPTIAN HIEROGLYPH O030;Lo;0;L;;;;;N;;;;;
+1327E;EGYPTIAN HIEROGLYPH O030A;Lo;0;L;;;;;N;;;;;
+1327F;EGYPTIAN HIEROGLYPH O031;Lo;0;L;;;;;N;;;;;
+13280;EGYPTIAN HIEROGLYPH O032;Lo;0;L;;;;;N;;;;;
+13281;EGYPTIAN HIEROGLYPH O033;Lo;0;L;;;;;N;;;;;
+13282;EGYPTIAN HIEROGLYPH O033A;Lo;0;L;;;;;N;;;;;
+13283;EGYPTIAN HIEROGLYPH O034;Lo;0;L;;;;;N;;;;;
+13284;EGYPTIAN HIEROGLYPH O035;Lo;0;L;;;;;N;;;;;
+13285;EGYPTIAN HIEROGLYPH O036;Lo;0;L;;;;;N;;;;;
+13286;EGYPTIAN HIEROGLYPH O036A;Lo;0;L;;;;;N;;;;;
+13287;EGYPTIAN HIEROGLYPH O036B;Lo;0;L;;;;;N;;;;;
+13288;EGYPTIAN HIEROGLYPH O036C;Lo;0;L;;;;;N;;;;;
+13289;EGYPTIAN HIEROGLYPH O036D;Lo;0;L;;;;;N;;;;;
+1328A;EGYPTIAN HIEROGLYPH O037;Lo;0;L;;;;;N;;;;;
+1328B;EGYPTIAN HIEROGLYPH O038;Lo;0;L;;;;;N;;;;;
+1328C;EGYPTIAN HIEROGLYPH O039;Lo;0;L;;;;;N;;;;;
+1328D;EGYPTIAN HIEROGLYPH O040;Lo;0;L;;;;;N;;;;;
+1328E;EGYPTIAN HIEROGLYPH O041;Lo;0;L;;;;;N;;;;;
+1328F;EGYPTIAN HIEROGLYPH O042;Lo;0;L;;;;;N;;;;;
+13290;EGYPTIAN HIEROGLYPH O043;Lo;0;L;;;;;N;;;;;
+13291;EGYPTIAN HIEROGLYPH O044;Lo;0;L;;;;;N;;;;;
+13292;EGYPTIAN HIEROGLYPH O045;Lo;0;L;;;;;N;;;;;
+13293;EGYPTIAN HIEROGLYPH O046;Lo;0;L;;;;;N;;;;;
+13294;EGYPTIAN HIEROGLYPH O047;Lo;0;L;;;;;N;;;;;
+13295;EGYPTIAN HIEROGLYPH O048;Lo;0;L;;;;;N;;;;;
+13296;EGYPTIAN HIEROGLYPH O049;Lo;0;L;;;;;N;;;;;
+13297;EGYPTIAN HIEROGLYPH O050;Lo;0;L;;;;;N;;;;;
+13298;EGYPTIAN HIEROGLYPH O050A;Lo;0;L;;;;;N;;;;;
+13299;EGYPTIAN HIEROGLYPH O050B;Lo;0;L;;;;;N;;;;;
+1329A;EGYPTIAN HIEROGLYPH O051;Lo;0;L;;;;;N;;;;;
+1329B;EGYPTIAN HIEROGLYPH P001;Lo;0;L;;;;;N;;;;;
+1329C;EGYPTIAN HIEROGLYPH P001A;Lo;0;L;;;;;N;;;;;
+1329D;EGYPTIAN HIEROGLYPH P002;Lo;0;L;;;;;N;;;;;
+1329E;EGYPTIAN HIEROGLYPH P003;Lo;0;L;;;;;N;;;;;
+1329F;EGYPTIAN HIEROGLYPH P003A;Lo;0;L;;;;;N;;;;;
+132A0;EGYPTIAN HIEROGLYPH P004;Lo;0;L;;;;;N;;;;;
+132A1;EGYPTIAN HIEROGLYPH P005;Lo;0;L;;;;;N;;;;;
+132A2;EGYPTIAN HIEROGLYPH P006;Lo;0;L;;;;;N;;;;;
+132A3;EGYPTIAN HIEROGLYPH P007;Lo;0;L;;;;;N;;;;;
+132A4;EGYPTIAN HIEROGLYPH P008;Lo;0;L;;;;;N;;;;;
+132A5;EGYPTIAN HIEROGLYPH P009;Lo;0;L;;;;;N;;;;;
+132A6;EGYPTIAN HIEROGLYPH P010;Lo;0;L;;;;;N;;;;;
+132A7;EGYPTIAN HIEROGLYPH P011;Lo;0;L;;;;;N;;;;;
+132A8;EGYPTIAN HIEROGLYPH Q001;Lo;0;L;;;;;N;;;;;
+132A9;EGYPTIAN HIEROGLYPH Q002;Lo;0;L;;;;;N;;;;;
+132AA;EGYPTIAN HIEROGLYPH Q003;Lo;0;L;;;;;N;;;;;
+132AB;EGYPTIAN HIEROGLYPH Q004;Lo;0;L;;;;;N;;;;;
+132AC;EGYPTIAN HIEROGLYPH Q005;Lo;0;L;;;;;N;;;;;
+132AD;EGYPTIAN HIEROGLYPH Q006;Lo;0;L;;;;;N;;;;;
+132AE;EGYPTIAN HIEROGLYPH Q007;Lo;0;L;;;;;N;;;;;
+132AF;EGYPTIAN HIEROGLYPH R001;Lo;0;L;;;;;N;;;;;
+132B0;EGYPTIAN HIEROGLYPH R002;Lo;0;L;;;;;N;;;;;
+132B1;EGYPTIAN HIEROGLYPH R002A;Lo;0;L;;;;;N;;;;;
+132B2;EGYPTIAN HIEROGLYPH R003;Lo;0;L;;;;;N;;;;;
+132B3;EGYPTIAN HIEROGLYPH R003A;Lo;0;L;;;;;N;;;;;
+132B4;EGYPTIAN HIEROGLYPH R003B;Lo;0;L;;;;;N;;;;;
+132B5;EGYPTIAN HIEROGLYPH R004;Lo;0;L;;;;;N;;;;;
+132B6;EGYPTIAN HIEROGLYPH R005;Lo;0;L;;;;;N;;;;;
+132B7;EGYPTIAN HIEROGLYPH R006;Lo;0;L;;;;;N;;;;;
+132B8;EGYPTIAN HIEROGLYPH R007;Lo;0;L;;;;;N;;;;;
+132B9;EGYPTIAN HIEROGLYPH R008;Lo;0;L;;;;;N;;;;;
+132BA;EGYPTIAN HIEROGLYPH R009;Lo;0;L;;;;;N;;;;;
+132BB;EGYPTIAN HIEROGLYPH R010;Lo;0;L;;;;;N;;;;;
+132BC;EGYPTIAN HIEROGLYPH R010A;Lo;0;L;;;;;N;;;;;
+132BD;EGYPTIAN HIEROGLYPH R011;Lo;0;L;;;;;N;;;;;
+132BE;EGYPTIAN HIEROGLYPH R012;Lo;0;L;;;;;N;;;;;
+132BF;EGYPTIAN HIEROGLYPH R013;Lo;0;L;;;;;N;;;;;
+132C0;EGYPTIAN HIEROGLYPH R014;Lo;0;L;;;;;N;;;;;
+132C1;EGYPTIAN HIEROGLYPH R015;Lo;0;L;;;;;N;;;;;
+132C2;EGYPTIAN HIEROGLYPH R016;Lo;0;L;;;;;N;;;;;
+132C3;EGYPTIAN HIEROGLYPH R016A;Lo;0;L;;;;;N;;;;;
+132C4;EGYPTIAN HIEROGLYPH R017;Lo;0;L;;;;;N;;;;;
+132C5;EGYPTIAN HIEROGLYPH R018;Lo;0;L;;;;;N;;;;;
+132C6;EGYPTIAN HIEROGLYPH R019;Lo;0;L;;;;;N;;;;;
+132C7;EGYPTIAN HIEROGLYPH R020;Lo;0;L;;;;;N;;;;;
+132C8;EGYPTIAN HIEROGLYPH R021;Lo;0;L;;;;;N;;;;;
+132C9;EGYPTIAN HIEROGLYPH R022;Lo;0;L;;;;;N;;;;;
+132CA;EGYPTIAN HIEROGLYPH R023;Lo;0;L;;;;;N;;;;;
+132CB;EGYPTIAN HIEROGLYPH R024;Lo;0;L;;;;;N;;;;;
+132CC;EGYPTIAN HIEROGLYPH R025;Lo;0;L;;;;;N;;;;;
+132CD;EGYPTIAN HIEROGLYPH R026;Lo;0;L;;;;;N;;;;;
+132CE;EGYPTIAN HIEROGLYPH R027;Lo;0;L;;;;;N;;;;;
+132CF;EGYPTIAN HIEROGLYPH R028;Lo;0;L;;;;;N;;;;;
+132D0;EGYPTIAN HIEROGLYPH R029;Lo;0;L;;;;;N;;;;;
+132D1;EGYPTIAN HIEROGLYPH S001;Lo;0;L;;;;;N;;;;;
+132D2;EGYPTIAN HIEROGLYPH S002;Lo;0;L;;;;;N;;;;;
+132D3;EGYPTIAN HIEROGLYPH S002A;Lo;0;L;;;;;N;;;;;
+132D4;EGYPTIAN HIEROGLYPH S003;Lo;0;L;;;;;N;;;;;
+132D5;EGYPTIAN HIEROGLYPH S004;Lo;0;L;;;;;N;;;;;
+132D6;EGYPTIAN HIEROGLYPH S005;Lo;0;L;;;;;N;;;;;
+132D7;EGYPTIAN HIEROGLYPH S006;Lo;0;L;;;;;N;;;;;
+132D8;EGYPTIAN HIEROGLYPH S006A;Lo;0;L;;;;;N;;;;;
+132D9;EGYPTIAN HIEROGLYPH S007;Lo;0;L;;;;;N;;;;;
+132DA;EGYPTIAN HIEROGLYPH S008;Lo;0;L;;;;;N;;;;;
+132DB;EGYPTIAN HIEROGLYPH S009;Lo;0;L;;;;;N;;;;;
+132DC;EGYPTIAN HIEROGLYPH S010;Lo;0;L;;;;;N;;;;;
+132DD;EGYPTIAN HIEROGLYPH S011;Lo;0;L;;;;;N;;;;;
+132DE;EGYPTIAN HIEROGLYPH S012;Lo;0;L;;;;;N;;;;;
+132DF;EGYPTIAN HIEROGLYPH S013;Lo;0;L;;;;;N;;;;;
+132E0;EGYPTIAN HIEROGLYPH S014;Lo;0;L;;;;;N;;;;;
+132E1;EGYPTIAN HIEROGLYPH S014A;Lo;0;L;;;;;N;;;;;
+132E2;EGYPTIAN HIEROGLYPH S014B;Lo;0;L;;;;;N;;;;;
+132E3;EGYPTIAN HIEROGLYPH S015;Lo;0;L;;;;;N;;;;;
+132E4;EGYPTIAN HIEROGLYPH S016;Lo;0;L;;;;;N;;;;;
+132E5;EGYPTIAN HIEROGLYPH S017;Lo;0;L;;;;;N;;;;;
+132E6;EGYPTIAN HIEROGLYPH S017A;Lo;0;L;;;;;N;;;;;
+132E7;EGYPTIAN HIEROGLYPH S018;Lo;0;L;;;;;N;;;;;
+132E8;EGYPTIAN HIEROGLYPH S019;Lo;0;L;;;;;N;;;;;
+132E9;EGYPTIAN HIEROGLYPH S020;Lo;0;L;;;;;N;;;;;
+132EA;EGYPTIAN HIEROGLYPH S021;Lo;0;L;;;;;N;;;;;
+132EB;EGYPTIAN HIEROGLYPH S022;Lo;0;L;;;;;N;;;;;
+132EC;EGYPTIAN HIEROGLYPH S023;Lo;0;L;;;;;N;;;;;
+132ED;EGYPTIAN HIEROGLYPH S024;Lo;0;L;;;;;N;;;;;
+132EE;EGYPTIAN HIEROGLYPH S025;Lo;0;L;;;;;N;;;;;
+132EF;EGYPTIAN HIEROGLYPH S026;Lo;0;L;;;;;N;;;;;
+132F0;EGYPTIAN HIEROGLYPH S026A;Lo;0;L;;;;;N;;;;;
+132F1;EGYPTIAN HIEROGLYPH S026B;Lo;0;L;;;;;N;;;;;
+132F2;EGYPTIAN HIEROGLYPH S027;Lo;0;L;;;;;N;;;;;
+132F3;EGYPTIAN HIEROGLYPH S028;Lo;0;L;;;;;N;;;;;
+132F4;EGYPTIAN HIEROGLYPH S029;Lo;0;L;;;;;N;;;;;
+132F5;EGYPTIAN HIEROGLYPH S030;Lo;0;L;;;;;N;;;;;
+132F6;EGYPTIAN HIEROGLYPH S031;Lo;0;L;;;;;N;;;;;
+132F7;EGYPTIAN HIEROGLYPH S032;Lo;0;L;;;;;N;;;;;
+132F8;EGYPTIAN HIEROGLYPH S033;Lo;0;L;;;;;N;;;;;
+132F9;EGYPTIAN HIEROGLYPH S034;Lo;0;L;;;;;N;;;;;
+132FA;EGYPTIAN HIEROGLYPH S035;Lo;0;L;;;;;N;;;;;
+132FB;EGYPTIAN HIEROGLYPH S035A;Lo;0;L;;;;;N;;;;;
+132FC;EGYPTIAN HIEROGLYPH S036;Lo;0;L;;;;;N;;;;;
+132FD;EGYPTIAN HIEROGLYPH S037;Lo;0;L;;;;;N;;;;;
+132FE;EGYPTIAN HIEROGLYPH S038;Lo;0;L;;;;;N;;;;;
+132FF;EGYPTIAN HIEROGLYPH S039;Lo;0;L;;;;;N;;;;;
+13300;EGYPTIAN HIEROGLYPH S040;Lo;0;L;;;;;N;;;;;
+13301;EGYPTIAN HIEROGLYPH S041;Lo;0;L;;;;;N;;;;;
+13302;EGYPTIAN HIEROGLYPH S042;Lo;0;L;;;;;N;;;;;
+13303;EGYPTIAN HIEROGLYPH S043;Lo;0;L;;;;;N;;;;;
+13304;EGYPTIAN HIEROGLYPH S044;Lo;0;L;;;;;N;;;;;
+13305;EGYPTIAN HIEROGLYPH S045;Lo;0;L;;;;;N;;;;;
+13306;EGYPTIAN HIEROGLYPH S046;Lo;0;L;;;;;N;;;;;
+13307;EGYPTIAN HIEROGLYPH T001;Lo;0;L;;;;;N;;;;;
+13308;EGYPTIAN HIEROGLYPH T002;Lo;0;L;;;;;N;;;;;
+13309;EGYPTIAN HIEROGLYPH T003;Lo;0;L;;;;;N;;;;;
+1330A;EGYPTIAN HIEROGLYPH T003A;Lo;0;L;;;;;N;;;;;
+1330B;EGYPTIAN HIEROGLYPH T004;Lo;0;L;;;;;N;;;;;
+1330C;EGYPTIAN HIEROGLYPH T005;Lo;0;L;;;;;N;;;;;
+1330D;EGYPTIAN HIEROGLYPH T006;Lo;0;L;;;;;N;;;;;
+1330E;EGYPTIAN HIEROGLYPH T007;Lo;0;L;;;;;N;;;;;
+1330F;EGYPTIAN HIEROGLYPH T007A;Lo;0;L;;;;;N;;;;;
+13310;EGYPTIAN HIEROGLYPH T008;Lo;0;L;;;;;N;;;;;
+13311;EGYPTIAN HIEROGLYPH T008A;Lo;0;L;;;;;N;;;;;
+13312;EGYPTIAN HIEROGLYPH T009;Lo;0;L;;;;;N;;;;;
+13313;EGYPTIAN HIEROGLYPH T009A;Lo;0;L;;;;;N;;;;;
+13314;EGYPTIAN HIEROGLYPH T010;Lo;0;L;;;;;N;;;;;
+13315;EGYPTIAN HIEROGLYPH T011;Lo;0;L;;;;;N;;;;;
+13316;EGYPTIAN HIEROGLYPH T011A;Lo;0;L;;;;;N;;;;;
+13317;EGYPTIAN HIEROGLYPH T012;Lo;0;L;;;;;N;;;;;
+13318;EGYPTIAN HIEROGLYPH T013;Lo;0;L;;;;;N;;;;;
+13319;EGYPTIAN HIEROGLYPH T014;Lo;0;L;;;;;N;;;;;
+1331A;EGYPTIAN HIEROGLYPH T015;Lo;0;L;;;;;N;;;;;
+1331B;EGYPTIAN HIEROGLYPH T016;Lo;0;L;;;;;N;;;;;
+1331C;EGYPTIAN HIEROGLYPH T016A;Lo;0;L;;;;;N;;;;;
+1331D;EGYPTIAN HIEROGLYPH T017;Lo;0;L;;;;;N;;;;;
+1331E;EGYPTIAN HIEROGLYPH T018;Lo;0;L;;;;;N;;;;;
+1331F;EGYPTIAN HIEROGLYPH T019;Lo;0;L;;;;;N;;;;;
+13320;EGYPTIAN HIEROGLYPH T020;Lo;0;L;;;;;N;;;;;
+13321;EGYPTIAN HIEROGLYPH T021;Lo;0;L;;;;;N;;;;;
+13322;EGYPTIAN HIEROGLYPH T022;Lo;0;L;;;;;N;;;;;
+13323;EGYPTIAN HIEROGLYPH T023;Lo;0;L;;;;;N;;;;;
+13324;EGYPTIAN HIEROGLYPH T024;Lo;0;L;;;;;N;;;;;
+13325;EGYPTIAN HIEROGLYPH T025;Lo;0;L;;;;;N;;;;;
+13326;EGYPTIAN HIEROGLYPH T026;Lo;0;L;;;;;N;;;;;
+13327;EGYPTIAN HIEROGLYPH T027;Lo;0;L;;;;;N;;;;;
+13328;EGYPTIAN HIEROGLYPH T028;Lo;0;L;;;;;N;;;;;
+13329;EGYPTIAN HIEROGLYPH T029;Lo;0;L;;;;;N;;;;;
+1332A;EGYPTIAN HIEROGLYPH T030;Lo;0;L;;;;;N;;;;;
+1332B;EGYPTIAN HIEROGLYPH T031;Lo;0;L;;;;;N;;;;;
+1332C;EGYPTIAN HIEROGLYPH T032;Lo;0;L;;;;;N;;;;;
+1332D;EGYPTIAN HIEROGLYPH T032A;Lo;0;L;;;;;N;;;;;
+1332E;EGYPTIAN HIEROGLYPH T033;Lo;0;L;;;;;N;;;;;
+1332F;EGYPTIAN HIEROGLYPH T033A;Lo;0;L;;;;;N;;;;;
+13330;EGYPTIAN HIEROGLYPH T034;Lo;0;L;;;;;N;;;;;
+13331;EGYPTIAN HIEROGLYPH T035;Lo;0;L;;;;;N;;;;;
+13332;EGYPTIAN HIEROGLYPH T036;Lo;0;L;;;;;N;;;;;
+13333;EGYPTIAN HIEROGLYPH U001;Lo;0;L;;;;;N;;;;;
+13334;EGYPTIAN HIEROGLYPH U002;Lo;0;L;;;;;N;;;;;
+13335;EGYPTIAN HIEROGLYPH U003;Lo;0;L;;;;;N;;;;;
+13336;EGYPTIAN HIEROGLYPH U004;Lo;0;L;;;;;N;;;;;
+13337;EGYPTIAN HIEROGLYPH U005;Lo;0;L;;;;;N;;;;;
+13338;EGYPTIAN HIEROGLYPH U006;Lo;0;L;;;;;N;;;;;
+13339;EGYPTIAN HIEROGLYPH U006A;Lo;0;L;;;;;N;;;;;
+1333A;EGYPTIAN HIEROGLYPH U006B;Lo;0;L;;;;;N;;;;;
+1333B;EGYPTIAN HIEROGLYPH U007;Lo;0;L;;;;;N;;;;;
+1333C;EGYPTIAN HIEROGLYPH U008;Lo;0;L;;;;;N;;;;;
+1333D;EGYPTIAN HIEROGLYPH U009;Lo;0;L;;;;;N;;;;;
+1333E;EGYPTIAN HIEROGLYPH U010;Lo;0;L;;;;;N;;;;;
+1333F;EGYPTIAN HIEROGLYPH U011;Lo;0;L;;;;;N;;;;;
+13340;EGYPTIAN HIEROGLYPH U012;Lo;0;L;;;;;N;;;;;
+13341;EGYPTIAN HIEROGLYPH U013;Lo;0;L;;;;;N;;;;;
+13342;EGYPTIAN HIEROGLYPH U014;Lo;0;L;;;;;N;;;;;
+13343;EGYPTIAN HIEROGLYPH U015;Lo;0;L;;;;;N;;;;;
+13344;EGYPTIAN HIEROGLYPH U016;Lo;0;L;;;;;N;;;;;
+13345;EGYPTIAN HIEROGLYPH U017;Lo;0;L;;;;;N;;;;;
+13346;EGYPTIAN HIEROGLYPH U018;Lo;0;L;;;;;N;;;;;
+13347;EGYPTIAN HIEROGLYPH U019;Lo;0;L;;;;;N;;;;;
+13348;EGYPTIAN HIEROGLYPH U020;Lo;0;L;;;;;N;;;;;
+13349;EGYPTIAN HIEROGLYPH U021;Lo;0;L;;;;;N;;;;;
+1334A;EGYPTIAN HIEROGLYPH U022;Lo;0;L;;;;;N;;;;;
+1334B;EGYPTIAN HIEROGLYPH U023;Lo;0;L;;;;;N;;;;;
+1334C;EGYPTIAN HIEROGLYPH U023A;Lo;0;L;;;;;N;;;;;
+1334D;EGYPTIAN HIEROGLYPH U024;Lo;0;L;;;;;N;;;;;
+1334E;EGYPTIAN HIEROGLYPH U025;Lo;0;L;;;;;N;;;;;
+1334F;EGYPTIAN HIEROGLYPH U026;Lo;0;L;;;;;N;;;;;
+13350;EGYPTIAN HIEROGLYPH U027;Lo;0;L;;;;;N;;;;;
+13351;EGYPTIAN HIEROGLYPH U028;Lo;0;L;;;;;N;;;;;
+13352;EGYPTIAN HIEROGLYPH U029;Lo;0;L;;;;;N;;;;;
+13353;EGYPTIAN HIEROGLYPH U029A;Lo;0;L;;;;;N;;;;;
+13354;EGYPTIAN HIEROGLYPH U030;Lo;0;L;;;;;N;;;;;
+13355;EGYPTIAN HIEROGLYPH U031;Lo;0;L;;;;;N;;;;;
+13356;EGYPTIAN HIEROGLYPH U032;Lo;0;L;;;;;N;;;;;
+13357;EGYPTIAN HIEROGLYPH U032A;Lo;0;L;;;;;N;;;;;
+13358;EGYPTIAN HIEROGLYPH U033;Lo;0;L;;;;;N;;;;;
+13359;EGYPTIAN HIEROGLYPH U034;Lo;0;L;;;;;N;;;;;
+1335A;EGYPTIAN HIEROGLYPH U035;Lo;0;L;;;;;N;;;;;
+1335B;EGYPTIAN HIEROGLYPH U036;Lo;0;L;;;;;N;;;;;
+1335C;EGYPTIAN HIEROGLYPH U037;Lo;0;L;;;;;N;;;;;
+1335D;EGYPTIAN HIEROGLYPH U038;Lo;0;L;;;;;N;;;;;
+1335E;EGYPTIAN HIEROGLYPH U039;Lo;0;L;;;;;N;;;;;
+1335F;EGYPTIAN HIEROGLYPH U040;Lo;0;L;;;;;N;;;;;
+13360;EGYPTIAN HIEROGLYPH U041;Lo;0;L;;;;;N;;;;;
+13361;EGYPTIAN HIEROGLYPH U042;Lo;0;L;;;;;N;;;;;
+13362;EGYPTIAN HIEROGLYPH V001;Lo;0;L;;;;;N;;;;;
+13363;EGYPTIAN HIEROGLYPH V001A;Lo;0;L;;;;;N;;;;;
+13364;EGYPTIAN HIEROGLYPH V001B;Lo;0;L;;;;;N;;;;;
+13365;EGYPTIAN HIEROGLYPH V001C;Lo;0;L;;;;;N;;;;;
+13366;EGYPTIAN HIEROGLYPH V001D;Lo;0;L;;;;;N;;;;;
+13367;EGYPTIAN HIEROGLYPH V001E;Lo;0;L;;;;;N;;;;;
+13368;EGYPTIAN HIEROGLYPH V001F;Lo;0;L;;;;;N;;;;;
+13369;EGYPTIAN HIEROGLYPH V001G;Lo;0;L;;;;;N;;;;;
+1336A;EGYPTIAN HIEROGLYPH V001H;Lo;0;L;;;;;N;;;;;
+1336B;EGYPTIAN HIEROGLYPH V001I;Lo;0;L;;;;;N;;;;;
+1336C;EGYPTIAN HIEROGLYPH V002;Lo;0;L;;;;;N;;;;;
+1336D;EGYPTIAN HIEROGLYPH V002A;Lo;0;L;;;;;N;;;;;
+1336E;EGYPTIAN HIEROGLYPH V003;Lo;0;L;;;;;N;;;;;
+1336F;EGYPTIAN HIEROGLYPH V004;Lo;0;L;;;;;N;;;;;
+13370;EGYPTIAN HIEROGLYPH V005;Lo;0;L;;;;;N;;;;;
+13371;EGYPTIAN HIEROGLYPH V006;Lo;0;L;;;;;N;;;;;
+13372;EGYPTIAN HIEROGLYPH V007;Lo;0;L;;;;;N;;;;;
+13373;EGYPTIAN HIEROGLYPH V007A;Lo;0;L;;;;;N;;;;;
+13374;EGYPTIAN HIEROGLYPH V007B;Lo;0;L;;;;;N;;;;;
+13375;EGYPTIAN HIEROGLYPH V008;Lo;0;L;;;;;N;;;;;
+13376;EGYPTIAN HIEROGLYPH V009;Lo;0;L;;;;;N;;;;;
+13377;EGYPTIAN HIEROGLYPH V010;Lo;0;L;;;;;N;;;;;
+13378;EGYPTIAN HIEROGLYPH V011;Lo;0;L;;;;;N;;;;;
+13379;EGYPTIAN HIEROGLYPH V011A;Lo;0;L;;;;;N;;;;;
+1337A;EGYPTIAN HIEROGLYPH V011B;Lo;0;L;;;;;N;;;;;
+1337B;EGYPTIAN HIEROGLYPH V011C;Lo;0;L;;;;;N;;;;;
+1337C;EGYPTIAN HIEROGLYPH V012;Lo;0;L;;;;;N;;;;;
+1337D;EGYPTIAN HIEROGLYPH V012A;Lo;0;L;;;;;N;;;;;
+1337E;EGYPTIAN HIEROGLYPH V012B;Lo;0;L;;;;;N;;;;;
+1337F;EGYPTIAN HIEROGLYPH V013;Lo;0;L;;;;;N;;;;;
+13380;EGYPTIAN HIEROGLYPH V014;Lo;0;L;;;;;N;;;;;
+13381;EGYPTIAN HIEROGLYPH V015;Lo;0;L;;;;;N;;;;;
+13382;EGYPTIAN HIEROGLYPH V016;Lo;0;L;;;;;N;;;;;
+13383;EGYPTIAN HIEROGLYPH V017;Lo;0;L;;;;;N;;;;;
+13384;EGYPTIAN HIEROGLYPH V018;Lo;0;L;;;;;N;;;;;
+13385;EGYPTIAN HIEROGLYPH V019;Lo;0;L;;;;;N;;;;;
+13386;EGYPTIAN HIEROGLYPH V020;Lo;0;L;;;;;N;;;;;
+13387;EGYPTIAN HIEROGLYPH V020A;Lo;0;L;;;;;N;;;;;
+13388;EGYPTIAN HIEROGLYPH V020B;Lo;0;L;;;;;N;;;;;
+13389;EGYPTIAN HIEROGLYPH V020C;Lo;0;L;;;;;N;;;;;
+1338A;EGYPTIAN HIEROGLYPH V020D;Lo;0;L;;;;;N;;;;;
+1338B;EGYPTIAN HIEROGLYPH V020E;Lo;0;L;;;;;N;;;;;
+1338C;EGYPTIAN HIEROGLYPH V020F;Lo;0;L;;;;;N;;;;;
+1338D;EGYPTIAN HIEROGLYPH V020G;Lo;0;L;;;;;N;;;;;
+1338E;EGYPTIAN HIEROGLYPH V020H;Lo;0;L;;;;;N;;;;;
+1338F;EGYPTIAN HIEROGLYPH V020I;Lo;0;L;;;;;N;;;;;
+13390;EGYPTIAN HIEROGLYPH V020J;Lo;0;L;;;;;N;;;;;
+13391;EGYPTIAN HIEROGLYPH V020K;Lo;0;L;;;;;N;;;;;
+13392;EGYPTIAN HIEROGLYPH V020L;Lo;0;L;;;;;N;;;;;
+13393;EGYPTIAN HIEROGLYPH V021;Lo;0;L;;;;;N;;;;;
+13394;EGYPTIAN HIEROGLYPH V022;Lo;0;L;;;;;N;;;;;
+13395;EGYPTIAN HIEROGLYPH V023;Lo;0;L;;;;;N;;;;;
+13396;EGYPTIAN HIEROGLYPH V023A;Lo;0;L;;;;;N;;;;;
+13397;EGYPTIAN HIEROGLYPH V024;Lo;0;L;;;;;N;;;;;
+13398;EGYPTIAN HIEROGLYPH V025;Lo;0;L;;;;;N;;;;;
+13399;EGYPTIAN HIEROGLYPH V026;Lo;0;L;;;;;N;;;;;
+1339A;EGYPTIAN HIEROGLYPH V027;Lo;0;L;;;;;N;;;;;
+1339B;EGYPTIAN HIEROGLYPH V028;Lo;0;L;;;;;N;;;;;
+1339C;EGYPTIAN HIEROGLYPH V028A;Lo;0;L;;;;;N;;;;;
+1339D;EGYPTIAN HIEROGLYPH V029;Lo;0;L;;;;;N;;;;;
+1339E;EGYPTIAN HIEROGLYPH V029A;Lo;0;L;;;;;N;;;;;
+1339F;EGYPTIAN HIEROGLYPH V030;Lo;0;L;;;;;N;;;;;
+133A0;EGYPTIAN HIEROGLYPH V030A;Lo;0;L;;;;;N;;;;;
+133A1;EGYPTIAN HIEROGLYPH V031;Lo;0;L;;;;;N;;;;;
+133A2;EGYPTIAN HIEROGLYPH V031A;Lo;0;L;;;;;N;;;;;
+133A3;EGYPTIAN HIEROGLYPH V032;Lo;0;L;;;;;N;;;;;
+133A4;EGYPTIAN HIEROGLYPH V033;Lo;0;L;;;;;N;;;;;
+133A5;EGYPTIAN HIEROGLYPH V033A;Lo;0;L;;;;;N;;;;;
+133A6;EGYPTIAN HIEROGLYPH V034;Lo;0;L;;;;;N;;;;;
+133A7;EGYPTIAN HIEROGLYPH V035;Lo;0;L;;;;;N;;;;;
+133A8;EGYPTIAN HIEROGLYPH V036;Lo;0;L;;;;;N;;;;;
+133A9;EGYPTIAN HIEROGLYPH V037;Lo;0;L;;;;;N;;;;;
+133AA;EGYPTIAN HIEROGLYPH V037A;Lo;0;L;;;;;N;;;;;
+133AB;EGYPTIAN HIEROGLYPH V038;Lo;0;L;;;;;N;;;;;
+133AC;EGYPTIAN HIEROGLYPH V039;Lo;0;L;;;;;N;;;;;
+133AD;EGYPTIAN HIEROGLYPH V040;Lo;0;L;;;;;N;;;;;
+133AE;EGYPTIAN HIEROGLYPH V040A;Lo;0;L;;;;;N;;;;;
+133AF;EGYPTIAN HIEROGLYPH W001;Lo;0;L;;;;;N;;;;;
+133B0;EGYPTIAN HIEROGLYPH W002;Lo;0;L;;;;;N;;;;;
+133B1;EGYPTIAN HIEROGLYPH W003;Lo;0;L;;;;;N;;;;;
+133B2;EGYPTIAN HIEROGLYPH W003A;Lo;0;L;;;;;N;;;;;
+133B3;EGYPTIAN HIEROGLYPH W004;Lo;0;L;;;;;N;;;;;
+133B4;EGYPTIAN HIEROGLYPH W005;Lo;0;L;;;;;N;;;;;
+133B5;EGYPTIAN HIEROGLYPH W006;Lo;0;L;;;;;N;;;;;
+133B6;EGYPTIAN HIEROGLYPH W007;Lo;0;L;;;;;N;;;;;
+133B7;EGYPTIAN HIEROGLYPH W008;Lo;0;L;;;;;N;;;;;
+133B8;EGYPTIAN HIEROGLYPH W009;Lo;0;L;;;;;N;;;;;
+133B9;EGYPTIAN HIEROGLYPH W009A;Lo;0;L;;;;;N;;;;;
+133BA;EGYPTIAN HIEROGLYPH W010;Lo;0;L;;;;;N;;;;;
+133BB;EGYPTIAN HIEROGLYPH W010A;Lo;0;L;;;;;N;;;;;
+133BC;EGYPTIAN HIEROGLYPH W011;Lo;0;L;;;;;N;;;;;
+133BD;EGYPTIAN HIEROGLYPH W012;Lo;0;L;;;;;N;;;;;
+133BE;EGYPTIAN HIEROGLYPH W013;Lo;0;L;;;;;N;;;;;
+133BF;EGYPTIAN HIEROGLYPH W014;Lo;0;L;;;;;N;;;;;
+133C0;EGYPTIAN HIEROGLYPH W014A;Lo;0;L;;;;;N;;;;;
+133C1;EGYPTIAN HIEROGLYPH W015;Lo;0;L;;;;;N;;;;;
+133C2;EGYPTIAN HIEROGLYPH W016;Lo;0;L;;;;;N;;;;;
+133C3;EGYPTIAN HIEROGLYPH W017;Lo;0;L;;;;;N;;;;;
+133C4;EGYPTIAN HIEROGLYPH W017A;Lo;0;L;;;;;N;;;;;
+133C5;EGYPTIAN HIEROGLYPH W018;Lo;0;L;;;;;N;;;;;
+133C6;EGYPTIAN HIEROGLYPH W018A;Lo;0;L;;;;;N;;;;;
+133C7;EGYPTIAN HIEROGLYPH W019;Lo;0;L;;;;;N;;;;;
+133C8;EGYPTIAN HIEROGLYPH W020;Lo;0;L;;;;;N;;;;;
+133C9;EGYPTIAN HIEROGLYPH W021;Lo;0;L;;;;;N;;;;;
+133CA;EGYPTIAN HIEROGLYPH W022;Lo;0;L;;;;;N;;;;;
+133CB;EGYPTIAN HIEROGLYPH W023;Lo;0;L;;;;;N;;;;;
+133CC;EGYPTIAN HIEROGLYPH W024;Lo;0;L;;;;;N;;;;;
+133CD;EGYPTIAN HIEROGLYPH W024A;Lo;0;L;;;;;N;;;;;
+133CE;EGYPTIAN HIEROGLYPH W025;Lo;0;L;;;;;N;;;;;
+133CF;EGYPTIAN HIEROGLYPH X001;Lo;0;L;;;;;N;;;;;
+133D0;EGYPTIAN HIEROGLYPH X002;Lo;0;L;;;;;N;;;;;
+133D1;EGYPTIAN HIEROGLYPH X003;Lo;0;L;;;;;N;;;;;
+133D2;EGYPTIAN HIEROGLYPH X004;Lo;0;L;;;;;N;;;;;
+133D3;EGYPTIAN HIEROGLYPH X004A;Lo;0;L;;;;;N;;;;;
+133D4;EGYPTIAN HIEROGLYPH X004B;Lo;0;L;;;;;N;;;;;
+133D5;EGYPTIAN HIEROGLYPH X005;Lo;0;L;;;;;N;;;;;
+133D6;EGYPTIAN HIEROGLYPH X006;Lo;0;L;;;;;N;;;;;
+133D7;EGYPTIAN HIEROGLYPH X006A;Lo;0;L;;;;;N;;;;;
+133D8;EGYPTIAN HIEROGLYPH X007;Lo;0;L;;;;;N;;;;;
+133D9;EGYPTIAN HIEROGLYPH X008;Lo;0;L;;;;;N;;;;;
+133DA;EGYPTIAN HIEROGLYPH X008A;Lo;0;L;;;;;N;;;;;
+133DB;EGYPTIAN HIEROGLYPH Y001;Lo;0;L;;;;;N;;;;;
+133DC;EGYPTIAN HIEROGLYPH Y001A;Lo;0;L;;;;;N;;;;;
+133DD;EGYPTIAN HIEROGLYPH Y002;Lo;0;L;;;;;N;;;;;
+133DE;EGYPTIAN HIEROGLYPH Y003;Lo;0;L;;;;;N;;;;;
+133DF;EGYPTIAN HIEROGLYPH Y004;Lo;0;L;;;;;N;;;;;
+133E0;EGYPTIAN HIEROGLYPH Y005;Lo;0;L;;;;;N;;;;;
+133E1;EGYPTIAN HIEROGLYPH Y006;Lo;0;L;;;;;N;;;;;
+133E2;EGYPTIAN HIEROGLYPH Y007;Lo;0;L;;;;;N;;;;;
+133E3;EGYPTIAN HIEROGLYPH Y008;Lo;0;L;;;;;N;;;;;
+133E4;EGYPTIAN HIEROGLYPH Z001;Lo;0;L;;;;;N;;;;;
+133E5;EGYPTIAN HIEROGLYPH Z002;Lo;0;L;;;;;N;;;;;
+133E6;EGYPTIAN HIEROGLYPH Z002A;Lo;0;L;;;;;N;;;;;
+133E7;EGYPTIAN HIEROGLYPH Z002B;Lo;0;L;;;;;N;;;;;
+133E8;EGYPTIAN HIEROGLYPH Z002C;Lo;0;L;;;;;N;;;;;
+133E9;EGYPTIAN HIEROGLYPH Z002D;Lo;0;L;;;;;N;;;;;
+133EA;EGYPTIAN HIEROGLYPH Z003;Lo;0;L;;;;;N;;;;;
+133EB;EGYPTIAN HIEROGLYPH Z003A;Lo;0;L;;;;;N;;;;;
+133EC;EGYPTIAN HIEROGLYPH Z003B;Lo;0;L;;;;;N;;;;;
+133ED;EGYPTIAN HIEROGLYPH Z004;Lo;0;L;;;;;N;;;;;
+133EE;EGYPTIAN HIEROGLYPH Z004A;Lo;0;L;;;;;N;;;;;
+133EF;EGYPTIAN HIEROGLYPH Z005;Lo;0;L;;;;;N;;;;;
+133F0;EGYPTIAN HIEROGLYPH Z005A;Lo;0;L;;;;;N;;;;;
+133F1;EGYPTIAN HIEROGLYPH Z006;Lo;0;L;;;;;N;;;;;
+133F2;EGYPTIAN HIEROGLYPH Z007;Lo;0;L;;;;;N;;;;;
+133F3;EGYPTIAN HIEROGLYPH Z008;Lo;0;L;;;;;N;;;;;
+133F4;EGYPTIAN HIEROGLYPH Z009;Lo;0;L;;;;;N;;;;;
+133F5;EGYPTIAN HIEROGLYPH Z010;Lo;0;L;;;;;N;;;;;
+133F6;EGYPTIAN HIEROGLYPH Z011;Lo;0;L;;;;;N;;;;;
+133F7;EGYPTIAN HIEROGLYPH Z012;Lo;0;L;;;;;N;;;;;
+133F8;EGYPTIAN HIEROGLYPH Z013;Lo;0;L;;;;;N;;;;;
+133F9;EGYPTIAN HIEROGLYPH Z014;Lo;0;L;;;;;N;;;;;
+133FA;EGYPTIAN HIEROGLYPH Z015;Lo;0;L;;;;;N;;;;;
+133FB;EGYPTIAN HIEROGLYPH Z015A;Lo;0;L;;;;;N;;;;;
+133FC;EGYPTIAN HIEROGLYPH Z015B;Lo;0;L;;;;;N;;;;;
+133FD;EGYPTIAN HIEROGLYPH Z015C;Lo;0;L;;;;;N;;;;;
+133FE;EGYPTIAN HIEROGLYPH Z015D;Lo;0;L;;;;;N;;;;;
+133FF;EGYPTIAN HIEROGLYPH Z015E;Lo;0;L;;;;;N;;;;;
+13400;EGYPTIAN HIEROGLYPH Z015F;Lo;0;L;;;;;N;;;;;
+13401;EGYPTIAN HIEROGLYPH Z015G;Lo;0;L;;;;;N;;;;;
+13402;EGYPTIAN HIEROGLYPH Z015H;Lo;0;L;;;;;N;;;;;
+13403;EGYPTIAN HIEROGLYPH Z015I;Lo;0;L;;;;;N;;;;;
+13404;EGYPTIAN HIEROGLYPH Z016;Lo;0;L;;;;;N;;;;;
+13405;EGYPTIAN HIEROGLYPH Z016A;Lo;0;L;;;;;N;;;;;
+13406;EGYPTIAN HIEROGLYPH Z016B;Lo;0;L;;;;;N;;;;;
+13407;EGYPTIAN HIEROGLYPH Z016C;Lo;0;L;;;;;N;;;;;
+13408;EGYPTIAN HIEROGLYPH Z016D;Lo;0;L;;;;;N;;;;;
+13409;EGYPTIAN HIEROGLYPH Z016E;Lo;0;L;;;;;N;;;;;
+1340A;EGYPTIAN HIEROGLYPH Z016F;Lo;0;L;;;;;N;;;;;
+1340B;EGYPTIAN HIEROGLYPH Z016G;Lo;0;L;;;;;N;;;;;
+1340C;EGYPTIAN HIEROGLYPH Z016H;Lo;0;L;;;;;N;;;;;
+1340D;EGYPTIAN HIEROGLYPH AA001;Lo;0;L;;;;;N;;;;;
+1340E;EGYPTIAN HIEROGLYPH AA002;Lo;0;L;;;;;N;;;;;
+1340F;EGYPTIAN HIEROGLYPH AA003;Lo;0;L;;;;;N;;;;;
+13410;EGYPTIAN HIEROGLYPH AA004;Lo;0;L;;;;;N;;;;;
+13411;EGYPTIAN HIEROGLYPH AA005;Lo;0;L;;;;;N;;;;;
+13412;EGYPTIAN HIEROGLYPH AA006;Lo;0;L;;;;;N;;;;;
+13413;EGYPTIAN HIEROGLYPH AA007;Lo;0;L;;;;;N;;;;;
+13414;EGYPTIAN HIEROGLYPH AA007A;Lo;0;L;;;;;N;;;;;
+13415;EGYPTIAN HIEROGLYPH AA007B;Lo;0;L;;;;;N;;;;;
+13416;EGYPTIAN HIEROGLYPH AA008;Lo;0;L;;;;;N;;;;;
+13417;EGYPTIAN HIEROGLYPH AA009;Lo;0;L;;;;;N;;;;;
+13418;EGYPTIAN HIEROGLYPH AA010;Lo;0;L;;;;;N;;;;;
+13419;EGYPTIAN HIEROGLYPH AA011;Lo;0;L;;;;;N;;;;;
+1341A;EGYPTIAN HIEROGLYPH AA012;Lo;0;L;;;;;N;;;;;
+1341B;EGYPTIAN HIEROGLYPH AA013;Lo;0;L;;;;;N;;;;;
+1341C;EGYPTIAN HIEROGLYPH AA014;Lo;0;L;;;;;N;;;;;
+1341D;EGYPTIAN HIEROGLYPH AA015;Lo;0;L;;;;;N;;;;;
+1341E;EGYPTIAN HIEROGLYPH AA016;Lo;0;L;;;;;N;;;;;
+1341F;EGYPTIAN HIEROGLYPH AA017;Lo;0;L;;;;;N;;;;;
+13420;EGYPTIAN HIEROGLYPH AA018;Lo;0;L;;;;;N;;;;;
+13421;EGYPTIAN HIEROGLYPH AA019;Lo;0;L;;;;;N;;;;;
+13422;EGYPTIAN HIEROGLYPH AA020;Lo;0;L;;;;;N;;;;;
+13423;EGYPTIAN HIEROGLYPH AA021;Lo;0;L;;;;;N;;;;;
+13424;EGYPTIAN HIEROGLYPH AA022;Lo;0;L;;;;;N;;;;;
+13425;EGYPTIAN HIEROGLYPH AA023;Lo;0;L;;;;;N;;;;;
+13426;EGYPTIAN HIEROGLYPH AA024;Lo;0;L;;;;;N;;;;;
+13427;EGYPTIAN HIEROGLYPH AA025;Lo;0;L;;;;;N;;;;;
+13428;EGYPTIAN HIEROGLYPH AA026;Lo;0;L;;;;;N;;;;;
+13429;EGYPTIAN HIEROGLYPH AA027;Lo;0;L;;;;;N;;;;;
+1342A;EGYPTIAN HIEROGLYPH AA028;Lo;0;L;;;;;N;;;;;
+1342B;EGYPTIAN HIEROGLYPH AA029;Lo;0;L;;;;;N;;;;;
+1342C;EGYPTIAN HIEROGLYPH AA030;Lo;0;L;;;;;N;;;;;
+1342D;EGYPTIAN HIEROGLYPH AA031;Lo;0;L;;;;;N;;;;;
+1342E;EGYPTIAN HIEROGLYPH AA032;Lo;0;L;;;;;N;;;;;
 1D000;BYZANTINE MUSICAL SYMBOL PSILI;So;0;L;;;;;N;;;;;
 1D001;BYZANTINE MUSICAL SYMBOL DASEIA;So;0;L;;;;;N;;;;;
 1D002;BYZANTINE MUSICAL SYMBOL PERISPOMENI;So;0;L;;;;;N;;;;;
@@ -17204,12 +19588,12 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1D243;COMBINING GREEK MUSICAL TETRASEME;Mn;230;NSM;;;;;N;;;;;
 1D244;COMBINING GREEK MUSICAL PENTASEME;Mn;230;NSM;;;;;N;;;;;
 1D245;GREEK MUSICAL LEIMMA;So;0;ON;;;;;N;;;;;
-1D300;MONOGRAM FOR EARTH;So;0;ON;;;;;N;;ren *;;;
-1D301;DIGRAM FOR HEAVENLY EARTH;So;0;ON;;;;;N;;tian ren *;;;
-1D302;DIGRAM FOR HUMAN EARTH;So;0;ON;;;;;N;;di ren *;;;
-1D303;DIGRAM FOR EARTHLY HEAVEN;So;0;ON;;;;;N;;ren tian *;;;
-1D304;DIGRAM FOR EARTHLY HUMAN;So;0;ON;;;;;N;;ren di *;;;
-1D305;DIGRAM FOR EARTH;So;0;ON;;;;;N;;ren ren *;;;
+1D300;MONOGRAM FOR EARTH;So;0;ON;;;;;N;;;;;
+1D301;DIGRAM FOR HEAVENLY EARTH;So;0;ON;;;;;N;;;;;
+1D302;DIGRAM FOR HUMAN EARTH;So;0;ON;;;;;N;;;;;
+1D303;DIGRAM FOR EARTHLY HEAVEN;So;0;ON;;;;;N;;;;;
+1D304;DIGRAM FOR EARTHLY HUMAN;So;0;ON;;;;;N;;;;;
+1D305;DIGRAM FOR EARTH;So;0;ON;;;;;N;;;;;
 1D306;TETRAGRAM FOR CENTRE;So;0;ON;;;;;N;;;;;
 1D307;TETRAGRAM FOR FULL CIRCLE;So;0;ON;;;;;N;;;;;
 1D308;TETRAGRAM FOR MIRED;So;0;ON;;;;;N;;;;;
@@ -18014,7 +20398,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1D6D8;MATHEMATICAL BOLD SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
 1D6D9;MATHEMATICAL BOLD SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
 1D6DA;MATHEMATICAL BOLD SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
-1D6DB;MATHEMATICAL BOLD PARTIAL DIFFERENTIAL;Sm;0;L;<font> 2202;;;;Y;;;;;
+1D6DB;MATHEMATICAL BOLD PARTIAL DIFFERENTIAL;Sm;0;ON;<font> 2202;;;;Y;;;;;
 1D6DC;MATHEMATICAL BOLD EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
 1D6DD;MATHEMATICAL BOLD THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
 1D6DE;MATHEMATICAL BOLD KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
@@ -18072,7 +20456,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1D712;MATHEMATICAL ITALIC SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
 1D713;MATHEMATICAL ITALIC SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
 1D714;MATHEMATICAL ITALIC SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
-1D715;MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL;Sm;0;L;<font> 2202;;;;Y;;;;;
+1D715;MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL;Sm;0;ON;<font> 2202;;;;Y;;;;;
 1D716;MATHEMATICAL ITALIC EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
 1D717;MATHEMATICAL ITALIC THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
 1D718;MATHEMATICAL ITALIC KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
@@ -18130,7 +20514,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1D74C;MATHEMATICAL BOLD ITALIC SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
 1D74D;MATHEMATICAL BOLD ITALIC SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
 1D74E;MATHEMATICAL BOLD ITALIC SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
-1D74F;MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL;Sm;0;L;<font> 2202;;;;Y;;;;;
+1D74F;MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL;Sm;0;ON;<font> 2202;;;;Y;;;;;
 1D750;MATHEMATICAL BOLD ITALIC EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
 1D751;MATHEMATICAL BOLD ITALIC THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
 1D752;MATHEMATICAL BOLD ITALIC KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
@@ -18188,7 +20572,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1D786;MATHEMATICAL SANS-SERIF BOLD SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
 1D787;MATHEMATICAL SANS-SERIF BOLD SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
 1D788;MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
-1D789;MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL;Sm;0;L;<font> 2202;;;;Y;;;;;
+1D789;MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL;Sm;0;ON;<font> 2202;;;;Y;;;;;
 1D78A;MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
 1D78B;MATHEMATICAL SANS-SERIF BOLD THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
 1D78C;MATHEMATICAL SANS-SERIF BOLD KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
@@ -18246,7 +20630,7 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1D7C0;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL CHI;Ll;0;L;<font> 03C7;;;;N;;;;;
 1D7C1;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PSI;Ll;0;L;<font> 03C8;;;;N;;;;;
 1D7C2;MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA;Ll;0;L;<font> 03C9;;;;N;;;;;
-1D7C3;MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL;Sm;0;L;<font> 2202;;;;Y;;;;;
+1D7C3;MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL;Sm;0;ON;<font> 2202;;;;Y;;;;;
 1D7C4;MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL;Ll;0;L;<font> 03F5;;;;N;;;;;
 1D7C5;MATHEMATICAL SANS-SERIF BOLD ITALIC THETA SYMBOL;Ll;0;L;<font> 03D1;;;;N;;;;;
 1D7C6;MATHEMATICAL SANS-SERIF BOLD ITALIC KAPPA SYMBOL;Ll;0;L;<font> 03F0;;;;N;;;;;
@@ -18449,8 +20833,117 @@ FFFD;REPLACEMENT CHARACTER;So;0;ON;;;;;N;;;;;
 1F091;DOMINO TILE VERTICAL-06-04;So;0;ON;;;;;N;;;;;
 1F092;DOMINO TILE VERTICAL-06-05;So;0;ON;;;;;N;;;;;
 1F093;DOMINO TILE VERTICAL-06-06;So;0;ON;;;;;N;;;;;
+1F100;DIGIT ZERO FULL STOP;No;0;EN;<compat> 0030 002E;;0;0;N;;;;;
+1F101;DIGIT ZERO COMMA;No;0;EN;<compat> 0030 002C;;0;0;N;;;;;
+1F102;DIGIT ONE COMMA;No;0;EN;<compat> 0031 002C;;1;1;N;;;;;
+1F103;DIGIT TWO COMMA;No;0;EN;<compat> 0032 002C;;2;2;N;;;;;
+1F104;DIGIT THREE COMMA;No;0;EN;<compat> 0033 002C;;3;3;N;;;;;
+1F105;DIGIT FOUR COMMA;No;0;EN;<compat> 0034 002C;;4;4;N;;;;;
+1F106;DIGIT FIVE COMMA;No;0;EN;<compat> 0035 002C;;5;5;N;;;;;
+1F107;DIGIT SIX COMMA;No;0;EN;<compat> 0036 002C;;6;6;N;;;;;
+1F108;DIGIT SEVEN COMMA;No;0;EN;<compat> 0037 002C;;7;7;N;;;;;
+1F109;DIGIT EIGHT COMMA;No;0;EN;<compat> 0038 002C;;8;8;N;;;;;
+1F10A;DIGIT NINE COMMA;No;0;EN;<compat> 0039 002C;;9;9;N;;;;;
+1F110;PARENTHESIZED LATIN CAPITAL LETTER A;So;0;L;<compat> 0028 0041 0029;;;;N;;;;;
+1F111;PARENTHESIZED LATIN CAPITAL LETTER B;So;0;L;<compat> 0028 0042 0029;;;;N;;;;;
+1F112;PARENTHESIZED LATIN CAPITAL LETTER C;So;0;L;<compat> 0028 0043 0029;;;;N;;;;;
+1F113;PARENTHESIZED LATIN CAPITAL LETTER D;So;0;L;<compat> 0028 0044 0029;;;;N;;;;;
+1F114;PARENTHESIZED LATIN CAPITAL LETTER E;So;0;L;<compat> 0028 0045 0029;;;;N;;;;;
+1F115;PARENTHESIZED LATIN CAPITAL LETTER F;So;0;L;<compat> 0028 0046 0029;;;;N;;;;;
+1F116;PARENTHESIZED LATIN CAPITAL LETTER G;So;0;L;<compat> 0028 0047 0029;;;;N;;;;;
+1F117;PARENTHESIZED LATIN CAPITAL LETTER H;So;0;L;<compat> 0028 0048 0029;;;;N;;;;;
+1F118;PARENTHESIZED LATIN CAPITAL LETTER I;So;0;L;<compat> 0028 0049 0029;;;;N;;;;;
+1F119;PARENTHESIZED LATIN CAPITAL LETTER J;So;0;L;<compat> 0028 004A 0029;;;;N;;;;;
+1F11A;PARENTHESIZED LATIN CAPITAL LETTER K;So;0;L;<compat> 0028 004B 0029;;;;N;;;;;
+1F11B;PARENTHESIZED LATIN CAPITAL LETTER L;So;0;L;<compat> 0028 004C 0029;;;;N;;;;;
+1F11C;PARENTHESIZED LATIN CAPITAL LETTER M;So;0;L;<compat> 0028 004D 0029;;;;N;;;;;
+1F11D;PARENTHESIZED LATIN CAPITAL LETTER N;So;0;L;<compat> 0028 004E 0029;;;;N;;;;;
+1F11E;PARENTHESIZED LATIN CAPITAL LETTER O;So;0;L;<compat> 0028 004F 0029;;;;N;;;;;
+1F11F;PARENTHESIZED LATIN CAPITAL LETTER P;So;0;L;<compat> 0028 0050 0029;;;;N;;;;;
+1F120;PARENTHESIZED LATIN CAPITAL LETTER Q;So;0;L;<compat> 0028 0051 0029;;;;N;;;;;
+1F121;PARENTHESIZED LATIN CAPITAL LETTER R;So;0;L;<compat> 0028 0052 0029;;;;N;;;;;
+1F122;PARENTHESIZED LATIN CAPITAL LETTER S;So;0;L;<compat> 0028 0053 0029;;;;N;;;;;
+1F123;PARENTHESIZED LATIN CAPITAL LETTER T;So;0;L;<compat> 0028 0054 0029;;;;N;;;;;
+1F124;PARENTHESIZED LATIN CAPITAL LETTER U;So;0;L;<compat> 0028 0055 0029;;;;N;;;;;
+1F125;PARENTHESIZED LATIN CAPITAL LETTER V;So;0;L;<compat> 0028 0056 0029;;;;N;;;;;
+1F126;PARENTHESIZED LATIN CAPITAL LETTER W;So;0;L;<compat> 0028 0057 0029;;;;N;;;;;
+1F127;PARENTHESIZED LATIN CAPITAL LETTER X;So;0;L;<compat> 0028 0058 0029;;;;N;;;;;
+1F128;PARENTHESIZED LATIN CAPITAL LETTER Y;So;0;L;<compat> 0028 0059 0029;;;;N;;;;;
+1F129;PARENTHESIZED LATIN CAPITAL LETTER Z;So;0;L;<compat> 0028 005A 0029;;;;N;;;;;
+1F12A;TORTOISE SHELL BRACKETED LATIN CAPITAL LETTER S;So;0;L;<compat> 3014 0053 3015;;;;N;;;;;
+1F12B;CIRCLED ITALIC LATIN CAPITAL LETTER C;So;0;L;<circle> 0043;;;;N;;;;;
+1F12C;CIRCLED ITALIC LATIN CAPITAL LETTER R;So;0;L;<circle> 0052;;;;N;;;;;
+1F12D;CIRCLED CD;So;0;L;<circle> 0043 0044;;;;N;;;;;
+1F12E;CIRCLED WZ;So;0;L;<circle> 0057 005A;;;;N;;;;;
+1F131;SQUARED LATIN CAPITAL LETTER B;So;0;L;<square> 0042;;;;N;;;;;
+1F13D;SQUARED LATIN CAPITAL LETTER N;So;0;L;<square> 004E;;;;N;;;;;
+1F13F;SQUARED LATIN CAPITAL LETTER P;So;0;L;<square> 0050;;;;N;;;;;
+1F142;SQUARED LATIN CAPITAL LETTER S;So;0;L;<square> 0053;;;;N;;;;;
+1F146;SQUARED LATIN CAPITAL LETTER W;So;0;L;<square> 0057;;;;N;;;;;
+1F14A;SQUARED HV;So;0;L;<square> 0048 0056;;;;N;;;;;
+1F14B;SQUARED MV;So;0;L;<square> 004D 0056;;;;N;;;;;
+1F14C;SQUARED SD;So;0;L;<square> 0053 0044;;;;N;;;;;
+1F14D;SQUARED SS;So;0;L;<square> 0053 0053;;;;N;;;;;
+1F14E;SQUARED PPV;So;0;L;<square> 0050 0050 0056;;;;N;;;;;
+1F157;NEGATIVE CIRCLED LATIN CAPITAL LETTER H;So;0;L;;;;;N;;;;;
+1F15F;NEGATIVE CIRCLED LATIN CAPITAL LETTER P;So;0;L;;;;;N;;;;;
+1F179;NEGATIVE SQUARED LATIN CAPITAL LETTER J;So;0;L;;;;;N;;;;;
+1F17B;NEGATIVE SQUARED LATIN CAPITAL LETTER L;So;0;L;;;;;N;;;;;
+1F17C;NEGATIVE SQUARED LATIN CAPITAL LETTER M;So;0;L;;;;;N;;;;;
+1F17F;NEGATIVE SQUARED LATIN CAPITAL LETTER P;So;0;L;;;;;N;;;;;
+1F18A;CROSSED NEGATIVE SQUARED LATIN CAPITAL LETTER P;So;0;L;;;;;N;;;;;
+1F18B;NEGATIVE SQUARED IC;So;0;L;;;;;N;;;;;
+1F18C;NEGATIVE SQUARED PA;So;0;L;;;;;N;;;;;
+1F18D;NEGATIVE SQUARED SA;So;0;L;;;;;N;;;;;
+1F190;SQUARE DJ;So;0;L;<square> 0044 004A;;;;N;;;;;
+1F200;SQUARE HIRAGANA HOKA;So;0;L;<square> 307B 304B;;;;N;;;;;
+1F210;SQUARED CJK UNIFIED IDEOGRAPH-624B;So;0;L;<square> 624B;;;;N;;;;;
+1F211;SQUARED CJK UNIFIED IDEOGRAPH-5B57;So;0;L;<square> 5B57;;;;N;;;;;
+1F212;SQUARED CJK UNIFIED IDEOGRAPH-53CC;So;0;L;<square> 53CC;;;;N;;;;;
+1F213;SQUARED KATAKANA DE;So;0;L;<square> 30C7;;;;N;;;;;
+1F214;SQUARED CJK UNIFIED IDEOGRAPH-4E8C;So;0;L;<square> 4E8C;;;;N;;;;;
+1F215;SQUARED CJK UNIFIED IDEOGRAPH-591A;So;0;L;<square> 591A;;;;N;;;;;
+1F216;SQUARED CJK UNIFIED IDEOGRAPH-89E3;So;0;L;<square> 89E3;;;;N;;;;;
+1F217;SQUARED CJK UNIFIED IDEOGRAPH-5929;So;0;L;<square> 5929;;;;N;;;;;
+1F218;SQUARED CJK UNIFIED IDEOGRAPH-4EA4;So;0;L;<square> 4EA4;;;;N;;;;;
+1F219;SQUARED CJK UNIFIED IDEOGRAPH-6620;So;0;L;<square> 6620;;;;N;;;;;
+1F21A;SQUARED CJK UNIFIED IDEOGRAPH-7121;So;0;L;<square> 7121;;;;N;;;;;
+1F21B;SQUARED CJK UNIFIED IDEOGRAPH-6599;So;0;L;<square> 6599;;;;N;;;;;
+1F21C;SQUARED CJK UNIFIED IDEOGRAPH-524D;So;0;L;<square> 524D;;;;N;;;;;
+1F21D;SQUARED CJK UNIFIED IDEOGRAPH-5F8C;So;0;L;<square> 5F8C;;;;N;;;;;
+1F21E;SQUARED CJK UNIFIED IDEOGRAPH-518D;So;0;L;<square> 518D;;;;N;;;;;
+1F21F;SQUARED CJK UNIFIED IDEOGRAPH-65B0;So;0;L;<square> 65B0;;;;N;;;;;
+1F220;SQUARED CJK UNIFIED IDEOGRAPH-521D;So;0;L;<square> 521D;;;;N;;;;;
+1F221;SQUARED CJK UNIFIED IDEOGRAPH-7D42;So;0;L;<square> 7D42;;;;N;;;;;
+1F222;SQUARED CJK UNIFIED IDEOGRAPH-751F;So;0;L;<square> 751F;;;;N;;;;;
+1F223;SQUARED CJK UNIFIED IDEOGRAPH-8CA9;So;0;L;<square> 8CA9;;;;N;;;;;
+1F224;SQUARED CJK UNIFIED IDEOGRAPH-58F0;So;0;L;<square> 58F0;;;;N;;;;;
+1F225;SQUARED CJK UNIFIED IDEOGRAPH-5439;So;0;L;<square> 5439;;;;N;;;;;
+1F226;SQUARED CJK UNIFIED IDEOGRAPH-6F14;So;0;L;<square> 6F14;;;;N;;;;;
+1F227;SQUARED CJK UNIFIED IDEOGRAPH-6295;So;0;L;<square> 6295;;;;N;;;;;
+1F228;SQUARED CJK UNIFIED IDEOGRAPH-6355;So;0;L;<square> 6355;;;;N;;;;;
+1F229;SQUARED CJK UNIFIED IDEOGRAPH-4E00;So;0;L;<square> 4E00;;;;N;;;;;
+1F22A;SQUARED CJK UNIFIED IDEOGRAPH-4E09;So;0;L;<square> 4E09;;;;N;;;;;
+1F22B;SQUARED CJK UNIFIED IDEOGRAPH-904A;So;0;L;<square> 904A;;;;N;;;;;
+1F22C;SQUARED CJK UNIFIED IDEOGRAPH-5DE6;So;0;L;<square> 5DE6;;;;N;;;;;
+1F22D;SQUARED CJK UNIFIED IDEOGRAPH-4E2D;So;0;L;<square> 4E2D;;;;N;;;;;
+1F22E;SQUARED CJK UNIFIED IDEOGRAPH-53F3;So;0;L;<square> 53F3;;;;N;;;;;
+1F22F;SQUARED CJK UNIFIED IDEOGRAPH-6307;So;0;L;<square> 6307;;;;N;;;;;
+1F230;SQUARED CJK UNIFIED IDEOGRAPH-8D70;So;0;L;<square> 8D70;;;;N;;;;;
+1F231;SQUARED CJK UNIFIED IDEOGRAPH-6253;So;0;L;<square> 6253;;;;N;;;;;
+1F240;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-672C;So;0;L;<compat> 3014 672C 3015;;;;N;;;;;
+1F241;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-4E09;So;0;L;<compat> 3014 4E09 3015;;;;N;;;;;
+1F242;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-4E8C;So;0;L;<compat> 3014 4E8C 3015;;;;N;;;;;
+1F243;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-5B89;So;0;L;<compat> 3014 5B89 3015;;;;N;;;;;
+1F244;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-70B9;So;0;L;<compat> 3014 70B9 3015;;;;N;;;;;
+1F245;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-6253;So;0;L;<compat> 3014 6253 3015;;;;N;;;;;
+1F246;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-76D7;So;0;L;<compat> 3014 76D7 3015;;;;N;;;;;
+1F247;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-52DD;So;0;L;<compat> 3014 52DD 3015;;;;N;;;;;
+1F248;TORTOISE SHELL BRACKETED CJK UNIFIED IDEOGRAPH-6557;So;0;L;<compat> 3014 6557 3015;;;;N;;;;;
 20000;<CJK Ideograph Extension B, First>;Lo;0;L;;;;;N;;;;;
 2A6D6;<CJK Ideograph Extension B, Last>;Lo;0;L;;;;;N;;;;;
+2A700;<CJK Ideograph Extension C, First>;Lo;0;L;;;;;N;;;;;
+2B734;<CJK Ideograph Extension C, Last>;Lo;0;L;;;;;N;;;;;
 2F800;CJK COMPATIBILITY IDEOGRAPH-2F800;Lo;0;L;4E3D;;;;N;;;;;
 2F801;CJK COMPATIBILITY IDEOGRAPH-2F801;Lo;0;L;4E38;;;;N;;;;;
 2F802;CJK COMPATIBILITY IDEOGRAPH-2F802;Lo;0;L;4E41;;;;N;;;;;

From 741b56af5ca4b8635c0c015e4e2d2a9bff0c3a11 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 23 Mar 2010 23:25:14 +0100
Subject: [PATCH 0664/1628] Moved unicode files to separate directory

---
 autogen.sh                        |   2 +-
 unicode/BidiMirroring.txt         | 588 ++++++++++++++++++++++++++++++
 {util => unicode}/UnicodeData.txt |   0
 3 files changed, 589 insertions(+), 1 deletion(-)
 create mode 100644 unicode/BidiMirroring.txt
 rename {util => unicode}/UnicodeData.txt (100%)

diff --git a/autogen.sh b/autogen.sh
index 524b908f5..7cbee5cca 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,7 +13,7 @@ echo timestamp > stamp-h.in
 
 python util/import_gcry.py lib/libgcrypt/ .
 
-python util/import_unicode.py util/UnicodeData.txt util/BidiMirroring.txt unidata.c
+python util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt unidata.c
 
 for rmk in conf/*.rmk ${GRUB_CONTRIB}/*/conf/*.rmk; do
   if test -e $rmk ; then
diff --git a/unicode/BidiMirroring.txt b/unicode/BidiMirroring.txt
new file mode 100644
index 000000000..81e838a7e
--- /dev/null
+++ b/unicode/BidiMirroring.txt
@@ -0,0 +1,588 @@
+# BidiMirroring-5.2.0.txt
+# Date: 2009-05-22, 12:44:00 PDT [KW]
+#
+# Bidi_Mirroring_Glyph Property
+# 
+# This file is an informative contributory data file in the
+# Unicode Character Database.
+#
+# Copyright (c) 1991-2009 Unicode, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
+# This data file lists characters that have the mirrored property
+# where there is another Unicode character that typically has a glyph
+# that is the mirror image of the original character's glyph.
+# The repertoire covered by the file is Unicode 5.2.0.
+# 
+# The file contains a list of lines with mappings from one code point
+# to another one for character-based mirroring.
+# Note that for "real" mirroring, a rendering engine needs to select
+# appropriate alternative glyphs, and that many Unicode characters do not
+# have a mirror-image Unicode character.
+# 
+# Each mapping line contains two fields, separated by a semicolon (';').
+# Each of the two fields contains a code point represented as a
+# variable-length hexadecimal value with 4 to 6 digits.
+# A comment indicates where the characters are "BEST FIT" mirroring.
+# 
+# Code points with the "mirrored" property but no appropriate mirrors are
+# listed as comments at the end of the file.
+# 
+# For information on bidi mirroring, see UAX #9: Bidirectional Algorithm,
+# at http://www.unicode.org/unicode/reports/tr9/
+# 
+# This file was originally created by Markus Scherer.
+# Extended for Unicode 3.2, 4.0, 4.1, 5.0, 5.1, and 5.2 by Ken Whistler.
+# 
+# ############################################################
+
+0028; 0029 # LEFT PARENTHESIS
+0029; 0028 # RIGHT PARENTHESIS
+003C; 003E # LESS-THAN SIGN
+003E; 003C # GREATER-THAN SIGN
+005B; 005D # LEFT SQUARE BRACKET
+005D; 005B # RIGHT SQUARE BRACKET
+007B; 007D # LEFT CURLY BRACKET
+007D; 007B # RIGHT CURLY BRACKET
+00AB; 00BB # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+00BB; 00AB # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+0F3A; 0F3B # TIBETAN MARK GUG RTAGS GYON
+0F3B; 0F3A # TIBETAN MARK GUG RTAGS GYAS
+0F3C; 0F3D # TIBETAN MARK ANG KHANG GYON
+0F3D; 0F3C # TIBETAN MARK ANG KHANG GYAS
+169B; 169C # OGHAM FEATHER MARK
+169C; 169B # OGHAM REVERSED FEATHER MARK
+2039; 203A # SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+203A; 2039 # SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+2045; 2046 # LEFT SQUARE BRACKET WITH QUILL
+2046; 2045 # RIGHT SQUARE BRACKET WITH QUILL
+207D; 207E # SUPERSCRIPT LEFT PARENTHESIS
+207E; 207D # SUPERSCRIPT RIGHT PARENTHESIS
+208D; 208E # SUBSCRIPT LEFT PARENTHESIS
+208E; 208D # SUBSCRIPT RIGHT PARENTHESIS
+2208; 220B # ELEMENT OF
+2209; 220C # NOT AN ELEMENT OF
+220A; 220D # SMALL ELEMENT OF
+220B; 2208 # CONTAINS AS MEMBER
+220C; 2209 # DOES NOT CONTAIN AS MEMBER
+220D; 220A # SMALL CONTAINS AS MEMBER
+2215; 29F5 # DIVISION SLASH
+223C; 223D # TILDE OPERATOR
+223D; 223C # REVERSED TILDE
+2243; 22CD # ASYMPTOTICALLY EQUAL TO
+2252; 2253 # APPROXIMATELY EQUAL TO OR THE IMAGE OF
+2253; 2252 # IMAGE OF OR APPROXIMATELY EQUAL TO
+2254; 2255 # COLON EQUALS
+2255; 2254 # EQUALS COLON
+2264; 2265 # LESS-THAN OR EQUAL TO
+2265; 2264 # GREATER-THAN OR EQUAL TO
+2266; 2267 # LESS-THAN OVER EQUAL TO
+2267; 2266 # GREATER-THAN OVER EQUAL TO
+2268; 2269 # [BEST FIT] LESS-THAN BUT NOT EQUAL TO
+2269; 2268 # [BEST FIT] GREATER-THAN BUT NOT EQUAL TO
+226A; 226B # MUCH LESS-THAN
+226B; 226A # MUCH GREATER-THAN
+226E; 226F # [BEST FIT] NOT LESS-THAN
+226F; 226E # [BEST FIT] NOT GREATER-THAN
+2270; 2271 # [BEST FIT] NEITHER LESS-THAN NOR EQUAL TO
+2271; 2270 # [BEST FIT] NEITHER GREATER-THAN NOR EQUAL TO
+2272; 2273 # [BEST FIT] LESS-THAN OR EQUIVALENT TO
+2273; 2272 # [BEST FIT] GREATER-THAN OR EQUIVALENT TO
+2274; 2275 # [BEST FIT] NEITHER LESS-THAN NOR EQUIVALENT TO
+2275; 2274 # [BEST FIT] NEITHER GREATER-THAN NOR EQUIVALENT TO
+2276; 2277 # LESS-THAN OR GREATER-THAN
+2277; 2276 # GREATER-THAN OR LESS-THAN
+2278; 2279 # [BEST FIT] NEITHER LESS-THAN NOR GREATER-THAN
+2279; 2278 # [BEST FIT] NEITHER GREATER-THAN NOR LESS-THAN
+227A; 227B # PRECEDES
+227B; 227A # SUCCEEDS
+227C; 227D # PRECEDES OR EQUAL TO
+227D; 227C # SUCCEEDS OR EQUAL TO
+227E; 227F # [BEST FIT] PRECEDES OR EQUIVALENT TO
+227F; 227E # [BEST FIT] SUCCEEDS OR EQUIVALENT TO
+2280; 2281 # [BEST FIT] DOES NOT PRECEDE
+2281; 2280 # [BEST FIT] DOES NOT SUCCEED
+2282; 2283 # SUBSET OF
+2283; 2282 # SUPERSET OF
+2284; 2285 # [BEST FIT] NOT A SUBSET OF
+2285; 2284 # [BEST FIT] NOT A SUPERSET OF
+2286; 2287 # SUBSET OF OR EQUAL TO
+2287; 2286 # SUPERSET OF OR EQUAL TO
+2288; 2289 # [BEST FIT] NEITHER A SUBSET OF NOR EQUAL TO
+2289; 2288 # [BEST FIT] NEITHER A SUPERSET OF NOR EQUAL TO
+228A; 228B # [BEST FIT] SUBSET OF WITH NOT EQUAL TO
+228B; 228A # [BEST FIT] SUPERSET OF WITH NOT EQUAL TO
+228F; 2290 # SQUARE IMAGE OF
+2290; 228F # SQUARE ORIGINAL OF
+2291; 2292 # SQUARE IMAGE OF OR EQUAL TO
+2292; 2291 # SQUARE ORIGINAL OF OR EQUAL TO
+2298; 29B8 # CIRCLED DIVISION SLASH
+22A2; 22A3 # RIGHT TACK
+22A3; 22A2 # LEFT TACK
+22A6; 2ADE # ASSERTION
+22A8; 2AE4 # TRUE
+22A9; 2AE3 # FORCES
+22AB; 2AE5 # DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE
+22B0; 22B1 # PRECEDES UNDER RELATION
+22B1; 22B0 # SUCCEEDS UNDER RELATION
+22B2; 22B3 # NORMAL SUBGROUP OF
+22B3; 22B2 # CONTAINS AS NORMAL SUBGROUP
+22B4; 22B5 # NORMAL SUBGROUP OF OR EQUAL TO
+22B5; 22B4 # CONTAINS AS NORMAL SUBGROUP OR EQUAL TO
+22B6; 22B7 # ORIGINAL OF
+22B7; 22B6 # IMAGE OF
+22C9; 22CA # LEFT NORMAL FACTOR SEMIDIRECT PRODUCT
+22CA; 22C9 # RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT
+22CB; 22CC # LEFT SEMIDIRECT PRODUCT
+22CC; 22CB # RIGHT SEMIDIRECT PRODUCT
+22CD; 2243 # REVERSED TILDE EQUALS
+22D0; 22D1 # DOUBLE SUBSET
+22D1; 22D0 # DOUBLE SUPERSET
+22D6; 22D7 # LESS-THAN WITH DOT
+22D7; 22D6 # GREATER-THAN WITH DOT
+22D8; 22D9 # VERY MUCH LESS-THAN
+22D9; 22D8 # VERY MUCH GREATER-THAN
+22DA; 22DB # LESS-THAN EQUAL TO OR GREATER-THAN
+22DB; 22DA # GREATER-THAN EQUAL TO OR LESS-THAN
+22DC; 22DD # EQUAL TO OR LESS-THAN
+22DD; 22DC # EQUAL TO OR GREATER-THAN
+22DE; 22DF # EQUAL TO OR PRECEDES
+22DF; 22DE # EQUAL TO OR SUCCEEDS
+22E0; 22E1 # [BEST FIT] DOES NOT PRECEDE OR EQUAL
+22E1; 22E0 # [BEST FIT] DOES NOT SUCCEED OR EQUAL
+22E2; 22E3 # [BEST FIT] NOT SQUARE IMAGE OF OR EQUAL TO
+22E3; 22E2 # [BEST FIT] NOT SQUARE ORIGINAL OF OR EQUAL TO
+22E4; 22E5 # [BEST FIT] SQUARE IMAGE OF OR NOT EQUAL TO
+22E5; 22E4 # [BEST FIT] SQUARE ORIGINAL OF OR NOT EQUAL TO
+22E6; 22E7 # [BEST FIT] LESS-THAN BUT NOT EQUIVALENT TO
+22E7; 22E6 # [BEST FIT] GREATER-THAN BUT NOT EQUIVALENT TO
+22E8; 22E9 # [BEST FIT] PRECEDES BUT NOT EQUIVALENT TO
+22E9; 22E8 # [BEST FIT] SUCCEEDS BUT NOT EQUIVALENT TO
+22EA; 22EB # [BEST FIT] NOT NORMAL SUBGROUP OF
+22EB; 22EA # [BEST FIT] DOES NOT CONTAIN AS NORMAL SUBGROUP
+22EC; 22ED # [BEST FIT] NOT NORMAL SUBGROUP OF OR EQUAL TO
+22ED; 22EC # [BEST FIT] DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL
+22F0; 22F1 # UP RIGHT DIAGONAL ELLIPSIS
+22F1; 22F0 # DOWN RIGHT DIAGONAL ELLIPSIS
+22F2; 22FA # ELEMENT OF WITH LONG HORIZONTAL STROKE
+22F3; 22FB # ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE
+22F4; 22FC # SMALL ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE
+22F6; 22FD # ELEMENT OF WITH OVERBAR
+22F7; 22FE # SMALL ELEMENT OF WITH OVERBAR
+22FA; 22F2 # CONTAINS WITH LONG HORIZONTAL STROKE
+22FB; 22F3 # CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE
+22FC; 22F4 # SMALL CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE
+22FD; 22F6 # CONTAINS WITH OVERBAR
+22FE; 22F7 # SMALL CONTAINS WITH OVERBAR
+2308; 2309 # LEFT CEILING
+2309; 2308 # RIGHT CEILING
+230A; 230B # LEFT FLOOR
+230B; 230A # RIGHT FLOOR
+2329; 232A # LEFT-POINTING ANGLE BRACKET
+232A; 2329 # RIGHT-POINTING ANGLE BRACKET
+2768; 2769 # MEDIUM LEFT PARENTHESIS ORNAMENT
+2769; 2768 # MEDIUM RIGHT PARENTHESIS ORNAMENT
+276A; 276B # MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT
+276B; 276A # MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT
+276C; 276D # MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT
+276D; 276C # MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT
+276E; 276F # HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT
+276F; 276E # HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT
+2770; 2771 # HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT
+2771; 2770 # HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT
+2772; 2773 # LIGHT LEFT TORTOISE SHELL BRACKET
+2773; 2772 # LIGHT RIGHT TORTOISE SHELL BRACKET
+2774; 2775 # MEDIUM LEFT CURLY BRACKET ORNAMENT
+2775; 2774 # MEDIUM RIGHT CURLY BRACKET ORNAMENT
+27C3; 27C4 # OPEN SUBSET
+27C4; 27C3 # OPEN SUPERSET
+27C5; 27C6 # LEFT S-SHAPED BAG DELIMITER
+27C6; 27C5 # RIGHT S-SHAPED BAG DELIMITER
+27C8; 27C9 # REVERSE SOLIDUS PRECEDING SUBSET
+27C9; 27C8 # SUPERSET PRECEDING SOLIDUS
+27D5; 27D6 # LEFT OUTER JOIN
+27D6; 27D5 # RIGHT OUTER JOIN
+27DD; 27DE # LONG RIGHT TACK
+27DE; 27DD # LONG LEFT TACK
+27E2; 27E3 # WHITE CONCAVE-SIDED DIAMOND WITH LEFTWARDS TICK
+27E3; 27E2 # WHITE CONCAVE-SIDED DIAMOND WITH RIGHTWARDS TICK
+27E4; 27E5 # WHITE SQUARE WITH LEFTWARDS TICK
+27E5; 27E4 # WHITE SQUARE WITH RIGHTWARDS TICK
+27E6; 27E7 # MATHEMATICAL LEFT WHITE SQUARE BRACKET
+27E7; 27E6 # MATHEMATICAL RIGHT WHITE SQUARE BRACKET
+27E8; 27E9 # MATHEMATICAL LEFT ANGLE BRACKET
+27E9; 27E8 # MATHEMATICAL RIGHT ANGLE BRACKET
+27EA; 27EB # MATHEMATICAL LEFT DOUBLE ANGLE BRACKET
+27EB; 27EA # MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET
+27EC; 27ED # MATHEMATICAL LEFT WHITE TORTOISE SHELL BRACKET
+27ED; 27EC # MATHEMATICAL RIGHT WHITE TORTOISE SHELL BRACKET
+27EE; 27EF # MATHEMATICAL LEFT FLATTENED PARENTHESIS
+27EF; 27EE # MATHEMATICAL RIGHT FLATTENED PARENTHESIS
+2983; 2984 # LEFT WHITE CURLY BRACKET
+2984; 2983 # RIGHT WHITE CURLY BRACKET
+2985; 2986 # LEFT WHITE PARENTHESIS
+2986; 2985 # RIGHT WHITE PARENTHESIS
+2987; 2988 # Z NOTATION LEFT IMAGE BRACKET
+2988; 2987 # Z NOTATION RIGHT IMAGE BRACKET
+2989; 298A # Z NOTATION LEFT BINDING BRACKET
+298A; 2989 # Z NOTATION RIGHT BINDING BRACKET
+298B; 298C # LEFT SQUARE BRACKET WITH UNDERBAR
+298C; 298B # RIGHT SQUARE BRACKET WITH UNDERBAR
+298D; 2990 # LEFT SQUARE BRACKET WITH TICK IN TOP CORNER
+298E; 298F # RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
+298F; 298E # LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
+2990; 298D # RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER
+2991; 2992 # LEFT ANGLE BRACKET WITH DOT
+2992; 2991 # RIGHT ANGLE BRACKET WITH DOT
+2993; 2994 # LEFT ARC LESS-THAN BRACKET
+2994; 2993 # RIGHT ARC GREATER-THAN BRACKET
+2995; 2996 # DOUBLE LEFT ARC GREATER-THAN BRACKET
+2996; 2995 # DOUBLE RIGHT ARC LESS-THAN BRACKET
+2997; 2998 # LEFT BLACK TORTOISE SHELL BRACKET
+2998; 2997 # RIGHT BLACK TORTOISE SHELL BRACKET
+29B8; 2298 # CIRCLED REVERSE SOLIDUS
+29C0; 29C1 # CIRCLED LESS-THAN
+29C1; 29C0 # CIRCLED GREATER-THAN
+29C4; 29C5 # SQUARED RISING DIAGONAL SLASH
+29C5; 29C4 # SQUARED FALLING DIAGONAL SLASH
+29CF; 29D0 # LEFT TRIANGLE BESIDE VERTICAL BAR
+29D0; 29CF # VERTICAL BAR BESIDE RIGHT TRIANGLE
+29D1; 29D2 # BOWTIE WITH LEFT HALF BLACK
+29D2; 29D1 # BOWTIE WITH RIGHT HALF BLACK
+29D4; 29D5 # TIMES WITH LEFT HALF BLACK
+29D5; 29D4 # TIMES WITH RIGHT HALF BLACK
+29D8; 29D9 # LEFT WIGGLY FENCE
+29D9; 29D8 # RIGHT WIGGLY FENCE
+29DA; 29DB # LEFT DOUBLE WIGGLY FENCE
+29DB; 29DA # RIGHT DOUBLE WIGGLY FENCE
+29F5; 2215 # REVERSE SOLIDUS OPERATOR
+29F8; 29F9 # BIG SOLIDUS
+29F9; 29F8 # BIG REVERSE SOLIDUS
+29FC; 29FD # LEFT-POINTING CURVED ANGLE BRACKET
+29FD; 29FC # RIGHT-POINTING CURVED ANGLE BRACKET
+2A2B; 2A2C # MINUS SIGN WITH FALLING DOTS
+2A2C; 2A2B # MINUS SIGN WITH RISING DOTS
+2A2D; 2A2E # PLUS SIGN IN LEFT HALF CIRCLE
+2A2E; 2A2D # PLUS SIGN IN RIGHT HALF CIRCLE
+2A34; 2A35 # MULTIPLICATION SIGN IN LEFT HALF CIRCLE
+2A35; 2A34 # MULTIPLICATION SIGN IN RIGHT HALF CIRCLE
+2A3C; 2A3D # INTERIOR PRODUCT
+2A3D; 2A3C # RIGHTHAND INTERIOR PRODUCT
+2A64; 2A65 # Z NOTATION DOMAIN ANTIRESTRICTION
+2A65; 2A64 # Z NOTATION RANGE ANTIRESTRICTION
+2A79; 2A7A # LESS-THAN WITH CIRCLE INSIDE
+2A7A; 2A79 # GREATER-THAN WITH CIRCLE INSIDE
+2A7D; 2A7E # LESS-THAN OR SLANTED EQUAL TO
+2A7E; 2A7D # GREATER-THAN OR SLANTED EQUAL TO
+2A7F; 2A80 # LESS-THAN OR SLANTED EQUAL TO WITH DOT INSIDE
+2A80; 2A7F # GREATER-THAN OR SLANTED EQUAL TO WITH DOT INSIDE
+2A81; 2A82 # LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE
+2A82; 2A81 # GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE
+2A83; 2A84 # LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE RIGHT
+2A84; 2A83 # GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE LEFT
+2A8B; 2A8C # LESS-THAN ABOVE DOUBLE-LINE EQUAL ABOVE GREATER-THAN
+2A8C; 2A8B # GREATER-THAN ABOVE DOUBLE-LINE EQUAL ABOVE LESS-THAN
+2A91; 2A92 # LESS-THAN ABOVE GREATER-THAN ABOVE DOUBLE-LINE EQUAL
+2A92; 2A91 # GREATER-THAN ABOVE LESS-THAN ABOVE DOUBLE-LINE EQUAL
+2A93; 2A94 # LESS-THAN ABOVE SLANTED EQUAL ABOVE GREATER-THAN ABOVE SLANTED EQUAL
+2A94; 2A93 # GREATER-THAN ABOVE SLANTED EQUAL ABOVE LESS-THAN ABOVE SLANTED EQUAL
+2A95; 2A96 # SLANTED EQUAL TO OR LESS-THAN
+2A96; 2A95 # SLANTED EQUAL TO OR GREATER-THAN
+2A97; 2A98 # SLANTED EQUAL TO OR LESS-THAN WITH DOT INSIDE
+2A98; 2A97 # SLANTED EQUAL TO OR GREATER-THAN WITH DOT INSIDE
+2A99; 2A9A # DOUBLE-LINE EQUAL TO OR LESS-THAN
+2A9A; 2A99 # DOUBLE-LINE EQUAL TO OR GREATER-THAN
+2A9B; 2A9C # DOUBLE-LINE SLANTED EQUAL TO OR LESS-THAN
+2A9C; 2A9B # DOUBLE-LINE SLANTED EQUAL TO OR GREATER-THAN
+2AA1; 2AA2 # DOUBLE NESTED LESS-THAN
+2AA2; 2AA1 # DOUBLE NESTED GREATER-THAN
+2AA6; 2AA7 # LESS-THAN CLOSED BY CURVE
+2AA7; 2AA6 # GREATER-THAN CLOSED BY CURVE
+2AA8; 2AA9 # LESS-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL
+2AA9; 2AA8 # GREATER-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL
+2AAA; 2AAB # SMALLER THAN
+2AAB; 2AAA # LARGER THAN
+2AAC; 2AAD # SMALLER THAN OR EQUAL TO
+2AAD; 2AAC # LARGER THAN OR EQUAL TO
+2AAF; 2AB0 # PRECEDES ABOVE SINGLE-LINE EQUALS SIGN
+2AB0; 2AAF # SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN
+2AB3; 2AB4 # PRECEDES ABOVE EQUALS SIGN
+2AB4; 2AB3 # SUCCEEDS ABOVE EQUALS SIGN
+2ABB; 2ABC # DOUBLE PRECEDES
+2ABC; 2ABB # DOUBLE SUCCEEDS
+2ABD; 2ABE # SUBSET WITH DOT
+2ABE; 2ABD # SUPERSET WITH DOT
+2ABF; 2AC0 # SUBSET WITH PLUS SIGN BELOW
+2AC0; 2ABF # SUPERSET WITH PLUS SIGN BELOW
+2AC1; 2AC2 # SUBSET WITH MULTIPLICATION SIGN BELOW
+2AC2; 2AC1 # SUPERSET WITH MULTIPLICATION SIGN BELOW
+2AC3; 2AC4 # SUBSET OF OR EQUAL TO WITH DOT ABOVE
+2AC4; 2AC3 # SUPERSET OF OR EQUAL TO WITH DOT ABOVE
+2AC5; 2AC6 # SUBSET OF ABOVE EQUALS SIGN
+2AC6; 2AC5 # SUPERSET OF ABOVE EQUALS SIGN
+2ACD; 2ACE # SQUARE LEFT OPEN BOX OPERATOR
+2ACE; 2ACD # SQUARE RIGHT OPEN BOX OPERATOR
+2ACF; 2AD0 # CLOSED SUBSET
+2AD0; 2ACF # CLOSED SUPERSET
+2AD1; 2AD2 # CLOSED SUBSET OR EQUAL TO
+2AD2; 2AD1 # CLOSED SUPERSET OR EQUAL TO
+2AD3; 2AD4 # SUBSET ABOVE SUPERSET
+2AD4; 2AD3 # SUPERSET ABOVE SUBSET
+2AD5; 2AD6 # SUBSET ABOVE SUBSET
+2AD6; 2AD5 # SUPERSET ABOVE SUPERSET
+2ADE; 22A6 # SHORT LEFT TACK
+2AE3; 22A9 # DOUBLE VERTICAL BAR LEFT TURNSTILE
+2AE4; 22A8 # VERTICAL BAR DOUBLE LEFT TURNSTILE
+2AE5; 22AB # DOUBLE VERTICAL BAR DOUBLE LEFT TURNSTILE
+2AEC; 2AED # DOUBLE STROKE NOT SIGN
+2AED; 2AEC # REVERSED DOUBLE STROKE NOT SIGN
+2AF7; 2AF8 # TRIPLE NESTED LESS-THAN
+2AF8; 2AF7 # TRIPLE NESTED GREATER-THAN
+2AF9; 2AFA # DOUBLE-LINE SLANTED LESS-THAN OR EQUAL TO
+2AFA; 2AF9 # DOUBLE-LINE SLANTED GREATER-THAN OR EQUAL TO
+2E02; 2E03 # LEFT SUBSTITUTION BRACKET
+2E03; 2E02 # RIGHT SUBSTITUTION BRACKET
+2E04; 2E05 # LEFT DOTTED SUBSTITUTION BRACKET
+2E05; 2E04 # RIGHT DOTTED SUBSTITUTION BRACKET
+2E09; 2E0A # LEFT TRANSPOSITION BRACKET
+2E0A; 2E09 # RIGHT TRANSPOSITION BRACKET
+2E0C; 2E0D # LEFT RAISED OMISSION BRACKET
+2E0D; 2E0C # RIGHT RAISED OMISSION BRACKET
+2E1C; 2E1D # LEFT LOW PARAPHRASE BRACKET
+2E1D; 2E1C # RIGHT LOW PARAPHRASE BRACKET
+2E20; 2E21 # LEFT VERTICAL BAR WITH QUILL
+2E21; 2E20 # RIGHT VERTICAL BAR WITH QUILL
+2E22; 2E23 # TOP LEFT HALF BRACKET
+2E23; 2E22 # TOP RIGHT HALF BRACKET
+2E24; 2E25 # BOTTOM LEFT HALF BRACKET
+2E25; 2E24 # BOTTOM RIGHT HALF BRACKET
+2E26; 2E27 # LEFT SIDEWAYS U BRACKET
+2E27; 2E26 # RIGHT SIDEWAYS U BRACKET
+2E28; 2E29 # LEFT DOUBLE PARENTHESIS
+2E29; 2E28 # RIGHT DOUBLE PARENTHESIS
+3008; 3009 # LEFT ANGLE BRACKET
+3009; 3008 # RIGHT ANGLE BRACKET
+300A; 300B # LEFT DOUBLE ANGLE BRACKET
+300B; 300A # RIGHT DOUBLE ANGLE BRACKET
+300C; 300D # [BEST FIT] LEFT CORNER BRACKET
+300D; 300C # [BEST FIT] RIGHT CORNER BRACKET
+300E; 300F # [BEST FIT] LEFT WHITE CORNER BRACKET
+300F; 300E # [BEST FIT] RIGHT WHITE CORNER BRACKET
+3010; 3011 # LEFT BLACK LENTICULAR BRACKET
+3011; 3010 # RIGHT BLACK LENTICULAR BRACKET
+3014; 3015 # LEFT TORTOISE SHELL BRACKET
+3015; 3014 # RIGHT TORTOISE SHELL BRACKET
+3016; 3017 # LEFT WHITE LENTICULAR BRACKET
+3017; 3016 # RIGHT WHITE LENTICULAR BRACKET
+3018; 3019 # LEFT WHITE TORTOISE SHELL BRACKET
+3019; 3018 # RIGHT WHITE TORTOISE SHELL BRACKET
+301A; 301B # LEFT WHITE SQUARE BRACKET
+301B; 301A # RIGHT WHITE SQUARE BRACKET
+FE59; FE5A # SMALL LEFT PARENTHESIS
+FE5A; FE59 # SMALL RIGHT PARENTHESIS
+FE5B; FE5C # SMALL LEFT CURLY BRACKET
+FE5C; FE5B # SMALL RIGHT CURLY BRACKET
+FE5D; FE5E # SMALL LEFT TORTOISE SHELL BRACKET
+FE5E; FE5D # SMALL RIGHT TORTOISE SHELL BRACKET
+FE64; FE65 # SMALL LESS-THAN SIGN
+FE65; FE64 # SMALL GREATER-THAN SIGN
+FF08; FF09 # FULLWIDTH LEFT PARENTHESIS
+FF09; FF08 # FULLWIDTH RIGHT PARENTHESIS
+FF1C; FF1E # FULLWIDTH LESS-THAN SIGN
+FF1E; FF1C # FULLWIDTH GREATER-THAN SIGN
+FF3B; FF3D # FULLWIDTH LEFT SQUARE BRACKET
+FF3D; FF3B # FULLWIDTH RIGHT SQUARE BRACKET
+FF5B; FF5D # FULLWIDTH LEFT CURLY BRACKET
+FF5D; FF5B # FULLWIDTH RIGHT CURLY BRACKET
+FF5F; FF60 # FULLWIDTH LEFT WHITE PARENTHESIS
+FF60; FF5F # FULLWIDTH RIGHT WHITE PARENTHESIS
+FF62; FF63 # [BEST FIT] HALFWIDTH LEFT CORNER BRACKET
+FF63; FF62 # [BEST FIT] HALFWIDTH RIGHT CORNER BRACKET
+
+# The following characters have no appropriate mirroring character.
+# For these characters it is up to the rendering system
+#   to provide mirrored glyphs.
+
+# 2140; DOUBLE-STRUCK N-ARY SUMMATION
+# 2201; COMPLEMENT
+# 2202; PARTIAL DIFFERENTIAL
+# 2203; THERE EXISTS
+# 2204; THERE DOES NOT EXIST
+# 2211; N-ARY SUMMATION
+# 2216; SET MINUS
+# 221A; SQUARE ROOT
+# 221B; CUBE ROOT
+# 221C; FOURTH ROOT
+# 221D; PROPORTIONAL TO
+# 221F; RIGHT ANGLE
+# 2220; ANGLE
+# 2221; MEASURED ANGLE
+# 2222; SPHERICAL ANGLE
+# 2224; DOES NOT DIVIDE
+# 2226; NOT PARALLEL TO
+# 222B; INTEGRAL
+# 222C; DOUBLE INTEGRAL
+# 222D; TRIPLE INTEGRAL
+# 222E; CONTOUR INTEGRAL
+# 222F; SURFACE INTEGRAL
+# 2230; VOLUME INTEGRAL
+# 2231; CLOCKWISE INTEGRAL
+# 2232; CLOCKWISE CONTOUR INTEGRAL
+# 2233; ANTICLOCKWISE CONTOUR INTEGRAL
+# 2239; EXCESS
+# 223B; HOMOTHETIC
+# 223E; INVERTED LAZY S
+# 223F; SINE WAVE
+# 2240; WREATH PRODUCT
+# 2241; NOT TILDE
+# 2242; MINUS TILDE
+# 2244; NOT ASYMPTOTICALLY EQUAL TO
+# 2245; APPROXIMATELY EQUAL TO
+# 2246; APPROXIMATELY BUT NOT ACTUALLY EQUAL TO
+# 2247; NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO
+# 2248; ALMOST EQUAL TO
+# 2249; NOT ALMOST EQUAL TO
+# 224A; ALMOST EQUAL OR EQUAL TO
+# 224B; TRIPLE TILDE
+# 224C; ALL EQUAL TO
+# 225F; QUESTIONED EQUAL TO
+# 2260; NOT EQUAL TO
+# 2262; NOT IDENTICAL TO
+# 228C; MULTISET
+# 22A7; MODELS
+# 22AA; TRIPLE VERTICAL BAR RIGHT TURNSTILE
+# 22AC; DOES NOT PROVE
+# 22AD; NOT TRUE
+# 22AE; DOES NOT FORCE
+# 22AF; NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE
+# 22B8; MULTIMAP
+# 22BE; RIGHT ANGLE WITH ARC
+# 22BF; RIGHT TRIANGLE
+# 22F5; ELEMENT OF WITH DOT ABOVE
+# 22F8; ELEMENT OF WITH UNDERBAR
+# 22F9; ELEMENT OF WITH TWO HORIZONTAL STROKES
+# 22FF; Z NOTATION BAG MEMBERSHIP
+# 2320; TOP HALF INTEGRAL
+# 2321; BOTTOM HALF INTEGRAL
+# 27CC; LONG DIVISION
+# 27C0; THREE DIMENSIONAL ANGLE
+# 27D3; LOWER RIGHT CORNER WITH DOT
+# 27D4; UPPER LEFT CORNER WITH DOT
+# 27DC; LEFT MULTIMAP
+# 299B; MEASURED ANGLE OPENING LEFT
+# 299C; RIGHT ANGLE VARIANT WITH SQUARE
+# 299D; MEASURED RIGHT ANGLE WITH DOT
+# 299E; ANGLE WITH S INSIDE
+# 299F; ACUTE ANGLE
+# 29A0; SPHERICAL ANGLE OPENING LEFT
+# 29A1; SPHERICAL ANGLE OPENING UP
+# 29A2; TURNED ANGLE
+# 29A3; REVERSED ANGLE
+# 29A4; ANGLE WITH UNDERBAR
+# 29A5; REVERSED ANGLE WITH UNDERBAR
+# 29A6; OBLIQUE ANGLE OPENING UP
+# 29A7; OBLIQUE ANGLE OPENING DOWN
+# 29A8; MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND RIGHT
+# 29A9; MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND LEFT
+# 29AA; MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND RIGHT
+# 29AB; MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND LEFT
+# 29AC; MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND UP
+# 29AD; MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND UP
+# 29AE; MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND DOWN
+# 29AF; MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND DOWN
+# 29C2; CIRCLE WITH SMALL CIRCLE TO THE RIGHT
+# 29C3; CIRCLE WITH TWO HORIZONTAL STROKES TO THE RIGHT
+# 29C9; TWO JOINED SQUARES
+# 29CE; RIGHT TRIANGLE ABOVE LEFT TRIANGLE
+# 29DC; INCOMPLETE INFINITY
+# 29E1; INCREASES AS
+# 29E3; EQUALS SIGN AND SLANTED PARALLEL
+# 29E4; EQUALS SIGN AND SLANTED PARALLEL WITH TILDE ABOVE
+# 29E5; IDENTICAL TO AND SLANTED PARALLEL
+# 29E8; DOWN-POINTING TRIANGLE WITH LEFT HALF BLACK
+# 29E9; DOWN-POINTING TRIANGLE WITH RIGHT HALF BLACK
+# 29F4; RULE-DELAYED
+# 29F6; SOLIDUS WITH OVERBAR
+# 29F7; REVERSE SOLIDUS WITH HORIZONTAL STROKE
+# 2A0A; MODULO TWO SUM
+# 2A0B; SUMMATION WITH INTEGRAL
+# 2A0C; QUADRUPLE INTEGRAL OPERATOR
+# 2A0D; FINITE PART INTEGRAL
+# 2A0E; INTEGRAL WITH DOUBLE STROKE
+# 2A0F; INTEGRAL AVERAGE WITH SLASH
+# 2A10; CIRCULATION FUNCTION
+# 2A11; ANTICLOCKWISE INTEGRATION
+# 2A12; LINE INTEGRATION WITH RECTANGULAR PATH AROUND POLE
+# 2A13; LINE INTEGRATION WITH SEMICIRCULAR PATH AROUND POLE
+# 2A14; LINE INTEGRATION NOT INCLUDING THE POLE
+# 2A15; INTEGRAL AROUND A POINT OPERATOR
+# 2A16; QUATERNION INTEGRAL OPERATOR
+# 2A17; INTEGRAL WITH LEFTWARDS ARROW WITH HOOK
+# 2A18; INTEGRAL WITH TIMES SIGN
+# 2A19; INTEGRAL WITH INTERSECTION
+# 2A1A; INTEGRAL WITH UNION
+# 2A1B; INTEGRAL WITH OVERBAR
+# 2A1C; INTEGRAL WITH UNDERBAR
+# 2A1E; LARGE LEFT TRIANGLE OPERATOR
+# 2A1F; Z NOTATION SCHEMA COMPOSITION
+# 2A20; Z NOTATION SCHEMA PIPING
+# 2A21; Z NOTATION SCHEMA PROJECTION
+# 2A24; PLUS SIGN WITH TILDE ABOVE
+# 2A26; PLUS SIGN WITH TILDE BELOW
+# 2A29; MINUS SIGN WITH COMMA ABOVE
+# 2A3E; Z NOTATION RELATIONAL COMPOSITION
+# 2A57; SLOPING LARGE OR
+# 2A58; SLOPING LARGE AND
+# 2A6A; TILDE OPERATOR WITH DOT ABOVE
+# 2A6B; TILDE OPERATOR WITH RISING DOTS
+# 2A6C; SIMILAR MINUS SIMILAR
+# 2A6D; CONGRUENT WITH DOT ABOVE
+# 2A6F; ALMOST EQUAL TO WITH CIRCUMFLEX ACCENT
+# 2A70; APPROXIMATELY EQUAL OR EQUAL TO
+# 2A73; EQUALS SIGN ABOVE TILDE OPERATOR
+# 2A74; DOUBLE COLON EQUAL
+# 2A7B; LESS-THAN WITH QUESTION MARK ABOVE
+# 2A7C; GREATER-THAN WITH QUESTION MARK ABOVE
+# 2A85; LESS-THAN OR APPROXIMATE
+# 2A86; GREATER-THAN OR APPROXIMATE
+# 2A87; LESS-THAN AND SINGLE-LINE NOT EQUAL TO
+# 2A88; GREATER-THAN AND SINGLE-LINE NOT EQUAL TO
+# 2A89; LESS-THAN AND NOT APPROXIMATE
+# 2A8A; GREATER-THAN AND NOT APPROXIMATE
+# 2A8D; LESS-THAN ABOVE SIMILAR OR EQUAL
+# 2A8E; GREATER-THAN ABOVE SIMILAR OR EQUAL
+# 2A8F; LESS-THAN ABOVE SIMILAR ABOVE GREATER-THAN
+# 2A90; GREATER-THAN ABOVE SIMILAR ABOVE LESS-THAN
+# 2A9D; SIMILAR OR LESS-THAN
+# 2A9E; SIMILAR OR GREATER-THAN
+# 2A9F; SIMILAR ABOVE LESS-THAN ABOVE EQUALS SIGN
+# 2AA0; SIMILAR ABOVE GREATER-THAN ABOVE EQUALS SIGN
+# 2AA3; DOUBLE NESTED LESS-THAN WITH UNDERBAR
+# 2AB1; PRECEDES ABOVE SINGLE-LINE NOT EQUAL TO
+# 2AB2; SUCCEEDS ABOVE SINGLE-LINE NOT EQUAL TO
+# 2AB5; PRECEDES ABOVE NOT EQUAL TO
+# 2AB6; SUCCEEDS ABOVE NOT EQUAL TO
+# 2AB7; PRECEDES ABOVE ALMOST EQUAL TO
+# 2AB8; SUCCEEDS ABOVE ALMOST EQUAL TO
+# 2AB9; PRECEDES ABOVE NOT ALMOST EQUAL TO
+# 2ABA; SUCCEEDS ABOVE NOT ALMOST EQUAL TO
+# 2AC7; SUBSET OF ABOVE TILDE OPERATOR
+# 2AC8; SUPERSET OF ABOVE TILDE OPERATOR
+# 2AC9; SUBSET OF ABOVE ALMOST EQUAL TO
+# 2ACA; SUPERSET OF ABOVE ALMOST EQUAL TO
+# 2ACB; SUBSET OF ABOVE NOT EQUAL TO
+# 2ACC; SUPERSET OF ABOVE NOT EQUAL TO
+# 2ADC; FORKING
+# 2AE2; VERTICAL BAR TRIPLE RIGHT TURNSTILE
+# 2AE6; LONG DASH FROM LEFT MEMBER OF DOUBLE VERTICAL
+# 2AEE; DOES NOT DIVIDE WITH REVERSED NEGATION SLASH
+# 2AF3; PARALLEL WITH TILDE OPERATOR
+# 2AFB; TRIPLE SOLIDUS BINARY RELATION
+# 2AFD; DOUBLE SOLIDUS OPERATOR
+# 1D6DB; MATHEMATICAL BOLD PARTIAL DIFFERENTIAL
+# 1D715; MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL
+# 1D74F; MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL
+# 1D789; MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL
+# 1D7C3; MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL
+
+# EOF
diff --git a/util/UnicodeData.txt b/unicode/UnicodeData.txt
similarity index 100%
rename from util/UnicodeData.txt
rename to unicode/UnicodeData.txt

From e83200d891a4513bf3cf20e7c23d95c685ce297e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 23 Mar 2010 23:33:42 +0100
Subject: [PATCH 0665/1628] mention variations and vertical text in unsupported
 features

---
 normal/charset.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/normal/charset.c b/normal/charset.c
index 00bbcb815..c026c6966 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -33,6 +33,8 @@
   218, 224, 226, 233, 234
   - Private use surrogates
   - Private use characters (not really a problem)
+  - Variations (no font support)
+  - Vertical text
  */
 
 /* Convert a (possibly null-terminated) UTF-8 string of at most SRCSIZE

From 03e4ef0293b15b6623cdbab36d09aa13bc123f55 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 24 Mar 2010 00:35:38 +0100
Subject: [PATCH 0666/1628] Import data for arabic joining computation

---
 autogen.sh                |   2 +-
 include/grub/unicode.h    |  31 +++-
 unicode/ArabicShaping.txt | 373 ++++++++++++++++++++++++++++++++++++++
 util/import_unicode.py    |  48 ++++-
 4 files changed, 445 insertions(+), 9 deletions(-)
 create mode 100644 unicode/ArabicShaping.txt

diff --git a/autogen.sh b/autogen.sh
index 7cbee5cca..f9d55318f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,7 +13,7 @@ echo timestamp > stamp-h.in
 
 python util/import_gcry.py lib/libgcrypt/ .
 
-python util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt unidata.c
+python util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt unicode/ArabicShaping.txt unidata.c
 
 for rmk in conf/*.rmk ${GRUB_CONTRIB}/*/conf/*.rmk; do
   if test -e $rmk ; then
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 457bcd93b..28c752b9e 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -36,6 +36,7 @@ struct grub_unicode_compact_range
   grub_uint8_t bidi_type:5;
   grub_uint8_t comb_type;
   grub_uint8_t bidi_mirror:1;
+  grub_uint8_t join_type:3;
 } __attribute__ ((packed));
 
 enum grub_bidi_type
@@ -61,6 +62,16 @@ enum grub_bidi_type
     GRUB_BIDI_TYPE_ON
   };
 
+enum grub_join_type
+  {
+    GRUB_JOIN_TYPE_NONJOINING = 0,
+    GRUB_JOIN_TYPE_LEFT = 1,
+    GRUB_JOIN_TYPE_RIGHT = 2,
+    GRUB_JOIN_TYPE_DUAL = 3,
+    GRUB_JOIN_TYPE_CAUSING = 4,
+    GRUB_JOIN_TYPE_TRANSPARENT = 5
+  };
+
 enum grub_comb_type
   {
     GRUB_UNICODE_COMB_NONE = 0,
@@ -103,7 +114,7 @@ struct grub_unicode_glyph
 {
   grub_uint32_t base;
   grub_uint16_t variant:9;
-  grub_uint8_t attributes:1;
+  grub_uint8_t attributes:5;
   grub_size_t ncomb;
   struct grub_unicode_combining {
     grub_uint32_t code;
@@ -115,12 +126,30 @@ struct grub_unicode_glyph
 };
 
 #define GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR 0x1
+#define GRUB_UNICODE_GLYPH_ATTRIBUTES_JOIN_LEFT_TO_RIGHT_SHIFT 1
+#define GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED 0x2
+#define GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED \
+  (GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED \
+   << GRUB_UNICODE_GLYPH_ATTRIBUTES_JOIN_LEFT_TO_RIGHT_SHIFT)
+/* Set iff the corresponding joining flags come from ZWJ or ZWNJ.  */
+#define GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED_EXPLICIT 0x8
+#define GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED_EXPLICIT \
+  (GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED_EXPLICIT \
+   << GRUB_UNICODE_GLYPH_ATTRIBUTES_JOIN_LEFT_TO_RIGHT_SHIFT)
+#define GRUB_UNICODE_GLYPH_ATTRIBUTES_JOIN \
+  (GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED \
+   | GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED \
+   | GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED_EXPLICIT \
+   | GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED_EXPLICIT)
+
 #define GRUB_UNICODE_COMBINING_GRAPHEME_JOINER 0x34f
 #define GRUB_UNICODE_VARIATION_SELECTOR_1 0xfe00
 #define GRUB_UNICODE_VARIATION_SELECTOR_16 0xfe0f
 #define GRUB_UNICODE_VARIATION_SELECTOR_17 0xe0100
 #define GRUB_UNICODE_VARIATION_SELECTOR_256 0xe01ef
 #define GRUB_UNICODE_HEBREW_WAW  0x05d5
+#define GRUB_UNICODE_ZWNJ        0x200c
+#define GRUB_UNICODE_ZWJ         0x200d
 
 extern struct grub_unicode_compact_range grub_unicode_compact[];
 extern struct grub_unicode_bidi_pair grub_unicode_bidi_pairs[];
diff --git a/unicode/ArabicShaping.txt b/unicode/ArabicShaping.txt
new file mode 100644
index 000000000..b851d3839
--- /dev/null
+++ b/unicode/ArabicShaping.txt
@@ -0,0 +1,373 @@
+# ArabicShaping-5.2.0.txt
+# Date: 2009-08-17, 11:11:00 PDT [KW]
+#
+# This file is a normative contributory data file in the
+# Unicode Character Database.
+#
+# Copyright (c) 1991-2009 Unicode, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
+# This file defines the shaping classes for Arabic, Syriac, and N'Ko
+# positional shaping, repeating in machine readable form the
+# information exemplified in Tables 8-3, 8-7, 8-8, 8-11, 8-12,
+# 8-13, and 13-5 of The Unicode Standard, Version 5.2.
+#
+# See sections 8.2, 8.3, and 13.5 of The Unicode Standard, Version 5.2
+# for more information.
+#
+# Each line contains four fields, separated by a semicolon.
+#
+# Field 0: the code point, in 4-digit hexadecimal
+#   form, of an Arabic, Syriac, or N'Ko character.
+#
+# Field 1: gives a short schematic name for that character,
+#   abbreviated from the normative Unicode character name.
+#
+# Field 2: defines the joining type (property name: Joining_Type)
+#   R Right_Joining
+#   L Left_Joining
+#   D Dual_Joining
+#   C Join_Causing
+#   U Non_Joining
+#   T Transparent
+#     See Section 8.2, Arabic for more information on these types.
+#
+# Field 3: defines the joining group (property name: Joining_Group)
+#
+# The values of the joining group are based schematically on character
+# names. Where a schematic character name consists of two or more parts separated
+# by spaces, the formal Joining_Group property value, as specified in
+# PropertyValueAliases.txt, consists of the same name parts joined by
+# underscores. Hence, the entry:
+#
+#   0629; TEH MARBUTA; R; TEH MARBUTA
+#
+# corresponds to [Joining_Group = Teh_Marbuta].
+#
+# Note: For historical reasons, the property value [Joining_Group = Hamza_On_Heh_Goal]
+#   is anachronistically named. It used to apply to both of the following characters
+#   in earlier versions of the standard:
+#
+#   U+06C2 ARABIC LETTER HEH GOAL WITH HAMZA ABOVE
+#   U+06C3 ARABIC LETTER TEH MARBUTA GOAL
+#
+#   However, it currently applies only to U+06C3, and *not* to U+06C2.
+#   To avoid destabilizing existing Joining_Group property aliases, the
+#   value Hamza_On_Heh_Goal has not been changed, despite the fact that it
+#   no longer applies to Hamza On Heh Goal, but only to Teh Marbuta Goal.
+#
+# When other cursive scripts are added to the Unicode Standard in
+# the future, the joining group value of all its letters will default
+# to jg=No_Joining_Group in this data file. Other, more specific
+# joining group values will be defined only if an explicit proposal
+# to define those values exactly has been approved by the UTC. This
+# is the convention exemplified by the N'Ko script. Only the Arabic
+# and Syriac scripts currently have explicit joining group values defined.
+#
+# Note: Code points that are not explicitly listed in this file are
+# either of joining type T or U:
+#
+# - Those that not explicitly listed that are of General Category Mn, Me, or Cf
+#   have joining type T.
+# - All others not explicitly listed have joining type U.
+#
+# For an explicit listing of characters of joining type T, see
+# the derived property file DerivedJoiningType.txt.
+#
+# There are currently no characters of joining type L defined in Unicode.
+#
+# #############################################################
+ 
+# Unicode; Schematic Name; Joining Type; Joining Group
+
+# Arabic characters
+
+0600; ARABIC NUMBER SIGN; U; No_Joining_Group
+0601; ARABIC SIGN SANAH; U; No_Joining_Group
+0602; ARABIC FOOTNOTE MARKER; U; No_Joining_Group
+0603; ARABIC SIGN SAFHA; U; No_Joining_Group
+0608; ARABIC RAY; U; No_Joining_Group
+060B; AFGHANI SIGN; U; No_Joining_Group
+0621; HAMZA; U; No_Joining_Group
+0622; MADDA ON ALEF; R; ALEF
+0623; HAMZA ON ALEF; R; ALEF
+0624; HAMZA ON WAW; R; WAW
+0625; HAMZA UNDER ALEF; R; ALEF
+0626; HAMZA ON YEH; D; YEH
+0627; ALEF; R; ALEF
+0628; BEH; D; BEH
+0629; TEH MARBUTA; R; TEH MARBUTA
+062A; TEH; D; BEH
+062B; THEH; D; BEH
+062C; JEEM; D; HAH
+062D; HAH; D; HAH
+062E; KHAH; D; HAH
+062F; DAL; R; DAL
+0630; THAL; R; DAL
+0631; REH; R; REH
+0632; ZAIN; R; REH
+0633; SEEN; D; SEEN
+0634; SHEEN; D; SEEN
+0635; SAD; D; SAD
+0636; DAD; D; SAD
+0637; TAH; D; TAH
+0638; ZAH; D; TAH
+0639; AIN; D; AIN
+063A; GHAIN; D; AIN
+063B; KEHEH WITH 2 DOTS ABOVE; D; GAF
+063C; KEHEH WITH 3 DOTS BELOW; D; GAF 
+063D; FARSI YEH WITH INVERTED V; D; FARSI YEH
+063E; FARSI YEH WITH 2 DOTS ABOVE; D; FARSI YEH
+063F; FARSI YEH WITH 3 DOTS ABOVE; D; FARSI YEH
+0640; TATWEEL; C; No_Joining_Group
+0641; FEH; D; FEH
+0642; QAF; D; QAF
+0643; KAF; D; KAF
+0644; LAM; D; LAM
+0645; MEEM; D; MEEM
+0646; NOON; D; NOON
+0647; HEH; D; HEH
+0648; WAW; R; WAW
+0649; ALEF MAKSURA; D; YEH
+064A; YEH; D; YEH
+066E; DOTLESS BEH; D; BEH
+066F; DOTLESS QAF; D; QAF
+0671; HAMZAT WASL ON ALEF; R; ALEF
+0672; WAVY HAMZA ON ALEF; R; ALEF
+0673; WAVY HAMZA UNDER ALEF; R; ALEF
+0674; HIGH HAMZA; U; No_Joining_Group
+0675; HIGH HAMZA ALEF; R; ALEF
+0676; HIGH HAMZA WAW; R; WAW
+0677; HIGH HAMZA WAW WITH DAMMA; R; WAW
+0678; HIGH HAMZA YEH; D; YEH
+0679; TEH WITH SMALL TAH; D; BEH
+067A; TEH WITH 2 DOTS VERTICAL ABOVE; D; BEH
+067B; BEH WITH 2 DOTS VERTICAL BELOW; D; BEH
+067C; TEH WITH RING; D; BEH
+067D; TEH WITH 3 DOTS ABOVE DOWNWARD; D; BEH
+067E; TEH WITH 3 DOTS BELOW; D; BEH
+067F; TEH WITH 4 DOTS ABOVE; D; BEH
+0680; BEH WITH 4 DOTS BELOW; D; BEH
+0681; HAMZA ON HAH; D; HAH
+0682; HAH WITH 2 DOTS VERTICAL ABOVE; D; HAH
+0683; HAH WITH MIDDLE 2 DOTS; D; HAH
+0684; HAH WITH MIDDLE 2 DOTS VERTICAL; D; HAH
+0685; HAH WITH 3 DOTS ABOVE; D; HAH
+0686; HAH WITH MIDDLE 3 DOTS DOWNWARD; D; HAH
+0687; HAH WITH MIDDLE 4 DOTS; D; HAH
+0688; DAL WITH SMALL TAH; R; DAL
+0689; DAL WITH RING; R; DAL
+068A; DAL WITH DOT BELOW; R; DAL
+068B; DAL WITH DOT BELOW AND SMALL TAH; R; DAL
+068C; DAL WITH 2 DOTS ABOVE; R; DAL
+068D; DAL WITH 2 DOTS BELOW; R; DAL
+068E; DAL WITH 3 DOTS ABOVE; R; DAL
+068F; DAL WITH 3 DOTS ABOVE DOWNWARD; R; DAL
+0690; DAL WITH 4 DOTS ABOVE; R; DAL
+0691; REH WITH SMALL TAH; R; REH
+0692; REH WITH SMALL V; R; REH
+0693; REH WITH RING; R; REH
+0694; REH WITH DOT BELOW; R; REH
+0695; REH WITH SMALL V BELOW; R; REH
+0696; REH WITH DOT BELOW AND DOT ABOVE; R; REH
+0697; REH WITH 2 DOTS ABOVE; R; REH
+0698; REH WITH 3 DOTS ABOVE; R; REH
+0699; REH WITH 4 DOTS ABOVE; R; REH
+069A; SEEN WITH DOT BELOW AND DOT ABOVE; D; SEEN
+069B; SEEN WITH 3 DOTS BELOW; D; SEEN
+069C; SEEN WITH 3 DOTS BELOW AND 3 DOTS ABOVE; D; SEEN
+069D; SAD WITH 2 DOTS BELOW; D; SAD
+069E; SAD WITH 3 DOTS ABOVE; D; SAD
+069F; TAH WITH 3 DOTS ABOVE; D; TAH
+06A0; AIN WITH 3 DOTS ABOVE; D; AIN
+06A1; DOTLESS FEH; D; FEH
+06A2; FEH WITH DOT MOVED BELOW; D; FEH
+06A3; FEH WITH DOT BELOW; D; FEH
+06A4; FEH WITH 3 DOTS ABOVE; D; FEH
+06A5; FEH WITH 3 DOTS BELOW; D; FEH
+06A6; FEH WITH 4 DOTS ABOVE; D; FEH
+06A7; QAF WITH DOT ABOVE; D; QAF
+06A8; QAF WITH 3 DOTS ABOVE; D; QAF
+06A9; KEHEH; D; GAF
+06AA; SWASH KAF; D; SWASH KAF
+06AB; KAF WITH RING; D; GAF
+06AC; KAF WITH DOT ABOVE; D; KAF
+06AD; KAF WITH 3 DOTS ABOVE; D; KAF
+06AE; KAF WITH 3 DOTS BELOW; D; KAF
+06AF; GAF; D; GAF
+06B0; GAF WITH RING; D; GAF
+06B1; GAF WITH 2 DOTS ABOVE; D; GAF
+06B2; GAF WITH 2 DOTS BELOW; D; GAF
+06B3; GAF WITH 2 DOTS VERTICAL BELOW; D; GAF
+06B4; GAF WITH 3 DOTS ABOVE; D; GAF
+06B5; LAM WITH SMALL V; D; LAM
+06B6; LAM WITH DOT ABOVE; D; LAM
+06B7; LAM WITH 3 DOTS ABOVE; D; LAM
+06B8; LAM WITH 3 DOTS BELOW; D; LAM
+06B9; NOON WITH DOT BELOW; D; NOON
+06BA; DOTLESS NOON; D; NOON
+06BB; DOTLESS NOON WITH SMALL TAH; D; NOON
+06BC; NOON WITH RING; D; NOON
+06BD; NYA; D; NYA
+06BE; KNOTTED HEH; D; KNOTTED HEH
+06BF; HAH WITH MIDDLE 3 DOTS DOWNWARD AND DOT ABOVE; D; HAH
+06C0; HAMZA ON HEH; R; TEH MARBUTA
+06C1; HEH GOAL; D; HEH GOAL
+06C2; HAMZA ON HEH GOAL; D; HEH GOAL
+06C3; TEH MARBUTA GOAL; R; HAMZA ON HEH GOAL
+06C4; WAW WITH RING; R; WAW
+06C5; WAW WITH BAR; R; WAW
+06C6; WAW WITH SMALL V; R; WAW
+06C7; WAW WITH DAMMA; R; WAW
+06C8; WAW WITH ALEF ABOVE; R; WAW
+06C9; WAW WITH INVERTED SMALL V; R; WAW
+06CA; WAW WITH 2 DOTS ABOVE; R; WAW
+06CB; WAW WITH 3 DOTS ABOVE; R; WAW
+06CC; FARSI YEH; D; FARSI YEH
+06CD; YEH WITH TAIL; R; YEH WITH TAIL
+06CE; FARSI YEH WITH SMALL V; D; FARSI YEH
+06CF; WAW WITH DOT ABOVE; R; WAW
+06D0; YEH WITH 2 DOTS VERTICAL BELOW; D; YEH
+06D1; YEH WITH 3 DOTS BELOW; D; YEH
+06D2; YEH BARREE; R; YEH BARREE
+06D3; HAMZA ON YEH BARREE; R; YEH BARREE
+06D5; AE; R; TEH MARBUTA
+06DD; ARABIC END OF AYAH; U; No_Joining_Group
+06EE; DAL WITH INVERTED V; R; DAL
+06EF; REH WITH INVERTED V; R; REH
+06FA; SEEN WITH DOT BELOW AND 3 DOTS ABOVE; D; SEEN
+06FB; DAD WITH DOT BELOW; D; SAD
+06FC; GHAIN WITH DOT BELOW; D; AIN
+06FF; HEH WITH INVERTED V; D; KNOTTED HEH
+
+# Syriac characters
+
+0710; ALAPH; R; ALAPH
+0712; BETH; D; BETH
+0713; GAMAL; D; GAMAL
+0714; GAMAL GARSHUNI; D; GAMAL
+0715; DALATH; R; DALATH RISH
+0716; DOTLESS DALATH RISH; R; DALATH RISH
+0717; HE; R; HE
+0718; WAW; R; SYRIAC WAW
+0719; ZAIN; R; ZAIN
+071A; HETH; D; HETH
+071B; TETH; D; TETH
+071C; TETH GARSHUNI; D; TETH
+071D; YUDH; D; YUDH
+071E; YUDH HE; R; YUDH HE
+071F; KAPH; D; KAPH
+0720; LAMADH; D; LAMADH
+0721; MIM; D; MIM
+0722; NUN; D; NUN
+0723; SEMKATH; D; SEMKATH
+0724; FINAL SEMKATH; D; FINAL SEMKATH
+0725; E; D; E
+0726; PE; D; PE
+0727; REVERSED PE; D; REVERSED PE
+0728; SADHE; R; SADHE
+0729; QAPH; D; QAPH
+072A; RISH; R; DALATH RISH
+072B; SHIN; D; SHIN
+072C; TAW; R; TAW
+072D; PERSIAN BHETH; D; BETH
+072E; PERSIAN GHAMAL; D; GAMAL
+072F; PERSIAN DHALATH; R; DALATH RISH
+074D; SOGDIAN ZHAIN; R; ZHAIN
+074E; SOGDIAN KHAPH; D; KHAPH
+074F; SOGDIAN FE; D; FE
+
+# Arabic supplement characters
+
+0750; BEH WITH 3 DOTS HORIZONTALLY BELOW; D; BEH
+0751; BEH WITH DOT BELOW AND 3 DOTS ABOVE; D; BEH
+0752; BEH WITH 3 DOTS POINTING UPWARDS BELOW; D; BEH
+0753; BEH WITH 3 DOTS POINTING UPWARDS BELOW AND 2 DOTS ABOVE; D; BEH
+0754; BEH WITH 2 DOTS BELOW AND DOT ABOVE; D; BEH
+0755; BEH WITH INVERTED SMALL V BELOW; D; BEH
+0756; BEH WITH SMALL V; D; BEH
+0757; HAH WITH 2 DOTS ABOVE; D; HAH
+0758; HAH WITH 3 DOTS POINTING UPWARDS BELOW; D; HAH
+0759; DAL WITH 2 DOTS VERTICALLY BELOW AND SMALL TAH; R; DAL
+075A; DAL WITH INVERTED SMALL V BELOW; R; DAL
+075B; REH WITH STROKE; R; REH
+075C; SEEN WITH 4 DOTS ABOVE; D; SEEN
+075D; AIN WITH 2 DOTS ABOVE; D; AIN
+075E; AIN WITH 3 DOTS POINTING DOWNWARDS ABOVE; D; AIN
+075F; AIN WITH 2 DOTS VERTICALLY ABOVE; D; AIN
+0760; FEH WITH 2 DOTS BELOW; D; FEH
+0761; FEH WITH 3 DOTS POINTING UPWARDS BELOW; D; FEH
+0762; KEHEH WITH DOT ABOVE; D; GAF
+0763; KEHEH WITH 3 DOTS ABOVE; D; GAF
+0764; KEHEH WITH 3 DOTS POINTING UPWARDS BELOW; D; GAF
+0765; MEEM WITH DOT ABOVE; D; MEEM
+0766; MEEM WITH DOT BELOW; D; MEEM
+0767; NOON WITH 2 DOTS BELOW; D; NOON
+0768; NOON WITH SMALL TAH; D; NOON
+0769; NOON WITH SMALL V; D; NOON
+076A; LAM WITH BAR; D; LAM
+076B; REH WITH 2 DOTS VERTICALLY ABOVE; R; REH
+076C; REH WITH HAMZA ABOVE; R; REH
+076D; SEEN WITH 2 DOTS VERTICALLY ABOVE; D; SEEN
+076E; HAH WITH SMALL TAH BELOW; D; HAH
+076F; HAH WITH SMALL TAH AND 2 DOTS; D; HAH
+0770; SEEN WITH SMALL TAH AND 2 DOTS; D; SEEN
+0771; REH WITH SMALL TAH AND 2 DOTS; R; REH
+0772; HAH WITH SMALL TAH ABOVE; D; HAH
+0773; ALEF WITH DIGIT TWO ABOVE; R; ALEF
+0774; ALEF WITH DIGIT THREE ABOVE; R; ALEF
+0775; FARSI YEH WITH DIGIT TWO ABOVE; D; FARSI YEH
+0776; FARSI YEH WITH DIGIT THREE ABOVE; D; FARSI YEH
+0777; YEH WITH DIGIT FOUR BELOW; D; YEH
+0778; WAW WITH DIGIT TWO ABOVE; R; WAW
+0779; WAW WITH DIGIT THREE ABOVE; R; WAW
+077A; YEH BARREE WITH DIGIT TWO ABOVE; D; BURUSHASKI YEH BARREE
+077B; YEH BARREE WITH DIGIT THREE ABOVE; D; BURUSHASKI YEH BARREE
+077C; HAH WITH DIGIT FOUR BELOW; D; HAH
+077D; SEEN WITH DIGIT FOUR ABOVE; D; SEEN
+077E; SEEN WITH INVERTED V; D; SEEN
+077F; KAF WITH 2 DOTS ABOVE; D; KAF
+
+# N'Ko Characters
+
+07CA; NKO A; D; No_Joining_Group
+07CB; NKO EE; D; No_Joining_Group
+07CC; NKO I; D; No_Joining_Group
+07CD; NKO E; D; No_Joining_Group
+07CE; NKO U; D; No_Joining_Group
+07CF; NKO OO; D; No_Joining_Group
+07D0; NKO O; D; No_Joining_Group
+07D1; NKO DAGBASINNA; D; No_Joining_Group
+07D2; NKO N; D; No_Joining_Group
+07D3; NKO BA; D; No_Joining_Group
+07D4; NKO PA; D; No_Joining_Group
+07D5; NKO TA; D; No_Joining_Group
+07D6; NKO JA; D; No_Joining_Group
+07D7; NKO CHA; D; No_Joining_Group
+07D8; NKO DA; D; No_Joining_Group
+07D9; NKO RA; D; No_Joining_Group
+07DA; NKO RRA; D; No_Joining_Group
+07DB; NKO SA; D; No_Joining_Group
+07DC; NKO GBA; D; No_Joining_Group
+07DD; NKO FA; D; No_Joining_Group
+07DE; NKO KA; D; No_Joining_Group
+07DF; NKO LA; D; No_Joining_Group
+07E0; NKO NA WOLOSO; D; No_Joining_Group
+07E1; NKO MA; D; No_Joining_Group
+07E2; NKO NYA; D; No_Joining_Group
+07E3; NKO NA; D; No_Joining_Group
+07E4; NKO HA; D; No_Joining_Group
+07E5; NKO WA; D; No_Joining_Group
+07E6; NKO YA; D; No_Joining_Group
+07E7; NKO NYA WOLOSO; D; No_Joining_Group
+07E8; NKO JONA JA; D; No_Joining_Group
+07E9; NKO JONA CHA; D; No_Joining_Group
+07EA; NKO JONA RA; D; No_Joining_Group
+07FA; NKO LAJANYALAN; C; No_Joining_Group
+
+# Other
+
+200C; ZERO WIDTH NON-JOINER; U; No_Joining_Group
+200D; ZERO WIDTH JOINER; C; No_Joining_Group
+
+# EOF
diff --git a/util/import_unicode.py b/util/import_unicode.py
index e0e53b655..653d7bae2 100644
--- a/util/import_unicode.py
+++ b/util/import_unicode.py
@@ -24,8 +24,33 @@ import datetime
 if len (sys.argv) < 3:
     print ("Usage: %s SOURCE DESTINATION" % sys.argv[0])
     exit (0)
+infile = open (sys.argv[3], "r")
+joining = {}
+for line in infile:
+    line = re.sub ("#.*$", "", line)
+    line = line.replace ("\n", "")
+    line = line.replace (" ", "")
+    if len (line) == 0 or line[0] == '\n':
+        continue
+    sp = line.split (";")
+    curcode = int (sp[0], 16)
+    if sp[2] == "U":
+        joining[curcode] = "GRUB_JOIN_TYPE_NONJOINING"
+    elif sp[2] == "L":
+        joining[curcode] = "GRUB_JOIN_TYPE_LEFT"
+    elif sp[2] == "R":
+        joining[curcode] = "GRUB_JOIN_TYPE_RIGHT"
+    elif sp[2] == "D":
+        joining[curcode] = "GRUB_JOIN_TYPE_DUAL"
+    elif sp[2] == "C":
+        joining[curcode] = "GRUB_JOIN_TYPE_CAUSING"
+    else:
+        print ("Unknown joining type '%s'" % sp[2])
+        exit (1)
+infile.close ()
+
 infile = open (sys.argv[1], "r")
-outfile = open (sys.argv[3], "w")
+outfile = open (sys.argv[4], "w")
 outfile.write ("#include <grub/unicode.h>\n")
 outfile.write ("\n")
 outfile.write ("struct grub_unicode_compact_range grub_unicode_compact[] = {\n")
@@ -74,23 +99,32 @@ for line in infile:
                 curcombtype != 240 and curcombtype != 253 and \
                 curcombtype != 254 and curcombtype != 255):
         print ("WARNING: Unknown combining type %d" % curcombtype)
+    if curcode in joining:
+        curjoin = joining[curcode]
+    elif sp[2] == "Me" or sp[2] == "Mn" or sp[2] == "Cf":
+        curjoin = "GRUB_JOIN_TYPE_TRANSPARENT"
+    else:
+        curjoin = "GRUB_JOIN_TYPE_NONJOINING"
     if lastcode + 1 != curcode or curbiditype != lastbiditype \
-            or curcombtype != lastcombtype or curmirrortype != lastmirrortype:
+            or curcombtype != lastcombtype or curmirrortype != lastmirrortype \
+            or curjoin != lastjoin:
         if begincode != -2 and (lastbiditype != "L" or lastcombtype != 0 or \
                                     lastmirrortype):
-            outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s, %d, %d},\n" \
+            outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s, %d, %d, %s},\n" \
                                 % (begincode, lastcode, lastbiditype, \
-                                       lastcombtype, lastmirrortype)))
+                                       lastcombtype, lastmirrortype, \
+                                       lastjoin)))
         begincode = curcode
     lastcode = curcode
+    lastjoin = curjoin
     lastbiditype = curbiditype
     lastcombtype = curcombtype
     lastmirrortype = curmirrortype
 if lastbiditype != "L" or lastcombtype != 0 or lastmirrortype:
-    outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s, %d, %d},\n" \
+    outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s, %d, %d, %s},\n" \
                         % (begincode, lastcode, lastbiditype, lastcombtype, \
-                               lastmirrortype)))
-outfile.write ("{0, 0, 0, 0, 0},\n")
+                               lastmirrortype, lastjoin)))
+outfile.write ("{0, 0, 0, 0, 0, 0},\n")
 
 outfile.write ("};\n")
 

From df3d4cba13cdc9d6f3f45ad5446df537ac7ccc73 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 24 Mar 2010 01:00:54 +0100
Subject: [PATCH 0667/1628] Arabic joining computation

---
 normal/charset.c | 225 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 197 insertions(+), 28 deletions(-)

diff --git a/normal/charset.c b/normal/charset.c
index c026c6966..970a14b1f 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -403,6 +403,26 @@ grub_utf8_to_ucs4 (grub_uint32_t *dest, grub_size_t destsize,
   return p - dest;
 }
 
+static grub_uint8_t *join_types = NULL;
+
+static void
+unpack_join (void)
+{
+  unsigned i;
+  struct grub_unicode_compact_range *cur;
+
+  join_types = grub_zalloc (GRUB_UNICODE_MAX_CACHED_CHAR);
+  if (!join_types)
+    {
+      grub_errno = GRUB_ERR_NONE;
+      return;
+    }
+  for (cur = grub_unicode_compact; cur->end; cur++)
+    for (i = cur->start; i <= cur->end
+	     && i < GRUB_UNICODE_MAX_CACHED_CHAR; i++)
+      join_types[i] = cur->join_type;
+}
+
 static grub_uint8_t *bidi_types = NULL;
 
 static void
@@ -444,6 +464,24 @@ get_bidi_type (grub_uint32_t c)
   return GRUB_BIDI_TYPE_L;
 }
 
+static inline enum grub_join_type
+get_join_type (grub_uint32_t c)
+{
+  struct grub_unicode_compact_range *cur;
+
+  if (!join_types)
+    unpack_join ();
+
+  if (join_types && c < GRUB_UNICODE_MAX_CACHED_CHAR)
+    return join_types[c];
+
+  for (cur = grub_unicode_compact; cur->end; cur++)
+    if (cur->start <= c && c <= cur->end)
+      return cur->join_type;
+
+  return GRUB_JOIN_TYPE_NONJOINING;
+}
+
 static inline int
 is_mirrored (grub_uint32_t c)
 {
@@ -637,8 +675,6 @@ bidi_line_wrap (struct grub_unicode_glyph *visual_out,
 	{	  
 	  unsigned min_odd_level = 0xffffffff;
 	  unsigned max_level = 0;
-	  unsigned j;
-	  unsigned i;
 
 	  if (k != visual_len && last_space > (signed) line_start)
 	    k = last_space;
@@ -650,30 +686,113 @@ bidi_line_wrap (struct grub_unicode_glyph *visual_out,
 	  else
 	    last_space_width = line_width - last_width;
 
-	  for (i = line_start; i < k; i++)
-	    {
-	      if (levels[i] > max_level)
-		max_level = levels[i];
-	      if (levels[i] < min_odd_level && (levels[i] & 1))
-		min_odd_level = levels[i];
-	    }
+	  {
+	    unsigned i;
+	    for (i = line_start; i < k; i++)
+	      {
+		if (levels[i] > max_level)
+		  max_level = levels[i];
+		if (levels[i] < min_odd_level && (levels[i] & 1))
+		  min_odd_level = levels[i];
+	      }
+	  }
+
+	  {
+	    unsigned j;	  
+	    /* FIXME: can be optimized.  */
+	    for (j = max_level; j >= min_odd_level; j--)
+	      {
+		unsigned in = 0;
+		unsigned i;
+		for (i = line_start; i < k; i++)
+		  {
+		    if (i != line_start && levels[i] >= j && levels[i-1] < j)
+		      in = i;
+		    if (levels[i] >= j && (i + 1 == k || levels[i+1] < j))
+		      revert (in, i);
+		  }
+	      }
+	  }
 	  
-	  /* FIXME: can be optimized.  */
-	  for (j = max_level; j >= min_odd_level; j--)
-	    {
-	      unsigned in = 0;
-	      for (i = line_start; i < k; i++)
-		{
-		  if (i != line_start && levels[i] >= j && levels[i-1] < j)
-		    in = i;
-		  if (levels[i] >= j && (i + 1 == k || levels[i+1] < j))
-		    revert (in, i);
-		}
-	    }
-	  
-	  for (i = line_start; i < k; i++)
-	    if (is_mirrored (visual[i].base) && levels[i])
-	      visual[i].attributes |= GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR;
+	  {
+	    unsigned i;
+	    for (i = line_start; i < k; i++)
+	      {
+		if (is_mirrored (visual[i].base) && levels[i])
+		  visual[i].attributes |= GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR;
+		if ((visual[i].attributes & GRUB_UNICODE_GLYPH_ATTRIBUTES_JOIN)
+		    && levels[i])
+		  {
+		    int left, right;
+		    left = visual[i].attributes
+		      & (GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED 
+			 | GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED_EXPLICIT);
+		    right = visual[i].attributes
+		      & (GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED 
+			 | GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED_EXPLICIT);
+		    visual[i].attributes &= ~GRUB_UNICODE_GLYPH_ATTRIBUTES_JOIN;
+		    left <<= GRUB_UNICODE_GLYPH_ATTRIBUTES_JOIN_LEFT_TO_RIGHT_SHIFT;
+		    right >>= GRUB_UNICODE_GLYPH_ATTRIBUTES_JOIN_LEFT_TO_RIGHT_SHIFT;
+		    visual[i].attributes |= (left | right);
+		  }
+	      }
+	  }
+
+	  {
+	    int left_join = 0;
+	    unsigned i;
+	    for (i = line_start; i < k; i++)
+	      {
+		enum grub_join_type join_type = get_join_type (visual[i].base);
+		if (!(visual[i].attributes
+		      & GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED_EXPLICIT)
+		    && (join_type == GRUB_JOIN_TYPE_LEFT
+			|| join_type == GRUB_JOIN_TYPE_DUAL))
+		  {
+		    if (left_join)
+		      visual[i].attributes
+			|= GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED;
+		    else
+		      visual[i].attributes
+			&= ~GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED;
+		  }
+		if (join_type == GRUB_JOIN_TYPE_NONJOINING
+		    || join_type == GRUB_JOIN_TYPE_LEFT)
+		  left_join = 0;
+		if (join_type == GRUB_JOIN_TYPE_RIGHT
+		    || join_type == GRUB_JOIN_TYPE_DUAL
+		    || join_type == GRUB_JOIN_TYPE_CAUSING)
+		  left_join = 1;
+	      }
+	  }
+
+	  {
+	    int right_join = 0;
+	    signed i;
+	    for (i = k - 1; i >= (signed) line_start; i--)
+	      {
+		enum grub_join_type join_type = get_join_type (visual[i].base);
+		if (!(visual[i].attributes
+		      & GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED_EXPLICIT)
+		    && (join_type == GRUB_JOIN_TYPE_RIGHT
+			|| join_type == GRUB_JOIN_TYPE_DUAL))
+		  {
+		    if (right_join)
+		      visual[i].attributes
+			|= GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED;
+		    else
+		      visual[i].attributes
+			&= ~GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED;
+		  }
+		if (join_type == GRUB_JOIN_TYPE_NONJOINING
+		    || join_type == GRUB_JOIN_TYPE_RIGHT)
+		  right_join = 0;
+		if (join_type == GRUB_JOIN_TYPE_LEFT
+		    || join_type == GRUB_JOIN_TYPE_DUAL
+		    || join_type == GRUB_JOIN_TYPE_CAUSING)
+		  right_join = 1;
+	      }
+	  }		
 
 	  grub_memcpy (outptr, &visual[line_start],
 		       (k - line_start) * sizeof (visual[0]));
@@ -785,11 +904,43 @@ grub_bidi_line_logical_to_visual (const grub_uint32_t *logical,
   cur_override = OVERRIDE_NEUTRAL;
   {
     const grub_uint32_t *lptr;
+    enum {JOIN_DEFAULT, NOJOIN, JOIN_FORCE} join_state = JOIN_DEFAULT;
+    int zwj_propagate_to_previous = 0;
     for (lptr = logical; lptr < logical + logical_len;)
       {
-	grub_size_t p = grub_unicode_aglomerate_comb (lptr, logical 
-						      + logical_len - lptr, 
-						      &visual[visual_len]);
+	grub_size_t p;
+
+	if (*lptr == GRUB_UNICODE_ZWJ)
+	  {
+	    if (zwj_propagate_to_previous)
+	      {
+		visual[visual_len - 1].attributes
+		  |= GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED_EXPLICIT
+		  | GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED;
+	      }
+	    zwj_propagate_to_previous = 0;
+	    join_state = JOIN_FORCE;
+	    lptr++;
+	    continue;
+	  }
+
+	if (*lptr == GRUB_UNICODE_ZWNJ)
+	  {
+	    if (zwj_propagate_to_previous)
+	      {
+		visual[visual_len - 1].attributes
+		  |= GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED_EXPLICIT;
+		visual[visual_len - 1].attributes 
+		  &= ~GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED;
+	      }
+	    zwj_propagate_to_previous = 0;
+	    join_state = NOJOIN;
+	    lptr++;
+	    continue;
+	  }
+
+	p = grub_unicode_aglomerate_comb (lptr, logical + logical_len - lptr, 
+					  &visual[visual_len]);
 	
 	type = get_bidi_type (visual[visual_len].base);
 	switch (type)
@@ -813,6 +964,24 @@ grub_bidi_line_logical_to_visual (const grub_uint32_t *logical,
 	    break;
 	  default:
 	    {
+	      if (join_state == JOIN_FORCE)
+		{
+		  visual[visual_len].attributes
+		    |= GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED_EXPLICIT
+		    | GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED;
+		}
+	      
+	      if (join_state == NOJOIN)
+		{
+		  visual[visual_len].attributes
+		    |= GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED_EXPLICIT;
+		  visual[visual_len].attributes
+		    &= ~GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED;
+		}
+
+	      join_state = JOIN_DEFAULT;
+	      zwj_propagate_to_previous = 1;
+
 	      levels[visual_len] = cur_level;
 	      if (cur_override != OVERRIDE_NEUTRAL)
 		resolved_types[visual_len] = 

From b320771ada9a62d43cfae4d2e37dead01ffe23ce Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 24 Mar 2010 01:05:50 +0100
Subject: [PATCH 0668/1628] Remove private use surrogates from unsupported list

---
 normal/charset.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/normal/charset.c b/normal/charset.c
index 970a14b1f..c3a856b97 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -31,7 +31,6 @@
   - Combining characters of types 7, 8, 9, 21, 27, 28, 29, 30, 31,
   32, 33, 34, 35, 36, 84, 91, 103, 107, 118, 122, 129, 130, 132,
   218, 224, 226, 233, 234
-  - Private use surrogates
   - Private use characters (not really a problem)
   - Variations (no font support)
   - Vertical text

From 21b9992685e4fa58f818610b6b13c22cb2f85ec7 Mon Sep 17 00:00:00 2001
From:  <>
Date: Wed, 24 Mar 2010 12:50:15 +0000
Subject: [PATCH 0669/1628] * .bzrignore: Add grub-bin2h, grub-reboot, and
 grub-set-default.

---
 .bzrignore | 3 +++
 ChangeLog  | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/.bzrignore b/.bzrignore
index 5a1443d09..46e8637b6 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -26,6 +26,7 @@ docs/version.texi
 genkernsyms.sh
 gensymlist.sh
 gentrigtables
+grub-bin2h
 grub-dumpbios
 grub-editenv
 grub-emu
@@ -41,11 +42,13 @@ grub-pe2elf
 grub-probe
 grub_probe_init.c
 grub_probe_init.h
+grub-reboot
 grub-script-check
 grub_script_check_init.c
 grub_script_check_init.h
 grub_script.tab.c
 grub_script.tab.h
+grub-set-default
 grub-setup
 grub_setup_init.c
 grub_setup_init.h
diff --git a/ChangeLog b/ChangeLog
index 55c45af87..6bb82215a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-24  Colin Watson  <cjwatson@ubuntu.com>
+
+	* .bzrignore: Add grub-bin2h, grub-reboot, and grub-set-default.
+
 2010-03-21  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-install.in: Copy .mo files from @datadir@/locale, to

From a3940f887483f4b92c1d9204fd40b3a5e80d6bf8 Mon Sep 17 00:00:00 2001
From: Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Wed, 24 Mar 2010 12:54:39 +0000
Subject: [PATCH 0670/1628] * kern/dl.c (grub_dl_resolve_symbols): Improve
 error message grammar.

---
 ChangeLog | 5 +++++
 kern/dl.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6bb82215a..e3e39b84a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-24  Adrian Glaubitz  <glaubitz@physik.fu-berlin.de>
+
+	* kern/dl.c (grub_dl_resolve_symbols): Improve error message
+	grammar.
+
 2010-03-24  Colin Watson  <cjwatson@ubuntu.com>
 
 	* .bzrignore: Add grub-bin2h, grub-reboot, and grub-set-default.
diff --git a/kern/dl.c b/kern/dl.c
index 278d5b568..19ee13243 100644
--- a/kern/dl.c
+++ b/kern/dl.c
@@ -348,7 +348,7 @@ grub_dl_resolve_symbols (grub_dl_t mod, Elf_Ehdr *e)
 	      sym->st_value = (Elf_Addr) grub_dl_resolve_symbol (name);
 	      if (! sym->st_value)
 		return grub_error (GRUB_ERR_BAD_MODULE,
-				   "the symbol `%s' not found", name);
+				   "symbol not found: `%s'", name);
 	    }
 	  else
 	    {

From 0761327dd08f78b749f82290497aa0ef20a38a21 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 24 Mar 2010 20:03:29 +0100
Subject: [PATCH 0671/1628] Update unicode problem list

---
 normal/charset.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/normal/charset.c b/normal/charset.c
index c3a856b97..0683fc88c 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -19,14 +19,15 @@
 /*
   Current problems with Unicode rendering: 
   - B and BN bidi type characters (ignored)
-  - Mc type characters with combining class 0 (treated as non-combining)
-  - Mn type characters with combining class 0 (treated as non-combining)
-  - Me type characters with combining class 0 (treated as non-combining)
+  - Mc type characters with combining class 0 (poorly combined)
+  - Mn type characters with combining class 0 (poorly combined)
+  - Me type characters with combining class 0 (poorly combined)
   - Cf type characters (ignored)
   - Cc type characters (ignored)
   - Line-breaking rules (e.g. Zs type characters)
   - Indic languages
   - Arabic shaping
+  - non-Semitic shaping (rarely used)
   - Zl and Zp characters
   - Combining characters of types 7, 8, 9, 21, 27, 28, 29, 30, 31,
   32, 33, 34, 35, 36, 84, 91, 103, 107, 118, 122, 129, 130, 132,
@@ -34,6 +35,11 @@
   - Private use characters (not really a problem)
   - Variations (no font support)
   - Vertical text
+  Font information ignored:
+  - Kerning
+  - Justification data
+  - Glyph posititioning
+  - Baseline data
  */
 
 /* Convert a (possibly null-terminated) UTF-8 string of at most SRCSIZE

From e6d428c1b8a5414b6ae79af023c45822df45a9f5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 24 Mar 2010 22:33:00 +0100
Subject: [PATCH 0672/1628] Arabic shaping support

---
 font/font.c         |  22 ++-
 include/grub/font.h |   5 +
 normal/charset.c    |   2 +-
 util/grub-mkfont.c  | 423 +++++++++++++++++++++++++++++++++++++++-----
 4 files changed, 400 insertions(+), 52 deletions(-)

diff --git a/font/font.c b/font/font.c
index 1fc10aa91..911ca4ee3 100644
--- a/font/font.c
+++ b/font/font.c
@@ -151,6 +151,7 @@ ascii_glyph_lookup (grub_uint32_t code)
           ascii_font_glyph[current]->offset_x = 0; 
           ascii_font_glyph[current]->offset_y = -2; 
 	  ascii_font_glyph[current]->device_width = 8;
+	  ascii_font_glyph[current]->font = NULL;
 
 	  grub_memcpy (ascii_font_glyph[current]->bitmap,
 		       &ascii_bitmaps[(0x7f - current) * ASCII_BITMAP_SIZE],
@@ -1181,11 +1182,12 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
     {
       grub_int16_t space = 0;
       /* Center by default.  */
-      grub_int16_t targetx = (bounds.width - combining_glyphs[i]->width) / 2
-	+ bounds.x;
+      grub_int16_t targetx;
       
       if (!combining_glyphs[i])
 	continue;
+      targetx = (bounds.width - combining_glyphs[i]->width) / 2
+	+ bounds.x;
       /* CGJ is to avoid diacritics reordering. */
       if (glyph_id->combining[i].code == GRUB_UNICODE_COMBINING_GRAPHEME_JOINER)
 	continue;
@@ -1325,13 +1327,25 @@ grub_font_construct_dry_run (grub_font_t hinted_font,
 			     struct grub_font_glyph ***combining_glyphs_out,
 			     int *device_width)
 {
-  struct grub_font_glyph *main_glyph;
+  struct grub_font_glyph *main_glyph = NULL;
   struct grub_font_glyph **combining_glyphs;
+  grub_uint32_t desired_attributes = 0;
 
   if (combining_glyphs_out)
     *combining_glyphs_out = NULL;
 
-  main_glyph = grub_font_get_glyph_with_fallback (hinted_font, glyph_id->base);
+  if (glyph_id->attributes & GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED)
+    desired_attributes |= GRUB_FONT_CODE_RIGHT_JOINED;
+
+  if (glyph_id->attributes & GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED)
+    desired_attributes |= GRUB_FONT_CODE_LEFT_JOINED;
+
+  main_glyph = grub_font_get_glyph_with_fallback (hinted_font, glyph_id->base
+						  | desired_attributes);
+
+  if (!main_glyph)
+    main_glyph = grub_font_get_glyph_with_fallback (hinted_font,
+						    glyph_id->base);
 
   /* Glyph not available in any font.  Use ASCII fallback.  */
   if (!main_glyph)
diff --git a/include/grub/font.h b/include/grub/font.h
index b896159c2..690363faf 100644
--- a/include/grub/font.h
+++ b/include/grub/font.h
@@ -70,6 +70,11 @@ struct grub_font_glyph
   grub_uint8_t bitmap[0];
 };
 
+/* Part of code field which is really used as such.  */
+#define GRUB_FONT_CODE_CHAR_MASK     0x001fffff
+#define GRUB_FONT_CODE_RIGHT_JOINED  0x80000000
+#define GRUB_FONT_CODE_LEFT_JOINED   0x40000000
+
 /* Initialize the font loader.
    Must be called before any fonts are loaded or used.  */
 void grub_font_loader_init (void);
diff --git a/normal/charset.c b/normal/charset.c
index 0683fc88c..9ad1f7cb7 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -26,7 +26,6 @@
   - Cc type characters (ignored)
   - Line-breaking rules (e.g. Zs type characters)
   - Indic languages
-  - Arabic shaping
   - non-Semitic shaping (rarely used)
   - Zl and Zp characters
   - Combining characters of types 7, 8, 9, 21, 27, 28, 29, 30, 31,
@@ -40,6 +39,7 @@
   - Justification data
   - Glyph posititioning
   - Baseline data
+  TODO: Use form characters of Unicode as last resort Arabic shaping.
  */
 
 /* Convert a (possibly null-terminated) UTF-8 string of at most SRCSIZE
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 49c5095ac..9eee2a488 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -19,8 +19,10 @@
 #include <config.h>
 #include <grub/types.h>
 #include <grub/util/misc.h>
+#include <grub/misc.h>
 #include <grub/i18n.h>
 #include <grub/fontformat.h>
+#include <grub/font.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -29,6 +31,8 @@
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
+#include FT_TRUETYPE_TAGS_H
+#include FT_TRUETYPE_TABLES_H
 #include <freetype/ftsynth.h>
 
 #include "progname.h"
@@ -47,7 +51,7 @@ struct grub_glyph_info
   int y_ofs;
   int device_width;
   int bitmap_size;
-  grub_uint8_t bitmap[0];
+  grub_uint8_t *bitmap;
 };
 
 enum file_formats
@@ -76,7 +80,9 @@ struct grub_font_info
   int flags;
   int num_range;
   grub_uint32_t *ranges;
-  struct grub_glyph_info *glyph;
+  struct grub_glyph_info *glyphs_unsorted;
+  struct grub_glyph_info *glyphs_sorted;
+  int num_glyphs;
 };
 
 static struct option options[] =
@@ -149,11 +155,11 @@ add_pixel (grub_uint8_t **data, int *mask, int not_blank)
   *mask >>= 1;
 }
 
-void
-add_char (struct grub_font_info *font_info, FT_Face face,
-	  grub_uint32_t char_code)
+static void
+add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
+	   grub_uint32_t char_code)
 {
-  struct grub_glyph_info *glyph_info, **p_glyph;
+  struct grub_glyph_info *glyph_info;
   int width, height;
   grub_uint8_t *data;
   int mask, i, j, bitmap_size;
@@ -168,24 +174,17 @@ add_char (struct grub_font_info *font_info, FT_Face face,
   else if (font_info->flags & GRUB_FONT_FLAG_FORCEHINT)
     flag |= FT_LOAD_FORCE_AUTOHINT;
 
-  if (FT_Load_Char (face, char_code, flag))
-    return;
+  if (FT_Load_Glyph (face, glyph_idx, flag))
+    {
+      printf ("WARNING: Couldn't load glyph %x\n", glyph_idx);
+      return;
+    }
 
   glyph = face->glyph;
 
   if (font_info->flags & GRUB_FONT_FLAG_BOLD)
     FT_GlyphSlot_Embolden (glyph);
 
-  p_glyph = &font_info->glyph;
-  while ((*p_glyph) && ((*p_glyph)->char_code > char_code))
-    {
-      p_glyph = &(*p_glyph)->next;
-    }
-
-  /* Ignore duplicated glyph.  */
-  if ((*p_glyph) && ((*p_glyph)->char_code == char_code))
-    return;
-
   if (glyph->next)
     printf ("%x\n", char_code);
 
@@ -193,11 +192,13 @@ add_char (struct grub_font_info *font_info, FT_Face face,
   height = glyph->bitmap.rows;
 
   bitmap_size = ((width * height + 7) / 8);
-  glyph_info = xmalloc (sizeof (struct grub_glyph_info) + bitmap_size);
+  glyph_info = xmalloc (sizeof (struct grub_glyph_info));
+  glyph_info->bitmap = xmalloc (bitmap_size);
   glyph_info->bitmap_size = bitmap_size;
 
-  glyph_info->next = *p_glyph;
-  *p_glyph = glyph_info;
+  glyph_info->next = font_info->glyphs_unsorted;
+  font_info->glyphs_unsorted = glyph_info;
+  font_info->num_glyphs++;
 
   glyph_info->char_code = char_code;
   glyph_info->width = width;
@@ -227,9 +228,318 @@ add_char (struct grub_font_info *font_info, FT_Face face,
 		 (1 << (7 - (i & 7))));
 }
 
+struct glyph_replace *subst_rightjoin, *subst_leftjoin, *subst_medijoin;
+
+struct glyph_replace
+{
+  struct glyph_replace *next;
+  grub_uint32_t from, to;
+};
+
+/* TODO: sort glyph_replace and use binary search if necessary.  */
+static void
+add_char (struct grub_font_info *font_info, FT_Face face,
+	  grub_uint32_t char_code)
+{
+  FT_UInt glyph_idx;
+  struct glyph_replace *cur;
+
+  glyph_idx = FT_Get_Char_Index (face, char_code);
+  if (!glyph_idx)
+    return;
+  add_glyph (font_info, glyph_idx, face, char_code);
+  for (cur = subst_rightjoin; cur; cur = cur->next)
+    if (cur->from == glyph_idx)
+      {
+	add_glyph (font_info, cur->to, face,
+		   char_code | GRUB_FONT_CODE_RIGHT_JOINED);
+	break;
+      }
+  for (cur = subst_leftjoin; cur; cur = cur->next)
+    if (cur->from == glyph_idx)
+      {
+	add_glyph (font_info, cur->to, face,
+		   char_code | GRUB_FONT_CODE_LEFT_JOINED);
+	break;
+      }
+  for (cur = subst_medijoin; cur; cur = cur->next)
+    if (cur->from == glyph_idx)
+      {
+	add_glyph (font_info, cur->to, face,
+		   char_code | GRUB_FONT_CODE_LEFT_JOINED
+		   | GRUB_FONT_CODE_RIGHT_JOINED);
+	break;
+      }
+}
+
+struct gsub_header
+{
+  grub_uint32_t version;
+  grub_uint16_t scripts_off;
+  grub_uint16_t features_off;
+  grub_uint16_t lookups_off;
+} __attribute__ ((packed));
+
+struct gsub_features
+{
+  grub_uint16_t count;
+  struct
+  {
+#define FEATURE_FINA 0x66696e61
+#define FEATURE_INIT 0x696e6974
+#define FEATURE_MEDI 0x6d656469
+#define FEATURE_AALT 0x61616c74
+    grub_uint32_t feature_tag;
+    grub_uint16_t offset;
+  } __attribute__ ((packed)) features[0];
+} __attribute__ ((packed));
+
+struct gsub_feature
+{
+  grub_uint16_t params;
+  grub_uint16_t lookupcount;
+  grub_uint16_t lookupindices[0];
+} __attribute__ ((packed));
+
+struct gsub_lookup_list
+{
+  grub_uint16_t count;
+  grub_uint16_t offsets[0];
+} __attribute__ ((packed));
+
+struct gsub_lookup
+{
+  grub_uint16_t type;
+  grub_uint16_t flag;
+  grub_uint16_t subtablecount;
+  grub_uint16_t subtables[0];
+} __attribute__ ((packed));
+
+struct gsub_substitution
+{
+  grub_uint16_t type;
+  grub_uint16_t coverage_off;
+  union
+  {
+    grub_int16_t delta;
+    struct
+    {
+      grub_int16_t count;
+      grub_uint16_t repl[0];
+    };
+  };
+} __attribute__ ((packed));
+
+struct gsub_coverage_list
+{
+  grub_uint16_t type;
+  grub_uint16_t count;
+  grub_uint16_t glyphs[0];
+} __attribute__ ((packed));
+
+struct gsub_coverage_ranges
+{
+  grub_uint16_t type;
+  grub_uint16_t count;
+  struct 
+  {
+    grub_uint16_t start;
+    grub_uint16_t end;
+    grub_uint16_t start_index;
+  } __attribute__ ((packed)) ranges[0];
+} __attribute__ ((packed));
+
+#define GSUB_SINGLE_SUBSTITUTION 1
+
+#define GSUB_SUBSTITUTION_DELTA 1
+#define GSUB_SUBSTITUTION_MAP 2
+
+#define GSUB_COVERAGE_LIST 1
+#define GSUB_COVERAGE_RANGE 2
+
+#define GSUB_RTL_CHAR 1
+
+static void
+add_subst (grub_uint32_t from, grub_uint32_t to, struct glyph_replace **target)
+{
+  struct glyph_replace *new = xmalloc (sizeof (*new));
+  new->next = *target;
+  new->from = from;
+  new->to = to;
+  *target = new;
+}
+
+static void
+process_cursive (struct gsub_feature *feature,
+		 struct gsub_lookup_list *lookups,
+		 grub_uint32_t feattag)
+{
+  int j, k;
+  int i;
+  struct glyph_replace **target;
+  struct gsub_substitution *sub;
+
+  auto inline void subst (grub_uint32_t glyph);
+  void subst (grub_uint32_t glyph)
+  {
+    grub_uint16_t substtype;
+    substtype = grub_be_to_cpu16 (sub->type);
+
+    if (substtype == GSUB_SUBSTITUTION_DELTA)
+      add_subst (glyph, glyph + grub_be_to_cpu16 (sub->delta), target);
+    else if (i >= grub_be_to_cpu16 (sub->count))
+      printf ("Out of range substitution (%d, %d)\n", i,
+	      grub_be_to_cpu16 (sub->count));
+    else
+      add_subst (glyph, grub_be_to_cpu16 (sub->repl[i++]), target);
+  }
+
+  for (j = 0; j < grub_be_to_cpu16 (feature->lookupcount); j++)
+    {
+      int lookup_index = grub_be_to_cpu16 (feature->lookupindices[j]);
+      struct gsub_lookup *lookup;
+      if (lookup_index >= grub_be_to_cpu16 (lookups->count))
+	{
+	  printf ("Out of range lookup: %d\n", lookup_index);
+	  continue;
+	}
+      lookup = (struct gsub_lookup *)
+	((grub_uint8_t *) lookups 
+	 + grub_be_to_cpu16 (lookups->offsets[lookup_index]));
+      if (grub_be_to_cpu16 (lookup->type) != GSUB_SINGLE_SUBSTITUTION)
+	{
+	  printf ("Unsupported substitution type: %d\n",
+		  grub_be_to_cpu16 (lookup->type));
+	  continue;
+	}		      
+      if (grub_be_to_cpu16 (lookup->flag) & ~GSUB_RTL_CHAR)
+	{
+	  printf ("Unsupported substitution flag: 0x%x\n",
+		  grub_be_to_cpu16 (lookup->flag));
+	}
+      switch (feattag)
+	{
+	case FEATURE_INIT:
+	  if (grub_be_to_cpu16 (lookup->flag) & GSUB_RTL_CHAR)
+	    target = &subst_leftjoin;
+	  else
+	    target = &subst_rightjoin;
+	  break;
+	case FEATURE_FINA:
+	  if (grub_be_to_cpu16 (lookup->flag) & GSUB_RTL_CHAR)
+	    target = &subst_rightjoin;
+	  else
+	    target = &subst_leftjoin;
+	  break;
+	case FEATURE_MEDI:
+	  target = &subst_medijoin;
+	  break;	  
+	}
+      for (k = 0; k < grub_be_to_cpu16 (lookup->subtablecount); k++)
+	{
+	  sub = (struct gsub_substitution *)
+	    ((grub_uint8_t *) lookup + grub_be_to_cpu16 (lookup->subtables[k]));
+	  grub_uint16_t substtype;
+	  substtype = grub_be_to_cpu16 (sub->type);
+	  if (substtype != GSUB_SUBSTITUTION_MAP
+	      && substtype != GSUB_SUBSTITUTION_DELTA)
+	    {
+	      printf ("Unsupported substitution specification: %d\n",
+		      substtype);
+	      continue;
+	    }
+	  void *coverage = (grub_uint8_t *) sub
+	    + grub_be_to_cpu16 (sub->coverage_off);
+	  grub_uint32_t covertype;
+	  covertype = grub_be_to_cpu16 (*(grub_uint16_t * __attribute__ ((packed))) coverage);
+	  i = 0;
+	  if (covertype == GSUB_COVERAGE_LIST)
+	    {
+	      struct gsub_coverage_list *cover = coverage;
+	      int l;
+	      for (l = 0; l < grub_be_to_cpu16 (cover->count); l++)
+		subst (grub_be_to_cpu16 (cover->glyphs[l]));
+	    }
+	  else if (covertype == GSUB_COVERAGE_RANGE)
+	    {
+	      struct gsub_coverage_ranges *cover = coverage;
+	      int l, m;
+	      for (l = 0; l < grub_be_to_cpu16 (cover->count); l++)
+		for (m = grub_be_to_cpu16 (cover->ranges[l].start);
+		     m <= grub_be_to_cpu16 (cover->ranges[l].end); m++)
+		  subst (m);
+	    }
+	  else
+	    printf ("Unsupported coverage specification: %d\n", covertype);
+	}
+    }
+}
+
 void
 add_font (struct grub_font_info *font_info, FT_Face face)
 {
+  struct gsub_header *gsub = NULL;
+  FT_ULong gsub_len = 0;
+
+  if (!FT_Load_Sfnt_Table (face, TTAG_GSUB, 0, NULL, &gsub_len))
+    {
+      gsub = xmalloc (gsub_len);
+      if (FT_Load_Sfnt_Table (face, TTAG_GSUB, 0, (void *) gsub, &gsub_len))
+	{
+	  free (gsub);
+	  gsub = NULL;
+	  gsub_len = 0;
+	}
+    }
+  if (gsub)
+    {
+      struct gsub_features *features 
+	= (struct gsub_features *) (((grub_uint8_t *) gsub)
+				    + grub_be_to_cpu16 (gsub->features_off));
+      struct gsub_lookup_list *lookups
+	= (struct gsub_lookup_list *) (((grub_uint8_t *) gsub)
+				       + grub_be_to_cpu16 (gsub->lookups_off));
+      int i;
+      int nfeatures = grub_be_to_cpu16 (features->count);
+      for (i = 0; i < nfeatures; i++)
+	{
+	  struct gsub_feature *feature = (struct gsub_feature *)
+	    ((grub_uint8_t *) features
+	     + grub_be_to_cpu16 (features->features[i].offset));
+	  grub_uint32_t feattag
+	    = grub_be_to_cpu32 (features->features[i].feature_tag);
+	  if (feature->params)
+	    printf ("WARNING: unsupported feature parameters: %x\n",
+		    grub_be_to_cpu16 (feature->params));
+	  switch (feattag)
+	    {
+	      /* Used for retrieving all possible variants. Useless in grub.  */
+	    case FEATURE_AALT:
+	      break;
+
+	      /* Cursive form variants.  */
+	    case FEATURE_FINA:
+	    case FEATURE_INIT:
+	    case FEATURE_MEDI:
+	      process_cursive (feature, lookups, feattag);
+	      break;
+
+	    default:
+	      {
+		char str[5];
+		int j;
+		memcpy (str, &features->features[i].feature_tag,
+			sizeof (features->features[i].feature_tag));
+		str[4] = 0;
+		for (j = 0; j < 4; j++)
+		  if (!grub_isgraph (str[j]))
+		    str[j] = '?';
+		printf ("Unknown gsub feature 0x%x (%s)\n", feattag, str);
+	      }
+	    }
+	}
+    }
+
   if (font_info->num_range)
     {
       int i;
@@ -287,7 +597,8 @@ print_glyphs (struct grub_font_info *font_info)
   struct grub_glyph_info *glyph;
   char line[512];
 
-  for (glyph = font_info->glyph, num = 0; glyph; glyph = glyph->next, num++)
+  for (glyph = font_info->glyphs_sorted, num = 0; num < font_info->num_glyphs;
+       glyph++, num++)
     {
       int x, y, xmax, xmin, ymax, ymin;
       grub_uint8_t *bitmap, mask;
@@ -363,7 +674,8 @@ write_font_ascii_bitmap (struct grub_font_info *font_info, char *output_file)
     grub_util_error ("Can\'t write to file %s.", output_file);
 
   int correct_size;
-  for (glyph = font_info->glyph, num = 0; glyph; glyph = glyph->next, num++)
+  for (glyph = font_info->glyphs_sorted, num = 0; num < font_info->num_glyphs;
+       glyph++, num++)
     {
       correct_size = 1;
       if (glyph->width != 8 || glyph->height != 16)
@@ -397,7 +709,8 @@ write_font_width_spec (struct grub_font_info *font_info, char *output_file)
   if (! file)
     grub_util_error ("Can\'t write to file %s.", output_file);
 
-  for (glyph = font_info->glyph; glyph; glyph = glyph->next)
+  for (glyph = font_info->glyphs_sorted;
+       glyph < font_info->glyphs_sorted + font_info->num_glyphs; glyph++)
     if (glyph->width > 12)
       out[glyph->char_code >> 3] |= (1 << (glyph->char_code & 7));
 
@@ -412,8 +725,8 @@ write_font_pf2 (struct grub_font_info *font_info, char *output_file)
   FILE *file;
   grub_uint32_t leng, data;
   char style_name[20], *font_name;
-  struct grub_glyph_info *cur, *pre;
-  int num, offset;
+  int offset;
+  struct grub_glyph_info *cur;
 
   file = fopen (output_file, "wb");
   if (! file)
@@ -497,33 +810,18 @@ write_font_pf2 (struct grub_font_info *font_info, char *output_file)
       printf ("Font descent: %d\n", font_info->desc);
     }
 
-  num = 0;
-  pre = 0;
-  cur = font_info->glyph;
-  while (cur)
-    {
-      struct grub_glyph_info *nxt;
-
-      nxt = cur->next;
-      cur->next = pre;
-      pre = cur;
-      cur = nxt;
-      num++;
-    }
-
-  font_info->glyph = pre;
-
   if (font_verbosity > 0)
-    printf ("Number of glyph: %d\n", num);
+    printf ("Number of glyph: %d\n", font_info->num_glyphs);
 
-  leng = grub_cpu_to_be32 (num * 9);
+  leng = grub_cpu_to_be32 (font_info->num_glyphs * 9);
   grub_util_write_image (FONT_FORMAT_SECTION_NAMES_CHAR_INDEX,
   			 sizeof(FONT_FORMAT_SECTION_NAMES_CHAR_INDEX) - 1,
 			 file);
   grub_util_write_image ((char *) &leng, 4, file);
-  offset += 8 + num * 9 + 8;
+  offset += 8 + font_info->num_glyphs * 9 + 8;
 
-  for (cur = font_info->glyph; cur; cur = cur->next)
+  for (cur = font_info->glyphs_sorted;
+       cur < font_info->glyphs_sorted + font_info->num_glyphs; cur++)
     {
       data = grub_cpu_to_be32 (cur->char_code);
       grub_util_write_image ((char *) &data, 4, file);
@@ -539,7 +837,8 @@ write_font_pf2 (struct grub_font_info *font_info, char *output_file)
   			 sizeof(FONT_FORMAT_SECTION_NAMES_DATA) - 1, file);
   grub_util_write_image ((char *) &leng, 4, file);
 
-  for (cur = font_info->glyph; cur; cur = cur->next)
+  for (cur = font_info->glyphs_sorted;
+       cur < font_info->glyphs_sorted + font_info->num_glyphs; cur++)
     {
       data = grub_cpu_to_be16 (cur->width);
       grub_util_write_image ((char *) &data, 2, file);
@@ -742,6 +1041,36 @@ main (int argc, char *argv[])
 
   FT_Done_FreeType (ft_lib);
 
+  {
+    int counter[65537];
+    struct grub_glyph_info *tmp, *cur;
+    int i;
+
+    memset (counter, 0, sizeof (counter));
+
+    for (cur = font_info.glyphs_unsorted; cur; cur = cur->next)
+      counter[(cur->char_code & 0xffff) + 1]++;
+    for (i = 0; i < 0x10000; i++)
+      counter[i+1] += counter[i];
+    tmp = xmalloc (font_info.num_glyphs
+		   * sizeof (tmp[0]));
+    for (cur = font_info.glyphs_unsorted; cur; cur = cur->next)
+      tmp[counter[(cur->char_code & 0xffff)]++] = *cur;
+
+    memset (counter, 0, sizeof (counter));
+
+    for (cur = tmp; cur < tmp + font_info.num_glyphs; cur++)
+      counter[((cur->char_code & 0xffff0000) >> 16) + 1]++;
+    for (i = 0; i < 0x10000; i++)
+      counter[i+1] += counter[i];
+    font_info.glyphs_sorted = xmalloc (font_info.num_glyphs
+					* sizeof (font_info.glyphs_sorted[0]));
+    for (cur = tmp; cur < tmp + font_info.num_glyphs; cur++)
+      font_info.glyphs_sorted[counter[(cur->char_code & 0xffff0000) >> 16]++]
+	= *cur;
+    free (tmp);
+  }
+
   switch (file_format)
     {
     case PF2:

From 6d107fb2a41045d5ba6fd6b37b35aa3973140340 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 25 Mar 2010 11:26:50 +0100
Subject: [PATCH 0673/1628] Add ligatures to problem list

---
 font/font.c        | 2 --
 normal/charset.c   | 1 +
 util/grub-mkfont.c | 7 +++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/font/font.c b/font/font.c
index 911ca4ee3..f39bd9e7e 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1268,8 +1268,6 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	case GRUB_UNICODE_COMB_HEBREW_QAMATS:
 	case GRUB_UNICODE_COMB_HEBREW_TSERE:
 	case GRUB_UNICODE_COMB_HEBREW_SEGOL:
-	  /* , 
-	     GRUB_UNICODE_COMB_HEBREW_DAGESH = 21*/
 	  /* TODO: placement in final kaf and under reish.  */
 
 	case GRUB_UNICODE_COMB_HEBREW_HATAF_SEGOL:
diff --git a/normal/charset.c b/normal/charset.c
index 9ad1f7cb7..55a9894a9 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -34,6 +34,7 @@
   - Private use characters (not really a problem)
   - Variations (no font support)
   - Vertical text
+  - Ligatures
   Font information ignored:
   - Kerning
   - Justification data
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 9eee2a488..09a03085a 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -289,6 +289,8 @@ struct gsub_features
 #define FEATURE_INIT 0x696e6974
 #define FEATURE_MEDI 0x6d656469
 #define FEATURE_AALT 0x61616c74
+#define FEATURE_LIGA 0x6c696761
+#define FEATURE_RLIG 0x726c6967
     grub_uint32_t feature_tag;
     grub_uint16_t offset;
   } __attribute__ ((packed)) features[0];
@@ -517,6 +519,11 @@ add_font (struct grub_font_info *font_info, FT_Face face)
 	    case FEATURE_AALT:
 	      break;
 
+	      /* FIXME: Add ligature support.  */
+	    case FEATURE_LIGA:
+	    case FEATURE_RLIG:
+	      break;
+
 	      /* Cursive form variants.  */
 	    case FEATURE_FINA:
 	    case FEATURE_INIT:

From 3c31d9c0824926fed5c3513812e13c0641867fed Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 25 Mar 2010 11:56:19 +0100
Subject: [PATCH 0674/1628] Report freetype errors

---
 util/grub-mkfont.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 09a03085a..c9d48ed7a 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -35,6 +35,12 @@
 #include FT_TRUETYPE_TABLES_H
 #include <freetype/ftsynth.h>
 
+#undef __FTERRORS_H__
+#define FT_ERROR_START_LIST   const char *ft_errmsgs[] = { 
+#define FT_ERRORDEF(e, v, s)  [e] = s,
+#define FT_ERROR_END_LIST     };
+#include FT_ERRORS_H   
+
 #include "progname.h"
 
 #define GRUB_FONT_DEFAULT_SIZE		16
@@ -165,6 +171,7 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
   int mask, i, j, bitmap_size;
   FT_GlyphSlot glyph;
   int flag = FT_LOAD_RENDER | FT_LOAD_MONOCHROME;
+  FT_Error err;
 
   if (font_info->flags & GRUB_FONT_FLAG_NOBITMAP)
     flag |= FT_LOAD_NO_BITMAP;
@@ -174,9 +181,15 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
   else if (font_info->flags & GRUB_FONT_FLAG_FORCEHINT)
     flag |= FT_LOAD_FORCE_AUTOHINT;
 
-  if (FT_Load_Glyph (face, glyph_idx, flag))
+  err = FT_Load_Glyph (face, glyph_idx, flag);
+  if (err)
     {
-      printf ("WARNING: Couldn't load glyph %x\n", glyph_idx);
+      if (err < ARRAY_SIZE (ft_errmsgs))
+	printf ("Freetype Error %d loading glyph 0x%x for U+0x%x: %s\n",
+		err, glyph_idx, char_code, ft_errmsgs[err]);
+      else
+	printf ("Freetype Error %d loading glyph 0x%x for U+0x%x\n",
+		err, glyph_idx, char_code);
       return;
     }
 

From d85da27cc0e1e670abee72758836f633cd52b297 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 26 Mar 2010 19:14:24 +0100
Subject: [PATCH 0675/1628] Remove grub_commands_iterate

---
 commands/help.c        | 145 ++++++++++++++++++++---------------------
 include/grub/command.h |   7 +-
 normal/completion.c    |  29 ++++-----
 3 files changed, 82 insertions(+), 99 deletions(-)

diff --git a/commands/help.c b/commands/help.c
index 1181c3bfb..ecf77fa4c 100644
--- a/commands/help.c
+++ b/commands/help.c
@@ -33,94 +33,87 @@ grub_cmd_help (grub_extcmd_t ext __attribute__ ((unused)), int argc,
   int cnt = 0;
   char *currarg;
 
-  auto int print_command_info (grub_command_t cmd);
-  auto int print_command_help (grub_command_t cmd);
-
-  int print_command_info (grub_command_t cmd)
-    {
-      if ((cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE) &&
-	  (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE))
-	{
-	  struct grub_term_output *term;
-	  const char *summary_translated = _(cmd->summary);
-	  char *command_help;
-	  grub_uint32_t *unicode_command_help;
-	  grub_uint32_t *unicode_last_position;
-	  			      
-	  command_help = grub_xasprintf ("%s %s", cmd->name, summary_translated);
-	  if (!command_help)
-	    return 1;
-
-	  grub_utf8_to_ucs4_alloc (command_help, &unicode_command_help,
-	  			   &unicode_last_position);
-
-	  FOR_ACTIVE_TERM_OUTPUTS(term)
-	  {
-	    unsigned stringwidth;
-	    grub_uint32_t *unicode_last_screen_position;
-
-	    unicode_last_screen_position = unicode_command_help;
-
-	    stringwidth = 0;
-
-	    while (unicode_last_screen_position < unicode_last_position && 
-		   stringwidth < ((grub_term_width (term) / 2) - 2))
-	      {
-		stringwidth
-		  += grub_term_getcharwidth (term,
-					     *unicode_last_screen_position);
-		unicode_last_screen_position++;
-	      }
-
-	    grub_print_ucs4 (unicode_command_help,
-			     unicode_last_screen_position, term);
-	    if (!(cnt % 2))
-	      grub_print_spaces (term, grub_term_width (term) / 2
-				 - stringwidth);
-	  }
-	  if (cnt % 2)
-	    grub_printf ("\n");
-	  cnt++;
-	  
-	  grub_free (command_help);
-	  grub_free (unicode_command_help);
-	}
-      return 0;
-    }
-
-  int print_command_help (grub_command_t cmd)
-    {
-      if (cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE)
-	{
-	  if (! grub_strncmp (cmd->name, currarg, grub_strlen (currarg)))
-	    {
-	      if (cnt++ > 0)
-		grub_printf ("\n\n");
-
-	      if (cmd->flags & GRUB_COMMAND_FLAG_EXTCMD)
-		grub_arg_show_help ((grub_extcmd_t) cmd->data);
-	      else
-		grub_printf ("%s %s %s\n%s\b", _("Usage:"), cmd->name, _(cmd->summary),
-			     _(cmd->description));
-	    }
-	}
-      return 0;
-    }
-
   if (argc == 0)
     {
-      grub_command_iterate (print_command_info);
+      grub_command_t cmd;
+      FOR_COMMANDS(cmd)
+      {
+	if ((cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE) &&
+	    (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE))
+	  {
+	    struct grub_term_output *term;
+	    const char *summary_translated = _(cmd->summary);
+	    char *command_help;
+	    grub_uint32_t *unicode_command_help;
+	    grub_uint32_t *unicode_last_position;
+	  			      
+	    command_help = grub_xasprintf ("%s %s", cmd->name, summary_translated);
+	    if (!command_help)
+	      break;
+
+	    grub_utf8_to_ucs4_alloc (command_help, &unicode_command_help,
+				     &unicode_last_position);
+
+	    FOR_ACTIVE_TERM_OUTPUTS(term)
+	    {
+	      unsigned stringwidth;
+	      grub_uint32_t *unicode_last_screen_position;
+
+	      unicode_last_screen_position = unicode_command_help;
+
+	      stringwidth = 0;
+
+	      while (unicode_last_screen_position < unicode_last_position && 
+		     stringwidth < ((grub_term_width (term) / 2) - 2))
+		{
+		  stringwidth
+		    += grub_term_getcharwidth (term,
+					       *unicode_last_screen_position);
+		  unicode_last_screen_position++;
+		}
+
+	      grub_print_ucs4 (unicode_command_help,
+			       unicode_last_screen_position, term);
+	      if (!(cnt % 2))
+		grub_print_spaces (term, grub_term_width (term) / 2
+				   - stringwidth);
+	    }
+	    if (cnt % 2)
+	      grub_printf ("\n");
+	    cnt++;
+	  
+	    grub_free (command_help);
+	    grub_free (unicode_command_help);
+	  }
+      }
       if (!(cnt % 2))
 	grub_printf ("\n");
     }
   else
     {
       int i;
+      grub_command_t cmd;
 
       for (i = 0; i < argc; i++)
 	{
 	  currarg = args[i];
-	  grub_command_iterate (print_command_help);
+	  FOR_COMMANDS(cmd)
+	  {
+	    if (cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE)
+	      {
+		if (! grub_strncmp (cmd->name, currarg, grub_strlen (currarg)))
+		  {
+		    if (cnt++ > 0)
+		      grub_printf ("\n\n");
+
+		    if (cmd->flags & GRUB_COMMAND_FLAG_EXTCMD)
+		      grub_arg_show_help ((grub_extcmd_t) cmd->data);
+		    else
+		      grub_printf ("%s %s %s\n%s\b", _("Usage:"), cmd->name, _(cmd->summary),
+				   _(cmd->description));
+		  }
+	      }
+	  }
 	}
     }
 
diff --git a/include/grub/command.h b/include/grub/command.h
index 6e9942b60..3fad88ed0 100644
--- a/include/grub/command.h
+++ b/include/grub/command.h
@@ -115,12 +115,7 @@ grub_command_execute (const char *name, int argc, char **argv)
   return (cmd) ? cmd->func (cmd, argc, argv) : GRUB_ERR_FILE_NOT_FOUND;
 }
 
-static inline int
-grub_command_iterate (int (*func) (grub_command_t))
-{
-  return grub_list_iterate (GRUB_AS_LIST (grub_command_list),
-			    (grub_list_hook_t) func);
-}
+#define FOR_COMMANDS(var) for ((var) = grub_command_list; (var); (var) = (var)->next)
 
 void grub_register_core_commands (void);
 
diff --git a/normal/completion.c b/normal/completion.c
index 13e8f7a6b..13c4b7b05 100644
--- a/normal/completion.c
+++ b/normal/completion.c
@@ -176,21 +176,6 @@ iterate_dev (const char *devname)
   return 0;
 }
 
-static int
-iterate_command (grub_command_t cmd)
-{
-  if (cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE)
-    {
-      if (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE)
-	{
-	  if (add_completion (cmd->name, " ", GRUB_COMPLETION_TYPE_COMMAND))
-	    return 1;
-	}
-    }
-
-  return 0;
-}
-
 /* Complete a device.  */
 static int
 complete_device (void)
@@ -421,8 +406,18 @@ grub_normal_do_completion (char *buf, int *restore,
   if (argc == 1 || argc == 0)
     {
       /* Complete a command.  */
-      if (grub_command_iterate (iterate_command))
-	goto fail;
+      grub_command_t cmd;
+      FOR_COMMANDS(cmd)
+      {
+	if (cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE)
+	  {
+	    if (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE)
+	      {
+		if (add_completion (cmd->name, " ", GRUB_COMPLETION_TYPE_COMMAND))
+		  goto fail;
+	      }
+	  }
+      }
     }
   else if (*current_word == '-')
     {

From fbc5a383e2742ffdf166ddcd98e12e87999aecf4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 26 Mar 2010 19:18:19 +0100
Subject: [PATCH 0676/1628] Remove list_iterate usage auth.c

---
 normal/auth.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/normal/auth.c b/normal/auth.c
index 156b84c37..6d475cc0a 100644
--- a/normal/auth.c
+++ b/normal/auth.c
@@ -133,25 +133,24 @@ static int
 is_authenticated (const char *userlist)
 {
   const char *superusers;
-
-  auto int hook (grub_list_t item);
-  int hook (grub_list_t item)
-  {
-    const char *name;
-    if (!((struct grub_auth_user *) item)->authenticated)
-      return 0;
-    name = ((struct grub_auth_user *) item)->name;
-
-    return (userlist && grub_strword (userlist, name))
-      || grub_strword (superusers, name);
-  }
+  struct grub_auth_user *user;
 
   superusers = grub_env_get ("superusers");
 
   if (!superusers)
     return 1;
 
-  return grub_list_iterate (GRUB_AS_LIST (users), hook);
+  for (user = users; user; user = user->next)
+    {
+      if (!(user->authenticated))
+	continue;
+
+      if ((userlist && grub_strword (userlist, user->name))
+	  || grub_strword (superusers, user->name))
+	return 1;
+    }
+
+  return 0;
 }
 
 static int

From 2aa6398b64430fc5235361b69efbae56e0188aec Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 26 Mar 2010 19:21:01 +0100
Subject: [PATCH 0677/1628] Remove second part of list_iterate usage auth.c

---
 normal/auth.c | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/normal/auth.c b/normal/auth.c
index 6d475cc0a..87337afda 100644
--- a/normal/auth.c
+++ b/normal/auth.c
@@ -204,22 +204,7 @@ grub_auth_check_authentication (const char *userlist)
   grub_err_t err;
   static unsigned long punishment_delay = 1;
   char entered[GRUB_AUTH_MAX_PASSLEN];
-
-  auto int hook (grub_list_t item);
-  int hook (grub_list_t item)
-  {
-    if (grub_strcmp (login, ((struct grub_auth_user *) item)->name) == 0)
-      cur = (struct grub_auth_user *) item;
-    return 0;
-  }
-
-  auto int hook_any (grub_list_t item);
-  int hook_any (grub_list_t item)
-  {
-    if (((struct grub_auth_user *) item)->callback)
-      cur = (struct grub_auth_user *) item;
-    return 0;
-  }
+  struct grub_auth_user *user;
 
   grub_memset (login, 0, sizeof (login));
 
@@ -239,7 +224,11 @@ grub_auth_check_authentication (const char *userlist)
   if (!grub_password_get (entered, GRUB_AUTH_MAX_PASSLEN))
     goto access_denied;
 
-  grub_list_iterate (GRUB_AS_LIST (users), hook);
+  for (user = users; user; user = user->next)
+    {
+      if (grub_strcmp (login, user->name) == 0)
+	cur = user;
+    }
 
   if (!cur || ! cur->callback)
     goto access_denied;

From 7c0ab99bd2095fdd081e5c627727a3c878b35409 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 26 Mar 2010 19:23:19 +0100
Subject: [PATCH 0678/1628] Remove  list_iterate usage functional_test.c

---
 tests/lib/functional_test.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/tests/lib/functional_test.c b/tests/lib/functional_test.c
index 8ff08cf8a..33eeec451 100644
--- a/tests/lib/functional_test.c
+++ b/tests/lib/functional_test.c
@@ -26,15 +26,10 @@ grub_functional_test (struct grub_extcmd *cmd __attribute__ ((unused)),
 		      int argc __attribute__ ((unused)),
 		      char **args __attribute__ ((unused)))
 {
-  auto int run_test (grub_test_t test);
-  int run_test (grub_test_t test)
-  {
-    grub_test_run (test);
-    return 0;
-  }
+  grub_test_t test;
 
-  grub_list_iterate (GRUB_AS_LIST (grub_test_list),
-		     (grub_list_hook_t) run_test);
+  for (test = grub_test_list; test; test = test->next)
+    grub_test_run (test);
   return GRUB_ERR_NONE;
 }
 

From 42ca71ca47cbd9b83c9febee2a6a1950c0fcd58f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 26 Mar 2010 19:25:53 +0100
Subject: [PATCH 0679/1628] FOR_LIST_ELEMENTS convenience macros

---
 include/grub/list.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/grub/list.h b/include/grub/list.h
index 5559158dc..1c00a349e 100644
--- a/include/grub/list.h
+++ b/include/grub/list.h
@@ -40,6 +40,8 @@ int EXPORT_FUNC(grub_list_iterate) (grub_list_t head, grub_list_hook_t hook);
 void EXPORT_FUNC(grub_list_insert) (grub_list_t *head, grub_list_t item,
 				    grub_list_test_t test);
 
+#define FOR_LIST_ELEMENTS(var, list) for ((var) = (list); (var); (var) = (var)->next)
+
 static inline void *
 grub_bad_type_cast_real (int line, const char *file)
      ATTRIBUTE_ERROR ("bad type cast between incompatible grub types");

From 3f8ae91c0913ec34baea73adb4368a44a41e9416 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 26 Mar 2010 19:32:21 +0100
Subject: [PATCH 0680/1628] Use FOR_LIST_ELEMENTS convenience macros

---
 include/grub/command.h      | 2 +-
 include/grub/partition.h    | 2 +-
 include/grub/term.h         | 8 ++++----
 normal/auth.c               | 2 +-
 tests/lib/functional_test.c | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/grub/command.h b/include/grub/command.h
index 3fad88ed0..6bd3d07c9 100644
--- a/include/grub/command.h
+++ b/include/grub/command.h
@@ -115,7 +115,7 @@ grub_command_execute (const char *name, int argc, char **argv)
   return (cmd) ? cmd->func (cmd, argc, argv) : GRUB_ERR_FILE_NOT_FOUND;
 }
 
-#define FOR_COMMANDS(var) for ((var) = grub_command_list; (var); (var) = (var)->next)
+#define FOR_COMMANDS(var) FOR_LIST_ELEMENTS((var), grub_command_list)
 
 void grub_register_core_commands (void);
 
diff --git a/include/grub/partition.h b/include/grub/partition.h
index 80a9c15f0..722c7b3e0 100644
--- a/include/grub/partition.h
+++ b/include/grub/partition.h
@@ -91,7 +91,7 @@ grub_partition_map_unregister (grub_partition_map_t partmap)
 		    GRUB_AS_LIST (partmap));
 }
 
-#define FOR_PARTITION_MAPS(var) for (var = grub_partition_map_list; var; var = var->next)
+#define FOR_PARTITION_MAPS(var) FOR_LIST_ELEMENTS((var), (grub_partition_map_list))
 
 
 static inline grub_disk_addr_t
diff --git a/include/grub/term.h b/include/grub/term.h
index 143aabe1e..230436388 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -245,10 +245,10 @@ grub_term_unregister_output (grub_term_output_t term)
 		    GRUB_AS_LIST (term));
 }
 
-#define FOR_ACTIVE_TERM_INPUTS(var) for (var = grub_term_inputs; var; var = var->next)
-#define FOR_DISABLED_TERM_INPUTS(var) for (var = grub_term_inputs_disabled; var; var = var->next)
-#define FOR_ACTIVE_TERM_OUTPUTS(var) for (var = grub_term_outputs; var; var = var->next)
-#define FOR_DISABLED_TERM_OUTPUTS(var) for (var = grub_term_outputs_disabled; var; var = var->next)
+#define FOR_ACTIVE_TERM_INPUTS(var) FOR_LIST_ELEMENTS((var), (grub_term_inputs))
+#define FOR_DISABLED_TERM_INPUTS(var) FOR_LIST_ELEMENTS((var), (grub_term_inputs_disabled))
+#define FOR_ACTIVE_TERM_OUTPUTS(var) FOR_LIST_ELEMENTS((var), (grub_term_outputs))
+#define FOR_DISABLED_TERM_OUTPUTS(var) FOR_LIST_ELEMENTS((var), (grub_term_outputs_disabled))
 
 void EXPORT_FUNC(grub_putchar) (int c);
 void EXPORT_FUNC(grub_putcode) (grub_uint32_t code,
diff --git a/normal/auth.c b/normal/auth.c
index 87337afda..c28f50024 100644
--- a/normal/auth.c
+++ b/normal/auth.c
@@ -140,7 +140,7 @@ is_authenticated (const char *userlist)
   if (!superusers)
     return 1;
 
-  for (user = users; user; user = user->next)
+  FOR_LIST_ELEMENTS (user, users)
     {
       if (!(user->authenticated))
 	continue;
diff --git a/tests/lib/functional_test.c b/tests/lib/functional_test.c
index 33eeec451..6aafe4dbb 100644
--- a/tests/lib/functional_test.c
+++ b/tests/lib/functional_test.c
@@ -28,7 +28,7 @@ grub_functional_test (struct grub_extcmd *cmd __attribute__ ((unused)),
 {
   grub_test_t test;
 
-  for (test = grub_test_list; test; test = test->next)
+  FOR_LIST_ELEMENTS (test, grub_test_list)
     grub_test_run (test);
   return GRUB_ERR_NONE;
 }

From 41e12098274d28183aa5f46d0c26863383f5b26d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 26 Mar 2010 19:35:34 +0100
Subject: [PATCH 0681/1628] Remove  list_iterate usage tests/

---
 tests/lib/test.c      | 20 +++++++-------------
 tests/lib/unit_test.c | 12 ++++--------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/tests/lib/test.c b/tests/lib/test.c
index b5c054370..3029495c6 100644
--- a/tests/lib/test.c
+++ b/tests/lib/test.c
@@ -134,23 +134,17 @@ grub_test_unregister (const char *name)
 int
 grub_test_run (grub_test_t test)
 {
-  auto int print_failure (grub_test_failure_t item);
-  int print_failure (grub_test_failure_t item)
-  {
-    grub_test_failure_t failure = (grub_test_failure_t) item;
-
-    grub_printf (" %s:%s:%u: %s\n",
-		 (failure->file ? : "<unknown_file>"),
-		 (failure->funp ? : "<unknown_function>"),
-		 failure->line, (failure->message ? : "<no message>"));
-    return 0;
-  }
+  grub_test_failure_t failure;
 
   test->main ();
 
   grub_printf ("%s:\n", test->name);
-  grub_list_iterate (GRUB_AS_LIST (failure_list),
-		     (grub_list_hook_t) print_failure);
+  FOR_LIST_ELEMENTS (failure, failure_list)
+    grub_printf (" %s:%s:%u: %s\n",
+		 (failure->file ? : "<unknown_file>"),
+		 (failure->funp ? : "<unknown_function>"),
+		 failure->line, (failure->message ? : "<no message>"));
+
   if (!failure_list)
     grub_printf ("%s: PASS\n", test->name);
   else
diff --git a/tests/lib/unit_test.c b/tests/lib/unit_test.c
index e461150de..e8b97b1f4 100644
--- a/tests/lib/unit_test.c
+++ b/tests/lib/unit_test.c
@@ -34,16 +34,12 @@ main (int argc __attribute__ ((unused)),
   extern void grub_unit_test_init (void);
   extern void grub_unit_test_fini (void);
 
-  auto int run_test (grub_test_t test);
-  int run_test (grub_test_t test)
-  {
-    status = grub_test_run (test) ? : status;
-    return 0;
-  }
+  grub_test_t test;
 
   grub_unit_test_init ();
-  grub_list_iterate (GRUB_AS_LIST (grub_test_list),
-		     (grub_list_hook_t) run_test);
+  FOR_LIST_ELEMENTS (test, grub_test_list)
+    status = grub_test_run (test) ? : status;
+
   grub_unit_test_fini ();
 
   exit (status);

From fda282327f5c373d2c4ffd8c2b3080d09d742af8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 26 Mar 2010 19:44:18 +0100
Subject: [PATCH 0682/1628] Complete eradication of grub_list_iterate

---
 commands/handler.c  | 30 ++++++++++++++++--------------
 include/grub/list.h |  1 -
 kern/list.c         | 31 +++++--------------------------
 normal/handler.c    | 42 ++++++++++++++++--------------------------
 4 files changed, 37 insertions(+), 67 deletions(-)

diff --git a/commands/handler.c b/commands/handler.c
index f9270972b..2bfa67415 100644
--- a/commands/handler.c
+++ b/commands/handler.c
@@ -32,21 +32,17 @@ grub_cmd_handler (struct grub_command *cmd __attribute__ ((unused)),
   void *curr_item = 0;
   grub_handler_class_t head;
 
-  auto int list_item (grub_named_list_t item);
-  int list_item (grub_named_list_t item)
-    {
-      if (item == curr_item)
-	grub_putchar ('*');
-
-      grub_printf ("%s\n", item->name);
-
-      return 0;
-    }
-
   head = grub_handler_class_list;
   if (argc == 0)
     {
-      grub_list_iterate (GRUB_AS_LIST (head), (grub_list_hook_t) list_item);
+      grub_handler_class_t item;
+      FOR_LIST_ELEMENTS(item, head)
+	{
+	  if (item == curr_item)
+	    grub_putchar ('*');
+
+	  grub_printf ("%s\n", item->name);
+	}
     }
   else
     {
@@ -63,9 +59,15 @@ grub_cmd_handler (struct grub_command *cmd __attribute__ ((unused)),
 
       if (argc == 0)
 	{
+	  grub_handler_class_t item;
 	  curr_item = class->cur_handler;
-	  grub_list_iterate (GRUB_AS_LIST (class->handler_list),
-			     (grub_list_hook_t) list_item);
+	  FOR_LIST_ELEMENTS(item, head)
+	    {
+	      if (item == curr_item)
+		grub_putchar ('*');
+
+	      grub_printf ("%s\n", item->name);
+	    }
 	}
       else
 	{
diff --git a/include/grub/list.h b/include/grub/list.h
index 1c00a349e..2fd418aca 100644
--- a/include/grub/list.h
+++ b/include/grub/list.h
@@ -36,7 +36,6 @@ typedef int (*grub_list_test_t) (grub_list_t new_item, grub_list_t item);
 void EXPORT_FUNC(grub_list_push) (grub_list_t *head, grub_list_t item);
 void * EXPORT_FUNC(grub_list_pop) (grub_list_t *head);
 void EXPORT_FUNC(grub_list_remove) (grub_list_t *head, grub_list_t item);
-int EXPORT_FUNC(grub_list_iterate) (grub_list_t head, grub_list_hook_t hook);
 void EXPORT_FUNC(grub_list_insert) (grub_list_t *head, grub_list_t item,
 				    grub_list_test_t test);
 
diff --git a/kern/list.c b/kern/list.c
index 379b0d886..507d13f86 100644
--- a/kern/list.c
+++ b/kern/list.c
@@ -53,18 +53,6 @@ grub_list_remove (grub_list_t *head, grub_list_t item)
       }
 }
 
-int
-grub_list_iterate (grub_list_t head, grub_list_hook_t hook)
-{
-  grub_list_t p;
-
-  for (p = head; p; p = p->next)
-    if (hook (p))
-      return 1;
-
-  return 0;
-}
-
 void
 grub_list_insert (grub_list_t *head, grub_list_t item,
 		  grub_list_test_t test)
@@ -82,22 +70,13 @@ grub_list_insert (grub_list_t *head, grub_list_t item,
 void *
 grub_named_list_find (grub_named_list_t head, const char *name)
 {
-  grub_named_list_t result = NULL;
+  grub_named_list_t item;
 
-  auto int list_find (grub_named_list_t item);
-  int list_find (grub_named_list_t item)
-    {
-      if (! grub_strcmp (item->name, name))
-	{
-	  result = item;
-	  return 1;
-	}
+  FOR_LIST_ELEMENTS (item, head)
+    if (grub_strcmp (item->name, name) == 0)
+      return item;
 
-      return 0;
-    }
-
-  grub_list_iterate (GRUB_AS_LIST (head), (grub_list_hook_t) list_find);
-  return result;
+  return NULL;
 }
 
 void
diff --git a/normal/handler.c b/normal/handler.c
index 686626929..8c97fd9a8 100644
--- a/normal/handler.c
+++ b/normal/handler.c
@@ -138,30 +138,6 @@ read_handler_list (void)
   static int first_time = 1;
   const char *class_name;
 
-  auto int iterate_handler (grub_handler_t handler);
-  int iterate_handler (grub_handler_t handler)
-    {
-      char name[grub_strlen (class_name) + grub_strlen (handler->name) + 2];
-
-      grub_strcpy (name, class_name);
-      grub_strcat (name, ".");
-      grub_strcat (name, handler->name);
-
-      insert_handler (name, 0);
-
-      return 0;
-    }
-
-  auto int iterate_class (grub_handler_class_t class);
-  int iterate_class (grub_handler_class_t class)
-    {
-      class_name = class->name;
-      grub_list_iterate (GRUB_AS_LIST (class->handler_list),
-			 (grub_list_hook_t) iterate_handler);
-
-      return 0;
-    }
-
   /* Make sure that this function does not get executed twice.  */
   if (! first_time)
     return;
@@ -209,8 +185,22 @@ read_handler_list (void)
 	}
     }
 
-  grub_list_iterate (GRUB_AS_LIST (grub_handler_class_list),
-		     (grub_list_hook_t) iterate_class);
+  grub_handler_class_t class;
+  FOR_LIST_ELEMENTS (class, grub_handler_class_list)
+    {
+      grub_handler_t handler;
+      class_name = class->name;
+      FOR_LIST_ELEMENTS(handler, class->handler_list)
+      {
+	char name[grub_strlen (class_name) + grub_strlen (handler->name) + 2];
+
+	grub_strcpy (name, class_name);
+	grub_strcat (name, ".");
+	grub_strcat (name, handler->name);
+
+	insert_handler (name, 0);
+      }
+    }
 
   /* Ignore errors.  */
   grub_errno = GRUB_ERR_NONE;

From 82f542016ebd7bd31ce2b74085b22e5f4ead49af Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 26 Mar 2010 20:00:06 +0100
Subject: [PATCH 0683/1628] Eradicate grub_list_insert

---
 include/grub/list.h |  2 --
 kern/list.c         | 39 ++++++++++++++-------------------------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/include/grub/list.h b/include/grub/list.h
index 2fd418aca..73d51be12 100644
--- a/include/grub/list.h
+++ b/include/grub/list.h
@@ -36,8 +36,6 @@ typedef int (*grub_list_test_t) (grub_list_t new_item, grub_list_t item);
 void EXPORT_FUNC(grub_list_push) (grub_list_t *head, grub_list_t item);
 void * EXPORT_FUNC(grub_list_pop) (grub_list_t *head);
 void EXPORT_FUNC(grub_list_remove) (grub_list_t *head, grub_list_t item);
-void EXPORT_FUNC(grub_list_insert) (grub_list_t *head, grub_list_t item,
-				    grub_list_test_t test);
 
 #define FOR_LIST_ELEMENTS(var, list) for ((var) = (list); (var); (var) = (var)->next)
 
diff --git a/kern/list.c b/kern/list.c
index 507d13f86..5b0248129 100644
--- a/kern/list.c
+++ b/kern/list.c
@@ -53,20 +53,6 @@ grub_list_remove (grub_list_t *head, grub_list_t item)
       }
 }
 
-void
-grub_list_insert (grub_list_t *head, grub_list_t item,
-		  grub_list_test_t test)
-{
-  grub_list_t *p, q;
-
-  for (p = head, q = *p; q; p = &(q->next), q = q->next)
-    if (test (item, q))
-      break;
-
-  *p = item;
-  item->next = q;
-}
-
 void *
 grub_named_list_find (grub_named_list_t head, const char *name)
 {
@@ -84,27 +70,30 @@ grub_prio_list_insert (grub_prio_list_t *head, grub_prio_list_t nitem)
 {
   int inactive = 0;
 
-  auto int test (grub_prio_list_t new_item, grub_prio_list_t item);
-  int test (grub_prio_list_t new_item, grub_prio_list_t item)
+  grub_prio_list_t *p, q;
+    
+  for (p = head, q = *p; q; p = &(q->next), q = q->next)
     {
       int r;
 
-      r = grub_strcmp (new_item->name, item->name);
-      if (r)
-	return (r < 0);
+      r = grub_strcmp (nitem->name, q->name);
+      if (r < 0)
+	break;
+      if (r > 0)
+	continue;
 
-      if (new_item->prio >= (item->prio & GRUB_PRIO_LIST_PRIO_MASK))
+      if (nitem->prio >= (q->prio & GRUB_PRIO_LIST_PRIO_MASK))
 	{
-	  item->prio &= ~GRUB_PRIO_LIST_FLAG_ACTIVE;
-	  return 1;
+	  q->prio &= ~GRUB_PRIO_LIST_FLAG_ACTIVE;
+	  break;
 	}
 
       inactive = 1;
-      return 0;
     }
 
-  grub_list_insert (GRUB_AS_LIST_P (head), GRUB_AS_LIST (nitem),
-		    (grub_list_test_t) test);
+  *p = nitem;
+  nitem->next = q;
+
   if (! inactive)
     nitem->prio |= GRUB_PRIO_LIST_FLAG_ACTIVE;
 }

From 8cfa78770df70c60637fddc12749b256382eca7d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 26 Mar 2010 20:05:25 +0100
Subject: [PATCH 0684/1628] cleanup list.h a bit

---
 include/grub/list.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/grub/list.h b/include/grub/list.h
index 73d51be12..d3abd69c4 100644
--- a/include/grub/list.h
+++ b/include/grub/list.h
@@ -30,9 +30,6 @@ struct grub_list
 };
 typedef struct grub_list *grub_list_t;
 
-typedef int (*grub_list_hook_t) (grub_list_t item);
-typedef int (*grub_list_test_t) (grub_list_t new_item, grub_list_t item);
-
 void EXPORT_FUNC(grub_list_push) (grub_list_t *head, grub_list_t item);
 void * EXPORT_FUNC(grub_list_pop) (grub_list_t *head);
 void EXPORT_FUNC(grub_list_remove) (grub_list_t *head, grub_list_t item);

From 0959e5ec30d629f661129bbaf4dfed8c41c7a5d9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 26 Mar 2010 20:20:52 +0100
Subject: [PATCH 0685/1628] Remove grub_list_pop

---
 gettext/gettext.c   | 10 +++-------
 include/grub/list.h |  1 -
 kern/list.c         | 12 ------------
 normal/handler.c    |  8 +++++---
 tests/lib/test.c    |  4 +++-
 5 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/gettext/gettext.c b/gettext/gettext.c
index 0aa8decbd..bc7d42824 100644
--- a/gettext/gettext.c
+++ b/gettext/gettext.c
@@ -309,14 +309,10 @@ grub_gettext_init_ext (const char *lang)
 static void
 grub_gettext_delete_list (void)
 {
-  struct grub_gettext_msg *item;
-
-  while ((item =
-	  grub_list_pop (GRUB_AS_LIST_P (&grub_gettext_msg_list))) != 0)
+  while (grub_gettext_msg_list)
     {
-      char *original = (char *) ((struct grub_gettext_msg *) item)->name;
-      grub_free (original);
-
+      grub_free ((char *) grub_gettext_msg_list->name);
+      grub_gettext_msg_list = grub_gettext_msg_list->next;
       /* Don't delete the translated message because could be in use.  */
     }
 }
diff --git a/include/grub/list.h b/include/grub/list.h
index d3abd69c4..75353010c 100644
--- a/include/grub/list.h
+++ b/include/grub/list.h
@@ -31,7 +31,6 @@ struct grub_list
 typedef struct grub_list *grub_list_t;
 
 void EXPORT_FUNC(grub_list_push) (grub_list_t *head, grub_list_t item);
-void * EXPORT_FUNC(grub_list_pop) (grub_list_t *head);
 void EXPORT_FUNC(grub_list_remove) (grub_list_t *head, grub_list_t item);
 
 #define FOR_LIST_ELEMENTS(var, list) for ((var) = (list); (var); (var) = (var)->next)
diff --git a/kern/list.c b/kern/list.c
index 5b0248129..33c334166 100644
--- a/kern/list.c
+++ b/kern/list.c
@@ -28,18 +28,6 @@ grub_list_push (grub_list_t *head, grub_list_t item)
   *head = item;
 }
 
-void *
-grub_list_pop (grub_list_t *head)
-{
-  grub_list_t item;
-
-  item = *head;
-  if (item)
-    *head = item->next;
-
-  return item;
-}
-
 void
 grub_list_remove (grub_list_t *head, grub_list_t item)
 {
diff --git a/normal/handler.c b/normal/handler.c
index 8c97fd9a8..4c8b8f769 100644
--- a/normal/handler.c
+++ b/normal/handler.c
@@ -33,7 +33,7 @@ struct grub_handler_list
   grub_command_t cmd;
 };
 
-static grub_list_t handler_list;
+static struct grub_handler_list *handler_list;
 
 static grub_err_t
 grub_handler_cmd (struct grub_command *cmd,
@@ -127,7 +127,7 @@ insert_handler (char *name, char *module)
     }
 
   item->cmd->data = data;
-  grub_list_push (&handler_list, GRUB_AS_LIST (item));
+  grub_list_push (GRUB_AS_LIST_P (&handler_list), GRUB_AS_LIST (item));
 }
 
 /* Read the file handler.lst for auto-loading.  */
@@ -211,8 +211,10 @@ free_handler_list (void)
 {
   struct grub_handler_list *item;
 
-  while ((item = grub_list_pop (&handler_list)) != 0)
+  while (handler_list)
     {
+      item = handler_list;
+      handler_list = handler_list->next;
       grub_free (item->cmd->data);
       grub_unregister_command (item->cmd);
       grub_free (item->name);
diff --git a/tests/lib/test.c b/tests/lib/test.c
index 3029495c6..06d78b7d7 100644
--- a/tests/lib/test.c
+++ b/tests/lib/test.c
@@ -66,8 +66,10 @@ free_failures (void)
 {
   grub_test_failure_t item;
 
-  while ((item = grub_list_pop (GRUB_AS_LIST_P (&failure_list))) != 0)
+  while (failure_list)
     {
+      item = failure_list;
+      failure_list = item->next;
       if (item->message)
 	grub_free (item->message);
 

From 969d1c782da9c66f5b92c70a46cd8dcc78c10a42 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 27 Mar 2010 00:04:14 +0100
Subject: [PATCH 0686/1628] 	Simplify Apple CC support.

	* commands/i386/pc/drivemap_int13h.S: Use LOCAL when possible.
	Add 0 byte at the end not to have a symbol with empty target.
	* mmap/i386/pc/mmap_helper.S: Likewise.
	* genmk.rb: Ignore errors 2030 and 2050.
	* kern/i386/pc/startup.S: Use LOCAL when possible.
---
 ChangeLog                          | 10 ++++
 commands/i386/pc/drivemap_int13h.S | 29 ++++-------
 genmk.rb                           |  2 +-
 kern/i386/pc/startup.S             | 22 ++++----
 mmap/i386/pc/mmap_helper.S         | 81 ++++++++++--------------------
 5 files changed, 58 insertions(+), 86 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 65d7b9068..91b3069e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Simplify Apple CC support.
+
+	* commands/i386/pc/drivemap_int13h.S: Use LOCAL when possible.
+	Add 0 byte at the end not to have a symbol with empty target.
+	* mmap/i386/pc/mmap_helper.S: Likewise.
+	* genmk.rb: Ignore errors 2030 and 2050.
+	* kern/i386/pc/startup.S: Use LOCAL when possible.
+
 2010-03-26  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Testcase and the fix for final semicolon on cmdline.
diff --git a/commands/i386/pc/drivemap_int13h.S b/commands/i386/pc/drivemap_int13h.S
index 440349685..b460cd7b5 100644
--- a/commands/i386/pc/drivemap_int13h.S
+++ b/commands/i386/pc/drivemap_int13h.S
@@ -19,7 +19,7 @@
 
 #include <grub/symbol.h>
 
-#define INT13H_OFFSET(x) ((x) - EXT_C(grub_drivemap_handler))
+#define INT13H_OFFSET(x) ((x) - LOCAL (base))
 
 .code16
 
@@ -27,6 +27,7 @@
 
 /* The replacement int13 handler.   Preserve all registers.  */
 FUNCTION(grub_drivemap_handler)
+LOCAL (base):
 	/* Save %dx for future restore. */
 	push	%dx
 	/* Push flags. Used to simulate interrupt with original flags. */
@@ -35,12 +36,7 @@ FUNCTION(grub_drivemap_handler)
 	/* Map the drive number (always in DL).  */
 	push	%ax
 	push	%bx
-#ifdef APPLE_CC
-	grub_drivemap_mapstart_ofs = INT13H_OFFSET(EXT_C(grub_drivemap_mapstart))
-	movw	$grub_drivemap_mapstart_ofs, %bx
-#else
-	movw	$INT13H_OFFSET(EXT_C(grub_drivemap_mapstart)), %bx
-#endif
+	movw	$INT13H_OFFSET(LOCAL (mapstart)), %bx
 
 more_remaining:
 	movw	%cs:(%bx), %ax
@@ -66,12 +62,7 @@ not_found:
 	popf
 	pushf
 
-#ifdef APPLE_CC
-	grub_drivemap_oldhandler_ofs = INT13H_OFFSET (EXT_C (grub_drivemap_oldhandler))
-	lcall *%cs:grub_drivemap_oldhandler_ofs
-#else
-	lcall *%cs:INT13H_OFFSET (EXT_C (grub_drivemap_oldhandler))
-#endif
+	lcall *%cs:INT13H_OFFSET (LOCAL (oldhandler))
 
 	push	%bp
 	mov	%sp, %bp
@@ -94,11 +85,7 @@ norestore:
 	popf
 	pushf
 
-#ifdef APPLE_CC
-	lcall *%cs:grub_drivemap_oldhandler_ofs
-#else
-	lcall *%cs:INT13H_OFFSET (EXT_C (grub_drivemap_oldhandler))
-#endif
+	lcall *%cs:INT13H_OFFSET (LOCAL (oldhandler))
 
 	push	%bp
 	mov	%sp, %bp
@@ -111,9 +98,13 @@ norestore:
 /* Far pointer to the old handler.  Stored as a CS:IP in the style of real-mode
    IVT entries (thus PI:SC in mem).  */
 VARIABLE(grub_drivemap_oldhandler)
+LOCAL (oldhandler):
 	.word 0x0, 0x0
 
 /* This label MUST be at the end of the copied block, since the installer code
    reserves additional space for mappings at runtime and copies them over it.  */
-.align 2
+	.align 2
+	
 VARIABLE(grub_drivemap_mapstart)
+LOCAL (mapstart):
+	.byte 0
diff --git a/genmk.rb b/genmk.rb
index 46b2ed092..bb5a1dde1 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -161,7 +161,7 @@ else
 	-rm -f $@
 	-rm -f $@.bin
 	$(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@.bin #{pre_obj} #{mod_obj}
-	$(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -nu -nd $@.bin $@
+	$(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -ew2030 -ew2050 -nu -nd $@.bin $@
 	-rm -f $@.bin
 endif
 endif
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index 23f3f398e..0aa420c6c 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -53,7 +53,7 @@
 #include <multiboot.h>
 #include <multiboot2.h>
 
-#define ABS(x)	((x) - _start + GRUB_BOOT_MACHINE_KERNEL_ADDR + 0x200)
+#define ABS(x)	((x) - LOCAL (base) + GRUB_BOOT_MACHINE_KERNEL_ADDR + 0x200)
 
 	.file	"startup.S"
 
@@ -66,16 +66,15 @@
 	.globl	start, _start
 start:
 _start:
+LOCAL (base):
 	/*
 	 *  Guarantee that "main" is loaded at 0x0:0x8200.
 	 */
-#ifdef APPLE_CC
-	codestart_abs = ABS(codestart) - 0x10000
-	ljmp $0, $(codestart_abs)
+#ifdef __APPLE__
+	ljmp $0, $(ABS(LOCAL (codestart)) - 0x10000)
 #else
-	ljmp $0, $ABS(codestart)
+	ljmp $0, $ABS(LOCAL (codestart))
 #endif
-
 	/*
 	 *  Compatibility version number
 	 *
@@ -183,7 +182,7 @@ multiboot_trampoline:
 	.code16
 
 /* the real mode code continues... */
-codestart:
+LOCAL (codestart):
 	cli		/* we're not safe here! */
 
 	/* set up %ds, %ss, and %es */
@@ -1156,7 +1155,7 @@ FUNCTION(grub_console_real_putchar)
  */
 
 /* this table is used in translate_keycode below */
-translation_table:
+LOCAL (translation_table):
 	.word	GRUB_CONSOLE_KEY_LEFT, GRUB_TERM_LEFT
 	.word	GRUB_CONSOLE_KEY_RIGHT, GRUB_TERM_RIGHT
 	.word	GRUB_CONSOLE_KEY_UP, GRUB_TERM_UP
@@ -1178,11 +1177,10 @@ translate_keycode:
 	pushw	%bx
 	pushw	%si
 
-#ifdef APPLE_CC
-	translation_table_abs = ABS (translation_table) - 0x10000
-	movw	$(translation_table_abs), %si
+#ifdef __APPLE__
+	movw	$(ABS(LOCAL (translation_table)) - 0x10000), %si
 #else
-	movw	$ABS(translation_table), %si
+	movw	$ABS(LOCAL (translation_table)), %si
 #endif
 
 1:	lodsw
diff --git a/mmap/i386/pc/mmap_helper.S b/mmap/i386/pc/mmap_helper.S
index c6d12fd6c..743954574 100644
--- a/mmap/i386/pc/mmap_helper.S
+++ b/mmap/i386/pc/mmap_helper.S
@@ -19,32 +19,27 @@
 
 #include <grub/symbol.h>
 
-#define DS(x) ((x) - segstart)
+#define DS(x) ((x) - LOCAL (segstart))
 
-segstart:
+LOCAL (segstart):
 VARIABLE(grub_machine_mmaphook_start)
 	.code16
 VARIABLE(grub_machine_mmaphook_int12)
 	push %ds
 	push %cs
 	pop %ds
-#ifdef APPLE_CC
-	grub_machine_mmaphook_kblow_rel = DS (EXT_C (grub_machine_mmaphook_kblow))
-	movw (grub_machine_mmaphook_kblow_rel), %ax
-#else
-	movw DS (EXT_C (grub_machine_mmaphook_kblow)), %ax
-#endif
+	movw DS (LOCAL (kblow)), %ax
 	pop %ds
 	iret
 
 VARIABLE(grub_machine_mmaphook_int15)
 	pushf
 	cmpw $0xe801, %ax
-	jz e801
+	jz LOCAL (e801)
 	cmpw $0xe820, %ax
-	jz e820
+	jz LOCAL (e820)
 	cmpb $0x88, %ah
-	jz h88
+	jz LOCAL (h88)
 	popf
 	/* ljmp */
 	.byte	0xea
@@ -53,67 +48,44 @@ VARIABLE (grub_machine_mmaphook_int15offset)
 VARIABLE (grub_machine_mmaphook_int15segment)
 	.word	0
 
-e801:
+LOCAL (e801):
 	popf
 	push %ds
 	push %cs
 	pop %ds
-#ifdef APPLE_CC
-	grub_machine_mmaphook_kbin16mb_rel = DS (EXT_C (grub_machine_mmaphook_kbin16mb))
-	grub_machine_mmaphook_64kbin4gb_rel = DS (EXT_C (grub_machine_mmaphook_64kbin4gb))
-	movw (grub_machine_mmaphook_kbin16mb_rel), %ax
-	movw (grub_machine_mmaphook_64kbin4gb_rel), %bx
-#else
-	movw DS (EXT_C (grub_machine_mmaphook_kbin16mb)), %ax
-	movw DS (EXT_C (grub_machine_mmaphook_64kbin4gb)), %bx
-#endif
+	movw DS (LOCAL (kbin16mb)), %ax
+	movw DS (LOCAL (m64kbin4gb)), %bx
 	movw %ax, %cx
 	movw %bx, %dx
 	pop %ds
 	clc
 	iret
 
-h88:
+LOCAL (h88):
 	popf
 	push %ds
 	push %cs
 	pop %ds
-#ifdef APPLE_CC
-	movw (grub_machine_mmaphook_kbin16mb_rel), %ax
-#else
-	movw DS (EXT_C (grub_machine_mmaphook_kbin16mb)), %ax
-#endif
+	movw DS (LOCAL (kbin16mb)), %ax
 	pop %ds
 	clc
 	iret
 
-e820:
-#ifdef APPLE_CC
-	mmaphook_mmap_rel = DS(mmaphook_mmap)
-	mmaphook_mmap_num_rel = DS(EXT_C(grub_machine_mmaphook_mmap_num))
-#endif
+LOCAL (e820):
 	popf
 	push %ds
 	push %cs
 	pop %ds
 	cmpw $20, %cx
-	jb errexit
-#ifdef APPLE_CC
-	cmpw (mmaphook_mmap_num_rel), %bx
-#else
-	cmpw DS (EXT_C (grub_machine_mmaphook_mmap_num)), %bx
-#endif
-	jae errexit
+	jb LOCAL (errexit)
+	cmpw DS (LOCAL (mmap_num)), %bx
+	jae LOCAL (errexit)
 	cmp $0x534d4150, %edx
-	jne errexit
+	jne LOCAL (errexit)
 	push %si
 	push %di
 	movw $20, %cx
-#ifdef APPLE_CC
-	movl $(mmaphook_mmap_rel), %esi
-#else
-	movw $(DS(mmaphook_mmap)), %si
-#endif
+	movw $(DS(LOCAL (mmaphook_mmap))), %si
 	mov %bx, %ax
 	imul $20, %ax
 	add %ax, %si
@@ -122,19 +94,15 @@ e820:
 	pop %si
 	movl $20, %ecx
 	inc %bx
-#ifdef APPLE_CC
-	cmpw (mmaphook_mmap_num_rel), %bx
-#else
-	cmpw DS(EXT_C(grub_machine_mmaphook_mmap_num)), %bx
-#endif
-	jb noclean
+	cmpw DS(LOCAL (mmap_num)), %bx
+	jb LOCAL (noclean)
 	xor %bx, %bx
-noclean:
+LOCAL (noclean):
 	mov $0x534d4150, %eax
 	pop %ds
 	clc
 	iret
-errexit:
+LOCAL (errexit):
 	mov $0x534d4150, %eax
 	pop %ds
 	stc
@@ -142,13 +110,18 @@ errexit:
 	iret
 
 VARIABLE(grub_machine_mmaphook_mmap_num)
+LOCAL (mmap_num):
 	.word 0
 VARIABLE(grub_machine_mmaphook_kblow)
+LOCAL (kblow):
 	.word 0
 VARIABLE (grub_machine_mmaphook_kbin16mb)
+LOCAL (kbin16mb):
 	.word 0
 VARIABLE (grub_machine_mmaphook_64kbin4gb)
+LOCAL (m64kbin4gb):
 	.word 0
-mmaphook_mmap:
+LOCAL (mmaphook_mmap):
 	/* Memory map is placed just after the interrupt handlers. */
 VARIABLE(grub_machine_mmaphook_end)
+	.byte 0

From d56a6ac7f67fcfaf5490c0d3d9bb9240ac2c31f7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 27 Mar 2010 00:19:42 +0100
Subject: [PATCH 0687/1628] Remove handlers

---
 commands/handler.c        | 103 ------------------
 conf/any-emu.rmk          |   2 +-
 conf/common.rmk           |  43 ++------
 conf/i386-coreboot.rmk    |   2 +-
 conf/i386-ieee1275.rmk    |   2 +-
 conf/i386-pc.rmk          |   4 +-
 conf/i386-qemu.rmk        |   2 +-
 conf/mips-qemu-mips.rmk   |   2 +-
 conf/mips-yeeloong.rmk    |   2 +-
 conf/powerpc-ieee1275.rmk |   2 +-
 conf/sparc64-ieee1275.rmk |   2 +-
 conf/x86-efi.rmk          |   2 +-
 include/grub/handler.h    |  60 ----------
 include/grub/parser.h     |  32 +-----
 include/grub/script_sh.h  |   3 +
 include/grub/term.h       |   2 +-
 kern/handler.c            |  64 -----------
 kern/main.c               |   1 -
 kern/parser.c             |   8 +-
 kern/rescue_parser.c      |  14 +--
 kern/rescue_reader.c      |   2 +-
 normal/handler.c          | 223 --------------------------------------
 normal/main.c             |  53 ++-------
 normal/menu_entry.c       |   3 +-
 script/main.c             |  18 +--
 util/grub-fstest.c        |   3 -
 util/grub-probe.c         |   3 -
 util/grub-script-check.c  |   7 --
 util/i386/pc/grub-setup.c |   3 -
 29 files changed, 40 insertions(+), 627 deletions(-)
 delete mode 100644 commands/handler.c
 delete mode 100644 include/grub/handler.h
 delete mode 100644 kern/handler.c
 delete mode 100644 normal/handler.c

diff --git a/commands/handler.c b/commands/handler.c
deleted file mode 100644
index 2bfa67415..000000000
--- a/commands/handler.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* handler.c - commands to list or select handlers */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  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/err.h>
-#include <grub/misc.h>
-#include <grub/term.h>
-#include <grub/handler.h>
-#include <grub/command.h>
-#include <grub/i18n.h>
-
-static grub_err_t
-grub_cmd_handler (struct grub_command *cmd __attribute__ ((unused)),
-		  int argc, char **args)
-{
-  void *curr_item = 0;
-  grub_handler_class_t head;
-
-  head = grub_handler_class_list;
-  if (argc == 0)
-    {
-      grub_handler_class_t item;
-      FOR_LIST_ELEMENTS(item, head)
-	{
-	  if (item == curr_item)
-	    grub_putchar ('*');
-
-	  grub_printf ("%s\n", item->name);
-	}
-    }
-  else
-    {
-      char *class_name;
-      grub_handler_class_t class;
-
-      class_name = args[0];
-      argc--;
-      args++;
-
-      class = grub_named_list_find (GRUB_AS_NAMED_LIST (head), class_name);
-      if (! class)
-	return grub_error (GRUB_ERR_FILE_NOT_FOUND, "class not found");
-
-      if (argc == 0)
-	{
-	  grub_handler_class_t item;
-	  curr_item = class->cur_handler;
-	  FOR_LIST_ELEMENTS(item, head)
-	    {
-	      if (item == curr_item)
-		grub_putchar ('*');
-
-	      grub_printf ("%s\n", item->name);
-	    }
-	}
-      else
-	{
-	  grub_handler_t handler;
-
-	  handler =
-	    grub_named_list_find (GRUB_AS_NAMED_LIST (class->handler_list),
-				  args[0]);
-
-	  if (! handler)
-	    return grub_error (GRUB_ERR_FILE_NOT_FOUND, "handler not found");
-
-	  grub_handler_set_current (class, handler);
-	}
-    }
-
-  return 0;
-}
-
-static grub_command_t cmd_handler;
-
-GRUB_MOD_INIT(handler)
-{
-  cmd_handler =
-    grub_register_command ("handler", grub_cmd_handler,
-			   N_("[class [handler]]"),
-			   N_("List or select a handler."));
-}
-
-GRUB_MOD_FINI(handler)
-{
-  grub_unregister_command (cmd_handler);
-}
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 758a8d720..3a2c47bf5 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -7,7 +7,7 @@ util/grub-emu.c_DEPENDENCIES = grub_emu_init.h
 kernel_img_RELOCATABLE = yes
 pkglib_PROGRAMS = kernel.img
 kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c kern/env.c	\
-	kern/err.c kern/list.c kern/handler.c kern/command.c		\
+	kern/err.c kern/list.c  kern/command.c		\
 	kern/corecmd.c kern/file.c kern/fs.c kern/main.c kern/misc.c	\
 	kern/parser.c kern/partition.c kern/term.c			\
 	kern/rescue_reader.c kern/rescue_parser.c			\
diff --git a/conf/common.rmk b/conf/common.rmk
index f55bbfe0c..6300af3aa 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -27,7 +27,7 @@ util/grub-probe.c_DEPENDENCIES = grub_probe_init.h
 grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c	\
 	util/hostdisk.c	util/misc.c util/getroot.c		\
 	kern/device.c kern/disk.c kern/err.c kern/misc.c	\
-	kern/parser.c kern/partition.c kern/file.c kern/list.c	\
+	kern/partition.c kern/file.c kern/list.c	\
 	\
 	fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c		\
 	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	\
@@ -104,12 +104,11 @@ DISTCLEANFILES += grub_script.yy.c grub_script.yy.h
 
 # For grub-script-check.
 bin_UTILITIES += grub-script-check
-util/grub-script-check.c_DEPENDENCIES = grub_script_check_init.h
 grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c \
 	util/grub-script-check.c util/misc.c \
 	script/main.c script/script.c script/function.c script/lexer.c \
-	kern/handler.c kern/err.c kern/parser.c kern/list.c \
-	kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c \
+	kern/err.c kern/list.c \
+	kern/misc.c kern/env.c grub_script.tab.c \
 	grub_script.yy.c
 
 MOSTLYCLEANFILES += symlist.c kernel_syms.lst
@@ -119,7 +118,7 @@ kernel_img_HEADERS += boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
 	machine/memory.h machine/loader.h machine/kernel.h \
-	list.h handler.h command.h i18n.h env_private.h
+	list.h command.h i18n.h env_private.h
 
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
 	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
@@ -132,19 +131,6 @@ grub_script.tab.c grub_script.tab.h: script/parser.y
 	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/parser.y
 DISTCLEANFILES += grub_script.tab.c grub_script.tab.h
 
-# For grub-script-check.
-grub_script_check_init.lst: geninit.sh $(filter-out grub_script_check_init.c,$(grub_script_check_SOURCES))
-	rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
-DISTCLEANFILES += grub_script_check_init.lst
-
-grub_script_check_init.h: grub_script_check_init.lst $(filter-out grub_script_check_init.c,$(grub_script_check_SOURCES)) geninitheader.sh
-	rm -f $@; sh $(srcdir)/geninitheader.sh $< > $@
-DISTCLEANFILES += grub_script_check_init.h
-
-grub_script_check_init.c: grub_script_check_init.lst $(filter-out grub_script_check_init.c,$(grub_script_check_SOURCES)) geninit.sh
-	rm -f $@; sh $(srcdir)/geninit.sh $< $(filter %.c,$^) > $@
-DISTCLEANFILES += grub_script_check_init.c
-
 # For grub-probe.
 grub_probe_init.lst: geninit.sh $(filter-out grub_probe_init.c,$(grub_probe_SOURCES))
 	rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
@@ -455,12 +441,12 @@ scsi_mod_CFLAGS = $(COMMON_CFLAGS)
 scsi_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # Commands.
-pkglib_MODULES += minicmd.mod extcmd.mod hello.mod handler.mod	\
+pkglib_MODULES += minicmd.mod extcmd.mod hello.mod 	\
 	ls.mod cmp.mod cat.mod help.mod search.mod loopback.mod	\
 	configfile.mod echo.mod		\
 	terminfo.mod test.mod blocklist.mod hexdump.mod		\
 	read.mod sleep.mod loadenv.mod crc.mod parttool.mod	\
-	msdospart.mod memrw.mod normal.mod sh.mod 		\
+	msdospart.mod memrw.mod normal.mod 			\
 	gptsync.mod true.mod probe.mod password.mod		\
 	keystatus.mod
 
@@ -521,11 +507,6 @@ msdospart_mod_SOURCES = parttool/msdospart.c
 msdospart_mod_CFLAGS = $(COMMON_CFLAGS)
 msdospart_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For handler.mod.
-handler_mod_SOURCES = commands/handler.c
-handler_mod_CFLAGS = $(COMMON_CFLAGS)
-handler_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For ls.mod.
 ls_mod_SOURCES = commands/ls.c
 ls_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -645,19 +626,15 @@ keystatus_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For normal.mod.
 normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
-	normal/auth.c normal/autofs.c normal/handler.c \
+	normal/auth.c normal/autofs.c  \
 	normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
 	normal/menu_entry.c normal/menu_text.c \
-	normal/misc.c normal/crypto.c normal/term.c normal/context.c
+	normal/misc.c normal/crypto.c normal/term.c normal/context.c \
+	script/main.c script/script.c script/execute.c \
+	script/function.c script/lexer.c grub_script.tab.c grub_script.yy.c
 normal_mod_CFLAGS = $(COMMON_CFLAGS)
 normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For sh.mod.
-sh_mod_SOURCES = script/main.c script/script.c script/execute.c \
-	script/function.c script/lexer.c grub_script.tab.c grub_script.yy.c
-sh_mod_CFLAGS = $(COMMON_CFLAGS)
-sh_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 ifneq (, $(FONT_SOURCE))
 font/font.c_DEPENDENCIES = ascii.h
 endif
diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 3cef9313f..0979f03ee 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -16,7 +16,7 @@ kernel_img_SOURCES = kern/i386/coreboot/startup.S \
 	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
 	kern/misc.c kern/mm.c kern/term.c \
 	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
+	kern/time.c kern/list.c  kern/command.c kern/corecmd.c \
 	kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
 	kern/i386/tsc.c kern/i386/pit.c \
 	kern/generic/rtc_get_time_ms.c \
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index d4a459b3e..f8921df9b 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -18,7 +18,7 @@ kernel_img_SOURCES = kern/i386/ieee1275/startup.S \
 	kern/rescue_parser.c kern/rescue_reader.c \
 	kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
 	kern/env.c \
-	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
+	kern/time.c kern/list.c  kern/command.c kern/corecmd.c \
 	kern/generic/millisleep.c \
 	kern/ieee1275/ieee1275.c \
 	term/ieee1275/ofconsole.c \
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index ece88446b..7b624837b 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -45,7 +45,7 @@ kernel_img_SOURCES = kern/i386/pc/startup.S \
 	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
 	kern/misc.c kern/mm.c kern/term.c \
 	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
+	kern/time.c kern/list.c kern/command.c kern/corecmd.c \
 	kern/$(target_cpu)/dl.c kern/i386/pc/init.c kern/i386/pc/mmap.c \
 	kern/parser.c kern/partition.c \
 	kern/i386/tsc.c kern/i386/pit.c \
@@ -76,7 +76,7 @@ util/i386/pc/grub-setup.c_DEPENDENCIES = grub_setup_init.h
 grub_setup_SOURCES = gnulib/progname.c \
 	util/i386/pc/grub-setup.c util/hostdisk.c	\
 	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
-	kern/err.c kern/misc.c kern/parser.c kern/partition.c	\
+	kern/err.c kern/misc.c kern/partition.c	\
 	kern/file.c kern/fs.c kern/env.c kern/list.c		\
 	fs/fshelp.c						\
 	\
diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index 97273e1ce..cbe6d0455 100644
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -29,7 +29,7 @@ kernel_img_SOURCES = kern/i386/qemu/startup.S \
 	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
 	kern/misc.c kern/mm.c kern/term.c \
 	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
+	kern/time.c kern/list.c  kern/command.c kern/corecmd.c \
 	kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
 	kern/i386/tsc.c kern/i386/pit.c \
 	kern/generic/rtc_get_time_ms.c \
diff --git a/conf/mips-qemu-mips.rmk b/conf/mips-qemu-mips.rmk
index e06370122..7cddf72ad 100644
--- a/conf/mips-qemu-mips.rmk
+++ b/conf/mips-qemu-mips.rmk
@@ -12,7 +12,7 @@ kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
 	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c 		\
 	kern/misc.c kern/mm.c kern/term.c 	\
 	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/list.c kern/handler.c kern/command.c kern/corecmd.c	\
+	kern/list.c  kern/command.c kern/corecmd.c	\
 	kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c 	\
 	kern/generic/millisleep.c kern/generic/rtc_get_time_ms.c kern/time.c    \
 	symlist.c kern/$(target_cpu)/cache.S
diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 35cd01b4b..bf39bf668 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -15,7 +15,7 @@ kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
 	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c 		\
 	kern/misc.c kern/mm.c kern/term.c 	\
 	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/list.c kern/handler.c kern/command.c kern/corecmd.c	\
+	kern/list.c  kern/command.c kern/corecmd.c	\
 	kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c 	\
 	kern/generic/millisleep.c kern/generic/rtc_get_time_ms.c kern/time.c    \
 	kern/$(target_cpu)/cache.S \
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 86f6ddcb3..7b32b24f1 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -13,7 +13,7 @@ kernel_img_SOURCES = kern/powerpc/ieee1275/startup.S kern/ieee1275/cmain.c \
 	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c 		\
 	kern/misc.c kern/mm.c kern/term.c 	\
 	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/list.c kern/handler.c kern/command.c kern/corecmd.c	\
+	kern/list.c  kern/command.c kern/corecmd.c	\
 	kern/ieee1275/init.c 						\
 	kern/ieee1275/mmap.c						\
 	term/ieee1275/ofconsole.c 		\
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 78e511e31..b4079dd1f 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -25,7 +25,7 @@ kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c	\
 	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c		\
 	kern/misc.c kern/mm.c kern/term.c			\
 	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/list.c kern/handler.c kern/command.c kern/corecmd.c	\
+	kern/list.c  kern/command.c kern/corecmd.c	\
 	kern/sparc64/ieee1275/ieee1275.c 				\
 	kern/sparc64/ieee1275/init.c 					\
 	kern/ieee1275/mmap.c						\
diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index 5cb472168..bab68f0f4 100644
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -30,7 +30,7 @@ kernel_img_SOURCES = kern/$(target_cpu)/efi/startup.S kern/main.c kern/device.c
 	kern/$(target_cpu)/dl.c kern/i386/efi/init.c kern/parser.c kern/partition.c \
 	kern/env.c symlist.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c \
 	term/efi/console.c disk/efi/efidisk.c \
-	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
+	kern/time.c kern/list.c  kern/command.c kern/corecmd.c \
 	kern/i386/tsc.c kern/i386/pit.c \
 	kern/generic/rtc_get_time_ms.c \
 	kern/generic/millisleep.c
diff --git a/include/grub/handler.h b/include/grub/handler.h
deleted file mode 100644
index 77dd7d9c1..000000000
--- a/include/grub/handler.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* handler.h - header for grub handler */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  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/>.
- */
-
-#ifndef GRUB_HANDLER_HEADER
-#define GRUB_HANDLER_HEADER 1
-
-#include <grub/list.h>
-#include <grub/err.h>
-
-struct grub_handler
-{
-  struct grub_handler *next;
-  const char *name;
-  grub_err_t (*init) (void);
-  grub_err_t (*fini) (void);
-};
-typedef struct grub_handler *grub_handler_t;
-
-struct grub_handler_class
-{
-  struct grub_handler_class *next;
-  const char *name;
-  grub_handler_t handler_list;
-  grub_handler_t cur_handler;
-};
-typedef struct grub_handler_class *grub_handler_class_t;
-
-extern grub_handler_class_t EXPORT_VAR(grub_handler_class_list);
-
-void EXPORT_FUNC(grub_handler_register) (grub_handler_class_t class,
-					 grub_handler_t handler);
-void EXPORT_FUNC(grub_handler_unregister) (grub_handler_class_t class,
-					   grub_handler_t handler);
-grub_err_t EXPORT_FUNC(grub_handler_set_current) (grub_handler_class_t class,
-						  grub_handler_t handler);
-
-#define GRUB_AS_HANDLER(ptr) \
-  ((GRUB_FIELD_MATCH (ptr, grub_handler_t, next) && \
-    GRUB_FIELD_MATCH (ptr, grub_handler_t, name) && \
-    GRUB_FIELD_MATCH (ptr, grub_handler_t, init) && \
-    GRUB_FIELD_MATCH (ptr, grub_handler_t, fini)) ? \
-   (grub_handler_t) ptr : grub_bad_type_cast ())
-
-#endif /* ! GRUB_HANDLER_HEADER */
diff --git a/include/grub/parser.h b/include/grub/parser.h
index 17f0c4303..064f73fcb 100644
--- a/include/grub/parser.h
+++ b/include/grub/parser.h
@@ -22,7 +22,6 @@
 
 #include <grub/types.h>
 #include <grub/err.h>
-#include <grub/handler.h>
 #include <grub/reader.h>
 
 /* All the states for the command line.  */
@@ -84,36 +83,9 @@ struct grub_parser
 };
 typedef struct grub_parser *grub_parser_t;
 
-extern struct grub_handler_class EXPORT_VAR(grub_parser_class);
 grub_err_t EXPORT_FUNC(grub_parser_execute) (char *source);
 
-static inline void
-grub_parser_register (const char *name __attribute__ ((unused)),
-		      /* `name' is ignored here, but used by genhandlerlist.sh.  */
-		      grub_parser_t parser)
-{
-  grub_handler_register (&grub_parser_class, GRUB_AS_HANDLER (parser));
-}
-
-static inline void
-grub_parser_unregister (grub_parser_t parser)
-{
-  grub_handler_unregister (&grub_parser_class, GRUB_AS_HANDLER (parser));
-}
-
-static inline grub_parser_t
-grub_parser_get_current (void)
-{
-  return (grub_parser_t) grub_parser_class.cur_handler;
-}
-
-static inline grub_err_t
-grub_parser_set_current (grub_parser_t parser)
-{
-  return grub_handler_set_current (&grub_parser_class,
-				   GRUB_AS_HANDLER (parser));
-}
-
-void grub_register_rescue_parser (void);
+grub_err_t
+grub_rescue_parse_line (char *line, grub_reader_getline_t getline);
 
 #endif /* ! GRUB_PARSER_HEADER */
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 33c6d2b85..5e85d983e 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -324,4 +324,7 @@ int grub_script_function_call (grub_script_function_t func,
 char **
 grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *count);
 
+grub_err_t
+grub_normal_parse_line (char *line, grub_reader_getline_t getline);
+
 #endif /* ! GRUB_NORMAL_PARSER_HEADER */
diff --git a/include/grub/term.h b/include/grub/term.h
index 230436388..4a05909da 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -38,7 +38,7 @@
 #include <grub/err.h>
 #include <grub/symbol.h>
 #include <grub/types.h>
-#include <grub/handler.h>
+#include <grub/list.h>
 
 /* These are used to represent the various color states we use.  */
 typedef enum
diff --git a/kern/handler.c b/kern/handler.c
deleted file mode 100644
index 2bf85313c..000000000
--- a/kern/handler.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* handler.c - grub handler function */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  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/handler.h>
-
-grub_handler_class_t grub_handler_class_list;
-
-void
-grub_handler_register (grub_handler_class_t class, grub_handler_t handler)
-{
-  int first_handler = (class->handler_list == 0);
-
-  grub_list_push (GRUB_AS_LIST_P (&class->handler_list),
-		  GRUB_AS_LIST (handler));
-
-  if (first_handler)
-    {
-      grub_list_push (GRUB_AS_LIST_P (&grub_handler_class_list),
-		      GRUB_AS_LIST (class));
-      grub_handler_set_current (class, handler);
-    }
-}
-
-void
-grub_handler_unregister (grub_handler_class_t class, grub_handler_t handler)
-{
-  grub_list_remove (GRUB_AS_LIST_P (&class->handler_list),
-		    GRUB_AS_LIST (handler));
-
-  if (class->handler_list == 0)
-    grub_list_remove (GRUB_AS_LIST_P (&grub_handler_class_list),
-		      GRUB_AS_LIST (class));
-}
-
-grub_err_t
-grub_handler_set_current (grub_handler_class_t class, grub_handler_t handler)
-{
-  if (class->cur_handler && class->cur_handler->fini)
-    if ((class->cur_handler->fini) () != GRUB_ERR_NONE)
-      return grub_errno;
-
-  if (handler->init)
-    if ((handler->init) () != GRUB_ERR_NONE)
-      return grub_errno;
-
-  class->cur_handler = handler;
-  return GRUB_ERR_NONE;
-}
diff --git a/kern/main.c b/kern/main.c
index 2f2c951ab..e644ea5b1 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -191,7 +191,6 @@ grub_main (void)
   grub_set_root_dev ();
 
   grub_register_core_commands ();
-  grub_register_rescue_parser ();
 
   grub_load_config ();
   grub_load_normal_mode ();
diff --git a/kern/parser.c b/kern/parser.c
index 80312b9b4..06e4ed673 100644
--- a/kern/parser.c
+++ b/kern/parser.c
@@ -230,10 +230,6 @@ grub_parser_split_cmdline (const char *cmdline, grub_reader_getline_t getline,
   return 0;
 }
 
-struct grub_handler_class grub_parser_class = {
-  .name = "parser"
-};
-
 grub_err_t
 grub_parser_execute (char *source)
 {
@@ -262,11 +258,9 @@ grub_parser_execute (char *source)
   while (source)
     {
       char *line;
-      grub_parser_t parser;
 
       getline (&line, 0);
-      parser = grub_parser_get_current ();
-      parser->parse_line (line, getline);
+      grub_rescue_parse_line (line, getline);
       grub_free (line);
     }
 
diff --git a/kern/rescue_parser.c b/kern/rescue_parser.c
index d3725e739..9c85ba6bd 100644
--- a/kern/rescue_parser.c
+++ b/kern/rescue_parser.c
@@ -24,7 +24,7 @@
 #include <grub/misc.h>
 #include <grub/command.h>
 
-static grub_err_t
+grub_err_t
 grub_rescue_parse_line (char *line, grub_reader_getline_t getline)
 {
   char *name;
@@ -74,15 +74,3 @@ grub_rescue_parse_line (char *line, grub_reader_getline_t getline)
 
   return grub_errno;
 }
-
-static struct grub_parser grub_rescue_parser =
-  {
-    .name = "rescue",
-    .parse_line = grub_rescue_parse_line
-  };
-
-void
-grub_register_rescue_parser (void)
-{
-  grub_parser_register ("rescue", &grub_rescue_parser);
-}
diff --git a/kern/rescue_reader.c b/kern/rescue_reader.c
index f573cf41f..2f053aaea 100644
--- a/kern/rescue_reader.c
+++ b/kern/rescue_reader.c
@@ -86,7 +86,7 @@ grub_rescue_run (void)
       if (! line || line[0] == '\0')
 	continue;
 
-      grub_parser_get_current ()->parse_line (line, grub_rescue_read_line);
+      grub_rescue_parse_line (line, grub_rescue_read_line);
       grub_free (line);
     }
 }
diff --git a/normal/handler.c b/normal/handler.c
deleted file mode 100644
index 4c8b8f769..000000000
--- a/normal/handler.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/* handler.c - support handler loading */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  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/mm.h>
-#include <grub/err.h>
-#include <grub/env.h>
-#include <grub/misc.h>
-#include <grub/command.h>
-#include <grub/handler.h>
-#include <grub/normal.h>
-
-struct grub_handler_list
-{
-  struct grub_handler_list *next;
-  char *name;
-  grub_command_t cmd;
-};
-
-static struct grub_handler_list *handler_list;
-
-static grub_err_t
-grub_handler_cmd (struct grub_command *cmd,
-		  int argc __attribute__ ((unused)),
-		  char **args __attribute__ ((unused)))
-{
-  char *p;
-  grub_handler_class_t class;
-  grub_handler_t handler;
-
-  p = grub_strchr (cmd->name, '.');
-  if (! p)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid command name");
-
-  if (cmd->data)
-    {
-      if (! grub_dl_get (cmd->data))
-	{
-	  grub_dl_t mod;
-
-	  mod = grub_dl_load (cmd->data);
-	  if (mod)
-	    grub_dl_ref (mod);
-	  else
-	    return grub_errno;
-	}
-      grub_free (cmd->data);
-      cmd->data = 0;
-    }
-
-  *p = 0;
-  class = grub_named_list_find (GRUB_AS_NAMED_LIST (grub_handler_class_list),
-				cmd->name);
-  *p = '.';
-
-  if (! class)
-    return grub_error (GRUB_ERR_FILE_NOT_FOUND, "class not found");
-
-
-  handler = grub_named_list_find (GRUB_AS_NAMED_LIST (class->handler_list),
-				  p + 1);
-  if (! handler)
-    return grub_error (GRUB_ERR_FILE_NOT_FOUND, "handler not found");
-
-  grub_handler_set_current (class, handler);
-
-  return 0;
-}
-
-static void
-insert_handler (char *name, char *module)
-{
-  struct grub_handler_list *item;
-  char *data;
-
-  if (grub_command_find (name))
-    return;
-
-  item = grub_malloc (sizeof (*item));
-  if (! item)
-    return;
-
-  item->name = grub_strdup (name);
-  if (! item->name)
-    {
-      grub_free (item);
-      return;
-    }
-
-  if (module)
-    {
-      data = grub_strdup (module);
-      if (! data)
-	{
-	  grub_free (item->name);
-	  grub_free (item);
-	  return;
-	}
-    }
-  else
-    data = 0;
-
-  item->cmd = grub_register_command (item->name, grub_handler_cmd, 0,
-				     "Set active handler.");
-  if (! item->cmd)
-    {
-      grub_free (data);
-      grub_free (item->name);
-      grub_free (item);
-      return;
-    }
-
-  item->cmd->data = data;
-  grub_list_push (GRUB_AS_LIST_P (&handler_list), GRUB_AS_LIST (item));
-}
-
-/* Read the file handler.lst for auto-loading.  */
-void
-read_handler_list (void)
-{
-  const char *prefix;
-  static int first_time = 1;
-  const char *class_name;
-
-  /* Make sure that this function does not get executed twice.  */
-  if (! first_time)
-    return;
-  first_time = 0;
-
-  prefix = grub_env_get ("prefix");
-  if (prefix)
-    {
-      char *filename;
-
-      filename = grub_xasprintf ("%s/handler.lst", prefix);
-      if (filename)
-	{
-	  grub_file_t file;
-
-	  file = grub_file_open (filename);
-	  if (file)
-	    {
-	      char *buf = NULL;
-	      for (;; grub_free (buf))
-		{
-		  char *p;
-
-		  buf = grub_file_getline (file);
-
-		  if (! buf)
-		    break;
-
-		  if (! grub_isgraph (buf[0]))
-		    continue;
-
-		  p = grub_strchr (buf, ':');
-		  if (! p)
-		    continue;
-
-		  *p = '\0';
-		  while (*++p == ' ')
-		    ;
-
-		  insert_handler (buf, p);
-		}
-	      grub_file_close (file);
-	    }
-	  grub_free (filename);
-	}
-    }
-
-  grub_handler_class_t class;
-  FOR_LIST_ELEMENTS (class, grub_handler_class_list)
-    {
-      grub_handler_t handler;
-      class_name = class->name;
-      FOR_LIST_ELEMENTS(handler, class->handler_list)
-      {
-	char name[grub_strlen (class_name) + grub_strlen (handler->name) + 2];
-
-	grub_strcpy (name, class_name);
-	grub_strcat (name, ".");
-	grub_strcat (name, handler->name);
-
-	insert_handler (name, 0);
-      }
-    }
-
-  /* Ignore errors.  */
-  grub_errno = GRUB_ERR_NONE;
-}
-
-void
-free_handler_list (void)
-{
-  struct grub_handler_list *item;
-
-  while (handler_list)
-    {
-      item = handler_list;
-      handler_list = handler_list->next;
-      grub_free (item->cmd->data);
-      grub_unregister_command (item->cmd);
-      grub_free (item->name);
-      grub_free (item);
-    }
-}
diff --git a/normal/main.c b/normal/main.c
index 5a5467485..e16e8ef7d 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -31,6 +31,7 @@
 #include <grub/auth.h>
 #include <grub/i18n.h>
 #include <grub/charset.h>
+#include <grub/script_sh.h>
 
 #define GRUB_DEFAULT_HISTORY_SIZE	50
 
@@ -308,7 +309,6 @@ static grub_menu_t
 read_config_file (const char *config)
 {
   grub_file_t file;
-  grub_parser_t old_parser = 0;
 
   auto grub_err_t getline (char **line, int cont);
   grub_err_t getline (char **line, int cont __attribute__ ((unused)))
@@ -322,36 +322,7 @@ read_config_file (const char *config)
 	    return grub_errno;
 
 	  if (buf[0] == '#')
-	    {
-	      if (buf[1] == '!')
-		{
-		  grub_parser_t parser;
-		  grub_named_list_t list;
-
-		  buf += 2;
-		  while (grub_isspace (*buf))
-		    buf++;
-
-		  if (! old_parser)
-		    old_parser = grub_parser_get_current ();
-
-		  list = GRUB_AS_NAMED_LIST (grub_parser_class.handler_list);
-		  parser = grub_named_list_find (list, buf);
-		  if (parser)
-		    grub_parser_set_current (parser);
-		  else
-		    {
-		      char cmd_name[8 + grub_strlen (buf)];
-
-		      /* Perhaps it's not loaded yet, try the autoload
-			 command.  */
-		      grub_strcpy (cmd_name, "parser.");
-		      grub_strcat (cmd_name, buf);
-		      grub_command_execute (cmd_name, 0, 0);
-		    }
-		}
-	      grub_free (*line);
-	    }
+	    grub_free (*line);
 	  else
 	    break;
 	}
@@ -387,15 +358,12 @@ read_config_file (const char *config)
       if ((getline (&line, 0)) || (! line))
 	break;
 
-      grub_parser_get_current ()->parse_line (line, getline);
+      grub_normal_parse_line (line, getline);
       grub_free (line);
     }
 
   grub_file_close (file);
 
-  if (old_parser)
-    grub_parser_set_current (old_parser);
-
   return newmenu;
 }
 
@@ -453,7 +421,6 @@ grub_normal_execute (const char *config, int nested, int batch)
   grub_menu_t menu = 0;
 
   read_lists (NULL, NULL);
-  read_handler_list ();
   grub_register_variable_hook ("prefix", NULL, read_lists);
   grub_command_execute ("parser.grub", 0, 0);
 
@@ -559,17 +526,15 @@ grub_normal_reader_init (int nested)
   return 0;
 }
 
-
 static grub_err_t
 grub_normal_read_line_real (char **line, int cont, int nested)
 {
-  grub_parser_t parser = grub_parser_get_current ();
-  char *prompt;
+  const char *prompt;
 
   if (cont)
-    prompt = grub_xasprintf (">");
+    prompt = ">";
   else
-    prompt = grub_xasprintf ("%s>", parser->name);
+    prompt = "grub>";
 
   if (!prompt)
     return grub_errno;
@@ -583,14 +548,11 @@ grub_normal_read_line_real (char **line, int cont, int nested)
       if (cont || nested)
 	{
 	  grub_free (*line);
-	  grub_free (prompt);
 	  *line = 0;
 	  return grub_errno;
 	}
     }
   
-  grub_free (prompt);
-
   return 0;
 }
 
@@ -631,7 +593,7 @@ grub_cmdline_run (int nested)
       if (! line)
 	break;
 
-      grub_parser_get_current ()->parse_line (line, grub_normal_read_line);
+      grub_normal_parse_line (line, grub_normal_read_line);
       grub_free (line);
     }
 }
@@ -679,5 +641,4 @@ GRUB_MOD_FINI(normal)
   grub_set_history (0);
   grub_register_variable_hook ("pager", 0, 0);
   grub_fs_autoload_hook = 0;
-  free_handler_list ();
 }
diff --git a/normal/menu_entry.c b/normal/menu_entry.c
index 644fe90fd..c23d67d70 100644
--- a/normal/menu_entry.c
+++ b/normal/menu_entry.c
@@ -23,6 +23,7 @@
 #include <grub/loader.h>
 #include <grub/command.h>
 #include <grub/parser.h>
+#include <grub/script_sh.h>
 #include <grub/auth.h>
 #include <grub/i18n.h>
 
@@ -1189,7 +1190,7 @@ run (struct screen *screen)
   while (currline < screen->num_lines)
     {
       editor_getline (&nextline, 0);
-      if (grub_parser_get_current ()->parse_line (nextline, editor_getline))
+      if (grub_normal_parse_line (nextline, editor_getline))
 	break;
     }
 
diff --git a/script/main.c b/script/main.c
index b5159dc7d..752a8cd8a 100644
--- a/script/main.c
+++ b/script/main.c
@@ -20,7 +20,7 @@
 #include <grub/parser.h>
 #include <grub/script_sh.h>
 
-static grub_err_t
+grub_err_t
 grub_normal_parse_line (char *line, grub_reader_getline_t getline)
 {
   struct grub_script *parsed_script;
@@ -39,19 +39,3 @@ grub_normal_parse_line (char *line, grub_reader_getline_t getline)
 
   return grub_errno;
 }
-
-static struct grub_parser grub_sh_parser =
-  {
-    .name = "grub",
-    .parse_line = grub_normal_parse_line
-  };
-
-GRUB_MOD_INIT(sh)
-{
-  grub_parser_register ("grub", &grub_sh_parser);
-}
-
-GRUB_MOD_FINI(sh)
-{
-  grub_parser_unregister (&grub_sh_parser);
-}
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index c03c43451..f7e1eb2dd 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -55,9 +55,6 @@ grub_getkey (void)
   return -1;
 }
 
-struct grub_handler_class grub_term_input_class;
-struct grub_handler_class grub_term_output_class;
-
 void
 grub_refresh (void)
 {
diff --git a/util/grub-probe.c b/util/grub-probe.c
index 948f10dcf..37b92454a 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -70,9 +70,6 @@ grub_getkey (void)
   return -1;
 }
 
-struct grub_handler_class grub_term_input_class;
-struct grub_handler_class grub_term_output_class;
-
 void
 grub_refresh (void)
 {
diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index 7dc400dde..722736c81 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -26,8 +26,6 @@
 #include <grub/parser.h>
 #include <grub/script_sh.h>
 
-#include <grub_script_check_init.h>
-
 #define _GNU_SOURCE	1
 
 #include <ctype.h>
@@ -232,9 +230,6 @@ main (int argc, char *argv[])
 	}
     }
 
-  /* Initialize all modules.  */
-  grub_init_all ();
-
   do
     {
       input = 0;
@@ -252,8 +247,6 @@ main (int argc, char *argv[])
       grub_free (input);
     } while (script != 0);
 
-  /* Free resources.  */
-  grub_fini_all ();
   if (file) fclose (file);
 
   return (script == 0);
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 63fa8c328..989b06360 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -69,9 +69,6 @@ grub_getkey (void)
   return -1;
 }
 
-struct grub_handler_class grub_term_input_class;
-struct grub_handler_class grub_term_output_class;
-
 void
 grub_refresh (void)
 {

From c96db58ec599d1bcfb12bf345fb4988e1ef1a741 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 27 Mar 2010 00:27:42 +0100
Subject: [PATCH 0688/1628] Remove grub_fs_iterate

---
 include/grub/fs.h | 26 ++++++++++++++++++++------
 kern/fs.c         | 32 +-------------------------------
 2 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/include/grub/fs.h b/include/grub/fs.h
index 45f515768..3368eb553 100644
--- a/include/grub/fs.h
+++ b/include/grub/fs.h
@@ -24,6 +24,8 @@
 #include <grub/symbol.h>
 #include <grub/types.h>
 
+#include <grub/list.h>
+
 /* Forward declaration is required, because of mutual reference.  */
 struct grub_file;
 
@@ -38,6 +40,9 @@ struct grub_dirhook_info
 /* Filesystem descriptor.  */
 struct grub_fs
 {
+  /* The next filesystem.  */
+  struct grub_fs *next;
+
   /* My name.  */
   const char *name;
 
@@ -72,9 +77,6 @@ struct grub_fs
   /* Whether this filesystem reserves first sector for DOS-style boot.  */
   int reserved_first_sector;
 #endif
-
-  /* The next filesystem.  */
-  struct grub_fs *next;
 };
 typedef struct grub_fs *grub_fs_t;
 
@@ -87,10 +89,22 @@ extern struct grub_fs grub_fs_blocklist;
    the linked list GRUB_FS_LIST through the function grub_fs_register.  */
 typedef int (*grub_fs_autoload_hook_t) (void);
 extern grub_fs_autoload_hook_t EXPORT_VAR(grub_fs_autoload_hook);
+extern grub_fs_t EXPORT_VAR (grub_fs_list);
+
+static inline void
+grub_fs_register (grub_fs_t fs)
+{
+  grub_list_push (GRUB_AS_LIST_P (&grub_fs_list), GRUB_AS_LIST (fs));
+}
+
+static inline void
+grub_fs_unregister (grub_fs_t fs)
+{
+  grub_list_remove (GRUB_AS_LIST_P (&grub_fs_list), GRUB_AS_LIST (fs));
+}
+
+#define FOR_FILESYSTEMS(var) FOR_LIST_ELEMENTS((var), (grub_fs_list))
 
-void EXPORT_FUNC(grub_fs_register) (grub_fs_t fs);
-void EXPORT_FUNC(grub_fs_unregister) (grub_fs_t fs);
-void EXPORT_FUNC(grub_fs_iterate) (int (*hook) (const grub_fs_t fs));
 grub_fs_t EXPORT_FUNC(grub_fs_probe) (grub_device_t device);
 
 #endif /* ! GRUB_FS_HEADER */
diff --git a/kern/fs.c b/kern/fs.c
index 0c456377f..cf800f4cc 100644
--- a/kern/fs.c
+++ b/kern/fs.c
@@ -27,40 +27,10 @@
 #include <grub/mm.h>
 #include <grub/term.h>
 
-static grub_fs_t grub_fs_list;
+grub_fs_t grub_fs_list = 0;
 
 grub_fs_autoload_hook_t grub_fs_autoload_hook = 0;
 
-void
-grub_fs_register (grub_fs_t fs)
-{
-  fs->next = grub_fs_list;
-  grub_fs_list = fs;
-}
-
-void
-grub_fs_unregister (grub_fs_t fs)
-{
-  grub_fs_t *p, q;
-
-  for (p = &grub_fs_list, q = *p; q; p = &(q->next), q = q->next)
-    if (q == fs)
-      {
-	*p = q->next;
-	break;
-      }
-}
-
-void
-grub_fs_iterate (int (*hook) (const grub_fs_t fs))
-{
-  grub_fs_t p;
-
-  for (p = grub_fs_list; p; p = p->next)
-    if (hook (p))
-      break;
-}
-
 grub_fs_t
 grub_fs_probe (grub_device_t device)
 {

From 9eade9dbd7602d4b9dbae8a09dc89a1631ab314e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 27 Mar 2010 00:36:28 +0100
Subject: [PATCH 0689/1628] Remove grub_video_iterate

---
 include/grub/video.h | 29 +++++++++++++++++++++++------
 video/video.c        | 35 +----------------------------------
 2 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/include/grub/video.h b/include/grub/video.h
index 57f2b37f2..3e8ea0e96 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -21,6 +21,7 @@
 
 #include <grub/err.h>
 #include <grub/types.h>
+#include <grub/list.h>
 
 /* Video color in hardware dependent format.  Users should not assume any
    specific coding format.  */
@@ -185,6 +186,9 @@ typedef enum grub_video_driver_id
 
 struct grub_video_adapter
 {
+  /* The next video adapter.  */
+  struct grub_video_adapter *next;
+
   /* The video adapter name.  */
   const char *name;
   grub_video_driver_id_t id;
@@ -253,15 +257,28 @@ struct grub_video_adapter
   grub_err_t (*set_active_render_target) (struct grub_video_render_target *target);
 
   grub_err_t (*get_active_render_target) (struct grub_video_render_target **target);
-
-  /* The next video adapter.  */
-  struct grub_video_adapter *next;
 };
 typedef struct grub_video_adapter *grub_video_adapter_t;
 
-void EXPORT_FUNC (grub_video_register) (grub_video_adapter_t adapter);
-void grub_video_unregister (grub_video_adapter_t adapter);
-void grub_video_iterate (int (*hook) (grub_video_adapter_t adapter));
+extern grub_video_adapter_t EXPORT_VAR(grub_video_adapter_list);
+
+/* Register video driver.  */
+static inline void
+grub_video_register (grub_video_adapter_t adapter)
+{
+  grub_list_push (GRUB_AS_LIST_P (&grub_video_adapter_list),
+		  GRUB_AS_LIST (adapter));
+}
+
+/* Unregister video driver.  */
+static inline void
+grub_video_unregister (grub_video_adapter_t adapter)
+{
+  grub_list_remove (GRUB_AS_LIST_P (&grub_video_adapter_list),
+		    GRUB_AS_LIST (adapter));
+}
+
+#define FOR_VIDEO_ADAPTERS(var) FOR_LIST_ELEMENTS((var), (grub_video_adapter_list))
 
 grub_err_t EXPORT_FUNC (grub_video_restore) (void);
 
diff --git a/video/video.c b/video/video.c
index 42418f980..7a1a446e4 100644
--- a/video/video.c
+++ b/video/video.c
@@ -23,44 +23,11 @@
 #include <grub/mm.h>
 
 /* The list of video adapters registered to system.  */
-static grub_video_adapter_t grub_video_adapter_list;
+grub_video_adapter_t grub_video_adapter_list = NULL;
 
 /* Active video adapter.  */
 static grub_video_adapter_t grub_video_adapter_active;
 
-/* Register video driver.  */
-void
-grub_video_register (grub_video_adapter_t adapter)
-{
-  adapter->next = grub_video_adapter_list;
-  grub_video_adapter_list = adapter;
-}
-
-/* Unregister video driver.  */
-void
-grub_video_unregister (grub_video_adapter_t adapter)
-{
-  grub_video_adapter_t *p, q;
-
-  for (p = &grub_video_adapter_list, q = *p; q; p = &(q->next), q = q->next)
-    if (q == adapter)
-      {
-        *p = q->next;
-        break;
-      }
-}
-
-/* Iterate thru all registered video drivers.  */
-void
-grub_video_iterate (int (*hook) (grub_video_adapter_t adapter))
-{
-  grub_video_adapter_t p;
-
-  for (p = grub_video_adapter_list; p; p = p->next)
-    if (hook (p))
-      break;
-}
-
 /* Restore back to initial mode (where applicable).  */
 grub_err_t
 grub_video_restore (void)

From fcaae9ec1242c54e0bd763d80f8427e70e9f7fde Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 27 Mar 2010 00:52:40 +0100
Subject: [PATCH 0690/1628] Remove grub_dl_iterate

---
 commands/minicmd.c | 34 ++++++++++++++------------------
 include/grub/dl.h  |  6 +++++-
 kern/dl.c          | 49 ++++++++++++----------------------------------
 3 files changed, 32 insertions(+), 57 deletions(-)

diff --git a/commands/minicmd.c b/commands/minicmd.c
index 4ea9efead..92d262caf 100644
--- a/commands/minicmd.c
+++ b/commands/minicmd.c
@@ -301,27 +301,23 @@ grub_mini_cmd_lsmod (struct grub_command *cmd __attribute__ ((unused)),
 		     int argc __attribute__ ((unused)),
 		     char *argv[] __attribute__ ((unused)))
 {
-  auto int print_module (grub_dl_t mod);
-
-  int print_module (grub_dl_t mod)
-    {
-      grub_dl_dep_t dep;
-
-      grub_printf ("%s\t%d\t\t", mod->name, mod->ref_count);
-      for (dep = mod->dep; dep; dep = dep->next)
-	{
-	  if (dep != mod->dep)
-	    grub_putchar (',');
-
-	  grub_printf ("%s", dep->mod->name);
-	}
-      grub_putchar ('\n');
-
-      return 0;
-    }
+  grub_dl_t mod;
 
   grub_printf ("Name\tRef Count\tDependencies\n");
-  grub_dl_iterate (print_module);
+  FOR_DL_MODULES (mod)
+  {
+    grub_dl_dep_t dep;
+
+    grub_printf ("%s\t%d\t\t", mod->name, mod->ref_count);
+    for (dep = mod->dep; dep; dep = dep->next)
+      {
+	if (dep != mod->dep)
+	  grub_putchar (',');
+
+	grub_printf ("%s", dep->mod->name);
+      }
+    grub_putchar ('\n');
+  }
 
   return 0;
 }
diff --git a/include/grub/dl.h b/include/grub/dl.h
index 17e03f400..c44e85aef 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -82,6 +82,7 @@ struct grub_dl
   Elf_Sym *symtab;
   void (*init) (struct grub_dl *mod);
   void (*fini) (void);
+  struct grub_dl *next;
 };
 typedef struct grub_dl *grub_dl_t;
 
@@ -113,7 +114,10 @@ grub_dl_unref (grub_dl_t mod)
 int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);
 int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);
 #endif
-void EXPORT_FUNC(grub_dl_iterate) (int (*hook) (grub_dl_t mod));
+extern grub_dl_t EXPORT_VAR(grub_dl_head);
+
+#define FOR_DL_MODULES(var) FOR_LIST_ELEMENTS ((var), (grub_dl_head))
+
 grub_dl_t EXPORT_FUNC(grub_dl_get) (const char *name);
 grub_err_t grub_dl_register_symbol (const char *name, void *addr,
 				    grub_dl_t mod);
diff --git a/kern/dl.c b/kern/dl.c
index 19ee13243..cf59cec30 100644
--- a/kern/dl.c
+++ b/kern/dl.c
@@ -39,31 +39,17 @@
 
 
 
-struct grub_dl_list
-{
-  struct grub_dl_list *next;
-  grub_dl_t mod;
-};
-typedef struct grub_dl_list *grub_dl_list_t;
-
-static grub_dl_list_t grub_dl_head;
+grub_dl_t grub_dl_head = 0;
 
 static grub_err_t
 grub_dl_add (grub_dl_t mod)
 {
-  grub_dl_list_t l;
-
   if (grub_dl_get (mod->name))
     return grub_error (GRUB_ERR_BAD_MODULE,
 		       "`%s' is already loaded", mod->name);
 
-  l = (grub_dl_list_t) grub_malloc (sizeof (*l));
-  if (! l)
-    return grub_errno;
-
-  l->mod = mod;
-  l->next = grub_dl_head;
-  grub_dl_head = l;
+  mod->next = grub_dl_head;
+  grub_dl_head = mod;
 
   return GRUB_ERR_NONE;
 }
@@ -71,13 +57,12 @@ grub_dl_add (grub_dl_t mod)
 static void
 grub_dl_remove (grub_dl_t mod)
 {
-  grub_dl_list_t *p, q;
+  grub_dl_t *p, q;
 
   for (p = &grub_dl_head, q = *p; q; p = &q->next, q = *p)
-    if (q->mod == mod)
+    if (q == mod)
       {
 	*p = q->next;
-	grub_free (q);
 	return;
       }
 }
@@ -85,25 +70,15 @@ grub_dl_remove (grub_dl_t mod)
 grub_dl_t
 grub_dl_get (const char *name)
 {
-  grub_dl_list_t l;
+  grub_dl_t l;
 
   for (l = grub_dl_head; l; l = l->next)
-    if (grub_strcmp (name, l->mod->name) == 0)
-      return l->mod;
+    if (grub_strcmp (name, l->name) == 0)
+      return l;
 
   return 0;
 }
 
-void
-grub_dl_iterate (int (*hook) (grub_dl_t mod))
-{
-  grub_dl_list_t l;
-
-  for (l = grub_dl_head; l; l = l->next)
-    if (hook (l->mod))
-      break;
-}
-
 
 
 struct grub_symbol
@@ -690,11 +665,11 @@ grub_dl_unload_unneeded (void)
 {
   /* Because grub_dl_remove modifies the list of modules, this
      implementation is tricky.  */
-  grub_dl_list_t p = grub_dl_head;
+  grub_dl_t p = grub_dl_head;
 
   while (p)
     {
-      if (grub_dl_unload (p->mod))
+      if (grub_dl_unload (p))
 	{
 	  p = grub_dl_head;
 	  continue;
@@ -710,13 +685,13 @@ grub_dl_unload_all (void)
 {
   while (grub_dl_head)
     {
-      grub_dl_list_t p;
+      grub_dl_t p;
 
       grub_dl_unload_unneeded ();
 
       /* Force to decrement the ref count. This will purge pre-loaded
 	 modules and manually inserted modules.  */
       for (p = grub_dl_head; p; p = p->next)
-	p->mod->ref_count--;
+	p->ref_count--;
     }
 }

From 9cc7b8751eb717834864fc587412a4dbafa7066d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 27 Mar 2010 00:58:35 +0100
Subject: [PATCH 0691/1628] Remove grub_script_function_iterate

---
 include/grub/script_sh.h |  6 +++++-
 script/function.c        | 14 +-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 5e85d983e..020cbb2f7 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -313,11 +313,15 @@ struct grub_script_function
 };
 typedef struct grub_script_function *grub_script_function_t;
 
+extern grub_script_function_t grub_script_function_list;
+
+#define FOR_SCRIPT_FUNCTIONS(var) for((var) = grub_script_function_list; \
+				      (var); (var) = (var)->next)
+
 grub_script_function_t grub_script_function_create (struct grub_script_arg *functionname,
 						    struct grub_script *cmd);
 void grub_script_function_remove (const char *name);
 grub_script_function_t grub_script_function_find (char *functionname);
-int grub_script_function_iterate (int (*iterate) (grub_script_function_t));
 int grub_script_function_call (grub_script_function_t func,
 			       int argc, char **args);
 
diff --git a/script/function.c b/script/function.c
index ded470c4e..810c65233 100644
--- a/script/function.c
+++ b/script/function.c
@@ -21,7 +21,7 @@
 #include <grub/parser.h>
 #include <grub/mm.h>
 
-static grub_script_function_t grub_script_function_list;
+grub_script_function_t grub_script_function_list;
 
 grub_script_function_t
 grub_script_function_create (struct grub_script_arg *functionname_arg,
@@ -104,18 +104,6 @@ grub_script_function_find (char *functionname)
   return func;
 }
 
-int
-grub_script_function_iterate (int (*iterate) (grub_script_function_t))
-{
-  grub_script_function_t func;
-
-  for (func = grub_script_function_list; func; func = func->next)
-    if (iterate (func))
-      return 1;
-
-  return 0;
-}
-
 int
 grub_script_function_call (grub_script_function_t func,
 			   int argc __attribute__((unused)),

From 394a3120a7e082b130108895243ad00648151564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Sat, 27 Mar 2010 12:19:32 +0100
Subject: [PATCH 0692/1628] 	Fix a build failure (-Wundef -Werror) when
 ENABLE_NLS is not defined, 	which is the case with --disabled-nls.

	* include/grub/i18n.h: Use (defined(ENABLE_NLS)
	&& ENABLE_NLS) instead of ENABLE_NLS in all #if preprocessor macros.
	* util/misc.c: Likewise.
	* util/mkisofs/mkisofs.c: Likewise.
	* util/mkisofs/mkisofs.h: Likewise.
---
 ChangeLog              | 11 +++++++++++
 include/grub/i18n.h    |  6 +++---
 util/misc.c            |  4 ++--
 util/mkisofs/mkisofs.c |  4 ++--
 util/mkisofs/mkisofs.h |  6 +++---
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 91b3069e0..ef534fd31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-27  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	Fix a build failure (-Wundef -Werror) when ENABLE_NLS is not defined,
+	which is the case with --disabled-nls.
+
+	* include/grub/i18n.h: Use (defined(ENABLE_NLS)
+	&& ENABLE_NLS) instead of ENABLE_NLS in all #if preprocessor macros.
+	* util/misc.c: Likewise.
+	* util/mkisofs/mkisofs.c: Likewise.
+	* util/mkisofs/mkisofs.h: Likewise.
+
 2010-03-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Simplify Apple CC support.
diff --git a/include/grub/i18n.h b/include/grub/i18n.h
index 0cba54765..9e7f52d45 100644
--- a/include/grub/i18n.h
+++ b/include/grub/i18n.h
@@ -25,7 +25,7 @@
 extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
 
 /* NLS can be disabled through the configure --disable-nls option.  */
-#if ENABLE_NLS
+#if (defined(ENABLE_NLS) && ENABLE_NLS)
 
 # ifdef GRUB_UTIL
 
@@ -34,7 +34,7 @@ extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
 
 # endif /* GRUB_UTIL */
 
-#else /* ! ENABLE_NLS */
+#else /* ! (defined(ENABLE_NLS) && ENABLE_NLS) */
 
 /* Disabled NLS.
    The casts to 'const char *' serve the purpose of producing warnings
@@ -47,7 +47,7 @@ extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
 #  define grub_gettext(str) ((const char *) (str))
 # endif /* GRUB_UTIL */
 
-#endif /* ENABLE_NLS */
+#endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
 
 #ifdef GRUB_UTIL
 # define _(str) gettext(str)
diff --git a/util/misc.c b/util/misc.c
index 7381c8fdd..0f52c218d 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -604,10 +604,10 @@ make_system_path_relative_to_its_root (const char *path)
 void
 grub_util_init_nls (void)
 {
-#if ENABLE_NLS
+#if (defined(ENABLE_NLS) && ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
-#endif /* ENABLE_NLS */
+#endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
 }
 #endif
diff --git a/util/mkisofs/mkisofs.c b/util/mkisofs/mkisofs.c
index 69b4b3d0d..16e2f0c7d 100644
--- a/util/mkisofs/mkisofs.c
+++ b/util/mkisofs/mkisofs.c
@@ -640,11 +640,11 @@ int FDECL2(main, int, argc, char **, argv){
   char *log_file = 0;
 
   set_program_name (argv[0]);
-#if ENABLE_NLS
+#if (defined(ENABLE_NLS) && ENABLE_NLS)
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
-#endif /* ENABLE_NLS */
+#endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
 
   if (argc < 2)
     usage();
diff --git a/util/mkisofs/mkisofs.h b/util/mkisofs/mkisofs.h
index 482db6ceb..b699516e9 100644
--- a/util/mkisofs/mkisofs.h
+++ b/util/mkisofs/mkisofs.h
@@ -30,12 +30,12 @@
 #include <prototyp.h>
 #include <sys/stat.h>
 
-#if ENABLE_NLS
+#if (defined(ENABLE_NLS) && ENABLE_NLS)
 
 #  include <locale.h>
 #  include <libintl.h>
 
-#else /* ! ENABLE_NLS */
+#else /* ! (defined(ENABLE_NLS) && ENABLE_NLS) */
 
 /* Disabled NLS.
    The casts to 'const char *' serve the purpose of producing warnings
@@ -43,7 +43,7 @@
    On pre-ANSI systems without 'const', the config.h file is supposed to
    contain "#define const".  */
 #  define gettext(Msgid) ((const char *) (Msgid))
-#endif /* ENABLE_NLS */
+#endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
 
 #define _(str) gettext(str)
 #define N_(str) str

From 3506b90b0d278ce8dd5fe7ab32903db876cd85ad Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 27 Mar 2010 12:53:40 +0100
Subject: [PATCH 0693/1628] 	Resync with gnulib.

	* Makefile.in (GNULIB_CFLAGS): New variable.
	* conf/common.rmk (grub_mkisofs_CFLAGS): Add GNULIB_CFLAGS.
	(grub_script_check_CFLAGS): New variable.
	* gnulib/alloca.h: Resync with gnulib.
	* gnulib/error.c: Likewise.
	* gnulib/error.h: Likewise.
	* gnulib/fnmatch.c: Likewise.
	* gnulib/fnmatch_loop.c: Likewise.
	* gnulib/getdelim.c: Likewise.
	* gnulib/getline.c: Likewise.
	* gnulib/getopt.c: Likewise.
	* gnulib/getopt1.c: Likewise.
	* gnulib/getopt_int.h: Likewise.
	* gnulib/gettext.h: Likewise.
	* gnulib/progname.c: Likewise.
	* gnulib/progname.h: Likewise.
---
 ChangeLog             |   21 +
 Makefile.in           |    1 +
 conf/common.rmk       |    4 +-
 gnulib/alloca.h       |    4 +-
 gnulib/error.c        |  152 ++--
 gnulib/error.h        |   24 +-
 gnulib/fnmatch.c      |  198 ++---
 gnulib/fnmatch_loop.c | 1730 +++++++++++++++++++++--------------------
 gnulib/getdelim.c     |   77 +-
 gnulib/getline.c      |    2 +-
 gnulib/getopt.c       | 1247 +++++++++++++++--------------
 gnulib/getopt1.c      |  128 +--
 gnulib/getopt_int.h   |   38 +-
 gnulib/gettext.h      |   42 +-
 gnulib/progname.c     |   32 +-
 gnulib/progname.h     |   12 +-
 16 files changed, 1891 insertions(+), 1821 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ef534fd31..86c1d6ceb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2010-03-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Resync with gnulib.
+
+	* Makefile.in (GNULIB_CFLAGS): New variable.
+	* conf/common.rmk (grub_mkisofs_CFLAGS): Add GNULIB_CFLAGS.
+	(grub_script_check_CFLAGS): New variable.
+	* gnulib/alloca.h: Resync with gnulib.
+	* gnulib/error.c: Likewise.
+	* gnulib/error.h: Likewise.
+	* gnulib/fnmatch.c: Likewise.
+	* gnulib/fnmatch_loop.c: Likewise.
+	* gnulib/getdelim.c: Likewise.
+	* gnulib/getline.c: Likewise.
+	* gnulib/getopt.c: Likewise.
+	* gnulib/getopt1.c: Likewise.
+	* gnulib/getopt_int.h: Likewise.
+	* gnulib/gettext.h: Likewise.
+	* gnulib/progname.c: Likewise.
+	* gnulib/progname.h: Likewise.
+
 2010-03-27  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	Fix a build failure (-Wundef -Werror) when ENABLE_NLS is not defined,
diff --git a/Makefile.in b/Makefile.in
index 07fe6219a..d640b91d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,6 +79,7 @@ LIBS = @LIBS@ $(LIBINTL)
 
 CC = @CC@
 CFLAGS = @CFLAGS@
+GNULIB_CFLAGS = -Wno-undef -D_GL_UNUSED="__attribute__ ((unused))"
 ASFLAGS = @ASFLAGS@
 LDFLAGS = @LDFLAGS@ $(LIBS)
 CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/gnulib -I$(srcdir)/include -Wall -W \
diff --git a/conf/common.rmk b/conf/common.rmk
index f55bbfe0c..a7536d08e 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -56,7 +56,7 @@ grub_mkisofs_SOURCES = util/mkisofs/eltorito.c 				\
 	gnulib/error.c gnulib/progname.c
 grub_mkisofs_CFLAGS = -D_FILE_OFFSET_BITS=64 				\
 	-I$(srcdir)/util/mkisofs/include				\
-	-Wno-all -Werror
+	-Wno-all -Werror $(GNULIB_CFLAGS)
 
 # For grub-fstest.
 util/grub-fstest.c_DEPENDENCIES = grub_fstest_init.h
@@ -111,7 +111,7 @@ grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c
 	kern/handler.c kern/err.c kern/parser.c kern/list.c \
 	kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c \
 	grub_script.yy.c
-
+grub_script_check_CFLAGS = $(GNULIB_CFLAGS)
 MOSTLYCLEANFILES += symlist.c kernel_syms.lst
 DEFSYMFILES += kernel_syms.lst
 
diff --git a/gnulib/alloca.h b/gnulib/alloca.h
index 5d16e08b7..107534e98 100644
--- a/gnulib/alloca.h
+++ b/gnulib/alloca.h
@@ -1,7 +1,7 @@
 /* Memory allocation on the stack.
 
-   Copyright (C) 1995, 1999, 2001-2004, 2006-2008 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995, 1999, 2001-2004, 2006-2010 Free Software Foundation,
+   Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published
diff --git a/gnulib/error.c b/gnulib/error.c
index af2287b27..c79e8d42c 100644
--- a/gnulib/error.c
+++ b/gnulib/error.c
@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 2000-2007, 2009-2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
@@ -70,8 +70,8 @@ unsigned int error_message_count;
 extern void __error (int status, int errnum, const char *message, ...)
      __attribute__ ((__format__ (__printf__, 3, 4)));
 extern void __error_at_line (int status, int errnum, const char *file_name,
-			     unsigned int line_number, const char *message,
-			     ...)
+                             unsigned int line_number, const char *message,
+                             ...)
      __attribute__ ((__format__ (__printf__, 5, 6)));;
 # define error __error
 # define error_at_line __error_at_line
@@ -86,6 +86,7 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
 #else /* not _LIBC */
 
 # include <fcntl.h>
+# include <unistd.h>
 
 # if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P
 #  ifndef HAVE_DECL_STRERROR_R
@@ -100,8 +101,33 @@ extern char *program_name;
 
 # if HAVE_STRERROR_R || defined strerror_r
 #  define __strerror_r strerror_r
-# endif	/* HAVE_STRERROR_R || defined strerror_r */
-#endif	/* not _LIBC */
+# endif /* HAVE_STRERROR_R || defined strerror_r */
+#endif  /* not _LIBC */
+
+static inline void
+flush_stdout (void)
+{
+#if !_LIBC && defined F_GETFL
+  int stdout_fd;
+
+# if GNULIB_FREOPEN_SAFER
+  /* Use of gnulib's freopen-safer module normally ensures that
+       fileno (stdout) == 1
+     whenever stdout is open.  */
+  stdout_fd = STDOUT_FILENO;
+# else
+  /* POSIX states that fileno (stdout) after fclose is unspecified.  But in
+     practice it is not a problem, because stdout is statically allocated and
+     the fd of a FILE stream is stored as a field in its allocated memory.  */
+  stdout_fd = fileno (stdout);
+# endif
+  /* POSIX states that fflush (stdout) after fclose is unspecified; it
+     is safe in glibc, but not on all other platforms.  fflush (NULL)
+     is always defined, but too draconian.  */
+  if (0 <= stdout_fd && 0 <= fcntl (stdout_fd, F_GETFL))
+#endif
+    fflush (stdout);
+}
 
 static void
 print_errno_message (int errnum)
@@ -149,58 +175,58 @@ error_tail (int status, int errnum, const char *message, va_list args)
       bool use_malloc = false;
 
       while (1)
-	{
-	  if (__libc_use_alloca (len * sizeof (wchar_t)))
-	    wmessage = (wchar_t *) alloca (len * sizeof (wchar_t));
-	  else
-	    {
-	      if (!use_malloc)
-		wmessage = NULL;
+        {
+          if (__libc_use_alloca (len * sizeof (wchar_t)))
+            wmessage = (wchar_t *) alloca (len * sizeof (wchar_t));
+          else
+            {
+              if (!use_malloc)
+                wmessage = NULL;
 
-	      wchar_t *p = (wchar_t *) realloc (wmessage,
-						len * sizeof (wchar_t));
-	      if (p == NULL)
-		{
-		  free (wmessage);
-		  fputws_unlocked (L"out of memory\n", stderr);
-		  return;
-		}
-	      wmessage = p;
-	      use_malloc = true;
-	    }
+              wchar_t *p = (wchar_t *) realloc (wmessage,
+                                                len * sizeof (wchar_t));
+              if (p == NULL)
+                {
+                  free (wmessage);
+                  fputws_unlocked (L"out of memory\n", stderr);
+                  return;
+                }
+              wmessage = p;
+              use_malloc = true;
+            }
 
-	  memset (&st, '\0', sizeof (st));
-	  tmp = message;
+          memset (&st, '\0', sizeof (st));
+          tmp = message;
 
-	  res = mbsrtowcs (wmessage, &tmp, len, &st);
-	  if (res != len)
-	    break;
+          res = mbsrtowcs (wmessage, &tmp, len, &st);
+          if (res != len)
+            break;
 
-	  if (__builtin_expect (len >= SIZE_MAX / 2, 0))
-	    {
-	      /* This really should not happen if everything is fine.  */
-	      res = (size_t) -1;
-	      break;
-	    }
+          if (__builtin_expect (len >= SIZE_MAX / 2, 0))
+            {
+              /* This really should not happen if everything is fine.  */
+              res = (size_t) -1;
+              break;
+            }
 
-	  len *= 2;
-	}
+          len *= 2;
+        }
 
       if (res == (size_t) -1)
-	{
-	  /* The string cannot be converted.  */
-	  if (use_malloc)
-	    {
-	      free (wmessage);
-	      use_malloc = false;
-	    }
-	  wmessage = (wchar_t *) L"???";
-	}
+        {
+          /* The string cannot be converted.  */
+          if (use_malloc)
+            {
+              free (wmessage);
+              use_malloc = false;
+            }
+          wmessage = (wchar_t *) L"???";
+        }
 
       __vfwprintf (stderr, wmessage, args);
 
       if (use_malloc)
-	free (wmessage);
+        free (wmessage);
     }
   else
 #endif
@@ -235,16 +261,10 @@ error (int status, int errnum, const char *message, ...)
      cancellation.  Therefore disable cancellation for now.  */
   int state = PTHREAD_CANCEL_ENABLE;
   __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
-		   0);
+                   0);
 #endif
 
-#if !_LIBC && defined F_GETFL
-  /* POSIX states that fflush (stdout) after fclose is unspecified; it
-     is safe in glibc, but not on all other platforms.  fflush (NULL)
-     is always defined, but too draconian.  */
-  if (0 <= fcntl (1, F_GETFL))
-#endif
-  fflush (stdout);
+  flush_stdout ();
 #ifdef _LIBC
   _IO_flockfile (stderr);
 #endif
@@ -276,7 +296,7 @@ int error_one_per_line;
 
 void
 error_at_line (int status, int errnum, const char *file_name,
-	       unsigned int line_number, const char *message, ...)
+               unsigned int line_number, const char *message, ...)
 {
   va_list args;
 
@@ -286,10 +306,10 @@ error_at_line (int status, int errnum, const char *file_name,
       static unsigned int old_line_number;
 
       if (old_line_number == line_number
-	  && (file_name == old_file_name
-	      || strcmp (old_file_name, file_name) == 0))
-	/* Simply return and print nothing.  */
-	return;
+          && (file_name == old_file_name
+              || strcmp (old_file_name, file_name) == 0))
+        /* Simply return and print nothing.  */
+        return;
 
       old_file_name = file_name;
       old_line_number = line_number;
@@ -300,16 +320,10 @@ error_at_line (int status, int errnum, const char *file_name,
      cancellation.  Therefore disable cancellation for now.  */
   int state = PTHREAD_CANCEL_ENABLE;
   __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
-		   0);
+                   0);
 #endif
 
-#if !_LIBC && defined F_GETFL
-  /* POSIX states that fflush (stdout) after fclose is unspecified; it
-     is safe in glibc, but not on all other platforms.  fflush (NULL)
-     is always defined, but too draconian.  */
-  if (0 <= fcntl (1, F_GETFL))
-#endif
-  fflush (stdout);
+  flush_stdout ();
 #ifdef _LIBC
   _IO_flockfile (stderr);
 #endif
@@ -326,10 +340,10 @@ error_at_line (int status, int errnum, const char *file_name,
 
 #if _LIBC
   __fxprintf (NULL, file_name != NULL ? "%s:%d: " : " ",
-	      file_name, line_number);
+              file_name, line_number);
 #else
   fprintf (stderr, file_name != NULL ? "%s:%d: " : " ",
-	   file_name, line_number);
+           file_name, line_number);
 #endif
 
   va_start (args, message);
diff --git a/gnulib/error.h b/gnulib/error.h
index 6d4968114..9deef02d2 100644
--- a/gnulib/error.h
+++ b/gnulib/error.h
@@ -1,5 +1,6 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995, 1996, 1997, 2003, 2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 2003, 2006, 2008, 2009, 2010 Free Software
+   Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
@@ -19,19 +20,18 @@
 #define _ERROR_H 1
 
 #ifndef __attribute__
-/* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
-#  define __attribute__(Spec) /* empty */
-# endif
-/* The __-protected variants of `format' and `printf' attributes
-   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
+/* The __attribute__ feature is available in gcc versions 2.5 and later.
+   The __-protected variants of the attributes 'format' and 'printf' are
+   accepted by gcc versions 2.6.4 (effectively 2.7) and later.
+   We enable __attribute__ only if these are supported too, because
+   gnulib and libintl do '#define printf __printf__' when they override
+   the 'printf' function.  */
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-#  define __format__ format
-#  define __printf__ printf
+#  define __attribute__(Spec)   /* empty */
 # endif
 #endif
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -43,7 +43,7 @@ extern void error (int __status, int __errnum, const char *__format, ...)
      __attribute__ ((__format__ (__printf__, 3, 4)));
 
 extern void error_at_line (int __status, int __errnum, const char *__fname,
-			   unsigned int __lineno, const char *__format, ...)
+                           unsigned int __lineno, const char *__format, ...)
      __attribute__ ((__format__ (__printf__, 5, 6)));
 
 /* If NULL, error will flush stdout, then print on stderr the program
@@ -58,7 +58,7 @@ extern unsigned int error_message_count;
    variable controls whether this mode is selected or not.  */
 extern int error_one_per_line;
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 }
 #endif
 
diff --git a/gnulib/fnmatch.c b/gnulib/fnmatch.c
index 48bc8b5d2..f15dbb806 100644
--- a/gnulib/fnmatch.c
+++ b/gnulib/fnmatch.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007
-	Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 
 /* Enable GNU extensions in fnmatch.h.  */
 #ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
+# define _GNU_SOURCE    1
 #endif
 
 #if ! defined __builtin_expect && __GNUC__ < 3
@@ -89,7 +89,7 @@ extern int fnmatch (const char *pattern, const char *string, int flags);
 #  define isblank(c) ((c) == ' ' || (c) == '\t')
 # endif
 
-# define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
+# define STREQ(s1, s2) (strcmp (s1, s2) == 0)
 
 # if defined _LIBC || WIDE_CHAR_SUPPORT
 /* The GNU C library provides support for user-defined character classes
@@ -109,25 +109,25 @@ extern int fnmatch (const char *pattern, const char *string, int flags);
 #  endif
 
 #  ifdef _LIBC
-#   define ISWCTYPE(WC, WT)	__iswctype (WC, WT)
+#   define ISWCTYPE(WC, WT)     __iswctype (WC, WT)
 #  else
-#   define ISWCTYPE(WC, WT)	iswctype (WC, WT)
+#   define ISWCTYPE(WC, WT)     iswctype (WC, WT)
 #  endif
 
 #  if (HAVE_MBSTATE_T && HAVE_MBSRTOWCS) || _LIBC
 /* In this case we are implementing the multibyte character handling.  */
-#   define HANDLE_MULTIBYTE	1
+#   define HANDLE_MULTIBYTE     1
 #  endif
 
 # else
 #  define CHAR_CLASS_MAX_LENGTH  6 /* Namely, `xdigit'.  */
 
-#  define IS_CHAR_CLASS(string)						      \
-   (STREQ (string, "alpha") || STREQ (string, "upper")			      \
-    || STREQ (string, "lower") || STREQ (string, "digit")		      \
-    || STREQ (string, "alnum") || STREQ (string, "xdigit")		      \
-    || STREQ (string, "space") || STREQ (string, "print")		      \
-    || STREQ (string, "punct") || STREQ (string, "graph")		      \
+#  define IS_CHAR_CLASS(string)                                               \
+   (STREQ (string, "alpha") || STREQ (string, "upper")                        \
+    || STREQ (string, "lower") || STREQ (string, "digit")                     \
+    || STREQ (string, "alnum") || STREQ (string, "xdigit")                    \
+    || STREQ (string, "space") || STREQ (string, "print")                     \
+    || STREQ (string, "punct") || STREQ (string, "graph")                     \
     || STREQ (string, "cntrl") || STREQ (string, "blank"))
 # endif
 
@@ -145,17 +145,17 @@ static int posixly_correct;
 
 /* Note that this evaluates C many times.  */
 # define FOLD(c) ((flags & FNM_CASEFOLD) ? tolower (c) : (c))
-# define CHAR	char
-# define UCHAR	unsigned char
-# define INT	int
-# define FCT	internal_fnmatch
-# define EXT	ext_match
-# define END	end_pattern
-# define L_(CS)	CS
+# define CHAR   char
+# define UCHAR  unsigned char
+# define INT    int
+# define FCT    internal_fnmatch
+# define EXT    ext_match
+# define END    end_pattern
+# define L_(CS) CS
 # ifdef _LIBC
-#  define BTOWC(C)	__btowc (C)
+#  define BTOWC(C)      __btowc (C)
 # else
-#  define BTOWC(C)	btowc (C)
+#  define BTOWC(C)      btowc (C)
 # endif
 # define STRLEN(S) strlen (S)
 # define STRCAT(D, S) strcat (D, S)
@@ -175,14 +175,14 @@ static int posixly_correct;
 
 # if HANDLE_MULTIBYTE
 #  define FOLD(c) ((flags & FNM_CASEFOLD) ? towlower (c) : (c))
-#  define CHAR	wchar_t
-#  define UCHAR	wint_t
-#  define INT	wint_t
-#  define FCT	internal_fnwmatch
-#  define EXT	ext_wmatch
-#  define END	end_wpattern
-#  define L_(CS)	L##CS
-#  define BTOWC(C)	(C)
+#  define CHAR  wchar_t
+#  define UCHAR wint_t
+#  define INT   wint_t
+#  define FCT   internal_fnwmatch
+#  define EXT   ext_wmatch
+#  define END   end_wpattern
+#  define L_(CS)        L##CS
+#  define BTOWC(C)      (C)
 #  ifdef _LIBC
 #   define STRLEN(S) __wcslen (S)
 #   define STRCAT(D, S) __wcscat (D, S)
@@ -218,40 +218,40 @@ is_char_class (const wchar_t *wcs)
       /* Test for a printable character from the portable character set.  */
 #  ifdef _LIBC
       if (*wcs < 0x20 || *wcs > 0x7e
-	  || *wcs == 0x24 || *wcs == 0x40 || *wcs == 0x60)
-	return (wctype_t) 0;
+          || *wcs == 0x24 || *wcs == 0x40 || *wcs == 0x60)
+        return (wctype_t) 0;
 #  else
       switch (*wcs)
-	{
-	case L' ': case L'!': case L'"': case L'#': case L'%':
-	case L'&': case L'\'': case L'(': case L')': case L'*':
-	case L'+': case L',': case L'-': case L'.': case L'/':
-	case L'0': case L'1': case L'2': case L'3': case L'4':
-	case L'5': case L'6': case L'7': case L'8': case L'9':
-	case L':': case L';': case L'<': case L'=': case L'>':
-	case L'?':
-	case L'A': case L'B': case L'C': case L'D': case L'E':
-	case L'F': case L'G': case L'H': case L'I': case L'J':
-	case L'K': case L'L': case L'M': case L'N': case L'O':
-	case L'P': case L'Q': case L'R': case L'S': case L'T':
-	case L'U': case L'V': case L'W': case L'X': case L'Y':
-	case L'Z':
-	case L'[': case L'\\': case L']': case L'^': case L'_':
-	case L'a': case L'b': case L'c': case L'd': case L'e':
-	case L'f': case L'g': case L'h': case L'i': case L'j':
-	case L'k': case L'l': case L'm': case L'n': case L'o':
-	case L'p': case L'q': case L'r': case L's': case L't':
-	case L'u': case L'v': case L'w': case L'x': case L'y':
-	case L'z': case L'{': case L'|': case L'}': case L'~':
-	  break;
-	default:
-	  return (wctype_t) 0;
-	}
+        {
+        case L' ': case L'!': case L'"': case L'#': case L'%':
+        case L'&': case L'\'': case L'(': case L')': case L'*':
+        case L'+': case L',': case L'-': case L'.': case L'/':
+        case L'0': case L'1': case L'2': case L'3': case L'4':
+        case L'5': case L'6': case L'7': case L'8': case L'9':
+        case L':': case L';': case L'<': case L'=': case L'>':
+        case L'?':
+        case L'A': case L'B': case L'C': case L'D': case L'E':
+        case L'F': case L'G': case L'H': case L'I': case L'J':
+        case L'K': case L'L': case L'M': case L'N': case L'O':
+        case L'P': case L'Q': case L'R': case L'S': case L'T':
+        case L'U': case L'V': case L'W': case L'X': case L'Y':
+        case L'Z':
+        case L'[': case L'\\': case L']': case L'^': case L'_':
+        case L'a': case L'b': case L'c': case L'd': case L'e':
+        case L'f': case L'g': case L'h': case L'i': case L'j':
+        case L'k': case L'l': case L'm': case L'n': case L'o':
+        case L'p': case L'q': case L'r': case L's': case L't':
+        case L'u': case L'v': case L'w': case L'x': case L'y':
+        case L'z': case L'{': case L'|': case L'}': case L'~':
+          break;
+        default:
+          return (wctype_t) 0;
+        }
 #  endif
 
       /* Avoid overrunning the buffer.  */
       if (cp == s + CHAR_CLASS_MAX_LENGTH)
-	return (wctype_t) 0;
+        return (wctype_t) 0;
 
       *cp++ = (char) *wcs++;
     }
@@ -287,58 +287,58 @@ fnmatch (const char *pattern, const char *string, int flags)
       int res;
 
       /* Calculate the size needed to convert the strings to
-	 wide characters.  */
+         wide characters.  */
       memset (&ps, '\0', sizeof (ps));
       patsize = mbsrtowcs (NULL, &pattern, 0, &ps) + 1;
       if (__builtin_expect (patsize != 0, 1))
-	{
-	  assert (mbsinit (&ps));
-	  strsize = mbsrtowcs (NULL, &string, 0, &ps) + 1;
-	  if (__builtin_expect (strsize != 0, 1))
-	    {
-	      assert (mbsinit (&ps));
-	      totsize = patsize + strsize;
-	      if (__builtin_expect (! (patsize <= totsize
-				       && totsize <= SIZE_MAX / sizeof (wchar_t)),
-				    0))
-		{
-		  errno = ENOMEM;
-		  return -1;
-		}
+        {
+          assert (mbsinit (&ps));
+          strsize = mbsrtowcs (NULL, &string, 0, &ps) + 1;
+          if (__builtin_expect (strsize != 0, 1))
+            {
+              assert (mbsinit (&ps));
+              totsize = patsize + strsize;
+              if (__builtin_expect (! (patsize <= totsize
+                                       && totsize <= SIZE_MAX / sizeof (wchar_t)),
+                                    0))
+                {
+                  errno = ENOMEM;
+                  return -1;
+                }
 
-	      /* Allocate room for the wide characters.  */
-	      if (__builtin_expect (totsize < ALLOCA_LIMIT, 1))
-		wpattern = (wchar_t *) alloca (totsize * sizeof (wchar_t));
-	      else
-		{
-		  wpattern = malloc (totsize * sizeof (wchar_t));
-		  if (__builtin_expect (! wpattern, 0))
-		    {
-		      errno = ENOMEM;
-		      return -1;
-		    }
-		}
-	      wstring = wpattern + patsize;
+              /* Allocate room for the wide characters.  */
+              if (__builtin_expect (totsize < ALLOCA_LIMIT, 1))
+                wpattern = (wchar_t *) alloca (totsize * sizeof (wchar_t));
+              else
+                {
+                  wpattern = malloc (totsize * sizeof (wchar_t));
+                  if (__builtin_expect (! wpattern, 0))
+                    {
+                      errno = ENOMEM;
+                      return -1;
+                    }
+                }
+              wstring = wpattern + patsize;
 
-	      /* Convert the strings into wide characters.  */
-	      mbsrtowcs (wpattern, &pattern, patsize, &ps);
-	      assert (mbsinit (&ps));
-	      mbsrtowcs (wstring, &string, strsize, &ps);
+              /* Convert the strings into wide characters.  */
+              mbsrtowcs (wpattern, &pattern, patsize, &ps);
+              assert (mbsinit (&ps));
+              mbsrtowcs (wstring, &string, strsize, &ps);
 
-	      res = internal_fnwmatch (wpattern, wstring, wstring + strsize - 1,
-				       flags & FNM_PERIOD, flags);
+              res = internal_fnwmatch (wpattern, wstring, wstring + strsize - 1,
+                                       flags & FNM_PERIOD, flags);
 
-	      if (__builtin_expect (! (totsize < ALLOCA_LIMIT), 0))
-		free (wpattern);
-	      return res;
-	    }
-	}
+              if (__builtin_expect (! (totsize < ALLOCA_LIMIT), 0))
+                free (wpattern);
+              return res;
+            }
+        }
     }
 
 # endif /* HANDLE_MULTIBYTE */
 
   return internal_fnmatch (pattern, string, string + strlen (string),
-			   flags & FNM_PERIOD, flags);
+                           flags & FNM_PERIOD, flags);
 }
 
 # ifdef _LIBC
@@ -351,4 +351,4 @@ compat_symbol (libc, __fnmatch_old, fnmatch, GLIBC_2_0);
 libc_hidden_ver (__fnmatch, fnmatch)
 # endif
 
-#endif	/* _LIBC or not __GNU_LIBRARY__.  */
+#endif  /* _LIBC or not __GNU_LIBRARY__.  */
diff --git a/gnulib/fnmatch_loop.c b/gnulib/fnmatch_loop.c
index c2182ffb0..8cd444404 100644
--- a/gnulib/fnmatch_loop.c
+++ b/gnulib/fnmatch_loop.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006
-   Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+   2003, 2004, 2005, 2006, 2009, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 /* Match STRING against the file name pattern PATTERN, returning zero if
    it matches, nonzero if not.  */
 static int EXT (INT opt, const CHAR *pattern, const CHAR *string,
-		const CHAR *string_end, bool no_leading_period, int flags)
+                const CHAR *string_end, bool no_leading_period, int flags)
      internal_function;
 static const CHAR *END (const CHAR *patternp) internal_function;
 
@@ -46,310 +46,310 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,
       c = FOLD (c);
 
       switch (c)
-	{
-	case L_('?'):
-	  if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
-	    {
-	      int res;
+        {
+        case L_('?'):
+          if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
+            {
+              int res;
 
-	      res = EXT (c, p, n, string_end, no_leading_period,
-			 flags);
-	      if (res != -1)
-		return res;
-	    }
+              res = EXT (c, p, n, string_end, no_leading_period,
+                         flags);
+              if (res != -1)
+                return res;
+            }
 
-	  if (n == string_end)
-	    return FNM_NOMATCH;
-	  else if (*n == L_('/') && (flags & FNM_FILE_NAME))
-	    return FNM_NOMATCH;
-	  else if (*n == L_('.') && no_leading_period)
-	    return FNM_NOMATCH;
-	  break;
+          if (n == string_end)
+            return FNM_NOMATCH;
+          else if (*n == L_('/') && (flags & FNM_FILE_NAME))
+            return FNM_NOMATCH;
+          else if (*n == L_('.') && no_leading_period)
+            return FNM_NOMATCH;
+          break;
 
-	case L_('\\'):
-	  if (!(flags & FNM_NOESCAPE))
-	    {
-	      c = *p++;
-	      if (c == L_('\0'))
-		/* Trailing \ loses.  */
-		return FNM_NOMATCH;
-	      c = FOLD (c);
-	    }
-	  if (n == string_end || FOLD ((UCHAR) *n) != c)
-	    return FNM_NOMATCH;
-	  break;
+        case L_('\\'):
+          if (!(flags & FNM_NOESCAPE))
+            {
+              c = *p++;
+              if (c == L_('\0'))
+                /* Trailing \ loses.  */
+                return FNM_NOMATCH;
+              c = FOLD (c);
+            }
+          if (n == string_end || FOLD ((UCHAR) *n) != c)
+            return FNM_NOMATCH;
+          break;
 
-	case L_('*'):
-	  if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
-	    {
-	      int res;
+        case L_('*'):
+          if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
+            {
+              int res;
 
-	      res = EXT (c, p, n, string_end, no_leading_period,
-			 flags);
-	      if (res != -1)
-		return res;
-	    }
+              res = EXT (c, p, n, string_end, no_leading_period,
+                         flags);
+              if (res != -1)
+                return res;
+            }
 
-	  if (n != string_end && *n == L_('.') && no_leading_period)
-	    return FNM_NOMATCH;
+          if (n != string_end && *n == L_('.') && no_leading_period)
+            return FNM_NOMATCH;
 
-	  for (c = *p++; c == L_('?') || c == L_('*'); c = *p++)
-	    {
-	      if (*p == L_('(') && (flags & FNM_EXTMATCH) != 0)
-		{
-		  const CHAR *endp = END (p);
-		  if (endp != p)
-		    {
-		      /* This is a pattern.  Skip over it.  */
-		      p = endp;
-		      continue;
-		    }
-		}
+          for (c = *p++; c == L_('?') || c == L_('*'); c = *p++)
+            {
+              if (*p == L_('(') && (flags & FNM_EXTMATCH) != 0)
+                {
+                  const CHAR *endp = END (p);
+                  if (endp != p)
+                    {
+                      /* This is a pattern.  Skip over it.  */
+                      p = endp;
+                      continue;
+                    }
+                }
 
-	      if (c == L_('?'))
-		{
-		  /* A ? needs to match one character.  */
-		  if (n == string_end)
-		    /* There isn't another character; no match.  */
-		    return FNM_NOMATCH;
-		  else if (*n == L_('/')
-			   && __builtin_expect (flags & FNM_FILE_NAME, 0))
-		    /* A slash does not match a wildcard under
-		       FNM_FILE_NAME.  */
-		    return FNM_NOMATCH;
-		  else
-		    /* One character of the string is consumed in matching
-		       this ? wildcard, so *??? won't match if there are
-		       less than three characters.  */
-		    ++n;
-		}
-	    }
+              if (c == L_('?'))
+                {
+                  /* A ? needs to match one character.  */
+                  if (n == string_end)
+                    /* There isn't another character; no match.  */
+                    return FNM_NOMATCH;
+                  else if (*n == L_('/')
+                           && __builtin_expect (flags & FNM_FILE_NAME, 0))
+                    /* A slash does not match a wildcard under
+                       FNM_FILE_NAME.  */
+                    return FNM_NOMATCH;
+                  else
+                    /* One character of the string is consumed in matching
+                       this ? wildcard, so *??? won't match if there are
+                       less than three characters.  */
+                    ++n;
+                }
+            }
 
-	  if (c == L_('\0'))
-	    /* The wildcard(s) is/are the last element of the pattern.
-	       If the name is a file name and contains another slash
-	       this means it cannot match, unless the FNM_LEADING_DIR
-	       flag is set.  */
-	    {
-	      int result = (flags & FNM_FILE_NAME) == 0 ? 0 : FNM_NOMATCH;
+          if (c == L_('\0'))
+            /* The wildcard(s) is/are the last element of the pattern.
+               If the name is a file name and contains another slash
+               this means it cannot match, unless the FNM_LEADING_DIR
+               flag is set.  */
+            {
+              int result = (flags & FNM_FILE_NAME) == 0 ? 0 : FNM_NOMATCH;
 
-	      if (flags & FNM_FILE_NAME)
-		{
-		  if (flags & FNM_LEADING_DIR)
-		    result = 0;
-		  else
-		    {
-		      if (MEMCHR (n, L_('/'), string_end - n) == NULL)
-			result = 0;
-		    }
-		}
+              if (flags & FNM_FILE_NAME)
+                {
+                  if (flags & FNM_LEADING_DIR)
+                    result = 0;
+                  else
+                    {
+                      if (MEMCHR (n, L_('/'), string_end - n) == NULL)
+                        result = 0;
+                    }
+                }
 
-	      return result;
-	    }
-	  else
-	    {
-	      const CHAR *endp;
+              return result;
+            }
+          else
+            {
+              const CHAR *endp;
 
-	      endp = MEMCHR (n, (flags & FNM_FILE_NAME) ? L_('/') : L_('\0'),
-			     string_end - n);
-	      if (endp == NULL)
-		endp = string_end;
+              endp = MEMCHR (n, (flags & FNM_FILE_NAME) ? L_('/') : L_('\0'),
+                             string_end - n);
+              if (endp == NULL)
+                endp = string_end;
 
-	      if (c == L_('[')
-		  || (__builtin_expect (flags & FNM_EXTMATCH, 0) != 0
-		      && (c == L_('@') || c == L_('+') || c == L_('!'))
-		      && *p == L_('(')))
-		{
-		  int flags2 = ((flags & FNM_FILE_NAME)
-				? flags : (flags & ~FNM_PERIOD));
-		  bool no_leading_period2 = no_leading_period;
+              if (c == L_('[')
+                  || (__builtin_expect (flags & FNM_EXTMATCH, 0) != 0
+                      && (c == L_('@') || c == L_('+') || c == L_('!'))
+                      && *p == L_('(')))
+                {
+                  int flags2 = ((flags & FNM_FILE_NAME)
+                                ? flags : (flags & ~FNM_PERIOD));
+                  bool no_leading_period2 = no_leading_period;
 
-		  for (--p; n < endp; ++n, no_leading_period2 = false)
-		    if (FCT (p, n, string_end, no_leading_period2, flags2)
-			== 0)
-		      return 0;
-		}
-	      else if (c == L_('/') && (flags & FNM_FILE_NAME))
-		{
-		  while (n < string_end && *n != L_('/'))
-		    ++n;
-		  if (n < string_end && *n == L_('/')
-		      && (FCT (p, n + 1, string_end, flags & FNM_PERIOD, flags)
-			  == 0))
-		    return 0;
-		}
-	      else
-		{
-		  int flags2 = ((flags & FNM_FILE_NAME)
-				? flags : (flags & ~FNM_PERIOD));
-		  int no_leading_period2 = no_leading_period;
+                  for (--p; n < endp; ++n, no_leading_period2 = false)
+                    if (FCT (p, n, string_end, no_leading_period2, flags2)
+                        == 0)
+                      return 0;
+                }
+              else if (c == L_('/') && (flags & FNM_FILE_NAME))
+                {
+                  while (n < string_end && *n != L_('/'))
+                    ++n;
+                  if (n < string_end && *n == L_('/')
+                      && (FCT (p, n + 1, string_end, flags & FNM_PERIOD, flags)
+                          == 0))
+                    return 0;
+                }
+              else
+                {
+                  int flags2 = ((flags & FNM_FILE_NAME)
+                                ? flags : (flags & ~FNM_PERIOD));
+                  int no_leading_period2 = no_leading_period;
 
-		  if (c == L_('\\') && !(flags & FNM_NOESCAPE))
-		    c = *p;
-		  c = FOLD (c);
-		  for (--p; n < endp; ++n, no_leading_period2 = false)
-		    if (FOLD ((UCHAR) *n) == c
-			&& (FCT (p, n, string_end, no_leading_period2, flags2)
-			    == 0))
-		      return 0;
-		}
-	    }
+                  if (c == L_('\\') && !(flags & FNM_NOESCAPE))
+                    c = *p;
+                  c = FOLD (c);
+                  for (--p; n < endp; ++n, no_leading_period2 = false)
+                    if (FOLD ((UCHAR) *n) == c
+                        && (FCT (p, n, string_end, no_leading_period2, flags2)
+                            == 0))
+                      return 0;
+                }
+            }
 
-	  /* If we come here no match is possible with the wildcard.  */
-	  return FNM_NOMATCH;
+          /* If we come here no match is possible with the wildcard.  */
+          return FNM_NOMATCH;
 
-	case L_('['):
-	  {
-	    /* Nonzero if the sense of the character class is inverted.  */
-	    register bool not;
-	    CHAR cold;
-	    UCHAR fn;
+        case L_('['):
+          {
+            /* Nonzero if the sense of the character class is inverted.  */
+            register bool not;
+            CHAR cold;
+            UCHAR fn;
 
-	    if (posixly_correct == 0)
-	      posixly_correct = getenv ("POSIXLY_CORRECT") != NULL ? 1 : -1;
+            if (posixly_correct == 0)
+              posixly_correct = getenv ("POSIXLY_CORRECT") != NULL ? 1 : -1;
 
-	    if (n == string_end)
-	      return FNM_NOMATCH;
+            if (n == string_end)
+              return FNM_NOMATCH;
 
-	    if (*n == L_('.') && no_leading_period)
-	      return FNM_NOMATCH;
+            if (*n == L_('.') && no_leading_period)
+              return FNM_NOMATCH;
 
-	    if (*n == L_('/') && (flags & FNM_FILE_NAME))
-	      /* `/' cannot be matched.  */
-	      return FNM_NOMATCH;
+            if (*n == L_('/') && (flags & FNM_FILE_NAME))
+              /* `/' cannot be matched.  */
+              return FNM_NOMATCH;
 
-	    not = (*p == L_('!') || (posixly_correct < 0 && *p == L_('^')));
-	    if (not)
-	      ++p;
+            not = (*p == L_('!') || (posixly_correct < 0 && *p == L_('^')));
+            if (not)
+              ++p;
 
-	    fn = FOLD ((UCHAR) *n);
+            fn = FOLD ((UCHAR) *n);
 
-	    c = *p++;
-	    for (;;)
-	      {
-		if (!(flags & FNM_NOESCAPE) && c == L_('\\'))
-		  {
-		    if (*p == L_('\0'))
-		      return FNM_NOMATCH;
-		    c = FOLD ((UCHAR) *p);
-		    ++p;
+            c = *p++;
+            for (;;)
+              {
+                if (!(flags & FNM_NOESCAPE) && c == L_('\\'))
+                  {
+                    if (*p == L_('\0'))
+                      return FNM_NOMATCH;
+                    c = FOLD ((UCHAR) *p);
+                    ++p;
 
-		    goto normal_bracket;
-		  }
-		else if (c == L_('[') && *p == L_(':'))
-		  {
-		    /* Leave room for the null.  */
-		    CHAR str[CHAR_CLASS_MAX_LENGTH + 1];
-		    size_t c1 = 0;
+                    goto normal_bracket;
+                  }
+                else if (c == L_('[') && *p == L_(':'))
+                  {
+                    /* Leave room for the null.  */
+                    CHAR str[CHAR_CLASS_MAX_LENGTH + 1];
+                    size_t c1 = 0;
 #if defined _LIBC || WIDE_CHAR_SUPPORT
-		    wctype_t wt;
+                    wctype_t wt;
 #endif
-		    const CHAR *startp = p;
+                    const CHAR *startp = p;
 
-		    for (;;)
-		      {
-			if (c1 == CHAR_CLASS_MAX_LENGTH)
-			  /* The name is too long and therefore the pattern
-			     is ill-formed.  */
-			  return FNM_NOMATCH;
+                    for (;;)
+                      {
+                        if (c1 == CHAR_CLASS_MAX_LENGTH)
+                          /* The name is too long and therefore the pattern
+                             is ill-formed.  */
+                          return FNM_NOMATCH;
 
-			c = *++p;
-			if (c == L_(':') && p[1] == L_(']'))
-			  {
-			    p += 2;
-			    break;
-			  }
-			if (c < L_('a') || c >= L_('z'))
-			  {
-			    /* This cannot possibly be a character class name.
-			       Match it as a normal range.  */
-			    p = startp;
-			    c = L_('[');
-			    goto normal_bracket;
-			  }
-			str[c1++] = c;
-		      }
-		    str[c1] = L_('\0');
+                        c = *++p;
+                        if (c == L_(':') && p[1] == L_(']'))
+                          {
+                            p += 2;
+                            break;
+                          }
+                        if (c < L_('a') || c >= L_('z'))
+                          {
+                            /* This cannot possibly be a character class name.
+                               Match it as a normal range.  */
+                            p = startp;
+                            c = L_('[');
+                            goto normal_bracket;
+                          }
+                        str[c1++] = c;
+                      }
+                    str[c1] = L_('\0');
 
 #if defined _LIBC || WIDE_CHAR_SUPPORT
-		    wt = IS_CHAR_CLASS (str);
-		    if (wt == 0)
-		      /* Invalid character class name.  */
-		      return FNM_NOMATCH;
+                    wt = IS_CHAR_CLASS (str);
+                    if (wt == 0)
+                      /* Invalid character class name.  */
+                      return FNM_NOMATCH;
 
 # if defined _LIBC && ! WIDE_CHAR_VERSION
-		    /* The following code is glibc specific but does
-		       there a good job in speeding up the code since
-		       we can avoid the btowc() call.  */
-		    if (_ISCTYPE ((UCHAR) *n, wt))
-		      goto matched;
+                    /* The following code is glibc specific but does
+                       there a good job in speeding up the code since
+                       we can avoid the btowc() call.  */
+                    if (_ISCTYPE ((UCHAR) *n, wt))
+                      goto matched;
 # else
-		    if (ISWCTYPE (BTOWC ((UCHAR) *n), wt))
-		      goto matched;
+                    if (ISWCTYPE (BTOWC ((UCHAR) *n), wt))
+                      goto matched;
 # endif
 #else
-		    if ((STREQ (str, L_("alnum")) && isalnum ((UCHAR) *n))
-			|| (STREQ (str, L_("alpha")) && isalpha ((UCHAR) *n))
-			|| (STREQ (str, L_("blank")) && isblank ((UCHAR) *n))
-			|| (STREQ (str, L_("cntrl")) && iscntrl ((UCHAR) *n))
-			|| (STREQ (str, L_("digit")) && isdigit ((UCHAR) *n))
-			|| (STREQ (str, L_("graph")) && isgraph ((UCHAR) *n))
-			|| (STREQ (str, L_("lower")) && islower ((UCHAR) *n))
-			|| (STREQ (str, L_("print")) && isprint ((UCHAR) *n))
-			|| (STREQ (str, L_("punct")) && ispunct ((UCHAR) *n))
-			|| (STREQ (str, L_("space")) && isspace ((UCHAR) *n))
-			|| (STREQ (str, L_("upper")) && isupper ((UCHAR) *n))
-			|| (STREQ (str, L_("xdigit")) && isxdigit ((UCHAR) *n)))
-		      goto matched;
+                    if ((STREQ (str, L_("alnum")) && isalnum ((UCHAR) *n))
+                        || (STREQ (str, L_("alpha")) && isalpha ((UCHAR) *n))
+                        || (STREQ (str, L_("blank")) && isblank ((UCHAR) *n))
+                        || (STREQ (str, L_("cntrl")) && iscntrl ((UCHAR) *n))
+                        || (STREQ (str, L_("digit")) && isdigit ((UCHAR) *n))
+                        || (STREQ (str, L_("graph")) && isgraph ((UCHAR) *n))
+                        || (STREQ (str, L_("lower")) && islower ((UCHAR) *n))
+                        || (STREQ (str, L_("print")) && isprint ((UCHAR) *n))
+                        || (STREQ (str, L_("punct")) && ispunct ((UCHAR) *n))
+                        || (STREQ (str, L_("space")) && isspace ((UCHAR) *n))
+                        || (STREQ (str, L_("upper")) && isupper ((UCHAR) *n))
+                        || (STREQ (str, L_("xdigit")) && isxdigit ((UCHAR) *n)))
+                      goto matched;
 #endif
-		    c = *p++;
-		  }
+                    c = *p++;
+                  }
 #ifdef _LIBC
-		else if (c == L_('[') && *p == L_('='))
-		  {
-		    UCHAR str[1];
-		    uint32_t nrules =
-		      _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
-		    const CHAR *startp = p;
+                else if (c == L_('[') && *p == L_('='))
+                  {
+                    UCHAR str[1];
+                    uint32_t nrules =
+                      _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+                    const CHAR *startp = p;
 
-		    c = *++p;
-		    if (c == L_('\0'))
-		      {
-			p = startp;
-			c = L_('[');
-			goto normal_bracket;
-		      }
-		    str[0] = c;
+                    c = *++p;
+                    if (c == L_('\0'))
+                      {
+                        p = startp;
+                        c = L_('[');
+                        goto normal_bracket;
+                      }
+                    str[0] = c;
 
-		    c = *++p;
-		    if (c != L_('=') || p[1] != L_(']'))
-		      {
-			p = startp;
-			c = L_('[');
-			goto normal_bracket;
-		      }
-		    p += 2;
+                    c = *++p;
+                    if (c != L_('=') || p[1] != L_(']'))
+                      {
+                        p = startp;
+                        c = L_('[');
+                        goto normal_bracket;
+                      }
+                    p += 2;
 
-		    if (nrules == 0)
-		      {
-			if ((UCHAR) *n == str[0])
-			  goto matched;
-		      }
-		    else
-		      {
-			const int32_t *table;
+                    if (nrules == 0)
+                      {
+                        if ((UCHAR) *n == str[0])
+                          goto matched;
+                      }
+                    else
+                      {
+                        const int32_t *table;
 # if WIDE_CHAR_VERSION
-			const int32_t *weights;
-			const int32_t *extra;
+                        const int32_t *weights;
+                        const int32_t *extra;
 # else
-			const unsigned char *weights;
-			const unsigned char *extra;
+                        const unsigned char *weights;
+                        const unsigned char *extra;
 # endif
-			const int32_t *indirect;
-			int32_t idx;
-			const UCHAR *cp = (const UCHAR *) str;
+                        const int32_t *indirect;
+                        int32_t idx;
+                        const UCHAR *cp = (const UCHAR *) str;
 
-			/* This #include defines a local function!  */
+                        /* This #include defines a local function!  */
 # if WIDE_CHAR_VERSION
 #  include <locale/weightwc.h>
 # else
@@ -357,605 +357,610 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,
 # endif
 
 # if WIDE_CHAR_VERSION
-			table = (const int32_t *)
-			  _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEWC);
-			weights = (const int32_t *)
-			  _NL_CURRENT (LC_COLLATE, _NL_COLLATE_WEIGHTWC);
-			extra = (const int32_t *)
-			  _NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAWC);
-			indirect = (const int32_t *)
-			  _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTWC);
+                        table = (const int32_t *)
+                          _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEWC);
+                        weights = (const int32_t *)
+                          _NL_CURRENT (LC_COLLATE, _NL_COLLATE_WEIGHTWC);
+                        extra = (const int32_t *)
+                          _NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAWC);
+                        indirect = (const int32_t *)
+                          _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTWC);
 # else
-			table = (const int32_t *)
-			  _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
-			weights = (const unsigned char *)
-			  _NL_CURRENT (LC_COLLATE, _NL_COLLATE_WEIGHTMB);
-			extra = (const unsigned char *)
-			  _NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB);
-			indirect = (const int32_t *)
-			  _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
+                        table = (const int32_t *)
+                          _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
+                        weights = (const unsigned char *)
+                          _NL_CURRENT (LC_COLLATE, _NL_COLLATE_WEIGHTMB);
+                        extra = (const unsigned char *)
+                          _NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB);
+                        indirect = (const int32_t *)
+                          _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
 # endif
 
-			idx = findidx (&cp);
-			if (idx != 0)
-			  {
-			    /* We found a table entry.  Now see whether the
-			       character we are currently at has the same
-			       equivalance class value.  */
-			    int len = weights[idx];
-			    int32_t idx2;
-			    const UCHAR *np = (const UCHAR *) n;
+                        idx = findidx (&cp);
+                        if (idx != 0)
+                          {
+                            /* We found a table entry.  Now see whether the
+                               character we are currently at has the same
+                               equivalance class value.  */
+                            int len = weights[idx & 0xffffff];
+                            int32_t idx2;
+                            const UCHAR *np = (const UCHAR *) n;
 
-			    idx2 = findidx (&np);
-			    if (idx2 != 0 && len == weights[idx2])
-			      {
-				int cnt = 0;
+                            idx2 = findidx (&np);
+                            if (idx2 != 0
+                                && (idx >> 24) == (idx2 >> 24)
+                                && len == weights[idx2 & 0xffffff])
+                              {
+                                int cnt = 0;
 
-				while (cnt < len
-				       && (weights[idx + 1 + cnt]
-					   == weights[idx2 + 1 + cnt]))
-				  ++cnt;
+                                idx &= 0xffffff;
+                                idx2 &= 0xffffff;
 
-				if (cnt == len)
-				  goto matched;
-			      }
-			  }
-		      }
+                                while (cnt < len
+                                       && (weights[idx + 1 + cnt]
+                                           == weights[idx2 + 1 + cnt]))
+                                  ++cnt;
 
-		    c = *p++;
-		  }
+                                if (cnt == len)
+                                  goto matched;
+                              }
+                          }
+                      }
+
+                    c = *p++;
+                  }
 #endif
-		else if (c == L_('\0'))
-		  /* [ (unterminated) loses.  */
-		  return FNM_NOMATCH;
-		else
-		  {
-		    bool is_range = false;
+                else if (c == L_('\0'))
+                  /* [ (unterminated) loses.  */
+                  return FNM_NOMATCH;
+                else
+                  {
+                    bool is_range = false;
 
 #ifdef _LIBC
-		    bool is_seqval = false;
+                    bool is_seqval = false;
 
-		    if (c == L_('[') && *p == L_('.'))
-		      {
-			uint32_t nrules =
-			  _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
-			const CHAR *startp = p;
-			size_t c1 = 0;
+                    if (c == L_('[') && *p == L_('.'))
+                      {
+                        uint32_t nrules =
+                          _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+                        const CHAR *startp = p;
+                        size_t c1 = 0;
 
-			while (1)
-			  {
-			    c = *++p;
-			    if (c == L_('.') && p[1] == L_(']'))
-			      {
-				p += 2;
-				break;
-			      }
-			    if (c == '\0')
-			      return FNM_NOMATCH;
-			    ++c1;
-			  }
+                        while (1)
+                          {
+                            c = *++p;
+                            if (c == L_('.') && p[1] == L_(']'))
+                              {
+                                p += 2;
+                                break;
+                              }
+                            if (c == '\0')
+                              return FNM_NOMATCH;
+                            ++c1;
+                          }
 
-			/* We have to handling the symbols differently in
-			   ranges since then the collation sequence is
-			   important.  */
-			is_range = *p == L_('-') && p[1] != L_('\0');
+                        /* We have to handling the symbols differently in
+                           ranges since then the collation sequence is
+                           important.  */
+                        is_range = *p == L_('-') && p[1] != L_('\0');
 
-			if (nrules == 0)
-			  {
-			    /* There are no names defined in the collation
-			       data.  Therefore we only accept the trivial
-			       names consisting of the character itself.  */
-			    if (c1 != 1)
-			      return FNM_NOMATCH;
+                        if (nrules == 0)
+                          {
+                            /* There are no names defined in the collation
+                               data.  Therefore we only accept the trivial
+                               names consisting of the character itself.  */
+                            if (c1 != 1)
+                              return FNM_NOMATCH;
 
-			    if (!is_range && *n == startp[1])
-			      goto matched;
+                            if (!is_range && *n == startp[1])
+                              goto matched;
 
-			    cold = startp[1];
-			    c = *p++;
-			  }
-			else
-			  {
-			    int32_t table_size;
-			    const int32_t *symb_table;
+                            cold = startp[1];
+                            c = *p++;
+                          }
+                        else
+                          {
+                            int32_t table_size;
+                            const int32_t *symb_table;
 # ifdef WIDE_CHAR_VERSION
-			    char str[c1];
-			    size_t strcnt;
+                            char str[c1];
+                            size_t strcnt;
 # else
 #  define str (startp + 1)
 # endif
-			    const unsigned char *extra;
-			    int32_t idx;
-			    int32_t elem;
-			    int32_t second;
-			    int32_t hash;
+                            const unsigned char *extra;
+                            int32_t idx;
+                            int32_t elem;
+                            int32_t second;
+                            int32_t hash;
 
 # ifdef WIDE_CHAR_VERSION
-			    /* We have to convert the name to a single-byte
-			       string.  This is possible since the names
-			       consist of ASCII characters and the internal
-			       representation is UCS4.  */
-			    for (strcnt = 0; strcnt < c1; ++strcnt)
-			      str[strcnt] = startp[1 + strcnt];
+                            /* We have to convert the name to a single-byte
+                               string.  This is possible since the names
+                               consist of ASCII characters and the internal
+                               representation is UCS4.  */
+                            for (strcnt = 0; strcnt < c1; ++strcnt)
+                              str[strcnt] = startp[1 + strcnt];
 # endif
 
-			    table_size =
-			      _NL_CURRENT_WORD (LC_COLLATE,
-						_NL_COLLATE_SYMB_HASH_SIZEMB);
-			    symb_table = (const int32_t *)
-			      _NL_CURRENT (LC_COLLATE,
-					   _NL_COLLATE_SYMB_TABLEMB);
-			    extra = (const unsigned char *)
-			      _NL_CURRENT (LC_COLLATE,
-					   _NL_COLLATE_SYMB_EXTRAMB);
+                            table_size =
+                              _NL_CURRENT_WORD (LC_COLLATE,
+                                                _NL_COLLATE_SYMB_HASH_SIZEMB);
+                            symb_table = (const int32_t *)
+                              _NL_CURRENT (LC_COLLATE,
+                                           _NL_COLLATE_SYMB_TABLEMB);
+                            extra = (const unsigned char *)
+                              _NL_CURRENT (LC_COLLATE,
+                                           _NL_COLLATE_SYMB_EXTRAMB);
 
-			    /* Locate the character in the hashing table.  */
-			    hash = elem_hash (str, c1);
+                            /* Locate the character in the hashing table.  */
+                            hash = elem_hash (str, c1);
 
-			    idx = 0;
-			    elem = hash % table_size;
-			    if (symb_table[2 * elem] != 0)
-			      {
-				second = hash % (table_size - 2) + 1;
+                            idx = 0;
+                            elem = hash % table_size;
+                            if (symb_table[2 * elem] != 0)
+                              {
+                                second = hash % (table_size - 2) + 1;
 
-				do
-				  {
-				    /* First compare the hashing value.  */
-				    if (symb_table[2 * elem] == hash
-					&& (c1
-					    == extra[symb_table[2 * elem + 1]])
-					&& memcmp (str,
-						   &extra[symb_table[2 * elem
-								     + 1]
-							  + 1], c1) == 0)
-				      {
-					/* Yep, this is the entry.  */
-					idx = symb_table[2 * elem + 1];
-					idx += 1 + extra[idx];
-					break;
-				      }
+                                do
+                                  {
+                                    /* First compare the hashing value.  */
+                                    if (symb_table[2 * elem] == hash
+                                        && (c1
+                                            == extra[symb_table[2 * elem + 1]])
+                                        && memcmp (str,
+                                                   &extra[symb_table[2 * elem
+                                                                     + 1]
+                                                          + 1], c1) == 0)
+                                      {
+                                        /* Yep, this is the entry.  */
+                                        idx = symb_table[2 * elem + 1];
+                                        idx += 1 + extra[idx];
+                                        break;
+                                      }
 
-				    /* Next entry.  */
-				    elem += second;
-				  }
-				while (symb_table[2 * elem] != 0);
-			      }
+                                    /* Next entry.  */
+                                    elem += second;
+                                  }
+                                while (symb_table[2 * elem] != 0);
+                              }
 
-			    if (symb_table[2 * elem] != 0)
-			      {
-				/* Compare the byte sequence but only if
-				   this is not part of a range.  */
+                            if (symb_table[2 * elem] != 0)
+                              {
+                                /* Compare the byte sequence but only if
+                                   this is not part of a range.  */
 # ifdef WIDE_CHAR_VERSION
-				int32_t *wextra;
+                                int32_t *wextra;
 
-				idx += 1 + extra[idx];
-				/* Adjust for the alignment.  */
-				idx = (idx + 3) & ~3;
+                                idx += 1 + extra[idx];
+                                /* Adjust for the alignment.  */
+                                idx = (idx + 3) & ~3;
 
-				wextra = (int32_t *) &extra[idx + 4];
+                                wextra = (int32_t *) &extra[idx + 4];
 # endif
 
-				if (! is_range)
-				  {
+                                if (! is_range)
+                                  {
 # ifdef WIDE_CHAR_VERSION
-				    for (c1 = 0;
-					 (int32_t) c1 < wextra[idx];
-					 ++c1)
-				      if (n[c1] != wextra[1 + c1])
-					break;
+                                    for (c1 = 0;
+                                         (int32_t) c1 < wextra[idx];
+                                         ++c1)
+                                      if (n[c1] != wextra[1 + c1])
+                                        break;
 
-				    if ((int32_t) c1 == wextra[idx])
-				      goto matched;
+                                    if ((int32_t) c1 == wextra[idx])
+                                      goto matched;
 # else
-				    for (c1 = 0; c1 < extra[idx]; ++c1)
-				      if (n[c1] != extra[1 + c1])
-					break;
+                                    for (c1 = 0; c1 < extra[idx]; ++c1)
+                                      if (n[c1] != extra[1 + c1])
+                                        break;
 
-				    if (c1 == extra[idx])
-				      goto matched;
+                                    if (c1 == extra[idx])
+                                      goto matched;
 # endif
-				  }
+                                  }
 
-				/* Get the collation sequence value.  */
-				is_seqval = true;
+                                /* Get the collation sequence value.  */
+                                is_seqval = true;
 # ifdef WIDE_CHAR_VERSION
-				cold = wextra[1 + wextra[idx]];
+                                cold = wextra[1 + wextra[idx]];
 # else
-				/* Adjust for the alignment.  */
-				idx += 1 + extra[idx];
-				idx = (idx + 3) & ~4;
-				cold = *((int32_t *) &extra[idx]);
+                                /* Adjust for the alignment.  */
+                                idx += 1 + extra[idx];
+                                idx = (idx + 3) & ~4;
+                                cold = *((int32_t *) &extra[idx]);
 # endif
 
-				c = *p++;
-			      }
-			    else if (c1 == 1)
-			      {
-				/* No valid character.  Match it as a
-				   single byte.  */
-				if (!is_range && *n == str[0])
-				  goto matched;
+                                c = *p++;
+                              }
+                            else if (c1 == 1)
+                              {
+                                /* No valid character.  Match it as a
+                                   single byte.  */
+                                if (!is_range && *n == str[0])
+                                  goto matched;
 
-				cold = str[0];
-				c = *p++;
-			      }
-			    else
-			      return FNM_NOMATCH;
-			  }
-		      }
-		    else
+                                cold = str[0];
+                                c = *p++;
+                              }
+                            else
+                              return FNM_NOMATCH;
+                          }
+                      }
+                    else
 # undef str
 #endif
-		      {
-			c = FOLD (c);
-		      normal_bracket:
+                      {
+                        c = FOLD (c);
+                      normal_bracket:
 
-			/* We have to handling the symbols differently in
-			   ranges since then the collation sequence is
-			   important.  */
-			is_range = (*p == L_('-') && p[1] != L_('\0')
-				    && p[1] != L_(']'));
+                        /* We have to handling the symbols differently in
+                           ranges since then the collation sequence is
+                           important.  */
+                        is_range = (*p == L_('-') && p[1] != L_('\0')
+                                    && p[1] != L_(']'));
 
-			if (!is_range && c == fn)
-			  goto matched;
+                        if (!is_range && c == fn)
+                          goto matched;
 
 #if _LIBC
-			/* This is needed if we goto normal_bracket; from
-			   outside of is_seqval's scope.  */
-			is_seqval = false;
+                        /* This is needed if we goto normal_bracket; from
+                           outside of is_seqval's scope.  */
+                        is_seqval = false;
 #endif
 
-			cold = c;
-			c = *p++;
-		      }
+                        cold = c;
+                        c = *p++;
+                      }
 
-		    if (c == L_('-') && *p != L_(']'))
-		      {
+                    if (c == L_('-') && *p != L_(']'))
+                      {
 #if _LIBC
-			/* We have to find the collation sequence
-			   value for C.  Collation sequence is nothing
-			   we can regularly access.  The sequence
-			   value is defined by the order in which the
-			   definitions of the collation values for the
-			   various characters appear in the source
-			   file.  A strange concept, nowhere
-			   documented.  */
-			uint32_t fcollseq;
-			uint32_t lcollseq;
-			UCHAR cend = *p++;
+                        /* We have to find the collation sequence
+                           value for C.  Collation sequence is nothing
+                           we can regularly access.  The sequence
+                           value is defined by the order in which the
+                           definitions of the collation values for the
+                           various characters appear in the source
+                           file.  A strange concept, nowhere
+                           documented.  */
+                        uint32_t fcollseq;
+                        uint32_t lcollseq;
+                        UCHAR cend = *p++;
 
 # ifdef WIDE_CHAR_VERSION
-			/* Search in the `names' array for the characters.  */
-			fcollseq = __collseq_table_lookup (collseq, fn);
-			if (fcollseq == ~((uint32_t) 0))
-			  /* XXX We don't know anything about the character
-			     we are supposed to match.  This means we are
-			     failing.  */
-			  goto range_not_matched;
+                        /* Search in the `names' array for the characters.  */
+                        fcollseq = __collseq_table_lookup (collseq, fn);
+                        if (fcollseq == ~((uint32_t) 0))
+                          /* XXX We don't know anything about the character
+                             we are supposed to match.  This means we are
+                             failing.  */
+                          goto range_not_matched;
 
-			if (is_seqval)
-			  lcollseq = cold;
-			else
-			  lcollseq = __collseq_table_lookup (collseq, cold);
+                        if (is_seqval)
+                          lcollseq = cold;
+                        else
+                          lcollseq = __collseq_table_lookup (collseq, cold);
 # else
-			fcollseq = collseq[fn];
-			lcollseq = is_seqval ? cold : collseq[(UCHAR) cold];
+                        fcollseq = collseq[fn];
+                        lcollseq = is_seqval ? cold : collseq[(UCHAR) cold];
 # endif
 
-			is_seqval = false;
-			if (cend == L_('[') && *p == L_('.'))
-			  {
-			    uint32_t nrules =
-			      _NL_CURRENT_WORD (LC_COLLATE,
-						_NL_COLLATE_NRULES);
-			    const CHAR *startp = p;
-			    size_t c1 = 0;
+                        is_seqval = false;
+                        if (cend == L_('[') && *p == L_('.'))
+                          {
+                            uint32_t nrules =
+                              _NL_CURRENT_WORD (LC_COLLATE,
+                                                _NL_COLLATE_NRULES);
+                            const CHAR *startp = p;
+                            size_t c1 = 0;
 
-			    while (1)
-			      {
-				c = *++p;
-				if (c == L_('.') && p[1] == L_(']'))
-				  {
-				    p += 2;
-				    break;
-				  }
-				if (c == '\0')
-				  return FNM_NOMATCH;
-				++c1;
-			      }
+                            while (1)
+                              {
+                                c = *++p;
+                                if (c == L_('.') && p[1] == L_(']'))
+                                  {
+                                    p += 2;
+                                    break;
+                                  }
+                                if (c == '\0')
+                                  return FNM_NOMATCH;
+                                ++c1;
+                              }
 
-			    if (nrules == 0)
-			      {
-				/* There are no names defined in the
-				   collation data.  Therefore we only
-				   accept the trivial names consisting
-				   of the character itself.  */
-				if (c1 != 1)
-				  return FNM_NOMATCH;
+                            if (nrules == 0)
+                              {
+                                /* There are no names defined in the
+                                   collation data.  Therefore we only
+                                   accept the trivial names consisting
+                                   of the character itself.  */
+                                if (c1 != 1)
+                                  return FNM_NOMATCH;
 
-				cend = startp[1];
-			      }
-			    else
-			      {
-				int32_t table_size;
-				const int32_t *symb_table;
+                                cend = startp[1];
+                              }
+                            else
+                              {
+                                int32_t table_size;
+                                const int32_t *symb_table;
 # ifdef WIDE_CHAR_VERSION
-				char str[c1];
-				size_t strcnt;
+                                char str[c1];
+                                size_t strcnt;
 # else
 #  define str (startp + 1)
 # endif
-				const unsigned char *extra;
-				int32_t idx;
-				int32_t elem;
-				int32_t second;
-				int32_t hash;
+                                const unsigned char *extra;
+                                int32_t idx;
+                                int32_t elem;
+                                int32_t second;
+                                int32_t hash;
 
 # ifdef WIDE_CHAR_VERSION
-				/* We have to convert the name to a single-byte
-				   string.  This is possible since the names
-				   consist of ASCII characters and the internal
-				   representation is UCS4.  */
-				for (strcnt = 0; strcnt < c1; ++strcnt)
-				  str[strcnt] = startp[1 + strcnt];
+                                /* We have to convert the name to a single-byte
+                                   string.  This is possible since the names
+                                   consist of ASCII characters and the internal
+                                   representation is UCS4.  */
+                                for (strcnt = 0; strcnt < c1; ++strcnt)
+                                  str[strcnt] = startp[1 + strcnt];
 # endif
 
-				table_size =
-				  _NL_CURRENT_WORD (LC_COLLATE,
-						    _NL_COLLATE_SYMB_HASH_SIZEMB);
-				symb_table = (const int32_t *)
-				  _NL_CURRENT (LC_COLLATE,
-					       _NL_COLLATE_SYMB_TABLEMB);
-				extra = (const unsigned char *)
-				  _NL_CURRENT (LC_COLLATE,
-					       _NL_COLLATE_SYMB_EXTRAMB);
+                                table_size =
+                                  _NL_CURRENT_WORD (LC_COLLATE,
+                                                    _NL_COLLATE_SYMB_HASH_SIZEMB);
+                                symb_table = (const int32_t *)
+                                  _NL_CURRENT (LC_COLLATE,
+                                               _NL_COLLATE_SYMB_TABLEMB);
+                                extra = (const unsigned char *)
+                                  _NL_CURRENT (LC_COLLATE,
+                                               _NL_COLLATE_SYMB_EXTRAMB);
 
-				/* Locate the character in the hashing
+                                /* Locate the character in the hashing
                                    table.  */
-				hash = elem_hash (str, c1);
+                                hash = elem_hash (str, c1);
 
-				idx = 0;
-				elem = hash % table_size;
-				if (symb_table[2 * elem] != 0)
-				  {
-				    second = hash % (table_size - 2) + 1;
+                                idx = 0;
+                                elem = hash % table_size;
+                                if (symb_table[2 * elem] != 0)
+                                  {
+                                    second = hash % (table_size - 2) + 1;
 
-				    do
-				      {
-					/* First compare the hashing value.  */
-					if (symb_table[2 * elem] == hash
-					    && (c1
-						== extra[symb_table[2 * elem + 1]])
-					    && memcmp (str,
-						       &extra[symb_table[2 * elem + 1]
-							      + 1], c1) == 0)
-					  {
-					    /* Yep, this is the entry.  */
-					    idx = symb_table[2 * elem + 1];
-					    idx += 1 + extra[idx];
-					    break;
-					  }
+                                    do
+                                      {
+                                        /* First compare the hashing value.  */
+                                        if (symb_table[2 * elem] == hash
+                                            && (c1
+                                                == extra[symb_table[2 * elem + 1]])
+                                            && memcmp (str,
+                                                       &extra[symb_table[2 * elem + 1]
+                                                              + 1], c1) == 0)
+                                          {
+                                            /* Yep, this is the entry.  */
+                                            idx = symb_table[2 * elem + 1];
+                                            idx += 1 + extra[idx];
+                                            break;
+                                          }
 
-					/* Next entry.  */
-					elem += second;
-				      }
-				    while (symb_table[2 * elem] != 0);
-				  }
+                                        /* Next entry.  */
+                                        elem += second;
+                                      }
+                                    while (symb_table[2 * elem] != 0);
+                                  }
 
-				if (symb_table[2 * elem] != 0)
-				  {
-				    /* Compare the byte sequence but only if
-				       this is not part of a range.  */
+                                if (symb_table[2 * elem] != 0)
+                                  {
+                                    /* Compare the byte sequence but only if
+                                       this is not part of a range.  */
 # ifdef WIDE_CHAR_VERSION
-				    int32_t *wextra;
+                                    int32_t *wextra;
 
-				    idx += 1 + extra[idx];
-				    /* Adjust for the alignment.  */
-				    idx = (idx + 3) & ~4;
+                                    idx += 1 + extra[idx];
+                                    /* Adjust for the alignment.  */
+                                    idx = (idx + 3) & ~4;
 
-				    wextra = (int32_t *) &extra[idx + 4];
+                                    wextra = (int32_t *) &extra[idx + 4];
 # endif
-				    /* Get the collation sequence value.  */
-				    is_seqval = true;
+                                    /* Get the collation sequence value.  */
+                                    is_seqval = true;
 # ifdef WIDE_CHAR_VERSION
-				    cend = wextra[1 + wextra[idx]];
+                                    cend = wextra[1 + wextra[idx]];
 # else
-				    /* Adjust for the alignment.  */
-				    idx += 1 + extra[idx];
-				    idx = (idx + 3) & ~4;
-				    cend = *((int32_t *) &extra[idx]);
+                                    /* Adjust for the alignment.  */
+                                    idx += 1 + extra[idx];
+                                    idx = (idx + 3) & ~4;
+                                    cend = *((int32_t *) &extra[idx]);
 # endif
-				  }
-				else if (symb_table[2 * elem] != 0 && c1 == 1)
-				  {
-				    cend = str[0];
-				    c = *p++;
-				  }
-				else
-				  return FNM_NOMATCH;
-			      }
+                                  }
+                                else if (symb_table[2 * elem] != 0 && c1 == 1)
+                                  {
+                                    cend = str[0];
+                                    c = *p++;
+                                  }
+                                else
+                                  return FNM_NOMATCH;
+                              }
 # undef str
-			  }
-			else
-			  {
-			    if (!(flags & FNM_NOESCAPE) && cend == L_('\\'))
-			      cend = *p++;
-			    if (cend == L_('\0'))
-			      return FNM_NOMATCH;
-			    cend = FOLD (cend);
-			  }
+                          }
+                        else
+                          {
+                            if (!(flags & FNM_NOESCAPE) && cend == L_('\\'))
+                              cend = *p++;
+                            if (cend == L_('\0'))
+                              return FNM_NOMATCH;
+                            cend = FOLD (cend);
+                          }
 
-			/* XXX It is not entirely clear to me how to handle
-			   characters which are not mentioned in the
-			   collation specification.  */
-			if (
+                        /* XXX It is not entirely clear to me how to handle
+                           characters which are not mentioned in the
+                           collation specification.  */
+                        if (
 # ifdef WIDE_CHAR_VERSION
-			    lcollseq == 0xffffffff ||
+                            lcollseq == 0xffffffff ||
 # endif
-			    lcollseq <= fcollseq)
-			  {
-			    /* We have to look at the upper bound.  */
-			    uint32_t hcollseq;
+                            lcollseq <= fcollseq)
+                          {
+                            /* We have to look at the upper bound.  */
+                            uint32_t hcollseq;
 
-			    if (is_seqval)
-			      hcollseq = cend;
-			    else
-			      {
+                            if (is_seqval)
+                              hcollseq = cend;
+                            else
+                              {
 # ifdef WIDE_CHAR_VERSION
-				hcollseq =
-				  __collseq_table_lookup (collseq, cend);
-				if (hcollseq == ~((uint32_t) 0))
-				  {
-				    /* Hum, no information about the upper
-				       bound.  The matching succeeds if the
-				       lower bound is matched exactly.  */
-				    if (lcollseq != fcollseq)
-				      goto range_not_matched;
+                                hcollseq =
+                                  __collseq_table_lookup (collseq, cend);
+                                if (hcollseq == ~((uint32_t) 0))
+                                  {
+                                    /* Hum, no information about the upper
+                                       bound.  The matching succeeds if the
+                                       lower bound is matched exactly.  */
+                                    if (lcollseq != fcollseq)
+                                      goto range_not_matched;
 
-				    goto matched;
-				  }
+                                    goto matched;
+                                  }
 # else
-				hcollseq = collseq[cend];
+                                hcollseq = collseq[cend];
 # endif
-			      }
+                              }
 
-			    if (lcollseq <= hcollseq && fcollseq <= hcollseq)
-			      goto matched;
-			  }
+                            if (lcollseq <= hcollseq && fcollseq <= hcollseq)
+                              goto matched;
+                          }
 # ifdef WIDE_CHAR_VERSION
-		      range_not_matched:
+                      range_not_matched:
 # endif
 #else
-			/* We use a boring value comparison of the character
-			   values.  This is better than comparing using
-			   `strcoll' since the latter would have surprising
-			   and sometimes fatal consequences.  */
-			UCHAR cend = *p++;
+                        /* We use a boring value comparison of the character
+                           values.  This is better than comparing using
+                           `strcoll' since the latter would have surprising
+                           and sometimes fatal consequences.  */
+                        UCHAR cend = *p++;
 
-			if (!(flags & FNM_NOESCAPE) && cend == L_('\\'))
-			  cend = *p++;
-			if (cend == L_('\0'))
-			  return FNM_NOMATCH;
+                        if (!(flags & FNM_NOESCAPE) && cend == L_('\\'))
+                          cend = *p++;
+                        if (cend == L_('\0'))
+                          return FNM_NOMATCH;
 
-			/* It is a range.  */
-			if (cold <= fn && fn <= cend)
-			  goto matched;
+                        /* It is a range.  */
+                        if (cold <= fn && fn <= cend)
+                          goto matched;
 #endif
 
-			c = *p++;
-		      }
-		  }
+                        c = *p++;
+                      }
+                  }
 
-		if (c == L_(']'))
-		  break;
-	      }
+                if (c == L_(']'))
+                  break;
+              }
 
-	    if (!not)
-	      return FNM_NOMATCH;
-	    break;
+            if (!not)
+              return FNM_NOMATCH;
+            break;
 
-	  matched:
-	    /* Skip the rest of the [...] that already matched.  */
-	    do
-	      {
-	      ignore_next:
-		c = *p++;
+          matched:
+            /* Skip the rest of the [...] that already matched.  */
+            do
+              {
+              ignore_next:
+                c = *p++;
 
-		if (c == L_('\0'))
-		  /* [... (unterminated) loses.  */
-		  return FNM_NOMATCH;
+                if (c == L_('\0'))
+                  /* [... (unterminated) loses.  */
+                  return FNM_NOMATCH;
 
-		if (!(flags & FNM_NOESCAPE) && c == L_('\\'))
-		  {
-		    if (*p == L_('\0'))
-		      return FNM_NOMATCH;
-		    /* XXX 1003.2d11 is unclear if this is right.  */
-		    ++p;
-		  }
-		else if (c == L_('[') && *p == L_(':'))
-		  {
-		    int c1 = 0;
-		    const CHAR *startp = p;
+                if (!(flags & FNM_NOESCAPE) && c == L_('\\'))
+                  {
+                    if (*p == L_('\0'))
+                      return FNM_NOMATCH;
+                    /* XXX 1003.2d11 is unclear if this is right.  */
+                    ++p;
+                  }
+                else if (c == L_('[') && *p == L_(':'))
+                  {
+                    int c1 = 0;
+                    const CHAR *startp = p;
 
-		    while (1)
-		      {
-			c = *++p;
-			if (++c1 == CHAR_CLASS_MAX_LENGTH)
-			  return FNM_NOMATCH;
+                    while (1)
+                      {
+                        c = *++p;
+                        if (++c1 == CHAR_CLASS_MAX_LENGTH)
+                          return FNM_NOMATCH;
 
-			if (*p == L_(':') && p[1] == L_(']'))
-			  break;
+                        if (*p == L_(':') && p[1] == L_(']'))
+                          break;
 
-			if (c < L_('a') || c >= L_('z'))
-			  {
-			    p = startp;
-			    goto ignore_next;
-			  }
-		      }
-		    p += 2;
-		    c = *p++;
-		  }
-		else if (c == L_('[') && *p == L_('='))
-		  {
-		    c = *++p;
-		    if (c == L_('\0'))
-		      return FNM_NOMATCH;
-		    c = *++p;
-		    if (c != L_('=') || p[1] != L_(']'))
-		      return FNM_NOMATCH;
-		    p += 2;
-		    c = *p++;
-		  }
-		else if (c == L_('[') && *p == L_('.'))
-		  {
-		    ++p;
-		    while (1)
-		      {
-			c = *++p;
-			if (c == '\0')
-			  return FNM_NOMATCH;
+                        if (c < L_('a') || c >= L_('z'))
+                          {
+                            p = startp;
+                            goto ignore_next;
+                          }
+                      }
+                    p += 2;
+                    c = *p++;
+                  }
+                else if (c == L_('[') && *p == L_('='))
+                  {
+                    c = *++p;
+                    if (c == L_('\0'))
+                      return FNM_NOMATCH;
+                    c = *++p;
+                    if (c != L_('=') || p[1] != L_(']'))
+                      return FNM_NOMATCH;
+                    p += 2;
+                    c = *p++;
+                  }
+                else if (c == L_('[') && *p == L_('.'))
+                  {
+                    ++p;
+                    while (1)
+                      {
+                        c = *++p;
+                        if (c == '\0')
+                          return FNM_NOMATCH;
 
-			if (*p == L_('.') && p[1] == L_(']'))
-			  break;
-		      }
-		    p += 2;
-		    c = *p++;
-		  }
-	      }
-	    while (c != L_(']'));
-	    if (not)
-	      return FNM_NOMATCH;
-	  }
-	  break;
+                        if (*p == L_('.') && p[1] == L_(']'))
+                          break;
+                      }
+                    p += 2;
+                    c = *p++;
+                  }
+              }
+            while (c != L_(']'));
+            if (not)
+              return FNM_NOMATCH;
+          }
+          break;
 
-	case L_('+'):
-	case L_('@'):
-	case L_('!'):
-	  if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
-	    {
-	      int res;
+        case L_('+'):
+        case L_('@'):
+        case L_('!'):
+          if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
+            {
+              int res;
 
-	      res = EXT (c, p, n, string_end, no_leading_period, flags);
-	      if (res != -1)
-		return res;
-	    }
-	  goto normal_match;
+              res = EXT (c, p, n, string_end, no_leading_period, flags);
+              if (res != -1)
+                return res;
+            }
+          goto normal_match;
 
-	case L_('/'):
-	  if (NO_LEADING_PERIOD (flags))
-	    {
-	      if (n == string_end || c != (UCHAR) *n)
-		return FNM_NOMATCH;
+        case L_('/'):
+          if (NO_LEADING_PERIOD (flags))
+            {
+              if (n == string_end || c != (UCHAR) *n)
+                return FNM_NOMATCH;
 
-	      new_no_leading_period = true;
-	      break;
-	    }
-	  /* FALLTHROUGH */
-	default:
-	normal_match:
-	  if (n == string_end || c != FOLD ((UCHAR) *n))
-	    return FNM_NOMATCH;
-	}
+              new_no_leading_period = true;
+              break;
+            }
+          /* FALLTHROUGH */
+        default:
+        normal_match:
+          if (n == string_end || c != FOLD ((UCHAR) *n))
+            return FNM_NOMATCH;
+        }
 
       no_leading_period = new_no_leading_period;
       ++n;
@@ -984,25 +989,25 @@ END (const CHAR *pattern)
       return pattern;
     else if (*p == L_('['))
       {
-	/* Handle brackets special.  */
-	if (posixly_correct == 0)
-	  posixly_correct = getenv ("POSIXLY_CORRECT") != NULL ? 1 : -1;
+        /* Handle brackets special.  */
+        if (posixly_correct == 0)
+          posixly_correct = getenv ("POSIXLY_CORRECT") != NULL ? 1 : -1;
 
-	/* Skip the not sign.  We have to recognize it because of a possibly
-	   following ']'.  */
-	if (*++p == L_('!') || (posixly_correct < 0 && *p == L_('^')))
-	  ++p;
-	/* A leading ']' is recognized as such.  */
-	if (*p == L_(']'))
-	  ++p;
-	/* Skip over all characters of the list.  */
-	while (*p != L_(']'))
-	  if (*p++ == L_('\0'))
-	    /* This is no valid pattern.  */
-	    return pattern;
+        /* Skip the not sign.  We have to recognize it because of a possibly
+           following ']'.  */
+        if (*++p == L_('!') || (posixly_correct < 0 && *p == L_('^')))
+          ++p;
+        /* A leading ']' is recognized as such.  */
+        if (*p == L_(']'))
+          ++p;
+        /* Skip over all characters of the list.  */
+        while (*p != L_(']'))
+          if (*p++ == L_('\0'))
+            /* This is no valid pattern.  */
+            return pattern;
       }
     else if ((*p == L_('?') || *p == L_('*') || *p == L_('+') || *p == L_('@')
-	      || *p == L_('!')) && p[1] == L_('('))
+              || *p == L_('!')) && p[1] == L_('('))
       p = END (p + 1);
     else if (*p == L_(')'))
       break;
@@ -1037,64 +1042,63 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
       return -1;
     else if (*p == L_('['))
       {
-	/* Handle brackets special.  */
-	if (posixly_correct == 0)
-	  posixly_correct = getenv ("POSIXLY_CORRECT") != NULL ? 1 : -1;
+        /* Handle brackets special.  */
+        if (posixly_correct == 0)
+          posixly_correct = getenv ("POSIXLY_CORRECT") != NULL ? 1 : -1;
 
-	/* Skip the not sign.  We have to recognize it because of a possibly
-	   following ']'.  */
-	if (*++p == L_('!') || (posixly_correct < 0 && *p == L_('^')))
-	  ++p;
-	/* A leading ']' is recognized as such.  */
-	if (*p == L_(']'))
-	  ++p;
-	/* Skip over all characters of the list.  */
-	while (*p != L_(']'))
-	  if (*p++ == L_('\0'))
-	    /* This is no valid pattern.  */
-	    return -1;
+        /* Skip the not sign.  We have to recognize it because of a possibly
+           following ']'.  */
+        if (*++p == L_('!') || (posixly_correct < 0 && *p == L_('^')))
+          ++p;
+        /* A leading ']' is recognized as such.  */
+        if (*p == L_(']'))
+          ++p;
+        /* Skip over all characters of the list.  */
+        while (*p != L_(']'))
+          if (*p++ == L_('\0'))
+            /* This is no valid pattern.  */
+            return -1;
       }
     else if ((*p == L_('?') || *p == L_('*') || *p == L_('+') || *p == L_('@')
-	      || *p == L_('!')) && p[1] == L_('('))
+              || *p == L_('!')) && p[1] == L_('('))
       /* Remember the nesting level.  */
       ++level;
     else if (*p == L_(')'))
       {
-	if (level-- == 0)
-	  {
-	    /* This means we found the end of the pattern.  */
+        if (level-- == 0)
+          {
+            /* This means we found the end of the pattern.  */
 #define NEW_PATTERN \
-	    struct patternlist *newp;					      \
-	    size_t plen;						      \
-	    size_t plensize;						      \
-	    size_t newpsize;						      \
-									      \
-	    assert (p > startp);					      \
-	    plen = (opt == L_('?') || opt == L_('@')			      \
-		    ? pattern_len					      \
-		    : (unsigned) (p - startp) + 1);			      \
-	    plensize = plen * sizeof (CHAR);				      \
-	    newpsize = offsetof (struct patternlist, str) + plensize;	      \
-	    if ((size_t) -1 / sizeof (CHAR) < plen			      \
-		|| newpsize < offsetof (struct patternlist, str)	      \
-		|| ALLOCA_LIMIT <= newpsize)				      \
-	      return -1;						      \
-	    newp = (struct patternlist *) alloca (newpsize);		      \
-	    *((CHAR *) MEMPCPY (newp->str, startp, p - startp)) = L_('\0');    \
-	    newp->next = NULL;						      \
-	    *lastp = newp;						      \
-	    lastp = &newp->next
-	    NEW_PATTERN;
-	    break;
-	  }
+            struct patternlist *newp;                                         \
+            size_t plen;                                                      \
+            size_t plensize;                                                  \
+            size_t newpsize;                                                  \
+                                                                              \
+            plen = (opt == L_('?') || opt == L_('@')                          \
+                    ? pattern_len                                             \
+                    : p - startp + 1UL);                                      \
+            plensize = plen * sizeof (CHAR);                                  \
+            newpsize = offsetof (struct patternlist, str) + plensize;         \
+            if ((size_t) -1 / sizeof (CHAR) < plen                            \
+                || newpsize < offsetof (struct patternlist, str)              \
+                || ALLOCA_LIMIT <= newpsize)                                  \
+              return -1;                                                      \
+            newp = (struct patternlist *) alloca (newpsize);                  \
+            *((CHAR *) MEMPCPY (newp->str, startp, p - startp)) = L_('\0');    \
+            newp->next = NULL;                                                \
+            *lastp = newp;                                                    \
+            lastp = &newp->next
+            NEW_PATTERN;
+            break;
+          }
       }
     else if (*p == L_('|'))
       {
-	if (level == 0)
-	  {
-	    NEW_PATTERN;
-	    startp = p + 1;
-	  }
+        if (level == 0)
+          {
+            NEW_PATTERN;
+            startp = p + 1;
+          }
       }
   assert (list != NULL);
   assert (p[-1] == L_(')'));
@@ -1104,36 +1108,36 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
     {
     case L_('*'):
       if (FCT (p, string, string_end, no_leading_period, flags) == 0)
-	return 0;
+        return 0;
       /* FALLTHROUGH */
 
     case L_('+'):
       do
-	{
-	  for (rs = string; rs <= string_end; ++rs)
-	    /* First match the prefix with the current pattern with the
-	       current pattern.  */
-	    if (FCT (list->str, string, rs, no_leading_period,
-		     flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD) == 0
-		/* This was successful.  Now match the rest with the rest
-		   of the pattern.  */
-		&& (FCT (p, rs, string_end,
-			 rs == string
-			 ? no_leading_period
-			 : rs[-1] == '/' && NO_LEADING_PERIOD (flags),
-			 flags & FNM_FILE_NAME
-			 ? flags : flags & ~FNM_PERIOD) == 0
-		    /* This didn't work.  Try the whole pattern.  */
-		    || (rs != string
-			&& FCT (pattern - 1, rs, string_end,
-				rs == string
-				? no_leading_period
-				: rs[-1] == '/' && NO_LEADING_PERIOD (flags),
-				flags & FNM_FILE_NAME
-				? flags : flags & ~FNM_PERIOD) == 0)))
-	      /* It worked.  Signal success.  */
-	      return 0;
-	}
+        {
+          for (rs = string; rs <= string_end; ++rs)
+            /* First match the prefix with the current pattern with the
+               current pattern.  */
+            if (FCT (list->str, string, rs, no_leading_period,
+                     flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD) == 0
+                /* This was successful.  Now match the rest with the rest
+                   of the pattern.  */
+                && (FCT (p, rs, string_end,
+                         rs == string
+                         ? no_leading_period
+                         : rs[-1] == '/' && NO_LEADING_PERIOD (flags),
+                         flags & FNM_FILE_NAME
+                         ? flags : flags & ~FNM_PERIOD) == 0
+                    /* This didn't work.  Try the whole pattern.  */
+                    || (rs != string
+                        && FCT (pattern - 1, rs, string_end,
+                                rs == string
+                                ? no_leading_period
+                                : rs[-1] == '/' && NO_LEADING_PERIOD (flags),
+                                flags & FNM_FILE_NAME
+                                ? flags : flags & ~FNM_PERIOD) == 0)))
+              /* It worked.  Signal success.  */
+              return 0;
+        }
       while ((list = list->next) != NULL);
 
       /* None of the patterns lead to a match.  */
@@ -1141,20 +1145,20 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
 
     case L_('?'):
       if (FCT (p, string, string_end, no_leading_period, flags) == 0)
-	return 0;
+        return 0;
       /* FALLTHROUGH */
 
     case L_('@'):
       do
-	/* I cannot believe it but `strcat' is actually acceptable
-	   here.  Match the entire string with the prefix from the
-	   pattern list and the rest of the pattern following the
-	   pattern list.  */
-	if (FCT (STRCAT (list->str, p), string, string_end,
-		 no_leading_period,
-		 flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD) == 0)
-	  /* It worked.  Signal success.  */
-	  return 0;
+        /* I cannot believe it but `strcat' is actually acceptable
+           here.  Match the entire string with the prefix from the
+           pattern list and the rest of the pattern following the
+           pattern list.  */
+        if (FCT (STRCAT (list->str, p), string, string_end,
+                 no_leading_period,
+                 flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD) == 0)
+          /* It worked.  Signal success.  */
+          return 0;
       while ((list = list->next) != NULL);
 
       /* None of the patterns lead to a match.  */
@@ -1162,28 +1166,28 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
 
     case L_('!'):
       for (rs = string; rs <= string_end; ++rs)
-	{
-	  struct patternlist *runp;
+        {
+          struct patternlist *runp;
 
-	  for (runp = list; runp != NULL; runp = runp->next)
-	    if (FCT (runp->str, string, rs,  no_leading_period,
-		     flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD) == 0)
-	      break;
+          for (runp = list; runp != NULL; runp = runp->next)
+            if (FCT (runp->str, string, rs,  no_leading_period,
+                     flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD) == 0)
+              break;
 
-	  /* If none of the patterns matched see whether the rest does.  */
-	  if (runp == NULL
-	      && (FCT (p, rs, string_end,
-		       rs == string
-		       ? no_leading_period
-		       : rs[-1] == '/' && NO_LEADING_PERIOD (flags),
-		       flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD)
-		  == 0))
-	    /* This is successful.  */
-	    return 0;
-	}
+          /* If none of the patterns matched see whether the rest does.  */
+          if (runp == NULL
+              && (FCT (p, rs, string_end,
+                       rs == string
+                       ? no_leading_period
+                       : rs[-1] == '/' && NO_LEADING_PERIOD (flags),
+                       flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD)
+                  == 0))
+            /* This is successful.  */
+            return 0;
+        }
 
       /* None of the patterns together with the rest of the pattern
-	 lead to a match.  */
+         lead to a match.  */
       return FNM_NOMATCH;
 
     default:
diff --git a/gnulib/getdelim.c b/gnulib/getdelim.c
index 85818b565..c0240900c 100644
--- a/gnulib/getdelim.c
+++ b/gnulib/getdelim.c
@@ -1,6 +1,6 @@
 /* getdelim.c --- Implementation of replacement getdelim function.
-   Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005, 2006, 2007,
-   2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005, 2006, 2007, 2008,
+   2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -21,13 +21,16 @@
 
 #include <config.h>
 
+/* Don't use __attribute__ __nonnull__ in this compilation unit.  Otherwise gcc
+   optimizes away the lineptr == NULL || n == NULL || fp == NULL tests below.  */
+#define _GL_ARG_NONNULL(params)
+
 #include <stdio.h>
 
 #include <limits.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <unistd.h>
 
 #ifndef SSIZE_MAX
 # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
@@ -35,15 +38,15 @@
 
 #if USE_UNLOCKED_IO
 # include "unlocked-io.h"
-# define getc_maybe_unlocked(fp)	getc(fp)
+# define getc_maybe_unlocked(fp)        getc(fp)
 #elif !HAVE_FLOCKFILE || !HAVE_FUNLOCKFILE || !HAVE_DECL_GETC_UNLOCKED
 # undef flockfile
 # undef funlockfile
 # define flockfile(x) ((void) 0)
 # define funlockfile(x) ((void) 0)
-# define getc_maybe_unlocked(fp)	getc(fp)
+# define getc_maybe_unlocked(fp)        getc(fp)
 #else
-# define getc_maybe_unlocked(fp)	getc_unlocked(fp)
+# define getc_maybe_unlocked(fp)        getc_unlocked(fp)
 #endif
 
 /* Read up to (and including) a DELIMITER from FP into *LINEPTR (and
@@ -72,10 +75,10 @@ getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
       *n = 120;
       new_lineptr = (char *) realloc (*lineptr, *n);
       if (new_lineptr == NULL)
-	{
-	  result = -1;
-	  goto unlock_return;
-	}
+        {
+          result = -1;
+          goto unlock_return;
+        }
       *lineptr = new_lineptr;
     }
 
@@ -85,44 +88,44 @@ getdelim (char **lineptr, size_t *n, int delimiter, FILE *fp)
 
       i = getc_maybe_unlocked (fp);
       if (i == EOF)
-	{
-	  result = -1;
-	  break;
-	}
+        {
+          result = -1;
+          break;
+        }
 
       /* Make enough space for len+1 (for final NUL) bytes.  */
       if (cur_len + 1 >= *n)
-	{
-	  size_t needed_max =
-	    SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX;
-	  size_t needed = 2 * *n + 1;   /* Be generous. */
-	  char *new_lineptr;
+        {
+          size_t needed_max =
+            SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX;
+          size_t needed = 2 * *n + 1;   /* Be generous. */
+          char *new_lineptr;
 
-	  if (needed_max < needed)
-	    needed = needed_max;
-	  if (cur_len + 1 >= needed)
-	    {
-	      result = -1;
-	      errno = EOVERFLOW;
-	      goto unlock_return;
-	    }
+          if (needed_max < needed)
+            needed = needed_max;
+          if (cur_len + 1 >= needed)
+            {
+              result = -1;
+              errno = EOVERFLOW;
+              goto unlock_return;
+            }
 
-	  new_lineptr = (char *) realloc (*lineptr, needed);
-	  if (new_lineptr == NULL)
-	    {
-	      result = -1;
-	      goto unlock_return;
-	    }
+          new_lineptr = (char *) realloc (*lineptr, needed);
+          if (new_lineptr == NULL)
+            {
+              result = -1;
+              goto unlock_return;
+            }
 
-	  *lineptr = new_lineptr;
-	  *n = needed;
-	}
+          *lineptr = new_lineptr;
+          *n = needed;
+        }
 
       (*lineptr)[cur_len] = i;
       cur_len++;
 
       if (i == delimiter)
-	break;
+        break;
     }
   (*lineptr)[cur_len] = '\0';
   result = cur_len ? cur_len : result;
diff --git a/gnulib/getline.c b/gnulib/getline.c
index eb8f055a8..6cf187be2 100644
--- a/gnulib/getline.c
+++ b/gnulib/getline.c
@@ -1,5 +1,5 @@
 /* getline.c --- Implementation of replacement getline function.
-   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
diff --git a/gnulib/getopt.c b/gnulib/getopt.c
index f1e6d1f7c..aaabc8d19 100644
--- a/gnulib/getopt.c
+++ b/gnulib/getopt.c
@@ -1,9 +1,9 @@
 /* Getopt for GNU.
-   NOTE: getopt is now part of the C library, so if you don't know what
+   NOTE: getopt is part of the C library, so if you don't know what
    "Keep this file name-space clean" means, talk to drepper@gnu.org
    before changing it!
-   Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004,2006,2008
-	Free Software Foundation, Inc.
+   Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2010 Free Software
+   Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
@@ -41,12 +41,9 @@
 # include <wchar.h>
 #endif
 
-#ifndef attribute_hidden
-# define attribute_hidden
-#endif
-
-/* Unlike standard Unix `getopt', functions like `getopt_long'
-   let the user intersperse the options with the other arguments.
+/* This version of `getopt' appears to the caller like standard Unix `getopt'
+   but it behaves differently for the user, since it allows the user
+   to intersperse the options with the other arguments.
 
    As `getopt_long' works, it permutes the elements of ARGV so that,
    when it is done, all the options precede everything else.  Thus
@@ -54,7 +51,7 @@
 
    Using `getopt' or setting the environment variable POSIXLY_CORRECT
    disables permutation.
-   Then the application's behavior is completely standard.
+   Then the behavior is completely standard.
 
    GNU application programs can use a third alternative mode in which
    they can distinguish the relative order of options and other arguments.  */
@@ -121,18 +118,18 @@ extern char *__getopt_nonoption_flags;
 
 # ifdef USE_NONOPTION_FLAGS
 #  define SWAP_FLAGS(ch1, ch2) \
-  if (d->__nonoption_flags_len > 0)					      \
-    {									      \
-      char __tmp = __getopt_nonoption_flags[ch1];			      \
-      __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];	      \
-      __getopt_nonoption_flags[ch2] = __tmp;				      \
+  if (d->__nonoption_flags_len > 0)                                           \
+    {                                                                         \
+      char __tmp = __getopt_nonoption_flags[ch1];                             \
+      __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];          \
+      __getopt_nonoption_flags[ch2] = __tmp;                                  \
     }
 # else
 #  define SWAP_FLAGS(ch1, ch2)
 # endif
-#else	/* !_LIBC */
+#else   /* !_LIBC */
 # define SWAP_FLAGS(ch1, ch2)
-#endif	/* _LIBC */
+#endif  /* _LIBC */
 
 /* Exchange two adjacent subsequences of ARGV.
    One subsequence is elements [first_nonopt,last_nonopt)
@@ -163,57 +160,57 @@ exchange (char **argv, struct _getopt_data *d)
   if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len)
     {
       /* We must extend the array.  The user plays games with us and
-	 presents new arguments.  */
+         presents new arguments.  */
       char *new_str = malloc (top + 1);
       if (new_str == NULL)
-	d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0;
+        d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0;
       else
-	{
-	  memset (__mempcpy (new_str, __getopt_nonoption_flags,
-			     d->__nonoption_flags_max_len),
-		  '\0', top + 1 - d->__nonoption_flags_max_len);
-	  d->__nonoption_flags_max_len = top + 1;
-	  __getopt_nonoption_flags = new_str;
-	}
+        {
+          memset (__mempcpy (new_str, __getopt_nonoption_flags,
+                             d->__nonoption_flags_max_len),
+                  '\0', top + 1 - d->__nonoption_flags_max_len);
+          d->__nonoption_flags_max_len = top + 1;
+          __getopt_nonoption_flags = new_str;
+        }
     }
 #endif
 
   while (top > middle && middle > bottom)
     {
       if (top - middle > middle - bottom)
-	{
-	  /* Bottom segment is the short one.  */
-	  int len = middle - bottom;
-	  register int i;
+        {
+          /* Bottom segment is the short one.  */
+          int len = middle - bottom;
+          register int i;
 
-	  /* Swap it with the top part of the top segment.  */
-	  for (i = 0; i < len; i++)
-	    {
-	      tem = argv[bottom + i];
-	      argv[bottom + i] = argv[top - (middle - bottom) + i];
-	      argv[top - (middle - bottom) + i] = tem;
-	      SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
-	    }
-	  /* Exclude the moved bottom segment from further swapping.  */
-	  top -= len;
-	}
+          /* Swap it with the top part of the top segment.  */
+          for (i = 0; i < len; i++)
+            {
+              tem = argv[bottom + i];
+              argv[bottom + i] = argv[top - (middle - bottom) + i];
+              argv[top - (middle - bottom) + i] = tem;
+              SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
+            }
+          /* Exclude the moved bottom segment from further swapping.  */
+          top -= len;
+        }
       else
-	{
-	  /* Top segment is the short one.  */
-	  int len = top - middle;
-	  register int i;
+        {
+          /* Top segment is the short one.  */
+          int len = top - middle;
+          register int i;
 
-	  /* Swap it with the bottom part of the bottom segment.  */
-	  for (i = 0; i < len; i++)
-	    {
-	      tem = argv[bottom + i];
-	      argv[bottom + i] = argv[middle + i];
-	      argv[middle + i] = tem;
-	      SWAP_FLAGS (bottom + i, middle + i);
-	    }
-	  /* Exclude the moved top segment from further swapping.  */
-	  bottom += len;
-	}
+          /* Swap it with the bottom part of the bottom segment.  */
+          for (i = 0; i < len; i++)
+            {
+              tem = argv[bottom + i];
+              argv[bottom + i] = argv[middle + i];
+              argv[middle + i] = tem;
+              SWAP_FLAGS (bottom + i, middle + i);
+            }
+          /* Exclude the moved top segment from further swapping.  */
+          bottom += len;
+        }
     }
 
   /* Update records for the slots the non-options now occupy.  */
@@ -225,8 +222,9 @@ exchange (char **argv, struct _getopt_data *d)
 /* Initialize the internal data when the first call is made.  */
 
 static const char *
-_getopt_initialize (int argc, char **argv, const char *optstring,
-		    int posixly_correct, struct _getopt_data *d)
+_getopt_initialize (int argc _GL_UNUSED,
+                    char **argv _GL_UNUSED, const char *optstring,
+                    struct _getopt_data *d, int posixly_correct)
 {
   /* Start processing options with ARGV-element 1 (since ARGV-element 0
      is the program name); the sequence of previously skipped
@@ -260,25 +258,25 @@ _getopt_initialize (int argc, char **argv, const char *optstring,
       && argc == __libc_argc && argv == __libc_argv)
     {
       if (d->__nonoption_flags_max_len == 0)
-	{
-	  if (__getopt_nonoption_flags == NULL
-	      || __getopt_nonoption_flags[0] == '\0')
-	    d->__nonoption_flags_max_len = -1;
-	  else
-	    {
-	      const char *orig_str = __getopt_nonoption_flags;
-	      int len = d->__nonoption_flags_max_len = strlen (orig_str);
-	      if (d->__nonoption_flags_max_len < argc)
-		d->__nonoption_flags_max_len = argc;
-	      __getopt_nonoption_flags =
-		(char *) malloc (d->__nonoption_flags_max_len);
-	      if (__getopt_nonoption_flags == NULL)
-		d->__nonoption_flags_max_len = -1;
-	      else
-		memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
-			'\0', d->__nonoption_flags_max_len - len);
-	    }
-	}
+        {
+          if (__getopt_nonoption_flags == NULL
+              || __getopt_nonoption_flags[0] == '\0')
+            d->__nonoption_flags_max_len = -1;
+          else
+            {
+              const char *orig_str = __getopt_nonoption_flags;
+              int len = d->__nonoption_flags_max_len = strlen (orig_str);
+              if (d->__nonoption_flags_max_len < argc)
+                d->__nonoption_flags_max_len = argc;
+              __getopt_nonoption_flags =
+                (char *) malloc (d->__nonoption_flags_max_len);
+              if (__getopt_nonoption_flags == NULL)
+                d->__nonoption_flags_max_len = -1;
+              else
+                memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
+                        '\0', d->__nonoption_flags_max_len - len);
+            }
+        }
       d->__nonoption_flags_len = d->__nonoption_flags_max_len;
     }
   else
@@ -330,6 +328,10 @@ _getopt_initialize (int argc, char **argv, const char *optstring,
    `flag' field is nonzero, the value of the option's `val' field
    if the `flag' field is zero.
 
+   The elements of ARGV aren't really const, because we permute them.
+   But we pretend they're const in the prototype to be compatible
+   with other systems.
+
    LONGOPTS is a vector of `struct option' terminated by an
    element containing a name which is zero.
 
@@ -338,15 +340,12 @@ _getopt_initialize (int argc, char **argv, const char *optstring,
    recent call.
 
    If LONG_ONLY is nonzero, '-' as well as '--' can introduce
-   long-named options.
-
-   If POSIXLY_CORRECT is nonzero, behave as if the POSIXLY_CORRECT
-   environment variable were set.  */
+   long-named options.  */
 
 int
 _getopt_internal_r (int argc, char **argv, const char *optstring,
-		    const struct option *longopts, int *longind,
-		    int long_only, int posixly_correct, struct _getopt_data *d)
+                    const struct option *longopts, int *longind,
+                    int long_only, struct _getopt_data *d, int posixly_correct)
 {
   int print_errors = d->opterr;
   if (optstring[0] == ':')
@@ -360,9 +359,9 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
   if (d->optind == 0 || !d->__initialized)
     {
       if (d->optind == 0)
-	d->optind = 1;	/* Don't scan ARGV[0], the program name.  */
-      optstring = _getopt_initialize (argc, argv, optstring,
-				      posixly_correct, d);
+        d->optind = 1;  /* Don't scan ARGV[0], the program name.  */
+      optstring = _getopt_initialize (argc, argv, optstring, d,
+                                      posixly_correct);
       d->__initialized = 1;
     }
 
@@ -372,8 +371,8 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
      is only used when the used in the GNU libc.  */
 #if defined _LIBC && defined USE_NONOPTION_FLAGS
 # define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0' \
-		      || (d->optind < d->__nonoption_flags_len		      \
-			  && __getopt_nonoption_flags[d->optind] == '1'))
+                      || (d->optind < d->__nonoption_flags_len                \
+                          && __getopt_nonoption_flags[d->optind] == '1'))
 #else
 # define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0')
 #endif
@@ -383,78 +382,78 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
       /* Advance to the next ARGV-element.  */
 
       /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
-	 moved back by the user (who may also have changed the arguments).  */
+         moved back by the user (who may also have changed the arguments).  */
       if (d->__last_nonopt > d->optind)
-	d->__last_nonopt = d->optind;
+        d->__last_nonopt = d->optind;
       if (d->__first_nonopt > d->optind)
-	d->__first_nonopt = d->optind;
+        d->__first_nonopt = d->optind;
 
       if (d->__ordering == PERMUTE)
-	{
-	  /* If we have just processed some options following some non-options,
-	     exchange them so that the options come first.  */
+        {
+          /* If we have just processed some options following some non-options,
+             exchange them so that the options come first.  */
 
-	  if (d->__first_nonopt != d->__last_nonopt
-	      && d->__last_nonopt != d->optind)
-	    exchange ((char **) argv, d);
-	  else if (d->__last_nonopt != d->optind)
-	    d->__first_nonopt = d->optind;
+          if (d->__first_nonopt != d->__last_nonopt
+              && d->__last_nonopt != d->optind)
+            exchange ((char **) argv, d);
+          else if (d->__last_nonopt != d->optind)
+            d->__first_nonopt = d->optind;
 
-	  /* Skip any additional non-options
-	     and extend the range of non-options previously skipped.  */
+          /* Skip any additional non-options
+             and extend the range of non-options previously skipped.  */
 
-	  while (d->optind < argc && NONOPTION_P)
-	    d->optind++;
-	  d->__last_nonopt = d->optind;
-	}
+          while (d->optind < argc && NONOPTION_P)
+            d->optind++;
+          d->__last_nonopt = d->optind;
+        }
 
       /* The special ARGV-element `--' means premature end of options.
-	 Skip it like a null option,
-	 then exchange with previous non-options as if it were an option,
-	 then skip everything else like a non-option.  */
+         Skip it like a null option,
+         then exchange with previous non-options as if it were an option,
+         then skip everything else like a non-option.  */
 
       if (d->optind != argc && !strcmp (argv[d->optind], "--"))
-	{
-	  d->optind++;
+        {
+          d->optind++;
 
-	  if (d->__first_nonopt != d->__last_nonopt
-	      && d->__last_nonopt != d->optind)
-	    exchange ((char **) argv, d);
-	  else if (d->__first_nonopt == d->__last_nonopt)
-	    d->__first_nonopt = d->optind;
-	  d->__last_nonopt = argc;
+          if (d->__first_nonopt != d->__last_nonopt
+              && d->__last_nonopt != d->optind)
+            exchange ((char **) argv, d);
+          else if (d->__first_nonopt == d->__last_nonopt)
+            d->__first_nonopt = d->optind;
+          d->__last_nonopt = argc;
 
-	  d->optind = argc;
-	}
+          d->optind = argc;
+        }
 
       /* If we have done all the ARGV-elements, stop the scan
-	 and back over any non-options that we skipped and permuted.  */
+         and back over any non-options that we skipped and permuted.  */
 
       if (d->optind == argc)
-	{
-	  /* Set the next-arg-index to point at the non-options
-	     that we previously skipped, so the caller will digest them.  */
-	  if (d->__first_nonopt != d->__last_nonopt)
-	    d->optind = d->__first_nonopt;
-	  return -1;
-	}
+        {
+          /* Set the next-arg-index to point at the non-options
+             that we previously skipped, so the caller will digest them.  */
+          if (d->__first_nonopt != d->__last_nonopt)
+            d->optind = d->__first_nonopt;
+          return -1;
+        }
 
       /* If we have come to a non-option and did not permute it,
-	 either stop the scan or describe it to the caller and pass it by.  */
+         either stop the scan or describe it to the caller and pass it by.  */
 
       if (NONOPTION_P)
-	{
-	  if (d->__ordering == REQUIRE_ORDER)
-	    return -1;
-	  d->optarg = argv[d->optind++];
-	  return 1;
-	}
+        {
+          if (d->__ordering == REQUIRE_ORDER)
+            return -1;
+          d->optarg = argv[d->optind++];
+          return 1;
+        }
 
       /* We have found another option-ARGV-element.
-	 Skip the initial punctuation.  */
+         Skip the initial punctuation.  */
 
       d->__nextchar = (argv[d->optind] + 1
-		  + (longopts != NULL && argv[d->optind][1] == '-'));
+                  + (longopts != NULL && argv[d->optind][1] == '-'));
     }
 
   /* Decode the current option-ARGV-element.  */
@@ -474,8 +473,8 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
 
   if (longopts != NULL
       && (argv[d->optind][1] == '-'
-	  || (long_only && (argv[d->optind][2]
-			    || !strchr (optstring, argv[d->optind][1])))))
+          || (long_only && (argv[d->optind][2]
+                            || !strchr (optstring, argv[d->optind][1])))))
     {
       char *nameend;
       const struct option *p;
@@ -486,251 +485,251 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
       int option_index;
 
       for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++)
-	/* Do nothing.  */ ;
+        /* Do nothing.  */ ;
 
       /* Test all long options for either exact match
-	 or abbreviated matches.  */
+         or abbreviated matches.  */
       for (p = longopts, option_index = 0; p->name; p++, option_index++)
-	if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
-	  {
-	    if ((unsigned int) (nameend - d->__nextchar)
-		== (unsigned int) strlen (p->name))
-	      {
-		/* Exact match found.  */
-		pfound = p;
-		indfound = option_index;
-		exact = 1;
-		break;
-	      }
-	    else if (pfound == NULL)
-	      {
-		/* First nonexact match found.  */
-		pfound = p;
-		indfound = option_index;
-	      }
-	    else if (long_only
-		     || pfound->has_arg != p->has_arg
-		     || pfound->flag != p->flag
-		     || pfound->val != p->val)
-	      /* Second or later nonexact match found.  */
-	      ambig = 1;
-	  }
+        if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
+          {
+            if ((unsigned int) (nameend - d->__nextchar)
+                == (unsigned int) strlen (p->name))
+              {
+                /* Exact match found.  */
+                pfound = p;
+                indfound = option_index;
+                exact = 1;
+                break;
+              }
+            else if (pfound == NULL)
+              {
+                /* First nonexact match found.  */
+                pfound = p;
+                indfound = option_index;
+              }
+            else if (long_only
+                     || pfound->has_arg != p->has_arg
+                     || pfound->flag != p->flag
+                     || pfound->val != p->val)
+              /* Second or later nonexact match found.  */
+              ambig = 1;
+          }
 
       if (ambig && !exact)
-	{
-	  if (print_errors)
-	    {
+        {
+          if (print_errors)
+            {
 #if defined _LIBC && defined USE_IN_LIBIO
-	      char *buf;
+              char *buf;
 
-	      if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"),
-			      argv[0], argv[d->optind]) >= 0)
-		{
-		  _IO_flockfile (stderr);
+              if (__asprintf (&buf, _("%s: option '%s' is ambiguous\n"),
+                              argv[0], argv[d->optind]) >= 0)
+                {
+                  _IO_flockfile (stderr);
 
-		  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-		  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+                  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+                  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
 
-		  __fxprintf (NULL, "%s", buf);
+                  __fxprintf (NULL, "%s", buf);
 
-		  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-		  _IO_funlockfile (stderr);
+                  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+                  _IO_funlockfile (stderr);
 
-		  free (buf);
-		}
+                  free (buf);
+                }
 #else
-	      fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
-		       argv[0], argv[d->optind]);
+              fprintf (stderr, _("%s: option '%s' is ambiguous\n"),
+                       argv[0], argv[d->optind]);
 #endif
-	    }
-	  d->__nextchar += strlen (d->__nextchar);
-	  d->optind++;
-	  d->optopt = 0;
-	  return '?';
-	}
+            }
+          d->__nextchar += strlen (d->__nextchar);
+          d->optind++;
+          d->optopt = 0;
+          return '?';
+        }
 
       if (pfound != NULL)
-	{
-	  option_index = indfound;
-	  d->optind++;
-	  if (*nameend)
-	    {
-	      /* Don't test has_arg with >, because some C compilers don't
-		 allow it to be used on enums.  */
-	      if (pfound->has_arg)
-		d->optarg = nameend + 1;
-	      else
-		{
-		  if (print_errors)
-		    {
+        {
+          option_index = indfound;
+          d->optind++;
+          if (*nameend)
+            {
+              /* Don't test has_arg with >, because some C compilers don't
+                 allow it to be used on enums.  */
+              if (pfound->has_arg)
+                d->optarg = nameend + 1;
+              else
+                {
+                  if (print_errors)
+                    {
 #if defined _LIBC && defined USE_IN_LIBIO
-		      char *buf;
-		      int n;
+                      char *buf;
+                      int n;
 #endif
 
-		      if (argv[d->optind - 1][1] == '-')
-			{
-			  /* --option */
+                      if (argv[d->optind - 1][1] == '-')
+                        {
+                          /* --option */
 #if defined _LIBC && defined USE_IN_LIBIO
-			  n = __asprintf (&buf, _("\
-%s: option `--%s' doesn't allow an argument\n"),
-					  argv[0], pfound->name);
+                          n = __asprintf (&buf, _("\
+%s: option '--%s' doesn't allow an argument\n"),
+                                          argv[0], pfound->name);
 #else
-			  fprintf (stderr, _("\
-%s: option `--%s' doesn't allow an argument\n"),
-				   argv[0], pfound->name);
+                          fprintf (stderr, _("\
+%s: option '--%s' doesn't allow an argument\n"),
+                                   argv[0], pfound->name);
 #endif
-			}
-		      else
-			{
-			  /* +option or -option */
+                        }
+                      else
+                        {
+                          /* +option or -option */
 #if defined _LIBC && defined USE_IN_LIBIO
-			  n = __asprintf (&buf, _("\
-%s: option `%c%s' doesn't allow an argument\n"),
-					  argv[0], argv[d->optind - 1][0],
-					  pfound->name);
+                          n = __asprintf (&buf, _("\
+%s: option '%c%s' doesn't allow an argument\n"),
+                                          argv[0], argv[d->optind - 1][0],
+                                          pfound->name);
 #else
-			  fprintf (stderr, _("\
-%s: option `%c%s' doesn't allow an argument\n"),
-				   argv[0], argv[d->optind - 1][0],
-				   pfound->name);
+                          fprintf (stderr, _("\
+%s: option '%c%s' doesn't allow an argument\n"),
+                                   argv[0], argv[d->optind - 1][0],
+                                   pfound->name);
 #endif
-			}
+                        }
 
 #if defined _LIBC && defined USE_IN_LIBIO
-		      if (n >= 0)
-			{
-			  _IO_flockfile (stderr);
+                      if (n >= 0)
+                        {
+                          _IO_flockfile (stderr);
 
-			  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-			  ((_IO_FILE *) stderr)->_flags2
-			    |= _IO_FLAGS2_NOTCANCEL;
+                          int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+                          ((_IO_FILE *) stderr)->_flags2
+                            |= _IO_FLAGS2_NOTCANCEL;
 
-			  __fxprintf (NULL, "%s", buf);
+                          __fxprintf (NULL, "%s", buf);
 
-			  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-			  _IO_funlockfile (stderr);
+                          ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+                          _IO_funlockfile (stderr);
 
-			  free (buf);
-			}
+                          free (buf);
+                        }
 #endif
-		    }
+                    }
 
-		  d->__nextchar += strlen (d->__nextchar);
+                  d->__nextchar += strlen (d->__nextchar);
 
-		  d->optopt = pfound->val;
-		  return '?';
-		}
-	    }
-	  else if (pfound->has_arg == 1)
-	    {
-	      if (d->optind < argc)
-		d->optarg = argv[d->optind++];
-	      else
-		{
-		  if (print_errors)
-		    {
+                  d->optopt = pfound->val;
+                  return '?';
+                }
+            }
+          else if (pfound->has_arg == 1)
+            {
+              if (d->optind < argc)
+                d->optarg = argv[d->optind++];
+              else
+                {
+                  if (print_errors)
+                    {
 #if defined _LIBC && defined USE_IN_LIBIO
-		      char *buf;
+                      char *buf;
 
-		      if (__asprintf (&buf, _("\
-%s: option `%s' requires an argument\n"),
-				      argv[0], argv[d->optind - 1]) >= 0)
-			{
-			  _IO_flockfile (stderr);
+                      if (__asprintf (&buf, _("\
+%s: option '%s' requires an argument\n"),
+                                      argv[0], argv[d->optind - 1]) >= 0)
+                        {
+                          _IO_flockfile (stderr);
 
-			  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-			  ((_IO_FILE *) stderr)->_flags2
-			    |= _IO_FLAGS2_NOTCANCEL;
+                          int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+                          ((_IO_FILE *) stderr)->_flags2
+                            |= _IO_FLAGS2_NOTCANCEL;
 
-			  __fxprintf (NULL, "%s", buf);
+                          __fxprintf (NULL, "%s", buf);
 
-			  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-			  _IO_funlockfile (stderr);
+                          ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+                          _IO_funlockfile (stderr);
 
-			  free (buf);
-			}
+                          free (buf);
+                        }
 #else
-		      fprintf (stderr,
-			       _("%s: option `%s' requires an argument\n"),
-			       argv[0], argv[d->optind - 1]);
+                      fprintf (stderr,
+                               _("%s: option '%s' requires an argument\n"),
+                               argv[0], argv[d->optind - 1]);
 #endif
-		    }
-		  d->__nextchar += strlen (d->__nextchar);
-		  d->optopt = pfound->val;
-		  return optstring[0] == ':' ? ':' : '?';
-		}
-	    }
-	  d->__nextchar += strlen (d->__nextchar);
-	  if (longind != NULL)
-	    *longind = option_index;
-	  if (pfound->flag)
-	    {
-	      *(pfound->flag) = pfound->val;
-	      return 0;
-	    }
-	  return pfound->val;
-	}
+                    }
+                  d->__nextchar += strlen (d->__nextchar);
+                  d->optopt = pfound->val;
+                  return optstring[0] == ':' ? ':' : '?';
+                }
+            }
+          d->__nextchar += strlen (d->__nextchar);
+          if (longind != NULL)
+            *longind = option_index;
+          if (pfound->flag)
+            {
+              *(pfound->flag) = pfound->val;
+              return 0;
+            }
+          return pfound->val;
+        }
 
       /* Can't find it as a long option.  If this is not getopt_long_only,
-	 or the option starts with '--' or is not a valid short
-	 option, then it's an error.
-	 Otherwise interpret it as a short option.  */
+         or the option starts with '--' or is not a valid short
+         option, then it's an error.
+         Otherwise interpret it as a short option.  */
       if (!long_only || argv[d->optind][1] == '-'
-	  || strchr (optstring, *d->__nextchar) == NULL)
-	{
-	  if (print_errors)
-	    {
+          || strchr (optstring, *d->__nextchar) == NULL)
+        {
+          if (print_errors)
+            {
 #if defined _LIBC && defined USE_IN_LIBIO
-	      char *buf;
-	      int n;
+              char *buf;
+              int n;
 #endif
 
-	      if (argv[d->optind][1] == '-')
-		{
-		  /* --option */
+              if (argv[d->optind][1] == '-')
+                {
+                  /* --option */
 #if defined _LIBC && defined USE_IN_LIBIO
-		  n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"),
-				  argv[0], d->__nextchar);
+                  n = __asprintf (&buf, _("%s: unrecognized option '--%s'\n"),
+                                  argv[0], d->__nextchar);
 #else
-		  fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
-			   argv[0], d->__nextchar);
+                  fprintf (stderr, _("%s: unrecognized option '--%s'\n"),
+                           argv[0], d->__nextchar);
 #endif
-		}
-	      else
-		{
-		  /* +option or -option */
+                }
+              else
+                {
+                  /* +option or -option */
 #if defined _LIBC && defined USE_IN_LIBIO
-		  n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"),
-				  argv[0], argv[d->optind][0], d->__nextchar);
+                  n = __asprintf (&buf, _("%s: unrecognized option '%c%s'\n"),
+                                  argv[0], argv[d->optind][0], d->__nextchar);
 #else
-		  fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
-			   argv[0], argv[d->optind][0], d->__nextchar);
+                  fprintf (stderr, _("%s: unrecognized option '%c%s'\n"),
+                           argv[0], argv[d->optind][0], d->__nextchar);
 #endif
-		}
+                }
 
 #if defined _LIBC && defined USE_IN_LIBIO
-	      if (n >= 0)
-		{
-		  _IO_flockfile (stderr);
+              if (n >= 0)
+                {
+                  _IO_flockfile (stderr);
 
-		  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-		  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+                  int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+                  ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
 
-		  __fxprintf (NULL, "%s", buf);
+                  __fxprintf (NULL, "%s", buf);
 
-		  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-		  _IO_funlockfile (stderr);
+                  ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+                  _IO_funlockfile (stderr);
 
-		  free (buf);
-		}
+                  free (buf);
+                }
 #endif
-	    }
-	  d->__nextchar = (char *) "";
-	  d->optind++;
-	  d->optopt = 0;
-	  return '?';
-	}
+            }
+          d->__nextchar = (char *) "";
+          d->optind++;
+          d->optopt = 0;
+          return '?';
+        }
     }
 
   /* Look at and handle the next short option-character.  */
@@ -745,335 +744,321 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
 
     if (temp == NULL || c == ':')
       {
-	if (print_errors)
-	  {
+        if (print_errors)
+          {
 #if defined _LIBC && defined USE_IN_LIBIO
-	      char *buf;
-	      int n;
+              char *buf;
+              int n;
 #endif
 
-	    if (d->__posixly_correct)
-	      {
-		/* 1003.2 specifies the format of this message.  */
 #if defined _LIBC && defined USE_IN_LIBIO
-		n = __asprintf (&buf, _("%s: illegal option -- %c\n"),
-				argv[0], c);
+              n = __asprintf (&buf, _("%s: invalid option -- '%c'\n"),
+                              argv[0], c);
 #else
-		fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c);
+              fprintf (stderr, _("%s: invalid option -- '%c'\n"), argv[0], c);
 #endif
-	      }
-	    else
-	      {
-#if defined _LIBC && defined USE_IN_LIBIO
-		n = __asprintf (&buf, _("%s: invalid option -- %c\n"),
-				argv[0], c);
-#else
-		fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c);
-#endif
-	      }
 
 #if defined _LIBC && defined USE_IN_LIBIO
-	    if (n >= 0)
-	      {
-		_IO_flockfile (stderr);
+            if (n >= 0)
+              {
+                _IO_flockfile (stderr);
 
-		int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-		((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+                int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+                ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
 
-		__fxprintf (NULL, "%s", buf);
+                __fxprintf (NULL, "%s", buf);
 
-		((_IO_FILE *) stderr)->_flags2 = old_flags2;
-		_IO_funlockfile (stderr);
+                ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+                _IO_funlockfile (stderr);
 
-		free (buf);
-	      }
+                free (buf);
+              }
 #endif
-	  }
-	d->optopt = c;
-	return '?';
+          }
+        d->optopt = c;
+        return '?';
       }
     /* Convenience. Treat POSIX -W foo same as long option --foo */
     if (temp[0] == 'W' && temp[1] == ';')
       {
-	char *nameend;
-	const struct option *p;
-	const struct option *pfound = NULL;
-	int exact = 0;
-	int ambig = 0;
-	int indfound = 0;
-	int option_index;
+        char *nameend;
+        const struct option *p;
+        const struct option *pfound = NULL;
+        int exact = 0;
+        int ambig = 0;
+        int indfound = 0;
+        int option_index;
 
-	/* This is an option that requires an argument.  */
-	if (*d->__nextchar != '\0')
-	  {
-	    d->optarg = d->__nextchar;
-	    /* If we end this ARGV-element by taking the rest as an arg,
-	       we must advance to the next element now.  */
-	    d->optind++;
-	  }
-	else if (d->optind == argc)
-	  {
-	    if (print_errors)
-	      {
-		/* 1003.2 specifies the format of this message.  */
+        /* This is an option that requires an argument.  */
+        if (*d->__nextchar != '\0')
+          {
+            d->optarg = d->__nextchar;
+            /* If we end this ARGV-element by taking the rest as an arg,
+               we must advance to the next element now.  */
+            d->optind++;
+          }
+        else if (d->optind == argc)
+          {
+            if (print_errors)
+              {
 #if defined _LIBC && defined USE_IN_LIBIO
-		char *buf;
+                char *buf;
 
-		if (__asprintf (&buf,
-				_("%s: option requires an argument -- %c\n"),
-				argv[0], c) >= 0)
-		  {
-		    _IO_flockfile (stderr);
+                if (__asprintf (&buf,
+                                _("%s: option requires an argument -- '%c'\n"),
+                                argv[0], c) >= 0)
+                  {
+                    _IO_flockfile (stderr);
 
-		    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-		    ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+                    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+                    ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
 
-		    __fxprintf (NULL, "%s", buf);
+                    __fxprintf (NULL, "%s", buf);
 
-		    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-		    _IO_funlockfile (stderr);
+                    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+                    _IO_funlockfile (stderr);
 
-		    free (buf);
-		  }
+                    free (buf);
+                  }
 #else
-		fprintf (stderr, _("%s: option requires an argument -- %c\n"),
-			 argv[0], c);
+                fprintf (stderr,
+                         _("%s: option requires an argument -- '%c'\n"),
+                         argv[0], c);
 #endif
-	      }
-	    d->optopt = c;
-	    if (optstring[0] == ':')
-	      c = ':';
-	    else
-	      c = '?';
-	    return c;
-	  }
-	else
-	  /* We already incremented `d->optind' once;
-	     increment it again when taking next ARGV-elt as argument.  */
-	  d->optarg = argv[d->optind++];
+              }
+            d->optopt = c;
+            if (optstring[0] == ':')
+              c = ':';
+            else
+              c = '?';
+            return c;
+          }
+        else
+          /* We already incremented `d->optind' once;
+             increment it again when taking next ARGV-elt as argument.  */
+          d->optarg = argv[d->optind++];
 
-	/* optarg is now the argument, see if it's in the
-	   table of longopts.  */
+        /* optarg is now the argument, see if it's in the
+           table of longopts.  */
 
-	for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '=';
-	     nameend++)
-	  /* Do nothing.  */ ;
+        for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '=';
+             nameend++)
+          /* Do nothing.  */ ;
 
-	/* Test all long options for either exact match
-	   or abbreviated matches.  */
-	for (p = longopts, option_index = 0; p->name; p++, option_index++)
-	  if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
-	    {
-	      if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name))
-		{
-		  /* Exact match found.  */
-		  pfound = p;
-		  indfound = option_index;
-		  exact = 1;
-		  break;
-		}
-	      else if (pfound == NULL)
-		{
-		  /* First nonexact match found.  */
-		  pfound = p;
-		  indfound = option_index;
-		}
-	      else
-		/* Second or later nonexact match found.  */
-		ambig = 1;
-	    }
-	if (ambig && !exact)
-	  {
-	    if (print_errors)
-	      {
+        /* Test all long options for either exact match
+           or abbreviated matches.  */
+        for (p = longopts, option_index = 0; p->name; p++, option_index++)
+          if (!strncmp (p->name, d->__nextchar, nameend - d->__nextchar))
+            {
+              if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name))
+                {
+                  /* Exact match found.  */
+                  pfound = p;
+                  indfound = option_index;
+                  exact = 1;
+                  break;
+                }
+              else if (pfound == NULL)
+                {
+                  /* First nonexact match found.  */
+                  pfound = p;
+                  indfound = option_index;
+                }
+              else
+                /* Second or later nonexact match found.  */
+                ambig = 1;
+            }
+        if (ambig && !exact)
+          {
+            if (print_errors)
+              {
 #if defined _LIBC && defined USE_IN_LIBIO
-		char *buf;
+                char *buf;
 
-		if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"),
-				argv[0], argv[d->optind]) >= 0)
-		  {
-		    _IO_flockfile (stderr);
+                if (__asprintf (&buf, _("%s: option '-W %s' is ambiguous\n"),
+                                argv[0], argv[d->optind]) >= 0)
+                  {
+                    _IO_flockfile (stderr);
 
-		    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-		    ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+                    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+                    ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
 
-		    __fxprintf (NULL, "%s", buf);
+                    __fxprintf (NULL, "%s", buf);
 
-		    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-		    _IO_funlockfile (stderr);
+                    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+                    _IO_funlockfile (stderr);
 
-		    free (buf);
-		  }
+                    free (buf);
+                  }
 #else
-		fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
-			 argv[0], argv[d->optind]);
+                fprintf (stderr, _("%s: option '-W %s' is ambiguous\n"),
+                         argv[0], argv[d->optind]);
 #endif
-	      }
-	    d->__nextchar += strlen (d->__nextchar);
-	    d->optind++;
-	    return '?';
-	  }
-	if (pfound != NULL)
-	  {
-	    option_index = indfound;
-	    if (*nameend)
-	      {
-		/* Don't test has_arg with >, because some C compilers don't
-		   allow it to be used on enums.  */
-		if (pfound->has_arg)
-		  d->optarg = nameend + 1;
-		else
-		  {
-		    if (print_errors)
-		      {
+              }
+            d->__nextchar += strlen (d->__nextchar);
+            d->optind++;
+            return '?';
+          }
+        if (pfound != NULL)
+          {
+            option_index = indfound;
+            if (*nameend)
+              {
+                /* Don't test has_arg with >, because some C compilers don't
+                   allow it to be used on enums.  */
+                if (pfound->has_arg)
+                  d->optarg = nameend + 1;
+                else
+                  {
+                    if (print_errors)
+                      {
 #if defined _LIBC && defined USE_IN_LIBIO
-			char *buf;
+                        char *buf;
 
-			if (__asprintf (&buf, _("\
-%s: option `-W %s' doesn't allow an argument\n"),
-					argv[0], pfound->name) >= 0)
-			  {
-			    _IO_flockfile (stderr);
+                        if (__asprintf (&buf, _("\
+%s: option '-W %s' doesn't allow an argument\n"),
+                                        argv[0], pfound->name) >= 0)
+                          {
+                            _IO_flockfile (stderr);
 
-			    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-			    ((_IO_FILE *) stderr)->_flags2
-			      |= _IO_FLAGS2_NOTCANCEL;
+                            int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+                            ((_IO_FILE *) stderr)->_flags2
+                              |= _IO_FLAGS2_NOTCANCEL;
 
-			    __fxprintf (NULL, "%s", buf);
+                            __fxprintf (NULL, "%s", buf);
 
-			    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-			    _IO_funlockfile (stderr);
+                            ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+                            _IO_funlockfile (stderr);
 
-			    free (buf);
-			  }
+                            free (buf);
+                          }
 #else
-			fprintf (stderr, _("\
-%s: option `-W %s' doesn't allow an argument\n"),
-				 argv[0], pfound->name);
+                        fprintf (stderr, _("\
+%s: option '-W %s' doesn't allow an argument\n"),
+                                 argv[0], pfound->name);
 #endif
-		      }
+                      }
 
-		    d->__nextchar += strlen (d->__nextchar);
-		    return '?';
-		  }
-	      }
-	    else if (pfound->has_arg == 1)
-	      {
-		if (d->optind < argc)
-		  d->optarg = argv[d->optind++];
-		else
-		  {
-		    if (print_errors)
-		      {
+                    d->__nextchar += strlen (d->__nextchar);
+                    return '?';
+                  }
+              }
+            else if (pfound->has_arg == 1)
+              {
+                if (d->optind < argc)
+                  d->optarg = argv[d->optind++];
+                else
+                  {
+                    if (print_errors)
+                      {
 #if defined _LIBC && defined USE_IN_LIBIO
-			char *buf;
+                        char *buf;
 
-			if (__asprintf (&buf, _("\
-%s: option `%s' requires an argument\n"),
-					argv[0], argv[d->optind - 1]) >= 0)
-			  {
-			    _IO_flockfile (stderr);
+                        if (__asprintf (&buf, _("\
+%s: option '%s' requires an argument\n"),
+                                        argv[0], argv[d->optind - 1]) >= 0)
+                          {
+                            _IO_flockfile (stderr);
 
-			    int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-			    ((_IO_FILE *) stderr)->_flags2
-			      |= _IO_FLAGS2_NOTCANCEL;
+                            int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+                            ((_IO_FILE *) stderr)->_flags2
+                              |= _IO_FLAGS2_NOTCANCEL;
 
-			    __fxprintf (NULL, "%s", buf);
+                            __fxprintf (NULL, "%s", buf);
 
-			    ((_IO_FILE *) stderr)->_flags2 = old_flags2;
-			    _IO_funlockfile (stderr);
+                            ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+                            _IO_funlockfile (stderr);
 
-			    free (buf);
-			  }
+                            free (buf);
+                          }
 #else
-			fprintf (stderr,
-				 _("%s: option `%s' requires an argument\n"),
-				 argv[0], argv[d->optind - 1]);
+                        fprintf (stderr,
+                                 _("%s: option '%s' requires an argument\n"),
+                                 argv[0], argv[d->optind - 1]);
 #endif
-		      }
-		    d->__nextchar += strlen (d->__nextchar);
-		    return optstring[0] == ':' ? ':' : '?';
-		  }
-	      }
-	    d->__nextchar += strlen (d->__nextchar);
-	    if (longind != NULL)
-	      *longind = option_index;
-	    if (pfound->flag)
-	      {
-		*(pfound->flag) = pfound->val;
-		return 0;
-	      }
-	    return pfound->val;
-	  }
-	  d->__nextchar = NULL;
-	  return 'W';	/* Let the application handle it.   */
+                      }
+                    d->__nextchar += strlen (d->__nextchar);
+                    return optstring[0] == ':' ? ':' : '?';
+                  }
+              }
+            d->__nextchar += strlen (d->__nextchar);
+            if (longind != NULL)
+              *longind = option_index;
+            if (pfound->flag)
+              {
+                *(pfound->flag) = pfound->val;
+                return 0;
+              }
+            return pfound->val;
+          }
+          d->__nextchar = NULL;
+          return 'W';   /* Let the application handle it.   */
       }
     if (temp[1] == ':')
       {
-	if (temp[2] == ':')
-	  {
-	    /* This is an option that accepts an argument optionally.  */
-	    if (*d->__nextchar != '\0')
-	      {
-		d->optarg = d->__nextchar;
-		d->optind++;
-	      }
-	    else
-	      d->optarg = NULL;
-	    d->__nextchar = NULL;
-	  }
-	else
-	  {
-	    /* This is an option that requires an argument.  */
-	    if (*d->__nextchar != '\0')
-	      {
-		d->optarg = d->__nextchar;
-		/* If we end this ARGV-element by taking the rest as an arg,
-		   we must advance to the next element now.  */
-		d->optind++;
-	      }
-	    else if (d->optind == argc)
-	      {
-		if (print_errors)
-		  {
-		    /* 1003.2 specifies the format of this message.  */
+        if (temp[2] == ':')
+          {
+            /* This is an option that accepts an argument optionally.  */
+            if (*d->__nextchar != '\0')
+              {
+                d->optarg = d->__nextchar;
+                d->optind++;
+              }
+            else
+              d->optarg = NULL;
+            d->__nextchar = NULL;
+          }
+        else
+          {
+            /* This is an option that requires an argument.  */
+            if (*d->__nextchar != '\0')
+              {
+                d->optarg = d->__nextchar;
+                /* If we end this ARGV-element by taking the rest as an arg,
+                   we must advance to the next element now.  */
+                d->optind++;
+              }
+            else if (d->optind == argc)
+              {
+                if (print_errors)
+                  {
 #if defined _LIBC && defined USE_IN_LIBIO
-		    char *buf;
+                    char *buf;
 
-		    if (__asprintf (&buf, _("\
-%s: option requires an argument -- %c\n"),
-				    argv[0], c) >= 0)
-		      {
-			_IO_flockfile (stderr);
+                    if (__asprintf (&buf, _("\
+%s: option requires an argument -- '%c'\n"),
+                                    argv[0], c) >= 0)
+                      {
+                        _IO_flockfile (stderr);
 
-			int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
-			((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
+                        int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
+                        ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
 
-			__fxprintf (NULL, "%s", buf);
+                        __fxprintf (NULL, "%s", buf);
 
-			((_IO_FILE *) stderr)->_flags2 = old_flags2;
-			_IO_funlockfile (stderr);
+                        ((_IO_FILE *) stderr)->_flags2 = old_flags2;
+                        _IO_funlockfile (stderr);
 
-			free (buf);
-		      }
+                        free (buf);
+                      }
 #else
-		    fprintf (stderr,
-			     _("%s: option requires an argument -- %c\n"),
-			     argv[0], c);
+                    fprintf (stderr,
+                             _("%s: option requires an argument -- '%c'\n"),
+                             argv[0], c);
 #endif
-		  }
-		d->optopt = c;
-		if (optstring[0] == ':')
-		  c = ':';
-		else
-		  c = '?';
-	      }
-	    else
-	      /* We already incremented `optind' once;
-		 increment it again when taking next ARGV-elt as argument.  */
-	      d->optarg = argv[d->optind++];
-	    d->__nextchar = NULL;
-	  }
+                  }
+                d->optopt = c;
+                if (optstring[0] == ':')
+                  c = ':';
+                else
+                  c = '?';
+              }
+            else
+              /* We already incremented `optind' once;
+                 increment it again when taking next ARGV-elt as argument.  */
+              d->optarg = argv[d->optind++];
+            d->__nextchar = NULL;
+          }
       }
     return c;
   }
@@ -1081,16 +1066,17 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
 
 int
 _getopt_internal (int argc, char **argv, const char *optstring,
-		  const struct option *longopts, int *longind,
-		  int long_only, int posixly_correct)
+                  const struct option *longopts, int *longind, int long_only,
+                  int posixly_correct)
 {
   int result;
 
   getopt_data.optind = optind;
   getopt_data.opterr = opterr;
 
-  result = _getopt_internal_r (argc, argv, optstring, longopts, longind,
-			       long_only, posixly_correct, &getopt_data);
+  result = _getopt_internal_r (argc, argv, optstring, longopts,
+                               longind, long_only, &getopt_data,
+                               posixly_correct);
 
   optind = getopt_data.optind;
   optarg = getopt_data.optarg;
@@ -1110,10 +1096,23 @@ enum { POSIXLY_CORRECT = 1 };
 int
 getopt (int argc, char *const *argv, const char *optstring)
 {
-  return _getopt_internal (argc, (char **) argv, optstring, NULL, NULL, 0,
-			   POSIXLY_CORRECT);
+  return _getopt_internal (argc, (char **) argv, optstring,
+                           (const struct option *) 0,
+                           (int *) 0,
+                           0, POSIXLY_CORRECT);
 }
 
+#ifdef _LIBC
+int
+__posix_getopt (int argc, char *const *argv, const char *optstring)
+{
+  return _getopt_internal (argc, argv, optstring,
+                           (const struct option *) 0,
+                           (int *) 0,
+                           0, 1);
+}
+#endif
+
 
 #ifdef TEST
 
@@ -1132,51 +1131,51 @@ main (int argc, char **argv)
 
       c = getopt (argc, argv, "abc:d:0123456789");
       if (c == -1)
-	break;
+        break;
 
       switch (c)
-	{
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	  if (digit_optind != 0 && digit_optind != this_option_optind)
-	    printf ("digits occur in two different argv-elements.\n");
-	  digit_optind = this_option_optind;
-	  printf ("option %c\n", c);
-	  break;
+        {
+        case '0':
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+        case '8':
+        case '9':
+          if (digit_optind != 0 && digit_optind != this_option_optind)
+            printf ("digits occur in two different argv-elements.\n");
+          digit_optind = this_option_optind;
+          printf ("option %c\n", c);
+          break;
 
-	case 'a':
-	  printf ("option a\n");
-	  break;
+        case 'a':
+          printf ("option a\n");
+          break;
 
-	case 'b':
-	  printf ("option b\n");
-	  break;
+        case 'b':
+          printf ("option b\n");
+          break;
 
-	case 'c':
-	  printf ("option c with value `%s'\n", optarg);
-	  break;
+        case 'c':
+          printf ("option c with value '%s'\n", optarg);
+          break;
 
-	case '?':
-	  break;
+        case '?':
+          break;
 
-	default:
-	  printf ("?? getopt returned character code 0%o ??\n", c);
-	}
+        default:
+          printf ("?? getopt returned character code 0%o ??\n", c);
+        }
     }
 
   if (optind < argc)
     {
       printf ("non-option ARGV-elements: ");
       while (optind < argc)
-	printf ("%s ", argv[optind++]);
+        printf ("%s ", argv[optind++]);
       printf ("\n");
     }
 
diff --git a/gnulib/getopt1.c b/gnulib/getopt1.c
index d6a3ecf4e..046d69f94 100644
--- a/gnulib/getopt1.c
+++ b/gnulib/getopt1.c
@@ -1,6 +1,6 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004,2006
-     Free Software Foundation, Inc.
+   Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997,
+   1998, 2004, 2006, 2009, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
@@ -32,25 +32,25 @@
 #include <stdlib.h>
 #endif
 
-#ifndef	NULL
+#ifndef NULL
 #define NULL 0
 #endif
 
 int
 getopt_long (int argc, char *__getopt_argv_const *argv, const char *options,
-	     const struct option *long_options, int *opt_index)
+             const struct option *long_options, int *opt_index)
 {
   return _getopt_internal (argc, (char **) argv, options, long_options,
-			   opt_index, 0, 0);
+                           opt_index, 0, 0);
 }
 
 int
 _getopt_long_r (int argc, char **argv, const char *options,
-		const struct option *long_options, int *opt_index,
-		struct _getopt_data *d)
+                const struct option *long_options, int *opt_index,
+                struct _getopt_data *d)
 {
   return _getopt_internal_r (argc, argv, options, long_options, opt_index,
-			     0, 0, d);
+                             0, d, 0);
 }
 
 /* Like getopt_long, but '-' as well as '--' can indicate a long option.
@@ -60,20 +60,20 @@ _getopt_long_r (int argc, char **argv, const char *options,
 
 int
 getopt_long_only (int argc, char *__getopt_argv_const *argv,
-		  const char *options,
-		  const struct option *long_options, int *opt_index)
+                  const char *options,
+                  const struct option *long_options, int *opt_index)
 {
   return _getopt_internal (argc, (char **) argv, options, long_options,
-			   opt_index, 1, 0);
+                           opt_index, 1, 0);
 }
 
 int
 _getopt_long_only_r (int argc, char **argv, const char *options,
-		     const struct option *long_options, int *opt_index,
-		     struct _getopt_data *d)
+                     const struct option *long_options, int *opt_index,
+                     struct _getopt_data *d)
 {
   return _getopt_internal_r (argc, argv, options, long_options, opt_index,
-			     1, 0, d);
+                             1, d, 0);
 }
 
 
@@ -91,76 +91,76 @@ main (int argc, char **argv)
     {
       int this_option_optind = optind ? optind : 1;
       int option_index = 0;
-      static struct option long_options[] =
+      static const struct option long_options[] =
       {
-	{"add", 1, 0, 0},
-	{"append", 0, 0, 0},
-	{"delete", 1, 0, 0},
-	{"verbose", 0, 0, 0},
-	{"create", 0, 0, 0},
-	{"file", 1, 0, 0},
-	{0, 0, 0, 0}
+        {"add", 1, 0, 0},
+        {"append", 0, 0, 0},
+        {"delete", 1, 0, 0},
+        {"verbose", 0, 0, 0},
+        {"create", 0, 0, 0},
+        {"file", 1, 0, 0},
+        {0, 0, 0, 0}
       };
 
       c = getopt_long (argc, argv, "abc:d:0123456789",
-		       long_options, &option_index);
+                       long_options, &option_index);
       if (c == -1)
-	break;
+        break;
 
       switch (c)
-	{
-	case 0:
-	  printf ("option %s", long_options[option_index].name);
-	  if (optarg)
-	    printf (" with arg %s", optarg);
-	  printf ("\n");
-	  break;
+        {
+        case 0:
+          printf ("option %s", long_options[option_index].name);
+          if (optarg)
+            printf (" with arg %s", optarg);
+          printf ("\n");
+          break;
 
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':
-	  if (digit_optind != 0 && digit_optind != this_option_optind)
-	    printf ("digits occur in two different argv-elements.\n");
-	  digit_optind = this_option_optind;
-	  printf ("option %c\n", c);
-	  break;
+        case '0':
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+        case '8':
+        case '9':
+          if (digit_optind != 0 && digit_optind != this_option_optind)
+            printf ("digits occur in two different argv-elements.\n");
+          digit_optind = this_option_optind;
+          printf ("option %c\n", c);
+          break;
 
-	case 'a':
-	  printf ("option a\n");
-	  break;
+        case 'a':
+          printf ("option a\n");
+          break;
 
-	case 'b':
-	  printf ("option b\n");
-	  break;
+        case 'b':
+          printf ("option b\n");
+          break;
 
-	case 'c':
-	  printf ("option c with value `%s'\n", optarg);
-	  break;
+        case 'c':
+          printf ("option c with value `%s'\n", optarg);
+          break;
 
-	case 'd':
-	  printf ("option d with value `%s'\n", optarg);
-	  break;
+        case 'd':
+          printf ("option d with value `%s'\n", optarg);
+          break;
 
-	case '?':
-	  break;
+        case '?':
+          break;
 
-	default:
-	  printf ("?? getopt returned character code 0%o ??\n", c);
-	}
+        default:
+          printf ("?? getopt returned character code 0%o ??\n", c);
+        }
     }
 
   if (optind < argc)
     {
       printf ("non-option ARGV-elements: ");
       while (optind < argc)
-	printf ("%s ", argv[optind++]);
+        printf ("%s ", argv[optind++]);
       printf ("\n");
     }
 
diff --git a/gnulib/getopt_int.h b/gnulib/getopt_int.h
index 3c6628bb9..169def5b2 100644
--- a/gnulib/getopt_int.h
+++ b/gnulib/getopt_int.h
@@ -1,6 +1,6 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2010 Free Software
+   Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
@@ -17,12 +17,14 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _GETOPT_INT_H
-#define _GETOPT_INT_H	1
+#define _GETOPT_INT_H   1
+
+#include <getopt.h>
 
 extern int _getopt_internal (int ___argc, char **___argv,
-			     const char *__shortopts,
-		             const struct option *__longopts, int *__longind,
-			     int __long_only, int __posixly_correct);
+                             const char *__shortopts,
+                             const struct option *__longopts, int *__longind,
+                             int __long_only, int __posixly_correct);
 
 
 /* Reentrant versions which can handle parsing multiple argument
@@ -108,23 +110,23 @@ struct _getopt_data
 
 /* The initializer is necessary to set OPTIND and OPTERR to their
    default values and to clear the initialization flag.  */
-#define _GETOPT_DATA_INITIALIZER	{ 1, 1 }
+#define _GETOPT_DATA_INITIALIZER        { 1, 1 }
 
 extern int _getopt_internal_r (int ___argc, char **___argv,
-			       const char *__shortopts,
-			       const struct option *__longopts, int *__longind,
-			       int __long_only, int __posixly_correct,
-			       struct _getopt_data *__data);
+                               const char *__shortopts,
+                               const struct option *__longopts, int *__longind,
+                               int __long_only, struct _getopt_data *__data,
+                               int __posixly_correct);
 
 extern int _getopt_long_r (int ___argc, char **___argv,
-			   const char *__shortopts,
-			   const struct option *__longopts, int *__longind,
-			   struct _getopt_data *__data);
+                           const char *__shortopts,
+                           const struct option *__longopts, int *__longind,
+                           struct _getopt_data *__data);
 
 extern int _getopt_long_only_r (int ___argc, char **___argv,
-				const char *__shortopts,
-				const struct option *__longopts,
-				int *__longind,
-				struct _getopt_data *__data);
+                                const char *__shortopts,
+                                const struct option *__longopts,
+                                int *__longind,
+                                struct _getopt_data *__data);
 
 #endif /* getopt_int.h */
diff --git a/gnulib/gettext.h b/gnulib/gettext.h
index 9d76ec9af..6a069c448 100644
--- a/gnulib/gettext.h
+++ b/gnulib/gettext.h
@@ -1,5 +1,6 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2010 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -63,21 +64,30 @@
    for invalid uses of the value returned from these functions.
    On pre-ANSI systems without 'const', the config.h file is supposed to
    contain "#define const".  */
+# undef gettext
 # define gettext(Msgid) ((const char *) (Msgid))
+# undef dgettext
 # define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid))
+# undef dcgettext
 # define dcgettext(Domainname, Msgid, Category) \
     ((void) (Category), dgettext (Domainname, Msgid))
+# undef ngettext
 # define ngettext(Msgid1, Msgid2, N) \
     ((N) == 1 \
      ? ((void) (Msgid2), (const char *) (Msgid1)) \
      : ((void) (Msgid1), (const char *) (Msgid2)))
+# undef dngettext
 # define dngettext(Domainname, Msgid1, Msgid2, N) \
     ((void) (Domainname), ngettext (Msgid1, Msgid2, N))
+# undef dcngettext
 # define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-    ((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N))
+    ((void) (Category), dngettext (Domainname, Msgid1, Msgid2, N))
+# undef textdomain
 # define textdomain(Domainname) ((const char *) (Domainname))
+# undef bindtextdomain
 # define bindtextdomain(Domainname, Dirname) \
     ((void) (Domainname), (const char *) (Dirname))
+# undef bind_textdomain_codeset
 # define bind_textdomain_codeset(Domainname, Codeset) \
     ((void) (Domainname), (const char *) (Codeset))
 
@@ -131,8 +141,8 @@ inline
 #endif
 static const char *
 pgettext_aux (const char *domain,
-	      const char *msg_ctxt_id, const char *msgid,
-	      int category)
+              const char *msg_ctxt_id, const char *msgid,
+              int category)
 {
   const char *translation = dcgettext (domain, msg_ctxt_id, category);
   if (translation == msg_ctxt_id)
@@ -150,9 +160,9 @@ inline
 #endif
 static const char *
 npgettext_aux (const char *domain,
-	       const char *msg_ctxt_id, const char *msgid,
-	       const char *msgid_plural, unsigned long int n,
-	       int category)
+               const char *msg_ctxt_id, const char *msgid,
+               const char *msgid_plural, unsigned long int n,
+               int category)
 {
   const char *translation =
     dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
@@ -190,8 +200,8 @@ inline
 #endif
 static const char *
 dcpgettext_expr (const char *domain,
-		 const char *msgctxt, const char *msgid,
-		 int category)
+                 const char *msgctxt, const char *msgid,
+                 int category)
 {
   size_t msgctxt_len = strlen (msgctxt) + 1;
   size_t msgid_len = strlen (msgid) + 1;
@@ -213,10 +223,10 @@ dcpgettext_expr (const char *domain,
       translation = dcgettext (domain, msg_ctxt_id, category);
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
-	free (msg_ctxt_id);
+        free (msg_ctxt_id);
 #endif
       if (translation != msg_ctxt_id)
-	return translation;
+        return translation;
     }
   return msgid;
 }
@@ -235,9 +245,9 @@ inline
 #endif
 static const char *
 dcnpgettext_expr (const char *domain,
-		  const char *msgctxt, const char *msgid,
-		  const char *msgid_plural, unsigned long int n,
-		  int category)
+                  const char *msgctxt, const char *msgid,
+                  const char *msgid_plural, unsigned long int n,
+                  int category)
 {
   size_t msgctxt_len = strlen (msgctxt) + 1;
   size_t msgid_len = strlen (msgid) + 1;
@@ -259,10 +269,10 @@ dcnpgettext_expr (const char *domain,
       translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
-	free (msg_ctxt_id);
+        free (msg_ctxt_id);
 #endif
       if (!(translation == msg_ctxt_id || translation == msgid_plural))
-	return translation;
+        return translation;
     }
   return (n == 1 ? msgid : msgid_plural);
 }
diff --git a/gnulib/progname.c b/gnulib/progname.c
index bfa374a52..1415e6a55 100644
--- a/gnulib/progname.c
+++ b/gnulib/progname.c
@@ -1,6 +1,6 @@
 /* Program name management.
-   Copyright (C) 2001-2003, 2005-2009 Free Software Foundation, Inc.
-   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
+   Copyright (C) 2001-2003, 2005-2010 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,6 +23,8 @@
 #include "progname.h"
 
 #include <errno.h> /* get program_invocation_name declaration */
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 
@@ -30,7 +32,9 @@
    To be initialized by main().  */
 const char *program_name = NULL;
 
-/* Set program_name, based on argv[0].  */
+/* Set program_name, based on argv[0].
+   argv0 must be a string allocated with indefinite extent, and must not be
+   modified after this call.  */
 void
 set_program_name (const char *argv0)
 {
@@ -42,20 +46,30 @@ set_program_name (const char *argv0)
   const char *slash;
   const char *base;
 
+  /* Sanity check.  POSIX requires the invoking process to pass a non-NULL
+     argv[0].  */
+  if (argv0 == NULL)
+    {
+      /* It's a bug in the invoking program.  Help diagnosing it.  */
+      fputs ("A NULL argv[0] was passed through an exec system call.\n",
+             stderr);
+      abort ();
+    }
+
   slash = strrchr (argv0, '/');
   base = (slash != NULL ? slash + 1 : argv0);
   if (base - argv0 >= 7 && strncmp (base - 7, "/.libs/", 7) == 0)
     {
       argv0 = base;
       if (strncmp (base, "lt-", 3) == 0)
-	{
-	  argv0 = base + 3;
-	  /* On glibc systems, remove the "lt-" prefix from the variable
-	     program_invocation_short_name.  */
+        {
+          argv0 = base + 3;
+          /* On glibc systems, remove the "lt-" prefix from the variable
+             program_invocation_short_name.  */
 #if HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
-	  program_invocation_short_name = (char *) argv0;
+          program_invocation_short_name = (char *) argv0;
 #endif
-	}
+        }
     }
 
   /* But don't strip off a leading <dirname>/ in general, because when the user
diff --git a/gnulib/progname.h b/gnulib/progname.h
index 82615c6bc..5ba303bd0 100644
--- a/gnulib/progname.h
+++ b/gnulib/progname.h
@@ -1,6 +1,6 @@
 /* Program name management.
-   Copyright (C) 2001-2004, 2006 Free Software Foundation, Inc.
-   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
+   Copyright (C) 2001-2004, 2006, 2009-2010 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -31,7 +31,9 @@ extern "C" {
 /* String containing name the program is called with.  */
 extern const char *program_name;
 
-/* Set program_name, based on argv[0].  */
+/* Set program_name, based on argv[0].
+   argv0 must be a string allocated with indefinite extent, and must not be
+   modified after this call.  */
 extern void set_program_name (const char *argv0);
 
 #if ENABLE_RELOCATABLE
@@ -39,8 +41,8 @@ extern void set_program_name (const char *argv0);
 /* Set program_name, based on argv[0], and original installation prefix and
    directory, for relocatability.  */
 extern void set_program_name_and_installdir (const char *argv0,
-					     const char *orig_installprefix,
-					     const char *orig_installdir);
+                                             const char *orig_installprefix,
+                                             const char *orig_installdir);
 #undef set_program_name
 #define set_program_name(ARG0) \
   set_program_name_and_installdir (ARG0, INSTALLPREFIX, INSTALLDIR)

From 46960ff9ec75f23666c47b745b041c221655acb5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 27 Mar 2010 21:50:57 +0100
Subject: [PATCH 0694/1628] Resynced with multiboot2 spec

---
 include/multiboot2.h | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/include/multiboot2.h b/include/multiboot2.h
index 820479425..59d7c951f 100644
--- a/include/multiboot2.h
+++ b/include/multiboot2.h
@@ -103,24 +103,24 @@ struct multiboot_header
 
 struct multiboot_header_tag
 {
-  multiboot_uint32_t type;
+  multiboot_uint16_t type;
+  multiboot_uint16_t flags;
   multiboot_uint32_t size;
-  multiboot_uint32_t flags;
 };
 
 struct multiboot_header_tag_information_request
 {
-  multiboot_uint32_t type;
+  multiboot_uint16_t type;
+  multiboot_uint16_t flags;
   multiboot_uint32_t size;
-  multiboot_uint32_t flags;
   multiboot_uint32_t requests[0];
 };
 
 struct multiboot_header_tag_address
 {
-  multiboot_uint32_t type;
+  multiboot_uint16_t type;
+  multiboot_uint16_t flags;
   multiboot_uint32_t size;
-  multiboot_uint32_t flags;
   multiboot_uint32_t header_addr;
   multiboot_uint32_t load_addr;
   multiboot_uint32_t load_end_addr;
@@ -129,25 +129,25 @@ struct multiboot_header_tag_address
 
 struct multiboot_header_tag_entry_address
 {
-  multiboot_uint32_t type;
+  multiboot_uint16_t type;
+  multiboot_uint16_t flags;
   multiboot_uint32_t size;
-  multiboot_uint32_t flags;
   multiboot_uint32_t entry_addr;
 };
 
 struct multiboot_header_tag_console_flags
 {
-  multiboot_uint32_t type;
+  multiboot_uint16_t type;
+  multiboot_uint16_t flags;
   multiboot_uint32_t size;
-  multiboot_uint32_t flags;
   multiboot_uint32_t console_flags;
 };
 
 struct multiboot_header_tag_framebuffer
 {
-  multiboot_uint32_t type;
+  multiboot_uint16_t type;
+  multiboot_uint16_t flags;
   multiboot_uint32_t size;
-  multiboot_uint32_t flags;
   multiboot_uint32_t width;
   multiboot_uint32_t height;
   multiboot_uint32_t depth;
@@ -155,9 +155,9 @@ struct multiboot_header_tag_framebuffer
 
 struct multiboot_header_tag_module_align
 {
-  multiboot_uint32_t type;
+  multiboot_uint16_t type;
+  multiboot_uint16_t flags;
   multiboot_uint32_t size;
-  multiboot_uint32_t flags;
   multiboot_uint32_t width;
   multiboot_uint32_t height;
   multiboot_uint32_t depth;
@@ -193,8 +193,6 @@ struct multiboot_tag_string
 {
   multiboot_uint32_t type;
   multiboot_uint32_t size;
-  multiboot_uint32_t entry_size;
-  multiboot_uint32_t entry_version;
   char string[0];
 };
 

From 3a7c36977a37c21d07484ecde445a8cce801a68f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 27 Mar 2010 22:40:49 +0100
Subject: [PATCH 0695/1628] Fix compilation problem

---
 loader/i386/multiboot_mbi2.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/loader/i386/multiboot_mbi2.c b/loader/i386/multiboot_mbi2.c
index d07ce92f3..09d09d5a9 100644
--- a/loader/i386/multiboot_mbi2.c
+++ b/loader/i386/multiboot_mbi2.c
@@ -678,7 +678,6 @@ grub_multiboot_add_module (grub_addr_t start, grub_size_t size,
 void
 grub_multiboot_set_bootdev (void)
 {
-  char *p;
   grub_device_t dev;
 
   slice = ~0;
@@ -696,22 +695,13 @@ grub_multiboot_set_bootdev (void)
   dev = grub_device_open (0);
   if (dev && dev->disk && dev->disk->partition)
     {
-      char *p0;
-      p = p0 = dev->disk->partition->partmap->get_name (dev->disk->partition);
-      if (p)
-	{
-	  if ((p[0] >= '0') && (p[0] <= '9'))
-	    {
-	      slice = grub_strtoul (p, &p, 0) - 1;
-
-	      if ((p) && (p[0] == ','))
-		p++;
-	    }
-
-	  if ((p[0] >= 'a') && (p[0] <= 'z'))
-	    part = p[0] - 'a';
+      if (dev->disk->partition->parent)
+ 	{
+	  part = dev->disk->partition->number;
+	  slice = dev->disk->partition->parent->number;
 	}
-      grub_free (p0);
+      else
+	slice = dev->disk->partition->number;
     }
   if (dev)
     grub_device_close (dev);

From fe9381dd00d957b49e6c92fbb17b6ad4e18f1a21 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 27 Mar 2010 22:42:02 +0100
Subject: [PATCH 0696/1628] Resync changelog

---
 ChangeLog.tag | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.tag b/ChangeLog.tag
index dbeea1017..73983b463 100644
--- a/ChangeLog.tag
+++ b/ChangeLog.tag
@@ -4,13 +4,20 @@
 
 	* conf/i386.rmk (multiboot2_mod_SOURCES): Replace
 	loader/i386/multiboot_mbi.c with loader/i386/multiboot_mbi2.c.
+	Remove loader/multiboot_loader.c.
 	* include/grub/i386/multiboot.h (grub_multiboot_real_boot): Removed.
 	(grub_multiboot2_real_boot): Likewise.
 	* include/grub/multiboot.h (grub_multiboot_set_accepts_video): Removed.
-	(grub_get_multiboot_mmap_len): New proto.
+	(grub_get_multiboot_mmap_count): New proto.
 	(grub_fill_multiboot_mmap): Likewise.
 	(grub_multiboot_set_video_mode): Likewise.
 	(grub_multiboot_fill_vbe_info_real): Likewise.
+	(grub_multiboot_set_console): Likewise.
+	(grub_multiboot_load): Likewise.
+	(grub_multiboot_load_elf): Likewise.
+	(GRUB_MULTIBOOT_CONSOLE_EGA_TEXT): New definition.
+	(GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER): Likewise.
+	* include/multiboot.h: Resynced with specification.
 	* include/multiboot2.h: Resynced with specification.
 	* loader/i386/multiboot_mbi.c (DEFAULT_VIDEO_MODE): Moved from here...
 	* loader/i386/multiboot.c (DEFAULT_VIDEO_MODE): ... here.

From f5d5c327e3884dd99171fc7b5c17669f356f9b28 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 28 Mar 2010 13:46:42 +0200
Subject: [PATCH 0697/1628] Remove VBE multiboot support

---
 ChangeLog.mbivid             |  9 ----
 ChangeLog.tag                |  8 ----
 include/grub/multiboot.h     |  9 ----
 loader/i386/multiboot.c      | 49 +--------------------
 loader/i386/multiboot_mbi.c  | 10 -----
 loader/i386/multiboot_mbi2.c | 82 +++++++++++++++---------------------
 6 files changed, 34 insertions(+), 133 deletions(-)
 delete mode 100644 ChangeLog.mbivid

diff --git a/ChangeLog.mbivid b/ChangeLog.mbivid
deleted file mode 100644
index 25db22c19..000000000
--- a/ChangeLog.mbivid
+++ /dev/null
@@ -1,9 +0,0 @@
-2010-01-14  Vladimir Serbinenko  <phcoder@gmail.com>
-
-	VBE multiboot support.
-
-	* loader/i386/multiboot_mbi.c (HAS_VBE): New constant.
-	(grub_multiboot_get_mbi_size) [HAS_VBE]: Account for VBE structures.
-	(grub_multiboot_make_mbi) [HAS_VBE]: Likewise.
-	(fill_vbe_info) [HAS_VBE]: New function.
-	(retrieve_video_parameters) [HAS_VBE]: Call fill_vbe_info.
diff --git a/ChangeLog.tag b/ChangeLog.tag
index 73983b463..90faf3dd6 100644
--- a/ChangeLog.tag
+++ b/ChangeLog.tag
@@ -11,7 +11,6 @@
 	(grub_get_multiboot_mmap_count): New proto.
 	(grub_fill_multiboot_mmap): Likewise.
 	(grub_multiboot_set_video_mode): Likewise.
-	(grub_multiboot_fill_vbe_info_real): Likewise.
 	(grub_multiboot_set_console): Likewise.
 	(grub_multiboot_load): Likewise.
 	(grub_multiboot_load_elf): Likewise.
@@ -24,9 +23,6 @@
 	* loader/i386/multiboot_mbi.c (HAS_VGA_TEXT): Moved from here ..
 	* include/grub/multiboot.h (GRUB_MACHINE_HAS_VGA_TEXT): ... here. All
 	users updated.
-	* loader/i386/multiboot_mbi.c (HAS_VBE): Moved from here ..
-	* include/grub/multiboot.h (GRUB_MACHINE_HAS_VBE): ... here. All
-	users updated.
 	* loader/i386/multiboot_mbi.c (accepts_video): Moved from here...
 	* loader/i386/multiboot.c (accepts_video): ... here. All users updated.
 	* loader/i386/multiboot_mbi.c (grub_multiboot_set_accepts_video):
@@ -40,8 +36,4 @@
 	* loader/i386/multiboot_mbi.c (set_video_mode): Moved from here...
 	* loader/i386/multiboot.c (grub_multiboot_set_video_mode): ... here.
 	All users updated.
-	* loader/i386/multiboot_mbi.c (fill_vbe_info): Moved generic parts
-	from here...
-	* loader/i386/multiboot.c (grub_multiboot_fill_vbe_info_real): ... here.
-	All users updated.
 	* loader/i386/multiboot_mbi2.c: New file.
diff --git a/include/grub/multiboot.h b/include/grub/multiboot.h
index 70241ec3c..49d71fa09 100644
--- a/include/grub/multiboot.h
+++ b/include/grub/multiboot.h
@@ -51,17 +51,8 @@ grub_err_t grub_multiboot_set_video_mode (void);
 
 #if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
 #include <grub/i386/pc/vbe.h>
-grub_err_t
-grub_multiboot_fill_vbe_info_real (struct grub_vbe_info_block *vbe_control_info,
-				   struct grub_vbe_mode_info_block *vbe_mode_info,
-				   multiboot_uint16_t *vbe_mode,
-				   multiboot_uint16_t *vbe_interface_seg,
-				   multiboot_uint16_t *vbe_interface_off,
-				   multiboot_uint16_t *vbe_interface_len);
-#define GRUB_MACHINE_HAS_VBE 1
 #define GRUB_MACHINE_HAS_VGA_TEXT 1
 #else
-#define GRUB_MACHINE_HAS_VBE 0
 #define GRUB_MACHINE_HAS_VGA_TEXT 0
 #endif
 
diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index a89233431..99d1cf906 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -20,6 +20,7 @@
 /*
  *  FIXME: The following features from the Multiboot specification still
  *         need to be implemented:
+ *  - VBE support
  *  - symbol table
  *  - drives table
  *  - ROM configuration table
@@ -115,54 +116,6 @@ grub_multiboot_set_video_mode (void)
   return err;
 }
 
-#if GRUB_MACHINE_HAS_VBE
-grub_err_t
-grub_multiboot_fill_vbe_info_real (struct grub_vbe_info_block *vbe_control_info,
-				   struct grub_vbe_mode_info_block *vbe_mode_info,
-				   multiboot_uint16_t *vbe_mode,
-				   multiboot_uint16_t *vbe_interface_seg,
-				   multiboot_uint16_t *vbe_interface_off,
-				   multiboot_uint16_t *vbe_interface_len)
-{
-  grub_vbe_status_t status;
-  void *scratch = (void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
-    
-  status = grub_vbe_bios_get_controller_info (scratch);
-  if (status != GRUB_VBE_STATUS_OK)
-    return grub_error (GRUB_ERR_IO, "Can't get controller info.");  
-  grub_memcpy (vbe_control_info, scratch, sizeof (struct grub_vbe_info_block));
-  
-  status = grub_vbe_bios_get_mode (scratch);
-  *vbe_mode = *(grub_uint32_t *) scratch;
-  if (status != GRUB_VBE_STATUS_OK)
-    return grub_error (GRUB_ERR_IO, "can't get VBE mode");
-
-  /* get_mode_info isn't available for mode 3.  */
-  if (*vbe_mode == 3)
-    {
-      grub_memset (vbe_mode_info, 0, sizeof (struct grub_vbe_mode_info_block));
-      vbe_mode_info->memory_model = GRUB_VBE_MEMORY_MODEL_TEXT;
-      vbe_mode_info->x_resolution = 80;
-      vbe_mode_info->y_resolution = 25;
-    }
-  else
-    {
-      status = grub_vbe_bios_get_mode_info (*vbe_mode, scratch);
-      if (status != GRUB_VBE_STATUS_OK)
-	return grub_error (GRUB_ERR_IO, "can't get mode info");
-      grub_memcpy (vbe_mode_info, scratch,
-		   sizeof (struct grub_vbe_mode_info_block));
-    }
-      
-  /* FIXME: retrieve those.  */
-  *vbe_interface_seg = 0;
-  *vbe_interface_off = 0;
-  *vbe_interface_len = 0;
-  
-  return GRUB_ERR_NONE;
-}
-#endif
-
 static grub_err_t
 grub_multiboot_boot (void)
 {
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index 0deca8930..2a7c70f96 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -186,10 +186,6 @@ grub_multiboot_get_mbi_size (void)
     + modcnt * sizeof (struct multiboot_mod_list) + total_modcmd
     + ALIGN_UP (sizeof(PACKAGE_STRING), 4) 
     + grub_get_multiboot_mmap_count () * sizeof (struct multiboot_mmap_entry)
-#if GRUB_MACHINE_HAS_VBE
-    + sizeof (struct grub_vbe_info_block)
-    + sizeof (struct grub_vbe_mode_info_block)
-#endif
     + 256 * sizeof (struct multiboot_color);
 }
 
@@ -391,12 +387,6 @@ grub_multiboot_make_mbi (void *orig, grub_uint32_t dest, grub_off_t buf_off,
       grub_print_error ();
       grub_errno = GRUB_ERR_NONE;
     }
-#if GRUB_MACHINE_HAS_VBE
-  ptrorig += sizeof (struct grub_vbe_info_block);
-  ptrdest += sizeof (struct grub_vbe_info_block);
-  ptrorig += sizeof (struct grub_vbe_mode_info_block);
-  ptrdest += sizeof (struct grub_vbe_mode_info_block);
-#endif
 
   return GRUB_ERR_NONE;
 }
diff --git a/loader/i386/multiboot_mbi2.c b/loader/i386/multiboot_mbi2.c
index 09d09d5a9..436cd0901 100644
--- a/loader/i386/multiboot_mbi2.c
+++ b/loader/i386/multiboot_mbi2.c
@@ -127,10 +127,10 @@ grub_multiboot_load (grub_file_t file)
 	      case MULTIBOOT_TAG_TYPE_BASIC_MEMINFO:
 	      case MULTIBOOT_TAG_TYPE_BOOTDEV:
 	      case MULTIBOOT_TAG_TYPE_MMAP:
-	      case MULTIBOOT_TAG_TYPE_VBE:
 	      case MULTIBOOT_TAG_TYPE_FRAMEBUFFER:
 		break;
 
+	      case MULTIBOOT_TAG_TYPE_VBE:
 	      case MULTIBOOT_TAG_TYPE_ELF_SECTIONS:
 	      case MULTIBOOT_TAG_TYPE_APM:
 	      default:
@@ -271,37 +271,6 @@ grub_multiboot_get_mbi_size (void)
     + sizeof (struct multiboot_tag_vbe) + MULTIBOOT_TAG_ALIGN - 1;
 }
 
-#ifdef GRUB_MACHINE_HAS_VBE
-
-static grub_err_t
-fill_vbe_info (struct grub_vbe_mode_info_block **vbe_mode_info_out,
-	       grub_uint8_t **ptrorig)
-{
-  struct multiboot_tag_vbe *tag = (struct multiboot_tag_vbe *) *ptrorig;
-  grub_err_t err;
-
-  tag->type = MULTIBOOT_TAG_TYPE_VBE;
-  tag->size = 0;
-  err = grub_multiboot_fill_vbe_info_real ((struct grub_vbe_info_block *)
-					   &(tag->vbe_control_info),
-					   (struct grub_vbe_mode_info_block *) 
-					   &(tag->vbe_mode_info),
-					   &(tag->vbe_mode),
-					   &(tag->vbe_interface_seg),
-					   &(tag->vbe_interface_off),
-					   &(tag->vbe_interface_len));
-  if (err)
-    return err;
-  if (vbe_mode_info_out)
-    *vbe_mode_info_out = (struct grub_vbe_mode_info_block *) 
-      &(tag->vbe_mode_info);
-  tag->size = sizeof (struct multiboot_tag_vbe);
-  *ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN);
-  return GRUB_ERR_NONE;
-}
-
-#endif
-
 /* Fill previously allocated Multiboot mmap.  */
 static void
 grub_fill_multiboot_mmap (struct multiboot_tag_mmap *tag)
@@ -373,11 +342,35 @@ retrieve_video_parameters (grub_uint8_t **ptrorig)
 #if HAS_VGA_TEXT
   if (driv_id == GRUB_VIDEO_DRIVER_NONE)
     {
-      struct grub_vbe_mode_info_block *vbe_mode_info;
-      err = fill_vbe_info (&vbe_mode_info, ptrorig);
-      if (err)
-	return err;
-      if (vbe_mode_info->memory_model == GRUB_VBE_MEMORY_MODEL_TEXT)
+      struct grub_vbe_mode_info_block vbe_mode_info;
+      grub_vbe_status_t status;
+      grub_uint32_t vbe_mode;
+      void *scratch = (void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
+
+      status = grub_vbe_bios_get_mode (scratch);
+      vbe_mode = *(grub_uint32_t *) scratch;
+      if (status != GRUB_VBE_STATUS_OK)
+	return GRUB_ERR_NONE;
+
+      /* get_mode_info isn't available for mode 3.  */
+      if (vbe_mode == 3)
+	{
+	  grub_memset (&vbe_mode_info, 0,
+		       sizeof (struct grub_vbe_mode_info_block));
+	  vbe_mode_info.memory_model = GRUB_VBE_MEMORY_MODEL_TEXT;
+	  vbe_mode_info.x_resolution = 80;
+	  vbe_mode_info.y_resolution = 25;
+	}
+      else
+	{
+	  status = grub_vbe_bios_get_mode_info (vbe_mode, scratch);
+	  if (status != GRUB_VBE_STATUS_OK)
+	    return GRUB_ERR_NONE;
+	  grub_memcpy (&vbe_mode_info, scratch,
+		       sizeof (struct grub_vbe_mode_info_block));
+	}
+
+      if (vbe_mode_info.memory_model == GRUB_VBE_MEMORY_MODEL_TEXT)
 	{
 	  tag = (struct multiboot_tag_framebuffer *) *ptrorig;
 	  tag->common.type = MULTIBOOT_TAG_TYPE_FRAMEBUFFER;
@@ -385,9 +378,9 @@ retrieve_video_parameters (grub_uint8_t **ptrorig)
 
 	  tag->common.framebuffer_addr = 0xb8000;
 	  
-	  tag->common.framebuffer_pitch = 2 * vbe_mode_info->x_resolution;	
-	  tag->common.framebuffer_width = vbe_mode_info->x_resolution;
-	  tag->common.framebuffer_height = vbe_mode_info->y_resolution;
+	  tag->common.framebuffer_pitch = 2 * vbe_mode_info.x_resolution;	
+	  tag->common.framebuffer_width = vbe_mode_info.x_resolution;
+	  tag->common.framebuffer_height = vbe_mode_info.y_resolution;
 
 	  tag->common.framebuffer_bpp = 16;
 	  
@@ -453,15 +446,6 @@ retrieve_video_parameters (grub_uint8_t **ptrorig)
     }
   *ptrorig += ALIGN_UP (tag->common.size, MULTIBOOT_TAG_ALIGN);
 
-#if HAS_VBE
-  if (driv_id == GRUB_VIDEO_DRIVER_VBE)
-    {
-      err = fill_vbe_info (NULL, ptrorig);
-      if (err)
-	return err;
-    }
-#endif
-
   return GRUB_ERR_NONE;
 }
 

From 016883a55c11f0db1dd3759129d0c83fcfb8eb5d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 28 Mar 2010 14:19:41 +0200
Subject: [PATCH 0698/1628] 	* include/multiboot2.h: Resync with spec.

---
 ChangeLog            |  4 ++++
 include/multiboot2.h | 14 +-------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b15ba47d5..aba023c7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/multiboot2.h: Resync with spec.
+
 2010-03-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Multiboot2 tag support
diff --git a/include/multiboot2.h b/include/multiboot2.h
index 59d7c951f..647109c0b 100644
--- a/include/multiboot2.h
+++ b/include/multiboot2.h
@@ -36,22 +36,10 @@
 #define MULTIBOOT_MOD_ALIGN			0x00001000
 
 /* Alignment of the multiboot info structure.  */
-#define MULTIBOOT_INFO_ALIGN			0x00000004
+#define MULTIBOOT_INFO_ALIGN			0x00000008
 
 /* Flags set in the 'flags' member of the multiboot header.  */
 
-/* Align all boot modules on i386 page (4KB) boundaries.  */
-#define MULTIBOOT_PAGE_ALIGN			0x00000001
-
-/* Must pass memory information to OS.  */
-#define MULTIBOOT_MEMORY_INFO			0x00000002
-
-/* Must pass video information to OS.  */
-#define MULTIBOOT_VIDEO_MODE			0x00000004
-
-/* This flag indicates the use of the address fields in the header.  */
-#define MULTIBOOT_AOUT_KLUDGE			0x00010000
-
 #define MULTIBOOT_TAG_ALIGN                  8
 #define MULTIBOOT_TAG_TYPE_END               0
 #define MULTIBOOT_TAG_TYPE_CMDLINE           1

From a64b15feedea40d814aa6e04682605781e43b289 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 28 Mar 2010 21:43:42 +0200
Subject: [PATCH 0699/1628] resynced with gnulib. Cleaned up wrapping layer

---
 Makefile.in                                   |   4 +-
 conf/common.rmk                               |   6 +-
 gnulib/regcomp.c                              | 172 ++++++++++--------
 gnulib/regex.c                                |  50 ++++-
 {include/grub => gnulib}/regex.h              |   7 +-
 gnulib/regex_internal.c                       | 101 +++++-----
 gnulib/regex_internal.h                       |  49 ++++-
 gnulib/regexec.c                              | 161 ++++++++--------
 lib/posix_wrap/assert.h                       |  33 ++++
 .../gnulib-wrap.h => lib/posix_wrap/ctype.h   |  98 +---------
 lib/posix_wrap/langinfo.h                     |  38 ++++
 lib/posix_wrap/limits.h                       |   0
 lib/posix_wrap/localcharset.h                 |  28 +++
 lib/posix_wrap/stdint.h                       |   1 +
 lib/posix_wrap/stdio.h                        |  24 +++
 lib/posix_wrap/stdlib.h                       |  56 ++++++
 lib/posix_wrap/string.h                       |  40 ++++
 lib/posix_wrap/sys/types.h                    |  32 ++++
 lib/posix_wrap/wchar.h                        |  25 +++
 lib/posix_wrap/wctype.h                       |   0
 20 files changed, 620 insertions(+), 305 deletions(-)
 rename {include/grub => gnulib}/regex.h (99%)
 create mode 100644 lib/posix_wrap/assert.h
 rename include/grub/gnulib-wrap.h => lib/posix_wrap/ctype.h (51%)
 create mode 100644 lib/posix_wrap/langinfo.h
 create mode 100644 lib/posix_wrap/limits.h
 create mode 100644 lib/posix_wrap/localcharset.h
 create mode 100644 lib/posix_wrap/stdint.h
 create mode 100644 lib/posix_wrap/stdio.h
 create mode 100644 lib/posix_wrap/stdlib.h
 create mode 100644 lib/posix_wrap/string.h
 create mode 100644 lib/posix_wrap/sys/types.h
 create mode 100644 lib/posix_wrap/wchar.h
 create mode 100644 lib/posix_wrap/wctype.h

diff --git a/Makefile.in b/Makefile.in
index d640b91d6..2580c15b6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,7 +79,9 @@ LIBS = @LIBS@ $(LIBINTL)
 
 CC = @CC@
 CFLAGS = @CFLAGS@
-GNULIB_CFLAGS = -Wno-undef -D_GL_UNUSED="__attribute__ ((unused))"
+POSIX_CFLAGS = -I$(srcdir)/lib/posix_wrap 
+GNULIB_UTIL_CFLAGS = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))" -I$(srcdir)/gnulib
+GNULIB_CFLAGS = $(GNULIB_UTIL_CFLAGS) $(POSIX_CFLAGS)
 ASFLAGS = @ASFLAGS@
 LDFLAGS = @LDFLAGS@ $(LIBS)
 CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/gnulib -I$(srcdir)/include -Wall -W \
diff --git a/conf/common.rmk b/conf/common.rmk
index b2e5e0247..b9ed37d26 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -56,7 +56,7 @@ grub_mkisofs_SOURCES = util/mkisofs/eltorito.c 				\
 	gnulib/error.c gnulib/progname.c
 grub_mkisofs_CFLAGS = -D_FILE_OFFSET_BITS=64 				\
 	-I$(srcdir)/util/mkisofs/include				\
-	-Wno-all -Werror $(GNULIB_CFLAGS)
+	-Wno-all -Werror $(GNULIB_UTIL_CFLAGS)
 
 # For grub-fstest.
 util/grub-fstest.c_DEPENDENCIES = grub_fstest_init.h
@@ -111,7 +111,7 @@ grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c
 	kern/handler.c kern/err.c kern/parser.c kern/list.c \
 	kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c \
 	grub_script.yy.c
-grub_script_check_CFLAGS = $(GNULIB_CFLAGS)
+grub_script_check_CFLAGS = $(GNULIB_UTIL_CFLAGS)
 MOSTLYCLEANFILES += symlist.c kernel_syms.lst
 DEFSYMFILES += kernel_syms.lst
 
@@ -788,7 +788,7 @@ charset_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += regexp.mod
 regexp_mod_SOURCES = gnulib/regex.c commands/regexp.c
-regexp_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-sign-compare -Wno-unused
+regexp_mod_CFLAGS = $(COMMON_CFLAGS) $(GNULIB_CFLAGS)
 regexp_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += terminal.mod
diff --git a/gnulib/regcomp.c b/gnulib/regcomp.c
index 6472ff6b2..7eff56925 100644
--- a/gnulib/regcomp.c
+++ b/gnulib/regcomp.c
@@ -1,6 +1,6 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009
-   Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+   Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -383,7 +383,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,
 	     applies to multibyte character sets; for single byte character
 	     sets, the SIMPLE_BRACKET again suffices.  */
 	  if (dfa->mb_cur_max > 1
-	      && (cset->nchar_classes || cset->non_match
+	      && (cset->nchar_classes || cset->non_match || cset->nranges
 # ifdef _LIBC
 		  || cset->nequiv_classes
 # endif /* _LIBC */
@@ -636,7 +636,7 @@ free_dfa_content (re_dfa_t *dfa)
 	    re_dfastate_t *state = entry->array[j];
 	    free_state (state);
 	  }
-        re_free (entry->array);
+	re_free (entry->array);
       }
   re_free (dfa->state_table);
 #ifdef RE_ENABLE_I18N
@@ -850,6 +850,9 @@ static reg_errcode_t
 init_dfa (re_dfa_t *dfa, size_t pat_len)
 {
   __re_size_t table_size;
+#ifndef _LIBC
+  char *codeset_name;
+#endif
 #ifdef RE_ENABLE_I18N
   size_t max_i18n_object_size = MAX (sizeof (wchar_t), sizeof (wctype_t));
 #else
@@ -893,7 +896,9 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)
   dfa->map_notascii = (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MAP_TO_NONASCII)
 		       != 0);
 #else
-  if (strcmp (locale_charset (), "UTF-8") == 0)
+  codeset_name = nl_langinfo (CODESET);
+  if (strcasecmp (codeset_name, "UTF-8") == 0
+      || strcasecmp (codeset_name, "UTF8") == 0)
     dfa->is_utf8 = 1;
 
   /* We check exhaustively in the loop below if this charset is a
@@ -1016,7 +1021,10 @@ create_initial_state (re_dfa_t *dfa)
 	    Idx dest_idx = dfa->edests[node_idx].elems[0];
 	    if (!re_node_set_contains (&init_nodes, dest_idx))
 	      {
-		re_node_set_merge (&init_nodes, dfa->eclosures + dest_idx);
+		reg_errcode_t merge_err
+                  = re_node_set_merge (&init_nodes, dfa->eclosures + dest_idx);
+		if (merge_err != REG_NOERROR)
+		  return merge_err;
 		i = 0;
 	      }
 	  }
@@ -1085,8 +1093,8 @@ optimize_utf8 (re_dfa_t *dfa)
 	  }
 	break;
       case OP_PERIOD:
-        has_period = true;
-        break;
+	has_period = true;
+	break;
       case OP_BACK_REF:
       case OP_ALT:
       case END_OF_RE:
@@ -1187,7 +1195,7 @@ analyze (regex_t *preg)
     {
       dfa->inveclosures = re_malloc (re_node_set, dfa->nodes_len);
       if (BE (dfa->inveclosures == NULL, 0))
-        return REG_ESPACE;
+	return REG_ESPACE;
       ret = calc_inveclosure (dfa);
     }
 
@@ -1209,16 +1217,16 @@ postorder (bin_tree_t *root, reg_errcode_t (fn (void *, bin_tree_t *)),
 	 if that's the only child).  */
       while (node->left || node->right)
 	if (node->left)
-          node = node->left;
-        else
-          node = node->right;
+	  node = node->left;
+	else
+	  node = node->right;
 
       do
 	{
 	  reg_errcode_t err = fn (extra, node);
 	  if (BE (err != REG_NOERROR, 0))
 	    return err;
-          if (node->parent == NULL)
+	  if (node->parent == NULL)
 	    return REG_NOERROR;
 	  prev = node;
 	  node = node->parent;
@@ -1252,7 +1260,7 @@ preorder (bin_tree_t *root, reg_errcode_t (fn (void *, bin_tree_t *)),
 	      prev = node;
 	      node = node->parent;
 	      if (!node)
-	        return REG_NOERROR;
+		return REG_NOERROR;
 	    }
 	  node = node->right;
 	}
@@ -1275,13 +1283,13 @@ optimize_subexps (void *extra, bin_tree_t *node)
     }
 
   else if (node->token.type == SUBEXP
-           && node->left && node->left->token.type == SUBEXP)
+	   && node->left && node->left->token.type == SUBEXP)
     {
       Idx other_idx = node->left->token.opr.idx;
 
       node->left = node->left->left;
       if (node->left)
-        node->left->parent = node;
+	node->left->parent = node;
 
       dfa->subexp_map[other_idx] = dfa->subexp_map[node->token.opr.idx];
       if (other_idx < BITSET_WORD_BITS)
@@ -1366,9 +1374,9 @@ calc_first (void *extra, bin_tree_t *node)
       node->first = node;
       node->node_idx = re_dfa_add_node (dfa, node->token);
       if (BE (node->node_idx == REG_MISSING, 0))
-        return REG_ESPACE;
+	return REG_ESPACE;
       if (node->token.type == ANCHOR)
-        dfa->nodes[node->node_idx].constraint = node->token.opr.ctx_type;
+	dfa->nodes[node->node_idx].constraint = node->token.opr.ctx_type;
     }
   return REG_NOERROR;
 }
@@ -1390,7 +1398,7 @@ calc_next (void *extra, bin_tree_t *node)
       if (node->left)
 	node->left->next = node->next;
       if (node->right)
-        node->right->next = node->next;
+	node->right->next = node->next;
       break;
     }
   return REG_NOERROR;
@@ -1441,7 +1449,7 @@ link_nfa_nodes (void *extra, bin_tree_t *node)
     case OP_BACK_REF:
       dfa->nexts[idx] = node->next->node_idx;
       if (node->token.type == OP_BACK_REF)
-	re_node_set_init_1 (dfa->edests + idx, dfa->nexts[idx]);
+	err = re_node_set_init_1 (dfa->edests + idx, dfa->nexts[idx]);
       break;
 
     default:
@@ -1498,7 +1506,6 @@ duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node,
 	     destination.  */
 	  org_dest = dfa->edests[org_node].elems[0];
 	  re_node_set_empty (dfa->edests + clone_node);
-	  clone_dest = search_duplicated_node (dfa, org_dest, constraint);
 	  /* If the node is root_node itself, it means the epsilon closure
 	     has a loop.  Then tie it to the destination of the root_node.  */
 	  if (org_node == root_node && clone_node != org_node)
@@ -1542,7 +1549,7 @@ duplicate_node_closure (re_dfa_t *dfa, Idx top_org_node, Idx top_clone_node,
 	    }
 	  else
 	    {
-	      /* There is a duplicated node which satisfy the constraint,
+	      /* There is a duplicated node which satisfies the constraint,
 		 use it to avoid infinite loop.  */
 	      ok = re_node_set_insert (dfa->edests + clone_node, clone_dest);
 	      if (BE (! ok, 0))
@@ -1674,10 +1681,9 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root)
 {
   reg_errcode_t err;
   Idx i;
-  bool incomplete;
-  bool ok;
   re_node_set eclosure;
-  incomplete = false;
+  bool ok;
+  bool incomplete = false;
   err = re_node_set_alloc (&eclosure, dfa->edests[node].nelem + 1);
   if (BE (err != REG_NOERROR, 0))
     return err;
@@ -1722,7 +1728,9 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root)
 	else
 	  eclosure_elem = dfa->eclosures[edest];
 	/* Merge the epsilon closure of `edest'.  */
-	re_node_set_merge (&eclosure, &eclosure_elem);
+	err = re_node_set_merge (&eclosure, &eclosure_elem);
+	if (BE (err != REG_NOERROR, 0))
+	  return err;
 	/* If the epsilon closure of `edest' is incomplete,
 	   the epsilon closure of this node is also incomplete.  */
 	if (dfa->eclosures[edest].nelem == 0)
@@ -1732,7 +1740,7 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root)
 	  }
       }
 
-  /* Epsilon closures include itself.  */
+  /* An epsilon closure includes itself.  */
   ok = re_node_set_insert (&eclosure, node);
   if (BE (! ok, 0))
     return REG_ESPACE;
@@ -2319,7 +2327,7 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
 	  && dfa->word_ops_used == 0)
 	init_word_char (dfa);
       if (token->opr.ctx_type == WORD_DELIM
-          || token->opr.ctx_type == NOT_WORD_DELIM)
+	  || token->opr.ctx_type == NOT_WORD_DELIM)
 	{
 	  bin_tree_t *tree_first, *tree_last;
 	  if (token->opr.ctx_type == WORD_DELIM)
@@ -2327,13 +2335,13 @@ parse_expression (re_string_t *regexp, regex_t *preg, re_token_t *token,
 	      token->opr.ctx_type = WORD_FIRST;
 	      tree_first = create_token_tree (dfa, NULL, NULL, token);
 	      token->opr.ctx_type = WORD_LAST;
-            }
-          else
-            {
+	    }
+	  else
+	    {
 	      token->opr.ctx_type = INSIDE_WORD;
 	      tree_first = create_token_tree (dfa, NULL, NULL, token);
 	      token->opr.ctx_type = INSIDE_NOTWORD;
-            }
+	    }
 	  tree_last = create_token_tree (dfa, NULL, NULL, token);
 	  tree = create_tree (dfa, tree_first, tree_last, OP_ALT);
 	  if (BE (tree_first == NULL || tree_last == NULL || tree == NULL, 0))
@@ -2444,7 +2452,7 @@ parse_sub_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
     {
       tree = parse_reg_exp (regexp, preg, token, syntax, nest, err);
       if (BE (*err == REG_NOERROR && token->type != OP_CLOSE_SUBEXP, 0))
-        *err = REG_EPAREN;
+	*err = REG_EPAREN;
       if (BE (*err != REG_NOERROR, 0))
 	return NULL;
     }
@@ -2515,7 +2523,8 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
 	  return elem;
 	}
 
-      if (BE (end != REG_MISSING && start > end, 0))
+      if (BE ((end != REG_MISSING && start > end)
+	      || token->type != OP_CLOSE_DUP_NUM, 0))
 	{
 	  /* First number greater than second.  */
 	  *err = REG_BADBR;
@@ -2568,10 +2577,14 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
   if (BE (tree == NULL, 0))
     goto parse_dup_op_espace;
 
+/* From gnulib's "intprops.h":
+   True if the arithmetic type T is signed.  */
+#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
+
   /* This loop is actually executed only when end != REG_MISSING,
      to rewrite <re>{0,n} as (<re>(<re>...<re>?)?)?...  We have
      already created the start+1-th copy.  */
-  if ((Idx) -1 < 0 || end != REG_MISSING)
+  if (TYPE_SIGNED (Idx) || end != REG_MISSING)
     for (i = start + 2; i <= end; ++i)
       {
 	elem = duplicate_tree (elem, dfa);
@@ -2609,11 +2622,17 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
 static reg_errcode_t
 internal_function
 # ifdef RE_ENABLE_I18N
-build_range_exp (bitset_t sbcset, re_charset_t *mbcset, Idx *range_alloc,
-		 bracket_elem_t *start_elem, bracket_elem_t *end_elem)
+build_range_exp (const reg_syntax_t syntax,
+                 bitset_t sbcset,
+                 re_charset_t *mbcset,
+                 Idx *range_alloc,
+                 const bracket_elem_t *start_elem,
+                 const bracket_elem_t *end_elem)
 # else /* not RE_ENABLE_I18N */
-build_range_exp (bitset_t sbcset, bracket_elem_t *start_elem,
-		 bracket_elem_t *end_elem)
+build_range_exp (const reg_syntax_t syntax,
+                 bitset_t sbcset,
+                 const bracket_elem_t *start_elem,
+                 const bracket_elem_t *end_elem)
 # endif /* not RE_ENABLE_I18N */
 {
   unsigned int start_ch, end_ch;
@@ -2652,7 +2671,9 @@ build_range_exp (bitset_t sbcset, bracket_elem_t *start_elem,
       return REG_ECOLLATE;
     cmp_buf[0] = start_wc;
     cmp_buf[4] = end_wc;
-    if (wcscoll (cmp_buf, cmp_buf + 4) > 0)
+
+    if (BE ((syntax & RE_NO_EMPTY_RANGES)
+            && wcscoll (cmp_buf, cmp_buf + 4) > 0, 0))
       return REG_ERANGE;
 
     /* Got valid collation sequence values, add them as a new entry.
@@ -2662,9 +2683,9 @@ build_range_exp (bitset_t sbcset, bracket_elem_t *start_elem,
        no MBCSET if dfa->mb_cur_max == 1.  */
     if (mbcset)
       {
-        /* Check the space of the arrays.  */
-        if (BE (*range_alloc == mbcset->nranges, 0))
-          {
+	/* Check the space of the arrays.  */
+	if (BE (*range_alloc == mbcset->nranges, 0))
+	  {
 	    /* There is not enough space, need realloc.  */
 	    wchar_t *new_array_start, *new_array_end;
 	    Idx new_nranges;
@@ -2674,9 +2695,9 @@ build_range_exp (bitset_t sbcset, bracket_elem_t *start_elem,
 	    /* Use realloc since mbcset->range_starts and mbcset->range_ends
 	       are NULL if *range_alloc == 0.  */
 	    new_array_start = re_realloc (mbcset->range_starts, wchar_t,
-				          new_nranges);
+					  new_nranges);
 	    new_array_end = re_realloc (mbcset->range_ends, wchar_t,
-				        new_nranges);
+					new_nranges);
 
 	    if (BE (new_array_start == NULL || new_array_end == NULL, 0))
 	      return REG_ESPACE;
@@ -2684,10 +2705,10 @@ build_range_exp (bitset_t sbcset, bracket_elem_t *start_elem,
 	    mbcset->range_starts = new_array_start;
 	    mbcset->range_ends = new_array_end;
 	    *range_alloc = new_nranges;
-          }
+	  }
 
-        mbcset->range_starts[mbcset->nranges] = start_wc;
-        mbcset->range_ends[mbcset->nranges++] = end_wc;
+	mbcset->range_starts[mbcset->nranges] = start_wc;
+	mbcset->range_ends[mbcset->nranges++] = end_wc;
       }
 
     /* Build the table for single byte characters.  */
@@ -2799,7 +2820,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
       return elem;
     }
 
-  /* Local function for parse_bracket_exp used in _LIBC environement.
+  /* Local function for parse_bracket_exp used in _LIBC environment.
      Look up the collation sequence value of BR_ELEM.
      Return the value if succeeded, UINT_MAX otherwise.  */
 
@@ -2823,7 +2844,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
 	}
       else if (br_elem->type == MB_CHAR)
 	{
-	  return __collseq_table_lookup (collseqwc, br_elem->opr.wch);
+	  if (nrules != 0)
+	    return __collseq_table_lookup (collseqwc, br_elem->opr.wch);
 	}
       else if (br_elem->type == COLL_SYM)
 	{
@@ -2904,8 +2926,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
 	 build below suffices. */
       if (nrules > 0 || dfa->mb_cur_max > 1)
 	{
-          /* Check the space of the arrays.  */
-          if (BE (*range_alloc == mbcset->nranges, 0))
+	  /* Check the space of the arrays.  */
+	  if (BE (*range_alloc == mbcset->nranges, 0))
 	    {
 	      /* There is not enough space, need realloc.  */
 	      uint32_t *new_array_start;
@@ -2917,18 +2939,18 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
 	      new_array_start = re_realloc (mbcset->range_starts, uint32_t,
 					    new_nranges);
 	      new_array_end = re_realloc (mbcset->range_ends, uint32_t,
-				          new_nranges);
+					  new_nranges);
 
 	      if (BE (new_array_start == NULL || new_array_end == NULL, 0))
-	        return REG_ESPACE;
+		return REG_ESPACE;
 
 	      mbcset->range_starts = new_array_start;
 	      mbcset->range_ends = new_array_end;
 	      *range_alloc = new_nranges;
 	    }
 
-          mbcset->range_starts[mbcset->nranges] = start_collseq;
-          mbcset->range_ends[mbcset->nranges++] = end_collseq;
+	  mbcset->range_starts[mbcset->nranges] = start_collseq;
+	  mbcset->range_ends[mbcset->nranges++] = end_collseq;
 	}
 
       /* Build the table for single byte characters.  */
@@ -3154,11 +3176,11 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
 				  &start_elem, &end_elem);
 #else
 # ifdef RE_ENABLE_I18N
-	  *err = build_range_exp (sbcset,
+	  *err = build_range_exp (syntax, sbcset,
 				  dfa->mb_cur_max > 1 ? mbcset : NULL,
 				  &range_alloc, &start_elem, &end_elem);
 # else
-	  *err = build_range_exp (sbcset, &start_elem, &end_elem);
+	  *err = build_range_exp (syntax, sbcset, &start_elem, &end_elem);
 # endif
 #endif /* RE_ENABLE_I18N */
 	  if (BE (*err != REG_NOERROR, 0))
@@ -3262,17 +3284,17 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
 	 of having both SIMPLE_BRACKET and COMPLEX_BRACKET.  */
       if (sbc_idx < BITSET_WORDS)
 	{
-          /* Build a tree for simple bracket.  */
-          br_token.type = SIMPLE_BRACKET;
-          br_token.opr.sbcset = sbcset;
-          work_tree = create_token_tree (dfa, NULL, NULL, &br_token);
-          if (BE (work_tree == NULL, 0))
-            goto parse_bracket_exp_espace;
+	  /* Build a tree for simple bracket.  */
+	  br_token.type = SIMPLE_BRACKET;
+	  br_token.opr.sbcset = sbcset;
+	  work_tree = create_token_tree (dfa, NULL, NULL, &br_token);
+	  if (BE (work_tree == NULL, 0))
+	    goto parse_bracket_exp_espace;
 
-          /* Then join them by ALT node.  */
-          work_tree = create_tree (dfa, work_tree, mbc_tree, OP_ALT);
-          if (BE (work_tree == NULL, 0))
-            goto parse_bracket_exp_espace;
+	  /* Then join them by ALT node.  */
+	  work_tree = create_tree (dfa, work_tree, mbc_tree, OP_ALT);
+	  if (BE (work_tree == NULL, 0))
+	    goto parse_bracket_exp_espace;
 	}
       else
 	{
@@ -3291,7 +3313,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
       br_token.opr.sbcset = sbcset;
       work_tree = create_token_tree (dfa, NULL, NULL, &br_token);
       if (BE (work_tree == NULL, 0))
-        goto parse_bracket_exp_espace;
+	goto parse_bracket_exp_espace;
     }
   return work_tree;
 
@@ -3430,7 +3452,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
 
       /* Build single byte matcing table for this equivalence class.  */
       char_buf[1] = (unsigned char) '\0';
-      len = weights[idx1];
+      len = weights[idx1 & 0xffffff];
       for (ch = 0; ch < SBC_MAX; ++ch)
 	{
 	  char_buf[0] = ch;
@@ -3442,11 +3464,15 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
 	  if (idx2 == 0)
 	    /* This isn't a valid character.  */
 	    continue;
-	  if (len == weights[idx2])
+	  /* Compare only if the length matches and the collation rule
+	     index is the same.  */
+	  if (len == weights[idx2 & 0xffffff] && (idx1 >> 24) == (idx2 >> 24))
 	    {
 	      int cnt = 0;
+
 	      while (cnt <= len &&
-		     weights[idx1 + 1 + cnt] == weights[idx2 + 1 + cnt])
+		     weights[(idx1 & 0xffffff) + 1 + cnt]
+		     == weights[(idx2 & 0xffffff) + 1 + cnt])
 		++cnt;
 
 	      if (cnt > len)
@@ -3842,7 +3868,7 @@ duplicate_tree (const bin_tree_t *root, re_dfa_t *dfa)
 	      node = node->parent;
 	      dup_node = dup_node->parent;
 	      if (!node)
-	        return dup_root;
+		return dup_root;
 	    }
 	  node = node->right;
 	  p_new = &dup_node->right;
diff --git a/gnulib/regex.c b/gnulib/regex.c
index 76998f8d3..904fe62c8 100644
--- a/gnulib/regex.c
+++ b/gnulib/regex.c
@@ -1,5 +1,6 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2005, 2006, 2009, 2010 Free Software Foundation,
+   Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -17,10 +18,55 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
-#include <grub/regex.h>
+#include <config.h>
 
+/* Make sure noone compiles this code with a C++ compiler.  */
+#if defined __cplusplus && defined _LIBC
+# error "This is C code, use a C compiler"
+#endif
+
+#ifdef _LIBC
+/* We have to keep the namespace clean.  */
+# define regfree(preg) __regfree (preg)
+# define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef)
+# define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags)
+# define regerror(errcode, preg, errbuf, errbuf_size) \
+	__regerror(errcode, preg, errbuf, errbuf_size)
+# define re_set_registers(bu, re, nu, st, en) \
+	__re_set_registers (bu, re, nu, st, en)
+# define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \
+	__re_match_2 (bufp, string1, size1, string2, size2, pos, regs, stop)
+# define re_match(bufp, string, size, pos, regs) \
+	__re_match (bufp, string, size, pos, regs)
+# define re_search(bufp, string, size, startpos, range, regs) \
+	__re_search (bufp, string, size, startpos, range, regs)
+# define re_compile_pattern(pattern, length, bufp) \
+	__re_compile_pattern (pattern, length, bufp)
+# define re_set_syntax(syntax) __re_set_syntax (syntax)
+# define re_search_2(bufp, st1, s1, st2, s2, startpos, range, regs, stop) \
+	__re_search_2 (bufp, st1, s1, st2, s2, startpos, range, regs, stop)
+# define re_compile_fastmap(bufp) __re_compile_fastmap (bufp)
+
+# include "../locale/localeinfo.h"
+#endif
+
+/* On some systems, limits.h sets RE_DUP_MAX to a lower value than
+   GNU regex allows.  Include it before <regex.h>, which correctly
+   #undefs RE_DUP_MAX and sets it to the right value.  */
+#include <limits.h>
+
+#include <regex.h>
 #include "regex_internal.h"
 
 #include "regex_internal.c"
 #include "regcomp.c"
 #include "regexec.c"
+
+/* Binary backward compatibility.  */
+#if _LIBC
+# include <shlib-compat.h>
+# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3)
+link_warning (re_max_failures, "the 're_max_failures' variable is obsolete and will go away.")
+int re_max_failures = 2000;
+# endif
+#endif
diff --git a/include/grub/regex.h b/gnulib/regex.h
similarity index 99%
rename from include/grub/regex.h
rename to gnulib/regex.h
index 091342d0b..594d5e6aa 100644
--- a/include/grub/regex.h
+++ b/gnulib/regex.h
@@ -1,7 +1,8 @@
 /* Definitions for data structures and routines for the regular
    expression library.
-   Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003,2005,2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 1996, 1997, 1998,
+   2000, 2001, 2002, 2003, 2005, 2006, 2009, 2010 Free Software Foundation,
+   Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
@@ -21,7 +22,7 @@
 #ifndef _REGEX_H
 #define _REGEX_H 1
 
-#include <grub/gnulib-wrap.h>
+#include <sys/types.h>
 
 /* Allow the use in C++ code.  */
 #ifdef __cplusplus
diff --git a/gnulib/regex_internal.c b/gnulib/regex_internal.c
index 904b88ed9..378b767d8 100644
--- a/gnulib/regex_internal.c
+++ b/gnulib/regex_internal.c
@@ -1,6 +1,6 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+   Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -36,7 +36,7 @@ static re_dfastate_t *create_cd_newstate (const re_dfa_t *dfa,
    re_string_reconstruct before using the object.  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 re_string_allocate (re_string_t *pstr, const char *str, Idx len, Idx init_len,
 		    RE_TRANSLATE_TYPE trans, bool icase, const re_dfa_t *dfa)
 {
@@ -64,7 +64,7 @@ re_string_allocate (re_string_t *pstr, const char *str, Idx len, Idx init_len,
 /* This function allocate the buffers, and initialize them.  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 re_string_construct (re_string_t *pstr, const char *str, Idx len,
 		     RE_TRANSLATE_TYPE trans, bool icase, const re_dfa_t *dfa)
 {
@@ -127,7 +127,7 @@ re_string_construct (re_string_t *pstr, const char *str, Idx len,
 /* Helper functions for re_string_allocate, and re_string_construct.  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 re_string_realloc_buffers (re_string_t *pstr, Idx new_buf_len)
 {
 #ifdef RE_ENABLE_I18N
@@ -267,7 +267,7 @@ build_wcs_buffer (re_string_t *pstr)
    but for REG_ICASE.  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 build_wcs_upper_buffer (re_string_t *pstr)
 {
   mbstate_t prev_st;
@@ -430,8 +430,8 @@ build_wcs_upper_buffer (re_string_t *pstr)
 		    src_idx += mbclen;
 		    continue;
 		  }
-                else
-                  memcpy (pstr->mbs + byte_idx, p, mbclen);
+		else
+		  memcpy (pstr->mbs + byte_idx, p, mbclen);
 	      }
 	    else
 	      memcpy (pstr->mbs + byte_idx, p, mbclen);
@@ -569,7 +569,7 @@ re_string_translate_buffer (re_string_t *pstr)
    convert to upper case in case of REG_ICASE, apply translation.  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
 {
   Idx offset;
@@ -964,7 +964,7 @@ re_string_context_at (const re_string_t *input, Idx idx, int eflags)
 /* Functions for set operation.  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 re_node_set_alloc (re_node_set *set, Idx size)
 {
   set->alloc = size;
@@ -976,7 +976,7 @@ re_node_set_alloc (re_node_set *set, Idx size)
 }
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 re_node_set_init_1 (re_node_set *set, Idx elem)
 {
   set->alloc = 1;
@@ -992,7 +992,7 @@ re_node_set_init_1 (re_node_set *set, Idx elem)
 }
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 re_node_set_init_2 (re_node_set *set, Idx elem1, Idx elem2)
 {
   set->alloc = 2;
@@ -1022,7 +1022,7 @@ re_node_set_init_2 (re_node_set *set, Idx elem1, Idx elem2)
 }
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 re_node_set_init_copy (re_node_set *dest, const re_node_set *src)
 {
   dest->nelem = src->nelem;
@@ -1047,7 +1047,7 @@ re_node_set_init_copy (re_node_set *dest, const re_node_set *src)
    Note: We assume dest->elems is NULL, when dest->alloc is 0.  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1,
 			   const re_node_set *src2)
 {
@@ -1062,7 +1062,7 @@ re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1,
       Idx new_alloc = src1->nelem + src2->nelem + dest->alloc;
       Idx *new_elems = re_realloc (dest->elems, Idx, new_alloc);
       if (BE (new_elems == NULL, 0))
-        return REG_ESPACE;
+	return REG_ESPACE;
       dest->elems = new_elems;
       dest->alloc = new_alloc;
     }
@@ -1112,20 +1112,20 @@ re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1,
   if (delta > 0 && REG_VALID_INDEX (id))
     for (;;)
       {
-        if (dest->elems[is] > dest->elems[id])
-          {
-            /* Copy from the top.  */
-            dest->elems[id + delta--] = dest->elems[is--];
-            if (delta == 0)
-              break;
-          }
-        else
-          {
-            /* Slide from the bottom.  */
-            dest->elems[id + delta] = dest->elems[id];
-            if (! REG_VALID_INDEX (--id))
-              break;
-          }
+	if (dest->elems[is] > dest->elems[id])
+	  {
+	    /* Copy from the top.  */
+	    dest->elems[id + delta--] = dest->elems[is--];
+	    if (delta == 0)
+	      break;
+	  }
+	else
+	  {
+	    /* Slide from the bottom.  */
+	    dest->elems[id + delta] = dest->elems[id];
+	    if (! REG_VALID_INDEX (--id))
+	      break;
+	  }
       }
 
   /* Copy remaining SRC elements.  */
@@ -1138,7 +1138,7 @@ re_node_set_add_intersect (re_node_set *dest, const re_node_set *src1,
    DEST. Return value indicate the error code or REG_NOERROR if succeeded.  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 re_node_set_init_union (re_node_set *dest, const re_node_set *src1,
 			const re_node_set *src2)
 {
@@ -1191,7 +1191,7 @@ re_node_set_init_union (re_node_set *dest, const re_node_set *src1,
    DEST. Return value indicate the error code or REG_NOERROR if succeeded.  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 re_node_set_merge (re_node_set *dest, const re_node_set *src)
 {
   Idx is, id, sbase, delta;
@@ -1221,11 +1221,11 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)
        REG_VALID_INDEX (is) && REG_VALID_INDEX (id); )
     {
       if (dest->elems[id] == src->elems[is])
-        is--, id--;
+	is--, id--;
       else if (dest->elems[id] < src->elems[is])
-        dest->elems[--sbase] = src->elems[is--];
+	dest->elems[--sbase] = src->elems[is--];
       else /* if (dest->elems[id] > src->elems[is]) */
-        --id;
+	--id;
     }
 
   if (REG_VALID_INDEX (is))
@@ -1247,21 +1247,21 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)
   for (;;)
     {
       if (dest->elems[is] > dest->elems[id])
-        {
+	{
 	  /* Copy from the top.  */
-          dest->elems[id + delta--] = dest->elems[is--];
+	  dest->elems[id + delta--] = dest->elems[is--];
 	  if (delta == 0)
 	    break;
 	}
       else
-        {
-          /* Slide from the bottom.  */
-          dest->elems[id + delta] = dest->elems[id];
+	{
+	  /* Slide from the bottom.  */
+	  dest->elems[id + delta] = dest->elems[id];
 	  if (! REG_VALID_INDEX (--id))
 	    {
 	      /* Copy remaining SRC elements.  */
 	      memcpy (dest->elems, dest->elems + sbase,
-	              delta * sizeof (Idx));
+		      delta * sizeof (Idx));
 	      break;
 	    }
 	}
@@ -1275,7 +1275,7 @@ re_node_set_merge (re_node_set *dest, const re_node_set *src)
    Return true if successful.  */
 
 static bool
-internal_function
+internal_function __attribute_warn_unused_result__
 re_node_set_insert (re_node_set *set, Idx elem)
 {
   Idx idx;
@@ -1308,12 +1308,12 @@ re_node_set_insert (re_node_set *set, Idx elem)
     {
       idx = 0;
       for (idx = set->nelem; idx > 0; idx--)
-        set->elems[idx] = set->elems[idx - 1];
+	set->elems[idx] = set->elems[idx - 1];
     }
   else
     {
       for (idx = set->nelem; set->elems[idx - 1] > elem; idx--)
-        set->elems[idx] = set->elems[idx - 1];
+	set->elems[idx] = set->elems[idx - 1];
     }
 
   /* Insert the new element.  */
@@ -1327,7 +1327,7 @@ re_node_set_insert (re_node_set *set, Idx elem)
    Return true if successful.  */
 
 static bool
-internal_function
+internal_function __attribute_warn_unused_result__
 re_node_set_insert_last (re_node_set *set, Idx elem)
 {
   /* Realloc if we need.  */
@@ -1473,7 +1473,7 @@ calc_state_hash (const re_node_set *nodes, unsigned int context)
 	   optimization.  */
 
 static re_dfastate_t *
-internal_function
+internal_function __attribute_warn_unused_result__
 re_acquire_state (reg_errcode_t *err, const re_dfa_t *dfa,
 		  const re_node_set *nodes)
 {
@@ -1521,7 +1521,7 @@ re_acquire_state (reg_errcode_t *err, const re_dfa_t *dfa,
 	   optimization.  */
 
 static re_dfastate_t *
-internal_function
+internal_function __attribute_warn_unused_result__
 re_acquire_state_context (reg_errcode_t *err, const re_dfa_t *dfa,
 			  const re_node_set *nodes, unsigned int context)
 {
@@ -1562,6 +1562,7 @@ re_acquire_state_context (reg_errcode_t *err, const re_dfa_t *dfa,
    indicates the error code if failed.  */
 
 static reg_errcode_t
+__attribute_warn_unused_result__
 register_state (const re_dfa_t *dfa, re_dfastate_t *newstate,
 		re_hashval_t hash)
 {
@@ -1616,7 +1617,7 @@ free_state (re_dfastate_t *state)
    Return the new state if succeeded, otherwise return NULL.  */
 
 static re_dfastate_t *
-internal_function
+internal_function __attribute_warn_unused_result__
 create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
 		    re_hashval_t hash)
 {
@@ -1666,7 +1667,7 @@ create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
    Return the new state if succeeded, otherwise return NULL.  */
 
 static re_dfastate_t *
-internal_function
+internal_function __attribute_warn_unused_result__
 create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
 		    unsigned int context, re_hashval_t hash)
 {
@@ -1715,7 +1716,9 @@ create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
 		  free_state (newstate);
 		  return NULL;
 		}
-	      re_node_set_init_copy (newstate->entrance_nodes, nodes);
+	      if (re_node_set_init_copy (newstate->entrance_nodes, nodes)
+		  != REG_NOERROR)
+		return NULL;
 	      nctx_nodes = 0;
 	      newstate->has_constraint = 1;
 	    }
diff --git a/gnulib/regex_internal.h b/gnulib/regex_internal.h
index 3cdc548d3..e1b4c61b3 100644
--- a/gnulib/regex_internal.h
+++ b/gnulib/regex_internal.h
@@ -1,6 +1,6 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+   Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -21,6 +21,32 @@
 #ifndef _REGEX_INTERNAL_H
 #define _REGEX_INTERNAL_H 1
 
+#include <assert.h>
+#include <ctype.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <langinfo.h>
+#ifndef _LIBC
+# include "localcharset.h"
+#endif
+#if defined HAVE_LOCALE_H || defined _LIBC
+# include <locale.h>
+#endif
+
+#include <wchar.h>
+#include <wctype.h>
+#include <stdint.h>
+#if defined _LIBC
+# include <bits/libc-lock.h>
+#else
+# define __libc_lock_init(NAME) do { } while (0)
+# define __libc_lock_lock(NAME) do { } while (0)
+# define __libc_lock_unlock(NAME) do { } while (0)
+#endif
+
 /* In case that the system doesn't have isblank().  */
 #if !defined _LIBC && ! (defined isblank || (HAVE_ISBLANK && HAVE_DECL_ISBLANK))
 # define isblank(ch) ((ch) == ' ' || (ch) == '\t')
@@ -58,7 +84,7 @@
 # define SIZE_MAX ((size_t) -1)
 #endif
 
-#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCSCOLL) || defined (_LIBC)
+#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCSCOLL) || _LIBC
 # define RE_ENABLE_I18N
 #endif
 
@@ -825,4 +851,21 @@ re_string_elem_size_at (const re_string_t *pstr, Idx idx)
 }
 #endif /* RE_ENABLE_I18N */
 
+#ifndef __GNUC_PREREQ
+# if defined __GNUC__ && defined __GNUC_MINOR__
+#  define __GNUC_PREREQ(maj, min) \
+         ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+# else
+#  define __GNUC_PREREQ(maj, min) 0
+# endif
+#endif
+
+#if __GNUC_PREREQ (3,4)
+# undef __attribute_warn_unused_result__
+# define __attribute_warn_unused_result__ \
+   __attribute__ ((__warn_unused_result__))
+#else
+# define __attribute_warn_unused_result__ /* empty */
+#endif
+
 #endif /*  _REGEX_INTERNAL_H */
diff --git a/gnulib/regexec.c b/gnulib/regexec.c
index 21a81669f..9388ac12b 100644
--- a/gnulib/regexec.c
+++ b/gnulib/regexec.c
@@ -1,6 +1,6 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+   Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -637,7 +637,7 @@ re_exec (s)
    (0 <= LAST_START && LAST_START <= LENGTH)  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 re_search_internal (const regex_t *preg,
 		    const char *string, Idx length,
 		    Idx start, Idx last_start, Idx stop,
@@ -833,10 +833,10 @@ re_search_internal (const regex_t *preg,
 		break;
 	      match_first += incr;
 	      if (match_first < left_lim || match_first > right_lim)
-	        {
-	          err = REG_NOMATCH;
-	          goto free_return;
-	        }
+		{
+		  err = REG_NOMATCH;
+		  goto free_return;
+		}
 	    }
 	  break;
 	}
@@ -953,14 +953,14 @@ re_search_internal (const regex_t *preg,
 	}
 
       if (dfa->subexp_map)
-        for (reg_idx = 0; reg_idx + 1 < nmatch; reg_idx++)
-          if (dfa->subexp_map[reg_idx] != reg_idx)
-            {
-              pmatch[reg_idx + 1].rm_so
-                = pmatch[dfa->subexp_map[reg_idx] + 1].rm_so;
-              pmatch[reg_idx + 1].rm_eo
-                = pmatch[dfa->subexp_map[reg_idx] + 1].rm_eo;
-            }
+	for (reg_idx = 0; reg_idx + 1 < nmatch; reg_idx++)
+	  if (dfa->subexp_map[reg_idx] != reg_idx)
+	    {
+	      pmatch[reg_idx + 1].rm_so
+		= pmatch[dfa->subexp_map[reg_idx] + 1].rm_so;
+	      pmatch[reg_idx + 1].rm_eo
+		= pmatch[dfa->subexp_map[reg_idx] + 1].rm_eo;
+	    }
     }
 
  free_return:
@@ -972,7 +972,7 @@ re_search_internal (const regex_t *preg,
 }
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 prune_impossible_nodes (re_match_context_t *mctx)
 {
   const re_dfa_t *const dfa = mctx->dfa;
@@ -1110,7 +1110,7 @@ acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx,
    index of the buffer.  */
 
 static Idx
-internal_function
+internal_function __attribute_warn_unused_result__
 check_matching (re_match_context_t *mctx, bool fl_longest_match,
 		Idx *p_match_first)
 {
@@ -1149,7 +1149,7 @@ check_matching (re_match_context_t *mctx, bool fl_longest_match,
 	    {
 	      err = transit_state_bkref (mctx, &cur_state->nodes);
 	      if (BE (err != REG_NOERROR, 0))
-	        return err;
+		return err;
 	    }
 	}
     }
@@ -1176,16 +1176,16 @@ check_matching (re_match_context_t *mctx, bool fl_longest_match,
       Idx next_char_idx = re_string_cur_idx (&mctx->input) + 1;
 
       if (BE (next_char_idx >= mctx->input.bufs_len, 0)
-          || (BE (next_char_idx >= mctx->input.valid_len, 0)
-              && mctx->input.valid_len < mctx->input.len))
-        {
-          err = extend_buffers (mctx);
-          if (BE (err != REG_NOERROR, 0))
+	  || (BE (next_char_idx >= mctx->input.valid_len, 0)
+	      && mctx->input.valid_len < mctx->input.len))
+	{
+	  err = extend_buffers (mctx);
+	  if (BE (err != REG_NOERROR, 0))
 	    {
 	      assert (err == REG_ESPACE);
 	      return REG_ERROR;
 	    }
-        }
+	}
 
       cur_state = transit_state (&err, mctx, cur_state);
       if (mctx->state_log != NULL)
@@ -1309,17 +1309,17 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
           if (dest_node == REG_MISSING)
 	    dest_node = candidate;
 
-          else
+	  else
 	    {
 	      /* In order to avoid infinite loop like "(a*)*", return the second
-	         epsilon-transition if the first was already considered.  */
+		 epsilon-transition if the first was already considered.  */
 	      if (re_node_set_contains (eps_via_nodes, dest_node))
-	        return candidate;
+		return candidate;
 
 	      /* Otherwise, push the second epsilon-transition on the fail stack.  */
 	      else if (fs != NULL
 		       && push_fail_stack (fs, *pidx, candidate, nregs, regs,
-				           eps_via_nodes))
+					   eps_via_nodes))
 		return REG_ERROR;
 
 	      /* We know we are going to exit.  */
@@ -1385,7 +1385,7 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs,
 }
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 push_fail_stack (struct re_fail_stack_t *fs, Idx str_idx, Idx dest_node,
 		 Idx nregs, regmatch_t *regs, re_node_set *eps_via_nodes)
 {
@@ -1432,7 +1432,7 @@ pop_fail_stack (struct re_fail_stack_t *fs, Idx *pidx, Idx nregs,
    pmatch[i].rm_so == pmatch[i].rm_eo == -1 for 0 < i < nmatch.  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 set_regs (const regex_t *preg, const re_match_context_t *mctx, size_t nmatch,
 	  regmatch_t *pmatch, bool fl_backtrack)
 {
@@ -1667,7 +1667,7 @@ sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx)
       if (mctx->state_log[str_idx])
 	{
 	  err = build_sifted_states (mctx, sctx, str_idx, &cur_dest);
-          if (BE (err != REG_NOERROR, 0))
+	  if (BE (err != REG_NOERROR, 0))
 	    goto free_return;
 	}
 
@@ -1686,7 +1686,7 @@ sift_states_backward (const re_match_context_t *mctx, re_sift_context_t *sctx)
 }
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 build_sifted_states (const re_match_context_t *mctx, re_sift_context_t *sctx,
 		     Idx str_idx, re_node_set *cur_dest)
 {
@@ -1848,7 +1848,7 @@ update_cur_sifted_state (const re_match_context_t *mctx,
 }
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes,
 		       const re_node_set *candidates)
 {
@@ -1863,10 +1863,14 @@ add_epsilon_src_nodes (const re_dfa_t *dfa, re_node_set *dest_nodes,
     {
       err = re_node_set_alloc (&state->inveclosure, dest_nodes->nelem);
       if (BE (err != REG_NOERROR, 0))
-        return REG_ESPACE;
+	return REG_ESPACE;
       for (i = 0; i < dest_nodes->nelem; i++)
-        re_node_set_merge (&state->inveclosure,
-			   dfa->inveclosures + dest_nodes->elems[i]);
+	{
+	  err = re_node_set_merge (&state->inveclosure,
+				   dfa->inveclosures + dest_nodes->elems[i]);
+	  if (BE (err != REG_NOERROR, 0))
+	    return REG_ESPACE;
+	}
     }
   return re_node_set_add_intersect (dest_nodes, candidates,
 				    &state->inveclosure);
@@ -1978,7 +1982,7 @@ check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries,
 	    {
 	      struct re_backref_cache_entry *ent = mctx->bkref_ents + bkref_idx;
 	      do
-	        {
+		{
 		  Idx dst;
 		  int cpos;
 
@@ -2000,9 +2004,9 @@ check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries,
 		  if (dst == from_node)
 		    {
 		      if (boundaries & 1)
-		        return -1;
+			return -1;
 		      else /* if (boundaries & 2) */
-		        return 0;
+			return 0;
 		    }
 
 		  cpos =
@@ -2016,7 +2020,7 @@ check_dst_limits_calc_pos_1 (const re_match_context_t *mctx, int boundaries,
 		  if (subexp_idx < BITSET_WORD_BITS)
 		    ent->eps_reachable_subexps_map
 		      &= ~((bitset_word_t) 1 << subexp_idx);
-	        }
+		}
 	      while (ent++->more);
 	    }
 	  break;
@@ -2158,7 +2162,7 @@ check_subexp_limits (const re_dfa_t *dfa, re_node_set *dest_nodes,
 }
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx,
 		   Idx str_idx, const re_node_set *candidates)
 {
@@ -2241,7 +2245,7 @@ sift_states_bkref (const re_match_context_t *mctx, re_sift_context_t *sctx,
 	  re_node_set_remove (&local_sctx.limits, enabled_idx);
 
 	  /* mctx->bkref_ents may have changed, reload the pointer.  */
-          entry = mctx->bkref_ents + enabled_idx;
+	  entry = mctx->bkref_ents + enabled_idx;
 	}
       while (enabled_idx++, entry++->more);
     }
@@ -2288,7 +2292,7 @@ sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx,
    update the destination of STATE_LOG.  */
 
 static re_dfastate_t *
-internal_function
+internal_function __attribute_warn_unused_result__
 transit_state (reg_errcode_t *err, re_match_context_t *mctx,
 	       re_dfastate_t *state)
 {
@@ -2322,7 +2326,7 @@ transit_state (reg_errcode_t *err, re_match_context_t *mctx,
 
       trtable = state->word_trtable;
       if (BE (trtable != NULL, 1))
-        {
+	{
 	  unsigned int context;
 	  context
 	    = re_string_context_at (&mctx->input,
@@ -2368,21 +2372,21 @@ merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx,
       unsigned int context;
       re_node_set next_nodes, *log_nodes, *table_nodes = NULL;
       /* If (state_log[cur_idx] != 0), it implies that cur_idx is
-         the destination of a multibyte char/collating element/
-         back reference.  Then the next state is the union set of
-         these destinations and the results of the transition table.  */
+	 the destination of a multibyte char/collating element/
+	 back reference.  Then the next state is the union set of
+	 these destinations and the results of the transition table.  */
       pstate = mctx->state_log[cur_idx];
       log_nodes = pstate->entrance_nodes;
       if (next_state != NULL)
-        {
-          table_nodes = next_state->entrance_nodes;
-          *err = re_node_set_init_union (&next_nodes, table_nodes,
+	{
+	  table_nodes = next_state->entrance_nodes;
+	  *err = re_node_set_init_union (&next_nodes, table_nodes,
 					     log_nodes);
-          if (BE (*err != REG_NOERROR, 0))
+	  if (BE (*err != REG_NOERROR, 0))
 	    return NULL;
-        }
+	}
       else
-        next_nodes = *log_nodes;
+	next_nodes = *log_nodes;
       /* Note: We already add the nodes of the initial state,
 	 then we don't need to add them here.  */
 
@@ -2390,12 +2394,12 @@ merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx,
 				      re_string_cur_idx (&mctx->input) - 1,
 				      mctx->eflags);
       next_state = mctx->state_log[cur_idx]
-        = re_acquire_state_context (err, dfa, &next_nodes, context);
+	= re_acquire_state_context (err, dfa, &next_nodes, context);
       /* We don't need to check errors here, since the return value of
-         this function is next_state and ERR is already set.  */
+	 this function is next_state and ERR is already set.  */
 
       if (table_nodes != NULL)
-        re_node_set_free (&next_nodes);
+	re_node_set_free (&next_nodes);
     }
 
   if (BE (dfa->nbackref, 0) && next_state != NULL)
@@ -2436,9 +2440,9 @@ find_recover_state (reg_errcode_t *err, re_match_context_t *mctx)
 
       do
 	{
-          if (++cur_str_idx > max)
-            return NULL;
-          re_string_skip_bytes (&mctx->input, 1);
+	  if (++cur_str_idx > max)
+	    return NULL;
+	  re_string_skip_bytes (&mctx->input, 1);
 	}
       while (mctx->state_log[cur_str_idx] == NULL);
 
@@ -2546,7 +2550,7 @@ transit_state_mb (re_match_context_t *mctx, re_dfastate_t *pstate)
       re_dfastate_t *dest_state;
 
       if (!dfa->nodes[cur_node_idx].accept_mb)
-        continue;
+	continue;
 
       if (dfa->nodes[cur_node_idx].constraint)
 	{
@@ -2714,7 +2718,7 @@ transit_state_bkref (re_match_context_t *mctx, const re_node_set *nodes)
    delay these checking for prune_impossible_nodes().  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx)
 {
   const re_dfa_t *const dfa = mctx->dfa;
@@ -2727,7 +2731,7 @@ get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx)
       const struct re_backref_cache_entry *entry
 	= mctx->bkref_ents + cache_idx;
       do
-        if (entry->node == bkref_node)
+	if (entry->node == bkref_node)
 	  return REG_NOERROR; /* We already checked it.  */
       while (entry++->more);
     }
@@ -2915,7 +2919,7 @@ find_subexp_node (const re_dfa_t *dfa, const re_node_set *nodes,
    Return REG_NOERROR if it can arrive, or REG_NOMATCH otherwise.  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node,
 	       Idx top_str, Idx last_node, Idx last_str, int type)
 {
@@ -3077,7 +3081,7 @@ check_arrival (re_match_context_t *mctx, state_array_t *path, Idx top_node,
 	 Can't we unify them?  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 check_arrival_add_next_nodes (re_match_context_t *mctx, Idx str_idx,
 			      re_node_set *cur_nodes, re_node_set *next_nodes)
 {
@@ -3211,7 +3215,7 @@ check_arrival_expand_ecl (const re_dfa_t *dfa, re_node_set *cur_nodes,
    problematic append it to DST_NODES.  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes,
 			      Idx target, Idx ex_subexp, int type)
 {
@@ -3256,7 +3260,7 @@ check_arrival_expand_ecl_sub (const re_dfa_t *dfa, re_node_set *dst_nodes,
    in MCTX->BKREF_ENTS.  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 expand_bkref_cache (re_match_context_t *mctx, re_node_set *cur_nodes,
 		    Idx cur_str, Idx subexp_num, int type)
 {
@@ -3622,7 +3626,7 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
 	}
 #ifdef RE_ENABLE_I18N
       else if (type == OP_UTF8_PERIOD)
-        {
+	{
 	  if (ASCII_CHARS % BITSET_WORD_BITS == 0)
 	    memset (accepts, -1, ASCII_CHARS / CHAR_BIT);
 	  else
@@ -3631,7 +3635,7 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
 	    bitset_clear (accepts, '\n');
 	  if (dfa->syntax & RE_DOT_NOT_NULL)
 	    bitset_clear (accepts, '\0');
-        }
+	}
 #endif
       else
 	continue;
@@ -3836,7 +3840,7 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
   if (node->type == OP_PERIOD)
     {
       if (char_len <= 1)
-        return 0;
+	return 0;
       /* FIXME: I don't think this if is needed, as both '\n'
 	 and '\0' are char_len == 1.  */
       /* '.' accepts any one character except the following two cases.  */
@@ -3949,15 +3953,20 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
 		_NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB);
 	      indirect = (const int32_t *)
 		_NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
-	      idx = findidx (&cp);
+	      int32_t idx = findidx (&cp);
 	      if (idx > 0)
 		for (i = 0; i < cset->nequiv_classes; ++i)
 		  {
 		    int32_t equiv_class_idx = cset->equiv_classes[i];
-		    size_t weight_len = weights[idx];
-		    if (weight_len == weights[equiv_class_idx])
+		    size_t weight_len = weights[idx & 0xffffff];
+		    if (weight_len == weights[equiv_class_idx & 0xffffff]
+			&& (idx >> 24) == (equiv_class_idx >> 24))
 		      {
 			Idx cnt = 0;
+
+			idx &= 0xffffff;
+			equiv_class_idx &= 0xffffff;
+
 			while (cnt <= weight_len
 			       && (weights[equiv_class_idx + 1 + cnt]
 				   == weights[idx + 1 + cnt]))
@@ -4123,7 +4132,7 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node,
 /* Extend the buffers, if the buffers have run out.  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 extend_buffers (re_match_context_t *mctx)
 {
   reg_errcode_t ret;
@@ -4186,7 +4195,7 @@ extend_buffers (re_match_context_t *mctx)
 /* Initialize MCTX.  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 match_ctx_init (re_match_context_t *mctx, int eflags, Idx n)
 {
   mctx->eflags = eflags;
@@ -4266,7 +4275,7 @@ match_ctx_free (re_match_context_t *mctx)
 */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 match_ctx_add_entry (re_match_context_t *mctx, Idx node, Idx str_idx, Idx from,
 		     Idx to)
 {
@@ -4338,7 +4347,7 @@ search_cur_bkref_entry (const re_match_context_t *mctx, Idx str_idx)
    at STR_IDX.  */
 
 static reg_errcode_t
-internal_function
+internal_function __attribute_warn_unused_result__
 match_ctx_add_subtop (re_match_context_t *mctx, Idx node, Idx str_idx)
 {
 #ifdef DEBUG
diff --git a/lib/posix_wrap/assert.h b/lib/posix_wrap/assert.h
new file mode 100644
index 000000000..94cfdd543
--- /dev/null
+++ b/lib/posix_wrap/assert.h
@@ -0,0 +1,33 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009, 2010  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/>.
+ */
+
+#ifndef GRUB_POSIX_ASSERT_H
+#define GRUB_POSIX_ASSERT_H	1
+
+#include <grub/misc.h>
+
+#define assert(x) assert_real(__FILE__, __LINE__, x)
+
+static inline void
+assert_real (const char *file, int line, int cond)
+{
+  if (!cond)
+    grub_fatal ("Assertion failed at %s:%d\n", file, line);
+}
+
+#endif
diff --git a/include/grub/gnulib-wrap.h b/lib/posix_wrap/ctype.h
similarity index 51%
rename from include/grub/gnulib-wrap.h
rename to lib/posix_wrap/ctype.h
index e3f7b23b0..2dc3e53e9 100644
--- a/include/grub/gnulib-wrap.h
+++ b/lib/posix_wrap/ctype.h
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2009, 2010  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
@@ -16,48 +16,11 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GRUB_GNULIB_WRAP_H
-#define GRUB_GNULIB_WRAP_H	1
+#ifndef GRUB_POSIX_CTYPE_H
+#define GRUB_POSIX_CTYPE_H	1
 
-#include <grub/mm.h>
 #include <grub/misc.h>
 
-#define HAVE_ISBLANK 0
-#define HAVE_LIBINTL_H 0
-#define HAVE_LOCALE_H 0
-#define __STRICT_ANSI__ 0
-#define DEBUG 0
-#define _Restrict_ __restrict
-#define _Restrict_arr_ __restrict
-
-typedef grub_size_t size_t;
-typedef int bool;
-static const bool true = 1;
-static const bool false = 0;
-
-#define assert(x) assert_real(__FILE__, __LINE__, x)
-
-static inline void
-assert_real (const char *file, int line, int cond)
-{
-  if (!cond)
-    grub_fatal ("Assertion failed at %s:%d\n", file, line);
-}
-
-static inline char *
-locale_charset (void)
-{
-  return "UTF-8";
-}
-
-#define MB_CUR_MAX 6
-
-static inline void *
-realloc (void *ptr, grub_size_t size)
-{
-  return grub_realloc (ptr, size);
-}
-
 static inline int
 toupper (int c)
 {
@@ -137,59 +100,4 @@ tolower (int c)
   return grub_tolower (c);
 }
 
-static inline grub_size_t
-strlen (const char *s)
-{
-  return grub_strlen (s);
-}
-
-static inline int 
-strcmp (const char *s1, const char *s2)
-{
-  return grub_strcmp (s1, s2);
-}
-
-static inline void
-abort (void)
-{
-  grub_abort ();
-}
-
-static inline void 
-free (void *ptr)
-{
-  grub_free (ptr);
-}
-
-static inline void *
-malloc (grub_size_t size)
-{
-  return grub_malloc (size);
-}
-
-static inline void *
-calloc (grub_size_t size, grub_size_t nelem)
-{
-  return grub_zalloc (size * nelem);
-}
-
-static inline char *strncpy (char *dest, const char *src, int c)
-{
-  return grub_strncpy (dest, src, c);
-}
-
-
-#define ULONG_MAX GRUB_ULONG_MAX
-#define UCHAR_MAX 0xff
-
-/* UCS-4.  */
-typedef grub_uint32_t wchar_t;
-
-#undef __libc_lock_init
-#define __libc_lock_init(x)
-#undef __libc_lock_lock
-#define __libc_lock_lock(x)
-#undef __libc_lock_unlock
-#define __libc_lock_unlock(x)
-
 #endif
diff --git a/lib/posix_wrap/langinfo.h b/lib/posix_wrap/langinfo.h
new file mode 100644
index 000000000..14833c0b8
--- /dev/null
+++ b/lib/posix_wrap/langinfo.h
@@ -0,0 +1,38 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009, 2010  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/>.
+ */
+
+#ifndef GRUB_POSIX_LANGINFO_H
+#define GRUB_POSIX_LANGINFO_H	1
+
+#include <localcharset.h>
+
+typedef enum { CODESET } nl_item;
+
+static inline char *
+nl_langinfo (nl_item item)
+{
+  switch (item)
+    {
+    case CODESET:
+      return locale_charset ();
+    default:
+      return "";
+    }
+}
+
+#endif
diff --git a/lib/posix_wrap/limits.h b/lib/posix_wrap/limits.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/posix_wrap/localcharset.h b/lib/posix_wrap/localcharset.h
new file mode 100644
index 000000000..92eb815ec
--- /dev/null
+++ b/lib/posix_wrap/localcharset.h
@@ -0,0 +1,28 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009, 2010  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/>.
+ */
+
+#ifndef GRUB_POSIX_LOCALCHARSET_H
+#define GRUB_POSIX_LOCALCHARSET_H	1
+
+static inline char *
+locale_charset (void)
+{
+  return "UTF-8";
+}
+
+#endif
diff --git a/lib/posix_wrap/stdint.h b/lib/posix_wrap/stdint.h
new file mode 100644
index 000000000..a12c43b15
--- /dev/null
+++ b/lib/posix_wrap/stdint.h
@@ -0,0 +1 @@
+#include <sys/types.h>
diff --git a/lib/posix_wrap/stdio.h b/lib/posix_wrap/stdio.h
new file mode 100644
index 000000000..31f6d6c60
--- /dev/null
+++ b/lib/posix_wrap/stdio.h
@@ -0,0 +1,24 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009, 2010  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/>.
+ */
+
+#ifndef GRUB_POSIX_STDIO_H
+#define GRUB_POSIX_STDIO_H	1
+
+#include <grub/misc.h>
+
+#endif
diff --git a/lib/posix_wrap/stdlib.h b/lib/posix_wrap/stdlib.h
new file mode 100644
index 000000000..5ef6159ef
--- /dev/null
+++ b/lib/posix_wrap/stdlib.h
@@ -0,0 +1,56 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009, 2010  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/>.
+ */
+
+#ifndef GRUB_POSIX_STDLIB_H
+#define GRUB_POSIX_STDLIB_H	1
+
+#include <grub/mm.h>
+
+static inline void 
+free (void *ptr)
+{
+  grub_free (ptr);
+}
+
+static inline void *
+malloc (grub_size_t size)
+{
+  return grub_malloc (size);
+}
+
+static inline void *
+calloc (grub_size_t size, grub_size_t nelem)
+{
+  return grub_zalloc (size * nelem);
+}
+
+static inline void *
+realloc (void *ptr, grub_size_t size)
+{
+  return grub_realloc (ptr, size);
+}
+
+static inline void
+abort (void)
+{
+  grub_abort ();
+}
+
+#define MB_CUR_MAX 6
+
+#endif
diff --git a/lib/posix_wrap/string.h b/lib/posix_wrap/string.h
new file mode 100644
index 000000000..7bb6f1e6f
--- /dev/null
+++ b/lib/posix_wrap/string.h
@@ -0,0 +1,40 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009, 2010  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/>.
+ */
+
+#ifndef GRUB_POSIX_STRING_H
+#define GRUB_POSIX_STRING_H	1
+
+static inline grub_size_t
+strlen (const char *s)
+{
+  return grub_strlen (s);
+}
+
+static inline int 
+strcmp (const char *s1, const char *s2)
+{
+  return grub_strcmp (s1, s2);
+}
+
+static inline int 
+strcasecmp (const char *s1, const char *s2)
+{
+  return grub_strcasecmp (s1, s2);
+}
+
+#endif
diff --git a/lib/posix_wrap/sys/types.h b/lib/posix_wrap/sys/types.h
new file mode 100644
index 000000000..ce3794087
--- /dev/null
+++ b/lib/posix_wrap/sys/types.h
@@ -0,0 +1,32 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009, 2010  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/>.
+ */
+
+#ifndef GRUB_POSIX_SYS_TYPES_H
+#define GRUB_POSIX_SYS_TYPES_H	1
+
+#include <grub/misc.h>
+
+typedef grub_size_t size_t;
+typedef int bool;
+static const bool true = 1;
+static const bool false = 0;
+
+#define ULONG_MAX GRUB_ULONG_MAX
+#define UCHAR_MAX 0xff
+
+#endif
diff --git a/lib/posix_wrap/wchar.h b/lib/posix_wrap/wchar.h
new file mode 100644
index 000000000..fd56fd332
--- /dev/null
+++ b/lib/posix_wrap/wchar.h
@@ -0,0 +1,25 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009, 2010  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/>.
+ */
+
+#ifndef GRUB_POSIX_WCHAR_H
+#define GRUB_POSIX_WCHAR_H	1
+
+/* UCS-4.  */
+typedef grub_uint32_t wchar_t;
+
+#endif
diff --git a/lib/posix_wrap/wctype.h b/lib/posix_wrap/wctype.h
new file mode 100644
index 000000000..e69de29bb

From 74f34747b12fc8c451a78bda5c85936f2567af2e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 28 Mar 2010 22:19:06 +0200
Subject: [PATCH 0700/1628] Fix path to regex.h

---
 commands/regexp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commands/regexp.c b/commands/regexp.c
index 6ceb78f0f..910bb9082 100644
--- a/commands/regexp.c
+++ b/commands/regexp.c
@@ -21,7 +21,7 @@
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/command.h>
-#include <grub/regex.h>
+#include <regex.h>
 
 static grub_err_t
 grub_cmd_regexp (grub_command_t cmd __attribute__ ((unused)),

From 66bf23d2e7f78c18f14a416a9754f814c97c39c5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 28 Mar 2010 22:20:32 +0200
Subject: [PATCH 0701/1628] Use posix wrappers in lexer

---
 conf/common.rmk        |  4 +---
 lib/posix_wrap/stdio.h |  5 +++++
 script/yylex.l         | 22 +++++++---------------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index b9ed37d26..87ae1e202 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -98,8 +98,6 @@ grub_bin2h_SOURCES = gnulib/progname.c util/bin2h.c
 # For the lexer.
 grub_script.yy.c grub_script.yy.h: script/yylex.l
 	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(srcdir)/script/yylex.l
-	sed -i 's/^#include.*\(<stdio\.h>\|<string\.h>\|<errno\.h>\|<stdlib\.h>\|<unistd\.h>\)//g' grub_script.yy.h
-	sed -i 's/^#include.*\(<stdio\.h>\|<string\.h>\|<errno\.h>\|<stdlib\.h>\|<unistd\.h>\)//g' grub_script.yy.c
 DISTCLEANFILES += grub_script.yy.c grub_script.yy.h
 
 # For grub-script-check.
@@ -655,7 +653,7 @@ normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
 # For sh.mod.
 sh_mod_SOURCES = script/main.c script/script.c script/execute.c \
 	script/function.c script/lexer.c grub_script.tab.c grub_script.yy.c
-sh_mod_CFLAGS = $(COMMON_CFLAGS)
+sh_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS)
 sh_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 ifneq (, $(FONT_SOURCE))
diff --git a/lib/posix_wrap/stdio.h b/lib/posix_wrap/stdio.h
index 31f6d6c60..701fceaa4 100644
--- a/lib/posix_wrap/stdio.h
+++ b/lib/posix_wrap/stdio.h
@@ -20,5 +20,10 @@
 #define GRUB_POSIX_STDIO_H	1
 
 #include <grub/misc.h>
+#include <grub/file.h>
+
+typedef struct grub_file FILE;
+
+#define EOF    -1
 
 #endif
diff --git a/script/yylex.l b/script/yylex.l
index db276ef61..4d7c66448 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -68,31 +68,23 @@ static void  copy_string (struct grub_parser_param *, const char *,
 
 %top{
 
+#include <sys/types.h>
+
+typedef size_t yy_size_t;
+#define YY_TYPEDEF_YY_SIZE_T 1
+
 /* 
  * Some flex hacks for -nostdinc; XXX We need to fix these when libc
  * support becomes availble in GRUB.
  */
 
-#include <grub/types.h>
-
-typedef grub_size_t size_t;
-typedef grub_size_t yy_size_t;
-#define YY_TYPEDEF_YY_SIZE_T 1
-
-#define FILE   void
+#ifndef GRUB_UTIL
 #define stdin  0
 #define stdout 0
-#define EOF    0
-
-#define errno  grub_errno
-#define EINVAL GRUB_ERR_BAD_NUMBER
-#define ENOMEM GRUB_ERR_OUT_OF_MEMORY
-
-#define strlen grub_strlen
-#define memset grub_memset
 
 #define fprintf(...) 0
 #define exit(...)
+#endif
 
 #pragma GCC diagnostic warning "-Wunused-variable"
 #pragma GCC diagnostic warning "-Wunused-function"

From c0420b76b0885a9db8fb3911e9744ab5b58d92a6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 29 Mar 2010 02:05:38 +0200
Subject: [PATCH 0702/1628] Fix ascii fallback

---
 font/font.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/font/font.c b/font/font.c
index f39bd9e7e..d512ec98f 100644
--- a/font/font.c
+++ b/font/font.c
@@ -154,7 +154,7 @@ ascii_glyph_lookup (grub_uint32_t code)
 	  ascii_font_glyph[current]->font = NULL;
 
 	  grub_memcpy (ascii_font_glyph[current]->bitmap,
-		       &ascii_bitmaps[(0x7f - current) * ASCII_BITMAP_SIZE],
+		       &ascii_bitmaps[current * ASCII_BITMAP_SIZE],
 		       ASCII_BITMAP_SIZE);
 	}
 

From 3f11c7131efb94091c89f43e16399b0d32315d38 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 29 Mar 2010 02:06:40 +0200
Subject: [PATCH 0703/1628] Generate shaping table based on unicode if source
 font has none

---
 conf/common.rmk        |  2 +-
 include/grub/unicode.h | 15 +++++++++
 util/grub-mkfont.c     | 73 +++++++++++++++++++++++++++++++++++++++---
 util/import_unicode.py | 60 ++++++++++++++++++++++++++++------
 4 files changed, 135 insertions(+), 15 deletions(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index d790abade..c157e9578 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -82,7 +82,7 @@ grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c util/hostfs.c \
 # For grub-mkfont.
 ifeq ($(enable_grub_mkfont), yes)
 bin_UTILITIES += grub-mkfont
-grub_mkfont_SOURCES = gnulib/progname.c util/grub-mkfont.c util/misc.c
+grub_mkfont_SOURCES = gnulib/progname.c util/grub-mkfont.c util/misc.c unidata.c
 grub_mkfont_CFLAGS = $(freetype_cflags)
 grub_mkfont_LDFLAGS = $(freetype_libs)
 endif
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 28c752b9e..9fde69cc8 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -39,6 +39,19 @@ struct grub_unicode_compact_range
   grub_uint8_t join_type:3;
 } __attribute__ ((packed));
 
+/* Old-style Arabic shaping. Used for "visual UTF-8" and
+   in grub-mkfont to find variant glyphs in absence of GPOS tables.  */
+struct grub_unicode_arabic_shape
+{
+  grub_uint32_t code;
+  grub_uint32_t isolated;
+  grub_uint32_t right_linked;
+  grub_uint32_t both_linked;
+  grub_uint32_t left_linked;
+};
+
+extern struct grub_unicode_arabic_shape grub_unicode_arabic_shapes[];
+
 enum grub_bidi_type
   {
     GRUB_BIDI_TYPE_L = 0,
@@ -150,6 +163,8 @@ struct grub_unicode_glyph
 #define GRUB_UNICODE_HEBREW_WAW  0x05d5
 #define GRUB_UNICODE_ZWNJ        0x200c
 #define GRUB_UNICODE_ZWJ         0x200d
+#define GRUB_UNICODE_ARABIC_START 0x600
+#define GRUB_UNICODE_ARABIC_END   0x700
 
 extern struct grub_unicode_compact_range grub_unicode_compact[];
 extern struct grub_unicode_bidi_pair grub_unicode_bidi_pairs[];
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index c9d48ed7a..886fc8d4a 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -23,6 +23,7 @@
 #include <grub/i18n.h>
 #include <grub/fontformat.h>
 #include <grub/font.h>
+#include <grub/unicode.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -184,12 +185,18 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
   err = FT_Load_Glyph (face, glyph_idx, flag);
   if (err)
     {
-      if (err < ARRAY_SIZE (ft_errmsgs))
-	printf ("Freetype Error %d loading glyph 0x%x for U+0x%x: %s\n",
-		err, glyph_idx, char_code, ft_errmsgs[err]);
+      printf ("Freetype Error %d loading glyph 0x%x for U+0x%x%s",
+	      err, glyph_idx, char_code & GRUB_FONT_CODE_CHAR_MASK,
+	      char_code & GRUB_FONT_CODE_RIGHT_JOINED
+	      ? ((char_code & GRUB_FONT_CODE_LEFT_JOINED) ? " (medial)":
+		 " (leftmost)")
+	      : ((char_code & GRUB_FONT_CODE_LEFT_JOINED) ? " (rightmost)":
+		 ""));
+
+      if (err > 0 && err < (signed) ARRAY_SIZE (ft_errmsgs))
+	printf (": %s\n", ft_errmsgs[err]);
       else
-	printf ("Freetype Error %d loading glyph 0x%x for U+0x%x\n",
-		err, glyph_idx, char_code);
+	printf ("\n");
       return;
     }
 
@@ -268,6 +275,25 @@ add_char (struct grub_font_info *font_info, FT_Face face,
 		   char_code | GRUB_FONT_CODE_RIGHT_JOINED);
 	break;
       }
+  if (!cur && char_code >= GRUB_UNICODE_ARABIC_START
+      && char_code < GRUB_UNICODE_ARABIC_END)
+    {
+      int i;
+      for (i = 0; grub_unicode_arabic_shapes[i].code; i++)
+	if (grub_unicode_arabic_shapes[i].code == char_code
+	    && grub_unicode_arabic_shapes[i].right_linked)
+	  {
+	    FT_UInt idx2;
+	    idx2 = FT_Get_Char_Index (face, grub_unicode_arabic_shapes[i]
+				      .right_linked);
+	    if (idx2)
+	      add_glyph (font_info, idx2, face,
+			 char_code | GRUB_FONT_CODE_RIGHT_JOINED);
+	    break;
+	  }
+	      
+    }
+
   for (cur = subst_leftjoin; cur; cur = cur->next)
     if (cur->from == glyph_idx)
       {
@@ -275,6 +301,24 @@ add_char (struct grub_font_info *font_info, FT_Face face,
 		   char_code | GRUB_FONT_CODE_LEFT_JOINED);
 	break;
       }
+  if (!cur && char_code >= GRUB_UNICODE_ARABIC_START
+      && char_code < GRUB_UNICODE_ARABIC_END)
+    {
+      int i;
+      for (i = 0; grub_unicode_arabic_shapes[i].code; i++)
+	if (grub_unicode_arabic_shapes[i].code == char_code
+	    && grub_unicode_arabic_shapes[i].left_linked)
+	  {
+	    FT_UInt idx2;
+	    idx2 = FT_Get_Char_Index (face, grub_unicode_arabic_shapes[i]
+				      .left_linked);
+	    if (idx2)
+	      add_glyph (font_info, idx2, face,
+			 char_code | GRUB_FONT_CODE_LEFT_JOINED);
+	    break;
+	  }
+	      
+    }
   for (cur = subst_medijoin; cur; cur = cur->next)
     if (cur->from == glyph_idx)
       {
@@ -283,6 +327,25 @@ add_char (struct grub_font_info *font_info, FT_Face face,
 		   | GRUB_FONT_CODE_RIGHT_JOINED);
 	break;
       }
+  if (!cur && char_code >= GRUB_UNICODE_ARABIC_START
+      && char_code < GRUB_UNICODE_ARABIC_END)
+    {
+      int i;
+      for (i = 0; grub_unicode_arabic_shapes[i].code; i++)
+	if (grub_unicode_arabic_shapes[i].code == char_code
+	    && grub_unicode_arabic_shapes[i].both_linked)
+	  {
+	    FT_UInt idx2;
+	    idx2 = FT_Get_Char_Index (face, grub_unicode_arabic_shapes[i]
+				      .both_linked);
+	    if (idx2)
+	      add_glyph (font_info, idx2, face,
+			 char_code | GRUB_FONT_CODE_LEFT_JOINED
+			 | GRUB_FONT_CODE_RIGHT_JOINED);
+	    break;
+	  }
+	      
+    }
 }
 
 struct gsub_header
diff --git a/util/import_unicode.py b/util/import_unicode.py
index 653d7bae2..1ee162d3f 100644
--- a/util/import_unicode.py
+++ b/util/import_unicode.py
@@ -35,15 +35,15 @@ for line in infile:
     sp = line.split (";")
     curcode = int (sp[0], 16)
     if sp[2] == "U":
-        joining[curcode] = "GRUB_JOIN_TYPE_NONJOINING"
+        joining[curcode] = "NONJOINING"
     elif sp[2] == "L":
-        joining[curcode] = "GRUB_JOIN_TYPE_LEFT"
+        joining[curcode] = "LEFT"
     elif sp[2] == "R":
-        joining[curcode] = "GRUB_JOIN_TYPE_RIGHT"
+        joining[curcode] = "RIGHT"
     elif sp[2] == "D":
-        joining[curcode] = "GRUB_JOIN_TYPE_DUAL"
+        joining[curcode] = "DUAL"
     elif sp[2] == "C":
-        joining[curcode] = "GRUB_JOIN_TYPE_CAUSING"
+        joining[curcode] = "CAUSING"
     else:
         print ("Unknown joining type '%s'" % sp[2])
         exit (1)
@@ -60,6 +60,7 @@ lastcode = -2
 lastbiditype = "X"
 lastmirrortype = False
 lastcombtype = -1
+arabicsubst = {}
 for line in infile:
     sp = line.split (";")
     curcode = int (sp[0], 16)
@@ -102,15 +103,35 @@ for line in infile:
     if curcode in joining:
         curjoin = joining[curcode]
     elif sp[2] == "Me" or sp[2] == "Mn" or sp[2] == "Cf":
-        curjoin = "GRUB_JOIN_TYPE_TRANSPARENT"
+        curjoin = "TRANSPARENT"
     else:
-        curjoin = "GRUB_JOIN_TYPE_NONJOINING"
+        curjoin = "NONJOINING"
+    if sp[1].startswith ("ARABIC LETTER "):
+        arabname = sp[1][len ("ARABIC LETTER "):]
+        form = 0
+        if arabname.endswith (" ISOLATED FORM"):
+            arabname = arabname[0:len (arabname) - len (" ISOLATED FORM")]
+            form = 1
+        if arabname.endswith (" FINAL FORM"):
+            arabname = arabname[0:len (arabname) - len (" FINAL FORM")]
+            form = 2
+        if arabname.endswith (" MEDIAL FORM"):
+            arabname = arabname[0:len (arabname) - len (" MEDIAL FORM")]
+            form = 3
+        if arabname.endswith (" INITIAL FORM"):
+            arabname = arabname[0:len (arabname) - len (" INITIAL FORM")]
+            form = 4
+        if arabname not in arabicsubst:
+            arabicsubst[arabname]={}
+        arabicsubst[arabname][form] = curcode;
+        if form == 0:
+            arabicsubst[arabname]['join'] = curjoin
     if lastcode + 1 != curcode or curbiditype != lastbiditype \
             or curcombtype != lastcombtype or curmirrortype != lastmirrortype \
             or curjoin != lastjoin:
         if begincode != -2 and (lastbiditype != "L" or lastcombtype != 0 or \
                                     lastmirrortype):
-            outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s, %d, %d, %s},\n" \
+            outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s, %d, %d, GRUB_JOIN_TYPE_%s},\n" \
                                 % (begincode, lastcode, lastbiditype, \
                                        lastcombtype, lastmirrortype, \
                                        lastjoin)))
@@ -121,7 +142,7 @@ for line in infile:
     lastcombtype = curcombtype
     lastmirrortype = curmirrortype
 if lastbiditype != "L" or lastcombtype != 0 or lastmirrortype:
-    outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s, %d, %d, %s},\n" \
+    outfile.write (("{0x%x, 0x%x, GRUB_BIDI_TYPE_%s, %d, %d, GRUB_JOIN_TYPE_%s},\n" \
                         % (begincode, lastcode, lastbiditype, lastcombtype, \
                                lastmirrortype, lastjoin)))
 outfile.write ("{0, 0, 0, 0, 0, 0},\n")
@@ -147,3 +168,24 @@ for line in infile:
 outfile.write ("{0, 0},\n")
 outfile.write ("};\n")
 
+infile.close ()
+
+outfile.write ("struct grub_unicode_arabic_shape grub_unicode_arabic_shapes[] = {\n ")
+
+for x in arabicsubst:
+    try:
+        if arabicsubst[x]['join'] == "DUAL":
+            outfile.write ("{0x%x, 0x%x, 0x%x, 0x%x, 0x%x},\n " % (arabicsubst[x][0], arabicsubst[x][1], arabicsubst[x][2], arabicsubst[x][3], arabicsubst[x][4]))
+        elif arabicsubst[x]['join'] == "RIGHT":
+            outfile.write ("{0x%x, 0x%x, 0x%x, 0x%x, 0x%x},\n " % (arabicsubst[x][0], arabicsubst[x][1], arabicsubst[x][2], 0, 0))
+        elif arabicsubst[x]['join'] == "LEFT":
+            outfile.write ("{0x%x, 0x%x, 0x%x, 0x%x, 0x%x},\n " % (arabicsubst[x][0], arabicsubst[x][1], 0, 0, arabicsubst[x][4]))
+    except:
+        pass
+
+outfile.write ("{0, 0, 0, 0, 0},\n")
+outfile.write ("};\n")
+
+
+outfile.close ()
+

From a6ab5fb2cf541b93a4e1a2fd1c0c58a8ccd13133 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 29 Mar 2010 03:13:59 +0200
Subject: [PATCH 0704/1628] Cut font borders

---
 util/grub-mkfont.c | 89 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 70 insertions(+), 19 deletions(-)

diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 886fc8d4a..970cc4aca 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -164,10 +164,11 @@ add_pixel (grub_uint8_t **data, int *mask, int not_blank)
 
 static void
 add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
-	   grub_uint32_t char_code)
+	   grub_uint32_t char_code, int nocut)
 {
   struct grub_glyph_info *glyph_info;
   int width, height;
+  int cuttop, cutbottom, cutleft, cutright;
   grub_uint8_t *data;
   int mask, i, j, bitmap_size;
   FT_GlyphSlot glyph;
@@ -208,8 +209,58 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
   if (glyph->next)
     printf ("%x\n", char_code);
 
-  width = glyph->bitmap.width;
-  height = glyph->bitmap.rows;
+  if (nocut)
+    cuttop = cutbottom = cutleft = cutright = 0;
+  else
+    {
+      for (cuttop = 0; cuttop < glyph->bitmap.rows; cuttop++)
+	{
+	  for (j = 0; j < glyph->bitmap.width; j++)
+	    if (glyph->bitmap.buffer[j / 8 + cuttop * glyph->bitmap.pitch]
+		& (1 << (7 - (j & 7))))
+	      break;
+	  if (j != glyph->bitmap.width)
+	    break;
+	}
+
+      for (cutbottom = glyph->bitmap.rows - 1; cutbottom >= 0; cutbottom--)
+	{
+	  for (j = 0; j < glyph->bitmap.width; j++)
+	    if (glyph->bitmap.buffer[j / 8 + cutbottom * glyph->bitmap.pitch]
+		& (1 << (7 - (j & 7))))
+	      break;
+	  if (j != glyph->bitmap.width)
+	    break;
+	}
+      cutbottom = glyph->bitmap.rows - 1 - cutbottom;
+      if (cutbottom + cuttop >= glyph->bitmap.rows)
+	cutbottom = 0;
+
+      for (cutleft = 0; cutleft < glyph->bitmap.width; cutleft++)
+	{
+	  for (j = 0; j < glyph->bitmap.rows; j++)
+	    if (glyph->bitmap.buffer[cutleft / 8 + j * glyph->bitmap.pitch]
+		& (1 << (7 - (cutleft & 7))))
+	      break;
+	  if (j != glyph->bitmap.rows)
+	    break;
+	}
+      for (cutright = glyph->bitmap.width - 1; cutright >= 0; cutright--)
+	{
+	  for (j = 0; j < glyph->bitmap.rows; j++)
+	    if (glyph->bitmap.buffer[cutright / 8 + j * glyph->bitmap.pitch]
+		& (1 << (7 - (cutright & 7))))
+	      break;
+	  if (j != glyph->bitmap.rows)
+	    break;
+	}
+      cutright = glyph->bitmap.width - 1 - cutright;
+      if (cutright + cutleft >= glyph->bitmap.width)
+	cutright = 0;
+    }
+
+  width = glyph->bitmap.width - cutleft - cutright;
+  height = glyph->bitmap.rows - cutbottom - cuttop;
 
   bitmap_size = ((width * height + 7) / 8);
   glyph_info = xmalloc (sizeof (struct grub_glyph_info));
@@ -223,8 +274,8 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
   glyph_info->char_code = char_code;
   glyph_info->width = width;
   glyph_info->height = height;
-  glyph_info->x_ofs = glyph->bitmap_left;
-  glyph_info->y_ofs = glyph->bitmap_top - height;
+  glyph_info->x_ofs = glyph->bitmap_left + cutleft;
+  glyph_info->y_ofs = glyph->bitmap_top - height - cuttop;
   glyph_info->device_width = glyph->metrics.horiAdvance / 64;
 
   if (width > font_info->max_width)
@@ -241,8 +292,8 @@ add_glyph (struct grub_font_info *font_info, FT_UInt glyph_idx, FT_Face face,
 
   mask = 0;
   data = &glyph_info->bitmap[0] - 1;
-  for (j = 0; j < height; j++)
-    for (i = 0; i < width; i++)
+  for (j = cuttop; j < height + cuttop; j++)
+    for (i = cutleft; i < width + cutleft; i++)
       add_pixel (&data, &mask,
 		 glyph->bitmap.buffer[i / 8 + j * glyph->bitmap.pitch] &
 		 (1 << (7 - (i & 7))));
@@ -259,7 +310,7 @@ struct glyph_replace
 /* TODO: sort glyph_replace and use binary search if necessary.  */
 static void
 add_char (struct grub_font_info *font_info, FT_Face face,
-	  grub_uint32_t char_code)
+	  grub_uint32_t char_code, int nocut)
 {
   FT_UInt glyph_idx;
   struct glyph_replace *cur;
@@ -267,12 +318,12 @@ add_char (struct grub_font_info *font_info, FT_Face face,
   glyph_idx = FT_Get_Char_Index (face, char_code);
   if (!glyph_idx)
     return;
-  add_glyph (font_info, glyph_idx, face, char_code);
+  add_glyph (font_info, glyph_idx, face, char_code, nocut);
   for (cur = subst_rightjoin; cur; cur = cur->next)
     if (cur->from == glyph_idx)
       {
 	add_glyph (font_info, cur->to, face,
-		   char_code | GRUB_FONT_CODE_RIGHT_JOINED);
+		   char_code | GRUB_FONT_CODE_RIGHT_JOINED, nocut);
 	break;
       }
   if (!cur && char_code >= GRUB_UNICODE_ARABIC_START
@@ -288,7 +339,7 @@ add_char (struct grub_font_info *font_info, FT_Face face,
 				      .right_linked);
 	    if (idx2)
 	      add_glyph (font_info, idx2, face,
-			 char_code | GRUB_FONT_CODE_RIGHT_JOINED);
+			 char_code | GRUB_FONT_CODE_RIGHT_JOINED, nocut);
 	    break;
 	  }
 	      
@@ -298,7 +349,7 @@ add_char (struct grub_font_info *font_info, FT_Face face,
     if (cur->from == glyph_idx)
       {
 	add_glyph (font_info, cur->to, face,
-		   char_code | GRUB_FONT_CODE_LEFT_JOINED);
+		   char_code | GRUB_FONT_CODE_LEFT_JOINED, nocut);
 	break;
       }
   if (!cur && char_code >= GRUB_UNICODE_ARABIC_START
@@ -314,7 +365,7 @@ add_char (struct grub_font_info *font_info, FT_Face face,
 				      .left_linked);
 	    if (idx2)
 	      add_glyph (font_info, idx2, face,
-			 char_code | GRUB_FONT_CODE_LEFT_JOINED);
+			 char_code | GRUB_FONT_CODE_LEFT_JOINED, nocut);
 	    break;
 	  }
 	      
@@ -324,7 +375,7 @@ add_char (struct grub_font_info *font_info, FT_Face face,
       {
 	add_glyph (font_info, cur->to, face,
 		   char_code | GRUB_FONT_CODE_LEFT_JOINED
-		   | GRUB_FONT_CODE_RIGHT_JOINED);
+		   | GRUB_FONT_CODE_RIGHT_JOINED, nocut);
 	break;
       }
   if (!cur && char_code >= GRUB_UNICODE_ARABIC_START
@@ -341,7 +392,7 @@ add_char (struct grub_font_info *font_info, FT_Face face,
 	    if (idx2)
 	      add_glyph (font_info, idx2, face,
 			 char_code | GRUB_FONT_CODE_LEFT_JOINED
-			 | GRUB_FONT_CODE_RIGHT_JOINED);
+			 | GRUB_FONT_CODE_RIGHT_JOINED, nocut);
 	    break;
 	  }
 	      
@@ -554,7 +605,7 @@ process_cursive (struct gsub_feature *feature,
 }
 
 void
-add_font (struct grub_font_info *font_info, FT_Face face)
+add_font (struct grub_font_info *font_info, FT_Face face, int nocut)
 {
   struct gsub_header *gsub = NULL;
   FT_ULong gsub_len = 0;
@@ -631,7 +682,7 @@ add_font (struct grub_font_info *font_info, FT_Face face)
       for (i = 0; i < font_info->num_range; i++)
 	for (j = font_info->ranges[i * 2]; j <= font_info->ranges[i * 2 + 1];
 	     j++)
-	  add_char (font_info, face, j);
+	  add_char (font_info, face, j, nocut);
     }
   else
     {
@@ -640,7 +691,7 @@ add_font (struct grub_font_info *font_info, FT_Face face)
       for (char_code = FT_Get_First_Char (face, &glyph_index);
 	   glyph_index;
 	   char_code = FT_Get_Next_Char (face, char_code, &glyph_index))
-	add_char (font_info, face, char_code);
+	add_char (font_info, face, char_code, nocut);
     }
 }
 
@@ -1118,7 +1169,7 @@ main (int argc, char *argv[])
       font_info.size = size;
 
       FT_Set_Pixel_Sizes (ft_face, size, size);
-      add_font (&font_info, ft_face);
+      add_font (&font_info, ft_face, file_format != PF2);
       FT_Done_Face (ft_face);
     }
 

From a82890fffcb113f48fee854e5fc38aca9ec39158 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 29 Mar 2010 03:37:24 +0200
Subject: [PATCH 0705/1628] Shape arabic code when on UTF-8 visual

---
 include/grub/unicode.h |  2 ++
 normal/charset.c       | 36 ++++++++++++++++++++++++++++++++++++
 normal/term.c          |  9 ++++++---
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 9fde69cc8..a779e2c9c 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -222,5 +222,7 @@ grub_unicode_glyph_from_code (grub_uint32_t code)
 
 grub_uint32_t
 grub_unicode_mirror_code (grub_uint32_t in);
+grub_uint32_t
+grub_unicode_shape_code (grub_uint32_t in, grub_uint8_t attr);
 
 #endif
diff --git a/normal/charset.c b/normal/charset.c
index 55a9894a9..6f09fac90 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -1227,3 +1227,39 @@ grub_unicode_mirror_code (grub_uint32_t in)
       return grub_unicode_bidi_pairs[i].replace;
   return in;
 }
+
+grub_uint32_t
+grub_unicode_shape_code (grub_uint32_t in, grub_uint8_t attr)
+{
+  int i;
+  if (!(in >= GRUB_UNICODE_ARABIC_START
+	&& in < GRUB_UNICODE_ARABIC_END))
+    return in;
+
+  for (i = 0; grub_unicode_arabic_shapes[i].code; i++)
+    if (grub_unicode_arabic_shapes[i].code == in)
+      {
+	grub_uint32_t out;
+	switch (attr & (GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED
+			| GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED))
+	  {
+	  case 0:
+	    out = grub_unicode_arabic_shapes[i].isolated;
+	    break;
+	  case GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED:
+	    out = grub_unicode_arabic_shapes[i].right_linked;
+	    break;
+	  case GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED:
+	    out = grub_unicode_arabic_shapes[i].left_linked;
+	    break;
+	  case GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED
+	    |GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED:
+	    out = grub_unicode_arabic_shapes[i].both_linked;
+	    break;
+	  }
+	if (out)
+	  return out;
+      }
+
+  return in;
+}
diff --git a/normal/term.c b/normal/term.c
index 09299f647..4724c5d41 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -392,9 +392,12 @@ putglyph (const struct grub_unicode_glyph *c, struct grub_term_output *term)
 	    {
 	      code = c->base;
 	      if ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
-		  == GRUB_TERM_CODE_TYPE_UTF8_VISUAL
-		  && (c->attributes & GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR))
-		code = grub_unicode_mirror_code (code);
+		  == GRUB_TERM_CODE_TYPE_UTF8_VISUAL)
+		{
+		  if ((c->attributes & GRUB_UNICODE_GLYPH_ATTRIBUTE_MIRROR))
+		    code = grub_unicode_mirror_code (code);
+		  code = grub_unicode_shape_code (code, c->attributes);
+		}
 	    }
 	  else
 	    code = c->combining[i].code;

From ad109fe05639d21fe8fb3c317f12f6fd75d2e058 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 29 Mar 2010 04:11:14 +0200
Subject: [PATCH 0706/1628] Arabic diacritics support

---
 font/font.c            | 12 +++++++++++-
 include/grub/unicode.h |  8 ++++++++
 normal/charset.c       | 25 ++++++++++++++++++++-----
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/font/font.c b/font/font.c
index d512ec98f..3aa415cdc 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1248,6 +1248,13 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	    min_devwidth = combining_glyphs[i]->width;
 	  break;
 
+	  /* TODO: Put dammah and fathah nearer to shadda.  */
+	case GRUB_UNICODE_COMB_ARABIC_DAMMAH:
+	case GRUB_UNICODE_COMB_ARABIC_DAMMATAN:
+	case GRUB_UNICODE_COMB_ARABIC_FATHATAN:
+	case GRUB_UNICODE_COMB_ARABIC_FATHAH:
+	case GRUB_UNICODE_COMB_ARABIC_SUKUN:
+	case GRUB_UNICODE_COMB_ARABIC_SHADDA:
 	case GRUB_UNICODE_COMB_HEBREW_RAFE:
 	case GRUB_UNICODE_STACK_ABOVE:
 	  space = combining_glyphs[i]->offset_y
@@ -1276,12 +1283,15 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	case GRUB_UNICODE_COMB_HEBREW_PATAH:
 	case GRUB_UNICODE_COMB_HEBREW_QUBUTS:
 	case GRUB_UNICODE_COMB_HEBREW_METEG:
+	  /* TODO: Put kasra and kasratan under shadda.  */
+	case GRUB_UNICODE_COMB_ARABIC_KASRA:
+	case GRUB_UNICODE_COMB_ARABIC_KASRATAN:
 	  /* I don't know how ypogegrammeni differs from subscript. */
 	case GRUB_UNICODE_COMB_YPOGEGRAMMENI:
 	case GRUB_UNICODE_STACK_BELOW:
 	  space = -(combining_glyphs[i]->offset_y 
 		    + combining_glyphs[i]->height);
-	  if (space < 0)
+	  if (space <= 0)
 	    space = 1 + (grub_font_get_xheight (main_glyph->font)) / 8;
 	  
 	case GRUB_UNICODE_STACK_ATTACHED_BELOW:
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index a779e2c9c..19837d82e 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -106,6 +106,14 @@ enum grub_comb_type
     GRUB_UNICODE_COMB_HEBREW_SHIN_DOT = 24,
     GRUB_UNICODE_COMB_HEBREW_SIN_DOT = 25,
     GRUB_UNICODE_COMB_HEBREW_VARIKA = 26,
+    GRUB_UNICODE_COMB_ARABIC_FATHATAN = 27,
+    GRUB_UNICODE_COMB_ARABIC_DAMMATAN = 28,
+    GRUB_UNICODE_COMB_ARABIC_KASRATAN = 29,
+    GRUB_UNICODE_COMB_ARABIC_FATHAH = 30,
+    GRUB_UNICODE_COMB_ARABIC_DAMMAH = 31,
+    GRUB_UNICODE_COMB_ARABIC_KASRA = 32,
+    GRUB_UNICODE_COMB_ARABIC_SHADDA = 33,
+    GRUB_UNICODE_COMB_ARABIC_SUKUN = 34,
     GRUB_UNICODE_STACK_ATTACHED_BELOW = 202,
     GRUB_UNICODE_STACK_ATTACHED_ABOVE = 214,
     GRUB_UNICODE_COMB_ATTACHED_ABOVE_RIGHT = 216,
diff --git a/normal/charset.c b/normal/charset.c
index 6f09fac90..6c68884ae 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -28,9 +28,8 @@
   - Indic languages
   - non-Semitic shaping (rarely used)
   - Zl and Zp characters
-  - Combining characters of types 7, 8, 9, 21, 27, 28, 29, 30, 31,
-  32, 33, 34, 35, 36, 84, 91, 103, 107, 118, 122, 129, 130, 132,
-  218, 224, 226, 233, 234
+  - Combining characters of types 7, 8, 9, 21, 35, 36, 84, 91, 103, 107,
+  118, 122, 129, 130, 132, 218, 224, 226, 233, 234
   - Private use characters (not really a problem)
   - Variations (no font support)
   - Vertical text
@@ -40,7 +39,7 @@
   - Justification data
   - Glyph posititioning
   - Baseline data
-  TODO: Use form characters of Unicode as last resort Arabic shaping.
+  Most underline diacritics aren't displayed in gfxterm
  */
 
 /* Convert a (possibly null-terminated) UTF-8 string of at most SRCSIZE
@@ -550,6 +549,22 @@ grub_unicode_estimate_width (const struct grub_unicode_glyph *c)
 
 #endif
 
+static inline int
+is_type_after (enum grub_comb_type a, enum grub_comb_type b)
+{
+  /* Shadda is numerically higher than most of Arabic diacritics but has
+     to be rendered before them.  */
+  if (a == GRUB_UNICODE_COMB_ARABIC_SHADDA 
+      && b <= GRUB_UNICODE_COMB_ARABIC_KASRA
+      && b >= GRUB_UNICODE_COMB_ARABIC_FATHATAN)
+    return 0;
+  if (b == GRUB_UNICODE_COMB_ARABIC_SHADDA 
+      && a <= GRUB_UNICODE_COMB_ARABIC_KASRA
+      && a >= GRUB_UNICODE_COMB_ARABIC_FATHATAN)
+    return 1;
+  return a > b;
+}
+
 grub_size_t
 grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen,
 			      struct grub_unicode_glyph *out)
@@ -605,7 +620,7 @@ grub_unicode_aglomerate_comb (const grub_uint32_t *in, grub_size_t inlen,
 	  out->combining = n;
 
 	  for (j = last_comb_pointer; j < out->ncomb; j++)
-	    if (out->combining[j].type > comb_type)
+	    if (is_type_after (out->combining[j].type, comb_type))
 	      break;
 	  grub_memmove (out->combining + j + 1,
 			out->combining + j,

From e2588ccbfee10bcc53882baffd97ba11e4308fc0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 29 Mar 2010 13:01:08 +0200
Subject: [PATCH 0707/1628] Alif and alaph superscripts

---
 font/font.c            | 4 +++-
 include/grub/unicode.h | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/font/font.c b/font/font.c
index 3aa415cdc..da3f0cc74 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1248,11 +1248,13 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	    min_devwidth = combining_glyphs[i]->width;
 	  break;
 
-	  /* TODO: Put dammah and fathah nearer to shadda.  */
+	  /* TODO: Put dammah, fathah and alif nearer to shadda.  */
+	case GRUB_UNICODE_COMB_SYRIAC_SUPERSCRIPT_ALAPH:
 	case GRUB_UNICODE_COMB_ARABIC_DAMMAH:
 	case GRUB_UNICODE_COMB_ARABIC_DAMMATAN:
 	case GRUB_UNICODE_COMB_ARABIC_FATHATAN:
 	case GRUB_UNICODE_COMB_ARABIC_FATHAH:
+	case GRUB_UNICODE_COMB_ARABIC_SUPERSCRIPT_ALIF:
 	case GRUB_UNICODE_COMB_ARABIC_SUKUN:
 	case GRUB_UNICODE_COMB_ARABIC_SHADDA:
 	case GRUB_UNICODE_COMB_HEBREW_RAFE:
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 19837d82e..f5da907aa 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -114,6 +114,8 @@ enum grub_comb_type
     GRUB_UNICODE_COMB_ARABIC_KASRA = 32,
     GRUB_UNICODE_COMB_ARABIC_SHADDA = 33,
     GRUB_UNICODE_COMB_ARABIC_SUKUN = 34,
+    GRUB_UNICODE_COMB_ARABIC_SUPERSCRIPT_ALIF = 35,
+    GRUB_UNICODE_COMB_SYRIAC_SUPERSCRIPT_ALAPH = 36,
     GRUB_UNICODE_STACK_ATTACHED_BELOW = 202,
     GRUB_UNICODE_STACK_ATTACHED_ABOVE = 214,
     GRUB_UNICODE_COMB_ATTACHED_ABOVE_RIGHT = 216,

From 0546172e3e690d508a90662645a1c4ad7b826e04 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 29 Mar 2010 13:31:03 +0200
Subject: [PATCH 0708/1628] Basic thaana support

---
 font/font.c            | 20 ++++++++++++++++++++
 include/grub/unicode.h | 21 ++++++++++++++++-----
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/font/font.c b/font/font.c
index da3f0cc74..2eeadbbda 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1259,6 +1259,7 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	case GRUB_UNICODE_COMB_ARABIC_SHADDA:
 	case GRUB_UNICODE_COMB_HEBREW_RAFE:
 	case GRUB_UNICODE_STACK_ABOVE:
+	stacked_above:
 	  space = combining_glyphs[i]->offset_y
 	    - grub_font_get_xheight (combining_glyphs[i]->font) - 1;
 	  if (space <= 0)
@@ -1291,6 +1292,7 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	  /* I don't know how ypogegrammeni differs from subscript. */
 	case GRUB_UNICODE_COMB_YPOGEGRAMMENI:
 	case GRUB_UNICODE_STACK_BELOW:
+	stacked_below:
 	  space = -(combining_glyphs[i]->offset_y 
 		    + combining_glyphs[i]->height);
 	  if (space <= 0)
@@ -1303,6 +1305,24 @@ blit_comb (const struct grub_unicode_glyph *glyph_id,
 	    min_devwidth = combining_glyphs[i]->width;
 	  break;
 
+	case GRUB_UNICODE_COMB_MN:
+	  switch (glyph_id->combining[i].code)
+	    {
+	    case GRUB_UNICODE_THAANA_ABAFILI:
+	    case GRUB_UNICODE_THAANA_AABAAFILI:
+	    case GRUB_UNICODE_THAANA_UBUFILI:
+	    case GRUB_UNICODE_THAANA_OOBOOFILI:
+	    case GRUB_UNICODE_THAANA_EBEFILI:
+	    case GRUB_UNICODE_THAANA_EYBEYFILI:
+	    case GRUB_UNICODE_THAANA_OBOFILI:
+	    case GRUB_UNICODE_THAANA_OABOAFILI:
+	    case GRUB_UNICODE_THAANA_SUKUN:
+	      goto stacked_above;
+	    case GRUB_UNICODE_THAANA_IBIFILI:
+	    case GRUB_UNICODE_THAANA_EEBEEFILI:
+	      goto stacked_below;	      
+	    }
+	  /* Fall through.  */
 	default:
 	  {
 	    /* Default handling. Just draw combining character on top
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index f5da907aa..2e08fb0d1 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -170,11 +170,22 @@ struct grub_unicode_glyph
 #define GRUB_UNICODE_VARIATION_SELECTOR_16 0xfe0f
 #define GRUB_UNICODE_VARIATION_SELECTOR_17 0xe0100
 #define GRUB_UNICODE_VARIATION_SELECTOR_256 0xe01ef
-#define GRUB_UNICODE_HEBREW_WAW  0x05d5
-#define GRUB_UNICODE_ZWNJ        0x200c
-#define GRUB_UNICODE_ZWJ         0x200d
-#define GRUB_UNICODE_ARABIC_START 0x600
-#define GRUB_UNICODE_ARABIC_END   0x700
+#define GRUB_UNICODE_HEBREW_WAW        0x05d5
+#define GRUB_UNICODE_ZWNJ              0x200c
+#define GRUB_UNICODE_ZWJ               0x200d
+#define GRUB_UNICODE_ARABIC_START      0x0600
+#define GRUB_UNICODE_ARABIC_END        0x0700
+#define GRUB_UNICODE_THAANA_ABAFILI    0x07a6
+#define GRUB_UNICODE_THAANA_AABAAFILI  0x07a7
+#define GRUB_UNICODE_THAANA_IBIFILI    0x07a8
+#define GRUB_UNICODE_THAANA_EEBEEFILI  0x07a9
+#define GRUB_UNICODE_THAANA_UBUFILI    0x07aa
+#define GRUB_UNICODE_THAANA_OOBOOFILI  0x07ab
+#define GRUB_UNICODE_THAANA_EBEFILI    0x07ac
+#define GRUB_UNICODE_THAANA_EYBEYFILI  0x07ad
+#define GRUB_UNICODE_THAANA_OBOFILI    0x07ae
+#define GRUB_UNICODE_THAANA_OABOAFILI  0x07af
+#define GRUB_UNICODE_THAANA_SUKUN      0x07b0
 
 extern struct grub_unicode_compact_range grub_unicode_compact[];
 extern struct grub_unicode_bidi_pair grub_unicode_bidi_pairs[];

From 483c5e7d47c260c268853128e4a077211d2e8358 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 29 Mar 2010 13:36:08 +0200
Subject: [PATCH 0709/1628] Transform remarkable unicode codepoints into enum

---
 include/grub/unicode.h | 45 ++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 2e08fb0d1..39e4c52cc 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -165,27 +165,30 @@ struct grub_unicode_glyph
    | GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED_EXPLICIT \
    | GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED_EXPLICIT)
 
-#define GRUB_UNICODE_COMBINING_GRAPHEME_JOINER 0x34f
-#define GRUB_UNICODE_VARIATION_SELECTOR_1 0xfe00
-#define GRUB_UNICODE_VARIATION_SELECTOR_16 0xfe0f
-#define GRUB_UNICODE_VARIATION_SELECTOR_17 0xe0100
-#define GRUB_UNICODE_VARIATION_SELECTOR_256 0xe01ef
-#define GRUB_UNICODE_HEBREW_WAW        0x05d5
-#define GRUB_UNICODE_ZWNJ              0x200c
-#define GRUB_UNICODE_ZWJ               0x200d
-#define GRUB_UNICODE_ARABIC_START      0x0600
-#define GRUB_UNICODE_ARABIC_END        0x0700
-#define GRUB_UNICODE_THAANA_ABAFILI    0x07a6
-#define GRUB_UNICODE_THAANA_AABAAFILI  0x07a7
-#define GRUB_UNICODE_THAANA_IBIFILI    0x07a8
-#define GRUB_UNICODE_THAANA_EEBEEFILI  0x07a9
-#define GRUB_UNICODE_THAANA_UBUFILI    0x07aa
-#define GRUB_UNICODE_THAANA_OOBOOFILI  0x07ab
-#define GRUB_UNICODE_THAANA_EBEFILI    0x07ac
-#define GRUB_UNICODE_THAANA_EYBEYFILI  0x07ad
-#define GRUB_UNICODE_THAANA_OBOFILI    0x07ae
-#define GRUB_UNICODE_THAANA_OABOAFILI  0x07af
-#define GRUB_UNICODE_THAANA_SUKUN      0x07b0
+enum
+  {
+    GRUB_UNICODE_COMBINING_GRAPHEME_JOINER = 0x034f,
+    GRUB_UNICODE_HEBREW_WAW                = 0x05d5,
+    GRUB_UNICODE_ARABIC_START              = 0x0600,
+    GRUB_UNICODE_ARABIC_END                = 0x0700,
+    GRUB_UNICODE_THAANA_ABAFILI            = 0x07a6,
+    GRUB_UNICODE_THAANA_AABAAFILI          = 0x07a7,
+    GRUB_UNICODE_THAANA_IBIFILI            = 0x07a8,
+    GRUB_UNICODE_THAANA_EEBEEFILI          = 0x07a9,
+    GRUB_UNICODE_THAANA_UBUFILI            = 0x07aa,
+    GRUB_UNICODE_THAANA_OOBOOFILI          = 0x07ab,
+    GRUB_UNICODE_THAANA_EBEFILI            = 0x07ac,
+    GRUB_UNICODE_THAANA_EYBEYFILI          = 0x07ad,
+    GRUB_UNICODE_THAANA_OBOFILI            = 0x07ae,
+    GRUB_UNICODE_THAANA_OABOAFILI          = 0x07af,
+    GRUB_UNICODE_THAANA_SUKUN              = 0x07b0,
+    GRUB_UNICODE_ZWNJ                      = 0x200c,
+    GRUB_UNICODE_ZWJ                       = 0x200d,
+    GRUB_UNICODE_VARIATION_SELECTOR_1      = 0xfe00,
+    GRUB_UNICODE_VARIATION_SELECTOR_16     = 0xfe0f,
+    GRUB_UNICODE_VARIATION_SELECTOR_17     = 0xe0100,
+    GRUB_UNICODE_VARIATION_SELECTOR_256    = 0xe01ef
+  };
 
 extern struct grub_unicode_compact_range grub_unicode_compact[];
 extern struct grub_unicode_bidi_pair grub_unicode_bidi_pairs[];

From af09641e2b01a63316695653bea80902033e37dd Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 30 Mar 2010 11:18:29 +0200
Subject: [PATCH 0710/1628] * loader/i386/multiboot_mbi2.c
 (retrieve_video_parameters): Fix compilation on coreboot and qemu

---
 ChangeLog                    |  5 +++++
 loader/i386/multiboot_mbi2.c | 26 ++++++++++++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aba023c7b..5367493a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/i386/multiboot_mbi2.c (retrieve_video_parameters): Fix
+	compilation on coreboot and qemu
+
 2010-03-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/multiboot2.h: Resync with spec.
diff --git a/loader/i386/multiboot_mbi2.c b/loader/i386/multiboot_mbi2.c
index 436cd0901..1910d656e 100644
--- a/loader/i386/multiboot_mbi2.c
+++ b/loader/i386/multiboot_mbi2.c
@@ -34,13 +34,9 @@
 
 #if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
 #include <grub/i386/pc/vbe.h>
-#define DEFAULT_VIDEO_MODE "text"
 #define HAS_VGA_TEXT 1
-#define HAS_VBE 1
 #else
-#define DEFAULT_VIDEO_MODE "auto"
 #define HAS_VGA_TEXT 0
-#define HAS_VBE 0
 #endif
 
 struct module
@@ -343,14 +339,20 @@ retrieve_video_parameters (grub_uint8_t **ptrorig)
   if (driv_id == GRUB_VIDEO_DRIVER_NONE)
     {
       struct grub_vbe_mode_info_block vbe_mode_info;
-      grub_vbe_status_t status;
       grub_uint32_t vbe_mode;
-      void *scratch = (void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
 
-      status = grub_vbe_bios_get_mode (scratch);
-      vbe_mode = *(grub_uint32_t *) scratch;
-      if (status != GRUB_VBE_STATUS_OK)
-	return GRUB_ERR_NONE;
+#if defined (GRUB_MACHINE_PCBIOS)
+      {
+	grub_vbe_status_t status;
+	void *scratch = (void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
+	status = grub_vbe_bios_get_mode (scratch);
+	vbe_mode = *(grub_uint32_t *) scratch;
+	if (status != GRUB_VBE_STATUS_OK)
+	  return GRUB_ERR_NONE;
+      }
+#else
+      vbe_mode = 3;
+#endif
 
       /* get_mode_info isn't available for mode 3.  */
       if (vbe_mode == 3)
@@ -361,14 +363,18 @@ retrieve_video_parameters (grub_uint8_t **ptrorig)
 	  vbe_mode_info.x_resolution = 80;
 	  vbe_mode_info.y_resolution = 25;
 	}
+#if defined (GRUB_MACHINE_PCBIOS)
       else
 	{
+	  grub_vbe_status_t status;
+	  void *scratch = (void *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
 	  status = grub_vbe_bios_get_mode_info (vbe_mode, scratch);
 	  if (status != GRUB_VBE_STATUS_OK)
 	    return GRUB_ERR_NONE;
 	  grub_memcpy (&vbe_mode_info, scratch,
 		       sizeof (struct grub_vbe_mode_info_block));
 	}
+#endif
 
       if (vbe_mode_info.memory_model == GRUB_VBE_MEMORY_MODEL_TEXT)
 	{

From c2062d5f3a568965177e03cac88b0e855320f4c5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 30 Mar 2010 14:09:24 +0200
Subject: [PATCH 0711/1628] Remove useless change in grub-emu.c

---
 util/grub-emu.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/util/grub-emu.c b/util/grub-emu.c
index debf53b1d..7d4544509 100644
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -63,11 +63,6 @@ grub_arch_dl_check_header (void *ehdr)
   return GRUB_ERR_BAD_MODULE;
 }
 
-void grub_hostfs_init (void);
-void grub_hostfs_fini (void);
-void grub_host_init (void);
-void grub_host_fini (void);
-
 grub_err_t
 grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 {
@@ -80,14 +75,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
 void
 grub_reboot (void)
 {
-  grub_fini_all ();
-  grub_hostfs_fini ();
-  grub_host_fini ();
-
-  grub_machine_fini ();
-
-  exit (0);
-  //  longjmp (main_env, 1);
+  longjmp (main_env, 1);
 }
 
 void
@@ -158,6 +146,11 @@ usage (int status)
 }
 
 
+void grub_hostfs_init (void);
+void grub_hostfs_fini (void);
+void grub_host_init (void);
+void grub_host_fini (void);
+
 int
 main (int argc, char *argv[])
 {

From b07c314e45d85220759a791d74917fefb08440c9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 30 Mar 2010 14:21:48 +0200
Subject: [PATCH 0712/1628] Add lost unicode LICENSE

---
 unicode/COPYING | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 unicode/COPYING

diff --git a/unicode/COPYING b/unicode/COPYING
new file mode 100644
index 000000000..f81c87a27
--- /dev/null
+++ b/unicode/COPYING
@@ -0,0 +1,9 @@
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2009 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.

From 17be44164beda6dd1b1a57b0869e5faf349a3dcc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 30 Mar 2010 14:22:07 +0200
Subject: [PATCH 0713/1628] ADd ChangeLog

---
 ChangeLog.bidi | 223 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 223 insertions(+)
 create mode 100644 ChangeLog.bidi

diff --git a/ChangeLog.bidi b/ChangeLog.bidi
new file mode 100644
index 000000000..972e6e356
--- /dev/null
+++ b/ChangeLog.bidi
@@ -0,0 +1,223 @@
+2010-03-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Bidi and diacritics support.
+
+	* Makefile.in (widthspec.bin): New target.
+	(widthspec.h): Likewise.
+	(TARGET_CFLAGS): Add -DHAVE_UNIFONT_WIDTHSPEC=1 if font was available.
+	* autogen.sh: Generate unidata.c.
+	* commands/cat.c (grub_cmd_cat): Don't use grub_putchar.
+	* commands/handler.c (grub_cmd_handler): Likewise.
+	* commands/ls.c (grub_ls_list_devices): Likewise.
+	(grub_ls_list_files): Likewise.
+	* commands/minicmd.c (grub_mini_cmd_cat): Likewise.
+	(grub_mini_cmd_lsmod): Likewise.
+	* commands/read.c: Likewise.
+	* kern/corecmd.c (grub_core_cmd_ls): Likewise.
+	* kern/rescue_reader.c (grub_rescue_read_line): Likewise.
+	* lib/arg.c (grub_arg_show_help): Likewise.
+	* lib/crypto.c (grub_password_get): Likewise.
+	* normal/auth.c (grub_username_get): Likewise.
+	* normal/misc.c (grub_normal_print_device_info): Likewise.
+	* commands/help.c (grub_cmd_help): Use grub_unicode_aglomerate_comb.
+	* conf/common.rmk (grub_mkfont_SOURCES): Add unidata.c.
+	(gfxmenu_mod_SOURCES): Add gfxmenu/font.c.
+	(normal/charset.c_DEPENDENCIES): New variable.
+	(normal_mod_SOURCES): Add normal/charset.c and unidata.c.
+	(pkglib_MODULES): Remove charset.mod.
+	(charset_mod_SOURCES): Removed.
+	(charset_mod_CFLAGS): Likewise.
+	(charset_mod_LDFLAGS): Likewise.
+	* font/font.c (ascii_glyph_lookup): Return NULL on failure.
+	Fill ->font. Reverse ascii bitmaps.
+	(grub_font_get_xheight): New function.
+	* font/font.c (grub_font_get_string_width): Moved from here ...
+	* gfxmenu/font.c (grub_font_get_string_width): ... here.
+	* font/font.c (grub_font_draw_string): Moved from here ...
+	* gfxmenu/font.c (grub_font_draw_string): ... here.
+	* font/font.c (grub_font_dup_glyph): New function.
+	(grub_font_blit_glyph): Likewise.
+	(grub_font_blit_glyph_mirror): Likewise.
+	(blit_comb): Likewise.
+	(grub_font_construct_dry_run): Likewise.
+	(grub_font_get_constructed_device_width): Likewise.
+	(grub_font_construct_glyph): Likewise.
+	* include/grub/charset.h (grub_ucs4_to_utf8): New proto.
+	* include/grub/misc.h (grub_utf8_to_ucs4): Moved from here ...
+	* include/grub/charset.h (grub_utf8_to_ucs4): ... here.
+	* include/grub/font.h (GRUB_FONT_CODE_CHAR_MASK): New constant.
+	(GRUB_FONT_CODE_RIGHT_JOINED): Likewise.
+	(GRUB_FONT_CODE_LEFT_JOINED): Likewise.
+	(grub_font_get_xheight): New proto.
+	(grub_font_get_constructed_device_width): Likewise.
+	(grub_font_construct_glyph): Likewise.
+	* include/grub/font.h (grub_font_get_string_width): Moved from here ...
+	* include/grub/gfxmenu_view.h (grub_font_get_string_width): ... here.
+	* include/grub/font.h (grub_font_draw_string): Moved from here ...
+	* include/grub/gfxmenu_view.h (grub_font_draw_string): ... here.
+	* include/grub/i386/vga_common.h (grub_console_putchar): Moved from here..
+	* include/grub/i386/pc/console.h (grub_console_putchar): ... here.
+	* include/grub/i386/vga_common.h (grub_console_real_putchar): Removed.
+	(grub_console_getcharwidth): Likewise.
+	* include/grub/misc.h (grub_xputs): New proto.
+	(grub_puts): Inlined.
+	* include/grub/normal.h (grub_print_ucs4): Add margin specification.
+	(grub_normal_get_line_counter): Removed.
+	(grub_install_newline_hook): Likewise.
+	(grub_normal_get_char_counter): New proto.
+	(grub_normal_reset_more): Likewise.
+	(grub_xputs_normal): Likewise.
+	* include/grub/term.h (GRUB_TERM_CODE_TYPE_MASK): New definition.
+	(GRUB_TERM_CODE_TYPE_ASCII): Likewise.
+	(GRUB_TERM_CODE_TYPE_VGA): Likewise.
+	(GRUB_TERM_CODE_TYPE_UTF8_LOGICAL): Likewise.
+	(GRUB_TERM_CODE_TYPE_UTF8_VISUAL): Likewise.
+	(GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS): Likewise.
+	(grub_term_output): Pass grub_unicode_glyph to putchar and getcharwidth.
+	All users updated.
+	(grub_putchar): Removed.
+	(grub_putcode): Remove EXPORT_FUNC since it's not in kernel anymore.
+	(grub_unicode_estimate_width): New function.
+	(grub_term_getcharwidth): Add defaults.
+	* include/grub/unicode.h: New file.
+	* include/grub/video.h (grub_video_signed_rect): New type.
+	* kern/i386/pc/startup.S (grub_console_real_putchar): Renamed to ...
+	(grub_console_putchar): ... this.
+	(grub_console_putchar): Handle argument difference.
+	* kern/misc.c (grub_puts): Removed.
+	(grub_vprintf): Store UTF-8 string instead of outputting it directly.
+	(grub_vsnprintf_real): Remove str = NULL support.
+	* kern/misc.c (grub_utf8_to_ucs4): Move from here ...
+	* normal/charset.c (grub_utf8_to_ucs4): ... here.
+	* kern/term.c (grub_putcode): Renamed to ...
+	(grub_putcode_dumb): ... this. Pass grub_unicode_glyph instead of code.
+	(grub_putchar): Removed.
+	(grub_xputs_dumb): New function.
+	(grub_xputs): New variable.
+	(grub_cls): Use grub_putcode_dumb.
+	* lib/charset.c: Move from here ...
+	* normal/charset.c: ... to here.
+	(grub_ucs4_to_utf8): New function.
+	(grub_ucs4_to_utf8_alloc): Use grub_ucs4_to_utf8.
+	(join_types): New variable.
+	(unpack_join): New function.
+	(bidi_types): New variable.
+	(unpack_bidi): New function.
+	(get_bidi_type): Likewise.
+	(get_join_type): Likewise.
+	(is_mirrored): Likewise.
+	(grub_unicode_get_comb_type): Likewise.
+	(grub_unicode_estimate_width) [HAVE_UNIFONT_WIDTHSPEC]: Likewise.
+	(is_type_after): Likewise.
+	(grub_unicode_aglomerate_comb): Likewise.
+	(bidi_line_wrap): Likewise.
+	(grub_bidi_line_logical_to_visual): Likewise.
+	(grub_bidi_logical_to_visual): Likewise.
+	(grub_unicode_mirror_code): Likewise.
+	(grub_unicode_shape_code): Likewise.
+	* normal/cmdline.c (grub_cmdline_get): Reset more counter.
+	Don't use grub_putchar.
+	* normal/main.c (grub_normal_init_page): Use grub_putcode.
+	(grub_normal_reader_init): Likewise.
+	(grub_xputs_saved): New variable.
+	(GRUB_MOD_INIT): Set grub_xputs.
+	(GRUB_MOD_FINI): Restore grub_xputs.
+	* normal/menu.c (grub_wait_after_message): Don't use grub_putchar.
+	(menu_init): Avoid printing gfxmenu error.
+	(show_menu): Use grub_normal_get_char_counter.
+	* normal/menu_entry.c (update_screen): Fix out-of-array.
+	(complete): Avoid NULL dereferencing.
+	* grub_menu_entry_run (grub_menu_entry_run): Don't use putchar.
+	* normal/menu_text.c (print_spaces): Removed.
+	(grub_print_ucs4): Likewise.
+	(grub_print_message_indented): Use grub_print_ucs4.
+	(print_message): Use grub_putcode.
+	(print_entry): Hanlde diacritics.
+	* normal/term.c (term_state): New type.
+	(grub_more_lines): Removed.
+	(term_states): New variable.
+	(grub_normal_line_counter): Renamed to ..
+	(grub_normal_char_counter): ...this. All users updated.
+	(grub_normal_get_line_counter): Renamed to ...
+	(grub_normal_get_char_counter): ... this.
+	(grub_normal_reset_more): New function.
+	(process_newline): Removed.
+	(print_more): New function.
+	(grub_install_newline_hook): Removed.
+	(map_code): New function.
+	(grub_puts_terminal): Use grub_print_ucs4.
+	(putglyph): New function.
+	(putcode_real): Likewise.
+	(grub_putcode): Use putcode_real.
+	(get_maxwidth): New function.
+	(get_startwidth): Likewise.
+	(print_ucs4_terminal): Likewise.
+	(find_term_state): Likewise.
+	(put_glyphs_terminal): Likewise.
+	(print_backlog): Likewise.
+	(print_ucs4_real): Likewise.
+	(grub_print_ucs4): Likewise.
+	(grub_xputs_normal): Likewise.
+	* term/efi/console.c (grub_console_putchar): Output diacritics.
+	(grub_console_getcharwidth): Removed.
+	(grub_console_term_output): Declare as GRUB_TERM_CODE_TYPE_UCS4_VISUAL.
+	* term/gfxterm.c (clear_char): Free chars.
+	(scroll_up): Avoid leaking memory.
+	(grub_gfxterm_putchar): Support diacritics.
+	(grub_video_term): Declare as GRUB_TERM_CODE_TYPE_UCS4_VISUAL.
+	* term/i386/pc/console.c (grub_console_term_output): Declare as
+	GRUB_TERM_CODE_TYPE_VGA.
+	* term/i386/pc/vga.c (grub_vga_term): Declare as
+	GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS.
+	* term/i386/pc/vga_text.c (grub_vga_text_term): Declare as
+	GRUB_TERM_CODE_TYPE_VGA.
+	* term/i386/vga_common.c (map_char): Removed.
+	(grub_console_putchar): Likewise.
+	(grub_console_getcharwidth): Likewise.
+	* term/ieee1275/ofconsole.c (grub_ofconsole_putchar): Remove mapping.
+	(grub_ofconsole_term_output): Declare as GRUB_TERM_CODE_TYPE_ASCII.
+	* term/serial.c (options): New options ascii, utf8 and visual-utf8.
+	(grub_serial_putchar): Remove mapping. Use estimated_width.
+	(grub_cmd_serial): Handle charset arguments.
+	* term/terminfo.c (putstr): Use putchar directly.
+	* unicode/ArabicShaping.txt: New file (imported from Unicode).
+	* unicode/BidiMirroring.txt: Likewise.
+	* unicode/UnicodeData.txt: Likewise.
+	* unicode/COPYING: Likewise.
+	* util/console.c (grub_ncurses_putchar): Remove mapping.
+	(grub_ncurses_getcharwidth): Removed.
+	(grub_ncurses_term_output): Declare as GRUB_TERM_CODE_TYPE_ASCII.
+	* util/grub-editenv.c (grub_putchar): Removed.
+	(grub_xputs_real): New function.
+	(grub_xputs): New variable.
+	* util/grub-fstest.c (grub_putchar): Removed.
+	(grub_xputs_real): New function.
+	(grub_xputs): New variable.
+	* util/grub-probe.c (grub_putchar): Removed.
+	(grub_xputs_real): New function.
+	(grub_xputs): New variable.
+	* util/grub-script-check.c (grub_putchar): Removed.
+	(grub_xputs_real): New function.
+	(grub_xputs): New variable.
+	* util/i386/pc/grub-setup.c (grub_putchar): Removed.
+	(grub_xputs_real): New function.
+	(grub_xputs): New variable.
+	* util/import_unicode.py: New file.
+	* util/grub-mkfont.c (ft_errmsgs): New array.
+	(grub_glyph_info): Make bitmap a pointer.
+	(file_formats): New type WIDTH_SPEC.
+	(grub_font_info): New members glyphs_unsorted, glyphs_sorted, num_glyphs.
+	(options): Add width-spec.
+	(help): Likewise.
+	(add_char): Renamed to ...
+	(add_glyph): ... this.
+	(add_glyph): Use index. Show freetype errors. Cut blank space at borders.
+	(glyph_replace): New type.
+	(subst_rightjoin), (subst_leftjoin), (subst_medijoin): New variables.
+	(add_char): New function.
+	(add_subst): Likewise.
+	(process_cursive): Likewise.
+	(add_font): Handle GSUB.
+	(write_font_width_spec): New function.
+	(main): Sort glyphs.
+

From f9fd65df54d5f114a0f33ac30f49c6b2226ded30 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 31 Mar 2010 22:01:37 +0200
Subject: [PATCH 0714/1628] 	* kern/ieee1275/openfw.c
 (grub_children_iterate): Skip device itself if 	returned by firmware.

---
 ChangeLog              | 5 +++++
 kern/ieee1275/openfw.c | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5367493a2..d05dd5a7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/ieee1275/openfw.c (grub_children_iterate): Skip device itself if
+	returned by firmware.
+
 2010-03-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/i386/multiboot_mbi2.c (retrieve_video_parameters): Fix
diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index ae1eb5522..cf9e1a870 100644
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -73,10 +73,16 @@ grub_children_iterate (char *devpath,
 				      IEEE1275_MAX_PROP_LEN, &actual))
 	childtype[0] = 0;
 
+      if (dev == child)
+	continue;
+
       if (grub_ieee1275_package_to_path (child, childpath,
 					 IEEE1275_MAX_PATH_LEN, &actual))
 	continue;
 
+      if (grub_strcmp (devpath, childpath) == 0)
+	continue;
+
       if (grub_ieee1275_get_property (child, "name", childname,
 				      IEEE1275_MAX_PROP_LEN, &actual))
 	continue;

From 495442ed025eb218077a5d86777894ffefe46c48 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 31 Mar 2010 22:03:48 +0200
Subject: [PATCH 0715/1628] 	* kern/device.c (grub_device_iterate): Clear
 errors after failed 	opening device.

---
 ChangeLog     | 5 +++++
 kern/device.c | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d05dd5a7d..d35e1ca22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/device.c (grub_device_iterate): Clear errors after failed
+	opening device.
+
 2010-03-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/ieee1275/openfw.c (grub_children_iterate): Skip device itself if
diff --git a/kern/device.c b/kern/device.c
index cd019fdaf..4273fedfe 100644
--- a/kern/device.c
+++ b/kern/device.c
@@ -98,7 +98,10 @@ grub_device_iterate (int (*hook) (const char *name))
 
       dev = grub_device_open (disk_name);
       if (! dev)
-	return 0;
+	{
+	  grub_errno = GRUB_ERR_NONE;
+	  return 0;
+	}
 
       if (dev->disk && dev->disk->has_partitions)
 	{

From accbdc88a5fa0917d0c061913e76f729903cd216 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Apr 2010 18:43:52 +0200
Subject: [PATCH 0716/1628] Use scanline for relocator to allow multiple memory
 sources

---
 lib/relocator.c | 832 ++++++++++++++++++++++++++++++------------------
 1 file changed, 524 insertions(+), 308 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index 298c13d06..38aa67502 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -22,7 +22,6 @@
 #include <grub/misc.h>
 #include <grub/cache.h>
 
-/* TODO: use more efficient data structures if necessary.  */
 /* FIXME: check memory map.  */ 
 /* FIXME: try to request memory from firmware.  */
 
@@ -35,14 +34,22 @@ struct grub_relocator
   grub_size_t relocators_size;
 };
 
+struct grub_relocator_subchunk
+{
+  enum {CHUNK_TYPE_IN_REGION, CHUNK_TYPE_REGION_START} type;
+  grub_addr_t host_start;
+  grub_addr_t start;
+  grub_size_t size;
+};
+
 struct grub_relocator_chunk
 {
   struct grub_relocator_chunk *next;
   grub_addr_t src;
   grub_addr_t target;
   grub_size_t size;
-  enum {CHUNK_TYPE_IN_REGION, CHUNK_TYPE_REGION_START} type;
-  grub_addr_t host_start;
+  struct grub_relocator_subchunk *subchunks;
+  unsigned nsubchunks;
 };
 
 struct grub_relocator *
@@ -63,143 +70,148 @@ grub_relocator_new (void)
   return ret;
 }
 
-static grub_mm_header_t
-get_best_header (struct grub_relocator *rel,
-		 grub_addr_t start, grub_addr_t end, grub_addr_t align,
-		 grub_size_t size,
-		 grub_mm_region_t rb, grub_mm_header_t *prev,
-		 grub_addr_t *best_addr, int from_low_priv, int collisioncheck)
+struct event
 {
-  grub_mm_header_t h, hp;
-  grub_mm_header_t hb = NULL, hbp = NULL;
-
-  auto void try_addr (grub_addr_t allowable_start, grub_addr_t allowable_end);
-  void try_addr (grub_addr_t allowable_start, grub_addr_t allowable_end)
+  enum {
+    IN_REG_START = 0, 
+    IN_REG_END = 1, 
+    REG_BEG_START = 2, 
+    REG_BEG_END = REG_BEG_START | 1,
+    COLLISION_START = 4, 
+    COLLISION_END = COLLISION_START | 1
+  } type;
+  grub_addr_t pos;
+  union
   {
-    if (from_low_priv)
-      {
-	grub_addr_t addr;
-
-	addr = ALIGN_UP (allowable_start, align);
-
-	if (addr < start)
-	  addr = ALIGN_UP (start, align);
-
-	if (collisioncheck)
-	  while (1)
-	    {
-	      struct grub_relocator_chunk *chunk;
-	      for (chunk = rel->chunks; chunk; chunk = chunk->next)
-		if ((chunk->target <= addr
-		     && addr < chunk->target + chunk->size)
-		    || (chunk->target < addr + size
-			&& addr + size < chunk->target + chunk->size)
-		    || (addr <= chunk->target && chunk->target < addr + size)
-		    || (addr < chunk->target + chunk->size
-			&& chunk->target + chunk->size < addr + size))
-		  {
-		    grub_dprintf ("relocator",
-				  "collision 0x%llx+0x%llx, 0x%llx+0x%llx\n",
-				  (unsigned long long) chunk->target,
-				  (unsigned long long) chunk->size,
-				  (unsigned long long) addr,
-				  (unsigned long long) size);
-		    addr = ALIGN_UP (chunk->target + chunk->size, align);
-		    break;
-		  }
-	      if (!chunk)
-		break;
-	    }
-
-	if (allowable_end <= addr + size)
-	  return;
-
-	if (addr > end)
-	  return;
-
-	if (hb == NULL || *best_addr > addr)
-	  {
-	    hb = h;
-	    hbp = hp;
-	    *best_addr = addr;
-	    grub_dprintf ("relocator", "picked %p/%lx\n", hb,
-			  (unsigned long) addr);
-	  }
-      }
-    else
-      {
-	grub_addr_t addr;
-
-	addr = ALIGN_DOWN (allowable_end - size, align);
-
-	if (addr > end)
-	  addr = ALIGN_DOWN (end, align);
-
-	if (collisioncheck)
-	  while (1)
-	    {
-	      struct grub_relocator_chunk *chunk;
-	      for (chunk = rel->chunks; chunk; chunk = chunk->next)
-		if ((chunk->target <= addr
-		     && addr < chunk->target + chunk->size)
-		    || (chunk->target < addr + size
-			&& addr + size < chunk->target + chunk->size)
-		    || (addr <= chunk->target && chunk->target < addr + size)
-		    || (addr < chunk->target + chunk->size
-			&& chunk->target + chunk->size < addr + size))
-		  {
-		    addr = ALIGN_DOWN (chunk->target - size, align);
-		    break;
-		  }
-	      if (!chunk)
-		break;
-	    }
-
-	if (allowable_start > addr)
-	  return;
-
-	if (addr < start)
-	  return;
-
-	if (hb == NULL || *best_addr < addr)
-	  {
-	    hb = h;
-	    hbp = hp;
-	    *best_addr = addr;
-	    grub_dprintf ("relocator", "picked %p/%lx\n", hb,
-			  (unsigned long) addr);
-	  }
-      }
-  }
-  
-  hp = rb->first;
-  h = hp->next;
-  grub_dprintf ("relocator", "alive\n");
-  do
+    struct
     {
-      grub_addr_t allowable_start, allowable_end;
-      allowable_start = (grub_addr_t) h;
-      allowable_end = (grub_addr_t) (h + h->size);
+      grub_mm_region_t reg;
+      grub_mm_header_t hancestor;
+      grub_mm_region_t *regancestor;
+      grub_mm_header_t head;
+    };
+  };
+};
 
-      if (h->magic != GRUB_MM_FREE_MAGIC)
-	grub_fatal ("free magic is broken at %p: 0x%x", h, h->magic);
+#define DIGITSORT_BITS 8
+#define DIGITSORT_MASK ((1 << DIGITSORT_BITS) - 1)
+#define BITS_IN_BYTE 8
 
-      try_addr (allowable_start, allowable_end);
+#define max(a, b) (((a) > (b)) ? (a) : (b))
+#define min(a, b) (((a) < (b)) ? (a) : (b))
 
-      if ((grub_addr_t) h == (grub_addr_t) (rb + 1))
-	{
-	  grub_dprintf ("relocator", "Trying region start 0x%llx\n",
-			(unsigned long long) (allowable_start 
-					      - sizeof (*rb) - rb->pre_size));
-	  try_addr (allowable_start - sizeof (*rb) - rb->pre_size,
-		    allowable_end - sizeof (*rb));
-	}
-      hp = h;
-      h = hp->next;
+static inline int
+is_start (int type)
+{
+  return !(type & 1) && (type != COLLISION_START);
+}
+
+static void
+allocate_regstart (grub_addr_t addr, grub_size_t size, grub_mm_region_t rb,
+		   grub_mm_region_t *regancestor, grub_mm_header_t hancestor)
+{
+  grub_addr_t newreg_start, newreg_raw_start = addr + size;
+  grub_addr_t newreg_size, newreg_presize;
+  grub_mm_header_t new_header;
+  grub_mm_header_t hb = (grub_mm_header_t) (rb + 1);
+  
+  grub_dprintf ("relocator", "ra = %p, rb = %p\n", regancestor, rb);
+
+  newreg_start = ALIGN_UP (newreg_raw_start, GRUB_MM_ALIGN);
+  newreg_presize = newreg_start - newreg_raw_start;
+  newreg_size = rb->size - (newreg_start - (grub_addr_t) rb);
+  if ((hb->size << GRUB_MM_ALIGN_LOG2) >= newreg_start
+      - (grub_addr_t) rb)
+    {
+      grub_mm_header_t newhnext = hb->next;
+      grub_size_t newhsize = ((hb->size << GRUB_MM_ALIGN_LOG2)
+			      - (newreg_start
+				 - (grub_addr_t) rb)) >> GRUB_MM_ALIGN_LOG2;
+      new_header = (void *) (newreg_start + sizeof (*rb));
+      if (newhnext == hb)
+	newhnext = new_header;
+      new_header->next = newhnext;
+      new_header->size = newhsize;
+      new_header->magic = GRUB_MM_FREE_MAGIC;
+    }
+  else
+    {
+      new_header = hb->next;
+      if (new_header == hb)
+	new_header = (void *) (newreg_start + sizeof (*rb));	    
+    }
+  {
+    struct grub_mm_header *newregfirst = rb->first;
+    struct grub_mm_region *newregnext = rb->next;
+    struct grub_mm_region *newreg = (void *) newreg_start;
+    hancestor->next = new_header;
+    if (newregfirst == hb)
+      newregfirst = new_header;
+    newreg->first = newregfirst;
+    newreg->next = newregnext;
+    newreg->pre_size = newreg_presize;
+    newreg->size = newreg_size;
+    *regancestor = newreg;
+    {
+      grub_mm_header_t h = newreg->first, hp = NULL;
+      do
+	{
+	  if ((void *) h < (void *) (newreg + 1))
+	    grub_fatal ("Failed to adjust memory region: %p, %p, %p, %p, %p",
+			newreg, newreg->first, h, hp, hb);
+	  if ((void *) h == (void *) (newreg + 1))
+	    grub_dprintf ("relocator",
+			  "Free start memory region: %p, %p, %p, %p, %p",
+			  newreg, newreg->first, h, hp, hb);
+
+	  hp = h;
+	  h = h->next;
+	}
+      while (h != newreg->first);
+    }
+  }
+
+}
+
+static void
+allocate_inreg (grub_addr_t addr, grub_size_t size,
+		grub_mm_header_t hb, grub_mm_header_t hbp,
+		grub_mm_region_t rb)
+{
+  struct grub_mm_header *foll = NULL;
+    
+  if (ALIGN_UP (addr + size, GRUB_MM_ALIGN) + GRUB_MM_ALIGN
+      <= (grub_addr_t) (hb + hb->size))
+    {
+      foll = (void *) ALIGN_UP (addr + size, GRUB_MM_ALIGN);
+      foll->magic = GRUB_MM_FREE_MAGIC;
+      foll->size = hb->size - (foll - hb);
+    }
+
+  if (addr - (grub_addr_t) hb >= sizeof (*hb))
+    {
+      hb->size = ((addr - (grub_addr_t) hb) >> GRUB_MM_ALIGN_LOG2);
+      if (foll)
+	{
+	  foll->next = hb;
+	  hbp->next = foll;
+	  if (rb->first == hb)
+	    rb->first = foll;
+	}
+    }
+  else
+    {
+      if (foll)
+	foll->next = hb->next;
+      else
+	foll = hb->next;
+	
+      hbp->next = foll;
+      if (rb->first == hb)
+	rb->first = foll;
+      if (rb->first == hb)
+	rb->first = (void *) (rb + 1);
     }
-  while (hp && hp != rb->first);
-  *prev = hbp;
-  return hb;
 }
 
 static int
@@ -208,159 +220,355 @@ malloc_in_range (struct grub_relocator *rel,
 		 grub_size_t size, struct grub_relocator_chunk *res,
 		 int from_low_priv, int collisioncheck)
 {
-  grub_mm_region_t rb, rbp;
-  grub_mm_header_t hb = NULL, hbp = NULL;
-  grub_addr_t best_addr;
+  grub_mm_region_t r, *ra, base_saved;
+  struct event *events = NULL, *eventt = NULL, *t;
+  unsigned maxevents = 2;
+  grub_mm_header_t p, pa;
+  unsigned *counter;
+  int nallocs = 0;
+  unsigned i, j, N = 0;
+  grub_addr_t target = 0;
 
- again:
+  grub_dprintf ("relocator",
+		"trying to allocate in %x-%x aligned %x size %x\n",
+		start, end, align, size);
 
-  rb = NULL, rbp = NULL;
-  
-  {
-    grub_mm_region_t r, rp;
-    for (rp = NULL, r = grub_mm_base; r; rp = r, r = r->next)
-      {
-	grub_dprintf ("relocator", "region %p. %d %d %d %d\n", r,
-		      (grub_addr_t) r + r->size + sizeof (*r) >= start,
-		      (grub_addr_t) r < end, r->size + sizeof (*r) >= size,
-		      (rb == NULL || (from_low_priv ? rb > r : rb < r)));
-	if ((grub_addr_t) r + r->size + sizeof (*r) >= start
-	    && (grub_addr_t) r < end && r->size + sizeof (*r) >= size
-	    && (rb == NULL || (from_low_priv ? rb > r : rb < r)))
-	  {
-	    rb = r;
-	    rbp = rp;
-	  }
-      }
-  }
+  start = ALIGN_UP (start, align);
+  end = ALIGN_DOWN (end - size, align) + size;
+  grub_dprintf ("relocator",
+		"trying to allocate in %x-%x aligned %x size %x\n",
+		start, end, align, size);
 
-  if (!rb)
+  if (end < start + size)
+    return 0;
+
+  /* We have to avoid any allocations when filling scanline events. 
+     Hence 2-stages.
+   */
+  for (r = grub_mm_base; r; r = r->next)
     {
-      grub_dprintf ("relocator", "no suitable region found\n");
+      p = r->first;
+      do
+	{
+	  maxevents += 2;
+	  p = p->next;
+	}
+      while (p != r->first);
+      maxevents += 2;
+    }
+  if (collisioncheck && rel)
+    {
+      struct grub_relocator_chunk *chunk;
+      for (chunk = rel->chunks; chunk; chunk = chunk->next)
+	maxevents += 2;
+    }
+
+  events = grub_malloc (maxevents * sizeof (events[0]));
+  eventt = grub_malloc (maxevents * sizeof (events[0]));
+  counter = grub_malloc ((DIGITSORT_MASK + 2) * sizeof (counter[0]));
+  if (!events || !eventt || !counter)
+    {
+      grub_dprintf ("relocator", "events or counter allocation failed %d\n",
+		    maxevents);
+      grub_free (events);
+      grub_free (eventt);
+      grub_free (counter);
       return 0;
     }
 
-  grub_dprintf ("relocator", "trying region %p - %p\n", rb, rb + rb->size + 1);
-
-  hb = get_best_header (rel, start, end, align, size, rb, &hbp, &best_addr,
-			from_low_priv, collisioncheck);
-
-  grub_dprintf ("relocator", "best header %p/%p/%lx\n", hb, hbp,
-		(unsigned long) best_addr);
-
-  if (!hb)
+  if (collisioncheck && rel)
     {
-      if (from_low_priv)
-	start = (grub_addr_t) (rb + rb->size + sizeof (*rb));
-      else
-	end = (grub_addr_t) rb - 1;
-      goto again;
+      struct grub_relocator_chunk *chunk;
+      for (chunk = rel->chunks; chunk; chunk = chunk->next)
+	{
+	  events[N].type = COLLISION_START;
+	  events[N].pos = chunk->target;
+	  N++;
+	  events[N].type = COLLISION_END;
+	  events[N].pos = chunk->target + chunk->size;
+	  N++;
+	}
     }
 
-  /* Special case: relocating region start.  */
-  if (best_addr < (grub_addr_t) hb)
+  /* No malloc from this point.  */
+  base_saved = grub_mm_base;
+  grub_mm_base = NULL;
+
+  for (ra = &base_saved, r = *ra; r; ra = &(r->next), r = *ra)
     {
-      grub_addr_t newreg_start, newreg_raw_start = best_addr + size;
-      grub_addr_t newreg_size, newreg_presize;
-      grub_mm_header_t new_header;
-
-      res->src = best_addr;
-      res->type = CHUNK_TYPE_REGION_START;
-      res->host_start = (grub_addr_t) rb - rb->pre_size;
-
-      newreg_start = ALIGN_UP (newreg_raw_start, GRUB_MM_ALIGN);
-      newreg_presize = newreg_start - newreg_raw_start;
-      newreg_size = rb->size - (newreg_start - (grub_addr_t) rb);
-      if ((hb->size << GRUB_MM_ALIGN_LOG2) >= newreg_start
-	  - (grub_addr_t) rb)
-	{
-	  grub_mm_header_t newhnext = hb->next;
-	  grub_size_t newhsize = ((hb->size << GRUB_MM_ALIGN_LOG2)
-				  - (newreg_start
-				     - (grub_addr_t) rb)) >> GRUB_MM_ALIGN_LOG2;
-	  new_header = (void *) (newreg_start + sizeof (*rb));
-	  if (newhnext == hb)
-	    newhnext = new_header;
-	  new_header->next = newhnext;
-	  new_header->size = newhsize;
-	  new_header->magic = GRUB_MM_FREE_MAGIC;
-	}
-      else
-	{
-	  new_header = hb->next;
-	  if (new_header == hb)
-	    new_header = (void *) (newreg_start + sizeof (*rb));	    
-	}
-      {
-	struct grub_mm_header *newregfirst = rb->first;
-	struct grub_mm_region *newregnext = rb->next;
-	struct grub_mm_region *newreg = (void *) newreg_start;
-	hbp->next = new_header;
-	if (newregfirst == hb)
-	  newregfirst = new_header;
-	newreg->first = newregfirst;
-	newreg->next = newregnext;
-	newreg->pre_size = newreg_presize;
-	newreg->size = newreg_size;
-	if (rbp)
-	  rbp->next = newreg;
-	else
-	  grub_mm_base = newreg;
-	{
-	  grub_mm_header_t h = newreg->first, hp = NULL;
-	  do
+      int pre_added = 0;
+      pa = r->first;
+      p = pa->next;
+      do 
+	{	  
+	  if (p == (grub_mm_header_t) (r + 1))
 	    {
-	      if ((void *) h < (void *) (newreg + 1))
-		grub_fatal ("Failed to adjust memory region: %p, %p, %p, %p, %p",
-			    newreg, newreg->first, h, hp, hb);
-	      hp = h;
-	      h = h->next;
+	      pre_added = 1;
+	      events[N].type = REG_BEG_START;
+	      events[N].pos = (grub_addr_t) r - r->pre_size;
+	      events[N].reg = r;
+	      events[N].regancestor = ra;
+	      events[N].head = p;
+	      events[N].hancestor = pa;
+	      N++;
+	      events[N].type = REG_BEG_END;
+	      events[N].pos = (grub_addr_t) (p + p->size) - sizeof (*r);
+	      N++;
 	    }
-	  while (h != newreg->first);
+	  else
+	    {
+	      events[N].type = IN_REG_START;
+	      events[N].pos = (grub_addr_t) p;
+	      events[N].head = p;
+	      events[N].hancestor = pa;
+	      events[N].reg = r;
+	      N++;
+	      events[N].type = IN_REG_END;
+	      events[N].pos = (grub_addr_t) (p + p->size);
+	      N++;
+	    }
+	  pa = p;
+	  p = pa->next;
+	}
+      while (pa != r->first);
+      /* FIXME */
+      if (0)//if (!pre_added)
+	{
+	  events[N].type = REG_BEG_START;
+	  events[N].pos = (grub_addr_t) r - r->pre_size;
+	  events[N].reg = r;
+	  N++;
+	  events[N].type = REG_BEG_END;
+	  events[N].pos = (grub_addr_t) r;
+	  N++;
 	}
-      }
-      return 1;
     }
+
+  /* Put ending events after starting events.  */
   {
-    struct grub_mm_header *foll = NULL;
-
-    res->src = best_addr;
-    res->type = CHUNK_TYPE_IN_REGION;
-    
-    if (ALIGN_UP (best_addr + size, GRUB_MM_ALIGN) + GRUB_MM_ALIGN
-	<= (grub_addr_t) (hb + hb->size))
-      {
-	foll = (void *) ALIGN_UP (best_addr + size, GRUB_MM_ALIGN);
-	foll->magic = GRUB_MM_FREE_MAGIC;
-	foll->size = hb->size - (foll - hb);
-      }
-
-    if (best_addr - (grub_addr_t) hb >= sizeof (*hb))
-      {
-	hb->size = ((best_addr - (grub_addr_t) hb) >> GRUB_MM_ALIGN_LOG2);
-	if (foll)
-	  {
-	    foll->next = hb;
-	    hbp->next = foll;
-	    if (rb->first == hb)
-	      rb->first = foll;
-	  }
-      }
-    else
-      {
-	if (foll)
-	  foll->next = hb->next;
-	else
-	  foll = hb->next;
-	
-	hbp->next = foll;
-	if (rb->first == hb)
-	  rb->first = foll;
-	if (rb->first == hb)
-	  rb->first = (void *) (rb + 1);
-      }
-    return 1;
+    int st = 0, e = N / 2;
+    for (j = 0; j < N; j++)
+      if (is_start (events[j].type) || events[j].type == COLLISION_START)
+	eventt[st++] = events[j];
+      else
+	eventt[e++] = events[j];
+    t = eventt;
+    eventt = events;
+    events = t;
   }
+  for (i = 0; i < (BITS_IN_BYTE * sizeof (grub_addr_t) / DIGITSORT_BITS);
+       i++)
+    {
+      memset (counter, 0, (1 + (1 << DIGITSORT_BITS)) * sizeof (counter[0]));
+      for (j = 0; j < N; j++)
+	counter[((events[j].pos >> (DIGITSORT_BITS * i)) 
+		 & DIGITSORT_MASK) + 1]++;
+      for (j = 0; j <= DIGITSORT_MASK; j++)
+	counter[j+1] += counter[j];
+      for (j = 0; j < N; j++)
+	eventt[counter[((events[j].pos >> (DIGITSORT_BITS * i)) 
+			& DIGITSORT_MASK)]++] = events[j];
+      t = eventt;
+      eventt = events;
+      events = t;
+    }
+
+  grub_dprintf ("relocator", "scanline events:\n");
+  for (j = 0; j < N; j++)
+    grub_dprintf ("relocator", "event %x, type %d\n", events[j].pos,
+		  events[j].type);
+
+  /* Now events are nicely sorted.  */
+  if (from_low_priv)
+    {
+      int nstarted = 0, ncollisions = 0;
+      grub_addr_t starta = 0;
+      int numstarted;
+      for (j = 0; j < N; j++)
+	{
+	  switch (events[j].type)
+	    {
+	    case COLLISION_END:
+	      ncollisions--;
+	    case IN_REG_START:
+	    case REG_BEG_START:
+	      if ((events[j].type == COLLISION_END ? nstarted != 0
+		   : nstarted == 0) 
+		  && ncollisions == 0)
+		{
+		  starta = ALIGN_UP (events[j].pos, align);
+		  numstarted = j;
+		}
+	      if (events[j].type != COLLISION_END)
+		nstarted++;
+	      break;
+
+	    case IN_REG_END:
+	    case REG_BEG_END:
+		nstarted--;
+	    case COLLISION_START:
+	      if (((events[j].type == COLLISION_START)
+		   ? nstarted != 0 : nstarted == 0) 
+		  && ncollisions == 0)
+		{
+		  target = starta;
+		  if (target < start)
+		    target = start;
+		  grub_dprintf ("relocator", "%x, %x, %x\n", target, start,
+				events[j].pos);
+		  if (target + size <= end && target + size <= events[j].pos)
+		    /* Found an usable address.  */
+		    goto found;
+		}
+	      if (events[j].type == COLLISION_START)
+		ncollisions++;
+	      break;
+	    }
+	}
+    }
+  else
+    {
+      int nstarted = 0, ncollisions = 0;
+      grub_addr_t enda = 0;
+      int numend;
+      for (j = N - 1; j != (unsigned) -1; j--)
+	{
+	  switch (events[j].type)
+	    {
+	    case COLLISION_START:
+	      ncollisions--;
+	    case IN_REG_END:
+	    case REG_BEG_END:
+	      if ((events[j].type == COLLISION_END ? nstarted != 0 
+		   : nstarted == 0) 
+		  && ncollisions == 0)
+		{
+		  enda = ALIGN_DOWN (events[j].pos - size, align) + size;
+		  numend = j;
+		}
+	      nstarted++;
+	      break;
+
+	    case IN_REG_START:
+	    case REG_BEG_START:
+		nstarted--;
+	    case COLLISION_END:
+	      if ((events[j].type == COLLISION_START ? nstarted != 0
+		   : nstarted == 0) 
+		  && ncollisions == 0)
+		{
+		  target = enda - size;
+		  if (target > end - size)
+		    target = end - size;
+		  grub_dprintf ("relocator", "%x, %x, %x\n", target, start,
+				events[j].pos);
+		  if (target >= start && target >= events[j].pos)
+		    goto found;
+		}
+	      if (events[j].type == COLLISION_START)
+		ncollisions++;
+	      break;
+	    }
+	}
+    }
+
+  grub_mm_base = base_saved;
+  grub_free (events);
+  grub_free (eventt);
+  grub_free (counter);
+  return 0;
+
+ found:
+  {
+    int last_start = 0;
+    for (j = 0; j < N; j++)
+      {
+	if (j != 0 && events[j - 1].pos != events[j].pos)
+	  {
+	    grub_addr_t alloc_start, alloc_end;
+	    alloc_start = max (events[j - 1].pos, target);
+	    alloc_end = min (events[j].pos, target + size);
+	    if (alloc_end > alloc_start)
+	      {
+		grub_dprintf ("relocator", "%d\n", last_start);
+
+		if (events[last_start].type == REG_BEG_START
+		    || events[last_start].type == IN_REG_START)
+		  {
+		    if (events[last_start].type == REG_BEG_START &&
+			(grub_addr_t) (events[last_start].reg + 1) > target)
+		      allocate_regstart (alloc_start, alloc_end - alloc_start,
+					 events[last_start].reg,
+					 events[last_start].regancestor,
+					 events[last_start].hancestor);
+		    else
+		      allocate_inreg (alloc_start, alloc_end - alloc_start,
+				      events[last_start].head,
+				      events[last_start].hancestor,
+				      events[last_start].reg);
+		  }
+		nallocs++;
+	      }
+	  }
+	if (is_start (events[j].type))
+	  last_start = j;
+      }
+  }
+
+  grub_memset ((void *) target, 0, size);
+  grub_dprintf ("relocator", "baseptr = %p\n", &base_saved);
+  for (r = base_saved; r; r = r->next)
+    {
+      p = r->first;
+      do
+	{
+	  if (!p)
+	    grub_fatal ("null in the ring %p %p\n", r, p);
+	  p = p->next;
+	}
+      while (p != r->first);
+    }
+
+  /* Malloc is available again.  */
+  grub_mm_base = base_saved;
+
+  /* FIXME: react on out of memory.  */
+  res->subchunks = grub_malloc (sizeof (res->subchunks[0]) * nallocs);
+  res->nsubchunks = nallocs;
+
+  {
+    int last_start = 0;
+    int cural = 0;
+    for (j = 0; j < N; j++)
+      {
+	if (j != 0 && events[j - 1].pos != events[j].pos)
+	  {
+	    grub_addr_t alloc_start, alloc_end;
+	    alloc_start = max (events[j - 1].pos, target);
+	    alloc_end = min (events[j].pos, target + size);
+	    if (alloc_end > alloc_start)
+	      {
+		res->subchunks[cural].start = alloc_start;
+		res->subchunks[cural].size = alloc_end - alloc_start;
+		if (res->subchunks[last_start].type == IN_REG_START)
+		  res->subchunks[cural].type = CHUNK_TYPE_IN_REGION;
+		else if (res->subchunks[last_start].type == REG_BEG_START)
+		  {
+		    res->subchunks[cural].type = CHUNK_TYPE_REGION_START;
+		    res->subchunks[cural].host_start
+		      = (grub_addr_t) events[last_start].reg;
+		  }
+		cural++;
+	      }
+	  }
+	if (is_start (events[j].type))
+	  last_start = j;
+      }
+  }
+  res->src = target;
+  res->size = size;
+  grub_dprintf ("relocator", "allocated: %x %x\n", target, size);
+  return 1;
 }
 
 static void
@@ -601,48 +809,56 @@ grub_relocator_unload (struct grub_relocator *rel)
     return;
   for (chunk = rel->chunks; chunk; chunk = next)
     {
-      switch (chunk->type)
-	{
-	case CHUNK_TYPE_REGION_START:
+      unsigned i;
+      for (i = 0; i < chunk->nsubchunks; i++) 
+	switch (chunk->subchunks[i].type)
 	  {
-	    grub_mm_region_t r1, r2, *rp;
-	    grub_mm_header_t h;
-	    grub_size_t pre_size;
-	    r1 = (grub_mm_region_t) ALIGN_UP (chunk->src + chunk->size,
-					      GRUB_MM_ALIGN);
-	    r2 = (grub_mm_region_t) ALIGN_UP (chunk->host_start, GRUB_MM_ALIGN);
-	    for (rp = &grub_mm_base; *rp && *rp != r2; rp = &((*rp)->next));
-	    if (!*rp)
-	      grub_fatal ("Anomaly in region alocations detected. "
-			  "Simultaneous relocators?");
-	    pre_size = ALIGN_UP (chunk->host_start, GRUB_MM_ALIGN)
-	      - chunk->host_start;
-	    r2->first = r1->first;
-	    r2->next = r1->next;
-	    r2->pre_size = pre_size;
-	    r2->size = r1->size + (r2 - r1) * sizeof (*r2);
-	    *rp = r1;
-	    h = (grub_mm_header_t) (r1 + 1);
-	    h->next = h;
-	    h->magic = GRUB_MM_ALLOC_MAGIC;
-	    h->size = (r2 - r1);
-	    grub_free (h + 1);
-	    break;
+	  case CHUNK_TYPE_REGION_START:
+	    {
+	      grub_mm_region_t r1, r2, *rp;
+	      grub_mm_header_t h;
+	      grub_size_t pre_size;
+	      r1 = (grub_mm_region_t) ALIGN_UP (chunk->subchunks[i].start 
+						+ chunk->subchunks[i].size,
+						GRUB_MM_ALIGN);
+	      r2 = (grub_mm_region_t) ALIGN_UP (chunk->subchunks[i].host_start,
+						GRUB_MM_ALIGN);
+	      for (rp = &grub_mm_base; *rp && *rp != r2; rp = &((*rp)->next));
+	      /* FIXME  */
+	      if (!*rp)
+		grub_fatal ("Anomaly in region alocations detected. "
+			    "Simultaneous relocators?");
+	      pre_size = ALIGN_UP (chunk->subchunks[i].host_start, 
+				   GRUB_MM_ALIGN)
+		- chunk->subchunks[i].host_start;
+	      r2->first = r1->first;
+	      r2->next = r1->next;
+	      r2->pre_size = pre_size;
+	      r2->size = r1->size + (r2 - r1) * sizeof (*r2);
+	      *rp = r1;
+	      h = (grub_mm_header_t) (r1 + 1);
+	      h->next = h;
+	      h->magic = GRUB_MM_ALLOC_MAGIC;
+	      h->size = (r2 - r1);
+	      grub_free (h + 1);
+	      break;
+	    }
+	  case CHUNK_TYPE_IN_REGION:
+	    {
+	      grub_mm_header_t h 
+		= (grub_mm_header_t) ALIGN_DOWN (chunk->subchunks[i].start,
+						 GRUB_MM_ALIGN);
+	      h->size = (chunk->subchunks[i].start / GRUB_MM_ALIGN)
+		- ((chunk->subchunks[i].start + chunk->subchunks[i].size 
+		    + GRUB_MM_ALIGN - 1) / GRUB_MM_ALIGN);
+	      h->next = h;
+	      h->magic = GRUB_MM_ALLOC_MAGIC;
+	      grub_free (h + 1);
+	      break;
+	    }
 	  }
-	case CHUNK_TYPE_IN_REGION:
-	  {
-	    grub_mm_header_t h = (grub_mm_header_t) ALIGN_DOWN (chunk->src,
-								GRUB_MM_ALIGN);
-	    h->size = (chunk->src / GRUB_MM_ALIGN)
-	      - ((chunk->src + chunk->size + GRUB_MM_ALIGN - 1) 
-		 / GRUB_MM_ALIGN);
-	    h->next = h;
-	    h->magic = GRUB_MM_ALLOC_MAGIC;
-	    grub_free (h + 1);
-	    break;
-	  }
-	}
       next = chunk->next;
+      grub_free (chunk->subchunks);
       grub_free (chunk);
     }
 }

From d5631db0f2763746d35bd6ca895610b133f0841d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Apr 2010 21:12:20 +0200
Subject: [PATCH 0717/1628] 	grub-mkconfig multiple terminal support.

	* util/grub-mkconfig.in: Handle multiple terminals correctly.
	* util/grub.d/00_header.in: Likewise.
---
 ChangeLog.mtcfg          |   6 ++
 util/grub-mkconfig.in    | 115 ++++++++++++++++++++++-----------------
 util/grub.d/00_header.in |  76 ++++++++++++++------------
 3 files changed, 110 insertions(+), 87 deletions(-)
 create mode 100644 ChangeLog.mtcfg

diff --git a/ChangeLog.mtcfg b/ChangeLog.mtcfg
new file mode 100644
index 000000000..2f246c26a
--- /dev/null
+++ b/ChangeLog.mtcfg
@@ -0,0 +1,6 @@
+2010-04-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	grub-mkconfig multiple terminal support.
+
+	* util/grub-mkconfig.in: Handle multiple terminals correctly.
+	* util/grub.d/00_header.in: Likewise.
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index daa110be7..94cd2e199 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -140,60 +140,73 @@ if [ "x${GRUB_TERMINAL}" != "x" ] ; then
   GRUB_TERMINAL_OUTPUT="${GRUB_TERMINAL}"
 fi
 
-case x${GRUB_TERMINAL_OUTPUT} in
-  x | xgfxterm)
-    # If this platform supports gfxterm, try to use it.
-    if test -e ${grub_prefix}/gfxterm.mod ; then
-      # FIXME: this should do something smarter than just loading first
-      # video backend.
-      GRUB_VIDEO_BACKEND=$(head -n 1 ${grub_prefix}/video.lst || true)
-      if [ -n "${GRUB_VIDEO_BACKEND}" ] ; then
-        GRUB_TERMINAL_OUTPUT=gfxterm
-      elif [ "${GRUB_TERMINAL_OUTPUT}" = "gfxterm" ] ; then
-        echo "No suitable backend could be found for gfxterm." >&2 ; exit 1
-      fi
-    fi
-  ;;
-  xconsole | xserial | xofconsole) ;;
-  *) echo "Invalid output terminal \"${GRUB_TERMINAL_OUTPUT}\"" >&2 ; exit 1 ;;
-esac
+termoutdefault=0
+if [ "x${GRUB_TERMINAL_OUTPUT}" == x ]; then
+    GRUB_TERMINAL_OUTPUT=gfxterm;
+    termoutdefault=1;
+fi
 
-# check for terminals that require fonts
-case ${GRUB_TERMINAL_OUTPUT} in
-  gfxterm)
-    if [ -n "$GRUB_FONT" ] ; then
-      if is_path_readable_by_grub ${GRUB_FONT} > /dev/null ; then
-        GRUB_FONT_PATH=${GRUB_FONT}
-	else
-	  echo "No such font or not readable by grub: ${GRUB_FONT}" >&2
-	  exit 1
+for x in ${GRUB_TERMINAL_OUTPUT}; do
+    if [ x${x} == xgfxterm ]; then
+        # If this platform supports gfxterm, try to use it.
+	if ! test -e ${grub_prefix}/gfxterm.mod ; then
+	    if [ "x$termoutdefault" != "x1" ]; then
+		echo "gfxterm isn't available on your platform" >&2 ; exit 1
+	    fi
+	    GRUB_TERMINAL_OUTPUT=
+	    break;
+	fi
+        # FIXME: this should do something smarter than just loading first
+        # video backend.
+	GRUB_VIDEO_BACKEND=$(head -n 1 ${grub_prefix}/video.lst || true)
+	if [ -z "${GRUB_VIDEO_BACKEND}" ] ; then
+	    if [ "x$termoutdefault" != "x1" ]; then
+		echo "No suitable backend could be found for gfxterm." >&2 ; exit 1
+	    fi
+	    GRUB_TERMINAL_OUTPUT=
+	fi
+	if [ -n "$GRUB_FONT" ] ; then
+	    if is_path_readable_by_grub ${GRUB_FONT} > /dev/null ; then
+		GRUB_FONT_PATH=${GRUB_FONT}
+	    else
+		echo "No such font or not readable by grub: ${GRUB_FONT}" >&2
+		exit 1
+	    fi
+	else
+	    for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do
+		for basename in unicode unifont ascii; do
+		    path="${dir}/${basename}.pf2"
+		    if is_path_readable_by_grub ${path} > /dev/null ; then
+			GRUB_FONT_PATH=${path}
+		    else
+			continue
+		    fi
+		    if [ "${basename}" = "ascii" ] ; then
+	                # make sure all our children behave in conformance with ascii..
+			export LANG=C
+		    fi
+		    break 2
+		done
+	    done
+	fi
+	if [ -z "${GRUB_FONT_PATH}" ] ; then
+	    if [ "x$termoutdefault" != "x1" ]; then
+		echo "No font for gfxterm found." >&2 ; exit 1
+	    fi
+	    GRUB_TERMINAL_OUTPUT=
 	fi
-    else
-      for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do
-        for basename in unicode unifont ascii; do
-	  path="${dir}/${basename}.pf2"
-          if is_path_readable_by_grub ${path} > /dev/null ; then
-	    GRUB_FONT_PATH=${path}
-	  else
-	    continue
-	  fi
-	  if [ "${basename}" = "ascii" ] ; then
-	    # make sure all our children behave in conformance with ascii..
-	    export LANG=C
-	  fi
-	  break 2
-        done
-      done
     fi
-    if [ -z "${GRUB_FONT_PATH}" ] ; then
-      # fallback to the native terminal for this platform
-      unset GRUB_TERMINAL_OUTPUT
-    fi
-  ;;
-  *)
-    # make sure all our children behave in conformance with ascii..
-    export LANG=C
-esac
+done
+
+for x in ${GRUB_TERMINAL_OUTPUT}; do
+    case "x${x}" in
+	xgfxterm) ;;
+	xconsole | xserial | xofconsole)
+            # make sure all our children behave in conformance with ascii..
+	    export LANG=C;;
+	*) echo "Invalid output terminal \"${GRUB_TERMINAL_OUTPUT}\"" >&2 ; exit 1 ;;
+    esac
+done
 
 # These are defined in this script, export them here so that user can
 # override them.
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index c86f7b867..81f7a213a 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -59,19 +59,52 @@ function savedefault {
 }
 EOF
 
-case ${GRUB_TERMINAL_INPUT}:${GRUB_TERMINAL_OUTPUT} in
-  serial:* | *:serial)
+serial=0;
+gfxterm=0;
+for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
+    if [ xserial = "x$x" ]; then
+	serial=1;
+    fi
+    if [ xgfxterm = "x$x" ]; then
+	gfxterm=1;
+    fi
+done
+
+if [ "x$serial" = x1 ]; then
     if ! test -e ${grub_prefix}/serial.mod ; then
-      echo "Serial terminal not available on this platform." >&2 ; exit 1
+	echo "Serial terminal not available on this platform." >&2 ; exit 1
     fi
 
     if [ "x${GRUB_SERIAL_COMMAND}" = "x" ] ; then
-      grub_warn "Requested serial terminal but GRUB_SERIAL_COMMAND is unspecified. Default parameters will be used."
-      GRUB_SERIAL_COMMAND=serial
+	grub_warn "Requested serial terminal but GRUB_SERIAL_COMMAND is unspecified. Default parameters will be used."
+	GRUB_SERIAL_COMMAND=serial
     fi
     echo "${GRUB_SERIAL_COMMAND}"
-  ;;
-esac
+fi
+
+if [ "x$gfxterm" = x1 ]; then
+    # Make the font accessible
+    prepare_grub_to_access_device `${grub_probe} --target=device ${GRUB_FONT_PATH}`
+
+    cat << EOF
+if loadfont `make_system_path_relative_to_its_root ${GRUB_FONT_PATH}` ; then
+  set gfxmode=${GRUB_GFXMODE}
+  insmod gfxterm
+  insmod ${GRUB_VIDEO_BACKEND}
+EOF
+    if [ x$GRUB_THEME != x ] && [ -f $GRUB_THEME ] \
+	&& is_path_readable_by_grub $GRUB_THEME; then
+	echo "Found theme: $GRUB_THEME" >&2
+	prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME` | sed -e "s/^/  /"
+	cat << EOF
+  insmod gfxmenu
+  set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
+EOF
+    fi
+    cat << EOF
+fi
+EOF
+fi
 
 case x${GRUB_TERMINAL_INPUT} in
   x)
@@ -89,35 +122,6 @@ EOF
 esac
 
 case x${GRUB_TERMINAL_OUTPUT} in
- xgfxterm)
-    # Make the font accessible
-    prepare_grub_to_access_device `${grub_probe} --target=device ${GRUB_FONT_PATH}`
-
-    cat << EOF
-if loadfont `make_system_path_relative_to_its_root ${GRUB_FONT_PATH}` ; then
-  set gfxmode=${GRUB_GFXMODE}
-  insmod gfxterm
-  insmod ${GRUB_VIDEO_BACKEND}
-  if terminal_output gfxterm ; then true ; else
-    # For backward compatibility with versions of terminal.mod that don't
-    # understand terminal_output
-    terminal gfxterm
-  fi
-EOF
-if [ x$GRUB_THEME != x ] && [ -f $GRUB_THEME ] \
-	&& is_path_readable_by_grub $GRUB_THEME; then
-    echo "Found theme: $GRUB_THEME" >&2
-    prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME` | sed -e "s/^/  /"
-    cat << EOF
-  insmod gfxmenu
-  set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
-  set menuviewer=gfxmenu
-EOF
-fi
-    cat << EOF
-fi
-EOF
-  ;;
   x)
     # Just use the native terminal
   ;;

From 47674667e367a23bdda0de03ac81ccd0c62fa9ea Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 3 Apr 2010 00:45:01 +0200
Subject: [PATCH 0718/1628] 	Import gnulib argp module.

	* gnulib/argp-ba.c: New file.
	* gnulib/argp-eexst.c: Likewise.
	* gnulib/argp-fmtstream.c: Likewise.
	* gnulib/argp-fmtstream.h: Likewise.
	* gnulib/argp-fs-xinl.c: Likewise.
	* gnulib/argp-help.c: Likewise.
	* gnulib/argp-namefrob.h: Likewise.
	* gnulib/argp-parse.c: Likewise.
	* gnulib/argp-pin.c: Likewise.
	* gnulib/argp-pv.c: Likewise.
	* gnulib/argp-pvh.c: Likewise.
	* gnulib/argp-version-etc.c: Likewise.
	* gnulib/argp-version-etc.h: Likewise.
	* gnulib/argp-xinl.c: Likewise.
	* gnulib/argp.h: Likewise.
---
 ChangeLog                 |   20 +
 gnulib/argp-ba.c          |   34 +
 gnulib/argp-eexst.c       |   30 +
 gnulib/argp-fmtstream.c   |  435 +++++++++
 gnulib/argp-fmtstream.h   |  354 +++++++
 gnulib/argp-fs-xinl.c     |   42 +
 gnulib/argp-help.c        | 1951 +++++++++++++++++++++++++++++++++++++
 gnulib/argp-namefrob.h    |  157 +++
 gnulib/argp-parse.c       |  952 ++++++++++++++++++
 gnulib/argp-pin.c         |   27 +
 gnulib/argp-pv.c          |   34 +
 gnulib/argp-pvh.c         |   31 +
 gnulib/argp-version-etc.c |   38 +
 gnulib/argp-version-etc.h |   40 +
 gnulib/argp-xinl.c        |   42 +
 gnulib/argp.h             |  645 ++++++++++++
 16 files changed, 4832 insertions(+)
 create mode 100644 gnulib/argp-ba.c
 create mode 100644 gnulib/argp-eexst.c
 create mode 100644 gnulib/argp-fmtstream.c
 create mode 100644 gnulib/argp-fmtstream.h
 create mode 100644 gnulib/argp-fs-xinl.c
 create mode 100644 gnulib/argp-help.c
 create mode 100644 gnulib/argp-namefrob.h
 create mode 100644 gnulib/argp-parse.c
 create mode 100644 gnulib/argp-pin.c
 create mode 100644 gnulib/argp-pv.c
 create mode 100644 gnulib/argp-pvh.c
 create mode 100644 gnulib/argp-version-etc.c
 create mode 100644 gnulib/argp-version-etc.h
 create mode 100644 gnulib/argp-xinl.c
 create mode 100644 gnulib/argp.h

diff --git a/ChangeLog b/ChangeLog
index d35e1ca22..86eaedb83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2010-04-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Import gnulib argp module.
+
+	* gnulib/argp-ba.c: New file.
+	* gnulib/argp-eexst.c: Likewise.
+	* gnulib/argp-fmtstream.c: Likewise.
+	* gnulib/argp-fmtstream.h: Likewise.
+	* gnulib/argp-fs-xinl.c: Likewise.
+	* gnulib/argp-help.c: Likewise.
+	* gnulib/argp-namefrob.h: Likewise.
+	* gnulib/argp-parse.c: Likewise.
+	* gnulib/argp-pin.c: Likewise.
+	* gnulib/argp-pv.c: Likewise.
+	* gnulib/argp-pvh.c: Likewise.
+	* gnulib/argp-version-etc.c: Likewise.
+	* gnulib/argp-version-etc.h: Likewise.
+	* gnulib/argp-xinl.c: Likewise.
+	* gnulib/argp.h: Likewise.
+
 2010-03-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/device.c (grub_device_iterate): Clear errors after failed
diff --git a/gnulib/argp-ba.c b/gnulib/argp-ba.c
new file mode 100644
index 000000000..95feabb86
--- /dev/null
+++ b/gnulib/argp-ba.c
@@ -0,0 +1,34 @@
+/* Default definition for ARGP_PROGRAM_BUG_ADDRESS.
+   Copyright (C) 1996, 1997, 1999, 2009, 2010 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Written by Miles Bader <miles@gnu.ai.mit.edu>.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* If set by the user program, it should point to string that is the
+   bug-reporting address for the program.  It will be printed by argp_help if
+   the ARGP_HELP_BUG_ADDR flag is set (as it is by various standard help
+   messages), embedded in a sentence that says something like `Report bugs to
+   ADDR.'.  */
+const char *argp_program_bug_address
+/* This variable should be zero-initialized.  On most systems, putting it into
+   BSS is sufficient.  Not so on MacOS X 10.3 and 10.4, see
+   <http://lists.gnu.org/archive/html/bug-gnulib/2009-01/msg00329.html>
+   <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00096.html>.  */
+#if defined __ELF__
+  /* On ELF systems, variables in BSS behave well.  */
+#else
+  = (const char *) 0
+#endif
+  ;
diff --git a/gnulib/argp-eexst.c b/gnulib/argp-eexst.c
new file mode 100644
index 000000000..115a8cd5d
--- /dev/null
+++ b/gnulib/argp-eexst.c
@@ -0,0 +1,30 @@
+/* Default definition for ARGP_ERR_EXIT_STATUS
+   Copyright (C) 1997, 2009, 2010 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Written by Miles Bader <miles@gnu.ai.mit.edu>.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <sysexits.h>
+
+#include "argp.h"
+
+/* The exit status that argp will use when exiting due to a parsing error.
+   If not defined or set by the user program, this defaults to EX_USAGE from
+   <sysexits.h>.  */
+error_t argp_err_exit_status = EX_USAGE;
diff --git a/gnulib/argp-fmtstream.c b/gnulib/argp-fmtstream.c
new file mode 100644
index 000000000..70bbebc21
--- /dev/null
+++ b/gnulib/argp-fmtstream.c
@@ -0,0 +1,435 @@
+/* Word-wrapping and line-truncating streams
+   Copyright (C) 1997-1999, 2001-2003, 2005, 2009-2010 Free Software
+   Foundation, Inc.
+   This file is part of the GNU C Library.
+   Written by Miles Bader <miles@gnu.ai.mit.edu>.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* This package emulates glibc `line_wrap_stream' semantics for systems that
+   don't have that.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <ctype.h>
+
+#include "argp-fmtstream.h"
+#include "argp-namefrob.h"
+
+#ifndef ARGP_FMTSTREAM_USE_LINEWRAP
+
+#ifndef isblank
+#define isblank(ch) ((ch)==' ' || (ch)=='\t')
+#endif
+
+#if defined _LIBC && defined USE_IN_LIBIO
+# include <wchar.h>
+# include <libio/libioP.h>
+# define __vsnprintf(s, l, f, a) _IO_vsnprintf (s, l, f, a)
+#endif
+
+#define INIT_BUF_SIZE 200
+#define PRINTF_SIZE_GUESS 150
+
+/* Return an argp_fmtstream that outputs to STREAM, and which prefixes lines
+   written on it with LMARGIN spaces and limits them to RMARGIN columns
+   total.  If WMARGIN >= 0, words that extend past RMARGIN are wrapped by
+   replacing the whitespace before them with a newline and WMARGIN spaces.
+   Otherwise, chars beyond RMARGIN are simply dropped until a newline.
+   Returns NULL if there was an error.  */
+argp_fmtstream_t
+__argp_make_fmtstream (FILE *stream,
+                       size_t lmargin, size_t rmargin, ssize_t wmargin)
+{
+  argp_fmtstream_t fs;
+
+  fs = (struct argp_fmtstream *) malloc (sizeof (struct argp_fmtstream));
+  if (fs != NULL)
+    {
+      fs->stream = stream;
+
+      fs->lmargin = lmargin;
+      fs->rmargin = rmargin;
+      fs->wmargin = wmargin;
+      fs->point_col = 0;
+      fs->point_offs = 0;
+
+      fs->buf = (char *) malloc (INIT_BUF_SIZE);
+      if (! fs->buf)
+        {
+          free (fs);
+          fs = 0;
+        }
+      else
+        {
+          fs->p = fs->buf;
+          fs->end = fs->buf + INIT_BUF_SIZE;
+        }
+    }
+
+  return fs;
+}
+#if 0
+/* Not exported.  */
+#ifdef weak_alias
+weak_alias (__argp_make_fmtstream, argp_make_fmtstream)
+#endif
+#endif
+
+/* Flush FS to its stream, and free it (but don't close the stream).  */
+void
+__argp_fmtstream_free (argp_fmtstream_t fs)
+{
+  __argp_fmtstream_update (fs);
+  if (fs->p > fs->buf)
+    {
+#ifdef USE_IN_LIBIO
+      __fxprintf (fs->stream, "%.*s", (int) (fs->p - fs->buf), fs->buf);
+#else
+      fwrite_unlocked (fs->buf, 1, fs->p - fs->buf, fs->stream);
+#endif
+    }
+  free (fs->buf);
+  free (fs);
+}
+#if 0
+/* Not exported.  */
+#ifdef weak_alias
+weak_alias (__argp_fmtstream_free, argp_fmtstream_free)
+#endif
+#endif
+
+/* Process FS's buffer so that line wrapping is done from POINT_OFFS to the
+   end of its buffer.  This code is mostly from glibc stdio/linewrap.c.  */
+void
+__argp_fmtstream_update (argp_fmtstream_t fs)
+{
+  char *buf, *nl;
+  size_t len;
+
+  /* Scan the buffer for newlines.  */
+  buf = fs->buf + fs->point_offs;
+  while (buf < fs->p)
+    {
+      size_t r;
+
+      if (fs->point_col == 0 && fs->lmargin != 0)
+        {
+          /* We are starting a new line.  Print spaces to the left margin.  */
+          const size_t pad = fs->lmargin;
+          if (fs->p + pad < fs->end)
+            {
+              /* We can fit in them in the buffer by moving the
+                 buffer text up and filling in the beginning.  */
+              memmove (buf + pad, buf, fs->p - buf);
+              fs->p += pad; /* Compensate for bigger buffer. */
+              memset (buf, ' ', pad); /* Fill in the spaces.  */
+              buf += pad; /* Don't bother searching them.  */
+            }
+          else
+            {
+              /* No buffer space for spaces.  Must flush.  */
+              size_t i;
+              for (i = 0; i < pad; i++)
+                {
+#ifdef USE_IN_LIBIO
+                  if (_IO_fwide (fs->stream, 0) > 0)
+                    putwc_unlocked (L' ', fs->stream);
+                  else
+#endif
+                    putc_unlocked (' ', fs->stream);
+                }
+            }
+          fs->point_col = pad;
+        }
+
+      len = fs->p - buf;
+      nl = memchr (buf, '\n', len);
+
+      if (fs->point_col < 0)
+        fs->point_col = 0;
+
+      if (!nl)
+        {
+          /* The buffer ends in a partial line.  */
+
+          if (fs->point_col + len < fs->rmargin)
+            {
+              /* The remaining buffer text is a partial line and fits
+                 within the maximum line width.  Advance point for the
+                 characters to be written and stop scanning.  */
+              fs->point_col += len;
+              break;
+            }
+          else
+            /* Set the end-of-line pointer for the code below to
+               the end of the buffer.  */
+            nl = fs->p;
+        }
+      else if (fs->point_col + (nl - buf) < (ssize_t) fs->rmargin)
+        {
+          /* The buffer contains a full line that fits within the maximum
+             line width.  Reset point and scan the next line.  */
+          fs->point_col = 0;
+          buf = nl + 1;
+          continue;
+        }
+
+      /* This line is too long.  */
+      r = fs->rmargin - 1;
+
+      if (fs->wmargin < 0)
+        {
+          /* Truncate the line by overwriting the excess with the
+             newline and anything after it in the buffer.  */
+          if (nl < fs->p)
+            {
+              memmove (buf + (r - fs->point_col), nl, fs->p - nl);
+              fs->p -= buf + (r - fs->point_col) - nl;
+              /* Reset point for the next line and start scanning it.  */
+              fs->point_col = 0;
+              buf += r + 1; /* Skip full line plus \n. */
+            }
+          else
+            {
+              /* The buffer ends with a partial line that is beyond the
+                 maximum line width.  Advance point for the characters
+                 written, and discard those past the max from the buffer.  */
+              fs->point_col += len;
+              fs->p -= fs->point_col - r;
+              break;
+            }
+        }
+      else
+        {
+          /* Do word wrap.  Go to the column just past the maximum line
+             width and scan back for the beginning of the word there.
+             Then insert a line break.  */
+
+          char *p, *nextline;
+          int i;
+
+          p = buf + (r + 1 - fs->point_col);
+          while (p >= buf && !isblank ((unsigned char) *p))
+            --p;
+          nextline = p + 1;     /* This will begin the next line.  */
+
+          if (nextline > buf)
+            {
+              /* Swallow separating blanks.  */
+              if (p >= buf)
+                do
+                  --p;
+                while (p >= buf && isblank ((unsigned char) *p));
+              nl = p + 1;       /* The newline will replace the first blank. */
+            }
+          else
+            {
+              /* A single word that is greater than the maximum line width.
+                 Oh well.  Put it on an overlong line by itself.  */
+              p = buf + (r + 1 - fs->point_col);
+              /* Find the end of the long word.  */
+              if (p < nl)
+                do
+                  ++p;
+                while (p < nl && !isblank ((unsigned char) *p));
+              if (p == nl)
+                {
+                  /* It already ends a line.  No fussing required.  */
+                  fs->point_col = 0;
+                  buf = nl + 1;
+                  continue;
+                }
+              /* We will move the newline to replace the first blank.  */
+              nl = p;
+              /* Swallow separating blanks.  */
+              do
+                ++p;
+              while (isblank ((unsigned char) *p));
+              /* The next line will start here.  */
+              nextline = p;
+            }
+
+          /* Note: There are a bunch of tests below for
+             NEXTLINE == BUF + LEN + 1; this case is where NL happens to fall
+             at the end of the buffer, and NEXTLINE is in fact empty (and so
+             we need not be careful to maintain its contents).  */
+
+          if ((nextline == buf + len + 1
+               ? fs->end - nl < fs->wmargin + 1
+               : nextline - (nl + 1) < fs->wmargin)
+              && fs->p > nextline)
+            {
+              /* The margin needs more blanks than we removed.  */
+              if (fs->end - fs->p > fs->wmargin + 1)
+                /* Make some space for them.  */
+                {
+                  size_t mv = fs->p - nextline;
+                  memmove (nl + 1 + fs->wmargin, nextline, mv);
+                  nextline = nl + 1 + fs->wmargin;
+                  len = nextline + mv - buf;
+                  *nl++ = '\n';
+                }
+              else
+                /* Output the first line so we can use the space.  */
+                {
+#ifdef _LIBC
+                  __fxprintf (fs->stream, "%.*s\n",
+                              (int) (nl - fs->buf), fs->buf);
+#else
+                  if (nl > fs->buf)
+                    fwrite_unlocked (fs->buf, 1, nl - fs->buf, fs->stream);
+                  putc_unlocked ('\n', fs->stream);
+#endif
+
+                  len += buf - fs->buf;
+                  nl = buf = fs->buf;
+                }
+            }
+          else
+            /* We can fit the newline and blanks in before
+               the next word.  */
+            *nl++ = '\n';
+
+          if (nextline - nl >= fs->wmargin
+              || (nextline == buf + len + 1 && fs->end - nextline >= fs->wmargin))
+            /* Add blanks up to the wrap margin column.  */
+            for (i = 0; i < fs->wmargin; ++i)
+              *nl++ = ' ';
+          else
+            for (i = 0; i < fs->wmargin; ++i)
+#ifdef USE_IN_LIBIO
+              if (_IO_fwide (fs->stream, 0) > 0)
+                putwc_unlocked (L' ', fs->stream);
+              else
+#endif
+                putc_unlocked (' ', fs->stream);
+
+          /* Copy the tail of the original buffer into the current buffer
+             position.  */
+          if (nl < nextline)
+            memmove (nl, nextline, buf + len - nextline);
+          len -= nextline - buf;
+
+          /* Continue the scan on the remaining lines in the buffer.  */
+          buf = nl;
+
+          /* Restore bufp to include all the remaining text.  */
+          fs->p = nl + len;
+
+          /* Reset the counter of what has been output this line.  If wmargin
+             is 0, we want to avoid the lmargin getting added, so we set
+             point_col to a magic value of -1 in that case.  */
+          fs->point_col = fs->wmargin ? fs->wmargin : -1;
+        }
+    }
+
+  /* Remember that we've scanned as far as the end of the buffer.  */
+  fs->point_offs = fs->p - fs->buf;
+}
+
+/* Ensure that FS has space for AMOUNT more bytes in its buffer, either by
+   growing the buffer, or by flushing it.  True is returned iff we succeed. */
+int
+__argp_fmtstream_ensure (struct argp_fmtstream *fs, size_t amount)
+{
+  if ((size_t) (fs->end - fs->p) < amount)
+    {
+      ssize_t wrote;
+
+      /* Flush FS's buffer.  */
+      __argp_fmtstream_update (fs);
+
+#ifdef _LIBC
+      __fxprintf (fs->stream, "%.*s", (int) (fs->p - fs->buf), fs->buf);
+      wrote = fs->p - fs->buf;
+#else
+      wrote = fwrite_unlocked (fs->buf, 1, fs->p - fs->buf, fs->stream);
+#endif
+      if (wrote == fs->p - fs->buf)
+        {
+          fs->p = fs->buf;
+          fs->point_offs = 0;
+        }
+      else
+        {
+          fs->p -= wrote;
+          fs->point_offs -= wrote;
+          memmove (fs->buf, fs->buf + wrote, fs->p - fs->buf);
+          return 0;
+        }
+
+      if ((size_t) (fs->end - fs->buf) < amount)
+        /* Gotta grow the buffer.  */
+        {
+          size_t old_size = fs->end - fs->buf;
+          size_t new_size = old_size + amount;
+          char *new_buf;
+
+          if (new_size < old_size || ! (new_buf = realloc (fs->buf, new_size)))
+            {
+              __set_errno (ENOMEM);
+              return 0;
+            }
+
+          fs->buf = new_buf;
+          fs->end = new_buf + new_size;
+          fs->p = fs->buf;
+        }
+    }
+
+  return 1;
+}
+
+ssize_t
+__argp_fmtstream_printf (struct argp_fmtstream *fs, const char *fmt, ...)
+{
+  int out;
+  size_t avail;
+  size_t size_guess = PRINTF_SIZE_GUESS; /* How much space to reserve. */
+
+  do
+    {
+      va_list args;
+
+      if (! __argp_fmtstream_ensure (fs, size_guess))
+        return -1;
+
+      va_start (args, fmt);
+      avail = fs->end - fs->p;
+      out = __vsnprintf (fs->p, avail, fmt, args);
+      va_end (args);
+      if ((size_t) out >= avail)
+        size_guess = out + 1;
+    }
+  while ((size_t) out >= avail);
+
+  fs->p += out;
+
+  return out;
+}
+#if 0
+/* Not exported.  */
+#ifdef weak_alias
+weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf)
+#endif
+#endif
+
+#endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */
diff --git a/gnulib/argp-fmtstream.h b/gnulib/argp-fmtstream.h
new file mode 100644
index 000000000..b913d1b25
--- /dev/null
+++ b/gnulib/argp-fmtstream.h
@@ -0,0 +1,354 @@
+/* Word-wrapping and line-truncating streams.
+   Copyright (C) 1997, 2006-2010 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Written by Miles Bader <miles@gnu.ai.mit.edu>.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* This package emulates glibc `line_wrap_stream' semantics for systems that
+   don't have that.  If the system does have it, it is just a wrapper for
+   that.  This header file is only used internally while compiling argp, and
+   shouldn't be installed.  */
+
+#ifndef _ARGP_FMTSTREAM_H
+#define _ARGP_FMTSTREAM_H
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#ifndef __attribute__
+/* The __attribute__ feature is available in gcc versions 2.5 and later.
+   The __-protected variants of the attributes 'format' and 'printf' are
+   accepted by gcc versions 2.6.4 (effectively 2.7) and later.
+   We enable __attribute__ only if these are supported too, because
+   gnulib and libintl do '#define printf __printf__' when they override
+   the 'printf' function.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __attribute__(Spec)   /* empty */
+# endif
+#endif
+
+#if    (_LIBC - 0 && !defined (USE_IN_LIBIO)) \
+    || (defined (__GNU_LIBRARY__) && defined (HAVE_LINEWRAP_H))
+/* line_wrap_stream is available, so use that.  */
+#define ARGP_FMTSTREAM_USE_LINEWRAP
+#endif
+
+#ifdef ARGP_FMTSTREAM_USE_LINEWRAP
+/* Just be a simple wrapper for line_wrap_stream; the semantics are
+   *slightly* different, as line_wrap_stream doesn't actually make a new
+   object, it just modifies the given stream (reversibly) to do
+   line-wrapping.  Since we control who uses this code, it doesn't matter.  */
+
+#include <linewrap.h>
+
+typedef FILE *argp_fmtstream_t;
+
+#define argp_make_fmtstream line_wrap_stream
+#define __argp_make_fmtstream line_wrap_stream
+#define argp_fmtstream_free line_unwrap_stream
+#define __argp_fmtstream_free line_unwrap_stream
+
+#define __argp_fmtstream_putc(fs,ch) putc(ch,fs)
+#define argp_fmtstream_putc(fs,ch) putc(ch,fs)
+#define __argp_fmtstream_puts(fs,str) fputs(str,fs)
+#define argp_fmtstream_puts(fs,str) fputs(str,fs)
+#define __argp_fmtstream_write(fs,str,len) fwrite(str,1,len,fs)
+#define argp_fmtstream_write(fs,str,len) fwrite(str,1,len,fs)
+#define __argp_fmtstream_printf fprintf
+#define argp_fmtstream_printf fprintf
+
+#define __argp_fmtstream_lmargin line_wrap_lmargin
+#define argp_fmtstream_lmargin line_wrap_lmargin
+#define __argp_fmtstream_set_lmargin line_wrap_set_lmargin
+#define argp_fmtstream_set_lmargin line_wrap_set_lmargin
+#define __argp_fmtstream_rmargin line_wrap_rmargin
+#define argp_fmtstream_rmargin line_wrap_rmargin
+#define __argp_fmtstream_set_rmargin line_wrap_set_rmargin
+#define argp_fmtstream_set_rmargin line_wrap_set_rmargin
+#define __argp_fmtstream_wmargin line_wrap_wmargin
+#define argp_fmtstream_wmargin line_wrap_wmargin
+#define __argp_fmtstream_set_wmargin line_wrap_set_wmargin
+#define argp_fmtstream_set_wmargin line_wrap_set_wmargin
+#define __argp_fmtstream_point line_wrap_point
+#define argp_fmtstream_point line_wrap_point
+
+#else /* !ARGP_FMTSTREAM_USE_LINEWRAP */
+/* Guess we have to define our own version.  */
+
+struct argp_fmtstream
+{
+  FILE *stream;                 /* The stream we're outputting to.  */
+
+  size_t lmargin, rmargin;      /* Left and right margins.  */
+  ssize_t wmargin;              /* Margin to wrap to, or -1 to truncate.  */
+
+  /* Point in buffer to which we've processed for wrapping, but not output.  */
+  size_t point_offs;
+  /* Output column at POINT_OFFS, or -1 meaning 0 but don't add lmargin.  */
+  ssize_t point_col;
+
+  char *buf;                    /* Output buffer.  */
+  char *p;                      /* Current end of text in BUF. */
+  char *end;                    /* Absolute end of BUF.  */
+};
+
+typedef struct argp_fmtstream *argp_fmtstream_t;
+
+/* Return an argp_fmtstream that outputs to STREAM, and which prefixes lines
+   written on it with LMARGIN spaces and limits them to RMARGIN columns
+   total.  If WMARGIN >= 0, words that extend past RMARGIN are wrapped by
+   replacing the whitespace before them with a newline and WMARGIN spaces.
+   Otherwise, chars beyond RMARGIN are simply dropped until a newline.
+   Returns NULL if there was an error.  */
+extern argp_fmtstream_t __argp_make_fmtstream (FILE *__stream,
+                                               size_t __lmargin,
+                                               size_t __rmargin,
+                                               ssize_t __wmargin);
+extern argp_fmtstream_t argp_make_fmtstream (FILE *__stream,
+                                             size_t __lmargin,
+                                             size_t __rmargin,
+                                             ssize_t __wmargin);
+
+/* Flush __FS to its stream, and free it (but don't close the stream).  */
+extern void __argp_fmtstream_free (argp_fmtstream_t __fs);
+extern void argp_fmtstream_free (argp_fmtstream_t __fs);
+
+extern ssize_t __argp_fmtstream_printf (argp_fmtstream_t __fs,
+                                        const char *__fmt, ...)
+     __attribute__ ((__format__ (printf, 2, 3)));
+extern ssize_t argp_fmtstream_printf (argp_fmtstream_t __fs,
+                                      const char *__fmt, ...)
+     __attribute__ ((__format__ (printf, 2, 3)));
+
+#if _LIBC || !defined __OPTIMIZE__
+extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
+extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
+
+extern int __argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str);
+extern int argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str);
+
+extern size_t __argp_fmtstream_write (argp_fmtstream_t __fs,
+                                      const char *__str, size_t __len);
+extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
+                                    const char *__str, size_t __len);
+#endif
+
+/* Access macros for various bits of state.  */
+#define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin)
+#define argp_fmtstream_rmargin(__fs) ((__fs)->rmargin)
+#define argp_fmtstream_wmargin(__fs) ((__fs)->wmargin)
+#define __argp_fmtstream_lmargin argp_fmtstream_lmargin
+#define __argp_fmtstream_rmargin argp_fmtstream_rmargin
+#define __argp_fmtstream_wmargin argp_fmtstream_wmargin
+
+#if _LIBC || !defined __OPTIMIZE__
+/* Set __FS's left margin to LMARGIN and return the old value.  */
+extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
+                                          size_t __lmargin);
+extern size_t __argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
+                                            size_t __lmargin);
+
+/* Set __FS's right margin to __RMARGIN and return the old value.  */
+extern size_t argp_fmtstream_set_rmargin (argp_fmtstream_t __fs,
+                                          size_t __rmargin);
+extern size_t __argp_fmtstream_set_rmargin (argp_fmtstream_t __fs,
+                                            size_t __rmargin);
+
+/* Set __FS's wrap margin to __WMARGIN and return the old value.  */
+extern size_t argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
+                                          size_t __wmargin);
+extern size_t __argp_fmtstream_set_wmargin (argp_fmtstream_t __fs,
+                                            size_t __wmargin);
+
+/* Return the column number of the current output point in __FS.  */
+extern size_t argp_fmtstream_point (argp_fmtstream_t __fs);
+extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs);
+#endif
+
+/* Internal routines.  */
+extern void _argp_fmtstream_update (argp_fmtstream_t __fs);
+extern void __argp_fmtstream_update (argp_fmtstream_t __fs);
+extern int _argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
+extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
+
+#ifdef __OPTIMIZE__
+/* Inline versions of above routines.  */
+
+#if !_LIBC
+#define __argp_fmtstream_putc argp_fmtstream_putc
+#define __argp_fmtstream_puts argp_fmtstream_puts
+#define __argp_fmtstream_write argp_fmtstream_write
+#define __argp_fmtstream_set_lmargin argp_fmtstream_set_lmargin
+#define __argp_fmtstream_set_rmargin argp_fmtstream_set_rmargin
+#define __argp_fmtstream_set_wmargin argp_fmtstream_set_wmargin
+#define __argp_fmtstream_point argp_fmtstream_point
+#define __argp_fmtstream_update _argp_fmtstream_update
+#define __argp_fmtstream_ensure _argp_fmtstream_ensure
+#endif
+
+#ifndef ARGP_FS_EI
+# ifdef __GNUC__
+   /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+      inline semantics, unless -fgnu89-inline is used.  It defines a macro
+      __GNUC_STDC_INLINE__ to indicate this situation or a macro
+      __GNUC_GNU_INLINE__ to indicate the opposite situation.
+
+      GCC 4.2 with -std=c99 or -std=gnu99 implements the GNU C inline
+      semantics but warns, unless -fgnu89-inline is used:
+        warning: C99 inline functions are not supported; using GNU89
+        warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute
+      It defines a macro __GNUC_GNU_INLINE__ to indicate this situation.
+
+      Whereas Apple GCC 4.0.1 build 5479 without -std=c99 or -std=gnu99
+      implements the GNU C inline semantics and defines the macro
+      __GNUC_GNU_INLINE__, but it does not warn and does not support
+      __attribute__ ((__gnu_inline__)).
+
+      All in all, these are the possible combinations.  For every compiler,
+      we need to choose ARGP_FS_EI so that the corresponding table cell
+      contains an "ok".
+
+        \    ARGP_FS_EI                      inline   extern    extern
+          \                                           inline    inline
+      CC    \                                                   __attribute__
+                                                                ((gnu_inline))
+
+      gcc 4.3.0                              error    ok        ok
+      gcc 4.3.0 -std=gnu99 -fgnu89-inline    error    ok        ok
+      gcc 4.3.0 -std=gnu99                   ok       error     ok
+
+      gcc 4.2.2                              error    ok        ok
+      gcc 4.2.2 -std=gnu99 -fgnu89-inline    error    ok        ok
+      gcc 4.2.2 -std=gnu99                   error    warning   ok
+
+      gcc 4.1.2                              error    ok        warning
+      gcc 4.1.2 -std=gnu99                   error    ok        warning
+
+      Apple gcc 4.0.1                        error    ok        warning
+      Apple gcc 4.0.1 -std=gnu99             ok       error     warning
+    */
+#  if defined __GNUC_STDC_INLINE__
+#   define ARGP_FS_EI inline
+#  elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)
+#   define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__))
+#  else
+#   define ARGP_FS_EI extern inline
+#  endif
+# else
+   /* With other compilers, assume the ISO C99 meaning of 'inline', if
+      the compiler supports 'inline' at all.  */
+#  define ARGP_FS_EI inline
+# endif
+#endif
+
+ARGP_FS_EI size_t
+__argp_fmtstream_write (argp_fmtstream_t __fs,
+                        const char *__str, size_t __len)
+{
+  if (__fs->p + __len <= __fs->end || __argp_fmtstream_ensure (__fs, __len))
+    {
+      memcpy (__fs->p, __str, __len);
+      __fs->p += __len;
+      return __len;
+    }
+  else
+    return 0;
+}
+
+ARGP_FS_EI int
+__argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str)
+{
+  size_t __len = strlen (__str);
+  if (__len)
+    {
+      size_t __wrote = __argp_fmtstream_write (__fs, __str, __len);
+      return __wrote == __len ? 0 : -1;
+    }
+  else
+    return 0;
+}
+
+ARGP_FS_EI int
+__argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch)
+{
+  if (__fs->p < __fs->end || __argp_fmtstream_ensure (__fs, 1))
+    return *__fs->p++ = __ch;
+  else
+    return EOF;
+}
+
+/* Set __FS's left margin to __LMARGIN and return the old value.  */
+ARGP_FS_EI size_t
+__argp_fmtstream_set_lmargin (argp_fmtstream_t __fs, size_t __lmargin)
+{
+  size_t __old;
+  if ((size_t) (__fs->p - __fs->buf) > __fs->point_offs)
+    __argp_fmtstream_update (__fs);
+  __old = __fs->lmargin;
+  __fs->lmargin = __lmargin;
+  return __old;
+}
+
+/* Set __FS's right margin to __RMARGIN and return the old value.  */
+ARGP_FS_EI size_t
+__argp_fmtstream_set_rmargin (argp_fmtstream_t __fs, size_t __rmargin)
+{
+  size_t __old;
+  if ((size_t) (__fs->p - __fs->buf) > __fs->point_offs)
+    __argp_fmtstream_update (__fs);
+  __old = __fs->rmargin;
+  __fs->rmargin = __rmargin;
+  return __old;
+}
+
+/* Set FS's wrap margin to __WMARGIN and return the old value.  */
+ARGP_FS_EI size_t
+__argp_fmtstream_set_wmargin (argp_fmtstream_t __fs, size_t __wmargin)
+{
+  size_t __old;
+  if ((size_t) (__fs->p - __fs->buf) > __fs->point_offs)
+    __argp_fmtstream_update (__fs);
+  __old = __fs->wmargin;
+  __fs->wmargin = __wmargin;
+  return __old;
+}
+
+/* Return the column number of the current output point in __FS.  */
+ARGP_FS_EI size_t
+__argp_fmtstream_point (argp_fmtstream_t __fs)
+{
+  if ((size_t) (__fs->p - __fs->buf) > __fs->point_offs)
+    __argp_fmtstream_update (__fs);
+  return __fs->point_col >= 0 ? __fs->point_col : 0;
+}
+
+#if !_LIBC
+#undef __argp_fmtstream_putc
+#undef __argp_fmtstream_puts
+#undef __argp_fmtstream_write
+#undef __argp_fmtstream_set_lmargin
+#undef __argp_fmtstream_set_rmargin
+#undef __argp_fmtstream_set_wmargin
+#undef __argp_fmtstream_point
+#undef __argp_fmtstream_update
+#undef __argp_fmtstream_ensure
+#endif
+
+#endif /* __OPTIMIZE__ */
+
+#endif /* ARGP_FMTSTREAM_USE_LINEWRAP */
+
+#endif /* argp-fmtstream.h */
diff --git a/gnulib/argp-fs-xinl.c b/gnulib/argp-fs-xinl.c
new file mode 100644
index 000000000..2c683f914
--- /dev/null
+++ b/gnulib/argp-fs-xinl.c
@@ -0,0 +1,42 @@
+/* Real definitions for extern inline functions in argp-fmtstream.h
+   Copyright (C) 1997, 2003, 2004, 2009, 2010 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Written by Miles Bader <miles@gnu.ai.mit.edu>.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#define ARGP_FS_EI
+#undef __OPTIMIZE__
+#define __OPTIMIZE__ 1
+#include "argp-fmtstream.h"
+
+#if 0
+/* Not exported.  */
+/* Add weak aliases.  */
+#if _LIBC - 0 && !defined (ARGP_FMTSTREAM_USE_LINEWRAP) && defined (weak_alias)
+
+weak_alias (__argp_fmtstream_putc, argp_fmtstream_putc)
+weak_alias (__argp_fmtstream_puts, argp_fmtstream_puts)
+weak_alias (__argp_fmtstream_write, argp_fmtstream_write)
+weak_alias (__argp_fmtstream_set_lmargin, argp_fmtstream_set_lmargin)
+weak_alias (__argp_fmtstream_set_rmargin, argp_fmtstream_set_rmargin)
+weak_alias (__argp_fmtstream_set_wmargin, argp_fmtstream_set_wmargin)
+weak_alias (__argp_fmtstream_point, argp_fmtstream_point)
+
+#endif
+#endif
diff --git a/gnulib/argp-help.c b/gnulib/argp-help.c
new file mode 100644
index 000000000..5b6d950be
--- /dev/null
+++ b/gnulib/argp-help.c
@@ -0,0 +1,1951 @@
+/* Hierarchial argument parsing help output
+   Copyright (C) 1995-2005, 2007, 2009-2010 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Written by Miles Bader <miles@gnu.ai.mit.edu>.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE    1
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <alloca.h>
+#include <errno.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include <limits.h>
+#ifdef USE_IN_LIBIO
+# include <wchar.h>
+#endif
+
+#ifdef _LIBC
+# include <libintl.h>
+# undef dgettext
+# define dgettext(domain, msgid) \
+   INTUSE(__dcgettext) (domain, msgid, LC_MESSAGES)
+#else
+# include "gettext.h"
+#endif
+
+#include "argp.h"
+#include "argp-fmtstream.h"
+#include "argp-namefrob.h"
+
+#ifndef SIZE_MAX
+# define SIZE_MAX ((size_t) -1)
+#endif
+
+/* User-selectable (using an environment variable) formatting parameters.
+
+   These may be specified in an environment variable called `ARGP_HELP_FMT',
+   with a contents like:  VAR1=VAL1,VAR2=VAL2,BOOLVAR2,no-BOOLVAR2
+   Where VALn must be a positive integer.  The list of variables is in the
+   UPARAM_NAMES vector, below.  */
+
+/* Default parameters.  */
+#define DUP_ARGS      0         /* True if option argument can be duplicated. */
+#define DUP_ARGS_NOTE 1         /* True to print a note about duplicate args. */
+#define SHORT_OPT_COL 2         /* column in which short options start */
+#define LONG_OPT_COL  6         /* column in which long options start */
+#define DOC_OPT_COL   2         /* column in which doc options start */
+#define OPT_DOC_COL  29         /* column in which option text starts */
+#define HEADER_COL    1         /* column in which group headers are printed */
+#define USAGE_INDENT 12         /* indentation of wrapped usage lines */
+#define RMARGIN      79         /* right margin used for wrapping */
+
+/* User-selectable (using an environment variable) formatting parameters.
+   They must all be of type `int' for the parsing code to work.  */
+struct uparams
+{
+  /* If true, arguments for an option are shown with both short and long
+     options, even when a given option has both, e.g. `-x ARG, --longx=ARG'.
+     If false, then if an option has both, the argument is only shown with
+     the long one, e.g., `-x, --longx=ARG', and a message indicating that
+     this really means both is printed below the options.  */
+  int dup_args;
+
+  /* This is true if when DUP_ARGS is false, and some duplicate arguments have
+     been suppressed, an explanatory message should be printed.  */
+  int dup_args_note;
+
+  /* Various output columns.  */
+  int short_opt_col;      /* column in which short options start */
+  int long_opt_col;       /* column in which long options start */
+  int doc_opt_col;        /* column in which doc options start */
+  int opt_doc_col;        /* column in which option text starts */
+  int header_col;         /* column in which group headers are printed */
+  int usage_indent;       /* indentation of wrapped usage lines */
+  int rmargin;            /* right margin used for wrapping */
+
+  int valid;              /* True when the values in here are valid.  */
+};
+
+/* This is a global variable, as user options are only ever read once.  */
+static struct uparams uparams = {
+  DUP_ARGS, DUP_ARGS_NOTE,
+  SHORT_OPT_COL, LONG_OPT_COL, DOC_OPT_COL, OPT_DOC_COL, HEADER_COL,
+  USAGE_INDENT, RMARGIN,
+  0
+};
+
+/* A particular uparam, and what the user name is.  */
+struct uparam_name
+{
+  const char *name;             /* User name.  */
+  int is_bool;                  /* Whether it's `boolean'.  */
+  size_t uparams_offs;          /* Location of the (int) field in UPARAMS.  */
+};
+
+/* The name-field mappings we know about.  */
+static const struct uparam_name uparam_names[] =
+{
+  { "dup-args",       1, offsetof (struct uparams, dup_args) },
+  { "dup-args-note",  1, offsetof (struct uparams, dup_args_note) },
+  { "short-opt-col",  0, offsetof (struct uparams, short_opt_col) },
+  { "long-opt-col",   0, offsetof (struct uparams, long_opt_col) },
+  { "doc-opt-col",    0, offsetof (struct uparams, doc_opt_col) },
+  { "opt-doc-col",    0, offsetof (struct uparams, opt_doc_col) },
+  { "header-col",     0, offsetof (struct uparams, header_col) },
+  { "usage-indent",   0, offsetof (struct uparams, usage_indent) },
+  { "rmargin",        0, offsetof (struct uparams, rmargin) },
+  { 0 }
+};
+
+static void
+validate_uparams (const struct argp_state *state, struct uparams *upptr)
+{
+  const struct uparam_name *up;
+
+  for (up = uparam_names; up->name; up++)
+    {
+      if (up->is_bool
+          || up->uparams_offs == offsetof (struct uparams, rmargin))
+        continue;
+      if (*(int *)((char *)upptr + up->uparams_offs) >= upptr->rmargin)
+        {
+          __argp_failure (state, 0, 0,
+                          dgettext (state->root_argp->argp_domain,
+                                    "\
+ARGP_HELP_FMT: %s value is less than or equal to %s"),
+                          "rmargin", up->name);
+          return;
+        }
+    }
+  uparams = *upptr;
+  uparams.valid = 1;
+}
+
+/* Read user options from the environment, and fill in UPARAMS appropiately. */
+static void
+fill_in_uparams (const struct argp_state *state)
+{
+  const char *var = getenv ("ARGP_HELP_FMT");
+  struct uparams new_params = uparams;
+
+#define SKIPWS(p) do { while (isspace ((unsigned char) *p)) p++; } while (0);
+
+  if (var)
+    {
+      /* Parse var. */
+      while (*var)
+        {
+          SKIPWS (var);
+
+          if (isalpha ((unsigned char) *var))
+            {
+              size_t var_len;
+              const struct uparam_name *un;
+              int unspec = 0, val = 0;
+              const char *arg = var;
+
+              while (isalnum ((unsigned char) *arg) || *arg == '-' || *arg == '_')
+                arg++;
+              var_len = arg - var;
+
+              SKIPWS (arg);
+
+              if (*arg == '\0' || *arg == ',')
+                unspec = 1;
+              else if (*arg == '=')
+                {
+                  arg++;
+                  SKIPWS (arg);
+                }
+
+              if (unspec)
+                {
+                  if (var[0] == 'n' && var[1] == 'o' && var[2] == '-')
+                    {
+                      val = 0;
+                      var += 3;
+                      var_len -= 3;
+                    }
+                  else
+                    val = 1;
+                }
+              else if (isdigit ((unsigned char) *arg))
+                {
+                  val = atoi (arg);
+                  while (isdigit ((unsigned char) *arg))
+                    arg++;
+                  SKIPWS (arg);
+                }
+
+              for (un = uparam_names; un->name; un++)
+                if (strlen (un->name) == var_len
+                    && strncmp (var, un->name, var_len) == 0)
+                  {
+                    if (unspec && !un->is_bool)
+                      __argp_failure (state, 0, 0,
+                                      dgettext (state->root_argp->argp_domain,
+                                                "\
+%.*s: ARGP_HELP_FMT parameter requires a value"),
+                                      (int) var_len, var);
+                    else if (val < 0)
+                      __argp_failure (state, 0, 0,
+                                      dgettext (state->root_argp->argp_domain,
+                                                "\
+%.*s: ARGP_HELP_FMT parameter must be positive"),
+                                      (int) var_len, var);
+                    else
+                      *(int *)((char *)&new_params + un->uparams_offs) = val;
+                    break;
+                  }
+              if (! un->name)
+                __argp_failure (state, 0, 0,
+                                dgettext (state->root_argp->argp_domain, "\
+%.*s: Unknown ARGP_HELP_FMT parameter"),
+                                (int) var_len, var);
+
+              var = arg;
+              if (*var == ',')
+                var++;
+            }
+          else if (*var)
+            {
+              __argp_failure (state, 0, 0,
+                              dgettext (state->root_argp->argp_domain,
+                                        "Garbage in ARGP_HELP_FMT: %s"), var);
+              break;
+            }
+        }
+      validate_uparams (state, &new_params);
+    }
+}
+
+/* Returns true if OPT hasn't been marked invisible.  Visibility only affects
+   whether OPT is displayed or used in sorting, not option shadowing.  */
+#define ovisible(opt) (! ((opt)->flags & OPTION_HIDDEN))
+
+/* Returns true if OPT is an alias for an earlier option.  */
+#define oalias(opt) ((opt)->flags & OPTION_ALIAS)
+
+/* Returns true if OPT is an documentation-only entry.  */
+#define odoc(opt) ((opt)->flags & OPTION_DOC)
+
+/* Returns true if OPT should not be translated */
+#define onotrans(opt) ((opt)->flags & OPTION_NO_TRANS)
+
+/* Returns true if OPT is the end-of-list marker for a list of options.  */
+#define oend(opt) __option_is_end (opt)
+
+/* Returns true if OPT has a short option.  */
+#define oshort(opt) __option_is_short (opt)
+
+/*
+   The help format for a particular option is like:
+
+     -xARG, -yARG, --long1=ARG, --long2=ARG        Documentation...
+
+   Where ARG will be omitted if there's no argument, for this option, or
+   will be surrounded by "[" and "]" appropiately if the argument is
+   optional.  The documentation string is word-wrapped appropiately, and if
+   the list of options is long enough, it will be started on a separate line.
+   If there are no short options for a given option, the first long option is
+   indented slighly in a way that's supposed to make most long options appear
+   to be in a separate column.
+
+   For example, the following output (from ps):
+
+     -p PID, --pid=PID          List the process PID
+         --pgrp=PGRP            List processes in the process group PGRP
+     -P, -x, --no-parent        Include processes without parents
+     -Q, --all-fields           Don't elide unusable fields (normally if there's
+                                some reason ps can't print a field for any
+                                process, it's removed from the output entirely)
+     -r, --reverse, --gratuitously-long-reverse-option
+                                Reverse the order of any sort
+         --session[=SID]        Add the processes from the session SID (which
+                                defaults to the sid of the current process)
+
+    Here are some more options:
+     -f ZOT, --foonly=ZOT       Glork a foonly
+     -z, --zaza                 Snit a zar
+
+     -?, --help                 Give this help list
+         --usage                Give a short usage message
+     -V, --version              Print program version
+
+   The struct argp_option array for the above could look like:
+
+   {
+     {"pid",       'p',      "PID",  0, "List the process PID"},
+     {"pgrp",      OPT_PGRP, "PGRP", 0, "List processes in the process group PGRP"},
+     {"no-parent", 'P',       0,     0, "Include processes without parents"},
+     {0,           'x',       0,     OPTION_ALIAS},
+     {"all-fields",'Q',       0,     0, "Don't elide unusable fields (normally"
+                                        " if there's some reason ps can't"
+                                        " print a field for any process, it's"
+                                        " removed from the output entirely)" },
+     {"reverse",   'r',       0,     0, "Reverse the order of any sort"},
+     {"gratuitously-long-reverse-option", 0, 0, OPTION_ALIAS},
+     {"session",   OPT_SESS,  "SID", OPTION_ARG_OPTIONAL,
+                                        "Add the processes from the session"
+                                        " SID (which defaults to the sid of"
+                                        " the current process)" },
+
+     {0,0,0,0, "Here are some more options:"},
+     {"foonly", 'f', "ZOT", 0, "Glork a foonly"},
+     {"zaza", 'z', 0, 0, "Snit a zar"},
+
+     {0}
+   }
+
+   Note that the last three options are automatically supplied by argp_parse,
+   unless you tell it not to with ARGP_NO_HELP.
+
+*/
+
+/* Returns true if CH occurs between BEG and END.  */
+static int
+find_char (char ch, char *beg, char *end)
+{
+  while (beg < end)
+    if (*beg == ch)
+      return 1;
+    else
+      beg++;
+  return 0;
+}
+
+struct hol_cluster;             /* fwd decl */
+
+struct hol_entry
+{
+  /* First option.  */
+  const struct argp_option *opt;
+  /* Number of options (including aliases).  */
+  unsigned num;
+
+  /* A pointers into the HOL's short_options field, to the first short option
+     letter for this entry.  The order of the characters following this point
+     corresponds to the order of options pointed to by OPT, and there are at
+     most NUM.  A short option recorded in a option following OPT is only
+     valid if it occurs in the right place in SHORT_OPTIONS (otherwise it's
+     probably been shadowed by some other entry).  */
+  char *short_options;
+
+  /* Entries are sorted by their group first, in the order:
+       1, 2, ..., n, 0, -m, ..., -2, -1
+     and then alphabetically within each group.  The default is 0.  */
+  int group;
+
+  /* The cluster of options this entry belongs to, or 0 if none.  */
+  struct hol_cluster *cluster;
+
+  /* The argp from which this option came.  */
+  const struct argp *argp;
+
+  /* Position in the array */
+  unsigned ord;
+};
+
+/* A cluster of entries to reflect the argp tree structure.  */
+struct hol_cluster
+{
+  /* A descriptive header printed before options in this cluster.  */
+  const char *header;
+
+  /* Used to order clusters within the same group with the same parent,
+     according to the order in which they occurred in the parent argp's child
+     list.  */
+  int index;
+
+  /* How to sort this cluster with respect to options and other clusters at the
+     same depth (clusters always follow options in the same group).  */
+  int group;
+
+  /* The cluster to which this cluster belongs, or 0 if it's at the base
+     level.  */
+  struct hol_cluster *parent;
+
+  /* The argp from which this cluster is (eventually) derived.  */
+  const struct argp *argp;
+
+  /* The distance this cluster is from the root.  */
+  int depth;
+
+  /* Clusters in a given hol are kept in a linked list, to make freeing them
+     possible.  */
+  struct hol_cluster *next;
+};
+
+/* A list of options for help.  */
+struct hol
+{
+  /* An array of hol_entry's.  */
+  struct hol_entry *entries;
+  /* The number of entries in this hol.  If this field is zero, the others
+     are undefined.  */
+  unsigned num_entries;
+
+  /* A string containing all short options in this HOL.  Each entry contains
+     pointers into this string, so the order can't be messed with blindly.  */
+  char *short_options;
+
+  /* Clusters of entries in this hol.  */
+  struct hol_cluster *clusters;
+};
+
+/* Create a struct hol from the options in ARGP.  CLUSTER is the
+   hol_cluster in which these entries occur, or 0, if at the root.  */
+static struct hol *
+make_hol (const struct argp *argp, struct hol_cluster *cluster)
+{
+  char *so;
+  const struct argp_option *o;
+  const struct argp_option *opts = argp->options;
+  struct hol_entry *entry;
+  unsigned num_short_options = 0;
+  struct hol *hol = malloc (sizeof (struct hol));
+
+  assert (hol);
+
+  hol->num_entries = 0;
+  hol->clusters = 0;
+
+  if (opts)
+    {
+      int cur_group = 0;
+
+      /* The first option must not be an alias.  */
+      assert (! oalias (opts));
+
+      /* Calculate the space needed.  */
+      for (o = opts; ! oend (o); o++)
+        {
+          if (! oalias (o))
+            hol->num_entries++;
+          if (oshort (o))
+            num_short_options++;        /* This is an upper bound.  */
+        }
+
+      hol->entries = malloc (sizeof (struct hol_entry) * hol->num_entries);
+      hol->short_options = malloc (num_short_options + 1);
+
+      assert (hol->entries && hol->short_options);
+      if (SIZE_MAX <= UINT_MAX)
+        assert (hol->num_entries <= SIZE_MAX / sizeof (struct hol_entry));
+
+      /* Fill in the entries.  */
+      so = hol->short_options;
+      for (o = opts, entry = hol->entries; ! oend (o); entry++)
+        {
+          entry->opt = o;
+          entry->num = 0;
+          entry->short_options = so;
+          entry->group = cur_group =
+            o->group
+            ? o->group
+            : ((!o->name && !o->key)
+               ? cur_group + 1
+               : cur_group);
+          entry->cluster = cluster;
+          entry->argp = argp;
+
+          do
+            {
+              entry->num++;
+              if (oshort (o) && ! find_char (o->key, hol->short_options, so))
+                /* O has a valid short option which hasn't already been used.*/
+                *so++ = o->key;
+              o++;
+            }
+          while (! oend (o) && oalias (o));
+        }
+      *so = '\0';               /* null terminated so we can find the length */
+    }
+
+  return hol;
+}
+
+/* Add a new cluster to HOL, with the given GROUP and HEADER (taken from the
+   associated argp child list entry), INDEX, and PARENT, and return a pointer
+   to it.  ARGP is the argp that this cluster results from.  */
+static struct hol_cluster *
+hol_add_cluster (struct hol *hol, int group, const char *header, int index,
+                 struct hol_cluster *parent, const struct argp *argp)
+{
+  struct hol_cluster *cl = malloc (sizeof (struct hol_cluster));
+  if (cl)
+    {
+      cl->group = group;
+      cl->header = header;
+
+      cl->index = index;
+      cl->parent = parent;
+      cl->argp = argp;
+      cl->depth = parent ? parent->depth + 1 : 0;
+
+      cl->next = hol->clusters;
+      hol->clusters = cl;
+    }
+  return cl;
+}
+
+/* Free HOL and any resources it uses.  */
+static void
+hol_free (struct hol *hol)
+{
+  struct hol_cluster *cl = hol->clusters;
+
+  while (cl)
+    {
+      struct hol_cluster *next = cl->next;
+      free (cl);
+      cl = next;
+    }
+
+  if (hol->num_entries > 0)
+    {
+      free (hol->entries);
+      free (hol->short_options);
+    }
+
+  free (hol);
+}
+
+static int
+hol_entry_short_iterate (const struct hol_entry *entry,
+                         int (*func)(const struct argp_option *opt,
+                                     const struct argp_option *real,
+                                     const char *domain, void *cookie),
+                         const char *domain, void *cookie)
+{
+  unsigned nopts;
+  int val = 0;
+  const struct argp_option *opt, *real = entry->opt;
+  char *so = entry->short_options;
+
+  for (opt = real, nopts = entry->num; nopts > 0 && !val; opt++, nopts--)
+    if (oshort (opt) && *so == opt->key)
+      {
+        if (!oalias (opt))
+          real = opt;
+        if (ovisible (opt))
+          val = (*func)(opt, real, domain, cookie);
+        so++;
+      }
+
+  return val;
+}
+
+static inline int
+__attribute__ ((always_inline))
+hol_entry_long_iterate (const struct hol_entry *entry,
+                        int (*func)(const struct argp_option *opt,
+                                    const struct argp_option *real,
+                                    const char *domain, void *cookie),
+                        const char *domain, void *cookie)
+{
+  unsigned nopts;
+  int val = 0;
+  const struct argp_option *opt, *real = entry->opt;
+
+  for (opt = real, nopts = entry->num; nopts > 0 && !val; opt++, nopts--)
+    if (opt->name)
+      {
+        if (!oalias (opt))
+          real = opt;
+        if (ovisible (opt))
+          val = (*func)(opt, real, domain, cookie);
+      }
+
+  return val;
+}
+
+/* Iterator that returns true for the first short option.  */
+static int
+until_short (const struct argp_option *opt, const struct argp_option *real,
+             const char *domain, void *cookie)
+{
+  return oshort (opt) ? opt->key : 0;
+}
+
+/* Returns the first valid short option in ENTRY, or 0 if there is none.  */
+static char
+hol_entry_first_short (const struct hol_entry *entry)
+{
+  return hol_entry_short_iterate (entry, until_short,
+                                  entry->argp->argp_domain, 0);
+}
+
+/* Returns the first valid long option in ENTRY, or 0 if there is none.  */
+static const char *
+hol_entry_first_long (const struct hol_entry *entry)
+{
+  const struct argp_option *opt;
+  unsigned num;
+  for (opt = entry->opt, num = entry->num; num > 0; opt++, num--)
+    if (opt->name && ovisible (opt))
+      return opt->name;
+  return 0;
+}
+
+/* Returns the entry in HOL with the long option name NAME, or 0 if there is
+   none.  */
+static struct hol_entry *
+hol_find_entry (struct hol *hol, const char *name)
+{
+  struct hol_entry *entry = hol->entries;
+  unsigned num_entries = hol->num_entries;
+
+  while (num_entries-- > 0)
+    {
+      const struct argp_option *opt = entry->opt;
+      unsigned num_opts = entry->num;
+
+      while (num_opts-- > 0)
+        if (opt->name && ovisible (opt) && strcmp (opt->name, name) == 0)
+          return entry;
+        else
+          opt++;
+
+      entry++;
+    }
+
+  return 0;
+}
+
+/* If an entry with the long option NAME occurs in HOL, set it's special
+   sort position to GROUP.  */
+static void
+hol_set_group (struct hol *hol, const char *name, int group)
+{
+  struct hol_entry *entry = hol_find_entry (hol, name);
+  if (entry)
+    entry->group = group;
+}
+
+/* Order by group:  0, 1, 2, ..., n, -m, ..., -2, -1.
+   EQ is what to return if GROUP1 and GROUP2 are the same.  */
+static int
+group_cmp (int group1, int group2, int eq)
+{
+  if (group1 == group2)
+    return eq;
+  else if ((group1 < 0 && group2 < 0) || (group1 >= 0 && group2 >= 0))
+    return group1 - group2;
+  else
+    return group2 - group1;
+}
+
+/* Compare clusters CL1 & CL2 by the order that they should appear in
+   output.  */
+static int
+hol_cluster_cmp (const struct hol_cluster *cl1, const struct hol_cluster *cl2)
+{
+  /* If one cluster is deeper than the other, use its ancestor at the same
+     level, so that finding the common ancestor is straightforward.
+
+     clN->depth > 0 means that clN->parent != NULL (see hol_add_cluster) */
+  while (cl1->depth > cl2->depth)
+    cl1 = cl1->parent;
+  while (cl2->depth > cl1->depth)
+    cl2 = cl2->parent;
+
+  /* Now reduce both clusters to their ancestors at the point where both have
+     a common parent; these can be directly compared.  */
+  while (cl1->parent != cl2->parent)
+    cl1 = cl1->parent, cl2 = cl2->parent;
+
+  return group_cmp (cl1->group, cl2->group, cl2->index - cl1->index);
+}
+
+/* Return the ancestor of CL that's just below the root (i.e., has a parent
+   of 0).  */
+static struct hol_cluster *
+hol_cluster_base (struct hol_cluster *cl)
+{
+  while (cl->parent)
+    cl = cl->parent;
+  return cl;
+}
+
+/* Return true if CL1 is a child of CL2.  */
+static int
+hol_cluster_is_child (const struct hol_cluster *cl1,
+                      const struct hol_cluster *cl2)
+{
+  while (cl1 && cl1 != cl2)
+    cl1 = cl1->parent;
+  return cl1 == cl2;
+}
+
+/* Given the name of a OPTION_DOC option, modifies NAME to start at the tail
+   that should be used for comparisons, and returns true iff it should be
+   treated as a non-option.  */
+static int
+canon_doc_option (const char **name)
+{
+  int non_opt;
+
+  if (!*name)
+    non_opt = 1;
+  else
+    {
+      /* Skip initial whitespace.  */
+      while (isspace ((unsigned char) **name))
+        (*name)++;
+      /* Decide whether this looks like an option (leading `-') or not.  */
+      non_opt = (**name != '-');
+      /* Skip until part of name used for sorting.  */
+      while (**name && !isalnum ((unsigned char) **name))
+        (*name)++;
+    }
+  return non_opt;
+}
+
+#define HOL_ENTRY_PTRCMP(a,b) ((a)->ord < (b)->ord ? -1 : 1)
+
+/* Order ENTRY1 & ENTRY2 by the order which they should appear in a help
+   listing.  */
+static int
+hol_entry_cmp (const struct hol_entry *entry1,
+               const struct hol_entry *entry2)
+{
+  /* The group numbers by which the entries should be ordered; if either is
+     in a cluster, then this is just the group within the cluster.  */
+  int group1 = entry1->group, group2 = entry2->group;
+  int rc;
+
+  if (entry1->cluster != entry2->cluster)
+    {
+      /* The entries are not within the same cluster, so we can't compare them
+         directly, we have to use the appropiate clustering level too.  */
+      if (! entry1->cluster)
+        /* ENTRY1 is at the `base level', not in a cluster, so we have to
+           compare it's group number with that of the base cluster in which
+           ENTRY2 resides.  Note that if they're in the same group, the
+           clustered option always comes laster.  */
+        return group_cmp (group1, hol_cluster_base (entry2->cluster)->group, -1);
+      else if (! entry2->cluster)
+        /* Likewise, but ENTRY2's not in a cluster.  */
+        return group_cmp (hol_cluster_base (entry1->cluster)->group, group2, 1);
+      else
+        /* Both entries are in clusters, we can just compare the clusters.  */
+        return (rc = hol_cluster_cmp (entry1->cluster, entry2->cluster)) ?
+               rc : HOL_ENTRY_PTRCMP (entry1, entry2);
+    }
+  else if (group1 == group2)
+    /* The entries are both in the same cluster and group, so compare them
+       alphabetically.  */
+    {
+      int short1 = hol_entry_first_short (entry1);
+      int short2 = hol_entry_first_short (entry2);
+      int doc1 = odoc (entry1->opt);
+      int doc2 = odoc (entry2->opt);
+      const char *long1 = hol_entry_first_long (entry1);
+      const char *long2 = hol_entry_first_long (entry2);
+
+      if (doc1)
+        doc1 = canon_doc_option (&long1);
+      if (doc2)
+        doc2 = canon_doc_option (&long2);
+
+      if (doc1 != doc2)
+        /* `documentation' options always follow normal options (or
+           documentation options that *look* like normal options).  */
+        return doc1 - doc2;
+      else if (!short1 && !short2 && long1 && long2)
+        /* Only long options.  */
+        return (rc = __strcasecmp (long1, long2)) ?
+               rc : HOL_ENTRY_PTRCMP (entry1, entry2);
+      else
+        /* Compare short/short, long/short, short/long, using the first
+           character of long options.  Entries without *any* valid
+           options (such as options with OPTION_HIDDEN set) will be put
+           first, but as they're not displayed, it doesn't matter where
+           they are.  */
+        {
+          unsigned char first1 = short1 ? short1 : long1 ? *long1 : 0;
+          unsigned char first2 = short2 ? short2 : long2 ? *long2 : 0;
+          /* Use tolower, not _tolower, since only the former is
+             guaranteed to work on something already lower case.  */
+          int lower_cmp = tolower (first1) - tolower (first2);
+          /* Compare ignoring case, except when the options are both the
+             same letter, in which case lower-case always comes first.  */
+          return lower_cmp ? lower_cmp :
+                 (rc = first2 - first1) ?
+                 rc : HOL_ENTRY_PTRCMP (entry1, entry2);
+        }
+    }
+  else
+    /* Within the same cluster, but not the same group, so just compare
+       groups.  */
+    return group_cmp (group1, group2, HOL_ENTRY_PTRCMP (entry1, entry2));
+}
+
+/* Version of hol_entry_cmp with correct signature for qsort.  */
+static int
+hol_entry_qcmp (const void *entry1_v, const void *entry2_v)
+{
+  return hol_entry_cmp (entry1_v, entry2_v);
+}
+
+/* Sort HOL by group and alphabetically by option name (with short options
+   taking precedence over long).  Since the sorting is for display purposes
+   only, the shadowing of options isn't effected.  */
+static void
+hol_sort (struct hol *hol)
+{
+  if (hol->num_entries > 0)
+    {
+      unsigned i;
+      struct hol_entry *e;
+      for (i = 0, e = hol->entries; i < hol->num_entries; i++, e++)
+        e->ord = i;
+      qsort (hol->entries, hol->num_entries, sizeof (struct hol_entry),
+             hol_entry_qcmp);
+    }
+}
+
+/* Append MORE to HOL, destroying MORE in the process.  Options in HOL shadow
+   any in MORE with the same name.  */
+static void
+hol_append (struct hol *hol, struct hol *more)
+{
+  struct hol_cluster **cl_end = &hol->clusters;
+
+  /* Steal MORE's cluster list, and add it to the end of HOL's.  */
+  while (*cl_end)
+    cl_end = &(*cl_end)->next;
+  *cl_end = more->clusters;
+  more->clusters = 0;
+
+  /* Merge entries.  */
+  if (more->num_entries > 0)
+    {
+      if (hol->num_entries == 0)
+        {
+          hol->num_entries = more->num_entries;
+          hol->entries = more->entries;
+          hol->short_options = more->short_options;
+          more->num_entries = 0;        /* Mark MORE's fields as invalid.  */
+        }
+      else
+        /* Append the entries in MORE to those in HOL, taking care to only add
+           non-shadowed SHORT_OPTIONS values.  */
+        {
+          unsigned left;
+          char *so, *more_so;
+          struct hol_entry *e;
+          unsigned num_entries = hol->num_entries + more->num_entries;
+          struct hol_entry *entries =
+            malloc (num_entries * sizeof (struct hol_entry));
+          unsigned hol_so_len = strlen (hol->short_options);
+          char *short_options =
+            malloc (hol_so_len + strlen (more->short_options) + 1);
+
+          assert (entries && short_options);
+          if (SIZE_MAX <= UINT_MAX)
+            assert (num_entries <= SIZE_MAX / sizeof (struct hol_entry));
+
+          __mempcpy (__mempcpy (entries, hol->entries,
+                                hol->num_entries * sizeof (struct hol_entry)),
+                     more->entries,
+                     more->num_entries * sizeof (struct hol_entry));
+
+          __mempcpy (short_options, hol->short_options, hol_so_len);
+
+          /* Fix up the short options pointers from HOL.  */
+          for (e = entries, left = hol->num_entries; left > 0; e++, left--)
+            e->short_options += (short_options - hol->short_options);
+
+          /* Now add the short options from MORE, fixing up its entries
+             too.  */
+          so = short_options + hol_so_len;
+          more_so = more->short_options;
+          for (left = more->num_entries; left > 0; e++, left--)
+            {
+              int opts_left;
+              const struct argp_option *opt;
+
+              e->short_options = so;
+
+              for (opts_left = e->num, opt = e->opt; opts_left; opt++, opts_left--)
+                {
+                  int ch = *more_so;
+                  if (oshort (opt) && ch == opt->key)
+                    /* The next short option in MORE_SO, CH, is from OPT.  */
+                    {
+                      if (! find_char (ch, short_options,
+                                       short_options + hol_so_len))
+                        /* The short option CH isn't shadowed by HOL's options,
+                           so add it to the sum.  */
+                        *so++ = ch;
+                      more_so++;
+                    }
+                }
+            }
+
+          *so = '\0';
+
+          free (hol->entries);
+          free (hol->short_options);
+
+          hol->entries = entries;
+          hol->num_entries = num_entries;
+          hol->short_options = short_options;
+        }
+    }
+
+  hol_free (more);
+}
+
+/* Inserts enough spaces to make sure STREAM is at column COL.  */
+static void
+indent_to (argp_fmtstream_t stream, unsigned col)
+{
+  int needed = col - __argp_fmtstream_point (stream);
+  while (needed-- > 0)
+    __argp_fmtstream_putc (stream, ' ');
+}
+
+/* Output to STREAM either a space, or a newline if there isn't room for at
+   least ENSURE characters before the right margin.  */
+static void
+space (argp_fmtstream_t stream, size_t ensure)
+{
+  if (__argp_fmtstream_point (stream) + ensure
+      >= __argp_fmtstream_rmargin (stream))
+    __argp_fmtstream_putc (stream, '\n');
+  else
+    __argp_fmtstream_putc (stream, ' ');
+}
+
+/* If the option REAL has an argument, we print it in using the printf
+   format REQ_FMT or OPT_FMT depending on whether it's a required or
+   optional argument.  */
+static void
+arg (const struct argp_option *real, const char *req_fmt, const char *opt_fmt,
+     const char *domain, argp_fmtstream_t stream)
+{
+  if (real->arg)
+    {
+      if (real->flags & OPTION_ARG_OPTIONAL)
+        __argp_fmtstream_printf (stream, opt_fmt,
+                                 dgettext (domain, real->arg));
+      else
+        __argp_fmtstream_printf (stream, req_fmt,
+                                 dgettext (domain, real->arg));
+    }
+}
+
+/* Helper functions for hol_entry_help.  */
+
+/* State used during the execution of hol_help.  */
+struct hol_help_state
+{
+  /* PREV_ENTRY should contain the previous entry printed, or 0.  */
+  struct hol_entry *prev_entry;
+
+  /* If an entry is in a different group from the previous one, and SEP_GROUPS
+     is true, then a blank line will be printed before any output. */
+  int sep_groups;
+
+  /* True if a duplicate option argument was suppressed (only ever set if
+     UPARAMS.dup_args is false).  */
+  int suppressed_dup_arg;
+};
+
+/* Some state used while printing a help entry (used to communicate with
+   helper functions).  See the doc for hol_entry_help for more info, as most
+   of the fields are copied from its arguments.  */
+struct pentry_state
+{
+  const struct hol_entry *entry;
+  argp_fmtstream_t stream;
+  struct hol_help_state *hhstate;
+
+  /* True if nothing's been printed so far.  */
+  int first;
+
+  /* If non-zero, the state that was used to print this help.  */
+  const struct argp_state *state;
+};
+
+/* If a user doc filter should be applied to DOC, do so.  */
+static const char *
+filter_doc (const char *doc, int key, const struct argp *argp,
+            const struct argp_state *state)
+{
+  if (argp->help_filter)
+    /* We must apply a user filter to this output.  */
+    {
+      void *input = __argp_input (argp, state);
+      return (*argp->help_filter) (key, doc, input);
+    }
+  else
+    /* No filter.  */
+    return doc;
+}
+
+/* Prints STR as a header line, with the margin lines set appropiately, and
+   notes the fact that groups should be separated with a blank line.  ARGP is
+   the argp that should dictate any user doc filtering to take place.  Note
+   that the previous wrap margin isn't restored, but the left margin is reset
+   to 0.  */
+static void
+print_header (const char *str, const struct argp *argp,
+              struct pentry_state *pest)
+{
+  const char *tstr = dgettext (argp->argp_domain, str);
+  const char *fstr = filter_doc (tstr, ARGP_KEY_HELP_HEADER, argp, pest->state);
+
+  if (fstr)
+    {
+      if (*fstr)
+        {
+          if (pest->hhstate->prev_entry)
+            /* Precede with a blank line.  */
+            __argp_fmtstream_putc (pest->stream, '\n');
+          indent_to (pest->stream, uparams.header_col);
+          __argp_fmtstream_set_lmargin (pest->stream, uparams.header_col);
+          __argp_fmtstream_set_wmargin (pest->stream, uparams.header_col);
+          __argp_fmtstream_puts (pest->stream, fstr);
+          __argp_fmtstream_set_lmargin (pest->stream, 0);
+          __argp_fmtstream_putc (pest->stream, '\n');
+        }
+
+      pest->hhstate->sep_groups = 1; /* Separate subsequent groups. */
+    }
+
+  if (fstr != tstr)
+    free ((char *) fstr);
+}
+
+/* Inserts a comma if this isn't the first item on the line, and then makes
+   sure we're at least to column COL.  If this *is* the first item on a line,
+   prints any pending whitespace/headers that should precede this line. Also
+   clears FIRST.  */
+static void
+comma (unsigned col, struct pentry_state *pest)
+{
+  if (pest->first)
+    {
+      const struct hol_entry *pe = pest->hhstate->prev_entry;
+      const struct hol_cluster *cl = pest->entry->cluster;
+
+      if (pest->hhstate->sep_groups && pe && pest->entry->group != pe->group)
+        __argp_fmtstream_putc (pest->stream, '\n');
+
+      if (cl && cl->header && *cl->header
+          && (!pe
+              || (pe->cluster != cl
+                  && !hol_cluster_is_child (pe->cluster, cl))))
+        /* If we're changing clusters, then this must be the start of the
+           ENTRY's cluster unless that is an ancestor of the previous one
+           (in which case we had just popped into a sub-cluster for a bit).
+           If so, then print the cluster's header line.  */
+        {
+          int old_wm = __argp_fmtstream_wmargin (pest->stream);
+          print_header (cl->header, cl->argp, pest);
+          __argp_fmtstream_set_wmargin (pest->stream, old_wm);
+        }
+
+      pest->first = 0;
+    }
+  else
+    __argp_fmtstream_puts (pest->stream, ", ");
+
+  indent_to (pest->stream, col);
+}
+
+/* Print help for ENTRY to STREAM.  */
+static void
+hol_entry_help (struct hol_entry *entry, const struct argp_state *state,
+                argp_fmtstream_t stream, struct hol_help_state *hhstate)
+{
+  unsigned num;
+  const struct argp_option *real = entry->opt, *opt;
+  char *so = entry->short_options;
+  int have_long_opt = 0;        /* We have any long options.  */
+  /* Saved margins.  */
+  int old_lm = __argp_fmtstream_set_lmargin (stream, 0);
+  int old_wm = __argp_fmtstream_wmargin (stream);
+  /* PEST is a state block holding some of our variables that we'd like to
+     share with helper functions.  */
+  struct pentry_state pest;
+
+  pest.entry = entry;
+  pest.stream = stream;
+  pest.hhstate = hhstate;
+  pest.first = 1;
+  pest.state = state;
+
+  if (! odoc (real))
+    for (opt = real, num = entry->num; num > 0; opt++, num--)
+      if (opt->name && ovisible (opt))
+        {
+          have_long_opt = 1;
+          break;
+        }
+
+  /* First emit short options.  */
+  __argp_fmtstream_set_wmargin (stream, uparams.short_opt_col); /* For truly bizarre cases. */
+  for (opt = real, num = entry->num; num > 0; opt++, num--)
+    if (oshort (opt) && opt->key == *so)
+      /* OPT has a valid (non shadowed) short option.  */
+      {
+        if (ovisible (opt))
+          {
+            comma (uparams.short_opt_col, &pest);
+            __argp_fmtstream_putc (stream, '-');
+            __argp_fmtstream_putc (stream, *so);
+            if (!have_long_opt || uparams.dup_args)
+              arg (real, " %s", "[%s]", state->root_argp->argp_domain, stream);
+            else if (real->arg)
+              hhstate->suppressed_dup_arg = 1;
+          }
+        so++;
+      }
+
+  /* Now, long options.  */
+  if (odoc (real))
+    /* A `documentation' option.  */
+    {
+      __argp_fmtstream_set_wmargin (stream, uparams.doc_opt_col);
+      for (opt = real, num = entry->num; num > 0; opt++, num--)
+        if (opt->name && *opt->name && ovisible (opt))
+          {
+            comma (uparams.doc_opt_col, &pest);
+            /* Calling dgettext here isn't quite right, since sorting will
+               have been done on the original; but documentation options
+               should be pretty rare anyway...  */
+            __argp_fmtstream_puts (stream,
+                                   onotrans (opt) ?
+                                             opt->name :
+                                   dgettext (state->root_argp->argp_domain,
+                                             opt->name));
+          }
+    }
+  else
+    /* A real long option.  */
+    {
+      int first_long_opt = 1;
+
+      __argp_fmtstream_set_wmargin (stream, uparams.long_opt_col);
+      for (opt = real, num = entry->num; num > 0; opt++, num--)
+        if (opt->name && ovisible (opt))
+          {
+            comma (uparams.long_opt_col, &pest);
+            __argp_fmtstream_printf (stream, "--%s", opt->name);
+            if (first_long_opt || uparams.dup_args)
+              arg (real, "=%s", "[=%s]", state->root_argp->argp_domain,
+                   stream);
+            else if (real->arg)
+              hhstate->suppressed_dup_arg = 1;
+          }
+    }
+
+  /* Next, documentation strings.  */
+  __argp_fmtstream_set_lmargin (stream, 0);
+
+  if (pest.first)
+    {
+      /* Didn't print any switches, what's up?  */
+      if (!oshort (real) && !real->name)
+        /* This is a group header, print it nicely.  */
+        print_header (real->doc, entry->argp, &pest);
+      else
+        /* Just a totally shadowed option or null header; print nothing.  */
+        goto cleanup;           /* Just return, after cleaning up.  */
+    }
+  else
+    {
+      const char *tstr = real->doc ? dgettext (state->root_argp->argp_domain,
+                                               real->doc) : 0;
+      const char *fstr = filter_doc (tstr, real->key, entry->argp, state);
+      if (fstr && *fstr)
+        {
+          unsigned int col = __argp_fmtstream_point (stream);
+
+          __argp_fmtstream_set_lmargin (stream, uparams.opt_doc_col);
+          __argp_fmtstream_set_wmargin (stream, uparams.opt_doc_col);
+
+          if (col > (unsigned int) (uparams.opt_doc_col + 3))
+            __argp_fmtstream_putc (stream, '\n');
+          else if (col >= (unsigned int) uparams.opt_doc_col)
+            __argp_fmtstream_puts (stream, "   ");
+          else
+            indent_to (stream, uparams.opt_doc_col);
+
+          __argp_fmtstream_puts (stream, fstr);
+        }
+      if (fstr && fstr != tstr)
+        free ((char *) fstr);
+
+      /* Reset the left margin.  */
+      __argp_fmtstream_set_lmargin (stream, 0);
+      __argp_fmtstream_putc (stream, '\n');
+    }
+
+  hhstate->prev_entry = entry;
+
+cleanup:
+  __argp_fmtstream_set_lmargin (stream, old_lm);
+  __argp_fmtstream_set_wmargin (stream, old_wm);
+}
+
+/* Output a long help message about the options in HOL to STREAM.  */
+static void
+hol_help (struct hol *hol, const struct argp_state *state,
+          argp_fmtstream_t stream)
+{
+  unsigned num;
+  struct hol_entry *entry;
+  struct hol_help_state hhstate = { 0, 0, 0 };
+
+  for (entry = hol->entries, num = hol->num_entries; num > 0; entry++, num--)
+    hol_entry_help (entry, state, stream, &hhstate);
+
+  if (hhstate.suppressed_dup_arg && uparams.dup_args_note)
+    {
+      const char *tstr = dgettext (state->root_argp->argp_domain, "\
+Mandatory or optional arguments to long options are also mandatory or \
+optional for any corresponding short options.");
+      const char *fstr = filter_doc (tstr, ARGP_KEY_HELP_DUP_ARGS_NOTE,
+                                     state ? state->root_argp : 0, state);
+      if (fstr && *fstr)
+        {
+          __argp_fmtstream_putc (stream, '\n');
+          __argp_fmtstream_puts (stream, fstr);
+          __argp_fmtstream_putc (stream, '\n');
+        }
+      if (fstr && fstr != tstr)
+        free ((char *) fstr);
+    }
+}
+
+/* Helper functions for hol_usage.  */
+
+/* If OPT is a short option without an arg, append its key to the string
+   pointer pointer to by COOKIE, and advance the pointer.  */
+static int
+add_argless_short_opt (const struct argp_option *opt,
+                       const struct argp_option *real,
+                       const char *domain, void *cookie)
+{
+  char **snao_end = cookie;
+  if (!(opt->arg || real->arg)
+      && !((opt->flags | real->flags) & OPTION_NO_USAGE))
+    *(*snao_end)++ = opt->key;
+  return 0;
+}
+
+/* If OPT is a short option with an arg, output a usage entry for it to the
+   stream pointed at by COOKIE.  */
+static int
+usage_argful_short_opt (const struct argp_option *opt,
+                        const struct argp_option *real,
+                        const char *domain, void *cookie)
+{
+  argp_fmtstream_t stream = cookie;
+  const char *arg = opt->arg;
+  int flags = opt->flags | real->flags;
+
+  if (! arg)
+    arg = real->arg;
+
+  if (arg && !(flags & OPTION_NO_USAGE))
+    {
+      arg = dgettext (domain, arg);
+
+      if (flags & OPTION_ARG_OPTIONAL)
+        __argp_fmtstream_printf (stream, " [-%c[%s]]", opt->key, arg);
+      else
+        {
+          /* Manually do line wrapping so that it (probably) won't
+             get wrapped at the embedded space.  */
+          space (stream, 6 + strlen (arg));
+          __argp_fmtstream_printf (stream, "[-%c %s]", opt->key, arg);
+        }
+    }
+
+  return 0;
+}
+
+/* Output a usage entry for the long option opt to the stream pointed at by
+   COOKIE.  */
+static int
+usage_long_opt (const struct argp_option *opt,
+                const struct argp_option *real,
+                const char *domain, void *cookie)
+{
+  argp_fmtstream_t stream = cookie;
+  const char *arg = opt->arg;
+  int flags = opt->flags | real->flags;
+
+  if (! arg)
+    arg = real->arg;
+
+  if (! (flags & OPTION_NO_USAGE) && !odoc (opt))
+    {
+      if (arg)
+        {
+          arg = dgettext (domain, arg);
+          if (flags & OPTION_ARG_OPTIONAL)
+            __argp_fmtstream_printf (stream, " [--%s[=%s]]", opt->name, arg);
+          else
+            __argp_fmtstream_printf (stream, " [--%s=%s]", opt->name, arg);
+        }
+      else
+        __argp_fmtstream_printf (stream, " [--%s]", opt->name);
+    }
+
+  return 0;
+}
+
+/* Print a short usage description for the arguments in HOL to STREAM.  */
+static void
+hol_usage (struct hol *hol, argp_fmtstream_t stream)
+{
+  if (hol->num_entries > 0)
+    {
+      unsigned nentries;
+      struct hol_entry *entry;
+      char *short_no_arg_opts = alloca (strlen (hol->short_options) + 1);
+      char *snao_end = short_no_arg_opts;
+
+      /* First we put a list of short options without arguments.  */
+      for (entry = hol->entries, nentries = hol->num_entries
+           ; nentries > 0
+           ; entry++, nentries--)
+        hol_entry_short_iterate (entry, add_argless_short_opt,
+                                 entry->argp->argp_domain, &snao_end);
+      if (snao_end > short_no_arg_opts)
+        {
+          *snao_end++ = 0;
+          __argp_fmtstream_printf (stream, " [-%s]", short_no_arg_opts);
+        }
+
+      /* Now a list of short options *with* arguments.  */
+      for (entry = hol->entries, nentries = hol->num_entries
+           ; nentries > 0
+           ; entry++, nentries--)
+        hol_entry_short_iterate (entry, usage_argful_short_opt,
+                                 entry->argp->argp_domain, stream);
+
+      /* Finally, a list of long options (whew!).  */
+      for (entry = hol->entries, nentries = hol->num_entries
+           ; nentries > 0
+           ; entry++, nentries--)
+        hol_entry_long_iterate (entry, usage_long_opt,
+                                entry->argp->argp_domain, stream);
+    }
+}
+
+/* Make a HOL containing all levels of options in ARGP.  CLUSTER is the
+   cluster in which ARGP's entries should be clustered, or 0.  */
+static struct hol *
+argp_hol (const struct argp *argp, struct hol_cluster *cluster)
+{
+  const struct argp_child *child = argp->children;
+  struct hol *hol = make_hol (argp, cluster);
+  if (child)
+    while (child->argp)
+      {
+        struct hol_cluster *child_cluster =
+          ((child->group || child->header)
+           /* Put CHILD->argp within its own cluster.  */
+           ? hol_add_cluster (hol, child->group, child->header,
+                              child - argp->children, cluster, argp)
+           /* Just merge it into the parent's cluster.  */
+           : cluster);
+        hol_append (hol, argp_hol (child->argp, child_cluster)) ;
+        child++;
+      }
+  return hol;
+}
+
+/* Calculate how many different levels with alternative args strings exist in
+   ARGP.  */
+static size_t
+argp_args_levels (const struct argp *argp)
+{
+  size_t levels = 0;
+  const struct argp_child *child = argp->children;
+
+  if (argp->args_doc && strchr (argp->args_doc, '\n'))
+    levels++;
+
+  if (child)
+    while (child->argp)
+      levels += argp_args_levels ((child++)->argp);
+
+  return levels;
+}
+
+/* Print all the non-option args documented in ARGP to STREAM.  Any output is
+   preceded by a space.  LEVELS is a pointer to a byte vector the length
+   returned by argp_args_levels; it should be initialized to zero, and
+   updated by this routine for the next call if ADVANCE is true.  True is
+   returned as long as there are more patterns to output.  */
+static int
+argp_args_usage (const struct argp *argp, const struct argp_state *state,
+                 char **levels, int advance, argp_fmtstream_t stream)
+{
+  char *our_level = *levels;
+  int multiple = 0;
+  const struct argp_child *child = argp->children;
+  const char *tdoc = dgettext (argp->argp_domain, argp->args_doc), *nl = 0;
+  const char *fdoc = filter_doc (tdoc, ARGP_KEY_HELP_ARGS_DOC, argp, state);
+
+  if (fdoc)
+    {
+      const char *cp = fdoc;
+      nl = __strchrnul (cp, '\n');
+      if (*nl != '\0')
+        /* This is a `multi-level' args doc; advance to the correct position
+           as determined by our state in LEVELS, and update LEVELS.  */
+        {
+          int i;
+          multiple = 1;
+          for (i = 0; i < *our_level; i++)
+            cp = nl + 1, nl = __strchrnul (cp, '\n');
+          (*levels)++;
+        }
+
+      /* Manually do line wrapping so that it (probably) won't get wrapped at
+         any embedded spaces.  */
+      space (stream, 1 + nl - cp);
+
+      __argp_fmtstream_write (stream, cp, nl - cp);
+    }
+  if (fdoc && fdoc != tdoc)
+    free ((char *)fdoc);        /* Free user's modified doc string.  */
+
+  if (child)
+    while (child->argp)
+      advance = !argp_args_usage ((child++)->argp, state, levels, advance, stream);
+
+  if (advance && multiple)
+    {
+      /* Need to increment our level.  */
+      if (*nl)
+        /* There's more we can do here.  */
+        {
+          (*our_level)++;
+          advance = 0;          /* Our parent shouldn't advance also. */
+        }
+      else if (*our_level > 0)
+        /* We had multiple levels, but used them up; reset to zero.  */
+        *our_level = 0;
+    }
+
+  return !advance;
+}
+
+/* Print the documentation for ARGP to STREAM; if POST is false, then
+   everything preceeding a `\v' character in the documentation strings (or
+   the whole string, for those with none) is printed, otherwise, everything
+   following the `\v' character (nothing for strings without).  Each separate
+   bit of documentation is separated a blank line, and if PRE_BLANK is true,
+   then the first is as well.  If FIRST_ONLY is true, only the first
+   occurrence is output.  Returns true if anything was output.  */
+static int
+argp_doc (const struct argp *argp, const struct argp_state *state,
+          int post, int pre_blank, int first_only,
+          argp_fmtstream_t stream)
+{
+  const char *text;
+  const char *inp_text;
+  size_t inp_text_len = 0;
+  const char *trans_text;
+  void *input = 0;
+  int anything = 0;
+  const struct argp_child *child = argp->children;
+
+  if (argp->doc)
+    {
+      char *vt = strchr (argp->doc, '\v');
+      if (vt)
+        {
+          if (post)
+            inp_text = vt + 1;
+          else
+            {
+              inp_text_len = vt - argp->doc;
+              inp_text = __strndup (argp->doc, inp_text_len);
+            }
+        }
+      else
+        inp_text = post ? 0 : argp->doc;
+      trans_text = inp_text ? dgettext (argp->argp_domain, inp_text) : NULL;
+    }
+  else
+    trans_text = inp_text = 0;
+
+  if (argp->help_filter)
+    /* We have to filter the doc strings.  */
+    {
+      input = __argp_input (argp, state);
+      text =
+        (*argp->help_filter) (post
+                              ? ARGP_KEY_HELP_POST_DOC
+                              : ARGP_KEY_HELP_PRE_DOC,
+                              trans_text, input);
+    }
+  else
+    text = (const char *) trans_text;
+
+  if (text)
+    {
+      if (pre_blank)
+        __argp_fmtstream_putc (stream, '\n');
+
+      __argp_fmtstream_puts (stream, text);
+
+      if (__argp_fmtstream_point (stream) > __argp_fmtstream_lmargin (stream))
+        __argp_fmtstream_putc (stream, '\n');
+
+      anything = 1;
+    }
+
+  if (text && text != trans_text)
+    free ((char *) text);       /* Free TEXT returned from the help filter.  */
+
+  if (inp_text && inp_text_len)
+    free ((char *) inp_text);   /* We copied INP_TEXT, so free it now.  */
+
+  if (post && argp->help_filter)
+    /* Now see if we have to output a ARGP_KEY_HELP_EXTRA text.  */
+    {
+      text = (*argp->help_filter) (ARGP_KEY_HELP_EXTRA, 0, input);
+      if (text)
+        {
+          if (anything || pre_blank)
+            __argp_fmtstream_putc (stream, '\n');
+          __argp_fmtstream_puts (stream, text);
+          free ((char *) text);
+          if (__argp_fmtstream_point (stream)
+              > __argp_fmtstream_lmargin (stream))
+            __argp_fmtstream_putc (stream, '\n');
+          anything = 1;
+        }
+    }
+
+  if (child)
+    while (child->argp && !(first_only && anything))
+      anything |=
+        argp_doc ((child++)->argp, state,
+                  post, anything || pre_blank, first_only,
+                  stream);
+
+  return anything;
+}
+
+/* Output a usage message for ARGP to STREAM.  If called from
+   argp_state_help, STATE is the relevent parsing state.  FLAGS are from the
+   set ARGP_HELP_*.  NAME is what to use wherever a `program name' is
+   needed. */
+static void
+_help (const struct argp *argp, const struct argp_state *state, FILE *stream,
+       unsigned flags, char *name)
+{
+  int anything = 0;             /* Whether we've output anything.  */
+  struct hol *hol = 0;
+  argp_fmtstream_t fs;
+
+  if (! stream)
+    return;
+
+#if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
+  __flockfile (stream);
+#endif
+
+  if (! uparams.valid)
+    fill_in_uparams (state);
+
+  fs = __argp_make_fmtstream (stream, 0, uparams.rmargin, 0);
+  if (! fs)
+    {
+#if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
+      __funlockfile (stream);
+#endif
+      return;
+    }
+
+  if (flags & (ARGP_HELP_USAGE | ARGP_HELP_SHORT_USAGE | ARGP_HELP_LONG))
+    {
+      hol = argp_hol (argp, 0);
+
+      /* If present, these options always come last.  */
+      hol_set_group (hol, "help", -1);
+      hol_set_group (hol, "version", -1);
+
+      hol_sort (hol);
+    }
+
+  if (flags & (ARGP_HELP_USAGE | ARGP_HELP_SHORT_USAGE))
+    /* Print a short `Usage:' message.  */
+    {
+      int first_pattern = 1, more_patterns;
+      size_t num_pattern_levels = argp_args_levels (argp);
+      char *pattern_levels = alloca (num_pattern_levels);
+
+      memset (pattern_levels, 0, num_pattern_levels);
+
+      do
+        {
+          int old_lm;
+          int old_wm = __argp_fmtstream_set_wmargin (fs, uparams.usage_indent);
+          char *levels = pattern_levels;
+
+          if (first_pattern)
+            __argp_fmtstream_printf (fs, "%s %s",
+                                     dgettext (argp->argp_domain, "Usage:"),
+                                     name);
+          else
+            __argp_fmtstream_printf (fs, "%s %s",
+                                     dgettext (argp->argp_domain, "  or: "),
+                                     name);
+
+          /* We set the lmargin as well as the wmargin, because hol_usage
+             manually wraps options with newline to avoid annoying breaks.  */
+          old_lm = __argp_fmtstream_set_lmargin (fs, uparams.usage_indent);
+
+          if (flags & ARGP_HELP_SHORT_USAGE)
+            /* Just show where the options go.  */
+            {
+              if (hol->num_entries > 0)
+                __argp_fmtstream_puts (fs, dgettext (argp->argp_domain,
+                                                     " [OPTION...]"));
+            }
+          else
+            /* Actually print the options.  */
+            {
+              hol_usage (hol, fs);
+              flags |= ARGP_HELP_SHORT_USAGE; /* But only do so once.  */
+            }
+
+          more_patterns = argp_args_usage (argp, state, &levels, 1, fs);
+
+          __argp_fmtstream_set_wmargin (fs, old_wm);
+          __argp_fmtstream_set_lmargin (fs, old_lm);
+
+          __argp_fmtstream_putc (fs, '\n');
+          anything = 1;
+
+          first_pattern = 0;
+        }
+      while (more_patterns);
+    }
+
+  if (flags & ARGP_HELP_PRE_DOC)
+    anything |= argp_doc (argp, state, 0, 0, 1, fs);
+
+  if (flags & ARGP_HELP_SEE)
+    {
+      __argp_fmtstream_printf (fs, dgettext (argp->argp_domain, "\
+Try `%s --help' or `%s --usage' for more information.\n"),
+                               name, name);
+      anything = 1;
+    }
+
+  if (flags & ARGP_HELP_LONG)
+    /* Print a long, detailed help message.  */
+    {
+      /* Print info about all the options.  */
+      if (hol->num_entries > 0)
+        {
+          if (anything)
+            __argp_fmtstream_putc (fs, '\n');
+          hol_help (hol, state, fs);
+          anything = 1;
+        }
+    }
+
+  if (flags & ARGP_HELP_POST_DOC)
+    /* Print any documentation strings at the end.  */
+    anything |= argp_doc (argp, state, 1, anything, 0, fs);
+
+  if ((flags & ARGP_HELP_BUG_ADDR) && argp_program_bug_address)
+    {
+      if (anything)
+        __argp_fmtstream_putc (fs, '\n');
+      __argp_fmtstream_printf (fs, dgettext (argp->argp_domain,
+                                             "Report bugs to %s.\n"),
+                               argp_program_bug_address);
+      anything = 1;
+    }
+
+#if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
+  __funlockfile (stream);
+#endif
+
+  if (hol)
+    hol_free (hol);
+
+  __argp_fmtstream_free (fs);
+}
+
+/* Output a usage message for ARGP to STREAM.  FLAGS are from the set
+   ARGP_HELP_*.  NAME is what to use wherever a `program name' is needed. */
+void __argp_help (const struct argp *argp, FILE *stream,
+                  unsigned flags, char *name)
+{
+  struct argp_state state;
+  memset (&state, 0, sizeof state);
+  state.root_argp = argp;
+  _help (argp, &state, stream, flags, name);
+}
+#ifdef weak_alias
+weak_alias (__argp_help, argp_help)
+#endif
+
+#if ! (defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME)
+char *
+__argp_short_program_name (void)
+{
+# if HAVE_DECL_PROGRAM_INVOCATION_NAME
+  return __argp_base_name (program_invocation_name);
+# else
+  /* FIXME: What now? Miles suggests that it is better to use NULL,
+     but currently the value is passed on directly to fputs_unlocked,
+     so that requires more changes. */
+# if __GNUC__
+#  warning No reasonable value to return
+# endif /* __GNUC__ */
+  return "";
+# endif
+}
+#endif
+
+/* Output, if appropriate, a usage message for STATE to STREAM.  FLAGS are
+   from the set ARGP_HELP_*.  */
+void
+__argp_state_help (const struct argp_state *state, FILE *stream, unsigned flags)
+{
+  if ((!state || ! (state->flags & ARGP_NO_ERRS)) && stream)
+    {
+      if (state && (state->flags & ARGP_LONG_ONLY))
+        flags |= ARGP_HELP_LONG_ONLY;
+
+      _help (state ? state->root_argp : 0, state, stream, flags,
+             state ? state->name : __argp_short_program_name ());
+
+      if (!state || ! (state->flags & ARGP_NO_EXIT))
+        {
+          if (flags & ARGP_HELP_EXIT_ERR)
+            exit (argp_err_exit_status);
+          if (flags & ARGP_HELP_EXIT_OK)
+            exit (0);
+        }
+  }
+}
+#ifdef weak_alias
+weak_alias (__argp_state_help, argp_state_help)
+#endif
+
+/* If appropriate, print the printf string FMT and following args, preceded
+   by the program name and `:', to stderr, and followed by a `Try ... --help'
+   message, then exit (1).  */
+void
+__argp_error (const struct argp_state *state, const char *fmt, ...)
+{
+  if (!state || !(state->flags & ARGP_NO_ERRS))
+    {
+      FILE *stream = state ? state->err_stream : stderr;
+
+      if (stream)
+        {
+          va_list ap;
+
+#if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
+          __flockfile (stream);
+#endif
+
+          va_start (ap, fmt);
+
+#ifdef USE_IN_LIBIO
+          if (_IO_fwide (stream, 0) > 0)
+            {
+              char *buf;
+
+              if (__asprintf (&buf, fmt, ap) < 0)
+                buf = NULL;
+
+              __fwprintf (stream, L"%s: %s\n",
+                          state ? state->name : __argp_short_program_name (),
+                          buf);
+
+              free (buf);
+            }
+          else
+#endif
+            {
+              fputs_unlocked (state
+                              ? state->name : __argp_short_program_name (),
+                              stream);
+              putc_unlocked (':', stream);
+              putc_unlocked (' ', stream);
+
+              vfprintf (stream, fmt, ap);
+
+              putc_unlocked ('\n', stream);
+            }
+
+          __argp_state_help (state, stream, ARGP_HELP_STD_ERR);
+
+          va_end (ap);
+
+#if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
+          __funlockfile (stream);
+#endif
+        }
+    }
+}
+#ifdef weak_alias
+weak_alias (__argp_error, argp_error)
+#endif
+
+/* Similar to the standard gnu error-reporting function error(), but will
+   respect the ARGP_NO_EXIT and ARGP_NO_ERRS flags in STATE, and will print
+   to STATE->err_stream.  This is useful for argument parsing code that is
+   shared between program startup (when exiting is desired) and runtime
+   option parsing (when typically an error code is returned instead).  The
+   difference between this function and argp_error is that the latter is for
+   *parsing errors*, and the former is for other problems that occur during
+   parsing but don't reflect a (syntactic) problem with the input.  */
+void
+__argp_failure (const struct argp_state *state, int status, int errnum,
+                const char *fmt, ...)
+{
+  if (!state || !(state->flags & ARGP_NO_ERRS))
+    {
+      FILE *stream = state ? state->err_stream : stderr;
+
+      if (stream)
+        {
+#if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
+          __flockfile (stream);
+#endif
+
+#ifdef USE_IN_LIBIO
+          if (_IO_fwide (stream, 0) > 0)
+            __fwprintf (stream, L"%s",
+                        state ? state->name : __argp_short_program_name ());
+          else
+#endif
+            fputs_unlocked (state
+                            ? state->name : __argp_short_program_name (),
+                            stream);
+
+          if (fmt)
+            {
+              va_list ap;
+
+              va_start (ap, fmt);
+#ifdef USE_IN_LIBIO
+              if (_IO_fwide (stream, 0) > 0)
+                {
+                  char *buf;
+
+                  if (__asprintf (&buf, fmt, ap) < 0)
+                    buf = NULL;
+
+                  __fwprintf (stream, L": %s", buf);
+
+                  free (buf);
+                }
+              else
+#endif
+                {
+                  putc_unlocked (':', stream);
+                  putc_unlocked (' ', stream);
+
+                  vfprintf (stream, fmt, ap);
+                }
+
+              va_end (ap);
+            }
+
+          if (errnum)
+            {
+              char buf[200];
+
+#ifdef USE_IN_LIBIO
+              if (_IO_fwide (stream, 0) > 0)
+                __fwprintf (stream, L": %s",
+                            __strerror_r (errnum, buf, sizeof (buf)));
+              else
+#endif
+                {
+                  char const *s = NULL;
+                  putc_unlocked (':', stream);
+                  putc_unlocked (' ', stream);
+#if _LIBC || (HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P)
+                  s = __strerror_r (errnum, buf, sizeof buf);
+#elif HAVE_DECL_STRERROR_R
+                  if (__strerror_r (errnum, buf, sizeof buf) == 0)
+                    s = buf;
+#endif
+#if !_LIBC
+                  if (! s && ! (s = strerror (errnum)))
+                    s = dgettext (state->root_argp->argp_domain,
+                                  "Unknown system error");
+#endif
+                  fputs (s, stream);
+                }
+            }
+
+#ifdef USE_IN_LIBIO
+          if (_IO_fwide (stream, 0) > 0)
+            putwc_unlocked (L'\n', stream);
+          else
+#endif
+            putc_unlocked ('\n', stream);
+
+#if _LIBC || (HAVE_FLOCKFILE && HAVE_FUNLOCKFILE)
+          __funlockfile (stream);
+#endif
+
+          if (status && (!state || !(state->flags & ARGP_NO_EXIT)))
+            exit (status);
+        }
+    }
+}
+#ifdef weak_alias
+weak_alias (__argp_failure, argp_failure)
+#endif
diff --git a/gnulib/argp-namefrob.h b/gnulib/argp-namefrob.h
new file mode 100644
index 000000000..24581a626
--- /dev/null
+++ b/gnulib/argp-namefrob.h
@@ -0,0 +1,157 @@
+/* Name frobnication for compiling argp outside of glibc
+   Copyright (C) 1997, 2003, 2007, 2009, 2010 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Written by Miles Bader <miles@gnu.ai.mit.edu>.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#if !_LIBC
+/* This code is written for inclusion in gnu-libc, and uses names in the
+   namespace reserved for libc.  If we're not compiling in libc, define those
+   names to be the normal ones instead.  */
+
+/* argp-parse functions */
+#undef __argp_parse
+#define __argp_parse argp_parse
+#undef __option_is_end
+#define __option_is_end _option_is_end
+#undef __option_is_short
+#define __option_is_short _option_is_short
+#undef __argp_input
+#define __argp_input _argp_input
+
+/* argp-help functions */
+#undef __argp_help
+#define __argp_help argp_help
+#undef __argp_error
+#define __argp_error argp_error
+#undef __argp_failure
+#define __argp_failure argp_failure
+#undef __argp_state_help
+#define __argp_state_help argp_state_help
+#undef __argp_usage
+#define __argp_usage argp_usage
+
+/* argp-fmtstream functions */
+#undef __argp_make_fmtstream
+#define __argp_make_fmtstream argp_make_fmtstream
+#undef __argp_fmtstream_free
+#define __argp_fmtstream_free argp_fmtstream_free
+#undef __argp_fmtstream_putc
+#define __argp_fmtstream_putc argp_fmtstream_putc
+#undef __argp_fmtstream_puts
+#define __argp_fmtstream_puts argp_fmtstream_puts
+#undef __argp_fmtstream_write
+#define __argp_fmtstream_write argp_fmtstream_write
+#undef __argp_fmtstream_printf
+#define __argp_fmtstream_printf argp_fmtstream_printf
+#undef __argp_fmtstream_set_lmargin
+#define __argp_fmtstream_set_lmargin argp_fmtstream_set_lmargin
+#undef __argp_fmtstream_set_rmargin
+#define __argp_fmtstream_set_rmargin argp_fmtstream_set_rmargin
+#undef __argp_fmtstream_set_wmargin
+#define __argp_fmtstream_set_wmargin argp_fmtstream_set_wmargin
+#undef __argp_fmtstream_point
+#define __argp_fmtstream_point argp_fmtstream_point
+#undef __argp_fmtstream_update
+#define __argp_fmtstream_update _argp_fmtstream_update
+#undef __argp_fmtstream_ensure
+#define __argp_fmtstream_ensure _argp_fmtstream_ensure
+#undef __argp_fmtstream_lmargin
+#define __argp_fmtstream_lmargin argp_fmtstream_lmargin
+#undef __argp_fmtstream_rmargin
+#define __argp_fmtstream_rmargin argp_fmtstream_rmargin
+#undef __argp_fmtstream_wmargin
+#define __argp_fmtstream_wmargin argp_fmtstream_wmargin
+
+/* normal libc functions we call */
+#undef __flockfile
+#define __flockfile flockfile
+#undef __funlockfile
+#define __funlockfile funlockfile
+#undef __mempcpy
+#define __mempcpy mempcpy
+#undef __sleep
+#define __sleep sleep
+#undef __strcasecmp
+#define __strcasecmp strcasecmp
+#undef __strchrnul
+#define __strchrnul strchrnul
+#undef __strerror_r
+#define __strerror_r strerror_r
+#undef __strndup
+#define __strndup strndup
+#undef __vsnprintf
+#define __vsnprintf vsnprintf
+
+#if defined(HAVE_DECL_CLEARERR_UNLOCKED) && !HAVE_DECL_CLEARERR_UNLOCKED
+# define clearerr_unlocked(x) clearerr (x)
+#endif
+#if defined(HAVE_DECL_FEOF_UNLOCKED) && !HAVE_DECL_FEOF_UNLOCKED
+# define feof_unlocked(x) feof (x)
+# endif
+#if defined(HAVE_DECL_FERROR_UNLOCKED) && !HAVE_DECL_FERROR_UNLOCKED
+# define ferror_unlocked(x) ferror (x)
+# endif
+#if defined(HAVE_DECL_FFLUSH_UNLOCKED) && !HAVE_DECL_FFLUSH_UNLOCKED
+# define fflush_unlocked(x) fflush (x)
+# endif
+#if defined(HAVE_DECL_FGETS_UNLOCKED) && !HAVE_DECL_FGETS_UNLOCKED
+# define fgets_unlocked(x,y,z) fgets (x,y,z)
+# endif
+#if defined(HAVE_DECL_FPUTC_UNLOCKED) && !HAVE_DECL_FPUTC_UNLOCKED
+# define fputc_unlocked(x,y) fputc (x,y)
+# endif
+#if defined(HAVE_DECL_FPUTS_UNLOCKED) && !HAVE_DECL_FPUTS_UNLOCKED
+# define fputs_unlocked(x,y) fputs (x,y)
+# endif
+#if defined(HAVE_DECL_FREAD_UNLOCKED) && !HAVE_DECL_FREAD_UNLOCKED
+# define fread_unlocked(w,x,y,z) fread (w,x,y,z)
+# endif
+#if defined(HAVE_DECL_FWRITE_UNLOCKED) && !HAVE_DECL_FWRITE_UNLOCKED
+# define fwrite_unlocked(w,x,y,z) fwrite (w,x,y,z)
+# endif
+#if defined(HAVE_DECL_GETC_UNLOCKED) && !HAVE_DECL_GETC_UNLOCKED
+# define getc_unlocked(x) getc (x)
+# endif
+#if defined(HAVE_DECL_GETCHAR_UNLOCKED) && !HAVE_DECL_GETCHAR_UNLOCKED
+#  define getchar_unlocked() getchar ()
+# endif
+#if defined(HAVE_DECL_PUTC_UNLOCKED) && !HAVE_DECL_PUTC_UNLOCKED
+# define putc_unlocked(x,y) putc (x,y)
+# endif
+#if defined(HAVE_DECL_PUTCHAR_UNLOCKED) && !HAVE_DECL_PUTCHAR_UNLOCKED
+# define putchar_unlocked(x) putchar (x)
+# endif
+
+#endif /* !_LIBC */
+
+#ifndef __set_errno
+#define __set_errno(e) (errno = (e))
+#endif
+
+#if defined GNULIB_ARGP_DISABLE_DIRNAME
+# define __argp_base_name(arg) arg
+#elif defined GNULIB_ARGP_EXTERN_BASENAME
+extern char *__argp_base_name (const char *arg);
+#else
+# include "dirname.h"
+# define __argp_base_name last_component
+#endif
+
+#if defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
+# define __argp_short_program_name()    (program_invocation_short_name)
+#else
+extern char *__argp_short_program_name (void);
+#endif
diff --git a/gnulib/argp-parse.c b/gnulib/argp-parse.c
new file mode 100644
index 000000000..a1cbf884e
--- /dev/null
+++ b/gnulib/argp-parse.c
@@ -0,0 +1,952 @@
+/* Hierarchial argument parsing, layered over getopt
+   Copyright (C) 1995-2000, 2002-2004, 2009-2010 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Written by Miles Bader <miles@gnu.ai.mit.edu>.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <alloca.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <limits.h>
+#include <getopt.h>
+#include <getopt_int.h>
+
+#ifdef _LIBC
+# include <libintl.h>
+# undef dgettext
+# define dgettext(domain, msgid) \
+   INTUSE(__dcgettext) (domain, msgid, LC_MESSAGES)
+#else
+# include "gettext.h"
+#endif
+#define N_(msgid) msgid
+
+#include "argp.h"
+#include "argp-namefrob.h"
+
+#define alignof(type) offsetof (struct { char c; type x; }, x)
+#define alignto(n, d) ((((n) + (d) - 1) / (d)) * (d))
+
+/* Getopt return values.  */
+#define KEY_END (-1)            /* The end of the options.  */
+#define KEY_ARG 1               /* A non-option argument.  */
+#define KEY_ERR '?'             /* An error parsing the options.  */
+
+/* The meta-argument used to prevent any further arguments being interpreted
+   as options.  */
+#define QUOTE "--"
+
+/* The number of bits we steal in a long-option value for our own use.  */
+#define GROUP_BITS CHAR_BIT
+
+/* The number of bits available for the user value.  */
+#define USER_BITS ((sizeof ((struct option *)0)->val * CHAR_BIT) - GROUP_BITS)
+#define USER_MASK ((1 << USER_BITS) - 1)
+
+/* EZ alias for ARGP_ERR_UNKNOWN.  */
+#define EBADKEY ARGP_ERR_UNKNOWN
+
+/* Default options.  */
+
+/* When argp is given the --HANG switch, _ARGP_HANG is set and argp will sleep
+   for one second intervals, decrementing _ARGP_HANG until it's zero.  Thus
+   you can force the program to continue by attaching a debugger and setting
+   it to 0 yourself.  */
+static volatile int _argp_hang;
+
+#define OPT_PROGNAME    -2
+#define OPT_USAGE       -3
+#define OPT_HANG        -4
+
+static const struct argp_option argp_default_options[] =
+{
+  {"help",        '?',          0, 0,  N_("give this help list"), -1},
+  {"usage",       OPT_USAGE,    0, 0,  N_("give a short usage message"), 0},
+  {"program-name",OPT_PROGNAME,N_("NAME"), OPTION_HIDDEN, N_("set the program name"), 0},
+  {"HANG",        OPT_HANG,    N_("SECS"), OPTION_ARG_OPTIONAL | OPTION_HIDDEN,
+     N_("hang for SECS seconds (default 3600)"), 0},
+  {NULL, 0, 0, 0, NULL, 0}
+};
+
+static error_t
+argp_default_parser (int key, char *arg, struct argp_state *state)
+{
+  switch (key)
+    {
+    case '?':
+      __argp_state_help (state, state->out_stream, ARGP_HELP_STD_HELP);
+      break;
+    case OPT_USAGE:
+      __argp_state_help (state, state->out_stream,
+                         ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK);
+      break;
+
+    case OPT_PROGNAME:          /* Set the program name.  */
+#if defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_NAME
+      program_invocation_name = arg;
+#endif
+      /* [Note that some systems only have PROGRAM_INVOCATION_SHORT_NAME (aka
+         __PROGNAME), in which case, PROGRAM_INVOCATION_NAME is just defined
+         to be that, so we have to be a bit careful here.]  */
+
+      /* Update what we use for messages.  */
+      state->name = __argp_base_name (arg);
+
+#if defined _LIBC || HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
+      program_invocation_short_name = state->name;
+#endif
+
+      if ((state->flags & (ARGP_PARSE_ARGV0 | ARGP_NO_ERRS))
+          == ARGP_PARSE_ARGV0)
+        /* Update what getopt uses too.  */
+        state->argv[0] = arg;
+
+      break;
+
+    case OPT_HANG:
+      _argp_hang = atoi (arg ? arg : "3600");
+      while (_argp_hang-- > 0)
+        __sleep (1);
+      break;
+
+    default:
+      return EBADKEY;
+    }
+  return 0;
+}
+
+static const struct argp argp_default_argp =
+  {argp_default_options, &argp_default_parser, NULL, NULL, NULL, NULL, "libc"};
+
+
+static const struct argp_option argp_version_options[] =
+{
+  {"version",     'V',          0, 0,  N_("print program version"), -1},
+  {NULL, 0, 0, 0, NULL, 0}
+};
+
+static error_t
+argp_version_parser (int key, char *arg, struct argp_state *state)
+{
+  switch (key)
+    {
+    case 'V':
+      if (argp_program_version_hook)
+        (*argp_program_version_hook) (state->out_stream, state);
+      else if (argp_program_version)
+        fprintf (state->out_stream, "%s\n", argp_program_version);
+      else
+        __argp_error (state, dgettext (state->root_argp->argp_domain,
+                                       "(PROGRAM ERROR) No version known!?"));
+      if (! (state->flags & ARGP_NO_EXIT))
+        exit (0);
+      break;
+    default:
+      return EBADKEY;
+    }
+  return 0;
+}
+
+static const struct argp argp_version_argp =
+  {argp_version_options, &argp_version_parser, NULL, NULL, NULL, NULL, "libc"};
+
+/* Returns the offset into the getopt long options array LONG_OPTIONS of a
+   long option with called NAME, or -1 if none is found.  Passing NULL as
+   NAME will return the number of options.  */
+static int
+find_long_option (struct option *long_options, const char *name)
+{
+  struct option *l = long_options;
+  while (l->name != NULL)
+    if (name != NULL && strcmp (l->name, name) == 0)
+      return l - long_options;
+    else
+      l++;
+  if (name == NULL)
+    return l - long_options;
+  else
+    return -1;
+}
+
+
+/* The state of a `group' during parsing.  Each group corresponds to a
+   particular argp structure from the tree of such descending from the top
+   level argp passed to argp_parse.  */
+struct group
+{
+  /* This group's parsing function.  */
+  argp_parser_t parser;
+
+  /* Which argp this group is from.  */
+  const struct argp *argp;
+
+  /* Points to the point in SHORT_OPTS corresponding to the end of the short
+     options for this group.  We use it to determine from which group a
+     particular short options is from.  */
+  char *short_end;
+
+  /* The number of non-option args sucessfully handled by this parser.  */
+  unsigned args_processed;
+
+  /* This group's parser's parent's group.  */
+  struct group *parent;
+  unsigned parent_index;        /* And the our position in the parent.   */
+
+  /* These fields are swapped into and out of the state structure when
+     calling this group's parser.  */
+  void *input, **child_inputs;
+  void *hook;
+};
+
+/* Call GROUP's parser with KEY and ARG, swapping any group-specific info
+   from STATE before calling, and back into state afterwards.  If GROUP has
+   no parser, EBADKEY is returned.  */
+static error_t
+group_parse (struct group *group, struct argp_state *state, int key, char *arg)
+{
+  if (group->parser)
+    {
+      error_t err;
+      state->hook = group->hook;
+      state->input = group->input;
+      state->child_inputs = group->child_inputs;
+      state->arg_num = group->args_processed;
+      err = (*group->parser)(key, arg, state);
+      group->hook = state->hook;
+      return err;
+    }
+  else
+    return EBADKEY;
+}
+
+struct parser
+{
+  const struct argp *argp;
+
+  /* SHORT_OPTS is the getopt short options string for the union of all the
+     groups of options.  */
+  char *short_opts;
+  /* LONG_OPTS is the array of getop long option structures for the union of
+     all the groups of options.  */
+  struct option *long_opts;
+  /* OPT_DATA is the getopt data used for the re-entrant getopt.  */
+  struct _getopt_data opt_data;
+
+  /* States of the various parsing groups.  */
+  struct group *groups;
+  /* The end of the GROUPS array.  */
+  struct group *egroup;
+  /* An vector containing storage for the CHILD_INPUTS field in all groups.  */
+  void **child_inputs;
+
+  /* True if we think using getopt is still useful; if false, then
+     remaining arguments are just passed verbatim with ARGP_KEY_ARG.  This is
+     cleared whenever getopt returns KEY_END, but may be set again if the user
+     moves the next argument pointer backwards.  */
+  int try_getopt;
+
+  /* State block supplied to parsing routines.  */
+  struct argp_state state;
+
+  /* Memory used by this parser.  */
+  void *storage;
+};
+
+/* The next usable entries in the various parser tables being filled in by
+   convert_options.  */
+struct parser_convert_state
+{
+  struct parser *parser;
+  char *short_end;
+  struct option *long_end;
+  void **child_inputs_end;
+};
+
+/* Converts all options in ARGP (which is put in GROUP) and ancestors
+   into getopt options stored in SHORT_OPTS and LONG_OPTS; SHORT_END and
+   CVT->LONG_END are the points at which new options are added.  Returns the
+   next unused group entry.  CVT holds state used during the conversion.  */
+static struct group *
+convert_options (const struct argp *argp,
+                 struct group *parent, unsigned parent_index,
+                 struct group *group, struct parser_convert_state *cvt)
+{
+  /* REAL is the most recent non-alias value of OPT.  */
+  const struct argp_option *real = argp->options;
+  const struct argp_child *children = argp->children;
+
+  if (real || argp->parser)
+    {
+      const struct argp_option *opt;
+
+      if (real)
+        for (opt = real; !__option_is_end (opt); opt++)
+          {
+            if (! (opt->flags & OPTION_ALIAS))
+              /* OPT isn't an alias, so we can use values from it.  */
+              real = opt;
+
+            if (! (real->flags & OPTION_DOC))
+              /* A real option (not just documentation).  */
+              {
+                if (__option_is_short (opt))
+                  /* OPT can be used as a short option.  */
+                  {
+                    *cvt->short_end++ = opt->key;
+                    if (real->arg)
+                      {
+                        *cvt->short_end++ = ':';
+                        if (real->flags & OPTION_ARG_OPTIONAL)
+                          *cvt->short_end++ = ':';
+                      }
+                    *cvt->short_end = '\0'; /* keep 0 terminated */
+                  }
+
+                if (opt->name
+                    && find_long_option (cvt->parser->long_opts, opt->name) < 0)
+                  /* OPT can be used as a long option.  */
+                  {
+                    cvt->long_end->name = opt->name;
+                    cvt->long_end->has_arg =
+                      (real->arg
+                       ? (real->flags & OPTION_ARG_OPTIONAL
+                          ? optional_argument
+                          : required_argument)
+                       : no_argument);
+                    cvt->long_end->flag = 0;
+                    /* we add a disambiguating code to all the user's
+                       values (which is removed before we actually call
+                       the function to parse the value); this means that
+                       the user loses use of the high 8 bits in all his
+                       values (the sign of the lower bits is preserved
+                       however)...  */
+                    cvt->long_end->val =
+                      ((opt->key ? opt->key : real->key) & USER_MASK)
+                      + (((group - cvt->parser->groups) + 1) << USER_BITS);
+
+                    /* Keep the LONG_OPTS list terminated.  */
+                    (++cvt->long_end)->name = NULL;
+                  }
+              }
+            }
+
+      group->parser = argp->parser;
+      group->argp = argp;
+      group->short_end = cvt->short_end;
+      group->args_processed = 0;
+      group->parent = parent;
+      group->parent_index = parent_index;
+      group->input = 0;
+      group->hook = 0;
+      group->child_inputs = 0;
+
+      if (children)
+        /* Assign GROUP's CHILD_INPUTS field some space from
+           CVT->child_inputs_end.*/
+        {
+          unsigned num_children = 0;
+          while (children[num_children].argp)
+            num_children++;
+          group->child_inputs = cvt->child_inputs_end;
+          cvt->child_inputs_end += num_children;
+        }
+
+      parent = group++;
+    }
+  else
+    parent = 0;
+
+  if (children)
+    {
+      unsigned index = 0;
+      while (children->argp)
+        group =
+          convert_options (children++->argp, parent, index++, group, cvt);
+    }
+
+  return group;
+}
+
+/* Find the merged set of getopt options, with keys appropiately prefixed. */
+static void
+parser_convert (struct parser *parser, const struct argp *argp, int flags)
+{
+  struct parser_convert_state cvt;
+
+  cvt.parser = parser;
+  cvt.short_end = parser->short_opts;
+  cvt.long_end = parser->long_opts;
+  cvt.child_inputs_end = parser->child_inputs;
+
+  if (flags & ARGP_IN_ORDER)
+    *cvt.short_end++ = '-';
+  else if (flags & ARGP_NO_ARGS)
+    *cvt.short_end++ = '+';
+  *cvt.short_end = '\0';
+
+  cvt.long_end->name = NULL;
+
+  parser->argp = argp;
+
+  if (argp)
+    parser->egroup = convert_options (argp, 0, 0, parser->groups, &cvt);
+  else
+    parser->egroup = parser->groups; /* No parsers at all! */
+}
+
+/* Lengths of various parser fields which we will allocated.  */
+struct parser_sizes
+{
+  size_t short_len;             /* Getopt short options string.  */
+  size_t long_len;              /* Getopt long options vector.  */
+  size_t num_groups;            /* Group structures we allocate.  */
+  size_t num_child_inputs;      /* Child input slots.  */
+};
+
+/* For ARGP, increments the NUM_GROUPS field in SZS by the total number of
+ argp structures descended from it, and the SHORT_LEN & LONG_LEN fields by
+ the maximum lengths of the resulting merged getopt short options string and
+ long-options array, respectively.  */
+static void
+calc_sizes (const struct argp *argp,  struct parser_sizes *szs)
+{
+  const struct argp_child *child = argp->children;
+  const struct argp_option *opt = argp->options;
+
+  if (opt || argp->parser)
+    {
+      szs->num_groups++;
+      if (opt)
+        {
+          int num_opts = 0;
+          while (!__option_is_end (opt++))
+            num_opts++;
+          szs->short_len += num_opts * 3; /* opt + up to 2 `:'s */
+          szs->long_len += num_opts;
+        }
+    }
+
+  if (child)
+    while (child->argp)
+      {
+        calc_sizes ((child++)->argp, szs);
+        szs->num_child_inputs++;
+      }
+}
+
+/* Initializes PARSER to parse ARGP in a manner described by FLAGS.  */
+static error_t
+parser_init (struct parser *parser, const struct argp *argp,
+             int argc, char **argv, int flags, void *input)
+{
+  error_t err = 0;
+  struct group *group;
+  struct parser_sizes szs;
+  struct _getopt_data opt_data = _GETOPT_DATA_INITIALIZER;
+  char *storage;
+  size_t glen, gsum;
+  size_t clen, csum;
+  size_t llen, lsum;
+  size_t slen, ssum;
+
+  szs.short_len = (flags & ARGP_NO_ARGS) ? 0 : 1;
+  szs.long_len = 0;
+  szs.num_groups = 0;
+  szs.num_child_inputs = 0;
+
+  if (argp)
+    calc_sizes (argp, &szs);
+
+  /* Lengths of the various bits of storage used by PARSER.  */
+  glen = (szs.num_groups + 1) * sizeof (struct group);
+  clen = szs.num_child_inputs * sizeof (void *);
+  llen = (szs.long_len + 1) * sizeof (struct option);
+  slen = szs.short_len + 1;
+
+  /* Sums of previous lengths, properly aligned.  There's no need to
+     align gsum, since struct group is aligned at least as strictly as
+     void * (since it contains a void * member).  And there's no need
+     to align lsum, since struct option is aligned at least as
+     strictly as char.  */
+  gsum = glen;
+  csum = alignto (gsum + clen, alignof (struct option));
+  lsum = csum + llen;
+  ssum = lsum + slen;
+
+  parser->storage = malloc (ssum);
+  if (! parser->storage)
+    return ENOMEM;
+
+  storage = parser->storage;
+  parser->groups = parser->storage;
+  parser->child_inputs = (void **) (storage + gsum);
+  parser->long_opts = (struct option *) (storage + csum);
+  parser->short_opts = storage + lsum;
+  parser->opt_data = opt_data;
+
+  memset (parser->child_inputs, 0, clen);
+  parser_convert (parser, argp, flags);
+
+  memset (&parser->state, 0, sizeof (struct argp_state));
+  parser->state.root_argp = parser->argp;
+  parser->state.argc = argc;
+  parser->state.argv = argv;
+  parser->state.flags = flags;
+  parser->state.err_stream = stderr;
+  parser->state.out_stream = stdout;
+  parser->state.next = 0;       /* Tell getopt to initialize.  */
+  parser->state.pstate = parser;
+
+  parser->try_getopt = 1;
+
+  /* Call each parser for the first time, giving it a chance to propagate
+     values to child parsers.  */
+  if (parser->groups < parser->egroup)
+    parser->groups->input = input;
+  for (group = parser->groups;
+       group < parser->egroup && (!err || err == EBADKEY);
+       group++)
+    {
+      if (group->parent)
+        /* If a child parser, get the initial input value from the parent. */
+        group->input = group->parent->child_inputs[group->parent_index];
+
+      if (!group->parser
+          && group->argp->children && group->argp->children->argp)
+        /* For the special case where no parsing function is supplied for an
+           argp, propagate its input to its first child, if any (this just
+           makes very simple wrapper argps more convenient).  */
+        group->child_inputs[0] = group->input;
+
+      err = group_parse (group, &parser->state, ARGP_KEY_INIT, 0);
+    }
+  if (err == EBADKEY)
+    err = 0;                    /* Some parser didn't understand.  */
+
+  if (err)
+    return err;
+
+  if (parser->state.flags & ARGP_NO_ERRS)
+    {
+      parser->opt_data.opterr = 0;
+      if (parser->state.flags & ARGP_PARSE_ARGV0)
+        /* getopt always skips ARGV[0], so we have to fake it out.  As long
+           as OPTERR is 0, then it shouldn't actually try to access it.  */
+        parser->state.argv--, parser->state.argc++;
+    }
+  else
+    parser->opt_data.opterr = 1;        /* Print error messages.  */
+
+  if (parser->state.argv == argv && argv[0])
+    /* There's an argv[0]; use it for messages.  */
+    parser->state.name = __argp_base_name (argv[0]);
+  else
+    parser->state.name = __argp_short_program_name ();
+
+  return 0;
+}
+
+/* Free any storage consumed by PARSER (but not PARSER itself).  */
+static error_t
+parser_finalize (struct parser *parser,
+                 error_t err, int arg_ebadkey, int *end_index)
+{
+  struct group *group;
+
+  if (err == EBADKEY && arg_ebadkey)
+    /* Suppress errors generated by unparsed arguments.  */
+    err = 0;
+
+  if (! err)
+    {
+      if (parser->state.next == parser->state.argc)
+        /* We successfully parsed all arguments!  Call all the parsers again,
+           just a few more times... */
+        {
+          for (group = parser->groups;
+               group < parser->egroup && (!err || err==EBADKEY);
+               group++)
+            if (group->args_processed == 0)
+              err = group_parse (group, &parser->state, ARGP_KEY_NO_ARGS, 0);
+          for (group = parser->egroup - 1;
+               group >= parser->groups && (!err || err==EBADKEY);
+               group--)
+            err = group_parse (group, &parser->state, ARGP_KEY_END, 0);
+
+          if (err == EBADKEY)
+            err = 0;            /* Some parser didn't understand.  */
+
+          /* Tell the user that all arguments are parsed.  */
+          if (end_index)
+            *end_index = parser->state.next;
+        }
+      else if (end_index)
+        /* Return any remaining arguments to the user.  */
+        *end_index = parser->state.next;
+      else
+        /* No way to return the remaining arguments, they must be bogus. */
+        {
+          if (!(parser->state.flags & ARGP_NO_ERRS)
+              && parser->state.err_stream)
+            fprintf (parser->state.err_stream,
+                     dgettext (parser->argp->argp_domain,
+                               "%s: Too many arguments\n"),
+                     parser->state.name);
+          err = EBADKEY;
+        }
+    }
+
+  /* Okay, we're all done, with either an error or success; call the parsers
+     to indicate which one.  */
+
+  if (err)
+    {
+      /* Maybe print an error message.  */
+      if (err == EBADKEY)
+        /* An appropriate message describing what the error was should have
+           been printed earlier.  */
+        __argp_state_help (&parser->state, parser->state.err_stream,
+                           ARGP_HELP_STD_ERR);
+
+      /* Since we didn't exit, give each parser an error indication.  */
+      for (group = parser->groups; group < parser->egroup; group++)
+        group_parse (group, &parser->state, ARGP_KEY_ERROR, 0);
+    }
+  else
+    /* Notify parsers of success, and propagate back values from parsers.  */
+    {
+      /* We pass over the groups in reverse order so that child groups are
+         given a chance to do there processing before passing back a value to
+         the parent.  */
+      for (group = parser->egroup - 1
+           ; group >= parser->groups && (!err || err == EBADKEY)
+           ; group--)
+        err = group_parse (group, &parser->state, ARGP_KEY_SUCCESS, 0);
+      if (err == EBADKEY)
+        err = 0;                /* Some parser didn't understand.  */
+    }
+
+  /* Call parsers once more, to do any final cleanup.  Errors are ignored.  */
+  for (group = parser->egroup - 1; group >= parser->groups; group--)
+    group_parse (group, &parser->state, ARGP_KEY_FINI, 0);
+
+  if (err == EBADKEY)
+    err = EINVAL;
+
+  free (parser->storage);
+
+  return err;
+}
+
+/* Call the user parsers to parse the non-option argument VAL, at the current
+   position, returning any error.  The state NEXT pointer is assumed to have
+   been adjusted (by getopt) to point after this argument; this function will
+   adjust it correctly to reflect however many args actually end up being
+   consumed.  */
+static error_t
+parser_parse_arg (struct parser *parser, char *val)
+{
+  /* Save the starting value of NEXT, first adjusting it so that the arg
+     we're parsing is again the front of the arg vector.  */
+  int index = --parser->state.next;
+  error_t err = EBADKEY;
+  struct group *group;
+  int key = 0;                  /* Which of ARGP_KEY_ARG[S] we used.  */
+
+  /* Try to parse the argument in each parser.  */
+  for (group = parser->groups
+       ; group < parser->egroup && err == EBADKEY
+       ; group++)
+    {
+      parser->state.next++;     /* For ARGP_KEY_ARG, consume the arg.  */
+      key = ARGP_KEY_ARG;
+      err = group_parse (group, &parser->state, key, val);
+
+      if (err == EBADKEY)
+        /* This parser doesn't like ARGP_KEY_ARG; try ARGP_KEY_ARGS instead. */
+        {
+          parser->state.next--; /* For ARGP_KEY_ARGS, put back the arg.  */
+          key = ARGP_KEY_ARGS;
+          err = group_parse (group, &parser->state, key, 0);
+        }
+    }
+
+  if (! err)
+    {
+      if (key == ARGP_KEY_ARGS)
+        /* The default for ARGP_KEY_ARGS is to assume that if NEXT isn't
+           changed by the user, *all* arguments should be considered
+           consumed.  */
+        parser->state.next = parser->state.argc;
+
+      if (parser->state.next > index)
+        /* Remember that we successfully processed a non-option
+           argument -- but only if the user hasn't gotten tricky and set
+           the clock back.  */
+        (--group)->args_processed += (parser->state.next - index);
+      else
+        /* The user wants to reparse some args, give getopt another try.  */
+        parser->try_getopt = 1;
+    }
+
+  return err;
+}
+
+/* Call the user parsers to parse the option OPT, with argument VAL, at the
+   current position, returning any error.  */
+static error_t
+parser_parse_opt (struct parser *parser, int opt, char *val)
+{
+  /* The group key encoded in the high bits; 0 for short opts or
+     group_number + 1 for long opts.  */
+  int group_key = opt >> USER_BITS;
+  error_t err = EBADKEY;
+
+  if (group_key == 0)
+    /* A short option.  By comparing OPT's position in SHORT_OPTS to the
+       various starting positions in each group's SHORT_END field, we can
+       determine which group OPT came from.  */
+    {
+      struct group *group;
+      char *short_index = strchr (parser->short_opts, opt);
+
+      if (short_index)
+        for (group = parser->groups; group < parser->egroup; group++)
+          if (group->short_end > short_index)
+            {
+              err = group_parse (group, &parser->state, opt,
+                                 parser->opt_data.optarg);
+              break;
+            }
+    }
+  else
+    /* A long option.  We use shifts instead of masking for extracting
+       the user value in order to preserve the sign.  */
+    err =
+      group_parse (&parser->groups[group_key - 1], &parser->state,
+                   (opt << GROUP_BITS) >> GROUP_BITS,
+                   parser->opt_data.optarg);
+
+  if (err == EBADKEY)
+    /* At least currently, an option not recognized is an error in the
+       parser, because we pre-compute which parser is supposed to deal
+       with each option.  */
+    {
+      static const char bad_key_err[] =
+        N_("(PROGRAM ERROR) Option should have been recognized!?");
+      if (group_key == 0)
+        __argp_error (&parser->state, "-%c: %s", opt,
+                      dgettext (parser->argp->argp_domain, bad_key_err));
+      else
+        {
+          struct option *long_opt = parser->long_opts;
+          while (long_opt->val != opt && long_opt->name)
+            long_opt++;
+          __argp_error (&parser->state, "--%s: %s",
+                        long_opt->name ? long_opt->name : "???",
+                        dgettext (parser->argp->argp_domain, bad_key_err));
+        }
+    }
+
+  return err;
+}
+
+/* Parse the next argument in PARSER (as indicated by PARSER->state.next).
+   Any error from the parsers is returned, and *ARGP_EBADKEY indicates
+   whether a value of EBADKEY is due to an unrecognized argument (which is
+   generally not fatal).  */
+static error_t
+parser_parse_next (struct parser *parser, int *arg_ebadkey)
+{
+  int opt;
+  error_t err = 0;
+
+  if (parser->state.quoted && parser->state.next < parser->state.quoted)
+    /* The next argument pointer has been moved to before the quoted
+       region, so pretend we never saw the quoting `--', and give getopt
+       another chance.  If the user hasn't removed it, getopt will just
+       process it again.  */
+    parser->state.quoted = 0;
+
+  if (parser->try_getopt && !parser->state.quoted)
+    /* Give getopt a chance to parse this.  */
+    {
+      /* Put it back in OPTIND for getopt.  */
+      parser->opt_data.optind = parser->state.next;
+      /* Distinguish KEY_ERR from a real option.  */
+      parser->opt_data.optopt = KEY_END;
+      if (parser->state.flags & ARGP_LONG_ONLY)
+        opt = _getopt_long_only_r (parser->state.argc, parser->state.argv,
+                                   parser->short_opts, parser->long_opts, 0,
+                                   &parser->opt_data);
+      else
+        opt = _getopt_long_r (parser->state.argc, parser->state.argv,
+                              parser->short_opts, parser->long_opts, 0,
+                              &parser->opt_data);
+      /* And see what getopt did.  */
+      parser->state.next = parser->opt_data.optind;
+
+      if (opt == KEY_END)
+        /* Getopt says there are no more options, so stop using
+           getopt; we'll continue if necessary on our own.  */
+        {
+          parser->try_getopt = 0;
+          if (parser->state.next > 1
+              && strcmp (parser->state.argv[parser->state.next - 1], QUOTE)
+                   == 0)
+            /* Not only is this the end of the options, but it's a
+               `quoted' region, which may have args that *look* like
+               options, so we definitely shouldn't try to use getopt past
+               here, whatever happens.  */
+            parser->state.quoted = parser->state.next;
+        }
+      else if (opt == KEY_ERR && parser->opt_data.optopt != KEY_END)
+        /* KEY_ERR can have the same value as a valid user short
+           option, but in the case of a real error, getopt sets OPTOPT
+           to the offending character, which can never be KEY_END.  */
+        {
+          *arg_ebadkey = 0;
+          return EBADKEY;
+        }
+    }
+  else
+    opt = KEY_END;
+
+  if (opt == KEY_END)
+    {
+      /* We're past what getopt considers the options.  */
+      if (parser->state.next >= parser->state.argc
+          || (parser->state.flags & ARGP_NO_ARGS))
+        /* Indicate that we're done.  */
+        {
+          *arg_ebadkey = 1;
+          return EBADKEY;
+        }
+      else
+        /* A non-option arg; simulate what getopt might have done.  */
+        {
+          opt = KEY_ARG;
+          parser->opt_data.optarg = parser->state.argv[parser->state.next++];
+        }
+    }
+
+  if (opt == KEY_ARG)
+    /* A non-option argument; try each parser in turn.  */
+    err = parser_parse_arg (parser, parser->opt_data.optarg);
+  else
+    err = parser_parse_opt (parser, opt, parser->opt_data.optarg);
+
+  if (err == EBADKEY)
+    *arg_ebadkey = (opt == KEY_END || opt == KEY_ARG);
+
+  return err;
+}
+
+/* Parse the options strings in ARGC & ARGV according to the argp in ARGP.
+   FLAGS is one of the ARGP_ flags above.  If END_INDEX is non-NULL, the
+   index in ARGV of the first unparsed option is returned in it.  If an
+   unknown option is present, EINVAL is returned; if some parser routine
+   returned a non-zero value, it is returned; otherwise 0 is returned.  */
+error_t
+__argp_parse (const struct argp *argp, int argc, char **argv, unsigned flags,
+              int *end_index, void *input)
+{
+  error_t err;
+  struct parser parser;
+
+  /* If true, then err == EBADKEY is a result of a non-option argument failing
+     to be parsed (which in some cases isn't actually an error).  */
+  int arg_ebadkey = 0;
+
+#ifndef _LIBC
+  if (!(flags & ARGP_PARSE_ARGV0))
+    {
+#ifdef HAVE_DECL_PROGRAM_INVOCATION_NAME
+      if (!program_invocation_name)
+        program_invocation_name = argv[0];
+#endif
+#ifdef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
+      if (!program_invocation_short_name)
+        program_invocation_short_name = __argp_base_name (argv[0]);
+#endif
+    }
+#endif
+
+  if (! (flags & ARGP_NO_HELP))
+    /* Add our own options.  */
+    {
+      struct argp_child *child = alloca (4 * sizeof (struct argp_child));
+      struct argp *top_argp = alloca (sizeof (struct argp));
+
+      /* TOP_ARGP has no options, it just serves to group the user & default
+         argps.  */
+      memset (top_argp, 0, sizeof (*top_argp));
+      top_argp->children = child;
+
+      memset (child, 0, 4 * sizeof (struct argp_child));
+
+      if (argp)
+        (child++)->argp = argp;
+      (child++)->argp = &argp_default_argp;
+      if (argp_program_version || argp_program_version_hook)
+        (child++)->argp = &argp_version_argp;
+      child->argp = 0;
+
+      argp = top_argp;
+    }
+
+  /* Construct a parser for these arguments.  */
+  err = parser_init (&parser, argp, argc, argv, flags, input);
+
+  if (! err)
+    /* Parse! */
+    {
+      while (! err)
+        err = parser_parse_next (&parser, &arg_ebadkey);
+      err = parser_finalize (&parser, err, arg_ebadkey, end_index);
+    }
+
+  return err;
+}
+#ifdef weak_alias
+weak_alias (__argp_parse, argp_parse)
+#endif
+
+/* Return the input field for ARGP in the parser corresponding to STATE; used
+   by the help routines.  */
+void *
+__argp_input (const struct argp *argp, const struct argp_state *state)
+{
+  if (state)
+    {
+      struct group *group;
+      struct parser *parser = state->pstate;
+
+      for (group = parser->groups; group < parser->egroup; group++)
+        if (group->argp == argp)
+          return group->input;
+    }
+
+  return 0;
+}
+#ifdef weak_alias
+weak_alias (__argp_input, _argp_input)
+#endif
diff --git a/gnulib/argp-pin.c b/gnulib/argp-pin.c
new file mode 100644
index 000000000..eda4d958e
--- /dev/null
+++ b/gnulib/argp-pin.c
@@ -0,0 +1,27 @@
+/* Full and short program names for argp module
+   Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
+char *program_invocation_short_name = 0;
+#endif
+#ifndef HAVE_PROGRAM_INVOCATION_NAME
+char *program_invocation_name = 0;
+#endif
+
diff --git a/gnulib/argp-pv.c b/gnulib/argp-pv.c
new file mode 100644
index 000000000..e3227d322
--- /dev/null
+++ b/gnulib/argp-pv.c
@@ -0,0 +1,34 @@
+/* Default definition for ARGP_PROGRAM_VERSION.
+   Copyright (C) 1996, 1997, 1999, 2006, 2009, 2010 Free Software Foundation,
+   Inc.
+   This file is part of the GNU C Library.
+   Written by Miles Bader <miles@gnu.ai.mit.edu>.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* If set by the user program to a non-zero value, then a default option
+   --version is added (unless the ARGP_NO_HELP flag is used), which will
+   print this string followed by a newline and exit (unless the
+   ARGP_NO_EXIT flag is used).  Overridden by ARGP_PROGRAM_VERSION_HOOK.  */
+const char *argp_program_version
+/* This variable should be zero-initialized.  On most systems, putting it into
+   BSS is sufficient.  Not so on MacOS X 10.3 and 10.4, see
+   <http://lists.gnu.org/archive/html/bug-gnulib/2009-01/msg00329.html>
+   <http://lists.gnu.org/archive/html/bug-gnulib/2009-08/msg00096.html>.  */
+#if defined __ELF__
+  /* On ELF systems, variables in BSS behave well.  */
+#else
+  = (const char *) 0
+#endif
+  ;
diff --git a/gnulib/argp-pvh.c b/gnulib/argp-pvh.c
new file mode 100644
index 000000000..fb98fc21c
--- /dev/null
+++ b/gnulib/argp-pvh.c
@@ -0,0 +1,31 @@
+/* Default definition for ARGP_PROGRAM_VERSION_HOOK.
+   Copyright (C) 1996, 1997, 1999, 2004, 2009, 2010 Free Software Foundation,
+   Inc.
+   This file is part of the GNU C Library.
+   Written by Miles Bader <miles@gnu.ai.mit.edu>.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "argp.h"
+
+/* If set by the user program to a non-zero value, then a default option
+   --version is added (unless the ARGP_NO_HELP flag is used), which calls
+   this function with a stream to print the version to and a pointer to the
+   current parsing state, and then exits (unless the ARGP_NO_EXIT flag is
+   used).  This variable takes precedent over ARGP_PROGRAM_VERSION.  */
+void (*argp_program_version_hook) (FILE *stream, struct argp_state *state) = NULL;
diff --git a/gnulib/argp-version-etc.c b/gnulib/argp-version-etc.c
new file mode 100644
index 000000000..f500a8f56
--- /dev/null
+++ b/gnulib/argp-version-etc.c
@@ -0,0 +1,38 @@
+/* Version hook for Argp.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+#include <version-etc.h>
+#include <argp.h>
+#include <argp-version-etc.h>
+
+static const char *program_canonical_name;
+static const char * const *program_authors;
+
+static void
+version_etc_hook (FILE *stream, struct argp_state *state)
+{
+  version_etc_ar (stream, program_canonical_name, PACKAGE_NAME, VERSION,
+                  program_authors);
+}
+
+void
+argp_version_setup (const char *name, const char * const *authors)
+{
+  argp_program_version_hook = version_etc_hook;
+  program_canonical_name = name;
+  program_authors = authors;
+}
diff --git a/gnulib/argp-version-etc.h b/gnulib/argp-version-etc.h
new file mode 100644
index 000000000..7c12c0181
--- /dev/null
+++ b/gnulib/argp-version-etc.h
@@ -0,0 +1,40 @@
+/* Version hook for Argp.
+   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _ARGP_VERSION_ETC_H
+#define _ARGP_VERSION_ETC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Setup standard display of the version information for the `--version'
+   option.  NAME is the canonical program name, and AUTHORS is a NULL-
+   terminated array of author names. At least one author name must be
+   given.
+
+   If NAME is NULL, the package name (as given by the PACKAGE macro)
+   is asumed to be the name of the program.
+
+   This function is intended to be called before argp_parse().
+*/
+extern void argp_version_setup (const char *name, const char * const *authors);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _ARGP_VERSION_ETC_H */
diff --git a/gnulib/argp-xinl.c b/gnulib/argp-xinl.c
new file mode 100644
index 000000000..6e7e20bba
--- /dev/null
+++ b/gnulib/argp-xinl.c
@@ -0,0 +1,42 @@
+/* Real definitions for extern inline functions in argp.h
+   Copyright (C) 1997, 1998, 2004, 2009, 2010 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Written by Miles Bader <miles@gnu.ai.mit.edu>.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if defined _LIBC || defined HAVE_FEATURES_H
+# include <features.h>
+#endif
+
+#ifndef __USE_EXTERN_INLINES
+# define __USE_EXTERN_INLINES   1
+#endif
+#define ARGP_EI
+#undef __OPTIMIZE__
+#define __OPTIMIZE__ 1
+#include "argp.h"
+
+/* Add weak aliases.  */
+#if _LIBC - 0 && defined (weak_alias)
+
+weak_alias (__argp_usage, argp_usage)
+weak_alias (__option_is_short, _option_is_short)
+weak_alias (__option_is_end, _option_is_end)
+
+#endif
diff --git a/gnulib/argp.h b/gnulib/argp.h
new file mode 100644
index 000000000..3667224a9
--- /dev/null
+++ b/gnulib/argp.h
@@ -0,0 +1,645 @@
+/* Hierarchial argument parsing, layered over getopt.
+   Copyright (C) 1995-1999, 2003-2010 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Written by Miles Bader <miles@gnu.ai.mit.edu>.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _ARGP_H
+#define _ARGP_H
+
+#include <stdio.h>
+#include <ctype.h>
+#include <getopt.h>
+#include <limits.h>
+
+#define __need_error_t
+#include <errno.h>
+
+#ifndef __THROW
+# define __THROW
+#endif
+#ifndef __NTH
+# define __NTH(fct) fct __THROW
+#endif
+
+#ifndef __attribute__
+/* The __attribute__ feature is available in gcc versions 2.5 and later.
+   The __-protected variants of the attributes 'format' and 'printf' are
+   accepted by gcc versions 2.6.4 (effectively 2.7) and later.
+   We enable __attribute__ only if these are supported too, because
+   gnulib and libintl do '#define printf __printf__' when they override
+   the 'printf' function.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __attribute__(Spec)   /* empty */
+# endif
+#endif
+
+/* GCC 2.95 and later have "__restrict"; C99 compilers have
+   "restrict", and "configure" may have defined "restrict".
+   Other compilers use __restrict, __restrict__, and _Restrict, and
+   'configure' might #define 'restrict' to those words.  */
+#ifndef __restrict
+# if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__))
+#  if 199901L <= __STDC_VERSION__
+#   define __restrict restrict
+#  else
+#   define __restrict
+#  endif
+# endif
+#endif
+
+#ifndef __error_t_defined
+typedef int error_t;
+# define __error_t_defined
+#endif
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* A description of a particular option.  A pointer to an array of
+   these is passed in the OPTIONS field of an argp structure.  Each option
+   entry can correspond to one long option and/or one short option; more
+   names for the same option can be added by following an entry in an option
+   array with options having the OPTION_ALIAS flag set.  */
+struct argp_option
+{
+  /* The long option name.  For more than one name for the same option, you
+     can use following options with the OPTION_ALIAS flag set.  */
+  const char *name;
+
+  /* What key is returned for this option.  If > 0 and printable, then it's
+     also accepted as a short option.  */
+  int key;
+
+  /* If non-NULL, this is the name of the argument associated with this
+     option, which is required unless the OPTION_ARG_OPTIONAL flag is set. */
+  const char *arg;
+
+  /* OPTION_ flags.  */
+  int flags;
+
+  /* The doc string for this option.  If both NAME and KEY are 0, This string
+     will be printed outdented from the normal option column, making it
+     useful as a group header (it will be the first thing printed in its
+     group); in this usage, it's conventional to end the string with a `:'.
+
+     Write the initial value as N_("TEXT") if you want xgettext to collect
+     it into a POT file.  */
+  const char *doc;
+
+  /* The group this option is in.  In a long help message, options are sorted
+     alphabetically within each group, and the groups presented in the order
+     0, 1, 2, ..., n, -m, ..., -2, -1.  Every entry in an options array with
+     if this field 0 will inherit the group number of the previous entry, or
+     zero if it's the first one, unless its a group header (NAME and KEY both
+     0), in which case, the previous entry + 1 is the default.  Automagic
+     options such as --help are put into group -1.  */
+  int group;
+};
+
+/* The argument associated with this option is optional.  */
+#define OPTION_ARG_OPTIONAL     0x1
+
+/* This option isn't displayed in any help messages.  */
+#define OPTION_HIDDEN           0x2
+
+/* This option is an alias for the closest previous non-alias option.  This
+   means that it will be displayed in the same help entry, and will inherit
+   fields other than NAME and KEY from the aliased option.  */
+#define OPTION_ALIAS            0x4
+
+/* This option isn't actually an option (and so should be ignored by the
+   actual option parser), but rather an arbitrary piece of documentation that
+   should be displayed in much the same manner as the options.  If this flag
+   is set, then the option NAME field is displayed unmodified (e.g., no `--'
+   prefix is added) at the left-margin (where a *short* option would normally
+   be displayed), and the documentation string in the normal place. The NAME
+   field will be translated using gettext, unless OPTION_NO_TRANS is set (see
+   below). For purposes of sorting, any leading whitespace and punctuation is
+   ignored, except that if the first non-whitespace character is not `-', this
+   entry is displayed after all options (and OPTION_DOC entries with a leading
+   `-') in the same group.  */
+#define OPTION_DOC              0x8
+
+/* This option shouldn't be included in `long' usage messages (but is still
+   included in help messages).  This is mainly intended for options that are
+   completely documented in an argp's ARGS_DOC field, in which case including
+   the option in the generic usage list would be redundant.  For instance,
+   if ARGS_DOC is "FOO BAR\n-x BLAH", and the `-x' option's purpose is to
+   distinguish these two cases, -x should probably be marked
+   OPTION_NO_USAGE.  */
+#define OPTION_NO_USAGE         0x10
+
+/* Valid only in conjunction with OPTION_DOC. This option disables translation
+   of option name. */
+#define OPTION_NO_TRANS         0x20
+
+
+struct argp;                    /* fwd declare this type */
+struct argp_state;              /* " */
+struct argp_child;              /* " */
+
+/* The type of a pointer to an argp parsing function.  */
+typedef error_t (*argp_parser_t) (int key, char *arg,
+                                  struct argp_state *state);
+
+/* What to return for unrecognized keys.  For special ARGP_KEY_ keys, such
+   returns will simply be ignored.  For user keys, this error will be turned
+   into EINVAL (if the call to argp_parse is such that errors are propagated
+   back to the user instead of exiting); returning EINVAL itself would result
+   in an immediate stop to parsing in *all* cases.  */
+#define ARGP_ERR_UNKNOWN        E2BIG /* Hurd should never need E2BIG.  XXX */
+
+/* Special values for the KEY argument to an argument parsing function.
+   ARGP_ERR_UNKNOWN should be returned if they aren't understood.
+
+   The sequence of keys to a parsing function is either (where each
+   uppercased word should be prefixed by `ARGP_KEY_' and opt is a user key):
+
+       INIT opt... NO_ARGS END SUCCESS  -- No non-option arguments at all
+   or  INIT (opt | ARG)... END SUCCESS  -- All non-option args parsed
+   or  INIT (opt | ARG)... SUCCESS      -- Some non-option arg unrecognized
+
+   The third case is where every parser returned ARGP_KEY_UNKNOWN for an
+   argument, in which case parsing stops at that argument (returning the
+   unparsed arguments to the caller of argp_parse if requested, or stopping
+   with an error message if not).
+
+   If an error occurs (either detected by argp, or because the parsing
+   function returned an error value), then the parser is called with
+   ARGP_KEY_ERROR, and no further calls are made.  */
+
+/* This is not an option at all, but rather a command line argument.  If a
+   parser receiving this key returns success, the fact is recorded, and the
+   ARGP_KEY_NO_ARGS case won't be used.  HOWEVER, if while processing the
+   argument, a parser function decrements the NEXT field of the state it's
+   passed, the option won't be considered processed; this is to allow you to
+   actually modify the argument (perhaps into an option), and have it
+   processed again.  */
+#define ARGP_KEY_ARG            0
+/* There are remaining arguments not parsed by any parser, which may be found
+   starting at (STATE->argv + STATE->next).  If success is returned, but
+   STATE->next left untouched, it's assumed that all arguments were consume,
+   otherwise, the parser should adjust STATE->next to reflect any arguments
+   consumed.  */
+#define ARGP_KEY_ARGS           0x1000006
+/* There are no more command line arguments at all.  */
+#define ARGP_KEY_END            0x1000001
+/* Because it's common to want to do some special processing if there aren't
+   any non-option args, user parsers are called with this key if they didn't
+   successfully process any non-option arguments.  Called just before
+   ARGP_KEY_END (where more general validity checks on previously parsed
+   arguments can take place).  */
+#define ARGP_KEY_NO_ARGS        0x1000002
+/* Passed in before any parsing is done.  Afterwards, the values of each
+   element of the CHILD_INPUT field, if any, in the state structure is
+   copied to each child's state to be the initial value of the INPUT field.  */
+#define ARGP_KEY_INIT           0x1000003
+/* Use after all other keys, including SUCCESS & END.  */
+#define ARGP_KEY_FINI           0x1000007
+/* Passed in when parsing has successfully been completed (even if there are
+   still arguments remaining).  */
+#define ARGP_KEY_SUCCESS        0x1000004
+/* Passed in if an error occurs.  */
+#define ARGP_KEY_ERROR          0x1000005
+
+/* An argp structure contains a set of options declarations, a function to
+   deal with parsing one, documentation string, a possible vector of child
+   argp's, and perhaps a function to filter help output.  When actually
+   parsing options, getopt is called with the union of all the argp
+   structures chained together through their CHILD pointers, with conflicts
+   being resolved in favor of the first occurrence in the chain.  */
+struct argp
+{
+  /* An array of argp_option structures, terminated by an entry with both
+     NAME and KEY having a value of 0.  */
+  const struct argp_option *options;
+
+  /* What to do with an option from this structure.  KEY is the key
+     associated with the option, and ARG is any associated argument (NULL if
+     none was supplied).  If KEY isn't understood, ARGP_ERR_UNKNOWN should be
+     returned.  If a non-zero, non-ARGP_ERR_UNKNOWN value is returned, then
+     parsing is stopped immediately, and that value is returned from
+     argp_parse().  For special (non-user-supplied) values of KEY, see the
+     ARGP_KEY_ definitions below.  */
+  argp_parser_t parser;
+
+  /* A string describing what other arguments are wanted by this program.  It
+     is only used by argp_usage to print the `Usage:' message.  If it
+     contains newlines, the strings separated by them are considered
+     alternative usage patterns, and printed on separate lines (lines after
+     the first are prefix by `  or: ' instead of `Usage:').  */
+  const char *args_doc;
+
+  /* If non-NULL, a string containing extra text to be printed before and
+     after the options in a long help message (separated by a vertical tab
+     `\v' character).
+     Write the initial value as N_("BEFORE-TEXT") "\v" N_("AFTER-TEXT") if
+     you want xgettext to collect the two pieces of text into a POT file.  */
+  const char *doc;
+
+  /* A vector of argp_children structures, terminated by a member with a 0
+     argp field, pointing to child argps should be parsed with this one.  Any
+     conflicts are resolved in favor of this argp, or early argps in the
+     CHILDREN list.  This field is useful if you use libraries that supply
+     their own argp structure, which you want to use in conjunction with your
+     own.  */
+  const struct argp_child *children;
+
+  /* If non-zero, this should be a function to filter the output of help
+     messages.  KEY is either a key from an option, in which case TEXT is
+     that option's help text, or a special key from the ARGP_KEY_HELP_
+     defines, below, describing which other help text TEXT is.  The function
+     should return either TEXT, if it should be used as-is, a replacement
+     string, which should be malloced, and will be freed by argp, or NULL,
+     meaning `print nothing'.  The value for TEXT is *after* any translation
+     has been done, so if any of the replacement text also needs translation,
+     that should be done by the filter function.  INPUT is either the input
+     supplied to argp_parse, or NULL, if argp_help was called directly.  */
+  char *(*help_filter) (int __key, const char *__text, void *__input);
+
+  /* If non-zero the strings used in the argp library are translated using
+     the domain described by this string.  Otherwise the currently installed
+     default domain is used.  */
+  const char *argp_domain;
+};
+
+/* Possible KEY arguments to a help filter function.  */
+#define ARGP_KEY_HELP_PRE_DOC   0x2000001 /* Help text preceeding options. */
+#define ARGP_KEY_HELP_POST_DOC  0x2000002 /* Help text following options. */
+#define ARGP_KEY_HELP_HEADER    0x2000003 /* Option header string. */
+#define ARGP_KEY_HELP_EXTRA     0x2000004 /* After all other documentation;
+                                             TEXT is NULL for this key.  */
+/* Explanatory note emitted when duplicate option arguments have been
+   suppressed.  */
+#define ARGP_KEY_HELP_DUP_ARGS_NOTE 0x2000005
+#define ARGP_KEY_HELP_ARGS_DOC  0x2000006 /* Argument doc string.  */
+
+/* When an argp has a non-zero CHILDREN field, it should point to a vector of
+   argp_child structures, each of which describes a subsidiary argp.  */
+struct argp_child
+{
+  /* The child parser.  */
+  const struct argp *argp;
+
+  /* Flags for this child.  */
+  int flags;
+
+  /* If non-zero, an optional header to be printed in help output before the
+     child options.  As a side-effect, a non-zero value forces the child
+     options to be grouped together; to achieve this effect without actually
+     printing a header string, use a value of "".  */
+  const char *header;
+
+  /* Where to group the child options relative to the other (`consolidated')
+     options in the parent argp; the values are the same as the GROUP field
+     in argp_option structs, but all child-groupings follow parent options at
+     a particular group level.  If both this field and HEADER are zero, then
+     they aren't grouped at all, but rather merged with the parent options
+     (merging the child's grouping levels with the parents).  */
+  int group;
+};
+
+/* Parsing state.  This is provided to parsing functions called by argp,
+   which may examine and, as noted, modify fields.  */
+struct argp_state
+{
+  /* The top level ARGP being parsed.  */
+  const struct argp *root_argp;
+
+  /* The argument vector being parsed.  May be modified.  */
+  int argc;
+  char **argv;
+
+  /* The index in ARGV of the next arg that to be parsed.  May be modified. */
+  int next;
+
+  /* The flags supplied to argp_parse.  May be modified.  */
+  unsigned flags;
+
+  /* While calling a parsing function with a key of ARGP_KEY_ARG, this is the
+     number of the current arg, starting at zero, and incremented after each
+     such call returns.  At all other times, this is the number of such
+     arguments that have been processed.  */
+  unsigned arg_num;
+
+  /* If non-zero, the index in ARGV of the first argument following a special
+     `--' argument (which prevents anything following being interpreted as an
+     option).  Only set once argument parsing has proceeded past this point. */
+  int quoted;
+
+  /* An arbitrary pointer passed in from the user.  */
+  void *input;
+  /* Values to pass to child parsers.  This vector will be the same length as
+     the number of children for the current parser.  */
+  void **child_inputs;
+
+  /* For the parser's use.  Initialized to 0.  */
+  void *hook;
+
+  /* The name used when printing messages.  This is initialized to ARGV[0],
+     or PROGRAM_INVOCATION_NAME if that is unavailable.  */
+  char *name;
+
+  /* Streams used when argp prints something.  */
+  FILE *err_stream;             /* For errors; initialized to stderr. */
+  FILE *out_stream;             /* For information; initialized to stdout. */
+
+  void *pstate;                 /* Private, for use by argp.  */
+};
+
+/* Flags for argp_parse (note that the defaults are those that are
+   convenient for program command line parsing): */
+
+/* Don't ignore the first element of ARGV.  Normally (and always unless
+   ARGP_NO_ERRS is set) the first element of the argument vector is
+   skipped for option parsing purposes, as it corresponds to the program name
+   in a command line.  */
+#define ARGP_PARSE_ARGV0  0x01
+
+/* Don't print error messages for unknown options to stderr; unless this flag
+   is set, ARGP_PARSE_ARGV0 is ignored, as ARGV[0] is used as the program
+   name in the error messages.  This flag implies ARGP_NO_EXIT (on the
+   assumption that silent exiting upon errors is bad behaviour).  */
+#define ARGP_NO_ERRS    0x02
+
+/* Don't parse any non-option args.  Normally non-option args are parsed by
+   calling the parse functions with a key of ARGP_KEY_ARG, and the actual arg
+   as the value.  Since it's impossible to know which parse function wants to
+   handle it, each one is called in turn, until one returns 0 or an error
+   other than ARGP_ERR_UNKNOWN; if an argument is handled by no one, the
+   argp_parse returns prematurely (but with a return value of 0).  If all
+   args have been parsed without error, all parsing functions are called one
+   last time with a key of ARGP_KEY_END.  This flag needn't normally be set,
+   as the normal behavior is to stop parsing as soon as some argument can't
+   be handled.  */
+#define ARGP_NO_ARGS    0x04
+
+/* Parse options and arguments in the same order they occur on the command
+   line -- normally they're rearranged so that all options come first. */
+#define ARGP_IN_ORDER   0x08
+
+/* Don't provide the standard long option --help, which causes usage and
+      option help information to be output to stdout, and exit (0) called. */
+#define ARGP_NO_HELP    0x10
+
+/* Don't exit on errors (they may still result in error messages).  */
+#define ARGP_NO_EXIT    0x20
+
+/* Use the gnu getopt `long-only' rules for parsing arguments.  */
+#define ARGP_LONG_ONLY  0x40
+
+/* Turns off any message-printing/exiting options.  */
+#define ARGP_SILENT    (ARGP_NO_EXIT | ARGP_NO_ERRS | ARGP_NO_HELP)
+
+/* Parse the options strings in ARGC & ARGV according to the options in ARGP.
+   FLAGS is one of the ARGP_ flags above.  If ARG_INDEX is non-NULL, the
+   index in ARGV of the first unparsed option is returned in it.  If an
+   unknown option is present, ARGP_ERR_UNKNOWN is returned; if some parser
+   routine returned a non-zero value, it is returned; otherwise 0 is
+   returned.  This function may also call exit unless the ARGP_NO_HELP flag
+   is set.  INPUT is a pointer to a value to be passed in to the parser.  */
+extern error_t argp_parse (const struct argp *__restrict __argp,
+                           int /*argc*/, char **__restrict /*argv*/,
+                           unsigned __flags, int *__restrict __arg_index,
+                           void *__restrict __input);
+extern error_t __argp_parse (const struct argp *__restrict __argp,
+                             int /*argc*/, char **__restrict /*argv*/,
+                             unsigned __flags, int *__restrict __arg_index,
+                             void *__restrict __input);
+
+/* Global variables.  */
+
+/* GNULIB makes sure both program_invocation_name and
+   program_invocation_short_name are available */
+#ifdef GNULIB_PROGRAM_INVOCATION_NAME
+extern char *program_invocation_name;
+# undef HAVE_DECL_PROGRAM_INVOCATION_NAME
+# define HAVE_DECL_PROGRAM_INVOCATION_NAME 1
+#endif
+
+#ifdef GNULIB_PROGRAM_INVOCATION_SHORT_NAME
+extern char *program_invocation_short_name;
+# undef HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME
+# define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 1
+#endif
+
+/* If defined or set by the user program to a non-zero value, then a default
+   option --version is added (unless the ARGP_NO_HELP flag is used), which
+   will print this string followed by a newline and exit (unless the
+   ARGP_NO_EXIT flag is used).  Overridden by ARGP_PROGRAM_VERSION_HOOK.  */
+extern const char *argp_program_version;
+
+/* If defined or set by the user program to a non-zero value, then a default
+   option --version is added (unless the ARGP_NO_HELP flag is used), which
+   calls this function with a stream to print the version to and a pointer to
+   the current parsing state, and then exits (unless the ARGP_NO_EXIT flag is
+   used).  This variable takes precedent over ARGP_PROGRAM_VERSION.  */
+extern void (*argp_program_version_hook) (FILE *__restrict __stream,
+                                          struct argp_state *__restrict
+                                          __state);
+
+/* If defined or set by the user program, it should point to string that is
+   the bug-reporting address for the program.  It will be printed by
+   argp_help if the ARGP_HELP_BUG_ADDR flag is set (as it is by various
+   standard help messages), embedded in a sentence that says something like
+   `Report bugs to ADDR.'.  */
+extern const char *argp_program_bug_address;
+
+/* The exit status that argp will use when exiting due to a parsing error.
+   If not defined or set by the user program, this defaults to EX_USAGE from
+   <sysexits.h>.  */
+extern error_t argp_err_exit_status;
+
+/* Flags for argp_help.  */
+#define ARGP_HELP_USAGE         0x01 /* a Usage: message. */
+#define ARGP_HELP_SHORT_USAGE   0x02 /*  " but don't actually print options. */
+#define ARGP_HELP_SEE           0x04 /* a `Try ... for more help' message. */
+#define ARGP_HELP_LONG          0x08 /* a long help message. */
+#define ARGP_HELP_PRE_DOC       0x10 /* doc string preceding long help.  */
+#define ARGP_HELP_POST_DOC      0x20 /* doc string following long help.  */
+#define ARGP_HELP_DOC           (ARGP_HELP_PRE_DOC | ARGP_HELP_POST_DOC)
+#define ARGP_HELP_BUG_ADDR      0x40 /* bug report address */
+#define ARGP_HELP_LONG_ONLY     0x80 /* modify output appropriately to
+                                        reflect ARGP_LONG_ONLY mode.  */
+
+/* These ARGP_HELP flags are only understood by argp_state_help.  */
+#define ARGP_HELP_EXIT_ERR      0x100 /* Call exit(1) instead of returning.  */
+#define ARGP_HELP_EXIT_OK       0x200 /* Call exit(0) instead of returning.  */
+
+/* The standard thing to do after a program command line parsing error, if an
+   error message has already been printed.  */
+#define ARGP_HELP_STD_ERR \
+  (ARGP_HELP_SEE | ARGP_HELP_EXIT_ERR)
+/* The standard thing to do after a program command line parsing error, if no
+   more specific error message has been printed.  */
+#define ARGP_HELP_STD_USAGE \
+  (ARGP_HELP_SHORT_USAGE | ARGP_HELP_SEE | ARGP_HELP_EXIT_ERR)
+/* The standard thing to do in response to a --help option.  */
+#define ARGP_HELP_STD_HELP \
+  (ARGP_HELP_SHORT_USAGE | ARGP_HELP_LONG | ARGP_HELP_EXIT_OK \
+   | ARGP_HELP_DOC | ARGP_HELP_BUG_ADDR)
+
+/* Output a usage message for ARGP to STREAM.  FLAGS are from the set
+   ARGP_HELP_*.  */
+extern void argp_help (const struct argp *__restrict __argp,
+                       FILE *__restrict __stream,
+                       unsigned __flags, char *__restrict __name);
+extern void __argp_help (const struct argp *__restrict __argp,
+                         FILE *__restrict __stream, unsigned __flags,
+                         char *__name);
+
+/* The following routines are intended to be called from within an argp
+   parsing routine (thus taking an argp_state structure as the first
+   argument).  They may or may not print an error message and exit, depending
+   on the flags in STATE -- in any case, the caller should be prepared for
+   them *not* to exit, and should return an appropiate error after calling
+   them.  [argp_usage & argp_error should probably be called argp_state_...,
+   but they're used often enough that they should be short]  */
+
+/* Output, if appropriate, a usage message for STATE to STREAM.  FLAGS are
+   from the set ARGP_HELP_*.  */
+extern void argp_state_help (const struct argp_state *__restrict __state,
+                             FILE *__restrict __stream,
+                             unsigned int __flags);
+extern void __argp_state_help (const struct argp_state *__restrict __state,
+                               FILE *__restrict __stream,
+                               unsigned int __flags);
+
+#if _LIBC || !defined __USE_EXTERN_INLINES
+/* Possibly output the standard usage message for ARGP to stderr and exit.  */
+extern void argp_usage (const struct argp_state *__state);
+extern void __argp_usage (const struct argp_state *__state);
+#endif
+
+/* If appropriate, print the printf string FMT and following args, preceded
+   by the program name and `:', to stderr, and followed by a `Try ... --help'
+   message, then exit (1).  */
+extern void argp_error (const struct argp_state *__restrict __state,
+                        const char *__restrict __fmt, ...)
+     __attribute__ ((__format__ (__printf__, 2, 3)));
+extern void __argp_error (const struct argp_state *__restrict __state,
+                          const char *__restrict __fmt, ...)
+     __attribute__ ((__format__ (__printf__, 2, 3)));
+
+/* Similar to the standard gnu error-reporting function error(), but will
+   respect the ARGP_NO_EXIT and ARGP_NO_ERRS flags in STATE, and will print
+   to STATE->err_stream.  This is useful for argument parsing code that is
+   shared between program startup (when exiting is desired) and runtime
+   option parsing (when typically an error code is returned instead).  The
+   difference between this function and argp_error is that the latter is for
+   *parsing errors*, and the former is for other problems that occur during
+   parsing but don't reflect a (syntactic) problem with the input.  */
+extern void argp_failure (const struct argp_state *__restrict __state,
+                          int __status, int __errnum,
+                          const char *__restrict __fmt, ...)
+     __attribute__ ((__format__ (__printf__, 4, 5)));
+extern void __argp_failure (const struct argp_state *__restrict __state,
+                            int __status, int __errnum,
+                            const char *__restrict __fmt, ...)
+     __attribute__ ((__format__ (__printf__, 4, 5)));
+
+#if _LIBC || !defined __USE_EXTERN_INLINES
+/* Returns true if the option OPT is a valid short option.  */
+extern int _option_is_short (const struct argp_option *__opt) __THROW;
+extern int __option_is_short (const struct argp_option *__opt) __THROW;
+
+/* Returns true if the option OPT is in fact the last (unused) entry in an
+   options array.  */
+extern int _option_is_end (const struct argp_option *__opt) __THROW;
+extern int __option_is_end (const struct argp_option *__opt) __THROW;
+#endif
+
+/* Return the input field for ARGP in the parser corresponding to STATE; used
+   by the help routines.  */
+extern void *_argp_input (const struct argp *__restrict __argp,
+                          const struct argp_state *__restrict __state)
+     __THROW;
+extern void *__argp_input (const struct argp *__restrict __argp,
+                           const struct argp_state *__restrict __state)
+     __THROW;
+
+#ifdef __USE_EXTERN_INLINES
+
+# if !_LIBC
+#  define __argp_usage argp_usage
+#  define __argp_state_help argp_state_help
+#  define __option_is_short _option_is_short
+#  define __option_is_end _option_is_end
+# endif
+
+# ifndef ARGP_EI
+#  ifdef __GNUC__
+    /* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
+       inline semantics, unless -fgnu89-inline is used.  It defines a macro
+       __GNUC_STDC_INLINE__ to indicate this situation or a macro
+       __GNUC_GNU_INLINE__ to indicate the opposite situation.
+       GCC 4.2 with -std=c99 or -std=gnu99 implements the GNU C inline
+       semantics but warns, unless -fgnu89-inline is used:
+         warning: C99 inline functions are not supported; using GNU89
+         warning: to disable this warning use -fgnu89-inline or the gnu_inline function attribute
+       It defines a macro __GNUC_GNU_INLINE__ to indicate this situation.  */
+#   if defined __GNUC_STDC_INLINE__
+#    define ARGP_EI __inline__
+#   elif defined __GNUC_GNU_INLINE__
+#    define ARGP_EI extern __inline__ __attribute__ ((__gnu_inline__))
+#   else
+#    define ARGP_EI extern __inline__
+#   endif
+#  else
+    /* With other compilers, assume the ISO C99 meaning of 'inline', if
+       the compiler supports 'inline' at all.  */
+#   define ARGP_EI inline
+#  endif
+# endif
+
+ARGP_EI void
+__argp_usage (const struct argp_state *__state)
+{
+  __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
+}
+
+ARGP_EI int
+__NTH (__option_is_short (const struct argp_option *__opt))
+{
+  if (__opt->flags & OPTION_DOC)
+    return 0;
+  else
+    {
+      int __key = __opt->key;
+      return __key > 0 && __key <= UCHAR_MAX && isprint (__key);
+    }
+}
+
+ARGP_EI int
+__NTH (__option_is_end (const struct argp_option *__opt))
+{
+  return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
+}
+
+# if !_LIBC
+#  undef __argp_usage
+#  undef __argp_state_help
+#  undef __option_is_short
+#  undef __option_is_end
+# endif
+#endif /* Use extern inlines.  */
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif /* argp.h */

From 3a5768645c0594efc8fdd41a07661854e8709ccd Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 3 Apr 2010 11:53:29 +0200
Subject: [PATCH 0719/1628] First version of allocation from firmware

---
 conf/i386.rmk                    |   7 +
 include/grub/relocator_private.h |  46 ++++
 lib/i386/relocator.c             |   1 +
 lib/ieee1275/relocator.c         |  83 ++++++
 lib/relocator.c                  | 450 +++++++++++++++++++++----------
 5 files changed, 440 insertions(+), 147 deletions(-)
 create mode 100644 lib/ieee1275/relocator.c

diff --git a/conf/i386.rmk b/conf/i386.rmk
index 87514cb1f..868a767b1 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -16,9 +16,16 @@ vga_text_mod_CFLAGS = $(COMMON_CFLAGS)
 vga_text_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += relocator.mod
+ifeq ($(platform), ieee1275)
+relocator_mod_SOURCES = lib/relocator.c lib/i386/relocator32.S \
+	lib/i386/relocator64.S lib/i386/relocator16.S \
+	lib/$(target_cpu)/relocator_asm.S lib/i386/relocator.c \
+	lib/ieee1275/relocator.c
+else
 relocator_mod_SOURCES = lib/relocator.c lib/i386/relocator32.S \
 	lib/i386/relocator64.S lib/i386/relocator16.S \
 	lib/$(target_cpu)/relocator_asm.S lib/i386/relocator.c
+endif
 relocator_mod_CFLAGS = $(COMMON_CFLAGS)
 relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
 relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/include/grub/relocator_private.h b/include/grub/relocator_private.h
index f9e76468e..c526b0b0c 100644
--- a/include/grub/relocator_private.h
+++ b/include/grub/relocator_private.h
@@ -21,6 +21,7 @@
 
 #include <grub/types.h>
 #include <grub/err.h>
+#include <grub/mm_private.h>
 
 extern grub_size_t grub_relocator_align;
 extern grub_size_t grub_relocator_forward_size;
@@ -38,4 +39,49 @@ void grub_cpu_relocator_backward (void *rels, void *src, void *tgt,
 				 grub_size_t size);
 void grub_cpu_relocator_jumper (void *rels, grub_addr_t addr);
 
+#ifdef GRUB_MACHINE_IEEE1275
+#define GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS 1
+#else
+#define GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS 0
+#endif
+
+struct grub_relocator_mmap_event
+{
+  enum {
+    IN_REG_START = 0, 
+    IN_REG_END = 1, 
+    REG_BEG_START = 2, 
+    REG_BEG_END = REG_BEG_START | 1,
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+    REG_FIRMWARE_START = 4, 
+    REG_FIRMWARE_END = REG_FIRMWARE_START | 1,
+    /* To track the regions already in heap.  */
+    FIRMWARE_BLOCK_START = 6, 
+    FIRMWARE_BLOCK_END = FIRMWARE_BLOCK_START | 1,
+#endif
+    COLLISION_START = 8,
+    COLLISION_END = COLLISION_START | 1
+  } type;
+  grub_addr_t pos;
+  union
+  {
+    struct
+    {
+      grub_mm_region_t reg;
+      grub_mm_header_t hancestor;
+      grub_mm_region_t *regancestor;
+      grub_mm_header_t head;
+    };
+  };
+};
+
+/* Return 0 on failure, 1 on success. The failure here 
+   can be very time-expensive, so please make sure fill events is accurate.  */
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+int grub_relocator_firmware_alloc_region (grub_addr_t start, grub_size_t size);
+unsigned grub_relocator_firmware_fill_events (struct grub_relocator_mmap_event *events);
+unsigned grub_relocator_firmware_get_max_events (void);
+void grub_relocator_firmware_free_region (grub_addr_t start, grub_size_t size);
+#endif
+
 #endif
diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index 4eaa66890..a4038d75f 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -253,6 +253,7 @@ grub_relocator64_boot (struct grub_relocator *rel,
     return err;
 
   asm volatile ("cli");
+  grub_printf ("%x\n", relst);
   ((void (*) (void)) relst) ();
 
   /* Not reached.  */
diff --git a/lib/ieee1275/relocator.c b/lib/ieee1275/relocator.c
new file mode 100644
index 000000000..bf7f4a821
--- /dev/null
+++ b/lib/ieee1275/relocator.c
@@ -0,0 +1,83 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/relocator.h>
+#include <grub/relocator_private.h>
+#include <grub/memory.h>
+#include <grub/ieee1275/ieee1275.h>
+
+unsigned 
+grub_relocator_firmware_get_max_events (void)
+{
+  int counter = 0;
+  auto int NESTED_FUNC_ATTR count (grub_uint64_t addr __attribute__ ((unused)),
+				   grub_uint64_t len __attribute__ ((unused)),
+				   grub_uint32_t type __attribute__ ((unused)));
+  int NESTED_FUNC_ATTR count (grub_uint64_t addr __attribute__ ((unused)), 
+			      grub_uint64_t len __attribute__ ((unused)), 
+			      grub_uint32_t type __attribute__ ((unused)))
+  {
+    counter++;
+    return 0;
+  }
+
+  if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CANNOT_INTERPRET))
+    return 0;
+  grub_machine_mmap_iterate (count);
+  return 2 * counter;
+}
+
+unsigned 
+grub_relocator_firmware_fill_events (struct grub_relocator_mmap_event *events)
+{
+  int counter = 0;
+  auto int NESTED_FUNC_ATTR fill (grub_uint64_t addr, grub_uint64_t len,
+				  grub_uint32_t type);
+  int NESTED_FUNC_ATTR fill (grub_uint64_t addr, grub_uint64_t len,
+			     grub_uint32_t type)
+  {
+    if (type != GRUB_MACHINE_MEMORY_AVAILABLE)
+      return 0;
+
+    events[counter].type = REG_FIRMWARE_START;
+    events[counter].pos = addr;
+    counter++;
+    events[counter].type = REG_FIRMWARE_END;
+    events[counter].pos = addr + len;
+    counter++;
+
+    return 0;
+  }
+
+  if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CANNOT_INTERPRET))
+    return 0;
+  grub_machine_mmap_iterate (fill);
+  return counter;
+}
+
+int
+grub_relocator_firmware_alloc_region (grub_addr_t start, grub_size_t size)
+{
+  return (grub_claimmap (start, size) >= 0);
+}
+
+void
+grub_relocator_firmware_free_region (grub_addr_t start, grub_size_t size)
+{
+  grub_ieee1275_release (start, size);
+}
diff --git a/lib/relocator.c b/lib/relocator.c
index 38aa67502..bf8fa3718 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2009, 2010  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
@@ -23,7 +23,6 @@
 #include <grub/cache.h>
 
 /* FIXME: check memory map.  */ 
-/* FIXME: try to request memory from firmware.  */
 
 struct grub_relocator
 {
@@ -36,7 +35,11 @@ struct grub_relocator
 
 struct grub_relocator_subchunk
 {
-  enum {CHUNK_TYPE_IN_REGION, CHUNK_TYPE_REGION_START} type;
+  enum {CHUNK_TYPE_IN_REGION, CHUNK_TYPE_REGION_START,
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+	CHUNK_TYPE_FIRMWARE
+#endif
+  } type;
   grub_addr_t host_start;
   grub_addr_t start;
   grub_size_t size;
@@ -52,6 +55,15 @@ struct grub_relocator_chunk
   unsigned nsubchunks;
 };
 
+struct grub_relocator_extra_block
+{
+  struct grub_relocator_extra_block *next;
+  grub_addr_t start;
+  grub_addr_t end;
+};
+
+struct grub_relocator_extra_block *extra_blocks;
+
 struct grub_relocator *
 grub_relocator_new (void)
 {
@@ -70,29 +82,6 @@ grub_relocator_new (void)
   return ret;
 }
 
-struct event
-{
-  enum {
-    IN_REG_START = 0, 
-    IN_REG_END = 1, 
-    REG_BEG_START = 2, 
-    REG_BEG_END = REG_BEG_START | 1,
-    COLLISION_START = 4, 
-    COLLISION_END = COLLISION_START | 1
-  } type;
-  grub_addr_t pos;
-  union
-  {
-    struct
-    {
-      grub_mm_region_t reg;
-      grub_mm_header_t hancestor;
-      grub_mm_region_t *regancestor;
-      grub_mm_header_t head;
-    };
-  };
-};
-
 #define DIGITSORT_BITS 8
 #define DIGITSORT_MASK ((1 << DIGITSORT_BITS) - 1)
 #define BITS_IN_BYTE 8
@@ -221,7 +210,7 @@ malloc_in_range (struct grub_relocator *rel,
 		 int from_low_priv, int collisioncheck)
 {
   grub_mm_region_t r, *ra, base_saved;
-  struct event *events = NULL, *eventt = NULL, *t;
+  struct grub_relocator_mmap_event *events = NULL, *eventt = NULL, *t;
   unsigned maxevents = 2;
   grub_mm_header_t p, pa;
   unsigned *counter;
@@ -254,7 +243,7 @@ malloc_in_range (struct grub_relocator *rel,
 	  p = p->next;
 	}
       while (p != r->first);
-      maxevents += 2;
+      maxevents += 4;
     }
   if (collisioncheck && rel)
     {
@@ -263,6 +252,16 @@ malloc_in_range (struct grub_relocator *rel,
 	maxevents += 2;
     }
 
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+  {
+    struct grub_relocator_extra_block *cur;
+    for (cur = extra_blocks; cur; cur = cur->next)
+      maxevents += 2;
+  }
+#endif
+
+  maxevents += grub_relocator_firmware_get_max_events ();
+
   events = grub_malloc (maxevents * sizeof (events[0]));
   eventt = grub_malloc (maxevents * sizeof (events[0]));
   counter = grub_malloc ((DIGITSORT_MASK + 2) * sizeof (counter[0]));
@@ -290,6 +289,35 @@ malloc_in_range (struct grub_relocator *rel,
 	}
     }
 
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+  for (r = grub_mm_base; r; r = r->next)
+    {
+      grub_dprintf ("relocator", "Blocking at 0x%x-0x%x\n",
+		    (grub_addr_t) r - r->pre_size, 
+		    (grub_addr_t) (r + 1) + r->size);
+      events[N].type = FIRMWARE_BLOCK_START;
+      events[N].pos = (grub_addr_t) r - r->pre_size;
+      N++;
+      events[N].type = FIRMWARE_BLOCK_END;
+      events[N].pos = (grub_addr_t) (r + 1) + r->size;
+      N++;
+    }
+  {
+    struct grub_relocator_extra_block *cur;
+    for (cur = extra_blocks; cur; cur = cur->next)
+      {
+	grub_dprintf ("relocator", "Blocking at 0x%x-0x%x\n",
+		      cur->start, cur->end);
+	events[N].type = FIRMWARE_BLOCK_START;
+	events[N].pos = cur->start;
+	N++;
+	events[N].type = FIRMWARE_BLOCK_END;
+	events[N].pos = cur->end;
+	N++;
+      }
+  }
+#endif
+
   /* No malloc from this point.  */
   base_saved = grub_mm_base;
   grub_mm_base = NULL;
@@ -344,6 +372,8 @@ malloc_in_range (struct grub_relocator *rel,
 	}
     }
 
+  N += grub_relocator_firmware_fill_events (events + N);
+
   /* Put ending events after starting events.  */
   {
     int st = 0, e = N / 2;
@@ -373,104 +403,86 @@ malloc_in_range (struct grub_relocator *rel,
       events = t;
     }
 
-  grub_dprintf ("relocator", "scanline events:\n");
-  for (j = 0; j < N; j++)
-    grub_dprintf ("relocator", "event %x, type %d\n", events[j].pos,
-		  events[j].type);
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+ retry:
+#endif
 
   /* Now events are nicely sorted.  */
-  if (from_low_priv)
-    {
-      int nstarted = 0, ncollisions = 0;
-      grub_addr_t starta = 0;
-      int numstarted;
-      for (j = 0; j < N; j++)
-	{
-	  switch (events[j].type)
-	    {
-	    case COLLISION_END:
-	      ncollisions--;
-	    case IN_REG_START:
-	    case REG_BEG_START:
-	      if ((events[j].type == COLLISION_END ? nstarted != 0
-		   : nstarted == 0) 
-		  && ncollisions == 0)
-		{
-		  starta = ALIGN_UP (events[j].pos, align);
-		  numstarted = j;
-		}
-	      if (events[j].type != COLLISION_END)
-		nstarted++;
-	      break;
+  {
+    int nstarted = 0, ncollisions = 0, nstartedfw = 0, nblockfw = 0;
+    grub_addr_t starta = 0;
+    int numstarted;
+    for (j = from_low_priv ? 0 : N - 1; from_low_priv ? j < N : (j + 1); 
+	 from_low_priv ? j++ : j--)
+      {
+	int isinsidebefore, isinsideafter;
+	isinsidebefore = (!ncollisions 
+			  && (nstarted || (nstartedfw && !nblockfw)));
+	switch (events[j].type)
+	  {
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+	  case REG_FIRMWARE_START:
+	    nstartedfw++;
+	    break;
 
-	    case IN_REG_END:
-	    case REG_BEG_END:
-		nstarted--;
-	    case COLLISION_START:
-	      if (((events[j].type == COLLISION_START)
-		   ? nstarted != 0 : nstarted == 0) 
-		  && ncollisions == 0)
-		{
-		  target = starta;
-		  if (target < start)
-		    target = start;
-		  grub_dprintf ("relocator", "%x, %x, %x\n", target, start,
-				events[j].pos);
-		  if (target + size <= end && target + size <= events[j].pos)
-		    /* Found an usable address.  */
-		    goto found;
-		}
-	      if (events[j].type == COLLISION_START)
-		ncollisions++;
-	      break;
-	    }
-	}
-    }
-  else
-    {
-      int nstarted = 0, ncollisions = 0;
-      grub_addr_t enda = 0;
-      int numend;
-      for (j = N - 1; j != (unsigned) -1; j--)
-	{
-	  switch (events[j].type)
-	    {
-	    case COLLISION_START:
-	      ncollisions--;
-	    case IN_REG_END:
-	    case REG_BEG_END:
-	      if ((events[j].type == COLLISION_END ? nstarted != 0 
-		   : nstarted == 0) 
-		  && ncollisions == 0)
-		{
-		  enda = ALIGN_DOWN (events[j].pos - size, align) + size;
-		  numend = j;
-		}
-	      nstarted++;
-	      break;
+	  case REG_FIRMWARE_END:
+	    nstartedfw--;
+	    break;
 
-	    case IN_REG_START:
-	    case REG_BEG_START:
-		nstarted--;
-	    case COLLISION_END:
-	      if ((events[j].type == COLLISION_START ? nstarted != 0
-		   : nstarted == 0) 
-		  && ncollisions == 0)
-		{
-		  target = enda - size;
-		  if (target > end - size)
-		    target = end - size;
-		  grub_dprintf ("relocator", "%x, %x, %x\n", target, start,
-				events[j].pos);
-		  if (target >= start && target >= events[j].pos)
-		    goto found;
-		}
-	      if (events[j].type == COLLISION_START)
-		ncollisions++;
-	      break;
-	    }
-	}
-    }
+	  case FIRMWARE_BLOCK_START:
+	    nblockfw++;
+	    break;
+
+	  case FIRMWARE_BLOCK_END:
+	    nblockfw--;
+	    break;
+#endif
+
+	  case COLLISION_START:
+	    ncollisions++;
+	    break;
+
+	  case COLLISION_END:
+	    ncollisions--;
+	    break;
+
+	  case IN_REG_START:
+	  case REG_BEG_START:
+	    nstarted++;
+	    break;
+
+	  case IN_REG_END:
+	  case REG_BEG_END:
+	    nstarted--;
+	    break;
+	  }
+	isinsideafter = (!ncollisions 
+			 && (nstarted || (nstartedfw && !nblockfw)));
+	if (!isinsidebefore && isinsideafter)
+	  {
+	    starta = from_low_priv ? ALIGN_UP (events[j].pos, align)
+	      : ALIGN_DOWN (events[j].pos - size, align) + size;
+	    numstarted = j;
+	  }
+	if (isinsidebefore && !isinsideafter && from_low_priv)
+	  {
+	    target = starta;
+	    if (target < start)
+	      target = start;
+	    if (target + size <= end && target + size <= events[j].pos)
+	      /* Found an usable address.  */
+	      goto found;
+	  }
+	if (isinsidebefore && !isinsideafter && !from_low_priv)
+	  {
+	    target = starta - size;
+	    if (target > end - size)
+	      target = end - size;
+	    if (target >= start && target >= events[j].pos)
+	      goto found;
+	  }
+      }
+  }
 
   grub_mm_base = base_saved;
   grub_free (events);
@@ -480,9 +492,24 @@ malloc_in_range (struct grub_relocator *rel,
 
  found:
   {
+    int inreg = 0, regbeg = 0, fwin = 0, fwb = 0, ncol = 0;
     int last_start = 0;
     for (j = 0; j < N; j++)
       {
+	int typepre;
+	if (ncol)
+	  typepre = -1;
+	else if (regbeg)
+	  typepre = CHUNK_TYPE_REGION_START;
+	else if (inreg)
+	  typepre = CHUNK_TYPE_IN_REGION;
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+	else if (fwin && !fwb)
+	  typepre = CHUNK_TYPE_FIRMWARE;
+#endif
+	else
+	  typepre = -1;
+
 	if (j != 0 && events[j - 1].pos != events[j].pos)
 	  {
 	    grub_addr_t alloc_start, alloc_end;
@@ -490,28 +517,84 @@ malloc_in_range (struct grub_relocator *rel,
 	    alloc_end = min (events[j].pos, target + size);
 	    if (alloc_end > alloc_start)
 	      {
-		grub_dprintf ("relocator", "%d\n", last_start);
-
-		if (events[last_start].type == REG_BEG_START
-		    || events[last_start].type == IN_REG_START)
+		switch (typepre)
 		  {
-		    if (events[last_start].type == REG_BEG_START &&
-			(grub_addr_t) (events[last_start].reg + 1) > target)
-		      allocate_regstart (alloc_start, alloc_end - alloc_start,
-					 events[last_start].reg,
-					 events[last_start].regancestor,
-					 events[last_start].hancestor);
-		    else
-		      allocate_inreg (alloc_start, alloc_end - alloc_start,
-				      events[last_start].head,
-				      events[last_start].hancestor,
-				      events[last_start].reg);
+		  case CHUNK_TYPE_REGION_START:
+		    allocate_regstart (alloc_start, alloc_end - alloc_start,
+				       events[last_start].reg,
+				       events[last_start].regancestor,
+				       events[last_start].hancestor);
+		    break;
+		  case CHUNK_TYPE_IN_REGION:
+		    allocate_inreg (alloc_start, alloc_end - alloc_start,
+				    events[last_start].head,
+				    events[last_start].hancestor,
+				    events[last_start].reg);
+		    break;
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+		  case CHUNK_TYPE_FIRMWARE:
+		    /* The failure here can be very expensive.  */
+		    if (!grub_relocator_firmware_alloc_region (alloc_start, 
+							       alloc_end - alloc_start))
+		      {
+			grub_dprintf ("relocator",
+				      "firmware allocation 0x%x-0x%x failed.\n",
+				      alloc_start, alloc_end);
+			if (from_low_priv)
+			  start = alloc_end;
+			else
+			  end = alloc_start;
+			goto retry;
+		      }
+		    break;
+#endif
 		  }
 		nallocs++;
 	      }
 	  }
-	if (is_start (events[j].type))
-	  last_start = j;
+	  
+	switch (events[j].type)
+	  {
+	  case REG_BEG_START:
+	  case IN_REG_START:
+	    if (events[j].type == REG_BEG_START &&
+		(grub_addr_t) (events[j].reg + 1) > target)
+	      regbeg++;
+	    else
+	      inreg++;
+	    last_start = j;
+	    break;
+
+	  case REG_BEG_END:
+	  case IN_REG_END:
+	    inreg = regbeg = 0;
+	    break;
+
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+	  case REG_FIRMWARE_START:
+	    fwin++;
+	    break;
+
+	  case REG_FIRMWARE_END:
+	    fwin--;
+	    break;
+
+	  case FIRMWARE_BLOCK_START:
+	    fwb++;
+	    break;
+
+	  case FIRMWARE_BLOCK_END:
+	    fwb--;
+	    break;
+#endif
+	  case COLLISION_START:
+	    ncol++;
+	    break;
+	  case COLLISION_END:
+	    ncol--;
+	    break;
+	  }
+
       }
   }
 
@@ -538,9 +621,24 @@ malloc_in_range (struct grub_relocator *rel,
 
   {
     int last_start = 0;
+    int inreg = 0, regbeg = 0, fwin = 0, fwb = 0, ncol = 0;
     int cural = 0;
     for (j = 0; j < N; j++)
       {
+	int typepre;
+	if (ncol)
+	  typepre = -1;
+	else if (regbeg)
+	  typepre = CHUNK_TYPE_REGION_START;
+	else if (inreg)
+	  typepre = CHUNK_TYPE_IN_REGION;
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+	else if (fwin && !fwb)
+	  typepre = CHUNK_TYPE_FIRMWARE;
+#endif
+	else
+	  typepre = -1;
+
 	if (j != 0 && events[j - 1].pos != events[j].pos)
 	  {
 	    grub_addr_t alloc_start, alloc_end;
@@ -548,23 +646,76 @@ malloc_in_range (struct grub_relocator *rel,
 	    alloc_end = min (events[j].pos, target + size);
 	    if (alloc_end > alloc_start)
 	      {
-		res->subchunks[cural].start = alloc_start;
-		res->subchunks[cural].size = alloc_end - alloc_start;
-		if (res->subchunks[last_start].type == IN_REG_START)
-		  res->subchunks[cural].type = CHUNK_TYPE_IN_REGION;
-		else if (res->subchunks[last_start].type == REG_BEG_START)
+		grub_dprintf ("relocator", "subchunk 0x%x-0x%x, %d\n",
+			      alloc_start, alloc_end, typepre);
+		res->subchunks[cural].type = typepre;
+		if (typepre == CHUNK_TYPE_REGION_START)
 		  {
-		    res->subchunks[cural].type = CHUNK_TYPE_REGION_START;
 		    res->subchunks[cural].host_start
 		      = (grub_addr_t) events[last_start].reg;
 		  }
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+		if (typepre == CHUNK_TYPE_REGION_START
+		    || typepre == CHUNK_TYPE_FIRMWARE)
+		  {
+		    /* FIXME: react on out of memory.  */
+		    struct grub_relocator_extra_block *ne;
+		    ne = grub_malloc (sizeof (*ne));
+		    ne->start = alloc_start;
+		    ne->end = alloc_end;
+		    ne->next = extra_blocks;
+		    extra_blocks = ne;
+		  }
+#endif
 		cural++;
 	      }
 	  }
-	if (is_start (events[j].type))
-	  last_start = j;
+	  
+	switch (events[j].type)
+	  {
+	  case REG_BEG_START:
+	  case IN_REG_START:
+	    if (events[j].type == REG_BEG_START &&
+		(grub_addr_t) (events[j].reg + 1) > target)
+	      regbeg++;
+	    else
+	      inreg++;
+	    last_start = j;
+	    break;
+
+	  case REG_BEG_END:
+	  case IN_REG_END:
+	    inreg = regbeg = 0;
+	    break;
+
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+	  case REG_FIRMWARE_START:
+	    fwin++;
+	    break;
+
+	  case REG_FIRMWARE_END:
+	    fwin--;
+	    break;
+
+	  case FIRMWARE_BLOCK_START:
+	    fwb++;
+	    break;
+
+	  case FIRMWARE_BLOCK_END:
+	    fwb--;
+	    break;
+#endif
+	  case COLLISION_START:
+	    ncol++;
+	    break;
+	  case COLLISION_END:
+	    ncol--;
+	    break;
+	  }
+
       }
   }
+
   res->src = target;
   res->size = size;
   grub_dprintf ("relocator", "allocated: %x %x\n", target, size);
@@ -801,6 +952,7 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
   return GRUB_ERR_NONE;
 }
 
+/* FIXME: remove extra blocks.  */
 void
 grub_relocator_unload (struct grub_relocator *rel)
 {
@@ -856,6 +1008,10 @@ grub_relocator_unload (struct grub_relocator *rel)
 	      grub_free (h + 1);
 	      break;
 	    }
+	  case CHUNK_TYPE_FIRMWARE:
+	    grub_relocator_firmware_free_region (chunk->subchunks[i].start,
+						 chunk->subchunks[i].size);
+	    break;
 	  }
       next = chunk->next;
       grub_free (chunk->subchunks);

From a60f822cb2a0b78fecd92fe311538918871a79e6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 3 Apr 2010 14:12:43 +0200
Subject: [PATCH 0720/1628] Add missing id field to grub_video_sm712_adapter

---
 include/grub/video.h | 13 +++++++------
 video/sm712.c        |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/grub/video.h b/include/grub/video.h
index 57f2b37f2..782a5281b 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -180,7 +180,8 @@ typedef enum grub_video_driver_id
     GRUB_VIDEO_DRIVER_NONE,
     GRUB_VIDEO_DRIVER_VBE,
     GRUB_VIDEO_DRIVER_EFI_UGA,
-    GRUB_VIDEO_DRIVER_EFI_GOP
+    GRUB_VIDEO_DRIVER_EFI_GOP,
+    GRUB_VIDEO_DRIVER_SM712
   } grub_video_driver_id_t;
 
 struct grub_video_adapter
@@ -272,7 +273,7 @@ grub_err_t EXPORT_FUNC (grub_video_get_info) (struct grub_video_mode_info *mode_
    sure that framebuffer address doesn't change. To ensure this abstraction
    grub_video_get_info_and_fini is the only function supplying framebuffer
    address. */
-grub_err_t grub_video_get_info_and_fini (struct grub_video_mode_info *mode_info,
+grub_err_t EXPORT_FUNC (grub_video_get_info_and_fini) (struct grub_video_mode_info *mode_info,
 					 void **framebuffer);
 
 enum grub_video_blit_format grub_video_get_blit_format (struct grub_video_mode_info *mode_info);
@@ -280,8 +281,9 @@ enum grub_video_blit_format grub_video_get_blit_format (struct grub_video_mode_i
 grub_err_t grub_video_set_palette (unsigned int start, unsigned int count,
                                    struct grub_video_palette_data *palette_data);
 
-grub_err_t grub_video_get_palette (unsigned int start, unsigned int count,
-                                   struct grub_video_palette_data *palette_data);
+grub_err_t EXPORT_FUNC (grub_video_get_palette) (unsigned int start,
+						 unsigned int count,
+						 struct grub_video_palette_data *palette_data);
 
 grub_err_t EXPORT_FUNC (grub_video_set_viewport) (unsigned int x,
 						  unsigned int y,
@@ -356,7 +358,6 @@ grub_video_check_mode_flag (unsigned int flags, unsigned int mask,
   return (flag & mask) ? !! (flags & flag) : def;
 }
 
-grub_video_driver_id_t
-grub_video_get_driver_id (void);
+grub_video_driver_id_t EXPORT_FUNC (grub_video_get_driver_id) (void);
 
 #endif /* ! GRUB_VIDEO_HEADER */
diff --git a/video/sm712.c b/video/sm712.c
index a86470b7d..33861beef 100644
--- a/video/sm712.c
+++ b/video/sm712.c
@@ -191,6 +191,7 @@ grub_video_sm712_get_info_and_fini (struct grub_video_mode_info *mode_info,
 static struct grub_video_adapter grub_video_sm712_adapter =
   {
     .name = "SM712 Video Driver",
+    .id = GRUB_VIDEO_DRIVER_SM712,
 
     .init = grub_video_sm712_video_init,
     .fini = grub_video_sm712_video_fini,

From 8c46a785e3ae8d624b74bf1bc4af80b307466fd3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 3 Apr 2010 14:14:48 +0200
Subject: [PATCH 0721/1628] mips multiboot2 support

---
 conf/mips.rmk                 |  7 +++++++
 include/grub/i386/multiboot.h | 14 ++++++++++++++
 include/grub/mips/multiboot.h | 36 +++++++++++++++++++++++++++++++++++
 include/multiboot2.h          |  3 ++-
 loader/i386/multiboot.c       | 18 ++++++------------
 loader/i386/multiboot_elfxx.c |  4 ++--
 loader/i386/multiboot_mbi2.c  |  3 ++-
 7 files changed, 69 insertions(+), 16 deletions(-)
 create mode 100644 include/grub/mips/multiboot.h

diff --git a/conf/mips.rmk b/conf/mips.rmk
index face4127d..1776a5d18 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -30,4 +30,11 @@ relocator_mod_CFLAGS = $(COMMON_CFLAGS)
 relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
 relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += multiboot2.mod
+multiboot2_mod_SOURCES = loader/i386/multiboot.c \
+			 loader/i386/multiboot_mbi2.c
+multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
+multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
+multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
+
 include $(srcdir)/conf/common.mk
diff --git a/include/grub/i386/multiboot.h b/include/grub/i386/multiboot.h
index 8131e9477..1c711fad4 100644
--- a/include/grub/i386/multiboot.h
+++ b/include/grub/i386/multiboot.h
@@ -24,4 +24,18 @@ extern char *grub_multiboot_payload_orig;
 extern grub_addr_t grub_multiboot_payload_dest;
 extern grub_size_t grub_multiboot_payload_size;
 
+#define MULTIBOOT_INITIAL_STATE  { .eax = MULTIBOOT_BOOTLOADER_MAGIC,	\
+    .ecx = 0,								\
+    .edx = 0,								\
+    /* Set esp to some random location in low memory to avoid breaking */ \
+    /* non-compliant kernels.  */					\
+    .esp = 0x7ff00							\
+      }
+#define MULTIBOOT_ENTRY_REGISTER eip
+#define MULTIBOOT_MBI_REGISTER ebx
+#define MULTIBOOT_ARCHITECTURE_CURRENT MULTIBOOT_ARCHITECTURE_I386
+
+#define MULTIBOOT_ELF32_MACHINE EM_386
+#define MULTIBOOT_ELF64_MACHINE EM_X86_64
+
 #endif /* ! GRUB_MULTIBOOT_CPU_HEADER */
diff --git a/include/grub/mips/multiboot.h b/include/grub/mips/multiboot.h
new file mode 100644
index 000000000..a27229efe
--- /dev/null
+++ b/include/grub/mips/multiboot.h
@@ -0,0 +1,36 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2003,2004,2007,2008,2009  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/>.
+ */
+
+#ifndef GRUB_MULTIBOOT_CPU_HEADER
+#define GRUB_MULTIBOOT_CPU_HEADER	1
+
+extern grub_uint32_t grub_multiboot_payload_eip;
+extern char *grub_multiboot_payload_orig;
+extern grub_addr_t grub_multiboot_payload_dest;
+extern grub_size_t grub_multiboot_payload_size;
+
+#define MULTIBOOT_INITIAL_STATE  { .gpr[4] = MULTIBOOT_BOOTLOADER_MAGIC, \
+    .jumpreg = 1 }
+#define MULTIBOOT_ENTRY_REGISTER gpr[1]
+#define MULTIBOOT_MBI_REGISTER gpr[5]
+#define MULTIBOOT_ARCHITECTURE_CURRENT MULTIBOOT_ARCHITECTURE_MIPS32
+
+#define MULTIBOOT_ELF32_MACHINE EM_MIPS
+#define MULTIBOOT_ELF64_MACHINE EM_MIPS
+
+#endif /* ! GRUB_MULTIBOOT_CPU_HEADER */
diff --git a/include/multiboot2.h b/include/multiboot2.h
index 647109c0b..275debe75 100644
--- a/include/multiboot2.h
+++ b/include/multiboot2.h
@@ -61,7 +61,8 @@
 #define MULTIBOOT_HEADER_TAG_FRAMEBUFFER  5
 #define MULTIBOOT_HEADER_TAG_MODULE_ALIGN  6
 
-#define GRUB_MULTIBOOT_ARCHITECTURE_I386  0
+#define MULTIBOOT_ARCHITECTURE_I386  0
+#define MULTIBOOT_ARCHITECTURE_MIPS32  4
 #define MULTIBOOT_HEADER_TAG_OPTIONAL 1
 
 #define MULTIBOOT_CONSOLE_FLAGS_CONSOLE_REQUIRED 1
diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index 99d1cf906..1a22cd3a6 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -41,7 +41,7 @@
 #include <grub/misc.h>
 #include <grub/gzio.h>
 #include <grub/env.h>
-#include <grub/i386/relocator.h>
+#include <grub/cpu/relocator.h>
 #include <grub/video.h>
 #include <grub/memory.h>
 #include <grub/i18n.h>
@@ -121,16 +121,9 @@ grub_multiboot_boot (void)
 {
   grub_size_t mbi_size;
   grub_err_t err;
-  struct grub_relocator32_state state =
-    {
-      .eax = MULTIBOOT_BOOTLOADER_MAGIC,
-      .ecx = 0,
-      .edx = 0,
-      .eip = grub_multiboot_payload_eip,
-      /* Set esp to some random location in low memory to avoid breaking
-	 non-compliant kernels.  */
-      .esp = 0x7ff00
-    };
+  struct grub_relocator32_state state = MULTIBOOT_INITIAL_STATE;
+
+  state.MULTIBOOT_ENTRY_REGISTER = grub_multiboot_payload_eip;
 
   mbi_size = grub_multiboot_get_mbi_size ();
   if (grub_multiboot_alloc_mbi < mbi_size)
@@ -143,7 +136,8 @@ grub_multiboot_boot (void)
       grub_multiboot_alloc_mbi = mbi_size;
     }
 
-  state.ebx = grub_multiboot_payload_dest + grub_multiboot_pure_size;
+  state.MULTIBOOT_MBI_REGISTER = grub_multiboot_payload_dest
+    + grub_multiboot_pure_size;
   err = grub_multiboot_make_mbi (grub_multiboot_payload_orig,
 				 grub_multiboot_payload_dest,
 				 grub_multiboot_pure_size, mbi_size);
diff --git a/loader/i386/multiboot_elfxx.c b/loader/i386/multiboot_elfxx.c
index 05fb2c1c1..92a52d3a8 100644
--- a/loader/i386/multiboot_elfxx.c
+++ b/loader/i386/multiboot_elfxx.c
@@ -18,13 +18,13 @@
 
 #if defined(MULTIBOOT_LOAD_ELF32)
 # define XX		32
-# define E_MACHINE	EM_386
+# define E_MACHINE	MULTIBOOT_ELF32_MACHINE
 # define ELFCLASSXX	ELFCLASS32
 # define Elf_Ehdr	Elf32_Ehdr
 # define Elf_Phdr	Elf32_Phdr
 #elif defined(MULTIBOOT_LOAD_ELF64)
 # define XX		64
-# define E_MACHINE	EM_X86_64
+# define E_MACHINE	MULTIBOOT_ELF64_MACHINE
 # define ELFCLASSXX	ELFCLASS64
 # define Elf_Ehdr	Elf64_Ehdr
 # define Elf_Phdr	Elf64_Phdr
diff --git a/loader/i386/multiboot_mbi2.c b/loader/i386/multiboot_mbi2.c
index 1910d656e..8b67f9383 100644
--- a/loader/i386/multiboot_mbi2.c
+++ b/loader/i386/multiboot_mbi2.c
@@ -90,7 +90,8 @@ grub_multiboot_load (grub_file_t file)
     {
       if (header->magic == MULTIBOOT_HEADER_MAGIC
 	  && !(header->magic + header->architecture
-	       + header->header_length + header->checksum))
+	       + header->header_length + header->checksum)
+	  && header->architecture == MULTIBOOT_ARCHITECTURE_CURRENT)
 	break;
     }
 

From a9cd257a873c889e763a3785efcfa2710ac13f8f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 3 Apr 2010 14:29:11 +0200
Subject: [PATCH 0722/1628] Move files to appropriate places

---
 conf/i386.rmk                       | 6 ++----
 conf/mips.rmk                       | 4 ++--
 loader/{i386 => }/multiboot.c       | 0
 loader/{i386 => }/multiboot_elfxx.c | 0
 loader/{i386 => }/multiboot_mbi2.c  | 0
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename loader/{i386 => }/multiboot.c (100%)
 rename loader/{i386 => }/multiboot_elfxx.c (100%)
 rename loader/{i386 => }/multiboot_mbi2.c (100%)

diff --git a/conf/i386.rmk b/conf/i386.rmk
index 79a8e430b..3d7f42804 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -33,15 +33,13 @@ setpci_mod_CFLAGS = $(COMMON_CFLAGS)
 setpci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += multiboot.mod
-multiboot_mod_SOURCES = loader/i386/multiboot.c \
-			loader/i386/multiboot_mbi.c
+multiboot_mod_SOURCES = loader/multiboot.c loader/i386/multiboot_mbi.c
 multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
 multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
 multiboot_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
 pkglib_MODULES += multiboot2.mod
-multiboot2_mod_SOURCES = loader/i386/multiboot.c \
-			 loader/i386/multiboot_mbi2.c
+multiboot2_mod_SOURCES = loader/multiboot.c loader/multiboot_mbi2.c
 multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
 multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
diff --git a/conf/mips.rmk b/conf/mips.rmk
index 1776a5d18..c9d94eb74 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -31,8 +31,8 @@ relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
 relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += multiboot2.mod
-multiboot2_mod_SOURCES = loader/i386/multiboot.c \
-			 loader/i386/multiboot_mbi2.c
+multiboot2_mod_SOURCES = loader/multiboot.c \
+			 loader/multiboot_mbi2.c
 multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
 multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
 multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
diff --git a/loader/i386/multiboot.c b/loader/multiboot.c
similarity index 100%
rename from loader/i386/multiboot.c
rename to loader/multiboot.c
diff --git a/loader/i386/multiboot_elfxx.c b/loader/multiboot_elfxx.c
similarity index 100%
rename from loader/i386/multiboot_elfxx.c
rename to loader/multiboot_elfxx.c
diff --git a/loader/i386/multiboot_mbi2.c b/loader/multiboot_mbi2.c
similarity index 100%
rename from loader/i386/multiboot_mbi2.c
rename to loader/multiboot_mbi2.c

From 1c7a1bab8c86cbcfd8a3d493f741b1066eb5522f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 3 Apr 2010 19:41:36 +0200
Subject: [PATCH 0723/1628] Definitively remove allocation from region start if
 no free header is present at the begining (at most 15 bytes loss)

---
 lib/relocator.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index 11d2cff6b..b3a7801c5 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -359,17 +359,6 @@ malloc_in_range (struct grub_relocator *rel,
 	  p = pa->next;
 	}
       while (pa != r->first);
-      /* FIXME */
-      if (0)//if (!pre_added)
-	{
-	  events[N].type = REG_BEG_START;
-	  events[N].pos = (grub_addr_t) r - r->pre_size;
-	  events[N].reg = r;
-	  N++;
-	  events[N].type = REG_BEG_END;
-	  events[N].pos = (grub_addr_t) r;
-	  N++;
-	}
     }
 
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS

From 651a6c17fea4dbcd94c06ad8d65380cbff165e59 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 3 Apr 2010 20:07:09 +0200
Subject: [PATCH 0724/1628] Add missing files

---
 lib/posix_wrap/errno.h  | 28 ++++++++++++++++++++++++++++
 lib/posix_wrap/unistd.h |  0
 2 files changed, 28 insertions(+)
 create mode 100644 lib/posix_wrap/errno.h
 create mode 100644 lib/posix_wrap/unistd.h

diff --git a/lib/posix_wrap/errno.h b/lib/posix_wrap/errno.h
new file mode 100644
index 000000000..9031722e2
--- /dev/null
+++ b/lib/posix_wrap/errno.h
@@ -0,0 +1,28 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009, 2010  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/>.
+ */
+
+#ifndef GRUB_POSIX_ERRNO_H
+#define GRUB_POSIX_ERRNO_H	1
+
+#include <grub/err.h>
+
+#define errno  grub_errno
+#define EINVAL GRUB_ERR_BAD_NUMBER
+#define ENOMEM GRUB_ERR_OUT_OF_MEMORY
+
+#endif
diff --git a/lib/posix_wrap/unistd.h b/lib/posix_wrap/unistd.h
new file mode 100644
index 000000000..e69de29bb

From 3db3a82b75ee0cb9dc512852f35000a79535aa36 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 3 Apr 2010 20:12:43 +0200
Subject: [PATCH 0725/1628] =?UTF-8?q?=09*=20Makefile.in=20(uninstall):=20R?=
 =?UTF-8?q?emove=20a=20leftover=20debug=20echo.=20=09Reported=20by:=20Gr?=
 =?UTF-8?q?=C3=A9goire=20Sutre?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ChangeLog   | 5 +++++
 Makefile.in | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e66dbce43..061b24a11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* Makefile.in (uninstall): Remove a leftover debug echo.
+	Reported by: Grégoire Sutre
+
 2010-04-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	MIPS multiboot2 support.
diff --git a/Makefile.in b/Makefile.in
index d640b91d6..f227650c4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -396,7 +396,6 @@ uninstall:
 	@list='$(lib_SCRIPTS)'; \
 	for file in $$list; do \
 	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  echo rm -f $(DESTDIR)$(libdir)/$$dest; \
 	  rm -f $(DESTDIR)$(libdir)/grub/$$dest; \
 	done
 	@list='$(info_INFOS)'; \

From bd5a6415b0cb4d36145dc493aeffdc69ec6e7bbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Sat, 3 Apr 2010 20:23:21 +0200
Subject: [PATCH 0726/1628] 	* util/i386/efi/grub-dumpdevtree: replaced the
 non-portable `==' by 	`=' and added double quotes on operands of this
 equality test.

---
 ChangeLog                      | 5 +++++
 util/i386/efi/grub-dumpdevtree | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 061b24a11..035cd078a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-03  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* util/i386/efi/grub-dumpdevtree: replaced the non-portable `==' by
+	`=' and added double quotes on operands of this equality test.
+
 2010-04-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* Makefile.in (uninstall): Remove a leftover debug echo.
diff --git a/util/i386/efi/grub-dumpdevtree b/util/i386/efi/grub-dumpdevtree
index 25aa35e23..51004cc85 100644
--- a/util/i386/efi/grub-dumpdevtree
+++ b/util/i386/efi/grub-dumpdevtree
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
-if [ x$1 == x ]; then
+if [ "x$1" = "x" ]; then
    echo "Filename required".
 fi
 

From b1654fdfe1317a7a9ccc9c50d0f077f26651ccca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Sat, 3 Apr 2010 20:35:13 +0200
Subject: [PATCH 0727/1628] 	* Makefile.in (LEX): new variable.

---
 ChangeLog   | 4 ++++
 Makefile.in | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 035cd078a..a1bfc3ef7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-03  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* Makefile.in (LEX): new variable.
+
 2010-04-03  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* util/i386/efi/grub-dumpdevtree: replaced the non-portable `==' by
diff --git a/Makefile.in b/Makefile.in
index f227650c4..3d832d725 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,6 +117,7 @@ LIBCURSES = @LIBCURSES@
 LIBUSB = @LIBUSB@
 LIBSDL = @LIBSDL@
 LIBPCIACCESS = @LIBPCIACCESS@
+LEX = @LEX@
 YACC = @YACC@
 FONT_SOURCE = @FONT_SOURCE@
 

From 50479febcfd2bbac32fe824b8e8ea52b0f3cccc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Sat, 3 Apr 2010 20:48:36 +0200
Subject: [PATCH 0728/1628] 	* util/grub-install.in: Use mkdir -p to create
 grub directory. 	* util/i386/efi/grub-install.in: Likewise. 	*
 util/ieee1275/grub-install.in: Likewise.

---
 ChangeLog                     | 6 ++++++
 util/grub-install.in          | 3 +--
 util/i386/efi/grub-install.in | 3 +--
 util/ieee1275/grub-install.in | 3 +--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a1bfc3ef7..fbfefad82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-03  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* util/grub-install.in: Use mkdir -p to create grub directory.
+	* util/i386/efi/grub-install.in: Likewise.
+	* util/ieee1275/grub-install.in: Likewise.
+
 2010-04-03  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* Makefile.in (LEX): new variable.
diff --git a/util/grub-install.in b/util/grub-install.in
index a1671b200..790b56ff6 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -219,8 +219,7 @@ else
 fi
 
 # Create the GRUB directory if it is not present.
-test -d "$bootdir" || mkdir "$bootdir" || exit 1
-test -d "$grubdir" || mkdir "$grubdir" || exit 1
+mkdir -p "$grubdir" || exit 1
 
 # If --recheck is specified, remove the device map, if present.
 if test $recheck = yes; then
diff --git a/util/i386/efi/grub-install.in b/util/i386/efi/grub-install.in
index 2e9b0ca39..cc4d950d2 100644
--- a/util/i386/efi/grub-install.in
+++ b/util/i386/efi/grub-install.in
@@ -145,8 +145,7 @@ else
 fi
 
 # Create the GRUB directory if it is not present.
-test -d "$bootdir" || mkdir "$bootdir" || exit 1
-test -d "$grubdir" || mkdir "$grubdir" || exit 1
+mkdir -p "$grubdir" || exit 1
 
 # If --recheck is specified, remove the device map, if present.
 if test $recheck = yes; then
diff --git a/util/ieee1275/grub-install.in b/util/ieee1275/grub-install.in
index be4053542..363f312db 100644
--- a/util/ieee1275/grub-install.in
+++ b/util/ieee1275/grub-install.in
@@ -141,8 +141,7 @@ fi
 # XXX warn on firmware-unreadable filesystems?
 
 # Create the GRUB directory if it is not present.
-test -d "$bootdir" || mkdir "$bootdir" || exit 1
-test -d "$grubdir" || mkdir "$grubdir" || exit 1
+mkdir -p "$grubdir" || exit 1
 
 # Create the device map file if it is not present.
 if test -f "$device_map"; then

From b9396631bc0a677d2800f1c9eec6b4e006071d07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Sat, 3 Apr 2010 20:52:06 +0200
Subject: [PATCH 0729/1628] 	* util/grub-install.in: Add `|| exit 1' to all
 grub-probe calls 	for which failure is fatal.

---
 ChangeLog            | 5 +++++
 util/grub-install.in | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fbfefad82..d679336aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-03  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* util/grub-install.in: Add `|| exit 1' to all grub-probe calls
+	for which failure is fatal.
+
 2010-04-03  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* util/grub-install.in: Use mkdir -p to create grub directory.
diff --git a/util/grub-install.in b/util/grub-install.in
index 790b56ff6..142d5792f 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -270,7 +270,7 @@ for dir in ${localedir}/*; do
 done
 
 # Write device to a variable so we don't have to traverse /dev every time.
-grub_device=`$grub_probe --target=device ${grubdir}`
+grub_device=`$grub_probe --target=device ${grubdir}` || exit 1
 
 if ! test -f ${grubdir}/grubenv; then
     $grub_editenv ${grubdir}/grubenv create
@@ -312,11 +312,11 @@ if [ "x${devabstraction_module}" = "x" ] ; then
       if echo "${install_device}" | grep -qx "(.*)" ; then
         install_drive="${install_device}"
       else
-        install_drive="`$grub_probe --target=drive --device ${install_device}`"
+        install_drive="`$grub_probe --target=drive --device ${install_device}`" || exit 1
       fi
       install_drive="`echo ${install_drive} | sed -e s/,[0-9]*[a-z]*//g`"
     fi
-    grub_drive="`$grub_probe --target=drive --device ${grub_device}`"
+    grub_drive="`$grub_probe --target=drive --device ${grub_device}`" || exit 1
 
     # Strip partition number
     grub_drive="`echo ${grub_drive} | sed -e s/,[0-9]*[a-z]*//g`"
@@ -343,7 +343,7 @@ if [ "x${devabstraction_module}" = "x" ] ; then
         modules="$modules search_fs_uuid"
     fi
 else
-    prefix_drive=`$grub_probe --target=drive --device ${grub_device}`
+    prefix_drive=`$grub_probe --target=drive --device ${grub_device}` || exit 1
 fi
 
 if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then

From 187bbe3d9cf392c7cd7fb413bc001909c1f01068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Sat, 3 Apr 2010 21:00:21 +0200
Subject: [PATCH 0730/1628] 	* kern/misc.c: Disable the
 __enable_execute_stack hack for utilities. 	* include/grub/misc.h:
 Likewise.

---
 ChangeLog           | 5 +++++
 include/grub/misc.h | 2 +-
 kern/misc.c         | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d679336aa..1afed06f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-03  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* kern/misc.c: Disable the __enable_execute_stack hack for utilities.
+	* include/grub/misc.h: Likewise.
+
 2010-04-03  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* util/grub-install.in: Add `|| exit 1' to all grub-probe calls
diff --git a/include/grub/misc.h b/include/grub/misc.h
index 5b1477ed4..61174c38d 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -261,7 +261,7 @@ grub_size_t EXPORT_FUNC(grub_utf8_to_ucs4) (grub_uint32_t *dest,
 grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
 					  grub_uint32_t d, grub_uint32_t *r);
 
-#ifdef NEED_ENABLE_EXECUTE_STACK
+#if defined(NEED_ENABLE_EXECUTE_STACK) && !defined(GRUB_UTIL)
 void EXPORT_FUNC(__enable_execute_stack) (void *addr);
 #endif
 
diff --git a/kern/misc.c b/kern/misc.c
index 4772e22b0..9d8fc70da 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -1058,7 +1058,7 @@ grub_abort (void)
 void abort (void) __attribute__ ((alias ("grub_abort")));
 #endif
 
-#ifdef NEED_ENABLE_EXECUTE_STACK
+#if defined(NEED_ENABLE_EXECUTE_STACK) && !defined(GRUB_UTIL)
 /* Some gcc versions generate a call to this function
    in trampolines for nested functions.  */
 void __enable_execute_stack (void *addr __attribute__ ((unused)))

From 88ba41253ea607829cd62dfe6cd37ae20c963dd3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 3 Apr 2010 22:55:57 +0200
Subject: [PATCH 0731/1628] Fix x86_64-efi compilation.

---
 conf/x86-efi.rmk     | 14 ++------------
 lib/i386/relocator.c |  1 -
 lib/relocator.c      | 16 ++++++++--------
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index 5cb472168..b97accac6 100644
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -16,8 +16,7 @@ grub_install_SOURCES = util/i386/efi/grub-install.in
 
 # Modules.
 pkglib_PROGRAMS = kernel.img
-pkglib_MODULES = chain.mod appleldr.mod \
-	linux.mod halt.mod  \
+pkglib_MODULES = chain.mod appleldr.mod halt.mod  \
 	datetime.mod loadbios.mod \
 	fixvideo.mod mmap.mod acpi.mod
 
@@ -63,15 +62,6 @@ appleldr_mod_SOURCES = loader/efi/appleloader.c
 appleldr_mod_CFLAGS = $(COMMON_CFLAGS)
 appleldr_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/efi/linux.c
-ifeq ($(target_cpu), x86_64)
-linux_mod_SOURCES += loader/i386/linux_trampoline.S
-endif
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod.
 halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -103,7 +93,7 @@ efi_gop_mod_CFLAGS = $(COMMON_CFLAGS)
 efi_gop_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += xnu.mod
-xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c loader/i386/efi/xnu.c \
+xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c \
 	loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
 xnu_mod_CFLAGS = $(COMMON_CFLAGS)
 xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index a4038d75f..4eaa66890 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -253,7 +253,6 @@ grub_relocator64_boot (struct grub_relocator *rel,
     return err;
 
   asm volatile ("cli");
-  grub_printf ("%x\n", relst);
   ((void (*) (void)) relst) ();
 
   /* Not reached.  */
diff --git a/lib/relocator.c b/lib/relocator.c
index b3a7801c5..79a98e851 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -219,14 +219,12 @@ malloc_in_range (struct grub_relocator *rel,
   grub_addr_t target = 0;
 
   grub_dprintf ("relocator",
-		"trying to allocate in %x-%x aligned %x size %x\n",
-		start, end, align, size);
+		"trying to allocate in 0x%lx-0x%lx aligned 0x%lx size 0x%lx\n",
+		(unsigned long) start, (unsigned long) end,
+		(unsigned long) align, (unsigned long) size);
 
   start = ALIGN_UP (start, align);
   end = ALIGN_DOWN (end - size, align) + size;
-  grub_dprintf ("relocator",
-		"trying to allocate in %x-%x aligned %x size %x\n",
-		start, end, align, size);
 
   if (end < start + size)
     return 0;
@@ -643,8 +641,9 @@ malloc_in_range (struct grub_relocator *rel,
 	    alloc_end = min (events[j].pos, target + size);
 	    if (alloc_end > alloc_start)
 	      {
-		grub_dprintf ("relocator", "subchunk 0x%x-0x%x, %d\n",
-			      alloc_start, alloc_end, typepre);
+		grub_dprintf ("relocator", "subchunk 0x%lx-0x%lx, %d\n",
+			      (unsigned long) alloc_start,
+			      (unsigned long) alloc_end, typepre);
 		res->subchunks[cural].type = typepre;
 		if (typepre == CHUNK_TYPE_REGION_START)
 		  {
@@ -715,7 +714,8 @@ malloc_in_range (struct grub_relocator *rel,
 
   res->src = target;
   res->size = size;
-  grub_dprintf ("relocator", "allocated: %x %x\n", target, size);
+  grub_dprintf ("relocator", "allocated: 0x%lx+0x%lx\n", (unsigned long) target,
+		(unsigned long) size);
   return 1;
 }
 

From a8c3b552a729bf9cf9b1bc13a56fc8ce18b9c416 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 4 Apr 2010 14:12:11 +0200
Subject: [PATCH 0732/1628] 	Remove unused grub_vga_get_font.

	* kern/i386/pc/startup.S (grub_vga_get_font): Removed.
	* include/grub/i386/pc/vga.h (grub_vga_get_font): Likewise.
---
 ChangeLog                  |  7 +++++++
 include/grub/i386/pc/vga.h |  3 ---
 kern/i386/pc/startup.S     | 27 ---------------------------
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1afed06f7..de10988c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Remove unused grub_vga_get_font.
+
+	* kern/i386/pc/startup.S (grub_vga_get_font): Removed.
+	* include/grub/i386/pc/vga.h (grub_vga_get_font): Likewise.
+
 2010-04-03  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* kern/misc.c: Disable the __enable_execute_stack hack for utilities.
diff --git a/include/grub/i386/pc/vga.h b/include/grub/i386/pc/vga.h
index b9822395b..2724f6401 100644
--- a/include/grub/i386/pc/vga.h
+++ b/include/grub/i386/pc/vga.h
@@ -28,7 +28,4 @@
 /* Set the video mode to MODE and return the previous mode.  */
 unsigned char EXPORT_FUNC(grub_vga_set_mode) (unsigned char mode);
 
-/* Return a pointer to the ROM font table.  */
-unsigned char *EXPORT_FUNC(grub_vga_get_font) (void);
-
 #endif /* ! GRUB_VGA_MACHINE_HEADER */
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index 0aa420c6c..e78903a45 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -1539,33 +1539,6 @@ FUNCTION(grub_vga_set_mode)
 	popl	%ebp
 	ret
 
-
-/*
- * unsigned char *grub_vga_get_font (void)
- */
-FUNCTION(grub_vga_get_font)
-	pushl	%ebp
-	pushl	%ebx
-
-	call	prot_to_real
-	.code16
-	movw	$0x1130, %ax
-	movb	$0x06, %bh
-	int	$0x10
-	movw	%es, %bx
-	movw	%bp, %dx
-	DATA32	call	real_to_prot
-	.code32
-
-	movzwl	%bx, %ecx
-	shll	$4, %ecx
-	movw	%dx, %ax
-	addl	%ecx, %eax
-
-	popl	%ebx
-	popl	%ebp
-	ret
-
 /*
  * grub_vbe_bios_status_t grub_vbe_get_controller_info (struct grub_vbe_info_block *controller_info)
  *

From 65936631e410142f4527a2b6121507669c4f0551 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 4 Apr 2010 14:24:50 +0200
Subject: [PATCH 0733/1628] intwrap vbe and vga calls

---
 conf/i386-pc.rmk           |   4 +-
 include/grub/i386/pc/vbe.h |  70 ++---
 include/grub/i386/pc/vga.h |   3 -
 kern/i386/pc/startup.S     | 507 -------------------------------------
 term/i386/pc/vga.c         |  20 ++
 video/i386/pc/vbe.c        | 195 ++++++++++++++
 6 files changed, 244 insertions(+), 555 deletions(-)

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 84e6f1b1e..bef17a25b 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -54,8 +54,8 @@ kernel_img_SOURCES = kern/i386/pc/startup.S \
 	kern/env.c \
 	term/i386/pc/console.c term/i386/vga_common.c \
 	symlist.c
-kernel_img_HEADERS += machine/biosdisk.h machine/vga.h machine/vbe.h \
-	machine/pxe.h i386/pit.h machine/init.h machine/int.h
+kernel_img_HEADERS += machine/biosdisk.h machine/pxe.h i386/pit.h \
+	machine/init.h machine/int.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
diff --git a/include/grub/i386/pc/vbe.h b/include/grub/i386/pc/vbe.h
index abf246fa1..9b05c2299 100644
--- a/include/grub/i386/pc/vbe.h
+++ b/include/grub/i386/pc/vbe.h
@@ -169,56 +169,40 @@ struct grub_vbe_palette_data
   grub_uint8_t alignment;
 } __attribute__ ((packed));
 
-/* Prototypes for kernel real mode thunks.  */
-
+/* Prototypes for helper functions.  */
 /* Call VESA BIOS 0x4f00 to get VBE Controller Information, return status.  */
-grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_get_controller_info) (struct grub_vbe_info_block *controller_info);
-
+grub_vbe_status_t 
+grub_vbe_bios_get_controller_info (struct grub_vbe_info_block *controller_info);
 /* Call VESA BIOS 0x4f01 to get VBE Mode Information, return status.  */
-grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_get_mode_info) (grub_uint32_t mode,
-                                                            struct grub_vbe_mode_info_block *mode_info);
+grub_vbe_status_t 
+grub_vbe_bios_get_mode_info (grub_uint32_t mode,
+			     struct grub_vbe_mode_info_block *mode_info);
+/* Call VESA BIOS 0x4f03 to return current VBE Mode, return status.  */
+grub_vbe_status_t 
+grub_vbe_bios_get_mode (grub_uint32_t *mode);
+/* Call VESA BIOS 0x4f05 to set memory window, return status.  */
+grub_vbe_status_t
+grub_vbe_bios_set_memory_window (grub_uint32_t window, grub_uint32_t position);
+/* Call VESA BIOS 0x4f05 to return memory window, return status.  */
+grub_vbe_status_t
+grub_vbe_bios_get_memory_window (grub_uint32_t window,
+				 grub_uint32_t *position);
+/* Call VESA BIOS 0x4f06 to set scanline length (in bytes), return status.  */
+grub_vbe_status_t 
+grub_vbe_bios_set_scanline_length (grub_uint32_t length);
+/* Call VESA BIOS 0x4f06 to return scanline length (in bytes), return status.  */
+grub_vbe_status_t 
+grub_vbe_bios_get_scanline_length (grub_uint32_t *length);
+/* Call VESA BIOS 0x4f07 to get display start, return status.  */
+grub_vbe_status_t 
+grub_vbe_bios_get_display_start (grub_uint32_t *x,
+				 grub_uint32_t *y);
 
-grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_getset_dac_palette_width) (int set, int *width);
+grub_vbe_status_t grub_vbe_bios_getset_dac_palette_width (int set, int *width);
 
 #define grub_vbe_bios_get_dac_palette_width(width)	grub_vbe_bios_getset_dac_palette_width(0, (width))
 #define grub_vbe_bios_set_dac_palette_width(width)	grub_vbe_bios_getset_dac_palette_width(1, (width))
 
-/* Call VESA BIOS 0x4f02 to set video mode, return status.  */
-grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_set_mode) (grub_uint32_t mode,
-                                                       struct grub_vbe_crtc_info_block *crtc_info);
-
-/* Call VESA BIOS 0x4f03 to return current VBE Mode, return status.  */
-grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_get_mode) (grub_uint32_t *mode);
-
-/* Call VESA BIOS 0x4f05 to set memory window, return status.  */
-grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_set_memory_window) (grub_uint32_t window,
-                                                                grub_uint32_t position);
-
-/* Call VESA BIOS 0x4f05 to return memory window, return status.  */
-grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_get_memory_window) (grub_uint32_t window,
-                                                                grub_uint32_t *position);
-
-/* Call VESA BIOS 0x4f06 to set scanline length (in bytes), return status.  */
-grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_set_scanline_length) (grub_uint32_t length);
-
-/* Call VESA BIOS 0x4f06 to return scanline length (in bytes), return status.  */
-grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_get_scanline_length) (grub_uint32_t *length);
-
-/* Call VESA BIOS 0x4f07 to set display start, return status.  */
-grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_set_display_start) (grub_uint32_t x,
-                                                                grub_uint32_t y);
-
-/* Call VESA BIOS 0x4f07 to get display start, return status.  */
-grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_get_display_start) (grub_uint32_t *x,
-                                                                grub_uint32_t *y);
-
-/* Call VESA BIOS 0x4f09 to set palette data, return status.  */
-grub_vbe_status_t EXPORT_FUNC(grub_vbe_bios_set_palette_data) (grub_uint32_t color_count,
-                                                               grub_uint32_t start_index,
-                                                               struct grub_vbe_palette_data *palette_data);
-
-/* Prototypes for helper functions.  */
-
 grub_err_t grub_vbe_probe (struct grub_vbe_info_block *info_block);
 grub_err_t grub_vbe_set_video_mode (grub_uint32_t mode,
                                     struct grub_vbe_mode_info_block *mode_info);
diff --git a/include/grub/i386/pc/vga.h b/include/grub/i386/pc/vga.h
index 2724f6401..ecc169022 100644
--- a/include/grub/i386/pc/vga.h
+++ b/include/grub/i386/pc/vga.h
@@ -25,7 +25,4 @@
 /* The VGA (at the beginning of upper memory).  */
 #define GRUB_MEMORY_MACHINE_VGA_ADDR		GRUB_MEMORY_MACHINE_UPPER
 
-/* Set the video mode to MODE and return the previous mode.  */
-unsigned char EXPORT_FUNC(grub_vga_set_mode) (unsigned char mode);
-
 #endif /* ! GRUB_VGA_MACHINE_HEADER */
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index a9e819a9f..8e4bd13bd 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -1434,513 +1434,6 @@ FUNCTION(grub_get_rtc)
 	popl	%ebp
 	ret
 
-
-/*
- * unsigned char grub_vga_set_mode (unsigned char mode)
- */
-FUNCTION(grub_vga_set_mode)
-	pushl	%ebp
-	pushl	%ebx
-	movl	%eax, %ecx
-
-	call	prot_to_real
-	.code16
-	/* get current mode */
-	xorw	%bx, %bx
-	movb	$0x0f, %ah
-	int	$0x10
-	movb	%al, %dl
-
-	/* set the new mode */
-	movb	%cl, %al
-	xorb	%ah, %ah
-	int	$0x10
-
-	DATA32	call	real_to_prot
-	.code32
-
-	movb	%dl, %al
-	popl	%ebx
-	popl	%ebp
-	ret
-
-/*
- * grub_vbe_bios_status_t grub_vbe_get_controller_info (struct grub_vbe_info_block *controller_info)
- *
- * Register allocations for parameters:
- * %eax		*controller_info
- */
-FUNCTION(grub_vbe_bios_get_controller_info)
-	pushl	%ebp
-	pushl	%edi
-	pushl	%edx
-
-	movw	%ax, %di	/* Store *controller_info to %edx:%di.  */
-	xorw	%ax, %ax
-	shrl	$4, %eax
-	mov	%eax, %edx	/* prot_to_real destroys %eax.  */
-
-	call	prot_to_real
-	.code16
-
-	pushw	%es
-
-	movw	%dx, %es	/* *controller_info is now on %es:%di.  */
-	movw	$0x4f00, %ax
-	int	$0x10
-
-	movw	%ax, %dx	/* real_to_prot destroys %eax.  */
-
-	popw	%es
-
-	DATA32 call	real_to_prot
-	.code32
-
-	movl	%edx, %eax
-	andl	$0x0FFFF, %eax	/* Return value in %eax.  */
-
-	pop	%edx
-	popl	%edi
-	popl	%ebp
-	ret
-
-/*
- * grub_vbe_status_t grub_vbe_bios_get_mode_info (grub_uint32_t mode,
- *						  struct grub_vbe_mode_info_block *mode_info)
- *
- * Register allocations for parameters:
- * %eax		mode
- * %edx		*mode_info
- */
-FUNCTION(grub_vbe_bios_get_mode_info)
-	pushl   %ebp
-	pushl   %edi
-
-	movl	%eax, %ecx	/* Store mode number to %ecx.  */
-
-	movw    %dx, %di	/* Store *mode_info to %edx:%di.  */
-	xorw    %dx, %dx
-	shrl    $4, %edx
-
-	call    prot_to_real
-	.code16
-
-	pushw   %es
-
-	movw    %dx, %es	/* *mode_info is now on %es:%di.  */
-	movw    $0x4f01, %ax
-	int     $0x10
-
-	movw    %ax, %dx        /* real_to_prot destroys %eax.  */
-
-	popw    %es
-
-	DATA32 call     real_to_prot
-	.code32
-
-	movl    %edx, %eax
-	andl    $0x0FFFF, %eax  /* Return value in %eax.  */
-
-	popl    %edi
-	popl    %ebp
-	ret
-
-/*
- * grub_vbe_status_t grub_vbe_bios_set_mode (grub_uint32_t mode,
- *					     struct grub_vbe_crtc_info_block *crtc_info)
- *
- * Register allocations for parameters:
- * %eax		mode
- * %edx		*crtc_info
- */
-FUNCTION(grub_vbe_bios_set_mode)
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%edi
-
-	movl	%eax, %ebx	/* Store mode in %ebx.  */
-
-	movw    %dx, %di	/* Store *crtc_info to %edx:%di.  */
-	xorw    %dx, %dx
-	shrl    $4, %edx
-
-	call    prot_to_real
-	.code16
-
-	pushw   %es
-
-	movw    %dx, %es	/* *crtc_info is now on %es:%di.  */
-
-	movw	$0x4f02, %ax
-	int	$0x10
-
-	movw	%ax, %dx	/* real_to_prot destroys %eax.  */
-
-	popw	%es
-
-	DATA32 call	real_to_prot
-	.code32
-
-	movw	%dx, %ax
-	andl	$0xFFFF, %eax	/* Return value in %eax.  */
-
-	popl	%edi
-	popl	%ebx
-	popl	%ebp
-	ret
-
-/*
- * grub_vbe_status_t grub_vbe_bios_get_mode (grub_uint32_t *mode)
- *
- * Register allocations for parameters:
- * %eax		*mode
- */
-FUNCTION(grub_vbe_bios_get_mode)
-	pushl   %ebp
-	pushl   %ebx
-	pushl	%edi
-	pushl	%edx
-	pushl	%eax		/* Push *mode to stack.  */
-
-	call    prot_to_real
-	.code16
-
-	movw    $0x4f03, %ax
-	int     $0x10
-
-	movw	%ax, %dx	/* real_to_prot destroys %eax.  */
-
-	DATA32 call     real_to_prot
-	.code32
-
-	popl	%edi		/* Pops *mode from stack to %edi.  */
-	andl	$0xFFFF, %ebx
-	movl	%ebx, (%edi)
-
-	movw	%dx, %ax
-	andl	$0xFFFF, %eax	/* Return value in %eax.  */
-
-	popl	%edx
-	popl	%edi
-	popl    %ebx
-	popl    %ebp
-	ret
-
-/*
- * grub_vbe_status_t grub_vbe_bios_getset_dac_palette_width (int set, int *dac_mask_size)
- *
- * Register allocations for parameters:
- * %eax		set
- * %edx		*dac_mask_size
- */
-FUNCTION(grub_vbe_bios_getset_dac_palette_width)
-	pushl	%ebp
-	pushl	%ebx
-
-	xorl	%ebx, %ebx
-
-	/* If we only want to fetch the value, set %bl to 1.  */
-	testl	%eax, %eax
-	jne	1f
-	incb	%bl
-1:
-
-	/* Put desired width in %bh.  */
-	movl	(%edx), %eax
-	movb	%al, %bh
-
-	call    prot_to_real
-	.code16
-
-	movw	$0x4f08, %ax
-	int	$0x10
-
-	movw	%ax, %cx	/* real_to_prot destroys %eax.  */
-
-	DATA32 call	real_to_prot
-	.code32
-
-	/* Move result back to *dac_mask_size.  */
-	xorl	%eax, %eax
-	movb	%bh, %al
-	movl	%eax, (%edx)
-
-	/* Return value in %eax.  */
-	movw	%cx, %ax
-
-	popl	%ebx
-	popl	%ebp
-	ret
-
-/*
- * grub_vbe_status_t grub_vbe_bios_set_memory_window (grub_uint32_t window,
- *						      grub_uint32_t position);
- *
- * Register allocations for parameters:
- * %eax		window
- * %edx		position
- */
-FUNCTION(grub_vbe_bios_set_memory_window)
-	pushl	%ebp
-	pushl	%ebx
-
-	movl	%eax, %ebx
-
-	call	prot_to_real
-	.code16
-
-	movw	$0x4f05, %ax
-	andw	$0x00ff, %bx	/* BL = window, BH = 0, Set memory window.  */
-	int	$0x10
-
-	movw	%ax, %dx	/* real_to_prot destroys %eax.  */
-
-	DATA32 call	real_to_prot
-	.code32
-
-	movw	%dx, %ax
-	andl	$0xFFFF, %eax	/* Return value in %eax.  */
-
-	popl	%ebx
-	popl	%ebp
-	ret
-
-/*
- * grub_vbe_status_t grub_vbe_bios_get_memory_window (grub_uint32_t window,
- * 						      grub_uint32_t *position);
- *
- * Register allocations for parameters:
- * %eax		window
- * %edx		*position
- */
-FUNCTION(grub_vbe_bios_get_memory_window)
-	pushl   %ebp
-	pushl   %ebx
-	pushl	%edi
-	pushl	%edx		/* Push *position to stack.  */
-
-	movl	%eax, %ebx	/* Store window in %ebx.  */
-
-	call    prot_to_real
-	.code16
-
-	movw    $0x4f05, %ax
-	andw	$0x00ff, %bx	/* BL = window.  */
-	orw	$0x0100, %bx	/* BH = 1, Get memory window.  */
-	int     $0x10
-
-	movw	%ax, %bx	/* real_to_prot destroys %eax.  */
-
-	DATA32 call     real_to_prot
-	.code32
-
-	popl	%edi		/* pops *position from stack to %edi.  */
-	andl	$0xFFFF, %edx
-	movl	%edx, (%edi)	/* Return position to caller.  */
-
-	movw	%bx, %ax
-	andl	$0xFFFF, %eax	/* Return value in %eax.  */
-
-	popl	%edi
-	popl    %ebx
-	popl    %ebp
-	ret
-
-/*
- * grub_vbe_status_t grub_vbe_bios_set_scanline_length (grub_uint32_t length)
- *
- * Register allocations for parameters:
- * %eax		length
- */
-FUNCTION(grub_vbe_bios_set_scanline_length)
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%edx
-
-	movl	%eax, %ecx	/* Store length in %ecx.  */
-
-	call	prot_to_real
-	.code16
-
-	movw	$0x4f06, %ax
-	movw	$0x0002, %bx	/* BL = 2, Set Scan Line in Bytes.  */
-	int	$0x10
-
-	movw	%ax, %dx	/* real_to_prot destroys %eax.  */
-
-	DATA32 call	real_to_prot
-	.code32
-
-	movw	%dx, %ax
-	andl	$0xFFFF, %eax	/* Return value in %eax.  */
-
-	popl	%edx
-	popl	%ebx
-	popl	%ebp
-	ret
-
-/*
- * grub_vbe_status_t grub_vbe_bios_get_scanline_length (grub_uint32_t *length)
- *
- * Register allocations for parameters:
- * %eax		*length
- */
-FUNCTION(grub_vbe_bios_get_scanline_length)
-	pushl   %ebp
-	pushl   %ebx
-	pushl	%edi
-	pushl	%edx		/* Push *length to stack.  */
-
-	call    prot_to_real
-	.code16
-
-	movw    $0x4f06, %ax
-	movw	$0x0001, %bx	/* BL = 1, Get Scan Line Length (in bytes).  */
-	int     $0x10
-
-	movw	%ax, %dx	/* real_to_prot destroys %eax.  */
-
-	DATA32 call     real_to_prot
-	.code32
-
-	popl	%edi		/* Pops *length from stack to %edi.  */
-	andl	$0xFFFF, %ebx
-	movl	%ebx, (%edi)	/* Return length to caller.  */
-
-	movw	%dx, %ax
-	andl	$0xFFFF, %eax	/* Return value in %eax.  */
-
-	popl	%edi
-	popl    %ebx
-	popl    %ebp
-	ret
-
-/*
- * grub_vbe_status_t grub_vbe_bios_set_display_start (grub_uint32_t x,
- *						      grub_uint32_t y)
- *
- * Register allocations for parameters:
- * %eax		x
- * %edx		y
- */
-FUNCTION(grub_vbe_bios_set_display_start)
-	pushl	%ebp
-	pushl	%ebx
-
-	movl	%eax, %ecx	/* Store x in %ecx.  */
-
-	call	prot_to_real
-	.code16
-
-	movw	$0x4f07, %ax
-	movw	$0x0080, %bx	/* BL = 80h, Set Display Start
-				   during Vertical Retrace.  */
-	int	$0x10
-
-	movw	%ax, %dx	/* real_to_prot destroys %eax.  */
-
-	DATA32 call	real_to_prot
-	.code32
-
-	movw	%dx, %ax
-	andl	$0xFFFF, %eax	/* Return value in %eax.  */
-
-	popl	%ebx
-	popl	%ebp
-	ret
-
-/*
- * grub_vbe_status_t grub_vbe_bios_get_display_start (grub_uint32_t *x,
- *						      grub_uint32_t *y)
- *
- * Register allocations for parameters:
- * %eax		*x
- * %edx		*y
- */
-FUNCTION(grub_vbe_bios_get_display_start)
-	pushl   %ebp
-	pushl   %ebx
-	pushl	%edi
-	pushl	%eax		/* Push *x to stack.  */
-	pushl	%edx		/* Push *y to stack.  */
-
-	call    prot_to_real
-	.code16
-
-	movw    $0x4f07, %ax
-	movw	$0x0001, %bx	/* BL = 1, Get Display Start.  */
-	int     $0x10
-
-	movw	%ax, %bx	/* real_to_prot destroys %eax.  */
-
-	DATA32 call     real_to_prot
-	.code32
-
-	popl	%edi		/* Pops *y from stack to %edi.  */
-	andl	$0xFFFF, %edx
-	movl	%edx, (%edi)	/* Return y-position to caller.  */
-
-	popl	%edi		/* Pops *x from stack to %edi.  */
-	andl	$0xFFFF, %ecx
-	movl	%ecx, (%edi)	/* Return x-position to caller.  */
-
-	movw	%bx, %ax
-	andl	$0xFFFF, %eax	/* Return value in %eax.  */
-
-	popl	%edi
-	popl    %ebx
-	popl    %ebp
-	ret
-
-/*
- * grub_vbe_status_t grub_vbe_bios_set_palette_data (grub_uint32_t color_count,
- *						     grub_uint32_t start_index,
- *						     struct grub_vbe_palette_data *palette_data)
- *
- * Register allocations for parameters:
- * %eax		color_count
- * %edx		start_index
- * %ecx		*palette_data
- */
-FUNCTION(grub_vbe_bios_set_palette_data)
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%edi
-
-	movl	%eax, %ebx	/* Store color_count in %ebx.  */
-
-	movw    %cx, %di	/* Store *palette_data to %ecx:%di.  */
-	xorw    %cx, %cx
-	shrl    $4, %ecx
-
-	call    prot_to_real
-	.code16
-
-	pushw   %es
-
-	movw    %cx, %es	/* *palette_data is now on %es:%di.  */
-	movw	%bx, %cx	/* color_count is now on %cx.  */
-
-	movw	$0x4f09, %ax
-	xorw	%bx, %bx	/* BL = 0, Set Palette Data.  */
-	int	$0x10
-
-	movw	%ax, %dx	/* real_to_prot destroys %eax.  */
-
-	popw	%es
-
-	DATA32 call	real_to_prot
-	.code32
-
-	movw	%dx, %ax
-	andl	$0xFFFF, %eax	/* Return value in %eax.  */
-
-	popl	%edi
-	popl	%ebx
-	popl	%ebp
-	ret
-
-
 pxe_rm_entry:
 	.long	0
 
diff --git a/term/i386/pc/vga.c b/term/i386/pc/vga.c
index 402b30fe6..85c516b6a 100644
--- a/term/i386/pc/vga.c
+++ b/term/i386/pc/vga.c
@@ -19,6 +19,7 @@
 // TODO: Deprecated and broken. Needs to be converted to Video Driver!
 
 #include <grub/machine/vga.h>
+#include <grub/machine/int.h>
 #include <grub/machine/console.h>
 #include <grub/cpu/io.h>
 #include <grub/term.h>
@@ -82,6 +83,25 @@ static grub_font_t font = 0;
 #define INPUT_STATUS1_REGISTER	0x3DA
 #define INPUT_STATUS1_VERTR_BIT 0x08
 
+static unsigned char 
+grub_vga_set_mode (unsigned char mode)
+{
+  struct grub_bios_int_registers regs;
+  unsigned char ret;
+  /* get current mode */
+  regs.eax = 0x0f00;
+  regs.ebx = 0;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x10, &regs);
+
+  ret = regs.eax & 0xff;
+  regs.eax = mode;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x10, &regs);
+
+  return ret;
+}
+
 static inline void
 wait_vretrace (void)
 {
diff --git a/video/i386/pc/vbe.c b/video/i386/pc/vbe.c
index 72b8f1831..45ba86227 100644
--- a/video/i386/pc/vbe.c
+++ b/video/i386/pc/vbe.c
@@ -28,6 +28,7 @@
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/video.h>
+#include <grub/machine/int.h>
 
 static int vbe_detected = -1;
 
@@ -71,6 +72,200 @@ real2pm (grub_vbe_farptr_t ptr)
                    + ((unsigned long) ptr & 0x0000FFFF));
 }
 
+/* Call VESA BIOS 0x4f09 to set palette data, return status.  */
+static grub_vbe_status_t 
+grub_vbe_bios_set_palette_data (grub_uint32_t color_count,
+				grub_uint32_t start_index,
+				struct grub_vbe_palette_data *palette_data)
+{
+  struct grub_bios_int_registers regs;
+  regs.eax = 0x4f09;
+  regs.ebx = 0;
+  regs.ecx = color_count;
+  regs.edx = start_index;
+  regs.es = (((grub_addr_t) palette_data) & 0xffff0000) >> 4;
+  regs.edi = ((grub_addr_t) palette_data) & 0xffff;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x10, &regs);
+  return regs.eax & 0xffff;
+}
+
+/* Call VESA BIOS 0x4f00 to get VBE Controller Information, return status.  */
+grub_vbe_status_t 
+grub_vbe_bios_get_controller_info (struct grub_vbe_info_block *ci)
+{
+  struct grub_bios_int_registers regs;
+  /* Store *controller_info to %es:%di.  */
+  regs.es = (((grub_addr_t) ci) & 0xffff0000) >> 4;
+  regs.edi = ((grub_addr_t) ci) & 0xffff;
+  regs.eax = 0x4f00;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x10, &regs);
+  return regs.eax & 0xffff;
+}
+
+/* Call VESA BIOS 0x4f01 to get VBE Mode Information, return status.  */
+grub_vbe_status_t 
+grub_vbe_bios_get_mode_info (grub_uint32_t mode,
+			     struct grub_vbe_mode_info_block *mode_info)
+{
+  struct grub_bios_int_registers regs;
+  regs.eax = 0x4f01;
+  regs.ecx = mode;
+  /* Store *mode_info to %es:%di.  */
+  regs.es = ((grub_addr_t) mode_info & 0xffff0000) >> 4;
+  regs.edi = (grub_addr_t) mode_info & 0x0000ffff;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x10, &regs);
+  return regs.eax & 0xffff;
+}
+
+/* Call VESA BIOS 0x4f02 to set video mode, return status.  */
+static grub_vbe_status_t
+grub_vbe_bios_set_mode (grub_uint32_t mode,
+			struct grub_vbe_crtc_info_block *crtc_info)
+{
+  struct grub_bios_int_registers regs;
+
+  regs.eax = 0x4f02;
+  regs.ebx = mode;
+  /* Store *crtc_info to %es:%di.  */
+  regs.es = (((grub_addr_t) crtc_info) & 0xffff0000) >> 4;
+  regs.edi = ((grub_addr_t) crtc_info) & 0xffff;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x10, &regs);
+
+  return regs.eax & 0xffff;
+}
+
+/* Call VESA BIOS 0x4f03 to return current VBE Mode, return status.  */
+grub_vbe_status_t 
+grub_vbe_bios_get_mode (grub_uint32_t *mode)
+{
+  struct grub_bios_int_registers regs;
+
+  regs.eax = 0x4f03;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x10, &regs);
+  *mode = regs.ebx & 0xffff;
+
+  return regs.eax & 0xffff;
+}
+
+grub_vbe_status_t 
+grub_vbe_bios_getset_dac_palette_width (int set, int *dac_mask_size)
+{
+  struct grub_bios_int_registers regs;
+
+  regs.eax = 0x4f08;
+  regs.ebx = (*dac_mask_size & 0xff) >> 8;
+  regs.ebx = set ? 1 : 0;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x10, &regs);
+  *dac_mask_size = (regs.ebx >> 8) & 0xff;
+
+  return regs.eax & 0xffff;
+}
+
+/* Call VESA BIOS 0x4f05 to set memory window, return status.  */
+grub_vbe_status_t
+grub_vbe_bios_set_memory_window (grub_uint32_t window,
+				 grub_uint32_t position)
+{
+  struct grub_bios_int_registers regs;
+
+  /* BL = window, BH = 0, Set memory window.  */
+  regs.ebx = window & 0x00ff;
+  regs.edx = position;
+  regs.eax = 0x4f05;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x10, &regs);
+  return regs.eax & 0xffff;
+}
+
+/* Call VESA BIOS 0x4f05 to return memory window, return status.  */
+grub_vbe_status_t
+grub_vbe_bios_get_memory_window (grub_uint32_t window,
+				 grub_uint32_t *position)
+{
+  struct grub_bios_int_registers regs;
+
+  regs.eax = 0x4f05;
+  /* BH = 1, Get memory window. BL = window.  */
+  regs.ebx = (window & 0x00ff) | 0x100;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x10, &regs);
+
+  *position = regs.edx & 0xffff;
+  return regs.eax & 0xffff;
+}
+
+/* Call VESA BIOS 0x4f06 to set scanline length (in bytes), return status.  */
+grub_vbe_status_t 
+grub_vbe_bios_set_scanline_length (grub_uint32_t length)
+{
+  struct grub_bios_int_registers regs;
+
+  regs.ecx = length;
+  regs.eax = 0x4f06;
+  /* BL = 2, Set Scan Line in Bytes.  */
+  regs.ebx = 0x0002;	
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x10, &regs);
+  return regs.eax & 0xffff;
+}
+
+/* Call VESA BIOS 0x4f06 to return scanline length (in bytes), return status.  */
+grub_vbe_status_t 
+grub_vbe_bios_get_scanline_length (grub_uint32_t *length)
+{
+  struct grub_bios_int_registers regs;
+
+  regs.eax = 0x4f06;
+  regs.ebx = 0x0001;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  /* BL = 1, Get Scan Line Length (in bytes).  */
+  grub_bios_interrupt (0x10, &regs);
+
+  *length = regs.ebx & 0xffff;
+  return regs.eax & 0xffff;
+}
+
+/* Call VESA BIOS 0x4f07 to set display start, return status.  */
+static grub_vbe_status_t 
+grub_vbe_bios_set_display_start (grub_uint32_t x, grub_uint32_t y)
+{
+  struct grub_bios_int_registers regs;
+
+  /* Store x in %ecx.  */
+  regs.ecx = x;
+  regs.edx = y;
+  regs.eax = 0x4f07;
+  /* BL = 80h, Set Display Start during Vertical Retrace.  */
+  regs.ebx = 0x0080;	
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x10, &regs);
+  return regs.eax & 0xffff;
+}
+
+/* Call VESA BIOS 0x4f07 to get display start, return status.  */
+grub_vbe_status_t 
+grub_vbe_bios_get_display_start (grub_uint32_t *x,
+				 grub_uint32_t *y)
+{
+  struct grub_bios_int_registers regs;
+
+  regs.eax = 0x4f07;
+  /* BL = 1, Get Display Start.  */
+  regs.ebx = 0x0001;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x10, &regs);
+
+  *x = regs.ecx & 0xffff;
+  *y = regs.edx & 0xffff;
+  return regs.eax & 0xffff;
+}
+
 grub_err_t
 grub_vbe_probe (struct grub_vbe_info_block *info_block)
 {

From 1b8cb8573bca47fbf959be2b7c5f5da868c09735 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 4 Apr 2010 15:49:06 +0200
Subject: [PATCH 0734/1628] intwrap grub_pxe_scan

---
 fs/i386/pc/pxe.c           | 56 +++++++++++++++++++++++++++++-----
 include/grub/i386/pc/pxe.h |  5 ++--
 kern/i386/pc/startup.S     | 61 ++------------------------------------
 3 files changed, 53 insertions(+), 69 deletions(-)

diff --git a/fs/i386/pc/pxe.c b/fs/i386/pc/pxe.c
index 82d8ee583..0a279df45 100644
--- a/fs/i386/pc/pxe.c
+++ b/fs/i386/pc/pxe.c
@@ -27,6 +27,7 @@
 #include <grub/env.h>
 
 #include <grub/machine/pxe.h>
+#include <grub/machine/int.h>
 #include <grub/machine/memory.h>
 
 #define SEGMENT(x)	((x) >> 4)
@@ -55,6 +56,45 @@ struct grub_pxe_data
   char filename[0];
 };
 
+static grub_uint32_t pxe_rm_entry = 0;
+
+static struct grub_pxenv *
+grub_pxe_scan (void)
+{
+  struct grub_bios_int_registers regs;
+  struct grub_pxenv *ret;
+  void *pxe;
+
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+
+  regs.ebx = 0;
+  regs.ecx = 0;
+  regs.eax = 0x5650;
+
+  grub_bios_interrupt (0x1a, &regs);
+
+  if ((regs.eax & 0xffff) != 0x564e)
+    return NULL;
+  ret = (struct grub_pxenv *) ((regs.es << 4) + (regs.ebx & 0xffff));
+  if (grub_memcmp (ret->signature, GRUB_PXE_SIGNATURE, sizeof (ret->signature))
+      != 0)
+    return NULL;
+  if (ret->version < 0x201)
+    return NULL;
+
+  pxe = (void *) ((((ret->pxe_ptr & 0xffff0000) >> 16) << 4)
+		  + (ret->pxe_ptr & 0xffff));
+  if (!pxe)
+    return NULL;
+
+  /* !PXE  */
+  if (*(grub_uint32_t *) pxe !=	0x45585021)
+    return NULL;
+
+  pxe_rm_entry = ret->rm_entry;
+  return ret;
+}
+
 static int
 grub_pxe_iterate (int (*hook) (const char *name))
 {
@@ -202,14 +242,14 @@ grub_pxefs_open (struct grub_file *file, const char *name)
 
   if (curr_file != 0)
     {
-      grub_pxe_call (GRUB_PXENV_TFTP_CLOSE, &c.c2);
+      grub_pxe_call (GRUB_PXENV_TFTP_CLOSE, &c.c2, pxe_rm_entry);
       curr_file = 0;
     }
 
   c.c1.server_ip = disk_data->server_ip;
   c.c1.gateway_ip = disk_data->gateway_ip;
   grub_strcpy ((char *)&c.c1.filename[0], name);
-  grub_pxe_call (GRUB_PXENV_TFTP_GET_FSIZE, &c.c1);
+  grub_pxe_call (GRUB_PXENV_TFTP_GET_FSIZE, &c.c1, pxe_rm_entry);
   if (c.c1.status)
     return grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
 
@@ -217,7 +257,7 @@ grub_pxefs_open (struct grub_file *file, const char *name)
 
   c.c2.tftp_port = grub_cpu_to_be16 (GRUB_PXE_TFTP_PORT);
   c.c2.packet_size = grub_pxe_blksize;
-  grub_pxe_call (GRUB_PXENV_TFTP_OPEN, &c.c2);
+  grub_pxe_call (GRUB_PXENV_TFTP_OPEN, &c.c2, pxe_rm_entry);
   if (c.c2.status)
     return grub_error (GRUB_ERR_BAD_FS, "open fails");
 
@@ -275,14 +315,14 @@ grub_pxefs_read (grub_file_t file, char *buf, grub_size_t len)
       struct grub_pxenv_tftp_open o;
 
       if (curr_file != 0)
-        grub_pxe_call (GRUB_PXENV_TFTP_CLOSE, &o);
+        grub_pxe_call (GRUB_PXENV_TFTP_CLOSE, &o, pxe_rm_entry);
 
       o.server_ip = disk_data->server_ip;
       o.gateway_ip = disk_data->gateway_ip;
       grub_strcpy ((char *)&o.filename[0], data->filename);
       o.tftp_port = grub_cpu_to_be16 (GRUB_PXE_TFTP_PORT);
       o.packet_size = grub_pxe_blksize;
-      grub_pxe_call (GRUB_PXENV_TFTP_OPEN, &o);
+      grub_pxe_call (GRUB_PXENV_TFTP_OPEN, &o, pxe_rm_entry);
       if (o.status)
 	{
 	  grub_error (GRUB_ERR_BAD_FS, "open fails");
@@ -297,7 +337,7 @@ grub_pxefs_read (grub_file_t file, char *buf, grub_size_t len)
   while (pn >= data->packet_number)
     {
       c.buffer_size = data->block_size;
-      grub_pxe_call (GRUB_PXENV_TFTP_READ, &c);
+      grub_pxe_call (GRUB_PXENV_TFTP_READ, &c, pxe_rm_entry);
       if (c.status)
         {
           grub_error (GRUB_ERR_BAD_FS, "read fails");
@@ -318,7 +358,7 @@ grub_pxefs_close (grub_file_t file)
 
   if (curr_file == file)
     {
-      grub_pxe_call (GRUB_PXENV_TFTP_CLOSE, &c);
+      grub_pxe_call (GRUB_PXENV_TFTP_CLOSE, &c, pxe_rm_entry);
       curr_file = 0;
     }
 
@@ -454,7 +494,7 @@ grub_pxe_detect (void)
   ci.packet_type = GRUB_PXENV_PACKET_TYPE_DHCP_ACK;
   ci.buffer = 0;
   ci.buffer_size = 0;
-  grub_pxe_call (GRUB_PXENV_GET_CACHED_INFO, &ci);
+  grub_pxe_call (GRUB_PXENV_GET_CACHED_INFO, &ci, pxe_rm_entry);
   if (ci.status)
     return;
 
diff --git a/include/grub/i386/pc/pxe.h b/include/grub/i386/pc/pxe.h
index 39f356c83..049dd1950 100644
--- a/include/grub/i386/pc/pxe.h
+++ b/include/grub/i386/pc/pxe.h
@@ -168,6 +168,8 @@
 
 #ifndef ASM_FILE
 
+#define GRUB_PXE_SIGNATURE "PXENV+"
+
 struct grub_pxenv
 {
   grub_uint8_t signature[6];	/* 'PXENV+'.  */
@@ -302,8 +304,7 @@ struct grub_pxenv_unload_stack
   grub_uint8_t reserved[10];
 } __attribute__ ((packed));
 
-struct grub_pxenv * EXPORT_FUNC(grub_pxe_scan) (void);
-int EXPORT_FUNC(grub_pxe_call) (int func, void * data);
+int EXPORT_FUNC(grub_pxe_call) (int func, void * data, grub_uint32_t pxe_rm_entry);
 
 extern struct grub_pxenv *grub_pxe_pxenv;
 
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index 8e4bd13bd..ef58c738c 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -1434,65 +1434,8 @@ FUNCTION(grub_get_rtc)
 	popl	%ebp
 	ret
 
-pxe_rm_entry:
-	.long	0
-
 /*
- * struct grub_pxenv *grub_pxe_scan (void);
- */
-FUNCTION(grub_pxe_scan)
-	pushl	%ebp
-	pushl	%ebx
-
-	xorl	%ebx, %ebx
-	xorl	%ecx, %ecx
-
-	call    prot_to_real
-	.code16
-
-	pushw	%es
-
-	movw	$0x5650, %ax
-	int	$0x1A
-	cmpw	$0x564E, %ax
-	jnz	1f
-	cmpl	$0x4E455850, %es:(%bx)		/* PXEN(V+)  */
-	jnz	1f
-	cmpw	$0x201, %es:6(%bx)		/* API version  */
-	jb	1f
-	lesw	%es:0x28(%bx), %bx		/* !PXE structure  */
-	cmpl	$0x45585021, %es:(%bx)		/* !PXE  */
-	jnz	1f
-	movw	%es, %cx
-	jmp	2f
-1:
-	xorw	%bx, %bx
-	xorw	%cx, %cx
-2:
-
-	popw	%es
-
-	DATA32 call	real_to_prot
-	.code32
-
-	xorl	%eax, %eax
-	leal	(%eax, %ecx, 4), %ecx
-	leal	(%ebx, %ecx, 4), %eax		/* eax = ecx * 16 + ebx  */
-
-	orl	%eax, %eax
-	jz	1f
-
-	movl	0x10(%eax), %ecx
-	movl	%ecx, pxe_rm_entry
-
-1:
-
-	popl	%ebx
-	popl	%ebp
-	ret
-
-/*
- * int grub_pxe_call (int func, void* data);
+ * int grub_pxe_call (int func, void* data, grub_uint32_t pxe_rm_entry);
  */
 FUNCTION(grub_pxe_call)
 	pushl	%ebp
@@ -1501,13 +1444,13 @@ FUNCTION(grub_pxe_call)
 	pushl	%edi
 	pushl	%ebx
 
+	movl	%ecx, %ebx
 	movl	%eax, %ecx
 	movl	%edx, %eax
 	andl	$0xF, %eax
 	shrl	$4, %edx
 	shll	$16, %edx
 	addl	%eax, %edx
-	movl	pxe_rm_entry, %ebx
 
 	call    prot_to_real
 	.code16

From 42c4f0001610dd487f9af1a7e22a05bc3bf33001 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 4 Apr 2010 18:42:48 +0200
Subject: [PATCH 0735/1628] intwrapped halt

---
 commands/i386/pc/halt.c | 64 +++++++++++++++++++++++++++++++++++++++++
 include/grub/misc.h     |  2 +-
 kern/i386/pc/startup.S  | 60 --------------------------------------
 3 files changed, 65 insertions(+), 61 deletions(-)

diff --git a/commands/i386/pc/halt.c b/commands/i386/pc/halt.c
index 4c39612ae..c237fe361 100644
--- a/commands/i386/pc/halt.c
+++ b/commands/i386/pc/halt.c
@@ -21,6 +21,7 @@
 #include <grub/misc.h>
 #include <grub/extcmd.h>
 #include <grub/i18n.h>
+#include <grub/machine/int.h>
 
 static const struct grub_arg_option options[] =
   {
@@ -28,6 +29,69 @@ static const struct grub_arg_option options[] =
     {0, 0, 0, 0, 0, 0}
   };
 
+static inline void __attribute__ ((noreturn))
+stop (void)
+{
+  while (1)
+    {
+      asm volatile ("hlt");
+    }
+}
+/*
+ * Halt the system, using APM if possible. If NO_APM is true, don't use
+ * APM even if it is available.
+ */
+void 
+grub_halt (int no_apm)
+{
+  struct grub_bios_int_registers regs;
+
+  if (no_apm)
+    stop ();
+
+  /* detect APM */
+  regs.eax = 0x5300;
+  regs.ebx = 0;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x15, &regs);
+  
+  if (regs.flags & GRUB_CPU_INT_FLAGS_CARRY)
+    stop ();
+
+  /* disconnect APM first */
+  regs.eax = 0x5304;
+  regs.ebx = 0;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x15, &regs);
+
+  /* connect APM */
+  regs.eax = 0x5301;
+  regs.ebx = 0;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x15, &regs);
+  if (regs.flags & GRUB_CPU_INT_FLAGS_CARRY)
+    stop ();
+
+  /* set APM protocol level - 1.1 or bust. (this covers APM 1.2 also) */
+  regs.eax = 0x530E;
+  regs.ebx = 0;
+  regs.ecx = 0x0101;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x15, &regs);
+  if (regs.flags & GRUB_CPU_INT_FLAGS_CARRY)
+    stop ();
+
+  /* set the power state to off */
+  regs.eax = 0x5307;
+  regs.ebx = 1;
+  regs.ecx = 3;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x15, &regs);
+
+  /* shouldn't reach here */
+  stop ();
+}
+
 static grub_err_t
 grub_cmd_halt (grub_extcmd_t cmd,
 	       int argc __attribute__ ((unused)),
diff --git a/include/grub/misc.h b/include/grub/misc.h
index 61174c38d..95c7664f1 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -298,7 +298,7 @@ void EXPORT_FUNC (grub_reboot) (void);
 #ifdef GRUB_MACHINE_PCBIOS
 /* Halt the system, using APM if possible. If NO_APM is true, don't
  * use APM even if it is available.  */
-void EXPORT_FUNC (grub_halt) (int no_apm);
+void grub_halt (int no_apm);
 #else
 void EXPORT_FUNC (grub_halt) (void);
 #endif
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index ef58c738c..4c7c74ec7 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -450,16 +450,6 @@ gate_a20_check_state:
  */
 	. = _start + GRUB_KERNEL_MACHINE_RAW_SIZE
 
-	/*
-	 * This next part is sort of evil.  It takes advantage of the
-	 * byte ordering on the x86 to work in either 16-bit or 32-bit
-	 * mode, so think about it before changing it.
-	 */
-
-FUNCTION(grub_hard_stop)
-	hlt
-	jmp EXT_C(grub_hard_stop)
-
 
 /*
  * grub_stop_floppy()
@@ -486,56 +476,6 @@ FUNCTION(grub_exit)
 	jmp	cold_reboot
 	.code32
 
-/*
- * grub_halt(int no_apm)
- *
- * Halt the system, using APM if possible. If NO_APM is true, don't use
- * APM even if it is available.
- */
-FUNCTION(grub_halt)
-	/* see if zero */
-	testl	%eax, %eax
-	jnz	EXT_C(grub_stop)
-
-	call	prot_to_real
-	.code16
-
-	/* detect APM */
-	movw	$0x5300, %ax
-	xorw	%bx, %bx
-	int	$0x15
-	jc	EXT_C(grub_hard_stop)
-	/* don't check %bx for buggy BIOSes... */
-
-	/* disconnect APM first */
-	movw	$0x5304, %ax
-	xorw	%bx, %bx
-	int	$0x15
-
-	/* connect APM */
-	movw	$0x5301, %ax
-	xorw	%bx, %bx
-	int	$0x15
-	jc	EXT_C(grub_hard_stop)
-
-	/* set APM protocol level - 1.1 or bust. (this covers APM 1.2 also) */
-	movw	$0x530E, %ax
-	xorw	%bx, %bx
-	movw	$0x0101, %cx
-	int	$0x15
-	jc	EXT_C(grub_hard_stop)
-
-	/* set the power state to off */
-	movw	$0x5307, %ax
-	movw	$1, %bx
-	movw	$3, %cx
-	int	$0x15
-
-	/* shouldn't reach here */
-	jmp	EXT_C(grub_hard_stop)
-	.code32
-
-
 /*
  *  void grub_chainloader_real_boot (int drive, void *part_addr)
  *

From 77356db852a5866ccef6cf1025fefff27a1ac279 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 4 Apr 2010 18:43:26 +0200
Subject: [PATCH 0736/1628] Intwrapped biosdisk

---
 conf/i386-pc.rmk                |   3 +-
 disk/i386/pc/biosdisk.c         | 160 ++++++++++++++++++++
 include/grub/i386/pc/biosdisk.h |  12 --
 include/grub/i386/pc/init.h     |   2 +-
 kern/i386/pc/startup.S          | 257 --------------------------------
 5 files changed, 162 insertions(+), 272 deletions(-)

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index bef17a25b..39554594c 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -54,8 +54,7 @@ kernel_img_SOURCES = kern/i386/pc/startup.S \
 	kern/env.c \
 	term/i386/pc/console.c term/i386/vga_common.c \
 	symlist.c
-kernel_img_HEADERS += machine/biosdisk.h machine/pxe.h i386/pit.h \
-	machine/init.h machine/int.h
+kernel_img_HEADERS += machine/pxe.h i386/pit.h machine/int.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
diff --git a/disk/i386/pc/biosdisk.c b/disk/i386/pc/biosdisk.c
index 4fc29023b..71b516422 100644
--- a/disk/i386/pc/biosdisk.c
+++ b/disk/i386/pc/biosdisk.c
@@ -83,6 +83,166 @@ grub_biosdisk_rw_int13_extensions (int ah, int drive, void *dap)
   return (regs.eax >> 8) & 0xff;
 }
 
+/*
+ *   Call standard and old INT13 (int 13 %ah=AH) for DRIVE. Read/write
+ *   NSEC sectors from COFF/HOFF/SOFF into SEGMENT. If an error occurs,
+ *   return non-zero, otherwise zero.
+ */
+static int 
+grub_biosdisk_rw_standard (int ah, int drive, int coff, int hoff,
+			   int soff, int nsec, int segment)
+{
+  int ret, i;
+
+  /* Try 3 times.  */
+  for (i = 0; i < 3; i++)
+    {
+      struct grub_bios_int_registers regs;
+
+      /* set up CHS information */
+      /* set %ch to low eight bits of cylinder */
+      regs.ecx = (coff << 8) & 0xff00;
+      /* set bits 6-7 of %cl to high two bits of cylinder */
+      regs.ecx |= (coff >> 2) & 0xc0;
+      /* set bits 0-5 of %cl to sector */
+      regs.ecx |= soff & 0x3f;
+
+      /* set %dh to head and %dl to drive */  
+      regs.edx = (drive & 0xff) | ((hoff << 8) & 0xff00);
+      /* set %ah to AH */
+      regs.eax = (ah << 8) & 0xff00;
+      /* set %al to NSEC */
+      regs.eax |= nsec & 0xff;
+
+      regs.ebx = 0;
+      regs.es = segment;
+
+      regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+
+      grub_bios_interrupt (0x13, &regs);
+      /* check if successful */
+      if (!(regs.flags & GRUB_CPU_INT_FLAGS_CARRY))
+	return 0;
+
+      /* save return value */
+      ret = regs.eax >> 8;
+
+      /* if fail, reset the disk system */
+      regs.eax = 0;
+      regs.edx = (drive & 0xff);
+      regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+      grub_bios_interrupt (0x13, &regs);
+    }
+  return ret;
+}
+
+/*
+ *   Check if LBA is supported for DRIVE. If it is supported, then return
+ *   the major version of extensions, otherwise zero.
+ */
+static int
+grub_biosdisk_check_int13_extensions (int drive)
+{
+  struct grub_bios_int_registers regs;
+
+  regs.edx = drive & 0xff;
+  regs.eax = 0x4100;
+  regs.ebx = 0x55aa;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x13, &regs);
+  
+  if (regs.flags & GRUB_CPU_INT_FLAGS_CARRY)
+    return 0;
+
+  if ((regs.ebx & 0xffff) != 0xaa55)
+    return 0;
+
+  /* check if AH=0x42 is supported */
+  if (!(regs.ecx & 1))
+    return 0;
+
+  return (regs.eax >> 8) & 0xff;
+}
+
+/*
+ *   Return the geometry of DRIVE in CYLINDERS, HEADS and SECTORS. If an
+ *   error occurs, then return non-zero, otherwise zero.
+ */
+static int 
+grub_biosdisk_get_diskinfo_standard (int drive,
+				     unsigned long *cylinders,
+				     unsigned long *heads,
+				     unsigned long *sectors)
+{
+  struct grub_bios_int_registers regs;
+
+  regs.eax = 0x0800;
+  regs.edx = drive & 0xff;
+
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x13, &regs);
+
+  /* Check if unsuccessful. Ignore return value if carry isn't set to 
+     workaround some buggy BIOSes. */
+  if ((regs.flags & GRUB_CPU_INT_FLAGS_CARRY) && ((regs.eax & 0xff00) != 0))
+    return (regs.eax & 0xff00) >> 8;
+
+  /* bogus BIOSes may not return an error number */  
+  /* 0 sectors means no disk */
+  if (!(regs.ecx & 0x3f))
+    /* XXX 0x60 is one of the unused error numbers */
+    return 0x60;
+
+  /* the number of heads is counted from zero */
+  *heads = ((regs.edx >> 8) & 0xff) + 1;
+  *cylinders = (((regs.ecx >> 8) & 0xff) | ((regs.ecx << 2) & 0x0300)) + 1;
+  *sectors = regs.ecx & 0x3f;
+  return 0;
+}
+
+static int
+grub_biosdisk_get_diskinfo_real (int drive, void *drp, grub_uint16_t ax)
+{
+  struct grub_bios_int_registers regs;
+
+  regs.eax = ax;
+
+  /* compute the address of drive parameters */
+  regs.esi = ((grub_addr_t) drp) & 0xf;
+  regs.ds = ((grub_addr_t) drp) >> 4;
+  regs.edx = drive & 0xff;
+
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x13, &regs);
+
+  /* Check if unsuccessful. Ignore return value if carry isn't set to 
+     workaround some buggy BIOSes. */
+  if ((regs.flags & GRUB_CPU_INT_FLAGS_CARRY) && ((regs.eax & 0xff00) != 0))
+    return (regs.eax & 0xff00) >> 8;
+
+  return 0;
+}
+
+/*
+ *   Return the cdrom information of DRIVE in CDRP. If an error occurs,
+ *   then return non-zero, otherwise zero.
+ */
+static int
+grub_biosdisk_get_cdinfo_int13_extensions (int drive, void *cdrp)
+{
+  return grub_biosdisk_get_diskinfo_real (drive, cdrp, 0x4b01);
+}
+
+/*
+ *   Return the geometry of DRIVE in a drive parameters, DRP. If an error
+ *   occurs, then return non-zero, otherwise zero.
+ */
+static int
+grub_biosdisk_get_diskinfo_int13_extensions (int drive, void *drp)
+{
+  return grub_biosdisk_get_diskinfo_real (drive, drp, 0x4800);
+}
+
 static int
 grub_biosdisk_get_drive (const char *name)
 {
diff --git a/include/grub/i386/pc/biosdisk.h b/include/grub/i386/pc/biosdisk.h
index 83d833cad..69a240a2e 100644
--- a/include/grub/i386/pc/biosdisk.h
+++ b/include/grub/i386/pc/biosdisk.h
@@ -106,18 +106,6 @@ struct grub_biosdisk_dap
   grub_uint64_t block;
 } __attribute__ ((packed));
 
-int EXPORT_FUNC(grub_biosdisk_rw_standard) (int ah, int drive, int coff, int hoff,
-			       int soff, int nsec, int segment);
-int EXPORT_FUNC(grub_biosdisk_check_int13_extensions) (int drive);
-int EXPORT_FUNC(grub_biosdisk_get_diskinfo_int13_extensions) (int drive,
-           void *drp);
-int EXPORT_FUNC(grub_biosdisk_get_cdinfo_int13_extensions) (int drive,
-           void *cdrp);
-int EXPORT_FUNC(grub_biosdisk_get_diskinfo_standard) (int drive,
-					 unsigned long *cylinders,
-					 unsigned long *heads,
-					 unsigned long *sectors);
-
 void grub_biosdisk_init (void);
 void grub_biosdisk_fini (void);
 
diff --git a/include/grub/i386/pc/init.h b/include/grub/i386/pc/init.h
index 2be80e773..30130d189 100644
--- a/include/grub/i386/pc/init.h
+++ b/include/grub/i386/pc/init.h
@@ -33,7 +33,7 @@ grub_uint32_t grub_get_eisa_mmap (void);
 
 /* Get a memory map entry. Return next continuation value. Zero means
    the end.  */
-grub_uint32_t EXPORT_FUNC(grub_get_mmap_entry) (struct grub_machine_mmap_entry *entry,
+grub_uint32_t grub_get_mmap_entry (struct grub_machine_mmap_entry *entry,
 				   grub_uint32_t cont);
 
 /* Turn on/off Gate A20.  */
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index 4c7c74ec7..6733e12bc 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -505,263 +505,6 @@ FUNCTION(grub_chainloader_real_boot)
 
 #include "../loader.S"
 
-/*
- *   int grub_biosdisk_rw_standard (int ah, int drive, int coff, int hoff,
- *                                  int soff, int nsec, int segment)
- *
- *   Call standard and old INT13 (int 13 %ah=AH) for DRIVE. Read/write
- *   NSEC sectors from COFF/HOFF/SOFF into SEGMENT. If an error occurs,
- *   return non-zero, otherwise zero.
- */
-
-FUNCTION(grub_biosdisk_rw_standard)
-	pushl	%ebp
-	movl	%esp, %ebp
-
-	pushl	%ebx
-	pushl	%edi
-	pushl	%esi
-
-	/* set up CHS information */
-
-	/* set %ch to low eight bits of cylinder */
-	xchgb	%cl, %ch
-	/* set bits 6-7 of %cl to high two bits of cylinder */
-	shlb	$6, %cl
-	/* set bits 0-5 of %cl to sector */
-	addb	0xc(%ebp), %cl
-	/* set %dh to head */
-	movb	0x8(%ebp), %dh
-	/* set %ah to AH */
-	movb	%al, %ah
-	/* set %al to NSEC */
-	movb	0x10(%ebp), %al
-	/* save %ax in %di */
-	movw	%ax, %di
-	/* save SEGMENT in %bx */
-	movw	0x14(%ebp), %bx
-
-	/* enter real mode */
-	call	prot_to_real
-
-	.code16
-	movw	%bx, %es
-	xorw	%bx, %bx
-	movw	$3, %si		/* attempt at least three times */
-
-1:
-	movw	%di, %ax
-	int	$0x13		/* do the operation */
-	jnc	2f		/* check if successful */
-
-	movb	%ah, %bl	/* save return value */
-	/* if fail, reset the disk system */
-	xorw	%ax, %ax
-	int	$0x13
-
-	decw	%si
-	cmpw	$0, %si
-	je	2f
-	xorb	%bl, %bl
-	jmp	1b		/* retry */
-2:
-	/* back to protected mode */
-	DATA32	call	real_to_prot
-	.code32
-
-	movb	%bl, %al	/* return value in %eax */
-
-	popl	%esi
-	popl	%edi
-	popl	%ebx
-	popl	%ebp
-
-	ret	$(4 * 4)
-
-
-/*
- *   int grub_biosdisk_check_int13_extensions (int drive)
- *
- *   Check if LBA is supported for DRIVE. If it is supported, then return
- *   the major version of extensions, otherwise zero.
- */
-
-FUNCTION(grub_biosdisk_check_int13_extensions)
-	pushl	%ebp
-	pushl	%ebx
-
-	/* drive */
-	movb	%al, %dl
-	/* enter real mode */
-	call	prot_to_real
-
-	.code16
-	movb	$0x41, %ah
-	movw	$0x55aa, %bx
-	int	$0x13		/* do the operation */
-
-	/* check the result */
-	jc	1f
-	cmpw	$0xaa55, %bx
-	jne	1f
-
-	movb	%ah, %bl	/* save the major version into %bl */
-
-	/* check if AH=0x42 is supported */
-	andw	$1, %cx
-	jnz	2f
-
-1:
-	xorb	%bl, %bl
-2:
-	/* back to protected mode */
-	DATA32	call	real_to_prot
-	.code32
-
-	movb	%bl, %al	/* return value in %eax */
-
-	popl	%ebx
-	popl	%ebp
-
-	ret
-
-
-/*
- *   int grub_biosdisk_get_cdinfo_int13_extensions (int drive, void *cdrp)
- *
- *   Return the cdrom information of DRIVE in CDRP. If an error occurs,
- *   then return non-zero, otherwise zero.
- */
-
-FUNCTION(grub_biosdisk_get_cdinfo_int13_extensions)
-	movw	$0x4B01, %cx
-	jmp	1f
-
-/*
- *   int grub_biosdisk_get_diskinfo_int13_extensions (int drive, void *drp)
- *
- *   Return the geometry of DRIVE in a drive parameters, DRP. If an error
- *   occurs, then return non-zero, otherwise zero.
- */
-
-FUNCTION(grub_biosdisk_get_diskinfo_int13_extensions)
-	movb	$0x48, %ch
-1:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-
-	/* compute the address of drive parameters */
-	movw	%dx, %si
-	andl	$0xf, %esi
-	shrl	$4, %edx
-	movw	%dx, %bx	/* save the segment into %bx */
-	/* drive */
-	movb	%al, %dl
-	/* enter real mode */
-	call	prot_to_real
-
-	.code16
-	movw	%cx, %ax
-	movw	%bx, %ds
-	int	$0x13		/* do the operation */
-	jc      noclean
-	/* Clean return value if carry isn't set to workaround
-	some buggy BIOSes.  */
-	xor     %ax, %ax
-noclean:
-	movb	%ah, %bl	/* save return value in %bl */
-	/* back to protected mode */
-	DATA32	call	real_to_prot
-	.code32
-
-	movb	%bl, %al	/* return value in %eax */
-
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-
-	ret
-
-
-/*
- *   int grub_biosdisk_get_diskinfo_standard (int drive,
- *                                            unsigned long *cylinders,
- *                                            unsigned long *heads,
- *                                            unsigned long *sectors)
- *
- *   Return the geometry of DRIVE in CYLINDERS, HEADS and SECTORS. If an
- *   error occurs, then return non-zero, otherwise zero.
- */
-
-FUNCTION(grub_biosdisk_get_diskinfo_standard)
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%edi
-
-	/* push CYLINDERS */
-	pushl	%edx
-	/* push HEADS */
-	pushl	%ecx
-	/* SECTORS is on the stack */
-
-	/* drive */
-	movb	%al, %dl
-	/* enter real mode */
-	call	prot_to_real
-
-	.code16
-	movb	$0x8, %ah
-	int	$0x13		/* do the operation */
-	jc      noclean2
-	/* Clean return value if carry isn't set to workaround
-	some buggy BIOSes.  */
-	xor     %ax, %ax
-noclean2:
-	/* check if successful */
-	testb	%ah, %ah
-	jnz	1f
-	/* bogus BIOSes may not return an error number */
-	testb	$0x3f, %cl	/* 0 sectors means no disk */
-	jnz	1f		/* if non-zero, then succeed */
-	/* XXX 0x60 is one of the unused error numbers */
-	movb	$0x60, %ah
-1:
-	movb	%ah, %bl	/* save return value in %bl */
-	/* back to protected mode */
-	DATA32	call	real_to_prot
-	.code32
-
-	/* pop HEADS */
-	popl	%edi
-	movb	%dh, %al
-	incl	%eax	/* the number of heads is counted from zero */
-	movl	%eax, (%edi)
-
-	/* pop CYLINDERS */
-	popl	%edi
-	movb	%ch, %al
-	movb	%cl, %ah
-	shrb	$6, %ah	/* the number of cylinders is counted from zero */
-	incl	%eax
-	movl	%eax, (%edi)
-
-	/* SECTORS */
-	movl	0x10(%esp), %edi
-	andb	$0x3f, %cl
-	movzbl	%cl, %eax
-	movl	%eax, (%edi)
-
-	xorl	%eax, %eax
-	movb	%bl, %al	/* return value in %eax */
-
-	popl	%edi
-	popl	%ebx
-	popl	%ebp
-
-	ret	$4
-
-
 /*
  *
  * grub_get_memsize(i) :  return the memory size in KB. i == 0 for conventional

From 064cb524ecb9c70d611065a6d3c1b4b3fe0e85a3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 5 Apr 2010 15:57:40 +0200
Subject: [PATCH 0737/1628] 	* include/grub/i386/pc/init.h
 (grub_get_mmap_entry): Don't export. 	* conf/i386-pc.rmk
 (kernel_img_HEADERS): Remove machine/init.h.

---
 ChangeLog                   | 5 +++++
 conf/i386-pc.rmk            | 2 +-
 include/grub/i386/pc/init.h | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index de10988c5..745bbe423 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/i386/pc/init.h (grub_get_mmap_entry): Don't export.
+	* conf/i386-pc.rmk (kernel_img_HEADERS): Remove machine/init.h.
+
 2010-04-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Remove unused grub_vga_get_font.
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index ece88446b..18febc879 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -55,7 +55,7 @@ kernel_img_SOURCES = kern/i386/pc/startup.S \
 	term/i386/pc/console.c term/i386/vga_common.c \
 	symlist.c
 kernel_img_HEADERS += machine/biosdisk.h machine/vga.h machine/vbe.h \
-	machine/pxe.h i386/pit.h machine/init.h
+	machine/pxe.h i386/pit.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
diff --git a/include/grub/i386/pc/init.h b/include/grub/i386/pc/init.h
index 2be80e773..30130d189 100644
--- a/include/grub/i386/pc/init.h
+++ b/include/grub/i386/pc/init.h
@@ -33,7 +33,7 @@ grub_uint32_t grub_get_eisa_mmap (void);
 
 /* Get a memory map entry. Return next continuation value. Zero means
    the end.  */
-grub_uint32_t EXPORT_FUNC(grub_get_mmap_entry) (struct grub_machine_mmap_entry *entry,
+grub_uint32_t grub_get_mmap_entry (struct grub_machine_mmap_entry *entry,
 				   grub_uint32_t cont);
 
 /* Turn on/off Gate A20.  */

From 2622c3ffb0fab52f0a00a8096b88ce55afb45198 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 5 Apr 2010 15:59:32 +0200
Subject: [PATCH 0738/1628] 	* kern/i386/pc/startup.S (grub_getrtsecs):
 Removed (dead code).

---
 ChangeLog              |  4 ++++
 kern/i386/pc/startup.S | 41 -----------------------------------------
 2 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 745bbe423..de222d1cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/i386/pc/startup.S (grub_getrtsecs): Removed (dead code).
+
 2010-04-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/i386/pc/init.h (grub_get_mmap_entry): Don't export.
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index e78903a45..374277767 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -1444,47 +1444,6 @@ FUNCTION(grub_console_setcursor)
 	popl	%ebp
 	ret
 
-/*
- * grub_getrtsecs()
- *	if a seconds value can be read, read it and return it (BCD),
- *      otherwise return 0xFF
- * BIOS call "INT 1AH Function 02H" to check whether a character is pending
- *	Call with	%ah = 0x2
- *	Return:
- *		If RT Clock can give correct values
- *			%ch = hour (BCD)
- *			%cl = minutes (BCD)
- *                      %dh = seconds (BCD)
- *                      %dl = daylight savings time (00h std, 01h daylight)
- *			Carry flag = clear
- *		else
- *			Carry flag = set
- *                         (this indicates that the clock is updating, or
- *                          that it isn't running)
- */
-FUNCTION(grub_getrtsecs)
-	pushl	%ebp
-
-	call	prot_to_real	/* enter real mode */
-	.code16
-
-	clc
-	movb	$0x2, %ah
-	int	$0x1a
-
-	DATA32	jnc	gottime
-	movb	$0xff, %dh
-
-gottime:
-	DATA32	call	real_to_prot
-	.code32
-
-	movb	%dh, %al
-
-	popl	%ebp
-	ret
-
-
 /*
  * grub_get_rtc()
  *	return the real time in ticks, of which there are about

From 974ac4f755edec1d286d6d4b23687083adfedb51 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 5 Apr 2010 16:06:16 +0200
Subject: [PATCH 0739/1628] 	* loader/i386/multiboot_mbi.c
 (grub_multiboot_load): Correctly report 	unsupported video mode types.

---
 ChangeLog                   | 5 +++++
 loader/i386/multiboot_mbi.c | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index de222d1cb..5fd6a7c0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/i386/multiboot_mbi.c (grub_multiboot_load): Correctly report
+	unsupported video mode types.
+
 2010-04-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/i386/pc/startup.S (grub_getrtsecs): Removed (dead code).
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index 2a7c70f96..3d974f04e 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -170,6 +170,11 @@ grub_multiboot_load (grub_file_t file)
 					    header->width, header->height,
 					    header->depth, 0);
 	  break;
+	default:
+	  err = grub_error (GRUB_ERR_BAD_OS, 
+			    "unsupported graphical mode type %d",
+			    header->mode_type);
+	  break;
 	}
     }
   else

From 09220190683cf9170953b09e82759d442dde95c0 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 5 Apr 2010 21:08:30 +0530
Subject: [PATCH 0740/1628] added flex version check in configure.ac

---
 configure.ac | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 50edf645c..157a6114c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,11 +170,6 @@ if test "x$CMP" = x; then
   AC_MSG_ERROR([cmp is not found])
 fi
 
-AC_CHECK_PROGS([LEX], [flex])
-if test "x$LEX" = x; then
-  AC_MSG_ERROR([flex is not found])
-fi
-
 AC_CHECK_PROGS([YACC], [bison])
 if test "x$YACC" = x; then
   AC_MSG_ERROR([bison is not found])
@@ -188,10 +183,23 @@ for file in /usr/src/unifont.bdf /usr/share/fonts/X11/misc/unifont.pcf.gz /usr/s
 done
 
 AC_PROG_INSTALL
+AC_PROG_SED
 AC_PROG_AWK
+AC_PROG_LEX
 AC_PROG_MAKE_SET
 AC_PROG_MKDIR_P
 
+if test "x$LEX" = x; then
+  AC_MSG_ERROR([flex is not found])
+else
+  version=`$LEX --version 2>/dev/null | $SED -e 's/flex //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 100 + $2) * 100 + $3;}'`
+  if test -n "$version" -a test "$version" -ge 205035; then
+    :
+  else
+    AC_MSG_ERROR([flex is too old. GRUB requires 2.5.35 or above])
+  fi
+fi
+
 # These are not a "must".
 AC_PATH_PROG(RUBY, ruby)
 AC_PATH_PROG(MAKEINFO, makeinfo)

From b777c18e388b55230058fdae5e0a120307b5430d Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 5 Apr 2010 21:47:19 +0530
Subject: [PATCH 0741/1628] fixed version canonicalization

---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 157a6114c..1f55a9ca7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,8 +192,8 @@ AC_PROG_MKDIR_P
 if test "x$LEX" = x; then
   AC_MSG_ERROR([flex is not found])
 else
-  version=`$LEX --version 2>/dev/null | $SED -e 's/flex //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 100 + $2) * 100 + $3;}'`
-  if test -n "$version" -a test "$version" -ge 205035; then
+  version=`$LEX --version 2>/dev/null | $SED -e 's/flex //' | $AWK 'BEGIN { FS = "."; } { printf "%d", $1 * 10000 + $2 * 100 + $3;}'`
+  if test -n "$version" -a "$version" -ge 20535; then
     :
   else
     AC_MSG_ERROR([flex is too old. GRUB requires 2.5.35 or above])

From 04a3792f87113f34b7fe3bfce3bdf347cb19ff84 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 5 Apr 2010 22:39:58 +0200
Subject: [PATCH 0742/1628] Macroify fwstart.S more

---
 include/grub/mips/loongson.h        |  3 +++
 include/grub/mips/yeeloong/serial.h |  1 +
 kern/mips/yeeloong/fwstart.S        | 24 +++++++++++++-----------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/include/grub/mips/loongson.h b/include/grub/mips/loongson.h
index c2aa276a2..7dcc15cd4 100644
--- a/include/grub/mips/loongson.h
+++ b/include/grub/mips/loongson.h
@@ -67,6 +67,9 @@
 #define GRUB_CPU_LOONGSON_LIOCFG   0xbfe00108
 #define GRUB_CPU_LOONGSON_ROM_DELAY_OFFSET 2
 #define GRUB_CPU_LOONGSON_ROM_DELAY_MASK 0x1f
+#define GRUB_CPU_LOONGSON_CORECFG   0xbfe00180
+#define GRUB_CPU_LOONGSON_CORECFG_DISABLE_DDR2_SPACE 0x100
+#define GRUB_CPU_LOONGSON_CORECFG_BUFFER_CPU 0x200
 
 #define GRUB_CPU_LOONGSON_GPIOCFG  0xbfe00120
 #define GRUB_CPU_LOONGSON_SHUTDOWN_GPIO 1
diff --git a/include/grub/mips/yeeloong/serial.h b/include/grub/mips/yeeloong/serial.h
index b22352f5a..ebe3638a1 100644
--- a/include/grub/mips/yeeloong/serial.h
+++ b/include/grub/mips/yeeloong/serial.h
@@ -19,6 +19,7 @@
 #ifndef GRUB_MACHINE_SERIAL_HEADER
 #define GRUB_MACHINE_SERIAL_HEADER	1
 
+#define GRUB_MACHINE_SERIAL_DIVISOR_115200 2
 #define GRUB_MACHINE_SERIAL_PORT  0xbff003f8
 
 #ifndef ASM_FILE
diff --git a/kern/mips/yeeloong/fwstart.S b/kern/mips/yeeloong/fwstart.S
index 4a9a749f7..f541a535f 100644
--- a/kern/mips/yeeloong/fwstart.S
+++ b/kern/mips/yeeloong/fwstart.S
@@ -116,17 +116,19 @@ __start:
 	 move $a0, $v0
 
 	bal read_spd
-	 ori $a0, $zero, 2
+	 ori $a0, $zero, GRUB_SMBUS_SPD_MEMORY_TYPE_ADDR
 	ori $t0, $zero, GRUB_SMBUS_SPD_MEMORY_TYPE_DDR2
 	lui $a0, %hi(unimplemented_memory_type)
 	bne $t0, $v0, fatal
 	 addiu $a0, $a0, %hi(unimplemented_memory_type)
 
 	/* And here is our goal: DDR2 controller initialisation.  */
-        lui	$t0, 0xbfe0
-        ld	$t1, 0x0180($t0)
-	andi	$t1, $t1, 0x4ff
-        sd	$t1, 0x0180($t0)
+        lui	$t0, %hi(GRUB_CPU_LOONGSON_CORECFG)
+        ld	$t1, %lo(GRUB_CPU_LOONGSON_CORECFG) ($t0)
+	/* Use addiu for sign-extension.  */
+	addiu	$t2, $zero, ~(GRUB_CPU_LOONGSON_CORECFG_DISABLE_DDR2_SPACE|GRUB_CPU_LOONGSON_CORECFG_BUFFER_CPU)
+	and	$t1, $t1, $t2
+	sd	$t1, %lo (GRUB_CPU_LOONGSON_CORECFG) ($t0)
 
 	b continue
 
@@ -218,7 +220,7 @@ serial_hw_init:
 	sb  $t1, (%lo (GRUB_MACHINE_SERIAL_PORT) + UART_LCR)($t0)
 
 	/* Set the baud rate 115200.  */
-	ori $t1, $zero, 2
+	ori $t1, $zero, GRUB_MACHINE_SERIAL_DIVISOR_115200
 	sb $t1, (%lo (GRUB_MACHINE_SERIAL_PORT) + UART_DLL)($t0) 
 	sb $zero, (%lo (GRUB_MACHINE_SERIAL_PORT) + UART_DLH)($t0) 
 
@@ -430,7 +432,7 @@ regdump:
 write_dumpreg:	
 	ld $t2, 0($t6)
 	sd $t2, 0($t4)
-	addiu $t4, $t4, 0x10
+	addiu $t4, $t4, GRUB_MACHINE_DDR2_REG_STEP
 	jr $ra
 	 addiu $t6, $t6, GRUB_MACHINE_DDR2_REG_SIZE
 
@@ -531,10 +533,10 @@ continue:
 	sd  $t5, (%lo(GRUB_MACHINE_DDR2_BASE) + 0x30) ($t4)
 
 	/* Desactivate DDR2 registers.  */
-        lui	$t0, 0xbfe0
-        ld	$t1, 0x0180($t0)
-	ori	$t1, $t1, 0x100
-        sd	$t1, 0x0180($t0)
+        lui	$t0, %hi (GRUB_CPU_LOONGSON_CORECFG)
+        ld	$t1, %lo (GRUB_CPU_LOONGSON_CORECFG) ($t0)
+	ori	$t1, $t1, GRUB_CPU_LOONGSON_CORECFG_DISABLE_DDR2_SPACE
+        sd	$t1, %lo (GRUB_CPU_LOONGSON_CORECFG) ($t0)
 
 	/* Enable cache.  */
 	mfc0	$t0, GRUB_CPU_LOONGSON_COP0_CACHE_CONFIG

From f9e7780cfff7fad076c23c73a930f3bb5b33fcee Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 6 Apr 2010 02:40:44 +0200
Subject: [PATCH 0743/1628] Fix an early timer-related hang

---
 include/grub/cs5536.h     |  9 +++++++++
 kern/mips/yeeloong/init.c | 41 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/include/grub/cs5536.h b/include/grub/cs5536.h
index ec554f002..21d6d55fc 100644
--- a/include/grub/cs5536.h
+++ b/include/grub/cs5536.h
@@ -29,8 +29,12 @@
 #define GRUB_CS5536_MSR_MAILBOX_ADDR  0xf4
 #define GRUB_CS5536_MSR_MAILBOX_DATA0 0xf8
 #define GRUB_CS5536_MSR_MAILBOX_DATA1 0xfc
+#define GRUB_CS5536_MSR_IRQ_MAP_BAR 0x80000008
 #define GRUB_CS5536_MSR_SMB_BAR 0x8000000b
 #define GRUB_CS5536_MSR_GPIO_BAR 0x8000000c
+#define GRUB_CS5536_MSR_MFGPT_BAR 0x8000000d
+#define GRUB_CS5536_MSR_ACPI_BAR 0x8000000e
+#define GRUB_CS5536_MSR_PM_BAR 0x8000000f
 #define GRUB_CS5536_SMB_REG_DATA 0x0
 #define GRUB_CS5536_SMB_REG_STATUS 0x1
 #define GRUB_CS5536_SMB_REG_STATUS_SDAST (1 << 6)
@@ -55,10 +59,15 @@
 #define GRUB_CS5536_LBAR_ADDR_MASK GRUB_ULL (0x000000000000fff8)
 #define GRUB_CS5536_LBAR_ENABLE GRUB_ULL (0x0000000100000000)
 #define GRUB_CS5536_LBAR_MASK_MASK GRUB_ULL (0x0000f00000000000)
+#define GRUB_CS5536_LBAR_TURN_ON (GRUB_CS5536_LBAR_ENABLE | GRUB_CS5536_LBAR_MASK_MASK)
 
 /* PMON-compatible LBARs.  */
+#define GRUB_CS5536_LBAR_IRQ_MAP   0x0b360
 #define GRUB_CS5536_LBAR_GPIO      0x0b000
+#define GRUB_CS5536_LBAR_MFGPT     0x0b300
 #define GRUB_CS5536_LBAR_SMBUS     0x0b390
+#define GRUB_CS5536_LBAR_ACPI      0x0b340
+#define GRUB_CS5536_LBAR_PM        0x0b280
 
 #define GRUB_GPIO_SMBUS_PINS ((1 << 14) | (1 << 15))
 #define GRUB_GPIO_REG_OUT_EN 0x4
diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 127cf870e..9cadd64b2 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -67,6 +67,26 @@ grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
   return GRUB_ERR_NONE;
 }
 
+/* Dump of GPIO connections. FIXME: Remove useless and macroify.  */
+static grub_uint32_t gpiodump[] = {
+  0xffff0000, 0x2ffdd002, 0xffff0000, 0xffff0000,
+  0x2fffd000, 0xffff0000, 0x1000efff, 0xefff1000,
+  0x3ffbc004, 0xffff0000, 0xffff0000, 0xffff0000,
+  0x3ffbc004, 0x3ffbc004, 0xffff0000, 0x00000000,
+  0xffff0000, 0xffff0000, 0x3ffbc004, 0x3f9bc064,
+  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000,
+  0xffff0000, 0xffff0000, 0x0000ffff, 0xffff0000,
+  0xefff1000, 0xffff0000, 0xffff0000, 0xffff0000,
+  0xefff1000, 0xefff1000, 0xffff0000, 0x00000000,
+  0xffff0000, 0xffff0000, 0xefff1000, 0xffff0000,
+  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  0x00000000, 0x50000000, 0x00000000, 0x00000000,
+};
+
 void
 grub_machine_init (void)
 {
@@ -121,6 +141,27 @@ grub_machine_init (void)
 	  grub_arch_memsize = (totalmem >> 20);
 	  grub_arch_highmemsize = 0;
 	}
+
+      /* Make sure GPIO is where we expect it to be.  */
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GPIO_BAR,
+			     GRUB_CS5536_LBAR_TURN_ON 
+			     | GRUB_CS5536_LBAR_GPIO);
+
+      for (i = 0; i < (int) ARRAY_SIZE (gpiodump); i++)
+	((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_IO_BASE 
+				     + GRUB_CS5536_LBAR_GPIO)) [i]
+	  = gpiodump[i];
+
+      /* Enable more BARs.  */
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IRQ_MAP_BAR,
+			     GRUB_CS5536_LBAR_TURN_ON 
+			     | GRUB_CS5536_LBAR_IRQ_MAP);
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_MFGPT_BAR,
+			     GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_MFGPT);
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_ACPI_BAR,
+			     GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_ACPI);
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_PM_BAR,
+			     GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_PM);
     }
 
   modend = grub_modules_get_end ();

From f9d9068aa720aea0fd25bf4f7033b430d965b926 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 6 Apr 2010 12:21:11 +0530
Subject: [PATCH 0744/1628] removed -serial stdio option from qemu cmdline

---
 tests/util/grub-shell.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 2b9131547..a41a6f6f4 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -135,7 +135,7 @@ fdafile=`mktemp`
 cp ${isofile} ${fdafile}
 
 outfile=`mktemp`
-qemu-system-i386 ${qemuopts} -nographic -serial stdio -hda ${hdafile} -fda ${fdafile} -cdrom ${isofile} -boot ${bootdev} | tr -d "\r" >${outfile}
+qemu-system-i386 ${qemuopts} -nographic -hda ${hdafile} -fda ${fdafile} -cdrom ${isofile} -boot ${bootdev} | tr -d "\r" >${outfile}
 
 cat $outfile
 

From fa09c82e6e0e3aa36c80d8c7b98f80f0da2787ce Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 6 Apr 2010 12:31:44 +0530
Subject: [PATCH 0745/1628] updated changelog

---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5fb147455..10e9a774d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-06  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	Fix unit testing framework for qemu 0.12.
+
+	* tests/util/grub-shell.in: Remove -serial stdio option.
+
 2010-04-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	POSIX header file wrappers.

From 4ee717e12b0a98c0763ac87e9fd27ad38a91b3f4 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 6 Apr 2010 14:39:11 +0530
Subject: [PATCH 0746/1628] fix freebsd build

---
 conf/common.rmk | 2 +-
 configure.ac    | 2 +-
 script/yylex.l  | 6 ------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index 87ae1e202..a83d10662 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -653,7 +653,7 @@ normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
 # For sh.mod.
 sh_mod_SOURCES = script/main.c script/script.c script/execute.c \
 	script/function.c script/lexer.c grub_script.tab.c grub_script.yy.c
-sh_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS)
+sh_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS) -Wno-error
 sh_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 ifneq (, $(FONT_SOURCE))
diff --git a/configure.ac b/configure.ac
index 1f55a9ca7..0af597bd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,7 +192,7 @@ AC_PROG_MKDIR_P
 if test "x$LEX" = x; then
   AC_MSG_ERROR([flex is not found])
 else
-  version=`$LEX --version 2>/dev/null | $SED -e 's/flex //' | $AWK 'BEGIN { FS = "."; } { printf "%d", $1 * 10000 + $2 * 100 + $3;}'`
+  version=`$LEX --version 2>/dev/null | $SED -e 's/flex//' -e 's/version//' | $AWK -F "." '{ printf "%d", $1 * 10000 + $2 * 100 + $3;}'`
   if test -n "$version" -a "$version" -ge 20535; then
     :
   else
diff --git a/script/yylex.l b/script/yylex.l
index 4d7c66448..0cf33c951 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -86,12 +86,6 @@ typedef size_t yy_size_t;
 #define exit(...)
 #endif
 
-#pragma GCC diagnostic warning "-Wunused-variable"
-#pragma GCC diagnostic warning "-Wunused-function"
-#pragma GCC diagnostic warning "-Wunused-parameter"
-#pragma GCC diagnostic warning "-Wstrict-prototypes"
-#pragma GCC diagnostic warning "-Wmissing-prototypes"
-
 }
 
 %option ecs

From 781d7798bb2fa0f04c455fe5df1f72b4255b589b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 6 Apr 2010 22:12:04 +0200
Subject: [PATCH 0747/1628] Fix interrupt and windows problems

---
 disk/ata.c                       |   6 +-
 include/grub/ata.h               |   6 ++
 include/grub/cs5536.h            |  96 ++++++++++++++++++++--
 include/grub/mips/yeeloong/pci.h |   5 +-
 kern/mips/yeeloong/init.c        | 131 +++++++++++++++++++++++++++++++
 5 files changed, 234 insertions(+), 10 deletions(-)

diff --git a/disk/ata.c b/disk/ata.c
index b2291cd53..1b55ee680 100644
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -27,8 +27,10 @@
 #include <grub/cs5536.h>
 
 /* At the moment, only two IDE ports are supported.  */
-static const grub_port_t grub_ata_ioaddress[] = { 0x1f0, 0x170 };
-static const grub_port_t grub_ata_ioaddress2[] = { 0x3f6, 0x376 };
+static const grub_port_t grub_ata_ioaddress[] = { GRUB_ATA_CH0_PORT1,
+						  GRUB_ATA_CH1_PORT1 };
+static const grub_port_t grub_ata_ioaddress2[] = { GRUB_ATA_CH0_PORT2, 
+						   GRUB_ATA_CH1_PORT2 };
 
 static struct grub_ata_device *grub_ata_devices;
 
diff --git a/include/grub/ata.h b/include/grub/ata.h
index 940e67102..9e3aaf0e6 100644
--- a/include/grub/ata.h
+++ b/include/grub/ata.h
@@ -32,6 +32,12 @@ typedef enum
     GRUB_ATA_LBA48
   } grub_ata_addressing_t;
 
+#define GRUB_ATA_CH0_PORT1 0x1f0
+#define GRUB_ATA_CH1_PORT1 0x170
+
+#define GRUB_ATA_CH0_PORT2 0x3f6
+#define GRUB_ATA_CH1_PORT2 0x376
+
 #define GRUB_ATA_REG_DATA	0
 #define GRUB_ATA_REG_ERROR	1
 #define GRUB_ATA_REG_FEATURES	1
diff --git a/include/grub/cs5536.h b/include/grub/cs5536.h
index 21d6d55fc..c2323fe9b 100644
--- a/include/grub/cs5536.h
+++ b/include/grub/cs5536.h
@@ -31,10 +31,92 @@
 #define GRUB_CS5536_MSR_MAILBOX_DATA1 0xfc
 #define GRUB_CS5536_MSR_IRQ_MAP_BAR 0x80000008
 #define GRUB_CS5536_MSR_SMB_BAR 0x8000000b
+
+#define GRUB_CS5536_SMBUS_REGS_SIZE 8
+#define GRUB_CS5536_GPIO_REGS_SIZE 256
+#define GRUB_CS5536_MFGPT_REGS_SIZE 64
+#define GRUB_CS5536_IRQ_MAP_REGS_SIZE 32
+#define GRUB_CS5536_PM_REGS_SIZE 128
+#define GRUB_CS5536_ACPI_REGS_SIZE 32
+
+#define GRUB_CS5536_DESTINATION_GLIU     0
+#define GRUB_CS5536_DESTINATION_GLPCI_SB 1
+#define GRUB_CS5536_DESTINATION_USB      2
+#define GRUB_CS5536_DESTINATION_IDE      3
+#define GRUB_CS5536_DESTINATION_DD       4
+#define GRUB_CS5536_DESTINATION_ACC      5
+#define GRUB_CS5536_DESTINATION_GLCP     7
+
+#define GRUB_CS5536_P2D_DEST_SHIFT    61
+#define GRUB_CS5536_P2D_LOG_ALIGN  12
+#define GRUB_CS5536_P2D_ALIGN  (1 << GRUB_CS5536_P2D_LOG_ALIGN)
+#define GRUB_CS5536_P2D_BASE_SHIFT 20
+#define GRUB_CS5536_P2D_MASK_SHIFT 0
+
+#define GRUB_CS5536_MSR_GL_IOD_START 0x000100e0
+#define GRUB_CS5536_IOD_DEST_SHIFT    61
+#define GRUB_CS5536_IOD_BASE_SHIFT    20
+#define GRUB_CS5536_IOD_MASK_SHIFT 0
+#define GRUB_CS5536_IOD_ADDR_MASK     0xfffff
+
 #define GRUB_CS5536_MSR_GPIO_BAR 0x8000000c
 #define GRUB_CS5536_MSR_MFGPT_BAR 0x8000000d
 #define GRUB_CS5536_MSR_ACPI_BAR 0x8000000e
 #define GRUB_CS5536_MSR_PM_BAR 0x8000000f
+#define GRUB_CS5536_MSR_DIVIL_LEG_IO 0x80000014
+#define GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE0 0x00000001
+#define GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1 0x00000002
+#define GRUB_CS5536_MSR_DIVIL_LEG_IO_MODE_X86    0x10000000
+#define GRUB_CS5536_MSR_DIVIL_LEG_IO_F_REMAP     0x04000000
+#define GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_PRIMARY_MASK 0x80000024
+#define GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_LPC_MASK 0x80000025
+#define GRUB_CS5536_DIVIL_LPC_INTERRUPTS 0x1002
+#define GRUB_CS5536_MSR_DIVIL_LPC_SERIAL_IRQ_CONTROL 0x8000004e
+#define GRUB_CS5536_MSR_DIVIL_LPC_SERIAL_IRQ_CONTROL_ENABLE 0x80
+
+#define GRUB_CS5536_MSR_USB_OHCI_BASE 0x40000008
+#define GRUB_CS5536_MSR_USB_EHCI_BASE 0x40000009
+#define GRUB_CS5536_MSR_USB_CONTROLLER_BASE 0x4000000a
+#define GRUB_CS5536_MSR_USB_OPTION_CONTROLLER_BASE 0x4000000b
+#define GRUB_CS5536_MSR_USB_BASE_ADDR_MASK     0xffffff00
+#define GRUB_CS5536_MSR_USB_BASE_BUS_MASTER    0x400000000ULL
+#define GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE 0x200000000ULL
+#define GRUB_CS5536_MSR_USB_EHCI_BASE_FLDJ_SHIFT 40
+
+#define GRUB_CS5536_MSR_IDE_IO_BAR 0x60000008
+#define GRUB_CS5536_MSR_IDE_IO_BAR_UNITS 1
+#define GRUB_CS5536_MSR_IDE_IO_BAR_ADDR_MASK 0xfffffff0
+#define GRUB_CS5536_MSR_IDE_CFG 0x60000010
+#define GRUB_CS5536_MSR_IDE_CFG_CHANNEL_ENABLE 2
+#define GRUB_CS5536_MSR_IDE_TIMING 0x60000012
+#define GRUB_CS5536_MSR_IDE_TIMING_PIO0 0x98
+#define GRUB_CS5536_MSR_IDE_TIMING_DRIVE0_SHIFT 24
+#define GRUB_CS5536_MSR_IDE_TIMING_DRIVE1_SHIFT 16
+#define GRUB_CS5536_MSR_IDE_CAS_TIMING 0x60000013
+#define GRUB_CS5536_MSR_IDE_CAS_TIMING_CMD_PIO0 0x99
+#define GRUB_CS5536_MSR_IDE_CAS_TIMING_CMD_SHIFT 24
+#define GRUB_CS5536_MSR_IDE_CAS_TIMING_DRIVE0_SHIFT 6
+#define GRUB_CS5536_MSR_IDE_CAS_TIMING_DRIVE1_SHIFT 4
+#define GRUB_CS5536_MSR_IDE_CAS_TIMING_PIO0 2
+
+#define GRUB_CS5536_MSR_GL_PCI_CTRL 0x00000010
+#define GRUB_CS5536_MSR_GL_PCI_CTRL_MEMORY_ENABLE 1
+#define GRUB_CS5536_MSR_GL_PCI_CTRL_IO_ENABLE 2
+#define GRUB_CS5536_MSR_GL_PCI_CTRL_LATENCY_SHIFT 35
+#define GRUB_CS5536_MSR_GL_PCI_CTRL_OUT_THR_SHIFT 60
+#define GRUB_CS5536_MSR_GL_PCI_CTRL_IN_THR_SHIFT 56
+
+#define GRUB_CS5536_MSR_GL_REGIONS_START 0x00000020
+#define GRUB_CS5536_MSR_GL_REGIONS_NUM   16
+#define GRUB_CS5536_MSR_GL_REGION_ENABLE 1
+#define GRUB_CS5536_MSR_GL_REGION_IO        0x100000000ULL
+#define GRUB_CS5536_MSR_GL_REGION_BASE_MASK 0xfffff000ULL
+#define GRUB_CS5536_MSR_GL_REGION_IO_BASE_SHIFT 12
+#define GRUB_CS5536_MSR_GL_REGION_TOP_MASK 0xfffff00000000000ULL
+#define GRUB_CS5536_MSR_GL_REGION_IO_TOP_SHIFT 44
+
+#define GRUB_CS5536_MSR_GL_P2D_START 0x00010020
+
 #define GRUB_CS5536_SMB_REG_DATA 0x0
 #define GRUB_CS5536_SMB_REG_STATUS 0x1
 #define GRUB_CS5536_SMB_REG_STATUS_SDAST (1 << 6)
@@ -62,12 +144,14 @@
 #define GRUB_CS5536_LBAR_TURN_ON (GRUB_CS5536_LBAR_ENABLE | GRUB_CS5536_LBAR_MASK_MASK)
 
 /* PMON-compatible LBARs.  */
-#define GRUB_CS5536_LBAR_IRQ_MAP   0x0b360
-#define GRUB_CS5536_LBAR_GPIO      0x0b000
-#define GRUB_CS5536_LBAR_MFGPT     0x0b300
-#define GRUB_CS5536_LBAR_SMBUS     0x0b390
-#define GRUB_CS5536_LBAR_ACPI      0x0b340
-#define GRUB_CS5536_LBAR_PM        0x0b280
+#define GRUB_CS5536_LBAR_GPIO      0xb000
+#define GRUB_CS5536_LBAR_ACC       0xb200
+#define GRUB_CS5536_LBAR_PM        0xb280
+#define GRUB_CS5536_LBAR_MFGPT     0xb300
+#define GRUB_CS5536_LBAR_ACPI      0xb340
+#define GRUB_CS5536_LBAR_IRQ_MAP   0xb360
+#define GRUB_CS5536_LBAR_IDE       0xb380
+#define GRUB_CS5536_LBAR_SMBUS     0xb390
 
 #define GRUB_GPIO_SMBUS_PINS ((1 << 14) | (1 << 15))
 #define GRUB_GPIO_REG_OUT_EN 0x4
diff --git a/include/grub/mips/yeeloong/pci.h b/include/grub/mips/yeeloong/pci.h
index aa5e0bbea..8f3a29d5c 100644
--- a/include/grub/mips/yeeloong/pci.h
+++ b/include/grub/mips/yeeloong/pci.h
@@ -27,8 +27,9 @@
 #define GRUB_PCI_NUM_BUS        1
 #define GRUB_PCI_NUM_DEVICES    16
 
-#define GRUB_MACHINE_PCI_IO_BASE          0xbfd00000
-#define GRUB_MACHINE_PCI_CONFSPACE        0xbfe80000
+#define GRUB_MACHINE_PCI_IO_BASE           0xbfd00000
+#define GRUB_MACHINE_PCI_CONFSPACE         0xbfe80000
+#define GRUB_MACHINE_PCI_CONTROLLER_HEADER 0xbfe00000
 
 #define GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR 0xbfe00118
 
diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 9cadd64b2..cf241ea96 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -31,6 +31,7 @@
 #include <grub/cs5536.h>
 #include <grub/term.h>
 #include <grub/machine/ec.h>
+#include <grub/ata.h>
 
 extern void grub_video_sm712_init (void);
 extern void grub_video_init (void);
@@ -87,6 +88,43 @@ static grub_uint32_t gpiodump[] = {
   0x00000000, 0x50000000, 0x00000000, 0x00000000,
 };
 
+static inline void
+set_io_space (grub_pci_device_t dev, int num, grub_uint16_t start,
+	      grub_uint16_t len)
+{
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_REGIONS_START + num,
+			 ((((grub_uint64_t) start + len - 4)
+			   << GRUB_CS5536_MSR_GL_REGION_IO_TOP_SHIFT)
+			  & GRUB_CS5536_MSR_GL_REGION_TOP_MASK)
+			 | (((grub_uint64_t) start
+			     << GRUB_CS5536_MSR_GL_REGION_IO_BASE_SHIFT)
+			  & GRUB_CS5536_MSR_GL_REGION_BASE_MASK)
+			 | GRUB_CS5536_MSR_GL_REGION_IO
+			 | GRUB_CS5536_MSR_GL_REGION_ENABLE);
+}
+
+static inline void
+set_iod (grub_pci_device_t dev, int num, int dest, int start, int mask)
+{
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_IOD_START + num,
+			 ((grub_uint64_t) dest << GRUB_CS5536_IOD_DEST_SHIFT)
+			 | (((grub_uint64_t) start & GRUB_CS5536_IOD_ADDR_MASK)
+			    << GRUB_CS5536_IOD_BASE_SHIFT)
+			 | ((mask & GRUB_CS5536_IOD_ADDR_MASK)
+			    << GRUB_CS5536_IOD_MASK_SHIFT));
+}
+
+static inline void
+set_p2d (grub_pci_device_t dev, int num, int dest, grub_uint32_t start)
+{
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_P2D_START + num,
+			 (((grub_uint64_t) dest) << GRUB_CS5536_P2D_DEST_SHIFT)
+			 | ((grub_uint64_t) (start >> GRUB_CS5536_P2D_LOG_ALIGN)
+			    << GRUB_CS5536_P2D_BASE_SHIFT)
+			 | (((1 << (32 - GRUB_CS5536_P2D_LOG_ALIGN)) - 1)
+			    << GRUB_CS5536_P2D_MASK_SHIFT));
+}
+
 void
 grub_machine_init (void)
 {
@@ -147,6 +185,7 @@ grub_machine_init (void)
 			     GRUB_CS5536_LBAR_TURN_ON 
 			     | GRUB_CS5536_LBAR_GPIO);
 
+      /* Setup GPIO.  */
       for (i = 0; i < (int) ARRAY_SIZE (gpiodump); i++)
 	((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_IO_BASE 
 				     + GRUB_CS5536_LBAR_GPIO)) [i]
@@ -162,6 +201,98 @@ grub_machine_init (void)
 			     GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_ACPI);
       grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_PM_BAR,
 			     GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_PM);
+
+      /* Setup DIVIL.  */
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_LEG_IO,
+			     GRUB_CS5536_MSR_DIVIL_LEG_IO_MODE_X86
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_F_REMAP
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE0
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1);
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_PRIMARY_MASK,
+			     (~GRUB_CS5536_DIVIL_LPC_INTERRUPTS) & 0xffff);
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_LPC_MASK,
+			     GRUB_CS5536_DIVIL_LPC_INTERRUPTS);
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_LPC_SERIAL_IRQ_CONTROL,
+			     GRUB_CS5536_MSR_DIVIL_LPC_SERIAL_IRQ_CONTROL_ENABLE);
+
+      /* Initialise USB controller.  */
+      /* FIXME: assign adresses dynamically.  */
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_OHCI_BASE, 
+			     GRUB_CS5536_MSR_USB_BASE_BUS_MASTER
+			     | GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
+			     | 0x05024000);
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_EHCI_BASE,
+			     GRUB_CS5536_MSR_USB_BASE_BUS_MASTER
+			     | GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
+			     | (0x20ULL 
+				<< GRUB_CS5536_MSR_USB_EHCI_BASE_FLDJ_SHIFT)
+			     | 0x05023000);
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_CONTROLLER_BASE,
+			     GRUB_CS5536_MSR_USB_BASE_BUS_MASTER
+			     | GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
+			     | 0x05020000);
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_OPTION_CONTROLLER_BASE,
+			     GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
+			     | 0x05022000);
+      set_p2d (dev, 0, GRUB_CS5536_DESTINATION_USB, 0x05020000);
+      set_p2d (dev, 1, GRUB_CS5536_DESTINATION_USB, 0x05022000);
+      set_p2d (dev, 5, GRUB_CS5536_DESTINATION_USB, 0x05024000);
+      set_p2d (dev, 6, GRUB_CS5536_DESTINATION_USB, 0x05023000);
+
+      /* Setup IDE controller.  */
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_IO_BAR,
+			     GRUB_CS5536_LBAR_IDE
+			     | GRUB_CS5536_MSR_IDE_IO_BAR_UNITS);
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_CFG,
+			     GRUB_CS5536_MSR_IDE_CFG_CHANNEL_ENABLE);
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_TIMING,
+			     (GRUB_CS5536_MSR_IDE_TIMING_PIO0
+			      << GRUB_CS5536_MSR_IDE_TIMING_DRIVE0_SHIFT)
+			     | (GRUB_CS5536_MSR_IDE_TIMING_PIO0
+				<< GRUB_CS5536_MSR_IDE_TIMING_DRIVE1_SHIFT));
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_CAS_TIMING,
+			     (GRUB_CS5536_MSR_IDE_CAS_TIMING_CMD_PIO0
+			      << GRUB_CS5536_MSR_IDE_CAS_TIMING_CMD_SHIFT)
+			     | (GRUB_CS5536_MSR_IDE_CAS_TIMING_PIO0
+				<< GRUB_CS5536_MSR_IDE_CAS_TIMING_DRIVE0_SHIFT)
+			     | (GRUB_CS5536_MSR_IDE_CAS_TIMING_PIO0
+				<< GRUB_CS5536_MSR_IDE_CAS_TIMING_DRIVE1_SHIFT));
+
+      /* Setup Geodelink PCI.  */
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_PCI_CTRL,
+			     (4ULL << GRUB_CS5536_MSR_GL_PCI_CTRL_OUT_THR_SHIFT)
+			     | (4ULL << GRUB_CS5536_MSR_GL_PCI_CTRL_IN_THR_SHIFT)
+			     | (8ULL << GRUB_CS5536_MSR_GL_PCI_CTRL_LATENCY_SHIFT)
+			     | GRUB_CS5536_MSR_GL_PCI_CTRL_IO_ENABLE
+			     | GRUB_CS5536_MSR_GL_PCI_CTRL_MEMORY_ENABLE);
+
+      /* Setup windows.  */
+      set_io_space (dev, 0, GRUB_CS5536_LBAR_SMBUS,
+		    GRUB_CS5536_SMBUS_REGS_SIZE);
+      set_io_space (dev, 1, GRUB_CS5536_LBAR_GPIO, GRUB_CS5536_GPIO_REGS_SIZE);
+      set_io_space (dev, 2, GRUB_CS5536_LBAR_MFGPT,
+		    GRUB_CS5536_MFGPT_REGS_SIZE);
+      set_io_space (dev, 3, GRUB_CS5536_LBAR_IRQ_MAP,
+		    GRUB_CS5536_IRQ_MAP_REGS_SIZE);
+      set_io_space (dev, 4, GRUB_CS5536_LBAR_PM, GRUB_CS5536_PM_REGS_SIZE);
+      set_io_space (dev, 5, GRUB_CS5536_LBAR_ACPI, GRUB_CS5536_ACPI_REGS_SIZE);
+      set_iod (dev, 0, GRUB_CS5536_DESTINATION_IDE, GRUB_ATA_CH0_PORT1,
+	       0xffff8);
+      set_iod (dev, 1, GRUB_CS5536_DESTINATION_ACC, GRUB_CS5536_LBAR_ACC,
+	       0xfff80);
+      set_iod (dev, 2, GRUB_CS5536_DESTINATION_IDE, GRUB_CS5536_LBAR_IDE,
+	       0xffff0);
+
+      /* Setup PCI controller.  */
+      *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER
+				    + GRUB_PCI_REG_COMMAND)) = 0x22b00046;
+      *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER
+				    + GRUB_PCI_REG_CACHELINE)) = 0xff;
+      *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER 
+				    + GRUB_PCI_REG_ADDRESS_REG0))
+	= 0x80000000 | GRUB_PCI_ADDR_MEM_TYPE_64 | GRUB_PCI_ADDR_MEM_PREFETCH;
+      *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER 
+				    + GRUB_PCI_REG_ADDRESS_REG1)) = 0;
     }
 
   modend = grub_modules_get_end ();

From 3bf09c9ea83350ee0be9c970ddbb8a57606f3eb5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 6 Apr 2010 22:23:02 +0200
Subject: [PATCH 0748/1628] rename format from raw to yeeloong_flash

---
 include/grub/mips/kernel.h           | 13 -------------
 include/grub/mips/qemu-mips/kernel.h | 15 +++++++++++++++
 include/grub/mips/yeeloong/kernel.h  | 13 +++++++++++++
 util/grub-mkrawimage.c               |  5 +++++
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/include/grub/mips/kernel.h b/include/grub/mips/kernel.h
index 8b68f7b6b..ee759f10b 100644
--- a/include/grub/mips/kernel.h
+++ b/include/grub/mips/kernel.h
@@ -41,21 +41,8 @@
 #define GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE
 #define GRUB_KERNEL_MACHINE_COMPRESSED_SIZE GRUB_KERNEL_CPU_COMPRESSED_SIZE
 
-#define GRUB_PLATFORM_IMAGE_FORMATS     "raw, elf"
-#define GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT     "raw"
-
-#define GRUB_PLATFORM_IMAGE_DEFAULT GRUB_PLATFORM_IMAGE_RAW
-
 #ifndef ASM_FILE
 
-typedef enum {
-  GRUB_PLATFORM_IMAGE_RAW,
-  GRUB_PLATFORM_IMAGE_ELF
-}
-  grub_platform_image_format_t;
-#define GRUB_PLATFORM_IMAGE_RAW GRUB_PLATFORM_IMAGE_RAW
-#define GRUB_PLATFORM_IMAGE_ELF GRUB_PLATFORM_IMAGE_ELF
-
 /* The prefix which points to the directory where GRUB modules and its
    configuration file are located.  */
 extern char grub_prefix[];
diff --git a/include/grub/mips/qemu-mips/kernel.h b/include/grub/mips/qemu-mips/kernel.h
index dbf74c1b2..cc6169d5f 100644
--- a/include/grub/mips/qemu-mips/kernel.h
+++ b/include/grub/mips/qemu-mips/kernel.h
@@ -31,6 +31,21 @@ void EXPORT_FUNC (grub_halt) (void);
    configuration file are located.  */
 extern char grub_prefix[];
 
+#define GRUB_PLATFORM_IMAGE_FORMATS     "raw, elf"
+#define GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT     "raw"
+
+#define GRUB_PLATFORM_IMAGE_DEFAULT GRUB_PLATFORM_IMAGE_RAW
+
+#ifndef ASM_FILE
+
+typedef enum {
+  GRUB_PLATFORM_IMAGE_RAW,
+  GRUB_PLATFORM_IMAGE_ELF
+}
+  grub_platform_image_format_t;
+#define GRUB_PLATFORM_IMAGE_RAW GRUB_PLATFORM_IMAGE_RAW
+#define GRUB_PLATFORM_IMAGE_ELF GRUB_PLATFORM_IMAGE_ELF
+
 #endif
 
 #endif /* ! GRUB_KERNEL_MACHINE_HEADER */
diff --git a/include/grub/mips/yeeloong/kernel.h b/include/grub/mips/yeeloong/kernel.h
index 230455dbf..05fe0eb55 100644
--- a/include/grub/mips/yeeloong/kernel.h
+++ b/include/grub/mips/yeeloong/kernel.h
@@ -27,6 +27,19 @@
 void EXPORT_FUNC (grub_reboot) (void);
 void EXPORT_FUNC (grub_halt) (void);
 
+#define GRUB_PLATFORM_IMAGE_FORMATS     "yeeloong_flash, elf"
+#define GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT     "yeeloong_flash"
+
+#define GRUB_PLATFORM_IMAGE_DEFAULT GRUB_PLATFORM_IMAGE_YEELOONG_FLASH
+
+typedef enum {
+  GRUB_PLATFORM_IMAGE_YEELOONG_FLASH,
+  GRUB_PLATFORM_IMAGE_ELF
+}
+  grub_platform_image_format_t;
+#define GRUB_PLATFORM_IMAGE_YEELOONG_FLASH GRUB_PLATFORM_IMAGE_YEELOONG_FLASH
+#define GRUB_PLATFORM_IMAGE_ELF GRUB_PLATFORM_IMAGE_ELF
+
 #endif
 
 #endif /* ! GRUB_KERNEL_MACHINE_HEADER */
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 7babbef6a..67bd64a1b 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -569,6 +569,11 @@ main (int argc, char *argv[])
 
 #ifdef GRUB_PLATFORM_IMAGE_DEFAULT
 	  case 'O':
+#ifdef GRUB_PLATFORM_IMAGE_YEELOONG_FLASH
+	    if (strcmp (optarg, "yeeloong_flash") == 0)
+	      format = GRUB_PLATFORM_IMAGE_YEELOONG_FLASH;
+	    else 
+#endif
 #ifdef GRUB_PLATFORM_IMAGE_RAW
 	    if (strcmp (optarg, "raw") == 0)
 	      format = GRUB_PLATFORM_IMAGE_RAW;

From df60998c64afaf0025f59365c172109c6ecab774 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 8 Apr 2010 10:54:44 +0100
Subject: [PATCH 0749/1628] * util/grub.d/10_linux.in: Only use the first word
 of GRUB_DISTRIBUTOR for --class, to avoid problems if somebody puts spaces in
 GRUB_DISTRIBUTOR. * util/grub.d/10_kfreebsd.in: Likewise. *
 util/grub.d/10_hurd.in: Likewise.

---
 ChangeLog                  | 8 ++++++++
 util/grub.d/10_hurd.in     | 2 +-
 util/grub.d/10_kfreebsd.in | 2 +-
 util/grub.d/10_linux.in    | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7441af4b3..83825a6c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-08  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub.d/10_linux.in: Only use the first word of
+	GRUB_DISTRIBUTOR for --class, to avoid problems if somebody puts
+	spaces in GRUB_DISTRIBUTOR.
+	* util/grub.d/10_kfreebsd.in: Likewise.
+	* util/grub.d/10_hurd.in: Likewise.
+
 2010-04-06  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Fix unit testing framework for Qemu 0.12.
diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index fbb4eb752..5dbb11f22 100644
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -27,7 +27,7 @@ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS=GNU
 else
   OS="${GRUB_DISTRIBUTOR} GNU/Hurd"
-  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}"
+  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
 fi
 
 at_least_one=false
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index dc87d6162..43651c82b 100644
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -30,7 +30,7 @@ CLASS="--class os"
 case "${GRUB_DISTRIBUTOR}" in
   Debian)
 	OS="${GRUB_DISTRIBUTOR} GNU/kFreeBSD"
-	CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') --class gnu-kfreebsd --class gnu ${CLASS}"
+	CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) --class gnu-kfreebsd --class gnu ${CLASS}"
   ;;
   *)
 	OS="FreeBSD"
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 2c60bc681..8dc0df5d9 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -31,7 +31,7 @@ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS=GNU/Linux
 else
   OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}"
+  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
 fi
 
 # loop-AES arranges things so that /dev/loop/X can be our root device, but

From b7841cebaafade6c545b7bef66ae2a0a1c7be91f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 9 Apr 2010 16:18:25 +0200
Subject: [PATCH 0750/1628] 2010-04-09  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* Makefile.in: Specify files explicitly instead of using $< and $@ since
	we use cd $(srcdir).
---
 ChangeLog   | 5 +++++
 Makefile.in | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83825a6c3..ee19f60d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* Makefile.in: Specify files explicitly instead of using $< and $@ since
+	we use cd $(srcdir).
+
 2010-04-08  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub.d/10_linux.in: Only use the first word of
diff --git a/Makefile.in b/Makefile.in
index ed460e4cf..d5eda4be3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -530,8 +530,8 @@ genkernsyms.sh: genkernsyms.sh.in config.status
 	$(SHELL) ./config.status
 
 $(srcdir)/po/$(PACKAGE).pot: po/POTFILES po/POTFILES-shell
-	cd $(srcdir) && $(XGETTEXT) -ctranslate --from-code=utf-8 -o $@ -f $< --keyword=_ --keyword=N_
-	cd $(srcdir) && $(XGETTEXT) -ctranslate --from-code=utf-8 -o $@ -f po/POTFILES-shell -j --language=Shell
+	cd $(srcdir) && $(XGETTEXT) -ctranslate --from-code=utf-8 -o po/$(PACKAGE).pot -f po/POTFILES --keyword=_ --keyword=N_
+	cd $(srcdir) && $(XGETTEXT) -ctranslate --from-code=utf-8 -o po/$(PACKAGE).pot -f po/POTFILES-shell -j --language=Shell
 
 $(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po): po/$(PACKAGE).pot
 	$(MSGMERGE) -U $@ $^

From d64795c0eb35035727f5186535f4b81df0542d99 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 9 Apr 2010 16:56:07 +0200
Subject: [PATCH 0751/1628] 	Load fonts and modules for gfxmenu in
 grub-mkconfig. 	Idea by: Mario Vasquez

	* util/grub.d/00_header.in: Load pf2 and image modules.
---
 ChangeLog                |  7 +++++++
 util/grub.d/00_header.in | 26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index cbc8ff331..0b77ea6a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Load fonts and modules for gfxmenu in grub-mkconfig.
+	Idea by: Mario Vasquez
+
+	* util/grub.d/00_header.in: Load pf2 and image modules.
+
 2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	grub-mkconfig multiple terminal support.
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 81f7a213a..f99010d6d 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -98,6 +98,32 @@ EOF
 	prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME` | sed -e "s/^/  /"
 	cat << EOF
   insmod gfxmenu
+EOF
+	themedir="`dirname $GRUB_THEME`"
+	for x in "$themedir"/*.pf2 "$themedir"/f/*.pf2; do
+	    if [ -f "$x" ]; then
+		cat << EOF
+  loadfont (\$root)`make_system_path_relative_to_its_root $x`
+EOF
+	    fi
+	done
+	if [ x"`echo "$themedir"/*.jpg`" != x"$themedir/*.jpg" ]; then
+	    cat << EOF
+  insmod jpeg
+EOF
+	fi
+	if [ x"`echo "$themedir"/*.png`" != x"$themedir/*.png" ]; then
+	    cat << EOF
+  insmod png
+EOF
+	fi
+	if [ x"`echo "$themedir"/*.tga`" != x"$themedir/*.tga" ]; then
+	    cat << EOF
+  insmod tga
+EOF
+	fi
+	    
+	cat << EOF
   set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
 EOF
     fi

From d7c43ba1c0e8c2449377c1b3aa43238f985f83da Mon Sep 17 00:00:00 2001
From: Mario Vazquez <mariovazq@gmail.com>
Date: Fri, 9 Apr 2010 17:37:38 +0200
Subject: [PATCH 0752/1628] 	GRUB_BACKGROUND support.

	* util/grub-mkconfig.in: Export GRUB_BACKGROUND.
	* util/grub.d/00_header.in: Parse GRUB_BACKGROUND.
---
 ChangeLog                |  9 ++++++++-
 util/grub-mkconfig.in    |  1 +
 util/grub.d/00_header.in | 14 ++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0b77ea6a4..1fdd2a21b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
+2010-04-09  Mario Vazquez <mariovazq@gmail.com>
+
+	GRUB_BACKGROUND support.
+
+	* util/grub-mkconfig.in: Export GRUB_BACKGROUND.
+	* util/grub.d/00_header.in: Parse GRUB_BACKGROUND.
+
 2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Load fonts and modules for gfxmenu in grub-mkconfig.
-	Idea by: Mario Vasquez
+	Idea by: Mario Vazquez
 
 	* util/grub.d/00_header.in: Load pf2 and image modules.
 
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 94cd2e199..b98bbc993 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -233,6 +233,7 @@ export GRUB_DEFAULT \
   GRUB_DISABLE_LINUX_UUID \
   GRUB_DISABLE_LINUX_RECOVERY \
   GRUB_GFXMODE \
+  GRUB_BACKGROUND \
   GRUB_THEME \
   GRUB_GFXPAYLOAD_LINUX \
   GRUB_DISABLE_OS_PROBER \
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index f99010d6d..beb9653da 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -125,6 +125,20 @@ EOF
 	    
 	cat << EOF
   set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
+EOF
+    elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \
+	    && is_path_readable_by_grub "$GRUB_BACKGROUND"; then
+	echo "Found background: $GRUB_BACKGROUND" >&2
+	case "$GRUB_BACKGROUND" in 
+	    *.png)         reader=png ;;
+	    *.tga)         reader=tga ;;
+	    *.jpg|*.jpeg)  reader=jpeg ;;
+	    *)             echo "Unsupported image format" >&2; exit 1 ;;
+	esac
+	prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"` | sed -e "s/^/  /"
+	cat << EOF
+  insmod $reader
+  background_image -m stretch `make_system_path_relative_to_its_root "$GRUB_BACKGROUND"`
 EOF
     fi
     cat << EOF

From e215d8e02a47435a54f5c014c2ee99b59153d601 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 9 Apr 2010 17:44:03 +0200
Subject: [PATCH 0753/1628] 	* util/grub.d/00_header.in: Add few missing
 quotes. Recognise *.jpeg 	as *.jpg.

---
 ChangeLog                |  5 +++++
 util/grub.d/00_header.in | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1fdd2a21b..1db00bc4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub.d/00_header.in: Add few missing quotes. Recognise *.jpeg
+	as *.jpg.
+
 2010-04-09  Mario Vazquez <mariovazq@gmail.com>
 
 	GRUB_BACKGROUND support.
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index beb9653da..d181fdffc 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -84,22 +84,22 @@ fi
 
 if [ "x$gfxterm" = x1 ]; then
     # Make the font accessible
-    prepare_grub_to_access_device `${grub_probe} --target=device ${GRUB_FONT_PATH}`
+    prepare_grub_to_access_device `${grub_probe} --target=device "${GRUB_FONT_PATH}"`
 
     cat << EOF
-if loadfont `make_system_path_relative_to_its_root ${GRUB_FONT_PATH}` ; then
+if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT_PATH}"` ; then
   set gfxmode=${GRUB_GFXMODE}
   insmod gfxterm
   insmod ${GRUB_VIDEO_BACKEND}
 EOF
-    if [ x$GRUB_THEME != x ] && [ -f $GRUB_THEME ] \
-	&& is_path_readable_by_grub $GRUB_THEME; then
+    if [ "x$GRUB_THEME" != x ] && [ -f "$GRUB_THEME" ] \
+	&& is_path_readable_by_grub "$GRUB_THEME"; then
 	echo "Found theme: $GRUB_THEME" >&2
-	prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME` | sed -e "s/^/  /"
+	prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"` | sed -e "s/^/  /"
 	cat << EOF
   insmod gfxmenu
 EOF
-	themedir="`dirname $GRUB_THEME`"
+	themedir="`dirname "$GRUB_THEME"`"
 	for x in "$themedir"/*.pf2 "$themedir"/f/*.pf2; do
 	    if [ -f "$x" ]; then
 		cat << EOF
@@ -107,7 +107,7 @@ EOF
 EOF
 	    fi
 	done
-	if [ x"`echo "$themedir"/*.jpg`" != x"$themedir/*.jpg" ]; then
+	if [ x"`echo "$themedir"/*.jpg`" != x"$themedir/*.jpg" ] || [ x"`echo "$themedir"/*.jpeg`" != x"$themedir/*.jpeg" ]; then
 	    cat << EOF
   insmod jpeg
 EOF

From 1d383404e30b0759d6054db3ff289f6b7e3c1778 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 9 Apr 2010 19:30:57 +0200
Subject: [PATCH 0754/1628] compile fixes and cleanups

---
 kern/term.c        | 2 --
 normal/charset.c   | 2 +-
 term/efi/console.c | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/kern/term.c b/kern/term.c
index a65d67196..dba94ecf7 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -28,8 +28,6 @@ struct grub_term_input *grub_term_inputs_disabled;
 struct grub_term_output *grub_term_outputs;
 struct grub_term_input *grub_term_inputs;
 
-void (*grub_newline_hook) (void) = NULL;
-
 /* Put a Unicode character.  */
 static void
 grub_putcode_dumb (grub_uint32_t code,
diff --git a/normal/charset.c b/normal/charset.c
index 6c68884ae..0fcc2a440 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -1254,7 +1254,7 @@ grub_unicode_shape_code (grub_uint32_t in, grub_uint8_t attr)
   for (i = 0; grub_unicode_arabic_shapes[i].code; i++)
     if (grub_unicode_arabic_shapes[i].code == in)
       {
-	grub_uint32_t out;
+	grub_uint32_t out = 0;
 	switch (attr & (GRUB_UNICODE_GLYPH_ATTRIBUTE_RIGHT_JOINED
 			| GRUB_UNICODE_GLYPH_ATTRIBUTE_LEFT_JOINED))
 	  {
diff --git a/term/efi/console.c b/term/efi/console.c
index 35b265ddb..aa0c984c2 100644
--- a/term/efi/console.c
+++ b/term/efi/console.c
@@ -350,7 +350,7 @@ static struct grub_term_output grub_console_term_output =
     .setcolor = grub_console_setcolor,
     .getcolor = grub_console_getcolor,
     .setcursor = grub_console_setcursor,
-    .flags = GRUB_TERM_CODE_TYPE_UCS4_VISUAL
+    .flags = GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS
   };
 
 void

From 1118c32ec7cde35f2d6da9f4fb6e41c8aadf6186 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 9 Apr 2010 19:38:23 +0200
Subject: [PATCH 0755/1628] 	* font/font.c: Indented.

---
 ChangeLog   |   4 +
 font/font.c | 462 ++++++++++++++++++++++++++--------------------------
 2 files changed, 233 insertions(+), 233 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1e23de038..d6cdfdbe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* font/font.c: Indented.
+
 2010-04-09  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Elif support to GRUB script (by Deepak Vankadaru).
diff --git a/font/font.c b/font/font.c
index 1b3dc6387..9a89cadc5 100644
--- a/font/font.c
+++ b/font/font.c
@@ -91,25 +91,24 @@ struct font_file_section
 };
 
 /* Replace unknown glyphs with a rounded question mark.  */
-static grub_uint8_t unknown_glyph_bitmap[] =
-{
-  /*       76543210 */
-  0x7C, /*  ooooo   */
-  0x82, /* o     o  */
-  0xBA, /* o ooo o  */
-  0xAA, /* o o o o  */
-  0xAA, /* o o o o  */
-  0x8A, /* o   o o  */
-  0x9A, /* o  oo o  */
-  0x92, /* o  o  o  */
-  0x92, /* o  o  o  */
-  0x92, /* o  o  o  */
-  0x92, /* o  o  o  */
-  0x82, /* o     o  */
-  0x92, /* o  o  o  */
-  0x82, /* o     o  */
-  0x7C, /*  ooooo   */
-  0x00  /*          */
+static grub_uint8_t unknown_glyph_bitmap[] = {
+  /*                               76543210 */
+  0x7C,				/*  ooooo   */
+  0x82,				/* o     o  */
+  0xBA,				/* o ooo o  */
+  0xAA,				/* o o o o  */
+  0xAA,				/* o o o o  */
+  0x8A,				/* o   o o  */
+  0x9A,				/* o  oo o  */
+  0x92,				/* o  o  o  */
+  0x92,				/* o  o  o  */
+  0x92,				/* o  o  o  */
+  0x92,				/* o  o  o  */
+  0x82,				/* o     o  */
+  0x92,				/* o  o  o  */
+  0x82,				/* o     o  */
+  0x7C,				/*  ooooo   */
+  0x00				/*          */
 };
 
 /* The "unknown glyph" glyph, used as a last resort.  */
@@ -130,7 +129,7 @@ static struct grub_font_glyph *ascii_font_glyph[0x80];
 static struct grub_font_glyph *
 ascii_glyph_lookup (grub_uint32_t code)
 {
-#ifdef USE_ASCII_FAILBACK 
+#ifdef USE_ASCII_FAILBACK
   static int ascii_failback_initialized = 0;
 
   if (code >= 0x80)
@@ -140,14 +139,14 @@ ascii_glyph_lookup (grub_uint32_t code)
     {
       int current;
       for (current = 0; current < 0x80; current++)
-        {
-	  ascii_font_glyph[current] = grub_malloc(sizeof(struct grub_font_glyph)
-	  			+ ASCII_BITMAP_SIZE);
+	{
+	  ascii_font_glyph[current] =
+	    grub_malloc (sizeof (struct grub_font_glyph) + ASCII_BITMAP_SIZE);
 
-          ascii_font_glyph[current]->width = 8;
-          ascii_font_glyph[current]->height = 16; 
-          ascii_font_glyph[current]->offset_x = 0; 
-          ascii_font_glyph[current]->offset_y = -2; 
+	  ascii_font_glyph[current]->width = 8;
+	  ascii_font_glyph[current]->height = 16;
+	  ascii_font_glyph[current]->offset_x = 0;
+	  ascii_font_glyph[current]->offset_y = -2;
 	  ascii_font_glyph[current]->device_width = 8;
 
 	  grub_memcpy (ascii_font_glyph[current]->bitmap,
@@ -173,9 +172,9 @@ grub_font_loader_init (void)
     return;
 
   /* Make glyph for unknown glyph.  */
-  unknown_glyph = grub_malloc(sizeof(struct grub_font_glyph)
-                              + sizeof(unknown_glyph_bitmap));
-  if (! unknown_glyph)
+  unknown_glyph = grub_malloc (sizeof (struct grub_font_glyph)
+			       + sizeof (unknown_glyph_bitmap));
+  if (!unknown_glyph)
     return;
 
   unknown_glyph->width = 8;
@@ -183,13 +182,13 @@ grub_font_loader_init (void)
   unknown_glyph->offset_x = 0;
   unknown_glyph->offset_y = -3;
   unknown_glyph->device_width = 8;
-  grub_memcpy(unknown_glyph->bitmap,
-              unknown_glyph_bitmap, sizeof(unknown_glyph_bitmap));
+  grub_memcpy (unknown_glyph->bitmap,
+	       unknown_glyph_bitmap, sizeof (unknown_glyph_bitmap));
 
   /* Initialize the null font.  */
   font_init (&null_font);
   null_font.name = "<No Font>";
-  null_font.ascent = unknown_glyph->height-3;
+  null_font.ascent = unknown_glyph->height - 3;
   null_font.descent = 3;
   null_font.max_char_width = unknown_glyph->width;
   null_font.max_char_height = unknown_glyph->height;
@@ -247,7 +246,7 @@ open_section (grub_file_t file, struct font_file_section *section)
   else if (retval < 0)
     {
       grub_error (GRUB_ERR_BAD_FONT,
-                  "font format error: can't read section name");
+		  "font format error: can't read section name");
       return 1;
     }
 
@@ -262,7 +261,7 @@ open_section (grub_file_t file, struct font_file_section *section)
   else if (retval < 0)
     {
       grub_error (GRUB_ERR_BAD_FONT,
-                  "font format error: can't read section length");
+		  "font format error: can't read section length");
       return 1;
     }
 
@@ -283,22 +282,22 @@ open_section (grub_file_t file, struct font_file_section *section)
    grub_errno is set appropriately).  */
 static int
 load_font_index (grub_file_t file, grub_uint32_t sect_length, struct
-                 grub_font *font)
+		 grub_font *font)
 {
   unsigned i;
   grub_uint32_t last_code;
 
 #if FONT_DEBUG >= 2
-  grub_printf("load_font_index(sect_length=%d)\n", sect_length);
+  grub_printf ("load_font_index(sect_length=%d)\n", sect_length);
 #endif
 
   /* Sanity check: ensure section length is divisible by the entry size.  */
   if ((sect_length % FONT_CHAR_INDEX_ENTRY_SIZE) != 0)
     {
       grub_error (GRUB_ERR_BAD_FONT,
-                  "font file format error: character index length %d "
-                  "is not a multiple of the entry size %d",
-                  sect_length, FONT_CHAR_INDEX_ENTRY_SIZE);
+		  "font file format error: character index length %d "
+		  "is not a multiple of the entry size %d",
+		  sect_length, FONT_CHAR_INDEX_ENTRY_SIZE);
       return 1;
     }
 
@@ -307,11 +306,11 @@ load_font_index (grub_file_t file, grub_uint32_t sect_length, struct
 
   /* Allocate the character index array.  */
   font->char_index = grub_malloc (font->num_chars
-                                  * sizeof (struct char_index_entry));
-  if (! font->char_index)
+				  * sizeof (struct char_index_entry));
+  if (!font->char_index)
     return 1;
   font->bmp_idx = grub_malloc (0x10000 * sizeof (grub_uint16_t));
-  if (! font->bmp_idx)
+  if (!font->bmp_idx)
     {
       grub_free (font->char_index);
       return 1;
@@ -320,7 +319,7 @@ load_font_index (grub_file_t file, grub_uint32_t sect_length, struct
 
 
 #if FONT_DEBUG >= 2
-  grub_printf("num_chars=%d)\n", font->num_chars);
+  grub_printf ("num_chars=%d)\n", font->num_chars);
 #endif
 
   last_code = 0;
@@ -332,17 +331,17 @@ load_font_index (grub_file_t file, grub_uint32_t sect_length, struct
 
       /* Read code point value; convert to native byte order.  */
       if (grub_file_read (file, &entry->code, 4) != 4)
-        return 1;
+	return 1;
       entry->code = grub_be_to_cpu32 (entry->code);
 
       /* Verify that characters are in ascending order.  */
       if (i != 0 && entry->code <= last_code)
-        {
-          grub_error (GRUB_ERR_BAD_FONT,
-                      "font characters not in ascending order: %u <= %u",
-                      entry->code, last_code);
-          return 1;
-        }
+	{
+	  grub_error (GRUB_ERR_BAD_FONT,
+		      "font characters not in ascending order: %u <= %u",
+		      entry->code, last_code);
+	  return 1;
+	}
 
       if (entry->code < 0x10000)
 	font->bmp_idx[entry->code] = i;
@@ -351,11 +350,11 @@ load_font_index (grub_file_t file, grub_uint32_t sect_length, struct
 
       /* Read storage flags byte.  */
       if (grub_file_read (file, &entry->storage_flags, 1) != 1)
-        return 1;
+	return 1;
 
       /* Read glyph data offset; convert to native byte order.  */
       if (grub_file_read (file, &entry->offset, 4) != 4)
-        return 1;
+	return 1;
       entry->offset = grub_be_to_cpu32 (entry->offset);
 
       /* No glyph loaded.  Will be loaded on demand and cached thereafter.  */
@@ -364,7 +363,7 @@ load_font_index (grub_file_t file, grub_uint32_t sect_length, struct
 #if FONT_DEBUG >= 5
       /* Print the 1st 10 characters.  */
       if (i < 10)
-        grub_printf("c=%d o=%d\n", entry->code, entry->offset);
+	grub_printf ("c=%d o=%d\n", entry->code, entry->offset);
 #endif
     }
 
@@ -380,7 +379,7 @@ read_section_as_string (struct font_file_section *section)
   grub_ssize_t ret;
 
   str = grub_malloc (section->length + 1);
-  if (! str)
+  if (!str)
     return 0;
 
   ret = grub_file_read (section->file, str, section->length);
@@ -398,18 +397,18 @@ read_section_as_string (struct font_file_section *section)
    which is stored into *VALUE.
    Returns 0 upon success, nonzero upon failure.  */
 static int
-read_section_as_short (struct font_file_section *section, grub_int16_t *value)
+read_section_as_short (struct font_file_section *section,
+		       grub_int16_t * value)
 {
   grub_uint16_t raw_value;
 
   if (section->length != 2)
     {
       grub_error (GRUB_ERR_BAD_FONT,
-                  "font file format error: section %c%c%c%c length "
-                  "is %d but should be 2",
-                  section->name[0], section->name[1],
-                  section->name[2], section->name[3],
-                  section->length);
+		  "font file format error: section %c%c%c%c length "
+		  "is %d but should be 2",
+		  section->name[0], section->name[1],
+		  section->name[2], section->name[3], section->length);
       return 1;
     }
   if (grub_file_read (section->file, &raw_value, 2) != 2)
@@ -430,7 +429,7 @@ grub_font_load (const char *filename)
   grub_font_t font = 0;
 
 #if FONT_DEBUG >= 1
-  grub_printf("add_font(%s)\n", filename);
+  grub_printf ("add_font(%s)\n", filename);
 #endif
 
   file = grub_buffile_open (filename, 1024);
@@ -438,7 +437,7 @@ grub_font_load (const char *filename)
     goto fail;
 
 #if FONT_DEBUG >= 3
-  grub_printf("file opened\n");
+  grub_printf ("file opened\n");
 #endif
 
   /* Read the FILE section.  It indicates the file format.  */
@@ -446,159 +445,166 @@ grub_font_load (const char *filename)
     goto fail;
 
 #if FONT_DEBUG >= 3
-  grub_printf("opened FILE section\n");
+  grub_printf ("opened FILE section\n");
 #endif
   if (grub_memcmp (section.name, FONT_FORMAT_SECTION_NAMES_FILE,
-  		   sizeof(FONT_FORMAT_SECTION_NAMES_FILE) - 1) != 0)
+		   sizeof (FONT_FORMAT_SECTION_NAMES_FILE) - 1) != 0)
     {
       grub_error (GRUB_ERR_BAD_FONT,
-                  "font file format error: 1st section must be FILE");
+		  "font file format error: 1st section must be FILE");
       goto fail;
     }
 
 #if FONT_DEBUG >= 3
-  grub_printf("section name ok\n");
+  grub_printf ("section name ok\n");
 #endif
   if (section.length != 4)
     {
       grub_error (GRUB_ERR_BAD_FONT,
-                  "font file format error (file type ID length is %d "
-                  "but should be 4)", section.length);
+		  "font file format error (file type ID length is %d "
+		  "but should be 4)", section.length);
       goto fail;
     }
 
 #if FONT_DEBUG >= 3
-  grub_printf("section length ok\n");
+  grub_printf ("section length ok\n");
 #endif
   /* Check the file format type code.  */
   if (grub_file_read (file, magic, 4) != 4)
     goto fail;
 
 #if FONT_DEBUG >= 3
-  grub_printf("read magic ok\n");
+  grub_printf ("read magic ok\n");
 #endif
 
   if (grub_memcmp (magic, FONT_FORMAT_PFF2_MAGIC, 4) != 0)
     {
       grub_error (GRUB_ERR_BAD_FONT, "invalid font magic %x %x %x %x",
-                  magic[0], magic[1], magic[2], magic[3]);
+		  magic[0], magic[1], magic[2], magic[3]);
       goto fail;
     }
 
 #if FONT_DEBUG >= 3
-  grub_printf("compare magic ok\n");
+  grub_printf ("compare magic ok\n");
 #endif
 
   /* Allocate the font object.  */
   font = (grub_font_t) grub_malloc (sizeof (struct grub_font));
-  if (! font)
+  if (!font)
     goto fail;
 
   font_init (font);
   font->file = file;
 
 #if FONT_DEBUG >= 3
-  grub_printf("allocate font ok; loading font info\n");
+  grub_printf ("allocate font ok; loading font info\n");
 #endif
 
   /* Load the font information.  */
   while (1)
     {
       if (open_section (file, &section) != 0)
-        {
-          if (section.eof)
-            break;              /* Done reading the font file.  */
-          else
-            goto fail;
-        }
+	{
+	  if (section.eof)
+	    break;		/* Done reading the font file.  */
+	  else
+	    goto fail;
+	}
 
 #if FONT_DEBUG >= 2
-      grub_printf("opened section %c%c%c%c ok\n",
-                  section.name[0], section.name[1],
-                  section.name[2], section.name[3]);
+      grub_printf ("opened section %c%c%c%c ok\n",
+		   section.name[0], section.name[1],
+		   section.name[2], section.name[3]);
 #endif
 
       if (grub_memcmp (section.name, FONT_FORMAT_SECTION_NAMES_FONT_NAME,
-      		       sizeof(FONT_FORMAT_SECTION_NAMES_FONT_NAME) - 1) == 0)
-        {
-          font->name = read_section_as_string (&section);
-          if (!font->name)
-            goto fail;
-        }
+		       sizeof (FONT_FORMAT_SECTION_NAMES_FONT_NAME) - 1) == 0)
+	{
+	  font->name = read_section_as_string (&section);
+	  if (!font->name)
+	    goto fail;
+	}
       else if (grub_memcmp (section.name,
-      			    FONT_FORMAT_SECTION_NAMES_POINT_SIZE,
-			    sizeof(FONT_FORMAT_SECTION_NAMES_POINT_SIZE) - 1) == 0)
-        {
-          if (read_section_as_short (&section, &font->point_size) != 0)
-            goto fail;
-        }
+			    FONT_FORMAT_SECTION_NAMES_POINT_SIZE,
+			    sizeof (FONT_FORMAT_SECTION_NAMES_POINT_SIZE) -
+			    1) == 0)
+	{
+	  if (read_section_as_short (&section, &font->point_size) != 0)
+	    goto fail;
+	}
       else if (grub_memcmp (section.name, FONT_FORMAT_SECTION_NAMES_WEIGHT,
-      			    sizeof(FONT_FORMAT_SECTION_NAMES_WEIGHT) - 1) == 0)
-        {
-          char *wt;
-          wt = read_section_as_string (&section);
-          if (!wt)
-            continue;
-          /* Convert the weight string 'normal' or 'bold' into a number.  */
-          if (grub_strcmp (wt, "normal") == 0)
-            font->weight = FONT_WEIGHT_NORMAL;
-          else if (grub_strcmp (wt, "bold") == 0)
-            font->weight = FONT_WEIGHT_BOLD;
-          grub_free (wt);
-        }
+			    sizeof (FONT_FORMAT_SECTION_NAMES_WEIGHT) - 1)
+	       == 0)
+	{
+	  char *wt;
+	  wt = read_section_as_string (&section);
+	  if (!wt)
+	    continue;
+	  /* Convert the weight string 'normal' or 'bold' into a number.  */
+	  if (grub_strcmp (wt, "normal") == 0)
+	    font->weight = FONT_WEIGHT_NORMAL;
+	  else if (grub_strcmp (wt, "bold") == 0)
+	    font->weight = FONT_WEIGHT_BOLD;
+	  grub_free (wt);
+	}
       else if (grub_memcmp (section.name,
-      	       FONT_FORMAT_SECTION_NAMES_MAX_CHAR_WIDTH,
-	       sizeof(FONT_FORMAT_SECTION_NAMES_MAX_CHAR_WIDTH) - 1) == 0)
-        {
-          if (read_section_as_short (&section, &font->max_char_width) != 0)
-            goto fail;
-        }
+			    FONT_FORMAT_SECTION_NAMES_MAX_CHAR_WIDTH,
+			    sizeof (FONT_FORMAT_SECTION_NAMES_MAX_CHAR_WIDTH)
+			    - 1) == 0)
+	{
+	  if (read_section_as_short (&section, &font->max_char_width) != 0)
+	    goto fail;
+	}
       else if (grub_memcmp (section.name,
-      	       FONT_FORMAT_SECTION_NAMES_MAX_CHAR_HEIGHT,
-	       sizeof(FONT_FORMAT_SECTION_NAMES_MAX_CHAR_HEIGHT) - 1) == 0)
-        {
-          if (read_section_as_short (&section, &font->max_char_height) != 0)
-            goto fail;
-        }
+			    FONT_FORMAT_SECTION_NAMES_MAX_CHAR_HEIGHT,
+			    sizeof (FONT_FORMAT_SECTION_NAMES_MAX_CHAR_HEIGHT)
+			    - 1) == 0)
+	{
+	  if (read_section_as_short (&section, &font->max_char_height) != 0)
+	    goto fail;
+	}
       else if (grub_memcmp (section.name,
-      	       FONT_FORMAT_SECTION_NAMES_ASCENT,
-	       sizeof(FONT_FORMAT_SECTION_NAMES_ASCENT) - 1) == 0)
-        {
-          if (read_section_as_short (&section, &font->ascent) != 0)
-            goto fail;
-        }
+			    FONT_FORMAT_SECTION_NAMES_ASCENT,
+			    sizeof (FONT_FORMAT_SECTION_NAMES_ASCENT) - 1)
+	       == 0)
+	{
+	  if (read_section_as_short (&section, &font->ascent) != 0)
+	    goto fail;
+	}
       else if (grub_memcmp (section.name, FONT_FORMAT_SECTION_NAMES_DESCENT,
-      			    sizeof(FONT_FORMAT_SECTION_NAMES_DESCENT) - 1) == 0)
-        {
-          if (read_section_as_short (&section, &font->descent) != 0)
-            goto fail;
-        }
+			    sizeof (FONT_FORMAT_SECTION_NAMES_DESCENT) - 1)
+	       == 0)
+	{
+	  if (read_section_as_short (&section, &font->descent) != 0)
+	    goto fail;
+	}
       else if (grub_memcmp (section.name,
-      			    FONT_FORMAT_SECTION_NAMES_CHAR_INDEX,
-			    sizeof(FONT_FORMAT_SECTION_NAMES_CHAR_INDEX) - 1) == 0)
-        {
-          if (load_font_index (file, section.length, font) != 0)
-            goto fail;
-        }
+			    FONT_FORMAT_SECTION_NAMES_CHAR_INDEX,
+			    sizeof (FONT_FORMAT_SECTION_NAMES_CHAR_INDEX) -
+			    1) == 0)
+	{
+	  if (load_font_index (file, section.length, font) != 0)
+	    goto fail;
+	}
       else if (grub_memcmp (section.name, FONT_FORMAT_SECTION_NAMES_DATA,
-      			    sizeof(FONT_FORMAT_SECTION_NAMES_DATA) - 1) == 0)
-        {
-          /* When the DATA section marker is reached, we stop reading.  */
-          break;
-        }
+			    sizeof (FONT_FORMAT_SECTION_NAMES_DATA) - 1) == 0)
+	{
+	  /* When the DATA section marker is reached, we stop reading.  */
+	  break;
+	}
       else
-        {
-          /* Unhandled section type, simply skip past it.  */
+	{
+	  /* Unhandled section type, simply skip past it.  */
 #if FONT_DEBUG >= 3
-          grub_printf("Unhandled section type, skipping.\n");
+	  grub_printf ("Unhandled section type, skipping.\n");
 #endif
-          grub_off_t section_end = grub_file_tell (file) + section.length;
-          if ((int) grub_file_seek (file, section_end) == -1)
-            goto fail;
-        }
+	  grub_off_t section_end = grub_file_tell (file) + section.length;
+	  if ((int) grub_file_seek (file, section_end) == -1)
+	    goto fail;
+	}
     }
 
-  if (! font->name)
+  if (!font->name)
     {
       grub_printf ("Note: Font has no name.\n");
       font->name = grub_strdup ("Unknown");
@@ -606,22 +612,19 @@ grub_font_load (const char *filename)
 
 #if FONT_DEBUG >= 1
   grub_printf ("Loaded font `%s'.\n"
-               "Ascent=%d Descent=%d MaxW=%d MaxH=%d Number of characters=%d.\n",
-               font->name,
-               font->ascent, font->descent,
-               font->max_char_width, font->max_char_height,
-               font->num_chars);
+	       "Ascent=%d Descent=%d MaxW=%d MaxH=%d Number of characters=%d.\n",
+	       font->name,
+	       font->ascent, font->descent,
+	       font->max_char_width, font->max_char_height, font->num_chars);
 #endif
 
   if (font->max_char_width == 0
       || font->max_char_height == 0
       || font->num_chars == 0
-      || font->char_index == 0
-      || font->ascent == 0
-      || font->descent == 0)
+      || font->char_index == 0 || font->ascent == 0 || font->descent == 0)
     {
       grub_error (GRUB_ERR_BAD_FONT,
-                  "invalid font file: missing some required data");
+		  "invalid font file: missing some required data");
       goto fail;
     }
 
@@ -679,18 +682,18 @@ find_glyph (const grub_font_t font, grub_uint32_t code)
   lo = 0;
   hi = font->num_chars - 1;
 
-  if (! table)
+  if (!table)
     return 0;
 
   while (lo <= hi)
     {
       mid = lo + (hi - lo) / 2;
       if (code < table[mid].code)
-        hi = mid - 1;
+	hi = mid - 1;
       else if (code > table[mid].code)
-        lo = mid + 1;
+	lo = mid + 1;
       else
-        return &table[mid];
+	return &table[mid];
     }
 
   return 0;
@@ -716,12 +719,12 @@ grub_font_get_glyph_internal (grub_font_t font, grub_uint32_t code)
       int len;
 
       if (index_entry->glyph)
-        /* Return cached glyph.  */
-        return index_entry->glyph;
+	/* Return cached glyph.  */
+	return index_entry->glyph;
 
-      if (! font->file)
-        /* No open file, can't load any glyphs.  */
-        return 0;
+      if (!font->file)
+	/* No open file, can't load any glyphs.  */
+	return 0;
 
       /* Make sure we can find glyphs for error messages.  Push active
          error message to error stack and reset error message.  */
@@ -730,23 +733,23 @@ grub_font_get_glyph_internal (grub_font_t font, grub_uint32_t code)
       grub_file_seek (font->file, index_entry->offset);
 
       /* Read the glyph width, height, and baseline.  */
-      if (read_be_uint16(font->file, &width) != 0
-          || read_be_uint16(font->file, &height) != 0
-          || read_be_int16(font->file, &xoff) != 0
-          || read_be_int16(font->file, &yoff) != 0
-          || read_be_int16(font->file, &dwidth) != 0)
-        {
-          remove_font (font);
-          return 0;
-        }
+      if (read_be_uint16 (font->file, &width) != 0
+	  || read_be_uint16 (font->file, &height) != 0
+	  || read_be_int16 (font->file, &xoff) != 0
+	  || read_be_int16 (font->file, &yoff) != 0
+	  || read_be_int16 (font->file, &dwidth) != 0)
+	{
+	  remove_font (font);
+	  return 0;
+	}
 
       len = (width * height + 7) / 8;
       glyph = grub_malloc (sizeof (struct grub_font_glyph) + len);
-      if (! glyph)
-        {
-          remove_font (font);
-          return 0;
-        }
+      if (!glyph)
+	{
+	  remove_font (font);
+	  return 0;
+	}
 
       glyph->font = font;
       glyph->width = width;
@@ -757,13 +760,13 @@ grub_font_get_glyph_internal (grub_font_t font, grub_uint32_t code)
 
       /* Don't try to read empty bitmaps (e.g., space characters).  */
       if (len != 0)
-        {
-          if (grub_file_read (font->file, glyph->bitmap, len) != len)
-            {
-              remove_font (font);
-              return 0;
-            }
-        }
+	{
+	  if (grub_file_read (font->file, glyph->bitmap, len) != len)
+	    {
+	      remove_font (font);
+	      return 0;
+	    }
+	}
 
       /* Restore old error message.  */
       grub_error_pop ();
@@ -787,7 +790,7 @@ free_font (grub_font_t font)
   if (font)
     {
       if (font->file)
-        grub_file_close (font->file);
+	grub_file_close (font->file);
       grub_free (font->name);
       grub_free (font->family);
       grub_free (font->char_index);
@@ -804,7 +807,7 @@ register_font (grub_font_t font)
   struct grub_font_node *node = 0;
 
   node = grub_malloc (sizeof (struct grub_font_node));
-  if (! node)
+  if (!node)
     return 1;
 
   node->value = font;
@@ -822,18 +825,17 @@ remove_font (grub_font_t font)
   struct grub_font_node **nextp, *cur;
 
   for (nextp = &grub_font_list, cur = *nextp;
-       cur;
-       nextp = &cur->next, cur = cur->next)
+       cur; nextp = &cur->next, cur = cur->next)
     {
       if (cur->value == font)
-        {
-          *nextp = cur->next;
+	{
+	  *nextp = cur->next;
 
-          /* Free the node, but not the font itself.  */
-          grub_free (cur);
+	  /* Free the node, but not the font itself.  */
+	  grub_free (cur);
 
-          return;
-        }
+	  return;
+	}
     }
 }
 
@@ -850,7 +852,7 @@ grub_font_get (const char *font_name)
     {
       grub_font_t font = node->value;
       if (grub_strcmp (font->name, font_name) == 0)
-        return font;
+	return font;
     }
 
   /* If no font by that name is found, return the first font in the list
@@ -927,7 +929,7 @@ grub_font_get_string_width (grub_font_t font, const char *str)
   const grub_uint8_t *ptr;
 
   for (ptr = (const grub_uint8_t *) str, width = 0;
-       grub_utf8_to_ucs4 (&code, 1, ptr, -1, &ptr) > 0; )
+       grub_utf8_to_ucs4 (&code, 1, ptr, -1, &ptr) > 0;)
     {
       glyph = grub_font_get_glyph_with_fallback (font, code);
       width += glyph->device_width;
@@ -961,7 +963,7 @@ grub_font_get_glyph (grub_font_t font, grub_uint32_t code)
    sizes are used so that tiny 8 point glyphs are not mixed into a string
    of 24 point text unless there is no other choice.  */
 static int
-get_font_diversity(grub_font_t a, grub_font_t b)
+get_font_diversity (grub_font_t a, grub_font_t b)
 {
   int d;
 
@@ -1011,7 +1013,7 @@ grub_font_get_glyph_with_fallback (grub_font_t font, grub_uint32_t code)
       /* First try to get the glyph from the specified font.  */
       glyph = grub_font_get_glyph_internal (font, code);
       if (glyph)
-        return glyph;
+	return glyph;
     }
 
   /* Otherwise, search all loaded fonts for the glyph and use the one from
@@ -1028,16 +1030,16 @@ grub_font_get_glyph_with_fallback (grub_font_t font, grub_uint32_t code)
 
       glyph = grub_font_get_glyph_internal (curfont, code);
       if (glyph)
-        {
-          int d;
+	{
+	  int d;
 
-          d = get_font_diversity (curfont, font);
-          if (d < best_diversity)
-            {
-              best_diversity = d;
-              best_glyph = glyph;
-            }
-        }
+	  d = get_font_diversity (curfont, font);
+	  if (d < best_diversity)
+	    {
+	      best_diversity = d;
+	      best_glyph = glyph;
+	    }
+	}
     }
 
   if (best_glyph)
@@ -1052,9 +1054,8 @@ grub_font_get_glyph_with_fallback (grub_font_t font, grub_uint32_t code)
    baseline of the character, while the x coordinate designates the left
    side location of the character.  */
 grub_err_t
-grub_font_draw_glyph (struct grub_font_glyph *glyph,
-                      grub_video_color_t color,
-                      int left_x, int baseline_y)
+grub_font_draw_glyph (struct grub_font_glyph * glyph,
+		      grub_video_color_t color, int left_x, int baseline_y)
 {
   struct grub_video_bitmap glyph_bitmap;
 
@@ -1065,8 +1066,7 @@ grub_font_draw_glyph (struct grub_font_glyph *glyph,
   glyph_bitmap.mode_info.width = glyph->width;
   glyph_bitmap.mode_info.height = glyph->height;
   glyph_bitmap.mode_info.mode_type =
-    (1 << GRUB_VIDEO_MODE_TYPE_DEPTH_POS)
-    | GRUB_VIDEO_MODE_TYPE_1BIT_BITMAP;
+    (1 << GRUB_VIDEO_MODE_TYPE_DEPTH_POS) | GRUB_VIDEO_MODE_TYPE_1BIT_BITMAP;
   glyph_bitmap.mode_info.blit_format = GRUB_VIDEO_BLIT_FORMAT_1BIT_PACKED;
   glyph_bitmap.mode_info.bpp = 1;
 
@@ -1081,11 +1081,11 @@ grub_font_draw_glyph (struct grub_font_glyph *glyph,
   glyph_bitmap.mode_info.bg_green = 0;
   glyph_bitmap.mode_info.bg_blue = 0;
   glyph_bitmap.mode_info.bg_alpha = 0;
-  grub_video_unmap_color(color,
-                         &glyph_bitmap.mode_info.fg_red,
-                         &glyph_bitmap.mode_info.fg_green,
-                         &glyph_bitmap.mode_info.fg_blue,
-                         &glyph_bitmap.mode_info.fg_alpha);
+  grub_video_unmap_color (color,
+			  &glyph_bitmap.mode_info.fg_red,
+			  &glyph_bitmap.mode_info.fg_green,
+			  &glyph_bitmap.mode_info.fg_blue,
+			  &glyph_bitmap.mode_info.fg_alpha);
   glyph_bitmap.data = glyph->bitmap;
 
   int bitmap_left = left_x + glyph->offset_x;
@@ -1093,9 +1093,8 @@ grub_font_draw_glyph (struct grub_font_glyph *glyph,
   int bitmap_top = bitmap_bottom - glyph->height;
 
   return grub_video_blit_bitmap (&glyph_bitmap, GRUB_VIDEO_BLIT_BLEND,
-                                 bitmap_left, bitmap_top,
-                                 0, 0,
-                                 glyph->width, glyph->height);
+				 bitmap_left, bitmap_top,
+				 0, 0, glyph->width, glyph->height);
 }
 
 /* Draw a UTF-8 string of text on the current video render target.
@@ -1105,8 +1104,7 @@ grub_font_draw_glyph (struct grub_font_glyph *glyph,
    a glyph from another loaded font may be used instead.  */
 grub_err_t
 grub_font_draw_string (const char *str, grub_font_t font,
-                       grub_video_color_t color,
-                       int left_x, int baseline_y)
+		       grub_video_color_t color, int left_x, int baseline_y)
 {
   int x;
   struct grub_font_glyph *glyph;
@@ -1114,15 +1112,13 @@ grub_font_draw_string (const char *str, grub_font_t font,
   const grub_uint8_t *ptr;
 
   for (ptr = (const grub_uint8_t *) str, x = left_x;
-       grub_utf8_to_ucs4 (&code, 1, ptr, -1, &ptr) > 0; )
+       grub_utf8_to_ucs4 (&code, 1, ptr, -1, &ptr) > 0;)
     {
       glyph = grub_font_get_glyph_with_fallback (font, code);
-      if (grub_font_draw_glyph (glyph, color, x, baseline_y)
-          != GRUB_ERR_NONE)
-        return grub_errno;
+      if (grub_font_draw_glyph (glyph, color, x, baseline_y) != GRUB_ERR_NONE)
+	return grub_errno;
       x += glyph->device_width;
     }
 
   return GRUB_ERR_NONE;
 }
-

From 477797112671d69767fee13f6e6ddb3b08e2ccff Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 9 Apr 2010 20:40:14 +0200
Subject: [PATCH 0756/1628] 	* util/grub-mkrescue.in: Fix incorrect path in
 coreboot part. 	Reported by: Thomas Schmitt. 	Add -no-emul-boot to
 grub-mkisofs parameters.

---
 ChangeLog             | 6 ++++++
 util/grub-mkrescue.in | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d6cdfdbe8..a2a33b2ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkrescue.in: Fix incorrect path in coreboot part.
+	Reported by: Thomas Schmitt.
+	Add -no-emul-boot to grub-mkisofs parameters.
+
 2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* font/font.c: Indented.
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index db29b0899..aafdfb059 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -156,7 +156,7 @@ EOF
         echo "insmod $i"
     done ; \
     echo "source /boot/grub/grub.cfg") \
-    > ${iso9660_dir}/boot/grub/i386-pc/grub.cfg
+    > ${iso9660_dir}/boot/grub/i386-coreboot/grub.cfg
 
     tar -C ${memdisk_dir} -cf ${memdisk_img} boot
     rm -rf ${memdisk_dir}
@@ -187,7 +187,7 @@ if test -e "${pc_dir}" ; then
     echo "source /boot/grub/grub.cfg") \
     > ${iso9660_dir}/boot/grub/i386-pc/grub.cfg
 
-    grub_mkisofs_arguments="${grub_mkisofs_arguments} -b boot/grub/i386-pc/eltorito.img -boot-info-table \
+    grub_mkisofs_arguments="${grub_mkisofs_arguments} -b boot/grub/i386-pc/eltorito.img -no-emul-boot -boot-info-table \
 		--embedded-boot ${embed_img}"
 fi
 

From 027de555e271b3954fbd749c293ec807cf720405 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 9 Apr 2010 21:07:24 +0200
Subject: [PATCH 0757/1628] 	* normal/autofs.c (read_fs_list): New
 parameter 'prefix'. 	All users updated. 	* normal/crypto.c
 (read_crypto_list): Likewise. 	* normal/dyncmd.c (read_command_list):
 Likewise. 	* normal/term.c (read_terminal_list): Likewise. 	*
 normal/main.c (read_lists): Use explicit prefix. 	(read_lists_hook): Use
 read_lists. 	(grub_normal_execute): Likewise.

---
 ChangeLog             | 11 +++++++++++
 include/grub/normal.h |  8 ++++----
 normal/autofs.c       |  5 +----
 normal/crypto.c       |  4 +---
 normal/dyncmd.c       |  5 +----
 normal/main.c         | 25 ++++++++++++++++---------
 normal/term.c         |  4 +---
 7 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a2a33b2ef..5f3251fcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* normal/autofs.c (read_fs_list): New parameter 'prefix'.
+	All users updated.
+	* normal/crypto.c (read_crypto_list): Likewise.
+	* normal/dyncmd.c (read_command_list): Likewise.
+	* normal/term.c (read_terminal_list): Likewise.
+	* normal/main.c (read_lists): Use explicit prefix.
+	(read_lists_hook): Use read_lists.
+	(grub_normal_execute): Likewise.
+
 2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkrescue.in: Fix incorrect path in coreboot part.
diff --git a/include/grub/normal.h b/include/grub/normal.h
index fe45ddf71..35eedf5ae 100644
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -96,17 +96,17 @@ void read_handler_list (void);
 void free_handler_list (void);
 
 /* Defined in `dyncmd.c'.  */
-void read_command_list (void);
+void read_command_list (const char *prefix);
 
 /* Defined in `autofs.c'.  */
-void read_fs_list (void);
+void read_fs_list (const char *prefix);
 
 void grub_context_init (void);
 void grub_context_fini (void);
 
-void read_crypto_list (void);
+void read_crypto_list (const char *prefix);
 
-void read_terminal_list (void);
+void read_terminal_list (const char *prefix);
 
 void grub_set_more (int onoff);
 
diff --git a/normal/autofs.c b/normal/autofs.c
index 11b3fc1be..e1d4c017c 100644
--- a/normal/autofs.c
+++ b/normal/autofs.c
@@ -51,11 +51,8 @@ autoload_fs_module (void)
 
 /* Read the file fs.lst for auto-loading.  */
 void
-read_fs_list (void)
+read_fs_list (const char *prefix)
 {
-  const char *prefix;
-
-  prefix = grub_env_get ("prefix");
   if (prefix)
     {
       char *filename;
diff --git a/normal/crypto.c b/normal/crypto.c
index f051e2c4c..465c9f81d 100644
--- a/normal/crypto.c
+++ b/normal/crypto.c
@@ -66,14 +66,12 @@ grub_crypto_spec_free (void)
 
 /* Read the file crypto.lst for auto-loading.  */
 void
-read_crypto_list (void)
+read_crypto_list (const char *prefix)
 {
-  const char *prefix;
   char *filename;
   grub_file_t file;
   char *buf = NULL;
 
-  prefix = grub_env_get ("prefix");
   if (!prefix)
     {
       grub_errno = GRUB_ERR_NONE;
diff --git a/normal/dyncmd.c b/normal/dyncmd.c
index ca9a82289..a3cafa514 100644
--- a/normal/dyncmd.c
+++ b/normal/dyncmd.c
@@ -60,11 +60,8 @@ grub_dyncmd_dispatcher (struct grub_command *cmd,
 
 /* Read the file command.lst for auto-loading.  */
 void
-read_command_list (void)
+read_command_list (const char *prefix)
 {
-  const char *prefix;
-
-  prefix = grub_env_get ("prefix");
   if (prefix)
     {
       char *filename;
diff --git a/normal/main.c b/normal/main.c
index 5a5467485..df92e622b 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -434,14 +434,20 @@ grub_normal_init_page (struct grub_term_output *term)
   grub_free (unicode_msg);
 }
 
-static char *
-read_lists (struct grub_env_var *var __attribute__ ((unused)),
-	    const char *val)
+static void
+read_lists (const char *val)
 {
-  read_command_list ();
-  read_fs_list ();
-  read_crypto_list ();
-  read_terminal_list ();
+  read_command_list (val);
+  read_fs_list (val);
+  read_crypto_list (val);
+  read_terminal_list (val);
+}
+
+static char *
+read_lists_hook (struct grub_env_var *var __attribute__ ((unused)),
+		 const char *val)
+{
+  read_lists (val);
   return val ? grub_strdup (val) : NULL;
 }
 
@@ -451,10 +457,11 @@ void
 grub_normal_execute (const char *config, int nested, int batch)
 {
   grub_menu_t menu = 0;
+  const char *prefix = grub_env_get ("prefix");
 
-  read_lists (NULL, NULL);
+  read_lists (prefix);
   read_handler_list ();
-  grub_register_variable_hook ("prefix", NULL, read_lists);
+  grub_register_variable_hook ("prefix", NULL, read_lists_hook);
   grub_command_execute ("parser.grub", 0, 0);
 
   if (config)
diff --git a/normal/term.c b/normal/term.c
index 7bedd6799..688141dab 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -167,14 +167,12 @@ grub_terminal_autoload_free (void)
 
 /* Read the file terminal.lst for auto-loading.  */
 void
-read_terminal_list (void)
+read_terminal_list (const char *prefix)
 {
-  const char *prefix;
   char *filename;
   grub_file_t file;
   char *buf = NULL;
 
-  prefix = grub_env_get ("prefix");
   if (!prefix)
     {
       grub_errno = GRUB_ERR_NONE;

From 25f4e25287453d430890dbc87c0af5d8f8c38968 Mon Sep 17 00:00:00 2001
From: EFI Coder <eficoder@hotmail.com>
Date: Fri, 9 Apr 2010 21:16:17 +0200
Subject: [PATCH 0758/1628] 	* normal/menu_text.c (print_message): Clean up
 the message and show 	the Fn information when on EFI 	* term/efi/console.c
 (grub_console_checkkey): Add F4 support.

---
 ChangeLog          |  6 ++++++
 normal/menu_text.c | 11 +++++++++--
 term/efi/console.c |  3 +++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f3251fcb..e25639a42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-09  EFI Coder <eficoder@hotmail.com>
+
+	* normal/menu_text.c (print_message): Clean up the message and show
+	the Fn information when on EFI
+	* term/efi/console.c (grub_console_checkkey): Add F4 support.
+
 2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* normal/autofs.c (read_fs_list): New parameter 'prefix'.
diff --git a/normal/menu_text.c b/normal/menu_text.c
index b39f57512..bb0587502 100644
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -176,10 +176,17 @@ print_message (int nested, int edit, struct grub_term_output *term)
   if (edit)
     {
       grub_putcode ('\n', term);
+#ifdef GRUB_MACHINE_EFI
+      grub_print_message_indented (_("Minimum Emacs-like screen editing is \
+supported. TAB lists completions. Press F1 to boot, F2=Ctrl-a, F3=Ctrl-e, \
+F4 for a command-line or ESC to discard edits and return to the GRUB menu."),
+                                   STANDARD_MARGIN, STANDARD_MARGIN, term);
+#else
       grub_print_message_indented (_("Minimum Emacs-like screen editing is \
 supported. TAB lists completions. Press Ctrl-x to boot, Ctrl-c for a \
-command-line or ESC to return menu."), STANDARD_MARGIN, STANDARD_MARGIN,
-				   term);
+command-line or ESC to discard edits and return to the GRUB menu."),
+                                   STANDARD_MARGIN, STANDARD_MARGIN, term);
+#endif
     }
   else
     {
diff --git a/term/efi/console.c b/term/efi/console.c
index 264770cae..c33cffdfe 100644
--- a/term/efi/console.c
+++ b/term/efi/console.c
@@ -194,6 +194,9 @@ grub_console_checkkey (void)
 	case 0x0d:
 	  read_key = 5;
 	  break;
+	case 0x0e:
+	  read_key = 3;
+	  break;
 	case 0x17:
 	  read_key = '\e';
 	  break;

From 5d7e744525cd67fca0c2c9508c9f8a480e1ab9a5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 9 Apr 2010 21:35:52 +0200
Subject: [PATCH 0759/1628] 	* term/efi/console.c (grub_console_checkkey):
 Macroify key contants.

---
 ChangeLog          |  4 ++++
 term/efi/console.c | 14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e25639a42..820b595ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* term/efi/console.c (grub_console_checkkey): Macroify key contants.
+
 2010-04-09  EFI Coder <eficoder@hotmail.com>
 
 	* normal/menu_text.c (print_message): Clean up the message and show
diff --git a/term/efi/console.c b/term/efi/console.c
index c33cffdfe..664861398 100644
--- a/term/efi/console.c
+++ b/term/efi/console.c
@@ -159,27 +159,27 @@ grub_console_checkkey (void)
 	  read_key = key.unicode_char;
 	  break;
 	case 0x01:
-	  read_key = 16;
+	  read_key = GRUB_TERM_UP;
 	  break;
 	case 0x02:
-	  read_key = 14;
+	  read_key = GRUB_TERM_DOWN;
 	  break;
 	case 0x03:
-	  read_key = 6;
+	  read_key = GRUB_TERM_RIGHT;
 	  break;
 	case 0x04:
-	  read_key = 2;
+	  read_key = GRUB_TERM_LEFT;
 	  break;
 	case 0x05:
-	  read_key = 1;
+	  read_key = GRUB_TERM_HOME;
 	  break;
 	case 0x06:
-	  read_key = 5;
+	  read_key = GRUB_TERM_END;
 	  break;
 	case 0x07:
 	  break;
 	case 0x08:
-	  read_key = 4;
+	  read_key = GRUB_TERM_DC;
 	  break;
 	case 0x09:
 	  break;

From 47822096b5f7433456791d82128f2decb3282271 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 9 Apr 2010 23:04:00 +0200
Subject: [PATCH 0760/1628] 	* Makefile.in (RMKFILES): Search in srcdir and
 not current directory. 	(MAINTAINER_CLEANFILES): Don't add $(srcdir)
 to MKFILES. Add few 	missing files. 	(maintainer-clean): Remove
 libgcrypt-grub.

---
 ChangeLog   | 7 +++++++
 Makefile.in | 8 ++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 820b595ed..3313a4911 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* Makefile.in (RMKFILES): Search in srcdir and not current directory.
+	(MAINTAINER_CLEANFILES): Don't add $(srcdir) to MKFILES. Add few
+	missing files.
+	(maintainer-clean): Remove libgcrypt-grub.
+
 2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* term/efi/console.c (grub_console_checkkey): Macroify key contants.
diff --git a/Makefile.in b/Makefile.in
index d5eda4be3..57af32cfc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -136,7 +136,7 @@ enable_efiemu = @enable_efiemu@
 
 ### General variables.
 
-RMKFILES = $(wildcard conf/*.rmk)
+RMKFILES = $(wildcard $(srcdir)/conf/*.rmk)
 
 MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES))
 
@@ -155,7 +155,9 @@ DISTCLEANFILES = config.status config.cache config.log config.h \
 	gensymlist.sh genkernsyms.sh build_env.mk \
 	docs/grub.info docs/version.texi docs/stamp-vti
 
-MAINTAINER_CLEANFILES = $(srcdir)/configure $(addprefix $(srcdir)/,$(MKFILES)) \
+MAINTAINER_CLEANFILES = $(srcdir)/configure $(srcdir)/aclocal.m4 \
+	$(MKFILES) $(srcdir)/config.guess \
+	$(srcdir)/config.sub $(srcdir)/install-sh $(srcdir)/missing \
 	$(srcdir)/DISTLIST $(srcdir)/config.h.in $(srcdir)/stamp-h.in $(INFOS)
 
 # The default target.
@@ -427,6 +429,8 @@ distclean: mostlyclean
 
 maintainer-clean: distclean
 	-test -z "$(MAINTAINER_CLEANFILES)" || rm -f $(MAINTAINER_CLEANFILES)
+	-rmdir $(srcdir)/lib/libgcrypt-grub/cipher
+	-rmdir $(srcdir)/lib/libgcrypt-grub
 
 info:
 

From 787928e31e8ee281935870014b5466abdd05f401 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 9 Apr 2010 23:15:33 +0200
Subject: [PATCH 0761/1628] Remove newline_hook declaration

---
 include/grub/term.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/grub/term.h b/include/grub/term.h
index 8a9218635..40f7fb0b9 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -427,8 +427,6 @@ grub_term_getcolor (struct grub_term_output *term,
     }
 }
 
-extern void (*EXPORT_VAR (grub_newline_hook)) (void);
-
 struct grub_term_autoload
 {
   struct grub_term_autoload *next;

From e2d15128a5a2468a5ce9db7c441810e0defae56e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 9 Apr 2010 23:16:08 +0200
Subject: [PATCH 0762/1628] Fix grub-setup on sparc compilation

---
 conf/sparc64-ieee1275.rmk          |  2 +-
 util/sparc64/ieee1275/grub-setup.c | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 78e511e31..ba891307a 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -51,7 +51,7 @@ grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
 util/sparc64/ieee1275/grub-setup.c_DEPENDENCIES = grub_setup_init.h
 grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c	\
 	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
-	kern/err.c kern/misc.c kern/parser.c kern/partition.c	\
+	kern/err.c kern/misc.c kern/partition.c	\
 	kern/file.c kern/fs.c kern/env.c kern/list.c		\
 	fs/fshelp.c						\
 	\
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index c39ea853f..b5aa3ca85 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -82,21 +82,20 @@ struct boot_blocklist
   grub_uint32_t len;
 } __attribute__ ((packed));
 
-void
-grub_putchar (int c)
+void 
+grub_xputs_real (const char *str)
 {
-  putchar (c);
+  fputs (str, stdout);
 }
 
+void (*grub_xputs) (const char *str) = grub_xputs_real;
+
 int
 grub_getkey (void)
 {
   return -1;
 }
 
-struct grub_handler_class grub_term_input_class;
-struct grub_handler_class grub_term_output_class;
-
 void
 grub_refresh (void)
 {

From b3d0fa12aff7cd1a42201fdbce9b67513aad7e36 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 10 Apr 2010 01:56:51 +0200
Subject: [PATCH 0763/1628] Fix usb support

---
 ChangeLog.emu-modload |  7 ++++++-
 conf/any-emu.rmk      |  4 +++-
 include/grub/libusb.h | 29 +++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 include/grub/libusb.h

diff --git a/ChangeLog.emu-modload b/ChangeLog.emu-modload
index dd0ea6bf0..c675021de 100644
--- a/ChangeLog.emu-modload
+++ b/ChangeLog.emu-modload
@@ -7,10 +7,15 @@
 	(TARGET_CFLAGS): Add -DGRUB_TARGET_NO_MODULES=1 if applicable.
 	(CFLAGS): Likewise.
 	* conf/any-emu.rmk: Generate symlist.
+	(kernel_img_HEADERS): Add util/datetime.h.
+	(kernel_img_HEADERS) [sdl]: Add sdl.h.
+	(kernel_img_HEADERS) [libusb]: Add libusb.h.
+	(kernel_img_SOURCES) [TARGET_NO_MODULES = no && !x86]: Add
+	kern/$(target_cpu)/cache.S.
 	* configure.ac (grub-emu-modules): New option.
 	* genmk.rb: Handle multiple source lists.
-	* genmoddep.awk: Output all undefined symbols.
 	* include/grub/sdl.h: New file.
+	* include/grub/libusb.h: Likewise.
 	* util/grub-emu.c (main): Hanle (host) root.
 	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Error with
 	GRUB_ERR_UNKNOWN_DEVICE.
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index e27a6978b..ddc6b0fd4 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -15,7 +15,7 @@ kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c kern/env.c	\
 	\
 	gnulib/progname.c util/hostfs.c disk/host.c
 kernel_img_HEADERS += datetime.h
-kernel_img_CFLAGS = $(CPPFLAGS) $(CFLAGS) -Wno-undef
+kernel_img_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-undef -I$(srcdir)/gnulib
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 TARGET_NO_STRIP = yes
 
@@ -46,6 +46,8 @@ endif
 grub_emu_LDFLAGS = $(LIBCURSES)
 
 ifeq ($(enable_grub_emu_usb), yes)
+kernel_img_HEADERS += libusb.h
+
 pkglib_MODULES += libusb.mod
 libusb_mod_SOURCES = util/usb.c
 libusb_mod_CFLAGS = 
diff --git a/include/grub/libusb.h b/include/grub/libusb.h
new file mode 100644
index 000000000..26548bccb
--- /dev/null
+++ b/include/grub/libusb.h
@@ -0,0 +1,29 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+void EXPORT_FUNC (usb_bulk_write) (void);
+void EXPORT_FUNC (usb_find_busses) (void);
+void EXPORT_FUNC (usb_init) (void);
+void EXPORT_FUNC (usb_find_devices) (void);
+void EXPORT_FUNC (usb_open) (void);
+void EXPORT_FUNC (usb_get_busses) (void);
+void EXPORT_FUNC (usb_control_msg) (void);
+void EXPORT_FUNC (usb_release_interface) (void);
+void EXPORT_FUNC (usb_close) (void);
+void EXPORT_FUNC (usb_bulk_read) (void);
+void EXPORT_FUNC (usb_claim_interface) (void);

From be124579b1e6e4b1e28a5caccb2caa0c326e9f22 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 10 Apr 2010 02:08:01 +0200
Subject: [PATCH 0764/1628] 	* lib/posix_wrap/locale.h: Add missing file. 
 Reported by: Seth Goldberg.

---
 ChangeLog               | 5 +++++
 lib/posix_wrap/locale.h | 0
 2 files changed, 5 insertions(+)
 create mode 100644 lib/posix_wrap/locale.h

diff --git a/ChangeLog b/ChangeLog
index bc2225d2e..813ea512f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* lib/posix_wrap/locale.h: Add missing file.
+	Reported by: Seth Goldberg.
+
 2010-04-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	grub-emu module load support.
diff --git a/lib/posix_wrap/locale.h b/lib/posix_wrap/locale.h
new file mode 100644
index 000000000..e69de29bb

From f2fd9d2b2bf4c958c3e5b505dd5450e341d2e50c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 10 Apr 2010 02:45:26 +0200
Subject: [PATCH 0765/1628] 	* include/grub/efi/memory.h
 (grub_machine_mmap_iterate): Remove 	EXPORT_FUNC. 	Reported by: Seth
 Goldberg.

---
 ChangeLog                 | 6 ++++++
 include/grub/efi/memory.h | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 813ea512f..a8d498033 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/efi/memory.h (grub_machine_mmap_iterate): Remove
+	EXPORT_FUNC.
+	Reported by: Seth Goldberg.
+
 2010-04-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* lib/posix_wrap/locale.h: Add missing file.
diff --git a/include/grub/efi/memory.h b/include/grub/efi/memory.h
index e5ea58d67..285be8359 100644
--- a/include/grub/efi/memory.h
+++ b/include/grub/efi/memory.h
@@ -34,9 +34,9 @@
      by firmware. */
 #define GRUB_MACHINE_MEMORY_HOLE 	6
 
-
-grub_err_t EXPORT_FUNC(grub_machine_mmap_iterate)
-(int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
+grub_err_t grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
+								    grub_uint64_t,
+								    grub_uint32_t));
 grub_err_t grub_machine_mmap_register (grub_uint64_t start, grub_uint64_t size,
 				       int type, int handle);
 grub_err_t grub_machine_mmap_unregister (int handle);

From daea6abdeb9f58dfa0dfe072101d78b540f0a623 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 10 Apr 2010 03:05:03 +0200
Subject: [PATCH 0766/1628] 	* loader/multiboot.c (GRUB_MOD_INIT)
 [GRUB_USE_MULTIBOOT2]: 	Rename "module" to "module2". 	Reported by:
 Seth Goldberg.

---
 ChangeLog          | 6 ++++++
 loader/multiboot.c | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8d498033..d39c0b65a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/multiboot.c (GRUB_MOD_INIT) [GRUB_USE_MULTIBOOT2]:
+	Rename "module" to "module2".
+	Reported by: Seth Goldberg.
+
 2010-04-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/efi/memory.h (grub_machine_mmap_iterate): Remove
diff --git a/loader/multiboot.c b/loader/multiboot.c
index 1a22cd3a6..ce1e75dda 100644
--- a/loader/multiboot.c
+++ b/loader/multiboot.c
@@ -335,14 +335,16 @@ GRUB_MOD_INIT(multiboot)
 #ifdef GRUB_USE_MULTIBOOT2
     grub_register_command ("multiboot2", grub_cmd_multiboot,
 			   0, N_("Load a multiboot 2 kernel."));
+  cmd_module =
+    grub_register_command ("module2", grub_cmd_module,
+			   0, N_("Load a multiboot 2 module."));
 #else
     grub_register_command ("multiboot", grub_cmd_multiboot,
 			   0, N_("Load a multiboot kernel."));
-#endif
-
   cmd_module =
     grub_register_command ("module", grub_cmd_module,
 			   0, N_("Load a multiboot module."));
+#endif
 
   my_mod = mod;
 }

From 6734334a53938ea478da447c8ca9414f72fd6cfa Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 10 Apr 2010 12:46:12 +0200
Subject: [PATCH 0767/1628] 	* include/grub/util/misc.h
 (canonicalise_file_name): Add missing 	prototype. 	Reported by: Seth
 Goldberg.

---
 ChangeLog                | 6 ++++++
 include/grub/util/misc.h | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d39c0b65a..b1770bf4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/util/misc.h (canonicalise_file_name): Add missing
+	prototype.
+	Reported by: Seth Goldberg.
+
 2010-04-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/multiboot.c (GRUB_MOD_INIT) [GRUB_USE_MULTIBOOT2]:
diff --git a/include/grub/util/misc.h b/include/grub/util/misc.h
index 373fff8bb..63d4dac6d 100644
--- a/include/grub/util/misc.h
+++ b/include/grub/util/misc.h
@@ -88,6 +88,8 @@ grub_int64_t grub_util_get_disk_size (char *name);
 
 char *make_system_path_relative_to_its_root (const char *path);
 
+char *canonicalize_file_name (const char *path);
+
 void grub_util_init_nls (void);
 
 #endif /* ! GRUB_UTIL_MISC_HEADER */

From c663074e6d2d35394a5254900bdd03c10279bd8a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 10 Apr 2010 14:35:26 +0200
Subject: [PATCH 0768/1628] intwrap get_memsize

---
 include/grub/i386/pc/init.h |  4 ----
 kern/i386/pc/init.c         | 19 +++++++++++++++++-
 kern/i386/pc/mmap.c         | 19 +++++++++++++++++-
 kern/i386/pc/startup.S      | 40 -------------------------------------
 4 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/include/grub/i386/pc/init.h b/include/grub/i386/pc/init.h
index 30130d189..368668922 100644
--- a/include/grub/i386/pc/init.h
+++ b/include/grub/i386/pc/init.h
@@ -23,10 +23,6 @@
 #include <grub/symbol.h>
 #include <grub/machine/memory.h>
 
-/* Get the memory size in KB. If EXTENDED is zero, return conventional
-   memory, otherwise return extended memory.  */
-grub_uint16_t grub_get_memsize (int extended);
-
 /* Get a packed EISA memory map. Lower 16 bits are between 1MB and 16MB
    in 1KB parts, and upper 16 bits are above 16MB in 64KB parts.  */
 grub_uint32_t grub_get_eisa_mmap (void);
diff --git a/kern/i386/pc/init.c b/kern/i386/pc/init.c
index fa646df19..ab625ef44 100644
--- a/kern/i386/pc/init.c
+++ b/kern/i386/pc/init.c
@@ -23,6 +23,7 @@
 #include <grub/machine/memory.h>
 #include <grub/machine/console.h>
 #include <grub/machine/kernel.h>
+#include <grub/machine/int.h>
 #include <grub/types.h>
 #include <grub/err.h>
 #include <grub/dl.h>
@@ -134,6 +135,22 @@ compact_mem_regions (void)
       }
 }
 
+/*
+ *
+ * grub_get_conv_memsize(i) :  return the conventional memory size in KB.
+ *	BIOS call "INT 12H" to get conventional memory size
+ *      The return value in AX.
+ */
+static inline grub_uint16_t
+grub_get_conv_memsize (void)
+{
+  struct grub_bios_int_registers regs;
+
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  grub_bios_interrupt (0x12, &regs);
+  return regs.eax & 0xffff;
+}
+
 void
 grub_machine_init (void)
 {
@@ -143,7 +160,7 @@ grub_machine_init (void)
   /* Initialize the console as early as possible.  */
   grub_console_init ();
 
-  grub_lower_mem = grub_get_memsize (0) << 10;
+  grub_lower_mem = grub_get_conv_memsize () << 10;
 
   /* Sanity check.  */
   if (grub_lower_mem < GRUB_MEMORY_MACHINE_RESERVED_END)
diff --git a/kern/i386/pc/mmap.c b/kern/i386/pc/mmap.c
index 52d8fd597..b1bf2056f 100644
--- a/kern/i386/pc/mmap.c
+++ b/kern/i386/pc/mmap.c
@@ -17,10 +17,27 @@
  */
 
 #include <grub/machine/init.h>
+#include <grub/machine/int.h>
 #include <grub/machine/memory.h>
 #include <grub/err.h>
 #include <grub/types.h>
 
+/*
+ * grub_get_ext_memsize() :  return the extended memory size in KB.
+ *	BIOS call "INT 15H, AH=88H" to get extended memory size
+ *	The return value in AX.
+ *
+ */
+static inline grub_uint16_t
+grub_get_ext_memsize (void)
+{
+  struct grub_bios_int_registers regs;
+
+  regs.eax = 0x8800;
+  grub_bios_interrupt (0x15, &regs);
+  return regs.eax & 0xffff;
+}
+
 grub_err_t
 grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t))
 {
@@ -56,7 +73,7 @@ grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uin
 	    hook (0x1000000, eisa_mmap & ~0xFFFF, GRUB_MACHINE_MEMORY_AVAILABLE);
 	}
       else
-	hook (0x100000, grub_get_memsize (1) << 10, GRUB_MACHINE_MEMORY_AVAILABLE);
+	hook (0x100000, grub_get_ext_memsize () << 10, GRUB_MACHINE_MEMORY_AVAILABLE);
     }
 
   return 0;
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index 6733e12bc..233ab8074 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -505,46 +505,6 @@ FUNCTION(grub_chainloader_real_boot)
 
 #include "../loader.S"
 
-/*
- *
- * grub_get_memsize(i) :  return the memory size in KB. i == 0 for conventional
- *		memory, i == 1 for extended memory
- *	BIOS call "INT 12H" to get conventional memory size
- *	BIOS call "INT 15H, AH=88H" to get extended memory size
- *		Both have the return value in AX.
- *
- */
-
-FUNCTION(grub_get_memsize)
-	pushl	%ebp
-
-	movl	%eax, %edx
-
-	call	prot_to_real	/* enter real mode */
-	.code16
-
-	testl	%edx, %edx
-	jnz	xext
-
-	int	$0x12
-	jmp	xdone
-
-xext:
-	movb	$0x88, %ah
-	int	$0x15
-
-xdone:
-	movw	%ax, %dx
-
-	DATA32	call	real_to_prot
-	.code32
-
-	movw	%dx, %ax
-
-	popl	%ebp
-	ret
-
-
 /*
  *
  * grub_get_eisa_mmap() :  return packed EISA memory map, lower 16 bits is

From 2663fb5f046251e7b7e68d55843e28a63de82b18 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 10 Apr 2010 18:06:45 +0530
Subject: [PATCH 0769/1628] flex version check is now done by awk alone

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 0af597bd3..08260eae5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,7 +192,7 @@ AC_PROG_MKDIR_P
 if test "x$LEX" = x; then
   AC_MSG_ERROR([flex is not found])
 else
-  version=`$LEX --version 2>/dev/null | $SED -e 's/flex//' -e 's/version//' | $AWK -F "." '{ printf "%d", $1 * 10000 + $2 * 100 + $3;}'`
+  version=`$LEX --version | $AWK '{ split($NF,x,"."); print x[[1]]*10000+x[[2]]*100+x[[3]]; }'`
   if test -n "$version" -a "$version" -ge 20535; then
     :
   else

From 0d06476b0540bf7abe4b423fa741a8ec6338d4cc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 10 Apr 2010 14:45:27 +0200
Subject: [PATCH 0770/1628] intwrap get_eisa_map. Fix intwrapping of
 get_ext_memsize.

---
 include/grub/i386/pc/init.h |  4 ----
 kern/i386/pc/mmap.c         | 23 +++++++++++++++++++++++
 kern/i386/pc/startup.S      | 37 -------------------------------------
 3 files changed, 23 insertions(+), 41 deletions(-)

diff --git a/include/grub/i386/pc/init.h b/include/grub/i386/pc/init.h
index 368668922..7dc8ee1f4 100644
--- a/include/grub/i386/pc/init.h
+++ b/include/grub/i386/pc/init.h
@@ -23,10 +23,6 @@
 #include <grub/symbol.h>
 #include <grub/machine/memory.h>
 
-/* Get a packed EISA memory map. Lower 16 bits are between 1MB and 16MB
-   in 1KB parts, and upper 16 bits are above 16MB in 64KB parts.  */
-grub_uint32_t grub_get_eisa_mmap (void);
-
 /* Get a memory map entry. Return next continuation value. Zero means
    the end.  */
 grub_uint32_t grub_get_mmap_entry (struct grub_machine_mmap_entry *entry,
diff --git a/kern/i386/pc/mmap.c b/kern/i386/pc/mmap.c
index b1bf2056f..2758d17f8 100644
--- a/kern/i386/pc/mmap.c
+++ b/kern/i386/pc/mmap.c
@@ -34,10 +34,33 @@ grub_get_ext_memsize (void)
   struct grub_bios_int_registers regs;
 
   regs.eax = 0x8800;
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
   grub_bios_interrupt (0x15, &regs);
   return regs.eax & 0xffff;
 }
 
+/* Get a packed EISA memory map. Lower 16 bits are between 1MB and 16MB
+   in 1KB parts, and upper 16 bits are above 16MB in 64KB parts. If error, return zero.
+   BIOS call "INT 15H, AH=E801H" to get EISA memory map,
+     AX = memory between 1M and 16M in 1K parts.
+     BX = memory above 16M in 64K parts. 
+*/
+ 
+static inline grub_uint32_t
+grub_get_eisa_mmap (void)
+{
+  struct grub_bios_int_registers regs;
+
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+  regs.eax = 0xe801;
+  grub_bios_interrupt (0x15, &regs);
+
+  if ((regs.eax & 0xff00) == 0x8600)
+    return 0;
+
+  return (regs.eax & 0xffff) | (regs.ebx << 16);
+}
+
 grub_err_t
 grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t))
 {
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index 233ab8074..3fa1b11e8 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -505,43 +505,6 @@ FUNCTION(grub_chainloader_real_boot)
 
 #include "../loader.S"
 
-/*
- *
- * grub_get_eisa_mmap() :  return packed EISA memory map, lower 16 bits is
- *		memory between 1M and 16M in 1K parts, upper 16 bits is
- *		memory above 16M in 64K parts.  If error, return zero.
- *	BIOS call "INT 15H, AH=E801H" to get EISA memory map,
- *		AX = memory between 1M and 16M in 1K parts.
- *		BX = memory above 16M in 64K parts.
- *
- */
-
-FUNCTION(grub_get_eisa_mmap)
-	pushl	%ebp
-	pushl	%ebx
-
-	call	prot_to_real	/* enter real mode */
-	.code16
-
-	movw	$0xe801, %ax
-	int	$0x15
-
-	shll	$16, %ebx
-	movw	%ax, %bx
-
-	DATA32	call	real_to_prot
-	.code32
-
-	cmpb	$0x86, %bh
-	je	xnoteisa
-
-	movl	%ebx, %eax
-
-xnoteisa:
-	popl	%ebx
-	popl	%ebp
-	ret
-
 /*
  *
  * grub_get_mmap_entry(addr, cont) : address and old continuation value (zero to

From 2c7031b135ec6bcdbcdcef86b1159bd3742c8d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Sat, 10 Apr 2010 17:07:33 +0200
Subject: [PATCH 0771/1628] 	Add grub-probe support for NetBSD.

	* util/getroot.c (find_root_device): Convert block device to
	character device on NetBSD.
	* util/probe.c (probe): Require character device on NetBSD.
	* util/hostdisk.c: NetBSD specific headers.
	(configure_device_driver): new function to tune device driver
	parameters (currently only for NetBSD floppy driver).
	(grub_util_biosdisk_open): NetBSD specific code (get disk size
	via disklabel ioctl).
	(open_device): call configure_device_driver on NetBSD.
	(convert_system_partition_to_system_disk): NetBSD specific code.
	(device_is_wholedisk): Likewise.
	(grub_util_biosdisk_get_grub_dev): Likewise.
	(make_device_name): Fixed a typo in bsd_part_str.
	* configure.ac: check for opendisk() and getrawpartition() on
	NetBSD and set LIBUTIL.
	* Makefile.in: add LIBUTIL to LIBS.
---
 ChangeLog       |  21 +++++++
 Makefile.in     |   5 +-
 configure.ac    |  15 +++++
 util/getroot.c  |  11 +++-
 util/hostdisk.c | 156 +++++++++++++++++++++++++++++++++++++++++++-----
 5 files changed, 191 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 38171b1f0..f71c37ad0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2010-04-10  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	Add grub-probe support for NetBSD.
+
+	* util/getroot.c (find_root_device): Convert block device to
+	character device on NetBSD.
+	* util/probe.c (probe): Require character device on NetBSD.
+	* util/hostdisk.c: NetBSD specific headers.
+	(configure_device_driver): new function to tune device driver
+	parameters (currently only for NetBSD floppy driver).
+	(grub_util_biosdisk_open): NetBSD specific code (get disk size
+	via disklabel ioctl).
+	(open_device): call configure_device_driver on NetBSD.
+	(convert_system_partition_to_system_disk): NetBSD specific code.
+	(device_is_wholedisk): Likewise.
+	(grub_util_biosdisk_get_grub_dev): Likewise.
+	(make_device_name): Fixed a typo in bsd_part_str.
+	* configure.ac: check for opendisk() and getrawpartition() on
+	NetBSD and set LIBUTIL.
+	* Makefile.in: add LIBUTIL to LIBS.
+
 2010-04-10  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Documentation fix.
diff --git a/Makefile.in b/Makefile.in
index 898e6b92a..08c25971f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,6 +45,9 @@ pkglibdir =  $(libdir)/`echo @PACKAGE_TARNAME@/$(target_cpu)-$(platform) | sed '
 LIBINTL = @LIBINTL@
 TARGET_NO_MODULES = @TARGET_NO_MODULES@
 
+# Util library.
+LIBUTIL = @LIBUTIL@
+
 XGETTEXT = @XGETTEXT@
 MSGMERGE = @MSGMERGE@
 MSGFMT = @MSGFMT@
@@ -76,7 +79,7 @@ MKDIR_P = @MKDIR_P@
 
 mkinstalldirs = $(srcdir)/mkinstalldirs
 
-LIBS = @LIBS@ $(LIBINTL)
+LIBS = @LIBS@ $(LIBINTL) $(LIBUTIL)
 
 CC = @CC@
 CFLAGS = @CFLAGS@
diff --git a/configure.ac b/configure.ac
index cabae08e3..afdb7b32d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,6 +130,7 @@ case "$host_os" in
   gnu*)				host_kernel=hurd ;;
   linux*)			host_kernel=linux ;;
   freebsd* | kfreebsd*-gnu)	host_kernel=kfreebsd ;;
+  netbsd*)			host_kernel=netbsd ;;
   cygwin)			host_kernel=windows ;;
 esac
 
@@ -242,6 +243,20 @@ AC_CHECK_FUNCS(memmove sbrk strdup lstat getuid getgid)
 AC_CHECK_HEADERS(sys/mkdev.h sys/sysmacros.h malloc.h termios.h sys/types.h)
 AC_CHECK_HEADERS(unistd.h string.h strings.h sys/stat.h sys/fcntl.h limits.h)
 
+# For opendisk() and getrawpartition() on NetBSD.
+# Used in util/deviceiter.c and in util/hostdisk.c.
+AC_CHECK_HEADER([util.h], [
+  AC_CHECK_LIB([util], [opendisk], [
+    LIBUTIL="-lutil"
+    AC_DEFINE(HAVE_OPENDISK, 1, [Define if opendisk() in -lutil can be used])
+  ])
+  AC_CHECK_LIB([util], [getrawpartition], [
+    LIBUTIL="-lutil"
+    AC_DEFINE(HAVE_GETRAWPARTITION, 1, [Define if getrawpartition() in -lutil can be used])
+  ])
+])
+AC_SUBST([LIBUTIL])
+
 #
 # Check for target programs.
 #
diff --git a/util/getroot.c b/util/getroot.c
index 82393635c..94eadc5e1 100644
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -264,10 +264,17 @@ find_root_device (const char *dir, dev_t dev)
 	  /* Found!  */
 	  char *res;
 	  char *cwd;
+#if defined(__NetBSD__)
+	  /* Convert this block device to its character (raw) device.  */
+	  const char *template = "%s/r%s";
+#else
+	  /* Keep the device name as it is.  */
+	  const char *template = "%s/%s";
+#endif
 
 	  cwd = xgetcwd ();
-	  res = xmalloc (strlen (cwd) + strlen (ent->d_name) + 2);
-	  sprintf (res, "%s/%s", cwd, ent->d_name);
+	  res = xmalloc (strlen (cwd) + strlen (ent->d_name) + 3);
+	  sprintf (res, template, cwd, ent->d_name);
 	  strip_extra_slashes (res);
 	  free (cwd);
 
diff --git a/util/hostdisk.c b/util/hostdisk.c
index 3ecc95391..8a412da55 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -98,6 +98,18 @@ struct hd_geometry
 # include <sys/disk.h>
 #endif
 
+#if defined(__NetBSD__)
+# include <sys/ioctl.h>
+# include <sys/disklabel.h>    /* struct disklabel */
+# ifdef HAVE_GETRAWPARTITION
+#  include <util.h>    /* getrawpartition */
+# endif /* HAVE_GETRAWPARTITION */
+# include <sys/fdio.h>
+# ifndef RAW_FLOPPY_MAJOR
+#  define RAW_FLOPPY_MAJOR	9
+# endif /* ! RAW_FLOPPY_MAJOR */
+#endif /* defined(__NetBSD__) */
+
 struct
 {
   char *drive;
@@ -129,6 +141,31 @@ have_devfs (void)
 }
 #endif /* __linux__ */
 
+#if defined(__NetBSD__)
+/* Adjust device driver parameters.  This function should be called just
+   after successfully opening the device.  For now, it simply prevents the
+   floppy driver from retrying operations on failure, as otherwise the
+   driver takes a while to abort when there is no floppy in the drive.  */
+static void
+configure_device_driver (int fd)
+{
+  struct stat st;
+
+  if (fstat (fd, &st) < 0 || ! S_ISCHR (st.st_mode))
+    return;
+  if (major(st.st_rdev) == RAW_FLOPPY_MAJOR)
+    {
+      int floppy_opts;
+
+      if (ioctl (fd, FDIOCGETOPTS, &floppy_opts) == -1)
+	return;
+      floppy_opts |= FDOPT_NORETRY;
+      if (ioctl (fd, FDIOCSETOPTS, &floppy_opts) == -1)
+	return;
+    }
+}
+#endif /* defined(__NetBSD__) */
+
 static int
 find_grub_drive (const char *name)
 {
@@ -204,16 +241,20 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
     return GRUB_ERR_NONE;
   }
 #elif defined(__linux__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
-      defined(__FreeBSD_kernel__) || defined(__APPLE__)
+      defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__NetBSD__)
   {
+# if defined(__NetBSD__)
+    struct disklabel label;
+# else
     unsigned long long nr;
+# endif
     int fd;
 
     fd = open (map[drive].device, O_RDONLY);
     if (fd == -1)
       return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "cannot open `%s' while attempting to get disk size", map[drive].device);
 
-# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__NetBSD__)
     if (fstat (fd, &st) < 0 || ! S_ISCHR (st.st_mode))
 # else
     if (fstat (fd, &st) < 0 || ! S_ISBLK (st.st_mode))
@@ -227,6 +268,9 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
     if (ioctl (fd, DIOCGMEDIASIZE, &nr))
 # elif defined(__APPLE__)
     if (ioctl (fd, DKIOCGETBLOCKCOUNT, &nr))
+# elif defined(__NetBSD__)
+    configure_device_driver (fd);
+    if (ioctl (fd, DIOCGDINFO, &label) == -1)
 # else
     if (ioctl (fd, BLKGETSIZE64, &nr))
 # endif
@@ -237,14 +281,16 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
 
     close (fd);
 
-#if defined (__APPLE__)
+# if defined (__APPLE__)
     disk->total_sectors = nr;
-#else
+# elif defined(__NetBSD__)
+    disk->total_sectors = label.d_secperunit;
+# else
     disk->total_sectors = nr / 512;
 
     if (nr % 512)
       grub_util_error ("unaligned device size");
-#endif
+# endif
 
     grub_util_info ("the size of %s is %llu", name, disk->total_sectors);
 
@@ -483,6 +529,10 @@ open_device (const grub_disk_t disk, grub_disk_addr_t sector, int flags)
     }
 #endif /* ! __linux__ */
 
+#if defined(__NetBSD__)
+  configure_device_driver (fd);
+#endif /* defined(__NetBSD__) */
+
 #if defined(__linux__) && (!defined(__GLIBC__) || \
         ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))))
   /* Maybe libc doesn't have large file support.  */
@@ -811,7 +861,7 @@ make_device_name (int drive, int dos_part, int bsd_part)
     dos_part_str = xasprintf (",%d", dos_part + 1);
 
   if (bsd_part >= 0)
-    bsd_part_str = xasprintf (",%c", dos_part + 'a');
+    bsd_part_str = xasprintf (",%c", bsd_part + 'a');
 
   ret = xasprintf ("%s%s%s", map[drive].drive,
                    dos_part_str ? : "",
@@ -981,6 +1031,27 @@ convert_system_partition_to_system_disk (const char *os_dev)
     }
   return path;
 
+#elif defined(__NetBSD__)
+  /* NetBSD uses "/dev/r[wsc]d[0-9]+[a-z]".  */
+  char *path = xstrdup (os_dev);
+  if (strncmp ("/dev/rwd", path, 8) == 0 ||
+      strncmp ("/dev/rsd", path, 8) == 0 ||
+      strncmp ("/dev/rcd", path, 8) == 0)
+    {
+      char *q;
+      q = path + strlen(path) - 1;    /* last character */
+      if (grub_isalpha(*q) && grub_isdigit(*(q-1)))
+        {
+          int rawpart = -1;
+# ifdef HAVE_GETRAWPARTITION
+          rawpart = getrawpartition();
+# endif /* HAVE_GETRAWPARTITION */
+          if (rawpart >= 0)
+            *q = 'a' + rawpart;
+        }
+    }
+  return path;
+
 #else
 # warning "The function `convert_system_partition_to_system_disk' might not work on your OS correctly."
   return xstrdup (os_dev);
@@ -999,6 +1070,26 @@ device_is_wholedisk (const char *os_dev)
 }
 #endif
 
+#if defined(__NetBSD__)
+/* Try to determine whether a given device name corresponds to a whole disk.
+   This function should give in most cases a definite answer, but it may
+   actually give an approximate one in the following sense: if the return
+   value is 0 then the device name does not correspond to a whole disk.  */
+static int
+device_is_wholedisk (const char *os_dev)
+{
+  int len = strlen (os_dev);
+  int rawpart = -1;
+
+# ifdef HAVE_GETRAWPARTITION
+  rawpart = getrawpartition();
+# endif /* HAVE_GETRAWPARTITION */
+  if (rawpart < 0)
+    return 1;
+  return (os_dev[len - 1] == ('a' + rawpart));
+}
+#endif /* defined(__NetBSD__) */
+
 static int
 find_system_device (const char *os_dev)
 {
@@ -1051,14 +1142,14 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
       == 0)
     return make_device_name (drive, -1, -1);
 
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__NetBSD__)
   if (! S_ISCHR (st.st_mode))
 #else
   if (! S_ISBLK (st.st_mode))
 #endif
     return make_device_name (drive, -1, -1);
 
-#if defined(__linux__) || defined(__CYGWIN__)
+#if defined(__linux__) || defined(__CYGWIN__) || defined(__NetBSD__)
   /* Linux counts partitions uniformly, whether a BSD partition or a DOS
      partition, so mapping them to GRUB devices is not trivial.
      Here, get the start sector of a partition by HDIO_GETGEO, and
@@ -1066,12 +1157,24 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
 
      Cygwin /dev/sdXN emulation uses Windows partition mapping. It
      does not count the extended partition and missing primary
-     partitions.  Use same method as on Linux here.  */
+     partitions.  Use same method as on Linux here.
+
+     For NetBSD, proceed as for Linux, except that the start sector is
+     obtained from the disk label.  */
   {
     char *name;
     grub_disk_t disk;
     int fd;
+# if !defined(__NetBSD__)
+    const char *disk_info_msg = "geometry";
     struct hd_geometry hdg;
+    typeof (hdg.start) p_offset;
+# else /* defined(__NetBSD__) */
+    const char *disk_info_msg = "label";
+    struct disklabel label;
+    int index;
+    u_int32_t p_offset;
+# endif /* !defined(__NetBSD__) */
     int dos_part = -1;
     int bsd_part = -1;
     auto int find_partition (grub_disk_t dsk,
@@ -1086,7 +1189,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
 
 	part_start = grub_partition_get_start (partition);
 
-	if (hdg.start == part_start)
+	if (p_offset == part_start)
 	  {
 	    if (partition->parent)
 	      {
@@ -1107,21 +1210,33 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
 
     name = make_device_name (drive, -1, -1);
 
+# if !defined(__NetBSD__)
     if (MAJOR (st.st_rdev) == FLOPPY_MAJOR)
       return name;
+# else /* defined(__NetBSD__) */
+    /* Since os_dev and convert_system_partition_to_system_disk (os_dev) are
+     * different, we know that os_dev is of the form /dev/r[wsc]d[0-9]+[a-z]
+     * and in particular it cannot be a floppy device.  */
+    index = os_dev[strlen(os_dev) - 1] - 'a';
+# endif /* !defined(__NetBSD__) */
 
     fd = open (os_dev, O_RDONLY);
     if (fd == -1)
       {
-	grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' while attempting to get disk geometry", os_dev);
+	grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' while attempting to get disk %s", os_dev, disk_info_msg);
 	free (name);
 	return 0;
       }
 
+# if !defined(__NetBSD__)
     if (ioctl (fd, HDIO_GETGEO, &hdg))
+# else /* defined(__NetBSD__) */
+    configure_device_driver (fd);
+    if (ioctl (fd, DIOCGDINFO, &label) == -1)
+# endif /* !defined(__NetBSD__) */
       {
 	grub_error (GRUB_ERR_BAD_DEVICE,
-		    "cannot get geometry of `%s'", os_dev);
+		    "cannot get disk %s of `%s'", disk_info_msg, os_dev);
 	close (fd);
 	free (name);
 	return 0;
@@ -1129,9 +1244,22 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
 
     close (fd);
 
-    grub_util_info ("%s starts from %lu", os_dev, hdg.start);
+# if !defined(__NetBSD__)
+    p_offset = hdg.start;
+# else /* defined(__NetBSD__) */
+    if (index >= label.d_npartitions)
+      {
+	grub_error (GRUB_ERR_BAD_DEVICE,
+		    "no disk label entry for `%s'", os_dev);
+	free (name);
+	return 0;
+      }
+    p_offset = label.d_partitions[index].p_offset;
+# endif /* !defined(__NetBSD__) */
 
-    if (hdg.start == 0 && device_is_wholedisk (os_dev))
+    grub_util_info ("%s starts from %lu", os_dev, p_offset);
+
+    if (p_offset == 0 && device_is_wholedisk (os_dev))
       return name;
 
     grub_util_info ("opening the device %s", name);

From e0fc9e78c15db91ebaa0f0c2e95573fb83057234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Sat, 10 Apr 2010 17:09:24 +0200
Subject: [PATCH 0772/1628] missing part of patch

---
 util/grub-probe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/grub-probe.c b/util/grub-probe.c
index 948f10dcf..bb41480e2 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -119,7 +119,7 @@ probe (const char *path, char *device_name)
 
   if (path == NULL)
     {
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
       if (! grub_util_check_char_device (device_name))
         grub_util_error ("%s is not a character device", device_name);
 #else

From f632937ab5c0223259991c3073ed8569df27a304 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 10 Apr 2010 19:12:04 +0200
Subject: [PATCH 0773/1628] intwrap grub_get_mmap_entry

---
 include/grub/i386/pc/init.h |  5 ---
 kern/i386/pc/mmap.c         | 47 ++++++++++++++++++++
 kern/i386/pc/startup.S      | 88 -------------------------------------
 3 files changed, 47 insertions(+), 93 deletions(-)

diff --git a/include/grub/i386/pc/init.h b/include/grub/i386/pc/init.h
index 7dc8ee1f4..a6d2abf41 100644
--- a/include/grub/i386/pc/init.h
+++ b/include/grub/i386/pc/init.h
@@ -23,11 +23,6 @@
 #include <grub/symbol.h>
 #include <grub/machine/memory.h>
 
-/* Get a memory map entry. Return next continuation value. Zero means
-   the end.  */
-grub_uint32_t grub_get_mmap_entry (struct grub_machine_mmap_entry *entry,
-				   grub_uint32_t cont);
-
 /* Turn on/off Gate A20.  */
 void grub_gate_a20 (int on);
 
diff --git a/kern/i386/pc/mmap.c b/kern/i386/pc/mmap.c
index 2758d17f8..25f8a739b 100644
--- a/kern/i386/pc/mmap.c
+++ b/kern/i386/pc/mmap.c
@@ -61,6 +61,53 @@ grub_get_eisa_mmap (void)
   return (regs.eax & 0xffff) | (regs.ebx << 16);
 }
 
+/*
+ *
+ * grub_get_mmap_entry(addr, cont) : address and old continuation value (zero to
+ *		start), for the Query System Address Map BIOS call.
+ *
+ *  Sets the first 4-byte int value of "addr" to the size returned by
+ *  the call.  If the call fails, sets it to zero.
+ *
+ *	Returns:  new (non-zero) continuation value, 0 if done.
+ */
+/* Get a memory map entry. Return next continuation value. Zero means
+   the end.  */
+static grub_uint32_t
+grub_get_mmap_entry (struct grub_machine_mmap_entry *entry,
+		     grub_uint32_t cont)
+{
+  struct grub_bios_int_registers regs;
+
+  regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
+
+  /* place address (+4) in ES:DI */
+  regs.es = ((grub_addr_t) &entry->addr) >> 4;
+  regs.edi = ((grub_addr_t) &entry->addr) & 0xf;
+	
+  /* set continuation value */
+  regs.ebx = cont;
+
+  /* set default maximum buffer size */
+  regs.ecx = sizeof (*entry) - sizeof (entry->size);
+
+  /* set EDX to 'SMAP' */
+  regs.edx = 0x534d4150;
+
+  regs.eax = 0xe820;
+  grub_bios_interrupt (0x15, &regs);
+
+  /* write length of buffer (zero if error) into ADDR */	
+  if ((regs.flags & GRUB_CPU_INT_FLAGS_CARRY) || regs.eax != 0x534d4150
+      || regs.ecx < 0x14 || regs.ecx > 0x400)
+    entry->size = 0;
+  else
+    entry->size = regs.ecx;
+
+  /* return the continuation value */
+  return regs.ebx;
+}
+
 grub_err_t
 grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t))
 {
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index 3fa1b11e8..ee677fc15 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -505,94 +505,6 @@ FUNCTION(grub_chainloader_real_boot)
 
 #include "../loader.S"
 
-/*
- *
- * grub_get_mmap_entry(addr, cont) : address and old continuation value (zero to
- *		start), for the Query System Address Map BIOS call.
- *
- *  Sets the first 4-byte int value of "addr" to the size returned by
- *  the call.  If the call fails, sets it to zero.
- *
- *	Returns:  new (non-zero) continuation value, 0 if done.
- */
-
-FUNCTION(grub_get_mmap_entry)
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%edi
-	pushl	%esi
-
-	/* push ADDR */
-	pushl	%eax
-
-	/* place address (+4) in ES:DI */
-	addl	$4, %eax
-	movl	%eax, %edi
-	andl	$0xf, %edi
-	shrl	$4, %eax
-	movl	%eax, %esi
-
-	/* set continuation value */
-	movl	%edx, %ebx
-
-	/* set default maximum buffer size */
-	movl	$0x14, %ecx
-
-	/* set EDX to 'SMAP' */
-	movl	$0x534d4150, %edx
-
-	call	prot_to_real	/* enter real mode */
-	.code16
-
-	movw	%si, %es
-	movl	$0xe820, %eax
-	int	$0x15
-
-	DATA32	jc	xnosmap
-
-	cmpl	$0x534d4150, %eax
-	jne	xnosmap
-
-	cmpl	$0x14, %ecx
-	jl	xnosmap
-
-	cmpl	$0x400, %ecx
-	jg	xnosmap
-
-	jmp	xsmap
-
-xnosmap:
-	xorl	%ecx, %ecx
-
-/* 	Apple's cc jumps few bytes before the correct
-	label in this context. Hence nops. */
-#ifdef APPLE_CC
-	nop
-	nop
-	nop
-	nop
-	nop
-	nop
-#endif
-
-xsmap:
-	DATA32	call	real_to_prot
-	.code32
-
-	/* write length of buffer (zero if error) into ADDR */
-	popl	%eax
-	movl	%ecx, (%eax)
-
-	/* set return value to continuation */
-	movl	%ebx, %eax
-
-	popl	%esi
-	popl	%edi
-	popl	%ebx
-	popl	%ebp
-	ret
-
-
 /*
  * void grub_console_real_putchar (int c)
  *

From 8c5ed46e488770805299fa41a1d1614229d037a1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 10 Apr 2010 19:59:22 +0200
Subject: [PATCH 0774/1628] Inline grub_stop_floppy

---
 include/grub/i386/coreboot/init.h             |  2 +-
 .../init.c => include/grub/i386/floppy.h      | 20 +++++++++++++------
 include/grub/i386/pc/init.h                   |  3 +--
 kern/i386/coreboot/init.c                     | 10 ----------
 kern/i386/loader.S                            |  6 +++++-
 5 files changed, 21 insertions(+), 20 deletions(-)
 rename kern/i386/ieee1275/init.c => include/grub/i386/floppy.h (62%)

diff --git a/include/grub/i386/coreboot/init.h b/include/grub/i386/coreboot/init.h
index e67007414..e944f9cc8 100644
--- a/include/grub/i386/coreboot/init.h
+++ b/include/grub/i386/coreboot/init.h
@@ -21,8 +21,8 @@
 
 #include <grub/symbol.h>
 #include <grub/i386/pc/memory.h>
+#include <grub/i386/floppy.h>
 
 void EXPORT_FUNC(grub_stop) (void) __attribute__ ((noreturn));
-void EXPORT_FUNC(grub_stop_floppy) (void);
 
 #endif
diff --git a/kern/i386/ieee1275/init.c b/include/grub/i386/floppy.h
similarity index 62%
rename from kern/i386/ieee1275/init.c
rename to include/grub/i386/floppy.h
index 9fb98739b..0e3690549 100644
--- a/kern/i386/ieee1275/init.c
+++ b/include/grub/i386/floppy.h
@@ -1,7 +1,6 @@
-/*  init.c -- Initialize GRUB on Open Firmware.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2003,2004,2005,2007,2008 Free Software Foundation, Inc.
+ *  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010  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
@@ -17,12 +16,21 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <grub/types.h>
-#include <grub/cache.h>
+#ifndef GRUB_FLOPPY_CPU_HEADER
+#define GRUB_FLOPPY_CPU_HEADER	1
 
-void grub_stop_floppy (void);
+#define GRUB_FLOPPY_REG_DIGITAL_OUTPUT		0x3f2
 
-void
+#ifndef ASM_FILE
+#include <grub/cpu/io.h>
+
+/* Stop the floppy drive from spinning, so that other software is
+   jumped to with a known state.  */
+static inline void
 grub_stop_floppy (void)
 {
+  grub_outb (0, GRUB_FLOPPY_REG_DIGITAL_OUTPUT);
 }
+#endif
+
+#endif
diff --git a/include/grub/i386/pc/init.h b/include/grub/i386/pc/init.h
index a6d2abf41..4005a1772 100644
--- a/include/grub/i386/pc/init.h
+++ b/include/grub/i386/pc/init.h
@@ -22,10 +22,9 @@
 #include <grub/types.h>
 #include <grub/symbol.h>
 #include <grub/machine/memory.h>
+#include <grub/cpu/floppy.h>
 
 /* Turn on/off Gate A20.  */
 void grub_gate_a20 (int on);
 
-void EXPORT_FUNC(grub_stop_floppy) (void);
-
 #endif /* ! GRUB_INIT_MACHINE_HEADER */
diff --git a/kern/i386/coreboot/init.c b/kern/i386/coreboot/init.c
index 5f80f28c1..9013d8f91 100644
--- a/kern/i386/coreboot/init.c
+++ b/kern/i386/coreboot/init.c
@@ -36,8 +36,6 @@
 #include <grub/cpu/kernel.h>
 #include <grub/cpu/tsc.h>
 
-#define GRUB_FLOPPY_REG_DIGITAL_OUTPUT		0x3f2
-
 extern char _start[];
 extern char _end[];
 
@@ -50,14 +48,6 @@ grub_get_rtc (void)
   grub_fatal ("grub_get_rtc() is not implemented.\n");
 }
 
-/* Stop the floppy drive from spinning, so that other software is
-   jumped to with a known state.  */
-void
-grub_stop_floppy (void)
-{
-  grub_outb (0, GRUB_FLOPPY_REG_DIGITAL_OUTPUT);
-}
-
 void
 grub_exit (void)
 {
diff --git a/kern/i386/loader.S b/kern/i386/loader.S
index ed57c43ca..9eb5af1f7 100644
--- a/kern/i386/loader.S
+++ b/kern/i386/loader.S
@@ -45,6 +45,8 @@
  *  This is the area for all of the special variables.
  */
 
+#include <grub/i386/floppy.h>
+
 	.p2align	2	/* force 4-byte alignment */
 
 /*
@@ -96,7 +98,9 @@ bzimage:
 
 	/* XXX new stack pointer in safe area for calling functions */
 	movl	$0x4000, %esp
-	call	EXT_C(grub_stop_floppy)
+	movw    $GRUB_FLOPPY_REG_DIGITAL_OUTPUT, %dx
+	xorb	%al, %al
+	outb	%al, %dx
 
 	/* final setup for linux boot */
 	call	prot_to_real

From 44f77f21d894176eaa6d02ef4c47f0db49b04536 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 10 Apr 2010 20:00:14 +0200
Subject: [PATCH 0775/1628] Remove misc.S from i386-pc sources

---
 conf/i386-pc.rmk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 6666e3a32..2eca82d25 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -40,7 +40,6 @@ cdboot_img_FORMAT = binary
 
 # For kernel.img.
 kernel_img_SOURCES = kern/i386/pc/startup.S \
-	kern/i386/misc.S \
 	kern/main.c kern/device.c \
 	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
 	kern/misc.c kern/mm.c kern/term.c \

From b7f3ac299db3208400d55bd46bd3dee4bdcad123 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 10 Apr 2010 20:28:25 +0200
Subject: [PATCH 0776/1628] 	* util/hostdisk.c
 (grub_util_biosdisk_get_grub_dev): Remove 	disk_info_msg (conflicts with
 gettexting into languages with cases).

---
 ChangeLog       | 5 +++++
 util/hostdisk.c | 6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f71c37ad0..91115c2ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Remove
+	disk_info_msg (conflicts with gettexting into languages with cases).
+
 2010-04-10  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	Add grub-probe support for NetBSD.
diff --git a/util/hostdisk.c b/util/hostdisk.c
index 8a412da55..79652625d 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -1166,11 +1166,9 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
     grub_disk_t disk;
     int fd;
 # if !defined(__NetBSD__)
-    const char *disk_info_msg = "geometry";
     struct hd_geometry hdg;
     typeof (hdg.start) p_offset;
 # else /* defined(__NetBSD__) */
-    const char *disk_info_msg = "label";
     struct disklabel label;
     int index;
     u_int32_t p_offset;
@@ -1223,7 +1221,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
     fd = open (os_dev, O_RDONLY);
     if (fd == -1)
       {
-	grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' while attempting to get disk %s", os_dev, disk_info_msg);
+	grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' while attempting to get disk geometry", os_dev);
 	free (name);
 	return 0;
       }
@@ -1236,7 +1234,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
 # endif /* !defined(__NetBSD__) */
       {
 	grub_error (GRUB_ERR_BAD_DEVICE,
-		    "cannot get disk %s of `%s'", disk_info_msg, os_dev);
+		    "cannot get disk geometry of `%s'", os_dev);
 	close (fd);
 	free (name);
 	return 0;

From 5d04b11e0ed03f89292b34edf9e44fa6403ce405 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 11 Apr 2010 01:14:31 +0200
Subject: [PATCH 0777/1628] 	Unify libgcc processing.

	* Makefile.in (kernel_img_LDFLAGS): New variable.
	* conf/common.rmk (kernel_img_HEADERS): Add libgcc.h.
	* conf/i386-coreboot.rmk (kernel_img_LDFLAGS): Append instead of
	overwriting.
	* conf/i386-ieee1275.rmk (kernel_img_LDFLAGS): Likewise.
	* conf/i386-pc.rmk (kernel_img_LDFLAGS): Likewise.
	* conf/i386-qemu.rmk (kernel_img_LDFLAGS): Likewise.
	* conf/x86-efi.rmk (kernel_img_LDFLAGS): Likewise.
	* conf/mips-qemu-mips.rmk (kernel_img_LDFLAGS): Append instead of
	overwriting. Remove -lgcc and -static-libgcc
	* conf/mips-yeeloong.rmk (kernel_img_LDFLAGS): Likewise.
	* conf/mips.rmk (kernel_img_HEADERS): Remove cpu/libgcc.h
	* conf/powerpc-ieee1275.rmk (kernel_img_HEADERS): Remove cpu/libgcc.h
	(kernel_img_LDFLAGS): Append instead of overwriting.
	Remove -lgcc and -static-libgcc
	* conf/sparc64-ieee1275.rmk: Likewise.
	* include/grub/powerpc/libgcc.h: Move to ...
	* include/grub/libgcc.h: .. this.
	* include/grub/libgcc.h: Don't export most of the function on x86.
	(__bswapsi2): New export.
	(__bswapdi2): Likewise.
	* include/grub/mips/libgcc.h: Removed.
	* include/grub/sparc64/libgcc.h: Likewise.
---
 ChangeLog                           | 28 +++++++++++++++++++++
 Makefile.in                         |  1 +
 conf/common.rmk                     |  2 +-
 conf/i386-coreboot.rmk              |  2 +-
 conf/i386-ieee1275.rmk              |  2 +-
 conf/i386-pc.rmk                    |  2 +-
 conf/i386-qemu.rmk                  |  2 +-
 conf/mips-qemu-mips.rmk             |  3 +--
 conf/mips-yeeloong.rmk              |  3 +--
 conf/mips.rmk                       |  2 +-
 conf/powerpc-ieee1275.rmk           |  5 ++--
 conf/sparc64-ieee1275.rmk           |  4 +--
 conf/x86-efi.rmk                    |  2 +-
 include/grub/{powerpc => }/libgcc.h | 26 ++++++++++++++------
 include/grub/mips/libgcc.h          | 38 -----------------------------
 include/grub/sparc64/libgcc.h       | 29 ----------------------
 16 files changed, 60 insertions(+), 91 deletions(-)
 rename include/grub/{powerpc => }/libgcc.h (86%)
 delete mode 100644 include/grub/mips/libgcc.h
 delete mode 100644 include/grub/sparc64/libgcc.h

diff --git a/ChangeLog b/ChangeLog
index 91115c2ce..ec4766d44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2010-04-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Unify libgcc processing.
+
+	* Makefile.in (kernel_img_LDFLAGS): New variable.
+	* conf/common.rmk (kernel_img_HEADERS): Add libgcc.h.
+	* conf/i386-coreboot.rmk (kernel_img_LDFLAGS): Append instead of
+	overwriting.
+	* conf/i386-ieee1275.rmk (kernel_img_LDFLAGS): Likewise.
+	* conf/i386-pc.rmk (kernel_img_LDFLAGS): Likewise.
+	* conf/i386-qemu.rmk (kernel_img_LDFLAGS): Likewise.
+	* conf/x86-efi.rmk (kernel_img_LDFLAGS): Likewise.
+	* conf/mips-qemu-mips.rmk (kernel_img_LDFLAGS): Append instead of
+	overwriting. Remove -lgcc and -static-libgcc
+	* conf/mips-yeeloong.rmk (kernel_img_LDFLAGS): Likewise.
+	* conf/mips.rmk (kernel_img_HEADERS): Remove cpu/libgcc.h
+	* conf/powerpc-ieee1275.rmk (kernel_img_HEADERS): Remove cpu/libgcc.h
+	(kernel_img_LDFLAGS): Append instead of overwriting.
+	Remove -lgcc and -static-libgcc
+	* conf/sparc64-ieee1275.rmk: Likewise.
+	* include/grub/powerpc/libgcc.h: Move to ...
+	* include/grub/libgcc.h: .. this.
+	* include/grub/libgcc.h: Don't export most of the function on x86.
+	(__bswapsi2): New export.
+	(__bswapdi2): Likewise.
+	* include/grub/mips/libgcc.h: Removed.
+	* include/grub/sparc64/libgcc.h: Likewise.
+
 2010-04-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Remove
diff --git a/Makefile.in b/Makefile.in
index 08c25971f..e253af6c9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -103,6 +103,7 @@ TARGET_IMG_LDSCRIPT = @TARGET_IMG_LDSCRIPT@
 TARGET_IMG_LDFLAGS = -nostdlib @TARGET_IMG_LDFLAGS@
 TARGET_IMG_CFLAGS = @TARGET_IMG_CFLAGS@
 TARGET_OBJ2ELF = @TARGET_OBJ2ELF@
+kernel_img_LDFLAGS = -static-libgcc -lgcc
 EXEEXT = @EXEEXT@
 OBJCOPY = @OBJCOPY@
 STRIP = @STRIP@
diff --git a/conf/common.rmk b/conf/common.rmk
index 952be558c..8df232a0b 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -116,7 +116,7 @@ DEFSYMFILES += kernel_syms.lst
 kernel_img_HEADERS += boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
 	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	list.h handler.h command.h i18n.h env_private.h
+	list.h handler.h command.h i18n.h env_private.h libgcc.h
 
 ifneq ($(platform), emu)
 kernel_img_HEADERS += machine/memory.h machine/loader.h machine/kernel.h
diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 3cef9313f..69b8e9a48 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -26,7 +26,7 @@ kernel_img_SOURCES = kern/i386/coreboot/startup.S \
 	symlist.c
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR),-Bstatic
+kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR),-Bstatic
 
 sbin_SCRIPTS += grub-install
 grub_install_SOURCES = util/grub-install.in
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index d4a459b3e..05ba38a65 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -27,7 +27,7 @@ kernel_img_SOURCES = kern/i386/ieee1275/startup.S \
 kernel_img_HEADERS += ieee1275/ieee1275.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x10000,-Bstatic
+kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x10000,-Bstatic
 
 # Scripts.
 sbin_SCRIPTS = grub-install
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index c52f6fa45..eace1e2da 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -58,7 +58,7 @@ kernel_img_HEADERS += machine/biosdisk.h machine/vga.h machine/vbe.h \
 	machine/pxe.h i386/pit.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
+kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
 kernel_img_FORMAT = binary
 
 # Utilities.
diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index 97273e1ce..664bef12a 100644
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -39,7 +39,7 @@ kernel_img_SOURCES = kern/i386/qemu/startup.S \
 	symlist.c
 kernel_img_CFLAGS = $(COMMON_CFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR)
+kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 kernel_img_FORMAT = binary
 
 sbin_SCRIPTS += grub-install
diff --git a/conf/mips-qemu-mips.rmk b/conf/mips-qemu-mips.rmk
index e06370122..af5b26bec 100644
--- a/conf/mips-qemu-mips.rmk
+++ b/conf/mips-qemu-mips.rmk
@@ -18,6 +18,5 @@ kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
 	symlist.c kern/$(target_cpu)/cache.S
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
-	-Wl,-N,-S,-Ttext,$(LINK_BASE),-Bstatic
+kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(LINK_BASE),-Bstatic
 kernel_img_FORMAT = binary
diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 35cd01b4b..6a96ddfaf 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -29,8 +29,7 @@ kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
 	symlist.c
 kernel_img_CFLAGS = $(COMMON_CFLAGS) -DUSE_ASCII_FAILBACK
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
-	-Wl,-N,-S,-Ttext,$(LINK_BASE),-Bstatic
+kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(LINK_BASE),-Bstatic
 kernel_img_FORMAT = binary
 
 # For ata.mod.
diff --git a/conf/mips.rmk b/conf/mips.rmk
index c9d94eb74..4603c219e 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -4,7 +4,7 @@
 COMMON_CFLAGS += -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
 
 # Images.
-kernel_img_HEADERS += cpu/libgcc.h cpu/cache.h
+kernel_img_HEADERS += cpu/cache.h
 
 # Scripts.
 sbin_SCRIPTS = 
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 86f6ddcb3..d5968ac8e 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -3,7 +3,7 @@
 
 # Images.
 
-kernel_img_HEADERS += cpu/libgcc.h ieee1275/ieee1275.h
+kernel_img_HEADERS += ieee1275/ieee1275.h
 
 # Programs
 pkglib_PROGRAMS = kernel.img
@@ -23,8 +23,7 @@ kernel_img_SOURCES = kern/powerpc/ieee1275/startup.S kern/ieee1275/cmain.c \
 	symlist.c kern/$(target_cpu)/cache.S
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
-	-Wl,-N,-S,-Ttext,0x200000,-Bstatic
+kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x200000,-Bstatic
 
 # Scripts.
 sbin_SCRIPTS = grub-install
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index a387b8a96..72f947f6a 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -19,7 +19,7 @@ diskboot_img_ASFLAGS = $(COMMON_ASFLAGS)
 diskboot_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-Ttext,0x4200
 diskboot_img_FORMAT = binary
 
-kernel_img_HEADERS += cpu/libgcc.h ieee1275/ieee1275.h cpu/ieee1275/ieee1275.h
+kernel_img_HEADERS += ieee1275/ieee1275.h cpu/ieee1275/ieee1275.h
 kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c	\
 	kern/ieee1275/ieee1275.c kern/main.c kern/device.c		\
 	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c		\
@@ -36,7 +36,7 @@ kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c	\
 	symlist.c kern/$(target_cpu)/cache.S
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = -nostdlib -Wl,-N,-Ttext,0x4400,-Bstatic,-melf64_sparc -static-libgcc -lgcc
+kernel_img_LDFLAGS += -nostdlib -Wl,-N,-Ttext,0x4400,-Bstatic,-melf64_sparc
 kernel_img_FORMAT = binary
 
 # Utilities.
diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index 5cb472168..46957d933 100644
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -40,7 +40,7 @@ endif
 kernel_img_HEADERS += efi/efi.h efi/time.h efi/disk.h i386/pit.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
+kernel_img_LDFLAGS += $(COMMON_LDFLAGS)
 
 # For acpi.mod.
 acpi_mod_SOURCES = commands/acpi.c commands/efi/acpi.c
diff --git a/include/grub/powerpc/libgcc.h b/include/grub/libgcc.h
similarity index 86%
rename from include/grub/powerpc/libgcc.h
rename to include/grub/libgcc.h
index 6be122308..d0adae8c1 100644
--- a/include/grub/powerpc/libgcc.h
+++ b/include/grub/libgcc.h
@@ -18,21 +18,31 @@
 
 #include <config.h>
 
-#ifdef HAVE___ASHLDI3
+/* On x86 these functions aren't really needed. Save some space.  */
+#if !defined (__i386__) && !defined (__x86_64__)
+# ifdef HAVE___ASHLDI3
 void EXPORT_FUNC (__ashldi3) (void);
-#endif
-#ifdef HAVE___ASHRDI3
+# endif
+# ifdef HAVE___ASHRDI3
 void EXPORT_FUNC (__ashrdi3) (void);
-#endif
-#ifdef HAVE___LSHRDI3
+# endif
+# ifdef HAVE___LSHRDI3
 void EXPORT_FUNC (__lshrdi3) (void);
+# endif
+# ifdef HAVE___UCMPDI2
+void EXPORT_FUNC (__ucmpdi2) (void);
+# endif
+# ifdef HAVE___BSWAPSI2
+void EXPORT_FUNC (__bswapsi2) (void);
+# endif
+# ifdef HAVE___BSWAPDI2
+void EXPORT_FUNC (__bswapdi2) (void);
+# endif
 #endif
+
 #ifdef HAVE___TRAMPOLINE_SETUP
 void EXPORT_FUNC (__trampoline_setup) (void);
 #endif
-#ifdef HAVE___UCMPDI2
-void EXPORT_FUNC (__ucmpdi2) (void);
-#endif
 
 #ifdef HAVE__RESTGPR_14_X
 void EXPORT_FUNC (_restgpr_14_x) (void);
diff --git a/include/grub/mips/libgcc.h b/include/grub/mips/libgcc.h
deleted file mode 100644
index f06ea1c1c..000000000
--- a/include/grub/mips/libgcc.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2004,2007,2009  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 <config.h>
-
-#ifdef HAVE___ASHLDI3
-void EXPORT_FUNC (__ashldi3) (void);
-#endif
-#ifdef HAVE___ASHRDI3
-void EXPORT_FUNC (__ashrdi3) (void);
-#endif
-#ifdef HAVE___LSHRDI3
-void EXPORT_FUNC (__lshrdi3) (void);
-#endif
-#ifdef HAVE___UCMPDI2
-void EXPORT_FUNC (__ucmpdi2) (void);
-#endif
-#ifdef HAVE___BSWAPSI2
-void EXPORT_FUNC (__bswapsi2) (void);
-#endif
-#ifdef HAVE___BSWAPDI2
-void EXPORT_FUNC (__bswapdi2) (void);
-#endif
diff --git a/include/grub/sparc64/libgcc.h b/include/grub/sparc64/libgcc.h
deleted file mode 100644
index e73abe29c..000000000
--- a/include/grub/sparc64/libgcc.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2004,2007,2009  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 <config.h>
-
-#ifdef HAVE___BSWAPSI2
-typedef int SItype __attribute__ ((mode (SI)));
-SItype EXPORT_FUNC (__bswapsi2) (SItype);
-#endif
-
-#ifdef HAVE___BSWAPDI2
-typedef int DItype __attribute__ ((mode (DI)));
-DItype EXPORT_FUNC (__bswapdi2) (DItype);
-#endif

From 01fcf061eadf54a618452be258d4896431c8bba7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 11 Apr 2010 16:14:51 +0200
Subject: [PATCH 0778/1628] 	* configure.ac: Respect grub_cv_asm_uscore
 when defining dummy symbols.

---
 ChangeLog    |  4 ++++
 configure.ac | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ec4766d44..61f1bc20e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Respect grub_cv_asm_uscore when defining dummy symbols.
+
 2010-04-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Unify libgcc processing.
diff --git a/configure.ac b/configure.ac
index afdb7b32d..66e06bc86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -479,12 +479,19 @@ CC="$TARGET_CC"
 if test "x$TARGET_APPLE_CC" = x1 ; then
 CFLAGS="$TARGET_CFLAGS -nostdlib -Wno-error"
 else
-CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100 -Wl,--defsym,abort=main -Wno-error"
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100 -Wno-error"
 fi
 CPPFLAGS="$TARGET_CPPFLAGS"
 LDFLAGS="$TARGET_LDFLAGS"
 LIBS=-lgcc
 
+grub_ASM_USCORE
+if test x$grub_cv_asm_uscore = xyes; then
+CFLAGS="$CFLAGS -Wl,--defsym,_abort=_main"
+else
+CFLAGS="$CFLAGS -Wl,--defsym,abort=main"
+fi
+
 # Check for libgcc symbols
 AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __trampoline_setup __ucmpdi2 _restgpr_14_x)
 
@@ -501,7 +508,6 @@ if test "x$TARGET_APPLE_CC" != x1 ; then
 grub_PROG_OBJCOPY_ABSOLUTE
 fi
 grub_PROG_LD_BUILD_ID_NONE
-grub_ASM_USCORE
 if test "x$target_cpu" = xi386; then
   if test ! -z "$TARGET_IMG_LDSCRIPT"; then
     # Check symbols provided by linker script.

From 4b0cd8f81387b5953e8d9f209d5f5d94e6baef2b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 11 Apr 2010 21:24:21 +0200
Subject: [PATCH 0779/1628] 	Fix cygwin compilation.

	* configure.ac: Define NEED_REGISTER_FRAME_INFO.
	* include/grub/misc.h (__register_frame_info)
	[NEED_REGISTER_FRAME_INFO && !UTIL]: New export.
	(__deregister_frame_info) [NEED_REGISTER_FRAME_INFO && !UTIL]: Likewise.
	* kern/misc.c (__register_frame_info)
	[NEED_REGISTER_FRAME_INFO && !UTIL]: New empty function.
	(__deregister_frame_info) [NEED_REGISTER_FRAME_INFO && !UTIL]: Likewise.
---
 ChangeLog           | 12 ++++++++++++
 configure.ac        |  6 +++++-
 include/grub/misc.h |  5 +++++
 kern/misc.c         |  9 +++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 61f1bc20e..d766bcd50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-04-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Fix cygwin compilation.
+
+	* configure.ac: Define NEED_REGISTER_FRAME_INFO.
+	* include/grub/misc.h (__register_frame_info)
+	[NEED_REGISTER_FRAME_INFO && !UTIL]: New export.
+	(__deregister_frame_info) [NEED_REGISTER_FRAME_INFO && !UTIL]: Likewise.
+	* kern/misc.c (__register_frame_info)
+	[NEED_REGISTER_FRAME_INFO && !UTIL]: New empty function.
+	(__deregister_frame_info) [NEED_REGISTER_FRAME_INFO && !UTIL]: Likewise.
+
 2010-04-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Respect grub_cv_asm_uscore when defining dummy symbols.
diff --git a/configure.ac b/configure.ac
index 66e06bc86..3116d6584 100644
--- a/configure.ac
+++ b/configure.ac
@@ -376,7 +376,11 @@ AC_SUBST(TARGET_IMG_CFLAGS)
 # For platforms where ELF is not the default link format.
 AC_MSG_CHECKING([for command to convert module to ELF format])
 case "${host_os}" in
-  cygwin) TARGET_OBJ2ELF='grub-pe2elf' ;;
+  cygwin) TARGET_OBJ2ELF='grub-pe2elf';
+# FIXME: put proper test here
+  AC_DEFINE([NEED_REGISTER_FRAME_INFO], 1,
+	    [Define to 1 if GCC generates calls to __register_frame_info()])
+  ;;
   *) ;;
 esac
 AC_SUBST(TARGET_OBJ2ELF)
diff --git a/include/grub/misc.h b/include/grub/misc.h
index 61174c38d..9bfc6974e 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -265,6 +265,11 @@ grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
 void EXPORT_FUNC(__enable_execute_stack) (void *addr);
 #endif
 
+#if defined (NEED_REGISTER_FRAME_INFO) && !defined(GRUB_UTIL)
+void EXPORT_FUNC (__register_frame_info) (void);
+void EXPORT_FUNC (__deregister_frame_info) (void);
+#endif
+
 /* Inline functions.  */
 
 static inline unsigned int
diff --git a/kern/misc.c b/kern/misc.c
index 9d8fc70da..ccc01d43f 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -1066,3 +1066,12 @@ void __enable_execute_stack (void *addr __attribute__ ((unused)))
 }
 #endif
 
+#if defined (NEED_REGISTER_FRAME_INFO) && !defined(GRUB_UTIL)
+void __register_frame_info (void)
+{
+}
+
+void __deregister_frame_info (void)
+{
+}
+#endif

From e16c2c65b9e79559eef968b82f384d9fa4afdcfc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 12 Apr 2010 10:32:45 +0200
Subject: [PATCH 0780/1628] React glacefully to in-middle out-of-memory. Fix
 few bugs.

---
 lib/relocator.c | 203 +++++++++++++++++++++++++++++-------------------
 1 file changed, 121 insertions(+), 82 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index 79a98e851..486b66700 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -22,8 +22,6 @@
 #include <grub/misc.h>
 #include <grub/cache.h>
 
-/* FIXME: check memory map.  */ 
-
 struct grub_relocator
 {
   struct grub_relocator_chunk *chunks;
@@ -185,21 +183,81 @@ allocate_inreg (grub_addr_t addr, grub_size_t size,
 	  foll->next = hb;
 	  hbp->next = foll;
 	  if (rb->first == hb)
-	    rb->first = foll;
+	    {
+	      rb->first = foll;
+	    }
 	}
     }
   else
     {
       if (foll)
-	foll->next = hb->next;
+	{
+	  foll->next = hb->next;
+	}
       else
 	foll = hb->next;
 	
       hbp->next = foll;
       if (rb->first == hb)
-	rb->first = foll;
+	{
+	  rb->first = foll;
+	}
       if (rb->first == hb)
-	rb->first = (void *) (rb + 1);
+	{
+	  rb->first = (void *) (rb + 1);
+	}
+    }
+}
+
+/* FIXME: remove extra blocks.  */
+static void
+free_subchunk (const struct grub_relocator_subchunk *subchu)
+{
+  switch (subchu->type)
+    {
+    case CHUNK_TYPE_REGION_START:
+      {
+	grub_mm_region_t r1, r2, *rp;
+	grub_mm_header_t h;
+	grub_size_t pre_size;
+	r1 = (grub_mm_region_t) ALIGN_UP (subchu->start + subchu->size,
+					  GRUB_MM_ALIGN);
+	r2 = (grub_mm_region_t) ALIGN_UP (subchu->host_start, GRUB_MM_ALIGN);
+	for (rp = &grub_mm_base; *rp && *rp != r2; rp = &((*rp)->next));
+	/* FIXME  */
+	if (!*rp)
+	  grub_fatal ("Anomaly in region alocations detected. "
+		      "Simultaneous relocators?");
+	pre_size = ALIGN_UP (subchu->host_start, GRUB_MM_ALIGN)
+	  - subchu->host_start;
+	r2->first = r1->first;
+	r2->next = r1->next;
+	r2->pre_size = pre_size;
+	r2->size = r1->size + (r2 - r1) * sizeof (*r2);
+	*rp = r1;
+	h = (grub_mm_header_t) (r1 + 1);
+	h->next = h;
+	h->magic = GRUB_MM_ALLOC_MAGIC;
+	h->size = (r2 - r1);
+	grub_free (h + 1);
+	break;
+      }
+    case CHUNK_TYPE_IN_REGION:
+      {
+	grub_mm_header_t h = (grub_mm_header_t) ALIGN_DOWN (subchu->start,
+							    GRUB_MM_ALIGN);
+	h->size = (subchu->start / GRUB_MM_ALIGN)
+	  - ((subchu->start + subchu->size + GRUB_MM_ALIGN - 1) / GRUB_MM_ALIGN);
+	h->next = h;
+	h->magic = GRUB_MM_ALLOC_MAGIC;
+	grub_free (h + 1);
+	break;
+      }
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+    case CHUNK_TYPE_FIRMWARE:
+      grub_relocator_firmware_free_region (subchu->start, subchu->size);
+      break;
+#endif
     }
 }
 
@@ -516,12 +574,24 @@ malloc_in_range (struct grub_relocator *rel,
 				       events[last_start].reg,
 				       events[last_start].regancestor,
 				       events[last_start].hancestor);
+		    {
+		      unsigned k;
+		      for (k = 0; k < N; k++)
+			if (events[k].hancestor == events[last_start].head)
+			  events[k].hancestor = events[last_start].hancestor;
+		    }
 		    break;
 		  case CHUNK_TYPE_IN_REGION:
 		    allocate_inreg (alloc_start, alloc_end - alloc_start,
 				    events[last_start].head,
 				    events[last_start].hancestor,
 				    events[last_start].reg);
+		    {
+		      unsigned k;
+		      for (k = 0; k < N; k++)
+			if (events[k].hancestor == events[last_start].head)
+			  events[k].hancestor = events[last_start].hancestor;
+		    }
 		    break;
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
 		  case CHUNK_TYPE_FIRMWARE:
@@ -529,9 +599,6 @@ malloc_in_range (struct grub_relocator *rel,
 		    if (!grub_relocator_firmware_alloc_region (alloc_start, 
 							       alloc_end - alloc_start))
 		      {
-			grub_dprintf ("relocator",
-				      "firmware allocation 0x%x-0x%x failed.\n",
-				      alloc_start, alloc_end);
 			if (from_low_priv)
 			  start = alloc_end;
 			else
@@ -559,7 +626,10 @@ malloc_in_range (struct grub_relocator *rel,
 
 	  case REG_BEG_END:
 	  case IN_REG_END:
-	    inreg = regbeg = 0;
+	    if (regbeg)
+	      regbeg--;
+	    else
+	      inreg--;
 	    break;
 
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
@@ -598,7 +668,7 @@ malloc_in_range (struct grub_relocator *rel,
       do
 	{
 	  if (!p)
-	    grub_fatal ("null in the ring %p %p\n", r, p);
+	    grub_fatal ("null in the ring %p\n", r);
 	  p = p->next;
 	}
       while (p != r->first);
@@ -607,9 +677,6 @@ malloc_in_range (struct grub_relocator *rel,
   /* Malloc is available again.  */
   grub_mm_base = base_saved;
 
-  /* FIXME: react on out of memory.  */
-  res->subchunks = grub_malloc (sizeof (res->subchunks[0]) * nallocs);
-  res->nsubchunks = nallocs;
 
   {
     int last_start = 0;
@@ -617,7 +684,13 @@ malloc_in_range (struct grub_relocator *rel,
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
     int fwin = 0, fwb = 0;
 #endif
-    int cural = 0;
+    unsigned cural = 0;
+    int oom = 0;
+    res->subchunks = grub_malloc (sizeof (res->subchunks[0]) * nallocs);
+    if (!res->subchunks)
+      oom = 1;
+    res->nsubchunks = nallocs;
+
     for (j = 0; j < N; j++)
       {
 	int typepre;
@@ -637,6 +710,10 @@ malloc_in_range (struct grub_relocator *rel,
 	if (j != 0 && events[j - 1].pos != events[j].pos)
 	  {
 	    grub_addr_t alloc_start, alloc_end;
+	    struct grub_relocator_subchunk tofree;
+	    struct grub_relocator_subchunk *curschu = &tofree;
+	    if (!oom)
+	      curschu = &res->subchunks[cural];
 	    alloc_start = max (events[j - 1].pos, target);
 	    alloc_end = min (events[j].pos, target + size);
 	    if (alloc_end > alloc_start)
@@ -644,26 +721,33 @@ malloc_in_range (struct grub_relocator *rel,
 		grub_dprintf ("relocator", "subchunk 0x%lx-0x%lx, %d\n",
 			      (unsigned long) alloc_start,
 			      (unsigned long) alloc_end, typepre);
-		res->subchunks[cural].type = typepre;
+		curschu->type = typepre;
 		if (typepre == CHUNK_TYPE_REGION_START)
-		  {
-		    res->subchunks[cural].host_start
-		      = (grub_addr_t) events[last_start].reg;
-		  }
+		  curschu->host_start = (grub_addr_t) events[last_start].reg;
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
-		if (typepre == CHUNK_TYPE_REGION_START
-		    || typepre == CHUNK_TYPE_FIRMWARE)
+		if (!oom && (typepre == CHUNK_TYPE_REGION_START
+			     || typepre == CHUNK_TYPE_FIRMWARE))
 		  {
-		    /* FIXME: react on out of memory.  */
 		    struct grub_relocator_extra_block *ne;
 		    ne = grub_malloc (sizeof (*ne));
-		    ne->start = alloc_start;
-		    ne->end = alloc_end;
-		    ne->next = extra_blocks;
-		    extra_blocks = ne;
+		    if (!ne)
+		      {
+			oom = 1;
+			grub_memcpy (&tofree, curschu, sizeof (tofree));
+		      }
+		    else
+		      {
+			ne->start = alloc_start;
+			ne->end = alloc_end;
+			ne->next = extra_blocks;
+			extra_blocks = ne;
+		      }
 		  }
 #endif
-		cural++;
+		if (!oom)
+		  cural++;
+		else
+		  free_subchunk (&tofree);
 	      }
 	  }
 	  
@@ -708,7 +792,14 @@ malloc_in_range (struct grub_relocator *rel,
 	    ncol--;
 	    break;
 	  }
-
+      }
+    if (oom)
+      {
+	for (i = 0; i < cural; i++)
+	  free_subchunk (&res->subchunks[i]);
+	grub_free (res->subchunks);
+	grub_dprintf ("relocator", "allocation failed with out-of-memory\n");
+	return 0;
       }
   }
 
@@ -949,7 +1040,6 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
   return GRUB_ERR_NONE;
 }
 
-/* FIXME: remove extra blocks.  */
 void
 grub_relocator_unload (struct grub_relocator *rel)
 {
@@ -960,58 +1050,7 @@ grub_relocator_unload (struct grub_relocator *rel)
     {
       unsigned i;
       for (i = 0; i < chunk->nsubchunks; i++) 
-	switch (chunk->subchunks[i].type)
-	  {
-	  case CHUNK_TYPE_REGION_START:
-	    {
-	      grub_mm_region_t r1, r2, *rp;
-	      grub_mm_header_t h;
-	      grub_size_t pre_size;
-	      r1 = (grub_mm_region_t) ALIGN_UP (chunk->subchunks[i].start 
-						+ chunk->subchunks[i].size,
-						GRUB_MM_ALIGN);
-	      r2 = (grub_mm_region_t) ALIGN_UP (chunk->subchunks[i].host_start,
-						GRUB_MM_ALIGN);
-	      for (rp = &grub_mm_base; *rp && *rp != r2; rp = &((*rp)->next));
-	      /* FIXME  */
-	      if (!*rp)
-		grub_fatal ("Anomaly in region alocations detected. "
-			    "Simultaneous relocators?");
-	      pre_size = ALIGN_UP (chunk->subchunks[i].host_start, 
-				   GRUB_MM_ALIGN)
-		- chunk->subchunks[i].host_start;
-	      r2->first = r1->first;
-	      r2->next = r1->next;
-	      r2->pre_size = pre_size;
-	      r2->size = r1->size + (r2 - r1) * sizeof (*r2);
-	      *rp = r1;
-	      h = (grub_mm_header_t) (r1 + 1);
-	      h->next = h;
-	      h->magic = GRUB_MM_ALLOC_MAGIC;
-	      h->size = (r2 - r1);
-	      grub_free (h + 1);
-	      break;
-	    }
-	  case CHUNK_TYPE_IN_REGION:
-	    {
-	      grub_mm_header_t h 
-		= (grub_mm_header_t) ALIGN_DOWN (chunk->subchunks[i].start,
-						 GRUB_MM_ALIGN);
-	      h->size = (chunk->subchunks[i].start / GRUB_MM_ALIGN)
-		- ((chunk->subchunks[i].start + chunk->subchunks[i].size 
-		    + GRUB_MM_ALIGN - 1) / GRUB_MM_ALIGN);
-	      h->next = h;
-	      h->magic = GRUB_MM_ALLOC_MAGIC;
-	      grub_free (h + 1);
-	      break;
-	    }
-#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
-	  case CHUNK_TYPE_FIRMWARE:
-	    grub_relocator_firmware_free_region (chunk->subchunks[i].start,
-						 chunk->subchunks[i].size);
-	    break;
-#endif
-	  }
+	free_subchunk (&chunk->subchunks[i]);
       next = chunk->next;
       grub_free (chunk->subchunks);
       grub_free (chunk);

From 68eb58e95597f99da4819972a1527865800d70f4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 12 Apr 2010 12:40:09 +0200
Subject: [PATCH 0781/1628] Add a TODO comment

---
 lib/relocator.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/relocator.c b/lib/relocator.c
index 486b66700..93a88b889 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -574,6 +574,7 @@ malloc_in_range (struct grub_relocator *rel,
 				       events[last_start].reg,
 				       events[last_start].regancestor,
 				       events[last_start].hancestor);
+		    /* TODO: maintain a reverse lookup tree for hancestor.  */
 		    {
 		      unsigned k;
 		      for (k = 0; k < N; k++)

From b02c7c8fb57a92cd04a84d32bb67c6142980f144 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 12 Apr 2010 21:33:03 +0530
Subject: [PATCH 0782/1628] added getopt like error for missing option
 parameters

---
 util/grub-install.in                   | 27 ++++++++++++++++++--------
 util/grub-mkconfig.in                  | 19 +++++++++++++++---
 util/grub-mkrescue.in                  | 19 ++++++++++++++----
 util/grub-reboot.in                    | 13 ++++++++++++-
 util/grub-set-default.in               | 13 ++++++++++++-
 util/i386/efi/grub-install.in          | 21 +++++++++++++++-----
 util/ieee1275/grub-install.in          | 21 +++++++++++++++-----
 util/powerpc/ieee1275/grub-mkrescue.in | 17 +++++++++++++---
 8 files changed, 120 insertions(+), 30 deletions(-)

diff --git a/util/grub-install.in b/util/grub-install.in
index 7b9c04913..e5ed9dcd5 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -105,6 +105,17 @@ Report bugs to <bug-grub@gnu.org>.
 EOF
 }
 
+argument () {
+  opt=$1
+  shift
+
+  if test $# -eq 0; then
+      echo "$0: option requires an argument -- '$opt'" 1>&2
+      exit 1
+  fi
+  echo $1
+}
+
 # Check the arguments.
 while test $# -gt 0
 do
@@ -120,37 +131,37 @@ do
 	exit 0 ;;
 
     --modules)
-	modules=$1; shift;;
+	modules=`argument $option "$@"`; shift;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
 
     --font)
-	font=$1; shift;;
+	font=`argument $option "$@"`; shift;;
     --font=*)
 	font=`echo "$option" | sed 's/--font=//'` ;;
 
     --root-directory)
-	rootdir=$1; shift;;
+	rootdir=`argument $option "$@"`; shift;;
     --root-directory=*)
 	rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
 
     --grub-setup)
-	grub_setup=$1; shift;;
+	grub_setup=`argument $option "$@"`; shift;;
     --grub-setup=*)
 	grub_setup=`echo "$option" | sed 's/--grub-setup=//'` ;;
 
     --grub-mkimage)
-	grub_mkimage=$1; shift;;
+	grub_mkimage=`argument $option "$@"`; shift;;
     --grub-mkimage=*)
 	grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
 
     --grub-mkdevicemap)
-	grub_mkdevicemap=$1; shift;;
+	grub_mkdevicemap=`argument $option "$@"`; shift;;
     --grub-mkdevicemap=*)
 	grub_mkdevicemap=`echo "$option" | sed 's/--grub-mkdevicemap=//'` ;;
 
     --grub-probe)
-	grub_probe=$1; shift;;
+	grub_probe=`argument $option "$@"`; shift;;
     --grub-probe=*)
 	grub_probe=`echo "$option" | sed 's/--grub-probe=//'` ;;
 
@@ -161,7 +172,7 @@ do
 
     --disk-module)
 	if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
-	    disk_module=$1; shift;
+	    disk_module=`argument $option "$@"`; shift;
 	fi ;;
     --disk-module=*)
 	if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 82964836b..c3aa57723 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -49,6 +49,17 @@ Report bugs to <bug-grub@gnu.org>.
 EOF
 }
 
+argument () {
+  opt=$1
+  shift
+
+  if test $# -eq 0; then
+      echo "$0: option requires an argument -- '$opt'" 1>&2
+      exit 1
+  fi
+  echo $1
+}
+
 # Check the arguments.
 while test $# -gt 0
 do
@@ -63,9 +74,7 @@ do
 	echo "$0 (GNU GRUB ${package_version})"
 	exit 0 ;;
     -o | --output)
-	grub_cfg=$1
-	shift
-	;;
+	grub_cfg=`argument $option "$@"`; shift;;
     --output=*)
 	grub_cfg=`echo "$option" | sed 's/--output=//'`
 	;;
@@ -74,6 +83,10 @@ do
 	usage
 	exit 1
 	;;
+    *)
+	echo "Invalid parameter, $option" 1>&2
+	exit 1
+	;;
     esac
 done
 
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 64ccd6ae8..ffb987718 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -51,6 +51,17 @@ Report bugs to <bug-grub@gnu.org>.
 EOF
 }
 
+argument () {
+  opt=$1
+  shift
+
+  if test $# -eq 0; then
+      echo "$0: option requires an argument -- '$opt'" 1>&2
+      exit 1
+  fi
+  echo $1
+}
+
 # Check the arguments.
 while test $# -gt 0
 do
@@ -66,18 +77,18 @@ do
 	exit 0 ;;
 
     --modules)
-        modules=$1; shift ;;
+        modules=`argument $option "$@"`; shift ;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
 
     -o | --output)
-	output_image=$1; shift ;;
+	output_image=`argument $option "$@"`; shift ;;
     --output=*)
 	output_image=`echo "$option" | sed 's/--output=//'` ;;
 
     # Intentionally undocumented
     --override-directory)
-        override_dir=$1
+        override_dir=`argument $option "$@"`
 	shift
 	PATH=${override_dir}:$PATH
 	export PATH
@@ -93,7 +104,7 @@ do
 	exit 1
 	;;
     *)
-	source="${source} ${option}" ;;
+	source="${source} ${option} $@"; break ;;
     esac
 done
 
diff --git a/util/grub-reboot.in b/util/grub-reboot.in
index eb7073e02..48e3ae243 100644
--- a/util/grub-reboot.in
+++ b/util/grub-reboot.in
@@ -44,6 +44,17 @@ Report bugs to <bug-grub@gnu.org>.
 EOF
 }
 
+argument () {
+  opt=$1
+  shift
+
+  if test $# -eq 0; then
+      echo "$0: option requires an argument -- '$opt'" 1>&2
+      exit 1
+  fi
+  echo $1
+}
+
 # Check the arguments.
 while test $# -gt 0
 do
@@ -59,7 +70,7 @@ do
 	exit 0 ;;
 
     --root-directory)
-	rootdir=$1; shift ;;
+	rootdir=`argument $option "$@"`; shift ;;
     --root-directory=*)
 	rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
 
diff --git a/util/grub-set-default.in b/util/grub-set-default.in
index 2636543c3..a4739f95f 100644
--- a/util/grub-set-default.in
+++ b/util/grub-set-default.in
@@ -44,6 +44,17 @@ Report bugs to <bug-grub@gnu.org>.
 EOF
 }
 
+argument () {
+  opt=$1
+  shift
+
+  if test $# -eq 0; then
+      echo "$0: option requires an argument -- '$opt'" 1>&2
+      exit 1
+  fi
+  echo $1
+}
+
 # Check the arguments.
 while test $# -gt 0
 do
@@ -59,7 +70,7 @@ do
 	exit 0 ;;
 
     --root-directory)
-	rootdir=$1; shift ;;
+	rootdir=`argument $option "$@"`; shift ;;
     --root-directory=*)
 	rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
 
diff --git a/util/i386/efi/grub-install.in b/util/i386/efi/grub-install.in
index 097519d50..54c190678 100644
--- a/util/i386/efi/grub-install.in
+++ b/util/i386/efi/grub-install.in
@@ -71,6 +71,17 @@ Report bugs to <bug-grub@gnu.org>.
 EOF
 }
 
+argument () {
+  opt=$1
+  shift
+
+  if test $# -eq 0; then
+      echo "$0: option requires an argument -- '$opt'" 1>&2
+      exit 1
+  fi
+  echo $1
+}
+
 # Check the arguments.
 while test $# -gt 0
 do
@@ -86,27 +97,27 @@ do
 	exit 0 ;;
 
     --modules)
-        modules=$1; shift ;;
+        modules=`argument $option "$@"`; shift ;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
 
     --root-directory)
-	rootdir=$1; shift ;;
+	rootdir=`argument $option "$@"`; shift ;;
     --root-directory=*)
 	rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
 
     --grub-mkimage)
-	grub_mkimage=$1; shift ;;
+	grub_mkimage=`argument $option "$@"`; shift ;;
     --grub-mkimage=*)
 	grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
 
     --grub-mkdevicemap)
-	grub_mkdevicemap=$1; shift ;;
+	grub_mkdevicemap=`argument $option "$@"`; shift ;;
     --grub-mkdevicemap=*)
 	grub_mkdevicemap=`echo "$option" | sed 's/--grub-mkdevicemap=//'` ;;
 
     --grub-probe)
-	grub_probe=$1; shift ;;
+	grub_probe=`argument $option "$@"`; shift ;;
     --grub-probe=*)
 	grub_probe=`echo "$option" | sed 's/--grub-probe=//'` ;;
 
diff --git a/util/ieee1275/grub-install.in b/util/ieee1275/grub-install.in
index 4a5403c18..dde275c2a 100644
--- a/util/ieee1275/grub-install.in
+++ b/util/ieee1275/grub-install.in
@@ -74,6 +74,17 @@ Report bugs to <bug-grub@gnu.org>.
 EOF
 }
 
+argument () {
+  opt=$1
+  shift
+
+  if test $# -eq 0; then
+      echo "$0: option requires an argument -- '$opt'" 1>&2
+      exit 1
+  fi
+  echo $1
+}
+
 # Check the arguments.
 while test $# -gt 0
 do
@@ -89,27 +100,27 @@ do
 	exit 0 ;;
 
     --modules)
-	modules=$1; shift ;;
+	modules=`argument $option "$@"`; shift ;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
 
     --root-directory)
-	rootdir=$1; shift ;;
+	rootdir=`argument $option "$@"`; shift ;;
     --root-directory=*)
 	rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
 
     --grub-mkdevicemap)
-	grub_mkdevicemap=$1; shift ;;
+	grub_mkdevicemap=`argument $option "$@"`; shift ;;
     --grub-mkdevicemap=*)
 	grub_mkdevicemap=`echo "$option" | sed 's/--grub-mkdevicemap=//'` ;;
 
     --grub-mkimage)
-	grub_mkimage=$1; shift ;;
+	grub_mkimage=`argument $option "$@"`; shift ;;
     --grub-mkimage=*)
 	grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
 
     --grub-probe)
-	grub_probe=$1; shift ;;
+	grub_probe=`argument $option "$@"`; shift ;;
     --grub-probe=*)
 	grub_probe=`echo "$option" | sed 's/--grub-probe=//'` ;;
 
diff --git a/util/powerpc/ieee1275/grub-mkrescue.in b/util/powerpc/ieee1275/grub-mkrescue.in
index 375adb0cb..1adc149ae 100644
--- a/util/powerpc/ieee1275/grub-mkrescue.in
+++ b/util/powerpc/ieee1275/grub-mkrescue.in
@@ -52,6 +52,17 @@ Report bugs to <bug-grub@gnu.org>.
 EOF
 }
 
+argument () {
+  opt=$1
+  shift
+
+  if test $# -eq 0; then
+      echo "$0: option requires an argument -- '$opt'" 1>&2
+      exit 1
+  fi
+  echo $1
+}
+
 input_dir=${pkglibdir}
 
 # Check the arguments.
@@ -69,17 +80,17 @@ do
 	exit 0 ;;
 
     --modules)
-	modules=$1; shift ;;
+	modules=`argument $option "$@"`; shift ;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
 
     --pkglibdir)
-	input_dir=$1; shift ;;
+	input_dir=`argument $option "$@"`; shift ;;
     --pkglibdir=*)
 	input_dir=`echo "$option" | sed 's/--pkglibdir=//'` ;;
 
     --grub-mkimage)
-	grub_mkimage=$1; shift ;;
+	grub_mkimage=`argument $option "$@"`; shift ;;
     --grub-mkimage=*)
 	grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
 

From ce44826e79a92aaf21e19580d0580d29121d2260 Mon Sep 17 00:00:00 2001
From: Carles Pina i Estany <carles@pina.cat>
Date: Tue, 13 Apr 2010 13:57:56 +0100
Subject: [PATCH 0783/1628] Enclose all translated strings in grub.cfg in
 single quotes, and escape them appropriately (Ubuntu bug #552921). *
 util/grub-mkconfig_lib.in (gettext_quoted): New function. *
 util/grub.d/10_hurd.in: Use it. * util/grub.d/10_kfreebsd.in
 (kfreebsd_entry): Likewise. * util/grub.d/10_linux.in (linux_entry):
 Likewise. 	Also-By: Colin Watson <cjwatson@ubuntu.com>

---
 ChangeLog                  | 11 +++++++++++
 util/grub-mkconfig_lib.in  |  4 ++++
 util/grub.d/10_hurd.in     |  8 ++++----
 util/grub.d/10_kfreebsd.in |  6 +++---
 util/grub.d/10_linux.in    | 10 +++++-----
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d766bcd50..4be24c1b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-04-13  Carles Pina i Estany  <carles@pina.cat>
+2010-04-13  Colin Watson  <cjwatson@ubuntu.com>
+
+	Enclose all translated strings in grub.cfg in single quotes, and
+	escape them appropriately (Ubuntu bug #552921).
+
+	* util/grub-mkconfig_lib.in (gettext_quoted): New function.
+	* util/grub.d/10_hurd.in: Use it.
+	* util/grub.d/10_kfreebsd.in (kfreebsd_entry): Likewise.
+	* util/grub.d/10_linux.in (linux_entry): Likewise.
+
 2010-04-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix cygwin compilation.
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index bcd6baffb..a4151348c 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -188,3 +188,7 @@ version_find_latest ()
   done
   echo "$a"
 }
+
+gettext_quoted () {
+  gettext "$@" | sed "s/'/'\\\\''/g"
+}
diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index 5dbb11f22..8e16e7d9f 100644
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -76,13 +76,13 @@ menuentry "${OS}" ${CLASS} {
 EOF
 prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
 cat << EOF
-	echo		$(gettext "Loading GNU Mach ...")
+	echo		'$(gettext_quoted "Loading GNU Mach ...")'
 	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/}
 EOF
 save_default_entry | sed -e "s/^/\t/"
 prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
 cat << EOF
-	echo		$(gettext "Loading the Hurd ...")
+	echo		'$(gettext_quoted "Loading the Hurd ...")'
 	module		/hurd/${hurd_fs}.static ${hurd_fs} --readonly \\
 			--multiboot-command-line='\${kernel-command-line}' \\
 			--host-priv-port='\${host-port}' \\
@@ -98,13 +98,13 @@ menuentry "${OS} (recovery mode)" {
 EOF
 prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
 cat << EOF
-	echo		$(gettext "Loading GNU Mach ...")
+	echo		'$(gettext_quoted "Loading GNU Mach ...")'
 	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/} -s
 EOF
 save_default_entry | sed -e "s/^/\t/"
 prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
 cat << EOF
-	echo		$(gettext "Loading the Hurd ...")
+	echo		'$(gettext_quoted "Loading the Hurd ...")'
 	module		/hurd/${hurd_fs}.static ${hurd_fs} \\
 			--multiboot-command-line='\${kernel-command-line}' \\
 			--host-priv-port='\${host-port}' \\
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index 43651c82b..5ab546282 100644
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -44,15 +44,15 @@ kfreebsd_entry ()
   version="$2"
   recovery="$3"	# not used yet
   args="$4"	# not used yet
-  title="$(gettext "%s, with kFreeBSD %s")"
-  printf "menuentry \"${title}\" ${CLASS} {\n" "${os}" "${version}"
+  title="$(gettext_quoted "%s, with kFreeBSD %s")"
+  printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}"
   save_default_entry | sed -e "s/^/\t/"
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi
   printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
-	echo			$(printf "$(gettext "Loading kernel of FreeBSD %s ...")" ${version})
+	echo			'$(printf "$(gettext_quoted "Loading kernel of FreeBSD %s ...")" ${version})'
 	kfreebsd		${rel_dirname}/${basename}
 EOF
 
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 8dc0df5d9..e691cae86 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -56,11 +56,11 @@ linux_entry ()
   recovery="$3"
   args="$4"
   if ${recovery} ; then
-    title="$(gettext "%s, with Linux %s (recovery mode)")"
+    title="$(gettext_quoted "%s, with Linux %s (recovery mode)")"
   else
-    title="$(gettext "%s, with Linux %s")"
+    title="$(gettext_quoted "%s, with Linux %s")"
   fi
-  printf "menuentry \"${title}\" ${CLASS} {\n" "${os}" "${version}"
+  printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}"
   save_default_entry | sed -e "s/^/\t/"
 
   # Use ELILO's generic "efifb" when it's known to be available.
@@ -83,12 +83,12 @@ EOF
   fi
   printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
-	echo	$(printf "$(gettext "Loading Linux %s ...")" ${version})
+	echo	'$(printf "$(gettext_quoted "Loading Linux %s ...")" ${version})'
 	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
 EOF
   if test -n "${initrd}" ; then
     cat << EOF
-	echo	$(gettext "Loading initial ramdisk ...")
+	echo	'$(gettext_quoted "Loading initial ramdisk ...")'
 	initrd	${rel_dirname}/${initrd}
 EOF
   fi

From 4e6da157dd218f4d4c262e875d0b7fd55b8048ae Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 13 Apr 2010 20:58:12 +0530
Subject: [PATCH 0784/1628] fix and testcase for \$ in grub script dquote
 strings

---
 conf/tests.rmk |  5 ++++-
 script/yylex.l | 11 ++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/conf/tests.rmk b/conf/tests.rmk
index 11e5f2a1a..d48bc3dd9 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -65,6 +65,9 @@ grub_script_blanklines_SOURCES = tests/grub_script_blanklines.in
 check_SCRIPTS += grub_script_final_semicolon
 grub_script_final_semicolon_SOURCES = tests/grub_script_final_semicolon.in
 
+check_SCRIPTS += grub_script_dollar
+grub_script_dollar_SOURCES = tests/grub_script_dollar.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -79,7 +82,7 @@ SCRIPTED_TESTS += grub_script_while1
 SCRIPTED_TESTS += grub_script_if
 SCRIPTED_TESTS += grub_script_blanklines
 SCRIPTED_TESTS += grub_script_final_semicolon
-
+SCRIPTED_TESTS += grub_script_dollar
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/script/yylex.l b/script/yylex.l
index 0cf33c951..29aa5c2e3 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -211,7 +211,7 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
                   ARG (GRUB_SCRIPT_ARG_TYPE_TEXT);
                 }
   \\            |
-  [^\"\'$\\]+   { COPY (yytext, yyleng); }
+  [^\"\'\$\\]+  { COPY (yytext, yyleng); }
   <<EOF>>       {
                   yy_pop_state (yyscanner);
                   yypop_buffer_state (yyscanner);
@@ -254,6 +254,11 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
 }
 
 <DQUOTE>{
+  \\\$          { COPY ("$", 1); }
+  \\\\          { COPY ("\\", 1); }
+  \\\"          { COPY ("\"", 1); }
+  \\\n          { /* ignore */ }
+  [^\"\$\\\n]+  { COPY (yytext, yyleng); }
   \"            {
                   yy_pop_state (yyscanner);
                   ARG (GRUB_SCRIPT_ARG_TYPE_DQSTR);
@@ -262,10 +267,6 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
                   yy_push_state (VAR, yyscanner);
                   ARG (GRUB_SCRIPT_ARG_TYPE_DQSTR);
                 }
-  \\\\          { COPY ("\\", 1); }
-  \\\"          { COPY ("\"", 1); }
-  \\\n          { /* ignore */ }
-  [^\"$\\\n]+   { COPY (yytext, yyleng); }
   (.|\n)        { COPY (yytext, yyleng); }
 }
 

From ae45b7bad4a382479344d7d06d97a9132f75ab9c Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 13 Apr 2010 21:01:56 +0530
Subject: [PATCH 0785/1628] add missing testcase

---
 tests/grub_script_dollar.in | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 tests/grub_script_dollar.in

diff --git a/tests/grub_script_dollar.in b/tests/grub_script_dollar.in
new file mode 100644
index 000000000..3819b8bc9
--- /dev/null
+++ b/tests/grub_script_dollar.in
@@ -0,0 +1,5 @@
+#! /bin/sh -e
+
+@builddir@/grub-script-check << EOF
+echo "\\\$"
+EOF

From d371a6313d881c0f18415c4d750fcabaee7a6268 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 13 Apr 2010 21:43:17 +0200
Subject: [PATCH 0786/1628] Fixed unloading payload

---
 lib/relocator.c | 104 ++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 84 insertions(+), 20 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index 93a88b889..4f37fb435 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -41,6 +41,7 @@ struct grub_relocator_subchunk
   grub_addr_t host_start;
   grub_addr_t start;
   grub_size_t size;
+  struct grub_relocator_extra_block *extra;
 };
 
 struct grub_relocator_chunk
@@ -56,6 +57,7 @@ struct grub_relocator_chunk
 struct grub_relocator_extra_block
 {
   struct grub_relocator_extra_block *next;
+  struct grub_relocator_extra_block **prev;
   grub_addr_t start;
   grub_addr_t end;
 };
@@ -209,7 +211,6 @@ allocate_inreg (grub_addr_t addr, grub_size_t size,
     }
 }
 
-/* FIXME: remove extra blocks.  */
 static void
 free_subchunk (const struct grub_relocator_subchunk *subchu)
 {
@@ -220,34 +221,89 @@ free_subchunk (const struct grub_relocator_subchunk *subchu)
 	grub_mm_region_t r1, r2, *rp;
 	grub_mm_header_t h;
 	grub_size_t pre_size;
-	r1 = (grub_mm_region_t) ALIGN_UP (subchu->start + subchu->size,
+	r1 = (grub_mm_region_t) ALIGN_UP (subchu->host_start, GRUB_MM_ALIGN);
+	r2 = (grub_mm_region_t) ALIGN_UP (subchu->start + subchu->size,
 					  GRUB_MM_ALIGN);
-	r2 = (grub_mm_region_t) ALIGN_UP (subchu->host_start, GRUB_MM_ALIGN);
 	for (rp = &grub_mm_base; *rp && *rp != r2; rp = &((*rp)->next));
-	/* FIXME  */
-	if (!*rp)
-	  grub_fatal ("Anomaly in region alocations detected. "
-		      "Simultaneous relocators?");
 	pre_size = ALIGN_UP (subchu->host_start, GRUB_MM_ALIGN)
 	  - subchu->host_start;
-	r2->first = r1->first;
-	r2->next = r1->next;
-	r2->pre_size = pre_size;
-	r2->size = r1->size + (r2 - r1) * sizeof (*r2);
-	*rp = r1;
-	h = (grub_mm_header_t) (r1 + 1);
-	h->next = h;
-	h->magic = GRUB_MM_ALLOC_MAGIC;
-	h->size = (r2 - r1);
-	grub_free (h + 1);
+
+	if (*rp)
+	  {
+	    grub_mm_header_t h2, *hp;
+	    r1->first = r2->first;
+	    r1->next = r2->next;
+	    r1->pre_size = pre_size;
+	    r1->size = r2->size + (r2 - r1) * sizeof (*r2);
+	    *rp = r1;
+	    h = (grub_mm_header_t) (r1 + 1);
+	    h->next = r2->first;
+	    h->magic = GRUB_MM_FREE_MAGIC;
+	    h->size = (r2 - r1 - 1);
+	    for (hp = &r2->first, h2 = *hp; h2->next != r2->first;
+		 hp = &(h2->next), h2 = *hp)
+	      if (h2 == (grub_mm_header_t) (r2 + 1))
+		break;
+	    if (h2 == (grub_mm_header_t) (r2 + 1))
+	      {
+		h->size = h2->size + (h2 - h);
+		h->next = h2->next;
+		*hp = h;
+		if (hp == &r2->first)
+		  {
+		    for (h2 = r2->first; h2->next != r2->first; h2 = h2->next);
+		    h2->next = h;
+		  }
+	      }
+	    else
+	      {
+		h2->next = h;
+	      }
+	  }
+	else
+	  {
+	    r1->pre_size = pre_size;
+	    r1->size = (r2 - r1) * sizeof (*r2);
+	    /* Find where to insert this region.
+	       Put a smaller one before bigger ones,
+	       to prevent fragmentation.  */
+	    for (rp = &grub_mm_base; *rp; rp = &((*rp)->next))
+	      if ((*rp)->size > r1->size)
+		break;
+	    r1->next = *rp;
+	    *rp = r1->next;
+	    h = (grub_mm_header_t) (r1 + 1);
+	    r1->first = h;
+	    h->next = h;
+	    h->magic = GRUB_MM_FREE_MAGIC;
+	    h->size = (r2 - r1 - 1);
+	  }
+	for (r2 = grub_mm_base; r2; r2 = r2->next)
+	  if ((grub_addr_t) r2 + r2->size == (grub_addr_t) r1)
+	    break;
+	if (r2)
+	  {
+	    grub_mm_header_t hl2, hl, g;
+	    g = (grub_mm_header_t) ((grub_addr_t) r2 + r2->size);
+	    g->size = (grub_mm_header_t) r1 - g;
+	    r2->size += r1->size;
+	    for (hl = r2->first; hl->next != r2->first; hl = hl->next);
+	    for (hl2 = r1->first; hl2->next != r1->first; hl2 = hl2->next);
+	    hl2->next = r2->first;
+	    r2->first = r1->first;
+	    hl->next = r2->first;
+	    *rp = (*rp)->next;
+	    grub_free (g + 1);
+	  }
 	break;
       }
     case CHUNK_TYPE_IN_REGION:
       {
 	grub_mm_header_t h = (grub_mm_header_t) ALIGN_DOWN (subchu->start,
 							    GRUB_MM_ALIGN);
-	h->size = (subchu->start / GRUB_MM_ALIGN)
-	  - ((subchu->start + subchu->size + GRUB_MM_ALIGN - 1) / GRUB_MM_ALIGN);
+	h->size
+	  = ((subchu->start + subchu->size + GRUB_MM_ALIGN - 1) / GRUB_MM_ALIGN)
+	  - (subchu->start / GRUB_MM_ALIGN);
 	h->next = h;
 	h->magic = GRUB_MM_ALLOC_MAGIC;
 	grub_free (h + 1);
@@ -256,9 +312,11 @@ free_subchunk (const struct grub_relocator_subchunk *subchu)
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
     case CHUNK_TYPE_FIRMWARE:
       grub_relocator_firmware_free_region (subchu->start, subchu->size);
+      *curschu->extra->prev = curschu->extra->next;
+      grub_free (curschu->extra);
       break;
 #endif
-    }
+    }  
 }
 
 static int
@@ -723,6 +781,8 @@ malloc_in_range (struct grub_relocator *rel,
 			      (unsigned long) alloc_start,
 			      (unsigned long) alloc_end, typepre);
 		curschu->type = typepre;
+		curschu->start = alloc_start;
+		curschu->size = alloc_end - alloc_start;
 		if (typepre == CHUNK_TYPE_REGION_START)
 		  curschu->host_start = (grub_addr_t) events[last_start].reg;
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
@@ -741,7 +801,10 @@ malloc_in_range (struct grub_relocator *rel,
 			ne->start = alloc_start;
 			ne->end = alloc_end;
 			ne->next = extra_blocks;
+			ne->prev = &extra_blocks;
+			extra_blocks->prev = &(ne->next);
 			extra_blocks = ne;
+			curschu->extra = ne;
 		      }
 		  }
 #endif
@@ -1056,6 +1119,7 @@ grub_relocator_unload (struct grub_relocator *rel)
       grub_free (chunk->subchunks);
       grub_free (chunk);
     }
+  grub_free (rel);
 }
 
 grub_err_t

From 851395d8659fc58532797e6b45646e58845d50cf Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 14 Apr 2010 13:38:05 +0530
Subject: [PATCH 0787/1628] fix uninitialized warning

---
 loader/i386/bsdXX.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/loader/i386/bsdXX.c b/loader/i386/bsdXX.c
index b4d574821..cd5ba85dc 100644
--- a/loader/i386/bsdXX.c
+++ b/loader/i386/bsdXX.c
@@ -80,7 +80,7 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (grub_file_t file, int argc,
 {
   Elf_Ehdr e;
   Elf_Shdr *s;
-  char *shdr;
+  char *shdr = 0;
   grub_addr_t curload, module;
   grub_err_t err;
 
@@ -148,7 +148,7 @@ SUFFIX (grub_freebsd_load_elfmodule) (grub_file_t file, int argc, char *argv[],
 {
   Elf_Ehdr e;
   Elf_Shdr *s;
-  char *shdr;
+  char *shdr = 0;
   grub_addr_t curload, module;
   grub_err_t err;
 
@@ -223,7 +223,7 @@ SUFFIX (grub_freebsd_load_elf_meta) (grub_file_t file, grub_addr_t *kern_end)
   grub_err_t err;
   Elf_Ehdr e;
   Elf_Shdr *s;
-  char *shdr;
+  char *shdr = 0;
   unsigned symoff, stroff, symsize, strsize;
   grub_addr_t curload;
   grub_freebsd_addr_t symstart, symend, symentsize, dynamic;

From 0b45630927f0bb4f48589adbc1011b12b103be19 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 14 Apr 2010 13:59:58 +0100
Subject: [PATCH 0788/1628] Restore TEXTDOMAINDIR correction from r1889, lost
 apparently by mistake in r2156.  Noticed by Anthony Fok. *
 util/grub.d/10_kfreebsd.in (TEXTDOMAINDIR): Set to lowercased @localedir@. *
 util/grub.d/10_linux.in (TEXTDOMAINDIR): Likewise.

---
 ChangeLog                  | 9 +++++++++
 util/grub.d/10_kfreebsd.in | 2 +-
 util/grub.d/10_linux.in    | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9e0f3485d..1ac1ae6ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-04-14  Colin Watson  <cjwatson@ubuntu.com>
+
+	Restore TEXTDOMAINDIR correction from r1889, lost apparently by
+	mistake in r2156.  Noticed by Anthony Fok.
+
+	* util/grub.d/10_kfreebsd.in (TEXTDOMAINDIR): Set to lowercased
+	@localedir@.
+	* util/grub.d/10_linux.in (TEXTDOMAINDIR): Likewise.
+
 2010-04-14  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Fix a spurious, uninitialized variable warning.
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index 5ab546282..f63421617 100644
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -23,7 +23,7 @@ libdir=@libdir@
 . ${libdir}/grub/grub-mkconfig_lib
 
 export TEXTDOMAIN=@PACKAGE@
-export TEXTDOMAINDIR=@LOCALEDIR@
+export TEXTDOMAINDIR=@localedir@
 
 CLASS="--class os"
 
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index e691cae86..802d59f51 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -23,7 +23,7 @@ libdir=@libdir@
 . ${libdir}/grub/grub-mkconfig_lib
 
 export TEXTDOMAIN=@PACKAGE@
-export TEXTDOMAINDIR=@LOCALEDIR@
+export TEXTDOMAINDIR=@localedir@
 
 CLASS="--class gnu-linux --class gnu --class os"
 

From b883356cf6cfb07ee36eaf14ea590e2318efc4ae Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 14 Apr 2010 18:46:02 +0200
Subject: [PATCH 0789/1628] ntldr support. (based on information from nyu but
 no code from him)

---
 conf/i386-pc.rmk       |   6 ++
 loader/i386/pc/ntldr.c | 140 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+)
 create mode 100644 loader/i386/pc/ntldr.c

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 1b6221f4d..c138188ed 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -143,6 +143,12 @@ chain_mod_SOURCES = loader/i386/pc/chainloader.c
 chain_mod_CFLAGS = $(COMMON_CFLAGS)
 chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For ntldr.mod.
+pkglib_MODULES += ntldr.mod
+ntldr_mod_SOURCES = loader/i386/pc/ntldr.c
+ntldr_mod_CFLAGS = $(COMMON_CFLAGS)
+ntldr_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 pkglib_MODULES += linux16.mod
 linux16_mod_SOURCES = loader/i386/pc/linux.c
 linux16_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/loader/i386/pc/ntldr.c b/loader/i386/pc/ntldr.c
new file mode 100644
index 000000000..9e461ff49
--- /dev/null
+++ b/loader/i386/pc/ntldr.c
@@ -0,0 +1,140 @@
+/* chainloader.c - boot another boot loader */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2004,2007,2009,2010  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/loader.h>
+#include <grub/file.h>
+#include <grub/err.h>
+#include <grub/device.h>
+#include <grub/disk.h>
+#include <grub/misc.h>
+#include <grub/types.h>
+#include <grub/partition.h>
+#include <grub/dl.h>
+#include <grub/command.h>
+#include <grub/machine/biosnum.h>
+#include <grub/i18n.h>
+#include <grub/video.h>
+#include <grub/mm.h>
+#include <grub/cpu/relocator.h>
+
+static grub_dl_t my_mod;
+static struct grub_relocator *rel;
+
+#define GRUB_NTLDR_SEGMENT         0x2000
+
+static grub_err_t
+grub_ntldr_boot (void)
+{
+  struct grub_relocator16_state state = { 
+    .cs = GRUB_NTLDR_SEGMENT,
+    .ip = 0
+  };
+  grub_video_set_mode ("text", 0, 0);
+
+  return grub_relocator16_boot (rel, state);
+}
+
+static grub_err_t
+grub_ntldr_unload (void)
+{
+  grub_relocator_unload (rel);
+  rel = NULL;
+  grub_dl_unref (my_mod);
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_cmd_ntldr (grub_command_t cmd __attribute__ ((unused)),
+		int argc, char *argv[])
+{
+  grub_file_t file = 0;
+  grub_err_t err;
+  void *bs, *ntldr;
+  grub_size_t ntldrsize;
+  grub_device_t dev;
+
+  if (argc == 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no file specified");
+
+  grub_dl_ref (my_mod);
+
+  rel = grub_relocator_new ();
+  if (!rel)
+    goto fail;
+
+  file = grub_file_open (argv[0]);
+  if (! file)
+    goto fail;
+
+  err = grub_relocator_alloc_chunk_addr (rel, &bs, 0x7C00,
+					 GRUB_DISK_SECTOR_SIZE);
+  if (err)
+    goto fail;
+
+  dev = grub_device_open (0);
+
+  if (dev && dev->disk)
+    {
+      err = grub_disk_read (dev->disk, 0, 0, GRUB_DISK_SECTOR_SIZE, bs);
+      if (err)
+	{
+	  grub_device_close (dev);
+	  goto fail;
+	}
+    }
+
+  if (dev)
+    grub_device_close (dev);
+
+  ntldrsize = grub_file_size (file);
+  err = grub_relocator_alloc_chunk_addr (rel, &ntldr, GRUB_NTLDR_SEGMENT << 4,
+					 ntldrsize);
+  if (err)
+    goto fail;
+
+  if (grub_file_read (file, ntldr, ntldrsize)
+      != (grub_ssize_t) ntldrsize)
+    goto fail;
+ 
+  grub_loader_set (grub_ntldr_boot, grub_ntldr_unload, 1);
+  return GRUB_ERR_NONE;
+
+ fail:
+
+  if (file)
+    grub_file_close (file);
+
+  grub_ntldr_unload ();
+
+  return grub_errno;
+}
+
+static grub_command_t cmd;
+
+GRUB_MOD_INIT(ntldr)
+{
+  cmd = grub_register_command ("ntldr", grub_cmd_ntldr,
+			       0, N_("Load NTLDR or BootMGR."));
+  my_mod = mod;
+}
+
+GRUB_MOD_FINI(ntldr)
+{
+  grub_unregister_command (cmd);
+}

From dae84898b268bf733e8a6c2cc31be814ee0e1694 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 15 Apr 2010 02:11:26 +0200
Subject: [PATCH 0790/1628] Pass %dl to ntldr. Clear other registers.

---
 include/grub/i386/relocator.h |  1 +
 lib/i386/relocator.c          |  3 +++
 lib/i386/relocator16.S        |  5 +++++
 loader/i386/pc/ntldr.c        | 11 ++++++++++-
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/include/grub/i386/relocator.h b/include/grub/i386/relocator.h
index f32413a1b..891235f9b 100644
--- a/include/grub/i386/relocator.h
+++ b/include/grub/i386/relocator.h
@@ -44,6 +44,7 @@ struct grub_relocator16_state
   grub_uint16_t ss;
   grub_uint16_t sp;
   grub_uint16_t ip;
+  grub_uint32_t edx;
 };
 
 struct grub_relocator64_state
diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index 4eaa66890..5985fac7a 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -49,6 +49,7 @@ extern grub_uint16_t grub_relocator16_fs;
 extern grub_uint16_t grub_relocator16_gs;
 extern grub_uint16_t grub_relocator16_ss;
 extern grub_uint16_t grub_relocator16_sp;
+extern grub_uint32_t grub_relocator16_edx;
 
 extern grub_uint8_t grub_relocator32_start;
 extern grub_uint8_t grub_relocator32_end;
@@ -207,6 +208,8 @@ grub_relocator16_boot (struct grub_relocator *rel,
   grub_relocator16_ss = state.ss;
   grub_relocator16_sp = state.sp;
 
+  grub_relocator16_edx = state.edx;
+
   grub_memmove (src, &grub_relocator16_start, RELOCATOR_SIZEOF (16));
 
   err = grub_relocator_prepare_relocs (rel, target, &relst, NULL);
diff --git a/lib/i386/relocator16.S b/lib/i386/relocator16.S
index 7d65e4dbe..510d3a1ed 100644
--- a/lib/i386/relocator16.S
+++ b/lib/i386/relocator16.S
@@ -151,6 +151,11 @@ VARIABLE(grub_relocator16_ss)
 VARIABLE(grub_relocator16_sp)
 	.word	0
 	movw	%ax, %ss
+
+	/* movw imm32, %edx.  */
+	.byte	0x66, 0xba
+VARIABLE(grub_relocator16_edx)
+	.long	0
 	
 	/* Cleared direction flag is of no problem with any current
 	   payload and makes this implementation easier.  */
diff --git a/loader/i386/pc/ntldr.c b/loader/i386/pc/ntldr.c
index 9e461ff49..1368694fb 100644
--- a/loader/i386/pc/ntldr.c
+++ b/loader/i386/pc/ntldr.c
@@ -35,6 +35,7 @@
 
 static grub_dl_t my_mod;
 static struct grub_relocator *rel;
+static grub_uint32_t edx = 0xffffffff;
 
 #define GRUB_NTLDR_SEGMENT         0x2000
 
@@ -43,7 +44,14 @@ grub_ntldr_boot (void)
 {
   struct grub_relocator16_state state = { 
     .cs = GRUB_NTLDR_SEGMENT,
-    .ip = 0
+    .ip = 0,
+    .ds = 0,
+    .es = 0,
+    .fs = 0,
+    .gs = 0,
+    .ss = 0,
+    .sp = 0x7c00,
+    .edx = edx
   };
   grub_video_set_mode ("text", 0, 0);
 
@@ -87,6 +95,7 @@ grub_cmd_ntldr (grub_command_t cmd __attribute__ ((unused)),
   if (err)
     goto fail;
 
+  edx = grub_get_root_biosnumber ();
   dev = grub_device_open (0);
 
   if (dev && dev->disk)

From d499b1337144d3811410159d466c78ce9bd02657 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 15 Apr 2010 02:13:28 +0200
Subject: [PATCH 0791/1628] Remove grub/handler.h inclusion. Reported by:
 Giovanni Toraldo

---
 util/grub-editenv.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index f21042c97..4ea97bded 100644
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -21,7 +21,6 @@
 #include <grub/types.h>
 #include <grub/util/misc.h>
 #include <grub/lib/envblk.h>
-#include <grub/handler.h>
 #include <grub/i18n.h>
 
 #include <stdio.h>

From 1c9d6bb81b49ef776dde560ac13cb3222f14c25e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 16 Apr 2010 19:43:52 +0200
Subject: [PATCH 0792/1628] Initialise USB option controller

---
 include/grub/cs5536.h     | 13 ++++++++++---
 kern/mips/yeeloong/init.c | 13 +++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/include/grub/cs5536.h b/include/grub/cs5536.h
index c2323fe9b..218e17d1a 100644
--- a/include/grub/cs5536.h
+++ b/include/grub/cs5536.h
@@ -39,6 +39,11 @@
 #define GRUB_CS5536_PM_REGS_SIZE 128
 #define GRUB_CS5536_ACPI_REGS_SIZE 32
 
+#define GRUB_CS5536_USB_OPTION_REGS_SIZE 0x1c
+#define GRUB_CS5536_USB_OPTION_REG_UOCMUX  1
+#define GRUB_CS5536_USB_OPTION_REG_UOCMUX_PMUX_MASK 0x03
+#define GRUB_CS5536_USB_OPTION_REG_UOCMUX_PMUX_HC   0x02
+
 #define GRUB_CS5536_DESTINATION_GLIU     0
 #define GRUB_CS5536_DESTINATION_GLPCI_SB 1
 #define GRUB_CS5536_DESTINATION_USB      2
@@ -78,9 +83,11 @@
 #define GRUB_CS5536_MSR_USB_EHCI_BASE 0x40000009
 #define GRUB_CS5536_MSR_USB_CONTROLLER_BASE 0x4000000a
 #define GRUB_CS5536_MSR_USB_OPTION_CONTROLLER_BASE 0x4000000b
-#define GRUB_CS5536_MSR_USB_BASE_ADDR_MASK     0xffffff00
-#define GRUB_CS5536_MSR_USB_BASE_BUS_MASTER    0x400000000ULL
-#define GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE 0x200000000ULL
+#define GRUB_CS5536_MSR_USB_BASE_ADDR_MASK     0x00ffffff00ULL
+#define GRUB_CS5536_MSR_USB_BASE_BUS_MASTER    0x0400000000ULL
+#define GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE 0x0200000000ULL
+#define GRUB_CS5536_MSR_USB_BASE_PME_ENABLED       0x0800000000ULL
+#define GRUB_CS5536_MSR_USB_BASE_PME_STATUS        0x1000000000ULL
 #define GRUB_CS5536_MSR_USB_EHCI_BASE_FLDJ_SHIFT 40
 
 #define GRUB_CS5536_MSR_IDE_IO_BAR 0x60000008
diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index cf241ea96..5c3340f39 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -239,6 +239,19 @@ grub_machine_init (void)
       set_p2d (dev, 5, GRUB_CS5536_DESTINATION_USB, 0x05024000);
       set_p2d (dev, 6, GRUB_CS5536_DESTINATION_USB, 0x05023000);
 
+      {
+	volatile grub_uint32_t *oc;
+	oc = grub_pci_device_map_range (dev, 0x05022000,
+					GRUB_CS5536_USB_OPTION_REGS_SIZE);
+
+	oc[GRUB_CS5536_USB_OPTION_REG_UOCMUX] =
+	  (oc[GRUB_CS5536_USB_OPTION_REG_UOCMUX]
+	   & ~GRUB_CS5536_USB_OPTION_REG_UOCMUX_PMUX_MASK)
+	  | GRUB_CS5536_USB_OPTION_REG_UOCMUX_PMUX_HC;
+	grub_pci_device_unmap_range (dev, oc, GRUB_CS5536_USB_OPTION_REGS_SIZE);
+      }
+
+
       /* Setup IDE controller.  */
       grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_IO_BAR,
 			     GRUB_CS5536_LBAR_IDE

From 913043335344de534fa70205f6c823090b707a0a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 16 Apr 2010 19:46:22 +0200
Subject: [PATCH 0793/1628] Enable USB compilation on Yeeloong

---
 conf/mips-yeeloong.rmk           | 34 ++++++++++++++++++++++++++++++--
 include/grub/cs5536.h            |  8 +++++---
 include/grub/mips/yeeloong/pci.h | 10 +++++-----
 term/usb_keyboard.c              |  1 -
 4 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 288b36ea5..233d8dae6 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -5,7 +5,7 @@ COMMON_CFLAGS += -march=mips3
 COMMON_ASFLAGS += -march=mips3
 
 kernel_img_HEADERS += pci.h bitmap.h video.h gfxterm.h font.h \
-		      bitmap_scale.h bufio.h cs5536.h
+		      bitmap_scale.h bufio.h cs5536.h machine/pci.h
 
 include $(srcdir)/conf/mips.mk
 
@@ -27,7 +27,7 @@ kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
 	video/fb/fbfill.c video/fb/fbutil.c video/bitmap.c \
 	video/bitmap_scale.c video/sm712.c bus/pci.c bus/bonito.c \
 	term/gfxterm.c commands/extcmd.c lib/arg.c \
-	bus/cs5536.c \
+	bus/cs5536.c term/serial.c term/terminfo.c term/tparm.c \
 	symlist.c
 kernel_img_CFLAGS = $(COMMON_CFLAGS) -DUSE_ASCII_FAILBACK
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
@@ -92,5 +92,35 @@ halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For usb.mod
+pkglib_MODULES += usb.mod
+usb_mod_SOURCES = bus/usb/usb.c bus/usb/usbtrans.c bus/usb/usbhub.c
+usb_mod_CFLAGS = $(COMMON_CFLAGS)
+usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usbtest.mod
+pkglib_MODULES += usbtest.mod
+usbtest_mod_SOURCES = commands/usbtest.c
+usbtest_mod_CFLAGS = $(COMMON_CFLAGS)
+usbtest_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ohci.mod
+pkglib_MODULES += ohci.mod
+ohci_mod_SOURCES = bus/usb/ohci.c
+ohci_mod_CFLAGS = $(COMMON_CFLAGS)
+ohci_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usbms.mod
+pkglib_MODULES += usbms.mod
+usbms_mod_SOURCES = disk/usbms.c
+usbms_mod_CFLAGS = $(COMMON_CFLAGS)
+usbms_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usb_keyboard.mod
+pkglib_MODULES += usb_keyboard.mod
+usb_keyboard_mod_SOURCES = term/usb_keyboard.c
+usb_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
+usb_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 sbin_SCRIPTS += grub-install
 grub_install_SOURCES = util/grub-install.in
diff --git a/include/grub/cs5536.h b/include/grub/cs5536.h
index 218e17d1a..a16fb7a09 100644
--- a/include/grub/cs5536.h
+++ b/include/grub/cs5536.h
@@ -169,9 +169,11 @@
 #ifndef ASM_FILE
 int EXPORT_FUNC (grub_cs5536_find) (grub_pci_device_t *devp);
 
-grub_uint64_t grub_cs5536_read_msr (grub_pci_device_t dev, grub_uint32_t addr);
-void grub_cs5536_write_msr (grub_pci_device_t dev, grub_uint32_t addr,
-			    grub_uint64_t val);
+grub_uint64_t EXPORT_FUNC (grub_cs5536_read_msr) (grub_pci_device_t dev,
+						  grub_uint32_t addr);
+void EXPORT_FUNC (grub_cs5536_write_msr) (grub_pci_device_t dev,
+					  grub_uint32_t addr,
+					  grub_uint64_t val);
 grub_err_t grub_cs5536_read_spd_byte (grub_port_t smbbase, grub_uint8_t dev,
 				      grub_uint8_t addr, grub_uint8_t *res);
 grub_err_t EXPORT_FUNC (grub_cs5536_read_spd) (grub_port_t smbbase,
diff --git a/include/grub/mips/yeeloong/pci.h b/include/grub/mips/yeeloong/pci.h
index 8f3a29d5c..7c816ac8e 100644
--- a/include/grub/mips/yeeloong/pci.h
+++ b/include/grub/mips/yeeloong/pci.h
@@ -105,12 +105,12 @@ grub_pci_write_byte (grub_pci_address_t addr, grub_uint8_t data)
 }
 
 volatile void *
-grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),
-			   grub_addr_t base, grub_size_t size);
+EXPORT_FUNC (grub_pci_device_map_range) (grub_pci_device_t dev,
+					 grub_addr_t base, grub_size_t size);
 void
-grub_pci_device_unmap_range (grub_pci_device_t dev __attribute__ ((unused)),
-			     volatile void *mem,
-			     grub_size_t size __attribute__ ((unused)));
+EXPORT_FUNC (grub_pci_device_unmap_range) (grub_pci_device_t dev,
+					   volatile void *mem,
+					   grub_size_t size);
 #endif
 
 #endif /* GRUB_MACHINE_PCI_H */
diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index 5d76c5e02..69d5709b6 100644
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -18,7 +18,6 @@
  */
 
 #include <grub/term.h>
-#include <grub/machine/console.h>
 #include <grub/time.h>
 #include <grub/cpu/io.h>
 #include <grub/misc.h>

From f78e34d87c779d71e957cc8a0d3ed0505f44b0f7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 16 Apr 2010 19:59:51 +0200
Subject: [PATCH 0794/1628] Initialize power and timing of OHCI.

---
 bus/usb/ohci.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 6d185bc7f..b385a699a 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -24,7 +24,7 @@
 #include <grub/misc.h>
 #include <grub/pci.h>
 #include <grub/cpu/pci.h>
-#include <grub/i386/io.h>
+#include <grub/cpu/io.h>
 #include <grub/time.h>
 
 struct grub_ohci_hcca
@@ -91,10 +91,18 @@ typedef enum
   GRUB_OHCI_REG_BULKCURR,
   GRUB_OHCI_REG_DONEHEAD,
   GRUB_OHCI_REG_FRAME_INTERVAL,
+  GRUB_OHCI_REG_PERIODIC_START = 16,
   GRUB_OHCI_REG_RHUBA = 18,
   GRUB_OHCI_REG_RHUBPORT = 21
 } grub_ohci_reg_t;
 
+#define GRUB_OHCI_RHUB_PORT_POWER_MASK 0x300
+#define GRUB_OHCI_RHUB_PORT_ALL_POWERED 0x200
+
+/* XXX: Is this choice of timings sane?  */
+#define GRUB_OHCI_FSMPS 0x2778
+#define GRUB_OHCI_PERIODIC_START 0x257f
+
 static grub_uint32_t
 grub_ohci_readreg32 (struct grub_ohci *o, grub_ohci_reg_t reg)
 {
@@ -166,6 +174,11 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   if ((revision & 0xFF) != 0x10)
     goto fail;
 
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBA,
+			(grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBA)
+			 & ~GRUB_OHCI_RHUB_PORT_POWER_MASK)
+			| GRUB_OHCI_RHUB_PORT_ALL_POWERED);
+
   /* Backup the frame interval register.  */
   frame_interval = grub_ohci_readreg32 (o, GRUB_OHCI_REG_FRAME_INTERVAL);
 
@@ -175,8 +188,17 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   grub_dprintf ("ohci", "OHCI reset\n");
 
   /* Restore the frame interval register.  */
+#define GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_MASK 0x8fff0000
+#define GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_SHIFT 16
+
+  frame_interval = (frame_interval & ~GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_MASK)
+    | (GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_SHIFT
+       << GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_SHIFT);
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_FRAME_INTERVAL, frame_interval);
 
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_PERIODIC_START,
+			GRUB_OHCI_PERIODIC_START);
+
   /* Setup the HCCA.  */
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, (grub_uint32_t) o->hcca);
   grub_dprintf ("ohci", "OHCI HCCA\n");

From 481695bce082577ca2d56f476be6727b3d543394 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 16 Apr 2010 20:04:44 +0200
Subject: [PATCH 0795/1628] Adjust OHCI init routines for MIPS and CS5535

---
 bus/usb/ohci.c | 90 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 64 insertions(+), 26 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index b385a699a..efa2b74e9 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -26,6 +26,7 @@
 #include <grub/cpu/pci.h>
 #include <grub/cpu/io.h>
 #include <grub/time.h>
+#include <grub/cs5536.h>
 
 struct grub_ohci_hcca
 {
@@ -70,6 +71,7 @@ struct grub_ohci
 {
   volatile grub_uint32_t *iobase;
   volatile struct grub_ohci_hcca *hcca;
+  grub_uint32_t hcca_addr;
   struct grub_ohci *next;
 };
 
@@ -122,51 +124,85 @@ grub_ohci_writereg32 (struct grub_ohci *o,
    controller.  If this is the case, initialize it.  */
 static int NESTED_FUNC_ATTR
 grub_ohci_pci_iter (grub_pci_device_t dev,
-		    grub_pci_id_t pciid __attribute__((unused)))
+		    grub_pci_id_t pciid)
 {
-  grub_uint32_t class_code;
-  grub_uint32_t class;
-  grub_uint32_t subclass;
   grub_uint32_t interf;
   grub_uint32_t base;
   grub_pci_address_t addr;
   struct grub_ohci *o;
   grub_uint32_t revision;
   grub_uint32_t frame_interval;
-
-  addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
-  class_code = grub_pci_read (addr) >> 8;
-
-  interf = class_code & 0xFF;
-  subclass = (class_code >> 8) & 0xFF;
-  class = class_code >> 16;
-
-  /* If this is not an OHCI controller, just return.  */
-  if (class != 0x0c || subclass != 0x03 || interf != 0x10)
-    return 0;
+  int cs5536;
+  grub_uint32_t hcca_addr;
 
   /* Determine IO base address.  */
-  addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
-  base = grub_pci_read (addr);
+  grub_dprintf ("ohci", "pciid = %x\n", pciid);
+  if (pciid == GRUB_CS5536_PCIID)
+    {
+      grub_uint64_t basereg;
+
+      cs5536 = 1;
+      basereg = grub_cs5536_read_msr (dev, GRUB_CS5536_MSR_USB_OHCI_BASE);
+      if (!(basereg & GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE))
+	{
+	  /* Shouldn't happen.  */
+	  grub_dprintf ("ohci", "No OHCI address is assigned\n");
+	  return 0;
+	}
+      base = (basereg & GRUB_CS5536_MSR_USB_BASE_ADDR_MASK);
+      basereg |= GRUB_CS5536_MSR_USB_BASE_BUS_MASTER;
+      basereg &= ~GRUB_CS5536_MSR_USB_BASE_PME_ENABLED;
+      basereg &= ~GRUB_CS5536_MSR_USB_BASE_PME_STATUS;
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_OHCI_BASE, basereg);
+
+    }
+  else
+    {
+      grub_uint32_t class_code;
+      grub_uint32_t class;
+      grub_uint32_t subclass;
+
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
+      class_code = grub_pci_read (addr) >> 8;
+      
+      interf = class_code & 0xFF;
+      subclass = (class_code >> 8) & 0xFF;
+      class = class_code >> 16;
+
+      /* If this is not an OHCI controller, just return.  */
+      if (class != 0x0c || subclass != 0x03 || interf != 0x10)
+	return 0;
+
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
+      base = grub_pci_read (addr);
 
 #if 0
-  /* Stop if there is no IO space base address defined.  */
-  if (! (base & 1))
-    return 0;
+      /* Stop if there is no IO space base address defined.  */
+      if (! (base & 1))
+	return 0;
 #endif
 
+      grub_dprintf ("ohci", "class=0x%02x 0x%02x interface 0x%02x\n",
+		    class, subclass, interf);
+    }
+
   /* Allocate memory for the controller and register it.  */
   o = grub_malloc (sizeof (*o));
   if (! o)
     return 1;
 
-  o->iobase = (grub_uint32_t *) base;
+  o->iobase = grub_pci_device_map_range (dev, base, 0x100);
 
+  grub_dprintf ("ohci", "base=%p\n", o->iobase);
+
+  /* FIXME: create proper abstraction for this.  */
+#ifdef GRUB_MACHINE_MIPS_YEELOONG
+  hcca_addr = 0x05000100;
+#else
   /* Reserve memory for the HCCA.  */
-  o->hcca = (struct grub_ohci_hcca *) grub_memalign (256, 256);
-
-  grub_dprintf ("ohci", "class=0x%02x 0x%02x interface 0x%02x base=%p\n",
- 		class, subclass, interf, o->iobase);
+  hcca_addr = (grub_uint32_t) grub_memalign (256, 256);
+#endif
+  o->hcca = grub_pci_device_map_range (dev, hcca_addr, 256);
 
   /* Check if the OHCI revision is actually 1.0 as supported.  */
   revision = grub_ohci_readreg32 (o, GRUB_OHCI_REG_REVISION);
@@ -200,7 +236,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
 			GRUB_OHCI_PERIODIC_START);
 
   /* Setup the HCCA.  */
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, (grub_uint32_t) o->hcca);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, hcca_addr);
   grub_dprintf ("ohci", "OHCI HCCA\n");
 
   /* Enable the OHCI.  */
@@ -216,8 +252,10 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   return 0;
 
  fail:
+#ifndef GRUB_MACHINE_MIPS_YEELOONG
   if (o)
     grub_free ((void *) o->hcca);
+#endif
   grub_free (o);
 
   return 1;

From 7e3a6f3b23ab021e66752c278d49dad863bae4b4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 16 Apr 2010 20:05:35 +0200
Subject: [PATCH 0796/1628] Move few defines to appropriate place

---
 bus/usb/ohci.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index efa2b74e9..69efda435 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -101,6 +101,9 @@ typedef enum
 #define GRUB_OHCI_RHUB_PORT_POWER_MASK 0x300
 #define GRUB_OHCI_RHUB_PORT_ALL_POWERED 0x200
 
+#define GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_MASK 0x8fff0000
+#define GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_SHIFT 16
+
 /* XXX: Is this choice of timings sane?  */
 #define GRUB_OHCI_FSMPS 0x2778
 #define GRUB_OHCI_PERIODIC_START 0x257f
@@ -224,9 +227,6 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   grub_dprintf ("ohci", "OHCI reset\n");
 
   /* Restore the frame interval register.  */
-#define GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_MASK 0x8fff0000
-#define GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_SHIFT 16
-
   frame_interval = (frame_interval & ~GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_MASK)
     | (GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_SHIFT
        << GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_SHIFT);

From fa2bef48160d1d397e48ed5552ddcd215675865f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 16 Apr 2010 20:41:54 +0200
Subject: [PATCH 0797/1628] Skip unfunctional controllers

---
 bus/usb/ohci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 69efda435..de20a1491 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -258,7 +258,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
 #endif
   grub_free (o);
 
-  return 1;
+  return 0;
 }
 
 

From 260ddb94173888f802d9de8f50603fa4f3c717ae Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 17 Apr 2010 16:43:04 +0200
Subject: [PATCH 0798/1628] create a fat16 image as efi spec requires

---
 util/grub-mkrescue.in | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index b86be39e0..e7dbb45ff 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -203,21 +203,31 @@ if test -e "${pc_dir}" ; then
 		--embedded-boot ${embed_img}"
 fi
 
+if test -e "${efi64_dir}" || test -e "${efi32_dir}"; then
+    efi_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
+    mkdir -p "${efi_dir}/efi/boot"
+else
+    efi_dir=
+fi
+
 # build bootx64.efi
 if test -e "${efi64_dir}" ; then
     echo "Generates bootx64.efi"
-    mkdir -p ${iso9660_dir}/efi/boot
-    grub-mkimage -d ${efi64_dir}/ -o ${iso9660_dir}/efi/boot/bootx64.efi --prefix=/boot/grub/x86_64-efi \
+    grub-mkimage -d "${efi64_dir}" -o "${efi_dir}"/efi/boot/bootx64.efi --prefix=/boot/grub/x86_64-efi \
         search iso9660 configfile sh 
 
-    modules="$(cat ${efi64_dir}/partmap.lst) ${modules}"
+    modules="$(cat "${efi64_dir}"/partmap.lst) ${modules}"
     (for i in ${modules} ; do
-	if [ "x$i" != xkernel.mod ]; then
-            echo "insmod $i"
-	fi
+        echo "insmod $i"
     done ; \
     echo "source /boot/grub/grub.cfg") \
-    > ${iso9660_dir}/boot/grub/x86_64-efi/grub.cfg
+    > "${iso9660_dir}"/boot/grub/x86_64-efi/grub.cfg
+fi
+
+if test x"${efi_dir}" != x; then
+    mformat -C -f 2880 -L 16 -i "${iso9660_dir}"/efi.img ::
+    mcopy -s -i "${iso9660_dir}"/efi.img ${efi_dir}/efi ::/
+    grub_mkisofs_arguments="${grub_mkisofs_arguments} --efi-boot efi.img"
 fi
 
 # build iso image

From ebfe7eb4dd2467091e7018d6879d1ccf32cdeb6c Mon Sep 17 00:00:00 2001
From: Christian Franke <franke@computer.org>
Date: Sat, 17 Apr 2010 17:17:36 +0200
Subject: [PATCH 0799/1628] 	* Makefile.in: Add missing localedir setting.

---
 ChangeLog   | 4 ++++
 Makefile.in | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1ac1ae6ce..a89f7e6cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-17  Christian Franke <franke@computer.org>
+
+	* Makefile.in: Add missing localedir setting.
+
 2010-04-14  Colin Watson  <cjwatson@ubuntu.com>
 
 	Restore TEXTDOMAINDIR correction from r1889, lost apparently by
diff --git a/Makefile.in b/Makefile.in
index e253af6c9..29f997213 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,6 +35,7 @@ sysconfdir = @sysconfdir@
 sharedstatedir = @sharedstatedir@
 localstatedir = @localstatedir@
 libdir = @libdir@
+localedir = @localedir@
 infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@

From 0973daeb380d6d1ef26a10feb28be4ef5140c861 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 17 Apr 2010 18:58:56 +0200
Subject: [PATCH 0800/1628] 	* disk/lvm.c (grub_lvm_memberlist): Issue an
 error if pv->disk = 0.

---
 ChangeLog  | 4 ++++
 disk/lvm.c | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a89f7e6cc..87c72cd43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* disk/lvm.c (grub_lvm_memberlist): Issue an error if pv->disk = 0.
+
 2010-04-17  Christian Franke <franke@computer.org>
 
 	* Makefile.in: Add missing localedir setting.
diff --git a/disk/lvm.c b/disk/lvm.c
index 2c54ca3b3..c2ae82df2 100644
--- a/disk/lvm.c
+++ b/disk/lvm.c
@@ -24,6 +24,10 @@
 #include <grub/misc.h>
 #include <grub/lvm.h>
 
+#ifdef GRUB_UTIL
+#include <grub/util/misc.h>
+#endif
+
 static struct grub_lvm_vg *vg_list;
 static int lv_count;
 
@@ -68,6 +72,9 @@ grub_lvm_memberlist (grub_disk_t disk)
   if (lv->vg->pvs)
     for (pv = lv->vg->pvs; pv; pv = pv->next)
       {
+	if (!pv->disk)
+	  grub_util_error ("Couldn't find PV %s. Check your device.map",
+			   pv->name);
 	tmp = grub_malloc (sizeof (*tmp));
 	tmp->disk = pv->disk;
 	tmp->next = list;

From 0b830b8f5edf78db51a04ff2d9bde4006057829a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Apr 2010 12:59:04 +0200
Subject: [PATCH 0801/1628] 	* util/hostdisk.c (make_device_name): Change
 to new partition naming.

---
 ChangeLog       | 4 ++++
 util/hostdisk.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 87c72cd43..9d2277f28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/hostdisk.c (make_device_name): Change to new partition naming.
+
 2010-04-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* disk/lvm.c (grub_lvm_memberlist): Issue an error if pv->disk = 0.
diff --git a/util/hostdisk.c b/util/hostdisk.c
index 79652625d..a8e418046 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -861,7 +861,7 @@ make_device_name (int drive, int dos_part, int bsd_part)
     dos_part_str = xasprintf (",%d", dos_part + 1);
 
   if (bsd_part >= 0)
-    bsd_part_str = xasprintf (",%c", bsd_part + 'a');
+    bsd_part_str = xasprintf (",%d", bsd_part + 1);
 
   ret = xasprintf ("%s%s%s", map[drive].drive,
                    dos_part_str ? : "",

From a9e6ff28d277b5e925b73b2ca6bb4a190a9dac1d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Apr 2010 13:00:06 +0200
Subject: [PATCH 0802/1628] 	* po/POTFILES: Renamed multiboot_loader.c to
 multiboot.c

---
 ChangeLog   | 4 ++++
 po/POTFILES | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9d2277f28..6f39713a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* po/POTFILES: Renamed multiboot_loader.c to multiboot.c
+
 2010-04-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/hostdisk.c (make_device_name): Change to new partition naming.
diff --git a/po/POTFILES b/po/POTFILES
index 5fabb0634..0dfc3c041 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -62,7 +62,7 @@ loader/i386/linux.c
 loader/i386/pc/chainloader.c
 loader/i386/pc/linux.c
 loader/i386/xnu.c
-loader/multiboot_loader.c
+loader/multiboot.c
 loader/powerpc/ieee1275/linux.c
 loader/sparc64/ieee1275/linux.c
 loader/xnu.c

From 6e86896ed8bd6ce55592092c30e0c087d902cae8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Apr 2010 14:02:13 +0200
Subject: [PATCH 0803/1628] Use ofpathname in grub-setup on sparc

---
 conf/powerpc-ieee1275.rmk                     |  7 ++++
 conf/sparc64-ieee1275.rmk                     |  1 +
 include/grub/util/hostdisk.h                  |  3 ++
 include/grub/util/ofpath.h                    |  2 +-
 util/hostdisk.c                               |  6 ++++
 util/{sparc64 => }/ieee1275/grub-ofpathname.c |  0
 util/ieee1275/ofpath.c                        |  2 +-
 util/sparc64/ieee1275/grub-setup.c            | 34 ++++---------------
 8 files changed, 26 insertions(+), 29 deletions(-)
 rename util/{sparc64 => }/ieee1275/grub-ofpathname.c (100%)

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index d5968ac8e..d7d477327 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -25,6 +25,13 @@ kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x200000,-Bstatic
 
+# Utilities.
+sbin_UTILITIES = grub-ofpathname
+
+# For grub-ofpathname.
+grub_ofpathname_SOURCES = util/ieee1275/grub-ofpathname.c \
+	util/ieee1275/ofpath.c util/misc.c gnulib/progname.c
+
 # Scripts.
 sbin_SCRIPTS = grub-install
 bin_SCRIPTS = grub-mkrescue
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 72f947f6a..a92e66a80 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -50,6 +50,7 @@ grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
 # For grub-setup.
 util/sparc64/ieee1275/grub-setup.c_DEPENDENCIES = grub_setup_init.h
 grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c	\
+	util/ieee1275/ofpath.c \
 	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
 	kern/err.c kern/misc.c kern/parser.c kern/partition.c	\
 	kern/file.c kern/fs.c kern/env.c kern/list.c		\
diff --git a/include/grub/util/hostdisk.h b/include/grub/util/hostdisk.h
index 21efb0d17..246046ee0 100644
--- a/include/grub/util/hostdisk.h
+++ b/include/grub/util/hostdisk.h
@@ -20,8 +20,11 @@
 #ifndef GRUB_BIOSDISK_MACHINE_UTIL_HEADER
 #define GRUB_BIOSDISK_MACHINE_UTIL_HEADER	1
 
+#include <grub/disk.h>
+
 void grub_util_biosdisk_init (const char *dev_map);
 void grub_util_biosdisk_fini (void);
 char *grub_util_biosdisk_get_grub_dev (const char *os_dev);
+const char *grub_util_biosdisk_get_osdev (grub_disk_t disk);
 
 #endif /* ! GRUB_BIOSDISK_MACHINE_UTIL_HEADER */
diff --git a/include/grub/util/ofpath.h b/include/grub/util/ofpath.h
index 78f24d784..b43c523cb 100644
--- a/include/grub/util/ofpath.h
+++ b/include/grub/util/ofpath.h
@@ -1,6 +1,6 @@
 #ifndef GRUB_OFPATH_MACHINE_UTIL_HEADER
 #define GRUB_OFPATH_MACHINE_UTIL_HEADER	1
 
-char *grub_util_devname_to_ofpath (char *devname);
+char *grub_util_devname_to_ofpath (const char *devname);
 
 #endif /* ! GRUB_OFPATH_MACHINE_UTIL_HEADER */
diff --git a/util/hostdisk.c b/util/hostdisk.c
index a8e418046..8be487461 100644
--- a/util/hostdisk.c
+++ b/util/hostdisk.c
@@ -1352,3 +1352,9 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
   return make_device_name (drive, -1, -1);
 #endif
 }
+
+const char *
+grub_util_biosdisk_get_osdev (grub_disk_t disk)
+{
+  return map[disk->id].device;
+}
diff --git a/util/sparc64/ieee1275/grub-ofpathname.c b/util/ieee1275/grub-ofpathname.c
similarity index 100%
rename from util/sparc64/ieee1275/grub-ofpathname.c
rename to util/ieee1275/grub-ofpathname.c
diff --git a/util/ieee1275/ofpath.c b/util/ieee1275/ofpath.c
index 79a0e8be5..fa0d48cf9 100644
--- a/util/ieee1275/ofpath.c
+++ b/util/ieee1275/ofpath.c
@@ -368,7 +368,7 @@ strip_trailing_digits (const char *p)
 }
 
 char *
-grub_util_devname_to_ofpath (char *devname)
+grub_util_devname_to_ofpath (const char *devname)
 {
   char *name_buf, *device, *devnode, *devicenode, *ofpath;
 
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index c39ea853f..cfd58a08f 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -35,6 +35,7 @@
 #include <grub/term.h>
 #include <grub/util/raid.h>
 #include <grub/util/lvm.h>
+#include <grub/util/ofpath.h>
 
 #include <grub_setup_init.h>
 
@@ -103,28 +104,6 @@ grub_refresh (void)
   fflush (stdout);
 }
 
-static char *compute_dest_ofpath (const char *dest)
-{
-  int len = strlen (dest);
-  char *res, *p, c;
-
-  res = xmalloc (len);
-  p = res;
-  while ((c = *dest++) != '\0')
-    {
-      if (c == '\\' && *dest == ',')
-	{
-	  *p++ = ',';
-	  dest++;
-	}
-      else
-	*p++ = c;
-    }
-  *p++ = '\0';
-
-  return res;
-}
-
 static void
 setup (const char *prefix, const char *dir,
        const char *boot_file, const char *core_file,
@@ -195,8 +174,6 @@ setup (const char *prefix, const char *dir,
       last_length = length;
     }
 
-  dest_ofpath = compute_dest_ofpath (dest);
-
   /* Read the boot image by the OS service.  */
   boot_path = grub_util_get_path (dir, boot_file);
   boot_size = grub_util_get_image_size (boot_path);
@@ -229,8 +206,7 @@ setup (const char *prefix, const char *dir,
 					   + GRUB_DISK_SECTOR_SIZE
 					   - sizeof (*block));
 
-  grub_util_info ("root is `%s', dest is `%s', and dest_ofpath is `%s'",
-		  root, dest, dest_ofpath);
+  grub_util_info ("root is `%s', dest is `%s'", root, dest);
 
   /* Open the root device and the destination device.  */
   grub_util_info ("Opening root");
@@ -243,6 +219,11 @@ setup (const char *prefix, const char *dir,
   if (! dest_dev)
     grub_util_error ("%s", grub_errmsg);
 
+  dest_ofpath
+    = grub_util_devname_to_ofpath (grub_util_biosdisk_get_osdev (dest_dev->disk));
+
+  grub_util_info ("dest_ofpath is `%s'", dest_ofpath);
+
   grub_util_info ("setting the root device to `%s'", root);
   if (grub_env_set ("root", root) != GRUB_ERR_NONE)
     grub_util_error ("%s", grub_errmsg);
@@ -449,7 +430,6 @@ init_info (struct grub_setup_info *gp)
   gp->dev_map = NULL;
   gp->root_dev = NULL;
   gp->prefix = NULL;
-  gp->dest_dev = NULL;
 }
 
 static int

From d0faf8a1b3c0a8e21b4ef17e10118a8b336a216c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Apr 2010 16:31:27 +0200
Subject: [PATCH 0804/1628] Correct path to grub-ofpathname

---
 conf/sparc64-ieee1275.rmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index a92e66a80..c82bd81f3 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -70,7 +70,7 @@ grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c	\
 	grub_setup_init.c
 
 # For grub-ofpathname.
-grub_ofpathname_SOURCES = util/sparc64/ieee1275/grub-ofpathname.c \
+grub_ofpathname_SOURCES = util/ieee1275/grub-ofpathname.c \
 	util/ieee1275/ofpath.c util/misc.c gnulib/progname.c
 
 # Scripts.

From ee9056d097bafe2324d4adaf912364aa9e7fd296 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Apr 2010 16:35:08 +0200
Subject: [PATCH 0805/1628] Support cross-disk installs. On non-cross-disk
 retrieve bootpath from chosen/bootpath

---
 boot/sparc64/ieee1275/boot.S         | 16 ++++++++++++++++
 include/grub/sparc64/ieee1275/boot.h |  4 ++--
 util/sparc64/ieee1275/grub-setup.c   | 27 +++++++++++++++++++--------
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/boot/sparc64/ieee1275/boot.S b/boot/sparc64/ieee1275/boot.S
index 167406017..4008b1b54 100644
--- a/boot/sparc64/ieee1275/boot.S
+++ b/boot/sparc64/ieee1275/boot.S
@@ -152,6 +152,22 @@ boot_continue:
 	call	console_write
 	 mov	GRUB_NAME_LEN, %o3
 
+	GET_ABS(boot_path, %o3)
+	ldub	[%o3], %o1
+	brnz,pn	%o1, bootpath_known
+	 mov	4, %g1
+
+	/* getprop(chosen_node, "bootpath", &buffer, buffer_size) */
+	 GET_ABS(prom_getprop_name, %o0)
+	mov	1, %o5
+	mov	CHOSEN_NODE_REG, %o1
+	GET_ABS(prom_bootpath_name, %o2)
+	mov	(kernel_sector - boot_path), %o4
+	call	prom_call
+	 stx	%g1, [%l1 + 256]
+
+bootpath_known:	
+
 	/* Open up the boot_path, and use that handle to read the
 	 * first block of the GRUB kernel image.
 	 *
diff --git a/include/grub/sparc64/ieee1275/boot.h b/include/grub/sparc64/ieee1275/boot.h
index e1c1aa675..7b2137664 100644
--- a/include/grub/sparc64/ieee1275/boot.h
+++ b/include/grub/sparc64/ieee1275/boot.h
@@ -43,9 +43,9 @@
 
 #define GRUB_BOOT_MACHINE_BOOT_DEVPATH	0x0a
 
-#define GRUB_BOOT_MACHINE_BOOT_DEVPATH_END 0x80
+#define GRUB_BOOT_MACHINE_BOOT_DEVPATH_END (0x80 - 40)
 
-#define GRUB_BOOT_MACHINE_KERNEL_SECTOR 0x88
+#define GRUB_BOOT_MACHINE_KERNEL_SECTOR (0x80 - 40)
 
 #define GRUB_BOOT_MACHINE_CODE_END \
 	(0x1fc - GRUB_BOOT_AOUT_HEADER_SIZE)
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index cfd58a08f..97cc89301 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -114,7 +114,7 @@ setup (const char *prefix, const char *dir,
   size_t boot_size, core_size;
   grub_uint16_t core_sectors;
   grub_device_t root_dev, dest_dev;
-  char *boot_devpath, *dest_ofpath;
+  char *boot_devpath;
   grub_disk_addr_t *kernel_sector;
   struct boot_blocklist *first_block, *block;
   char *tmp_img;
@@ -219,11 +219,6 @@ setup (const char *prefix, const char *dir,
   if (! dest_dev)
     grub_util_error ("%s", grub_errmsg);
 
-  dest_ofpath
-    = grub_util_devname_to_ofpath (grub_util_biosdisk_get_osdev (dest_dev->disk));
-
-  grub_util_info ("dest_ofpath is `%s'", dest_ofpath);
-
   grub_util_info ("setting the root device to `%s'", root);
   if (grub_env_set ("root", root) != GRUB_ERR_NONE)
     grub_util_error ("%s", grub_errmsg);
@@ -332,6 +327,24 @@ setup (const char *prefix, const char *dir,
       != (grub_ssize_t) core_size - GRUB_DISK_SECTOR_SIZE)
     grub_util_error ("failed to read the rest sectors of the core image");
 
+  if (file->device->disk->id != dest_dev->disk->id)
+    {
+      const char *dest_ofpath;
+      dest_ofpath
+	= grub_util_devname_to_ofpath (grub_util_biosdisk_get_osdev (file->device->disk));
+      grub_util_info ("dest_ofpath is `%s'", dest_ofpath);
+      strncpy (boot_devpath, dest_ofpath, GRUB_BOOT_MACHINE_BOOT_DEVPATH_END
+	       - GRUB_BOOT_MACHINE_BOOT_DEVPATH - 1);
+      boot_devpath[GRUB_BOOT_MACHINE_BOOT_DEVPATH_END
+		   - GRUB_BOOT_MACHINE_BOOT_DEVPATH - 1] = 0;
+    }
+  else
+    {
+      grub_util_info ("non cross-disk install");
+      memset (boot_devpath, 0, GRUB_BOOT_MACHINE_BOOT_DEVPATH_END
+	      - GRUB_BOOT_MACHINE_BOOT_DEVPATH);
+    }
+
   grub_file_close (file);
 
   free (core_path);
@@ -339,8 +352,6 @@ setup (const char *prefix, const char *dir,
 
   *kernel_sector = grub_cpu_to_be64 (first_sector);
 
-  strcpy(boot_devpath, dest_ofpath);
-
   grub_util_info ("boot device path %s, prefix is %s, dest is %s",
 		  boot_devpath, prefix, dest);
 

From b076cdc730408d5d5ae0c6279b2560e3de1582fc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Apr 2010 18:22:58 +0200
Subject: [PATCH 0806/1628] Shave off bytes to compensate boot.img size
 increase

---
 boot/sparc64/ieee1275/boot.S         | 73 +++++++++++++---------------
 include/grub/sparc64/ieee1275/boot.h |  4 +-
 util/sparc64/ieee1275/grub-setup.c   | 10 ++--
 3 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/boot/sparc64/ieee1275/boot.S b/boot/sparc64/ieee1275/boot.S
index 4008b1b54..f08258f47 100644
--- a/boot/sparc64/ieee1275/boot.S
+++ b/boot/sparc64/ieee1275/boot.S
@@ -45,8 +45,9 @@ boot_version:		.byte	GRUB_BOOT_VERSION_MAJOR, GRUB_BOOT_VERSION_MINOR
 	 * load address plus the size of the prepended A.OUT header (32 bytes).
 	 */
 boot_path:
-	. = _start + GRUB_BOOT_MACHINE_KERNEL_SECTOR
-kernel_sector:		.xword 2
+	. = _start + GRUB_BOOT_MACHINE_KERNEL_BYTE
+boot_path_end:
+kernel_byte:		.xword (2 << 9)
 kernel_address:		.word  GRUB_BOOT_MACHINE_KERNEL_ADDR
 
 prom_finddev_name:	.asciz "finddevice"
@@ -77,11 +78,23 @@ prom_error:
 	/* %o0: OF call name
 	 * %o1: input arg 1
 	 */
-prom_call_1_1:
-	mov	1, %g1
-	ba	prom_call
-	 mov	1, %o5
+prom_call_1_1_o2:
+	clr	%o2
+	ba	prom_call_x_1
+	 mov	1, %g1
 
+prom_call_getprop:
+	mov	4, %g1
+	stx	%g1, [%l1 + 256]
+	mov	CHOSEN_NODE_REG, %o1
+	ba	prom_call_x_1
+	 GET_ABS(prom_getprop_name, %o0)
+
+prom_call_3_1_o1:
+	ba prom_call_3_1
+	 mov	BOOTDEV_REG, %o1
+
+	
 	/* %o2: message string
 	 * %o3: message length
 	 */
@@ -95,8 +108,9 @@ console_write:
 	 * %o2: input arg 2
 	 * %o3: input arg 3
 	 */
-prom_call_3_1:
+prom_call_3_1:	
 	mov	3, %g1
+prom_call_x_1:
 	mov	1, %o5
 	/* fallthru */
 
@@ -126,23 +140,17 @@ boot_continue:
 	 * chosen_node = prom_finddevice("/chosen")
 	 */
 	GET_ABS(prom_finddev_name, %o0)
-	GET_ABS(prom_chosen_path, %o1)
-	call	prom_call_1_1
-	 clr	%o2
+	call	prom_call_1_1_o2
+	 GET_ABS(prom_chosen_path, %o1)
 
 	ldx	[%l1 + 0x20], CHOSEN_NODE_REG
 	brz	CHOSEN_NODE_REG, prom_error
 
 	/* getprop(chosen_node, "stdout", &buffer, buffer_size) */
-	 GET_ABS(prom_getprop_name, %o0)
-	mov	4, %g1
-	mov	1, %o5
-	mov	CHOSEN_NODE_REG, %o1
-	GET_ABS(prom_stdout_name, %o2)
+	 GET_ABS(prom_stdout_name, %o2)
 	add	%l1, 256, %o3
-	mov	1024, %o4
-	call	prom_call
-	 stx	%g1, [%l1 + 256]
+	call	prom_call_getprop
+	 mov	1024, %o4
 
 	lduw	[%l1 + 256], STDOUT_NODE_REG
 	brz,pn	STDOUT_NODE_REG, prom_error
@@ -155,16 +163,11 @@ boot_continue:
 	GET_ABS(boot_path, %o3)
 	ldub	[%o3], %o1
 	brnz,pn	%o1, bootpath_known
-	 mov	4, %g1
 
 	/* getprop(chosen_node, "bootpath", &buffer, buffer_size) */
-	 GET_ABS(prom_getprop_name, %o0)
-	mov	1, %o5
-	mov	CHOSEN_NODE_REG, %o1
-	GET_ABS(prom_bootpath_name, %o2)
-	mov	(kernel_sector - boot_path), %o4
-	call	prom_call
-	 stx	%g1, [%l1 + 256]
+	 GET_ABS(prom_bootpath_name, %o2)
+	call	prom_call_getprop
+	 mov	(boot_path_end - boot_path), %o4
 
 bootpath_known:	
 
@@ -174,9 +177,8 @@ bootpath_known:
 	 * bootdev_handle = open(boot_path)
 	 */
 	GET_ABS(prom_open_name, %o0)
-	GET_ABS(boot_path, %o1)
-	call	prom_call_1_1
-	 clr	%o2
+	call	prom_call_1_1_o2
+	 GET_ABS(boot_path, %o1)
 
 	ldx	[%l1 + 0x20], BOOTDEV_REG
 	brz,pn	BOOTDEV_REG, prom_open_error
@@ -184,28 +186,23 @@ bootpath_known:
 	/* Since we have 64-bit cells, the high cell of the seek offset
 	 * is zero and the low cell is the entire value.
 	 *
-	 * seek(bootdev, 0, *kernel_sector << 9)
+	 * seek(bootdev, 0, *kernel_byte)
 	 */
 	 GET_ABS(prom_seek_name, %o0)
-	mov	BOOTDEV_REG, %o1
 	clr	%o2
-	LDX_ABS(kernel_sector, 0x00, %o3)
-	call	prom_call_3_1
-	 sllx	%o3, 9, %o3
+	call	prom_call_3_1_o1
+	 LDX_ABS(kernel_byte, 0x00, %o3)
 
 	/* read(bootdev, *kernel_address, 512) */
 	GET_ABS(prom_read_name, %o0)
-	mov	BOOTDEV_REG, %o1
 	LDUW_ABS(kernel_address, 0x00, %o2)
-	call	prom_call_3_1
+	call	prom_call_3_1_o1
 	 mov	512, %o3
 
 	LDUW_ABS(kernel_address, 0x00, %o2)
 	jmpl	%o2, %o7
 	 nop
 
-1:	ba,a	1b
-
 	. = _start + GRUB_BOOT_MACHINE_CODE_END
 
 /* the last 4 bytes in the sector 0 contain the signature */
diff --git a/include/grub/sparc64/ieee1275/boot.h b/include/grub/sparc64/ieee1275/boot.h
index 7b2137664..9671c6900 100644
--- a/include/grub/sparc64/ieee1275/boot.h
+++ b/include/grub/sparc64/ieee1275/boot.h
@@ -43,9 +43,9 @@
 
 #define GRUB_BOOT_MACHINE_BOOT_DEVPATH	0x0a
 
-#define GRUB_BOOT_MACHINE_BOOT_DEVPATH_END (0x80 - 40)
+#define GRUB_BOOT_MACHINE_BOOT_DEVPATH_END 0x80
 
-#define GRUB_BOOT_MACHINE_KERNEL_SECTOR (0x80 - 40)
+#define GRUB_BOOT_MACHINE_KERNEL_BYTE 0x80
 
 #define GRUB_BOOT_MACHINE_CODE_END \
 	(0x1fc - GRUB_BOOT_AOUT_HEADER_SIZE)
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index 97cc89301..34a006d7f 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -115,7 +115,7 @@ setup (const char *prefix, const char *dir,
   grub_uint16_t core_sectors;
   grub_device_t root_dev, dest_dev;
   char *boot_devpath;
-  grub_disk_addr_t *kernel_sector;
+  grub_disk_addr_t *kernel_byte;
   struct boot_blocklist *first_block, *block;
   char *tmp_img;
   int i;
@@ -187,9 +187,9 @@ setup (const char *prefix, const char *dir,
   boot_devpath = (char *) (boot_img
 			   + GRUB_BOOT_AOUT_HEADER_SIZE
 			   + GRUB_BOOT_MACHINE_BOOT_DEVPATH);
-  kernel_sector = (grub_disk_addr_t *) (boot_img
-					+ GRUB_BOOT_AOUT_HEADER_SIZE
-					+ GRUB_BOOT_MACHINE_KERNEL_SECTOR);
+  kernel_byte = (grub_disk_addr_t *) (boot_img
+				      + GRUB_BOOT_AOUT_HEADER_SIZE
+				      + GRUB_BOOT_MACHINE_KERNEL_BYTE);
 
   core_path = grub_util_get_path (dir, core_file);
   core_size = grub_util_get_image_size (core_path);
@@ -350,7 +350,7 @@ setup (const char *prefix, const char *dir,
   free (core_path);
   free (tmp_img);
 
-  *kernel_sector = grub_cpu_to_be64 (first_sector);
+  *kernel_byte = grub_cpu_to_be64 (first_sector << GRUB_DISK_SECTOR_BITS);
 
   grub_util_info ("boot device path %s, prefix is %s, dest is %s",
 		  boot_devpath, prefix, dest);

From 38e55e905886e905f0a7d966e0a61cb50c86909f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Sun, 18 Apr 2010 19:57:50 +0200
Subject: [PATCH 0807/1628] TARGET_IMG_LDFLAGS_AC now always expects a number
 appended to it.  Fixed grub_prefix in grub-mkconfig for NetBSD and OpenBSD.

---
 ChangeLog             |  9 +++++++++
 acinclude.m4          |  2 +-
 configure.ac          |  4 ++--
 util/grub-mkconfig.in | 18 +++++++++++++++---
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6f39713a2..796d5614d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-04-18  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* util/grub-mkconfig.in: Corrected two == equality tests.
+	Set grub_prefix as in grub-install for NetBSD and OpenBSD.
+	* configure.ac: All definitions and uses of TARGET_IMG_LDFLAGS_AC now
+	expect a number appended to it.
+	* acinclude.m4 (grub_PROG_OBJCOPY_ABSOLUTE): ${TARGET_IMG_LDFLAGS_AC}
+	expects a number appended to it.
+
 2010-04-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* po/POTFILES: Renamed multiboot_loader.c to multiboot.c
diff --git a/acinclude.m4 b/acinclude.m4
index 692404e20..72483b5d0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -93,7 +93,7 @@ else
 fi
 grub_cv_prog_objcopy_absolute=yes
 for link_addr in 0x2000 0x8000 0x7C00; do
-  if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib ${TARGET_IMG_LDFLAGS_AC} -Wl,-Ttext -Wl,$link_addr conftest.o -o conftest.exec]); then :
+  if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib ${TARGET_IMG_LDFLAGS_AC}$link_addr conftest.o -o conftest.exec]); then :
   else
     AC_MSG_ERROR([${CC-cc} cannot link at address $link_addr])
   fi
diff --git a/configure.ac b/configure.ac
index 3116d6584..5b959fb01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -360,7 +360,7 @@ else
 if test -f "${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
   TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
   TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}  -Wl,-Ttext,"
-  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
+  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc  -Wl,-Ttext,"
 else
   TARGET_IMG_LDSCRIPT=
   TARGET_IMG_LDFLAGS='-Wl,-N  -Wl,-Ttext,'
@@ -515,7 +515,7 @@ grub_PROG_LD_BUILD_ID_NONE
 if test "x$target_cpu" = xi386; then
   if test ! -z "$TARGET_IMG_LDSCRIPT"; then
     # Check symbols provided by linker script.
-    CFLAGS="$TARGET_CFLAGS -nostdlib $TARGET_IMG_LDFLAGS_AC -Wl,-Ttext,8000,--defsym,___main=0x8100"
+    CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC}8000,--defsym,___main=0x8100"
   fi
   if test "x$TARGET_APPLE_CC" != x1 ; then
     grub_CHECK_BSS_START_SYMBOL
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index b98bbc993..4e476ae06 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -24,10 +24,10 @@ sbindir=@sbindir@
 libdir=@libdir@
 sysconfdir=@sysconfdir@
 package_version=@PACKAGE_VERSION@
+host_os=@host_os@
 datarootdir=@datarootdir@
 datadir=@datadir@
 pkgdatadir=${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`
-grub_prefix=`echo /boot/grub | sed ${transform}`
 grub_cfg=""
 grub_mkconfig_dir=${sysconfdir}/grub.d
 
@@ -75,6 +75,18 @@ done
 
 . ${libdir}/grub/grub-mkconfig_lib
 
+case "$host_os" in
+netbsd* | openbsd*)
+    # Because /boot is used for the boot block in NetBSD and OpenBSD, use /grub
+    # instead of /boot/grub.
+    grub_prefix=`echo /grub | sed ${transform}`
+    ;;
+*)
+    # Use /boot/grub by default.
+    grub_prefix=`echo /boot/grub | sed ${transform}`
+    ;;
+esac
+
 if [ "x$EUID" = "x" ] ; then
   EUID=`id -u`
 fi
@@ -141,13 +153,13 @@ if [ "x${GRUB_TERMINAL}" != "x" ] ; then
 fi
 
 termoutdefault=0
-if [ "x${GRUB_TERMINAL_OUTPUT}" == x ]; then
+if [ "x${GRUB_TERMINAL_OUTPUT}" = "x" ]; then
     GRUB_TERMINAL_OUTPUT=gfxterm;
     termoutdefault=1;
 fi
 
 for x in ${GRUB_TERMINAL_OUTPUT}; do
-    if [ x${x} == xgfxterm ]; then
+    if [ "x${x}" = "xgfxterm" ]; then
         # If this platform supports gfxterm, try to use it.
 	if ! test -e ${grub_prefix}/gfxterm.mod ; then
 	    if [ "x$termoutdefault" != "x1" ]; then

From 7428eb2cf6b0b7e5edf250713ae4d8ee65ca598d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Apr 2010 20:38:40 +0200
Subject: [PATCH 0808/1628] Revert useless and wrong parts

---
 conf/powerpc-ieee1275.rmk          | 7 -------
 util/sparc64/ieee1275/grub-setup.c | 1 +
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index d7d477327..d5968ac8e 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -25,13 +25,6 @@ kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x200000,-Bstatic
 
-# Utilities.
-sbin_UTILITIES = grub-ofpathname
-
-# For grub-ofpathname.
-grub_ofpathname_SOURCES = util/ieee1275/grub-ofpathname.c \
-	util/ieee1275/ofpath.c util/misc.c gnulib/progname.c
-
 # Scripts.
 sbin_SCRIPTS = grub-install
 bin_SCRIPTS = grub-mkrescue
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index 34a006d7f..b511a96b2 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -441,6 +441,7 @@ init_info (struct grub_setup_info *gp)
   gp->dev_map = NULL;
   gp->root_dev = NULL;
   gp->prefix = NULL;
+  gp->dest_dev = NULL;
 }
 
 static int

From a6a6609cfc7bc1d605cd16cd36800f5d905a5e22 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Apr 2010 20:38:59 +0200
Subject: [PATCH 0809/1628] ChangeLog

---
 ChangeLog.sparcfixes | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 ChangeLog.sparcfixes

diff --git a/ChangeLog.sparcfixes b/ChangeLog.sparcfixes
new file mode 100644
index 000000000..3e7bcbaf9
--- /dev/null
+++ b/ChangeLog.sparcfixes
@@ -0,0 +1,19 @@
+2010-04-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* boot/sparc64/ieee1275/boot.S: Various size-reducing changes.
+	Retrieve chosen/bootpath if bootpath isn't hardcoded.
+	* conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Add
+	util/ieee1275/ofpath.c.
+	* util/sparc64/ieee1275/grub-ofpathname.c: Renamed to ...
+	* util/ieee1275/grub-ofpathname.c: ... this. All users updated
+	* include/grub/sparc64/ieee1275/boot.h
+	(GRUB_BOOT_MACHINE_KERNEL_SECTOR): Renamed to ...
+	(GRUB_BOOT_MACHINE_KERNEL_BYTE): ...this. Moved 8 bytes lower.
+	* util/hostdisk.c (grub_util_biosdisk_get_osdev): New function.
+	* util/ieee1275/ofpath.c (grub_util_devname_to_ofpath): Make argument
+	const char *.
+	* util/sparc64/ieee1275/grub-setup.c (compute_dest_ofpath): Removed.
+	(setup): Use KERNEL_BYTE instead of KERNEL_SECTOR.
+	Use grub_util_devname_to_ofpath. Zero-fill boot_devpath on same disk
+	install.
+

From 189593857c736841fb79cfabbcb280f690c3ab81 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 19 Apr 2010 02:41:48 +0200
Subject: [PATCH 0810/1628] 	* fs/udf.c (grub_udf_iterate_dir): Decode the
 Unicode filenames.

---
 ChangeLog |  4 ++++
 fs/udf.c  | 33 ++++++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c9c398603..ee2cf4079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* fs/udf.c (grub_udf_iterate_dir): Decode the Unicode filenames.
+
 2010-04-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* boot/sparc64/ieee1275/boot.S: Various size-reducing changes.
diff --git a/fs/udf.c b/fs/udf.c
index cecb6eb78..725468f54 100644
--- a/fs/udf.c
+++ b/fs/udf.c
@@ -25,6 +25,7 @@
 #include <grub/dl.h>
 #include <grub/types.h>
 #include <grub/fshelp.h>
+#include <grub/charset.h>
 
 #define GRUB_UDF_MAX_PDS		2
 #define GRUB_UDF_MAX_PMS		6
@@ -745,19 +746,41 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir,
       else
 	{
 	  enum grub_fshelp_filetype type;
-	  char filename[dirent.file_ident_length + 1];
+	  grub_uint8_t raw[dirent.file_ident_length];
+	  grub_uint16_t utf16[dirent.file_ident_length - 1];
+	  grub_uint8_t filename[dirent.file_ident_length * 2];
+	  grub_size_t utf16len;
 
 	  type = ((dirent.characteristics & GRUB_UDF_FID_CHAR_DIRECTORY) ?
 		  (GRUB_FSHELP_DIR) : (GRUB_FSHELP_REG));
 
 	  if ((grub_udf_read_file (dir, 0, offset,
-				   dirent.file_ident_length, filename))
+				   dirent.file_ident_length,
+				   (char *) raw))
 	      != dirent.file_ident_length)
 	    return 0;
 
-	  filename[dirent.file_ident_length] = 0;
-	  if (hook (&filename[1], type, child))
-	    return 1;
+	  if (raw[0] == 8)
+	    {
+	      unsigned i;
+	      utf16len = dirent.file_ident_length - 1;
+	      for (i = 0; i < utf16len; i++)
+		utf16[i] = raw[i + 1];
+	    }
+	  if (raw[0] == 16)
+	    {
+	      unsigned i;
+	      utf16len = (dirent.file_ident_length - 1) / 2;
+	      for (i = 0; i < utf16len; i++)
+		utf16[i] = (raw[2 * i + 1] << 8) | raw[2*i + 2];
+	    }
+	  if (raw[0] == 8 || raw[0] == 16)
+	    {
+	      *grub_utf16_to_utf8 (filename, utf16, utf16len) = '\0';
+	  
+	      if (hook ((char *) filename, type, child))
+		return 1;
+	    }
 	}
 
       /* Align to dword boundary.  */

From f48c87aae870fd859909d9e79b0d15e2b5db2d80 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 19 Apr 2010 03:28:55 +0200
Subject: [PATCH 0811/1628] 	* fs/udf.c (grub_udf_iterate_dir): Silence a
 spurious warning.

---
 ChangeLog | 4 ++++
 fs/udf.c  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ee2cf4079..04e84a415 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* fs/udf.c (grub_udf_iterate_dir): Silence a spurious warning.
+
 2010-04-19  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* fs/udf.c (grub_udf_iterate_dir): Decode the Unicode filenames.
diff --git a/fs/udf.c b/fs/udf.c
index 725468f54..ad109bed9 100644
--- a/fs/udf.c
+++ b/fs/udf.c
@@ -749,7 +749,7 @@ grub_udf_iterate_dir (grub_fshelp_node_t dir,
 	  grub_uint8_t raw[dirent.file_ident_length];
 	  grub_uint16_t utf16[dirent.file_ident_length - 1];
 	  grub_uint8_t filename[dirent.file_ident_length * 2];
-	  grub_size_t utf16len;
+	  grub_size_t utf16len = 0;
 
 	  type = ((dirent.characteristics & GRUB_UDF_FID_CHAR_DIRECTORY) ?
 		  (GRUB_FSHELP_DIR) : (GRUB_FSHELP_REG));

From 454c3001f20d7a6662db39f6e50728833eec3177 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 19 Apr 2010 15:15:59 +0530
Subject: [PATCH 0812/1628] fix emu build with grub-emu-pci and
 grub-emu-modules

---
 conf/any-emu.rmk            |  3 ++-
 include/grub/libpciaccess.h | 26 ++++++++++++++++++++++++++
 include/grub/util/misc.h    |  7 ++++---
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 include/grub/libpciaccess.h

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index ddc6b0fd4..d1e5754dc 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -14,7 +14,7 @@ kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c kern/env.c	\
 	util/hostdisk.c util/getroot.c util/mm.c util/time.c		\
 	\
 	gnulib/progname.c util/hostfs.c disk/host.c
-kernel_img_HEADERS += datetime.h
+kernel_img_HEADERS += datetime.h util/misc.h
 kernel_img_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-undef -I$(srcdir)/gnulib
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 TARGET_NO_STRIP = yes
@@ -88,6 +88,7 @@ pkglib_MODULES += pci.mod
 pci_mod_SOURCES = util/pci.c commands/lspci.c
 pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 grub_emu_LDFLAGS += $(LIBPCIACCESS)
+kernel_img_HEADERS += libpciaccess.h
 endif
 
 include $(srcdir)/conf/common.mk
diff --git a/include/grub/libpciaccess.h b/include/grub/libpciaccess.h
new file mode 100644
index 000000000..4d2b3bde5
--- /dev/null
+++ b/include/grub/libpciaccess.h
@@ -0,0 +1,26 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+void EXPORT_FUNC (pci_slot_match_iterator_create) (void);
+void EXPORT_FUNC (pci_system_cleanup) (void);
+void EXPORT_FUNC (pci_device_unmap_range) (void);
+void EXPORT_FUNC (pci_iterator_destroy) (void);
+void EXPORT_FUNC (pci_device_map_range) (void);
+void EXPORT_FUNC (pci_device_cfg_read_u32) (void);
+void EXPORT_FUNC (pci_device_next) (void);
+void EXPORT_FUNC (pci_system_init) (void);
diff --git a/include/grub/util/misc.h b/include/grub/util/misc.h
index 63d4dac6d..8b78b92ea 100644
--- a/include/grub/util/misc.h
+++ b/include/grub/util/misc.h
@@ -27,6 +27,7 @@
 
 #include <config.h>
 #include <grub/types.h>
+#include <grub/symbol.h>
 
 #ifdef __NetBSD__
 /* NetBSD uses /boot for its boot block.  */
@@ -40,9 +41,9 @@
 extern char *progname;
 extern int verbosity;
 
-void grub_util_warn (const char *fmt, ...);
-void grub_util_info (const char *fmt, ...);
-void grub_util_error (const char *fmt, ...) __attribute__ ((noreturn));
+void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...);
+void EXPORT_FUNC(grub_util_info) (const char *fmt, ...);
+void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((noreturn));
 
 void *xmalloc (size_t size);
 void *xrealloc (void *ptr, size_t size);

From 0d2c20c6f15ec8c7bcc1e7f30c7f9e0f561deb2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Mon, 19 Apr 2010 21:25:41 +0200
Subject: [PATCH 0813/1628] Add grub-mkconfig support for NetBSD.

---
 ChangeLog                 |  9 ++++
 po/POTFILES-shell         |  1 +
 util/grub-mkconfig.in     |  3 ++
 util/grub-mkconfig_lib.in |  8 +++-
 util/grub.d/10_netbsd.in  | 86 +++++++++++++++++++++++++++++++++++++++
 5 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 util/grub.d/10_netbsd.in

diff --git a/ChangeLog b/ChangeLog
index 57565fcb3..a80606f46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-04-19  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	Add grub-mkconfig support for NetBSD.
+
+	* util/grub.d/10_netbsd.in: grub-mkconfig helper script for NetBSD.
+	* util/grub-mkconfig.in: export new NetBSD specific variables.
+	* po/POTFILES-shell: added 10_netbsd.in.
+	* util/grub-mkconfig_lib.in: check for gettext binary, default to echo.
+
 2010-04-19  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Fix emu build with grub-emu-pci and grub-emu-modules.
diff --git a/po/POTFILES-shell b/po/POTFILES-shell
index cb28d331b..90d2b978c 100644
--- a/po/POTFILES-shell
+++ b/po/POTFILES-shell
@@ -2,3 +2,4 @@
 # Shell language are included here.
 util/grub.d/10_kfreebsd.in
 util/grub.d/10_linux.in
+util/grub.d/10_netbsd.in
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 4e476ae06..85212f8fc 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -239,11 +239,14 @@ export GRUB_DEFAULT \
   GRUB_DISTRIBUTOR \
   GRUB_CMDLINE_LINUX \
   GRUB_CMDLINE_LINUX_DEFAULT \
+  GRUB_CMDLINE_NETBSD \
+  GRUB_CMDLINE_NETBSD_DEFAULT \
   GRUB_TERMINAL_INPUT \
   GRUB_TERMINAL_OUTPUT \
   GRUB_SERIAL_COMMAND \
   GRUB_DISABLE_LINUX_UUID \
   GRUB_DISABLE_LINUX_RECOVERY \
+  GRUB_DISABLE_NETBSD_RECOVERY \
   GRUB_GFXMODE \
   GRUB_BACKGROUND \
   GRUB_THEME \
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index a4151348c..831bef846 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -31,6 +31,12 @@ if test "x$grub_mkrelpath" = x; then
   grub_mkrelpath=${bindir}/`echo grub-mkrelpath | sed ${transform}`
 fi
 
+if $(which gettext >/dev/null 2>/dev/null) ; then
+  gettext="gettext"
+else
+  gettext="echo"
+fi
+
 grub_warn ()
 {
   echo "Warning: $@" >&2
@@ -190,5 +196,5 @@ version_find_latest ()
 }
 
 gettext_quoted () {
-  gettext "$@" | sed "s/'/'\\\\''/g"
+  $gettext "$@" | sed "s/'/'\\\\''/g"
 }
diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in
new file mode 100644
index 000000000..7e5fb34ad
--- /dev/null
+++ b/util/grub.d/10_netbsd.in
@@ -0,0 +1,86 @@
+#! /bin/sh -e
+
+# grub-mkconfig helper script.
+# Copyright (C) 2006,2007,2008,2009,2010  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/>.
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+libdir=@libdir@
+. ${libdir}/grub/grub-mkconfig_lib
+
+export TEXTDOMAIN=@PACKAGE@
+export TEXTDOMAINDIR=@localedir@
+
+if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+  OS=NetBSD
+else
+  OS="${GRUB_DISTRIBUTOR} NetBSD"
+fi
+
+netbsd_entry ()
+{
+  loader="$1"	# "knetbsd" or "multiboot"
+  kernel="$2"	# absolute path to the kernel file
+  recovery="$3"	# is this is a recovery entry?
+  args="$4"	# extra arguments appended to loader command
+
+  kroot_device="$(echo ${GRUB_DEVICE} | sed -e 's,^/dev/r,,')"
+  if ${recovery} ; then
+    title="$(gettext_quoted "%s, with kernel %s (via %s, recovery mode)")"
+  else
+    title="$(gettext_quoted "%s, with kernel %s (via %s)")"
+  fi
+
+  printf "menuentry \"${title}\" {\n" \
+    "${OS}" "$(echo ${kernel} | sed -e 's,^.*/,,')" "${loader}"
+  printf "%s\n" "${prepare_boot_cache}"
+  case "${loader}" in
+    knetbsd)
+      printf "\tknetbsd %s -r %s %s\n" \
+        "${kernel}" "${kroot_device}" "${GRUB_CMDLINE_NETBSD} ${args}"
+      ;;
+    multiboot)
+      printf "\tmultiboot %s %s root=%s %s\n" \
+        "${kernel}" "${kernel}" "${kroot_device}" "${GRUB_CMDLINE_NETBSD} ${args}"
+      ;;
+  esac
+  printf "}\n"
+}
+
+prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e 's,^,	,')"
+
+# We look for NetBSD kernels in / but not in subdirectories.  We simply
+# pick all statically linked ELF executable files (or links) in / with a
+# name that starts with `netbsd'.
+pattern="^ELF[^,]*executable.*statically linked"
+for k in $(ls -t /netbsd*) ; do
+  if ! grub_file_is_not_garbage "$k" ; then
+    continue
+  fi
+  if ! ((file -bL "$k" | grep -q "${pattern}") ||
+        (zcat "$k" | file -bL - | grep -q "${pattern}")) 2>/dev/null ; then
+    continue
+  fi
+
+  echo "Found NetBSD kernel: $k" >&2
+  netbsd_entry "knetbsd"   "$k" false "${GRUB_CMDLINE_NETBSD_DEFAULT}"
+  netbsd_entry "multiboot" "$k" false "${GRUB_CMDLINE_NETBSD_DEFAULT}"
+  if [ "x${GRUB_DISABLE_NETBSD_RECOVERY}" != "xtrue" ]; then
+    netbsd_entry "knetbsd"   "$k" true "-s"
+    netbsd_entry "multiboot" "$k" true "-s"
+  fi
+done

From 91b58e6b747a4f3a7533090bf1e2e05ade05d038 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 20 Apr 2010 18:08:26 +0200
Subject: [PATCH 0814/1628] EFI requests support for newreloc

---
 conf/i386.rmk                    |   7 ++
 include/grub/efi/efi.h           |   8 +-
 include/grub/relocator_private.h |   8 ++
 kern/efi/efi.c                   |  34 ------
 kern/efi/mm.c                    |  74 +++++++++++++
 lib/efi/relocator.c              | 104 ++++++++++++++++++
 lib/relocator.c                  | 174 ++++++++++++++++++++++++++-----
 loader/i386/bsd.c                |  20 ++--
 loader/i386/linux.c              |  12 +--
 loader/i386/xnu.c                |  12 +--
 loader/multiboot.c               |   5 +-
 term/efi/console.c               |  27 ++++-
 12 files changed, 399 insertions(+), 86 deletions(-)
 create mode 100644 lib/efi/relocator.c

diff --git a/conf/i386.rmk b/conf/i386.rmk
index e223694df..e04d73d61 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -22,10 +22,17 @@ relocator_mod_SOURCES = lib/relocator.c lib/i386/relocator32.S \
 	lib/$(target_cpu)/relocator_asm.S lib/i386/relocator.c \
 	lib/ieee1275/relocator.c
 else
+ifeq ($(platform), efi)
+relocator_mod_SOURCES = lib/relocator.c lib/i386/relocator32.S \
+	lib/i386/relocator64.S lib/i386/relocator16.S \
+	lib/$(target_cpu)/relocator_asm.S lib/i386/relocator.c \
+	lib/efi/relocator.c
+else
 relocator_mod_SOURCES = lib/relocator.c lib/i386/relocator32.S \
 	lib/i386/relocator64.S lib/i386/relocator16.S \
 	lib/$(target_cpu)/relocator_asm.S lib/i386/relocator.c
 endif
+endif
 relocator_mod_CFLAGS = $(COMMON_CFLAGS)
 relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
 relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
index 5852a476f..a56b3f56b 100644
--- a/include/grub/efi/efi.h
+++ b/include/grub/efi/efi.h
@@ -53,8 +53,10 @@ void EXPORT_FUNC(grub_efi_print_device_path) (grub_efi_device_path_t *dp);
 char *EXPORT_FUNC(grub_efi_get_filename) (grub_efi_device_path_t *dp);
 grub_efi_device_path_t *
 EXPORT_FUNC(grub_efi_get_device_path) (grub_efi_handle_t handle);
-int EXPORT_FUNC(grub_efi_exit_boot_services) (grub_efi_uintn_t map_key);
-int EXPORT_FUNC (grub_efi_finish_boot_services) (void);
+grub_err_t EXPORT_FUNC (grub_efi_finish_boot_services) (grub_size_t *outbuf_size, void *outbuf,
+							grub_efi_uintn_t *map_key,
+							grub_efi_uintn_t *efi_desc_size,
+							grub_efi_uint32_t *efi_desc_version);
 grub_err_t EXPORT_FUNC (grub_efi_set_virtual_address_map) (grub_efi_uintn_t memory_map_size,
 							   grub_efi_uintn_t descriptor_size,
 							   grub_efi_uint32_t descriptor_version,
@@ -70,4 +72,6 @@ void grub_efi_set_prefix (void);
 extern grub_efi_system_table_t *EXPORT_VAR(grub_efi_system_table);
 extern grub_efi_handle_t EXPORT_VAR(grub_efi_image_handle);
 
+extern int EXPORT_VAR(grub_efi_is_finished);
+
 #endif /* ! GRUB_EFI_EFI_HEADER */
diff --git a/include/grub/relocator_private.h b/include/grub/relocator_private.h
index c526b0b0c..8398defbd 100644
--- a/include/grub/relocator_private.h
+++ b/include/grub/relocator_private.h
@@ -41,10 +41,18 @@ void grub_cpu_relocator_jumper (void *rels, grub_addr_t addr);
 
 #ifdef GRUB_MACHINE_IEEE1275
 #define GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS 1
+#define GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT_LOG 0
+#elif defined (GRUB_MACHINE_EFI)
+#define GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS 1
+#define GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT_LOG 12
 #else
 #define GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS 0
 #endif
 
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+#define GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT (1 << GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT_LOG)
+#endif
+
 struct grub_relocator_mmap_event
 {
   enum {
diff --git a/kern/efi/efi.c b/kern/efi/efi.c
index d8b225535..4916a0d18 100644
--- a/kern/efi/efi.c
+++ b/kern/efi/efi.c
@@ -181,17 +181,6 @@ grub_halt (void)
               GRUB_EFI_RESET_SHUTDOWN, GRUB_EFI_SUCCESS, 0, NULL);
 }
 
-int
-grub_efi_exit_boot_services (grub_efi_uintn_t map_key)
-{
-  grub_efi_boot_services_t *b;
-  grub_efi_status_t status;
-
-  b = grub_efi_system_table->boot_services;
-  status = efi_call_2 (b->exit_boot_services, grub_efi_image_handle, map_key);
-  return status == GRUB_EFI_SUCCESS;
-}
-
 grub_err_t
 grub_efi_set_virtual_address_map (grub_efi_uintn_t memory_map_size,
 				  grub_efi_uintn_t descriptor_size,
@@ -758,26 +747,3 @@ grub_efi_print_device_path (grub_efi_device_path_t *dp)
       dp = (grub_efi_device_path_t *) ((char *) dp + len);
     }
 }
-
-int
-grub_efi_finish_boot_services (void)
-{
-  grub_efi_uintn_t mmap_size = 0;
-  grub_efi_uintn_t map_key;
-  grub_efi_uintn_t desc_size;
-  grub_efi_uint32_t desc_version;
-  void *mmap_buf = 0;
-
-  if (grub_efi_get_memory_map (&mmap_size, mmap_buf, &map_key,
-			       &desc_size, &desc_version) < 0)
-    return 0;
-
-  mmap_buf = grub_malloc (mmap_size);
-
-  if (grub_efi_get_memory_map (&mmap_size, mmap_buf, &map_key,
-			       &desc_size, &desc_version) <= 0)
-    return 0;
-
-  return grub_efi_exit_boot_services (map_key);
-}
-
diff --git a/kern/efi/mm.c b/kern/efi/mm.c
index ceb8fc9ba..4db0e7e92 100644
--- a/kern/efi/mm.c
+++ b/kern/efi/mm.c
@@ -49,6 +49,12 @@ static struct allocated_page *allocated_pages = 0;
 #define MIN_HEAP_SIZE	0x100000
 #define MAX_HEAP_SIZE	(1600 * 0x100000)
 
+static void *finish_mmap_buf = 0;
+static grub_efi_uintn_t finish_mmap_size = 0;
+static grub_efi_uintn_t finish_key = 0;
+static grub_efi_uintn_t finish_desc_size;
+static grub_efi_uint32_t finish_desc_version;
+int grub_efi_is_finished = 0;
 
 /* Allocate pages. Return the pointer to the first of allocated pages.  */
 void *
@@ -140,6 +146,51 @@ grub_efi_free_pages (grub_efi_physical_address_t address,
   efi_call_2 (b->free_pages, address, pages);
 }
 
+grub_err_t
+grub_efi_finish_boot_services (grub_size_t *outbuf_size, void *outbuf,
+			       grub_efi_uintn_t *map_key,
+			       grub_efi_uintn_t *efi_desc_size,
+			       grub_efi_uint32_t *efi_desc_version)
+{
+  grub_efi_boot_services_t *b;
+  grub_efi_status_t status;
+
+  if (grub_efi_get_memory_map (&finish_mmap_size, finish_mmap_buf, &finish_key,
+			       &finish_desc_size, &finish_desc_version) < 0)
+    return grub_error (GRUB_ERR_IO, "couldn't retrieve memory map");
+
+  if (outbuf && *outbuf_size < finish_mmap_size)
+    return grub_error (GRUB_ERR_IO, "memory map buffer is too small");
+
+  finish_mmap_buf = grub_malloc (finish_mmap_size);
+  if (!finish_mmap_buf)
+    return grub_errno;
+
+  if (grub_efi_get_memory_map (&finish_mmap_size, finish_mmap_buf, &finish_key,
+			       &finish_desc_size, &finish_desc_version) <= 0)
+    return grub_error (GRUB_ERR_IO, "couldn't retrieve memory map");
+
+  b = grub_efi_system_table->boot_services;
+  status = efi_call_2 (b->exit_boot_services, grub_efi_image_handle,
+		       finish_key);
+  if (status != GRUB_EFI_SUCCESS)
+    return grub_error (GRUB_ERR_IO, "couldn't terminate EFI services");
+
+  grub_efi_is_finished = 1;
+  if (outbuf_size)
+    *outbuf_size = finish_mmap_size;
+  if (outbuf)
+    grub_memcpy (outbuf, finish_mmap_buf, finish_mmap_size);
+  if (map_key)
+    *map_key = finish_key;
+  if (efi_desc_size)
+    *efi_desc_size = finish_desc_size;
+  if (efi_desc_version)
+    *efi_desc_version = finish_desc_version;
+
+  return GRUB_ERR_NONE;
+}
+
 /* Get the memory map as defined in the EFI spec. Return 1 if successful,
    return 0 if partial, or return -1 if an error occurs.  */
 int
@@ -154,6 +205,29 @@ grub_efi_get_memory_map (grub_efi_uintn_t *memory_map_size,
   grub_efi_uintn_t key;
   grub_efi_uint32_t version;
 
+  if (grub_efi_is_finished)
+    {
+      int ret = 1;
+      if (*memory_map_size < finish_mmap_size)
+	{
+	  grub_memcpy (memory_map, finish_mmap_buf, *memory_map_size);
+	  ret = 0;
+	}
+      else
+	{
+	  grub_memcpy (memory_map, finish_mmap_buf, finish_mmap_size);
+	  ret = 1;
+	}
+      *memory_map_size = finish_mmap_size;
+      if (map_key)
+	*map_key = finish_key;
+      if (descriptor_size)
+	*descriptor_size = finish_desc_size;
+      if (descriptor_version)
+	*descriptor_version = finish_desc_version;
+      return ret;
+    }
+
   /* Allow some parameters to be missing.  */
   if (! map_key)
     map_key = &key;
diff --git a/lib/efi/relocator.c b/lib/efi/relocator.c
new file mode 100644
index 000000000..fc4de834b
--- /dev/null
+++ b/lib/efi/relocator.c
@@ -0,0 +1,104 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/relocator.h>
+#include <grub/relocator_private.h>
+#include <grub/memory.h>
+#include <grub/efi/efi.h>
+#include <grub/efi/api.h>
+#include <grub/term.h>
+
+#define NEXT_MEMORY_DESCRIPTOR(desc, size)	\
+  ((grub_efi_memory_descriptor_t *) ((char *) (desc) + (size)))
+
+unsigned 
+grub_relocator_firmware_get_max_events (void)
+{
+  grub_efi_uintn_t mmapsize = 0, descriptor_size = 0;
+  grub_efi_uint32_t descriptor_version = 0;
+  grub_efi_uintn_t key;
+  grub_efi_get_memory_map (&mmapsize, NULL, &key, &descriptor_size,
+			   &descriptor_version);
+  /* Since grub_relocator_firmware_fill_events uses malloc
+     we need some reserve. Hence +10.  */
+  return 2 * (mmapsize / descriptor_size + 10);
+}
+
+unsigned 
+grub_relocator_firmware_fill_events (struct grub_relocator_mmap_event *events)
+{
+  grub_efi_uintn_t mmapsize = 0, desc_size = 0;
+  grub_efi_uint32_t descriptor_version = 0;
+  grub_efi_memory_descriptor_t *descs = NULL;
+  grub_efi_uintn_t key;
+  int counter = 0;
+  grub_efi_memory_descriptor_t *desc;
+
+  grub_efi_get_memory_map (&mmapsize, NULL, &key, &desc_size,
+			   &descriptor_version);
+  descs = grub_malloc (mmapsize);
+  if (!descs)
+    return 0;
+
+  grub_efi_get_memory_map (&mmapsize, descs, &key, &desc_size,
+			   &descriptor_version);
+
+  for (desc = descs;
+       (char *) desc < ((char *) descs + mmapsize);
+       desc = NEXT_MEMORY_DESCRIPTOR (desc, desc_size))
+    {
+      if (desc->type != GRUB_EFI_CONVENTIONAL_MEMORY)
+	continue;
+      events[counter].type = REG_FIRMWARE_START;
+      events[counter].pos = desc->physical_start;
+      counter++;
+      events[counter].type = REG_FIRMWARE_END;
+      events[counter].pos = desc->physical_start + (desc->num_pages << 12);
+      counter++;      
+    }
+
+  return counter;
+}
+
+int
+grub_relocator_firmware_alloc_region (grub_addr_t start, grub_size_t size)
+{
+  grub_efi_boot_services_t *b;
+  grub_efi_physical_address_t address = start;
+  grub_efi_status_t status;
+
+  if (grub_efi_is_finished)
+    return 1;
+
+  b = grub_efi_system_table->boot_services;
+  status = efi_call_4 (b->allocate_pages, GRUB_EFI_ALLOCATE_ADDRESS,
+		       GRUB_EFI_LOADER_DATA, size >> 12, &address);
+  return (status == GRUB_EFI_SUCCESS);
+}
+
+void
+grub_relocator_firmware_free_region (grub_addr_t start, grub_size_t size)
+{
+  grub_efi_boot_services_t *b;
+
+  if (grub_efi_is_finished)
+    return;
+
+  b = grub_efi_system_table->boot_services;
+  efi_call_2 (b->free_pages, start, size >> 12);
+}
diff --git a/lib/relocator.c b/lib/relocator.c
index 4f37fb435..de4cca626 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -42,6 +42,7 @@ struct grub_relocator_subchunk
   grub_addr_t start;
   grub_size_t size;
   struct grub_relocator_extra_block *extra;
+  struct grub_relocator_fw_leftover *pre, *post;
 };
 
 struct grub_relocator_chunk
@@ -62,6 +63,15 @@ struct grub_relocator_extra_block
   grub_addr_t end;
 };
 
+struct grub_relocator_fw_leftover
+{
+  struct grub_relocator_fw_leftover *next;
+  struct grub_relocator_fw_leftover **prev;
+  grub_addr_t quantstart;
+  grub_uint8_t freebytes[GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT / 8];
+};
+
+struct grub_relocator_fw_leftover *leftovers;
 struct grub_relocator_extra_block *extra_blocks;
 
 struct grub_relocator *
@@ -159,7 +169,6 @@ allocate_regstart (grub_addr_t addr, grub_size_t size, grub_mm_region_t rb,
       while (h != newreg->first);
     }
   }
-
 }
 
 static void
@@ -211,6 +220,20 @@ allocate_inreg (grub_addr_t addr, grub_size_t size,
     }
 }
 
+static void
+check_leftover (struct grub_relocator_fw_leftover *lo)
+{
+  unsigned i;
+  for (i = 0; i < sizeof (lo->freebytes); i++)
+    if (lo->freebytes[i] != 0xff)
+      return;
+  grub_relocator_firmware_free_region (lo->quantstart,
+				       GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
+  *lo->prev = lo->next;
+  if (lo->next)
+    lo->next->prev = lo->prev;
+}
+
 static void
 free_subchunk (const struct grub_relocator_subchunk *subchu)
 {
@@ -311,9 +334,34 @@ free_subchunk (const struct grub_relocator_subchunk *subchu)
       }
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
     case CHUNK_TYPE_FIRMWARE:
-      grub_relocator_firmware_free_region (subchu->start, subchu->size);
-      *curschu->extra->prev = curschu->extra->next;
-      grub_free (curschu->extra);
+      {
+	grub_addr_t fstart, fend;
+	fstart = ALIGN_UP (subchu->start,
+			   GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
+	fend = ALIGN_DOWN (subchu->start + subchu->size,
+			   GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
+	if (fstart < fend)
+	  grub_relocator_firmware_free_region (fstart, fend - fstart);
+	if (subchu->pre)
+	  {
+	    int off = subchu->start - fstart
+	      - GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT;
+	    grub_memset (subchu->pre->freebytes + off / 8 + 1,
+			 0xff, sizeof (subchu->pre->freebytes) - off / 8 - 1);
+	    subchu->pre->freebytes[off / 8] |= ~((1 << (off % 8)) - 1);
+	    check_leftover (subchu->pre);
+	  }
+	if (subchu->post)
+	  {
+	    int off = subchu->start + subchu->size - fend;
+	    grub_memset (subchu->pre->freebytes,
+			 0xff, sizeof (subchu->pre->freebytes) - off / 8);
+	    subchu->pre->freebytes[off / 8] |= ((1 << (8 - (off % 8))) - 1);
+	    check_leftover (subchu->post);
+	  }
+	*subchu->extra->prev = subchu->extra->next;
+	grub_free (subchu->extra);
+      }
       break;
 #endif
     }  
@@ -406,7 +454,7 @@ malloc_in_range (struct grub_relocator *rel,
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
   for (r = grub_mm_base; r; r = r->next)
     {
-      grub_dprintf ("relocator", "Blocking at 0x%x-0x%x\n",
+      grub_dprintf ("relocator", "Blocking at 0x%lx-0x%lx\n",
 		    (grub_addr_t) r - r->pre_size, 
 		    (grub_addr_t) (r + 1) + r->size);
       events[N].type = FIRMWARE_BLOCK_START;
@@ -420,7 +468,7 @@ malloc_in_range (struct grub_relocator *rel,
     struct grub_relocator_extra_block *cur;
     for (cur = extra_blocks; cur; cur = cur->next)
       {
-	grub_dprintf ("relocator", "Blocking at 0x%x-0x%x\n",
+	grub_dprintf ("relocator", "Blocking at 0x%lx-0x%lx\n",
 		      cur->start, cur->end);
 	events[N].type = FIRMWARE_BLOCK_START;
 	events[N].pos = cur->start;
@@ -432,6 +480,10 @@ malloc_in_range (struct grub_relocator *rel,
   }
 #endif
 
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+  N += grub_relocator_firmware_fill_events (events + N);
+#endif
+
   /* No malloc from this point.  */
   base_saved = grub_mm_base;
   grub_mm_base = NULL;
@@ -475,10 +527,6 @@ malloc_in_range (struct grub_relocator *rel,
       while (pa != r->first);
     }
 
-#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
-  N += grub_relocator_firmware_fill_events (events + N);
-#endif
-
   /* Put ending events after starting events.  */
   {
     int st = 0, e = N / 2;
@@ -654,17 +702,26 @@ malloc_in_range (struct grub_relocator *rel,
 		    break;
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
 		  case CHUNK_TYPE_FIRMWARE:
-		    /* The failure here can be very expensive.  */
-		    if (!grub_relocator_firmware_alloc_region (alloc_start, 
-							       alloc_end - alloc_start))
-		      {
-			if (from_low_priv)
-			  start = alloc_end;
-			else
-			  end = alloc_start;
-			goto retry;
-		      }
-		    break;
+		    {
+		      grub_addr_t fstart, fend;
+		      fstart
+			= ALIGN_DOWN (alloc_start,
+				      GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
+		      fend
+			= ALIGN_UP (alloc_end,
+				    GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
+		      /* The failure here can be very expensive.  */
+		      if (!grub_relocator_firmware_alloc_region (fstart, 
+								 fend - fstart))
+			{
+			  if (from_low_priv)
+			    start = fend;
+			  else
+			    end = fstart;
+			  goto retry;
+			}
+		      break;
+		    }
 #endif
 		  }
 		nallocs++;
@@ -736,7 +793,6 @@ malloc_in_range (struct grub_relocator *rel,
   /* Malloc is available again.  */
   grub_mm_base = base_saved;
 
-
   {
     int last_start = 0;
     int inreg = 0, regbeg = 0, ncol = 0;
@@ -784,8 +840,6 @@ malloc_in_range (struct grub_relocator *rel,
 		curschu->start = alloc_start;
 		curschu->size = alloc_end - alloc_start;
 		if (typepre == CHUNK_TYPE_REGION_START)
-		  curschu->host_start = (grub_addr_t) events[last_start].reg;
-#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
 		if (!oom && (typepre == CHUNK_TYPE_REGION_START
 			     || typepre == CHUNK_TYPE_FIRMWARE))
 		  {
@@ -807,6 +861,76 @@ malloc_in_range (struct grub_relocator *rel,
 			curschu->extra = ne;
 		      }
 		  }
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+		if (!oom && typepre == CHUNK_TYPE_FIRMWARE)
+		    {
+		      grub_addr_t fstart, fend;
+		      struct grub_relocator_fw_leftover *lo1 = NULL;
+		      struct grub_relocator_fw_leftover *lo2 = NULL;
+
+		      fstart
+			= ALIGN_DOWN (alloc_start,
+				      GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
+		      fend
+			= ALIGN_UP (alloc_end,
+				    GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
+
+		      if (fstart != alloc_start)
+			lo1 = grub_malloc (sizeof (*lo1));
+		      if (fend != alloc_end)
+			lo2 = grub_malloc (sizeof (*lo2));
+		      if ((!lo1 && fstart != alloc_start)
+			  || (!lo2 && fend != alloc_end))
+			{
+			  struct grub_relocator_extra_block *ne;
+			  grub_free (lo1);
+			  grub_free (lo2);
+			  lo1 = NULL;
+			  lo2 = NULL;
+			  oom = 1;
+			  grub_memcpy (&tofree, curschu, sizeof (tofree));
+			  ne = extra_blocks;
+			  extra_blocks = extra_blocks->next;
+			  grub_free (ne);
+			}
+		      if (lo1)
+			{
+			  lo1->quantstart = fstart;
+			  grub_memset (lo1->freebytes, 0xff,
+				       (alloc_start - fstart) / 8);
+			  lo1->freebytes[(alloc_start - fstart) / 8]
+			    = (1 << ((alloc_start - fstart) % 8)) - 1;
+			  grub_memset (lo1->freebytes
+				       + ((alloc_start - fstart) / 8) + 1, 0,
+				       sizeof (lo1->freebytes)
+				       - (alloc_start - fstart) / 8 - 1);
+			  lo1->next = leftovers;
+			  lo1->prev = &leftovers;
+			  if (leftovers)
+			    leftovers->prev = &lo1->next;
+			  leftovers = lo1;
+			}
+		      if (lo2)
+			{
+			  lo2->quantstart
+			    = fend - GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT;
+			  grub_memset (lo2->freebytes, 0,
+				       (alloc_end - lo2->quantstart) / 8);
+			  lo2->freebytes[(alloc_end - lo2->quantstart) / 8]
+			    = ~((1 << ((alloc_end - lo2->quantstart) % 8)) - 1);
+			  grub_memset (lo2->freebytes
+				       + ((alloc_end - lo2->quantstart) / 8)
+				       + 1, 0, sizeof (lo2->freebytes)
+				       - (alloc_end - lo2->quantstart) / 8 - 1);
+			  lo2->prev = &leftovers;
+			  if (leftovers)
+			    leftovers->prev = &lo2->next;
+			  lo2->next = leftovers;
+			  leftovers = lo2;
+			}
+		      curschu->pre = lo1;
+		      curschu->post = lo2;
+		    }
 #endif
 		if (!oom)
 		  cural++;
@@ -814,7 +938,7 @@ malloc_in_range (struct grub_relocator *rel,
 		  free_subchunk (&tofree);
 	      }
 	  }
-	  
+
 	switch (events[j].type)
 	  {
 	  case REG_BEG_START:
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index f50e94f98..cfd10713d 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -692,8 +692,9 @@ grub_freebsd_boot (void)
 	return err;
 
 #ifdef GRUB_MACHINE_EFI
-      if (! grub_efi_finish_boot_services ())
-	grub_fatal ("cannot exit boot services");
+      err = grub_efi_finish_boot_services (NULL, NULL, NULL, NULL, NULL);
+      if (err)
+	return err;
 #endif
 
       pagetable = p;
@@ -723,8 +724,9 @@ grub_freebsd_boot (void)
 	return err;
 
 #ifdef GRUB_MACHINE_EFI
-      if (! grub_efi_finish_boot_services ())
-	grub_fatal ("cannot exit boot services");
+      err = grub_efi_finish_boot_services (NULL, NULL, NULL, NULL, NULL);
+      if (err)
+	return err;
 #endif
 
       grub_memcpy (&stack[9], &bi, sizeof (bi));
@@ -804,8 +806,9 @@ grub_openbsd_boot (void)
   grub_video_set_mode ("text", 0, 0);
 
 #ifdef GRUB_MACHINE_EFI
-  if (! grub_efi_finish_boot_services ())
-    grub_fatal ("cannot exit boot services");
+  err = grub_efi_finish_boot_services (NULL, NULL, NULL, NULL, NULL);
+  if (err)
+    return err;
 #endif
 
   state.eip = entry;
@@ -1009,8 +1012,9 @@ grub_netbsd_boot (void)
     return err;
 
 #ifdef GRUB_MACHINE_EFI
-  if (! grub_efi_finish_boot_services ())
-    grub_fatal ("cannot exit boot services");
+  err = grub_efi_finish_boot_services (NULL, NULL, NULL, NULL, NULL);
+  if (err)
+    return err;
 #endif
 
   state.eip = entry;
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index 4a1068070..ef1b8309e 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -681,15 +681,13 @@ grub_linux_boot (void)
 
 #ifdef GRUB_MACHINE_EFI
   {
-    grub_efi_uintn_t efi_map_key, efi_desc_size;
+    grub_efi_uintn_t efi_desc_size;
     grub_efi_uint32_t efi_desc_version;
-    if (grub_efi_get_memory_map (&efi_mmap_size, efi_mmap_buf, &efi_map_key,
-				 &efi_desc_size, &efi_desc_version) <= 0)
-      grub_fatal ("cannot get memory map");
+    err = grub_efi_finish_boot_services (&efi_mmap_size, efi_mmap_buf, NULL,
+					 &efi_desc_size, &efi_desc_version);
+    if (err)
+      return err;
     
-    if (! grub_efi_exit_boot_services (efi_map_key))
-      grub_fatal ("cannot exit boot services");
-
     /* Note that no boot services are available from here.  */
 
     /* Pass EFI parameters.  */
diff --git a/loader/i386/xnu.c b/loader/i386/xnu.c
index bdcd383c5..dcec3554f 100644
--- a/loader/i386/xnu.c
+++ b/loader/i386/xnu.c
@@ -1038,10 +1038,11 @@ grub_xnu_boot (void)
   bootparams->devtree = devtree_target;
   bootparams->devtreelen = devtreelen;
 
-  if (grub_autoefi_get_memory_map (&memory_map_size, memory_map,
-				   &map_key, &descriptor_size,
-				   &descriptor_version) <= 0)
-    return grub_errno;
+  err = grub_efi_finish_boot_services (&memory_map_size, memory_map,
+				       &map_key, &descriptor_size,
+				       &descriptor_version);
+  if (err)
+    return err;
 
   bootparams->efi_system_table = PTR_TO_UINT32 (grub_autoefi_system_table);
 
@@ -1096,9 +1097,6 @@ grub_xnu_boot (void)
     + bootparams->heap_size + GRUB_XNU_PAGESIZE;
   grub_xnu_arg1 = bootparams_target;
 
-  if (! grub_autoefi_exit_boot_services (map_key))
-    return grub_error (GRUB_ERR_IO, "can't exit boot services");
-
   grub_autoefi_set_virtual_address_map (memory_map_size, descriptor_size,
 					descriptor_version,memory_map);
 
diff --git a/loader/multiboot.c b/loader/multiboot.c
index 53dc42abb..a3ca6266f 100644
--- a/loader/multiboot.c
+++ b/loader/multiboot.c
@@ -126,8 +126,9 @@ grub_multiboot_boot (void)
     return err;
 
 #ifdef GRUB_MACHINE_EFI
-  if (! grub_efi_finish_boot_services ())
-     grub_fatal ("cannot exit boot services");
+  err = grub_efi_finish_boot_services (NULL, NULL, NULL, NULL, NULL);
+  if (err)
+    return err;
 #endif
 
   grub_relocator32_boot (grub_multiboot_relocator, state);
diff --git a/term/efi/console.c b/term/efi/console.c
index 664861398..eac227561 100644
--- a/term/efi/console.c
+++ b/term/efi/console.c
@@ -90,6 +90,9 @@ grub_console_putchar (grub_uint32_t c)
   grub_efi_char16_t str[2];
   grub_efi_simple_text_output_interface_t *o;
 
+  if (grub_efi_is_finished)
+    return;
+
   o = grub_efi_system_table->con_out;
 
   /* For now, do not try to use a surrogate pair.  */
@@ -120,6 +123,9 @@ grub_console_checkkey (void)
   grub_efi_input_key_t key;
   grub_efi_status_t status;
 
+  if (grub_efi_is_finished)
+    return 0;
+
   if (read_key >= 0)
     return 1;
 
@@ -217,6 +223,9 @@ grub_console_getkey (void)
   grub_efi_status_t status;
   int key;
 
+  if (grub_efi_is_finished)
+    return 0;
+
   if (read_key >= 0)
     {
       key = read_key;
@@ -249,7 +258,8 @@ grub_console_getwh (void)
   grub_efi_uintn_t columns, rows;
 
   o = grub_efi_system_table->con_out;
-  if (efi_call_4 (o->query_mode, o, o->mode->mode, &columns, &rows) != GRUB_EFI_SUCCESS)
+  if (grub_efi_is_finished || efi_call_4 (o->query_mode, o, o->mode->mode,
+					  &columns, &rows) != GRUB_EFI_SUCCESS)
     {
       /* Why does this fail?  */
       columns = 80;
@@ -264,6 +274,9 @@ grub_console_getxy (void)
 {
   grub_efi_simple_text_output_interface_t *o;
 
+  if (grub_efi_is_finished)
+    return 0;
+
   o = grub_efi_system_table->con_out;
   return ((o->mode->cursor_column << 8) | o->mode->cursor_row);
 }
@@ -273,6 +286,9 @@ grub_console_gotoxy (grub_uint8_t x, grub_uint8_t y)
 {
   grub_efi_simple_text_output_interface_t *o;
 
+  if (grub_efi_is_finished)
+    return;
+
   o = grub_efi_system_table->con_out;
   efi_call_3 (o->set_cursor_position, o, x, y);
 }
@@ -283,6 +299,9 @@ grub_console_cls (void)
   grub_efi_simple_text_output_interface_t *o;
   grub_efi_int32_t orig_attr;
 
+  if (grub_efi_is_finished)
+    return;
+
   o = grub_efi_system_table->con_out;
   orig_attr = o->mode->attribute;
   efi_call_2 (o->set_attributes, o, GRUB_EFI_BACKGROUND_BLACK);
@@ -295,6 +314,9 @@ grub_console_setcolorstate (grub_term_color_state state)
 {
   grub_efi_simple_text_output_interface_t *o;
 
+  if (grub_efi_is_finished)
+    return;
+
   o = grub_efi_system_table->con_out;
 
   switch (state) {
@@ -331,6 +353,9 @@ grub_console_setcursor (int on)
 {
   grub_efi_simple_text_output_interface_t *o;
 
+  if (grub_efi_is_finished)
+    return;
+
   o = grub_efi_system_table->con_out;
   efi_call_2 (o->enable_cursor, o, on);
 }

From 6d6f55c557871efa852e53c3f5a34f36241ed284 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 21 Apr 2010 09:27:57 +0200
Subject: [PATCH 0815/1628] Use leftovers

---
 include/grub/relocator_private.h |   7 +-
 lib/relocator.c                  | 281 +++++++++++++++++++++----------
 util/grub-mkrescue.in            |  45 ++++-
 3 files changed, 237 insertions(+), 96 deletions(-)

diff --git a/include/grub/relocator_private.h b/include/grub/relocator_private.h
index 8398defbd..a859ec9fd 100644
--- a/include/grub/relocator_private.h
+++ b/include/grub/relocator_private.h
@@ -66,8 +66,10 @@ struct grub_relocator_mmap_event
     /* To track the regions already in heap.  */
     FIRMWARE_BLOCK_START = 6, 
     FIRMWARE_BLOCK_END = FIRMWARE_BLOCK_START | 1,
+    REG_LEFTOVER_START = 8, 
+    REG_LEFTOVER_END = REG_LEFTOVER_START | 1,
 #endif
-    COLLISION_START = 8,
+    COLLISION_START = 10,
     COLLISION_END = COLLISION_START | 1
   } type;
   grub_addr_t pos;
@@ -80,6 +82,9 @@ struct grub_relocator_mmap_event
       grub_mm_region_t *regancestor;
       grub_mm_header_t head;
     };
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+    struct grub_relocator_fw_leftover *leftover;
+#endif
   };
 };
 
diff --git a/lib/relocator.c b/lib/relocator.c
index de4cca626..1fe5a94e5 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -35,7 +35,7 @@ struct grub_relocator_subchunk
 {
   enum {CHUNK_TYPE_IN_REGION, CHUNK_TYPE_REGION_START,
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
-	CHUNK_TYPE_FIRMWARE
+	CHUNK_TYPE_FIRMWARE, CHUNK_TYPE_LEFTOVER
 #endif
   } type;
   grub_addr_t host_start;
@@ -334,6 +334,7 @@ free_subchunk (const struct grub_relocator_subchunk *subchu)
       }
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
     case CHUNK_TYPE_FIRMWARE:
+    case CHUNK_TYPE_LEFTOVER:
       {
 	grub_addr_t fstart, fend;
 	fstart = ALIGN_UP (subchu->start,
@@ -375,11 +376,12 @@ malloc_in_range (struct grub_relocator *rel,
 {
   grub_mm_region_t r, *ra, base_saved;
   struct grub_relocator_mmap_event *events = NULL, *eventt = NULL, *t;
-  unsigned maxevents = 2;
+  /* 128 is just in case of additional malloc (shouldn't happen).  */
+  unsigned maxevents = 2 + 128;
   grub_mm_header_t p, pa;
   unsigned *counter;
   int nallocs = 0;
-  unsigned i, j, N = 0;
+  unsigned j, N = 0;
   grub_addr_t target = 0;
 
   grub_dprintf ("relocator",
@@ -422,6 +424,23 @@ malloc_in_range (struct grub_relocator *rel,
   }
 
   maxevents += grub_relocator_firmware_get_max_events ();
+
+  {
+    struct grub_relocator_fw_leftover *cur;
+    for (cur = leftovers; cur; cur = cur->next)
+      {
+	int l = 0;
+	unsigned i;
+	for (i = 0; i < GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT; i++)
+	  {
+	    if (l != ((cur->freebytes[i / 8] >> (i % 8)) & 1))
+	      maxevents++;
+	    l = ((cur->freebytes[i / 8] >> (i % 8)) & 1);
+	  }
+	if (l)
+	  maxevents++;
+      }
+  }
 #endif
 
   events = grub_malloc (maxevents * sizeof (events[0]));
@@ -478,10 +497,35 @@ malloc_in_range (struct grub_relocator *rel,
 	N++;
       }
   }
-#endif
 
-#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
   N += grub_relocator_firmware_fill_events (events + N);
+
+  {
+    struct grub_relocator_fw_leftover *cur;
+    for (cur = leftovers; cur; cur = cur->next)
+      {
+	unsigned i;
+	int l = 0;
+	for (i = 0; i < GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT; i++)
+	  {
+	    if (l != ((cur->freebytes[i / 8] >> (i % 8)) & 1))
+	      {
+		events[N].type = l ? REG_LEFTOVER_END : REG_LEFTOVER_START;
+		events[N].pos = cur->quantstart + i;
+		events[N].leftover = cur;
+		N++;
+	      }
+	    l = ((cur->freebytes[i / 8] >> (i % 8)) & 1);
+	  }
+	if (l)
+	  {
+	    events[N].type = REG_LEFTOVER_END;
+	    events[N].pos = cur->quantstart + i;
+	    events[N].leftover = cur;
+	    N++;
+	  }
+      }
+  }
 #endif
 
   /* No malloc from this point.  */
@@ -539,22 +583,25 @@ malloc_in_range (struct grub_relocator *rel,
     eventt = events;
     events = t;
   }
-  for (i = 0; i < (BITS_IN_BYTE * sizeof (grub_addr_t) / DIGITSORT_BITS);
-       i++)
-    {
-      memset (counter, 0, (1 + (1 << DIGITSORT_BITS)) * sizeof (counter[0]));
-      for (j = 0; j < N; j++)
-	counter[((events[j].pos >> (DIGITSORT_BITS * i)) 
-		 & DIGITSORT_MASK) + 1]++;
-      for (j = 0; j <= DIGITSORT_MASK; j++)
-	counter[j+1] += counter[j];
-      for (j = 0; j < N; j++)
-	eventt[counter[((events[j].pos >> (DIGITSORT_BITS * i)) 
-			& DIGITSORT_MASK)]++] = events[j];
-      t = eventt;
-      eventt = events;
-      events = t;
-    }
+  {
+    unsigned i;
+    for (i = 0; i < (BITS_IN_BYTE * sizeof (grub_addr_t) / DIGITSORT_BITS);
+	 i++)
+      {
+	memset (counter, 0, (1 + (1 << DIGITSORT_BITS)) * sizeof (counter[0]));
+	for (j = 0; j < N; j++)
+	  counter[((events[j].pos >> (DIGITSORT_BITS * i)) 
+		   & DIGITSORT_MASK) + 1]++;
+	for (j = 0; j <= DIGITSORT_MASK; j++)
+	  counter[j+1] += counter[j];
+	for (j = 0; j < N; j++)
+	  eventt[counter[((events[j].pos >> (DIGITSORT_BITS * i)) 
+			  & DIGITSORT_MASK)]++] = events[j];
+	t = eventt;
+	eventt = events;
+	events = t;
+      }
+  }
 
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
  retry:
@@ -563,14 +610,15 @@ malloc_in_range (struct grub_relocator *rel,
   /* Now events are nicely sorted.  */
   {
     int nstarted = 0, ncollisions = 0, nstartedfw = 0, nblockfw = 0;
+    int nlefto = 0;
     grub_addr_t starta = 0;
     int numstarted;
     for (j = from_low_priv ? 0 : N - 1; from_low_priv ? j < N : (j + 1); 
 	 from_low_priv ? j++ : j--)
       {
 	int isinsidebefore, isinsideafter;
-	isinsidebefore = (!ncollisions 
-			  && (nstarted || (nstartedfw && !nblockfw)));
+	isinsidebefore = (!ncollisions && (nstarted || (((nlefto || nstartedfw)
+							 && !nblockfw))));
 	switch (events[j].type)
 	  {
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
@@ -589,6 +637,13 @@ malloc_in_range (struct grub_relocator *rel,
 	  case FIRMWARE_BLOCK_END:
 	    nblockfw--;
 	    break;
+	  case REG_LEFTOVER_START:
+	    nlefto++;
+	    break;
+
+	  case REG_LEFTOVER_END:
+	    nlefto--;
+	    break;
 #endif
 
 	  case COLLISION_START:
@@ -609,8 +664,8 @@ malloc_in_range (struct grub_relocator *rel,
 	    nstarted--;
 	    break;
 	  }
-	isinsideafter = (!ncollisions 
-			 && (nstarted || (nstartedfw && !nblockfw)));
+	isinsideafter = (!ncollisions && (nstarted || ((nlefto || nstartedfw) 
+						       && !nblockfw)));
 	if (!isinsidebefore && isinsideafter)
 	  {
 	    starta = from_low_priv ? ALIGN_UP (events[j].pos, align)
@@ -647,7 +702,7 @@ malloc_in_range (struct grub_relocator *rel,
   {
     int inreg = 0, regbeg = 0, ncol = 0;
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
-    int fwin = 0, fwb = 0;
+    int fwin = 0, fwb = 0, fwlefto = 0;
 #endif
     int last_start = 0;
     for (j = 0; j < N; j++)
@@ -662,6 +717,8 @@ malloc_in_range (struct grub_relocator *rel,
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
 	else if (fwin && !fwb)
 	  typepre = CHUNK_TYPE_FIRMWARE;
+	else if (fwlefto && !fwb)
+	  typepre = CHUNK_TYPE_LEFTOVER;
 #endif
 	else
 	  typepre = -1;
@@ -722,6 +779,21 @@ malloc_in_range (struct grub_relocator *rel,
 			}
 		      break;
 		    }
+		  case CHUNK_TYPE_LEFTOVER:
+		    {
+		      unsigned offstart = alloc_start
+			% GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT;
+		      unsigned offend = alloc_end
+			% GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT;
+		      struct grub_relocator_fw_leftover *lo
+			= events[last_start].leftover;
+		      lo->freebytes[offstart / 8]
+			&= ((1 << (8 - (start % 8))) - 1);
+		      grub_memset (lo->freebytes + (offstart + 7) / 8, 0,
+				   offend / 8 - (offstart + 7) / 8);
+		      lo->freebytes[offend / 8] &= ~((1 << (offend % 8)) - 1);
+		    }
+		    break;
 #endif
 		  }
 		nallocs++;
@@ -757,6 +829,14 @@ malloc_in_range (struct grub_relocator *rel,
 	    fwin--;
 	    break;
 
+	  case REG_LEFTOVER_START:
+	    fwlefto++;
+	    break;
+
+	  case REG_LEFTOVER_END:
+	    fwlefto--;
+	    break;
+
 	  case FIRMWARE_BLOCK_START:
 	    fwb++;
 	    break;
@@ -797,7 +877,7 @@ malloc_in_range (struct grub_relocator *rel,
     int last_start = 0;
     int inreg = 0, regbeg = 0, ncol = 0;
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
-    int fwin = 0, fwb = 0;
+    int fwin = 0, fwlefto = 0, fwb = 0;
 #endif
     unsigned cural = 0;
     int oom = 0;
@@ -818,6 +898,8 @@ malloc_in_range (struct grub_relocator *rel,
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
 	else if (fwin && !fwb)
 	  typepre = CHUNK_TYPE_FIRMWARE;
+	else if (fwlefto && !fwb)
+	  typepre = CHUNK_TYPE_LEFTOVER;
 #endif
 	else
 	  typepre = -1;
@@ -863,74 +945,80 @@ malloc_in_range (struct grub_relocator *rel,
 		  }
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
 		if (!oom && typepre == CHUNK_TYPE_FIRMWARE)
-		    {
-		      grub_addr_t fstart, fend;
-		      struct grub_relocator_fw_leftover *lo1 = NULL;
-		      struct grub_relocator_fw_leftover *lo2 = NULL;
+		  {
+		    grub_addr_t fstart, fend;
+		    struct grub_relocator_fw_leftover *lo1 = NULL;
+		    struct grub_relocator_fw_leftover *lo2 = NULL;
 
-		      fstart
-			= ALIGN_DOWN (alloc_start,
-				      GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
-		      fend
-			= ALIGN_UP (alloc_end,
+		    fstart
+		      = ALIGN_DOWN (alloc_start,
 				    GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
+		    fend
+		      = ALIGN_UP (alloc_end,
+				  GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
 
-		      if (fstart != alloc_start)
-			lo1 = grub_malloc (sizeof (*lo1));
-		      if (fend != alloc_end)
-			lo2 = grub_malloc (sizeof (*lo2));
-		      if ((!lo1 && fstart != alloc_start)
-			  || (!lo2 && fend != alloc_end))
-			{
-			  struct grub_relocator_extra_block *ne;
-			  grub_free (lo1);
-			  grub_free (lo2);
-			  lo1 = NULL;
-			  lo2 = NULL;
-			  oom = 1;
-			  grub_memcpy (&tofree, curschu, sizeof (tofree));
-			  ne = extra_blocks;
-			  extra_blocks = extra_blocks->next;
-			  grub_free (ne);
-			}
-		      if (lo1)
-			{
-			  lo1->quantstart = fstart;
-			  grub_memset (lo1->freebytes, 0xff,
-				       (alloc_start - fstart) / 8);
-			  lo1->freebytes[(alloc_start - fstart) / 8]
-			    = (1 << ((alloc_start - fstart) % 8)) - 1;
-			  grub_memset (lo1->freebytes
-				       + ((alloc_start - fstart) / 8) + 1, 0,
-				       sizeof (lo1->freebytes)
-				       - (alloc_start - fstart) / 8 - 1);
-			  lo1->next = leftovers;
-			  lo1->prev = &leftovers;
-			  if (leftovers)
-			    leftovers->prev = &lo1->next;
-			  leftovers = lo1;
-			}
-		      if (lo2)
-			{
-			  lo2->quantstart
-			    = fend - GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT;
-			  grub_memset (lo2->freebytes, 0,
-				       (alloc_end - lo2->quantstart) / 8);
-			  lo2->freebytes[(alloc_end - lo2->quantstart) / 8]
-			    = ~((1 << ((alloc_end - lo2->quantstart) % 8)) - 1);
-			  grub_memset (lo2->freebytes
-				       + ((alloc_end - lo2->quantstart) / 8)
-				       + 1, 0, sizeof (lo2->freebytes)
-				       - (alloc_end - lo2->quantstart) / 8 - 1);
-			  lo2->prev = &leftovers;
-			  if (leftovers)
-			    leftovers->prev = &lo2->next;
-			  lo2->next = leftovers;
-			  leftovers = lo2;
-			}
-		      curschu->pre = lo1;
-		      curschu->post = lo2;
-		    }
+		    if (fstart != alloc_start)
+		      lo1 = grub_malloc (sizeof (*lo1));
+		    if (fend != alloc_end)
+		      lo2 = grub_malloc (sizeof (*lo2));
+		    if ((!lo1 && fstart != alloc_start)
+			|| (!lo2 && fend != alloc_end))
+		      {
+			struct grub_relocator_extra_block *ne;
+			grub_free (lo1);
+			grub_free (lo2);
+			lo1 = NULL;
+			lo2 = NULL;
+			oom = 1;
+			grub_memcpy (&tofree, curschu, sizeof (tofree));
+			ne = extra_blocks;
+			extra_blocks = extra_blocks->next;
+			grub_free (ne);
+		      }
+		    if (lo1)
+		      {
+			lo1->quantstart = fstart;
+			grub_memset (lo1->freebytes, 0xff,
+				     (alloc_start - fstart) / 8);
+			lo1->freebytes[(alloc_start - fstart) / 8]
+			  = (1 << ((alloc_start - fstart) % 8)) - 1;
+			grub_memset (lo1->freebytes
+				     + ((alloc_start - fstart) / 8) + 1, 0,
+				     sizeof (lo1->freebytes)
+				     - (alloc_start - fstart) / 8 - 1);
+			lo1->next = leftovers;
+			lo1->prev = &leftovers;
+			if (leftovers)
+			  leftovers->prev = &lo1->next;
+			leftovers = lo1;
+		      }
+		    if (lo2)
+		      {
+			lo2->quantstart
+			  = fend - GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT;
+			grub_memset (lo2->freebytes, 0,
+				     (alloc_end - lo2->quantstart) / 8);
+			lo2->freebytes[(alloc_end - lo2->quantstart) / 8]
+			  = ~((1 << ((alloc_end - lo2->quantstart) % 8)) - 1);
+			grub_memset (lo2->freebytes
+				     + ((alloc_end - lo2->quantstart) / 8)
+				     + 1, 0, sizeof (lo2->freebytes)
+				     - (alloc_end - lo2->quantstart) / 8 - 1);
+			lo2->prev = &leftovers;
+			if (leftovers)
+			  leftovers->prev = &lo2->next;
+			lo2->next = leftovers;
+			leftovers = lo2;
+		      }
+		    curschu->pre = lo1;
+		    curschu->post = lo2;
+		  }
+
+		if (typepre == CHUNK_TYPE_LEFTOVER)
+		  {
+		    curschu->pre = events[last_start].leftover;
+		    curschu->post = events[last_start].leftover;
+		  }
 #endif
 		if (!oom)
 		  cural++;
@@ -965,6 +1053,14 @@ malloc_in_range (struct grub_relocator *rel,
 	    fwin--;
 	    break;
 
+	  case REG_LEFTOVER_START:
+	    fwlefto++;
+	    break;
+
+	  case REG_LEFTOVER_END:
+	    fwlefto--;
+	    break;
+
 	  case FIRMWARE_BLOCK_START:
 	    fwb++;
 	    break;
@@ -983,6 +1079,7 @@ malloc_in_range (struct grub_relocator *rel,
       }
     if (oom)
       {
+	unsigned i;
 	for (i = 0; i < cural; i++)
 	  free_subchunk (&res->subchunks[i]);
 	grub_free (res->subchunks);
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index aafdfb059..e7dbb45ff 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -32,6 +32,8 @@ pkglib_DATA="@pkglib_DATA@"
 
 coreboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-coreboot
 pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-pc
+efi32_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-efi
+efi64_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi
 
 # Usage: usage
 # Print the usage.
@@ -128,13 +130,23 @@ if [ "${override_dir}" = "" ] ; then
     if test -e "${pc_dir}" ; then
         process_input_dir ${pc_dir} pc
     fi
+    if test -e "${efi32_dir}" ; then
+        process_input_dir ${efi32_dir} efi32
+    fi
+    if test -e "${efi64_dir}" ; then
+        process_input_dir ${efi64_dir} efi64
+    fi
 else
     process_input_dir ${override_dir} ${native_platform}
     coreboot_dir=
     pc_dir=
-    case "${native_platform}" in
-        coreboot) coreboot_dir=${override_dir} ;;
-        pc) pc_dir=${override_dir} ;;
+    efi32_dir=
+    efi64_dir=
+    case "${target_cpu}-${native_platform}" in
+        i386-coreboot) coreboot_dir=${override_dir} ;;
+        i386-pc) pc_dir=${override_dir} ;;
+	i386-efi) efi32_dir=${override_dir} ;;
+	x86_64-efi) efi64_dir=${override_dir} ;;
     esac
 fi
 
@@ -191,6 +203,33 @@ if test -e "${pc_dir}" ; then
 		--embedded-boot ${embed_img}"
 fi
 
+if test -e "${efi64_dir}" || test -e "${efi32_dir}"; then
+    efi_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
+    mkdir -p "${efi_dir}/efi/boot"
+else
+    efi_dir=
+fi
+
+# build bootx64.efi
+if test -e "${efi64_dir}" ; then
+    echo "Generates bootx64.efi"
+    grub-mkimage -d "${efi64_dir}" -o "${efi_dir}"/efi/boot/bootx64.efi --prefix=/boot/grub/x86_64-efi \
+        search iso9660 configfile sh 
+
+    modules="$(cat "${efi64_dir}"/partmap.lst) ${modules}"
+    (for i in ${modules} ; do
+        echo "insmod $i"
+    done ; \
+    echo "source /boot/grub/grub.cfg") \
+    > "${iso9660_dir}"/boot/grub/x86_64-efi/grub.cfg
+fi
+
+if test x"${efi_dir}" != x; then
+    mformat -C -f 2880 -L 16 -i "${iso9660_dir}"/efi.img ::
+    mcopy -s -i "${iso9660_dir}"/efi.img ${efi_dir}/efi ::/
+    grub_mkisofs_arguments="${grub_mkisofs_arguments} --efi-boot efi.img"
+fi
+
 # build iso image
 grub-mkisofs ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} ${source}
 rm -rf ${iso9660_dir}

From 5490ddc18bdcf27c1eeb88ffd90aab2708a2c016 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 21 Apr 2010 10:01:41 +0200
Subject: [PATCH 0816/1628] Fix compilation on i386-pc

---
 efiemu/main.c                | 16 ----------------
 include/grub/autoefi.h       |  2 ++
 include/grub/efiemu/efiemu.h |  3 +--
 loader/i386/xnu.c            |  6 +++---
 4 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/efiemu/main.c b/efiemu/main.c
index 8a8a508fa..7ebbae946 100644
--- a/efiemu/main.c
+++ b/efiemu/main.c
@@ -182,22 +182,6 @@ grub_cmd_efiemu_prepare (grub_command_t cmd __attribute__ ((unused)),
 
 
 
-
-int
-grub_efiemu_exit_boot_services (grub_efi_uintn_t map_key
-				__attribute__ ((unused)))
-{
-  /* Nothing to do here yet */
-  return 1;
-}
-
-int
-grub_efiemu_finish_boot_services (void)
-{
-  /* Nothing to do here yet */
-  return 1;
-}
-
 /* Load the runtime from the file FILENAME.  */
 static grub_err_t
 grub_efiemu_load_file (const char *filename)
diff --git a/include/grub/autoefi.h b/include/grub/autoefi.h
index 5ae4b3a21..740be3249 100644
--- a/include/grub/autoefi.h
+++ b/include/grub/autoefi.h
@@ -50,6 +50,7 @@ static inline grub_err_t grub_autoefi_prepare (void)
 # define SYSTEM_TABLE_PTR(x) ((void *)(grub_efi_system_table->x))
 # define SIZEOF_OF_UINTN sizeof (grub_efi_uintn_t)
 # define SYSTEM_TABLE(x) (grub_efi_system_table->x)
+# define grub_autoefi_finish_boot_services grub_efi_finish_boot_services
 # define EFI_PRESENT 1
 #else
 # include <grub/efiemu/efiemu.h>
@@ -72,6 +73,7 @@ static inline grub_err_t grub_autoefi_prepare (void)
 # define SYSTEM_TABLE GRUB_EFIEMU_SYSTEM_TABLE
 # define grub_efi_allocate_pages(x,y) (x)
 # define grub_efi_free_pages(x,y) GRUB_EFI_SUCCESS
+# define grub_autoefi_finish_boot_services grub_efiemu_finish_boot_services
 # define EFI_PRESENT 1
 #endif
 
diff --git a/include/grub/efiemu/efiemu.h b/include/grub/efiemu/efiemu.h
index 3980d32cd..1cddbca7c 100644
--- a/include/grub/efiemu/efiemu.h
+++ b/include/grub/efiemu/efiemu.h
@@ -217,13 +217,12 @@ int grub_efiemu_get_memory_map (grub_efi_uintn_t *memory_map_size,
 				grub_efi_uintn_t *map_key,
 				grub_efi_uintn_t *descriptor_size,
 				grub_efi_uint32_t *descriptor_version);
+#define grub_efiemu_finish_boot_services grub_efiemu_get_memory_map
 grub_err_t
 grub_efiemu_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
 							grub_uint64_t,
 							grub_uint32_t));
 int grub_efiemu_sizeof_uintn_t (void);
-int grub_efiemu_exit_boot_services (grub_efi_uintn_t map_key);
-int grub_efiemu_finish_boot_services (void);
 grub_err_t
 grub_efiemu_get_lower_upper_memory (grub_uint64_t *lower, grub_uint64_t *upper);
 #define GRUB_EFIEMU_MEMORY_AVAILABLE	1
diff --git a/loader/i386/xnu.c b/loader/i386/xnu.c
index dcec3554f..2aec590fb 100644
--- a/loader/i386/xnu.c
+++ b/loader/i386/xnu.c
@@ -1038,9 +1038,9 @@ grub_xnu_boot (void)
   bootparams->devtree = devtree_target;
   bootparams->devtreelen = devtreelen;
 
-  err = grub_efi_finish_boot_services (&memory_map_size, memory_map,
-				       &map_key, &descriptor_size,
-				       &descriptor_version);
+  err = grub_autoefi_finish_boot_services (&memory_map_size, memory_map,
+					   &map_key, &descriptor_size,
+					   &descriptor_version);
   if (err)
     return err;
 

From ba2f141cb580b243ef2defdb68b3137b7199499b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 21 Apr 2010 10:02:05 +0200
Subject: [PATCH 0817/1628] Check memory map when choosing address

---
 lib/relocator.c | 46 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index 1fe5a94e5..127b80533 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -21,6 +21,7 @@
 #include <grub/mm_private.h>
 #include <grub/misc.h>
 #include <grub/cache.h>
+#include <grub/memory.h>
 
 struct grub_relocator
 {
@@ -63,6 +64,7 @@ struct grub_relocator_extra_block
   grub_addr_t end;
 };
 
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
 struct grub_relocator_fw_leftover
 {
   struct grub_relocator_fw_leftover *next;
@@ -72,6 +74,8 @@ struct grub_relocator_fw_leftover
 };
 
 struct grub_relocator_fw_leftover *leftovers;
+#endif
+
 struct grub_relocator_extra_block *extra_blocks;
 
 struct grub_relocator *
@@ -220,6 +224,7 @@ allocate_inreg (grub_addr_t addr, grub_size_t size,
     }
 }
 
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
 static void
 check_leftover (struct grub_relocator_fw_leftover *lo)
 {
@@ -233,6 +238,7 @@ check_leftover (struct grub_relocator_fw_leftover *lo)
   if (lo->next)
     lo->next->prev = lo->prev;
 }
+#endif
 
 static void
 free_subchunk (const struct grub_relocator_subchunk *subchu)
@@ -923,7 +929,10 @@ malloc_in_range (struct grub_relocator *rel,
 		curschu->size = alloc_end - alloc_start;
 		if (typepre == CHUNK_TYPE_REGION_START)
 		if (!oom && (typepre == CHUNK_TYPE_REGION_START
-			     || typepre == CHUNK_TYPE_FIRMWARE))
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+			     || typepre == CHUNK_TYPE_FIRMWARE
+#endif
+			     ))
 		  {
 		    struct grub_relocator_extra_block *ne;
 		    ne = grub_malloc (sizeof (*ne));
@@ -1282,11 +1291,36 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
     }
   while (0);
 
-  /* FIXME: check memory map.  */
-  if (preference == GRUB_RELOCATOR_PREFERENCE_HIGH)
-    chunk->target = ALIGN_DOWN (max_addr, align);
-  else
-    chunk->target = ALIGN_UP (min_addr, align);    
+  {
+    int found = 0;
+    auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
+    int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t sz, grub_uint32_t type)
+    {
+      grub_uint64_t candidate;
+      if (type != GRUB_MACHINE_MEMORY_AVAILABLE)
+	return 0;
+      candidate = ALIGN_UP (addr, align);
+      if (candidate < min_addr)
+	candidate = min_addr;
+      if (candidate + size >= addr + sz
+	  || candidate > ALIGN_DOWN (max_addr, align))
+	return 0;
+      if (preference == GRUB_RELOCATOR_PREFERENCE_HIGH)
+	candidate = ALIGN_DOWN (addr + sz - size, align);
+      if (!found || (preference == GRUB_RELOCATOR_PREFERENCE_HIGH
+		     && candidate > chunk->target))
+	chunk->target = candidate;
+      if (!found || (preference == GRUB_RELOCATOR_PREFERENCE_LOW
+		     && candidate < chunk->target))
+	chunk->target = candidate;
+      found = 1;
+      return 0;
+    }
+
+    grub_machine_mmap_iterate (hook);
+    if (!found)
+      return grub_error (GRUB_ERR_BAD_OS, "couldn't find suitable memory target");
+  }
   while (1)
     {
       struct grub_relocator_chunk *chunk2;

From 368c17f85d89ee8b03dc3c77b4df59ce2e5abf2c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 21 Apr 2010 15:25:49 +0200
Subject: [PATCH 0818/1628] First part of virtual addr support in relocator

---
 include/grub/i386/memory.h       |  24 ++++++
 include/grub/relocator_private.h |  13 ++--
 lib/i386/relocator.c             |  24 +++---
 lib/relocator.c                  | 124 ++++++++++++++++---------------
 4 files changed, 110 insertions(+), 75 deletions(-)

diff --git a/include/grub/i386/memory.h b/include/grub/i386/memory.h
index fe2f6e4e1..4f9a3c916 100644
--- a/include/grub/i386/memory.h
+++ b/include/grub/i386/memory.h
@@ -28,4 +28,28 @@
 #define GRUB_MEMORY_CPU_AMD64_MSR		0xc0000080
 #define GRUB_MEMORY_CPU_AMD64_MSR_ON		0x00000100
 
+#ifndef ASM_FILE
+
+typedef grub_addr_t grub_phys_addr_t;
+
+static inline grub_phys_addr_t
+grub_vtop (void *a)
+{
+  return (grub_phys_addr_t) a;
+}
+
+static inline void *
+grub_map_memory (grub_phys_addr_t a, grub_size_t size __attribute__ ((unused)))
+{
+  return (void *) a;
+}
+
+static inline void
+grub_unmap_memory (void *a __attribute__ ((unused)),
+		   grub_size_t size __attribute__ ((unused)))
+{
+}
+
+#endif
+
 #endif /* ! GRUB_MEMORY_CPU_HEADER */
diff --git a/include/grub/relocator_private.h b/include/grub/relocator_private.h
index a859ec9fd..d12a0f05a 100644
--- a/include/grub/relocator_private.h
+++ b/include/grub/relocator_private.h
@@ -31,8 +31,9 @@ extern grub_size_t grub_relocator_jumper_size;
 void
 grub_cpu_relocator_init (void);
 grub_err_t
-grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
-			       grub_addr_t *relstart, grub_size_t *relsize);
+grub_relocator_prepare_relocs (struct grub_relocator *rel,
+			       void *addr,
+			       void **relstart, grub_size_t *relsize);
 void grub_cpu_relocator_forward (void *rels, void *src, void *tgt,
 				 grub_size_t size);
 void grub_cpu_relocator_backward (void *rels, void *src, void *tgt,
@@ -72,7 +73,7 @@ struct grub_relocator_mmap_event
     COLLISION_START = 10,
     COLLISION_END = COLLISION_START | 1
   } type;
-  grub_addr_t pos;
+  grub_phys_addr_t pos;
   union
   {
     struct
@@ -91,10 +92,12 @@ struct grub_relocator_mmap_event
 /* Return 0 on failure, 1 on success. The failure here 
    can be very time-expensive, so please make sure fill events is accurate.  */
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
-int grub_relocator_firmware_alloc_region (grub_addr_t start, grub_size_t size);
+int grub_relocator_firmware_alloc_region (grub_phys_addr_t start,
+					  grub_size_t size);
 unsigned grub_relocator_firmware_fill_events (struct grub_relocator_mmap_event *events);
 unsigned grub_relocator_firmware_get_max_events (void);
-void grub_relocator_firmware_free_region (grub_addr_t start, grub_size_t size);
+void grub_relocator_firmware_free_region (grub_phys_addr_t start,
+					  grub_size_t size);
 #endif
 
 #endif
diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index 5985fac7a..5dd4cde75 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -84,6 +84,12 @@ grub_size_t grub_relocator_jumper_size = 12;
 grub_size_t grub_relocator_jumper_size = 7;
 #endif
 
+static inline void *
+ptov (grub_addr_t a)
+{
+  return (void *) a;
+}
+
 void
 grub_cpu_relocator_init (void)
 {
@@ -148,10 +154,10 @@ grub_err_t
 grub_relocator32_boot (struct grub_relocator *rel,
 		       struct grub_relocator32_state state)
 {
-  grub_addr_t target;
+  grub_phys_addr_t target;
   void *src;
   grub_err_t err;
-  grub_addr_t relst;
+  void *relst;
 
   err = grub_relocator_alloc_chunk_align (rel, &src, &target, 0,
 					  (0xffffffff - RELOCATOR_SIZEOF (32))
@@ -170,7 +176,7 @@ grub_relocator32_boot (struct grub_relocator *rel,
 
   grub_memmove (src, &grub_relocator32_start, RELOCATOR_SIZEOF (32));
 
-  err = grub_relocator_prepare_relocs (rel, target, &relst, NULL);
+  err = grub_relocator_prepare_relocs (rel, ptov (target), &relst, NULL);
   if (err)
     return err;
 
@@ -185,10 +191,10 @@ grub_err_t
 grub_relocator16_boot (struct grub_relocator *rel,
 		       struct grub_relocator16_state state)
 {
-  grub_addr_t target;
+  grub_phys_addr_t target;
   void *src;
   grub_err_t err;
-  grub_addr_t relst;
+  void *relst;
 
   err = grub_relocator_alloc_chunk_align (rel, &src, &target, 0,
 					  0xa0000 - RELOCATOR_SIZEOF (16),
@@ -212,7 +218,7 @@ grub_relocator16_boot (struct grub_relocator *rel,
 
   grub_memmove (src, &grub_relocator16_start, RELOCATOR_SIZEOF (16));
 
-  err = grub_relocator_prepare_relocs (rel, target, &relst, NULL);
+  err = grub_relocator_prepare_relocs (rel, ptov (target), &relst, NULL);
   if (err)
     return err;
 
@@ -228,10 +234,10 @@ grub_relocator64_boot (struct grub_relocator *rel,
 		       struct grub_relocator64_state state,
 		       grub_addr_t min_addr, grub_addr_t max_addr)
 {
-  grub_addr_t target;
+  grub_phys_addr_t target;
   void *src;
   grub_err_t err;
-  grub_addr_t relst;
+  void *relst;
 
   err = grub_relocator_alloc_chunk_align (rel, &src, &target, min_addr,
 					  max_addr - RELOCATOR_SIZEOF (64),
@@ -251,7 +257,7 @@ grub_relocator64_boot (struct grub_relocator *rel,
 
   grub_memmove (src, &grub_relocator64_start, RELOCATOR_SIZEOF (64));
 
-  err = grub_relocator_prepare_relocs (rel, target, &relst, NULL);
+  err = grub_relocator_prepare_relocs (rel, ptov (target), &relst, NULL);
   if (err)
     return err;
 
diff --git a/lib/relocator.c b/lib/relocator.c
index 127b80533..b559d12ea 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -26,9 +26,9 @@
 struct grub_relocator
 {
   struct grub_relocator_chunk *chunks;
-  grub_addr_t postchunks;
-  grub_addr_t highestaddr;
-  grub_addr_t highestnonpostaddr;
+  grub_phys_addr_t postchunks;
+  grub_phys_addr_t highestaddr;
+  grub_phys_addr_t highestnonpostaddr;
   grub_size_t relocators_size;
 };
 
@@ -39,9 +39,11 @@ struct grub_relocator_subchunk
 	CHUNK_TYPE_FIRMWARE, CHUNK_TYPE_LEFTOVER
 #endif
   } type;
-  grub_addr_t host_start;
-  grub_addr_t start;
+  grub_mm_region_t reg;
+  grub_mm_header_t head;
+  grub_phys_addr_t start;
   grub_size_t size;
+  grub_size_t pre_size;
   struct grub_relocator_extra_block *extra;
   struct grub_relocator_fw_leftover *pre, *post;
 };
@@ -49,8 +51,9 @@ struct grub_relocator_subchunk
 struct grub_relocator_chunk
 {
   struct grub_relocator_chunk *next;
-  grub_addr_t src;
-  grub_addr_t target;
+  grub_phys_addr_t src;
+  void *srcv;
+  grub_phys_addr_t target;
   grub_size_t size;
   struct grub_relocator_subchunk *subchunks;
   unsigned nsubchunks;
@@ -60,8 +63,8 @@ struct grub_relocator_extra_block
 {
   struct grub_relocator_extra_block *next;
   struct grub_relocator_extra_block **prev;
-  grub_addr_t start;
-  grub_addr_t end;
+  grub_phys_addr_t start;
+  grub_phys_addr_t end;
 };
 
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
@@ -69,7 +72,7 @@ struct grub_relocator_fw_leftover
 {
   struct grub_relocator_fw_leftover *next;
   struct grub_relocator_fw_leftover **prev;
-  grub_addr_t quantstart;
+  grub_phys_addr_t quantstart;
   grub_uint8_t freebytes[GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT / 8];
 };
 
@@ -89,7 +92,7 @@ grub_relocator_new (void)
   if (!ret)
     return NULL;
     
-  ret->postchunks = ~(grub_addr_t) 0;
+  ret->postchunks = ~(grub_phys_addr_t) 0;
   ret->relocators_size = grub_relocator_jumper_size;
   grub_dprintf ("relocator", "relocators_size=%lu\n",
 		(unsigned long) ret->relocators_size);
@@ -110,10 +113,11 @@ is_start (int type)
 }
 
 static void
-allocate_regstart (grub_addr_t addr, grub_size_t size, grub_mm_region_t rb,
+allocate_regstart (grub_phys_addr_t addr, grub_size_t size, grub_mm_region_t rb,
 		   grub_mm_region_t *regancestor, grub_mm_header_t hancestor)
 {
-  grub_addr_t newreg_start, newreg_raw_start = addr + size;
+  grub_addr_t newreg_start, newreg_raw_start
+    = (grub_addr_t) rb + (addr - grub_vtop (rb)) + size;
   grub_addr_t newreg_size, newreg_presize;
   grub_mm_header_t new_header;
   grub_mm_header_t hb = (grub_mm_header_t) (rb + 1);
@@ -176,23 +180,24 @@ allocate_regstart (grub_addr_t addr, grub_size_t size, grub_mm_region_t rb,
 }
 
 static void
-allocate_inreg (grub_addr_t addr, grub_size_t size,
+allocate_inreg (grub_phys_addr_t paddr, grub_size_t size,
 		grub_mm_header_t hb, grub_mm_header_t hbp,
 		grub_mm_region_t rb)
 {
   struct grub_mm_header *foll = NULL;
+  grub_addr_t vaddr = (grub_addr_t) hb + (paddr - grub_vtop (hb));
     
-  if (ALIGN_UP (addr + size, GRUB_MM_ALIGN) + GRUB_MM_ALIGN
+  if (ALIGN_UP (vaddr + size, GRUB_MM_ALIGN) + GRUB_MM_ALIGN
       <= (grub_addr_t) (hb + hb->size))
     {
-      foll = (void *) ALIGN_UP (addr + size, GRUB_MM_ALIGN);
+      foll = (void *) ALIGN_UP (vaddr + size, GRUB_MM_ALIGN);
       foll->magic = GRUB_MM_FREE_MAGIC;
       foll->size = hb->size - (foll - hb);
     }
 
-  if (addr - (grub_addr_t) hb >= sizeof (*hb))
+  if (vaddr - (grub_addr_t) hb >= sizeof (*hb))
     {
-      hb->size = ((addr - (grub_addr_t) hb) >> GRUB_MM_ALIGN_LOG2);
+      hb->size = ((vaddr - (grub_addr_t) hb) >> GRUB_MM_ALIGN_LOG2);
       if (foll)
 	{
 	  foll->next = hb;
@@ -250,12 +255,13 @@ free_subchunk (const struct grub_relocator_subchunk *subchu)
 	grub_mm_region_t r1, r2, *rp;
 	grub_mm_header_t h;
 	grub_size_t pre_size;
-	r1 = (grub_mm_region_t) ALIGN_UP (subchu->host_start, GRUB_MM_ALIGN);
-	r2 = (grub_mm_region_t) ALIGN_UP (subchu->start + subchu->size,
+	r1 = subchu->reg;
+	r2 = (grub_mm_region_t) ALIGN_UP ((grub_addr_t) subchu->reg
+					  + (grub_vtop (subchu->reg)
+					     - subchu->start) + subchu->size,
 					  GRUB_MM_ALIGN);
 	for (rp = &grub_mm_base; *rp && *rp != r2; rp = &((*rp)->next));
-	pre_size = ALIGN_UP (subchu->host_start, GRUB_MM_ALIGN)
-	  - subchu->host_start;
+	pre_size = subchu->pre_size;
 
 	if (*rp)
 	  {
@@ -328,7 +334,7 @@ free_subchunk (const struct grub_relocator_subchunk *subchu)
       }
     case CHUNK_TYPE_IN_REGION:
       {
-	grub_mm_header_t h = (grub_mm_header_t) ALIGN_DOWN (subchu->start,
+	grub_mm_header_t h = (grub_mm_header_t) ALIGN_DOWN ((grub_addr_t) subchu->head,
 							    GRUB_MM_ALIGN);
 	h->size
 	  = ((subchu->start + subchu->size + GRUB_MM_ALIGN - 1) / GRUB_MM_ALIGN)
@@ -549,26 +555,26 @@ malloc_in_range (struct grub_relocator *rel,
 	    {
 	      pre_added = 1;
 	      events[N].type = REG_BEG_START;
-	      events[N].pos = (grub_addr_t) r - r->pre_size;
+	      events[N].pos = grub_vtop (r) - r->pre_size;
 	      events[N].reg = r;
 	      events[N].regancestor = ra;
 	      events[N].head = p;
 	      events[N].hancestor = pa;
 	      N++;
 	      events[N].type = REG_BEG_END;
-	      events[N].pos = (grub_addr_t) (p + p->size) - sizeof (*r);
+	      events[N].pos = grub_vtop (p + p->size) - sizeof (*r);
 	      N++;
 	    }
 	  else
 	    {
 	      events[N].type = IN_REG_START;
-	      events[N].pos = (grub_addr_t) p;
+	      events[N].pos = grub_vtop (p);
 	      events[N].head = p;
 	      events[N].hancestor = pa;
 	      events[N].reg = r;
 	      N++;
 	      events[N].type = IN_REG_END;
-	      events[N].pos = (grub_addr_t) (p + p->size);
+	      events[N].pos = grub_vtop (p + p->size);
 	      N++;
 	    }
 	  pa = p;
@@ -862,20 +868,6 @@ malloc_in_range (struct grub_relocator *rel,
       }
   }
 
-  grub_memset ((void *) target, 0, size);
-  grub_dprintf ("relocator", "baseptr = %p\n", &base_saved);
-  for (r = base_saved; r; r = r->next)
-    {
-      p = r->first;
-      do
-	{
-	  if (!p)
-	    grub_fatal ("null in the ring %p\n", r);
-	  p = p->next;
-	}
-      while (p != r->first);
-    }
-
   /* Malloc is available again.  */
   grub_mm_base = base_saved;
 
@@ -927,7 +919,13 @@ malloc_in_range (struct grub_relocator *rel,
 		curschu->type = typepre;
 		curschu->start = alloc_start;
 		curschu->size = alloc_end - alloc_start;
-		if (typepre == CHUNK_TYPE_REGION_START)
+		if (typepre == CHUNK_TYPE_REGION_START
+		    || typepre == CHUNK_TYPE_IN_REGION)
+		  {
+		    curschu->reg = events[last_start].reg;
+		    curschu->head = events[last_start].head;
+		    curschu->pre_size = alloc_start - events[j - 1].pos;
+		  }
 		if (!oom && (typepre == CHUNK_TYPE_REGION_START
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
 			     || typepre == CHUNK_TYPE_FIRMWARE
@@ -1106,8 +1104,8 @@ malloc_in_range (struct grub_relocator *rel,
 
 static void
 adjust_limits (struct grub_relocator *rel, 
-	       grub_addr_t *min_addr, grub_addr_t *max_addr,
-	       grub_addr_t in_min, grub_addr_t in_max)
+	       grub_phys_addr_t *min_addr, grub_phys_addr_t *max_addr,
+	       grub_phys_addr_t in_min, grub_phys_addr_t in_max)
 {
   struct grub_relocator_chunk *chunk;
 
@@ -1129,10 +1127,10 @@ adjust_limits (struct grub_relocator *rel,
 
 grub_err_t
 grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
-				 grub_addr_t target, grub_size_t size)
+				 grub_phys_addr_t target, grub_size_t size)
 {
   struct grub_relocator_chunk *chunk;
-  grub_addr_t min_addr = 0, max_addr;
+  grub_phys_addr_t min_addr = 0, max_addr;
 
   if (target > ~size)
     return grub_error (GRUB_ERR_OUT_OF_RANGE, "address is out of range");
@@ -1223,14 +1221,15 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
   grub_dprintf ("relocator", "cur = %p, next = %p\n", rel->chunks,
 		rel->chunks->next);
 
-  *src = (void *) chunk->src;
+  *src = chunk->srcv = grub_map_memory (chunk->src, chunk->size);
   return GRUB_ERR_NONE;
 }
 
 grub_err_t
 grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
-				  grub_addr_t *target,
-				  grub_addr_t min_addr, grub_addr_t max_addr,
+				  grub_phys_addr_t *target,
+				  grub_phys_addr_t min_addr,
+				  grub_phys_addr_t max_addr,
 				  grub_size_t size, grub_size_t align,
 				  int preference)
 {
@@ -1354,7 +1353,7 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
   rel->chunks = chunk;
   grub_dprintf ("relocator", "cur = %p, next = %p\n", rel->chunks,
 		rel->chunks->next);
-  *src = (void *) chunk->src;
+  *src = chunk->srcv = grub_map_memory (chunk->src, chunk->size);
   *target = chunk->target;
   return GRUB_ERR_NONE;
 }
@@ -1370,6 +1369,7 @@ grub_relocator_unload (struct grub_relocator *rel)
       unsigned i;
       for (i = 0; i < chunk->nsubchunks; i++) 
 	free_subchunk (&chunk->subchunks[i]);
+      grub_unmap_memory (chunk->srcv, chunk->size);
       next = chunk->next;
       grub_free (chunk->subchunks);
       grub_free (chunk);
@@ -1378,11 +1378,11 @@ grub_relocator_unload (struct grub_relocator *rel)
 }
 
 grub_err_t
-grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
-			       grub_addr_t *relstart, grub_size_t *relsize)
+grub_relocator_prepare_relocs (struct grub_relocator *rel, void *addr,
+			       void **relstart, grub_size_t *relsize)
 {
-  grub_addr_t rels;
-  grub_addr_t rels0;
+  grub_uint8_t *rels;
+  grub_uint8_t *rels0;
   struct grub_relocator_chunk *sorted;
   grub_size_t nchunks = 0;
   unsigned j;
@@ -1395,7 +1395,7 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
 			grub_relocator_align,
 			rel->relocators_size, &movers_chunk, 1, 1))
     return grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
-  rels = rels0 = movers_chunk.src;
+  rels = rels0 = movers_chunk.srcv;
 
   if (relsize)
     *relsize = rel->relocators_size;
@@ -1463,23 +1463,25 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
       if (sorted[j].src < sorted[j].target)
 	{
 	  grub_cpu_relocator_backward ((void *) rels,
-				       (void *) sorted[j].src,
-				       (void *) sorted[j].target,
+				       sorted[j].srcv,
+				       grub_map_memory (sorted[j].target,
+							sorted[j].size),
 				       sorted[j].size);
 	  rels += grub_relocator_backward_size;
 	}
       if (sorted[j].src > sorted[j].target)
 	{
 	  grub_cpu_relocator_forward ((void *) rels,
-				      (void *) sorted[j].src,
-				      (void *) sorted[j].target,
+				      sorted[j].srcv,
+				      grub_map_memory (sorted[j].target,
+						       sorted[j].size),
 				      sorted[j].size);
 	  rels += grub_relocator_forward_size;
 	}
       if (sorted[j].src == sorted[j].target)
-	grub_arch_sync_caches ((void *) sorted[j].src, sorted[j].size);
+	grub_arch_sync_caches (sorted[j].srcv, sorted[j].size);
     }
-  grub_cpu_relocator_jumper ((void *) rels, addr);
+  grub_cpu_relocator_jumper ((void *) rels, (grub_addr_t) addr);
   *relstart = rels0;
   grub_free (sorted);
   return GRUB_ERR_NONE;

From 4b2ec20b411f9829eafc639963a2f0812d8e046d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 21 Apr 2010 19:13:45 +0200
Subject: [PATCH 0819/1628] Second part of p2v support

---
 include/grub/relocator.h         |  20 +++-
 include/grub/relocator_private.h |   2 +-
 lib/i386/relocator.c             |  41 ++++----
 lib/relocator.c                  |  42 +++++---
 loader/i386/bsd.c                | 159 ++++++++++++++++++++-----------
 loader/i386/bsdXX.c              |  51 ++++++----
 loader/i386/linux.c              |  44 +++++----
 loader/i386/multiboot_mbi.c      |  10 +-
 loader/i386/pc/linux.c           |  48 ++++++----
 loader/i386/pc/ntldr.c           |  24 +++--
 loader/multiboot.c               |  24 +++--
 loader/multiboot_elfxx.c         |  48 ++++++----
 loader/multiboot_mbi2.c          |  12 ++-
 loader/xnu.c                     |   4 +-
 loader/xnu_resume.c              |  44 +++++----
 15 files changed, 361 insertions(+), 212 deletions(-)

diff --git a/include/grub/relocator.h b/include/grub/relocator.h
index 32bab7053..89e746088 100644
--- a/include/grub/relocator.h
+++ b/include/grub/relocator.h
@@ -21,19 +21,29 @@
 
 #include <grub/types.h>
 #include <grub/err.h>
+#include <grub/memory.h>
 
 struct grub_relocator;
+struct grub_relocator_chunk;
+typedef const struct grub_relocator_chunk *grub_relocator_chunk_t;
 
 struct grub_relocator *grub_relocator_new (void);
 
 grub_err_t
-grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
-				 grub_addr_t target, grub_size_t size);
+grub_relocator_alloc_chunk_addr (struct grub_relocator *rel,
+				 grub_relocator_chunk_t *out,
+				 grub_phys_addr_t target, grub_size_t size);
+
+void *
+get_virtual_current_address (grub_relocator_chunk_t in);
+grub_phys_addr_t
+get_physical_target_address (grub_relocator_chunk_t in);
 
 grub_err_t
-grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src, 
-				  grub_addr_t *target,
-				  grub_addr_t min_addr, grub_addr_t max_addr,
+grub_relocator_alloc_chunk_align (struct grub_relocator *rel, 
+				  grub_relocator_chunk_t *out,
+				  grub_phys_addr_t min_addr,
+				  grub_phys_addr_t max_addr,
 				  grub_size_t size, grub_size_t align,
 				  int preference);
 
diff --git a/include/grub/relocator_private.h b/include/grub/relocator_private.h
index d12a0f05a..10e445bfe 100644
--- a/include/grub/relocator_private.h
+++ b/include/grub/relocator_private.h
@@ -32,7 +32,7 @@ void
 grub_cpu_relocator_init (void);
 grub_err_t
 grub_relocator_prepare_relocs (struct grub_relocator *rel,
-			       void *addr,
+			       grub_addr_t addr,
 			       void **relstart, grub_size_t *relsize);
 void grub_cpu_relocator_forward (void *rels, void *src, void *tgt,
 				 grub_size_t size);
diff --git a/lib/i386/relocator.c b/lib/i386/relocator.c
index 5dd4cde75..55e6b5578 100644
--- a/lib/i386/relocator.c
+++ b/lib/i386/relocator.c
@@ -84,12 +84,6 @@ grub_size_t grub_relocator_jumper_size = 12;
 grub_size_t grub_relocator_jumper_size = 7;
 #endif
 
-static inline void *
-ptov (grub_addr_t a)
-{
-  return (void *) a;
-}
-
 void
 grub_cpu_relocator_init (void)
 {
@@ -154,12 +148,11 @@ grub_err_t
 grub_relocator32_boot (struct grub_relocator *rel,
 		       struct grub_relocator32_state state)
 {
-  grub_phys_addr_t target;
-  void *src;
   grub_err_t err;
   void *relst;
+  grub_relocator_chunk_t ch;
 
-  err = grub_relocator_alloc_chunk_align (rel, &src, &target, 0,
+  err = grub_relocator_alloc_chunk_align (rel, &ch, 0,
 					  (0xffffffff - RELOCATOR_SIZEOF (32))
 					  + 1, RELOCATOR_SIZEOF (32), 16,
 					  GRUB_RELOCATOR_PREFERENCE_NONE);
@@ -174,9 +167,11 @@ grub_relocator32_boot (struct grub_relocator *rel,
   grub_relocator32_esp = state.esp;
   grub_relocator32_esi = state.esi;
 
-  grub_memmove (src, &grub_relocator32_start, RELOCATOR_SIZEOF (32));
+  grub_memmove (get_virtual_current_address (ch), &grub_relocator32_start,
+		RELOCATOR_SIZEOF (32));
 
-  err = grub_relocator_prepare_relocs (rel, ptov (target), &relst, NULL);
+  err = grub_relocator_prepare_relocs (rel, get_physical_target_address (ch),
+				       &relst, NULL);
   if (err)
     return err;
 
@@ -191,12 +186,11 @@ grub_err_t
 grub_relocator16_boot (struct grub_relocator *rel,
 		       struct grub_relocator16_state state)
 {
-  grub_phys_addr_t target;
-  void *src;
   grub_err_t err;
   void *relst;
+  grub_relocator_chunk_t ch;
 
-  err = grub_relocator_alloc_chunk_align (rel, &src, &target, 0,
+  err = grub_relocator_alloc_chunk_align (rel, &ch, 0,
 					  0xa0000 - RELOCATOR_SIZEOF (16),
 					  RELOCATOR_SIZEOF (16), 16,
 					  GRUB_RELOCATOR_PREFERENCE_NONE);
@@ -216,12 +210,16 @@ grub_relocator16_boot (struct grub_relocator *rel,
 
   grub_relocator16_edx = state.edx;
 
-  grub_memmove (src, &grub_relocator16_start, RELOCATOR_SIZEOF (16));
+  grub_memmove (get_virtual_current_address (ch), &grub_relocator16_start,
+		RELOCATOR_SIZEOF (16));
 
-  err = grub_relocator_prepare_relocs (rel, ptov (target), &relst, NULL);
+  err = grub_relocator_prepare_relocs (rel, get_physical_target_address (ch),
+				       &relst, NULL);
   if (err)
     return err;
 
+  grub_printf ("%p\n", relst);
+
   asm volatile ("cli");
   ((void (*) (void)) relst) ();
 
@@ -234,12 +232,11 @@ grub_relocator64_boot (struct grub_relocator *rel,
 		       struct grub_relocator64_state state,
 		       grub_addr_t min_addr, grub_addr_t max_addr)
 {
-  grub_phys_addr_t target;
-  void *src;
   grub_err_t err;
   void *relst;
+  grub_relocator_chunk_t ch;
 
-  err = grub_relocator_alloc_chunk_align (rel, &src, &target, min_addr,
+  err = grub_relocator_alloc_chunk_align (rel, &ch, min_addr,
 					  max_addr - RELOCATOR_SIZEOF (64),
 					  RELOCATOR_SIZEOF (64), 16,
 					  GRUB_RELOCATOR_PREFERENCE_NONE);
@@ -255,9 +252,11 @@ grub_relocator64_boot (struct grub_relocator *rel,
   grub_relocator64_rsi = state.rsi;
   grub_relocator64_cr3 = state.cr3;
 
-  grub_memmove (src, &grub_relocator64_start, RELOCATOR_SIZEOF (64));
+  grub_memmove (get_virtual_current_address (ch), &grub_relocator64_start,
+		RELOCATOR_SIZEOF (64));
 
-  err = grub_relocator_prepare_relocs (rel, ptov (target), &relst, NULL);
+  err = grub_relocator_prepare_relocs (rel, get_physical_target_address (ch),
+				       &relst, NULL);
   if (err)
     return err;
 
diff --git a/lib/relocator.c b/lib/relocator.c
index b559d12ea..e43463e4d 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -81,6 +81,18 @@ struct grub_relocator_fw_leftover *leftovers;
 
 struct grub_relocator_extra_block *extra_blocks;
 
+void *
+get_virtual_current_address (grub_relocator_chunk_t in)
+{
+  return in->srcv;
+}
+
+grub_phys_addr_t
+get_physical_target_address (grub_relocator_chunk_t in)
+{
+  return in->target;
+}
+
 struct grub_relocator *
 grub_relocator_new (void)
 {
@@ -1126,7 +1138,8 @@ adjust_limits (struct grub_relocator *rel,
 }
 
 grub_err_t
-grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
+grub_relocator_alloc_chunk_addr (struct grub_relocator *rel,
+				 grub_relocator_chunk_t *out,
 				 grub_phys_addr_t target, grub_size_t size)
 {
   struct grub_relocator_chunk *chunk;
@@ -1221,13 +1234,14 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel, void **src,
   grub_dprintf ("relocator", "cur = %p, next = %p\n", rel->chunks,
 		rel->chunks->next);
 
-  *src = chunk->srcv = grub_map_memory (chunk->src, chunk->size);
+  chunk->srcv = grub_map_memory (chunk->src, chunk->size);
+  *out = chunk;
   return GRUB_ERR_NONE;
 }
 
 grub_err_t
-grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
-				  grub_phys_addr_t *target,
+grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
+				  grub_relocator_chunk_t *out,
 				  grub_phys_addr_t min_addr,
 				  grub_phys_addr_t max_addr,
 				  grub_size_t size, grub_size_t align,
@@ -1262,8 +1276,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
       chunk->size = size;
       chunk->next = rel->chunks;
       rel->chunks = chunk;
-      *src = (void *) chunk->src;
-      *target = chunk->target;
+      chunk->srcv = grub_map_memory (chunk->src, chunk->size);
+      *out = chunk;
       return GRUB_ERR_NONE;
     }
 
@@ -1300,12 +1314,12 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
 	return 0;
       candidate = ALIGN_UP (addr, align);
       if (candidate < min_addr)
-	candidate = min_addr;
-      if (candidate + size >= addr + sz
+	candidate = ALIGN_UP (min_addr, align);
+      if (candidate + size > addr + sz
 	  || candidate > ALIGN_DOWN (max_addr, align))
 	return 0;
       if (preference == GRUB_RELOCATOR_PREFERENCE_HIGH)
-	candidate = ALIGN_DOWN (addr + sz - size, align);
+	candidate = ALIGN_DOWN (min (addr + sz - size, max_addr), align);
       if (!found || (preference == GRUB_RELOCATOR_PREFERENCE_HIGH
 		     && candidate > chunk->target))
 	chunk->target = candidate;
@@ -1353,8 +1367,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel, void **src,
   rel->chunks = chunk;
   grub_dprintf ("relocator", "cur = %p, next = %p\n", rel->chunks,
 		rel->chunks->next);
-  *src = chunk->srcv = grub_map_memory (chunk->src, chunk->size);
-  *target = chunk->target;
+  chunk->srcv = grub_map_memory (chunk->src, chunk->size);
+  *out = chunk;
   return GRUB_ERR_NONE;
 }
 
@@ -1378,7 +1392,7 @@ grub_relocator_unload (struct grub_relocator *rel)
 }
 
 grub_err_t
-grub_relocator_prepare_relocs (struct grub_relocator *rel, void *addr,
+grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
 			       void **relstart, grub_size_t *relsize)
 {
   grub_uint8_t *rels;
@@ -1395,12 +1409,12 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, void *addr,
 			grub_relocator_align,
 			rel->relocators_size, &movers_chunk, 1, 1))
     return grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
-  rels = rels0 = movers_chunk.srcv;
+  rels = rels0 = grub_map_memory (movers_chunk.src, movers_chunk.size);
 
   if (relsize)
     *relsize = rel->relocators_size;
 
-  grub_dprintf ("relocator", "Relocs allocated\n");
+  grub_dprintf ("relocator", "Relocs allocated at %p\n", movers_chunk.srcv);
   
   {
     unsigned i;
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index cfd10713d..1b2fadd80 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -606,10 +606,14 @@ grub_freebsd_boot (void)
   if (is_64bit)
     p_size += 4096 * 3;
 
-  err = grub_relocator_alloc_chunk_addr (relocator, (void **) &p,
-					 kern_end, p_size);
-  if (err)
-    return err;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (relocator, &ch,
+					   kern_end, p_size);
+    if (err)
+      return err;
+    p = get_virtual_current_address (ch);
+  }
   p_target = kern_end;
   p0 = p;
   kern_end += p_size;
@@ -682,14 +686,18 @@ grub_freebsd_boot (void)
       grub_uint32_t *stack;
       grub_addr_t stack_target;
 
-      err = grub_relocator_alloc_chunk_align (relocator, (void **) &stack,
-					      &stack_target,
-					      0x10000, 0x90000,
-					      3 * sizeof (grub_uint32_t)
-					      + sizeof (bi), 4,
-					      GRUB_RELOCATOR_PREFERENCE_NONE);
-      if (err)
-	return err;
+      {
+	grub_relocator_chunk_t ch;
+	err = grub_relocator_alloc_chunk_align (relocator, &ch,
+						0x10000, 0x90000,
+						3 * sizeof (grub_uint32_t)
+						+ sizeof (bi), 4,
+						GRUB_RELOCATOR_PREFERENCE_NONE);
+	if (err)
+	  return err;
+	stack = get_virtual_current_address (ch);
+	stack_target = get_physical_target_address (ch);
+      }
 
 #ifdef GRUB_MACHINE_EFI
       err = grub_efi_finish_boot_services (NULL, NULL, NULL, NULL, NULL);
@@ -714,14 +722,19 @@ grub_freebsd_boot (void)
       struct grub_relocator32_state state;
       grub_uint32_t *stack;
       grub_addr_t stack_target;
-      err = grub_relocator_alloc_chunk_align (relocator, (void **) &stack,
-					      &stack_target,
-					      0x10000, 0x90000,
-					      9 * sizeof (grub_uint32_t)
-					      + sizeof (bi), 4,
-					      GRUB_RELOCATOR_PREFERENCE_NONE);
-      if (err)
-	return err;
+
+      {
+	grub_relocator_chunk_t ch;
+	err = grub_relocator_alloc_chunk_align (relocator, &ch,
+						0x10000, 0x90000,
+						9 * sizeof (grub_uint32_t)
+						+ sizeof (bi), 4,
+						GRUB_RELOCATOR_PREFERENCE_NONE);
+	if (err)
+	  return err;
+	stack = get_virtual_current_address (ch);
+	stack_target = get_physical_target_address (ch);
+      }
 
 #ifdef GRUB_MACHINE_EFI
       err = grub_efi_finish_boot_services (NULL, NULL, NULL, NULL, NULL);
@@ -772,12 +785,16 @@ grub_openbsd_boot (void)
   }
 
   buf_target = GRUB_BSD_TEMP_BUFFER - 9 * sizeof (grub_uint32_t);
-  err = grub_relocator_alloc_chunk_addr (relocator, &buf0,
-					 buf_target, tag_buf_len
-					 + sizeof (struct grub_openbsd_bootargs)
-					 + 9 * sizeof (grub_uint32_t));
-  if (err)
-    return err;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (relocator, &ch, buf_target,
+					   tag_buf_len
+					   + sizeof (struct grub_openbsd_bootargs)
+					   + 9 * sizeof (grub_uint32_t));
+    if (err)
+      return err;
+    buf0 = get_virtual_current_address (ch);
+  }
 
   stack = (grub_uint32_t *) buf0;
   arg0 = curarg = stack + 9;
@@ -976,12 +993,16 @@ grub_netbsd_boot (void)
   }
 
   arg_target = kern_end;
-  err = grub_relocator_alloc_chunk_addr (relocator, &curarg,
-					 arg_target, tag_buf_len
-					 + sizeof (struct grub_netbsd_bootinfo)
-					 + tag_count * sizeof (grub_uint32_t));
-  if (err)
-    return err;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (relocator, &ch,
+					   arg_target, tag_buf_len
+					   + sizeof (struct grub_netbsd_bootinfo)
+					   + tag_count * sizeof (grub_uint32_t));
+    if (err)
+      return err;
+    curarg = get_virtual_current_address (ch);
+  }
 
   arg0 = curarg;
   bootinfo = (void *) ((grub_uint8_t *) arg0 + tag_buf_len);
@@ -1004,12 +1025,16 @@ grub_netbsd_boot (void)
       }
   }
 
-  err = grub_relocator_alloc_chunk_align (relocator, (void **) &stack,
-					  &stack_target, 0x10000, 0x90000,
-					  7 * sizeof (grub_uint32_t), 4,
-					  GRUB_RELOCATOR_PREFERENCE_NONE);
-  if (err)
-    return err;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_align (relocator, &ch, 0x10000, 0x90000,
+					    7 * sizeof (grub_uint32_t), 4,
+					    GRUB_RELOCATOR_PREFERENCE_NONE);
+    if (err)
+      return err;
+    stack = get_virtual_current_address (ch);
+    stack_target = get_physical_target_address (ch);
+  }
 
 #ifdef GRUB_MACHINE_EFI
   err = grub_efi_finish_boot_services (NULL, NULL, NULL, NULL, NULL);
@@ -1107,10 +1132,15 @@ grub_bsd_load_aout (grub_file_t file)
   if (!relocator)
     return grub_errno;
 
-  err = grub_relocator_alloc_chunk_addr (relocator, &kern_chunk_src,
-					 kern_start, kern_end - kern_start);
-  if (err)
-    return err;
+  {
+    grub_relocator_chunk_t ch;
+
+    err = grub_relocator_alloc_chunk_addr (relocator, &ch,
+					   kern_start, kern_end - kern_start);
+    if (err)
+      return err;
+    kern_chunk_src = get_virtual_current_address (ch);
+  }
 
   return grub_aout_load (file, ofs, kern_chunk_src,
 			 ah.aout32.a_text + ah.aout32.a_data,
@@ -1210,15 +1240,19 @@ grub_bsd_load_elf (grub_elf_t elf)
 
   if (grub_elf_is_elf32 (elf))
     {
+      grub_relocator_chunk_t ch;
+
       entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFF;
       err = grub_elf32_phdr_iterate (elf, grub_bsd_elf32_size_hook, NULL);
       if (err)
 	return err;
-      err = grub_relocator_alloc_chunk_addr (relocator, &kern_chunk_src,
+      err = grub_relocator_alloc_chunk_addr (relocator, &ch,
 					     kern_start, kern_end - kern_start);
       if (err)
 	return err;
 
+      kern_chunk_src = get_virtual_current_address (ch);
+
       return grub_elf32_load (elf, grub_bsd_elf32_hook, 0, 0);
     }
   else if (grub_elf_is_elf64 (elf))
@@ -1246,10 +1280,15 @@ grub_bsd_load_elf (grub_elf_t elf)
 
       grub_dprintf ("bsd", "kern_start = %lx, kern_end = %lx\n",
 		    (unsigned long) kern_start, (unsigned long) kern_end);
-      err = grub_relocator_alloc_chunk_addr (relocator, &kern_chunk_src,
-					     kern_start, kern_end - kern_start);
-      if (err)
-	return err;
+      {
+	grub_relocator_chunk_t ch;
+
+	err = grub_relocator_alloc_chunk_addr (relocator, &ch, kern_start,
+					       kern_end - kern_start);
+	if (err)
+	  return err;
+	kern_chunk_src = get_virtual_current_address (ch);
+      }
 
       return grub_elf64_load (elf, grub_bsd_elf64_hook, 0, 0);
     }
@@ -1682,10 +1721,15 @@ grub_cmd_freebsd_module (grub_command_t cmd __attribute__ ((unused)),
   if ((!file) || (!file->size))
     goto fail;
 
-  err = grub_relocator_alloc_chunk_addr (relocator, &src, kern_end, 
-					 file->size);
-  if (err)
-    goto fail;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (relocator, &ch, kern_end, 
+					   file->size);
+    if (err)
+      goto fail;
+    src = get_virtual_current_address (ch);
+  }
+
 
   grub_file_read (file, src, file->size);
   if (grub_errno)
@@ -1728,10 +1772,15 @@ grub_netbsd_module_load (char *filename, grub_uint32_t type)
   if ((!file) || (!file->size))
     goto fail;
 
-  err = grub_relocator_alloc_chunk_addr (relocator, &src, kern_end, 
-					 file->size);
-  if (err)
-    goto fail;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (relocator, &ch, kern_end, 
+					   file->size);
+    if (err)
+      goto fail;
+
+    src = get_virtual_current_address (ch);
+  }
 
   grub_file_read (file, src, file->size);
   if (grub_errno)
diff --git a/loader/i386/bsdXX.c b/loader/i386/bsdXX.c
index 734633704..85f4c6236 100644
--- a/loader/i386/bsdXX.c
+++ b/loader/i386/bsdXX.c
@@ -103,10 +103,14 @@ SUFFIX (grub_freebsd_load_elfmodule_obj) (struct grub_relocator *relocator,
       chunk_size += s->sh_size;
     }
 
-  err = grub_relocator_alloc_chunk_addr (relocator, &chunk_src,
-					 module, chunk_size);
-  if (err)
-    return err;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (relocator, &ch,
+					   module, chunk_size);
+    if (err)
+      return err;
+    chunk_src = get_virtual_current_address (ch);
+  }
 
   for (s = (Elf_Shdr *) shdr; s < (Elf_Shdr *) ((char *) shdr
 						+ e.e_shnum * e.e_shentsize);
@@ -191,10 +195,16 @@ SUFFIX (grub_freebsd_load_elfmodule) (struct grub_relocator *relocator,
 	chunk_size = s->sh_addr + s->sh_size;
     }
 
-  err = grub_relocator_alloc_chunk_addr (relocator, &chunk_src,
-					 module, chunk_size);
-  if (err)
-    return err;
+  {
+    grub_relocator_chunk_t ch;
+
+    err = grub_relocator_alloc_chunk_addr (relocator, &ch,
+					   module, chunk_size);
+    if (err)
+      return err;
+
+    chunk_src = get_virtual_current_address (ch);
+  }
 
   for (s = (Elf_Shdr *) shdr; s < (Elf_Shdr *) ((char *) shdr
 						+ e.e_shnum * e.e_shentsize);
@@ -300,10 +310,15 @@ SUFFIX (grub_freebsd_load_elf_meta) (struct grub_relocator *relocator,
     + 2 * sizeof (grub_freebsd_addr_t);
 
   symtarget = ALIGN_UP (*kern_end, sizeof (grub_freebsd_addr_t));
-  err = grub_relocator_alloc_chunk_addr (relocator, &sym_chunk,
-					 symtarget, chunk_size);
-  if (err)
-    return err;
+
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (relocator, &ch,
+					   symtarget, chunk_size);
+    if (err)
+      return err;
+    sym_chunk = get_virtual_current_address (ch);
+  }
 
   symstart = symtarget;
   symend = symstart + chunk_size;
@@ -413,10 +428,14 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
     + sizeof (e) + e.e_shnum * e.e_shentsize;
 
   symtarget = ALIGN_UP (*kern_end, sizeof (grub_freebsd_addr_t));
-  err = grub_relocator_alloc_chunk_addr (relocator, &sym_chunk,
-					 symtarget, chunk_size);
-  if (err)
-    return err;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (relocator, &ch,
+					   symtarget, chunk_size);
+    if (err)
+      return err;
+    sym_chunk = get_virtual_current_address (ch);
+  }
 
   symtab.nsyms = 1;
   symtab.ssyms = symtarget;
diff --git a/loader/i386/linux.c b/loader/i386/linux.c
index ef1b8309e..e05225f25 100644
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@ -412,20 +412,28 @@ allocate_pages (grub_size_t prot_size)
       goto fail;
     }
 
-  err = grub_relocator_alloc_chunk_addr (relocator, &real_mode_mem,
-					 real_mode_target,
-					 (real_size + mmap_size 
-					  + efi_mmap_size));
-  if (err)
-    goto fail;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (relocator, &ch,
+					   real_mode_target,
+					   (real_size + mmap_size 
+					    + efi_mmap_size));
+    if (err)
+      goto fail;
+    real_mode_mem = get_virtual_current_address (ch);
+  }
   efi_mmap_buf = (grub_uint8_t *) real_mode_mem + real_size + mmap_size;
 
   prot_mode_target = GRUB_LINUX_BZIMAGE_ADDR;
 
-  err = grub_relocator_alloc_chunk_addr (relocator, &prot_mode_mem,
-					 prot_mode_target, prot_size);
-  if (err)
-    goto fail;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (relocator, &ch,
+					   prot_mode_target, prot_size);
+    if (err)
+      goto fail;
+    prot_mode_mem = get_virtual_current_address (ch);
+  }
 
   grub_dprintf ("linux", "real_mode_mem = %lx, real_mode_pages = %x, "
                 "prot_mode_mem = %lx, prot_mode_pages = %x\n",
@@ -1111,12 +1119,16 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
       goto fail;
     }
 
-  err = grub_relocator_alloc_chunk_align (relocator, &initrd_mem,
-					  &initrd_mem_target,
-					  addr_min, addr, size, 0x1000,
-					  GRUB_RELOCATOR_PREFERENCE_HIGH);
-  if (err)
-    return err;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_align (relocator, &ch,
+					    addr_min, addr, size, 0x1000,
+					    GRUB_RELOCATOR_PREFERENCE_HIGH);
+    if (err)
+      return err;
+    initrd_mem = get_virtual_current_address (ch);
+    initrd_mem_target = get_physical_target_address (ch);
+  }
 
   if (grub_file_read (file, initrd_mem, size) != size)
     {
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index 2f32c3f4e..ea1385be7 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -108,6 +108,7 @@ grub_multiboot_load (grub_file_t file)
 		       header->load_end_addr - header->load_addr);
       grub_size_t code_size;
       void *source;
+      grub_relocator_chunk_t ch;
 
       if (header->bss_end_addr)
 	code_size = (header->bss_end_addr - header->load_addr);
@@ -115,7 +116,7 @@ grub_multiboot_load (grub_file_t file)
 	code_size = load_size;
 
       err = grub_relocator_alloc_chunk_addr (grub_multiboot_relocator, 
-					     &source, header->load_addr,
+					     &ch, header->load_addr,
 					     code_size);
       if (err)
 	{
@@ -123,6 +124,7 @@ grub_multiboot_load (grub_file_t file)
 	  grub_free (buffer);
 	  return err;
 	}
+      source = get_virtual_current_address (ch);
 
       if ((grub_file_seek (file, offset)) == (grub_off_t) -1)
 	{
@@ -322,16 +324,18 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
 
   grub_err_t err;
   grub_size_t bufsize;
+  grub_relocator_chunk_t ch;
 
   bufsize = grub_multiboot_get_mbi_size ();
 
-  err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, 
-					  (void **) &ptrorig, &ptrdest,
+  err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &ch,
 					  0, 0xffffffff - bufsize,
 					  bufsize, 4,
 					  GRUB_RELOCATOR_PREFERENCE_NONE);
   if (err)
     return err;
+  ptrorig = get_virtual_current_address (ch);
+  ptrdest = (grub_addr_t) get_virtual_current_address (ch);
 
   *target = ptrdest;
 
diff --git a/loader/i386/pc/linux.c b/loader/i386/pc/linux.c
index 176220a2b..82640d77d 100644
--- a/loader/i386/pc/linux.c
+++ b/loader/i386/pc/linux.c
@@ -255,12 +255,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
 	  }
       }
 
-  err = grub_relocator_alloc_chunk_addr (relocator, (void **)
-					 &grub_linux_real_chunk,
-					 grub_linux_real_target,
-					 GRUB_LINUX_SETUP_MOVE_SIZE);
-  if (err)
-    return err;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (relocator, &ch,
+					   grub_linux_real_target,
+					   GRUB_LINUX_SETUP_MOVE_SIZE);
+    if (err)
+      return err;
+    grub_linux_real_chunk = get_virtual_current_address (ch);
+  }
 
   /* Put the real mode code at the temporary address.  */
   grub_memmove (grub_linux_real_chunk, &lh, sizeof (lh));
@@ -301,12 +304,15 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
     grub_linux_prot_target = GRUB_LINUX_BZIMAGE_ADDR;
   else
     grub_linux_prot_target = GRUB_LINUX_ZIMAGE_ADDR;
-  err = grub_relocator_alloc_chunk_addr (relocator,
-					 (void **) &grub_linux_prot_chunk,
-					 grub_linux_prot_target,
-					 grub_linux16_prot_size);
-  if (err)
-    return err;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (relocator, &ch,
+					   grub_linux_prot_target,
+					   grub_linux16_prot_size);
+    if (err)
+      return err;
+    grub_linux_prot_chunk = get_virtual_current_address (ch);
+  }
 
   len = grub_linux16_prot_size;
   if (grub_file_read (file, grub_linux_prot_chunk, grub_linux16_prot_size)
@@ -398,13 +404,17 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
 
   size = grub_file_size (file);
 
-  err = grub_relocator_alloc_chunk_align (relocator, (void **) &initrd_chunk,
-					  &initrd_addr,
-					  addr_min, addr_max - size,
-					  size, 0x1000,
-					  GRUB_RELOCATOR_PREFERENCE_HIGH);
-  if (err)
-    return err;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_align (relocator, &ch,
+					    addr_min, addr_max - size,
+					    size, 0x1000,
+					    GRUB_RELOCATOR_PREFERENCE_HIGH);
+    if (err)
+      return err;
+    initrd_chunk = get_virtual_current_address (ch);
+    initrd_addr = get_physical_target_address (ch);
+  }
 
   if (grub_file_read (file, initrd_chunk, size) != size)
     {
diff --git a/loader/i386/pc/ntldr.c b/loader/i386/pc/ntldr.c
index 1368694fb..0c33a0680 100644
--- a/loader/i386/pc/ntldr.c
+++ b/loader/i386/pc/ntldr.c
@@ -90,10 +90,14 @@ grub_cmd_ntldr (grub_command_t cmd __attribute__ ((unused)),
   if (! file)
     goto fail;
 
-  err = grub_relocator_alloc_chunk_addr (rel, &bs, 0x7C00,
-					 GRUB_DISK_SECTOR_SIZE);
-  if (err)
-    goto fail;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (rel, &ch, 0x7C00,
+					   GRUB_DISK_SECTOR_SIZE);
+    if (err)
+      goto fail;
+    bs = get_virtual_current_address (ch);
+  }
 
   edx = grub_get_root_biosnumber ();
   dev = grub_device_open (0);
@@ -112,10 +116,14 @@ grub_cmd_ntldr (grub_command_t cmd __attribute__ ((unused)),
     grub_device_close (dev);
 
   ntldrsize = grub_file_size (file);
-  err = grub_relocator_alloc_chunk_addr (rel, &ntldr, GRUB_NTLDR_SEGMENT << 4,
-					 ntldrsize);
-  if (err)
-    goto fail;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (rel, &ch, GRUB_NTLDR_SEGMENT << 4,
+					   ntldrsize);
+    if (err)
+      goto fail;
+    ntldr = get_virtual_current_address (ch);
+  }
 
   if (grub_file_read (file, ntldr, ntldrsize)
       != (grub_ssize_t) ntldrsize)
diff --git a/loader/multiboot.c b/loader/multiboot.c
index a3ca6266f..6c6afcee9 100644
--- a/loader/multiboot.c
+++ b/loader/multiboot.c
@@ -284,16 +284,20 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
     return grub_errno;
 
   size = grub_file_size (file);
-  err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &module, 
-					  &target,
-					  0, (0xffffffff - size) + 1,
-					  size, MULTIBOOT_MOD_ALIGN,
-					  GRUB_RELOCATOR_PREFERENCE_NONE);
-  if (err)
-    {
-      grub_file_close (file);
-      return err;
-    }
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &ch,
+					    0, (0xffffffff - size) + 1,
+					    size, MULTIBOOT_MOD_ALIGN,
+					    GRUB_RELOCATOR_PREFERENCE_NONE);
+    if (err)
+      {
+	grub_file_close (file);
+	return err;
+      }
+    module = get_virtual_current_address (ch);
+    target = (grub_addr_t) get_virtual_current_address (ch);
+  }
 
   err = grub_multiboot_add_module (target, size, argc - 1, argv + 1);
   if (err)
diff --git a/loader/multiboot_elfxx.c b/loader/multiboot_elfxx.c
index 561c7572c..880e93ce5 100644
--- a/loader/multiboot_elfxx.c
+++ b/loader/multiboot_elfxx.c
@@ -92,14 +92,18 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
 	  grub_dprintf ("multiboot_loader", "segment %d: paddr=0x%lx, memsz=0x%lx, vaddr=0x%lx\n",
 			i, (long) phdr(i)->p_paddr, (long) phdr(i)->p_memsz, (long) phdr(i)->p_vaddr);
 
-	  err = grub_relocator_alloc_chunk_addr (grub_multiboot_relocator, 
-						 &source, phdr(i)->p_paddr,
-						 phdr(i)->p_memsz);
-	  if (err)
-	    {
-	      grub_dprintf ("multiboot_loader", "Error loading phdr %d\n", i);
-	      return err;
-	    }
+	  {
+	    grub_relocator_chunk_t ch;
+	    err = grub_relocator_alloc_chunk_addr (grub_multiboot_relocator, 
+						   &ch, phdr(i)->p_paddr,
+						   phdr(i)->p_memsz);
+	    if (err)
+	      {
+		grub_dprintf ("multiboot_loader", "Error loading phdr %d\n", i);
+		return err;
+	      }
+	    source = get_virtual_current_address (ch);
+	  }
 
 	  if (grub_file_seek (file, (grub_off_t) phdr(i)->p_offset)
 	      == (grub_off_t) -1)
@@ -163,18 +167,22 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
 	  if (sh->sh_size == 0)
 	    continue;
 
-	  err 
-	    = grub_relocator_alloc_chunk_align (grub_multiboot_relocator,
-						&src, &target, 0,
-						(0xffffffff - sh->sh_size) + 1,
-						sh->sh_size,
-						sh->sh_addralign,
-						GRUB_RELOCATOR_PREFERENCE_NONE);
-	  if (err)
-	    {
-	      grub_dprintf ("multiboot_loader", "Error loading shdr %d\n", i);
-	      return err;
-	    }
+	  {
+	    grub_relocator_chunk_t ch;
+	    err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator,
+						    &ch, 0,
+						    (0xffffffff - sh->sh_size)
+						    + 1, sh->sh_size,
+						    sh->sh_addralign,
+						    GRUB_RELOCATOR_PREFERENCE_NONE);
+	    if (err)
+	      {
+		grub_dprintf ("multiboot_loader", "Error loading shdr %d\n", i);
+		return err;
+	      }
+	    src = get_virtual_current_address (ch);
+	    target = get_physical_target_address (ch);
+	  }
 
 	  if (grub_file_seek (file, sh->sh_offset) == (grub_off_t) -1)
 	    return grub_error (GRUB_ERR_BAD_OS,
diff --git a/loader/multiboot_mbi2.c b/loader/multiboot_mbi2.c
index c5929f10f..5f4a52800 100644
--- a/loader/multiboot_mbi2.c
+++ b/loader/multiboot_mbi2.c
@@ -191,6 +191,7 @@ grub_multiboot_load (grub_file_t file)
 		       addr_tag->load_end_addr - addr_tag->load_addr);
       grub_size_t code_size;
       void *source;
+      grub_relocator_chunk_t ch;
 
       if (addr_tag->bss_end_addr)
 	code_size = (addr_tag->bss_end_addr - addr_tag->load_addr);
@@ -198,7 +199,7 @@ grub_multiboot_load (grub_file_t file)
 	code_size = load_size;
 
       err = grub_relocator_alloc_chunk_addr (grub_multiboot_relocator, 
-					     &source, addr_tag->load_addr,
+					     &ch, addr_tag->load_addr,
 					     code_size);
       if (err)
 	{
@@ -206,6 +207,7 @@ grub_multiboot_load (grub_file_t file)
 	  grub_free (buffer);
 	  return err;
 	}
+      source = get_virtual_current_address (ch);
 
       if ((grub_file_seek (file, offset)) == (grub_off_t) -1)
 	{
@@ -460,19 +462,19 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
   grub_uint8_t *mbistart;
   grub_err_t err;
   grub_size_t bufsize;
-  grub_addr_t ptrdest;
+  grub_relocator_chunk_t ch;
 
   bufsize = grub_multiboot_get_mbi_size ();
 
-  err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, 
-					  (void **) &ptrorig, &ptrdest,
+  err = grub_relocator_alloc_chunk_align (grub_multiboot_relocator, &ch,
 					  0, 0xffffffff - bufsize,
 					  bufsize, 4,
 					  GRUB_RELOCATOR_PREFERENCE_NONE);
   if (err)
     return err;
 
-  *target = ptrdest;
+  ptrorig = get_virtual_current_address (ch);
+  *target = get_physical_target_address (ch);
 
   mbistart = ptrorig;
   ptrorig += 2 * sizeof (grub_uint32_t);
diff --git a/loader/xnu.c b/loader/xnu.c
index f1d372b73..17f850018 100644
--- a/loader/xnu.c
+++ b/loader/xnu.c
@@ -51,13 +51,15 @@ grub_err_t
 grub_xnu_heap_malloc (int size, void **src, grub_addr_t *target)
 {
   grub_err_t err;
+  grub_relocator_chunk_t ch;
   
-  err = grub_relocator_alloc_chunk_addr (grub_xnu_relocator, src,
+  err = grub_relocator_alloc_chunk_addr (grub_xnu_relocator, &ch,
 					 grub_xnu_heap_target_start
 					 + grub_xnu_heap_size, size);
   if (err)
     return err;
 
+  *src = get_virtual_current_address (ch);
   *target = grub_xnu_heap_target_start + grub_xnu_heap_size;
   grub_xnu_heap_size += size;
   grub_dprintf ("xnu", "val=%p\n", *src);
diff --git a/loader/xnu_resume.c b/loader/xnu_resume.c
index 2d47df601..6aebc1f34 100644
--- a/loader/xnu_resume.c
+++ b/loader/xnu_resume.c
@@ -103,25 +103,33 @@ grub_xnu_resume (char *imagename)
       return grub_errno;
     }
 
-  err = grub_relocator_alloc_chunk_addr (grub_xnu_relocator, &code,
-					 codedest, codesize + GRUB_XNU_PAGESIZE);
-  if (err)
-    {
-      grub_file_close (file);
-      return err;
-    }
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (grub_xnu_relocator, &ch, codedest,
+					   codesize + GRUB_XNU_PAGESIZE);
+    if (err)
+      {
+	grub_file_close (file);
+	return err;
+      }
+    code = get_virtual_current_address (ch);
+  }
 
-  err = grub_relocator_alloc_chunk_align (grub_xnu_relocator, &image,
-					  &target_image, 0,
-					  (0xffffffff - hibhead.image_size) + 1,
-					  hibhead.image_size,
-					  GRUB_XNU_PAGESIZE,
-					  GRUB_RELOCATOR_PREFERENCE_NONE);
-  if (err)
-    {
-      grub_file_close (file);
-      return err;
-    }
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_align (grub_xnu_relocator, &ch, 0,
+					    (0xffffffff - hibhead.image_size) + 1,
+					    hibhead.image_size,
+					    GRUB_XNU_PAGESIZE,
+					    GRUB_RELOCATOR_PREFERENCE_NONE);
+    if (err)
+      {
+	grub_file_close (file);
+	return err;
+      }
+    image = get_virtual_current_address (ch);
+    target_image = get_physical_target_address (ch);
+  }
 
   /* Read code part. */
   if (grub_file_seek (file, total_header_size) == (grub_off_t) -1

From 4ba8d3540af50879a797994939c4d8559772215a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 21 Apr 2010 21:26:56 +0200
Subject: [PATCH 0820/1628] 	* configure.ac: Refuse to compile for
 x86_64-efi is mcmodel=large 	is not supported.

---
 ChangeLog    | 5 +++++
 configure.ac | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a80606f46..a8fab4bcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Refuse to compile for x86_64-efi is mcmodel=large
+	is not supported.
+
 2010-04-19  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	Add grub-mkconfig support for NetBSD.
diff --git a/configure.ac b/configure.ac
index 5b959fb01..28b3c1d95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -413,9 +413,7 @@ if test "$target_cpu"-"$platform" = x86_64-efi; then
 		      [grub_cv_cc_mcmodel=no])
   ])
   if test "x$grub_cv_cc_mcmodel" = xno; then
-    CFLAGS="$SAVED_CFLAGS -m64 -DMCMODEL_SMALL=1"
-    TARGET_CFLAGS="$TARGET_CFLAGS -DMCMODEL_SMALL=1"
-    AC_MSG_WARN([-mcmodel=large not supported. You won't be able to use the memory over 4GiB. Upgrade your gcc])
+    AC_MSG_ERROR([-mcmodel=large not supported. Upgrade your gcc.])
   else
     TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large"
   fi

From 97b2dc70b47501e00f0b6ff3f49d606277d3b8c3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 22 Apr 2010 02:43:24 +0200
Subject: [PATCH 0821/1628] Fix segv in reloc.c

---
 lib/relocator.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index e43463e4d..eac290c97 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -957,7 +957,8 @@ malloc_in_range (struct grub_relocator *rel,
 			ne->end = alloc_end;
 			ne->next = extra_blocks;
 			ne->prev = &extra_blocks;
-			extra_blocks->prev = &(ne->next);
+			if (extra_blocks)
+			  extra_blocks->prev = &(ne->next);
 			extra_blocks = ne;
 			curschu->extra = ne;
 		      }

From a51df0a1b4dcc32a2a023c504352458a7d292b14 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 22 Apr 2010 02:44:45 +0200
Subject: [PATCH 0822/1628] Adjust mips relocator

---
 include/grub/mips/yeeloong/memory.h | 22 +++++++++++++++++++++-
 lib/mips/relocator.c                | 16 ++++++++++------
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/include/grub/mips/yeeloong/memory.h b/include/grub/mips/yeeloong/memory.h
index 922db2404..e7e995283 100644
--- a/include/grub/mips/yeeloong/memory.h
+++ b/include/grub/mips/yeeloong/memory.h
@@ -31,7 +31,6 @@
 #define GRUB_ARCH_LOWMEMMAXSIZE 0x10000000
 #define GRUB_ARCH_HIGHMEMPSTART 0x10000000
 
-
 #define GRUB_MACHINE_MEMORY_AVAILABLE        1
 #define GRUB_MACHINE_MEMORY_MAX_TYPE         1
   /* This one is special: it's used internally but is never reported
@@ -40,6 +39,27 @@
 #define GRUB_MACHINE_MEMORY_RESERVED GRUB_MACHINE_MEMORY_HOLE
 
 #ifndef ASM_FILE
+
+typedef grub_addr_t grub_phys_addr_t;
+
+static inline grub_phys_addr_t
+grub_vtop (void *a)
+{
+  return ((grub_phys_addr_t) a) & 0x1fffffff;
+}
+
+static inline void *
+grub_map_memory (grub_phys_addr_t a, grub_size_t size __attribute__ ((unused)))
+{
+  return (void *) (a | 0x80000000);
+}
+
+static inline void
+grub_unmap_memory (void *a __attribute__ ((unused)),
+		   grub_size_t size __attribute__ ((unused)))
+{
+}
+
 grub_err_t EXPORT_FUNC (grub_machine_mmap_iterate)
 (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
 
diff --git a/lib/mips/relocator.c b/lib/mips/relocator.c
index 410b68b8b..537b0af2c 100644
--- a/lib/mips/relocator.c
+++ b/lib/mips/relocator.c
@@ -111,15 +111,16 @@ grub_err_t
 grub_relocator32_boot (struct grub_relocator *rel,
 		       struct grub_relocator32_state state)
 {
-  grub_addr_t target;
-  void *src, *ptr;
+  grub_relocator_chunk_t ch;
+  void *ptr;
   grub_err_t err;
-  grub_addr_t relst;
+  void *relst;
   grub_size_t relsize;
   grub_size_t stateset_size = 31 * REGW_SIZEOF + JUMP_SIZEOF;
   unsigned i;
+  grub_addr_t vtarget;
 
-  err = grub_relocator_alloc_chunk_align (rel, &src, &target, 0,
+  err = grub_relocator_alloc_chunk_align (rel, &ch, 0,
 					  (0xffffffff - stateset_size)
 					  + 1, stateset_size,
 					  sizeof (grub_uint32_t),
@@ -127,12 +128,15 @@ grub_relocator32_boot (struct grub_relocator *rel,
   if (err)
     return err;
 
-  ptr = src;
+  ptr = get_virtual_current_address (ch);
   for (i = 1; i < 32; i++)
     write_reg (i, state.gpr[i], &ptr);
   write_jump (state.jumpreg, &ptr);
 
-  err = grub_relocator_prepare_relocs (rel, target, &relst, &relsize);
+  vtarget = (grub_addr_t) grub_map_memory (get_physical_target_address (ch),
+					   stateset_size);
+
+  err = grub_relocator_prepare_relocs (rel, vtarget, &relst, &relsize);
   if (err)
     return err;
 

From 530a4814cc0b7ac0ceca90c81ddfcd5eb590c5d3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 22 Apr 2010 02:45:06 +0200
Subject: [PATCH 0823/1628] Adjust mips/linux.c

---
 loader/mips/linux.c | 60 +++++++++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index 4c59e31d0..a3569c34c 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -33,9 +33,6 @@
 #include <grub/pci.h>
 #include <grub/machine/time.h>
 
-#define ELF32_LOADMASK (0x00000000UL)
-#define ELF64_LOADMASK (0x0000000000000000ULL)
-
 static grub_dl_t my_mod;
 
 static int loaded;
@@ -85,7 +82,7 @@ grub_linux_load32 (grub_elf_t elf, void **extra_mem, grub_size_t extra_size)
   grub_err_t err;
 
   /* Linux's entry point incorrectly contains a virtual address.  */
-  entry_addr = elf->ehdr.ehdr32.e_entry & ~ELF32_LOADMASK;
+  entry_addr = elf->ehdr.ehdr32.e_entry;
 
   linux_size = grub_elf32_size (elf, &base);
   if (linux_size == 0)
@@ -101,10 +98,15 @@ grub_linux_load32 (grub_elf_t elf, void **extra_mem, grub_size_t extra_size)
   if (!relocator)
     return grub_errno;
 
-  err = grub_relocator_alloc_chunk_addr (relocator, (void **) &playground,
-					 target_addr, linux_size);
-  if (err)
-    return err;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (relocator, &ch,
+					   target_addr & 0x1fffffff,
+					   linux_size);
+    if (err)
+      return err;
+    playground = get_virtual_current_address (ch);
+  }
 
   *extra_mem = playground + extraoff;
 
@@ -135,7 +137,7 @@ grub_linux_load64 (grub_elf_t elf, void **extra_mem, grub_size_t extra_size)
   grub_err_t err;
 
   /* Linux's entry point incorrectly contains a virtual address.  */
-  entry_addr = elf->ehdr.ehdr64.e_entry & ~ELF64_LOADMASK;
+  entry_addr = elf->ehdr.ehdr64.e_entry;
 
   linux_size = grub_elf64_size (elf, &base);
   if (linux_size == 0)
@@ -151,10 +153,15 @@ grub_linux_load64 (grub_elf_t elf, void **extra_mem, grub_size_t extra_size)
   if (!relocator)
     return grub_errno;
 
-  err = grub_relocator_alloc_chunk_addr (relocator, (void **) &playground,
-					 target_addr, linux_size);
-  if (err)
-    return err;
+  {
+    grub_relocator_chunk_t ch;
+    err = grub_relocator_alloc_chunk_addr (relocator, &ch,
+					   target_addr & 0x1fffffff,
+					   linux_size);
+    if (err)
+      return err;
+    playground = get_virtual_current_address (ch);
+  }
 
   *extra_mem = playground + extraoff;
 
@@ -344,18 +351,23 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
 
   size = grub_file_size (file);
 
-  err = grub_relocator_alloc_chunk_align (relocator, &initrd_src, 
-					  &initrd_dest,
-					  target_addr + linux_size + 0x10000,
-					  (0xffffffff - size) + 1,
-					  size, 0x10000,
-					  GRUB_RELOCATOR_PREFERENCE_NONE);
+  {
+    grub_relocator_chunk_t ch;
 
-  if (err)
-    {
-      grub_file_close (file);
-      return err;
-    }
+    err = grub_relocator_alloc_chunk_align (relocator, &ch,
+					    target_addr + linux_size + 0x10000,
+					    (0xffffffff - size) + 1,
+					    size, 0x10000,
+					    GRUB_RELOCATOR_PREFERENCE_NONE);
+
+    if (err)
+      {
+	grub_file_close (file);
+	return err;
+      }
+    initrd_src = get_virtual_current_address (ch);
+    initrd_dest = get_physical_target_address (ch) | 0x80000000;
+  }
 
   if (grub_file_read (file, initrd_src, size) != size)
     {

From bc05c2cb2c3c77d4bda5900f7cc24c9c00da356f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 24 Apr 2010 21:08:25 +0200
Subject: [PATCH 0824/1628] Change to xorrisofs. Make message more clear.

---
 util/grub-mkrescue.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index e7dbb45ff..057577272 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -212,7 +212,7 @@ fi
 
 # build bootx64.efi
 if test -e "${efi64_dir}" ; then
-    echo "Generates bootx64.efi"
+    echo "Enabling EFI64 support ..."
     grub-mkimage -d "${efi64_dir}" -o "${efi_dir}"/efi/boot/bootx64.efi --prefix=/boot/grub/x86_64-efi \
         search iso9660 configfile sh 
 
@@ -231,7 +231,7 @@ if test x"${efi_dir}" != x; then
 fi
 
 # build iso image
-grub-mkisofs ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} ${source}
+xorrisofs ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} ${source}
 rm -rf ${iso9660_dir}
 
 rm -f ${embed_img}

From f67dc308f6339cef658747870bfbbe31f4949e48 Mon Sep 17 00:00:00 2001
From: Jiro SEKIBA <jir@unicus.jp>
Date: Sat, 24 Apr 2010 22:09:08 +0200
Subject: [PATCH 0825/1628] 	Nilfs2 support.

	* conf/common.rmk (grub_probe_SOURCES): Add fs/nilfs2.c.
	(grub_fstest_SOURCES): Likewise.
	(pkglib_MODULES): Add nilfs2.mod.
	(nilfs2_mod_SOURCES): New variable.
	(nilfs2_mod_CFLAGS): Likewise.
	(nilfs2_mod_LDFLAGS): Likewise.
	* conf/i386-pc.rmk (grub_setup_SOURCES): Add fs/nilfs2.c.
	* conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Add fs/nilfs2.c.
	* fs/nilfs2.c: New file.
---
 ChangeLog                 |   14 +
 conf/common.rmk           |   14 +-
 conf/i386-pc.rmk          |    6 +-
 conf/sparc64-ieee1275.rmk |    6 +-
 fs/nilfs2.c               | 1133 +++++++++++++++++++++++++++++++++++++
 5 files changed, 1163 insertions(+), 10 deletions(-)
 create mode 100644 fs/nilfs2.c

diff --git a/ChangeLog b/ChangeLog
index a8fab4bcc..ca82974e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-04-24  Jiro SEKIBA <jir@unicus.jp>
+
+	Nilfs2 support.
+
+	* conf/common.rmk (grub_probe_SOURCES): Add fs/nilfs2.c.
+	(grub_fstest_SOURCES): Likewise.
+	(pkglib_MODULES): Add nilfs2.mod.
+	(nilfs2_mod_SOURCES): New variable.
+	(nilfs2_mod_CFLAGS): Likewise.
+	(nilfs2_mod_LDFLAGS): Likewise.
+	* conf/i386-pc.rmk (grub_setup_SOURCES): Add fs/nilfs2.c.
+	* conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Add fs/nilfs2.c.
+	* fs/nilfs2.c: New file.
+
 2010-04-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Refuse to compile for x86_64-efi is mcmodel=large
diff --git a/conf/common.rmk b/conf/common.rmk
index 8df232a0b..4b39e9b71 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -31,9 +31,9 @@ grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c	\
 	\
 	fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c		\
 	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	\
-	fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c		\
-	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c	\
-	fs/befs.c fs/befs_be.c fs/tar.c		\
+	fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c	\
+	fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c		\
+	fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c		\
 	\
 	partmap/msdos.c partmap/bsdlabel.c partmap/apple.c \
 	partmap/sun.c partmap/sunpc.c partmap/gpt.c \
@@ -69,7 +69,7 @@ grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c util/hostfs.c \
 	\
 	fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c			\
 	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c		\
-	fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c			\
+	fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c	\
 	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c fs/befs.c 	\
 	fs/befs_be.c fs/tar.c			\
 	\
@@ -298,6 +298,12 @@ minix_mod_SOURCES = fs/minix.c
 minix_mod_CFLAGS = $(COMMON_CFLAGS)
 minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For nilfs2.mod.
+pkglib_MODULES += nilfs2.mod
+nilfs2_mod_SOURCES = fs/nilfs2.c
+nilfs2_mod_CFLAGS = $(COMMON_CFLAGS)
+nilfs2_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # For hfs.mod.
 hfs_mod_SOURCES = fs/hfs.c
 hfs_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index eace1e2da..a5a1b08ea 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -82,9 +82,9 @@ grub_setup_SOURCES = gnulib/progname.c \
 	\
 	fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c		 \
 	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	 \
-	fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c		 \
-	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c	 \
-	fs/befs.c fs/befs_be.c fs/tar.c			\
+	fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c	\
+	fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c		\
+	fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c		\
 	\
 	partmap/msdos.c partmap/bsdlabel.c partmap/sunpc.c	\
 	partmap/gpt.c		\
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index c82bd81f3..f0c9b0db7 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -58,9 +58,9 @@ grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c	\
 	\
 	fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c		\
 	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	\
-	fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c		\
-	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c	\
-	fs/befs.c fs/befs_be.c fs/tar.c			\
+	fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c	\
+	fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c		\
+	fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c		\
 	\
 	partmap/amiga.c	partmap/apple.c partmap/msdos.c 	\
 	partmap/bsdlabel.c partmap/sun.c partmap/acorn.c	\
diff --git a/fs/nilfs2.c b/fs/nilfs2.c
new file mode 100644
index 000000000..7e0415d12
--- /dev/null
+++ b/fs/nilfs2.c
@@ -0,0 +1,1133 @@
+/* 
+ *  nilfs2.c - New Implementation of Log filesystem 
+ *
+ *  Written by Jiro SEKIBA <jir@unicus.jp>
+ *
+ *  Copyright (C) 2003,2004,2005,2007,2008,2010  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/>.
+ */
+
+
+/* Filetype information as used in inodes.  */
+#define FILETYPE_INO_MASK	0170000
+#define FILETYPE_INO_REG	0100000
+#define FILETYPE_INO_DIRECTORY	0040000
+#define FILETYPE_INO_SYMLINK	0120000
+
+#include <grub/err.h>
+#include <grub/file.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/disk.h>
+#include <grub/dl.h>
+#include <grub/types.h>
+#include <grub/fshelp.h>
+
+#define NILFS_INODE_BMAP_SIZE	7
+
+#define NILFS_SUPORT_REV	2
+
+/* Magic value used to identify an nilfs2 filesystem.  */
+#define	NILFS2_SUPER_MAGIC	0x3434
+/* nilfs btree node flag.  */
+#define NILFS_BTREE_NODE_ROOT   0x01
+
+/* nilfs btree node level. */
+#define NILFS_BTREE_LEVEL_DATA          0
+#define NILFS_BTREE_LEVEL_NODE_MIN      (NILFS_BTREE_LEVEL_DATA + 1)
+#define NILFS_BTREE_LEVEL_MAX           14
+
+struct grub_nilfs2_inode
+{
+  grub_uint64_t i_blocks;
+  grub_uint64_t i_size;
+  grub_uint64_t i_ctime;
+  grub_uint64_t i_mtime;
+  grub_uint32_t i_ctime_nsec;
+  grub_uint32_t i_mtime_nsec;
+  grub_uint32_t i_uid;
+  grub_uint32_t i_gid;
+  grub_uint16_t i_mode;
+  grub_uint16_t i_links_count;
+  grub_uint32_t i_flags;
+  grub_uint64_t i_bmap[NILFS_INODE_BMAP_SIZE];
+#define i_device_code	i_bmap[0]
+  grub_uint64_t i_xattr;
+  grub_uint32_t i_generation;
+  grub_uint32_t i_pad;
+};
+
+struct grub_nilfs2_super_root
+{
+  grub_uint32_t sr_sum;
+  grub_uint16_t sr_bytes;
+  grub_uint16_t sr_flags;
+  grub_uint64_t sr_nongc_ctime;
+  struct grub_nilfs2_inode sr_dat;
+  struct grub_nilfs2_inode sr_cpfile;
+  struct grub_nilfs2_inode sr_sufile;
+};
+
+struct grub_nilfs2_super_block
+{
+  grub_uint32_t s_rev_level;
+  grub_uint16_t s_minor_rev_level;
+  grub_uint16_t s_magic;
+  grub_uint16_t s_bytes;
+  grub_uint16_t s_flags;
+  grub_uint32_t s_crc_seed;
+  grub_uint32_t s_sum;
+  grub_uint32_t s_log_block_size;
+  grub_uint64_t s_nsegments;
+  grub_uint64_t s_dev_size;
+  grub_uint64_t s_first_data_block;
+  grub_uint32_t s_blocks_per_segment;
+  grub_uint32_t s_r_segments_percentage;
+  grub_uint64_t s_last_cno;
+  grub_uint64_t s_last_pseg;
+  grub_uint64_t s_last_seq;
+  grub_uint64_t s_free_blocks_count;
+  grub_uint64_t s_ctime;
+  grub_uint64_t s_mtime;
+  grub_uint64_t s_wtime;
+  grub_uint16_t s_mnt_count;
+  grub_uint16_t s_max_mnt_count;
+  grub_uint16_t s_state;
+  grub_uint16_t s_errors;
+  grub_uint64_t s_lastcheck;
+  grub_uint32_t s_checkinterval;
+  grub_uint32_t s_creator_os;
+  grub_uint16_t s_def_resuid;
+  grub_uint16_t s_def_resgid;
+  grub_uint32_t s_first_ino;
+  grub_uint16_t s_inode_size;
+  grub_uint16_t s_dat_entry_size;
+  grub_uint16_t s_checkpoint_size;
+  grub_uint16_t s_segment_usage_size;
+  grub_uint8_t s_uuid[16];
+  char s_volume_name[16];
+  char s_last_mounted[64];
+  grub_uint32_t s_c_interval;
+  grub_uint32_t s_c_block_max;
+  grub_uint32_t s_reserved[192];
+};
+
+struct grub_nilfs2_dir_entry
+{
+  grub_uint64_t inode;
+  grub_uint16_t rec_len;
+  grub_uint8_t name_len;
+  grub_uint8_t file_type;
+#if 0				/* followed by file name. */
+  char name[NILFS_NAME_LEN];
+  char pad;
+#endif
+} __attribute__ ((packed));
+
+enum
+{
+  NILFS_FT_UNKNOWN,
+  NILFS_FT_REG_FILE,
+  NILFS_FT_DIR,
+  NILFS_FT_CHRDEV,
+  NILFS_FT_BLKDEV,
+  NILFS_FT_FIFO,
+  NILFS_FT_SOCK,
+  NILFS_FT_SYMLINK,
+  NILFS_FT_MAX
+};
+
+struct grub_nilfs2_finfo
+{
+  grub_uint64_t fi_ino;
+  grub_uint64_t fi_cno;
+  grub_uint32_t fi_nblocks;
+  grub_uint32_t fi_ndatablk;
+};
+
+struct grub_nilfs2_binfo_v
+{
+  grub_uint64_t bi_vblocknr;
+  grub_uint64_t bi_blkoff;
+};
+
+struct grub_nilfs2_binfo_dat
+{
+  grub_uint64_t bi_blkoff;
+  grub_uint8_t bi_level;
+  grub_uint8_t bi_pad[7];
+};
+
+union grub_nilfs2_binfo
+{
+  struct grub_nilfs2_binfo_v bi_v;
+  struct grub_nilfs2_binfo_dat bi_dat;
+};
+
+struct grub_nilfs2_segment_summary
+{
+  grub_uint32_t ss_datasum;
+  grub_uint32_t ss_sumsum;
+  grub_uint32_t ss_magic;
+  grub_uint16_t ss_bytes;
+  grub_uint16_t ss_flags;
+  grub_uint64_t ss_seq;
+  grub_uint64_t ss_create;
+  grub_uint64_t ss_next;
+  grub_uint32_t ss_nblocks;
+  grub_uint32_t ss_nfinfo;
+  grub_uint32_t ss_sumbytes;
+  grub_uint32_t ss_pad;
+};
+
+struct grub_nilfs2_btree_node
+{
+  grub_uint8_t bn_flags;
+  grub_uint8_t bn_level;
+  grub_uint16_t bn_nchildren;
+  grub_uint32_t bn_pad;
+};
+
+struct grub_nilfs2_palloc_group_desc
+{
+  grub_uint32_t pg_nfrees;
+};
+
+struct grub_nilfs2_dat_entry
+{
+  grub_uint64_t de_blocknr;
+  grub_uint64_t de_start;
+  grub_uint64_t de_end;
+  grub_uint64_t de_rsv;
+};
+
+struct grub_nilfs2_snapshot_list
+{
+  grub_uint64_t ssl_next;
+  grub_uint64_t ssl_prev;
+};
+
+struct grub_nilfs2_cpfile_header
+{
+  grub_uint64_t ch_ncheckpoints;
+  grub_uint64_t ch_nsnapshots;
+  struct grub_nilfs2_snapshot_list ch_snapshot_list;
+};
+
+struct grub_nilfs2_checkpoint
+{
+  grub_uint32_t cp_flags;
+  grub_uint32_t cp_checkpoints_count;
+  struct grub_nilfs2_snapshot_list cp_snapshot_list;
+  grub_uint64_t cp_cno;
+  grub_uint64_t cp_create;
+  grub_uint64_t cp_nblk_inc;
+  grub_uint64_t cp_inodes_count;
+  grub_uint64_t cp_blocks_count;
+  struct grub_nilfs2_inode cp_ifile_inode;
+};
+
+
+#define NILFS_BMAP_LARGE	0x1
+#define NILFS_BMAP_SIZE	(NILFS_INODE_BMAP_SIZE * sizeof(grub_uint64_t))
+
+/* nilfs extra padding for nonroot btree node. */
+#define NILFS_BTREE_NODE_EXTRA_PAD_SIZE (sizeof(grub_uint64_t))
+#define NILFS_BTREE_ROOT_SIZE	NILFS_BMAP_SIZE
+#define NILFS_BTREE_ROOT_NCHILDREN_MAX \
+ ((NILFS_BTREE_ROOT_SIZE - sizeof(struct nilfs_btree_node)) / \
+  (sizeof(grub_uint64_t) + sizeof(grub_uint64_t)) )
+
+
+struct grub_fshelp_node
+{
+  struct grub_nilfs2_data *data;
+  struct grub_nilfs2_inode inode;
+  grub_uint64_t ino;
+  int inode_read;
+};
+
+struct grub_nilfs2_data
+{
+  struct grub_nilfs2_super_block sblock;
+  struct grub_nilfs2_super_root sroot;
+  struct grub_nilfs2_inode ifile;
+  grub_disk_t disk;
+  struct grub_nilfs2_inode *inode;
+  struct grub_fshelp_node diropen;
+};
+
+/* Log2 size of nilfs2 block in 512 blocks.  */
+#define LOG2_NILFS2_BLOCK_SIZE(data)			\
+	(grub_le_to_cpu32 (data->sblock.s_log_block_size) + 1)
+
+/* Log2 size of nilfs2 block in bytes.  */
+#define LOG2_BLOCK_SIZE(data)					\
+	(grub_le_to_cpu32 (data->sblock.s_log_block_size) + 10)
+
+/* The size of an nilfs2 block in bytes.  */
+#define NILFS2_BLOCK_SIZE(data)		(1 << LOG2_BLOCK_SIZE (data))
+
+static grub_uint64_t
+grub_nilfs2_dat_translate (struct grub_nilfs2_data *data, grub_uint64_t key);
+static grub_dl_t my_mod;
+
+
+
+static inline unsigned long
+grub_nilfs2_palloc_entries_per_group (struct grub_nilfs2_data *data)
+{
+  return 1UL << (LOG2_BLOCK_SIZE (data) + 3);
+}
+
+static inline grub_uint64_t
+grub_nilfs2_palloc_group (struct grub_nilfs2_data *data,
+			  grub_uint64_t nr, grub_uint32_t * offset)
+{
+  return grub_divmod64 (nr, grub_nilfs2_palloc_entries_per_group (data),
+			offset);
+}
+
+static inline grub_uint32_t
+grub_nilfs2_palloc_groups_per_desc_block (struct grub_nilfs2_data *data)
+{
+  return NILFS2_BLOCK_SIZE (data) /
+    sizeof (struct grub_nilfs2_palloc_group_desc);
+}
+
+static inline grub_uint32_t
+grub_nilfs2_entries_per_block (struct grub_nilfs2_data *data,
+			       unsigned long entry_size)
+{
+  return NILFS2_BLOCK_SIZE (data) / entry_size;
+}
+
+
+static inline grub_uint32_t
+grub_nilfs2_blocks_per_group (struct grub_nilfs2_data *data,
+			      unsigned long entry_size)
+{
+  return grub_div_roundup (grub_nilfs2_palloc_entries_per_group (data),
+			   grub_nilfs2_entries_per_block (data,
+							  entry_size)) + 1;
+}
+
+static inline grub_uint32_t
+grub_nilfs2_blocks_per_desc_block (struct grub_nilfs2_data *data,
+				   unsigned long entry_size)
+{
+  return grub_nilfs2_palloc_groups_per_desc_block (data) *
+    grub_nilfs2_blocks_per_group (data, entry_size) + 1;
+}
+
+static inline grub_uint32_t
+grub_nilfs2_palloc_desc_block_offset (struct grub_nilfs2_data *data,
+				      unsigned long group,
+				      unsigned long entry_size)
+{
+  grub_uint32_t desc_block =
+    group / grub_nilfs2_palloc_groups_per_desc_block (data);
+  return desc_block * grub_nilfs2_blocks_per_desc_block (data, entry_size);
+}
+
+static inline grub_uint32_t
+grub_nilfs2_palloc_bitmap_block_offset (struct grub_nilfs2_data *data,
+					unsigned long group,
+					unsigned long entry_size)
+{
+  unsigned long desc_offset = group %
+    grub_nilfs2_palloc_groups_per_desc_block (data);
+
+  return grub_nilfs2_palloc_desc_block_offset (data, group, entry_size) + 1 +
+    desc_offset * grub_nilfs2_blocks_per_group (data, entry_size);
+}
+
+static inline grub_uint32_t
+grub_nilfs2_palloc_entry_offset (struct grub_nilfs2_data *data,
+				 grub_uint64_t nr, unsigned long entry_size)
+{
+  unsigned long group;
+  grub_uint32_t group_offset;
+
+  group = grub_nilfs2_palloc_group (data, nr, &group_offset);
+
+  return grub_nilfs2_palloc_bitmap_block_offset (data, group,
+						 entry_size) + 1 +
+    group_offset / grub_nilfs2_entries_per_block (data, entry_size);
+
+}
+
+static inline struct grub_nilfs2_btree_node *
+grub_nilfs2_btree_get_root (struct grub_nilfs2_inode *inode)
+{
+  return (struct grub_nilfs2_btree_node *) &inode->i_bmap[0];
+}
+
+static inline int
+grub_nilfs2_btree_get_level (struct grub_nilfs2_btree_node *node)
+{
+  return node->bn_level;
+}
+
+static inline grub_uint64_t *
+grub_nilfs2_btree_node_dkeys (struct grub_nilfs2_btree_node *node)
+{
+  return (grub_uint64_t *) ((char *) (node + 1) +
+			    ((node->bn_flags & NILFS_BTREE_NODE_ROOT) ?
+			     0 : NILFS_BTREE_NODE_EXTRA_PAD_SIZE));
+}
+
+static inline grub_uint64_t
+grub_nilfs2_btree_node_get_key (struct grub_nilfs2_btree_node *node,
+				int index)
+{
+  return grub_le_to_cpu64 (*(grub_nilfs2_btree_node_dkeys (node) + index));
+}
+
+static inline int
+grub_nilfs2_btree_node_lookup (struct grub_nilfs2_btree_node *node,
+			       grub_uint64_t key, int *indexp)
+{
+  grub_uint64_t nkey;
+  int index, low, high, s;
+
+  low = 0;
+  high = grub_le_to_cpu16 (node->bn_nchildren) - 1;
+  index = 0;
+  s = 0;
+  while (low <= high)
+    {
+      index = (low + high) / 2;
+      nkey = grub_nilfs2_btree_node_get_key (node, index);
+      if (nkey == key)
+	{
+	  *indexp = index;
+	  return 1;
+	}
+      else if (nkey < key)
+	{
+	  low = index + 1;
+	  s = -1;
+	}
+      else
+	{
+	  high = index - 1;
+	  s = 1;
+	}
+    }
+
+  if (node->bn_level > NILFS_BTREE_LEVEL_NODE_MIN)
+    {
+      if (s > 0 && index > 0)
+	index--;
+    }
+  else if (s < 0)
+    index++;
+
+  *indexp = index;
+  return s == 0;
+}
+
+static inline int
+grub_nilfs2_btree_node_nchildren_max (struct grub_nilfs2_data *data,
+				      struct grub_nilfs2_btree_node *node)
+{
+  int node_children_max = ((NILFS2_BLOCK_SIZE (data) -
+			    sizeof (struct grub_nilfs2_btree_node) -
+			    NILFS_BTREE_NODE_EXTRA_PAD_SIZE) /
+			   (sizeof (grub_uint64_t) + sizeof (grub_uint64_t)));
+
+  return (node->bn_flags & NILFS_BTREE_NODE_ROOT) ? 3 : node_children_max;
+}
+
+static inline grub_uint64_t *
+grub_nilfs2_btree_node_dptrs (struct grub_nilfs2_data *data,
+			      struct grub_nilfs2_btree_node *node)
+{
+  return (grub_uint64_t *) (grub_nilfs2_btree_node_dkeys (node) +
+			    grub_nilfs2_btree_node_nchildren_max (data,
+								  node));
+}
+
+static inline grub_uint64_t
+grub_nilfs2_btree_node_get_ptr (struct grub_nilfs2_data *data,
+				struct grub_nilfs2_btree_node *node,
+				int index)
+{
+  return
+    grub_le_to_cpu64 (*(grub_nilfs2_btree_node_dptrs (data, node) + index));
+}
+
+static inline int
+grub_nilfs2_btree_get_nonroot_node (struct grub_nilfs2_data *data,
+				    grub_uint64_t ptr, void *block)
+{
+  grub_disk_t disk = data->disk;
+  unsigned int nilfs2_block_count = (1 << LOG2_NILFS2_BLOCK_SIZE (data));
+
+  return grub_disk_read (disk, ptr * nilfs2_block_count, 0,
+			 NILFS2_BLOCK_SIZE (data), block);
+}
+
+static grub_uint64_t
+grub_nilfs2_btree_lookup (struct grub_nilfs2_data *data,
+			  struct grub_nilfs2_inode *inode,
+			  grub_uint64_t key, int need_translate)
+{
+  struct grub_nilfs2_btree_node *node;
+  unsigned char block[NILFS2_BLOCK_SIZE (data)];
+  grub_uint64_t ptr;
+  int level, found, index;
+
+  node = grub_nilfs2_btree_get_root (inode);
+  level = grub_nilfs2_btree_get_level (node);
+
+  found = grub_nilfs2_btree_node_lookup (node, key, &index);
+  ptr = grub_nilfs2_btree_node_get_ptr (data, node, index);
+  if (need_translate)
+    ptr = grub_nilfs2_dat_translate (data, ptr);
+
+  for (level--; level >= NILFS_BTREE_LEVEL_NODE_MIN; level--)
+    {
+      grub_nilfs2_btree_get_nonroot_node (data, ptr, block);
+      if (grub_errno)
+	{
+	  return -1;
+	}
+      node = (struct grub_nilfs2_btree_node *) block;
+
+      if (node->bn_level != level)
+	{
+	  grub_error (GRUB_ERR_BAD_FS, "btree level mismatch\n");
+	  return -1;
+	}
+
+      if (!found)
+	found = grub_nilfs2_btree_node_lookup (node, key, &index);
+      else
+	index = 0;
+
+      if (index < grub_nilfs2_btree_node_nchildren_max (data, node))
+	{
+	  ptr = grub_nilfs2_btree_node_get_ptr (data, node, index);
+	  if (need_translate)
+	    ptr = grub_nilfs2_dat_translate (data, ptr);
+	}
+      else
+	{
+	  grub_error (GRUB_ERR_BAD_FS, "btree corruption\n");
+	  return -1;
+	}
+    }
+
+  if (!found)
+    return -1;
+
+  return ptr;
+}
+
+static inline grub_uint64_t
+grub_nilfs2_direct_lookup (struct grub_nilfs2_inode *inode, grub_uint64_t key)
+{
+  return grub_le_to_cpu64 (inode->i_bmap[1 + key]);
+}
+
+static inline grub_uint64_t
+grub_nilfs2_bmap_lookup (struct grub_nilfs2_data *data,
+			 struct grub_nilfs2_inode *inode,
+			 grub_uint64_t key, int need_translate)
+{
+  struct grub_nilfs2_btree_node *root = grub_nilfs2_btree_get_root (inode);
+  if (root->bn_flags & NILFS_BMAP_LARGE)
+    return grub_nilfs2_btree_lookup (data, inode, key, need_translate);
+  else
+    {
+      grub_uint64_t ptr;
+      ptr = grub_nilfs2_direct_lookup (inode, key);
+      if (need_translate)
+	ptr = grub_nilfs2_dat_translate (data, ptr);
+      return ptr;
+    }
+}
+
+static grub_uint64_t
+grub_nilfs2_dat_translate (struct grub_nilfs2_data *data, grub_uint64_t key)
+{
+  struct grub_nilfs2_dat_entry entry;
+  grub_disk_t disk = data->disk;
+  grub_uint64_t pptr;
+  grub_uint32_t blockno, offset;
+  unsigned int nilfs2_block_count = (1 << LOG2_NILFS2_BLOCK_SIZE (data));
+
+  blockno = grub_nilfs2_palloc_entry_offset (data, key,
+					     sizeof (struct
+						     grub_nilfs2_dat_entry));
+
+  grub_divmod64 (key * sizeof (struct grub_nilfs2_dat_entry),
+		 NILFS2_BLOCK_SIZE (data), &offset);
+
+  pptr = grub_nilfs2_bmap_lookup (data, &data->sroot.sr_dat, blockno, 0);
+  if (pptr == (grub_uint64_t) - 1)
+    {
+      grub_error (GRUB_ERR_BAD_FS, "btree lookup failure");
+      return -1;
+    }
+
+  grub_disk_read (disk, pptr * nilfs2_block_count, offset,
+		  sizeof (struct grub_nilfs2_dat_entry), &entry);
+
+  return grub_le_to_cpu64 (entry.de_blocknr);
+}
+
+
+static grub_disk_addr_t
+grub_nilfs2_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
+{
+  struct grub_nilfs2_data *data = node->data;
+  struct grub_nilfs2_inode *inode = &node->inode;
+  grub_uint64_t pptr = -1;
+
+  pptr = grub_nilfs2_bmap_lookup (data, inode, fileblock, 1);
+  if (pptr == (grub_uint64_t) - 1)
+    {
+      grub_error (GRUB_ERR_BAD_FS, "btree lookup failure");
+      return -1;
+    }
+
+  return pptr;
+}
+
+/* Read LEN bytes from the file described by DATA starting with byte
+   POS.  Return the amount of read bytes in READ.  */
+static grub_ssize_t
+grub_nilfs2_read_file (grub_fshelp_node_t node,
+		       void NESTED_FUNC_ATTR (*read_hook) (grub_disk_addr_t
+							   sector,
+							   unsigned offset,
+							   unsigned length),
+		       int pos, grub_size_t len, char *buf)
+{
+  return grub_fshelp_read_file (node->data->disk, node, read_hook,
+				pos, len, buf, grub_nilfs2_read_block,
+				grub_le_to_cpu64 (node->inode.i_size),
+				LOG2_NILFS2_BLOCK_SIZE (node->data));
+
+}
+
+static grub_err_t
+grub_nilfs2_read_checkpoint (struct grub_nilfs2_data *data,
+			     grub_uint64_t cpno,
+			     struct grub_nilfs2_checkpoint *cpp)
+{
+  grub_uint64_t blockno;
+  grub_uint32_t offset;
+  grub_uint64_t pptr;
+  grub_disk_t disk = data->disk;
+  unsigned int nilfs2_block_count = (1 << LOG2_NILFS2_BLOCK_SIZE (data));
+
+  /* Assume sizeof(struct grub_nilfs2_cpfile_header) < 
+     sizeof(struct grub_nilfs2_checkpoint).
+   */
+  blockno = grub_divmod64 (cpno, NILFS2_BLOCK_SIZE (data) /
+			   sizeof (struct grub_nilfs2_checkpoint), &offset);
+
+  pptr = grub_nilfs2_bmap_lookup (data, &data->sroot.sr_cpfile, blockno, 1);
+  if (pptr == (grub_uint64_t) - 1)
+    {
+      return grub_error (GRUB_ERR_BAD_FS, "btree lookup failure");
+    }
+
+  return grub_disk_read (disk, pptr * nilfs2_block_count,
+			 offset * sizeof (struct grub_nilfs2_checkpoint),
+			 sizeof (struct grub_nilfs2_checkpoint), cpp);
+}
+
+static inline grub_err_t
+grub_nilfs2_read_last_checkpoint (struct grub_nilfs2_data *data,
+				  struct grub_nilfs2_checkpoint *cpp)
+{
+  return grub_nilfs2_read_checkpoint (data,
+				      grub_le_to_cpu64 (data->
+							sblock.s_last_cno),
+				      cpp);
+}
+
+/* Read the inode INO for the file described by DATA into INODE.  */
+static grub_err_t
+grub_nilfs2_read_inode (struct grub_nilfs2_data *data,
+			grub_uint64_t ino, struct grub_nilfs2_inode *inodep)
+{
+  grub_uint64_t blockno;
+  unsigned int offset;
+  grub_uint64_t pptr;
+  grub_disk_t disk = data->disk;
+  unsigned int nilfs2_block_count = (1 << LOG2_NILFS2_BLOCK_SIZE (data));
+
+  blockno = grub_nilfs2_palloc_entry_offset (data, ino,
+					     sizeof (struct
+						     grub_nilfs2_inode));
+
+  grub_divmod64 (sizeof (struct grub_nilfs2_inode) * ino,
+		 NILFS2_BLOCK_SIZE (data), &offset);
+  pptr = grub_nilfs2_bmap_lookup (data, &data->ifile, blockno, 1);
+  if (pptr == (grub_uint64_t) - 1)
+    {
+      return grub_error (GRUB_ERR_BAD_FS, "btree lookup failure");
+    }
+
+  return grub_disk_read (disk, pptr * nilfs2_block_count, offset,
+			 sizeof (struct grub_nilfs2_inode), inodep);
+}
+
+static int
+grub_nilfs2_valid_sb (struct grub_nilfs2_super_block *sbp)
+{
+  if (grub_le_to_cpu16 (sbp->s_magic) != NILFS2_SUPER_MAGIC)
+    return 0;
+
+  if (grub_le_to_cpu32 (sbp->s_rev_level) != NILFS_SUPORT_REV)
+    return 0;
+
+  return 1;
+}
+
+static struct grub_nilfs2_data *
+grub_nilfs2_mount (grub_disk_t disk)
+{
+  struct grub_nilfs2_data *data;
+  struct grub_nilfs2_segment_summary ss;
+  struct grub_nilfs2_checkpoint last_checkpoint;
+  grub_uint64_t last_pseg;
+  grub_uint32_t nblocks;
+  unsigned int nilfs2_block_count;
+
+  data = grub_malloc (sizeof (struct grub_nilfs2_data));
+  if (!data)
+    return 0;
+
+  /* Read the superblock.  */
+  grub_disk_read (disk, 1 * 2, 0, sizeof (struct grub_nilfs2_super_block),
+		  &data->sblock);
+  if (grub_errno)
+    goto fail;
+
+  /* Make sure this is an nilfs2 filesystem.  */
+  if (!grub_nilfs2_valid_sb (&data->sblock))
+    {
+      grub_error (GRUB_ERR_BAD_FS, "not a nilfs2 filesystem");
+      goto fail;
+    }
+
+  nilfs2_block_count = (1 << LOG2_NILFS2_BLOCK_SIZE (data));
+
+  /* Read the last segment summary. */
+  last_pseg = grub_le_to_cpu64 (data->sblock.s_last_pseg);
+  grub_disk_read (disk, last_pseg * nilfs2_block_count, 0,
+		  sizeof (struct grub_nilfs2_segment_summary), &ss);
+
+  if (grub_errno)
+    goto fail;
+
+  /* Read the super root block. */
+  nblocks = grub_le_to_cpu32 (ss.ss_nblocks);
+  grub_disk_read (disk, (last_pseg + (nblocks - 1)) * nilfs2_block_count, 0,
+		  sizeof (struct grub_nilfs2_super_root), &data->sroot);
+
+  if (grub_errno)
+    goto fail;
+
+  data->disk = disk;
+
+  grub_nilfs2_read_last_checkpoint (data, &last_checkpoint);
+
+  if (grub_errno)
+    goto fail;
+
+  grub_memcpy (&data->ifile, &last_checkpoint.cp_ifile_inode,
+	       sizeof (struct grub_nilfs2_inode));
+
+  data->diropen.data = data;
+  data->diropen.ino = 2;
+  data->diropen.inode_read = 1;
+  data->inode = &data->diropen.inode;
+
+  grub_nilfs2_read_inode (data, 2, data->inode);
+
+  return data;
+
+fail:
+  if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
+    grub_error (GRUB_ERR_BAD_FS, "not a nilfs2 filesystem");
+
+  grub_free (data);
+  return 0;
+}
+
+static char *
+grub_nilfs2_read_symlink (grub_fshelp_node_t node)
+{
+  char *symlink;
+  struct grub_fshelp_node *diro = node;
+
+  if (!diro->inode_read)
+    {
+      grub_nilfs2_read_inode (diro->data, diro->ino, &diro->inode);
+      if (grub_errno)
+	return 0;
+    }
+
+  symlink = grub_malloc (grub_le_to_cpu64 (diro->inode.i_size) + 1);
+  if (!symlink)
+    return 0;
+
+  grub_nilfs2_read_file (diro, 0, 0,
+			 grub_le_to_cpu64 (diro->inode.i_size), symlink);
+  if (grub_errno)
+    {
+      grub_free (symlink);
+      return 0;
+    }
+
+  symlink[grub_le_to_cpu64 (diro->inode.i_size)] = '\0';
+  return symlink;
+}
+
+static int
+grub_nilfs2_iterate_dir (grub_fshelp_node_t dir,
+			 int NESTED_FUNC_ATTR
+			 (*hook) (const char *filename,
+				  enum grub_fshelp_filetype filetype,
+				  grub_fshelp_node_t node))
+{
+  unsigned int fpos = 0;
+  struct grub_fshelp_node *diro = (struct grub_fshelp_node *) dir;
+
+  if (!diro->inode_read)
+    {
+      grub_nilfs2_read_inode (diro->data, diro->ino, &diro->inode);
+      if (grub_errno)
+	return 0;
+    }
+
+  /* Iterate files.  */
+  while (fpos < grub_le_to_cpu64 (diro->inode.i_size))
+    {
+      struct grub_nilfs2_dir_entry dirent;
+
+      grub_nilfs2_read_file (diro, 0, fpos,
+			     sizeof (struct grub_nilfs2_dir_entry),
+			     (char *) &dirent);
+      if (grub_errno)
+	return 0;
+
+      if (dirent.rec_len == 0)
+	return 0;
+
+      if (dirent.name_len != 0)
+	{
+	  char filename[dirent.name_len + 1];
+	  struct grub_fshelp_node *fdiro;
+	  enum grub_fshelp_filetype type = GRUB_FSHELP_UNKNOWN;
+
+	  grub_nilfs2_read_file (diro, 0,
+				 fpos + sizeof (struct grub_nilfs2_dir_entry),
+				 dirent.name_len, filename);
+	  if (grub_errno)
+	    return 0;
+
+	  fdiro = grub_malloc (sizeof (struct grub_fshelp_node));
+	  if (!fdiro)
+	    return 0;
+
+	  fdiro->data = diro->data;
+	  fdiro->ino = grub_le_to_cpu64 (dirent.inode);
+
+	  filename[dirent.name_len] = '\0';
+
+	  if (dirent.file_type != NILFS_FT_UNKNOWN)
+	    {
+	      fdiro->inode_read = 0;
+
+	      if (dirent.file_type == NILFS_FT_DIR)
+		type = GRUB_FSHELP_DIR;
+	      else if (dirent.file_type == NILFS_FT_SYMLINK)
+		type = GRUB_FSHELP_SYMLINK;
+	      else if (dirent.file_type == NILFS_FT_REG_FILE)
+		type = GRUB_FSHELP_REG;
+	    }
+	  else
+	    {
+	      /* The filetype can not be read from the dirent, read
+	         the inode to get more information.  */
+	      grub_nilfs2_read_inode (diro->data,
+				      grub_le_to_cpu64 (dirent.inode),
+				      &fdiro->inode);
+	      if (grub_errno)
+		{
+		  grub_free (fdiro);
+		  return 0;
+		}
+
+	      fdiro->inode_read = 1;
+
+	      if ((grub_le_to_cpu16 (fdiro->inode.i_mode)
+		   & FILETYPE_INO_MASK) == FILETYPE_INO_DIRECTORY)
+		type = GRUB_FSHELP_DIR;
+	      else if ((grub_le_to_cpu16 (fdiro->inode.i_mode)
+			& FILETYPE_INO_MASK) == FILETYPE_INO_SYMLINK)
+		type = GRUB_FSHELP_SYMLINK;
+	      else if ((grub_le_to_cpu16 (fdiro->inode.i_mode)
+			& FILETYPE_INO_MASK) == FILETYPE_INO_REG)
+		type = GRUB_FSHELP_REG;
+	    }
+
+	  if (hook (filename, type, fdiro))
+	    return 1;
+	}
+
+      fpos += grub_le_to_cpu16 (dirent.rec_len);
+    }
+
+  return 0;
+}
+
+/* Open a file named NAME and initialize FILE.  */
+static grub_err_t
+grub_nilfs2_open (struct grub_file *file, const char *name)
+{
+  struct grub_nilfs2_data *data = NULL;
+  struct grub_fshelp_node *fdiro = 0;
+
+  grub_dl_ref (my_mod);
+
+  data = grub_nilfs2_mount (file->device->disk);
+  if (!data)
+    goto fail;
+
+  grub_fshelp_find_file (name, &data->diropen, &fdiro,
+			 grub_nilfs2_iterate_dir, grub_nilfs2_read_symlink,
+			 GRUB_FSHELP_REG);
+  if (grub_errno)
+    goto fail;
+
+  if (!fdiro->inode_read)
+    {
+      grub_nilfs2_read_inode (data, fdiro->ino, &fdiro->inode);
+      if (grub_errno)
+	goto fail;
+    }
+
+  grub_memcpy (data->inode, &fdiro->inode, sizeof (struct grub_nilfs2_inode));
+  grub_free (fdiro);
+
+  file->size = grub_le_to_cpu64 (data->inode->i_size);
+  file->data = data;
+  file->offset = 0;
+
+  return 0;
+
+fail:
+  if (fdiro != &data->diropen)
+    grub_free (fdiro);
+  grub_free (data);
+
+  grub_dl_unref (my_mod);
+
+  return grub_errno;
+}
+
+static grub_err_t
+grub_nilfs2_close (grub_file_t file)
+{
+  grub_free (file->data);
+
+  grub_dl_unref (my_mod);
+
+  return GRUB_ERR_NONE;
+}
+
+/* Read LEN bytes data from FILE into BUF.  */
+static grub_ssize_t
+grub_nilfs2_read (grub_file_t file, char *buf, grub_size_t len)
+{
+  struct grub_nilfs2_data *data = (struct grub_nilfs2_data *) file->data;
+
+  return grub_nilfs2_read_file (&data->diropen, file->read_hook,
+				file->offset, len, buf);
+}
+
+static grub_err_t
+grub_nilfs2_dir (grub_device_t device, const char *path,
+		 int (*hook) (const char *filename,
+			      const struct grub_dirhook_info * info))
+{
+  struct grub_nilfs2_data *data = 0;
+  struct grub_fshelp_node *fdiro = 0;
+
+  auto int NESTED_FUNC_ATTR iterate (const char *filename,
+				     enum grub_fshelp_filetype filetype,
+				     grub_fshelp_node_t node);
+
+  int NESTED_FUNC_ATTR iterate (const char *filename,
+				enum grub_fshelp_filetype filetype,
+				grub_fshelp_node_t node)
+  {
+    struct grub_dirhook_info info;
+    grub_memset (&info, 0, sizeof (info));
+    if (!node->inode_read)
+      {
+	grub_nilfs2_read_inode (data, node->ino, &node->inode);
+	if (!grub_errno)
+	  node->inode_read = 1;
+	grub_errno = GRUB_ERR_NONE;
+      }
+    if (node->inode_read)
+      {
+	info.mtimeset = 1;
+	info.mtime = grub_le_to_cpu64 (node->inode.i_mtime);
+      }
+
+    info.dir = ((filetype & GRUB_FSHELP_TYPE_MASK) == GRUB_FSHELP_DIR);
+    grub_free (node);
+    return hook (filename, &info);
+  }
+
+  grub_dl_ref (my_mod);
+
+  data = grub_nilfs2_mount (device->disk);
+  if (!data)
+    goto fail;
+
+  grub_fshelp_find_file (path, &data->diropen, &fdiro,
+			 grub_nilfs2_iterate_dir, grub_nilfs2_read_symlink,
+			 GRUB_FSHELP_DIR);
+  if (grub_errno)
+    goto fail;
+
+  grub_nilfs2_iterate_dir (fdiro, iterate);
+
+fail:
+  if (fdiro != &data->diropen)
+    grub_free (fdiro);
+  grub_free (data);
+
+  grub_dl_unref (my_mod);
+
+  return grub_errno;
+}
+
+static grub_err_t
+grub_nilfs2_label (grub_device_t device, char **label)
+{
+  struct grub_nilfs2_data *data;
+  grub_disk_t disk = device->disk;
+
+  grub_dl_ref (my_mod);
+
+  data = grub_nilfs2_mount (disk);
+  if (data)
+    *label = grub_strndup (data->sblock.s_volume_name, 14);
+  else
+    *label = NULL;
+
+  grub_dl_unref (my_mod);
+
+  grub_free (data);
+
+  return grub_errno;
+}
+
+static grub_err_t
+grub_nilfs2_uuid (grub_device_t device, char **uuid)
+{
+  struct grub_nilfs2_data *data;
+  grub_disk_t disk = device->disk;
+
+  grub_dl_ref (my_mod);
+
+  data = grub_nilfs2_mount (disk);
+  if (data)
+    {
+      *uuid =
+	grub_xasprintf
+	("%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%0x-%02x%02x%02x%02x%02x%02x",
+	 data->sblock.s_uuid[0], data->sblock.s_uuid[1],
+	 data->sblock.s_uuid[2], data->sblock.s_uuid[3],
+	 data->sblock.s_uuid[4], data->sblock.s_uuid[5],
+	 data->sblock.s_uuid[6], data->sblock.s_uuid[7],
+	 data->sblock.s_uuid[8], data->sblock.s_uuid[9],
+	 data->sblock.s_uuid[10], data->sblock.s_uuid[11],
+	 data->sblock.s_uuid[12], data->sblock.s_uuid[13],
+	 data->sblock.s_uuid[14], data->sblock.s_uuid[15]);
+    }
+  else
+    *uuid = NULL;
+
+  grub_dl_unref (my_mod);
+
+  grub_free (data);
+
+  return grub_errno;
+}
+
+/* Get mtime.  */
+static grub_err_t
+grub_nilfs2_mtime (grub_device_t device, grub_int32_t * tm)
+{
+  struct grub_nilfs2_data *data;
+  grub_disk_t disk = device->disk;
+
+  grub_dl_ref (my_mod);
+
+  data = grub_nilfs2_mount (disk);
+  if (!data)
+    *tm = 0;
+  else
+    *tm = (grub_int32_t) grub_le_to_cpu64 (data->sblock.s_mtime);
+
+  grub_dl_unref (my_mod);
+
+  grub_free (data);
+
+  return grub_errno;
+}
+
+
+
+static struct grub_fs grub_nilfs2_fs = {
+  .name = "nilfs2",
+  .dir = grub_nilfs2_dir,
+  .open = grub_nilfs2_open,
+  .read = grub_nilfs2_read,
+  .close = grub_nilfs2_close,
+  .label = grub_nilfs2_label,
+  .uuid = grub_nilfs2_uuid,
+  .mtime = grub_nilfs2_mtime,
+#ifdef GRUB_UTIL
+  .reserved_first_sector = 1,
+#endif
+  .next = 0
+};
+
+GRUB_MOD_INIT (nilfs2)
+{
+  grub_fs_register (&grub_nilfs2_fs);
+  my_mod = mod;
+}
+
+GRUB_MOD_FINI (nilfs2)
+{
+  grub_fs_unregister (&grub_nilfs2_fs);
+}

From 2aec1692d929f28b75242beafaf971d777b78655 Mon Sep 17 00:00:00 2001
From: Christian Franke <franke@computer.org>
Date: Sat, 24 Apr 2010 22:41:52 +0200
Subject: [PATCH 0826/1628] 	* configure.ac: Do not CHECK_BSS_START_SYMBOL 
 and CHECK_END_SYMBOL if grub-emu is built. 	Unset TARGET_OBJ2ELF if
 grub-emu is built 	without module support.

---
 ChangeLog    |  7 +++++++
 configure.ac | 16 +++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ca82974e4..044b396b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-24  Christian Franke  <franke@computer.org>
+
+	* configure.ac: Do not CHECK_BSS_START_SYMBOL
+	and CHECK_END_SYMBOL if grub-emu is built.
+	Unset TARGET_OBJ2ELF if grub-emu is built
+	without module support.
+
 2010-04-24  Jiro SEKIBA <jir@unicus.jp>
 
 	Nilfs2 support.
diff --git a/configure.ac b/configure.ac
index 28b3c1d95..4bfc5a2b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -511,11 +511,11 @@ grub_PROG_OBJCOPY_ABSOLUTE
 fi
 grub_PROG_LD_BUILD_ID_NONE
 if test "x$target_cpu" = xi386; then
-  if test ! -z "$TARGET_IMG_LDSCRIPT"; then
-    # Check symbols provided by linker script.
-    CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC}8000,--defsym,___main=0x8100"
-  fi
-  if test "x$TARGET_APPLE_CC" != x1 ; then
+  if test "$platform" != emu && test "x$TARGET_APPLE_CC" != x1 ; then
+    if test ! -z "$TARGET_IMG_LDSCRIPT"; then
+      # Check symbols provided by linker script.
+      CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC}8000 -Wl,--defsym,___main=0x8100"
+    fi
     grub_CHECK_BSS_START_SYMBOL
     grub_CHECK_END_SYMBOL
   fi
@@ -635,6 +635,12 @@ else
 fi
 AC_SUBST(TARGET_NO_MODULES)
 
+if test "$TARGET_NO_MODULES" = yes ; then
+  # Do not convert modules, otherwise linkage may fail (Cygwin only).
+  # FIXME: Should be checked above before TARGET_OBJ2ELF is set first.
+  TARGET_OBJ2ELF=
+fi
+
 if test x"$enable_grub_emu_usb" = xno ; then
   grub_emu_usb_excuse="explicitly disabled"
 fi

From 553c01f95813ed7245b4bc3484940843a5e28e30 Mon Sep 17 00:00:00 2001
From: Christian Franke <franke@computer.org>
Date: Sat, 24 Apr 2010 23:18:57 +0200
Subject: [PATCH 0827/1628] 	* Makefile.in (TARGET_LDFLAGS): Add
 -static-libgcc. 	(kernel_img_LDFLAGS): Remove -static-libgcc.

---
 ChangeLog   | 5 +++++
 Makefile.in | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 044b396b3..92c8dc53c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-24  Christian Franke  <franke@computer.org>
+
+	* Makefile.in (TARGET_LDFLAGS): Add -static-libgcc.
+	(kernel_img_LDFLAGS): Remove -static-libgcc.
+
 2010-04-24  Christian Franke  <franke@computer.org>
 
 	* configure.ac: Do not CHECK_BSS_START_SYMBOL
diff --git a/Makefile.in b/Makefile.in
index 29f997213..822a08797 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -99,12 +99,12 @@ TARGET_APPLE_CC = @TARGET_APPLE_CC@
 OBJCONV = @OBJCONV@
 TARGET_CPPFLAGS = @TARGET_CPPFLAGS@ -I$(srcdir)/include -I$(builddir) -I$(builddir)/include \
 	-Wall -W
-TARGET_LDFLAGS = -nostdlib @TARGET_LDFLAGS@
+TARGET_LDFLAGS = -nostdlib -static-libgcc @TARGET_LDFLAGS@
 TARGET_IMG_LDSCRIPT = @TARGET_IMG_LDSCRIPT@
 TARGET_IMG_LDFLAGS = -nostdlib @TARGET_IMG_LDFLAGS@
 TARGET_IMG_CFLAGS = @TARGET_IMG_CFLAGS@
 TARGET_OBJ2ELF = @TARGET_OBJ2ELF@
-kernel_img_LDFLAGS = -static-libgcc -lgcc
+kernel_img_LDFLAGS = -lgcc
 EXEEXT = @EXEEXT@
 OBJCOPY = @OBJCOPY@
 STRIP = @STRIP@

From d31bc9964cd301831055849a21aaa403b297c41b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 25 Apr 2010 01:54:46 +0200
Subject: [PATCH 0828/1628] migrate kernel.img to elf

---
 conf/i386-pc.rmk               |   5 +-
 conf/i386-qemu.rmk             |   2 +-
 conf/mips-qemu-mips.rmk        |   2 +-
 conf/mips-yeeloong.rmk         |   2 +-
 conf/sparc64-ieee1275.rmk      |   3 +-
 conf/x86-efi.rmk               |   2 +-
 include/grub/x86_64/efi/boot.h |   0
 util/grub-mkrawimage.c         | 169 ++++++++++++++++++++++++++++++++-
 8 files changed, 172 insertions(+), 13 deletions(-)
 create mode 100644 include/grub/x86_64/efi/boot.h

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index a5a1b08ea..f2490ba97 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -5,8 +5,7 @@ GRUB_KERNEL_MACHINE_LINK_ADDR = 0x8200
 COMMON_CFLAGS = -mrtd -mregparm=3
 
 # Images.
-pkglib_IMAGES = boot.img cdboot.img diskboot.img kernel.img lnxboot.img \
-	pxeboot.img
+pkglib_IMAGES = boot.img cdboot.img diskboot.img lnxboot.img pxeboot.img
 
 # For boot.img.
 boot_img_SOURCES = boot/i386/pc/boot.S
@@ -39,6 +38,7 @@ cdboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x7C00
 cdboot_img_FORMAT = binary
 
 # For kernel.img.
+pkglib_PROGRAMS = kernel.img
 kernel_img_SOURCES = kern/i386/pc/startup.S \
 	kern/i386/misc.S \
 	kern/main.c kern/device.c \
@@ -59,7 +59,6 @@ kernel_img_HEADERS += machine/biosdisk.h machine/vga.h machine/vbe.h \
 kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
-kernel_img_FORMAT = binary
 
 # Utilities.
 bin_UTILITIES = grub-mkimage
diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index 664bef12a..923231791 100644
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -19,7 +19,7 @@ grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 util/grub-mkrawimage.c_DEPENDENCIES = Makefile
 
-pkglib_IMAGES += kernel.img
+pkglib_PROGRAMS += kernel.img
 kernel_img_SOURCES = kern/i386/qemu/startup.S \
 	kern/i386/misc.S \
 	kern/i386/coreboot/init.c \
diff --git a/conf/mips-qemu-mips.rmk b/conf/mips-qemu-mips.rmk
index af5b26bec..2f80ab2e3 100644
--- a/conf/mips-qemu-mips.rmk
+++ b/conf/mips-qemu-mips.rmk
@@ -5,7 +5,7 @@ COMMON_CFLAGS += -march=mips3
 COMMON_ASFLAGS += -march=mips3
 include $(srcdir)/conf/mips.mk
 
-pkglib_IMAGES = kernel.img
+pkglib_PROGRAMS = kernel.img
 kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
 	kern/main.c kern/device.c kern/$(target_cpu)/init.c \
 	kern/$(target_cpu)/$(target_machine)/init.c 		\
diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 6a96ddfaf..5ce8ede9d 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -8,7 +8,7 @@ kernel_img_HEADERS += pci.h bitmap.h video.h gfxterm.h font.h bitmap_scale.h buf
 
 include $(srcdir)/conf/mips.mk
 
-pkglib_IMAGES = kernel.img
+pkglib_PROGRAMS = kernel.img
 kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
 	kern/main.c kern/device.c kern/$(target_cpu)/init.c \
 	kern/$(target_cpu)/$(target_machine)/init.c 		\
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index f0c9b0db7..8e96599aa 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -5,7 +5,8 @@ COMMON_CFLAGS = -mno-app-regs
 COMMON_LDFLAGS = -melf64_sparc -mno-relax
 
 # Images.
-pkglib_IMAGES = boot.img diskboot.img kernel.img
+pkglib_IMAGES = boot.img diskboot.img
+pkglib_PROGRAMS = kernel.img
 
 # For boot.img.
 boot_img_SOURCES = boot/sparc64/ieee1275/boot.S
diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index 46957d933..bab561cc4 100644
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -4,7 +4,7 @@
 bin_UTILITIES = grub-mkimage
 
 # For grub-mkimage.
-grub_mkimage_SOURCES = gnulib/progname.c util/i386/efi/grub-mkimage.c \
+grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c \
 	util/misc.c util/resolve.c
 util/i386/efi/grub-mkimage.c_DEPENDENCIES = Makefile
 
diff --git a/include/grub/x86_64/efi/boot.h b/include/grub/x86_64/efi/boot.h
new file mode 100644
index 000000000..e69de29bb
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 20a344d04..dace903a9 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
+#include <grub/efi/pe32.h>
 
 #define _GNU_SOURCE	1
 #include <getopt.h>
@@ -44,6 +45,8 @@
 
 #define ALIGN_ADDR(x) (ALIGN_UP((x), GRUB_TARGET_SIZEOF_VOID_P))
 
+#define SECTION_ALIGN 1
+
 #ifdef ENABLE_LZMA
 #include <grub/lib/LzmaEnc.h>
 
@@ -97,6 +100,162 @@ compress_kernel (char *kernel_img, size_t kernel_size,
 
 #endif	/* No lzma compression */
 
+/* Determine if this section is a text section. Return false if this
+   section is not allocated.  */
+static int
+is_text_section (Elf_Shdr *s)
+{
+  if (grub_target_to_host32 (s->sh_type) != SHT_PROGBITS)
+    return 0;
+  return ((grub_target_to_host32 (s->sh_flags) & (SHF_EXECINSTR | SHF_ALLOC))
+	  == (SHF_EXECINSTR | SHF_ALLOC));
+}
+
+/* Determine if this section is a data section. This assumes that
+   BSS is also a data section, since the converter initializes BSS
+   when producing PE32 to avoid a bug in EFI implementations.  */
+static int
+is_data_section (Elf_Shdr *s)
+{
+  if (grub_target_to_host32 (s->sh_type) != SHT_PROGBITS)
+    return 0;
+  return ((grub_target_to_host32 (s->sh_flags) & (SHF_EXECINSTR | SHF_ALLOC))
+	  == SHF_ALLOC);
+}
+
+/* Locate section addresses by merging code sections and data sections
+   into .text and .data, respectively. Return the array of section
+   addresses.  */
+static Elf_Addr *
+locate_sections (Elf_Shdr *sections, Elf_Half section_entsize,
+		 Elf_Half num_sections, const char *strtab,
+		 grub_size_t *exec_size, grub_size_t *kernel_sz)
+{
+  int i;
+  Elf_Addr current_address;
+  Elf_Addr *section_addresses;
+  Elf_Shdr *s;
+
+  section_addresses = xmalloc (sizeof (*section_addresses) * num_sections);
+  memset (section_addresses, 0, sizeof (*section_addresses) * num_sections);
+
+  current_address = 0;
+
+  /* .text */
+  for (i = 0, s = sections;
+       i < num_sections;
+       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+    if (is_text_section (s))
+      {
+	Elf_Word align = grub_host_to_target32 (s->sh_addralign);
+	const char *name = strtab + grub_host_to_target32 (s->sh_name);
+
+	if (align)
+	  current_address = ALIGN_UP (current_address, align);
+
+	grub_util_info ("locating the section %s at 0x%x",
+			name, current_address);
+	section_addresses[i] = current_address;
+	current_address += grub_host_to_target32 (s->sh_size);
+      }
+
+  current_address = ALIGN_UP (current_address, SECTION_ALIGN);
+  *exec_size = current_address;
+
+  /* .data */
+  for (i = 0, s = sections;
+       i < num_sections;
+       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+    if (is_data_section (s))
+      {
+	Elf_Word align = grub_host_to_target32 (s->sh_addralign);
+	const char *name = strtab + grub_host_to_target32 (s->sh_name);
+
+	if (align)
+	  current_address = ALIGN_UP (current_address, align);
+
+	grub_util_info ("locating the section %s at 0x%x",
+			name, current_address);
+	section_addresses[i] = current_address;
+	current_address += grub_host_to_target32 (s->sh_size);
+      }
+
+  current_address = ALIGN_UP (current_address, SECTION_ALIGN);
+  *kernel_sz = current_address;
+  return section_addresses;
+}
+
+/* Return if the ELF header is valid.  */
+static int
+check_elf_header (Elf_Ehdr *e, size_t size)
+{
+  if (size < sizeof (*e)
+      || e->e_ident[EI_MAG0] != ELFMAG0
+      || e->e_ident[EI_MAG1] != ELFMAG1
+      || e->e_ident[EI_MAG2] != ELFMAG2
+      || e->e_ident[EI_MAG3] != ELFMAG3
+      || e->e_ident[EI_VERSION] != EV_CURRENT
+      || e->e_version != grub_host_to_target32 (EV_CURRENT))
+    return 0;
+
+  return 1;
+}
+
+static char *
+load_image (const char *kernel_path, grub_size_t *exec_size, 
+	    grub_size_t *kernel_sz, grub_size_t total_module_size)
+{
+  char *kernel_img, *out_img;
+  const char *strtab;
+  Elf_Ehdr *e;
+  Elf_Shdr *sections;
+  Elf_Addr *section_addresses;
+  int i;
+  Elf_Shdr *s;
+  Elf_Half num_sections;
+  Elf_Off section_offset;
+  Elf_Half section_entsize;
+  grub_size_t kernel_size;
+
+  kernel_size = grub_util_get_image_size (kernel_path);
+  kernel_img = xmalloc (kernel_size);
+  grub_util_load_image (kernel_path, kernel_img);
+
+  e = (Elf_Ehdr *) kernel_img;
+  if (! check_elf_header (e, kernel_size))
+    grub_util_error ("invalid ELF header");
+
+  section_offset = grub_target_to_host32 (e->e_shoff);
+  section_entsize = grub_target_to_host16 (e->e_shentsize);
+  num_sections = grub_target_to_host16 (e->e_shnum);
+
+  if (kernel_size < section_offset + section_entsize * num_sections)
+    grub_util_error ("invalid ELF format");
+
+  sections = (Elf_Shdr *) (kernel_img + section_offset);
+
+  /* Relocate sections then symbols in the virtual address space.  */
+  s = (Elf_Shdr *) ((char *) sections
+		      + grub_host_to_target16 (e->e_shstrndx) * section_entsize);
+  strtab = (char *) e + grub_host_to_target32 (s->sh_offset);
+
+  section_addresses = locate_sections (sections, section_entsize,
+				       num_sections, strtab,
+				       exec_size, kernel_sz);
+  out_img = xmalloc (*kernel_sz + total_module_size);
+
+  for (i = 0, s = sections;
+       i < num_sections;
+       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+    if (is_data_section (s) || is_text_section (s))
+      memcpy (out_img + section_addresses[i],
+	      kernel_img + grub_host_to_target32 (s->sh_offset),
+	      grub_host_to_target32 (s->sh_size));
+  free (kernel_img);
+
+  return out_img;
+}
+
 static void
 generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 		char *memdisk_path, char *font_path, char *config_path,
@@ -109,17 +268,15 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 )
 {
   char *kernel_img, *core_img;
-  size_t kernel_size, total_module_size, core_size;
+  size_t kernel_size, total_module_size, core_size, exec_size;
   size_t memdisk_size = 0, font_size = 0, config_size = 0, config_size_pure = 0;
   char *kernel_path;
   size_t offset;
   struct grub_util_path_list *path_list, *p, *next;
   struct grub_module_info *modinfo;
-
   path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods);
 
   kernel_path = grub_util_get_path (dir, "kernel.img");
-  kernel_size = grub_util_get_image_size (kernel_path);
 
   total_module_size = sizeof (struct grub_module_info);
 
@@ -150,8 +307,8 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
   grub_util_info ("the total module size is 0x%x", total_module_size);
 
-  kernel_img = xmalloc (kernel_size + total_module_size);
-  grub_util_load_image (kernel_path, kernel_img);
+  kernel_img = load_image (kernel_path, &exec_size, &kernel_size,
+			   total_module_size);
 
   if (GRUB_KERNEL_MACHINE_PREFIX + strlen (prefix) + 1 > GRUB_KERNEL_MACHINE_DATA_END)
     grub_util_error (_("prefix is too long"));
@@ -237,8 +394,10 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
   *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE))
     = grub_host_to_target32 (total_module_size);
 #endif
+#ifdef GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE
   *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE))
     = grub_host_to_target32 (kernel_size);
+#endif
 #ifdef GRUB_KERNEL_MACHINE_COMPRESSED_SIZE
   *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_COMPRESSED_SIZE))
     = grub_host_to_target32 (core_size - GRUB_KERNEL_MACHINE_RAW_SIZE);

From e310b81f6cb8c0ad893e08282a49ef42f69d5c9f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 25 Apr 2010 19:38:12 +0200
Subject: [PATCH 0829/1628] util/grub-mkrawimage.c working on EFI

---
 util/grub-mkrawimage.c | 690 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 680 insertions(+), 10 deletions(-)

diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index dace903a9..30608a932 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -30,6 +30,7 @@
 #include <grub/util/misc.h>
 #include <grub/util/resolve.h>
 #include <grub/misc.h>
+#include <time.h>
 
 #include <stdio.h>
 #include <unistd.h>
@@ -45,7 +46,19 @@
 
 #define ALIGN_ADDR(x) (ALIGN_UP((x), GRUB_TARGET_SIZEOF_VOID_P))
 
+#ifdef GRUB_MACHINE_EFI
+#define SECTION_ALIGN GRUB_PE32_SECTION_ALIGNMENT
+#define VADDR_OFFSET ALIGN_UP (sizeof (struct grub_pe32_header) + 5 * sizeof (struct grub_pe32_section_table), SECTION_ALIGN)
+#else
 #define SECTION_ALIGN 1
+#define VADDR_OFFSET 0
+#endif
+
+#if GRUB_TARGET_WORDSIZE == 32
+# define grub_target_to_host(val) grub_target_to_host32(val)
+#elif GRUB_TARGET_WORDSIZE == 64
+# define grub_target_to_host(val) grub_target_to_host64(val)
+#endif
 
 #ifdef ENABLE_LZMA
 #include <grub/lib/LzmaEnc.h>
@@ -100,13 +113,436 @@ compress_kernel (char *kernel_img, size_t kernel_size,
 
 #endif	/* No lzma compression */
 
+#ifdef GRUB_MACHINE_EFI
+
+/* Relocate symbols; note that this function overwrites the symbol table.
+   Return the address of a start symbol.  */
+static Elf_Addr
+relocate_symbols (Elf_Ehdr *e, Elf_Shdr *sections,
+		  Elf_Shdr *symtab_section, Elf_Addr *section_addresses,
+		  Elf_Half section_entsize, Elf_Half num_sections)
+{
+  Elf_Word symtab_size, sym_size, num_syms;
+  Elf_Off symtab_offset;
+  Elf_Addr start_address = 0;
+  Elf_Sym *sym;
+  Elf_Word i;
+  Elf_Shdr *strtab_section;
+  const char *strtab;
+
+  strtab_section
+    = (Elf_Shdr *) ((char *) sections
+		      + (grub_target_to_host32 (symtab_section->sh_link)
+			 * section_entsize));
+  strtab = (char *) e + grub_target_to_host32 (strtab_section->sh_offset);
+
+  symtab_size = grub_target_to_host32 (symtab_section->sh_size);
+  sym_size = grub_target_to_host32 (symtab_section->sh_entsize);
+  symtab_offset = grub_target_to_host32 (symtab_section->sh_offset);
+  num_syms = symtab_size / sym_size;
+
+  for (i = 0, sym = (Elf_Sym *) ((char *) e + symtab_offset);
+       i < num_syms;
+       i++, sym = (Elf_Sym *) ((char *) sym + sym_size))
+    {
+      Elf_Section index;
+      const char *name;
+
+      name = strtab + grub_target_to_host32 (sym->st_name);
+
+      index = grub_target_to_host16 (sym->st_shndx);
+      if (index == STN_ABS)
+        {
+          continue;
+        }
+      else if ((index == STN_UNDEF))
+	{
+	  if (sym->st_name)
+	    grub_util_error ("undefined symbol %s", name);
+	  else
+	    continue;
+	}
+      else if (index >= num_sections)
+	grub_util_error ("section %d does not exist", index);
+
+      sym->st_value = (grub_target_to_host32 (sym->st_value)
+		       + section_addresses[index]);
+      grub_util_info ("locating %s at 0x%x", name, sym->st_value);
+
+      if (! start_address)
+	if (strcmp (name, "_start") == 0 || strcmp (name, "start") == 0)
+	  start_address = sym->st_value;
+    }
+
+  return start_address;
+}
+
+/* Return the address of a symbol at the index I in the section S.  */
+static Elf_Addr
+get_symbol_address (Elf_Ehdr *e, Elf_Shdr *s, Elf_Word i)
+{
+  Elf_Sym *sym;
+
+  sym = (Elf_Sym *) ((char *) e
+		       + grub_target_to_host32 (s->sh_offset)
+		       + i * grub_target_to_host32 (s->sh_entsize));
+  return sym->st_value;
+}
+
+/* Return the address of a modified value.  */
+static Elf_Addr *
+get_target_address (Elf_Ehdr *e, Elf_Shdr *s, Elf_Addr offset)
+{
+  return (Elf_Addr *) ((char *) e + grub_target_to_host32 (s->sh_offset) + offset);
+}
+
+/* Deal with relocation information. This function relocates addresses
+   within the virtual address space starting from 0. So only relative
+   addresses can be fully resolved. Absolute addresses must be relocated
+   again by a PE32 relocator when loaded.  */
+static void
+relocate_addresses (Elf_Ehdr *e, Elf_Shdr *sections,
+		    Elf_Addr *section_addresses,
+		    Elf_Half section_entsize, Elf_Half num_sections,
+		    const char *strtab)
+{
+  Elf_Half i;
+  Elf_Shdr *s;
+
+  for (i = 0, s = sections;
+       i < num_sections;
+       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+    if ((s->sh_type == grub_host_to_target32 (SHT_REL)) ||
+        (s->sh_type == grub_host_to_target32 (SHT_RELA)))
+      {
+	Elf_Rela *r;
+	Elf_Word rtab_size, r_size, num_rs;
+	Elf_Off rtab_offset;
+	Elf_Shdr *symtab_section;
+	Elf_Word target_section_index;
+	Elf_Addr target_section_addr;
+	Elf_Shdr *target_section;
+	Elf_Word j;
+
+	symtab_section = (Elf_Shdr *) ((char *) sections
+					 + (grub_target_to_host32 (s->sh_link)
+					    * section_entsize));
+	target_section_index = grub_target_to_host32 (s->sh_info);
+	target_section_addr = section_addresses[target_section_index];
+	target_section = (Elf_Shdr *) ((char *) sections
+					 + (target_section_index
+					    * section_entsize));
+
+	grub_util_info ("dealing with the relocation section %s for %s",
+			strtab + grub_target_to_host32 (s->sh_name),
+			strtab + grub_target_to_host32 (target_section->sh_name));
+
+	rtab_size = grub_target_to_host32 (s->sh_size);
+	r_size = grub_target_to_host32 (s->sh_entsize);
+	rtab_offset = grub_target_to_host32 (s->sh_offset);
+	num_rs = rtab_size / r_size;
+
+	for (j = 0, r = (Elf_Rela *) ((char *) e + rtab_offset);
+	     j < num_rs;
+	     j++, r = (Elf_Rela *) ((char *) r + r_size))
+	  {
+            Elf_Addr info;
+	    Elf_Addr offset;
+	    Elf_Addr sym_addr;
+	    Elf_Addr *target;
+	    Elf_Addr addend;
+
+	    offset = grub_target_to_host (r->r_offset);
+	    target = get_target_address (e, target_section, offset);
+	    info = grub_target_to_host (r->r_info);
+	    sym_addr = get_symbol_address (e, symtab_section,
+					   ELF_R_SYM (info));
+
+            addend = (s->sh_type == grub_target_to_host32 (SHT_RELA)) ?
+	      r->r_addend : 0;
+
+            switch (ELF_R_TYPE (info))
+	      {
+#if GRUB_TARGET_SIZEOF_VOID_P == 4
+	      case R_386_NONE:
+		break;
+
+	      case R_386_32:
+		/* This is absolute.  */
+		*target = grub_host_to_target32 (grub_target_to_host32 (*target)
+                                            + addend + sym_addr);
+		grub_util_info ("relocating an R_386_32 entry to 0x%x at the offset 0x%x",
+				*target, offset);
+		break;
+
+	      case R_386_PC32:
+		/* This is relative.  */
+		*target = grub_host_to_target32 (grub_target_to_host32 (*target)
+						 + addend + sym_addr
+						 - target_section_addr - offset
+						 - VADDR_OFFSET);
+		grub_util_info ("relocating an R_386_PC32 entry to 0x%x at the offset 0x%x",
+				*target, offset);
+		break;
+
+#else
+
+              case R_X86_64_NONE:
+                break;
+
+              case R_X86_64_64:
+		*target = grub_host_to_target64 (grub_target_to_host64 (*target)
+					    + addend + sym_addr);
+		grub_util_info ("relocating an R_X86_64_64 entry to 0x%llx at the offset 0x%llx",
+				*target, offset);
+		break;
+
+              case R_X86_64_PC32:
+                {
+                  grub_uint32_t *t32 = (grub_uint32_t *) target;
+                  *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
+						+ addend + sym_addr
+						- target_section_addr - offset
+						- VADDR_OFFSET);
+                  grub_util_info ("relocating an R_X86_64_PC32 entry to 0x%x at the offset 0x%llx",
+                                  *t32, offset);
+                  break;
+                }
+
+              case R_X86_64_32:
+              case R_X86_64_32S:
+                {
+                  grub_uint32_t *t32 = (grub_uint32_t *) target;
+                  *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
+                                           + addend + sym_addr);
+                  grub_util_info ("relocating an R_X86_64_32(S) entry to 0x%x at the offset 0x%llx",
+                                  *t32, offset);
+                  break;
+                }
+
+#endif
+	      default:
+		grub_util_error ("unknown relocation type %d",
+				 ELF_R_TYPE (info));
+		break;
+	      }
+	  }
+      }
+}
+
+struct fixup_block_list
+{
+  struct fixup_block_list *next;
+  int state;
+  struct grub_pe32_fixup_block b;
+};
+
+/* Add a PE32's fixup entry for a relocation. Return the resulting address
+   after having written to the file OUT.  */
+Elf_Addr
+add_fixup_entry (struct fixup_block_list **cblock, grub_uint16_t type,
+		 Elf_Addr addr, int flush, Elf_Addr current_address)
+{
+  struct grub_pe32_fixup_block *b;
+
+  b = &((*cblock)->b);
+
+  /* First, check if it is necessary to write out the current block.  */
+  if ((*cblock)->state)
+    {
+      if (flush || addr < b->page_rva || b->page_rva + 0x1000 <= addr)
+	{
+	  grub_uint32_t size;
+
+	  if (flush)
+	    {
+	      /* Add as much padding as necessary to align the address
+		 with a section boundary.  */
+	      Elf_Addr next_address;
+	      unsigned padding_size;
+              size_t index;
+
+	      next_address = current_address + b->block_size;
+	      padding_size = ((ALIGN_UP (next_address, SECTION_ALIGN)
+			       - next_address)
+			      >> 1);
+              index = ((b->block_size - sizeof (*b)) >> 1);
+              grub_util_info ("adding %d padding fixup entries", padding_size);
+	      while (padding_size--)
+		{
+		  b->entries[index++] = 0;
+		  b->block_size += 2;
+		}
+	    }
+          else if (b->block_size & (8 - 1))
+            {
+	      /* If not aligned with a 32-bit boundary, add
+		 a padding entry.  */
+              size_t index;
+
+              grub_util_info ("adding a padding fixup entry");
+              index = ((b->block_size - sizeof (*b)) >> 1);
+              b->entries[index] = 0;
+              b->block_size += 2;
+            }
+
+          /* Flush it.  */
+          grub_util_info ("writing %d bytes of a fixup block starting at 0x%x",
+                          b->block_size, b->page_rva);
+          size = b->block_size;
+	  current_address += size;
+	  b->page_rva = grub_host_to_target32 (b->page_rva);
+	  b->block_size = grub_host_to_target32 (b->block_size);
+	  (*cblock)->next = xmalloc (sizeof (**cblock) + 2 * 0x1000);
+	  memset ((*cblock)->next, 0, sizeof (**cblock) + 2 * 0x1000);
+	  *cblock = (*cblock)->next;
+	}
+    }
+
+  b = &((*cblock)->b);
+
+  if (! flush)
+    {
+      grub_uint16_t entry;
+      size_t index;
+
+      /* If not allocated yet, allocate a block with enough entries.  */
+      if (! (*cblock)->state)
+	{
+	  (*cblock)->state = 1;
+
+	  /* The spec does not mention the requirement of a Page RVA.
+	     Here, align the address with a 4K boundary for safety.  */
+	  b->page_rva = (addr & ~(0x1000 - 1));
+	  b->block_size = sizeof (*b);
+	}
+
+      /* Sanity check.  */
+      if (b->block_size >= sizeof (*b) + 2 * 0x1000)
+	grub_util_error ("too many fixup entries");
+
+      /* Add a new entry.  */
+      index = ((b->block_size - sizeof (*b)) >> 1);
+      entry = GRUB_PE32_FIXUP_ENTRY (type, addr - b->page_rva);
+      b->entries[index] = grub_host_to_target16 (entry);
+      b->block_size += 2;
+    }
+
+  return current_address;
+}
+
+/* Make a .reloc section.  */
+static Elf_Addr
+make_reloc_section (Elf_Ehdr *e, void **out,
+		    Elf_Addr *section_addresses, Elf_Shdr *sections,
+		    Elf_Half section_entsize, Elf_Half num_sections,
+		    const char *strtab)
+{
+  Elf_Half i;
+  Elf_Shdr *s;
+  struct fixup_block_list *lst, *lst0;
+  Elf_Addr current_address = 0;
+
+  lst = lst0 = xmalloc (sizeof (*lst) + 2 * 0x1000);
+  memset (lst, 0, sizeof (*lst) + 2 * 0x1000);
+
+  for (i = 0, s = sections;
+       i < num_sections;
+       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+    if ((s->sh_type == grub_cpu_to_le32 (SHT_REL)) ||
+        (s->sh_type == grub_cpu_to_le32 (SHT_RELA)))
+      {
+	Elf_Rel *r;
+	Elf_Word rtab_size, r_size, num_rs;
+	Elf_Off rtab_offset;
+	Elf_Addr section_address;
+	Elf_Word j;
+
+	grub_util_info ("translating the relocation section %s",
+			strtab + grub_le_to_cpu32 (s->sh_name));
+
+	rtab_size = grub_le_to_cpu32 (s->sh_size);
+	r_size = grub_le_to_cpu32 (s->sh_entsize);
+	rtab_offset = grub_le_to_cpu32 (s->sh_offset);
+	num_rs = rtab_size / r_size;
+
+	section_address = section_addresses[grub_le_to_cpu32 (s->sh_info)];
+
+	for (j = 0, r = (Elf_Rel *) ((char *) e + rtab_offset);
+	     j < num_rs;
+	     j++, r = (Elf_Rel *) ((char *) r + r_size))
+	  {
+	    Elf_Addr info;
+	    Elf_Addr offset;
+
+	    offset = grub_le_to_cpu32 (r->r_offset);
+	    info = grub_le_to_cpu32 (r->r_info);
+
+	    /* Necessary to relocate only absolute addresses.  */
+#if GRUB_TARGET_SIZEOF_VOID_P == 4
+	    if (ELF_R_TYPE (info) == R_386_32)
+	      {
+		Elf_Addr addr;
+
+		addr = section_address + offset;
+		grub_util_info ("adding a relocation entry for 0x%x", addr);
+		current_address = add_fixup_entry (&lst,
+						   GRUB_PE32_REL_BASED_HIGHLOW,
+						   addr, 0, current_address);
+	      }
+#else
+	    if ((ELF_R_TYPE (info) == R_X86_64_32) ||
+                (ELF_R_TYPE (info) == R_X86_64_32S))
+	      {
+		grub_util_error ("can\'t add fixup entry for R_X86_64_32(S)");
+	      }
+	    else if (ELF_R_TYPE (info) == R_X86_64_64)
+	      {
+		Elf_Addr addr;
+
+		addr = section_address + offset;
+		grub_util_info ("adding a relocation entry for 0x%llx", addr);
+		current_address = add_fixup_entry (&lst,
+						   GRUB_PE32_REL_BASED_DIR64,
+						   addr,
+						   0, current_address);
+	      }
+#endif
+	  }
+      }
+
+  current_address = add_fixup_entry (&lst, 0, 0, 1, current_address);
+
+  {
+    grub_uint8_t *ptr;
+    ptr = *out = xmalloc (current_address);
+    for (lst = lst0; lst; lst = lst->next)
+      if (lst->state)
+	{
+	  memcpy (ptr, &lst->b, grub_target_to_host32 (lst->b.block_size));
+	  ptr += grub_target_to_host32 (lst->b.block_size);
+	}
+    if (current_address + *out != ptr)
+      {
+	grub_util_error ("Bug detected %d != %d\n", ptr - (grub_uint8_t *) *out,
+			 current_address);
+      }
+  }
+
+  return current_address;
+}
+
+#endif
+
 /* Determine if this section is a text section. Return false if this
    section is not allocated.  */
 static int
 is_text_section (Elf_Shdr *s)
 {
+#ifndef GRUB_MACHINE_EFI
   if (grub_target_to_host32 (s->sh_type) != SHT_PROGBITS)
     return 0;
+#endif
   return ((grub_target_to_host32 (s->sh_flags) & (SHF_EXECINSTR | SHF_ALLOC))
 	  == (SHF_EXECINSTR | SHF_ALLOC));
 }
@@ -117,8 +553,10 @@ is_text_section (Elf_Shdr *s)
 static int
 is_data_section (Elf_Shdr *s)
 {
+#ifndef GRUB_MACHINE_EFI
   if (grub_target_to_host32 (s->sh_type) != SHT_PROGBITS)
     return 0;
+#endif
   return ((grub_target_to_host32 (s->sh_flags) & (SHF_EXECINSTR | SHF_ALLOC))
 	  == SHF_ALLOC);
 }
@@ -151,7 +589,8 @@ locate_sections (Elf_Shdr *sections, Elf_Half section_entsize,
 	const char *name = strtab + grub_host_to_target32 (s->sh_name);
 
 	if (align)
-	  current_address = ALIGN_UP (current_address, align);
+	  current_address = ALIGN_UP (current_address + VADDR_OFFSET, align)
+	    - VADDR_OFFSET;
 
 	grub_util_info ("locating the section %s at 0x%x",
 			name, current_address);
@@ -159,7 +598,8 @@ locate_sections (Elf_Shdr *sections, Elf_Half section_entsize,
 	current_address += grub_host_to_target32 (s->sh_size);
       }
 
-  current_address = ALIGN_UP (current_address, SECTION_ALIGN);
+  current_address = ALIGN_UP (current_address + VADDR_OFFSET, SECTION_ALIGN)
+    - VADDR_OFFSET;
   *exec_size = current_address;
 
   /* .data */
@@ -172,7 +612,8 @@ locate_sections (Elf_Shdr *sections, Elf_Half section_entsize,
 	const char *name = strtab + grub_host_to_target32 (s->sh_name);
 
 	if (align)
-	  current_address = ALIGN_UP (current_address, align);
+	  current_address = ALIGN_UP (current_address + VADDR_OFFSET, align)
+	    - VADDR_OFFSET;
 
 	grub_util_info ("locating the section %s at 0x%x",
 			name, current_address);
@@ -180,7 +621,8 @@ locate_sections (Elf_Shdr *sections, Elf_Half section_entsize,
 	current_address += grub_host_to_target32 (s->sh_size);
       }
 
-  current_address = ALIGN_UP (current_address, SECTION_ALIGN);
+  current_address = ALIGN_UP (current_address + VADDR_OFFSET, SECTION_ALIGN)
+    - VADDR_OFFSET;
   *kernel_sz = current_address;
   return section_addresses;
 }
@@ -203,19 +645,25 @@ check_elf_header (Elf_Ehdr *e, size_t size)
 
 static char *
 load_image (const char *kernel_path, grub_size_t *exec_size, 
-	    grub_size_t *kernel_sz, grub_size_t total_module_size)
+	    grub_size_t *kernel_sz, grub_size_t *bss_size,
+	    grub_size_t total_module_size, Elf_Addr *start,
+	    void **reloc_section, grub_size_t *reloc_size)
 {
   char *kernel_img, *out_img;
   const char *strtab;
   Elf_Ehdr *e;
   Elf_Shdr *sections;
   Elf_Addr *section_addresses;
+  Elf_Addr *section_vaddresses;
   int i;
   Elf_Shdr *s;
   Elf_Half num_sections;
   Elf_Off section_offset;
   Elf_Half section_entsize;
   grub_size_t kernel_size;
+  Elf_Shdr *symtab_section;
+
+  *start = 0;
 
   kernel_size = grub_util_get_image_size (kernel_path);
   kernel_img = xmalloc (kernel_size);
@@ -242,15 +690,93 @@ load_image (const char *kernel_path, grub_size_t *exec_size,
   section_addresses = locate_sections (sections, section_entsize,
 				       num_sections, strtab,
 				       exec_size, kernel_sz);
+
+#ifdef GRUB_MACHINE_EFI
+  {
+    section_vaddresses = xmalloc (sizeof (*section_addresses) * num_sections);
+
+    for (i = 0; i < num_sections; i++)
+      section_vaddresses[i] = section_addresses[i] + VADDR_OFFSET;
+
+#if 0
+    {
+      Elf_Addr current_address = *kernel_sz;
+
+      for (i = 0, s = sections;
+	   i < num_sections;
+	   i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+	if (grub_target_to_host32 (s->sh_type) == SHT_NOBITS)
+	  {
+	    Elf_Word align = grub_host_to_target32 (s->sh_addralign);
+	    const char *name = strtab + grub_host_to_target32 (s->sh_name);
+
+	    if (align)
+	      current_address = ALIGN_UP (current_address + VADDR_OFFSET, align)
+		- VADDR_OFFSET;
+	
+	    grub_util_info ("locating the section %s at 0x%x",
+			    name, current_address);
+	    section_vaddresses[i] = current_address + VADDR_OFFSET;
+	    current_address += grub_host_to_target32 (s->sh_size);
+	  }
+      current_address = ALIGN_UP (current_address + VADDR_OFFSET, SECTION_ALIGN)
+	- VADDR_OFFSET;
+      *bss_size = current_address - *kernel_sz;
+    }
+#else
+    *bss_size = 0;
+#endif
+
+    symtab_section = NULL;
+    for (i = 0, s = sections;
+	 i < num_sections;
+	 i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+      if (s->sh_type == grub_host_to_target32 (SHT_SYMTAB))
+	{
+	  symtab_section = s;
+	  break;
+	}
+
+    if (! symtab_section)
+      grub_util_error ("no symbol table");
+
+    *start = relocate_symbols (e, sections, symtab_section,
+			       section_vaddresses, section_entsize,
+			       num_sections);
+    if (*start == 0)
+      grub_util_error ("start symbol is not defined");
+
+    /* Resolve addresses in the virtual address space.  */
+    relocate_addresses (e, sections, section_addresses, section_entsize,
+			num_sections, strtab);
+
+    *reloc_size = make_reloc_section (e, reloc_section,
+				      section_vaddresses, sections,
+				      section_entsize, num_sections,
+				      strtab);
+
+  }
+#else
+  *bss_size = 0;
+  *reloc_size = 0;
+  *reloc_section = NULL;
+#endif
+
   out_img = xmalloc (*kernel_sz + total_module_size);
 
   for (i = 0, s = sections;
        i < num_sections;
        i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
     if (is_data_section (s) || is_text_section (s))
-      memcpy (out_img + section_addresses[i],
-	      kernel_img + grub_host_to_target32 (s->sh_offset),
-	      grub_host_to_target32 (s->sh_size));
+      {
+	if (grub_target_to_host32 (s->sh_type) == SHT_NOBITS)
+	  memset (out_img + section_addresses[i], 0,
+		  grub_host_to_target32 (s->sh_size));
+	else
+	  memcpy (out_img + section_addresses[i],
+		  kernel_img + grub_host_to_target32 (s->sh_offset),
+		  grub_host_to_target32 (s->sh_size));
+      }
   free (kernel_img);
 
   return out_img;
@@ -274,6 +800,10 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
   size_t offset;
   struct grub_util_path_list *path_list, *p, *next;
   struct grub_module_info *modinfo;
+  grub_size_t bss_size;
+  Elf_Addr start_address;
+  void *rel_section;
+  grub_size_t reloc_size;
   path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods);
 
   kernel_path = grub_util_get_path (dir, "kernel.img");
@@ -307,8 +837,9 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
   grub_util_info ("the total module size is 0x%x", total_module_size);
 
-  kernel_img = load_image (kernel_path, &exec_size, &kernel_size,
-			   total_module_size);
+  kernel_img = load_image (kernel_path, &exec_size, &kernel_size, &bss_size,
+			   total_module_size, &start_address, &rel_section,
+			   &reloc_size);
 
   if (GRUB_KERNEL_MACHINE_PREFIX + strlen (prefix) + 1 > GRUB_KERNEL_MACHINE_DATA_END)
     grub_util_error (_("prefix is too long"));
@@ -456,6 +987,145 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
     free (boot_img);
     free (boot_path);
   }
+#elif defined(GRUB_MACHINE_EFI)
+  {
+    void *pe_img;
+    size_t pe_size;
+    struct grub_pe32_header *header;
+    struct grub_pe32_coff_header *c;
+    struct grub_pe32_optional_header *o;
+    struct grub_pe32_section_table *text_section, *data_section;
+    struct grub_pe32_section_table *mods_section, *reloc_section;
+    static const grub_uint8_t stub[] = GRUB_PE32_MSDOS_STUB;
+    int header_size = ALIGN_UP (sizeof (struct grub_pe32_header)
+				+ 5 * sizeof (struct grub_pe32_section_table),
+				SECTION_ALIGN);
+    int reloc_addr = ALIGN_UP (header_size + core_size, SECTION_ALIGN);
+
+    pe_size = ALIGN_UP (reloc_addr + reloc_size, SECTION_ALIGN);
+    pe_img = xmalloc (reloc_addr + reloc_size);
+    memset (pe_img, 0, header_size);
+    memcpy (pe_img + header_size, core_img, core_size);
+    memcpy (pe_img + reloc_addr, rel_section, reloc_size);
+    header = pe_img;
+
+    /* The magic.  */
+    memcpy (header->msdos_stub, stub, sizeof (header->msdos_stub));
+    memcpy (header->signature, "PE\0\0", sizeof (header->signature));
+
+    /* The COFF file header.  */
+    c = &header->coff_header;
+#if GRUB_TARGET_SIZEOF_VOID_P == 4
+    c->machine = grub_host_to_target16 (GRUB_PE32_MACHINE_I386);
+#else
+    c->machine = grub_host_to_target16 (GRUB_PE32_MACHINE_X86_64);
+#endif
+
+    c->num_sections = grub_host_to_target16 (4);
+    c->time = grub_host_to_target32 (time (0));
+    c->optional_header_size = grub_host_to_target16 (sizeof (header->optional_header));
+    c->characteristics = grub_host_to_target16 (GRUB_PE32_EXECUTABLE_IMAGE
+						| GRUB_PE32_LINE_NUMS_STRIPPED
+#if GRUB_TARGET_SIZEOF_VOID_P == 4
+						| GRUB_PE32_32BIT_MACHINE
+#endif
+						| GRUB_PE32_LOCAL_SYMS_STRIPPED
+						| GRUB_PE32_DEBUG_STRIPPED);
+
+    /* The PE Optional header.  */
+    o = &header->optional_header;
+    o->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC);
+    o->code_size = grub_host_to_target32 (exec_size);
+    o->data_size = grub_cpu_to_le32 (reloc_addr - exec_size);
+    o->bss_size = grub_cpu_to_le32 (bss_size);
+    o->entry_addr = grub_cpu_to_le32 (start_address);
+    o->code_base = grub_cpu_to_le32 (header_size);
+#if GRUB_TARGET_SIZEOF_VOID_P == 4
+    o->data_base = grub_host_to_target32 (header_size + exec_size);
+#endif
+    o->image_base = 0;
+    o->section_alignment = grub_host_to_target32 (SECTION_ALIGN);
+    o->file_alignment = grub_host_to_target32 (SECTION_ALIGN);
+    o->image_size = grub_host_to_target32 (pe_size);
+    o->header_size = grub_host_to_target32 (header_size);
+    o->subsystem = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION);
+
+    /* Do these really matter? */
+    o->stack_reserve_size = grub_host_to_target32 (0x10000);
+    o->stack_commit_size = grub_host_to_target32 (0x10000);
+    o->heap_reserve_size = grub_host_to_target32 (0x10000);
+    o->heap_commit_size = grub_host_to_target32 (0x10000);
+    
+    o->num_data_directories = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES);
+
+    o->base_relocation_table.rva = grub_host_to_target32 (reloc_addr);
+    o->base_relocation_table.size = grub_host_to_target32 (reloc_size);
+
+    /* The sections.  */
+    text_section = (struct grub_pe32_section_table *) (header + 1);
+    strcpy (text_section->name, ".text");
+    text_section->virtual_size = grub_cpu_to_le32 (exec_size);
+    text_section->virtual_address = grub_cpu_to_le32 (header_size);
+    text_section->raw_data_size = grub_cpu_to_le32 (exec_size);
+    text_section->raw_data_offset = grub_cpu_to_le32 (header_size);
+    text_section->characteristics = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_CODE
+						      | GRUB_PE32_SCN_MEM_EXECUTE
+						      | GRUB_PE32_SCN_MEM_READ
+						      | GRUB_PE32_SCN_ALIGN_64BYTES);
+
+    data_section = text_section + 1;
+    strcpy (data_section->name, ".data");
+    data_section->virtual_size = grub_cpu_to_le32 (kernel_size - exec_size);
+    data_section->virtual_address = grub_cpu_to_le32 (header_size + exec_size);
+    data_section->raw_data_size = grub_cpu_to_le32 (kernel_size - exec_size);
+    data_section->raw_data_offset = grub_cpu_to_le32 (header_size + exec_size);
+    data_section->characteristics
+      = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
+			  | GRUB_PE32_SCN_MEM_READ
+			  | GRUB_PE32_SCN_MEM_WRITE
+			  | GRUB_PE32_SCN_ALIGN_64BYTES);
+
+#if 0
+    bss_section = data_section + 1;
+    strcpy (bss_section->name, ".bss");
+    bss_section->virtual_size = grub_cpu_to_le32 (bss_size);
+    bss_section->virtual_address = grub_cpu_to_le32 (header_size + kernel_size);
+    bss_section->raw_data_size = 0;
+    bss_section->raw_data_offset = 0;
+    bss_section->characteristics
+      = grub_cpu_to_le32 (GRUB_PE32_SCN_MEM_READ
+			  | GRUB_PE32_SCN_MEM_WRITE
+			  | GRUB_PE32_SCN_ALIGN_64BYTES
+			  | GRUB_PE32_SCN_CNT_INITIALIZED_DATA
+			  | 0x80);
+#endif
+    
+    mods_section = data_section + 1;
+    strcpy (mods_section->name, "mods");
+    mods_section->virtual_size = grub_cpu_to_le32 (reloc_addr - kernel_size - header_size);
+    mods_section->virtual_address = grub_cpu_to_le32 (header_size + kernel_size + bss_size);
+    mods_section->raw_data_size = grub_cpu_to_le32 (reloc_addr - kernel_size - header_size);
+    mods_section->raw_data_offset = grub_cpu_to_le32 (header_size + kernel_size);
+    mods_section->characteristics
+      = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
+			  | GRUB_PE32_SCN_MEM_READ
+			  | GRUB_PE32_SCN_MEM_WRITE
+			  | GRUB_PE32_SCN_ALIGN_64BYTES);
+
+    reloc_section = mods_section + 1;
+    strcpy (reloc_section->name, ".reloc");
+    reloc_section->virtual_size = grub_cpu_to_le32 (reloc_size);
+    reloc_section->virtual_address = grub_cpu_to_le32 (reloc_addr + bss_size);
+    reloc_section->raw_data_size = grub_cpu_to_le32 (reloc_size);
+    reloc_section->raw_data_offset = grub_cpu_to_le32 (reloc_addr);
+    reloc_section->characteristics
+      = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
+			  | GRUB_PE32_SCN_MEM_DISCARDABLE
+			  | GRUB_PE32_SCN_MEM_READ);
+    free (core_img);
+    core_img = pe_img;
+    core_size = pe_size;
+  }
 #elif defined(GRUB_MACHINE_QEMU)
   {
     char *rom_img;

From 287c2f24265a5e1ca5c4fe5a6322e9f54b4bb996 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 25 Apr 2010 19:39:22 +0200
Subject: [PATCH 0830/1628] Remove efi/grub-mkimage.c

---
 util/i386/efi/grub-mkimage.c | 1112 ----------------------------------
 1 file changed, 1112 deletions(-)
 delete mode 100644 util/i386/efi/grub-mkimage.c

diff --git a/util/i386/efi/grub-mkimage.c b/util/i386/efi/grub-mkimage.c
deleted file mode 100644
index f8c0f152e..000000000
--- a/util/i386/efi/grub-mkimage.c
+++ /dev/null
@@ -1,1112 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2004,2005,2006,2007,2008,2009  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 <stdio.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <grub/elf.h>
-#include <grub/util/misc.h>
-#include <grub/util/resolve.h>
-#include <grub/kernel.h>
-#include <grub/efi/pe32.h>
-#include <grub/machine/kernel.h>
-#include "progname.h"
-
-#if GRUB_TARGET_WORDSIZE == 32
-# define grub_le_to_cpu(val) grub_le_to_cpu32(val)
-#elif GRUB_TARGET_WORDSIZE == 64
-# define grub_le_to_cpu(val) grub_le_to_cpu64(val)
-#endif
-
-static const grub_uint8_t stub[] = GRUB_PE32_MSDOS_STUB;
-
-static inline Elf_Addr
-align_address (Elf_Addr addr, unsigned alignment)
-{
-  return (addr + alignment - 1) & ~(alignment - 1);
-}
-
-static inline Elf_Addr
-align_pe32_section (Elf_Addr addr)
-{
-  return align_address (addr, GRUB_PE32_SECTION_ALIGNMENT);
-}
-
-/* Read the whole kernel image. Return the pointer to a read image,
-   and store the size in bytes in *SIZE.  */
-static char *
-read_kernel_image (const char *dir, size_t *size)
-{
-  char *kernel_image;
-  char *kernel_path;
-
-  kernel_path = grub_util_get_path (dir, "kernel.img");
-  *size = grub_util_get_image_size (kernel_path);
-  kernel_image = grub_util_read_image (kernel_path);
-  free (kernel_path);
-
-  return kernel_image;
-}
-
-/* Return if the ELF header is valid.  */
-static int
-check_elf_header (Elf_Ehdr *e, size_t size)
-{
-  if (size < sizeof (*e)
-      || e->e_ident[EI_MAG0] != ELFMAG0
-      || e->e_ident[EI_MAG1] != ELFMAG1
-      || e->e_ident[EI_MAG2] != ELFMAG2
-      || e->e_ident[EI_MAG3] != ELFMAG3
-      || e->e_ident[EI_VERSION] != EV_CURRENT
-      || e->e_version != grub_cpu_to_le32 (EV_CURRENT)
-      || ((e->e_ident[EI_CLASS] != ELFCLASS32) &&
-          (e->e_ident[EI_CLASS] != ELFCLASS64))
-      || e->e_ident[EI_DATA] != ELFDATA2LSB
-      || ((e->e_machine != grub_cpu_to_le16 (EM_386)) &&
-          (e->e_machine != grub_cpu_to_le16 (EM_X86_64))))
-    return 0;
-
-  return 1;
-}
-
-/* Return the starting address right after the header,
-   aligned by the section alignment. Allocate 4 section tables for
-   .text, .data, .reloc, and mods.  */
-static Elf_Addr
-get_starting_section_address (void)
-{
-  return align_pe32_section (sizeof (struct grub_pe32_header)
-			     + 4 * sizeof (struct grub_pe32_section_table));
-}
-
-/* Determine if this section is a text section. Return false if this
-   section is not allocated.  */
-static int
-is_text_section (Elf_Shdr *s)
-{
-  return ((s->sh_flags & grub_cpu_to_le32 (SHF_EXECINSTR | SHF_ALLOC))
-	  == grub_cpu_to_le32 (SHF_EXECINSTR | SHF_ALLOC));
-}
-
-/* Determine if this section is a data section. This assumes that
-   BSS is also a data section, since the converter initializes BSS
-   when producing PE32 to avoid a bug in EFI implementations.  */
-static int
-is_data_section (Elf_Shdr *s)
-{
-  return (s->sh_flags & grub_cpu_to_le32 (SHF_ALLOC)
-	  && ! (s->sh_flags & grub_cpu_to_le32 (SHF_EXECINSTR)));
-}
-
-/* Locate section addresses by merging code sections and data sections
-   into .text and .data, respectively. Return the array of section
-   addresses.  */
-static Elf_Addr *
-locate_sections (Elf_Shdr *sections, Elf_Half section_entsize,
-		 Elf_Half num_sections, const char *strtab)
-{
-  int i;
-  Elf_Addr current_address;
-  Elf_Addr *section_addresses;
-  Elf_Shdr *s;
-
-  section_addresses = xmalloc (sizeof (*section_addresses) * num_sections);
-  memset (section_addresses, 0, sizeof (*section_addresses) * num_sections);
-
-  current_address = get_starting_section_address ();
-
-  /* .text */
-  for (i = 0, s = sections;
-       i < num_sections;
-       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-    if (is_text_section (s))
-      {
-	Elf_Word align = grub_le_to_cpu32 (s->sh_addralign);
-	const char *name = strtab + grub_le_to_cpu32 (s->sh_name);
-
-	if (align)
-	  current_address = align_address (current_address, align);
-
-	grub_util_info ("locating the section %s at 0x%x",
-			name, current_address);
-	section_addresses[i] = current_address;
-	current_address += grub_le_to_cpu32 (s->sh_size);
-      }
-
-  current_address = align_pe32_section (current_address);
-
-  /* .data */
-  for (i = 0, s = sections;
-       i < num_sections;
-       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-    if (is_data_section (s))
-      {
-	Elf_Word align = grub_le_to_cpu32 (s->sh_addralign);
-	const char *name = strtab + grub_le_to_cpu32 (s->sh_name);
-
-	if (align)
-	  current_address = align_address (current_address, align);
-
-	grub_util_info ("locating the section %s at 0x%x",
-			name, current_address);
-	section_addresses[i] = current_address;
-	current_address += grub_le_to_cpu32 (s->sh_size);
-      }
-
-  return section_addresses;
-}
-
-/* Return the symbol table section, if any.  */
-static Elf_Shdr *
-find_symtab_section (Elf_Shdr *sections,
-		     Elf_Half section_entsize, Elf_Half num_sections)
-{
-  int i;
-  Elf_Shdr *s;
-
-  for (i = 0, s = sections;
-       i < num_sections;
-       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-    if (s->sh_type == grub_cpu_to_le32 (SHT_SYMTAB))
-      return s;
-
-  return 0;
-}
-
-/* Return the address of the string table.  */
-static const char *
-find_strtab (Elf_Ehdr *e, Elf_Shdr *sections, Elf_Half section_entsize)
-{
-  Elf_Shdr *s;
-  char *strtab;
-
-  s = (Elf_Shdr *) ((char *) sections
-		      + grub_le_to_cpu16 (e->e_shstrndx) * section_entsize);
-  strtab = (char *) e + grub_le_to_cpu32 (s->sh_offset);
-  return strtab;
-}
-
-/* Relocate symbols; note that this function overwrites the symbol table.
-   Return the address of a start symbol.  */
-static Elf_Addr
-relocate_symbols (Elf_Ehdr *e, Elf_Shdr *sections,
-		  Elf_Shdr *symtab_section, Elf_Addr *section_addresses,
-		  Elf_Half section_entsize, Elf_Half num_sections)
-{
-  Elf_Word symtab_size, sym_size, num_syms;
-  Elf_Off symtab_offset;
-  Elf_Addr start_address = 0;
-  Elf_Sym *sym;
-  Elf_Word i;
-  Elf_Shdr *strtab_section;
-  const char *strtab;
-
-  strtab_section
-    = (Elf_Shdr *) ((char *) sections
-		      + (grub_le_to_cpu32 (symtab_section->sh_link)
-			 * section_entsize));
-  strtab = (char *) e + grub_le_to_cpu32 (strtab_section->sh_offset);
-
-  symtab_size = grub_le_to_cpu32 (symtab_section->sh_size);
-  sym_size = grub_le_to_cpu32 (symtab_section->sh_entsize);
-  symtab_offset = grub_le_to_cpu32 (symtab_section->sh_offset);
-  num_syms = symtab_size / sym_size;
-
-  for (i = 0, sym = (Elf_Sym *) ((char *) e + symtab_offset);
-       i < num_syms;
-       i++, sym = (Elf_Sym *) ((char *) sym + sym_size))
-    {
-      Elf_Section index;
-      const char *name;
-
-      name = strtab + grub_le_to_cpu32 (sym->st_name);
-
-      index = grub_le_to_cpu16 (sym->st_shndx);
-      if (index == STN_ABS)
-        {
-          continue;
-        }
-      else if ((index == STN_UNDEF))
-	{
-	  if (sym->st_name)
-	    grub_util_error ("undefined symbol %s", name);
-	  else
-	    continue;
-	}
-      else if (index >= num_sections)
-	grub_util_error ("section %d does not exist", index);
-
-      sym->st_value = (grub_le_to_cpu32 (sym->st_value)
-		       + section_addresses[index]);
-      grub_util_info ("locating %s at 0x%x", name, sym->st_value);
-
-      if (! start_address)
-	if (strcmp (name, "_start") == 0 || strcmp (name, "start") == 0)
-	  start_address = sym->st_value;
-    }
-
-  return start_address;
-}
-
-/* Return the address of a symbol at the index I in the section S.  */
-static Elf_Addr
-get_symbol_address (Elf_Ehdr *e, Elf_Shdr *s, Elf_Word i)
-{
-  Elf_Sym *sym;
-
-  sym = (Elf_Sym *) ((char *) e
-		       + grub_le_to_cpu32 (s->sh_offset)
-		       + i * grub_le_to_cpu32 (s->sh_entsize));
-  return sym->st_value;
-}
-
-/* Return the address of a modified value.  */
-static Elf_Addr *
-get_target_address (Elf_Ehdr *e, Elf_Shdr *s, Elf_Addr offset)
-{
-  return (Elf_Addr *) ((char *) e + grub_le_to_cpu32 (s->sh_offset) + offset);
-}
-
-/* Deal with relocation information. This function relocates addresses
-   within the virtual address space starting from 0. So only relative
-   addresses can be fully resolved. Absolute addresses must be relocated
-   again by a PE32 relocator when loaded.  */
-static void
-relocate_addresses (Elf_Ehdr *e, Elf_Shdr *sections,
-		    Elf_Addr *section_addresses,
-		    Elf_Half section_entsize, Elf_Half num_sections,
-		    const char *strtab)
-{
-  Elf_Half i;
-  Elf_Shdr *s;
-
-  for (i = 0, s = sections;
-       i < num_sections;
-       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-    if ((s->sh_type == grub_cpu_to_le32 (SHT_REL)) ||
-        (s->sh_type == grub_cpu_to_le32 (SHT_RELA)))
-      {
-	Elf_Rela *r;
-	Elf_Word rtab_size, r_size, num_rs;
-	Elf_Off rtab_offset;
-	Elf_Shdr *symtab_section;
-	Elf_Word target_section_index;
-	Elf_Addr target_section_addr;
-	Elf_Shdr *target_section;
-	Elf_Word j;
-
-	symtab_section = (Elf_Shdr *) ((char *) sections
-					 + (grub_le_to_cpu32 (s->sh_link)
-					    * section_entsize));
-	target_section_index = grub_le_to_cpu32 (s->sh_info);
-	target_section_addr = section_addresses[target_section_index];
-	target_section = (Elf_Shdr *) ((char *) sections
-					 + (target_section_index
-					    * section_entsize));
-
-	grub_util_info ("dealing with the relocation section %s for %s",
-			strtab + grub_le_to_cpu32 (s->sh_name),
-			strtab + grub_le_to_cpu32 (target_section->sh_name));
-
-	rtab_size = grub_le_to_cpu32 (s->sh_size);
-	r_size = grub_le_to_cpu32 (s->sh_entsize);
-	rtab_offset = grub_le_to_cpu32 (s->sh_offset);
-	num_rs = rtab_size / r_size;
-
-	for (j = 0, r = (Elf_Rela *) ((char *) e + rtab_offset);
-	     j < num_rs;
-	     j++, r = (Elf_Rela *) ((char *) r + r_size))
-	  {
-            Elf_Addr info;
-	    Elf_Addr offset;
-	    Elf_Addr sym_addr;
-	    Elf_Addr *target;
-	    Elf_Addr addend;
-
-	    offset = grub_le_to_cpu (r->r_offset);
-	    target = get_target_address (e, target_section, offset);
-	    info = grub_le_to_cpu (r->r_info);
-	    sym_addr = get_symbol_address (e, symtab_section,
-					   ELF_R_SYM (info));
-
-            addend = (s->sh_type == grub_cpu_to_le32 (SHT_RELA)) ?
-	      r->r_addend : 0;
-
-            switch (ELF_R_TYPE (info))
-	      {
-#if GRUB_TARGET_SIZEOF_VOID_P == 4
-	      case R_386_NONE:
-		break;
-
-	      case R_386_32:
-		/* This is absolute.  */
-		*target = grub_cpu_to_le32 (grub_le_to_cpu32 (*target)
-                                            + addend + sym_addr);
-		grub_util_info ("relocating an R_386_32 entry to 0x%x at the offset 0x%x",
-				*target, offset);
-		break;
-
-	      case R_386_PC32:
-		/* This is relative.  */
-		*target = grub_cpu_to_le32 (grub_le_to_cpu32 (*target)
-					    + addend + sym_addr
-					    - target_section_addr - offset);
-		grub_util_info ("relocating an R_386_PC32 entry to 0x%x at the offset 0x%x",
-				*target, offset);
-		break;
-
-#else
-
-              case R_X86_64_NONE:
-                break;
-
-              case R_X86_64_64:
-		*target = grub_cpu_to_le64 (grub_le_to_cpu64 (*target)
-					    + addend + sym_addr);
-		grub_util_info ("relocating an R_X86_64_64 entry to 0x%llx at the offset 0x%llx",
-				*target, offset);
-		break;
-
-              case R_X86_64_PC32:
-                {
-                  grub_uint32_t *t32 = (grub_uint32_t *) target;
-                  *t32 = grub_cpu_to_le64 (grub_le_to_cpu32 (*t32)
-                                           + addend + sym_addr
-                                           - target_section_addr - offset);
-                  grub_util_info ("relocating an R_X86_64_PC32 entry to 0x%x at the offset 0x%llx",
-                                  *t32, offset);
-                  break;
-                }
-
-              case R_X86_64_32:
-              case R_X86_64_32S:
-                {
-                  grub_uint32_t *t32 = (grub_uint32_t *) target;
-                  *t32 = grub_cpu_to_le64 (grub_le_to_cpu32 (*t32)
-                                           + addend + sym_addr);
-                  grub_util_info ("relocating an R_X86_64_32(S) entry to 0x%x at the offset 0x%llx",
-                                  *t32, offset);
-                  break;
-                }
-
-#endif
-	      default:
-		grub_util_error ("unknown relocation type %d",
-				 ELF_R_TYPE (info));
-		break;
-	      }
-	  }
-      }
-}
-
-void
-write_padding (FILE *out, size_t size)
-{
-  size_t i;
-
-  for (i = 0; i < size; i++)
-    if (fputc (0, out) == EOF)
-      grub_util_error ("padding failed");
-}
-
-/* Add a PE32's fixup entry for a relocation. Return the resulting address
-   after having written to the file OUT.  */
-Elf_Addr
-add_fixup_entry (struct grub_pe32_fixup_block **block, grub_uint16_t type,
-		 Elf_Addr addr, int flush, Elf_Addr current_address,
-		 FILE *out)
-{
-  struct grub_pe32_fixup_block *b = *block;
-
-  /* First, check if it is necessary to write out the current block.  */
-  if (b)
-    {
-      if (flush || addr < b->page_rva || b->page_rva + 0x1000 <= addr)
-	{
-	  grub_uint32_t size;
-
-	  if (flush)
-	    {
-	      /* Add as much padding as necessary to align the address
-		 with a section boundary.  */
-	      Elf_Addr next_address;
-	      unsigned padding_size;
-              size_t index;
-
-	      next_address = current_address + b->block_size;
-	      padding_size = ((align_pe32_section (next_address)
-			       - next_address)
-			      >> 1);
-              index = ((b->block_size - sizeof (*b)) >> 1);
-              grub_util_info ("adding %d padding fixup entries", padding_size);
-	      while (padding_size--)
-		{
-		  b->entries[index++] = 0;
-		  b->block_size += 2;
-		}
-	    }
-          else if (b->block_size & (8 - 1))
-            {
-	      /* If not aligned with a 32-bit boundary, add
-		 a padding entry.  */
-              size_t index;
-
-              grub_util_info ("adding a padding fixup entry");
-              index = ((b->block_size - sizeof (*b)) >> 1);
-              b->entries[index] = 0;
-              b->block_size += 2;
-            }
-
-          /* Flush it.  */
-          grub_util_info ("writing %d bytes of a fixup block starting at 0x%x",
-                          b->block_size, b->page_rva);
-          size = b->block_size;
-	  current_address += size;
-	  b->page_rva = grub_cpu_to_le32 (b->page_rva);
-	  b->block_size = grub_cpu_to_le32 (b->block_size);
-	  if (fwrite (b, size, 1, out) != 1)
-	    grub_util_error ("write failed");
-	  free (b);
-	  *block = b = 0;
-	}
-    }
-
-  if (! flush)
-    {
-      grub_uint16_t entry;
-      size_t index;
-
-      /* If not allocated yet, allocate a block with enough entries.  */
-      if (! b)
-	{
-	  *block = b = xmalloc (sizeof (*b) + 2 * 0x1000);
-
-	  /* The spec does not mention the requirement of a Page RVA.
-	     Here, align the address with a 4K boundary for safety.  */
-	  b->page_rva = (addr & ~(0x1000 - 1));
-	  b->block_size = sizeof (*b);
-	}
-
-      /* Sanity check.  */
-      if (b->block_size >= sizeof (*b) + 2 * 0x1000)
-	grub_util_error ("too many fixup entries");
-
-      /* Add a new entry.  */
-      index = ((b->block_size - sizeof (*b)) >> 1);
-      entry = GRUB_PE32_FIXUP_ENTRY (type, addr - b->page_rva);
-      b->entries[index] = grub_cpu_to_le16 (entry);
-      b->block_size += 2;
-    }
-
-  return current_address;
-}
-
-/* Write out zeros to make space for the header.  */
-static Elf_Addr
-make_header_space (FILE *out)
-{
-  Elf_Addr addr;
-
-  addr = get_starting_section_address ();
-  write_padding (out, addr);
-
-  return addr;
-}
-
-/* Write text sections.  */
-static Elf_Addr
-write_text_sections (FILE *out, Elf_Addr current_address,
-		     Elf_Ehdr *e, Elf_Shdr *sections,
-		     Elf_Half section_entsize, Elf_Half num_sections,
-		     const char *strtab)
-{
-  Elf_Half i;
-  Elf_Shdr *s;
-  Elf_Addr addr;
-
-  for (i = 0, s = sections;
-       i < num_sections;
-       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-    if (is_text_section (s))
-      {
-	Elf_Word align = grub_le_to_cpu32 (s->sh_addralign);
-	Elf_Off offset = grub_le_to_cpu32 (s->sh_offset);
-	Elf_Word size = grub_le_to_cpu32 (s->sh_size);
-	const char *name = strtab + grub_le_to_cpu32 (s->sh_name);
-
-	if (align)
-	  {
-	    addr = align_address (current_address, align);
-	    if (current_address != addr)
-	      {
-		grub_util_info ("padding %d bytes for the ELF section alignment",
-				addr - current_address);
-		write_padding (out, addr - current_address);
-		current_address = addr;
-	      }
-	  }
-
-	grub_util_info ("writing the text section %s at 0x%x",
-			name, current_address);
-
-	if (fwrite ((char *) e + offset, size, 1, out) != 1)
-	  grub_util_error ("write failed");
-
-	current_address += size;
-      }
-
-  addr = align_pe32_section (current_address);
-  if (addr != current_address)
-    {
-      grub_util_info ("padding %d bytes for the PE32 section alignment",
-		      addr - current_address);
-      write_padding (out, addr - current_address);
-    }
-
-  return addr;
-}
-
-/* Write data sections.  */
-static Elf_Addr
-write_data_sections (FILE *out, Elf_Addr current_address,
-		     Elf_Ehdr *e, Elf_Shdr *sections,
-		     Elf_Half section_entsize, Elf_Half num_sections,
-		     const char *strtab)
-{
-  Elf_Half i;
-  Elf_Shdr *s;
-  Elf_Addr addr;
-
-  for (i = 0, s = sections;
-       i < num_sections;
-       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-    if (is_data_section (s))
-      {
-	Elf_Word align = grub_le_to_cpu32 (s->sh_addralign);
-	Elf_Off offset = grub_le_to_cpu32 (s->sh_offset);
-	Elf_Word size = grub_le_to_cpu32 (s->sh_size);
-	const char *name = strtab + grub_le_to_cpu32 (s->sh_name);
-
-	if (align)
-	  {
-	    addr = align_address (current_address, align);
-	    if (current_address != addr)
-	      {
-		grub_util_info ("padding %d bytes for the ELF section alignment",
-				addr - current_address);
-		write_padding (out, addr - current_address);
-		current_address = addr;
-	      }
-	  }
-
-	grub_util_info ("writing the data section %s at 0x%x",
-			name, current_address);
-
-	if (s->sh_type == grub_cpu_to_le32 (SHT_NOBITS))
-	  write_padding (out, size);
-	else
-	  if (fwrite ((char *) e + offset, size, 1, out) != 1)
-	    grub_util_error ("write failed");
-
-	current_address += size;
-      }
-
-  addr = align_pe32_section (current_address);
-  if (addr != current_address)
-    {
-      grub_util_info ("padding %d bytes for the PE32 section alignment",
-		      addr - current_address);
-      write_padding (out, addr - current_address);
-    }
-
-  return addr;
-}
-
-/* Write modules.  */
-static Elf_Addr
-make_mods_section (FILE *out, Elf_Addr current_address,
-		   const char *dir, char *mods[])
-{
-  struct grub_util_path_list *path_list;
-  grub_size_t total_module_size;
-  struct grub_util_path_list *p;
-  struct grub_module_info modinfo;
-  Elf_Addr addr;
-
-  memset (&modinfo, 0, sizeof (modinfo));
-
-  path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods);
-
-  total_module_size = sizeof (struct grub_module_info);
-  for (p = path_list; p; p = p->next)
-    {
-      total_module_size += (grub_util_get_image_size (p->name)
-			    + sizeof (struct grub_module_header));
-    }
-
-  grub_util_info ("the total module size is 0x%x", total_module_size);
-
-  modinfo.magic = grub_cpu_to_le32 (GRUB_MODULE_MAGIC);
-  modinfo.offset = grub_cpu_to_le32 (sizeof (modinfo));
-  modinfo.size = grub_cpu_to_le32 (total_module_size);
-
-  if (fwrite (&modinfo, sizeof (modinfo), 1, out) != 1)
-    grub_util_error ("write failed");
-
-  for (p = path_list; p; p = p->next)
-    {
-      struct grub_module_header header;
-      size_t mod_size;
-      char *mod_image;
-
-      memset (&header, 0, sizeof (header));
-
-      grub_util_info ("adding module %s", p->name);
-
-      mod_size = grub_util_get_image_size (p->name);
-      header.type = OBJ_TYPE_ELF;
-      header.size = grub_host_to_target32 (mod_size + sizeof (header));
-
-      mod_image = grub_util_read_image (p->name);
-
-      if (fwrite (&header, sizeof (header), 1, out) != 1
-	  || fwrite (mod_image, mod_size, 1, out) != 1)
-	grub_util_error ("write failed");
-
-      free (mod_image);
-    }
-
-  for (p = path_list; p; )
-    {
-      struct grub_util_path_list *q;
-
-      q = p->next;
-      free (p);
-      p = q;
-    }
-
-  current_address += total_module_size;
-
-  addr = align_pe32_section (current_address);
-  if (addr != current_address)
-    {
-      grub_util_info ("padding %d bytes for the PE32 section alignment",
-		      addr - current_address);
-      write_padding (out, addr - current_address);
-    }
-
-  return addr;
-}
-
-/* Make a .reloc section.  */
-static Elf_Addr
-make_reloc_section (FILE *out, Elf_Addr current_address, Elf_Ehdr *e,
-		    Elf_Addr *section_addresses, Elf_Shdr *sections,
-		    Elf_Half section_entsize, Elf_Half num_sections,
-		    const char *strtab)
-{
-  Elf_Half i;
-  Elf_Shdr *s;
-  struct grub_pe32_fixup_block *fixup_block = 0;
-
-  for (i = 0, s = sections;
-       i < num_sections;
-       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-    if ((s->sh_type == grub_cpu_to_le32 (SHT_REL)) ||
-        (s->sh_type == grub_cpu_to_le32 (SHT_RELA)))
-      {
-	Elf_Rel *r;
-	Elf_Word rtab_size, r_size, num_rs;
-	Elf_Off rtab_offset;
-	Elf_Addr section_address;
-	Elf_Word j;
-
-	grub_util_info ("translating the relocation section %s",
-			strtab + grub_le_to_cpu32 (s->sh_name));
-
-	rtab_size = grub_le_to_cpu32 (s->sh_size);
-	r_size = grub_le_to_cpu32 (s->sh_entsize);
-	rtab_offset = grub_le_to_cpu32 (s->sh_offset);
-	num_rs = rtab_size / r_size;
-
-	section_address = section_addresses[grub_le_to_cpu32 (s->sh_info)];
-
-	for (j = 0, r = (Elf_Rel *) ((char *) e + rtab_offset);
-	     j < num_rs;
-	     j++, r = (Elf_Rel *) ((char *) r + r_size))
-	  {
-	    Elf_Addr info;
-	    Elf_Addr offset;
-
-	    offset = grub_le_to_cpu32 (r->r_offset);
-	    info = grub_le_to_cpu32 (r->r_info);
-
-	    /* Necessary to relocate only absolute addresses.  */
-#if GRUB_TARGET_SIZEOF_VOID_P == 4
-	    if (ELF_R_TYPE (info) == R_386_32)
-	      {
-		Elf_Addr addr;
-
-		addr = section_address + offset;
-		grub_util_info ("adding a relocation entry for 0x%x", addr);
-		current_address = add_fixup_entry (&fixup_block,
-						   GRUB_PE32_REL_BASED_HIGHLOW,
-						   addr, 0, current_address,
-						   out);
-	      }
-#else
-	    if ((ELF_R_TYPE (info) == R_X86_64_32) ||
-                (ELF_R_TYPE (info) == R_X86_64_32S))
-	      {
-		grub_util_error ("can\'t add fixup entry for R_X86_64_32(S)");
-	      }
-	    else if (ELF_R_TYPE (info) == R_X86_64_64)
-	      {
-		Elf_Addr addr;
-
-		addr = section_address + offset;
-		grub_util_info ("adding a relocation entry for 0x%llx", addr);
-		current_address = add_fixup_entry (&fixup_block,
-						   GRUB_PE32_REL_BASED_DIR64,
-						   addr,
-						   0, current_address,
-						   out);
-	      }
-#endif
-	  }
-      }
-
-  current_address = add_fixup_entry (&fixup_block, 0, 0, 1,
-				     current_address, out);
-
-  return current_address;
-}
-
-/* Create the header.  */
-static void
-make_header (FILE *out, Elf_Addr text_address, Elf_Addr data_address,
-	     Elf_Addr mods_address, Elf_Addr reloc_address,
-	     Elf_Addr end_address, Elf_Addr start_address)
-{
-  struct grub_pe32_header header;
-  struct grub_pe32_coff_header *c;
-  struct grub_pe32_optional_header *o;
-  struct grub_pe32_section_table text_section, data_section;
-  struct grub_pe32_section_table mods_section, reloc_section;
-
-  /* The magic.  */
-  memset (&header, 0, sizeof (header));
-  memcpy (header.msdos_stub, stub, sizeof (header.msdos_stub));
-  memcpy (header.signature, "PE\0\0", sizeof (header.signature));
-
-  /* The COFF file header.  */
-  c = &header.coff_header;
-#if GRUB_TARGET_SIZEOF_VOID_P == 4
-  c->machine = grub_cpu_to_le16 (GRUB_PE32_MACHINE_I386);
-#else
-  c->machine = grub_cpu_to_le16 (GRUB_PE32_MACHINE_X86_64);
-#endif
-
-  c->num_sections = grub_cpu_to_le16 (4);
-  c->time = grub_cpu_to_le32 (time (0));
-  c->optional_header_size = grub_cpu_to_le16 (sizeof (header.optional_header));
-  c->characteristics = grub_cpu_to_le16 (GRUB_PE32_EXECUTABLE_IMAGE
-					 | GRUB_PE32_LINE_NUMS_STRIPPED
-#if GRUB_TARGET_SIZEOF_VOID_P == 4
-                                         | GRUB_PE32_32BIT_MACHINE
-#endif
-					 | GRUB_PE32_LOCAL_SYMS_STRIPPED
-                                         | GRUB_PE32_DEBUG_STRIPPED);
-
-  /* The PE Optional header.  */
-  o = &header.optional_header;
-  o->magic = grub_cpu_to_le16 (GRUB_PE32_PE32_MAGIC);
-  o->code_size = grub_cpu_to_le32 (data_address - text_address);
-  o->data_size = grub_cpu_to_le32 (reloc_address - data_address);
-  o->bss_size = 0;
-  o->entry_addr = grub_cpu_to_le32 (start_address);
-  o->code_base = grub_cpu_to_le32 (text_address);
-#if GRUB_TARGET_SIZEOF_VOID_P == 4
-  o->data_base = grub_cpu_to_le32 (data_address);
-#endif
-  o->image_base = 0;
-  o->section_alignment = grub_cpu_to_le32 (GRUB_PE32_SECTION_ALIGNMENT);
-  o->file_alignment = grub_cpu_to_le32 (GRUB_PE32_FILE_ALIGNMENT);
-  o->image_size = grub_cpu_to_le32 (end_address);
-  o->header_size = grub_cpu_to_le32 (text_address);
-  o->subsystem = grub_cpu_to_le16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION);
-
-  /* Do these really matter? */
-  o->stack_reserve_size = grub_cpu_to_le32 (0x10000);
-  o->stack_commit_size = grub_cpu_to_le32 (0x10000);
-  o->heap_reserve_size = grub_cpu_to_le32 (0x10000);
-  o->heap_commit_size = grub_cpu_to_le32 (0x10000);
-
-  o->num_data_directories = grub_cpu_to_le32 (GRUB_PE32_NUM_DATA_DIRECTORIES);
-
-  o->base_relocation_table.rva = grub_cpu_to_le32 (reloc_address);
-  o->base_relocation_table.size = grub_cpu_to_le32 (end_address
-						    - reloc_address);
-
-  /* The sections.  */
-  memset (&text_section, 0, sizeof (text_section));
-  strcpy (text_section.name, ".text");
-  text_section.virtual_size = grub_cpu_to_le32 (data_address - text_address);
-  text_section.virtual_address = grub_cpu_to_le32 (text_address);
-  text_section.raw_data_size = grub_cpu_to_le32 (data_address - text_address);
-  text_section.raw_data_offset = grub_cpu_to_le32 (text_address);
-  text_section.characteristics = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_CODE
-						   | GRUB_PE32_SCN_MEM_EXECUTE
-						   | GRUB_PE32_SCN_MEM_READ);
-
-  memset (&data_section, 0, sizeof (data_section));
-  strcpy (data_section.name, ".data");
-  data_section.virtual_size = grub_cpu_to_le32 (mods_address - data_address);
-  data_section.virtual_address = grub_cpu_to_le32 (data_address);
-  data_section.raw_data_size = grub_cpu_to_le32 (mods_address - data_address);
-  data_section.raw_data_offset = grub_cpu_to_le32 (data_address);
-  data_section.characteristics
-    = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
-			| GRUB_PE32_SCN_MEM_READ
-			| GRUB_PE32_SCN_MEM_WRITE);
-
-  memset (&mods_section, 0, sizeof (mods_section));
-  strcpy (mods_section.name, "mods");
-  mods_section.virtual_size = grub_cpu_to_le32 (reloc_address - mods_address);
-  mods_section.virtual_address = grub_cpu_to_le32 (mods_address);
-  mods_section.raw_data_size = grub_cpu_to_le32 (reloc_address - mods_address);
-  mods_section.raw_data_offset = grub_cpu_to_le32 (mods_address);
-  mods_section.characteristics
-    = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
-			| GRUB_PE32_SCN_MEM_READ
-			| GRUB_PE32_SCN_MEM_WRITE);
-
-  memset (&reloc_section, 0, sizeof (reloc_section));
-  strcpy (reloc_section.name, ".reloc");
-  reloc_section.virtual_size = grub_cpu_to_le32 (end_address - reloc_address);
-  reloc_section.virtual_address = grub_cpu_to_le32 (reloc_address);
-  reloc_section.raw_data_size = grub_cpu_to_le32 (end_address - reloc_address);
-  reloc_section.raw_data_offset = grub_cpu_to_le32 (reloc_address);
-  reloc_section.characteristics
-    = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
-			| GRUB_PE32_SCN_MEM_DISCARDABLE
-			| GRUB_PE32_SCN_MEM_READ);
-
-  /* Write them out.  */
-  if (fseeko (out, 0, SEEK_SET) < 0)
-    grub_util_error ("seek failed");
-
-  if (fwrite (&header, sizeof (header), 1, out) != 1
-      || fwrite (&text_section, sizeof (text_section), 1, out) != 1
-      || fwrite (&data_section, sizeof (data_section), 1, out) != 1
-      || fwrite (&mods_section, sizeof (mods_section), 1, out) != 1
-      || fwrite (&reloc_section, sizeof (reloc_section), 1, out) != 1)
-    grub_util_error ("write failed");
-}
-
-/* Convert an ELF relocatable object into an EFI Application (PE32).  */
-void
-convert_elf (const char *dir, char *prefix, FILE *out, char *mods[])
-{
-  char *kernel_image;
-  size_t kernel_size;
-  const char *strtab;
-  Elf_Ehdr *e;
-  Elf_Shdr *sections;
-  Elf_Off section_offset;
-  Elf_Half section_entsize;
-  Elf_Half num_sections;
-  Elf_Addr *section_addresses;
-  Elf_Shdr *symtab_section;
-  Elf_Addr start_address;
-  Elf_Addr text_address, data_address, reloc_address, mods_address;
-  Elf_Addr end_address;
-  Elf_Shdr *s;
-  int i;
-
-  /* Get the kernel image and check the format.  */
-  kernel_image = read_kernel_image (dir, &kernel_size);
-  e = (Elf_Ehdr *) kernel_image;
-  if (! check_elf_header (e, kernel_size))
-    grub_util_error ("invalid ELF header");
-
-  section_offset = grub_cpu_to_le32 (e->e_shoff);
-  section_entsize = grub_cpu_to_le16 (e->e_shentsize);
-  num_sections = grub_cpu_to_le16 (e->e_shnum);
-
-  if (kernel_size < section_offset + section_entsize * num_sections)
-    grub_util_error ("invalid ELF format");
-
-  sections = (Elf_Shdr *) (kernel_image + section_offset);
-  strtab = find_strtab (e, sections, section_entsize);
-
-  for (i = 0, s = sections;
-       i < num_sections;
-       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-    if (is_text_section (s))
-      {
-	  Elf_Off offset = grub_le_to_cpu32 (s->sh_offset);
-
-	  if (GRUB_KERNEL_MACHINE_PREFIX + strlen (prefix) + 1 > GRUB_KERNEL_MACHINE_DATA_END)
-	    grub_util_error ("prefix too long");
-
-	  strcpy (kernel_image + offset + GRUB_KERNEL_MACHINE_PREFIX, prefix);
-	  break;
-      }
-
-  /* Relocate sections then symbols in the virtual address space.  */
-  section_addresses = locate_sections (sections, section_entsize,
-				       num_sections, strtab);
-
-  symtab_section = find_symtab_section (sections,
-					section_entsize, num_sections);
-  if (! symtab_section)
-    grub_util_error ("no symbol table");
-
-  start_address = relocate_symbols (e, sections, symtab_section,
-				    section_addresses, section_entsize,
-				    num_sections);
-  if (start_address == 0)
-    grub_util_error ("start symbol is not defined");
-
-  /* Resolve addresses in the virtual address space.  */
-  relocate_addresses (e, sections, section_addresses, section_entsize,
-		      num_sections, strtab);
-
-  /* Generate a PE32 image file. The strategy is to dump binary data first,
-     then fill up the header.  */
-  text_address = make_header_space (out);
-  data_address = write_text_sections (out, text_address, e, sections,
-				      section_entsize, num_sections,
-				      strtab);
-  mods_address = write_data_sections (out, data_address, e, sections,
-				      section_entsize, num_sections,
-				      strtab);
-  reloc_address = make_mods_section (out, mods_address, dir, mods);
-  end_address = make_reloc_section (out, reloc_address, e, section_addresses,
-				    sections, section_entsize, num_sections,
-				    strtab);
-  make_header (out, text_address, data_address, mods_address,
-	       reloc_address, end_address, start_address);
-
-  /* Clean up.  */
-  free (section_addresses);
-  free (kernel_image);
-}
-
-static struct option options[] =
-  {
-    {"directory", required_argument, 0, 'd'},
-    {"prefix", required_argument, 0, 'p'},
-    {"output", required_argument, 0, 'o'},
-    {"help", no_argument, 0, 'h'},
-    {"version", no_argument, 0, 'V'},
-    {"verbose", no_argument, 0, 'v'},
-    { 0, 0, 0, 0 }
-  };
-
-static void
-usage (int status)
-{
-  if (status)
-    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
-  else
-    printf ("\
-Usage: %s -o FILE [OPTION]... [MODULES]\n\
-\n\
-Make a bootable image of GRUB.\n\
-\n\
-  -d, --directory=DIR     use images and modules under DIR [default=%s]\n\
-  -p, --prefix=DIR        set grub_prefix directory [default=%s]\n\
-  -o, --output=FILE       output a generated image to FILE\n\
-  -h, --help              display this message and exit\n\
-  -V, --version           print version information and exit\n\
-  -v, --verbose           print verbose messages\n\
-\n\
-Report bugs to <%s>.\n\
-", program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY, PACKAGE_BUGREPORT);
-
-  exit (status);
-}
-
-int
-main (int argc, char *argv[])
-{
-  FILE *fp;
-  char *output = NULL;
-  char *dir = NULL;
-  char *prefix = NULL;
-
-  program_name = "grub-mkimage";
-
-  while (1)
-    {
-      int c = getopt_long (argc, argv, "d:p:o:hVv", options, 0);
-      if (c == -1)
-	break;
-
-      switch (c)
-	{
-	  case 'd':
-	    if (dir)
-	      free (dir);
-	    dir = xstrdup (optarg);
-	    break;
-	  case 'h':
-	    usage (0);
-	    break;
-	  case 'o':
-	    if (output)
-	      free (output);
-	    output = xstrdup (optarg);
-	    break;
-	  case 'p':
-	    if (prefix)
-	      free (prefix);
-	    prefix = xstrdup (optarg);
-	    break;
-	  case 'V':
-	    printf ("grub-mkimage (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
-	    return 0;
-	  case 'v':
-	    verbosity++;
-	    break;
-	  default:
-	    usage (1);
-	    break;
-	}
-  }
-
-  if (! output)
-    usage (1);
-
-  fp = fopen (output, "wb");
-  if (! fp)
-    grub_util_error ("cannot open %s", output);
-
-  convert_elf (dir ? : GRUB_LIBDIR, prefix ? : DEFAULT_DIRECTORY, fp, argv + optind);
-
-  fclose (fp);
-
-  return 0;
-}

From 2fa6a5dd4431588f98790e052858f3b851e34bac Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 25 Apr 2010 19:41:51 +0200
Subject: [PATCH 0831/1628] rename grub-mkrawimage to grub-mkimage

---
 conf/i386-pc.rmk                           | 4 ++--
 conf/i386-qemu.rmk                         | 4 ++--
 conf/mips.rmk                              | 4 ++--
 conf/sparc64-ieee1275.rmk                  | 2 +-
 conf/x86-efi.rmk                           | 2 +-
 util/{grub-mkrawimage.c => grub-mkimage.c} | 0
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename util/{grub-mkrawimage.c => grub-mkimage.c} (100%)

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index f2490ba97..2dd874e13 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -65,10 +65,10 @@ bin_UTILITIES = grub-mkimage
 sbin_UTILITIES = grub-setup
 
 # For grub-mkimage.
-grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
+grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkimage.c util/misc.c \
 	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-util/grub-mkrawimage.c_DEPENDENCIES = Makefile
+util/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # For grub-setup.
 util/i386/pc/grub-setup.c_DEPENDENCIES = grub_setup_init.h
diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index 923231791..003f86c33 100644
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -14,10 +14,10 @@ boot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_BOOT_MACHINE_LI
 boot_img_FORMAT = binary
 
 bin_UTILITIES += grub-mkimage
-grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
+grub_mkimage_SOURCES = util/grub-mkimage.c util/misc.c \
 	util/resolve.c gnulib/progname.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-util/grub-mkrawimage.c_DEPENDENCIES = Makefile
+util/grub-mkimage.c_DEPENDENCIES = Makefile
 
 pkglib_PROGRAMS += kernel.img
 kernel_img_SOURCES = kern/i386/qemu/startup.S \
diff --git a/conf/mips.rmk b/conf/mips.rmk
index 4603c219e..c748d3945 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -12,10 +12,10 @@ bin_SCRIPTS =
 
 # For grub-mkimage.
 bin_UTILITIES += grub-mkimage
-grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
+grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkimage.c util/misc.c \
 	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(LINK_BASE)
-util/grub-mkrawimage.c_DEPENDENCIES = Makefile
+util/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # For serial.mod.
 pkglib_MODULES += serial.mod
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 8e96599aa..dd1524df1 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -45,7 +45,7 @@ bin_UTILITIES = grub-mkimage
 sbin_UTILITIES = grub-setup grub-ofpathname
 
 # For grub-mkimage.
-grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
+grub_mkimage_SOURCES = util/grub-mkimage.c util/misc.c \
         util/resolve.c gnulib/progname.c
 
 # For grub-setup.
diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index bab561cc4..8bf0a08d9 100644
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -4,7 +4,7 @@
 bin_UTILITIES = grub-mkimage
 
 # For grub-mkimage.
-grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c \
+grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkimage.c \
 	util/misc.c util/resolve.c
 util/i386/efi/grub-mkimage.c_DEPENDENCIES = Makefile
 
diff --git a/util/grub-mkrawimage.c b/util/grub-mkimage.c
similarity index 100%
rename from util/grub-mkrawimage.c
rename to util/grub-mkimage.c

From 2296410ffbef1c180f3c001dff7abcc39fc6a242 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 25 Apr 2010 22:26:29 +0200
Subject: [PATCH 0832/1628] initial support for ppc in grub-mkimage (bugs for
 now)

---
 conf/common.rmk                        |   7 ++
 conf/i386-pc.rmk                       |   7 --
 conf/i386-qemu.rmk                     |   6 --
 conf/mips.rmk                          |   7 --
 conf/sparc64-ieee1275.rmk              |   5 --
 conf/x86-efi.rmk                       |   8 --
 include/grub/mips/kernel.h             |   2 +
 include/grub/powerpc/ieee1275/kernel.h |  19 ++++
 include/grub/powerpc/kernel.h          |   3 -
 kern/powerpc/ieee1275/startup.S        |   6 +-
 util/elf/grub-mkimage.c                |   5 +-
 util/grub-mkimage.c                    | 115 +++++++++++++++++++++----
 12 files changed, 133 insertions(+), 57 deletions(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index 4b39e9b71..011bb2773 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -21,6 +21,13 @@ grub_mkelfimage_SOURCES = gnulib/progname.c \
 	util/resolve.c
 util/elf/grub-mkimage.c_DEPENDENCIES = Makefile
 
+# For grub-mkimage.
+bin_UTILITIES += grub-mkimage
+grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkimage.c util/misc.c \
+	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
+grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
+util/grub-mkimage.c_DEPENDENCIES = Makefile
+
 # For grub-probe.
 sbin_UTILITIES += grub-probe
 util/grub-probe.c_DEPENDENCIES = grub_probe_init.h
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 2dd874e13..1e0a3ff58 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -61,15 +61,8 @@ kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
 
 # Utilities.
-bin_UTILITIES = grub-mkimage
 sbin_UTILITIES = grub-setup
 
-# For grub-mkimage.
-grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkimage.c util/misc.c \
-	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
-grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-util/grub-mkimage.c_DEPENDENCIES = Makefile
-
 # For grub-setup.
 util/i386/pc/grub-setup.c_DEPENDENCIES = grub_setup_init.h
 grub_setup_SOURCES = gnulib/progname.c \
diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index 003f86c33..ff263245d 100644
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -13,12 +13,6 @@ boot_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_M
 boot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_BOOT_MACHINE_LINK_ADDR)
 boot_img_FORMAT = binary
 
-bin_UTILITIES += grub-mkimage
-grub_mkimage_SOURCES = util/grub-mkimage.c util/misc.c \
-	util/resolve.c gnulib/progname.c
-grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-util/grub-mkimage.c_DEPENDENCIES = Makefile
-
 pkglib_PROGRAMS += kernel.img
 kernel_img_SOURCES = kern/i386/qemu/startup.S \
 	kern/i386/misc.S \
diff --git a/conf/mips.rmk b/conf/mips.rmk
index c748d3945..7d30f55f1 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -10,13 +10,6 @@ kernel_img_HEADERS += cpu/cache.h
 sbin_SCRIPTS = 
 bin_SCRIPTS = 
 
-# For grub-mkimage.
-bin_UTILITIES += grub-mkimage
-grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkimage.c util/misc.c \
-	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
-grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(LINK_BASE)
-util/grub-mkimage.c_DEPENDENCIES = Makefile
-
 # For serial.mod.
 pkglib_MODULES += serial.mod
 serial_mod_SOURCES = term/serial.c
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index dd1524df1..5b71d4cb2 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -41,13 +41,8 @@ kernel_img_LDFLAGS += -nostdlib -Wl,-N,-Ttext,0x4400,-Bstatic,-melf64_sparc
 kernel_img_FORMAT = binary
 
 # Utilities.
-bin_UTILITIES = grub-mkimage
 sbin_UTILITIES = grub-setup grub-ofpathname
 
-# For grub-mkimage.
-grub_mkimage_SOURCES = util/grub-mkimage.c util/misc.c \
-        util/resolve.c gnulib/progname.c
-
 # For grub-setup.
 util/sparc64/ieee1275/grub-setup.c_DEPENDENCIES = grub_setup_init.h
 grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c	\
diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index 8bf0a08d9..99a9938ef 100644
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -1,13 +1,5 @@
 # -*- makefile -*-
 
-# Utilities.
-bin_UTILITIES = grub-mkimage
-
-# For grub-mkimage.
-grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkimage.c \
-	util/misc.c util/resolve.c
-util/i386/efi/grub-mkimage.c_DEPENDENCIES = Makefile
-
 # Scripts.
 sbin_SCRIPTS = grub-install
 
diff --git a/include/grub/mips/kernel.h b/include/grub/mips/kernel.h
index 8b68f7b6b..172c1dbe2 100644
--- a/include/grub/mips/kernel.h
+++ b/include/grub/mips/kernel.h
@@ -46,6 +46,8 @@
 
 #define GRUB_PLATFORM_IMAGE_DEFAULT GRUB_PLATFORM_IMAGE_RAW
 
+#define EM_TARGET EM_MIPS
+
 #ifndef ASM_FILE
 
 typedef enum {
diff --git a/include/grub/powerpc/ieee1275/kernel.h b/include/grub/powerpc/ieee1275/kernel.h
index a76c2a4df..229416243 100644
--- a/include/grub/powerpc/ieee1275/kernel.h
+++ b/include/grub/powerpc/ieee1275/kernel.h
@@ -21,8 +21,27 @@
 
 #include <grub/symbol.h>
 
+#define GRUB_PLATFORM_IMAGE_FORMATS     "raw, elf"
+#define GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT     "raw"
+
+#define GRUB_PLATFORM_IMAGE_DEFAULT GRUB_PLATFORM_IMAGE_RAW
+#define GRUB_KERNEL_MACHINE_PREFIX		0x4
+#define GRUB_KERNEL_MACHINE_DATA_END	0x44
+#define GRUB_KERNEL_MACHINE_LINK_ALIGN 4
+
+#define EM_TARGET EM_PPC
+#define GRUB_KERNEL_MACHINE_LINK_ADDR 0x200000
+
 #ifndef ASM_FILE
 
+typedef enum {
+  GRUB_PLATFORM_IMAGE_RAW,
+  GRUB_PLATFORM_IMAGE_ELF
+}
+  grub_platform_image_format_t;
+#define GRUB_PLATFORM_IMAGE_RAW GRUB_PLATFORM_IMAGE_RAW
+#define GRUB_PLATFORM_IMAGE_ELF GRUB_PLATFORM_IMAGE_ELF
+
 /* The prefix which points to the directory where GRUB modules and its
    configuration file are located.  */
 extern char grub_prefix[];
diff --git a/include/grub/powerpc/kernel.h b/include/grub/powerpc/kernel.h
index b4687337f..e4ff65174 100644
--- a/include/grub/powerpc/kernel.h
+++ b/include/grub/powerpc/kernel.h
@@ -26,7 +26,4 @@
    rewrite grub-mkimage to generate valid ELF files.  */
 #define GRUB_MOD_GAP 0x8000
 
-#define GRUB_KERNEL_CPU_PREFIX		0x4
-#define GRUB_KERNEL_CPU_DATA_END	0x44
-
 #endif
diff --git a/kern/powerpc/ieee1275/startup.S b/kern/powerpc/ieee1275/startup.S
index 75e1ed852..979f260f8 100644
--- a/kern/powerpc/ieee1275/startup.S
+++ b/kern/powerpc/ieee1275/startup.S
@@ -18,7 +18,7 @@
  */
 
 #include <grub/symbol.h>
-#include <grub/cpu/kernel.h>
+#include <grub/machine/kernel.h>
 
 .extern __bss_start
 .extern _end
@@ -30,7 +30,7 @@ start:
 _start:
 	b	codestart
 
-	. = _start + GRUB_KERNEL_CPU_PREFIX
+	. = _start + GRUB_KERNEL_MACHINE_PREFIX
 
 VARIABLE(grub_prefix)
 	/* to be filled by grub-mkelfimage */
@@ -39,7 +39,7 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = _start + GRUB_KERNEL_CPU_DATA_END
+	. = _start + GRUB_KERNEL_MACHINE_DATA_END
 
 codestart:
 	li      2, 0
diff --git a/util/elf/grub-mkimage.c b/util/elf/grub-mkimage.c
index 04a19bc4e..f37837c19 100644
--- a/util/elf/grub-mkimage.c
+++ b/util/elf/grub-mkimage.c
@@ -31,6 +31,7 @@
 #include <grub/util/resolve.h>
 #include <grub/kernel.h>
 #include <grub/cpu/kernel.h>
+#include <grub/machine/kernel.h>
 #include <grub/i18n.h>
 
 #include "progname.h"
@@ -323,9 +324,9 @@ add_segments (char *dir, char *prefix, FILE *out, int chrp, char *mods[], char *
 
   if (prefix)
     {
-      if (GRUB_KERNEL_CPU_PREFIX + strlen (prefix) + 1 > GRUB_KERNEL_CPU_DATA_END)
+      if (GRUB_KERNEL_MACHINE_PREFIX + strlen (prefix) + 1 > GRUB_KERNEL_MACHINE_DATA_END)
         grub_util_error ("prefix too long");
-      grub_util_write_image_at (prefix, strlen (prefix) + 1, first_segment + GRUB_KERNEL_CPU_PREFIX, out);
+      grub_util_write_image_at (prefix, strlen (prefix) + 1, first_segment + GRUB_KERNEL_MACHINE_PREFIX, out);
     }
 
   free (phdrs);
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 30608a932..71376eaee 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -46,6 +46,36 @@
 
 #define ALIGN_ADDR(x) (ALIGN_UP((x), GRUB_TARGET_SIZEOF_VOID_P))
 
+#define GRUB_IEEE1275_NOTE_NAME "PowerPC"
+#define GRUB_IEEE1275_NOTE_TYPE 0x1275
+
+/* These structures are defined according to the CHRP binding to IEEE1275,
+   "Client Program Format" section.  */
+
+struct grub_ieee1275_note_hdr
+{
+  grub_uint32_t namesz;
+  grub_uint32_t descsz;
+  grub_uint32_t type;
+  char name[sizeof (GRUB_IEEE1275_NOTE_NAME)];
+};
+
+struct grub_ieee1275_note_desc
+{
+  grub_uint32_t real_mode;
+  grub_uint32_t real_base;
+  grub_uint32_t real_size;
+  grub_uint32_t virt_base;
+  grub_uint32_t virt_size;
+  grub_uint32_t load_base;
+};
+
+struct grub_ieee1275_note
+{
+  struct grub_ieee1275_note_hdr header;
+  struct grub_ieee1275_note_desc descriptor;
+};
+
 #ifdef GRUB_MACHINE_EFI
 #define SECTION_ALIGN GRUB_PE32_SECTION_ALIGNMENT
 #define VADDR_OFFSET ALIGN_UP (sizeof (struct grub_pe32_header) + 5 * sizeof (struct grub_pe32_section_table), SECTION_ALIGN)
@@ -786,11 +816,11 @@ static void
 generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 		char *memdisk_path, char *font_path, char *config_path,
 #ifdef GRUB_PLATFORM_IMAGE_DEFAULT
-		grub_platform_image_format_t format
+		grub_platform_image_format_t format,
 #else
-		int dummy __attribute__ ((unused))
+		int dummy __attribute__ ((unused)),
 #endif
-
+		int note
 )
 {
   char *kernel_img, *core_img;
@@ -1205,7 +1235,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       free (boot_img);
       free (boot_path);
     }
-#elif defined(GRUB_MACHINE_MIPS)
+#elif defined(GRUB_MACHINE_MIPS) || defined (GRUB_MACHINE_IEEE1275)
   if (format == GRUB_PLATFORM_IMAGE_ELF)
     {
       char *elf_img;
@@ -1213,12 +1243,21 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       Elf32_Ehdr *ehdr;
       Elf32_Phdr *phdr;
       grub_uint32_t target_addr;
+      int header_size, footer_size = 0;
+      int phnum = 1;
+
+      if (note)
+	{
+	  phnum++;
+	  footer_size += sizeof (struct grub_ieee1275_note);
+	}
+      header_size = ALIGN_ADDR (sizeof (*ehdr) + phnum * sizeof (*phdr));
 
       program_size = ALIGN_ADDR (core_size);
 
-      elf_img = xmalloc (program_size + sizeof (*ehdr) + sizeof (*phdr));
-      memset (elf_img, 0, program_size + sizeof (*ehdr) + sizeof (*phdr));
-      memcpy (elf_img  + sizeof (*ehdr) + sizeof (*phdr), core_img, core_size);
+      elf_img = xmalloc (program_size + header_size + footer_size);
+      memset (elf_img, 0, program_size + header_size);
+      memcpy (elf_img  + header_size, core_img, core_size);
       ehdr = (void *) elf_img;
       phdr = (void *) (elf_img + sizeof (*ehdr));
       memcpy (ehdr->e_ident, ELFMAG, SELFMAG);
@@ -1231,12 +1270,12 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       ehdr->e_ident[EI_VERSION] = EV_CURRENT;
       ehdr->e_ident[EI_OSABI] = ELFOSABI_NONE;
       ehdr->e_type = grub_host_to_target16 (ET_EXEC);
-      ehdr->e_machine = grub_host_to_target16 (EM_MIPS);
+      ehdr->e_machine = grub_host_to_target16 (EM_TARGET);
       ehdr->e_version = grub_host_to_target32 (EV_CURRENT);
 
       ehdr->e_phoff = grub_host_to_target32 ((char *) phdr - (char *) ehdr);
       ehdr->e_phentsize = grub_host_to_target16 (sizeof (*phdr));
-      ehdr->e_phnum = grub_host_to_target16 (1);
+      ehdr->e_phnum = grub_host_to_target16 (phnum);
 
       /* No section headers.  */
       ehdr->e_shoff = grub_host_to_target32 (0);
@@ -1247,23 +1286,60 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       ehdr->e_ehsize = grub_host_to_target16 (sizeof (*ehdr));
 
       phdr->p_type = grub_host_to_target32 (PT_LOAD);
-      phdr->p_offset = grub_host_to_target32 (sizeof (*ehdr) + sizeof (*phdr));
+      phdr->p_offset = grub_host_to_target32 (header_size);
       phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
 
-      target_addr = ALIGN_UP (GRUB_KERNEL_MACHINE_LINK_ADDR 
+#if defined(GRUB_MACHINE_MIPS)
+      target_addr = ALIGN_UP (GRUB_KERNEL_MACHINE_LINK_ADDR
 			      + kernel_size + total_module_size, 32);
+#else
+      target_addr = GRUB_KERNEL_MACHINE_LINK_ADDR;
+#endif
       ehdr->e_entry = grub_host_to_target32 (target_addr);
       phdr->p_vaddr = grub_host_to_target32 (target_addr);
       phdr->p_paddr = grub_host_to_target32 (target_addr);
       phdr->p_align = grub_host_to_target32 (GRUB_KERNEL_MACHINE_LINK_ALIGN);
+#if defined(GRUB_MACHINE_MIPS)
       ehdr->e_flags = grub_host_to_target32 (0x1000 | EF_MIPS_NOREORDER 
 					     | EF_MIPS_PIC | EF_MIPS_CPIC);
+#else
+      ehdr->e_flags = 0;
+#endif
       phdr->p_filesz = grub_host_to_target32 (core_size);
       phdr->p_memsz = grub_host_to_target32 (core_size);
 
+      if (note)
+	{
+	  int note_size = sizeof (struct grub_ieee1275_note);
+	  struct grub_ieee1275_note *note = (struct grub_ieee1275_note *) 
+	    (elf_img + program_size + header_size);
+
+	  grub_util_info ("adding CHRP NOTE segment");
+
+	  note->header.namesz = grub_host_to_target32 (sizeof (GRUB_IEEE1275_NOTE_NAME));
+	  note->header.descsz = grub_host_to_target32 (note_size);
+	  note->header.type = grub_host_to_target32 (GRUB_IEEE1275_NOTE_TYPE);
+	  strcpy (note->header.name, GRUB_IEEE1275_NOTE_NAME);
+	  note->descriptor.real_mode = grub_host_to_target32 (0xffffffff);
+	  note->descriptor.real_base = grub_host_to_target32 (0x00c00000);
+	  note->descriptor.real_size = grub_host_to_target32 (0xffffffff);
+	  note->descriptor.virt_base = grub_host_to_target32 (0xffffffff);
+	  note->descriptor.virt_size = grub_host_to_target32 (0xffffffff);
+	  note->descriptor.load_base = grub_host_to_target32 (0x00004000);
+
+	  phdr[1].p_type = grub_host_to_target32 (PT_NOTE);
+	  phdr[1].p_flags = grub_host_to_target32 (PF_R);
+	  phdr[1].p_align = grub_host_to_target32 (GRUB_TARGET_SIZEOF_LONG);
+	  phdr[1].p_vaddr = 0;
+	  phdr[1].p_paddr = 0;
+	  phdr[1].p_filesz = grub_host_to_target32 (note_size);
+	  phdr[1].p_memsz = 0;
+	  phdr[1].p_offset = grub_host_to_target32 (header_size + program_size);
+	}
+
       free (core_img);
       core_img = elf_img;
-      core_size = program_size  + sizeof (*ehdr) + sizeof (*phdr);
+      core_size = program_size + header_size + footer_size;
   }
 #endif
 
@@ -1291,6 +1367,7 @@ static struct option options[] =
     {"font", required_argument, 0, 'f'},
     {"config", required_argument, 0, 'c'},
     {"output", required_argument, 0, 'o'},
+    {"note", no_argument, 0, 'n'},
 #ifdef GRUB_PLATFORM_IMAGE_DEFAULT
     {"format", required_argument, 0, 'O'},
 #endif
@@ -1316,6 +1393,7 @@ Make a bootable image of GRUB.\n\
   -m, --memdisk=FILE      embed FILE as a memdisk image\n\
   -f, --font=FILE         embed FILE as a boot font\n\
   -c, --config=FILE       embed FILE as boot config\n\
+  -n, --note              add NOTE segment for CHRP Open Firmware\n\
   -o, --output=FILE       output a generated image to FILE [default=stdout]\n"
 #ifdef GRUB_PLATFORM_IMAGE_DEFAULT
 	    "\
@@ -1348,6 +1426,7 @@ main (int argc, char *argv[])
   char *font = NULL;
   char *config = NULL;
   FILE *fp = stdout;
+  int note = 0;
 #ifdef GRUB_PLATFORM_IMAGE_DEFAULT
   grub_platform_image_format_t format = GRUB_PLATFORM_IMAGE_DEFAULT;
 #endif
@@ -1358,7 +1437,7 @@ main (int argc, char *argv[])
 
   while (1)
     {
-      int c = getopt_long (argc, argv, "d:p:m:c:o:O:f:hVv", options, 0);
+      int c = getopt_long (argc, argv, "d:p:m:c:o:O:f:hVvn", options, 0);
 
       if (c == -1)
 	break;
@@ -1400,6 +1479,10 @@ main (int argc, char *argv[])
 	    dir = xstrdup (optarg);
 	    break;
 
+	  case 'n':
+	    note = 1;
+	    break;
+
 	  case 'm':
 	    if (memdisk)
 	      free (memdisk);
@@ -1462,11 +1545,11 @@ main (int argc, char *argv[])
   generate_image (dir ? : GRUB_LIBDIR, prefix ? : DEFAULT_DIRECTORY, fp,
 		  argv + optind, memdisk, font, config,
 #ifdef GRUB_PLATFORM_IMAGE_DEFAULT
-		  format
+		  format,
 #else
-		  0
+		  0,
 #endif
-		  );
+		  note);
 
   fclose (fp);
 

From 7576adef7cc18df53688e248fcdabb73aa9cb4da Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 25 Apr 2010 23:04:29 +0200
Subject: [PATCH 0833/1628] Remove grub-mkelfimage

---
 conf/common.rmk | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index 011bb2773..bab7effb9 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -14,13 +14,6 @@ else
 grub_mkdevicemap_SOURCES += util/devicemap.c
 endif
 
-# For grub-mkelfimage.
-bin_UTILITIES += grub-mkelfimage
-grub_mkelfimage_SOURCES = gnulib/progname.c \
-	util/elf/grub-mkimage.c util/misc.c \
-	util/resolve.c
-util/elf/grub-mkimage.c_DEPENDENCIES = Makefile
-
 # For grub-mkimage.
 bin_UTILITIES += grub-mkimage
 grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkimage.c util/misc.c \

From 614be3f11949a6a2e7033e2f2dc4caa3e5a772a3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 26 Apr 2010 00:45:21 +0200
Subject: [PATCH 0834/1628] #if-less grub-mkimage

---
 include/grub/i386/pc/boot.h            |   17 +-
 include/grub/i386/pc/kernel.h          |   24 +-
 include/grub/i386/pc/memory.h          |    6 +-
 include/grub/i386/qemu/boot.h          |    3 -
 include/grub/i386/qemu/kernel.h        |    3 -
 include/grub/sparc64/ieee1275/boot.h   |    4 -
 include/grub/sparc64/ieee1275/kernel.h |   13 -
 util/grub-mkimage.c                    | 1378 +++++++++++++-----------
 util/grub-mkrescue.in                  |    2 +-
 9 files changed, 765 insertions(+), 685 deletions(-)

diff --git a/include/grub/i386/pc/boot.h b/include/grub/i386/pc/boot.h
index e88c62b71..09d01caee 100644
--- a/include/grub/i386/pc/boot.h
+++ b/include/grub/i386/pc/boot.h
@@ -19,6 +19,9 @@
 #ifndef GRUB_BOOT_MACHINE_HEADER
 #define GRUB_BOOT_MACHINE_HEADER	1
 
+#define MACHINE I386_PC
+#include <grub/offsets.h>
+
 /* The signature for bootloader.  */
 #define GRUB_BOOT_MACHINE_SIGNATURE	0xaa55
 
@@ -57,9 +60,6 @@
    floppy.  */
 #define GRUB_BOOT_MACHINE_BIOS_HD_FLAG	0x80
 
-/* The segment where the kernel is loaded.  */
-#define GRUB_BOOT_MACHINE_KERNEL_SEG	0x800
-
 /* The address where the kernel is loaded.  */
 #define GRUB_BOOT_MACHINE_KERNEL_ADDR	(GRUB_BOOT_MACHINE_KERNEL_SEG << 4)
 
@@ -68,16 +68,7 @@
 
 #define GRUB_BOOT_MACHINE_PXE_DL	0x7f
 
-#ifndef ASM_FILE
-
 /* This is the blocklist used in the diskboot image.  */
-struct grub_boot_blocklist
-{
-  grub_uint64_t start;
-  grub_uint16_t len;
-  grub_uint16_t segment;
-} __attribute__ ((packed));
-
-#endif /* ! ASM_FILE */
+#define grub_boot_blocklist grub_pc_bios_boot_blocklist
 
 #endif /* ! BOOT_MACHINE_HEADER */
diff --git a/include/grub/i386/pc/kernel.h b/include/grub/i386/pc/kernel.h
index e830afae2..77d5c6e5a 100644
--- a/include/grub/i386/pc/kernel.h
+++ b/include/grub/i386/pc/kernel.h
@@ -19,29 +19,9 @@
 #ifndef KERNEL_MACHINE_HEADER
 #define KERNEL_MACHINE_HEADER	1
 
-/* The offset of GRUB_TOTAL_MODULE_SIZE.  */
-#define GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE	0x8
+#define MACHINE I386_PC
 
-/* The offset of GRUB_KERNEL_IMAGE_SIZE.  */
-#define GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE	0xc
-
-/* The offset of GRUB_COMPRESSED_SIZE.  */
-#define GRUB_KERNEL_MACHINE_COMPRESSED_SIZE	0x10
-
-/* The offset of GRUB_INSTALL_DOS_PART.  */
-#define GRUB_KERNEL_MACHINE_INSTALL_DOS_PART	0x14
-
-/* The offset of GRUB_INSTALL_BSD_PART.  */
-#define GRUB_KERNEL_MACHINE_INSTALL_BSD_PART	0x18
-
-/* The offset of GRUB_PREFIX.  */
-#define GRUB_KERNEL_MACHINE_PREFIX		0x1c
-
-/* End of the data section. */
-#define GRUB_KERNEL_MACHINE_DATA_END		0x5c
-
-/* The size of the first region which won't be compressed.  */
-#define GRUB_KERNEL_MACHINE_RAW_SIZE		(GRUB_KERNEL_MACHINE_DATA_END + 0x5F0)
+#include <grub/offsets.h>
 
 /* Enable LZMA compression */
 #define ENABLE_LZMA	1
diff --git a/include/grub/i386/pc/memory.h b/include/grub/i386/pc/memory.h
index 841b06164..0b4191734 100644
--- a/include/grub/i386/pc/memory.h
+++ b/include/grub/i386/pc/memory.h
@@ -29,6 +29,9 @@
 
 #include <grub/i386/memory.h>
 
+#define MACHINE I386_PC
+#include <grub/offsets.h>
+
 /* The scratch buffer used in real mode code.  */
 #define GRUB_MEMORY_MACHINE_SCRATCH_ADDR	0x68000
 #define GRUB_MEMORY_MACHINE_SCRATCH_SEG	(GRUB_MEMORY_MACHINE_SCRATCH_ADDR >> 4)
@@ -40,9 +43,6 @@
 /* The size of the protect mode stack.  */
 #define GRUB_MEMORY_MACHINE_PROT_STACK_SIZE	0x8000
 
-/* The upper memory area (starting at 640 kiB).  */
-#define GRUB_MEMORY_MACHINE_UPPER		0xa0000
-
 /* The protected mode stack.  */
 #define GRUB_MEMORY_MACHINE_PROT_STACK	\
 	(GRUB_MEMORY_MACHINE_SCRATCH_ADDR + GRUB_MEMORY_MACHINE_SCRATCH_SIZE \
diff --git a/include/grub/i386/qemu/boot.h b/include/grub/i386/qemu/boot.h
index 6fbb57750..5f53eabfb 100644
--- a/include/grub/i386/qemu/boot.h
+++ b/include/grub/i386/qemu/boot.h
@@ -22,7 +22,4 @@
 /* The size of boot.img.  */
 #define GRUB_BOOT_MACHINE_SIZE			(0x100000 - GRUB_BOOT_MACHINE_LINK_ADDR)
 
-/* The offset of GRUB_CORE_ENTRY_ADDR.  */
-#define GRUB_BOOT_MACHINE_CORE_ENTRY_ADDR	0x4
-
 #endif
diff --git a/include/grub/i386/qemu/kernel.h b/include/grub/i386/qemu/kernel.h
index bc0b93d4f..3d22c9d9f 100644
--- a/include/grub/i386/qemu/kernel.h
+++ b/include/grub/i386/qemu/kernel.h
@@ -19,9 +19,6 @@
 #ifndef GRUB_KERNEL_MACHINE_HEADER
 #define GRUB_KERNEL_MACHINE_HEADER	1
 
-/* The offset of GRUB_CORE_ENTRY_ADDR.  */
-#define GRUB_KERNEL_MACHINE_CORE_ENTRY_ADDR	0x8
-
 /* The offset of GRUB_KERNEL_IMAGE_SIZE.  */
 #define GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE	0xc
 
diff --git a/include/grub/sparc64/ieee1275/boot.h b/include/grub/sparc64/ieee1275/boot.h
index 9671c6900..bd0a7bf3c 100644
--- a/include/grub/sparc64/ieee1275/boot.h
+++ b/include/grub/sparc64/ieee1275/boot.h
@@ -50,10 +50,6 @@
 #define GRUB_BOOT_MACHINE_CODE_END \
 	(0x1fc - GRUB_BOOT_AOUT_HEADER_SIZE)
 
-#define GRUB_BOOT_MACHINE_LIST_SIZE	12
-
-#define GRUB_BOOT_MACHINE_IMAGE_ADDRESS	0x4400
-
 #define GRUB_BOOT_MACHINE_KERNEL_ADDR 0x4200
 
 #endif /* ! BOOT_MACHINE_HEADER */
diff --git a/include/grub/sparc64/ieee1275/kernel.h b/include/grub/sparc64/ieee1275/kernel.h
index a16fb88e7..2948a8d2f 100644
--- a/include/grub/sparc64/ieee1275/kernel.h
+++ b/include/grub/sparc64/ieee1275/kernel.h
@@ -42,21 +42,8 @@
 #define GRUB_KERNEL_MACHINE_RAW_SIZE                   0
 #define GRUB_KERNEL_MACHINE_STACK_SIZE          0x40000
 
-#define GRUB_PLATFORM_IMAGE_FORMATS     "raw, aout"
-#define GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT     "raw"
-
-#define GRUB_PLATFORM_IMAGE_DEFAULT GRUB_PLATFORM_IMAGE_RAW
-
 #ifndef ASM_FILE
 
-typedef enum {
-  GRUB_PLATFORM_IMAGE_RAW,
-  GRUB_PLATFORM_IMAGE_AOUT
-}
-  grub_platform_image_format_t;
-#define GRUB_PLATFORM_IMAGE_RAW GRUB_PLATFORM_IMAGE_RAW
-#define GRUB_PLATFORM_IMAGE_AOUT GRUB_PLATFORM_IMAGE_AOUT
-
 #include <grub/symbol.h>
 #include <grub/types.h>
 
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 71376eaee..af2988a3f 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -19,9 +19,6 @@
 
 #include <config.h>
 #include <grub/types.h>
-#include <grub/machine/boot.h>
-#include <grub/machine/kernel.h>
-#include <grub/machine/memory.h>
 #include <grub/elf.h>
 #include <grub/aout.h>
 #include <grub/i18n.h>
@@ -30,6 +27,7 @@
 #include <grub/util/misc.h>
 #include <grub/util/resolve.h>
 #include <grub/misc.h>
+#include <grub/offsets.h>
 #include <time.h>
 
 #include <stdio.h>
@@ -44,7 +42,144 @@
 
 #include "progname.h"
 
-#define ALIGN_ADDR(x) (ALIGN_UP((x), GRUB_TARGET_SIZEOF_VOID_P))
+#define ALIGN_ADDR(x) (ALIGN_UP((x), image_target->voidp_sizeof))
+
+#define TARGET_NO_FIELD 0xffffffff
+struct image_target_desc
+{
+  const char *name;
+  grub_size_t voidp_sizeof;
+  int bigendian;
+  enum {
+    IMAGE_I386_PC, IMAGE_EFI, IMAGE_COREBOOT,
+    IMAGE_SPARC64_AOUT, IMAGE_SPARC64_RAW, IMAGE_I386_IEEE1275,
+    IMAGE_YEELOONG_ELF, IMAGE_QEMU, IMAGE_PPC
+  } id;
+  enum {FORMAT_RAW, FORMAT_AOUT, FORMAT_ELF, FORMAT_PE} format;
+  enum
+    {
+      PLATFORM_FLAGS_NONE = 0,
+      PLATFORM_FLAGS_LZMA = 1
+    } flags;
+  unsigned prefix;
+  unsigned data_end;
+  unsigned raw_size;
+  unsigned total_module_size;
+  unsigned kernel_image_size;
+  unsigned compressed_size;
+  unsigned link_align;
+  grub_uint16_t elf_target;
+  unsigned section_align;
+  signed vaddr_offset;
+  unsigned install_dos_part, install_bsd_part;
+};
+
+struct image_target_desc image_targets[] =
+  {
+    {"i386-coreboot", 4, 0, IMAGE_COREBOOT, FORMAT_ELF, PLATFORM_FLAGS_NONE,
+     .section_align = 1,
+     .vaddr_offset = 0
+    },
+    {"i386-pc", 4, 0, IMAGE_I386_PC, FORMAT_RAW, PLATFORM_FLAGS_LZMA,
+     GRUB_KERNEL_I386_PC_PREFIX, GRUB_KERNEL_I386_PC_DATA_END,
+     GRUB_KERNEL_I386_PC_RAW_SIZE, GRUB_KERNEL_I386_PC_TOTAL_MODULE_SIZE,
+     GRUB_KERNEL_I386_PC_KERNEL_IMAGE_SIZE, GRUB_KERNEL_I386_PC_COMPRESSED_SIZE,
+     .section_align = 1,
+     .vaddr_offset = 0,
+     GRUB_KERNEL_I386_PC_INSTALL_DOS_PART, GRUB_KERNEL_I386_PC_INSTALL_BSD_PART
+    },
+    {"i386-efi", 4, 0, IMAGE_EFI, FORMAT_PE, PLATFORM_FLAGS_NONE,
+     .section_align = GRUB_PE32_SECTION_ALIGNMENT,
+     .vaddr_offset = ALIGN_UP (sizeof (struct grub_pe32_header)
+			       + 5 * sizeof (struct grub_pe32_section_table),
+			       GRUB_PE32_SECTION_ALIGNMENT)
+    },
+    {"i386-ieee1275", 4, 0, IMAGE_I386_IEEE1275, FORMAT_ELF, PLATFORM_FLAGS_NONE,
+     .section_align = 1,
+     .vaddr_offset = 0},
+    {"i386-qemu", 4, 0, IMAGE_QEMU, FORMAT_RAW, PLATFORM_FLAGS_NONE,
+     .section_align = 1,
+     .vaddr_offset = 0},
+    {"x86_64-efi", 8, 0, IMAGE_EFI, FORMAT_PE, PLATFORM_FLAGS_NONE,
+     .section_align = GRUB_PE32_SECTION_ALIGNMENT,
+     .vaddr_offset = ALIGN_UP (sizeof (struct grub_pe32_header)
+			       + 5 * sizeof (struct grub_pe32_section_table),
+			       GRUB_PE32_SECTION_ALIGNMENT)
+    },
+    {"mipsel-yeeloong-elf", 4, 0, IMAGE_YEELOONG_ELF, FORMAT_ELF, PLATFORM_FLAGS_NONE,
+     .section_align = 1,
+     .vaddr_offset = 0},
+    {"powerpc-ieee1275", 4, 1, IMAGE_PPC, FORMAT_ELF, PLATFORM_FLAGS_NONE,
+     .section_align = 1,
+     .vaddr_offset = 0},
+    {"sparc64-ieee1275-raw", 8, 1, IMAGE_SPARC64_RAW,
+     FORMAT_RAW, PLATFORM_FLAGS_NONE,
+     .section_align = 1,
+     .vaddr_offset = 0},
+    {"sparc64-ieee1275-aout", 8, 1, IMAGE_SPARC64_AOUT,
+     FORMAT_AOUT, PLATFORM_FLAGS_NONE,
+     .section_align = 1,
+     .vaddr_offset = 0},
+  };
+
+#define grub_target_to_host32(x) (grub_target_to_host32_real (image_target, (x)))
+#define grub_host_to_target32(x) (grub_host_to_target32_real (image_target, (x)))
+#define grub_target_to_host16(x) (grub_target_to_host16_real (image_target, (x)))
+#define grub_host_to_target16(x) (grub_host_to_target16_real (image_target, (x)))
+
+static inline grub_uint32_t
+grub_target_to_host32_real (struct image_target_desc *image_target, grub_uint32_t in)
+{
+  if (image_target->bigendian)
+    return grub_be_to_cpu32 (in);
+  else
+    return grub_le_to_cpu32 (in);
+}
+
+static inline grub_uint64_t
+grub_target_to_host64_real (struct image_target_desc *image_target, grub_uint64_t in)
+{
+  if (image_target->bigendian)
+    return grub_be_to_cpu64 (in);
+  else
+    return grub_le_to_cpu64 (in);
+}
+
+static inline grub_uint32_t
+grub_target_to_host_real (struct image_target_desc *image_target, grub_uint32_t in)
+{
+  if (image_target->voidp_sizeof == 8)
+    return grub_target_to_host64_real (image_target, in);
+  else
+    return grub_target_to_host32_real (image_target, in);
+}
+
+static inline grub_uint32_t
+grub_host_to_target32_real (struct image_target_desc *image_target, grub_uint32_t in)
+{
+  if (image_target->bigendian)
+    return grub_cpu_to_be32 (in);
+  else
+    return grub_cpu_to_le32 (in);
+}
+
+static inline grub_uint16_t
+grub_target_to_host16_real (struct image_target_desc *image_target, grub_uint16_t in)
+{
+  if (image_target->bigendian)
+    return grub_be_to_cpu16 (in);
+  else
+    return grub_le_to_cpu16 (in);
+}
+
+static inline grub_uint16_t
+grub_host_to_target16_real (struct image_target_desc *image_target, grub_uint16_t in)
+{
+  if (image_target->bigendian)
+    return grub_cpu_to_be16 (in);
+  else
+    return grub_cpu_to_le16 (in);
+}
 
 #define GRUB_IEEE1275_NOTE_NAME "PowerPC"
 #define GRUB_IEEE1275_NOTE_TYPE 0x1275
@@ -76,21 +211,8 @@ struct grub_ieee1275_note
   struct grub_ieee1275_note_desc descriptor;
 };
 
-#ifdef GRUB_MACHINE_EFI
-#define SECTION_ALIGN GRUB_PE32_SECTION_ALIGNMENT
-#define VADDR_OFFSET ALIGN_UP (sizeof (struct grub_pe32_header) + 5 * sizeof (struct grub_pe32_section_table), SECTION_ALIGN)
-#else
-#define SECTION_ALIGN 1
-#define VADDR_OFFSET 0
-#endif
+#define grub_target_to_host(val) grub_target_to_host_real(image_target, (val))
 
-#if GRUB_TARGET_WORDSIZE == 32
-# define grub_target_to_host(val) grub_target_to_host32(val)
-#elif GRUB_TARGET_WORDSIZE == 64
-# define grub_target_to_host(val) grub_target_to_host64(val)
-#endif
-
-#ifdef ENABLE_LZMA
 #include <grub/lib/LzmaEnc.h>
 
 static void *SzAlloc(void *p, size_t size) { p = p; return xmalloc(size); }
@@ -98,8 +220,8 @@ static void SzFree(void *p, void *address) { p = p; free(address); }
 static ISzAlloc g_Alloc = { SzAlloc, SzFree };
 
 static void
-compress_kernel (char *kernel_img, size_t kernel_size,
-		 char **core_img, size_t *core_size)
+compress_kernel_lzma (char *kernel_img, size_t kernel_size,
+		      char **core_img, size_t *core_size, size_t raw_size)
 {
   CLzmaEncProps props;
   unsigned char out_props[5];
@@ -112,45 +234,47 @@ compress_kernel (char *kernel_img, size_t kernel_size,
   props.pb = 2;
   props.numThreads = 1;
 
-  if (kernel_size < GRUB_KERNEL_MACHINE_RAW_SIZE)
+  if (kernel_size < raw_size)
     grub_util_error (_("the core image is too small"));
 
   *core_img = xmalloc (kernel_size);
-  memcpy (*core_img, kernel_img, GRUB_KERNEL_MACHINE_RAW_SIZE);
+  memcpy (*core_img, kernel_img, raw_size);
 
-  *core_size = kernel_size - GRUB_KERNEL_MACHINE_RAW_SIZE;
-  if (LzmaEncode((unsigned char *) *core_img + GRUB_KERNEL_MACHINE_RAW_SIZE,
-                 core_size,
-                 (unsigned char *) kernel_img + GRUB_KERNEL_MACHINE_RAW_SIZE,
-                 kernel_size - GRUB_KERNEL_MACHINE_RAW_SIZE,
-                 &props, out_props, &out_props_size,
-                 0, NULL, &g_Alloc, &g_Alloc) != SZ_OK)
+  *core_size = kernel_size - raw_size;
+  if (LzmaEncode ((unsigned char *) *core_img + raw_size, core_size,
+		  (unsigned char *) kernel_img + raw_size,
+		  kernel_size - raw_size,
+		  &props, out_props, &out_props_size,
+		  0, NULL, &g_Alloc, &g_Alloc) != SZ_OK)
     grub_util_error (_("cannot compress the kernel image"));
 
-  *core_size += GRUB_KERNEL_MACHINE_RAW_SIZE;
+  *core_size += raw_size;
 }
 
-#else	/* No lzma compression */
-
 static void
-compress_kernel (char *kernel_img, size_t kernel_size,
-               char **core_img, size_t *core_size)
+compress_kernel (struct image_target_desc *image_target, char *kernel_img,
+		 size_t kernel_size, char **core_img, size_t *core_size)
 {
+ if (image_target->flags & PLATFORM_FLAGS_LZMA)
+   {
+     compress_kernel_lzma (kernel_img, kernel_size, core_img,
+			   core_size, image_target->raw_size);
+     return;
+   }
+
   *core_img = xmalloc (kernel_size);
   memcpy (*core_img, kernel_img, kernel_size);
   *core_size = kernel_size;
 }
 
-#endif	/* No lzma compression */
-
-#ifdef GRUB_MACHINE_EFI
 
 /* Relocate symbols; note that this function overwrites the symbol table.
    Return the address of a start symbol.  */
 static Elf_Addr
 relocate_symbols (Elf_Ehdr *e, Elf_Shdr *sections,
 		  Elf_Shdr *symtab_section, Elf_Addr *section_addresses,
-		  Elf_Half section_entsize, Elf_Half num_sections)
+		  Elf_Half section_entsize, Elf_Half num_sections,
+		  struct image_target_desc *image_target)
 {
   Elf_Word symtab_size, sym_size, num_syms;
   Elf_Off symtab_offset;
@@ -209,7 +333,8 @@ relocate_symbols (Elf_Ehdr *e, Elf_Shdr *sections,
 
 /* Return the address of a symbol at the index I in the section S.  */
 static Elf_Addr
-get_symbol_address (Elf_Ehdr *e, Elf_Shdr *s, Elf_Word i)
+get_symbol_address (Elf_Ehdr *e, Elf_Shdr *s, Elf_Word i,
+		    struct image_target_desc *image_target)
 {
   Elf_Sym *sym;
 
@@ -221,7 +346,8 @@ get_symbol_address (Elf_Ehdr *e, Elf_Shdr *s, Elf_Word i)
 
 /* Return the address of a modified value.  */
 static Elf_Addr *
-get_target_address (Elf_Ehdr *e, Elf_Shdr *s, Elf_Addr offset)
+get_target_address (Elf_Ehdr *e, Elf_Shdr *s, Elf_Addr offset,
+		    struct image_target_desc *image_target)
 {
   return (Elf_Addr *) ((char *) e + grub_target_to_host32 (s->sh_offset) + offset);
 }
@@ -234,7 +360,7 @@ static void
 relocate_addresses (Elf_Ehdr *e, Elf_Shdr *sections,
 		    Elf_Addr *section_addresses,
 		    Elf_Half section_entsize, Elf_Half num_sections,
-		    const char *strtab)
+		    const char *strtab, struct image_target_desc *image_target)
 {
   Elf_Half i;
   Elf_Shdr *s;
@@ -283,79 +409,84 @@ relocate_addresses (Elf_Ehdr *e, Elf_Shdr *sections,
 	    Elf_Addr addend;
 
 	    offset = grub_target_to_host (r->r_offset);
-	    target = get_target_address (e, target_section, offset);
+	    target = get_target_address (e, target_section, offset, image_target);
 	    info = grub_target_to_host (r->r_info);
 	    sym_addr = get_symbol_address (e, symtab_section,
-					   ELF_R_SYM (info));
+					   ELF_R_SYM (info), image_target);
 
             addend = (s->sh_type == grub_target_to_host32 (SHT_RELA)) ?
 	      r->r_addend : 0;
 
-            switch (ELF_R_TYPE (info))
-	      {
-#if GRUB_TARGET_SIZEOF_VOID_P == 4
-	      case R_386_NONE:
-		break;
+	    if (image_target->voidp_sizeof == 4)
+	      switch (ELF_R_TYPE (info))
+		{
+		case R_386_NONE:
+		  break;
 
-	      case R_386_32:
-		/* This is absolute.  */
-		*target = grub_host_to_target32 (grub_target_to_host32 (*target)
-                                            + addend + sym_addr);
-		grub_util_info ("relocating an R_386_32 entry to 0x%x at the offset 0x%x",
-				*target, offset);
-		break;
+		case R_386_32:
+		  /* This is absolute.  */
+		  *target = grub_host_to_target32 (grub_target_to_host32 (*target)
+						   + addend + sym_addr);
+		  grub_util_info ("relocating an R_386_32 entry to 0x%x at the offset 0x%x",
+				  *target, offset);
+		  break;
 
-	      case R_386_PC32:
-		/* This is relative.  */
-		*target = grub_host_to_target32 (grub_target_to_host32 (*target)
-						 + addend + sym_addr
-						 - target_section_addr - offset
-						 - VADDR_OFFSET);
-		grub_util_info ("relocating an R_386_PC32 entry to 0x%x at the offset 0x%x",
-				*target, offset);
-		break;
+		case R_386_PC32:
+		  /* This is relative.  */
+		  *target = grub_host_to_target32 (grub_target_to_host32 (*target)
+						   + addend + sym_addr
+						   - target_section_addr - offset
+						   - image_target->vaddr_offset);
+		  grub_util_info ("relocating an R_386_PC32 entry to 0x%x at the offset 0x%x",
+				  *target, offset);
+		  break;
+		default:
+		  grub_util_error ("unknown relocation type %d",
+				   ELF_R_TYPE (info));
+		  break;
+		}
+	    else
+	      switch (ELF_R_TYPE (info))
+		{
 
-#else
+		case R_X86_64_NONE:
+		  break;
 
-              case R_X86_64_NONE:
-                break;
+		case R_X86_64_64:
+		  *target = grub_host_to_target64 (grub_target_to_host64 (*target)
+						   + addend + sym_addr);
+		  grub_util_info ("relocating an R_X86_64_64 entry to 0x%llx at the offset 0x%llx",
+				  *target, offset);
+		  break;
 
-              case R_X86_64_64:
-		*target = grub_host_to_target64 (grub_target_to_host64 (*target)
-					    + addend + sym_addr);
-		grub_util_info ("relocating an R_X86_64_64 entry to 0x%llx at the offset 0x%llx",
-				*target, offset);
-		break;
+		case R_X86_64_PC32:
+		  {
+		    grub_uint32_t *t32 = (grub_uint32_t *) target;
+		    *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
+						  + addend + sym_addr
+						  - target_section_addr - offset
+						  - image_target->vaddr_offset);
+		    grub_util_info ("relocating an R_X86_64_PC32 entry to 0x%x at the offset 0x%llx",
+				    *t32, offset);
+		    break;
+		  }
 
-              case R_X86_64_PC32:
-                {
-                  grub_uint32_t *t32 = (grub_uint32_t *) target;
-                  *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
-						+ addend + sym_addr
-						- target_section_addr - offset
-						- VADDR_OFFSET);
-                  grub_util_info ("relocating an R_X86_64_PC32 entry to 0x%x at the offset 0x%llx",
-                                  *t32, offset);
-                  break;
-                }
+		case R_X86_64_32:
+		case R_X86_64_32S:
+		  {
+		    grub_uint32_t *t32 = (grub_uint32_t *) target;
+		    *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
+						  + addend + sym_addr);
+		    grub_util_info ("relocating an R_X86_64_32(S) entry to 0x%x at the offset 0x%llx",
+				    *t32, offset);
+		    break;
+		  }
 
-              case R_X86_64_32:
-              case R_X86_64_32S:
-                {
-                  grub_uint32_t *t32 = (grub_uint32_t *) target;
-                  *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
-                                           + addend + sym_addr);
-                  grub_util_info ("relocating an R_X86_64_32(S) entry to 0x%x at the offset 0x%llx",
-                                  *t32, offset);
-                  break;
-                }
-
-#endif
-	      default:
-		grub_util_error ("unknown relocation type %d",
-				 ELF_R_TYPE (info));
-		break;
-	      }
+		default:
+		  grub_util_error ("unknown relocation type %d",
+				   ELF_R_TYPE (info));
+		  break;
+		}
 	  }
       }
 }
@@ -371,7 +502,8 @@ struct fixup_block_list
    after having written to the file OUT.  */
 Elf_Addr
 add_fixup_entry (struct fixup_block_list **cblock, grub_uint16_t type,
-		 Elf_Addr addr, int flush, Elf_Addr current_address)
+		 Elf_Addr addr, int flush, Elf_Addr current_address,
+		 struct image_target_desc *image_target)
 {
   struct grub_pe32_fixup_block *b;
 
@@ -393,7 +525,7 @@ add_fixup_entry (struct fixup_block_list **cblock, grub_uint16_t type,
               size_t index;
 
 	      next_address = current_address + b->block_size;
-	      padding_size = ((ALIGN_UP (next_address, SECTION_ALIGN)
+	      padding_size = ((ALIGN_UP (next_address, image_target->section_align)
 			       - next_address)
 			      >> 1);
               index = ((b->block_size - sizeof (*b)) >> 1);
@@ -466,7 +598,7 @@ static Elf_Addr
 make_reloc_section (Elf_Ehdr *e, void **out,
 		    Elf_Addr *section_addresses, Elf_Shdr *sections,
 		    Elf_Half section_entsize, Elf_Half num_sections,
-		    const char *strtab)
+		    const char *strtab, struct image_target_desc *image_target)
 {
   Elf_Half i;
   Elf_Shdr *s;
@@ -509,39 +641,44 @@ make_reloc_section (Elf_Ehdr *e, void **out,
 	    info = grub_le_to_cpu32 (r->r_info);
 
 	    /* Necessary to relocate only absolute addresses.  */
-#if GRUB_TARGET_SIZEOF_VOID_P == 4
-	    if (ELF_R_TYPE (info) == R_386_32)
+	    if (image_target->voidp_sizeof == 4)
 	      {
-		Elf_Addr addr;
+		if (ELF_R_TYPE (info) == R_386_32)
+		  {
+		    Elf_Addr addr;
 
-		addr = section_address + offset;
-		grub_util_info ("adding a relocation entry for 0x%x", addr);
-		current_address = add_fixup_entry (&lst,
-						   GRUB_PE32_REL_BASED_HIGHLOW,
-						   addr, 0, current_address);
+		    addr = section_address + offset;
+		    grub_util_info ("adding a relocation entry for 0x%x", addr);
+		    current_address = add_fixup_entry (&lst,
+						       GRUB_PE32_REL_BASED_HIGHLOW,
+						       addr, 0, current_address,
+						       image_target);
+		  }
 	      }
-#else
-	    if ((ELF_R_TYPE (info) == R_X86_64_32) ||
-                (ELF_R_TYPE (info) == R_X86_64_32S))
+	    else
 	      {
-		grub_util_error ("can\'t add fixup entry for R_X86_64_32(S)");
-	      }
-	    else if (ELF_R_TYPE (info) == R_X86_64_64)
-	      {
-		Elf_Addr addr;
+		if ((ELF_R_TYPE (info) == R_X86_64_32) ||
+		    (ELF_R_TYPE (info) == R_X86_64_32S))
+		  {
+		    grub_util_error ("can\'t add fixup entry for R_X86_64_32(S)");
+		  }
+		else if (ELF_R_TYPE (info) == R_X86_64_64)
+		  {
+		    Elf_Addr addr;
 
-		addr = section_address + offset;
-		grub_util_info ("adding a relocation entry for 0x%llx", addr);
-		current_address = add_fixup_entry (&lst,
-						   GRUB_PE32_REL_BASED_DIR64,
-						   addr,
-						   0, current_address);
+		    addr = section_address + offset;
+		    grub_util_info ("adding a relocation entry for 0x%llx", addr);
+		    current_address = add_fixup_entry (&lst,
+						       GRUB_PE32_REL_BASED_DIR64,
+						       addr,
+						       0, current_address,
+						       image_target);
+		  }
 	      }
-#endif
 	  }
       }
 
-  current_address = add_fixup_entry (&lst, 0, 0, 1, current_address);
+  current_address = add_fixup_entry (&lst, 0, 0, 1, current_address, image_target);
 
   {
     grub_uint8_t *ptr;
@@ -562,17 +699,14 @@ make_reloc_section (Elf_Ehdr *e, void **out,
   return current_address;
 }
 
-#endif
-
 /* Determine if this section is a text section. Return false if this
    section is not allocated.  */
 static int
-is_text_section (Elf_Shdr *s)
+is_text_section (Elf_Shdr *s, struct image_target_desc *image_target)
 {
-#ifndef GRUB_MACHINE_EFI
-  if (grub_target_to_host32 (s->sh_type) != SHT_PROGBITS)
+  if (image_target->id != IMAGE_EFI 
+      && grub_target_to_host32 (s->sh_type) != SHT_PROGBITS)
     return 0;
-#endif
   return ((grub_target_to_host32 (s->sh_flags) & (SHF_EXECINSTR | SHF_ALLOC))
 	  == (SHF_EXECINSTR | SHF_ALLOC));
 }
@@ -581,12 +715,11 @@ is_text_section (Elf_Shdr *s)
    BSS is also a data section, since the converter initializes BSS
    when producing PE32 to avoid a bug in EFI implementations.  */
 static int
-is_data_section (Elf_Shdr *s)
+is_data_section (Elf_Shdr *s, struct image_target_desc *image_target)
 {
-#ifndef GRUB_MACHINE_EFI
-  if (grub_target_to_host32 (s->sh_type) != SHT_PROGBITS)
+  if (image_target->id != IMAGE_EFI 
+      && grub_target_to_host32 (s->sh_type) != SHT_PROGBITS)
     return 0;
-#endif
   return ((grub_target_to_host32 (s->sh_flags) & (SHF_EXECINSTR | SHF_ALLOC))
 	  == SHF_ALLOC);
 }
@@ -597,7 +730,8 @@ is_data_section (Elf_Shdr *s)
 static Elf_Addr *
 locate_sections (Elf_Shdr *sections, Elf_Half section_entsize,
 		 Elf_Half num_sections, const char *strtab,
-		 grub_size_t *exec_size, grub_size_t *kernel_sz)
+		 grub_size_t *exec_size, grub_size_t *kernel_sz,
+		 struct image_target_desc *image_target)
 {
   int i;
   Elf_Addr current_address;
@@ -613,14 +747,14 @@ locate_sections (Elf_Shdr *sections, Elf_Half section_entsize,
   for (i = 0, s = sections;
        i < num_sections;
        i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-    if (is_text_section (s))
+    if (is_text_section (s, image_target))
       {
 	Elf_Word align = grub_host_to_target32 (s->sh_addralign);
 	const char *name = strtab + grub_host_to_target32 (s->sh_name);
 
 	if (align)
-	  current_address = ALIGN_UP (current_address + VADDR_OFFSET, align)
-	    - VADDR_OFFSET;
+	  current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
+				      align) - image_target->vaddr_offset;
 
 	grub_util_info ("locating the section %s at 0x%x",
 			name, current_address);
@@ -628,22 +762,24 @@ locate_sections (Elf_Shdr *sections, Elf_Half section_entsize,
 	current_address += grub_host_to_target32 (s->sh_size);
       }
 
-  current_address = ALIGN_UP (current_address + VADDR_OFFSET, SECTION_ALIGN)
-    - VADDR_OFFSET;
+  current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
+			      image_target->section_align)
+    - image_target->vaddr_offset;
   *exec_size = current_address;
 
   /* .data */
   for (i = 0, s = sections;
        i < num_sections;
        i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-    if (is_data_section (s))
+    if (is_data_section (s, image_target))
       {
 	Elf_Word align = grub_host_to_target32 (s->sh_addralign);
 	const char *name = strtab + grub_host_to_target32 (s->sh_name);
 
 	if (align)
-	  current_address = ALIGN_UP (current_address + VADDR_OFFSET, align)
-	    - VADDR_OFFSET;
+	  current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
+				      align)
+	    - image_target->vaddr_offset;
 
 	grub_util_info ("locating the section %s at 0x%x",
 			name, current_address);
@@ -651,15 +787,15 @@ locate_sections (Elf_Shdr *sections, Elf_Half section_entsize,
 	current_address += grub_host_to_target32 (s->sh_size);
       }
 
-  current_address = ALIGN_UP (current_address + VADDR_OFFSET, SECTION_ALIGN)
-    - VADDR_OFFSET;
+  current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
+			      image_target->section_align) - image_target->vaddr_offset;
   *kernel_sz = current_address;
   return section_addresses;
 }
 
 /* Return if the ELF header is valid.  */
 static int
-check_elf_header (Elf_Ehdr *e, size_t size)
+check_elf_header (Elf_Ehdr *e, size_t size, struct image_target_desc *image_target)
 {
   if (size < sizeof (*e)
       || e->e_ident[EI_MAG0] != ELFMAG0
@@ -677,7 +813,8 @@ static char *
 load_image (const char *kernel_path, grub_size_t *exec_size, 
 	    grub_size_t *kernel_sz, grub_size_t *bss_size,
 	    grub_size_t total_module_size, Elf_Addr *start,
-	    void **reloc_section, grub_size_t *reloc_size)
+	    void **reloc_section, grub_size_t *reloc_size,
+	    struct image_target_desc *image_target)
 {
   char *kernel_img, *out_img;
   const char *strtab;
@@ -700,7 +837,7 @@ load_image (const char *kernel_path, grub_size_t *exec_size,
   grub_util_load_image (kernel_path, kernel_img);
 
   e = (Elf_Ehdr *) kernel_img;
-  if (! check_elf_header (e, kernel_size))
+  if (! check_elf_header (e, kernel_size, image_target))
     grub_util_error ("invalid ELF header");
 
   section_offset = grub_target_to_host32 (e->e_shoff);
@@ -719,85 +856,86 @@ load_image (const char *kernel_path, grub_size_t *exec_size,
 
   section_addresses = locate_sections (sections, section_entsize,
 				       num_sections, strtab,
-				       exec_size, kernel_sz);
+				       exec_size, kernel_sz, image_target);
 
-#ifdef GRUB_MACHINE_EFI
-  {
-    section_vaddresses = xmalloc (sizeof (*section_addresses) * num_sections);
+  if (image_target->id == IMAGE_EFI)
+    {
+      section_vaddresses = xmalloc (sizeof (*section_addresses) * num_sections);
 
-    for (i = 0; i < num_sections; i++)
-      section_vaddresses[i] = section_addresses[i] + VADDR_OFFSET;
+      for (i = 0; i < num_sections; i++)
+	section_vaddresses[i] = section_addresses[i] + image_target->vaddr_offset;
 
 #if 0
-    {
-      Elf_Addr current_address = *kernel_sz;
+      {
+	Elf_Addr current_address = *kernel_sz;
 
+	for (i = 0, s = sections;
+	     i < num_sections;
+	     i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+	  if (grub_target_to_host32 (s->sh_type) == SHT_NOBITS)
+	    {
+	      Elf_Word align = grub_host_to_target32 (s->sh_addralign);
+	      const char *name = strtab + grub_host_to_target32 (s->sh_name);
+
+	      if (align)
+		current_address = ALIGN_UP (current_address + VADDR_OFFSET, align)
+		  - VADDR_OFFSET;
+	
+	      grub_util_info ("locating the section %s at 0x%x",
+			      name, current_address);
+	      section_vaddresses[i] = current_address + VADDR_OFFSET;
+	      current_address += grub_host_to_target32 (s->sh_size);
+	    }
+	current_address = ALIGN_UP (current_address + VADDR_OFFSET, SECTION_ALIGN)
+	  - VADDR_OFFSET;
+	*bss_size = current_address - *kernel_sz;
+      }
+#else
+      *bss_size = 0;
+#endif
+
+      symtab_section = NULL;
       for (i = 0, s = sections;
 	   i < num_sections;
 	   i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-	if (grub_target_to_host32 (s->sh_type) == SHT_NOBITS)
+	if (s->sh_type == grub_host_to_target32 (SHT_SYMTAB))
 	  {
-	    Elf_Word align = grub_host_to_target32 (s->sh_addralign);
-	    const char *name = strtab + grub_host_to_target32 (s->sh_name);
-
-	    if (align)
-	      current_address = ALIGN_UP (current_address + VADDR_OFFSET, align)
-		- VADDR_OFFSET;
-	
-	    grub_util_info ("locating the section %s at 0x%x",
-			    name, current_address);
-	    section_vaddresses[i] = current_address + VADDR_OFFSET;
-	    current_address += grub_host_to_target32 (s->sh_size);
+	    symtab_section = s;
+	    break;
 	  }
-      current_address = ALIGN_UP (current_address + VADDR_OFFSET, SECTION_ALIGN)
-	- VADDR_OFFSET;
-      *bss_size = current_address - *kernel_sz;
+
+      if (! symtab_section)
+	grub_util_error ("no symbol table");
+
+      *start = relocate_symbols (e, sections, symtab_section,
+				 section_vaddresses, section_entsize,
+				 num_sections, image_target);
+      if (*start == 0)
+	grub_util_error ("start symbol is not defined");
+
+      /* Resolve addresses in the virtual address space.  */
+      relocate_addresses (e, sections, section_addresses, section_entsize,
+			  num_sections, strtab, image_target);
+
+      *reloc_size = make_reloc_section (e, reloc_section,
+					section_vaddresses, sections,
+					section_entsize, num_sections,
+					strtab, image_target);
+
+    }
+  else
+    {
+      *bss_size = 0;
+      *reloc_size = 0;
+      *reloc_section = NULL;
     }
-#else
-    *bss_size = 0;
-#endif
-
-    symtab_section = NULL;
-    for (i = 0, s = sections;
-	 i < num_sections;
-	 i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-      if (s->sh_type == grub_host_to_target32 (SHT_SYMTAB))
-	{
-	  symtab_section = s;
-	  break;
-	}
-
-    if (! symtab_section)
-      grub_util_error ("no symbol table");
-
-    *start = relocate_symbols (e, sections, symtab_section,
-			       section_vaddresses, section_entsize,
-			       num_sections);
-    if (*start == 0)
-      grub_util_error ("start symbol is not defined");
-
-    /* Resolve addresses in the virtual address space.  */
-    relocate_addresses (e, sections, section_addresses, section_entsize,
-			num_sections, strtab);
-
-    *reloc_size = make_reloc_section (e, reloc_section,
-				      section_vaddresses, sections,
-				      section_entsize, num_sections,
-				      strtab);
-
-  }
-#else
-  *bss_size = 0;
-  *reloc_size = 0;
-  *reloc_section = NULL;
-#endif
 
   out_img = xmalloc (*kernel_sz + total_module_size);
 
   for (i = 0, s = sections;
        i < num_sections;
        i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-    if (is_data_section (s) || is_text_section (s))
+    if (is_data_section (s, image_target) || is_text_section (s, image_target))
       {
 	if (grub_target_to_host32 (s->sh_type) == SHT_NOBITS)
 	  memset (out_img + section_addresses[i], 0,
@@ -815,13 +953,7 @@ load_image (const char *kernel_path, grub_size_t *exec_size,
 static void
 generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 		char *memdisk_path, char *font_path, char *config_path,
-#ifdef GRUB_PLATFORM_IMAGE_DEFAULT
-		grub_platform_image_format_t format,
-#else
-		int dummy __attribute__ ((unused)),
-#endif
-		int note
-)
+		struct image_target_desc *image_target, int note)
 {
   char *kernel_img, *core_img;
   size_t kernel_size, total_module_size, core_size, exec_size;
@@ -869,11 +1001,11 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
   kernel_img = load_image (kernel_path, &exec_size, &kernel_size, &bss_size,
 			   total_module_size, &start_address, &rel_section,
-			   &reloc_size);
+			   &reloc_size, image_target);
 
-  if (GRUB_KERNEL_MACHINE_PREFIX + strlen (prefix) + 1 > GRUB_KERNEL_MACHINE_DATA_END)
+  if (image_target->prefix + strlen (prefix) + 1 > image_target->data_end)
     grub_util_error (_("prefix is too long"));
-  strcpy (kernel_img + GRUB_KERNEL_MACHINE_PREFIX, prefix);
+  strcpy (kernel_img + image_target->prefix, prefix);
 
   /* Fill in the grub_module_info structure.  */
   modinfo = (struct grub_module_info *) (kernel_img + kernel_size);
@@ -946,402 +1078,401 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
     }
 
   grub_util_info ("kernel_img=%p, kernel_size=0x%x", kernel_img, kernel_size);
-  compress_kernel (kernel_img, kernel_size + total_module_size,
+  compress_kernel (image_target, kernel_img, kernel_size + total_module_size,
 		   &core_img, &core_size);
 
   grub_util_info ("the core size is 0x%x", core_size);
 
-#ifdef GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
-  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE))
-    = grub_host_to_target32 (total_module_size);
-#endif
-#ifdef GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE
-  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE))
-    = grub_host_to_target32 (kernel_size);
-#endif
-#ifdef GRUB_KERNEL_MACHINE_COMPRESSED_SIZE
-  *((grub_uint32_t *) (core_img + GRUB_KERNEL_MACHINE_COMPRESSED_SIZE))
-    = grub_host_to_target32 (core_size - GRUB_KERNEL_MACHINE_RAW_SIZE);
-#endif
+  if (image_target->total_module_size != TARGET_NO_FIELD)
+    *((grub_uint32_t *) (core_img + image_target->total_module_size))
+      = grub_host_to_target32 (total_module_size);
+  if (image_target->kernel_image_size != TARGET_NO_FIELD)
+    *((grub_uint32_t *) (core_img + image_target->kernel_image_size))
+      = grub_host_to_target32 (kernel_size);
+  if (image_target->compressed_size != TARGET_NO_FIELD)
+    *((grub_uint32_t *) (core_img + image_target->compressed_size))
+      = grub_host_to_target32 (core_size - image_target->raw_size);
 
-#if defined(GRUB_KERNEL_MACHINE_INSTALL_DOS_PART) && defined(GRUB_KERNEL_MACHINE_INSTALL_BSD_PART)
   /* If we included a drive in our prefix, let GRUB know it doesn't have to
      prepend the drive told by BIOS.  */
-  if (prefix[0] == '(')
+  if (image_target->install_dos_part != TARGET_NO_FIELD
+      && image_target->install_bsd_part != TARGET_NO_FIELD && prefix[0] == '(')
     {
-      *((grub_int32_t *) (core_img + GRUB_KERNEL_MACHINE_INSTALL_DOS_PART))
+      *((grub_int32_t *) (core_img + image_target->install_dos_part))
 	= grub_host_to_target32 (-2);
-      *((grub_int32_t *) (core_img + GRUB_KERNEL_MACHINE_INSTALL_BSD_PART))
+      *((grub_int32_t *) (core_img + image_target->install_bsd_part))
 	= grub_host_to_target32 (-2);
     }
-#endif
-
-#ifdef GRUB_MACHINE_PCBIOS
-  if (GRUB_KERNEL_MACHINE_LINK_ADDR + core_size > GRUB_MEMORY_MACHINE_UPPER)
-    grub_util_error (_("core image is too big (%p > %p)"),
- 		     GRUB_KERNEL_MACHINE_LINK_ADDR + core_size,
-		     GRUB_MEMORY_MACHINE_UPPER);
-#endif
-
-#if defined(GRUB_MACHINE_PCBIOS)
-  {
-    unsigned num;
-    char *boot_path, *boot_img;
-    size_t boot_size;
-    num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
-    if (num > 0xffff)
-      grub_util_error (_("the core image is too big"));
-
-    boot_path = grub_util_get_path (dir, "diskboot.img");
-    boot_size = grub_util_get_image_size (boot_path);
-    if (boot_size != GRUB_DISK_SECTOR_SIZE)
-      grub_util_error (_("diskboot.img size must be %u bytes"),
-		       GRUB_DISK_SECTOR_SIZE);
-
-    boot_img = grub_util_read_image (boot_path);
 
+  switch (image_target->id)
     {
-      struct grub_boot_blocklist *block;
-      block = (struct grub_boot_blocklist *) (boot_img
-					      + GRUB_DISK_SECTOR_SIZE
-					      - sizeof (*block));
-      block->len = grub_host_to_target16 (num);
+    case IMAGE_I386_PC:
+      {
+	unsigned num;
+	char *boot_path, *boot_img;
+	size_t boot_size;
 
-      /* This is filled elsewhere.  Verify it just in case.  */
-      assert (block->segment
-	      == grub_host_to_target16 (GRUB_BOOT_MACHINE_KERNEL_SEG
-					+ (GRUB_DISK_SECTOR_SIZE >> 4)));
-    }
+	if (GRUB_KERNEL_MACHINE_LINK_ADDR + core_size > GRUB_MEMORY_I386_PC_UPPER)
+	  grub_util_error (_("core image is too big (%p > %p)"),
+			   GRUB_KERNEL_MACHINE_LINK_ADDR + core_size,
+			   GRUB_MEMORY_I386_PC_UPPER);
 
-    grub_util_write_image (boot_img, boot_size, out);
-    free (boot_img);
-    free (boot_path);
-  }
-#elif defined(GRUB_MACHINE_EFI)
-  {
-    void *pe_img;
-    size_t pe_size;
-    struct grub_pe32_header *header;
-    struct grub_pe32_coff_header *c;
-    struct grub_pe32_optional_header *o;
-    struct grub_pe32_section_table *text_section, *data_section;
-    struct grub_pe32_section_table *mods_section, *reloc_section;
-    static const grub_uint8_t stub[] = GRUB_PE32_MSDOS_STUB;
-    int header_size = ALIGN_UP (sizeof (struct grub_pe32_header)
-				+ 5 * sizeof (struct grub_pe32_section_table),
-				SECTION_ALIGN);
-    int reloc_addr = ALIGN_UP (header_size + core_size, SECTION_ALIGN);
+	num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
+	if (num > 0xffff)
+	  grub_util_error (_("the core image is too big"));
 
-    pe_size = ALIGN_UP (reloc_addr + reloc_size, SECTION_ALIGN);
-    pe_img = xmalloc (reloc_addr + reloc_size);
-    memset (pe_img, 0, header_size);
-    memcpy (pe_img + header_size, core_img, core_size);
-    memcpy (pe_img + reloc_addr, rel_section, reloc_size);
-    header = pe_img;
+	boot_path = grub_util_get_path (dir, "diskboot.img");
+	boot_size = grub_util_get_image_size (boot_path);
+	if (boot_size != GRUB_DISK_SECTOR_SIZE)
+	  grub_util_error (_("diskboot.img size must be %u bytes"),
+			   GRUB_DISK_SECTOR_SIZE);
 
-    /* The magic.  */
-    memcpy (header->msdos_stub, stub, sizeof (header->msdos_stub));
-    memcpy (header->signature, "PE\0\0", sizeof (header->signature));
+	boot_img = grub_util_read_image (boot_path);
 
-    /* The COFF file header.  */
-    c = &header->coff_header;
-#if GRUB_TARGET_SIZEOF_VOID_P == 4
-    c->machine = grub_host_to_target16 (GRUB_PE32_MACHINE_I386);
-#else
-    c->machine = grub_host_to_target16 (GRUB_PE32_MACHINE_X86_64);
-#endif
+	{
+	  struct grub_pc_bios_boot_blocklist *block;
+	  block = (struct grub_pc_bios_boot_blocklist *) (boot_img
+							  + GRUB_DISK_SECTOR_SIZE
+							  - sizeof (*block));
+	  block->len = grub_host_to_target16 (num);
 
-    c->num_sections = grub_host_to_target16 (4);
-    c->time = grub_host_to_target32 (time (0));
-    c->optional_header_size = grub_host_to_target16 (sizeof (header->optional_header));
-    c->characteristics = grub_host_to_target16 (GRUB_PE32_EXECUTABLE_IMAGE
-						| GRUB_PE32_LINE_NUMS_STRIPPED
-#if GRUB_TARGET_SIZEOF_VOID_P == 4
-						| GRUB_PE32_32BIT_MACHINE
-#endif
-						| GRUB_PE32_LOCAL_SYMS_STRIPPED
-						| GRUB_PE32_DEBUG_STRIPPED);
+	  /* This is filled elsewhere.  Verify it just in case.  */
+	  assert (block->segment
+		  == grub_host_to_target16 (GRUB_BOOT_I386_PC_KERNEL_SEG
+					    + (GRUB_DISK_SECTOR_SIZE >> 4)));
+	}
 
-    /* The PE Optional header.  */
-    o = &header->optional_header;
-    o->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC);
-    o->code_size = grub_host_to_target32 (exec_size);
-    o->data_size = grub_cpu_to_le32 (reloc_addr - exec_size);
-    o->bss_size = grub_cpu_to_le32 (bss_size);
-    o->entry_addr = grub_cpu_to_le32 (start_address);
-    o->code_base = grub_cpu_to_le32 (header_size);
-#if GRUB_TARGET_SIZEOF_VOID_P == 4
-    o->data_base = grub_host_to_target32 (header_size + exec_size);
-#endif
-    o->image_base = 0;
-    o->section_alignment = grub_host_to_target32 (SECTION_ALIGN);
-    o->file_alignment = grub_host_to_target32 (SECTION_ALIGN);
-    o->image_size = grub_host_to_target32 (pe_size);
-    o->header_size = grub_host_to_target32 (header_size);
-    o->subsystem = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION);
+	grub_util_write_image (boot_img, boot_size, out);
+	free (boot_img);
+	free (boot_path);
+      }
+      break;
+    case IMAGE_EFI:
+      {
+	void *pe_img;
+	size_t pe_size;
+	struct grub_pe32_header *header;
+	struct grub_pe32_coff_header *c;
+	struct grub_pe32_optional_header *o;
+	struct grub_pe32_section_table *text_section, *data_section;
+	struct grub_pe32_section_table *mods_section, *reloc_section;
+	static const grub_uint8_t stub[] = GRUB_PE32_MSDOS_STUB;
+	int header_size = ALIGN_UP (sizeof (struct grub_pe32_header)
+				    + 5 * sizeof (struct grub_pe32_section_table),
+				    image_target->section_align);
+	int reloc_addr = ALIGN_UP (header_size + core_size, image_target->section_align);
 
-    /* Do these really matter? */
-    o->stack_reserve_size = grub_host_to_target32 (0x10000);
-    o->stack_commit_size = grub_host_to_target32 (0x10000);
-    o->heap_reserve_size = grub_host_to_target32 (0x10000);
-    o->heap_commit_size = grub_host_to_target32 (0x10000);
+	pe_size = ALIGN_UP (reloc_addr + reloc_size, image_target->section_align);
+	pe_img = xmalloc (reloc_addr + reloc_size);
+	memset (pe_img, 0, header_size);
+	memcpy (pe_img + header_size, core_img, core_size);
+	memcpy (pe_img + reloc_addr, rel_section, reloc_size);
+	header = pe_img;
+
+	/* The magic.  */
+	memcpy (header->msdos_stub, stub, sizeof (header->msdos_stub));
+	memcpy (header->signature, "PE\0\0", sizeof (header->signature));
+
+	/* The COFF file header.  */
+	c = &header->coff_header;
+	if (image_target->voidp_sizeof == 4)
+	  c->machine = grub_host_to_target16 (GRUB_PE32_MACHINE_I386);
+	else
+	  c->machine = grub_host_to_target16 (GRUB_PE32_MACHINE_X86_64);
+
+	c->num_sections = grub_host_to_target16 (4);
+	c->time = grub_host_to_target32 (time (0));
+	c->optional_header_size = grub_host_to_target16 (sizeof (header->optional_header));
+	c->characteristics = grub_host_to_target16 (GRUB_PE32_EXECUTABLE_IMAGE
+						    | GRUB_PE32_LINE_NUMS_STRIPPED
+						    | ((image_target->voidp_sizeof == 4)
+						       ? GRUB_PE32_32BIT_MACHINE
+						       : 0)
+						    | GRUB_PE32_LOCAL_SYMS_STRIPPED
+						    | GRUB_PE32_DEBUG_STRIPPED);
+
+	/* The PE Optional header.  */
+	o = &header->optional_header;
+	o->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC);
+	o->code_size = grub_host_to_target32 (exec_size);
+	o->data_size = grub_cpu_to_le32 (reloc_addr - exec_size);
+	o->bss_size = grub_cpu_to_le32 (bss_size);
+	o->entry_addr = grub_cpu_to_le32 (start_address);
+	o->code_base = grub_cpu_to_le32 (header_size);
+	if (image_target->voidp_sizeof == 4)
+	  o->data_base = grub_host_to_target32 (header_size + exec_size);
+	o->image_base = 0;
+	o->section_alignment = grub_host_to_target32 (image_target->section_align);
+	o->file_alignment = grub_host_to_target32 (image_target->section_align);
+	o->image_size = grub_host_to_target32 (pe_size);
+	o->header_size = grub_host_to_target32 (header_size);
+	o->subsystem = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION);
+
+	/* Do these really matter? */
+	o->stack_reserve_size = grub_host_to_target32 (0x10000);
+	o->stack_commit_size = grub_host_to_target32 (0x10000);
+	o->heap_reserve_size = grub_host_to_target32 (0x10000);
+	o->heap_commit_size = grub_host_to_target32 (0x10000);
     
-    o->num_data_directories = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES);
+	o->num_data_directories = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES);
 
-    o->base_relocation_table.rva = grub_host_to_target32 (reloc_addr);
-    o->base_relocation_table.size = grub_host_to_target32 (reloc_size);
+	o->base_relocation_table.rva = grub_host_to_target32 (reloc_addr);
+	o->base_relocation_table.size = grub_host_to_target32 (reloc_size);
 
-    /* The sections.  */
-    text_section = (struct grub_pe32_section_table *) (header + 1);
-    strcpy (text_section->name, ".text");
-    text_section->virtual_size = grub_cpu_to_le32 (exec_size);
-    text_section->virtual_address = grub_cpu_to_le32 (header_size);
-    text_section->raw_data_size = grub_cpu_to_le32 (exec_size);
-    text_section->raw_data_offset = grub_cpu_to_le32 (header_size);
-    text_section->characteristics = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_CODE
-						      | GRUB_PE32_SCN_MEM_EXECUTE
-						      | GRUB_PE32_SCN_MEM_READ
-						      | GRUB_PE32_SCN_ALIGN_64BYTES);
+	/* The sections.  */
+	text_section = (struct grub_pe32_section_table *) (header + 1);
+	strcpy (text_section->name, ".text");
+	text_section->virtual_size = grub_cpu_to_le32 (exec_size);
+	text_section->virtual_address = grub_cpu_to_le32 (header_size);
+	text_section->raw_data_size = grub_cpu_to_le32 (exec_size);
+	text_section->raw_data_offset = grub_cpu_to_le32 (header_size);
+	text_section->characteristics = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_CODE
+							  | GRUB_PE32_SCN_MEM_EXECUTE
+							  | GRUB_PE32_SCN_MEM_READ
+							  | GRUB_PE32_SCN_ALIGN_64BYTES);
 
-    data_section = text_section + 1;
-    strcpy (data_section->name, ".data");
-    data_section->virtual_size = grub_cpu_to_le32 (kernel_size - exec_size);
-    data_section->virtual_address = grub_cpu_to_le32 (header_size + exec_size);
-    data_section->raw_data_size = grub_cpu_to_le32 (kernel_size - exec_size);
-    data_section->raw_data_offset = grub_cpu_to_le32 (header_size + exec_size);
-    data_section->characteristics
-      = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
-			  | GRUB_PE32_SCN_MEM_READ
-			  | GRUB_PE32_SCN_MEM_WRITE
-			  | GRUB_PE32_SCN_ALIGN_64BYTES);
+	data_section = text_section + 1;
+	strcpy (data_section->name, ".data");
+	data_section->virtual_size = grub_cpu_to_le32 (kernel_size - exec_size);
+	data_section->virtual_address = grub_cpu_to_le32 (header_size + exec_size);
+	data_section->raw_data_size = grub_cpu_to_le32 (kernel_size - exec_size);
+	data_section->raw_data_offset = grub_cpu_to_le32 (header_size + exec_size);
+	data_section->characteristics
+	  = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
+			      | GRUB_PE32_SCN_MEM_READ
+			      | GRUB_PE32_SCN_MEM_WRITE
+			      | GRUB_PE32_SCN_ALIGN_64BYTES);
 
 #if 0
-    bss_section = data_section + 1;
-    strcpy (bss_section->name, ".bss");
-    bss_section->virtual_size = grub_cpu_to_le32 (bss_size);
-    bss_section->virtual_address = grub_cpu_to_le32 (header_size + kernel_size);
-    bss_section->raw_data_size = 0;
-    bss_section->raw_data_offset = 0;
-    bss_section->characteristics
-      = grub_cpu_to_le32 (GRUB_PE32_SCN_MEM_READ
-			  | GRUB_PE32_SCN_MEM_WRITE
-			  | GRUB_PE32_SCN_ALIGN_64BYTES
-			  | GRUB_PE32_SCN_CNT_INITIALIZED_DATA
-			  | 0x80);
+	bss_section = data_section + 1;
+	strcpy (bss_section->name, ".bss");
+	bss_section->virtual_size = grub_cpu_to_le32 (bss_size);
+	bss_section->virtual_address = grub_cpu_to_le32 (header_size + kernel_size);
+	bss_section->raw_data_size = 0;
+	bss_section->raw_data_offset = 0;
+	bss_section->characteristics
+	  = grub_cpu_to_le32 (GRUB_PE32_SCN_MEM_READ
+			      | GRUB_PE32_SCN_MEM_WRITE
+			      | GRUB_PE32_SCN_ALIGN_64BYTES
+			      | GRUB_PE32_SCN_CNT_INITIALIZED_DATA
+			      | 0x80);
 #endif
     
-    mods_section = data_section + 1;
-    strcpy (mods_section->name, "mods");
-    mods_section->virtual_size = grub_cpu_to_le32 (reloc_addr - kernel_size - header_size);
-    mods_section->virtual_address = grub_cpu_to_le32 (header_size + kernel_size + bss_size);
-    mods_section->raw_data_size = grub_cpu_to_le32 (reloc_addr - kernel_size - header_size);
-    mods_section->raw_data_offset = grub_cpu_to_le32 (header_size + kernel_size);
-    mods_section->characteristics
-      = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
-			  | GRUB_PE32_SCN_MEM_READ
-			  | GRUB_PE32_SCN_MEM_WRITE
-			  | GRUB_PE32_SCN_ALIGN_64BYTES);
+	mods_section = data_section + 1;
+	strcpy (mods_section->name, "mods");
+	mods_section->virtual_size = grub_cpu_to_le32 (reloc_addr - kernel_size - header_size);
+	mods_section->virtual_address = grub_cpu_to_le32 (header_size + kernel_size + bss_size);
+	mods_section->raw_data_size = grub_cpu_to_le32 (reloc_addr - kernel_size - header_size);
+	mods_section->raw_data_offset = grub_cpu_to_le32 (header_size + kernel_size);
+	mods_section->characteristics
+	  = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
+			      | GRUB_PE32_SCN_MEM_READ
+			      | GRUB_PE32_SCN_MEM_WRITE
+			      | GRUB_PE32_SCN_ALIGN_64BYTES);
 
-    reloc_section = mods_section + 1;
-    strcpy (reloc_section->name, ".reloc");
-    reloc_section->virtual_size = grub_cpu_to_le32 (reloc_size);
-    reloc_section->virtual_address = grub_cpu_to_le32 (reloc_addr + bss_size);
-    reloc_section->raw_data_size = grub_cpu_to_le32 (reloc_size);
-    reloc_section->raw_data_offset = grub_cpu_to_le32 (reloc_addr);
-    reloc_section->characteristics
-      = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
-			  | GRUB_PE32_SCN_MEM_DISCARDABLE
-			  | GRUB_PE32_SCN_MEM_READ);
-    free (core_img);
-    core_img = pe_img;
-    core_size = pe_size;
-  }
-#elif defined(GRUB_MACHINE_QEMU)
-  {
-    char *rom_img;
-    size_t rom_size;
-    char *boot_path, *boot_img;
-    size_t boot_size;
+	reloc_section = mods_section + 1;
+	strcpy (reloc_section->name, ".reloc");
+	reloc_section->virtual_size = grub_cpu_to_le32 (reloc_size);
+	reloc_section->virtual_address = grub_cpu_to_le32 (reloc_addr + bss_size);
+	reloc_section->raw_data_size = grub_cpu_to_le32 (reloc_size);
+	reloc_section->raw_data_offset = grub_cpu_to_le32 (reloc_addr);
+	reloc_section->characteristics
+	  = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
+			      | GRUB_PE32_SCN_MEM_DISCARDABLE
+			      | GRUB_PE32_SCN_MEM_READ);
+	free (core_img);
+	core_img = pe_img;
+	core_size = pe_size;
+      }
+      break;
+    case IMAGE_QEMU:
+      {
+	char *rom_img;
+	size_t rom_size;
+	char *boot_path, *boot_img;
+	size_t boot_size;
 
-    boot_path = grub_util_get_path (dir, "boot.img");
-    boot_size = grub_util_get_image_size (boot_path);
-    boot_img = grub_util_read_image (boot_path);
+	boot_path = grub_util_get_path (dir, "boot.img");
+	boot_size = grub_util_get_image_size (boot_path);
+	boot_img = grub_util_read_image (boot_path);
 
-    /* Rom sizes must be 64k-aligned.  */
-    rom_size = ALIGN_UP (core_size + boot_size, 64 * 1024);
+	/* Rom sizes must be 64k-aligned.  */
+	rom_size = ALIGN_UP (core_size + boot_size, 64 * 1024);
 
-    rom_img = xmalloc (rom_size);
-    memset (rom_img, 0, rom_size);
+	rom_img = xmalloc (rom_size);
+	memset (rom_img, 0, rom_size);
 
-    *((grub_int32_t *) (core_img + GRUB_KERNEL_MACHINE_CORE_ENTRY_ADDR))
-      = grub_host_to_target32 ((grub_uint32_t) -rom_size);
+	*((grub_int32_t *) (core_img + GRUB_KERNEL_I386_QEMU_CORE_ENTRY_ADDR))
+	  = grub_host_to_target32 ((grub_uint32_t) -rom_size);
 
-    memcpy (rom_img, core_img, core_size);
+	memcpy (rom_img, core_img, core_size);
 
-    *((grub_int32_t *) (boot_img + GRUB_BOOT_MACHINE_CORE_ENTRY_ADDR))
-      = grub_host_to_target32 ((grub_uint32_t) -rom_size);
+	*((grub_int32_t *) (boot_img + GRUB_BOOT_I386_QEMU_CORE_ENTRY_ADDR))
+	  = grub_host_to_target32 ((grub_uint32_t) -rom_size);
 
-    memcpy (rom_img + rom_size - boot_size, boot_img, boot_size);
+	memcpy (rom_img + rom_size - boot_size, boot_img, boot_size);
 
-    free (core_img);
-    core_img = rom_img;
-    core_size = rom_size;
+	free (core_img);
+	core_img = rom_img;
+	core_size = rom_size;
 
-    free (boot_img);
-    free (boot_path);
-  }
-#elif defined (GRUB_MACHINE_SPARC64)
-  if (format == GRUB_PLATFORM_IMAGE_AOUT)
-    {
-      void *aout_img;
-      size_t aout_size;
-      struct grub_aout32_header *aout_head;
+	free (boot_img);
+	free (boot_path);
+      }
+      break;
+    case IMAGE_SPARC64_AOUT:
+      {
+	void *aout_img;
+	size_t aout_size;
+	struct grub_aout32_header *aout_head;
 
-      aout_size = core_size + sizeof (*aout_head);
-      aout_img = xmalloc (aout_size);
-      aout_head = aout_img;
-      aout_head->a_midmag = grub_host_to_target32 ((AOUT_MID_SUN << 16)
-						   | AOUT32_OMAGIC);
-      aout_head->a_text = grub_host_to_target32 (core_size);
-      aout_head->a_entry
-	= grub_host_to_target32 (GRUB_BOOT_MACHINE_IMAGE_ADDRESS);
-      memcpy (aout_img + sizeof (*aout_head), core_img, core_size);
+	aout_size = core_size + sizeof (*aout_head);
+	aout_img = xmalloc (aout_size);
+	aout_head = aout_img;
+	aout_head->a_midmag = grub_host_to_target32 ((AOUT_MID_SUN << 16)
+						     | AOUT32_OMAGIC);
+	aout_head->a_text = grub_host_to_target32 (core_size);
+	aout_head->a_entry
+	  = grub_host_to_target32 (GRUB_BOOT_SPARC64_IEEE1275_IMAGE_ADDRESS);
+	memcpy (aout_img + sizeof (*aout_head), core_img, core_size);
 
-      free (core_img);
-      core_img = aout_img;
-      core_size = aout_size;
+	free (core_img);
+	core_img = aout_img;
+	core_size = aout_size;
+      }
+      break;
+    case IMAGE_SPARC64_RAW:
+      {
+	unsigned int num;
+	char *boot_path, *boot_img;
+	size_t boot_size;
+
+	num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
+	num <<= GRUB_DISK_SECTOR_BITS;
+
+	boot_path = grub_util_get_path (dir, "diskboot.img");
+	boot_size = grub_util_get_image_size (boot_path);
+	if (boot_size != GRUB_DISK_SECTOR_SIZE)
+	  grub_util_error ("diskboot.img is not one sector size");
+
+	boot_img = grub_util_read_image (boot_path);
+
+	*((grub_uint32_t *) (boot_img + GRUB_DISK_SECTOR_SIZE
+			     - GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE + 8))
+	  = grub_host_to_target32 (num);
+
+	grub_util_write_image (boot_img, boot_size, out);
+	free (boot_img);
+	free (boot_path);
+      }
+      break;
+    case IMAGE_YEELOONG_ELF:
+    case IMAGE_PPC:
+    case IMAGE_COREBOOT:
+    case IMAGE_I386_IEEE1275:
+      {
+	char *elf_img;
+	size_t program_size;
+	Elf32_Ehdr *ehdr;
+	Elf32_Phdr *phdr;
+	grub_uint32_t target_addr;
+	int header_size, footer_size = 0;
+	int phnum = 1;
+
+	if (note)
+	  {
+	    phnum++;
+	    footer_size += sizeof (struct grub_ieee1275_note);
+	  }
+	header_size = ALIGN_ADDR (sizeof (*ehdr) + phnum * sizeof (*phdr));
+
+	program_size = ALIGN_ADDR (core_size);
+
+	elf_img = xmalloc (program_size + header_size + footer_size);
+	memset (elf_img, 0, program_size + header_size);
+	memcpy (elf_img  + header_size, core_img, core_size);
+	ehdr = (void *) elf_img;
+	phdr = (void *) (elf_img + sizeof (*ehdr));
+	memcpy (ehdr->e_ident, ELFMAG, SELFMAG);
+	ehdr->e_ident[EI_CLASS] = ELFCLASS32;
+	if (!image_target->bigendian)
+	  ehdr->e_ident[EI_DATA] = ELFDATA2LSB;
+	else
+	  ehdr->e_ident[EI_DATA] = ELFDATA2MSB;
+	ehdr->e_ident[EI_VERSION] = EV_CURRENT;
+	ehdr->e_ident[EI_OSABI] = ELFOSABI_NONE;
+	ehdr->e_type = grub_host_to_target16 (ET_EXEC);
+	ehdr->e_machine = grub_host_to_target16 (image_target->elf_target);
+	ehdr->e_version = grub_host_to_target32 (EV_CURRENT);
+
+	ehdr->e_phoff = grub_host_to_target32 ((char *) phdr - (char *) ehdr);
+	ehdr->e_phentsize = grub_host_to_target16 (sizeof (*phdr));
+	ehdr->e_phnum = grub_host_to_target16 (phnum);
+
+	/* No section headers.  */
+	ehdr->e_shoff = grub_host_to_target32 (0);
+	ehdr->e_shentsize = grub_host_to_target16 (0);
+	ehdr->e_shnum = grub_host_to_target16 (0);
+	ehdr->e_shstrndx = grub_host_to_target16 (0);
+
+	ehdr->e_ehsize = grub_host_to_target16 (sizeof (*ehdr));
+
+	phdr->p_type = grub_host_to_target32 (PT_LOAD);
+	phdr->p_offset = grub_host_to_target32 (header_size);
+	phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
+
+	if (image_target->id == IMAGE_YEELOONG_ELF)
+	  target_addr = ALIGN_UP (GRUB_KERNEL_MACHINE_LINK_ADDR
+				+ kernel_size + total_module_size, 32);
+	else
+	  target_addr = GRUB_KERNEL_MACHINE_LINK_ADDR;
+	ehdr->e_entry = grub_host_to_target32 (target_addr);
+	phdr->p_vaddr = grub_host_to_target32 (target_addr);
+	phdr->p_paddr = grub_host_to_target32 (target_addr);
+	phdr->p_align = grub_host_to_target32 (image_target->link_align);
+	if (image_target->id == IMAGE_YEELOONG_ELF)
+	  ehdr->e_flags = grub_host_to_target32 (0x1000 | EF_MIPS_NOREORDER 
+						 | EF_MIPS_PIC | EF_MIPS_CPIC);
+	else
+	  ehdr->e_flags = 0;
+	phdr->p_filesz = grub_host_to_target32 (core_size);
+	phdr->p_memsz = grub_host_to_target32 (core_size);
+
+	if (note)
+	  {
+	    int note_size = sizeof (struct grub_ieee1275_note);
+	    struct grub_ieee1275_note *note = (struct grub_ieee1275_note *) 
+	      (elf_img + program_size + header_size);
+
+	    grub_util_info ("adding CHRP NOTE segment");
+
+	    note->header.namesz = grub_host_to_target32 (sizeof (GRUB_IEEE1275_NOTE_NAME));
+	    note->header.descsz = grub_host_to_target32 (note_size);
+	    note->header.type = grub_host_to_target32 (GRUB_IEEE1275_NOTE_TYPE);
+	    strcpy (note->header.name, GRUB_IEEE1275_NOTE_NAME);
+	    note->descriptor.real_mode = grub_host_to_target32 (0xffffffff);
+	    note->descriptor.real_base = grub_host_to_target32 (0x00c00000);
+	    note->descriptor.real_size = grub_host_to_target32 (0xffffffff);
+	    note->descriptor.virt_base = grub_host_to_target32 (0xffffffff);
+	    note->descriptor.virt_size = grub_host_to_target32 (0xffffffff);
+	    note->descriptor.load_base = grub_host_to_target32 (0x00004000);
+
+	    phdr[1].p_type = grub_host_to_target32 (PT_NOTE);
+	    phdr[1].p_flags = grub_host_to_target32 (PF_R);
+	    phdr[1].p_align = grub_host_to_target32 (GRUB_TARGET_SIZEOF_LONG);
+	    phdr[1].p_vaddr = 0;
+	    phdr[1].p_paddr = 0;
+	    phdr[1].p_filesz = grub_host_to_target32 (note_size);
+	    phdr[1].p_memsz = 0;
+	    phdr[1].p_offset = grub_host_to_target32 (header_size + program_size);
+	  }
+
+	free (core_img);
+	core_img = elf_img;
+	core_size = program_size + header_size + footer_size;
+      }
+      break;
     }
-  else
-    {
-      unsigned int num;
-      char *boot_path, *boot_img;
-      size_t boot_size;
-
-      num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
-      num <<= GRUB_DISK_SECTOR_BITS;
-
-      boot_path = grub_util_get_path (dir, "diskboot.img");
-      boot_size = grub_util_get_image_size (boot_path);
-      if (boot_size != GRUB_DISK_SECTOR_SIZE)
-	grub_util_error ("diskboot.img is not one sector size");
-
-      boot_img = grub_util_read_image (boot_path);
-
-      *((grub_uint32_t *) (boot_img + GRUB_DISK_SECTOR_SIZE
-			   - GRUB_BOOT_MACHINE_LIST_SIZE + 8))
-	= grub_host_to_target32 (num);
-
-      grub_util_write_image (boot_img, boot_size, out);
-      free (boot_img);
-      free (boot_path);
-    }
-#elif defined(GRUB_MACHINE_MIPS) || defined (GRUB_MACHINE_IEEE1275)
-  if (format == GRUB_PLATFORM_IMAGE_ELF)
-    {
-      char *elf_img;
-      size_t program_size;
-      Elf32_Ehdr *ehdr;
-      Elf32_Phdr *phdr;
-      grub_uint32_t target_addr;
-      int header_size, footer_size = 0;
-      int phnum = 1;
-
-      if (note)
-	{
-	  phnum++;
-	  footer_size += sizeof (struct grub_ieee1275_note);
-	}
-      header_size = ALIGN_ADDR (sizeof (*ehdr) + phnum * sizeof (*phdr));
-
-      program_size = ALIGN_ADDR (core_size);
-
-      elf_img = xmalloc (program_size + header_size + footer_size);
-      memset (elf_img, 0, program_size + header_size);
-      memcpy (elf_img  + header_size, core_img, core_size);
-      ehdr = (void *) elf_img;
-      phdr = (void *) (elf_img + sizeof (*ehdr));
-      memcpy (ehdr->e_ident, ELFMAG, SELFMAG);
-      ehdr->e_ident[EI_CLASS] = ELFCLASS32;
-#ifdef GRUB_CPU_MIPSEL
-      ehdr->e_ident[EI_DATA] = ELFDATA2LSB;
-#else
-      ehdr->e_ident[EI_DATA] = ELFDATA2MSB;
-#endif
-      ehdr->e_ident[EI_VERSION] = EV_CURRENT;
-      ehdr->e_ident[EI_OSABI] = ELFOSABI_NONE;
-      ehdr->e_type = grub_host_to_target16 (ET_EXEC);
-      ehdr->e_machine = grub_host_to_target16 (EM_TARGET);
-      ehdr->e_version = grub_host_to_target32 (EV_CURRENT);
-
-      ehdr->e_phoff = grub_host_to_target32 ((char *) phdr - (char *) ehdr);
-      ehdr->e_phentsize = grub_host_to_target16 (sizeof (*phdr));
-      ehdr->e_phnum = grub_host_to_target16 (phnum);
-
-      /* No section headers.  */
-      ehdr->e_shoff = grub_host_to_target32 (0);
-      ehdr->e_shentsize = grub_host_to_target16 (0);
-      ehdr->e_shnum = grub_host_to_target16 (0);
-      ehdr->e_shstrndx = grub_host_to_target16 (0);
-
-      ehdr->e_ehsize = grub_host_to_target16 (sizeof (*ehdr));
-
-      phdr->p_type = grub_host_to_target32 (PT_LOAD);
-      phdr->p_offset = grub_host_to_target32 (header_size);
-      phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
-
-#if defined(GRUB_MACHINE_MIPS)
-      target_addr = ALIGN_UP (GRUB_KERNEL_MACHINE_LINK_ADDR
-			      + kernel_size + total_module_size, 32);
-#else
-      target_addr = GRUB_KERNEL_MACHINE_LINK_ADDR;
-#endif
-      ehdr->e_entry = grub_host_to_target32 (target_addr);
-      phdr->p_vaddr = grub_host_to_target32 (target_addr);
-      phdr->p_paddr = grub_host_to_target32 (target_addr);
-      phdr->p_align = grub_host_to_target32 (GRUB_KERNEL_MACHINE_LINK_ALIGN);
-#if defined(GRUB_MACHINE_MIPS)
-      ehdr->e_flags = grub_host_to_target32 (0x1000 | EF_MIPS_NOREORDER 
-					     | EF_MIPS_PIC | EF_MIPS_CPIC);
-#else
-      ehdr->e_flags = 0;
-#endif
-      phdr->p_filesz = grub_host_to_target32 (core_size);
-      phdr->p_memsz = grub_host_to_target32 (core_size);
-
-      if (note)
-	{
-	  int note_size = sizeof (struct grub_ieee1275_note);
-	  struct grub_ieee1275_note *note = (struct grub_ieee1275_note *) 
-	    (elf_img + program_size + header_size);
-
-	  grub_util_info ("adding CHRP NOTE segment");
-
-	  note->header.namesz = grub_host_to_target32 (sizeof (GRUB_IEEE1275_NOTE_NAME));
-	  note->header.descsz = grub_host_to_target32 (note_size);
-	  note->header.type = grub_host_to_target32 (GRUB_IEEE1275_NOTE_TYPE);
-	  strcpy (note->header.name, GRUB_IEEE1275_NOTE_NAME);
-	  note->descriptor.real_mode = grub_host_to_target32 (0xffffffff);
-	  note->descriptor.real_base = grub_host_to_target32 (0x00c00000);
-	  note->descriptor.real_size = grub_host_to_target32 (0xffffffff);
-	  note->descriptor.virt_base = grub_host_to_target32 (0xffffffff);
-	  note->descriptor.virt_size = grub_host_to_target32 (0xffffffff);
-	  note->descriptor.load_base = grub_host_to_target32 (0x00004000);
-
-	  phdr[1].p_type = grub_host_to_target32 (PT_NOTE);
-	  phdr[1].p_flags = grub_host_to_target32 (PF_R);
-	  phdr[1].p_align = grub_host_to_target32 (GRUB_TARGET_SIZEOF_LONG);
-	  phdr[1].p_vaddr = 0;
-	  phdr[1].p_paddr = 0;
-	  phdr[1].p_filesz = grub_host_to_target32 (note_size);
-	  phdr[1].p_memsz = 0;
-	  phdr[1].p_offset = grub_host_to_target32 (header_size + program_size);
-	}
-
-      free (core_img);
-      core_img = elf_img;
-      core_size = program_size + header_size + footer_size;
-  }
-#endif
 
   grub_util_write_image (core_img, core_size, out);
   free (kernel_img);
@@ -1368,9 +1499,7 @@ static struct option options[] =
     {"config", required_argument, 0, 'c'},
     {"output", required_argument, 0, 'o'},
     {"note", no_argument, 0, 'n'},
-#ifdef GRUB_PLATFORM_IMAGE_DEFAULT
     {"format", required_argument, 0, 'O'},
-#endif
     {"help", no_argument, 0, 'h'},
     {"version", no_argument, 0, 'V'},
     {"verbose", no_argument, 0, 'v'},
@@ -1383,7 +1512,24 @@ usage (int status)
   if (status)
     fprintf (stderr, _("Try `%s --help' for more information.\n"), program_name);
   else
-    printf (_("\
+    {
+      int format_len = 0;
+      char *formats;
+      char *ptr;
+      unsigned i;
+      for (i = 0; i < ARRAY_SIZE (image_targets); i++)
+	format_len += strlen (image_targets[i].name) + 2;
+      ptr = formats = xmalloc (format_len);
+      for (i = 0; i < ARRAY_SIZE (image_targets); i++)
+	{
+	  strcpy (ptr, image_targets[i].name);
+	  ptr += strlen (image_targets[i].name);
+	  *ptr++ = ',';
+	  *ptr++ = ' ';
+	}
+      ptr[-2] = 0;
+
+      printf (_("\
 Usage: %s [OPTION]... [MODULES]\n\
 \n\
 Make a bootable image of GRUB.\n\
@@ -1394,25 +1540,20 @@ Make a bootable image of GRUB.\n\
   -f, --font=FILE         embed FILE as a boot font\n\
   -c, --config=FILE       embed FILE as boot config\n\
   -n, --note              add NOTE segment for CHRP Open Firmware\n\
-  -o, --output=FILE       output a generated image to FILE [default=stdout]\n"
-#ifdef GRUB_PLATFORM_IMAGE_DEFAULT
-	    "\
-  -O, --format=FORMAT     generate an image in format [default=%s]\n\
-                          available formats: %s\n"
-#endif
-	    "\
+  -o, --output=FILE       output a generated image to FILE [default=stdout]\n\
+  -O, --format=FORMAT     generate an image in format\n\
+                          available formats: %s\n\
   -h, --help              display this message and exit\n\
   -V, --version           print version information and exit\n\
   -v, --verbose           print verbose messages\n\
 \n\
 Report bugs to <%s>.\n\
 "), 
-program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY,
-#ifdef GRUB_PLATFORM_IMAGE_DEFAULT
-  GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT, GRUB_PLATFORM_IMAGE_FORMATS,
-#endif
-PACKAGE_BUGREPORT);
-
+	      program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY,
+	      formats,
+	      PACKAGE_BUGREPORT);
+      free (formats);
+    }
   exit (status);
 }
 
@@ -1427,9 +1568,7 @@ main (int argc, char *argv[])
   char *config = NULL;
   FILE *fp = stdout;
   int note = 0;
-#ifdef GRUB_PLATFORM_IMAGE_DEFAULT
-  grub_platform_image_format_t format = GRUB_PLATFORM_IMAGE_DEFAULT;
-#endif
+  struct image_target_desc *image_target = NULL;
 
   set_program_name (argv[0]);
 
@@ -1451,27 +1590,19 @@ main (int argc, char *argv[])
 	    output = xstrdup (optarg);
 	    break;
 
-#ifdef GRUB_PLATFORM_IMAGE_DEFAULT
 	  case 'O':
-#ifdef GRUB_PLATFORM_IMAGE_RAW
-	    if (strcmp (optarg, "raw") == 0)
-	      format = GRUB_PLATFORM_IMAGE_RAW;
-	    else 
-#endif
-#ifdef GRUB_PLATFORM_IMAGE_ELF
-	    if (strcmp (optarg, "elf") == 0)
-	      format = GRUB_PLATFORM_IMAGE_ELF;
-	    else 
-#endif
-#ifdef GRUB_PLATFORM_IMAGE_AOUT
-	    if (strcmp (optarg, "aout") == 0)
-	      format = GRUB_PLATFORM_IMAGE_AOUT;
-	    else 
-#endif
-	      usage (1);
-	    break;
-#endif
-
+	    {
+	      unsigned i;
+	      for (i = 0; i < ARRAY_SIZE (image_targets); i++)
+		if (strcmp (optarg, image_targets[i].name) == 0)
+		  image_target = &image_targets[i];
+	      if (!image_target)
+		{
+		  printf ("unknown target %s\n", optarg);
+		  usage (1);
+		}
+	      break;
+	    }
 	  case 'd':
 	    if (dir)
 	      free (dir);
@@ -1534,6 +1665,12 @@ main (int argc, char *argv[])
 	  }
     }
 
+  if (!image_target)
+    {
+      printf ("Target not specified.\n");
+      usage (1);
+    }
+
   if (output)
     {
       fp = fopen (output, "wb");
@@ -1544,12 +1681,7 @@ main (int argc, char *argv[])
 
   generate_image (dir ? : GRUB_LIBDIR, prefix ? : DEFAULT_DIRECTORY, fp,
 		  argv + optind, memdisk, font, config,
-#ifdef GRUB_PLATFORM_IMAGE_DEFAULT
-		  format,
-#else
-		  0,
-#endif
-		  note);
+		  image_target, note);
 
   fclose (fp);
 
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index aafdfb059..7d553a767 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -171,7 +171,7 @@ fi
 if test -e "${pc_dir}" ; then
     echo "Enabling BIOS support ..."
     core_img=`mktemp "$MKTEMP_TEMPLATE"`
-    grub-mkimage -d ${pc_dir}/ -o ${core_img} --prefix=/boot/grub/i386-pc \
+    grub-mkimage -d ${pc_dir}/ -O i386-pc -o ${core_img} --prefix=/boot/grub/i386-pc \
         iso9660 biosdisk
     cat ${pc_dir}/cdboot.img ${core_img} > ${iso9660_dir}/boot/grub/i386-pc/eltorito.img
 

From 460d8402e033873f16a2ebe32ca490d6cbdb9ebf Mon Sep 17 00:00:00 2001
From: Christian Franke <franke@computer.org>
Date: Mon, 26 Apr 2010 03:35:55 +0200
Subject: [PATCH 0835/1628] 	* include/grub/util/getroot.h
 (grub_get_prefix): Remove prototype. 	* util/getroot.c [__CYGWIN__]
 (get_win32_path): Remove function. 	(grub_get_prefix): Remove function. 
 * util/grub-emu.c (main): Replace grub_get_prefix () call by 
 make_system_path_relative_to_its_root (). 	*
 util/sparc64/ieee1275/grub-setup.c (main): Likewise.

---
 ChangeLog                          | 11 +++-
 include/grub/util/getroot.h        |  1 -
 util/getroot.c                     | 97 ------------------------------
 util/grub-emu.c                    |  2 +-
 util/sparc64/ieee1275/grub-setup.c |  3 +-
 5 files changed, 13 insertions(+), 101 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 92c8dc53c..29e634bf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-04-26  Christian Franke  <franke@computer.org>
+
+	* include/grub/util/getroot.h (grub_get_prefix): Remove prototype.
+	* util/getroot.c [__CYGWIN__] (get_win32_path): Remove function.
+	(grub_get_prefix): Remove function.
+	* util/grub-emu.c (main): Replace grub_get_prefix () call by
+	make_system_path_relative_to_its_root ().
+	* util/sparc64/ieee1275/grub-setup.c (main): Likewise.
+
 2010-04-24  Christian Franke  <franke@computer.org>
 
 	* Makefile.in (TARGET_LDFLAGS): Add -static-libgcc.
@@ -95,7 +104,7 @@
 
 	* disk/lvm.c (grub_lvm_memberlist): Issue an error if pv->disk = 0.
 
-2010-04-17  Christian Franke <franke@computer.org>
+2010-04-17  Christian Franke  <franke@computer.org>
 
 	* Makefile.in: Add missing localedir setting.
 
diff --git a/include/grub/util/getroot.h b/include/grub/util/getroot.h
index f9f7f9baa..dff7b4df7 100644
--- a/include/grub/util/getroot.h
+++ b/include/grub/util/getroot.h
@@ -26,7 +26,6 @@ enum grub_dev_abstraction_types {
 };
 
 char *grub_guess_root_device (const char *dir);
-char *grub_get_prefix (const char *dir);
 int grub_util_get_dev_abstraction (const char *os_dev);
 char *grub_util_get_grub_dev (const char *os_dev);
 const char *grub_util_check_block_device (const char *blk_dev);
diff --git a/util/getroot.c b/util/getroot.c
index 94eadc5e1..891bd0f10 100644
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -79,103 +79,6 @@ xgetcwd (void)
   return path;
 }
 
-#ifdef __CYGWIN__
-/* Convert POSIX path to Win32 path,
-   remove drive letter, replace backslashes.  */
-static char *
-get_win32_path (const char *path)
-{
-  char winpath[PATH_MAX];
-  cygwin_conv_to_full_win32_path (path, winpath);
-
-  int len = strlen (winpath);
-  if (len > 2 && winpath[1] == ':')
-    {
-      len -= 2;
-      memmove (winpath, winpath + 2, len + 1);
-    }
-
-  int i;
-  for (i = 0; i < len; i++)
-    if (winpath[i] == '\\')
-      winpath[i] = '/';
-  return xstrdup (winpath);
-}
-#endif
-
-char *
-grub_get_prefix (const char *dir)
-{
-  char *saved_cwd;
-  char *abs_dir, *prev_dir;
-  char *prefix;
-  struct stat st, prev_st;
-
-  /* Save the current directory.  */
-  saved_cwd = xgetcwd ();
-
-  if (chdir (dir) < 0)
-    grub_util_error ("cannot change directory to `%s'", dir);
-
-  abs_dir = xgetcwd ();
-  strip_extra_slashes (abs_dir);
-  prev_dir = xstrdup (abs_dir);
-
-  if (stat (".", &prev_st) < 0)
-    grub_util_error ("cannot stat `%s'", dir);
-
-  if (! S_ISDIR (prev_st.st_mode))
-    grub_util_error ("`%s' is not a directory", dir);
-
-  while (1)
-    {
-      if (chdir ("..") < 0)
-	grub_util_error ("cannot change directory to the parent");
-
-      if (stat (".", &st) < 0)
-	grub_util_error ("cannot stat current directory");
-
-      if (! S_ISDIR (st.st_mode))
-	grub_util_error ("current directory is not a directory???");
-
-      if (prev_st.st_dev != st.st_dev || prev_st.st_ino == st.st_ino)
-	break;
-
-      free (prev_dir);
-      prev_dir = xgetcwd ();
-      prev_st = st;
-    }
-
-  strip_extra_slashes (prev_dir);
-  prefix = xmalloc (strlen (abs_dir) - strlen (prev_dir) + 2);
-  prefix[0] = '/';
-  strcpy (prefix + 1, abs_dir + strlen (prev_dir));
-  strip_extra_slashes (prefix);
-
-  if (chdir (saved_cwd) < 0)
-    grub_util_error ("cannot change directory to `%s'", dir);
-
-#ifdef __CYGWIN__
-  if (st.st_dev != (DEV_CYGDRIVE_MAJOR << 16))
-    {
-      /* Reached some mount point not below /cygdrive.
-	 GRUB does not know Cygwin's emulated mounts,
-	 convert to Win32 path.  */
-      grub_util_info ("Cygwin prefix = %s", prefix);
-      char * wprefix = get_win32_path (prefix);
-      free (prefix);
-      prefix = wprefix;
-    }
-#endif
-
-  free (saved_cwd);
-  free (abs_dir);
-  free (prev_dir);
-
-  grub_util_info ("prefix = %s", prefix);
-  return prefix;
-}
-
 #ifdef __MINGW32__
 
 static char *
diff --git a/util/grub-emu.c b/util/grub-emu.c
index 8660f0aa0..8c53b0aca 100644
--- a/util/grub-emu.c
+++ b/util/grub-emu.c
@@ -242,7 +242,7 @@ main (int argc, char *argv[])
   if (strcmp (root_dev, "host") == 0)
     dir = xstrdup (dir);
   else
-    dir = grub_get_prefix (dir);
+    dir = make_system_path_relative_to_its_root (dir);
   prefix = xmalloc (strlen (root_dev) + 2 + strlen (dir) + 1);
   sprintf (prefix, "(%s)%s", root_dev, dir);
   free (dir);
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index b511a96b2..06bc16795 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -627,7 +627,8 @@ main (int argc, char *argv[])
 
   find_dest_dev (&ginfo, argv);
 
-  ginfo.prefix = grub_get_prefix (ginfo.dir ? : DEFAULT_DIRECTORY);
+  ginfo.prefix = make_system_path_relative_to_its_root (ginfo.dir ?
+							: DEFAULT_DIRECTORY);
 
   check_root_dev (&ginfo);
 

From 94ac7906451fc65323122507c595b790fb2b4644 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 26 Apr 2010 10:56:12 +0200
Subject: [PATCH 0836/1628] Fix various issues created by previous commits

---
 Makefile.in                            |   4 +-
 boot/i386/qemu/boot.S                  |   2 +-
 boot/sparc64/ieee1275/diskboot.S       |  11 +-
 configure.ac                           |   1 +
 include/grub/efi/pe32.h                |  60 +++++++--
 include/grub/i386/pc/boot.h            |   1 -
 include/grub/i386/pc/kernel.h          |   2 -
 include/grub/i386/pc/memory.h          |   1 -
 include/grub/i386/qemu/kernel.h        |   9 +-
 include/grub/offsets.h                 | 101 ++++++++++++++++
 include/grub/powerpc/ieee1275/kernel.h |  18 +--
 kern/i386/qemu/startup.S               |   2 +-
 util/grub-mkimage.c                    | 161 ++++++++++++++++++-------
 13 files changed, 285 insertions(+), 88 deletions(-)
 create mode 100644 include/grub/offsets.h

diff --git a/Makefile.in b/Makefile.in
index 822a08797..3df8b1b72 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -90,7 +90,7 @@ GNULIB_CFLAGS = $(GNULIB_UTIL_CFLAGS) $(POSIX_CFLAGS)
 ASFLAGS = @ASFLAGS@
 LDFLAGS = @LDFLAGS@ $(LIBS)
 CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/gnulib -I$(srcdir)/include -Wall -W \
-	 -DGRUB_LIBDIR=\"$(pkglibdir)\" -DLOCALEDIR=\"$(localedir)\"
+	 -DGRUB_LIBDIR=\"$(libdir)\" -DLOCALEDIR=\"$(localedir)\"
 TARGET_CC = @TARGET_CC@
 TARGET_CFLAGS = -ffreestanding @TARGET_CFLAGS@
 TARGET_ASFLAGS = -nostdinc -fno-builtin @TARGET_ASFLAGS@
@@ -287,7 +287,7 @@ build_env.mk: Makefile
 	echo "TARGET_CC=$(TARGET_CC)" ; \
 	echo "TARGET_CFLAGS=$(TARGET_CFLAGS)" ; \
 	echo "TARGET_ASFLAGS=$(TARGET_ASFLAGS)" ; \
-	echo "TARGET_CPPFLAGS=$(TARGET_CPPFLAGS) -I$(pkglibdir) -I$(includedir)" ; \
+	echo "TARGET_CPPFLAGS=$(TARGET_CPPFLAGS) -I$(libdir) -I$(includedir)" ; \
 	echo "STRIP=$(STRIP)" ; \
 	echo "OBJCONV=$(OBJCONV)" ; \
 	echo "TARGET_MODULE_FORMAT=$(TARGET_MODULE_FORMAT)" ; \
diff --git a/boot/i386/qemu/boot.S b/boot/i386/qemu/boot.S
index a93fe3943..51039dd69 100644
--- a/boot/i386/qemu/boot.S
+++ b/boot/i386/qemu/boot.S
@@ -31,7 +31,7 @@ _start:
 
 	jmp	1f
 
-	. = _start + GRUB_BOOT_MACHINE_CORE_ENTRY_ADDR
+	. = _start + GRUB_BOOT_I386_QEMU_CORE_ENTRY_ADDR
 VARIABLE(grub_core_entry_addr)
 	.long	0
 1:
diff --git a/boot/sparc64/ieee1275/diskboot.S b/boot/sparc64/ieee1275/diskboot.S
index a4d4b5bf9..a8fd50d87 100644
--- a/boot/sparc64/ieee1275/diskboot.S
+++ b/boot/sparc64/ieee1275/diskboot.S
@@ -19,6 +19,7 @@
 
 #include <grub/boot.h>
 #include <grub/machine/boot.h>
+#include <grub/offsets.h>
 
 	.text
 	.align	4
@@ -87,8 +88,8 @@ after_info_block:
 	call	console_write
 	 mov	NOTIFICATION_STRING_LEN, %o3
 
-	GET_ABS(firstlist - GRUB_BOOT_MACHINE_LIST_SIZE, %l2)
-	set	GRUB_BOOT_MACHINE_IMAGE_ADDRESS, %l3
+	GET_ABS(firstlist - GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE, %l2)
+	set	GRUB_BOOT_SPARC64_IEEE1275_IMAGE_ADDRESS, %l3
 bootloop:
 	lduw	[%l2 + 0x08], %o0
 	brz	%o0, bootit
@@ -115,7 +116,7 @@ bootloop:
 	 mov	NOTIFICATION_STEP_LEN, %o3
 
 	ba	bootloop
-	 sub	%l2, GRUB_BOOT_MACHINE_LIST_SIZE, %l2
+	 sub	%l2, GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE, %l2
 
 bootit:
 	GET_ABS(prom_close_name, %o0)
@@ -127,8 +128,8 @@ bootit:
 	GET_ABS(notification_done, %o2)
 	call	console_write
 	 mov	NOTIFICATION_DONE_LEN, %o3
-	sethi	%hi(GRUB_BOOT_MACHINE_IMAGE_ADDRESS), %o2
-	jmpl	%o2 + %lo(GRUB_BOOT_MACHINE_IMAGE_ADDRESS), %o7
+	sethi	%hi(GRUB_BOOT_SPARC64_IEEE1275_IMAGE_ADDRESS), %o2
+	jmpl	%o2 + %lo(GRUB_BOOT_SPARC64_IEEE1275_IMAGE_ADDRESS), %o7
 	 mov	CIF_REG, %o4
 1:	ba,a	1b
 
diff --git a/configure.ac b/configure.ac
index 4bfc5a2b0..e3453b636 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,7 @@ case "$target_cpu" in
   mips)      	machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_MIPS=1" ;;
   sparc64)      machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
 esac
+machine_CFLAGS="$machine_CFLAGS -DMACHINE=`echo ${target_cpu}_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`"
 
 CFLAGS="$CFLAGS $machine_CFLAGS"
 TARGET_ASFLAGS="$TARGET_ASFLAGS $machine_CFLAGS"
diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
index 21b56ae27..9d9edc220 100644
--- a/include/grub/efi/pe32.h
+++ b/include/grub/efi/pe32.h
@@ -99,12 +99,8 @@ struct grub_pe32_optional_header
   grub_uint32_t entry_addr;
   grub_uint32_t code_base;
 
-#if GRUB_TARGET_SIZEOF_VOID_P == 4
   grub_uint32_t data_base;
   grub_uint32_t image_base;
-#else
-  grub_uint64_t image_base;
-#endif
 
   grub_uint32_t section_alignment;
   grub_uint32_t file_alignment;
@@ -121,22 +117,66 @@ struct grub_pe32_optional_header
   grub_uint16_t subsystem;
   grub_uint16_t dll_characteristics;
 
-#if GRUB_TARGET_SIZEOF_VOID_P == 4
-
   grub_uint32_t stack_reserve_size;
   grub_uint32_t stack_commit_size;
   grub_uint32_t heap_reserve_size;
   grub_uint32_t heap_commit_size;
 
-#else
+  grub_uint32_t loader_flags;
+  grub_uint32_t num_data_directories;
+
+  /* Data directories.  */
+  struct grub_pe32_data_directory export_table;
+  struct grub_pe32_data_directory import_table;
+  struct grub_pe32_data_directory resource_table;
+  struct grub_pe32_data_directory exception_table;
+  struct grub_pe32_data_directory certificate_table;
+  struct grub_pe32_data_directory base_relocation_table;
+  struct grub_pe32_data_directory debug;
+  struct grub_pe32_data_directory architecture;
+  struct grub_pe32_data_directory global_ptr;
+  struct grub_pe32_data_directory tls_table;
+  struct grub_pe32_data_directory load_config_table;
+  struct grub_pe32_data_directory bound_import;
+  struct grub_pe32_data_directory iat;
+  struct grub_pe32_data_directory delay_import_descriptor;
+  struct grub_pe32_data_directory com_runtime_header;
+  struct grub_pe32_data_directory reserved_entry;
+};
+
+struct grub_pe64_optional_header
+{
+  grub_uint16_t magic;
+  grub_uint8_t major_linker_version;
+  grub_uint8_t minor_linker_version;
+  grub_uint32_t code_size;
+  grub_uint32_t data_size;
+  grub_uint32_t bss_size;
+  grub_uint32_t entry_addr;
+  grub_uint32_t code_base;
+
+  grub_uint64_t image_base;
+
+  grub_uint32_t section_alignment;
+  grub_uint32_t file_alignment;
+  grub_uint16_t major_os_version;
+  grub_uint16_t minor_os_version;
+  grub_uint16_t major_image_version;
+  grub_uint16_t minor_image_version;
+  grub_uint16_t major_subsystem_version;
+  grub_uint16_t minor_subsystem_version;
+  grub_uint32_t reserved;
+  grub_uint32_t image_size;
+  grub_uint32_t header_size;
+  grub_uint32_t checksum;
+  grub_uint16_t subsystem;
+  grub_uint16_t dll_characteristics;
 
   grub_uint64_t stack_reserve_size;
   grub_uint64_t stack_commit_size;
   grub_uint64_t heap_reserve_size;
   grub_uint64_t heap_commit_size;
 
-#endif
-
   grub_uint32_t loader_flags;
   grub_uint32_t num_data_directories;
 
@@ -221,6 +261,8 @@ struct grub_pe32_header
   struct grub_pe32_optional_header optional_header;
 };
 
+#define GRUB_PE32_SIGNATURE_SIZE 4
+
 struct grub_pe32_fixup_block
 {
   grub_uint32_t page_rva;
diff --git a/include/grub/i386/pc/boot.h b/include/grub/i386/pc/boot.h
index 09d01caee..a4d42ff3c 100644
--- a/include/grub/i386/pc/boot.h
+++ b/include/grub/i386/pc/boot.h
@@ -19,7 +19,6 @@
 #ifndef GRUB_BOOT_MACHINE_HEADER
 #define GRUB_BOOT_MACHINE_HEADER	1
 
-#define MACHINE I386_PC
 #include <grub/offsets.h>
 
 /* The signature for bootloader.  */
diff --git a/include/grub/i386/pc/kernel.h b/include/grub/i386/pc/kernel.h
index 77d5c6e5a..f0a9d4fc2 100644
--- a/include/grub/i386/pc/kernel.h
+++ b/include/grub/i386/pc/kernel.h
@@ -19,8 +19,6 @@
 #ifndef KERNEL_MACHINE_HEADER
 #define KERNEL_MACHINE_HEADER	1
 
-#define MACHINE I386_PC
-
 #include <grub/offsets.h>
 
 /* Enable LZMA compression */
diff --git a/include/grub/i386/pc/memory.h b/include/grub/i386/pc/memory.h
index 0b4191734..68f5e8bc9 100644
--- a/include/grub/i386/pc/memory.h
+++ b/include/grub/i386/pc/memory.h
@@ -29,7 +29,6 @@
 
 #include <grub/i386/memory.h>
 
-#define MACHINE I386_PC
 #include <grub/offsets.h>
 
 /* The scratch buffer used in real mode code.  */
diff --git a/include/grub/i386/qemu/kernel.h b/include/grub/i386/qemu/kernel.h
index 3d22c9d9f..e29f0aeb2 100644
--- a/include/grub/i386/qemu/kernel.h
+++ b/include/grub/i386/qemu/kernel.h
@@ -19,14 +19,7 @@
 #ifndef GRUB_KERNEL_MACHINE_HEADER
 #define GRUB_KERNEL_MACHINE_HEADER	1
 
-/* The offset of GRUB_KERNEL_IMAGE_SIZE.  */
-#define GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE	0xc
-
-/* The offset of GRUB_PREFIX.  */
-#define GRUB_KERNEL_MACHINE_PREFIX		0x10
-
-/* End of the data section. */
-#define GRUB_KERNEL_MACHINE_DATA_END		0x50
+#include <grub/offsets.h>
 
 #ifndef ASM_FILE
 
diff --git a/include/grub/offsets.h b/include/grub/offsets.h
new file mode 100644
index 000000000..a0c2f61f9
--- /dev/null
+++ b/include/grub/offsets.h
@@ -0,0 +1,101 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2003,2007,2008  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/>.
+ */
+
+#ifndef OFFSETS_HEADER
+#define OFFSETS_HEADER	1
+
+/* The offset of GRUB_TOTAL_MODULE_SIZE.  */
+#define GRUB_KERNEL_I386_PC_TOTAL_MODULE_SIZE	0x8
+
+/* The offset of GRUB_KERNEL_IMAGE_SIZE.  */
+#define GRUB_KERNEL_I386_PC_KERNEL_IMAGE_SIZE	0xc
+
+/* The offset of GRUB_COMPRESSED_SIZE.  */
+#define GRUB_KERNEL_I386_PC_COMPRESSED_SIZE	0x10
+
+/* The offset of GRUB_INSTALL_DOS_PART.  */
+#define GRUB_KERNEL_I386_PC_INSTALL_DOS_PART	0x14
+
+/* The offset of GRUB_INSTALL_BSD_PART.  */
+#define GRUB_KERNEL_I386_PC_INSTALL_BSD_PART	0x18
+
+/* The offset of GRUB_PREFIX.  */
+#define GRUB_KERNEL_I386_PC_PREFIX		0x1c
+
+/* End of the data section. */
+#define GRUB_KERNEL_I386_PC_DATA_END		0x5c
+
+/* The size of the first region which won't be compressed.  */
+#define GRUB_KERNEL_I386_PC_RAW_SIZE		(GRUB_KERNEL_I386_PC_DATA_END + 0x5F0)
+
+/* The segment where the kernel is loaded.  */
+#define GRUB_BOOT_I386_PC_KERNEL_SEG	0x800
+
+/* The upper memory area (starting at 640 kiB).  */
+#define GRUB_MEMORY_I386_PC_UPPER		0xa0000
+#define GRUB_MEMORY_I386_QEMU_UPPER		GRUB_MEMORY_I386_PC_UPPER
+
+/* The offset of GRUB_CORE_ENTRY_ADDR.  */
+#define GRUB_BOOT_I386_QEMU_CORE_ENTRY_ADDR	0x4
+
+/* The offset of GRUB_CORE_ENTRY_ADDR.  */
+#define GRUB_KERNEL_I386_QEMU_CORE_ENTRY_ADDR	0x8
+
+/* The offset of GRUB_KERNEL_IMAGE_SIZE.  */
+#define GRUB_KERNEL_I386_QEMU_KERNEL_IMAGE_SIZE	0xc
+
+/* The offset of GRUB_PREFIX.  */
+#define GRUB_KERNEL_I386_QEMU_PREFIX		0x10
+
+/* End of the data section. */
+#define GRUB_KERNEL_I386_QEMU_DATA_END		0x50
+
+#define GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE	12
+
+#define GRUB_BOOT_SPARC64_IEEE1275_IMAGE_ADDRESS	0x4400
+
+#define GRUB_KERNEL_POWERPC_IEEE1275_PREFIX		0x4
+#define GRUB_KERNEL_POWERPC_IEEE1275_DATA_END	0x44
+#define GRUB_KERNEL_POWERPC_IEEE1275_LINK_ALIGN 4
+
+#ifdef MACHINE
+#define GRUB_OFFSETS_CONCAT_(a,b,c) a ## b ## c
+#define GRUB_OFFSETS_CONCAT(a,b,c) GRUB_OFFSETS_CONCAT_(a,b,c)
+#define GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _TOTAL_MODULE_SIZE)
+#define GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _KERNEL_IMAGE_SIZE)
+#define GRUB_KERNEL_MACHINE_COMPRESSED_SIZE GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _COMPRESSED_SIZE)
+
+#define GRUB_KERNEL_MACHINE_PREFIX GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _PREFIX)
+#define GRUB_KERNEL_MACHINE_DATA_END GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _DATA_END)
+#define GRUB_BOOT_MACHINE_KERNEL_SEG GRUB_OFFSETS_CONCAT (GRUB_BOOT_, MACHINE, _KERNEL_SEG)
+#define GRUB_MEMORY_MACHINE_UPPER GRUB_OFFSETS_CONCAT (GRUB_MEMORY_, MACHINE, _UPPER)
+#define GRUB_KERNEL_MACHINE_RAW_SIZE GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _RAW_SIZE)
+#define GRUB_KERNEL_MACHINE_INSTALL_BSD_PART GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _INSTALL_BSD_PART)
+#define GRUB_KERNEL_MACHINE_INSTALL_DOS_PART GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _INSTALL_DOS_PART)
+#endif
+
+#ifndef ASM_FILE
+struct grub_pc_bios_boot_blocklist
+{
+  grub_uint64_t start;
+  grub_uint16_t len;
+  grub_uint16_t segment;
+} __attribute__ ((packed));
+#endif
+
+#endif
diff --git a/include/grub/powerpc/ieee1275/kernel.h b/include/grub/powerpc/ieee1275/kernel.h
index 229416243..75d6c62a6 100644
--- a/include/grub/powerpc/ieee1275/kernel.h
+++ b/include/grub/powerpc/ieee1275/kernel.h
@@ -20,28 +20,12 @@
 #define GRUB_KERNEL_MACHINE_HEADER	1
 
 #include <grub/symbol.h>
+#include <grub/offsets.h>
 
-#define GRUB_PLATFORM_IMAGE_FORMATS     "raw, elf"
-#define GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT     "raw"
-
-#define GRUB_PLATFORM_IMAGE_DEFAULT GRUB_PLATFORM_IMAGE_RAW
-#define GRUB_KERNEL_MACHINE_PREFIX		0x4
-#define GRUB_KERNEL_MACHINE_DATA_END	0x44
-#define GRUB_KERNEL_MACHINE_LINK_ALIGN 4
-
-#define EM_TARGET EM_PPC
 #define GRUB_KERNEL_MACHINE_LINK_ADDR 0x200000
 
 #ifndef ASM_FILE
 
-typedef enum {
-  GRUB_PLATFORM_IMAGE_RAW,
-  GRUB_PLATFORM_IMAGE_ELF
-}
-  grub_platform_image_format_t;
-#define GRUB_PLATFORM_IMAGE_RAW GRUB_PLATFORM_IMAGE_RAW
-#define GRUB_PLATFORM_IMAGE_ELF GRUB_PLATFORM_IMAGE_ELF
-
 /* The prefix which points to the directory where GRUB modules and its
    configuration file are located.  */
 extern char grub_prefix[];
diff --git a/kern/i386/qemu/startup.S b/kern/i386/qemu/startup.S
index 7484650b2..dc40cc4a2 100644
--- a/kern/i386/qemu/startup.S
+++ b/kern/i386/qemu/startup.S
@@ -27,7 +27,7 @@
 _start:
 	jmp	codestart
 
-	. = _start + GRUB_KERNEL_MACHINE_CORE_ENTRY_ADDR
+	. = _start + GRUB_KERNEL_I386_QEMU_CORE_ENTRY_ADDR
 VARIABLE(grub_core_entry_addr)
 	.long	0
 VARIABLE(grub_kernel_image_size)
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index af2988a3f..08003a07f 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -72,6 +72,7 @@ struct image_target_desc
   unsigned section_align;
   signed vaddr_offset;
   unsigned install_dos_part, install_bsd_part;
+  grub_uint64_t link_addr;
 };
 
 struct image_target_desc image_targets[] =
@@ -90,8 +91,11 @@ struct image_target_desc image_targets[] =
     },
     {"i386-efi", 4, 0, IMAGE_EFI, FORMAT_PE, PLATFORM_FLAGS_NONE,
      .section_align = GRUB_PE32_SECTION_ALIGNMENT,
-     .vaddr_offset = ALIGN_UP (sizeof (struct grub_pe32_header)
-			       + 5 * sizeof (struct grub_pe32_section_table),
+     .vaddr_offset = ALIGN_UP (GRUB_PE32_MSDOS_STUB_SIZE
+			       + GRUB_PE32_SIGNATURE_SIZE
+			       + sizeof (struct grub_pe32_coff_header)
+			       + sizeof (struct grub_pe32_optional_header)
+			       + 4 * sizeof (struct grub_pe32_section_table),
 			       GRUB_PE32_SECTION_ALIGNMENT)
     },
     {"i386-ieee1275", 4, 0, IMAGE_I386_IEEE1275, FORMAT_ELF, PLATFORM_FLAGS_NONE,
@@ -102,8 +106,11 @@ struct image_target_desc image_targets[] =
      .vaddr_offset = 0},
     {"x86_64-efi", 8, 0, IMAGE_EFI, FORMAT_PE, PLATFORM_FLAGS_NONE,
      .section_align = GRUB_PE32_SECTION_ALIGNMENT,
-     .vaddr_offset = ALIGN_UP (sizeof (struct grub_pe32_header)
-			       + 5 * sizeof (struct grub_pe32_section_table),
+     .vaddr_offset = ALIGN_UP (GRUB_PE32_MSDOS_STUB_SIZE
+			       + GRUB_PE32_SIGNATURE_SIZE
+			       + sizeof (struct grub_pe32_coff_header)
+			       + sizeof (struct grub_pe64_optional_header)
+			       + 4 * sizeof (struct grub_pe32_section_table),
 			       GRUB_PE32_SECTION_ALIGNMENT)
     },
     {"mipsel-yeeloong-elf", 4, 0, IMAGE_YEELOONG_ELF, FORMAT_ELF, PLATFORM_FLAGS_NONE,
@@ -1150,19 +1157,35 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
     case IMAGE_EFI:
       {
 	void *pe_img;
+	grub_uint8_t *header;
 	size_t pe_size;
-	struct grub_pe32_header *header;
 	struct grub_pe32_coff_header *c;
-	struct grub_pe32_optional_header *o;
 	struct grub_pe32_section_table *text_section, *data_section;
 	struct grub_pe32_section_table *mods_section, *reloc_section;
 	static const grub_uint8_t stub[] = GRUB_PE32_MSDOS_STUB;
-	int header_size = ALIGN_UP (sizeof (struct grub_pe32_header)
-				    + 5 * sizeof (struct grub_pe32_section_table),
-				    image_target->section_align);
-	int reloc_addr = ALIGN_UP (header_size + core_size, image_target->section_align);
+	int header_size;
+	int reloc_addr;
 
-	pe_size = ALIGN_UP (reloc_addr + reloc_size, image_target->section_align);
+	if (image_target->voidp_sizeof == 4)
+	  header_size = ALIGN_UP (GRUB_PE32_MSDOS_STUB_SIZE
+				  + GRUB_PE32_SIGNATURE_SIZE
+				  + sizeof (struct grub_pe32_coff_header)
+				  + sizeof (struct grub_pe32_optional_header)
+				  + 4 * sizeof (struct grub_pe32_section_table),
+				  GRUB_PE32_SECTION_ALIGNMENT);
+	else
+	  header_size = ALIGN_UP (GRUB_PE32_MSDOS_STUB_SIZE
+				  + GRUB_PE32_SIGNATURE_SIZE
+				  + sizeof (struct grub_pe32_coff_header)
+				  + sizeof (struct grub_pe64_optional_header)
+				  + 4 * sizeof (struct grub_pe32_section_table),
+				  GRUB_PE32_SECTION_ALIGNMENT);
+
+	reloc_addr = ALIGN_UP (header_size + core_size,
+			       image_target->section_align);
+
+	pe_size = ALIGN_UP (reloc_addr + reloc_size,
+			    image_target->section_align);
 	pe_img = xmalloc (reloc_addr + reloc_size);
 	memset (pe_img, 0, header_size);
 	memcpy (pe_img + header_size, core_img, core_size);
@@ -1170,11 +1193,12 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 	header = pe_img;
 
 	/* The magic.  */
-	memcpy (header->msdos_stub, stub, sizeof (header->msdos_stub));
-	memcpy (header->signature, "PE\0\0", sizeof (header->signature));
+	memcpy (header, stub, GRUB_PE32_MSDOS_STUB_SIZE);
+	memcpy (header + GRUB_PE32_MSDOS_STUB_SIZE, "PE\0\0",
+		GRUB_PE32_SIGNATURE_SIZE);
 
 	/* The COFF file header.  */
-	c = &header->coff_header;
+	c = header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE;
 	if (image_target->voidp_sizeof == 4)
 	  c->machine = grub_host_to_target16 (GRUB_PE32_MACHINE_I386);
 	else
@@ -1182,7 +1206,6 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
 	c->num_sections = grub_host_to_target16 (4);
 	c->time = grub_host_to_target32 (time (0));
-	c->optional_header_size = grub_host_to_target16 (sizeof (header->optional_header));
 	c->characteristics = grub_host_to_target16 (GRUB_PE32_EXECUTABLE_IMAGE
 						    | GRUB_PE32_LINE_NUMS_STRIPPED
 						    | ((image_target->voidp_sizeof == 4)
@@ -1192,33 +1215,74 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 						    | GRUB_PE32_DEBUG_STRIPPED);
 
 	/* The PE Optional header.  */
-	o = &header->optional_header;
-	o->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC);
-	o->code_size = grub_host_to_target32 (exec_size);
-	o->data_size = grub_cpu_to_le32 (reloc_addr - exec_size);
-	o->bss_size = grub_cpu_to_le32 (bss_size);
-	o->entry_addr = grub_cpu_to_le32 (start_address);
-	o->code_base = grub_cpu_to_le32 (header_size);
 	if (image_target->voidp_sizeof == 4)
-	  o->data_base = grub_host_to_target32 (header_size + exec_size);
-	o->image_base = 0;
-	o->section_alignment = grub_host_to_target32 (image_target->section_align);
-	o->file_alignment = grub_host_to_target32 (image_target->section_align);
-	o->image_size = grub_host_to_target32 (pe_size);
-	o->header_size = grub_host_to_target32 (header_size);
-	o->subsystem = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION);
+	  {
+	    struct grub_pe32_optional_header *o;
 
-	/* Do these really matter? */
-	o->stack_reserve_size = grub_host_to_target32 (0x10000);
-	o->stack_commit_size = grub_host_to_target32 (0x10000);
-	o->heap_reserve_size = grub_host_to_target32 (0x10000);
-	o->heap_commit_size = grub_host_to_target32 (0x10000);
+	    c->optional_header_size = grub_host_to_target16 (sizeof (struct grub_pe32_optional_header));
+
+	    o = header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE
+	      + sizeof (struct grub_pe32_coff_header);
+	    o->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC);
+	    o->code_size = grub_host_to_target32 (exec_size);
+	    o->data_size = grub_cpu_to_le32 (reloc_addr - exec_size);
+	    o->bss_size = grub_cpu_to_le32 (bss_size);
+	    o->entry_addr = grub_cpu_to_le32 (start_address);
+	    o->code_base = grub_cpu_to_le32 (header_size);
+
+	    o->data_base = grub_host_to_target32 (header_size + exec_size);
+
+	    o->image_base = 0;
+	    o->section_alignment = grub_host_to_target32 (image_target->section_align);
+	    o->file_alignment = grub_host_to_target32 (image_target->section_align);
+	    o->image_size = grub_host_to_target32 (pe_size);
+	    o->header_size = grub_host_to_target32 (header_size);
+	    o->subsystem = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION);
+
+	    /* Do these really matter? */
+	    o->stack_reserve_size = grub_host_to_target32 (0x10000);
+	    o->stack_commit_size = grub_host_to_target32 (0x10000);
+	    o->heap_reserve_size = grub_host_to_target32 (0x10000);
+	    o->heap_commit_size = grub_host_to_target32 (0x10000);
     
-	o->num_data_directories = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES);
+	    o->num_data_directories = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES);
 
-	o->base_relocation_table.rva = grub_host_to_target32 (reloc_addr);
-	o->base_relocation_table.size = grub_host_to_target32 (reloc_size);
+	    o->base_relocation_table.rva = grub_host_to_target32 (reloc_addr);
+	    o->base_relocation_table.size = grub_host_to_target32 (reloc_size);
+	  }
+	else
+	  {
+	    struct grub_pe64_optional_header *o;
 
+	    c->optional_header_size = grub_host_to_target16 (sizeof (struct grub_pe32_optional_header));
+
+	    o = header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE
+	      + sizeof (struct grub_pe32_coff_header);
+	    o->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC);
+	    o->code_size = grub_host_to_target32 (exec_size);
+	    o->data_size = grub_cpu_to_le32 (reloc_addr - exec_size);
+	    o->bss_size = grub_cpu_to_le32 (bss_size);
+	    o->entry_addr = grub_cpu_to_le32 (start_address);
+	    o->code_base = grub_cpu_to_le32 (header_size);
+	    o->image_base = 0;
+	    o->section_alignment = grub_host_to_target32 (image_target->section_align);
+	    o->file_alignment = grub_host_to_target32 (image_target->section_align);
+	    o->image_size = grub_host_to_target32 (pe_size);
+	    o->header_size = grub_host_to_target32 (header_size);
+	    o->subsystem = grub_host_to_target16 (GRUB_PE32_SUBSYSTEM_EFI_APPLICATION);
+
+	    /* Do these really matter? */
+	    o->stack_reserve_size = grub_host_to_target32 (0x10000);
+	    o->stack_commit_size = grub_host_to_target32 (0x10000);
+	    o->heap_reserve_size = grub_host_to_target32 (0x10000);
+	    o->heap_commit_size = grub_host_to_target32 (0x10000);
+    
+	    o->num_data_directories
+	      = grub_host_to_target32 (GRUB_PE32_NUM_DATA_DIRECTORIES);
+
+	    o->base_relocation_table.rva = grub_host_to_target32 (reloc_addr);
+	    o->base_relocation_table.size = grub_host_to_target32 (reloc_size);
+	  }
 	/* The sections.  */
 	text_section = (struct grub_pe32_section_table *) (header + 1);
 	strcpy (text_section->name, ".text");
@@ -1422,10 +1486,10 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 	phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
 
 	if (image_target->id == IMAGE_YEELOONG_ELF)
-	  target_addr = ALIGN_UP (GRUB_KERNEL_MACHINE_LINK_ADDR
-				+ kernel_size + total_module_size, 32);
+	  target_addr = ALIGN_UP (image_target->link_addr
+				  + kernel_size + total_module_size, 32);
 	else
-	  target_addr = GRUB_KERNEL_MACHINE_LINK_ADDR;
+	  target_addr = image_target->link_addr;
 	ehdr->e_entry = grub_host_to_target32 (target_addr);
 	phdr->p_vaddr = grub_host_to_target32 (target_addr);
 	phdr->p_paddr = grub_host_to_target32 (target_addr);
@@ -1534,7 +1598,7 @@ Usage: %s [OPTION]... [MODULES]\n\
 \n\
 Make a bootable image of GRUB.\n\
 \n\
-  -d, --directory=DIR     use images and modules under DIR [default=%s]\n\
+  -d, --directory=DIR     use images and modules under DIR [default=%s/@platform@]\n\
   -p, --prefix=DIR        set grub_prefix directory [default=%s]\n\
   -m, --memdisk=FILE      embed FILE as a memdisk image\n\
   -f, --font=FILE         embed FILE as a boot font\n\
@@ -1679,6 +1743,21 @@ main (int argc, char *argv[])
       free (output);
     }
 
+  if (!dir)
+    {
+      const char *last;
+      last = strchr (image_target->name, '-');
+      if (last)
+	last = strchr (last + 1, '-');
+      if (!last)
+	last = image_target->name + strlen (image_target->name);
+      dir = xmalloc (sizeof (GRUB_LIBDIR) + (last - image_target->name));
+      memcpy (dir, GRUB_LIBDIR, sizeof (GRUB_LIBDIR) - 1);
+      memcpy (dir + sizeof (GRUB_LIBDIR) - 1, image_target->name,
+	      last - image_target->name);
+      *(dir + sizeof (GRUB_LIBDIR) - 1 +  (last - image_target->name)) = 0;
+    }
+
   generate_image (dir ? : GRUB_LIBDIR, prefix ? : DEFAULT_DIRECTORY, fp,
 		  argv + optind, memdisk, font, config,
 		  image_target, note);

From 0253aeb7a1ae7c4bc03f4fa4f4c34ff73f4d9ff4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 26 Apr 2010 13:11:43 +0200
Subject: [PATCH 0837/1628] Unified grub-mkimage achieved

---
 conf/common.rmk         |   1 -
 conf/i386-pc.rmk        |   4 +-
 include/grub/efi/pe32.h |   9 +-
 include/grub/kernel.h   |  26 +-
 include/grub/offsets.h  |   2 +
 util/grub-mkimage.c     | 767 ++++------------------------------------
 util/grub-mkimagexx.c   | 741 ++++++++++++++++++++++++++++++++++++++
 7 files changed, 836 insertions(+), 714 deletions(-)
 create mode 100644 util/grub-mkimagexx.c

diff --git a/conf/common.rmk b/conf/common.rmk
index bab7effb9..98dca34f9 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -18,7 +18,6 @@ endif
 bin_UTILITIES += grub-mkimage
 grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkimage.c util/misc.c \
 	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
-grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 util/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # For grub-probe.
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 1e0a3ff58..f0da94b42 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -1,7 +1,5 @@
 # -*- makefile -*-
 
-GRUB_KERNEL_MACHINE_LINK_ADDR = 0x8200
-
 COMMON_CFLAGS = -mrtd -mregparm=3
 
 # Images.
@@ -58,7 +56,7 @@ kernel_img_HEADERS += machine/biosdisk.h machine/vga.h machine/vbe.h \
 	machine/pxe.h i386/pit.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
+kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x8200 $(COMMON_CFLAGS)
 
 # Utilities.
 sbin_UTILITIES = grub-setup
diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
index 9d9edc220..90f9c9f5c 100644
--- a/include/grub/efi/pe32.h
+++ b/include/grub/efi/pe32.h
@@ -199,15 +199,8 @@ struct grub_pe64_optional_header
   struct grub_pe32_data_directory reserved_entry;
 };
 
-#if GRUB_TARGET_SIZEOF_VOID_P == 4
-
 #define GRUB_PE32_PE32_MAGIC	0x10b
-
-#else
-
-#define GRUB_PE32_PE32_MAGIC	0x20b
-
-#endif
+#define GRUB_PE32_PE64_MAGIC	0x20b
 
 #define GRUB_PE32_SUBSYSTEM_EFI_APPLICATION	10
 
diff --git a/include/grub/kernel.h b/include/grub/kernel.h
index bf52ffcb4..f7740b2e3 100644
--- a/include/grub/kernel.h
+++ b/include/grub/kernel.h
@@ -42,19 +42,33 @@ struct grub_module_header
 /* "gmim" (GRUB Module Info Magic).  */
 #define GRUB_MODULE_MAGIC 0x676d696d
 
-struct grub_module_info
+struct grub_module_info32
 {
   /* Magic number so we know we have modules present.  */
   grub_uint32_t magic;
-#if GRUB_TARGET_SIZEOF_VOID_P == 8
-  grub_uint32_t padding;
-#endif
   /* The offset of the modules.  */
-  grub_target_off_t offset;
+  grub_uint32_t offset;
   /* The size of all modules plus this header.  */
-  grub_target_size_t size;
+  grub_uint32_t size;
 };
 
+struct grub_module_info64
+{
+  /* Magic number so we know we have modules present.  */
+  grub_uint32_t magic;
+  grub_uint32_t padding;
+  /* The offset of the modules.  */
+  grub_uint64_t offset;
+  /* The size of all modules plus this header.  */
+  grub_uint64_t size;
+};
+
+#if GRUB_TARGET_SIZEOF_VOID_P == 8
+#define grub_module_info grub_module_info64
+#else
+#define grub_module_info grub_module_info32
+#endif
+
 extern grub_addr_t grub_arch_modules_addr (void);
 
 extern void EXPORT_FUNC(grub_module_iterate) (int (*hook) (struct grub_module_header *));
diff --git a/include/grub/offsets.h b/include/grub/offsets.h
index a0c2f61f9..2ba6351ca 100644
--- a/include/grub/offsets.h
+++ b/include/grub/offsets.h
@@ -46,6 +46,8 @@
 /* The segment where the kernel is loaded.  */
 #define GRUB_BOOT_I386_PC_KERNEL_SEG	0x800
 
+#define GRUB_KERNEL_I386_PC_LINK_ADDR  0x8200
+
 /* The upper memory area (starting at 640 kiB).  */
 #define GRUB_MEMORY_I386_PC_UPPER		0xa0000
 #define GRUB_MEMORY_I386_QEMU_UPPER		GRUB_MEMORY_I386_PC_UPPER
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 08003a07f..c9bafdd8b 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -131,6 +131,9 @@ struct image_target_desc image_targets[] =
 
 #define grub_target_to_host32(x) (grub_target_to_host32_real (image_target, (x)))
 #define grub_host_to_target32(x) (grub_host_to_target32_real (image_target, (x)))
+#define grub_target_to_host64(x) (grub_target_to_host64_real (image_target, (x)))
+#define grub_host_to_target64(x) (grub_host_to_target64_real (image_target, (x)))
+#define grub_host_to_target_addr(x) (grub_host_to_target_addr_real (image_target, (x)))
 #define grub_target_to_host16(x) (grub_target_to_host16_real (image_target, (x)))
 #define grub_host_to_target16(x) (grub_host_to_target16_real (image_target, (x)))
 
@@ -152,13 +155,13 @@ grub_target_to_host64_real (struct image_target_desc *image_target, grub_uint64_
     return grub_le_to_cpu64 (in);
 }
 
-static inline grub_uint32_t
-grub_target_to_host_real (struct image_target_desc *image_target, grub_uint32_t in)
+static inline grub_uint64_t
+grub_host_to_target64_real (struct image_target_desc *image_target, grub_uint64_t in)
 {
-  if (image_target->voidp_sizeof == 8)
-    return grub_target_to_host64_real (image_target, in);
+  if (image_target->bigendian)
+    return grub_cpu_to_be64 (in);
   else
-    return grub_target_to_host32_real (image_target, in);
+    return grub_cpu_to_le64 (in);
 }
 
 static inline grub_uint32_t
@@ -188,6 +191,24 @@ grub_host_to_target16_real (struct image_target_desc *image_target, grub_uint16_
     return grub_cpu_to_le16 (in);
 }
 
+static inline grub_uint32_t
+grub_host_to_target_addr_real (struct image_target_desc *image_target, grub_uint32_t in)
+{
+  if (image_target->voidp_sizeof == 8)
+    return grub_host_to_target64_real (image_target, in);
+  else
+    return grub_host_to_target32_real (image_target, in);
+}
+
+static inline grub_uint32_t
+grub_target_to_host_real (struct image_target_desc *image_target, grub_uint32_t in)
+{
+  if (image_target->voidp_sizeof == 8)
+    return grub_target_to_host64_real (image_target, in);
+  else
+    return grub_target_to_host32_real (image_target, in);
+}
+
 #define GRUB_IEEE1275_NOTE_NAME "PowerPC"
 #define GRUB_IEEE1275_NOTE_TYPE 0x1275
 
@@ -274,230 +295,6 @@ compress_kernel (struct image_target_desc *image_target, char *kernel_img,
   *core_size = kernel_size;
 }
 
-
-/* Relocate symbols; note that this function overwrites the symbol table.
-   Return the address of a start symbol.  */
-static Elf_Addr
-relocate_symbols (Elf_Ehdr *e, Elf_Shdr *sections,
-		  Elf_Shdr *symtab_section, Elf_Addr *section_addresses,
-		  Elf_Half section_entsize, Elf_Half num_sections,
-		  struct image_target_desc *image_target)
-{
-  Elf_Word symtab_size, sym_size, num_syms;
-  Elf_Off symtab_offset;
-  Elf_Addr start_address = 0;
-  Elf_Sym *sym;
-  Elf_Word i;
-  Elf_Shdr *strtab_section;
-  const char *strtab;
-
-  strtab_section
-    = (Elf_Shdr *) ((char *) sections
-		      + (grub_target_to_host32 (symtab_section->sh_link)
-			 * section_entsize));
-  strtab = (char *) e + grub_target_to_host32 (strtab_section->sh_offset);
-
-  symtab_size = grub_target_to_host32 (symtab_section->sh_size);
-  sym_size = grub_target_to_host32 (symtab_section->sh_entsize);
-  symtab_offset = grub_target_to_host32 (symtab_section->sh_offset);
-  num_syms = symtab_size / sym_size;
-
-  for (i = 0, sym = (Elf_Sym *) ((char *) e + symtab_offset);
-       i < num_syms;
-       i++, sym = (Elf_Sym *) ((char *) sym + sym_size))
-    {
-      Elf_Section index;
-      const char *name;
-
-      name = strtab + grub_target_to_host32 (sym->st_name);
-
-      index = grub_target_to_host16 (sym->st_shndx);
-      if (index == STN_ABS)
-        {
-          continue;
-        }
-      else if ((index == STN_UNDEF))
-	{
-	  if (sym->st_name)
-	    grub_util_error ("undefined symbol %s", name);
-	  else
-	    continue;
-	}
-      else if (index >= num_sections)
-	grub_util_error ("section %d does not exist", index);
-
-      sym->st_value = (grub_target_to_host32 (sym->st_value)
-		       + section_addresses[index]);
-      grub_util_info ("locating %s at 0x%x", name, sym->st_value);
-
-      if (! start_address)
-	if (strcmp (name, "_start") == 0 || strcmp (name, "start") == 0)
-	  start_address = sym->st_value;
-    }
-
-  return start_address;
-}
-
-/* Return the address of a symbol at the index I in the section S.  */
-static Elf_Addr
-get_symbol_address (Elf_Ehdr *e, Elf_Shdr *s, Elf_Word i,
-		    struct image_target_desc *image_target)
-{
-  Elf_Sym *sym;
-
-  sym = (Elf_Sym *) ((char *) e
-		       + grub_target_to_host32 (s->sh_offset)
-		       + i * grub_target_to_host32 (s->sh_entsize));
-  return sym->st_value;
-}
-
-/* Return the address of a modified value.  */
-static Elf_Addr *
-get_target_address (Elf_Ehdr *e, Elf_Shdr *s, Elf_Addr offset,
-		    struct image_target_desc *image_target)
-{
-  return (Elf_Addr *) ((char *) e + grub_target_to_host32 (s->sh_offset) + offset);
-}
-
-/* Deal with relocation information. This function relocates addresses
-   within the virtual address space starting from 0. So only relative
-   addresses can be fully resolved. Absolute addresses must be relocated
-   again by a PE32 relocator when loaded.  */
-static void
-relocate_addresses (Elf_Ehdr *e, Elf_Shdr *sections,
-		    Elf_Addr *section_addresses,
-		    Elf_Half section_entsize, Elf_Half num_sections,
-		    const char *strtab, struct image_target_desc *image_target)
-{
-  Elf_Half i;
-  Elf_Shdr *s;
-
-  for (i = 0, s = sections;
-       i < num_sections;
-       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-    if ((s->sh_type == grub_host_to_target32 (SHT_REL)) ||
-        (s->sh_type == grub_host_to_target32 (SHT_RELA)))
-      {
-	Elf_Rela *r;
-	Elf_Word rtab_size, r_size, num_rs;
-	Elf_Off rtab_offset;
-	Elf_Shdr *symtab_section;
-	Elf_Word target_section_index;
-	Elf_Addr target_section_addr;
-	Elf_Shdr *target_section;
-	Elf_Word j;
-
-	symtab_section = (Elf_Shdr *) ((char *) sections
-					 + (grub_target_to_host32 (s->sh_link)
-					    * section_entsize));
-	target_section_index = grub_target_to_host32 (s->sh_info);
-	target_section_addr = section_addresses[target_section_index];
-	target_section = (Elf_Shdr *) ((char *) sections
-					 + (target_section_index
-					    * section_entsize));
-
-	grub_util_info ("dealing with the relocation section %s for %s",
-			strtab + grub_target_to_host32 (s->sh_name),
-			strtab + grub_target_to_host32 (target_section->sh_name));
-
-	rtab_size = grub_target_to_host32 (s->sh_size);
-	r_size = grub_target_to_host32 (s->sh_entsize);
-	rtab_offset = grub_target_to_host32 (s->sh_offset);
-	num_rs = rtab_size / r_size;
-
-	for (j = 0, r = (Elf_Rela *) ((char *) e + rtab_offset);
-	     j < num_rs;
-	     j++, r = (Elf_Rela *) ((char *) r + r_size))
-	  {
-            Elf_Addr info;
-	    Elf_Addr offset;
-	    Elf_Addr sym_addr;
-	    Elf_Addr *target;
-	    Elf_Addr addend;
-
-	    offset = grub_target_to_host (r->r_offset);
-	    target = get_target_address (e, target_section, offset, image_target);
-	    info = grub_target_to_host (r->r_info);
-	    sym_addr = get_symbol_address (e, symtab_section,
-					   ELF_R_SYM (info), image_target);
-
-            addend = (s->sh_type == grub_target_to_host32 (SHT_RELA)) ?
-	      r->r_addend : 0;
-
-	    if (image_target->voidp_sizeof == 4)
-	      switch (ELF_R_TYPE (info))
-		{
-		case R_386_NONE:
-		  break;
-
-		case R_386_32:
-		  /* This is absolute.  */
-		  *target = grub_host_to_target32 (grub_target_to_host32 (*target)
-						   + addend + sym_addr);
-		  grub_util_info ("relocating an R_386_32 entry to 0x%x at the offset 0x%x",
-				  *target, offset);
-		  break;
-
-		case R_386_PC32:
-		  /* This is relative.  */
-		  *target = grub_host_to_target32 (grub_target_to_host32 (*target)
-						   + addend + sym_addr
-						   - target_section_addr - offset
-						   - image_target->vaddr_offset);
-		  grub_util_info ("relocating an R_386_PC32 entry to 0x%x at the offset 0x%x",
-				  *target, offset);
-		  break;
-		default:
-		  grub_util_error ("unknown relocation type %d",
-				   ELF_R_TYPE (info));
-		  break;
-		}
-	    else
-	      switch (ELF_R_TYPE (info))
-		{
-
-		case R_X86_64_NONE:
-		  break;
-
-		case R_X86_64_64:
-		  *target = grub_host_to_target64 (grub_target_to_host64 (*target)
-						   + addend + sym_addr);
-		  grub_util_info ("relocating an R_X86_64_64 entry to 0x%llx at the offset 0x%llx",
-				  *target, offset);
-		  break;
-
-		case R_X86_64_PC32:
-		  {
-		    grub_uint32_t *t32 = (grub_uint32_t *) target;
-		    *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
-						  + addend + sym_addr
-						  - target_section_addr - offset
-						  - image_target->vaddr_offset);
-		    grub_util_info ("relocating an R_X86_64_PC32 entry to 0x%x at the offset 0x%llx",
-				    *t32, offset);
-		    break;
-		  }
-
-		case R_X86_64_32:
-		case R_X86_64_32S:
-		  {
-		    grub_uint32_t *t32 = (grub_uint32_t *) target;
-		    *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
-						  + addend + sym_addr);
-		    grub_util_info ("relocating an R_X86_64_32(S) entry to 0x%x at the offset 0x%llx",
-				    *t32, offset);
-		    break;
-		  }
-
-		default:
-		  grub_util_error ("unknown relocation type %d",
-				   ELF_R_TYPE (info));
-		  break;
-		}
-	  }
-      }
-}
-
 struct fixup_block_list
 {
   struct fixup_block_list *next;
@@ -505,457 +302,13 @@ struct fixup_block_list
   struct grub_pe32_fixup_block b;
 };
 
-/* Add a PE32's fixup entry for a relocation. Return the resulting address
-   after having written to the file OUT.  */
-Elf_Addr
-add_fixup_entry (struct fixup_block_list **cblock, grub_uint16_t type,
-		 Elf_Addr addr, int flush, Elf_Addr current_address,
-		 struct image_target_desc *image_target)
-{
-  struct grub_pe32_fixup_block *b;
+#define MKIMAGE_ELF32 1
+#include "grub-mkimagexx.c"
+#undef MKIMAGE_ELF32
 
-  b = &((*cblock)->b);
-
-  /* First, check if it is necessary to write out the current block.  */
-  if ((*cblock)->state)
-    {
-      if (flush || addr < b->page_rva || b->page_rva + 0x1000 <= addr)
-	{
-	  grub_uint32_t size;
-
-	  if (flush)
-	    {
-	      /* Add as much padding as necessary to align the address
-		 with a section boundary.  */
-	      Elf_Addr next_address;
-	      unsigned padding_size;
-              size_t index;
-
-	      next_address = current_address + b->block_size;
-	      padding_size = ((ALIGN_UP (next_address, image_target->section_align)
-			       - next_address)
-			      >> 1);
-              index = ((b->block_size - sizeof (*b)) >> 1);
-              grub_util_info ("adding %d padding fixup entries", padding_size);
-	      while (padding_size--)
-		{
-		  b->entries[index++] = 0;
-		  b->block_size += 2;
-		}
-	    }
-          else if (b->block_size & (8 - 1))
-            {
-	      /* If not aligned with a 32-bit boundary, add
-		 a padding entry.  */
-              size_t index;
-
-              grub_util_info ("adding a padding fixup entry");
-              index = ((b->block_size - sizeof (*b)) >> 1);
-              b->entries[index] = 0;
-              b->block_size += 2;
-            }
-
-          /* Flush it.  */
-          grub_util_info ("writing %d bytes of a fixup block starting at 0x%x",
-                          b->block_size, b->page_rva);
-          size = b->block_size;
-	  current_address += size;
-	  b->page_rva = grub_host_to_target32 (b->page_rva);
-	  b->block_size = grub_host_to_target32 (b->block_size);
-	  (*cblock)->next = xmalloc (sizeof (**cblock) + 2 * 0x1000);
-	  memset ((*cblock)->next, 0, sizeof (**cblock) + 2 * 0x1000);
-	  *cblock = (*cblock)->next;
-	}
-    }
-
-  b = &((*cblock)->b);
-
-  if (! flush)
-    {
-      grub_uint16_t entry;
-      size_t index;
-
-      /* If not allocated yet, allocate a block with enough entries.  */
-      if (! (*cblock)->state)
-	{
-	  (*cblock)->state = 1;
-
-	  /* The spec does not mention the requirement of a Page RVA.
-	     Here, align the address with a 4K boundary for safety.  */
-	  b->page_rva = (addr & ~(0x1000 - 1));
-	  b->block_size = sizeof (*b);
-	}
-
-      /* Sanity check.  */
-      if (b->block_size >= sizeof (*b) + 2 * 0x1000)
-	grub_util_error ("too many fixup entries");
-
-      /* Add a new entry.  */
-      index = ((b->block_size - sizeof (*b)) >> 1);
-      entry = GRUB_PE32_FIXUP_ENTRY (type, addr - b->page_rva);
-      b->entries[index] = grub_host_to_target16 (entry);
-      b->block_size += 2;
-    }
-
-  return current_address;
-}
-
-/* Make a .reloc section.  */
-static Elf_Addr
-make_reloc_section (Elf_Ehdr *e, void **out,
-		    Elf_Addr *section_addresses, Elf_Shdr *sections,
-		    Elf_Half section_entsize, Elf_Half num_sections,
-		    const char *strtab, struct image_target_desc *image_target)
-{
-  Elf_Half i;
-  Elf_Shdr *s;
-  struct fixup_block_list *lst, *lst0;
-  Elf_Addr current_address = 0;
-
-  lst = lst0 = xmalloc (sizeof (*lst) + 2 * 0x1000);
-  memset (lst, 0, sizeof (*lst) + 2 * 0x1000);
-
-  for (i = 0, s = sections;
-       i < num_sections;
-       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-    if ((s->sh_type == grub_cpu_to_le32 (SHT_REL)) ||
-        (s->sh_type == grub_cpu_to_le32 (SHT_RELA)))
-      {
-	Elf_Rel *r;
-	Elf_Word rtab_size, r_size, num_rs;
-	Elf_Off rtab_offset;
-	Elf_Addr section_address;
-	Elf_Word j;
-
-	grub_util_info ("translating the relocation section %s",
-			strtab + grub_le_to_cpu32 (s->sh_name));
-
-	rtab_size = grub_le_to_cpu32 (s->sh_size);
-	r_size = grub_le_to_cpu32 (s->sh_entsize);
-	rtab_offset = grub_le_to_cpu32 (s->sh_offset);
-	num_rs = rtab_size / r_size;
-
-	section_address = section_addresses[grub_le_to_cpu32 (s->sh_info)];
-
-	for (j = 0, r = (Elf_Rel *) ((char *) e + rtab_offset);
-	     j < num_rs;
-	     j++, r = (Elf_Rel *) ((char *) r + r_size))
-	  {
-	    Elf_Addr info;
-	    Elf_Addr offset;
-
-	    offset = grub_le_to_cpu32 (r->r_offset);
-	    info = grub_le_to_cpu32 (r->r_info);
-
-	    /* Necessary to relocate only absolute addresses.  */
-	    if (image_target->voidp_sizeof == 4)
-	      {
-		if (ELF_R_TYPE (info) == R_386_32)
-		  {
-		    Elf_Addr addr;
-
-		    addr = section_address + offset;
-		    grub_util_info ("adding a relocation entry for 0x%x", addr);
-		    current_address = add_fixup_entry (&lst,
-						       GRUB_PE32_REL_BASED_HIGHLOW,
-						       addr, 0, current_address,
-						       image_target);
-		  }
-	      }
-	    else
-	      {
-		if ((ELF_R_TYPE (info) == R_X86_64_32) ||
-		    (ELF_R_TYPE (info) == R_X86_64_32S))
-		  {
-		    grub_util_error ("can\'t add fixup entry for R_X86_64_32(S)");
-		  }
-		else if (ELF_R_TYPE (info) == R_X86_64_64)
-		  {
-		    Elf_Addr addr;
-
-		    addr = section_address + offset;
-		    grub_util_info ("adding a relocation entry for 0x%llx", addr);
-		    current_address = add_fixup_entry (&lst,
-						       GRUB_PE32_REL_BASED_DIR64,
-						       addr,
-						       0, current_address,
-						       image_target);
-		  }
-	      }
-	  }
-      }
-
-  current_address = add_fixup_entry (&lst, 0, 0, 1, current_address, image_target);
-
-  {
-    grub_uint8_t *ptr;
-    ptr = *out = xmalloc (current_address);
-    for (lst = lst0; lst; lst = lst->next)
-      if (lst->state)
-	{
-	  memcpy (ptr, &lst->b, grub_target_to_host32 (lst->b.block_size));
-	  ptr += grub_target_to_host32 (lst->b.block_size);
-	}
-    if (current_address + *out != ptr)
-      {
-	grub_util_error ("Bug detected %d != %d\n", ptr - (grub_uint8_t *) *out,
-			 current_address);
-      }
-  }
-
-  return current_address;
-}
-
-/* Determine if this section is a text section. Return false if this
-   section is not allocated.  */
-static int
-is_text_section (Elf_Shdr *s, struct image_target_desc *image_target)
-{
-  if (image_target->id != IMAGE_EFI 
-      && grub_target_to_host32 (s->sh_type) != SHT_PROGBITS)
-    return 0;
-  return ((grub_target_to_host32 (s->sh_flags) & (SHF_EXECINSTR | SHF_ALLOC))
-	  == (SHF_EXECINSTR | SHF_ALLOC));
-}
-
-/* Determine if this section is a data section. This assumes that
-   BSS is also a data section, since the converter initializes BSS
-   when producing PE32 to avoid a bug in EFI implementations.  */
-static int
-is_data_section (Elf_Shdr *s, struct image_target_desc *image_target)
-{
-  if (image_target->id != IMAGE_EFI 
-      && grub_target_to_host32 (s->sh_type) != SHT_PROGBITS)
-    return 0;
-  return ((grub_target_to_host32 (s->sh_flags) & (SHF_EXECINSTR | SHF_ALLOC))
-	  == SHF_ALLOC);
-}
-
-/* Locate section addresses by merging code sections and data sections
-   into .text and .data, respectively. Return the array of section
-   addresses.  */
-static Elf_Addr *
-locate_sections (Elf_Shdr *sections, Elf_Half section_entsize,
-		 Elf_Half num_sections, const char *strtab,
-		 grub_size_t *exec_size, grub_size_t *kernel_sz,
-		 struct image_target_desc *image_target)
-{
-  int i;
-  Elf_Addr current_address;
-  Elf_Addr *section_addresses;
-  Elf_Shdr *s;
-
-  section_addresses = xmalloc (sizeof (*section_addresses) * num_sections);
-  memset (section_addresses, 0, sizeof (*section_addresses) * num_sections);
-
-  current_address = 0;
-
-  /* .text */
-  for (i = 0, s = sections;
-       i < num_sections;
-       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-    if (is_text_section (s, image_target))
-      {
-	Elf_Word align = grub_host_to_target32 (s->sh_addralign);
-	const char *name = strtab + grub_host_to_target32 (s->sh_name);
-
-	if (align)
-	  current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
-				      align) - image_target->vaddr_offset;
-
-	grub_util_info ("locating the section %s at 0x%x",
-			name, current_address);
-	section_addresses[i] = current_address;
-	current_address += grub_host_to_target32 (s->sh_size);
-      }
-
-  current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
-			      image_target->section_align)
-    - image_target->vaddr_offset;
-  *exec_size = current_address;
-
-  /* .data */
-  for (i = 0, s = sections;
-       i < num_sections;
-       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-    if (is_data_section (s, image_target))
-      {
-	Elf_Word align = grub_host_to_target32 (s->sh_addralign);
-	const char *name = strtab + grub_host_to_target32 (s->sh_name);
-
-	if (align)
-	  current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
-				      align)
-	    - image_target->vaddr_offset;
-
-	grub_util_info ("locating the section %s at 0x%x",
-			name, current_address);
-	section_addresses[i] = current_address;
-	current_address += grub_host_to_target32 (s->sh_size);
-      }
-
-  current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
-			      image_target->section_align) - image_target->vaddr_offset;
-  *kernel_sz = current_address;
-  return section_addresses;
-}
-
-/* Return if the ELF header is valid.  */
-static int
-check_elf_header (Elf_Ehdr *e, size_t size, struct image_target_desc *image_target)
-{
-  if (size < sizeof (*e)
-      || e->e_ident[EI_MAG0] != ELFMAG0
-      || e->e_ident[EI_MAG1] != ELFMAG1
-      || e->e_ident[EI_MAG2] != ELFMAG2
-      || e->e_ident[EI_MAG3] != ELFMAG3
-      || e->e_ident[EI_VERSION] != EV_CURRENT
-      || e->e_version != grub_host_to_target32 (EV_CURRENT))
-    return 0;
-
-  return 1;
-}
-
-static char *
-load_image (const char *kernel_path, grub_size_t *exec_size, 
-	    grub_size_t *kernel_sz, grub_size_t *bss_size,
-	    grub_size_t total_module_size, Elf_Addr *start,
-	    void **reloc_section, grub_size_t *reloc_size,
-	    struct image_target_desc *image_target)
-{
-  char *kernel_img, *out_img;
-  const char *strtab;
-  Elf_Ehdr *e;
-  Elf_Shdr *sections;
-  Elf_Addr *section_addresses;
-  Elf_Addr *section_vaddresses;
-  int i;
-  Elf_Shdr *s;
-  Elf_Half num_sections;
-  Elf_Off section_offset;
-  Elf_Half section_entsize;
-  grub_size_t kernel_size;
-  Elf_Shdr *symtab_section;
-
-  *start = 0;
-
-  kernel_size = grub_util_get_image_size (kernel_path);
-  kernel_img = xmalloc (kernel_size);
-  grub_util_load_image (kernel_path, kernel_img);
-
-  e = (Elf_Ehdr *) kernel_img;
-  if (! check_elf_header (e, kernel_size, image_target))
-    grub_util_error ("invalid ELF header");
-
-  section_offset = grub_target_to_host32 (e->e_shoff);
-  section_entsize = grub_target_to_host16 (e->e_shentsize);
-  num_sections = grub_target_to_host16 (e->e_shnum);
-
-  if (kernel_size < section_offset + section_entsize * num_sections)
-    grub_util_error ("invalid ELF format");
-
-  sections = (Elf_Shdr *) (kernel_img + section_offset);
-
-  /* Relocate sections then symbols in the virtual address space.  */
-  s = (Elf_Shdr *) ((char *) sections
-		      + grub_host_to_target16 (e->e_shstrndx) * section_entsize);
-  strtab = (char *) e + grub_host_to_target32 (s->sh_offset);
-
-  section_addresses = locate_sections (sections, section_entsize,
-				       num_sections, strtab,
-				       exec_size, kernel_sz, image_target);
-
-  if (image_target->id == IMAGE_EFI)
-    {
-      section_vaddresses = xmalloc (sizeof (*section_addresses) * num_sections);
-
-      for (i = 0; i < num_sections; i++)
-	section_vaddresses[i] = section_addresses[i] + image_target->vaddr_offset;
-
-#if 0
-      {
-	Elf_Addr current_address = *kernel_sz;
-
-	for (i = 0, s = sections;
-	     i < num_sections;
-	     i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-	  if (grub_target_to_host32 (s->sh_type) == SHT_NOBITS)
-	    {
-	      Elf_Word align = grub_host_to_target32 (s->sh_addralign);
-	      const char *name = strtab + grub_host_to_target32 (s->sh_name);
-
-	      if (align)
-		current_address = ALIGN_UP (current_address + VADDR_OFFSET, align)
-		  - VADDR_OFFSET;
-	
-	      grub_util_info ("locating the section %s at 0x%x",
-			      name, current_address);
-	      section_vaddresses[i] = current_address + VADDR_OFFSET;
-	      current_address += grub_host_to_target32 (s->sh_size);
-	    }
-	current_address = ALIGN_UP (current_address + VADDR_OFFSET, SECTION_ALIGN)
-	  - VADDR_OFFSET;
-	*bss_size = current_address - *kernel_sz;
-      }
-#else
-      *bss_size = 0;
-#endif
-
-      symtab_section = NULL;
-      for (i = 0, s = sections;
-	   i < num_sections;
-	   i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-	if (s->sh_type == grub_host_to_target32 (SHT_SYMTAB))
-	  {
-	    symtab_section = s;
-	    break;
-	  }
-
-      if (! symtab_section)
-	grub_util_error ("no symbol table");
-
-      *start = relocate_symbols (e, sections, symtab_section,
-				 section_vaddresses, section_entsize,
-				 num_sections, image_target);
-      if (*start == 0)
-	grub_util_error ("start symbol is not defined");
-
-      /* Resolve addresses in the virtual address space.  */
-      relocate_addresses (e, sections, section_addresses, section_entsize,
-			  num_sections, strtab, image_target);
-
-      *reloc_size = make_reloc_section (e, reloc_section,
-					section_vaddresses, sections,
-					section_entsize, num_sections,
-					strtab, image_target);
-
-    }
-  else
-    {
-      *bss_size = 0;
-      *reloc_size = 0;
-      *reloc_section = NULL;
-    }
-
-  out_img = xmalloc (*kernel_sz + total_module_size);
-
-  for (i = 0, s = sections;
-       i < num_sections;
-       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-    if (is_data_section (s, image_target) || is_text_section (s, image_target))
-      {
-	if (grub_target_to_host32 (s->sh_type) == SHT_NOBITS)
-	  memset (out_img + section_addresses[i], 0,
-		  grub_host_to_target32 (s->sh_size));
-	else
-	  memcpy (out_img + section_addresses[i],
-		  kernel_img + grub_host_to_target32 (s->sh_offset),
-		  grub_host_to_target32 (s->sh_size));
-      }
-  free (kernel_img);
-
-  return out_img;
-}
+#define MKIMAGE_ELF64 1
+#include "grub-mkimagexx.c"
+#undef MKIMAGE_ELF64
 
 static void
 generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
@@ -968,16 +321,18 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
   char *kernel_path;
   size_t offset;
   struct grub_util_path_list *path_list, *p, *next;
-  struct grub_module_info *modinfo;
   grub_size_t bss_size;
-  Elf_Addr start_address;
+  grub_uint64_t start_address;
   void *rel_section;
   grub_size_t reloc_size;
   path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods);
 
   kernel_path = grub_util_get_path (dir, "kernel.img");
 
-  total_module_size = sizeof (struct grub_module_info);
+  if (image_target->voidp_sizeof == 8)
+    total_module_size = sizeof (struct grub_module_info64);
+  else
+    total_module_size = sizeof (struct grub_module_info32);
 
   if (memdisk_path)
     {
@@ -1006,22 +361,42 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
   grub_util_info ("the total module size is 0x%x", total_module_size);
 
-  kernel_img = load_image (kernel_path, &exec_size, &kernel_size, &bss_size,
-			   total_module_size, &start_address, &rel_section,
-			   &reloc_size, image_target);
+  if (image_target->voidp_sizeof == 4)
+    kernel_img = load_image32 (kernel_path, &exec_size, &kernel_size, &bss_size,
+			       total_module_size, &start_address, &rel_section,
+			       &reloc_size, image_target);
+  else
+    kernel_img = load_image64 (kernel_path, &exec_size, &kernel_size, &bss_size,
+			       total_module_size, &start_address, &rel_section,
+			       &reloc_size, image_target);
 
   if (image_target->prefix + strlen (prefix) + 1 > image_target->data_end)
     grub_util_error (_("prefix is too long"));
   strcpy (kernel_img + image_target->prefix, prefix);
 
-  /* Fill in the grub_module_info structure.  */
-  modinfo = (struct grub_module_info *) (kernel_img + kernel_size);
-  memset (modinfo, 0, sizeof (struct grub_module_info));
-  modinfo->magic = grub_host_to_target32 (GRUB_MODULE_MAGIC);
-  modinfo->offset = grub_host_to_target_addr (sizeof (struct grub_module_info));
-  modinfo->size = grub_host_to_target_addr (total_module_size);
+  if (image_target->voidp_sizeof == 8)
+    {
+      /* Fill in the grub_module_info structure.  */
+      struct grub_module_info64 *modinfo;
+      modinfo = (struct grub_module_info64 *) (kernel_img + kernel_size);
+      memset (modinfo, 0, sizeof (struct grub_module_info64));
+      modinfo->magic = grub_host_to_target32 (GRUB_MODULE_MAGIC);
+      modinfo->offset = grub_host_to_target_addr (sizeof (struct grub_module_info64));
+      modinfo->size = grub_host_to_target_addr (total_module_size);
+      offset = kernel_size + sizeof (struct grub_module_info64);
+    }
+  else
+    {
+      /* Fill in the grub_module_info structure.  */
+      struct grub_module_info32 *modinfo;
+      modinfo = (struct grub_module_info32 *) (kernel_img + kernel_size);
+      memset (modinfo, 0, sizeof (struct grub_module_info32));
+      modinfo->magic = grub_host_to_target32 (GRUB_MODULE_MAGIC);
+      modinfo->offset = grub_host_to_target_addr (sizeof (struct grub_module_info32));
+      modinfo->size = grub_host_to_target_addr (total_module_size);
+      offset = kernel_size + sizeof (struct grub_module_info32);
+    }
 
-  offset = kernel_size + sizeof (struct grub_module_info);
   for (p = path_list; p; p = p->next)
     {
       struct grub_module_header *header;
@@ -1119,9 +494,9 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 	char *boot_path, *boot_img;
 	size_t boot_size;
 
-	if (GRUB_KERNEL_MACHINE_LINK_ADDR + core_size > GRUB_MEMORY_I386_PC_UPPER)
+	if (GRUB_KERNEL_I386_PC_LINK_ADDR + core_size > GRUB_MEMORY_I386_PC_UPPER)
 	  grub_util_error (_("core image is too big (%p > %p)"),
-			   GRUB_KERNEL_MACHINE_LINK_ADDR + core_size,
+			   GRUB_KERNEL_I386_PC_LINK_ADDR + core_size,
 			   GRUB_MEMORY_I386_PC_UPPER);
 
 	num = ((core_size + GRUB_DISK_SECTOR_SIZE - 1) >> GRUB_DISK_SECTOR_BITS);
@@ -1258,7 +633,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
 	    o = header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE
 	      + sizeof (struct grub_pe32_coff_header);
-	    o->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC);
+	    o->magic = grub_host_to_target16 (GRUB_PE32_PE64_MAGIC);
 	    o->code_size = grub_host_to_target32 (exec_size);
 	    o->data_size = grub_cpu_to_le32 (reloc_addr - exec_size);
 	    o->bss_size = grub_cpu_to_le32 (bss_size);
@@ -1523,7 +898,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
 	    phdr[1].p_type = grub_host_to_target32 (PT_NOTE);
 	    phdr[1].p_flags = grub_host_to_target32 (PF_R);
-	    phdr[1].p_align = grub_host_to_target32 (GRUB_TARGET_SIZEOF_LONG);
+	    phdr[1].p_align = grub_host_to_target32 (image_target->voidp_sizeof);
 	    phdr[1].p_vaddr = 0;
 	    phdr[1].p_paddr = 0;
 	    phdr[1].p_filesz = grub_host_to_target32 (note_size);
diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
new file mode 100644
index 000000000..eb0c7a514
--- /dev/null
+++ b/util/grub-mkimagexx.c
@@ -0,0 +1,741 @@
+/* grub-mkimage.c - make a bootable image */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010  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/>.
+ */
+
+#if defined(MKIMAGE_ELF32)
+# define SUFFIX(x)	x ## 32
+# define ELFCLASSXX	ELFCLASS32
+# define Elf_Ehdr	Elf32_Ehdr
+# define Elf_Phdr	Elf32_Phdr
+# define Elf_Addr	Elf32_Addr
+# define Elf_Sym	Elf32_Sym
+# define Elf_Off	Elf32_Off
+# define Elf_Shdr	Elf32_Shdr
+# define Elf_Rela       Elf32_Rela
+# define Elf_Rel        Elf32_Rel
+# define ELF_R_SYM(val)		ELF32_R_SYM(val)
+# define ELF_R_TYPE(val)		ELF32_R_TYPE(val)
+#elif defined(MKIMAGE_ELF64)
+# define SUFFIX(x)	x ## 64
+# define ELFCLASSXX	ELFCLASS64
+# define Elf_Ehdr	Elf64_Ehdr
+# define Elf_Phdr	Elf64_Phdr
+# define Elf_Addr	Elf64_Addr
+# define Elf_Sym	Elf64_Sym
+# define Elf_Off	Elf64_Off
+# define Elf_Shdr	Elf64_Shdr
+# define Elf_Rela       Elf64_Rela
+# define Elf_Rel        Elf64_Rel
+# define ELF_R_SYM(val)		ELF64_R_SYM(val)
+# define ELF_R_TYPE(val)		ELF64_R_TYPE(val)
+#else
+#error "I'm confused"
+#endif
+
+/* Relocate symbols; note that this function overwrites the symbol table.
+   Return the address of a start symbol.  */
+static Elf_Addr
+SUFFIX (relocate_symbols) (Elf_Ehdr *e, Elf_Shdr *sections,
+			   Elf_Shdr *symtab_section, Elf_Addr *section_addresses,
+			   Elf_Half section_entsize, Elf_Half num_sections,
+			   struct image_target_desc *image_target)
+{
+  Elf_Word symtab_size, sym_size, num_syms;
+  Elf_Off symtab_offset;
+  Elf_Addr start_address = 0;
+  Elf_Sym *sym;
+  Elf_Word i;
+  Elf_Shdr *strtab_section;
+  const char *strtab;
+
+  strtab_section
+    = (Elf_Shdr *) ((char *) sections
+		      + (grub_target_to_host32 (symtab_section->sh_link)
+			 * section_entsize));
+  strtab = (char *) e + grub_target_to_host32 (strtab_section->sh_offset);
+
+  symtab_size = grub_target_to_host32 (symtab_section->sh_size);
+  sym_size = grub_target_to_host32 (symtab_section->sh_entsize);
+  symtab_offset = grub_target_to_host32 (symtab_section->sh_offset);
+  num_syms = symtab_size / sym_size;
+
+  for (i = 0, sym = (Elf_Sym *) ((char *) e + symtab_offset);
+       i < num_syms;
+       i++, sym = (Elf_Sym *) ((char *) sym + sym_size))
+    {
+      Elf_Section index;
+      const char *name;
+
+      name = strtab + grub_target_to_host32 (sym->st_name);
+
+      index = grub_target_to_host16 (sym->st_shndx);
+      if (index == STN_ABS)
+        {
+          continue;
+        }
+      else if ((index == STN_UNDEF))
+	{
+	  if (sym->st_name)
+	    grub_util_error ("undefined symbol %s", name);
+	  else
+	    continue;
+	}
+      else if (index >= num_sections)
+	grub_util_error ("section %d does not exist", index);
+
+      sym->st_value = (grub_target_to_host32 (sym->st_value)
+		       + section_addresses[index]);
+      grub_util_info ("locating %s at 0x%x", name, sym->st_value);
+
+      if (! start_address)
+	if (strcmp (name, "_start") == 0 || strcmp (name, "start") == 0)
+	  start_address = sym->st_value;
+    }
+
+  return start_address;
+}
+
+/* Return the address of a symbol at the index I in the section S.  */
+static Elf_Addr
+SUFFIX (get_symbol_address) (Elf_Ehdr *e, Elf_Shdr *s, Elf_Word i,
+			     struct image_target_desc *image_target)
+{
+  Elf_Sym *sym;
+
+  sym = (Elf_Sym *) ((char *) e
+		       + grub_target_to_host32 (s->sh_offset)
+		       + i * grub_target_to_host32 (s->sh_entsize));
+  return sym->st_value;
+}
+
+/* Return the address of a modified value.  */
+static Elf_Addr *
+SUFFIX (get_target_address) (Elf_Ehdr *e, Elf_Shdr *s, Elf_Addr offset,
+		    struct image_target_desc *image_target)
+{
+  return (Elf_Addr *) ((char *) e + grub_target_to_host32 (s->sh_offset) + offset);
+}
+
+/* Deal with relocation information. This function relocates addresses
+   within the virtual address space starting from 0. So only relative
+   addresses can be fully resolved. Absolute addresses must be relocated
+   again by a PE32 relocator when loaded.  */
+static void
+SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
+			     Elf_Addr *section_addresses,
+			     Elf_Half section_entsize, Elf_Half num_sections,
+			     const char *strtab, struct image_target_desc *image_target)
+{
+  Elf_Half i;
+  Elf_Shdr *s;
+
+  for (i = 0, s = sections;
+       i < num_sections;
+       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+    if ((s->sh_type == grub_host_to_target32 (SHT_REL)) ||
+        (s->sh_type == grub_host_to_target32 (SHT_RELA)))
+      {
+	Elf_Rela *r;
+	Elf_Word rtab_size, r_size, num_rs;
+	Elf_Off rtab_offset;
+	Elf_Shdr *symtab_section;
+	Elf_Word target_section_index;
+	Elf_Addr target_section_addr;
+	Elf_Shdr *target_section;
+	Elf_Word j;
+
+	symtab_section = (Elf_Shdr *) ((char *) sections
+					 + (grub_target_to_host32 (s->sh_link)
+					    * section_entsize));
+	target_section_index = grub_target_to_host32 (s->sh_info);
+	target_section_addr = section_addresses[target_section_index];
+	target_section = (Elf_Shdr *) ((char *) sections
+					 + (target_section_index
+					    * section_entsize));
+
+	grub_util_info ("dealing with the relocation section %s for %s",
+			strtab + grub_target_to_host32 (s->sh_name),
+			strtab + grub_target_to_host32 (target_section->sh_name));
+
+	rtab_size = grub_target_to_host32 (s->sh_size);
+	r_size = grub_target_to_host32 (s->sh_entsize);
+	rtab_offset = grub_target_to_host32 (s->sh_offset);
+	num_rs = rtab_size / r_size;
+
+	for (j = 0, r = (Elf_Rela *) ((char *) e + rtab_offset);
+	     j < num_rs;
+	     j++, r = (Elf_Rela *) ((char *) r + r_size))
+	  {
+            Elf_Addr info;
+	    Elf_Addr offset;
+	    Elf_Addr sym_addr;
+	    Elf_Addr *target;
+	    Elf_Addr addend;
+
+	    offset = grub_target_to_host (r->r_offset);
+	    target = SUFFIX (get_target_address) (e, target_section,
+						  offset, image_target);
+	    info = grub_target_to_host (r->r_info);
+	    sym_addr = SUFFIX (get_symbol_address) (e, symtab_section,
+						    ELF_R_SYM (info), image_target);
+
+            addend = (s->sh_type == grub_target_to_host32 (SHT_RELA)) ?
+	      r->r_addend : 0;
+
+	    if (image_target->voidp_sizeof == 4)
+	      switch (ELF_R_TYPE (info))
+		{
+		case R_386_NONE:
+		  break;
+
+		case R_386_32:
+		  /* This is absolute.  */
+		  *target = grub_host_to_target32 (grub_target_to_host32 (*target)
+						   + addend + sym_addr);
+		  grub_util_info ("relocating an R_386_32 entry to 0x%x at the offset 0x%x",
+				  *target, offset);
+		  break;
+
+		case R_386_PC32:
+		  /* This is relative.  */
+		  *target = grub_host_to_target32 (grub_target_to_host32 (*target)
+						   + addend + sym_addr
+						   - target_section_addr - offset
+						   - image_target->vaddr_offset);
+		  grub_util_info ("relocating an R_386_PC32 entry to 0x%x at the offset 0x%x",
+				  *target, offset);
+		  break;
+		default:
+		  grub_util_error ("unknown relocation type %d",
+				   ELF_R_TYPE (info));
+		  break;
+		}
+	    else
+	      switch (ELF_R_TYPE (info))
+		{
+
+		case R_X86_64_NONE:
+		  break;
+
+		case R_X86_64_64:
+		  *target = grub_host_to_target64 (grub_target_to_host64 (*target)
+						   + addend + sym_addr);
+		  grub_util_info ("relocating an R_X86_64_64 entry to 0x%llx at the offset 0x%llx",
+				  *target, offset);
+		  break;
+
+		case R_X86_64_PC32:
+		  {
+		    grub_uint32_t *t32 = (grub_uint32_t *) target;
+		    *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
+						  + addend + sym_addr
+						  - target_section_addr - offset
+						  - image_target->vaddr_offset);
+		    grub_util_info ("relocating an R_X86_64_PC32 entry to 0x%x at the offset 0x%llx",
+				    *t32, offset);
+		    break;
+		  }
+
+		case R_X86_64_32:
+		case R_X86_64_32S:
+		  {
+		    grub_uint32_t *t32 = (grub_uint32_t *) target;
+		    *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
+						  + addend + sym_addr);
+		    grub_util_info ("relocating an R_X86_64_32(S) entry to 0x%x at the offset 0x%llx",
+				    *t32, offset);
+		    break;
+		  }
+
+		default:
+		  grub_util_error ("unknown relocation type %d",
+				   ELF_R_TYPE (info));
+		  break;
+		}
+	  }
+      }
+}
+
+/* Add a PE32's fixup entry for a relocation. Return the resulting address
+   after having written to the file OUT.  */
+static Elf_Addr
+SUFFIX (add_fixup_entry) (struct fixup_block_list **cblock, grub_uint16_t type,
+			  Elf_Addr addr, int flush, Elf_Addr current_address,
+			  struct image_target_desc *image_target)
+{
+  struct grub_pe32_fixup_block *b;
+
+  b = &((*cblock)->b);
+
+  /* First, check if it is necessary to write out the current block.  */
+  if ((*cblock)->state)
+    {
+      if (flush || addr < b->page_rva || b->page_rva + 0x1000 <= addr)
+	{
+	  grub_uint32_t size;
+
+	  if (flush)
+	    {
+	      /* Add as much padding as necessary to align the address
+		 with a section boundary.  */
+	      Elf_Addr next_address;
+	      unsigned padding_size;
+              size_t index;
+
+	      next_address = current_address + b->block_size;
+	      padding_size = ((ALIGN_UP (next_address, image_target->section_align)
+			       - next_address)
+			      >> 1);
+              index = ((b->block_size - sizeof (*b)) >> 1);
+              grub_util_info ("adding %d padding fixup entries", padding_size);
+	      while (padding_size--)
+		{
+		  b->entries[index++] = 0;
+		  b->block_size += 2;
+		}
+	    }
+          else if (b->block_size & (8 - 1))
+            {
+	      /* If not aligned with a 32-bit boundary, add
+		 a padding entry.  */
+              size_t index;
+
+              grub_util_info ("adding a padding fixup entry");
+              index = ((b->block_size - sizeof (*b)) >> 1);
+              b->entries[index] = 0;
+              b->block_size += 2;
+            }
+
+          /* Flush it.  */
+          grub_util_info ("writing %d bytes of a fixup block starting at 0x%x",
+                          b->block_size, b->page_rva);
+          size = b->block_size;
+	  current_address += size;
+	  b->page_rva = grub_host_to_target32 (b->page_rva);
+	  b->block_size = grub_host_to_target32 (b->block_size);
+	  (*cblock)->next = xmalloc (sizeof (**cblock) + 2 * 0x1000);
+	  memset ((*cblock)->next, 0, sizeof (**cblock) + 2 * 0x1000);
+	  *cblock = (*cblock)->next;
+	}
+    }
+
+  b = &((*cblock)->b);
+
+  if (! flush)
+    {
+      grub_uint16_t entry;
+      size_t index;
+
+      /* If not allocated yet, allocate a block with enough entries.  */
+      if (! (*cblock)->state)
+	{
+	  (*cblock)->state = 1;
+
+	  /* The spec does not mention the requirement of a Page RVA.
+	     Here, align the address with a 4K boundary for safety.  */
+	  b->page_rva = (addr & ~(0x1000 - 1));
+	  b->block_size = sizeof (*b);
+	}
+
+      /* Sanity check.  */
+      if (b->block_size >= sizeof (*b) + 2 * 0x1000)
+	grub_util_error ("too many fixup entries");
+
+      /* Add a new entry.  */
+      index = ((b->block_size - sizeof (*b)) >> 1);
+      entry = GRUB_PE32_FIXUP_ENTRY (type, addr - b->page_rva);
+      b->entries[index] = grub_host_to_target16 (entry);
+      b->block_size += 2;
+    }
+
+  return current_address;
+}
+
+/* Make a .reloc section.  */
+static Elf_Addr
+SUFFIX (make_reloc_section) (Elf_Ehdr *e, void **out,
+			     Elf_Addr *section_addresses, Elf_Shdr *sections,
+			     Elf_Half section_entsize, Elf_Half num_sections,
+			     const char *strtab, struct image_target_desc *image_target)
+{
+  Elf_Half i;
+  Elf_Shdr *s;
+  struct fixup_block_list *lst, *lst0;
+  Elf_Addr current_address = 0;
+
+  lst = lst0 = xmalloc (sizeof (*lst) + 2 * 0x1000);
+  memset (lst, 0, sizeof (*lst) + 2 * 0x1000);
+
+  for (i = 0, s = sections;
+       i < num_sections;
+       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+    if ((s->sh_type == grub_cpu_to_le32 (SHT_REL)) ||
+        (s->sh_type == grub_cpu_to_le32 (SHT_RELA)))
+      {
+	Elf_Rel *r;
+	Elf_Word rtab_size, r_size, num_rs;
+	Elf_Off rtab_offset;
+	Elf_Addr section_address;
+	Elf_Word j;
+
+	grub_util_info ("translating the relocation section %s",
+			strtab + grub_le_to_cpu32 (s->sh_name));
+
+	rtab_size = grub_le_to_cpu32 (s->sh_size);
+	r_size = grub_le_to_cpu32 (s->sh_entsize);
+	rtab_offset = grub_le_to_cpu32 (s->sh_offset);
+	num_rs = rtab_size / r_size;
+
+	section_address = section_addresses[grub_le_to_cpu32 (s->sh_info)];
+
+	for (j = 0, r = (Elf_Rel *) ((char *) e + rtab_offset);
+	     j < num_rs;
+	     j++, r = (Elf_Rel *) ((char *) r + r_size))
+	  {
+	    Elf_Addr info;
+	    Elf_Addr offset;
+
+	    offset = grub_le_to_cpu32 (r->r_offset);
+	    info = grub_le_to_cpu32 (r->r_info);
+
+	    /* Necessary to relocate only absolute addresses.  */
+	    if (image_target->voidp_sizeof == 4)
+	      {
+		if (ELF_R_TYPE (info) == R_386_32)
+		  {
+		    Elf_Addr addr;
+
+		    addr = section_address + offset;
+		    grub_util_info ("adding a relocation entry for 0x%x", addr);
+		    current_address
+		      = SUFFIX (add_fixup_entry) (&lst,
+						  GRUB_PE32_REL_BASED_HIGHLOW,
+						  addr, 0, current_address,
+						  image_target);
+		  }
+	      }
+	    else
+	      {
+		if ((ELF_R_TYPE (info) == R_X86_64_32) ||
+		    (ELF_R_TYPE (info) == R_X86_64_32S))
+		  {
+		    grub_util_error ("can\'t add fixup entry for R_X86_64_32(S)");
+		  }
+		else if (ELF_R_TYPE (info) == R_X86_64_64)
+		  {
+		    Elf_Addr addr;
+
+		    addr = section_address + offset;
+		    grub_util_info ("adding a relocation entry for 0x%llx", addr);
+		    current_address
+		      = SUFFIX (add_fixup_entry) (&lst,
+						  GRUB_PE32_REL_BASED_DIR64,
+						  addr,
+						  0, current_address,
+						  image_target);
+		  }
+	      }
+	  }
+      }
+
+  current_address = SUFFIX (add_fixup_entry) (&lst, 0, 0, 1, current_address, image_target);
+
+  {
+    grub_uint8_t *ptr;
+    ptr = *out = xmalloc (current_address);
+    for (lst = lst0; lst; lst = lst->next)
+      if (lst->state)
+	{
+	  memcpy (ptr, &lst->b, grub_target_to_host32 (lst->b.block_size));
+	  ptr += grub_target_to_host32 (lst->b.block_size);
+	}
+    if (current_address + *out != ptr)
+      {
+	grub_util_error ("Bug detected %d != %d\n", ptr - (grub_uint8_t *) *out,
+			 current_address);
+      }
+  }
+
+  return current_address;
+}
+
+/* Determine if this section is a text section. Return false if this
+   section is not allocated.  */
+static int
+SUFFIX (is_text_section) (Elf_Shdr *s, struct image_target_desc *image_target)
+{
+  if (image_target->id != IMAGE_EFI 
+      && grub_target_to_host32 (s->sh_type) != SHT_PROGBITS)
+    return 0;
+  return ((grub_target_to_host32 (s->sh_flags) & (SHF_EXECINSTR | SHF_ALLOC))
+	  == (SHF_EXECINSTR | SHF_ALLOC));
+}
+
+/* Determine if this section is a data section. This assumes that
+   BSS is also a data section, since the converter initializes BSS
+   when producing PE32 to avoid a bug in EFI implementations.  */
+static int
+SUFFIX (is_data_section) (Elf_Shdr *s, struct image_target_desc *image_target)
+{
+  if (image_target->id != IMAGE_EFI 
+      && grub_target_to_host32 (s->sh_type) != SHT_PROGBITS)
+    return 0;
+  return ((grub_target_to_host32 (s->sh_flags) & (SHF_EXECINSTR | SHF_ALLOC))
+	  == SHF_ALLOC);
+}
+
+/* Return if the ELF header is valid.  */
+static int
+SUFFIX (check_elf_header) (Elf_Ehdr *e, size_t size, struct image_target_desc *image_target)
+{
+  if (size < sizeof (*e)
+      || e->e_ident[EI_MAG0] != ELFMAG0
+      || e->e_ident[EI_MAG1] != ELFMAG1
+      || e->e_ident[EI_MAG2] != ELFMAG2
+      || e->e_ident[EI_MAG3] != ELFMAG3
+      || e->e_ident[EI_VERSION] != EV_CURRENT
+      || e->e_ident[EI_CLASS] != ELFCLASSXX
+      || e->e_version != grub_host_to_target32 (EV_CURRENT))
+    return 0;
+
+  return 1;
+}
+
+/* Locate section addresses by merging code sections and data sections
+   into .text and .data, respectively. Return the array of section
+   addresses.  */
+static Elf_Addr *
+SUFFIX (locate_sections) (Elf_Shdr *sections, Elf_Half section_entsize,
+			  Elf_Half num_sections, const char *strtab,
+			  grub_size_t *exec_size, grub_size_t *kernel_sz,
+			  struct image_target_desc *image_target)
+{
+  int i;
+  Elf_Addr current_address;
+  Elf_Addr *section_addresses;
+  Elf_Shdr *s;
+
+  section_addresses = xmalloc (sizeof (*section_addresses) * num_sections);
+  memset (section_addresses, 0, sizeof (*section_addresses) * num_sections);
+
+  current_address = 0;
+
+  /* .text */
+  for (i = 0, s = sections;
+       i < num_sections;
+       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+    if (SUFFIX (is_text_section) (s, image_target))
+      {
+	Elf_Word align = grub_host_to_target32 (s->sh_addralign);
+	const char *name = strtab + grub_host_to_target32 (s->sh_name);
+
+	if (align)
+	  current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
+				      align) - image_target->vaddr_offset;
+
+	grub_util_info ("locating the section %s at 0x%x",
+			name, current_address);
+	section_addresses[i] = current_address;
+	current_address += grub_host_to_target32 (s->sh_size);
+      }
+
+  current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
+			      image_target->section_align)
+    - image_target->vaddr_offset;
+  *exec_size = current_address;
+
+  /* .data */
+  for (i = 0, s = sections;
+       i < num_sections;
+       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+    if (SUFFIX (is_data_section) (s, image_target))
+      {
+	Elf_Word align = grub_host_to_target32 (s->sh_addralign);
+	const char *name = strtab + grub_host_to_target32 (s->sh_name);
+
+	if (align)
+	  current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
+				      align)
+	    - image_target->vaddr_offset;
+
+	grub_util_info ("locating the section %s at 0x%x",
+			name, current_address);
+	section_addresses[i] = current_address;
+	current_address += grub_host_to_target32 (s->sh_size);
+      }
+
+  current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
+			      image_target->section_align) - image_target->vaddr_offset;
+  *kernel_sz = current_address;
+  return section_addresses;
+}
+
+static char *
+SUFFIX (load_image) (const char *kernel_path, grub_size_t *exec_size, 
+		     grub_size_t *kernel_sz, grub_size_t *bss_size,
+		     grub_size_t total_module_size, grub_uint64_t *start,
+		     void **reloc_section, grub_size_t *reloc_size,
+		     struct image_target_desc *image_target)
+{
+  char *kernel_img, *out_img;
+  const char *strtab;
+  Elf_Ehdr *e;
+  Elf_Shdr *sections;
+  Elf_Addr *section_addresses;
+  Elf_Addr *section_vaddresses;
+  int i;
+  Elf_Shdr *s;
+  Elf_Half num_sections;
+  Elf_Off section_offset;
+  Elf_Half section_entsize;
+  grub_size_t kernel_size;
+  Elf_Shdr *symtab_section;
+
+  *start = 0;
+
+  kernel_size = grub_util_get_image_size (kernel_path);
+  kernel_img = xmalloc (kernel_size);
+  grub_util_load_image (kernel_path, kernel_img);
+
+  e = (Elf_Ehdr *) kernel_img;
+  if (! SUFFIX (check_elf_header) (e, kernel_size, image_target))
+    grub_util_error ("invalid ELF header");
+
+  section_offset = grub_target_to_host32 (e->e_shoff);
+  section_entsize = grub_target_to_host16 (e->e_shentsize);
+  num_sections = grub_target_to_host16 (e->e_shnum);
+
+  if (kernel_size < section_offset + section_entsize * num_sections)
+    grub_util_error ("invalid ELF format");
+
+  sections = (Elf_Shdr *) (kernel_img + section_offset);
+
+  /* Relocate sections then symbols in the virtual address space.  */
+  s = (Elf_Shdr *) ((char *) sections
+		      + grub_host_to_target16 (e->e_shstrndx) * section_entsize);
+  strtab = (char *) e + grub_host_to_target32 (s->sh_offset);
+
+  section_addresses = SUFFIX (locate_sections) (sections, section_entsize,
+						num_sections, strtab,
+						exec_size, kernel_sz, image_target);
+
+  if (image_target->id == IMAGE_EFI)
+    {
+      section_vaddresses = xmalloc (sizeof (*section_addresses) * num_sections);
+
+      for (i = 0; i < num_sections; i++)
+	section_vaddresses[i] = section_addresses[i] + image_target->vaddr_offset;
+
+#if 0
+      {
+	Elf_Addr current_address = *kernel_sz;
+
+	for (i = 0, s = sections;
+	     i < num_sections;
+	     i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+	  if (grub_target_to_host32 (s->sh_type) == SHT_NOBITS)
+	    {
+	      Elf_Word align = grub_host_to_target32 (s->sh_addralign);
+	      const char *name = strtab + grub_host_to_target32 (s->sh_name);
+
+	      if (align)
+		current_address = ALIGN_UP (current_address + VADDR_OFFSET, align)
+		  - VADDR_OFFSET;
+	
+	      grub_util_info ("locating the section %s at 0x%x",
+			      name, current_address);
+	      section_vaddresses[i] = current_address + VADDR_OFFSET;
+	      current_address += grub_host_to_target32 (s->sh_size);
+	    }
+	current_address = ALIGN_UP (current_address + VADDR_OFFSET, SECTION_ALIGN)
+	  - VADDR_OFFSET;
+	*bss_size = current_address - *kernel_sz;
+      }
+#else
+      *bss_size = 0;
+#endif
+
+      symtab_section = NULL;
+      for (i = 0, s = sections;
+	   i < num_sections;
+	   i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+	if (s->sh_type == grub_host_to_target32 (SHT_SYMTAB))
+	  {
+	    symtab_section = s;
+	    break;
+	  }
+
+      if (! symtab_section)
+	grub_util_error ("no symbol table");
+
+      *start = SUFFIX (relocate_symbols) (e, sections, symtab_section,
+					  section_vaddresses, section_entsize,
+					  num_sections, image_target);
+      if (*start == 0)
+	grub_util_error ("start symbol is not defined");
+      
+      /* Resolve addresses in the virtual address space.  */
+      SUFFIX (relocate_addresses) (e, sections, section_addresses, section_entsize,
+				   num_sections, strtab, image_target);
+	  
+      *reloc_size = SUFFIX (make_reloc_section) (e, reloc_section,
+						 section_vaddresses, sections,
+						 section_entsize, num_sections,
+						 strtab, image_target);
+    }
+  else
+    {
+      *bss_size = 0;
+      *reloc_size = 0;
+      *reloc_section = NULL;
+    }
+
+  out_img = xmalloc (*kernel_sz + total_module_size);
+
+  for (i = 0, s = sections;
+       i < num_sections;
+       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+    if (SUFFIX (is_data_section) (s, image_target)
+	|| SUFFIX (is_text_section) (s, image_target))
+      {
+	if (grub_target_to_host32 (s->sh_type) == SHT_NOBITS)
+	  memset (out_img + section_addresses[i], 0,
+		  grub_host_to_target32 (s->sh_size));
+	else
+	  memcpy (out_img + section_addresses[i],
+		  kernel_img + grub_host_to_target32 (s->sh_offset),
+		  grub_host_to_target32 (s->sh_size));
+      }
+  free (kernel_img);
+
+  return out_img;
+}
+
+
+#undef SUFFIX
+#undef ELFCLASSXX
+#undef Elf_Ehdr
+#undef Elf_Phdr
+#undef Elf_Shdr
+#undef Elf_Addr
+#undef Elf_Sym
+#undef Elf_Off
+#undef Elf_Rela
+#undef Elf_Rel
+#undef ELF_R_TYPE
+#undef ELF_R_SYM

From 962b15b4c19ba248a7e66ebd9f504c901f917361 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 26 Apr 2010 14:42:40 +0200
Subject: [PATCH 0838/1628] Fill info tables for qemu, sparc and mips

---
 boot/sparc64/ieee1275/diskboot.S       |   2 +-
 include/grub/mips/kernel.h             |  33 -----
 include/grub/offsets.h                 |  31 ++++
 include/grub/sparc64/ieee1275/kernel.h |  16 --
 kern/mips/startup.S                    |  23 +--
 kern/sparc64/ieee1275/crt0.S           |   1 +
 util/grub-mkimage.c                    | 198 ++++++++++++++++++-------
 util/grub-mkimagexx.c                  |  27 ++--
 8 files changed, 205 insertions(+), 126 deletions(-)

diff --git a/boot/sparc64/ieee1275/diskboot.S b/boot/sparc64/ieee1275/diskboot.S
index a8fd50d87..83dfee098 100644
--- a/boot/sparc64/ieee1275/diskboot.S
+++ b/boot/sparc64/ieee1275/diskboot.S
@@ -137,7 +137,7 @@ lastlist:
 	.word	0
 	.word	0
 
-	. = _start + (0x200 - GRUB_BOOT_MACHINE_LIST_SIZE)
+	. = _start + (0x200 - GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE)
 blocklist_default_start:
 	.word	0
 	.word	2
diff --git a/include/grub/mips/kernel.h b/include/grub/mips/kernel.h
index 172c1dbe2..bc4d43b2b 100644
--- a/include/grub/mips/kernel.h
+++ b/include/grub/mips/kernel.h
@@ -23,41 +23,8 @@
 /* Non-zero value is only needed for PowerMacs.  */
 #define GRUB_MOD_GAP   0x0
 
-#define GRUB_KERNEL_MACHINE_LINK_ALIGN  32
-
-#define GRUB_KERNEL_CPU_RAW_SIZE        0x200
-#define GRUB_KERNEL_CPU_COMPRESSED_SIZE        0x8
-#define GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE      0xc
-#define GRUB_KERNEL_CPU_KERNEL_IMAGE_SIZE      0x10
-
-#define GRUB_KERNEL_CPU_PREFIX	        GRUB_KERNEL_CPU_RAW_SIZE
-#define GRUB_KERNEL_CPU_DATA_END	GRUB_KERNEL_CPU_RAW_SIZE + 0x48
-
-#define GRUB_KERNEL_MACHINE_RAW_SIZE GRUB_KERNEL_CPU_RAW_SIZE
-
-#define GRUB_KERNEL_MACHINE_PREFIX	GRUB_KERNEL_CPU_PREFIX
-#define GRUB_KERNEL_MACHINE_DATA_END	GRUB_KERNEL_CPU_DATA_END
-#define GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE GRUB_KERNEL_CPU_KERNEL_IMAGE_SIZE
-#define GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE
-#define GRUB_KERNEL_MACHINE_COMPRESSED_SIZE GRUB_KERNEL_CPU_COMPRESSED_SIZE
-
-#define GRUB_PLATFORM_IMAGE_FORMATS     "raw, elf"
-#define GRUB_PLATFORM_IMAGE_DEFAULT_FORMAT     "raw"
-
-#define GRUB_PLATFORM_IMAGE_DEFAULT GRUB_PLATFORM_IMAGE_RAW
-
-#define EM_TARGET EM_MIPS
-
 #ifndef ASM_FILE
 
-typedef enum {
-  GRUB_PLATFORM_IMAGE_RAW,
-  GRUB_PLATFORM_IMAGE_ELF
-}
-  grub_platform_image_format_t;
-#define GRUB_PLATFORM_IMAGE_RAW GRUB_PLATFORM_IMAGE_RAW
-#define GRUB_PLATFORM_IMAGE_ELF GRUB_PLATFORM_IMAGE_ELF
-
 /* The prefix which points to the directory where GRUB modules and its
    configuration file are located.  */
 extern char grub_prefix[];
diff --git a/include/grub/offsets.h b/include/grub/offsets.h
index 2ba6351ca..fc4cd0a46 100644
--- a/include/grub/offsets.h
+++ b/include/grub/offsets.h
@@ -67,14 +67,45 @@
 /* End of the data section. */
 #define GRUB_KERNEL_I386_QEMU_DATA_END		0x50
 
+#define GRUB_KERNEL_I386_QEMU_LINK_ADDR         0x8200
+
+/* The offset of GRUB_TOTAL_MODULE_SIZE.  */
+#define GRUB_KERNEL_SPARC64_IEEE1275_TOTAL_MODULE_SIZE	0x8
+
+/* The offset of GRUB_KERNEL_IMAGE_SIZE.  */
+#define GRUB_KERNEL_SPARC64_IEEE1275_KERNEL_IMAGE_SIZE	0xc
+
+/* The offset of GRUB_COMPRESSED_SIZE.  */
+#define GRUB_KERNEL_SPARC64_IEEE1275_COMPRESSED_SIZE	0x10
+
+/* The offset of GRUB_PREFIX.  */
+#define GRUB_KERNEL_SPARC64_IEEE1275_PREFIX		0x14
+
+/* End of the data section. */
+#define GRUB_KERNEL_SPARC64_IEEE1275_DATA_END		0x114
+
 #define GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE	12
 
 #define GRUB_BOOT_SPARC64_IEEE1275_IMAGE_ADDRESS	0x4400
+#define GRUB_KERNEL_SPARC64_IEEE1275_RAW_SIZE                   0
+#define GRUB_KERNEL_SPARC64_IEEE1275_LINK_ADDR 0x4400
 
 #define GRUB_KERNEL_POWERPC_IEEE1275_PREFIX		0x4
 #define GRUB_KERNEL_POWERPC_IEEE1275_DATA_END	0x44
 #define GRUB_KERNEL_POWERPC_IEEE1275_LINK_ALIGN 4
 
+#define GRUB_KERNEL_MIPS_YEELOONG_LINK_ADDR         0x80200000
+
+#define GRUB_KERNEL_MIPS_YEELOONG_LINK_ALIGN  32
+
+#define GRUB_KERNEL_MIPS_YEELOONG_RAW_SIZE        0x200
+#define GRUB_KERNEL_MIPS_YEELOONG_COMPRESSED_SIZE        0x8
+#define GRUB_KERNEL_MIPS_YEELOONG_TOTAL_MODULE_SIZE      0xc
+#define GRUB_KERNEL_MIPS_YEELOONG_KERNEL_IMAGE_SIZE      0x10
+
+#define GRUB_KERNEL_MIPS_YEELOONG_PREFIX	        GRUB_KERNEL_MIPS_YEELOONG_RAW_SIZE
+#define GRUB_KERNEL_MIPS_YEELOONG_DATA_END	GRUB_KERNEL_MIPS_YEELOONG_RAW_SIZE + 0x48
+
 #ifdef MACHINE
 #define GRUB_OFFSETS_CONCAT_(a,b,c) a ## b ## c
 #define GRUB_OFFSETS_CONCAT(a,b,c) GRUB_OFFSETS_CONCAT_(a,b,c)
diff --git a/include/grub/sparc64/ieee1275/kernel.h b/include/grub/sparc64/ieee1275/kernel.h
index 2948a8d2f..012b5570c 100644
--- a/include/grub/sparc64/ieee1275/kernel.h
+++ b/include/grub/sparc64/ieee1275/kernel.h
@@ -24,22 +24,6 @@
 /* Non-zero value is only needed for PowerMacs.  */
 #define GRUB_MOD_GAP 0x0
 
-/* The offset of GRUB_TOTAL_MODULE_SIZE.  */
-#define GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE	0x8
-
-/* The offset of GRUB_KERNEL_IMAGE_SIZE.  */
-#define GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE	0xc
-
-/* The offset of GRUB_COMPRESSED_SIZE.  */
-#define GRUB_KERNEL_MACHINE_COMPRESSED_SIZE	0x10
-
-/* The offset of GRUB_PREFIX.  */
-#define GRUB_KERNEL_MACHINE_PREFIX		0x14
-
-/* End of the data section. */
-#define GRUB_KERNEL_MACHINE_DATA_END		0x114
-
-#define GRUB_KERNEL_MACHINE_RAW_SIZE                   0
 #define GRUB_KERNEL_MACHINE_STACK_SIZE          0x40000
 
 #ifndef ASM_FILE
diff --git a/kern/mips/startup.S b/kern/mips/startup.S
index 5e3fb7ad5..876b2df71 100644
--- a/kern/mips/startup.S
+++ b/kern/mips/startup.S
@@ -18,8 +18,9 @@
  */
 
 #include <grub/symbol.h>
-#include <grub/cpu/kernel.h>
+#include <grub/offsets.h>
 #include <grub/machine/memory.h>
+#include <grub/machine/kernel.h>
 
 #define BASE_ADDR 8
 	
@@ -32,13 +33,13 @@ _start:
 start:	
 	bal codestart
 base:	
-	. = _start + GRUB_KERNEL_CPU_COMPRESSED_SIZE
+	. = _start + GRUB_KERNEL_MACHINE_COMPRESSED_SIZE
 compressed_size:
 	.long 0
-	. = _start + GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE
+	. = _start + GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE
 total_module_size:
 	.long 0
-	. = _start + GRUB_KERNEL_CPU_KERNEL_IMAGE_SIZE
+	. = _start + GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE
 kernel_image_size:	
 	.long	0
 codestart:
@@ -105,10 +106,10 @@ argdone:
 #endif
 
 	/* Decompress the payload. */
-	addiu $a0, $s0, GRUB_KERNEL_CPU_RAW_SIZE - BASE_ADDR
+	addiu $a0, $s0, GRUB_KERNEL_MACHINE_RAW_SIZE - BASE_ADDR
 	lui $a1, %hi(compressed)
 	addiu $a1, %lo(compressed)
-	lw $a2, (GRUB_KERNEL_CPU_COMPRESSED_SIZE - BASE_ADDR)($s0)
+	lw $a2, (GRUB_KERNEL_MACHINE_COMPRESSED_SIZE - BASE_ADDR)($s0)
 	move $s1, $a1
 
 	/* $a0 contains source compressed address, $a1 is destination,
@@ -134,9 +135,9 @@ reloccont:
 	addiu $t1, %lo(cont)
 
 	jr $t1
-	. = _start + GRUB_KERNEL_CPU_RAW_SIZE
+	. = _start + GRUB_KERNEL_MACHINE_RAW_SIZE
 compressed:	
-	. = _start + GRUB_KERNEL_CPU_PREFIX
+	. = _start + GRUB_KERNEL_MACHINE_PREFIX
 
 VARIABLE(grub_prefix)
 
@@ -146,7 +147,7 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = _start + GRUB_KERNEL_CPU_DATA_END
+	. = _start + GRUB_KERNEL_MACHINE_DATA_END
 #ifdef GRUB_MACHINE_MIPS_YEELOONG
 VARIABLE (grub_arch_busclock)
 	.long 0
@@ -171,7 +172,7 @@ cont:
 	/* Move the modules out of BSS.  */
 	lui $t1, %hi(_start)
 	addiu $t1, %lo(_start)
-	lw $t2, (GRUB_KERNEL_CPU_KERNEL_IMAGE_SIZE - BASE_ADDR)($s0)
+	lw $t2, (GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE - BASE_ADDR)($s0)
 	addu $t2, $t1, $t2
 	
 	lui $t1, %hi(_end)
@@ -181,7 +182,7 @@ cont:
 	nor $t3, $t3, $0
 	and $t1, $t1, $t3
 	
-	lw $t3, (GRUB_KERNEL_CPU_TOTAL_MODULE_SIZE - BASE_ADDR)($s0)
+	lw $t3, (GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE - BASE_ADDR)($s0)
 
 	/* Backward copy.  */
 	add $t1, $t1, $t3
diff --git a/kern/sparc64/ieee1275/crt0.S b/kern/sparc64/ieee1275/crt0.S
index d5a172296..f0f47416d 100644
--- a/kern/sparc64/ieee1275/crt0.S
+++ b/kern/sparc64/ieee1275/crt0.S
@@ -18,6 +18,7 @@
  */
 #include <grub/symbol.h>
 #include <grub/machine/kernel.h>
+#include <grub/offsets.h>
 
 	.text
 	.align	4
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index c9bafdd8b..7ba9e595e 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -55,7 +55,6 @@ struct image_target_desc
     IMAGE_SPARC64_AOUT, IMAGE_SPARC64_RAW, IMAGE_I386_IEEE1275,
     IMAGE_YEELOONG_ELF, IMAGE_QEMU, IMAGE_PPC
   } id;
-  enum {FORMAT_RAW, FORMAT_AOUT, FORMAT_ELF, FORMAT_PE} format;
   enum
     {
       PLATFORM_FLAGS_NONE = 0,
@@ -77,56 +76,153 @@ struct image_target_desc
 
 struct image_target_desc image_targets[] =
   {
-    {"i386-coreboot", 4, 0, IMAGE_COREBOOT, FORMAT_ELF, PLATFORM_FLAGS_NONE,
-     .section_align = 1,
-     .vaddr_offset = 0
+    {
+      .name = "i386-coreboot",
+      .voidp_sizeof = 4,
+      .bigendian = 0,
+      .id = IMAGE_COREBOOT,
+      .flags = PLATFORM_FLAGS_NONE,
+      .section_align = 1,
+      .vaddr_offset = 0
     },
-    {"i386-pc", 4, 0, IMAGE_I386_PC, FORMAT_RAW, PLATFORM_FLAGS_LZMA,
-     GRUB_KERNEL_I386_PC_PREFIX, GRUB_KERNEL_I386_PC_DATA_END,
-     GRUB_KERNEL_I386_PC_RAW_SIZE, GRUB_KERNEL_I386_PC_TOTAL_MODULE_SIZE,
-     GRUB_KERNEL_I386_PC_KERNEL_IMAGE_SIZE, GRUB_KERNEL_I386_PC_COMPRESSED_SIZE,
-     .section_align = 1,
-     .vaddr_offset = 0,
-     GRUB_KERNEL_I386_PC_INSTALL_DOS_PART, GRUB_KERNEL_I386_PC_INSTALL_BSD_PART
+    {
+      .name = "i386-pc",
+      .voidp_sizeof = 4,
+      .bigendian = 0,
+      .id = IMAGE_I386_PC, 
+      .flags = PLATFORM_FLAGS_LZMA,
+      .prefix = GRUB_KERNEL_I386_PC_PREFIX,
+      .data_end = GRUB_KERNEL_I386_PC_DATA_END,
+      .raw_size = GRUB_KERNEL_I386_PC_RAW_SIZE,
+      .total_module_size = GRUB_KERNEL_I386_PC_TOTAL_MODULE_SIZE,
+      .kernel_image_size = GRUB_KERNEL_I386_PC_KERNEL_IMAGE_SIZE,
+      .compressed_size = GRUB_KERNEL_I386_PC_COMPRESSED_SIZE,
+      .section_align = 1,
+      .vaddr_offset = 0,
+      .install_dos_part = GRUB_KERNEL_I386_PC_INSTALL_DOS_PART,
+      .install_bsd_part = GRUB_KERNEL_I386_PC_INSTALL_BSD_PART,
+      .link_addr = GRUB_KERNEL_I386_PC_LINK_ADDR
     },
-    {"i386-efi", 4, 0, IMAGE_EFI, FORMAT_PE, PLATFORM_FLAGS_NONE,
-     .section_align = GRUB_PE32_SECTION_ALIGNMENT,
-     .vaddr_offset = ALIGN_UP (GRUB_PE32_MSDOS_STUB_SIZE
-			       + GRUB_PE32_SIGNATURE_SIZE
-			       + sizeof (struct grub_pe32_coff_header)
-			       + sizeof (struct grub_pe32_optional_header)
-			       + 4 * sizeof (struct grub_pe32_section_table),
-			       GRUB_PE32_SECTION_ALIGNMENT)
+    {
+      .name = "i386-efi",
+      .voidp_sizeof = 4,
+      .bigendian = 0,
+      .id = IMAGE_EFI,
+      .flags = PLATFORM_FLAGS_NONE,
+      .section_align = GRUB_PE32_SECTION_ALIGNMENT,
+      .vaddr_offset = ALIGN_UP (GRUB_PE32_MSDOS_STUB_SIZE
+				+ GRUB_PE32_SIGNATURE_SIZE
+				+ sizeof (struct grub_pe32_coff_header)
+				+ sizeof (struct grub_pe32_optional_header)
+				+ 4 * sizeof (struct grub_pe32_section_table),
+				GRUB_PE32_SECTION_ALIGNMENT)
     },
-    {"i386-ieee1275", 4, 0, IMAGE_I386_IEEE1275, FORMAT_ELF, PLATFORM_FLAGS_NONE,
-     .section_align = 1,
-     .vaddr_offset = 0},
-    {"i386-qemu", 4, 0, IMAGE_QEMU, FORMAT_RAW, PLATFORM_FLAGS_NONE,
-     .section_align = 1,
-     .vaddr_offset = 0},
-    {"x86_64-efi", 8, 0, IMAGE_EFI, FORMAT_PE, PLATFORM_FLAGS_NONE,
-     .section_align = GRUB_PE32_SECTION_ALIGNMENT,
-     .vaddr_offset = ALIGN_UP (GRUB_PE32_MSDOS_STUB_SIZE
-			       + GRUB_PE32_SIGNATURE_SIZE
-			       + sizeof (struct grub_pe32_coff_header)
-			       + sizeof (struct grub_pe64_optional_header)
-			       + 4 * sizeof (struct grub_pe32_section_table),
-			       GRUB_PE32_SECTION_ALIGNMENT)
+    {
+      .name = "i386-ieee1275",
+      .voidp_sizeof = 4,
+      .bigendian = 0,
+      .id = IMAGE_I386_IEEE1275, 
+      .flags = PLATFORM_FLAGS_NONE,
+      .section_align = 1,
+      .vaddr_offset = 0
+    },
+    {
+      .name = "i386-qemu",
+      .voidp_sizeof = 4,
+      .bigendian = 0,
+      .id = IMAGE_QEMU, 
+      .flags = PLATFORM_FLAGS_NONE,
+      .prefix = GRUB_KERNEL_I386_QEMU_PREFIX,
+      .data_end = GRUB_KERNEL_I386_QEMU_DATA_END,
+      .raw_size = 0,
+      .total_module_size = TARGET_NO_FIELD,
+      .compressed_size = TARGET_NO_FIELD,
+      .kernel_image_size = GRUB_KERNEL_I386_QEMU_KERNEL_IMAGE_SIZE,
+      .section_align = 1,
+      .vaddr_offset = 0,
+      .install_dos_part = TARGET_NO_FIELD,
+      .install_bsd_part = TARGET_NO_FIELD,
+      .link_addr = GRUB_KERNEL_I386_QEMU_LINK_ADDR
+    },
+    {
+      .name = "x86_64-efi",
+      .voidp_sizeof = 8,
+      .bigendian = 0, 
+      .id = IMAGE_EFI, 
+      .flags = PLATFORM_FLAGS_NONE,
+      .section_align = GRUB_PE32_SECTION_ALIGNMENT,
+      .vaddr_offset = ALIGN_UP (GRUB_PE32_MSDOS_STUB_SIZE
+				+ GRUB_PE32_SIGNATURE_SIZE
+				+ sizeof (struct grub_pe32_coff_header)
+				+ sizeof (struct grub_pe64_optional_header)
+				+ 4 * sizeof (struct grub_pe32_section_table),
+				GRUB_PE32_SECTION_ALIGNMENT)
+    },
+    {
+      .name = "mipsel-yeeloong-elf",
+      .voidp_sizeof = 4,
+      .bigendian = 0,
+      .id = IMAGE_YEELOONG_ELF, 
+      .flags = PLATFORM_FLAGS_NONE,
+      .prefix = GRUB_KERNEL_MIPS_YEELOONG_PREFIX,
+      .data_end = GRUB_KERNEL_MIPS_YEELOONG_DATA_END,
+      .raw_size = GRUB_KERNEL_MIPS_YEELOONG_RAW_SIZE,
+      .total_module_size = GRUB_KERNEL_MIPS_YEELOONG_TOTAL_MODULE_SIZE,
+      .compressed_size = GRUB_KERNEL_MIPS_YEELOONG_COMPRESSED_SIZE,
+      .kernel_image_size = GRUB_KERNEL_MIPS_YEELOONG_KERNEL_IMAGE_SIZE,
+      .section_align = 1,
+      .vaddr_offset = 0,
+      .install_dos_part = TARGET_NO_FIELD,
+      .install_bsd_part = TARGET_NO_FIELD,
+      .link_addr = GRUB_KERNEL_MIPS_YEELOONG_LINK_ADDR,
+      .elf_target = EM_MIPS,
+      .link_align = GRUB_KERNEL_MIPS_YEELOONG_LINK_ALIGN
+    },
+    {
+      .name = "powerpc-ieee1275",
+      .voidp_sizeof = 4,
+      .bigendian = 1,
+      .id = IMAGE_PPC, 
+      .flags = PLATFORM_FLAGS_NONE,
+      .section_align = 1,
+      .vaddr_offset = 0
+    },
+    {
+      .name = "sparc64-ieee1275-raw",
+      .voidp_sizeof = 8,
+      .bigendian = 1, 
+      .id = IMAGE_SPARC64_RAW,
+      .flags = PLATFORM_FLAGS_NONE,
+      .prefix = GRUB_KERNEL_SPARC64_IEEE1275_PREFIX,
+      .data_end = GRUB_KERNEL_SPARC64_IEEE1275_DATA_END,
+      .raw_size = GRUB_KERNEL_SPARC64_IEEE1275_RAW_SIZE,
+      .total_module_size = GRUB_KERNEL_SPARC64_IEEE1275_TOTAL_MODULE_SIZE,
+      .kernel_image_size = GRUB_KERNEL_SPARC64_IEEE1275_KERNEL_IMAGE_SIZE,
+      .compressed_size = GRUB_KERNEL_SPARC64_IEEE1275_COMPRESSED_SIZE,
+      .section_align = 1,
+      .vaddr_offset = 0,
+      .install_dos_part = TARGET_NO_FIELD,
+      .install_bsd_part = TARGET_NO_FIELD,
+      .link_addr = GRUB_KERNEL_SPARC64_IEEE1275_LINK_ADDR
+    },
+    {
+      .name = "sparc64-ieee1275-aout",
+      .voidp_sizeof = 8,
+      .bigendian = 1,
+      .id = IMAGE_SPARC64_AOUT,
+      .flags = PLATFORM_FLAGS_NONE,
+      .prefix = GRUB_KERNEL_SPARC64_IEEE1275_PREFIX,
+      .data_end = GRUB_KERNEL_SPARC64_IEEE1275_DATA_END,
+      .raw_size = GRUB_KERNEL_SPARC64_IEEE1275_RAW_SIZE,
+      .total_module_size = GRUB_KERNEL_SPARC64_IEEE1275_TOTAL_MODULE_SIZE,
+      .kernel_image_size = GRUB_KERNEL_SPARC64_IEEE1275_KERNEL_IMAGE_SIZE,
+      .compressed_size = GRUB_KERNEL_SPARC64_IEEE1275_COMPRESSED_SIZE,
+      .section_align = 1,
+      .vaddr_offset = 0,
+      .install_dos_part = TARGET_NO_FIELD,
+      .install_bsd_part = TARGET_NO_FIELD,
+      .link_addr = GRUB_KERNEL_SPARC64_IEEE1275_LINK_ADDR
     },
-    {"mipsel-yeeloong-elf", 4, 0, IMAGE_YEELOONG_ELF, FORMAT_ELF, PLATFORM_FLAGS_NONE,
-     .section_align = 1,
-     .vaddr_offset = 0},
-    {"powerpc-ieee1275", 4, 1, IMAGE_PPC, FORMAT_ELF, PLATFORM_FLAGS_NONE,
-     .section_align = 1,
-     .vaddr_offset = 0},
-    {"sparc64-ieee1275-raw", 8, 1, IMAGE_SPARC64_RAW,
-     FORMAT_RAW, PLATFORM_FLAGS_NONE,
-     .section_align = 1,
-     .vaddr_offset = 0},
-    {"sparc64-ieee1275-aout", 8, 1, IMAGE_SPARC64_AOUT,
-     FORMAT_AOUT, PLATFORM_FLAGS_NONE,
-     .section_align = 1,
-     .vaddr_offset = 0},
   };
 
 #define grub_target_to_host32(x) (grub_target_to_host32_real (image_target, (x)))
@@ -191,8 +287,8 @@ grub_host_to_target16_real (struct image_target_desc *image_target, grub_uint16_
     return grub_cpu_to_le16 (in);
 }
 
-static inline grub_uint32_t
-grub_host_to_target_addr_real (struct image_target_desc *image_target, grub_uint32_t in)
+static inline grub_uint64_t
+grub_host_to_target_addr_real (struct image_target_desc *image_target, grub_uint64_t in)
 {
   if (image_target->voidp_sizeof == 8)
     return grub_host_to_target64_real (image_target, in);
@@ -200,8 +296,8 @@ grub_host_to_target_addr_real (struct image_target_desc *image_target, grub_uint
     return grub_host_to_target32_real (image_target, in);
 }
 
-static inline grub_uint32_t
-grub_target_to_host_real (struct image_target_desc *image_target, grub_uint32_t in)
+static inline grub_uint64_t
+grub_target_to_host_real (struct image_target_desc *image_target, grub_uint64_t in)
 {
   if (image_target->voidp_sizeof == 8)
     return grub_target_to_host64_real (image_target, in);
diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
index eb0c7a514..abfe56d42 100644
--- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c
@@ -67,11 +67,11 @@ SUFFIX (relocate_symbols) (Elf_Ehdr *e, Elf_Shdr *sections,
     = (Elf_Shdr *) ((char *) sections
 		      + (grub_target_to_host32 (symtab_section->sh_link)
 			 * section_entsize));
-  strtab = (char *) e + grub_target_to_host32 (strtab_section->sh_offset);
+  strtab = (char *) e + grub_target_to_host (strtab_section->sh_offset);
 
-  symtab_size = grub_target_to_host32 (symtab_section->sh_size);
-  sym_size = grub_target_to_host32 (symtab_section->sh_entsize);
-  symtab_offset = grub_target_to_host32 (symtab_section->sh_offset);
+  symtab_size = grub_target_to_host (symtab_section->sh_size);
+  sym_size = grub_target_to_host (symtab_section->sh_entsize);
+  symtab_offset = grub_target_to_host (symtab_section->sh_offset);
   num_syms = symtab_size / sym_size;
 
   for (i = 0, sym = (Elf_Sym *) ((char *) e + symtab_offset);
@@ -482,7 +482,7 @@ SUFFIX (is_text_section) (Elf_Shdr *s, struct image_target_desc *image_target)
   if (image_target->id != IMAGE_EFI 
       && grub_target_to_host32 (s->sh_type) != SHT_PROGBITS)
     return 0;
-  return ((grub_target_to_host32 (s->sh_flags) & (SHF_EXECINSTR | SHF_ALLOC))
+  return ((grub_target_to_host (s->sh_flags) & (SHF_EXECINSTR | SHF_ALLOC))
 	  == (SHF_EXECINSTR | SHF_ALLOC));
 }
 
@@ -495,7 +495,7 @@ SUFFIX (is_data_section) (Elf_Shdr *s, struct image_target_desc *image_target)
   if (image_target->id != IMAGE_EFI 
       && grub_target_to_host32 (s->sh_type) != SHT_PROGBITS)
     return 0;
-  return ((grub_target_to_host32 (s->sh_flags) & (SHF_EXECINSTR | SHF_ALLOC))
+  return ((grub_target_to_host (s->sh_flags) & (SHF_EXECINSTR | SHF_ALLOC))
 	  == SHF_ALLOC);
 }
 
@@ -543,7 +543,6 @@ SUFFIX (locate_sections) (Elf_Shdr *sections, Elf_Half section_entsize,
       {
 	Elf_Word align = grub_host_to_target32 (s->sh_addralign);
 	const char *name = strtab + grub_host_to_target32 (s->sh_name);
-
 	if (align)
 	  current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
 				      align) - image_target->vaddr_offset;
@@ -551,7 +550,7 @@ SUFFIX (locate_sections) (Elf_Shdr *sections, Elf_Half section_entsize,
 	grub_util_info ("locating the section %s at 0x%x",
 			name, current_address);
 	section_addresses[i] = current_address;
-	current_address += grub_host_to_target32 (s->sh_size);
+	current_address += grub_host_to_target_addr (s->sh_size);
       }
 
   current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
@@ -576,7 +575,7 @@ SUFFIX (locate_sections) (Elf_Shdr *sections, Elf_Half section_entsize,
 	grub_util_info ("locating the section %s at 0x%x",
 			name, current_address);
 	section_addresses[i] = current_address;
-	current_address += grub_host_to_target32 (s->sh_size);
+	current_address += grub_host_to_target_addr (s->sh_size);
       }
 
   current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
@@ -616,7 +615,7 @@ SUFFIX (load_image) (const char *kernel_path, grub_size_t *exec_size,
   if (! SUFFIX (check_elf_header) (e, kernel_size, image_target))
     grub_util_error ("invalid ELF header");
 
-  section_offset = grub_target_to_host32 (e->e_shoff);
+  section_offset = grub_target_to_host (e->e_shoff);
   section_entsize = grub_target_to_host16 (e->e_shentsize);
   num_sections = grub_target_to_host16 (e->e_shnum);
 
@@ -660,7 +659,7 @@ SUFFIX (load_image) (const char *kernel_path, grub_size_t *exec_size,
 	      grub_util_info ("locating the section %s at 0x%x",
 			      name, current_address);
 	      section_vaddresses[i] = current_address + VADDR_OFFSET;
-	      current_address += grub_host_to_target32 (s->sh_size);
+	      current_address += grub_host_to_target_addr (s->sh_size);
 	    }
 	current_address = ALIGN_UP (current_address + VADDR_OFFSET, SECTION_ALIGN)
 	  - VADDR_OFFSET;
@@ -715,11 +714,11 @@ SUFFIX (load_image) (const char *kernel_path, grub_size_t *exec_size,
       {
 	if (grub_target_to_host32 (s->sh_type) == SHT_NOBITS)
 	  memset (out_img + section_addresses[i], 0,
-		  grub_host_to_target32 (s->sh_size));
+		  grub_host_to_target_addr (s->sh_size));
 	else
 	  memcpy (out_img + section_addresses[i],
-		  kernel_img + grub_host_to_target32 (s->sh_offset),
-		  grub_host_to_target32 (s->sh_size));
+		  kernel_img + grub_host_to_target_addr (s->sh_offset),
+		  grub_host_to_target_addr (s->sh_size));
       }
   free (kernel_img);
 

From bb3208158ab37c8a8f28b946b1e804a1442d0c9a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 26 Apr 2010 17:19:15 +0200
Subject: [PATCH 0839/1628] Fill info for remaining platforms. Make efi image
 identical to image of previous grub-mkimage

---
 conf/i386-coreboot.rmk           |  4 +-
 include/grub/efi/pe32.h          | 10 ++--
 include/grub/i386/efi/kernel.h   |  6 ---
 include/grub/i386/kernel.h       |  3 --
 include/grub/offsets.h           | 21 ++++++++
 include/grub/x86_64/efi/kernel.h |  6 ---
 kern/i386/coreboot/startup.S     |  4 +-
 kern/i386/ieee1275/startup.S     |  4 +-
 util/grub-mkimage.c              | 88 ++++++++++++++++++++++++--------
 9 files changed, 101 insertions(+), 45 deletions(-)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 69b8e9a48..11c3abd2a 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -4,8 +4,6 @@ COMMON_CFLAGS = -mrtd -mregparm=3
 
 # Images.
 
-GRUB_KERNEL_MACHINE_LINK_ADDR	= 0x8200
-
 pkglib_PROGRAMS += kernel.img
 kernel_img_SOURCES = kern/i386/coreboot/startup.S \
 	kern/i386/misc.S \
@@ -26,7 +24,7 @@ kernel_img_SOURCES = kern/i386/coreboot/startup.S \
 	symlist.c
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR),-Bstatic
+kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x8200,-Bstatic
 
 sbin_SCRIPTS += grub-install
 grub_install_SOURCES = util/grub-install.in
diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
index 90f9c9f5c..81a1a5797 100644
--- a/include/grub/efi/pe32.h
+++ b/include/grub/efi/pe32.h
@@ -238,6 +238,7 @@ struct grub_pe32_section_table
 #define GRUB_PE32_SCN_ALIGN_SHIFT		20
 #define GRUB_PE32_SCN_ALIGN_MASK		7
 
+#define GRUB_PE32_SIGNATURE_SIZE 4
 
 struct grub_pe32_header
 {
@@ -245,17 +246,20 @@ struct grub_pe32_header
   grub_uint8_t msdos_stub[GRUB_PE32_MSDOS_STUB_SIZE];
 
   /* This is always PE\0\0.  */
-  char signature[4];
+  char signature[GRUB_PE32_SIGNATURE_SIZE];
 
   /* The COFF file header.  */
   struct grub_pe32_coff_header coff_header;
 
+#if GRUB_TARGET_SIZEOF_VOID_P == 8
+  /* The Optional header.  */
+  struct grub_pe64_optional_header optional_header;
+#else
   /* The Optional header.  */
   struct grub_pe32_optional_header optional_header;
+#endif
 };
 
-#define GRUB_PE32_SIGNATURE_SIZE 4
-
 struct grub_pe32_fixup_block
 {
   grub_uint32_t page_rva;
diff --git a/include/grub/i386/efi/kernel.h b/include/grub/i386/efi/kernel.h
index c0549f41a..0cb39a215 100644
--- a/include/grub/i386/efi/kernel.h
+++ b/include/grub/i386/efi/kernel.h
@@ -23,11 +23,5 @@
    configuration file are located.  */
 extern char grub_prefix[];
 
-/* The offset of GRUB_PREFIX.  */
-#define GRUB_KERNEL_MACHINE_PREFIX		0x8
-
-/* End of the data section. */
-#define GRUB_KERNEL_MACHINE_DATA_END		0x50
-
 #endif /* ! GRUB_MACHINE_KERNEL_HEADER */
 
diff --git a/include/grub/i386/kernel.h b/include/grub/i386/kernel.h
index 5514c8ccf..a0d806929 100644
--- a/include/grub/i386/kernel.h
+++ b/include/grub/i386/kernel.h
@@ -29,7 +29,4 @@
 /* Non-zero value is only needed for PowerMacs.  */
 #define GRUB_MOD_GAP 0x0
 
-#define GRUB_KERNEL_CPU_PREFIX	0x2
-#define GRUB_KERNEL_CPU_DATA_END	0x42
-
 #endif
diff --git a/include/grub/offsets.h b/include/grub/offsets.h
index fc4cd0a46..768e4726a 100644
--- a/include/grub/offsets.h
+++ b/include/grub/offsets.h
@@ -93,6 +93,7 @@
 #define GRUB_KERNEL_POWERPC_IEEE1275_PREFIX		0x4
 #define GRUB_KERNEL_POWERPC_IEEE1275_DATA_END	0x44
 #define GRUB_KERNEL_POWERPC_IEEE1275_LINK_ALIGN 4
+#define GRUB_KERNEL_POWERPC_IEEE1275_LINK_ADDR 0x200000
 
 #define GRUB_KERNEL_MIPS_YEELOONG_LINK_ADDR         0x80200000
 
@@ -106,6 +107,26 @@
 #define GRUB_KERNEL_MIPS_YEELOONG_PREFIX	        GRUB_KERNEL_MIPS_YEELOONG_RAW_SIZE
 #define GRUB_KERNEL_MIPS_YEELOONG_DATA_END	GRUB_KERNEL_MIPS_YEELOONG_RAW_SIZE + 0x48
 
+/* The offset of GRUB_PREFIX.  */
+#define GRUB_KERNEL_I386_EFI_PREFIX		0x8
+
+/* End of the data section. */
+#define GRUB_KERNEL_I386_EFI_DATA_END		0x50
+
+/* The offset of GRUB_PREFIX.  */
+#define GRUB_KERNEL_X86_64_EFI_PREFIX		0x8
+
+/* End of the data section. */
+#define GRUB_KERNEL_X86_64_EFI_DATA_END		0x50
+
+#define GRUB_KERNEL_I386_COREBOOT_PREFIX	0x2
+#define GRUB_KERNEL_I386_COREBOOT_DATA_END	0x42
+#define GRUB_KERNEL_I386_COREBOOT_LINK_ADDR	0x8200
+
+#define GRUB_KERNEL_I386_IEEE1275_PREFIX	0x2
+#define GRUB_KERNEL_I386_IEEE1275_DATA_END	0x42
+#define GRUB_KERNEL_I386_IEEE1275_LINK_ADDR	0x10000
+
 #ifdef MACHINE
 #define GRUB_OFFSETS_CONCAT_(a,b,c) a ## b ## c
 #define GRUB_OFFSETS_CONCAT(a,b,c) GRUB_OFFSETS_CONCAT_(a,b,c)
diff --git a/include/grub/x86_64/efi/kernel.h b/include/grub/x86_64/efi/kernel.h
index c0549f41a..0cb39a215 100644
--- a/include/grub/x86_64/efi/kernel.h
+++ b/include/grub/x86_64/efi/kernel.h
@@ -23,11 +23,5 @@
    configuration file are located.  */
 extern char grub_prefix[];
 
-/* The offset of GRUB_PREFIX.  */
-#define GRUB_KERNEL_MACHINE_PREFIX		0x8
-
-/* End of the data section. */
-#define GRUB_KERNEL_MACHINE_DATA_END		0x50
-
 #endif /* ! GRUB_MACHINE_KERNEL_HEADER */
 
diff --git a/kern/i386/coreboot/startup.S b/kern/i386/coreboot/startup.S
index e94950aae..ecdc0b61c 100644
--- a/kern/i386/coreboot/startup.S
+++ b/kern/i386/coreboot/startup.S
@@ -42,7 +42,7 @@ _start:
 	 *  This is a special data area at a fixed offset from the beginning.
 	 */
 
-	. = _start + GRUB_KERNEL_CPU_PREFIX
+	. = _start + GRUB_KERNEL_MACHINE_PREFIX
 
 VARIABLE(grub_prefix)
 	/* to be filled by grub-mkimage */
@@ -51,7 +51,7 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = _start + GRUB_KERNEL_CPU_DATA_END
+	. = _start + GRUB_KERNEL_MACHINE_DATA_END
 
 /*
  *  Support for booting GRUB from a Multiboot boot loader (e.g. GRUB itself).
diff --git a/kern/i386/ieee1275/startup.S b/kern/i386/ieee1275/startup.S
index 35258adb6..ad2ef329b 100644
--- a/kern/i386/ieee1275/startup.S
+++ b/kern/i386/ieee1275/startup.S
@@ -43,7 +43,7 @@ _start:
 	 *  This is a special data area at a fixed offset from the beginning.
 	 */
 
-	. = _start + GRUB_KERNEL_CPU_PREFIX
+	. = _start + GRUB_KERNEL_MACHINE_PREFIX
 
 VARIABLE(grub_prefix)
 	/* to be filled by grub-mkimage */
@@ -52,7 +52,7 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = _start + GRUB_KERNEL_CPU_DATA_END
+	. = _start + GRUB_KERNEL_MACHINE_DATA_END
 
 codestart:
 	movl %eax, EXT_C(grub_ieee1275_entry_fn)
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 7ba9e595e..25ab5afe4 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -82,8 +82,17 @@ struct image_target_desc image_targets[] =
       .bigendian = 0,
       .id = IMAGE_COREBOOT,
       .flags = PLATFORM_FLAGS_NONE,
+      .prefix = GRUB_KERNEL_I386_COREBOOT_PREFIX,
+      .data_end = GRUB_KERNEL_I386_COREBOOT_DATA_END,
+      .raw_size = 0,
+      .total_module_size = TARGET_NO_FIELD,
+      .kernel_image_size = TARGET_NO_FIELD,
+      .compressed_size = TARGET_NO_FIELD,
       .section_align = 1,
-      .vaddr_offset = 0
+      .vaddr_offset = 0,
+      .install_dos_part = TARGET_NO_FIELD,
+      .install_bsd_part = TARGET_NO_FIELD,
+      .link_addr = GRUB_KERNEL_I386_COREBOOT_LINK_ADDR
     },
     {
       .name = "i386-pc",
@@ -109,13 +118,21 @@ struct image_target_desc image_targets[] =
       .bigendian = 0,
       .id = IMAGE_EFI,
       .flags = PLATFORM_FLAGS_NONE,
+      .prefix = GRUB_KERNEL_I386_EFI_PREFIX,
+      .data_end = GRUB_KERNEL_I386_EFI_DATA_END,
+      .raw_size = 0,
+      .total_module_size = TARGET_NO_FIELD,
+      .kernel_image_size = TARGET_NO_FIELD,
+      .compressed_size = TARGET_NO_FIELD,
       .section_align = GRUB_PE32_SECTION_ALIGNMENT,
       .vaddr_offset = ALIGN_UP (GRUB_PE32_MSDOS_STUB_SIZE
 				+ GRUB_PE32_SIGNATURE_SIZE
 				+ sizeof (struct grub_pe32_coff_header)
 				+ sizeof (struct grub_pe32_optional_header)
 				+ 4 * sizeof (struct grub_pe32_section_table),
-				GRUB_PE32_SECTION_ALIGNMENT)
+				GRUB_PE32_SECTION_ALIGNMENT),
+      .install_dos_part = TARGET_NO_FIELD,
+      .install_bsd_part = TARGET_NO_FIELD,
     },
     {
       .name = "i386-ieee1275",
@@ -123,8 +140,17 @@ struct image_target_desc image_targets[] =
       .bigendian = 0,
       .id = IMAGE_I386_IEEE1275, 
       .flags = PLATFORM_FLAGS_NONE,
+      .prefix = GRUB_KERNEL_I386_IEEE1275_PREFIX,
+      .data_end = GRUB_KERNEL_I386_IEEE1275_DATA_END,
+      .raw_size = 0,
+      .total_module_size = TARGET_NO_FIELD,
+      .kernel_image_size = TARGET_NO_FIELD,
+      .compressed_size = TARGET_NO_FIELD,
       .section_align = 1,
-      .vaddr_offset = 0
+      .vaddr_offset = 0,
+      .install_dos_part = TARGET_NO_FIELD,
+      .install_bsd_part = TARGET_NO_FIELD,
+      .link_addr = GRUB_KERNEL_I386_IEEE1275_LINK_ADDR
     },
     {
       .name = "i386-qemu",
@@ -150,13 +176,21 @@ struct image_target_desc image_targets[] =
       .bigendian = 0, 
       .id = IMAGE_EFI, 
       .flags = PLATFORM_FLAGS_NONE,
+      .prefix = GRUB_KERNEL_X86_64_EFI_PREFIX,
+      .data_end = GRUB_KERNEL_X86_64_EFI_DATA_END,
+      .raw_size = 0,
+      .total_module_size = TARGET_NO_FIELD,
+      .kernel_image_size = TARGET_NO_FIELD,
+      .compressed_size = TARGET_NO_FIELD,
       .section_align = GRUB_PE32_SECTION_ALIGNMENT,
       .vaddr_offset = ALIGN_UP (GRUB_PE32_MSDOS_STUB_SIZE
 				+ GRUB_PE32_SIGNATURE_SIZE
 				+ sizeof (struct grub_pe32_coff_header)
 				+ sizeof (struct grub_pe64_optional_header)
 				+ 4 * sizeof (struct grub_pe32_section_table),
-				GRUB_PE32_SECTION_ALIGNMENT)
+				GRUB_PE32_SECTION_ALIGNMENT),
+      .install_dos_part = TARGET_NO_FIELD,
+      .install_bsd_part = TARGET_NO_FIELD,
     },
     {
       .name = "mipsel-yeeloong-elf",
@@ -184,8 +218,17 @@ struct image_target_desc image_targets[] =
       .bigendian = 1,
       .id = IMAGE_PPC, 
       .flags = PLATFORM_FLAGS_NONE,
+      .prefix = GRUB_KERNEL_POWERPC_IEEE1275_PREFIX,
+      .data_end = GRUB_KERNEL_POWERPC_IEEE1275_DATA_END,
+      .raw_size = 0,
+      .total_module_size = TARGET_NO_FIELD,
+      .kernel_image_size = TARGET_NO_FIELD,
+      .compressed_size = TARGET_NO_FIELD,
       .section_align = 1,
-      .vaddr_offset = 0
+      .vaddr_offset = 0,
+      .install_dos_part = TARGET_NO_FIELD,
+      .install_bsd_part = TARGET_NO_FIELD,
+      .link_addr = GRUB_KERNEL_POWERPC_IEEE1275_LINK_ADDR
     },
     {
       .name = "sparc64-ieee1275-raw",
@@ -629,6 +672,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       {
 	void *pe_img;
 	grub_uint8_t *header;
+	void *sections;
 	size_t pe_size;
 	struct grub_pe32_coff_header *c;
 	struct grub_pe32_section_table *text_section, *data_section;
@@ -669,7 +713,8 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 		GRUB_PE32_SIGNATURE_SIZE);
 
 	/* The COFF file header.  */
-	c = header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE;
+	c = (struct grub_pe32_coff_header *) (header + GRUB_PE32_MSDOS_STUB_SIZE
+					      + GRUB_PE32_SIGNATURE_SIZE);
 	if (image_target->voidp_sizeof == 4)
 	  c->machine = grub_host_to_target16 (GRUB_PE32_MACHINE_I386);
 	else
@@ -692,11 +737,13 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
 	    c->optional_header_size = grub_host_to_target16 (sizeof (struct grub_pe32_optional_header));
 
-	    o = header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE
-	      + sizeof (struct grub_pe32_coff_header);
+	    o = (struct grub_pe32_optional_header *)
+	      (header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE
+	       + sizeof (struct grub_pe32_coff_header));
 	    o->magic = grub_host_to_target16 (GRUB_PE32_PE32_MAGIC);
 	    o->code_size = grub_host_to_target32 (exec_size);
-	    o->data_size = grub_cpu_to_le32 (reloc_addr - exec_size);
+	    o->data_size = grub_cpu_to_le32 (reloc_addr - exec_size
+					     - header_size);
 	    o->bss_size = grub_cpu_to_le32 (bss_size);
 	    o->entry_addr = grub_cpu_to_le32 (start_address);
 	    o->code_base = grub_cpu_to_le32 (header_size);
@@ -720,18 +767,21 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
 	    o->base_relocation_table.rva = grub_host_to_target32 (reloc_addr);
 	    o->base_relocation_table.size = grub_host_to_target32 (reloc_size);
+	    sections = o + 1;
 	  }
 	else
 	  {
 	    struct grub_pe64_optional_header *o;
 
-	    c->optional_header_size = grub_host_to_target16 (sizeof (struct grub_pe32_optional_header));
+	    c->optional_header_size = grub_host_to_target16 (sizeof (struct grub_pe64_optional_header));
 
-	    o = header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE
-	      + sizeof (struct grub_pe32_coff_header);
+	    o = (struct grub_pe64_optional_header *) 
+	      (header + GRUB_PE32_MSDOS_STUB_SIZE + GRUB_PE32_SIGNATURE_SIZE
+	       + sizeof (struct grub_pe32_coff_header));
 	    o->magic = grub_host_to_target16 (GRUB_PE32_PE64_MAGIC);
 	    o->code_size = grub_host_to_target32 (exec_size);
-	    o->data_size = grub_cpu_to_le32 (reloc_addr - exec_size);
+	    o->data_size = grub_cpu_to_le32 (reloc_addr - exec_size
+					     - header_size);
 	    o->bss_size = grub_cpu_to_le32 (bss_size);
 	    o->entry_addr = grub_cpu_to_le32 (start_address);
 	    o->code_base = grub_cpu_to_le32 (header_size);
@@ -753,9 +803,10 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
 	    o->base_relocation_table.rva = grub_host_to_target32 (reloc_addr);
 	    o->base_relocation_table.size = grub_host_to_target32 (reloc_size);
+	    sections = o + 1;
 	  }
 	/* The sections.  */
-	text_section = (struct grub_pe32_section_table *) (header + 1);
+	text_section = sections;
 	strcpy (text_section->name, ".text");
 	text_section->virtual_size = grub_cpu_to_le32 (exec_size);
 	text_section->virtual_address = grub_cpu_to_le32 (header_size);
@@ -763,8 +814,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 	text_section->raw_data_offset = grub_cpu_to_le32 (header_size);
 	text_section->characteristics = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_CODE
 							  | GRUB_PE32_SCN_MEM_EXECUTE
-							  | GRUB_PE32_SCN_MEM_READ
-							  | GRUB_PE32_SCN_ALIGN_64BYTES);
+							  | GRUB_PE32_SCN_MEM_READ);
 
 	data_section = text_section + 1;
 	strcpy (data_section->name, ".data");
@@ -775,8 +825,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 	data_section->characteristics
 	  = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
 			      | GRUB_PE32_SCN_MEM_READ
-			      | GRUB_PE32_SCN_MEM_WRITE
-			      | GRUB_PE32_SCN_ALIGN_64BYTES);
+			      | GRUB_PE32_SCN_MEM_WRITE);
 
 #if 0
 	bss_section = data_section + 1;
@@ -802,8 +851,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 	mods_section->characteristics
 	  = grub_cpu_to_le32 (GRUB_PE32_SCN_CNT_INITIALIZED_DATA
 			      | GRUB_PE32_SCN_MEM_READ
-			      | GRUB_PE32_SCN_MEM_WRITE
-			      | GRUB_PE32_SCN_ALIGN_64BYTES);
+			      | GRUB_PE32_SCN_MEM_WRITE);
 
 	reloc_section = mods_section + 1;
 	strcpy (reloc_section->name, ".reloc");

From debaf23f7c1ee4cc70a43a7bebc37667e5a4d6e0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 26 Apr 2010 19:11:38 +0200
Subject: [PATCH 0840/1628] all images binary identical to the ones from trunk

---
 include/grub/elf.h            |  1 +
 include/grub/i386/kernel.h    | 10 ----
 include/grub/offsets.h        | 16 +++++++
 include/grub/powerpc/kernel.h |  7 ---
 kern/i386/coreboot/init.c     |  2 +-
 kern/ieee1275/init.c          |  2 +-
 util/grub-mkimage.c           | 86 ++++++++++++++++++++++++++--------
 util/grub-mkimagexx.c         | 87 ++++++++++++++++++++---------------
 8 files changed, 137 insertions(+), 74 deletions(-)

diff --git a/include/grub/elf.h b/include/grub/elf.h
index e54989cde..b9401f241 100644
--- a/include/grub/elf.h
+++ b/include/grub/elf.h
@@ -555,6 +555,7 @@ typedef struct
 #define	PT_NUM		8		/* Number of defined types */
 #define PT_LOOS		0x60000000	/* Start of OS-specific */
 #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
+#define PT_GNU_STACK	0x6474e551      /* GCC stack segment  */
 #define PT_LOSUNW	0x6ffffffa
 #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
 #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
diff --git a/include/grub/i386/kernel.h b/include/grub/i386/kernel.h
index a0d806929..45c7abd72 100644
--- a/include/grub/i386/kernel.h
+++ b/include/grub/i386/kernel.h
@@ -19,14 +19,4 @@
 #ifndef GRUB_KERNEL_CPU_HEADER
 #define GRUB_KERNEL_CPU_HEADER	1
 
-
-#ifdef GRUB_MACHINE_IEEE1275
-#define GRUB_MOD_ALIGN	0x1000
-#else
-#define GRUB_MOD_ALIGN	0x1
-#endif
-
-/* Non-zero value is only needed for PowerMacs.  */
-#define GRUB_MOD_GAP 0x0
-
 #endif
diff --git a/include/grub/offsets.h b/include/grub/offsets.h
index 768e4726a..a7f252e85 100644
--- a/include/grub/offsets.h
+++ b/include/grub/offsets.h
@@ -127,9 +127,25 @@
 #define GRUB_KERNEL_I386_IEEE1275_DATA_END	0x42
 #define GRUB_KERNEL_I386_IEEE1275_LINK_ADDR	0x10000
 
+#define GRUB_KERNEL_I386_IEEE1275_MOD_ALIGN	0x1000
+#define GRUB_KERNEL_I386_COREBOOT_MOD_ALIGN	0x1
+
+/* Non-zero value is only needed for PowerMacs.  */
+#define GRUB_KERNEL_I386_IEEE1275_MOD_GAP 0x0
+#define GRUB_KERNEL_I386_COREBOOT_MOD_GAP 0x0
+
+#define GRUB_KERNEL_POWERPC_IEEE1275_MOD_ALIGN 0x1000
+
+/* Minimal gap between _end and the start of the modules.  It's a hack
+   for PowerMac to prevent "CLAIM failed" error.  The real fix is to
+   rewrite grub-mkimage to generate valid ELF files.  */
+#define GRUB_KERNEL_POWERPC_IEEE1275_MOD_GAP 0x8000
+
 #ifdef MACHINE
 #define GRUB_OFFSETS_CONCAT_(a,b,c) a ## b ## c
 #define GRUB_OFFSETS_CONCAT(a,b,c) GRUB_OFFSETS_CONCAT_(a,b,c)
+#define GRUB_KERNEL_MACHINE_MOD_ALIGN GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _MOD_ALIGN)
+#define GRUB_KERNEL_MACHINE_MOD_GAP GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _MOD_GAP)
 #define GRUB_KERNEL_MACHINE_TOTAL_MODULE_SIZE GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _TOTAL_MODULE_SIZE)
 #define GRUB_KERNEL_MACHINE_KERNEL_IMAGE_SIZE GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _KERNEL_IMAGE_SIZE)
 #define GRUB_KERNEL_MACHINE_COMPRESSED_SIZE GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _COMPRESSED_SIZE)
diff --git a/include/grub/powerpc/kernel.h b/include/grub/powerpc/kernel.h
index e4ff65174..3fc0b9e23 100644
--- a/include/grub/powerpc/kernel.h
+++ b/include/grub/powerpc/kernel.h
@@ -19,11 +19,4 @@
 #ifndef GRUB_KERNEL_CPU_HEADER
 #define GRUB_KERNEL_CPU_HEADER	1
 
-#define GRUB_MOD_ALIGN 0x1000
-
-/* Minimal gap between _end and the start of the modules.  It's a hack
-   for PowerMac to prevent "CLAIM failed" error.  The real fix is to
-   rewrite grub-mkimage to generate valid ELF files.  */
-#define GRUB_MOD_GAP 0x8000
-
 #endif
diff --git a/kern/i386/coreboot/init.c b/kern/i386/coreboot/init.c
index 5f80f28c1..f367269c4 100644
--- a/kern/i386/coreboot/init.c
+++ b/kern/i386/coreboot/init.c
@@ -144,6 +144,6 @@ grub_arch_modules_addr (void)
 #ifdef GRUB_MACHINE_QEMU
   return grub_core_entry_addr + grub_kernel_image_size;
 #else
-  return ALIGN_UP((grub_addr_t) _end, GRUB_MOD_ALIGN);
+  return ALIGN_UP((grub_addr_t) _end, GRUB_KERNEL_MACHINE_MOD_ALIGN);
 #endif
 }
diff --git a/kern/ieee1275/init.c b/kern/ieee1275/init.c
index 75f261a71..db9583d8b 100644
--- a/kern/ieee1275/init.c
+++ b/kern/ieee1275/init.c
@@ -284,5 +284,5 @@ grub_get_rtc (void)
 grub_addr_t
 grub_arch_modules_addr (void)
 {
-  return ALIGN_UP((grub_addr_t) _end + GRUB_MOD_GAP, GRUB_MOD_ALIGN);
+  return ALIGN_UP((grub_addr_t) _end + GRUB_KERNEL_MACHINE_MOD_GAP, GRUB_KERNEL_MACHINE_MOD_ALIGN);
 }
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 25ab5afe4..cc4a225d4 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -72,6 +72,7 @@ struct image_target_desc
   signed vaddr_offset;
   unsigned install_dos_part, install_bsd_part;
   grub_uint64_t link_addr;
+  unsigned mod_gap, mod_align;
 };
 
 struct image_target_desc image_targets[] =
@@ -92,7 +93,11 @@ struct image_target_desc image_targets[] =
       .vaddr_offset = 0,
       .install_dos_part = TARGET_NO_FIELD,
       .install_bsd_part = TARGET_NO_FIELD,
-      .link_addr = GRUB_KERNEL_I386_COREBOOT_LINK_ADDR
+      .link_addr = GRUB_KERNEL_I386_COREBOOT_LINK_ADDR,
+      .elf_target = EM_386,
+      .link_align = 4,
+      .mod_gap = GRUB_KERNEL_I386_COREBOOT_MOD_GAP,
+      .mod_align = GRUB_KERNEL_I386_COREBOOT_MOD_ALIGN
     },
     {
       .name = "i386-pc",
@@ -150,7 +155,11 @@ struct image_target_desc image_targets[] =
       .vaddr_offset = 0,
       .install_dos_part = TARGET_NO_FIELD,
       .install_bsd_part = TARGET_NO_FIELD,
-      .link_addr = GRUB_KERNEL_I386_IEEE1275_LINK_ADDR
+      .link_addr = GRUB_KERNEL_I386_IEEE1275_LINK_ADDR,
+      .elf_target = EM_386,
+      .mod_gap = GRUB_KERNEL_I386_IEEE1275_MOD_GAP,
+      .mod_align = GRUB_KERNEL_I386_IEEE1275_MOD_ALIGN,
+      .link_align = 4,
     },
     {
       .name = "i386-qemu",
@@ -228,7 +237,11 @@ struct image_target_desc image_targets[] =
       .vaddr_offset = 0,
       .install_dos_part = TARGET_NO_FIELD,
       .install_bsd_part = TARGET_NO_FIELD,
-      .link_addr = GRUB_KERNEL_POWERPC_IEEE1275_LINK_ADDR
+      .link_addr = GRUB_KERNEL_POWERPC_IEEE1275_LINK_ADDR,
+      .elf_target = EM_PPC,
+      .mod_gap = GRUB_KERNEL_POWERPC_IEEE1275_MOD_GAP,
+      .mod_align = GRUB_KERNEL_POWERPC_IEEE1275_MOD_ALIGN,
+      .link_align = 4
     },
     {
       .name = "sparc64-ieee1275-raw",
@@ -463,7 +476,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
   grub_size_t bss_size;
   grub_uint64_t start_address;
   void *rel_section;
-  grub_size_t reloc_size;
+  grub_size_t reloc_size, align;
   path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods);
 
   kernel_path = grub_util_get_path (dir, "kernel.img");
@@ -503,11 +516,11 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
   if (image_target->voidp_sizeof == 4)
     kernel_img = load_image32 (kernel_path, &exec_size, &kernel_size, &bss_size,
 			       total_module_size, &start_address, &rel_section,
-			       &reloc_size, image_target);
+			       &reloc_size, &align, image_target);
   else
     kernel_img = load_image64 (kernel_path, &exec_size, &kernel_size, &bss_size,
 			       total_module_size, &start_address, &rel_section,
-			       &reloc_size, image_target);
+			       &reloc_size, &align, image_target);
 
   if (image_target->prefix + strlen (prefix) + 1 > image_target->data_end)
     grub_util_error (_("prefix is too long"));
@@ -961,6 +974,9 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 	grub_uint32_t target_addr;
 	int header_size, footer_size = 0;
 	int phnum = 1;
+	
+	if (image_target->id != IMAGE_YEELOONG_ELF)
+	  phnum += 2;
 
 	if (note)
 	  {
@@ -994,7 +1010,10 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 
 	/* No section headers.  */
 	ehdr->e_shoff = grub_host_to_target32 (0);
-	ehdr->e_shentsize = grub_host_to_target16 (0);
+	if (image_target->id == IMAGE_YEELOONG_ELF)
+	  ehdr->e_shentsize = grub_host_to_target16 (0);
+	else
+	  ehdr->e_shentsize = grub_host_to_target16 (sizeof (Elf32_Shdr));
 	ehdr->e_shnum = grub_host_to_target16 (0);
 	ehdr->e_shstrndx = grub_host_to_target16 (0);
 
@@ -1012,14 +1031,44 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 	ehdr->e_entry = grub_host_to_target32 (target_addr);
 	phdr->p_vaddr = grub_host_to_target32 (target_addr);
 	phdr->p_paddr = grub_host_to_target32 (target_addr);
-	phdr->p_align = grub_host_to_target32 (image_target->link_align);
+	phdr->p_align = grub_host_to_target32 (align > image_target->link_align ? align : image_target->link_align);
 	if (image_target->id == IMAGE_YEELOONG_ELF)
 	  ehdr->e_flags = grub_host_to_target32 (0x1000 | EF_MIPS_NOREORDER 
 						 | EF_MIPS_PIC | EF_MIPS_CPIC);
 	else
 	  ehdr->e_flags = 0;
-	phdr->p_filesz = grub_host_to_target32 (core_size);
-	phdr->p_memsz = grub_host_to_target32 (core_size);
+	if (image_target->id == IMAGE_YEELOONG_ELF)
+	  {
+	    phdr->p_filesz = grub_host_to_target32 (core_size);
+	    phdr->p_memsz = grub_host_to_target32 (core_size);
+	  }
+	else
+	  {
+	    grub_uint32_t target_addr_mods;
+	    phdr->p_filesz = grub_host_to_target32 (kernel_size);
+	    phdr->p_memsz = grub_host_to_target32 (kernel_size + bss_size);
+
+	    phdr++;
+	    phdr->p_type = grub_host_to_target32 (PT_GNU_STACK);
+	    phdr->p_offset = grub_host_to_target32 (header_size + kernel_size);
+	    phdr->p_paddr = phdr->p_vaddr = phdr->p_filesz = phdr->p_memsz = 0;
+	    phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
+	    phdr->p_align = grub_host_to_target32 (image_target->link_align);
+
+	    phdr++;
+	    phdr->p_type = grub_host_to_target32 (PT_LOAD);
+	    phdr->p_offset = grub_host_to_target32 (header_size + kernel_size);
+	    phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
+	    phdr->p_filesz = phdr->p_memsz
+	      = grub_host_to_target32 (core_size - kernel_size);
+
+	    target_addr_mods = ALIGN_UP (target_addr + kernel_size + bss_size
+					 + image_target->mod_gap,
+					 image_target->mod_align);
+	    phdr->p_vaddr = grub_host_to_target32 (target_addr_mods);
+	    phdr->p_paddr = grub_host_to_target32 (target_addr_mods);
+	    phdr->p_align = grub_host_to_target32 (image_target->link_align);
+	  }
 
 	if (note)
 	  {
@@ -1040,14 +1089,15 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 	    note->descriptor.virt_size = grub_host_to_target32 (0xffffffff);
 	    note->descriptor.load_base = grub_host_to_target32 (0x00004000);
 
-	    phdr[1].p_type = grub_host_to_target32 (PT_NOTE);
-	    phdr[1].p_flags = grub_host_to_target32 (PF_R);
-	    phdr[1].p_align = grub_host_to_target32 (image_target->voidp_sizeof);
-	    phdr[1].p_vaddr = 0;
-	    phdr[1].p_paddr = 0;
-	    phdr[1].p_filesz = grub_host_to_target32 (note_size);
-	    phdr[1].p_memsz = 0;
-	    phdr[1].p_offset = grub_host_to_target32 (header_size + program_size);
+	    phdr++;
+	    phdr->p_type = grub_host_to_target32 (PT_NOTE);
+	    phdr->p_flags = grub_host_to_target32 (PF_R);
+	    phdr->p_align = grub_host_to_target32 (image_target->voidp_sizeof);
+	    phdr->p_vaddr = 0;
+	    phdr->p_paddr = 0;
+	    phdr->p_filesz = grub_host_to_target32 (note_size);
+	    phdr->p_memsz = 0;
+	    phdr->p_offset = grub_host_to_target32 (header_size + program_size);
 	  }
 
 	free (core_img);
diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
index abfe56d42..e9fdc7428 100644
--- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c
@@ -523,6 +523,7 @@ static Elf_Addr *
 SUFFIX (locate_sections) (Elf_Shdr *sections, Elf_Half section_entsize,
 			  Elf_Half num_sections, const char *strtab,
 			  grub_size_t *exec_size, grub_size_t *kernel_sz,
+			  grub_size_t *all_align,
 			  struct image_target_desc *image_target)
 {
   int i;
@@ -530,11 +531,21 @@ SUFFIX (locate_sections) (Elf_Shdr *sections, Elf_Half section_entsize,
   Elf_Addr *section_addresses;
   Elf_Shdr *s;
 
+  *all_align = 1;
+
   section_addresses = xmalloc (sizeof (*section_addresses) * num_sections);
   memset (section_addresses, 0, sizeof (*section_addresses) * num_sections);
 
   current_address = 0;
 
+  for (i = 0, s = sections;
+       i < num_sections;
+       i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+    if ((grub_target_to_host (s->sh_flags) & SHF_ALLOC) 
+	&& grub_host_to_target32 (s->sh_addralign) > *all_align)
+      *all_align = grub_host_to_target32 (s->sh_addralign);
+
+
   /* .text */
   for (i = 0, s = sections;
        i < num_sections;
@@ -546,7 +557,6 @@ SUFFIX (locate_sections) (Elf_Shdr *sections, Elf_Half section_entsize,
 	if (align)
 	  current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
 				      align) - image_target->vaddr_offset;
-
 	grub_util_info ("locating the section %s at 0x%x",
 			name, current_address);
 	section_addresses[i] = current_address;
@@ -589,6 +599,7 @@ SUFFIX (load_image) (const char *kernel_path, grub_size_t *exec_size,
 		     grub_size_t *kernel_sz, grub_size_t *bss_size,
 		     grub_size_t total_module_size, grub_uint64_t *start,
 		     void **reloc_section, grub_size_t *reloc_size,
+		     grub_size_t *align,
 		     struct image_target_desc *image_target)
 {
   char *kernel_img, *out_img;
@@ -631,44 +642,47 @@ SUFFIX (load_image) (const char *kernel_path, grub_size_t *exec_size,
 
   section_addresses = SUFFIX (locate_sections) (sections, section_entsize,
 						num_sections, strtab,
-						exec_size, kernel_sz, image_target);
+						exec_size, kernel_sz, align,
+						image_target);
+
+  section_vaddresses = xmalloc (sizeof (*section_addresses) * num_sections);
+
+  for (i = 0; i < num_sections; i++)
+    section_vaddresses[i] = section_addresses[i] + image_target->vaddr_offset;
+
+  if (image_target->id != IMAGE_EFI)
+    {
+      Elf_Addr current_address = *kernel_sz;
+
+      for (i = 0, s = sections;
+	   i < num_sections;
+	   i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
+	if (grub_target_to_host32 (s->sh_type) == SHT_NOBITS)
+	  {
+	    Elf_Word align = grub_host_to_target32 (s->sh_addralign);
+	    const char *name = strtab + grub_host_to_target32 (s->sh_name);
+
+	    if (align)
+	      current_address = ALIGN_UP (current_address
+					  + image_target->vaddr_offset, align)
+		- image_target->vaddr_offset;
+	
+	    grub_util_info ("locating the section %s at 0x%x",
+			    name, current_address);
+	    section_vaddresses[i] = current_address
+	      + image_target->vaddr_offset;
+	    current_address += grub_host_to_target_addr (s->sh_size);
+	  }
+      current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
+				  image_target->section_align)
+	- image_target->vaddr_offset;
+      *bss_size = current_address - *kernel_sz;
+    }
+  else
+    *bss_size = 0;
 
   if (image_target->id == IMAGE_EFI)
     {
-      section_vaddresses = xmalloc (sizeof (*section_addresses) * num_sections);
-
-      for (i = 0; i < num_sections; i++)
-	section_vaddresses[i] = section_addresses[i] + image_target->vaddr_offset;
-
-#if 0
-      {
-	Elf_Addr current_address = *kernel_sz;
-
-	for (i = 0, s = sections;
-	     i < num_sections;
-	     i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
-	  if (grub_target_to_host32 (s->sh_type) == SHT_NOBITS)
-	    {
-	      Elf_Word align = grub_host_to_target32 (s->sh_addralign);
-	      const char *name = strtab + grub_host_to_target32 (s->sh_name);
-
-	      if (align)
-		current_address = ALIGN_UP (current_address + VADDR_OFFSET, align)
-		  - VADDR_OFFSET;
-	
-	      grub_util_info ("locating the section %s at 0x%x",
-			      name, current_address);
-	      section_vaddresses[i] = current_address + VADDR_OFFSET;
-	      current_address += grub_host_to_target_addr (s->sh_size);
-	    }
-	current_address = ALIGN_UP (current_address + VADDR_OFFSET, SECTION_ALIGN)
-	  - VADDR_OFFSET;
-	*bss_size = current_address - *kernel_sz;
-      }
-#else
-      *bss_size = 0;
-#endif
-
       symtab_section = NULL;
       for (i = 0, s = sections;
 	   i < num_sections;
@@ -699,7 +713,6 @@ SUFFIX (load_image) (const char *kernel_path, grub_size_t *exec_size,
     }
   else
     {
-      *bss_size = 0;
       *reloc_size = 0;
       *reloc_section = NULL;
     }

From 8ea6ecb36d0df734d1cef2c0290c114b649c703d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 26 Apr 2010 21:11:16 +0200
Subject: [PATCH 0841/1628] Some cleanups

---
 conf/common.rmk                        |   2 +-
 conf/i386-pc.rmk                       |   2 +-
 include/grub/i386/coreboot/kernel.h    |  28 --
 include/grub/i386/efi/kernel.h         |  27 --
 include/grub/i386/ieee1275/kernel.h    |   1 -
 include/grub/i386/kernel.h             |  22 --
 include/grub/i386/pc/kernel.h          |   4 -
 include/grub/i386/qemu/kernel.h        |   4 -
 include/grub/kernel.h                  |   4 +
 include/grub/mips/kernel.h             |  34 --
 include/grub/mips/qemu-mips/boot.h     |   0
 include/grub/mips/qemu-mips/kernel.h   |   4 -
 include/grub/mips/yeeloong/boot.h      |   0
 include/grub/mips/yeeloong/kernel.h    |   1 -
 include/grub/offsets.h                 |   2 +
 include/grub/powerpc/ieee1275/kernel.h |  35 --
 include/grub/sparc64/ieee1275/kernel.h |   9 -
 include/grub/sparc64/kernel.h          |  30 --
 include/grub/types.h                   |  36 --
 include/grub/x86_64/efi/kernel.h       |  27 --
 include/grub/x86_64/kernel.h           |   1 -
 kern/efi/init.c                        |   1 -
 kern/i386/coreboot/init.c              |   5 +-
 kern/i386/coreboot/startup.S           |   2 +-
 kern/i386/ieee1275/startup.S           |   1 -
 kern/ieee1275/cmain.c                  |   1 -
 kern/ieee1275/init.c                   |   3 +-
 kern/ieee1275/openfw.c                 |   1 -
 kern/mips/init.c                       |   1 -
 kern/mips/startup.S                    |   6 +-
 kern/mips/yeeloong/init.c              |   1 -
 kern/powerpc/ieee1275/startup.S        |   2 +-
 util/elf/grub-mkimage.c                | 463 -------------------------
 util/grub-mkimagexx.c                  |   3 +
 util/i386/pc/grub-setup.c              |   7 +
 util/sparc64/ieee1275/grub-setup.c     |   7 +
 36 files changed, 34 insertions(+), 743 deletions(-)
 delete mode 100644 include/grub/i386/coreboot/kernel.h
 delete mode 100644 include/grub/i386/efi/kernel.h
 delete mode 100644 include/grub/i386/ieee1275/kernel.h
 delete mode 100644 include/grub/i386/kernel.h
 delete mode 100644 include/grub/mips/kernel.h
 delete mode 100644 include/grub/mips/qemu-mips/boot.h
 delete mode 100644 include/grub/mips/yeeloong/boot.h
 delete mode 100644 include/grub/powerpc/ieee1275/kernel.h
 delete mode 100644 include/grub/sparc64/kernel.h
 delete mode 100644 include/grub/x86_64/efi/kernel.h
 delete mode 100644 include/grub/x86_64/kernel.h
 delete mode 100644 util/elf/grub-mkimage.c

diff --git a/conf/common.rmk b/conf/common.rmk
index 98dca34f9..f9e7eb194 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -118,7 +118,7 @@ kernel_img_HEADERS += boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	list.h handler.h command.h i18n.h env_private.h libgcc.h
 
 ifneq ($(platform), emu)
-kernel_img_HEADERS += machine/memory.h machine/loader.h machine/kernel.h
+kernel_img_HEADERS += machine/memory.h machine/loader.h
 endif
 
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index f0da94b42..4c55f28f6 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -53,7 +53,7 @@ kernel_img_SOURCES = kern/i386/pc/startup.S \
 	term/i386/pc/console.c term/i386/vga_common.c \
 	symlist.c
 kernel_img_HEADERS += machine/biosdisk.h machine/vga.h machine/vbe.h \
-	machine/pxe.h i386/pit.h
+	machine/pxe.h i386/pit.h machine/kernel.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x8200 $(COMMON_CFLAGS)
diff --git a/include/grub/i386/coreboot/kernel.h b/include/grub/i386/coreboot/kernel.h
deleted file mode 100644
index fb60668cc..000000000
--- a/include/grub/i386/coreboot/kernel.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2006,2007,2008  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/>.
- */
-
-#ifndef GRUB_KERNEL_MACHINE_HEADER
-#define GRUB_KERNEL_MACHINE_HEADER	1
-
-#include <grub/symbol.h>
-
-#ifndef ASM_FILE
-extern char grub_prefix[];
-#endif
-
-#endif /* ! GRUB_KERNEL_MACHINE_HEADER */
diff --git a/include/grub/i386/efi/kernel.h b/include/grub/i386/efi/kernel.h
deleted file mode 100644
index 0cb39a215..000000000
--- a/include/grub/i386/efi/kernel.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2003,2007  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/>.
- */
-
-#ifndef GRUB_MACHINE_KERNEL_HEADER
-#define GRUB_MACHINE_KERNEL_HEADER   1
-
-/* The prefix which points to the directory where GRUB modules and its
-   configuration file are located.  */
-extern char grub_prefix[];
-
-#endif /* ! GRUB_MACHINE_KERNEL_HEADER */
-
diff --git a/include/grub/i386/ieee1275/kernel.h b/include/grub/i386/ieee1275/kernel.h
deleted file mode 100644
index dccf8cbe1..000000000
--- a/include/grub/i386/ieee1275/kernel.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <grub/powerpc/ieee1275/kernel.h>
diff --git a/include/grub/i386/kernel.h b/include/grub/i386/kernel.h
deleted file mode 100644
index 45c7abd72..000000000
--- a/include/grub/i386/kernel.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2006,2007,2008,2009  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/>.
- */
-
-#ifndef GRUB_KERNEL_CPU_HEADER
-#define GRUB_KERNEL_CPU_HEADER	1
-
-#endif
diff --git a/include/grub/i386/pc/kernel.h b/include/grub/i386/pc/kernel.h
index f0a9d4fc2..1de37a5d5 100644
--- a/include/grub/i386/pc/kernel.h
+++ b/include/grub/i386/pc/kernel.h
@@ -41,10 +41,6 @@ extern grub_int32_t grub_install_dos_part;
 /* The BSD partition number of the installed partition.  */
 extern grub_int32_t grub_install_bsd_part;
 
-/* The prefix which points to the directory where GRUB modules and its
-   configuration file are located.  */
-extern char grub_prefix[];
-
 /* The boot BIOS drive number.  */
 extern grub_uint8_t EXPORT_VAR(grub_boot_drive);
 
diff --git a/include/grub/i386/qemu/kernel.h b/include/grub/i386/qemu/kernel.h
index e29f0aeb2..0aa2b3d09 100644
--- a/include/grub/i386/qemu/kernel.h
+++ b/include/grub/i386/qemu/kernel.h
@@ -34,10 +34,6 @@ extern grub_int32_t grub_kernel_image_size;
 /* The total size of module images following the kernel.  */
 extern grub_int32_t grub_total_module_size;
 
-/* The prefix which points to the directory where GRUB modules and its
-   configuration file are located.  */
-extern char grub_prefix[];
-
 #endif /* ! ASM_FILE */
 
 #endif /* ! GRUB_KERNEL_MACHINE_HEADER */
diff --git a/include/grub/kernel.h b/include/grub/kernel.h
index f7740b2e3..fed875db1 100644
--- a/include/grub/kernel.h
+++ b/include/grub/kernel.h
@@ -90,4 +90,8 @@ void grub_machine_set_prefix (void);
 /* Register all the exported symbols. This is automatically generated.  */
 void grub_register_exported_symbols (void);
 
+#if ! defined (ASM_FILE) && !defined (GRUB_MACHINE_EMU)
+extern char grub_prefix[];
+#endif
+
 #endif /* ! GRUB_KERNEL_HEADER */
diff --git a/include/grub/mips/kernel.h b/include/grub/mips/kernel.h
deleted file mode 100644
index bc4d43b2b..000000000
--- a/include/grub/mips/kernel.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2006,2007,2008  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/>.
- */
-
-#ifndef GRUB_KERNEL_CPU_HEADER
-#define GRUB_KERNEL_CPU_HEADER	1
-
-#define GRUB_MOD_ALIGN 0x1
-/* Non-zero value is only needed for PowerMacs.  */
-#define GRUB_MOD_GAP   0x0
-
-#ifndef ASM_FILE
-
-/* The prefix which points to the directory where GRUB modules and its
-   configuration file are located.  */
-extern char grub_prefix[];
-
-#endif
-
-#endif
diff --git a/include/grub/mips/qemu-mips/boot.h b/include/grub/mips/qemu-mips/boot.h
deleted file mode 100644
index e69de29bb..000000000
diff --git a/include/grub/mips/qemu-mips/kernel.h b/include/grub/mips/qemu-mips/kernel.h
index dbf74c1b2..230455dbf 100644
--- a/include/grub/mips/qemu-mips/kernel.h
+++ b/include/grub/mips/qemu-mips/kernel.h
@@ -27,10 +27,6 @@
 void EXPORT_FUNC (grub_reboot) (void);
 void EXPORT_FUNC (grub_halt) (void);
 
-/* The prefix which points to the directory where GRUB modules and its
-   configuration file are located.  */
-extern char grub_prefix[];
-
 #endif
 
 #endif /* ! GRUB_KERNEL_MACHINE_HEADER */
diff --git a/include/grub/mips/yeeloong/boot.h b/include/grub/mips/yeeloong/boot.h
deleted file mode 100644
index e69de29bb..000000000
diff --git a/include/grub/mips/yeeloong/kernel.h b/include/grub/mips/yeeloong/kernel.h
index 230455dbf..c08405e83 100644
--- a/include/grub/mips/yeeloong/kernel.h
+++ b/include/grub/mips/yeeloong/kernel.h
@@ -20,7 +20,6 @@
 #define GRUB_KERNEL_MACHINE_HEADER	1
 
 #include <grub/symbol.h>
-#include <grub/cpu/kernel.h>
 
 #ifndef ASM_FILE
 
diff --git a/include/grub/offsets.h b/include/grub/offsets.h
index a7f252e85..ae0b2557e 100644
--- a/include/grub/offsets.h
+++ b/include/grub/offsets.h
@@ -136,6 +136,8 @@
 
 #define GRUB_KERNEL_POWERPC_IEEE1275_MOD_ALIGN 0x1000
 
+#define GRUB_KERNEL_MIPS_YEELOONG_MOD_ALIGN 0x1
+
 /* Minimal gap between _end and the start of the modules.  It's a hack
    for PowerMac to prevent "CLAIM failed" error.  The real fix is to
    rewrite grub-mkimage to generate valid ELF files.  */
diff --git a/include/grub/powerpc/ieee1275/kernel.h b/include/grub/powerpc/ieee1275/kernel.h
deleted file mode 100644
index 75d6c62a6..000000000
--- a/include/grub/powerpc/ieee1275/kernel.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2006,2007,2008  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/>.
- */
-
-#ifndef GRUB_KERNEL_MACHINE_HEADER
-#define GRUB_KERNEL_MACHINE_HEADER	1
-
-#include <grub/symbol.h>
-#include <grub/offsets.h>
-
-#define GRUB_KERNEL_MACHINE_LINK_ADDR 0x200000
-
-#ifndef ASM_FILE
-
-/* The prefix which points to the directory where GRUB modules and its
-   configuration file are located.  */
-extern char grub_prefix[];
-
-#endif
-
-#endif /* ! GRUB_KERNEL_MACHINE_HEADER */
diff --git a/include/grub/sparc64/ieee1275/kernel.h b/include/grub/sparc64/ieee1275/kernel.h
index 012b5570c..5aa50b852 100644
--- a/include/grub/sparc64/ieee1275/kernel.h
+++ b/include/grub/sparc64/ieee1275/kernel.h
@@ -19,11 +19,6 @@
 #ifndef GRUB_KERNEL_MACHINE_HEADER
 #define GRUB_KERNEL_MACHINE_HEADER	1
 
-#define GRUB_MOD_ALIGN 0x2000
-
-/* Non-zero value is only needed for PowerMacs.  */
-#define GRUB_MOD_GAP 0x0
-
 #define GRUB_KERNEL_MACHINE_STACK_SIZE          0x40000
 
 #ifndef ASM_FILE
@@ -37,10 +32,6 @@ extern grub_int32_t grub_kernel_image_size;
 /* The total size of module images following the kernel.  */
 extern grub_int32_t grub_total_module_size;
 
-/* The prefix which points to the directory where GRUB modules and its
-   configuration file are located.  */
-extern char grub_prefix[];
-
 #endif /* ! ASM_FILE */
 
 #endif /* ! GRUB_KERNEL_MACHINE_HEADER */
diff --git a/include/grub/sparc64/kernel.h b/include/grub/sparc64/kernel.h
deleted file mode 100644
index 9f404b05d..000000000
--- a/include/grub/sparc64/kernel.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2006,2007,2008  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/>.
- */
-
-#ifndef GRUB_KERNEL_CPU_HEADER
-#define GRUB_KERNEL_CPU_HEADER	1
-
-#define GRUB_MOD_ALIGN 0x2000
-
-/* Non-zero value is only needed for PowerMacs.  */
-#define GRUB_MOD_GAP 0x0
-
-#define GRUB_KERNEL_CPU_PREFIX	0x2
-#define GRUB_KERNEL_CPU_DATA_END	0x42
-
-#endif
diff --git a/include/grub/types.h b/include/grub/types.h
index 9eaafd0c1..6e9461f1d 100644
--- a/include/grub/types.h
+++ b/include/grub/types.h
@@ -178,21 +178,6 @@ static inline grub_uint64_t grub_swap_bytes64(grub_uint64_t x)
 # define grub_be_to_cpu16(x)	((grub_uint16_t) (x))
 # define grub_be_to_cpu32(x)	((grub_uint32_t) (x))
 # define grub_be_to_cpu64(x)	((grub_uint64_t) (x))
-# ifdef GRUB_TARGET_WORDS_BIGENDIAN
-#  define grub_target_to_host16(x)	((grub_uint16_t) (x))
-#  define grub_target_to_host32(x)	((grub_uint32_t) (x))
-#  define grub_target_to_host64(x)	((grub_uint64_t) (x))
-#  define grub_host_to_target16(x)	((grub_uint16_t) (x))
-#  define grub_host_to_target32(x)	((grub_uint32_t) (x))
-#  define grub_host_to_target64(x)	((grub_uint64_t) (x))
-# else /* ! GRUB_TARGET_WORDS_BIGENDIAN */
-#  define grub_target_to_host16(x)	grub_swap_bytes16(x)
-#  define grub_target_to_host32(x)	grub_swap_bytes32(x)
-#  define grub_target_to_host64(x)	grub_swap_bytes64(x)
-#  define grub_host_to_target16(x)	grub_swap_bytes16(x)
-#  define grub_host_to_target32(x)	grub_swap_bytes32(x)
-#  define grub_host_to_target64(x)	grub_swap_bytes64(x)
-# endif
 #else /* ! WORDS_BIGENDIAN */
 # define grub_cpu_to_le16(x)	((grub_uint16_t) (x))
 # define grub_cpu_to_le32(x)	((grub_uint32_t) (x))
@@ -206,27 +191,6 @@ static inline grub_uint64_t grub_swap_bytes64(grub_uint64_t x)
 # define grub_be_to_cpu16(x)	grub_swap_bytes16(x)
 # define grub_be_to_cpu32(x)	grub_swap_bytes32(x)
 # define grub_be_to_cpu64(x)	grub_swap_bytes64(x)
-# ifdef GRUB_TARGET_WORDS_BIGENDIAN
-#  define grub_target_to_host16(x)	grub_swap_bytes16(x)
-#  define grub_target_to_host32(x)	grub_swap_bytes32(x)
-#  define grub_target_to_host64(x)	grub_swap_bytes64(x)
-#  define grub_host_to_target16(x)	grub_swap_bytes16(x)
-#  define grub_host_to_target32(x)	grub_swap_bytes32(x)
-#  define grub_host_to_target64(x)	grub_swap_bytes64(x)
-# else /* ! GRUB_TARGET_WORDS_BIGENDIAN */
-#  define grub_target_to_host16(x)	((grub_uint16_t) (x))
-#  define grub_target_to_host32(x)	((grub_uint32_t) (x))
-#  define grub_target_to_host64(x)	((grub_uint64_t) (x))
-#  define grub_host_to_target16(x)	((grub_uint16_t) (x))
-#  define grub_host_to_target32(x)	((grub_uint32_t) (x))
-#  define grub_host_to_target64(x)	((grub_uint64_t) (x))
-# endif
 #endif /* ! WORDS_BIGENDIAN */
 
-#if GRUB_TARGET_SIZEOF_VOID_P == 8
-#  define grub_host_to_target_addr(x) grub_host_to_target64(x)
-#else
-#  define grub_host_to_target_addr(x) grub_host_to_target32(x)
-#endif
-
 #endif /* ! GRUB_TYPES_HEADER */
diff --git a/include/grub/x86_64/efi/kernel.h b/include/grub/x86_64/efi/kernel.h
deleted file mode 100644
index 0cb39a215..000000000
--- a/include/grub/x86_64/efi/kernel.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2003,2007  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/>.
- */
-
-#ifndef GRUB_MACHINE_KERNEL_HEADER
-#define GRUB_MACHINE_KERNEL_HEADER   1
-
-/* The prefix which points to the directory where GRUB modules and its
-   configuration file are located.  */
-extern char grub_prefix[];
-
-#endif /* ! GRUB_MACHINE_KERNEL_HEADER */
-
diff --git a/include/grub/x86_64/kernel.h b/include/grub/x86_64/kernel.h
deleted file mode 100644
index 25ac57e40..000000000
--- a/include/grub/x86_64/kernel.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <grub/i386/kernel.h>
diff --git a/kern/efi/init.c b/kern/efi/init.c
index a0b4ff779..afd21055d 100644
--- a/kern/efi/init.c
+++ b/kern/efi/init.c
@@ -24,7 +24,6 @@
 #include <grub/misc.h>
 #include <grub/env.h>
 #include <grub/mm.h>
-#include <grub/machine/kernel.h>
 
 void
 grub_efi_init (void)
diff --git a/kern/i386/coreboot/init.c b/kern/i386/coreboot/init.c
index f367269c4..08f2cce3a 100644
--- a/kern/i386/coreboot/init.c
+++ b/kern/i386/coreboot/init.c
@@ -22,7 +22,6 @@
 #include <grub/machine/init.h>
 #include <grub/machine/memory.h>
 #include <grub/machine/console.h>
-#include <grub/machine/kernel.h>
 #include <grub/types.h>
 #include <grub/err.h>
 #include <grub/dl.h>
@@ -33,8 +32,10 @@
 #include <grub/time.h>
 #include <grub/symbol.h>
 #include <grub/cpu/io.h>
-#include <grub/cpu/kernel.h>
 #include <grub/cpu/tsc.h>
+#ifdef GRUB_MACHINE_QEMU
+#include <grub/machine/kernel.h>
+#endif
 
 #define GRUB_FLOPPY_REG_DIGITAL_OUTPUT		0x3f2
 
diff --git a/kern/i386/coreboot/startup.S b/kern/i386/coreboot/startup.S
index ecdc0b61c..bdefb69bc 100644
--- a/kern/i386/coreboot/startup.S
+++ b/kern/i386/coreboot/startup.S
@@ -19,7 +19,7 @@
 #include <grub/symbol.h>
 #include <grub/machine/memory.h>
 #include <grub/cpu/linux.h>
-#include <grub/cpu/kernel.h>
+#include <grub/offsets.h>
 #include <multiboot.h>
 #include <multiboot2.h>
 
diff --git a/kern/i386/ieee1275/startup.S b/kern/i386/ieee1275/startup.S
index ad2ef329b..c0a08a954 100644
--- a/kern/i386/ieee1275/startup.S
+++ b/kern/i386/ieee1275/startup.S
@@ -19,7 +19,6 @@
 #include <grub/symbol.h>
 #include <grub/machine/memory.h>
 #include <grub/cpu/linux.h>
-#include <grub/cpu/kernel.h>
 #include <multiboot.h>
 #include <multiboot2.h>
 
diff --git a/kern/ieee1275/cmain.c b/kern/ieee1275/cmain.c
index c1185f82c..cdc8ca051 100644
--- a/kern/ieee1275/cmain.c
+++ b/kern/ieee1275/cmain.c
@@ -20,7 +20,6 @@
 #include <grub/kernel.h>
 #include <grub/misc.h>
 #include <grub/types.h>
-#include <grub/machine/kernel.h>
 #include <grub/ieee1275/ieee1275.h>
 
 int (*grub_ieee1275_entry_fn) (void *);
diff --git a/kern/ieee1275/init.c b/kern/ieee1275/init.c
index db9583d8b..f79b82776 100644
--- a/kern/ieee1275/init.c
+++ b/kern/ieee1275/init.c
@@ -29,10 +29,9 @@
 #include <grub/misc.h>
 #include <grub/time.h>
 #include <grub/machine/console.h>
-#include <grub/machine/kernel.h>
-#include <grub/cpu/kernel.h>
 #include <grub/ieee1275/ofdisk.h>
 #include <grub/ieee1275/ieee1275.h>
+#include <grub/offsets.h>
 
 /* The minimal heap size we can live with. */
 #define HEAP_MIN_SIZE		(unsigned long) (2 * 1024 * 1024)
diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index cf9e1a870..5693f3be0 100644
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -21,7 +21,6 @@
 #include <grub/err.h>
 #include <grub/misc.h>
 #include <grub/mm.h>
-#include <grub/machine/kernel.h>
 #include <grub/ieee1275/ieee1275.h>
 
 enum grub_ieee1275_parse_type
diff --git a/kern/mips/init.c b/kern/mips/init.c
index 5adcedcbb..f220108d4 100644
--- a/kern/mips/init.c
+++ b/kern/mips/init.c
@@ -18,7 +18,6 @@
 
 #include <grub/kernel.h>
 #include <grub/env.h>
-#include <grub/mips/kernel.h>
 
 void
 grub_machine_set_prefix (void)
diff --git a/kern/mips/startup.S b/kern/mips/startup.S
index 876b2df71..1d18131be 100644
--- a/kern/mips/startup.S
+++ b/kern/mips/startup.S
@@ -20,7 +20,7 @@
 #include <grub/symbol.h>
 #include <grub/offsets.h>
 #include <grub/machine/memory.h>
-#include <grub/machine/kernel.h>
+#include <grub/offsets.h>
 
 #define BASE_ADDR 8
 	
@@ -177,8 +177,8 @@ cont:
 	
 	lui $t1, %hi(_end)
 	addiu $t1, %lo(_end)
-	addiu $t1, (GRUB_MOD_ALIGN-1)
-	li $t3, (GRUB_MOD_ALIGN-1)
+	addiu $t1, (GRUB_KERNEL_MACHINE_MOD_ALIGN-1)
+	li $t3, (GRUB_KERNEL_MACHINE_MOD_ALIGN-1)
 	nor $t3, $t3, $0
 	and $t1, $t1, $t3
 	
diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 6bba27b51..47aa774a0 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -26,7 +26,6 @@
 #include <grub/time.h>
 #include <grub/machine/kernel.h>
 #include <grub/machine/memory.h>
-#include <grub/cpu/kernel.h>
 
 extern void grub_video_sm712_init (void);
 extern void grub_video_init (void);
diff --git a/kern/powerpc/ieee1275/startup.S b/kern/powerpc/ieee1275/startup.S
index 979f260f8..96d153778 100644
--- a/kern/powerpc/ieee1275/startup.S
+++ b/kern/powerpc/ieee1275/startup.S
@@ -18,7 +18,7 @@
  */
 
 #include <grub/symbol.h>
-#include <grub/machine/kernel.h>
+#include <grub/offsets.h>
 
 .extern __bss_start
 .extern _end
diff --git a/util/elf/grub-mkimage.c b/util/elf/grub-mkimage.c
deleted file mode 100644
index f37837c19..000000000
--- a/util/elf/grub-mkimage.c
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2004,2005,2006,2007,2008,2009,2010  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 <config.h>
-
-#include <stdio.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-#include <grub/elf.h>
-#include <grub/misc.h>
-#include <grub/util/misc.h>
-#include <grub/util/resolve.h>
-#include <grub/kernel.h>
-#include <grub/cpu/kernel.h>
-#include <grub/machine/kernel.h>
-#include <grub/i18n.h>
-
-#include "progname.h"
-
-#define GRUB_IEEE1275_NOTE_NAME "PowerPC"
-#define GRUB_IEEE1275_NOTE_TYPE 0x1275
-
-/* These structures are defined according to the CHRP binding to IEEE1275,
-   "Client Program Format" section.  */
-
-struct grub_ieee1275_note_hdr
-{
-  grub_uint32_t namesz;
-  grub_uint32_t descsz;
-  grub_uint32_t type;
-  char name[sizeof (GRUB_IEEE1275_NOTE_NAME)];
-};
-
-struct grub_ieee1275_note_desc
-{
-  grub_uint32_t real_mode;
-  grub_uint32_t real_base;
-  grub_uint32_t real_size;
-  grub_uint32_t virt_base;
-  grub_uint32_t virt_size;
-  grub_uint32_t load_base;
-};
-
-struct grub_ieee1275_note
-{
-  struct grub_ieee1275_note_hdr header;
-  struct grub_ieee1275_note_desc descriptor;
-};
-
-void
-load_note (Elf32_Phdr *phdr, FILE *out)
-{
-  struct grub_ieee1275_note note;
-  int note_size = sizeof (struct grub_ieee1275_note);
-
-  grub_util_info ("adding CHRP NOTE segment");
-
-  note.header.namesz = grub_host_to_target32 (sizeof (GRUB_IEEE1275_NOTE_NAME));
-  note.header.descsz = grub_host_to_target32 (note_size);
-  note.header.type = grub_host_to_target32 (GRUB_IEEE1275_NOTE_TYPE);
-  strcpy (note.header.name, GRUB_IEEE1275_NOTE_NAME);
-  note.descriptor.real_mode = grub_host_to_target32 (0xffffffff);
-  note.descriptor.real_base = grub_host_to_target32 (0x00c00000);
-  note.descriptor.real_size = grub_host_to_target32 (0xffffffff);
-  note.descriptor.virt_base = grub_host_to_target32 (0xffffffff);
-  note.descriptor.virt_size = grub_host_to_target32 (0xffffffff);
-  note.descriptor.load_base = grub_host_to_target32 (0x00004000);
-
-  /* Write the note data to the new segment.  */
-  grub_util_write_image_at (&note, note_size,
-			    grub_target_to_host32 (phdr->p_offset), out);
-
-  /* Fill in the rest of the segment header.  */
-  phdr->p_type = grub_host_to_target32 (PT_NOTE);
-  phdr->p_flags = grub_host_to_target32 (PF_R);
-  phdr->p_align = grub_host_to_target32 (GRUB_TARGET_SIZEOF_LONG);
-  phdr->p_vaddr = 0;
-  phdr->p_paddr = 0;
-  phdr->p_filesz = grub_host_to_target32 (note_size);
-  phdr->p_memsz = 0;
-}
-
-void
-load_modules (grub_addr_t modbase, Elf32_Phdr *phdr, const char *dir,
-	      char *mods[], FILE *out, char *memdisk_path, char *config_path)
-{
-  char *module_img;
-  struct grub_util_path_list *path_list;
-  struct grub_util_path_list *p;
-  struct grub_module_info *modinfo;
-  size_t offset;
-  size_t total_module_size;
-  size_t memdisk_size = 0;
-  size_t config_size = 0;
-
-  path_list = grub_util_resolve_dependencies (dir, "moddep.lst", mods);
-
-  offset = sizeof (struct grub_module_info);
-  total_module_size = sizeof (struct grub_module_info);
-
-  if (memdisk_path)
-    {
-      memdisk_size = ALIGN_UP(grub_util_get_image_size (memdisk_path), 512);
-      grub_util_info ("the size of memory disk is 0x%x", memdisk_size);
-      total_module_size += memdisk_size + sizeof (struct grub_module_header);
-    }
-
-  if (config_path)
-    {
-      config_size = ALIGN_UP(grub_util_get_image_size (config_path), 512);
-      grub_util_info ("the size of memory disk is 0x%x", config_size);
-      total_module_size += config_size + sizeof (struct grub_module_header);
-    }
-
-  for (p = path_list; p; p = p->next)
-    {
-      total_module_size += (grub_util_get_image_size (p->name)
-	  + sizeof (struct grub_module_header));
-    }
-
-  grub_util_info ("the total module size is 0x%x", total_module_size);
-
-  module_img = xmalloc (total_module_size);
-  modinfo = (struct grub_module_info *) module_img;
-  modinfo->magic = grub_host_to_target32 (GRUB_MODULE_MAGIC);
-  modinfo->offset = grub_host_to_target32 (sizeof (struct grub_module_info));
-  modinfo->size = grub_host_to_target32 (total_module_size);
-
-  /* Load all the modules, with headers, into module_img.  */
-  for (p = path_list; p; p = p->next)
-    {
-      struct grub_module_header *header;
-      size_t mod_size;
-
-      grub_util_info ("adding module %s", p->name);
-
-      mod_size = grub_util_get_image_size (p->name);
-
-      header = (struct grub_module_header *) (module_img + offset);
-      header->type = OBJ_TYPE_ELF;
-      header->size = grub_host_to_target32 (mod_size + sizeof (*header));
-
-      grub_util_load_image (p->name, module_img + offset + sizeof (*header));
-
-      offset += sizeof (*header) + mod_size;
-    }
-
-  if (memdisk_path)
-    {
-      struct grub_module_header *header;
-
-      header = (struct grub_module_header *) (module_img + offset);
-      header->type = OBJ_TYPE_MEMDISK;
-      header->size = grub_host_to_target32 (memdisk_size + sizeof (*header));
-      offset += sizeof (*header);
-
-      grub_util_load_image (memdisk_path, module_img + offset);
-      offset += memdisk_size;
-    }
-
-  if (config_path)
-    {
-      struct grub_module_header *header;
-
-      header = (struct grub_module_header *) (module_img + offset);
-      header->type = OBJ_TYPE_CONFIG;
-      header->size = grub_host_to_target32 (config_size + sizeof (*header));
-      offset += sizeof (*header);
-
-      grub_util_load_image (config_path, module_img + offset);
-      offset += config_size;
-    }
-
-
-  /* Write the module data to the new segment.  */
-  grub_util_write_image_at (module_img, total_module_size,
-			    grub_host_to_target32 (phdr->p_offset), out);
-
-  /* Fill in the rest of the segment header.  */
-  phdr->p_type = grub_host_to_target32 (PT_LOAD);
-  phdr->p_flags = grub_host_to_target32 (PF_R | PF_W | PF_X);
-  phdr->p_align = grub_host_to_target32 (GRUB_TARGET_SIZEOF_LONG);
-  phdr->p_vaddr = grub_host_to_target32 (modbase);
-  phdr->p_paddr = grub_host_to_target32 (modbase);
-  phdr->p_filesz = grub_host_to_target32 (total_module_size);
-  phdr->p_memsz = grub_host_to_target32 (total_module_size);
-}
-
-void
-add_segments (char *dir, char *prefix, FILE *out, int chrp, char *mods[], char *memdisk_path, char *config_path)
-{
-  Elf32_Ehdr ehdr;
-  Elf32_Phdr *phdrs = NULL;
-  Elf32_Phdr *phdr;
-  FILE *in;
-  char *kernel_path;
-  grub_addr_t grub_end = 0;
-  off_t offset, first_segment;
-  int i, phdr_size;
-
-  /* Read ELF header.  */
-  kernel_path = grub_util_get_path (dir, "kernel.img");
-  in = fopen (kernel_path, "rb");
-  if (! in)
-    grub_util_error ("cannot open %s", kernel_path);
-
-  grub_util_read_at (&ehdr, sizeof (ehdr), 0, in);
-
-  offset = ALIGN_UP (sizeof (ehdr), GRUB_TARGET_SIZEOF_LONG);
-  ehdr.e_phoff = grub_host_to_target32 (offset);
-
-  phdr_size = (grub_target_to_host16 (ehdr.e_phentsize) *
-               grub_target_to_host16 (ehdr.e_phnum));
-
-  if (mods[0] != NULL)
-    phdr_size += grub_target_to_host16 (ehdr.e_phentsize);
-
-  if (chrp)
-    phdr_size += grub_target_to_host16 (ehdr.e_phentsize);
-
-  phdrs = xmalloc (phdr_size);
-  offset += ALIGN_UP (phdr_size, GRUB_TARGET_SIZEOF_LONG);
-
-  first_segment = offset;
-
-  /* Copy all existing segments.  */
-  for (i = 0; i < grub_target_to_host16 (ehdr.e_phnum); i++)
-    {
-      char *segment_img;
-      grub_size_t segment_end;
-
-      phdr = phdrs + i;
-
-      /* Read segment header.  */
-      grub_util_read_at (phdr, sizeof (Elf32_Phdr),
-			 (grub_target_to_host32 (ehdr.e_phoff)
-			  + (i * grub_target_to_host16 (ehdr.e_phentsize))),
-			 in);
-      grub_util_info ("copying segment %d, type %d", i,
-		      grub_target_to_host32 (phdr->p_type));
-
-      /* Locate _end.  */
-      segment_end = grub_target_to_host32 (phdr->p_paddr)
-		    + grub_target_to_host32 (phdr->p_memsz);
-      grub_util_info ("segment %u end 0x%lx", i, segment_end);
-      if (segment_end > grub_end)
-	grub_end = segment_end;
-
-      /* Read segment data and write it to new file.  */
-      segment_img = xmalloc (grub_target_to_host32 (phdr->p_filesz));
-
-      grub_util_read_at (segment_img, grub_target_to_host32 (phdr->p_filesz),
-			 grub_target_to_host32 (phdr->p_offset), in);
-
-      phdr->p_offset = grub_host_to_target32 (offset);
-      grub_util_write_image_at (segment_img, grub_target_to_host32 (phdr->p_filesz),
-				offset, out);
-      offset += ALIGN_UP (grub_target_to_host32 (phdr->p_filesz),
-			  GRUB_TARGET_SIZEOF_LONG);
-
-      free (segment_img);
-    }
-
-  if (mods[0] != NULL)
-    {
-      grub_addr_t modbase;
-
-      /* Place modules just after grub segment.  */
-      modbase = ALIGN_UP(grub_end + GRUB_MOD_GAP, GRUB_MOD_ALIGN);
-
-      /* Construct new segment header for modules.  */
-      phdr = phdrs + grub_target_to_host16 (ehdr.e_phnum);
-      ehdr.e_phnum = grub_host_to_target16 (grub_target_to_host16 (ehdr.e_phnum) + 1);
-
-      /* Fill in p_offset so the callees know where to write.  */
-      phdr->p_offset = grub_host_to_target32 (ALIGN_UP (grub_util_get_fp_size (out),
-							GRUB_TARGET_SIZEOF_LONG));
-
-      load_modules (modbase, phdr, dir, mods, out, memdisk_path, config_path);
-    }
-
-  if (chrp)
-    {
-      /* Construct new segment header for the CHRP note.  */
-      phdr = phdrs + grub_target_to_host16 (ehdr.e_phnum);
-      ehdr.e_phnum = grub_host_to_target16 (grub_target_to_host16 (ehdr.e_phnum) + 1);
-
-      /* Fill in p_offset so the callees know where to write.  */
-      phdr->p_offset = grub_host_to_target32 (ALIGN_UP (grub_util_get_fp_size (out),
-							GRUB_TARGET_SIZEOF_LONG));
-
-      load_note (phdr, out);
-    }
-
-  /* Don't bother preserving the section headers.  */
-  ehdr.e_shoff = 0;
-  ehdr.e_shnum = 0;
-  ehdr.e_shstrndx = 0;
-
-  /* Write entire segment table to the file.  */
-  grub_util_write_image_at (phdrs, phdr_size, grub_target_to_host32 (ehdr.e_phoff), out);
-
-  /* Write ELF header.  */
-  grub_util_write_image_at (&ehdr, sizeof (ehdr), 0, out);
-
-  if (prefix)
-    {
-      if (GRUB_KERNEL_MACHINE_PREFIX + strlen (prefix) + 1 > GRUB_KERNEL_MACHINE_DATA_END)
-        grub_util_error ("prefix too long");
-      grub_util_write_image_at (prefix, strlen (prefix) + 1, first_segment + GRUB_KERNEL_MACHINE_PREFIX, out);
-    }
-
-  free (phdrs);
-  free (kernel_path);
-}
-
-static struct option options[] =
-  {
-    {"directory", required_argument, 0, 'd'},
-    {"prefix", required_argument, 0, 'p'},
-    {"memdisk", required_argument, 0, 'm'},
-    {"config", required_argument, 0, 'c'},
-    {"output", required_argument, 0, 'o'},
-    {"help", no_argument, 0, 'h'},
-    {"note", no_argument, 0, 'n'},
-    {"version", no_argument, 0, 'V'},
-    {"verbose", no_argument, 0, 'v'},
-    { 0, 0, 0, 0 },
-  };
-
-static void
-usage (int status)
-{
-  if (status)
-    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
-  else
-    printf ("\
-Usage: %s -o FILE [OPTION]... [MODULES]\n\
-\n\
-Make a bootable image of GRUB.\n\
-\n\
-  -d, --directory=DIR     use images and modules under DIR [default=%s]\n\
-  -p, --prefix=DIR        set grub_prefix directory\n\
-  -m, --memdisk=FILE      embed FILE as a memdisk image\n\
-  -c, --config=FILE       embed FILE as boot config\n\
-  -o, --output=FILE       output a generated image to FILE\n\
-  -h, --help              display this message and exit\n\
-  -n, --note              add NOTE segment for CHRP Open Firmware\n\
-  -V, --version           print version information and exit\n\
-  -v, --verbose           print verbose messages\n\
-\n\
-Report bugs to <%s>.\n\
-", program_name, GRUB_LIBDIR, PACKAGE_BUGREPORT);
-
-  exit (status);
-}
-
-int
-main (int argc, char *argv[])
-{
-  FILE *fp;
-  char *output = NULL;
-  char *dir = NULL;
-  char *prefix = NULL;
-  char *memdisk = NULL;
-  char *config = NULL;
-  int chrp = 0;
-
-  set_program_name (argv[0]);
-
-  grub_util_init_nls ();
-
-  while (1)
-    {
-      int c = getopt_long (argc, argv, "d:p:m:c:o:hVvn", options, 0);
-      if (c == -1)
-	break;
-
-      switch (c)
-	{
-	  case 'd':
-	    if (dir)
-	      free (dir);
-	    dir = xstrdup (optarg);
-	    break;
-	  case 'p':
-	    if (prefix)
-	      free (prefix);
-	    prefix = xstrdup (optarg);
-	    break;
-	  case 'm':
-	    if (memdisk)
-	      free (memdisk);
-	    memdisk = xstrdup (optarg);
-
-	    if (prefix)
-	      free (prefix);
-	    prefix = xstrdup ("(memdisk)/boot/grub");
-
-	    break;
-	  case 'c':
-	    if (config)
-	      free (config);
-	    config = xstrdup (optarg);
-
-	    break;
-
-	  case 'h':
-	    usage (0);
-	    break;
-	  case 'n':
-	    chrp = 1;
-	    break;
-	  case 'o':
-	    if (output)
-	      free (output);
-	    output = xstrdup (optarg);
-	    break;
-	  case 'V':
-	    printf ("grub-mkimage (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
-	    return 0;
-	  case 'v':
-	    verbosity++;
-	    break;
-	  default:
-	    usage (1);
-	    break;
-	}
-  }
-
-  if (!output)
-    usage (1);
-
-  fp = fopen (output, "wb");
-  if (! fp)
-    grub_util_error ("cannot open %s", output);
-
-  add_segments (dir ? : GRUB_LIBDIR, prefix, fp, chrp, argv + optind, memdisk,
-		config);
-
-  fclose (fp);
-
-  return 0;
-}
diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
index e9fdc7428..4a257e329 100644
--- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c
@@ -17,6 +17,9 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#undef ELF_R_SYM
+#undef ELF_R_TYPE
+
 #if defined(MKIMAGE_ELF32)
 # define SUFFIX(x)	x ## 32
 # define ELFCLASSXX	ELFCLASS32
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 63fa8c328..f479d5090 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -57,6 +57,13 @@ static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_P
 #define DEFAULT_BOOT_FILE	"boot.img"
 #define DEFAULT_CORE_FILE	"core.img"
 
+#define grub_target_to_host16(x)	grub_le_to_cpu16(x)
+#define grub_target_to_host32(x)	grub_le_to_cpu32(x)
+#define grub_target_to_host64(x)	grub_le_to_cpu64(x)
+#define grub_host_to_target16(x)	grub_cpu_to_le16(x)
+#define grub_host_to_target32(x)	grub_cpu_to_le32(x)
+#define grub_host_to_target64(x)	grub_cpu_to_le64(x)
+
 void
 grub_putchar (int c)
 {
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index b511a96b2..fbf6ba036 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -76,6 +76,13 @@
 #define DEFAULT_BOOT_FILE	"boot.img"
 #define DEFAULT_CORE_FILE	"core.img"
 
+#define grub_target_to_host16(x)	grub_be_to_cpu16(x)
+#define grub_target_to_host32(x)	grub_be_to_cpu32(x)
+#define grub_target_to_host64(x)	grub_be_to_cpu64(x)
+#define grub_host_to_target16(x)	grub_cpu_to_be16(x)
+#define grub_host_to_target32(x)	grub_cpu_to_be32(x)
+#define grub_host_to_target64(x)	grub_cpu_to_be64(x)
+
 /* This is the blocklist used in the diskboot image.  */
 struct boot_blocklist
 {

From 88d046d01efb74d256ccab953ebe0dbe82b0ee2e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 26 Apr 2010 21:27:41 +0200
Subject: [PATCH 0842/1628] Switch to new grub-mkimage syntax

---
 util/grub-install.in                   | 19 +++++++++++--------
 util/grub-mkrescue.in                  |  4 ++--
 util/i386/efi/grub-install.in          |  2 +-
 util/ieee1275/grub-install.in          |  4 ++--
 util/powerpc/ieee1275/grub-mkrescue.in |  4 ++--
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/util/grub-install.in b/util/grub-install.in
index 142d5792f..8a93ace8c 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -35,11 +35,7 @@ pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${t
 localedir=@datadir@/locale
 
 grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
-if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] || [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
-    grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
-else
-    grub_mkimage=${bindir}/`echo grub-mkelfimage | sed ${transform}`
-fi
+grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
 grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
 grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
 grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}`
@@ -346,16 +342,23 @@ else
     prefix_drive=`$grub_probe --target=drive --device ${grub_device}` || exit 1
 fi
 
+case "${target_cpu}-${platform}"
+    i386-pc) mkimage_target=i386-pc ;;
+    sparc64-ieee1275) mkimage_target=sparc64-ieee1275-raw ;;
+    mips-yeeloong) mkimage_target=mipsel-yeeloong-elf ;;
+    *) mkimage_target=i386-coreboot;
+esac
+
 if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then
-    $grub_mkimage ${config_opt} --output=${grubdir}/core.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
+    $grub_mkimage ${config_opt} -O ${mkimage_target} --output=${grubdir}/core.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 
     # Now perform the installation.
     $grub_setup ${setup_verbose} ${setup_force} --directory=${grubdir} --device-map=${device_map} \
         ${install_device} || exit 1
 elif [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
-    $grub_mkimage ${config_opt} -f ${font} -d ${pkglibdir} -O elf --output=/boot/grub.elf --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
+    $grub_mkimage ${config_opt} -f ${font} -d ${pkglibdir} -O ${mkimage_target} --output=/boot/grub.elf --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 else
-    $grub_mkimage ${config_opt} -d ${pkglibdir} --output=/boot/multiboot.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
+    $grub_mkimage -O ${mkimage_target} ${config_opt} -d ${pkglibdir} --output=/boot/multiboot.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 fi
 
 echo "Installation finished. No error reported."
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 7d553a767..a5430534a 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -160,7 +160,7 @@ EOF
 
     tar -C ${memdisk_dir} -cf ${memdisk_img} boot
     rm -rf ${memdisk_dir}
-    grub-mkelfimage -d ${coreboot_dir}/ -m ${memdisk_img} -o ${iso9660_dir}/boot/multiboot.img \
+    grub-mkimage -O i386-coreboot -d ${coreboot_dir}/ -m ${memdisk_img} -o ${iso9660_dir}/boot/multiboot.img \
         memdisk tar search iso9660 configfile sh \
         ata at_keyboard
     rm -f ${memdisk_img}
@@ -171,7 +171,7 @@ fi
 if test -e "${pc_dir}" ; then
     echo "Enabling BIOS support ..."
     core_img=`mktemp "$MKTEMP_TEMPLATE"`
-    grub-mkimage -d ${pc_dir}/ -O i386-pc -o ${core_img} --prefix=/boot/grub/i386-pc \
+    grub-mkimage -O i386-pc -d ${pc_dir}/ -O i386-pc -o ${core_img} --prefix=/boot/grub/i386-pc \
         iso9660 biosdisk
     cat ${pc_dir}/cdboot.img ${core_img} > ${iso9660_dir}/boot/grub/i386-pc/eltorito.img
 
diff --git a/util/i386/efi/grub-install.in b/util/i386/efi/grub-install.in
index cc4d950d2..9b4270ff6 100644
--- a/util/i386/efi/grub-install.in
+++ b/util/i386/efi/grub-install.in
@@ -213,7 +213,7 @@ devabstraction_module=`$grub_probe --target=abstraction --device-map=${device_ma
 # The order in this list is critical.  Be careful when modifying it.
 modules="$modules $fs_module $partmap_module $devabstraction_module"
 
-$grub_mkimage --output=${grubdir}/grub.efi $modules || exit 1
+$grub_mkimage -O ${target_cpu}-efi --output=${grubdir}/grub.efi $modules || exit 1
 
 # Prompt the user to check if the device map is correct.
 echo "Installation finished. No error reported."
diff --git a/util/ieee1275/grub-install.in b/util/ieee1275/grub-install.in
index 363f312db..4d00cc217 100644
--- a/util/ieee1275/grub-install.in
+++ b/util/ieee1275/grub-install.in
@@ -34,7 +34,7 @@ target_cpu=@target_cpu@
 platform=@platform@
 pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
 
-grub_mkimage=${bindir}/`echo grub-mkelfimage | sed ${transform}`
+grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
 grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
 grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
 grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}`
@@ -189,7 +189,7 @@ devabstraction_module=`$grub_probe --target=abstraction --device-map=${device_ma
 modules="$modules $fs_module $partmap_module $devabstraction_module"
 
 # Now perform the installation.
-"$grub_mkimage" --directory=${pkglibdir} --output=${grubdir}/grub $modules || exit 1
+"$grub_mkimage" -O ${target_cpu}-ieee1275 --directory=${pkglibdir} --output=${grubdir}/grub $modules || exit 1
 
 if test $update_nvram = yes; then
     set $ofpathname dummy
diff --git a/util/powerpc/ieee1275/grub-mkrescue.in b/util/powerpc/ieee1275/grub-mkrescue.in
index 0110e799c..16658505b 100644
--- a/util/powerpc/ieee1275/grub-mkrescue.in
+++ b/util/powerpc/ieee1275/grub-mkrescue.in
@@ -30,7 +30,7 @@ target_cpu=@target_cpu@
 platform=@platform@
 pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
 
-grub_mkimage=${bindir}/`echo grub-mkelfimage | sed ${transform}`
+grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
 
 # Usage: usage
 # Print the usage.
@@ -104,7 +104,7 @@ boot_dir=${iso_dir}/boot/grub
 mkdir ${iso_dir}/boot
 mkdir ${boot_dir}
 core_img=${boot_dir}/grub.img
-${grub_mkimage} -n -d ${input_dir}/ -o ${core_img} ${modules}
+${grub_mkimage} -O powerpc-ieee1275 -n -d ${input_dir}/ -o ${core_img} ${modules}
 genisoimage -hfs -part -no-desktop -r -J -o ${output_image} \
  -map ${map_file} -hfs-bless ${boot_dir} -chrp-boot -sysid PPC \
  ${iso_dir}

From 840b61d8f0fc4919fbfdfb0e8495f2c0da81b715 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 27 Apr 2010 10:50:28 +0530
Subject: [PATCH 0843/1628] reorganized grub-emu sources to suite upcoming
 automake build system

---
 {util => bus/emu}/pci.c               |   0
 {util => bus/usb/emu}/usb.c           |   0
 conf/any-emu.rmk                      |  19 ++-
 conf/common.rmk                       |   4 +-
 include/grub/{util => emu}/console.h  |   0
 include/grub/{util => emu}/getroot.h  |   0
 include/grub/{util => emu}/hostdisk.h |   0
 include/grub/emu/misc.h               |  31 ++++
 kern/emu/cache.S                      |  17 +++
 {util => kern/emu}/console.c          |   2 +-
 kern/emu/dummy/dl.c                   |  51 +++++++
 {util => kern/emu}/getroot.c          |  10 +-
 {util => kern/emu}/hostdisk.c         |   4 +-
 {util => kern/emu}/hostfs.c           |   0
 kern/emu/lite.c                       |  16 +++
 util/grub-emu.c => kern/emu/main.c    |  42 +++++-
 kern/emu/misc.c                       | 199 ++++++++++++++++++++++++++
 {util => kern/emu}/time.c             |   0
 util/grub-probe.c                     |   5 +-
 {util => video/emu}/sdl.c             |   0
 20 files changed, 378 insertions(+), 22 deletions(-)
 rename {util => bus/emu}/pci.c (100%)
 rename {util => bus/usb/emu}/usb.c (100%)
 rename include/grub/{util => emu}/console.h (100%)
 rename include/grub/{util => emu}/getroot.h (100%)
 rename include/grub/{util => emu}/hostdisk.h (100%)
 create mode 100644 include/grub/emu/misc.h
 create mode 100644 kern/emu/cache.S
 rename {util => kern/emu}/console.c (99%)
 create mode 100644 kern/emu/dummy/dl.c
 rename {util => kern/emu}/getroot.c (98%)
 rename {util => kern/emu}/hostdisk.c (99%)
 rename {util => kern/emu}/hostfs.c (100%)
 create mode 100644 kern/emu/lite.c
 rename util/grub-emu.c => kern/emu/main.c (91%)
 create mode 100644 kern/emu/misc.c
 rename {util => kern/emu}/time.c (100%)
 rename {util => video/emu}/sdl.c (100%)

diff --git a/util/pci.c b/bus/emu/pci.c
similarity index 100%
rename from util/pci.c
rename to bus/emu/pci.c
diff --git a/util/usb.c b/bus/usb/emu/usb.c
similarity index 100%
rename from util/usb.c
rename to bus/usb/emu/usb.c
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index d1e5754dc..5f6798d79 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -10,11 +10,11 @@ kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c kern/env.c	\
 	kern/parser.c kern/partition.c kern/term.c			\
 	kern/rescue_reader.c kern/rescue_parser.c			\
 	\
-	util/console.c  util/grub-emu.c util/misc.c			\
-	util/hostdisk.c util/getroot.c util/mm.c util/time.c		\
+	kern/emu/misc.c kern/emu/getroot.c kern/emu/time.c		\
+	kern/emu/hostdisk.c kern/emu/hostfs.c kern/emu/console.c	\
 	\
-	gnulib/progname.c util/hostfs.c disk/host.c
-kernel_img_HEADERS += datetime.h util/misc.h
+	gnulib/progname.c disk/host.c
+kernel_img_HEADERS += datetime.h emu/misc.h
 kernel_img_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-undef -I$(srcdir)/gnulib
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 TARGET_NO_STRIP = yes
@@ -49,7 +49,7 @@ ifeq ($(enable_grub_emu_usb), yes)
 kernel_img_HEADERS += libusb.h
 
 pkglib_MODULES += libusb.mod
-libusb_mod_SOURCES = util/usb.c
+libusb_mod_SOURCES = bus/usb/emu/usb.c
 libusb_mod_CFLAGS = 
 libusb_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
@@ -76,7 +76,7 @@ endif
 
 ifeq ($(enable_grub_emu_sdl), yes)
 pkglib_MODULES += sdl.mod
-sdl_mod_SOURCES = util/sdl.c
+sdl_mod_SOURCES = video/emu/sdl.c
 sdl_mod_CFLAGS = 
 sdl_mod_LDFLAGS = $(COMMON_LDFLAGS)
 grub_emu_LDFLAGS += $(LIBSDL)
@@ -106,8 +106,13 @@ ifneq ($(TARGET_NO_MODULES), yes)
 grub-emu: $(pkglib_PROGRAMS)
 	$(CC) -o $@ $(pkglib_PROGRAMS) $(grub_emu_LDFLAGS) $(LDFLAGS)
 else
+
+pkglib_MODULES += emu.mod
+emu_mod_SOURCES = kern/emu/main.c
+emu_mod_CFLAGS = -I$(srcdir)/gnulib
+
 grub-emu: $(pkglib_MODULES) $(pkglib_PROGRAMS)
-	$(CC) -o $@ $(pkglib_MODULES) $(pkglib_PROGRAMS) $(grub_emu_LDFLAGS) $(LDFLAGS)
+	$(CC) -o $@ $^ $(grub_emu_LDFLAGS) $(LDFLAGS)
 endif
 GRUB_EMU=grub-emu
 
diff --git a/conf/common.rmk b/conf/common.rmk
index 8df232a0b..6267d7818 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -25,7 +25,7 @@ util/elf/grub-mkimage.c_DEPENDENCIES = Makefile
 sbin_UTILITIES += grub-probe
 util/grub-probe.c_DEPENDENCIES = grub_probe_init.h
 grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c	\
-	util/hostdisk.c	util/misc.c util/getroot.c util/mm.c	\
+	kern/emu/hostdisk.c util/misc.c kern/emu/getroot.c util/mm.c	\
 	kern/device.c kern/disk.c kern/err.c kern/misc.c	\
 	kern/parser.c kern/partition.c kern/file.c kern/list.c	\
 	\
@@ -60,7 +60,7 @@ grub_mkisofs_CFLAGS = -D_FILE_OFFSET_BITS=64 				\
 
 # For grub-fstest.
 util/grub-fstest.c_DEPENDENCIES = grub_fstest_init.h
-grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c util/hostfs.c \
+grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c kern/emu/hostfs.c \
 	util/misc.c util/mm.c 	\
 	kern/file.c kern/device.c kern/disk.c kern/err.c kern/misc.c	\
 	disk/host.c disk/loopback.c kern/list.c kern/command.c		\
diff --git a/include/grub/util/console.h b/include/grub/emu/console.h
similarity index 100%
rename from include/grub/util/console.h
rename to include/grub/emu/console.h
diff --git a/include/grub/util/getroot.h b/include/grub/emu/getroot.h
similarity index 100%
rename from include/grub/util/getroot.h
rename to include/grub/emu/getroot.h
diff --git a/include/grub/util/hostdisk.h b/include/grub/emu/hostdisk.h
similarity index 100%
rename from include/grub/util/hostdisk.h
rename to include/grub/emu/hostdisk.h
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
new file mode 100644
index 000000000..e62aeba08
--- /dev/null
+++ b/include/grub/emu/misc.h
@@ -0,0 +1,31 @@
+#ifndef GRUB_EMU_MISC_H
+#define GRUB_EMU_MISC_H 1
+
+#include <grub/symbol.h>
+#include <grub/types.h>
+
+#ifdef __NetBSD__
+/* NetBSD uses /boot for its boot block.  */
+# define DEFAULT_DIRECTORY	"/grub"
+#else
+# define DEFAULT_DIRECTORY	"/boot/grub"
+#endif
+
+#define DEFAULT_DEVICE_MAP	DEFAULT_DIRECTORY "/device.map"
+
+extern int verbosity;
+extern const char *program_name;
+
+void grub_init_all (void);
+void grub_fini_all (void);
+
+void * EXPORT_FUNC(xmalloc) (grub_size_t size);
+void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size);
+char * EXPORT_FUNC(xstrdup) (const char *str);
+char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
+
+void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...);
+void EXPORT_FUNC(grub_util_info) (const char *fmt, ...);
+void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((noreturn));
+
+#endif /* GRUB_EMU_MISC_H */
diff --git a/kern/emu/cache.S b/kern/emu/cache.S
new file mode 100644
index 000000000..087b2b495
--- /dev/null
+++ b/kern/emu/cache.S
@@ -0,0 +1,17 @@
+#ifndef GRUB_MACHINE_EMU
+#error "This source is only meant for grub-emu platform"
+#endif
+
+#if GRUB_CPU_I386
+#elif GRUB_CPU_X86_64
+#elif GRUB_CPU_SPARC64
+#include "../sparc64/cache.S"
+#elif GRUB_CPU_MIPS
+#include "../mips/cache.S"
+#elif GRUB_CPU_MIPSEL
+#include "../mips/cache.S"
+#elif GRUB_CPU_POWERPC
+#include "../powerpc/cache.S"
+#else
+#error "No target cpu type is defined"
+#endif
diff --git a/util/console.c b/kern/emu/console.c
similarity index 99%
rename from util/console.c
rename to kern/emu/console.c
index 382fd7f89..f7fbc899a 100644
--- a/util/console.c
+++ b/kern/emu/console.c
@@ -27,7 +27,7 @@
 # define A_STANDOUT	0
 #endif /* ! A_STANDOUT */
 
-#include <grub/util/console.h>
+#include <grub/emu/console.h>
 #include <grub/term.h>
 #include <grub/types.h>
 
diff --git a/kern/emu/dummy/dl.c b/kern/emu/dummy/dl.c
new file mode 100644
index 000000000..8e9fabfc2
--- /dev/null
+++ b/kern/emu/dummy/dl.c
@@ -0,0 +1,51 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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 <config.h>
+#include <grub/dl.h>
+
+grub_err_t
+grub_arch_dl_check_header (void *ehdr)
+{
+  (void) ehdr;
+
+  return GRUB_ERR_BAD_MODULE;
+}
+
+grub_err_t
+grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
+{
+  (void) mod;
+  (void) ehdr;
+
+  return GRUB_ERR_BAD_MODULE;
+}
+
+/* int */
+/* grub_dl_ref (grub_dl_t mod) */
+/* {  */
+/*   (void) mod; */
+/*   return 0; */
+/* } */
+
+/* int */
+/* grub_dl_unref (grub_dl_t mod) */
+/* {  */
+/*   (void) mod; */
+/*   return 0; */
+/* } */
diff --git a/util/getroot.c b/kern/emu/getroot.c
similarity index 98%
rename from util/getroot.c
rename to kern/emu/getroot.c
index 94eadc5e1..91799aa8f 100644
--- a/util/getroot.c
+++ b/kern/emu/getroot.c
@@ -22,6 +22,8 @@
 #include <unistd.h>
 #include <string.h>
 #include <dirent.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #ifdef __CYGWIN__
 # include <sys/fcntl.h>
@@ -36,9 +38,11 @@
 #include <hurd/fs.h>
 #endif
 
-#include <grub/util/misc.h>
-#include <grub/util/hostdisk.h>
-#include <grub/util/getroot.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/emu/misc.h>
+#include <grub/emu/hostdisk.h>
+#include <grub/emu/getroot.h>
 
 static void
 strip_extra_slashes (char *dir)
diff --git a/util/hostdisk.c b/kern/emu/hostdisk.c
similarity index 99%
rename from util/hostdisk.c
rename to kern/emu/hostdisk.c
index 8be487461..983f101ae 100644
--- a/util/hostdisk.c
+++ b/kern/emu/hostdisk.c
@@ -22,8 +22,8 @@
 #include <grub/msdos_partition.h>
 #include <grub/types.h>
 #include <grub/err.h>
-#include <grub/util/misc.h>
-#include <grub/util/hostdisk.h>
+#include <grub/emu/misc.h>
+#include <grub/emu/hostdisk.h>
 #include <grub/misc.h>
 #include <grub/i18n.h>
 #include <grub/list.h>
diff --git a/util/hostfs.c b/kern/emu/hostfs.c
similarity index 100%
rename from util/hostfs.c
rename to kern/emu/hostfs.c
diff --git a/kern/emu/lite.c b/kern/emu/lite.c
new file mode 100644
index 000000000..1f06e39dc
--- /dev/null
+++ b/kern/emu/lite.c
@@ -0,0 +1,16 @@
+#include <config.h>
+#include <grub/emu/misc.h>
+
+/* grub-emu-lite supports dynamic module loading, so it won't have any
+   embedded modules.  */
+void
+grub_init_all(void)
+{
+  return;
+}
+
+void
+grub_fini_all(void)
+{
+  return;
+}
diff --git a/util/grub-emu.c b/kern/emu/main.c
similarity index 91%
rename from util/grub-emu.c
rename to kern/emu/main.c
index 8660f0aa0..978919f2a 100644
--- a/util/grub-emu.c
+++ b/kern/emu/main.c
@@ -16,7 +16,10 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <time.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <setjmp.h>
 #include <sys/stat.h>
 #include <getopt.h>
 #include <string.h>
@@ -27,13 +30,13 @@
 #include <grub/mm.h>
 #include <grub/setjmp.h>
 #include <grub/fs.h>
-#include <grub/util/hostdisk.h>
-#include <grub/dl.h>
-#include <grub/util/console.h>
-#include <grub/util/misc.h>
+#include <grub/emu/hostdisk.h>
+#include <grub/time.h>
+#include <grub/emu/console.h>
+#include <grub/emu/misc.h>
 #include <grub/kernel.h>
 #include <grub/normal.h>
-#include <grub/util/getroot.h>
+#include <grub/emu/getroot.h>
 #include <grub/env.h>
 #include <grub/partition.h>
 #include <grub/i18n.h>
@@ -261,3 +264,32 @@ main (int argc, char *argv[])
 
   return 0;
 }
+
+#ifdef __MINGW32__
+
+void
+grub_millisleep (grub_uint32_t ms)
+{
+  Sleep (ms);
+}
+
+#else
+
+void
+grub_millisleep (grub_uint32_t ms)
+{
+  struct timespec ts;
+
+  ts.tv_sec = ms / 1000;
+  ts.tv_nsec = (ms % 1000) * 1000000;
+  nanosleep (&ts, NULL);
+}
+
+#endif
+
+#if GRUB_NO_MODULES
+void
+grub_register_exported_symbols (void)
+{
+}
+#endif
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
new file mode 100644
index 000000000..d8dfc938d
--- /dev/null
+++ b/kern/emu/misc.c
@@ -0,0 +1,199 @@
+#include <config.h>
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+
+#include <grub/mm.h>
+#include <grub/err.h>
+#include <grub/env.h>
+#include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/i18n.h>
+#include <grub/time.h>
+#include <grub/emu/misc.h>
+
+int verbosity;
+
+void
+grub_util_warn (const char *fmt, ...)
+{
+  va_list ap;
+
+  fprintf (stderr, _("%s: warn:"), program_name);
+  fprintf (stderr, " ");
+  va_start (ap, fmt);
+  vfprintf (stderr, fmt, ap);
+  va_end (ap);
+  fprintf (stderr, ".\n");
+  fflush (stderr);
+}
+
+void
+grub_util_info (const char *fmt, ...)
+{
+  if (verbosity > 0)
+    {
+      va_list ap;
+
+      fprintf (stderr, _("%s: info:"), program_name);
+      fprintf (stderr, " ");
+      va_start (ap, fmt);
+      vfprintf (stderr, fmt, ap);
+      va_end (ap);
+      fprintf (stderr, ".\n");
+      fflush (stderr);
+    }
+}
+
+void
+grub_util_error (const char *fmt, ...)
+{
+  va_list ap;
+
+  fprintf (stderr, _("%s: error:"), program_name);
+  fprintf (stderr, " ");
+  va_start (ap, fmt);
+  vfprintf (stderr, fmt, ap);
+  va_end (ap);
+  fprintf (stderr, ".\n");
+  exit (1);
+}
+
+void *
+grub_malloc (grub_size_t size)
+{
+  return malloc (size);
+}
+
+void *
+grub_zalloc (grub_size_t size)
+{
+  void *ret;
+
+  ret = malloc (size);
+  memset (ret, 0, size);
+  return ret;
+}
+
+void
+grub_free (void *ptr)
+{
+  free (ptr);
+}
+
+void *
+grub_realloc (void *ptr, grub_size_t size)
+{
+  return realloc (ptr, size);
+}
+
+void *
+grub_memalign (grub_size_t align, grub_size_t size)
+{
+  void *p;
+
+#if defined(HAVE_POSIX_MEMALIGN)
+  if (align < sizeof (void *))
+    align = sizeof (void *);
+
+  else if (align % sizeof (void *))
+    grub_fatal ("bad alignment");
+
+  if (posix_memalign (&p, align, size) != 0)
+    p = 0;
+#elif defined(HAVE_MEMALIGN)
+  p = memalign (align, size);
+#else
+  (void) align;
+  (void) size;
+  grub_fatal ("grub_memalign is not supported");
+#endif
+
+  if (! p)
+    grub_fatal ("out of memory");
+
+  return p;
+}
+
+void *
+xmalloc (grub_size_t size)
+{
+  void *p;
+
+  p = grub_malloc (size);
+  if (! p)
+    grub_fatal ("out of memory");
+
+  return p;
+}
+
+void *
+xrealloc (void *ptr, grub_size_t size)
+{
+  ptr = grub_realloc (ptr, size);
+  if (! ptr)
+    grub_fatal ("out of memory");
+
+  return ptr;
+}
+
+char *
+xstrdup (const char *str)
+{
+  size_t len;
+  char *newstr;
+
+  len = grub_strlen (str);
+  newstr = (char *) xmalloc (len + 1);
+  grub_memcpy (newstr, str, len + 1);
+
+  return newstr;
+}
+
+char *
+xasprintf (const char *fmt, ...)
+{ 
+  va_list ap;
+  char *result;
+  
+  va_start (ap, fmt);
+  if (vasprintf (&result, fmt, ap) < 0)
+    { 
+      if (errno == ENOMEM)
+        grub_util_error ("out of memory");
+      return NULL;
+    }
+  
+  return result;
+}
+
+void
+grub_exit (void)
+{
+  exit (1);
+}
+
+grub_uint64_t
+grub_get_time_ms (void)
+{
+  struct timeval tv;
+
+  gettimeofday (&tv, 0);
+
+  return (tv.tv_sec * 1000 + tv.tv_usec / 1000);
+}
+
+grub_uint32_t
+grub_get_rtc (void)
+{
+  struct timeval tv;
+
+  gettimeofday (&tv, 0);
+
+  return (tv.tv_sec * GRUB_TICKS_PER_SECOND
+	  + (((tv.tv_sec % GRUB_TICKS_PER_SECOND) * 1000000 + tv.tv_usec)
+	     * GRUB_TICKS_PER_SECOND / 1000000));
+}
diff --git a/util/time.c b/kern/emu/time.c
similarity index 100%
rename from util/time.c
rename to kern/emu/time.c
diff --git a/util/grub-probe.c b/util/grub-probe.c
index bb41480e2..1b2606dc7 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <grub/types.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/device.h>
 #include <grub/disk.h>
@@ -26,8 +27,8 @@
 #include <grub/fs.h>
 #include <grub/partition.h>
 #include <grub/msdos_partition.h>
-#include <grub/util/hostdisk.h>
-#include <grub/util/getroot.h>
+#include <grub/emu/hostdisk.h>
+#include <grub/emu/getroot.h>
 #include <grub/term.h>
 #include <grub/env.h>
 #include <grub/raid.h>
diff --git a/util/sdl.c b/video/emu/sdl.c
similarity index 100%
rename from util/sdl.c
rename to video/emu/sdl.c

From 4c7085f82be6f018c895b9fd871ff8eed1d94be3 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 27 Apr 2010 13:57:14 +0530
Subject: [PATCH 0844/1628] added support for --enable-grub-emu-modules build

---
 conf/any-emu.rmk    | 18 +++++++---------
 include/grub/dl.h   | 15 -------------
 kern/dl.c           |  8 +++++--
 kern/emu/cache.S    | 17 ---------------
 kern/emu/dummy/dl.c | 51 ---------------------------------------------
 kern/emu/lite.c     | 16 --------------
 kern/emu/main.c     |  1 +
 util/misc.c         | 14 +++++++++++++
 8 files changed, 28 insertions(+), 112 deletions(-)
 delete mode 100644 kern/emu/cache.S
 delete mode 100644 kern/emu/dummy/dl.c
 delete mode 100644 kern/emu/lite.c

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 5f6798d79..ffaabcd2f 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -9,10 +9,11 @@ kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c kern/env.c	\
 	kern/corecmd.c kern/file.c kern/fs.c kern/main.c kern/misc.c	\
 	kern/parser.c kern/partition.c kern/term.c			\
 	kern/rescue_reader.c kern/rescue_parser.c			\
-	\
-	kern/emu/misc.c kern/emu/getroot.c kern/emu/time.c		\
-	kern/emu/hostdisk.c kern/emu/hostfs.c kern/emu/console.c	\
-	\
+									\
+	kern/emu/main.c kern/emu/misc.c kern/emu/getroot.c		\
+	kern/emu/time.c kern/emu/hostdisk.c kern/emu/hostfs.c		\
+	kern/emu/console.c						\
+									\
 	gnulib/progname.c disk/host.c
 kernel_img_HEADERS += datetime.h emu/misc.h
 kernel_img_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-undef -I$(srcdir)/gnulib
@@ -85,7 +86,7 @@ endif
 
 ifeq ($(enable_grub_emu_pci), yes)
 pkglib_MODULES += pci.mod
-pci_mod_SOURCES = util/pci.c commands/lspci.c
+pci_mod_SOURCES = bus/emu/pci.c commands/lspci.c
 pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 grub_emu_LDFLAGS += $(LIBPCIACCESS)
 kernel_img_HEADERS += libpciaccess.h
@@ -104,13 +105,8 @@ DISTCLEANFILES += grub_emu_init.c
 CLEANFILES += grub-emu
 ifneq ($(TARGET_NO_MODULES), yes)
 grub-emu: $(pkglib_PROGRAMS)
-	$(CC) -o $@ $(pkglib_PROGRAMS) $(grub_emu_LDFLAGS) $(LDFLAGS)
+	$(CC) -o $@ $^ $(grub_emu_LDFLAGS) $(LDFLAGS)
 else
-
-pkglib_MODULES += emu.mod
-emu_mod_SOURCES = kern/emu/main.c
-emu_mod_CFLAGS = -I$(srcdir)/gnulib
-
 grub-emu: $(pkglib_MODULES) $(pkglib_PROGRAMS)
 	$(CC) -o $@ $^ $(grub_emu_LDFLAGS) $(LDFLAGS)
 endif
diff --git a/include/grub/dl.h b/include/grub/dl.h
index cfb7c2f99..cf5da7fd5 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -96,23 +96,8 @@ void grub_dl_unload_all (void);
 #else
 #define GRUB_NO_MODULES 0
 #endif
-#if GRUB_NO_MODULES
-static inline int
-grub_dl_ref (grub_dl_t mod)
-{
-  (void) mod;
-  return 0;
-}
-static inline int
-grub_dl_unref (grub_dl_t mod)
-{
-  (void) mod;
-  return 0;
-}
-#else
 int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);
 int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);
-#endif
 void EXPORT_FUNC(grub_dl_iterate) (int (*hook) (grub_dl_t mod));
 grub_dl_t EXPORT_FUNC(grub_dl_get) (const char *name);
 grub_err_t grub_dl_register_symbol (const char *name, void *addr,
diff --git a/kern/dl.c b/kern/dl.c
index 19ee13243..c6a038cfa 100644
--- a/kern/dl.c
+++ b/kern/dl.c
@@ -469,12 +469,14 @@ grub_dl_resolve_dependencies (grub_dl_t mod, Elf_Ehdr *e)
   return GRUB_ERR_NONE;
 }
 
-#if !GRUB_NO_MODULES
 int
 grub_dl_ref (grub_dl_t mod)
 {
   grub_dl_dep_t dep;
 
+  if (!mod)
+    return 0;
+
   for (dep = mod->dep; dep; dep = dep->next)
     grub_dl_ref (dep->mod);
 
@@ -486,12 +488,14 @@ grub_dl_unref (grub_dl_t mod)
 {
   grub_dl_dep_t dep;
 
+  if (!mod)
+    return 0;
+
   for (dep = mod->dep; dep; dep = dep->next)
     grub_dl_unref (dep->mod);
 
   return --mod->ref_count;
 }
-#endif
 
 static void
 grub_dl_flush_cache (grub_dl_t mod)
diff --git a/kern/emu/cache.S b/kern/emu/cache.S
deleted file mode 100644
index 087b2b495..000000000
--- a/kern/emu/cache.S
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef GRUB_MACHINE_EMU
-#error "This source is only meant for grub-emu platform"
-#endif
-
-#if GRUB_CPU_I386
-#elif GRUB_CPU_X86_64
-#elif GRUB_CPU_SPARC64
-#include "../sparc64/cache.S"
-#elif GRUB_CPU_MIPS
-#include "../mips/cache.S"
-#elif GRUB_CPU_MIPSEL
-#include "../mips/cache.S"
-#elif GRUB_CPU_POWERPC
-#include "../powerpc/cache.S"
-#else
-#error "No target cpu type is defined"
-#endif
diff --git a/kern/emu/dummy/dl.c b/kern/emu/dummy/dl.c
deleted file mode 100644
index 8e9fabfc2..000000000
--- a/kern/emu/dummy/dl.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2010  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 <config.h>
-#include <grub/dl.h>
-
-grub_err_t
-grub_arch_dl_check_header (void *ehdr)
-{
-  (void) ehdr;
-
-  return GRUB_ERR_BAD_MODULE;
-}
-
-grub_err_t
-grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
-{
-  (void) mod;
-  (void) ehdr;
-
-  return GRUB_ERR_BAD_MODULE;
-}
-
-/* int */
-/* grub_dl_ref (grub_dl_t mod) */
-/* {  */
-/*   (void) mod; */
-/*   return 0; */
-/* } */
-
-/* int */
-/* grub_dl_unref (grub_dl_t mod) */
-/* {  */
-/*   (void) mod; */
-/*   return 0; */
-/* } */
diff --git a/kern/emu/lite.c b/kern/emu/lite.c
deleted file mode 100644
index 1f06e39dc..000000000
--- a/kern/emu/lite.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <config.h>
-#include <grub/emu/misc.h>
-
-/* grub-emu-lite supports dynamic module loading, so it won't have any
-   embedded modules.  */
-void
-grub_init_all(void)
-{
-  return;
-}
-
-void
-grub_fini_all(void)
-{
-  return;
-}
diff --git a/kern/emu/main.c b/kern/emu/main.c
index 978919f2a..c9b1d6595 100644
--- a/kern/emu/main.c
+++ b/kern/emu/main.c
@@ -27,6 +27,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <grub/dl.h>
 #include <grub/mm.h>
 #include <grub/setjmp.h>
 #include <grub/fs.h>
diff --git a/util/misc.c b/util/misc.c
index 17fa6d5e4..c413352e7 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -564,3 +564,17 @@ grub_util_init_nls (void)
 #endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
 }
 #endif
+
+int
+grub_dl_ref (grub_dl_t mod)
+{
+  (void) mod;
+  return 0;
+}
+
+int
+grub_dl_unref (grub_dl_t mod)
+{
+  (void) mod;
+  return 0;
+}

From 13ac43057bcac4644bc50e572c804c7e04470a49 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 27 Apr 2010 11:08:53 +0200
Subject: [PATCH 0845/1628] use uuids on efi

---
 kern/efi/init.c       | 76 +++++++++++++++++++++++++++----------------
 util/grub-mkrescue.in | 24 +++++++++++---
 2 files changed, 67 insertions(+), 33 deletions(-)

diff --git a/kern/efi/init.c b/kern/efi/init.c
index afd21055d..b79084a6a 100644
--- a/kern/efi/init.c
+++ b/kern/efi/init.c
@@ -24,6 +24,7 @@
 #include <grub/misc.h>
 #include <grub/env.h>
 #include <grub/mm.h>
+#include <grub/kernel.h>
 
 void
 grub_efi_init (void)
@@ -41,39 +42,58 @@ grub_efi_init (void)
 void
 grub_efi_set_prefix (void)
 {
-  grub_efi_loaded_image_t *image;
+  grub_efi_loaded_image_t *image = NULL;
+  char *device = NULL;
+  char *path = NULL;
 
-  image = grub_efi_get_loaded_image (grub_efi_image_handle);
-  if (image)
+  {
+    char *pptr = NULL;
+    if (grub_prefix[0] == '(')
+      {
+	pptr = grub_strrchr (grub_prefix, ')');
+	if (pptr)
+	  {
+	    device = grub_strndup (grub_prefix + 1, pptr - grub_prefix - 1);
+	    pptr++;
+	  }
+      }
+    if (!pptr)
+      pptr = grub_prefix;
+    if (pptr[0])
+      path = grub_strdup (pptr);
+  }
+
+  if (!device || !path)
+    image = grub_efi_get_loaded_image (grub_efi_image_handle);
+  if (image && !device)
+    device = grub_efidisk_get_device_name (image->device_handle);
+
+  if (image && !path)
     {
-      char *device;
-      char *file;
+      char *p;
 
-      device = grub_efidisk_get_device_name (image->device_handle);
-      file = grub_efi_get_filename (image->file_path);
+      path = grub_efi_get_filename (image->file_path);
 
-      if (device && file)
-	{
-	  char *p;
-	  char *prefix;
-
-	  /* Get the directory.  */
-	  p = grub_strrchr (file, '/');
-	  if (p)
-	    *p = '\0';
-
-	  prefix = grub_xasprintf ("(%s)%s", device, file);
-	  if (prefix)
-	    {
-	      
-	      grub_env_set ("prefix", prefix);
-	      grub_free (prefix);
-	    }
-	}
-
-      grub_free (device);
-      grub_free (file);
+      /* Get the directory.  */
+      p = grub_strrchr (path, '/');
+      if (p)
+	*p = '\0';
     }
+
+  if (device && path)
+    {
+      char *prefix;
+
+      prefix = grub_xasprintf ("(%s)%s", device, path);
+      if (prefix)
+	{
+	  grub_env_set ("prefix", prefix);
+	  grub_free (prefix);
+	}
+    }
+
+  grub_free (device);
+  grub_free (path);
 }
 
 void
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index cf791d108..0265f9b81 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -150,14 +150,16 @@ else
     esac
 fi
 
+# obtain date-based UUID
+iso_uuid=$(date -u +%Y-%m-%d-%H-%M-%S-00)
+grub_mkisofs_arguments="${grub_mkisofs_arguments} --modification-date=$(echo ${iso_uuid} | sed -e s/-//g)"
+
 # build coreboot core.img
 if test -e "${coreboot_dir}" ; then
     echo "Enabling coreboot support ..."
     memdisk_img=`mktemp "$MKTEMP_TEMPLATE"`
     memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
     mkdir -p ${memdisk_dir}/boot/grub
-    # obtain date-based UUID
-    iso_uuid=$(date -u +%Y-%m-%d-%H-%M-%S-00)
 
     modules="$(cat ${coreboot_dir}/partmap.lst) ${modules}"
     cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
@@ -176,7 +178,6 @@ EOF
         memdisk tar search iso9660 configfile sh \
         ata at_keyboard
     rm -f ${memdisk_img}
-    grub_mkisofs_arguments="${grub_mkisofs_arguments} --modification-date=$(echo ${iso_uuid} | sed -e s/-//g)"
 fi
 
 # build BIOS core.img
@@ -213,8 +214,21 @@ fi
 # build bootx64.efi
 if test -e "${efi64_dir}" ; then
     echo "Enabling EFI64 support ..."
-    grub-mkimage -O x86_64-efi -d "${efi64_dir}" -o "${efi_dir}"/efi/boot/bootx64.efi --prefix=/boot/grub/x86_64-efi \
-        search iso9660 configfile sh 
+    memdisk_img=`mktemp "$MKTEMP_TEMPLATE"`
+    memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
+    mkdir -p ${memdisk_dir}/boot/grub
+
+    cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
+search --fs-uuid --set ${iso_uuid}
+set prefix=(\${root})/boot/grub/${target_cpu}-efi
+EOF
+
+    tar -C ${memdisk_dir} -cf ${memdisk_img} boot
+    rm -rf ${memdisk_dir}
+
+    grub-mkimage -O x86_64-efi -d "${efi64_dir}" -m "${memdisk_img}" -o "${efi_dir}"/efi/boot/bootx64.efi --prefix='(memdisk)/boot/grub' \
+        search iso9660 configfile sh memdisk tar
+    rm -f ${memdisk_img}
 
     modules="$(cat "${efi64_dir}"/partmap.lst) ${modules}"
     (for i in ${modules} ; do

From ff6bea78b442acb7e2304d9ae7c78a94237422e2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 27 Apr 2010 13:22:38 +0200
Subject: [PATCH 0846/1628] Enable pathspecs

---
 util/grub-mkrescue.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 0265f9b81..9b319ac27 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -245,7 +245,7 @@ if test x"${efi_dir}" != x; then
 fi
 
 # build iso image
-xorrisofs ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} ${source}
+xorriso -pathspecs on -as mkisofs ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} ${source}
 rm -rf ${iso9660_dir}
 
 rm -f ${embed_img}

From 6adde6749e034c0d718b974e6274f5a175330853 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 27 Apr 2010 13:23:11 +0200
Subject: [PATCH 0847/1628] efi boottests

---
 conf/i386-efi.rmk        | 2 ++
 conf/i386-pc.rmk         | 5 +++--
 conf/i386.rmk            | 8 ++++----
 conf/x86-efi.rmk         | 2 ++
 conf/x86_64-efi.rmk      | 2 ++
 tests/util/grub-shell.in | 6 ++++--
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index e826cb333..b50c77d3c 100644
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -2,4 +2,6 @@
 
 COMMON_LDFLAGS = -melf_i386
 
+QEMU32=qemu-system-i386
+
 include $(srcdir)/conf/x86-efi.mk
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 801caba28..1888c2afb 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -292,12 +292,13 @@ pkglib_DATA += efiemu32.o efiemu64.o
 endif
 
 BOOTTARGET=cd
+QEMU32=qemu-system-i386
 
 bootcheck-linux16-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg grub-shell
-	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 bootcheck-linux16-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg grub-shell
-	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 BOOTCHECKS+=bootcheck-linux16-i386 bootcheck-linux16-x86_64
 
diff --git a/conf/i386.rmk b/conf/i386.rmk
index a3f79dd43..9cec10a80 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -89,16 +89,16 @@ kfreebsd-mfsroot.%: kfreebsd.init.% Makefile
 CLEANFILES += linux.init.i386 kfreebsd.init.i386 linux.init.x86_64 linux-initramfs.i386 linux-initramfs.x86_64
 
 bootcheck-kfreebsd-i386: kfreebsd-mfsroot.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
-	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/mfsroot=kfreebsd-mfsroot.i386 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.i386 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/mfsroot=kfreebsd-mfsroot.i386 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.i386 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 bootcheck-kfreebsd-x86_64: kfreebsd-mfsroot.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
-	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/mfsroot=kfreebsd-mfsroot.x86_64 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/mfsroot=kfreebsd-mfsroot.x86_64 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 bootcheck-linux-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg grub-shell
-	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 bootcheck-linux-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg grub-shell
-	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 BOOTCHECKS += bootcheck-linux-i386 bootcheck-linux-x86_64 \
 	bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64
diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index 286ba988e..61d225bc7 100644
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -104,5 +104,7 @@ xnu_mod_CFLAGS = $(COMMON_CFLAGS)
 xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
 xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
+BOOTTARGET=cd
+
 include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk
diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 200621280..5ef3cc434 100644
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -2,4 +2,6 @@
 
 COMMON_LDFLAGS = -melf_x86_64
 
+QEMU32=qemu-system-x86_64
+
 include $(srcdir)/conf/x86-efi.mk
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 5726ec0d8..1ff562096 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -145,8 +145,10 @@ if [ x$boot = xfd ]; then
     device=fda
     bootdev=a
 fi
-${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} -boot ${bootdev} | tr -d "\r"
-rm -f ${isofile}
+
+echo ${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} -boot ${bootdev}
+#${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} -boot ${bootdev} | tr -d "\r"
+#rm -f ${isofile}
 
 rm -f ${tmpfile} ${cfgfile}
 exit 0

From 613b1b2c586be4b77e0e4f536e800c8213e4a8fc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 27 Apr 2010 13:44:39 +0200
Subject: [PATCH 0848/1628] Include /grub.cfg

---
 util/grub-mkrescue.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 9b319ac27..4f151ac98 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -165,6 +165,7 @@ if test -e "${coreboot_dir}" ; then
     cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
 search --fs-uuid --set ${iso_uuid}
 set prefix=(\${root})/boot/grub/${target_cpu}-coreboot
+source $prefix/grub.cfg
 EOF
     (for i in ${modules} ; do
         echo "insmod $i"
@@ -221,6 +222,7 @@ if test -e "${efi64_dir}" ; then
     cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
 search --fs-uuid --set ${iso_uuid}
 set prefix=(\${root})/boot/grub/${target_cpu}-efi
+source $prefix/grub.cfg
 EOF
 
     tar -C ${memdisk_dir} -cf ${memdisk_img} boot

From d534028780bc8aa39231a3d10ef811322feda2b8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 27 Apr 2010 13:45:08 +0200
Subject: [PATCH 0849/1628] Remove debugging leftovers

---
 tests/util/grub-shell.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 1ff562096..d8ea588a7 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -146,9 +146,8 @@ if [ x$boot = xfd ]; then
     bootdev=a
 fi
 
-echo ${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} -boot ${bootdev}
-#${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} -boot ${bootdev} | tr -d "\r"
-#rm -f ${isofile}
+${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} -boot ${bootdev} | tr -d "\r"
+rm -f ${isofile}
 
 rm -f ${tmpfile} ${cfgfile}
 exit 0

From f07ccea799dc9ebc632a44313ad2e94ea55f9efb Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 27 Apr 2010 20:55:12 +0530
Subject: [PATCH 0850/1628] removed some duplicate code

---
 conf/any-emu.rmk         |   6 +-
 conf/common.rmk          |  23 +++---
 disk/lvm.c               |   2 +-
 include/grub/emu/misc.h  |  10 +++
 include/grub/util/misc.h |  35 +--------
 kern/emu/misc.c          |  98 +++++++++---------------
 {util => kern/emu}/mm.c  |   5 --
 util/grub-mkrelpath.c    |   1 +
 util/grub-probe.c        |   2 +-
 util/misc.c              | 157 ---------------------------------------
 10 files changed, 64 insertions(+), 275 deletions(-)
 rename {util => kern/emu}/mm.c (92%)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index ffaabcd2f..cb0ec873f 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -10,9 +10,9 @@ kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c kern/env.c	\
 	kern/parser.c kern/partition.c kern/term.c			\
 	kern/rescue_reader.c kern/rescue_parser.c			\
 									\
-	kern/emu/main.c kern/emu/misc.c kern/emu/getroot.c		\
-	kern/emu/time.c kern/emu/hostdisk.c kern/emu/hostfs.c		\
-	kern/emu/console.c						\
+	kern/emu/main.c kern/emu/mm.c kern/emu/misc.c			\
+	kern/emu/getroot.c kern/emu/time.c kern/emu/hostdisk.c		\
+	kern/emu/hostfs.c kern/emu/console.c				\
 									\
 	gnulib/progname.c disk/host.c
 kernel_img_HEADERS += datetime.h emu/misc.h
diff --git a/conf/common.rmk b/conf/common.rmk
index 6267d7818..a08e0d3c0 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -6,7 +6,7 @@ script/lexer.c_DEPENDENCIES = grub_script.tab.h
 sbin_UTILITIES += grub-mkdevicemap
 grub_mkdevicemap_SOURCES = gnulib/progname.c util/grub-mkdevicemap.c \
 	util/deviceiter.c \
-	util/misc.c
+	util/misc.c kern/emu/misc.c
 
 ifeq ($(target_cpu)-$(platform), sparc64-ieee1275)
 grub_mkdevicemap_SOURCES += util/ieee1275/ofpath.c util/ieee1275/devicemap.c
@@ -16,16 +16,15 @@ endif
 
 # For grub-mkelfimage.
 bin_UTILITIES += grub-mkelfimage
-grub_mkelfimage_SOURCES = gnulib/progname.c \
-	util/elf/grub-mkimage.c util/misc.c \
-	util/resolve.c
+grub_mkelfimage_SOURCES = gnulib/progname.c util/elf/grub-mkimage.c	\
+	util/misc.c kern/emu/misc.c util/resolve.c
 util/elf/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # For grub-probe.
 sbin_UTILITIES += grub-probe
 util/grub-probe.c_DEPENDENCIES = grub_probe_init.h
 grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c	\
-	kern/emu/hostdisk.c util/misc.c kern/emu/getroot.c util/mm.c	\
+	kern/emu/hostdisk.c util/misc.c kern/emu/misc.c kern/emu/getroot.c kern/emu/mm.c	\
 	kern/device.c kern/disk.c kern/err.c kern/misc.c	\
 	kern/parser.c kern/partition.c kern/file.c kern/list.c	\
 	\
@@ -61,7 +60,7 @@ grub_mkisofs_CFLAGS = -D_FILE_OFFSET_BITS=64 				\
 # For grub-fstest.
 util/grub-fstest.c_DEPENDENCIES = grub_fstest_init.h
 grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c kern/emu/hostfs.c \
-	util/misc.c util/mm.c 	\
+	util/misc.c kern/emu/misc.c kern/emu/mm.c 	\
 	kern/file.c kern/device.c kern/disk.c kern/err.c kern/misc.c	\
 	disk/host.c disk/loopback.c kern/list.c kern/command.c		\
 	lib/arg.c commands/extcmd.c normal/datetime.c normal/misc.c	\
@@ -83,14 +82,14 @@ grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c kern/emu/hostfs.c \
 # For grub-mkfont.
 ifeq ($(enable_grub_mkfont), yes)
 bin_UTILITIES += grub-mkfont
-grub_mkfont_SOURCES = gnulib/progname.c util/grub-mkfont.c util/misc.c
+grub_mkfont_SOURCES = gnulib/progname.c util/grub-mkfont.c util/misc.c kern/emu/misc.c
 grub_mkfont_CFLAGS = $(freetype_cflags)
 grub_mkfont_LDFLAGS = $(freetype_libs)
 endif
 
 # For grub-mkrelpath.
 bin_UTILITIES += grub-mkrelpath
-grub_mkrelpath_SOURCES = gnulib/progname.c util/grub-mkrelpath.c util/misc.c
+grub_mkrelpath_SOURCES = gnulib/progname.c util/grub-mkrelpath.c util/misc.c kern/emu/misc.c
 
 bin_UTILITIES += grub-bin2h
 grub_bin2h_SOURCES = gnulib/progname.c util/bin2h.c
@@ -104,7 +103,7 @@ DISTCLEANFILES += grub_script.yy.c grub_script.yy.h
 bin_UTILITIES += grub-script-check
 util/grub-script-check.c_DEPENDENCIES = grub_script_check_init.h
 grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c \
-	util/grub-script-check.c util/misc.c util/mm.c \
+	util/grub-script-check.c util/misc.c kern/emu/misc.c kern/emu/mm.c \
 	script/main.c script/script.c script/function.c script/lexer.c \
 	kern/handler.c kern/err.c kern/parser.c kern/list.c \
 	kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c \
@@ -187,7 +186,7 @@ DISTCLEANFILES += grub_fstest_init.c
 
 # for grub-editenv
 bin_UTILITIES += grub-editenv
-grub_editenv_SOURCES = gnulib/progname.c util/grub-editenv.c lib/envblk.c util/misc.c util/mm.c kern/misc.c kern/err.c
+grub_editenv_SOURCES = gnulib/progname.c util/grub-editenv.c lib/envblk.c util/misc.c kern/emu/misc.c kern/emu/mm.c kern/misc.c kern/err.c
 CLEANFILES += grub-editenv
 
 # Needed for genmk.rb to work
@@ -195,7 +194,7 @@ ifeq (0,1)
 bin_UTILITIES += grub-macho2img grub-pe2elf
 endif
 
-grub_pe2elf_SOURCES = gnulib/progname.c util/grub-pe2elf.c util/misc.c
+grub_pe2elf_SOURCES = gnulib/progname.c util/grub-pe2elf.c util/misc.c kern/emu/misc.c
 CLEANFILES += grub-pe2elf
 
 grub_macho2img_SOURCES = util/grub-macho2img.c
@@ -855,7 +854,7 @@ boot_mod_CFLAGS = $(COMMON_CFLAGS)
 boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 bin_UTILITIES += grub-mkpasswd-pbkdf2
-grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c util/mm.c kern/err.c
+grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/emu/misc.c kern/emu/mm.c kern/err.c
 grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap -DGRUB_MKPASSWD=1
 
 include $(srcdir)/conf/gcry.mk
diff --git a/disk/lvm.c b/disk/lvm.c
index c2ae82df2..7dde40920 100644
--- a/disk/lvm.c
+++ b/disk/lvm.c
@@ -25,7 +25,7 @@
 #include <grub/lvm.h>
 
 #ifdef GRUB_UTIL
-#include <grub/util/misc.h>
+#include <grub/emu/misc.h>
 #endif
 
 static struct grub_lvm_vg *vg_list;
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index e62aeba08..4e4df2ad2 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -28,4 +28,14 @@ void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...);
 void EXPORT_FUNC(grub_util_info) (const char *fmt, ...);
 void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((noreturn));
 
+#ifndef HAVE_VASPRINTF
+int EXPORT_FUNC(vasprintf) (char **buf, const char *fmt, va_list ap);
+#endif
+
+#ifndef  HAVE_ASPRINTF
+int EXPORT_FUNC(asprintf) (char **buf, const char *fmt, ...);
+#endif
+
+char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
+
 #endif /* GRUB_EMU_MISC_H */
diff --git a/include/grub/util/misc.h b/include/grub/util/misc.h
index 8b78b92ea..48dfbb868 100644
--- a/include/grub/util/misc.h
+++ b/include/grub/util/misc.h
@@ -28,26 +28,7 @@
 #include <config.h>
 #include <grub/types.h>
 #include <grub/symbol.h>
-
-#ifdef __NetBSD__
-/* NetBSD uses /boot for its boot block.  */
-# define DEFAULT_DIRECTORY	"/grub"
-#else
-# define DEFAULT_DIRECTORY	"/boot/grub"
-#endif
-
-#define DEFAULT_DEVICE_MAP	DEFAULT_DIRECTORY "/device.map"
-
-extern char *progname;
-extern int verbosity;
-
-void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...);
-void EXPORT_FUNC(grub_util_info) (const char *fmt, ...);
-void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((noreturn));
-
-void *xmalloc (size_t size);
-void *xrealloc (void *ptr, size_t size);
-char *xstrdup (const char *str);
+#include <grub/emu/misc.h>
 
 char *grub_util_get_path (const char *dir, const char *file);
 size_t grub_util_get_fp_size (FILE *fp);
@@ -59,20 +40,6 @@ void grub_util_write_image (const char *img, size_t size, FILE *out);
 void grub_util_write_image_at (const void *img, size_t size, off_t offset,
 			       FILE *out);
 
-#ifndef HAVE_VASPRINTF
-
-int vasprintf (char **buf, const char *fmt, va_list ap);
-
-#endif
-
-#ifndef  HAVE_ASPRINTF
-
-int asprintf (char **buf, const char *fmt, ...);
-
-#endif
-
-char *xasprintf (const char *fmt, ...);
-
 #ifdef __MINGW32__
 
 #define fseeko fseeko64
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index d8dfc938d..999cdf257 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -62,70 +62,14 @@ grub_util_error (const char *fmt, ...)
   exit (1);
 }
 
-void *
-grub_malloc (grub_size_t size)
-{
-  return malloc (size);
-}
-
-void *
-grub_zalloc (grub_size_t size)
-{
-  void *ret;
-
-  ret = malloc (size);
-  memset (ret, 0, size);
-  return ret;
-}
-
-void
-grub_free (void *ptr)
-{
-  free (ptr);
-}
-
-void *
-grub_realloc (void *ptr, grub_size_t size)
-{
-  return realloc (ptr, size);
-}
-
-void *
-grub_memalign (grub_size_t align, grub_size_t size)
-{
-  void *p;
-
-#if defined(HAVE_POSIX_MEMALIGN)
-  if (align < sizeof (void *))
-    align = sizeof (void *);
-
-  else if (align % sizeof (void *))
-    grub_fatal ("bad alignment");
-
-  if (posix_memalign (&p, align, size) != 0)
-    p = 0;
-#elif defined(HAVE_MEMALIGN)
-  p = memalign (align, size);
-#else
-  (void) align;
-  (void) size;
-  grub_fatal ("grub_memalign is not supported");
-#endif
-
-  if (! p)
-    grub_fatal ("out of memory");
-
-  return p;
-}
-
 void *
 xmalloc (grub_size_t size)
 {
   void *p;
 
-  p = grub_malloc (size);
+  p = malloc (size);
   if (! p)
-    grub_fatal ("out of memory");
+    grub_util_error ("out of memory");
 
   return p;
 }
@@ -133,9 +77,9 @@ xmalloc (grub_size_t size)
 void *
 xrealloc (void *ptr, grub_size_t size)
 {
-  ptr = grub_realloc (ptr, size);
+  ptr = realloc (ptr, size);
   if (! ptr)
-    grub_fatal ("out of memory");
+    grub_util_error ("out of memory");
 
   return ptr;
 }
@@ -146,13 +90,43 @@ xstrdup (const char *str)
   size_t len;
   char *newstr;
 
-  len = grub_strlen (str);
+  len = strlen (str);
   newstr = (char *) xmalloc (len + 1);
-  grub_memcpy (newstr, str, len + 1);
+  memcpy (newstr, str, len + 1);
 
   return newstr;
 }
 
+#ifndef HAVE_VASPRINTF
+
+int
+vasprintf (char **buf, const char *fmt, va_list ap)
+{
+  /* Should be large enough.  */
+  *buf = xmalloc (512);
+
+  return vsprintf (*buf, fmt, ap);
+}
+
+#endif
+
+#ifndef  HAVE_ASPRINTF
+
+int
+asprintf (char **buf, const char *fmt, ...)
+{
+  int status;
+  va_list ap;
+
+  va_start (ap, fmt);
+  status = vasprintf (*buf, fmt, ap);
+  va_end (ap);
+
+  return status;
+}
+
+#endif
+
 char *
 xasprintf (const char *fmt, ...)
 { 
diff --git a/util/mm.c b/kern/emu/mm.c
similarity index 92%
rename from util/mm.c
rename to kern/emu/mm.c
index 0e9e9f3a8..803c1c9aa 100644
--- a/util/mm.c
+++ b/kern/emu/mm.c
@@ -55,8 +55,6 @@ grub_realloc (void *ptr, grub_size_t size)
 {
   void *ret;
   ret = realloc (ptr, size);
-  if (!ret)
-    grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
   return ret;
 }
 
@@ -78,8 +76,5 @@ grub_memalign (grub_size_t align, grub_size_t size)
   grub_util_error ("grub_memalign is not supported");
 #endif
 
-  if (!p)
-    grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
-
   return p;
 }
diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c
index 327f0c866..c26fa7b67 100644
--- a/util/grub-mkrelpath.c
+++ b/util/grub-mkrelpath.c
@@ -17,6 +17,7 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
 #include <grub/util/misc.h>
 #include <grub/i18n.h>
 #include <getopt.h>
diff --git a/util/grub-probe.c b/util/grub-probe.c
index 1b2606dc7..add942fb4 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include <grub/types.h>
-#include <grub/emu/misc.h>
+#include <grub/util/misc.h>
 #include <grub/util/misc.h>
 #include <grub/device.h>
 #include <grub/disk.h>
diff --git a/util/misc.c b/util/misc.c
index c413352e7..d26e51bbf 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -58,53 +58,6 @@
 #include <winioctl.h>
 #endif
 
-int verbosity = 0;
-
-void
-grub_util_warn (const char *fmt, ...)
-{
-  va_list ap;
-
-  fprintf (stderr, _("%s: warn:"), program_name);
-  fprintf (stderr, " ");
-  va_start (ap, fmt);
-  vfprintf (stderr, fmt, ap);
-  va_end (ap);
-  fprintf (stderr, ".\n");
-  fflush (stderr);
-}
-
-void
-grub_util_info (const char *fmt, ...)
-{
-  if (verbosity > 0)
-    {
-      va_list ap;
-
-      fprintf (stderr, _("%s: info:"), program_name);
-      fprintf (stderr, " ");
-      va_start (ap, fmt);
-      vfprintf (stderr, fmt, ap);
-      va_end (ap);
-      fprintf (stderr, ".\n");
-      fflush (stderr);
-    }
-}
-
-void
-grub_util_error (const char *fmt, ...)
-{
-  va_list ap;
-
-  fprintf (stderr, _("%s: error:"), program_name);
-  fprintf (stderr, " ");
-  va_start (ap, fmt);
-  vfprintf (stderr, fmt, ap);
-  va_end (ap);
-  fprintf (stderr, ".\n");
-  exit (1);
-}
-
 #ifdef GRUB_UTIL
 int
 grub_err_printf (const char *fmt, ...)
@@ -120,41 +73,6 @@ grub_err_printf (const char *fmt, ...)
 }
 #endif
 
-void *
-xmalloc (size_t size)
-{
-  void *p;
-
-  p = malloc (size);
-  if (! p)
-    grub_util_error ("out of memory");
-
-  return p;
-}
-
-void *
-xrealloc (void *ptr, size_t size)
-{
-  ptr = realloc (ptr, size);
-  if (! ptr)
-    grub_util_error ("out of memory");
-
-  return ptr;
-}
-
-char *
-xstrdup (const char *str)
-{
-  size_t len;
-  char *newstr;
-
-  len = strlen (str);
-  newstr = (char *) xmalloc (len + 1);
-  memcpy (newstr, str, len + 1);
-
-  return newstr;
-}
-
 char *
 grub_util_get_path (const char *dir, const char *file)
 {
@@ -277,34 +195,6 @@ grub_register_exported_symbols (void)
 }
 #endif
 
-void
-grub_exit (void)
-{
-  exit (1);
-}
-
-grub_uint32_t
-grub_get_rtc (void)
-{
-  struct timeval tv;
-
-  gettimeofday (&tv, 0);
-
-  return (tv.tv_sec * GRUB_TICKS_PER_SECOND
-	  + (((tv.tv_sec % GRUB_TICKS_PER_SECOND) * 1000000 + tv.tv_usec)
-	     * GRUB_TICKS_PER_SECOND / 1000000));
-}
-
-grub_uint64_t
-grub_get_time_ms (void)
-{
-  struct timeval tv;
-
-  gettimeofday (&tv, 0);
-
-  return (tv.tv_sec * 1000 + tv.tv_usec / 1000);
-}
-
 #ifdef __MINGW32__
 
 void
@@ -335,53 +225,6 @@ grub_arch_sync_caches (void *address __attribute__ ((unused)),
 }
 #endif
 
-#ifndef HAVE_VASPRINTF
-
-int
-vasprintf (char **buf, const char *fmt, va_list ap)
-{
-  /* Should be large enough.  */
-  *buf = xmalloc (512);
-
-  return vsprintf (*buf, fmt, ap);
-}
-
-#endif
-
-#ifndef  HAVE_ASPRINTF
-
-int
-asprintf (char **buf, const char *fmt, ...)
-{
-  int status;
-  va_list ap;
-
-  va_start (ap, fmt);
-  status = vasprintf (*buf, fmt, ap);
-  va_end (ap);
-
-  return status;
-}
-
-#endif
-
-char *
-xasprintf (const char *fmt, ...)
-{
-  va_list ap;
-  char *result;
-
-  va_start (ap, fmt);
-  if (vasprintf (&result, fmt, ap) < 0)
-    {
-      if (errno == ENOMEM)
-	grub_util_error ("out of memory");
-      return NULL;
-    }
-
-  return result;
-}
-
 #ifdef __MINGW32__
 
 void sync (void)

From 95327fc92dbdb567fd4980f9144e324e425d32e2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 27 Apr 2010 17:25:32 +0200
Subject: [PATCH 0851/1628] Fix blocker counter

---
 lib/relocator.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/relocator.c b/lib/relocator.c
index eac290c97..4c180e72a 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -446,6 +446,8 @@ malloc_in_range (struct grub_relocator *rel,
     for (cur = extra_blocks; cur; cur = cur->next)
       maxevents += 2;
   }
+  for (r = grub_mm_base; r; r = r->next)
+    maxevents += 2;
 
   maxevents += grub_relocator_firmware_get_max_events ();
 
@@ -791,6 +793,8 @@ malloc_in_range (struct grub_relocator *rel,
 		      fend
 			= ALIGN_UP (alloc_end,
 				    GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
+		      grub_dprintf ("relocator", "requesting %lx-%lx\n",
+				    fstart, fend);
 		      /* The failure here can be very expensive.  */
 		      if (!grub_relocator_firmware_alloc_region (fstart, 
 								 fend - fstart))

From b84cac2a36828b701a3f8125b8f9e4f9a2db0dc0 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 27 Apr 2010 20:59:45 +0530
Subject: [PATCH 0852/1628] undo some hunks that were removed by mistake

---
 kern/emu/mm.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kern/emu/mm.c b/kern/emu/mm.c
index 803c1c9aa..0e9e9f3a8 100644
--- a/kern/emu/mm.c
+++ b/kern/emu/mm.c
@@ -55,6 +55,8 @@ grub_realloc (void *ptr, grub_size_t size)
 {
   void *ret;
   ret = realloc (ptr, size);
+  if (!ret)
+    grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
   return ret;
 }
 
@@ -76,5 +78,8 @@ grub_memalign (grub_size_t align, grub_size_t size)
   grub_util_error ("grub_memalign is not supported");
 #endif
 
+  if (!p)
+    grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
+
   return p;
 }

From dc106194612b2a60e8759aaa3a5cc887ae145a3d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 27 Apr 2010 21:41:22 +0200
Subject: [PATCH 0853/1628] Add midding qemu-opts

---
 conf/i386.rmk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/i386.rmk b/conf/i386.rmk
index c18ce9699..9007b2889 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -145,10 +145,10 @@ bootcheck-kfreebsd-x86_64: kfreebsd-mfsroot.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/mfsroot=kfreebsd-mfsroot.x86_64 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 bootcheck-knetbsd-i386: knetbsd.miniroot-image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg knetbsd.miniroot-image.i386 grub-shell
-	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/miniroot=knetbsd.miniroot-image.i386 --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/miniroot=knetbsd.miniroot-image.i386 --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 bootcheck-knetbsd-x86_64: knetbsd.miniroot-image.x86_64 $(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/tests/boot/knetbsd.cfg knetbsd.miniroot-image.x86_64 grub-shell
-	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/miniroot=knetbsd.miniroot-image.x86_64 --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/miniroot=knetbsd.miniroot-image.x86_64 --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 bootcheck-linux-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null

From 708745c8a74cbb7aa004fa400cb710e578cf0b8e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 27 Apr 2010 21:42:15 +0200
Subject: [PATCH 0854/1628] Shutdown manually

---
 tests/boot/kfreebsd.init-i386.S   | 42 ++++++++++++++++++++++++++++++-
 tests/boot/kfreebsd.init-x86_64.S | 40 +++++++++++++++++++++++++++--
 tests/boot/knetbsd.init-x86_64.S  | 31 ++++++++++++++++++++++-
 tests/boot/linux.init-i386.S      | 25 ++++++++++++++++++
 4 files changed, 134 insertions(+), 4 deletions(-)

diff --git a/tests/boot/kfreebsd.init-i386.S b/tests/boot/kfreebsd.init-i386.S
index 8812b650b..12c94a036 100644
--- a/tests/boot/kfreebsd.init-i386.S
+++ b/tests/boot/kfreebsd.init-i386.S
@@ -21,12 +21,16 @@
 #define SYSCALL_OPEN 5
 #define SYSCALL_WRITE 4
 #define SYSCALL_RESET 55
+#define SYSCALL_FSYNC 95
+#define SYSCALL_ARCH 165
 #define SYSCALL_EXIT 1
+#define SYSCALL_ARCH_IOPL	4
 #define SYSCALL_INT 0x80
 
 #define RESET_NOSYNC 0x4
 #define RESET_HALT 0x8
 #define RESET_POWEROFF 0x4000
+#define SHUTDOWN_PORT 0x8900
 
 	.section ".init", "ax"
 	.global start,_start
@@ -52,6 +56,39 @@ _start:
 	pushl $0
 	int $SYSCALL_INT
 	addl $16, %esp
+
+	/* fsync.  */
+	movl $SYSCALL_FSYNC, %eax
+	pushl %ecx
+	pushl $0
+	int $SYSCALL_INT
+	addl $8, %esp
+
+	/* IOPL.  */
+	movl $SYSCALL_ARCH, %eax
+	pushl $iopl_arg
+	pushl $SYSCALL_ARCH_IOPL
+	pushl $0
+	int $SYSCALL_INT
+	addl $12, %esp
+	
+	movw $SHUTDOWN_PORT, %dx
+	movb $'S', %al
+	outb %al, %dx
+	movb $'h', %al
+	outb %al, %dx
+	movb $'u', %al
+	outb %al, %dx
+	movb $'t', %al
+	outb %al, %dx
+	movb $'d', %al
+	outb %al, %dx
+	movb $'o', %al
+	outb %al, %dx
+	movb $'w', %al
+	outb %al, %dx
+	movb $'n', %al
+	outb %al, %dx
 	
 	/* shutdown.  */
 	movl $SYSCALL_RESET, %eax
@@ -71,4 +108,7 @@ device:
 message:
 	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
 messageend:
-	
\ No newline at end of file
+iopl_arg:
+	.long SHUTDOWN_PORT
+	.long 1
+	.long 1
diff --git a/tests/boot/kfreebsd.init-x86_64.S b/tests/boot/kfreebsd.init-x86_64.S
index edff0d782..d2907b3a8 100644
--- a/tests/boot/kfreebsd.init-x86_64.S
+++ b/tests/boot/kfreebsd.init-x86_64.S
@@ -18,14 +18,18 @@
 
 #define MODE_RDRW 2
 #define FLAGS_NONE 0
+#define SYSCALL_ARCH 165
 #define SYSCALL_OPEN 5
 #define SYSCALL_WRITE 4
 #define SYSCALL_RESET 55
 #define SYSCALL_EXIT 1
+#define SYSCALL_ARCH_IOPL	4
+#define SYSCALL_FSYNC 95
 
 #define RESET_NOSYNC 0x4
 #define RESET_HALT 0x8
 #define RESET_POWEROFF 0x4000
+#define SHUTDOWN_PORT 0x8900
 
 	.section ".init", "ax"
 	.global start,_start
@@ -40,10 +44,38 @@ _start:
 	movq %rax, %rdi
 
 	/* write.  */
-	movq $SYSCALL_WRITE, %rax
 	leaq message, %rsi
-	movq $(messageend-message), %rdx
+	movq $SYSCALL_WRITE, %rax
+	movq $(messageend - message), %rdx
 	syscall
+
+	/* fsync.  */
+	movq $SYSCALL_FSYNC, %rax
+	syscall
+
+	/* IOPL.  */
+	movq $SYSCALL_ARCH, %rax
+	movq $SYSCALL_ARCH_IOPL, %rdi
+	leaq iopl_arg, %rsi
+	syscall
+
+	movw $SHUTDOWN_PORT, %dx
+	movb $'S', %al
+	outb %al, %dx
+	movb $'h', %al
+	outb %al, %dx
+	movb $'u', %al
+	outb %al, %dx
+	movb $'t', %al
+	outb %al, %dx
+	movb $'d', %al
+	outb %al, %dx
+	movb $'o', %al
+	outb %al, %dx
+	movb $'w', %al
+	outb %al, %dx
+	movb $'n', %al
+	outb %al, %dx
 	
 	/* shutdown.  */
 	movq $SYSCALL_RESET, %rax
@@ -60,3 +92,7 @@ device:
 message:
 	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
 messageend:
+iopl_arg:
+	.long SHUTDOWN_PORT
+	.long 1
+	.long 1
\ No newline at end of file
diff --git a/tests/boot/knetbsd.init-x86_64.S b/tests/boot/knetbsd.init-x86_64.S
index dfc64e99d..05a494594 100644
--- a/tests/boot/knetbsd.init-x86_64.S
+++ b/tests/boot/knetbsd.init-x86_64.S
@@ -23,12 +23,15 @@
 #define SYSCALL_RESET 208
 #define SYSCALL_EXIT 1
 #define SYSCALL_MKNOD 14
+#define SYSCALL_ARCH 165
 #define SYSCALL_MOUNT 410
 #define SYSCALL_INT 0x80
+#define SYSCALL_ARCH_IOPL	2
 
 #define RESET_NOSYNC 0x4
 #define RESET_HALT 0x8
 #define RESET_POWEROFF 0x800
+#define SHUTDOWN_PORT 0x8900
 
 	.section ".init", "ax"
 	.global start,_start
@@ -64,6 +67,30 @@ _start:
 	leaq message, %rsi
 	syscall
 
+	/* IOPL.  */
+	movq $SYSCALL_ARCH, %rax
+	movq $SYSCALL_ARCH_IOPL, %rdi
+	leaq iopl_arg, %rsi
+	syscall
+
+	movw $SHUTDOWN_PORT, %dx
+	movb $'S', %al
+	outb %al, %dx
+	movb $'h', %al
+	outb %al, %dx
+	movb $'u', %al
+	outb %al, %dx
+	movb $'t', %al
+	outb %al, %dx
+	movb $'d', %al
+	outb %al, %dx
+	movb $'o', %al
+	outb %al, %dx
+	movb $'w', %al
+	outb %al, %dx
+	movb $'n', %al
+	outb %al, %dx
+
 	/* shutdown.  */
 	movq $SYSCALL_RESET, %rax
 	movq $(RESET_POWEROFF|RESET_HALT|RESET_NOSYNC), %rdi
@@ -118,4 +145,6 @@ tmpfs_args:
 	.long		0777
 	/* Alignment long.  */
 	.long 0
-tmpfs_args_end:	
\ No newline at end of file
+tmpfs_args_end:
+iopl_arg:
+	.long 3
\ No newline at end of file
diff --git a/tests/boot/linux.init-i386.S b/tests/boot/linux.init-i386.S
index a79a5787e..f3eca6d88 100644
--- a/tests/boot/linux.init-i386.S
+++ b/tests/boot/linux.init-i386.S
@@ -18,6 +18,7 @@
 
 #define SYSCALL_WRITE 4
 #define SYSCALL_RESET 88
+#define SYSCALL_IOPL 110
 #define SYSCALL_EXIT 1
 #define SYSCALL_INT 0x80
 
@@ -26,6 +27,8 @@
 #define SHUTDOWN_MAGIC2 0x28121969
 #define SHUTDOWN_MAGIC3 0x4321fedc
 
+#define SHUTDOWN_PORT 0x8900
+
 	.text
 	.global start, _start
 _start:
@@ -37,6 +40,28 @@ start:
 	movl $(messageend-message), %edx
 	int $SYSCALL_INT
 
+	movl $SYSCALL_IOPL, %eax
+	movl $3, %ebx
+	int $SYSCALL_INT
+
+	movw $SHUTDOWN_PORT, %dx
+	movb $'S', %al
+	outb %al, %dx
+	movb $'h', %al
+	outb %al, %dx
+	movb $'u', %al
+	outb %al, %dx
+	movb $'t', %al
+	outb %al, %dx
+	movb $'d', %al
+	outb %al, %dx
+	movb $'o', %al
+	outb %al, %dx
+	movb $'w', %al
+	outb %al, %dx
+	movb $'n', %al
+	outb %al, %dx
+	
 	/* shutdown.  */
 	movl $SYSCALL_RESET, %eax
 	movl $SHUTDOWN_MAGIC1, %ebx

From e7b43a6550fa6d46f9189e6758ec51d56b48ddf2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 27 Apr 2010 21:42:45 +0200
Subject: [PATCH 0855/1628] Use hasbrokenint12

---
 tests/boot/kfreebsd.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/boot/kfreebsd.cfg b/tests/boot/kfreebsd.cfg
index 71b97b67e..8f339cd7f 100644
--- a/tests/boot/kfreebsd.cfg
+++ b/tests/boot/kfreebsd.cfg
@@ -1,6 +1,7 @@
 kfreebsd /kfreebsd -h
 kfreebsd_loadenv /kfreebsd_env
 kfreebsd_module /mfsroot type=mfs_root
+set kFreeBSD.hw.hasbrokenint12=1
 boot
 # Shouln't happen
 halt

From 54f83682d4c7e4fc519a837fdb9750f519f79a7b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 27 Apr 2010 21:43:16 +0200
Subject: [PATCH 0856/1628] Add missing escape

---
 util/grub-mkrescue.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 4f151ac98..2ef9aa8bd 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -165,7 +165,7 @@ if test -e "${coreboot_dir}" ; then
     cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
 search --fs-uuid --set ${iso_uuid}
 set prefix=(\${root})/boot/grub/${target_cpu}-coreboot
-source $prefix/grub.cfg
+source \$prefix/grub.cfg
 EOF
     (for i in ${modules} ; do
         echo "insmod $i"
@@ -222,7 +222,7 @@ if test -e "${efi64_dir}" ; then
     cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
 search --fs-uuid --set ${iso_uuid}
 set prefix=(\${root})/boot/grub/${target_cpu}-efi
-source $prefix/grub.cfg
+source \$prefix/grub.cfg
 EOF
 
     tar -C ${memdisk_dir} -cf ${memdisk_img} boot

From cc9d24254fd1d71a7bfc6e30981cfbd7cf860272 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 27 Apr 2010 22:08:24 +0200
Subject: [PATCH 0857/1628] 	* conf/x86-efi.rmk (linux_mod_SOURCES): Write
 explicitly to avoid 	autogen issues.

---
 ChangeLog        |  5 +++++
 conf/x86-efi.rmk | 10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29e634bf6..725eb297d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* conf/x86-efi.rmk (linux_mod_SOURCES): Write explicitly to avoid
+	autogen issues.
+
 2010-04-26  Christian Franke  <franke@computer.org>
 
 	* include/grub/util/getroot.h (grub_get_prefix): Remove prototype.
diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index 46957d933..e29dad645 100644
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -64,13 +64,17 @@ appleldr_mod_CFLAGS = $(COMMON_CFLAGS)
 appleldr_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For linux.mod.
-linux_mod_SOURCES = loader/i386/efi/linux.c
 ifeq ($(target_cpu), x86_64)
-linux_mod_SOURCES += loader/i386/linux_trampoline.S
-endif
+linux_mod_SOURCES = loader/i386/efi/linux.c loader/i386/linux_trampoline.S
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
+else
+linux_mod_SOURCES = loader/i386/efi/linux.c
+linux_mod_CFLAGS = $(COMMON_CFLAGS)
+linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
+linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
+endif
 
 # For halt.mod.
 halt_mod_SOURCES = commands/halt.c

From dce9e78a4f65fa009465cba9b9bceee8a85f720b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 28 Apr 2010 09:40:50 +0200
Subject: [PATCH 0858/1628] Increase bootcheck timeout

---
 conf/common.rmk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index 0a622ca04..e1d148987 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -865,7 +865,8 @@ grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(sr
 
 # Randomly generated
 SUCCESSFUL_BOOT_STRING=3e49994fd5d82b7c9298d672d774080d
-BOOTCHECK_TIMEOUT=60
+# tianocore cd access is very slow
+BOOTCHECK_TIMEOUT=600
 
 bootcheck: $(BOOTCHECKS)
 

From 3af6010ff71a3c9f1b9a11bb67991dc55fba9a12 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 28 Apr 2010 09:41:34 +0200
Subject: [PATCH 0859/1628] Disable kfreebsd-x86_64 and knetbsd-i386 bootchecks
 on non-pc

---
 conf/i386-pc.rmk | 6 +++++-
 conf/i386.rmk    | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 95a996c75..66d2447ad 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -286,7 +286,11 @@ bootcheck-linux16-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(s
 bootcheck-linux16-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
-BOOTCHECKS+=bootcheck-linux16-i386 bootcheck-linux16-x86_64
+BOOTCHECKS += bootcheck-linux16-i386 bootcheck-linux16-x86_64
+# It is defined in i386.rmk but requires ACPI
+BOOTCHECKS += bootcheck-kfreebsd-x86_64
+# It is defined in i386.rmk but crashes early on non-BIOS
+BOOTCHECKS += bootcheck-knetbsd-i386
 
 include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk
diff --git a/conf/i386.rmk b/conf/i386.rmk
index 9007b2889..97becfc7b 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -157,8 +157,7 @@ bootcheck-linux-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 BOOTCHECKS += bootcheck-linux-i386 bootcheck-linux-x86_64 \
-	bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \
-	bootcheck-knetbsd-i386 bootcheck-knetbsd-x86_64
+	bootcheck-kfreebsd-i386 bootcheck-knetbsd-x86_64
 
 .PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
 	bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \

From bb06ba0892dd4d9d2bf838b437e1d2253141c484 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed, 28 Apr 2010 22:59:27 +0200
Subject: [PATCH 0860/1628] * docs/grub.texi (play): Document that zero pitches
 produce rests.

---
 ChangeLog      | 4 ++++
 docs/grub.texi | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 725eb297d..c06df52d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-28  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* docs/grub.texi (play): Document that zero pitches produce rests.
+
 2010-04-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* conf/x86-efi.rmk (linux_mod_SOURCES): Write explicitly to avoid
diff --git a/docs/grub.texi b/docs/grub.texi
index f8a9bc414..704f8b2a3 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1379,7 +1379,8 @@ pitch and duration pairs.
 If the arguments are a series of numbers, play the inline tune.
 
 The tempo is the base for all note durations. 60 gives a 1-second base, 120
-gives a half-second base, etc.  Pitches are Hz.
+gives a half-second base, etc.  Pitches are Hz.  Set pitch to 0 to produce
+a rest.
 @end deffn
 
 

From c76a18386f45b0bc1dc8ef4d69f1210a4bde60c7 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed, 28 Apr 2010 23:18:16 +0200
Subject: [PATCH 0861/1628] * commands/i386/pc/play.c (grub_cmd_play): Call
 'grub_file_open' only if argc is 1.

---
 ChangeLog               |  2 ++
 commands/i386/pc/play.c | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c06df52d5..4c8f2b2f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2010-04-28  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* docs/grub.texi (play): Document that zero pitches produce rests.
+	* commands/i386/pc/play.c (grub_cmd_play): Call 'grub_file_open' only
+	if argc is 1.
 
 2010-04-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
diff --git a/commands/i386/pc/play.c b/commands/i386/pc/play.c
index 44d98a1f0..4ed937d4a 100644
--- a/commands/i386/pc/play.c
+++ b/commands/i386/pc/play.c
@@ -177,16 +177,20 @@ static grub_err_t
 grub_cmd_play (grub_command_t cmd __attribute__ ((unused)),
 	       int argc, char **args)
 {
-  grub_file_t file;
 
   if (argc < 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name or tempo and notes required");
 
-  file = grub_file_open (args[0]);
-  if (file)
+  if (argc == 1)
     {
       struct note buf;
       grub_uint32_t tempo;
+      grub_file_t file;
+
+      file = grub_file_open (args[0]);
+
+      if (! file)
+        return grub_error (GRUB_ERR_FILE_NOT_FOUND, "file not found");
 
       if (grub_file_read (file, &tempo, sizeof (tempo)) != sizeof (tempo))
         {

From ae3c4cd010ff4aba666415a9804169b7ad0aeb84 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 29 Apr 2010 13:26:38 +0200
Subject: [PATCH 0862/1628] Remove loader.h

---
 conf/common.rmk                        |  2 +-
 conf/i386-pc.rmk                       |  2 +-
 include/grub/i386/coreboot/loader.h    |  1 -
 include/grub/i386/efi/loader.h         | 22 ------------------
 include/grub/i386/ieee1275/loader.h    | 29 -----------------------
 include/grub/mips/yeeloong/loader.h    |  0
 include/grub/powerpc/ieee1275/loader.h | 32 --------------------------
 include/grub/sparc64/ieee1275/loader.h | 27 ----------------------
 8 files changed, 2 insertions(+), 113 deletions(-)
 delete mode 100644 include/grub/i386/coreboot/loader.h
 delete mode 100644 include/grub/i386/efi/loader.h
 delete mode 100644 include/grub/i386/ieee1275/loader.h
 delete mode 100644 include/grub/mips/yeeloong/loader.h
 delete mode 100644 include/grub/powerpc/ieee1275/loader.h
 delete mode 100644 include/grub/sparc64/ieee1275/loader.h

diff --git a/conf/common.rmk b/conf/common.rmk
index e1d148987..a8c881276 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -118,7 +118,7 @@ kernel_img_HEADERS += boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
 	list.h handler.h command.h i18n.h env_private.h libgcc.h mm_private.h
 
 ifneq ($(platform), emu)
-kernel_img_HEADERS += machine/memory.h machine/loader.h
+kernel_img_HEADERS += machine/memory.h
 endif
 
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 66d2447ad..d403d19f1 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -53,7 +53,7 @@ kernel_img_SOURCES = kern/i386/pc/startup.S \
 	term/i386/pc/console.c term/i386/vga_common.c \
 	symlist.c
 kernel_img_HEADERS += machine/biosdisk.h machine/vga.h machine/vbe.h \
-	machine/pxe.h i386/pit.h machine/kernel.h
+	machine/pxe.h i386/pit.h machine/kernel.h machine/loader.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x8200 $(COMMON_CFLAGS)
diff --git a/include/grub/i386/coreboot/loader.h b/include/grub/i386/coreboot/loader.h
deleted file mode 100644
index d3f36bba5..000000000
--- a/include/grub/i386/coreboot/loader.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <grub/cpu/loader.h>
diff --git a/include/grub/i386/efi/loader.h b/include/grub/i386/efi/loader.h
deleted file mode 100644
index 222dae82d..000000000
--- a/include/grub/i386/efi/loader.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2003,2004,2006,2007  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/>.
- */
-
-#ifndef GRUB_LOADER_MACHINE_HEADER
-#define GRUB_LOADER_MACHINE_HEADER	1
-
-#endif /* ! GRUB_LOADER_MACHINE_HEADER */
diff --git a/include/grub/i386/ieee1275/loader.h b/include/grub/i386/ieee1275/loader.h
deleted file mode 100644
index 20df2e1d6..000000000
--- a/include/grub/i386/ieee1275/loader.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2003,2004,2007,2008  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/>.
- */
-
-#ifndef GRUB_LOADER_MACHINE_HEADER
-#define GRUB_LOADER_MACHINE_HEADER	1
-
-#include <grub/types.h>
-#include <grub/symbol.h>
-#include <grub/multiboot.h>
-
-void grub_rescue_cmd_linux (int argc, char *argv[]);
-void grub_rescue_cmd_initrd (int argc, char *argv[]);
-
-#endif /* ! GRUB_LOADER_MACHINE_HEADER */
diff --git a/include/grub/mips/yeeloong/loader.h b/include/grub/mips/yeeloong/loader.h
deleted file mode 100644
index e69de29bb..000000000
diff --git a/include/grub/powerpc/ieee1275/loader.h b/include/grub/powerpc/ieee1275/loader.h
deleted file mode 100644
index 606bfcd0b..000000000
--- a/include/grub/powerpc/ieee1275/loader.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2004,2007  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/>.
- */
-
-#ifndef GRUB_LOADER_MACHINE_HEADER
-#define GRUB_LOADER_MACHINE_HEADER	1
-
-/* The symbol shared between the normal mode and rescue mode
-   loader.  */
-void grub_rescue_cmd_linux (int argc, char *argv[]);
-void grub_rescue_cmd_initrd (int argc, char *argv[]);
-
-void grub_linux_init (void);
-void grub_linux_fini (void);
-void grub_linux_normal_init (void);
-void grub_linux_normal_fini (void);
-
-#endif /* ! GRUB_LOADER_MACHINE_HEADER */
diff --git a/include/grub/sparc64/ieee1275/loader.h b/include/grub/sparc64/ieee1275/loader.h
deleted file mode 100644
index 12bb2a69b..000000000
--- a/include/grub/sparc64/ieee1275/loader.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  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/>.
- */
-
-#ifndef GRUB_LOADER_MACHINE_HEADER
-#define GRUB_LOADER_MACHINE_HEADER	1
-
-/* The symbol shared between the normal mode and rescue mode
-   loader.  */
-void grub_rescue_cmd_linux (int argc, char *argv[]);
-void grub_rescue_cmd_initrd (int argc, char *argv[]);
-
-#endif /* ! GRUB_LOADER_MACHINE_HEADER */

From 3bd6968e566d70d763dd4b0623849bab12a01120 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 29 Apr 2010 13:28:46 +0200
Subject: [PATCH 0863/1628] fix i386-qemu building problems

---
 conf/i386-qemu.rmk | 19 +------------------
 conf/i386.rmk      |  2 ++
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index ff263245d..6d387a6f6 100644
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -43,7 +43,7 @@ bin_SCRIPTS += grub-mkrescue
 grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 # Modules.
-pkglib_MODULES = linux.mod aout.mod halt.mod datetime.mod mmap.mod
+pkglib_MODULES = halt.mod datetime.mod mmap.mod
 
 # For mmap.mod.
 mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
@@ -51,28 +51,11 @@ mmap_mod_CFLAGS = $(COMMON_CFLAGS)
 mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod.
 halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For aout.mod.
-aout_mod_SOURCES = loader/aout.c
-aout_mod_CFLAGS = $(COMMON_CFLAGS)
-aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For bsd.mod
-pkglib_MODULES += bsd.mod
-bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c loader/i386/bsd_helper.S loader/i386/bsd_trampoline.S
-bsd_mod_CFLAGS = $(COMMON_CFLAGS)
-bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
 # For datetime.mod
 datetime_mod_SOURCES = lib/cmos_datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/conf/i386.rmk b/conf/i386.rmk
index 97becfc7b..004dab7f3 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -10,10 +10,12 @@ at_keyboard_mod_SOURCES = term/at_keyboard.c
 at_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
 at_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+ifneq ($(platform), qemu)
 pkglib_MODULES += vga_text.mod
 vga_text_mod_SOURCES = term/i386/pc/vga_text.c term/i386/vga_common.c
 vga_text_mod_CFLAGS = $(COMMON_CFLAGS)
 vga_text_mod_LDFLAGS = $(COMMON_LDFLAGS)
+endif
 
 pkglib_MODULES += relocator.mod
 ifeq ($(platform), ieee1275)

From 6406a79dffb55949deb854ef449d5e70c7f632c5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 29 Apr 2010 13:36:53 +0200
Subject: [PATCH 0864/1628] switch off manually on linux x86_64

---
 tests/boot/linux.init-x86_64.S | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/boot/linux.init-x86_64.S b/tests/boot/linux.init-x86_64.S
index 17ba8040c..63dca5e20 100644
--- a/tests/boot/linux.init-x86_64.S
+++ b/tests/boot/linux.init-x86_64.S
@@ -18,6 +18,7 @@
 
 #define SYSCALL_WRITE 1
 #define SYSCALL_RESET 169
+#define SYSCALL_IOPL 172
 #define SYSCALL_EXIT 60
 
 #define STDOUT 1
@@ -25,6 +26,8 @@
 #define SHUTDOWN_MAGIC2 0x28121969
 #define SHUTDOWN_MAGIC3 0x4321fedc
 
+#define SHUTDOWN_PORT 0x8900
+
 	.text
 	.global start, _start
 _start:
@@ -36,6 +39,28 @@ start:
 	movq $(messageend-message), %rdx
 	syscall
 
+	movq $SYSCALL_IOPL, %rax
+	movq $3, %rdi
+	syscall
+
+	movw $SHUTDOWN_PORT, %dx
+	movb $'S', %al
+	outb %al, %dx
+	movb $'h', %al
+	outb %al, %dx
+	movb $'u', %al
+	outb %al, %dx
+	movb $'t', %al
+	outb %al, %dx
+	movb $'d', %al
+	outb %al, %dx
+	movb $'o', %al
+	outb %al, %dx
+	movb $'w', %al
+	outb %al, %dx
+	movb $'n', %al
+	outb %al, %dx
+	
 	/* shutdown.  */
 	movq $SYSCALL_RESET, %rax
 	movq $SHUTDOWN_MAGIC1, %rdi

From 0993355a68b5e954c26184a4fb19310c15eef701 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 29 Apr 2010 18:10:22 +0530
Subject: [PATCH 0865/1628] nested recording support

---
 include/grub/script_sh.h |  4 +--
 script/lexer.c           | 68 +++++++++++++++++-----------------------
 script/parser.y          | 11 ++++---
 3 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index b55b6a806..17b1c5a5a 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -282,8 +282,8 @@ struct grub_lexer_param *grub_script_lexer_init (struct grub_parser_param *parse
 void grub_script_lexer_fini (struct grub_lexer_param *);
 void grub_script_lexer_ref (struct grub_lexer_param *);
 void grub_script_lexer_deref (struct grub_lexer_param *);
-void grub_script_lexer_record_start (struct grub_parser_param *);
-char *grub_script_lexer_record_stop (struct grub_parser_param *);
+unsigned grub_script_lexer_record_start (struct grub_parser_param *);
+char *grub_script_lexer_record_stop (struct grub_parser_param *, unsigned);
 int  grub_script_lexer_yywrap (struct grub_parser_param *);
 void grub_script_lexer_record (struct grub_parser_param *, char *);
 
diff --git a/script/lexer.c b/script/lexer.c
index 42a570348..73adf627f 100644
--- a/script/lexer.c
+++ b/script/lexer.c
@@ -38,68 +38,57 @@ grub_script_lexer_deref (struct grub_lexer_param *state)
 }
 
 /* Start recording all characters passing through the lexer.  */
-void
+unsigned
 grub_script_lexer_record_start (struct grub_parser_param *parser)
 {
   struct grub_lexer_param *lexer = parser->lexerstate;
 
-  lexer->record = 1;
-  lexer->recordpos = 0;
-  if (lexer->recording) /* reuse last record */
-    return;
+  lexer->record++;
+  if (lexer->recording)
+    return lexer->recordpos;
 
+  lexer->recordpos = 0;
   lexer->recordlen = GRUB_LEXER_INITIAL_RECORD_SIZE;
   lexer->recording = grub_malloc (lexer->recordlen);
   if (!lexer->recording)
     {
       grub_script_yyerror (parser, 0);
-      lexer->record = 0;
       lexer->recordlen = 0;
     }
+  return lexer->recordpos;
 }
 
 char *
-grub_script_lexer_record_stop (struct grub_parser_param *parser)
+grub_script_lexer_record_stop (struct grub_parser_param *parser, unsigned offset)
 {
-  char *ptr;
+  int count;
   char *result;
   struct grub_lexer_param *lexer = parser->lexerstate;
 
-  auto char *compact (char *start, char *end);
-  char *compact (char *start, char *end)
-  {
-    /* Delete '{' and '}' characters and whitespaces.  */
-    while (*start && grub_isspace (*start)) start++;
-    if (*start == '{') start++;
-    while (*start && grub_isspace (*start)) start++;
-
-    while (*end && grub_isspace (*end)) end--;
-    if (*end == '}') end--;
-    while (*end && grub_isspace (*end)) end--;
-    end[1] = '\0';
-
-    return start;
-  }
-
-  if (!lexer->record || !lexer->recording)
+  if (!lexer->record)
     return 0;
 
-  /* XXX This is not necessary in BASH.  */
+  lexer->record--;
+  if (!lexer->recording)
+    return 0;
 
-  ptr = compact (lexer->recording, lexer->recording + lexer->recordpos - 1);
-  lexer->record = 0;
-  lexer->recordpos = 0;
-
-  /* This memory would be freed by, grub_script_free.  */
-  result = grub_script_malloc (parser, grub_strlen (ptr) + 1);
-  if (result)
-    grub_strcpy (result, ptr);
+  count = lexer->recordpos - offset;
+  result = grub_script_malloc (parser, count + 1);
+  if (result) {
+    grub_strncpy (result, lexer->recording + offset, count);
+    result[count] = '\0';
+  }
 
+  if (lexer->record == 0)
+    {
+      grub_free (lexer->recording);
+      lexer->recording = 0;
+      lexer->recordlen = 0;
+      lexer->recordpos = 0;
+    }
   return result;
 }
 
-#define MAX(a,b) ((a) < (b) ? (b) : (a))
-
 /* Record STR if input recording is enabled.  */
 void
 grub_script_lexer_record (struct grub_parser_param *parser, char *str)
@@ -108,21 +97,20 @@ grub_script_lexer_record (struct grub_parser_param *parser, char *str)
   char *old;
   struct grub_lexer_param *lexer = parser->lexerstate;
 
-  if (!lexer->record)
+  if (!lexer->record || !lexer->recording)
     return;
 
   len = grub_strlen (str);
   if (lexer->recordpos + len + 1 > lexer->recordlen)
     {
       old = lexer->recording;
-      lexer->recordlen = MAX (len, lexer->recordlen) * 2;
+      lexer->recordlen = grub_max (len, lexer->recordlen) * 2;
       lexer->recording = grub_realloc (lexer->recording, lexer->recordlen);
       if (!lexer->recording)
 	{
 	  grub_free (old);
-	  lexer->record = 0;
 	  lexer->recordpos = 0;
-	  lexer->recordlen /= 2;
+	  lexer->recordlen = 0;
 	  grub_script_yyerror (parser, 0);
 	  return;
 	}
diff --git a/script/parser.y b/script/parser.y
index b5815ea8d..e5de35cf4 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -33,6 +33,7 @@
   struct grub_script_arglist *arglist;
   struct grub_script_arg *arg;
   char *string;
+  unsigned offset;
 }
 
 %token GRUB_PARSER_TOKEN_BAD
@@ -217,14 +218,16 @@ menuentry: "menuentry"
            }
            arguments1
            {
-             grub_script_lexer_record_start (state);
+             $<offset>$ = grub_script_lexer_record_start (state);
            }
            delimiters0 "{" commands1 delimiters1 "}"
            {
-             char *menu_entry;
-             menu_entry = grub_script_lexer_record_stop (state);
+             char *def;
+             def = grub_script_lexer_record_stop (state, $<offset>4);
+	     *grub_strrchr(def, '}') = '\0';
+
              grub_script_lexer_deref (state->lexerstate);
-             $$ = grub_script_create_cmdmenu (state, $3, menu_entry, 0);
+             $$ = grub_script_create_cmdmenu (state, $3, def, 0);
            }
 ;
 

From 19dd394f56733b6beecf560b82984c293522455b Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 30 Apr 2010 12:09:31 +0530
Subject: [PATCH 0866/1628] block argument support

---
 include/grub/script_sh.h |  6 ++++-
 script/execute.c         |  1 +
 script/parser.y          | 50 ++++++++++++++++++++++++++++++++++++++--
 script/yylex.l           |  2 +-
 4 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 17b1c5a5a..e1bf6f22e 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -49,7 +49,8 @@ typedef enum
   GRUB_SCRIPT_ARG_TYPE_TEXT,
   GRUB_SCRIPT_ARG_TYPE_DQVAR,
   GRUB_SCRIPT_ARG_TYPE_DQSTR,
-  GRUB_SCRIPT_ARG_TYPE_SQSTR
+  GRUB_SCRIPT_ARG_TYPE_SQSTR,
+  GRUB_SCRIPT_ARG_TYPE_BLOCK
 } grub_script_arg_type_t;
 
 /* A part of an argument.  */
@@ -59,6 +60,9 @@ struct grub_script_arg
 
   char *str;
 
+  /* Parsed block argument.  */
+  struct grub_script_cmd *block;
+
   /* Next argument part.  */
   struct grub_script_arg *next;
 };
diff --git a/script/execute.c b/script/execute.c
index 40f161267..31fce554c 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -152,6 +152,7 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *c
 		}
 	      break;
 
+	    case GRUB_SCRIPT_ARG_TYPE_BLOCK:
 	    case GRUB_SCRIPT_ARG_TYPE_TEXT:
 	      if (grub_strlen (arg->str) > 0)
 		{
diff --git a/script/parser.y b/script/parser.y
index e5de35cf4..9d256a153 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -74,7 +74,7 @@
 %token <arg> GRUB_PARSER_TOKEN_NAME      "name"
 %token <arg> GRUB_PARSER_TOKEN_WORD      "word"
 
-%type <arglist> word argument arguments0 arguments1
+%type <arglist> word argument block parameters0 parameters1 arguments0 arguments1
 
 %type <cmd> script_init script
 %type <cmd> grubcmd ifclause ifcmd forcmd whilecmd untilcmd
@@ -147,6 +147,27 @@ argument : "case"      { $$ = grub_script_add_arglist (state, 0, $1); }
          | word { $$ = $1; }
 ;
 
+block: "{" 
+       {
+         grub_script_lexer_ref (state->lexerstate);
+         $<offset>$ = grub_script_lexer_record_start (state);
+       }
+       commands1 delimiters0 "}"
+       {
+         char *p;
+         struct grub_script_arg *arg;
+
+         grub_script_lexer_deref (state->lexerstate);
+         if (p = grub_script_lexer_record_stop (state, $<offset>2))
+	   *grub_strrchr (p, '}') = '\0';
+
+         if (arg = grub_script_arg_add (state, 0, GRUB_SCRIPT_ARG_TYPE_BLOCK, p))
+	   arg->block = $3;
+
+         $$ = grub_script_add_arglist (state, 0, arg);
+       }
+;
+
 arguments0: /* Empty */ { $$ = 0; }
           | arguments1  { $$ = $1; }
 ;
@@ -162,7 +183,32 @@ arguments1: argument arguments0
             }
 ;
 
-grubcmd: word arguments0
+parameters1: argument parameters0
+             {
+               if ($1 && $2)
+                 {
+                   $1->next = $2;
+                   $1->argcount += $2->argcount;
+                   $2->argcount = 0;
+                 }
+               $$ = $1;
+             }
+           | block parameters0
+             {
+               if ($1 && $2)
+                 {
+                   $1->next = $2;
+                   $1->argcount += $2->argcount;
+                   $2->argcount = 0;
+                 }
+               $$ = $1;
+             }
+;
+parameters0: /* Empty */ { $$ = 0; }
+           | parameters1 { $$ = $1; }
+;
+
+grubcmd: word parameters0
          {
            if ($1 && $2) {
              $1->next = $2;
diff --git a/script/yylex.l b/script/yylex.l
index 29aa5c2e3..585f818cb 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -114,7 +114,7 @@ typedef size_t yy_size_t;
 BLANK           [ \t]
 COMMENT         ^[ \t]*#.*$
 
-CHAR            [^|&$;<> \t\n\'\"\\]
+CHAR            [^{}|&$;<> \t\n\'\"\\]
 DIGITS          [[:digit:]]+
 NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
 

From 6fdda85ae6a255458808d4e4042eb51d55eb1380 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 30 Apr 2010 13:50:41 +0530
Subject: [PATCH 0867/1628] fix comment and brace handling

---
 conf/tests.rmk                |  4 ++++
 script/yylex.l                |  4 ++--
 tests/grub_script_comments.in | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 tests/grub_script_comments.in

diff --git a/conf/tests.rmk b/conf/tests.rmk
index d48bc3dd9..9af2f8f86 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -68,6 +68,9 @@ grub_script_final_semicolon_SOURCES = tests/grub_script_final_semicolon.in
 check_SCRIPTS += grub_script_dollar
 grub_script_dollar_SOURCES = tests/grub_script_dollar.in
 
+check_SCRIPTS += grub_script_comments
+grub_script_comments_SOURCES = tests/grub_script_comments.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -83,6 +86,7 @@ SCRIPTED_TESTS += grub_script_if
 SCRIPTED_TESTS += grub_script_blanklines
 SCRIPTED_TESTS += grub_script_final_semicolon
 SCRIPTED_TESTS += grub_script_dollar
+SCRIPTED_TESTS += grub_script_comments
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/script/yylex.l b/script/yylex.l
index 29aa5c2e3..7d4ea9e4e 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -112,9 +112,9 @@ typedef size_t yy_size_t;
 %option extra-type="struct grub_parser_param*"
 
 BLANK           [ \t]
-COMMENT         ^[ \t]*#.*$
+COMMENT         #.*$
 
-CHAR            [^|&$;<> \t\n\'\"\\]
+CHAR            [^{}|&$;<> \t\n\'\"\\]
 DIGITS          [[:digit:]]+
 NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
 
diff --git a/tests/grub_script_comments.in b/tests/grub_script_comments.in
new file mode 100644
index 000000000..7b3410717
--- /dev/null
+++ b/tests/grub_script_comments.in
@@ -0,0 +1,19 @@
+#! @builddir@/grub-shell-tester
+#
+# Copyright (C) 2010  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/>.
+
+echo a###b
+echo a# #b

From c548018b7c9e7a61310bcf551238b63df847a76b Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 1 May 2010 15:39:59 +0530
Subject: [PATCH 0868/1628] added few more test cases

---
 tests/grub_script_comments.in | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/grub_script_comments.in b/tests/grub_script_comments.in
index 7b3410717..f212cc1e1 100644
--- a/tests/grub_script_comments.in
+++ b/tests/grub_script_comments.in
@@ -17,3 +17,12 @@
 
 echo a###b
 echo a# #b
+
+echo #
+echo \#
+
+echo '#'
+echo "#"
+
+echo '\#'
+echo "\#"

From 6f8aaf68beb7b6de3ce3d5f39fbab75ffb9bb78d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 1 May 2010 13:20:07 +0200
Subject: [PATCH 0869/1628] 	Merge handling of input and output terminals.
 Fix a hang.

	* commands/terminal.c (abstract_terminal): New struct.
	(handle_command): New function. Based on grub_cmd_terminal_input.
	(grub_cmd_terminal_input): Use handle_command.
	(grub_cmd_terminal_output): Use handle_command.
---
 ChangeLog           |   9 +
 commands/terminal.c | 396 +++++++++++++++-----------------------------
 2 files changed, 146 insertions(+), 259 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 572fade35..530ecf32a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	MErge handling of input and output terminals. Fix a hang.
+
+	* commands/terminal.c (abstract_terminal): New struct.
+	(handle_command): New function. Based on grub_cmd_terminal_input.
+	(grub_cmd_terminal_input): Use handle_command.
+	(grub_cmd_terminal_output): Use handle_command.
+
 2010-05-01  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Fix comment handling.
diff --git a/commands/terminal.c b/commands/terminal.c
index e725123b8..c8c1ffe09 100644
--- a/commands/terminal.c
+++ b/commands/terminal.c
@@ -26,37 +26,48 @@
 struct grub_term_autoload *grub_term_input_autoload = NULL;
 struct grub_term_autoload *grub_term_output_autoload = NULL;
 
+struct abstract_terminal
+{
+  struct abstract_terminal *next;
+  const char *name;
+  grub_err_t (*init) (void);
+  grub_err_t (*fini) (void);
+};
+
 static grub_err_t
-grub_cmd_terminal_input (grub_command_t cmd __attribute__ ((unused)),
-			 int argc, char **args)
+handle_command (int argc, char **args, struct abstract_terminal **enabled,
+               struct abstract_terminal **disabled,
+               struct grub_term_autoload *autoloads,
+               const char *active_str,
+               const char *available_str)
 {
   int i;
-  grub_term_input_t term;
+  struct abstract_terminal *term;
   struct grub_term_autoload *aut;
 
   if (argc == 0)
     {
-      grub_puts_ (N_ ("Active input terminals:"));
-      FOR_ACTIVE_TERM_INPUTS(term)
-	grub_printf ("%s ", term->name);
+      grub_puts_ (active_str);
+      for (term = *enabled; term; term = term->next)
+       grub_printf ("%s ", term->name);
       grub_printf ("\n");
-      grub_puts_ (N_ ("Available input terminals:"));
-      FOR_DISABLED_TERM_INPUTS(term)
-	grub_printf ("%s ", term->name);
+      grub_puts_ (available_str);
+      for (term = *disabled; term; term = term->next)
+       grub_printf ("%s ", term->name);
       /* This is quadratic but we don't expect mode than 30 terminal
-	 modules ever.  */
-      for (aut = grub_term_input_autoload; aut; aut = aut->next)
-	{
-	  FOR_DISABLED_TERM_INPUTS(term)
-	    if (grub_strcmp (term->name, aut->name) == 0)
-	      break;
-	  if (!term)
-	    FOR_ACTIVE_TERM_INPUTS(term)
-	      if (grub_strcmp (term->name, aut->name) == 0)
-		break;
-	  if (!term)
-	    grub_printf ("%s ", aut->name);
-	}
+        modules ever.  */
+      for (aut = autoloads; aut; aut = aut->next)
+       {
+         for (term = *disabled; term; term = term->next)
+           if (grub_strcmp (term->name, aut->name) == 0)
+             break;
+         if (!term)
+           for (term = *enabled; term; term = term->next)
+             if (grub_strcmp (term->name, aut->name) == 0)
+               break;
+         if (!term)
+           grub_printf ("%s ", aut->name);
+       }
       grub_printf ("\n");
       return GRUB_ERR_NONE;
     }
@@ -73,112 +84,108 @@ grub_cmd_terminal_input (grub_command_t cmd __attribute__ ((unused)),
     {
       int again = 0;
       while (1)
-	{
-	  FOR_DISABLED_TERM_INPUTS(term)
-	    if (grub_strcmp (args[i], term->name) == 0)
-	      break;
-	  if (term == 0)
-	    FOR_ACTIVE_TERM_INPUTS(term)
-	      if (grub_strcmp (args[i], term->name) == 0)
-		break;
-	  if (term)
-	    break;
-	  if (again)
-	    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown terminal '%s'\n",
-			       args[i]);
-	  for (aut = grub_term_input_autoload; aut; aut = aut->next)
-	    if (grub_strcmp (args[i], aut->name) == 0)
-	      {
-		grub_dl_t mod;
-		mod = grub_dl_load (aut->modname);
-		if (mod)
-		  grub_dl_ref (mod);
-		grub_errno = GRUB_ERR_NONE;
-		break;
-	      }
-	  if (!aut)
-	    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown terminal '%s'\n",
-			       args[i]);
-	  again = 1;
-	}
+       {
+         for (term = *disabled; term; term = term->next)
+           if (grub_strcmp (args[i], term->name) == 0)
+             break;
+         if (term == 0)
+           for (term = *enabled; term; term = term->next)
+             if (grub_strcmp (args[i], term->name) == 0)
+               break;
+         if (term)
+           break;
+         if (again)
+           return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown terminal '%s'\n",
+                              args[i]);
+         for (aut = autoloads; aut; aut = aut->next)
+           if (grub_strcmp (args[i], aut->name) == 0)
+             {
+               grub_dl_t mod;
+               mod = grub_dl_load (aut->modname);
+               if (mod)
+                 grub_dl_ref (mod);
+               grub_errno = GRUB_ERR_NONE;
+               break;
+             }
+         if (!aut)
+           return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown terminal '%s'\n",
+                              args[i]);
+         again = 1;
+       }
     }
 
   if (grub_strcmp (args[0], "--append") == 0)
     {
       for (i = 1; i < argc; i++)
-	{
-	  FOR_DISABLED_TERM_INPUTS(term)
-	    if (grub_strcmp (args[i], term->name) == 0)
-	      break;
-	  if (term)
-	    {
+       {
+         for (term = *disabled; term; term = term->next)
+           if (grub_strcmp (args[i], term->name) == 0)
+             break;
+         if (term)
+           {
               if (term->init && term->init () != GRUB_ERR_NONE)
                 return grub_errno;
 
-	      grub_list_remove (GRUB_AS_LIST_P (&(grub_term_inputs_disabled)),
-				GRUB_AS_LIST (term));
-	      grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs),
-			      GRUB_AS_LIST (term));
-	    }
-	}
+             grub_list_remove (GRUB_AS_LIST_P (disabled), GRUB_AS_LIST (term));
+             grub_list_push (GRUB_AS_LIST_P (enabled), GRUB_AS_LIST (term));
+           }
+       }
       return GRUB_ERR_NONE;
     }
 
   if (grub_strcmp (args[0], "--remove") == 0)
     {
       for (i = 1; i < argc; i++)
-	{
-	  FOR_ACTIVE_TERM_INPUTS(term)
-	    if (grub_strcmp (args[i], term->name) == 0)
-	      break;
-	  if (term)
-	    {
-	      if (!term->next && term == grub_term_inputs)
-		return grub_error (GRUB_ERR_BAD_ARGUMENT,
-				   "can't remove the last terminal");
-	      grub_list_remove (GRUB_AS_LIST_P (&(grub_term_inputs)),
-				GRUB_AS_LIST (term));
-	      if (term->fini)
-		term->fini ();
-	      grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs_disabled),
-			      GRUB_AS_LIST (term));
-	    }
-	}
+       {
+         for (term = *enabled; term; term = term->next)
+           if (grub_strcmp (args[i], term->name) == 0)
+             break;
+         if (term)
+           {
+             if (!term->next && term == *enabled)
+               return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                                  "can't remove the last terminal");
+             grub_list_remove (GRUB_AS_LIST_P (enabled), GRUB_AS_LIST (term));
+             if (term->fini)
+               term->fini ();
+             grub_list_push (GRUB_AS_LIST_P (disabled), GRUB_AS_LIST (term));
+           }
+       }
       return GRUB_ERR_NONE;
     }
   for (i = 0; i < argc; i++)
     {
-      FOR_DISABLED_TERM_INPUTS(term)
-	if (grub_strcmp (args[i], term->name) == 0)
-	  break;
+      for (term = *disabled; term; term = term->next)
+       if (grub_strcmp (args[i], term->name) == 0)
+         break;
       if (term)
-	{
-	  if (term->init && term->init () != GRUB_ERR_NONE)
-	    return grub_errno;
+       {
+         if (term->init && term->init () != GRUB_ERR_NONE)
+           return grub_errno;
 
-	  grub_list_remove (GRUB_AS_LIST_P (&(grub_term_inputs_disabled)),
-			    GRUB_AS_LIST (term));
-	  grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs),
-			  GRUB_AS_LIST (term));
-	}	
+         grub_list_remove (GRUB_AS_LIST_P (disabled), GRUB_AS_LIST (term));
+         grub_list_push (GRUB_AS_LIST_P (enabled), GRUB_AS_LIST (term));
+       }       
     }
-
-  FOR_ACTIVE_TERM_INPUTS(term)
+  
   {
-    for (i = 0; i < argc; i++)
-      if (grub_strcmp (args[i], term->name) == 0)
-	break;
-    if (i == argc)
+    struct abstract_terminal *next;
+    for (term = *enabled; term; term = next)
       {
-	if (!term->next && term == grub_term_inputs)
-	  return grub_error (GRUB_ERR_BAD_ARGUMENT,
-			     "can't remove the last terminal");
-	grub_list_remove (GRUB_AS_LIST_P (&(grub_term_inputs)),
-			  GRUB_AS_LIST (term));
-	if (term->fini)
-	  term->fini ();
-	grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs_disabled),
-			GRUB_AS_LIST (term));
+       next = term->next;
+       for (i = 0; i < argc; i++)
+         if (grub_strcmp (args[i], term->name) == 0)
+           break;
+       if (i == argc)
+         {
+           if (!term->next && term == *enabled)
+             return grub_error (GRUB_ERR_BAD_ARGUMENT,
+                                "can't remove the last terminal");
+           grub_list_remove (GRUB_AS_LIST_P (enabled), GRUB_AS_LIST (term));
+           if (term->fini)
+             term->fini ();
+           grub_list_push (GRUB_AS_LIST_P (disabled), GRUB_AS_LIST (term));
+         }
       }
   }
 
@@ -186,163 +193,34 @@ grub_cmd_terminal_input (grub_command_t cmd __attribute__ ((unused)),
 }
 
 static grub_err_t
-grub_cmd_terminal_output (grub_command_t cmd __attribute__ ((unused)),
+grub_cmd_terminal_input (grub_command_t cmd __attribute__ ((unused)),
 			 int argc, char **args)
 {
-  int i;
-  grub_term_output_t term;
-  struct grub_term_autoload *aut;
+  (void) GRUB_FIELD_MATCH (grub_term_inputs, struct abstract_terminal *, next);
+  (void) GRUB_FIELD_MATCH (grub_term_inputs, struct abstract_terminal *, name);
+  (void) GRUB_FIELD_MATCH (grub_term_inputs, struct abstract_terminal *, init);
+  (void) GRUB_FIELD_MATCH (grub_term_inputs, struct abstract_terminal *, fini);
+  return handle_command (argc, args,
+                        (struct abstract_terminal **) &grub_term_inputs,
+                        (struct abstract_terminal **) &grub_term_inputs_disabled,
+                        grub_term_input_autoload,
+                        N_ ("Active input terminals:"),
+                        N_ ("Available input terminals:"));
+}
 
-  if (argc == 0)
-    {
-      grub_puts_ (N_ ("Active output terminals:"));
-      FOR_ACTIVE_TERM_OUTPUTS(term)
-	grub_printf ("%s ", term->name);
-      grub_printf ("\n");
-      grub_puts_ (N_ ("Available output terminals:"));
-      FOR_DISABLED_TERM_OUTPUTS(term)
-	grub_printf ("%s ", term->name);
-      /* This is quadratic but we don't expect mode than 30 terminal
-	 modules ever.  */
-      for (aut = grub_term_output_autoload; aut; aut = aut->next)
-	{
-	  FOR_DISABLED_TERM_OUTPUTS(term)
-	    if (grub_strcmp (term->name, aut->name) == 0)
-	      break;
-	  if (!term)
-	    FOR_ACTIVE_TERM_OUTPUTS(term)
-	      if (grub_strcmp (term->name, aut->name) == 0)
-		break;
-	  if (!term)
-	    grub_printf ("%s ", aut->name);
-	}
-      grub_printf ("\n");
-      return GRUB_ERR_NONE;
-    }
-  i = 0;
-
-  if (grub_strcmp (args[0], "--append") == 0
-      || grub_strcmp (args[0], "--remove") == 0)
-    i++;
-
-  if (i == argc)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, N_ ("no terminal specified"));
-
-  for (; i < argc; i++)
-    {
-      int again = 0;
-      while (1)
-	{
-	  FOR_DISABLED_TERM_OUTPUTS(term)
-	    if (grub_strcmp (args[i], term->name) == 0)
-	      break;
-	  if (term == 0)
-	    FOR_ACTIVE_TERM_OUTPUTS(term)
-	      if (grub_strcmp (args[i], term->name) == 0)
-		break;
-	  if (term)
-	    break;
-	  if (again)
-	    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown terminal '%s'\n",
-			       args[i]);
-	  for (aut = grub_term_output_autoload; aut; aut = aut->next)
-	    if (grub_strcmp (args[i], aut->name) == 0)
-	      {
-		grub_dl_t mod;
-		mod = grub_dl_load (aut->modname);
-		if (mod)
-		  grub_dl_ref (mod);
-		grub_errno = GRUB_ERR_NONE;
-		break;
-	      }
-	  if (!aut)
-	    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown terminal '%s'\n",
-			       args[i]);
-	  again = 1;
-	}
-    }
-
-  if (grub_strcmp (args[0], "--append") == 0)
-    {
-      for (i = 1; i < argc; i++)
-	{
-	  FOR_DISABLED_TERM_OUTPUTS(term)
-	    if (grub_strcmp (args[i], term->name) == 0)
-	      break;
-	  if (term)
-	    {
-              if (term->init && term->init () != GRUB_ERR_NONE)
-                return grub_errno;
-
-	      grub_list_remove (GRUB_AS_LIST_P (&(grub_term_outputs_disabled)),
-				GRUB_AS_LIST (term));
-	      grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs),
-			      GRUB_AS_LIST (term));
-	    }
-	}
-      return GRUB_ERR_NONE;
-    }
-
-  if (grub_strcmp (args[0], "--remove") == 0)
-    {
-      for (i = 1; i < argc; i++)
-	{
-	  FOR_ACTIVE_TERM_OUTPUTS(term)
-	    if (grub_strcmp (args[i], term->name) == 0)
-	      break;
-	  if (term)
-	    {
-	      if (!term->next && term == grub_term_outputs)
-		return grub_error (GRUB_ERR_BAD_ARGUMENT,
-				   "can't remove the last terminal");
-	      grub_list_remove (GRUB_AS_LIST_P (&(grub_term_outputs)),
-				GRUB_AS_LIST (term));
-	      if (term->fini)
-		term->fini ();
-	      grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs_disabled),
-			      GRUB_AS_LIST (term));
-	    }
-	}
-      return GRUB_ERR_NONE;
-    }
-
-  for (i = 0; i < argc; i++)
-    {
-      FOR_DISABLED_TERM_OUTPUTS(term)
-	if (grub_strcmp (args[i], term->name) == 0)
-	  break;
-      if (term)
-	{
-	  if (term->init && term->init () != GRUB_ERR_NONE)
-	    return grub_errno;
-
-	  grub_list_remove (GRUB_AS_LIST_P (&(grub_term_outputs_disabled)),
-			    GRUB_AS_LIST (term));
-	  grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs),
-			  GRUB_AS_LIST (term));
-	}	
-    }
-
-  FOR_ACTIVE_TERM_OUTPUTS(term)
-  {
-    for (i = 0; i < argc; i++)
-      if (grub_strcmp (args[i], term->name) == 0)
-	break;
-    if (i == argc)
-      {
-	if (!term->next && term == grub_term_outputs)
-	  return grub_error (GRUB_ERR_BAD_ARGUMENT,
-			     "can't remove the last terminal");
-	grub_list_remove (GRUB_AS_LIST_P (&(grub_term_outputs)),
-			  GRUB_AS_LIST (term));
-	if (term->fini)
-	  term->fini ();
-	grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs_disabled),
-			GRUB_AS_LIST (term));
-      }
-  }
-
-  return GRUB_ERR_NONE;
+static grub_err_t
+grub_cmd_terminal_output (grub_command_t cmd __attribute__ ((unused)),
+                         int argc, char **args)
+{
+  (void) GRUB_FIELD_MATCH (grub_term_outputs, struct abstract_terminal *, next);
+  (void) GRUB_FIELD_MATCH (grub_term_outputs, struct abstract_terminal *, name);
+  (void) GRUB_FIELD_MATCH (grub_term_outputs, struct abstract_terminal *, init);
+  (void) GRUB_FIELD_MATCH (grub_term_outputs, struct abstract_terminal *, fini);
+  return handle_command (argc, args, (struct abstract_terminal **) &grub_term_outputs,
+                        (struct abstract_terminal **) &grub_term_outputs_disabled,
+                        grub_term_output_autoload,
+                        N_ ("Active output terminals:"),
+                        N_ ("Available output terminals:"));
 }
 
 static grub_command_t cmd_terminal_input, cmd_terminal_output;

From 421e8a55915429de1388c01467923ab2a3efeab3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 1 May 2010 13:23:19 +0200
Subject: [PATCH 0870/1628] Fix ppc compilation problems

---
 conf/powerpc-ieee1275.rmk        |   2 +-
 conf/tests.rmk                   |   2 +-
 include/grub/powerpc/memory.h    |  47 ++++++++
 include/grub/relocator_private.h |  10 ++
 lib/powerpc/relocator.c          |  13 ++-
 lib/relocator.c                  | 188 ++++++++++++++++++-------------
 loader/powerpc/ieee1275/linux.c  |   1 -
 7 files changed, 175 insertions(+), 88 deletions(-)
 create mode 100644 include/grub/powerpc/memory.h

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 933aefe77..86ec85bfc 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -67,7 +67,7 @@ datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For relocator.mod.
 pkglib_MODULES += relocator.mod
-relocator_mod_SOURCES = lib/$(target_cpu)/relocator.c lib/relocator.c lib/$(target_cpu)/relocator_asm.S
+relocator_mod_SOURCES = lib/$(target_cpu)/relocator.c lib/relocator.c lib/$(target_cpu)/relocator_asm.S lib/ieee1275/relocator.c
 relocator_mod_CFLAGS = $(COMMON_CFLAGS)
 relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
 relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/conf/tests.rmk b/conf/tests.rmk
index d48bc3dd9..e86c315d3 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -2,7 +2,7 @@
 
 # For grub-shell
 grub-shell: tests/util/grub-shell.in config.status
-	./config.status --file=$@:$<
+	./config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
 	chmod +x $@
 check_SCRIPTS += grub-shell
 CLEANFILES += grub-shell
diff --git a/include/grub/powerpc/memory.h b/include/grub/powerpc/memory.h
new file mode 100644
index 000000000..b748f33c5
--- /dev/null
+++ b/include/grub/powerpc/memory.h
@@ -0,0 +1,47 @@
+/* memory.h - describe the memory map */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2007,2008,2009  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/>.
+ */
+
+#ifndef GRUB_MEMORY_CPU_HEADER
+#define GRUB_MEMORY_CPU_HEADER	1
+
+#ifndef ASM_FILE
+
+typedef grub_addr_t grub_phys_addr_t;
+
+static inline grub_phys_addr_t
+grub_vtop (void *a)
+{
+  return (grub_phys_addr_t) a;
+}
+
+static inline void *
+grub_map_memory (grub_phys_addr_t a, grub_size_t size __attribute__ ((unused)))
+{
+  return (void *) a;
+}
+
+static inline void
+grub_unmap_memory (void *a __attribute__ ((unused)),
+		   grub_size_t size __attribute__ ((unused)))
+{
+}
+
+#endif
+
+#endif /* ! GRUB_MEMORY_CPU_HEADER */
diff --git a/include/grub/relocator_private.h b/include/grub/relocator_private.h
index 10e445bfe..1c563cb64 100644
--- a/include/grub/relocator_private.h
+++ b/include/grub/relocator_private.h
@@ -40,6 +40,8 @@ void grub_cpu_relocator_backward (void *rels, void *src, void *tgt,
 				 grub_size_t size);
 void grub_cpu_relocator_jumper (void *rels, grub_addr_t addr);
 
+/* Remark: GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT_LOG = 1 or 2
+   aren't supported.  */
 #ifdef GRUB_MACHINE_IEEE1275
 #define GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS 1
 #define GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT_LOG 0
@@ -50,6 +52,12 @@ void grub_cpu_relocator_jumper (void *rels, grub_addr_t addr);
 #define GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS 0
 #endif
 
+#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS && GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT_LOG != 0
+#define GRUB_RELOCATOR_HAVE_LEFTOVERS 1
+#else
+#define GRUB_RELOCATOR_HAVE_LEFTOVERS 0
+#endif
+
 #if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
 #define GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT (1 << GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT_LOG)
 #endif
@@ -67,6 +75,8 @@ struct grub_relocator_mmap_event
     /* To track the regions already in heap.  */
     FIRMWARE_BLOCK_START = 6, 
     FIRMWARE_BLOCK_END = FIRMWARE_BLOCK_START | 1,
+#endif
+#if GRUB_RELOCATOR_HAVE_LEFTOVERS
     REG_LEFTOVER_START = 8, 
     REG_LEFTOVER_END = REG_LEFTOVER_START | 1,
 #endif
diff --git a/lib/powerpc/relocator.c b/lib/powerpc/relocator.c
index 9f5fc1c7f..85dfbeaf3 100644
--- a/lib/powerpc/relocator.c
+++ b/lib/powerpc/relocator.c
@@ -107,15 +107,15 @@ grub_err_t
 grub_relocator32_boot (struct grub_relocator *rel,
 		       struct grub_relocator32_state state)
 {
-  grub_addr_t target;
-  void *src, *ptr;
+  void *ptr;
   grub_err_t err;
-  grub_addr_t relst;
+  void *relst;
   grub_size_t relsize;
   grub_size_t stateset_size = 32 * REGW_SIZEOF + JUMP_SIZEOF;
   unsigned i;
+  grub_relocator_chunk_t ch;
 
-  err = grub_relocator_alloc_chunk_align (rel, &src, &target, 0,
+  err = grub_relocator_alloc_chunk_align (rel, &ch, 0,
 					  (0xffffffff - stateset_size)
 					  + 1, stateset_size,
 					  sizeof (grub_uint32_t),
@@ -123,12 +123,13 @@ grub_relocator32_boot (struct grub_relocator *rel,
   if (err)
     return err;
 
-  ptr = src;
+  ptr = get_virtual_current_address (ch);
   for (i = 0; i < 32; i++)
     write_reg (i, state.gpr[i], &ptr);
   write_jump (&ptr);
 
-  err = grub_relocator_prepare_relocs (rel, target, &relst, &relsize);
+  err = grub_relocator_prepare_relocs (rel, get_physical_target_address (ch),
+				       &relst, &relsize);
   if (err)
     return err;
 
diff --git a/lib/relocator.c b/lib/relocator.c
index 4c180e72a..6fbdb71d7 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -45,7 +45,9 @@ struct grub_relocator_subchunk
   grub_size_t size;
   grub_size_t pre_size;
   struct grub_relocator_extra_block *extra;
+#if GRUB_RELOCATOR_HAVE_LEFTOVERS
   struct grub_relocator_fw_leftover *pre, *post;
+#endif
 };
 
 struct grub_relocator_chunk
@@ -67,7 +69,7 @@ struct grub_relocator_extra_block
   grub_phys_addr_t end;
 };
 
-#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+#if GRUB_RELOCATOR_HAVE_LEFTOVERS
 struct grub_relocator_fw_leftover
 {
   struct grub_relocator_fw_leftover *next;
@@ -241,7 +243,7 @@ allocate_inreg (grub_phys_addr_t paddr, grub_size_t size,
     }
 }
 
-#if GRUB_RELOCATOR_HAVE_FIRMWARE_REQUESTS
+#if GRUB_RELOCATOR_HAVE_LEFTOVERS
 static void
 check_leftover (struct grub_relocator_fw_leftover *lo)
 {
@@ -367,6 +369,7 @@ free_subchunk (const struct grub_relocator_subchunk *subchu)
 			   GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
 	if (fstart < fend)
 	  grub_relocator_firmware_free_region (fstart, fend - fstart);
+#if GRUB_RELOCATOR_HAVE_LEFTOVERS
 	if (subchu->pre)
 	  {
 	    int off = subchu->start - fstart
@@ -384,6 +387,7 @@ free_subchunk (const struct grub_relocator_subchunk *subchu)
 	    subchu->pre->freebytes[off / 8] |= ((1 << (8 - (off % 8))) - 1);
 	    check_leftover (subchu->post);
 	  }
+#endif
 	*subchu->extra->prev = subchu->extra->next;
 	grub_free (subchu->extra);
       }
@@ -450,7 +454,9 @@ malloc_in_range (struct grub_relocator *rel,
     maxevents += 2;
 
   maxevents += grub_relocator_firmware_get_max_events ();
+#endif
 
+#if GRUB_RELOCATOR_HAVE_LEFTOVERS
   {
     struct grub_relocator_fw_leftover *cur;
     for (cur = leftovers; cur; cur = cur->next)
@@ -500,8 +506,8 @@ malloc_in_range (struct grub_relocator *rel,
   for (r = grub_mm_base; r; r = r->next)
     {
       grub_dprintf ("relocator", "Blocking at 0x%lx-0x%lx\n",
-		    (grub_addr_t) r - r->pre_size, 
-		    (grub_addr_t) (r + 1) + r->size);
+		    (unsigned long) r - r->pre_size, 
+		    (unsigned long) (r + 1) + r->size);
       events[N].type = FIRMWARE_BLOCK_START;
       events[N].pos = (grub_addr_t) r - r->pre_size;
       N++;
@@ -514,7 +520,7 @@ malloc_in_range (struct grub_relocator *rel,
     for (cur = extra_blocks; cur; cur = cur->next)
       {
 	grub_dprintf ("relocator", "Blocking at 0x%lx-0x%lx\n",
-		      cur->start, cur->end);
+		      (unsigned long) cur->start, (unsigned long) cur->end);
 	events[N].type = FIRMWARE_BLOCK_START;
 	events[N].pos = cur->start;
 	N++;
@@ -526,6 +532,7 @@ malloc_in_range (struct grub_relocator *rel,
 
   N += grub_relocator_firmware_fill_events (events + N);
 
+#if GRUB_RELOCATOR_HAVE_LEFTOVERS
   {
     struct grub_relocator_fw_leftover *cur;
     for (cur = leftovers; cur; cur = cur->next)
@@ -552,6 +559,7 @@ malloc_in_range (struct grub_relocator *rel,
 	  }
       }
   }
+#endif
 #endif
 
   /* No malloc from this point.  */
@@ -636,7 +644,11 @@ malloc_in_range (struct grub_relocator *rel,
   /* Now events are nicely sorted.  */
   {
     int nstarted = 0, ncollisions = 0, nstartedfw = 0, nblockfw = 0;
+#if GRUB_RELOCATOR_HAVE_LEFTOVERS
     int nlefto = 0;
+#else
+    const int nlefto = 0;
+#endif
     grub_addr_t starta = 0;
     int numstarted;
     for (j = from_low_priv ? 0 : N - 1; from_low_priv ? j < N : (j + 1); 
@@ -663,6 +675,9 @@ malloc_in_range (struct grub_relocator *rel,
 	  case FIRMWARE_BLOCK_END:
 	    nblockfw--;
 	    break;
+#endif
+
+#if GRUB_RELOCATOR_HAVE_LEFTOVERS
 	  case REG_LEFTOVER_START:
 	    nlefto++;
 	    break;
@@ -794,7 +809,8 @@ malloc_in_range (struct grub_relocator *rel,
 			= ALIGN_UP (alloc_end,
 				    GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
 		      grub_dprintf ("relocator", "requesting %lx-%lx\n",
-				    fstart, fend);
+				    (unsigned long) fstart,
+				    (unsigned long) fend);
 		      /* The failure here can be very expensive.  */
 		      if (!grub_relocator_firmware_alloc_region (fstart, 
 								 fend - fstart))
@@ -807,6 +823,9 @@ malloc_in_range (struct grub_relocator *rel,
 			}
 		      break;
 		    }
+#endif
+
+#if GRUB_RELOCATOR_HAVE_LEFTOVERS
 		  case CHUNK_TYPE_LEFTOVER:
 		    {
 		      unsigned offstart = alloc_start
@@ -857,14 +876,6 @@ malloc_in_range (struct grub_relocator *rel,
 	    fwin--;
 	    break;
 
-	  case REG_LEFTOVER_START:
-	    fwlefto++;
-	    break;
-
-	  case REG_LEFTOVER_END:
-	    fwlefto--;
-	    break;
-
 	  case FIRMWARE_BLOCK_START:
 	    fwb++;
 	    break;
@@ -873,6 +884,16 @@ malloc_in_range (struct grub_relocator *rel,
 	    fwb--;
 	    break;
 #endif
+
+#if GRUB_RELOCATOR_HAVE_LEFTOVERS
+	  case REG_LEFTOVER_START:
+	    fwlefto++;
+	    break;
+
+	  case REG_LEFTOVER_END:
+	    fwlefto--;
+	    break;
+#endif
 	  case COLLISION_START:
 	    ncol++;
 	    break;
@@ -971,8 +992,6 @@ malloc_in_range (struct grub_relocator *rel,
 		if (!oom && typepre == CHUNK_TYPE_FIRMWARE)
 		  {
 		    grub_addr_t fstart, fend;
-		    struct grub_relocator_fw_leftover *lo1 = NULL;
-		    struct grub_relocator_fw_leftover *lo2 = NULL;
 
 		    fstart
 		      = ALIGN_DOWN (alloc_start,
@@ -981,68 +1000,77 @@ malloc_in_range (struct grub_relocator *rel,
 		      = ALIGN_UP (alloc_end,
 				  GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
 
-		    if (fstart != alloc_start)
-		      lo1 = grub_malloc (sizeof (*lo1));
-		    if (fend != alloc_end)
-		      lo2 = grub_malloc (sizeof (*lo2));
-		    if ((!lo1 && fstart != alloc_start)
-			|| (!lo2 && fend != alloc_end))
-		      {
-			struct grub_relocator_extra_block *ne;
-			grub_free (lo1);
-			grub_free (lo2);
-			lo1 = NULL;
-			lo2 = NULL;
-			oom = 1;
-			grub_memcpy (&tofree, curschu, sizeof (tofree));
-			ne = extra_blocks;
-			extra_blocks = extra_blocks->next;
-			grub_free (ne);
-		      }
-		    if (lo1)
-		      {
-			lo1->quantstart = fstart;
-			grub_memset (lo1->freebytes, 0xff,
-				     (alloc_start - fstart) / 8);
-			lo1->freebytes[(alloc_start - fstart) / 8]
-			  = (1 << ((alloc_start - fstart) % 8)) - 1;
-			grub_memset (lo1->freebytes
-				     + ((alloc_start - fstart) / 8) + 1, 0,
-				     sizeof (lo1->freebytes)
-				     - (alloc_start - fstart) / 8 - 1);
-			lo1->next = leftovers;
-			lo1->prev = &leftovers;
-			if (leftovers)
-			  leftovers->prev = &lo1->next;
-			leftovers = lo1;
-		      }
-		    if (lo2)
-		      {
-			lo2->quantstart
-			  = fend - GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT;
-			grub_memset (lo2->freebytes, 0,
-				     (alloc_end - lo2->quantstart) / 8);
-			lo2->freebytes[(alloc_end - lo2->quantstart) / 8]
-			  = ~((1 << ((alloc_end - lo2->quantstart) % 8)) - 1);
-			grub_memset (lo2->freebytes
-				     + ((alloc_end - lo2->quantstart) / 8)
-				     + 1, 0, sizeof (lo2->freebytes)
-				     - (alloc_end - lo2->quantstart) / 8 - 1);
-			lo2->prev = &leftovers;
-			if (leftovers)
-			  leftovers->prev = &lo2->next;
-			lo2->next = leftovers;
-			leftovers = lo2;
-		      }
-		    curschu->pre = lo1;
-		    curschu->post = lo2;
+#if GRUB_RELOCATOR_HAVE_LEFTOVERS
+		    {
+		      struct grub_relocator_fw_leftover *lo1 = NULL;
+		      struct grub_relocator_fw_leftover *lo2 = NULL;
+		      if (fstart != alloc_start)
+			lo1 = grub_malloc (sizeof (*lo1));
+		      if (fend != alloc_end)
+			lo2 = grub_malloc (sizeof (*lo2));
+		      if ((!lo1 && fstart != alloc_start)
+			  || (!lo2 && fend != alloc_end))
+			{
+			  struct grub_relocator_extra_block *ne;
+			  grub_free (lo1);
+			  grub_free (lo2);
+			  lo1 = NULL;
+			  lo2 = NULL;
+			  oom = 1;
+			  grub_memcpy (&tofree, curschu, sizeof (tofree));
+			  ne = extra_blocks;
+			  extra_blocks = extra_blocks->next;
+			  grub_free (ne);
+			}
+		      if (lo1)
+			{
+			  lo1->quantstart = fstart;
+			  grub_memset (lo1->freebytes, 0xff,
+				       (alloc_start - fstart) / 8);
+			  lo1->freebytes[(alloc_start - fstart) / 8]
+			    = (1 << ((alloc_start - fstart) % 8)) - 1;
+			  grub_memset (lo1->freebytes
+				       + ((alloc_start - fstart) / 8) + 1, 0,
+				       sizeof (lo1->freebytes)
+				       - (alloc_start - fstart) / 8 - 1);
+			  lo1->next = leftovers;
+			  lo1->prev = &leftovers;
+			  if (leftovers)
+			    leftovers->prev = &lo1->next;
+			  leftovers = lo1;
+			}
+		      if (lo2)
+			{
+			  lo2->quantstart
+			    = fend - GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT;
+			  grub_memset (lo2->freebytes, 0,
+				       (alloc_end - lo2->quantstart) / 8);
+			  lo2->freebytes[(alloc_end - lo2->quantstart) / 8]
+			    = ~((1 << ((alloc_end - lo2->quantstart) % 8)) - 1);
+			  grub_memset (lo2->freebytes
+				       + ((alloc_end - lo2->quantstart) / 8)
+				       + 1, 0, sizeof (lo2->freebytes)
+				       - (alloc_end - lo2->quantstart) / 8 - 1);
+			  lo2->prev = &leftovers;
+			  if (leftovers)
+			    leftovers->prev = &lo2->next;
+			  lo2->next = leftovers;
+			  leftovers = lo2;
+			}
+		      curschu->pre = lo1;
+		      curschu->post = lo2;
+		    }
+#endif
 		  }
 
+#if GRUB_RELOCATOR_HAVE_LEFTOVERS
 		if (typepre == CHUNK_TYPE_LEFTOVER)
 		  {
 		    curschu->pre = events[last_start].leftover;
 		    curschu->post = events[last_start].leftover;
 		  }
+#endif
+
 #endif
 		if (!oom)
 		  cural++;
@@ -1077,14 +1105,6 @@ malloc_in_range (struct grub_relocator *rel,
 	    fwin--;
 	    break;
 
-	  case REG_LEFTOVER_START:
-	    fwlefto++;
-	    break;
-
-	  case REG_LEFTOVER_END:
-	    fwlefto--;
-	    break;
-
 	  case FIRMWARE_BLOCK_START:
 	    fwb++;
 	    break;
@@ -1093,6 +1113,16 @@ malloc_in_range (struct grub_relocator *rel,
 	    fwb--;
 	    break;
 #endif
+
+#if GRUB_RELOCATOR_HAVE_LEFTOVERS
+	  case REG_LEFTOVER_START:
+	    fwlefto++;
+	    break;
+
+	  case REG_LEFTOVER_END:
+	    fwlefto--;
+	    break;
+#endif
 	  case COLLISION_START:
 	    ncol++;
 	    break;
diff --git a/loader/powerpc/ieee1275/linux.c b/loader/powerpc/ieee1275/linux.c
index 930c0cb41..c9feec975 100644
--- a/loader/powerpc/ieee1275/linux.c
+++ b/loader/powerpc/ieee1275/linux.c
@@ -24,7 +24,6 @@
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/ieee1275/ieee1275.h>
-#include <grub/machine/loader.h>
 #include <grub/command.h>
 #include <grub/i18n.h>
 

From 3080f7a7bdbcf8713e2ffb1ce7916a7ba48293ba Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 1 May 2010 13:27:13 +0200
Subject: [PATCH 0871/1628] 	* kern/parser.c (grub_parser_execute): Cope
 with read-only config.

---
 ChangeLog     | 6 +++++-
 kern/parser.c | 7 +++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 530ecf32a..1b53d24f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
-	MErge handling of input and output terminals. Fix a hang.
+	* kern/parser.c (grub_parser_execute): Cope with read-only config.
+
+2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Merge handling of input and output terminals. Fix a hang.
 
 	* commands/terminal.c (abstract_terminal): New struct.
 	(handle_command): New function. Based on grub_cmd_terminal_input.
diff --git a/kern/parser.c b/kern/parser.c
index 80312b9b4..07597a1a8 100644
--- a/kern/parser.c
+++ b/kern/parser.c
@@ -249,12 +249,11 @@ grub_parser_execute (char *source)
       }
 
     p = grub_strchr (source, '\n');
-    if (p)
-      *p = 0;
 
-    *line = grub_strdup (source);
     if (p)
-      *p = '\n';
+      *line = grub_strndup (source, p - source);
+    else
+      *line = grub_strdup (source);
     source = p ? p + 1 : 0;
     return 0;
   }

From 7210dca9426f0540b9a49e006cab59ea1e145c29 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 1 May 2010 14:06:53 +0200
Subject: [PATCH 0872/1628] 	Split coreboot and multiboot ports.

	* conf/i386-multiboot.rmk: New file.
	* configure.ac: Add multiboot port.
	* include/grub/i386/multiboot/boot.h: New file.
	* include/grub/i386/multiboot/console.h: Likewise.
	* include/grub/i386/multiboot/init.h: Likewise.
	* include/grub/i386/multiboot/kernel.h: Likewise.
	* include/grub/i386/multiboot/loader.h: Likewise.
	* include/grub/i386/multiboot/memory.h: Likewise.
	* include/grub/i386/multiboot/serial.h: Likewise.
	* include/grub/i386/multiboot/time.h: Likewise.
	* include/grub/multiboot.h: Add GRUB_MACHINE_MULTIBOOT to ifdef.
	* loader/multiboot.c: Likewise.
	* loader/multiboot_mbi2.c: Likewise.
	* util/grub-mkrescue.in: Generate multiboot rescue.
---
 ChangeLog                             | 19 +++++++
 conf/i386-multiboot.rmk               | 74 +++++++++++++++++++++++++++
 configure.ac                          |  2 +
 include/grub/i386/multiboot/boot.h    |  1 +
 include/grub/i386/multiboot/console.h |  1 +
 include/grub/i386/multiboot/init.h    |  1 +
 include/grub/i386/multiboot/kernel.h  |  1 +
 include/grub/i386/multiboot/loader.h  |  1 +
 include/grub/i386/multiboot/memory.h  |  1 +
 include/grub/i386/multiboot/serial.h  |  1 +
 include/grub/i386/multiboot/time.h    |  1 +
 include/grub/multiboot.h              |  2 +-
 loader/multiboot.c                    |  2 +-
 loader/multiboot_mbi2.c               |  2 +-
 util/grub-mkrescue.in                 | 24 ++++-----
 15 files changed, 118 insertions(+), 15 deletions(-)
 create mode 100644 conf/i386-multiboot.rmk
 create mode 100644 include/grub/i386/multiboot/boot.h
 create mode 100644 include/grub/i386/multiboot/console.h
 create mode 100644 include/grub/i386/multiboot/init.h
 create mode 100644 include/grub/i386/multiboot/kernel.h
 create mode 100644 include/grub/i386/multiboot/loader.h
 create mode 100644 include/grub/i386/multiboot/memory.h
 create mode 100644 include/grub/i386/multiboot/serial.h
 create mode 100644 include/grub/i386/multiboot/time.h

diff --git a/ChangeLog b/ChangeLog
index 1b53d24f5..43f223113 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Split coreboot and multiboot ports.
+
+	* conf/i386-multiboot.rmk: New file.
+	* configure.ac: Add multiboot port.
+	* include/grub/i386/multiboot/boot.h: New file.
+	* include/grub/i386/multiboot/console.h: Likewise.
+	* include/grub/i386/multiboot/init.h: Likewise.
+	* include/grub/i386/multiboot/kernel.h: Likewise.
+	* include/grub/i386/multiboot/loader.h: Likewise.
+	* include/grub/i386/multiboot/memory.h: Likewise.
+	* include/grub/i386/multiboot/serial.h: Likewise.
+	* include/grub/i386/multiboot/time.h: Likewise.
+	* include/grub/multiboot.h: Add GRUB_MACHINE_MULTIBOOT to ifdef.
+	* loader/multiboot.c: Likewise.
+	* loader/multiboot_mbi2.c: Likewise.
+	* util/grub-mkrescue.in: Generate multiboot rescue.
+
 2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/parser.c (grub_parser_execute): Cope with read-only config.
diff --git a/conf/i386-multiboot.rmk b/conf/i386-multiboot.rmk
new file mode 100644
index 000000000..69b8e9a48
--- /dev/null
+++ b/conf/i386-multiboot.rmk
@@ -0,0 +1,74 @@
+# -*- makefile -*-
+
+COMMON_CFLAGS = -mrtd -mregparm=3 
+
+# Images.
+
+GRUB_KERNEL_MACHINE_LINK_ADDR	= 0x8200
+
+pkglib_PROGRAMS += kernel.img
+kernel_img_SOURCES = kern/i386/coreboot/startup.S \
+	kern/i386/misc.S \
+	kern/i386/coreboot/init.c \
+	kern/i386/multiboot_mmap.c \
+	kern/i386/halt.c \
+	kern/main.c kern/device.c \
+	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
+	kern/misc.c kern/mm.c kern/term.c \
+	kern/rescue_parser.c kern/rescue_reader.c \
+	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
+	kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
+	kern/i386/tsc.c kern/i386/pit.c \
+	kern/generic/rtc_get_time_ms.c \
+	kern/generic/millisleep.c \
+	kern/env.c \
+	term/i386/pc/vga_text.c term/i386/vga_common.c \
+	symlist.c
+kernel_img_CFLAGS = $(COMMON_CFLAGS)
+kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
+kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR),-Bstatic
+
+sbin_SCRIPTS += grub-install
+grub_install_SOURCES = util/grub-install.in
+
+bin_SCRIPTS += grub-mkrescue
+grub_mkrescue_SOURCES = util/grub-mkrescue.in
+
+# Modules.
+pkglib_MODULES = linux.mod aout.mod halt.mod datetime.mod mmap.mod
+
+# For mmap.mod.
+mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
+mmap_mod_CFLAGS = $(COMMON_CFLAGS)
+mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
+mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
+
+# For linux.mod.
+linux_mod_SOURCES = loader/i386/linux.c
+linux_mod_CFLAGS = $(COMMON_CFLAGS)
+linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For halt.mod.
+halt_mod_SOURCES = commands/halt.c
+halt_mod_CFLAGS = $(COMMON_CFLAGS)
+halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For aout.mod.
+aout_mod_SOURCES = loader/aout.c
+aout_mod_CFLAGS = $(COMMON_CFLAGS)
+aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For bsd.mod
+pkglib_MODULES += bsd.mod
+bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c loader/i386/bsd_helper.S loader/i386/bsd_trampoline.S
+bsd_mod_CFLAGS = $(COMMON_CFLAGS)
+bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
+bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
+
+# For datetime.mod
+datetime_mod_SOURCES = lib/cmos_datetime.c
+datetime_mod_CFLAGS = $(COMMON_CFLAGS)
+datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+include $(srcdir)/conf/i386.mk
+include $(srcdir)/conf/common.mk
diff --git a/configure.ac b/configure.ac
index 4bfc5a2b0..4e1dd41d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,7 @@ case "$target_cpu"-"$platform" in
   i386-efi) ;;
   x86_64-efi) ;;
   i386-pc) ;;
+  i386-multiboot) ;;
   i386-coreboot) ;;
   i386-linuxbios) platform=coreboot ;;
   i386-ieee1275) ;;
@@ -136,6 +137,7 @@ esac
 
 case "$platform" in
   coreboot)	machine_CFLAGS="-DGRUB_MACHINE_COREBOOT=1" ;;
+  multiboot)	machine_CFLAGS="-DGRUB_MACHINE_MULTIBOOT=1" ;;
   efi)		machine_CFLAGS="-DGRUB_MACHINE_EFI=1" ;;
   ieee1275)	machine_CFLAGS="-DGRUB_MACHINE_IEEE1275=1" ;;
   qemu)		machine_CFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
diff --git a/include/grub/i386/multiboot/boot.h b/include/grub/i386/multiboot/boot.h
new file mode 100644
index 000000000..c33f9bac0
--- /dev/null
+++ b/include/grub/i386/multiboot/boot.h
@@ -0,0 +1 @@
+#include <grub/i386/coreboot/boot.h>
diff --git a/include/grub/i386/multiboot/console.h b/include/grub/i386/multiboot/console.h
new file mode 100644
index 000000000..774399a4e
--- /dev/null
+++ b/include/grub/i386/multiboot/console.h
@@ -0,0 +1 @@
+#include <grub/i386/coreboot/console.h>
diff --git a/include/grub/i386/multiboot/init.h b/include/grub/i386/multiboot/init.h
new file mode 100644
index 000000000..fd935c3a2
--- /dev/null
+++ b/include/grub/i386/multiboot/init.h
@@ -0,0 +1 @@
+#include <grub/i386/coreboot/init.h>
diff --git a/include/grub/i386/multiboot/kernel.h b/include/grub/i386/multiboot/kernel.h
new file mode 100644
index 000000000..b41e86ebb
--- /dev/null
+++ b/include/grub/i386/multiboot/kernel.h
@@ -0,0 +1 @@
+#include <grub/i386/coreboot/kernel.h>
diff --git a/include/grub/i386/multiboot/loader.h b/include/grub/i386/multiboot/loader.h
new file mode 100644
index 000000000..1c725be19
--- /dev/null
+++ b/include/grub/i386/multiboot/loader.h
@@ -0,0 +1 @@
+#include <grub/i386/coreboot/loader.h>
diff --git a/include/grub/i386/multiboot/memory.h b/include/grub/i386/multiboot/memory.h
new file mode 100644
index 000000000..8dd6f7c8c
--- /dev/null
+++ b/include/grub/i386/multiboot/memory.h
@@ -0,0 +1 @@
+#include <grub/i386/coreboot/memory.h>
diff --git a/include/grub/i386/multiboot/serial.h b/include/grub/i386/multiboot/serial.h
new file mode 100644
index 000000000..2d8563414
--- /dev/null
+++ b/include/grub/i386/multiboot/serial.h
@@ -0,0 +1 @@
+#include <grub/i386/coreboot/serial.h>
diff --git a/include/grub/i386/multiboot/time.h b/include/grub/i386/multiboot/time.h
new file mode 100644
index 000000000..7177c7488
--- /dev/null
+++ b/include/grub/i386/multiboot/time.h
@@ -0,0 +1 @@
+#include <grub/i386/coreboot/time.h>
diff --git a/include/grub/multiboot.h b/include/grub/multiboot.h
index 49d71fa09..63947d1bc 100644
--- a/include/grub/multiboot.h
+++ b/include/grub/multiboot.h
@@ -49,7 +49,7 @@ void grub_multiboot_set_bootdev (void);
 grub_uint32_t grub_get_multiboot_mmap_count (void);
 grub_err_t grub_multiboot_set_video_mode (void);
 
-#if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
+#if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_MULTIBOOT) || defined (GRUB_MACHINE_QEMU)
 #include <grub/i386/pc/vbe.h>
 #define GRUB_MACHINE_HAS_VGA_TEXT 1
 #else
diff --git a/loader/multiboot.c b/loader/multiboot.c
index ce1e75dda..592289c45 100644
--- a/loader/multiboot.c
+++ b/loader/multiboot.c
@@ -50,7 +50,7 @@
 #include <grub/efi/efi.h>
 #endif
 
-#if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
+#if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_MULTIBOOT) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
 #define DEFAULT_VIDEO_MODE "text"
 #else
 #define DEFAULT_VIDEO_MODE "auto"
diff --git a/loader/multiboot_mbi2.c b/loader/multiboot_mbi2.c
index 8b67f9383..7e9cebe49 100644
--- a/loader/multiboot_mbi2.c
+++ b/loader/multiboot_mbi2.c
@@ -32,7 +32,7 @@
 #include <grub/env.h>
 #include <grub/video.h>
 
-#if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_QEMU)
+#if defined (GRUB_MACHINE_PCBIOS) || defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_MULTIBOOT) || defined (GRUB_MACHINE_QEMU)
 #include <grub/i386/pc/vbe.h>
 #define HAS_VGA_TEXT 1
 #else
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index aafdfb059..44e80b106 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -30,7 +30,7 @@ target_cpu=@target_cpu@
 native_platform=@platform@
 pkglib_DATA="@pkglib_DATA@"
 
-coreboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-coreboot
+multiboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-multiboot
 pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-pc
 
 # Usage: usage
@@ -122,45 +122,45 @@ process_input_dir ()
 }
 
 if [ "${override_dir}" = "" ] ; then
-    if test -e "${coreboot_dir}" ; then
-        process_input_dir ${coreboot_dir} coreboot
+    if test -e "${multiboot_dir}" ; then
+        process_input_dir ${multiboot_dir} multiboot
     fi
     if test -e "${pc_dir}" ; then
         process_input_dir ${pc_dir} pc
     fi
 else
     process_input_dir ${override_dir} ${native_platform}
-    coreboot_dir=
+    multiboot_dir=
     pc_dir=
     case "${native_platform}" in
-        coreboot) coreboot_dir=${override_dir} ;;
+        multiboot) multiboot_dir=${override_dir} ;;
         pc) pc_dir=${override_dir} ;;
     esac
 fi
 
-# build coreboot core.img
-if test -e "${coreboot_dir}" ; then
-    echo "Enabling coreboot support ..."
+# build multiboot core.img
+if test -e "${multiboot_dir}" ; then
+    echo "Enabling multiboot support ..."
     memdisk_img=`mktemp "$MKTEMP_TEMPLATE"`
     memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
     mkdir -p ${memdisk_dir}/boot/grub
     # obtain date-based UUID
     iso_uuid=$(date -u +%Y-%m-%d-%H-%M-%S-00)
 
-    modules="$(cat ${coreboot_dir}/partmap.lst) ${modules}"
+    modules="$(cat ${multiboot_dir}/partmap.lst) ${modules}"
     cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
 search --fs-uuid --set ${iso_uuid}
-set prefix=(\${root})/boot/grub/${target_cpu}-coreboot
+set prefix=(\${root})/boot/grub/${target_cpu}-multiboot
 EOF
     (for i in ${modules} ; do
         echo "insmod $i"
     done ; \
     echo "source /boot/grub/grub.cfg") \
-    > ${iso9660_dir}/boot/grub/i386-coreboot/grub.cfg
+    > ${iso9660_dir}/boot/grub/i386-multiboot/grub.cfg
 
     tar -C ${memdisk_dir} -cf ${memdisk_img} boot
     rm -rf ${memdisk_dir}
-    grub-mkelfimage -d ${coreboot_dir}/ -m ${memdisk_img} -o ${iso9660_dir}/boot/multiboot.img \
+    grub-mkelfimage -d ${multiboot_dir}/ -m ${memdisk_img} -o ${iso9660_dir}/boot/multiboot.img \
         memdisk tar search iso9660 configfile sh \
         ata at_keyboard
     rm -f ${memdisk_img}

From 7819a4562fb8edfaac72607cde8316a69acf20eb Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 1 May 2010 14:32:48 +0200
Subject: [PATCH 0873/1628] 	Use LBIO on coreboot.

	* conf/i386-coreboot.rmk (kernel_img_SOURCES): Change
	kern/i386/multiboot_mmap.c to kern/i386/coreboot/mmap.c.
	* include/grub/i386/coreboot/memory.h (GRUB_LINUXBIOS_MEMBER_LINK):
	New declaration.
	* kern/i386/coreboot/init.c (grub_machine_init): Don't call
	grub_machine_mmap_init on coreboot.
	* kern/i386/coreboot/mmap.c (grub_linuxbios_table_iterate): Handle
	GRUB_LINUXBIOS_MEMBER_LINK.
	(grub_machine_mmap_iterate): Fix declaration.
	* kern/i386/coreboot/startup.S: Don't save mbi location on coreboot.
---
 ChangeLog                           | 15 +++++++++++++++
 conf/i386-coreboot.rmk              |  2 +-
 include/grub/i386/coreboot/memory.h |  5 +++--
 kern/i386/coreboot/init.c           |  2 ++
 kern/i386/coreboot/mmap.c           | 16 +++++++++++++---
 kern/i386/coreboot/startup.S        |  2 ++
 6 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 43f223113..9ace29cc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Use LBIO on coreboot.
+
+	* conf/i386-coreboot.rmk (kernel_img_SOURCES): Change
+	kern/i386/multiboot_mmap.c to kern/i386/coreboot/mmap.c.
+	* include/grub/i386/coreboot/memory.h (GRUB_LINUXBIOS_MEMBER_LINK):
+	New declaration.
+	* kern/i386/coreboot/init.c (grub_machine_init): Don't call
+	grub_machine_mmap_init on coreboot.
+	* kern/i386/coreboot/mmap.c (grub_linuxbios_table_iterate): Handle
+	GRUB_LINUXBIOS_MEMBER_LINK.
+	(grub_machine_mmap_iterate): Fix declaration.
+	* kern/i386/coreboot/startup.S: Don't save mbi location on coreboot.
+
 2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Split coreboot and multiboot ports.
diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 69b8e9a48..ca969632a 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -10,7 +10,7 @@ pkglib_PROGRAMS += kernel.img
 kernel_img_SOURCES = kern/i386/coreboot/startup.S \
 	kern/i386/misc.S \
 	kern/i386/coreboot/init.c \
-	kern/i386/multiboot_mmap.c \
+       kern/i386/coreboot/mmap.c \
 	kern/i386/halt.c \
 	kern/main.c kern/device.c \
 	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
diff --git a/include/grub/i386/coreboot/memory.h b/include/grub/i386/coreboot/memory.h
index 434ae622e..664086a81 100644
--- a/include/grub/i386/coreboot/memory.h
+++ b/include/grub/i386/coreboot/memory.h
@@ -44,8 +44,9 @@ typedef struct grub_linuxbios_table_header *grub_linuxbios_table_header_t;
 
 struct grub_linuxbios_table_item
 {
-#define GRUB_LINUXBIOS_MEMBER_UNUSED		0
-#define GRUB_LINUXBIOS_MEMBER_MEMORY		1
+#define GRUB_LINUXBIOS_MEMBER_UNUSED		0x00
+#define GRUB_LINUXBIOS_MEMBER_MEMORY		0x01
+#define GRUB_LINUXBIOS_MEMBER_LINK              0x11
   grub_uint32_t tag;
   grub_uint32_t size;
 };
diff --git a/kern/i386/coreboot/init.c b/kern/i386/coreboot/init.c
index 5f80f28c1..b945e623f 100644
--- a/kern/i386/coreboot/init.c
+++ b/kern/i386/coreboot/init.c
@@ -117,7 +117,9 @@ grub_machine_init (void)
     return 0;
   }
 
+#ifdef GRUB_MACHINE_MULTIBOOT
   grub_machine_mmap_init ();
+#endif
   grub_machine_mmap_iterate (heap_init);
 
   grub_tsc_init ();
diff --git a/kern/i386/coreboot/mmap.c b/kern/i386/coreboot/mmap.c
index b15369ee5..d06627a08 100644
--- a/kern/i386/coreboot/mmap.c
+++ b/kern/i386/coreboot/mmap.c
@@ -57,13 +57,23 @@ signature_found:
 			       (long) table_header->size);
   for (; table_item->size;
        table_item = (grub_linuxbios_table_item_t) ((long) table_item + (long) table_item->size))
-    if (hook (table_item))
-      return 1;
+    {
+      if (table_item->tag == GRUB_LINUXBIOS_MEMBER_LINK
+         && check_signature ((grub_linuxbios_table_header_t) (grub_addr_t)
+                             *(grub_uint64_t *) (table_item + 1)))
+       {
+         table_header = (grub_linuxbios_table_header_t) (grub_addr_t)
+           *(grub_uint64_t *) (table_item + 1);
+         goto signature_found;   
+       }
+      if (hook (table_item))
+       return 1;
+    }
 
   return 0;
 }
 
-void
+grub_err_t
 grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t))
 {
   mem_region_t mem_region;
diff --git a/kern/i386/coreboot/startup.S b/kern/i386/coreboot/startup.S
index e94950aae..2c4a941cf 100644
--- a/kern/i386/coreboot/startup.S
+++ b/kern/i386/coreboot/startup.S
@@ -66,10 +66,12 @@ multiboot_header:
 	.long	-0x1BADB002 - MULTIBOOT_MEMORY_INFO
 
 codestart:
+#ifdef GRUB_MACHINE_MULTIBOOT
 	cmpl	$MULTIBOOT_BOOTLOADER_MAGIC, %eax
 	jne 0f
 	movl	%ebx, EXT_C(startup_multiboot_info)
 0:
+#endif
 
 	/* initialize the stack */
 	movl $GRUB_MEMORY_MACHINE_PROT_STACK, %esp

From 0359d0062832355f6ffa8801167134ac92d6eedb Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 1 May 2010 14:38:09 +0200
Subject: [PATCH 0874/1628] 	* boot/i386/qemu/boot.S: Add a missing
 .code16.

---
 ChangeLog             | 4 ++++
 boot/i386/qemu/boot.S | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9ace29cc2..eed00a623 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* boot/i386/qemu/boot.S: Add a missing .code16.
+
 2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Use LBIO on coreboot.
diff --git a/boot/i386/qemu/boot.S b/boot/i386/qemu/boot.S
index a93fe3943..03631a22a 100644
--- a/boot/i386/qemu/boot.S
+++ b/boot/i386/qemu/boot.S
@@ -63,5 +63,8 @@ VARIABLE(grub_core_entry_addr)
 	   *right here* and this is why we need this kludge.  */
 
 	. = GRUB_BOOT_MACHINE_SIZE - 16
+
+       .code16
+       
 	jmp	_start
 	. = GRUB_BOOT_MACHINE_SIZE

From ef4ffedd46e4fddb9ac73f26f30ba4add1238cb1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 1 May 2010 15:15:38 +0200
Subject: [PATCH 0875/1628] remove loader.h leftovers

---
 include/grub/i386/multiboot/loader.h | 1 -
 loader/sparc64/ieee1275/linux.c      | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 include/grub/i386/multiboot/loader.h

diff --git a/include/grub/i386/multiboot/loader.h b/include/grub/i386/multiboot/loader.h
deleted file mode 100644
index 1c725be19..000000000
--- a/include/grub/i386/multiboot/loader.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <grub/i386/coreboot/loader.h>
diff --git a/loader/sparc64/ieee1275/linux.c b/loader/sparc64/ieee1275/linux.c
index f55b4fa2a..948729a5d 100644
--- a/loader/sparc64/ieee1275/linux.c
+++ b/loader/sparc64/ieee1275/linux.c
@@ -24,7 +24,6 @@
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/ieee1275/ieee1275.h>
-#include <grub/machine/loader.h>
 #include <grub/gzio.h>
 #include <grub/command.h>
 #include <grub/i18n.h>

From aa8d7b264775ac81ab81470f649313eb13d7a180 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 1 May 2010 16:33:22 +0200
Subject: [PATCH 0876/1628] coreboot and qemu rescue disks and bootchecks

---
 conf/i386-coreboot.rmk   |   3 +
 conf/i386-qemu.rmk       |   3 +
 tests/util/grub-shell.in |  34 +++++++--
 util/grub-mkrescue.in    | 145 ++++++++++++++++++++-------------------
 4 files changed, 110 insertions(+), 75 deletions(-)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index ce54b80b1..805cc40b1 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -71,5 +71,8 @@ datetime_mod_SOURCES = lib/cmos_datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+BOOTTARGET=coreboot
+QEMU32=qemu-system-i386
+
 include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk
diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index 6d387a6f6..416fbc0f3 100644
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -61,5 +61,8 @@ datetime_mod_SOURCES = lib/cmos_datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+BOOTTARGET=qemu
+QEMU32=qemu-system-i386
+
 include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index d8ea588a7..86b46cf77 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -83,6 +83,8 @@ for option in "$@"; do
 	if   [ "$dev" = "fd" ] ; then boot=fd;
 	elif [ "$dev" = "hd" ] ; then boot=hd;
 	elif [ "$dev" = "cd" ] ; then boot=cd;
+	elif [ "$dev" = "qemu" ] ; then boot=qemu;
+	elif [ "$dev" = "coreboot" ] ; then boot=coreboot;
 	else
 	    echo "Unrecognized boot method \`$dev'" 1>&2
 	    usage
@@ -119,6 +121,8 @@ terminal_input serial
 terminal_output serial
 EOF
 
+rom_directory=`mktemp -d`
+
 for mod in ${modules}
 do
     echo "insmod ${mod}" >> ${cfgfile}
@@ -131,25 +135,43 @@ EOF
 
 isofile=`mktemp`
 grub-mkrescue --output=${isofile} --override-directory=${builddir} \
+    --rom-directory="${rom_directory}" \
     /boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \
     ${files} >/dev/null 2>&1
 if [ x$boot = xhd ]; then
     device=hda
-    bootdev=c
+    bootdev="-boot c"
 fi
 if [ x$boot = xcd ]; then
     device=cdrom
-    bootdev=d
+    bootdev="-boot d"
 fi
 if [ x$boot = xfd ]; then
     device=fda
-    bootdev=a
+    bootdev="-boot a"
 fi
 
-${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} -boot ${bootdev} | tr -d "\r"
-rm -f ${isofile}
+if [ x$boot = xqemu ]; then
+    bootdev="-bios ${rom_directory}/qemu.img"
+    device=cdrom
+fi
 
-rm -f ${tmpfile} ${cfgfile}
+if [ x$boot = xcoreboot ]; then
+    imgfile=`mktemp`
+    cp "${GRUB_COREBOOT_ROM}" "${imgfile}"
+    "${GRUB_CBFSTOOL}" "${imgfile}" add-payload "${rom_directory}/coreboot.elf" fallback/payload
+    bootdev="-bios ${imgfile}"
+    device=cdrom
+fi
+
+${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | tr -d "\r"
+rm -f "${isofile}" "${imgfile}"
+rm -rf "${rom_directory}"
+if [ x$boot = xcoreboot ]; then
+    rm -f "${imgfile}"
+fi
+
+rm -f "${tmpfile}" "${cfgfile}"
 exit 0
 
 
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 365c48f29..56b27a6e9 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -30,10 +30,13 @@ target_cpu=@target_cpu@
 native_platform=@platform@
 pkglib_DATA="@pkglib_DATA@"
 
-multiboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-multiboot
-pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-pc
+multiboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-multiboot
+coreboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-coreboot
+qemu_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-qemu
+pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-pc
 efi32_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-efi
 efi64_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi
+rom_directory=
 
 # Usage: usage
 # Print the usage.
@@ -46,6 +49,7 @@ Make GRUB rescue image.
   -v, --version           print the version information and exit
   --modules=MODULES       pre-load specified modules MODULES
   --output=FILE           save output in FILE [required]
+  --rom-directory=DIR     save rom images in DIR [optional]
 
 $0 generates a bootable rescue image with specified source files or directories.
 
@@ -66,6 +70,8 @@ for option in "$@"; do
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
     --output=*)
 	output_image=`echo "$option" | sed 's/--output=//'` ;;
+    --rom-directory=*)
+	rom_directory=`echo "$option" | sed 's/--rom-directory=//'` ;;
     # Intentionally undocumented
     --override-directory=*)
 	override_dir=`echo "${option}/" | sed 's/--override-directory=//'`
@@ -103,15 +109,15 @@ process_input_dir ()
 {
     input_dir="$1"
     platform="$2"
-    mkdir -p ${iso9660_dir}/boot/grub/${target_cpu}-${platform}
+    mkdir -p ${iso9660_dir}/boot/grub/${platform}
     for file in ${input_dir}/*.mod; do
         if test -f "$file"; then
-            cp -f "$file" ${iso9660_dir}/boot/grub/${target_cpu}-${platform}/
+            cp -f "$file" ${iso9660_dir}/boot/grub/${platform}/
         fi
     done
     for file in ${pkglib_DATA}; do
 	if test -f "${input_dir}/${file}"; then
-            cp -f "${input_dir}/${file}" ${iso9660_dir}/boot/grub/${target_cpu}-${platform}/
+            cp -f "${input_dir}/${file}" ${iso9660_dir}/boot/grub/${platform}/
 	fi
     done
 
@@ -123,27 +129,70 @@ process_input_dir ()
     done
 }
 
+make_image ()
+{
+    source_directory="$1"
+    platform=$2
+    if ! test -e "${source_directory}"; then
+	return;
+    fi
+
+    echo "Enabling $2 support ..."
+
+    memdisk_img=`mktemp "$MKTEMP_TEMPLATE"`
+    memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
+    mkdir -p ${memdisk_dir}/boot/grub
+
+    modules="$(cat ${source_directory}/partmap.lst) ${modules}"
+    cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
+search --fs-uuid --set ${iso_uuid}
+set prefix=(\${root})/boot/grub/${platform}
+source \$prefix/grub.cfg
+EOF
+    (for i in ${modules} ; do
+        echo "insmod $i"
+    done ; \
+    echo "source /boot/grub/grub.cfg") \
+    > ${iso9660_dir}/boot/grub/${platform}/grub.cfg
+
+    tar -C ${memdisk_dir} -cf ${memdisk_img} boot
+    rm -rf ${memdisk_dir}
+    grub-mkimage -O ${platform} -d "${source_directory}" -m "${memdisk_img}" -o "$3" --prefix='(memdisk)/boot/grub' \
+        search iso9660 configfile sh memdisk tar $4
+    rm -rf ${memdisk_img}
+}
+
 if [ "${override_dir}" = "" ] ; then
     if test -e "${multiboot_dir}" ; then
-        process_input_dir ${multiboot_dir} multiboot
+        process_input_dir ${multiboot_dir} i386-multiboot
+    fi
+    if test -e "${coreboot_dir}" ; then
+        process_input_dir ${coreboot_dir} i386-coreboot
+    fi
+    if test -e "${qemu_dir}" ; then
+        process_input_dir ${qemu_dir} i386-qemu
     fi
     if test -e "${pc_dir}" ; then
-        process_input_dir ${pc_dir} pc
+        process_input_dir ${pc_dir} i386-pc
     fi
     if test -e "${efi32_dir}" ; then
-        process_input_dir ${efi32_dir} efi32
+        process_input_dir ${efi32_dir} i386-efi
     fi
     if test -e "${efi64_dir}" ; then
-        process_input_dir ${efi64_dir} efi64
+        process_input_dir ${efi64_dir} x86_64-efi
     fi
 else
-    process_input_dir ${override_dir} ${native_platform}
+    process_input_dir ${override_dir} ${target_cpu}-${native_platform}
     multiboot_dir=
     pc_dir=
     efi32_dir=
     efi64_dir=
-    case "${native_platform}" in
+    coreboot_dir=
+    qemu_dir=
+    case "${target_cpu}-${native_platform}" in
         i386-multiboot) multiboot_dir=${override_dir} ;;
+        i386-coreboot) coreboot_dir=${override_dir} ;;
+        i386-qemu) qemu_dir=${override_dir} ;;
         i386-pc) pc_dir=${override_dir} ;;
 	i386-efi) efi32_dir=${override_dir} ;;
 	x86_64-efi) efi64_dir=${override_dir} ;;
@@ -154,33 +203,6 @@ fi
 iso_uuid=$(date -u +%Y-%m-%d-%H-%M-%S-00)
 grub_mkisofs_arguments="${grub_mkisofs_arguments} --modification-date=$(echo ${iso_uuid} | sed -e s/-//g)"
 
-# build multiboot core.img
-if test -e "${multiboot_dir}" ; then
-    echo "Enabling multiboot support ..."
-    memdisk_img=`mktemp "$MKTEMP_TEMPLATE"`
-    memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
-    mkdir -p ${memdisk_dir}/boot/grub
-
-    modules="$(cat ${multiboot_dir}/partmap.lst) ${modules}"
-    cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
-search --fs-uuid --set ${iso_uuid}
-set prefix=(\${root})/boot/grub/${target_cpu}-multiboot
-source \$prefix/grub.cfg
-EOF
-    (for i in ${modules} ; do
-        echo "insmod $i"
-    done ; \
-    echo "source /boot/grub/grub.cfg") \
-    > ${iso9660_dir}/boot/grub/i386-multiboot/grub.cfg
-
-    tar -C ${memdisk_dir} -cf ${memdisk_img} boot
-    rm -rf ${memdisk_dir}
-    grub-mkimage -O i386-multiboot -d ${multiboot_dir}/ -m ${memdisk_img} -o ${iso9660_dir}/boot/multiboot.img \
-        memdisk tar search iso9660 configfile sh \
-        ata at_keyboard
-    rm -f ${memdisk_img}
-fi
-
 # build BIOS core.img
 if test -e "${pc_dir}" ; then
     echo "Enabling BIOS support ..."
@@ -205,47 +227,32 @@ if test -e "${pc_dir}" ; then
 		--embedded-boot ${embed_img}"
 fi
 
+# build multiboot core.img
+make_image "${multiboot_dir}" i386-multiboot "${iso9660_dir}/boot/multiboot.img" "ata at_keyboard"
+
 if test -e "${efi64_dir}" || test -e "${efi32_dir}"; then
     efi_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
     mkdir -p "${efi_dir}/efi/boot"
-else
-    efi_dir=
-fi
 
-# build bootx64.efi
-if test -e "${efi64_dir}" ; then
-    echo "Enabling EFI64 support ..."
-    memdisk_img=`mktemp "$MKTEMP_TEMPLATE"`
-    memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
-    mkdir -p ${memdisk_dir}/boot/grub
+    # build bootx64.efi
+    make_image "${efi64_dir}" x86_64-efi "${efi_dir}"/efi/boot/bootx64.efi ""
+    # build bootia32.efi
+    make_image "${efi32_dir}" i386-efi "${efi_dir}"/efi/boot/bootia32.efi ""
 
-    cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
-search --fs-uuid --set ${iso_uuid}
-set prefix=(\${root})/boot/grub/${target_cpu}-efi
-source \$prefix/grub.cfg
-EOF
-
-    tar -C ${memdisk_dir} -cf ${memdisk_img} boot
-    rm -rf ${memdisk_dir}
-
-    grub-mkimage -O x86_64-efi -d "${efi64_dir}" -m "${memdisk_img}" -o "${efi_dir}"/efi/boot/bootx64.efi --prefix='(memdisk)/boot/grub' \
-        search iso9660 configfile sh memdisk tar
-    rm -f ${memdisk_img}
-
-    modules="$(cat "${efi64_dir}"/partmap.lst) ${modules}"
-    (for i in ${modules} ; do
-        echo "insmod $i"
-    done ; \
-    echo "source /boot/grub/grub.cfg") \
-    > "${iso9660_dir}"/boot/grub/x86_64-efi/grub.cfg
-fi
-
-if test x"${efi_dir}" != x; then
     mformat -C -f 2880 -L 16 -i "${iso9660_dir}"/efi.img ::
     mcopy -s -i "${iso9660_dir}"/efi.img ${efi_dir}/efi ::/
     grub_mkisofs_arguments="${grub_mkisofs_arguments} --efi-boot efi.img"
 fi
 
+make_image "${qemu_dir}" i386-qemu "${iso9660_dir}/boot/qemu.img" "ata at_keyboard"
+if [ -e "${iso9660_dir}/boot/qemu.img" ] && [ -d "${rom_directory}" ]; then
+    cp "${iso9660_dir}/boot/qemu.img" "${rom_directory}/qemu.img"
+fi
+make_image "${coreboot_dir}" i386-coreboot "${iso9660_dir}/boot/coreboot.elf" "ata at_keyboard"
+if [ -e "${iso9660_dir}/boot/coreboot.elf" ] && [ -d "${rom_directory}" ]; then
+    cp "${iso9660_dir}/boot/coreboot.elf" "${rom_directory}/coreboot.elf"
+fi
+
 # build iso image
 xorriso -pathspecs on -as mkisofs ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} ${source}
 rm -rf ${iso9660_dir}

From ce60689c68559c5fd91f904319613eb075b95ff5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 1 May 2010 16:35:15 +0200
Subject: [PATCH 0877/1628] 	* kern/i386/coreboot/init.c
 (grub_machine_init): Call 	grub_machine_mmap_init on qemu.

---
 ChangeLog                 | 5 +++++
 kern/i386/coreboot/init.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index eed00a623..8163ebe70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/i386/coreboot/init.c (grub_machine_init): Call
+	grub_machine_mmap_init on qemu.
+
 2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* boot/i386/qemu/boot.S: Add a missing .code16.
diff --git a/kern/i386/coreboot/init.c b/kern/i386/coreboot/init.c
index b945e623f..f7b837044 100644
--- a/kern/i386/coreboot/init.c
+++ b/kern/i386/coreboot/init.c
@@ -117,7 +117,7 @@ grub_machine_init (void)
     return 0;
   }
 
-#ifdef GRUB_MACHINE_MULTIBOOT
+#if defined (GRUB_MACHINE_MULTIBOOT) || defined (GRUB_MACHINE_QEMU)
   grub_machine_mmap_init ();
 #endif
   grub_machine_mmap_iterate (heap_init);

From 6d971470fad15daf02eb270bdd969c3ba9b42a6b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 1 May 2010 16:38:10 +0200
Subject: [PATCH 0878/1628] REmove memory map altering for FreeBSD

---
 loader/i386/bsd.c | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 1b2fadd80..c0c75204d 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -258,7 +258,6 @@ static void
 generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf)
 {
   int count = 0;
-  int isfirstrun = 1;
   struct grub_e820_mmap *mmap = buf;
   struct grub_e820_mmap prev, cur;
 
@@ -266,21 +265,6 @@ generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf)
   int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size,
 			     grub_uint32_t type)
     {
-      /* FreeBSD assumes that first 64KiB are available.
-	 Not always true but try to prevent panic somehow. */
-      if (kernel_type == KERNEL_TYPE_FREEBSD && isfirstrun && addr != 0)
-	{
-	  cur.addr = 0;
-	  cur.size = (addr < 0x10000) ? addr : 0x10000;
-	  cur.type = GRUB_E820_RAM;
-	  if (mmap)
-	    *mmap++ = cur;
-
-	  prev = cur;
-	  count++;
-	}
-      isfirstrun = 0;
-
       cur.addr = addr;
       cur.size = size;
       switch (type)
@@ -317,7 +301,7 @@ generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf)
 	{
 	  prev.size += cur.size;
 	  if (mmap)
-	    mmap[-1] = cur;
+           mmap[-1] = prev;
 	}
       else
 	{
@@ -330,7 +314,6 @@ generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf)
       return 0;
     }
 
-  isfirstrun = 1;
   grub_mmap_iterate (hook);
 
   if (len)

From d8b5cd40114891a5c672a16db5a9209b575b9f26 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 1 May 2010 20:28:07 +0200
Subject: [PATCH 0879/1628] 	* commands/hashsum.c (GRUB_MOD_INIT): Remove
 duplication of command 	name and add N_. 	*
 commands/i386/pc/drivemap.c (GRUB_MOD_INIT): Likewise. 	*
 commands/iorw.c (GRUB_MOD_INIT): Likewise. 	* commands/password_pbkdf2.c
 (GRUB_MOD_INIT): Likewise. 	* commands/regexp.c (GRUB_MOD_INIT): Likewise.
 	* commands/setpci.c (GRUB_MOD_INIT): Likewise. 	* commands/terminal.c
 (GRUB_MOD_INIT): Likewise. 	* efiemu/main.c (GRUB_MOD_INIT): Likewise. 
 * font/font_cmd.c (GRUB_MOD_INIT): Likewise. 	* kern/corecmd.c
 (GRUB_MOD_INIT): Likewise. 	* mmap/mmap.c (GRUB_MOD_INIT): Likewise. 
 * normal/context.c (GRUB_MOD_INIT): Likewise. 	* normal/main.c
 (GRUB_MOD_INIT): Likewise. 	* term/gfxterm.c (GRUB_MOD_INIT): Likewise. 
 * term/serial.c (GRUB_MOD_INIT): Likewise. 	* term/terminfo.c
 (GRUB_MOD_INIT): Likewise.

---
 ChangeLog                   | 20 ++++++++++++++++++++
 commands/hashsum.c          | 25 +++++++++++++------------
 commands/i386/pc/drivemap.c |  9 ++++-----
 commands/iorw.c             | 22 +++++++++++++---------
 commands/password_pbkdf2.c  |  5 +++--
 commands/regexp.c           |  5 +++--
 commands/setpci.c           |  7 ++++---
 commands/terminal.c         | 12 ++++++------
 efiemu/main.c               |  9 +++++----
 font/font_cmd.c             |  7 ++++---
 kern/corecmd.c              | 11 +++++++----
 mmap/mmap.c                 |  5 +++--
 normal/context.c            |  3 ++-
 normal/main.c               |  4 ++--
 term/gfxterm.c              |  5 +++--
 term/serial.c               |  4 ++--
 term/terminfo.c             |  3 ++-
 17 files changed, 96 insertions(+), 60 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 67910495b..ea576b9d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* commands/hashsum.c (GRUB_MOD_INIT): Remove duplication of command
+	name and add N_.
+	* commands/i386/pc/drivemap.c (GRUB_MOD_INIT): Likewise.
+	* commands/iorw.c (GRUB_MOD_INIT): Likewise.
+	* commands/password_pbkdf2.c (GRUB_MOD_INIT): Likewise.
+	* commands/regexp.c (GRUB_MOD_INIT): Likewise.
+	* commands/setpci.c (GRUB_MOD_INIT): Likewise.
+	* commands/terminal.c (GRUB_MOD_INIT): Likewise.
+	* efiemu/main.c (GRUB_MOD_INIT): Likewise.
+	* font/font_cmd.c (GRUB_MOD_INIT): Likewise.
+	* kern/corecmd.c (GRUB_MOD_INIT): Likewise.
+	* mmap/mmap.c (GRUB_MOD_INIT): Likewise.
+	* normal/context.c (GRUB_MOD_INIT): Likewise.
+	* normal/main.c (GRUB_MOD_INIT): Likewise.
+	* term/gfxterm.c (GRUB_MOD_INIT): Likewise.
+	* term/serial.c (GRUB_MOD_INIT): Likewise.
+	* term/terminfo.c (GRUB_MOD_INIT): Likewise.
+
 2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/mm.c (grub_real_malloc): Satisfy alignment requirement when
diff --git a/commands/hashsum.c b/commands/hashsum.c
index 951479fa7..d5f551dbb 100644
--- a/commands/hashsum.c
+++ b/commands/hashsum.c
@@ -24,13 +24,14 @@
 #include <grub/misc.h>
 #include <grub/crypto.h>
 #include <grub/normal.h>
+#include <grub/i18n.h>
 
 static const struct grub_arg_option options[] = {
-  {"hash", 'h', 0, "Specify hash to use.", "HASH", ARG_TYPE_STRING},
-  {"check", 'c', 0, "Check hash list file.", "FILE", ARG_TYPE_STRING},
-  {"prefix", 'p', 0, "Base directory for hash list.", "DIRECTORY",
+  {"hash", 'h', 0, N_("Specify hash to use."), N_("HASH"), ARG_TYPE_STRING},
+  {"check", 'c', 0, N_("Check hash list file."), N_("FILE"), ARG_TYPE_STRING},
+  {"prefix", 'p', 0, N_("Base directory for hash list."), N_("DIRECTORY"),
    ARG_TYPE_STRING},
-  {"keep-going", 'k', 0, "Don't stop after first error.", 0, 0},
+  {"keep-going", 'k', 0, N_("Don't stop after first error."), 0, 0},
   {0, 0, 0, 0, 0, 0}
 };
 
@@ -249,21 +250,21 @@ GRUB_MOD_INIT(hashsum)
 			      options);
   cmd_md5 = grub_register_extcmd ("md5sum", grub_cmd_hashsum,
 				  GRUB_COMMAND_FLAG_BOTH,
-				  "md5sum [-c FILE [-p PREFIX]] "
-				  "[FILE1 [FILE2 ...]]",
-				  "Compute or check hash checksum.",
+				  N_("[-c FILE [-p PREFIX]] "
+				     "[FILE1 [FILE2 ...]]"),
+				  N_("Compute or check hash checksum."),
 				  options);
   cmd_sha256 = grub_register_extcmd ("sha256sum", grub_cmd_hashsum,
 				     GRUB_COMMAND_FLAG_BOTH,
-				     "sha256sum [-c FILE [-p PREFIX]] "
-				     "[FILE1 [FILE2 ...]]",
+				     N_("[-c FILE [-p PREFIX]] "
+					"[FILE1 [FILE2 ...]]"),
 				     "Compute or check hash checksum.",
 				     options);
   cmd_sha512 = grub_register_extcmd ("sha512sum", grub_cmd_hashsum,
 				     GRUB_COMMAND_FLAG_BOTH,
-				     "sha512sum [-c FILE [-p PREFIX]] "
-				     "[FILE1 [FILE2 ...]]",
-				     "Compute or check hash checksum.",
+				     N_("[-c FILE [-p PREFIX]] "
+					"[FILE1 [FILE2 ...]]"),
+				     N_("Compute or check hash checksum."),
 				     options);
 }
 
diff --git a/commands/i386/pc/drivemap.c b/commands/i386/pc/drivemap.c
index 3baacba49..4afc43358 100644
--- a/commands/i386/pc/drivemap.c
+++ b/commands/i386/pc/drivemap.c
@@ -402,11 +402,10 @@ GRUB_MOD_INIT (drivemap)
   grub_get_root_biosnumber_saved = grub_get_root_biosnumber;
   grub_get_root_biosnumber = grub_get_root_biosnumber_drivemap;
   cmd = grub_register_extcmd ("drivemap", grub_cmd_drivemap,
-					GRUB_COMMAND_FLAG_BOTH,
-					"drivemap"
-					N_("-l | -r | [-s] grubdev osdisk."),
-					N_("Manage the BIOS drive mappings."),
-					options);
+			      GRUB_COMMAND_FLAG_BOTH,
+			      N_("-l | -r | [-s] grubdev osdisk."),
+			      N_("Manage the BIOS drive mappings."),
+			      options);
   drivemap_hook =
     grub_loader_register_preboot_hook (&install_int13_handler,
 				       &uninstall_int13_handler,
diff --git a/commands/iorw.c b/commands/iorw.c
index c356d0e36..474c8712e 100644
--- a/commands/iorw.c
+++ b/commands/iorw.c
@@ -22,14 +22,15 @@
 #include <grub/extcmd.h>
 #include <grub/env.h>
 #include <grub/cpu/io.h>
+#include <grub/i18n.h>
 
 static grub_extcmd_t cmd_read_byte, cmd_read_word, cmd_read_dword;
 static grub_command_t cmd_write_byte, cmd_write_word, cmd_write_dword;
 
 static const struct grub_arg_option options[] =
   {
-    {0, 'v', 0, "Save read value into variable VARNAME.",
-     "VARNAME", ARG_TYPE_STRING},
+    {0, 'v', 0, N_("Save read value into variable VARNAME."),
+     N_("VARNAME"), ARG_TYPE_STRING},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -62,7 +63,7 @@ grub_cmd_read (grub_extcmd_t cmd, int argc, char **argv)
 
   if (cmd->state[0].set)
     {
-      grub_sprintf (buf, "%x", value);
+      grub_snprintf (buf, sizeof (buf), "%x", value);
       grub_env_set (cmd->state[0].arg, buf);
     }
   else
@@ -117,22 +118,25 @@ GRUB_MOD_INIT(memrw)
 {
   cmd_read_byte =
     grub_register_extcmd ("inb", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
-			  "PORT", "Read byte from PORT.", options);
+			  N_("PORT"), N_("Read byte from PORT."), options);
   cmd_read_word =
     grub_register_extcmd ("inw", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
-			  "PORT", "Read word from PORT.", options);
+			  N_("PORT"), N_("Read word from PORT."), options);
   cmd_read_dword =
     grub_register_extcmd ("inl", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
-			  "PORT", "Read dword from PORT.", options);
+			  N_("PORT"), N_("Read dword from PORT."), options);
   cmd_write_byte =
     grub_register_command ("outb", grub_cmd_write,
-			   "PORT VALUE [MASK]", "Write byte VALUE to PORT.");
+			   N_("PORT VALUE [MASK]"),
+			   N_("Write byte VALUE to PORT."));
   cmd_write_word =
     grub_register_command ("outw", grub_cmd_write,
-			   "PORT VALUE [MASK]", "Write word VALUE to PORT.");
+			   N_("PORT VALUE [MASK]"),
+			   N_("Write word VALUE to PORT."));
   cmd_write_dword =
     grub_register_command ("outl", grub_cmd_write,
-			   "ADDR VALUE [MASK]", "Write dword VALUE to PORT.");
+			   N_("ADDR VALUE [MASK]"),
+			   N_("Write dword VALUE to PORT."));
 }
 
 GRUB_MOD_FINI(memrw)
diff --git a/commands/password_pbkdf2.c b/commands/password_pbkdf2.c
index 51c8ea794..6886987da 100644
--- a/commands/password_pbkdf2.c
+++ b/commands/password_pbkdf2.c
@@ -24,6 +24,7 @@
 #include <grub/env.h>
 #include <grub/normal.h>
 #include <grub/dl.h>
+#include <grub/i18n.h>
 
 static grub_dl_t my_mod;
 
@@ -186,8 +187,8 @@ GRUB_MOD_INIT(password_pbkdf2)
 {
   my_mod = mod;
   cmd = grub_register_command ("password_pbkdf2", grub_cmd_password,
-			       "password_pbkdf2 USER PBKDF2_PASSWORD",
-			       "Set user password (PBKDF2). ");
+			       N_("USER PBKDF2_PASSWORD"),
+			       N_("Set user password (PBKDF2). "));
 }
 
 GRUB_MOD_FINI(password_pbkdf2)
diff --git a/commands/regexp.c b/commands/regexp.c
index 910bb9082..e8e8243b5 100644
--- a/commands/regexp.c
+++ b/commands/regexp.c
@@ -21,6 +21,7 @@
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 #include <regex.h>
 
 static grub_err_t
@@ -69,8 +70,8 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(regexp)
 {
   cmd = grub_register_command ("regexp", grub_cmd_regexp,
-			       "REGEXP STRING",
-			       "Test if REGEXP matches STRING.");
+			       N_("REGEXP STRING"),
+			       N_("Test if REGEXP matches STRING."));
 }
 
 GRUB_MOD_FINI(regexp)
diff --git a/commands/setpci.c b/commands/setpci.c
index f780547a2..fbc7c214e 100644
--- a/commands/setpci.c
+++ b/commands/setpci.c
@@ -23,6 +23,7 @@
 #include <grub/extcmd.h>
 #include <grub/env.h>
 #include <grub/mm.h>
+#include <grub/i18n.h>
 
 struct pci_register
 {
@@ -329,9 +330,9 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(setpci)
 {
   cmd = grub_register_extcmd ("setpci", grub_cmd_setpci, GRUB_COMMAND_FLAG_BOTH,
-			      "setpci [-s POSITION] [-d DEVICE] [-v VAR] "
-			      "[REGISTER][=VALUE[:MASK]]",
-			      "Manipulate PCI devices.", options);
+			      N_("[-s POSITION] [-d DEVICE] [-v VAR] "
+				 "[REGISTER][=VALUE[:MASK]]"),
+			      N_("Manipulate PCI devices."), options);
 }
 
 GRUB_MOD_FINI(setpci)
diff --git a/commands/terminal.c b/commands/terminal.c
index c8c1ffe09..1129c39bd 100644
--- a/commands/terminal.c
+++ b/commands/terminal.c
@@ -229,14 +229,14 @@ GRUB_MOD_INIT(terminal)
 {
   cmd_terminal_input =
     grub_register_command ("terminal_input", grub_cmd_terminal_input,
-			   "[--append|--remove] "
-			   "[TERMINAL1] [TERMINAL2] ...",
-			   "List or select an input terminal.");
+			   N_("[--append|--remove] "
+			      "[TERMINAL1] [TERMINAL2] ..."),
+			   N_("List or select an input terminal."));
   cmd_terminal_output =
     grub_register_command ("terminal_output", grub_cmd_terminal_output,
-			   "[--append|--remove] "
-			   "[TERMINAL1] [TERMINAL2] ...",
-			   "List or select an output terminal.");
+			   N_("[--append|--remove] "
+			      "[TERMINAL1] [TERMINAL2] ..."),
+			   N_("List or select an output terminal."));
 }
 
 GRUB_MOD_FINI(terminal)
diff --git a/efiemu/main.c b/efiemu/main.c
index 8a8a508fa..b197a8b2c 100644
--- a/efiemu/main.c
+++ b/efiemu/main.c
@@ -31,6 +31,7 @@
 #include <grub/efiemu/efiemu.h>
 #include <grub/machine/efiemu.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 /* System table. Two version depending on mode */
 grub_efi_system_table32_t *grub_efiemu_system_table32 = 0;
@@ -327,15 +328,15 @@ GRUB_MOD_INIT(efiemu)
 {
   cmd_loadcore = grub_register_command ("efiemu_loadcore",
 					grub_cmd_efiemu_load,
-				       "FILE",
-				       "Load and initialize EFI emulator.");
+					N_("FILE"),
+					N_("Load and initialize EFI emulator."));
   cmd_prepare = grub_register_command ("efiemu_prepare",
 				       grub_cmd_efiemu_prepare,
 				       0,
-				       "Finalize loading of EFI emulator.");
+				       N_("Finalize loading of EFI emulator."));
   cmd_unload = grub_register_command ("efiemu_unload", grub_cmd_efiemu_unload,
 				      0,
-				      "Unload  EFI emulator.");
+				      N_("Unload EFI emulator."));
 }
 
 GRUB_MOD_FINI(efiemu)
diff --git a/font/font_cmd.c b/font/font_cmd.c
index 5515b2cdc..8b00dd8b9 100644
--- a/font/font_cmd.c
+++ b/font/font_cmd.c
@@ -21,6 +21,7 @@
 #include <grub/dl.h>
 #include <grub/misc.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 static grub_err_t
 loadfont_command (grub_command_t cmd __attribute__ ((unused)),
@@ -62,11 +63,11 @@ GRUB_MOD_INIT(font)
 
   cmd_loadfont =
     grub_register_command ("loadfont", loadfont_command,
-			 "FILE...",
-			 "Specify one or more font files to load.");
+			   N_("FILE..."),
+			   N_("Specify one or more font files to load."));
   cmd_lsfonts =
     grub_register_command ("lsfonts", lsfonts_command,
-			   0, "List the loaded fonts.");
+			   0, N_("List the loaded fonts."));
 }
 
 GRUB_MOD_FINI(font)
diff --git a/kern/corecmd.c b/kern/corecmd.c
index 8b8df63cb..9af706e94 100644
--- a/kern/corecmd.c
+++ b/kern/corecmd.c
@@ -26,6 +26,7 @@
 #include <grub/file.h>
 #include <grub/device.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 /* set ENVVAR=VALUE */
 static grub_err_t
@@ -178,11 +179,13 @@ void
 grub_register_core_commands (void)
 {
   grub_register_command ("set", grub_core_cmd_set,
-			 "[ENVVAR=VALUE]", "Set an environment variable.");
+			 N_("[ENVVAR=VALUE]"),
+			 N_("Set an environment variable."));
   grub_register_command ("unset", grub_core_cmd_unset,
-			 "ENVVAR", "Remove an environment variable.");
+			 N_("ENVVAR"),
+			 N_("Remove an environment variable."));
   grub_register_command ("ls", grub_core_cmd_ls,
-			 "[ARG]", "List devices or files.");
+			 N_("[ARG]"), N_("List devices or files."));
   grub_register_command ("insmod", grub_core_cmd_insmod,
-			 "MODULE", "Insert a module.");
+			 N_("MODULE"), N_("Insert a module."));
 }
diff --git a/mmap/mmap.c b/mmap/mmap.c
index c22be0a56..a1afc8b06 100644
--- a/mmap/mmap.c
+++ b/mmap/mmap.c
@@ -24,6 +24,7 @@
 #include <grub/mm.h>
 #include <grub/command.h>
 #include <grub/dl.h>
+#include <grub/i18n.h>
 
 #ifndef GRUB_MMAP_REGISTER_BY_FIRMWARE
 
@@ -414,8 +415,8 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(mmap)
 {
   cmd = grub_register_command ("badram", grub_cmd_badram,
-			       "ADDR1,MASK1[,ADDR2,MASK2[,...]]",
-			       "Declare memory regions as badram.");
+			       N_("ADDR1,MASK1[,ADDR2,MASK2[,...]]"),
+			       N_("Declare memory regions as badram."));
 }
 
 GRUB_MOD_FINI(mmap)
diff --git a/normal/context.c b/normal/context.c
index 08a841699..27adf287a 100644
--- a/normal/context.c
+++ b/normal/context.c
@@ -23,6 +23,7 @@
 #include <grub/mm.h>
 #include <grub/command.h>
 #include <grub/normal.h>
+#include <grub/i18n.h>
 
 struct menu_pointer
 {
@@ -172,7 +173,7 @@ grub_context_init (void)
   grub_env_export ("prefix");
 
   export_cmd = grub_register_command ("export", grub_cmd_export,
-				      "export ENVVAR", "Export a variable.");
+				      N_("ENVVAR"), N_("Export a variable."));
 }
 
 void
diff --git a/normal/main.c b/normal/main.c
index 8e49b540b..4ed17e82c 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -705,9 +705,9 @@ GRUB_MOD_INIT(normal)
 
   /* Register a command "normal" for the rescue mode.  */
   grub_register_command ("normal", grub_cmd_normal,
-			 0, "Enter normal mode.");
+			 0, N_("Enter normal mode."));
   grub_register_command ("normal_exit", grub_cmd_normal_exit,
-			 0, "Exit from normal mode.");
+			 0, N_("Exit from normal mode."));
 
   /* Reload terminal colors when these variables are written to.  */
   grub_register_variable_hook ("color_normal", NULL, grub_env_write_color_normal);
diff --git a/term/gfxterm.c b/term/gfxterm.c
index a1409980b..ecfe4ff3b 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -29,6 +29,7 @@
 #include <grub/command.h>
 #include <grub/extcmd.h>
 #include <grub/bitmap_scale.h>
+#include <grub/i18n.h>
 
 #define DEFAULT_VIDEO_MODE	"auto"
 #define DEFAULT_BORDER_WIDTH	10
@@ -1187,8 +1188,8 @@ GRUB_MOD_INIT(gfxterm)
     grub_register_extcmd ("background_image",
                           grub_gfxterm_background_image_cmd,
                           GRUB_COMMAND_FLAG_BOTH,
-                          "[-m (stretch|normal)] FILE",
-                          "Load background image for active terminal.",
+                          N_("[-m (stretch|normal)] FILE"),
+                          N_("Load background image for active terminal."),
                           background_image_cmd_options);
 }
 
diff --git a/term/serial.c b/term/serial.c
index 05497ce40..2347bb3ee 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -616,8 +616,8 @@ GRUB_MOD_INIT(serial)
 {
   cmd = grub_register_extcmd ("serial", grub_cmd_serial,
 			      GRUB_COMMAND_FLAG_BOTH,
-			      "serial [OPTIONS...]",
-			      "Configure serial port.", options);
+			      N_("[OPTIONS...]"),
+			      N_("Configure serial port."), options);
 
   /* Set default settings.  */
   serial_settings.port      = serial_hw_get_port (0);
diff --git a/term/terminfo.c b/term/terminfo.c
index 9a5979b1c..7402d23db 100644
--- a/term/terminfo.c
+++ b/term/terminfo.c
@@ -31,6 +31,7 @@
 #include <grub/terminfo.h>
 #include <grub/tparm.h>
 #include <grub/command.h>
+#include <grub/i18n.h>
 
 struct terminfo
 {
@@ -178,7 +179,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(terminfo)
 {
   cmd = grub_register_command ("terminfo", grub_cmd_terminfo,
-			       "[TERM]", "Set terminfo type.");
+			       N_("[TERM]"), N_("Set terminfo type."));
   grub_terminfo_set_current ("vt100");
 }
 

From f5f3ff9326a27431640bba6e2f8632468029becd Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 1 May 2010 21:31:45 +0200
Subject: [PATCH 0880/1628] 	* commands/help.c (grub_cmd_help): Fix a typo.
 	Reported by: Seth Goldberg

---
 ChangeLog       | 5 +++++
 commands/help.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ea576b9d2..9ecc94faf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* commands/help.c (grub_cmd_help): Fix a typo.
+	Reported by: Seth Goldberg
+
 2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* commands/hashsum.c (GRUB_MOD_INIT): Remove duplication of command
diff --git a/commands/help.c b/commands/help.c
index 1181c3bfb..c2aad03b2 100644
--- a/commands/help.c
+++ b/commands/help.c
@@ -100,7 +100,7 @@ grub_cmd_help (grub_extcmd_t ext __attribute__ ((unused)), int argc,
 	      if (cmd->flags & GRUB_COMMAND_FLAG_EXTCMD)
 		grub_arg_show_help ((grub_extcmd_t) cmd->data);
 	      else
-		grub_printf ("%s %s %s\n%s\b", _("Usage:"), cmd->name, _(cmd->summary),
+		grub_printf ("%s %s %s\n%s\n", _("Usage:"), cmd->name, _(cmd->summary),
 			     _(cmd->description));
 	    }
 	}

From 3558c6e93cb8dda8deb63cc9be884d9c6d34b331 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 1 May 2010 21:32:23 +0200
Subject: [PATCH 0881/1628] 	* kern/main.c (grub_load_config): Fix
 copy-pasted comment. 	Reported by: Seth Goldberg

---
 ChangeLog   | 5 +++++
 kern/main.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9ecc94faf..62252fcfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/main.c (grub_load_config): Fix copy-pasted comment.
+	Reported by: Seth Goldberg
+
 2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* commands/help.c (grub_cmd_help): Fix a typo.
diff --git a/kern/main.c b/kern/main.c
index 2f2c951ab..1fdf4ab07 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -102,7 +102,7 @@ grub_load_config (void)
   auto int hook (struct grub_module_header *);
   int hook (struct grub_module_header *header)
     {
-      /* Not an ELF module, skip.  */
+      /* Not an embedded config, skip.  */
       if (header->type != OBJ_TYPE_CONFIG)
 	return 0;
 

From d1b61374edb1f77f245317b7ec66909dc8b1a3a3 Mon Sep 17 00:00:00 2001
From: Christian Franke <franke@computer.org>
Date: Sat, 1 May 2010 21:39:32 +0200
Subject: [PATCH 0882/1628] 	* util/grub-mkconfig_lib.in
 (make_system_path_relative_to_its_root): 	Remove broken Cygwin path
 conversion. 	* util/misc.c: [__CYGWIN__] Add include and define. 
 [__CYGWIN__] (get_win32_path): Copy function from getroot.c, modify 	for
 Cygwin 1.7. 	(make_system_path_relative_to_its_root): Simplify loop,
 replace early 	return by break. 	[__CYGWIN__] Add conversion to win32
 path. 	Include "/" case in trailing slash removal.

---
 ChangeLog                 | 12 ++++++++
 util/grub-mkconfig_lib.in | 18 ++----------
 util/misc.c               | 61 ++++++++++++++++++++++++++++-----------
 3 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 62252fcfc..dadecec86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-05-01  Christian Franke  <franke@computer.org>
+
+	* util/grub-mkconfig_lib.in (make_system_path_relative_to_its_root):
+	Remove broken Cygwin path conversion.
+	* util/misc.c: [__CYGWIN__] Add include and define.
+	[__CYGWIN__] (get_win32_path): Copy function from getroot.c, modify
+	for Cygwin 1.7.
+	(make_system_path_relative_to_its_root): Simplify loop, replace early
+	return by break.
+	[__CYGWIN__] Add conversion to win32 path.
+	Include "/" case in trailing slash removal.
+
 2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/main.c (grub_load_config): Fix copy-pasted comment.
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 831bef846..f4674b257 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -1,5 +1,5 @@
 # Helper library for grub-mkconfig
-# Copyright (C) 2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 2007,2008,2009,2010  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
@@ -44,21 +44,7 @@ grub_warn ()
 
 make_system_path_relative_to_its_root ()
 {
-  path="`${grub_mkrelpath} $1`"
-
-  case "`uname 2>/dev/null`" in
-    CYGWIN*)
-      # Cygwin: Check if regular or emulated mount.
-      if [ -z "$dir" ] || [ "`stat -c %D "$dir/.."`" != 620000 ] ; then
-        # Reached some mount point not below /cygdrive.
-        # GRUB does not know Cygwin's emulated mounts,
-        # convert to Win32 path and remove drive letter.
-        path=`cygpath -m "$path" | sed -n 's,^[A-Za-z]:,,p'`
-        test ! -z "$path" || return 1
-      fi ;;
-  esac
-
-  echo "$path"
+  ${grub_mkrelpath} $1
 }
 
 is_path_readable_by_grub ()
diff --git a/util/misc.c b/util/misc.c
index 17fa6d5e4..f9d860d9a 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -53,6 +53,11 @@
 # include <malloc.h>
 #endif
 
+#ifdef __CYGWIN__
+# include <sys/cygwin.h>
+# define DEV_CYGDRIVE_MAJOR 98
+#endif
+
 #ifdef __MINGW32__
 #include <windows.h>
 #include <winioctl.h>
@@ -456,6 +461,27 @@ canonicalize_file_name (const char *path)
   return ret;
 }
 
+#ifdef __CYGWIN__
+/* Convert POSIX path to Win32 path,
+   remove drive letter, replace backslashes.  */
+static char *
+get_win32_path (const char *path)
+{
+  char winpath[PATH_MAX];
+  if (cygwin_conv_path (CCP_POSIX_TO_WIN_A, path, winpath, sizeof(winpath)))
+    grub_util_error ("cygwin_conv_path() failed");
+
+  int len = strlen (winpath);
+  int offs = (len > 2 && winpath[1] == ':' ? 2 : 0);
+
+  int i;
+  for (i = offs; i < len; i++)
+    if (winpath[i] == '\\')
+      winpath[i] = '/';
+  return xstrdup (winpath + offs);
+}
+#endif
+
 /* This function never prints trailing slashes (so that its output
    can be appended a slash unconditionally).  */
 char *
@@ -521,30 +547,31 @@ make_system_path_relative_to_its_root (const char *path)
       /* offset == 1 means root directory.  */
       if (offset == 1)
 	{
-	  free (buf);
-	  len = strlen (buf2);
-	  while (buf2[len - 1] == '/' && len > 1)
-	    {
-	      buf2[len - 1] = '\0';
-	      len--;
-	    }
-	  if (len > 1)
-	    return buf2;
-	  else
-	    {
-	      /* This means path given is just a backslash.  As above
-		 we have to return an empty string.  */
-	      free (buf2);
-	      return xstrdup ("");
-	    }
+	  /* Include leading slash.  */
+	  offset = 0;
+	  break;
 	}
     }
   free (buf);
   buf3 = xstrdup (buf2 + offset);
   free (buf2);
 
+#ifdef __CYGWIN__
+  if (st.st_dev != (DEV_CYGDRIVE_MAJOR << 16))
+    {
+      /* Reached some mount point not below /cygdrive.
+	 GRUB does not know Cygwin's emulated mounts,
+	 convert to Win32 path.  */
+      grub_util_info ("Cygwin path = %s\n", buf3);
+      char * temp = get_win32_path (buf3);
+      free (buf3);
+      buf3 = temp;
+    }
+#endif
+
+  /* Remove trailing slashes, return empty string if root directory.  */
   len = strlen (buf3);
-  while (buf3[len - 1] == '/' && len > 1)
+  while (len > 0 && buf3[len - 1] == '/')
     {
       buf3[len - 1] = '\0';
       len--;

From 92517362b2e204ec83a6d2d7bef99913b081da21 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 2 May 2010 16:26:00 +0200
Subject: [PATCH 0883/1628] Split a memory chunk spanning accross 1MiB mark for
 openbsd

---
 loader/i386/bsd.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index c0c75204d..26055d5ca 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -301,7 +301,7 @@ generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf)
 	{
 	  prev.size += cur.size;
 	  if (mmap)
-           mmap[-1] = prev;
+	    mmap[-1] = prev;
 	}
       else
 	{
@@ -311,6 +311,23 @@ generate_e820_mmap (grub_size_t *len, grub_size_t *cnt, void *buf)
 	  count++;
 	}
 
+      if (kernel_type == KERNEL_TYPE_OPENBSD && prev.addr < 0x100000
+	  && prev.addr + prev.size > 0x100000)
+	{
+	  cur.addr = 0x100000;
+	  cur.size = prev.addr + prev.size - 0x100000;
+	  cur.type = prev.type;
+	  prev.size = 0x100000 - prev.addr;
+	  if (mmap)
+	    {
+	      mmap[-1] = prev;
+	      mmap[0] = cur;
+	      mmap++;
+	    }
+	  prev = cur;
+	  count++;
+	}
+
       return 0;
     }
 
@@ -1475,7 +1492,7 @@ grub_cmd_openbsd (grub_extcmd_t cmd, int argc, char *argv[])
 
   if (grub_bsd_load (argc, argv) == GRUB_ERR_NONE)
     {
-      grub_loader_set (grub_openbsd_boot, grub_bsd_unload, 1);
+      grub_loader_set (grub_openbsd_boot, grub_bsd_unload, 0);
       openbsd_root = bootdev;
     }
 

From 4fc5ff74f2e5a1497cbdc482e0d8d2cd88fe34d8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 2 May 2010 16:27:22 +0200
Subject: [PATCH 0884/1628] USe more low memory on i386-qemu

---
 kern/i386/qemu/mmap.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kern/i386/qemu/mmap.c b/kern/i386/qemu/mmap.c
index c7fc4f45e..dfdb99b74 100644
--- a/kern/i386/qemu/mmap.c
+++ b/kern/i386/qemu/mmap.c
@@ -52,6 +52,11 @@ grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uin
 	    GRUB_MACHINE_MEMORY_AVAILABLE))
     return 1;
 
+  if (hook ((grub_addr_t) _end,
+           0xa0000 - (grub_addr_t) _end,
+           GRUB_MACHINE_MEMORY_AVAILABLE))
+    return 1;
+
   if (hook (GRUB_MEMORY_MACHINE_UPPER,
 	    0x100000 - GRUB_MEMORY_MACHINE_UPPER,
 	    GRUB_MACHINE_MEMORY_RESERVED))

From 32bf9244dc9150500be489e43d2efc1c2a04245b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 2 May 2010 19:39:07 +0200
Subject: [PATCH 0885/1628] Remove reference to loader.h

---
 loader/mips/linux.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/loader/mips/linux.c b/loader/mips/linux.c
index a3569c34c..018cfdcc5 100644
--- a/loader/mips/linux.c
+++ b/loader/mips/linux.c
@@ -23,7 +23,6 @@
 #include <grub/dl.h>
 #include <grub/mm.h>
 #include <grub/misc.h>
-#include <grub/machine/loader.h>
 #include <grub/command.h>
 #include <grub/mips/relocator.h>
 #include <grub/machine/memory.h>

From 6f030865dade7134dffee51bf27c3cc569aa2bab Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 2 May 2010 19:39:35 +0200
Subject: [PATCH 0886/1628] Add missing memory.h

---
 include/grub/mips/memory.h | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 include/grub/mips/memory.h

diff --git a/include/grub/mips/memory.h b/include/grub/mips/memory.h
new file mode 100644
index 000000000..e51bcc1f2
--- /dev/null
+++ b/include/grub/mips/memory.h
@@ -0,0 +1 @@
+#include <grub/machine/memory.h>

From db292d391f53e20454b1bf61c674399dc30105e9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 2 May 2010 19:39:46 +0200
Subject: [PATCH 0887/1628] Support elfsyms on mb2

---
 loader/multiboot_mbi2.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/loader/multiboot_mbi2.c b/loader/multiboot_mbi2.c
index 78c280fbf..8cade2f2f 100644
--- a/loader/multiboot_mbi2.c
+++ b/loader/multiboot_mbi2.c
@@ -55,6 +55,19 @@ static unsigned modcnt;
 static char *cmdline = NULL;
 static int bootdev_set;
 static grub_uint32_t biosdev, slice, part;
+static grub_size_t elf_sec_num, elf_sec_entsize;
+static unsigned elf_sec_shstrndx;
+static void *elf_sections;
+
+void
+grub_multiboot_add_elfsyms (grub_size_t num, grub_size_t entsize,
+			    unsigned shndx, void *data)
+{
+  elf_sec_num = num;
+  elf_sec_shstrndx = shndx;
+  elf_sec_entsize = entsize;
+  elf_sections = data;
+}
 
 grub_err_t
 grub_multiboot_load (grub_file_t file)
@@ -262,6 +275,8 @@ grub_multiboot_get_mbi_size (void)
     + (modcnt * sizeof (struct multiboot_tag_module) + total_modcmd)
     + sizeof (struct multiboot_tag_basic_meminfo)
     + ALIGN_UP (sizeof (struct multiboot_tag_bootdev), MULTIBOOT_TAG_ALIGN)
+    + sizeof (struct multiboot_tag_elf_sections)
+    + elf_sec_entsize * elf_sec_num
     + (sizeof (struct multiboot_tag_mmap) + grub_get_multiboot_mmap_count ()
        * sizeof (struct multiboot_mmap_entry))
     + sizeof (struct multiboot_tag_vbe) + MULTIBOOT_TAG_ALIGN - 1;
@@ -518,6 +533,19 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
     ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN);
   }
 
+  {
+    struct multiboot_tag_elf_sections *tag
+      = (struct multiboot_tag_elf_sections *) ptrorig;
+    tag->type = MULTIBOOT_TAG_TYPE_ELF_SECTIONS;
+    tag->size = sizeof (struct multiboot_tag_elf_sections)
+      + elf_sec_entsize * elf_sec_num;
+    grub_memcpy (tag->sections, elf_sections, elf_sec_entsize * elf_sec_num);
+    tag->num = elf_sec_num;
+    tag->entsize = elf_sec_entsize;
+    tag->shndx = elf_sec_shstrndx;
+    ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN);
+  }
+
   {
     struct multiboot_tag_basic_meminfo *tag
       = (struct multiboot_tag_basic_meminfo *) ptrorig;

From 05f602fc5168dbc53b05dc62d4fdc92d5bab4ed8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 2 May 2010 22:06:44 +0200
Subject: [PATCH 0888/1628] enable xnu on all platforms

---
 conf/i386-coreboot.rmk                        | 17 +++++
 conf/i386-ieee1275.rmk                        | 10 +++
 conf/i386-multiboot.rmk                       | 27 ++++---
 conf/i386-pc.rmk                              | 74 +++----------------
 conf/i386-qemu.rmk                            | 11 +++
 conf/i386.rmk                                 | 57 ++++++++++++++
 conf/x86-efi.rmk                              |  7 --
 configure.ac                                  |  6 ++
 efiemu/i386/coredetect.c                      |  1 -
 .../pc/efiemu.h => efiemu/i386/nocfgtables.c  | 16 ++--
 efiemu/i386/pc/cfgtables.c                    |  1 -
 efiemu/loadcore.c                             |  1 -
 efiemu/main.c                                 |  1 -
 include/grub/efiemu/efiemu.h                  |  2 +
 loader/i386/xnu.c                             |  4 +
 15 files changed, 145 insertions(+), 90 deletions(-)
 rename include/grub/i386/pc/efiemu.h => efiemu/i386/nocfgtables.c (75%)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 805cc40b1..c9eea6470 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -22,6 +22,7 @@ kernel_img_SOURCES = kern/i386/coreboot/startup.S \
 	kern/env.c \
 	term/i386/pc/vga_text.c term/i386/vga_common.c \
 	symlist.c
+kernel_img_HEADERS += i386/pit.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x8200,-Bstatic
@@ -71,6 +72,22 @@ datetime_mod_SOURCES = lib/cmos_datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += efiemu.mod
+efiemu_mod_SOURCES = efiemu/main.c efiemu/i386/loadcore32.c \
+		     efiemu/i386/loadcore64.c efiemu/i386/pc/cfgtables.c \
+		     efiemu/mm.c efiemu/loadcore_common.c efiemu/symbols.c \
+		     efiemu/loadcore32.c efiemu/loadcore64.c \
+		     efiemu/prepare32.c efiemu/prepare64.c efiemu/pnvram.c \
+		     efiemu/i386/coredetect.c
+efiemu_mod_CFLAGS = $(COMMON_CFLAGS)
+efiemu_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For acpi.mod.
+pkglib_MODULES += acpi.mod
+acpi_mod_SOURCES = commands/acpi.c commands/i386/pc/acpi.c
+acpi_mod_CFLAGS = $(COMMON_CFLAGS)
+acpi_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 BOOTTARGET=coreboot
 QEMU32=qemu-system-i386
 
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index d9469c6e6..1b7460dc3 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -64,5 +64,15 @@ datetime_mod_SOURCES = lib/cmos_datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += efiemu.mod
+efiemu_mod_SOURCES = efiemu/main.c efiemu/i386/loadcore32.c \
+		     efiemu/i386/loadcore64.c efiemu/i386/nocfgtables.c \
+		     efiemu/mm.c efiemu/loadcore_common.c efiemu/symbols.c \
+		     efiemu/loadcore32.c efiemu/loadcore64.c \
+		     efiemu/prepare32.c efiemu/prepare64.c efiemu/pnvram.c \
+		     efiemu/i386/coredetect.c
+efiemu_mod_CFLAGS = $(COMMON_CFLAGS)
+efiemu_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk
diff --git a/conf/i386-multiboot.rmk b/conf/i386-multiboot.rmk
index 69b8e9a48..ddfb7e283 100644
--- a/conf/i386-multiboot.rmk
+++ b/conf/i386-multiboot.rmk
@@ -24,6 +24,7 @@ kernel_img_SOURCES = kern/i386/coreboot/startup.S \
 	kern/env.c \
 	term/i386/pc/vga_text.c term/i386/vga_common.c \
 	symlist.c
+kernel_img_HEADERS += i386/pit.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR),-Bstatic
@@ -35,7 +36,7 @@ bin_SCRIPTS += grub-mkrescue
 grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 # Modules.
-pkglib_MODULES = linux.mod aout.mod halt.mod datetime.mod mmap.mod
+pkglib_MODULES = linux.mod halt.mod datetime.mod mmap.mod
 
 # For mmap.mod.
 mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
@@ -53,17 +54,21 @@ halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For aout.mod.
-aout_mod_SOURCES = loader/aout.c
-aout_mod_CFLAGS = $(COMMON_CFLAGS)
-aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
+pkglib_MODULES += efiemu.mod
+efiemu_mod_SOURCES = efiemu/main.c efiemu/i386/loadcore32.c \
+		     efiemu/i386/loadcore64.c efiemu/i386/pc/cfgtables.c \
+		     efiemu/mm.c efiemu/loadcore_common.c efiemu/symbols.c \
+		     efiemu/loadcore32.c efiemu/loadcore64.c \
+		     efiemu/prepare32.c efiemu/prepare64.c efiemu/pnvram.c \
+		     efiemu/i386/coredetect.c
+efiemu_mod_CFLAGS = $(COMMON_CFLAGS)
+efiemu_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For bsd.mod
-pkglib_MODULES += bsd.mod
-bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c loader/i386/bsd_helper.S loader/i386/bsd_trampoline.S
-bsd_mod_CFLAGS = $(COMMON_CFLAGS)
-bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
+# For acpi.mod.
+pkglib_MODULES += acpi.mod
+acpi_mod_SOURCES = commands/acpi.c commands/i386/pc/acpi.c
+acpi_mod_CFLAGS = $(COMMON_CFLAGS)
+acpi_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For datetime.mod
 datetime_mod_SOURCES = lib/cmos_datetime.c
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index d403d19f1..3f0eeb611 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -92,7 +92,7 @@ grub_mkrescue_SOURCES = util/grub-mkrescue.in
 pkglib_MODULES = biosdisk.mod chain.mod halt.mod vbe.mod vbetest.mod \
 	vbeinfo.mod vga.mod pxe.mod pxecmd.mod datetime.mod ata_pthru.mod \
 	hdparm.mod usb.mod uhci.mod ohci.mod usbtest.mod usbms.mod \
-	usb_keyboard.mod efiemu.mod mmap.mod acpi.mod drivemap.mod
+	usb_keyboard.mod mmap.mod drivemap.mod
 
 # For drivemap.mod.
 drivemap_mod_SOURCES = commands/i386/pc/drivemap.c \
@@ -101,17 +101,8 @@ drivemap_mod_ASFLAGS = $(COMMON_ASFLAGS)
 drivemap_mod_CFLAGS = $(COMMON_CFLAGS)
 drivemap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For efiemu.mod.
-efiemu_mod_SOURCES = efiemu/main.c efiemu/i386/loadcore32.c \
-		     efiemu/i386/loadcore64.c efiemu/i386/pc/cfgtables.c \
-		     efiemu/mm.c efiemu/loadcore_common.c efiemu/symbols.c \
-		     efiemu/loadcore32.c efiemu/loadcore64.c \
-		     efiemu/prepare32.c efiemu/prepare64.c efiemu/pnvram.c \
-		     efiemu/i386/coredetect.c
-efiemu_mod_CFLAGS = $(COMMON_CFLAGS)
-efiemu_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For acpi.mod.
+pkglib_MODULES += acpi.mod
 acpi_mod_SOURCES = commands/acpi.c commands/i386/pc/acpi.c
 acpi_mod_CFLAGS = $(COMMON_CFLAGS)
 acpi_mod_LDFLAGS = $(COMMON_LDFLAGS)
@@ -144,12 +135,15 @@ linux16_mod_SOURCES = loader/i386/pc/linux.c
 linux16_mod_CFLAGS = $(COMMON_CFLAGS)
 linux16_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-pkglib_MODULES += xnu.mod
-xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c \
-	 loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
-xnu_mod_CFLAGS = $(COMMON_CFLAGS)
-xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
-xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
+pkglib_MODULES += efiemu.mod
+efiemu_mod_SOURCES = efiemu/main.c efiemu/i386/loadcore32.c \
+		     efiemu/i386/loadcore64.c efiemu/i386/pc/cfgtables.c \
+		     efiemu/mm.c efiemu/loadcore_common.c efiemu/symbols.c \
+		     efiemu/loadcore32.c efiemu/loadcore64.c \
+		     efiemu/prepare32.c efiemu/prepare64.c efiemu/pnvram.c \
+		     efiemu/i386/coredetect.c
+efiemu_mod_CFLAGS = $(COMMON_CFLAGS)
+efiemu_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For halt.mod.
 halt_mod_SOURCES = commands/i386/pc/halt.c
@@ -231,52 +225,6 @@ hdparm_mod_SOURCES = commands/hdparm.c lib/hexdump.c
 hdparm_mod_CFLAGS = $(COMMON_CFLAGS)
 hdparm_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-ifeq ($(enable_efiemu), yes)
-
-efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
-	-rm -f $@
-ifeq ($(TARGET_APPLE_CC), 1)
-	-rm -f $@.bin
-	$(TARGET_CC) -c -m32 -DELF32 -DAPPLE_CC -o $@.bin -Wall -Werror $< -nostdlib -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-	$(OBJCONV) -felf32 -nu -nd $@.bin $@
-	-rm -f $@.bin
-else
-	$(TARGET_CC) -c -m32 -DELF32 -o $@ -Wall -Werror $< -nostdlib -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-	if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi
-endif
-
-efiemu64_c.o: efiemu/runtime/efiemu.c
-ifeq ($(TARGET_APPLE_CC), 1)
-	$(TARGET_CC) -c -m64 -DAPPLE_CC=1 -DELF64 -o $@ -Wall -Werror $< -nostdlib -mno-red-zone -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-else
-	$(TARGET_CC) -c -m64 -DELF64 -o $@ -Wall -Werror $< -nostdlib  -mcmodel=large -mno-red-zone -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-endif
-
-efiemu64_s.o: efiemu/runtime/efiemu.S
-	-rm -f $@
-ifeq ($(TARGET_APPLE_CC), 1)
-	$(TARGET_CC) -c -m64 -DAPPLE_CC=1 -DELF64 -o $@ -Wall -Werror $< -nostdlib -mno-red-zone -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-else
-	$(TARGET_CC) -c -m64 -DELF64 -o $@ -Wall -Werror $< -nostdlib  -mcmodel=large -mno-red-zone -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-endif
-
-efiemu64.o: efiemu64_c.o efiemu64_s.o  $(TARGET_OBJ2ELF)
-	-rm -f $@
-ifeq ($(TARGET_APPLE_CC), 1)
-	-rm -f $@.bin
-	$(TARGET_CC) -m64 -o $@.bin -Wl,-r $^ -nostdlib
-	$(OBJCONV) -felf64 -nu -nd $@.bin $@
-	-rm -f $@.bin
-else
-	$(TARGET_CC) -m64 -o $@ -Wl,-r $^ -nostdlib
-	if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi
-endif
-
-CLEANFILES += efiemu32.o efiemu64.o efiemu64_c.o efiemu64_s.o
-pkglib_DATA += efiemu32.o efiemu64.o
-
-endif
-
 BOOTTARGET=cd
 QEMU32=qemu-system-i386
 
diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index 416fbc0f3..5ec3c7eea 100644
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -31,6 +31,7 @@ kernel_img_SOURCES = kern/i386/qemu/startup.S \
 	kern/env.c \
 	term/i386/pc/vga_text.c term/i386/vga_common.c \
 	symlist.c
+kernel_img_HEADERS += i386/pit.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR)
@@ -61,6 +62,16 @@ datetime_mod_SOURCES = lib/cmos_datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += efiemu.mod
+efiemu_mod_SOURCES = efiemu/main.c efiemu/i386/loadcore32.c \
+		     efiemu/i386/loadcore64.c efiemu/i386/nocfgtables.c \
+		     efiemu/mm.c efiemu/loadcore_common.c efiemu/symbols.c \
+		     efiemu/loadcore32.c efiemu/loadcore64.c \
+		     efiemu/prepare32.c efiemu/prepare64.c efiemu/pnvram.c \
+		     efiemu/i386/coredetect.c
+efiemu_mod_CFLAGS = $(COMMON_CFLAGS)
+efiemu_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 BOOTTARGET=qemu
 QEMU32=qemu-system-i386
 
diff --git a/conf/i386.rmk b/conf/i386.rmk
index 004dab7f3..fb23e879b 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -105,6 +105,59 @@ play_mod_SOURCES = commands/i386/pc/play.c
 play_mod_CFLAGS = $(COMMON_CFLAGS)
 play_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += xnu.mod
+xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c \
+	 loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
+xnu_mod_CFLAGS = $(COMMON_CFLAGS)
+xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
+xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
+
+ifeq ($(enable_efiemu), yes)
+
+efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
+	-rm -f $@
+ifeq ($(TARGET_APPLE_CC), 1)
+	-rm -f $@.bin
+	$(TARGET_CC) -c -m32 -DELF32 -DAPPLE_CC -o $@.bin -Wall -Werror $< -nostdlib -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
+	$(OBJCONV) -felf32 -nu -nd $@.bin $@
+	-rm -f $@.bin
+else
+	$(TARGET_CC) -c -m32 -DELF32 -o $@ -Wall -Werror $< -nostdlib -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
+	if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi
+endif
+
+efiemu64_c.o: efiemu/runtime/efiemu.c
+ifeq ($(TARGET_APPLE_CC), 1)
+	$(TARGET_CC) -c -m64 -DAPPLE_CC=1 -DELF64 -o $@ -Wall -Werror $< -nostdlib -mno-red-zone -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
+else
+	$(TARGET_CC) -c -m64 -DELF64 -o $@ -Wall -Werror $< -nostdlib  -mcmodel=large -mno-red-zone -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
+endif
+
+efiemu64_s.o: efiemu/runtime/efiemu.S
+	-rm -f $@
+ifeq ($(TARGET_APPLE_CC), 1)
+	$(TARGET_CC) -c -m64 -DAPPLE_CC=1 -DELF64 -o $@ -Wall -Werror $< -nostdlib -mno-red-zone -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
+else
+	$(TARGET_CC) -c -m64 -DELF64 -o $@ -Wall -Werror $< -nostdlib  -mcmodel=large -mno-red-zone -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
+endif
+
+efiemu64.o: efiemu64_c.o efiemu64_s.o  $(TARGET_OBJ2ELF)
+	-rm -f $@
+ifeq ($(TARGET_APPLE_CC), 1)
+	-rm -f $@.bin
+	$(TARGET_CC) -m64 -o $@.bin -Wl,-r $^ -nostdlib
+	$(OBJCONV) -felf64 -nu -nd $@.bin $@
+	-rm -f $@.bin
+else
+	$(TARGET_CC) -m64 -o $@ -Wl,-r $^ -nostdlib
+	if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi
+endif
+
+CLEANFILES += efiemu32.o efiemu64.o efiemu64_c.o efiemu64_s.o
+pkglib_DATA += efiemu32.o efiemu64.o
+
+endif
+
 linux.init.x86_64: $(srcdir)/tests/boot/linux.init-x86_64.S
 	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 
@@ -161,6 +214,10 @@ bootcheck-linux-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64
 BOOTCHECKS += bootcheck-linux-i386 bootcheck-linux-x86_64 \
 	bootcheck-kfreebsd-i386 bootcheck-knetbsd-x86_64
 
+ifneq ($(platform), coreboot) 
+BOOTCHECKS += bootcheck-kfreebsd-i386
+endif
+
 .PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
 	bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \
 	bootcheck-knetbsd-i386 bootcheck-knetbsd-x86_64
diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index 68e1b3c7c..7bc0eeea0 100644
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -87,13 +87,6 @@ efi_gop_mod_SOURCES = video/efi_gop.c
 efi_gop_mod_CFLAGS = $(COMMON_CFLAGS)
 efi_gop_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-pkglib_MODULES += xnu.mod
-xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c \
-	loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
-xnu_mod_CFLAGS = $(COMMON_CFLAGS)
-xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
-xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
 BOOTTARGET=cd
 
 include $(srcdir)/conf/i386.mk
diff --git a/configure.ac b/configure.ac
index 1f7efd78a..810b8e78d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -542,6 +542,12 @@ AC_ARG_ENABLE([efiemu],
 if test x"$enable_efiemu" = xno ; then
   efiemu_excuse="explicitly disabled"
 fi
+if test x"$target_cpu" != xi386 ; then
+  efiemu_excuse="only available on i386"
+fi
+if test x"$platform" != xefi ; then
+  efiemu_excuse="not available on efi"
+fi
 if test x"$efiemu_excuse" = x ; then
   AC_CACHE_CHECK([whether options required for efiemu work], grub_cv_cc_efiemu, [
     CFLAGS="$CFLAGS -m64 -mcmodel=large -mno-red-zone -nostdlib"
diff --git a/efiemu/i386/coredetect.c b/efiemu/i386/coredetect.c
index 828508dee..975c4aa5d 100644
--- a/efiemu/i386/coredetect.c
+++ b/efiemu/i386/coredetect.c
@@ -17,7 +17,6 @@
  */
 
 #include <grub/efiemu/efiemu.h>
-#include <grub/machine/efiemu.h>
 #include <grub/command.h>
 
 #define cpuid(num,a,b,c,d) \
diff --git a/include/grub/i386/pc/efiemu.h b/efiemu/i386/nocfgtables.c
similarity index 75%
rename from include/grub/i386/pc/efiemu.h
rename to efiemu/i386/nocfgtables.c
index f269dd085..775f1d03a 100644
--- a/include/grub/i386/pc/efiemu.h
+++ b/efiemu/i386/nocfgtables.c
@@ -1,3 +1,4 @@
+/* Register SMBIOS and ACPI tables. */
 /*
  *  GRUB  --  GRand Unified Bootloader
  *  Copyright (C) 2009  Free Software Foundation, Inc.
@@ -16,9 +17,14 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GRUB_MACHINE_EFI_EMU_HEADER
-#define GRUB_MACHINE_EFI_EMU_HEADER	1
+#include <grub/err.h>
+#include <grub/efiemu/efiemu.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/acpi.h>
 
-grub_err_t grub_machine_efiemu_init_tables (void);
-
-#endif
+grub_err_t
+grub_machine_efiemu_init_tables (void)
+{
+  return GRUB_ERR_NONE;
+}
diff --git a/efiemu/i386/pc/cfgtables.c b/efiemu/i386/pc/cfgtables.c
index 9c6b4e55e..9287d3a94 100644
--- a/efiemu/i386/pc/cfgtables.c
+++ b/efiemu/i386/pc/cfgtables.c
@@ -19,7 +19,6 @@
 
 #include <grub/err.h>
 #include <grub/efiemu/efiemu.h>
-#include <grub/machine/efiemu.h>
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/acpi.h>
diff --git a/efiemu/loadcore.c b/efiemu/loadcore.c
index 4bf26ee44..edadd4580 100644
--- a/efiemu/loadcore.c
+++ b/efiemu/loadcore.c
@@ -22,7 +22,6 @@
 #include <grub/misc.h>
 #include <grub/efiemu/efiemu.h>
 #include <grub/cpu/efiemu.h>
-#include <grub/machine/efiemu.h>
 #include <grub/elf.h>
 
 /* ELF symbols and their values */
diff --git a/efiemu/main.c b/efiemu/main.c
index 7ebbae946..3f5fb9435 100644
--- a/efiemu/main.c
+++ b/efiemu/main.c
@@ -29,7 +29,6 @@
 #include <grub/dl.h>
 #include <grub/misc.h>
 #include <grub/efiemu/efiemu.h>
-#include <grub/machine/efiemu.h>
 #include <grub/command.h>
 
 /* System table. Two version depending on mode */
diff --git a/include/grub/efiemu/efiemu.h b/include/grub/efiemu/efiemu.h
index 1cddbca7c..fb1b69751 100644
--- a/include/grub/efiemu/efiemu.h
+++ b/include/grub/efiemu/efiemu.h
@@ -282,4 +282,6 @@ grub_efiemu_set_virtual_address_map (grub_efi_uintn_t memory_map_size,
 				     __attribute__ ((unused)),
 				     grub_efi_memory_descriptor_t *virtual_map);
 
+grub_err_t grub_machine_efiemu_init_tables (void);
+
 #endif /* ! GRUB_EFI_EMU_HEADER */
diff --git a/loader/i386/xnu.c b/loader/i386/xnu.c
index 2aec590fb..d110293e0 100644
--- a/loader/i386/xnu.c
+++ b/loader/i386/xnu.c
@@ -123,6 +123,7 @@ static grub_uint64_t
 guessfsb (void)
 {
   const grub_uint64_t sane_value = 100000000;
+#ifndef GRUB_MACHINE_IEEE1275
   grub_uint32_t manufacturer[3], max_cpuid, capabilities, msrlow;
   grub_uint64_t start_tsc;
   grub_uint64_t end_tsc;
@@ -208,6 +209,9 @@ guessfsb (void)
 
   return grub_divmod64 (2000 * tsc_ticks_per_ms,
 			((msrlow >> 7) & 0x3e) + ((msrlow >> 14) & 1), 0);
+#else
+  return sane_value;
+#endif
 }
 
 struct property_descriptor

From 7f5320b3194675c5c56e179aea01ca4bec5fd2fd Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 2 May 2010 23:09:45 +0200
Subject: [PATCH 0889/1628] Compress miniroot and decrease timeout

---
 conf/common.rmk         |  2 +-
 conf/i386.rmk           | 26 ++++++++++++++------------
 tests/boot/kfreebsd.cfg |  2 +-
 tests/boot/knetbsd.cfg  |  2 +-
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index a8c881276..29d69f27a 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -866,7 +866,7 @@ grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(sr
 # Randomly generated
 SUCCESSFUL_BOOT_STRING=3e49994fd5d82b7c9298d672d774080d
 # tianocore cd access is very slow
-BOOTCHECK_TIMEOUT=600
+BOOTCHECK_TIMEOUT=180
 
 bootcheck: $(BOOTCHECKS)
 
diff --git a/conf/i386.rmk b/conf/i386.rmk
index fb23e879b..b7c9b293d 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -182,6 +182,9 @@ linux-initramfs.%: linux.init.% Makefile
 kfreebsd-mfsroot.%: kfreebsd.init.% Makefile
 	TDIR=`mktemp -d`; mkdir $$TDIR/dev; mkdir $$TDIR/sbin; cp $< $$TDIR/sbin/init; makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR; rm -rf $$TDIR
 
+%.gz: %
+	gzip < $< > $@
+
 knetbsd.image.%: knetbsd.init.%
 	TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
 
@@ -193,17 +196,17 @@ knetbsd.miniroot-image.x86_64: knetbsd.image.x86_64 $(GRUB_PAYLOADS_DIR)/knetbsd
 
 CLEANFILES += linux.init.i386 kfreebsd.init.i386 linux.init.x86_64 linux-initramfs.i386 linux-initramfs.x86_64
 
-bootcheck-kfreebsd-i386: kfreebsd-mfsroot.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
-	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/mfsroot=kfreebsd-mfsroot.i386 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.i386 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+bootcheck-kfreebsd-i386: kfreebsd-mfsroot.i386.gz $(GRUB_PAYLOADS_DIR)/kfreebsd.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/mfsroot.gz=kfreebsd-mfsroot.i386.gz --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.i386 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
-bootcheck-kfreebsd-x86_64: kfreebsd-mfsroot.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
-	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/mfsroot=kfreebsd-mfsroot.x86_64 --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+bootcheck-kfreebsd-x86_64: kfreebsd-mfsroot.x86_64.gz $(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/mfsroot=kfreebsd-mfsroot.x86_64.gz --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
-bootcheck-knetbsd-i386: knetbsd.miniroot-image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg knetbsd.miniroot-image.i386 grub-shell
-	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/miniroot=knetbsd.miniroot-image.i386 --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+bootcheck-knetbsd-i386: knetbsd.miniroot-image.i386.gz $(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg knetbsd.miniroot-image.i386 grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/miniroot.gz=knetbsd.miniroot-image.i386.gz --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
-bootcheck-knetbsd-x86_64: knetbsd.miniroot-image.x86_64 $(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/tests/boot/knetbsd.cfg knetbsd.miniroot-image.x86_64 grub-shell
-	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/miniroot=knetbsd.miniroot-image.x86_64 --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+bootcheck-knetbsd-x86_64: knetbsd.miniroot-image.x86_64.gz $(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/tests/boot/knetbsd.cfg knetbsd.miniroot-image.x86_64 grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/miniroot.gz=knetbsd.miniroot-image.x86_64.gz --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 bootcheck-linux-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
@@ -211,11 +214,10 @@ bootcheck-linux-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(src
 bootcheck-linux-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
-BOOTCHECKS += bootcheck-linux-i386 bootcheck-linux-x86_64 \
-	bootcheck-kfreebsd-i386 bootcheck-knetbsd-x86_64
+BOOTCHECKS += bootcheck-linux-i386 bootcheck-linux-x86_64 
 
-ifneq ($(platform), coreboot) 
-BOOTCHECKS += bootcheck-kfreebsd-i386
+ifneq ($(platform), coreboot)
+BOOTCHECKS += bootcheck-kfreebsd-i386 bootcheck-knetbsd-x86_64
 endif
 
 .PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
diff --git a/tests/boot/kfreebsd.cfg b/tests/boot/kfreebsd.cfg
index 8f339cd7f..5534f3c03 100644
--- a/tests/boot/kfreebsd.cfg
+++ b/tests/boot/kfreebsd.cfg
@@ -1,6 +1,6 @@
 kfreebsd /kfreebsd -h
 kfreebsd_loadenv /kfreebsd_env
-kfreebsd_module /mfsroot type=mfs_root
+kfreebsd_module /mfsroot.gz type=mfs_root
 set kFreeBSD.hw.hasbrokenint12=1
 boot
 # Shouln't happen
diff --git a/tests/boot/knetbsd.cfg b/tests/boot/knetbsd.cfg
index ad2258dce..f88a846e1 100644
--- a/tests/boot/knetbsd.cfg
+++ b/tests/boot/knetbsd.cfg
@@ -1,5 +1,5 @@
 knetbsd /knetbsd -h
-knetbsd_module_elf /miniroot
+knetbsd_module_elf /miniroot.gz
 boot
 # Shouln't happen
 halt

From 86fbf9798a8079d3863ed21aadafb17365d77611 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 May 2010 01:46:43 +0200
Subject: [PATCH 0890/1628] Fix makefile problem due to compression

---
 conf/i386.rmk | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/conf/i386.rmk b/conf/i386.rmk
index b7c9b293d..0b707ca6a 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -179,19 +179,19 @@ knetbsd.init.x86_64: $(srcdir)/tests/boot/knetbsd.init-x86_64.S
 linux-initramfs.%: linux.init.% Makefile
 	TDIR=`mktemp -d`; cp $< $$TDIR/init; (cd $$TDIR; echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@; rm -rf $$TDIR
 
-kfreebsd-mfsroot.%: kfreebsd.init.% Makefile
-	TDIR=`mktemp -d`; mkdir $$TDIR/dev; mkdir $$TDIR/sbin; cp $< $$TDIR/sbin/init; makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR; rm -rf $$TDIR
-
-%.gz: %
+%.gz: %.img
 	gzip < $< > $@
 
+kfreebsd-mfsroot.%.img: kfreebsd.init.% Makefile
+	TDIR=`mktemp -d`; mkdir $$TDIR/dev; mkdir $$TDIR/sbin; cp $< $$TDIR/sbin/init; makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR; rm -rf $$TDIR
+
 knetbsd.image.%: knetbsd.init.%
 	TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
 
-knetbsd.miniroot-image.i386: knetbsd.image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386
+knetbsd.miniroot-image.i386.img: knetbsd.image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386
 	$(OBJCOPY) --add-section=miniroot=$< $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386 $@
 
-knetbsd.miniroot-image.x86_64: knetbsd.image.x86_64 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.x86_64
+knetbsd.miniroot-image.x86_64.img: knetbsd.image.x86_64 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.x86_64
 	$(OBJCOPY) --add-section=miniroot=$< $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.x86_64 $@
 
 CLEANFILES += linux.init.i386 kfreebsd.init.i386 linux.init.x86_64 linux-initramfs.i386 linux-initramfs.x86_64
@@ -200,7 +200,7 @@ bootcheck-kfreebsd-i386: kfreebsd-mfsroot.i386.gz $(GRUB_PAYLOADS_DIR)/kfreebsd.
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/mfsroot.gz=kfreebsd-mfsroot.i386.gz --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.i386 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 bootcheck-kfreebsd-x86_64: kfreebsd-mfsroot.x86_64.gz $(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
-	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/mfsroot=kfreebsd-mfsroot.x86_64.gz --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/mfsroot.gz=kfreebsd-mfsroot.x86_64.gz --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 bootcheck-knetbsd-i386: knetbsd.miniroot-image.i386.gz $(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg knetbsd.miniroot-image.i386 grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/miniroot.gz=knetbsd.miniroot-image.i386.gz --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null

From 2589383147fc5b1dbca19428e5ab2dba9ae9c3ac Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 May 2010 12:53:32 +0200
Subject: [PATCH 0891/1628] 	* kern/mm.c (grub_real_malloc): Fix size
 calculation when extra == 0.

---
 ChangeLog | 4 ++++
 kern/mm.c | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index dadecec86..96cfb2ebf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/mm.c (grub_real_malloc): Fix size calculation when extra == 0.
+
 2010-05-01  Christian Franke  <franke@computer.org>
 
 	* util/grub-mkconfig_lib.in (make_system_path_relative_to_its_root):
diff --git a/kern/mm.c b/kern/mm.c
index a903991d6..d79f5ce29 100644
--- a/kern/mm.c
+++ b/kern/mm.c
@@ -251,13 +251,20 @@ grub_real_malloc (grub_mm_header_t *first, grub_size_t n, grub_size_t align)
 	      grub_mm_header_t r;
 
 	      p->magic = GRUB_MM_ALLOC_MAGIC;
-	      p->size = n;
 	      
 	      r = p + extra + n;
 	      r->magic = GRUB_MM_FREE_MAGIC;
 	      r->size = p->size - extra - n;
 	      r->next = p->next;
 	      q->next = r;
+
+	      if (q == p)
+		{
+		  q = r;
+		  r->next = r;
+		}
+
+	      p->size = n;
 	    }
 	  else
 	    {

From 9b058d5291fbc0407ac07f8ece0a546317a7e3d4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 May 2010 13:07:31 +0200
Subject: [PATCH 0892/1628] 	* kern/mm.c (grub_mm_init_region): Check for
 region size after aligning 	pointers.

---
 ChangeLog |  5 +++++
 kern/mm.c | 11 +++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 96cfb2ebf..f06602d53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/mm.c (grub_mm_init_region): Check for region size after aligning
+	pointers.
+
 2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/mm.c (grub_real_malloc): Fix size calculation when extra == 0.
diff --git a/kern/mm.c b/kern/mm.c
index d79f5ce29..28802945c 100644
--- a/kern/mm.c
+++ b/kern/mm.c
@@ -148,15 +148,14 @@ grub_mm_init_region (void *addr, grub_size_t size)
   grub_printf ("Using memory for heap: start=%p, end=%p\n", addr, addr + (unsigned int) size);
 #endif
 
-  /* If this region is too small, ignore it.  */
-  if (size < GRUB_MM_ALIGN * 2)
-    return;
-
   /* Allocate a region from the head.  */
-  r = (grub_mm_region_t) (((grub_addr_t) addr + GRUB_MM_ALIGN - 1)
-			  & (~(GRUB_MM_ALIGN - 1)));
+  r = (grub_mm_region_t) ALIGN_UP ((grub_addr_t) addr, GRUB_MM_ALIGN);
   size -= (char *) r - (char *) addr + sizeof (*r);
 
+  /* If this region is too small, ignore it.  */
+  if (size < GRUB_MM_ALIGN)
+    return;
+
   h = (grub_mm_header_t) ((char *) r + GRUB_MM_ALIGN);
   h->next = h;
   h->magic = GRUB_MM_FREE_MAGIC;

From 7dd5a111ba41d1e5332898ba71f834f77292156c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 May 2010 13:12:55 +0200
Subject: [PATCH 0893/1628] 	* kern/mm.c (grub_real_malloc): Put magic and
 size assignment in common 	part.

---
 ChangeLog |  5 +++++
 kern/mm.c | 12 +++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f06602d53..c52e885ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/mm.c (grub_real_malloc): Put magic and size assignment in common
+	part.
+
 2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/mm.c (grub_mm_init_region): Check for region size after aligning
diff --git a/kern/mm.c b/kern/mm.c
index 28802945c..47324a662 100644
--- a/kern/mm.c
+++ b/kern/mm.c
@@ -220,7 +220,6 @@ grub_real_malloc (grub_mm_header_t *first, grub_size_t n, grub_size_t align)
 	         +---------------+          v
 	       */
 	      q->next = p->next;
-	      p->magic = GRUB_MM_ALLOC_MAGIC;
 	    }
 	  else if (align == 1 || p->size == n + extra)
 	    {
@@ -242,14 +241,10 @@ grub_real_malloc (grub_mm_header_t *first, grub_size_t n, grub_size_t align)
 
 	      p->size -= n;
 	      p += p->size;
-	      p->size = n;
-	      p->magic = GRUB_MM_ALLOC_MAGIC;
 	    }
 	  else if (extra == 0)
 	    {
 	      grub_mm_header_t r;
-
-	      p->magic = GRUB_MM_ALLOC_MAGIC;
 	      
 	      r = p + extra + n;
 	      r->magic = GRUB_MM_FREE_MAGIC;
@@ -262,8 +257,6 @@ grub_real_malloc (grub_mm_header_t *first, grub_size_t n, grub_size_t align)
 		  q = r;
 		  r->next = r;
 		}
-
-	      p->size = n;
 	    }
 	  else
 	    {
@@ -296,10 +289,11 @@ grub_real_malloc (grub_mm_header_t *first, grub_size_t n, grub_size_t align)
 	      p->size = extra;
 	      p->next = r;
 	      p += extra;
-	      p->size = n;
-	      p->magic = GRUB_MM_ALLOC_MAGIC;
 	    }
 
+	  p->magic = GRUB_MM_ALLOC_MAGIC;
+	  p->size = n;
+
 	  /* Mark find as a start marker for next allocation to fasten it.
 	     This will have side effect of fragmenting memory as small
 	     pieces before this will be un-used.  */

From 265d68cd1034e6e6ca6296dcf1c7a29244567d9d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 May 2010 13:17:12 +0200
Subject: [PATCH 0894/1628] 	* commands/parttool.c (grub_cmd_parttool): Fix
 #if !GRUB_NO_MODULES 	condition.

---
 ChangeLog           | 11 ++++++++---
 commands/parttool.c |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c52e885ee..2a6d5e12a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,19 @@
-2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+2010-05-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* commands/parttool.c (grub_cmd_parttool): Fix #if !GRUB_NO_MODULES
+	condition.
+
+2010-05-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/mm.c (grub_real_malloc): Put magic and size assignment in common
 	part.
 
-2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+2010-05-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/mm.c (grub_mm_init_region): Check for region size after aligning
 	pointers.
 
-2010-05-01  Vladimir Serbinenko  <phcoder@gmail.com>
+2010-05-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/mm.c (grub_real_malloc): Fix size calculation when extra == 0.
 
diff --git a/commands/parttool.c b/commands/parttool.c
index 0850c5e1d..528cf43d7 100644
--- a/commands/parttool.c
+++ b/commands/parttool.c
@@ -175,7 +175,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
     }
 
   /* Load modules. */
-#if GRUB_NO_MODULES
+#if !GRUB_NO_MODULES
   {
     const char *prefix;
     prefix = grub_env_get ("prefix");

From a57c242287d9e8d7cd97020a0b41cc196b5ed931 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 May 2010 22:53:51 +0200
Subject: [PATCH 0895/1628] Add missing token

---
 util/grub-install.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/grub-install.in b/util/grub-install.in
index 8a93ace8c..0db216fd5 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -342,7 +342,7 @@ else
     prefix_drive=`$grub_probe --target=drive --device ${grub_device}` || exit 1
 fi
 
-case "${target_cpu}-${platform}"
+case "${target_cpu}-${platform}" in
     i386-pc) mkimage_target=i386-pc ;;
     sparc64-ieee1275) mkimage_target=sparc64-ieee1275-raw ;;
     mips-yeeloong) mkimage_target=mipsel-yeeloong-elf ;;

From a1a5c869850fe45fe0dba4000d522045ba40e5ca Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 May 2010 22:54:46 +0200
Subject: [PATCH 0896/1628] Fix default mkimage path determination

---
 Makefile.in         |  2 +-
 util/grub-mkimage.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 3df8b1b72..54f17f27f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -90,7 +90,7 @@ GNULIB_CFLAGS = $(GNULIB_UTIL_CFLAGS) $(POSIX_CFLAGS)
 ASFLAGS = @ASFLAGS@
 LDFLAGS = @LDFLAGS@ $(LIBS)
 CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/gnulib -I$(srcdir)/include -Wall -W \
-	 -DGRUB_LIBDIR=\"$(libdir)\" -DLOCALEDIR=\"$(localedir)\"
+	 -DGRUB_PKGLIBROOTDIR=\"$(libdir)/`echo @PACKAGE_TARNAME@ | sed '$(transform)'`\" -DLOCALEDIR=\"$(localedir)\"
 TARGET_CC = @TARGET_CC@
 TARGET_CFLAGS = -ffreestanding @TARGET_CFLAGS@
 TARGET_ASFLAGS = -nostdinc -fno-builtin @TARGET_ASFLAGS@
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index cc4a225d4..5602b3a96 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -1182,7 +1182,7 @@ Make a bootable image of GRUB.\n\
 \n\
 Report bugs to <%s>.\n\
 "), 
-	      program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY,
+	      program_name, GRUB_PKGLIBROOTDIR, DEFAULT_DIRECTORY,
 	      formats,
 	      PACKAGE_BUGREPORT);
       free (formats);
@@ -1320,14 +1320,15 @@ main (int argc, char *argv[])
 	last = strchr (last + 1, '-');
       if (!last)
 	last = image_target->name + strlen (image_target->name);
-      dir = xmalloc (sizeof (GRUB_LIBDIR) + (last - image_target->name));
-      memcpy (dir, GRUB_LIBDIR, sizeof (GRUB_LIBDIR) - 1);
-      memcpy (dir + sizeof (GRUB_LIBDIR) - 1, image_target->name,
+      dir = xmalloc (sizeof (GRUB_PKGLIBROOTDIR) + (last - image_target->name));
+      memcpy (dir, GRUB_PKGLIBROOTDIR, sizeof (GRUB_PKGLIBROOTDIR) - 1);
+      *(dir + sizeof (GRUB_PKGLIBROOTDIR) - 1) = '/';
+      memcpy (dir + sizeof (GRUB_PKGLIBROOTDIR), image_target->name,
 	      last - image_target->name);
-      *(dir + sizeof (GRUB_LIBDIR) - 1 +  (last - image_target->name)) = 0;
+      *(dir + sizeof (GRUB_PKGLIBROOTDIR) + (last - image_target->name)) = 0;
     }
 
-  generate_image (dir ? : GRUB_LIBDIR, prefix ? : DEFAULT_DIRECTORY, fp,
+  generate_image (dir, prefix ? : DEFAULT_DIRECTORY, fp,
 		  argv + optind, memdisk, font, config,
 		  image_target, note);
 

From ee0b981c202bf39e9c8bca2b4369776cbe026985 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 May 2010 22:58:27 +0200
Subject: [PATCH 0897/1628] Fix BSD tests. Move BSD bootchecks to i386.rmk in
 hope to enable them one day everywhere

---
 conf/i386-pc.rmk |  4 ----
 conf/i386.rmk    | 12 ++++++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 3f0eeb611..662b398e5 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -235,10 +235,6 @@ bootcheck-linux16-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 BOOTCHECKS += bootcheck-linux16-i386 bootcheck-linux16-x86_64
-# It is defined in i386.rmk but requires ACPI
-BOOTCHECKS += bootcheck-kfreebsd-x86_64
-# It is defined in i386.rmk but crashes early on non-BIOS
-BOOTCHECKS += bootcheck-knetbsd-i386
 
 include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk
diff --git a/conf/i386.rmk b/conf/i386.rmk
index 0b707ca6a..44a5cb185 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -202,10 +202,10 @@ bootcheck-kfreebsd-i386: kfreebsd-mfsroot.i386.gz $(GRUB_PAYLOADS_DIR)/kfreebsd.
 bootcheck-kfreebsd-x86_64: kfreebsd-mfsroot.x86_64.gz $(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/mfsroot.gz=kfreebsd-mfsroot.x86_64.gz --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
-bootcheck-knetbsd-i386: knetbsd.miniroot-image.i386.gz $(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg knetbsd.miniroot-image.i386 grub-shell
+bootcheck-knetbsd-i386: knetbsd.miniroot-image.i386.gz $(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/miniroot.gz=knetbsd.miniroot-image.i386.gz --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
-bootcheck-knetbsd-x86_64: knetbsd.miniroot-image.x86_64.gz $(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/tests/boot/knetbsd.cfg knetbsd.miniroot-image.x86_64 grub-shell
+bootcheck-knetbsd-x86_64: knetbsd.miniroot-image.x86_64.gz $(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/tests/boot/knetbsd.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/miniroot.gz=knetbsd.miniroot-image.x86_64.gz --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 bootcheck-linux-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/tests/boot/linux.cfg grub-shell
@@ -217,9 +217,17 @@ bootcheck-linux-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64
 BOOTCHECKS += bootcheck-linux-i386 bootcheck-linux-x86_64 
 
 ifneq ($(platform), coreboot)
+# Crashes because memory at 0-0x1000 is occupied
 BOOTCHECKS += bootcheck-kfreebsd-i386 bootcheck-knetbsd-x86_64
 endif
 
+ifeq ($(platform), pc)
+# Requires ACPI
+BOOTCHECKS += bootcheck-kfreebsd-x86_64
+# Crashes early on non-BIOS
+BOOTCHECKS += bootcheck-knetbsd-i386
+endif
+
 .PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
 	bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \
 	bootcheck-knetbsd-i386 bootcheck-knetbsd-x86_64

From cfdcef121fa3b4fe6782498a3bf483472bb1a244 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 May 2010 23:00:49 +0200
Subject: [PATCH 0898/1628] Fix efiemu compilation condition

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 810b8e78d..60c989828 100644
--- a/configure.ac
+++ b/configure.ac
@@ -545,7 +545,7 @@ fi
 if test x"$target_cpu" != xi386 ; then
   efiemu_excuse="only available on i386"
 fi
-if test x"$platform" != xefi ; then
+if test x"$platform" = xefi ; then
   efiemu_excuse="not available on efi"
 fi
 if test x"$efiemu_excuse" = x ; then

From 0cb0344d11b73b1e23e858fe344760651e9ea292 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 May 2010 23:02:18 +0200
Subject: [PATCH 0899/1628] Fix overflow and add more dprintfs

---
 lib/relocator.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index 6fbdb71d7..5772ccc7d 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -200,15 +200,21 @@ allocate_inreg (grub_phys_addr_t paddr, grub_size_t size,
 {
   struct grub_mm_header *foll = NULL;
   grub_addr_t vaddr = (grub_addr_t) hb + (paddr - grub_vtop (hb));
+
+  grub_dprintf ("relocator",
+		"inreg paddr = 0x%x, size = %d, hb = %p, hbp = %p, rb = %p, vaddr = 0x%x\n",
+		paddr, size, hb, hbp, rb, vaddr);
     
   if (ALIGN_UP (vaddr + size, GRUB_MM_ALIGN) + GRUB_MM_ALIGN
       <= (grub_addr_t) (hb + hb->size))
     {
       foll = (void *) ALIGN_UP (vaddr + size, GRUB_MM_ALIGN);
       foll->magic = GRUB_MM_FREE_MAGIC;
-      foll->size = hb->size - (foll - hb);
+      foll->size = hb + hb->size - foll;
     }
 
+  grub_dprintf ("relocator", "foll = %p, foll->size = %d\n", foll, foll->size);
+
   if (vaddr - (grub_addr_t) hb >= sizeof (*hb))
     {
       hb->size = ((vaddr - (grub_addr_t) hb) >> GRUB_MM_ALIGN_LOG2);
@@ -431,12 +437,16 @@ malloc_in_range (struct grub_relocator *rel,
       p = r->first;
       do
 	{
+	  if ((grub_addr_t) p < (grub_addr_t) (r + 1)
+	      || (grub_addr_t) p >= (grub_addr_t) (r + 1) + r->size)
+	    grub_fatal ("%d: out of range pointer: %p\n", __LINE__, p);
 	  maxevents += 2;
 	  p = p->next;
 	}
       while (p != r->first);
       maxevents += 4;
     }
+
   if (collisioncheck && rel)
     {
       struct grub_relocator_chunk *chunk;
@@ -617,6 +627,7 @@ malloc_in_range (struct grub_relocator *rel,
     eventt = events;
     events = t;
   }
+
   {
     unsigned i;
     for (i = 0; i < (BITS_IN_BYTE * sizeof (grub_addr_t) / DIGITSORT_BITS);
@@ -1146,6 +1157,7 @@ malloc_in_range (struct grub_relocator *rel,
   res->size = size;
   grub_dprintf ("relocator", "allocated: 0x%lx+0x%lx\n", (unsigned long) target,
 		(unsigned long) size);
+
   return 1;
 }
 
@@ -1190,7 +1202,6 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel,
 	|| (target <= chunk->target && chunk->target < target + size))
       return grub_error (GRUB_ERR_BAD_ARGUMENT, "overlap detected");
 
-
   chunk = grub_malloc (sizeof (struct grub_relocator_chunk));
   if (!chunk)
     return grub_errno;

From bcfd0cf0facdcd1d713f3ff673662fc75426b479 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 3 May 2010 23:14:23 +0200
Subject: [PATCH 0900/1628] Pause before returning to menu editor

---
 normal/menu_entry.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/normal/menu_entry.c b/normal/menu_entry.c
index 20d602597..433208116 100644
--- a/normal/menu_entry.c
+++ b/normal/menu_entry.c
@@ -1370,8 +1370,13 @@ grub_menu_entry_run (grub_menu_entry_t entry)
 	  goto refresh;
 
 	case 24: /* C-x */
-	  if (! run (screen))
-	    goto fail;
+	  {
+	    int chars_before = grub_normal_get_char_counter ();
+	    run (screen);
+
+	    if (chars_before != grub_normal_get_char_counter ())
+	      grub_wait_after_message ();
+	  }
 	  goto refresh;
 
 	case 18: /* C-r */

From 04d050152fc2069b1a57208e6510af555c7fe732 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 4 May 2010 00:05:23 +0200
Subject: [PATCH 0901/1628] Move geode init to bus/cs5536.c

---
 bus/cs5536.c              | 167 ++++++++++++++++++++++++++++++++++++
 include/grub/cs5536.h     |   2 +
 kern/mips/yeeloong/init.c | 174 +-------------------------------------
 3 files changed, 170 insertions(+), 173 deletions(-)

diff --git a/bus/cs5536.c b/bus/cs5536.c
index f481397b7..088f4dfc1 100644
--- a/bus/cs5536.c
+++ b/bus/cs5536.c
@@ -20,6 +20,7 @@
 #include <grub/cs5536.h>
 #include <grub/pci.h>
 #include <grub/time.h>
+#include <grub/ata.h>
 
 int
 grub_cs5536_find (grub_pci_device_t *devp)
@@ -211,3 +212,169 @@ grub_cs5536_read_spd (grub_port_t smbbase, grub_uint8_t dev,
     }
   return GRUB_ERR_NONE;
 }
+
+/* Dump of GPIO connections. FIXME: Remove useless and macroify.  */
+static grub_uint32_t gpiodump[] = {
+  0xffff0000, 0x2ffdd002, 0xffff0000, 0xffff0000,
+  0x2fffd000, 0xffff0000, 0x1000efff, 0xefff1000,
+  0x3ffbc004, 0xffff0000, 0xffff0000, 0xffff0000,
+  0x3ffbc004, 0x3ffbc004, 0xffff0000, 0x00000000,
+  0xffff0000, 0xffff0000, 0x3ffbc004, 0x3f9bc064,
+  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000,
+  0xffff0000, 0xffff0000, 0x0000ffff, 0xffff0000,
+  0xefff1000, 0xffff0000, 0xffff0000, 0xffff0000,
+  0xefff1000, 0xefff1000, 0xffff0000, 0x00000000,
+  0xffff0000, 0xffff0000, 0xefff1000, 0xffff0000,
+  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  0x00000000, 0x50000000, 0x00000000, 0x00000000,
+};
+
+static inline void
+set_io_space (grub_pci_device_t dev, int num, grub_uint16_t start,
+	      grub_uint16_t len)
+{
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_REGIONS_START + num,
+			 ((((grub_uint64_t) start + len - 4)
+			   << GRUB_CS5536_MSR_GL_REGION_IO_TOP_SHIFT)
+			  & GRUB_CS5536_MSR_GL_REGION_TOP_MASK)
+			 | (((grub_uint64_t) start
+			     << GRUB_CS5536_MSR_GL_REGION_IO_BASE_SHIFT)
+			  & GRUB_CS5536_MSR_GL_REGION_BASE_MASK)
+			 | GRUB_CS5536_MSR_GL_REGION_IO
+			 | GRUB_CS5536_MSR_GL_REGION_ENABLE);
+}
+
+static inline void
+set_iod (grub_pci_device_t dev, int num, int dest, int start, int mask)
+{
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_IOD_START + num,
+			 ((grub_uint64_t) dest << GRUB_CS5536_IOD_DEST_SHIFT)
+			 | (((grub_uint64_t) start & GRUB_CS5536_IOD_ADDR_MASK)
+			    << GRUB_CS5536_IOD_BASE_SHIFT)
+			 | ((mask & GRUB_CS5536_IOD_ADDR_MASK)
+			    << GRUB_CS5536_IOD_MASK_SHIFT));
+}
+
+static inline void
+set_p2d (grub_pci_device_t dev, int num, int dest, grub_uint32_t start)
+{
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_P2D_START + num,
+			 (((grub_uint64_t) dest) << GRUB_CS5536_P2D_DEST_SHIFT)
+			 | ((grub_uint64_t) (start >> GRUB_CS5536_P2D_LOG_ALIGN)
+			    << GRUB_CS5536_P2D_BASE_SHIFT)
+			 | (((1 << (32 - GRUB_CS5536_P2D_LOG_ALIGN)) - 1)
+			    << GRUB_CS5536_P2D_MASK_SHIFT));
+}
+
+void
+grub_cs5536_init_geode (grub_pci_device_t dev)
+{
+  int i;
+
+  /* Make sure GPIO is where we expect it to be.  */
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GPIO_BAR,
+			 GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_GPIO);
+
+  /* Setup GPIO.  */
+  for (i = 0; i < (int) ARRAY_SIZE (gpiodump); i++)
+    ((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_IO_BASE 
+				 + GRUB_CS5536_LBAR_GPIO)) [i] = gpiodump[i];
+
+  /* Enable more BARs.  */
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IRQ_MAP_BAR,
+			 GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_IRQ_MAP);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_MFGPT_BAR,
+			 GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_MFGPT);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_ACPI_BAR,
+			 GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_ACPI);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_PM_BAR,
+			 GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_PM);
+
+  /* Setup DIVIL.  */
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_LEG_IO,
+			 GRUB_CS5536_MSR_DIVIL_LEG_IO_MODE_X86
+			 | GRUB_CS5536_MSR_DIVIL_LEG_IO_F_REMAP
+			 | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE0
+			 | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_PRIMARY_MASK,
+			 (~GRUB_CS5536_DIVIL_LPC_INTERRUPTS) & 0xffff);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_LPC_MASK,
+			 GRUB_CS5536_DIVIL_LPC_INTERRUPTS);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_LPC_SERIAL_IRQ_CONTROL,
+			 GRUB_CS5536_MSR_DIVIL_LPC_SERIAL_IRQ_CONTROL_ENABLE);
+
+  /* Initialise USB controller.  */
+  /* FIXME: assign adresses dynamically.  */
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_OHCI_BASE, 
+			 GRUB_CS5536_MSR_USB_BASE_BUS_MASTER
+			 | GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
+			 | 0x05024000);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_EHCI_BASE,
+			 GRUB_CS5536_MSR_USB_BASE_BUS_MASTER
+			 | GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
+			 | (0x20ULL << GRUB_CS5536_MSR_USB_EHCI_BASE_FLDJ_SHIFT)
+			 | 0x05023000);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_CONTROLLER_BASE,
+			 GRUB_CS5536_MSR_USB_BASE_BUS_MASTER
+			 | GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE | 0x05020000);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_OPTION_CONTROLLER_BASE,
+			 GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE | 0x05022000);
+  set_p2d (dev, 0, GRUB_CS5536_DESTINATION_USB, 0x05020000);
+  set_p2d (dev, 1, GRUB_CS5536_DESTINATION_USB, 0x05022000);
+  set_p2d (dev, 5, GRUB_CS5536_DESTINATION_USB, 0x05024000);
+  set_p2d (dev, 6, GRUB_CS5536_DESTINATION_USB, 0x05023000);
+
+  {
+    volatile grub_uint32_t *oc;
+    oc = grub_pci_device_map_range (dev, 0x05022000,
+				    GRUB_CS5536_USB_OPTION_REGS_SIZE);
+
+    oc[GRUB_CS5536_USB_OPTION_REG_UOCMUX] =
+      (oc[GRUB_CS5536_USB_OPTION_REG_UOCMUX]
+       & ~GRUB_CS5536_USB_OPTION_REG_UOCMUX_PMUX_MASK)
+      | GRUB_CS5536_USB_OPTION_REG_UOCMUX_PMUX_HC;
+    grub_pci_device_unmap_range (dev, oc, GRUB_CS5536_USB_OPTION_REGS_SIZE);
+  }
+
+  /* Setup IDE controller.  */
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_IO_BAR,
+			 GRUB_CS5536_LBAR_IDE
+			 | GRUB_CS5536_MSR_IDE_IO_BAR_UNITS);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_CFG,
+			 GRUB_CS5536_MSR_IDE_CFG_CHANNEL_ENABLE);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_TIMING,
+			 (GRUB_CS5536_MSR_IDE_TIMING_PIO0
+			  << GRUB_CS5536_MSR_IDE_TIMING_DRIVE0_SHIFT)
+			 | (GRUB_CS5536_MSR_IDE_TIMING_PIO0
+			    << GRUB_CS5536_MSR_IDE_TIMING_DRIVE1_SHIFT));
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_CAS_TIMING,
+			 (GRUB_CS5536_MSR_IDE_CAS_TIMING_CMD_PIO0
+			  << GRUB_CS5536_MSR_IDE_CAS_TIMING_CMD_SHIFT)
+			 | (GRUB_CS5536_MSR_IDE_CAS_TIMING_PIO0
+			    << GRUB_CS5536_MSR_IDE_CAS_TIMING_DRIVE0_SHIFT)
+			 | (GRUB_CS5536_MSR_IDE_CAS_TIMING_PIO0
+			    << GRUB_CS5536_MSR_IDE_CAS_TIMING_DRIVE1_SHIFT));
+
+  /* Setup Geodelink PCI.  */
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_PCI_CTRL,
+			 (4ULL << GRUB_CS5536_MSR_GL_PCI_CTRL_OUT_THR_SHIFT)
+			 | (4ULL << GRUB_CS5536_MSR_GL_PCI_CTRL_IN_THR_SHIFT)
+			 | (8ULL << GRUB_CS5536_MSR_GL_PCI_CTRL_LATENCY_SHIFT)
+			 | GRUB_CS5536_MSR_GL_PCI_CTRL_IO_ENABLE
+			 | GRUB_CS5536_MSR_GL_PCI_CTRL_MEMORY_ENABLE);
+
+  /* Setup windows.  */
+  set_io_space (dev, 0, GRUB_CS5536_LBAR_SMBUS, GRUB_CS5536_SMBUS_REGS_SIZE);
+  set_io_space (dev, 1, GRUB_CS5536_LBAR_GPIO, GRUB_CS5536_GPIO_REGS_SIZE);
+  set_io_space (dev, 2, GRUB_CS5536_LBAR_MFGPT, GRUB_CS5536_MFGPT_REGS_SIZE);
+  set_io_space (dev, 3, GRUB_CS5536_LBAR_IRQ_MAP, GRUB_CS5536_IRQ_MAP_REGS_SIZE);
+  set_io_space (dev, 4, GRUB_CS5536_LBAR_PM, GRUB_CS5536_PM_REGS_SIZE);
+  set_io_space (dev, 5, GRUB_CS5536_LBAR_ACPI, GRUB_CS5536_ACPI_REGS_SIZE);
+  set_iod (dev, 0, GRUB_CS5536_DESTINATION_IDE, GRUB_ATA_CH0_PORT1, 0xffff8);
+  set_iod (dev, 1, GRUB_CS5536_DESTINATION_ACC, GRUB_CS5536_LBAR_ACC, 0xfff80);
+  set_iod (dev, 2, GRUB_CS5536_DESTINATION_IDE, GRUB_CS5536_LBAR_IDE, 0xffff0);
+}
diff --git a/include/grub/cs5536.h b/include/grub/cs5536.h
index a16fb7a09..cd17e11fc 100644
--- a/include/grub/cs5536.h
+++ b/include/grub/cs5536.h
@@ -183,6 +183,8 @@ grub_err_t grub_cs5536_smbus_wait (grub_port_t smbbase);
 grub_err_t EXPORT_FUNC (grub_cs5536_init_smbus) (grub_pci_device_t dev,
 						 grub_uint16_t divisor,
 						 grub_port_t *smbbase);
+
+void grub_cs5536_init_geode (grub_pci_device_t dev);
 #endif
 
 #endif
diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 5c3340f39..fa02df601 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -31,7 +31,6 @@
 #include <grub/cs5536.h>
 #include <grub/term.h>
 #include <grub/machine/ec.h>
-#include <grub/ata.h>
 
 extern void grub_video_sm712_init (void);
 extern void grub_video_init (void);
@@ -68,63 +67,6 @@ grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
   return GRUB_ERR_NONE;
 }
 
-/* Dump of GPIO connections. FIXME: Remove useless and macroify.  */
-static grub_uint32_t gpiodump[] = {
-  0xffff0000, 0x2ffdd002, 0xffff0000, 0xffff0000,
-  0x2fffd000, 0xffff0000, 0x1000efff, 0xefff1000,
-  0x3ffbc004, 0xffff0000, 0xffff0000, 0xffff0000,
-  0x3ffbc004, 0x3ffbc004, 0xffff0000, 0x00000000,
-  0xffff0000, 0xffff0000, 0x3ffbc004, 0x3f9bc064,
-  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000,
-  0xffff0000, 0xffff0000, 0x0000ffff, 0xffff0000,
-  0xefff1000, 0xffff0000, 0xffff0000, 0xffff0000,
-  0xefff1000, 0xefff1000, 0xffff0000, 0x00000000,
-  0xffff0000, 0xffff0000, 0xefff1000, 0xffff0000,
-  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0x00000000, 0x50000000, 0x00000000, 0x00000000,
-};
-
-static inline void
-set_io_space (grub_pci_device_t dev, int num, grub_uint16_t start,
-	      grub_uint16_t len)
-{
-  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_REGIONS_START + num,
-			 ((((grub_uint64_t) start + len - 4)
-			   << GRUB_CS5536_MSR_GL_REGION_IO_TOP_SHIFT)
-			  & GRUB_CS5536_MSR_GL_REGION_TOP_MASK)
-			 | (((grub_uint64_t) start
-			     << GRUB_CS5536_MSR_GL_REGION_IO_BASE_SHIFT)
-			  & GRUB_CS5536_MSR_GL_REGION_BASE_MASK)
-			 | GRUB_CS5536_MSR_GL_REGION_IO
-			 | GRUB_CS5536_MSR_GL_REGION_ENABLE);
-}
-
-static inline void
-set_iod (grub_pci_device_t dev, int num, int dest, int start, int mask)
-{
-  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_IOD_START + num,
-			 ((grub_uint64_t) dest << GRUB_CS5536_IOD_DEST_SHIFT)
-			 | (((grub_uint64_t) start & GRUB_CS5536_IOD_ADDR_MASK)
-			    << GRUB_CS5536_IOD_BASE_SHIFT)
-			 | ((mask & GRUB_CS5536_IOD_ADDR_MASK)
-			    << GRUB_CS5536_IOD_MASK_SHIFT));
-}
-
-static inline void
-set_p2d (grub_pci_device_t dev, int num, int dest, grub_uint32_t start)
-{
-  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_P2D_START + num,
-			 (((grub_uint64_t) dest) << GRUB_CS5536_P2D_DEST_SHIFT)
-			 | ((grub_uint64_t) (start >> GRUB_CS5536_P2D_LOG_ALIGN)
-			    << GRUB_CS5536_P2D_BASE_SHIFT)
-			 | (((1 << (32 - GRUB_CS5536_P2D_LOG_ALIGN)) - 1)
-			    << GRUB_CS5536_P2D_MASK_SHIFT));
-}
-
 void
 grub_machine_init (void)
 {
@@ -180,121 +122,7 @@ grub_machine_init (void)
 	  grub_arch_highmemsize = 0;
 	}
 
-      /* Make sure GPIO is where we expect it to be.  */
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GPIO_BAR,
-			     GRUB_CS5536_LBAR_TURN_ON 
-			     | GRUB_CS5536_LBAR_GPIO);
-
-      /* Setup GPIO.  */
-      for (i = 0; i < (int) ARRAY_SIZE (gpiodump); i++)
-	((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_IO_BASE 
-				     + GRUB_CS5536_LBAR_GPIO)) [i]
-	  = gpiodump[i];
-
-      /* Enable more BARs.  */
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IRQ_MAP_BAR,
-			     GRUB_CS5536_LBAR_TURN_ON 
-			     | GRUB_CS5536_LBAR_IRQ_MAP);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_MFGPT_BAR,
-			     GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_MFGPT);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_ACPI_BAR,
-			     GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_ACPI);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_PM_BAR,
-			     GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_PM);
-
-      /* Setup DIVIL.  */
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_LEG_IO,
-			     GRUB_CS5536_MSR_DIVIL_LEG_IO_MODE_X86
-			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_F_REMAP
-			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE0
-			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_PRIMARY_MASK,
-			     (~GRUB_CS5536_DIVIL_LPC_INTERRUPTS) & 0xffff);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_LPC_MASK,
-			     GRUB_CS5536_DIVIL_LPC_INTERRUPTS);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_LPC_SERIAL_IRQ_CONTROL,
-			     GRUB_CS5536_MSR_DIVIL_LPC_SERIAL_IRQ_CONTROL_ENABLE);
-
-      /* Initialise USB controller.  */
-      /* FIXME: assign adresses dynamically.  */
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_OHCI_BASE, 
-			     GRUB_CS5536_MSR_USB_BASE_BUS_MASTER
-			     | GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
-			     | 0x05024000);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_EHCI_BASE,
-			     GRUB_CS5536_MSR_USB_BASE_BUS_MASTER
-			     | GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
-			     | (0x20ULL 
-				<< GRUB_CS5536_MSR_USB_EHCI_BASE_FLDJ_SHIFT)
-			     | 0x05023000);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_CONTROLLER_BASE,
-			     GRUB_CS5536_MSR_USB_BASE_BUS_MASTER
-			     | GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
-			     | 0x05020000);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_OPTION_CONTROLLER_BASE,
-			     GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
-			     | 0x05022000);
-      set_p2d (dev, 0, GRUB_CS5536_DESTINATION_USB, 0x05020000);
-      set_p2d (dev, 1, GRUB_CS5536_DESTINATION_USB, 0x05022000);
-      set_p2d (dev, 5, GRUB_CS5536_DESTINATION_USB, 0x05024000);
-      set_p2d (dev, 6, GRUB_CS5536_DESTINATION_USB, 0x05023000);
-
-      {
-	volatile grub_uint32_t *oc;
-	oc = grub_pci_device_map_range (dev, 0x05022000,
-					GRUB_CS5536_USB_OPTION_REGS_SIZE);
-
-	oc[GRUB_CS5536_USB_OPTION_REG_UOCMUX] =
-	  (oc[GRUB_CS5536_USB_OPTION_REG_UOCMUX]
-	   & ~GRUB_CS5536_USB_OPTION_REG_UOCMUX_PMUX_MASK)
-	  | GRUB_CS5536_USB_OPTION_REG_UOCMUX_PMUX_HC;
-	grub_pci_device_unmap_range (dev, oc, GRUB_CS5536_USB_OPTION_REGS_SIZE);
-      }
-
-
-      /* Setup IDE controller.  */
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_IO_BAR,
-			     GRUB_CS5536_LBAR_IDE
-			     | GRUB_CS5536_MSR_IDE_IO_BAR_UNITS);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_CFG,
-			     GRUB_CS5536_MSR_IDE_CFG_CHANNEL_ENABLE);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_TIMING,
-			     (GRUB_CS5536_MSR_IDE_TIMING_PIO0
-			      << GRUB_CS5536_MSR_IDE_TIMING_DRIVE0_SHIFT)
-			     | (GRUB_CS5536_MSR_IDE_TIMING_PIO0
-				<< GRUB_CS5536_MSR_IDE_TIMING_DRIVE1_SHIFT));
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_CAS_TIMING,
-			     (GRUB_CS5536_MSR_IDE_CAS_TIMING_CMD_PIO0
-			      << GRUB_CS5536_MSR_IDE_CAS_TIMING_CMD_SHIFT)
-			     | (GRUB_CS5536_MSR_IDE_CAS_TIMING_PIO0
-				<< GRUB_CS5536_MSR_IDE_CAS_TIMING_DRIVE0_SHIFT)
-			     | (GRUB_CS5536_MSR_IDE_CAS_TIMING_PIO0
-				<< GRUB_CS5536_MSR_IDE_CAS_TIMING_DRIVE1_SHIFT));
-
-      /* Setup Geodelink PCI.  */
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_PCI_CTRL,
-			     (4ULL << GRUB_CS5536_MSR_GL_PCI_CTRL_OUT_THR_SHIFT)
-			     | (4ULL << GRUB_CS5536_MSR_GL_PCI_CTRL_IN_THR_SHIFT)
-			     | (8ULL << GRUB_CS5536_MSR_GL_PCI_CTRL_LATENCY_SHIFT)
-			     | GRUB_CS5536_MSR_GL_PCI_CTRL_IO_ENABLE
-			     | GRUB_CS5536_MSR_GL_PCI_CTRL_MEMORY_ENABLE);
-
-      /* Setup windows.  */
-      set_io_space (dev, 0, GRUB_CS5536_LBAR_SMBUS,
-		    GRUB_CS5536_SMBUS_REGS_SIZE);
-      set_io_space (dev, 1, GRUB_CS5536_LBAR_GPIO, GRUB_CS5536_GPIO_REGS_SIZE);
-      set_io_space (dev, 2, GRUB_CS5536_LBAR_MFGPT,
-		    GRUB_CS5536_MFGPT_REGS_SIZE);
-      set_io_space (dev, 3, GRUB_CS5536_LBAR_IRQ_MAP,
-		    GRUB_CS5536_IRQ_MAP_REGS_SIZE);
-      set_io_space (dev, 4, GRUB_CS5536_LBAR_PM, GRUB_CS5536_PM_REGS_SIZE);
-      set_io_space (dev, 5, GRUB_CS5536_LBAR_ACPI, GRUB_CS5536_ACPI_REGS_SIZE);
-      set_iod (dev, 0, GRUB_CS5536_DESTINATION_IDE, GRUB_ATA_CH0_PORT1,
-	       0xffff8);
-      set_iod (dev, 1, GRUB_CS5536_DESTINATION_ACC, GRUB_CS5536_LBAR_ACC,
-	       0xfff80);
-      set_iod (dev, 2, GRUB_CS5536_DESTINATION_IDE, GRUB_CS5536_LBAR_IDE,
-	       0xffff0);
+      grub_cs5536_init_geode (dev);
 
       /* Setup PCI controller.  */
       *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER

From 725396942e6929567f786234f0a95e7390d45f19 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 4 May 2010 09:47:48 +0530
Subject: [PATCH 0902/1628] replace --enable-grub-emu-modules with
 grub-emu-lite

---
 Makefile.in             | 14 ++-------
 commands/parttool.c     |  3 +-
 conf/any-emu.rmk        | 38 ++++++++++++-------------
 configure.ac            | 63 ++++++++++++++---------------------------
 genmk.rb                |  8 ------
 include/grub/dl.h       | 11 ++-----
 include/grub/emu/misc.h |  1 +
 include/grub/misc.h     |  3 ++
 kern/emu/main.c         | 36 ++---------------------
 kern/main.c             |  2 ++
 normal/main.c           | 11 ++++---
 util/misc.c             |  4 +--
 12 files changed, 63 insertions(+), 131 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 822a08797..513deb516 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,7 +44,6 @@ pkglibdir =  $(libdir)/`echo @PACKAGE_TARNAME@/$(target_cpu)-$(platform) | sed '
 
 # Internationalization library.
 LIBINTL = @LIBINTL@
-TARGET_NO_MODULES = @TARGET_NO_MODULES@
 
 # Util library.
 LIBUTIL = @LIBUTIL@
@@ -187,17 +186,10 @@ include $(srcdir)/conf/tests.mk
 -include $(wildcard $(GRUB_CONTRIB)/*/conf/common.mk)
 endif
 
-ifeq ($(TARGET_NO_MODULES), yes)
-	TARGET_CFLAGS += -DGRUB_TARGET_NO_MODULES=1
-	CFLAGS += -DGRUB_TARGET_NO_MODULES=1
-endif
-
 ### General targets.
 
 CLEANFILES += $(pkglib_DATA) $(pkgdata_DATA) po/*.mo
-ifneq ($(TARGET_NO_MODULES), yes)
 pkglib_DATA += moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst
-endif
 moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep.awk
 	cat $(DEFSYMFILES) /dev/null \
 	  | $(AWK) -f $(srcdir)/genmoddep.awk $(UNDSYMFILES) > $@ \
@@ -298,7 +290,7 @@ build_env.mk: Makefile
 	) > $@
 pkglib_BUILDDIR += config.h grub_script.tab.h
 
-all-local: $(PROGRAMS) $(GRUB_EMU) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(INFOS) $(MKFILES) $(foreach lang, $(LINGUAS), po/$(lang).mo)
+all-local: $(PROGRAMS) $(GRUB_EMU) $(GRUB_EMU_LITE) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(INFOS) $(MKFILES) $(foreach lang, $(LINGUAS), po/$(lang).mo)
 
 install: install-local
 
@@ -319,7 +311,7 @@ install-local: all
 	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkgdatadir)/$$dest; \
 	done
 	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
-	@list='$(bin_UTILITIES) $(GRUB_EMU)'; for file in $$list; do \
+	@list='$(bin_UTILITIES) $(GRUB_EMU) $(GRUB_EMU_LITE)'; for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
@@ -395,7 +387,7 @@ uninstall:
 	  dest="`echo $$file | sed 's,.*/,,'`"; \
 	  rm -f $(DESTDIR)$(pkgdatadir)/$$dest; \
 	done
-	@list='$(bin_UTILITIES) $(bin_SCRIPTS) $(GRUB_EMU)'; for file in $$list; do \
+	@list='$(bin_UTILITIES) $(bin_SCRIPTS) $(GRUB_EMU) $(GRUB_EMU_LITE)'; for file in $$list; do \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  rm -f $(DESTDIR)$(bindir)/$$dest; \
 	  rm -f $(DESTDIR)$(mandir)/man1/$$dest.1; \
diff --git a/commands/parttool.c b/commands/parttool.c
index 528cf43d7..f2a62e581 100644
--- a/commands/parttool.c
+++ b/commands/parttool.c
@@ -175,7 +175,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
     }
 
   /* Load modules. */
-#if !GRUB_NO_MODULES
+  if (! grub_no_autoload)
   {
     const char *prefix;
     prefix = grub_env_get ("prefix");
@@ -233,7 +233,6 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
     /* Ignore errors.  */
     grub_errno = GRUB_ERR_NONE;
   }
-#endif
 
   if (argc == 1)
     return show_help ();
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index cb0ec873f..4e940181b 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -20,16 +20,13 @@ kernel_img_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-undef -I$(srcdir)/g
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 TARGET_NO_STRIP = yes
 
-ifneq ($(TARGET_NO_MODULES), yes)
-kernel_img_SOURCES += symlist.c kern/$(target_cpu)/dl.c
-ifneq ($(target_cpu), i386)
-ifneq ($(target_cpu), x86_64)
-kernel_img_SOURCES += kern/$(target_cpu)/cache.S
-endif
-endif
-else
-kernel_img_SOURCES += grub_emu_init.c
-endif
+noinst_MODULES = emu-full.mod
+emu_full_mod_SOURCES = kern/emu/full.c
+emu_full_mod_CFLAGS = $(COMMON_CFLAGS)
+
+noinst_MODULES = emu-lite.mod
+emu_lite_mod_SOURCES = kern/emu/lite.c kern/emu/cache.S symlist.c
+emu_lite_mod_CFLAGS = $(COMMON_CFLAGS)
 
 # For halt.mod.
 pkglib_MODULES += halt.mod
@@ -102,13 +99,16 @@ grub_emu_init.c: genemuinit.sh $(pkglib_MODULES) grub_emu_init.h
 	rm -f $@; echo $(pkglib_MODULES) | sh $(srcdir)/genemuinit.sh $(NM) > $@
 DISTCLEANFILES += grub_emu_init.c
 
-CLEANFILES += grub-emu
-ifneq ($(TARGET_NO_MODULES), yes)
-grub-emu: $(pkglib_PROGRAMS)
-	$(CC) -o $@ $^ $(grub_emu_LDFLAGS) $(LDFLAGS)
-else
-grub-emu: $(pkglib_MODULES) $(pkglib_PROGRAMS)
-	$(CC) -o $@ $^ $(grub_emu_LDFLAGS) $(LDFLAGS)
-endif
-GRUB_EMU=grub-emu
+grub_emu_init.o: grub_emu_init.c grub_emu_init.h
+	rm -f $@; $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -DGRUB_FILE=\"grub_init.c\" -c -o $@ $<
+CLEANFILES += grub_emu_init.o
 
+CLEANFILES += grub-emu-lite
+grub-emu-lite: $(pkglib_PROGRAMS) emu-lite.mod
+	$(CC) -o $@ $^ $(grub_emu_LDFLAGS) $(LDFLAGS)
+GRUB_EMU_LITE=grub-emu-lite
+
+CLEANFILES += grub-emu
+grub-emu: $(pkglib_MODULES) $(pkglib_PROGRAMS) emu-full.mod grub_emu_init.o
+	$(CC) -o $@ $^ $(grub_emu_LDFLAGS) $(LDFLAGS)
+GRUB_EMU=grub-emu
diff --git a/configure.ac b/configure.ac
index 4e1dd41d8..9462b32a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,14 +54,12 @@ case "$target_cpu" in
   amd64)	target_cpu=x86_64 ;;
   sparc)	target_cpu=sparc64 ;;
   mipsel|mips64el)
-                target_cpu=mips;    
-		TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPSEL=1"; 
-		CFLAGS="$CFLAGS -DGRUB_CPU_MIPSEL=1";
+                target_cpu=mips;
+		cpu_CPPFLAGS="-DGRUB_CPU_MIPSEL=1";
 		;;
   mips|mips64)
-                target_cpu=mips;    
-		TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPS=1"; 
-		CFLAGS="$CFLAGS -DGRUB_CPU_MIPS=1";
+                target_cpu=mips;
+		cpu_CPPFLAGS="-DGRUB_CPU_MIPS=1";
 		;;
 esac
 
@@ -136,24 +134,27 @@ case "$host_os" in
 esac
 
 case "$platform" in
-  coreboot)	machine_CFLAGS="-DGRUB_MACHINE_COREBOOT=1" ;;
-  multiboot)	machine_CFLAGS="-DGRUB_MACHINE_MULTIBOOT=1" ;;
-  efi)		machine_CFLAGS="-DGRUB_MACHINE_EFI=1" ;;
-  ieee1275)	machine_CFLAGS="-DGRUB_MACHINE_IEEE1275=1" ;;
-  qemu)		machine_CFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
-  pc)		machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
-  emu)		machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
-  yeeloong)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
-  qemu-mips)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  coreboot)	machine_CPPFLAGS="-DGRUB_MACHINE_COREBOOT=1" ;;
+  multiboot)	machine_CPPFLAGS="-DGRUB_MACHINE_MULTIBOOT=1" ;;
+  efi)		machine_CPPFLAGS="-DGRUB_MACHINE_EFI=1" ;;
+  ieee1275)	machine_CPPFLAGS="-DGRUB_MACHINE_IEEE1275=1" ;;
+  qemu)		machine_CPPFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
+  pc)		machine_CPPFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
+  emu)		machine_CPPFLAGS="-DGRUB_MACHINE_EMU=1" ;;
+  yeeloong)	machine_CPPFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  qemu-mips)	machine_CPPFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
 esac
 case "$target_cpu" in
-  mips)      	machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_MIPS=1" ;;
-  sparc64)      machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
+  i386)         cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_I386";;
+  x86_64)       cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_X86_64";;
+  powerpc)      cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_POWERPC";;
+  mips)      	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS=1" ;; # cpu_CPPFLAGS handled above
+  sparc64)      cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_SPARC64";
+                machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
 esac
 
-CFLAGS="$CFLAGS $machine_CFLAGS"
-TARGET_ASFLAGS="$TARGET_ASFLAGS $machine_CFLAGS"
-TARGET_CFLAGS="$TARGET_CFLAGS $machine_CFLAGS"
+CPPFLAGS="$CPPFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
+TARGET_CFLAGS="$TARGET_CFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
 
 AC_SUBST(host_cpu)
 AC_SUBST(host_os)
@@ -608,10 +609,6 @@ AC_ARG_ENABLE([grub-emu-pci],
 	      [AS_HELP_STRING([--enable-grub-emu-pci],
                              [build and install the `grub-emu' debugging utility with PCI support (potentially dangerous) (default=no)])])
 
-AC_ARG_ENABLE([grub-emu-modules],
-	      [AS_HELP_STRING([--enable-grub-emu-modules],
-                             [Support module loading in `grub-emu' debugging utility (default=no)])])
-
 if test "$platform" = emu; then
   missing_ncurses=
 [# Check for curses libraries.]
@@ -630,19 +627,6 @@ if test x"$missing_ncurses" = xtrue ; then
   AC_MSG_ERROR([grub-emu can't be compiled without ncurses])
 fi
 
-if test x"$enable_grub_emu_modules" = xyes ; then
-  TARGET_NO_MODULES=no
-else
-  TARGET_NO_MODULES=yes
-fi
-AC_SUBST(TARGET_NO_MODULES)
-
-if test "$TARGET_NO_MODULES" = yes ; then
-  # Do not convert modules, otherwise linkage may fail (Cygwin only).
-  # FIXME: Should be checked above before TARGET_OBJ2ELF is set first.
-  TARGET_OBJ2ELF=
-fi
-
 if test x"$enable_grub_emu_usb" = xno ; then
   grub_emu_usb_excuse="explicitly disabled"
 fi
@@ -820,11 +804,6 @@ echo PCI support for grub-emu: Yes
 else
 echo PCI support for grub-emu: No "($grub_emu_pci_excuse)"
 fi
-if [ x"$TARGET_NO_MODULES" = xno ]; then
-echo Module support for grub-emu: Yes
-else
-echo Module support for grub-emu: No
-fi
 fi
 if [ x"$enable_mm_debug" = xyes ]; then
 echo With memory debugging: Yes
diff --git a/genmk.rb b/genmk.rb
index e62dbd4f6..6b5ecd1d4 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -143,13 +143,6 @@ mostlyclean-module-#{@name}.#{@rule_count}:
 MOSTLYCLEAN_MODULE_TARGETS += mostlyclean-module-#{@name}.#{@rule_count}
 UNDSYMFILES += #{undsym}
 
-ifeq ($(TARGET_NO_MODULES), yes)
-#{@name}: #{pre_obj} $(TARGET_OBJ2ELF)
-	-rm -f $@
-	$(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ #{pre_obj}
-	if test ! -z \"$(TARGET_OBJ2ELF)\"; then ./$(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi
-	if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K _grub_mod_init -K _grub_mod_fini -R .note -R .comment $@; fi
-else
 ifneq ($(TARGET_APPLE_CC),1)
 #{@name}: #{pre_obj} #{mod_obj} $(TARGET_OBJ2ELF)
 	-rm -f $@
@@ -164,7 +157,6 @@ else
 	$(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -ew2030 -ew2050 -nu -nd $@.bin $@
 	-rm -f $@.bin
 endif
-endif
 
 #{pre_obj}: $(#{prefix}_DEPENDENCIES) #{objs_str}
 	-rm -f $@
diff --git a/include/grub/dl.h b/include/grub/dl.h
index cf5da7fd5..fde2e3163 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -91,22 +91,17 @@ grub_dl_t grub_dl_load_core (void *addr, grub_size_t size);
 int EXPORT_FUNC(grub_dl_unload) (grub_dl_t mod);
 void grub_dl_unload_unneeded (void);
 void grub_dl_unload_all (void);
-#if defined (GRUB_UTIL) || defined (GRUB_TARGET_NO_MODULES)
-#define GRUB_NO_MODULES 1
-#else
-#define GRUB_NO_MODULES 0
-#endif
 int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);
 int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);
 void EXPORT_FUNC(grub_dl_iterate) (int (*hook) (grub_dl_t mod));
 grub_dl_t EXPORT_FUNC(grub_dl_get) (const char *name);
-grub_err_t grub_dl_register_symbol (const char *name, void *addr,
-				    grub_dl_t mod);
+grub_err_t EXPORT_FUNC(grub_dl_register_symbol) (const char *name, void *addr,
+						 grub_dl_t mod);
 
 grub_err_t grub_arch_dl_check_header (void *ehdr);
 grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
 
-#if defined (_mips) && ! GRUB_NO_MODULES
+#if defined (_mips) && ! GRUB_MACHINE_EMU
 #define GRUB_LINKER_HAVE_INIT 1
 void grub_arch_dl_init_linker (void);
 #endif
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index 146e64aa9..6d7fd8820 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -16,6 +16,7 @@
 extern int verbosity;
 extern const char *program_name;
 
+void grub_emu_init (void);
 void grub_init_all (void);
 void grub_fini_all (void);
 
diff --git a/include/grub/misc.h b/include/grub/misc.h
index 9bfc6974e..1ec8bbc5a 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -50,6 +50,9 @@
 /* XXX: If grub_memmove is too slow, we must implement grub_memcpy.  */
 #define grub_memcpy(d,s,n)	grub_memmove ((d), (s), (n))
 
+/* Flag to control module autoloading in normal mode.  */
+extern int EXPORT_VAR(grub_no_autoload);
+
 void *EXPORT_FUNC(grub_memmove) (void *dest, const void *src, grub_size_t n);
 char *EXPORT_FUNC(grub_strcpy) (char *dest, const char *src);
 char *EXPORT_FUNC(grub_strncpy) (char *dest, const char *src, int c);
diff --git a/kern/emu/main.c b/kern/emu/main.c
index fb5dbf19f..8d6118c93 100644
--- a/kern/emu/main.c
+++ b/kern/emu/main.c
@@ -57,25 +57,6 @@ grub_arch_modules_addr (void)
   return 0;
 }
 
-#if GRUB_NO_MODULES
-grub_err_t
-grub_arch_dl_check_header (void *ehdr)
-{
-  (void) ehdr;
-
-  return GRUB_ERR_BAD_MODULE;
-}
-
-grub_err_t
-grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
-{
-  (void) mod;
-  (void) ehdr;
-
-  return GRUB_ERR_BAD_MODULE;
-}
-#endif
-
 void
 grub_reboot (void)
 {
@@ -154,10 +135,7 @@ void grub_hostfs_init (void);
 void grub_hostfs_fini (void);
 void grub_host_init (void);
 void grub_host_fini (void);
-#if GRUB_NO_MODULES
-void grub_init_all (void);
-void grub_fini_all (void);
-#endif
+void grub_emu_init (void);
 
 int
 main (int argc, char *argv[])
@@ -216,6 +194,7 @@ main (int argc, char *argv[])
     }
 
   signal (SIGINT, SIG_IGN);
+  grub_emu_init ();
   grub_console_init ();
   grub_host_init ();
   grub_hostfs_init ();
@@ -223,9 +202,7 @@ main (int argc, char *argv[])
   /* XXX: This is a bit unportable.  */
   grub_util_biosdisk_init (dev_map);
 
-#if GRUB_NO_MODULES
   grub_init_all ();
-#endif
 
   /* Make sure that there is a root device.  */
   if (! root_dev)
@@ -255,9 +232,7 @@ main (int argc, char *argv[])
   if (setjmp (main_env) == 0)
     grub_main ();
 
-#if GRUB_NO_MODULES
   grub_fini_all ();
-#endif
   grub_hostfs_fini ();
   grub_host_fini ();
 
@@ -287,10 +262,3 @@ grub_millisleep (grub_uint32_t ms)
 }
 
 #endif
-
-#if GRUB_NO_MODULES
-void
-grub_register_exported_symbols (void)
-{
-}
-#endif
diff --git a/kern/main.c b/kern/main.c
index 1fdf4ab07..2541d3295 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -30,6 +30,8 @@
 #include <grub/reader.h>
 #include <grub/parser.h>
 
+int grub_no_autoload;
+
 void
 grub_module_iterate (int (*hook) (struct grub_module_header *header))
 {
diff --git a/normal/main.c b/normal/main.c
index 4ed17e82c..2d493b897 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -476,10 +476,13 @@ grub_normal_init_page (struct grub_term_output *term)
 static void
 read_lists (const char *val)
 {
-  read_command_list (val);
-  read_fs_list (val);
-  read_crypto_list (val);
-  read_terminal_list (val);
+  if (! grub_no_autoload)
+    {
+      read_command_list (val);
+      read_fs_list (val);
+      read_crypto_list (val);
+      read_terminal_list (val);
+    }
 }
 
 static char *
diff --git a/util/misc.c b/util/misc.c
index 1656d6b5b..caec60552 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -193,12 +193,10 @@ grub_mm_init_region (void *addr __attribute__ ((unused)),
 {
 }
 
-#if GRUB_NO_MODULES
 void
 grub_register_exported_symbols (void)
 {
 }
-#endif
 
 #ifdef __MINGW32__
 
@@ -222,7 +220,7 @@ grub_millisleep (grub_uint32_t ms)
 
 #endif
 
-#if !(defined (__i386__) || defined (__x86_64__)) && GRUB_NO_MODULES
+#if !(defined (__i386__) || defined (__x86_64__)) && GRUB_MACHINE_EMU
 void
 grub_arch_sync_caches (void *address __attribute__ ((unused)),
 		       grub_size_t len __attribute__ ((unused)))

From 0a58eb2e3ac748bf613cb0270b22fe36f6c75bb6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 4 May 2010 10:56:52 +0200
Subject: [PATCH 0903/1628] move fwstart.S to boot/

---
 {kern => boot}/mips/yeeloong/fwstart.S | 0
 conf/mips-yeeloong.rmk                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {kern => boot}/mips/yeeloong/fwstart.S (100%)

diff --git a/kern/mips/yeeloong/fwstart.S b/boot/mips/yeeloong/fwstart.S
similarity index 100%
rename from kern/mips/yeeloong/fwstart.S
rename to boot/mips/yeeloong/fwstart.S
diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 233d8dae6..fbc23db7b 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -36,7 +36,7 @@ kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
 kernel_img_FORMAT = binary
 
 pkglib_IMAGES += fwstart.img
-fwstart_img_SOURCES = kern/$(target_cpu)/$(target_machine)/fwstart.S
+fwstart_img_SOURCES = boot/$(target_cpu)/$(target_machine)/fwstart.S
 fwstart_img_CFLAGS = $(COMMON_CFLAGS)
 fwstart_img_ASFLAGS = $(COMMON_ASFLAGS)
 fwstart_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \

From c3a4565068d248737de7a5cc0d159cef8181732f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 4 May 2010 11:32:10 +0200
Subject: [PATCH 0904/1628] Don't access NULL in dprintf

---
 lib/relocator.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index 5772ccc7d..c30177591 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -211,10 +211,10 @@ allocate_inreg (grub_phys_addr_t paddr, grub_size_t size,
       foll = (void *) ALIGN_UP (vaddr + size, GRUB_MM_ALIGN);
       foll->magic = GRUB_MM_FREE_MAGIC;
       foll->size = hb + hb->size - foll;
+      grub_dprintf ("relocator", "foll = %p, foll->size = %d\n", foll,
+		    foll->size);
     }
 
-  grub_dprintf ("relocator", "foll = %p, foll->size = %d\n", foll, foll->size);
-
   if (vaddr - (grub_addr_t) hb >= sizeof (*hb))
     {
       hb->size = ((vaddr - (grub_addr_t) hb) >> GRUB_MM_ALIGN_LOG2);

From 41cf1ca332a9b5de3467ff89492c453121703db5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 4 May 2010 15:53:21 +0200
Subject: [PATCH 0905/1628] implement ACPI shutdown

---
 commands/acpihalt.c     | 266 ++++++++++++++++++++++++++++++++++++++++
 commands/i386/pc/halt.c |   4 +
 conf/i386-pc.rmk        |   2 +-
 include/grub/acpi.h     |  27 +++-
 4 files changed, 296 insertions(+), 3 deletions(-)
 create mode 100644 commands/acpihalt.c

diff --git a/commands/acpihalt.c b/commands/acpihalt.c
new file mode 100644
index 000000000..2ba15468b
--- /dev/null
+++ b/commands/acpihalt.c
@@ -0,0 +1,266 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/acpi.h>
+#include <grub/misc.h>
+#include <grub/cpu/io.h>
+
+static inline grub_uint32_t
+decode_length (const grub_uint8_t *ptr, int *numlen)
+{
+  int num_bytes, i;
+  grub_uint32_t ret;
+  if (*ptr < 64)
+    {
+      if (numlen)
+	*numlen = 1;
+      return *ptr;
+    }
+  num_bytes = *ptr >> 6;
+  if (numlen)
+    *numlen = num_bytes + 1;
+  ret = *ptr & 0xf;
+  ptr++;
+  for (i = 0; i < num_bytes; i++)
+    {
+      ret |= *ptr << (8 * i + 4);
+      ptr++;
+    }
+  return ret;
+}
+
+static inline grub_uint32_t
+skip_name_string (const grub_uint8_t *ptr, const grub_uint8_t *end)
+{
+  const grub_uint8_t *ptr0 = ptr;
+  
+  while (ptr < end && (*ptr == '^' || *ptr == '\\'))
+    ptr++;
+  switch (*ptr)
+    {
+    case '.':
+      ptr++;
+      ptr += 8;
+      break;
+    case '/':
+      ptr++;
+      ptr += 1 + (*ptr) * 4;
+      break;
+    case 0:
+      ptr++;
+      break;
+    default:
+      ptr += 4;
+      break;
+    }
+  return ptr - ptr0;
+}
+
+static inline grub_uint32_t
+skip_data_ref_object (const grub_uint8_t *ptr, const grub_uint8_t *end)
+{
+  grub_dprintf ("acpi", "data type = 0x%x\n", *ptr);
+  switch (*ptr)
+    {
+    case GRUB_ACPI_OPCODE_PACKAGE:
+      return 1 + decode_length (ptr + 1, 0);
+    case GRUB_ACPI_OPCODE_ZERO:
+    case GRUB_ACPI_OPCODE_ONES:
+    case GRUB_ACPI_OPCODE_ONE:
+      return 1;
+    case GRUB_ACPI_OPCODE_BYTE_CONST:
+      return 2;
+    case GRUB_ACPI_OPCODE_WORD_CONST:
+      return 3;
+    case GRUB_ACPI_OPCODE_DWORD_CONST:
+      return 5;
+    default:
+      if (*ptr == '^' || *ptr == '\\' || *ptr == '_'
+	  || (*ptr >= 'A' && *ptr <= 'Z'))
+	return skip_name_string (ptr, end);
+      grub_printf ("Unknown opcode 0x%x\n", *ptr);
+      return 0;
+    }
+}
+
+static inline grub_uint32_t
+skip_ext_op (const grub_uint8_t *ptr, const grub_uint8_t *end)
+{
+  const grub_uint8_t *ptr0 = ptr;
+  int add;
+  grub_dprintf ("acpi", "Extended opcode: 0x%x\n", *ptr);
+  switch (*ptr)
+    {
+    case GRUB_ACPI_EXTOPCODE_MUTEX:
+      ptr++;
+      ptr += skip_name_string (ptr, end);
+      ptr++;
+      break;
+    case GRUB_ACPI_EXTOPCODE_OPERATION_REGION:
+      ptr++;
+      ptr += skip_name_string (ptr, end);
+      ptr++;
+      ptr += add = skip_data_ref_object (ptr, end);
+      if (!add)
+	return 0;
+      ptr += add = skip_data_ref_object (ptr, end);
+      if (!add)
+	return 0;
+      break;
+    case GRUB_ACPI_EXTOPCODE_FIELD_OP:
+      ptr++;
+      ptr += decode_length (ptr, 0);
+      break;
+    default:
+      grub_printf ("Unexpected extended opcode: 0x%x\n", *ptr);
+      return 0;
+    }
+  return ptr - ptr0;
+}
+
+static int
+get_sleep_type (grub_uint8_t *table, grub_uint8_t *end)
+{
+  grub_uint8_t *ptr, *prev;
+  int sleep_type = -1;
+  
+  ptr = table + sizeof (struct grub_acpi_table_header);
+  while (ptr < end && prev < ptr)
+    {
+      int add;
+      prev = ptr;
+      grub_dprintf ("acpi", "Opcode %x\n", *ptr);
+      grub_dprintf ("acpi", "Tell %x\n", ptr - table);
+      switch (*ptr)
+	{
+	case GRUB_ACPI_OPCODE_EXTOP:
+	  ptr++;
+	  ptr += add = skip_ext_op (ptr, end);
+	  if (!add)
+	    return -1;
+	  break;
+	case GRUB_ACPI_OPCODE_NAME:
+	  ptr++;
+	  if (memcmp (ptr, "_S5_", 4) == 0)
+	    {
+	      int ll;
+	      grub_uint8_t *ptr2 = ptr;
+	      ptr2 += 4;
+	      if (*ptr2 != 0x12)
+		{
+		  grub_printf ("Unknown opcode in _S5: 0x%x\n", *ptr2);
+		  return -1;
+		}
+	      ptr2++;
+	      decode_length (ptr2, &ll);
+	      ptr2 += ll;
+	      ptr2++;
+	      switch (*ptr2)
+		{
+		case GRUB_ACPI_OPCODE_ZERO:
+		  sleep_type = 0;
+		  break;
+		case GRUB_ACPI_OPCODE_ONE:
+		  sleep_type = 1;
+		  break;
+		case GRUB_ACPI_OPCODE_BYTE_CONST:
+		  sleep_type = ptr2[1];
+		  break;
+		default:
+		  grub_printf ("Unknown data type in _S5: 0x%x\n", *ptr2);
+		  return -1;
+		}
+	    }
+	  ptr += add = skip_name_string (ptr, end);
+	  if (!add)
+	    return -1;
+	  ptr += add = skip_data_ref_object (ptr, end);
+	  if (!add)
+	    return -1;
+	  break;
+	case GRUB_ACPI_OPCODE_SCOPE:
+	case GRUB_ACPI_OPCODE_IF:
+	case GRUB_ACPI_OPCODE_METHOD:
+	  {
+	    ptr++;
+	    ptr += decode_length (ptr, 0);
+	    break;
+	  }
+	}
+    }
+
+  grub_dprintf ("acpi", "TYP = %d\n", sleep_type);
+  return sleep_type;
+}
+
+void
+grub_acpi_halt (void)
+{
+  struct grub_acpi_rsdp_v20 *rsdp2;
+  struct grub_acpi_rsdp_v10 *rsdp1;
+      struct grub_acpi_table_header *rsdt;
+      grub_uint32_t *entry_ptr;
+
+  rsdp2 = grub_acpi_get_rsdpv2 ();
+  if (rsdp2)
+    rsdp1 = &(rsdp2->rsdpv1);
+  else
+    rsdp1 = grub_acpi_get_rsdpv1 ();
+  grub_dprintf ("acpi", "rsdp1=%p\n", rsdp1);
+  if (!rsdp1)
+    return;
+
+  rsdt = (struct grub_acpi_table_header *) rsdp1->rsdt_addr;
+  for (entry_ptr = (grub_uint32_t *) (rsdt + 1);
+       entry_ptr < (grub_uint32_t *) (((grub_uint8_t *) rsdt)
+				      + rsdt->length);
+       entry_ptr++)
+    {
+      if (grub_memcmp ((void *)*entry_ptr, "FACP", 4) == 0)
+	{
+	  grub_uint32_t port;
+	  struct grub_acpi_fadt *fadt
+	    = ((struct grub_acpi_fadt *) *entry_ptr);
+	  struct grub_acpi_table_header *dsdt
+	    = (struct grub_acpi_table_header *) fadt->dsdt_addr;
+	  int sleep_type = -1;
+
+	  port = fadt->pm1a;
+
+	  grub_dprintf ("acpi", "PM1a port=%x\n", port);
+
+	  if (grub_memcmp (dsdt->signature, "DSDT",
+			   sizeof (dsdt->signature)) != 0)
+	    break;
+
+	  sleep_type = get_sleep_type ((grub_uint8_t *) dsdt,
+				       (grub_uint8_t *) dsdt + dsdt->length);
+
+	  if (sleep_type < 0 || sleep_type >= 8)
+	    break;
+
+	  grub_dprintf ("acpi", "SLP_TYP = %d, port = 0x%x\n",
+			sleep_type, port);
+
+	  grub_outw (GRUB_ACPI_SLP_EN
+	  	     | (sleep_type << GRUB_ACPI_SLP_TYP_OFFSET), port & 0xffff);
+	}
+    }
+
+  grub_printf ("ACPI shutdown failed\n");
+}
diff --git a/commands/i386/pc/halt.c b/commands/i386/pc/halt.c
index 4c39612ae..143f4a4ff 100644
--- a/commands/i386/pc/halt.c
+++ b/commands/i386/pc/halt.c
@@ -21,6 +21,7 @@
 #include <grub/misc.h>
 #include <grub/extcmd.h>
 #include <grub/i18n.h>
+#include <grub/acpi.h>
 
 static const struct grub_arg_option options[] =
   {
@@ -36,6 +37,9 @@ grub_cmd_halt (grub_extcmd_t cmd,
 {
   struct grub_arg_list *state = cmd->state;
   int no_apm = 0;
+
+  grub_acpi_halt ();
+
   if (state[0].set)
     no_apm = 1;
   grub_halt (no_apm);
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index a5a1b08ea..13055b1c6 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -165,7 +165,7 @@ xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
 xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
 # For halt.mod.
-halt_mod_SOURCES = commands/i386/pc/halt.c
+halt_mod_SOURCES = commands/i386/pc/halt.c commands/acpihalt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/include/grub/acpi.h b/include/grub/acpi.h
index 7933db824..ae83aed34 100644
--- a/include/grub/acpi.h
+++ b/include/grub/acpi.h
@@ -58,10 +58,12 @@ struct grub_acpi_fadt
   struct grub_acpi_table_header hdr;
   grub_uint32_t facs_addr;
   grub_uint32_t dsdt_addr;
-  grub_uint8_t somefields1[88];
+  grub_uint8_t somefields1[20];
+  grub_uint32_t pm1a;
+  grub_uint8_t somefields2[64];
   grub_uint64_t facs_xaddr;
   grub_uint64_t dsdt_xaddr;
-  grub_uint8_t somefields2[96];
+  grub_uint8_t somefields3[96];
 } __attribute__ ((packed));
 
 struct grub_acpi_rsdp_v10 *grub_acpi_get_rsdpv1 (void);
@@ -72,4 +74,25 @@ grub_uint8_t grub_byte_checksum (void *base, grub_size_t size);
 
 grub_err_t grub_acpi_create_ebda (void);
 
+void grub_acpi_halt (void);
+
+#define GRUB_ACPI_SLP_EN (1 << 13)
+#define GRUB_ACPI_SLP_TYP_OFFSET 10
+
+enum
+  {
+    GRUB_ACPI_OPCODE_ZERO = 0, GRUB_ACPI_OPCODE_ONE = 1,
+    GRUB_ACPI_OPCODE_NAME = 8, GRUB_ACPI_OPCODE_BYTE_CONST = 0x0a,
+    GRUB_ACPI_OPCODE_WORD_CONST = 0x0b, GRUB_ACPI_OPCODE_DWORD_CONST = 0x0c,
+    GRUB_ACPI_OPCODE_SCOPE = 0x10, GRUB_ACPI_OPCODE_PACKAGE = 0x12,
+    GRUB_ACPI_OPCODE_METHOD = 0x14, GRUB_ACPI_OPCODE_EXTOP = 0x5b,
+    GRUB_ACPI_OPCODE_IF = 0xa0, GRUB_ACPI_OPCODE_ONES = 0xff
+  };
+enum
+  {
+    GRUB_ACPI_EXTOPCODE_MUTEX = 0x01,
+    GRUB_ACPI_EXTOPCODE_OPERATION_REGION = 0x80,
+    GRUB_ACPI_EXTOPCODE_FIELD_OP = 0x81
+  };
+
 #endif /* ! GRUB_ACPI_HEADER */

From d0fd0a359f3507b38b38d12f7e74c253ec46c2b7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 4 May 2010 15:57:18 +0200
Subject: [PATCH 0906/1628] remove references to kern/i386/ieee1275/init.c

---
 conf/i386-ieee1275.rmk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index d4a459b3e..07faa747a 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -8,7 +8,6 @@ pkglib_PROGRAMS = kernel.img
 # For kernel.img.
 kernel_img_SOURCES = kern/i386/ieee1275/startup.S \
 	kern/i386/misc.S \
-	kern/i386/ieee1275/init.c \
 	kern/ieee1275/init.c \
 	kern/ieee1275/mmap.c \
 	kern/ieee1275/cmain.c kern/ieee1275/openfw.c \

From 8496927478e5af0bd75741dc2d8f792831905786 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 4 May 2010 17:15:36 +0200
Subject: [PATCH 0907/1628] move grub_halt out of kernel on most platforms

---
 conf/i386-coreboot.rmk                        |  7 +++---
 conf/i386-ieee1275.rmk                        |  6 ++---
 conf/i386-multiboot.rmk                       |  7 +++---
 conf/i386-pc.rmk                              |  2 +-
 conf/i386-qemu.rmk                            |  7 +++---
 conf/powerpc-ieee1275.rmk                     |  2 +-
 conf/sparc64-ieee1275.rmk                     |  2 +-
 conf/x86-efi.rmk                              |  5 ++--
 include/grub/misc.h                           |  2 +-
 kern/efi/efi.c                                |  8 ------
 kern/i386/coreboot/init.c                     |  2 +-
 kern/i386/qemu/mmap.c                         |  1 -
 kern/i386/qemu/startup.S                      |  5 +++-
 kern/ieee1275/openfw.c                        | 10 --------
 kern/i386/misc.S => lib/efi/halt.c            | 25 +++++++++++--------
 {kern => lib}/i386/halt.c                     | 17 +++++++++++--
 .../coreboot/init.h => lib/ieee1275/halt.c    | 21 +++++++++-------
 loader/i386/bsd.c                             |  1 -
 18 files changed, 65 insertions(+), 65 deletions(-)
 rename kern/i386/misc.S => lib/efi/halt.c (62%)
 rename {kern => lib}/i386/halt.c (83%)
 rename include/grub/i386/coreboot/init.h => lib/ieee1275/halt.c (62%)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index ca969632a..e6786cdb8 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -8,10 +8,8 @@ GRUB_KERNEL_MACHINE_LINK_ADDR	= 0x8200
 
 pkglib_PROGRAMS += kernel.img
 kernel_img_SOURCES = kern/i386/coreboot/startup.S \
-	kern/i386/misc.S \
 	kern/i386/coreboot/init.c \
        kern/i386/coreboot/mmap.c \
-	kern/i386/halt.c \
 	kern/main.c kern/device.c \
 	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
 	kern/misc.c kern/mm.c kern/term.c \
@@ -35,7 +33,7 @@ bin_SCRIPTS += grub-mkrescue
 grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 # Modules.
-pkglib_MODULES = linux.mod aout.mod halt.mod datetime.mod mmap.mod
+pkglib_MODULES = linux.mod aout.mod datetime.mod mmap.mod
 
 # For mmap.mod.
 mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
@@ -49,7 +47,8 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For halt.mod.
-halt_mod_SOURCES = commands/halt.c
+pkglib_MODULES += halt.mod
+halt_mod_SOURCES = commands/halt.c lib/i386/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index b12ddfdda..ba7a26629 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -7,7 +7,6 @@ pkglib_PROGRAMS = kernel.img
 
 # For kernel.img.
 kernel_img_SOURCES = kern/i386/ieee1275/startup.S \
-	kern/i386/misc.S \
 	kern/ieee1275/init.c \
 	kern/ieee1275/mmap.c \
 	kern/ieee1275/cmain.c kern/ieee1275/openfw.c \
@@ -35,7 +34,7 @@ sbin_SCRIPTS = grub-install
 grub_install_SOURCES = util/ieee1275/grub-install.in
 
 # Modules.
-pkglib_MODULES = halt.mod suspend.mod		\
+pkglib_MODULES = suspend.mod		\
 	aout.mod linux.mod	\
 	nand.mod datetime.mod	\
 	mmap.mod
@@ -57,7 +56,8 @@ suspend_mod_CFLAGS = $(COMMON_CFLAGS)
 suspend_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For halt.mod
-halt_mod_SOURCES = commands/halt.c
+pkglib_MODULES += halt.mod
+halt_mod_SOURCES = commands/halt.c lib/ieee1275/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/conf/i386-multiboot.rmk b/conf/i386-multiboot.rmk
index 69b8e9a48..1da30dfd9 100644
--- a/conf/i386-multiboot.rmk
+++ b/conf/i386-multiboot.rmk
@@ -8,10 +8,8 @@ GRUB_KERNEL_MACHINE_LINK_ADDR	= 0x8200
 
 pkglib_PROGRAMS += kernel.img
 kernel_img_SOURCES = kern/i386/coreboot/startup.S \
-	kern/i386/misc.S \
 	kern/i386/coreboot/init.c \
 	kern/i386/multiboot_mmap.c \
-	kern/i386/halt.c \
 	kern/main.c kern/device.c \
 	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
 	kern/misc.c kern/mm.c kern/term.c \
@@ -35,7 +33,7 @@ bin_SCRIPTS += grub-mkrescue
 grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 # Modules.
-pkglib_MODULES = linux.mod aout.mod halt.mod datetime.mod mmap.mod
+pkglib_MODULES = linux.mod aout.mod datetime.mod mmap.mod
 
 # For mmap.mod.
 mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
@@ -49,7 +47,8 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For halt.mod.
-halt_mod_SOURCES = commands/halt.c
+pkglib_MODULES += halt.mod
+halt_mod_SOURCES = commands/halt.c lib/i386/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index b50655e9e..1ad32f41d 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -98,7 +98,6 @@ bin_SCRIPTS += grub-mkrescue
 grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 pkglib_MODULES = biosdisk.mod chain.mod 				\
-	halt.mod				\
 	vbe.mod vbetest.mod vbeinfo.mod 		\
 	vga.mod				\
 	aout.mod bsd.mod pxe.mod pxecmd.mod datetime.mod  	\
@@ -163,6 +162,7 @@ xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
 xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
 # For halt.mod.
+pkglib_MODULES += halt.mod
 halt_mod_SOURCES = commands/i386/pc/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index 664bef12a..6c2e00586 100644
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -21,10 +21,8 @@ util/grub-mkrawimage.c_DEPENDENCIES = Makefile
 
 pkglib_IMAGES += kernel.img
 kernel_img_SOURCES = kern/i386/qemu/startup.S \
-	kern/i386/misc.S \
 	kern/i386/coreboot/init.c \
 	kern/i386/qemu/mmap.c \
-	kern/i386/halt.c \
 	kern/main.c kern/device.c \
 	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
 	kern/misc.c kern/mm.c kern/term.c \
@@ -49,7 +47,7 @@ bin_SCRIPTS += grub-mkrescue
 grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 # Modules.
-pkglib_MODULES = linux.mod aout.mod halt.mod datetime.mod mmap.mod
+pkglib_MODULES = linux.mod aout.mod datetime.mod mmap.mod
 
 # For mmap.mod.
 mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
@@ -63,7 +61,8 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For halt.mod.
-halt_mod_SOURCES = commands/halt.c
+pkglib_MODULES += halt.mod
+halt_mod_SOURCES = commands/halt.c lib/i386/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index d5968ac8e..736fa4394 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -55,7 +55,7 @@ suspend_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For halt.mod
 pkglib_MODULES += halt.mod
-halt_mod_SOURCES = commands/halt.c
+halt_mod_SOURCES = commands/halt.c lib/ieee1275/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index f0c9b0db7..c6a0d03ec 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -93,7 +93,7 @@ linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For halt.mod.
 pkglib_MODULES += halt.mod
-halt_mod_SOURCES = commands/halt.c
+halt_mod_SOURCES = commands/halt.c lib/ieee1275/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index e29dad645..1d2221cdf 100644
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -17,7 +17,7 @@ grub_install_SOURCES = util/i386/efi/grub-install.in
 # Modules.
 pkglib_PROGRAMS = kernel.img
 pkglib_MODULES = chain.mod appleldr.mod \
-	linux.mod halt.mod  \
+	linux.mod   \
 	datetime.mod loadbios.mod \
 	fixvideo.mod mmap.mod acpi.mod
 
@@ -77,7 +77,8 @@ linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 endif
 
 # For halt.mod.
-halt_mod_SOURCES = commands/halt.c
+pkglib_MODULES += halt.mod
+halt_mod_SOURCES = commands/halt.c lib/efi/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/include/grub/misc.h b/include/grub/misc.h
index 44bcfe507..e5635e239 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -305,7 +305,7 @@ void EXPORT_FUNC (grub_reboot) (void);
  * use APM even if it is available.  */
 void grub_halt (int no_apm);
 #else
-void EXPORT_FUNC (grub_halt) (void);
+void grub_halt (void);
 #endif
 
 #endif /* ! GRUB_MISC_HEADER */
diff --git a/kern/efi/efi.c b/kern/efi/efi.c
index d8b225535..6806bb72a 100644
--- a/kern/efi/efi.c
+++ b/kern/efi/efi.c
@@ -173,14 +173,6 @@ grub_reboot (void)
 }
 #endif
 
-void
-grub_halt (void)
-{
-  grub_efi_fini ();
-  efi_call_4 (grub_efi_system_table->runtime_services->reset_system,
-              GRUB_EFI_RESET_SHUTDOWN, GRUB_EFI_SUCCESS, 0, NULL);
-}
-
 int
 grub_efi_exit_boot_services (grub_efi_uintn_t map_key)
 {
diff --git a/kern/i386/coreboot/init.c b/kern/i386/coreboot/init.c
index 93d75eced..594986eb8 100644
--- a/kern/i386/coreboot/init.c
+++ b/kern/i386/coreboot/init.c
@@ -19,7 +19,6 @@
 #include <grub/kernel.h>
 #include <grub/mm.h>
 #include <grub/machine/time.h>
-#include <grub/machine/init.h>
 #include <grub/machine/memory.h>
 #include <grub/machine/console.h>
 #include <grub/machine/kernel.h>
@@ -33,6 +32,7 @@
 #include <grub/time.h>
 #include <grub/symbol.h>
 #include <grub/cpu/io.h>
+#include <grub/cpu/floppy.h>
 #include <grub/cpu/kernel.h>
 #include <grub/cpu/tsc.h>
 
diff --git a/kern/i386/qemu/mmap.c b/kern/i386/qemu/mmap.c
index c7fc4f45e..fdc7e191b 100644
--- a/kern/i386/qemu/mmap.c
+++ b/kern/i386/qemu/mmap.c
@@ -16,7 +16,6 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <grub/machine/init.h>
 #include <grub/machine/memory.h>
 #include <grub/machine/boot.h>
 #include <grub/types.h>
diff --git a/kern/i386/qemu/startup.S b/kern/i386/qemu/startup.S
index 7484650b2..22996a394 100644
--- a/kern/i386/qemu/startup.S
+++ b/kern/i386/qemu/startup.S
@@ -94,6 +94,9 @@ codestart:
 	call	EXT_C(grub_main)
 
 	/* This should never happen.  */
-	jmp	EXT_C(grub_stop)
+	cli
+1:	
+	hlt
+	jmp 1b
 
 #include "../realmode.S"
diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index cf9e1a870..2f15274b6 100644
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -423,13 +423,3 @@ grub_reboot (void)
   grub_ieee1275_interpret ("reset-all", 0);
 }
 #endif
-
-void
-grub_halt (void)
-{
-  /* Not standardized.  We try three known commands.  */
-
-  grub_ieee1275_interpret ("shut-down", 0);
-  grub_ieee1275_interpret ("power-off", 0);
-  grub_ieee1275_interpret ("poweroff", 0);
-}
diff --git a/kern/i386/misc.S b/lib/efi/halt.c
similarity index 62%
rename from kern/i386/misc.S
rename to lib/efi/halt.c
index 7d57df9b9..e6fd6d07d 100644
--- a/kern/i386/misc.S
+++ b/lib/efi/halt.c
@@ -1,6 +1,7 @@
+/* efi.c - generic EFI support */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2005,2006,2007,2008 Free Software Foundation, Inc.
+ *  Copyright (C) 2006,2007,2008,2009,2010  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
@@ -16,14 +17,16 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <grub/symbol.h>
+#include <grub/efi/api.h>
+#include <grub/efi/efi.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/kernel.h>
 
-	.text
-/*
- *  This call is special...  it never returns...  in fact it should simply
- *  hang at this point!
- */
-FUNCTION(grub_stop)
-	cli
-1:	hlt
-	jmp	1b
+void
+grub_halt (void)
+{
+  grub_machine_fini ();
+  efi_call_4 (grub_efi_system_table->runtime_services->reset_system,
+              GRUB_EFI_RESET_SHUTDOWN, GRUB_EFI_SUCCESS, 0, NULL);
+}
diff --git a/kern/i386/halt.c b/lib/i386/halt.c
similarity index 83%
rename from kern/i386/halt.c
rename to lib/i386/halt.c
index 10805e42b..74e0c7301 100644
--- a/kern/i386/halt.c
+++ b/lib/i386/halt.c
@@ -17,11 +17,24 @@
  */
 
 #include <grub/cpu/io.h>
-#include <grub/machine/init.h>
 #include <grub/misc.h>
 
 const char bochs_shutdown[] = "Shutdown";
 
+/*
+ *  This call is special...  it never returns...  in fact it should simply
+ *  hang at this point!
+ */
+static inline void  __attribute__ ((noreturn))
+stop (void)
+{
+  asm volatile ("cli");
+  while (1)
+    {
+      asm volatile ("hlt");
+    }
+}
+
 void
 grub_halt (void)
 {
@@ -38,5 +51,5 @@ grub_halt (void)
 
   /* In order to return we'd have to check what the previous status of IF
      flag was.  But user most likely doesn't want to return anyway ...  */
-  grub_stop ();
+  stop ();
 }
diff --git a/include/grub/i386/coreboot/init.h b/lib/ieee1275/halt.c
similarity index 62%
rename from include/grub/i386/coreboot/init.h
rename to lib/ieee1275/halt.c
index e944f9cc8..9453714d3 100644
--- a/include/grub/i386/coreboot/init.h
+++ b/lib/ieee1275/halt.c
@@ -1,6 +1,7 @@
+/*  openfw.c -- Open firmware support functions.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2007  Free Software Foundation, Inc.
+ *  Copyright (C) 2003,2004,2005,2007,2008,2009 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
@@ -16,13 +17,15 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GRUB_INIT_I386_LINUXBIOS_HEADER
-#define GRUB_INIT_I386_LINUXBIOS_HEADER		1
+#include <grub/ieee1275/ieee1275.h>
+#include <grub/misc.h>
 
-#include <grub/symbol.h>
-#include <grub/i386/pc/memory.h>
-#include <grub/i386/floppy.h>
+void
+grub_halt (void)
+{
+  /* Not standardized.  We try three known commands.  */
 
-void EXPORT_FUNC(grub_stop) (void) __attribute__ ((noreturn));
-
-#endif
+  grub_ieee1275_interpret ("shut-down", 0);
+  grub_ieee1275_interpret ("power-off", 0);
+  grub_ieee1275_interpret ("poweroff", 0);
+}
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 3c7fe2fee..f9926d114 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -20,7 +20,6 @@
 #include <grub/cpu/loader.h>
 #include <grub/cpu/bsd.h>
 #include <grub/i386/cpuid.h>
-#include <grub/machine/init.h>
 #include <grub/machine/memory.h>
 #include <grub/memory.h>
 #include <grub/file.h>

From b2d8783a98e61edf1573a876ad26fedb26d17aa0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 4 May 2010 17:20:26 +0200
Subject: [PATCH 0908/1628] remove grub_stop_floppy leftover

---
 kern/i386/pc/startup.S | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index ec94a972f..4d4f2c860 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -451,18 +451,6 @@ gate_a20_check_state:
 	. = _start + GRUB_KERNEL_MACHINE_RAW_SIZE
 
 
-/*
- * grub_stop_floppy()
- *
- * Stop the floppy drive from spinning, so that other software is
- * jumped to with a known state.
- */
-FUNCTION(grub_stop_floppy)
-	movw	$0x3F2, %dx
-	xorb	%al, %al
-	outb	%al, %dx
-	ret
-
 /*
  * grub_exit()
  *

From 4e75dd1212e66914f83e360bf4e9056da8aaf776 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 4 May 2010 17:25:29 +0200
Subject: [PATCH 0909/1628] fix warnings on x86_64

---
 lib/relocator.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/relocator.c b/lib/relocator.c
index c30177591..9f9927929 100644
--- a/lib/relocator.c
+++ b/lib/relocator.c
@@ -201,9 +201,10 @@ allocate_inreg (grub_phys_addr_t paddr, grub_size_t size,
   struct grub_mm_header *foll = NULL;
   grub_addr_t vaddr = (grub_addr_t) hb + (paddr - grub_vtop (hb));
 
-  grub_dprintf ("relocator",
-		"inreg paddr = 0x%x, size = %d, hb = %p, hbp = %p, rb = %p, vaddr = 0x%x\n",
-		paddr, size, hb, hbp, rb, vaddr);
+  grub_dprintf ("relocator", "inreg paddr = 0x%lx, size = %lu,"
+		" hb = %p, hbp = %p, rb = %p, vaddr = 0x%lx\n",
+		(unsigned long) paddr, (unsigned long) size, hb, hbp,
+		rb, (unsigned long) vaddr);
     
   if (ALIGN_UP (vaddr + size, GRUB_MM_ALIGN) + GRUB_MM_ALIGN
       <= (grub_addr_t) (hb + hb->size))
@@ -211,8 +212,8 @@ allocate_inreg (grub_phys_addr_t paddr, grub_size_t size,
       foll = (void *) ALIGN_UP (vaddr + size, GRUB_MM_ALIGN);
       foll->magic = GRUB_MM_FREE_MAGIC;
       foll->size = hb + hb->size - foll;
-      grub_dprintf ("relocator", "foll = %p, foll->size = %d\n", foll,
-		    foll->size);
+      grub_dprintf ("relocator", "foll = %p, foll->size = %lu\n", foll,
+		    (unsigned long) foll->size);
     }
 
   if (vaddr - (grub_addr_t) hb >= sizeof (*hb))

From 469ed9410b4a1e7c20948a4ced73e8f3343379be Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 May 2010 09:58:02 +0200
Subject: [PATCH 0910/1628] Fix i386-pc compilation

---
 conf/i386.rmk           | 6 ++++++
 include/grub/i386/pci.h | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/conf/i386.rmk b/conf/i386.rmk
index 3d7f42804..bf2b80821 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -56,6 +56,12 @@ pci_mod_SOURCES = bus/pci.c
 pci_mod_CFLAGS = $(COMMON_CFLAGS)
 pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For cs5536.mod
+pkglib_MODULES += cs5536.mod
+cs5536_mod_SOURCES = bus/cs5536.c
+cs5536_mod_CFLAGS = $(COMMON_CFLAGS)
+cs5536_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # For lspci.mod
 pkglib_MODULES += lspci.mod
 lspci_mod_SOURCES = commands/lspci.c
diff --git a/include/grub/i386/pci.h b/include/grub/i386/pci.h
index bab42adb6..795dec58b 100644
--- a/include/grub/i386/pci.h
+++ b/include/grub/i386/pci.h
@@ -80,7 +80,7 @@ grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),
 
 static inline void
 grub_pci_device_unmap_range (grub_pci_device_t dev __attribute__ ((unused)),
-			     void *mem __attribute__ ((unused)),
+			     volatile void *mem __attribute__ ((unused)),
 			     grub_size_t size __attribute__ ((unused)))
 {
 }

From a8a145eb2fa1656dfbd92da3ea36af05544c206f Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 5 May 2010 14:05:06 +0530
Subject: [PATCH 0911/1628] simplify cmdblock with cmdlist

---
 include/grub/script_sh.h | 19 ++++-------------
 script/execute.c         |  6 +++---
 script/parser.y          | 10 +++------
 script/script.c          | 46 +++++++++++++++++-----------------------
 util/grub-script-check.c |  2 +-
 5 files changed, 31 insertions(+), 52 deletions(-)

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index b55b6a806..53f4f13bb 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -82,15 +82,6 @@ struct grub_script_cmdline
   struct grub_script_arglist *arglist;
 };
 
-/* A block of commands, this can be used to group commands.  */
-struct grub_script_cmdblock
-{
-  struct grub_script_cmd cmd;
-
-  /* A chain of commands.  */
-  struct grub_script_cmd *cmdlist;
-};
-
 /* An if statement.  */
 struct grub_script_cmdif
 {
@@ -234,8 +225,6 @@ grub_script_add_arglist (struct grub_parser_param *state,
 struct grub_script_cmd *
 grub_script_create_cmdline (struct grub_parser_param *state,
 			    struct grub_script_arglist *arglist);
-struct grub_script_cmd *
-grub_script_create_cmdblock (struct grub_parser_param *state);
 
 struct grub_script_cmd *
 grub_script_create_cmdif (struct grub_parser_param *state,
@@ -262,9 +251,9 @@ grub_script_create_cmdmenu (struct grub_parser_param *state,
 			    int options);
 
 struct grub_script_cmd *
-grub_script_add_cmd (struct grub_parser_param *state,
-		     struct grub_script_cmdblock *cmdblock,
-		     struct grub_script_cmd *cmd);
+grub_script_append_cmd (struct grub_parser_param *state,
+			struct grub_script_cmd *list,
+			struct grub_script_cmd *last);
 struct grub_script_arg *
 grub_script_arg_add (struct grub_parser_param *state,
 		     struct grub_script_arg *arg,
@@ -301,7 +290,7 @@ void grub_script_yyerror (struct grub_parser_param *, char const *);
 
 /* Commands to execute, don't use these directly.  */
 grub_err_t grub_script_execute_cmdline (struct grub_script_cmd *cmd);
-grub_err_t grub_script_execute_cmdblock (struct grub_script_cmd *cmd);
+grub_err_t grub_script_execute_cmdlist (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdif (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdfor (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdwhile (struct grub_script_cmd *cmd);
diff --git a/script/execute.c b/script/execute.c
index 40f161267..e10558b4d 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -269,13 +269,13 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 
 /* Execute a block of one or more commands.  */
 grub_err_t
-grub_script_execute_cmdblock (struct grub_script_cmd *cmd)
+grub_script_execute_cmdlist (struct grub_script_cmd *list)
 {
   int ret = 0;
-  struct grub_script_cmdblock *cmdblock = (struct grub_script_cmdblock *) cmd;
+  struct grub_script_cmd *cmd;
 
   /* Loop over every command and execute it.  */
-  for (cmd = cmdblock->cmdlist; cmd; cmd = cmd->next)
+  for (cmd = list->next; cmd; cmd = cmd->next)
     ret = grub_script_execute_cmd (cmd);
 
   return ret;
diff --git a/script/parser.y b/script/parser.y
index b5815ea8d..cc08af37a 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -96,9 +96,7 @@ script: newlines0
         }
       | script statement delimiter newlines0
         {
-          struct grub_script_cmdblock *cmdblock;
-          cmdblock = (struct grub_script_cmdblock *) $1;
-          $$ = grub_script_add_cmd (state, cmdblock, $2);
+          $$ = grub_script_append_cmd (state, $1, $2);
         }
       | error
         {
@@ -183,13 +181,11 @@ command: grubcmd  { $$ = $1; }
 /* A list of commands. */
 commands1: newlines0 command
            {
-             $$ = grub_script_add_cmd (state, 0, $2);
+             $$ = grub_script_append_cmd (state, 0, $2);
            }
          | commands1 delimiters1 command
            {
-             struct grub_script_cmdblock *cmdblock;
-	     cmdblock = (struct grub_script_cmdblock *) $1;
-	     $$ = grub_script_add_cmd (state, cmdblock, $3);
+	     $$ = grub_script_append_cmd (state, $1, $3);
            }
 ;
 
diff --git a/script/script.c b/script/script.c
index 4c87d9491..9cee40dcb 100644
--- a/script/script.c
+++ b/script/script.c
@@ -291,46 +291,40 @@ grub_script_create_cmdmenu (struct grub_parser_param *state,
   return (struct grub_script_cmd *) cmd;
 }
 
-/* Create a block of commands.  CMD contains the command that should
-   be added at the end of CMDBLOCK's list.  If CMDBLOCK is zero, a new
-   cmdblock will be created.  */
+/* Create a chain of commands.  LAST contains the command that should
+   be added at the end of LIST's list.  If LIST is zero, a new list
+   will be created.  */
 struct grub_script_cmd *
-grub_script_add_cmd (struct grub_parser_param *state,
-		     struct grub_script_cmdblock *cmdblock,
-		     struct grub_script_cmd *cmd)
+grub_script_append_cmd (struct grub_parser_param *state,
+			struct grub_script_cmd *list,
+			struct grub_script_cmd *last)
 {
   struct grub_script_cmd *ptr;
 
-  grub_dprintf ("scripting", "cmdblock\n");
+  grub_dprintf ("scripting", "append command\n");
 
-  if (!cmd)
-    return (struct grub_script_cmd *) cmdblock;
+  if (! last)
+    return list;
 
-  if (!cmdblock)
+  if (! list)
     {
-      cmdblock = grub_script_malloc (state, sizeof (*cmdblock));
-      if (!cmdblock)
+      list = grub_script_malloc (state, sizeof (*list));
+      if (! list)
 	return 0;
 
-      cmdblock->cmd.exec = grub_script_execute_cmdblock;
-      cmdblock->cmd.next = 0;
-      cmdblock->cmdlist = cmd;
-      cmd->next = 0;
+      list->exec = grub_script_execute_cmdlist;
+      list->next = last;
     }
   else
     {
-      if (!cmdblock->cmdlist)
-	cmdblock->cmdlist = cmd;
-      else
-	{
-	  ptr = cmdblock->cmdlist;
-	  while (ptr->next)
-	    ptr = ptr->next;
-	  ptr->next = cmd;
-	}
+      ptr = list;
+      while (ptr->next)
+	ptr = ptr->next;
+
+      ptr->next = last;
     }
 
-  return (struct grub_script_cmd *) cmdblock;
+  return list;
 }
 
 
diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index dc732aa01..3b7ab295d 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -70,7 +70,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd __attribute__ ((unused)
 }
 
 grub_err_t
-grub_script_execute_cmdblock (struct grub_script_cmd *cmd __attribute__ ((unused)))
+grub_script_execute_cmdlist (struct grub_script_cmd *cmd __attribute__ ((unused)))
 {
   return 0;
 }

From 839ced08f5cbc496087e21a51784d568eda96f7b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 May 2010 10:40:48 +0200
Subject: [PATCH 0912/1628] separate function to allocate DMA memory

---
 bus/pci.c               | 43 +++++++++++++++++++
 bus/usb/ohci.c          | 62 ++++++++++++++++------------
 bus/usb/uhci.c          |  6 +--
 bus/usb/usbtrans.c      | 91 +++++++++++++++++++++++++++++++++--------
 include/grub/pci.h      |  9 ++++
 include/grub/usbtrans.h |  2 +-
 kern/misc.c             |  3 +-
 7 files changed, 167 insertions(+), 49 deletions(-)

diff --git a/bus/pci.c b/bus/pci.c
index a08e53446..2fe9d764e 100644
--- a/bus/pci.c
+++ b/bus/pci.c
@@ -19,6 +19,49 @@
 
 #include <grub/dl.h>
 #include <grub/pci.h>
+#include <grub/mm.h>
+
+#if GRUB_TARGET_SIZEOF_VOID_P == 4
+struct grub_pci_dma_chunk *
+grub_memalign_dma32 (grub_size_t align, grub_size_t size)
+{
+  return grub_memalign (align, size);
+}
+
+void
+grub_dma_free (struct grub_pci_dma_chunk *ch)
+{
+  grub_free (ch);
+}
+#endif
+
+#ifdef GRUB_MACHINE_MIPS_YEELOONG
+void *
+grub_dma_get_virt (struct grub_pci_dma_chunk *ch)
+{
+  return (void *) ((((grub_uint32_t) ch) & 0x1fffffff) | 0xa0000000);
+}
+
+grub_uint32_t
+grub_dma_get_phys (struct grub_pci_dma_chunk *ch)
+{
+  return ((grub_uint32_t) ch) & 0x1fffffff;
+}
+#else
+
+void *
+grub_dma_get_virt (struct grub_pci_dma_chunk *ch)
+{
+  return (void *) ch;
+}
+
+grub_uint32_t
+grub_dma_get_phys (struct grub_pci_dma_chunk *ch)
+{
+  return (grub_uint32_t) ch;
+}
+
+#endif
 
 grub_pci_address_t
 grub_pci_make_address (grub_pci_device_t dev, int reg)
diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index de20a1491..81ce3294d 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -72,6 +72,7 @@ struct grub_ohci
   volatile grub_uint32_t *iobase;
   volatile struct grub_ohci_hcca *hcca;
   grub_uint32_t hcca_addr;
+  struct grub_pci_dma_chunk *hcca_chunk;
   struct grub_ohci *next;
 };
 
@@ -136,7 +137,6 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   grub_uint32_t revision;
   grub_uint32_t frame_interval;
   int cs5536;
-  grub_uint32_t hcca_addr;
 
   /* Determine IO base address.  */
   grub_dprintf ("ohci", "pciid = %x\n", pciid);
@@ -157,7 +157,6 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
       basereg &= ~GRUB_CS5536_MSR_USB_BASE_PME_ENABLED;
       basereg &= ~GRUB_CS5536_MSR_USB_BASE_PME_STATUS;
       grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_OHCI_BASE, basereg);
-
     }
   else
     {
@@ -198,14 +197,12 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
 
   grub_dprintf ("ohci", "base=%p\n", o->iobase);
 
-  /* FIXME: create proper abstraction for this.  */
-#ifdef GRUB_MACHINE_MIPS_YEELOONG
-  hcca_addr = 0x05000100;
-#else
   /* Reserve memory for the HCCA.  */
-  hcca_addr = (grub_uint32_t) grub_memalign (256, 256);
-#endif
-  o->hcca = grub_pci_device_map_range (dev, hcca_addr, 256);
+  o->hcca_chunk = grub_memalign_dma32 (256, 256);
+  if (! o->hcca_chunk)
+    return 1;
+  o->hcca = grub_dma_get_virt (o->hcca_chunk);
+  o->hcca_addr = grub_dma_get_phys (o->hcca_chunk);
 
   /* Check if the OHCI revision is actually 1.0 as supported.  */
   revision = grub_ohci_readreg32 (o, GRUB_OHCI_REG_REVISION);
@@ -236,7 +233,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
 			GRUB_OHCI_PERIODIC_START);
 
   /* Setup the HCCA.  */
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, hcca_addr);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, o->hcca_addr);
   grub_dprintf ("ohci", "OHCI HCCA\n");
 
   /* Enable the OHCI.  */
@@ -289,7 +286,7 @@ grub_ohci_iterate (int (*hook) (grub_usb_controller_t dev))
 static void
 grub_ohci_transaction (grub_ohci_td_t td,
 		       grub_transfer_type_t type, unsigned int toggle,
-		       grub_size_t size, char *data)
+		       grub_size_t size, grub_uint32_t data)
 {
   grub_uint32_t token;
   grub_uint32_t buffer;
@@ -321,7 +318,7 @@ grub_ohci_transaction (grub_ohci_td_t td,
   token |= toggle << 24;
   token |= 1 << 25;
 
-  buffer = (grub_uint32_t) data;
+  buffer = data;
   buffer_end = buffer + size - 1;
 
   td->token = grub_cpu_to_le32 (token);
@@ -336,7 +333,10 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 {
   struct grub_ohci *o = (struct grub_ohci *) dev->data;
   grub_ohci_ed_t ed;
+  grub_uint32_t ed_addr;
+  struct grub_pci_dma_chunk *ed_chunk, *td_list_chunk;
   grub_ohci_td_t td_list;
+  grub_uint32_t td_list_addr;
   grub_uint32_t target;
   grub_uint32_t td_tail;
   grub_uint32_t td_head;
@@ -346,18 +346,23 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   int i;
 
   /* Allocate an Endpoint Descriptor.  */
-  ed = grub_memalign (16, sizeof (*ed));
-  if (! ed)
+  ed_chunk = grub_memalign_dma32 (256, sizeof (*ed));
+  if (! ed_chunk)
     return GRUB_USB_ERR_INTERNAL;
+  ed = grub_dma_get_virt (ed_chunk);
+  ed_addr = grub_dma_get_phys (ed_chunk);
 
-  td_list = grub_memalign (16, sizeof (*td_list) * (transfer->transcnt + 1));
-  if (! td_list)
+  td_list_chunk = grub_memalign_dma32 (256, sizeof (*td_list)
+				       * (transfer->transcnt + 1));
+  if (! td_list_chunk)
     {
-      grub_free ((void *) ed);
+      grub_dma_free (ed_chunk);
       return GRUB_USB_ERR_INTERNAL;
     }
+  td_list = grub_dma_get_virt (td_list_chunk);
+  td_list_addr = grub_dma_get_phys (td_list_chunk);
 
-  grub_dprintf ("ohci", "alloc=%p\n", td_list);
+  grub_dprintf ("ohci", "alloc=%p/0x%x\n", td_list, td_list_addr);
 
   /* Setup all Transfer Descriptors.  */
   for (i = 0; i < transfer->transcnt; i++)
@@ -367,7 +372,8 @@ grub_ohci_transfer (grub_usb_controller_t dev,
       grub_ohci_transaction (&td_list[i], tr->pid, tr->toggle,
 			     tr->size, tr->data);
 
-      td_list[i].next_td = grub_cpu_to_le32 (&td_list[i + 1]);
+      td_list[i].next_td = grub_cpu_to_le32 (td_list_addr
+					     + (i + 1) * sizeof (td_list[0]));
     }
 
   /* Setup the Endpoint Descriptor.  */
@@ -384,9 +390,9 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   /* Set the maximum packet size.  */
   target |= transfer->max << 16;
 
-  td_head = (grub_uint32_t) td_list;
+  td_head = td_list_addr;
 
-  td_tail = (grub_uint32_t) &td_list[transfer->transcnt];
+  td_tail = td_list_addr + transfer->transcnt * sizeof (*td_list);
 
   ed->target = grub_cpu_to_le32 (target);
   ed->td_head = grub_cpu_to_le32 (td_head);
@@ -413,7 +419,7 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 	status &= ~(1 << 2);
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
 
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, (grub_uint32_t) ed);
+	grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, ed_addr);
 
 	/* Enable the Bulk list.  */
 	control |= 1 << 5;
@@ -440,10 +446,9 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 	status &= ~(1 << 1);
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
 
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD,
-			      (grub_uint32_t) ed);
+	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, ed_addr);
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD+1,
-			      (grub_uint32_t) ed);
+			      ed_addr);
 
 	/* Enable the Control list.  */
 	control |= 1 << 4;
@@ -484,9 +489,12 @@ grub_ohci_transfer (grub_usb_controller_t dev,
     {
       grub_uint8_t errcode;
       grub_ohci_td_t tderr;
+      grub_uint32_t td_err_addr;
 
-      tderr = (grub_ohci_td_t) grub_ohci_readreg32 (o,
-						    GRUB_OHCI_REG_DONEHEAD);
+      td_err_addr = grub_ohci_readreg32 (o, GRUB_OHCI_REG_DONEHEAD);
+
+      tderr = (grub_ohci_td_t) ((char *) td_list
+				+ (td_err_addr - td_list_addr));
       errcode = tderr->token >> 28;
 
       switch (errcode)
diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index 947f2367b..6e47c38ef 100644
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -380,7 +380,7 @@ static grub_uhci_td_t
 grub_uhci_transaction (struct grub_uhci *u, unsigned int endp,
 		       grub_transfer_type_t type, unsigned int addr,
 		       unsigned int toggle, grub_size_t size,
-		       char *data)
+		       grub_uint32_t data)
 {
   grub_uhci_td_t td;
   static const unsigned int tf[] = { 0x69, 0xE1, 0x2D };
@@ -398,7 +398,7 @@ grub_uhci_transaction (struct grub_uhci *u, unsigned int endp,
     }
 
   grub_dprintf ("uhci",
-		"transaction: endp=%d, type=%d, addr=%d, toggle=%d, size=%d data=%p td=%p\n",
+		"transaction: endp=%d, type=%d, addr=%d, toggle=%d, size=%d data=0x%x td=%p\n",
 		endp, type, addr, toggle, size, data, td);
 
   /* Don't point to any TD, just terminate.  */
@@ -418,7 +418,7 @@ grub_uhci_transaction (struct grub_uhci *u, unsigned int endp,
   td->token = ((size << 21) | (toggle << 19) | (endp << 15)
 	       | (addr << 8) | tf[type]);
 
-  td->buffer = (grub_uint32_t) data;
+  td->buffer = data;
 
   return td;
 }
diff --git a/bus/usb/usbtrans.c b/bus/usb/usbtrans.c
index 09e7af83e..f59d5ec77 100644
--- a/bus/usb/usbtrans.c
+++ b/bus/usb/usbtrans.c
@@ -18,6 +18,7 @@
  */
 
 #include <grub/dl.h>
+#include <grub/pci.h>
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/usb.h>
@@ -29,30 +30,59 @@ grub_usb_control_msg (grub_usb_device_t dev,
 		      grub_uint8_t request,
 		      grub_uint16_t value,
 		      grub_uint16_t index,
-		      grub_size_t size, char *data)
+		      grub_size_t size0, char *data_in)
 {
   int i;
   grub_usb_transfer_t transfer;
   int datablocks;
-  struct grub_usb_packet_setup setupdata;
+  struct grub_usb_packet_setup *setupdata;
+  grub_uint32_t setupdata_addr;
   grub_usb_err_t err;
   unsigned int max;
+  struct grub_pci_dma_chunk *data_chunk, *setupdata_chunk;
+  char *data;
+  grub_uint32_t data_addr;
+  grub_size_t size = size0;
+
+  /* FIXME: avoid allocation any kind of buffer in a first place.  */
+  data_chunk = grub_memalign_dma32 (128, size ? : 16);
+  if (!data_chunk)
+    return GRUB_USB_ERR_INTERNAL;
+  data = grub_dma_get_virt (data_chunk);
+  data_addr = grub_dma_get_phys (data_chunk);
+  grub_memcpy (data, data_in, size);
 
   grub_dprintf ("usb",
 		"control: reqtype=0x%02x req=0x%02x val=0x%02x idx=0x%02x size=%d\n",
 		reqtype, request,  value, index, size);
 
   /* Create a transfer.  */
-  transfer = grub_malloc (sizeof (struct grub_usb_transfer));
+  transfer = grub_malloc (sizeof (*transfer));
   if (! transfer)
-    return grub_errno;
+    {
+      grub_dma_free (data_chunk);
+      return grub_errno;
+    }
+
+  setupdata_chunk = grub_memalign_dma32 (32, sizeof (*setupdata));
+  if (! setupdata_chunk)
+    {
+      grub_free (transfer);
+      grub_dma_free (data_chunk);
+      return grub_errno;
+    }
+
+  setupdata = grub_dma_get_virt (setupdata_chunk);
+  setupdata_addr = grub_dma_get_phys (setupdata_chunk);
 
   /* Determine the maximum packet size.  */
-  if (dev->initialized)
+  if (dev->initialized && dev->descdev.maxsize0)
     max = dev->descdev.maxsize0;
   else
     max = 64;
 
+  grub_dprintf ("usb", "transfer = %p, dev = %p\n", transfer, dev);
+
   datablocks = (size + max - 1) / max;
 
   /* XXX: Discriminate between different types of control
@@ -71,18 +101,20 @@ grub_usb_control_msg (grub_usb_device_t dev,
   if (! transfer->transactions)
     {
       grub_free (transfer);
+      grub_dma_free (setupdata_chunk);
+      grub_dma_free (data_chunk);
       return grub_errno;
     }
 
   /* Build a Setup packet.  XXX: Endianness.  */
-  setupdata.reqtype = reqtype;
-  setupdata.request = request;
-  setupdata.value = value;
-  setupdata.index = index;
-  setupdata.length = size;
-  transfer->transactions[0].size = sizeof (setupdata);
+  setupdata->reqtype = reqtype;
+  setupdata->request = request;
+  setupdata->value = value;
+  setupdata->index = index;
+  setupdata->length = size;
+  transfer->transactions[0].size = sizeof (*setupdata);
   transfer->transactions[0].pid = GRUB_USB_TRANSFER_TYPE_SETUP;
-  transfer->transactions[0].data = (char *) &setupdata;
+  transfer->transactions[0].data = setupdata_addr;
   transfer->transactions[0].toggle = 0;
 
   /* Now the data...  XXX: Is this the right way to transfer control
@@ -99,13 +131,13 @@ grub_usb_control_msg (grub_usb_device_t dev,
 	tr->pid = GRUB_USB_TRANSFER_TYPE_IN;
       else
 	tr->pid = GRUB_USB_TRANSFER_TYPE_OUT;
-      tr->data = &data[i * max];
+      tr->data = data_addr + i * max;
       size -= max;
     }
 
   /* End with an empty OUT transaction.  */
   transfer->transactions[datablocks + 1].size = 0;
-  transfer->transactions[datablocks + 1].data = NULL;
+  transfer->transactions[datablocks + 1].data = 0;
   if (reqtype & 128)
     transfer->transactions[datablocks + 1].pid = GRUB_USB_TRANSFER_TYPE_OUT;
   else
@@ -117,13 +149,17 @@ grub_usb_control_msg (grub_usb_device_t dev,
 
   grub_free (transfer->transactions);
   grub_free (transfer);
+  grub_dma_free (data_chunk);
+  grub_dma_free (setupdata_chunk);
+
+  grub_memcpy (data_in, data, size0);
 
   return err;
 }
 
 static grub_usb_err_t
 grub_usb_bulk_readwrite (grub_usb_device_t dev,
-			 int endpoint, grub_size_t size, char *data,
+			 int endpoint, grub_size_t size0, char *data_in,
 			 grub_transfer_type_t type)
 {
   int i;
@@ -132,6 +168,19 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
   unsigned int max;
   grub_usb_err_t err;
   int toggle = dev->toggle[endpoint];
+  char *data;
+  grub_uint32_t data_addr;
+  struct grub_pci_dma_chunk *data_chunk;
+  grub_size_t size = size0;
+
+  /* FIXME: avoid allocation any kind of buffer in a first place.  */
+  data_chunk = grub_memalign_dma32 (128, size);
+  if (!data_chunk)
+    return GRUB_USB_ERR_INTERNAL;
+  data = grub_dma_get_virt (data_chunk);
+  data_addr = grub_dma_get_phys (data_chunk);
+  if (type == GRUB_USB_TRANSFER_TYPE_OUT)
+    grub_memcpy (data, data_in, size);
 
   /* Use the maximum packet size given in the endpoint descriptor.  */
   if (dev->initialized)
@@ -150,7 +199,10 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
   /* Create a transfer.  */
   transfer = grub_malloc (sizeof (struct grub_usb_transfer));
   if (! transfer)
-    return grub_errno;
+    {
+      grub_dma_free (data_chunk);
+      return grub_errno;
+    }
 
   datablocks = ((size + max - 1) / max);
   transfer->transcnt = datablocks;
@@ -167,6 +219,7 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
   if (! transfer->transactions)
     {
       grub_free (transfer);
+      grub_dma_free (data_chunk);
       return grub_errno;
     }
 
@@ -181,7 +234,7 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
       tr->toggle = toggle;
       toggle = toggle ? 0 : 1;
       tr->pid = type;
-      tr->data = &data[i * max];
+      tr->data = data_addr + i * max;
       size -= tr->size;
     }
 
@@ -191,6 +244,10 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
 
   grub_free (transfer->transactions);
   grub_free (transfer);
+  grub_dma_free (data_chunk);
+
+  if (type == GRUB_USB_TRANSFER_TYPE_IN)
+    grub_memcpy (data_in, data, size0);
 
   return err;
 }
diff --git a/include/grub/pci.h b/include/grub/pci.h
index 8a653c43e..fff4d3e3a 100644
--- a/include/grub/pci.h
+++ b/include/grub/pci.h
@@ -109,6 +109,15 @@ grub_pci_address_t EXPORT_FUNC(grub_pci_make_address) (grub_pci_device_t dev,
 						       int reg);
 
 void EXPORT_FUNC(grub_pci_iterate) (grub_pci_iteratefunc_t hook);
+
+struct grub_pci_dma_chunk;
+
+struct grub_pci_dma_chunk *EXPORT_FUNC(grub_memalign_dma32) (grub_size_t align,
+							     grub_size_t size);
+void EXPORT_FUNC(grub_dma_free) (struct grub_pci_dma_chunk *ch);
+void *EXPORT_FUNC(grub_dma_get_virt) (struct grub_pci_dma_chunk *ch);
+grub_uint32_t EXPORT_FUNC(grub_dma_get_phys) (struct grub_pci_dma_chunk *ch);
+
 #endif
 
 #endif /* GRUB_PCI_H */
diff --git a/include/grub/usbtrans.h b/include/grub/usbtrans.h
index 7e4a9d7ee..8c739684e 100644
--- a/include/grub/usbtrans.h
+++ b/include/grub/usbtrans.h
@@ -37,7 +37,7 @@ struct grub_usb_transaction
   int size;
   int toggle;
   grub_transfer_type_t pid;
-  char *data;
+  grub_uint32_t data;
 };
 typedef struct grub_usb_transaction *grub_usb_transaction_t;
 
diff --git a/kern/misc.c b/kern/misc.c
index 9d8fc70da..e86043c15 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -189,7 +189,7 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
   const char *debug = grub_env_get ("debug");
 
   if (! debug)
-    return;
+    debug = "usb,ohci";
 
   if (grub_strword (debug, "all") || grub_strword (debug, condition))
     {
@@ -197,6 +197,7 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
       va_start (args, fmt);
       grub_vprintf (fmt, args);
       va_end (args);
+      grub_refresh ();
     }
 }
 

From dcf937195ca499ce0b672e98e81c92891ea3abd2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 May 2010 10:49:03 +0200
Subject: [PATCH 0913/1628] revert accidental debugging commit

---
 kern/misc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kern/misc.c b/kern/misc.c
index e86043c15..9d8fc70da 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -189,7 +189,7 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
   const char *debug = grub_env_get ("debug");
 
   if (! debug)
-    debug = "usb,ohci";
+    return;
 
   if (grub_strword (debug, "all") || grub_strword (debug, condition))
     {
@@ -197,7 +197,6 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
       va_start (args, fmt);
       grub_vprintf (fmt, args);
       va_end (args);
-      grub_refresh ();
     }
 }
 

From 342bf06e583bb768060d52783272e0e91abc10e3 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 5 May 2010 14:47:50 +0530
Subject: [PATCH 0914/1628] function parameters support

---
 conf/tests.rmk                 |  4 ++
 include/grub/script_sh.h       | 13 +++++-
 script/execute.c               | 75 +++++++++++++++++++++++++++++++---
 script/function.c              |  9 ----
 script/yylex.l                 |  7 ++--
 tests/grub_script_functions.in | 63 ++++++++++++++++++++++++++++
 6 files changed, 151 insertions(+), 20 deletions(-)
 create mode 100644 tests/grub_script_functions.in

diff --git a/conf/tests.rmk b/conf/tests.rmk
index 9af2f8f86..9144e5528 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -71,6 +71,9 @@ grub_script_dollar_SOURCES = tests/grub_script_dollar.in
 check_SCRIPTS += grub_script_comments
 grub_script_comments_SOURCES = tests/grub_script_comments.in
 
+check_SCRIPTS += grub_script_functions
+grub_script_functions_SOURCES = tests/grub_script_functions.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -87,6 +90,7 @@ SCRIPTED_TESTS += grub_script_blanklines
 SCRIPTED_TESTS += grub_script_final_semicolon
 SCRIPTED_TESTS += grub_script_dollar
 SCRIPTED_TESTS += grub_script_comments
+SCRIPTED_TESTS += grub_script_functions
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 53f4f13bb..730aa3005 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -73,6 +73,15 @@ struct grub_script_arglist
   int argcount;
 };
 
+/* Scope for grub script constructs.  */
+struct grub_script_scope
+{
+  struct grub_script_scope *next;
+
+  char **args;
+  unsigned int argc;
+};
+
 /* A single command line.  */
 struct grub_script_cmdline
 {
@@ -329,8 +338,8 @@ grub_script_function_t grub_script_function_create (struct grub_script_arg *func
 void grub_script_function_remove (const char *name);
 grub_script_function_t grub_script_function_find (char *functionname);
 int grub_script_function_iterate (int (*iterate) (grub_script_function_t));
-int grub_script_function_call (grub_script_function_t func,
-			       int argc, char **args);
+grub_err_t grub_script_function_call (grub_script_function_t func,
+				      int argc, char **args);
 
 char **
 grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *count);
diff --git a/script/execute.c b/script/execute.c
index e10558b4d..571b6785b 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -30,6 +30,52 @@
    is sizeof (int) * 3, and one extra for a possible -ve sign.  */
 #define ERRNO_DIGITS_MAX  (sizeof (int) * 3 + 1)
 
+static struct grub_script_scope *scope = 0;
+
+static char *
+grub_script_env_get (const char *name)
+{
+  char *p = 0;
+  unsigned long num = 0;
+
+  if (! scope)
+    return grub_env_get (name);
+
+  if (grub_isdigit (name[0]))
+    {
+      num = grub_strtoul (name, &p, 10);
+      if (p && *p == '\0')
+	{
+	  if (num == 0)
+	    return 0; /* XXX no file name, for now.  */
+
+	  return (num > scope->argc ? 0 : scope->args[num - 1]);
+	}
+      else
+	{
+	  grub_error (GRUB_ERR_BAD_ARGUMENT, "bad variabe name substitution");
+	  return 0;
+	}
+    }
+  else if (grub_strcmp (name, "#") == 0)
+    {
+      static char buf[32]; /* Rewritten everytime.  */
+      grub_snprintf (buf, sizeof (buf), "%u", scope->argc);
+      return buf;
+    }
+  else
+    return grub_env_get (name);
+}
+
+static grub_err_t
+grub_script_env_set (const char *name, const char *val)
+{
+  if (grub_isdigit (name[0]) || grub_strcmp (name, "#") == 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad variable name");
+
+  return grub_env_set (name, val);
+}
+
 static grub_err_t
 grub_script_execute_cmd (struct grub_script_cmd *cmd)
 {
@@ -143,7 +189,7 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *c
 	  switch (arg->type)
 	    {
 	    case GRUB_SCRIPT_ARG_TYPE_VAR:
-	      value = grub_env_get (arg->str);
+	      value = grub_script_env_get (arg->str);
 	      while (value && *value && (ptr = move_to_next(&value)))
 		{
 		  empty = 0;
@@ -168,7 +214,7 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *c
 
 	    case GRUB_SCRIPT_ARG_TYPE_DQVAR:
 	      empty = 0;
-	      append (grub_env_get (arg->str), 0);
+	      append (grub_script_env_get (arg->str), 0);
 	      break;
 	    }
 	  arg = arg->next;
@@ -191,6 +237,23 @@ grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *c
   return argv;
 }
 
+/* Execute a function call.  */
+grub_err_t
+grub_script_function_call (grub_script_function_t func, int argc, char **args)
+{
+  grub_err_t ret = 0;
+  struct grub_script_scope new_scope;
+
+  new_scope.argc = argc;
+  new_scope.args = args;
+  grub_list_push (GRUB_AS_LIST_P (&scope), GRUB_AS_LIST (&new_scope));
+
+  ret = grub_script_execute (func->func);
+
+  grub_list_pop (GRUB_AS_LIST_P (&scope));
+  return ret;
+}
+
 /* Execute a single command line.  */
 grub_err_t
 grub_script_execute_cmdline (struct grub_script_cmd *cmd)
@@ -232,12 +295,12 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 	      /* Create two strings and set the variable.  */
 	      *eq = '\0';
 	      eq++;
-	      grub_env_set (assign, eq);
+	      grub_script_env_set (assign, eq);
 	    }
 	  grub_free (assign);
 
 	  grub_snprintf (errnobuf, sizeof (errnobuf), "%d", grub_errno);
-	  grub_env_set ("?", errnobuf);
+	  grub_script_env_set ("?", errnobuf);
 
 	  grub_print_error ();
 
@@ -291,7 +354,7 @@ grub_script_execute_cmdif (struct grub_script_cmd *cmd)
   /* Check if the commands results in a true or a false.  The value is
      read from the env variable `?'.  */
   grub_script_execute_cmd (cmdif->exec_to_evaluate);
-  result = grub_env_get ("?");
+  result = grub_script_env_get ("?");
 
   grub_errno = GRUB_ERR_NONE;
 
@@ -320,7 +383,7 @@ grub_script_execute_cmdfor (struct grub_script_cmd *cmd)
   result = 0;
   for (i = 0; i < argcount; i++)
     {
-      grub_env_set (cmdfor->name->str, args[i]);
+      grub_script_env_set (cmdfor->name->str, args[i]);
       result = grub_script_execute_cmd (cmdfor->list);
       grub_free (args[i]);
     }
diff --git a/script/function.c b/script/function.c
index ded470c4e..82c753bcd 100644
--- a/script/function.c
+++ b/script/function.c
@@ -115,12 +115,3 @@ grub_script_function_iterate (int (*iterate) (grub_script_function_t))
 
   return 0;
 }
-
-int
-grub_script_function_call (grub_script_function_t func,
-			   int argc __attribute__((unused)),
-			   char **args __attribute__((unused)))
-{
-  /* XXX: Arguments are not supported yet.  */
-  return grub_script_execute (func->func);
-}
diff --git a/script/yylex.l b/script/yylex.l
index 7d4ea9e4e..f563ac30d 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -119,7 +119,8 @@ DIGITS          [[:digit:]]+
 NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
 
 ESC             \\.
-VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|$\?|$\{\?\}
+SPECIAL        \?|\#
+VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|${SPECIAL}|$\{{SPECIAL}\}
 DQSTR           \"([^\\\"]|{ESC})*\"
 SQSTR           \'[^\']*\'
 WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
@@ -221,7 +222,7 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
 }
 
 <VAR>{
-  \?            |
+  {SPECIAL}     |
   {DIGITS}      |
   {NAME}        {
                   COPY (yytext, yyleng);
@@ -231,7 +232,7 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
                   else
                     ARG (GRUB_SCRIPT_ARG_TYPE_DQVAR);
                 }
-  \{\?\}        |
+  \{{SPECIAL}\} |
   \{{DIGITS}\}  |
   \{{NAME}\}    {
                   yytext[yyleng - 1] = '\0';
diff --git a/tests/grub_script_functions.in b/tests/grub_script_functions.in
new file mode 100644
index 000000000..41af87474
--- /dev/null
+++ b/tests/grub_script_functions.in
@@ -0,0 +1,63 @@
+#! @builddir@/grub-shell-tester
+
+# Run GRUB script in a Qemu instance
+# Copyright (C) 2010  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/>.
+
+echo parameter count
+function fcount {
+  echo "$#"
+}
+
+fcount
+fcount a
+fcount a b
+
+echo parameter count, with nesting
+function ffcount {
+  echo "$#"
+  fcount
+  fcount a
+  fcount a b
+}
+
+ffcount
+ffcount 1
+ffcount 1 2
+
+echo parameters
+function fparam {
+  echo 1 $1
+  echo 2 $2
+  echo 3 $3
+}
+
+fparam
+fparam a
+fparam a b
+
+echo parameters, with nesting
+function ffparam {
+  echo 1 $1
+  echo 2 $2
+  echo 3 $3
+  fparam
+  fparam a
+  fparam a b
+}
+
+ffparam
+ffparam 1
+ffparam 1 2

From a7aa28248b1f005b09392b4f25027a896ef0eca6 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 5 May 2010 15:34:26 +0530
Subject: [PATCH 0915/1628] break command support

---
 conf/common.rmk            | 12 +++---
 conf/tests.rmk             |  4 ++
 include/grub/script_sh.h   |  4 ++
 script/execute.c           | 47 +++++++++++++++++++--
 script/main.c              |  3 ++
 tests/grub_script_break.in | 86 ++++++++++++++++++++++++++++++++++++++
 util/grub-script-check.c   |  8 ++++
 7 files changed, 155 insertions(+), 9 deletions(-)
 create mode 100644 tests/grub_script_break.in

diff --git a/conf/common.rmk b/conf/common.rmk
index 4b39e9b71..ed96ce320 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -103,12 +103,12 @@ DISTCLEANFILES += grub_script.yy.c grub_script.yy.h
 # For grub-script-check.
 bin_UTILITIES += grub-script-check
 util/grub-script-check.c_DEPENDENCIES = grub_script_check_init.h
-grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c \
-	util/grub-script-check.c util/misc.c util/mm.c \
-	script/main.c script/script.c script/function.c script/lexer.c \
-	kern/handler.c kern/err.c kern/parser.c kern/list.c \
-	kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c \
-	grub_script.yy.c
+grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c		\
+	gnulib/getline.c util/grub-script-check.c util/misc.c		\
+	util/mm.c script/main.c script/script.c script/function.c	\
+	script/lexer.c kern/handler.c kern/err.c kern/parser.c		\
+	kern/list.c kern/misc.c kern/env.c kern/command.c		\
+	grub_script_check_init.c grub_script.tab.c grub_script.yy.c
 grub_script_check_CFLAGS = $(GNULIB_UTIL_CFLAGS)
 MOSTLYCLEANFILES += symlist.c kernel_syms.lst
 DEFSYMFILES += kernel_syms.lst
diff --git a/conf/tests.rmk b/conf/tests.rmk
index 9144e5528..8af4207b7 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -74,6 +74,9 @@ grub_script_comments_SOURCES = tests/grub_script_comments.in
 check_SCRIPTS += grub_script_functions
 grub_script_functions_SOURCES = tests/grub_script_functions.in
 
+check_SCRIPTS += grub_script_break
+grub_script_break_SOURCES = tests/grub_script_break.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -91,6 +94,7 @@ SCRIPTED_TESTS += grub_script_final_semicolon
 SCRIPTED_TESTS += grub_script_dollar
 SCRIPTED_TESTS += grub_script_comments
 SCRIPTED_TESTS += grub_script_functions
+SCRIPTED_TESTS += grub_script_break
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 730aa3005..aee0a743f 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -23,6 +23,7 @@
 #include <grub/types.h>
 #include <grub/err.h>
 #include <grub/parser.h>
+#include <grub/command.h>
 
 struct grub_script_mem;
 
@@ -308,6 +309,9 @@ grub_err_t grub_script_execute_menuentry (struct grub_script_cmd *cmd);
 /* Execute any GRUB pre-parsed command or script.  */
 grub_err_t grub_script_execute (struct grub_script *script);
 
+/* Break command for loops.  */
+grub_err_t grub_script_break (grub_command_t cmd, int argc, char *argv[]);
+
 /* This variable points to the parsed command.  This is used to
    communicate with the bison code.  */
 extern struct grub_script_cmd *grub_script_parsed;
diff --git a/script/execute.c b/script/execute.c
index 571b6785b..1f639e00b 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -30,8 +30,29 @@
    is sizeof (int) * 3, and one extra for a possible -ve sign.  */
 #define ERRNO_DIGITS_MAX  (sizeof (int) * 3 + 1)
 
+static unsigned long active_loops;
+static unsigned long active_breaks;
 static struct grub_script_scope *scope = 0;
 
+grub_err_t
+grub_script_break (grub_command_t cmd __attribute__((unused)),
+		   int argc, char *argv[])
+{
+  char *p = 0;
+  unsigned long count;
+
+  if (argc == 0)
+    count = 1;
+
+  else if ((argc > 1) ||
+	   (count = grub_strtoul (argv[0], &p, 10)) > active_loops ||
+	   (*p != '\0'))
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad break");
+
+  active_breaks = count;
+  return GRUB_ERR_NONE;
+}
+
 static char *
 grub_script_env_get (const char *name)
 {
@@ -242,8 +263,10 @@ grub_err_t
 grub_script_function_call (grub_script_function_t func, int argc, char **args)
 {
   grub_err_t ret = 0;
+  unsigned long loops = active_loops;
   struct grub_script_scope new_scope;
 
+  active_loops = 0;
   new_scope.argc = argc;
   new_scope.args = args;
   grub_list_push (GRUB_AS_LIST_P (&scope), GRUB_AS_LIST (&new_scope));
@@ -251,6 +274,7 @@ grub_script_function_call (grub_script_function_t func, int argc, char **args)
   ret = grub_script_execute (func->func);
 
   grub_list_pop (GRUB_AS_LIST_P (&scope));
+  active_loops = loops;
   return ret;
 }
 
@@ -338,7 +362,7 @@ grub_script_execute_cmdlist (struct grub_script_cmd *list)
   struct grub_script_cmd *cmd;
 
   /* Loop over every command and execute it.  */
-  for (cmd = list->next; cmd; cmd = cmd->next)
+  for (cmd = list->next; cmd && ! active_breaks; cmd = cmd->next)
     ret = grub_script_execute_cmd (cmd);
 
   return ret;
@@ -380,14 +404,22 @@ grub_script_execute_cmdfor (struct grub_script_cmd *cmd)
   if (!args)
     return grub_errno;
 
+  active_loops++;
   result = 0;
   for (i = 0; i < argcount; i++)
     {
-      grub_script_env_set (cmdfor->name->str, args[i]);
-      result = grub_script_execute_cmd (cmdfor->list);
+      if (! active_breaks)
+	{
+	  grub_script_env_set (cmdfor->name->str, args[i]);
+	  result = grub_script_execute_cmd (cmdfor->list);
+	}
       grub_free (args[i]);
     }
 
+  if (active_breaks)
+    active_breaks--;
+
+  active_loops--;
   grub_free (args);
   return result;
 }
@@ -400,6 +432,7 @@ grub_script_execute_cmdwhile (struct grub_script_cmd *cmd)
   int result;
   struct grub_script_cmdwhile *cmdwhile = (struct grub_script_cmdwhile *) cmd;
 
+  active_loops++;
   result = 0;
   do {
     cond = grub_script_execute_cmd (cmdwhile->cond);
@@ -407,8 +440,16 @@ grub_script_execute_cmdwhile (struct grub_script_cmd *cmd)
       break;
 
     result = grub_script_execute_cmd (cmdwhile->list);
+
+    if (active_breaks)
+      {
+	active_breaks--;
+	break;
+      }
+
   } while (1); /* XXX Put a check for ^C here */
 
+  active_loops--;
   return result;
 }
 
diff --git a/script/main.c b/script/main.c
index b5159dc7d..c30df1f2d 100644
--- a/script/main.c
+++ b/script/main.c
@@ -17,6 +17,7 @@
  */
 
 #include <grub/dl.h>
+#include <grub/i18n.h>
 #include <grub/parser.h>
 #include <grub/script_sh.h>
 
@@ -49,6 +50,8 @@ static struct grub_parser grub_sh_parser =
 GRUB_MOD_INIT(sh)
 {
   grub_parser_register ("grub", &grub_sh_parser);
+  grub_register_command ("break", grub_script_break,
+			 N_("[n]"), N_("Exit from loops"));
 }
 
 GRUB_MOD_FINI(sh)
diff --git a/tests/grub_script_break.in b/tests/grub_script_break.in
new file mode 100644
index 000000000..bf265e8b3
--- /dev/null
+++ b/tests/grub_script_break.in
@@ -0,0 +1,86 @@
+#! @builddir@/grub-shell-tester
+#
+# Copyright (C) 2010  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/>.
+
+# break without any arguments
+for i in 1 2 3 4 5 6 7 8 9 10
+do
+  echo $i
+  if test "$i" = 5
+  then
+    break
+  fi
+done
+
+# break with one
+for i in 1 2 3 4 5 6 7 8 9 10
+do
+  echo $i
+  if test "$i" = 5
+  then
+    break 1
+  fi
+done
+
+# break with loop count
+for i in 1 2 3 4 5
+do
+  for j in a b c d e f
+  do
+    echo "$i $j"
+    if test "$i" = 3
+    then
+      if test "$j" = d
+      then
+        break 2
+      fi
+    fi
+  done
+done
+
+# break into middle loop
+for i in 1 2 3 4 5
+do
+  for j in a b c d e f
+  do
+    echo "$i $j"
+    if test "$i" = 3
+    then
+      if test "$j" = d
+      then
+        break 1
+      fi
+    fi
+  done
+done
+
+# while and until loops
+a=
+while test "$a" != "aaaaaaa"
+do
+  a="a$a"
+  for i in 1 2 3 4
+  do
+    b=
+    until test "$b" = "bbbbb"
+    do
+      b="b$b"
+      echo "$a $i $b"
+      if test "$i" = 3; then echo "break 2"; break 2; fi
+    done
+  done
+done
+
diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index 3b7ab295d..972a5fe17 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -57,6 +57,14 @@ grub_refresh (void)
   fflush (stdout);
 }
 
+grub_err_t
+grub_script_break (grub_command_t cmd __attribute__((unused)),
+		   int argc __attribute__((unused)),
+		   char *argv[] __attribute__((unused)))
+{
+  return 0;
+}
+
 char *
 grub_script_execute_argument_to_string (struct grub_script_arg *arg __attribute__ ((unused)))
 {

From eee25941042302c182be4732194c4e2570461490 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 5 May 2010 16:19:31 +0530
Subject: [PATCH 0916/1628] continue command support

---
 conf/tests.rmk                |  4 ++
 script/execute.c              | 20 +++++---
 script/main.c                 |  2 +
 tests/grub_script_continue.in | 86 +++++++++++++++++++++++++++++++++++
 4 files changed, 106 insertions(+), 6 deletions(-)
 create mode 100644 tests/grub_script_continue.in

diff --git a/conf/tests.rmk b/conf/tests.rmk
index 8af4207b7..57cae95c5 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -77,6 +77,9 @@ grub_script_functions_SOURCES = tests/grub_script_functions.in
 check_SCRIPTS += grub_script_break
 grub_script_break_SOURCES = tests/grub_script_break.in
 
+check_SCRIPTS += grub_script_continue
+grub_script_continue_SOURCES = tests/grub_script_continue.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -95,6 +98,7 @@ SCRIPTED_TESTS += grub_script_dollar
 SCRIPTED_TESTS += grub_script_comments
 SCRIPTED_TESTS += grub_script_functions
 SCRIPTED_TESTS += grub_script_break
+SCRIPTED_TESTS += grub_script_continue
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/script/execute.c b/script/execute.c
index 1f639e00b..88d15495c 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -30,13 +30,13 @@
    is sizeof (int) * 3, and one extra for a possible -ve sign.  */
 #define ERRNO_DIGITS_MAX  (sizeof (int) * 3 + 1)
 
+static unsigned long is_continue;
 static unsigned long active_loops;
 static unsigned long active_breaks;
 static struct grub_script_scope *scope = 0;
 
 grub_err_t
-grub_script_break (grub_command_t cmd __attribute__((unused)),
-		   int argc, char *argv[])
+grub_script_break (grub_command_t cmd, int argc, char *argv[])
 {
   char *p = 0;
   unsigned long count;
@@ -50,6 +50,8 @@ grub_script_break (grub_command_t cmd __attribute__((unused)),
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad break");
 
   active_breaks = count;
+  is_continue = grub_strcmp (cmd->name, "break") ? 1 : 0;
+
   return GRUB_ERR_NONE;
 }
 
@@ -408,6 +410,9 @@ grub_script_execute_cmdfor (struct grub_script_cmd *cmd)
   result = 0;
   for (i = 0; i < argcount; i++)
     {
+      if (is_continue && active_breaks == 1)
+	active_breaks = 0;
+
       if (! active_breaks)
 	{
 	  grub_script_env_set (cmdfor->name->str, args[i]);
@@ -441,14 +446,17 @@ grub_script_execute_cmdwhile (struct grub_script_cmd *cmd)
 
     result = grub_script_execute_cmd (cmdwhile->list);
 
+    if (active_breaks == 1 && is_continue)
+      active_breaks = 0;
+
     if (active_breaks)
-      {
-	active_breaks--;
-	break;
-      }
+      break;
 
   } while (1); /* XXX Put a check for ^C here */
 
+  if (active_breaks)
+    active_breaks--;
+
   active_loops--;
   return result;
 }
diff --git a/script/main.c b/script/main.c
index c30df1f2d..401456e1d 100644
--- a/script/main.c
+++ b/script/main.c
@@ -52,6 +52,8 @@ GRUB_MOD_INIT(sh)
   grub_parser_register ("grub", &grub_sh_parser);
   grub_register_command ("break", grub_script_break,
 			 N_("[n]"), N_("Exit from loops"));
+  grub_register_command ("continue", grub_script_break,
+			 N_("[n]"), N_("Continue loops"));
 }
 
 GRUB_MOD_FINI(sh)
diff --git a/tests/grub_script_continue.in b/tests/grub_script_continue.in
new file mode 100644
index 000000000..4c28ce404
--- /dev/null
+++ b/tests/grub_script_continue.in
@@ -0,0 +1,86 @@
+#! @builddir@/grub-shell-tester
+#
+# Copyright (C) 2010  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/>.
+
+# continue without any arguments
+for i in 1 2 3 4 5 6 7 8 9 10
+do
+  if test "$i" = 5
+  then
+    continue
+  fi
+  echo $i
+done
+
+# continue with one
+for i in 1 2 3 4 5 6 7 8 9 10
+do
+  if test "$i" = 5
+  then
+    continue 1
+  fi
+  echo $i
+done
+
+# continue with loop count
+for i in 1 2 3 4 5
+do
+  for j in a b c d e f
+  do
+    if test "$i" = 3
+    then
+      if test "$j" = d
+      then
+        continue 2
+      fi
+      echo "$i $j"
+    fi
+  done
+done
+
+# continue into middle loop
+for i in 1 2 3 4 5
+do
+  for j in a b c d e f
+  do
+    if test "$i" = 3
+    then
+      if test "$j" = d
+      then
+        continue 1
+      fi
+      echo "$i $j"
+    fi
+  done
+done
+
+# while and until loops
+a=
+while test "$a" != "aaaaaaa"
+do
+  a="a$a"
+  for i in 1 2 3 4
+  do
+    b=
+    until test "$b" = "bbbbb"
+    do
+      b="b$b"
+      if test "$i" = 3; then echo "continue 2"; continue 2; fi
+      echo "$a $i $b"
+    done
+  done
+done
+

From 2bf6012d7f50ad13c5974e9fd137c37016bcffdd Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 May 2010 18:42:33 +0200
Subject: [PATCH 0917/1628] 	* term/ieee1275/ofconsole.c
 (grub_ofconsole_readkey): Support C0 code.

---
 ChangeLog                 |  4 ++++
 term/ieee1275/ofconsole.c | 34 ++++++++++++++++++++--------------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2a6d5e12a..2cfed5f1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Support C0 code.
+
 2010-05-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* commands/parttool.c (grub_cmd_parttool): Fix #if !GRUB_NO_MODULES
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index c0f895a15..26a43bdf4 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -194,14 +194,15 @@ grub_ofconsole_getcolor (grub_uint8_t *normal_color, grub_uint8_t *highlight_col
   *highlight_color = grub_ofconsole_highlight_color;
 }
 
+#define ANSI_C0 0x9b
+
 static int
 grub_ofconsole_readkey (int *key)
 {
-  char c;
+  grub_uint8_t c;
   grub_ssize_t actual = 0;
 
   grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
-
   if (actual > 0)
     switch(c)
       {
@@ -209,25 +210,30 @@ grub_ofconsole_readkey (int *key)
         /* Backspace: Ctrl-h.  */
         c = '\b'; 
         break;
+      case ANSI_C0:
       case '\e':
 	{
 	  grub_uint64_t start;
-	  grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
 
-	  /* On 9600 we have to wait up to 12 milliseconds.  */
-	  start = grub_get_time_ms ();
-	  while (actual <= 0 && grub_get_time_ms () - start < 12)
-	    grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
-
-	  if (actual <= 0)
+	  if (c == '\e')
 	    {
-	      *key = '\e';
-	      return 1;
+	      grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+
+	      /* On 9600 we have to wait up to 12 milliseconds.  */
+	      start = grub_get_time_ms ();
+	      while (actual <= 0 && grub_get_time_ms () - start < 12)
+		grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
+
+	      if (actual <= 0)
+		{
+		  *key = '\e';
+		  return 1;
+		}
+
+	      if (c != '[')
+		return 0;
 	    }
 
-	  if (c != '[')
-	    return 0;
-	  
 	  grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
 
 	  /* On 9600 we have to wait up to 12 milliseconds.  */

From a7fc080b56efd933a8e301ab074dc7da893247c7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 May 2010 18:44:02 +0200
Subject: [PATCH 0918/1628] 	* term/ieee1275/ofconsole.c
 (grub_ofconsole_getkey): Fix off-by-one 	error.

---
 ChangeLog                 | 5 +++++
 term/ieee1275/ofconsole.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 2cfed5f1e..6a8b7af7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* term/ieee1275/ofconsole.c (grub_ofconsole_getkey): Fix off-by-one
+	error.
+
 2010-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* term/ieee1275/ofconsole.c (grub_ofconsole_readkey): Support C0 code.
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index 26a43bdf4..898f9ceab 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -327,7 +327,7 @@ grub_ofconsole_getkey (void)
 static grub_uint16_t
 grub_ofconsole_getxy (void)
 {
-  return ((grub_curr_x - 1) << 8) | grub_curr_y;
+  return (grub_curr_x << 8) | grub_curr_y;
 }
 
 static void

From 7e720a9bc1a99411ee12ea561b7ec4bcaeb1dcc6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 May 2010 18:52:13 +0200
Subject: [PATCH 0919/1628] 	* include/grub/ieee1275/ieee1275.h
 (grub_ieee1275_flag): New value 	GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM. 
 * kern/ieee1275/cmain.c (grub_ieee1275_find_options): Set 
 GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM on qemu. 	* kern/ieee1275/init.c
 (grub_claim_heap): Don0t allocate below 	1.5MiB if
 GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM is set.

---
 ChangeLog                        |  9 +++++++++
 include/grub/ieee1275/ieee1275.h |  3 +++
 kern/ieee1275/cmain.c            | 10 ++++++++++
 kern/ieee1275/init.c             | 11 +++++++++++
 4 files changed, 33 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6a8b7af7d..c38bf213d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/ieee1275/ieee1275.h (grub_ieee1275_flag): New value
+	GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM.
+	* kern/ieee1275/cmain.c (grub_ieee1275_find_options): Set
+	GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM on qemu.
+	* kern/ieee1275/init.c (grub_claim_heap): Don0t allocate below
+	1.5MiB if GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM is set.
+
 2010-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* term/ieee1275/ofconsole.c (grub_ofconsole_getkey): Fix off-by-one
diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
index 2b2c36f8f..b30909c68 100644
--- a/include/grub/ieee1275/ieee1275.h
+++ b/include/grub/ieee1275/ieee1275.h
@@ -100,6 +100,9 @@ enum grub_ieee1275_flag
 
   /* Open Hack'Ware don't support the ANSI sequence.  */
   GRUB_IEEE1275_FLAG_NO_ANSI,
+
+  /* OpenFirmware hangs on qemu if one requests any memory below 1.5 MiB.  */
+  GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM,
 };
 
 extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);
diff --git a/kern/ieee1275/cmain.c b/kern/ieee1275/cmain.c
index c1185f82c..e59d43646 100644
--- a/kern/ieee1275/cmain.c
+++ b/kern/ieee1275/cmain.c
@@ -59,6 +59,7 @@ grub_ieee1275_find_options (void)
   char tmp[32];
   int is_smartfirmware = 0;
   int is_olpc = 0;
+  int is_qemu = 0;
 
   grub_ieee1275_finddevice ("/", &root);
   grub_ieee1275_finddevice ("/options", &options);
@@ -79,6 +80,11 @@ grub_ieee1275_find_options (void)
   if (rc >= 0 && !grub_strcmp (tmp, "OLPC"))
     is_olpc = 1;
 
+  rc = grub_ieee1275_get_property (root, "model",
+				   tmp,	sizeof (tmp), 0);
+  if (rc >= 0 && !grub_strcmp (tmp, "Emulated PC"))
+    is_qemu = 1;
+
   if (is_smartfirmware)
     {
       /* Broken in all versions */
@@ -135,6 +141,10 @@ grub_ieee1275_find_options (void)
       grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_OFDISK_SDCARD_ONLY);
     }
 
+  if (is_qemu)
+    /* OpenFirmware hangs on qemu if one requests any memory below 1.5 MiB.  */
+    grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM);
+
   if (! grub_ieee1275_finddevice ("/rom/boot-rom", &bootrom))
     {
       rc = grub_ieee1275_get_property (bootrom, "model", tmp, sizeof (tmp), 0);
diff --git a/kern/ieee1275/init.c b/kern/ieee1275/init.c
index 75f261a71..b48df37bc 100644
--- a/kern/ieee1275/init.c
+++ b/kern/ieee1275/init.c
@@ -133,6 +133,17 @@ static void grub_claim_heap (void)
     if (type != 1)
       return 0;
 
+    if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM))
+      {
+	if (addr + len <= 0x180000)
+	  return 0;
+
+	if (addr < 0x180000)
+	  {
+	    len = addr + len - 0x180000;
+	    addr = 0x180000;
+	  }
+      }
     len -= 1; /* Required for some firmware.  */
 
     /* Never exceed HEAP_MAX_SIZE  */

From e5507505467b3e6ac1058dc1c24217240ac1910e Mon Sep 17 00:00:00 2001
From: Peter Hurley <Noe-mailavailable>
Date: Wed, 5 May 2010 21:03:59 +0200
Subject: [PATCH 0920/1628] 	* video/readers/jpeg.c
 (grub_jpeg_decode_huff_table): Loop over all 	tables. Ignore non-last ac
 bit. 	(grub_jpeg_decode_quan_table): Likewise.

---
 ChangeLog            | 6 ++++++
 video/readers/jpeg.c | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c38bf213d..0efe3c5e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-05  Peter Hurley <No e-mail available> (tiny change)
+
+	* video/readers/jpeg.c (grub_jpeg_decode_huff_table): Loop over all
+	tables. Ignore non-last ac bit.
+	(grub_jpeg_decode_quan_table): Likewise.
+
 2010-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/ieee1275/ieee1275.h (grub_ieee1275_flag): New value
diff --git a/video/readers/jpeg.c b/video/readers/jpeg.c
index 5e749b8fd..c82b30c9c 100644
--- a/video/readers/jpeg.c
+++ b/video/readers/jpeg.c
@@ -178,8 +178,10 @@ grub_jpeg_decode_huff_table (struct grub_jpeg_data *data)
   next_marker = data->file->offset;
   next_marker += grub_jpeg_get_word (data);
 
+  while (data->file->offset + sizeof (count) + 1 <= next_marker)
+    {
   id = grub_jpeg_get_byte (data);
-  ac = (id >> 4);
+      ac = (id >> 4) & 1;
   id &= 0xF;
   if (id > 1)
     return grub_error (GRUB_ERR_BAD_FILE_TYPE,
@@ -213,6 +215,7 @@ grub_jpeg_decode_huff_table (struct grub_jpeg_data *data)
 
       base <<= 1;
     }
+    }
 
   if (data->file->offset != next_marker)
     grub_error (GRUB_ERR_BAD_FILE_TYPE, "jpeg: extra byte in huffman table");
@@ -229,6 +232,8 @@ grub_jpeg_decode_quan_table (struct grub_jpeg_data *data)
   next_marker = data->file->offset;
   next_marker += grub_jpeg_get_word (data);
 
+  while (data->file->offset + sizeof (data->quan_table[id]) + 1 <= next_marker)
+    {
   id = grub_jpeg_get_byte (data);
   if (id >= 0x10)		/* Upper 4-bit is precision.  */
     return grub_error (GRUB_ERR_BAD_FILE_TYPE,
@@ -241,6 +246,8 @@ grub_jpeg_decode_quan_table (struct grub_jpeg_data *data)
   if (grub_file_read (data->file, &data->quan_table[id], 64) != 64)
     return grub_errno;
 
+    }
+
   if (data->file->offset != next_marker)
     grub_error (GRUB_ERR_BAD_FILE_TYPE,
 		"jpeg: extra byte in quantization table");

From 09ddcd11fb3b93ce4cec40b84ee806847154fc09 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 May 2010 21:18:10 +0200
Subject: [PATCH 0921/1628] 	Various jpeg cleanups.

	* video/readers/jpeg.c (grub_jpeg_get_huff_code): Use ARRAY_SIZE.
	(grub_jpeg_decode_quan_table): Use sizeof.
	(grub_jpeg_decode_du): Use ARRAY_SIZE.
---
 ChangeLog            |  8 ++++++++
 video/readers/jpeg.c | 21 +++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0efe3c5e2..d3b2b44d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Various jpeg cleanups.
+
+	* video/readers/jpeg.c (grub_jpeg_get_huff_code): Use ARRAY_SIZE.
+	(grub_jpeg_decode_quan_table): Use sizeof.
+	(grub_jpeg_decode_du): Use ARRAY_SIZE.
+
 2010-05-05  Peter Hurley <No e-mail available> (tiny change)
 
 	* video/readers/jpeg.c (grub_jpeg_decode_huff_table): Loop over all
diff --git a/video/readers/jpeg.c b/video/readers/jpeg.c
index c82b30c9c..f46b7f83f 100644
--- a/video/readers/jpeg.c
+++ b/video/readers/jpeg.c
@@ -153,10 +153,11 @@ grub_jpeg_get_number (struct grub_jpeg_data *data, int num)
 static int
 grub_jpeg_get_huff_code (struct grub_jpeg_data *data, int id)
 {
-  int code, i;
+  int code;
+  unsigned i;
 
   code = 0;
-  for (i = 0; i < 16; i++)
+  for (i = 0; i < ARRAY_SIZE (data->huff_maxval[id]); i++)
     {
       code <<= 1;
       if (grub_jpeg_get_bit (data))
@@ -171,9 +172,10 @@ grub_jpeg_get_huff_code (struct grub_jpeg_data *data, int id)
 static grub_err_t
 grub_jpeg_decode_huff_table (struct grub_jpeg_data *data)
 {
-  int id, ac, i, n, base, ofs;
+  int id, ac, n, base, ofs;
   grub_uint32_t next_marker;
   grub_uint8_t count[16];
+  unsigned i;
 
   next_marker = data->file->offset;
   next_marker += grub_jpeg_get_word (data);
@@ -192,7 +194,7 @@ grub_jpeg_decode_huff_table (struct grub_jpeg_data *data)
     return grub_errno;
 
   n = 0;
-  for (i = 0; i < 16; i++)
+  for (i = 0; i < ARRAY_SIZE (count); i++)
     n += count[i];
 
   id += ac * 2;
@@ -205,7 +207,7 @@ grub_jpeg_decode_huff_table (struct grub_jpeg_data *data)
 
   base = 0;
   ofs = 0;
-  for (i = 0; i < 16; i++)
+  for (i = 0; i < ARRAY_SIZE (count); i++)
     {
       base += count[i];
       ofs += count[i];
@@ -243,7 +245,9 @@ grub_jpeg_decode_quan_table (struct grub_jpeg_data *data)
     return grub_error (GRUB_ERR_BAD_FILE_TYPE,
 		       "jpeg: too many quantization tables");
 
-  if (grub_file_read (data->file, &data->quan_table[id], 64) != 64)
+  if (grub_file_read (data->file, &data->quan_table[id],
+		      sizeof (data->quan_table[id]))
+      != sizeof (data->quan_table[id]))
     return grub_errno;
 
     }
@@ -451,7 +455,8 @@ grub_jpeg_idct_transform (jpeg_data_unit_t du)
 static void
 grub_jpeg_decode_du (struct grub_jpeg_data *data, int id, jpeg_data_unit_t du)
 {
-  int pos, h1, h2, qt;
+  int h1, h2, qt;
+  unsigned pos;
 
   grub_memset (du, 0, sizeof (jpeg_data_unit_t));
 
@@ -464,7 +469,7 @@ grub_jpeg_decode_du (struct grub_jpeg_data *data, int id, jpeg_data_unit_t du)
 
   du[0] = data->dc_value[id] * (int) data->quan_table[qt][0];
   pos = 1;
-  while (pos < 64)
+  while (pos < ARRAY_SIZE (data->quan_table[qt]))
     {
       int num, val;
 

From 2bf61a980bb1a3ef2fafdec1783e3582a75096f3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 May 2010 21:19:55 +0200
Subject: [PATCH 0922/1628] 	* video/readers/jpeg.c: Indented.

---
 ChangeLog            |  4 +++
 video/readers/jpeg.c | 84 ++++++++++++++++++++++----------------------
 2 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d3b2b44d1..76b1de28f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* video/readers/jpeg.c: Indented.
+
 2010-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Various jpeg cleanups.
diff --git a/video/readers/jpeg.c b/video/readers/jpeg.c
index f46b7f83f..9d88163bd 100644
--- a/video/readers/jpeg.c
+++ b/video/readers/jpeg.c
@@ -182,41 +182,41 @@ grub_jpeg_decode_huff_table (struct grub_jpeg_data *data)
 
   while (data->file->offset + sizeof (count) + 1 <= next_marker)
     {
-  id = grub_jpeg_get_byte (data);
+      id = grub_jpeg_get_byte (data);
       ac = (id >> 4) & 1;
-  id &= 0xF;
-  if (id > 1)
-    return grub_error (GRUB_ERR_BAD_FILE_TYPE,
-		       "jpeg: too many huffman tables");
+      id &= 0xF;
+      if (id > 1)
+	return grub_error (GRUB_ERR_BAD_FILE_TYPE,
+			   "jpeg: too many huffman tables");
 
-  if (grub_file_read (data->file, &count, sizeof (count)) !=
-      sizeof (count))
-    return grub_errno;
+      if (grub_file_read (data->file, &count, sizeof (count)) !=
+	  sizeof (count))
+	return grub_errno;
 
-  n = 0;
-  for (i = 0; i < ARRAY_SIZE (count); i++)
-    n += count[i];
+      n = 0;
+      for (i = 0; i < ARRAY_SIZE (count); i++)
+	n += count[i];
 
-  id += ac * 2;
-  data->huff_value[id] = grub_malloc (n);
-  if (grub_errno)
-    return grub_errno;
+      id += ac * 2;
+      data->huff_value[id] = grub_malloc (n);
+      if (grub_errno)
+	return grub_errno;
 
-  if (grub_file_read (data->file, data->huff_value[id], n) != n)
-    return grub_errno;
+      if (grub_file_read (data->file, data->huff_value[id], n) != n)
+	return grub_errno;
 
-  base = 0;
-  ofs = 0;
-  for (i = 0; i < ARRAY_SIZE (count); i++)
-    {
-      base += count[i];
-      ofs += count[i];
+      base = 0;
+      ofs = 0;
+      for (i = 0; i < ARRAY_SIZE (count); i++)
+	{
+	  base += count[i];
+	  ofs += count[i];
 
-      data->huff_maxval[id][i] = base;
-      data->huff_offset[id][i] = ofs - base;
+	  data->huff_maxval[id][i] = base;
+	  data->huff_offset[id][i] = ofs - base;
 
-      base <<= 1;
-    }
+	  base <<= 1;
+	}
     }
 
   if (data->file->offset != next_marker)
@@ -234,21 +234,22 @@ grub_jpeg_decode_quan_table (struct grub_jpeg_data *data)
   next_marker = data->file->offset;
   next_marker += grub_jpeg_get_word (data);
 
-  while (data->file->offset + sizeof (data->quan_table[id]) + 1 <= next_marker)
+  while (data->file->offset + sizeof (data->quan_table[id]) + 1
+	 <= next_marker)
     {
-  id = grub_jpeg_get_byte (data);
-  if (id >= 0x10)		/* Upper 4-bit is precision.  */
-    return grub_error (GRUB_ERR_BAD_FILE_TYPE,
-		       "jpeg: only 8-bit precision is supported");
+      id = grub_jpeg_get_byte (data);
+      if (id >= 0x10)		/* Upper 4-bit is precision.  */
+	return grub_error (GRUB_ERR_BAD_FILE_TYPE,
+			   "jpeg: only 8-bit precision is supported");
 
-  if (id > 1)
-    return grub_error (GRUB_ERR_BAD_FILE_TYPE,
-		       "jpeg: too many quantization tables");
+      if (id > 1)
+	return grub_error (GRUB_ERR_BAD_FILE_TYPE,
+			   "jpeg: too many quantization tables");
 
-  if (grub_file_read (data->file, &data->quan_table[id],
-		      sizeof (data->quan_table[id]))
-      != sizeof (data->quan_table[id]))
-    return grub_errno;
+      if (grub_file_read (data->file, &data->quan_table[id],
+			  sizeof (data->quan_table[id]))
+	  != sizeof (data->quan_table[id]))
+	return grub_errno;
 
     }
 
@@ -712,7 +713,7 @@ grub_video_reader_jpeg (struct grub_video_bitmap **bitmap,
 #if defined(JPEG_DEBUG)
 static grub_err_t
 grub_cmd_jpegtest (grub_command_t cmd __attribute__ ((unused)),
-                   int argc, char **args)
+		   int argc, char **args)
 {
   struct grub_video_bitmap *bitmap = 0;
 
@@ -747,8 +748,7 @@ GRUB_MOD_INIT (jpeg)
   grub_video_bitmap_reader_register (&jpeg_reader);
 #if defined(JPEG_DEBUG)
   cmd = grub_register_command ("jpegtest", grub_cmd_jpegtest,
-			       "FILE",
-			       "Tests loading of JPEG bitmap.");
+			       "FILE", "Tests loading of JPEG bitmap.");
 #endif
 }
 

From 0cd8e62cfa74e68a03f016286ce1937f6906f352 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 May 2010 21:41:25 +0200
Subject: [PATCH 0923/1628] remove leftover modules

---
 conf/i386-ieee1275.rmk  | 2 +-
 conf/i386-multiboot.rmk | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 1b7460dc3..b12022780 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -36,7 +36,7 @@ sbin_SCRIPTS = grub-install
 grub_install_SOURCES = util/ieee1275/grub-install.in
 
 # Modules.
-pkglib_MODULES = halt.mod suspend.mod aout.mod nand.mod datetime.mod mmap.mod
+pkglib_MODULES = halt.mod suspend.mod nand.mod datetime.mod mmap.mod
 
 # For mmap.mod.
 mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
diff --git a/conf/i386-multiboot.rmk b/conf/i386-multiboot.rmk
index ddfb7e283..6475e6763 100644
--- a/conf/i386-multiboot.rmk
+++ b/conf/i386-multiboot.rmk
@@ -36,7 +36,7 @@ bin_SCRIPTS += grub-mkrescue
 grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 # Modules.
-pkglib_MODULES = linux.mod halt.mod datetime.mod mmap.mod
+pkglib_MODULES = halt.mod datetime.mod mmap.mod
 
 # For mmap.mod.
 mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
@@ -44,11 +44,6 @@ mmap_mod_CFLAGS = $(COMMON_CFLAGS)
 mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod.
 halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)

From f948a3ffab9076be1db1f9146e8319c4aea0db81 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 5 May 2010 21:42:39 +0200
Subject: [PATCH 0924/1628] respect GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM

---
 lib/ieee1275/relocator.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/ieee1275/relocator.c b/lib/ieee1275/relocator.c
index bf7f4a821..947346d46 100644
--- a/lib/ieee1275/relocator.c
+++ b/lib/ieee1275/relocator.c
@@ -54,6 +54,18 @@ grub_relocator_firmware_fill_events (struct grub_relocator_mmap_event *events)
     if (type != GRUB_MACHINE_MEMORY_AVAILABLE)
       return 0;
 
+    if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM))
+      {
+	if (addr + len <= 0x180000)
+	  return 0;
+
+	if (addr < 0x180000)
+	  {
+	    len = addr + len - 0x180000;
+	    addr = 0x180000;
+	  }
+      }
+
     events[counter].type = REG_FIRMWARE_START;
     events[counter].pos = addr;
     counter++;

From da6e6f17f32680314c57f37fd98ce8e836c9bbed Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 6 May 2010 08:45:39 +0530
Subject: [PATCH 0925/1628] cygwin emu build fixes

---
 bus/usb/emu/usb.c       |  4 ++--
 conf/any-emu.rmk        |  2 +-
 include/grub/emu/misc.h |  7 +++++++
 kern/emu/getroot.c      |  9 ++-------
 kern/emu/misc.c         | 20 ++++++++++++++++++++
 util/misc.c             | 26 --------------------------
 6 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/bus/usb/emu/usb.c b/bus/usb/emu/usb.c
index a687eea9b..187857b5b 100644
--- a/bus/usb/emu/usb.c
+++ b/bus/usb/emu/usb.c
@@ -105,14 +105,14 @@ grub_usb_root_hub (grub_usb_controller_t controller __attribute__((unused)))
 grub_usb_err_t
 grub_usb_control_msg (grub_usb_device_t dev, grub_uint8_t reqtype,
 		      grub_uint8_t request, grub_uint16_t value,
-		      grub_uint16_t index, grub_size_t size, char *data)
+		      grub_uint16_t idx, grub_size_t size, char *data)
 {
   usb_dev_handle *devh;
   struct usb_device *d = dev->data;
 
   devh = usb_open (d);
   if (usb_control_msg (devh, reqtype, request,
-		       value, index, data, size, 20) < 0)
+		       value, idx, data, size, 20) < 0)
     {
       usb_close (devh);
       return GRUB_USB_ERR_STALL;
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index cb0ec873f..3f0df06aa 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -16,7 +16,7 @@ kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c kern/env.c	\
 									\
 	gnulib/progname.c disk/host.c
 kernel_img_HEADERS += datetime.h emu/misc.h
-kernel_img_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-undef -I$(srcdir)/gnulib
+kernel_img_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-char-subscripts -Wno-unused -Wno-deprecated-declarations -Wno-undef -I$(srcdir)/gnulib
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 TARGET_NO_STRIP = yes
 
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index 146e64aa9..e037e6be7 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -4,6 +4,13 @@
 #include <grub/symbol.h>
 #include <grub/types.h>
 
+#ifdef __CYGWIN__
+# include <sys/fcntl.h>
+# include <sys/cygwin.h>
+# include <limits.h>
+# define DEV_CYGDRIVE_MAJOR 98
+#endif
+
 #ifdef __NetBSD__
 /* NetBSD uses /boot for its boot block.  */
 # define DEFAULT_DIRECTORY	"/grub"
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index 10a65aa87..6875044da 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -19,6 +19,8 @@
 
 #include <config.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
 #include <dirent.h>
@@ -27,13 +29,6 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#ifdef __CYGWIN__
-# include <sys/fcntl.h>
-# include <sys/cygwin.h>
-# include <limits.h>
-# define DEV_CYGDRIVE_MAJOR 98
-#endif
-
 #ifdef __GNU__
 #include <hurd.h>
 #include <hurd/lookup.h>
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index 56195a851..4888f4a6b 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -176,6 +176,26 @@ grub_get_rtc (void)
 	     * GRUB_TICKS_PER_SECOND / 1000000));
 }
 
+#ifdef __CYGWIN__
+/* Convert POSIX path to Win32 path,
+   remove drive letter, replace backslashes.  */
+static char *
+get_win32_path (const char *path)
+{
+  char winpath[PATH_MAX];
+  if (cygwin_conv_path (CCP_POSIX_TO_WIN_A, path, winpath, sizeof(winpath)))
+    grub_util_error ("cygwin_conv_path() failed");
+
+  int len = strlen (winpath);
+  int offs = (len > 2 && winpath[1] == ':' ? 2 : 0);
+
+  int i;
+  for (i = offs; i < len; i++)
+    if (winpath[i] == '\\')
+      winpath[i] = '/';
+  return xstrdup (winpath + offs);
+}
+#endif
 
 /* This function never prints trailing slashes (so that its output
    can be appended a slash unconditionally).  */
diff --git a/util/misc.c b/util/misc.c
index 1656d6b5b..6785eb00f 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -53,11 +53,6 @@
 # include <malloc.h>
 #endif
 
-#ifdef __CYGWIN__
-# include <sys/cygwin.h>
-# define DEV_CYGDRIVE_MAJOR 98
-#endif
-
 #ifdef __MINGW32__
 #include <windows.h>
 #include <winioctl.h>
@@ -304,27 +299,6 @@ canonicalize_file_name (const char *path)
   return ret;
 }
 
-#ifdef __CYGWIN__
-/* Convert POSIX path to Win32 path,
-   remove drive letter, replace backslashes.  */
-static char *
-get_win32_path (const char *path)
-{
-  char winpath[PATH_MAX];
-  if (cygwin_conv_path (CCP_POSIX_TO_WIN_A, path, winpath, sizeof(winpath)))
-    grub_util_error ("cygwin_conv_path() failed");
-
-  int len = strlen (winpath);
-  int offs = (len > 2 && winpath[1] == ':' ? 2 : 0);
-
-  int i;
-  for (i = offs; i < len; i++)
-    if (winpath[i] == '\\')
-      winpath[i] = '/';
-  return xstrdup (winpath + offs);
-}
-#endif
-
 #ifdef GRUB_UTIL
 void
 grub_util_init_nls (void)

From ab4da2cd366dbd9b36542f8870c4a42adccc6df1 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 6 May 2010 09:33:45 +0530
Subject: [PATCH 0926/1628] build fixes for real platforms

---
 conf/i386-pc.rmk                   | 37 ++++++++++++-------------
 conf/i386-qemu.rmk                 |  2 +-
 conf/mips.rmk                      |  2 +-
 conf/sparc64-ieee1275.rmk          | 44 +++++++++++++++---------------
 conf/x86-efi.rmk                   |  2 +-
 util/i386/pc/grub-setup.c          |  6 ++--
 util/sparc64/ieee1275/grub-setup.c |  4 +--
 7 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index a5a1b08ea..abefb4d84 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -67,30 +67,29 @@ sbin_UTILITIES = grub-setup
 
 # For grub-mkimage.
 grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
-	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
+	kern/emu/misc.c util/resolve.c lib/LzmaEnc.c lib/LzFind.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 util/grub-mkrawimage.c_DEPENDENCIES = Makefile
 
 # For grub-setup.
 util/i386/pc/grub-setup.c_DEPENDENCIES = grub_setup_init.h
-grub_setup_SOURCES = gnulib/progname.c \
-	util/i386/pc/grub-setup.c util/hostdisk.c	\
-	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
-	kern/err.c kern/misc.c kern/parser.c kern/partition.c	\
-	kern/file.c kern/fs.c kern/env.c kern/list.c		\
-	fs/fshelp.c						\
-	\
-	fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c		 \
-	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	 \
-	fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c	\
-	fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c		\
-	fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c		\
-	\
-	partmap/msdos.c partmap/bsdlabel.c partmap/sunpc.c	\
-	partmap/gpt.c		\
-	\
-	disk/raid.c disk/mdraid_linux.c disk/lvm.c		\
-	util/raid.c util/lvm.c util/mm.c			\
+grub_setup_SOURCES = gnulib/progname.c util/i386/pc/grub-setup.c	\
+	util/misc.c kern/emu/misc.c kern/emu/getroot.c			\
+	kern/emu/hostdisk.c kern/device.c kern/disk.c kern/err.c	\
+	kern/misc.c kern/parser.c kern/partition.c kern/file.c		\
+	kern/emu/mm.c kern/fs.c kern/env.c kern/list.c fs/fshelp.c	\
+									\
+	fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c			\
+	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c		\
+	fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c		\
+	fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c			\
+	fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c			\
+									\
+	partmap/msdos.c partmap/bsdlabel.c partmap/sunpc.c		\
+	partmap/gpt.c							\
+									\
+	disk/raid.c disk/mdraid_linux.c disk/lvm.c			\
+	util/raid.c util/lvm.c						\
 	grub_setup_init.c
 
 sbin_SCRIPTS += grub-install
diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index 664bef12a..d5a18a78c 100644
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -14,7 +14,7 @@ boot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_BOOT_MACHINE_LI
 boot_img_FORMAT = binary
 
 bin_UTILITIES += grub-mkimage
-grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
+grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c kern/emu/misc.c \
 	util/resolve.c gnulib/progname.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 util/grub-mkrawimage.c_DEPENDENCIES = Makefile
diff --git a/conf/mips.rmk b/conf/mips.rmk
index 4603c219e..6e13ace29 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -13,7 +13,7 @@ bin_SCRIPTS =
 # For grub-mkimage.
 bin_UTILITIES += grub-mkimage
 grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
-	util/resolve.c lib/LzmaEnc.c lib/LzFind.c
+	kern/emu/misc.c util/resolve.c lib/LzmaEnc.c lib/LzFind.c
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(LINK_BASE)
 util/grub-mkrawimage.c_DEPENDENCIES = Makefile
 
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index f0c9b0db7..99128f918 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -44,34 +44,34 @@ bin_UTILITIES = grub-mkimage
 sbin_UTILITIES = grub-setup grub-ofpathname
 
 # For grub-mkimage.
-grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
+grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c kern/emu/misc.c \
         util/resolve.c gnulib/progname.c
 
 # For grub-setup.
 util/sparc64/ieee1275/grub-setup.c_DEPENDENCIES = grub_setup_init.h
-grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c util/hostdisk.c	\
-	util/ieee1275/ofpath.c \
-	util/misc.c util/getroot.c kern/device.c kern/disk.c	\
-	kern/err.c kern/misc.c kern/parser.c kern/partition.c	\
-	kern/file.c kern/fs.c kern/env.c kern/list.c		\
-	fs/fshelp.c						\
-	\
-	fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c		\
-	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	\
-	fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c	\
-	fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c		\
-	fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c		\
-	\
-	partmap/amiga.c	partmap/apple.c partmap/msdos.c 	\
-	partmap/bsdlabel.c partmap/sun.c partmap/acorn.c	\
-	\
-	disk/raid.c disk/mdraid_linux.c disk/lvm.c		\
-	util/raid.c util/lvm.c util/mm.c gnulib/progname.c	\
-	grub_setup_init.c
+grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c			\
+	util/ieee1275/ofpath.c util/misc.c kern/emu/hostdisk.c		\
+	kern/emu/misc.c kern/emu/getroot.c kern/emu/mm.c kern/device.c	\
+	kern/disk.c kern/err.c kern/misc.c kern/parser.c		\
+	kern/partition.c kern/file.c kern/fs.c kern/env.c kern/list.c	\
+	fs/fshelp.c							\
+									\
+	fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c			\
+	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c		\
+	fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c		\
+	fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c			\
+	fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c			\
+									\
+	partmap/amiga.c	partmap/apple.c partmap/msdos.c			\
+	partmap/bsdlabel.c partmap/sun.c partmap/acorn.c		\
+									\
+	disk/raid.c disk/mdraid_linux.c disk/lvm.c util/raid.c		\
+	util/lvm.c gnulib/progname.c grub_setup_init.c
 
 # For grub-ofpathname.
-grub_ofpathname_SOURCES = util/ieee1275/grub-ofpathname.c \
-	util/ieee1275/ofpath.c util/misc.c gnulib/progname.c
+grub_ofpathname_SOURCES = util/ieee1275/grub-ofpathname.c	\
+	util/ieee1275/ofpath.c util/misc.c kern/emu/misc.c	\
+	gnulib/progname.c
 
 # Scripts.
 sbin_SCRIPTS = grub-install
diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
index e29dad645..7d7d9a3e1 100644
--- a/conf/x86-efi.rmk
+++ b/conf/x86-efi.rmk
@@ -5,7 +5,7 @@ bin_UTILITIES = grub-mkimage
 
 # For grub-mkimage.
 grub_mkimage_SOURCES = gnulib/progname.c util/i386/efi/grub-mkimage.c \
-	util/misc.c util/resolve.c
+	util/misc.c kern/emu/misc.c util/resolve.c
 util/i386/efi/grub-mkimage.c_DEPENDENCIES = Makefile
 
 # Scripts.
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 63fa8c328..be6224f7f 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -28,14 +28,14 @@
 #include <grub/msdos_partition.h>
 #include <grub/gpt_partition.h>
 #include <grub/env.h>
-#include <grub/util/hostdisk.h>
+#include <grub/emu/hostdisk.h>
 #include <grub/machine/boot.h>
 #include <grub/machine/kernel.h>
 #include <grub/term.h>
 #include <grub/i18n.h>
 #include <grub/util/raid.h>
 #include <grub/util/lvm.h>
-#include <grub/util/getroot.h>
+#include <grub/emu/getroot.h>
 
 static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT;
 
@@ -423,7 +423,7 @@ unable_to_embed:
   /* Make sure that GRUB reads the identical image as the OS.  */
   tmp_img = xmalloc (core_size);
   core_path_dev_full = grub_util_get_path (dir, core_file);
-  core_path_dev = make_system_path_relative_to_its_root (core_path_dev_full);
+  core_path_dev = grub_make_system_path_relative_to_its_root (core_path_dev_full);
   free (core_path_dev_full);
 
   /* It is a Good Thing to sync two times.  */
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index 06bc16795..a46a22f87 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -29,7 +29,7 @@
 #include <grub/msdos_partition.h>
 #include <grub/gpt_partition.h>
 #include <grub/env.h>
-#include <grub/util/hostdisk.h>
+#include <grub/emu/hostdisk.h>
 #include <grub/machine/boot.h>
 #include <grub/machine/kernel.h>
 #include <grub/term.h>
@@ -46,7 +46,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <grub/util/getroot.h>
+#include <grub/emu/getroot.h>
 
 #define _GNU_SOURCE	1
 #include <getopt.h>

From 8f6a910b2389271059858ff58cace5a0639472c8 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 6 May 2010 09:55:06 +0530
Subject: [PATCH 0927/1628] fixed n > active_loops case

---
 include/grub/misc.h | 9 +++++++++
 script/execute.c    | 5 ++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/include/grub/misc.h b/include/grub/misc.h
index 9bfc6974e..bcbcf33a3 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -281,6 +281,15 @@ grub_abs (int x)
     return (unsigned int) x;
 }
 
+static inline long
+grub_min (long x, long y)
+{
+  if (x < y)
+    return x;
+  else
+    return y;
+}
+
 static inline long
 grub_max (long x, long y)
 {
diff --git a/script/execute.c b/script/execute.c
index 1f639e00b..3ad0b9dff 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -44,12 +44,11 @@ grub_script_break (grub_command_t cmd __attribute__((unused)),
   if (argc == 0)
     count = 1;
 
-  else if ((argc > 1) ||
-	   (count = grub_strtoul (argv[0], &p, 10)) > active_loops ||
+  else if ((argc > 1) || (count = grub_strtoul (argv[0], &p, 10)) == 0 ||
 	   (*p != '\0'))
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad break");
 
-  active_breaks = count;
+  active_breaks = grub_min (active_loops, count);
   return GRUB_ERR_NONE;
 }
 

From 60b4a7c45be55b950761bca55475a01a2307b946 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 6 May 2010 10:16:55 +0530
Subject: [PATCH 0928/1628] sparc build fix

---
 util/sparc64/ieee1275/grub-setup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index a46a22f87..a758b42e3 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -627,8 +627,8 @@ main (int argc, char *argv[])
 
   find_dest_dev (&ginfo, argv);
 
-  ginfo.prefix = make_system_path_relative_to_its_root (ginfo.dir ?
-							: DEFAULT_DIRECTORY);
+  ginfo.prefix = grub_make_system_path_relative_to_its_root (ginfo.dir ?
+							     : DEFAULT_DIRECTORY);
 
   check_root_dev (&ginfo);
 

From 8c411768822a75c8c15108872191a05e84befa6e Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 6 May 2010 11:34:04 +0530
Subject: [PATCH 0929/1628] automake commit without merge history

---
 .bzrignore                                    |    6 +
 ABOUT-NLS                                     |  223 +++
 Makefile.am                                   |   87 +
 Makefile.in                                   |  564 ------
 autogen.sh                                    |   39 +-
 configure.ac                                  |  783 +-------
 configure.common                              |  804 +++++++++
 docs/Makefile.am                              |    6 +
 geninit.sh                                    |   30 +-
 geninitheader.sh                              |   45 -
 genkernsyms.sh.in                             |   27 -
 genmk.rb                                      |  475 -----
 gentpl.py                                     |  460 +++++
 grub-core/Makefile.am                         |  155 ++
 grub-core/Makefile.extra-dist                 |   53 +
 grub-core/Makefile.kernel                     |  192 ++
 grub-core/Makefile.vars                       |   80 +
 {boot => grub-core/boot}/i386/pc/boot.S       |    0
 {boot => grub-core/boot}/i386/pc/cdboot.S     |    0
 {boot => grub-core/boot}/i386/pc/diskboot.S   |    0
 {boot => grub-core/boot}/i386/pc/lnxboot.S    |    0
 {boot => grub-core/boot}/i386/pc/pxeboot.S    |    0
 {boot => grub-core/boot}/i386/qemu/boot.S     |    0
 .../boot}/sparc64/ieee1275/boot.S             |    0
 .../boot}/sparc64/ieee1275/diskboot.S         |    0
 {bus => grub-core/bus}/bonito.c               |    0
 {util => grub-core/bus/emu}/pci.c             |    1 +
 {bus => grub-core/bus}/pci.c                  |    0
 {util => grub-core/bus/usb/emu}/usb.c         |    0
 {bus => grub-core/bus}/usb/ohci.c             |    0
 {bus => grub-core/bus}/usb/uhci.c             |    0
 {bus => grub-core/bus}/usb/usb.c              |    0
 {bus => grub-core/bus}/usb/usbhub.c           |    0
 {bus => grub-core/bus}/usb/usbtrans.c         |    0
 {commands => grub-core/commands}/acpi.c       |    0
 {commands => grub-core/commands}/blocklist.c  |    0
 {commands => grub-core/commands}/boot.c       |    0
 {commands => grub-core/commands}/cat.c        |    0
 {commands => grub-core/commands}/cmp.c        |    0
 {commands => grub-core/commands}/configfile.c |    0
 {commands => grub-core/commands}/crc.c        |    0
 {commands => grub-core/commands}/date.c       |    0
 {commands => grub-core/commands}/echo.c       |    0
 {commands => grub-core/commands}/efi/acpi.c   |    0
 .../commands}/efi/fixvideo.c                  |    0
 .../commands}/efi/loadbios.c                  |    0
 {commands => grub-core/commands}/extcmd.c     |    0
 {commands => grub-core/commands}/gptsync.c    |    0
 {commands => grub-core/commands}/halt.c       |    0
 {commands => grub-core/commands}/handler.c    |    0
 {commands => grub-core/commands}/hashsum.c    |    0
 {commands => grub-core/commands}/hdparm.c     |    0
 {commands => grub-core/commands}/help.c       |    0
 {commands => grub-core/commands}/hexdump.c    |    0
 {commands => grub-core/commands}/i386/cpuid.c |    0
 .../commands}/i386/pc/acpi.c                  |    0
 .../commands}/i386/pc/drivemap.c              |    0
 .../commands}/i386/pc/drivemap_int13h.S       |    0
 .../commands}/i386/pc/halt.c                  |    0
 .../commands}/i386/pc/play.c                  |    0
 .../commands}/i386/pc/pxecmd.c                |    0
 .../commands}/i386/pc/vbeinfo.c               |    0
 .../commands}/i386/pc/vbetest.c               |    0
 .../commands}/ieee1275/suspend.c              |    0
 {commands => grub-core/commands}/iorw.c       |    0
 {commands => grub-core/commands}/keystatus.c  |    0
 {commands => grub-core/commands}/loadenv.c    |    0
 {commands => grub-core/commands}/ls.c         |    0
 {commands => grub-core/commands}/lsmmap.c     |    0
 {commands => grub-core/commands}/lspci.c      |    0
 {commands => grub-core/commands}/memrw.c      |    0
 {commands => grub-core/commands}/minicmd.c    |    0
 {commands => grub-core/commands}/parttool.c   |    2 +-
 {commands => grub-core/commands}/password.c   |    0
 .../commands}/password_pbkdf2.c               |    0
 {commands => grub-core/commands}/probe.c      |    0
 {commands => grub-core/commands}/read.c       |    0
 {commands => grub-core/commands}/reboot.c     |    0
 {commands => grub-core/commands}/regexp.c     |    0
 {commands => grub-core/commands}/search.c     |    0
 .../commands}/search_file.c                   |    0
 .../commands}/search_label.c                  |    0
 .../commands}/search_uuid.c                   |    0
 .../commands}/search_wrap.c                   |    0
 {commands => grub-core/commands}/setpci.c     |    0
 {commands => grub-core/commands}/sleep.c      |    0
 {commands => grub-core/commands}/terminal.c   |    0
 {commands => grub-core/commands}/test.c       |    0
 {commands => grub-core/commands}/true.c       |    0
 {commands => grub-core/commands}/usbtest.c    |    0
 {commands => grub-core/commands}/videotest.c  |    0
 {commands => grub-core/commands}/xnu_uuid.c   |    0
 {conf => grub-core/conf}/any-emu.rmk          |    0
 {conf => grub-core/conf}/common.rmk           |    0
 {conf => grub-core/conf}/i386-coreboot.rmk    |    0
 {conf => grub-core/conf}/i386-efi.rmk         |    0
 {conf => grub-core/conf}/i386-ieee1275.rmk    |    0
 {conf => grub-core/conf}/i386-multiboot.rmk   |    0
 .../conf}/i386-pc-cygwin-img-ld.sc            |    0
 {conf => grub-core/conf}/i386-pc.rmk          |    0
 {conf => grub-core/conf}/i386-qemu.rmk        |    0
 {conf => grub-core/conf}/i386.rmk             |    0
 {conf => grub-core/conf}/mips-qemu-mips.rmk   |    0
 {conf => grub-core/conf}/mips-yeeloong.rmk    |    0
 {conf => grub-core/conf}/mips.rmk             |    0
 {conf => grub-core/conf}/powerpc-ieee1275.rmk |    0
 {conf => grub-core/conf}/sparc64-ieee1275.rmk |    0
 {conf => grub-core/conf}/tests.rmk            |    0
 {conf => grub-core/conf}/x86-efi.rmk          |    0
 {conf => grub-core/conf}/x86_64-efi.rmk       |    0
 grub-core/configure.ac                        |   91 +
 {disk => grub-core/disk}/ata.c                |    0
 {disk => grub-core/disk}/ata_pthru.c          |    0
 {disk => grub-core/disk}/dmraid_nvidia.c      |    0
 {disk => grub-core/disk}/efi/efidisk.c        |    0
 {disk => grub-core/disk}/host.c               |    0
 {disk => grub-core/disk}/i386/pc/biosdisk.c   |    0
 {disk => grub-core/disk}/ieee1275/nand.c      |    0
 {disk => grub-core/disk}/ieee1275/ofdisk.c    |    0
 {disk => grub-core/disk}/loopback.c           |    0
 {disk => grub-core/disk}/lvm.c                |    0
 {disk => grub-core/disk}/mdraid_linux.c       |    0
 {disk => grub-core/disk}/memdisk.c            |    0
 {disk => grub-core/disk}/raid.c               |    0
 {disk => grub-core/disk}/raid5_recover.c      |    0
 {disk => grub-core/disk}/raid6_recover.c      |    0
 {disk => grub-core/disk}/scsi.c               |    0
 {disk => grub-core/disk}/usbms.c              |    0
 .../efiemu}/i386/coredetect.c                 |    0
 .../efiemu}/i386/loadcore32.c                 |    0
 .../efiemu}/i386/loadcore64.c                 |    0
 .../efiemu}/i386/pc/cfgtables.c               |    0
 {efiemu => grub-core/efiemu}/loadcore.c       |    0
 {efiemu => grub-core/efiemu}/loadcore32.c     |    0
 {efiemu => grub-core/efiemu}/loadcore64.c     |    0
 .../efiemu}/loadcore_common.c                 |    0
 {efiemu => grub-core/efiemu}/main.c           |    0
 {efiemu => grub-core/efiemu}/mm.c             |    0
 {efiemu => grub-core/efiemu}/pnvram.c         |    0
 {efiemu => grub-core/efiemu}/prepare.c        |    0
 {efiemu => grub-core/efiemu}/prepare32.c      |    0
 {efiemu => grub-core/efiemu}/prepare64.c      |    0
 {efiemu => grub-core/efiemu}/runtime/config.h |    0
 {efiemu => grub-core/efiemu}/runtime/efiemu.S |    0
 {efiemu => grub-core/efiemu}/runtime/efiemu.c |    0
 .../efiemu}/runtime/efiemu.sh                 |    0
 {efiemu => grub-core/efiemu}/symbols.c        |    0
 {font => grub-core/font}/font.c               |    0
 {font => grub-core/font}/font_cmd.c           |    0
 {fs => grub-core/fs}/affs.c                   |    0
 {fs => grub-core/fs}/afs.c                    |    0
 {fs => grub-core/fs}/afs_be.c                 |    0
 {fs => grub-core/fs}/befs.c                   |    0
 {fs => grub-core/fs}/befs_be.c                |    0
 {fs => grub-core/fs}/cpio.c                   |    0
 {fs => grub-core/fs}/ext2.c                   |    0
 {fs => grub-core/fs}/fat.c                    |    0
 {fs => grub-core/fs}/fshelp.c                 |    0
 {fs => grub-core/fs}/hfs.c                    |    0
 {fs => grub-core/fs}/hfsplus.c                |    0
 {fs => grub-core/fs}/i386/pc/pxe.c            |    0
 {fs => grub-core/fs}/iso9660.c                |    0
 {fs => grub-core/fs}/jfs.c                    |    0
 {fs => grub-core/fs}/minix.c                  |    0
 {fs => grub-core/fs}/nilfs2.c                 |    0
 {fs => grub-core/fs}/ntfs.c                   |    0
 {fs => grub-core/fs}/ntfscomp.c               |    0
 {fs => grub-core/fs}/reiserfs.c               |    0
 {fs => grub-core/fs}/sfs.c                    |    0
 {fs => grub-core/fs}/tar.c                    |    0
 {fs => grub-core/fs}/udf.c                    |    0
 {fs => grub-core/fs}/ufs.c                    |    0
 {fs => grub-core/fs}/ufs2.c                   |    0
 {fs => grub-core/fs}/xfs.c                    |    0
 gencmdlist.sh => grub-core/gencmdlist.sh      |    0
 gendistlist.sh => grub-core/gendistlist.sh    |    0
 genemuinit.sh => grub-core/genemuinit.sh      |    0
 .../genemuinitheader.sh                       |    0
 genfslist.sh => grub-core/genfslist.sh        |    0
 .../genhandlerlist.sh                         |    0
 genmoddep.awk => grub-core/genmoddep.awk      |   13 +-
 genmodsrc.sh => grub-core/genmodsrc.sh        |    0
 .../genpartmaplist.sh                         |    0
 .../genparttoollist.sh                        |    0
 gensymlist.sh.in => grub-core/gensymlist.sh   |   13 +-
 .../genterminallist.sh                        |    0
 gentrigtables.c => grub-core/gentrigtables.c  |    3 +-
 genvideolist.sh => grub-core/genvideolist.sh  |    0
 {gettext => grub-core/gettext}/gettext.c      |    0
 {gfxmenu => grub-core/gfxmenu}/gfxmenu.c      |    0
 {gfxmenu => grub-core/gfxmenu}/gui_box.c      |    0
 {gfxmenu => grub-core/gfxmenu}/gui_canvas.c   |    0
 .../gfxmenu}/gui_circular_progress.c          |    0
 {gfxmenu => grub-core/gfxmenu}/gui_image.c    |    0
 {gfxmenu => grub-core/gfxmenu}/gui_label.c    |    0
 {gfxmenu => grub-core/gfxmenu}/gui_list.c     |    0
 .../gfxmenu}/gui_progress_bar.c               |    0
 .../gfxmenu}/gui_string_util.c                |    0
 {gfxmenu => grub-core/gfxmenu}/gui_util.c     |    0
 {gfxmenu => grub-core/gfxmenu}/icon_manager.c |    0
 {gfxmenu => grub-core/gfxmenu}/model.c        |    0
 {gfxmenu => grub-core/gfxmenu}/named_colors.c |    0
 {gfxmenu => grub-core/gfxmenu}/theme_loader.c |    0
 {gfxmenu => grub-core/gfxmenu}/view.c         |    0
 {gfxmenu => grub-core/gfxmenu}/widget-box.c   |    0
 {gnulib => grub-core/gnulib}/alloca.h         |    0
 {gnulib => grub-core/gnulib}/argp-ba.c        |    0
 {gnulib => grub-core/gnulib}/argp-eexst.c     |    0
 {gnulib => grub-core/gnulib}/argp-fmtstream.c |    0
 {gnulib => grub-core/gnulib}/argp-fmtstream.h |    0
 {gnulib => grub-core/gnulib}/argp-fs-xinl.c   |    0
 {gnulib => grub-core/gnulib}/argp-help.c      |    0
 {gnulib => grub-core/gnulib}/argp-namefrob.h  |    0
 {gnulib => grub-core/gnulib}/argp-parse.c     |    0
 {gnulib => grub-core/gnulib}/argp-pin.c       |    0
 {gnulib => grub-core/gnulib}/argp-pv.c        |    0
 {gnulib => grub-core/gnulib}/argp-pvh.c       |    0
 .../gnulib}/argp-version-etc.c                |    0
 .../gnulib}/argp-version-etc.h                |    0
 {gnulib => grub-core/gnulib}/argp-xinl.c      |    0
 {gnulib => grub-core/gnulib}/argp.h           |    0
 {gnulib => grub-core/gnulib}/error.c          |    0
 {gnulib => grub-core/gnulib}/error.h          |    0
 {gnulib => grub-core/gnulib}/fnmatch.c        |    0
 {gnulib => grub-core/gnulib}/fnmatch.h        |    0
 {gnulib => grub-core/gnulib}/fnmatch_loop.c   |    0
 {gnulib => grub-core/gnulib}/getdelim.c       |    0
 {gnulib => grub-core/gnulib}/getline.c        |    0
 {gnulib => grub-core/gnulib}/getopt.c         |    0
 {gnulib => grub-core/gnulib}/getopt.h         |    0
 {gnulib => grub-core/gnulib}/getopt1.c        |    0
 {gnulib => grub-core/gnulib}/getopt_int.h     |    0
 {gnulib => grub-core/gnulib}/gettext.h        |    0
 {gnulib => grub-core/gnulib}/progname.c       |    0
 {gnulib => grub-core/gnulib}/progname.h       |    0
 {gnulib => grub-core/gnulib}/regcomp.c        |    0
 {gnulib => grub-core/gnulib}/regex.c          |    0
 {gnulib => grub-core/gnulib}/regex.h          |    0
 {gnulib => grub-core/gnulib}/regex_internal.c |    0
 {gnulib => grub-core/gnulib}/regex_internal.h |    0
 {gnulib => grub-core/gnulib}/regexec.c        |    0
 {hello => grub-core/hello}/hello.c            |    0
 {hook => grub-core/hook}/datehook.c           |    0
 {util => grub-core}/import_gcry.py            |    0
 .../include}/grub/acorn_filecore.h            |    0
 {include => grub-core/include}/grub/acpi.h    |    0
 {include => grub-core/include}/grub/aout.h    |    0
 .../include}/grub/at_keyboard.h               |    0
 {include => grub-core/include}/grub/ata.h     |    0
 {include => grub-core/include}/grub/auth.h    |    0
 {include => grub-core/include}/grub/autoefi.h |    0
 {include => grub-core/include}/grub/bitmap.h  |    0
 .../include}/grub/bitmap_scale.h              |    0
 {include => grub-core/include}/grub/boot.h    |    0
 .../include}/grub/bsdlabel.h                  |    0
 {include => grub-core/include}/grub/bufio.h   |    0
 {include => grub-core/include}/grub/cache.h   |    0
 {include => grub-core/include}/grub/charset.h |    0
 {include => grub-core/include}/grub/cmos.h    |    0
 {include => grub-core/include}/grub/command.h |    0
 {include => grub-core/include}/grub/crypto.h  |    0
 .../include}/grub/datetime.h                  |    0
 {include => grub-core/include}/grub/device.h  |    0
 {include => grub-core/include}/grub/disk.h    |    0
 {include => grub-core/include}/grub/dl.h      |   32 +-
 {include => grub-core/include}/grub/efi/api.h |    0
 .../include}/grub/efi/console.h               |    0
 .../include}/grub/efi/console_control.h       |    0
 .../include}/grub/efi/disk.h                  |    0
 {include => grub-core/include}/grub/efi/efi.h |    0
 .../include}/grub/efi/graphics_output.h       |    0
 .../include}/grub/efi/memory.h                |    0
 .../include}/grub/efi/pe32.h                  |    0
 .../include}/grub/efi/time.h                  |    0
 .../include}/grub/efi/uga_draw.h              |    0
 .../include}/grub/efiemu/efiemu.h             |    0
 .../include}/grub/efiemu/runtime.h            |    0
 {include => grub-core/include}/grub/elf.h     |    0
 {include => grub-core/include}/grub/elfload.h |    0
 .../include/grub/emu}/console.h               |    0
 .../include/grub/emu}/getroot.h               |    1 +
 .../include/grub/emu}/hostdisk.h              |    0
 grub-core/include/grub/emu/misc.h             |   22 +
 {include => grub-core/include}/grub/env.h     |    0
 .../include}/grub/env_private.h               |    0
 {include => grub-core/include}/grub/err.h     |    0
 {include => grub-core/include}/grub/extcmd.h  |    0
 {include => grub-core/include}/grub/fbblit.h  |    0
 {include => grub-core/include}/grub/fbfill.h  |    0
 {include => grub-core/include}/grub/fbutil.h  |    0
 {include => grub-core/include}/grub/file.h    |    0
 {include => grub-core/include}/grub/font.h    |    0
 .../include}/grub/fontformat.h                |    0
 {include => grub-core/include}/grub/fs.h      |    0
 {include => grub-core/include}/grub/fshelp.h  |    0
 .../include}/grub/gfxmenu_model.h             |    0
 .../include}/grub/gfxmenu_view.h              |    0
 {include => grub-core/include}/grub/gfxterm.h |    0
 .../include}/grub/gfxwidgets.h                |    0
 .../include}/grub/gpt_partition.h             |    0
 {include => grub-core/include}/grub/gui.h     |    0
 .../include}/grub/gui_string_util.h           |    0
 {include => grub-core/include}/grub/gzio.h    |    0
 {include => grub-core/include}/grub/handler.h |    0
 {include => grub-core/include}/grub/hfs.h     |    0
 {include => grub-core/include}/grub/i18n.h    |    0
 .../include}/grub/i386/at_keyboard.h          |    0
 .../include}/grub/i386/bsd.h                  |    0
 .../include}/grub/i386/cmos.h                 |    0
 .../include}/grub/i386/coreboot/boot.h        |    0
 .../include}/grub/i386/coreboot/console.h     |    0
 .../include}/grub/i386/coreboot/init.h        |    0
 .../include}/grub/i386/coreboot/kernel.h      |    0
 .../include}/grub/i386/coreboot/loader.h      |    0
 .../include}/grub/i386/coreboot/memory.h      |    0
 .../include}/grub/i386/coreboot/serial.h      |    0
 .../include}/grub/i386/coreboot/time.h        |    0
 .../include}/grub/i386/cpuid.h                |    0
 .../include}/grub/i386/efi/kernel.h           |    0
 .../include}/grub/i386/efi/loader.h           |    0
 .../include}/grub/i386/efi/memory.h           |    0
 .../include}/grub/i386/efi/serial.h           |    0
 .../include}/grub/i386/efi/time.h             |    0
 .../include}/grub/i386/efiemu.h               |    0
 .../include}/grub/i386/freebsd_linker.h       |    0
 .../include}/grub/i386/freebsd_reboot.h       |    0
 .../include}/grub/i386/ieee1275/console.h     |    0
 .../include}/grub/i386/ieee1275/ieee1275.h    |    0
 .../include}/grub/i386/ieee1275/kernel.h      |    0
 .../include}/grub/i386/ieee1275/loader.h      |    0
 .../include}/grub/i386/ieee1275/memory.h      |    0
 .../include}/grub/i386/ieee1275/serial.h      |    0
 .../include}/grub/i386/ieee1275/time.h        |    0
 {include => grub-core/include}/grub/i386/io.h |    0
 .../include}/grub/i386/kernel.h               |    0
 .../include}/grub/i386/linux.h                |    0
 .../include}/grub/i386/loader.h               |    0
 .../include}/grub/i386/macho.h                |    0
 .../include}/grub/i386/memory.h               |    0
 .../include}/grub/i386/multiboot.h            |    0
 .../include}/grub/i386/multiboot/boot.h       |    0
 .../include}/grub/i386/multiboot/console.h    |    0
 .../include}/grub/i386/multiboot/init.h       |    0
 .../include}/grub/i386/multiboot/kernel.h     |    0
 .../include}/grub/i386/multiboot/loader.h     |    0
 .../include}/grub/i386/multiboot/memory.h     |    0
 .../include}/grub/i386/multiboot/serial.h     |    0
 .../include}/grub/i386/multiboot/time.h       |    0
 .../include}/grub/i386/netbsd_bootinfo.h      |    0
 .../include}/grub/i386/netbsd_reboot.h        |    0
 .../include}/grub/i386/openbsd_bootarg.h      |    0
 .../include}/grub/i386/openbsd_reboot.h       |    0
 .../include}/grub/i386/pc/biosdisk.h          |    0
 .../include}/grub/i386/pc/biosnum.h           |    0
 .../include}/grub/i386/pc/boot.h              |    0
 .../include}/grub/i386/pc/chainloader.h       |    0
 .../include}/grub/i386/pc/console.h           |    0
 .../include}/grub/i386/pc/efiemu.h            |    0
 .../include}/grub/i386/pc/init.h              |    0
 .../include}/grub/i386/pc/kernel.h            |    0
 .../include}/grub/i386/pc/loader.h            |    0
 .../include}/grub/i386/pc/memory.h            |    0
 .../include}/grub/i386/pc/pxe.h               |    0
 .../include}/grub/i386/pc/time.h              |    0
 .../include}/grub/i386/pc/vbe.h               |    0
 .../include}/grub/i386/pc/vga.h               |    0
 .../include}/grub/i386/pci.h                  |    0
 .../include}/grub/i386/pit.h                  |    0
 .../include}/grub/i386/qemu/boot.h            |    0
 .../include}/grub/i386/qemu/console.h         |    0
 .../include}/grub/i386/qemu/init.h            |    0
 .../include}/grub/i386/qemu/kernel.h          |    0
 .../include}/grub/i386/qemu/loader.h          |    0
 .../include}/grub/i386/qemu/memory.h          |    0
 .../include}/grub/i386/qemu/serial.h          |    0
 .../include}/grub/i386/qemu/time.h            |    0
 .../include}/grub/i386/relocator.h            |    0
 .../include}/grub/i386/setjmp.h               |    0
 .../include}/grub/i386/time.h                 |    0
 .../include}/grub/i386/tsc.h                  |    0
 .../include}/grub/i386/types.h                |    0
 .../include}/grub/i386/vga_common.h           |    0
 .../include}/grub/i386/xnu.h                  |    0
 .../include}/grub/icon_manager.h              |    0
 .../include}/grub/ieee1275/ieee1275.h         |    0
 .../include}/grub/ieee1275/ofdisk.h           |    0
 {include => grub-core/include}/grub/kernel.h  |    0
 .../include}/grub/lib/LzFind.h                |    0
 .../include}/grub/lib/LzHash.h                |    0
 .../include}/grub/lib/LzmaDec.h               |    0
 .../include}/grub/lib/LzmaEnc.h               |    0
 .../include}/grub/lib/LzmaTypes.h             |    0
 {include => grub-core/include}/grub/lib/arg.h |    0
 {include => grub-core/include}/grub/lib/crc.h |    0
 .../include}/grub/lib/envblk.h                |    0
 .../include}/grub/lib/hexdump.h               |    0
 {include => grub-core/include}/grub/libgcc.h  |    0
 .../include}/grub/libpciaccess.h              |    0
 {include => grub-core/include}/grub/libusb.h  |    0
 {include => grub-core/include}/grub/list.h    |    0
 {include => grub-core/include}/grub/loader.h  |    0
 {include => grub-core/include}/grub/lvm.h     |    0
 {include => grub-core/include}/grub/macho.h   |    0
 .../include}/grub/machoload.h                 |    0
 {include => grub-core/include}/grub/memory.h  |    0
 {include => grub-core/include}/grub/menu.h    |    0
 .../include}/grub/menu_viewer.h               |    0
 .../include}/grub/mips/at_keyboard.h          |    0
 .../include}/grub/mips/cache.h                |    0
 .../include}/grub/mips/cmos.h                 |    0
 {include => grub-core/include}/grub/mips/io.h |    0
 .../include}/grub/mips/kernel.h               |    0
 .../include}/grub/mips/multiboot.h            |    0
 .../include}/grub/mips/pci.h                  |    0
 .../include}/grub/mips/qemu-mips/boot.h       |    0
 .../include}/grub/mips/qemu-mips/kernel.h     |    0
 .../include}/grub/mips/qemu-mips/loader.h     |    0
 .../include}/grub/mips/qemu-mips/memory.h     |    0
 .../include}/grub/mips/qemu-mips/serial.h     |    0
 .../include}/grub/mips/qemu-mips/time.h       |    0
 .../include}/grub/mips/relocator.h            |    0
 .../include}/grub/mips/setjmp.h               |    0
 .../include}/grub/mips/time.h                 |    0
 .../include}/grub/mips/types.h                |    0
 .../include}/grub/mips/yeeloong/at_keyboard.h |    0
 .../include}/grub/mips/yeeloong/boot.h        |    0
 .../include}/grub/mips/yeeloong/cmos.h        |    0
 .../include}/grub/mips/yeeloong/kernel.h      |    0
 .../include}/grub/mips/yeeloong/loader.h      |    0
 .../include}/grub/mips/yeeloong/memory.h      |    0
 .../include}/grub/mips/yeeloong/pci.h         |    0
 .../include}/grub/mips/yeeloong/serial.h      |    0
 .../include}/grub/mips/yeeloong/time.h        |    0
 {include => grub-core/include}/grub/misc.h    |    0
 {include => grub-core/include}/grub/mm.h      |    0
 .../include}/grub/msdos_partition.h           |    0
 .../include}/grub/multiboot.h                 |    0
 .../include}/grub/multiboot_loader.h          |    0
 {include => grub-core/include}/grub/net.h     |    0
 {include => grub-core/include}/grub/normal.h  |    0
 {include => grub-core/include}/grub/ntfs.h    |    0
 {include => grub-core/include}/grub/parser.h  |    0
 .../include}/grub/partition.h                 |    0
 .../include}/grub/parttool.h                  |    0
 {include => grub-core/include}/grub/pci.h     |    0
 .../include}/grub/pciutils.h                  |    0
 .../include}/grub/powerpc/ieee1275/biosdisk.h |    0
 .../include}/grub/powerpc/ieee1275/console.h  |    0
 .../include}/grub/powerpc/ieee1275/ieee1275.h |    0
 .../include}/grub/powerpc/ieee1275/kernel.h   |    0
 .../include}/grub/powerpc/ieee1275/loader.h   |    0
 .../include}/grub/powerpc/ieee1275/memory.h   |    0
 .../include}/grub/powerpc/ieee1275/time.h     |    0
 .../grub/powerpc/ieee1275/util/biosdisk.h     |    0
 .../include}/grub/powerpc/kernel.h            |    0
 .../include}/grub/powerpc/setjmp.h            |    0
 .../include}/grub/powerpc/time.h              |    0
 .../include}/grub/powerpc/types.h             |    0
 {include => grub-core/include}/grub/raid.h    |    0
 {include => grub-core/include}/grub/reader.h  |    0
 .../include}/grub/script_sh.h                 |    0
 {include => grub-core/include}/grub/scsi.h    |    0
 {include => grub-core/include}/grub/scsicmd.h |    0
 {include => grub-core/include}/grub/sdl.h     |    0
 {include => grub-core/include}/grub/search.h  |    0
 {include => grub-core/include}/grub/serial.h  |    0
 {include => grub-core/include}/grub/setjmp.h  |    0
 .../include}/grub/sparc64/ieee1275/boot.h     |    0
 .../include}/grub/sparc64/ieee1275/console.h  |    0
 .../include}/grub/sparc64/ieee1275/ieee1275.h |    0
 .../include}/grub/sparc64/ieee1275/kernel.h   |    0
 .../include}/grub/sparc64/ieee1275/loader.h   |    0
 .../include}/grub/sparc64/ieee1275/memory.h   |    0
 .../include}/grub/sparc64/ieee1275/time.h     |    0
 .../include}/grub/sparc64/kernel.h            |    0
 .../include}/grub/sparc64/setjmp.h            |    0
 .../include}/grub/sparc64/time.h              |    0
 .../include}/grub/sparc64/types.h             |    0
 {include => grub-core/include}/grub/symbol.h  |    0
 {include => grub-core/include}/grub/term.h    |    0
 .../include}/grub/terminfo.h                  |    0
 {include => grub-core/include}/grub/test.h    |    8 +-
 {include => grub-core/include}/grub/time.h    |    0
 {include => grub-core/include}/grub/tparm.h   |    0
 {include => grub-core/include}/grub/trig.h    |    0
 {include => grub-core/include}/grub/types.h   |    0
 {include => grub-core/include}/grub/usb.h     |    0
 {include => grub-core/include}/grub/usbdesc.h |    0
 .../include}/grub/usbtrans.h                  |    0
 .../include}/grub/util/deviceiter.h           |    0
 .../include}/grub/util/lvm.h                  |    0
 .../include}/grub/util/misc.h                 |   13 -
 .../include}/grub/util/ofpath.h               |    0
 .../include}/grub/util/raid.h                 |    0
 .../include}/grub/util/resolve.h              |    0
 {include => grub-core/include}/grub/video.h   |    0
 .../include}/grub/video_fb.h                  |    0
 .../include}/grub/x86_64/at_keyboard.h        |    0
 .../include}/grub/x86_64/efi/kernel.h         |    0
 .../include}/grub/x86_64/efi/loader.h         |    0
 .../include}/grub/x86_64/efi/memory.h         |    0
 .../include}/grub/x86_64/efi/serial.h         |    0
 .../include}/grub/x86_64/efi/time.h           |    0
 .../include}/grub/x86_64/io.h                 |    0
 .../include}/grub/x86_64/kernel.h             |    0
 .../include}/grub/x86_64/linux.h              |    0
 .../include}/grub/x86_64/macho.h              |    0
 .../include}/grub/x86_64/multiboot.h          |    0
 .../include}/grub/x86_64/pci.h                |    0
 .../include}/grub/x86_64/relocator.h          |    0
 .../include}/grub/x86_64/setjmp.h             |    0
 .../include}/grub/x86_64/time.h               |    0
 .../include}/grub/x86_64/types.h              |    0
 .../include}/grub/x86_64/xnu.h                |    0
 {include => grub-core/include}/grub/xnu.h     |    0
 {include => grub-core/include}/multiboot.h    |    0
 {include => grub-core/include}/multiboot2.h   |    0
 {io => grub-core/io}/bufio.c                  |    0
 {io => grub-core/io}/gzio.c                   |    0
 {kern => grub-core/kern}/command.c            |    0
 {kern => grub-core/kern}/corecmd.c            |    0
 {kern => grub-core/kern}/device.c             |    0
 {kern => grub-core/kern}/disk.c               |    0
 {kern => grub-core/kern}/dl.c                 |    6 +-
 {kern => grub-core/kern}/efi/efi.c            |    0
 {kern => grub-core/kern}/efi/init.c           |    0
 {kern => grub-core/kern}/efi/mm.c             |    0
 {kern => grub-core/kern}/elf.c                |    0
 grub-core/kern/emu/cache.S                    |   17 +
 {util => grub-core/kern/emu}/console.c        |    2 +-
 grub-core/kern/emu/dl.c                       |   19 +
 grub-core/kern/emu/dummy/dl.c                 |   51 +
 grub-core/kern/emu/dummy/symlist.c            |   26 +
 {util => grub-core/kern/emu}/getroot.c        |  109 +-
 {util => grub-core/kern/emu}/hostdisk.c       |    4 +-
 {util => grub-core/kern/emu}/hostfs.c         |    0
 grub-core/kern/emu/lite.c                     |   16 +
 util/grub-emu.c => grub-core/kern/emu/main.c  |   67 +-
 grub-core/kern/emu/misc.c                     |  199 +++
 {util => grub-core/kern/emu}/time.c           |    0
 {kern => grub-core/kern}/env.c                |    0
 {kern => grub-core/kern}/err.c                |    0
 {kern => grub-core/kern}/file.c               |    0
 {kern => grub-core/kern}/fs.c                 |    0
 {kern => grub-core/kern}/generic/millisleep.c |    0
 .../kern}/generic/rtc_get_time_ms.c           |    0
 {kern => grub-core/kern}/handler.c            |    0
 {kern => grub-core/kern}/i386/coreboot/init.c |    0
 {kern => grub-core/kern}/i386/coreboot/mmap.c |    0
 .../kern}/i386/coreboot/startup.S             |    0
 {kern => grub-core/kern}/i386/dl.c            |    0
 {kern => grub-core/kern}/i386/efi/init.c      |    0
 {kern => grub-core/kern}/i386/efi/startup.S   |    0
 {kern => grub-core/kern}/i386/halt.c          |    0
 {kern => grub-core/kern}/i386/ieee1275/init.c |    0
 .../kern}/i386/ieee1275/startup.S             |    0
 {kern => grub-core/kern}/i386/loader.S        |    0
 {kern => grub-core/kern}/i386/misc.S          |    0
 .../kern}/i386/multiboot_mmap.c               |    0
 {kern => grub-core/kern}/i386/pc/init.c       |    0
 .../kern}/i386/pc/lzma_decode.S               |    0
 {kern => grub-core/kern}/i386/pc/mmap.c       |    0
 {kern => grub-core/kern}/i386/pc/startup.S    |    0
 {kern => grub-core/kern}/i386/pit.c           |    0
 {kern => grub-core/kern}/i386/qemu/mmap.c     |    0
 {kern => grub-core/kern}/i386/qemu/startup.S  |    0
 {kern => grub-core/kern}/i386/realmode.S      |    0
 {kern => grub-core/kern}/i386/tsc.c           |    0
 {kern => grub-core/kern}/ieee1275/cmain.c     |    0
 {kern => grub-core/kern}/ieee1275/ieee1275.c  |    0
 {kern => grub-core/kern}/ieee1275/init.c      |    0
 {kern => grub-core/kern}/ieee1275/mmap.c      |    0
 {kern => grub-core/kern}/ieee1275/openfw.c    |    0
 {kern => grub-core/kern}/list.c               |    0
 {kern => grub-core/kern}/main.c               |    0
 {kern => grub-core/kern}/mips/cache.S         |    0
 {kern => grub-core/kern}/mips/cache_flush.S   |    0
 {kern => grub-core/kern}/mips/dl.c            |    0
 {kern => grub-core/kern}/mips/init.c          |    0
 .../kern}/mips/qemu-mips/init.c               |    0
 {kern => grub-core/kern}/mips/startup.S       |    0
 {kern => grub-core/kern}/mips/yeeloong/init.c |    0
 {kern => grub-core/kern}/misc.c               |    0
 {kern => grub-core/kern}/mm.c                 |    0
 {kern => grub-core/kern}/parser.c             |    0
 {kern => grub-core/kern}/partition.c          |    0
 {kern => grub-core/kern}/powerpc/cache.S      |    0
 {kern => grub-core/kern}/powerpc/dl.c         |    0
 .../kern}/powerpc/ieee1275/startup.S          |    0
 {kern => grub-core/kern}/rescue_parser.c      |    0
 {kern => grub-core/kern}/rescue_reader.c      |    0
 {kern => grub-core/kern}/sparc64/cache.S      |    0
 {kern => grub-core/kern}/sparc64/dl.c         |    0
 .../kern}/sparc64/ieee1275/crt0.S             |    0
 .../kern}/sparc64/ieee1275/ieee1275.c         |    0
 .../kern}/sparc64/ieee1275/init.c             |    0
 {kern => grub-core/kern}/term.c               |    0
 {kern => grub-core/kern}/time.c               |    0
 {kern => grub-core/kern}/x86_64/dl.c          |    0
 .../kern}/x86_64/efi/callwrap.S               |    0
 {kern => grub-core/kern}/x86_64/efi/startup.S |    0
 {lib => grub-core/lib}/LzFind.c               |    0
 {lib => grub-core/lib}/LzmaDec.c              |    0
 {lib => grub-core/lib}/LzmaEnc.c              |    0
 {lib => grub-core/lib}/arg.c                  |    0
 {lib => grub-core/lib}/charset.c              |    0
 {lib => grub-core/lib}/cmos_datetime.c        |    0
 {lib => grub-core/lib}/crc.c                  |    0
 {lib => grub-core/lib}/crypto.c               |    0
 {lib => grub-core/lib}/efi/datetime.c         |    0
 {lib => grub-core/lib}/envblk.c               |    0
 {lib => grub-core/lib}/hexdump.c              |    0
 {lib => grub-core/lib}/i386/pc/biosnum.c      |    0
 {lib => grub-core/lib}/i386/relocator.c       |    0
 {lib => grub-core/lib}/i386/relocator_asm.S   |    0
 .../lib}/i386/relocator_backward.S            |    0
 {lib => grub-core/lib}/i386/setjmp.S          |    0
 {lib => grub-core/lib}/ieee1275/datetime.c    |    0
 .../lib}/libgcrypt/cipher/ChangeLog           |    0
 {lib => grub-core/lib}/libgcrypt/cipher/ac.c  |    0
 .../lib}/libgcrypt/cipher/arcfour.c           |    0
 .../lib}/libgcrypt/cipher/bithelp.h           |    0
 .../lib}/libgcrypt/cipher/blowfish.c          |    0
 .../lib}/libgcrypt/cipher/camellia-glue.c     |    0
 .../lib}/libgcrypt/cipher/camellia.c          |    0
 .../lib}/libgcrypt/cipher/camellia.h          |    0
 .../lib}/libgcrypt/cipher/cast5.c             |    0
 .../lib}/libgcrypt/cipher/cipher.c            |    0
 {lib => grub-core/lib}/libgcrypt/cipher/crc.c |    0
 {lib => grub-core/lib}/libgcrypt/cipher/des.c |    0
 {lib => grub-core/lib}/libgcrypt/cipher/dsa.c |    0
 {lib => grub-core/lib}/libgcrypt/cipher/ecc.c |    0
 .../lib}/libgcrypt/cipher/elgamal.c           |    0
 .../lib}/libgcrypt/cipher/hash-common.c       |    0
 .../lib}/libgcrypt/cipher/hash-common.h       |    0
 .../lib}/libgcrypt/cipher/hmac-tests.c        |    0
 {lib => grub-core/lib}/libgcrypt/cipher/md.c  |    0
 {lib => grub-core/lib}/libgcrypt/cipher/md4.c |    0
 {lib => grub-core/lib}/libgcrypt/cipher/md5.c |    0
 .../lib}/libgcrypt/cipher/primegen.c          |    0
 .../lib}/libgcrypt/cipher/pubkey.c            |    0
 .../lib}/libgcrypt/cipher/rfc2268.c           |    0
 .../lib}/libgcrypt/cipher/rijndael-tables.h   |    0
 .../lib}/libgcrypt/cipher/rijndael.c          |    0
 {lib => grub-core/lib}/libgcrypt/cipher/rmd.h |    0
 .../lib}/libgcrypt/cipher/rmd160.c            |    0
 {lib => grub-core/lib}/libgcrypt/cipher/rsa.c |    0
 .../lib}/libgcrypt/cipher/seed.c              |    0
 .../lib}/libgcrypt/cipher/serpent.c           |    0
 .../lib}/libgcrypt/cipher/sha1.c              |    0
 .../lib}/libgcrypt/cipher/sha256.c            |    0
 .../lib}/libgcrypt/cipher/sha512.c            |    0
 .../lib}/libgcrypt/cipher/tiger.c             |    0
 .../lib}/libgcrypt/cipher/twofish.c           |    0
 .../lib}/libgcrypt/cipher/whirlpool.c         |    0
 .../lib}/libgcrypt_wrap/cipher_wrap.h         |    0
 {lib => grub-core/lib}/mips/relocator.c       |    0
 {lib => grub-core/lib}/mips/relocator_asm.S   |    0
 {lib => grub-core/lib}/mips/setjmp.S          |    0
 {lib => grub-core/lib}/pbkdf2.c               |    0
 {lib => grub-core/lib}/posix_wrap/assert.h    |    0
 {lib => grub-core/lib}/posix_wrap/ctype.h     |    0
 {lib => grub-core/lib}/posix_wrap/errno.h     |    0
 {lib => grub-core/lib}/posix_wrap/langinfo.h  |    0
 {lib => grub-core/lib}/posix_wrap/limits.h    |    0
 .../lib}/posix_wrap/localcharset.h            |    0
 {lib => grub-core/lib}/posix_wrap/locale.h    |    0
 {lib => grub-core/lib}/posix_wrap/stdint.h    |    0
 {lib => grub-core/lib}/posix_wrap/stdio.h     |    0
 {lib => grub-core/lib}/posix_wrap/stdlib.h    |    1 +
 {lib => grub-core/lib}/posix_wrap/string.h    |    2 +
 {lib => grub-core/lib}/posix_wrap/sys/types.h |    0
 {lib => grub-core/lib}/posix_wrap/unistd.h    |    0
 {lib => grub-core/lib}/posix_wrap/wchar.h     |    0
 {lib => grub-core/lib}/posix_wrap/wctype.h    |    0
 {lib => grub-core/lib}/powerpc/setjmp.S       |    0
 {lib => grub-core/lib}/relocator.c            |    0
 {lib => grub-core/lib}/sparc64/setjmp.S       |    0
 {lib => grub-core/lib}/x86_64/setjmp.S        |    0
 {loader => grub-core/loader}/aout.c           |    0
 .../loader}/efi/appleloader.c                 |    0
 .../loader}/efi/chainloader.c                 |    0
 {loader => grub-core/loader}/i386/bsd.c       |    0
 {loader => grub-core/loader}/i386/bsd32.c     |    0
 {loader => grub-core/loader}/i386/bsd64.c     |    0
 {loader => grub-core/loader}/i386/bsdXX.c     |    0
 .../loader}/i386/bsd_helper.S                 |    0
 .../loader}/i386/bsd_pagetable.c              |    0
 .../loader}/i386/bsd_trampoline.S             |    0
 {loader => grub-core/loader}/i386/efi/linux.c |    0
 {loader => grub-core/loader}/i386/efi/xnu.c   |    0
 .../loader}/i386/ieee1275/linux.c             |    0
 {loader => grub-core/loader}/i386/linux.c     |    0
 .../loader}/i386/linux_trampoline.S           |    0
 .../loader}/i386/multiboot_mbi.c              |    0
 .../loader}/i386/pc/chainloader.c             |    0
 {loader => grub-core/loader}/i386/pc/linux.c  |    0
 {loader => grub-core/loader}/i386/pc/xnu.c    |    0
 {loader => grub-core/loader}/i386/xnu.c       |    0
 {loader => grub-core/loader}/macho.c          |    0
 {loader => grub-core/loader}/macho32.c        |    0
 {loader => grub-core/loader}/macho64.c        |    0
 {loader => grub-core/loader}/machoXX.c        |    0
 {loader => grub-core/loader}/mips/linux.c     |    0
 {loader => grub-core/loader}/multiboot.c      |    0
 .../loader}/multiboot_elfxx.c                 |    0
 {loader => grub-core/loader}/multiboot_mbi2.c |    0
 .../loader}/powerpc/ieee1275/linux.c          |    0
 .../loader}/sparc64/ieee1275/linux.c          |    0
 {loader => grub-core/loader}/xnu.c            |    0
 {loader => grub-core/loader}/xnu_resume.c     |    0
 {mmap => grub-core/mmap}/efi/mmap.c           |    0
 {mmap => grub-core/mmap}/i386/mmap.c          |    0
 {mmap => grub-core/mmap}/i386/pc/mmap.c       |    0
 .../mmap}/i386/pc/mmap_helper.S               |    0
 {mmap => grub-core/mmap}/i386/uppermem.c      |    0
 .../mmap}/mips/yeeloong/uppermem.c            |    0
 {mmap => grub-core/mmap}/mmap.c               |    0
 grub-core/modules.def                         | 1592 +++++++++++++++++
 {normal => grub-core/normal}/auth.c           |    0
 {normal => grub-core/normal}/autofs.c         |    0
 {normal => grub-core/normal}/cmdline.c        |    0
 {normal => grub-core/normal}/color.c          |    0
 {normal => grub-core/normal}/completion.c     |    0
 {normal => grub-core/normal}/context.c        |    0
 {normal => grub-core/normal}/crypto.c         |    0
 {normal => grub-core/normal}/datetime.c       |    0
 {normal => grub-core/normal}/dyncmd.c         |    0
 {normal => grub-core/normal}/handler.c        |    0
 {normal => grub-core/normal}/main.c           |    0
 {normal => grub-core/normal}/menu.c           |    0
 {normal => grub-core/normal}/menu_entry.c     |    0
 {normal => grub-core/normal}/menu_text.c      |    0
 {normal => grub-core/normal}/misc.c           |    0
 {normal => grub-core/normal}/term.c           |    0
 {partmap => grub-core/partmap}/acorn.c        |    0
 {partmap => grub-core/partmap}/amiga.c        |    0
 {partmap => grub-core/partmap}/apple.c        |    0
 {partmap => grub-core/partmap}/bsdlabel.c     |    0
 {partmap => grub-core/partmap}/gpt.c          |    0
 {partmap => grub-core/partmap}/msdos.c        |    0
 {partmap => grub-core/partmap}/sun.c          |    0
 {partmap => grub-core/partmap}/sunpc.c        |    0
 {parttool => grub-core/parttool}/msdospart.c  |    0
 grub-core/po/Makefile.am                      |    0
 {po => grub-core/po}/POTFILES                 |    0
 {po => grub-core/po}/POTFILES-shell           |    0
 {po => grub-core/po}/README                   |    0
 {script => grub-core/script}/execute.c        |    0
 {script => grub-core/script}/function.c       |    0
 {script => grub-core/script}/lexer.c          |    0
 {script => grub-core/script}/main.c           |    0
 {script => grub-core/script}/parser.y         |    0
 {script => grub-core/script}/script.c         |    0
 {script => grub-core/script}/yylex.l          |    0
 {term => grub-core/term}/at_keyboard.c        |    0
 {term => grub-core/term}/efi/console.c        |    0
 {term => grub-core/term}/gfxterm.c            |    0
 {term => grub-core/term}/i386/pc/console.c    |    0
 {term => grub-core/term}/i386/pc/vga.c        |    0
 {term => grub-core/term}/i386/pc/vga_text.c   |    0
 {term => grub-core/term}/i386/vga_common.c    |    0
 {term => grub-core/term}/ieee1275/ofconsole.c |    0
 {term => grub-core/term}/serial.c             |    0
 {term => grub-core/term}/terminfo.c           |    0
 {term => grub-core/term}/tparm.c              |    0
 {term => grub-core/term}/usb_keyboard.c       |    0
 .../tests}/example_functional_test.c          |    2 +-
 .../tests}/lib/functional_test.c              |    0
 {tests => grub-core/tests}/lib/test.c         |    0
 {video => grub-core/video}/bitmap.c           |    0
 {video => grub-core/video}/bitmap_scale.c     |    0
 {video => grub-core/video}/efi_gop.c          |    0
 {video => grub-core/video}/efi_uga.c          |    0
 {util => grub-core/video/emu}/sdl.c           |    0
 {video => grub-core/video}/fb/fbblit.c        |    0
 {video => grub-core/video}/fb/fbfill.c        |    0
 {video => grub-core/video}/fb/fbutil.c        |    0
 {video => grub-core/video}/fb/video_fb.c      |    0
 {video => grub-core/video}/i386/pc/vbe.c      |    0
 {video => grub-core/video}/ieee1275.c         |    0
 {video => grub-core/video}/readers/jpeg.c     |    0
 {video => grub-core/video}/readers/png.c      |    0
 {video => grub-core/video}/readers/tga.c      |    0
 {video => grub-core/video}/sm712.c            |    0
 {video => grub-core/video}/video.c            |    0
 modules.def                                   |  497 +++++
 po/Makefile.am                                |    0
 tests/example_grub_script_test.in             |    2 +-
 tests/lib/unit_test.c                         |    3 +-
 tests/util/grub-shell-tester.in               |    2 +-
 tests/util/grub-shell.in                      |   10 +-
 util/elf/grub-mkimage.c                       |    1 +
 util/grub-editenv.c                           |   19 +-
 util/grub-fstest.c                            |   24 +-
 util/grub-mkdevicemap.c                       |    1 +
 util/grub-mkfont.c                            |    2 +
 util/grub-mkpasswd-pbkdf2.c                   |   32 +-
 util/grub-mkrawimage.c                        |    1 +
 util/grub-mkrelpath.c                         |    3 +-
 util/grub-mkrescue.in                         |   23 +-
 util/grub-probe.c                             |   30 +-
 util/grub-script-check.c                      |   74 +-
 util/i386/efi/grub-mkimage.c                  |    1 +
 util/i386/pc/grub-setup.c                     |   30 +-
 util/lvm.c                                    |    2 +-
 util/misc.c                                   |  354 +---
 util/raid.c                                   |    1 +
 util/resolve.c                                |    3 +-
 util/sparc64/ieee1275/grub-setup.c            |   32 +-
 810 files changed, 4980 insertions(+), 2508 deletions(-)
 create mode 100644 ABOUT-NLS
 create mode 100644 Makefile.am
 delete mode 100644 Makefile.in
 create mode 100644 configure.common
 create mode 100644 docs/Makefile.am
 delete mode 100644 geninitheader.sh
 delete mode 100644 genkernsyms.sh.in
 delete mode 100644 genmk.rb
 create mode 100644 gentpl.py
 create mode 100644 grub-core/Makefile.am
 create mode 100644 grub-core/Makefile.extra-dist
 create mode 100644 grub-core/Makefile.kernel
 create mode 100644 grub-core/Makefile.vars
 rename {boot => grub-core/boot}/i386/pc/boot.S (100%)
 rename {boot => grub-core/boot}/i386/pc/cdboot.S (100%)
 rename {boot => grub-core/boot}/i386/pc/diskboot.S (100%)
 rename {boot => grub-core/boot}/i386/pc/lnxboot.S (100%)
 rename {boot => grub-core/boot}/i386/pc/pxeboot.S (100%)
 rename {boot => grub-core/boot}/i386/qemu/boot.S (100%)
 rename {boot => grub-core/boot}/sparc64/ieee1275/boot.S (100%)
 rename {boot => grub-core/boot}/sparc64/ieee1275/diskboot.S (100%)
 rename {bus => grub-core/bus}/bonito.c (100%)
 rename {util => grub-core/bus/emu}/pci.c (98%)
 rename {bus => grub-core/bus}/pci.c (100%)
 rename {util => grub-core/bus/usb/emu}/usb.c (100%)
 rename {bus => grub-core/bus}/usb/ohci.c (100%)
 rename {bus => grub-core/bus}/usb/uhci.c (100%)
 rename {bus => grub-core/bus}/usb/usb.c (100%)
 rename {bus => grub-core/bus}/usb/usbhub.c (100%)
 rename {bus => grub-core/bus}/usb/usbtrans.c (100%)
 rename {commands => grub-core/commands}/acpi.c (100%)
 rename {commands => grub-core/commands}/blocklist.c (100%)
 rename {commands => grub-core/commands}/boot.c (100%)
 rename {commands => grub-core/commands}/cat.c (100%)
 rename {commands => grub-core/commands}/cmp.c (100%)
 rename {commands => grub-core/commands}/configfile.c (100%)
 rename {commands => grub-core/commands}/crc.c (100%)
 rename {commands => grub-core/commands}/date.c (100%)
 rename {commands => grub-core/commands}/echo.c (100%)
 rename {commands => grub-core/commands}/efi/acpi.c (100%)
 rename {commands => grub-core/commands}/efi/fixvideo.c (100%)
 rename {commands => grub-core/commands}/efi/loadbios.c (100%)
 rename {commands => grub-core/commands}/extcmd.c (100%)
 rename {commands => grub-core/commands}/gptsync.c (100%)
 rename {commands => grub-core/commands}/halt.c (100%)
 rename {commands => grub-core/commands}/handler.c (100%)
 rename {commands => grub-core/commands}/hashsum.c (100%)
 rename {commands => grub-core/commands}/hdparm.c (100%)
 rename {commands => grub-core/commands}/help.c (100%)
 rename {commands => grub-core/commands}/hexdump.c (100%)
 rename {commands => grub-core/commands}/i386/cpuid.c (100%)
 rename {commands => grub-core/commands}/i386/pc/acpi.c (100%)
 rename {commands => grub-core/commands}/i386/pc/drivemap.c (100%)
 rename {commands => grub-core/commands}/i386/pc/drivemap_int13h.S (100%)
 rename {commands => grub-core/commands}/i386/pc/halt.c (100%)
 rename {commands => grub-core/commands}/i386/pc/play.c (100%)
 rename {commands => grub-core/commands}/i386/pc/pxecmd.c (100%)
 rename {commands => grub-core/commands}/i386/pc/vbeinfo.c (100%)
 rename {commands => grub-core/commands}/i386/pc/vbetest.c (100%)
 rename {commands => grub-core/commands}/ieee1275/suspend.c (100%)
 rename {commands => grub-core/commands}/iorw.c (100%)
 rename {commands => grub-core/commands}/keystatus.c (100%)
 rename {commands => grub-core/commands}/loadenv.c (100%)
 rename {commands => grub-core/commands}/ls.c (100%)
 rename {commands => grub-core/commands}/lsmmap.c (100%)
 rename {commands => grub-core/commands}/lspci.c (100%)
 rename {commands => grub-core/commands}/memrw.c (100%)
 rename {commands => grub-core/commands}/minicmd.c (100%)
 rename {commands => grub-core/commands}/parttool.c (99%)
 rename {commands => grub-core/commands}/password.c (100%)
 rename {commands => grub-core/commands}/password_pbkdf2.c (100%)
 rename {commands => grub-core/commands}/probe.c (100%)
 rename {commands => grub-core/commands}/read.c (100%)
 rename {commands => grub-core/commands}/reboot.c (100%)
 rename {commands => grub-core/commands}/regexp.c (100%)
 rename {commands => grub-core/commands}/search.c (100%)
 rename {commands => grub-core/commands}/search_file.c (100%)
 rename {commands => grub-core/commands}/search_label.c (100%)
 rename {commands => grub-core/commands}/search_uuid.c (100%)
 rename {commands => grub-core/commands}/search_wrap.c (100%)
 rename {commands => grub-core/commands}/setpci.c (100%)
 rename {commands => grub-core/commands}/sleep.c (100%)
 rename {commands => grub-core/commands}/terminal.c (100%)
 rename {commands => grub-core/commands}/test.c (100%)
 rename {commands => grub-core/commands}/true.c (100%)
 rename {commands => grub-core/commands}/usbtest.c (100%)
 rename {commands => grub-core/commands}/videotest.c (100%)
 rename {commands => grub-core/commands}/xnu_uuid.c (100%)
 rename {conf => grub-core/conf}/any-emu.rmk (100%)
 rename {conf => grub-core/conf}/common.rmk (100%)
 rename {conf => grub-core/conf}/i386-coreboot.rmk (100%)
 rename {conf => grub-core/conf}/i386-efi.rmk (100%)
 rename {conf => grub-core/conf}/i386-ieee1275.rmk (100%)
 rename {conf => grub-core/conf}/i386-multiboot.rmk (100%)
 rename {conf => grub-core/conf}/i386-pc-cygwin-img-ld.sc (100%)
 rename {conf => grub-core/conf}/i386-pc.rmk (100%)
 rename {conf => grub-core/conf}/i386-qemu.rmk (100%)
 rename {conf => grub-core/conf}/i386.rmk (100%)
 rename {conf => grub-core/conf}/mips-qemu-mips.rmk (100%)
 rename {conf => grub-core/conf}/mips-yeeloong.rmk (100%)
 rename {conf => grub-core/conf}/mips.rmk (100%)
 rename {conf => grub-core/conf}/powerpc-ieee1275.rmk (100%)
 rename {conf => grub-core/conf}/sparc64-ieee1275.rmk (100%)
 rename {conf => grub-core/conf}/tests.rmk (100%)
 rename {conf => grub-core/conf}/x86-efi.rmk (100%)
 rename {conf => grub-core/conf}/x86_64-efi.rmk (100%)
 create mode 100644 grub-core/configure.ac
 rename {disk => grub-core/disk}/ata.c (100%)
 rename {disk => grub-core/disk}/ata_pthru.c (100%)
 rename {disk => grub-core/disk}/dmraid_nvidia.c (100%)
 rename {disk => grub-core/disk}/efi/efidisk.c (100%)
 rename {disk => grub-core/disk}/host.c (100%)
 rename {disk => grub-core/disk}/i386/pc/biosdisk.c (100%)
 rename {disk => grub-core/disk}/ieee1275/nand.c (100%)
 rename {disk => grub-core/disk}/ieee1275/ofdisk.c (100%)
 rename {disk => grub-core/disk}/loopback.c (100%)
 rename {disk => grub-core/disk}/lvm.c (100%)
 rename {disk => grub-core/disk}/mdraid_linux.c (100%)
 rename {disk => grub-core/disk}/memdisk.c (100%)
 rename {disk => grub-core/disk}/raid.c (100%)
 rename {disk => grub-core/disk}/raid5_recover.c (100%)
 rename {disk => grub-core/disk}/raid6_recover.c (100%)
 rename {disk => grub-core/disk}/scsi.c (100%)
 rename {disk => grub-core/disk}/usbms.c (100%)
 rename {efiemu => grub-core/efiemu}/i386/coredetect.c (100%)
 rename {efiemu => grub-core/efiemu}/i386/loadcore32.c (100%)
 rename {efiemu => grub-core/efiemu}/i386/loadcore64.c (100%)
 rename {efiemu => grub-core/efiemu}/i386/pc/cfgtables.c (100%)
 rename {efiemu => grub-core/efiemu}/loadcore.c (100%)
 rename {efiemu => grub-core/efiemu}/loadcore32.c (100%)
 rename {efiemu => grub-core/efiemu}/loadcore64.c (100%)
 rename {efiemu => grub-core/efiemu}/loadcore_common.c (100%)
 rename {efiemu => grub-core/efiemu}/main.c (100%)
 rename {efiemu => grub-core/efiemu}/mm.c (100%)
 rename {efiemu => grub-core/efiemu}/pnvram.c (100%)
 rename {efiemu => grub-core/efiemu}/prepare.c (100%)
 rename {efiemu => grub-core/efiemu}/prepare32.c (100%)
 rename {efiemu => grub-core/efiemu}/prepare64.c (100%)
 rename {efiemu => grub-core/efiemu}/runtime/config.h (100%)
 rename {efiemu => grub-core/efiemu}/runtime/efiemu.S (100%)
 rename {efiemu => grub-core/efiemu}/runtime/efiemu.c (100%)
 rename {efiemu => grub-core/efiemu}/runtime/efiemu.sh (100%)
 rename {efiemu => grub-core/efiemu}/symbols.c (100%)
 rename {font => grub-core/font}/font.c (100%)
 rename {font => grub-core/font}/font_cmd.c (100%)
 rename {fs => grub-core/fs}/affs.c (100%)
 rename {fs => grub-core/fs}/afs.c (100%)
 rename {fs => grub-core/fs}/afs_be.c (100%)
 rename {fs => grub-core/fs}/befs.c (100%)
 rename {fs => grub-core/fs}/befs_be.c (100%)
 rename {fs => grub-core/fs}/cpio.c (100%)
 rename {fs => grub-core/fs}/ext2.c (100%)
 rename {fs => grub-core/fs}/fat.c (100%)
 rename {fs => grub-core/fs}/fshelp.c (100%)
 rename {fs => grub-core/fs}/hfs.c (100%)
 rename {fs => grub-core/fs}/hfsplus.c (100%)
 rename {fs => grub-core/fs}/i386/pc/pxe.c (100%)
 rename {fs => grub-core/fs}/iso9660.c (100%)
 rename {fs => grub-core/fs}/jfs.c (100%)
 rename {fs => grub-core/fs}/minix.c (100%)
 rename {fs => grub-core/fs}/nilfs2.c (100%)
 rename {fs => grub-core/fs}/ntfs.c (100%)
 rename {fs => grub-core/fs}/ntfscomp.c (100%)
 rename {fs => grub-core/fs}/reiserfs.c (100%)
 rename {fs => grub-core/fs}/sfs.c (100%)
 rename {fs => grub-core/fs}/tar.c (100%)
 rename {fs => grub-core/fs}/udf.c (100%)
 rename {fs => grub-core/fs}/ufs.c (100%)
 rename {fs => grub-core/fs}/ufs2.c (100%)
 rename {fs => grub-core/fs}/xfs.c (100%)
 rename gencmdlist.sh => grub-core/gencmdlist.sh (100%)
 rename gendistlist.sh => grub-core/gendistlist.sh (100%)
 rename genemuinit.sh => grub-core/genemuinit.sh (100%)
 rename genemuinitheader.sh => grub-core/genemuinitheader.sh (100%)
 rename genfslist.sh => grub-core/genfslist.sh (100%)
 rename genhandlerlist.sh => grub-core/genhandlerlist.sh (100%)
 rename genmoddep.awk => grub-core/genmoddep.awk (93%)
 rename genmodsrc.sh => grub-core/genmodsrc.sh (100%)
 rename genpartmaplist.sh => grub-core/genpartmaplist.sh (100%)
 rename genparttoollist.sh => grub-core/genparttoollist.sh (100%)
 rename gensymlist.sh.in => grub-core/gensymlist.sh (84%)
 rename genterminallist.sh => grub-core/genterminallist.sh (100%)
 rename gentrigtables.c => grub-core/gentrigtables.c (93%)
 rename genvideolist.sh => grub-core/genvideolist.sh (100%)
 rename {gettext => grub-core/gettext}/gettext.c (100%)
 rename {gfxmenu => grub-core/gfxmenu}/gfxmenu.c (100%)
 rename {gfxmenu => grub-core/gfxmenu}/gui_box.c (100%)
 rename {gfxmenu => grub-core/gfxmenu}/gui_canvas.c (100%)
 rename {gfxmenu => grub-core/gfxmenu}/gui_circular_progress.c (100%)
 rename {gfxmenu => grub-core/gfxmenu}/gui_image.c (100%)
 rename {gfxmenu => grub-core/gfxmenu}/gui_label.c (100%)
 rename {gfxmenu => grub-core/gfxmenu}/gui_list.c (100%)
 rename {gfxmenu => grub-core/gfxmenu}/gui_progress_bar.c (100%)
 rename {gfxmenu => grub-core/gfxmenu}/gui_string_util.c (100%)
 rename {gfxmenu => grub-core/gfxmenu}/gui_util.c (100%)
 rename {gfxmenu => grub-core/gfxmenu}/icon_manager.c (100%)
 rename {gfxmenu => grub-core/gfxmenu}/model.c (100%)
 rename {gfxmenu => grub-core/gfxmenu}/named_colors.c (100%)
 rename {gfxmenu => grub-core/gfxmenu}/theme_loader.c (100%)
 rename {gfxmenu => grub-core/gfxmenu}/view.c (100%)
 rename {gfxmenu => grub-core/gfxmenu}/widget-box.c (100%)
 rename {gnulib => grub-core/gnulib}/alloca.h (100%)
 rename {gnulib => grub-core/gnulib}/argp-ba.c (100%)
 rename {gnulib => grub-core/gnulib}/argp-eexst.c (100%)
 rename {gnulib => grub-core/gnulib}/argp-fmtstream.c (100%)
 rename {gnulib => grub-core/gnulib}/argp-fmtstream.h (100%)
 rename {gnulib => grub-core/gnulib}/argp-fs-xinl.c (100%)
 rename {gnulib => grub-core/gnulib}/argp-help.c (100%)
 rename {gnulib => grub-core/gnulib}/argp-namefrob.h (100%)
 rename {gnulib => grub-core/gnulib}/argp-parse.c (100%)
 rename {gnulib => grub-core/gnulib}/argp-pin.c (100%)
 rename {gnulib => grub-core/gnulib}/argp-pv.c (100%)
 rename {gnulib => grub-core/gnulib}/argp-pvh.c (100%)
 rename {gnulib => grub-core/gnulib}/argp-version-etc.c (100%)
 rename {gnulib => grub-core/gnulib}/argp-version-etc.h (100%)
 rename {gnulib => grub-core/gnulib}/argp-xinl.c (100%)
 rename {gnulib => grub-core/gnulib}/argp.h (100%)
 rename {gnulib => grub-core/gnulib}/error.c (100%)
 rename {gnulib => grub-core/gnulib}/error.h (100%)
 rename {gnulib => grub-core/gnulib}/fnmatch.c (100%)
 rename {gnulib => grub-core/gnulib}/fnmatch.h (100%)
 rename {gnulib => grub-core/gnulib}/fnmatch_loop.c (100%)
 rename {gnulib => grub-core/gnulib}/getdelim.c (100%)
 rename {gnulib => grub-core/gnulib}/getline.c (100%)
 rename {gnulib => grub-core/gnulib}/getopt.c (100%)
 rename {gnulib => grub-core/gnulib}/getopt.h (100%)
 rename {gnulib => grub-core/gnulib}/getopt1.c (100%)
 rename {gnulib => grub-core/gnulib}/getopt_int.h (100%)
 rename {gnulib => grub-core/gnulib}/gettext.h (100%)
 rename {gnulib => grub-core/gnulib}/progname.c (100%)
 rename {gnulib => grub-core/gnulib}/progname.h (100%)
 rename {gnulib => grub-core/gnulib}/regcomp.c (100%)
 rename {gnulib => grub-core/gnulib}/regex.c (100%)
 rename {gnulib => grub-core/gnulib}/regex.h (100%)
 rename {gnulib => grub-core/gnulib}/regex_internal.c (100%)
 rename {gnulib => grub-core/gnulib}/regex_internal.h (100%)
 rename {gnulib => grub-core/gnulib}/regexec.c (100%)
 rename {hello => grub-core/hello}/hello.c (100%)
 rename {hook => grub-core/hook}/datehook.c (100%)
 rename {util => grub-core}/import_gcry.py (100%)
 rename {include => grub-core/include}/grub/acorn_filecore.h (100%)
 rename {include => grub-core/include}/grub/acpi.h (100%)
 rename {include => grub-core/include}/grub/aout.h (100%)
 rename {include => grub-core/include}/grub/at_keyboard.h (100%)
 rename {include => grub-core/include}/grub/ata.h (100%)
 rename {include => grub-core/include}/grub/auth.h (100%)
 rename {include => grub-core/include}/grub/autoefi.h (100%)
 rename {include => grub-core/include}/grub/bitmap.h (100%)
 rename {include => grub-core/include}/grub/bitmap_scale.h (100%)
 rename {include => grub-core/include}/grub/boot.h (100%)
 rename {include => grub-core/include}/grub/bsdlabel.h (100%)
 rename {include => grub-core/include}/grub/bufio.h (100%)
 rename {include => grub-core/include}/grub/cache.h (100%)
 rename {include => grub-core/include}/grub/charset.h (100%)
 rename {include => grub-core/include}/grub/cmos.h (100%)
 rename {include => grub-core/include}/grub/command.h (100%)
 rename {include => grub-core/include}/grub/crypto.h (100%)
 rename {include => grub-core/include}/grub/datetime.h (100%)
 rename {include => grub-core/include}/grub/device.h (100%)
 rename {include => grub-core/include}/grub/disk.h (100%)
 rename {include => grub-core/include}/grub/dl.h (90%)
 rename {include => grub-core/include}/grub/efi/api.h (100%)
 rename {include => grub-core/include}/grub/efi/console.h (100%)
 rename {include => grub-core/include}/grub/efi/console_control.h (100%)
 rename {include => grub-core/include}/grub/efi/disk.h (100%)
 rename {include => grub-core/include}/grub/efi/efi.h (100%)
 rename {include => grub-core/include}/grub/efi/graphics_output.h (100%)
 rename {include => grub-core/include}/grub/efi/memory.h (100%)
 rename {include => grub-core/include}/grub/efi/pe32.h (100%)
 rename {include => grub-core/include}/grub/efi/time.h (100%)
 rename {include => grub-core/include}/grub/efi/uga_draw.h (100%)
 rename {include => grub-core/include}/grub/efiemu/efiemu.h (100%)
 rename {include => grub-core/include}/grub/efiemu/runtime.h (100%)
 rename {include => grub-core/include}/grub/elf.h (100%)
 rename {include => grub-core/include}/grub/elfload.h (100%)
 rename {include/grub/util => grub-core/include/grub/emu}/console.h (100%)
 rename {include/grub/util => grub-core/include/grub/emu}/getroot.h (94%)
 rename {include/grub/util => grub-core/include/grub/emu}/hostdisk.h (100%)
 create mode 100644 grub-core/include/grub/emu/misc.h
 rename {include => grub-core/include}/grub/env.h (100%)
 rename {include => grub-core/include}/grub/env_private.h (100%)
 rename {include => grub-core/include}/grub/err.h (100%)
 rename {include => grub-core/include}/grub/extcmd.h (100%)
 rename {include => grub-core/include}/grub/fbblit.h (100%)
 rename {include => grub-core/include}/grub/fbfill.h (100%)
 rename {include => grub-core/include}/grub/fbutil.h (100%)
 rename {include => grub-core/include}/grub/file.h (100%)
 rename {include => grub-core/include}/grub/font.h (100%)
 rename {include => grub-core/include}/grub/fontformat.h (100%)
 rename {include => grub-core/include}/grub/fs.h (100%)
 rename {include => grub-core/include}/grub/fshelp.h (100%)
 rename {include => grub-core/include}/grub/gfxmenu_model.h (100%)
 rename {include => grub-core/include}/grub/gfxmenu_view.h (100%)
 rename {include => grub-core/include}/grub/gfxterm.h (100%)
 rename {include => grub-core/include}/grub/gfxwidgets.h (100%)
 rename {include => grub-core/include}/grub/gpt_partition.h (100%)
 rename {include => grub-core/include}/grub/gui.h (100%)
 rename {include => grub-core/include}/grub/gui_string_util.h (100%)
 rename {include => grub-core/include}/grub/gzio.h (100%)
 rename {include => grub-core/include}/grub/handler.h (100%)
 rename {include => grub-core/include}/grub/hfs.h (100%)
 rename {include => grub-core/include}/grub/i18n.h (100%)
 rename {include => grub-core/include}/grub/i386/at_keyboard.h (100%)
 rename {include => grub-core/include}/grub/i386/bsd.h (100%)
 rename {include => grub-core/include}/grub/i386/cmos.h (100%)
 rename {include => grub-core/include}/grub/i386/coreboot/boot.h (100%)
 rename {include => grub-core/include}/grub/i386/coreboot/console.h (100%)
 rename {include => grub-core/include}/grub/i386/coreboot/init.h (100%)
 rename {include => grub-core/include}/grub/i386/coreboot/kernel.h (100%)
 rename {include => grub-core/include}/grub/i386/coreboot/loader.h (100%)
 rename {include => grub-core/include}/grub/i386/coreboot/memory.h (100%)
 rename {include => grub-core/include}/grub/i386/coreboot/serial.h (100%)
 rename {include => grub-core/include}/grub/i386/coreboot/time.h (100%)
 rename {include => grub-core/include}/grub/i386/cpuid.h (100%)
 rename {include => grub-core/include}/grub/i386/efi/kernel.h (100%)
 rename {include => grub-core/include}/grub/i386/efi/loader.h (100%)
 rename {include => grub-core/include}/grub/i386/efi/memory.h (100%)
 rename {include => grub-core/include}/grub/i386/efi/serial.h (100%)
 rename {include => grub-core/include}/grub/i386/efi/time.h (100%)
 rename {include => grub-core/include}/grub/i386/efiemu.h (100%)
 rename {include => grub-core/include}/grub/i386/freebsd_linker.h (100%)
 rename {include => grub-core/include}/grub/i386/freebsd_reboot.h (100%)
 rename {include => grub-core/include}/grub/i386/ieee1275/console.h (100%)
 rename {include => grub-core/include}/grub/i386/ieee1275/ieee1275.h (100%)
 rename {include => grub-core/include}/grub/i386/ieee1275/kernel.h (100%)
 rename {include => grub-core/include}/grub/i386/ieee1275/loader.h (100%)
 rename {include => grub-core/include}/grub/i386/ieee1275/memory.h (100%)
 rename {include => grub-core/include}/grub/i386/ieee1275/serial.h (100%)
 rename {include => grub-core/include}/grub/i386/ieee1275/time.h (100%)
 rename {include => grub-core/include}/grub/i386/io.h (100%)
 rename {include => grub-core/include}/grub/i386/kernel.h (100%)
 rename {include => grub-core/include}/grub/i386/linux.h (100%)
 rename {include => grub-core/include}/grub/i386/loader.h (100%)
 rename {include => grub-core/include}/grub/i386/macho.h (100%)
 rename {include => grub-core/include}/grub/i386/memory.h (100%)
 rename {include => grub-core/include}/grub/i386/multiboot.h (100%)
 rename {include => grub-core/include}/grub/i386/multiboot/boot.h (100%)
 rename {include => grub-core/include}/grub/i386/multiboot/console.h (100%)
 rename {include => grub-core/include}/grub/i386/multiboot/init.h (100%)
 rename {include => grub-core/include}/grub/i386/multiboot/kernel.h (100%)
 rename {include => grub-core/include}/grub/i386/multiboot/loader.h (100%)
 rename {include => grub-core/include}/grub/i386/multiboot/memory.h (100%)
 rename {include => grub-core/include}/grub/i386/multiboot/serial.h (100%)
 rename {include => grub-core/include}/grub/i386/multiboot/time.h (100%)
 rename {include => grub-core/include}/grub/i386/netbsd_bootinfo.h (100%)
 rename {include => grub-core/include}/grub/i386/netbsd_reboot.h (100%)
 rename {include => grub-core/include}/grub/i386/openbsd_bootarg.h (100%)
 rename {include => grub-core/include}/grub/i386/openbsd_reboot.h (100%)
 rename {include => grub-core/include}/grub/i386/pc/biosdisk.h (100%)
 rename {include => grub-core/include}/grub/i386/pc/biosnum.h (100%)
 rename {include => grub-core/include}/grub/i386/pc/boot.h (100%)
 rename {include => grub-core/include}/grub/i386/pc/chainloader.h (100%)
 rename {include => grub-core/include}/grub/i386/pc/console.h (100%)
 rename {include => grub-core/include}/grub/i386/pc/efiemu.h (100%)
 rename {include => grub-core/include}/grub/i386/pc/init.h (100%)
 rename {include => grub-core/include}/grub/i386/pc/kernel.h (100%)
 rename {include => grub-core/include}/grub/i386/pc/loader.h (100%)
 rename {include => grub-core/include}/grub/i386/pc/memory.h (100%)
 rename {include => grub-core/include}/grub/i386/pc/pxe.h (100%)
 rename {include => grub-core/include}/grub/i386/pc/time.h (100%)
 rename {include => grub-core/include}/grub/i386/pc/vbe.h (100%)
 rename {include => grub-core/include}/grub/i386/pc/vga.h (100%)
 rename {include => grub-core/include}/grub/i386/pci.h (100%)
 rename {include => grub-core/include}/grub/i386/pit.h (100%)
 rename {include => grub-core/include}/grub/i386/qemu/boot.h (100%)
 rename {include => grub-core/include}/grub/i386/qemu/console.h (100%)
 rename {include => grub-core/include}/grub/i386/qemu/init.h (100%)
 rename {include => grub-core/include}/grub/i386/qemu/kernel.h (100%)
 rename {include => grub-core/include}/grub/i386/qemu/loader.h (100%)
 rename {include => grub-core/include}/grub/i386/qemu/memory.h (100%)
 rename {include => grub-core/include}/grub/i386/qemu/serial.h (100%)
 rename {include => grub-core/include}/grub/i386/qemu/time.h (100%)
 rename {include => grub-core/include}/grub/i386/relocator.h (100%)
 rename {include => grub-core/include}/grub/i386/setjmp.h (100%)
 rename {include => grub-core/include}/grub/i386/time.h (100%)
 rename {include => grub-core/include}/grub/i386/tsc.h (100%)
 rename {include => grub-core/include}/grub/i386/types.h (100%)
 rename {include => grub-core/include}/grub/i386/vga_common.h (100%)
 rename {include => grub-core/include}/grub/i386/xnu.h (100%)
 rename {include => grub-core/include}/grub/icon_manager.h (100%)
 rename {include => grub-core/include}/grub/ieee1275/ieee1275.h (100%)
 rename {include => grub-core/include}/grub/ieee1275/ofdisk.h (100%)
 rename {include => grub-core/include}/grub/kernel.h (100%)
 rename {include => grub-core/include}/grub/lib/LzFind.h (100%)
 rename {include => grub-core/include}/grub/lib/LzHash.h (100%)
 rename {include => grub-core/include}/grub/lib/LzmaDec.h (100%)
 rename {include => grub-core/include}/grub/lib/LzmaEnc.h (100%)
 rename {include => grub-core/include}/grub/lib/LzmaTypes.h (100%)
 rename {include => grub-core/include}/grub/lib/arg.h (100%)
 rename {include => grub-core/include}/grub/lib/crc.h (100%)
 rename {include => grub-core/include}/grub/lib/envblk.h (100%)
 rename {include => grub-core/include}/grub/lib/hexdump.h (100%)
 rename {include => grub-core/include}/grub/libgcc.h (100%)
 rename {include => grub-core/include}/grub/libpciaccess.h (100%)
 rename {include => grub-core/include}/grub/libusb.h (100%)
 rename {include => grub-core/include}/grub/list.h (100%)
 rename {include => grub-core/include}/grub/loader.h (100%)
 rename {include => grub-core/include}/grub/lvm.h (100%)
 rename {include => grub-core/include}/grub/macho.h (100%)
 rename {include => grub-core/include}/grub/machoload.h (100%)
 rename {include => grub-core/include}/grub/memory.h (100%)
 rename {include => grub-core/include}/grub/menu.h (100%)
 rename {include => grub-core/include}/grub/menu_viewer.h (100%)
 rename {include => grub-core/include}/grub/mips/at_keyboard.h (100%)
 rename {include => grub-core/include}/grub/mips/cache.h (100%)
 rename {include => grub-core/include}/grub/mips/cmos.h (100%)
 rename {include => grub-core/include}/grub/mips/io.h (100%)
 rename {include => grub-core/include}/grub/mips/kernel.h (100%)
 rename {include => grub-core/include}/grub/mips/multiboot.h (100%)
 rename {include => grub-core/include}/grub/mips/pci.h (100%)
 rename {include => grub-core/include}/grub/mips/qemu-mips/boot.h (100%)
 rename {include => grub-core/include}/grub/mips/qemu-mips/kernel.h (100%)
 rename {include => grub-core/include}/grub/mips/qemu-mips/loader.h (100%)
 rename {include => grub-core/include}/grub/mips/qemu-mips/memory.h (100%)
 rename {include => grub-core/include}/grub/mips/qemu-mips/serial.h (100%)
 rename {include => grub-core/include}/grub/mips/qemu-mips/time.h (100%)
 rename {include => grub-core/include}/grub/mips/relocator.h (100%)
 rename {include => grub-core/include}/grub/mips/setjmp.h (100%)
 rename {include => grub-core/include}/grub/mips/time.h (100%)
 rename {include => grub-core/include}/grub/mips/types.h (100%)
 rename {include => grub-core/include}/grub/mips/yeeloong/at_keyboard.h (100%)
 rename {include => grub-core/include}/grub/mips/yeeloong/boot.h (100%)
 rename {include => grub-core/include}/grub/mips/yeeloong/cmos.h (100%)
 rename {include => grub-core/include}/grub/mips/yeeloong/kernel.h (100%)
 rename {include => grub-core/include}/grub/mips/yeeloong/loader.h (100%)
 rename {include => grub-core/include}/grub/mips/yeeloong/memory.h (100%)
 rename {include => grub-core/include}/grub/mips/yeeloong/pci.h (100%)
 rename {include => grub-core/include}/grub/mips/yeeloong/serial.h (100%)
 rename {include => grub-core/include}/grub/mips/yeeloong/time.h (100%)
 rename {include => grub-core/include}/grub/misc.h (100%)
 rename {include => grub-core/include}/grub/mm.h (100%)
 rename {include => grub-core/include}/grub/msdos_partition.h (100%)
 rename {include => grub-core/include}/grub/multiboot.h (100%)
 rename {include => grub-core/include}/grub/multiboot_loader.h (100%)
 rename {include => grub-core/include}/grub/net.h (100%)
 rename {include => grub-core/include}/grub/normal.h (100%)
 rename {include => grub-core/include}/grub/ntfs.h (100%)
 rename {include => grub-core/include}/grub/parser.h (100%)
 rename {include => grub-core/include}/grub/partition.h (100%)
 rename {include => grub-core/include}/grub/parttool.h (100%)
 rename {include => grub-core/include}/grub/pci.h (100%)
 rename {include => grub-core/include}/grub/pciutils.h (100%)
 rename {include => grub-core/include}/grub/powerpc/ieee1275/biosdisk.h (100%)
 rename {include => grub-core/include}/grub/powerpc/ieee1275/console.h (100%)
 rename {include => grub-core/include}/grub/powerpc/ieee1275/ieee1275.h (100%)
 rename {include => grub-core/include}/grub/powerpc/ieee1275/kernel.h (100%)
 rename {include => grub-core/include}/grub/powerpc/ieee1275/loader.h (100%)
 rename {include => grub-core/include}/grub/powerpc/ieee1275/memory.h (100%)
 rename {include => grub-core/include}/grub/powerpc/ieee1275/time.h (100%)
 rename {include => grub-core/include}/grub/powerpc/ieee1275/util/biosdisk.h (100%)
 rename {include => grub-core/include}/grub/powerpc/kernel.h (100%)
 rename {include => grub-core/include}/grub/powerpc/setjmp.h (100%)
 rename {include => grub-core/include}/grub/powerpc/time.h (100%)
 rename {include => grub-core/include}/grub/powerpc/types.h (100%)
 rename {include => grub-core/include}/grub/raid.h (100%)
 rename {include => grub-core/include}/grub/reader.h (100%)
 rename {include => grub-core/include}/grub/script_sh.h (100%)
 rename {include => grub-core/include}/grub/scsi.h (100%)
 rename {include => grub-core/include}/grub/scsicmd.h (100%)
 rename {include => grub-core/include}/grub/sdl.h (100%)
 rename {include => grub-core/include}/grub/search.h (100%)
 rename {include => grub-core/include}/grub/serial.h (100%)
 rename {include => grub-core/include}/grub/setjmp.h (100%)
 rename {include => grub-core/include}/grub/sparc64/ieee1275/boot.h (100%)
 rename {include => grub-core/include}/grub/sparc64/ieee1275/console.h (100%)
 rename {include => grub-core/include}/grub/sparc64/ieee1275/ieee1275.h (100%)
 rename {include => grub-core/include}/grub/sparc64/ieee1275/kernel.h (100%)
 rename {include => grub-core/include}/grub/sparc64/ieee1275/loader.h (100%)
 rename {include => grub-core/include}/grub/sparc64/ieee1275/memory.h (100%)
 rename {include => grub-core/include}/grub/sparc64/ieee1275/time.h (100%)
 rename {include => grub-core/include}/grub/sparc64/kernel.h (100%)
 rename {include => grub-core/include}/grub/sparc64/setjmp.h (100%)
 rename {include => grub-core/include}/grub/sparc64/time.h (100%)
 rename {include => grub-core/include}/grub/sparc64/types.h (100%)
 rename {include => grub-core/include}/grub/symbol.h (100%)
 rename {include => grub-core/include}/grub/term.h (100%)
 rename {include => grub-core/include}/grub/terminfo.h (100%)
 rename {include => grub-core/include}/grub/test.h (93%)
 rename {include => grub-core/include}/grub/time.h (100%)
 rename {include => grub-core/include}/grub/tparm.h (100%)
 rename {include => grub-core/include}/grub/trig.h (100%)
 rename {include => grub-core/include}/grub/types.h (100%)
 rename {include => grub-core/include}/grub/usb.h (100%)
 rename {include => grub-core/include}/grub/usbdesc.h (100%)
 rename {include => grub-core/include}/grub/usbtrans.h (100%)
 rename {include => grub-core/include}/grub/util/deviceiter.h (100%)
 rename {include => grub-core/include}/grub/util/lvm.h (100%)
 rename {include => grub-core/include}/grub/util/misc.h (85%)
 rename {include => grub-core/include}/grub/util/ofpath.h (100%)
 rename {include => grub-core/include}/grub/util/raid.h (100%)
 rename {include => grub-core/include}/grub/util/resolve.h (100%)
 rename {include => grub-core/include}/grub/video.h (100%)
 rename {include => grub-core/include}/grub/video_fb.h (100%)
 rename {include => grub-core/include}/grub/x86_64/at_keyboard.h (100%)
 rename {include => grub-core/include}/grub/x86_64/efi/kernel.h (100%)
 rename {include => grub-core/include}/grub/x86_64/efi/loader.h (100%)
 rename {include => grub-core/include}/grub/x86_64/efi/memory.h (100%)
 rename {include => grub-core/include}/grub/x86_64/efi/serial.h (100%)
 rename {include => grub-core/include}/grub/x86_64/efi/time.h (100%)
 rename {include => grub-core/include}/grub/x86_64/io.h (100%)
 rename {include => grub-core/include}/grub/x86_64/kernel.h (100%)
 rename {include => grub-core/include}/grub/x86_64/linux.h (100%)
 rename {include => grub-core/include}/grub/x86_64/macho.h (100%)
 rename {include => grub-core/include}/grub/x86_64/multiboot.h (100%)
 rename {include => grub-core/include}/grub/x86_64/pci.h (100%)
 rename {include => grub-core/include}/grub/x86_64/relocator.h (100%)
 rename {include => grub-core/include}/grub/x86_64/setjmp.h (100%)
 rename {include => grub-core/include}/grub/x86_64/time.h (100%)
 rename {include => grub-core/include}/grub/x86_64/types.h (100%)
 rename {include => grub-core/include}/grub/x86_64/xnu.h (100%)
 rename {include => grub-core/include}/grub/xnu.h (100%)
 rename {include => grub-core/include}/multiboot.h (100%)
 rename {include => grub-core/include}/multiboot2.h (100%)
 rename {io => grub-core/io}/bufio.c (100%)
 rename {io => grub-core/io}/gzio.c (100%)
 rename {kern => grub-core/kern}/command.c (100%)
 rename {kern => grub-core/kern}/corecmd.c (100%)
 rename {kern => grub-core/kern}/device.c (100%)
 rename {kern => grub-core/kern}/disk.c (100%)
 rename {kern => grub-core/kern}/dl.c (99%)
 rename {kern => grub-core/kern}/efi/efi.c (100%)
 rename {kern => grub-core/kern}/efi/init.c (100%)
 rename {kern => grub-core/kern}/efi/mm.c (100%)
 rename {kern => grub-core/kern}/elf.c (100%)
 create mode 100644 grub-core/kern/emu/cache.S
 rename {util => grub-core/kern/emu}/console.c (99%)
 create mode 100644 grub-core/kern/emu/dl.c
 create mode 100644 grub-core/kern/emu/dummy/dl.c
 create mode 100644 grub-core/kern/emu/dummy/symlist.c
 rename {util => grub-core/kern/emu}/getroot.c (82%)
 rename {util => grub-core/kern/emu}/hostdisk.c (99%)
 rename {util => grub-core/kern/emu}/hostfs.c (100%)
 create mode 100644 grub-core/kern/emu/lite.c
 rename util/grub-emu.c => grub-core/kern/emu/main.c (90%)
 create mode 100644 grub-core/kern/emu/misc.c
 rename {util => grub-core/kern/emu}/time.c (100%)
 rename {kern => grub-core/kern}/env.c (100%)
 rename {kern => grub-core/kern}/err.c (100%)
 rename {kern => grub-core/kern}/file.c (100%)
 rename {kern => grub-core/kern}/fs.c (100%)
 rename {kern => grub-core/kern}/generic/millisleep.c (100%)
 rename {kern => grub-core/kern}/generic/rtc_get_time_ms.c (100%)
 rename {kern => grub-core/kern}/handler.c (100%)
 rename {kern => grub-core/kern}/i386/coreboot/init.c (100%)
 rename {kern => grub-core/kern}/i386/coreboot/mmap.c (100%)
 rename {kern => grub-core/kern}/i386/coreboot/startup.S (100%)
 rename {kern => grub-core/kern}/i386/dl.c (100%)
 rename {kern => grub-core/kern}/i386/efi/init.c (100%)
 rename {kern => grub-core/kern}/i386/efi/startup.S (100%)
 rename {kern => grub-core/kern}/i386/halt.c (100%)
 rename {kern => grub-core/kern}/i386/ieee1275/init.c (100%)
 rename {kern => grub-core/kern}/i386/ieee1275/startup.S (100%)
 rename {kern => grub-core/kern}/i386/loader.S (100%)
 rename {kern => grub-core/kern}/i386/misc.S (100%)
 rename {kern => grub-core/kern}/i386/multiboot_mmap.c (100%)
 rename {kern => grub-core/kern}/i386/pc/init.c (100%)
 rename {kern => grub-core/kern}/i386/pc/lzma_decode.S (100%)
 rename {kern => grub-core/kern}/i386/pc/mmap.c (100%)
 rename {kern => grub-core/kern}/i386/pc/startup.S (100%)
 rename {kern => grub-core/kern}/i386/pit.c (100%)
 rename {kern => grub-core/kern}/i386/qemu/mmap.c (100%)
 rename {kern => grub-core/kern}/i386/qemu/startup.S (100%)
 rename {kern => grub-core/kern}/i386/realmode.S (100%)
 rename {kern => grub-core/kern}/i386/tsc.c (100%)
 rename {kern => grub-core/kern}/ieee1275/cmain.c (100%)
 rename {kern => grub-core/kern}/ieee1275/ieee1275.c (100%)
 rename {kern => grub-core/kern}/ieee1275/init.c (100%)
 rename {kern => grub-core/kern}/ieee1275/mmap.c (100%)
 rename {kern => grub-core/kern}/ieee1275/openfw.c (100%)
 rename {kern => grub-core/kern}/list.c (100%)
 rename {kern => grub-core/kern}/main.c (100%)
 rename {kern => grub-core/kern}/mips/cache.S (100%)
 rename {kern => grub-core/kern}/mips/cache_flush.S (100%)
 rename {kern => grub-core/kern}/mips/dl.c (100%)
 rename {kern => grub-core/kern}/mips/init.c (100%)
 rename {kern => grub-core/kern}/mips/qemu-mips/init.c (100%)
 rename {kern => grub-core/kern}/mips/startup.S (100%)
 rename {kern => grub-core/kern}/mips/yeeloong/init.c (100%)
 rename {kern => grub-core/kern}/misc.c (100%)
 rename {kern => grub-core/kern}/mm.c (100%)
 rename {kern => grub-core/kern}/parser.c (100%)
 rename {kern => grub-core/kern}/partition.c (100%)
 rename {kern => grub-core/kern}/powerpc/cache.S (100%)
 rename {kern => grub-core/kern}/powerpc/dl.c (100%)
 rename {kern => grub-core/kern}/powerpc/ieee1275/startup.S (100%)
 rename {kern => grub-core/kern}/rescue_parser.c (100%)
 rename {kern => grub-core/kern}/rescue_reader.c (100%)
 rename {kern => grub-core/kern}/sparc64/cache.S (100%)
 rename {kern => grub-core/kern}/sparc64/dl.c (100%)
 rename {kern => grub-core/kern}/sparc64/ieee1275/crt0.S (100%)
 rename {kern => grub-core/kern}/sparc64/ieee1275/ieee1275.c (100%)
 rename {kern => grub-core/kern}/sparc64/ieee1275/init.c (100%)
 rename {kern => grub-core/kern}/term.c (100%)
 rename {kern => grub-core/kern}/time.c (100%)
 rename {kern => grub-core/kern}/x86_64/dl.c (100%)
 rename {kern => grub-core/kern}/x86_64/efi/callwrap.S (100%)
 rename {kern => grub-core/kern}/x86_64/efi/startup.S (100%)
 rename {lib => grub-core/lib}/LzFind.c (100%)
 rename {lib => grub-core/lib}/LzmaDec.c (100%)
 rename {lib => grub-core/lib}/LzmaEnc.c (100%)
 rename {lib => grub-core/lib}/arg.c (100%)
 rename {lib => grub-core/lib}/charset.c (100%)
 rename {lib => grub-core/lib}/cmos_datetime.c (100%)
 rename {lib => grub-core/lib}/crc.c (100%)
 rename {lib => grub-core/lib}/crypto.c (100%)
 rename {lib => grub-core/lib}/efi/datetime.c (100%)
 rename {lib => grub-core/lib}/envblk.c (100%)
 rename {lib => grub-core/lib}/hexdump.c (100%)
 rename {lib => grub-core/lib}/i386/pc/biosnum.c (100%)
 rename {lib => grub-core/lib}/i386/relocator.c (100%)
 rename {lib => grub-core/lib}/i386/relocator_asm.S (100%)
 rename {lib => grub-core/lib}/i386/relocator_backward.S (100%)
 rename {lib => grub-core/lib}/i386/setjmp.S (100%)
 rename {lib => grub-core/lib}/ieee1275/datetime.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/ChangeLog (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/ac.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/arcfour.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/bithelp.h (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/blowfish.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/camellia-glue.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/camellia.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/camellia.h (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/cast5.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/cipher.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/crc.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/des.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/dsa.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/ecc.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/elgamal.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/hash-common.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/hash-common.h (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/hmac-tests.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/md.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/md4.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/md5.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/primegen.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/pubkey.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/rfc2268.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/rijndael-tables.h (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/rijndael.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/rmd.h (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/rmd160.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/rsa.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/seed.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/serpent.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/sha1.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/sha256.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/sha512.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/tiger.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/twofish.c (100%)
 rename {lib => grub-core/lib}/libgcrypt/cipher/whirlpool.c (100%)
 rename {lib => grub-core/lib}/libgcrypt_wrap/cipher_wrap.h (100%)
 rename {lib => grub-core/lib}/mips/relocator.c (100%)
 rename {lib => grub-core/lib}/mips/relocator_asm.S (100%)
 rename {lib => grub-core/lib}/mips/setjmp.S (100%)
 rename {lib => grub-core/lib}/pbkdf2.c (100%)
 rename {lib => grub-core/lib}/posix_wrap/assert.h (100%)
 rename {lib => grub-core/lib}/posix_wrap/ctype.h (100%)
 rename {lib => grub-core/lib}/posix_wrap/errno.h (100%)
 rename {lib => grub-core/lib}/posix_wrap/langinfo.h (100%)
 rename {lib => grub-core/lib}/posix_wrap/limits.h (100%)
 rename {lib => grub-core/lib}/posix_wrap/localcharset.h (100%)
 rename {lib => grub-core/lib}/posix_wrap/locale.h (100%)
 rename {lib => grub-core/lib}/posix_wrap/stdint.h (100%)
 rename {lib => grub-core/lib}/posix_wrap/stdio.h (100%)
 rename {lib => grub-core/lib}/posix_wrap/stdlib.h (98%)
 rename {lib => grub-core/lib}/posix_wrap/string.h (97%)
 rename {lib => grub-core/lib}/posix_wrap/sys/types.h (100%)
 rename {lib => grub-core/lib}/posix_wrap/unistd.h (100%)
 rename {lib => grub-core/lib}/posix_wrap/wchar.h (100%)
 rename {lib => grub-core/lib}/posix_wrap/wctype.h (100%)
 rename {lib => grub-core/lib}/powerpc/setjmp.S (100%)
 rename {lib => grub-core/lib}/relocator.c (100%)
 rename {lib => grub-core/lib}/sparc64/setjmp.S (100%)
 rename {lib => grub-core/lib}/x86_64/setjmp.S (100%)
 rename {loader => grub-core/loader}/aout.c (100%)
 rename {loader => grub-core/loader}/efi/appleloader.c (100%)
 rename {loader => grub-core/loader}/efi/chainloader.c (100%)
 rename {loader => grub-core/loader}/i386/bsd.c (100%)
 rename {loader => grub-core/loader}/i386/bsd32.c (100%)
 rename {loader => grub-core/loader}/i386/bsd64.c (100%)
 rename {loader => grub-core/loader}/i386/bsdXX.c (100%)
 rename {loader => grub-core/loader}/i386/bsd_helper.S (100%)
 rename {loader => grub-core/loader}/i386/bsd_pagetable.c (100%)
 rename {loader => grub-core/loader}/i386/bsd_trampoline.S (100%)
 rename {loader => grub-core/loader}/i386/efi/linux.c (100%)
 rename {loader => grub-core/loader}/i386/efi/xnu.c (100%)
 rename {loader => grub-core/loader}/i386/ieee1275/linux.c (100%)
 rename {loader => grub-core/loader}/i386/linux.c (100%)
 rename {loader => grub-core/loader}/i386/linux_trampoline.S (100%)
 rename {loader => grub-core/loader}/i386/multiboot_mbi.c (100%)
 rename {loader => grub-core/loader}/i386/pc/chainloader.c (100%)
 rename {loader => grub-core/loader}/i386/pc/linux.c (100%)
 rename {loader => grub-core/loader}/i386/pc/xnu.c (100%)
 rename {loader => grub-core/loader}/i386/xnu.c (100%)
 rename {loader => grub-core/loader}/macho.c (100%)
 rename {loader => grub-core/loader}/macho32.c (100%)
 rename {loader => grub-core/loader}/macho64.c (100%)
 rename {loader => grub-core/loader}/machoXX.c (100%)
 rename {loader => grub-core/loader}/mips/linux.c (100%)
 rename {loader => grub-core/loader}/multiboot.c (100%)
 rename {loader => grub-core/loader}/multiboot_elfxx.c (100%)
 rename {loader => grub-core/loader}/multiboot_mbi2.c (100%)
 rename {loader => grub-core/loader}/powerpc/ieee1275/linux.c (100%)
 rename {loader => grub-core/loader}/sparc64/ieee1275/linux.c (100%)
 rename {loader => grub-core/loader}/xnu.c (100%)
 rename {loader => grub-core/loader}/xnu_resume.c (100%)
 rename {mmap => grub-core/mmap}/efi/mmap.c (100%)
 rename {mmap => grub-core/mmap}/i386/mmap.c (100%)
 rename {mmap => grub-core/mmap}/i386/pc/mmap.c (100%)
 rename {mmap => grub-core/mmap}/i386/pc/mmap_helper.S (100%)
 rename {mmap => grub-core/mmap}/i386/uppermem.c (100%)
 rename {mmap => grub-core/mmap}/mips/yeeloong/uppermem.c (100%)
 rename {mmap => grub-core/mmap}/mmap.c (100%)
 create mode 100644 grub-core/modules.def
 rename {normal => grub-core/normal}/auth.c (100%)
 rename {normal => grub-core/normal}/autofs.c (100%)
 rename {normal => grub-core/normal}/cmdline.c (100%)
 rename {normal => grub-core/normal}/color.c (100%)
 rename {normal => grub-core/normal}/completion.c (100%)
 rename {normal => grub-core/normal}/context.c (100%)
 rename {normal => grub-core/normal}/crypto.c (100%)
 rename {normal => grub-core/normal}/datetime.c (100%)
 rename {normal => grub-core/normal}/dyncmd.c (100%)
 rename {normal => grub-core/normal}/handler.c (100%)
 rename {normal => grub-core/normal}/main.c (100%)
 rename {normal => grub-core/normal}/menu.c (100%)
 rename {normal => grub-core/normal}/menu_entry.c (100%)
 rename {normal => grub-core/normal}/menu_text.c (100%)
 rename {normal => grub-core/normal}/misc.c (100%)
 rename {normal => grub-core/normal}/term.c (100%)
 rename {partmap => grub-core/partmap}/acorn.c (100%)
 rename {partmap => grub-core/partmap}/amiga.c (100%)
 rename {partmap => grub-core/partmap}/apple.c (100%)
 rename {partmap => grub-core/partmap}/bsdlabel.c (100%)
 rename {partmap => grub-core/partmap}/gpt.c (100%)
 rename {partmap => grub-core/partmap}/msdos.c (100%)
 rename {partmap => grub-core/partmap}/sun.c (100%)
 rename {partmap => grub-core/partmap}/sunpc.c (100%)
 rename {parttool => grub-core/parttool}/msdospart.c (100%)
 create mode 100644 grub-core/po/Makefile.am
 rename {po => grub-core/po}/POTFILES (100%)
 rename {po => grub-core/po}/POTFILES-shell (100%)
 rename {po => grub-core/po}/README (100%)
 rename {script => grub-core/script}/execute.c (100%)
 rename {script => grub-core/script}/function.c (100%)
 rename {script => grub-core/script}/lexer.c (100%)
 rename {script => grub-core/script}/main.c (100%)
 rename {script => grub-core/script}/parser.y (100%)
 rename {script => grub-core/script}/script.c (100%)
 rename {script => grub-core/script}/yylex.l (100%)
 rename {term => grub-core/term}/at_keyboard.c (100%)
 rename {term => grub-core/term}/efi/console.c (100%)
 rename {term => grub-core/term}/gfxterm.c (100%)
 rename {term => grub-core/term}/i386/pc/console.c (100%)
 rename {term => grub-core/term}/i386/pc/vga.c (100%)
 rename {term => grub-core/term}/i386/pc/vga_text.c (100%)
 rename {term => grub-core/term}/i386/vga_common.c (100%)
 rename {term => grub-core/term}/ieee1275/ofconsole.c (100%)
 rename {term => grub-core/term}/serial.c (100%)
 rename {term => grub-core/term}/terminfo.c (100%)
 rename {term => grub-core/term}/tparm.c (100%)
 rename {term => grub-core/term}/usb_keyboard.c (100%)
 rename {tests => grub-core/tests}/example_functional_test.c (95%)
 rename {tests => grub-core/tests}/lib/functional_test.c (100%)
 rename {tests => grub-core/tests}/lib/test.c (100%)
 rename {video => grub-core/video}/bitmap.c (100%)
 rename {video => grub-core/video}/bitmap_scale.c (100%)
 rename {video => grub-core/video}/efi_gop.c (100%)
 rename {video => grub-core/video}/efi_uga.c (100%)
 rename {util => grub-core/video/emu}/sdl.c (100%)
 rename {video => grub-core/video}/fb/fbblit.c (100%)
 rename {video => grub-core/video}/fb/fbfill.c (100%)
 rename {video => grub-core/video}/fb/fbutil.c (100%)
 rename {video => grub-core/video}/fb/video_fb.c (100%)
 rename {video => grub-core/video}/i386/pc/vbe.c (100%)
 rename {video => grub-core/video}/ieee1275.c (100%)
 rename {video => grub-core/video}/readers/jpeg.c (100%)
 rename {video => grub-core/video}/readers/png.c (100%)
 rename {video => grub-core/video}/readers/tga.c (100%)
 rename {video => grub-core/video}/sm712.c (100%)
 rename {video => grub-core/video}/video.c (100%)
 create mode 100644 modules.def
 create mode 100644 po/Makefile.am

diff --git a/.bzrignore b/.bzrignore
index 46e8637b6..f91e72efa 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -71,3 +71,9 @@ stamp-h.in
 symlist.c
 trigtables.c
 update-grub_lib
+Makefile.in
+modules.am
+GPATH
+GRTAGS
+GSYMS
+GTAGS
\ No newline at end of file
diff --git a/ABOUT-NLS b/ABOUT-NLS
new file mode 100644
index 000000000..866b904ec
--- /dev/null
+++ b/ABOUT-NLS
@@ -0,0 +1,223 @@
+1 Notes on the Free Translation Project
+***************************************
+
+Free software is going international!  The Free Translation Project is
+a way to get maintainers of free software, translators, and users all
+together, so that free software will gradually become able to speak many
+languages.  A few packages already provide translations for their
+messages.
+
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do _not_
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.
+
+   Installers will find here some useful hints.  These notes also
+explain how users should proceed for getting the programs to use the
+available translations.  They tell how people wanting to contribute and
+work on translations can contact the appropriate team.
+
+   When reporting bugs in the `intl/' directory or bugs which may be
+related to internationalization, you should tell about the version of
+`gettext' which is used.  The information can be found in the
+`intl/VERSION' file, in internationalized packages.
+
+1.1 Quick configuration advice
+==============================
+
+If you want to exploit the full power of internationalization, you
+should configure it using
+
+     ./configure --with-included-gettext
+
+to force usage of internationalizing routines provided within this
+package, despite the existence of internationalizing capabilities in the
+operating system where this package is being installed.  So far, only
+the `gettext' implementation in the GNU C library version 2 provides as
+many features (such as locale alias, message inheritance, automatic
+charset conversion or plural form handling) as the implementation here.
+It is also not possible to offer this additional functionality on top
+of a `catgets' implementation.  Future versions of GNU `gettext' will
+very likely convey even more functionality.  So it might be a good idea
+to change to GNU `gettext' as soon as possible.
+
+   So you need _not_ provide this option if you are using GNU libc 2 or
+you have installed a recent copy of the GNU gettext package with the
+included `libintl'.
+
+1.2 INSTALL Matters
+===================
+
+Some packages are "localizable" when properly installed; the programs
+they contain can be made to speak your own native language.  Most such
+packages use GNU `gettext'.  Other packages have their own ways to
+internationalization, predating GNU `gettext'.
+
+   By default, this package will be installed to allow translation of
+messages.  It will automatically detect whether the system already
+provides the GNU `gettext' functions.  If not, the included GNU
+`gettext' library will be used.  This library is wholly contained
+within this package, usually in the `intl/' subdirectory, so prior
+installation of the GNU `gettext' package is _not_ required.
+Installers may use special options at configuration time for changing
+the default behaviour.  The commands:
+
+     ./configure --with-included-gettext
+     ./configure --disable-nls
+
+will, respectively, bypass any pre-existing `gettext' to use the
+internationalizing routines provided within this package, or else,
+_totally_ disable translation of messages.
+
+   When you already have GNU `gettext' installed on your system and run
+configure without an option for your new package, `configure' will
+probably detect the previously built and installed `libintl.a' file and
+will decide to use this.  This might not be desirable.  You should use
+the more recent version of the GNU `gettext' library.  I.e. if the file
+`intl/VERSION' shows that the library which comes with this package is
+more recent, you should use
+
+     ./configure --with-included-gettext
+
+to prevent auto-detection.
+
+   The configuration process will not test for the `catgets' function
+and therefore it will not be used.  The reason is that even an
+emulation of `gettext' on top of `catgets' could not provide all the
+extensions of the GNU `gettext' library.
+
+   Internationalized packages usually have many `po/LL.po' files, where
+LL gives an ISO 639 two-letter code identifying the language.  Unless
+translations have been forbidden at `configure' time by using the
+`--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable `LINGUAS'
+may be set, prior to configuration, to limit the installed set.
+`LINGUAS' should then contain a space separated list of two-letter
+codes, stating which languages are allowed.
+
+1.3 Using This Package
+======================
+
+As a user, if your language has been installed for this package, you
+only have to set the `LANG' environment variable to the appropriate
+`LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
+and `CC' is an ISO 3166 two-letter country code.  For example, let's
+suppose that you speak German and live in Germany.  At the shell
+prompt, merely execute `setenv LANG de_DE' (in `csh'),
+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
+This can be done from your `.login' or `.profile' file, once and for
+all.
+
+   You might think that the country code specification is redundant.
+But in fact, some languages have dialects in different countries.  For
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
+country code serves to distinguish the dialects.
+
+   The locale naming convention of `LL_CC', with `LL' denoting the
+language and `CC' denoting the country, is the one use on systems based
+on GNU libc.  On other systems, some variations of this scheme are
+used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
+locales supported by your system for your language by running the
+command `locale -a | grep '^LL''.
+
+   Not all programs have translations for all languages.  By default, an
+English message is shown in place of a nonexistent translation.  If you
+understand other languages, you can set up a priority list of languages.
+This is done through a different environment variable, called
+`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
+for the purpose of message handling, but you still need to have `LANG'
+set to the primary language; this is required by other parts of the
+system libraries.  For example, some Swedish users who would rather
+read translations in German than English for when Swedish is not
+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
+
+   Special advice for Norwegian users: The language code for Norwegian
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
+transition period, while some message catalogs for this language are
+installed under `nb' and some older ones under `no', it's recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
+older translations are used.
+
+   In the `LANGUAGE' environment variable, but not in the `LANG'
+environment variable, `LL_CC' combinations can be abbreviated as `LL'
+to denote the language's main dialect.  For example, `de' is equivalent
+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
+(Portuguese as spoken in Portugal) in this context.
+
+1.4 Translating Teams
+=====================
+
+For the Free Translation Project to be a success, we need interested
+people who like their own language and write it well, and who are also
+able to synergize with other translators speaking the same language.
+Each translation team has its own mailing list.  The up-to-date list of
+teams can be found at the Free Translation Project's homepage,
+`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
+area.
+
+   If you'd like to volunteer to _work_ at translating messages, you
+should become a member of the translating team for your own language.
+The subscribing address is _not_ the same as the list itself, it has
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request@li.org', having this message body:
+
+     subscribe
+
+   Keep in mind that team members are expected to participate
+_actively_ in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `translation@iro.umontreal.ca' to reach the
+coordinator for all translator teams.
+
+   The English team is special.  It works at improving and uniformizing
+the terminology in use.  Proven linguistic skills are praised more than
+programming skills, here.
+
+1.5 Available Packages
+======================
+
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of October
+2006.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination, with a
+translation percentage of at least 50%.
+
+# Matrix here is removed!
+
+   Some counters in the preceding matrix are higher than the number of
+visible blocks let us expect.  This is because a few extra PO files are
+used for implementing regional variants of languages, or language
+dialects.
+
+   For a PO file in the matrix above to be effective, the package to
+which it applies should also have been internationalized and
+distributed as such by its maintainer.  There might be an observable
+lag between the mere existence a PO file and its wide availability in a
+distribution.
+
+   If October 2006 seems to be old, you may fetch a more recent copy of
+this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
+matrix with full percentage details can be found at
+`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
+
+1.6 Using `gettext' in new packages
+===================================
+
+If you are writing a freely available program and want to
+internationalize it you are welcome to use GNU `gettext' in your
+package.  Of course you have to respect the GNU Library General Public
+License which covers the use of the GNU `gettext' library.  This means
+in particular that even non-free programs can use `libintl' as a shared
+library, whereas only free software can use `libintl' as a static
+library or use modified versions of `libintl'.
+
+   Once the sources are changed appropriately and the setup can handle
+the use of `gettext' the only thing missing are the translations.  The
+Free Translation Project is also available for packages which are not
+developed inside the GNU project.  Therefore the information given above
+applies also for every other Free Software Project.  Contact
+`translation@iro.umontreal.ca' to make the `.pot' files available to
+the translation teams.
+
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 000000000..d962963c1
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,87 @@
+AUTOMAKE_OPTIONS = subdir-objects
+DEPDIR = .deps-util
+
+EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def		\
+									\
+	geninit.sh							\
+									\
+	gnulib/progname.h gnulib/fnmatch_loop.c gnulib/alloca.h		\
+	gnulib/error.h gnulib/fnmatch.h gnulib/getopt.h			\
+	gnulib/getopt_int.h gnulib/gettext.h gnulib/progname.h		\
+									\
+	util/mkisofs/mkisofs.h util/mkisofs/iso9660.h			\
+	util/mkisofs/include/prototyp.h util/mkisofs/defaults.h		\
+	util/mkisofs/match.h util/mkisofs/exclude.h			\
+	util/mkisofs/msdos_partition.h util/mkisofs/include/fctldefs.h	\
+	util/mkisofs/include/mconfig.h util/mkisofs/include/statdefs.h
+
+SUBDIRS = . grub-core po docs
+
+include $(top_srcdir)/grub-core/Makefile.vars
+
+CFLAGS_PROGRAM = $(HOST_CFLAGS) $(CFLAGS_GNULIB)
+LDFLAGS_PROGRAM = $(HOST_LDFLAGS) $(LDFLAGS_GNULIB) $(LIBINTL)
+CPPFLAGS_PROGRAM = $(HOST_CPPFLAGS) $(CPPFLAGS_GNULIB)
+CCASFLAGS_PROGRAM = $(HOST_CCASFLAGS) $(CCASFLAGS_GNULIB)
+
+CFLAGS_LIBRARY = $(CFLAGS_PROGRAM)
+CPPFLAGS_LIBRARY = $(CPPFLAGS_PROGRAM)
+CCASFLAGS_LIBRARY = $(CCASFLAGS_PROGRAM)
+
+AM_CFLAGS =
+AM_LDFLAGS =
+AM_CPPFLAGS = $(CPPFLAGS_GRUB) -DGRUB_FILE=\"$(subst $(top_srcdir)/,,$<)\"
+AM_CCASFLAGS = -DASM_FILE=1
+
+# XXX Use Automake's LEX & YACC support
+grub_script.tab.c grub_script.tab.h: $(top_srcdir)/grub-core/script/parser.y
+	$(YACC) -d -p grub_script_yy -b grub_script $(top_srcdir)/grub-core/script/parser.y
+CLEANFILES += grub_script.tab.c grub_script.tab.h
+
+# For the lexer.
+grub_script.yy.c grub_script.yy.h: $(top_srcdir)/grub-core/script/yylex.l
+	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(top_srcdir)/grub-core/script/yylex.l
+CLEANFILES += grub_script.yy.c grub_script.yy.h
+
+# For libutil.a
+libutil_a_init.lst: grub_script.tab.h grub_script.yy.h $(libutil_a_SOURCES)
+	rm -f $@
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutil_a_CPPFLAGS) $(CPPFLAGS) \
+	  -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ \
+	  | grep '@MARKER@' | sed 's/@MARKER@\(.*\)@/\1/g' | sort -u > $@ || (rm -f $@; exit 1)
+CLEANFILES += libutil_a_init.lst
+
+libutil_a_init.c: libutil_a_init.lst $(top_srcdir)/geninit.sh
+	rm -f $@; sh $(top_srcdir)/geninit.sh `cat $<` > $@ || (rm -f $@; exit 1)
+CLEANFILES += libutil_a_init.c
+
+if COND_GRUB_MKFONT
+if COND_HAVE_FONT_SOURCE
+pkgdata_DATA = unicode.pf2 ascii.pf2 ascii.h
+endif
+endif
+
+unicode.pf2: $(FONT_SOURCE) grub-mkfont
+	$(builddir)/grub-mkfont -o $@ $(FONT_SOURCE)
+CLEANFILES += unicode.pf2
+
+# Arrows and lines are needed to draw the menu, so always include them
+UNICODE_ARROWS=0x2190-0x2193
+UNICODE_LINES=0x2501-0x251B
+
+ascii.pf2: $(FONT_SOURCE) grub-mkfont
+	$(builddir)/grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
+CLEANFILES += ascii.pf2
+
+ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
+	$(builddir)/grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE)
+CLEANFILES += ascii.bitmaps
+
+ascii.h: ascii.bitmaps grub-bin2h
+	$(builddir)/grub-bin2h ascii_bitmaps < $< > $@
+	cp $@ $(top_builddir)/grub-core/include
+CLEANFILES += ascii.h $(top_builddir)/grub-core/include/ascii.h
+
+platform_HEADERS = config.h
+
+include $(srcdir)/modules.am
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 822a08797..000000000
--- a/Makefile.in
+++ /dev/null
@@ -1,564 +0,0 @@
-# -*- makefile -*-
-#
-# Copyright (C) 1994,1995,1996,1997,1998,1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
-#
-# This Makefile.in is free software; the author
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-### The configure script will replace these variables.
-
-SHELL = /bin/sh
-
-@SET_MAKE@
-
-transform = @program_transform_name@
-
-srcdir = @srcdir@
-builddir = @builddir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datarootdir = @datarootdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-localedir = @localedir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-pkgdatadir = $(datadir)/`echo @PACKAGE_TARNAME@ | sed '$(transform)'`
-pkglibdir =  $(libdir)/`echo @PACKAGE_TARNAME@/$(target_cpu)-$(platform) | sed '$(transform)'`
-
-# Internationalization library.
-LIBINTL = @LIBINTL@
-TARGET_NO_MODULES = @TARGET_NO_MODULES@
-
-# Util library.
-LIBUTIL = @LIBUTIL@
-
-XGETTEXT = @XGETTEXT@
-MSGMERGE = @MSGMERGE@
-MSGFMT = @MSGFMT@
-
-LINGUAS = $(shell for i in $(srcdir)/po/*.po ; do \
-			if test -e $$i ; then echo $$i ; fi ; \
-		done | sed -e "s,.*/po/\(.*\)\.po$$,\1,")
-
-PACKAGE = @PACKAGE@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-
-host_os = @host_os@
-host_kernel = @host_kernel@
-host_cpu = @host_cpu@
-
-target_cpu = @target_cpu@
-platform = @platform@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-MKDIR_P = @MKDIR_P@
-
-mkinstalldirs = $(srcdir)/mkinstalldirs
-
-LIBS = @LIBS@ $(LIBINTL) $(LIBUTIL)
-
-CC = @CC@
-CFLAGS = @CFLAGS@
-POSIX_CFLAGS = -I$(srcdir)/lib/posix_wrap 
-GNULIB_UTIL_CFLAGS = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))" -I$(srcdir)/gnulib
-GNULIB_CFLAGS = $(GNULIB_UTIL_CFLAGS) $(POSIX_CFLAGS)
-ASFLAGS = @ASFLAGS@
-LDFLAGS = @LDFLAGS@ $(LIBS)
-CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/gnulib -I$(srcdir)/include -Wall -W \
-	 -DGRUB_LIBDIR=\"$(pkglibdir)\" -DLOCALEDIR=\"$(localedir)\"
-TARGET_CC = @TARGET_CC@
-TARGET_CFLAGS = -ffreestanding @TARGET_CFLAGS@
-TARGET_ASFLAGS = -nostdinc -fno-builtin @TARGET_ASFLAGS@
-TARGET_MODULE_FORMAT = @TARGET_MODULE_FORMAT@
-TARGET_APPLE_CC = @TARGET_APPLE_CC@
-OBJCONV = @OBJCONV@
-TARGET_CPPFLAGS = @TARGET_CPPFLAGS@ -I$(srcdir)/include -I$(builddir) -I$(builddir)/include \
-	-Wall -W
-TARGET_LDFLAGS = -nostdlib -static-libgcc @TARGET_LDFLAGS@
-TARGET_IMG_LDSCRIPT = @TARGET_IMG_LDSCRIPT@
-TARGET_IMG_LDFLAGS = -nostdlib @TARGET_IMG_LDFLAGS@
-TARGET_IMG_CFLAGS = @TARGET_IMG_CFLAGS@
-TARGET_OBJ2ELF = @TARGET_OBJ2ELF@
-kernel_img_LDFLAGS = -lgcc
-EXEEXT = @EXEEXT@
-OBJCOPY = @OBJCOPY@
-STRIP = @STRIP@
-NM = @NM@
-RUBY = @RUBY@
-MAKEINFO = @MAKEINFO@
-ifeq (, $(MAKEINFO))
-MAKEINFO = true
-endif
-HELP2MAN = @HELP2MAN@
-ifeq (, $(HELP2MAN))
-HELP2MAN = true
-else
-HELP2MAN := LANG=C $(HELP2MAN) --no-info --source=FSF
-endif
-AWK = @AWK@
-LIBCURSES = @LIBCURSES@
-LIBUSB = @LIBUSB@
-LIBSDL = @LIBSDL@
-LIBPCIACCESS = @LIBPCIACCESS@
-LEX = @LEX@
-YACC = @YACC@
-FONT_SOURCE = @FONT_SOURCE@
-
-# Options.
-enable_grub_emu_usb = @enable_grub_emu_usb@
-enable_grub_emu_sdl = @enable_grub_emu_sdl@
-enable_grub_emu_pci = @enable_grub_emu_pci@
-enable_grub_fstest = @enable_grub_fstest@
-enable_grub_pe2elf = @enable_grub_pe2elf@
-enable_grub_mkfont = @enable_grub_mkfont@
-freetype_cflags = @freetype_cflags@
-freetype_libs = @freetype_libs@
-enable_efiemu = @enable_efiemu@
-
-### General variables.
-
-RMKFILES = $(wildcard $(srcdir)/conf/*.rmk)
-
-MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES))
-
-PKGLIB = $(pkglib_IMAGES) $(pkglib_MODULES) $(pkglib_PROGRAMS) \
-	$(pkglib_DATA) $(pkglib_BUILDDIR)
-PKGDATA = $(pkgdata_DATA)
-PROGRAMS = $(bin_UTILITIES) $(sbin_UTILITIES)
-SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS) $(grub-mkconfig_SCRIPTS) \
-	$(lib_SCRIPTS)
-INFOS = $(info_INFOS)
-
-CLEANFILES =
-MOSTLYCLEANFILES =
-DISTCLEANFILES = config.status config.cache config.log config.h \
-	Makefile stamp-h stamp-h1 include/grub/cpu include/grub/machine \
-	gensymlist.sh genkernsyms.sh build_env.mk \
-	docs/grub.info docs/version.texi docs/stamp-vti
-
-MAINTAINER_CLEANFILES = $(srcdir)/configure $(srcdir)/aclocal.m4 \
-	$(MKFILES) $(srcdir)/config.guess \
-	$(srcdir)/config.sub $(srcdir)/install-sh $(srcdir)/missing \
-	$(srcdir)/DISTLIST $(srcdir)/config.h.in $(srcdir)/stamp-h.in $(INFOS)
-
-# The default target.
-all: all-local
-
-### Include an arch-specific Makefile.
-$(addprefix $(srcdir)/,$(MKFILES)): %.mk: %.rmk genmk.rb
-	if test "x$(RUBY)" = x; then \
-	  touch $@; \
-	else \
-	  $(RUBY) $(srcdir)/genmk.rb < $< > $@; \
-	fi
-
-ifeq ($(platform), emu)
-include $(srcdir)/conf/any-emu.mk
-else
-include $(srcdir)/conf/$(target_cpu)-$(platform).mk
-# For tests.
-include $(srcdir)/conf/tests.mk
-# For external modules.
--include $(wildcard $(GRUB_CONTRIB)/*/conf/common.mk)
-endif
-
-ifeq ($(TARGET_NO_MODULES), yes)
-	TARGET_CFLAGS += -DGRUB_TARGET_NO_MODULES=1
-	CFLAGS += -DGRUB_TARGET_NO_MODULES=1
-endif
-
-### General targets.
-
-CLEANFILES += $(pkglib_DATA) $(pkgdata_DATA) po/*.mo
-ifneq ($(TARGET_NO_MODULES), yes)
-pkglib_DATA += moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst
-endif
-moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep.awk
-	cat $(DEFSYMFILES) /dev/null \
-	  | $(AWK) -f $(srcdir)/genmoddep.awk $(UNDSYMFILES) > $@ \
-	  || (rm -f $@; exit 1)
-
-command.lst: $(COMMANDFILES)
-	cat $^ /dev/null | sort > $@
-
-fs.lst: $(FSFILES)
-	cat $^ /dev/null | sort > $@
-
-partmap.lst: $(PARTMAPFILES)
-	cat $^ /dev/null | sort > $@
-
-handler.lst: $(HANDLERFILES)
-	cat $^ /dev/null | sort > $@
-
-terminal.lst: $(TERMINALFILES)
-	cat $^ /dev/null | sort > $@
-
-parttool.lst: $(PARTTOOLFILES)
-	cat $^ /dev/null | sort | uniq > $@
-
-video.lst: $(VIDEOFILES)
-	cat $^ /dev/null | sort | uniq > $@
-
-crypto.lst: lib/libgcrypt-grub/cipher/crypto.lst
-	cp $^ $@
-
-ifneq (true, $(MAKEINFO))
-info_INFOS += docs/grub.info
-endif
-
-MOSTLYCLEANFILES += vti.tmp
-MAINTAINER_CLEANFILES += docs/stamp-vti docs/version.texi
-docs/version.texi: docs/stamp-vti
-docs/stamp-vti: docs/grub.texi configure.ac
-	$(MKDIR_P) docs
-	(set `$(SHELL) $(srcdir)/docs/mdate-sh $<`; \
-	echo "@set UPDATED $$1 $$2 $$3"; \
-	echo "@set UPDATED-MONTH $$2 $$3"; \
-	echo "@set EDITION $(PACKAGE_VERSION)"; \
-	echo "@set VERSION $(PACKAGE_VERSION)") > vti.tmp
-	@cmp -s vti.tmp $(builddir)/docs/version.texi \
-	  || (echo "Updating $(builddir)/docs/version.texi"; \
-	      cp vti.tmp $(builddir)/docs/version.texi)
-	-@rm -f vti.tmp
-	@cp $(builddir)/docs/version.texi $@
-
-# Use --force until such time as the documentation is cleaned up.
-docs/grub.info: docs/grub.texi docs/version.texi docs/fdl.texi
-	$(MKDIR_P) docs
-	-$(MAKEINFO) -P $(builddir)/docs --no-split --force $< -o $@
-
-ifeq (, $(FONT_SOURCE))
-else
-
-ifeq ($(enable_grub_mkfont),yes)
-
-pkgdata_DATA += unicode.pf2 ascii.pf2 ascii.h
-CLEANFILES += ascii.bitmaps
-
-# Arrows and lines are needed to draw the menu, so we always include them
-UNICODE_ARROWS=0x2190-0x2193
-UNICODE_LINES=0x2501-0x251B
-
-unicode.pf2: $(FONT_SOURCE) grub-mkfont
-	$(builddir)/grub-mkfont -o $@ $(FONT_SOURCE)
-
-ascii.pf2: $(FONT_SOURCE) grub-mkfont
-	$(builddir)/grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
-
-ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
-	$(builddir)/grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE)
-
-ascii.h: ascii.bitmaps grub-bin2h
-	$(builddir)/grub-bin2h ascii_bitmaps < $< > $@
-
-TARGET_CFLAGS += -DUSE_ASCII_FAILBACK=1
-endif
-endif
-
-# Used for building modules externally
-pkglib_BUILDDIR += build_env.mk
-build_env.mk: Makefile
-	(\
-	echo "TARGET_CC=$(TARGET_CC)" ; \
-	echo "TARGET_CFLAGS=$(TARGET_CFLAGS)" ; \
-	echo "TARGET_ASFLAGS=$(TARGET_ASFLAGS)" ; \
-	echo "TARGET_CPPFLAGS=$(TARGET_CPPFLAGS) -I$(pkglibdir) -I$(includedir)" ; \
-	echo "STRIP=$(STRIP)" ; \
-	echo "OBJCONV=$(OBJCONV)" ; \
-	echo "TARGET_MODULE_FORMAT=$(TARGET_MODULE_FORMAT)" ; \
-	echo "TARGET_APPLE_CC=$(TARGET_APPLE_CC)" ; \
-	echo "COMMON_ASFLAGS=$(COMMON_ASFLAGS)" ; \
-	echo "COMMON_CFLAGS=$(COMMON_CFLAGS)" ; \
-	echo "COMMON_LDFLAGS=$(COMMON_LDFLAGS)"\
-	) > $@
-pkglib_BUILDDIR += config.h grub_script.tab.h
-
-all-local: $(PROGRAMS) $(GRUB_EMU) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(INFOS) $(MKFILES) $(foreach lang, $(LINGUAS), po/$(lang).mo)
-
-install: install-local
-
-install-local: all
-	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-	rm -f $(DESTDIR)$(pkglibdir)/*
-	@list='$(PKGLIB)'; \
-	for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkglibdir)/$$dest; \
-	done
-	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-	@list='$(PKGDATA)'; \
-	for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkgdatadir)/$$dest; \
-	done
-	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
-	@list='$(bin_UTILITIES) $(GRUB_EMU)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
-	  $(HELP2MAN) --section=1 -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
-	done
-	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8
-	@list='$(sbin_UTILITIES)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
-	  $(HELP2MAN) --section=8 -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
-	done
-	@list='$(bin_SCRIPTS)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
-	  $(HELP2MAN) --section=1 -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
-	done
-	@list='$(sbin_SCRIPTS)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
-	  $(HELP2MAN) --section=8 -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
-	done
-	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/grub.d
-	@list='$(grub-mkconfig_SCRIPTS)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
-	done
-	@list='$(grub-mkconfig_DATA)'; for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
-	done
-	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(libdir)/grub
-	@list='$(lib_SCRIPTS)'; \
-	for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(libdir)/grub/$$dest; \
-	done
-	@langs='$(LINGUAS)'; \
-	for lang in $$langs; do \
-	  $(SHELL) $(mkinstalldirs) $(DESTDIR)/$(datadir)/locale/$$lang/LC_MESSAGES; \
-	  file="po/$$lang.mo"; \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)/$(datadir)/locale/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
-	done
-	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(infodir)
-	@list='$(info_INFOS)'; \
-	for file in $$list; do \
-	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
-	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(infodir); \
-	  if (install-info --version && \
-	       install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$dest" || :; \
-	  fi; \
-	done
-
-install-strip:
-	$(MAKE) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" install
-
-uninstall:
-	@list='$(PKGLIB)'; \
-	for file in $$list; do \
-	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  rm -f $(DESTDIR)$(pkglibdir)/$$dest; \
-	done
-	@list='$(PKGDATA)'; \
-	for file in $$list; do \
-	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  rm -f $(DESTDIR)$(pkgdatadir)/$$dest; \
-	done
-	@list='$(bin_UTILITIES) $(bin_SCRIPTS) $(GRUB_EMU)'; for file in $$list; do \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  rm -f $(DESTDIR)$(bindir)/$$dest; \
-	  rm -f $(DESTDIR)$(mandir)/man1/$$dest.1; \
-	done
-	@list='$(sbin_UTILITIES) $(sbin_SCRIPTS)'; for file in $$list; do \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  rm -f $(DESTDIR)$(sbindir)/$$dest; \
-	  rm -f $(DESTDIR)$(mandir)/man8/$$dest.8; \
-	done
-	@list='$(grub-mkconfig_SCRIPTS) $(grub-mkconfig_DATA)'; for file in $$list; do \
-	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
-	  rm -f $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
-	done
-	@list='$(lib_SCRIPTS)'; \
-	for file in $$list; do \
-	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  rm -f $(DESTDIR)$(libdir)/grub/$$dest; \
-	done
-	@list='$(info_INFOS)'; \
-	for file in $$list; do \
-	  dest="`echo $$file | sed 's,.*/,,'`"; \
-	  if (install-info --version && \
-	       install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-	    if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$dest"; then \
-	      :; \
-	    else \
-	      test ! -f "$(DESTDIR)$(infodir)/$$dest" || exit 1; \
-	    fi; \
-	  fi; \
-	  rm -f $(DESTDIR)$(infodir)/$$dest; \
-	done
-
-clean: $(CLEAN_IMAGE_TARGETS) $(CLEAN_MODULE_TARGETS) $(CLEAN_UTILITY_TARGETS)
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-mostlyclean: clean $(MOSTLYCLEAN_IMAGE_TARGETS) $(MOSTLYCLEAN_MODULE_TARGETS) $(MOSTLYCLEAN_UTILITY_TARGETS)
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-distclean: mostlyclean
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-	-rm -rf $(srcdir)/autom4te.cache
-
-maintainer-clean: distclean
-	-test -z "$(MAINTAINER_CLEANFILES)" || rm -f $(MAINTAINER_CLEANFILES)
-	-rmdir $(srcdir)/lib/libgcrypt-grub/cipher
-	-rmdir $(srcdir)/lib/libgcrypt-grub
-
-info:
-
-dvi:
-
-distdir=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
-
-DISTLIST: gendistlist.sh
-	$(SHELL) $(srcdir)/gendistlist.sh > $(srcdir)/DISTLIST
-
-distdir: DISTLIST
-	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
-	$(SHELL) $(mkinstalldirs) $(distdir)
-	for i in `cat $(srcdir)/DISTLIST`; do \
-	  dir=`echo "$$i" | sed 's:/[^/]*$$::'`; \
-	  if test -d $(srcdir)/$$dir; then \
-	    $(SHELL) $(mkinstalldirs) $(distdir)/$$dir; \
-	  fi; \
-	  cp -p $(srcdir)/$$i $(distdir)/$$i || exit 1; \
-	done
-	chmod -R a+r $(distdir)
-
-GZIP_ENV = --best
-
-dist: distdir
-	tar chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
-
-distcheck: dist
-	-chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) gzip -cd $(distdir).tar.gz | tar xf -
-	chmod -R a-w $(distdir)
-	chmod a+w $(distdir)
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	chmod a-w $(distdir)
-	dc_instdir=`CDPATH=: && cd $(distdir)/=inst && pwd` \
-	  && cd $(distdir)/=build \
-	  && $(SHELL) ../configure --srcdir=.. --prefix=$$dc_instdir \
-	  && $(MAKE) all dvi check install && $(MAKE) uninstall \
-	  && (test `find $$dc_instdir -type f -print | wc -l` -le 1 \
-	     || (echo "Error: files left after uninstall" 1>&2; \
-	         exit 1)) \
-	  && $(MAKE) dist && $(MAKE) distclean \
-	  && rm -f $(distdir).tar.gz \
-	  && (test `find . -type f -print | wc -l` -eq 0 \
-	     || (echo "Error: files left after distclean" 1>&2; \
-	         exit 1))
-	-chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir)
-	@echo "$(distdir).tar.gz is ready for distribution" | \
-	  sed 'h;s/./=/g;p;x;p;x'
-
-check: all $(UNIT_TESTS) $(FUNCTIONAL_TESTS) $(SCRIPTED_TESTS)
-	@list="$(UNIT_TESTS)"; \
-	set -e; \
-	for file in $$list; do \
-	  $(builddir)/$$file; \
-	done
-	@list="$(FUNCTIONAL_TESTS)"; \
-	set -e; \
-	for file in $$list; do \
-	  mod=`basename $$file .mod`; \
-	  echo "insmod functional_test; insmod $$mod; functional_test" \
-	    | $(builddir)/grub-shell; \
-	done
-	@list="$(SCRIPTED_TESTS)"; \
-	set -e; \
-	for file in $$list; do \
-	  $(builddir)/$$file; \
-	done
-
-.SUFFIX:
-.SUFFIX: .c .o .S .d
-
-# Regenerate configure and Makefile automatically.
-$(srcdir)/aclocal.m4: configure.ac acinclude.m4
-	cd $(srcdir) && aclocal
-
-$(srcdir)/configure: configure.ac aclocal.m4
-	cd $(srcdir) && autoconf
-
-$(srcdir)/config.h.in: stamp-h.in
-$(srcdir)/stamp-h.in: configure.ac aclocal.m4
-	cd $(srcdir) && autoheader
-	echo timestamp > $(srcdir)/stamp-h.in
-
-config.h: stamp-h
-stamp-h: config.h.in config.status
-	$(SHELL) ./config.status
-
-Makefile: Makefile.in config.status
-	$(SHELL) ./config.status
-
-config.status: configure
-	$(SHELL) ./config.status --recheck
-
-gensymlist.sh: gensymlist.sh.in config.status
-	$(SHELL) ./config.status
-
-genkernsyms.sh: genkernsyms.sh.in config.status
-	$(SHELL) ./config.status
-
-$(srcdir)/po/$(PACKAGE).pot: po/POTFILES po/POTFILES-shell
-	cd $(srcdir) && $(XGETTEXT) -ctranslate --from-code=utf-8 -o po/$(PACKAGE).pot -f po/POTFILES --keyword=_ --keyword=N_
-	cd $(srcdir) && $(XGETTEXT) -ctranslate --from-code=utf-8 -o po/$(PACKAGE).pot -f po/POTFILES-shell -j --language=Shell
-
-$(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po): po/$(PACKAGE).pot
-	$(MSGMERGE) -U $@ $^
-
-po/%.mo: po/%.po
-	$(MKDIR_P) $$(dirname $@)
-	$(MSGFMT) -c --statistics -o $@ $^
-
-.PHONY: all install install-strip uninstall clean mostlyclean distclean
-.PHONY: maintainer-clean info dvi dist check
-
-# Prevent an overflow.
-.NOEXPORT:
-
-.DELETE_ON_ERROR:
diff --git a/autogen.sh b/autogen.sh
index eb251f9f0..5358d45f1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,22 +2,33 @@
 
 set -e
 
-aclocal
-autoconf
-autoheader
+ln -sf ../NEWS             grub-core/
+ln -sf ../README           grub-core/
+ln -sf ../INSTALL          grub-core/
+ln -sf ../AUTHORS          grub-core/
+ln -sf ../COPYING          grub-core/
+ln -sf ../ABOUT-NLS        grub-core/
+ln -sf ../ChangeLog        grub-core/
+ln -sf ../aclocal.m4       grub-core/
+ln -sf ../acinclude.m4     grub-core/
+ln -sf ../config.rpath     grub-core/
+ln -sf ../gentpl.py        grub-core/
+ln -sf ../configure.common grub-core/
 
-# FIXME: automake doesn't like that there's no Makefile.am
-automake -a -c -f || true
+ln -sf grub-core/include .
+ln -sf grub-core/gnulib .
+ln -sf grub-core/lib .
+
+python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl
+autogen -T Makefile.tpl modules.def | sed -e '/^$/{N;/^\n$/D;}' > modules.am
+
+(cd grub-core && python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl)
+(cd grub-core && autogen -T Makefile.tpl modules.def | sed -e '/^$/{N;/^\n$/D;}' > modules.am)
+
+(cd grub-core && echo timestamp > stamp-h.in)
+(cd grub-core && python import_gcry.py lib/libgcrypt/ .)
 
 echo timestamp > stamp-h.in
-
-python util/import_gcry.py lib/libgcrypt/ .
-
-for rmk in conf/*.rmk ${GRUB_CONTRIB}/*/conf/*.rmk; do
-  if test -e $rmk ; then
-    ruby genmk.rb < $rmk > `echo $rmk | sed 's/\.rmk$/.mk/'`
-  fi
-done
-sh gendistlist.sh > DISTLIST
+autoreconf -vi
 
 exit 0
diff --git a/configure.ac b/configure.ac
index 4e1dd41d8..10c527565 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010  Free Software Foundation, Inc.
+# Copyright (C) 2010  Free Software Foundation, Inc.
 #
 # This configure.ac is free software; the author
 # gives unlimited permission to copy and/or distribute it,
@@ -23,782 +23,50 @@ dnl which specifies the system running GRUB, such as firmware.
 dnl This is necessary because the target type in autoconf does not
 dnl describe such a system very well.
 dnl
-dnl The current strategy is to use variables with no prefix (such as
-dnl CC, CFLAGS, etc.) for the host type as well as the build type,
-dnl because GRUB does not need to use those variables for the build
-dnl type, so there is no conflict. Variables with the prefix "TARGET_"
-dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target
-dnl type.
-
+dnl The current strategy is to build utilities using host
+dnl cross-compiler and grub core and modules using target
+dnl cross-compiler.  For this we use nested packages approach, where
+dnl top-level package grub utilities is built with HOSTCC and nested
+dnl package (in grub-core directory) builds with TARGETCC.
 
+# NOTE: grub-core/configure.ac must also be updated.
 AC_INIT([GRUB],[1.98],[bug-grub@gnu.org])
-AM_INIT_AUTOMAKE()
-AC_PREREQ(2.60)
-AC_CONFIG_SRCDIR([include/grub/dl.h])
-AC_CONFIG_HEADER([config.h])
+AC_CONFIG_AUX_DIR([.])
 
 # Checks for host and target systems.
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-# Program name transformations
-AC_ARG_PROGRAM
+AM_INIT_AUTOMAKE()
+AC_PREREQ(2.60)
+AC_CONFIG_SRCDIR([grub-core/include/grub/dl.h])
+AC_CONFIG_HEADER([config.h])
 
-# Optimization flag.  Allow user to override.
-if test "x$TARGET_CFLAGS" = x; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -Os"
-fi
-
-case "$target_cpu" in
-  i[[3456]]86)	target_cpu=i386 ;;
-  amd64)	target_cpu=x86_64 ;;
-  sparc)	target_cpu=sparc64 ;;
-  mipsel|mips64el)
-                target_cpu=mips;    
-		TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPSEL=1"; 
-		CFLAGS="$CFLAGS -DGRUB_CPU_MIPSEL=1";
-		;;
-  mips|mips64)
-                target_cpu=mips;    
-		TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPS=1"; 
-		CFLAGS="$CFLAGS -DGRUB_CPU_MIPS=1";
-		;;
-esac
-
-# Specify the platform (such as firmware).
-AC_ARG_WITH([platform],
-            AS_HELP_STRING([--with-platform=PLATFORM],
-                           [select the host platform [[guessed]]]))
-
-# Guess the platform if not specified.
-if test "x$with_platform" = x; then
-  case "$target_cpu"-"$target_vendor" in
-    i386-apple) platform=efi ;;
-    i386-*) platform=pc ;;
-    x86_64-apple) platform=efi ;;
-    x86_64-*) platform=pc ;;
-    powerpc-*) platform=ieee1275 ;;
-    powerpc64-*) platform=ieee1275 ;;
-    sparc64-*) platform=ieee1275 ;;
-    mips-*) platform=yeeloong ;;
-    *) AC_MSG_ERROR([unsupported CPU: "$target_cpu"]) ;;
-  esac
-else
-  platform="$with_platform"
-fi
-
-# Adjust CPU unless target was explicitly specified.
-if test -z "$target_alias"; then
-  case "$target_cpu"-"$platform" in
-    x86_64-efi) ;;
-    x86_64-emu) ;;
-    x86_64-*) target_cpu=i386 ;;
-    powerpc64-ieee1275) target_cpu=powerpc ;;
-  esac
-fi
-
-# Check if the platform is supported, make final adjustments.
-case "$target_cpu"-"$platform" in
-  i386-efi) ;;
-  x86_64-efi) ;;
-  i386-pc) ;;
-  i386-multiboot) ;;
-  i386-coreboot) ;;
-  i386-linuxbios) platform=coreboot ;;
-  i386-ieee1275) ;;
-  i386-qemu) ;;
-  powerpc-ieee1275) ;;
-  sparc64-ieee1275) ;;
-  mips-qemu-mips) ;;
-  mips-yeeloong) ;;
-  *-emu) ;;
-  *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
-esac
-
-case "$target_cpu" in
-  i386 | powerpc) target_m32=1 ;;
-  x86_64 | sparc64) target_m64=1 ;;
-esac
-
-case "$host_os" in
-  mingw32*) host_os=cygwin ;;
-esac
-
-# This normalizes the names, and creates a new variable ("host_kernel")
-# while at it, since the mapping is not always 1:1 (e.g. different OSes
-# using the same kernel type).
-case "$host_os" in
-  gnu*)				host_kernel=hurd ;;
-  linux*)			host_kernel=linux ;;
-  freebsd* | kfreebsd*-gnu)	host_kernel=kfreebsd ;;
-  netbsd*)			host_kernel=netbsd ;;
-  cygwin)			host_kernel=windows ;;
-esac
-
-case "$platform" in
-  coreboot)	machine_CFLAGS="-DGRUB_MACHINE_COREBOOT=1" ;;
-  multiboot)	machine_CFLAGS="-DGRUB_MACHINE_MULTIBOOT=1" ;;
-  efi)		machine_CFLAGS="-DGRUB_MACHINE_EFI=1" ;;
-  ieee1275)	machine_CFLAGS="-DGRUB_MACHINE_IEEE1275=1" ;;
-  qemu)		machine_CFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
-  pc)		machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
-  emu)		machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
-  yeeloong)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
-  qemu-mips)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
-esac
-case "$target_cpu" in
-  mips)      	machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_MIPS=1" ;;
-  sparc64)      machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
-esac
-
-CFLAGS="$CFLAGS $machine_CFLAGS"
-TARGET_ASFLAGS="$TARGET_ASFLAGS $machine_CFLAGS"
-TARGET_CFLAGS="$TARGET_CFLAGS $machine_CFLAGS"
-
-AC_SUBST(host_cpu)
-AC_SUBST(host_os)
-AC_SUBST(host_kernel)
-
-AC_SUBST(target_cpu)
-AC_SUBST(platform)
-
-#
-# Checks for build programs.
-#
-
-# Although cmp is listed in the GNU Coding Standards as a command which
-# can used directly, OpenBSD lacks cmp in the default installation.
-AC_CHECK_PROGS([CMP], [cmp])
-if test "x$CMP" = x; then
-  AC_MSG_ERROR([cmp is not found])
-fi
-
-AC_CHECK_PROGS([YACC], [bison])
-if test "x$YACC" = x; then
-  AC_MSG_ERROR([bison is not found])
-fi
-
-for file in /usr/src/unifont.bdf /usr/share/fonts/X11/misc/unifont.pcf.gz /usr/share/fonts/unifont/unifont.pcf.gz; do
-  if test -e $file ; then
-    AC_SUBST([FONT_SOURCE], [$file])
-    break
-  fi
-done
-
-AC_PROG_INSTALL
-AC_PROG_AWK
-AC_PROG_LEX
-AC_PROG_MAKE_SET
-AC_PROG_MKDIR_P
-
-if test "x$LEX" = x; then
-  AC_MSG_ERROR([flex is not found])
-else
-  version=`$LEX --version | $AWK '{ split($NF,x,"."); print x[[1]]*10000+x[[2]]*100+x[[3]]; }'`
-  if test -n "$version" -a "$version" -ge 20535; then
-    :
-  else
-    AC_MSG_ERROR([flex is too old. GRUB requires 2.5.35 or above])
-  fi
-fi
-
-# These are not a "must".
-AC_PATH_PROG(RUBY, ruby)
-AC_PATH_PROG(MAKEINFO, makeinfo)
-
-#
-# Checks for host programs.
-#
-
-AC_PROG_CC
-# Must be GCC.
-test "x$GCC" = xyes || AC_MSG_ERROR([GCC is required])
-
-AC_GNU_SOURCE
-AM_GNU_GETTEXT([external])
-AC_SYS_LARGEFILE
-
-# Identify characteristics of the host architecture.
-AC_C_BIGENDIAN
-AC_CHECK_SIZEOF(void *)
-AC_CHECK_SIZEOF(long)
-
-grub_apple_cc
-if test x$grub_cv_apple_cc = xyes ; then
-  CFLAGS="$CFLAGS -DAPPLE_CC=1 -fnested-functions"
-  ASFLAGS="$ASFLAGS -DAPPLE_CC=1"
-fi
-
-if test "x$cross_compiling" = xyes; then
-  AC_MSG_WARN([cannot generate manual pages while cross compiling])
-else
-  AC_PATH_PROG(HELP2MAN, help2man)
-fi
-
-# Check for functions.
-AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf)
-
-# For grub-mkisofs
-AC_HEADER_MAJOR
-AC_HEADER_DIRENT
-AC_CHECK_FUNCS(memmove sbrk strdup lstat getuid getgid)
-AC_CHECK_HEADERS(sys/mkdev.h sys/sysmacros.h malloc.h termios.h sys/types.h)
-AC_CHECK_HEADERS(unistd.h string.h strings.h sys/stat.h sys/fcntl.h limits.h)
-
-# For opendisk() and getrawpartition() on NetBSD.
-# Used in util/deviceiter.c and in util/hostdisk.c.
-AC_CHECK_HEADER([util.h], [
-  AC_CHECK_LIB([util], [opendisk], [
-    LIBUTIL="-lutil"
-    AC_DEFINE(HAVE_OPENDISK, 1, [Define if opendisk() in -lutil can be used])
-  ])
-  AC_CHECK_LIB([util], [getrawpartition], [
-    LIBUTIL="-lutil"
-    AC_DEFINE(HAVE_GETRAWPARTITION, 1, [Define if getrawpartition() in -lutil can be used])
-  ])
-])
-AC_SUBST([LIBUTIL])
-
-#
-# Check for target programs.
-#
-
-# Find tools for the target.
-if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then
-  tmp_ac_tool_prefix="$ac_tool_prefix"
-  ac_tool_prefix=$target_alias-
-
-  AC_CHECK_TOOLS(TARGET_CC, [gcc egcs cc],
-                 [AC_MSG_ERROR([none of gcc, egcs and cc is found. set TARGET_CC manually.])])
-  AC_CHECK_TOOL(OBJCOPY, objcopy)
-  AC_CHECK_TOOL(STRIP, strip)
-  AC_CHECK_TOOL(NM, nm)
-
-  ac_tool_prefix="$tmp_ac_tool_prefix"
-else
-  if test "x$TARGET_CC" = x; then
-    TARGET_CC=$CC
-  fi
-  AC_CHECK_TOOL(OBJCOPY, objcopy)
-  AC_CHECK_TOOL(STRIP, strip)
-  AC_CHECK_TOOL(NM, nm)
-fi
-AC_SUBST(TARGET_CC)
-
-
-# Test the C compiler for the target environment.
-tmp_CC="$CC"
-tmp_CFLAGS="$CFLAGS"
-tmp_LDFLAGS="$LDFLAGS"
-tmp_CPPFLAGS="$CPPFLAGS"
-tmp_LIBS="$LIBS"
-CC="$TARGET_CC"
-CFLAGS="$TARGET_CFLAGS"
-CPPFLAGS="$TARGET_CPPFLAGS"
-LDFLAGS="$TARGET_LDFLAGS"
-LIBS=""
-
-# debug flags.
-TARGET_CFLAGS="$TARGET_CFLAGS -Wall -W -Wshadow -Wpointer-arith -Wmissing-prototypes \
-               -Wundef -Wstrict-prototypes -g"
-
-# Force no alignment to save space on i386.
-if test "x$target_cpu" = xi386; then
-  AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
-    CFLAGS="$CFLAGS -falign-loops=1"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-        [grub_cv_cc_falign_loop=yes],
-	[grub_cv_cc_falign_loop=no])
-  ])
-
-  if test "x$grub_cv_cc_falign_loop" = xyes; then
-    TARGET_CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1"
-  else
-    TARGET_CFLAGS="$TARGET_CFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1"
-  fi
-
-  # Some toolchains enable these features by default, but they need
-  # registers that aren't set up properly in GRUB.
-  TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-3dnow"
-fi
-
-# By default, GCC 4.4 generates .eh_frame sections containing unwind
-# information in some cases where it previously did not. GRUB doesn't need
-# these and they just use up vital space. Restore the old compiler
-# behaviour.
-AC_CACHE_CHECK([whether -fno-dwarf2-cfi-asm works], [grub_cv_cc_fno_dwarf2_cfi_asm], [
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -fno-dwarf2-cfi-asm"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-      [grub_cv_cc_fno_dwarf2_cfi_asm=yes],
-      [grub_cv_cc_fno_dwarf2_cfi_asm=no])
-  CFLAGS="$SAVE_CFLAGS"
-])
-
-if test "x$grub_cv_cc_fno_dwarf2_cfi_asm" = xyes; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -fno-dwarf2-cfi-asm"
-fi
-
-grub_apple_target_cc
-if test x$grub_cv_apple_target_cc = xyes ; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -DAPPLE_CC=1 -fnested-functions"
-  CFLAGS="$CFLAGS -DAPPLE_CC=1 -fnested-functions"
-  TARGET_ASFLAGS="$TARGET_ASFLAGS -DAPPLE_CC=1"
-  TARGET_APPLE_CC=1
-  AC_CHECK_PROG([OBJCONV], [objconv], [objconv], [])
-  if test "x$OBJCONV" = x ; then
-     AC_CHECK_PROG([OBJCONV], [objconv], [./objconv], [], [.])
-  fi
-  if test "x$OBJCONV" = x ; then
-    AC_MSG_ERROR([objconv not found which is required when building with apple compiler])
-  fi
-  TARGET_IMG_LDSCRIPT=
-  TARGET_IMG_CFLAGS="-static"
-  TARGET_IMG_LDFLAGS='-nostdlib -static -Wl,-preload -Wl,-segalign,20 -Wl,-image_base,'
-  TARGET_IMG_LDFLAGS_AC='-nostdlib -static -Wl,-preload -Wl,-segalign,20 -Wl,-image_base,'
-else
-  TARGET_APPLE_CC=0
-# Use linker script if present, otherwise use builtin -N script.
-if test -f "${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
-  TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
-  TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}  -Wl,-Ttext,"
-  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc  -Wl,-Ttext,"
-else
-  TARGET_IMG_LDSCRIPT=
-  TARGET_IMG_LDFLAGS='-Wl,-N  -Wl,-Ttext,'
-  TARGET_IMG_LDFLAGS_AC='-Wl,-N  -Wl,-Ttext,'
-fi
-TARGET_IMG_CFLAGS=
-fi
-
-AC_SUBST(TARGET_IMG_LDSCRIPT)
-AC_SUBST(TARGET_IMG_LDFLAGS)
-AC_SUBST(TARGET_IMG_CFLAGS)
-
-# For platforms where ELF is not the default link format.
-AC_MSG_CHECKING([for command to convert module to ELF format])
-case "${host_os}" in
-  cygwin) TARGET_OBJ2ELF='grub-pe2elf';
-# FIXME: put proper test here
-  AC_DEFINE([NEED_REGISTER_FRAME_INFO], 1,
-	    [Define to 1 if GCC generates calls to __register_frame_info()])
-  ;;
-  *) ;;
-esac
-AC_SUBST(TARGET_OBJ2ELF)
-AC_MSG_RESULT([$TARGET_OBJ2ELF])
-
-
-if test "x$target_m32" = x1; then
-  # Force 32-bit mode.
-  TARGET_CFLAGS="$TARGET_CFLAGS -m32"
-  TARGET_ASFLAGS="$TARGET_CFLAGS -m32"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
-  TARGET_MODULE_FORMAT="elf32"
-fi
-
-if test "x$target_m64" = x1; then
-  # Force 64-bit mode.
-  TARGET_CFLAGS="$TARGET_CFLAGS -m64"
-  TARGET_ASFLAGS="$TARGET_ASFLAGS -m64"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
-  TARGET_MODULE_FORMAT="elf64"
-fi
-
-if test "$target_cpu"-"$platform" = x86_64-efi; then
-  # Use large model to support 4G memory
-  AC_CACHE_CHECK([whether option -mcmodel=large works], grub_cv_cc_mcmodel, [
-    SAVED_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -m64 -mcmodel=large"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-		      [grub_cv_cc_mcmodel=yes],
-		      [grub_cv_cc_mcmodel=no])
-  ])
-  if test "x$grub_cv_cc_mcmodel" = xno; then
-    AC_MSG_ERROR([-mcmodel=large not supported. Upgrade your gcc.])
-  else
-    TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large"
-  fi
-
-  # EFI writes to stack below %rsp, we must not use the red zone
-  AC_CACHE_CHECK([whether option -mno-red-zone works], grub_cv_cc_no_red_zone, [
-    CFLAGS="$CFLAGS -m64 -mno-red-zone"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-		      [grub_cv_cc_no_red_zone=yes],
-		      [grub_cv_cc_no_red_zone=no])
-  ])
-  if test "x$grub_cv_cc_no_red_zone" = xno; then
-    AC_MSG_ERROR([-mno-red-zone not supported, upgrade your gcc])
-  fi
-
-  TARGET_CFLAGS="$TARGET_CFLAGS -mno-red-zone"
-fi
-
-#
-# Compiler features.
-#
-
-# Need __enable_execute_stack() for nested function trampolines?
-grub_CHECK_ENABLE_EXECUTE_STACK
-
-# Position independent executable.
-grub_CHECK_PIE
-[# Need that, because some distributions ship compilers that include
-# `-fPIE' in the default specs.
-if [ x"$pie_possible" = xyes ]; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE"
-fi]
-
-# Smashing stack protector.
-grub_CHECK_STACK_PROTECTOR
-# Need that, because some distributions ship compilers that include
-# `-fstack-protector' in the default specs.
-if test "x$ssp_possible" = xyes; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -fno-stack-protector"
-fi
-grub_CHECK_STACK_ARG_PROBE
-# Cygwin's GCC uses alloca() to probe the stackframe on static
-# stack allocations above some threshold.
-if test x"$sap_possible" = xyes; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -mno-stack-arg-probe"
-fi
-
-AC_ARG_ENABLE([werror],
-	      [AS_HELP_STRING([--disable-werror],
-                             [do not use -Werror when building GRUB])])
-if test x"$enable_werror" != xno ; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -Werror"
-fi
-
-AC_SUBST(TARGET_CFLAGS)
-AC_SUBST(TARGET_MODULE_FORMAT)
-AC_SUBST(OBJCONV)
-AC_SUBST(TARGET_APPLE_CC)
-AC_SUBST(TARGET_ASFLAGS)
-AC_SUBST(TARGET_CPPFLAGS)
-AC_SUBST(TARGET_LDFLAGS)
-
-# Set them to their new values for the tests below.
-CC="$TARGET_CC"
-if test "x$TARGET_APPLE_CC" = x1 ; then
-CFLAGS="$TARGET_CFLAGS -nostdlib -Wno-error"
-else
-CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100 -Wno-error"
-fi
-CPPFLAGS="$TARGET_CPPFLAGS"
-LDFLAGS="$TARGET_LDFLAGS"
-LIBS=-lgcc
-
-grub_ASM_USCORE
-if test x$grub_cv_asm_uscore = xyes; then
-CFLAGS="$CFLAGS -Wl,--defsym,_abort=_main"
-else
-CFLAGS="$CFLAGS -Wl,--defsym,abort=main"
-fi
-
-# Check for libgcc symbols
-AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __trampoline_setup __ucmpdi2 _restgpr_14_x)
-
-if test "x$TARGET_APPLE_CC" = x1 ; then
-CFLAGS="$TARGET_CFLAGS -nostdlib"
-else
-CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100"
-fi
-LIBS=""
-
-# Defined in aclocal.m4.
-grub_PROG_TARGET_CC
-if test "x$TARGET_APPLE_CC" != x1 ; then
-grub_PROG_OBJCOPY_ABSOLUTE
-fi
-grub_PROG_LD_BUILD_ID_NONE
-if test "x$target_cpu" = xi386; then
-  if test "$platform" != emu && test "x$TARGET_APPLE_CC" != x1 ; then
-    if test ! -z "$TARGET_IMG_LDSCRIPT"; then
-      # Check symbols provided by linker script.
-      CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC}8000 -Wl,--defsym,___main=0x8100"
-    fi
-    grub_CHECK_BSS_START_SYMBOL
-    grub_CHECK_END_SYMBOL
-  fi
-  CFLAGS="$TARGET_CFLAGS"
-  grub_I386_ASM_PREFIX_REQUIREMENT
-  grub_I386_ASM_ADDR32
-  grub_I386_ASM_ABSOLUTE_WITHOUT_ASTERISK
-else
-  AC_DEFINE([NESTED_FUNC_ATTR], [], [Catch gcc bug])
-fi
-
-AH_BOTTOM([#if defined(__i386__) && !defined(GRUB_UTIL)
-#define NESTED_FUNC_ATTR __attribute__ ((__regparm__ (1)))
-#else
-#define NESTED_FUNC_ATTR
-#endif])
-
-AC_ARG_ENABLE([efiemu],
-	      [AS_HELP_STRING([--enable-efiemu],
-                             [build and install the efiemu runtimes (default=guessed)])])
-if test x"$enable_efiemu" = xno ; then
-  efiemu_excuse="explicitly disabled"
-fi
-if test x"$efiemu_excuse" = x ; then
-  AC_CACHE_CHECK([whether options required for efiemu work], grub_cv_cc_efiemu, [
-    CFLAGS="$CFLAGS -m64 -mcmodel=large -mno-red-zone -nostdlib"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-		      [grub_cv_cc_efiemu=yes],
-		      [grub_cv_cc_efiemu=no])
-  ])
-  if test x$grub_cv_cc_efiemu = xno; then
-     efiemu_excuse="cannot compile with -m64 -mcmodel=large -mno-red-zone -nostdlib"
-  fi
-fi
-if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then
-  AC_MSG_ERROR([efiemu runtime was explicitly requested but can't be compiled])
-fi
-if test x"$efiemu_excuse" = x ; then
-enable_efiemu=yes
-else
-enable_efiemu=no
-fi
-AC_SUBST([enable_efiemu])
-
-if test "$platform" != emu; then
-AC_CACHE_CHECK([whether -nostdinc -isystem works], [grub_cv_cc_isystem], [
-  SAVED_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
-int va_arg_func (int fixed, va_list args);]], [[]])],
-      [grub_cv_cc_isystem=yes],
-      [grub_cv_cc_isystem=no])
-  CPPFLAGS="$SAVED_CPPFLAGS"
-])
-
-if test x"$grub_cv_cc_isystem" = xyes ; then
-  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
-fi
-fi
-
-# Restore the flags.
-CC="$tmp_CC"
-CFLAGS="$tmp_CFLAGS"
-CPPFLAGS="$tmp_CPPFLAGS"
-LDFLAGS="$tmp_LDFLAGS"
-LIBS="$tmp_LIBS"
-
-#
-# Check for options.
-#
-
-# Memory manager debugging.
-AC_ARG_ENABLE([mm-debug],
-	      AS_HELP_STRING([--enable-mm-debug],
-                             [include memory manager debugging]),
-              [AC_DEFINE([MM_DEBUG], [1],
-                         [Define to 1 if you enable memory manager debugging.])])
-
-AC_ARG_ENABLE([grub-emu-usb],
-	      [AS_HELP_STRING([--enable-grub-emu-usb],
-                             [build and install the `grub-emu' debugging utility with USB support (default=guessed)])])
-
-AC_ARG_ENABLE([grub-emu-sdl],
-	      [AS_HELP_STRING([--enable-grub-emu-sdl],
-                             [build and install the `grub-emu' debugging utility with SDL support (default=guessed)])])
-
-AC_ARG_ENABLE([grub-emu-pci],
-	      [AS_HELP_STRING([--enable-grub-emu-pci],
-                             [build and install the `grub-emu' debugging utility with PCI support (potentially dangerous) (default=no)])])
-
-AC_ARG_ENABLE([grub-emu-modules],
-	      [AS_HELP_STRING([--enable-grub-emu-modules],
-                             [Support module loading in `grub-emu' debugging utility (default=no)])])
-
-if test "$platform" = emu; then
-  missing_ncurses=
-[# Check for curses libraries.]
-  AC_CHECK_LIB([ncurses], [wgetch], [LIBCURSES="-lncurses"],
-    [AC_CHECK_LIB([curses], [wgetch], [LIBCURSES="-lcurses"],
-      [missing_ncurses=[true]])])
-  AC_SUBST([LIBCURSES])
-[if [ x"$missing_ncurses" = x ]; then ]
-  [# Check for headers.]
-  AC_CHECK_HEADERS([ncurses/curses.h], [],
-    [AC_CHECK_HEADERS([ncurses.h], [],
-      [AC_CHECK_HEADERS([curses.h], [],
-	[missing_ncurses=[true]])])])
-[fi]
-if test x"$missing_ncurses" = xtrue ; then
-  AC_MSG_ERROR([grub-emu can't be compiled without ncurses])
-fi
-
-if test x"$enable_grub_emu_modules" = xyes ; then
-  TARGET_NO_MODULES=no
-else
-  TARGET_NO_MODULES=yes
-fi
-AC_SUBST(TARGET_NO_MODULES)
-
-if test "$TARGET_NO_MODULES" = yes ; then
-  # Do not convert modules, otherwise linkage may fail (Cygwin only).
-  # FIXME: Should be checked above before TARGET_OBJ2ELF is set first.
-  TARGET_OBJ2ELF=
-fi
-
-if test x"$enable_grub_emu_usb" = xno ; then
-  grub_emu_usb_excuse="explicitly disabled"
-fi
-
-if test x"$enable_grub_emu_pci" = xyes ; then
-   grub_emu_usb_excuse="conflicts with PCI support"
-fi
-
-[if [ x"$grub_emu_usb_excuse" = x ]; then
-    # Check for libusb libraries.]
-AC_CHECK_LIB([usb], [usb_claim_interface], [LIBUSB="-lusb"],
-    [grub_emu_usb_excuse=["need libusb library"]])
-    AC_SUBST([LIBUSB])
-[fi]
-[if [ x"$grub_emu_usb_excuse" = x ]; then
-    # Check for headers.]
-    AC_CHECK_HEADERS([usb.h], [],
-      [grub_emu_usb_excuse=["need libusb headers"]])
-[fi]
-if test x"$enable_grub_emu_usb" = xyes && test x"$grub_emu_usb_excuse" != x ; then
-  AC_MSG_ERROR([USB support for grub-emu was explicitly requested but can't be compiled])
-fi
-if test x"$grub_emu_usb_excuse" = x ; then
-enable_grub_emu_usb=yes
-else
-enable_grub_emu_usb=no
-fi
-
-if test x"$enable_grub_emu_sdl" = xno ; then
-  grub_emu_sdl_excuse="explicitely disabled"
-fi
-[if [ x"$grub_emu_sdl_excuse" = x ]; then
-    # Check for libSDL libraries.]
-AC_CHECK_LIB([SDL], [SDL_Init], [LIBSDL="-lSDL"],
-    [grub_emu_sdl_excuse=["libSDL libraries are required to build \`grub-emu' with SDL support"]])
-    AC_SUBST([LIBSDL])
-[fi]
-
-[if [ x"$grub_emu_sdl_excuse" = x ]; then
-    # Check for headers.]
-    AC_CHECK_HEADERS([SDL/SDL.h], [],
-      [grub_emu_sdl_excuse=["libSDL header file is required to build \`grub-emu' with SDL support"]])
-[fi]
-
-if test x"enable_grub_emu_sdl" = xyes && test x"$grub_emu_sdl_excuse" != x ; then
-  AC_MSG_ERROR([SDL support for grub-emu was explicitely requested but can't be compiled])
-fi
-if test x"$grub_emu_sdl_excuse" = x ; then
-enable_grub_emu_sdl=yes
-else
-enable_grub_emu_sdl=no
-fi
-
-if test x"$enable_grub_emu_pci" != xyes ; then
-   grub_emu_pci_excuse="not enabled"
-fi
-
-if test x"$enable_grub_emu_usb" = xyes ; then
-   grub_emu_pci_excuse="conflicts with USB support"
-fi
-
-[if [ x"$grub_emu_pci_excuse" = x ]; then
-      # Check for libpci libraries.]
-   AC_CHECK_LIB([pciaccess], [pci_system_init], [LIBPCIACCESS="-lpciaccess"],
-      [grub_emu_pci_excuse=["need libpciaccess library"]])
-    AC_SUBST([LIBPCIACCESS])
-[fi]
-[if [ x"$grub_emu_pci_excuse" = x ]; then
-    # Check for headers.]
-    AC_CHECK_HEADERS([pci/pci.h], [],
-      [grub_emu_pci_excuse=["need libpciaccess headers"]])
-[fi]
-
-if test x"$grub_emu_pci_excuse" = x ; then
-enable_grub_emu_pci=yes
-else
-
-enable_grub_emu_pci=no
-fi
-
-AC_SUBST([enable_grub_emu_sdl])
-AC_SUBST([enable_grub_emu_usb])
-AC_SUBST([enable_grub_emu_pci])
-fi
-
-AC_ARG_ENABLE([grub-fstest],
-	      [AS_HELP_STRING([--enable-grub-fstest],
-                             [build and install the `grub-fstest' debugging utility (default=guessed)])])
-if test x"$enable_grub_fstest" = xno ; then
-  grub_fstest_excuse="explicitly disabled"
-fi
-if test x"$grub_fstest_excuse" = x ; then
-enable_grub_fstest=yes
-else
-enable_grub_fstest=no
-fi
-AC_SUBST([enable_grub_fstest])
-
-AC_ARG_ENABLE([grub-mkfont],
-	      [AS_HELP_STRING([--enable-grub-mkfont],
-                             [build and install the `grub-mkfont' utility (default=guessed)])])
-if test x"$enable_grub_mkfont" = xno ; then
-  grub_mkfont_excuse="explicitly disabled"
-fi
-
-if test x"$grub_mkfont_excuse" = x ; then
-  # Check for freetype libraries.
-  AC_CHECK_PROGS([FREETYPE], [freetype-config])
-  if test "x$FREETYPE" = x ; then
-    grub_mkfont_excuse=["need freetype2 library"]
-  fi
-  freetype_cflags=`freetype-config --cflags`
-  freetype_libs=`freetype-config --libs`
-fi
-
-if test x"$grub_mkfont_excuse" = x ; then
-  # Check for freetype libraries.
-  SAVED_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $freetype_cflags"
-  AC_CHECK_HEADERS([ft2build.h], [],
-  	[grub_mkfont_excuse=["need freetype2 headers"]])
-  CPPFLAGS="$SAVED_CPPFLAGS"
-fi
-
-if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; then
-  AC_MSG_ERROR([grub-mkfont was explicitly requested but can't be compiled])
-fi
-if test x"$grub_mkfont_excuse" = x ; then
-enable_grub_mkfont=yes
-else
-enable_grub_mkfont=no
-fi
-AC_SUBST([enable_grub_mkfont])
-AC_SUBST([freetype_cflags])
-AC_SUBST([freetype_libs])
-
-AC_SUBST(ASFLAGS)
+m4_include([configure.common])
 
 # Output files.
 grub_CHECK_LINK_DIR
 if test x"$link_dir" = xyes ; then
-  AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu])
+  AC_CONFIG_LINKS([include/grub/cpu:grub-core/include/grub/$target_cpu])
   if test "$platform" != emu ; then
-    AC_CONFIG_LINKS([include/grub/machine:include/grub/$target_cpu/$platform])
+    AC_CONFIG_LINKS([include/grub/machine:grub-core/include/grub/$target_cpu/$platform])
   fi
 else
   mkdir -p include/grub 2>/dev/null
   rm -rf include/grub/cpu
-  cp -rp $srcdir/include/grub/$target_cpu include/grub/cpu 2>/dev/null
+  cp -rp $srcdir/grub-core/include/grub/$target_cpu include/grub/cpu 2>/dev/null
   if test "$platform" != emu ; then
     rm -rf include/grub/machine
-    cp -rp $srcdir/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
+    cp -rp $srcdir/grub-core/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
   fi
 fi
-AC_CONFIG_FILES([Makefile gensymlist.sh genkernsyms.sh])
+
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([po/Makefile])
+AC_CONFIG_FILES([docs/Makefile])
 AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
+
+AC_CONFIG_SUBDIRS([grub-core])
 AC_OUTPUT
 [
 echo "*******************************************************"
@@ -820,11 +88,6 @@ echo PCI support for grub-emu: Yes
 else
 echo PCI support for grub-emu: No "($grub_emu_pci_excuse)"
 fi
-if [ x"$TARGET_NO_MODULES" = xno ]; then
-echo Module support for grub-emu: Yes
-else
-echo Module support for grub-emu: No
-fi
 fi
 if [ x"$enable_mm_debug" = xyes ]; then
 echo With memory debugging: Yes
diff --git a/configure.common b/configure.common
new file mode 100644
index 000000000..31bac7742
--- /dev/null
+++ b/configure.common
@@ -0,0 +1,804 @@
+# -*- autoconf -*-
+
+# Process this file with autoconf to produce a configure script.
+
+# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010  Free Software Foundation, Inc.
+#
+# This configure.ac is free software; the author
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# This file is shared between grub-core and util configure scripts.
+
+# Program name transformations
+AC_ARG_PROGRAM
+
+# Optimization flag.  Allow user to override.
+if test "x$CFLAGS" = x; then
+  CFLAGS="$CFLAGS -Os"
+fi
+
+# Default HOST_CPPFLAGS
+CPPFLAGS=''
+HOST_CPPFLAGS="$HOST_CPPFLAGS -Wall -W"
+HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_srcdir)/grub-core/include"
+HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
+HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_srcdir)/grub-core/gnulib"
+HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_UTIL=1"
+HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_LIBDIR=\\\"\$(pkglibdir)\\\""
+HOST_CPPFLAGS="$HOST_CPPFLAGS -DLOCALEDIR=\\\"\$(localedir)\\\""
+
+TARGET_CPPFLAGS="$TARGET_CPPFLAGS -Wall -W"
+TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_srcdir)/include"
+TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_builddir)/include"
+
+case "$target_cpu" in
+  i[[3456]]86)	target_cpu=i386 ;;
+  amd64)	target_cpu=x86_64 ;;
+  sparc)	target_cpu=sparc64 ;;
+  mipsel|mips64el)
+                target_cpu=mips;
+		cpu_CPPFLAGS="-DGRUB_CPU_MIPSEL=1";
+		;;
+  mips|mips64)
+                target_cpu=mips;
+		cpu_CPPFLAGS="-DGRUB_CPU_MIPS=1";
+		;;
+esac
+
+# Specify the platform (such as firmware).
+AC_ARG_WITH([platform],
+            AS_HELP_STRING([--with-platform=PLATFORM],
+                           [select the host platform [[guessed]]]))
+
+# Guess the platform if not specified.
+if test "x$with_platform" = x; then
+  case "$target_cpu"-"$target_vendor" in
+    i386-apple) platform=efi ;;
+    i386-*) platform=pc ;;
+    x86_64-apple) platform=efi ;;
+    x86_64-*) platform=pc ;;
+    powerpc-*) platform=ieee1275 ;;
+    powerpc64-*) platform=ieee1275 ;;
+    sparc64-*) platform=ieee1275 ;;
+    mips-*) platform=yeeloong ;;
+    *) AC_MSG_ERROR([unsupported CPU: "$target_cpu"]) ;;
+  esac
+else
+  platform="$with_platform"
+fi
+
+# Adjust CPU unless target was explicitly specified.
+if test -z "$target_alias"; then
+  case "$target_cpu"-"$platform" in
+    x86_64-efi) ;;
+    x86_64-emu) ;;
+    x86_64-*) target_cpu=i386 ;;
+    powerpc64-ieee1275) target_cpu=powerpc ;;
+  esac
+fi
+
+# Check if the platform is supported, make final adjustments.
+case "$target_cpu"-"$platform" in
+  i386-efi) ;;
+  x86_64-efi) ;;
+  i386-pc) ;;
+  i386-multiboot) ;;
+  i386-coreboot) ;;
+  i386-linuxbios) platform=coreboot ;;
+  i386-ieee1275) ;;
+  i386-qemu) ;;
+  powerpc-ieee1275) ;;
+  sparc64-ieee1275) ;;
+  mips-qemu-mips) ;;
+  mips-yeeloong) ;;
+  *-emu) ;;
+  *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
+esac
+
+case "$target_cpu" in
+  i386 | powerpc) target_m32=1 ;;
+  x86_64 | sparc64) target_m64=1 ;;
+esac
+
+case "$host_os" in
+  mingw32*) host_os=cygwin ;;
+esac
+
+# This normalizes the names, and creates a new variable ("host_kernel")
+# while at it, since the mapping is not always 1:1 (e.g. different OSes
+# using the same kernel type).
+case "$host_os" in
+  gnu*)				host_kernel=hurd ;;
+  linux*)			host_kernel=linux ;;
+  freebsd* | kfreebsd*-gnu)	host_kernel=kfreebsd ;;
+  netbsd*)			host_kernel=netbsd ;;
+  cygwin)			host_kernel=windows ;;
+esac
+
+case "$platform" in
+  coreboot)	machine_CPPFLAGS="-DGRUB_MACHINE_COREBOOT=1" ;;
+  multiboot)	machine_CFLAGS="-DGRUB_MACHINE_MULTIBOOT=1" ;;
+  efi)		machine_CPPFLAGS="-DGRUB_MACHINE_EFI=1" ;;
+  ieee1275)	machine_CPPFLAGS="-DGRUB_MACHINE_IEEE1275=1" ;;
+  qemu)		machine_CPPFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
+  pc)		machine_CPPFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
+  emu)		machine_CPPFLAGS="-DGRUB_MACHINE_EMU=1" ;;
+  yeeloong)	machine_CPPFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  qemu-mips)	machine_CPPFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+esac
+case "$target_cpu" in
+  i386)         cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_I386";;
+  x86_64)       cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_X86_64";;
+  powerpc)      cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_POWERPC";;
+  mips)      	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS=1" ;; # cpu_CPPFLAGS handled above
+  sparc64)      cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_SPARC64";
+                machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
+esac
+
+HOST_CPPFLAGS="$HOST_CPPFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
+TARGET_CPPFLAGS="$TARGET_CPPFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
+
+AC_SUBST(host_cpu)
+AC_SUBST(host_os)
+AC_SUBST(host_kernel)
+
+AC_SUBST(target_cpu)
+AC_SUBST(platform)
+
+#
+# Checks for build programs.
+#
+
+# Although cmp is listed in the GNU Coding Standards as a command which
+# can used directly, OpenBSD lacks cmp in the default installation.
+AC_CHECK_PROGS([CMP], [cmp])
+if test "x$CMP" = x; then
+  AC_MSG_ERROR([cmp is not found])
+fi
+
+for file in /usr/src/unifont.bdf /usr/share/fonts/X11/misc/unifont.pcf.gz /usr/share/fonts/unifont/unifont.pcf.gz; do
+  if test -e $file ; then
+    FONT_SOURCE=$file
+    HOST_CPPFLAGS="$HOST_CPPFLAGS -DUSE_ASCII_FAILBACK=1"
+    TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DUSE_ASCII_FAILBACK=1"
+    break
+  fi
+done
+
+AC_PROG_RANLIB
+AC_PROG_INSTALL
+AC_PROG_AWK
+AC_PROG_LEX
+AC_PROG_YACC
+AC_PROG_MAKE_SET
+AC_PROG_MKDIR_P
+
+if test "x$LEX" = x; then
+  AC_MSG_ERROR([flex is not found])
+else
+  version=`$LEX --version | $AWK '{ split($NF,x,"."); print x[[1]]*10000+x[[2]]*100+x[[3]]; }'`
+  if test -n "$version" -a "$version" -ge 20535; then
+    :
+  else
+    AC_MSG_ERROR([flex is too old. GRUB requires 2.5.35 or above])
+  fi
+fi
+
+# These are not a "must".
+AC_PATH_PROG(MAKEINFO, makeinfo)
+
+#
+# Checks for host programs.
+#
+
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_AS
+
+# Must be GCC.
+test "x$GCC" = xyes || AC_MSG_ERROR([GCC is required])
+
+AC_GNU_SOURCE
+AM_GNU_GETTEXT([external])
+AC_SYS_LARGEFILE
+
+# Identify characteristics of the host architecture.
+AC_C_BIGENDIAN
+AC_CHECK_SIZEOF(void *)
+AC_CHECK_SIZEOF(long)
+
+grub_apple_cc
+if test x$grub_cv_apple_cc = xyes ; then
+  HOST_CPPFLAGS="$HOST_CPPFLAGS -DAPPLE_CC=1"
+  HOST_CFLAGS="$HOST_CFLAGS -fnested-functions"
+fi
+
+if test "x$cross_compiling" = xyes; then
+  AC_MSG_WARN([cannot generate manual pages while cross compiling])
+else
+  AC_PATH_PROG(HELP2MAN, help2man)
+fi
+
+# Check for functions.
+AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf)
+
+# For grub-mkisofs
+AC_HEADER_MAJOR
+AC_HEADER_DIRENT
+AC_CHECK_FUNCS(memmove sbrk strdup lstat getuid getgid)
+AC_CHECK_HEADERS(sys/mkdev.h sys/sysmacros.h malloc.h termios.h sys/types.h)
+AC_CHECK_HEADERS(unistd.h string.h strings.h sys/stat.h sys/fcntl.h limits.h)
+
+# For opendisk() and getrawpartition() on NetBSD.
+# Used in util/deviceiter.c and in util/hostdisk.c.
+AC_CHECK_HEADER([util.h], [
+  AC_CHECK_LIB([util], [opendisk], [
+    LIBUTIL="-lutil"
+    AC_DEFINE(HAVE_OPENDISK, 1, [Define if opendisk() in -lutil can be used])
+  ])
+  AC_CHECK_LIB([util], [getrawpartition], [
+    LIBUTIL="-lutil"
+    AC_DEFINE(HAVE_GETRAWPARTITION, 1, [Define if getrawpartition() in -lutil can be used])
+  ])
+])
+AC_SUBST([LIBUTIL])
+
+#
+# Check for host and build compilers.
+#
+HOST_CC=$CC
+AC_CHECK_PROGS(BUILD_CC, [gcc egcs cc],
+                 [AC_MSG_ERROR([none of gcc, egcs and cc is found. set BUILD_CC manually.])])
+
+#
+# Check for target programs.
+#
+
+# Find tools for the target.
+if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then
+  tmp_ac_tool_prefix="$ac_tool_prefix"
+  ac_tool_prefix=$target_alias-
+
+  AC_CHECK_TOOLS(TARGET_CC, [gcc egcs cc],
+                 [AC_MSG_ERROR([none of gcc, egcs and cc is found. set TARGET_CC manually.])])
+  AC_CHECK_TOOL(OBJCOPY, objcopy)
+  AC_CHECK_TOOL(STRIP, strip)
+  AC_CHECK_TOOL(NM, nm)
+
+  ac_tool_prefix="$tmp_ac_tool_prefix"
+else
+  if test "x$TARGET_CC" = x; then
+    TARGET_CC=$CC
+  fi
+  AC_CHECK_TOOL(OBJCOPY, objcopy)
+  AC_CHECK_TOOL(STRIP, strip)
+  AC_CHECK_TOOL(NM, nm)
+fi
+AC_SUBST(HOST_CC)
+AC_SUBST(BUILD_CC)
+AC_SUBST(TARGET_CC)
+
+# Test the C compiler for the target environment.
+tmp_CC="$CC"
+tmp_CFLAGS="$CFLAGS"
+tmp_LDFLAGS="$LDFLAGS"
+tmp_CPPFLAGS="$CPPFLAGS"
+tmp_LIBS="$LIBS"
+CC="$TARGET_CC"
+CFLAGS="$TARGET_CFLAGS"
+CPPFLAGS="$TARGET_CPPFLAGS"
+LDFLAGS="$TARGET_LDFLAGS"
+LIBS=""
+
+# debug flags.
+TARGET_CFLAGS="$TARGET_CFLAGS -Wall -W -Wshadow -Wpointer-arith -Wmissing-prototypes -Wundef -Wstrict-prototypes -g"
+TARGET_CCASFLAGS="$TARGET_CCASFLAGS -g"
+
+# Force no alignment to save space on i386.
+if test "x$target_cpu" = xi386; then
+  AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
+    CFLAGS="$CFLAGS -falign-loops=1"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+        [grub_cv_cc_falign_loop=yes],
+	[grub_cv_cc_falign_loop=no])
+  ])
+
+  if test "x$grub_cv_cc_falign_loop" = xyes; then
+    TARGET_CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1"
+  else
+    TARGET_CFLAGS="$TARGET_CFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1"
+  fi
+
+  # Some toolchains enable these features by default, but they need
+  # registers that aren't set up properly in GRUB.
+  TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-3dnow"
+fi
+
+# By default, GCC 4.4 generates .eh_frame sections containing unwind
+# information in some cases where it previously did not. GRUB doesn't need
+# these and they just use up vital space. Restore the old compiler
+# behaviour.
+AC_CACHE_CHECK([whether -fno-dwarf2-cfi-asm works], [grub_cv_cc_fno_dwarf2_cfi_asm], [
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -fno-dwarf2-cfi-asm"
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+      [grub_cv_cc_fno_dwarf2_cfi_asm=yes],
+      [grub_cv_cc_fno_dwarf2_cfi_asm=no])
+  CFLAGS="$SAVE_CFLAGS"
+])
+
+if test "x$grub_cv_cc_fno_dwarf2_cfi_asm" = xyes; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -fno-dwarf2-cfi-asm"
+fi
+
+grub_apple_target_cc
+if test x$grub_cv_apple_target_cc = xyes ; then
+  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DAPPLE_CC=1"
+  TARGET_CFLAGS="$TARGET_CFLAGS -fnested-functions"
+
+  CFLAGS="$CFLAGS -DAPPLE_CC=1 -fnested-functions"
+  TARGET_APPLE_CC=1
+  AC_CHECK_PROG([OBJCONV], [objconv], [objconv], [])
+  if test "x$OBJCONV" = x ; then
+     AC_CHECK_PROG([OBJCONV], [objconv], [./objconv], [], [.])
+  fi
+  if test "x$OBJCONV" = x ; then
+    AC_MSG_ERROR([objconv not found which is required when building with apple compiler])
+  fi
+  TARGET_IMG_LDSCRIPT=
+  TARGET_IMG_CFLAGS="-static"
+  TARGET_IMG_LDFLAGS='-nostdlib -static -Wl,-preload -Wl,-segalign,20 -Wl,-image_base,'
+  TARGET_IMG_LDFLAGS_AC='-nostdlib -static -Wl,-preload -Wl,-segalign,20 -Wl,-image_base,'
+else
+  TARGET_APPLE_CC=0
+# Use linker script if present, otherwise use builtin -N script.
+if test -f "${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
+  TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
+  TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}  -Wl,-Ttext,"
+  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc  -Wl,-Ttext,"
+else
+  TARGET_IMG_LDSCRIPT=
+  TARGET_IMG_LDFLAGS='-Wl,-N  -Wl,-Ttext,'
+  TARGET_IMG_LDFLAGS_AC='-Wl,-N  -Wl,-Ttext,'
+fi
+TARGET_IMG_CFLAGS=
+fi
+
+# For platforms where ELF is not the default link format.
+AC_MSG_CHECKING([for command to convert module to ELF format])
+case "${host_os}" in
+  cygwin) TARGET_OBJ2ELF='grub-pe2elf';
+# FIXME: put proper test here
+  AC_DEFINE([NEED_REGISTER_FRAME_INFO], 1,
+	    [Define to 1 if GCC generates calls to __register_frame_info()])
+  ;;
+  *) ;;
+esac
+AC_MSG_RESULT([$TARGET_OBJ2ELF])
+
+if test "x$target_m32" = x1; then
+  # Force 32-bit mode.
+  TARGET_CFLAGS="$TARGET_CFLAGS -m32"
+  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m32"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
+  TARGET_MODULE_FORMAT="elf32"
+fi
+
+if test "x$target_m64" = x1; then
+  # Force 64-bit mode.
+  TARGET_CFLAGS="$TARGET_CFLAGS -m64"
+  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m64"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
+  TARGET_MODULE_FORMAT="elf64"
+fi
+
+if test "$target_cpu"-"$platform" = x86_64-efi; then
+  # Use large model to support 4G memory
+  AC_CACHE_CHECK([whether option -mcmodel=large works], grub_cv_cc_mcmodel, [
+    SAVED_CFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS -m64 -mcmodel=large"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+		      [grub_cv_cc_mcmodel=yes],
+		      [grub_cv_cc_mcmodel=no])
+  ])
+  if test "x$grub_cv_cc_mcmodel" = xno; then
+    AC_MSG_ERROR([-mcmodel=large not supported. Upgrade your gcc.])
+  else
+    TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large"
+  fi
+
+  # EFI writes to stack below %rsp, we must not use the red zone
+  AC_CACHE_CHECK([whether option -mno-red-zone works], grub_cv_cc_no_red_zone, [
+    CFLAGS="$CFLAGS -m64 -mno-red-zone"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+		      [grub_cv_cc_no_red_zone=yes],
+		      [grub_cv_cc_no_red_zone=no])
+  ])
+  if test "x$grub_cv_cc_no_red_zone" = xno; then
+    AC_MSG_ERROR([-mno-red-zone not supported, upgrade your gcc])
+  fi
+
+  TARGET_CFLAGS="$TARGET_CFLAGS -mno-red-zone"
+fi
+
+#
+# Compiler features.
+#
+
+# Need __enable_execute_stack() for nested function trampolines?
+grub_CHECK_ENABLE_EXECUTE_STACK
+
+# Position independent executable.
+grub_CHECK_PIE
+[# Need that, because some distributions ship compilers that include
+# `-fPIE' in the default specs.
+if [ x"$pie_possible" = xyes ]; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE"
+fi]
+
+# Smashing stack protector.
+grub_CHECK_STACK_PROTECTOR
+# Need that, because some distributions ship compilers that include
+# `-fstack-protector' in the default specs.
+if test "x$ssp_possible" = xyes; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -fno-stack-protector"
+fi
+grub_CHECK_STACK_ARG_PROBE
+# Cygwin's GCC uses alloca() to probe the stackframe on static
+# stack allocations above some threshold.
+if test x"$sap_possible" = xyes; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -mno-stack-arg-probe"
+fi
+
+AC_ARG_ENABLE([werror],
+	      [AS_HELP_STRING([--disable-werror],
+                             [do not use -Werror when building GRUB])])
+if test x"$enable_werror" != xno ; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -Werror"
+fi
+
+AC_SUBST(TARGET_MODULE_FORMAT)
+AC_SUBST(OBJCONV)
+AC_SUBST(TARGET_APPLE_CC)
+
+AC_SUBST(TARGET_CFLAGS)
+AC_SUBST(TARGET_LDFLAGS)
+AC_SUBST(TARGET_CPPFLAGS)
+AC_SUBST(TARGET_CCASFLAGS)
+
+AC_SUBST(HOST_CFLAGS)
+AC_SUBST(HOST_LDFLAGS)
+AC_SUBST(HOST_CPPFLAGS)
+AC_SUBST(HOST_CCASFLAGS)
+
+# Set them to their new values for the tests below.
+CC="$TARGET_CC"
+if test "x$TARGET_APPLE_CC" = x1 ; then
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wno-error"
+else
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100 -Wno-error"
+fi
+CPPFLAGS="$TARGET_CPPFLAGS"
+LDFLAGS="$TARGET_LDFLAGS"
+LIBS=-lgcc
+
+grub_ASM_USCORE
+if test x$grub_cv_asm_uscore = xyes; then
+CFLAGS="$CFLAGS -Wl,--defsym,_abort=_main"
+else
+CFLAGS="$CFLAGS -Wl,--defsym,abort=main"
+fi
+
+# Check for libgcc symbols
+AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __trampoline_setup __ucmpdi2 _restgpr_14_x)
+
+if test "x$TARGET_APPLE_CC" = x1 ; then
+CFLAGS="$TARGET_CFLAGS -nostdlib"
+else
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100"
+fi
+LIBS=""
+
+# Defined in aclocal.m4.
+grub_PROG_TARGET_CC
+if test "x$TARGET_APPLE_CC" != x1 ; then
+grub_PROG_OBJCOPY_ABSOLUTE
+fi
+grub_PROG_LD_BUILD_ID_NONE
+if test "x$target_cpu" = xi386; then
+  if test "$platform" != emu && test "x$TARGET_APPLE_CC" != x1 ; then
+    if test ! -z "$TARGET_IMG_LDSCRIPT"; then
+      # Check symbols provided by linker script.
+      CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC}8000 -Wl,--defsym,___main=0x8100"
+    fi
+    grub_CHECK_BSS_START_SYMBOL
+    grub_CHECK_END_SYMBOL
+  fi
+  CFLAGS="$TARGET_CFLAGS"
+  grub_I386_ASM_PREFIX_REQUIREMENT
+  grub_I386_ASM_ADDR32
+  grub_I386_ASM_ABSOLUTE_WITHOUT_ASTERISK
+else
+  AC_DEFINE([NESTED_FUNC_ATTR], [], [Catch gcc bug])
+fi
+
+AH_BOTTOM([#if defined(__i386__) && !defined(GRUB_UTIL)
+#define NESTED_FUNC_ATTR __attribute__ ((__regparm__ (1)))
+#else
+#define NESTED_FUNC_ATTR
+#endif])
+
+AC_ARG_ENABLE([efiemu],
+	      [AS_HELP_STRING([--enable-efiemu],
+                             [build and install the efiemu runtimes (default=guessed)])])
+if test x"$enable_efiemu" = xno ; then
+  efiemu_excuse="explicitly disabled"
+fi
+if test x"$efiemu_excuse" = x ; then
+  AC_CACHE_CHECK([whether options required for efiemu work], grub_cv_cc_efiemu, [
+    CFLAGS="$CFLAGS -m64 -mcmodel=large -mno-red-zone -nostdlib"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+		      [grub_cv_cc_efiemu=yes],
+		      [grub_cv_cc_efiemu=no])
+  ])
+  if test x$grub_cv_cc_efiemu = xno; then
+     efiemu_excuse="cannot compile with -m64 -mcmodel=large -mno-red-zone -nostdlib"
+  fi
+fi
+if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then
+  AC_MSG_ERROR([efiemu runtime was explicitly requested but can't be compiled])
+fi
+if test x"$efiemu_excuse" = x ; then
+enable_efiemu=yes
+else
+enable_efiemu=no
+fi
+AC_SUBST([enable_efiemu])
+
+if test "$platform" != emu; then
+AC_CACHE_CHECK([whether -nostdinc -isystem works], [grub_cv_cc_isystem], [
+  SAVED_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+int va_arg_func (int fixed, va_list args);]], [[]])],
+      [grub_cv_cc_isystem=yes],
+      [grub_cv_cc_isystem=no])
+  CPPFLAGS="$SAVED_CPPFLAGS"
+])
+
+if test x"$grub_cv_cc_isystem" = xyes ; then
+  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
+fi
+fi
+
+# Restore the flags.
+CC="$tmp_CC"
+CFLAGS="$tmp_CFLAGS"
+CPPFLAGS="$tmp_CPPFLAGS"
+LDFLAGS="$tmp_LDFLAGS"
+LIBS="$tmp_LIBS"
+
+#
+# Check for options.
+#
+
+# Memory manager debugging.
+AC_ARG_ENABLE([mm-debug],
+	      AS_HELP_STRING([--enable-mm-debug],
+                             [include memory manager debugging]),
+              [AC_DEFINE([MM_DEBUG], [1],
+                         [Define to 1 if you enable memory manager debugging.])])
+
+AC_ARG_ENABLE([grub-emu-usb],
+	      [AS_HELP_STRING([--enable-grub-emu-usb],
+                             [build and install the `grub-emu' debugging utility with USB support (default=guessed)])])
+
+AC_ARG_ENABLE([grub-emu-sdl],
+	      [AS_HELP_STRING([--enable-grub-emu-sdl],
+                             [build and install the `grub-emu' debugging utility with SDL support (default=guessed)])])
+
+AC_ARG_ENABLE([grub-emu-pci],
+	      [AS_HELP_STRING([--enable-grub-emu-pci],
+                             [build and install the `grub-emu' debugging utility with PCI support (potentially dangerous) (default=no)])])
+
+if test "$platform" = emu; then
+  missing_ncurses=
+[# Check for curses libraries.]
+  AC_CHECK_LIB([ncurses], [wgetch], [LIBCURSES="-lncurses"],
+    [AC_CHECK_LIB([curses], [wgetch], [LIBCURSES="-lcurses"],
+      [missing_ncurses=[true]])])
+  AC_SUBST([LIBCURSES])
+[if [ x"$missing_ncurses" = x ]; then ]
+  [# Check for headers.]
+  AC_CHECK_HEADERS([ncurses/curses.h], [],
+    [AC_CHECK_HEADERS([ncurses.h], [],
+      [AC_CHECK_HEADERS([curses.h], [],
+	[missing_ncurses=[true]])])])
+[fi]
+if test x"$missing_ncurses" = xtrue ; then
+  AC_MSG_ERROR([grub-emu can't be compiled without ncurses])
+fi
+
+if test x"$enable_grub_emu_usb" = xno ; then
+  grub_emu_usb_excuse="explicitly disabled"
+fi
+
+if test x"$enable_grub_emu_pci" = xyes ; then
+   grub_emu_usb_excuse="conflicts with PCI support"
+fi
+
+[if [ x"$grub_emu_usb_excuse" = x ]; then
+    # Check for libusb libraries.]
+AC_CHECK_LIB([usb], [usb_claim_interface], [LIBUSB="-lusb"],
+    [grub_emu_usb_excuse=["need libusb library"]])
+    AC_SUBST([LIBUSB])
+[fi]
+[if [ x"$grub_emu_usb_excuse" = x ]; then
+    # Check for headers.]
+    AC_CHECK_HEADERS([usb.h], [],
+      [grub_emu_usb_excuse=["need libusb headers"]])
+[fi]
+if test x"$enable_grub_emu_usb" = xyes && test x"$grub_emu_usb_excuse" != x ; then
+  AC_MSG_ERROR([USB support for grub-emu was explicitly requested but can't be compiled])
+fi
+if test x"$grub_emu_usb_excuse" = x ; then
+enable_grub_emu_usb=yes
+else
+enable_grub_emu_usb=no
+fi
+
+if test x"$enable_grub_emu_sdl" = xno ; then
+  grub_emu_sdl_excuse="explicitely disabled"
+fi
+[if [ x"$grub_emu_sdl_excuse" = x ]; then
+    # Check for libSDL libraries.]
+AC_CHECK_LIB([SDL], [SDL_Init], [LIBSDL="-lSDL"],
+    [grub_emu_sdl_excuse=["libSDL libraries are required to build \`grub-emu' with SDL support"]])
+    AC_SUBST([LIBSDL])
+[fi]
+
+[if [ x"$grub_emu_sdl_excuse" = x ]; then
+    # Check for headers.]
+    AC_CHECK_HEADERS([SDL/SDL.h], [],
+      [grub_emu_sdl_excuse=["libSDL header file is required to build \`grub-emu' with SDL support"]])
+[fi]
+
+if test x"enable_grub_emu_sdl" = xyes && test x"$grub_emu_sdl_excuse" != x ; then
+  AC_MSG_ERROR([SDL support for grub-emu was explicitely requested but can't be compiled])
+fi
+if test x"$grub_emu_sdl_excuse" = x ; then
+enable_grub_emu_sdl=yes
+else
+enable_grub_emu_sdl=no
+fi
+
+if test x"$enable_grub_emu_pci" != xyes ; then
+   grub_emu_pci_excuse="not enabled"
+fi
+
+if test x"$enable_grub_emu_usb" = xyes ; then
+   grub_emu_pci_excuse="conflicts with USB support"
+fi
+
+[if [ x"$grub_emu_pci_excuse" = x ]; then
+      # Check for libpci libraries.]
+   AC_CHECK_LIB([pciaccess], [pci_system_init], [LIBPCIACCESS="-lpciaccess"],
+      [grub_emu_pci_excuse=["need libpciaccess library"]])
+    AC_SUBST([LIBPCIACCESS])
+[fi]
+[if [ x"$grub_emu_pci_excuse" = x ]; then
+    # Check for headers.]
+    AC_CHECK_HEADERS([pci/pci.h], [],
+      [grub_emu_pci_excuse=["need libpciaccess headers"]])
+[fi]
+
+if test x"$grub_emu_pci_excuse" = x ; then
+enable_grub_emu_pci=yes
+else
+
+enable_grub_emu_pci=no
+fi
+
+AC_SUBST([enable_grub_emu_sdl])
+AC_SUBST([enable_grub_emu_usb])
+AC_SUBST([enable_grub_emu_pci])
+fi
+
+AC_ARG_ENABLE([grub-fstest],
+	      [AS_HELP_STRING([--enable-grub-fstest],
+                             [build and install the `grub-fstest' debugging utility (default=guessed)])])
+if test x"$enable_grub_fstest" = xno ; then
+  grub_fstest_excuse="explicitly disabled"
+fi
+if test x"$grub_fstest_excuse" = x ; then
+enable_grub_fstest=yes
+else
+enable_grub_fstest=no
+fi
+AC_SUBST([enable_grub_fstest])
+
+AC_ARG_ENABLE([grub-mkfont],
+	      [AS_HELP_STRING([--enable-grub-mkfont],
+                             [build and install the `grub-mkfont' utility (default=guessed)])])
+if test x"$enable_grub_mkfont" = xno ; then
+  grub_mkfont_excuse="explicitly disabled"
+fi
+
+if test x"$grub_mkfont_excuse" = x ; then
+  # Check for freetype libraries.
+  AC_CHECK_PROGS([FREETYPE], [freetype-config])
+  if test "x$FREETYPE" = x ; then
+    grub_mkfont_excuse=["need freetype2 library"]
+  fi
+  freetype_cflags=`freetype-config --cflags`
+  freetype_libs=`freetype-config --libs`
+fi
+
+if test x"$grub_mkfont_excuse" = x ; then
+  # Check for freetype libraries.
+  SAVED_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $freetype_cflags"
+  AC_CHECK_HEADERS([ft2build.h], [],
+  	[grub_mkfont_excuse=["need freetype2 headers"]])
+  CPPFLAGS="$SAVED_CPPFLAGS"
+fi
+
+if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; then
+  AC_MSG_ERROR([grub-mkfont was explicitly requested but can't be compiled])
+fi
+if test x"$grub_mkfont_excuse" = x ; then
+enable_grub_mkfont=yes
+else
+enable_grub_mkfont=no
+fi
+AC_SUBST([enable_grub_mkfont])
+AC_SUBST([freetype_cflags])
+AC_SUBST([freetype_libs])
+
+AC_SUBST([FONT_SOURCE])
+AS_IF([test x$target_cpu = xi386 -a x$platform = xpc],
+	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
+AS_IF([test x$target_cpu = xi386 -a x$platform = xcoreboot],
+	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
+AS_IF([test x$target_cpu = xmips -a x$platform = xyeeloong],
+	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x80200000)])
+AS_IF([test x$target_cpu = xpowerpc -a x$platform = xieee1275],
+	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x200000)])
+AS_IF([test x$target_cpu = xi386 -a x$platform = xqemu],
+	    [AC_SUBST([GRUB_BOOT_MACHINE_LINK_ADDR], 0xffe00)])
+AS_IF([test x$target_cpu = xi386 -a x$platform = xieee1275],
+	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x10000)])
+AS_IF([test x$TARGET_APPLE_CC = x1],
+	    [AC_SUBST([USE_APPLE_CC_FIXES], yes)])
+
+#
+# Automake conditionals
+#
+
+AM_CONDITIONAL([COND_emu], [test x$platform = xemu])
+AM_CONDITIONAL([COND_i386_pc], [test x$target_cpu = xi386 -a x$platform = xpc])
+AM_CONDITIONAL([COND_i386_efi], [test x$target_cpu = xi386 -a x$platform = xefi])
+AM_CONDITIONAL([COND_i386_coreboot], [test x$target_cpu = xi386 -a x$platform = xcoreboot])
+AM_CONDITIONAL([COND_i386_ieee1275], [test x$target_cpu = xi386 -a x$platform = xieee1275])
+AM_CONDITIONAL([COND_i386_qemu], [test x$target_cpu = xi386 -a x$platform = xqemu])
+AM_CONDITIONAL([COND_x86_64_efi], [test x$target_cpu = xx86_64 -a x$platform = xefi])
+AM_CONDITIONAL([COND_mips_yeeloong], [test x$target_cpu = xmips -a x$platform = xyeeloong])
+AM_CONDITIONAL([COND_mips_qemu_mips], [test x$target_cpu = xmips -a x$platform = xqemu_mips])
+AM_CONDITIONAL([COND_sparc64_ieee1275], [test x$target_cpu = xsparc64 -a x$platform = xieee1275])
+AM_CONDITIONAL([COND_powerpc_ieee1275], [test x$target_cpu = xpowerpc -a x$platform = xieee1275])
+
+AM_CONDITIONAL([COND_MAN_PAGES], [test x$cross_compiling = xno -a x$HELP2MAN != x])
+AM_CONDITIONAL([COND_GRUB_EMU_USB], [test x$enable_grub_emu_usb = xyes])
+AM_CONDITIONAL([COND_GRUB_EMU_SDL], [test x$enable_grub_emu_sdl = xyes])
+AM_CONDITIONAL([COND_GRUB_EMU_PCI], [test x$enable_grub_emu_pci = xyes])
+AM_CONDITIONAL([COND_GRUB_MKFONT], [test x$enable_grub_mkfont = xyes])
+AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x])
+AM_CONDITIONAL([COND_GRUB_FSTEST], [test x$enable_grub_fstest = xyes])
+AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes])
+
diff --git a/docs/Makefile.am b/docs/Makefile.am
new file mode 100644
index 000000000..ab65a8dd2
--- /dev/null
+++ b/docs/Makefile.am
@@ -0,0 +1,6 @@
+AUTOMAKE_OPTIONS = subdir-objects
+AM_MAKEINFOFLAGS = --force --no-split --no-validate
+
+info_TEXINFOS = grub.texi
+grub_TEXINFOS = fdl.texi
+
diff --git a/geninit.sh b/geninit.sh
index 43d2d1640..f0810120f 100644
--- a/geninit.sh
+++ b/geninit.sh
@@ -11,11 +11,6 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-lst="$1"
-shift
-
-header=`echo "${lst}" | sed -e "s/\.lst$/.h/g"`
-
 cat <<EOF
 /* This file is automatically generated by geninit.sh. DO NOT EDIT! */
 /*
@@ -36,22 +31,24 @@ cat <<EOF
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <$header>
+#include <grub/emu/misc.h>
 
 EOF
 
+for mod in "$@"; do
+    echo "extern void grub_${mod}_init (void);"
+    echo "extern void grub_${mod}_fini (void);"
+done
+
 cat <<EOF
 void
 grub_init_all (void)
 {
 EOF
 
-while read line; do
-  file=`echo $line | cut -f1 -d:`
-  if echo $@ | grep $file >/dev/null; then
-    echo $line | sed -e 's/.*GRUB_MOD_INIT *(\([a-zA-Z0-9_]*\)).*/  grub_\1_init ();/'
-  fi
-done < ${lst}
+for mod in "$@"; do
+    echo "grub_${mod}_init ();"
+done
 
 cat <<EOF
 }
@@ -63,12 +60,9 @@ grub_fini_all (void)
 {
 EOF
 
-while read line; do
-  file=`echo $line | cut -f1 -d:`
-  if echo $@ | grep $file >/dev/null; then
-    echo $line | sed -e 's/.*GRUB_MOD_INIT *(\([a-zA-Z0-9_]*\)).*/  grub_\1_fini ();/'
-  fi
-done < ${lst}
+for mod in "$@"; do
+    echo "grub_${mod}_fini ();"
+done
 
 cat <<EOF
 }
diff --git a/geninitheader.sh b/geninitheader.sh
deleted file mode 100644
index 5ad1428b3..000000000
--- a/geninitheader.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 2005,2007  Free Software Foundation, Inc.
-#
-# This gensymlist.sh is free software; the author
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-lst="$1"
-shift
-
-cat <<EOF
-/* This file is automatically generated by gensymlist.sh. DO NOT EDIT! */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007  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/>.
- */
-
-EOF
-
-cat <<EOF
-void grub_init_all (void);
-void grub_fini_all (void);
-EOF
-
-grep -v '^#' "${lst}" | sed -n '/GRUB_MOD_INIT *([a-zA-Z0-9_]*)/{s/.*GRUB_MOD_INIT *(\([a-zA-Z0-9_]*\)).*/void grub_\1_init (void);/;p;}'
-grep -v '^#' "${lst}" | sed -n '/GRUB_MOD_INIT *([a-zA-Z0-9_]*)/{s/.*GRUB_MOD_INIT *(\([a-zA-Z0-9_]*\)).*/void grub_\1_fini (void);/;p;}'
diff --git a/genkernsyms.sh.in b/genkernsyms.sh.in
deleted file mode 100644
index c5c63b2d5..000000000
--- a/genkernsyms.sh.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 2002,2006,2008  Free Software Foundation, Inc.
-#
-# This gensymlist.sh is free software; the author
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-### The configure script will replace these variables.
-
-: ${srcdir=@srcdir@}
-: ${CC=@TARGET_CC@}
-
-u=
-grep "^#define HAVE_ASM_USCORE" config.h >/dev/null 2>&1 && u="_"
-
-$CC @TARGET_CFLAGS@ -DGRUB_SYMBOL_GENERATOR=1 -E -I. -Iinclude -I"$srcdir/include" $* \
-  | grep -v '^#' \
-  | sed -n \
-        -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/'"$u"'\1 kernel/;p;}' \
-        -e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/'"$u"'\1 kernel/;p;}' \
-  | sort -u
diff --git a/genmk.rb b/genmk.rb
deleted file mode 100644
index e62dbd4f6..000000000
--- a/genmk.rb
+++ /dev/null
@@ -1,475 +0,0 @@
-#! /usr/bin/ruby -w
-#
-# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
-#
-# This genmk.rb is free software; the author
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-module Enumerable
-  def collect_with_index
-    ret = []
-    self.each_with_index do |item, index|
-      ret.push(yield(item, index))
-    end
-    ret
-  end
-end
-
-class String
-  def to_var
-    self.gsub(/[^a-zA-Z0-9_@]/, '_')
-  end
-
-  def suffix(str)
-    self.sub(/\.[^\.]*$/, '') + '.' + str
-  end
-
-  def to_obj
-    self.sub(/\.[^\.]*$/, '').to_var + '.o'
-  end
-end
-
-class Image
-  def initialize(dir, name)
-    @dir = dir
-    @name = name
-    @rule_count = 0
-  end
-  attr_reader :dir, :name
-
-  def rule(sources)
-    prefix = @name.to_var
-    @rule_count += 1
-    exe = @name.suffix('exec')
-    objs = sources.collect do |src|
-      raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
-      prefix + '-' + src.to_obj
-    end
-    objs_str = objs.join(' ')
-    deps = objs.collect {|obj| obj.suffix('d')}
-    deps_str = deps.join(' ')
-
-"
-clean-image-#{@name}.#{@rule_count}:
-	rm -f #{@name} #{exe} #{objs_str}
-
-CLEAN_IMAGE_TARGETS += clean-image-#{@name}.#{@rule_count}
-
-mostlyclean-image-#{@name}.#{@rule_count}:
-	rm -f #{deps_str}
-
-MOSTLYCLEAN_IMAGE_TARGETS += mostlyclean-image-#{@name}.#{@rule_count}
-
-ifneq ($(TARGET_APPLE_CC),1)
-#{@name}: #{exe}
-	$(OBJCOPY) -O $(#{prefix}_FORMAT) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< $@
-else
-ifneq (#{exe},kernel.exec)
-#{@name}: #{exe} ./grub-macho2img
-	./grub-macho2img $< $@
-else
-#{@name}: #{exe} ./grub-macho2img
-	./grub-macho2img --bss $< $@
-endif
-endif
-
-#{exe}: #{objs_str}
-	$(TARGET_CC) -o $@ $^ $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS)
-
-" + objs.collect_with_index do |obj, i|
-      src = sources[i]
-      fake_obj = File.basename(src).suffix('o')
-      dep = deps[i]
-      flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end
-      extra_flags = if /\.S$/ =~ src then '-DASM_FILE=1' else '' end
-      dir = File.dirname(src)
-
-      "#{obj}: #{src} $(#{src}_DEPENDENCIES)
-	$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -DGRUB_FILE=\\\"#{src}\\\" -MD -c -o $@ $<
--include #{dep}
-
-"
-    end.join('')
-  end
-end
-
-# Use PModule instead Module, to avoid name conflicting.
-class PModule
-  def initialize(dir, name)
-    @dir = dir
-    @name = name
-    @rule_count = 0
-  end
-  attr_reader :dir, :name
-
-  def rule(sources)
-    prefix = @name.to_var
-    @rule_count += 1
-    objs = sources.collect do |src|
-      raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
-      prefix + '-' + src.to_obj
-    end
-    objs_str = objs.join(' ')
-    deps = objs.collect {|obj| obj.suffix('d')}
-    deps_str = deps.join(' ')
-    pre_obj = 'pre-' + @name.suffix('o')
-    mod_src = 'mod-' + @name.suffix('c')
-    mod_obj = mod_src.suffix('o')
-    defsym = 'def-' + @name.suffix('lst')
-    undsym = 'und-' + @name.suffix('lst')
-    mod_name = File.basename(@name, '.mod')
-    symbolic_name = mod_name.sub(/\.[^\.]*$/, '')
-
-"
-clean-module-#{@name}.#{@rule_count}:
-	rm -f #{@name} #{mod_obj} #{mod_src} #{pre_obj} #{objs_str} #{undsym}
-
-CLEAN_MODULE_TARGETS += clean-module-#{@name}.#{@rule_count}
-
-clean-module-#{@name}-symbol.#{@rule_count}:
-	rm -f #{defsym}
-
-CLEAN_MODULE_TARGETS += clean-module-#{@name}-symbol.#{@rule_count}
-DEFSYMFILES += #{defsym}
-mostlyclean-module-#{@name}.#{@rule_count}:
-	rm -f #{deps_str}
-
-MOSTLYCLEAN_MODULE_TARGETS += mostlyclean-module-#{@name}.#{@rule_count}
-UNDSYMFILES += #{undsym}
-
-ifeq ($(TARGET_NO_MODULES), yes)
-#{@name}: #{pre_obj} $(TARGET_OBJ2ELF)
-	-rm -f $@
-	$(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ #{pre_obj}
-	if test ! -z \"$(TARGET_OBJ2ELF)\"; then ./$(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi
-	if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K _grub_mod_init -K _grub_mod_fini -R .note -R .comment $@; fi
-else
-ifneq ($(TARGET_APPLE_CC),1)
-#{@name}: #{pre_obj} #{mod_obj} $(TARGET_OBJ2ELF)
-	-rm -f $@
-	$(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ #{pre_obj} #{mod_obj}
-	if test ! -z \"$(TARGET_OBJ2ELF)\"; then ./$(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi
-	if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K _grub_mod_init -K _grub_mod_fini -R .note -R .comment $@; fi
-else
-#{@name}: #{pre_obj} #{mod_obj} $(TARGET_OBJ2ELF)
-	-rm -f $@
-	-rm -f $@.bin
-	$(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@.bin #{pre_obj} #{mod_obj}
-	$(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -ew2030 -ew2050 -nu -nd $@.bin $@
-	-rm -f $@.bin
-endif
-endif
-
-#{pre_obj}: $(#{prefix}_DEPENDENCIES) #{objs_str}
-	-rm -f $@
-	$(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ #{objs_str}
-
-#{mod_obj}: #{mod_src}
-	$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(#{prefix}_CFLAGS) -DGRUB_FILE=\\\"#{mod_src}\\\" -c -o $@ $<
-
-#{mod_src}: $(builddir)/moddep.lst $(srcdir)/genmodsrc.sh
-	sh $(srcdir)/genmodsrc.sh '#{mod_name}' $< > $@ || (rm -f $@; exit 1)
-
-ifneq ($(TARGET_APPLE_CC),1)
-#{defsym}: #{pre_obj}
-	$(NM) -g --defined-only -P -p $< | sed 's/^\\([^ ]*\\).*/\\1 #{mod_name}/' > $@
-else
-#{defsym}: #{pre_obj}
-	$(NM) -g -P -p $< | grep -E '^[a-zA-Z0-9_]* [TDS]'  | sed 's/^\\([^ ]*\\).*/\\1 #{mod_name}/' > $@
-endif
-
-#{undsym}: #{pre_obj}
-	echo '#{mod_name}' > $@
-	$(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-" + objs.collect_with_index do |obj, i|
-      src = sources[i]
-      fake_obj = File.basename(src).suffix('o')
-      extra_target = obj.sub(/\.[^\.]*$/, '') + '-extra'
-      command = 'cmd-' + obj.suffix('lst')
-      fs = 'fs-' + obj.suffix('lst')
-      partmap = 'partmap-' + obj.suffix('lst')
-      handler = 'handler-' + obj.suffix('lst')
-      terminal = 'terminal-' + obj.suffix('lst')
-      parttool = 'parttool-' + obj.suffix('lst')
-      video = 'video-' + obj.suffix('lst')
-      dep = deps[i]
-      flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end
-      extra_flags = if /\.S$/ =~ src then '-DASM_FILE=1' else '' end
-      dir = File.dirname(src)
-
-      "#{obj}: #{src} $(#{src}_DEPENDENCIES)
-	$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -DGRUB_FILE=\\\"#{src}\\\" -MD -c -o $@ $<
--include #{dep}
-
-clean-module-#{extra_target}.#{@rule_count}:
-	rm -f #{command} #{fs} #{partmap} #{handler} #{parttool} #{video} #{terminal}
-
-CLEAN_MODULE_TARGETS += clean-module-#{extra_target}.#{@rule_count}
-
-COMMANDFILES += #{command}
-FSFILES += #{fs}
-PARTTOOLFILES += #{parttool}
-PARTMAPFILES += #{partmap}
-HANDLERFILES += #{handler}
-TERMINALFILES += #{terminal}
-VIDEOFILES += #{video}
-
-#{command}: #{src} $(#{src}_DEPENDENCIES) gencmdlist.sh
-	set -e; \
-	  $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
-	  | sh $(srcdir)/gencmdlist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
-
-#{fs}: #{src} $(#{src}_DEPENDENCIES) genfslist.sh
-	set -e; \
-	  $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
-	  | sh $(srcdir)/genfslist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
-
-#{parttool}: #{src} $(#{src}_DEPENDENCIES) genparttoollist.sh
-	set -e; \
-	  $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
-	  | sh $(srcdir)/genparttoollist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
-
-#{partmap}: #{src} $(#{src}_DEPENDENCIES) genpartmaplist.sh
-	set -e; \
-	  $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
-	  | sh $(srcdir)/genpartmaplist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
-
-#{handler}: #{src} $(#{src}_DEPENDENCIES) genhandlerlist.sh
-	set -e; \
-	  $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
-	  | sh $(srcdir)/genhandlerlist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
-
-#{terminal}: #{src} $(#{src}_DEPENDENCIES) genterminallist.sh
-	set -e; \
-	  $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
-	  | sh $(srcdir)/genterminallist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
-
-#{video}: #{src} $(#{src}_DEPENDENCIES) genvideolist.sh
-	set -e; \
-	  $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
-	  | sh $(srcdir)/genvideolist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
-
-"
-    end.join('')
-  end
-end
-
-class Utility
-  def initialize(dir, name)
-    @dir = dir
-    @name = name
-    @rule_count = 0
-  end
-  def print_tail()
-    prefix = @name.to_var
-    print "#{@name}: $(#{prefix}_DEPENDENCIES) $(#{prefix}_OBJECTS)
-	$(CC) -o $@ $(#{prefix}_OBJECTS) $(LDFLAGS) $(#{prefix}_LDFLAGS)
-
-"
-  end
-  attr_reader :dir, :name
-
-  def rule(sources)
-    prefix = @name.to_var
-    @rule_count += 1
-    objs = sources.collect do |src|
-      raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
-      prefix + '-' + src.to_obj
-    end
-    objs_str = objs.join(' ');
-    deps = objs.collect {|obj| obj.suffix('d')}
-    deps_str = deps.join(' ');
-
-    "
-clean-utility-#{@name}.#{@rule_count}:
-	rm -f #{@name}$(EXEEXT) #{objs_str}
-
-CLEAN_UTILITY_TARGETS += clean-utility-#{@name}.#{@rule_count}
-
-mostlyclean-utility-#{@name}.#{@rule_count}:
-	rm -f #{deps_str}
-
-MOSTLYCLEAN_UTILITY_TARGETS += mostlyclean-utility-#{@name}.#{@rule_count}
-
-#{prefix}_OBJECTS += #{objs_str}
-
-" + objs.collect_with_index do |obj, i|
-      src = sources[i]
-      fake_obj = File.basename(src).suffix('o')
-      dep = deps[i]
-      dir = File.dirname(src)
-
-      "#{obj}: #{src} $(#{src}_DEPENDENCIES)
-	$(CC) -I#{dir} -I$(srcdir)/#{dir} $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1 $(#{prefix}_CFLAGS) -DGRUB_FILE=\\\"#{src}\\\" -MD -c -o $@ $<
--include #{dep}
-
-"
-    end.join('')
-  end
-end
-
-class Program
-  def initialize(dir, name)
-    @dir = dir
-    @name = name
-  end
-  attr_reader :dir, :name
-
-  def print_tail()
-    prefix = @name.to_var
-    print "CLEANFILES += #{@name} $(#{prefix}_OBJECTS)
-ifeq ($(#{prefix}_RELOCATABLE),yes)
-#{@name}: $(#{prefix}_DEPENDENCIES) $(#{prefix}_OBJECTS)
-	$(TARGET_CC) -Wl,-r,-d -o $@ $(#{prefix}_OBJECTS) $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS)
-	if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) --strip-unneeded -K start -R .note -R .comment $@; fi
-else
-#{@name}: $(#{prefix}_DEPENDENCIES) $(#{prefix}_OBJECTS)
-	$(TARGET_CC) -o $@ $(#{prefix}_OBJECTS) $(TARGET_LDFLAGS) $(#{prefix}_LDFLAGS)
-	if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) -R .rel.dyn -R .reginfo -R .note -R .comment $@; fi
-endif
-
-"
-  end
-
-  def rule(sources)
-    prefix = @name.to_var
-    objs = sources.collect do |src|
-      raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
-      prefix + '-' + src.to_obj
-    end
-    deps = objs.collect {|obj| obj.suffix('d')}
-    deps_str = deps.join(' ');
-
-    "MOSTLYCLEANFILES += #{deps_str}
-
-" + objs.collect_with_index do |obj, i|
-      src = sources[i]
-      fake_obj = File.basename(src).suffix('o')
-      dep = deps[i]
-      flag = if /\.c$/ =~ src then 'CFLAGS' else 'ASFLAGS' end
-      extra_flags = if /\.S$/ =~ src then '-DASM_FILE=1' else '' end
-      dir = File.dirname(src)
-
-      "#{obj}: #{src} $(#{src}_DEPENDENCIES)
-	$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -DGRUB_FILE=\\\"#{src}\\\" -MD -c -o $@ $<
-
--include #{dep}
-
-#{prefix}_OBJECTS += #{obj}
-"
-    end.join('')
-  end
-end
-
-class Script
-  def initialize(dir, name)
-    @dir = dir
-    @name = name
-  end
-  attr_reader :dir, :name
-
-  def rule(sources)
-    if sources.length != 1
-      raise "only a single source file must be specified for a script"
-    end
-    src = sources[0]
-    if /\.in$/ !~ src
-      raise "unknown source file `#{src}'"
-    end
-
-    "CLEANFILES += #{@name}
-
-#{@name}: #{src} $(#{src}_DEPENDENCIES) config.status
-	./config.status --file=-:#{src} | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
-	chmod +x $@
-
-"
-  end
-end
-
-images = []
-utils = []
-pmodules = []
-programs = []
-scripts = []
-
-l = gets
-print l
-print "# Generated by genmk.rb, please don't edit!\n"
-
-cont = false
-str = nil
-while l = gets
-  if cont
-    str += l
-  else
-    str = l
-  end
-
-  print l
-  cont = (/\\$/ =~ l)
-  unless cont
-    str.gsub!(/\\\n/, ' ')
-
-    if /^([a-zA-Z0-9_]+)\s*\+?=\s*(.*?)\s*$/ =~ str
-      var, args = $1, $2
-
-      if var =~ /^([a-zA-Z0-9_]+)_([A-Z]+)$/
-	prefix, type = $1, $2
-
-	case type
-	when 'IMAGES'
-	  images += args.split(/\s+/).collect do |img|
-	    Image.new(prefix, img)
-	  end
-
-	when 'MODULES'
-	  pmodules += args.split(/\s+/).collect do |pmod|
-	    PModule.new(prefix, pmod)
-	  end
-
-	when 'UTILITIES'
-	  utils += args.split(/\s+/).collect do |util|
-	    Utility.new(prefix, util)
-	  end
-
-	when 'PROGRAMS'
-	  programs += args.split(/\s+/).collect do |prog|
-	    Program.new(prefix, prog)
-	  end
-
-	when 'SCRIPTS'
-	  scripts += args.split(/\s+/).collect do |script|
-	    Script.new(prefix, script)
-	  end
-
-	when 'SOURCES'
-	  if img = images.detect() {|i| i.name.to_var == prefix}
-	    print img.rule(args.split(/\s+/))
-	  elsif pmod = pmodules.detect() {|m| m.name.to_var == prefix}
-	    print pmod.rule(args.split(/\s+/))
-	  elsif util = utils.detect() {|u| u.name.to_var == prefix}
-	    print util.rule(args.split(/\s+/))
-	  elsif program = programs.detect() {|u| u.name.to_var == prefix}
-	    print program.rule(args.split(/\s+/))
-	  elsif script = scripts.detect() {|s| s.name.to_var == prefix}
-	    print script.rule(args.split(/\s+/))
-	  end
-	end
-      end
-
-    end
-
-  end
-
-end
-utils.each {|util| util.print_tail()}
-programs.each {|program| program.print_tail()}
-
diff --git a/gentpl.py b/gentpl.py
new file mode 100644
index 000000000..214b58afd
--- /dev/null
+++ b/gentpl.py
@@ -0,0 +1,460 @@
+#! /usr/bin/python
+
+#
+# This is the python script used to generate Makefile.tpl
+#
+
+GRUB_PLATFORMS = [ "emu", "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot",
+                   "i386_ieee1275", "x86_64_efi", "mips_yeeloong", "sparc64_ieee1275",
+                   "powerpc_ieee1275" ]
+
+GROUPS = {}
+GROUPS["i386"]    = [ "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot", "i386_ieee1275" ]
+GROUPS["x86_64"]  = [ "x86_64_efi" ]
+GROUPS["mips"]    = [ "mips_yeeloong" ]
+GROUPS["sparc64"] = [ "sparc64_ieee1275" ]
+GROUPS["powerpc"] = [ "powerpc_ieee1275" ]
+GROUPS["x86"]     = GROUPS["i386"] + GROUPS["x86_64"]
+GROUPS["x86_efi"] = [ "i386_efi", "x86_64_efi" ]
+GROUPS["common"]  = GRUB_PLATFORMS[:]
+GROUPS["nonemu"]  = GRUB_PLATFORMS[:]
+GROUPS["nonemu"].remove("emu")
+
+#
+# Create platform => groups reverse map, where groups covering that
+# platform are ordered by their sizes
+#
+RMAP = {}
+for platform in GRUB_PLATFORMS:
+    # initialize with platform itself as a group
+    RMAP[platform] = [ platform ]
+
+    for k in GROUPS.keys():
+        v = GROUPS[k]
+        # skip groups that don't cover this platform
+        if platform not in v: continue
+
+        bigger = []
+        smaller = []
+        # partition currently known groups based on their size
+        for group in RMAP[platform]:
+            if group in GRUB_PLATFORMS: smaller.append(group)
+            elif len(GROUPS[group]) < len(v): smaller.append(group)
+            else: bigger.append(group)
+        # insert in the middle
+        RMAP[platform] = smaller + [ k ] + bigger
+
+#
+# Global variables
+#
+GVARS = []
+
+def gvar_add(var, value):
+    if var not in GVARS:
+        GVARS.append(var)
+    return var + " += " + value + "\n"
+
+def global_variable_initializers():
+    r = ""
+    for var in GVARS:
+        r += var + " ?= \n"
+    return r
+
+#
+# Per PROGRAM/SCRIPT variables 
+#
+
+def var_set(var, value):
+    return var + "  = " + value + "\n"
+
+def var_add(var, value):
+    return var + " += " + value + "\n"
+
+#
+# Autogen constructs
+#
+
+def if_tag(tag, closure):
+    return "[+ IF " + tag + " +]" + closure() + "[+ ENDIF +]"
+
+def if_tag_defined(tag, closure):
+    return "[+ IF " + tag + " defined +]" + closure() + "[+ ENDIF +]"
+
+def for_tag(tag, closure):
+    return "[+ FOR ." + tag + " +]" + closure() + "[+ ENDFOR +]"
+
+def collect_values(tag, prefix=""):
+    return for_tag(tag, lambda: prefix + "[+ ." + tag + " +] ")
+
+def each_group(platform, suffix, closure):
+    r = None
+    for group in RMAP[platform]:
+        if r == None:
+            r = "[+ IF ." + group + suffix + " +]"
+        else:
+            r += "[+ ELIF ." + group + suffix + " +]"
+            
+        r += closure(group)
+
+    if r:
+        r += "[+ ELSE +]"
+        r += closure(None)
+        r += "[+ ENDIF +]"
+    else:
+        r = closure(None)
+
+    return r
+
+def each_platform(closure):
+    r = ""
+    for platform in GRUB_PLATFORMS:
+        for group in RMAP[platform]:
+            if group == RMAP[platform][0]:
+                r += "[+ IF ." + group + " defined +]"
+            else:
+                r += "[+ ELIF ." + group + " defined +]"
+
+            r += "if COND_" + platform + "\n"
+            r += closure(platform)
+            r += "endif\n"
+        r += "[+ ENDIF +]"
+    return r
+
+def canonical_name():   return "[+ % name `echo -n %s | sed -e 's/[^0-9A-Za-z@_]/_/g'` +]"
+def canonical_module(): return canonical_name() + "_module"
+def canonical_kernel(): return canonical_name() + "_exec"
+def canonical_image(): return canonical_name() + "_image"
+
+def shared_sources(prefix=""):        return collect_values("shared", prefix)
+def shared_nodist_sources(prefix=""): return collect_values("nodist_shared", prefix)
+
+def default_sources(prefix=""):        return collect_values("source", prefix)
+def default_nodist_sources(prefix=""): return collect_values("nodist", prefix)
+def default_ldadd():     return collect_values("ldadd")
+def default_cflags():    return collect_values("cflags")
+def default_ldflags():   return collect_values("ldflags")
+def default_cppflags():  return collect_values("cppflags")
+def default_ccasflags(): return collect_values("ccasflags")
+
+def group_sources(group, prefix=""):        return collect_values(group, prefix) if group else default_sources(prefix)
+def group_nodist_sources(group, prefix=""): return collect_values(group + "_nodist", prefix) if group else default_nodist_sources(prefix)
+
+def platform_sources(platform, prefix=""):        return each_group(platform, "", lambda g: collect_values(g, prefix) if g else default_sources(prefix))
+def platform_nodist_sources(platform, prefix=""): return each_group(platform, "_nodist", lambda g: collect_values(g + "_nodist", prefix) if g else default_nodist_sources(prefix))
+
+def platform_ldadd(platform):     return each_group(platform, "_ldadd", lambda g: collect_values(g + "_ldadd") if g else default_ldadd())
+def platform_cflags(platform):    return each_group(platform, "_cflags", lambda g: collect_values(g + "_cflags") if g else default_cflags())
+def platform_ldflags(platform):   return each_group(platform, "_ldflags", lambda g: collect_values(g + "_ldflags") if g else default_ldflags())
+def platform_cppflags(platform):  return each_group(platform, "_cppflags", lambda g: collect_values(g + "_cppflags") if g else default_cppflags())
+def platform_ccasflags(platform): return each_group(platform, "_ccasflags", lambda g: collect_values(g + "_ccasflags") if g else default_ccasflags())
+def platform_format(platform):    return each_group(platform, "_format", lambda g: collect_values(g + "_format") if g else "binary")
+
+def module(platform):
+    r  = gvar_add("noinst_PROGRAMS", "[+ name +].module")
+    r += gvar_add("MODULE_FILES", "[+ name +].module")
+
+    r += var_set(canonical_module() + "_SOURCES", platform_sources(platform) + "## platform sources")
+    r += var_add(canonical_module() + "_SOURCES", shared_sources() + "## shared sources")
+    r += var_set("nodist_" + canonical_module() + "_SOURCES", platform_nodist_sources(platform) + "## platform nodist sources")
+    r += var_add("nodist_" + canonical_module() + "_SOURCES", shared_nodist_sources() + "## shared nodist sources")
+    r += var_set(canonical_module() + "_LDADD", platform_ldadd(platform))
+    r += var_set(canonical_module() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_MODULE) " + platform_cflags(platform))
+    r += var_set(canonical_module() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_MODULE) " + platform_ldflags(platform))
+    r += var_set(canonical_module() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_MODULE) " + platform_cppflags(platform))
+    r += var_set(canonical_module() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_MODULE) " + platform_ccasflags(platform))
+
+    r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_module() + "_SOURCES)")
+    r += gvar_add("CLEANFILES", "$(nodist_" + canonical_module() + "_SOURCES)")
+
+    r += gvar_add("DEF_FILES", "def-[+ name +].lst")
+    r += gvar_add("UND_FILES", "und-[+ name +].lst")
+    r += gvar_add("MOD_FILES", "[+ name +].mod")
+    r += gvar_add("platform_DATA", "[+ name +].mod")
+    r += gvar_add("CLEANFILES", "def-[+ name +].lst und-[+ name +].lst mod-[+ name +].c mod-[+ name +].o [+ name +].mod")
+
+    r += gvar_add("COMMAND_FILES", "command-[+ name +].lst")
+    r += gvar_add("FS_FILES", "fs-[+ name +].lst")
+    r += gvar_add("VIDEO_FILES", "video-[+ name +].lst")
+    r += gvar_add("PARTMAP_FILES", "partmap-[+ name +].lst")
+    r += gvar_add("HANDLER_FILES", "handler-[+ name +].lst")
+    r += gvar_add("PARTTOOL_FILES", "parttool-[+ name +].lst")
+    r += gvar_add("TERMINAL_FILES", "terminal-[+ name +].lst")
+    r += gvar_add("CLEANFILES", "command-[+ name +].lst fs-[+ name +].lst")
+    r += gvar_add("CLEANFILES", "handler-[+ name +].lst terminal-[+ name +].lst")
+    r += gvar_add("CLEANFILES", "video-[+ name +].lst partmap-[+ name +].lst parttool-[+ name +].lst")
+
+    r += """
+[+ name +].pp: $(""" + canonical_module() + """_SOURCES) $(nodist_""" + canonical_module() + """_SOURCES)
+	$(TARGET_CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(""" + canonical_module() + """_CPPFLAGS) $(CPPFLAGS) $^ > $@ || (rm -f $@; exit 1)
+
+def-[+ name +].lst: [+ name +].module
+	if test x$(USE_APPLE_CC_FIXES) = xyes; then \
+	  $(NM) -g -P -p $< | grep -E '^[a-zA-Z0-9_]* [TDS]' | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@; \
+	else \
+	  $(NM) -g --defined-only -P -p $< | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@; \
+	fi
+
+und-[+ name +].lst: [+ name +].module
+	$(NM) -u -P -p $< | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@
+
+mod-[+ name +].c: [+ name +].module $(top_builddir)/moddep.lst $(top_srcdir)/genmodsrc.sh
+	sh $(top_srcdir)/genmodsrc.sh [+ name +] $(top_builddir)/moddep.lst > $@ || (rm -f $@; exit 1)
+
+mod-[+ name +].o: mod-[+ name +].c
+	$(TARGET_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS_MODULE) $(CPPFLAGS) $(CFLAGS_MODULE) $(CFLAGS) -c -o $@ $<
+
+[+ name +].mod: [+ name +].module mod-[+ name +].o
+	if test x$(USE_APPLE_CC_FIXES) = xyes; then \
+	  $(CCLD) $(LDFLAGS_MODULE) $(LDFLAGS) -o $@.bin $^; \
+	  $(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -nu -nd $@.bin $@; \
+	  rm -f $@.bin; \
+	else \
+	  $(CCLD) -o $@ $(LDFLAGS_MODULE) $(LDFLAGS) $^; \
+	  if test ! -z '$(TARGET_OBJ2ELF)'; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
+	  $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K _grub_mod_init -K _grub_mod_fini -R .note -R .comment $@; \
+	fi
+
+command-[+ name +].lst: [+ name +].pp $(top_srcdir)/gencmdlist.sh
+	cat $< | sh $(top_srcdir)/gencmdlist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+
+fs-[+ name +].lst: [+ name +].pp $(top_srcdir)/genfslist.sh
+	cat $< | sh $(top_srcdir)/genfslist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+
+video-[+ name +].lst: [+ name +].pp $(top_srcdir)/genvideolist.sh
+	cat $< | sh $(top_srcdir)/genvideolist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+
+partmap-[+ name +].lst: [+ name +].pp $(top_srcdir)/genpartmaplist.sh
+	cat $< | sh $(top_srcdir)/genpartmaplist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+
+parttool-[+ name +].lst: [+ name +].pp $(top_srcdir)/genparttoollist.sh
+	cat $< | sh $(top_srcdir)/genparttoollist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+
+handler-[+ name +].lst: [+ name +].pp $(top_srcdir)/genhandlerlist.sh
+	cat $< | sh $(top_srcdir)/genhandlerlist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+
+terminal-[+ name +].lst: [+ name +].pp $(top_srcdir)/genterminallist.sh
+	cat $< | sh $(top_srcdir)/genterminallist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+"""
+    return r
+
+def rule(target, source, cmd):
+    if cmd[0] == "\n":
+        return "\n" + target + ": " + source + cmd.replace("\n", "\n\t") + "\n"
+    else:
+        return "\n" + target + ": " + source + "\n\t" + cmd.replace("\n", "\n\t") + "\n"
+
+def image_nostrip(platform):
+    return if_tag_defined("image_nostrip." + platform, lambda: rule("[+ name +].img", "[+ name +].exec", "cp $< $@"))
+
+def image_strip(platform):
+    return if_tag_defined("image_strip." + platform, lambda: rule("[+ name +].img", "[+ name +].exec", "$(STRIP) -o $@ -R .rel.dyn -R .reginfo -R .note -R .comment $<"))
+
+def image_strip_keep_kernel(platform):
+    return if_tag_defined("image_strip_keep_kernel." + platform, lambda: rule("[+ name +].img", "[+ name +].exec", "$(STRIP) -o $@ --strip-unneeded -K start -R .note -R .comment $<"))
+
+def image_strip_macho2img(platform):
+    return if_tag_defined("image_strip_macho2img." + platform, lambda: rule("[+ name +].img", "[+ name +].exec", """
+if test "x$(TARGET_APPLE_CC)" = x1; then \
+  $(MACHO2IMG) --bss $< $@ || exit 1; \
+else \
+  $(STRIP) -o $@ -O binary --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< || exit 1; \
+fi
+"""))
+
+def kernel(platform):
+    r  = gvar_add("noinst_PROGRAMS", "[+ name +].exec")
+    r += var_set(canonical_kernel() + "_SOURCES", platform_sources(platform))
+    r += var_add(canonical_kernel() + "_SOURCES", shared_sources())
+    r += var_set("nodist_" + canonical_kernel() + "_SOURCES", platform_nodist_sources(platform) + "## platform nodist sources")
+    r += var_add("nodist_" + canonical_kernel() + "_SOURCES", shared_nodist_sources() + "## shared nodist sources")
+    r += var_set(canonical_kernel() + "_LDADD", platform_ldadd(platform))
+    r += var_set(canonical_kernel() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_KERNEL) " + platform_cflags(platform))
+    r += var_set(canonical_kernel() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_KERNEL) " + platform_ldflags(platform))
+    r += var_set(canonical_kernel() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) " + platform_cppflags(platform))
+    r += var_set(canonical_kernel() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_KERNEL) " + platform_ccasflags(platform))
+
+    r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_kernel() + "_SOURCES)")
+    r += gvar_add("CLEANFILES", "$(nodist_" + canonical_kernel() + "_SOURCES)")
+
+    r += gvar_add("platform_DATA", "[+ name +].img")
+    r += image_nostrip(platform)
+    r += image_strip(platform)
+    r += image_strip_keep_kernel(platform)
+    r += image_strip_macho2img(platform)
+    return r
+
+def image(platform):
+    r  = gvar_add("noinst_PROGRAMS", "[+ name +].image")
+    r += var_set(canonical_image() + "_SOURCES", platform_sources(platform))
+    r += var_add(canonical_image() + "_SOURCES", shared_sources())
+    r += var_set("nodist_" + canonical_image() + "_SOURCES", platform_nodist_sources(platform) + "## platform nodist sources")
+    r += var_add("nodist_" + canonical_image() + "_SOURCES", shared_nodist_sources() + "## shared nodist sources")
+    r += var_set(canonical_image() + "_LDADD", platform_ldadd(platform))
+    r += var_set(canonical_image() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_IMAGE) " + platform_cflags(platform))
+    r += var_set(canonical_image() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_IMAGE) " + platform_ldflags(platform))
+    r += var_set(canonical_image() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_IMAGE) " + platform_cppflags(platform))
+    r += var_set(canonical_image() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_IMAGE) " + platform_ccasflags(platform))
+
+    r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_image() + "_SOURCES)")
+    r += gvar_add("CLEANFILES", "$(nodist_" + canonical_image() + "_SOURCES)")
+
+    r += gvar_add("platform_DATA", "[+ name +].img")
+    r += rule("[+ name +].img", "[+ name +].image", """
+if test x$(USE_APPLE_CC_FIXES) = xyes; then \
+  $(MACHO2IMG) $< $@; \
+else \
+  $(OBJCOPY) -O """ + platform_format(platform) + """ --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< $@; \
+fi
+""")
+    return r
+
+def library(platform):
+    r  = gvar_add("noinst_LIBRARIES", "[+ name +]")
+    r += var_set(canonical_name() + "_SOURCES", platform_sources(platform))
+    r += var_add(canonical_name() + "_SOURCES", shared_sources())
+    r += var_set("nodist_" + canonical_name() + "_SOURCES", platform_nodist_sources(platform))
+    r += var_add("nodist_" + canonical_name() + "_SOURCES", shared_nodist_sources())
+    r += var_set(canonical_name() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_LIBRARY) " + platform_cflags(platform))
+    r += var_set(canonical_name() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) " + platform_cppflags(platform))
+    r += var_set(canonical_name() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_LIBRARY) " + platform_ccasflags(platform))
+
+    r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_name() + "_SOURCES)")
+    r += gvar_add("CLEANFILES", "$(nodist_" + canonical_name() + "_SOURCES)")
+
+    return r
+
+def installdir(default="bin"):
+    return "[+ IF installdir +][+ installdir +][+ ELSE +]" + default + "[+ ENDIF +]"
+
+def manpage():
+    r  = "if COND_MAN_PAGES\n"
+    r += "man_MANS += [+ name +].[+ mansection +]\n"
+    r += rule("[+ name +].[+ mansection +]", "", """
+$(MAKE) $(AM_MAKEFLAGS) [+ name +]
+chmod a+x [+ name +]
+$(HELP2MAN) --section=[+ mansection +] -o $@ ./[+ name +]
+""")
+    r += gvar_add("CLEANFILES", "[+ name +].[+ mansection +]")
+    r += "endif\n"
+    return r
+
+def program(platform, test=False):
+    if test:
+        r = gvar_add("check_PROGRAMS", "[+ name +]")
+    else:
+        r  = gvar_add(installdir() + "_PROGRAMS", "[+ name +]")
+
+    r += var_set(canonical_name() + "_SOURCES", platform_sources(platform))
+    r += var_add(canonical_name() + "_SOURCES", shared_sources())
+    r += var_set("nodist_" + canonical_name() + "_SOURCES", platform_nodist_sources(platform))
+    r += var_add("nodist_" + canonical_name() + "_SOURCES", shared_nodist_sources())
+    r += var_set(canonical_name() + "_LDADD", platform_ldadd(platform))
+    r += var_set(canonical_name() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_PROGRAM) " + platform_cflags(platform))
+    r += var_set(canonical_name() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_PROGRAM) " + platform_ldflags(platform))
+    r += var_set(canonical_name() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) " + platform_cppflags(platform))
+    r += var_set(canonical_name() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM) " + platform_ccasflags(platform))
+
+    r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_name() + "_SOURCES)")
+    r += gvar_add("CLEANFILES", "$(nodist_" + canonical_name() + "_SOURCES)")
+
+    if test:
+        r += if_tag_defined("enable", lambda: gvar_add("TESTS", "[+ name +]"))
+    else:
+        r += if_tag("mansection", lambda: manpage())
+
+    return r
+
+def test_program(platform):
+    return program(platform, True)
+
+def data(platform):
+    return gvar_add(installdir() + "_DATA", platform_sources(platform))
+
+def script(platform, test=False):
+    if test:
+        r = gvar_add("check_SCRIPTS", "[+ name +]")
+    else:
+        r  = gvar_add(installdir() + "_SCRIPTS", "[+ name +]")
+
+    r += rule("[+ name +]", "$(top_builddir)/config.status " + platform_sources(platform), """
+$(top_builddir)/config.status --file=-:""" + platform_sources(platform) + """ \
+  | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@
+chmod a+x [+ name +]
+""")
+
+    r += gvar_add("CLEANFILES", "[+ name +]")
+    r += gvar_add("EXTRA_DIST", platform_sources(platform))
+
+    if test:
+        r += if_tag_defined("enable", lambda: gvar_add("TESTS", "[+ name +]"))
+    else:
+        r += if_tag("mansection", lambda: manpage())
+
+    return r
+
+def test_script(platform):
+    return script(platform, True)
+
+def with_enable_condition(x):
+    return "[+ IF enable +]if [+ enable +]\n" + x + "endif\n[+ ELSE +]" + x + "[+ ENDIF +]"
+
+def module_rules():
+    return for_tag("module", lambda: with_enable_condition(each_platform(lambda p: module(p))))
+
+def kernel_rules():
+    return for_tag("kernel", lambda: with_enable_condition(each_platform(lambda p: kernel(p))))
+
+def image_rules():
+    return for_tag("image", lambda: with_enable_condition(each_platform(lambda p: image(p))))
+
+def library_rules():
+    return for_tag("library", lambda: with_enable_condition(each_platform(lambda p: library(p))))
+
+def program_rules():
+    return for_tag("program", lambda: with_enable_condition(each_platform(lambda p: program(p))))
+
+def script_rules():
+    return for_tag("script", lambda: with_enable_condition(each_platform(lambda p: script(p))))
+
+def data_rules():
+    return for_tag("data", lambda: with_enable_condition(each_platform(lambda p: data(p))))
+
+def test_program_rules():
+    return for_tag("test_program", lambda: with_enable_condition(each_platform(lambda p: test_program(p))))
+
+def test_script_rules():
+    return for_tag("test_script", lambda: with_enable_condition(each_platform(lambda p: test_script(p))))
+
+print "[+ AutoGen5 template +]\n"
+a = module_rules()
+b = kernel_rules()
+c = image_rules()
+d = library_rules()
+e = program_rules()
+f = script_rules()
+g = data_rules()
+h = test_program_rules()
+i = test_script_rules()
+z = global_variable_initializers()
+
+print z # initializer for all vars
+print a
+print b
+print c
+print d
+print e
+print f
+print g
+print h
+print i
+
+print """.PRECIOUS: modules.am
+$(srcdir)/modules.am: $(srcdir)/modules.def $(top_srcdir)/Makefile.tpl
+	autogen -T $(top_srcdir)/Makefile.tpl $(srcdir)/modules.def | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
+	mv $@.new $@
+
+.PRECIOUS: $(top_srcdir)/Makefile.tpl
+$(top_srcdir)/Makefile.tpl: $(top_srcdir)/gentpl.py
+	python $(top_srcdir)/gentpl.py | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
+	mv $@.new $@
+"""
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
new file mode 100644
index 000000000..1f2657656
--- /dev/null
+++ b/grub-core/Makefile.am
@@ -0,0 +1,155 @@
+AUTOMAKE_OPTIONS = subdir-objects
+SUBDIRS = po
+DEPDIR = .deps-core
+
+include $(top_srcdir)/Makefile.extra-dist
+include $(top_srcdir)/Makefile.vars
+
+LDADD_KERNEL = -lgcc
+CFLAGS_KERNEL = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
+LDFLAGS_KERNEL = $(TARGET_LDFLAGS) $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N -static-libgcc
+CPPFLAGS_KERNEL = $(TARGET_CPPFLAGS) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
+CCASFLAGS_KERNEL = $(TARGET_CCASFLAGS) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+
+CFLAGS_MODULE = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
+LDFLAGS_MODULE = $(TARGET_LDFLAGS) $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N,-r,-d
+CPPFLAGS_MODULE = $(TARGET_CPPFLAGS) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
+CCASFLAGS_MODULE = $(TARGET_CCASFLAGS) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+
+CFLAGS_IMAGE = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -fno-builtin
+LDFLAGS_IMAGE = $(TARGET_LDFLAGS) $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N,-S
+CPPFLAGS_IMAGE = $(TARGET_CPPFLAGS) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
+CCASFLAGS_IMAGE = $(TARGET_CCASFLAGS) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+
+CFLAGS_LIBRARY = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -fno-builtin
+CPPFLAGS_LIBRARY = $(TARGET_CPPFLAGS) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
+CCASFLAGS_LIBRARY = $(TARGET_CCASFLAGS) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+
+CFLAGS_PROGRAM = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM)
+LDFLAGS_PROGRAM = $(TARGET_LDFLAGS) $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM)
+CPPFLAGS_PROGRAM = $(TARGET_CPPFLAGS) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
+CCASFLAGS_PROGRAM = $(TARGET_CCASFLAGS) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+
+AM_CFLAGS = 
+AM_LDFLAGS =
+AM_CPPFLAGS = $(CPPFLAGS_GRUB) -DGRUB_FILE=\"$(subst $(top_srcdir)/,,$<)\"
+AM_CCASFLAGS = -DASM_FILE=1
+
+# gentrigtables
+gentrigtables: $(top_srcdir)/gentrigtables.c
+	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(CPPFLAGS) -lm $<
+CLEANFILES += gentrigtables
+
+# trigtables.c
+trigtables.c: gentrigtables.c configure.ac
+	$(MAKE) $(AM_MAKEFLAGS) gentrigtables
+	$(top_builddir)/gentrigtables > $@
+CLEANFILES += trigtables.c
+
+# XXX Use Automake's LEX & YACC support
+# See Recording Dependencies Manually in automake doc for below rules
+script/sh_module-lexer.$(OBJEXT):grub_script.tab.h
+grub_script.tab.c grub_script.tab.h: $(top_srcdir)/script/parser.y
+	$(YACC) -d -p grub_script_yy -b grub_script $(top_srcdir)/script/parser.y
+CLEANFILES += grub_script.tab.c grub_script.tab.h
+
+# For the lexer.
+# See Recording Dependencies Manually in automake doc for below rules
+script/sh_module-lexer.$(OBJEXT):grub_script.yy.h
+grub_script.yy.c grub_script.yy.h: $(top_srcdir)/script/yylex.l
+	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(top_srcdir)/script/yylex.l
+CLEANFILES += grub_script.yy.c grub_script.yy.h
+
+include $(srcdir)/modules.am
+include $(srcdir)/Makefile.kernel
+
+# .lst files
+platform_DATA += moddep.lst
+platform_DATA += fs.lst
+platform_DATA += command.lst
+platform_DATA += partmap.lst
+platform_DATA += handler.lst
+platform_DATA += terminal.lst
+platform_DATA += parttool.lst
+platform_DATA += video.lst
+platform_DATA += crypto.lst
+CLEANFILES += moddep.lst
+CLEANFILES += fs.lst
+CLEANFILES += command.lst
+CLEANFILES += partmap.lst
+CLEANFILES += handler.lst
+CLEANFILES += terminal.lst
+CLEANFILES += parttool.lst
+CLEANFILES += video.lst
+CLEANFILES += crypto.lst
+
+fs.lst: $(FS_FILES)
+	cat $^ /dev/null | sort | uniq > $@
+command.lst: $(COMMAND_FILES)
+	cat $^ /dev/null | sort | uniq > $@
+partmap.lst: $(PARTMAP_FILES)
+	cat $^ /dev/null | sort | uniq > $@
+handler.lst: $(HANDLER_FILES)
+	cat $^ /dev/null | sort | uniq > $@
+terminal.lst: $(TERMINAL_FILES)
+	cat $^ /dev/null | sort | uniq > $@
+parttool.lst: $(PARTTOOL_FILES)
+	cat $^ /dev/null | sort | uniq > $@
+video.lst: $(VIDEO_FILES)
+	cat $^ /dev/null | sort | uniq > $@
+
+# but, crypto.lst is simply copied
+crypto.lst: $(top_srcdir)/lib/libgcrypt-grub/cipher/crypto.lst
+	cp $^ $@
+
+# generate global module dependencies list
+moddep.lst: kernel_syms.lst genmoddep.awk $(DEF_FILES) $(UND_FILES)
+	cat $(DEF_FILES) kernel_syms.lst /dev/null \
+	  | $(AWK) -f $(top_srcdir)/genmoddep.awk $(UND_FILES) > $@ \
+	  || (rm -f $@; exit 1)
+
+if COND_i386_pc
+if COND_ENABLE_EFIEMU
+efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
+	-rm -f $@; \
+	if test "x$(TARGET_APPLE_CC)" = x1; then \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_GRUB) -DELF32 -DAPPLE_CC -m32 -Wall -Werror -nostdlib -O2 -c -o $@.bin $< || exit 1; \
+	  $(OBJCONV) -felf32 -nu -nd $@.bin $@ || exit 1; \
+	  rm -f $@.bin; \
+	else \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_GRUB) -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_GRUB) -DELF64 -DAPPLE_CC=1 -m64 -nostdlib -Wall -Werror -mno-red-zone -c -o $@ $< || exit 1; \
+	else \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_GRUB) -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_GRUB) -DELF64 -DAPPLE_CC=1 -m64 -Wall -Werror -nostdlib -O2 -mno-red-zone -c -o $@ $< || exit 1; \
+	else \
+	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_GRUB) -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
+endif
+
diff --git a/grub-core/Makefile.extra-dist b/grub-core/Makefile.extra-dist
new file mode 100644
index 000000000..c6516f06a
--- /dev/null
+++ b/grub-core/Makefile.extra-dist
@@ -0,0 +1,53 @@
+#
+# Extra files that need to be distributed (in .tar.gz) to build
+# successfully on user site.
+#
+# XXX Remove wildcards;  See 27.3 in automake.info
+#
+
+EXTRA_DIST =
+
+EXTRA_DIST += gentpl.py
+EXTRA_DIST += Makefile.tpl
+EXTRA_DIST += modules.def
+
+EXTRA_DIST += gentrigtables.c
+
+EXTRA_DIST += genmoddep.awk
+EXTRA_DIST += genmodsrc.sh
+EXTRA_DIST += gensymlist.sh
+
+EXTRA_DIST += genemuinit.sh
+EXTRA_DIST += genemuinitheader.sh
+
+EXTRA_DIST += genfslist.sh
+EXTRA_DIST += gencmdlist.sh
+EXTRA_DIST += genvideolist.sh
+EXTRA_DIST += genhandlerlist.sh
+EXTRA_DIST += genpartmaplist.sh
+EXTRA_DIST += genparttoollist.sh
+EXTRA_DIST += genterminallist.sh
+EXTRA_DIST += lib/libgcrypt-grub/cipher/crypto.lst
+
+EXTRA_DIST += script/yylex.l
+EXTRA_DIST += script/parser.y
+
+EXTRA_DIST += lib/relocator.c
+
+EXTRA_DIST += efiemu/loadcore.c
+EXTRA_DIST += efiemu/prepare.c
+
+EXTRA_DIST += loader/machoXX.c
+
+
+EXTRA_DIST += kern/i386/loader.S
+EXTRA_DIST += kern/i386/realmode.S
+EXTRA_DIST += loader/i386/bsdXX.c
+EXTRA_DIST += loader/i386/bsd_pagetable.c
+EXTRA_DIST += loader/i386/multiboot_elfxx.c
+EXTRA_DIST += commands/search.c
+
+EXTRA_DIST += kern/i386/pc/lzma_decode.S
+
+EXTRA_DIST += $(shell find $(top_srcdir) -name '*.h')
+
diff --git a/grub-core/Makefile.kernel b/grub-core/Makefile.kernel
new file mode 100644
index 000000000..58e464805
--- /dev/null
+++ b/grub-core/Makefile.kernel
@@ -0,0 +1,192 @@
+# -*- makefile -*-
+
+KERNEL_HEADER_FILES =
+KERNEL_HEADER_FILES += include/grub/cache.h
+KERNEL_HEADER_FILES += include/grub/command.h
+KERNEL_HEADER_FILES += include/grub/device.h
+KERNEL_HEADER_FILES += include/grub/disk.h
+KERNEL_HEADER_FILES += include/grub/dl.h
+KERNEL_HEADER_FILES += include/grub/elf.h
+KERNEL_HEADER_FILES += include/grub/elfload.h
+KERNEL_HEADER_FILES += include/grub/env.h
+KERNEL_HEADER_FILES += include/grub/env_private.h
+KERNEL_HEADER_FILES += include/grub/err.h
+KERNEL_HEADER_FILES += include/grub/file.h
+KERNEL_HEADER_FILES += include/grub/fs.h
+KERNEL_HEADER_FILES += include/grub/handler.h
+KERNEL_HEADER_FILES += include/grub/i18n.h
+KERNEL_HEADER_FILES += include/grub/kernel.h
+KERNEL_HEADER_FILES += include/grub/list.h
+KERNEL_HEADER_FILES += include/grub/misc.h
+KERNEL_HEADER_FILES += include/grub/mm.h
+KERNEL_HEADER_FILES += include/grub/net.h
+KERNEL_HEADER_FILES += include/grub/parser.h
+KERNEL_HEADER_FILES += include/grub/partition.h
+KERNEL_HEADER_FILES += include/grub/reader.h
+KERNEL_HEADER_FILES += include/grub/symbol.h
+KERNEL_HEADER_FILES += include/grub/term.h
+KERNEL_HEADER_FILES += include/grub/time.h
+KERNEL_HEADER_FILES += include/grub/types.h
+
+if COND_i386_pc
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/machine/biosdisk.h
+KERNEL_HEADER_FILES += include/grub/machine/boot.h
+KERNEL_HEADER_FILES += include/grub/machine/console.h
+KERNEL_HEADER_FILES += include/grub/machine/memory.h
+KERNEL_HEADER_FILES += include/grub/machine/loader.h
+KERNEL_HEADER_FILES += include/grub/machine/vga.h
+KERNEL_HEADER_FILES += include/grub/machine/vbe.h
+KERNEL_HEADER_FILES += include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += include/grub/machine/pxe.h
+KERNEL_HEADER_FILES += include/grub/i386/pit.h
+endif
+
+if COND_i386_efi
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/efi/efi.h
+KERNEL_HEADER_FILES += include/grub/efi/time.h
+KERNEL_HEADER_FILES += include/grub/efi/disk.h
+KERNEL_HEADER_FILES += include/grub/i386/pit.h
+endif
+
+if COND_i386_coreboot
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/machine/boot.h
+KERNEL_HEADER_FILES += include/grub/machine/console.h
+KERNEL_HEADER_FILES += include/grub/machine/init.h
+KERNEL_HEADER_FILES += include/grub/machine/memory.h
+KERNEL_HEADER_FILES += include/grub/machine/loader.h
+endif
+
+if COND_i386_qemu
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/machine/boot.h
+KERNEL_HEADER_FILES += include/grub/machine/console.h
+KERNEL_HEADER_FILES += include/grub/machine/init.h
+KERNEL_HEADER_FILES += include/grub/machine/memory.h
+KERNEL_HEADER_FILES += include/grub/machine/loader.h
+endif
+
+if COND_i386_ieee1275
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += include/grub/machine/loader.h
+KERNEL_HEADER_FILES += include/grub/machine/memory.h
+endif
+
+if COND_x86_64_efi
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/efi/efi.h
+KERNEL_HEADER_FILES += include/grub/efi/time.h
+KERNEL_HEADER_FILES += include/grub/efi/disk.h
+KERNEL_HEADER_FILES += include/grub/machine/loader.h
+KERNEL_HEADER_FILES += include/grub/i386/pit.h
+endif
+
+if COND_mips_yeeloong
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += include/grub/machine/memory.h
+KERNEL_HEADER_FILES += include/grub/cpu/cache.h
+KERNEL_HEADER_FILES += include/grub/bitmap.h
+KERNEL_HEADER_FILES += include/grub/video.h
+KERNEL_HEADER_FILES += include/grub/gfxterm.h
+KERNEL_HEADER_FILES += include/grub/font.h
+KERNEL_HEADER_FILES += include/grub/bitmap_scale.h
+KERNEL_HEADER_FILES += include/grub/bufio.h
+KERNEL_HEADER_FILES += include/grub/pci.h
+KERNEL_HEADER_FILES += include/grub/libgcc.h
+endif
+
+if COND_powerpc_ieee1275
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += include/grub/libgcc.h
+endif
+
+if COND_sparc64_ieee1275
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/libgcc.h
+KERNEL_HEADER_FILES += include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += include/grub/sparc64/ieee1275/ieee1275.h
+endif
+
+if COND_emu
+KERNEL_HEADER_FILES += include/grub/cpu/time.h
+KERNEL_HEADER_FILES += include/grub/cpu/types.h
+KERNEL_HEADER_FILES += include/grub/gzio.h
+KERNEL_HEADER_FILES += include/grub/menu.h
+KERNEL_HEADER_FILES += include/grub/datetime.h
+KERNEL_HEADER_FILES += include/grub/emu/misc.h
+if COND_GRUB_EMU_SDL
+KERNEL_HEADER_FILES += include/grub/sdl.h
+endif
+if COND_GRUB_EMU_USB
+KERNEL_HEADER_FILES += include/grub/libusb.h
+endif
+if COND_GRUB_EMU_PCI
+KERNEL_HEADER_FILES += include/grub/libpciaccess.h
+endif
+endif
+
+symlist.h: config.h $(KERNEL_HEADER_FILES)
+	@list='$^'; \
+	for p in $$list; do \
+	  echo "#include <$$p>" >> $@ || (rm -f $@; exit 1); \
+	done
+CLEANFILES += symlist.h
+BUILT_SOURCES += symlist.h
+
+symlist.c: symlist.h gensymlist.sh
+	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) -DGRUB_SYMBOL_GENERATOR=1 symlist.h > symlist.p || (rm -f symlist.p; exit 1)
+	cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
+	rm -f symlist.p
+CLEANFILES += symlist.c
+BUILT_SOURCES += symlist.c
+
+noinst_DATA += kernel_syms.lst
+kernel_syms.lst: $(KERNEL_HEADER_FILES) config.h
+	if grep "^#define HAVE_ASM_USCORE" config.h; then u="_"; else u=""; fi
+	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) $(CFLAGS) -DGRUB_SYMBOL_GENERATOR=1 $^ >kernel_syms.input
+	cat kernel_syms.input | grep -v '^#' | sed -n \
+	  -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
+	  -e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
+	  | sort -u >$@
+	rm -f kernel_syms.input
+CLEANFILES += kernel_syms.lst
+
+if COND_emu
+kern/emu/grub_emu-main.$(OBJEXT):grub_emu_init.h
+grub_emu-grub_emu_init.$(OBJEXT):grub_emu_init.h
+kern/emu/grub_emu_dyn-main.$(OBJEXT):grub_emu_init.h
+grub_emu_dyn-grub_emu_init.$(OBJEXT):grub_emu_init.h
+
+grub_emu_init.h: genemuinitheader.sh $(MOD_FILES)
+	rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinitheader.sh $(NM) > $@
+CLEANFILES += grub_emu_init.h
+
+grub_emu_init.c: grub_emu_init.h genemuinit.sh $(MOD_FILES)
+	rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinit.sh $(NM) > $@
+CLEANFILES += grub_emu_init.c
+endif
diff --git a/grub-core/Makefile.vars b/grub-core/Makefile.vars
new file mode 100644
index 000000000..710a8fd0b
--- /dev/null
+++ b/grub-core/Makefile.vars
@@ -0,0 +1,80 @@
+# -*- makefile -*-
+
+# Platform specific options
+if COND_i386_pc
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_efi
+  LDFLAGS_PLATFORM = -melf_i386
+endif
+if COND_x86_64_efi
+  LDFLAGS_PLATFORM = -melf_x86_64
+endif
+if COND_i386_qemu
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_coreboot
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_ieee1275
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_mips_yeeloong
+  CFLAGS_PLATFORM = -march=mips3 -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
+  CCASFLAGS_PLATFORM = -march=mips3
+endif
+if COND_sparc64_ieee1275
+  CFLAGS_PLATFORM = -mno-app-regs
+  LDFLAGS_PLATFORM = -melf64_sparc -mno-relax
+endif
+
+CPPFLAGS_GRUB = -I$(builddir) -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)
+CPPFLAGS_GRUB += -I$(top_srcdir)/include -I$(top_builddir)/include
+
+CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
+CPPFLAGS_GCRY = -I$(top_srcdir)/lib/libgcrypt_wrap
+
+CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))"
+CPPFLAGS_GNULIB = -I$(top_srcdir)/gnulib
+
+CFLAGS_MKISOFS = -Wno-all -Werror
+CPPFLAGS_MKISOFS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/util/mkisofs/include
+
+CFLAGS_POSIX = -fno-builtin
+CPPFLAGS_POSIX = -I$(top_srcdir)/lib/posix_wrap
+
+CPPFLAGS_EFIEMU = -I$(top_srcdir)/efiemu/runtime
+
+grubconfdir = $(sysconfdir)/grub.d
+platformdir = $(pkglibdir)/$(target_cpu)-$(platform)
+
+# to calm down automake
+BUILT_SOURCES =
+CLEANFILES =
+COMMAND_FILES =
+DEF_FILES =
+FS_FILES =
+HANDLER_FILES =
+IMG_FILES =
+MOD_FILES =
+MODULE_FILES =
+PARTMAP_FILES =
+PARTTOOL_FILES =
+TERMINAL_FILES =
+TESTS =
+UND_FILES =
+VIDEO_FILES =
+bin_PROGRAMS =
+bin_SCRIPTS =
+check_PROGRAMS =
+check_SCRIPTS =
+grubconf_DATA =
+grubconf_SCRIPTS =
+man_MANS =
+noinst_DATA =
+noinst_LIBRARIES =
+noinst_PROGRAMS =
+pkglib_SCRIPTS =
+platform_DATA =
+sbin_PROGRAMS =
+sbin_SCRIPTS =
diff --git a/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
similarity index 100%
rename from boot/i386/pc/boot.S
rename to grub-core/boot/i386/pc/boot.S
diff --git a/boot/i386/pc/cdboot.S b/grub-core/boot/i386/pc/cdboot.S
similarity index 100%
rename from boot/i386/pc/cdboot.S
rename to grub-core/boot/i386/pc/cdboot.S
diff --git a/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
similarity index 100%
rename from boot/i386/pc/diskboot.S
rename to grub-core/boot/i386/pc/diskboot.S
diff --git a/boot/i386/pc/lnxboot.S b/grub-core/boot/i386/pc/lnxboot.S
similarity index 100%
rename from boot/i386/pc/lnxboot.S
rename to grub-core/boot/i386/pc/lnxboot.S
diff --git a/boot/i386/pc/pxeboot.S b/grub-core/boot/i386/pc/pxeboot.S
similarity index 100%
rename from boot/i386/pc/pxeboot.S
rename to grub-core/boot/i386/pc/pxeboot.S
diff --git a/boot/i386/qemu/boot.S b/grub-core/boot/i386/qemu/boot.S
similarity index 100%
rename from boot/i386/qemu/boot.S
rename to grub-core/boot/i386/qemu/boot.S
diff --git a/boot/sparc64/ieee1275/boot.S b/grub-core/boot/sparc64/ieee1275/boot.S
similarity index 100%
rename from boot/sparc64/ieee1275/boot.S
rename to grub-core/boot/sparc64/ieee1275/boot.S
diff --git a/boot/sparc64/ieee1275/diskboot.S b/grub-core/boot/sparc64/ieee1275/diskboot.S
similarity index 100%
rename from boot/sparc64/ieee1275/diskboot.S
rename to grub-core/boot/sparc64/ieee1275/diskboot.S
diff --git a/bus/bonito.c b/grub-core/bus/bonito.c
similarity index 100%
rename from bus/bonito.c
rename to grub-core/bus/bonito.c
diff --git a/util/pci.c b/grub-core/bus/emu/pci.c
similarity index 98%
rename from util/pci.c
rename to grub-core/bus/emu/pci.c
index 420ae320b..d1beb561d 100644
--- a/util/pci.c
+++ b/grub-core/bus/emu/pci.c
@@ -19,6 +19,7 @@
 
 #include <grub/pci.h>
 #include <grub/dl.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 
 grub_pci_address_t
diff --git a/bus/pci.c b/grub-core/bus/pci.c
similarity index 100%
rename from bus/pci.c
rename to grub-core/bus/pci.c
diff --git a/util/usb.c b/grub-core/bus/usb/emu/usb.c
similarity index 100%
rename from util/usb.c
rename to grub-core/bus/usb/emu/usb.c
diff --git a/bus/usb/ohci.c b/grub-core/bus/usb/ohci.c
similarity index 100%
rename from bus/usb/ohci.c
rename to grub-core/bus/usb/ohci.c
diff --git a/bus/usb/uhci.c b/grub-core/bus/usb/uhci.c
similarity index 100%
rename from bus/usb/uhci.c
rename to grub-core/bus/usb/uhci.c
diff --git a/bus/usb/usb.c b/grub-core/bus/usb/usb.c
similarity index 100%
rename from bus/usb/usb.c
rename to grub-core/bus/usb/usb.c
diff --git a/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c
similarity index 100%
rename from bus/usb/usbhub.c
rename to grub-core/bus/usb/usbhub.c
diff --git a/bus/usb/usbtrans.c b/grub-core/bus/usb/usbtrans.c
similarity index 100%
rename from bus/usb/usbtrans.c
rename to grub-core/bus/usb/usbtrans.c
diff --git a/commands/acpi.c b/grub-core/commands/acpi.c
similarity index 100%
rename from commands/acpi.c
rename to grub-core/commands/acpi.c
diff --git a/commands/blocklist.c b/grub-core/commands/blocklist.c
similarity index 100%
rename from commands/blocklist.c
rename to grub-core/commands/blocklist.c
diff --git a/commands/boot.c b/grub-core/commands/boot.c
similarity index 100%
rename from commands/boot.c
rename to grub-core/commands/boot.c
diff --git a/commands/cat.c b/grub-core/commands/cat.c
similarity index 100%
rename from commands/cat.c
rename to grub-core/commands/cat.c
diff --git a/commands/cmp.c b/grub-core/commands/cmp.c
similarity index 100%
rename from commands/cmp.c
rename to grub-core/commands/cmp.c
diff --git a/commands/configfile.c b/grub-core/commands/configfile.c
similarity index 100%
rename from commands/configfile.c
rename to grub-core/commands/configfile.c
diff --git a/commands/crc.c b/grub-core/commands/crc.c
similarity index 100%
rename from commands/crc.c
rename to grub-core/commands/crc.c
diff --git a/commands/date.c b/grub-core/commands/date.c
similarity index 100%
rename from commands/date.c
rename to grub-core/commands/date.c
diff --git a/commands/echo.c b/grub-core/commands/echo.c
similarity index 100%
rename from commands/echo.c
rename to grub-core/commands/echo.c
diff --git a/commands/efi/acpi.c b/grub-core/commands/efi/acpi.c
similarity index 100%
rename from commands/efi/acpi.c
rename to grub-core/commands/efi/acpi.c
diff --git a/commands/efi/fixvideo.c b/grub-core/commands/efi/fixvideo.c
similarity index 100%
rename from commands/efi/fixvideo.c
rename to grub-core/commands/efi/fixvideo.c
diff --git a/commands/efi/loadbios.c b/grub-core/commands/efi/loadbios.c
similarity index 100%
rename from commands/efi/loadbios.c
rename to grub-core/commands/efi/loadbios.c
diff --git a/commands/extcmd.c b/grub-core/commands/extcmd.c
similarity index 100%
rename from commands/extcmd.c
rename to grub-core/commands/extcmd.c
diff --git a/commands/gptsync.c b/grub-core/commands/gptsync.c
similarity index 100%
rename from commands/gptsync.c
rename to grub-core/commands/gptsync.c
diff --git a/commands/halt.c b/grub-core/commands/halt.c
similarity index 100%
rename from commands/halt.c
rename to grub-core/commands/halt.c
diff --git a/commands/handler.c b/grub-core/commands/handler.c
similarity index 100%
rename from commands/handler.c
rename to grub-core/commands/handler.c
diff --git a/commands/hashsum.c b/grub-core/commands/hashsum.c
similarity index 100%
rename from commands/hashsum.c
rename to grub-core/commands/hashsum.c
diff --git a/commands/hdparm.c b/grub-core/commands/hdparm.c
similarity index 100%
rename from commands/hdparm.c
rename to grub-core/commands/hdparm.c
diff --git a/commands/help.c b/grub-core/commands/help.c
similarity index 100%
rename from commands/help.c
rename to grub-core/commands/help.c
diff --git a/commands/hexdump.c b/grub-core/commands/hexdump.c
similarity index 100%
rename from commands/hexdump.c
rename to grub-core/commands/hexdump.c
diff --git a/commands/i386/cpuid.c b/grub-core/commands/i386/cpuid.c
similarity index 100%
rename from commands/i386/cpuid.c
rename to grub-core/commands/i386/cpuid.c
diff --git a/commands/i386/pc/acpi.c b/grub-core/commands/i386/pc/acpi.c
similarity index 100%
rename from commands/i386/pc/acpi.c
rename to grub-core/commands/i386/pc/acpi.c
diff --git a/commands/i386/pc/drivemap.c b/grub-core/commands/i386/pc/drivemap.c
similarity index 100%
rename from commands/i386/pc/drivemap.c
rename to grub-core/commands/i386/pc/drivemap.c
diff --git a/commands/i386/pc/drivemap_int13h.S b/grub-core/commands/i386/pc/drivemap_int13h.S
similarity index 100%
rename from commands/i386/pc/drivemap_int13h.S
rename to grub-core/commands/i386/pc/drivemap_int13h.S
diff --git a/commands/i386/pc/halt.c b/grub-core/commands/i386/pc/halt.c
similarity index 100%
rename from commands/i386/pc/halt.c
rename to grub-core/commands/i386/pc/halt.c
diff --git a/commands/i386/pc/play.c b/grub-core/commands/i386/pc/play.c
similarity index 100%
rename from commands/i386/pc/play.c
rename to grub-core/commands/i386/pc/play.c
diff --git a/commands/i386/pc/pxecmd.c b/grub-core/commands/i386/pc/pxecmd.c
similarity index 100%
rename from commands/i386/pc/pxecmd.c
rename to grub-core/commands/i386/pc/pxecmd.c
diff --git a/commands/i386/pc/vbeinfo.c b/grub-core/commands/i386/pc/vbeinfo.c
similarity index 100%
rename from commands/i386/pc/vbeinfo.c
rename to grub-core/commands/i386/pc/vbeinfo.c
diff --git a/commands/i386/pc/vbetest.c b/grub-core/commands/i386/pc/vbetest.c
similarity index 100%
rename from commands/i386/pc/vbetest.c
rename to grub-core/commands/i386/pc/vbetest.c
diff --git a/commands/ieee1275/suspend.c b/grub-core/commands/ieee1275/suspend.c
similarity index 100%
rename from commands/ieee1275/suspend.c
rename to grub-core/commands/ieee1275/suspend.c
diff --git a/commands/iorw.c b/grub-core/commands/iorw.c
similarity index 100%
rename from commands/iorw.c
rename to grub-core/commands/iorw.c
diff --git a/commands/keystatus.c b/grub-core/commands/keystatus.c
similarity index 100%
rename from commands/keystatus.c
rename to grub-core/commands/keystatus.c
diff --git a/commands/loadenv.c b/grub-core/commands/loadenv.c
similarity index 100%
rename from commands/loadenv.c
rename to grub-core/commands/loadenv.c
diff --git a/commands/ls.c b/grub-core/commands/ls.c
similarity index 100%
rename from commands/ls.c
rename to grub-core/commands/ls.c
diff --git a/commands/lsmmap.c b/grub-core/commands/lsmmap.c
similarity index 100%
rename from commands/lsmmap.c
rename to grub-core/commands/lsmmap.c
diff --git a/commands/lspci.c b/grub-core/commands/lspci.c
similarity index 100%
rename from commands/lspci.c
rename to grub-core/commands/lspci.c
diff --git a/commands/memrw.c b/grub-core/commands/memrw.c
similarity index 100%
rename from commands/memrw.c
rename to grub-core/commands/memrw.c
diff --git a/commands/minicmd.c b/grub-core/commands/minicmd.c
similarity index 100%
rename from commands/minicmd.c
rename to grub-core/commands/minicmd.c
diff --git a/commands/parttool.c b/grub-core/commands/parttool.c
similarity index 99%
rename from commands/parttool.c
rename to grub-core/commands/parttool.c
index 528cf43d7..d38a8a98f 100644
--- a/commands/parttool.c
+++ b/grub-core/commands/parttool.c
@@ -175,7 +175,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
     }
 
   /* Load modules. */
-#if !GRUB_NO_MODULES
+#if defined(GRUB_MACHINE_EMU)
   {
     const char *prefix;
     prefix = grub_env_get ("prefix");
diff --git a/commands/password.c b/grub-core/commands/password.c
similarity index 100%
rename from commands/password.c
rename to grub-core/commands/password.c
diff --git a/commands/password_pbkdf2.c b/grub-core/commands/password_pbkdf2.c
similarity index 100%
rename from commands/password_pbkdf2.c
rename to grub-core/commands/password_pbkdf2.c
diff --git a/commands/probe.c b/grub-core/commands/probe.c
similarity index 100%
rename from commands/probe.c
rename to grub-core/commands/probe.c
diff --git a/commands/read.c b/grub-core/commands/read.c
similarity index 100%
rename from commands/read.c
rename to grub-core/commands/read.c
diff --git a/commands/reboot.c b/grub-core/commands/reboot.c
similarity index 100%
rename from commands/reboot.c
rename to grub-core/commands/reboot.c
diff --git a/commands/regexp.c b/grub-core/commands/regexp.c
similarity index 100%
rename from commands/regexp.c
rename to grub-core/commands/regexp.c
diff --git a/commands/search.c b/grub-core/commands/search.c
similarity index 100%
rename from commands/search.c
rename to grub-core/commands/search.c
diff --git a/commands/search_file.c b/grub-core/commands/search_file.c
similarity index 100%
rename from commands/search_file.c
rename to grub-core/commands/search_file.c
diff --git a/commands/search_label.c b/grub-core/commands/search_label.c
similarity index 100%
rename from commands/search_label.c
rename to grub-core/commands/search_label.c
diff --git a/commands/search_uuid.c b/grub-core/commands/search_uuid.c
similarity index 100%
rename from commands/search_uuid.c
rename to grub-core/commands/search_uuid.c
diff --git a/commands/search_wrap.c b/grub-core/commands/search_wrap.c
similarity index 100%
rename from commands/search_wrap.c
rename to grub-core/commands/search_wrap.c
diff --git a/commands/setpci.c b/grub-core/commands/setpci.c
similarity index 100%
rename from commands/setpci.c
rename to grub-core/commands/setpci.c
diff --git a/commands/sleep.c b/grub-core/commands/sleep.c
similarity index 100%
rename from commands/sleep.c
rename to grub-core/commands/sleep.c
diff --git a/commands/terminal.c b/grub-core/commands/terminal.c
similarity index 100%
rename from commands/terminal.c
rename to grub-core/commands/terminal.c
diff --git a/commands/test.c b/grub-core/commands/test.c
similarity index 100%
rename from commands/test.c
rename to grub-core/commands/test.c
diff --git a/commands/true.c b/grub-core/commands/true.c
similarity index 100%
rename from commands/true.c
rename to grub-core/commands/true.c
diff --git a/commands/usbtest.c b/grub-core/commands/usbtest.c
similarity index 100%
rename from commands/usbtest.c
rename to grub-core/commands/usbtest.c
diff --git a/commands/videotest.c b/grub-core/commands/videotest.c
similarity index 100%
rename from commands/videotest.c
rename to grub-core/commands/videotest.c
diff --git a/commands/xnu_uuid.c b/grub-core/commands/xnu_uuid.c
similarity index 100%
rename from commands/xnu_uuid.c
rename to grub-core/commands/xnu_uuid.c
diff --git a/conf/any-emu.rmk b/grub-core/conf/any-emu.rmk
similarity index 100%
rename from conf/any-emu.rmk
rename to grub-core/conf/any-emu.rmk
diff --git a/conf/common.rmk b/grub-core/conf/common.rmk
similarity index 100%
rename from conf/common.rmk
rename to grub-core/conf/common.rmk
diff --git a/conf/i386-coreboot.rmk b/grub-core/conf/i386-coreboot.rmk
similarity index 100%
rename from conf/i386-coreboot.rmk
rename to grub-core/conf/i386-coreboot.rmk
diff --git a/conf/i386-efi.rmk b/grub-core/conf/i386-efi.rmk
similarity index 100%
rename from conf/i386-efi.rmk
rename to grub-core/conf/i386-efi.rmk
diff --git a/conf/i386-ieee1275.rmk b/grub-core/conf/i386-ieee1275.rmk
similarity index 100%
rename from conf/i386-ieee1275.rmk
rename to grub-core/conf/i386-ieee1275.rmk
diff --git a/conf/i386-multiboot.rmk b/grub-core/conf/i386-multiboot.rmk
similarity index 100%
rename from conf/i386-multiboot.rmk
rename to grub-core/conf/i386-multiboot.rmk
diff --git a/conf/i386-pc-cygwin-img-ld.sc b/grub-core/conf/i386-pc-cygwin-img-ld.sc
similarity index 100%
rename from conf/i386-pc-cygwin-img-ld.sc
rename to grub-core/conf/i386-pc-cygwin-img-ld.sc
diff --git a/conf/i386-pc.rmk b/grub-core/conf/i386-pc.rmk
similarity index 100%
rename from conf/i386-pc.rmk
rename to grub-core/conf/i386-pc.rmk
diff --git a/conf/i386-qemu.rmk b/grub-core/conf/i386-qemu.rmk
similarity index 100%
rename from conf/i386-qemu.rmk
rename to grub-core/conf/i386-qemu.rmk
diff --git a/conf/i386.rmk b/grub-core/conf/i386.rmk
similarity index 100%
rename from conf/i386.rmk
rename to grub-core/conf/i386.rmk
diff --git a/conf/mips-qemu-mips.rmk b/grub-core/conf/mips-qemu-mips.rmk
similarity index 100%
rename from conf/mips-qemu-mips.rmk
rename to grub-core/conf/mips-qemu-mips.rmk
diff --git a/conf/mips-yeeloong.rmk b/grub-core/conf/mips-yeeloong.rmk
similarity index 100%
rename from conf/mips-yeeloong.rmk
rename to grub-core/conf/mips-yeeloong.rmk
diff --git a/conf/mips.rmk b/grub-core/conf/mips.rmk
similarity index 100%
rename from conf/mips.rmk
rename to grub-core/conf/mips.rmk
diff --git a/conf/powerpc-ieee1275.rmk b/grub-core/conf/powerpc-ieee1275.rmk
similarity index 100%
rename from conf/powerpc-ieee1275.rmk
rename to grub-core/conf/powerpc-ieee1275.rmk
diff --git a/conf/sparc64-ieee1275.rmk b/grub-core/conf/sparc64-ieee1275.rmk
similarity index 100%
rename from conf/sparc64-ieee1275.rmk
rename to grub-core/conf/sparc64-ieee1275.rmk
diff --git a/conf/tests.rmk b/grub-core/conf/tests.rmk
similarity index 100%
rename from conf/tests.rmk
rename to grub-core/conf/tests.rmk
diff --git a/conf/x86-efi.rmk b/grub-core/conf/x86-efi.rmk
similarity index 100%
rename from conf/x86-efi.rmk
rename to grub-core/conf/x86-efi.rmk
diff --git a/conf/x86_64-efi.rmk b/grub-core/conf/x86_64-efi.rmk
similarity index 100%
rename from conf/x86_64-efi.rmk
rename to grub-core/conf/x86_64-efi.rmk
diff --git a/grub-core/configure.ac b/grub-core/configure.ac
new file mode 100644
index 000000000..ac462ea77
--- /dev/null
+++ b/grub-core/configure.ac
@@ -0,0 +1,91 @@
+# Process this file with autoconf to produce a configure script.
+
+# Copyright (C) 2010  Free Software Foundation, Inc.
+#
+# This configure.ac is free software; the author
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+dnl This configure script is complicated, because GRUB needs to deal
+dnl with three potentially different types:
+dnl
+dnl   build  -- the environment for building GRUB
+dnl   host   -- the environment for running utilities
+dnl   target -- the environment for running GRUB
+dnl
+dnl In addition, GRUB needs to deal with a platform specification
+dnl which specifies the system running GRUB, such as firmware.
+dnl This is necessary because the target type in autoconf does not
+dnl describe such a system very well.
+dnl
+dnl The current strategy is to build utilities using host
+dnl cross-compiler and grub core and modules using target
+dnl cross-compiler.  For this we use nested packages approach, where
+dnl top-level package grub utilities is built with HOSTCC and nested
+dnl package (in grub-core directory) builds with TARGETCC.
+
+# NOTE: ../configure.ac must also be updated.
+AC_INIT([GRUB],[1.98],[bug-grub@gnu.org])
+AC_CONFIG_AUX_DIR([.])
+
+# Checks for host and target systems.
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
+AM_INIT_AUTOMAKE()
+AC_PREREQ(2.60)
+AC_CONFIG_SRCDIR([include/grub/dl.h])
+AC_CONFIG_HEADER([config.h])
+
+m4_include([configure.common])
+
+TARGET_CPP="$TARGET_CC -E"
+TARGET_CCAS=$TARGET_CC
+
+CC=$TARGET_CC
+CPP=$TARGET_CC
+CCAS=$TARGET_CC
+
+AC_SUBST(TARGET_CC)
+AC_SUBST(TARGET_CPP)
+AC_SUBST(TARGET_CCAS)
+AC_SUBST(TARGET_IMG_LDSCRIPT)
+AC_SUBST(TARGET_IMG_LDFLAGS)
+AC_SUBST(TARGET_IMG_CFLAGS)
+AC_SUBST(TARGET_OBJ2ELF)
+AC_SUBST(TARGET_MODULE_FORMAT)
+AC_SUBST(OBJCONV)
+AC_SUBST(TARGET_APPLE_CC)
+AC_SUBST(ASFLAGS)
+AC_SUBST(TARGET_CFLAGS)
+AC_SUBST(TARGET_ASFLAGS)
+AC_SUBST(TARGET_LDFLAGS)
+AC_SUBST(TARGET_CPPFLAGS)
+
+# Output files.
+grub_CHECK_LINK_DIR
+if test x"$link_dir" = xyes ; then
+  AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu])
+  if test "$platform" != emu ; then
+    AC_CONFIG_LINKS([include/grub/machine:include/grub/$target_cpu/$platform])
+  fi
+else
+  mkdir -p include/grub 2>/dev/null
+  rm -rf include/grub/cpu
+  cp -rp $srcdir/include/grub/$target_cpu include/grub/cpu 2>/dev/null
+  if test "$platform" != emu ; then
+    rm -rf include/grub/machine
+    cp -rp $srcdir/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
+  fi
+fi
+
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([po/Makefile])
+AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
+
+AC_OUTPUT
diff --git a/disk/ata.c b/grub-core/disk/ata.c
similarity index 100%
rename from disk/ata.c
rename to grub-core/disk/ata.c
diff --git a/disk/ata_pthru.c b/grub-core/disk/ata_pthru.c
similarity index 100%
rename from disk/ata_pthru.c
rename to grub-core/disk/ata_pthru.c
diff --git a/disk/dmraid_nvidia.c b/grub-core/disk/dmraid_nvidia.c
similarity index 100%
rename from disk/dmraid_nvidia.c
rename to grub-core/disk/dmraid_nvidia.c
diff --git a/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
similarity index 100%
rename from disk/efi/efidisk.c
rename to grub-core/disk/efi/efidisk.c
diff --git a/disk/host.c b/grub-core/disk/host.c
similarity index 100%
rename from disk/host.c
rename to grub-core/disk/host.c
diff --git a/disk/i386/pc/biosdisk.c b/grub-core/disk/i386/pc/biosdisk.c
similarity index 100%
rename from disk/i386/pc/biosdisk.c
rename to grub-core/disk/i386/pc/biosdisk.c
diff --git a/disk/ieee1275/nand.c b/grub-core/disk/ieee1275/nand.c
similarity index 100%
rename from disk/ieee1275/nand.c
rename to grub-core/disk/ieee1275/nand.c
diff --git a/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
similarity index 100%
rename from disk/ieee1275/ofdisk.c
rename to grub-core/disk/ieee1275/ofdisk.c
diff --git a/disk/loopback.c b/grub-core/disk/loopback.c
similarity index 100%
rename from disk/loopback.c
rename to grub-core/disk/loopback.c
diff --git a/disk/lvm.c b/grub-core/disk/lvm.c
similarity index 100%
rename from disk/lvm.c
rename to grub-core/disk/lvm.c
diff --git a/disk/mdraid_linux.c b/grub-core/disk/mdraid_linux.c
similarity index 100%
rename from disk/mdraid_linux.c
rename to grub-core/disk/mdraid_linux.c
diff --git a/disk/memdisk.c b/grub-core/disk/memdisk.c
similarity index 100%
rename from disk/memdisk.c
rename to grub-core/disk/memdisk.c
diff --git a/disk/raid.c b/grub-core/disk/raid.c
similarity index 100%
rename from disk/raid.c
rename to grub-core/disk/raid.c
diff --git a/disk/raid5_recover.c b/grub-core/disk/raid5_recover.c
similarity index 100%
rename from disk/raid5_recover.c
rename to grub-core/disk/raid5_recover.c
diff --git a/disk/raid6_recover.c b/grub-core/disk/raid6_recover.c
similarity index 100%
rename from disk/raid6_recover.c
rename to grub-core/disk/raid6_recover.c
diff --git a/disk/scsi.c b/grub-core/disk/scsi.c
similarity index 100%
rename from disk/scsi.c
rename to grub-core/disk/scsi.c
diff --git a/disk/usbms.c b/grub-core/disk/usbms.c
similarity index 100%
rename from disk/usbms.c
rename to grub-core/disk/usbms.c
diff --git a/efiemu/i386/coredetect.c b/grub-core/efiemu/i386/coredetect.c
similarity index 100%
rename from efiemu/i386/coredetect.c
rename to grub-core/efiemu/i386/coredetect.c
diff --git a/efiemu/i386/loadcore32.c b/grub-core/efiemu/i386/loadcore32.c
similarity index 100%
rename from efiemu/i386/loadcore32.c
rename to grub-core/efiemu/i386/loadcore32.c
diff --git a/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c
similarity index 100%
rename from efiemu/i386/loadcore64.c
rename to grub-core/efiemu/i386/loadcore64.c
diff --git a/efiemu/i386/pc/cfgtables.c b/grub-core/efiemu/i386/pc/cfgtables.c
similarity index 100%
rename from efiemu/i386/pc/cfgtables.c
rename to grub-core/efiemu/i386/pc/cfgtables.c
diff --git a/efiemu/loadcore.c b/grub-core/efiemu/loadcore.c
similarity index 100%
rename from efiemu/loadcore.c
rename to grub-core/efiemu/loadcore.c
diff --git a/efiemu/loadcore32.c b/grub-core/efiemu/loadcore32.c
similarity index 100%
rename from efiemu/loadcore32.c
rename to grub-core/efiemu/loadcore32.c
diff --git a/efiemu/loadcore64.c b/grub-core/efiemu/loadcore64.c
similarity index 100%
rename from efiemu/loadcore64.c
rename to grub-core/efiemu/loadcore64.c
diff --git a/efiemu/loadcore_common.c b/grub-core/efiemu/loadcore_common.c
similarity index 100%
rename from efiemu/loadcore_common.c
rename to grub-core/efiemu/loadcore_common.c
diff --git a/efiemu/main.c b/grub-core/efiemu/main.c
similarity index 100%
rename from efiemu/main.c
rename to grub-core/efiemu/main.c
diff --git a/efiemu/mm.c b/grub-core/efiemu/mm.c
similarity index 100%
rename from efiemu/mm.c
rename to grub-core/efiemu/mm.c
diff --git a/efiemu/pnvram.c b/grub-core/efiemu/pnvram.c
similarity index 100%
rename from efiemu/pnvram.c
rename to grub-core/efiemu/pnvram.c
diff --git a/efiemu/prepare.c b/grub-core/efiemu/prepare.c
similarity index 100%
rename from efiemu/prepare.c
rename to grub-core/efiemu/prepare.c
diff --git a/efiemu/prepare32.c b/grub-core/efiemu/prepare32.c
similarity index 100%
rename from efiemu/prepare32.c
rename to grub-core/efiemu/prepare32.c
diff --git a/efiemu/prepare64.c b/grub-core/efiemu/prepare64.c
similarity index 100%
rename from efiemu/prepare64.c
rename to grub-core/efiemu/prepare64.c
diff --git a/efiemu/runtime/config.h b/grub-core/efiemu/runtime/config.h
similarity index 100%
rename from efiemu/runtime/config.h
rename to grub-core/efiemu/runtime/config.h
diff --git a/efiemu/runtime/efiemu.S b/grub-core/efiemu/runtime/efiemu.S
similarity index 100%
rename from efiemu/runtime/efiemu.S
rename to grub-core/efiemu/runtime/efiemu.S
diff --git a/efiemu/runtime/efiemu.c b/grub-core/efiemu/runtime/efiemu.c
similarity index 100%
rename from efiemu/runtime/efiemu.c
rename to grub-core/efiemu/runtime/efiemu.c
diff --git a/efiemu/runtime/efiemu.sh b/grub-core/efiemu/runtime/efiemu.sh
similarity index 100%
rename from efiemu/runtime/efiemu.sh
rename to grub-core/efiemu/runtime/efiemu.sh
diff --git a/efiemu/symbols.c b/grub-core/efiemu/symbols.c
similarity index 100%
rename from efiemu/symbols.c
rename to grub-core/efiemu/symbols.c
diff --git a/font/font.c b/grub-core/font/font.c
similarity index 100%
rename from font/font.c
rename to grub-core/font/font.c
diff --git a/font/font_cmd.c b/grub-core/font/font_cmd.c
similarity index 100%
rename from font/font_cmd.c
rename to grub-core/font/font_cmd.c
diff --git a/fs/affs.c b/grub-core/fs/affs.c
similarity index 100%
rename from fs/affs.c
rename to grub-core/fs/affs.c
diff --git a/fs/afs.c b/grub-core/fs/afs.c
similarity index 100%
rename from fs/afs.c
rename to grub-core/fs/afs.c
diff --git a/fs/afs_be.c b/grub-core/fs/afs_be.c
similarity index 100%
rename from fs/afs_be.c
rename to grub-core/fs/afs_be.c
diff --git a/fs/befs.c b/grub-core/fs/befs.c
similarity index 100%
rename from fs/befs.c
rename to grub-core/fs/befs.c
diff --git a/fs/befs_be.c b/grub-core/fs/befs_be.c
similarity index 100%
rename from fs/befs_be.c
rename to grub-core/fs/befs_be.c
diff --git a/fs/cpio.c b/grub-core/fs/cpio.c
similarity index 100%
rename from fs/cpio.c
rename to grub-core/fs/cpio.c
diff --git a/fs/ext2.c b/grub-core/fs/ext2.c
similarity index 100%
rename from fs/ext2.c
rename to grub-core/fs/ext2.c
diff --git a/fs/fat.c b/grub-core/fs/fat.c
similarity index 100%
rename from fs/fat.c
rename to grub-core/fs/fat.c
diff --git a/fs/fshelp.c b/grub-core/fs/fshelp.c
similarity index 100%
rename from fs/fshelp.c
rename to grub-core/fs/fshelp.c
diff --git a/fs/hfs.c b/grub-core/fs/hfs.c
similarity index 100%
rename from fs/hfs.c
rename to grub-core/fs/hfs.c
diff --git a/fs/hfsplus.c b/grub-core/fs/hfsplus.c
similarity index 100%
rename from fs/hfsplus.c
rename to grub-core/fs/hfsplus.c
diff --git a/fs/i386/pc/pxe.c b/grub-core/fs/i386/pc/pxe.c
similarity index 100%
rename from fs/i386/pc/pxe.c
rename to grub-core/fs/i386/pc/pxe.c
diff --git a/fs/iso9660.c b/grub-core/fs/iso9660.c
similarity index 100%
rename from fs/iso9660.c
rename to grub-core/fs/iso9660.c
diff --git a/fs/jfs.c b/grub-core/fs/jfs.c
similarity index 100%
rename from fs/jfs.c
rename to grub-core/fs/jfs.c
diff --git a/fs/minix.c b/grub-core/fs/minix.c
similarity index 100%
rename from fs/minix.c
rename to grub-core/fs/minix.c
diff --git a/fs/nilfs2.c b/grub-core/fs/nilfs2.c
similarity index 100%
rename from fs/nilfs2.c
rename to grub-core/fs/nilfs2.c
diff --git a/fs/ntfs.c b/grub-core/fs/ntfs.c
similarity index 100%
rename from fs/ntfs.c
rename to grub-core/fs/ntfs.c
diff --git a/fs/ntfscomp.c b/grub-core/fs/ntfscomp.c
similarity index 100%
rename from fs/ntfscomp.c
rename to grub-core/fs/ntfscomp.c
diff --git a/fs/reiserfs.c b/grub-core/fs/reiserfs.c
similarity index 100%
rename from fs/reiserfs.c
rename to grub-core/fs/reiserfs.c
diff --git a/fs/sfs.c b/grub-core/fs/sfs.c
similarity index 100%
rename from fs/sfs.c
rename to grub-core/fs/sfs.c
diff --git a/fs/tar.c b/grub-core/fs/tar.c
similarity index 100%
rename from fs/tar.c
rename to grub-core/fs/tar.c
diff --git a/fs/udf.c b/grub-core/fs/udf.c
similarity index 100%
rename from fs/udf.c
rename to grub-core/fs/udf.c
diff --git a/fs/ufs.c b/grub-core/fs/ufs.c
similarity index 100%
rename from fs/ufs.c
rename to grub-core/fs/ufs.c
diff --git a/fs/ufs2.c b/grub-core/fs/ufs2.c
similarity index 100%
rename from fs/ufs2.c
rename to grub-core/fs/ufs2.c
diff --git a/fs/xfs.c b/grub-core/fs/xfs.c
similarity index 100%
rename from fs/xfs.c
rename to grub-core/fs/xfs.c
diff --git a/gencmdlist.sh b/grub-core/gencmdlist.sh
similarity index 100%
rename from gencmdlist.sh
rename to grub-core/gencmdlist.sh
diff --git a/gendistlist.sh b/grub-core/gendistlist.sh
similarity index 100%
rename from gendistlist.sh
rename to grub-core/gendistlist.sh
diff --git a/genemuinit.sh b/grub-core/genemuinit.sh
similarity index 100%
rename from genemuinit.sh
rename to grub-core/genemuinit.sh
diff --git a/genemuinitheader.sh b/grub-core/genemuinitheader.sh
similarity index 100%
rename from genemuinitheader.sh
rename to grub-core/genemuinitheader.sh
diff --git a/genfslist.sh b/grub-core/genfslist.sh
similarity index 100%
rename from genfslist.sh
rename to grub-core/genfslist.sh
diff --git a/genhandlerlist.sh b/grub-core/genhandlerlist.sh
similarity index 100%
rename from genhandlerlist.sh
rename to grub-core/genhandlerlist.sh
diff --git a/genmoddep.awk b/grub-core/genmoddep.awk
similarity index 93%
rename from genmoddep.awk
rename to grub-core/genmoddep.awk
index 48419a091..6c92e2fc7 100644
--- a/genmoddep.awk
+++ b/grub-core/genmoddep.awk
@@ -18,15 +18,14 @@ BEGIN {
   }
 }
 
-# The first line contains a module name.
-FNR == 1 {
-  module = $1
-  next
-};
-
 # The rest is undefined symbols.
 {
-  if ($1 in symtab) {
+  module = $2
+
+  # skip if empty
+  if ($1 == "" || $2 == "")
+      ;
+  else if ($1 in symtab) {
     modtab[module] = modtab[module] " " symtab[$1];
   }
   else if ($1 != "__gnu_local_gp") {
diff --git a/genmodsrc.sh b/grub-core/genmodsrc.sh
similarity index 100%
rename from genmodsrc.sh
rename to grub-core/genmodsrc.sh
diff --git a/genpartmaplist.sh b/grub-core/genpartmaplist.sh
similarity index 100%
rename from genpartmaplist.sh
rename to grub-core/genpartmaplist.sh
diff --git a/genparttoollist.sh b/grub-core/genparttoollist.sh
similarity index 100%
rename from genparttoollist.sh
rename to grub-core/genparttoollist.sh
diff --git a/gensymlist.sh.in b/grub-core/gensymlist.sh
similarity index 84%
rename from gensymlist.sh.in
rename to grub-core/gensymlist.sh
index 3c3ddfa6c..0ab56e9cb 100644
--- a/gensymlist.sh.in
+++ b/grub-core/gensymlist.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2002,2006,2007,2008  Free Software Foundation, Inc.
+# Copyright (C) 2002,2006,2007,2008,2009,2010  Free Software Foundation, Inc.
 #
 # This gensymlist.sh.in is free software; the author
 # gives unlimited permission to copy and/or distribute it,
@@ -11,17 +11,11 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-### The configure script will replace these variables.
-
-: ${srcdir=@srcdir@}
-: ${CC=@TARGET_CC@}
-
-
 cat <<EOF
 /* This file is automatically generated by gensymlist.sh. DO NOT EDIT! */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2006,2007,2008  Free Software Foundation, Inc.
+ *  Copyright (C) 2002,2006,2007,2008,2009,2010  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
@@ -37,7 +31,6 @@ cat <<EOF
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <grub/symbol.h>
 EOF
 
 for i in $*; do
@@ -60,7 +53,7 @@ cat <<EOF
     {
 EOF
 
-$CC @TARGET_CFLAGS@ -DGRUB_SYMBOL_GENERATOR=1 -E -I. -Iinclude -I"$srcdir/include" $* \
+(while read LINE; do echo $LINE; done) \
   | grep -v '^#' \
   | sed -n \
         -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/      {"\1", \1},/;p;}' \
diff --git a/genterminallist.sh b/grub-core/genterminallist.sh
similarity index 100%
rename from genterminallist.sh
rename to grub-core/genterminallist.sh
diff --git a/gentrigtables.c b/grub-core/gentrigtables.c
similarity index 93%
rename from gentrigtables.c
rename to grub-core/gentrigtables.c
index 772cd6224..bef2b083c 100644
--- a/gentrigtables.c
+++ b/grub-core/gentrigtables.c
@@ -24,7 +24,8 @@
 #include <stdio.h>
 
 int
-main ()
+main (int argc __attribute__ ((unused)),
+      char **argv __attribute__ ((unused)))
 {
   int i;
 
diff --git a/genvideolist.sh b/grub-core/genvideolist.sh
similarity index 100%
rename from genvideolist.sh
rename to grub-core/genvideolist.sh
diff --git a/gettext/gettext.c b/grub-core/gettext/gettext.c
similarity index 100%
rename from gettext/gettext.c
rename to grub-core/gettext/gettext.c
diff --git a/gfxmenu/gfxmenu.c b/grub-core/gfxmenu/gfxmenu.c
similarity index 100%
rename from gfxmenu/gfxmenu.c
rename to grub-core/gfxmenu/gfxmenu.c
diff --git a/gfxmenu/gui_box.c b/grub-core/gfxmenu/gui_box.c
similarity index 100%
rename from gfxmenu/gui_box.c
rename to grub-core/gfxmenu/gui_box.c
diff --git a/gfxmenu/gui_canvas.c b/grub-core/gfxmenu/gui_canvas.c
similarity index 100%
rename from gfxmenu/gui_canvas.c
rename to grub-core/gfxmenu/gui_canvas.c
diff --git a/gfxmenu/gui_circular_progress.c b/grub-core/gfxmenu/gui_circular_progress.c
similarity index 100%
rename from gfxmenu/gui_circular_progress.c
rename to grub-core/gfxmenu/gui_circular_progress.c
diff --git a/gfxmenu/gui_image.c b/grub-core/gfxmenu/gui_image.c
similarity index 100%
rename from gfxmenu/gui_image.c
rename to grub-core/gfxmenu/gui_image.c
diff --git a/gfxmenu/gui_label.c b/grub-core/gfxmenu/gui_label.c
similarity index 100%
rename from gfxmenu/gui_label.c
rename to grub-core/gfxmenu/gui_label.c
diff --git a/gfxmenu/gui_list.c b/grub-core/gfxmenu/gui_list.c
similarity index 100%
rename from gfxmenu/gui_list.c
rename to grub-core/gfxmenu/gui_list.c
diff --git a/gfxmenu/gui_progress_bar.c b/grub-core/gfxmenu/gui_progress_bar.c
similarity index 100%
rename from gfxmenu/gui_progress_bar.c
rename to grub-core/gfxmenu/gui_progress_bar.c
diff --git a/gfxmenu/gui_string_util.c b/grub-core/gfxmenu/gui_string_util.c
similarity index 100%
rename from gfxmenu/gui_string_util.c
rename to grub-core/gfxmenu/gui_string_util.c
diff --git a/gfxmenu/gui_util.c b/grub-core/gfxmenu/gui_util.c
similarity index 100%
rename from gfxmenu/gui_util.c
rename to grub-core/gfxmenu/gui_util.c
diff --git a/gfxmenu/icon_manager.c b/grub-core/gfxmenu/icon_manager.c
similarity index 100%
rename from gfxmenu/icon_manager.c
rename to grub-core/gfxmenu/icon_manager.c
diff --git a/gfxmenu/model.c b/grub-core/gfxmenu/model.c
similarity index 100%
rename from gfxmenu/model.c
rename to grub-core/gfxmenu/model.c
diff --git a/gfxmenu/named_colors.c b/grub-core/gfxmenu/named_colors.c
similarity index 100%
rename from gfxmenu/named_colors.c
rename to grub-core/gfxmenu/named_colors.c
diff --git a/gfxmenu/theme_loader.c b/grub-core/gfxmenu/theme_loader.c
similarity index 100%
rename from gfxmenu/theme_loader.c
rename to grub-core/gfxmenu/theme_loader.c
diff --git a/gfxmenu/view.c b/grub-core/gfxmenu/view.c
similarity index 100%
rename from gfxmenu/view.c
rename to grub-core/gfxmenu/view.c
diff --git a/gfxmenu/widget-box.c b/grub-core/gfxmenu/widget-box.c
similarity index 100%
rename from gfxmenu/widget-box.c
rename to grub-core/gfxmenu/widget-box.c
diff --git a/gnulib/alloca.h b/grub-core/gnulib/alloca.h
similarity index 100%
rename from gnulib/alloca.h
rename to grub-core/gnulib/alloca.h
diff --git a/gnulib/argp-ba.c b/grub-core/gnulib/argp-ba.c
similarity index 100%
rename from gnulib/argp-ba.c
rename to grub-core/gnulib/argp-ba.c
diff --git a/gnulib/argp-eexst.c b/grub-core/gnulib/argp-eexst.c
similarity index 100%
rename from gnulib/argp-eexst.c
rename to grub-core/gnulib/argp-eexst.c
diff --git a/gnulib/argp-fmtstream.c b/grub-core/gnulib/argp-fmtstream.c
similarity index 100%
rename from gnulib/argp-fmtstream.c
rename to grub-core/gnulib/argp-fmtstream.c
diff --git a/gnulib/argp-fmtstream.h b/grub-core/gnulib/argp-fmtstream.h
similarity index 100%
rename from gnulib/argp-fmtstream.h
rename to grub-core/gnulib/argp-fmtstream.h
diff --git a/gnulib/argp-fs-xinl.c b/grub-core/gnulib/argp-fs-xinl.c
similarity index 100%
rename from gnulib/argp-fs-xinl.c
rename to grub-core/gnulib/argp-fs-xinl.c
diff --git a/gnulib/argp-help.c b/grub-core/gnulib/argp-help.c
similarity index 100%
rename from gnulib/argp-help.c
rename to grub-core/gnulib/argp-help.c
diff --git a/gnulib/argp-namefrob.h b/grub-core/gnulib/argp-namefrob.h
similarity index 100%
rename from gnulib/argp-namefrob.h
rename to grub-core/gnulib/argp-namefrob.h
diff --git a/gnulib/argp-parse.c b/grub-core/gnulib/argp-parse.c
similarity index 100%
rename from gnulib/argp-parse.c
rename to grub-core/gnulib/argp-parse.c
diff --git a/gnulib/argp-pin.c b/grub-core/gnulib/argp-pin.c
similarity index 100%
rename from gnulib/argp-pin.c
rename to grub-core/gnulib/argp-pin.c
diff --git a/gnulib/argp-pv.c b/grub-core/gnulib/argp-pv.c
similarity index 100%
rename from gnulib/argp-pv.c
rename to grub-core/gnulib/argp-pv.c
diff --git a/gnulib/argp-pvh.c b/grub-core/gnulib/argp-pvh.c
similarity index 100%
rename from gnulib/argp-pvh.c
rename to grub-core/gnulib/argp-pvh.c
diff --git a/gnulib/argp-version-etc.c b/grub-core/gnulib/argp-version-etc.c
similarity index 100%
rename from gnulib/argp-version-etc.c
rename to grub-core/gnulib/argp-version-etc.c
diff --git a/gnulib/argp-version-etc.h b/grub-core/gnulib/argp-version-etc.h
similarity index 100%
rename from gnulib/argp-version-etc.h
rename to grub-core/gnulib/argp-version-etc.h
diff --git a/gnulib/argp-xinl.c b/grub-core/gnulib/argp-xinl.c
similarity index 100%
rename from gnulib/argp-xinl.c
rename to grub-core/gnulib/argp-xinl.c
diff --git a/gnulib/argp.h b/grub-core/gnulib/argp.h
similarity index 100%
rename from gnulib/argp.h
rename to grub-core/gnulib/argp.h
diff --git a/gnulib/error.c b/grub-core/gnulib/error.c
similarity index 100%
rename from gnulib/error.c
rename to grub-core/gnulib/error.c
diff --git a/gnulib/error.h b/grub-core/gnulib/error.h
similarity index 100%
rename from gnulib/error.h
rename to grub-core/gnulib/error.h
diff --git a/gnulib/fnmatch.c b/grub-core/gnulib/fnmatch.c
similarity index 100%
rename from gnulib/fnmatch.c
rename to grub-core/gnulib/fnmatch.c
diff --git a/gnulib/fnmatch.h b/grub-core/gnulib/fnmatch.h
similarity index 100%
rename from gnulib/fnmatch.h
rename to grub-core/gnulib/fnmatch.h
diff --git a/gnulib/fnmatch_loop.c b/grub-core/gnulib/fnmatch_loop.c
similarity index 100%
rename from gnulib/fnmatch_loop.c
rename to grub-core/gnulib/fnmatch_loop.c
diff --git a/gnulib/getdelim.c b/grub-core/gnulib/getdelim.c
similarity index 100%
rename from gnulib/getdelim.c
rename to grub-core/gnulib/getdelim.c
diff --git a/gnulib/getline.c b/grub-core/gnulib/getline.c
similarity index 100%
rename from gnulib/getline.c
rename to grub-core/gnulib/getline.c
diff --git a/gnulib/getopt.c b/grub-core/gnulib/getopt.c
similarity index 100%
rename from gnulib/getopt.c
rename to grub-core/gnulib/getopt.c
diff --git a/gnulib/getopt.h b/grub-core/gnulib/getopt.h
similarity index 100%
rename from gnulib/getopt.h
rename to grub-core/gnulib/getopt.h
diff --git a/gnulib/getopt1.c b/grub-core/gnulib/getopt1.c
similarity index 100%
rename from gnulib/getopt1.c
rename to grub-core/gnulib/getopt1.c
diff --git a/gnulib/getopt_int.h b/grub-core/gnulib/getopt_int.h
similarity index 100%
rename from gnulib/getopt_int.h
rename to grub-core/gnulib/getopt_int.h
diff --git a/gnulib/gettext.h b/grub-core/gnulib/gettext.h
similarity index 100%
rename from gnulib/gettext.h
rename to grub-core/gnulib/gettext.h
diff --git a/gnulib/progname.c b/grub-core/gnulib/progname.c
similarity index 100%
rename from gnulib/progname.c
rename to grub-core/gnulib/progname.c
diff --git a/gnulib/progname.h b/grub-core/gnulib/progname.h
similarity index 100%
rename from gnulib/progname.h
rename to grub-core/gnulib/progname.h
diff --git a/gnulib/regcomp.c b/grub-core/gnulib/regcomp.c
similarity index 100%
rename from gnulib/regcomp.c
rename to grub-core/gnulib/regcomp.c
diff --git a/gnulib/regex.c b/grub-core/gnulib/regex.c
similarity index 100%
rename from gnulib/regex.c
rename to grub-core/gnulib/regex.c
diff --git a/gnulib/regex.h b/grub-core/gnulib/regex.h
similarity index 100%
rename from gnulib/regex.h
rename to grub-core/gnulib/regex.h
diff --git a/gnulib/regex_internal.c b/grub-core/gnulib/regex_internal.c
similarity index 100%
rename from gnulib/regex_internal.c
rename to grub-core/gnulib/regex_internal.c
diff --git a/gnulib/regex_internal.h b/grub-core/gnulib/regex_internal.h
similarity index 100%
rename from gnulib/regex_internal.h
rename to grub-core/gnulib/regex_internal.h
diff --git a/gnulib/regexec.c b/grub-core/gnulib/regexec.c
similarity index 100%
rename from gnulib/regexec.c
rename to grub-core/gnulib/regexec.c
diff --git a/hello/hello.c b/grub-core/hello/hello.c
similarity index 100%
rename from hello/hello.c
rename to grub-core/hello/hello.c
diff --git a/hook/datehook.c b/grub-core/hook/datehook.c
similarity index 100%
rename from hook/datehook.c
rename to grub-core/hook/datehook.c
diff --git a/util/import_gcry.py b/grub-core/import_gcry.py
similarity index 100%
rename from util/import_gcry.py
rename to grub-core/import_gcry.py
diff --git a/include/grub/acorn_filecore.h b/grub-core/include/grub/acorn_filecore.h
similarity index 100%
rename from include/grub/acorn_filecore.h
rename to grub-core/include/grub/acorn_filecore.h
diff --git a/include/grub/acpi.h b/grub-core/include/grub/acpi.h
similarity index 100%
rename from include/grub/acpi.h
rename to grub-core/include/grub/acpi.h
diff --git a/include/grub/aout.h b/grub-core/include/grub/aout.h
similarity index 100%
rename from include/grub/aout.h
rename to grub-core/include/grub/aout.h
diff --git a/include/grub/at_keyboard.h b/grub-core/include/grub/at_keyboard.h
similarity index 100%
rename from include/grub/at_keyboard.h
rename to grub-core/include/grub/at_keyboard.h
diff --git a/include/grub/ata.h b/grub-core/include/grub/ata.h
similarity index 100%
rename from include/grub/ata.h
rename to grub-core/include/grub/ata.h
diff --git a/include/grub/auth.h b/grub-core/include/grub/auth.h
similarity index 100%
rename from include/grub/auth.h
rename to grub-core/include/grub/auth.h
diff --git a/include/grub/autoefi.h b/grub-core/include/grub/autoefi.h
similarity index 100%
rename from include/grub/autoefi.h
rename to grub-core/include/grub/autoefi.h
diff --git a/include/grub/bitmap.h b/grub-core/include/grub/bitmap.h
similarity index 100%
rename from include/grub/bitmap.h
rename to grub-core/include/grub/bitmap.h
diff --git a/include/grub/bitmap_scale.h b/grub-core/include/grub/bitmap_scale.h
similarity index 100%
rename from include/grub/bitmap_scale.h
rename to grub-core/include/grub/bitmap_scale.h
diff --git a/include/grub/boot.h b/grub-core/include/grub/boot.h
similarity index 100%
rename from include/grub/boot.h
rename to grub-core/include/grub/boot.h
diff --git a/include/grub/bsdlabel.h b/grub-core/include/grub/bsdlabel.h
similarity index 100%
rename from include/grub/bsdlabel.h
rename to grub-core/include/grub/bsdlabel.h
diff --git a/include/grub/bufio.h b/grub-core/include/grub/bufio.h
similarity index 100%
rename from include/grub/bufio.h
rename to grub-core/include/grub/bufio.h
diff --git a/include/grub/cache.h b/grub-core/include/grub/cache.h
similarity index 100%
rename from include/grub/cache.h
rename to grub-core/include/grub/cache.h
diff --git a/include/grub/charset.h b/grub-core/include/grub/charset.h
similarity index 100%
rename from include/grub/charset.h
rename to grub-core/include/grub/charset.h
diff --git a/include/grub/cmos.h b/grub-core/include/grub/cmos.h
similarity index 100%
rename from include/grub/cmos.h
rename to grub-core/include/grub/cmos.h
diff --git a/include/grub/command.h b/grub-core/include/grub/command.h
similarity index 100%
rename from include/grub/command.h
rename to grub-core/include/grub/command.h
diff --git a/include/grub/crypto.h b/grub-core/include/grub/crypto.h
similarity index 100%
rename from include/grub/crypto.h
rename to grub-core/include/grub/crypto.h
diff --git a/include/grub/datetime.h b/grub-core/include/grub/datetime.h
similarity index 100%
rename from include/grub/datetime.h
rename to grub-core/include/grub/datetime.h
diff --git a/include/grub/device.h b/grub-core/include/grub/device.h
similarity index 100%
rename from include/grub/device.h
rename to grub-core/include/grub/device.h
diff --git a/include/grub/disk.h b/grub-core/include/grub/disk.h
similarity index 100%
rename from include/grub/disk.h
rename to grub-core/include/grub/disk.h
diff --git a/include/grub/dl.h b/grub-core/include/grub/dl.h
similarity index 90%
rename from include/grub/dl.h
rename to grub-core/include/grub/dl.h
index cfb7c2f99..f98539a4e 100644
--- a/include/grub/dl.h
+++ b/grub-core/include/grub/dl.h
@@ -25,6 +25,13 @@
 #include <grub/types.h>
 #include <grub/elf.h>
 
+/*
+ * Macros GRUB_MOD_INIT and GRUB_MOD_FINI are also used by build rules
+ * to collect module names, so we define them only when they are not
+ * defined already.
+ */
+
+#ifndef GRUB_MOD_INIT
 #define GRUB_MOD_INIT(name)	\
 static void grub_mod_init (grub_dl_t mod __attribute__ ((unused))) __attribute__ ((used)); \
 void grub_##name##_init (void); \
@@ -32,7 +39,9 @@ void \
 grub_##name##_init (void) { grub_mod_init (0); } \
 static void \
 grub_mod_init (grub_dl_t mod __attribute__ ((unused)))
+#endif
 
+#ifndef GRUB_MOD_FINI
 #define GRUB_MOD_FINI(name)	\
 static void grub_mod_fini (void) __attribute__ ((used)); \
 void grub_##name##_fini (void); \
@@ -40,6 +49,7 @@ void \
 grub_##name##_fini (void) { grub_mod_fini (); } \
 static void \
 grub_mod_fini (void)
+#endif
 
 #ifdef APPLE_CC
 #define GRUB_MOD_NAME(name)	\
@@ -91,28 +101,8 @@ grub_dl_t grub_dl_load_core (void *addr, grub_size_t size);
 int EXPORT_FUNC(grub_dl_unload) (grub_dl_t mod);
 void grub_dl_unload_unneeded (void);
 void grub_dl_unload_all (void);
-#if defined (GRUB_UTIL) || defined (GRUB_TARGET_NO_MODULES)
-#define GRUB_NO_MODULES 1
-#else
-#define GRUB_NO_MODULES 0
-#endif
-#if GRUB_NO_MODULES
-static inline int
-grub_dl_ref (grub_dl_t mod)
-{
-  (void) mod;
-  return 0;
-}
-static inline int
-grub_dl_unref (grub_dl_t mod)
-{
-  (void) mod;
-  return 0;
-}
-#else
 int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);
 int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);
-#endif
 void EXPORT_FUNC(grub_dl_iterate) (int (*hook) (grub_dl_t mod));
 grub_dl_t EXPORT_FUNC(grub_dl_get) (const char *name);
 grub_err_t grub_dl_register_symbol (const char *name, void *addr,
@@ -121,7 +111,7 @@ grub_err_t grub_dl_register_symbol (const char *name, void *addr,
 grub_err_t grub_arch_dl_check_header (void *ehdr);
 grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
 
-#if defined (_mips) && ! GRUB_NO_MODULES
+#if defined (_mips)
 #define GRUB_LINKER_HAVE_INIT 1
 void grub_arch_dl_init_linker (void);
 #endif
diff --git a/include/grub/efi/api.h b/grub-core/include/grub/efi/api.h
similarity index 100%
rename from include/grub/efi/api.h
rename to grub-core/include/grub/efi/api.h
diff --git a/include/grub/efi/console.h b/grub-core/include/grub/efi/console.h
similarity index 100%
rename from include/grub/efi/console.h
rename to grub-core/include/grub/efi/console.h
diff --git a/include/grub/efi/console_control.h b/grub-core/include/grub/efi/console_control.h
similarity index 100%
rename from include/grub/efi/console_control.h
rename to grub-core/include/grub/efi/console_control.h
diff --git a/include/grub/efi/disk.h b/grub-core/include/grub/efi/disk.h
similarity index 100%
rename from include/grub/efi/disk.h
rename to grub-core/include/grub/efi/disk.h
diff --git a/include/grub/efi/efi.h b/grub-core/include/grub/efi/efi.h
similarity index 100%
rename from include/grub/efi/efi.h
rename to grub-core/include/grub/efi/efi.h
diff --git a/include/grub/efi/graphics_output.h b/grub-core/include/grub/efi/graphics_output.h
similarity index 100%
rename from include/grub/efi/graphics_output.h
rename to grub-core/include/grub/efi/graphics_output.h
diff --git a/include/grub/efi/memory.h b/grub-core/include/grub/efi/memory.h
similarity index 100%
rename from include/grub/efi/memory.h
rename to grub-core/include/grub/efi/memory.h
diff --git a/include/grub/efi/pe32.h b/grub-core/include/grub/efi/pe32.h
similarity index 100%
rename from include/grub/efi/pe32.h
rename to grub-core/include/grub/efi/pe32.h
diff --git a/include/grub/efi/time.h b/grub-core/include/grub/efi/time.h
similarity index 100%
rename from include/grub/efi/time.h
rename to grub-core/include/grub/efi/time.h
diff --git a/include/grub/efi/uga_draw.h b/grub-core/include/grub/efi/uga_draw.h
similarity index 100%
rename from include/grub/efi/uga_draw.h
rename to grub-core/include/grub/efi/uga_draw.h
diff --git a/include/grub/efiemu/efiemu.h b/grub-core/include/grub/efiemu/efiemu.h
similarity index 100%
rename from include/grub/efiemu/efiemu.h
rename to grub-core/include/grub/efiemu/efiemu.h
diff --git a/include/grub/efiemu/runtime.h b/grub-core/include/grub/efiemu/runtime.h
similarity index 100%
rename from include/grub/efiemu/runtime.h
rename to grub-core/include/grub/efiemu/runtime.h
diff --git a/include/grub/elf.h b/grub-core/include/grub/elf.h
similarity index 100%
rename from include/grub/elf.h
rename to grub-core/include/grub/elf.h
diff --git a/include/grub/elfload.h b/grub-core/include/grub/elfload.h
similarity index 100%
rename from include/grub/elfload.h
rename to grub-core/include/grub/elfload.h
diff --git a/include/grub/util/console.h b/grub-core/include/grub/emu/console.h
similarity index 100%
rename from include/grub/util/console.h
rename to grub-core/include/grub/emu/console.h
diff --git a/include/grub/util/getroot.h b/grub-core/include/grub/emu/getroot.h
similarity index 94%
rename from include/grub/util/getroot.h
rename to grub-core/include/grub/emu/getroot.h
index dff7b4df7..04a2805c8 100644
--- a/include/grub/util/getroot.h
+++ b/grub-core/include/grub/emu/getroot.h
@@ -28,6 +28,7 @@ enum grub_dev_abstraction_types {
 char *grub_guess_root_device (const char *dir);
 int grub_util_get_dev_abstraction (const char *os_dev);
 char *grub_util_get_grub_dev (const char *os_dev);
+char *grub_make_system_path_relative_to_its_root (const char *path);
 const char *grub_util_check_block_device (const char *blk_dev);
 const char *grub_util_check_char_device (const char *blk_dev);
 
diff --git a/include/grub/util/hostdisk.h b/grub-core/include/grub/emu/hostdisk.h
similarity index 100%
rename from include/grub/util/hostdisk.h
rename to grub-core/include/grub/emu/hostdisk.h
diff --git a/grub-core/include/grub/emu/misc.h b/grub-core/include/grub/emu/misc.h
new file mode 100644
index 000000000..29c1d4a73
--- /dev/null
+++ b/grub-core/include/grub/emu/misc.h
@@ -0,0 +1,22 @@
+#ifndef GRUB_EMU_MISC_H
+#define GRUB_EMU_MISC_H 1
+
+#include <grub/symbol.h>
+#include <grub/types.h>
+
+extern int verbosity;
+extern const char *program_name;
+
+void grub_init_all (void);
+void grub_fini_all (void);
+
+void * EXPORT_FUNC(xmalloc) (grub_size_t size);
+void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size);
+char * EXPORT_FUNC(xstrdup) (const char *str);
+char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
+
+void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...);
+void EXPORT_FUNC(grub_util_info) (const char *fmt, ...);
+void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((noreturn));
+
+#endif /* GRUB_EMU_MISC_H */
diff --git a/include/grub/env.h b/grub-core/include/grub/env.h
similarity index 100%
rename from include/grub/env.h
rename to grub-core/include/grub/env.h
diff --git a/include/grub/env_private.h b/grub-core/include/grub/env_private.h
similarity index 100%
rename from include/grub/env_private.h
rename to grub-core/include/grub/env_private.h
diff --git a/include/grub/err.h b/grub-core/include/grub/err.h
similarity index 100%
rename from include/grub/err.h
rename to grub-core/include/grub/err.h
diff --git a/include/grub/extcmd.h b/grub-core/include/grub/extcmd.h
similarity index 100%
rename from include/grub/extcmd.h
rename to grub-core/include/grub/extcmd.h
diff --git a/include/grub/fbblit.h b/grub-core/include/grub/fbblit.h
similarity index 100%
rename from include/grub/fbblit.h
rename to grub-core/include/grub/fbblit.h
diff --git a/include/grub/fbfill.h b/grub-core/include/grub/fbfill.h
similarity index 100%
rename from include/grub/fbfill.h
rename to grub-core/include/grub/fbfill.h
diff --git a/include/grub/fbutil.h b/grub-core/include/grub/fbutil.h
similarity index 100%
rename from include/grub/fbutil.h
rename to grub-core/include/grub/fbutil.h
diff --git a/include/grub/file.h b/grub-core/include/grub/file.h
similarity index 100%
rename from include/grub/file.h
rename to grub-core/include/grub/file.h
diff --git a/include/grub/font.h b/grub-core/include/grub/font.h
similarity index 100%
rename from include/grub/font.h
rename to grub-core/include/grub/font.h
diff --git a/include/grub/fontformat.h b/grub-core/include/grub/fontformat.h
similarity index 100%
rename from include/grub/fontformat.h
rename to grub-core/include/grub/fontformat.h
diff --git a/include/grub/fs.h b/grub-core/include/grub/fs.h
similarity index 100%
rename from include/grub/fs.h
rename to grub-core/include/grub/fs.h
diff --git a/include/grub/fshelp.h b/grub-core/include/grub/fshelp.h
similarity index 100%
rename from include/grub/fshelp.h
rename to grub-core/include/grub/fshelp.h
diff --git a/include/grub/gfxmenu_model.h b/grub-core/include/grub/gfxmenu_model.h
similarity index 100%
rename from include/grub/gfxmenu_model.h
rename to grub-core/include/grub/gfxmenu_model.h
diff --git a/include/grub/gfxmenu_view.h b/grub-core/include/grub/gfxmenu_view.h
similarity index 100%
rename from include/grub/gfxmenu_view.h
rename to grub-core/include/grub/gfxmenu_view.h
diff --git a/include/grub/gfxterm.h b/grub-core/include/grub/gfxterm.h
similarity index 100%
rename from include/grub/gfxterm.h
rename to grub-core/include/grub/gfxterm.h
diff --git a/include/grub/gfxwidgets.h b/grub-core/include/grub/gfxwidgets.h
similarity index 100%
rename from include/grub/gfxwidgets.h
rename to grub-core/include/grub/gfxwidgets.h
diff --git a/include/grub/gpt_partition.h b/grub-core/include/grub/gpt_partition.h
similarity index 100%
rename from include/grub/gpt_partition.h
rename to grub-core/include/grub/gpt_partition.h
diff --git a/include/grub/gui.h b/grub-core/include/grub/gui.h
similarity index 100%
rename from include/grub/gui.h
rename to grub-core/include/grub/gui.h
diff --git a/include/grub/gui_string_util.h b/grub-core/include/grub/gui_string_util.h
similarity index 100%
rename from include/grub/gui_string_util.h
rename to grub-core/include/grub/gui_string_util.h
diff --git a/include/grub/gzio.h b/grub-core/include/grub/gzio.h
similarity index 100%
rename from include/grub/gzio.h
rename to grub-core/include/grub/gzio.h
diff --git a/include/grub/handler.h b/grub-core/include/grub/handler.h
similarity index 100%
rename from include/grub/handler.h
rename to grub-core/include/grub/handler.h
diff --git a/include/grub/hfs.h b/grub-core/include/grub/hfs.h
similarity index 100%
rename from include/grub/hfs.h
rename to grub-core/include/grub/hfs.h
diff --git a/include/grub/i18n.h b/grub-core/include/grub/i18n.h
similarity index 100%
rename from include/grub/i18n.h
rename to grub-core/include/grub/i18n.h
diff --git a/include/grub/i386/at_keyboard.h b/grub-core/include/grub/i386/at_keyboard.h
similarity index 100%
rename from include/grub/i386/at_keyboard.h
rename to grub-core/include/grub/i386/at_keyboard.h
diff --git a/include/grub/i386/bsd.h b/grub-core/include/grub/i386/bsd.h
similarity index 100%
rename from include/grub/i386/bsd.h
rename to grub-core/include/grub/i386/bsd.h
diff --git a/include/grub/i386/cmos.h b/grub-core/include/grub/i386/cmos.h
similarity index 100%
rename from include/grub/i386/cmos.h
rename to grub-core/include/grub/i386/cmos.h
diff --git a/include/grub/i386/coreboot/boot.h b/grub-core/include/grub/i386/coreboot/boot.h
similarity index 100%
rename from include/grub/i386/coreboot/boot.h
rename to grub-core/include/grub/i386/coreboot/boot.h
diff --git a/include/grub/i386/coreboot/console.h b/grub-core/include/grub/i386/coreboot/console.h
similarity index 100%
rename from include/grub/i386/coreboot/console.h
rename to grub-core/include/grub/i386/coreboot/console.h
diff --git a/include/grub/i386/coreboot/init.h b/grub-core/include/grub/i386/coreboot/init.h
similarity index 100%
rename from include/grub/i386/coreboot/init.h
rename to grub-core/include/grub/i386/coreboot/init.h
diff --git a/include/grub/i386/coreboot/kernel.h b/grub-core/include/grub/i386/coreboot/kernel.h
similarity index 100%
rename from include/grub/i386/coreboot/kernel.h
rename to grub-core/include/grub/i386/coreboot/kernel.h
diff --git a/include/grub/i386/coreboot/loader.h b/grub-core/include/grub/i386/coreboot/loader.h
similarity index 100%
rename from include/grub/i386/coreboot/loader.h
rename to grub-core/include/grub/i386/coreboot/loader.h
diff --git a/include/grub/i386/coreboot/memory.h b/grub-core/include/grub/i386/coreboot/memory.h
similarity index 100%
rename from include/grub/i386/coreboot/memory.h
rename to grub-core/include/grub/i386/coreboot/memory.h
diff --git a/include/grub/i386/coreboot/serial.h b/grub-core/include/grub/i386/coreboot/serial.h
similarity index 100%
rename from include/grub/i386/coreboot/serial.h
rename to grub-core/include/grub/i386/coreboot/serial.h
diff --git a/include/grub/i386/coreboot/time.h b/grub-core/include/grub/i386/coreboot/time.h
similarity index 100%
rename from include/grub/i386/coreboot/time.h
rename to grub-core/include/grub/i386/coreboot/time.h
diff --git a/include/grub/i386/cpuid.h b/grub-core/include/grub/i386/cpuid.h
similarity index 100%
rename from include/grub/i386/cpuid.h
rename to grub-core/include/grub/i386/cpuid.h
diff --git a/include/grub/i386/efi/kernel.h b/grub-core/include/grub/i386/efi/kernel.h
similarity index 100%
rename from include/grub/i386/efi/kernel.h
rename to grub-core/include/grub/i386/efi/kernel.h
diff --git a/include/grub/i386/efi/loader.h b/grub-core/include/grub/i386/efi/loader.h
similarity index 100%
rename from include/grub/i386/efi/loader.h
rename to grub-core/include/grub/i386/efi/loader.h
diff --git a/include/grub/i386/efi/memory.h b/grub-core/include/grub/i386/efi/memory.h
similarity index 100%
rename from include/grub/i386/efi/memory.h
rename to grub-core/include/grub/i386/efi/memory.h
diff --git a/include/grub/i386/efi/serial.h b/grub-core/include/grub/i386/efi/serial.h
similarity index 100%
rename from include/grub/i386/efi/serial.h
rename to grub-core/include/grub/i386/efi/serial.h
diff --git a/include/grub/i386/efi/time.h b/grub-core/include/grub/i386/efi/time.h
similarity index 100%
rename from include/grub/i386/efi/time.h
rename to grub-core/include/grub/i386/efi/time.h
diff --git a/include/grub/i386/efiemu.h b/grub-core/include/grub/i386/efiemu.h
similarity index 100%
rename from include/grub/i386/efiemu.h
rename to grub-core/include/grub/i386/efiemu.h
diff --git a/include/grub/i386/freebsd_linker.h b/grub-core/include/grub/i386/freebsd_linker.h
similarity index 100%
rename from include/grub/i386/freebsd_linker.h
rename to grub-core/include/grub/i386/freebsd_linker.h
diff --git a/include/grub/i386/freebsd_reboot.h b/grub-core/include/grub/i386/freebsd_reboot.h
similarity index 100%
rename from include/grub/i386/freebsd_reboot.h
rename to grub-core/include/grub/i386/freebsd_reboot.h
diff --git a/include/grub/i386/ieee1275/console.h b/grub-core/include/grub/i386/ieee1275/console.h
similarity index 100%
rename from include/grub/i386/ieee1275/console.h
rename to grub-core/include/grub/i386/ieee1275/console.h
diff --git a/include/grub/i386/ieee1275/ieee1275.h b/grub-core/include/grub/i386/ieee1275/ieee1275.h
similarity index 100%
rename from include/grub/i386/ieee1275/ieee1275.h
rename to grub-core/include/grub/i386/ieee1275/ieee1275.h
diff --git a/include/grub/i386/ieee1275/kernel.h b/grub-core/include/grub/i386/ieee1275/kernel.h
similarity index 100%
rename from include/grub/i386/ieee1275/kernel.h
rename to grub-core/include/grub/i386/ieee1275/kernel.h
diff --git a/include/grub/i386/ieee1275/loader.h b/grub-core/include/grub/i386/ieee1275/loader.h
similarity index 100%
rename from include/grub/i386/ieee1275/loader.h
rename to grub-core/include/grub/i386/ieee1275/loader.h
diff --git a/include/grub/i386/ieee1275/memory.h b/grub-core/include/grub/i386/ieee1275/memory.h
similarity index 100%
rename from include/grub/i386/ieee1275/memory.h
rename to grub-core/include/grub/i386/ieee1275/memory.h
diff --git a/include/grub/i386/ieee1275/serial.h b/grub-core/include/grub/i386/ieee1275/serial.h
similarity index 100%
rename from include/grub/i386/ieee1275/serial.h
rename to grub-core/include/grub/i386/ieee1275/serial.h
diff --git a/include/grub/i386/ieee1275/time.h b/grub-core/include/grub/i386/ieee1275/time.h
similarity index 100%
rename from include/grub/i386/ieee1275/time.h
rename to grub-core/include/grub/i386/ieee1275/time.h
diff --git a/include/grub/i386/io.h b/grub-core/include/grub/i386/io.h
similarity index 100%
rename from include/grub/i386/io.h
rename to grub-core/include/grub/i386/io.h
diff --git a/include/grub/i386/kernel.h b/grub-core/include/grub/i386/kernel.h
similarity index 100%
rename from include/grub/i386/kernel.h
rename to grub-core/include/grub/i386/kernel.h
diff --git a/include/grub/i386/linux.h b/grub-core/include/grub/i386/linux.h
similarity index 100%
rename from include/grub/i386/linux.h
rename to grub-core/include/grub/i386/linux.h
diff --git a/include/grub/i386/loader.h b/grub-core/include/grub/i386/loader.h
similarity index 100%
rename from include/grub/i386/loader.h
rename to grub-core/include/grub/i386/loader.h
diff --git a/include/grub/i386/macho.h b/grub-core/include/grub/i386/macho.h
similarity index 100%
rename from include/grub/i386/macho.h
rename to grub-core/include/grub/i386/macho.h
diff --git a/include/grub/i386/memory.h b/grub-core/include/grub/i386/memory.h
similarity index 100%
rename from include/grub/i386/memory.h
rename to grub-core/include/grub/i386/memory.h
diff --git a/include/grub/i386/multiboot.h b/grub-core/include/grub/i386/multiboot.h
similarity index 100%
rename from include/grub/i386/multiboot.h
rename to grub-core/include/grub/i386/multiboot.h
diff --git a/include/grub/i386/multiboot/boot.h b/grub-core/include/grub/i386/multiboot/boot.h
similarity index 100%
rename from include/grub/i386/multiboot/boot.h
rename to grub-core/include/grub/i386/multiboot/boot.h
diff --git a/include/grub/i386/multiboot/console.h b/grub-core/include/grub/i386/multiboot/console.h
similarity index 100%
rename from include/grub/i386/multiboot/console.h
rename to grub-core/include/grub/i386/multiboot/console.h
diff --git a/include/grub/i386/multiboot/init.h b/grub-core/include/grub/i386/multiboot/init.h
similarity index 100%
rename from include/grub/i386/multiboot/init.h
rename to grub-core/include/grub/i386/multiboot/init.h
diff --git a/include/grub/i386/multiboot/kernel.h b/grub-core/include/grub/i386/multiboot/kernel.h
similarity index 100%
rename from include/grub/i386/multiboot/kernel.h
rename to grub-core/include/grub/i386/multiboot/kernel.h
diff --git a/include/grub/i386/multiboot/loader.h b/grub-core/include/grub/i386/multiboot/loader.h
similarity index 100%
rename from include/grub/i386/multiboot/loader.h
rename to grub-core/include/grub/i386/multiboot/loader.h
diff --git a/include/grub/i386/multiboot/memory.h b/grub-core/include/grub/i386/multiboot/memory.h
similarity index 100%
rename from include/grub/i386/multiboot/memory.h
rename to grub-core/include/grub/i386/multiboot/memory.h
diff --git a/include/grub/i386/multiboot/serial.h b/grub-core/include/grub/i386/multiboot/serial.h
similarity index 100%
rename from include/grub/i386/multiboot/serial.h
rename to grub-core/include/grub/i386/multiboot/serial.h
diff --git a/include/grub/i386/multiboot/time.h b/grub-core/include/grub/i386/multiboot/time.h
similarity index 100%
rename from include/grub/i386/multiboot/time.h
rename to grub-core/include/grub/i386/multiboot/time.h
diff --git a/include/grub/i386/netbsd_bootinfo.h b/grub-core/include/grub/i386/netbsd_bootinfo.h
similarity index 100%
rename from include/grub/i386/netbsd_bootinfo.h
rename to grub-core/include/grub/i386/netbsd_bootinfo.h
diff --git a/include/grub/i386/netbsd_reboot.h b/grub-core/include/grub/i386/netbsd_reboot.h
similarity index 100%
rename from include/grub/i386/netbsd_reboot.h
rename to grub-core/include/grub/i386/netbsd_reboot.h
diff --git a/include/grub/i386/openbsd_bootarg.h b/grub-core/include/grub/i386/openbsd_bootarg.h
similarity index 100%
rename from include/grub/i386/openbsd_bootarg.h
rename to grub-core/include/grub/i386/openbsd_bootarg.h
diff --git a/include/grub/i386/openbsd_reboot.h b/grub-core/include/grub/i386/openbsd_reboot.h
similarity index 100%
rename from include/grub/i386/openbsd_reboot.h
rename to grub-core/include/grub/i386/openbsd_reboot.h
diff --git a/include/grub/i386/pc/biosdisk.h b/grub-core/include/grub/i386/pc/biosdisk.h
similarity index 100%
rename from include/grub/i386/pc/biosdisk.h
rename to grub-core/include/grub/i386/pc/biosdisk.h
diff --git a/include/grub/i386/pc/biosnum.h b/grub-core/include/grub/i386/pc/biosnum.h
similarity index 100%
rename from include/grub/i386/pc/biosnum.h
rename to grub-core/include/grub/i386/pc/biosnum.h
diff --git a/include/grub/i386/pc/boot.h b/grub-core/include/grub/i386/pc/boot.h
similarity index 100%
rename from include/grub/i386/pc/boot.h
rename to grub-core/include/grub/i386/pc/boot.h
diff --git a/include/grub/i386/pc/chainloader.h b/grub-core/include/grub/i386/pc/chainloader.h
similarity index 100%
rename from include/grub/i386/pc/chainloader.h
rename to grub-core/include/grub/i386/pc/chainloader.h
diff --git a/include/grub/i386/pc/console.h b/grub-core/include/grub/i386/pc/console.h
similarity index 100%
rename from include/grub/i386/pc/console.h
rename to grub-core/include/grub/i386/pc/console.h
diff --git a/include/grub/i386/pc/efiemu.h b/grub-core/include/grub/i386/pc/efiemu.h
similarity index 100%
rename from include/grub/i386/pc/efiemu.h
rename to grub-core/include/grub/i386/pc/efiemu.h
diff --git a/include/grub/i386/pc/init.h b/grub-core/include/grub/i386/pc/init.h
similarity index 100%
rename from include/grub/i386/pc/init.h
rename to grub-core/include/grub/i386/pc/init.h
diff --git a/include/grub/i386/pc/kernel.h b/grub-core/include/grub/i386/pc/kernel.h
similarity index 100%
rename from include/grub/i386/pc/kernel.h
rename to grub-core/include/grub/i386/pc/kernel.h
diff --git a/include/grub/i386/pc/loader.h b/grub-core/include/grub/i386/pc/loader.h
similarity index 100%
rename from include/grub/i386/pc/loader.h
rename to grub-core/include/grub/i386/pc/loader.h
diff --git a/include/grub/i386/pc/memory.h b/grub-core/include/grub/i386/pc/memory.h
similarity index 100%
rename from include/grub/i386/pc/memory.h
rename to grub-core/include/grub/i386/pc/memory.h
diff --git a/include/grub/i386/pc/pxe.h b/grub-core/include/grub/i386/pc/pxe.h
similarity index 100%
rename from include/grub/i386/pc/pxe.h
rename to grub-core/include/grub/i386/pc/pxe.h
diff --git a/include/grub/i386/pc/time.h b/grub-core/include/grub/i386/pc/time.h
similarity index 100%
rename from include/grub/i386/pc/time.h
rename to grub-core/include/grub/i386/pc/time.h
diff --git a/include/grub/i386/pc/vbe.h b/grub-core/include/grub/i386/pc/vbe.h
similarity index 100%
rename from include/grub/i386/pc/vbe.h
rename to grub-core/include/grub/i386/pc/vbe.h
diff --git a/include/grub/i386/pc/vga.h b/grub-core/include/grub/i386/pc/vga.h
similarity index 100%
rename from include/grub/i386/pc/vga.h
rename to grub-core/include/grub/i386/pc/vga.h
diff --git a/include/grub/i386/pci.h b/grub-core/include/grub/i386/pci.h
similarity index 100%
rename from include/grub/i386/pci.h
rename to grub-core/include/grub/i386/pci.h
diff --git a/include/grub/i386/pit.h b/grub-core/include/grub/i386/pit.h
similarity index 100%
rename from include/grub/i386/pit.h
rename to grub-core/include/grub/i386/pit.h
diff --git a/include/grub/i386/qemu/boot.h b/grub-core/include/grub/i386/qemu/boot.h
similarity index 100%
rename from include/grub/i386/qemu/boot.h
rename to grub-core/include/grub/i386/qemu/boot.h
diff --git a/include/grub/i386/qemu/console.h b/grub-core/include/grub/i386/qemu/console.h
similarity index 100%
rename from include/grub/i386/qemu/console.h
rename to grub-core/include/grub/i386/qemu/console.h
diff --git a/include/grub/i386/qemu/init.h b/grub-core/include/grub/i386/qemu/init.h
similarity index 100%
rename from include/grub/i386/qemu/init.h
rename to grub-core/include/grub/i386/qemu/init.h
diff --git a/include/grub/i386/qemu/kernel.h b/grub-core/include/grub/i386/qemu/kernel.h
similarity index 100%
rename from include/grub/i386/qemu/kernel.h
rename to grub-core/include/grub/i386/qemu/kernel.h
diff --git a/include/grub/i386/qemu/loader.h b/grub-core/include/grub/i386/qemu/loader.h
similarity index 100%
rename from include/grub/i386/qemu/loader.h
rename to grub-core/include/grub/i386/qemu/loader.h
diff --git a/include/grub/i386/qemu/memory.h b/grub-core/include/grub/i386/qemu/memory.h
similarity index 100%
rename from include/grub/i386/qemu/memory.h
rename to grub-core/include/grub/i386/qemu/memory.h
diff --git a/include/grub/i386/qemu/serial.h b/grub-core/include/grub/i386/qemu/serial.h
similarity index 100%
rename from include/grub/i386/qemu/serial.h
rename to grub-core/include/grub/i386/qemu/serial.h
diff --git a/include/grub/i386/qemu/time.h b/grub-core/include/grub/i386/qemu/time.h
similarity index 100%
rename from include/grub/i386/qemu/time.h
rename to grub-core/include/grub/i386/qemu/time.h
diff --git a/include/grub/i386/relocator.h b/grub-core/include/grub/i386/relocator.h
similarity index 100%
rename from include/grub/i386/relocator.h
rename to grub-core/include/grub/i386/relocator.h
diff --git a/include/grub/i386/setjmp.h b/grub-core/include/grub/i386/setjmp.h
similarity index 100%
rename from include/grub/i386/setjmp.h
rename to grub-core/include/grub/i386/setjmp.h
diff --git a/include/grub/i386/time.h b/grub-core/include/grub/i386/time.h
similarity index 100%
rename from include/grub/i386/time.h
rename to grub-core/include/grub/i386/time.h
diff --git a/include/grub/i386/tsc.h b/grub-core/include/grub/i386/tsc.h
similarity index 100%
rename from include/grub/i386/tsc.h
rename to grub-core/include/grub/i386/tsc.h
diff --git a/include/grub/i386/types.h b/grub-core/include/grub/i386/types.h
similarity index 100%
rename from include/grub/i386/types.h
rename to grub-core/include/grub/i386/types.h
diff --git a/include/grub/i386/vga_common.h b/grub-core/include/grub/i386/vga_common.h
similarity index 100%
rename from include/grub/i386/vga_common.h
rename to grub-core/include/grub/i386/vga_common.h
diff --git a/include/grub/i386/xnu.h b/grub-core/include/grub/i386/xnu.h
similarity index 100%
rename from include/grub/i386/xnu.h
rename to grub-core/include/grub/i386/xnu.h
diff --git a/include/grub/icon_manager.h b/grub-core/include/grub/icon_manager.h
similarity index 100%
rename from include/grub/icon_manager.h
rename to grub-core/include/grub/icon_manager.h
diff --git a/include/grub/ieee1275/ieee1275.h b/grub-core/include/grub/ieee1275/ieee1275.h
similarity index 100%
rename from include/grub/ieee1275/ieee1275.h
rename to grub-core/include/grub/ieee1275/ieee1275.h
diff --git a/include/grub/ieee1275/ofdisk.h b/grub-core/include/grub/ieee1275/ofdisk.h
similarity index 100%
rename from include/grub/ieee1275/ofdisk.h
rename to grub-core/include/grub/ieee1275/ofdisk.h
diff --git a/include/grub/kernel.h b/grub-core/include/grub/kernel.h
similarity index 100%
rename from include/grub/kernel.h
rename to grub-core/include/grub/kernel.h
diff --git a/include/grub/lib/LzFind.h b/grub-core/include/grub/lib/LzFind.h
similarity index 100%
rename from include/grub/lib/LzFind.h
rename to grub-core/include/grub/lib/LzFind.h
diff --git a/include/grub/lib/LzHash.h b/grub-core/include/grub/lib/LzHash.h
similarity index 100%
rename from include/grub/lib/LzHash.h
rename to grub-core/include/grub/lib/LzHash.h
diff --git a/include/grub/lib/LzmaDec.h b/grub-core/include/grub/lib/LzmaDec.h
similarity index 100%
rename from include/grub/lib/LzmaDec.h
rename to grub-core/include/grub/lib/LzmaDec.h
diff --git a/include/grub/lib/LzmaEnc.h b/grub-core/include/grub/lib/LzmaEnc.h
similarity index 100%
rename from include/grub/lib/LzmaEnc.h
rename to grub-core/include/grub/lib/LzmaEnc.h
diff --git a/include/grub/lib/LzmaTypes.h b/grub-core/include/grub/lib/LzmaTypes.h
similarity index 100%
rename from include/grub/lib/LzmaTypes.h
rename to grub-core/include/grub/lib/LzmaTypes.h
diff --git a/include/grub/lib/arg.h b/grub-core/include/grub/lib/arg.h
similarity index 100%
rename from include/grub/lib/arg.h
rename to grub-core/include/grub/lib/arg.h
diff --git a/include/grub/lib/crc.h b/grub-core/include/grub/lib/crc.h
similarity index 100%
rename from include/grub/lib/crc.h
rename to grub-core/include/grub/lib/crc.h
diff --git a/include/grub/lib/envblk.h b/grub-core/include/grub/lib/envblk.h
similarity index 100%
rename from include/grub/lib/envblk.h
rename to grub-core/include/grub/lib/envblk.h
diff --git a/include/grub/lib/hexdump.h b/grub-core/include/grub/lib/hexdump.h
similarity index 100%
rename from include/grub/lib/hexdump.h
rename to grub-core/include/grub/lib/hexdump.h
diff --git a/include/grub/libgcc.h b/grub-core/include/grub/libgcc.h
similarity index 100%
rename from include/grub/libgcc.h
rename to grub-core/include/grub/libgcc.h
diff --git a/include/grub/libpciaccess.h b/grub-core/include/grub/libpciaccess.h
similarity index 100%
rename from include/grub/libpciaccess.h
rename to grub-core/include/grub/libpciaccess.h
diff --git a/include/grub/libusb.h b/grub-core/include/grub/libusb.h
similarity index 100%
rename from include/grub/libusb.h
rename to grub-core/include/grub/libusb.h
diff --git a/include/grub/list.h b/grub-core/include/grub/list.h
similarity index 100%
rename from include/grub/list.h
rename to grub-core/include/grub/list.h
diff --git a/include/grub/loader.h b/grub-core/include/grub/loader.h
similarity index 100%
rename from include/grub/loader.h
rename to grub-core/include/grub/loader.h
diff --git a/include/grub/lvm.h b/grub-core/include/grub/lvm.h
similarity index 100%
rename from include/grub/lvm.h
rename to grub-core/include/grub/lvm.h
diff --git a/include/grub/macho.h b/grub-core/include/grub/macho.h
similarity index 100%
rename from include/grub/macho.h
rename to grub-core/include/grub/macho.h
diff --git a/include/grub/machoload.h b/grub-core/include/grub/machoload.h
similarity index 100%
rename from include/grub/machoload.h
rename to grub-core/include/grub/machoload.h
diff --git a/include/grub/memory.h b/grub-core/include/grub/memory.h
similarity index 100%
rename from include/grub/memory.h
rename to grub-core/include/grub/memory.h
diff --git a/include/grub/menu.h b/grub-core/include/grub/menu.h
similarity index 100%
rename from include/grub/menu.h
rename to grub-core/include/grub/menu.h
diff --git a/include/grub/menu_viewer.h b/grub-core/include/grub/menu_viewer.h
similarity index 100%
rename from include/grub/menu_viewer.h
rename to grub-core/include/grub/menu_viewer.h
diff --git a/include/grub/mips/at_keyboard.h b/grub-core/include/grub/mips/at_keyboard.h
similarity index 100%
rename from include/grub/mips/at_keyboard.h
rename to grub-core/include/grub/mips/at_keyboard.h
diff --git a/include/grub/mips/cache.h b/grub-core/include/grub/mips/cache.h
similarity index 100%
rename from include/grub/mips/cache.h
rename to grub-core/include/grub/mips/cache.h
diff --git a/include/grub/mips/cmos.h b/grub-core/include/grub/mips/cmos.h
similarity index 100%
rename from include/grub/mips/cmos.h
rename to grub-core/include/grub/mips/cmos.h
diff --git a/include/grub/mips/io.h b/grub-core/include/grub/mips/io.h
similarity index 100%
rename from include/grub/mips/io.h
rename to grub-core/include/grub/mips/io.h
diff --git a/include/grub/mips/kernel.h b/grub-core/include/grub/mips/kernel.h
similarity index 100%
rename from include/grub/mips/kernel.h
rename to grub-core/include/grub/mips/kernel.h
diff --git a/include/grub/mips/multiboot.h b/grub-core/include/grub/mips/multiboot.h
similarity index 100%
rename from include/grub/mips/multiboot.h
rename to grub-core/include/grub/mips/multiboot.h
diff --git a/include/grub/mips/pci.h b/grub-core/include/grub/mips/pci.h
similarity index 100%
rename from include/grub/mips/pci.h
rename to grub-core/include/grub/mips/pci.h
diff --git a/include/grub/mips/qemu-mips/boot.h b/grub-core/include/grub/mips/qemu-mips/boot.h
similarity index 100%
rename from include/grub/mips/qemu-mips/boot.h
rename to grub-core/include/grub/mips/qemu-mips/boot.h
diff --git a/include/grub/mips/qemu-mips/kernel.h b/grub-core/include/grub/mips/qemu-mips/kernel.h
similarity index 100%
rename from include/grub/mips/qemu-mips/kernel.h
rename to grub-core/include/grub/mips/qemu-mips/kernel.h
diff --git a/include/grub/mips/qemu-mips/loader.h b/grub-core/include/grub/mips/qemu-mips/loader.h
similarity index 100%
rename from include/grub/mips/qemu-mips/loader.h
rename to grub-core/include/grub/mips/qemu-mips/loader.h
diff --git a/include/grub/mips/qemu-mips/memory.h b/grub-core/include/grub/mips/qemu-mips/memory.h
similarity index 100%
rename from include/grub/mips/qemu-mips/memory.h
rename to grub-core/include/grub/mips/qemu-mips/memory.h
diff --git a/include/grub/mips/qemu-mips/serial.h b/grub-core/include/grub/mips/qemu-mips/serial.h
similarity index 100%
rename from include/grub/mips/qemu-mips/serial.h
rename to grub-core/include/grub/mips/qemu-mips/serial.h
diff --git a/include/grub/mips/qemu-mips/time.h b/grub-core/include/grub/mips/qemu-mips/time.h
similarity index 100%
rename from include/grub/mips/qemu-mips/time.h
rename to grub-core/include/grub/mips/qemu-mips/time.h
diff --git a/include/grub/mips/relocator.h b/grub-core/include/grub/mips/relocator.h
similarity index 100%
rename from include/grub/mips/relocator.h
rename to grub-core/include/grub/mips/relocator.h
diff --git a/include/grub/mips/setjmp.h b/grub-core/include/grub/mips/setjmp.h
similarity index 100%
rename from include/grub/mips/setjmp.h
rename to grub-core/include/grub/mips/setjmp.h
diff --git a/include/grub/mips/time.h b/grub-core/include/grub/mips/time.h
similarity index 100%
rename from include/grub/mips/time.h
rename to grub-core/include/grub/mips/time.h
diff --git a/include/grub/mips/types.h b/grub-core/include/grub/mips/types.h
similarity index 100%
rename from include/grub/mips/types.h
rename to grub-core/include/grub/mips/types.h
diff --git a/include/grub/mips/yeeloong/at_keyboard.h b/grub-core/include/grub/mips/yeeloong/at_keyboard.h
similarity index 100%
rename from include/grub/mips/yeeloong/at_keyboard.h
rename to grub-core/include/grub/mips/yeeloong/at_keyboard.h
diff --git a/include/grub/mips/yeeloong/boot.h b/grub-core/include/grub/mips/yeeloong/boot.h
similarity index 100%
rename from include/grub/mips/yeeloong/boot.h
rename to grub-core/include/grub/mips/yeeloong/boot.h
diff --git a/include/grub/mips/yeeloong/cmos.h b/grub-core/include/grub/mips/yeeloong/cmos.h
similarity index 100%
rename from include/grub/mips/yeeloong/cmos.h
rename to grub-core/include/grub/mips/yeeloong/cmos.h
diff --git a/include/grub/mips/yeeloong/kernel.h b/grub-core/include/grub/mips/yeeloong/kernel.h
similarity index 100%
rename from include/grub/mips/yeeloong/kernel.h
rename to grub-core/include/grub/mips/yeeloong/kernel.h
diff --git a/include/grub/mips/yeeloong/loader.h b/grub-core/include/grub/mips/yeeloong/loader.h
similarity index 100%
rename from include/grub/mips/yeeloong/loader.h
rename to grub-core/include/grub/mips/yeeloong/loader.h
diff --git a/include/grub/mips/yeeloong/memory.h b/grub-core/include/grub/mips/yeeloong/memory.h
similarity index 100%
rename from include/grub/mips/yeeloong/memory.h
rename to grub-core/include/grub/mips/yeeloong/memory.h
diff --git a/include/grub/mips/yeeloong/pci.h b/grub-core/include/grub/mips/yeeloong/pci.h
similarity index 100%
rename from include/grub/mips/yeeloong/pci.h
rename to grub-core/include/grub/mips/yeeloong/pci.h
diff --git a/include/grub/mips/yeeloong/serial.h b/grub-core/include/grub/mips/yeeloong/serial.h
similarity index 100%
rename from include/grub/mips/yeeloong/serial.h
rename to grub-core/include/grub/mips/yeeloong/serial.h
diff --git a/include/grub/mips/yeeloong/time.h b/grub-core/include/grub/mips/yeeloong/time.h
similarity index 100%
rename from include/grub/mips/yeeloong/time.h
rename to grub-core/include/grub/mips/yeeloong/time.h
diff --git a/include/grub/misc.h b/grub-core/include/grub/misc.h
similarity index 100%
rename from include/grub/misc.h
rename to grub-core/include/grub/misc.h
diff --git a/include/grub/mm.h b/grub-core/include/grub/mm.h
similarity index 100%
rename from include/grub/mm.h
rename to grub-core/include/grub/mm.h
diff --git a/include/grub/msdos_partition.h b/grub-core/include/grub/msdos_partition.h
similarity index 100%
rename from include/grub/msdos_partition.h
rename to grub-core/include/grub/msdos_partition.h
diff --git a/include/grub/multiboot.h b/grub-core/include/grub/multiboot.h
similarity index 100%
rename from include/grub/multiboot.h
rename to grub-core/include/grub/multiboot.h
diff --git a/include/grub/multiboot_loader.h b/grub-core/include/grub/multiboot_loader.h
similarity index 100%
rename from include/grub/multiboot_loader.h
rename to grub-core/include/grub/multiboot_loader.h
diff --git a/include/grub/net.h b/grub-core/include/grub/net.h
similarity index 100%
rename from include/grub/net.h
rename to grub-core/include/grub/net.h
diff --git a/include/grub/normal.h b/grub-core/include/grub/normal.h
similarity index 100%
rename from include/grub/normal.h
rename to grub-core/include/grub/normal.h
diff --git a/include/grub/ntfs.h b/grub-core/include/grub/ntfs.h
similarity index 100%
rename from include/grub/ntfs.h
rename to grub-core/include/grub/ntfs.h
diff --git a/include/grub/parser.h b/grub-core/include/grub/parser.h
similarity index 100%
rename from include/grub/parser.h
rename to grub-core/include/grub/parser.h
diff --git a/include/grub/partition.h b/grub-core/include/grub/partition.h
similarity index 100%
rename from include/grub/partition.h
rename to grub-core/include/grub/partition.h
diff --git a/include/grub/parttool.h b/grub-core/include/grub/parttool.h
similarity index 100%
rename from include/grub/parttool.h
rename to grub-core/include/grub/parttool.h
diff --git a/include/grub/pci.h b/grub-core/include/grub/pci.h
similarity index 100%
rename from include/grub/pci.h
rename to grub-core/include/grub/pci.h
diff --git a/include/grub/pciutils.h b/grub-core/include/grub/pciutils.h
similarity index 100%
rename from include/grub/pciutils.h
rename to grub-core/include/grub/pciutils.h
diff --git a/include/grub/powerpc/ieee1275/biosdisk.h b/grub-core/include/grub/powerpc/ieee1275/biosdisk.h
similarity index 100%
rename from include/grub/powerpc/ieee1275/biosdisk.h
rename to grub-core/include/grub/powerpc/ieee1275/biosdisk.h
diff --git a/include/grub/powerpc/ieee1275/console.h b/grub-core/include/grub/powerpc/ieee1275/console.h
similarity index 100%
rename from include/grub/powerpc/ieee1275/console.h
rename to grub-core/include/grub/powerpc/ieee1275/console.h
diff --git a/include/grub/powerpc/ieee1275/ieee1275.h b/grub-core/include/grub/powerpc/ieee1275/ieee1275.h
similarity index 100%
rename from include/grub/powerpc/ieee1275/ieee1275.h
rename to grub-core/include/grub/powerpc/ieee1275/ieee1275.h
diff --git a/include/grub/powerpc/ieee1275/kernel.h b/grub-core/include/grub/powerpc/ieee1275/kernel.h
similarity index 100%
rename from include/grub/powerpc/ieee1275/kernel.h
rename to grub-core/include/grub/powerpc/ieee1275/kernel.h
diff --git a/include/grub/powerpc/ieee1275/loader.h b/grub-core/include/grub/powerpc/ieee1275/loader.h
similarity index 100%
rename from include/grub/powerpc/ieee1275/loader.h
rename to grub-core/include/grub/powerpc/ieee1275/loader.h
diff --git a/include/grub/powerpc/ieee1275/memory.h b/grub-core/include/grub/powerpc/ieee1275/memory.h
similarity index 100%
rename from include/grub/powerpc/ieee1275/memory.h
rename to grub-core/include/grub/powerpc/ieee1275/memory.h
diff --git a/include/grub/powerpc/ieee1275/time.h b/grub-core/include/grub/powerpc/ieee1275/time.h
similarity index 100%
rename from include/grub/powerpc/ieee1275/time.h
rename to grub-core/include/grub/powerpc/ieee1275/time.h
diff --git a/include/grub/powerpc/ieee1275/util/biosdisk.h b/grub-core/include/grub/powerpc/ieee1275/util/biosdisk.h
similarity index 100%
rename from include/grub/powerpc/ieee1275/util/biosdisk.h
rename to grub-core/include/grub/powerpc/ieee1275/util/biosdisk.h
diff --git a/include/grub/powerpc/kernel.h b/grub-core/include/grub/powerpc/kernel.h
similarity index 100%
rename from include/grub/powerpc/kernel.h
rename to grub-core/include/grub/powerpc/kernel.h
diff --git a/include/grub/powerpc/setjmp.h b/grub-core/include/grub/powerpc/setjmp.h
similarity index 100%
rename from include/grub/powerpc/setjmp.h
rename to grub-core/include/grub/powerpc/setjmp.h
diff --git a/include/grub/powerpc/time.h b/grub-core/include/grub/powerpc/time.h
similarity index 100%
rename from include/grub/powerpc/time.h
rename to grub-core/include/grub/powerpc/time.h
diff --git a/include/grub/powerpc/types.h b/grub-core/include/grub/powerpc/types.h
similarity index 100%
rename from include/grub/powerpc/types.h
rename to grub-core/include/grub/powerpc/types.h
diff --git a/include/grub/raid.h b/grub-core/include/grub/raid.h
similarity index 100%
rename from include/grub/raid.h
rename to grub-core/include/grub/raid.h
diff --git a/include/grub/reader.h b/grub-core/include/grub/reader.h
similarity index 100%
rename from include/grub/reader.h
rename to grub-core/include/grub/reader.h
diff --git a/include/grub/script_sh.h b/grub-core/include/grub/script_sh.h
similarity index 100%
rename from include/grub/script_sh.h
rename to grub-core/include/grub/script_sh.h
diff --git a/include/grub/scsi.h b/grub-core/include/grub/scsi.h
similarity index 100%
rename from include/grub/scsi.h
rename to grub-core/include/grub/scsi.h
diff --git a/include/grub/scsicmd.h b/grub-core/include/grub/scsicmd.h
similarity index 100%
rename from include/grub/scsicmd.h
rename to grub-core/include/grub/scsicmd.h
diff --git a/include/grub/sdl.h b/grub-core/include/grub/sdl.h
similarity index 100%
rename from include/grub/sdl.h
rename to grub-core/include/grub/sdl.h
diff --git a/include/grub/search.h b/grub-core/include/grub/search.h
similarity index 100%
rename from include/grub/search.h
rename to grub-core/include/grub/search.h
diff --git a/include/grub/serial.h b/grub-core/include/grub/serial.h
similarity index 100%
rename from include/grub/serial.h
rename to grub-core/include/grub/serial.h
diff --git a/include/grub/setjmp.h b/grub-core/include/grub/setjmp.h
similarity index 100%
rename from include/grub/setjmp.h
rename to grub-core/include/grub/setjmp.h
diff --git a/include/grub/sparc64/ieee1275/boot.h b/grub-core/include/grub/sparc64/ieee1275/boot.h
similarity index 100%
rename from include/grub/sparc64/ieee1275/boot.h
rename to grub-core/include/grub/sparc64/ieee1275/boot.h
diff --git a/include/grub/sparc64/ieee1275/console.h b/grub-core/include/grub/sparc64/ieee1275/console.h
similarity index 100%
rename from include/grub/sparc64/ieee1275/console.h
rename to grub-core/include/grub/sparc64/ieee1275/console.h
diff --git a/include/grub/sparc64/ieee1275/ieee1275.h b/grub-core/include/grub/sparc64/ieee1275/ieee1275.h
similarity index 100%
rename from include/grub/sparc64/ieee1275/ieee1275.h
rename to grub-core/include/grub/sparc64/ieee1275/ieee1275.h
diff --git a/include/grub/sparc64/ieee1275/kernel.h b/grub-core/include/grub/sparc64/ieee1275/kernel.h
similarity index 100%
rename from include/grub/sparc64/ieee1275/kernel.h
rename to grub-core/include/grub/sparc64/ieee1275/kernel.h
diff --git a/include/grub/sparc64/ieee1275/loader.h b/grub-core/include/grub/sparc64/ieee1275/loader.h
similarity index 100%
rename from include/grub/sparc64/ieee1275/loader.h
rename to grub-core/include/grub/sparc64/ieee1275/loader.h
diff --git a/include/grub/sparc64/ieee1275/memory.h b/grub-core/include/grub/sparc64/ieee1275/memory.h
similarity index 100%
rename from include/grub/sparc64/ieee1275/memory.h
rename to grub-core/include/grub/sparc64/ieee1275/memory.h
diff --git a/include/grub/sparc64/ieee1275/time.h b/grub-core/include/grub/sparc64/ieee1275/time.h
similarity index 100%
rename from include/grub/sparc64/ieee1275/time.h
rename to grub-core/include/grub/sparc64/ieee1275/time.h
diff --git a/include/grub/sparc64/kernel.h b/grub-core/include/grub/sparc64/kernel.h
similarity index 100%
rename from include/grub/sparc64/kernel.h
rename to grub-core/include/grub/sparc64/kernel.h
diff --git a/include/grub/sparc64/setjmp.h b/grub-core/include/grub/sparc64/setjmp.h
similarity index 100%
rename from include/grub/sparc64/setjmp.h
rename to grub-core/include/grub/sparc64/setjmp.h
diff --git a/include/grub/sparc64/time.h b/grub-core/include/grub/sparc64/time.h
similarity index 100%
rename from include/grub/sparc64/time.h
rename to grub-core/include/grub/sparc64/time.h
diff --git a/include/grub/sparc64/types.h b/grub-core/include/grub/sparc64/types.h
similarity index 100%
rename from include/grub/sparc64/types.h
rename to grub-core/include/grub/sparc64/types.h
diff --git a/include/grub/symbol.h b/grub-core/include/grub/symbol.h
similarity index 100%
rename from include/grub/symbol.h
rename to grub-core/include/grub/symbol.h
diff --git a/include/grub/term.h b/grub-core/include/grub/term.h
similarity index 100%
rename from include/grub/term.h
rename to grub-core/include/grub/term.h
diff --git a/include/grub/terminfo.h b/grub-core/include/grub/terminfo.h
similarity index 100%
rename from include/grub/terminfo.h
rename to grub-core/include/grub/terminfo.h
diff --git a/include/grub/test.h b/grub-core/include/grub/test.h
similarity index 93%
rename from include/grub/test.h
rename to grub-core/include/grub/test.h
index 27591cca2..336d3b672 100644
--- a/include/grub/test.h
+++ b/grub-core/include/grub/test.h
@@ -72,14 +72,14 @@ void grub_test_nonzero (int cond, const char *file,
 
 /* Macro to define a functional test.  */
 #define GRUB_FUNCTIONAL_TEST(name, funp)	\
-  GRUB_MOD_INIT(functional_test_##funp)		\
+  GRUB_MOD_INIT(name)				\
   {						\
-    grub_test_register (name, funp);		\
+    grub_test_register (#name, funp);		\
   }						\
 						\
-  GRUB_MOD_FINI(functional_test_##funp)		\
+  GRUB_MOD_FINI(name)				\
   {						\
-    grub_test_unregister (name);		\
+    grub_test_unregister (#name);		\
   }
 
 #endif /* ! GRUB_TEST_HEADER */
diff --git a/include/grub/time.h b/grub-core/include/grub/time.h
similarity index 100%
rename from include/grub/time.h
rename to grub-core/include/grub/time.h
diff --git a/include/grub/tparm.h b/grub-core/include/grub/tparm.h
similarity index 100%
rename from include/grub/tparm.h
rename to grub-core/include/grub/tparm.h
diff --git a/include/grub/trig.h b/grub-core/include/grub/trig.h
similarity index 100%
rename from include/grub/trig.h
rename to grub-core/include/grub/trig.h
diff --git a/include/grub/types.h b/grub-core/include/grub/types.h
similarity index 100%
rename from include/grub/types.h
rename to grub-core/include/grub/types.h
diff --git a/include/grub/usb.h b/grub-core/include/grub/usb.h
similarity index 100%
rename from include/grub/usb.h
rename to grub-core/include/grub/usb.h
diff --git a/include/grub/usbdesc.h b/grub-core/include/grub/usbdesc.h
similarity index 100%
rename from include/grub/usbdesc.h
rename to grub-core/include/grub/usbdesc.h
diff --git a/include/grub/usbtrans.h b/grub-core/include/grub/usbtrans.h
similarity index 100%
rename from include/grub/usbtrans.h
rename to grub-core/include/grub/usbtrans.h
diff --git a/include/grub/util/deviceiter.h b/grub-core/include/grub/util/deviceiter.h
similarity index 100%
rename from include/grub/util/deviceiter.h
rename to grub-core/include/grub/util/deviceiter.h
diff --git a/include/grub/util/lvm.h b/grub-core/include/grub/util/lvm.h
similarity index 100%
rename from include/grub/util/lvm.h
rename to grub-core/include/grub/util/lvm.h
diff --git a/include/grub/util/misc.h b/grub-core/include/grub/util/misc.h
similarity index 85%
rename from include/grub/util/misc.h
rename to grub-core/include/grub/util/misc.h
index 8b78b92ea..ed71acdcd 100644
--- a/include/grub/util/misc.h
+++ b/grub-core/include/grub/util/misc.h
@@ -38,17 +38,6 @@
 
 #define DEFAULT_DEVICE_MAP	DEFAULT_DIRECTORY "/device.map"
 
-extern char *progname;
-extern int verbosity;
-
-void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...);
-void EXPORT_FUNC(grub_util_info) (const char *fmt, ...);
-void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((noreturn));
-
-void *xmalloc (size_t size);
-void *xrealloc (void *ptr, size_t size);
-char *xstrdup (const char *str);
-
 char *grub_util_get_path (const char *dir, const char *file);
 size_t grub_util_get_fp_size (FILE *fp);
 size_t grub_util_get_image_size (const char *path);
@@ -71,8 +60,6 @@ int asprintf (char **buf, const char *fmt, ...);
 
 #endif
 
-char *xasprintf (const char *fmt, ...);
-
 #ifdef __MINGW32__
 
 #define fseeko fseeko64
diff --git a/include/grub/util/ofpath.h b/grub-core/include/grub/util/ofpath.h
similarity index 100%
rename from include/grub/util/ofpath.h
rename to grub-core/include/grub/util/ofpath.h
diff --git a/include/grub/util/raid.h b/grub-core/include/grub/util/raid.h
similarity index 100%
rename from include/grub/util/raid.h
rename to grub-core/include/grub/util/raid.h
diff --git a/include/grub/util/resolve.h b/grub-core/include/grub/util/resolve.h
similarity index 100%
rename from include/grub/util/resolve.h
rename to grub-core/include/grub/util/resolve.h
diff --git a/include/grub/video.h b/grub-core/include/grub/video.h
similarity index 100%
rename from include/grub/video.h
rename to grub-core/include/grub/video.h
diff --git a/include/grub/video_fb.h b/grub-core/include/grub/video_fb.h
similarity index 100%
rename from include/grub/video_fb.h
rename to grub-core/include/grub/video_fb.h
diff --git a/include/grub/x86_64/at_keyboard.h b/grub-core/include/grub/x86_64/at_keyboard.h
similarity index 100%
rename from include/grub/x86_64/at_keyboard.h
rename to grub-core/include/grub/x86_64/at_keyboard.h
diff --git a/include/grub/x86_64/efi/kernel.h b/grub-core/include/grub/x86_64/efi/kernel.h
similarity index 100%
rename from include/grub/x86_64/efi/kernel.h
rename to grub-core/include/grub/x86_64/efi/kernel.h
diff --git a/include/grub/x86_64/efi/loader.h b/grub-core/include/grub/x86_64/efi/loader.h
similarity index 100%
rename from include/grub/x86_64/efi/loader.h
rename to grub-core/include/grub/x86_64/efi/loader.h
diff --git a/include/grub/x86_64/efi/memory.h b/grub-core/include/grub/x86_64/efi/memory.h
similarity index 100%
rename from include/grub/x86_64/efi/memory.h
rename to grub-core/include/grub/x86_64/efi/memory.h
diff --git a/include/grub/x86_64/efi/serial.h b/grub-core/include/grub/x86_64/efi/serial.h
similarity index 100%
rename from include/grub/x86_64/efi/serial.h
rename to grub-core/include/grub/x86_64/efi/serial.h
diff --git a/include/grub/x86_64/efi/time.h b/grub-core/include/grub/x86_64/efi/time.h
similarity index 100%
rename from include/grub/x86_64/efi/time.h
rename to grub-core/include/grub/x86_64/efi/time.h
diff --git a/include/grub/x86_64/io.h b/grub-core/include/grub/x86_64/io.h
similarity index 100%
rename from include/grub/x86_64/io.h
rename to grub-core/include/grub/x86_64/io.h
diff --git a/include/grub/x86_64/kernel.h b/grub-core/include/grub/x86_64/kernel.h
similarity index 100%
rename from include/grub/x86_64/kernel.h
rename to grub-core/include/grub/x86_64/kernel.h
diff --git a/include/grub/x86_64/linux.h b/grub-core/include/grub/x86_64/linux.h
similarity index 100%
rename from include/grub/x86_64/linux.h
rename to grub-core/include/grub/x86_64/linux.h
diff --git a/include/grub/x86_64/macho.h b/grub-core/include/grub/x86_64/macho.h
similarity index 100%
rename from include/grub/x86_64/macho.h
rename to grub-core/include/grub/x86_64/macho.h
diff --git a/include/grub/x86_64/multiboot.h b/grub-core/include/grub/x86_64/multiboot.h
similarity index 100%
rename from include/grub/x86_64/multiboot.h
rename to grub-core/include/grub/x86_64/multiboot.h
diff --git a/include/grub/x86_64/pci.h b/grub-core/include/grub/x86_64/pci.h
similarity index 100%
rename from include/grub/x86_64/pci.h
rename to grub-core/include/grub/x86_64/pci.h
diff --git a/include/grub/x86_64/relocator.h b/grub-core/include/grub/x86_64/relocator.h
similarity index 100%
rename from include/grub/x86_64/relocator.h
rename to grub-core/include/grub/x86_64/relocator.h
diff --git a/include/grub/x86_64/setjmp.h b/grub-core/include/grub/x86_64/setjmp.h
similarity index 100%
rename from include/grub/x86_64/setjmp.h
rename to grub-core/include/grub/x86_64/setjmp.h
diff --git a/include/grub/x86_64/time.h b/grub-core/include/grub/x86_64/time.h
similarity index 100%
rename from include/grub/x86_64/time.h
rename to grub-core/include/grub/x86_64/time.h
diff --git a/include/grub/x86_64/types.h b/grub-core/include/grub/x86_64/types.h
similarity index 100%
rename from include/grub/x86_64/types.h
rename to grub-core/include/grub/x86_64/types.h
diff --git a/include/grub/x86_64/xnu.h b/grub-core/include/grub/x86_64/xnu.h
similarity index 100%
rename from include/grub/x86_64/xnu.h
rename to grub-core/include/grub/x86_64/xnu.h
diff --git a/include/grub/xnu.h b/grub-core/include/grub/xnu.h
similarity index 100%
rename from include/grub/xnu.h
rename to grub-core/include/grub/xnu.h
diff --git a/include/multiboot.h b/grub-core/include/multiboot.h
similarity index 100%
rename from include/multiboot.h
rename to grub-core/include/multiboot.h
diff --git a/include/multiboot2.h b/grub-core/include/multiboot2.h
similarity index 100%
rename from include/multiboot2.h
rename to grub-core/include/multiboot2.h
diff --git a/io/bufio.c b/grub-core/io/bufio.c
similarity index 100%
rename from io/bufio.c
rename to grub-core/io/bufio.c
diff --git a/io/gzio.c b/grub-core/io/gzio.c
similarity index 100%
rename from io/gzio.c
rename to grub-core/io/gzio.c
diff --git a/kern/command.c b/grub-core/kern/command.c
similarity index 100%
rename from kern/command.c
rename to grub-core/kern/command.c
diff --git a/kern/corecmd.c b/grub-core/kern/corecmd.c
similarity index 100%
rename from kern/corecmd.c
rename to grub-core/kern/corecmd.c
diff --git a/kern/device.c b/grub-core/kern/device.c
similarity index 100%
rename from kern/device.c
rename to grub-core/kern/device.c
diff --git a/kern/disk.c b/grub-core/kern/disk.c
similarity index 100%
rename from kern/disk.c
rename to grub-core/kern/disk.c
diff --git a/kern/dl.c b/grub-core/kern/dl.c
similarity index 99%
rename from kern/dl.c
rename to grub-core/kern/dl.c
index 19ee13243..12391ced9 100644
--- a/kern/dl.c
+++ b/grub-core/kern/dl.c
@@ -469,12 +469,13 @@ grub_dl_resolve_dependencies (grub_dl_t mod, Elf_Ehdr *e)
   return GRUB_ERR_NONE;
 }
 
-#if !GRUB_NO_MODULES
 int
 grub_dl_ref (grub_dl_t mod)
 {
   grub_dl_dep_t dep;
 
+  if (!mod) return 0;
+
   for (dep = mod->dep; dep; dep = dep->next)
     grub_dl_ref (dep->mod);
 
@@ -486,12 +487,13 @@ grub_dl_unref (grub_dl_t mod)
 {
   grub_dl_dep_t dep;
 
+  if (!mod) return 0;
+
   for (dep = mod->dep; dep; dep = dep->next)
     grub_dl_unref (dep->mod);
 
   return --mod->ref_count;
 }
-#endif
 
 static void
 grub_dl_flush_cache (grub_dl_t mod)
diff --git a/kern/efi/efi.c b/grub-core/kern/efi/efi.c
similarity index 100%
rename from kern/efi/efi.c
rename to grub-core/kern/efi/efi.c
diff --git a/kern/efi/init.c b/grub-core/kern/efi/init.c
similarity index 100%
rename from kern/efi/init.c
rename to grub-core/kern/efi/init.c
diff --git a/kern/efi/mm.c b/grub-core/kern/efi/mm.c
similarity index 100%
rename from kern/efi/mm.c
rename to grub-core/kern/efi/mm.c
diff --git a/kern/elf.c b/grub-core/kern/elf.c
similarity index 100%
rename from kern/elf.c
rename to grub-core/kern/elf.c
diff --git a/grub-core/kern/emu/cache.S b/grub-core/kern/emu/cache.S
new file mode 100644
index 000000000..087b2b495
--- /dev/null
+++ b/grub-core/kern/emu/cache.S
@@ -0,0 +1,17 @@
+#ifndef GRUB_MACHINE_EMU
+#error "This source is only meant for grub-emu platform"
+#endif
+
+#if GRUB_CPU_I386
+#elif GRUB_CPU_X86_64
+#elif GRUB_CPU_SPARC64
+#include "../sparc64/cache.S"
+#elif GRUB_CPU_MIPS
+#include "../mips/cache.S"
+#elif GRUB_CPU_MIPSEL
+#include "../mips/cache.S"
+#elif GRUB_CPU_POWERPC
+#include "../powerpc/cache.S"
+#else
+#error "No target cpu type is defined"
+#endif
diff --git a/util/console.c b/grub-core/kern/emu/console.c
similarity index 99%
rename from util/console.c
rename to grub-core/kern/emu/console.c
index 382fd7f89..f7fbc899a 100644
--- a/util/console.c
+++ b/grub-core/kern/emu/console.c
@@ -27,7 +27,7 @@
 # define A_STANDOUT	0
 #endif /* ! A_STANDOUT */
 
-#include <grub/util/console.h>
+#include <grub/emu/console.h>
 #include <grub/term.h>
 #include <grub/types.h>
 
diff --git a/grub-core/kern/emu/dl.c b/grub-core/kern/emu/dl.c
new file mode 100644
index 000000000..4266376a2
--- /dev/null
+++ b/grub-core/kern/emu/dl.c
@@ -0,0 +1,19 @@
+#ifndef GRUB_MACHINE_EMU
+#error "This source is only meant for grub-emu platform"
+#endif
+
+#if GRUB_CPU_I386
+#include "../i386/dl.c"
+#elif GRUB_CPU_X86_64
+#include "../x86_64/dl.c"
+#elif GRUB_CPU_SPARC64
+#include "../sparc64/dl.c"
+#elif GRUB_CPU_MIPS
+#include "../mips/dl.c"
+#elif GRUB_CPU_MIPSEL
+#include "../mips/dl.c"
+#elif GRUB_CPU_POWERPC
+#include "../powerpc/dl.c"
+#else
+#error "No target cpu type is defined"
+#endif
diff --git a/grub-core/kern/emu/dummy/dl.c b/grub-core/kern/emu/dummy/dl.c
new file mode 100644
index 000000000..8e9fabfc2
--- /dev/null
+++ b/grub-core/kern/emu/dummy/dl.c
@@ -0,0 +1,51 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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 <config.h>
+#include <grub/dl.h>
+
+grub_err_t
+grub_arch_dl_check_header (void *ehdr)
+{
+  (void) ehdr;
+
+  return GRUB_ERR_BAD_MODULE;
+}
+
+grub_err_t
+grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
+{
+  (void) mod;
+  (void) ehdr;
+
+  return GRUB_ERR_BAD_MODULE;
+}
+
+/* int */
+/* grub_dl_ref (grub_dl_t mod) */
+/* {  */
+/*   (void) mod; */
+/*   return 0; */
+/* } */
+
+/* int */
+/* grub_dl_unref (grub_dl_t mod) */
+/* {  */
+/*   (void) mod; */
+/*   return 0; */
+/* } */
diff --git a/grub-core/kern/emu/dummy/symlist.c b/grub-core/kern/emu/dummy/symlist.c
new file mode 100644
index 000000000..d1445a347
--- /dev/null
+++ b/grub-core/kern/emu/dummy/symlist.c
@@ -0,0 +1,26 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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 <config.h>
+#include <grub/kernel.h>
+#include <grub/emu/misc.h>
+
+void
+grub_register_exported_symbols (void)
+{
+}
diff --git a/util/getroot.c b/grub-core/kern/emu/getroot.c
similarity index 82%
rename from util/getroot.c
rename to grub-core/kern/emu/getroot.c
index 891bd0f10..ba357d861 100644
--- a/util/getroot.c
+++ b/grub-core/kern/emu/getroot.c
@@ -22,6 +22,10 @@
 #include <unistd.h>
 #include <string.h>
 #include <dirent.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
 
 #ifdef __CYGWIN__
 # include <sys/fcntl.h>
@@ -36,9 +40,11 @@
 #include <hurd/fs.h>
 #endif
 
-#include <grub/util/misc.h>
-#include <grub/util/hostdisk.h>
-#include <grub/util/getroot.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/emu/misc.h>
+#include <grub/emu/hostdisk.h>
+#include <grub/emu/getroot.h>
 
 static void
 strip_extra_slashes (char *dir)
@@ -541,3 +547,100 @@ grub_util_check_char_device (const char *blk_dev)
     return 0;
 }
 
+/* This function never prints trailing slashes (so that its output
+   can be appended a slash unconditionally).  */
+char *
+grub_make_system_path_relative_to_its_root (const char *path)
+{
+  struct stat st;
+  char *p, *buf, *buf2, *buf3;
+  uintptr_t offset = 0;
+  dev_t num;
+  size_t len;
+
+  /* canonicalize.  */
+  p = canonicalize_file_name (path);
+
+  if (p == NULL)
+    grub_util_error ("failed to get canonical path of %s", path);
+
+  len = strlen (p) + 1;
+  buf = xstrdup (p);
+  free (p);
+
+  if (stat (buf, &st) < 0)
+    grub_util_error ("cannot stat %s: %s", buf, strerror (errno));
+
+  buf2 = xstrdup (buf);
+  num = st.st_dev;
+
+  /* This loop sets offset to the number of chars of the root
+     directory we're inspecting.  */
+  while (1)
+    {
+      p = strrchr (buf, '/');
+      if (p == NULL)
+	/* This should never happen.  */
+	grub_util_error ("FIXME: no / in buf. (make_system_path_relative_to_its_root)");
+      if (p != buf)
+	*p = 0;
+      else
+	*++p = 0;
+
+      if (stat (buf, &st) < 0)
+	grub_util_error ("cannot stat %s: %s", buf, strerror (errno));
+
+      /* buf is another filesystem; we found it.  */
+      if (st.st_dev != num)
+	{
+	  /* offset == 0 means path given is the mount point.
+	     This works around special-casing of "/" in Un*x.  This function never
+	     prints trailing slashes (so that its output can be appended a slash
+	     unconditionally).  Each slash in is considered a preceding slash, and
+	     therefore the root directory is an empty string.  */
+	  if (offset == 0)
+	    {
+	      free (buf);
+	      free (buf2);
+	      return xstrdup ("");
+	    }
+	  else
+	    break;
+	}
+
+      offset = p - buf;
+      /* offset == 1 means root directory.  */
+      if (offset == 1)
+	{
+	  /* Include leading slash.  */
+	  offset = 0;
+	  break;
+	}
+    }
+  free (buf);
+  buf3 = xstrdup (buf2 + offset);
+  free (buf2);
+
+#ifdef __CYGWIN__
+  if (st.st_dev != (DEV_CYGDRIVE_MAJOR << 16))
+    {
+      /* Reached some mount point not below /cygdrive.
+	 GRUB does not know Cygwin's emulated mounts,
+	 convert to Win32 path.  */
+      grub_util_info ("Cygwin path = %s\n", buf3);
+      char * temp = get_win32_path (buf3);
+      free (buf3);
+      buf3 = temp;
+    }
+#endif
+
+  /* Remove trailing slashes, return empty string if root directory.  */
+  len = strlen (buf3);
+  while (len > 0 && buf3[len - 1] == '/')
+    {
+      buf3[len - 1] = '\0';
+      len--;
+    }
+
+  return buf3;
+}
diff --git a/util/hostdisk.c b/grub-core/kern/emu/hostdisk.c
similarity index 99%
rename from util/hostdisk.c
rename to grub-core/kern/emu/hostdisk.c
index 8be487461..983f101ae 100644
--- a/util/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -22,8 +22,8 @@
 #include <grub/msdos_partition.h>
 #include <grub/types.h>
 #include <grub/err.h>
-#include <grub/util/misc.h>
-#include <grub/util/hostdisk.h>
+#include <grub/emu/misc.h>
+#include <grub/emu/hostdisk.h>
 #include <grub/misc.h>
 #include <grub/i18n.h>
 #include <grub/list.h>
diff --git a/util/hostfs.c b/grub-core/kern/emu/hostfs.c
similarity index 100%
rename from util/hostfs.c
rename to grub-core/kern/emu/hostfs.c
diff --git a/grub-core/kern/emu/lite.c b/grub-core/kern/emu/lite.c
new file mode 100644
index 000000000..1f06e39dc
--- /dev/null
+++ b/grub-core/kern/emu/lite.c
@@ -0,0 +1,16 @@
+#include <config.h>
+#include <grub/emu/misc.h>
+
+/* grub-emu-lite supports dynamic module loading, so it won't have any
+   embedded modules.  */
+void
+grub_init_all(void)
+{
+  return;
+}
+
+void
+grub_fini_all(void)
+{
+  return;
+}
diff --git a/util/grub-emu.c b/grub-core/kern/emu/main.c
similarity index 90%
rename from util/grub-emu.c
rename to grub-core/kern/emu/main.c
index 8c53b0aca..9083e27a0 100644
--- a/util/grub-emu.c
+++ b/grub-core/kern/emu/main.c
@@ -16,7 +16,10 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <time.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <setjmp.h>
 #include <sys/stat.h>
 #include <getopt.h>
 #include <string.h>
@@ -27,20 +30,22 @@
 #include <grub/mm.h>
 #include <grub/setjmp.h>
 #include <grub/fs.h>
-#include <grub/util/hostdisk.h>
-#include <grub/dl.h>
-#include <grub/util/console.h>
+#include <grub/emu/hostdisk.h>
+#include <grub/time.h>
+#include <grub/emu/console.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/kernel.h>
 #include <grub/normal.h>
-#include <grub/util/getroot.h>
+#include <grub/emu/getroot.h>
 #include <grub/env.h>
 #include <grub/partition.h>
 #include <grub/i18n.h>
 
-#define ENABLE_RELOCATABLE 0
 #include "progname.h"
 
+#define ENABLE_RELOCATABLE 0
+
 /* Used for going back to the main function.  */
 static jmp_buf main_env;
 
@@ -53,25 +58,6 @@ grub_arch_modules_addr (void)
   return 0;
 }
 
-#if GRUB_NO_MODULES
-grub_err_t
-grub_arch_dl_check_header (void *ehdr)
-{
-  (void) ehdr;
-
-  return GRUB_ERR_BAD_MODULE;
-}
-
-grub_err_t
-grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
-{
-  (void) mod;
-  (void) ehdr;
-
-  return GRUB_ERR_BAD_MODULE;
-}
-#endif
-
 void
 grub_reboot (void)
 {
@@ -150,10 +136,6 @@ void grub_hostfs_init (void);
 void grub_hostfs_fini (void);
 void grub_host_init (void);
 void grub_host_fini (void);
-#if GRUB_NO_MODULES
-void grub_init_all (void);
-void grub_fini_all (void);
-#endif
 
 int
 main (int argc, char *argv[])
@@ -219,9 +201,8 @@ main (int argc, char *argv[])
   /* XXX: This is a bit unportable.  */
   grub_util_biosdisk_init (dev_map);
 
-#if GRUB_NO_MODULES
+  /* Initialize all embedded modules.  */
   grub_init_all ();
-#endif
 
   /* Make sure that there is a root device.  */
   if (! root_dev)
@@ -242,7 +223,7 @@ main (int argc, char *argv[])
   if (strcmp (root_dev, "host") == 0)
     dir = xstrdup (dir);
   else
-    dir = make_system_path_relative_to_its_root (dir);
+    dir = grub_make_system_path_relative_to_its_root (dir);
   prefix = xmalloc (strlen (root_dev) + 2 + strlen (dir) + 1);
   sprintf (prefix, "(%s)%s", root_dev, dir);
   free (dir);
@@ -251,9 +232,7 @@ main (int argc, char *argv[])
   if (setjmp (main_env) == 0)
     grub_main ();
 
-#if GRUB_NO_MODULES
   grub_fini_all ();
-#endif
   grub_hostfs_fini ();
   grub_host_fini ();
 
@@ -261,3 +240,25 @@ main (int argc, char *argv[])
 
   return 0;
 }
+
+#ifdef __MINGW32__
+
+void
+grub_millisleep (grub_uint32_t ms)
+{
+  Sleep (ms);
+}
+
+#else
+
+void
+grub_millisleep (grub_uint32_t ms)
+{
+  struct timespec ts;
+
+  ts.tv_sec = ms / 1000;
+  ts.tv_nsec = (ms % 1000) * 1000000;
+  nanosleep (&ts, NULL);
+}
+
+#endif
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
new file mode 100644
index 000000000..d8dfc938d
--- /dev/null
+++ b/grub-core/kern/emu/misc.c
@@ -0,0 +1,199 @@
+#include <config.h>
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+
+#include <grub/mm.h>
+#include <grub/err.h>
+#include <grub/env.h>
+#include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/i18n.h>
+#include <grub/time.h>
+#include <grub/emu/misc.h>
+
+int verbosity;
+
+void
+grub_util_warn (const char *fmt, ...)
+{
+  va_list ap;
+
+  fprintf (stderr, _("%s: warn:"), program_name);
+  fprintf (stderr, " ");
+  va_start (ap, fmt);
+  vfprintf (stderr, fmt, ap);
+  va_end (ap);
+  fprintf (stderr, ".\n");
+  fflush (stderr);
+}
+
+void
+grub_util_info (const char *fmt, ...)
+{
+  if (verbosity > 0)
+    {
+      va_list ap;
+
+      fprintf (stderr, _("%s: info:"), program_name);
+      fprintf (stderr, " ");
+      va_start (ap, fmt);
+      vfprintf (stderr, fmt, ap);
+      va_end (ap);
+      fprintf (stderr, ".\n");
+      fflush (stderr);
+    }
+}
+
+void
+grub_util_error (const char *fmt, ...)
+{
+  va_list ap;
+
+  fprintf (stderr, _("%s: error:"), program_name);
+  fprintf (stderr, " ");
+  va_start (ap, fmt);
+  vfprintf (stderr, fmt, ap);
+  va_end (ap);
+  fprintf (stderr, ".\n");
+  exit (1);
+}
+
+void *
+grub_malloc (grub_size_t size)
+{
+  return malloc (size);
+}
+
+void *
+grub_zalloc (grub_size_t size)
+{
+  void *ret;
+
+  ret = malloc (size);
+  memset (ret, 0, size);
+  return ret;
+}
+
+void
+grub_free (void *ptr)
+{
+  free (ptr);
+}
+
+void *
+grub_realloc (void *ptr, grub_size_t size)
+{
+  return realloc (ptr, size);
+}
+
+void *
+grub_memalign (grub_size_t align, grub_size_t size)
+{
+  void *p;
+
+#if defined(HAVE_POSIX_MEMALIGN)
+  if (align < sizeof (void *))
+    align = sizeof (void *);
+
+  else if (align % sizeof (void *))
+    grub_fatal ("bad alignment");
+
+  if (posix_memalign (&p, align, size) != 0)
+    p = 0;
+#elif defined(HAVE_MEMALIGN)
+  p = memalign (align, size);
+#else
+  (void) align;
+  (void) size;
+  grub_fatal ("grub_memalign is not supported");
+#endif
+
+  if (! p)
+    grub_fatal ("out of memory");
+
+  return p;
+}
+
+void *
+xmalloc (grub_size_t size)
+{
+  void *p;
+
+  p = grub_malloc (size);
+  if (! p)
+    grub_fatal ("out of memory");
+
+  return p;
+}
+
+void *
+xrealloc (void *ptr, grub_size_t size)
+{
+  ptr = grub_realloc (ptr, size);
+  if (! ptr)
+    grub_fatal ("out of memory");
+
+  return ptr;
+}
+
+char *
+xstrdup (const char *str)
+{
+  size_t len;
+  char *newstr;
+
+  len = grub_strlen (str);
+  newstr = (char *) xmalloc (len + 1);
+  grub_memcpy (newstr, str, len + 1);
+
+  return newstr;
+}
+
+char *
+xasprintf (const char *fmt, ...)
+{ 
+  va_list ap;
+  char *result;
+  
+  va_start (ap, fmt);
+  if (vasprintf (&result, fmt, ap) < 0)
+    { 
+      if (errno == ENOMEM)
+        grub_util_error ("out of memory");
+      return NULL;
+    }
+  
+  return result;
+}
+
+void
+grub_exit (void)
+{
+  exit (1);
+}
+
+grub_uint64_t
+grub_get_time_ms (void)
+{
+  struct timeval tv;
+
+  gettimeofday (&tv, 0);
+
+  return (tv.tv_sec * 1000 + tv.tv_usec / 1000);
+}
+
+grub_uint32_t
+grub_get_rtc (void)
+{
+  struct timeval tv;
+
+  gettimeofday (&tv, 0);
+
+  return (tv.tv_sec * GRUB_TICKS_PER_SECOND
+	  + (((tv.tv_sec % GRUB_TICKS_PER_SECOND) * 1000000 + tv.tv_usec)
+	     * GRUB_TICKS_PER_SECOND / 1000000));
+}
diff --git a/util/time.c b/grub-core/kern/emu/time.c
similarity index 100%
rename from util/time.c
rename to grub-core/kern/emu/time.c
diff --git a/kern/env.c b/grub-core/kern/env.c
similarity index 100%
rename from kern/env.c
rename to grub-core/kern/env.c
diff --git a/kern/err.c b/grub-core/kern/err.c
similarity index 100%
rename from kern/err.c
rename to grub-core/kern/err.c
diff --git a/kern/file.c b/grub-core/kern/file.c
similarity index 100%
rename from kern/file.c
rename to grub-core/kern/file.c
diff --git a/kern/fs.c b/grub-core/kern/fs.c
similarity index 100%
rename from kern/fs.c
rename to grub-core/kern/fs.c
diff --git a/kern/generic/millisleep.c b/grub-core/kern/generic/millisleep.c
similarity index 100%
rename from kern/generic/millisleep.c
rename to grub-core/kern/generic/millisleep.c
diff --git a/kern/generic/rtc_get_time_ms.c b/grub-core/kern/generic/rtc_get_time_ms.c
similarity index 100%
rename from kern/generic/rtc_get_time_ms.c
rename to grub-core/kern/generic/rtc_get_time_ms.c
diff --git a/kern/handler.c b/grub-core/kern/handler.c
similarity index 100%
rename from kern/handler.c
rename to grub-core/kern/handler.c
diff --git a/kern/i386/coreboot/init.c b/grub-core/kern/i386/coreboot/init.c
similarity index 100%
rename from kern/i386/coreboot/init.c
rename to grub-core/kern/i386/coreboot/init.c
diff --git a/kern/i386/coreboot/mmap.c b/grub-core/kern/i386/coreboot/mmap.c
similarity index 100%
rename from kern/i386/coreboot/mmap.c
rename to grub-core/kern/i386/coreboot/mmap.c
diff --git a/kern/i386/coreboot/startup.S b/grub-core/kern/i386/coreboot/startup.S
similarity index 100%
rename from kern/i386/coreboot/startup.S
rename to grub-core/kern/i386/coreboot/startup.S
diff --git a/kern/i386/dl.c b/grub-core/kern/i386/dl.c
similarity index 100%
rename from kern/i386/dl.c
rename to grub-core/kern/i386/dl.c
diff --git a/kern/i386/efi/init.c b/grub-core/kern/i386/efi/init.c
similarity index 100%
rename from kern/i386/efi/init.c
rename to grub-core/kern/i386/efi/init.c
diff --git a/kern/i386/efi/startup.S b/grub-core/kern/i386/efi/startup.S
similarity index 100%
rename from kern/i386/efi/startup.S
rename to grub-core/kern/i386/efi/startup.S
diff --git a/kern/i386/halt.c b/grub-core/kern/i386/halt.c
similarity index 100%
rename from kern/i386/halt.c
rename to grub-core/kern/i386/halt.c
diff --git a/kern/i386/ieee1275/init.c b/grub-core/kern/i386/ieee1275/init.c
similarity index 100%
rename from kern/i386/ieee1275/init.c
rename to grub-core/kern/i386/ieee1275/init.c
diff --git a/kern/i386/ieee1275/startup.S b/grub-core/kern/i386/ieee1275/startup.S
similarity index 100%
rename from kern/i386/ieee1275/startup.S
rename to grub-core/kern/i386/ieee1275/startup.S
diff --git a/kern/i386/loader.S b/grub-core/kern/i386/loader.S
similarity index 100%
rename from kern/i386/loader.S
rename to grub-core/kern/i386/loader.S
diff --git a/kern/i386/misc.S b/grub-core/kern/i386/misc.S
similarity index 100%
rename from kern/i386/misc.S
rename to grub-core/kern/i386/misc.S
diff --git a/kern/i386/multiboot_mmap.c b/grub-core/kern/i386/multiboot_mmap.c
similarity index 100%
rename from kern/i386/multiboot_mmap.c
rename to grub-core/kern/i386/multiboot_mmap.c
diff --git a/kern/i386/pc/init.c b/grub-core/kern/i386/pc/init.c
similarity index 100%
rename from kern/i386/pc/init.c
rename to grub-core/kern/i386/pc/init.c
diff --git a/kern/i386/pc/lzma_decode.S b/grub-core/kern/i386/pc/lzma_decode.S
similarity index 100%
rename from kern/i386/pc/lzma_decode.S
rename to grub-core/kern/i386/pc/lzma_decode.S
diff --git a/kern/i386/pc/mmap.c b/grub-core/kern/i386/pc/mmap.c
similarity index 100%
rename from kern/i386/pc/mmap.c
rename to grub-core/kern/i386/pc/mmap.c
diff --git a/kern/i386/pc/startup.S b/grub-core/kern/i386/pc/startup.S
similarity index 100%
rename from kern/i386/pc/startup.S
rename to grub-core/kern/i386/pc/startup.S
diff --git a/kern/i386/pit.c b/grub-core/kern/i386/pit.c
similarity index 100%
rename from kern/i386/pit.c
rename to grub-core/kern/i386/pit.c
diff --git a/kern/i386/qemu/mmap.c b/grub-core/kern/i386/qemu/mmap.c
similarity index 100%
rename from kern/i386/qemu/mmap.c
rename to grub-core/kern/i386/qemu/mmap.c
diff --git a/kern/i386/qemu/startup.S b/grub-core/kern/i386/qemu/startup.S
similarity index 100%
rename from kern/i386/qemu/startup.S
rename to grub-core/kern/i386/qemu/startup.S
diff --git a/kern/i386/realmode.S b/grub-core/kern/i386/realmode.S
similarity index 100%
rename from kern/i386/realmode.S
rename to grub-core/kern/i386/realmode.S
diff --git a/kern/i386/tsc.c b/grub-core/kern/i386/tsc.c
similarity index 100%
rename from kern/i386/tsc.c
rename to grub-core/kern/i386/tsc.c
diff --git a/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
similarity index 100%
rename from kern/ieee1275/cmain.c
rename to grub-core/kern/ieee1275/cmain.c
diff --git a/kern/ieee1275/ieee1275.c b/grub-core/kern/ieee1275/ieee1275.c
similarity index 100%
rename from kern/ieee1275/ieee1275.c
rename to grub-core/kern/ieee1275/ieee1275.c
diff --git a/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
similarity index 100%
rename from kern/ieee1275/init.c
rename to grub-core/kern/ieee1275/init.c
diff --git a/kern/ieee1275/mmap.c b/grub-core/kern/ieee1275/mmap.c
similarity index 100%
rename from kern/ieee1275/mmap.c
rename to grub-core/kern/ieee1275/mmap.c
diff --git a/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
similarity index 100%
rename from kern/ieee1275/openfw.c
rename to grub-core/kern/ieee1275/openfw.c
diff --git a/kern/list.c b/grub-core/kern/list.c
similarity index 100%
rename from kern/list.c
rename to grub-core/kern/list.c
diff --git a/kern/main.c b/grub-core/kern/main.c
similarity index 100%
rename from kern/main.c
rename to grub-core/kern/main.c
diff --git a/kern/mips/cache.S b/grub-core/kern/mips/cache.S
similarity index 100%
rename from kern/mips/cache.S
rename to grub-core/kern/mips/cache.S
diff --git a/kern/mips/cache_flush.S b/grub-core/kern/mips/cache_flush.S
similarity index 100%
rename from kern/mips/cache_flush.S
rename to grub-core/kern/mips/cache_flush.S
diff --git a/kern/mips/dl.c b/grub-core/kern/mips/dl.c
similarity index 100%
rename from kern/mips/dl.c
rename to grub-core/kern/mips/dl.c
diff --git a/kern/mips/init.c b/grub-core/kern/mips/init.c
similarity index 100%
rename from kern/mips/init.c
rename to grub-core/kern/mips/init.c
diff --git a/kern/mips/qemu-mips/init.c b/grub-core/kern/mips/qemu-mips/init.c
similarity index 100%
rename from kern/mips/qemu-mips/init.c
rename to grub-core/kern/mips/qemu-mips/init.c
diff --git a/kern/mips/startup.S b/grub-core/kern/mips/startup.S
similarity index 100%
rename from kern/mips/startup.S
rename to grub-core/kern/mips/startup.S
diff --git a/kern/mips/yeeloong/init.c b/grub-core/kern/mips/yeeloong/init.c
similarity index 100%
rename from kern/mips/yeeloong/init.c
rename to grub-core/kern/mips/yeeloong/init.c
diff --git a/kern/misc.c b/grub-core/kern/misc.c
similarity index 100%
rename from kern/misc.c
rename to grub-core/kern/misc.c
diff --git a/kern/mm.c b/grub-core/kern/mm.c
similarity index 100%
rename from kern/mm.c
rename to grub-core/kern/mm.c
diff --git a/kern/parser.c b/grub-core/kern/parser.c
similarity index 100%
rename from kern/parser.c
rename to grub-core/kern/parser.c
diff --git a/kern/partition.c b/grub-core/kern/partition.c
similarity index 100%
rename from kern/partition.c
rename to grub-core/kern/partition.c
diff --git a/kern/powerpc/cache.S b/grub-core/kern/powerpc/cache.S
similarity index 100%
rename from kern/powerpc/cache.S
rename to grub-core/kern/powerpc/cache.S
diff --git a/kern/powerpc/dl.c b/grub-core/kern/powerpc/dl.c
similarity index 100%
rename from kern/powerpc/dl.c
rename to grub-core/kern/powerpc/dl.c
diff --git a/kern/powerpc/ieee1275/startup.S b/grub-core/kern/powerpc/ieee1275/startup.S
similarity index 100%
rename from kern/powerpc/ieee1275/startup.S
rename to grub-core/kern/powerpc/ieee1275/startup.S
diff --git a/kern/rescue_parser.c b/grub-core/kern/rescue_parser.c
similarity index 100%
rename from kern/rescue_parser.c
rename to grub-core/kern/rescue_parser.c
diff --git a/kern/rescue_reader.c b/grub-core/kern/rescue_reader.c
similarity index 100%
rename from kern/rescue_reader.c
rename to grub-core/kern/rescue_reader.c
diff --git a/kern/sparc64/cache.S b/grub-core/kern/sparc64/cache.S
similarity index 100%
rename from kern/sparc64/cache.S
rename to grub-core/kern/sparc64/cache.S
diff --git a/kern/sparc64/dl.c b/grub-core/kern/sparc64/dl.c
similarity index 100%
rename from kern/sparc64/dl.c
rename to grub-core/kern/sparc64/dl.c
diff --git a/kern/sparc64/ieee1275/crt0.S b/grub-core/kern/sparc64/ieee1275/crt0.S
similarity index 100%
rename from kern/sparc64/ieee1275/crt0.S
rename to grub-core/kern/sparc64/ieee1275/crt0.S
diff --git a/kern/sparc64/ieee1275/ieee1275.c b/grub-core/kern/sparc64/ieee1275/ieee1275.c
similarity index 100%
rename from kern/sparc64/ieee1275/ieee1275.c
rename to grub-core/kern/sparc64/ieee1275/ieee1275.c
diff --git a/kern/sparc64/ieee1275/init.c b/grub-core/kern/sparc64/ieee1275/init.c
similarity index 100%
rename from kern/sparc64/ieee1275/init.c
rename to grub-core/kern/sparc64/ieee1275/init.c
diff --git a/kern/term.c b/grub-core/kern/term.c
similarity index 100%
rename from kern/term.c
rename to grub-core/kern/term.c
diff --git a/kern/time.c b/grub-core/kern/time.c
similarity index 100%
rename from kern/time.c
rename to grub-core/kern/time.c
diff --git a/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c
similarity index 100%
rename from kern/x86_64/dl.c
rename to grub-core/kern/x86_64/dl.c
diff --git a/kern/x86_64/efi/callwrap.S b/grub-core/kern/x86_64/efi/callwrap.S
similarity index 100%
rename from kern/x86_64/efi/callwrap.S
rename to grub-core/kern/x86_64/efi/callwrap.S
diff --git a/kern/x86_64/efi/startup.S b/grub-core/kern/x86_64/efi/startup.S
similarity index 100%
rename from kern/x86_64/efi/startup.S
rename to grub-core/kern/x86_64/efi/startup.S
diff --git a/lib/LzFind.c b/grub-core/lib/LzFind.c
similarity index 100%
rename from lib/LzFind.c
rename to grub-core/lib/LzFind.c
diff --git a/lib/LzmaDec.c b/grub-core/lib/LzmaDec.c
similarity index 100%
rename from lib/LzmaDec.c
rename to grub-core/lib/LzmaDec.c
diff --git a/lib/LzmaEnc.c b/grub-core/lib/LzmaEnc.c
similarity index 100%
rename from lib/LzmaEnc.c
rename to grub-core/lib/LzmaEnc.c
diff --git a/lib/arg.c b/grub-core/lib/arg.c
similarity index 100%
rename from lib/arg.c
rename to grub-core/lib/arg.c
diff --git a/lib/charset.c b/grub-core/lib/charset.c
similarity index 100%
rename from lib/charset.c
rename to grub-core/lib/charset.c
diff --git a/lib/cmos_datetime.c b/grub-core/lib/cmos_datetime.c
similarity index 100%
rename from lib/cmos_datetime.c
rename to grub-core/lib/cmos_datetime.c
diff --git a/lib/crc.c b/grub-core/lib/crc.c
similarity index 100%
rename from lib/crc.c
rename to grub-core/lib/crc.c
diff --git a/lib/crypto.c b/grub-core/lib/crypto.c
similarity index 100%
rename from lib/crypto.c
rename to grub-core/lib/crypto.c
diff --git a/lib/efi/datetime.c b/grub-core/lib/efi/datetime.c
similarity index 100%
rename from lib/efi/datetime.c
rename to grub-core/lib/efi/datetime.c
diff --git a/lib/envblk.c b/grub-core/lib/envblk.c
similarity index 100%
rename from lib/envblk.c
rename to grub-core/lib/envblk.c
diff --git a/lib/hexdump.c b/grub-core/lib/hexdump.c
similarity index 100%
rename from lib/hexdump.c
rename to grub-core/lib/hexdump.c
diff --git a/lib/i386/pc/biosnum.c b/grub-core/lib/i386/pc/biosnum.c
similarity index 100%
rename from lib/i386/pc/biosnum.c
rename to grub-core/lib/i386/pc/biosnum.c
diff --git a/lib/i386/relocator.c b/grub-core/lib/i386/relocator.c
similarity index 100%
rename from lib/i386/relocator.c
rename to grub-core/lib/i386/relocator.c
diff --git a/lib/i386/relocator_asm.S b/grub-core/lib/i386/relocator_asm.S
similarity index 100%
rename from lib/i386/relocator_asm.S
rename to grub-core/lib/i386/relocator_asm.S
diff --git a/lib/i386/relocator_backward.S b/grub-core/lib/i386/relocator_backward.S
similarity index 100%
rename from lib/i386/relocator_backward.S
rename to grub-core/lib/i386/relocator_backward.S
diff --git a/lib/i386/setjmp.S b/grub-core/lib/i386/setjmp.S
similarity index 100%
rename from lib/i386/setjmp.S
rename to grub-core/lib/i386/setjmp.S
diff --git a/lib/ieee1275/datetime.c b/grub-core/lib/ieee1275/datetime.c
similarity index 100%
rename from lib/ieee1275/datetime.c
rename to grub-core/lib/ieee1275/datetime.c
diff --git a/lib/libgcrypt/cipher/ChangeLog b/grub-core/lib/libgcrypt/cipher/ChangeLog
similarity index 100%
rename from lib/libgcrypt/cipher/ChangeLog
rename to grub-core/lib/libgcrypt/cipher/ChangeLog
diff --git a/lib/libgcrypt/cipher/ac.c b/grub-core/lib/libgcrypt/cipher/ac.c
similarity index 100%
rename from lib/libgcrypt/cipher/ac.c
rename to grub-core/lib/libgcrypt/cipher/ac.c
diff --git a/lib/libgcrypt/cipher/arcfour.c b/grub-core/lib/libgcrypt/cipher/arcfour.c
similarity index 100%
rename from lib/libgcrypt/cipher/arcfour.c
rename to grub-core/lib/libgcrypt/cipher/arcfour.c
diff --git a/lib/libgcrypt/cipher/bithelp.h b/grub-core/lib/libgcrypt/cipher/bithelp.h
similarity index 100%
rename from lib/libgcrypt/cipher/bithelp.h
rename to grub-core/lib/libgcrypt/cipher/bithelp.h
diff --git a/lib/libgcrypt/cipher/blowfish.c b/grub-core/lib/libgcrypt/cipher/blowfish.c
similarity index 100%
rename from lib/libgcrypt/cipher/blowfish.c
rename to grub-core/lib/libgcrypt/cipher/blowfish.c
diff --git a/lib/libgcrypt/cipher/camellia-glue.c b/grub-core/lib/libgcrypt/cipher/camellia-glue.c
similarity index 100%
rename from lib/libgcrypt/cipher/camellia-glue.c
rename to grub-core/lib/libgcrypt/cipher/camellia-glue.c
diff --git a/lib/libgcrypt/cipher/camellia.c b/grub-core/lib/libgcrypt/cipher/camellia.c
similarity index 100%
rename from lib/libgcrypt/cipher/camellia.c
rename to grub-core/lib/libgcrypt/cipher/camellia.c
diff --git a/lib/libgcrypt/cipher/camellia.h b/grub-core/lib/libgcrypt/cipher/camellia.h
similarity index 100%
rename from lib/libgcrypt/cipher/camellia.h
rename to grub-core/lib/libgcrypt/cipher/camellia.h
diff --git a/lib/libgcrypt/cipher/cast5.c b/grub-core/lib/libgcrypt/cipher/cast5.c
similarity index 100%
rename from lib/libgcrypt/cipher/cast5.c
rename to grub-core/lib/libgcrypt/cipher/cast5.c
diff --git a/lib/libgcrypt/cipher/cipher.c b/grub-core/lib/libgcrypt/cipher/cipher.c
similarity index 100%
rename from lib/libgcrypt/cipher/cipher.c
rename to grub-core/lib/libgcrypt/cipher/cipher.c
diff --git a/lib/libgcrypt/cipher/crc.c b/grub-core/lib/libgcrypt/cipher/crc.c
similarity index 100%
rename from lib/libgcrypt/cipher/crc.c
rename to grub-core/lib/libgcrypt/cipher/crc.c
diff --git a/lib/libgcrypt/cipher/des.c b/grub-core/lib/libgcrypt/cipher/des.c
similarity index 100%
rename from lib/libgcrypt/cipher/des.c
rename to grub-core/lib/libgcrypt/cipher/des.c
diff --git a/lib/libgcrypt/cipher/dsa.c b/grub-core/lib/libgcrypt/cipher/dsa.c
similarity index 100%
rename from lib/libgcrypt/cipher/dsa.c
rename to grub-core/lib/libgcrypt/cipher/dsa.c
diff --git a/lib/libgcrypt/cipher/ecc.c b/grub-core/lib/libgcrypt/cipher/ecc.c
similarity index 100%
rename from lib/libgcrypt/cipher/ecc.c
rename to grub-core/lib/libgcrypt/cipher/ecc.c
diff --git a/lib/libgcrypt/cipher/elgamal.c b/grub-core/lib/libgcrypt/cipher/elgamal.c
similarity index 100%
rename from lib/libgcrypt/cipher/elgamal.c
rename to grub-core/lib/libgcrypt/cipher/elgamal.c
diff --git a/lib/libgcrypt/cipher/hash-common.c b/grub-core/lib/libgcrypt/cipher/hash-common.c
similarity index 100%
rename from lib/libgcrypt/cipher/hash-common.c
rename to grub-core/lib/libgcrypt/cipher/hash-common.c
diff --git a/lib/libgcrypt/cipher/hash-common.h b/grub-core/lib/libgcrypt/cipher/hash-common.h
similarity index 100%
rename from lib/libgcrypt/cipher/hash-common.h
rename to grub-core/lib/libgcrypt/cipher/hash-common.h
diff --git a/lib/libgcrypt/cipher/hmac-tests.c b/grub-core/lib/libgcrypt/cipher/hmac-tests.c
similarity index 100%
rename from lib/libgcrypt/cipher/hmac-tests.c
rename to grub-core/lib/libgcrypt/cipher/hmac-tests.c
diff --git a/lib/libgcrypt/cipher/md.c b/grub-core/lib/libgcrypt/cipher/md.c
similarity index 100%
rename from lib/libgcrypt/cipher/md.c
rename to grub-core/lib/libgcrypt/cipher/md.c
diff --git a/lib/libgcrypt/cipher/md4.c b/grub-core/lib/libgcrypt/cipher/md4.c
similarity index 100%
rename from lib/libgcrypt/cipher/md4.c
rename to grub-core/lib/libgcrypt/cipher/md4.c
diff --git a/lib/libgcrypt/cipher/md5.c b/grub-core/lib/libgcrypt/cipher/md5.c
similarity index 100%
rename from lib/libgcrypt/cipher/md5.c
rename to grub-core/lib/libgcrypt/cipher/md5.c
diff --git a/lib/libgcrypt/cipher/primegen.c b/grub-core/lib/libgcrypt/cipher/primegen.c
similarity index 100%
rename from lib/libgcrypt/cipher/primegen.c
rename to grub-core/lib/libgcrypt/cipher/primegen.c
diff --git a/lib/libgcrypt/cipher/pubkey.c b/grub-core/lib/libgcrypt/cipher/pubkey.c
similarity index 100%
rename from lib/libgcrypt/cipher/pubkey.c
rename to grub-core/lib/libgcrypt/cipher/pubkey.c
diff --git a/lib/libgcrypt/cipher/rfc2268.c b/grub-core/lib/libgcrypt/cipher/rfc2268.c
similarity index 100%
rename from lib/libgcrypt/cipher/rfc2268.c
rename to grub-core/lib/libgcrypt/cipher/rfc2268.c
diff --git a/lib/libgcrypt/cipher/rijndael-tables.h b/grub-core/lib/libgcrypt/cipher/rijndael-tables.h
similarity index 100%
rename from lib/libgcrypt/cipher/rijndael-tables.h
rename to grub-core/lib/libgcrypt/cipher/rijndael-tables.h
diff --git a/lib/libgcrypt/cipher/rijndael.c b/grub-core/lib/libgcrypt/cipher/rijndael.c
similarity index 100%
rename from lib/libgcrypt/cipher/rijndael.c
rename to grub-core/lib/libgcrypt/cipher/rijndael.c
diff --git a/lib/libgcrypt/cipher/rmd.h b/grub-core/lib/libgcrypt/cipher/rmd.h
similarity index 100%
rename from lib/libgcrypt/cipher/rmd.h
rename to grub-core/lib/libgcrypt/cipher/rmd.h
diff --git a/lib/libgcrypt/cipher/rmd160.c b/grub-core/lib/libgcrypt/cipher/rmd160.c
similarity index 100%
rename from lib/libgcrypt/cipher/rmd160.c
rename to grub-core/lib/libgcrypt/cipher/rmd160.c
diff --git a/lib/libgcrypt/cipher/rsa.c b/grub-core/lib/libgcrypt/cipher/rsa.c
similarity index 100%
rename from lib/libgcrypt/cipher/rsa.c
rename to grub-core/lib/libgcrypt/cipher/rsa.c
diff --git a/lib/libgcrypt/cipher/seed.c b/grub-core/lib/libgcrypt/cipher/seed.c
similarity index 100%
rename from lib/libgcrypt/cipher/seed.c
rename to grub-core/lib/libgcrypt/cipher/seed.c
diff --git a/lib/libgcrypt/cipher/serpent.c b/grub-core/lib/libgcrypt/cipher/serpent.c
similarity index 100%
rename from lib/libgcrypt/cipher/serpent.c
rename to grub-core/lib/libgcrypt/cipher/serpent.c
diff --git a/lib/libgcrypt/cipher/sha1.c b/grub-core/lib/libgcrypt/cipher/sha1.c
similarity index 100%
rename from lib/libgcrypt/cipher/sha1.c
rename to grub-core/lib/libgcrypt/cipher/sha1.c
diff --git a/lib/libgcrypt/cipher/sha256.c b/grub-core/lib/libgcrypt/cipher/sha256.c
similarity index 100%
rename from lib/libgcrypt/cipher/sha256.c
rename to grub-core/lib/libgcrypt/cipher/sha256.c
diff --git a/lib/libgcrypt/cipher/sha512.c b/grub-core/lib/libgcrypt/cipher/sha512.c
similarity index 100%
rename from lib/libgcrypt/cipher/sha512.c
rename to grub-core/lib/libgcrypt/cipher/sha512.c
diff --git a/lib/libgcrypt/cipher/tiger.c b/grub-core/lib/libgcrypt/cipher/tiger.c
similarity index 100%
rename from lib/libgcrypt/cipher/tiger.c
rename to grub-core/lib/libgcrypt/cipher/tiger.c
diff --git a/lib/libgcrypt/cipher/twofish.c b/grub-core/lib/libgcrypt/cipher/twofish.c
similarity index 100%
rename from lib/libgcrypt/cipher/twofish.c
rename to grub-core/lib/libgcrypt/cipher/twofish.c
diff --git a/lib/libgcrypt/cipher/whirlpool.c b/grub-core/lib/libgcrypt/cipher/whirlpool.c
similarity index 100%
rename from lib/libgcrypt/cipher/whirlpool.c
rename to grub-core/lib/libgcrypt/cipher/whirlpool.c
diff --git a/lib/libgcrypt_wrap/cipher_wrap.h b/grub-core/lib/libgcrypt_wrap/cipher_wrap.h
similarity index 100%
rename from lib/libgcrypt_wrap/cipher_wrap.h
rename to grub-core/lib/libgcrypt_wrap/cipher_wrap.h
diff --git a/lib/mips/relocator.c b/grub-core/lib/mips/relocator.c
similarity index 100%
rename from lib/mips/relocator.c
rename to grub-core/lib/mips/relocator.c
diff --git a/lib/mips/relocator_asm.S b/grub-core/lib/mips/relocator_asm.S
similarity index 100%
rename from lib/mips/relocator_asm.S
rename to grub-core/lib/mips/relocator_asm.S
diff --git a/lib/mips/setjmp.S b/grub-core/lib/mips/setjmp.S
similarity index 100%
rename from lib/mips/setjmp.S
rename to grub-core/lib/mips/setjmp.S
diff --git a/lib/pbkdf2.c b/grub-core/lib/pbkdf2.c
similarity index 100%
rename from lib/pbkdf2.c
rename to grub-core/lib/pbkdf2.c
diff --git a/lib/posix_wrap/assert.h b/grub-core/lib/posix_wrap/assert.h
similarity index 100%
rename from lib/posix_wrap/assert.h
rename to grub-core/lib/posix_wrap/assert.h
diff --git a/lib/posix_wrap/ctype.h b/grub-core/lib/posix_wrap/ctype.h
similarity index 100%
rename from lib/posix_wrap/ctype.h
rename to grub-core/lib/posix_wrap/ctype.h
diff --git a/lib/posix_wrap/errno.h b/grub-core/lib/posix_wrap/errno.h
similarity index 100%
rename from lib/posix_wrap/errno.h
rename to grub-core/lib/posix_wrap/errno.h
diff --git a/lib/posix_wrap/langinfo.h b/grub-core/lib/posix_wrap/langinfo.h
similarity index 100%
rename from lib/posix_wrap/langinfo.h
rename to grub-core/lib/posix_wrap/langinfo.h
diff --git a/lib/posix_wrap/limits.h b/grub-core/lib/posix_wrap/limits.h
similarity index 100%
rename from lib/posix_wrap/limits.h
rename to grub-core/lib/posix_wrap/limits.h
diff --git a/lib/posix_wrap/localcharset.h b/grub-core/lib/posix_wrap/localcharset.h
similarity index 100%
rename from lib/posix_wrap/localcharset.h
rename to grub-core/lib/posix_wrap/localcharset.h
diff --git a/lib/posix_wrap/locale.h b/grub-core/lib/posix_wrap/locale.h
similarity index 100%
rename from lib/posix_wrap/locale.h
rename to grub-core/lib/posix_wrap/locale.h
diff --git a/lib/posix_wrap/stdint.h b/grub-core/lib/posix_wrap/stdint.h
similarity index 100%
rename from lib/posix_wrap/stdint.h
rename to grub-core/lib/posix_wrap/stdint.h
diff --git a/lib/posix_wrap/stdio.h b/grub-core/lib/posix_wrap/stdio.h
similarity index 100%
rename from lib/posix_wrap/stdio.h
rename to grub-core/lib/posix_wrap/stdio.h
diff --git a/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h
similarity index 98%
rename from lib/posix_wrap/stdlib.h
rename to grub-core/lib/posix_wrap/stdlib.h
index 5ef6159ef..4c725f6e2 100644
--- a/lib/posix_wrap/stdlib.h
+++ b/grub-core/lib/posix_wrap/stdlib.h
@@ -20,6 +20,7 @@
 #define GRUB_POSIX_STDLIB_H	1
 
 #include <grub/mm.h>
+#include <grub/misc.h>
 
 static inline void 
 free (void *ptr)
diff --git a/lib/posix_wrap/string.h b/grub-core/lib/posix_wrap/string.h
similarity index 97%
rename from lib/posix_wrap/string.h
rename to grub-core/lib/posix_wrap/string.h
index 7bb6f1e6f..4224836e2 100644
--- a/lib/posix_wrap/string.h
+++ b/grub-core/lib/posix_wrap/string.h
@@ -19,6 +19,8 @@
 #ifndef GRUB_POSIX_STRING_H
 #define GRUB_POSIX_STRING_H	1
 
+#include <grub/misc.h>
+
 static inline grub_size_t
 strlen (const char *s)
 {
diff --git a/lib/posix_wrap/sys/types.h b/grub-core/lib/posix_wrap/sys/types.h
similarity index 100%
rename from lib/posix_wrap/sys/types.h
rename to grub-core/lib/posix_wrap/sys/types.h
diff --git a/lib/posix_wrap/unistd.h b/grub-core/lib/posix_wrap/unistd.h
similarity index 100%
rename from lib/posix_wrap/unistd.h
rename to grub-core/lib/posix_wrap/unistd.h
diff --git a/lib/posix_wrap/wchar.h b/grub-core/lib/posix_wrap/wchar.h
similarity index 100%
rename from lib/posix_wrap/wchar.h
rename to grub-core/lib/posix_wrap/wchar.h
diff --git a/lib/posix_wrap/wctype.h b/grub-core/lib/posix_wrap/wctype.h
similarity index 100%
rename from lib/posix_wrap/wctype.h
rename to grub-core/lib/posix_wrap/wctype.h
diff --git a/lib/powerpc/setjmp.S b/grub-core/lib/powerpc/setjmp.S
similarity index 100%
rename from lib/powerpc/setjmp.S
rename to grub-core/lib/powerpc/setjmp.S
diff --git a/lib/relocator.c b/grub-core/lib/relocator.c
similarity index 100%
rename from lib/relocator.c
rename to grub-core/lib/relocator.c
diff --git a/lib/sparc64/setjmp.S b/grub-core/lib/sparc64/setjmp.S
similarity index 100%
rename from lib/sparc64/setjmp.S
rename to grub-core/lib/sparc64/setjmp.S
diff --git a/lib/x86_64/setjmp.S b/grub-core/lib/x86_64/setjmp.S
similarity index 100%
rename from lib/x86_64/setjmp.S
rename to grub-core/lib/x86_64/setjmp.S
diff --git a/loader/aout.c b/grub-core/loader/aout.c
similarity index 100%
rename from loader/aout.c
rename to grub-core/loader/aout.c
diff --git a/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c
similarity index 100%
rename from loader/efi/appleloader.c
rename to grub-core/loader/efi/appleloader.c
diff --git a/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
similarity index 100%
rename from loader/efi/chainloader.c
rename to grub-core/loader/efi/chainloader.c
diff --git a/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
similarity index 100%
rename from loader/i386/bsd.c
rename to grub-core/loader/i386/bsd.c
diff --git a/loader/i386/bsd32.c b/grub-core/loader/i386/bsd32.c
similarity index 100%
rename from loader/i386/bsd32.c
rename to grub-core/loader/i386/bsd32.c
diff --git a/loader/i386/bsd64.c b/grub-core/loader/i386/bsd64.c
similarity index 100%
rename from loader/i386/bsd64.c
rename to grub-core/loader/i386/bsd64.c
diff --git a/loader/i386/bsdXX.c b/grub-core/loader/i386/bsdXX.c
similarity index 100%
rename from loader/i386/bsdXX.c
rename to grub-core/loader/i386/bsdXX.c
diff --git a/loader/i386/bsd_helper.S b/grub-core/loader/i386/bsd_helper.S
similarity index 100%
rename from loader/i386/bsd_helper.S
rename to grub-core/loader/i386/bsd_helper.S
diff --git a/loader/i386/bsd_pagetable.c b/grub-core/loader/i386/bsd_pagetable.c
similarity index 100%
rename from loader/i386/bsd_pagetable.c
rename to grub-core/loader/i386/bsd_pagetable.c
diff --git a/loader/i386/bsd_trampoline.S b/grub-core/loader/i386/bsd_trampoline.S
similarity index 100%
rename from loader/i386/bsd_trampoline.S
rename to grub-core/loader/i386/bsd_trampoline.S
diff --git a/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
similarity index 100%
rename from loader/i386/efi/linux.c
rename to grub-core/loader/i386/efi/linux.c
diff --git a/loader/i386/efi/xnu.c b/grub-core/loader/i386/efi/xnu.c
similarity index 100%
rename from loader/i386/efi/xnu.c
rename to grub-core/loader/i386/efi/xnu.c
diff --git a/loader/i386/ieee1275/linux.c b/grub-core/loader/i386/ieee1275/linux.c
similarity index 100%
rename from loader/i386/ieee1275/linux.c
rename to grub-core/loader/i386/ieee1275/linux.c
diff --git a/loader/i386/linux.c b/grub-core/loader/i386/linux.c
similarity index 100%
rename from loader/i386/linux.c
rename to grub-core/loader/i386/linux.c
diff --git a/loader/i386/linux_trampoline.S b/grub-core/loader/i386/linux_trampoline.S
similarity index 100%
rename from loader/i386/linux_trampoline.S
rename to grub-core/loader/i386/linux_trampoline.S
diff --git a/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c
similarity index 100%
rename from loader/i386/multiboot_mbi.c
rename to grub-core/loader/i386/multiboot_mbi.c
diff --git a/loader/i386/pc/chainloader.c b/grub-core/loader/i386/pc/chainloader.c
similarity index 100%
rename from loader/i386/pc/chainloader.c
rename to grub-core/loader/i386/pc/chainloader.c
diff --git a/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
similarity index 100%
rename from loader/i386/pc/linux.c
rename to grub-core/loader/i386/pc/linux.c
diff --git a/loader/i386/pc/xnu.c b/grub-core/loader/i386/pc/xnu.c
similarity index 100%
rename from loader/i386/pc/xnu.c
rename to grub-core/loader/i386/pc/xnu.c
diff --git a/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
similarity index 100%
rename from loader/i386/xnu.c
rename to grub-core/loader/i386/xnu.c
diff --git a/loader/macho.c b/grub-core/loader/macho.c
similarity index 100%
rename from loader/macho.c
rename to grub-core/loader/macho.c
diff --git a/loader/macho32.c b/grub-core/loader/macho32.c
similarity index 100%
rename from loader/macho32.c
rename to grub-core/loader/macho32.c
diff --git a/loader/macho64.c b/grub-core/loader/macho64.c
similarity index 100%
rename from loader/macho64.c
rename to grub-core/loader/macho64.c
diff --git a/loader/machoXX.c b/grub-core/loader/machoXX.c
similarity index 100%
rename from loader/machoXX.c
rename to grub-core/loader/machoXX.c
diff --git a/loader/mips/linux.c b/grub-core/loader/mips/linux.c
similarity index 100%
rename from loader/mips/linux.c
rename to grub-core/loader/mips/linux.c
diff --git a/loader/multiboot.c b/grub-core/loader/multiboot.c
similarity index 100%
rename from loader/multiboot.c
rename to grub-core/loader/multiboot.c
diff --git a/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c
similarity index 100%
rename from loader/multiboot_elfxx.c
rename to grub-core/loader/multiboot_elfxx.c
diff --git a/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
similarity index 100%
rename from loader/multiboot_mbi2.c
rename to grub-core/loader/multiboot_mbi2.c
diff --git a/loader/powerpc/ieee1275/linux.c b/grub-core/loader/powerpc/ieee1275/linux.c
similarity index 100%
rename from loader/powerpc/ieee1275/linux.c
rename to grub-core/loader/powerpc/ieee1275/linux.c
diff --git a/loader/sparc64/ieee1275/linux.c b/grub-core/loader/sparc64/ieee1275/linux.c
similarity index 100%
rename from loader/sparc64/ieee1275/linux.c
rename to grub-core/loader/sparc64/ieee1275/linux.c
diff --git a/loader/xnu.c b/grub-core/loader/xnu.c
similarity index 100%
rename from loader/xnu.c
rename to grub-core/loader/xnu.c
diff --git a/loader/xnu_resume.c b/grub-core/loader/xnu_resume.c
similarity index 100%
rename from loader/xnu_resume.c
rename to grub-core/loader/xnu_resume.c
diff --git a/mmap/efi/mmap.c b/grub-core/mmap/efi/mmap.c
similarity index 100%
rename from mmap/efi/mmap.c
rename to grub-core/mmap/efi/mmap.c
diff --git a/mmap/i386/mmap.c b/grub-core/mmap/i386/mmap.c
similarity index 100%
rename from mmap/i386/mmap.c
rename to grub-core/mmap/i386/mmap.c
diff --git a/mmap/i386/pc/mmap.c b/grub-core/mmap/i386/pc/mmap.c
similarity index 100%
rename from mmap/i386/pc/mmap.c
rename to grub-core/mmap/i386/pc/mmap.c
diff --git a/mmap/i386/pc/mmap_helper.S b/grub-core/mmap/i386/pc/mmap_helper.S
similarity index 100%
rename from mmap/i386/pc/mmap_helper.S
rename to grub-core/mmap/i386/pc/mmap_helper.S
diff --git a/mmap/i386/uppermem.c b/grub-core/mmap/i386/uppermem.c
similarity index 100%
rename from mmap/i386/uppermem.c
rename to grub-core/mmap/i386/uppermem.c
diff --git a/mmap/mips/yeeloong/uppermem.c b/grub-core/mmap/mips/yeeloong/uppermem.c
similarity index 100%
rename from mmap/mips/yeeloong/uppermem.c
rename to grub-core/mmap/mips/yeeloong/uppermem.c
diff --git a/mmap/mmap.c b/grub-core/mmap/mmap.c
similarity index 100%
rename from mmap/mmap.c
rename to grub-core/mmap/mmap.c
diff --git a/grub-core/modules.def b/grub-core/modules.def
new file mode 100644
index 000000000..ae3ede5f1
--- /dev/null
+++ b/grub-core/modules.def
@@ -0,0 +1,1592 @@
+AutoGen definitions Makefile.tpl;
+
+kernel = {
+  name = kernel;
+
+  emu_ldflags              = '-Wl,-r';
+  x86_efi_ldflags          = '-Wl,-r';
+  i386_pc_ldflags          = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  i386_coreboot_ldflags    = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  i386_qemu_ldflags        = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  i386_ieee1275_ldflags    = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  mips_yeeloong_ldflags    = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  powerpc_ieee1275_ldflags = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+
+  mips_yeeloong_cppflags = '-DUSE_ASCII_FAILBACK';
+  i386_qemu_cppflags     = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
+  i386_qemu_ccasflags    = '-DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+
+  mips_ldadd = '-lgcc';
+  powerpc_ldadd = '-lgcc';
+  sparc64_ldadd = '-lgcc';
+
+  nonemu_nodist = symlist.c;
+
+  shared = kern/command.c;
+  shared = kern/corecmd.c;
+  shared = kern/device.c;
+  shared = kern/disk.c;
+  shared = kern/dl.c;
+  shared = kern/env.c;
+  shared = kern/err.c;
+  shared = kern/file.c;
+  shared = kern/fs.c;
+  shared = kern/handler.c;
+  shared = kern/list.c;
+  shared = kern/main.c;
+  shared = kern/misc.c;
+  shared = kern/parser.c;
+  shared = kern/partition.c;
+  shared = kern/rescue_parser.c;
+  shared = kern/rescue_reader.c;
+  shared = kern/term.c;
+
+  i386_pc = kern/i386/pc/startup.S;
+  i386_pc = kern/i386/misc.S;
+  i386_pc = kern/mm.c;
+  i386_pc = kern/time.c;
+  i386_pc = kern/i386/dl.c;
+  i386_pc = kern/i386/pc/init.c;
+  i386_pc = kern/i386/pc/mmap.c;
+  i386_pc = kern/i386/tsc.c;
+  i386_pc = kern/i386/pit.c;
+  i386_pc = kern/generic/rtc_get_time_ms.c;
+  i386_pc = kern/generic/millisleep.c;
+  i386_pc = term/i386/pc/console.c;
+  i386_pc = term/i386/vga_common.c;
+
+  i386_efi = kern/i386/efi/startup.S;
+  i386_efi = kern/mm.c;
+  i386_efi = kern/i386/dl.c;
+  i386_efi = kern/i386/efi/init.c;
+  i386_efi = kern/efi/efi.c;
+  i386_efi = kern/efi/init.c;
+  i386_efi = kern/efi/mm.c;
+  i386_efi = kern/time.c;
+  i386_efi = kern/i386/tsc.c;
+  i386_efi = kern/i386/pit.c;
+  i386_efi = kern/generic/rtc_get_time_ms.c;
+  i386_efi = kern/generic/millisleep.c;
+  i386_efi = term/efi/console.c;
+  i386_efi = disk/efi/efidisk.c;
+
+  i386_coreboot = kern/i386/coreboot/startup.S;
+  i386_coreboot = kern/i386/misc.S;
+  i386_coreboot = kern/i386/coreboot/init.c;
+  i386_coreboot = kern/i386/coreboot/mmap.c;
+  i386_coreboot = kern/i386/halt.c;
+  i386_coreboot = kern/mm.c;
+  i386_coreboot = kern/time.c;
+  i386_coreboot = kern/i386/dl.c;
+  i386_coreboot = kern/i386/tsc.c;
+  i386_coreboot = kern/i386/pit.c;
+  i386_coreboot = kern/generic/rtc_get_time_ms.c;
+  i386_coreboot = kern/generic/millisleep.c;
+  i386_coreboot = term/i386/pc/vga_text.c;
+  i386_coreboot = term/i386/vga_common.c;
+
+  i386_qemu = kern/i386/qemu/startup.S;
+  i386_qemu = kern/i386/misc.S;
+  i386_qemu = kern/i386/coreboot/init.c;
+  i386_qemu = kern/i386/qemu/mmap.c;
+  i386_qemu = kern/i386/halt.c;
+  i386_qemu = kern/mm.c;
+  i386_qemu = kern/time.c;
+  i386_qemu = kern/i386/dl.c;
+  i386_qemu = kern/i386/tsc.c;
+  i386_qemu = kern/i386/pit.c;
+  i386_qemu = kern/generic/rtc_get_time_ms.c;
+  i386_qemu = kern/generic/millisleep.c;
+  i386_qemu = term/i386/pc/vga_text.c;
+  i386_qemu = term/i386/vga_common.c;
+
+  i386_ieee1275 = kern/i386/ieee1275/startup.S;
+  i386_ieee1275 = kern/i386/misc.S;
+  i386_ieee1275 = kern/i386/ieee1275/init.c;
+  i386_ieee1275 = kern/ieee1275/init.c;
+  i386_ieee1275 = kern/ieee1275/mmap.c;
+  i386_ieee1275 = kern/ieee1275/cmain.c;
+  i386_ieee1275 = kern/ieee1275/openfw.c;
+  i386_ieee1275 = kern/mm.c;
+  i386_ieee1275 = kern/i386/dl.c;
+  i386_ieee1275 = kern/time.c;
+  i386_ieee1275 = kern/generic/millisleep.c;
+  i386_ieee1275 = kern/ieee1275/ieee1275.c;
+  i386_ieee1275 = term/ieee1275/ofconsole.c;
+  i386_ieee1275 = disk/ieee1275/ofdisk.c;
+
+  x86_64_efi = kern/x86_64/efi/startup.S;
+  x86_64_efi = kern/x86_64/efi/callwrap.S;
+  x86_64_efi = kern/mm.c;
+  x86_64_efi = kern/x86_64/dl.c;
+  x86_64_efi = kern/i386/efi/init.c;
+  x86_64_efi = kern/efi/efi.c;
+  x86_64_efi = kern/efi/init.c;
+  x86_64_efi = kern/efi/mm.c;
+  x86_64_efi = kern/time.c;
+  x86_64_efi = kern/i386/tsc.c;
+  x86_64_efi = kern/i386/pit.c;
+  x86_64_efi = kern/generic/millisleep.c;
+  x86_64_efi = kern/generic/rtc_get_time_ms.c;
+  x86_64_efi = term/efi/console.c;
+  x86_64_efi = disk/efi/efidisk.c;
+
+  mips_yeeloong = kern/mips/startup.S;
+  mips_yeeloong = kern/mips/init.c;
+  mips_yeeloong = kern/mips/yeeloong/init.c;
+  mips_yeeloong = kern/mm.c;
+  mips_yeeloong = kern/mips/dl.c;
+  mips_yeeloong = kern/generic/millisleep.c;
+  mips_yeeloong = kern/generic/rtc_get_time_ms.c;
+  mips_yeeloong = kern/time.c;
+  mips_yeeloong = kern/mips/cache.S;
+  mips_yeeloong = io/bufio.c;
+  mips_yeeloong = lib/arg.c;
+  mips_yeeloong = commands/extcmd.c;
+  mips_yeeloong = bus/pci.c;
+  mips_yeeloong = bus/bonito.c;
+  mips_yeeloong = font/font_cmd.c;
+  mips_yeeloong = font/font.c;
+  mips_yeeloong = term/at_keyboard.c;
+  mips_yeeloong = term/gfxterm.c;
+  mips_yeeloong = video/video.c;
+  mips_yeeloong = video/fb/video_fb.c;
+  mips_yeeloong = video/fb/fbblit.c;
+  mips_yeeloong = video/fb/fbfill.c;
+  mips_yeeloong = video/fb/fbutil.c;
+  mips_yeeloong = video/bitmap.c;
+  mips_yeeloong = video/bitmap_scale.c;
+  mips_yeeloong = video/sm712.c;
+
+  powerpc_ieee1275 = kern/powerpc/ieee1275/startup.S;
+  powerpc_ieee1275 = kern/ieee1275/cmain.c;
+  powerpc_ieee1275 = kern/ieee1275/ieee1275.c;
+  powerpc_ieee1275 = kern/mm.c;
+  powerpc_ieee1275 = kern/ieee1275/init.c;
+  powerpc_ieee1275 = kern/ieee1275/mmap.c;
+  powerpc_ieee1275 = kern/ieee1275/openfw.c;
+  powerpc_ieee1275 = kern/powerpc/dl.c;
+  powerpc_ieee1275 = kern/generic/millisleep.c;
+  powerpc_ieee1275 = kern/time.c;
+  powerpc_ieee1275 = kern/powerpc/cache.S;
+  powerpc_ieee1275 = term/ieee1275/ofconsole.c;
+  powerpc_ieee1275 = disk/ieee1275/ofdisk.c;
+
+  sparc64_ieee1275 = kern/sparc64/ieee1275/crt0.S;
+  sparc64_ieee1275 = kern/ieee1275/cmain.c;
+  sparc64_ieee1275 = kern/ieee1275/ieee1275.c;
+  sparc64_ieee1275 = kern/mm.c;
+  sparc64_ieee1275 = kern/sparc64/ieee1275/ieee1275.c;
+  sparc64_ieee1275 = kern/sparc64/ieee1275/init.c;
+  sparc64_ieee1275 = kern/ieee1275/mmap.c;
+  sparc64_ieee1275 = kern/ieee1275/openfw.c;
+  sparc64_ieee1275 = kern/sparc64/dl.c;
+  sparc64_ieee1275 = kern/generic/millisleep.c;
+  sparc64_ieee1275 = kern/time.c;
+  sparc64_ieee1275 = kern/sparc64/cache.S;
+  sparc64_ieee1275 = disk/ieee1275/ofdisk.c;
+  sparc64_ieee1275 = term/ieee1275/ofconsole.c;
+
+  emu = kern/emu/misc.c;
+  emu = kern/emu/getroot.c;
+  emu = kern/emu/time.c;
+  emu = kern/emu/hostdisk.c;
+  emu = kern/emu/hostfs.c;
+  emu = kern/emu/console.c;
+  emu = disk/host.c;
+
+  image_nostrip = { emu; };
+  image_strip_keep_kernel = { i386_efi; x86_64_efi; };
+  image_strip = { powerpc_ieee1275; i386_coreboot; i386_ieee1275; };
+  image_strip_macho2img = { mips_yeeloong; i386_pc; i386_qemu; sparc64_ieee1275; };
+};
+
+program = {
+  name = grub-emu;
+  mansection = 1;
+
+  source = kern/emu/main.c;
+  source = kern/emu/dummy/dl.c;
+  source = kern/emu/dummy/symlist.c;
+  source = gnulib/progname.c;
+
+  nodist = grub_emu_init.c;
+
+  cflags = '$(CFLAGS_GNULIB)';
+  cppflags = '$(CPPFLAGS_GNULIB)';
+
+  ldadd = kernel.exec;
+  ldadd = '$(MODULE_FILES)';
+  ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)';
+
+  emu;
+};
+
+program = {
+  name = grub-emu-lite;
+
+  source = kern/emu/main.c;
+  source = kern/emu/lite.c;
+  source = kern/emu/dl.c;
+  source = kern/emu/cache.S;
+  source = gnulib/progname.c;
+  nodist = symlist.c;
+
+  cflags = '$(CFLAGS_GNULIB)';
+  cppflags = '$(CPPFLAGS_GNULIB)';
+
+  ldadd = kernel.exec;
+  ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)';
+
+  emu;
+};
+
+module = {
+  name = trig;
+  nodist = trigtables.c;
+  common;
+};
+
+image = {
+  name = boot;
+  i386_pc = boot/i386/pc/boot.S;
+  i386_pc_ldflags = "-Wl,-Ttext=0x7C00";
+
+  i386_qemu = boot/i386/qemu/boot.S;
+  i386_qemu_ldflags = '-Wl,-Ttext,$(GRUB_BOOT_MACHINE_LINK_ADDR)';
+  i386_qemu_ccasflags = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
+
+  sparc64_ieee1275 = boot/sparc64/ieee1275/boot.S;
+  sparc64_ieee1275_format = a.out-sunos-big;
+  sparc64_ieee1275_ldflags = ' -Wl,-Ttext=0x4000';
+};
+
+image = {
+  name = cdboot;
+  source = boot/i386/pc/cdboot.S;
+  ldflags = "-Wl,-Ttext=0x7C00";
+
+  i386_pc;
+};
+
+image = {
+  name = pxeboot;
+  source = boot/i386/pc/pxeboot.S;
+  ldflags = '-Wl,-Ttext=0x7C00';
+
+  i386_pc;
+};
+
+image = {
+  name = diskboot;
+  i386_pc = boot/i386/pc/diskboot.S;
+  i386_pc_ldflags = '-Wl,-Ttext=0x8000';
+
+  sparc64_ieee1275 = boot/sparc64/ieee1275/diskboot.S;
+  sparc64_ieee1275_ldflags = '-Wl,-Ttext=0x4200';
+};
+
+image = {
+  name = lnxboot;
+  source = boot/i386/pc/lnxboot.S;
+  ldflags = '-Wl,-Ttext=0x6000';
+
+  i386_pc;
+};
+
+module = {
+  name = libusb;
+  source = bus/usb/emu/usb.c;
+  emu;
+  enable = COND_GRUB_EMU_USB;
+};
+
+module = {
+  name = pci;
+  source = bus/emu/pci.c;
+  source = commands/lspci.c;
+  emu;
+  enable = COND_GRUB_EMU_PCI;
+};
+
+module = {
+  name = usb;
+  source = bus/usb/usb.c;
+  source = bus/usb/usbtrans.c;
+  source = bus/usb/usbhub.c;
+  i386;
+};
+
+module = {
+  name = usb;
+  source = bus/usb/usb.c;
+  emu;
+  enable = COND_GRUB_EMU_USB;
+};
+
+module = {
+  name = uhci;
+  source = bus/usb/uhci.c;
+  x86;
+};
+
+module = {
+  name = ohci;
+  source = bus/usb/ohci.c;
+  x86;
+};
+
+module = {
+  name = pci;
+  source = bus/pci.c;
+  x86;
+};
+
+library = {
+  name = libgnulib.a;
+  source = gnulib/regex.c;
+  cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
+  common;
+};
+
+module = {
+  name = iorw;
+  source = commands/iorw.c;
+  i386;
+};
+
+module = {
+  name = regexp;
+  source = commands/regexp.c;
+  ldadd = libgnulib.a;
+  cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+  cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
+  common;
+};
+
+module = {
+  name = acpi;
+
+  x86_efi = commands/acpi.c;
+  x86_efi = commands/efi/acpi.c;
+
+  i386_pc = commands/acpi.c;
+  i386_pc = commands/i386/pc/acpi.c;
+};
+
+module = {
+  common;
+  name = blocklist;
+  source = commands/blocklist.c;
+};
+
+module = {
+  common;
+  name = boot;
+  source = commands/boot.c;
+
+  i386_pc = commands/boot.c;
+  i386_pc = lib/i386/pc/biosnum.c;
+};
+
+module = {
+  common;
+  name = cat;
+  source = commands/cat.c;
+};
+
+module = {
+  common;
+  name = cmp;
+  source = commands/cmp.c;
+};
+
+module = {
+  common;
+  name = configfile;
+  source = commands/configfile.c;
+};
+
+module = {
+  name = cpuid;
+  source = commands/i386/cpuid.c;
+
+  x86;
+};
+
+module = {
+  common;
+  name = crc;
+  source = commands/crc.c;
+  source = lib/crc.c;
+};
+
+module = {
+  common;
+  name = date;
+  source = commands/date.c;
+
+  x86;
+  mips;
+};
+
+module = {
+  name = drivemap;
+
+  i386_pc = commands/i386/pc/drivemap.c;
+  i386_pc = commands/i386/pc/drivemap_int13h.S;
+};
+
+module = {
+  common;
+  name = echo;
+  source = commands/echo.c;
+};
+
+module = {
+  common;
+  name = extcmd;
+  source = commands/extcmd.c;
+  source = lib/arg.c;
+};
+
+module = {
+  name = fixvideo;
+  x86_efi = commands/efi/fixvideo.c;
+};
+
+module = {
+  common;
+  name = gptsync;
+  source = commands/gptsync.c;
+};
+
+module = {
+  name = halt;
+  source = commands/halt.c;
+
+  i386_pc = commands/i386/pc/halt.c;
+  emu;
+  x86;
+  sparc64;
+  powerpc;
+};
+
+module = {
+  common;
+  name = handler;
+  source = commands/handler.c;
+};
+
+module = {
+  common;
+  name = hashsum;
+  source = commands/hashsum.c;
+};
+
+module = {
+  name = hdparm;
+  source = commands/hdparm.c;
+  source = lib/hexdump.c;
+
+  i386_pc;
+};
+
+module = {
+  common;
+  name = help;
+  source = commands/help.c;
+};
+
+module = {
+  common;
+  name = hexdump;
+  source = commands/hexdump.c;
+  source = lib/hexdump.c;
+};
+
+module = {
+  common;
+  name = keystatus;
+  source = commands/keystatus.c;
+};
+
+module = {
+  name = loadbios;
+  x86_efi = commands/efi/loadbios.c;
+};
+
+module = {
+  common;
+  name = loadenv;
+  source = commands/loadenv.c;
+  source = lib/envblk.c;
+};
+
+module = {
+  common;
+  name = ls;
+  source = commands/ls.c;
+};
+
+module = {
+  common;
+  name = lsmmap;
+  source = commands/lsmmap.c;
+
+  i386_pc;
+  i386_qemu;
+  i386_coreboot;
+  i386_ieee1275;
+  mips_yeeloong;
+  powerpc_ieee1275;
+};
+
+module = {
+  name = lspci;
+  source = commands/lspci.c;
+
+  x86;
+  mips;
+};
+
+module = {
+  common;
+  name = memrw;
+  source = commands/memrw.c;
+};
+
+module = {
+  common;
+  name = minicmd;
+  source = commands/minicmd.c;
+};
+
+module = {
+  common;
+  name = parttool;
+  source = commands/parttool.c;
+};
+
+module = {
+  common;
+  name = password;
+  source = commands/password.c;
+};
+
+module = {
+  common;
+  name = password_pbkdf2;
+  source = commands/password_pbkdf2.c;
+};
+
+module = {
+  name = play;
+  source = commands/i386/pc/play.c;
+  i386;
+};
+
+module = {
+  common;
+  name = probe;
+  source = commands/probe.c;
+};
+
+module = {
+  name = pxecmd;
+  i386_pc = commands/i386/pc/pxecmd.c;
+};
+
+module = {
+  common;
+  name = read;
+  source = commands/read.c;
+};
+
+module = {
+  common;
+  name = reboot;
+  source = commands/reboot.c;
+
+  x86; powerpc; sparc64;
+};
+
+module = {
+  common;
+  name = search;
+  source = commands/search_wrap.c;
+};
+
+module = {
+  common;
+  name = search_fs_file;
+  source = commands/search_file.c;
+};
+
+module = {
+  common;
+  name = search_fs_uuid;
+  source = commands/search_uuid.c;
+};
+
+module = {
+  common;
+  name = search_label;
+  source = commands/search_label.c;
+};
+
+module = {
+  name = setpci;
+  source = commands/setpci.c;
+
+  x86;
+};
+
+module = {
+  common;
+  name = sleep;
+  source = commands/sleep.c;
+};
+
+module = {
+  name = suspend;
+  source = commands/ieee1275/suspend.c;
+  i386_ieee1275;
+  powerpc_ieee1275;
+};
+
+module = {
+  common;
+  name = terminal;
+  source = commands/terminal.c;
+};
+
+module = {
+  common;
+  name = test;
+  source = commands/test.c;
+};
+
+module = {
+  common;
+  name = true;
+  source = commands/true.c;
+};
+
+module = {
+  name = usbtest;
+  source = commands/usbtest.c;
+  i386_pc;
+};
+
+module = {
+  name = usbtest;
+  source = commands/usbtest.c;
+  emu;
+  enable = COND_GRUB_EMU_USB;
+};
+
+module = {
+  name = vbeinfo;
+  i386_pc = commands/i386/pc/vbeinfo.c;
+};
+
+module = {
+  name = vbetest;
+  i386_pc = commands/i386/pc/vbetest.c;
+};
+
+module = {
+  common;
+  name = videotest;
+  source = commands/videotest.c;
+};
+
+module = {
+  common;
+  name = xnu_uuid;
+  source = commands/xnu_uuid.c;
+};
+
+module = {
+  common;
+  name = dm_nv;
+  source = disk/dmraid_nvidia.c;
+};
+
+module = {
+  common;
+  name = loopback;
+  source = disk/loopback.c;
+};
+
+module = {
+  common;
+  name = lvm;
+  source = disk/lvm.c;
+};
+
+module = {
+  common;
+  name = mdraid;
+  source = disk/mdraid_linux.c;
+};
+
+module = {
+  common;
+  name = raid;
+  source = disk/raid.c;
+};
+
+module = {
+  common;
+  name = raid5rec;
+  source = disk/raid5_recover.c;
+};
+
+module = {
+  common;
+  name = raid6rec;
+  source = disk/raid6_recover.c;
+};
+
+module = {
+  common;
+  name = scsi;
+  source = disk/scsi.c;
+};
+
+module = {
+  common;
+  name = memdisk;
+  source = disk/memdisk.c;
+};
+
+module = {
+  name = ata;
+  source = disk/ata.c;
+
+  x86;
+  mips;
+};
+
+module = {
+  name = ata_pthru;
+  source = disk/ata_pthru.c;
+
+  x86;
+  mips_yeeloong;
+};
+
+module = {
+  name = biosdisk;
+  i386_pc = disk/i386/pc/biosdisk.c;
+};
+
+module = {
+  name = usbms;
+  source = disk/usbms.c;
+  i386_pc;
+};
+
+module = {
+  name = usbms;
+  source = disk/usbms.c;
+  emu;
+  enable = COND_GRUB_EMU_USB;
+};
+
+module = {
+  name = nand;
+  source = disk/ieee1275/nand.c;
+
+  i386_ieee1275;
+};
+
+module = {
+  name = efiemu;
+  i386_pc = efiemu/main.c;
+  i386_pc = efiemu/i386/loadcore32.c;
+  i386_pc = efiemu/i386/loadcore64.c;
+  i386_pc = efiemu/i386/pc/cfgtables.c;
+  i386_pc = efiemu/mm.c;
+  i386_pc = efiemu/loadcore_common.c;
+  i386_pc = efiemu/symbols.c;
+  i386_pc = efiemu/loadcore32.c;
+  i386_pc = efiemu/loadcore64.c;
+  i386_pc = efiemu/prepare32.c;
+  i386_pc = efiemu/prepare64.c;
+  i386_pc = efiemu/pnvram.c;
+  i386_pc = efiemu/i386/coredetect.c;
+};
+
+module = {
+  name = font;
+  source = font/font.c;
+  source = font/font_cmd.c;
+  emu;
+  x86;
+  sparc64;
+  powerpc;
+};
+
+module = {
+  common;
+  name = affs;
+  source = fs/affs.c;
+};
+
+module = {
+  common;
+  name = afs;
+  source = fs/afs.c;
+};
+
+module = {
+  common;
+  name = afs_be;
+  source = fs/afs_be.c;
+};
+
+module = {
+  common;
+  name = befs;
+  source = fs/befs.c;
+};
+
+module = {
+  common;
+  name = befs_be;
+  source = fs/befs_be.c;
+};
+
+module = {
+  common;
+  name = cpio;
+  source = fs/cpio.c;
+};
+
+module = {
+  common;
+  name = ext2;
+  source = fs/ext2.c;
+};
+
+module = {
+  common;
+  name = fat;
+  source = fs/fat.c;
+};
+
+module = {
+  common;
+  name = fshelp;
+  source = fs/fshelp.c;
+};
+
+module = {
+  common;
+  name = hfs;
+  source = fs/hfs.c;
+};
+
+module = {
+  common;
+  name = hfsplus;
+  source = fs/hfsplus.c;
+};
+
+module = {
+  common;
+  name = iso9660;
+  source = fs/iso9660.c;
+};
+
+module = {
+  common;
+  name = jfs;
+  source = fs/jfs.c;
+};
+
+module = {
+  common;
+  name = minix;
+  source = fs/minix.c;
+};
+
+module = {
+  common;
+  name = nilfs2;
+  source = fs/nilfs2.c;
+};
+
+module = {
+  common;
+  name = ntfs;
+  source = fs/ntfs.c;
+};
+
+module = {
+  common;
+  name = ntfscomp;
+  source = fs/ntfscomp.c;
+};
+
+module = {
+  common;
+  name = reiserfs;
+  source = fs/reiserfs.c;
+};
+
+module = {
+  common;
+  name = sfs;
+  source = fs/sfs.c;
+};
+
+module = {
+  common;
+  name = tar;
+  source = fs/tar.c;
+};
+
+module = {
+  common;
+  name = udf;
+  source = fs/udf.c;
+};
+
+module = {
+  common;
+  name = ufs1;
+  source = fs/ufs.c;
+};
+
+module = {
+  common;
+  name = ufs2;
+  source = fs/ufs2.c;
+};
+
+module = {
+  common;
+  name = xfs;
+  source = fs/xfs.c;
+};
+
+module = {
+  name = pxe;
+  i386_pc = fs/i386/pc/pxe.c;
+};
+
+module = {
+  name = gettext;
+  source = gettext/gettext.c;
+  common;
+};
+
+module = {
+  common;
+  name = gfxmenu;
+  source = gfxmenu/gfxmenu.c;
+  source = gfxmenu/model.c;
+  source = gfxmenu/view.c;
+  source = gfxmenu/icon_manager.c;
+  source = gfxmenu/theme_loader.c;
+  source = gfxmenu/widget-box.c;
+  source = gfxmenu/gui_canvas.c;
+  source = gfxmenu/gui_circular_progress.c;
+  source = gfxmenu/gui_box.c;
+  source = gfxmenu/gui_label.c;
+  source = gfxmenu/gui_list.c;
+  source = gfxmenu/gui_image.c;
+  source = gfxmenu/gui_progress_bar.c;
+  source = gfxmenu/gui_util.c;
+  source = gfxmenu/gui_string_util.c;
+  source = gfxmenu/named_colors.c;
+};
+
+module = {
+  common;
+  name = hello;
+  source = hello/hello.c;
+};
+
+module = {
+  common;
+  name = gzio;
+  source = io/gzio.c;
+};
+
+module = {
+  name = bufio;
+  source = io/bufio.c;
+  emu;
+  x86;
+  sparc64;
+  powerpc;
+};
+
+module = {
+  common;
+  name = elf;
+  source = kern/elf.c;
+};
+
+module = {
+  common;
+  name = charset;
+  source = lib/charset.c;
+};
+
+module = {
+  common;
+  name = crypto;
+  source = lib/crypto.c;
+};
+
+module = {
+  common;
+  name = gcry_arcfour;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/arcfour.c;
+};
+
+module = {
+  common;
+  name = gcry_blowfish;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/blowfish.c;
+};
+
+module = {
+  common;
+  name = gcry_camellia;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/camellia.c;
+  source = lib/libgcrypt-grub/cipher/camellia-glue.c;
+};
+
+module = {
+  common;
+  name = gcry_cast5;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/cast5.c;
+};
+
+module = {
+  common;
+  name = gcry_crc;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/crc.c;
+};
+
+module = {
+  common;
+  name = gcry_des;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/des.c;
+};
+
+module = {
+  common;
+  name = gcry_md4;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/md4.c;
+};
+
+module = {
+  common;
+  name = gcry_md5;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/md5.c;
+};
+
+module = {
+  common;
+  name = gcry_rfc2268;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/rfc2268.c;
+};
+
+module = {
+  common;
+  name = gcry_rijndael;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/rijndael.c;
+};
+
+module = {
+  common;
+  name = gcry_rmd160;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/rmd160.c;
+};
+
+module = {
+  common;
+  name = gcry_seed;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/seed.c;
+};
+
+module = {
+  common;
+  name = gcry_serpent;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/serpent.c;
+};
+
+module = {
+  common;
+  name = gcry_sha1;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/sha1.c;
+};
+
+module = {
+  common;
+  name = gcry_sha256;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/sha256.c;
+};
+
+module = {
+  common;
+  name = gcry_sha512;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/sha512.c;
+};
+
+module = {
+  common;
+  name = gcry_tiger;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/tiger.c;
+};
+
+module = {
+  common;
+  name = gcry_twofish;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/twofish.c;
+};
+
+module = {
+  common;
+  name = gcry_whirlpool;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  source = lib/libgcrypt-grub/cipher/whirlpool.c;
+};
+
+module = {
+  common;
+  name = pbkdf2;
+  source = lib/pbkdf2.c;
+};
+
+module = {
+  name = relocator;
+  mips = lib/mips/relocator.c;
+  mips = lib/mips/relocator_asm.S;
+  x86 = lib/i386/relocator.c;
+  x86 = lib/i386/relocator_asm.S;
+  x86 = lib/i386/relocator_backward.S;
+};
+
+module = {
+  name = datetime;
+  source = lib/cmos_datetime.c;
+  x86_efi = lib/efi/datetime.c;
+  sparc64_ieee1275 = lib/ieee1275/datetime.c;
+  powerpc_ieee1275 = lib/ieee1275/datetime.c;
+  x86;
+  mips;
+};
+
+module = {
+  name = setjmp;
+  i386 = lib/i386/setjmp.S;
+  x86_64 = lib/x86_64/setjmp.S;
+  mips = lib/mips/setjmp.S;
+  sparc64 = lib/sparc64/setjmp.S;
+  powerpc = lib/powerpc/setjmp.S;
+};
+
+module = {
+  name = aout;
+  source = loader/aout.c;
+  i386_pc;
+  i386_qemu;
+  i386_coreboot;
+  i386_ieee1275;
+};
+
+module = {
+  name = bsd;
+  source = loader/i386/bsd.c;
+  source = loader/i386/bsd32.c;
+  source = loader/i386/bsd64.c;
+  source = loader/i386/bsd_helper.S;
+  source = loader/i386/bsd_trampoline.S;
+  i386_pc;
+  i386_qemu;
+  i386_coreboot;
+};
+
+module = {
+  name = linux16;
+  source = loader/i386/pc/linux.c;
+  i386_pc;
+};
+
+module = {
+  name = multiboot2;
+  cppflags = "-DGRUB_USE_MULTIBOOT2";
+
+  source = loader/multiboot.c;
+  source = loader/multiboot_mbi2.c;
+  x86;
+  mips;
+};
+
+module = {
+  name = multiboot;
+  source = loader/multiboot.c;
+  source = loader/i386/multiboot_mbi.c;
+  x86;
+};
+
+module = {
+  name = linux;
+  i386 = loader/i386/linux.c;
+  i386_efi = loader/i386/efi/linux.c;
+  i386_ieee1275 = loader/i386/ieee1275/linux.c;
+  x86_64_efi = loader/i386/efi/linux.c;
+  x86_64_efi = loader/i386/linux_trampoline.S;
+  mips = loader/mips/linux.c;
+  powerpc_ieee1275 = loader/powerpc/ieee1275/linux.c;
+  sparc64_ieee1275 = loader/sparc64/ieee1275/linux.c;
+};
+
+module = {
+  name = xnu;
+  x86_efi = loader/xnu_resume.c;
+  x86_efi = loader/i386/xnu.c;
+  x86_efi = loader/i386/efi/xnu.c;
+  x86_efi = loader/macho32.c;
+  x86_efi = loader/macho64.c;
+  x86_efi = loader/macho.c;
+  x86_efi = loader/xnu.c;
+
+  i386_pc = loader/xnu_resume.c;
+  i386_pc = loader/i386/xnu.c;
+  i386_pc = loader/i386/pc/xnu.c;
+  i386_pc = loader/macho32.c;
+  i386_pc = loader/macho64.c;
+  i386_pc = loader/macho.c;
+  i386_pc = loader/xnu.c;
+};
+
+module = {
+  name = appleldr;
+  x86_efi = loader/efi/appleloader.c;
+};
+
+module = {
+  name = chain;
+  x86_efi = loader/efi/chainloader.c;
+  i386_pc = loader/i386/pc/chainloader.c;
+};
+
+module = {
+  name = mmap;
+  i386_pc = mmap/mmap.c;
+  i386_pc = mmap/i386/uppermem.c;
+  i386_pc = mmap/i386/mmap.c;
+  i386_pc = mmap/i386/pc/mmap.c;
+  i386_pc = mmap/i386/pc/mmap_helper.S;
+
+  x86_efi = mmap/mmap.c;
+  x86_efi = mmap/i386/uppermem.c;
+  x86_efi = mmap/i386/mmap.c;
+  x86_efi = mmap/efi/mmap.c;
+
+  i386_coreboot = mmap/mmap.c;
+  i386_coreboot = mmap/i386/uppermem.c;
+  i386_coreboot = mmap/i386/mmap.c;
+
+  i386_qemu = mmap/mmap.c;
+  i386_qemu = mmap/i386/uppermem.c;
+  i386_qemu = mmap/i386/mmap.c;
+
+  i386_ieee1275 = mmap/mmap.c;
+  i386_ieee1275 = mmap/i386/uppermem.c;
+  i386_ieee1275 = mmap/i386/mmap.c;
+
+  mips_yeeloong = mmap/mmap.c;
+  mips_yeeloong = mmap/mips/yeeloong/uppermem.c;
+};
+
+module = {
+  common;
+  name = normal;
+  source = normal/main.c;
+  source = normal/cmdline.c;
+  source = normal/dyncmd.c;
+  source = normal/auth.c;
+  source = normal/autofs.c;
+  source = normal/handler.c;
+  source = normal/color.c;
+  source = normal/completion.c;
+  source = normal/datetime.c;
+  source = normal/menu.c;
+  source = normal/menu_entry.c;
+  source = normal/menu_text.c;
+  source = normal/misc.c;
+  source = normal/crypto.c;
+  source = normal/term.c;
+  source = normal/context.c;
+};
+
+module = {
+  common;
+  name = part_acorn;
+  source = partmap/acorn.c;
+};
+
+module = {
+  common;
+  name = part_amiga;
+  source = partmap/amiga.c;
+};
+
+module = {
+  common;
+  name = part_apple;
+  source = partmap/apple.c;
+};
+
+module = {
+  common;
+  name = part_gpt;
+  source = partmap/gpt.c;
+};
+
+module = {
+  common;
+  name = part_msdos;
+  source = partmap/msdos.c;
+};
+
+module = {
+  common;
+  name = part_sun;
+  source = partmap/sun.c;
+};
+
+module = {
+  common;
+  name = part_bsd;
+  source = partmap/bsdlabel.c;
+};
+
+module = {
+  common;
+  name = part_sunpc;
+  source = partmap/sunpc.c;
+};
+
+module = {
+  common;
+  name = msdospart;
+  source = parttool/msdospart.c;
+};
+
+module = {
+  common;
+  name = sh;
+  source = script/main.c;
+  source = script/script.c;
+  source = script/execute.c;
+  source = script/function.c;
+  source = script/lexer.c;
+  nodist = grub_script.tab.c;
+  nodist = grub_script.yy.c;
+  nodist = grub_script.tab.h;
+  nodist = grub_script.yy.h;
+  cflags = '$(CFLAGS_POSIX) -Wno-error';
+  cppflags = '$(CPPFLAGS_POSIX)';
+};
+
+module = {
+  name = at_keyboard;
+  source = term/at_keyboard.c;
+  x86;
+};
+
+module = {
+  name = gfxterm;
+  source = term/gfxterm.c;
+  emu;
+  x86;
+  sparc64;
+  powerpc;
+};
+
+module = {
+  name = serial;
+  source = term/serial.c;
+  mips;
+  i386;
+};
+
+module = {
+  common;
+  name = terminfo;
+  source = term/terminfo.c;
+  source = term/tparm.c;
+};
+
+module = {
+  name = usb_keyboard;
+  source = term/usb_keyboard.c;
+  i386_pc;
+};
+
+module = {
+  name = vga;
+  i386_pc = term/i386/pc/vga.c;
+};
+
+module = {
+  name = vga_text;
+  x86 = term/i386/pc/vga_text.c;
+  x86 = term/i386/vga_common.c;
+};
+
+module = {
+  name = functional_test;
+  source = tests/lib/functional_test.c;
+  source = tests/lib/test.c;
+  common;
+};
+
+module = {
+  name = example_functional_test;
+  source = tests/example_functional_test.c;
+  cflags = -Wno-format;
+  common;
+};
+
+module = {
+  name = bitmap;
+  source = video/bitmap.c;
+  emu;
+  x86;
+  sparc64;
+  powerpc;
+};
+
+module = {
+  name = bitmap_scale;
+  source = video/bitmap_scale.c;
+  emu;
+  x86;
+  sparc64;
+  powerpc;
+};
+
+module = {
+  name = efi_gop;
+  x86_efi = video/efi_gop.c;
+};
+
+module = {
+  name = efi_uga;
+  x86_efi = video/efi_uga.c;
+};
+
+module = {
+  common;
+  name = jpeg;
+  source = video/readers/jpeg.c;
+};
+
+module = {
+  common;
+  name = png;
+  source = video/readers/png.c;
+};
+
+module = {
+  common;
+  name = tga;
+  source = video/readers/tga.c;
+};
+
+module = {
+  name = vbe;
+  i386_pc = video/i386/pc/vbe.c;
+};
+
+module = {
+  name = video_fb;
+  source = video/fb/video_fb.c;
+  source = video/fb/fbblit.c;
+  source = video/fb/fbfill.c;
+  source = video/fb/fbutil.c;
+  emu;
+  x86;
+  sparc64;
+  powerpc;
+};
+
+module = {
+  name = video;
+  source = video/video.c;
+  emu;
+  x86;
+  sparc64;
+  powerpc;
+};
+
+module = {
+  name = ieee1275_fb;
+  source = video/ieee1275.c;
+  powerpc;
+  sparc64;
+};
+
+module = {
+  name = sdl;
+  source = video/emu/sdl.c;
+  enable = COND_GRUB_EMU_SDL;
+  emu;
+};
+
+module = {
+  name = datehook;
+  source = hook/datehook.c;
+  common;
+};
diff --git a/normal/auth.c b/grub-core/normal/auth.c
similarity index 100%
rename from normal/auth.c
rename to grub-core/normal/auth.c
diff --git a/normal/autofs.c b/grub-core/normal/autofs.c
similarity index 100%
rename from normal/autofs.c
rename to grub-core/normal/autofs.c
diff --git a/normal/cmdline.c b/grub-core/normal/cmdline.c
similarity index 100%
rename from normal/cmdline.c
rename to grub-core/normal/cmdline.c
diff --git a/normal/color.c b/grub-core/normal/color.c
similarity index 100%
rename from normal/color.c
rename to grub-core/normal/color.c
diff --git a/normal/completion.c b/grub-core/normal/completion.c
similarity index 100%
rename from normal/completion.c
rename to grub-core/normal/completion.c
diff --git a/normal/context.c b/grub-core/normal/context.c
similarity index 100%
rename from normal/context.c
rename to grub-core/normal/context.c
diff --git a/normal/crypto.c b/grub-core/normal/crypto.c
similarity index 100%
rename from normal/crypto.c
rename to grub-core/normal/crypto.c
diff --git a/normal/datetime.c b/grub-core/normal/datetime.c
similarity index 100%
rename from normal/datetime.c
rename to grub-core/normal/datetime.c
diff --git a/normal/dyncmd.c b/grub-core/normal/dyncmd.c
similarity index 100%
rename from normal/dyncmd.c
rename to grub-core/normal/dyncmd.c
diff --git a/normal/handler.c b/grub-core/normal/handler.c
similarity index 100%
rename from normal/handler.c
rename to grub-core/normal/handler.c
diff --git a/normal/main.c b/grub-core/normal/main.c
similarity index 100%
rename from normal/main.c
rename to grub-core/normal/main.c
diff --git a/normal/menu.c b/grub-core/normal/menu.c
similarity index 100%
rename from normal/menu.c
rename to grub-core/normal/menu.c
diff --git a/normal/menu_entry.c b/grub-core/normal/menu_entry.c
similarity index 100%
rename from normal/menu_entry.c
rename to grub-core/normal/menu_entry.c
diff --git a/normal/menu_text.c b/grub-core/normal/menu_text.c
similarity index 100%
rename from normal/menu_text.c
rename to grub-core/normal/menu_text.c
diff --git a/normal/misc.c b/grub-core/normal/misc.c
similarity index 100%
rename from normal/misc.c
rename to grub-core/normal/misc.c
diff --git a/normal/term.c b/grub-core/normal/term.c
similarity index 100%
rename from normal/term.c
rename to grub-core/normal/term.c
diff --git a/partmap/acorn.c b/grub-core/partmap/acorn.c
similarity index 100%
rename from partmap/acorn.c
rename to grub-core/partmap/acorn.c
diff --git a/partmap/amiga.c b/grub-core/partmap/amiga.c
similarity index 100%
rename from partmap/amiga.c
rename to grub-core/partmap/amiga.c
diff --git a/partmap/apple.c b/grub-core/partmap/apple.c
similarity index 100%
rename from partmap/apple.c
rename to grub-core/partmap/apple.c
diff --git a/partmap/bsdlabel.c b/grub-core/partmap/bsdlabel.c
similarity index 100%
rename from partmap/bsdlabel.c
rename to grub-core/partmap/bsdlabel.c
diff --git a/partmap/gpt.c b/grub-core/partmap/gpt.c
similarity index 100%
rename from partmap/gpt.c
rename to grub-core/partmap/gpt.c
diff --git a/partmap/msdos.c b/grub-core/partmap/msdos.c
similarity index 100%
rename from partmap/msdos.c
rename to grub-core/partmap/msdos.c
diff --git a/partmap/sun.c b/grub-core/partmap/sun.c
similarity index 100%
rename from partmap/sun.c
rename to grub-core/partmap/sun.c
diff --git a/partmap/sunpc.c b/grub-core/partmap/sunpc.c
similarity index 100%
rename from partmap/sunpc.c
rename to grub-core/partmap/sunpc.c
diff --git a/parttool/msdospart.c b/grub-core/parttool/msdospart.c
similarity index 100%
rename from parttool/msdospart.c
rename to grub-core/parttool/msdospart.c
diff --git a/grub-core/po/Makefile.am b/grub-core/po/Makefile.am
new file mode 100644
index 000000000..e69de29bb
diff --git a/po/POTFILES b/grub-core/po/POTFILES
similarity index 100%
rename from po/POTFILES
rename to grub-core/po/POTFILES
diff --git a/po/POTFILES-shell b/grub-core/po/POTFILES-shell
similarity index 100%
rename from po/POTFILES-shell
rename to grub-core/po/POTFILES-shell
diff --git a/po/README b/grub-core/po/README
similarity index 100%
rename from po/README
rename to grub-core/po/README
diff --git a/script/execute.c b/grub-core/script/execute.c
similarity index 100%
rename from script/execute.c
rename to grub-core/script/execute.c
diff --git a/script/function.c b/grub-core/script/function.c
similarity index 100%
rename from script/function.c
rename to grub-core/script/function.c
diff --git a/script/lexer.c b/grub-core/script/lexer.c
similarity index 100%
rename from script/lexer.c
rename to grub-core/script/lexer.c
diff --git a/script/main.c b/grub-core/script/main.c
similarity index 100%
rename from script/main.c
rename to grub-core/script/main.c
diff --git a/script/parser.y b/grub-core/script/parser.y
similarity index 100%
rename from script/parser.y
rename to grub-core/script/parser.y
diff --git a/script/script.c b/grub-core/script/script.c
similarity index 100%
rename from script/script.c
rename to grub-core/script/script.c
diff --git a/script/yylex.l b/grub-core/script/yylex.l
similarity index 100%
rename from script/yylex.l
rename to grub-core/script/yylex.l
diff --git a/term/at_keyboard.c b/grub-core/term/at_keyboard.c
similarity index 100%
rename from term/at_keyboard.c
rename to grub-core/term/at_keyboard.c
diff --git a/term/efi/console.c b/grub-core/term/efi/console.c
similarity index 100%
rename from term/efi/console.c
rename to grub-core/term/efi/console.c
diff --git a/term/gfxterm.c b/grub-core/term/gfxterm.c
similarity index 100%
rename from term/gfxterm.c
rename to grub-core/term/gfxterm.c
diff --git a/term/i386/pc/console.c b/grub-core/term/i386/pc/console.c
similarity index 100%
rename from term/i386/pc/console.c
rename to grub-core/term/i386/pc/console.c
diff --git a/term/i386/pc/vga.c b/grub-core/term/i386/pc/vga.c
similarity index 100%
rename from term/i386/pc/vga.c
rename to grub-core/term/i386/pc/vga.c
diff --git a/term/i386/pc/vga_text.c b/grub-core/term/i386/pc/vga_text.c
similarity index 100%
rename from term/i386/pc/vga_text.c
rename to grub-core/term/i386/pc/vga_text.c
diff --git a/term/i386/vga_common.c b/grub-core/term/i386/vga_common.c
similarity index 100%
rename from term/i386/vga_common.c
rename to grub-core/term/i386/vga_common.c
diff --git a/term/ieee1275/ofconsole.c b/grub-core/term/ieee1275/ofconsole.c
similarity index 100%
rename from term/ieee1275/ofconsole.c
rename to grub-core/term/ieee1275/ofconsole.c
diff --git a/term/serial.c b/grub-core/term/serial.c
similarity index 100%
rename from term/serial.c
rename to grub-core/term/serial.c
diff --git a/term/terminfo.c b/grub-core/term/terminfo.c
similarity index 100%
rename from term/terminfo.c
rename to grub-core/term/terminfo.c
diff --git a/term/tparm.c b/grub-core/term/tparm.c
similarity index 100%
rename from term/tparm.c
rename to grub-core/term/tparm.c
diff --git a/term/usb_keyboard.c b/grub-core/term/usb_keyboard.c
similarity index 100%
rename from term/usb_keyboard.c
rename to grub-core/term/usb_keyboard.c
diff --git a/tests/example_functional_test.c b/grub-core/tests/example_functional_test.c
similarity index 95%
rename from tests/example_functional_test.c
rename to grub-core/tests/example_functional_test.c
index 6802d2d53..525988145 100644
--- a/tests/example_functional_test.c
+++ b/grub-core/tests/example_functional_test.c
@@ -32,4 +32,4 @@ example_test (void)
 }
 
 /* Register example_test method as a functional test.  */
-GRUB_FUNCTIONAL_TEST ("example_functional_test", example_test);
+GRUB_FUNCTIONAL_TEST (example_functional_test, example_test);
diff --git a/tests/lib/functional_test.c b/grub-core/tests/lib/functional_test.c
similarity index 100%
rename from tests/lib/functional_test.c
rename to grub-core/tests/lib/functional_test.c
diff --git a/tests/lib/test.c b/grub-core/tests/lib/test.c
similarity index 100%
rename from tests/lib/test.c
rename to grub-core/tests/lib/test.c
diff --git a/video/bitmap.c b/grub-core/video/bitmap.c
similarity index 100%
rename from video/bitmap.c
rename to grub-core/video/bitmap.c
diff --git a/video/bitmap_scale.c b/grub-core/video/bitmap_scale.c
similarity index 100%
rename from video/bitmap_scale.c
rename to grub-core/video/bitmap_scale.c
diff --git a/video/efi_gop.c b/grub-core/video/efi_gop.c
similarity index 100%
rename from video/efi_gop.c
rename to grub-core/video/efi_gop.c
diff --git a/video/efi_uga.c b/grub-core/video/efi_uga.c
similarity index 100%
rename from video/efi_uga.c
rename to grub-core/video/efi_uga.c
diff --git a/util/sdl.c b/grub-core/video/emu/sdl.c
similarity index 100%
rename from util/sdl.c
rename to grub-core/video/emu/sdl.c
diff --git a/video/fb/fbblit.c b/grub-core/video/fb/fbblit.c
similarity index 100%
rename from video/fb/fbblit.c
rename to grub-core/video/fb/fbblit.c
diff --git a/video/fb/fbfill.c b/grub-core/video/fb/fbfill.c
similarity index 100%
rename from video/fb/fbfill.c
rename to grub-core/video/fb/fbfill.c
diff --git a/video/fb/fbutil.c b/grub-core/video/fb/fbutil.c
similarity index 100%
rename from video/fb/fbutil.c
rename to grub-core/video/fb/fbutil.c
diff --git a/video/fb/video_fb.c b/grub-core/video/fb/video_fb.c
similarity index 100%
rename from video/fb/video_fb.c
rename to grub-core/video/fb/video_fb.c
diff --git a/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c
similarity index 100%
rename from video/i386/pc/vbe.c
rename to grub-core/video/i386/pc/vbe.c
diff --git a/video/ieee1275.c b/grub-core/video/ieee1275.c
similarity index 100%
rename from video/ieee1275.c
rename to grub-core/video/ieee1275.c
diff --git a/video/readers/jpeg.c b/grub-core/video/readers/jpeg.c
similarity index 100%
rename from video/readers/jpeg.c
rename to grub-core/video/readers/jpeg.c
diff --git a/video/readers/png.c b/grub-core/video/readers/png.c
similarity index 100%
rename from video/readers/png.c
rename to grub-core/video/readers/png.c
diff --git a/video/readers/tga.c b/grub-core/video/readers/tga.c
similarity index 100%
rename from video/readers/tga.c
rename to grub-core/video/readers/tga.c
diff --git a/video/sm712.c b/grub-core/video/sm712.c
similarity index 100%
rename from video/sm712.c
rename to grub-core/video/sm712.c
diff --git a/video/video.c b/grub-core/video/video.c
similarity index 100%
rename from video/video.c
rename to grub-core/video/video.c
diff --git a/modules.def b/modules.def
new file mode 100644
index 000000000..4877533ef
--- /dev/null
+++ b/modules.def
@@ -0,0 +1,497 @@
+AutoGen definitions Makefile.tpl;
+
+library = {
+  name = libutil.a;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+
+  nodist = grub_script.tab.c;
+  nodist = grub_script.yy.c;
+  nodist = libutil_a_init.c;
+
+  source = grub-core/gnulib/error.c;
+  source = grub-core/gnulib/fnmatch.c;
+  source = grub-core/gnulib/getdelim.c;
+  source = grub-core/gnulib/getline.c;
+  source = grub-core/gnulib/getopt1.c;
+  source = grub-core/gnulib/getopt.c;
+  source = grub-core/gnulib/progname.c;
+
+  source = util/misc.c;
+  source = grub-core/kern/misc.c;
+  source = grub-core/kern/emu/misc.c;
+  source = grub-core/kern/emu/hostfs.c;
+  source = grub-core/kern/emu/getroot.c;
+  source = grub-core/kern/emu/hostdisk.c;
+
+  source = grub-core/commands/blocklist.c;
+  source = grub-core/commands/extcmd.c;
+  source = grub-core/commands/ls.c;
+  source = grub-core/disk/dmraid_nvidia.c;
+  source = grub-core/disk/host.c;
+  source = grub-core/disk/loopback.c;
+  source = grub-core/disk/lvm.c;
+  source = grub-core/disk/mdraid_linux.c;
+  source = grub-core/disk/raid5_recover.c;
+  source = grub-core/disk/raid6_recover.c;
+  source = grub-core/disk/raid.c;
+  source = grub-core/fs/affs.c;
+  source = grub-core/fs/afs_be.c;
+  source = grub-core/fs/afs.c;
+  source = grub-core/fs/befs_be.c;
+  source = grub-core/fs/befs.c;
+  source = grub-core/fs/cpio.c;
+  source = grub-core/fs/ext2.c;
+  source = grub-core/fs/fat.c;
+  source = grub-core/fs/fshelp.c;
+  source = grub-core/fs/hfs.c;
+  source = grub-core/fs/hfsplus.c;
+  source = grub-core/fs/iso9660.c;
+  source = grub-core/fs/jfs.c;
+  source = grub-core/fs/minix.c;
+  source = grub-core/fs/nilfs2.c;
+  source = grub-core/fs/ntfs.c;
+  source = grub-core/fs/ntfscomp.c;
+  source = grub-core/fs/reiserfs.c;
+  source = grub-core/fs/sfs.c;
+  source = grub-core/fs/tar.c;
+  source = grub-core/fs/udf.c;
+  source = grub-core/fs/ufs2.c;
+  source = grub-core/fs/ufs.c;
+  source = grub-core/fs/xfs.c;
+  source = grub-core/kern/command.c;
+  source = grub-core/kern/device.c;
+  source = grub-core/kern/disk.c;
+  source = grub-core/kern/env.c;
+  source = grub-core/kern/err.c;
+  source = grub-core/kern/file.c;
+  source = grub-core/kern/fs.c;
+  source = grub-core/kern/handler.c;
+  source = grub-core/kern/list.c;
+  source = grub-core/kern/parser.c;
+  source = grub-core/kern/partition.c;
+  source = grub-core/lib/arg.c;
+  source = grub-core/lib/crc.c;
+  source = grub-core/lib/crypto.c;
+  source = grub-core/lib/envblk.c;
+  source = grub-core/lib/hexdump.c;
+  source = grub-core/lib/libgcrypt-grub/cipher/sha512.c;
+  source = grub-core/lib/LzFind.c;
+  source = grub-core/lib/LzmaEnc.c;
+  source = grub-core/lib/pbkdf2.c;
+  source = grub-core/normal/datetime.c;
+  source = grub-core/normal/misc.c;
+  source = grub-core/partmap/acorn.c;
+  source = grub-core/partmap/amiga.c;
+  source = grub-core/partmap/apple.c;
+  source = grub-core/partmap/gpt.c;
+  source = grub-core/partmap/msdos.c;
+  source = grub-core/partmap/sun.c;
+  source = grub-core/script/function.c;
+  source = grub-core/script/lexer.c;
+  source = grub-core/script/main.c;
+  source = grub-core/script/script.c;
+  common;
+};
+
+program = {
+  name = grub-bin2h;
+  source = util/bin2h.c;
+  ldadd = libutil.a;
+  mansection = 1;
+  common;
+};
+
+program = {
+  name = grub-mkimage;
+  mansection = 1;
+
+  source = util/grub-mkrawimage.c;
+  source = util/resolve.c;
+
+  x86_efi = util/i386/efi/grub-mkimage.c;
+  x86_efi = util/resolve.c;
+
+  ldadd = libutil.a;
+
+  sparc64_ieee1275_cppflags = '-DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  mips_cppflags = '-DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  i386_pc_cppflags = '-DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  i386_qemu_cppflags = '-DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+
+  i386_pc; i386_qemu; mips; sparc64_ieee1275;
+};
+
+program = {
+  name = grub-mkelfimage;
+  mansection = 1;
+  source = util/elf/grub-mkimage.c;
+  source = util/resolve.c;
+
+  ldadd = libutil.a;
+  common;
+};
+
+program = {
+  name = grub-mkisofs;
+  mansection = 1;
+  source = util/mkisofs/eltorito.c;
+  source = util/mkisofs/hash.c;
+  source = util/mkisofs/joliet.c;
+  source = util/mkisofs/match.c;
+  source = util/mkisofs/mkisofs.c;
+  source = util/mkisofs/multi.c;
+  source = util/mkisofs/name.c;
+  source = util/mkisofs/rock.c;
+  source = util/mkisofs/tree.c;
+  source = util/mkisofs/write.c;
+  source = grub-core/gnulib/progname.c;
+  source = grub-core/gnulib/error.c;
+  cflags = '$(CFLAGS_MKISOFS)';
+  cppflags = '$(CPPFLAGS_MKISOFS)';
+  common;
+};
+
+program = {
+  name = grub-mkrelpath;
+  mansection = 1;
+
+  source = util/grub-mkrelpath.c;
+
+  ldadd = libutil.a;
+  common;
+};
+
+program = {
+  name = grub-script-check;
+  mansection = 1;
+
+  source = util/grub-script-check.c;
+
+  ldadd = libutil.a;
+  common;
+};
+
+program = {
+  name = grub-editenv;
+  mansection = 1;
+
+  source = util/grub-editenv.c;
+
+  ldadd = libutil.a;
+  common;
+};
+
+program = {
+  name = grub-mkpasswd-pbkdf2;
+  mansection = 1;
+
+  source = util/grub-mkpasswd-pbkdf2.c;
+
+  ldadd = libutil.a;
+  cflags = '$(CFLAGS_GCRY)';
+  cppflags = '$(CPPFLAGS_GCRY)';
+  common;
+};
+
+program = {
+  name = grub-macho2img;
+  mansection = 1;
+  source = util/grub-macho2img.c;
+};
+
+program = {
+  name = grub-pe2elf;
+  mansection = 1;
+  source = util/grub-pe2elf.c;
+
+  ldadd = libutil.a;
+};
+
+program = {
+  name = grub-fstest;
+  mansection = 1;
+  source = util/grub-fstest.c;
+
+  ldadd = libutil.a;
+  enable = COND_GRUB_FSTEST;
+  common;
+};
+
+program = {
+  name = grub-mkfont;
+  mansection = 1;
+  source = util/grub-mkfont.c;
+
+  ldadd = libutil.a;
+  cflags = '$(freetype_cflags)';
+  ldflags = '$(freetype_libs)';
+  common;
+  enable = COND_GRUB_MKFONT;
+};
+
+program = {
+  name = grub-mkdevicemap;
+  installdir = sbin;
+  mansection = 8;
+  source = util/grub-mkdevicemap.c;
+  source = util/deviceiter.c;
+  source = util/devicemap.c;
+
+  sparc64_ieee1275 = util/grub-mkdevicemap.c;
+  sparc64_ieee1275 = util/deviceiter.c;
+  sparc64_ieee1275 = util/ieee1275/ofpath.c;
+  sparc64_ieee1275 = util/ieee1275/devicemap.c;
+
+  ldadd = libutil.a;
+  common;
+};
+
+program = {
+  name = grub-probe;
+  installdir = sbin;
+  mansection = 8;
+  source = util/grub-probe.c;
+
+  ldadd = libutil.a;
+  common;
+};
+
+program = {
+  name = grub-setup;
+  installdir = sbin;
+  mansection = 8;
+  i386_pc = util/i386/pc/grub-setup.c;
+  i386_pc = util/raid.c;
+  i386_pc = util/lvm.c;
+
+  sparc64_ieee1275 = util/ieee1275/ofpath.c;
+  sparc64_ieee1275 = util/sparc64/ieee1275/grub-setup.c;
+  sparc64_ieee1275 = util/raid.c;
+  sparc64_ieee1275 = util/lvm.c;
+
+  ldadd = libutil.a;
+};
+
+program = {
+  name = grub-ofpathname;
+  installdir = sbin;
+  source = util/ieee1275/grub-ofpathname.c;
+  source = util/ieee1275/ofpath.c;
+
+  ldadd = libutil.a;
+  sparc64_ieee1275;
+};
+
+data = {
+  source = util/grub.d/README;
+  installdir = grubconf;
+  common;
+};
+
+script = {
+  name = '00_header';
+  source = util/grub.d/00_header.in;
+  installdir = grubconf;
+  common;
+};
+
+script = {
+  name = '10_windows';
+  source = util/grub.d/10_windows.in;
+  installdir = grubconf;
+};
+
+script = {
+  name = '10_hurd';
+  source = util/grub.d/10_hurd.in;
+  installdir = grubconf;
+};
+
+script = {
+  name = '10_linux';
+  source = util/grub.d/10_linux.in;
+  installdir = grubconf;
+  common;
+};
+
+script = {
+  name = '30_os-prober';
+  source = util/grub.d/30_os-prober.in;
+  installdir = grubconf;
+  common;
+};
+
+script = {
+  name = '40_custom';
+  source = util/grub.d/40_custom.in;
+  installdir = grubconf;
+  common;
+};
+
+script = {
+  mansection = 1;
+  name = grub-mkrescue;
+  source = util/grub-mkrescue.in;
+  powerpc_ieee1275 = util/powerpc/ieee1275/grub-mkrescue.in;
+  i386_pc;
+  i386_qemu;
+  i386_coreboot;
+};
+
+script = {
+  mansection = 8;
+  installdir = sbin;
+  name = grub-install;
+  source = util/grub-install.in;
+  x86_efi = util/i386/efi/grub-install.in;
+  i386_ieee1275 = util/ieee1275/grub-install.in;
+  powerpc_ieee1275 = util/ieee1275/grub-install.in;
+  mips;
+  i386_pc;
+  i386_qemu;
+  i386_coreboot;
+};
+
+script = {
+  name = grub-mkconfig;
+  source = util/grub-mkconfig.in;
+  mansection = 8;
+  installdir = sbin;
+  common;
+};
+
+script = {
+  name = grub-set-default;
+  source = util/grub-set-default.in;
+  mansection = 8;
+  installdir = sbin;
+  common;
+};
+
+script = {
+  name = grub-reboot;
+  source = util/grub-reboot.in;
+  mansection = 8;
+  installdir = sbin;
+  common;
+};
+
+script = {
+  name = grub-mkconfig_lib;
+  source = util/grub-mkconfig_lib.in;
+  installdir = pkglib;
+  common;
+};
+
+script = {
+  name = update-grub_lib;
+  source = util/update-grub_lib.in;
+  installdir = pkglib;
+  common;
+};
+
+test_script = {
+  name = grub-shell;
+  source = tests/util/grub-shell.in;
+  common;
+};
+
+test_script = {
+  name = grub-shell-tester;
+  source = tests/util/grub-shell-tester.in;
+  common;
+};
+
+test_script = {
+  name = example_scripted_test;
+  source = tests/example_scripted_test.in;
+  common;
+};
+
+test_script = {
+  name = example_grub_script_test;
+  source = tests/example_grub_script_test.in;
+  common;
+};
+
+test_script = {
+  name = grub_script_echo1;
+  source = tests/grub_script_echo1.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_echo_keywords;
+  source = tests/grub_script_echo_keywords.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_vars1;
+  source = tests/grub_script_vars1.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_for1;
+  source = tests/grub_script_for1.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_while1;
+  source = tests/grub_script_while1.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_if;
+  source = tests/grub_script_if.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_blanklines;
+  source = tests/grub_script_blanklines.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_final_semicolon;
+  source = tests/grub_script_final_semicolon.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_dollar;
+  source = tests/grub_script_dollar.in;
+  common;
+  enable;
+};
+
+test_script = {
+  name = grub_script_comments;
+  source = tests/grub_script_comments.in;
+  common;
+  enable;
+};
+
+test_program = {
+  name = example_unit_test;
+  source = tests/example_unit_test.c;
+  source = tests/lib/unit_test.c;
+  source = grub-core/kern/list.c;
+  source = grub-core/kern/misc.c;
+  source = grub-core/tests/lib/test.c;
+  cflags = -Wno-format;
+  common;
+};
diff --git a/po/Makefile.am b/po/Makefile.am
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/example_grub_script_test.in b/tests/example_grub_script_test.in
index 93a90a18e..6fa3dc98a 100644
--- a/tests/example_grub_script_test.in
+++ b/tests/example_grub_script_test.in
@@ -1,3 +1,3 @@
-#! @builddir@/grub-shell-tester --modules=echo
+#! @abs_top_builddir@/grub-shell-tester --modules=echo
 
 echo "hello world"
diff --git a/tests/lib/unit_test.c b/tests/lib/unit_test.c
index e461150de..92c8ae33a 100644
--- a/tests/lib/unit_test.c
+++ b/tests/lib/unit_test.c
@@ -105,5 +105,4 @@ grub_exit (void)
   exit (1);
 }
 
-struct grub_handler_class grub_term_input_class;
-struct grub_handler_class grub_term_output_class;
+struct grub_term_input *grub_term_inputs;
diff --git a/tests/util/grub-shell-tester.in b/tests/util/grub-shell-tester.in
index e9507c8f5..f1e91f561 100644
--- a/tests/util/grub-shell-tester.in
+++ b/tests/util/grub-shell-tester.in
@@ -91,7 +91,7 @@ if [ "x${source}" = x ] ; then
 fi
 
 outfile1=`mktemp`
-@builddir@/grub-shell --qemu-opts="${qemuopts}" --modules=${modules} ${source} >${outfile1}
+@abs_top_builddir@/grub-shell --qemu-opts="${qemuopts}" --modules=${modules} ${source} >${outfile1}
 
 outfile2=`mktemp`
 bash ${source} >${outfile2}
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index a41a6f6f4..8324beb97 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -123,10 +123,14 @@ source /boot/grub/testcase.cfg
 halt
 EOF
 
+rootdir=`mktemp -d`
+(cd @abs_top_builddir@ && make DESTDIR=$rootdir install) >/dev/null 2>&1
+
 isofile=`mktemp`
-grub-mkrescue --output=${isofile} --override-directory=${builddir} \
-  /boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \
-  >/dev/null 2>&1
+sh @abs_top_builddir@/grub-mkrescue --output=${isofile} \
+  --root-directory=${rootdir} /boot/grub/grub.cfg=${cfgfile} \
+  /boot/grub/testcase.cfg=${source} >/dev/null 2>&1
+rm -rf $rootdir
 
 hdafile=`mktemp`
 cp ${isofile} ${hdafile}
diff --git a/util/elf/grub-mkimage.c b/util/elf/grub-mkimage.c
index 04a19bc4e..fa9b202eb 100644
--- a/util/elf/grub-mkimage.c
+++ b/util/elf/grub-mkimage.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <grub/elf.h>
 #include <grub/misc.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/util/resolve.h>
 #include <grub/kernel.h>
diff --git a/util/grub-editenv.c b/util/grub-editenv.c
index f21042c97..24c36329c 100644
--- a/util/grub-editenv.c
+++ b/util/grub-editenv.c
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <grub/types.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/lib/envblk.h>
 #include <grub/handler.h>
@@ -34,24 +35,6 @@
 
 #define DEFAULT_ENVBLK_SIZE	1024
 
-void
-grub_putchar (int c)
-{
-  putchar (c);
-}
-
-void
-grub_refresh (void)
-{
-  fflush (stdout);
-}
-
-int
-grub_getkey (void)
-{
-  return 0;
-}
-
 char *
 grub_env_get (const char *name __attribute__ ((unused)))
 {
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index c03c43451..9ac5cf550 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <grub/types.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/misc.h>
 #include <grub/device.h>
@@ -33,8 +34,6 @@
 #include <grub/command.h>
 #include <grub/i18n.h>
 
-#include <grub_fstest_init.h>
-
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -43,27 +42,6 @@
 
 #include "progname.h"
 
-void
-grub_putchar (int c)
-{
-  putchar (c);
-}
-
-int
-grub_getkey (void)
-{
-  return -1;
-}
-
-struct grub_handler_class grub_term_input_class;
-struct grub_handler_class grub_term_output_class;
-
-void
-grub_refresh (void)
-{
-  fflush (stdout);
-}
-
 static grub_err_t
 execute_command (char *name, int n, char **args)
 {
diff --git a/util/grub-mkdevicemap.c b/util/grub-mkdevicemap.c
index c68482af1..d534ff9ef 100644
--- a/util/grub-mkdevicemap.c
+++ b/util/grub-mkdevicemap.c
@@ -29,6 +29,7 @@
 #include <fcntl.h>
 #include <limits.h>
 
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/util/deviceiter.h>
 #include <grub/i18n.h>
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 51e2e494c..30dd96a21 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -18,6 +18,8 @@
 
 #include <config.h>
 #include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/i18n.h>
 #include <grub/fontformat.h>
diff --git a/util/grub-mkpasswd-pbkdf2.c b/util/grub-mkpasswd-pbkdf2.c
index a00b1e990..4a218bc82 100644
--- a/util/grub-mkpasswd-pbkdf2.c
+++ b/util/grub-mkpasswd-pbkdf2.c
@@ -18,6 +18,7 @@
 
 #include <grub/types.h>
 #include <grub/crypto.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/i18n.h>
 
@@ -30,37 +31,6 @@
 
 #include "progname.h"
 
-/* Few functions to make crypto happy.  */
-void *
-grub_memmove (void *dest, const void *src, grub_size_t n)
-{
-  return memmove (dest, src, n);
-}
-
-void *
-grub_memset (void *s, int c, grub_size_t n)
-{
-  return memset (s, c, n);
-}
-
-int 
-grub_vprintf (const char *fmt, va_list args)
-{
-  return vprintf (fmt, args);
-}
-
-int 
-grub_vsnprintf (char *str, grub_size_t n, const char *fmt, va_list args)
-{
-  return vsnprintf (str, n, fmt, args);
-}
-
-void
-grub_abort (void)
-{
-  abort ();
-}
-
 static struct option options[] =
   {
     {"iteration_count", required_argument, 0, 'c'},
diff --git a/util/grub-mkrawimage.c b/util/grub-mkrawimage.c
index 20a344d04..ff3b9df83 100644
--- a/util/grub-mkrawimage.c
+++ b/util/grub-mkrawimage.c
@@ -27,6 +27,7 @@
 #include <grub/i18n.h>
 #include <grub/kernel.h>
 #include <grub/disk.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/util/resolve.h>
 #include <grub/misc.h>
diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c
index 327f0c866..4e9d0ed63 100644
--- a/util/grub-mkrelpath.c
+++ b/util/grub-mkrelpath.c
@@ -18,6 +18,7 @@
  */
 
 #include <grub/util/misc.h>
+#include <grub/emu/getroot.h>
 #include <grub/i18n.h>
 #include <getopt.h>
 
@@ -97,7 +98,7 @@ main (int argc, char *argv[])
 
   argument = argv[optind];
 
-  relpath = make_system_path_relative_to_its_root (argument);
+  relpath = grub_make_system_path_relative_to_its_root (argument);
   printf ("%s\n", relpath);
   free (relpath);
 
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 44e80b106..2fdb58114 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # Make GRUB rescue image
-# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010  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
@@ -28,8 +28,11 @@ PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 target_cpu=@target_cpu@
 native_platform=@platform@
-pkglib_DATA="@pkglib_DATA@"
+pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
 
+mkimage=${bindir}/grub-mkimage
+mkisofs=${bindir}/grub-mkisofs
+mkelfimage=${bindir}/grub-mkelfimage
 multiboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-multiboot
 pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-pc
 
@@ -70,6 +73,8 @@ for option in "$@"; do
 	PATH=${override_dir}:$PATH
 	export PATH
 	;;
+    --root-directory=*)
+        rootdir=`echo "${option}/" | sed 's/--root-directory=//'` ;;
     -*)
 	echo "Unrecognized option \`$option'" 1>&2
 	usage
@@ -121,6 +126,14 @@ process_input_dir ()
     done
 }
 
+if [ "${rootdir}" != "" ] ; then
+    coreboot_dir="${rootdir}/${coreboot_dir}"
+    pc_dir="${rootdir}/${pc_dir}"
+    mkimage="${rootdir}/${mkimage}"
+    mkisofs="${rootdir}/${mkisofs}"
+    mkelfimage="${rootdir}/${mkelfimage}"
+fi
+
 if [ "${override_dir}" = "" ] ; then
     if test -e "${multiboot_dir}" ; then
         process_input_dir ${multiboot_dir} multiboot
@@ -160,7 +173,7 @@ EOF
 
     tar -C ${memdisk_dir} -cf ${memdisk_img} boot
     rm -rf ${memdisk_dir}
-    grub-mkelfimage -d ${multiboot_dir}/ -m ${memdisk_img} -o ${iso9660_dir}/boot/multiboot.img \
+    ${mkelfimage} -d ${multiboot_dir}/ -m ${memdisk_img} -o ${iso9660_dir}/boot/multiboot.img \
         memdisk tar search iso9660 configfile sh \
         ata at_keyboard
     rm -f ${memdisk_img}
@@ -171,7 +184,7 @@ fi
 if test -e "${pc_dir}" ; then
     echo "Enabling BIOS support ..."
     core_img=`mktemp "$MKTEMP_TEMPLATE"`
-    grub-mkimage -d ${pc_dir}/ -o ${core_img} --prefix=/boot/grub/i386-pc \
+    ${mkimage} -d ${pc_dir}/ -o ${core_img} --prefix=/boot/grub/i386-pc \
         iso9660 biosdisk
     cat ${pc_dir}/cdboot.img ${core_img} > ${iso9660_dir}/boot/grub/i386-pc/eltorito.img
 
@@ -192,7 +205,7 @@ if test -e "${pc_dir}" ; then
 fi
 
 # build iso image
-grub-mkisofs ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} ${source}
+${mkisofs} ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} ${source}
 rm -rf ${iso9660_dir}
 
 rm -f ${embed_img}
diff --git a/util/grub-probe.c b/util/grub-probe.c
index bb41480e2..0cc35d4c5 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <grub/types.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/device.h>
 #include <grub/disk.h>
@@ -26,15 +27,13 @@
 #include <grub/fs.h>
 #include <grub/partition.h>
 #include <grub/msdos_partition.h>
-#include <grub/util/hostdisk.h>
-#include <grub/util/getroot.h>
+#include <grub/emu/hostdisk.h>
+#include <grub/emu/getroot.h>
 #include <grub/term.h>
 #include <grub/env.h>
 #include <grub/raid.h>
 #include <grub/i18n.h>
 
-#include <grub_probe_init.h>
-
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -58,27 +57,6 @@ enum {
 int print = PRINT_FS;
 static unsigned int argument_is_device = 0;
 
-void
-grub_putchar (int c)
-{
-  putchar (c);
-}
-
-int
-grub_getkey (void)
-{
-  return -1;
-}
-
-struct grub_handler_class grub_term_input_class;
-struct grub_handler_class grub_term_output_class;
-
-void
-grub_refresh (void)
-{
-  fflush (stdout);
-}
-
 static void
 probe_partmap (grub_disk_t disk)
 {
@@ -261,7 +239,7 @@ probe (const char *path, char *device_name)
 	      grub_util_info ("reading %s via OS facilities", path);
 	      filebuf_via_sys = grub_util_read_image (path);
 
-	      rel_path = make_system_path_relative_to_its_root (path);
+	      rel_path = grub_make_system_path_relative_to_its_root (path);
 	      grub_path = xasprintf ("(%s)%s", drive_name, rel_path);
 	      free (rel_path);
 	      grub_util_info ("reading %s via GRUB facilities", grub_path);
diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index dc732aa01..fa2459306 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -21,13 +21,12 @@
 #include <grub/types.h>
 #include <grub/mm.h>
 #include <grub/misc.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/i18n.h>
 #include <grub/parser.h>
 #include <grub/script_sh.h>
 
-#include <grub_script_check_init.h>
-
 #define _GNU_SOURCE	1
 
 #include <ctype.h>
@@ -39,75 +38,6 @@
 
 #include "progname.h"
 
-void
-grub_putchar (int c)
-{
-  putchar (c);
-}
-
-int
-grub_getkey (void)
-{
-  return -1;
-}
-
-void
-grub_refresh (void)
-{
-  fflush (stdout);
-}
-
-char *
-grub_script_execute_argument_to_string (struct grub_script_arg *arg __attribute__ ((unused)))
-{
-  return 0;
-}
-
-grub_err_t
-grub_script_execute_cmdline (struct grub_script_cmd *cmd __attribute__ ((unused)))
-{
-  return 0;
-}
-
-grub_err_t
-grub_script_execute_cmdblock (struct grub_script_cmd *cmd __attribute__ ((unused)))
-{
-  return 0;
-}
-
-grub_err_t
-grub_script_execute_cmdif (struct grub_script_cmd *cmd __attribute__ ((unused)))
-{
-  return 0;
-}
-
-grub_err_t
-grub_script_execute_cmdfor (struct grub_script_cmd *cmd __attribute__ ((unused)))
-{
-  return 0;
-}
-
-grub_err_t
-grub_script_execute_cmdwhile (struct grub_script_cmd *cmd __attribute__ ((unused)))
-{
-  return 0;
-}
-
-grub_err_t
-grub_script_execute_menuentry (struct grub_script_cmd *cmd __attribute__ ((unused)))
-{
-  return 0;
-}
-
-grub_err_t
-grub_script_execute (struct grub_script *script)
-{
-  if (script == 0 || script->cmd == 0)
-    return 0;
-
-  return script->cmd->exec (script->cmd);
-}
-
 static struct option options[] =
   {
     {"help", no_argument, 0, 'h'},
@@ -145,7 +75,7 @@ main (int argc, char *argv[])
   char *input;
   FILE *file = 0;
   int verbose = 0;
-  struct grub_script *script;
+  struct grub_script *script = 0;
 
   auto grub_err_t get_config_line (char **line, int cont);
   grub_err_t get_config_line (char **line, int cont __attribute__ ((unused)))
diff --git a/util/i386/efi/grub-mkimage.c b/util/i386/efi/grub-mkimage.c
index f8c0f152e..57fba9168 100644
--- a/util/i386/efi/grub-mkimage.c
+++ b/util/i386/efi/grub-mkimage.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <time.h>
 #include <grub/elf.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/util/resolve.h>
 #include <grub/kernel.h>
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 63fa8c328..66d45620c 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <grub/types.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/device.h>
 #include <grub/disk.h>
@@ -28,19 +29,17 @@
 #include <grub/msdos_partition.h>
 #include <grub/gpt_partition.h>
 #include <grub/env.h>
-#include <grub/util/hostdisk.h>
+#include <grub/emu/hostdisk.h>
 #include <grub/machine/boot.h>
 #include <grub/machine/kernel.h>
 #include <grub/term.h>
 #include <grub/i18n.h>
 #include <grub/util/raid.h>
 #include <grub/util/lvm.h>
-#include <grub/util/getroot.h>
+#include <grub/emu/getroot.h>
 
 static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT;
 
-#include <grub_setup_init.h>
-
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -57,27 +56,6 @@ static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_P
 #define DEFAULT_BOOT_FILE	"boot.img"
 #define DEFAULT_CORE_FILE	"core.img"
 
-void
-grub_putchar (int c)
-{
-  putchar (c);
-}
-
-int
-grub_getkey (void)
-{
-  return -1;
-}
-
-struct grub_handler_class grub_term_input_class;
-struct grub_handler_class grub_term_output_class;
-
-void
-grub_refresh (void)
-{
-  fflush (stdout);
-}
-
 static void
 setup (const char *dir,
        const char *boot_file, const char *core_file,
@@ -423,7 +401,7 @@ unable_to_embed:
   /* Make sure that GRUB reads the identical image as the OS.  */
   tmp_img = xmalloc (core_size);
   core_path_dev_full = grub_util_get_path (dir, core_file);
-  core_path_dev = make_system_path_relative_to_its_root (core_path_dev_full);
+  core_path_dev = grub_make_system_path_relative_to_its_root (core_path_dev_full);
   free (core_path_dev_full);
 
   /* It is a Good Thing to sync two times.  */
diff --git a/util/lvm.c b/util/lvm.c
index 0a0916344..bb2c19fe3 100644
--- a/util/lvm.c
+++ b/util/lvm.c
@@ -19,7 +19,7 @@
 
 /* We only support LVM on Linux.  */
 #ifdef __linux__
-
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/util/lvm.h>
 
diff --git a/util/misc.c b/util/misc.c
index f9d860d9a..a7d555092 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -38,11 +38,13 @@
 #include <grub/dl.h>
 #include <grub/misc.h>
 #include <grub/cache.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/mm.h>
 #include <grub/term.h>
 #include <grub/time.h>
 #include <grub/i18n.h>
+#include <grub/script_sh.h>
 
 #define ENABLE_RELOCATABLE 0
 #include "progname.h"
@@ -63,53 +65,6 @@
 #include <winioctl.h>
 #endif
 
-int verbosity = 0;
-
-void
-grub_util_warn (const char *fmt, ...)
-{
-  va_list ap;
-
-  fprintf (stderr, _("%s: warn:"), program_name);
-  fprintf (stderr, " ");
-  va_start (ap, fmt);
-  vfprintf (stderr, fmt, ap);
-  va_end (ap);
-  fprintf (stderr, ".\n");
-  fflush (stderr);
-}
-
-void
-grub_util_info (const char *fmt, ...)
-{
-  if (verbosity > 0)
-    {
-      va_list ap;
-
-      fprintf (stderr, _("%s: info:"), program_name);
-      fprintf (stderr, " ");
-      va_start (ap, fmt);
-      vfprintf (stderr, fmt, ap);
-      va_end (ap);
-      fprintf (stderr, ".\n");
-      fflush (stderr);
-    }
-}
-
-void
-grub_util_error (const char *fmt, ...)
-{
-  va_list ap;
-
-  fprintf (stderr, _("%s: error:"), program_name);
-  fprintf (stderr, " ");
-  va_start (ap, fmt);
-  vfprintf (stderr, fmt, ap);
-  va_end (ap);
-  fprintf (stderr, ".\n");
-  exit (1);
-}
-
 #ifdef GRUB_UTIL
 int
 grub_err_printf (const char *fmt, ...)
@@ -125,41 +80,6 @@ grub_err_printf (const char *fmt, ...)
 }
 #endif
 
-void *
-xmalloc (size_t size)
-{
-  void *p;
-
-  p = malloc (size);
-  if (! p)
-    grub_util_error ("out of memory");
-
-  return p;
-}
-
-void *
-xrealloc (void *ptr, size_t size)
-{
-  ptr = realloc (ptr, size);
-  if (! ptr)
-    grub_util_error ("out of memory");
-
-  return ptr;
-}
-
-char *
-xstrdup (const char *str)
-{
-  size_t len;
-  char *newstr;
-
-  len = strlen (str);
-  newstr = (char *) xmalloc (len + 1);
-  memcpy (newstr, str, len + 1);
-
-  return newstr;
-}
-
 char *
 grub_util_get_path (const char *dir, const char *file)
 {
@@ -268,6 +188,89 @@ grub_util_write_image (const char *img, size_t size, FILE *out)
     grub_util_error ("write failed");
 }
 
+char *
+grub_script_execute_argument_to_string (struct grub_script_arg *arg __attribute__ ((unused)))
+{
+  return 0;
+}
+
+grub_err_t
+grub_script_execute_cmdline (struct grub_script_cmd *cmd __attribute__ ((unused)))
+{
+  return 0;
+}
+
+grub_err_t
+grub_script_execute_cmdblock (struct grub_script_cmd *cmd __attribute__ ((unused)))
+{
+  return 0;
+}
+
+grub_err_t
+grub_script_execute_cmdif (struct grub_script_cmd *cmd __attribute__ ((unused)))
+{
+  return 0;
+}
+
+grub_err_t
+grub_script_execute_cmdfor (struct grub_script_cmd *cmd __attribute__ ((unused)))
+{
+  return 0;
+}
+
+grub_err_t
+grub_script_execute_cmdwhile (struct grub_script_cmd *cmd __attribute__ ((unused)))
+{
+  return 0;
+}
+
+grub_err_t
+grub_script_execute_menuentry (struct grub_script_cmd *cmd __attribute__ ((unused)))
+{
+  return 0;
+}
+
+grub_err_t
+grub_script_execute (struct grub_script *script)
+{
+  if (script == 0 || script->cmd == 0)
+    return 0;
+
+  return script->cmd->exec (script->cmd);
+}
+
+void
+grub_putchar (int c)
+{
+  putchar (c);
+}
+
+int
+grub_getkey (void)
+{
+  return -1;
+}
+
+void
+grub_refresh (void)
+{
+  fflush (stdout);
+}
+
+int
+grub_dl_ref (grub_dl_t mod)
+{
+  (void) mod;
+  return 0;
+}
+
+int
+grub_dl_unref (grub_dl_t mod)
+{
+  (void) mod;
+  return 0;
+}
+
 /* Some functions that we don't use.  */
 void
 grub_mm_init_region (void *addr __attribute__ ((unused)),
@@ -275,64 +278,7 @@ grub_mm_init_region (void *addr __attribute__ ((unused)),
 {
 }
 
-#if GRUB_NO_MODULES
-void
-grub_register_exported_symbols (void)
-{
-}
-#endif
-
-void
-grub_exit (void)
-{
-  exit (1);
-}
-
-grub_uint32_t
-grub_get_rtc (void)
-{
-  struct timeval tv;
-
-  gettimeofday (&tv, 0);
-
-  return (tv.tv_sec * GRUB_TICKS_PER_SECOND
-	  + (((tv.tv_sec % GRUB_TICKS_PER_SECOND) * 1000000 + tv.tv_usec)
-	     * GRUB_TICKS_PER_SECOND / 1000000));
-}
-
-grub_uint64_t
-grub_get_time_ms (void)
-{
-  struct timeval tv;
-
-  gettimeofday (&tv, 0);
-
-  return (tv.tv_sec * 1000 + tv.tv_usec / 1000);
-}
-
-#ifdef __MINGW32__
-
-void
-grub_millisleep (grub_uint32_t ms)
-{
-  Sleep (ms);
-}
-
-#else
-
-void
-grub_millisleep (grub_uint32_t ms)
-{
-  struct timespec ts;
-
-  ts.tv_sec = ms / 1000;
-  ts.tv_nsec = (ms % 1000) * 1000000;
-  nanosleep (&ts, NULL);
-}
-
-#endif
-
-#if !(defined (__i386__) || defined (__x86_64__)) && GRUB_NO_MODULES
+#if !(defined (__i386__) || defined (__x86_64__))
 void
 grub_arch_sync_caches (void *address __attribute__ ((unused)),
 		       grub_size_t len __attribute__ ((unused)))
@@ -340,19 +286,6 @@ grub_arch_sync_caches (void *address __attribute__ ((unused)),
 }
 #endif
 
-#ifndef HAVE_VASPRINTF
-
-int
-vasprintf (char **buf, const char *fmt, va_list ap)
-{
-  /* Should be large enough.  */
-  *buf = xmalloc (512);
-
-  return vsprintf (*buf, fmt, ap);
-}
-
-#endif
-
 #ifndef  HAVE_ASPRINTF
 
 int
@@ -370,23 +303,6 @@ asprintf (char **buf, const char *fmt, ...)
 
 #endif
 
-char *
-xasprintf (const char *fmt, ...)
-{
-  va_list ap;
-  char *result;
-
-  va_start (ap, fmt);
-  if (vasprintf (&result, fmt, ap) < 0)
-    {
-      if (errno == ENOMEM)
-	grub_util_error ("out of memory");
-      return NULL;
-    }
-
-  return result;
-}
-
 #ifdef __MINGW32__
 
 void sync (void)
@@ -482,104 +398,6 @@ get_win32_path (const char *path)
 }
 #endif
 
-/* This function never prints trailing slashes (so that its output
-   can be appended a slash unconditionally).  */
-char *
-make_system_path_relative_to_its_root (const char *path)
-{
-  struct stat st;
-  char *p, *buf, *buf2, *buf3;
-  uintptr_t offset = 0;
-  dev_t num;
-  size_t len;
-
-  /* canonicalize.  */
-  p = canonicalize_file_name (path);
-
-  if (p == NULL)
-    grub_util_error ("failed to get canonical path of %s", path);
-
-  len = strlen (p) + 1;
-  buf = xstrdup (p);
-  free (p);
-
-  if (stat (buf, &st) < 0)
-    grub_util_error ("cannot stat %s: %s", buf, strerror (errno));
-
-  buf2 = xstrdup (buf);
-  num = st.st_dev;
-
-  /* This loop sets offset to the number of chars of the root
-     directory we're inspecting.  */
-  while (1)
-    {
-      p = strrchr (buf, '/');
-      if (p == NULL)
-	/* This should never happen.  */
-	grub_util_error ("FIXME: no / in buf. (make_system_path_relative_to_its_root)");
-      if (p != buf)
-	*p = 0;
-      else
-	*++p = 0;
-
-      if (stat (buf, &st) < 0)
-	grub_util_error ("cannot stat %s: %s", buf, strerror (errno));
-
-      /* buf is another filesystem; we found it.  */
-      if (st.st_dev != num)
-	{
-	  /* offset == 0 means path given is the mount point.
-	     This works around special-casing of "/" in Un*x.  This function never
-	     prints trailing slashes (so that its output can be appended a slash
-	     unconditionally).  Each slash in is considered a preceding slash, and
-	     therefore the root directory is an empty string.  */
-	  if (offset == 0)
-	    {
-	      free (buf);
-	      free (buf2);
-	      return xstrdup ("");
-	    }
-	  else
-	    break;
-	}
-
-      offset = p - buf;
-      /* offset == 1 means root directory.  */
-      if (offset == 1)
-	{
-	  /* Include leading slash.  */
-	  offset = 0;
-	  break;
-	}
-    }
-  free (buf);
-  buf3 = xstrdup (buf2 + offset);
-  free (buf2);
-
-#ifdef __CYGWIN__
-  if (st.st_dev != (DEV_CYGDRIVE_MAJOR << 16))
-    {
-      /* Reached some mount point not below /cygdrive.
-	 GRUB does not know Cygwin's emulated mounts,
-	 convert to Win32 path.  */
-      grub_util_info ("Cygwin path = %s\n", buf3);
-      char * temp = get_win32_path (buf3);
-      free (buf3);
-      buf3 = temp;
-    }
-#endif
-
-  /* Remove trailing slashes, return empty string if root directory.  */
-  len = strlen (buf3);
-  while (len > 0 && buf3[len - 1] == '/')
-    {
-      buf3[len - 1] = '\0';
-      len--;
-    }
-
-  return buf3;
-}
-
 #ifdef GRUB_UTIL
 void
 grub_util_init_nls (void)
diff --git a/util/raid.c b/util/raid.c
index ec3ecd26e..edf865aa7 100644
--- a/util/raid.c
+++ b/util/raid.c
@@ -19,6 +19,7 @@
 
 /* We only support RAID on Linux.  */
 #ifdef __linux__
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/util/raid.h>
 
diff --git a/util/resolve.c b/util/resolve.c
index 8b33beba0..7eadffd38 100644
--- a/util/resolve.c
+++ b/util/resolve.c
@@ -21,8 +21,9 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <grub/util/resolve.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
+#include <grub/util/resolve.h>
 
 /* Module.  */
 struct mod_list
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index 06bc16795..7051fd078 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <grub/types.h>
+#include <grub/emu/misc.h>
 #include <grub/util/misc.h>
 #include <grub/device.h>
 #include <grub/i18n.h>
@@ -29,7 +30,7 @@
 #include <grub/msdos_partition.h>
 #include <grub/gpt_partition.h>
 #include <grub/env.h>
-#include <grub/util/hostdisk.h>
+#include <grub/emu/hostdisk.h>
 #include <grub/machine/boot.h>
 #include <grub/machine/kernel.h>
 #include <grub/term.h>
@@ -37,8 +38,6 @@
 #include <grub/util/lvm.h>
 #include <grub/util/ofpath.h>
 
-#include <grub_setup_init.h>
-
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
@@ -46,7 +45,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <grub/util/getroot.h>
+#include <grub/emu/getroot.h>
 
 #define _GNU_SOURCE	1
 #include <getopt.h>
@@ -83,27 +82,6 @@ struct boot_blocklist
   grub_uint32_t len;
 } __attribute__ ((packed));
 
-void
-grub_putchar (int c)
-{
-  putchar (c);
-}
-
-int
-grub_getkey (void)
-{
-  return -1;
-}
-
-struct grub_handler_class grub_term_input_class;
-struct grub_handler_class grub_term_output_class;
-
-void
-grub_refresh (void)
-{
-  fflush (stdout);
-}
-
 static void
 setup (const char *prefix, const char *dir,
        const char *boot_file, const char *core_file,
@@ -627,8 +605,8 @@ main (int argc, char *argv[])
 
   find_dest_dev (&ginfo, argv);
 
-  ginfo.prefix = make_system_path_relative_to_its_root (ginfo.dir ?
-							: DEFAULT_DIRECTORY);
+  ginfo.prefix = grub_make_system_path_relative_to_its_root (ginfo.dir ?
+							     : DEFAULT_DIRECTORY);
 
   check_root_dev (&ginfo);
 

From 7ad9681655c4203a2a38e5a0b97ae7d654b1f609 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 6 May 2010 11:38:35 +0530
Subject: [PATCH 0930/1628] add missing files

---
 kern/emu/cache.S | 19 ++++++++++++++++++
 kern/emu/dl.c    | 19 ++++++++++++++++++
 kern/emu/full.c  | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
 kern/emu/lite.c  | 42 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 130 insertions(+)
 create mode 100644 kern/emu/cache.S
 create mode 100644 kern/emu/dl.c
 create mode 100644 kern/emu/full.c
 create mode 100644 kern/emu/lite.c

diff --git a/kern/emu/cache.S b/kern/emu/cache.S
new file mode 100644
index 000000000..9975578b8
--- /dev/null
+++ b/kern/emu/cache.S
@@ -0,0 +1,19 @@
+#ifndef GRUB_MACHINE_EMU
+#error "This source is only meant for grub-emu platform"
+#endif
+
+#if defined(GRUB_CPU_I386)
+/* Nothing is necessary.  */
+#elif defined(GRUB_CPU_X86_64)
+/* Nothing is necessary.  */
+#elif defined(GRUB_CPU_SPARC64)
+#include "../sparc64/cache.S"
+#elif defined(GRUB_CPU_MIPS)
+#include "../mips/cache.S"
+#elif defined(GRUB_CPU_MIPSEL)
+#include "../mips/cache.S"
+#elif defined(GRUB_CPU_POWERPC)
+#include "../powerpc/cache.S"
+#else
+#error "No target cpu type is defined"
+#endif
diff --git a/kern/emu/dl.c b/kern/emu/dl.c
new file mode 100644
index 000000000..09e2f4a7a
--- /dev/null
+++ b/kern/emu/dl.c
@@ -0,0 +1,19 @@
+#ifndef GRUB_MACHINE_EMU
+#error "This source is only meant for grub-emu platform"
+#endif
+
+#if defined(GRUB_CPU_I386)
+#include "../i386/dl.c"
+#elif defined(GRUB_CPU_X86_64)
+#include "../x86_64/dl.c"
+#elif defined(GRUB_CPU_SPARC64)
+#include "../sparc64/dl.c"
+#elif defined(GRUB_CPU_MIPS)
+#include "../mips/dl.c"
+#elif defined(GRUB_CPU_MIPSEL)
+#include "../mips/dl.c"
+#elif defined(GRUB_CPU_POWERPC)
+#include "../powerpc/dl.c"
+#else
+#error "No target cpu type is defined"
+#endif
diff --git a/kern/emu/full.c b/kern/emu/full.c
new file mode 100644
index 000000000..0bd33337f
--- /dev/null
+++ b/kern/emu/full.c
@@ -0,0 +1,50 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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 <config.h>
+#include <grub/dl.h>
+#include <grub/env.h>
+#include <grub/kernel.h>
+#include <grub/misc.h>
+#include <grub/emu/misc.h>
+
+void
+grub_register_exported_symbols (void)
+{
+}
+
+grub_err_t
+grub_arch_dl_check_header (void *ehdr)
+{
+  (void) ehdr;
+  return GRUB_ERR_BAD_MODULE;
+}
+
+grub_err_t
+grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
+{
+  (void) mod;
+  (void) ehdr;
+  return GRUB_ERR_BAD_MODULE;
+}
+
+void
+grub_emu_init (void)
+{
+  grub_no_autoload = 1;
+}
diff --git a/kern/emu/lite.c b/kern/emu/lite.c
new file mode 100644
index 000000000..884ddee10
--- /dev/null
+++ b/kern/emu/lite.c
@@ -0,0 +1,42 @@
+#include <config.h>
+#include <grub/emu/misc.h>
+
+#ifndef GRUB_MACHINE_EMU
+#error "This source is only meant for grub-emu platform"
+#endif
+
+#if defined(GRUB_CPU_I386)
+#include "../i386/dl.c"
+#elif defined(GRUB_CPU_X86_64)
+#include "../x86_64/dl.c"
+#elif defined(GRUB_CPU_SPARC64)
+#include "../sparc64/dl.c"
+#elif defined(GRUB_CPU_MIPS)
+#include "../mips/dl.c"
+#elif defined(GRUB_CPU_MIPSEL)
+#include "../mips/dl.c"
+#elif defined(GRUB_CPU_POWERPC)
+#include "../powerpc/dl.c"
+#else
+#error "No target cpu type is defined"
+#endif
+
+/* grub-emu-lite supports dynamic module loading, so it won't have any
+   embedded modules.  */
+void
+grub_init_all (void)
+{
+  return;
+}
+
+void
+grub_fini_all (void)
+{
+  return;
+}
+
+void
+grub_emu_init (void)
+{
+  return;
+}

From e903ddec1c9f898068295d8781b1fbb295721d48 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 6 May 2010 21:11:59 +0200
Subject: [PATCH 0931/1628] move ANSI code recognition to terminfo.mod

---
 conf/common.rmk           |   5 +-
 conf/i386-ieee1275.rmk    |   1 +
 conf/powerpc-ieee1275.rmk |   2 +-
 conf/sparc64-ieee1275.rmk |   3 +-
 include/grub/terminfo.h   |   3 +
 term/ieee1275/ofconsole.c | 122 +++++---------------------------------
 term/terminfo.c           | 109 ++++++++++++++++++++++++++++++++++
 7 files changed, 136 insertions(+), 109 deletions(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index a1a39d723..3e22678ad 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -465,7 +465,7 @@ scsi_mod_LDFLAGS = $(COMMON_LDFLAGS)
 pkglib_MODULES += minicmd.mod extcmd.mod hello.mod handler.mod	\
 	ls.mod cmp.mod cat.mod help.mod search.mod loopback.mod	\
 	configfile.mod echo.mod		\
-	terminfo.mod test.mod blocklist.mod hexdump.mod		\
+	test.mod blocklist.mod hexdump.mod		\
 	read.mod sleep.mod loadenv.mod crc.mod parttool.mod	\
 	msdospart.mod memrw.mod normal.mod sh.mod 		\
 	gptsync.mod true.mod probe.mod password.mod		\
@@ -596,10 +596,13 @@ configfile_mod_SOURCES = commands/configfile.c
 configfile_mod_CFLAGS = $(COMMON_CFLAGS)
 configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+ifneq ($(platform), ieee1275)
 # For terminfo.mod.
+pkglib_MODULES += terminfo.mod
 terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
 terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
 terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
+endif
 
 # For blocklist.mod.
 blocklist_mod_SOURCES = commands/blocklist.c
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 05ba38a65..648205657 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -22,6 +22,7 @@ kernel_img_SOURCES = kern/i386/ieee1275/startup.S \
 	kern/generic/millisleep.c \
 	kern/ieee1275/ieee1275.c \
 	term/ieee1275/ofconsole.c \
+	term/terminfo.c term/tparm.c 	\
 	disk/ieee1275/ofdisk.c \
 	symlist.c
 kernel_img_HEADERS += ieee1275/ieee1275.h
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index d5968ac8e..cd08770df 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -16,7 +16,7 @@ kernel_img_SOURCES = kern/powerpc/ieee1275/startup.S kern/ieee1275/cmain.c \
 	kern/list.c kern/handler.c kern/command.c kern/corecmd.c	\
 	kern/ieee1275/init.c 						\
 	kern/ieee1275/mmap.c						\
-	term/ieee1275/ofconsole.c 		\
+	term/ieee1275/ofconsole.c term/terminfo.c term/tparm.c 		\
 	kern/ieee1275/openfw.c disk/ieee1275/ofdisk.c 		\
 	kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c 	\
 	kern/generic/millisleep.c kern/time.c                            \
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 49834a1fd..6fd7d0032 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -30,7 +30,8 @@ kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c	\
 	kern/sparc64/ieee1275/init.c 					\
 	kern/ieee1275/mmap.c						\
 	term/ieee1275/ofconsole.c 					\
-	kern/ieee1275/openfw.c disk/ieee1275/ofdisk.c 			\
+	kern/ieee1275/openfw.c term/terminfo.c term/tparm.c		\
+	disk/ieee1275/ofdisk.c	\
 	kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c	\
 	kern/generic/millisleep.c kern/time.c				\
 	symlist.c kern/$(target_cpu)/cache.S
diff --git a/include/grub/terminfo.h b/include/grub/terminfo.h
index e3a2c170a..84a6f6ab2 100644
--- a/include/grub/terminfo.h
+++ b/include/grub/terminfo.h
@@ -34,4 +34,7 @@ void grub_terminfo_reverse_video_off (grub_term_output_t oterm);
 void grub_terminfo_cursor_on (grub_term_output_t oterm);
 void grub_terminfo_cursor_off (grub_term_output_t oterm);
 
+#define GRUB_TERMINFO_READKEY_MAX_LEN 4
+void grub_terminfo_readkey (int *keys, int *len, int (*readkey) (void));
+
 #endif /* ! GRUB_TERMINFO_HEADER */
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index ce587d491..74de5806e 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -22,6 +22,7 @@
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/time.h>
+#include <grub/terminfo.h>
 #include <grub/machine/console.h>
 #include <grub/ieee1275/ieee1275.h>
 
@@ -34,7 +35,7 @@ static grub_uint8_t grub_ofconsole_height;
 static int grub_curr_x;
 static int grub_curr_y;
 
-static int grub_keybuf;
+static int grub_keybuf[GRUB_TERMINFO_READKEY_MAX_LEN];
 static int grub_buflen;
 
 struct color
@@ -149,116 +150,28 @@ grub_ofconsole_getcolor (grub_uint8_t *normal_color, grub_uint8_t *highlight_col
   *highlight_color = grub_ofconsole_highlight_color;
 }
 
-#define ANSI_C0 0x9b
-
 static int
-grub_ofconsole_readkey (int *key)
+readkey (void)
 {
   grub_uint8_t c;
   grub_ssize_t actual = 0;
 
   grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
   if (actual > 0)
-    switch(c)
-      {
-      case 0x7f:
-        /* Backspace: Ctrl-h.  */
-        c = '\b'; 
-        break;
-      case ANSI_C0:
-      case '\e':
-	{
-	  grub_uint64_t start;
-
-	  if (c == '\e')
-	    {
-	      grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
-
-	      /* On 9600 we have to wait up to 12 milliseconds.  */
-	      start = grub_get_time_ms ();
-	      while (actual <= 0 && grub_get_time_ms () - start < 12)
-		grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
-
-	      if (actual <= 0)
-		{
-		  *key = '\e';
-		  return 1;
-		}
-
-	      if (c != '[')
-		return 0;
-	    }
-
-	  grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
-
-	  /* On 9600 we have to wait up to 12 milliseconds.  */
-	  start = grub_get_time_ms ();
-	  while (actual <= 0 && grub_get_time_ms () - start < 12)
-	    grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
-	  if (actual <= 0)
-	    return 0;
-
-	  switch (c)
-	    {
-	    case 'A':
-	      /* Up: Ctrl-p.  */
-	      c = GRUB_TERM_UP;
-	      break;
-	    case 'B':
-	      /* Down: Ctrl-n.  */
-	      c = GRUB_TERM_DOWN;
-	      break;
-	    case 'C':
-	      /* Right: Ctrl-f.  */
-	      c = GRUB_TERM_RIGHT;
-	      break;
-	    case 'D':
-	      /* Left: Ctrl-b.  */
-	      c = GRUB_TERM_LEFT;
-	      break;
-	    case '3':
-	      {
-		grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
-		/* On 9600 we have to wait up to 12 milliseconds.  */
-		start = grub_get_time_ms ();
-		while (actual <= 0 && grub_get_time_ms () - start < 12)
-		  grub_ieee1275_read (stdin_ihandle, &c, 1, &actual);
-		
-		if (actual <= 0)
-		  return 0;
-  	    
-		/* Delete: Ctrl-d.  */
-		if (c == '~')
-		  c = GRUB_TERM_DC;
-		else
-		  return 0;
-		break;
-	      }
-	      break;
-	    }
-	}
-      }
-
-  *key = c;
-  return actual > 0;
+    return c;
+  return -1;
 }
 
 static int
 grub_ofconsole_checkkey (void)
 {
-  int key;
-  int read;
-
   if (grub_buflen)
     return 1;
 
-  read = grub_ofconsole_readkey (&key);
-  if (read)
-    {
-      grub_keybuf = key;
-      grub_buflen = 1;
-      return 1;
-    }
+  grub_terminfo_readkey (grub_keybuf, &grub_buflen, readkey);
+
+  if (grub_buflen)
+    return 1;
 
   return -1;
 }
@@ -266,17 +179,14 @@ grub_ofconsole_checkkey (void)
 static int
 grub_ofconsole_getkey (void)
 {
-  int key;
+  int ret;
+  while (! grub_buflen)
+    grub_terminfo_readkey (grub_keybuf, &grub_buflen, readkey);
 
-  if (grub_buflen)
-    {
-      grub_buflen  =0;
-      return grub_keybuf;
-    }
-
-  while (! grub_ofconsole_readkey (&key));
-
-  return key;
+  ret = grub_keybuf[0];
+  grub_buflen--;
+  grub_memmove (grub_keybuf, grub_keybuf + 1, grub_buflen);
+  return ret;
 }
 
 static grub_uint16_t
diff --git a/term/terminfo.c b/term/terminfo.c
index 03a7dc2b6..ef713e151 100644
--- a/term/terminfo.c
+++ b/term/terminfo.c
@@ -32,6 +32,7 @@
 #include <grub/tparm.h>
 #include <grub/command.h>
 #include <grub/i18n.h>
+#include <grub/time.h>
 
 struct terminfo
 {
@@ -167,6 +168,114 @@ grub_terminfo_cursor_off (grub_term_output_t oterm)
   putstr (grub_terminfo_tparm (term.cursor_off), oterm);
 }
 
+#define ANSI_C0 0x9b
+
+void
+grub_terminfo_readkey (int *keys, int *len, int (*readkey) (void))
+{
+  int c;
+
+#define CONTINUE_READ						\
+  {								\
+    grub_uint64_t start;					\
+    /* On 9600 we have to wait up to 12 milliseconds.  */	\
+    start = grub_get_time_ms ();				\
+    do								\
+      c = readkey ();						\
+    while (c == -1 && grub_get_time_ms () - start < 12);	\
+    if (c == -1)						\
+      return;							\
+								\
+    keys[*len] = c;						\
+    (*len)++;							\
+  }
+
+  c = readkey ();
+  if (c < 0)
+    {
+      *len = 0;
+      return;
+    }
+  *len = 1;
+  keys[0] = c;
+  if (c != ANSI_C0 && c != '\e')
+    {
+      /* Backspace: Ctrl-h.  */
+      if (c == 0x7f)
+	c = '\b'; 
+      *len = 1;
+      keys[0] = c;
+      return;
+    }
+
+  {
+    static struct
+    {
+      char key;
+      char ascii;
+    }
+    three_code_table[] =
+      {
+	{'4', GRUB_TERM_DC},
+	{'A', GRUB_TERM_UP},
+	{'B', GRUB_TERM_DOWN},
+	{'C', GRUB_TERM_RIGHT},
+	{'D', GRUB_TERM_LEFT},
+	{'F', GRUB_TERM_END},
+	{'H', GRUB_TERM_HOME},
+	{'K', GRUB_TERM_END},
+	{'P', GRUB_TERM_DC},
+	{'?', GRUB_TERM_PPAGE},
+	{'/', GRUB_TERM_NPAGE}
+      };
+
+    static struct
+    {
+      char key;
+      char ascii;
+    }
+    four_code_table[] =
+      {
+	{'1', GRUB_TERM_HOME},
+	{'3', GRUB_TERM_DC},
+	{'5', GRUB_TERM_PPAGE},
+	{'6', GRUB_TERM_NPAGE}
+      };
+    unsigned i;
+
+    if (c == '\e')
+      {
+	CONTINUE_READ;
+
+	if (c != '[')
+	  return;
+      }
+
+    CONTINUE_READ;
+	
+    for (i = 0; i < ARRAY_SIZE (three_code_table); i++)
+      if (three_code_table[i].key == c)
+	{
+	  keys[0] = three_code_table[i].ascii;
+	  *len = 1;
+	  return;
+	}
+
+    for (i = 0; i < ARRAY_SIZE (four_code_table); i++)
+      if (four_code_table[i].key == c)
+	{
+	  CONTINUE_READ;
+	  if (c != '~')
+	    return;
+	  keys[0] = three_code_table[i].ascii;
+	  *len = 1;
+	  return;
+	}
+    return;
+  }
+#undef CONTINUE_READ
+}
+
 /* GRUB Command.  */
 
 static grub_err_t

From 82e32bc310045899af6bd13399d0dcc4c5f9583d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 6 May 2010 21:32:58 +0200
Subject: [PATCH 0932/1628] make serial use ANSI code recognition in
 terminfo.mod

---
 conf/i386-ieee1275.rmk    |   2 +-
 include/grub/terminfo.h   |  20 +++---
 term/ieee1275/ofconsole.c |   4 +-
 term/serial.c             | 125 ++++++--------------------------------
 4 files changed, 30 insertions(+), 121 deletions(-)

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 648205657..66e75c77b 100644
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -25,7 +25,7 @@ kernel_img_SOURCES = kern/i386/ieee1275/startup.S \
 	term/terminfo.c term/tparm.c 	\
 	disk/ieee1275/ofdisk.c \
 	symlist.c
-kernel_img_HEADERS += ieee1275/ieee1275.h
+kernel_img_HEADERS += ieee1275/ieee1275.h terminfo.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x10000,-Bstatic
diff --git a/include/grub/terminfo.h b/include/grub/terminfo.h
index 84a6f6ab2..f078871d0 100644
--- a/include/grub/terminfo.h
+++ b/include/grub/terminfo.h
@@ -23,18 +23,18 @@
 #include <grub/types.h>
 #include <grub/term.h>
 
-char *grub_terminfo_get_current (void);
-grub_err_t grub_terminfo_set_current (const char *);
+char *EXPORT_FUNC(grub_terminfo_get_current) (void);
+grub_err_t EXPORT_FUNC(grub_terminfo_set_current) (const char *);
 
-void grub_terminfo_gotoxy (grub_uint8_t x, grub_uint8_t y,
-			   grub_term_output_t oterm);
-void grub_terminfo_cls (grub_term_output_t oterm);
-void grub_terminfo_reverse_video_on (grub_term_output_t oterm);
-void grub_terminfo_reverse_video_off (grub_term_output_t oterm);
-void grub_terminfo_cursor_on (grub_term_output_t oterm);
-void grub_terminfo_cursor_off (grub_term_output_t oterm);
+void EXPORT_FUNC(grub_terminfo_gotoxy) (grub_uint8_t x, grub_uint8_t y,
+					grub_term_output_t oterm);
+void EXPORT_FUNC(grub_terminfo_cls) (grub_term_output_t oterm);
+void EXPORT_FUNC(grub_terminfo_reverse_video_on) (grub_term_output_t oterm);
+void EXPORT_FUNC(grub_terminfo_reverse_video_off) (grub_term_output_t oterm);
+void EXPORT_FUNC(grub_terminfo_cursor_on) (grub_term_output_t oterm);
+void EXPORT_FUNC(grub_terminfo_cursor_off) (grub_term_output_t oterm);
 
 #define GRUB_TERMINFO_READKEY_MAX_LEN 4
-void grub_terminfo_readkey (int *keys, int *len, int (*readkey) (void));
+void EXPORT_FUNC(grub_terminfo_readkey) (int *keys, int *len, int (*readkey) (void));
 
 #endif /* ! GRUB_TERMINFO_HEADER */
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index 74de5806e..b9b60901b 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -166,12 +166,12 @@ static int
 grub_ofconsole_checkkey (void)
 {
   if (grub_buflen)
-    return 1;
+    return grub_keybuf[0];
 
   grub_terminfo_readkey (grub_keybuf, &grub_buflen, readkey);
 
   if (grub_buflen)
-    return 1;
+    return grub_keybuf[0];
 
   return -1;
 }
diff --git a/term/serial.c b/term/serial.c
index 6a20545b2..bdc80cb74 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -35,8 +35,8 @@ static unsigned int keep_track = 1;
 static unsigned int registered = 0;
 
 /* An input buffer.  */
-static char input_buf[8];
-static unsigned int npending = 0;
+static int input_buf[GRUB_TERMINFO_READKEY_MAX_LEN];
+static int npending = 0;
 
 static struct grub_term_output grub_serial_term_output;
 
@@ -114,98 +114,6 @@ serial_hw_put (const int c)
   grub_outb (c, serial_settings.port + UART_TX);
 }
 
-static void
-serial_translate_key_sequence (void)
-{
-  unsigned int i;
-  static struct
-  {
-    char key;
-    char ascii;
-  }
-  three_code_table[] =
-    {
-      {'A', 16},
-      {'B', 14},
-      {'C', 6},
-      {'D', 2},
-      {'F', 5},
-      {'H', 1},
-      {'4', 4}
-    };
-
-  static struct
-  {
-      short key;
-      char ascii;
-  }
-  four_code_table[] =
-    {
-      {('1' | ('~' << 8)), 1},
-      {('3' | ('~' << 8)), 4},
-      {('5' | ('~' << 8)), 7},
-      {('6' | ('~' << 8)), 3}
-    };
-
-  if (npending < 3)
-    return;
-
-  /* The buffer must start with "ESC [".  */
-  if (input_buf[0] != '\e' || input_buf[1] != '[')
-    return;
-
-  for (i = 0; i < ARRAY_SIZE (three_code_table); i++)
-    if (three_code_table[i].key == input_buf[2])
-      {
-	input_buf[0] = three_code_table[i].ascii;
-	npending -= 2;
-	grub_memmove (input_buf + 1, input_buf + 3, npending - 1);
-	return;
-      }
-
-  if (npending >= 4)
-    {
-      short key = input_buf[3] | (input_buf[4] << 8);
-
-      for (i = 0; i < ARRAY_SIZE (four_code_table); i++)
-	if (four_code_table[i].key == key)
-	  {
-	    input_buf[0] = four_code_table[i].ascii;
-	    npending -= 3;
-	    grub_memmove (input_buf + 1, input_buf + 4, npending - 1);
-	    return;
-	  }
-    }
-}
-
-static int
-fill_input_buf (const int nowait)
-{
-  int i;
-
-  for (i = 0; i < 10000 && npending < sizeof (input_buf); i++)
-    {
-      int c;
-
-      c = serial_hw_fetch ();
-      if (c >= 0)
-	{
-	  input_buf[npending++] = c;
-
-	  /* Reset the counter to zero, to wait for the same interval.  */
-	  i = 0;
-	}
-
-      if (nowait)
-	break;
-    }
-
-  /* Translate some key sequences.  */
-  serial_translate_key_sequence ();
-
-  return npending;
-}
-
 /* Convert speed to divisor.  */
 static unsigned short
 serial_get_divisor (unsigned int speed)
@@ -248,28 +156,29 @@ serial_get_divisor (unsigned int speed)
 static int
 grub_serial_checkkey (void)
 {
-  if (fill_input_buf (1))
+  if (npending)
     return input_buf[0];
-  else
-    return -1;
+
+  grub_terminfo_readkey (input_buf, &npending, serial_hw_fetch);
+
+  if (npending)
+    return input_buf[0];
+
+  return -1;
 }
 
 /* The serial version of getkey.  */
 static int
 grub_serial_getkey (void)
 {
-  int c;
+  int ret;
+  while (! npending)
+    grub_terminfo_readkey (input_buf, &npending, serial_hw_fetch);
 
-  while (! fill_input_buf (0))
-    ;
-
-  c = input_buf[0];
-  if (c == 0x7f)
-    c = GRUB_TERM_BACKSPACE;
-
-  grub_memmove (input_buf, input_buf + 1, --npending);
-
-  return c;
+  ret = input_buf[0];
+  npending--;
+  grub_memmove (input_buf, input_buf + 1, npending);
+  return ret;
 }
 
 /* Initialize a serial device. PORT is the port number for a serial device.

From 58664b94b78de229970f97acd40fc1a358934bec Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 7 May 2010 02:30:44 +0200
Subject: [PATCH 0933/1628] pass pointer to term to term functions

---
 commands/terminal.c            | 12 +++---
 include/grub/i386/pc/console.h | 16 ++++----
 include/grub/i386/vga_common.h | 13 ++++--
 include/grub/term.h            | 72 +++++++++++++++++++---------------
 kern/i386/pc/startup.S         |  8 ++--
 kern/term.c                    | 14 +++----
 normal/term.c                  | 16 ++++----
 term/at_keyboard.c             |  8 ++--
 term/efi/console.c             | 30 ++++++++------
 term/gfxterm.c                 | 46 +++++++++++++---------
 term/i386/pc/console.c         |  2 +-
 term/i386/pc/vga.c             | 25 +++++++-----
 term/i386/pc/vga_text.c        | 19 +++++----
 term/i386/vga_common.c         | 11 ++++--
 term/ieee1275/ofconsole.c      | 47 +++++++++++-----------
 term/serial.c                  | 26 ++++++------
 term/terminfo.c                |  2 +-
 term/usb_keyboard.c            |  8 ++--
 util/console.c                 | 36 ++++++++++-------
 19 files changed, 230 insertions(+), 181 deletions(-)

diff --git a/commands/terminal.c b/commands/terminal.c
index 1129c39bd..d34602a1b 100644
--- a/commands/terminal.c
+++ b/commands/terminal.c
@@ -30,8 +30,8 @@ struct abstract_terminal
 {
   struct abstract_terminal *next;
   const char *name;
-  grub_err_t (*init) (void);
-  grub_err_t (*fini) (void);
+  grub_err_t (*init) (struct abstract_terminal *term);
+  grub_err_t (*fini) (struct abstract_terminal *term);
 };
 
 static grub_err_t
@@ -123,7 +123,7 @@ handle_command (int argc, char **args, struct abstract_terminal **enabled,
              break;
          if (term)
            {
-              if (term->init && term->init () != GRUB_ERR_NONE)
+              if (term->init && term->init (term) != GRUB_ERR_NONE)
                 return grub_errno;
 
              grub_list_remove (GRUB_AS_LIST_P (disabled), GRUB_AS_LIST (term));
@@ -147,7 +147,7 @@ handle_command (int argc, char **args, struct abstract_terminal **enabled,
                                   "can't remove the last terminal");
              grub_list_remove (GRUB_AS_LIST_P (enabled), GRUB_AS_LIST (term));
              if (term->fini)
-               term->fini ();
+               term->fini (term);
              grub_list_push (GRUB_AS_LIST_P (disabled), GRUB_AS_LIST (term));
            }
        }
@@ -160,7 +160,7 @@ handle_command (int argc, char **args, struct abstract_terminal **enabled,
          break;
       if (term)
        {
-         if (term->init && term->init () != GRUB_ERR_NONE)
+         if (term->init && term->init (term) != GRUB_ERR_NONE)
            return grub_errno;
 
          grub_list_remove (GRUB_AS_LIST_P (disabled), GRUB_AS_LIST (term));
@@ -183,7 +183,7 @@ handle_command (int argc, char **args, struct abstract_terminal **enabled,
                                 "can't remove the last terminal");
            grub_list_remove (GRUB_AS_LIST_P (enabled), GRUB_AS_LIST (term));
            if (term->fini)
-             term->fini ();
+             term->fini (term);
            grub_list_push (GRUB_AS_LIST_P (disabled), GRUB_AS_LIST (term));
          }
       }
diff --git a/include/grub/i386/pc/console.h b/include/grub/i386/pc/console.h
index b677bb886..7f58344ec 100644
--- a/include/grub/i386/pc/console.h
+++ b/include/grub/i386/pc/console.h
@@ -40,13 +40,15 @@
 #include <grub/i386/vga_common.h>
 
 /* These are global to share code between C and asm.  */
-int grub_console_checkkey (void);
-int grub_console_getkey (void);
-grub_uint16_t grub_console_getxy (void);
-void grub_console_gotoxy (grub_uint8_t x, grub_uint8_t y);
-void grub_console_cls (void);
-void grub_console_setcursor (int on);
-void grub_console_putchar (const struct grub_unicode_glyph *c);
+int grub_console_checkkey (struct grub_term_input *term);
+int grub_console_getkey (struct grub_term_input *term);
+grub_uint16_t grub_console_getxy (struct grub_term_output *term);
+void grub_console_gotoxy (struct grub_term_output *term,
+			  grub_uint8_t x, grub_uint8_t y);
+void grub_console_cls (struct grub_term_output *term);
+void grub_console_setcursor (struct grub_term_output *term, int on);
+void grub_console_putchar (struct grub_term_output *term,
+			   const struct grub_unicode_glyph *c);
 
 /* Initialize the console system.  */
 void grub_console_init (void);
diff --git a/include/grub/i386/vga_common.h b/include/grub/i386/vga_common.h
index 7df2b9e9e..8ba09dfea 100644
--- a/include/grub/i386/vga_common.h
+++ b/include/grub/i386/vga_common.h
@@ -25,9 +25,14 @@
 
 extern grub_uint8_t grub_console_cur_color;
 
-grub_uint16_t grub_console_getwh (void);
-void grub_console_setcolorstate (grub_term_color_state state);
-void grub_console_setcolor (grub_uint8_t normal_color, grub_uint8_t highlight_color);
-void grub_console_getcolor (grub_uint8_t *normal_color, grub_uint8_t *highlight_color);
+grub_uint16_t grub_console_getwh (struct grub_term_output *term);
+void grub_console_setcolorstate (struct grub_term_output *term,
+				 grub_term_color_state state);
+void grub_console_setcolor (struct grub_term_output *term,
+			    grub_uint8_t normal_color,
+			    grub_uint8_t highlight_color);
+void grub_console_getcolor (struct grub_term_output *term,
+			    grub_uint8_t *normal_color,
+			    grub_uint8_t *highlight_color);
 
 #endif /* ! GRUB_VGA_COMMON_CPU_HEADER */
diff --git a/include/grub/term.h b/include/grub/term.h
index 40f7fb0b9..c43eb6ff7 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -136,19 +136,21 @@ struct grub_term_input
   const char *name;
 
   /* Initialize the terminal.  */
-  grub_err_t (*init) (void);
+  grub_err_t (*init) (struct grub_term_input *term);
 
   /* Clean up the terminal.  */
-  grub_err_t (*fini) (void);
+  grub_err_t (*fini) (struct grub_term_input *term);
 
   /* Check if any input character is available.  */
-  int (*checkkey) (void);
+  int (*checkkey) (struct grub_term_input *term);
 
   /* Get a character.  */
-  int (*getkey) (void);
+  int (*getkey) (struct grub_term_input *term);
 
   /* Get keyboard modifier status.  */
-  int (*getkeystatus) (void);
+  int (*getkeystatus) (struct grub_term_input *term);
+
+  void *data;
 };
 typedef struct grub_term_input *grub_term_input_t;
 
@@ -161,49 +163,57 @@ struct grub_term_output
   const char *name;
 
   /* Initialize the terminal.  */
-  grub_err_t (*init) (void);
+  grub_err_t (*init) (struct grub_term_output *term);
 
   /* Clean up the terminal.  */
-  grub_err_t (*fini) (void);
+  grub_err_t (*fini) (struct grub_term_output *term);
 
   /* Put a character. C is encoded in Unicode.  */
-  void (*putchar) (const struct grub_unicode_glyph *c);
+  void (*putchar) (struct grub_term_output *term,
+		   const struct grub_unicode_glyph *c);
 
   /* Get the number of columns occupied by a given character C. C is
      encoded in Unicode.  */
-  grub_ssize_t (*getcharwidth) (const struct grub_unicode_glyph *c);
+  grub_ssize_t (*getcharwidth) (struct grub_term_output *term,
+				const struct grub_unicode_glyph *c);
 
   /* Get the screen size. The return value is ((Width << 8) | Height).  */
-  grub_uint16_t (*getwh) (void);
+  grub_uint16_t (*getwh) (struct grub_term_output *term);
 
   /* Get the cursor position. The return value is ((X << 8) | Y).  */
-  grub_uint16_t (*getxy) (void);
+  grub_uint16_t (*getxy) (struct grub_term_output *term);
 
   /* Go to the position (X, Y).  */
-  void (*gotoxy) (grub_uint8_t x, grub_uint8_t y);
+  void (*gotoxy) (struct grub_term_output *term,
+		  grub_uint8_t x, grub_uint8_t y);
 
   /* Clear the screen.  */
-  void (*cls) (void);
+  void (*cls) (struct grub_term_output *term);
 
   /* Set the current color to be used */
-  void (*setcolorstate) (grub_term_color_state state);
+  void (*setcolorstate) (struct grub_term_output *term,
+			 grub_term_color_state state);
 
   /* Set the normal color and the highlight color. The format of each
      color is VGA's.  */
-  void (*setcolor) (grub_uint8_t normal_color, grub_uint8_t highlight_color);
+  void (*setcolor) (struct grub_term_output *term,
+		    grub_uint8_t normal_color, grub_uint8_t highlight_color);
 
   /* Get the normal color and the highlight color. The format of each
      color is VGA's.  */
-  void (*getcolor) (grub_uint8_t *normal_color, grub_uint8_t *highlight_color);
+  void (*getcolor) (struct grub_term_output *term,
+		    grub_uint8_t *normal_color, grub_uint8_t *highlight_color);
 
   /* Turn on/off the cursor.  */
-  void (*setcursor) (int on);
+  void (*setcursor) (struct grub_term_output *term, int on);
 
   /* Update the screen.  */
-  void (*refresh) (void);
+  void (*refresh) (struct grub_term_output *term);
 
   /* The feature flags defined above.  */
   grub_uint32_t flags;
+
+  void *data;
 };
 typedef struct grub_term_output *grub_term_output_t;
 
@@ -222,7 +232,7 @@ grub_term_register_input (const char *name __attribute__ ((unused)),
   else
     {
       /* If this is the first terminal, enable automatically.  */
-      if (! term->init || term->init () == GRUB_ERR_NONE)
+      if (! term->init || term->init (term) == GRUB_ERR_NONE)
 	grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs), GRUB_AS_LIST (term));
     }
 }
@@ -237,7 +247,7 @@ grub_term_register_output (const char *name __attribute__ ((unused)),
   else
     {
       /* If this is the first terminal, enable automatically.  */
-      if (! term->init || term->init () == GRUB_ERR_NONE)
+      if (! term->init || term->init (term) == GRUB_ERR_NONE)
 	grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs),
 			GRUB_AS_LIST (term));
     }
@@ -277,12 +287,12 @@ void grub_term_restore_pos (grub_uint16_t *pos);
 
 static inline unsigned grub_term_width (struct grub_term_output *term)
 {
-  return ((term->getwh()&0xFF00)>>8);
+  return ((term->getwh(term)&0xFF00)>>8);
 }
 
 static inline unsigned grub_term_height (struct grub_term_output *term)
 {
-  return (term->getwh()&0xFF);
+  return (term->getwh(term)&0xFF);
 }
 
 /* The width of the border.  */
@@ -326,20 +336,20 @@ grub_term_cursor_x (struct grub_term_output *term)
 static inline grub_uint16_t
 grub_term_getxy (struct grub_term_output *term)
 {
-  return term->getxy ();
+  return term->getxy (term);
 }
 
 static inline void
 grub_term_refresh (struct grub_term_output *term)
 {
   if (term->refresh)
-    term->refresh ();
+    term->refresh (term);
 }
 
 static inline void
 grub_term_gotoxy (struct grub_term_output *term, grub_uint8_t x, grub_uint8_t y)
 {
-  term->gotoxy (x, y);
+  term->gotoxy (term, x, y);
 }
 
 static inline void 
@@ -347,7 +357,7 @@ grub_term_setcolorstate (struct grub_term_output *term,
 			 grub_term_color_state state)
 {
   if (term->setcolorstate)
-    term->setcolorstate (state);
+    term->setcolorstate (term, state);
 }
 
   /* Set the normal color and the highlight color. The format of each
@@ -357,7 +367,7 @@ grub_term_setcolor (struct grub_term_output *term,
 		    grub_uint8_t normal_color, grub_uint8_t highlight_color)
 {
   if (term->setcolor)
-    term->setcolor (normal_color, highlight_color);
+    term->setcolor (term, normal_color, highlight_color);
 }
 
 /* Turn on/off the cursor.  */
@@ -365,14 +375,14 @@ static inline void
 grub_term_setcursor (struct grub_term_output *term, int on)
 {
   if (term->setcursor)
-    term->setcursor (on);
+    term->setcursor (term, on);
 }
 
 static inline void 
 grub_term_cls (struct grub_term_output *term)
 {
   if (term->cls)
-    (term->cls) ();
+    (term->cls) (term);
   else
     {
       grub_putcode ('\n', term);
@@ -402,7 +412,7 @@ grub_term_getcharwidth (struct grub_term_output *term,
 			const struct grub_unicode_glyph *c)
 {
   if (term->getcharwidth)
-    return term->getcharwidth (c);
+    return term->getcharwidth (term, c);
   else if (((term->flags & GRUB_TERM_CODE_TYPE_MASK)
 	    == GRUB_TERM_CODE_TYPE_UTF8_LOGICAL)
 	   || ((term->flags & GRUB_TERM_CODE_TYPE_MASK)
@@ -419,7 +429,7 @@ grub_term_getcolor (struct grub_term_output *term,
 		    grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
 {
   if (term->getcolor)
-    term->getcolor (normal_color, highlight_color);
+    term->getcolor (term, normal_color, highlight_color);
   else
     {
       *normal_color = 0x07;
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index f3942e199..761eb53fe 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -1078,7 +1078,7 @@ xsmap:
  */
 FUNCTION(grub_console_putchar)
 	/* Retrieve the base character.  */
-	movl	0(%eax), %edx
+	movl	0(%edx), %edx
 	pusha
 	movb	EXT_C(grub_console_cur_color), %bl
 
@@ -1329,8 +1329,8 @@ FUNCTION(grub_console_gotoxy)
 	pushl	%ebp
 	pushl	%ebx                    /* save EBX */
 
-	movb	%dl, %dh	/* %dh = y */
-	movb	%al, %dl	/* %dl = x */
+	movb	%cl, %dh	/* %dh = y */
+	/* %dl = x */
 
 	call	prot_to_real
 	.code16
@@ -1406,7 +1406,7 @@ FUNCTION(grub_console_setcursor)
 	pushl	%ebx
 
 	/* push ON */
-	pushl	%eax
+	pushl	%edx
 
 	/* check if the standard cursor shape has already been saved */
 	movw	console_cursor_shape, %ax
diff --git a/kern/term.c b/kern/term.c
index dba94ecf7..a1f8b9f93 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -47,14 +47,14 @@ grub_putcode_dumb (grub_uint32_t code,
     {
       int n;
 
-      n = 8 - ((term->getxy () >> 8) & 7);
+      n = 8 - ((term->getxy (term) >> 8) & 7);
       while (n--)
 	grub_putcode_dumb (' ', term);
 
       return;
     }
 
-  (term->putchar) (&c);
+  (term->putchar) (term, &c);
   if (code == '\n')
     grub_putcode_dumb ('\r', term);
 }
@@ -87,9 +87,9 @@ grub_getkey (void)
     {
       FOR_ACTIVE_TERM_INPUTS(term)
       {
-	int key = term->checkkey ();
+	int key = term->checkkey (term);
 	if (key != -1)
-	  return term->getkey ();
+	  return term->getkey (term);
       }
 
       grub_cpu_idle ();
@@ -103,7 +103,7 @@ grub_checkkey (void)
 
   FOR_ACTIVE_TERM_INPUTS(term)
   {
-    int key = term->checkkey ();
+    int key = term->checkkey (term);
     if (key != -1)
       return key;
   }
@@ -120,7 +120,7 @@ grub_getkeystatus (void)
   FOR_ACTIVE_TERM_INPUTS(term)
   {
     if (term->getkeystatus)
-      status |= term->getkeystatus ();
+      status |= term->getkeystatus (term);
   }
 
   return status;
@@ -139,7 +139,7 @@ grub_cls (void)
 	grub_term_refresh (term);
       }
     else
-      (term->cls) ();
+      (term->cls) (term);
   }
 }
 
diff --git a/normal/term.c b/normal/term.c
index 97c415f8a..f46930be4 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -366,10 +366,10 @@ putglyph (const struct grub_unicode_glyph *c, struct grub_term_output *term)
     {
       int n;
 
-      n = 8 - ((term->getxy () >> 8) & 7);
+      n = 8 - ((term->getxy (term) >> 8) & 7);
       c2.base = ' ';
       while (n--)
-	(term->putchar) (&c2);
+	(term->putchar) (term, &c2);
 
       return;
     }
@@ -405,19 +405,19 @@ putglyph (const struct grub_unicode_glyph *c, struct grub_term_output *term)
 	  for (ptr = u8; *ptr; ptr++)
 	    {
 	      c2.base = *ptr;
-	      (term->putchar) (&c2);
+	      (term->putchar) (term, &c2);
 	      c2.estimated_width = 0;
 	    }
 	}
       c2.estimated_width = 1;
     }
   else
-    (term->putchar) (c);
+    (term->putchar) (term, c);
 
   if (c->base == '\n')
     {
       c2.base = '\r';
-      (term->putchar) (&c2);
+      (term->putchar) (term, &c2);
     }
 }
 
@@ -468,7 +468,7 @@ static grub_ssize_t
 get_startwidth (struct grub_term_output *term,
 		int margin_left)
 {
-  return ((term->getxy () >> 8) & 0xff) - margin_left;
+  return ((term->getxy (term) >> 8) & 0xff) - margin_left;
 }
 
 static int
@@ -670,8 +670,8 @@ print_ucs4_real (const grub_uint32_t * str,
   if (backlog)
     state = find_term_state (term);
 
-  if (((term->getxy () >> 8) & 0xff) < margin_left)
-    grub_print_spaces (term, margin_left - ((term->getxy () >> 8) & 0xff));
+  if (((term->getxy (term) >> 8) & 0xff) < margin_left)
+    grub_print_spaces (term, margin_left - ((term->getxy (term) >> 8) & 0xff));
 
   if ((term->flags & GRUB_TERM_CODE_TYPE_MASK) 
       == GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS
diff --git a/term/at_keyboard.c b/term/at_keyboard.c
index 1f84ae71a..c3e71ea2d 100644
--- a/term/at_keyboard.c
+++ b/term/at_keyboard.c
@@ -236,7 +236,7 @@ grub_at_keyboard_getkey_noblock (void)
 }
 
 static int
-grub_at_keyboard_checkkey (void)
+grub_at_keyboard_checkkey (struct grub_term_input *term __attribute__ ((unused)))
 {
   if (pending_key != -1)
     return 1;
@@ -250,7 +250,7 @@ grub_at_keyboard_checkkey (void)
 }
 
 static int
-grub_at_keyboard_getkey (void)
+grub_at_keyboard_getkey (struct grub_term_input *term __attribute__ ((unused)))
 {
   int key;
   if (pending_key != -1)
@@ -267,7 +267,7 @@ grub_at_keyboard_getkey (void)
 }
 
 static grub_err_t
-grub_keyboard_controller_init (void)
+grub_keyboard_controller_init (struct grub_term_input *term __attribute__ ((unused)))
 {
   pending_key = -1;
   at_keyboard_status = 0;
@@ -277,7 +277,7 @@ grub_keyboard_controller_init (void)
 }
 
 static grub_err_t
-grub_keyboard_controller_fini (void)
+grub_keyboard_controller_fini (struct grub_term_input *term __attribute__ ((unused)))
 {
   grub_keyboard_controller_write (grub_keyboard_controller_orig);
   return GRUB_ERR_NONE;
diff --git a/term/efi/console.c b/term/efi/console.c
index cba56bcc8..e5dab8a96 100644
--- a/term/efi/console.c
+++ b/term/efi/console.c
@@ -85,7 +85,8 @@ map_char (grub_uint32_t c)
 }
 
 static void
-grub_console_putchar (const struct grub_unicode_glyph *c)
+grub_console_putchar (struct grub_term_output *term __attribute__ ((unused)),
+		      const struct grub_unicode_glyph *c)
 {
   grub_efi_char16_t str[2 + c->ncomb];
   grub_efi_simple_text_output_interface_t *o;
@@ -113,7 +114,7 @@ grub_console_putchar (const struct grub_unicode_glyph *c)
 }
 
 static int
-grub_console_checkkey (void)
+grub_console_checkkey (struct grub_term_input *term __attribute__ ((unused)))
 {
   grub_efi_simple_input_interface_t *i;
   grub_efi_input_key_t key;
@@ -208,7 +209,7 @@ grub_console_checkkey (void)
 }
 
 static int
-grub_console_getkey (void)
+grub_console_getkey (struct grub_term_input *term)
 {
   grub_efi_simple_input_interface_t *i;
   grub_efi_boot_services_t *b;
@@ -232,7 +233,7 @@ grub_console_getkey (void)
       if (status != GRUB_EFI_SUCCESS)
         return -1;
 
-      grub_console_checkkey ();
+      grub_console_checkkey (term);
     }
   while (read_key < 0);
 
@@ -242,7 +243,7 @@ grub_console_getkey (void)
 }
 
 static grub_uint16_t
-grub_console_getwh (void)
+grub_console_getwh (struct grub_term_output *term __attribute__ ((unused)))
 {
   grub_efi_simple_text_output_interface_t *o;
   grub_efi_uintn_t columns, rows;
@@ -259,7 +260,7 @@ grub_console_getwh (void)
 }
 
 static grub_uint16_t
-grub_console_getxy (void)
+grub_console_getxy (struct grub_term_output *term __attribute__ ((unused)))
 {
   grub_efi_simple_text_output_interface_t *o;
 
@@ -268,7 +269,8 @@ grub_console_getxy (void)
 }
 
 static void
-grub_console_gotoxy (grub_uint8_t x, grub_uint8_t y)
+grub_console_gotoxy (struct grub_term_output *term __attribute__ ((unused)),
+		     grub_uint8_t x, grub_uint8_t y)
 {
   grub_efi_simple_text_output_interface_t *o;
 
@@ -277,7 +279,7 @@ grub_console_gotoxy (grub_uint8_t x, grub_uint8_t y)
 }
 
 static void
-grub_console_cls (void)
+grub_console_cls (struct grub_term_output *term __attribute__ ((unused)))
 {
   grub_efi_simple_text_output_interface_t *o;
   grub_efi_int32_t orig_attr;
@@ -290,7 +292,8 @@ grub_console_cls (void)
 }
 
 static void
-grub_console_setcolorstate (grub_term_color_state state)
+grub_console_setcolorstate (struct grub_term_output *term __attribute__ ((unused)),
+			    grub_term_color_state state)
 {
   grub_efi_simple_text_output_interface_t *o;
 
@@ -312,21 +315,24 @@ grub_console_setcolorstate (grub_term_color_state state)
 }
 
 static void
-grub_console_setcolor (grub_uint8_t normal_color, grub_uint8_t highlight_color)
+grub_console_setcolor (struct grub_term_output *term __attribute__ ((unused)),
+		       grub_uint8_t normal_color, grub_uint8_t highlight_color)
 {
   grub_console_normal_color = normal_color;
   grub_console_highlight_color = highlight_color;
 }
 
 static void
-grub_console_getcolor (grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
+grub_console_getcolor (struct grub_term_output *term __attribute__ ((unused)),
+		       grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
 {
   *normal_color = grub_console_normal_color;
   *highlight_color = grub_console_highlight_color;
 }
 
 static void
-grub_console_setcursor (int on)
+grub_console_setcursor (struct grub_term_output *term __attribute__ ((unused)),
+			int on)
 {
   grub_efi_simple_text_output_interface_t *o;
 
diff --git a/term/gfxterm.c b/term/gfxterm.c
index af6401bbf..d9fb2e04c 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -146,10 +146,11 @@ static unsigned int calculate_normal_character_width (grub_font_t font);
 
 static unsigned char calculate_character_width (struct grub_font_glyph *glyph);
 
-static void grub_gfxterm_refresh (void);
+static void grub_gfxterm_refresh (struct grub_term_output *term __attribute__ ((unused)));
 
 static grub_ssize_t
-grub_gfxterm_getcharwidth (const struct grub_unicode_glyph *c);
+grub_gfxterm_getcharwidth (struct grub_term_output *term __attribute__ ((unused)),
+			   const struct grub_unicode_glyph *c);
 
 static void
 set_term_color (grub_uint8_t term_color)
@@ -364,7 +365,7 @@ grub_gfxterm_fullscreen (void)
 }
 
 static grub_err_t
-grub_gfxterm_term_init (void)
+grub_gfxterm_term_init (struct grub_term_output *term __attribute__ ((unused)))
 {
   char *tmp;
   grub_err_t err;
@@ -408,7 +409,7 @@ destroy_window (void)
 }
 
 static grub_err_t
-grub_gfxterm_term_fini (void)
+grub_gfxterm_term_fini (struct grub_term_output *term __attribute__ ((unused)))
 {
   destroy_window ();
   grub_video_restore ();
@@ -822,7 +823,8 @@ scroll_up (void)
 }
 
 static void
-grub_gfxterm_putchar (const struct grub_unicode_glyph *c)
+grub_gfxterm_putchar (struct grub_term_output *term,
+		      const struct grub_unicode_glyph *c)
 {
   if (c->base == '\a')
     /* FIXME */
@@ -860,7 +862,7 @@ grub_gfxterm_putchar (const struct grub_unicode_glyph *c)
 
       /* Calculate actual character width for glyph. This is number of
          times of normal_font_width.  */
-      char_width = grub_gfxterm_getcharwidth (c);
+      char_width = grub_gfxterm_getcharwidth (term, c);
 
       /* If we are about to exceed line length, wrap to next line.  */
       if (virtual_screen.cursor_x + char_width > virtual_screen.columns)
@@ -959,7 +961,8 @@ calculate_character_width (struct grub_font_glyph *glyph)
 }
 
 static grub_ssize_t
-grub_gfxterm_getcharwidth (const struct grub_unicode_glyph *c)
+grub_gfxterm_getcharwidth (struct grub_term_output *term __attribute__ ((unused)),
+			   const struct grub_unicode_glyph *c)
 {
   int dev_width;
   dev_width = grub_font_get_constructed_device_width (virtual_screen.font, c);
@@ -972,19 +975,20 @@ grub_gfxterm_getcharwidth (const struct grub_unicode_glyph *c)
 }
 
 static grub_uint16_t
-grub_virtual_screen_getwh (void)
+grub_virtual_screen_getwh (struct grub_term_output *term __attribute__ ((unused)))
 {
   return (virtual_screen.columns << 8) | virtual_screen.rows;
 }
 
 static grub_uint16_t
-grub_virtual_screen_getxy (void)
+grub_virtual_screen_getxy (struct grub_term_output *term __attribute__ ((unused)))
 {
   return ((virtual_screen.cursor_x << 8) | virtual_screen.cursor_y);
 }
 
 static void
-grub_gfxterm_gotoxy (grub_uint8_t x, grub_uint8_t y)
+grub_gfxterm_gotoxy (struct grub_term_output *term __attribute__ ((unused)),
+		     grub_uint8_t x, grub_uint8_t y)
 {
   if (x >= virtual_screen.columns)
     x = virtual_screen.columns - 1;
@@ -1005,7 +1009,7 @@ grub_gfxterm_gotoxy (grub_uint8_t x, grub_uint8_t y)
 }
 
 static void
-grub_virtual_screen_cls (void)
+grub_virtual_screen_cls (struct grub_term_output *term __attribute__ ((unused)))
 {
   grub_uint32_t i;
 
@@ -1016,12 +1020,12 @@ grub_virtual_screen_cls (void)
 }
 
 static void
-grub_gfxterm_cls (void)
+grub_gfxterm_cls (struct grub_term_output *term)
 {
   grub_video_color_t color;
 
   /* Clear virtual screen.  */
-  grub_virtual_screen_cls ();
+  grub_virtual_screen_cls (term);
 
   /* Clear text layer.  */
   grub_video_set_active_render_target (text_layer);
@@ -1033,11 +1037,12 @@ grub_gfxterm_cls (void)
   /* Mark virtual screen to be redrawn.  */
   dirty_region_add_virtualscreen ();
 
-  grub_gfxterm_refresh ();
+  grub_gfxterm_refresh (term);
 }
 
 static void
-grub_virtual_screen_setcolorstate (grub_term_color_state state)
+grub_virtual_screen_setcolorstate (struct grub_term_output *term __attribute__ ((unused)),
+				   grub_term_color_state state)
 {
   switch (state)
     {
@@ -1062,7 +1067,8 @@ grub_virtual_screen_setcolorstate (grub_term_color_state state)
 }
 
 static void
-grub_virtual_screen_setcolor (grub_uint8_t normal_color,
+grub_virtual_screen_setcolor (struct grub_term_output *term __attribute__ ((unused)),
+			      grub_uint8_t normal_color,
                               grub_uint8_t highlight_color)
 {
   virtual_screen.normal_color_setting = normal_color;
@@ -1070,7 +1076,8 @@ grub_virtual_screen_setcolor (grub_uint8_t normal_color,
 }
 
 static void
-grub_virtual_screen_getcolor (grub_uint8_t *normal_color,
+grub_virtual_screen_getcolor (struct grub_term_output *term __attribute__ ((unused)),
+			      grub_uint8_t *normal_color,
                               grub_uint8_t *highlight_color)
 {
   *normal_color = virtual_screen.normal_color_setting;
@@ -1078,7 +1085,8 @@ grub_virtual_screen_getcolor (grub_uint8_t *normal_color,
 }
 
 static void
-grub_gfxterm_setcursor (int on)
+grub_gfxterm_setcursor (struct grub_term_output *term __attribute__ ((unused)),
+			int on)
 {
   if (virtual_screen.cursor_state != on)
     {
@@ -1092,7 +1100,7 @@ grub_gfxterm_setcursor (int on)
 }
 
 static void
-grub_gfxterm_refresh (void)
+grub_gfxterm_refresh (struct grub_term_output *term __attribute__ ((unused)))
 {
   real_scroll ();
 
diff --git a/term/i386/pc/console.c b/term/i386/pc/console.c
index 146e16643..c157f482c 100644
--- a/term/i386/pc/console.c
+++ b/term/i386/pc/console.c
@@ -30,7 +30,7 @@ static const struct grub_machine_bios_data_area *bios_data_area =
 #define KEYBOARD_ALT		(1 << 3)
 
 static int
-grub_console_getkeystatus (void)
+grub_console_getkeystatus (struct grub_term_input *term __attribute__ ((unused)))
 {
   grub_uint8_t status = bios_data_area->keyboard_flag_lower;
   int mods = 0;
diff --git a/term/i386/pc/vga.c b/term/i386/pc/vga.c
index 036ac592a..a9dd5e214 100644
--- a/term/i386/pc/vga.c
+++ b/term/i386/pc/vga.c
@@ -152,7 +152,7 @@ set_start_address (unsigned int start)
 }
 
 static grub_err_t
-grub_vga_mod_init (void)
+grub_vga_mod_init (struct grub_term_output *term __attribute__ ((unused)))
 {
   text_mode = grub_vga_set_mode (0x10);
   cursor_state = 1;
@@ -169,7 +169,7 @@ grub_vga_mod_init (void)
 }
 
 static grub_err_t
-grub_vga_mod_fini (void)
+grub_vga_mod_fini (struct grub_term_output *term __attribute__ ((unused)))
 {
   set_map_mask (saved_map_mask);
   grub_vga_set_mode (text_mode);
@@ -287,7 +287,8 @@ scroll_up (void)
 }
 
 static void
-grub_vga_putchar (const struct grub_unicode_glyph *c)
+grub_vga_putchar (struct grub_term_output *term __attribute__ ((unused)),
+		  const struct grub_unicode_glyph *c)
 {
 #if DEBUG_VGA
   static int show = 1;
@@ -393,7 +394,8 @@ grub_vga_putchar (const struct grub_unicode_glyph *c)
 }
 
 static grub_ssize_t
-grub_vga_getcharwidth (const struct grub_unicode_glyph *c)
+grub_vga_getcharwidth (struct grub_term_output *term __attribute__ ((unused)),
+		       const struct grub_unicode_glyph *c)
 {
 #if 0
   struct grub_font_glyph glyph;
@@ -408,19 +410,20 @@ grub_vga_getcharwidth (const struct grub_unicode_glyph *c)
 }
 
 static grub_uint16_t
-grub_vga_getwh (void)
+grub_vga_getwh (struct grub_term_output *term __attribute__ ((unused)))
 {
   return (TEXT_WIDTH << 8) | TEXT_HEIGHT;
 }
 
 static grub_uint16_t
-grub_vga_getxy (void)
+grub_vga_getxy (struct grub_term_output *term __attribute__ ((unused)))
 {
   return ((xpos << 8) | ypos);
 }
 
 static void
-grub_vga_gotoxy (grub_uint8_t x, grub_uint8_t y)
+grub_vga_gotoxy (struct grub_term_output *term __attribute__ ((unused)),
+		 grub_uint8_t x, grub_uint8_t y)
 {
   if (x >= TEXT_WIDTH || y >= TEXT_HEIGHT)
     {
@@ -440,7 +443,7 @@ grub_vga_gotoxy (grub_uint8_t x, grub_uint8_t y)
 }
 
 static void
-grub_vga_cls (void)
+grub_vga_cls (struct grub_term_output *term __attribute__ ((unused)))
 {
   unsigned i;
 
@@ -460,7 +463,8 @@ grub_vga_cls (void)
 }
 
 static void
-grub_vga_setcolorstate (grub_term_color_state state)
+grub_vga_setcolorstate (struct grub_term_output *term __attribute__ ((unused)),
+			grub_term_color_state state)
 {
   switch (state)
     {
@@ -479,7 +483,8 @@ grub_vga_setcolorstate (grub_term_color_state state)
 }
 
 static void
-grub_vga_setcursor (int on)
+grub_vga_setcursor (struct grub_term_output *term __attribute__ ((unused)),
+		    int on)
 {
   if (cursor_state != on)
     {
diff --git a/term/i386/pc/vga_text.c b/term/i386/pc/vga_text.c
index 3f352afb4..9242adf0f 100644
--- a/term/i386/pc/vga_text.c
+++ b/term/i386/pc/vga_text.c
@@ -84,7 +84,8 @@ inc_x (void)
 }
 
 static void
-grub_vga_text_putchar (const struct grub_unicode_glyph *c)
+grub_vga_text_putchar (struct grub_term_output *term __attribute__ ((unused)),
+		       const struct grub_unicode_glyph *c)
 {
   switch (c->base)
     {
@@ -108,13 +109,14 @@ grub_vga_text_putchar (const struct grub_unicode_glyph *c)
 }
 
 static grub_uint16_t
-grub_vga_text_getxy (void)
+grub_vga_text_getxy (struct grub_term_output *term __attribute__ ((unused)))
 {
   return (grub_curr_x << 8) | grub_curr_y;
 }
 
 static void
-grub_vga_text_gotoxy (grub_uint8_t x, grub_uint8_t y)
+grub_vga_text_gotoxy (struct grub_term_output *term __attribute__ ((unused)),
+		      grub_uint8_t x, grub_uint8_t y)
 {
   grub_curr_x = x;
   grub_curr_y = y;
@@ -122,16 +124,17 @@ grub_vga_text_gotoxy (grub_uint8_t x, grub_uint8_t y)
 }
 
 static void
-grub_vga_text_cls (void)
+grub_vga_text_cls (struct grub_term_output *term)
 {
   int i;
   for (i = 0; i < ROWS * COLS; i++)
     ((short *) VGA_TEXT_SCREEN)[i] = ' ' | (grub_console_cur_color << 8);
-  grub_vga_text_gotoxy (0, 0);
+  grub_vga_text_gotoxy (term, 0, 0);
 }
 
 static void
-grub_vga_text_setcursor (int on)
+grub_vga_text_setcursor (struct grub_term_output *term __attribute__ ((unused)),
+			 int on)
 {
   grub_uint8_t old;
   grub_outb (CRTC_CURSOR, CRTC_ADDR_PORT);
@@ -143,9 +146,9 @@ grub_vga_text_setcursor (int on)
 }
 
 static grub_err_t
-grub_vga_text_init_fini (void)
+grub_vga_text_init_fini (struct grub_term_output *term)
 {
-  grub_vga_text_cls ();
+  grub_vga_text_cls (term);
   return 0;
 }
 
diff --git a/term/i386/vga_common.c b/term/i386/vga_common.c
index 894c5d911..16dc8c56b 100644
--- a/term/i386/vga_common.c
+++ b/term/i386/vga_common.c
@@ -26,13 +26,14 @@ static grub_uint8_t grub_console_normal_color = 0x7;
 static grub_uint8_t grub_console_highlight_color = 0x70;
 
 grub_uint16_t
-grub_console_getwh (void)
+grub_console_getwh (struct grub_term_output *term __attribute__ ((unused)))
 {
   return (80 << 8) | 25;
 }
 
 void
-grub_console_setcolorstate (grub_term_color_state state)
+grub_console_setcolorstate (struct grub_term_output *term __attribute__ ((unused)),
+			    grub_term_color_state state)
 {
   switch (state) {
     case GRUB_TERM_COLOR_STANDARD:
@@ -50,14 +51,16 @@ grub_console_setcolorstate (grub_term_color_state state)
 }
 
 void
-grub_console_setcolor (grub_uint8_t normal_color, grub_uint8_t highlight_color)
+grub_console_setcolor (struct grub_term_output *term __attribute__ ((unused)),
+		       grub_uint8_t normal_color, grub_uint8_t highlight_color)
 {
   grub_console_normal_color = normal_color;
   grub_console_highlight_color = highlight_color;
 }
 
 void
-grub_console_getcolor (grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
+grub_console_getcolor (struct grub_term_output *term __attribute__ ((unused)),
+		       grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
 {
   *normal_color = grub_console_normal_color;
   *highlight_color = grub_console_highlight_color;
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index b9b60901b..590fa7f53 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -77,7 +77,8 @@ grub_ofconsole_writeesc (const char *str)
 }
 
 static void
-grub_ofconsole_putchar (const struct grub_unicode_glyph *c)
+grub_ofconsole_putchar (struct grub_term_output *term __attribute__ ((unused)),
+			const struct grub_unicode_glyph *c)
 {
   char chr;
 
@@ -109,7 +110,8 @@ grub_ofconsole_putchar (const struct grub_unicode_glyph *c)
 }
 
 static void
-grub_ofconsole_setcolorstate (grub_term_color_state state)
+grub_ofconsole_setcolorstate (struct grub_term_output *term __attribute__ ((unused)),
+			      grub_term_color_state state)
 {
   char setcol[256];
   int fg;
@@ -135,7 +137,8 @@ grub_ofconsole_setcolorstate (grub_term_color_state state)
 }
 
 static void
-grub_ofconsole_setcolor (grub_uint8_t normal_color,
+grub_ofconsole_setcolor (struct grub_term_output *term __attribute__ ((unused)),
+			 grub_uint8_t normal_color,
 			 grub_uint8_t highlight_color)
 {
   /* Discard bright bit.  */
@@ -144,7 +147,8 @@ grub_ofconsole_setcolor (grub_uint8_t normal_color,
 }
 
 static void
-grub_ofconsole_getcolor (grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
+grub_ofconsole_getcolor (struct grub_term_output *term __attribute__ ((unused)),
+			 grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
 {
   *normal_color = grub_ofconsole_normal_color;
   *highlight_color = grub_ofconsole_highlight_color;
@@ -163,7 +167,7 @@ readkey (void)
 }
 
 static int
-grub_ofconsole_checkkey (void)
+grub_ofconsole_checkkey (struct grub_term_input *term __attribute__ ((unused)))
 {
   if (grub_buflen)
     return grub_keybuf[0];
@@ -177,7 +181,7 @@ grub_ofconsole_checkkey (void)
 }
 
 static int
-grub_ofconsole_getkey (void)
+grub_ofconsole_getkey (struct grub_term_input *term __attribute__ ((unused)))
 {
   int ret;
   while (! grub_buflen)
@@ -190,7 +194,7 @@ grub_ofconsole_getkey (void)
 }
 
 static grub_uint16_t
-grub_ofconsole_getxy (void)
+grub_ofconsole_getxy (struct grub_term_output *term __attribute__ ((unused)))
 {
   return (grub_curr_x << 8) | grub_curr_y;
 }
@@ -232,13 +236,14 @@ grub_ofconsole_dimensions (void)
 }
 
 static grub_uint16_t
-grub_ofconsole_getwh (void)
+grub_ofconsole_getwh (struct grub_term_output *term __attribute__ ((unused)))
 {
   return (grub_ofconsole_width << 8) | grub_ofconsole_height;
 }
 
 static void
-grub_ofconsole_gotoxy (grub_uint8_t x, grub_uint8_t y)
+grub_ofconsole_gotoxy (struct grub_term_output *term __attribute__ ((unused)),
+		       grub_uint8_t x, grub_uint8_t y)
 {
   if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_ANSI))
     {
@@ -265,17 +270,18 @@ grub_ofconsole_gotoxy (grub_uint8_t x, grub_uint8_t y)
 }
 
 static void
-grub_ofconsole_cls (void)
+grub_ofconsole_cls (struct grub_term_output *term)
 {
   /* Clear the screen.  Using serial console, screen(1) only recognizes the
    * ANSI escape sequence.  Using video console, Apple Open Firmware (version
    * 3.1.1) only recognizes the literal ^L.  So use both.  */
   grub_ofconsole_writeesc ("\e[2J");
-  grub_ofconsole_gotoxy (0, 0);
+  grub_ofconsole_gotoxy (term, 0, 0);
 }
 
 static void
-grub_ofconsole_setcursor (int on)
+grub_ofconsole_setcursor (struct grub_term_output *term __attribute__ ((unused)),
+			  int on)
 {
   /* Understood by the Open Firmware flavour in OLPC.  */
   if (on)
@@ -285,13 +291,13 @@ grub_ofconsole_setcursor (int on)
 }
 
 static void
-grub_ofconsole_refresh (void)
+grub_ofconsole_refresh (struct grub_term_output *term __attribute__ ((unused)))
 {
   /* Do nothing, the current console state is ok.  */
 }
 
 static grub_err_t
-grub_ofconsole_init_input (void)
+grub_ofconsole_init_input (struct grub_term_input *term __attribute__ ((unused)))
 {
   grub_ssize_t actual;
 
@@ -304,7 +310,7 @@ grub_ofconsole_init_input (void)
 }
 
 static grub_err_t
-grub_ofconsole_init_output (void)
+grub_ofconsole_init_output (struct grub_term_output *term)
 {
   grub_ssize_t actual;
 
@@ -328,7 +334,7 @@ grub_ofconsole_init_output (void)
 				 colors[col].green, colors[col].blue);
 
     /* Set the right fg and bg colors.  */
-      grub_ofconsole_setcolorstate (GRUB_TERM_COLOR_NORMAL);
+      grub_ofconsole_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
     }
 
   grub_ofconsole_dimensions ();
@@ -336,19 +342,11 @@ grub_ofconsole_init_output (void)
   return 0;
 }
 
-static grub_err_t
-grub_ofconsole_fini (void)
-{
-  return 0;
-}
-
-
 
 static struct grub_term_input grub_ofconsole_term_input =
   {
     .name = "ofconsole",
     .init = grub_ofconsole_init_input,
-    .fini = grub_ofconsole_fini,
     .checkkey = grub_ofconsole_checkkey,
     .getkey = grub_ofconsole_getkey,
   };
@@ -357,7 +355,6 @@ static struct grub_term_output grub_ofconsole_term_output =
   {
     .name = "ofconsole",
     .init = grub_ofconsole_init_output,
-    .fini = grub_ofconsole_fini,
     .putchar = grub_ofconsole_putchar,
     .getxy = grub_ofconsole_getxy,
     .getwh = grub_ofconsole_getwh,
diff --git a/term/serial.c b/term/serial.c
index bdc80cb74..61bad192f 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -154,7 +154,7 @@ serial_get_divisor (unsigned int speed)
 
 /* The serial version of checkkey.  */
 static int
-grub_serial_checkkey (void)
+grub_serial_checkkey (struct grub_term_input *term __attribute__ ((unused)))
 {
   if (npending)
     return input_buf[0];
@@ -169,7 +169,7 @@ grub_serial_checkkey (void)
 
 /* The serial version of getkey.  */
 static int
-grub_serial_getkey (void)
+grub_serial_getkey (struct grub_term_input *term __attribute__ ((unused)))
 {
   int ret;
   while (! npending)
@@ -219,8 +219,8 @@ serial_hw_init (void)
 #endif
 
   /* Drain the input buffer.  */
-  while (grub_serial_checkkey () != -1)
-    (void) grub_serial_getkey ();
+  while (grub_serial_checkkey (0) != -1)
+    (void) grub_serial_getkey (0);
 
   /*  FIXME: should check if the serial terminal was found.  */
 
@@ -229,7 +229,8 @@ serial_hw_init (void)
 
 /* The serial version of putchar.  */
 static void
-grub_serial_putchar (const struct grub_unicode_glyph *c)
+grub_serial_putchar (struct grub_term_output *term __attribute__ ((unused)),
+		     const struct grub_unicode_glyph *c)
 {
   /* Keep track of the cursor.  */
   if (keep_track)
@@ -274,19 +275,20 @@ grub_serial_putchar (const struct grub_unicode_glyph *c)
 }
 
 static grub_uint16_t
-grub_serial_getwh (void)
+grub_serial_getwh (struct grub_term_output *term __attribute__ ((unused)))
 {
   return (TEXT_WIDTH << 8) | TEXT_HEIGHT;
 }
 
 static grub_uint16_t
-grub_serial_getxy (void)
+grub_serial_getxy (struct grub_term_output *term __attribute__ ((unused)))
 {
   return ((xpos << 8) | ypos);
 }
 
 static void
-grub_serial_gotoxy (grub_uint8_t x, grub_uint8_t y)
+grub_serial_gotoxy (struct grub_term_output *term __attribute__ ((unused)),
+		    grub_uint8_t x, grub_uint8_t y)
 {
   if (x > TEXT_WIDTH || y > TEXT_HEIGHT)
     {
@@ -304,7 +306,7 @@ grub_serial_gotoxy (grub_uint8_t x, grub_uint8_t y)
 }
 
 static void
-grub_serial_cls (void)
+grub_serial_cls (struct grub_term_output *term __attribute__ ((unused)))
 {
   keep_track = 0;
   grub_terminfo_cls (&grub_serial_term_output);
@@ -314,7 +316,8 @@ grub_serial_cls (void)
 }
 
 static void
-grub_serial_setcolorstate (const grub_term_color_state state)
+grub_serial_setcolorstate (struct grub_term_output *term __attribute__ ((unused)),
+			   const grub_term_color_state state)
 {
   keep_track = 0;
   switch (state)
@@ -333,7 +336,8 @@ grub_serial_setcolorstate (const grub_term_color_state state)
 }
 
 static void
-grub_serial_setcursor (const int on)
+grub_serial_setcursor (struct grub_term_output *term __attribute__ ((unused)),
+		       const int on)
 {
   if (on)
     grub_terminfo_cursor_on (&grub_serial_term_output);
diff --git a/term/terminfo.c b/term/terminfo.c
index ef713e151..eb14d47f1 100644
--- a/term/terminfo.c
+++ b/term/terminfo.c
@@ -122,7 +122,7 @@ putstr (const char *str, grub_term_output_t oterm)
 	  .ncomb = 0,
 	  .combining = 0
 	};
-      oterm->putchar (&c);
+      oterm->putchar (oterm, &c);
     }
 }
 
diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index 5d76c5e02..51855c09b 100644
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -120,7 +120,7 @@ grub_usb_keyboard_getreport (grub_usb_device_t dev, grub_uint8_t *report)
 
 
 static int
-grub_usb_keyboard_checkkey (void)
+grub_usb_keyboard_checkkey (struct grub_term_input *term __attribute__ ((unused)))
 {
   grub_uint8_t data[8];
   int key;
@@ -189,7 +189,7 @@ typedef enum
 } grub_usb_keyboard_repeat_t;
 
 static int
-grub_usb_keyboard_getkey (void)
+grub_usb_keyboard_getkey (struct grub_term_input *term)
 {
   int key;
   grub_err_t err;
@@ -202,7 +202,7 @@ grub_usb_keyboard_getkey (void)
 
   do
     {
-      key = grub_usb_keyboard_checkkey ();
+      key = grub_usb_keyboard_checkkey (term);
     } while (key == -1);
 
   data[2] = !0; /* Or whatever.  */
@@ -254,7 +254,7 @@ grub_usb_keyboard_getkey (void)
 }
 
 static int
-grub_usb_keyboard_getkeystatus (void)
+grub_usb_keyboard_getkeystatus (struct grub_term_input *term __attribute__ ((unused)))
 {
   grub_uint8_t data[8];
   int mods = 0;
diff --git a/util/console.c b/util/console.c
index b4316042e..e8ee9f7da 100644
--- a/util/console.c
+++ b/util/console.c
@@ -64,13 +64,15 @@ static grub_uint8_t color_map[NUM_COLORS] =
 static int use_color;
 
 static void
-grub_ncurses_putchar (const struct grub_unicode_glyph *c)
+grub_ncurses_putchar (struct grub_term_output *term __attribute__ ((unused)),
+		      const struct grub_unicode_glyph *c)
 {
   addch (c->base | grub_console_attr);
 }
 
 static void
-grub_ncurses_setcolorstate (grub_term_color_state state)
+grub_ncurses_setcolorstate (struct grub_term_output *term __attribute__ ((unused)),
+			    grub_term_color_state state)
 {
   switch (state)
     {
@@ -104,14 +106,16 @@ grub_ncurses_setcolorstate (grub_term_color_state state)
 
 /* XXX: This function is never called.  */
 static void
-grub_ncurses_setcolor (grub_uint8_t normal_color, grub_uint8_t highlight_color)
+grub_ncurses_setcolor (struct grub_term_output *term __attribute__ ((unused)),
+		       grub_uint8_t normal_color, grub_uint8_t highlight_color)
 {
   grub_console_normal_color = normal_color;
   grub_console_highlight_color = highlight_color;
 }
 
 static void
-grub_ncurses_getcolor (grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
+grub_ncurses_getcolor (struct grub_term_output *term __attribute__ ((unused)),
+		       grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
 {
   *normal_color = grub_console_normal_color;
   *highlight_color = grub_console_highlight_color;
@@ -120,7 +124,7 @@ grub_ncurses_getcolor (grub_uint8_t *normal_color, grub_uint8_t *highlight_color
 static int saved_char = ERR;
 
 static int
-grub_ncurses_checkkey (void)
+grub_ncurses_checkkey (struct grub_term_input *term __attribute__ ((unused)))
 {
   int c;
 
@@ -142,7 +146,7 @@ grub_ncurses_checkkey (void)
 }
 
 static int
-grub_ncurses_getkey (void)
+grub_ncurses_getkey (struct grub_term_input *term __attribute__ ((unused)))
 {
   int c;
 
@@ -212,7 +216,7 @@ grub_ncurses_getkey (void)
 }
 
 static grub_uint16_t
-grub_ncurses_getxy (void)
+grub_ncurses_getxy (struct grub_term_output *term __attribute__ ((unused)))
 {
   int x;
   int y;
@@ -223,7 +227,7 @@ grub_ncurses_getxy (void)
 }
 
 static grub_uint16_t
-grub_ncurses_getwh (void)
+grub_ncurses_getwh (struct grub_term_output *term __attribute__ ((unused)))
 {
   int x;
   int y;
@@ -234,32 +238,34 @@ grub_ncurses_getwh (void)
 }
 
 static void
-grub_ncurses_gotoxy (grub_uint8_t x, grub_uint8_t y)
+grub_ncurses_gotoxy (struct grub_term_output *term __attribute__ ((unused)),
+		     grub_uint8_t x, grub_uint8_t y)
 {
   move (y, x);
 }
 
 static void
-grub_ncurses_cls (void)
+grub_ncurses_cls (struct grub_term_output *term __attribute__ ((unused)))
 {
   clear ();
   refresh ();
 }
 
 static void
-grub_ncurses_setcursor (int on)
+grub_ncurses_setcursor (struct grub_term_output *term __attribute__ ((unused)),
+			int on)
 {
   curs_set (on ? 1 : 0);
 }
 
 static void
-grub_ncurses_refresh (void)
+grub_ncurses_refresh (struct grub_term_output *term __attribute__ ((unused)))
 {
   refresh ();
 }
 
 static grub_err_t
-grub_ncurses_init (void)
+grub_ncurses_init (struct grub_term_output *term __attribute__ ((unused)))
 {
   initscr ();
   raw ();
@@ -291,7 +297,7 @@ grub_ncurses_init (void)
 }
 
 static grub_err_t
-grub_ncurses_fini (void)
+grub_ncurses_fini (struct grub_term_output *term __attribute__ ((unused)))
 {
   endwin ();
   return 0;
@@ -333,5 +339,5 @@ grub_console_init (void)
 void
 grub_console_fini (void)
 {
-  grub_ncurses_fini ();
+  grub_ncurses_fini (&grub_ncurses_term_output);
 }

From e9efa0fe368d21bd6bc6eed7b8427341dbe5de71 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 7 May 2010 10:08:09 +0530
Subject: [PATCH 0934/1628] shift command support

---
 conf/common.rmk            |  2 +-
 conf/tests.rmk             |  4 +++
 include/grub/script_sh.h   |  5 +++
 script/execute.c           | 33 ++++++++++++++++--
 script/main.c              |  3 ++
 tests/grub_script_shift.in | 69 ++++++++++++++++++++++++++++++++++++++
 util/grub-script-check.c   |  8 +++++
 7 files changed, 121 insertions(+), 3 deletions(-)
 create mode 100644 tests/grub_script_shift.in

diff --git a/conf/common.rmk b/conf/common.rmk
index 4b39e9b71..01f15dc59 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -106,7 +106,7 @@ util/grub-script-check.c_DEPENDENCIES = grub_script_check_init.h
 grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c \
 	util/grub-script-check.c util/misc.c util/mm.c \
 	script/main.c script/script.c script/function.c script/lexer.c \
-	kern/handler.c kern/err.c kern/parser.c kern/list.c \
+	kern/handler.c kern/err.c kern/parser.c kern/list.c kern/command.c \
 	kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c \
 	grub_script.yy.c
 grub_script_check_CFLAGS = $(GNULIB_UTIL_CFLAGS)
diff --git a/conf/tests.rmk b/conf/tests.rmk
index 9144e5528..9cda007db 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -74,6 +74,9 @@ grub_script_comments_SOURCES = tests/grub_script_comments.in
 check_SCRIPTS += grub_script_functions
 grub_script_functions_SOURCES = tests/grub_script_functions.in
 
+check_SCRIPTS += grub_script_shift
+grub_script_shift_SOURCES = tests/grub_script_shift.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -91,6 +94,7 @@ SCRIPTED_TESTS += grub_script_final_semicolon
 SCRIPTED_TESTS += grub_script_dollar
 SCRIPTED_TESTS += grub_script_comments
 SCRIPTED_TESTS += grub_script_functions
+SCRIPTED_TESTS += grub_script_shift
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 730aa3005..8610348f6 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -23,6 +23,7 @@
 #include <grub/types.h>
 #include <grub/err.h>
 #include <grub/parser.h>
+#include <grub/command.h>
 
 struct grub_script_mem;
 
@@ -80,6 +81,7 @@ struct grub_script_scope
 
   char **args;
   unsigned int argc;
+  unsigned int shift;
 };
 
 /* A single command line.  */
@@ -308,6 +310,9 @@ grub_err_t grub_script_execute_menuentry (struct grub_script_cmd *cmd);
 /* Execute any GRUB pre-parsed command or script.  */
 grub_err_t grub_script_execute (struct grub_script *script);
 
+/* SHIFT command for GRUB script.  */
+grub_err_t grub_script_cmd_shift (grub_command_t cmd, int argc, char *argv[]);
+
 /* This variable points to the parsed command.  This is used to
    communicate with the bison code.  */
 extern struct grub_script_cmd *grub_script_parsed;
diff --git a/script/execute.c b/script/execute.c
index 571b6785b..d3f8e9b25 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -32,6 +32,31 @@
 
 static struct grub_script_scope *scope = 0;
 
+grub_err_t
+grub_script_cmd_shift (grub_command_t cmd __attribute__((unused)),
+		       int argc, char *argv[])
+{
+  char *p = 0;
+  unsigned long n = 0;
+
+  if (! scope)
+    return GRUB_ERR_NONE;
+
+  if (argc == 0)
+    n = 1;
+  else if (argc > 1)
+    return GRUB_ERR_BAD_ARGUMENT;
+  else
+    {
+      n = grub_strtoul (argv[0], &p, 10);
+      if (*p != '\0')
+	return GRUB_ERR_BAD_ARGUMENT;
+    }
+
+  scope->shift = (unsigned int)(n > scope->argc ? 0 : n);
+  return GRUB_ERR_NONE;
+}
+
 static char *
 grub_script_env_get (const char *name)
 {
@@ -49,7 +74,10 @@ grub_script_env_get (const char *name)
 	  if (num == 0)
 	    return 0; /* XXX no file name, for now.  */
 
-	  return (num > scope->argc ? 0 : scope->args[num - 1]);
+	  if (num > scope->argc - scope->shift)
+	    return 0;
+	  else
+	    return scope->args[num - 1 + scope->shift];
 	}
       else
 	{
@@ -60,7 +88,7 @@ grub_script_env_get (const char *name)
   else if (grub_strcmp (name, "#") == 0)
     {
       static char buf[32]; /* Rewritten everytime.  */
-      grub_snprintf (buf, sizeof (buf), "%u", scope->argc);
+      grub_snprintf (buf, sizeof (buf), "%u", scope->argc - scope->shift);
       return buf;
     }
   else
@@ -244,6 +272,7 @@ grub_script_function_call (grub_script_function_t func, int argc, char **args)
   grub_err_t ret = 0;
   struct grub_script_scope new_scope;
 
+  new_scope.shift = 0;
   new_scope.argc = argc;
   new_scope.args = args;
   grub_list_push (GRUB_AS_LIST_P (&scope), GRUB_AS_LIST (&new_scope));
diff --git a/script/main.c b/script/main.c
index b5159dc7d..ef810611c 100644
--- a/script/main.c
+++ b/script/main.c
@@ -17,6 +17,7 @@
  */
 
 #include <grub/dl.h>
+#include <grub/i18n.h>
 #include <grub/parser.h>
 #include <grub/script_sh.h>
 
@@ -49,6 +50,8 @@ static struct grub_parser grub_sh_parser =
 GRUB_MOD_INIT(sh)
 {
   grub_parser_register ("grub", &grub_sh_parser);
+  grub_register_command ("shift", grub_script_cmd_shift,
+			 N_("[n]"), N_("Shift positional parameters."));
 }
 
 GRUB_MOD_FINI(sh)
diff --git a/tests/grub_script_shift.in b/tests/grub_script_shift.in
new file mode 100644
index 000000000..542e72974
--- /dev/null
+++ b/tests/grub_script_shift.in
@@ -0,0 +1,69 @@
+#! @builddir@/grub-shell-tester
+
+# Run GRUB script in a Qemu instance
+# Copyright (C) 2010  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/>.
+
+function f1 {
+  echo f1 $# $1 $2 $3
+  shift
+  echo f1 $# $1 $2 $3
+}
+
+function f2 {
+  echo f2 $# $1 $2 $3
+  shift 1
+  echo f2 $# $1 $2 $3
+}
+
+function f3 {
+  echo f3 $# $1 $2 $3
+  shift 3
+  echo f3 $# $1 $2 $3
+}
+
+function f4 {
+  echo f4 $# $1 $2 $3
+  shift 100
+  echo f4 $# $1 $2 $3
+}
+
+f1
+f1 a
+f1 a b
+f1 a b c
+f1 a b c d
+f1 a b c d e
+
+f2
+f2 a
+f2 a b
+f2 a b c
+f2 a b c d
+f2 a b c d e
+
+f3
+f3 a
+f3 a b
+f3 a b c
+f3 a b c d
+f3 a b c d e
+
+f4
+f4 a
+f4 a b
+f4 a b c
+f4 a b c d
+f4 a b c d e
diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index 3b7ab295d..1d9ebd57f 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -57,6 +57,14 @@ grub_refresh (void)
   fflush (stdout);
 }
 
+grub_err_t
+grub_script_cmd_shift (grub_command_t cmd __attribute__((unused)),
+		       int argc __attribute__((unused)),
+		       char *argv[] __attribute__((unused)))
+{
+  return 0;
+}
+
 char *
 grub_script_execute_argument_to_string (struct grub_script_arg *arg __attribute__ ((unused)))
 {

From bf8733749b11bacaee099c72e9a9178b29055af0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 7 May 2010 15:44:43 +0200
Subject: [PATCH 0935/1628] merge common serial and ofconsole code into
 terminfo

---
 include/grub/{i386 => }/ieee1275/console.h |   3 +-
 include/grub/powerpc/ieee1275/console.h    |  28 --
 include/grub/sparc64/ieee1275/console.h    |  28 --
 include/grub/terminfo.h                    |  68 +++-
 kern/ieee1275/init.c                       |   5 +-
 term/ieee1275/ofconsole.c                  | 241 +++---------
 term/serial.c                              | 189 ++--------
 term/terminfo.c                            | 412 +++++++++++++++++----
 term/tparm.c                               |   3 +
 9 files changed, 483 insertions(+), 494 deletions(-)
 rename include/grub/{i386 => }/ieee1275/console.h (92%)
 delete mode 100644 include/grub/powerpc/ieee1275/console.h
 delete mode 100644 include/grub/sparc64/ieee1275/console.h

diff --git a/include/grub/i386/ieee1275/console.h b/include/grub/ieee1275/console.h
similarity index 92%
rename from include/grub/i386/ieee1275/console.h
rename to include/grub/ieee1275/console.h
index 854724ac1..e054f54f5 100644
--- a/include/grub/i386/ieee1275/console.h
+++ b/include/grub/ieee1275/console.h
@@ -22,7 +22,8 @@
 #include <grub/symbol.h>
 
 /* Initialize the console system.  */
-void grub_console_init (void);
+void grub_console_init_early (void);
+void grub_console_init_lately (void);
 
 /* Finish the console system.  */
 void grub_console_fini (void);
diff --git a/include/grub/powerpc/ieee1275/console.h b/include/grub/powerpc/ieee1275/console.h
deleted file mode 100644
index ed2b7202a..000000000
--- a/include/grub/powerpc/ieee1275/console.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2004,2005,2007  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/>.
- */
-
-#ifndef GRUB_CONSOLE_MACHINE_HEADER
-#define GRUB_CONSOLE_MACHINE_HEADER	1
-
-/* Initialize the console system.  */
-void grub_console_init (void);
-
-/* Finish the console system.  */
-void grub_console_fini (void);
-
-#endif /* ! GRUB_CONSOLE_MACHINE_HEADER */
diff --git a/include/grub/sparc64/ieee1275/console.h b/include/grub/sparc64/ieee1275/console.h
deleted file mode 100644
index ed2b7202a..000000000
--- a/include/grub/sparc64/ieee1275/console.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2004,2005,2007  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/>.
- */
-
-#ifndef GRUB_CONSOLE_MACHINE_HEADER
-#define GRUB_CONSOLE_MACHINE_HEADER	1
-
-/* Initialize the console system.  */
-void grub_console_init (void);
-
-/* Finish the console system.  */
-void grub_console_fini (void);
-
-#endif /* ! GRUB_CONSOLE_MACHINE_HEADER */
diff --git a/include/grub/terminfo.h b/include/grub/terminfo.h
index f078871d0..54872caa8 100644
--- a/include/grub/terminfo.h
+++ b/include/grub/terminfo.h
@@ -23,18 +23,64 @@
 #include <grub/types.h>
 #include <grub/term.h>
 
-char *EXPORT_FUNC(grub_terminfo_get_current) (void);
-grub_err_t EXPORT_FUNC(grub_terminfo_set_current) (const char *);
-
-void EXPORT_FUNC(grub_terminfo_gotoxy) (grub_uint8_t x, grub_uint8_t y,
-					grub_term_output_t oterm);
-void EXPORT_FUNC(grub_terminfo_cls) (grub_term_output_t oterm);
-void EXPORT_FUNC(grub_terminfo_reverse_video_on) (grub_term_output_t oterm);
-void EXPORT_FUNC(grub_terminfo_reverse_video_off) (grub_term_output_t oterm);
-void EXPORT_FUNC(grub_terminfo_cursor_on) (grub_term_output_t oterm);
-void EXPORT_FUNC(grub_terminfo_cursor_off) (grub_term_output_t oterm);
+char *EXPORT_FUNC(grub_terminfo_get_current) (struct grub_term_output *term);
+grub_err_t EXPORT_FUNC(grub_terminfo_set_current) (struct grub_term_output *term,
+												const char *);
 
 #define GRUB_TERMINFO_READKEY_MAX_LEN 4
-void EXPORT_FUNC(grub_terminfo_readkey) (int *keys, int *len, int (*readkey) (void));
+struct grub_terminfo_input_state
+{
+  int input_buf[GRUB_TERMINFO_READKEY_MAX_LEN];
+  int npending;
+  int (*readkey) (void);
+};
+
+struct grub_terminfo_output_state
+{
+  struct grub_term_output *next;
+
+  char *name;
+
+  char *gotoxy;
+  char *cls;
+  char *reverse_video_on;
+  char *reverse_video_off;
+  char *cursor_on;
+  char *cursor_off;
+  char *setcolor;
+
+  grub_uint8_t normal_color;
+  grub_uint8_t highlight_color;
+
+  unsigned int xpos, ypos;
+
+  void (*put) (const int c);
+};
+
+void EXPORT_FUNC(grub_terminfo_gotoxy) (grub_term_output_t term,
+					grub_uint8_t x, grub_uint8_t y);
+void EXPORT_FUNC(grub_terminfo_cls) (grub_term_output_t term);
+grub_uint16_t EXPORT_FUNC (grub_terminfo_getxy) (struct grub_term_output *term);
+void EXPORT_FUNC (grub_terminfo_setcursor) (struct grub_term_output *term,
+					    const int on);
+void EXPORT_FUNC (grub_terminfo_setcolorstate) (struct grub_term_output *term,
+				  const grub_term_color_state state);
+
+
+int EXPORT_FUNC (grub_terminfo_checkkey) (struct grub_term_input *term);
+grub_err_t EXPORT_FUNC (grub_terminfo_input_init) (struct grub_term_input *term);
+int EXPORT_FUNC (grub_terminfo_getkey) (struct grub_term_input *term);
+void EXPORT_FUNC (grub_terminfo_putchar) (struct grub_term_output *term,
+					  const struct grub_unicode_glyph *c);
+void EXPORT_FUNC (grub_terminfo_getcolor) (struct grub_term_output *term,
+					   grub_uint8_t *normal_color,
+					   grub_uint8_t *highlight_color);
+void EXPORT_FUNC (grub_terminfo_setcolor) (struct grub_term_output *term,
+					   grub_uint8_t normal_color,
+					   grub_uint8_t highlight_color);
+
+grub_err_t EXPORT_FUNC (grub_terminfo_output_register) (struct grub_term_output *term,
+							const char *type);
+grub_err_t EXPORT_FUNC (grub_terminfo_output_unregister) (struct grub_term_output *term);
 
 #endif /* ! GRUB_TERMINFO_HEADER */
diff --git a/kern/ieee1275/init.c b/kern/ieee1275/init.c
index b48df37bc..1a408fb73 100644
--- a/kern/ieee1275/init.c
+++ b/kern/ieee1275/init.c
@@ -28,7 +28,7 @@
 #include <grub/env.h>
 #include <grub/misc.h>
 #include <grub/time.h>
-#include <grub/machine/console.h>
+#include <grub/ieee1275/console.h>
 #include <grub/machine/kernel.h>
 #include <grub/cpu/kernel.h>
 #include <grub/ieee1275/ofdisk.h>
@@ -225,11 +225,12 @@ grub_machine_init (void)
 
   grub_ieee1275_init ();
 
-  grub_console_init ();
+  grub_console_init_early ();
 #ifdef __i386__
   grub_get_extended_memory ();
 #endif
   grub_claim_heap ();
+  grub_console_init_lately ();
   grub_ofdisk_init ();
 
   /* Process commandline.  */
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index 590fa7f53..d143a6313 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -23,7 +23,7 @@
 #include <grub/mm.h>
 #include <grub/time.h>
 #include <grub/terminfo.h>
-#include <grub/machine/console.h>
+#include <grub/ieee1275/console.h>
 #include <grub/ieee1275/ieee1275.h>
 
 static grub_ieee1275_ihandle_t stdout_ihandle;
@@ -32,12 +32,6 @@ static grub_ieee1275_ihandle_t stdin_ihandle;
 static grub_uint8_t grub_ofconsole_width;
 static grub_uint8_t grub_ofconsole_height;
 
-static int grub_curr_x;
-static int grub_curr_y;
-
-static int grub_keybuf[GRUB_TERMINFO_READKEY_MAX_LEN];
-static int grub_buflen;
-
 struct color
 {
   int red;
@@ -58,102 +52,14 @@ static struct color colors[] =
     {0xFE, 0xFE, 0xFE}  // 7 = white
   };
 
-static grub_uint8_t grub_ofconsole_normal_color = 0x7;
-static grub_uint8_t grub_ofconsole_highlight_color = 0x70;
-
-/* Write control characters to the console.  */
 static void
-grub_ofconsole_writeesc (const char *str)
+put (const int c)
 {
-  if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_ANSI))
-    return;
+  char chr = c;
 
-  while (*str)
-    {
-      char chr = *(str++);
-      grub_ieee1275_write (stdout_ihandle, &chr, 1, 0);
-    }
-
-}
-
-static void
-grub_ofconsole_putchar (struct grub_term_output *term __attribute__ ((unused)),
-			const struct grub_unicode_glyph *c)
-{
-  char chr;
-
-  chr = c->base;
-
-  if (chr == '\n')
-    {
-      grub_curr_y++;
-      grub_curr_x = 0;
-    }
-  else if (chr == '\r')
-    {
-      grub_curr_x = 0;
-    }
-  else
-    {
-      grub_curr_x++;
-      if (grub_curr_x >= grub_ofconsole_width)
-        {
-	  chr = '\n';
-	  grub_ieee1275_write (stdout_ihandle, &chr, 1, 0);
-	  chr = '\r';
-	  grub_ieee1275_write (stdout_ihandle, &chr, 1, 0);
-	  grub_curr_y++;
-	  grub_curr_x = 1;
-        }
-    }
   grub_ieee1275_write (stdout_ihandle, &chr, 1, 0);
 }
 
-static void
-grub_ofconsole_setcolorstate (struct grub_term_output *term __attribute__ ((unused)),
-			      grub_term_color_state state)
-{
-  char setcol[256];
-  int fg;
-  int bg;
-
-  switch (state)
-    {
-    case GRUB_TERM_COLOR_STANDARD:
-    case GRUB_TERM_COLOR_NORMAL:
-      fg = grub_ofconsole_normal_color & 0x0f;
-      bg = grub_ofconsole_normal_color >> 4;
-      break;
-    case GRUB_TERM_COLOR_HIGHLIGHT:
-      fg = grub_ofconsole_highlight_color & 0x0f;
-      bg = grub_ofconsole_highlight_color >> 4;
-      break;
-    default:
-      return;
-    }
-
-  grub_snprintf (setcol, sizeof (setcol), "\e[3%dm\e[4%dm", fg, bg);
-  grub_ofconsole_writeesc (setcol);
-}
-
-static void
-grub_ofconsole_setcolor (struct grub_term_output *term __attribute__ ((unused)),
-			 grub_uint8_t normal_color,
-			 grub_uint8_t highlight_color)
-{
-  /* Discard bright bit.  */
-  grub_ofconsole_normal_color = normal_color & 0x77;
-  grub_ofconsole_highlight_color = highlight_color & 0x77;
-}
-
-static void
-grub_ofconsole_getcolor (struct grub_term_output *term __attribute__ ((unused)),
-			 grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
-{
-  *normal_color = grub_ofconsole_normal_color;
-  *highlight_color = grub_ofconsole_highlight_color;
-}
-
 static int
 readkey (void)
 {
@@ -166,39 +72,6 @@ readkey (void)
   return -1;
 }
 
-static int
-grub_ofconsole_checkkey (struct grub_term_input *term __attribute__ ((unused)))
-{
-  if (grub_buflen)
-    return grub_keybuf[0];
-
-  grub_terminfo_readkey (grub_keybuf, &grub_buflen, readkey);
-
-  if (grub_buflen)
-    return grub_keybuf[0];
-
-  return -1;
-}
-
-static int
-grub_ofconsole_getkey (struct grub_term_input *term __attribute__ ((unused)))
-{
-  int ret;
-  while (! grub_buflen)
-    grub_terminfo_readkey (grub_keybuf, &grub_buflen, readkey);
-
-  ret = grub_keybuf[0];
-  grub_buflen--;
-  grub_memmove (grub_keybuf, grub_keybuf + 1, grub_buflen);
-  return ret;
-}
-
-static grub_uint16_t
-grub_ofconsole_getxy (struct grub_term_output *term __attribute__ ((unused)))
-{
-  return (grub_curr_x << 8) | grub_curr_y;
-}
-
 static void
 grub_ofconsole_dimensions (void)
 {
@@ -241,44 +114,6 @@ grub_ofconsole_getwh (struct grub_term_output *term __attribute__ ((unused)))
   return (grub_ofconsole_width << 8) | grub_ofconsole_height;
 }
 
-static void
-grub_ofconsole_gotoxy (struct grub_term_output *term __attribute__ ((unused)),
-		       grub_uint8_t x, grub_uint8_t y)
-{
-  if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_ANSI))
-    {
-      char s[256];
-      grub_curr_x = x;
-      grub_curr_y = y;
-
-      grub_snprintf (s, sizeof (s), "\e[%d;%dH", y + 1, x + 1);
-      grub_ofconsole_writeesc (s);
-    }
-  else
-    {
-      if ((y == grub_curr_y) && (x == grub_curr_x - 1))
-        {
-          char chr;
-
-          chr = '\b';
-          grub_ieee1275_write (stdout_ihandle, &chr, 1, 0);
-        }
-
-      grub_curr_x = x;
-      grub_curr_y = y;
-    }
-}
-
-static void
-grub_ofconsole_cls (struct grub_term_output *term)
-{
-  /* Clear the screen.  Using serial console, screen(1) only recognizes the
-   * ANSI escape sequence.  Using video console, Apple Open Firmware (version
-   * 3.1.1) only recognizes the literal ^L.  So use both.  */
-  grub_ofconsole_writeesc ("\e[2J");
-  grub_ofconsole_gotoxy (term, 0, 0);
-}
-
 static void
 grub_ofconsole_setcursor (struct grub_term_output *term __attribute__ ((unused)),
 			  int on)
@@ -290,14 +125,8 @@ grub_ofconsole_setcursor (struct grub_term_output *term __attribute__ ((unused))
     grub_ieee1275_interpret ("cursor-off", 0);
 }
 
-static void
-grub_ofconsole_refresh (struct grub_term_output *term __attribute__ ((unused)))
-{
-  /* Do nothing, the current console state is ok.  */
-}
-
 static grub_err_t
-grub_ofconsole_init_input (struct grub_term_input *term __attribute__ ((unused)))
+grub_ofconsole_init_input (struct grub_term_input *term)
 {
   grub_ssize_t actual;
 
@@ -306,7 +135,7 @@ grub_ofconsole_init_input (struct grub_term_input *term __attribute__ ((unused))
       || actual != sizeof stdin_ihandle)
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "cannot find stdin");
 
-  return 0;
+  return grub_terminfo_input_init (term);
 }
 
 static grub_err_t
@@ -333,8 +162,8 @@ grub_ofconsole_init_output (struct grub_term_output *term)
 	grub_ieee1275_set_color (stdout_ihandle, col, colors[col].red,
 				 colors[col].green, colors[col].blue);
 
-    /* Set the right fg and bg colors.  */
-      grub_ofconsole_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
+      /* Set the right fg and bg colors.  */
+      grub_terminfo_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
     }
 
   grub_ofconsole_dimensions ();
@@ -343,41 +172,73 @@ grub_ofconsole_init_output (struct grub_term_output *term)
 }
 
 
+
+struct grub_terminfo_input_state grub_ofconsole_terminfo_input =
+  {
+    .readkey = readkey
+  };
+
+struct grub_terminfo_output_state grub_ofconsole_terminfo_output =
+  {
+    .put = put
+  };
+
 static struct grub_term_input grub_ofconsole_term_input =
   {
     .name = "ofconsole",
     .init = grub_ofconsole_init_input,
-    .checkkey = grub_ofconsole_checkkey,
-    .getkey = grub_ofconsole_getkey,
+    .checkkey = grub_terminfo_checkkey,
+    .getkey = grub_terminfo_getkey,
+    .data = &grub_ofconsole_terminfo_input
   };
 
 static struct grub_term_output grub_ofconsole_term_output =
   {
     .name = "ofconsole",
     .init = grub_ofconsole_init_output,
-    .putchar = grub_ofconsole_putchar,
-    .getxy = grub_ofconsole_getxy,
+    .putchar = grub_terminfo_putchar,
+    .getxy = grub_terminfo_getxy,
     .getwh = grub_ofconsole_getwh,
-    .gotoxy = grub_ofconsole_gotoxy,
-    .cls = grub_ofconsole_cls,
-    .setcolorstate = grub_ofconsole_setcolorstate,
-    .setcolor = grub_ofconsole_setcolor,
-    .getcolor = grub_ofconsole_getcolor,
+    .gotoxy = grub_terminfo_gotoxy,
+    .cls = grub_terminfo_cls,
+    .setcolorstate = grub_terminfo_setcolorstate,
+    .setcolor = grub_terminfo_setcolor,
+    .getcolor = grub_terminfo_getcolor,
     .setcursor = grub_ofconsole_setcursor,
-    .refresh = grub_ofconsole_refresh,
-    .flags = GRUB_TERM_CODE_TYPE_ASCII
+    .flags = GRUB_TERM_CODE_TYPE_ASCII,
+    .data = &grub_ofconsole_terminfo_output
   };
 
+void grub_terminfo_fini (void);
+void grub_terminfo_init (void);
+
 void
-grub_console_init (void)
+grub_console_init_early (void)
 {
   grub_term_register_input ("ofconsole", &grub_ofconsole_term_input);
   grub_term_register_output ("ofconsole", &grub_ofconsole_term_output);
 }
 
+void
+grub_console_init_lately (void)
+{
+  const char *type;
+
+  if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_ANSI))
+    type = "dumb";
+  else
+    type = "ieee1275";
+
+  grub_terminfo_init ();
+  grub_terminfo_output_register (&grub_ofconsole_term_output, type);
+}
+
 void
 grub_console_fini (void)
 {
   grub_term_unregister_input (&grub_ofconsole_term_input);
   grub_term_unregister_output (&grub_ofconsole_term_output);
+  grub_terminfo_output_unregister (&grub_ofconsole_term_output);
+
+  grub_terminfo_fini ();
 }
diff --git a/term/serial.c b/term/serial.c
index 61bad192f..82bf6abb7 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -27,19 +27,8 @@
 #include <grub/extcmd.h>
 #include <grub/i18n.h>
 
-#define TEXT_WIDTH	80
-#define TEXT_HEIGHT	24
-
-static unsigned int xpos, ypos;
-static unsigned int keep_track = 1;
 static unsigned int registered = 0;
 
-/* An input buffer.  */
-static int input_buf[GRUB_TERMINFO_READKEY_MAX_LEN];
-static int npending = 0;
-
-static struct grub_term_output grub_serial_term_output;
-
 /* Argument options.  */
 static const struct grub_arg_option options[] =
 {
@@ -152,35 +141,6 @@ serial_get_divisor (unsigned int speed)
   return 0;
 }
 
-/* The serial version of checkkey.  */
-static int
-grub_serial_checkkey (struct grub_term_input *term __attribute__ ((unused)))
-{
-  if (npending)
-    return input_buf[0];
-
-  grub_terminfo_readkey (input_buf, &npending, serial_hw_fetch);
-
-  if (npending)
-    return input_buf[0];
-
-  return -1;
-}
-
-/* The serial version of getkey.  */
-static int
-grub_serial_getkey (struct grub_term_input *term __attribute__ ((unused)))
-{
-  int ret;
-  while (! npending)
-    grub_terminfo_readkey (input_buf, &npending, serial_hw_fetch);
-
-  ret = input_buf[0];
-  npending--;
-  grub_memmove (input_buf, input_buf + 1, npending);
-  return ret;
-}
-
 /* Initialize a serial device. PORT is the port number for a serial device.
    SPEED is a DTE-DTE speed which must be one of these: 2400, 4800, 9600,
    19200, 38400, 57600 and 115200. WORD_LEN is the word length to be used
@@ -219,150 +179,56 @@ serial_hw_init (void)
 #endif
 
   /* Drain the input buffer.  */
-  while (grub_serial_checkkey (0) != -1)
-    (void) grub_serial_getkey (0);
+  while (serial_hw_fetch () != -1);
 
   /*  FIXME: should check if the serial terminal was found.  */
 
   return GRUB_ERR_NONE;
 }
 
-/* The serial version of putchar.  */
-static void
-grub_serial_putchar (struct grub_term_output *term __attribute__ ((unused)),
-		     const struct grub_unicode_glyph *c)
-{
-  /* Keep track of the cursor.  */
-  if (keep_track)
-    {
-      switch (c->base)
-	{
-	case '\a':
-	  break;
-
-	case '\b':
-	case 127:
-	  if (xpos > 0)
-	    xpos--;
-	  break;
-
-	case '\n':
-	  if (ypos < TEXT_HEIGHT - 1)
-	    ypos++;
-	  break;
-
-	case '\r':
-	  xpos = 0;
-	  break;
-
-	default:
-	  if ((c->base & 0xC0) == 0x80)
-	    break;
-	  if (xpos + c->estimated_width >= TEXT_WIDTH + 1)
-	    {
-	      xpos = 0;
-	      if (ypos < TEXT_HEIGHT - 1)
-		ypos++;
-	      serial_hw_put ('\r');
-	      serial_hw_put ('\n');
-	    }
-	  xpos += c->estimated_width;
-	  break;
-	}
-    }
-
-  serial_hw_put (c->base);
-}
-
 static grub_uint16_t
 grub_serial_getwh (struct grub_term_output *term __attribute__ ((unused)))
 {
+  const grub_uint8_t TEXT_WIDTH = 80;
+  const grub_uint8_t TEXT_HEIGHT = 24;
   return (TEXT_WIDTH << 8) | TEXT_HEIGHT;
 }
 
-static grub_uint16_t
-grub_serial_getxy (struct grub_term_output *term __attribute__ ((unused)))
-{
-  return ((xpos << 8) | ypos);
-}
+struct grub_terminfo_input_state grub_serial_terminfo_input =
+  {
+    .readkey = serial_hw_fetch
+  };
 
-static void
-grub_serial_gotoxy (struct grub_term_output *term __attribute__ ((unused)),
-		    grub_uint8_t x, grub_uint8_t y)
-{
-  if (x > TEXT_WIDTH || y > TEXT_HEIGHT)
-    {
-      grub_error (GRUB_ERR_OUT_OF_RANGE, "invalid point (%u,%u)", x, y);
-    }
-  else
-    {
-      keep_track = 0;
-      grub_terminfo_gotoxy (x, y, &grub_serial_term_output);
-      keep_track = 1;
-
-      xpos = x;
-      ypos = y;
-    }
-}
-
-static void
-grub_serial_cls (struct grub_term_output *term __attribute__ ((unused)))
-{
-  keep_track = 0;
-  grub_terminfo_cls (&grub_serial_term_output);
-  keep_track = 1;
-
-  xpos = ypos = 0;
-}
-
-static void
-grub_serial_setcolorstate (struct grub_term_output *term __attribute__ ((unused)),
-			   const grub_term_color_state state)
-{
-  keep_track = 0;
-  switch (state)
-    {
-    case GRUB_TERM_COLOR_STANDARD:
-    case GRUB_TERM_COLOR_NORMAL:
-      grub_terminfo_reverse_video_off (&grub_serial_term_output);
-      break;
-    case GRUB_TERM_COLOR_HIGHLIGHT:
-      grub_terminfo_reverse_video_on (&grub_serial_term_output);
-      break;
-    default:
-      break;
-    }
-  keep_track = 1;
-}
-
-static void
-grub_serial_setcursor (struct grub_term_output *term __attribute__ ((unused)),
-		       const int on)
-{
-  if (on)
-    grub_terminfo_cursor_on (&grub_serial_term_output);
-  else
-    grub_terminfo_cursor_off (&grub_serial_term_output);
-}
+struct grub_terminfo_output_state grub_serial_terminfo_output =
+  {
+    .put = serial_hw_put,
+    .normal_color = 0x7,
+    .highlight_color = 0x70
+  };
 
 static struct grub_term_input grub_serial_term_input =
 {
   .name = "serial",
-  .checkkey = grub_serial_checkkey,
-  .getkey = grub_serial_getkey,
+  .init = grub_terminfo_input_init,
+  .checkkey = grub_terminfo_checkkey,
+  .getkey = grub_terminfo_getkey,
+  .data = &grub_serial_terminfo_input
 };
 
 static struct grub_term_output grub_serial_term_output =
 {
   .name = "serial",
-  .putchar = grub_serial_putchar,
+  .putchar = grub_terminfo_putchar,
   .getwh = grub_serial_getwh,
-  .getxy = grub_serial_getxy,
-  .gotoxy = grub_serial_gotoxy,
-  .cls = grub_serial_cls,
-  .setcolorstate = grub_serial_setcolorstate,
-  .setcursor = grub_serial_setcursor,
+  .getxy = grub_terminfo_getxy,
+  .gotoxy = grub_terminfo_gotoxy,
+  .cls = grub_terminfo_cls,
+  .setcolorstate = grub_terminfo_setcolorstate,
+  .setcolor = grub_terminfo_setcolor,
+  .getcolor = grub_terminfo_getcolor,
+  .setcursor = grub_terminfo_setcursor,
   .flags = GRUB_TERM_CODE_TYPE_ASCII,
+  .data = &grub_serial_terminfo_output
 };
 
 
@@ -466,6 +332,7 @@ grub_cmd_serial (grub_extcmd_t cmd,
 	{
 	  grub_term_register_input ("serial", &grub_serial_term_input);
 	  grub_term_register_output ("serial", &grub_serial_term_output);
+	  grub_terminfo_output_register (&grub_serial_term_output, "vt100");
 	  registered = 1;
 	}
     }
@@ -482,6 +349,7 @@ grub_cmd_serial (grub_extcmd_t cmd,
 	      /* If unable to restore settings, unregister terminal.  */
 	      grub_term_unregister_input (&grub_serial_term_input);
 	      grub_term_unregister_output (&grub_serial_term_output);
+	      grub_terminfo_output_unregister (&grub_serial_term_output);
 	      registered = 0;
 	    }
 	}
@@ -518,5 +386,6 @@ GRUB_MOD_FINI(serial)
     {
       grub_term_unregister_input (&grub_serial_term_input);
       grub_term_unregister_output (&grub_serial_term_output);
+      grub_terminfo_output_unregister (&grub_serial_term_output);
     }
 }
diff --git a/term/terminfo.c b/term/terminfo.c
index eb14d47f1..f0e234106 100644
--- a/term/terminfo.c
+++ b/term/terminfo.c
@@ -34,25 +34,15 @@
 #include <grub/i18n.h>
 #include <grub/time.h>
 
-struct terminfo
-{
-  char *name;
-
-  char *gotoxy;
-  char *cls;
-  char *reverse_video_on;
-  char *reverse_video_off;
-  char *cursor_on;
-  char *cursor_off;
-};
-
-static struct terminfo term;
+static struct grub_term_output *terminfo_outputs;
 
 /* Get current terminfo name.  */
 char *
-grub_terminfo_get_current (void)
+grub_terminfo_get_current (struct grub_term_output *term)
 {
-  return term.name;
+  struct grub_terminfo_output_state *data
+    = (struct grub_terminfo_output_state *) term->data;
+  return data->name;
 }
 
 /* Free *PTR and set *PTR to NULL, to prevent double-free.  */
@@ -63,10 +53,29 @@ grub_terminfo_free (char **ptr)
   *ptr = 0;
 }
 
+static void
+grub_terminfo_all_free (struct grub_term_output *term)
+{
+  struct grub_terminfo_output_state *data
+    = (struct grub_terminfo_output_state *) term->data;
+
+  /* Free previously allocated memory.  */
+  grub_terminfo_free (&data->name);
+  grub_terminfo_free (&data->gotoxy);
+  grub_terminfo_free (&data->cls);
+  grub_terminfo_free (&data->reverse_video_on);
+  grub_terminfo_free (&data->reverse_video_off);
+  grub_terminfo_free (&data->cursor_on);
+  grub_terminfo_free (&data->cursor_off);
+}
+
 /* Set current terminfo type.  */
 grub_err_t
-grub_terminfo_set_current (const char *str)
+grub_terminfo_set_current (struct grub_term_output *term,
+			   const char *str)
 {
+  struct grub_terminfo_output_state *data
+    = (struct grub_terminfo_output_state *) term->data;
   /* TODO
    * Lookup user specified terminfo type. If found, set term variables
    * as appropriate. Otherwise return an error.
@@ -84,93 +93,290 @@ grub_terminfo_set_current (const char *str)
    *  d. Your idea here.
    */
 
-  /* Free previously allocated memory.  */
-  grub_terminfo_free (&term.name);
-  grub_terminfo_free (&term.gotoxy);
-  grub_terminfo_free (&term.cls);
-  grub_terminfo_free (&term.reverse_video_on);
-  grub_terminfo_free (&term.reverse_video_off);
-  grub_terminfo_free (&term.cursor_on);
-  grub_terminfo_free (&term.cursor_off);
+  grub_terminfo_all_free (term);
 
   if (grub_strcmp ("vt100", str) == 0)
     {
-      term.name              = grub_strdup ("vt100");
-      term.gotoxy            = grub_strdup ("\e[%i%p1%d;%p2%dH");
-      term.cls               = grub_strdup ("\e[H\e[J");
-      term.reverse_video_on  = grub_strdup ("\e[7m");
-      term.reverse_video_off = grub_strdup ("\e[m");
-      term.cursor_on         = grub_strdup ("\e[?25h");
-      term.cursor_off        = grub_strdup ("\e[?25l");
+      data->name              = grub_strdup ("vt100");
+      data->gotoxy            = grub_strdup ("\e[%i%p1%d;%p2%dH");
+      data->cls               = grub_strdup ("\e[H\e[J");
+      data->reverse_video_on  = grub_strdup ("\e[7m");
+      data->reverse_video_off = grub_strdup ("\e[m");
+      data->cursor_on         = grub_strdup ("\e[?25h");
+      data->cursor_off        = grub_strdup ("\e[?25l");
+      data->setcolor          = NULL;
+      return grub_errno;
+    }
+
+  if (grub_strcmp ("vt100-color", str) == 0)
+    {
+      data->name              = grub_strdup ("vt100-color");
+      data->gotoxy            = grub_strdup ("\e[%i%p1%d;%p2%dH");
+      data->cls               = grub_strdup ("\e[H\e[J");
+      data->reverse_video_on  = grub_strdup ("\e[7m");
+      data->reverse_video_off = grub_strdup ("\e[m");
+      data->cursor_on         = grub_strdup ("\e[?25h");
+      data->cursor_off        = grub_strdup ("\e[?25l");
+      data->setcolor          = grub_strdup ("\e[3%p1%dm\e[4%p2%dm");
+      return grub_errno;
+    }
+
+  if (grub_strcmp ("ieee1275", str) == 0)
+    {
+      data->name              = grub_strdup ("ieee1275");
+      data->gotoxy            = grub_strdup ("\e[%i%p1%d;%p2%dH");
+      /* Clear the screen.  Using serial console, screen(1) only recognizes the
+       * ANSI escape sequence.  Using video console, Apple Open Firmware
+       * (version 3.1.1) only recognizes the literal ^L.  So use both.  */
+      data->cls               = grub_strdup ("\e[2J");
+      data->reverse_video_on  = grub_strdup ("\e[7m");
+      data->reverse_video_off = grub_strdup ("\e[m");
+      data->cursor_on         = grub_strdup ("\e[?25h");
+      data->cursor_off        = grub_strdup ("\e[?25l");
+      data->setcolor          = grub_strdup ("\e[3%p1%dm\e[4%p2%dm");
+      return grub_errno;
+    }
+
+  if (grub_strcmp ("dumb", str) == 0)
+    {
+      data->name              = grub_strdup ("dumb");
+      data->gotoxy            = NULL;
+      data->cls               = NULL;
+      data->reverse_video_on  = NULL;
+      data->reverse_video_off = NULL;
+      data->cursor_on         = NULL;
+      data->cursor_off        = NULL;
+      data->setcolor          = NULL;
       return grub_errno;
     }
 
   return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown terminfo type");
 }
 
-/* Wrapper for grub_putchar to write strings.  */
-static void
-putstr (const char *str, grub_term_output_t oterm)
+grub_err_t
+grub_terminfo_output_register (struct grub_term_output *term,
+			       const char *type)
 {
-  while (*str)
-    {
-      struct grub_unicode_glyph c =
-	{
-	  .base = *str++,
-	  .variant = 0,
-	  .attributes = 0,
-	  .ncomb = 0,
-	  .combining = 0
-	};
-      oterm->putchar (oterm, &c);
-    }
+  grub_err_t err;
+  struct grub_terminfo_output_state *data;
+
+  err = grub_terminfo_set_current (term, type);
+
+  if (err)
+    return err;
+
+  data = (struct grub_terminfo_output_state *) term->data;
+  data->next = terminfo_outputs;
+  terminfo_outputs = term;
+  
+  data->normal_color = 0x07;
+  data->highlight_color = 0x70;
+
+  return GRUB_ERR_NONE;
 }
 
-/* Move the cursor to the given position starting with "0".  */
-void
-grub_terminfo_gotoxy (grub_uint8_t x, grub_uint8_t y, grub_term_output_t oterm)
+grub_err_t
+grub_terminfo_output_unregister (struct grub_term_output *term)
 {
-  putstr (grub_terminfo_tparm (term.gotoxy, y, x), oterm);
+  struct grub_term_output **ptr;
+
+  for (ptr = &terminfo_outputs; *ptr;
+       ptr = &((struct grub_terminfo_output_state *) (*ptr)->data)->next)
+    if (*ptr == term)
+      {
+	grub_terminfo_all_free (term);
+	*ptr = ((struct grub_terminfo_output_state *) (*ptr)->data)->next;
+	return GRUB_ERR_NONE;
+      }
+  return grub_error (GRUB_ERR_BAD_ARGUMENT, "terminal not found");
+}
+
+/* Wrapper for grub_putchar to write strings.  */
+static void
+putstr (struct grub_term_output *term, const char *str)
+{
+  struct grub_terminfo_output_state *data
+    = (struct grub_terminfo_output_state *) term->data;
+  while (*str)
+    data->put (*str++);
+}
+
+grub_uint16_t
+grub_terminfo_getxy (struct grub_term_output *term)
+{
+  struct grub_terminfo_output_state *data
+    = (struct grub_terminfo_output_state *) term->data;
+
+  return ((data->xpos << 8) | data->ypos);
+}
+
+void
+grub_terminfo_gotoxy (struct grub_term_output *term,
+		      grub_uint8_t x, grub_uint8_t y)
+{
+  struct grub_terminfo_output_state *data
+    = (struct grub_terminfo_output_state *) term->data;
+
+  if (x > grub_term_width (term) || y > grub_term_height (term))
+    {
+      grub_error (GRUB_ERR_OUT_OF_RANGE, "invalid point (%u,%u)", x, y);
+      return;
+    }
+
+  if (data->gotoxy)
+    putstr (term, grub_terminfo_tparm (data->gotoxy, y, x));
+  else
+    {
+      if ((y == data->ypos) && (x == data->xpos - 1))
+	data->put ('\b');
+    }
+
+  data->xpos = x;
+  data->ypos = y;
 }
 
 /* Clear the screen.  */
 void
-grub_terminfo_cls (grub_term_output_t oterm)
+grub_terminfo_cls (struct grub_term_output *term)
 {
-  putstr (grub_terminfo_tparm (term.cls), oterm);
+  struct grub_terminfo_output_state *data
+    = (struct grub_terminfo_output_state *) term->data;
+
+  putstr (term, grub_terminfo_tparm (data->cls));
+
+  data->xpos = data->ypos = 0;
 }
 
-/* Set reverse video mode on.  */
 void
-grub_terminfo_reverse_video_on (grub_term_output_t oterm)
+grub_terminfo_setcolor (struct grub_term_output *term,
+			grub_uint8_t normal_color,
+			grub_uint8_t highlight_color)
 {
-  putstr (grub_terminfo_tparm (term.reverse_video_on), oterm);
+  struct grub_terminfo_output_state *data
+    = (struct grub_terminfo_output_state *) term->data;
+
+  /* Discard bright bit.  */
+  data->normal_color = normal_color & 0x77;
+  data->highlight_color = highlight_color & 0x77;
 }
 
-/* Set reverse video mode off.  */
 void
-grub_terminfo_reverse_video_off (grub_term_output_t oterm)
+grub_terminfo_getcolor (struct grub_term_output *term,
+			grub_uint8_t *normal_color,
+			grub_uint8_t *highlight_color)
 {
-  putstr (grub_terminfo_tparm (term.reverse_video_off), oterm);
+  struct grub_terminfo_output_state *data
+    = (struct grub_terminfo_output_state *) term->data;
+
+  *normal_color = data->normal_color;
+  *highlight_color = data->highlight_color;
 }
 
-/* Show cursor.  */
 void
-grub_terminfo_cursor_on (grub_term_output_t oterm)
+grub_terminfo_setcolorstate (struct grub_term_output *term,
+			     const grub_term_color_state state)
 {
-  putstr (grub_terminfo_tparm (term.cursor_on), oterm);
+  struct grub_terminfo_output_state *data
+    = (struct grub_terminfo_output_state *) term->data;
+
+  if (data->setcolor)
+    {
+      int fg;
+      int bg;
+
+      switch (state)
+	{
+	case GRUB_TERM_COLOR_STANDARD:
+	case GRUB_TERM_COLOR_NORMAL:
+	  fg = data->normal_color & 0x0f;
+	  bg = data->normal_color >> 4;
+	  break;
+	case GRUB_TERM_COLOR_HIGHLIGHT:
+	  fg = data->highlight_color & 0x0f;
+	  bg = data->highlight_color >> 4;
+	  break;
+	default:
+	  return;
+	}
+
+      putstr (term, grub_terminfo_tparm (data->setcolor, fg, bg));
+      return;
+    }
+
+  switch (state)
+    {
+    case GRUB_TERM_COLOR_STANDARD:
+    case GRUB_TERM_COLOR_NORMAL:
+      putstr (term, grub_terminfo_tparm (data->reverse_video_off));
+      break;
+    case GRUB_TERM_COLOR_HIGHLIGHT:
+      putstr (term, grub_terminfo_tparm (data->reverse_video_on));
+      break;
+    default:
+      break;
+    }
 }
 
-/* Hide cursor.  */
 void
-grub_terminfo_cursor_off (grub_term_output_t oterm)
+grub_terminfo_setcursor (struct grub_term_output *term, const int on)
 {
-  putstr (grub_terminfo_tparm (term.cursor_off), oterm);
+  struct grub_terminfo_output_state *data
+    = (struct grub_terminfo_output_state *) term->data;
+
+  if (on)
+    putstr (term, grub_terminfo_tparm (data->cursor_on));
+  else
+    putstr (term, grub_terminfo_tparm (data->cursor_off));
+}
+
+/* The terminfo version of putchar.  */
+void
+grub_terminfo_putchar (struct grub_term_output *term,
+		       const struct grub_unicode_glyph *c)
+{
+  struct grub_terminfo_output_state *data
+    = (struct grub_terminfo_output_state *) term->data;
+
+  /* Keep track of the cursor.  */
+  switch (c->base)
+    {
+    case '\a':
+      break;
+
+    case '\b':
+    case 127:
+      if (data->xpos > 0)
+	data->xpos--;
+    break;
+
+    case '\n':
+      if (data->ypos < grub_term_height (term) - 1)
+	data->ypos++;
+      break;
+
+    case '\r':
+      data->xpos = 0;
+      break;
+
+    default:
+      if (data->xpos + c->estimated_width >= grub_term_width (term) + 1)
+	{
+	  data->xpos = 0;
+	  if (data->ypos < grub_term_height (term) - 1)
+	    data->ypos++;
+	  data->put ('\r');
+	  data->put ('\n');
+	}
+      data->xpos += c->estimated_width;
+      break;
+    }
+
+  data->put (c->base);
 }
 
 #define ANSI_C0 0x9b
 
-void
+static void
 grub_terminfo_readkey (int *keys, int *len, int (*readkey) (void))
 {
   int c;
@@ -276,21 +482,80 @@ grub_terminfo_readkey (int *keys, int *len, int (*readkey) (void))
 #undef CONTINUE_READ
 }
 
+/* The terminfo version of checkkey.  */
+int
+grub_terminfo_checkkey (struct grub_term_input *termi)
+{
+  struct grub_terminfo_input_state *data
+    = (struct grub_terminfo_input_state *) (termi->data);
+  if (data->npending)
+    return data->input_buf[0];
+
+  grub_terminfo_readkey (data->input_buf, &data->npending, data->readkey);
+
+  if (data->npending)
+    return data->input_buf[0];
+
+  return -1;
+}
+
+/* The terminfo version of getkey.  */
+int
+grub_terminfo_getkey (struct grub_term_input *termi)
+{
+  struct grub_terminfo_input_state *data
+    = (struct grub_terminfo_input_state *) (termi->data);
+  int ret;
+  while (! data->npending)
+    grub_terminfo_readkey (data->input_buf, &data->npending, data->readkey);
+
+  ret = data->input_buf[0];
+  data->npending--;
+  grub_memmove (data->input_buf, data->input_buf + 1, data->npending);
+  return ret;
+}
+
+grub_err_t
+grub_terminfo_input_init (struct grub_term_input *termi)
+{
+  struct grub_terminfo_input_state *data
+    = (struct grub_terminfo_input_state *) (termi->data);
+  data->npending = 0;
+
+  return GRUB_ERR_NONE;
+}
+
 /* GRUB Command.  */
 
 static grub_err_t
 grub_cmd_terminfo (grub_command_t cmd __attribute__ ((unused)),
 		   int argc, char **args)
 {
+  struct grub_term_output *cur;
+
   if (argc == 0)
-  {
-    grub_printf ("Current terminfo type: %s\n", grub_terminfo_get_current());
-    return GRUB_ERR_NONE;
-  }
-  else if (argc != 1)
+    {
+      grub_printf ("Current terminfo types: \n");
+      for (cur = terminfo_outputs; cur;
+	   cur = ((struct grub_terminfo_output_state *) cur->data)->next)
+	grub_printf ("%s: %s\n", cur->name,
+		     grub_terminfo_get_current(cur));
+
+      return GRUB_ERR_NONE;
+    }
+
+  if (argc == 1)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "too few parameters");
+  if (argc != 2)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "too many parameters");
-  else
-    return grub_terminfo_set_current (args[0]);
+
+  for (cur = terminfo_outputs; cur;
+       cur = ((struct grub_terminfo_output_state *) cur->data)->next)
+    if (grub_strcmp (args[0], cur->name) == 0)
+      return grub_terminfo_set_current (cur, args[1]);
+  return grub_error (GRUB_ERR_BAD_ARGUMENT,
+		     "no terminal %s found or it's not handled by terminfo",
+		     args[0]);
 }
 
 static grub_command_t cmd;
@@ -298,8 +563,7 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(terminfo)
 {
   cmd = grub_register_command ("terminfo", grub_cmd_terminfo,
-			       N_("[TERM]"), N_("Set terminfo type."));
-  grub_terminfo_set_current ("vt100");
+			       N_("[TERM TYPE]"), N_("Set terminfo type of TERM  to TYPE."));
 }
 
 GRUB_MOD_FINI(terminfo)
diff --git a/term/tparm.c b/term/tparm.c
index adf0b3a7c..076a192a5 100644
--- a/term/tparm.c
+++ b/term/tparm.c
@@ -751,6 +751,9 @@ grub_terminfo_tparm (const char *string, ...)
     va_list ap;
     char *result;
 
+    if (!string)
+      return "";
+
     va_start (ap, string);
     result = tparam_internal (string, ap);
     va_end (ap);

From 710d05aa8cadae86bd41bfd8b799ec4e784220ce Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 7 May 2010 18:07:05 +0200
Subject: [PATCH 0936/1628] Support serial colors

---
 term/ieee1275/ofconsole.c | 12 +++++++-----
 term/terminfo.c           | 19 +++++++++++++++----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index d143a6313..151425a91 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -39,16 +39,18 @@ struct color
   int blue;
 };
 
+/* Use serial colors as they are default on most firmwares and some firmwares
+   ignore set-color!. Additionally output may be redirected to serial.  */
 static struct color colors[] =
   {
     // {R, G, B}
-    {0x00, 0x00, 0x00},
-    {0x00, 0x00, 0xA8}, // 1 = blue
+    {0x00, 0x00, 0x00}, // 0 = black
+    {0xA8, 0x00, 0x00}, // 1 = red
     {0x00, 0xA8, 0x00}, // 2 = green
-    {0x00, 0xA8, 0xA8}, // 3 = cyan
-    {0xA8, 0x00, 0x00}, // 4 = red
+    {0xFE, 0xFE, 0x54}, // 3 = yellow
+    {0x00, 0x00, 0xA8}, // 4 = blue
     {0xA8, 0x00, 0xA8}, // 5 = magenta
-    {0xFE, 0xFE, 0x54}, // 6 = yellow
+    {0x00, 0xA8, 0xA8}, // 6 = cyan
     {0xFE, 0xFE, 0xFE}  // 7 = white
   };
 
diff --git a/term/terminfo.c b/term/terminfo.c
index f0e234106..4a07ba04f 100644
--- a/term/terminfo.c
+++ b/term/terminfo.c
@@ -255,9 +255,8 @@ grub_terminfo_setcolor (struct grub_term_output *term,
   struct grub_terminfo_output_state *data
     = (struct grub_terminfo_output_state *) term->data;
 
-  /* Discard bright bit.  */
-  data->normal_color = normal_color & 0x77;
-  data->highlight_color = highlight_color & 0x77;
+  data->normal_color = normal_color;
+  data->highlight_color = highlight_color;
 }
 
 void
@@ -283,6 +282,17 @@ grub_terminfo_setcolorstate (struct grub_term_output *term,
     {
       int fg;
       int bg;
+      /* Map from VGA to terminal colors.  */
+      const int colormap[8] 
+	= { 0, /* Black. */
+	    4, /* Blue. */
+	    2, /* Green. */
+	    6, /* Cyan. */
+	    1, /* Red.  */
+	    5, /* Magenta.  */
+	    3, /* Yellow.  */
+	    7, /* White.  */
+      };
 
       switch (state)
 	{
@@ -299,7 +309,8 @@ grub_terminfo_setcolorstate (struct grub_term_output *term,
 	  return;
 	}
 
-      putstr (term, grub_terminfo_tparm (data->setcolor, fg, bg));
+      putstr (term, grub_terminfo_tparm (data->setcolor, colormap[fg & 7],
+					 colormap[bg & 7]));
       return;
     }
 

From d8e9099811f354073d8d997f4e333ba5c3e6c0e8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 8 May 2010 00:17:23 +0200
Subject: [PATCH 0937/1628] Move serial encoding handling to terminfo.c

---
 include/grub/term.h | 13 +++---
 term/serial.c       | 16 +-------
 term/terminfo.c     | 99 ++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 93 insertions(+), 35 deletions(-)

diff --git a/include/grub/term.h b/include/grub/term.h
index c43eb6ff7..59a90d500 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -70,18 +70,19 @@ grub_term_color_state;
 /* Set when the terminal cannot do fancy things.  */
 #define GRUB_TERM_DUMB		        (1 << 2)
 /* Which encoding does terminal expect stream to be.  */
-#define GRUB_TERM_CODE_TYPE_MASK	        ((1 << 5) | (1 << 4) | (1 << 3))
+#define GRUB_TERM_CODE_TYPE_SHIFT       3
+#define GRUB_TERM_CODE_TYPE_MASK	        (7 << GRUB_TERM_CODE_TYPE_SHIFT)
 /* Only ASCII characters accepted.  */
-#define GRUB_TERM_CODE_TYPE_ASCII	        0
+#define GRUB_TERM_CODE_TYPE_ASCII	        (0 << GRUB_TERM_CODE_TYPE_SHIFT)
 /* Expects VGA characters (ASCII + pseudographics).  */
-#define GRUB_TERM_CODE_TYPE_VGA	                (1 << 3)
+#define GRUB_TERM_CODE_TYPE_VGA	                (1 << GRUB_TERM_CODE_TYPE_SHIFT)
 /* UTF-8 stream in logical order. Usually used for terminals
    which just forward the stream to another computer.  */
-#define GRUB_TERM_CODE_TYPE_UTF8_LOGICAL	(1 << 4)
+#define GRUB_TERM_CODE_TYPE_UTF8_LOGICAL	(2 << GRUB_TERM_CODE_TYPE_SHIFT)
 /* UTF-8 in visual order. Like UTF-8 logical but for buggy endpoints.  */
-#define GRUB_TERM_CODE_TYPE_UTF8_VISUAL	        ((1 << 4) | (1 << 3))
+#define GRUB_TERM_CODE_TYPE_UTF8_VISUAL	        (3 << GRUB_TERM_CODE_TYPE_SHIFT)
 /* Glyph description in visual order.  */
-#define GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS       (1 << 5)
+#define GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS       (4 << GRUB_TERM_CODE_TYPE_SHIFT)
 
 
 /* Bitmasks for modifier keys returned by grub_getkeystatus.  */
diff --git a/term/serial.c b/term/serial.c
index 82bf6abb7..46656455f 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -38,9 +38,6 @@ static const struct grub_arg_option options[] =
   {"word",   'w', 0, N_("Set the serial port word length."), 0, ARG_TYPE_INT},
   {"parity", 'r', 0, N_("Set the serial port parity."),      0, ARG_TYPE_STRING},
   {"stop",   't', 0, N_("Set the serial port stop bits."),   0, ARG_TYPE_INT},
-  {"ascii",  'a', 0, N_("Terminal is ASCII-only."),   0, ARG_TYPE_NONE},
-  {"utf8",   'l', 0, N_("Terminal is logical-ordered UTF-8."), 0, ARG_TYPE_NONE},
-  {"visual-utf8",   'v', 0, N_("Terminal is visually-ordered UTF-8."), 0, ARG_TYPE_NONE},
   {0, 0, 0, 0, 0, 0}
 };
 
@@ -201,9 +198,7 @@ struct grub_terminfo_input_state grub_serial_terminfo_input =
 
 struct grub_terminfo_output_state grub_serial_terminfo_output =
   {
-    .put = serial_hw_put,
-    .normal_color = 0x7,
-    .highlight_color = 0x70
+    .put = serial_hw_put
   };
 
 static struct grub_term_input grub_serial_term_input =
@@ -313,15 +308,6 @@ grub_cmd_serial (grub_extcmd_t cmd,
 	}
     }
 
-  grub_serial_term_output.flags &= ~GRUB_TERM_CODE_TYPE_MASK;
-
-  if (state[7].set)
-    grub_serial_term_output.flags |= GRUB_TERM_CODE_TYPE_UTF8_LOGICAL;
-  else if (state[8].set)
-    grub_serial_term_output.flags |= GRUB_TERM_CODE_TYPE_UTF8_VISUAL;
-  else
-    grub_serial_term_output.flags |= GRUB_TERM_CODE_TYPE_ASCII;
-
   /* Initialize with new settings.  */
   hwiniterr = serial_hw_init ();
 
diff --git a/term/terminfo.c b/term/terminfo.c
index 4a07ba04f..34d82fdbb 100644
--- a/term/terminfo.c
+++ b/term/terminfo.c
@@ -538,35 +538,100 @@ grub_terminfo_input_init (struct grub_term_input *termi)
 
 /* GRUB Command.  */
 
+static grub_err_t
+print_terminfo (void)
+{
+  const char *encoding_names[(GRUB_TERM_CODE_TYPE_MASK 
+			      >> GRUB_TERM_CODE_TYPE_SHIFT) + 1]
+    = {
+    /* VGA and glyph descriptor types are just for completeness,
+       they are not used on terminfo terminals.
+    */
+    [GRUB_TERM_CODE_TYPE_ASCII >> GRUB_TERM_CODE_TYPE_SHIFT] = _("ASCII"),
+    [GRUB_TERM_CODE_TYPE_VGA >> GRUB_TERM_CODE_TYPE_SHIFT] = "VGA",
+    [GRUB_TERM_CODE_TYPE_UTF8_LOGICAL >> GRUB_TERM_CODE_TYPE_SHIFT]
+    = _("UTF-8"),
+    [GRUB_TERM_CODE_TYPE_UTF8_VISUAL >> GRUB_TERM_CODE_TYPE_SHIFT]
+    = _("UTF-8 visual"),
+    [GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS >> GRUB_TERM_CODE_TYPE_SHIFT]
+    = "Glyph descriptors",
+    _("Unknown"), _("Unknown"), _("Unknown")
+  };
+  struct grub_term_output *cur;
+
+  grub_printf ("Current terminfo types: \n");
+  for (cur = terminfo_outputs; cur;
+       cur = ((struct grub_terminfo_output_state *) cur->data)->next)
+    grub_printf ("%s: %s\t%s\n", cur->name,
+		 grub_terminfo_get_current(cur),
+		 encoding_names[(cur->flags & GRUB_TERM_CODE_TYPE_MASK)
+				>> GRUB_TERM_CODE_TYPE_SHIFT]);
+
+  return GRUB_ERR_NONE;
+}
+
 static grub_err_t
 grub_cmd_terminfo (grub_command_t cmd __attribute__ ((unused)),
 		   int argc, char **args)
 {
   struct grub_term_output *cur;
+  int encoding = GRUB_TERM_CODE_TYPE_ASCII;
+  int i;
+  char *name = NULL, *type = NULL;
 
   if (argc == 0)
-    {
-      grub_printf ("Current terminfo types: \n");
-      for (cur = terminfo_outputs; cur;
-	   cur = ((struct grub_terminfo_output_state *) cur->data)->next)
-	grub_printf ("%s: %s\n", cur->name,
-		     grub_terminfo_get_current(cur));
+    return print_terminfo ();
 
-      return GRUB_ERR_NONE;
+  for (i = 0; i < argc; i++)
+    {
+      if (grub_strcmp (args[i], "-a") == 0
+	  || grub_strcmp (args[i], "--ascii") == 0)
+	{
+	  encoding = GRUB_TERM_CODE_TYPE_ASCII;
+	  continue;
+	}
+      if (grub_strcmp (args[i], "-u") == 0
+	  || grub_strcmp (args[i], "--utf8") == 0)
+	{
+	  encoding = GRUB_TERM_CODE_TYPE_UTF8_LOGICAL;
+	  continue;
+	}
+      if (grub_strcmp (args[i], "-v") == 0
+	  || grub_strcmp (args[i], "--visual-utf8") == 0)
+	{
+	  encoding = GRUB_TERM_CODE_TYPE_UTF8_VISUAL;
+	  continue;
+	}
+      if (!name)
+	{
+	  name = args[i];
+	  continue;
+	}
+      if (!type)
+	{
+	  type = args[i];
+	  continue;
+	}
+
+      return grub_error (GRUB_ERR_BAD_ARGUMENT, "too many parameters");
     }
 
-  if (argc == 1)
+  if (name == NULL)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "too few parameters");
-  if (argc != 2)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "too many parameters");
 
   for (cur = terminfo_outputs; cur;
        cur = ((struct grub_terminfo_output_state *) cur->data)->next)
-    if (grub_strcmp (args[0], cur->name) == 0)
-      return grub_terminfo_set_current (cur, args[1]);
+    if (grub_strcmp (name, cur->name) == 0)
+      {
+	cur->flags = (cur->flags & ~GRUB_TERM_CODE_TYPE_MASK) | encoding;
+	if (!type)
+	  return GRUB_ERR_NONE;
+
+	return grub_terminfo_set_current (cur, type);
+      }
   return grub_error (GRUB_ERR_BAD_ARGUMENT,
 		     "no terminal %s found or it's not handled by terminfo",
-		     args[0]);
+		     name);
 }
 
 static grub_command_t cmd;
@@ -574,7 +639,13 @@ static grub_command_t cmd;
 GRUB_MOD_INIT(terminfo)
 {
   cmd = grub_register_command ("terminfo", grub_cmd_terminfo,
-			       N_("[TERM TYPE]"), N_("Set terminfo type of TERM  to TYPE."));
+			       N_("[[-a|-u|-v] TERM [TYPE]]"),
+			       N_("Set terminfo type of TERM  to TYPE.\n"
+				  "-a, --ascii            Terminal is ASCII-only [default].\n"
+				  "-u, --utf8             Terminal is logical-ordered UTF-8.\n"
+				  "-v, --visual-utf8      Terminal is visually-ordered UTF-8.")
+
+			       );
 }
 
 GRUB_MOD_FINI(terminfo)

From 3c151d94af138fe813a42ee934f0206863d004e0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 8 May 2010 01:06:22 +0200
Subject: [PATCH 0938/1628] simplify setcolor/getcolor

---
 include/grub/i386/vga_common.h |  6 ------
 include/grub/term.h            | 35 +++++++++++++--------------------
 include/grub/terminfo.h        |  9 ---------
 term/efi/console.c             | 36 ++++++++--------------------------
 term/gfxterm.c                 | 36 ++++++----------------------------
 term/i386/pc/console.c         |  6 +++---
 term/i386/pc/vga.c             |  2 ++
 term/i386/pc/vga_text.c        |  6 +++---
 term/i386/vga_common.c         | 27 ++++---------------------
 term/ieee1275/ofconsole.c      |  6 +++---
 term/serial.c                  |  6 +++---
 term/terminfo.c                | 35 ++++-----------------------------
 util/console.c                 | 29 ++++-----------------------
 13 files changed, 54 insertions(+), 185 deletions(-)

diff --git a/include/grub/i386/vga_common.h b/include/grub/i386/vga_common.h
index 8ba09dfea..872790307 100644
--- a/include/grub/i386/vga_common.h
+++ b/include/grub/i386/vga_common.h
@@ -28,11 +28,5 @@ extern grub_uint8_t grub_console_cur_color;
 grub_uint16_t grub_console_getwh (struct grub_term_output *term);
 void grub_console_setcolorstate (struct grub_term_output *term,
 				 grub_term_color_state state);
-void grub_console_setcolor (struct grub_term_output *term,
-			    grub_uint8_t normal_color,
-			    grub_uint8_t highlight_color);
-void grub_console_getcolor (struct grub_term_output *term,
-			    grub_uint8_t *normal_color,
-			    grub_uint8_t *highlight_color);
 
 #endif /* ! GRUB_VGA_COMMON_CPU_HEADER */
diff --git a/include/grub/term.h b/include/grub/term.h
index 59a90d500..5a098e293 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -195,16 +195,6 @@ struct grub_term_output
   void (*setcolorstate) (struct grub_term_output *term,
 			 grub_term_color_state state);
 
-  /* Set the normal color and the highlight color. The format of each
-     color is VGA's.  */
-  void (*setcolor) (struct grub_term_output *term,
-		    grub_uint8_t normal_color, grub_uint8_t highlight_color);
-
-  /* Get the normal color and the highlight color. The format of each
-     color is VGA's.  */
-  void (*getcolor) (struct grub_term_output *term,
-		    grub_uint8_t *normal_color, grub_uint8_t *highlight_color);
-
   /* Turn on/off the cursor.  */
   void (*setcursor) (struct grub_term_output *term, int on);
 
@@ -214,10 +204,18 @@ struct grub_term_output
   /* The feature flags defined above.  */
   grub_uint32_t flags;
 
+  /* Current color state.  */
+  grub_uint8_t normal_color;
+  grub_uint8_t highlight_color;
+
   void *data;
 };
 typedef struct grub_term_output *grub_term_output_t;
 
+#define GRUB_TERM_DEFAULT_NORMAL_COLOR 0x07
+#define GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR 0x70
+#define GRUB_TERM_DEFAULT_STANDARD_COLOR 0x07
+
 extern struct grub_term_output *EXPORT_VAR(grub_term_outputs_disabled);
 extern struct grub_term_input *EXPORT_VAR(grub_term_inputs_disabled);
 extern struct grub_term_output *EXPORT_VAR(grub_term_outputs);
@@ -361,14 +359,14 @@ grub_term_setcolorstate (struct grub_term_output *term,
     term->setcolorstate (term, state);
 }
 
-  /* Set the normal color and the highlight color. The format of each
-     color is VGA's.  */
+/* Set the normal color and the highlight color. The format of each
+   color is VGA's.  */
 static inline void 
 grub_term_setcolor (struct grub_term_output *term,
 		    grub_uint8_t normal_color, grub_uint8_t highlight_color)
 {
-  if (term->setcolor)
-    term->setcolor (term, normal_color, highlight_color);
+  term->normal_color = normal_color;
+  term->highlight_color = highlight_color;
 }
 
 /* Turn on/off the cursor.  */
@@ -429,13 +427,8 @@ static inline void
 grub_term_getcolor (struct grub_term_output *term, 
 		    grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
 {
-  if (term->getcolor)
-    term->getcolor (term, normal_color, highlight_color);
-  else
-    {
-      *normal_color = 0x07;
-      *highlight_color = 0x07;
-    }
+  *normal_color = term->normal_color;
+  *highlight_color = term->highlight_color;
 }
 
 struct grub_term_autoload
diff --git a/include/grub/terminfo.h b/include/grub/terminfo.h
index 54872caa8..d6907d7f0 100644
--- a/include/grub/terminfo.h
+++ b/include/grub/terminfo.h
@@ -49,9 +49,6 @@ struct grub_terminfo_output_state
   char *cursor_off;
   char *setcolor;
 
-  grub_uint8_t normal_color;
-  grub_uint8_t highlight_color;
-
   unsigned int xpos, ypos;
 
   void (*put) (const int c);
@@ -72,12 +69,6 @@ grub_err_t EXPORT_FUNC (grub_terminfo_input_init) (struct grub_term_input *term)
 int EXPORT_FUNC (grub_terminfo_getkey) (struct grub_term_input *term);
 void EXPORT_FUNC (grub_terminfo_putchar) (struct grub_term_output *term,
 					  const struct grub_unicode_glyph *c);
-void EXPORT_FUNC (grub_terminfo_getcolor) (struct grub_term_output *term,
-					   grub_uint8_t *normal_color,
-					   grub_uint8_t *highlight_color);
-void EXPORT_FUNC (grub_terminfo_setcolor) (struct grub_term_output *term,
-					   grub_uint8_t normal_color,
-					   grub_uint8_t highlight_color);
 
 grub_err_t EXPORT_FUNC (grub_terminfo_output_register) (struct grub_term_output *term,
 							const char *type);
diff --git a/term/efi/console.c b/term/efi/console.c
index e5dab8a96..d54c1c4be 100644
--- a/term/efi/console.c
+++ b/term/efi/console.c
@@ -24,15 +24,9 @@
 #include <grub/efi/api.h>
 #include <grub/efi/console.h>
 
-static grub_uint8_t
+static const grub_uint8_t
 grub_console_standard_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_YELLOW,
 						  GRUB_EFI_BACKGROUND_BLACK);
-static grub_uint8_t
-grub_console_normal_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_LIGHTGRAY,
-						GRUB_EFI_BACKGROUND_BLACK);
-static grub_uint8_t
-grub_console_highlight_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_BLACK,
-						   GRUB_EFI_BACKGROUND_LIGHTGRAY);
 
 static int read_key = -1;
 
@@ -292,7 +286,7 @@ grub_console_cls (struct grub_term_output *term __attribute__ ((unused)))
 }
 
 static void
-grub_console_setcolorstate (struct grub_term_output *term __attribute__ ((unused)),
+grub_console_setcolorstate (struct grub_term_output *term,
 			    grub_term_color_state state)
 {
   grub_efi_simple_text_output_interface_t *o;
@@ -304,32 +298,16 @@ grub_console_setcolorstate (struct grub_term_output *term __attribute__ ((unused
       efi_call_2 (o->set_attributes, o, grub_console_standard_color);
       break;
     case GRUB_TERM_COLOR_NORMAL:
-      efi_call_2 (o->set_attributes, o, grub_console_normal_color);
+      efi_call_2 (o->set_attributes, o, term->normal_color);
       break;
     case GRUB_TERM_COLOR_HIGHLIGHT:
-      efi_call_2 (o->set_attributes, o, grub_console_highlight_color);
+      efi_call_2 (o->set_attributes, o, term->highlight_color);
       break;
     default:
       break;
   }
 }
 
-static void
-grub_console_setcolor (struct grub_term_output *term __attribute__ ((unused)),
-		       grub_uint8_t normal_color, grub_uint8_t highlight_color)
-{
-  grub_console_normal_color = normal_color;
-  grub_console_highlight_color = highlight_color;
-}
-
-static void
-grub_console_getcolor (struct grub_term_output *term __attribute__ ((unused)),
-		       grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
-{
-  *normal_color = grub_console_normal_color;
-  *highlight_color = grub_console_highlight_color;
-}
-
 static void
 grub_console_setcursor (struct grub_term_output *term __attribute__ ((unused)),
 			int on)
@@ -356,9 +334,11 @@ static struct grub_term_output grub_console_term_output =
     .gotoxy = grub_console_gotoxy,
     .cls = grub_console_cls,
     .setcolorstate = grub_console_setcolorstate,
-    .setcolor = grub_console_setcolor,
-    .getcolor = grub_console_getcolor,
     .setcursor = grub_console_setcursor,
+    .normal_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_LIGHTGRAY,
+					GRUB_EFI_BACKGROUND_BLACK),
+    .highlight_color = GRUB_EFI_TEXT_ATTR (GRUB_EFI_BLACK,
+					   GRUB_EFI_BACKGROUND_LIGHTGRAY),
     .flags = GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS
   };
 
diff --git a/term/gfxterm.c b/term/gfxterm.c
index d9fb2e04c..c38e306cb 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -35,8 +35,6 @@
 #define DEFAULT_BORDER_WIDTH	10
 
 #define DEFAULT_STANDARD_COLOR  0x07
-#define DEFAULT_NORMAL_COLOR    0x07
-#define DEFAULT_HIGHLIGHT_COLOR 0x70
 
 struct grub_dirty_region
 {
@@ -92,8 +90,6 @@ struct grub_virtual_screen
 
   /* Terminal color settings.  */
   grub_uint8_t standard_color_setting;
-  grub_uint8_t normal_color_setting;
-  grub_uint8_t highlight_color_setting;
   grub_uint8_t term_color;
 
   /* Color settings.  */
@@ -260,10 +256,8 @@ grub_virtual_screen_setup (unsigned int x, unsigned int y,
   grub_video_set_active_render_target (text_layer);
 
   virtual_screen.standard_color_setting = DEFAULT_STANDARD_COLOR;
-  virtual_screen.normal_color_setting = DEFAULT_NORMAL_COLOR;
-  virtual_screen.highlight_color_setting = DEFAULT_HIGHLIGHT_COLOR;
 
-  virtual_screen.term_color = virtual_screen.normal_color_setting;
+  virtual_screen.term_color = GRUB_TERM_DEFAULT_NORMAL_COLOR;
 
   set_term_color (virtual_screen.term_color);
 
@@ -1041,7 +1035,7 @@ grub_gfxterm_cls (struct grub_term_output *term)
 }
 
 static void
-grub_virtual_screen_setcolorstate (struct grub_term_output *term __attribute__ ((unused)),
+grub_virtual_screen_setcolorstate (struct grub_term_output *term,
 				   grub_term_color_state state)
 {
   switch (state)
@@ -1051,11 +1045,11 @@ grub_virtual_screen_setcolorstate (struct grub_term_output *term __attribute__ (
       break;
 
     case GRUB_TERM_COLOR_NORMAL:
-      virtual_screen.term_color = virtual_screen.normal_color_setting;
+      virtual_screen.term_color = term->normal_color;
       break;
 
     case GRUB_TERM_COLOR_HIGHLIGHT:
-      virtual_screen.term_color = virtual_screen.highlight_color_setting;
+      virtual_screen.term_color = term->highlight_color;
       break;
 
     default:
@@ -1066,24 +1060,6 @@ grub_virtual_screen_setcolorstate (struct grub_term_output *term __attribute__ (
   set_term_color (virtual_screen.term_color);
 }
 
-static void
-grub_virtual_screen_setcolor (struct grub_term_output *term __attribute__ ((unused)),
-			      grub_uint8_t normal_color,
-                              grub_uint8_t highlight_color)
-{
-  virtual_screen.normal_color_setting = normal_color;
-  virtual_screen.highlight_color_setting = highlight_color;
-}
-
-static void
-grub_virtual_screen_getcolor (struct grub_term_output *term __attribute__ ((unused)),
-			      grub_uint8_t *normal_color,
-                              grub_uint8_t *highlight_color)
-{
-  *normal_color = virtual_screen.normal_color_setting;
-  *highlight_color = virtual_screen.highlight_color_setting;
-}
-
 static void
 grub_gfxterm_setcursor (struct grub_term_output *term __attribute__ ((unused)),
 			int on)
@@ -1211,11 +1187,11 @@ static struct grub_term_output grub_video_term =
     .gotoxy = grub_gfxterm_gotoxy,
     .cls = grub_gfxterm_cls,
     .setcolorstate = grub_virtual_screen_setcolorstate,
-    .setcolor = grub_virtual_screen_setcolor,
-    .getcolor = grub_virtual_screen_getcolor,
     .setcursor = grub_gfxterm_setcursor,
     .refresh = grub_gfxterm_refresh,
     .flags = GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS,
+    .normal_color = GRUB_TERM_DEFAULT_NORMAL_COLOR,
+    .highlight_color = GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR,
     .next = 0
   };
 
diff --git a/term/i386/pc/console.c b/term/i386/pc/console.c
index c157f482c..2a7e34ad4 100644
--- a/term/i386/pc/console.c
+++ b/term/i386/pc/console.c
@@ -62,10 +62,10 @@ static struct grub_term_output grub_console_term_output =
     .gotoxy = grub_console_gotoxy,
     .cls = grub_console_cls,
     .setcolorstate = grub_console_setcolorstate,
-    .setcolor = grub_console_setcolor,
-    .getcolor = grub_console_getcolor,
     .setcursor = grub_console_setcursor,
-    .flags = GRUB_TERM_CODE_TYPE_VGA
+    .flags = GRUB_TERM_CODE_TYPE_VGA,
+    .normal_color = GRUB_TERM_DEFAULT_NORMAL_COLOR,
+    .highlight_color = GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR,
   };
 
 void
diff --git a/term/i386/pc/vga.c b/term/i386/pc/vga.c
index a9dd5e214..ace0504d4 100644
--- a/term/i386/pc/vga.c
+++ b/term/i386/pc/vga.c
@@ -511,6 +511,8 @@ static struct grub_term_output grub_vga_term =
     .setcolorstate = grub_vga_setcolorstate,
     .setcursor = grub_vga_setcursor,
     .flags = GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS,
+    .normal_color = GRUB_TERM_DEFAULT_NORMAL_COLOR,
+    .highlight_color = GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR,
   };
 
 GRUB_MOD_INIT(vga)
diff --git a/term/i386/pc/vga_text.c b/term/i386/pc/vga_text.c
index 9242adf0f..60bde5b05 100644
--- a/term/i386/pc/vga_text.c
+++ b/term/i386/pc/vga_text.c
@@ -163,10 +163,10 @@ static struct grub_term_output grub_vga_text_term =
     .gotoxy = grub_vga_text_gotoxy,
     .cls = grub_vga_text_cls,
     .setcolorstate = grub_console_setcolorstate,
-    .setcolor = grub_console_setcolor,
-    .getcolor = grub_console_getcolor,
     .setcursor = grub_vga_text_setcursor,
-    .flags = GRUB_TERM_CODE_TYPE_VGA
+    .flags = GRUB_TERM_CODE_TYPE_VGA,
+    .normal_color = GRUB_TERM_DEFAULT_NORMAL_COLOR,
+    .highlight_color = GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR,
   };
 
 GRUB_MOD_INIT(vga_text)
diff --git a/term/i386/vga_common.c b/term/i386/vga_common.c
index 16dc8c56b..02fb5c02d 100644
--- a/term/i386/vga_common.c
+++ b/term/i386/vga_common.c
@@ -21,9 +21,6 @@
 #include <grub/types.h>
 
 grub_uint8_t grub_console_cur_color = 0x7;
-static grub_uint8_t grub_console_standard_color = 0x7;
-static grub_uint8_t grub_console_normal_color = 0x7;
-static grub_uint8_t grub_console_highlight_color = 0x70;
 
 grub_uint16_t
 grub_console_getwh (struct grub_term_output *term __attribute__ ((unused)))
@@ -32,36 +29,20 @@ grub_console_getwh (struct grub_term_output *term __attribute__ ((unused)))
 }
 
 void
-grub_console_setcolorstate (struct grub_term_output *term __attribute__ ((unused)),
+grub_console_setcolorstate (struct grub_term_output *term,
 			    grub_term_color_state state)
 {
   switch (state) {
     case GRUB_TERM_COLOR_STANDARD:
-      grub_console_cur_color = grub_console_standard_color;
+      grub_console_cur_color = GRUB_TERM_DEFAULT_STANDARD_COLOR;
       break;
     case GRUB_TERM_COLOR_NORMAL:
-      grub_console_cur_color = grub_console_normal_color;
+      grub_console_cur_color = term->normal_color;
       break;
     case GRUB_TERM_COLOR_HIGHLIGHT:
-      grub_console_cur_color = grub_console_highlight_color;
+      grub_console_cur_color = term->highlight_color;
       break;
     default:
       break;
   }
 }
-
-void
-grub_console_setcolor (struct grub_term_output *term __attribute__ ((unused)),
-		       grub_uint8_t normal_color, grub_uint8_t highlight_color)
-{
-  grub_console_normal_color = normal_color;
-  grub_console_highlight_color = highlight_color;
-}
-
-void
-grub_console_getcolor (struct grub_term_output *term __attribute__ ((unused)),
-		       grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
-{
-  *normal_color = grub_console_normal_color;
-  *highlight_color = grub_console_highlight_color;
-}
diff --git a/term/ieee1275/ofconsole.c b/term/ieee1275/ofconsole.c
index 151425a91..604906ceb 100644
--- a/term/ieee1275/ofconsole.c
+++ b/term/ieee1275/ofconsole.c
@@ -204,11 +204,11 @@ static struct grub_term_output grub_ofconsole_term_output =
     .gotoxy = grub_terminfo_gotoxy,
     .cls = grub_terminfo_cls,
     .setcolorstate = grub_terminfo_setcolorstate,
-    .setcolor = grub_terminfo_setcolor,
-    .getcolor = grub_terminfo_getcolor,
     .setcursor = grub_ofconsole_setcursor,
     .flags = GRUB_TERM_CODE_TYPE_ASCII,
-    .data = &grub_ofconsole_terminfo_output
+    .data = &grub_ofconsole_terminfo_output,
+    .normal_color = GRUB_TERM_DEFAULT_NORMAL_COLOR,
+    .highlight_color = GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR,
   };
 
 void grub_terminfo_fini (void);
diff --git a/term/serial.c b/term/serial.c
index 46656455f..d97ead60a 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -219,11 +219,11 @@ static struct grub_term_output grub_serial_term_output =
   .gotoxy = grub_terminfo_gotoxy,
   .cls = grub_terminfo_cls,
   .setcolorstate = grub_terminfo_setcolorstate,
-  .setcolor = grub_terminfo_setcolor,
-  .getcolor = grub_terminfo_getcolor,
   .setcursor = grub_terminfo_setcursor,
   .flags = GRUB_TERM_CODE_TYPE_ASCII,
-  .data = &grub_serial_terminfo_output
+  .data = &grub_serial_terminfo_output,
+  .normal_color = GRUB_TERM_DEFAULT_NORMAL_COLOR,
+  .highlight_color = GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR,
 };
 
 
diff --git a/term/terminfo.c b/term/terminfo.c
index 34d82fdbb..dcf17106a 100644
--- a/term/terminfo.c
+++ b/term/terminfo.c
@@ -168,9 +168,6 @@ grub_terminfo_output_register (struct grub_term_output *term,
   data = (struct grub_terminfo_output_state *) term->data;
   data->next = terminfo_outputs;
   terminfo_outputs = term;
-  
-  data->normal_color = 0x07;
-  data->highlight_color = 0x70;
 
   return GRUB_ERR_NONE;
 }
@@ -247,30 +244,6 @@ grub_terminfo_cls (struct grub_term_output *term)
   data->xpos = data->ypos = 0;
 }
 
-void
-grub_terminfo_setcolor (struct grub_term_output *term,
-			grub_uint8_t normal_color,
-			grub_uint8_t highlight_color)
-{
-  struct grub_terminfo_output_state *data
-    = (struct grub_terminfo_output_state *) term->data;
-
-  data->normal_color = normal_color;
-  data->highlight_color = highlight_color;
-}
-
-void
-grub_terminfo_getcolor (struct grub_term_output *term,
-			grub_uint8_t *normal_color,
-			grub_uint8_t *highlight_color)
-{
-  struct grub_terminfo_output_state *data
-    = (struct grub_terminfo_output_state *) term->data;
-
-  *normal_color = data->normal_color;
-  *highlight_color = data->highlight_color;
-}
-
 void
 grub_terminfo_setcolorstate (struct grub_term_output *term,
 			     const grub_term_color_state state)
@@ -298,12 +271,12 @@ grub_terminfo_setcolorstate (struct grub_term_output *term,
 	{
 	case GRUB_TERM_COLOR_STANDARD:
 	case GRUB_TERM_COLOR_NORMAL:
-	  fg = data->normal_color & 0x0f;
-	  bg = data->normal_color >> 4;
+	  fg = term->normal_color & 0x0f;
+	  bg = term->normal_color >> 4;
 	  break;
 	case GRUB_TERM_COLOR_HIGHLIGHT:
-	  fg = data->highlight_color & 0x0f;
-	  bg = data->highlight_color >> 4;
+	  fg = term->highlight_color & 0x0f;
+	  bg = term->highlight_color >> 4;
 	  break;
 	default:
 	  return;
diff --git a/util/console.c b/util/console.c
index e8ee9f7da..8e5b59776 100644
--- a/util/console.c
+++ b/util/console.c
@@ -43,9 +43,7 @@ static int grub_console_attr = A_NORMAL;
 
 grub_uint8_t grub_console_cur_color = 7;
 
-static grub_uint8_t grub_console_standard_color = 0x7;
-static grub_uint8_t grub_console_normal_color = 0x7;
-static grub_uint8_t grub_console_highlight_color = 0x70;
+static const grub_uint8_t grub_console_standard_color = 0x7;
 
 #define NUM_COLORS	8
 
@@ -71,7 +69,7 @@ grub_ncurses_putchar (struct grub_term_output *term __attribute__ ((unused)),
 }
 
 static void
-grub_ncurses_setcolorstate (struct grub_term_output *term __attribute__ ((unused)),
+grub_ncurses_setcolorstate (struct grub_term_output *term,
 			    grub_term_color_state state)
 {
   switch (state)
@@ -81,11 +79,11 @@ grub_ncurses_setcolorstate (struct grub_term_output *term __attribute__ ((unused
       grub_console_attr = A_NORMAL;
       break;
     case GRUB_TERM_COLOR_NORMAL:
-      grub_console_cur_color = grub_console_normal_color;
+      grub_console_cur_color = term->normal_color;
       grub_console_attr = A_NORMAL;
       break;
     case GRUB_TERM_COLOR_HIGHLIGHT:
-      grub_console_cur_color = grub_console_highlight_color;
+      grub_console_cur_color = term->highlight_color;
       grub_console_attr = A_STANDOUT;
       break;
     default:
@@ -104,23 +102,6 @@ grub_ncurses_setcolorstate (struct grub_term_output *term __attribute__ ((unused
     }
 }
 
-/* XXX: This function is never called.  */
-static void
-grub_ncurses_setcolor (struct grub_term_output *term __attribute__ ((unused)),
-		       grub_uint8_t normal_color, grub_uint8_t highlight_color)
-{
-  grub_console_normal_color = normal_color;
-  grub_console_highlight_color = highlight_color;
-}
-
-static void
-grub_ncurses_getcolor (struct grub_term_output *term __attribute__ ((unused)),
-		       grub_uint8_t *normal_color, grub_uint8_t *highlight_color)
-{
-  *normal_color = grub_console_normal_color;
-  *highlight_color = grub_console_highlight_color;
-}
-
 static int saved_char = ERR;
 
 static int
@@ -322,8 +303,6 @@ static struct grub_term_output grub_ncurses_term_output =
     .gotoxy = grub_ncurses_gotoxy,
     .cls = grub_ncurses_cls,
     .setcolorstate = grub_ncurses_setcolorstate,
-    .setcolor = grub_ncurses_setcolor,
-    .getcolor = grub_ncurses_getcolor,
     .setcursor = grub_ncurses_setcursor,
     .refresh = grub_ncurses_refresh,
     .flags = GRUB_TERM_CODE_TYPE_ASCII

From 2dd54ae21d14e92744782145bc81891a3c376fea Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 8 May 2010 01:08:58 +0200
Subject: [PATCH 0939/1628] macroify keys in ncusest terminal code

---
 util/console.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/util/console.c b/util/console.c
index 8e5b59776..4704f1492 100644
--- a/util/console.c
+++ b/util/console.c
@@ -146,19 +146,19 @@ grub_ncurses_getkey (struct grub_term_input *term __attribute__ ((unused)))
   switch (c)
     {
     case KEY_LEFT:
-      c = 2;
+      c = GRUB_TERM_LEFT;
       break;
 
     case KEY_RIGHT:
-      c = 6;
+      c = GRUB_TERM_RIGHT;
       break;
 
     case KEY_UP:
-      c = 16;
+      c = GRUB_TERM_UP;
       break;
 
     case KEY_DOWN:
-      c = 14;
+      c = GRUB_TERM_DOWN;
       break;
 
     case KEY_IC:
@@ -166,30 +166,30 @@ grub_ncurses_getkey (struct grub_term_input *term __attribute__ ((unused)))
       break;
 
     case KEY_DC:
-      c = 4;
+      c = GRUB_TERM_DC;
       break;
 
     case KEY_BACKSPACE:
       /* XXX: For some reason ncurses on xterm does not return
 	 KEY_BACKSPACE.  */
     case 127:
-      c = 8;
+      c = GRUB_TERM_BACKSPACE;
       break;
 
     case KEY_HOME:
-      c = 1;
+      c = GRUB_TERM_HOME;
       break;
 
     case KEY_END:
-      c = 5;
+      c = GRUB_TERM_END;
       break;
 
     case KEY_NPAGE:
-      c = 3;
+      c = GRUB_TERM_NPAGE;
       break;
 
     case KEY_PPAGE:
-      c = 7;
+      c = GRUB_TERM_PPAGE;
       break;
     }
 

From d42b0387bfb546b5a4fd600c3f09293d7b622ec1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 8 May 2010 01:25:18 +0200
Subject: [PATCH 0940/1628] fix sparc64 compilation

---
 kern/sparc64/ieee1275/init.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kern/sparc64/ieee1275/init.c b/kern/sparc64/ieee1275/init.c
index a995217bc..72ee1f136 100644
--- a/kern/sparc64/ieee1275/init.c
+++ b/kern/sparc64/ieee1275/init.c
@@ -24,7 +24,7 @@
 #include <grub/misc.h>
 #include <grub/time.h>
 #include <grub/machine/boot.h>
-#include <grub/machine/console.h>
+#include <grub/ieee1275/console.h>
 #include <grub/machine/kernel.h>
 #include <grub/machine/time.h>
 #include <grub/ieee1275/ofdisk.h>
@@ -155,8 +155,9 @@ void
 grub_machine_init (void)
 {
   grub_ieee1275_init ();
-  grub_console_init ();
+  grub_console_init_early ();
   grub_heap_init ();
+  grub_console_init_lately ();
 
   grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_PARTITION_0);
   grub_ofdisk_init ();

From c6e5caab1dd7d7cb611161d62a3954f84d566558 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 9 May 2010 11:00:21 +0200
Subject: [PATCH 0941/1628] 	Transform (broken) vga terminal into (working)
 vga video driver.

	* conf/i386-pc.rmk (vga_mod_SOURCES): Change term/i386/pc/vga.c to
	video/i386/pc/vga.c.
	* include/grub/video.h (grub_video_driver_id):
	Add GRUB_VIDEO_DRIVER_VGA.
	* term/i386/pc/vga.c: Renamed to ...
	* video/i386/pc/vga.c: ...this
	(DEBUG_VGA): Removed.
	(CHAR_WIDTH): Likewise.
	(CHAR_HEIGHT): Likewise.
	(TEXT_WIDTH): Likewise.
	(TEXT_HEIGHT): Likewise.
	(DEFAULT_FG_COLOR): Likewise.
	(DEFAULT_BG_COLOR): Likewise.
	(colored_char): Likewise.
	(xpos): Likewise.
	(ypos): Likewise.
	(cursor_state): Likewise.
	(fg_color): Likewise.
	(bg_color): Likewise.
	(text_buf): Likewise.
	(page): Likewise.
	(font): Likewise.
	(framebuffer): New variable.
	(set_read_map): Disabled.
	(setup): New variable.
	(is_target): Likewise.
	(grub_vga_mod_init): Likewise.
	(grub_vga_mod_fini): Likewise.
	(check_vga_mem): Likewise.
	(write_char): Likewise.
	(write_cursor): Likewise.
	(scroll_up): Likewise.
	(grub_vga_putchar): Likewise.
	(grub_vga_getcharwidth): Likewise.
	(grub_vga_getwh): Likewise.
	(grub_vga_getxy): Likewise.
	(grub_vga_gotoxy): Likewise.
	(grub_vga_cls): Likewise.
	(grub_vga_setcolorstate): Likewise.
	(grub_vga_setcursor): Likewise.
	(grub_video_vga_init): New function.
	(grub_video_vga_setup): Likewise.
	(grub_video_vga_fini): Likewise.
	(update_target): Likewise.
	(grub_video_vga_blit_bitmap): Likewise.
	(grub_video_vga_blit_render_target): Likewise.
	(grub_video_vga_set_active_render_target): Likewise.
	(grub_video_vga_get_active_render_target): Likewise.
	(grub_video_vga_swap_buffers): Likewise.
	(grub_video_vga_set_palette): Likewise.
	(grub_video_vga_get_info_and_fini): Likewise.
	(grub_vga_term): Removed.
	(grub_video_vga_adapter): New variable.
	(GRUB_MOD_INIT): Register a video driver instead of terminal.
	(GRUB_MOD_FINI): Unrefister a video driver instead of terminal.
---
 ChangeLog            |  60 +++++
 conf/i386-pc.rmk     |   2 +-
 include/grub/video.h |   3 +-
 term/i386/pc/vga.c   | 513 -------------------------------------------
 video/i386/pc/vga.c  | 412 ++++++++++++++++++++++++++++++++++
 5 files changed, 475 insertions(+), 515 deletions(-)
 delete mode 100644 term/i386/pc/vga.c
 create mode 100644 video/i386/pc/vga.c

diff --git a/ChangeLog b/ChangeLog
index 76b1de28f..a388738cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+2010-05-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Transform (broken) vga terminal into (working) vga video driver.
+
+	* conf/i386-pc.rmk (vga_mod_SOURCES): Change term/i386/pc/vga.c to
+	video/i386/pc/vga.c.
+	* include/grub/video.h (grub_video_driver_id):
+	Add GRUB_VIDEO_DRIVER_VGA.
+	* term/i386/pc/vga.c: Renamed to ...
+	* video/i386/pc/vga.c: ...this
+	(DEBUG_VGA): Removed.
+	(CHAR_WIDTH): Likewise.
+	(CHAR_HEIGHT): Likewise.
+	(TEXT_WIDTH): Likewise.
+	(TEXT_HEIGHT): Likewise.
+	(DEFAULT_FG_COLOR): Likewise.
+	(DEFAULT_BG_COLOR): Likewise.
+	(colored_char): Likewise.
+	(xpos): Likewise.
+	(ypos): Likewise.
+	(cursor_state): Likewise.
+	(fg_color): Likewise.
+	(bg_color): Likewise.
+	(text_buf): Likewise.
+	(page): Likewise.
+	(font): Likewise.
+	(framebuffer): New variable.
+	(set_read_map): Disabled.
+	(setup): New variable.
+	(is_target): Likewise.
+	(grub_vga_mod_init): Likewise.
+	(grub_vga_mod_fini): Likewise.
+	(check_vga_mem): Likewise.
+	(write_char): Likewise.
+	(write_cursor): Likewise.
+	(scroll_up): Likewise.
+	(grub_vga_putchar): Likewise.
+	(grub_vga_getcharwidth): Likewise.
+	(grub_vga_getwh): Likewise.
+	(grub_vga_getxy): Likewise.
+	(grub_vga_gotoxy): Likewise.
+	(grub_vga_cls): Likewise.
+	(grub_vga_setcolorstate): Likewise.
+	(grub_vga_setcursor): Likewise.
+	(grub_video_vga_init): New function.
+	(grub_video_vga_setup): Likewise.
+	(grub_video_vga_fini): Likewise.
+	(update_target): Likewise.
+	(grub_video_vga_blit_bitmap): Likewise.
+	(grub_video_vga_blit_render_target): Likewise.
+	(grub_video_vga_set_active_render_target): Likewise.
+	(grub_video_vga_get_active_render_target): Likewise.
+	(grub_video_vga_swap_buffers): Likewise.
+	(grub_video_vga_set_palette): Likewise.
+	(grub_video_vga_get_info_and_fini): Likewise.
+	(grub_vga_term): Removed.
+	(grub_video_vga_adapter): New variable.
+	(GRUB_MOD_INIT): Register a video driver instead of terminal.
+	(GRUB_MOD_FINI): Unrefister a video driver instead of terminal.
+
 2010-05-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* video/readers/jpeg.c: Indented.
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index a5a1b08ea..66a6d883c 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -185,7 +185,7 @@ vbetest_mod_CFLAGS = $(COMMON_CFLAGS)
 vbetest_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For vga.mod.
-vga_mod_SOURCES = term/i386/pc/vga.c
+vga_mod_SOURCES = video/i386/pc/vga.c
 vga_mod_CFLAGS = $(COMMON_CFLAGS)
 vga_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/include/grub/video.h b/include/grub/video.h
index 782a5281b..5fd7e0c47 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -181,7 +181,8 @@ typedef enum grub_video_driver_id
     GRUB_VIDEO_DRIVER_VBE,
     GRUB_VIDEO_DRIVER_EFI_UGA,
     GRUB_VIDEO_DRIVER_EFI_GOP,
-    GRUB_VIDEO_DRIVER_SM712
+    GRUB_VIDEO_DRIVER_SM712,
+    GRUB_VIDEO_DRIVER_VGA
   } grub_video_driver_id_t;
 
 struct grub_video_adapter
diff --git a/term/i386/pc/vga.c b/term/i386/pc/vga.c
deleted file mode 100644
index 402b30fe6..000000000
--- a/term/i386/pc/vga.c
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2000,2001,2002,2003,2004,2005,2007,2008,2009  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/>.
- */
-
-// TODO: Deprecated and broken. Needs to be converted to Video Driver!
-
-#include <grub/machine/vga.h>
-#include <grub/machine/console.h>
-#include <grub/cpu/io.h>
-#include <grub/term.h>
-#include <grub/types.h>
-#include <grub/dl.h>
-#include <grub/misc.h>
-#include <grub/font.h>
-
-#define DEBUG_VGA	0
-
-#define VGA_WIDTH	640
-#define VGA_HEIGHT	350
-#define CHAR_WIDTH	8
-#define CHAR_HEIGHT	16
-#define TEXT_WIDTH	(VGA_WIDTH / CHAR_WIDTH)
-#define TEXT_HEIGHT	(VGA_HEIGHT / CHAR_HEIGHT)
-#define VGA_MEM		((grub_uint8_t *) GRUB_MEMORY_MACHINE_VGA_ADDR)
-#define PAGE_OFFSET(x)	((x) * (VGA_WIDTH * VGA_HEIGHT / 8))
-
-#define DEFAULT_FG_COLOR	0xa
-#define DEFAULT_BG_COLOR	0x0
-
-struct colored_char
-{
-  /* An Unicode codepoint.  */
-  grub_uint32_t code;
-
-  /* Color indexes.  */
-  unsigned char fg_color;
-  unsigned char bg_color;
-
-  /* The width of this character minus one.  */
-  unsigned char width;
-
-  /* The column index of this character.  */
-  unsigned char index;
-};
-
-static unsigned char text_mode;
-static unsigned xpos, ypos;
-static int cursor_state;
-static unsigned char fg_color, bg_color;
-static struct colored_char text_buf[TEXT_WIDTH * TEXT_HEIGHT];
-static unsigned char saved_map_mask;
-static int page = 0;
-static grub_font_t font = 0;
-
-#define SEQUENCER_ADDR_PORT	0x3C4
-#define SEQUENCER_DATA_PORT	0x3C5
-#define MAP_MASK_REGISTER	0x02
-
-#define CRTC_ADDR_PORT		0x3D4
-#define CRTC_DATA_PORT		0x3D5
-#define START_ADDR_HIGH_REGISTER 0x0C
-#define START_ADDR_LOW_REGISTER	0x0D
-
-#define GRAPHICS_ADDR_PORT	0x3CE
-#define GRAPHICS_DATA_PORT	0x3CF
-#define READ_MAP_REGISTER	0x04
-
-#define INPUT_STATUS1_REGISTER	0x3DA
-#define INPUT_STATUS1_VERTR_BIT 0x08
-
-static inline void
-wait_vretrace (void)
-{
-  /* Wait until there is a vertical retrace.  */
-  while (! (grub_inb (INPUT_STATUS1_REGISTER) & INPUT_STATUS1_VERTR_BIT));
-}
-
-/* Get Map Mask Register.  */
-static unsigned char
-get_map_mask (void)
-{
-  unsigned char old_addr;
-  unsigned char old_data;
-
-  old_addr = grub_inb (SEQUENCER_ADDR_PORT);
-  grub_outb (MAP_MASK_REGISTER, SEQUENCER_ADDR_PORT);
-
-  old_data = grub_inb (SEQUENCER_DATA_PORT);
-
-  grub_outb (old_addr, SEQUENCER_ADDR_PORT);
-
-  return old_data;
-}
-
-/* Set Map Mask Register.  */
-static void
-set_map_mask (unsigned char mask)
-{
-  unsigned char old_addr;
-
-  old_addr = grub_inb (SEQUENCER_ADDR_PORT);
-  grub_outb (MAP_MASK_REGISTER, SEQUENCER_ADDR_PORT);
-
-  grub_outb (mask, SEQUENCER_DATA_PORT);
-
-  grub_outb (old_addr, SEQUENCER_ADDR_PORT);
-}
-
-/* Set Read Map Register.  */
-static void
-set_read_map (unsigned char map)
-{
-  unsigned char old_addr;
-
-  old_addr = grub_inb (GRAPHICS_ADDR_PORT);
-
-  grub_outb (READ_MAP_REGISTER, GRAPHICS_ADDR_PORT);
-  grub_outb (map, GRAPHICS_DATA_PORT);
-
-  grub_outb (old_addr, GRAPHICS_ADDR_PORT);
-}
-
-/* Set start address.  */
-static void
-set_start_address (unsigned int start)
-{
-  unsigned char old_addr;
-
-  old_addr = grub_inb (CRTC_ADDR_PORT);
-
-  grub_outb (START_ADDR_LOW_REGISTER, CRTC_ADDR_PORT);
-  grub_outb (start & 0xFF, CRTC_DATA_PORT);
-
-  grub_outb (START_ADDR_HIGH_REGISTER, CRTC_ADDR_PORT);
-  grub_outb (start >> 8, CRTC_DATA_PORT);
-
-  grub_outb (old_addr, CRTC_ADDR_PORT);
-}
-
-static grub_err_t
-grub_vga_mod_init (void)
-{
-  text_mode = grub_vga_set_mode (0x10);
-  cursor_state = 1;
-  fg_color = DEFAULT_FG_COLOR;
-  bg_color = DEFAULT_BG_COLOR;
-  saved_map_mask = get_map_mask ();
-  set_map_mask (0x0f);
-  set_start_address (PAGE_OFFSET (page));
-  font = grub_font_get ("");  /* Choose any font, for now. */
-  if (!font)
-    return grub_error (GRUB_ERR_BAD_FONT, "no font loaded");
-
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_vga_mod_fini (void)
-{
-  set_map_mask (saved_map_mask);
-  grub_vga_set_mode (text_mode);
-  return GRUB_ERR_NONE;
-}
-
-static int
-check_vga_mem (void *p)
-{
-  return (p >= (void *) (VGA_MEM + PAGE_OFFSET (page))
-	  && p <= (void *) (VGA_MEM + PAGE_OFFSET (page)
-			    + VGA_WIDTH * VGA_HEIGHT / 8));
-}
-
-static void
-write_char (void)
-{
-  struct colored_char *p = text_buf + xpos + ypos * TEXT_WIDTH;
-  struct grub_font_glyph *glyph;
-  unsigned char *mem_base;
-  unsigned plane;
-
-  mem_base = (VGA_MEM + xpos +
-	      ypos * CHAR_HEIGHT * TEXT_WIDTH + PAGE_OFFSET (page)) - p->index;
-  p -= p->index;
-
-  /* Get glyph for character.  */
-  glyph = grub_font_get_glyph (font, p->code);
-
-  for (plane = 0x01; plane <= 0x08; plane <<= 1)
-    {
-      unsigned y;
-      unsigned offset;
-      unsigned char *mem;
-
-      set_map_mask (plane);
-
-      for (y = 0, offset = 0, mem = mem_base;
-	   y < CHAR_HEIGHT;
-	   y++, mem += TEXT_WIDTH)
-	{
-          /* TODO Re-implement glyph drawing for vga module.  */
-#if 0
-	  unsigned i;
-
-          unsigned char_width = 1; /* TODO Figure out wide characters.  */
-	  for (i = 0; i < char_width && offset < 32; i++)
-	    {
-	      unsigned char fg_mask, bg_mask;
-
-	      fg_mask = (p->fg_color & plane) ? glyph->bitmap[offset] : 0;
-	      bg_mask = (p->bg_color & plane) ? ~(glyph->bitmap[offset]) : 0;
-	      offset++;
-
-	      if (check_vga_mem (mem + i))
-		mem[i] = (fg_mask | bg_mask);
-	    }
-#endif /* 0 */
-	}
-    }
-
-  set_map_mask (0x0f);
-}
-
-static void
-write_cursor (void)
-{
-  unsigned char *mem = (VGA_MEM + PAGE_OFFSET (page) + xpos
-			+ (ypos * CHAR_HEIGHT + CHAR_HEIGHT - 3) * TEXT_WIDTH);
-  if (check_vga_mem (mem))
-    *mem = 0xff;
-
-  mem += TEXT_WIDTH;
-  if (check_vga_mem (mem))
-    *mem = 0xff;
-}
-
-static void
-scroll_up (void)
-{
-  unsigned i;
-  unsigned plane;
-
-  /* Do all the work in the other page.  */
-  grub_memmove (text_buf, text_buf + TEXT_WIDTH,
-		sizeof (struct colored_char) * TEXT_WIDTH * (TEXT_HEIGHT - 1));
-
-  for (i = TEXT_WIDTH * (TEXT_HEIGHT - 1); i < TEXT_WIDTH * TEXT_HEIGHT; i++)
-    {
-      text_buf[i].code = ' ';
-      text_buf[i].fg_color = 0;
-      text_buf[i].bg_color = 0;
-      text_buf[i].width = 0;
-      text_buf[i].index = 0;
-    }
-
-  for (plane = 1; plane <= 4; plane++)
-    {
-      set_read_map (plane);
-      set_map_mask (1 << plane);
-      grub_memmove (VGA_MEM + PAGE_OFFSET (1 - page), VGA_MEM
-		    + PAGE_OFFSET (page) + VGA_WIDTH * CHAR_HEIGHT / 8,
-		    VGA_WIDTH * (VGA_HEIGHT - CHAR_HEIGHT) / 8);
-    }
-
-  set_map_mask (0x0f);
-  grub_memset (VGA_MEM + PAGE_OFFSET (1 - page)
-	       + VGA_WIDTH * (VGA_HEIGHT - CHAR_HEIGHT) / 8, 0,
-	       VGA_WIDTH * CHAR_HEIGHT / 8);
-
-  /* Activate the other page.  */
-  page = 1 - page;
-  wait_vretrace ();
-  set_start_address (PAGE_OFFSET (page));
-}
-
-static void
-grub_vga_putchar (grub_uint32_t c)
-{
-#if DEBUG_VGA
-  static int show = 1;
-#endif
-
-  if (c == '\a')
-    /* FIXME */
-    return;
-
-  if (c == '\b' || c == '\n' || c == '\r')
-    {
-      /* Erase current cursor, if any.  */
-      if (cursor_state)
-	write_char ();
-
-      switch (c)
-	{
-	case '\b':
-	  if (xpos > 0)
-	    xpos--;
-	  break;
-
-	case '\n':
-	  if (ypos >= TEXT_HEIGHT - 1)
-	    scroll_up ();
-	  else
-	    ypos++;
-	  break;
-
-	case '\r':
-	  xpos = 0;
-	  break;
-	}
-
-      if (cursor_state)
-	write_cursor ();
-    }
-  else
-    {
-      struct grub_font_glyph *glyph;
-      struct colored_char *p;
-      unsigned char_width = 1;
-
-      glyph = grub_font_get_glyph(font, c);
-
-      if (xpos + char_width > TEXT_WIDTH)
-	grub_putchar ('\n');
-
-      p = text_buf + xpos + ypos * TEXT_WIDTH;
-      p->code = c;
-      p->fg_color = fg_color;
-      p->bg_color = bg_color;
-      p->width = char_width - 1;
-      p->index = 0;
-
-      if (char_width > 1)
-	{
-	  unsigned i;
-
-	  for (i = 1; i < char_width; i++)
-	    {
-	      p[i].code = ' ';
-	      p[i].width = char_width - 1;
-	      p[i].index = i;
-	    }
-	}
-
-      write_char ();
-
-      xpos += char_width;
-      if (xpos >= TEXT_WIDTH)
-	{
-	  xpos = 0;
-
-	  if (ypos >= TEXT_HEIGHT - 1)
-	    scroll_up ();
-	  else
-	    ypos++;
-	}
-
-      if (cursor_state)
-	write_cursor ();
-    }
-
-#if DEBUG_VGA
-  if (show)
-    {
-      grub_uint16_t pos = grub_getxy ();
-
-      show = 0;
-      grub_gotoxy (0, 0);
-      grub_printf ("[%u:%u]", (unsigned) (pos >> 8), (unsigned) (pos & 0xff));
-      grub_gotoxy (pos >> 8, pos & 0xff);
-      show = 1;
-    }
-#endif
-}
-
-static grub_ssize_t
-grub_vga_getcharwidth (grub_uint32_t c)
-{
-#if 0
-  struct grub_font_glyph glyph;
-
-  glyph = grub_font_get_glyph (c);
-
-  return glyph.char_width;
-#else
-  (void) c;   /* Prevent warning.  */
-  return 1;   /* TODO Fix wide characters?  */
-#endif
-}
-
-static grub_uint16_t
-grub_vga_getwh (void)
-{
-  return (TEXT_WIDTH << 8) | TEXT_HEIGHT;
-}
-
-static grub_uint16_t
-grub_vga_getxy (void)
-{
-  return ((xpos << 8) | ypos);
-}
-
-static void
-grub_vga_gotoxy (grub_uint8_t x, grub_uint8_t y)
-{
-  if (x >= TEXT_WIDTH || y >= TEXT_HEIGHT)
-    {
-      grub_error (GRUB_ERR_OUT_OF_RANGE, "invalid point (%u,%u)",
-		  (unsigned) x, (unsigned) y);
-      return;
-    }
-
-  if (cursor_state)
-    write_char ();
-
-  xpos = x;
-  ypos = y;
-
-  if (cursor_state)
-    write_cursor ();
-}
-
-static void
-grub_vga_cls (void)
-{
-  unsigned i;
-
-  wait_vretrace ();
-  for (i = 0; i < TEXT_WIDTH * TEXT_HEIGHT; i++)
-    {
-      text_buf[i].code = ' ';
-      text_buf[i].fg_color = 0;
-      text_buf[i].bg_color = 0;
-      text_buf[i].width = 0;
-      text_buf[i].index = 0;
-    }
-
-  grub_memset (VGA_MEM + PAGE_OFFSET (page), 0, VGA_WIDTH * VGA_HEIGHT / 8);
-
-  xpos = ypos = 0;
-}
-
-static void
-grub_vga_setcolorstate (grub_term_color_state state)
-{
-  switch (state)
-    {
-    case GRUB_TERM_COLOR_STANDARD:
-    case GRUB_TERM_COLOR_NORMAL:
-      fg_color = DEFAULT_FG_COLOR;
-      bg_color = DEFAULT_BG_COLOR;
-      break;
-    case GRUB_TERM_COLOR_HIGHLIGHT:
-      fg_color = DEFAULT_BG_COLOR;
-      bg_color = DEFAULT_FG_COLOR;
-      break;
-    default:
-      break;
-    }
-}
-
-static void
-grub_vga_setcursor (int on)
-{
-  if (cursor_state != on)
-    {
-      if (cursor_state)
-	write_char ();
-      else
-	write_cursor ();
-
-      cursor_state = on;
-    }
-}
-
-static struct grub_term_output grub_vga_term =
-  {
-    .name = "vga",
-    .init = grub_vga_mod_init,
-    .fini = grub_vga_mod_fini,
-    .putchar = grub_vga_putchar,
-    .getcharwidth = grub_vga_getcharwidth,
-    .getwh = grub_vga_getwh,
-    .getxy = grub_vga_getxy,
-    .gotoxy = grub_vga_gotoxy,
-    .cls = grub_vga_cls,
-    .setcolorstate = grub_vga_setcolorstate,
-    .setcursor = grub_vga_setcursor,
-    .flags = 0,
-  };
-
-GRUB_MOD_INIT(vga)
-{
-  grub_term_register_output ("vga", &grub_vga_term);
-}
-
-GRUB_MOD_FINI(vga)
-{
-  grub_term_unregister_output (&grub_vga_term);
-}
diff --git a/video/i386/pc/vga.c b/video/i386/pc/vga.c
new file mode 100644
index 000000000..222a71272
--- /dev/null
+++ b/video/i386/pc/vga.c
@@ -0,0 +1,412 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2000,2001,2002,2003,2004,2005,2007,2008,2009,2010  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/>.
+ */
+
+#define grub_video_render_target grub_video_fbrender_target
+
+#include <grub/machine/vga.h>
+#include <grub/machine/console.h>
+#include <grub/cpu/io.h>
+#include <grub/mm.h>
+#include <grub/video.h>
+#include <grub/video_fb.h>
+#include <grub/types.h>
+#include <grub/dl.h>
+#include <grub/misc.h>
+
+#define VGA_WIDTH	640
+#define VGA_HEIGHT	350
+#define VGA_MEM		((grub_uint8_t *) GRUB_MEMORY_MACHINE_VGA_ADDR)
+#define PAGE_OFFSET(x)	((x) * (VGA_WIDTH * VGA_HEIGHT / 8))
+
+static unsigned char text_mode;
+static unsigned char saved_map_mask;
+
+static struct
+{
+  struct grub_video_mode_info mode_info;
+  struct grub_video_render_target *render_target;
+  grub_uint8_t *temporary_buffer;
+  int front_page;
+  int back_page;
+} framebuffer;
+
+#define SEQUENCER_ADDR_PORT	0x3C4
+#define SEQUENCER_DATA_PORT	0x3C5
+#define MAP_MASK_REGISTER	0x02
+
+#define CRTC_ADDR_PORT		0x3D4
+#define CRTC_DATA_PORT		0x3D5
+#define START_ADDR_HIGH_REGISTER 0x0C
+#define START_ADDR_LOW_REGISTER	0x0D
+
+#define GRAPHICS_ADDR_PORT	0x3CE
+#define GRAPHICS_DATA_PORT	0x3CF
+#define READ_MAP_REGISTER	0x04
+
+#define INPUT_STATUS1_REGISTER	0x3DA
+#define INPUT_STATUS1_VERTR_BIT 0x08
+
+static inline void
+wait_vretrace (void)
+{
+  /* Wait until there is a vertical retrace.  */
+  while (! (grub_inb (INPUT_STATUS1_REGISTER) & INPUT_STATUS1_VERTR_BIT));
+}
+
+/* Get Map Mask Register.  */
+static unsigned char
+get_map_mask (void)
+{
+  unsigned char old_addr;
+  unsigned char old_data;
+
+  old_addr = grub_inb (SEQUENCER_ADDR_PORT);
+  grub_outb (MAP_MASK_REGISTER, SEQUENCER_ADDR_PORT);
+
+  old_data = grub_inb (SEQUENCER_DATA_PORT);
+
+  grub_outb (old_addr, SEQUENCER_ADDR_PORT);
+
+  return old_data;
+}
+
+/* Set Map Mask Register.  */
+static void
+set_map_mask (unsigned char mask)
+{
+  unsigned char old_addr;
+
+  old_addr = grub_inb (SEQUENCER_ADDR_PORT);
+  grub_outb (MAP_MASK_REGISTER, SEQUENCER_ADDR_PORT);
+
+  grub_outb (mask, SEQUENCER_DATA_PORT);
+
+  grub_outb (old_addr, SEQUENCER_ADDR_PORT);
+}
+
+#if 0
+/* Set Read Map Register.  */
+static void
+set_read_map (unsigned char map)
+{
+  unsigned char old_addr;
+
+  old_addr = grub_inb (GRAPHICS_ADDR_PORT);
+
+  grub_outb (READ_MAP_REGISTER, GRAPHICS_ADDR_PORT);
+  grub_outb (map, GRAPHICS_DATA_PORT);
+
+  grub_outb (old_addr, GRAPHICS_ADDR_PORT);
+}
+#endif
+
+/* Set start address.  */
+static void
+set_start_address (unsigned int start)
+{
+  unsigned char old_addr;
+
+  old_addr = grub_inb (CRTC_ADDR_PORT);
+
+  grub_outb (START_ADDR_LOW_REGISTER, CRTC_ADDR_PORT);
+  grub_outb (start & 0xFF, CRTC_DATA_PORT);
+
+  grub_outb (START_ADDR_HIGH_REGISTER, CRTC_ADDR_PORT);
+  grub_outb (start >> 8, CRTC_DATA_PORT);
+
+  grub_outb (old_addr, CRTC_ADDR_PORT);
+}
+
+static int setup = 0;
+static int is_target = 0;
+
+static grub_err_t
+grub_video_vga_init (void)
+{
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_video_vga_setup (unsigned int width, unsigned int height,
+                      unsigned int mode_type, unsigned int mode_mask)
+{
+  grub_err_t err;
+
+  if ((width && width != VGA_WIDTH) || (height && height != VGA_HEIGHT))
+    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no matching mode found");
+
+  framebuffer.temporary_buffer = grub_malloc (VGA_HEIGHT * VGA_WIDTH);
+  framebuffer.front_page = 0;
+  framebuffer.back_page = 0;
+  if (!framebuffer.temporary_buffer)
+    return grub_errno;
+
+  saved_map_mask = get_map_mask ();
+
+  text_mode = grub_vga_set_mode (0x10);
+  setup = 1;
+  set_map_mask (0x0f);
+  set_start_address (PAGE_OFFSET (framebuffer.front_page));
+
+  framebuffer.mode_info.width = VGA_WIDTH;
+  framebuffer.mode_info.height = VGA_HEIGHT;
+
+  framebuffer.mode_info.mode_type = GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
+
+  if (grub_video_check_mode_flag (mode_type, mode_mask,
+				  GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED, 1))
+    {
+      framebuffer.back_page = 1;
+      framebuffer.mode_info.mode_type |= GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED;
+    }
+
+  framebuffer.mode_info.bpp = 8;
+  framebuffer.mode_info.bytes_per_pixel = 1;
+  framebuffer.mode_info.pitch = VGA_WIDTH;
+  framebuffer.mode_info.number_of_colors = 16;
+  framebuffer.mode_info.red_mask_size = 0;
+  framebuffer.mode_info.red_field_pos = 0;
+  framebuffer.mode_info.green_mask_size = 0;
+  framebuffer.mode_info.green_field_pos = 0;
+  framebuffer.mode_info.blue_mask_size = 0;
+  framebuffer.mode_info.blue_field_pos = 0;
+  framebuffer.mode_info.reserved_mask_size = 0;
+  framebuffer.mode_info.reserved_field_pos = 0;
+
+  framebuffer.mode_info.blit_format
+    = grub_video_get_blit_format (&framebuffer.mode_info);
+
+  err = grub_video_fb_create_render_target_from_pointer (&framebuffer.render_target,
+							 &framebuffer.mode_info,
+							 framebuffer.temporary_buffer);
+
+  if (err)
+    {
+      grub_dprintf ("video", "Couldn't create FB target\n");
+      return err;
+    }
+
+  is_target = 1;
+  err = grub_video_fb_set_active_render_target (framebuffer.render_target);
+ 
+  if (err)
+    return err;
+ 
+  err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
+				   grub_video_fbstd_colors);
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_video_vga_fini (void)
+{
+  if (setup)
+    {
+      set_map_mask (saved_map_mask);
+      grub_vga_set_mode (text_mode);
+    }
+  setup = 0;
+  grub_free (framebuffer.temporary_buffer);
+  framebuffer.temporary_buffer = 0;
+  return GRUB_ERR_NONE;
+}
+
+static inline void
+update_target (void)
+{
+  int plane;
+
+  if (!is_target)
+    return;
+
+  for (plane = 0x01; plane <= 0x08; plane <<= 1)
+    {
+      grub_uint8_t *ptr;
+      volatile grub_uint8_t *ptr2;
+      unsigned cbyte = 0;
+      int shift = 7;
+      set_map_mask (plane);
+      for (ptr = framebuffer.temporary_buffer,
+	     ptr2 = VGA_MEM + PAGE_OFFSET (framebuffer.back_page);
+	   ptr < framebuffer.temporary_buffer + VGA_WIDTH * VGA_HEIGHT; ptr++)
+	{
+	  cbyte |= (!!(plane & *ptr)) << shift;
+	  shift--;
+	  if (shift == -1)
+	    {
+	      *ptr2++ = cbyte;
+	      shift = 7;
+	      cbyte = 0;
+	    }
+	}
+    }
+}
+
+static grub_err_t
+grub_video_vga_blit_bitmap (struct grub_video_bitmap *bitmap,
+			    enum grub_video_blit_operators oper, int x, int y,
+			    int offset_x, int offset_y,
+			    unsigned int width, unsigned int height)
+{
+  grub_err_t ret;
+  ret = grub_video_fb_blit_bitmap (bitmap, oper, x, y, offset_x, offset_y,
+				   width, height);
+  update_target ();
+  return ret;
+}
+
+static grub_err_t
+grub_video_vga_blit_render_target (struct grub_video_fbrender_target *source,
+                                   enum grub_video_blit_operators oper,
+                                   int x, int y, int offset_x, int offset_y,
+                                   unsigned int width, unsigned int height)
+{
+  grub_err_t ret;
+
+  ret = grub_video_fb_blit_render_target (source, oper, x, y,
+					  offset_x, offset_y, width, height);
+  update_target ();
+
+  return ret;
+}
+
+static grub_err_t
+grub_video_vga_set_active_render_target (struct grub_video_render_target *target)
+{
+  if (target == GRUB_VIDEO_RENDER_TARGET_DISPLAY)
+    {
+      is_target = 1;
+      target = framebuffer.render_target;
+    }
+  else
+    is_target = 0;
+
+  return grub_video_fb_set_active_render_target (target);
+}
+
+static grub_err_t
+grub_video_vga_get_active_render_target (struct grub_video_render_target **target)
+{
+  grub_err_t err;
+  err = grub_video_fb_get_active_render_target (target);
+  if (err)
+    return err;
+
+  if (*target == framebuffer.render_target)
+    *target = GRUB_VIDEO_RENDER_TARGET_DISPLAY;
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_video_vga_swap_buffers (void)
+{
+  if (!(framebuffer.mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED))
+    return GRUB_ERR_NONE;
+
+  /* Activate the other page.  */
+  framebuffer.front_page = !framebuffer.front_page;
+  framebuffer.back_page = !framebuffer.back_page;
+  wait_vretrace ();
+  set_start_address (PAGE_OFFSET (framebuffer.front_page));
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_video_vga_set_palette (unsigned int start __attribute__ ((unused)),
+			    unsigned int count __attribute__ ((unused)),
+                            struct grub_video_palette_data *palette_data __attribute__ ((unused)))
+{
+  return grub_error (GRUB_ERR_IO, "can't change palette");
+}
+
+static grub_err_t
+grub_video_vga_get_info_and_fini (struct grub_video_mode_info *mode_info,
+				  void **framebuf)
+{
+  set_map_mask (0xf);
+
+  grub_memcpy (mode_info, &(framebuffer.mode_info), sizeof (*mode_info));
+  mode_info->bpp = 1;
+  mode_info->bytes_per_pixel = 0;
+  mode_info->pitch = VGA_WIDTH / 8;
+  mode_info->number_of_colors = 1;
+
+  mode_info->bg_red = 0;
+  mode_info->bg_green = 0;
+  mode_info->bg_blue = 0;
+  mode_info->bg_alpha = 255;
+
+  mode_info->fg_red = 255;
+  mode_info->fg_green = 255;
+  mode_info->fg_blue = 255;
+  mode_info->fg_alpha = 255;
+
+  *framebuf = VGA_MEM + PAGE_OFFSET (framebuffer.front_page);
+
+  grub_video_fb_fini ();
+  grub_free (framebuffer.temporary_buffer);
+  framebuffer.temporary_buffer = 0;
+  setup = 0;
+
+  return GRUB_ERR_NONE;
+}
+
+
+static struct grub_video_adapter grub_video_vga_adapter =
+  {
+    .name = "VGA Video Driver",
+    .id = GRUB_VIDEO_DRIVER_VGA,
+
+    .init = grub_video_vga_init,
+    .fini = grub_video_vga_fini,
+    .setup = grub_video_vga_setup,
+    .get_info = grub_video_fb_get_info,
+    .get_info_and_fini = grub_video_vga_get_info_and_fini,
+    .set_palette = grub_video_vga_set_palette,
+    .get_palette = grub_video_fb_get_palette,
+    .set_viewport = grub_video_fb_set_viewport,
+    .get_viewport = grub_video_fb_get_viewport,
+    .map_color = grub_video_fb_map_color,
+    .map_rgb = grub_video_fb_map_rgb,
+    .map_rgba = grub_video_fb_map_rgba,
+    .unmap_color = grub_video_fb_unmap_color,
+    .fill_rect = grub_video_fb_fill_rect,
+    .blit_bitmap = grub_video_vga_blit_bitmap,
+    .blit_render_target = grub_video_vga_blit_render_target,
+    .scroll = grub_video_fb_scroll,
+    .swap_buffers = grub_video_vga_swap_buffers,
+    .create_render_target = grub_video_fb_create_render_target,
+    .delete_render_target = grub_video_fb_delete_render_target,
+    .set_active_render_target = grub_video_vga_set_active_render_target,
+    .get_active_render_target = grub_video_vga_get_active_render_target,
+
+    .next = 0
+  };
+
+GRUB_MOD_INIT(vga)
+{
+  grub_video_register (&grub_video_vga_adapter);
+}
+
+GRUB_MOD_FINI(vga)
+{
+  grub_video_unregister (&grub_video_vga_adapter);
+}

From b764bff263def3c0e60b232213ed362ee52a5fa8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 9 May 2010 12:56:32 +0200
Subject: [PATCH 0942/1628] Move arrow number into unicode characters array

---
 include/grub/term.h    | 14 --------------
 include/grub/unicode.h | 10 ++++++++++
 normal/menu_entry.c    |  8 ++++----
 normal/menu_text.c     | 28 ++++++++++++++--------------
 normal/term.c          | 40 ++++++++++++++++++++--------------------
 5 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/include/grub/term.h b/include/grub/term.h
index 5a098e293..e460e4a58 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -90,20 +90,6 @@ grub_term_color_state;
 #define GRUB_TERM_STATUS_CTRL	(1 << 1)
 #define GRUB_TERM_STATUS_ALT	(1 << 2)
 
-
-/* Unicode characters for fancy graphics.  */
-#define GRUB_TERM_DISP_LEFT	0x2190
-#define GRUB_TERM_DISP_UP	0x2191
-#define GRUB_TERM_DISP_RIGHT	0x2192
-#define GRUB_TERM_DISP_DOWN	0x2193
-#define GRUB_TERM_DISP_HLINE	0x2501
-#define GRUB_TERM_DISP_VLINE	0x2503
-#define GRUB_TERM_DISP_UL	0x250F
-#define GRUB_TERM_DISP_UR	0x2513
-#define GRUB_TERM_DISP_LL	0x2517
-#define GRUB_TERM_DISP_LR	0x251B
-
-
 /* Menu-related geometrical constants.  */
 
 /* The number of lines of "GRUB version..." at the top.  */
diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 39e4c52cc..9d1fe7ca0 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -184,6 +184,16 @@ enum
     GRUB_UNICODE_THAANA_SUKUN              = 0x07b0,
     GRUB_UNICODE_ZWNJ                      = 0x200c,
     GRUB_UNICODE_ZWJ                       = 0x200d,
+    GRUB_UNICODE_LEFTARROW                 = 0x2190,
+    GRUB_UNICODE_UPARROW                   = 0x2191,
+    GRUB_UNICODE_RIGHTARROW                = 0x2192,
+    GRUB_UNICODE_DOWNARROW                 = 0x2193,
+    GRUB_UNICODE_HLINE                     = 0x2501,
+    GRUB_UNICODE_VLINE                     = 0x2503,
+    GRUB_UNICODE_CORNER_UL                 = 0x250f,
+    GRUB_UNICODE_CORNER_UR                 = 0x2513,
+    GRUB_UNICODE_CORNER_LL                 = 0x2517,
+    GRUB_UNICODE_CORNER_LR                 = 0x251b,
     GRUB_UNICODE_VARIATION_SELECTOR_1      = 0xfe00,
     GRUB_UNICODE_VARIATION_SELECTOR_16     = 0xfe0f,
     GRUB_UNICODE_VARIATION_SELECTOR_17     = 0xe0100,
diff --git a/normal/menu_entry.c b/normal/menu_entry.c
index 433208116..d4d359066 100644
--- a/normal/menu_entry.c
+++ b/normal/menu_entry.c
@@ -173,7 +173,7 @@ print_up (int flag, struct per_term_screen *term_screen)
 		    GRUB_TERM_FIRST_ENTRY_Y);
 
   if (flag)
-    grub_putcode (GRUB_TERM_DISP_UP, term_screen->term);
+    grub_putcode (GRUB_UNICODE_UPARROW, term_screen->term);
   else
     grub_putcode (' ', term_screen->term);
 }
@@ -188,7 +188,7 @@ print_down (int flag, struct per_term_screen *term_screen)
 		    + grub_term_num_entries (term_screen->term));
 
   if (flag)
-    grub_putcode (GRUB_TERM_DISP_DOWN, term_screen->term);
+    grub_putcode (GRUB_UNICODE_DOWNARROW, term_screen->term);
   else
     grub_putcode (' ', term_screen->term);
 }
@@ -1097,7 +1097,7 @@ complete (struct screen *screen, int continuous, int update)
 	    endp = p + (grub_term_width (screen->terms[i].term) - 8);
 
 	    if (p != ucs4)
-	      grub_putcode (GRUB_TERM_DISP_LEFT, screen->terms[i].term);
+	      grub_putcode (GRUB_UNICODE_LEFTARROW, screen->terms[i].term);
 	    else
 	      grub_putcode (' ', screen->terms[i].term);
 
@@ -1105,7 +1105,7 @@ complete (struct screen *screen, int continuous, int update)
 			     0, 0, screen->terms[i].term);
 
 	    if (ucs4 + ucs4len > endp)
-	      grub_putcode (GRUB_TERM_DISP_RIGHT, screen->terms[i].term);
+	      grub_putcode (GRUB_UNICODE_RIGHTARROW, screen->terms[i].term);
 	    grub_term_gotoxy (screen->terms[i].term, pos >> 8, pos & 0xFF);
 	  }
     }
diff --git a/normal/menu_text.c b/normal/menu_text.c
index 22bcbda66..3e3e7e2fa 100644
--- a/normal/menu_text.c
+++ b/normal/menu_text.c
@@ -83,27 +83,27 @@ draw_border (struct grub_term_output *term)
   grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
 
   grub_term_gotoxy (term, GRUB_TERM_MARGIN, GRUB_TERM_TOP_BORDER_Y);
-  grub_putcode (GRUB_TERM_DISP_UL, term);
+  grub_putcode (GRUB_UNICODE_CORNER_UL, term);
   for (i = 0; i < (unsigned) grub_term_border_width (term) - 2; i++)
-    grub_putcode (GRUB_TERM_DISP_HLINE, term);
-  grub_putcode (GRUB_TERM_DISP_UR, term);
+    grub_putcode (GRUB_UNICODE_HLINE, term);
+  grub_putcode (GRUB_UNICODE_CORNER_UR, term);
 
   for (i = 0; i < (unsigned) grub_term_num_entries (term); i++)
     {
       grub_term_gotoxy (term, GRUB_TERM_MARGIN, GRUB_TERM_TOP_BORDER_Y + i + 1);
-      grub_putcode (GRUB_TERM_DISP_VLINE, term);
+      grub_putcode (GRUB_UNICODE_VLINE, term);
       grub_term_gotoxy (term, GRUB_TERM_MARGIN + grub_term_border_width (term)
 			- 1,
 			GRUB_TERM_TOP_BORDER_Y + i + 1);
-      grub_putcode (GRUB_TERM_DISP_VLINE, term);
+      grub_putcode (GRUB_UNICODE_VLINE, term);
     }
 
   grub_term_gotoxy (term, GRUB_TERM_MARGIN,
 		    GRUB_TERM_TOP_BORDER_Y + grub_term_num_entries (term) + 1);
-  grub_putcode (GRUB_TERM_DISP_LL, term);
+  grub_putcode (GRUB_UNICODE_CORNER_LL, term);
   for (i = 0; i < (unsigned) grub_term_border_width (term) - 2; i++)
-    grub_putcode (GRUB_TERM_DISP_HLINE, term);
-  grub_putcode (GRUB_TERM_DISP_LR, term);
+    grub_putcode (GRUB_UNICODE_HLINE, term);
+  grub_putcode (GRUB_UNICODE_CORNER_LR, term);
 
   grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
 
@@ -138,8 +138,8 @@ command-line or ESC to discard edits and return to the GRUB menu."),
 			  "entry is highlighted.\n");
       char *msg_translated;
 
-      msg_translated = grub_xasprintf (msg, (grub_uint32_t) GRUB_TERM_DISP_UP,
-				     (grub_uint32_t) GRUB_TERM_DISP_DOWN);
+      msg_translated = grub_xasprintf (msg, GRUB_UNICODE_UPARROW,
+				       GRUB_UNICODE_DOWNARROW);
       if (!msg_translated)
 	return;
       grub_putcode ('\n', term);
@@ -236,9 +236,9 @@ print_entry (int y, int highlight, grub_menu_entry_t entry,
 
   if (last_printed != len)
     {
-      grub_putcode (GRUB_TERM_DISP_RIGHT, term);
+      grub_putcode (GRUB_UNICODE_RIGHTARROW, term);
       struct grub_unicode_glyph pseudo_glyph = {
-	.base = GRUB_TERM_DISP_RIGHT,
+	.base = GRUB_UNICODE_RIGHTARROW,
 	.variant = 0,
 	.attributes = 0,
 	.ncomb = 0,
@@ -274,7 +274,7 @@ print_entries (grub_menu_t menu, int first, int offset,
 		    GRUB_TERM_FIRST_ENTRY_Y);
 
   if (first)
-    grub_putcode (GRUB_TERM_DISP_UP, term);
+    grub_putcode (GRUB_UNICODE_UPARROW, term);
   else
     grub_putcode (' ', term);
 
@@ -292,7 +292,7 @@ print_entries (grub_menu_t menu, int first, int offset,
 		    GRUB_TERM_TOP_BORDER_Y + grub_term_num_entries (term));
 
   if (e)
-    grub_putcode (GRUB_TERM_DISP_DOWN, term);
+    grub_putcode (GRUB_UNICODE_DOWNARROW, term);
   else
     grub_putcode (' ', term);
 
diff --git a/normal/term.c b/normal/term.c
index f46930be4..4d7dbf622 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -128,25 +128,25 @@ map_code (grub_uint32_t in, struct grub_term_output *term)
     case GRUB_TERM_CODE_TYPE_VGA:
       switch (in)
 	{
-	case GRUB_TERM_DISP_LEFT:
+	case GRUB_UNICODE_LEFTARROW:
 	  return 0x1b;
-	case GRUB_TERM_DISP_UP:
+	case GRUB_UNICODE_UPARROW:
 	  return 0x18;
-	case GRUB_TERM_DISP_RIGHT:
+	case GRUB_UNICODE_RIGHTARROW:
 	  return 0x1a;
-	case GRUB_TERM_DISP_DOWN:
+	case GRUB_UNICODE_DOWNARROW:
 	  return 0x19;
-	case GRUB_TERM_DISP_HLINE:
+	case GRUB_UNICODE_HLINE:
 	  return 0xc4;
-	case GRUB_TERM_DISP_VLINE:
+	case GRUB_UNICODE_VLINE:
 	  return 0xb3;
-	case GRUB_TERM_DISP_UL:
+	case GRUB_UNICODE_CORNER_UL:
 	  return 0xda;
-	case GRUB_TERM_DISP_UR:
+	case GRUB_UNICODE_CORNER_UR:
 	  return 0xbf;
-	case GRUB_TERM_DISP_LL:
+	case GRUB_UNICODE_CORNER_LL:
 	  return  0xc0;
-	case GRUB_TERM_DISP_LR:
+	case GRUB_UNICODE_CORNER_LR:
 	  return 0xd9;
 	}
       return '?';
@@ -154,28 +154,28 @@ map_code (grub_uint32_t in, struct grub_term_output *term)
       /* Better than nothing.  */
       switch (in)
 	{
-	case GRUB_TERM_DISP_LEFT:
+	case GRUB_UNICODE_LEFTARROW:
 	  return '<';
 		
-	case GRUB_TERM_DISP_UP:
+	case GRUB_UNICODE_UPARROW:
 	  return '^';
 	  
-	case GRUB_TERM_DISP_RIGHT:
+	case GRUB_UNICODE_RIGHTARROW:
 	  return '>';
 		
-	case GRUB_TERM_DISP_DOWN:
+	case GRUB_UNICODE_DOWNARROW:
 	  return 'v';
 		  
-	case GRUB_TERM_DISP_HLINE:
+	case GRUB_UNICODE_HLINE:
 	  return '-';
 		  
-	case GRUB_TERM_DISP_VLINE:
+	case GRUB_UNICODE_VLINE:
 	  return '|';
 		  
-	case GRUB_TERM_DISP_UL:
-	case GRUB_TERM_DISP_UR:
-	case GRUB_TERM_DISP_LL:
-	case GRUB_TERM_DISP_LR:
+	case GRUB_UNICODE_CORNER_UL:
+	case GRUB_UNICODE_CORNER_UR:
+	case GRUB_UNICODE_CORNER_LL:
+	case GRUB_UNICODE_CORNER_LR:
 	  return '+';
 		
 	}

From d7fd78dc3d95747639cbbd42c28cf77c22c26543 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 9 May 2010 13:20:35 +0200
Subject: [PATCH 0943/1628] macroify EFI characters mapping

---
 include/grub/unicode.h | 10 ++++++
 term/efi/console.c     | 71 +++++++++++++++++++-----------------------
 2 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/include/grub/unicode.h b/include/grub/unicode.h
index 9d1fe7ca0..64769258a 100644
--- a/include/grub/unicode.h
+++ b/include/grub/unicode.h
@@ -188,12 +188,22 @@ enum
     GRUB_UNICODE_UPARROW                   = 0x2191,
     GRUB_UNICODE_RIGHTARROW                = 0x2192,
     GRUB_UNICODE_DOWNARROW                 = 0x2193,
+    GRUB_UNICODE_LIGHT_HLINE               = 0x2500,
     GRUB_UNICODE_HLINE                     = 0x2501,
+    GRUB_UNICODE_LIGHT_VLINE               = 0x2502,
     GRUB_UNICODE_VLINE                     = 0x2503,
+    GRUB_UNICODE_LIGHT_CORNER_UL           = 0x250c,
     GRUB_UNICODE_CORNER_UL                 = 0x250f,
+    GRUB_UNICODE_LIGHT_CORNER_UR           = 0x2510,
     GRUB_UNICODE_CORNER_UR                 = 0x2513,
+    GRUB_UNICODE_LIGHT_CORNER_LL           = 0x2514,
     GRUB_UNICODE_CORNER_LL                 = 0x2517,
+    GRUB_UNICODE_LIGHT_CORNER_LR           = 0x2518,
     GRUB_UNICODE_CORNER_LR                 = 0x251b,
+    GRUB_UNICODE_BLACK_UP_TRIANGLE         = 0x25b2,
+    GRUB_UNICODE_BLACK_RIGHT_TRIANGLE      = 0x25ba,
+    GRUB_UNICODE_BLACK_DOWN_TRIANGLE       = 0x25bc,
+    GRUB_UNICODE_BLACK_LEFT_TRIANGLE       = 0x25c4,
     GRUB_UNICODE_VARIATION_SELECTOR_1      = 0xfe00,
     GRUB_UNICODE_VARIATION_SELECTOR_16     = 0xfe0f,
     GRUB_UNICODE_VARIATION_SELECTOR_17     = 0xe0100,
diff --git a/term/efi/console.c b/term/efi/console.c
index d54c1c4be..d3240590b 100644
--- a/term/efi/console.c
+++ b/term/efi/console.c
@@ -33,46 +33,39 @@ static int read_key = -1;
 static grub_uint32_t
 map_char (grub_uint32_t c)
 {
-  if (c > 0x7f)
+  /* Map some unicode characters to the EFI character.  */
+  switch (c)
     {
-      /* Map some unicode characters to the EFI character.  */
-      switch (c)
-	{
-	case 0x2190:	/* left arrow */
-	  c = 0x25c4;
-	  break;
-	case 0x2191:	/* up arrow */
-	  c = 0x25b2;
-	  break;
-	case 0x2192:	/* right arrow */
-	  c = 0x25ba;
-	  break;
-	case 0x2193:	/* down arrow */
-	  c = 0x25bc;
-	  break;
-	case 0x2501:	/* horizontal line */
-	  c = 0x2500;
-	  break;
-	case 0x2503:	/* vertical line */
-	  c = 0x2502;
-	  break;
-	case 0x250F:	/* upper-left corner */
-	  c = 0x250c;
-	  break;
-	case 0x2513:	/* upper-right corner */
-	  c = 0x2510;
-	  break;
-	case 0x2517:	/* lower-left corner */
-	  c = 0x2514;
-	  break;
-	case 0x251B:	/* lower-right corner */
-	  c = 0x2518;
-	  break;
-
-	default:
-	  c = '?';
-	  break;
-	}
+    case GRUB_UNICODE_LEFTARROW:
+      c = GRUB_UNICODE_BLACK_LEFT_TRIANGLE;
+      break;
+    case GRUB_UNICODE_UPARROW:
+      c = GRUB_UNICODE_BLACK_UP_TRIANGLE;
+      break;
+    case GRUB_UNICODE_RIGHTARROW:
+      c = GRUB_UNICODE_BLACK_RIGHT_TRIANGLE;
+      break;
+    case GRUB_UNICODE_DOWNARROW:
+      c = GRUB_UNICODE_BLACK_DOWN_TRIANGLE;
+      break;
+    case GRUB_UNICODE_HLINE:
+      c = GRUB_UNICODE_LIGHT_HLINE;
+      break;
+    case GRUB_UNICODE_VLINE:
+      c = GRUB_UNICODE_LIGHT_VLINE;
+      break;
+    case GRUB_UNICODE_CORNER_UL:
+      c = GRUB_UNICODE_LIGHT_CORNER_UL;
+      break;
+    case GRUB_UNICODE_CORNER_UR:
+      c = GRUB_UNICODE_LIGHT_CORNER_UR;
+      break;
+    case GRUB_UNICODE_CORNER_LL:
+      c = GRUB_UNICODE_LIGHT_CORNER_LL;
+      break;
+    case GRUB_UNICODE_CORNER_LR:
+      c = GRUB_UNICODE_LIGHT_CORNER_LR;
+      break;
     }
 
   return c;

From 232dbbe509dbee800eb65be87d9abc19849b86c3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 9 May 2010 13:26:52 +0200
Subject: [PATCH 0944/1628] Rename 'VGA' character set to CP-437

---
 include/grub/term.h     | 4 ++--
 normal/term.c           | 2 +-
 term/i386/pc/console.c  | 2 +-
 term/i386/pc/vga_text.c | 2 +-
 term/terminfo.c         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/grub/term.h b/include/grub/term.h
index e460e4a58..c744c3fb6 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -74,8 +74,8 @@ grub_term_color_state;
 #define GRUB_TERM_CODE_TYPE_MASK	        (7 << GRUB_TERM_CODE_TYPE_SHIFT)
 /* Only ASCII characters accepted.  */
 #define GRUB_TERM_CODE_TYPE_ASCII	        (0 << GRUB_TERM_CODE_TYPE_SHIFT)
-/* Expects VGA characters (ASCII + pseudographics).  */
-#define GRUB_TERM_CODE_TYPE_VGA	                (1 << GRUB_TERM_CODE_TYPE_SHIFT)
+/* Expects CP-437 characters (ASCII + pseudographics).  */
+#define GRUB_TERM_CODE_TYPE_CP437	                (1 << GRUB_TERM_CODE_TYPE_SHIFT)
 /* UTF-8 stream in logical order. Usually used for terminals
    which just forward the stream to another computer.  */
 #define GRUB_TERM_CODE_TYPE_UTF8_LOGICAL	(2 << GRUB_TERM_CODE_TYPE_SHIFT)
diff --git a/normal/term.c b/normal/term.c
index 4d7dbf622..2689f18b6 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -125,7 +125,7 @@ map_code (grub_uint32_t in, struct grub_term_output *term)
 
   switch (term->flags & GRUB_TERM_CODE_TYPE_MASK)
     {
-    case GRUB_TERM_CODE_TYPE_VGA:
+    case GRUB_TERM_CODE_TYPE_CP437:
       switch (in)
 	{
 	case GRUB_UNICODE_LEFTARROW:
diff --git a/term/i386/pc/console.c b/term/i386/pc/console.c
index 2a7e34ad4..19a8e3814 100644
--- a/term/i386/pc/console.c
+++ b/term/i386/pc/console.c
@@ -63,7 +63,7 @@ static struct grub_term_output grub_console_term_output =
     .cls = grub_console_cls,
     .setcolorstate = grub_console_setcolorstate,
     .setcursor = grub_console_setcursor,
-    .flags = GRUB_TERM_CODE_TYPE_VGA,
+    .flags = GRUB_TERM_CODE_TYPE_CP437,
     .normal_color = GRUB_TERM_DEFAULT_NORMAL_COLOR,
     .highlight_color = GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR,
   };
diff --git a/term/i386/pc/vga_text.c b/term/i386/pc/vga_text.c
index 60bde5b05..9fca56c29 100644
--- a/term/i386/pc/vga_text.c
+++ b/term/i386/pc/vga_text.c
@@ -164,7 +164,7 @@ static struct grub_term_output grub_vga_text_term =
     .cls = grub_vga_text_cls,
     .setcolorstate = grub_console_setcolorstate,
     .setcursor = grub_vga_text_setcursor,
-    .flags = GRUB_TERM_CODE_TYPE_VGA,
+    .flags = GRUB_TERM_CODE_TYPE_CP437,
     .normal_color = GRUB_TERM_DEFAULT_NORMAL_COLOR,
     .highlight_color = GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR,
   };
diff --git a/term/terminfo.c b/term/terminfo.c
index dcf17106a..ff54e5dba 100644
--- a/term/terminfo.c
+++ b/term/terminfo.c
@@ -521,7 +521,7 @@ print_terminfo (void)
        they are not used on terminfo terminals.
     */
     [GRUB_TERM_CODE_TYPE_ASCII >> GRUB_TERM_CODE_TYPE_SHIFT] = _("ASCII"),
-    [GRUB_TERM_CODE_TYPE_VGA >> GRUB_TERM_CODE_TYPE_SHIFT] = "VGA",
+    [GRUB_TERM_CODE_TYPE_CP437 >> GRUB_TERM_CODE_TYPE_SHIFT] = "CP-437",
     [GRUB_TERM_CODE_TYPE_UTF8_LOGICAL >> GRUB_TERM_CODE_TYPE_SHIFT]
     = _("UTF-8"),
     [GRUB_TERM_CODE_TYPE_UTF8_VISUAL >> GRUB_TERM_CODE_TYPE_SHIFT]

From a68c41941352bbfbb0eda2486e916aaf4d75a37c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 9 May 2010 13:37:32 +0200
Subject: [PATCH 0945/1628] macroify cp437 codepoints

---
 normal/term.c | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/normal/term.c b/normal/term.c
index 2689f18b6..47e61c5e8 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -117,6 +117,20 @@ grub_set_more (int onoff)
   grub_normal_reset_more ();
 }
 
+enum
+  {
+    GRUB_CP437_UPARROW         = 0x18,
+    GRUB_CP437_DOWNARROW       = 0x19,
+    GRUB_CP437_RIGHTARROW      = 0x1a,
+    GRUB_CP437_LEFTARROW       = 0x1b,
+    GRUB_CP437_VLINE           = 0xb3,
+    GRUB_CP437_CORNER_UR       = 0xbf,
+    GRUB_CP437_CORNER_LL       = 0xc0,
+    GRUB_CP437_HLINE           = 0xc4,
+    GRUB_CP437_CORNER_LR       = 0xd9,
+    GRUB_CP437_CORNER_UL       = 0xda,
+  };
+
 static grub_uint32_t
 map_code (grub_uint32_t in, struct grub_term_output *term)
 {
@@ -129,25 +143,25 @@ map_code (grub_uint32_t in, struct grub_term_output *term)
       switch (in)
 	{
 	case GRUB_UNICODE_LEFTARROW:
-	  return 0x1b;
+	  return GRUB_CP437_LEFTARROW;
 	case GRUB_UNICODE_UPARROW:
-	  return 0x18;
+	  return GRUB_CP437_UPARROW;
 	case GRUB_UNICODE_RIGHTARROW:
-	  return 0x1a;
+	  return GRUB_CP437_RIGHTARROW;
 	case GRUB_UNICODE_DOWNARROW:
-	  return 0x19;
+	  return GRUB_CP437_DOWNARROW;
 	case GRUB_UNICODE_HLINE:
-	  return 0xc4;
+	  return GRUB_CP437_HLINE;
 	case GRUB_UNICODE_VLINE:
-	  return 0xb3;
+	  return GRUB_CP437_VLINE;
 	case GRUB_UNICODE_CORNER_UL:
-	  return 0xda;
+	  return GRUB_CP437_CORNER_UL;
 	case GRUB_UNICODE_CORNER_UR:
-	  return 0xbf;
+	  return GRUB_CP437_CORNER_UR;
 	case GRUB_UNICODE_CORNER_LL:
-	  return  0xc0;
+	  return GRUB_CP437_CORNER_LL;
 	case GRUB_UNICODE_CORNER_LR:
-	  return 0xd9;
+	  return GRUB_CP437_CORNER_LR;
 	}
       return '?';
     case GRUB_TERM_CODE_TYPE_ASCII:

From 062cdbc1ca22c1cfb5c984da0872c18f1ce97036 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 10 May 2010 13:50:43 +0530
Subject: [PATCH 0946/1628] added i386-multiboot support

---
 configure.common          |  7 +++++--
 gentpl.py                 |  5 +++--
 grub-core/Makefile.kernel | 11 +++++++++++
 grub-core/modules.def     | 25 ++++++++++++++++++++++++-
 4 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/configure.common b/configure.common
index cf40fca0f..a18bc803f 100644
--- a/configure.common
+++ b/configure.common
@@ -766,6 +766,8 @@ AS_IF([test x$target_cpu = xi386 -a x$platform = xpc],
 	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
 AS_IF([test x$target_cpu = xi386 -a x$platform = xcoreboot],
 	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
+AS_IF([test x$target_cpu = xi386 -a x$platform = xmultiboot],
+	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
 AS_IF([test x$target_cpu = xmips -a x$platform = xyeeloong],
 	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x80200000)])
 AS_IF([test x$target_cpu = xpowerpc -a x$platform = xieee1275],
@@ -784,9 +786,10 @@ AS_IF([test x$TARGET_APPLE_CC = x1],
 AM_CONDITIONAL([COND_emu], [test x$platform = xemu])
 AM_CONDITIONAL([COND_i386_pc], [test x$target_cpu = xi386 -a x$platform = xpc])
 AM_CONDITIONAL([COND_i386_efi], [test x$target_cpu = xi386 -a x$platform = xefi])
-AM_CONDITIONAL([COND_i386_coreboot], [test x$target_cpu = xi386 -a x$platform = xcoreboot])
-AM_CONDITIONAL([COND_i386_ieee1275], [test x$target_cpu = xi386 -a x$platform = xieee1275])
 AM_CONDITIONAL([COND_i386_qemu], [test x$target_cpu = xi386 -a x$platform = xqemu])
+AM_CONDITIONAL([COND_i386_ieee1275], [test x$target_cpu = xi386 -a x$platform = xieee1275])
+AM_CONDITIONAL([COND_i386_coreboot], [test x$target_cpu = xi386 -a x$platform = xcoreboot])
+AM_CONDITIONAL([COND_i386_multiboot], [test x$target_cpu = xi386 -a x$platform = xmultiboot])
 AM_CONDITIONAL([COND_x86_64_efi], [test x$target_cpu = xx86_64 -a x$platform = xefi])
 AM_CONDITIONAL([COND_mips_yeeloong], [test x$target_cpu = xmips -a x$platform = xyeeloong])
 AM_CONDITIONAL([COND_mips_qemu_mips], [test x$target_cpu = xmips -a x$platform = xqemu_mips])
diff --git a/gentpl.py b/gentpl.py
index 214b58afd..d6043d05c 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -5,11 +5,12 @@
 #
 
 GRUB_PLATFORMS = [ "emu", "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot",
-                   "i386_ieee1275", "x86_64_efi", "mips_yeeloong", "sparc64_ieee1275",
+                   "i386_multiboot", "i386_ieee1275", "x86_64_efi",
+                   "mips_yeeloong", "sparc64_ieee1275",
                    "powerpc_ieee1275" ]
 
 GROUPS = {}
-GROUPS["i386"]    = [ "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot", "i386_ieee1275" ]
+GROUPS["i386"]    = [ "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot", "i386_multiboot", "i386_ieee1275" ]
 GROUPS["x86_64"]  = [ "x86_64_efi" ]
 GROUPS["mips"]    = [ "mips_yeeloong" ]
 GROUPS["sparc64"] = [ "sparc64_ieee1275" ]
diff --git a/grub-core/Makefile.kernel b/grub-core/Makefile.kernel
index 58e464805..38e2e0ab7 100644
--- a/grub-core/Makefile.kernel
+++ b/grub-core/Makefile.kernel
@@ -65,6 +65,17 @@ KERNEL_HEADER_FILES += include/grub/machine/memory.h
 KERNEL_HEADER_FILES += include/grub/machine/loader.h
 endif
 
+if COND_i386_multiboot
+KERNEL_HEADER_FILES += include/grub/boot.h
+KERNEL_HEADER_FILES += include/grub/loader.h
+KERNEL_HEADER_FILES += include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += include/grub/machine/boot.h
+KERNEL_HEADER_FILES += include/grub/machine/console.h
+KERNEL_HEADER_FILES += include/grub/machine/init.h
+KERNEL_HEADER_FILES += include/grub/machine/memory.h
+KERNEL_HEADER_FILES += include/grub/machine/loader.h
+endif
+
 if COND_i386_qemu
 KERNEL_HEADER_FILES += include/grub/boot.h
 KERNEL_HEADER_FILES += include/grub/loader.h
diff --git a/grub-core/modules.def b/grub-core/modules.def
index c3d90009b..b09516294 100644
--- a/grub-core/modules.def
+++ b/grub-core/modules.def
@@ -7,6 +7,7 @@ kernel = {
   x86_efi_ldflags          = '-Wl,-r';
   i386_pc_ldflags          = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
   i386_coreboot_ldflags    = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  i386_multiboot_ldflags   = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
   i386_qemu_ldflags        = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
   i386_ieee1275_ldflags    = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
   mips_yeeloong_ldflags    = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
@@ -87,6 +88,21 @@ kernel = {
   i386_coreboot = term/i386/pc/vga_text.c;
   i386_coreboot = term/i386/vga_common.c;
 
+  i386_multiboot = kern/i386/coreboot/startup.S;
+  i386_multiboot = kern/i386/misc.S;
+  i386_multiboot = kern/i386/coreboot/init.c;
+  i386_multiboot = kern/i386/multiboot_mmap.c;
+  i386_multiboot = kern/i386/halt.c;
+  i386_multiboot = kern/mm.c;
+  i386_multiboot = kern/time.c;
+  i386_multiboot = kern/i386/dl.c;
+  i386_multiboot = kern/i386/tsc.c;
+  i386_multiboot = kern/i386/pit.c;
+  i386_multiboot = kern/generic/rtc_get_time_ms.c;
+  i386_multiboot = kern/generic/millisleep.c;
+  i386_multiboot = term/i386/pc/vga_text.c;
+  i386_multiboot = term/i386/vga_common.c;
+
   i386_qemu = kern/i386/qemu/startup.S;
   i386_qemu = kern/i386/misc.S;
   i386_qemu = kern/i386/coreboot/init.c;
@@ -202,7 +218,7 @@ kernel = {
 
   image_nostrip = { emu; };
   image_strip_keep_kernel = { i386_efi; x86_64_efi; };
-  image_strip = { powerpc_ieee1275; i386_coreboot; i386_ieee1275; };
+  image_strip = { powerpc_ieee1275; i386_coreboot; i386_multiboot; i386_ieee1275; };
   image_strip_macho2img = { mips_yeeloong; i386_pc; i386_qemu; sparc64_ieee1275; };
 };
 
@@ -530,6 +546,7 @@ module = {
   i386_pc;
   i386_qemu;
   i386_coreboot;
+  i386_multiboot;
   i386_ieee1275;
   mips_yeeloong;
   powerpc_ieee1275;
@@ -1231,6 +1248,7 @@ module = {
   i386_pc;
   i386_qemu;
   i386_coreboot;
+  i386_multiboot;
   i386_ieee1275;
 };
 
@@ -1244,6 +1262,7 @@ module = {
   i386_pc;
   i386_qemu;
   i386_coreboot;
+  i386_multiboot;
 };
 
 module = {
@@ -1328,6 +1347,10 @@ module = {
   i386_coreboot = mmap/i386/uppermem.c;
   i386_coreboot = mmap/i386/mmap.c;
 
+  i386_multiboot = mmap/mmap.c;
+  i386_multiboot = mmap/i386/uppermem.c;
+  i386_multiboot = mmap/i386/mmap.c;
+
   i386_qemu = mmap/mmap.c;
   i386_qemu = mmap/i386/uppermem.c;
   i386_qemu = mmap/i386/mmap.c;

From 8be3ced19f8b81fcfa852a63b857a2328248ff6c Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 10 May 2010 14:05:10 +0530
Subject: [PATCH 0947/1628] fix mips build

---
 grub-core/include/grub/dl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grub-core/include/grub/dl.h b/grub-core/include/grub/dl.h
index 8c5f4bb2d..218de996c 100644
--- a/grub-core/include/grub/dl.h
+++ b/grub-core/include/grub/dl.h
@@ -111,7 +111,7 @@ grub_err_t EXPORT_FUNC(grub_dl_register_symbol) (const char *name, void *addr,
 grub_err_t grub_arch_dl_check_header (void *ehdr);
 grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
 
-#if defined (_mips) && ! GRUB_MACHINE_EMU
+#if defined (_mips) && ! defined (GRUB_MACHINE_EMU)
 #define GRUB_LINKER_HAVE_INIT 1
 void grub_arch_dl_init_linker (void);
 #endif

From 1426af206ccb5cd61930d208de7b46f3359ece30 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 10 May 2010 15:08:02 +0530
Subject: [PATCH 0948/1628] fix vga.c

---
 grub-core/modules.def | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grub-core/modules.def b/grub-core/modules.def
index b09516294..fe77c4cbd 100644
--- a/grub-core/modules.def
+++ b/grub-core/modules.def
@@ -1491,7 +1491,7 @@ module = {
 
 module = {
   name = vga;
-  i386_pc = term/i386/pc/vga.c;
+  i386_pc = video/i386/pc/vga.c;
 };
 
 module = {

From 2e33ae0d1b334535ecb113fc5c36ac0e6965741d Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 10 May 2010 15:37:18 +0530
Subject: [PATCH 0949/1628] few minor fixes

---
 Makefile.am | 4 ++--
 gentpl.py   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d962963c1..c0d6d003b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,6 +33,8 @@ AM_LDFLAGS =
 AM_CPPFLAGS = $(CPPFLAGS_GRUB) -DGRUB_FILE=\"$(subst $(top_srcdir)/,,$<)\"
 AM_CCASFLAGS = -DASM_FILE=1
 
+include $(srcdir)/modules.am
+
 # XXX Use Automake's LEX & YACC support
 grub_script.tab.c grub_script.tab.h: $(top_srcdir)/grub-core/script/parser.y
 	$(YACC) -d -p grub_script_yy -b grub_script $(top_srcdir)/grub-core/script/parser.y
@@ -83,5 +85,3 @@ ascii.h: ascii.bitmaps grub-bin2h
 CLEANFILES += ascii.h $(top_builddir)/grub-core/include/ascii.h
 
 platform_HEADERS = config.h
-
-include $(srcdir)/modules.am
diff --git a/gentpl.py b/gentpl.py
index d6043d05c..f906bd6d1 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -329,7 +329,7 @@ def installdir(default="bin"):
 
 def manpage():
     r  = "if COND_MAN_PAGES\n"
-    r += "man_MANS += [+ name +].[+ mansection +]\n"
+    r += gvar_add("man_MANS", "[+ name +].[+ mansection +]\n")
     r += rule("[+ name +].[+ mansection +]", "", """
 $(MAKE) $(AM_MAKEFLAGS) [+ name +]
 chmod a+x [+ name +]

From 01b0317f7b70fc6fe7fe73f7a36c2e4d26621255 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 11 May 2010 10:52:10 +0530
Subject: [PATCH 0950/1628] simplified nesting dynamic scopes

---
 include/grub/script_sh.h |  9 ---------
 script/execute.c         | 13 +++++++++++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 730aa3005..e1edbec15 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -73,15 +73,6 @@ struct grub_script_arglist
   int argcount;
 };
 
-/* Scope for grub script constructs.  */
-struct grub_script_scope
-{
-  struct grub_script_scope *next;
-
-  char **args;
-  unsigned int argc;
-};
-
 /* A single command line.  */
 struct grub_script_cmdline
 {
diff --git a/script/execute.c b/script/execute.c
index 571b6785b..573dab4cb 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -30,6 +30,12 @@
    is sizeof (int) * 3, and one extra for a possible -ve sign.  */
 #define ERRNO_DIGITS_MAX  (sizeof (int) * 3 + 1)
 
+/* Scope for grub script functions.  */
+struct grub_script_scope
+{
+  char **args;
+  unsigned int argc;
+};
 static struct grub_script_scope *scope = 0;
 
 static char *
@@ -242,15 +248,18 @@ grub_err_t
 grub_script_function_call (grub_script_function_t func, int argc, char **args)
 {
   grub_err_t ret = 0;
+  struct grub_script_scope *old_scope;
   struct grub_script_scope new_scope;
 
   new_scope.argc = argc;
   new_scope.args = args;
-  grub_list_push (GRUB_AS_LIST_P (&scope), GRUB_AS_LIST (&new_scope));
+
+  old_scope = scope;
+  scope = &new_scope;
 
   ret = grub_script_execute (func->func);
 
-  grub_list_pop (GRUB_AS_LIST_P (&scope));
+  scope = old_scope;
   return ret;
 }
 

From a0167e8bdf046724f3eb227b1c4ef9c3abe6f0f5 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 12 May 2010 10:19:12 +0530
Subject: [PATCH 0951/1628] rewrote arglist to argv conversion and added $@, $*
 support

---
 conf/common.rmk                |   2 +-
 include/grub/script_sh.h       |  12 ++
 script/argv.c                  | 128 ++++++++++++
 script/execute.c               | 362 +++++++++++++++------------------
 script/yylex.l                 |   2 +-
 tests/grub_script_echo1.in     |  27 +++
 tests/grub_script_functions.in |  70 ++++++-
 tests/grub_script_vars1.in     |   2 +-
 8 files changed, 392 insertions(+), 213 deletions(-)
 create mode 100644 script/argv.c

diff --git a/conf/common.rmk b/conf/common.rmk
index 4b39e9b71..54146904b 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -660,7 +660,7 @@ normal_mod_CFLAGS = $(COMMON_CFLAGS)
 normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For sh.mod.
-sh_mod_SOURCES = script/main.c script/script.c script/execute.c \
+sh_mod_SOURCES = script/main.c script/script.c script/argv.c script/execute.c \
 	script/function.c script/lexer.c grub_script.tab.c grub_script.yy.c
 sh_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS) -Wno-error
 sh_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index e1edbec15..5455fc763 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -63,6 +63,13 @@ struct grub_script_arg
   struct grub_script_arg *next;
 };
 
+/* An argument vector.  */
+struct grub_script_argv
+{
+  int argc;
+  char **args;
+};
+
 /* A complete argument.  It consists of a list of one or more `struct
    grub_script_arg's.  */
 struct grub_script_arglist
@@ -215,6 +222,11 @@ struct grub_parser_param
   struct grub_lexer_param *lexerstate;
 };
 
+void grub_script_argv_free    (struct grub_script_argv *argv);
+int grub_script_argv_next     (struct grub_script_argv *argv);
+int grub_script_argv_append   (struct grub_script_argv *argv, const char *s);
+int grub_script_argv_split_append (struct grub_script_argv *argv, char *s);
+
 struct grub_script_arglist *
 grub_script_create_arglist (struct grub_parser_param *state);
 
diff --git a/script/argv.c b/script/argv.c
new file mode 100644
index 000000000..1ac81f4b8
--- /dev/null
+++ b/script/argv.c
@@ -0,0 +1,128 @@
+/* argv.c - methods for constructing argument vector */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/mm.h>
+#include <grub/script_sh.h>
+
+#define ARG_ALLOCATION_UNIT  (32 * sizeof (char))
+#define ARGV_ALLOCATION_UNIT (8 * sizeof (void*))
+
+void
+grub_script_argv_free (struct grub_script_argv *argv)
+{
+  int i;
+
+  if (argv->args)
+    {
+      for (i = 0; i < argv->argc; i++)
+	grub_free (argv->args[i]);
+
+      grub_free (argv->args);
+    }
+
+  argv->argc = 0;
+  argv->args = 0;
+}
+
+/* Prepare for next argc.  */
+int
+grub_script_argv_next (struct grub_script_argv *argv)
+{
+  char **p = argv->args;
+
+  if (argv->argc == 0)
+    {
+      p = grub_malloc (ALIGN_UP (2 * sizeof (char *), ARG_ALLOCATION_UNIT));
+      if (! p)
+	return 1;
+
+      argv->argc = 1;
+      argv->args = p;
+      argv->args[0] = 0;
+      argv->args[1] = 0;
+      return 0;
+    }
+
+  if (! argv->args[argv->argc - 1])
+    return 0;
+
+  p = grub_realloc (p, ALIGN_UP ((argv->argc + 1) * sizeof (char *),
+				 ARG_ALLOCATION_UNIT));
+  if (! p)
+    return 1;
+
+  argv->argc++;
+  argv->args = p;
+  argv->args[argv->argc] = 0;
+  return 0;
+}
+
+/* Append `s' to the last argument.  */
+int
+grub_script_argv_append (struct grub_script_argv *argv, const char *s)
+{
+  int a, b;
+  char *p = argv->args[argv->argc - 1];
+
+  if (! s)
+    return 0;
+
+  a = p ? grub_strlen (p) : 0;
+  b = grub_strlen (s);
+
+  p = grub_realloc (p, ALIGN_UP ((a + b + 1) * sizeof (char),
+				 ARG_ALLOCATION_UNIT));
+  if (! p)
+    return 1;
+
+  grub_strcpy (p + a, s);
+  argv->args[argv->argc - 1] = p;
+  return 0;
+}
+
+/* Split `s' and append words as multiple arguments.  */
+int
+grub_script_argv_split_append (struct grub_script_argv *argv, char *s)
+{
+  char ch;
+  char *p;
+  int errors = 0;
+
+  if (! s)
+    return 0;
+
+  while (! errors && *s)
+    {
+      p = s;
+      while (*s && ! grub_isspace (*s))
+	s++;
+
+      ch = *s;
+      *s = '\0';
+      errors += grub_script_argv_append (argv, p);
+      *s = ch;
+
+      while (*s && grub_isspace (*s))
+	s++;
+
+      if (*s)
+	errors += grub_script_argv_next (argv);
+    }
+  return errors;
+}
diff --git a/script/execute.c b/script/execute.c
index 573dab4cb..905f457d3 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -33,55 +33,172 @@
 /* Scope for grub script functions.  */
 struct grub_script_scope
 {
-  char **args;
-  unsigned int argc;
+  struct grub_script_argv argv;
 };
 static struct grub_script_scope *scope = 0;
 
-static char *
-grub_script_env_get (const char *name)
+static int
+grub_env_special (const char *name)
 {
-  char *p = 0;
-  unsigned long num = 0;
+  if (grub_isdigit (name[0]) ||
+      grub_strcmp (name, "#") == 0 ||
+      grub_strcmp (name, "*") == 0 ||
+      grub_strcmp (name, "@") == 0)
+    return 1;
+  return 0;
+}
 
-  if (! scope)
-    return grub_env_get (name);
+static char **
+grub_script_env_get (const char *name, grub_script_arg_type_t type)
+{
+  int errors = 0;
+  struct grub_script_argv result = { 0, 0 };
 
-  if (grub_isdigit (name[0]))
+  errors += grub_script_argv_next (&result);
+  if (! grub_env_special (name))
     {
-      num = grub_strtoul (name, &p, 10);
-      if (p && *p == '\0')
+      char *v = grub_env_get (name);
+      if (v && v[0])
 	{
-	  if (num == 0)
-	    return 0; /* XXX no file name, for now.  */
-
-	  return (num > scope->argc ? 0 : scope->args[num - 1]);
-	}
-      else
-	{
-	  grub_error (GRUB_ERR_BAD_ARGUMENT, "bad variabe name substitution");
-	  return 0;
+	  if (type == GRUB_SCRIPT_ARG_TYPE_VAR)
+	    errors += grub_script_argv_split_append (&result, v);
+	  else
+	    errors += grub_script_argv_append (&result, v);
 	}
     }
+  else if (! scope)
+    errors += grub_script_argv_append (&result, 0);
+
   else if (grub_strcmp (name, "#") == 0)
     {
-      static char buf[32]; /* Rewritten everytime.  */
-      grub_snprintf (buf, sizeof (buf), "%u", scope->argc);
-      return buf;
+      char buffer[ERRNO_DIGITS_MAX + 1];
+      grub_snprintf (buffer, sizeof (buffer), "%u", scope->argv.argc);
+      errors += grub_script_argv_append (&result, buffer);
+    }
+  else if (grub_strcmp (name, "*") == 0)
+    {
+      int i;
+
+      for (i = 0; ! errors && i < scope->argv.argc; i++)
+	if (type == GRUB_SCRIPT_ARG_TYPE_VAR)
+	  {
+	    if (i != 0)
+	      errors += grub_script_argv_next (&result);
+	    errors += grub_script_argv_split_append (&result,
+						     scope->argv.args[i]);
+	  }
+	else
+	  {
+	    if (i != 0)
+	      errors += grub_script_argv_append (&result, " ");
+	    errors += grub_script_argv_append (&result,
+					       scope->argv.args[i]);
+	  }
+    }
+  else if (grub_strcmp (name, "@") == 0)
+    {
+      int i;
+
+      for (i = 0; ! errors && i < scope->argv.argc; i++)
+	{
+	  if (i != 0)
+	    errors += grub_script_argv_next (&result);
+
+	  if (type == GRUB_SCRIPT_ARG_TYPE_VAR)
+	    errors += grub_script_argv_split_append (&result,
+						     scope->argv.args[i]);
+	  else
+	    errors += grub_script_argv_append (&result,
+					       scope->argv.args[i]);
+	}
     }
   else
-    return grub_env_get (name);
+    {
+      unsigned long num = grub_strtoul (name, 0, 10);
+      if (num == 0)
+	; /* XXX no file name, for now.  */
+
+      else if (num <= scope->argv.argc)
+	{
+	  if (type == GRUB_SCRIPT_ARG_TYPE_VAR)
+	    errors += grub_script_argv_split_append (&result,
+						     scope->argv.args[num - 1]);
+	  else
+	    errors += grub_script_argv_append (&result,
+					       scope->argv.args[num - 1]);
+	}
+    }
+  return result.args;
 }
 
 static grub_err_t
 grub_script_env_set (const char *name, const char *val)
 {
-  if (grub_isdigit (name[0]) || grub_strcmp (name, "#") == 0)
+  if (grub_env_special (name))
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad variable name");
 
   return grub_env_set (name, val);
 }
 
+/* Expand arguments in ARGLIST into multiple arguments.  */
+static int
+grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
+			     struct grub_script_argv *argv)
+{
+  int i;
+  int error = 0;
+  char **values = 0;
+  struct grub_script_arg *arg = 0;
+  struct grub_script_argv result = { 0, 0 };
+
+  for (; error == 0 && arglist && arglist->arg; arglist = arglist->next)
+    {
+      error += grub_script_argv_next (&result);
+
+      arg = arglist->arg;
+      while (arg)
+	{
+	  if (error)
+	    break;
+
+	  switch (arg->type)
+	    {
+	    case GRUB_SCRIPT_ARG_TYPE_VAR:
+	    case GRUB_SCRIPT_ARG_TYPE_DQVAR:
+	      values = grub_script_env_get (arg->str, arg->type);
+	      for (i = 0; values && values[i]; i++)
+		{
+		  if (i != 0)
+		    error += grub_script_argv_next (&result);
+		  error += grub_script_argv_append (&result, values[i]);
+		}
+	      grub_free (values);
+	      break;
+
+	    case GRUB_SCRIPT_ARG_TYPE_TEXT:
+	      if (grub_strlen (arg->str))
+		error += grub_script_argv_append (&result, arg->str);
+	      break;
+
+	    case GRUB_SCRIPT_ARG_TYPE_DQSTR:
+	    case GRUB_SCRIPT_ARG_TYPE_SQSTR:
+	      error += grub_script_argv_append (&result, arg->str);
+	      break;
+	    }
+	  arg = arg->next;
+	}
+    }
+
+  if (error)
+    return 1;
+
+  if (! result.args[result.argc - 1])
+    result.argc--;
+
+  *argv = result;
+  return 0;
+}
+
 static grub_err_t
 grub_script_execute_cmd (struct grub_script_cmd *cmd)
 {
@@ -98,151 +215,6 @@ grub_script_execute_cmd (struct grub_script_cmd *cmd)
   return ret;
 }
 
-#define ARG_ALLOCATION_UNIT  (32 * sizeof (char))
-#define ARGV_ALLOCATION_UNIT (8 * sizeof (void*))
-
-/* Expand arguments in ARGLIST into multiple arguments.  */
-char **
-grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *count)
-{
-  int i;
-  int oom;
-  int argc;
-  int empty;
-  char *ptr;
-  char **argv;
-  char *value;
-  struct grub_script_arg *arg;
-
-  auto void push (char *str);
-  void push (char *str)
-  {
-    char **p;
-
-    if (oom)
-      return;
-
-    p = grub_realloc (argv, ALIGN_UP (sizeof(char*) * (argc + 1), ARGV_ALLOCATION_UNIT));
-    if (!p)
-      oom = 1;
-    else
-      {
-	p[argc++] = str;
-	argv = p;
-      }
-  }
-
-  auto char* append (const char *str, grub_size_t nchar);
-  char* append (const char *str, grub_size_t nchar)
-  {
-    int len;
-    int old;
-    char *p;
-
-    if (oom || !str)
-      return 0;
-
-    len = nchar ?: grub_strlen (str);
-    old = argv[argc - 1] ? grub_strlen (argv[argc - 1]) : 0;
-    p = grub_realloc (argv[argc - 1], ALIGN_UP(old + len + 1, ARG_ALLOCATION_UNIT));
-
-    if (p)
-      {
-	grub_strncpy (p + old, str, len);
-	p[old + len] = '\0';
-      }
-    else
-      {
-	oom = 1;
-	grub_free (argv[argc - 1]);
-      }
-    argv[argc - 1] = p;
-    return argv[argc - 1];
-  }
-
-  /* Move *STR to the begining of next word, but return current word.  */
-  auto char* move_to_next (char **str);
-  char* move_to_next (char **str)
-  {
-    char *end;
-    char *start;
-
-    if (oom || !str || !*str)
-      return 0;
-
-    start = *str;
-    while (*start && grub_isspace (*start)) start++;
-    if (*start == '\0')
-      return 0;
-
-    end = start + 1;
-    while (*end && !grub_isspace (*end)) end++;
-
-    *str = end;
-    return start;
-  }
-
-  oom = 0;
-  argv = 0;
-  argc = 0;
-  push (0);
-  for (; arglist; arglist = arglist->next)
-    {
-      empty = 1;
-      arg = arglist->arg;
-      while (arg)
-	{
-	  switch (arg->type)
-	    {
-	    case GRUB_SCRIPT_ARG_TYPE_VAR:
-	      value = grub_script_env_get (arg->str);
-	      while (value && *value && (ptr = move_to_next(&value)))
-		{
-		  empty = 0;
-		  append (ptr, value - ptr);
-		  if (*value) push(0);
-		}
-	      break;
-
-	    case GRUB_SCRIPT_ARG_TYPE_TEXT:
-	      if (grub_strlen (arg->str) > 0)
-		{
-		  empty = 0;
-		  append (arg->str, 0);
-		}
-	      break;
-
-	    case GRUB_SCRIPT_ARG_TYPE_DQSTR:
-	    case GRUB_SCRIPT_ARG_TYPE_SQSTR:
-	      empty = 0;
-	      append (arg->str, 0);
-	      break;
-
-	    case GRUB_SCRIPT_ARG_TYPE_DQVAR:
-	      empty = 0;
-	      append (grub_script_env_get (arg->str), 0);
-	      break;
-	    }
-	  arg = arg->next;
-	}
-      if (!empty)
-	push (0);
-    }
-
-  if (oom)
-    {
-      for (i = 0; i < argc; i++)
-	grub_free (argv[i]);
-      grub_free (argv);
-      argv = 0;
-    }
-
-  if (argv)
-    *count = argc - 1;
-
-  return argv;
-}
-
 /* Execute a function call.  */
 grub_err_t
 grub_script_function_call (grub_script_function_t func, int argc, char **args)
@@ -251,8 +223,8 @@ grub_script_function_call (grub_script_function_t func, int argc, char **args)
   struct grub_script_scope *old_scope;
   struct grub_script_scope new_scope;
 
-  new_scope.argc = argc;
-  new_scope.args = args;
+  new_scope.argv.argc = argc;
+  new_scope.argv.args = args;
 
   old_scope = scope;
   scope = &new_scope;
@@ -268,21 +240,18 @@ grub_err_t
 grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 {
   struct grub_script_cmdline *cmdline = (struct grub_script_cmdline *) cmd;
-  char **args = 0;
-  int i = 0;
   grub_command_t grubcmd;
   grub_err_t ret = 0;
-  int argcount = 0;
   grub_script_function_t func = 0;
   char errnobuf[18];
   char *cmdname;
+  struct grub_script_argv argv = { 0, 0 };
 
   /* Lookup the command.  */
-  args = grub_script_execute_arglist_to_argv (cmdline->arglist, &argcount);
-  if (!args)
+  if (grub_script_arglist_to_argv (cmdline->arglist, &argv))
     return grub_errno;
 
-  cmdname = args[0];
+  cmdname = argv.args[0];
   grubcmd = grub_command_find (cmdname);
   if (! grubcmd)
     {
@@ -319,14 +288,12 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 
   /* Execute the GRUB command or function.  */
   if (grubcmd)
-    ret = (grubcmd->func) (grubcmd, argcount - 1, args + 1);
+    ret = (grubcmd->func) (grubcmd, argv.argc - 1, argv.args + 1);
   else
-    ret = grub_script_function_call (func, argcount - 1, args + 1);
+    ret = grub_script_function_call (func, argv.argc - 1, argv.args + 1);
 
   /* Free arguments.  */
-  for (i = 0; i < argcount; i++)
-    grub_free (args[i]);
-  grub_free (args);
+  grub_script_argv_free (&argv);
 
   if (grub_errno == GRUB_ERR_TEST_FAILURE)
     grub_errno = GRUB_ERR_NONE;
@@ -363,7 +330,7 @@ grub_script_execute_cmdif (struct grub_script_cmd *cmd)
   /* Check if the commands results in a true or a false.  The value is
      read from the env variable `?'.  */
   grub_script_execute_cmd (cmdif->exec_to_evaluate);
-  result = grub_script_env_get ("?");
+  result = grub_env_get ("?");
 
   grub_errno = GRUB_ERR_NONE;
 
@@ -381,23 +348,20 @@ grub_script_execute_cmdfor (struct grub_script_cmd *cmd)
 {
   int i;
   int result;
-  char **args;
-  int argcount;
+  struct grub_script_argv argv;
   struct grub_script_cmdfor *cmdfor = (struct grub_script_cmdfor *) cmd;
 
-  args = grub_script_execute_arglist_to_argv (cmdfor->words, &argcount);
-  if (!args)
+  if (grub_script_arglist_to_argv (cmdfor->words, &argv))
     return grub_errno;
 
   result = 0;
-  for (i = 0; i < argcount; i++)
+  for (i = 0; i < argv.argc; i++)
     {
-      grub_script_env_set (cmdfor->name->str, args[i]);
+      grub_script_env_set (cmdfor->name->str, argv.args[i]);
       result = grub_script_execute_cmd (cmdfor->list);
-      grub_free (args[i]);
     }
 
-  grub_free (args);
+  grub_script_argv_free (&argv);
   return result;
 }
 
@@ -426,26 +390,20 @@ grub_err_t
 grub_script_execute_menuentry (struct grub_script_cmd *cmd)
 {
   struct grub_script_cmd_menuentry *cmd_menuentry;
-  char **args = 0;
-  int argcount = 0;
-  int i = 0;
+  struct grub_script_argv argv = {0, 0};
 
   cmd_menuentry = (struct grub_script_cmd_menuentry *) cmd;
 
   if (cmd_menuentry->arglist)
     {
-      args = grub_script_execute_arglist_to_argv (cmd_menuentry->arglist, &argcount);
-      if (!args)
+      if (grub_script_arglist_to_argv (cmd_menuentry->arglist, &argv))
 	return grub_errno;
     }
 
-  grub_normal_add_menu_entry (argcount, (const char **) args,
+  grub_normal_add_menu_entry (argv.argc, (const char **) argv.args,
 			      cmd_menuentry->sourcecode);
 
-  /* Free arguments.  */
-  for (i = 0; i < argcount; i++)
-    grub_free (args[i]);
-  grub_free (args);
+  grub_script_argv_free (&argv);
 
   return grub_errno;
 }
diff --git a/script/yylex.l b/script/yylex.l
index f563ac30d..bfc53a6ff 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -119,7 +119,7 @@ DIGITS          [[:digit:]]+
 NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
 
 ESC             \\.
-SPECIAL        \?|\#
+SPECIAL         \?|\#|\*|\@
 VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|${SPECIAL}|$\{{SPECIAL}\}
 DQSTR           \"([^\\\"]|{ESC})*\"
 SQSTR           \'[^\']*\'
diff --git a/tests/grub_script_echo1.in b/tests/grub_script_echo1.in
index 048907a76..554dd68ed 100644
--- a/tests/grub_script_echo1.in
+++ b/tests/grub_script_echo1.in
@@ -16,6 +16,33 @@
 # You should have received a copy of the GNU General Public License
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
+# simple arguments
+echo one two three
+echo "one two three"
+echo 'one two three'
+
+# empty arguments
+echo a "" b
+echo a '' b
+
+echo a $foo b
+echo a ${foo} b
+
+echo a "$foo" b
+echo a "${foo}" b
+
+# multi-part arguments
+echo one"two"three
+echo one${two}three
+echo one"two"$three
+
+echo one'two'three
+echo one${two}three
+echo one'two'$three
+
+echo one'two'three"four"five${six}seven$eight
+
+
 foo=bar
 echo $foo ${foo}
 echo "$foo" "${foo}"
diff --git a/tests/grub_script_functions.in b/tests/grub_script_functions.in
index 41af87474..234a1be13 100644
--- a/tests/grub_script_functions.in
+++ b/tests/grub_script_functions.in
@@ -18,7 +18,7 @@
 
 echo parameter count
 function fcount {
-  echo "$#"
+  echo fcount "$#"
 }
 
 fcount
@@ -27,7 +27,7 @@ fcount a b
 
 echo parameter count, with nesting
 function ffcount {
-  echo "$#"
+  echo ffcount "$#"
   fcount
   fcount a
   fcount a b
@@ -39,9 +39,9 @@ ffcount 1 2
 
 echo parameters
 function fparam {
-  echo 1 $1
-  echo 2 $2
-  echo 3 $3
+  echo fparam 1 $1
+  echo fparam 2 $2
+  echo fparam 3 $3
 }
 
 fparam
@@ -50,9 +50,9 @@ fparam a b
 
 echo parameters, with nesting
 function ffparam {
-  echo 1 $1
-  echo 2 $2
-  echo 3 $3
+  echo ffparam 1 $1
+  echo ffparam 2 $2
+  echo ffparam 3 $3
   fparam
   fparam a
   fparam a b
@@ -61,3 +61,57 @@ function ffparam {
 ffparam
 ffparam 1
 ffparam 1 2
+
+echo parameter expansion with specials
+function fstar {
+  for f in $*
+  do
+    echo fstar $f
+  done
+}
+
+fstar
+fstar a
+fstar a "1 2"
+fstar a "1 2" b
+
+function fdqstar {
+  for f in "$*"
+  do
+    echo fdqstar $f
+  done
+}
+
+fdqstar
+fdqstar a
+fdqstar a "1 2"
+fdqstar a "1 2" b
+
+function fat {
+  for f in $@
+  do
+    echo fat $f
+  done
+}
+
+fat
+fat a
+fat a "1 2"
+fat a "1 2" b
+fat a "1 2" b "c d"
+fat a "1 2" b "c d" e
+
+function fdqat {
+  for f in "$@"
+  do
+    echo fdqat $f
+  done
+}
+
+# fdqat # this case needs special handling, lets ignore till we really need it.
+fdqat a
+fdqat a "1 2"
+fdqat a "1 2" b
+fdqat a "1 2" b "c d"
+fdqat a "1 2" b "c d" e
+
diff --git a/tests/grub_script_vars1.in b/tests/grub_script_vars1.in
index 9ff897627..77b3cf298 100644
--- a/tests/grub_script_vars1.in
+++ b/tests/grub_script_vars1.in
@@ -28,7 +28,7 @@ foo=foo
 echo "" $foo
 
 echo $bar $foo
- 
+
 bar=""
 echo $bar $foo
 

From d13f69de73b15e7034c2ab110f3742bafbe2bf79 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 12 May 2010 10:45:22 +0530
Subject: [PATCH 0952/1628] handle failure case

---
 script/execute.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/script/execute.c b/script/execute.c
index 905f457d3..5200b04a7 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -128,6 +128,13 @@ grub_script_env_get (const char *name, grub_script_arg_type_t type)
 					       scope->argv.args[num - 1]);
 	}
     }
+
+  if (errors)
+    {
+      grub_script_argv_free (&result);
+      return 0;
+    }
+
   return result.args;
 }
 

From 53018ca6c361f6975eaa92aea3777144b7e04b66 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 12 May 2010 13:12:49 +0530
Subject: [PATCH 0953/1628] minor fix

---
 script/execute.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/execute.c b/script/execute.c
index 5200b04a7..2040be13c 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -285,7 +285,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 	  grub_free (assign);
 
 	  grub_snprintf (errnobuf, sizeof (errnobuf), "%d", grub_errno);
-	  grub_script_env_set ("?", errnobuf);
+	  grub_env_set ("?", errnobuf);
 
 	  grub_print_error ();
 

From 04888e878791894927261c4a8dc34ed44b27b37d Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 12 May 2010 13:53:50 +0530
Subject: [PATCH 0954/1628] few more testcases added

---
 tests/grub_script_functions.in | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/tests/grub_script_functions.in b/tests/grub_script_functions.in
index 234a1be13..3e69014d6 100644
--- a/tests/grub_script_functions.in
+++ b/tests/grub_script_functions.in
@@ -68,6 +68,11 @@ function fstar {
   do
     echo fstar $f
   done
+
+  for f in aaa$*bbb
+  do
+    echo fstar $f
+  done
 }
 
 fstar
@@ -80,6 +85,16 @@ function fdqstar {
   do
     echo fdqstar $f
   done
+
+  for f in aaa"$*"bbb
+  do
+    echo fdqstar $f
+  done
+
+  for f in "aaa$*bbb"
+  do
+    echo fdqstar $f
+  done
 }
 
 fdqstar
@@ -92,6 +107,11 @@ function fat {
   do
     echo fat $f
   done
+
+  for f in aaa$@bbb
+  do
+    echo fat $f
+  done
 }
 
 fat
@@ -106,6 +126,16 @@ function fdqat {
   do
     echo fdqat $f
   done
+
+  for f in aaa"$@"bbb
+  do
+    echo fdqat $f
+  done
+
+  for f in "aaa$@bbb"
+  do
+    echo fdqat $f
+  done
 }
 
 # fdqat # this case needs special handling, lets ignore till we really need it.

From b4cd82945a8f2ce728e160c316fb4d1b79c7c330 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 12 May 2010 17:43:49 +0530
Subject: [PATCH 0955/1628] minor fix

---
 script/execute.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/script/execute.c b/script/execute.c
index d83f51914..d2e8753c3 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -47,9 +47,6 @@ grub_script_cmd_shift (grub_command_t cmd __attribute__((unused)),
   if (! scope)
     return GRUB_ERR_NONE;
 
-  if (scope->argv.argc == 0)
-    return GRUB_ERR_NONE;
-
   if (argc == 0)
     n = 1;
 
@@ -59,10 +56,13 @@ grub_script_cmd_shift (grub_command_t cmd __attribute__((unused)),
   else
     {
       n = grub_strtoul (argv[0], &p, 10);
-      if (*p != '\0' || n > scope->argv.argc)
+      if (*p != '\0')
 	return GRUB_ERR_BAD_ARGUMENT;
     }
 
+  if (n > scope->argv.argc)
+    return GRUB_ERR_BAD_ARGUMENT;
+
   scope->argv.argc -= n;
   scope->argv.args += n;
   return GRUB_ERR_NONE;

From 7b252ac27c439528e54f9c127d912b3afad76b64 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 12 May 2010 17:46:49 +0530
Subject: [PATCH 0956/1628] few more testcases

---
 tests/grub_script_shift.in | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/grub_script_shift.in b/tests/grub_script_shift.in
index c7c94ab18..785b9c396 100644
--- a/tests/grub_script_shift.in
+++ b/tests/grub_script_shift.in
@@ -17,8 +17,12 @@
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
 function f1 {
+  echo f1 '$@' $@
+  echo f1 '$*' $*
   echo f1 $# $1 $2 $3
   shift
+  echo f1 '$@' $@
+  echo f1 '$*' $*
   echo f1 $# $1 $2 $3
 }
 
@@ -30,8 +34,12 @@ f1 a b c d
 f1 a b c d e
 
 function f2 {
+  echo f1 '$@' $@
+  echo f1 '$*' $*
   echo f2 $# $1 $2 $3
   shift 1
+  echo f1 '$@' $@
+  echo f1 '$*' $*
   echo f2 $# $1 $2 $3
 }
 
@@ -43,8 +51,12 @@ f2 a b c d
 f2 a b c d e
 
 function f3 {
+  echo f1 '$@' $@
+  echo f1 '$*' $*
   echo f3 $# $1 $2 $3
   shift 3
+  echo f1 '$@' $@
+  echo f1 '$*' $*
   echo f3 $# $1 $2 $3
 }
 
@@ -56,8 +68,12 @@ f3 a b c d
 f3 a b c d e
 
 function f4 {
+  echo f1 '$@' $@
+  echo f1 '$*' $*
   echo f4 $# $1 $2 $3
   shift 100
+  echo f1 '$@' $@
+  echo f1 '$*' $*
   echo f4 $# $1 $2 $3
 }
 

From cced9145fcb1005dfde437b5f835ecfb924477eb Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 13 May 2010 03:56:14 +0200
Subject: [PATCH 0957/1628] =?UTF-8?q?=09Fix=20gfxmenu=20crash.=20=09Report?=
 =?UTF-8?q?ed=20by:=20Thorsten=20Gr=C3=BCtzmacher.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* gfxmenu/gui_circular_progress.c (circprog_destroy): Unregister
	timeout hook.
	(circprog_set_property): Register and unregister timeout hook.
	* gfxmenu/gui_label.c (grub_gui_label): New fields template and value.
	(label_destroy): Free template. and unregister hook.
	(label_set_state): New function.
	(label_set_property): Handle templates and hooks.
	* gfxmenu/gui_progress_bar.c (progress_bar_destroy): Unregister
	timeout hook.
	(progress_bar_set_property): Register and unregister timeout hook.
	* gfxmenu/view.c (TIMEOUT_COMPONENT_ID): Move from here ...
	* include/grub/gui.h (GRUB_GFXMENU_TIMEOUT_COMPONENT_ID): ...to here
	* gfxmenu/view.c (grub_gfxmenu_timeout_notifications): New variable.
	(update_timeout_visit): Removed.
	(update_timeouts): New function.
	(redraw_timeouts): Likewise.
	(grub_gfxmenu_print_timeout): Use update_timeouts and redraw_timeouts.
	(grub_gfxmenu_clear_timeout): Likewise.
	* include/grub/gui.h (grub_gfxmenu_set_state_t): New type.
	(grub_gfxmenu_timeout_notify): Likewise.
	(grub_gfxmenu_timeout_notifications): New external variable.
	(grub_gfxmenu_timeout_register): New function.
	(grub_gfxmenu_timeout_unregister): Likewise.
---
 ChangeLog                       | 29 +++++++++++
 gfxmenu/gui_circular_progress.c | 28 ++++++-----
 gfxmenu/gui_label.c             | 32 +++++++++++-
 gfxmenu/gui_progress_bar.c      |  7 +++
 gfxmenu/view.c                  | 87 ++++++++++-----------------------
 include/grub/gui.h              | 45 +++++++++++++++++
 6 files changed, 155 insertions(+), 73 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a388738cb..78eebc11b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2010-05-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Fix gfxmenu crash.
+	Reported by: Thorsten Grützmacher.
+
+	* gfxmenu/gui_circular_progress.c (circprog_destroy): Unregister
+	timeout hook.
+	(circprog_set_property): Register and unregister timeout hook.
+	* gfxmenu/gui_label.c (grub_gui_label): New fields template and value.
+	(label_destroy): Free template. and unregister hook.
+	(label_set_state): New function.
+	(label_set_property): Handle templates and hooks.
+	* gfxmenu/gui_progress_bar.c (progress_bar_destroy): Unregister
+	timeout hook.
+	(progress_bar_set_property): Register and unregister timeout hook.
+	* gfxmenu/view.c (TIMEOUT_COMPONENT_ID): Move from here ...
+	* include/grub/gui.h (GRUB_GFXMENU_TIMEOUT_COMPONENT_ID): ...to here
+	* gfxmenu/view.c (grub_gfxmenu_timeout_notifications): New variable.
+	(update_timeout_visit): Removed.
+	(update_timeouts): New function.
+	(redraw_timeouts): Likewise.
+	(grub_gfxmenu_print_timeout): Use update_timeouts and redraw_timeouts.
+	(grub_gfxmenu_clear_timeout): Likewise.
+	* include/grub/gui.h (grub_gfxmenu_set_state_t): New type.
+	(grub_gfxmenu_timeout_notify): Likewise.
+	(grub_gfxmenu_timeout_notifications): New external variable.
+	(grub_gfxmenu_timeout_register): New function.
+	(grub_gfxmenu_timeout_unregister): Likewise.
+
 2010-05-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Transform (broken) vga terminal into (working) vga video driver.
diff --git a/gfxmenu/gui_circular_progress.c b/gfxmenu/gui_circular_progress.c
index 9a859ee2e..098ae1c92 100644
--- a/gfxmenu/gui_circular_progress.c
+++ b/gfxmenu/gui_circular_progress.c
@@ -54,6 +54,7 @@ static void
 circprog_destroy (void *vself)
 {
   circular_progress_t self = vself;
+  grub_gfxmenu_timeout_unregister ((grub_gui_component_t) self);
   grub_free (self);
 }
 
@@ -211,6 +212,17 @@ circprog_get_bounds (void *vself, grub_video_rect_t *bounds)
   *bounds = self->bounds;
 }
 
+static void
+circprog_set_state (void *vself, int visible, int start,
+		    int current, int end)
+{
+  circular_progress_t self = vself;  
+  self->visible = visible;
+  self->start = start;
+  self->value = current;
+  self->end = end;
+}
+
 static grub_err_t
 circprog_set_property (void *vself, const char *name, const char *value)
 {
@@ -247,26 +259,20 @@ circprog_set_property (void *vself, const char *name, const char *value)
     }
   else if (grub_strcmp (name, "id") == 0)
     {
+      grub_gfxmenu_timeout_unregister ((grub_gui_component_t) self);
       grub_free (self->id);
       if (value)
         self->id = grub_strdup (value);
       else
         self->id = 0;
+      if (self->id && grub_strcmp (self->id, GRUB_GFXMENU_TIMEOUT_COMPONENT_ID)
+	  == 0)
+	grub_gfxmenu_timeout_register ((grub_gui_component_t) self,
+				       circprog_set_state);
     }
   return grub_errno;
 }
 
-static void
-circprog_set_state (void *vself, int visible, int start,
-		    int current, int end)
-{
-  circular_progress_t self = vself;  
-  self->visible = visible;
-  self->start = start;
-  self->value = current;
-  self->end = end;
-}
-
 static struct grub_gui_component_ops circprog_ops =
 {
   .destroy = circprog_destroy,
diff --git a/gfxmenu/gui_label.c b/gfxmenu/gui_label.c
index a9dd575ac..15a352f84 100644
--- a/gfxmenu/gui_label.c
+++ b/gfxmenu/gui_label.c
@@ -46,8 +46,10 @@ struct grub_gui_label
   char *id;
   int visible;
   char *text;
+  char *template;
   grub_font_t font;
   grub_gui_color_t color;
+  int value;
   enum align_mode align;
 };
 
@@ -57,7 +59,9 @@ static void
 label_destroy (void *vself)
 {
   grub_gui_label_t self = vself;
+  grub_gfxmenu_timeout_unregister ((grub_gui_component_t) self);
   grub_free (self->text);
+  grub_free (self->template);
   grub_free (self);
 }
 
@@ -146,6 +150,17 @@ label_get_minimal_size (void *vself, unsigned *width, unsigned *height)
              + grub_font_get_descent (self->font));
 }
 
+static void
+label_set_state (void *vself, int visible, int start __attribute__ ((unused)),
+		 int current, int end __attribute__ ((unused)))
+{
+  grub_gui_label_t self = vself;  
+  self->value = -current;
+  self->visible = visible;
+  grub_free (self->text);
+  self->text = grub_xasprintf (self->template ? : "%d", self->value);
+}
+
 static grub_err_t
 label_set_property (void *vself, const char *name, const char *value)
 {
@@ -153,9 +168,17 @@ label_set_property (void *vself, const char *name, const char *value)
   if (grub_strcmp (name, "text") == 0)
     {
       grub_free (self->text);
+      grub_free (self->template);
       if (! value)
-        value = "";
-      self->text = grub_strdup (value);
+	{
+	  self->template = NULL;
+	  self->text = grub_strdup ("");
+	}
+      else
+	{
+	  self->template = grub_strdup (value);
+	  self->text = grub_xasprintf (value, self->value);
+	}
     }
   else if (grub_strcmp (name, "font") == 0)
     {
@@ -183,11 +206,16 @@ label_set_property (void *vself, const char *name, const char *value)
     }
   else if (grub_strcmp (name, "id") == 0)
     {
+      grub_gfxmenu_timeout_unregister ((grub_gui_component_t) self);
       grub_free (self->id);
       if (value)
         self->id = grub_strdup (value);
       else
         self->id = 0;
+      if (self->id && grub_strcmp (self->id, GRUB_GFXMENU_TIMEOUT_COMPONENT_ID)
+	  == 0)
+	grub_gfxmenu_timeout_register ((grub_gui_component_t) self,
+				       label_set_state);
     }
   return GRUB_ERR_NONE;
 }
diff --git a/gfxmenu/gui_progress_bar.c b/gfxmenu/gui_progress_bar.c
index d786aae31..e1b31794f 100644
--- a/gfxmenu/gui_progress_bar.c
+++ b/gfxmenu/gui_progress_bar.c
@@ -60,6 +60,7 @@ static void
 progress_bar_destroy (void *vself)
 {
   grub_gui_progress_bar_t self = vself;
+  grub_gfxmenu_timeout_unregister ((grub_gui_component_t) self);
   grub_free (self);
 }
 
@@ -333,11 +334,16 @@ progress_bar_set_property (void *vself, const char *name, const char *value)
     }
   else if (grub_strcmp (name, "id") == 0)
     {
+      grub_gfxmenu_timeout_unregister ((grub_gui_component_t) self);
       grub_free (self->id);
       if (value)
         self->id = grub_strdup (value);
       else
         self->id = 0;
+      /*      if (self->id && grub_strcmp (self->id, GRUB_GFXMENU_TIMEOUT_COMPONENT_ID)
+	      == 0)*/
+	grub_gfxmenu_timeout_register ((grub_gui_component_t) self,
+				       progress_bar_set_state);
     }
   return grub_errno;
 }
@@ -368,6 +374,7 @@ grub_gui_progress_bar_new (void)
   self = grub_zalloc (sizeof (*self));
   if (! self)
     return 0;
+
   self->progress.ops = &progress_bar_pb_ops;
   self->progress.component.ops = &progress_bar_ops;
   self->visible = 1;
diff --git a/gfxmenu/view.c b/gfxmenu/view.c
index bf637a96d..9a5671cdd 100644
--- a/gfxmenu/view.c
+++ b/gfxmenu/view.c
@@ -37,10 +37,6 @@
 #include <grub/gui_string_util.h>
 #include <grub/icon_manager.h>
 
-/* The component ID identifying GUI components to be updated as the timeout
-   status changes.  */
-#define TIMEOUT_COMPONENT_ID "__timeout__"
-
 static void
 init_terminal (grub_gfxmenu_view_t view);
 static grub_video_rect_t term_rect;
@@ -166,16 +162,28 @@ struct progress_value_data
   int value;
 };
 
-static void
-update_timeout_visit (grub_gui_component_t component,
-                      void *userdata)
-{
-  struct progress_value_data *pv;
-  pv = (struct progress_value_data *) userdata;
+struct grub_gfxmenu_timeout_notify *grub_gfxmenu_timeout_notifications;
 
-  ((struct grub_gui_progress *) component)->ops
-    ->set_state ((struct grub_gui_progress *) component,
-		 pv->visible, pv->start, pv->value, pv->end);
+static void
+update_timeouts (int visible, int start, int value, int end)
+{
+  struct grub_gfxmenu_timeout_notify *cur;
+
+  for (cur = grub_gfxmenu_timeout_notifications; cur; cur = cur->next)
+    cur->set_state (cur->self, visible, start, value, end);
+}
+
+static void
+redraw_timeouts (struct grub_gfxmenu_view *view)
+{
+  struct grub_gfxmenu_timeout_notify *cur;
+
+  for (cur = grub_gfxmenu_timeout_notifications; cur; cur = cur->next)
+    {
+      grub_video_rect_t bounds;
+      cur->self->ops->get_bounds (cur->self, &bounds);
+      grub_gfxmenu_view_redraw (view, &bounds);
+    }
 }
 
 void 
@@ -183,67 +191,26 @@ grub_gfxmenu_print_timeout (int timeout, void *data)
 {
   struct grub_gfxmenu_view *view = data;
 
-  struct progress_value_data pv;
-
-  auto void redraw_timeout_visit (grub_gui_component_t component,
-				  void *userdata __attribute__ ((unused)));
-
-  auto void redraw_timeout_visit (grub_gui_component_t component,
-				  void *userdata __attribute__ ((unused)))
-  {
-    grub_video_rect_t bounds;
-    component->ops->get_bounds (component, &bounds);
-    grub_gfxmenu_view_redraw (view, &bounds);
-  }
-
   if (view->first_timeout == -1)
     view->first_timeout = timeout;
 
-  pv.visible = 1;
-  pv.start = -(view->first_timeout + 1);
-  pv.end = 0;
-  pv.value = -timeout;
-
-  grub_gui_find_by_id ((grub_gui_component_t) view->canvas,
-                       TIMEOUT_COMPONENT_ID, update_timeout_visit, &pv);
-  grub_gui_find_by_id ((grub_gui_component_t) view->canvas,
-		       TIMEOUT_COMPONENT_ID, redraw_timeout_visit, &pv);
+  update_timeouts (1, -(view->first_timeout + 1), -timeout, 0);
+  redraw_timeouts (view);
   grub_video_swap_buffers ();
   if (view->double_repaint)
-    grub_gui_find_by_id ((grub_gui_component_t) view->canvas,
-			 TIMEOUT_COMPONENT_ID, redraw_timeout_visit, &pv);
+    redraw_timeouts (view);
 }
 
 void 
 grub_gfxmenu_clear_timeout (void *data)
 {
-  struct progress_value_data pv;
   struct grub_gfxmenu_view *view = data;
 
-  auto void redraw_timeout_visit (grub_gui_component_t component,
-				  void *userdata __attribute__ ((unused)));
-
-  auto void redraw_timeout_visit (grub_gui_component_t component,
-				  void *userdata __attribute__ ((unused)))
-  {
-    grub_video_rect_t bounds;
-    component->ops->get_bounds (component, &bounds);
-    grub_gfxmenu_view_redraw (view, &bounds);
-  }
-
-  pv.visible = 0;
-  pv.start = 1;
-  pv.end = 0;
-  pv.value = 0;
-
-  grub_gui_find_by_id ((grub_gui_component_t) view->canvas,
-                       TIMEOUT_COMPONENT_ID, update_timeout_visit, &pv);
-  grub_gui_find_by_id ((grub_gui_component_t) view->canvas,
-		       TIMEOUT_COMPONENT_ID, redraw_timeout_visit, &pv);
+  update_timeouts (0, 1, 0, 0);
+  redraw_timeouts (view);
   grub_video_swap_buffers ();
   if (view->double_repaint)
-    grub_gui_find_by_id ((grub_gui_component_t) view->canvas,
-			 TIMEOUT_COMPONENT_ID, redraw_timeout_visit, &pv);
+    redraw_timeouts (view);
 }
 
 static void
diff --git a/include/grub/gui.h b/include/grub/gui.h
index 7bd71acd3..6e4a11cbe 100644
--- a/include/grub/gui.h
+++ b/include/grub/gui.h
@@ -22,10 +22,15 @@
 #include <grub/video.h>
 #include <grub/bitmap.h>
 #include <grub/gfxmenu_view.h>
+#include <grub/mm.h>
 
 #ifndef GRUB_GUI_H
 #define GRUB_GUI_H 1
 
+/* The component ID identifying GUI components to be updated as the timeout
+   status changes.  */
+#define GRUB_GFXMENU_TIMEOUT_COMPONENT_ID "__timeout__"
+
 /* A representation of a color.  Unlike grub_video_color_t, this
    representation is independent of any video mode specifics.  */
 typedef struct grub_gui_color
@@ -79,6 +84,46 @@ struct grub_gui_progress_ops
   void (*set_state) (void *self, int visible, int start, int current, int end);
 };
 
+typedef void (*grub_gfxmenu_set_state_t) (void *self, int visible, int start,
+					  int current, int end);
+
+struct grub_gfxmenu_timeout_notify
+{
+  struct grub_gfxmenu_timeout_notify *next;
+  grub_gfxmenu_set_state_t set_state;
+  grub_gui_component_t self;
+};
+
+extern struct grub_gfxmenu_timeout_notify *grub_gfxmenu_timeout_notifications;
+
+static inline grub_err_t
+grub_gfxmenu_timeout_register (grub_gui_component_t self,
+			       grub_gfxmenu_set_state_t set_state)
+{
+  struct grub_gfxmenu_timeout_notify *ne = grub_malloc (sizeof (*ne));
+  if (!ne)
+    return grub_errno;
+  ne->set_state = set_state;
+  ne->self = self;
+  ne->next = grub_gfxmenu_timeout_notifications;
+  grub_gfxmenu_timeout_notifications = ne;
+  return GRUB_ERR_NONE;
+}
+
+static inline void
+grub_gfxmenu_timeout_unregister (grub_gui_component_t self)
+{
+  struct grub_gfxmenu_timeout_notify **p, *q;
+
+  for (p = &grub_gfxmenu_timeout_notifications, q = *p;
+       q; p = &(q->next), q = q->next)
+    if (q->self == self)
+      {
+	*p = q->next;
+	break;
+      }
+}
+
 typedef signed grub_fixed_signed_t;
 #define GRUB_FIXED_1 0x10000
 

From 65ce0931d0a8ef08395b2174f2e16914b2528b7e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 13 May 2010 14:42:22 +0200
Subject: [PATCH 0958/1628] Fix inconsistent grub_efiemu_finish_boot_services
 return type

---
 efiemu/mm.c                  | 19 +++++++++++++++++++
 include/grub/efiemu/efiemu.h | 10 +++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/efiemu/mm.c b/efiemu/mm.c
index 4b293606f..de7d309be 100644
--- a/efiemu/mm.c
+++ b/efiemu/mm.c
@@ -323,6 +323,25 @@ grub_efiemu_get_memory_map (grub_efi_uintn_t *memory_map_size,
   return 1;
 }
 
+grub_err_t
+grub_efiemu_finish_boot_services (grub_efi_uintn_t *memory_map_size,
+				  grub_efi_memory_descriptor_t *memory_map,
+				  grub_efi_uintn_t *map_key,
+				  grub_efi_uintn_t *descriptor_size,
+				  grub_efi_uint32_t *descriptor_version)
+{
+  int val = grub_efiemu_get_memory_map (memory_map_size,
+					memory_map, map_key,
+					descriptor_size,
+					descriptor_version);
+  if (val == 1)
+    return GRUB_ERR_NONE;
+  if (val == -1)
+    return grub_errno;
+  return grub_error (GRUB_ERR_IO, "memory map buffer is too small");
+}
+
+
 /* Free everything */
 grub_err_t
 grub_efiemu_mm_unload (void)
diff --git a/include/grub/efiemu/efiemu.h b/include/grub/efiemu/efiemu.h
index fb1b69751..56d4ea8ee 100644
--- a/include/grub/efiemu/efiemu.h
+++ b/include/grub/efiemu/efiemu.h
@@ -217,7 +217,15 @@ int grub_efiemu_get_memory_map (grub_efi_uintn_t *memory_map_size,
 				grub_efi_uintn_t *map_key,
 				grub_efi_uintn_t *descriptor_size,
 				grub_efi_uint32_t *descriptor_version);
-#define grub_efiemu_finish_boot_services grub_efiemu_get_memory_map
+
+
+grub_err_t
+grub_efiemu_finish_boot_services (grub_efi_uintn_t *memory_map_size,
+				  grub_efi_memory_descriptor_t *memory_map,
+				  grub_efi_uintn_t *map_key,
+				  grub_efi_uintn_t *descriptor_size,
+				  grub_efi_uint32_t *descriptor_version);
+
 grub_err_t
 grub_efiemu_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
 							grub_uint64_t,

From 94bf3dd564d4bd4aaebfb69159efb1499fc5a351 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 16 May 2010 01:32:07 +0200
Subject: [PATCH 0959/1628] somewhat working video_cirrus implementation

---
 conf/i386.rmk        |   5 +
 include/grub/video.h |   3 +-
 video/cirrus.c       | 538 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 545 insertions(+), 1 deletion(-)
 create mode 100644 video/cirrus.c

diff --git a/conf/i386.rmk b/conf/i386.rmk
index 02ce39817..ce5d42f0f 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -15,6 +15,11 @@ vga_text_mod_SOURCES = term/i386/pc/vga_text.c term/i386/vga_common.c
 vga_text_mod_CFLAGS = $(COMMON_CFLAGS)
 vga_text_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += video_cirrus.mod
+video_cirrus_mod_SOURCES = video/cirrus.c
+video_cirrus_mod_CFLAGS = $(COMMON_CFLAGS)
+video_cirrus_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 pkglib_MODULES += relocator.mod
 relocator_mod_SOURCES = lib/i386/relocator.c lib/i386/relocator_asm.S lib/i386/relocator_backward.S
 relocator_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/include/grub/video.h b/include/grub/video.h
index 5fd7e0c47..08ee54938 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -182,7 +182,8 @@ typedef enum grub_video_driver_id
     GRUB_VIDEO_DRIVER_EFI_UGA,
     GRUB_VIDEO_DRIVER_EFI_GOP,
     GRUB_VIDEO_DRIVER_SM712,
-    GRUB_VIDEO_DRIVER_VGA
+    GRUB_VIDEO_DRIVER_VGA,
+    GRUB_VIDEO_DRIVER_CIRRUS
   } grub_video_driver_id_t;
 
 struct grub_video_adapter
diff --git a/video/cirrus.c b/video/cirrus.c
new file mode 100644
index 000000000..ae1bd9940
--- /dev/null
+++ b/video/cirrus.c
@@ -0,0 +1,538 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2005,2006,2007,2008,2009,2010  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/>.
+ */
+
+#define grub_video_render_target grub_video_fbrender_target
+
+#include <grub/err.h>
+#include <grub/types.h>
+#include <grub/dl.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/video.h>
+#include <grub/video_fb.h>
+#include <grub/pci.h>
+
+static struct
+{
+  struct grub_video_mode_info mode_info;
+  struct grub_video_render_target *render_target;
+
+  grub_uint8_t *ptr;
+  int mapped;
+  grub_uint32_t base;
+  grub_pci_device_t dev;
+} framebuffer;
+
+#define CIRRUS_APERTURE_SIZE 0x200000
+
+#define GR_INDEX 0x3ce
+#define GR_DATA 0x3cf
+#define CR_INDEX 0x3d4
+#define CR_DATA 0x3d5
+#define SR_INDEX 0x3c4
+#define SR_DATA 0x3c5
+
+#define CIRRUS_MAX_WIDTH 0x800
+#define CIRRUS_WIDTH_DIVISOR 8
+#define CIRRUS_MAX_HEIGHT 0x800
+#define CIRRUS_MAX_PITCH (0x1ff * CIRRUS_WIDTH_DIVISOR)
+
+enum
+  {
+    CIRRUS_GR_MODE = 5,
+    CIRRUS_GR_GR6 = 6,
+    CIRRUS_GR_MAX
+  };
+
+#define CIRRUS_GR_GR6_GRAPHICS_MODE 1
+
+#define CIRRUS_GR_MODE_256_COLOR 0x40
+#define CIRRUS_GR_MODE_READ_MODE1 0x08
+
+enum
+  {
+    CIRRUS_CR_WIDTH = 0x01,
+    CIRRUS_CR_OVERFLOW = 0x07,
+    CIRRUS_CR_CELL_HEIGHT = 0x09,
+    CIRRUS_CR_VSYNC_END = 0x11,
+    CIRRUS_CR_HEIGHT = 0x12,
+    CIRRUS_CR_PITCH = 0x13,
+    CIRRUS_CR_MODE = 0x17,
+    CIRRUS_CR_LINE_COMPARE = 0x18,
+    CIRRUS_CR_EXTENDED_DISPLAY = 0x1b,
+    CIRRUS_CR_MAX
+  };
+
+#define CIRRUS_CR_CELL_HEIGHT_LINE_COMPARE_MASK 0x40
+#define CIRRUS_CR_CELL_HEIGHT_LINE_COMPARE_SHIFT 3
+
+#define CIRRUS_CR_OVERFLOW_HEIGHT1_SHIFT 7
+#define CIRRUS_CR_OVERFLOW_HEIGHT1_MASK 0x02
+#define CIRRUS_CR_OVERFLOW_HEIGHT2_SHIFT 3
+#define CIRRUS_CR_OVERFLOW_HEIGHT2_MASK 0xc0
+#define CIRRUS_CR_OVERFLOW_LINE_COMPARE_MASK 0x10
+#define CIRRUS_CR_OVERFLOW_LINE_COMPARE_SHIFT 4
+
+#define CIRRUS_CR_EXTENDED_DISPLAY_PITCH_MASK 0x10
+#define CIRRUS_CR_EXTENDED_DISPLAY_PITCH_SHIFT 4
+
+#define CIRRUS_CR_MODE_TIMING_ENABLE 0x80
+#define CIRRUS_CR_MODE_BYTE_MODE 0x40
+#define CIRRUS_CR_MODE_NO_HERCULES 0x02
+#define CIRRUS_CR_MODE_NO_CGA 0x01
+
+enum
+  {
+    CIRRUS_SR_MEMORY_MODE = 4,
+    CIRRUS_SR_EXTENDED_MODE = 7,
+    CIRRUS_SR_MAX
+  };
+#define CIRRUS_SR_MEMORY_MODE_CHAIN4 8
+#define CIRRUS_SR_MEMORY_MODE_NORMAL 0
+#define CIRRUS_SR_EXTENDED_MODE_LFB_ENABLE 0xf0
+#define CIRRUS_SR_EXTENDED_MODE_ENABLE_EXT 0x01
+#define CIRRUS_SR_EXTENDED_MODE_24BPP      0x04
+#define CIRRUS_SR_EXTENDED_MODE_16BPP      0x06
+#define CIRRUS_SR_EXTENDED_MODE_32BPP      0x08
+
+static void
+gr_write (grub_uint8_t val, grub_uint8_t addr)
+{
+  grub_outb (addr, GR_INDEX);
+  grub_outb (val, GR_DATA);
+}
+
+static grub_uint8_t
+gr_read (grub_uint8_t addr)
+{
+  grub_outb (addr, GR_INDEX);
+  return grub_inb (GR_DATA);
+}
+
+static void
+cr_write (grub_uint8_t val, grub_uint8_t addr)
+{
+  grub_outb (addr, CR_INDEX);
+  grub_outb (val, CR_DATA);
+}
+
+static grub_uint8_t
+cr_read (grub_uint8_t addr)
+{
+  grub_outb (addr, CR_INDEX);
+  return grub_inb (CR_DATA);
+}
+
+static void
+sr_write (grub_uint8_t val, grub_uint8_t addr)
+{
+  grub_outb (addr, SR_INDEX);
+  grub_outb (val, SR_DATA);
+}
+
+static grub_uint8_t
+sr_read (grub_uint8_t addr)
+{
+  grub_outb (addr, SR_INDEX);
+  return grub_inb (SR_DATA);
+}
+
+static void
+write_hidden_dac (grub_uint8_t data)
+{
+  grub_inb (0x3c8);
+  grub_inb (0x3c6);
+  grub_inb (0x3c6);
+  grub_inb (0x3c6);
+  grub_inb (0x3c6);
+  grub_outb (data, 0x3c6);
+}
+
+static grub_uint8_t
+read_hidden_dac (void)
+{
+  grub_inb (0x3c8);
+  grub_inb (0x3c6);
+  grub_inb (0x3c6);
+  grub_inb (0x3c6);
+  grub_inb (0x3c6);
+  return grub_inb (0x3c6);
+}
+
+struct saved_state
+{
+  grub_uint8_t cr[CIRRUS_CR_MAX];
+  grub_uint8_t gr[CIRRUS_GR_MAX];
+  grub_uint8_t sr[CIRRUS_SR_MAX];
+  grub_uint8_t hidden_dac;
+  /* We need to preserve VGA font and VGA text. */
+  grub_uint8_t vram[32 * 4 * 256];
+};
+
+static struct saved_state initial_state;
+static int state_saved = 0;
+
+static void
+save_state (struct saved_state *st)
+{
+  unsigned i;
+  for (i = 0; i < ARRAY_SIZE (st->cr); i++)
+    st->cr[i] = cr_read (i);
+  for (i = 0; i < ARRAY_SIZE (st->sr); i++)
+    st->sr[i] = sr_read (i);
+  for (i = 0; i < ARRAY_SIZE (st->gr); i++)
+    st->gr[i] = gr_read (i);
+  st->hidden_dac = read_hidden_dac ();
+  sr_write (CIRRUS_SR_MEMORY_MODE_CHAIN4, CIRRUS_SR_MEMORY_MODE);
+  grub_memcpy (st->vram, framebuffer.ptr, sizeof (st->vram));
+}
+
+static void
+restore_state (struct saved_state *st)
+{
+  unsigned i;
+  sr_write (CIRRUS_SR_MEMORY_MODE_CHAIN4, CIRRUS_SR_MEMORY_MODE);
+  grub_memcpy (framebuffer.ptr, st->vram, sizeof (st->vram));
+  for (i = 0; i < ARRAY_SIZE (st->cr); i++)
+    cr_write (st->cr[i], i);
+  for (i = 0; i < ARRAY_SIZE (st->sr); i++)
+    sr_write (st->sr[i], i);
+  for (i = 0; i < ARRAY_SIZE (st->gr); i++)
+    gr_write (st->gr[i], i);
+  write_hidden_dac (st->hidden_dac);
+}
+
+static grub_err_t
+grub_video_cirrus_video_init (void)
+{
+  /* Reset frame buffer.  */
+  grub_memset (&framebuffer, 0, sizeof(framebuffer));
+
+  return grub_video_fb_init ();
+}
+
+static grub_err_t
+grub_video_cirrus_video_fini (void)
+{
+  if (framebuffer.mapped)
+    grub_pci_device_unmap_range (framebuffer.dev, framebuffer.ptr,
+				 CIRRUS_APERTURE_SIZE);
+
+  if (state_saved)
+    {
+      restore_state (&initial_state);
+      state_saved = 0;
+    }
+
+  return grub_video_fb_fini ();
+}
+
+static grub_err_t
+grub_video_cirrus_setup (unsigned int width, unsigned int height,
+			unsigned int mode_type, unsigned int mode_mask __attribute__ ((unused)))
+{
+  int depth;
+  grub_err_t err;
+  int found = 0;
+  int pitch, bytes_per_pixel;
+
+  auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)));
+  int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid)
+    {
+      grub_pci_address_t addr;
+      grub_uint32_t class;
+
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
+      class = grub_pci_read (addr);
+
+      if (((class >> 16) & 0xffff) != 0x0300 || pciid != 0x00b81013)
+	return 0;
+      
+      found = 1;
+
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
+      framebuffer.base = grub_pci_read (addr) & GRUB_PCI_ADDR_MEM_MASK;
+      framebuffer.dev = dev;
+
+      return 1;
+    }
+
+  /* Decode depth from mode_type.  If it is zero, then autodetect.  */
+  depth = (mode_type & GRUB_VIDEO_MODE_TYPE_DEPTH_MASK)
+          >> GRUB_VIDEO_MODE_TYPE_DEPTH_POS;
+
+  if (width == 0 || height == 0)
+    {
+      width = 800;
+      height = 600;
+    }
+
+  if (width & (CIRRUS_WIDTH_DIVISOR - 1))
+    return grub_error (GRUB_ERR_IO,
+		       "screen width must be a multiple of %d",
+		       CIRRUS_WIDTH_DIVISOR);
+
+  if (width > CIRRUS_MAX_WIDTH)
+    return grub_error (GRUB_ERR_IO,
+		       "screen width must be at most %d", CIRRUS_MAX_WIDTH);
+
+  if (height > CIRRUS_MAX_HEIGHT)
+    return grub_error (GRUB_ERR_IO,
+		       "screen height must be at most %d", CIRRUS_MAX_HEIGHT);
+
+  if (depth == 0)
+    depth = 24;
+
+  if (depth != 32 && depth != 24 && depth != 16 && depth != 15)
+    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+		       "only 32, 24, 16 and 15-bit bpp are supported");
+
+  bytes_per_pixel = (depth + 7) / 8;
+  pitch = width * bytes_per_pixel;
+
+  if (pitch > CIRRUS_MAX_PITCH)
+    return grub_error (GRUB_ERR_IO,
+		       "screen width must be at most %d at bitdepth %d",
+		       CIRRUS_MAX_PITCH / bytes_per_pixel, depth);
+
+  grub_pci_iterate (find_card);
+  if (!found)
+    return grub_error (GRUB_ERR_IO, "Couldn't find graphics card");
+
+  if (found && framebuffer.base == 0)
+    {
+      /* FIXME: change framebuffer base */
+    }
+
+  /* We can safely discard volatile attribute.  */
+  framebuffer.ptr = (void *) grub_pci_device_map_range (framebuffer.dev,
+							framebuffer.base,
+							CIRRUS_APERTURE_SIZE);
+  framebuffer.mapped = 1;
+
+  if (!state_saved)
+    {
+      save_state (&initial_state);
+      state_saved = 1;
+    }
+
+  {
+    int pitch_reg, overflow_reg = 0, line_compare = 0x3ff;
+    grub_uint8_t sr_ext = 0;
+
+    pitch_reg = pitch / CIRRUS_WIDTH_DIVISOR;
+
+    gr_write (CIRRUS_GR_MODE_256_COLOR | CIRRUS_GR_MODE_READ_MODE1,
+	      CIRRUS_GR_MODE);
+    gr_write (CIRRUS_GR_GR6_GRAPHICS_MODE, CIRRUS_GR_GR6);
+    
+    sr_write (CIRRUS_SR_MEMORY_MODE_NORMAL, CIRRUS_SR_MEMORY_MODE);
+
+    /* Disable CR0-7 write protection.  */
+    cr_write (0, CIRRUS_CR_VSYNC_END);
+
+    cr_write (width / CIRRUS_WIDTH_DIVISOR - 1, CIRRUS_CR_WIDTH);
+    cr_write ((height - 1) & 0xff, CIRRUS_CR_HEIGHT);
+    overflow_reg |= (((height - 1) >> CIRRUS_CR_OVERFLOW_HEIGHT1_SHIFT) & 
+		     CIRRUS_CR_OVERFLOW_HEIGHT1_MASK)
+      | (((height - 1) >> CIRRUS_CR_OVERFLOW_HEIGHT2_SHIFT) & 
+	 CIRRUS_CR_OVERFLOW_HEIGHT2_MASK);
+
+    cr_write (pitch_reg & 0xff, CIRRUS_CR_PITCH);
+
+    cr_write (line_compare & 0xff, CIRRUS_CR_LINE_COMPARE);
+    overflow_reg |= (line_compare >> CIRRUS_CR_OVERFLOW_LINE_COMPARE_SHIFT)
+      & CIRRUS_CR_OVERFLOW_LINE_COMPARE_MASK;
+
+    cr_write (overflow_reg, CIRRUS_CR_OVERFLOW);
+
+    cr_write ((pitch_reg >> CIRRUS_CR_EXTENDED_DISPLAY_PITCH_SHIFT)
+	      & CIRRUS_CR_EXTENDED_DISPLAY_PITCH_MASK,
+	      CIRRUS_CR_EXTENDED_DISPLAY);
+
+    cr_write ((line_compare >> CIRRUS_CR_CELL_HEIGHT_LINE_COMPARE_SHIFT)
+	      & CIRRUS_CR_CELL_HEIGHT_LINE_COMPARE_MASK, CIRRUS_CR_CELL_HEIGHT);
+
+    cr_write (CIRRUS_CR_MODE_TIMING_ENABLE | CIRRUS_CR_MODE_BYTE_MODE
+	      | CIRRUS_CR_MODE_NO_HERCULES | CIRRUS_CR_MODE_NO_CGA,
+	      CIRRUS_CR_MODE);
+
+    sr_ext = CIRRUS_SR_EXTENDED_MODE_LFB_ENABLE
+      | CIRRUS_SR_EXTENDED_MODE_ENABLE_EXT;
+    switch (depth)
+      {
+      case 32:
+	sr_ext |= CIRRUS_SR_EXTENDED_MODE_32BPP;
+	break;
+      case 24:
+	sr_ext |= CIRRUS_SR_EXTENDED_MODE_24BPP;
+	break;
+      case 16:
+      case 15:
+	sr_ext |= CIRRUS_SR_EXTENDED_MODE_16BPP;
+	break;
+      }
+    sr_write (sr_ext, CIRRUS_SR_EXTENDED_MODE);
+    write_hidden_dac (depth == 16);
+  }
+
+  /* Fill mode info details.  */
+  framebuffer.mode_info.width = width;
+  framebuffer.mode_info.height = height;
+  framebuffer.mode_info.mode_type = GRUB_VIDEO_MODE_TYPE_RGB;
+  framebuffer.mode_info.bpp = depth;
+  framebuffer.mode_info.bytes_per_pixel = bytes_per_pixel;
+  framebuffer.mode_info.pitch = pitch;
+  framebuffer.mode_info.number_of_colors = 256;
+  framebuffer.mode_info.reserved_mask_size = 0;
+  framebuffer.mode_info.reserved_field_pos = 0;
+
+  switch (depth)
+    {
+    case 16:
+      framebuffer.mode_info.red_mask_size = 5;
+      framebuffer.mode_info.red_field_pos = 11;
+      framebuffer.mode_info.green_mask_size = 6;
+      framebuffer.mode_info.green_field_pos = 5;
+      framebuffer.mode_info.blue_mask_size = 5;
+      framebuffer.mode_info.blue_field_pos = 0;
+      break;
+
+    case 15:
+      framebuffer.mode_info.red_mask_size = 5;
+      framebuffer.mode_info.red_field_pos = 10;
+      framebuffer.mode_info.green_mask_size = 5;
+      framebuffer.mode_info.green_field_pos = 5;
+      framebuffer.mode_info.blue_mask_size = 5;
+      framebuffer.mode_info.blue_field_pos = 0;
+      break;
+
+    case 32:
+      framebuffer.mode_info.reserved_mask_size = 8;
+      framebuffer.mode_info.reserved_field_pos = 24;
+
+    case 24:
+      framebuffer.mode_info.red_mask_size = 8;
+      framebuffer.mode_info.red_field_pos = 16;
+      framebuffer.mode_info.green_mask_size = 8;
+      framebuffer.mode_info.green_field_pos = 8;
+      framebuffer.mode_info.blue_mask_size = 8;
+      framebuffer.mode_info.blue_field_pos = 0;
+      break;
+    }
+
+  framebuffer.mode_info.blit_format = grub_video_get_blit_format (&framebuffer.mode_info);
+
+  err = grub_video_fb_create_render_target_from_pointer (&framebuffer.render_target, &framebuffer.mode_info, framebuffer.ptr);
+
+  if (err)
+    return err;
+
+  err = grub_video_fb_set_active_render_target (framebuffer.render_target);
+  
+  if (err)
+    return err;
+
+  /* Copy default palette to initialize emulated palette.  */
+  err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
+				   grub_video_fbstd_colors);
+  return err;
+}
+
+static grub_err_t
+grub_video_cirrus_set_palette (unsigned int start, unsigned int count,
+			       struct grub_video_palette_data *palette_data)
+{
+  /*  if (framebuffer.index_color_mode) */
+    {
+      /* TODO: Implement setting indexed color mode palette to hardware.  */
+    }
+
+  /* Then set color to emulated palette.  */
+  return grub_video_fb_set_palette (start, count, palette_data);
+}
+
+static grub_err_t
+grub_video_cirrus_swap_buffers (void)
+{
+  /* TODO: Implement buffer swapping.  */
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_video_cirrus_set_active_render_target (struct grub_video_render_target *target)
+{
+  if (target == GRUB_VIDEO_RENDER_TARGET_DISPLAY)
+      target = framebuffer.render_target;
+
+  return grub_video_fb_set_active_render_target (target);
+}
+
+static grub_err_t
+grub_video_cirrus_get_info_and_fini (struct grub_video_mode_info *mode_info,
+				    void **framebuf)
+{
+  grub_memcpy (mode_info, &(framebuffer.mode_info), sizeof (*mode_info));
+  *framebuf = (char *) framebuffer.ptr;
+
+  grub_video_fb_fini ();
+
+  return GRUB_ERR_NONE;
+}
+
+
+static struct grub_video_adapter grub_video_cirrus_adapter =
+  {
+    .name = "Cirrus CLGD 5446 PCI Video Driver",
+    .id = GRUB_VIDEO_DRIVER_CIRRUS,
+
+    .init = grub_video_cirrus_video_init,
+    .fini = grub_video_cirrus_video_fini,
+    .setup = grub_video_cirrus_setup,
+    .get_info = grub_video_fb_get_info,
+    .get_info_and_fini = grub_video_cirrus_get_info_and_fini,
+    .set_palette = grub_video_cirrus_set_palette,
+    .get_palette = grub_video_fb_get_palette,
+    .set_viewport = grub_video_fb_set_viewport,
+    .get_viewport = grub_video_fb_get_viewport,
+    .map_color = grub_video_fb_map_color,
+    .map_rgb = grub_video_fb_map_rgb,
+    .map_rgba = grub_video_fb_map_rgba,
+    .unmap_color = grub_video_fb_unmap_color,
+    .fill_rect = grub_video_fb_fill_rect,
+    .blit_bitmap = grub_video_fb_blit_bitmap,
+    .blit_render_target = grub_video_fb_blit_render_target,
+    .scroll = grub_video_fb_scroll,
+    .swap_buffers = grub_video_cirrus_swap_buffers,
+    .create_render_target = grub_video_fb_create_render_target,
+    .delete_render_target = grub_video_fb_delete_render_target,
+    .set_active_render_target = grub_video_cirrus_set_active_render_target,
+    .get_active_render_target = grub_video_fb_get_active_render_target,
+
+    .next = 0
+  };
+
+GRUB_MOD_INIT(video_cirrus)
+{
+  grub_video_register (&grub_video_cirrus_adapter);
+}
+
+GRUB_MOD_FINI(video_cirrus)
+{
+  grub_video_unregister (&grub_video_cirrus_adapter);
+}

From 26162102fa7cd61a20bc9e637330bdfada6e47a6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 16 May 2010 14:40:03 +0200
Subject: [PATCH 0960/1628] Move most framebuffer handling to video_fb.c

---
 include/grub/video_fb.h |  17 ++-
 video/fb/video_fb.c     | 222 ++++++++++++++++++++++++++++++++++-
 video/i386/pc/vbe.c     | 253 ++++------------------------------------
 3 files changed, 252 insertions(+), 240 deletions(-)

diff --git a/include/grub/video_fb.h b/include/grub/video_fb.h
index 3046a597b..2c1907fdf 100644
--- a/include/grub/video_fb.h
+++ b/include/grub/video_fb.h
@@ -119,11 +119,18 @@ typedef grub_err_t
 (*grub_video_fb_doublebuf_update_screen_t) (struct grub_video_fbrender_target *front,
 					  struct grub_video_fbrender_target *back);
 
+typedef grub_err_t (*grub_video_fb_set_page_t) (int page);
+
 grub_err_t
-grub_video_fb_doublebuf_blit_init (struct grub_video_fbrender_target **front,
-				   struct grub_video_fbrender_target **back,
-				   grub_video_fb_doublebuf_update_screen_t *update_screen,
-				   struct grub_video_mode_info mode_info,
-				   void *framebuf);
+grub_video_fb_setup (unsigned int mode_type, unsigned int mode_mask,
+		     struct grub_video_mode_info *mode_info,
+		     volatile void *page0_ptr,
+		     grub_video_fb_set_page_t set_page_in,
+		     volatile void *page1_ptr);
+grub_err_t
+grub_video_fb_swap_buffers (void);
+grub_err_t
+grub_video_fb_get_info_and_fini (struct grub_video_mode_info *mode_info,
+				 void **framebuf);
 
 #endif /* ! GRUB_VIDEO_FB_HEADER */
diff --git a/video/fb/video_fb.c b/video/fb/video_fb.c
index 9c5577bb9..6ec61868d 100644
--- a/video/fb/video_fb.c
+++ b/video/fb/video_fb.c
@@ -26,8 +26,16 @@
 #include <grub/bitmap.h>
 
 static struct grub_video_fbrender_target *render_target;
+static struct grub_video_fbrender_target *front_target;
+static struct grub_video_fbrender_target *back_target;
 struct grub_video_palette_data *palette;
 static unsigned int palette_size;
+/* For page flipping strategy.  */
+static int displayed_page;           /* The page # that is the front buffer.  */
+static int render_page;              /* The page # that is the back buffer.  */
+static grub_video_fb_set_page_t set_page;
+static char *offscreen_buffer;
+static grub_video_fb_doublebuf_update_screen_t update_screen;
 
 /* Specify "standard" VGA palette, some video cards may
    need this and this will also be used when using RGB modes.  */
@@ -58,8 +66,11 @@ grub_video_fb_init (void)
 {
   grub_free (palette);
   render_target = 0;
+  front_target = 0;
+  back_target = 0;
   palette = 0;
   palette_size = 0;
+  set_page = 0;
   return GRUB_ERR_NONE;
 }
 
@@ -68,10 +79,15 @@ grub_video_fb_fini (void)
 {
   /* TODO: destroy render targets.  */
 
+  grub_free (offscreen_buffer);
   grub_free (palette);
   render_target = 0;
+  front_target = 0;
+  back_target = 0;
   palette = 0;
   palette_size = 0;
+  set_page = 0;
+  offscreen_buffer = 0;
   return GRUB_ERR_NONE;
 }
 
@@ -1221,6 +1237,10 @@ grub_video_fb_delete_render_target (struct grub_video_fbrender_target *target)
 grub_err_t
 grub_video_fb_set_active_render_target (struct grub_video_fbrender_target *target)
 {
+  if (target == (struct grub_video_fbrender_target *)
+      GRUB_VIDEO_RENDER_TARGET_DISPLAY)
+      target = back_target;
+
   if (! target->data)
     return grub_error (GRUB_ERR_BAD_ARGUMENT,
                        "invalid render target given");
@@ -1235,6 +1255,9 @@ grub_video_fb_get_active_render_target (struct grub_video_fbrender_target **targ
 {
   *target = render_target;
 
+  if (*target == back_target)
+    *target = (struct grub_video_fbrender_target *) GRUB_VIDEO_RENDER_TARGET_DISPLAY;
+
   return GRUB_ERR_NONE;
 }
 
@@ -1247,16 +1270,14 @@ doublebuf_blit_update_screen (struct grub_video_fbrender_target *front,
   return GRUB_ERR_NONE;
 }
 
-grub_err_t
+static grub_err_t
 grub_video_fb_doublebuf_blit_init (struct grub_video_fbrender_target **front,
 				   struct grub_video_fbrender_target **back,
-				   grub_video_fb_doublebuf_update_screen_t *update_screen,
 				   struct grub_video_mode_info mode_info,
 				   void *framebuf)
 {
   grub_err_t err;
   int page_size = mode_info.pitch * mode_info.height;
-  void *offscreen_buffer;
 
   err = grub_video_fb_create_render_target_from_pointer (front, &mode_info,
 							 framebuf);
@@ -1283,7 +1304,200 @@ grub_video_fb_doublebuf_blit_init (struct grub_video_fbrender_target **front,
     }
   (*back)->is_allocated = 1;
 
-  *update_screen = doublebuf_blit_update_screen;
+  update_screen = doublebuf_blit_update_screen;
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+doublebuf_pageflipping_update_screen (struct grub_video_fbrender_target *front
+				      __attribute__ ((unused)),
+				      struct grub_video_fbrender_target *back
+				      __attribute__ ((unused)))
+{
+  int new_displayed_page;
+  struct grub_video_fbrender_target *target;
+  grub_err_t err;
+
+  /* Swap the page numbers in the framebuffer struct.  */
+  new_displayed_page = render_page;
+  render_page = displayed_page;
+  displayed_page = new_displayed_page;
+
+  err = set_page (displayed_page);
+  if (err)
+    {
+      /* Restore previous state.  */
+      render_page = displayed_page;
+      displayed_page = new_displayed_page;
+      return err;
+    }
+
+  target = back_target;
+  back_target = front_target;
+  front_target = target;
+
+  if (front_target->mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP)
+    grub_memcpy (back_target->data, front_target->data,
+		 back_target->mode_info.pitch * back_target->mode_info.height);
+
+  err = grub_video_fb_get_active_render_target (&target);
+  if (err)
+    return err;
+
+  if (render_target == back_target)
+    render_target = front_target;
+  else if (target == front_target)
+    render_target = back_target;
+
+  return err;
+}
+
+static grub_err_t
+doublebuf_pageflipping_init (struct grub_video_mode_info *mode_info,
+			     volatile void *page0_ptr,
+			     grub_video_fb_set_page_t set_page_in,
+			     volatile void *page1_ptr)
+{
+  grub_err_t err;
+
+  displayed_page = 0;
+  render_page = 1;
+
+  update_screen = doublebuf_pageflipping_update_screen;
+
+  err = grub_video_fb_create_render_target_from_pointer (&front_target,
+							 mode_info,
+							 (void *) page0_ptr);
+  if (err)
+    return err;
+
+  err = grub_video_fb_create_render_target_from_pointer (&back_target,
+							 mode_info,
+							 (void *) page1_ptr);
+  if (err)
+    {
+      grub_video_fb_delete_render_target (front_target);
+      return err;
+    }
+
+  /* Set the framebuffer memory data pointer and display the right page.  */
+  err = set_page_in (displayed_page);
+  if (err)
+    {
+      grub_video_fb_delete_render_target (front_target);
+      grub_video_fb_delete_render_target (back_target);
+      return err;
+    }
+  set_page = set_page_in;
+
+  return GRUB_ERR_NONE;
+}
+
+/* Select the best double buffering mode available.  */
+grub_err_t
+grub_video_fb_setup (unsigned int mode_type, unsigned int mode_mask,
+		     struct grub_video_mode_info *mode_info,
+		     volatile void *page0_ptr,
+		     grub_video_fb_set_page_t set_page_in,
+		     volatile void *page1_ptr)
+{
+  grub_err_t err;
+  int updating_swap_needed;
+
+  updating_swap_needed
+    = grub_video_check_mode_flag (mode_type, mode_mask,
+				  GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP, 0);
+
+  /* Do double buffering only if it's either requested or efficient.  */
+  if (set_page_in && grub_video_check_mode_flag (mode_type, mode_mask,
+						 GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED,
+						 !updating_swap_needed))
+    {
+      mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED;
+      if (updating_swap_needed)
+	mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP;
+
+      err = doublebuf_pageflipping_init (mode_info, page0_ptr,
+					 set_page_in,
+					 page1_ptr);
+      if (!err)
+	{
+	  render_target = back_target;
+	  return GRUB_ERR_NONE;
+	}
+      
+      mode_info->mode_type &= ~(GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
+				| GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
+
+      grub_errno = GRUB_ERR_NONE;
+    }
+
+  if (grub_video_check_mode_flag (mode_type, mode_mask,
+				  GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED,
+				  0))
+    {
+      mode_info->mode_type |= (GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
+			       | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
+
+      err = grub_video_fb_doublebuf_blit_init (&front_target,
+					       &back_target,
+					       *mode_info,
+					       (void *) page0_ptr);
+
+      if (!err)
+	{
+	  render_target = back_target;
+	  return GRUB_ERR_NONE;
+	}
+
+      mode_info->mode_type &= ~(GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
+				| GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
+
+      grub_errno = GRUB_ERR_NONE;
+    }
+
+  /* Fall back to no double buffering.  */
+  err = grub_video_fb_create_render_target_from_pointer (&front_target,
+							 mode_info,
+							 (void *) page0_ptr);
+
+  if (err)
+    return err;
+
+  back_target = front_target;
+  update_screen = 0;
+
+  mode_info->mode_type &= ~GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED;
+
+  render_target = back_target;
+
+  return GRUB_ERR_NONE;
+}
+
+
+grub_err_t
+grub_video_fb_swap_buffers (void)
+{
+  grub_err_t err;
+  if (!update_screen)
+    return GRUB_ERR_NONE;
+
+  err = update_screen (front_target, back_target);
+  if (err)
+    return err;
+
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_video_fb_get_info_and_fini (struct grub_video_mode_info *mode_info,
+				 void **framebuf)
+{
+  grub_memcpy (mode_info, &(front_target->mode_info), sizeof (*mode_info));
+  *framebuf = front_target->data;
+
+  grub_video_fb_fini ();
 
   return GRUB_ERR_NONE;
 }
diff --git a/video/i386/pc/vbe.c b/video/i386/pc/vbe.c
index 72b8f1831..05c6db736 100644
--- a/video/i386/pc/vbe.c
+++ b/video/i386/pc/vbe.c
@@ -40,25 +40,12 @@ static grub_uint32_t last_set_mode = 3;
 static struct
 {
   struct grub_video_mode_info mode_info;
-  struct grub_video_render_target *front_target;
-  struct grub_video_render_target *back_target;
 
   unsigned int bytes_per_scan_line;
   unsigned int bytes_per_pixel;
   grub_uint32_t active_vbe_mode;
   grub_uint8_t *ptr;
   int index_color_mode;
-
-  char *offscreen_buffer;
-
-  grub_size_t page_size;        /* The size of a page in bytes.  */
-
-  /* For page flipping strategy.  */
-  int displayed_page;           /* The page # that is the front buffer.  */
-  int render_page;              /* The page # that is the back buffer.  */
-
-  /* Virtual functions.  */
-  grub_video_fb_doublebuf_update_screen_t update_screen;
 } framebuffer;
 
 static grub_uint32_t initial_vbe_mode;
@@ -377,7 +364,6 @@ grub_video_vbe_fini (void)
   vbe_mode_list = NULL;
 
   err = grub_video_fb_fini ();
-  grub_free (framebuffer.offscreen_buffer);
   return err;
 }
 
@@ -387,11 +373,11 @@ grub_video_vbe_fini (void)
   respectively.
 */
 static grub_err_t
-doublebuf_pageflipping_commit (void)
+doublebuf_pageflipping_set_page (int page)
 {
   /* Tell the video adapter to display the new front page.  */
   int display_start_line
-    = framebuffer.mode_info.height * framebuffer.displayed_page;
+    = framebuffer.mode_info.height * page;
 
   grub_vbe_status_t vbe_err =
     grub_vbe_bios_set_display_start (0, display_start_line);
@@ -402,164 +388,6 @@ doublebuf_pageflipping_commit (void)
   return 0;
 }
 
-static grub_err_t
-doublebuf_pageflipping_update_screen (struct grub_video_fbrender_target *front
-				      __attribute__ ((unused)),
-				      struct grub_video_fbrender_target *back
-				      __attribute__ ((unused)))
-{
-  int new_displayed_page;
-  struct grub_video_fbrender_target *target;
-  grub_err_t err;
-
-  /* Swap the page numbers in the framebuffer struct.  */
-  new_displayed_page = framebuffer.render_page;
-  framebuffer.render_page = framebuffer.displayed_page;
-  framebuffer.displayed_page = new_displayed_page;
-
-  err = doublebuf_pageflipping_commit ();
-  if (err)
-    {
-      /* Restore previous state.  */
-      framebuffer.render_page = framebuffer.displayed_page;
-      framebuffer.displayed_page = new_displayed_page;
-      return err;
-    }
-
-  if (framebuffer.mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP)
-    grub_memcpy (framebuffer.ptr + framebuffer.render_page
-		 * framebuffer.page_size, framebuffer.ptr
-		 + framebuffer.displayed_page * framebuffer.page_size,
-		 framebuffer.page_size);
-
-  target = framebuffer.back_target;
-  framebuffer.back_target = framebuffer.front_target;
-  framebuffer.front_target = target;
-
-  err = grub_video_fb_get_active_render_target (&target);
-  if (err)
-    return err;
-
-  if (target == framebuffer.back_target)
-    err = grub_video_fb_set_active_render_target (framebuffer.front_target);
-  else if (target == framebuffer.front_target)
-    err = grub_video_fb_set_active_render_target (framebuffer.back_target);
-
-  return err;
-}
-
-static grub_err_t
-doublebuf_pageflipping_init (void)
-{
-  /* Get video RAM size in bytes.  */
-  grub_size_t vram_size = controller_info.total_memory << 16;
-  grub_err_t err;
-
-  framebuffer.page_size =
-    framebuffer.mode_info.pitch * framebuffer.mode_info.height;
-
-  if (2 * framebuffer.page_size > vram_size)
-    return grub_error (GRUB_ERR_OUT_OF_MEMORY,
-		       "Not enough video memory for double buffering.");
-
-  framebuffer.displayed_page = 0;
-  framebuffer.render_page = 1;
-
-  framebuffer.update_screen = doublebuf_pageflipping_update_screen;
-
-  err = grub_video_fb_create_render_target_from_pointer (&framebuffer.front_target, &framebuffer.mode_info, framebuffer.ptr);
-  if (err)
-    return err;
-
-  err = grub_video_fb_create_render_target_from_pointer (&framebuffer.back_target, &framebuffer.mode_info, framebuffer.ptr + framebuffer.page_size);
-  if (err)
-    {
-      grub_video_fb_delete_render_target (framebuffer.front_target);
-      return err;
-    }
-
-  /* Set the framebuffer memory data pointer and display the right page.  */
-  err = doublebuf_pageflipping_commit ();
-  if (err)
-    {
-      grub_video_fb_delete_render_target (framebuffer.front_target);
-      grub_video_fb_delete_render_target (framebuffer.back_target);
-      return err;
-    }
-
-  return GRUB_ERR_NONE;
-}
-
-/* Select the best double buffering mode available.  */
-static grub_err_t
-double_buffering_init (unsigned int mode_type, unsigned int mode_mask)
-{
-  grub_err_t err;
-  int updating_swap_needed;
-
-  updating_swap_needed
-    = grub_video_check_mode_flag (mode_type, mode_mask,
-				  GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP, 0);
-
-  /* Do double buffering only if it's either requested or efficient.  */
-  if (grub_video_check_mode_flag (mode_type, mode_mask,
-				  GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED,
-				  !updating_swap_needed))
-    {
-      framebuffer.mode_info.mode_type |= GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED;
-      if (updating_swap_needed)
-	framebuffer.mode_info.mode_type |= GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP;
-      err = doublebuf_pageflipping_init ();
-      if (!err)
-	return GRUB_ERR_NONE;
-      
-      framebuffer.mode_info.mode_type
-	&= ~(GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
-	     | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
-
-      grub_errno = GRUB_ERR_NONE;
-    }
-
-  if (grub_video_check_mode_flag (mode_type, mode_mask,
-				  GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED,
-				  0))
-    {
-      framebuffer.mode_info.mode_type 
-	|= (GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
-	    | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
-
-      err = grub_video_fb_doublebuf_blit_init (&framebuffer.front_target,
-					       &framebuffer.back_target,
-					       &framebuffer.update_screen,
-					       framebuffer.mode_info,
-					       framebuffer.ptr);
-
-      if (!err)
-	return GRUB_ERR_NONE;
-
-      framebuffer.mode_info.mode_type
-	&= ~(GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
-	     | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
-
-      grub_errno = GRUB_ERR_NONE;
-    }
-
-  /* Fall back to no double buffering.  */
-  err = grub_video_fb_create_render_target_from_pointer (&framebuffer.front_target, &framebuffer.mode_info, framebuffer.ptr);
-
-  if (err)
-    return err;
-
-  framebuffer.back_target = framebuffer.front_target;
-  framebuffer.update_screen = 0;
-
-  framebuffer.mode_info.mode_type &= ~GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED;
-
-  return GRUB_ERR_NONE;
-}
-
-
-
 static grub_err_t
 grub_video_vbe_setup (unsigned int width, unsigned int height,
                       unsigned int mode_type, unsigned int mode_mask)
@@ -684,15 +512,24 @@ grub_video_vbe_setup (unsigned int width, unsigned int height,
 
       framebuffer.mode_info.blit_format = grub_video_get_blit_format (&framebuffer.mode_info);
 
-      /* Set up double buffering and targets.  */
-      err = double_buffering_init (mode_type, mode_mask);
-      if (err)
-	return err;
+      {
+	/* Get video RAM size in bytes.  */
+	grub_size_t vram_size = controller_info.total_memory << 16;
+	grub_size_t page_size;        /* The size of a page in bytes.  */
 
-      err = grub_video_fb_set_active_render_target (framebuffer.back_target);
+	page_size = framebuffer.mode_info.pitch * framebuffer.mode_info.height;
 
-      if (err)
-	return err;
+	if (vram_size >= 2 * page_size)
+	  err = grub_video_fb_setup (mode_type, mode_mask,
+				     &framebuffer.mode_info,
+				     framebuffer.ptr,
+				     doublebuf_pageflipping_set_page,
+				     framebuffer.ptr + page_size);
+	else
+	  err = grub_video_fb_setup (mode_type, mode_mask,
+				     &framebuffer.mode_info,
+				     framebuffer.ptr, 0, 0);
+      }
 
       /* Copy default palette to initialize emulated palette.  */
       err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
@@ -723,59 +560,13 @@ grub_video_vbe_set_palette (unsigned int start, unsigned int count,
   return grub_video_fb_set_palette (start, count, palette_data);
 }
 
-static grub_err_t
-grub_video_vbe_swap_buffers (void)
-{
-  grub_err_t err;
-  if (!framebuffer.update_screen)
-    return GRUB_ERR_NONE;
-
-  err = framebuffer.update_screen (framebuffer.front_target,
-				   framebuffer.back_target);
-  if (err)
-    return err;
-
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_video_vbe_set_active_render_target (struct grub_video_render_target *target)
-{
-  if (target == GRUB_VIDEO_RENDER_TARGET_DISPLAY)
-      target = framebuffer.back_target;
-
-  return grub_video_fb_set_active_render_target (target);
-}
-
-static grub_err_t
-grub_video_vbe_get_active_render_target (struct grub_video_render_target **target)
-{
-  grub_err_t err;
-  err = grub_video_fb_get_active_render_target (target);
-  if (err)
-    return err;
-
-  if (*target == framebuffer.back_target)
-    *target = GRUB_VIDEO_RENDER_TARGET_DISPLAY;
-
-  return GRUB_ERR_NONE;
-}
-
 static grub_err_t
 grub_video_vbe_get_info_and_fini (struct grub_video_mode_info *mode_info,
 				  void **framebuf)
 {
-  grub_memcpy (mode_info, &(framebuffer.mode_info), sizeof (*mode_info));
-  *framebuf = (char *) framebuffer.ptr
-    + framebuffer.displayed_page * framebuffer.page_size;
-
   grub_free (vbe_mode_list);
   vbe_mode_list = NULL;
-
-  grub_video_fb_fini ();
-  grub_free (framebuffer.offscreen_buffer);
-
-  return GRUB_ERR_NONE;
+  return grub_video_fb_get_info_and_fini (mode_info, framebuf);
 }
 
 static struct grub_video_adapter grub_video_vbe_adapter =
@@ -800,11 +591,11 @@ static struct grub_video_adapter grub_video_vbe_adapter =
     .blit_bitmap = grub_video_fb_blit_bitmap,
     .blit_render_target = grub_video_fb_blit_render_target,
     .scroll = grub_video_fb_scroll,
-    .swap_buffers = grub_video_vbe_swap_buffers,
+    .swap_buffers = grub_video_fb_swap_buffers,
     .create_render_target = grub_video_fb_create_render_target,
     .delete_render_target = grub_video_fb_delete_render_target,
-    .set_active_render_target = grub_video_vbe_set_active_render_target,
-    .get_active_render_target = grub_video_vbe_get_active_render_target,
+    .set_active_render_target = grub_video_fb_set_active_render_target,
+    .get_active_render_target = grub_video_fb_get_active_render_target,
 
     .next = 0
   };

From 02aabd9e467744b696878db42adc0acd5a900609 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 16 May 2010 15:01:54 +0200
Subject: [PATCH 0961/1628] Encapsulate video_fb state in a structure

---
 include/grub/video_fb.h |   4 +-
 video/fb/video_fb.c     | 398 ++++++++++++++++++++--------------------
 2 files changed, 206 insertions(+), 196 deletions(-)

diff --git a/include/grub/video_fb.h b/include/grub/video_fb.h
index 2c1907fdf..6816f6f60 100644
--- a/include/grub/video_fb.h
+++ b/include/grub/video_fb.h
@@ -89,8 +89,8 @@ grub_video_fb_blit_bitmap (struct grub_video_bitmap *bitmap,
 
 grub_err_t
 grub_video_fb_blit_render_target (struct grub_video_fbrender_target *source,
-                                   enum grub_video_blit_operators oper,
-                                   int x, int y, int offset_x, int offset_y,
+				  enum grub_video_blit_operators oper,
+				  int x, int y, int offset_x, int offset_y,
 				  unsigned int width, unsigned int height);
 
 grub_err_t
diff --git a/video/fb/video_fb.c b/video/fb/video_fb.c
index 6ec61868d..69626be5c 100644
--- a/video/fb/video_fb.c
+++ b/video/fb/video_fb.c
@@ -25,17 +25,20 @@
 #include <grub/fbutil.h>
 #include <grub/bitmap.h>
 
-static struct grub_video_fbrender_target *render_target;
-static struct grub_video_fbrender_target *front_target;
-static struct grub_video_fbrender_target *back_target;
-struct grub_video_palette_data *palette;
-static unsigned int palette_size;
-/* For page flipping strategy.  */
-static int displayed_page;           /* The page # that is the front buffer.  */
-static int render_page;              /* The page # that is the back buffer.  */
-static grub_video_fb_set_page_t set_page;
-static char *offscreen_buffer;
-static grub_video_fb_doublebuf_update_screen_t update_screen;
+static struct
+{
+  struct grub_video_fbrender_target *render_target;
+  struct grub_video_fbrender_target *front_target;
+  struct grub_video_fbrender_target *back_target;
+  struct grub_video_palette_data *palette;
+  unsigned int palette_size;
+  /* For page flipping strategy.  */
+  int displayed_page;           /* The page # that is the front buffer.  */
+  int render_page;              /* The page # that is the back buffer.  */
+  grub_video_fb_set_page_t set_page;
+  char *offscreen_buffer;
+  grub_video_fb_doublebuf_update_screen_t update_screen;
+} framebuffer;
 
 /* Specify "standard" VGA palette, some video cards may
    need this and this will also be used when using RGB modes.  */
@@ -64,13 +67,13 @@ struct grub_video_palette_data grub_video_fbstd_colors[GRUB_VIDEO_FBSTD_NUMCOLOR
 grub_err_t
 grub_video_fb_init (void)
 {
-  grub_free (palette);
-  render_target = 0;
-  front_target = 0;
-  back_target = 0;
-  palette = 0;
-  palette_size = 0;
-  set_page = 0;
+  grub_free (framebuffer.palette);
+  framebuffer.render_target = 0;
+  framebuffer.front_target = 0;
+  framebuffer.back_target = 0;
+  framebuffer.palette = 0;
+  framebuffer.palette_size = 0;
+  framebuffer.set_page = 0;
   return GRUB_ERR_NONE;
 }
 
@@ -79,15 +82,15 @@ grub_video_fb_fini (void)
 {
   /* TODO: destroy render targets.  */
 
-  grub_free (offscreen_buffer);
-  grub_free (palette);
-  render_target = 0;
-  front_target = 0;
-  back_target = 0;
-  palette = 0;
-  palette_size = 0;
-  set_page = 0;
-  offscreen_buffer = 0;
+  grub_free (framebuffer.offscreen_buffer);
+  grub_free (framebuffer.palette);
+  framebuffer.render_target = 0;
+  framebuffer.front_target = 0;
+  framebuffer.back_target = 0;
+  framebuffer.palette = 0;
+  framebuffer.palette_size = 0;
+  framebuffer.set_page = 0;
+  framebuffer.offscreen_buffer = 0;
   return GRUB_ERR_NONE;
 }
 
@@ -95,7 +98,7 @@ grub_err_t
 grub_video_fb_get_info (struct grub_video_mode_info *mode_info)
 {
   /* Copy mode info from active render target.  */
-  grub_memcpy (mode_info, &render_target->mode_info,
+  grub_memcpy (mode_info, &framebuffer.render_target->mode_info,
                sizeof (struct grub_video_mode_info));
 
   return GRUB_ERR_NONE;
@@ -108,8 +111,8 @@ grub_video_fb_get_palette (unsigned int start, unsigned int count,
   unsigned int i;
 
   /* Assume that we know everything from index color palette.  */
-  for (i = 0; (i < count) && ((i + start) < palette_size); i++)
-    palette_data[i] = palette[start + i];
+  for (i = 0; (i < count) && ((i + start) < framebuffer.palette_size); i++)
+    palette_data[i] = framebuffer.palette[start + i];
 
   return GRUB_ERR_NONE;
 }
@@ -119,18 +122,20 @@ grub_video_fb_set_palette (unsigned int start, unsigned int count,
 			   struct grub_video_palette_data *palette_data)
 {
   unsigned i;
-  if (start + count > palette_size)
+  if (start + count > framebuffer.palette_size)
     {
-      palette_size = start + count;
-      palette = grub_realloc (palette, sizeof (palette[0]) * palette_size);
-      if (!palette)
+      framebuffer.palette_size = start + count;
+      framebuffer.palette = grub_realloc (framebuffer.palette,
+					  sizeof (framebuffer.palette[0])
+					  * framebuffer.palette_size);
+      if (!framebuffer.palette)
 	{
 	  grub_video_fb_fini ();
 	  return grub_errno;
 	}
     }
-  for (i = 0; (i < count) && ((i + start) < palette_size); i++)
-    palette[start + i] = palette_data[i];
+  for (i = 0; (i < count) && ((i + start) < framebuffer.palette_size); i++)
+    framebuffer.palette[start + i] = palette_data[i];
   return GRUB_ERR_NONE;
 }
 
@@ -140,28 +145,28 @@ grub_video_fb_set_viewport (unsigned int x, unsigned int y,
 {
   /* Make sure viewport is withing screen dimensions.  If viewport was set
      to be out of the region, mark its size as zero.  */
-  if (x > render_target->mode_info.width)
+  if (x > framebuffer.render_target->mode_info.width)
     {
       x = 0;
       width = 0;
     }
 
-  if (y > render_target->mode_info.height)
+  if (y > framebuffer.render_target->mode_info.height)
     {
       y = 0;
       height = 0;
     }
 
-  if (x + width > render_target->mode_info.width)
-    width = render_target->mode_info.width - x;
+  if (x + width > framebuffer.render_target->mode_info.width)
+    width = framebuffer.render_target->mode_info.width - x;
 
-  if (y + height > render_target->mode_info.height)
-    height = render_target->mode_info.height - y;
+  if (y + height > framebuffer.render_target->mode_info.height)
+    height = framebuffer.render_target->mode_info.height - y;
 
-  render_target->viewport.x = x;
-  render_target->viewport.y = y;
-  render_target->viewport.width = width;
-  render_target->viewport.height = height;
+  framebuffer.render_target->viewport.x = x;
+  framebuffer.render_target->viewport.y = y;
+  framebuffer.render_target->viewport.width = width;
+  framebuffer.render_target->viewport.height = height;
 
   return GRUB_ERR_NONE;
 }
@@ -170,10 +175,10 @@ grub_err_t
 grub_video_fb_get_viewport (unsigned int *x, unsigned int *y,
 			    unsigned int *width, unsigned int *height)
 {
-  if (x) *x = render_target->viewport.x;
-  if (y) *y = render_target->viewport.y;
-  if (width) *width = render_target->viewport.width;
-  if (height) *height = render_target->viewport.height;
+  if (x) *x = framebuffer.render_target->viewport.x;
+  if (y) *y = framebuffer.render_target->viewport.y;
+  if (width) *width = framebuffer.render_target->viewport.width;
+  if (height) *height = framebuffer.render_target->viewport.height;
 
   return GRUB_ERR_NONE;
 }
@@ -184,18 +189,18 @@ grub_video_fb_map_color (grub_uint32_t color_name)
 {
   /* TODO: implement color theme mapping code.  */
 
-  if (color_name < palette_size)
+  if (color_name < framebuffer.palette_size)
     {
-      if ((render_target->mode_info.mode_type
+      if ((framebuffer.render_target->mode_info.mode_type
            & GRUB_VIDEO_MODE_TYPE_INDEX_COLOR) != 0)
         return color_name;
       else
         {
           grub_video_color_t color;
 
-          color = grub_video_fb_map_rgb (palette[color_name].r,
-					 palette[color_name].g,
-					 palette[color_name].b);
+          color = grub_video_fb_map_rgb (framebuffer.palette[color_name].r,
+					 framebuffer.palette[color_name].g,
+					 framebuffer.palette[color_name].b);
 
           return color;
         }
@@ -209,7 +214,7 @@ grub_video_color_t
 grub_video_fb_map_rgb (grub_uint8_t red, grub_uint8_t green,
 		       grub_uint8_t blue)
 {
-  if ((render_target->mode_info.mode_type
+  if ((framebuffer.render_target->mode_info.mode_type
        & GRUB_VIDEO_MODE_TYPE_INDEX_COLOR) != 0)
     {
       int minindex = 0;
@@ -219,13 +224,13 @@ grub_video_fb_map_rgb (grub_uint8_t red, grub_uint8_t green,
       unsigned i;
 
       /* Find best matching color.  */
-      for (i = 0; i < palette_size; i++)
+      for (i = 0; i < framebuffer.palette_size; i++)
         {
-          val = palette[i].r - red;
+          val = framebuffer.palette[i].r - red;
           tmp = val * val;
-          val = palette[i].g - green;
+          val = framebuffer.palette[i].g - green;
           tmp += val * val;
-          val = palette[i].b - blue;
+          val = framebuffer.palette[i].b - blue;
           tmp += val * val;
 
           if (i == 0)
@@ -242,12 +247,12 @@ grub_video_fb_map_rgb (grub_uint8_t red, grub_uint8_t green,
 
       return minindex;
     }
-  else if ((render_target->mode_info.mode_type
+  else if ((framebuffer.render_target->mode_info.mode_type
             & GRUB_VIDEO_MODE_TYPE_1BIT_BITMAP) != 0)
     {
-       if (red == render_target->mode_info.fg_red
-           && green == render_target->mode_info.fg_green
-           && blue == render_target->mode_info.fg_blue)
+       if (red == framebuffer.render_target->mode_info.fg_red
+           && green == framebuffer.render_target->mode_info.fg_green
+           && blue == framebuffer.render_target->mode_info.fg_blue)
          return 1;
        else
          return 0;
@@ -257,15 +262,15 @@ grub_video_fb_map_rgb (grub_uint8_t red, grub_uint8_t green,
       grub_uint32_t value;
       grub_uint8_t alpha = 255; /* Opaque color.  */
 
-      red >>= 8 - render_target->mode_info.red_mask_size;
-      green >>= 8 - render_target->mode_info.green_mask_size;
-      blue >>= 8 - render_target->mode_info.blue_mask_size;
-      alpha >>= 8 - render_target->mode_info.reserved_mask_size;
+      red >>= 8 - framebuffer.render_target->mode_info.red_mask_size;
+      green >>= 8 - framebuffer.render_target->mode_info.green_mask_size;
+      blue >>= 8 - framebuffer.render_target->mode_info.blue_mask_size;
+      alpha >>= 8 - framebuffer.render_target->mode_info.reserved_mask_size;
 
-      value = red << render_target->mode_info.red_field_pos;
-      value |= green << render_target->mode_info.green_field_pos;
-      value |= blue << render_target->mode_info.blue_field_pos;
-      value |= alpha << render_target->mode_info.reserved_field_pos;
+      value = red << framebuffer.render_target->mode_info.red_field_pos;
+      value |= green << framebuffer.render_target->mode_info.green_field_pos;
+      value |= blue << framebuffer.render_target->mode_info.blue_field_pos;
+      value |= alpha << framebuffer.render_target->mode_info.reserved_field_pos;
 
       return value;
     }
@@ -277,18 +282,18 @@ grub_video_color_t
 grub_video_fb_map_rgba (grub_uint8_t red, grub_uint8_t green,
 			grub_uint8_t blue, grub_uint8_t alpha)
 {
-  if ((render_target->mode_info.mode_type
+  if ((framebuffer.render_target->mode_info.mode_type
        & GRUB_VIDEO_MODE_TYPE_INDEX_COLOR) != 0)
     /* No alpha available in index color modes, just use
        same value as in only RGB modes.  */
     return grub_video_fb_map_rgb (red, green, blue);
-  else if ((render_target->mode_info.mode_type
+  else if ((framebuffer.render_target->mode_info.mode_type
             & GRUB_VIDEO_MODE_TYPE_1BIT_BITMAP) != 0)
     {
-      if (red == render_target->mode_info.fg_red
-          && green == render_target->mode_info.fg_green
-          && blue == render_target->mode_info.fg_blue
-          && alpha == render_target->mode_info.fg_alpha)
+      if (red == framebuffer.render_target->mode_info.fg_red
+          && green == framebuffer.render_target->mode_info.fg_green
+          && blue == framebuffer.render_target->mode_info.fg_blue
+          && alpha == framebuffer.render_target->mode_info.fg_alpha)
         return 1;
       else
         return 0;
@@ -297,15 +302,15 @@ grub_video_fb_map_rgba (grub_uint8_t red, grub_uint8_t green,
     {
       grub_uint32_t value;
 
-      red >>= 8 - render_target->mode_info.red_mask_size;
-      green >>= 8 - render_target->mode_info.green_mask_size;
-      blue >>= 8 - render_target->mode_info.blue_mask_size;
-      alpha >>= 8 - render_target->mode_info.reserved_mask_size;
+      red >>= 8 - framebuffer.render_target->mode_info.red_mask_size;
+      green >>= 8 - framebuffer.render_target->mode_info.green_mask_size;
+      blue >>= 8 - framebuffer.render_target->mode_info.blue_mask_size;
+      alpha >>= 8 - framebuffer.render_target->mode_info.reserved_mask_size;
 
-      value = red << render_target->mode_info.red_field_pos;
-      value |= green << render_target->mode_info.green_field_pos;
-      value |= blue << render_target->mode_info.blue_field_pos;
-      value |= alpha << render_target->mode_info.reserved_field_pos;
+      value = red << framebuffer.render_target->mode_info.red_field_pos;
+      value |= green << framebuffer.render_target->mode_info.green_field_pos;
+      value |= blue << framebuffer.render_target->mode_info.blue_field_pos;
+      value |= alpha << framebuffer.render_target->mode_info.reserved_field_pos;
 
       return value;
     }
@@ -319,8 +324,8 @@ grub_video_fb_unmap_color (grub_video_color_t color,
 {
   struct grub_video_fbblit_info target_info;
 
-  target_info.mode_info = &render_target->mode_info;
-  target_info.data = render_target->data;
+  target_info.mode_info = &framebuffer.render_target->mode_info;
+  target_info.data = framebuffer.render_target->data;
 
   grub_video_fb_unmap_color_int (&target_info, color, red, green, blue, alpha);
 
@@ -350,10 +355,10 @@ grub_video_fb_unmap_color_int (struct grub_video_fbblit_info * source,
           return;
         }
 
-      *red = palette[color].r;
-      *green = palette[color].g;
-      *blue = palette[color].b;
-      *alpha = palette[color].a;
+      *red = framebuffer.palette[color].r;
+      *green = framebuffer.palette[color].g;
+      *blue = framebuffer.palette[color].b;
+      *alpha = framebuffer.palette[color].a;
       return;
     }
   else if ((mode_info->mode_type
@@ -422,9 +427,9 @@ grub_video_fb_fill_rect (grub_video_color_t color, int x, int y,
   struct grub_video_fbblit_info target;
 
   /* Make sure there is something to do.  */
-  if ((x >= (int)render_target->viewport.width) || (x + (int)width < 0))
+  if ((x >= (int)framebuffer.render_target->viewport.width) || (x + (int)width < 0))
     return GRUB_ERR_NONE;
-  if ((y >= (int)render_target->viewport.height) || (y + (int)height < 0))
+  if ((y >= (int)framebuffer.render_target->viewport.height) || (y + (int)height < 0))
     return GRUB_ERR_NONE;
 
   /* Do not allow drawing out of viewport.  */
@@ -439,18 +444,18 @@ grub_video_fb_fill_rect (grub_video_color_t color, int x, int y,
       y = 0;
     }
 
-  if ((x + width) > render_target->viewport.width)
-    width = render_target->viewport.width - x;
-  if ((y + height) > render_target->viewport.height)
-    height = render_target->viewport.height - y;
+  if ((x + width) > framebuffer.render_target->viewport.width)
+    width = framebuffer.render_target->viewport.width - x;
+  if ((y + height) > framebuffer.render_target->viewport.height)
+    height = framebuffer.render_target->viewport.height - y;
 
   /* Add viewport offset.  */
-  x += render_target->viewport.x;
-  y += render_target->viewport.y;
+  x += framebuffer.render_target->viewport.x;
+  y += framebuffer.render_target->viewport.y;
 
   /* Use fbblit_info to encapsulate rendering.  */
-  target.mode_info = &render_target->mode_info;
-  target.data = render_target->data;
+  target.mode_info = &framebuffer.render_target->mode_info;
+  target.data = framebuffer.render_target->data;
 
   /* Try to figure out more optimized version.  Note that color is already
      mapped to target format so we can make assumptions based on that.  */
@@ -777,9 +782,9 @@ grub_video_fb_blit_bitmap (struct grub_video_bitmap *bitmap,
   /* Make sure there is something to do.  */
   if ((width == 0) || (height == 0))
     return GRUB_ERR_NONE;
-  if ((x >= (int)render_target->viewport.width) || (x + (int)width < 0))
+  if ((x >= (int)framebuffer.render_target->viewport.width) || (x + (int)width < 0))
     return GRUB_ERR_NONE;
-  if ((y >= (int)render_target->viewport.height) || (y + (int)height < 0))
+  if ((y >= (int)framebuffer.render_target->viewport.height) || (y + (int)height < 0))
     return GRUB_ERR_NONE;
   if ((x + (int)bitmap->mode_info.width) < 0)
     return GRUB_ERR_NONE;
@@ -822,10 +827,10 @@ grub_video_fb_blit_bitmap (struct grub_video_bitmap *bitmap,
     }
 
   /* Do not allow drawing out of viewport.  */
-  if ((x + width) > render_target->viewport.width)
-    width = render_target->viewport.width - x;
-  if ((y + height) > render_target->viewport.height)
-    height = render_target->viewport.height - y;
+  if ((x + width) > framebuffer.render_target->viewport.width)
+    width = framebuffer.render_target->viewport.width - x;
+  if ((y + height) > framebuffer.render_target->viewport.height)
+    height = framebuffer.render_target->viewport.height - y;
 
   if ((offset_x + width) > bitmap->mode_info.width)
     width = bitmap->mode_info.width - offset_x;
@@ -840,14 +845,14 @@ grub_video_fb_blit_bitmap (struct grub_video_bitmap *bitmap,
     height = bitmap->mode_info.height;
 
   /* Add viewport offset.  */
-  x += render_target->viewport.x;
-  y += render_target->viewport.y;
+  x += framebuffer.render_target->viewport.x;
+  y += framebuffer.render_target->viewport.y;
 
   /* Use fbblit_info to encapsulate rendering.  */
   source.mode_info = &bitmap->mode_info;
   source.data = bitmap->data;
-  target.mode_info = &render_target->mode_info;
-  target.data = render_target->data;
+  target.mode_info = &framebuffer.render_target->mode_info;
+  target.data = framebuffer.render_target->data;
 
   /* Do actual blitting.  */
   common_blitter (&target, &source, oper, x, y, width, height,
@@ -868,9 +873,9 @@ grub_video_fb_blit_render_target (struct grub_video_fbrender_target *source,
   /* Make sure there is something to do.  */
   if ((width == 0) || (height == 0))
     return GRUB_ERR_NONE;
-  if ((x >= (int)render_target->viewport.width) || (x + (int)width < 0))
+  if ((x >= (int)framebuffer.render_target->viewport.width) || (x + (int)width < 0))
     return GRUB_ERR_NONE;
-  if ((y >= (int)render_target->viewport.height) || (y + (int)height < 0))
+  if ((y >= (int)framebuffer.render_target->viewport.height) || (y + (int)height < 0))
     return GRUB_ERR_NONE;
   if ((x + (int)source->mode_info.width) < 0)
     return GRUB_ERR_NONE;
@@ -913,10 +918,10 @@ grub_video_fb_blit_render_target (struct grub_video_fbrender_target *source,
     }
 
   /* Do not allow drawing out of viewport.  */
-  if ((x + width) > render_target->viewport.width)
-    width = render_target->viewport.width - x;
-  if ((y + height) > render_target->viewport.height)
-    height = render_target->viewport.height - y;
+  if ((x + width) > framebuffer.render_target->viewport.width)
+    width = framebuffer.render_target->viewport.width - x;
+  if ((y + height) > framebuffer.render_target->viewport.height)
+    height = framebuffer.render_target->viewport.height - y;
 
   if ((offset_x + width) > source->mode_info.width)
     width = source->mode_info.width - offset_x;
@@ -931,14 +936,14 @@ grub_video_fb_blit_render_target (struct grub_video_fbrender_target *source,
     height = source->mode_info.height;
 
   /* Add viewport offset.  */
-  x += render_target->viewport.x;
-  y += render_target->viewport.y;
+  x += framebuffer.render_target->viewport.x;
+  y += framebuffer.render_target->viewport.y;
 
   /* Use fbblit_info to encapsulate rendering.  */
   source_info.mode_info = &source->mode_info;
   source_info.data = source->data;
-  target_info.mode_info = &render_target->mode_info;
-  target_info.data = render_target->data;
+  target_info.mode_info = &framebuffer.render_target->mode_info;
+  target_info.data = framebuffer.render_target->data;
 
   /* Do actual blitting.  */
   common_blitter (&target_info, &source_info, oper, x, y, width, height,
@@ -961,42 +966,42 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy)
   if ((dx == 0) && (dy == 0))
     return GRUB_ERR_NONE;
 
-  width = render_target->viewport.width - grub_abs (dx);
-  height = render_target->viewport.height - grub_abs (dy);
+  width = framebuffer.render_target->viewport.width - grub_abs (dx);
+  height = framebuffer.render_target->viewport.height - grub_abs (dy);
 
   if (dx < 0)
     {
-      src_x = render_target->viewport.x - dx;
-      dst_x = render_target->viewport.x;
+      src_x = framebuffer.render_target->viewport.x - dx;
+      dst_x = framebuffer.render_target->viewport.x;
     }
   else
     {
-      src_x = render_target->viewport.x;
-      dst_x = render_target->viewport.x + dx;
+      src_x = framebuffer.render_target->viewport.x;
+      dst_x = framebuffer.render_target->viewport.x + dx;
     }
 
   if (dy < 0)
     {
-      src_y = render_target->viewport.y - dy;
-      dst_y = render_target->viewport.y;
+      src_y = framebuffer.render_target->viewport.y - dy;
+      dst_y = framebuffer.render_target->viewport.y;
     }
   else
     {
-      src_y = render_target->viewport.y;
-      dst_y = render_target->viewport.y + dy;
+      src_y = framebuffer.render_target->viewport.y;
+      dst_y = framebuffer.render_target->viewport.y + dy;
     }
 
   /* 2. Check if there is need to copy data.  */
-  if ((grub_abs (dx) < render_target->viewport.width)
-       && (grub_abs (dy) < render_target->viewport.height))
+  if ((grub_abs (dx) < framebuffer.render_target->viewport.width)
+       && (grub_abs (dy) < framebuffer.render_target->viewport.height))
     {
       /* 3. Move data in render target.  */
       struct grub_video_fbblit_info target;
       int i, j;
       int linedelta, linelen;
 
-      target.mode_info = &render_target->mode_info;
-      target.data = render_target->data;
+      target.mode_info = &framebuffer.render_target->mode_info;
+      target.data = framebuffer.render_target->data;
 
       linedelta = target.mode_info->pitch
 	- width * target.mode_info->bytes_per_pixel;
@@ -1079,27 +1084,27 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy)
 
   /* 4a. Fill top & bottom parts.  */
   if (dy > 0)
-    grub_video_fb_fill_rect (color, 0, 0, render_target->viewport.width, dy);
+    grub_video_fb_fill_rect (color, 0, 0, framebuffer.render_target->viewport.width, dy);
   else if (dy < 0)
     {
-      if (render_target->viewport.height < grub_abs (dy))
-        dy = -render_target->viewport.height;
+      if (framebuffer.render_target->viewport.height < grub_abs (dy))
+        dy = -framebuffer.render_target->viewport.height;
 
-      grub_video_fb_fill_rect (color, 0, render_target->viewport.height + dy,
-                                render_target->viewport.width, -dy);
+      grub_video_fb_fill_rect (color, 0, framebuffer.render_target->viewport.height + dy,
+                                framebuffer.render_target->viewport.width, -dy);
     }
 
   /* 4b. Fill left & right parts.  */
   if (dx > 0)
     grub_video_fb_fill_rect (color, 0, 0,
-                              dx, render_target->viewport.height);
+                              dx, framebuffer.render_target->viewport.height);
   else if (dx < 0)
     {
-      if (render_target->viewport.width < grub_abs (dx))
-        dx = -render_target->viewport.width;
+      if (framebuffer.render_target->viewport.width < grub_abs (dx))
+        dx = -framebuffer.render_target->viewport.width;
 
-      grub_video_fb_fill_rect (color, render_target->viewport.width + dx, 0,
-                                -dx, render_target->viewport.height);
+      grub_video_fb_fill_rect (color, framebuffer.render_target->viewport.width + dx, 0,
+                                -dx, framebuffer.render_target->viewport.height);
     }
 
   return GRUB_ERR_NONE;
@@ -1146,7 +1151,7 @@ grub_video_fb_create_render_target (struct grub_video_fbrender_target **result,
   target->mode_info.bpp = 32;
   target->mode_info.bytes_per_pixel = 4;
   target->mode_info.pitch = target->mode_info.bytes_per_pixel * width;
-  target->mode_info.number_of_colors = palette_size; /* Emulated palette.  */
+  target->mode_info.number_of_colors = framebuffer.palette_size; /* Emulated palette.  */
   target->mode_info.red_mask_size = 8;
   target->mode_info.red_field_pos = 0;
   target->mode_info.green_mask_size = 8;
@@ -1239,13 +1244,13 @@ grub_video_fb_set_active_render_target (struct grub_video_fbrender_target *targe
 {
   if (target == (struct grub_video_fbrender_target *)
       GRUB_VIDEO_RENDER_TARGET_DISPLAY)
-      target = back_target;
+    target = framebuffer.back_target;
 
   if (! target->data)
     return grub_error (GRUB_ERR_BAD_ARGUMENT,
                        "invalid render target given");
 
-  render_target = target;
+  framebuffer.render_target = target;
 
   return GRUB_ERR_NONE;
 }
@@ -1253,9 +1258,9 @@ grub_video_fb_set_active_render_target (struct grub_video_fbrender_target *targe
 grub_err_t
 grub_video_fb_get_active_render_target (struct grub_video_fbrender_target **target)
 {
-  *target = render_target;
+  *target = framebuffer.render_target;
 
-  if (*target == back_target)
+  if (*target == framebuffer.back_target)
     *target = (struct grub_video_fbrender_target *) GRUB_VIDEO_RENDER_TARGET_DISPLAY;
 
   return GRUB_ERR_NONE;
@@ -1284,8 +1289,8 @@ grub_video_fb_doublebuf_blit_init (struct grub_video_fbrender_target **front,
   if (err)
     return err;
 
-  offscreen_buffer = grub_malloc (page_size);
-  if (! offscreen_buffer)
+  framebuffer.offscreen_buffer = grub_malloc (page_size);
+  if (! framebuffer.offscreen_buffer)
     {
       grub_video_fb_delete_render_target (*front);
       *front = 0;
@@ -1293,18 +1298,19 @@ grub_video_fb_doublebuf_blit_init (struct grub_video_fbrender_target **front,
     }
 
   err = grub_video_fb_create_render_target_from_pointer (back, &mode_info,
-							 offscreen_buffer);
+							 framebuffer.offscreen_buffer);
 
   if (err)
     {
       grub_video_fb_delete_render_target (*front);
-      grub_free (offscreen_buffer);
+      grub_free (framebuffer.offscreen_buffer);
+      framebuffer.offscreen_buffer = 0;
       *front = 0;
       return grub_errno;
     }
   (*back)->is_allocated = 1;
 
-  update_screen = doublebuf_blit_update_screen;
+  framebuffer.update_screen = doublebuf_blit_update_screen;
 
   return GRUB_ERR_NONE;
 }
@@ -1320,35 +1326,37 @@ doublebuf_pageflipping_update_screen (struct grub_video_fbrender_target *front
   grub_err_t err;
 
   /* Swap the page numbers in the framebuffer struct.  */
-  new_displayed_page = render_page;
-  render_page = displayed_page;
-  displayed_page = new_displayed_page;
+  new_displayed_page = framebuffer.render_page;
+  framebuffer.render_page = framebuffer.displayed_page;
+  framebuffer.displayed_page = new_displayed_page;
 
-  err = set_page (displayed_page);
+  err = framebuffer.set_page (framebuffer.displayed_page);
   if (err)
     {
       /* Restore previous state.  */
-      render_page = displayed_page;
-      displayed_page = new_displayed_page;
+      framebuffer.render_page = framebuffer.displayed_page;
+      framebuffer.displayed_page = new_displayed_page;
       return err;
     }
 
-  target = back_target;
-  back_target = front_target;
-  front_target = target;
+  target = framebuffer.back_target;
+  framebuffer.back_target = framebuffer.front_target;
+  framebuffer.front_target = target;
 
-  if (front_target->mode_info.mode_type & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP)
-    grub_memcpy (back_target->data, front_target->data,
-		 back_target->mode_info.pitch * back_target->mode_info.height);
+  if (framebuffer.front_target->mode_info.mode_type
+      & GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP)
+    grub_memcpy (framebuffer.back_target->data, framebuffer.front_target->data,
+		 framebuffer.back_target->mode_info.pitch
+		 * framebuffer.back_target->mode_info.height);
 
   err = grub_video_fb_get_active_render_target (&target);
   if (err)
     return err;
 
-  if (render_target == back_target)
-    render_target = front_target;
-  else if (target == front_target)
-    render_target = back_target;
+  if (framebuffer.render_target == framebuffer.back_target)
+    framebuffer.render_target = framebuffer.front_target;
+  else if (framebuffer.render_target == framebuffer.front_target)
+    framebuffer.render_target = framebuffer.back_target;
 
   return err;
 }
@@ -1361,35 +1369,35 @@ doublebuf_pageflipping_init (struct grub_video_mode_info *mode_info,
 {
   grub_err_t err;
 
-  displayed_page = 0;
-  render_page = 1;
+  framebuffer.displayed_page = 0;
+  framebuffer.render_page = 1;
 
-  update_screen = doublebuf_pageflipping_update_screen;
+  framebuffer.update_screen = doublebuf_pageflipping_update_screen;
 
-  err = grub_video_fb_create_render_target_from_pointer (&front_target,
+  err = grub_video_fb_create_render_target_from_pointer (&framebuffer.front_target,
 							 mode_info,
 							 (void *) page0_ptr);
   if (err)
     return err;
 
-  err = grub_video_fb_create_render_target_from_pointer (&back_target,
+  err = grub_video_fb_create_render_target_from_pointer (&framebuffer.back_target,
 							 mode_info,
 							 (void *) page1_ptr);
   if (err)
     {
-      grub_video_fb_delete_render_target (front_target);
+      grub_video_fb_delete_render_target (framebuffer.front_target);
       return err;
     }
 
   /* Set the framebuffer memory data pointer and display the right page.  */
-  err = set_page_in (displayed_page);
+  err = set_page_in (framebuffer.displayed_page);
   if (err)
     {
-      grub_video_fb_delete_render_target (front_target);
-      grub_video_fb_delete_render_target (back_target);
+      grub_video_fb_delete_render_target (framebuffer.front_target);
+      grub_video_fb_delete_render_target (framebuffer.back_target);
       return err;
     }
-  set_page = set_page_in;
+  framebuffer.set_page = set_page_in;
 
   return GRUB_ERR_NONE;
 }
@@ -1423,7 +1431,7 @@ grub_video_fb_setup (unsigned int mode_type, unsigned int mode_mask,
 					 page1_ptr);
       if (!err)
 	{
-	  render_target = back_target;
+	  framebuffer.render_target = framebuffer.back_target;
 	  return GRUB_ERR_NONE;
 	}
       
@@ -1440,14 +1448,14 @@ grub_video_fb_setup (unsigned int mode_type, unsigned int mode_mask,
       mode_info->mode_type |= (GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
 			       | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
 
-      err = grub_video_fb_doublebuf_blit_init (&front_target,
-					       &back_target,
+      err = grub_video_fb_doublebuf_blit_init (&framebuffer.front_target,
+					       &framebuffer.back_target,
 					       *mode_info,
 					       (void *) page0_ptr);
 
       if (!err)
 	{
-	  render_target = back_target;
+	  framebuffer.render_target = framebuffer.back_target;
 	  return GRUB_ERR_NONE;
 	}
 
@@ -1458,19 +1466,19 @@ grub_video_fb_setup (unsigned int mode_type, unsigned int mode_mask,
     }
 
   /* Fall back to no double buffering.  */
-  err = grub_video_fb_create_render_target_from_pointer (&front_target,
+  err = grub_video_fb_create_render_target_from_pointer (&framebuffer.front_target,
 							 mode_info,
 							 (void *) page0_ptr);
 
   if (err)
     return err;
 
-  back_target = front_target;
-  update_screen = 0;
+  framebuffer.back_target = framebuffer.front_target;
+  framebuffer.update_screen = 0;
 
   mode_info->mode_type &= ~GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED;
 
-  render_target = back_target;
+  framebuffer.render_target = framebuffer.back_target;
 
   return GRUB_ERR_NONE;
 }
@@ -1480,10 +1488,11 @@ grub_err_t
 grub_video_fb_swap_buffers (void)
 {
   grub_err_t err;
-  if (!update_screen)
+  if (!framebuffer.update_screen)
     return GRUB_ERR_NONE;
 
-  err = update_screen (front_target, back_target);
+  err = framebuffer.update_screen (framebuffer.front_target,
+				   framebuffer.back_target);
   if (err)
     return err;
 
@@ -1494,8 +1503,9 @@ grub_err_t
 grub_video_fb_get_info_and_fini (struct grub_video_mode_info *mode_info,
 				 void **framebuf)
 {
-  grub_memcpy (mode_info, &(front_target->mode_info), sizeof (*mode_info));
-  *framebuf = front_target->data;
+  grub_memcpy (mode_info, &(framebuffer.front_target->mode_info),
+	       sizeof (*mode_info));
+  *framebuf = framebuffer.front_target->data;
 
   grub_video_fb_fini ();
 

From d00b0b3f4d25e0945d1aadb59afa1752b43b680a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 16 May 2010 20:20:31 +0200
Subject: [PATCH 0962/1628] Support double buffering on video cirrus

---
 video/cirrus.c | 108 +++++++++++++++++++++++++++++--------------------
 1 file changed, 64 insertions(+), 44 deletions(-)

diff --git a/video/cirrus.c b/video/cirrus.c
index ae1bd9940..09dbb2c1d 100644
--- a/video/cirrus.c
+++ b/video/cirrus.c
@@ -30,7 +30,7 @@
 static struct
 {
   struct grub_video_mode_info mode_info;
-  struct grub_video_render_target *render_target;
+  grub_size_t page_size;        /* The size of a page in bytes.  */
 
   grub_uint8_t *ptr;
   int mapped;
@@ -69,12 +69,15 @@ enum
     CIRRUS_CR_WIDTH = 0x01,
     CIRRUS_CR_OVERFLOW = 0x07,
     CIRRUS_CR_CELL_HEIGHT = 0x09,
+    CIRRUS_CR_SCREEN_START_HIGH = 0xc,
+    CIRRUS_CR_SCREEN_START_LOW = 0xd,
     CIRRUS_CR_VSYNC_END = 0x11,
     CIRRUS_CR_HEIGHT = 0x12,
     CIRRUS_CR_PITCH = 0x13,
     CIRRUS_CR_MODE = 0x17,
     CIRRUS_CR_LINE_COMPARE = 0x18,
     CIRRUS_CR_EXTENDED_DISPLAY = 0x1b,
+    CIRRUS_CR_EXTENDED_OVERLAY = 0x1d,
     CIRRUS_CR_MAX
   };
 
@@ -85,17 +88,25 @@ enum
 #define CIRRUS_CR_OVERFLOW_HEIGHT1_MASK 0x02
 #define CIRRUS_CR_OVERFLOW_HEIGHT2_SHIFT 3
 #define CIRRUS_CR_OVERFLOW_HEIGHT2_MASK 0xc0
-#define CIRRUS_CR_OVERFLOW_LINE_COMPARE_MASK 0x10
 #define CIRRUS_CR_OVERFLOW_LINE_COMPARE_SHIFT 4
-
-#define CIRRUS_CR_EXTENDED_DISPLAY_PITCH_MASK 0x10
-#define CIRRUS_CR_EXTENDED_DISPLAY_PITCH_SHIFT 4
+#define CIRRUS_CR_OVERFLOW_LINE_COMPARE_MASK 0x10
 
 #define CIRRUS_CR_MODE_TIMING_ENABLE 0x80
 #define CIRRUS_CR_MODE_BYTE_MODE 0x40
 #define CIRRUS_CR_MODE_NO_HERCULES 0x02
 #define CIRRUS_CR_MODE_NO_CGA 0x01
 
+#define CIRRUS_CR_EXTENDED_DISPLAY_PITCH_MASK 0x10
+#define CIRRUS_CR_EXTENDED_DISPLAY_PITCH_SHIFT 4
+#define CIRRUS_CR_EXTENDED_DISPLAY_START_MASK1 0x1
+#define CIRRUS_CR_EXTENDED_DISPLAY_START_SHIFT1 16
+#define CIRRUS_CR_EXTENDED_DISPLAY_START_MASK2 0xc
+#define CIRRUS_CR_EXTENDED_DISPLAY_START_SHIFT2 15
+
+#define CIRRUS_CR_EXTENDED_OVERLAY_DISPLAY_START_MASK 0x80
+#define CIRRUS_CR_EXTENDED_OVERLAY_DISPLAY_START_SHIFT 12
+
+
 enum
   {
     CIRRUS_SR_MEMORY_MODE = 4,
@@ -242,6 +253,33 @@ grub_video_cirrus_video_fini (void)
   return grub_video_fb_fini ();
 }
 
+static grub_err_t
+doublebuf_pageflipping_set_page (int page)
+{
+  int start = framebuffer.page_size * page / 4;
+  grub_uint8_t cr_ext, cr_overlay;
+
+  cr_write (start & 0xff, CIRRUS_CR_SCREEN_START_LOW);
+  cr_write ((start & 0xff00) >> 8, CIRRUS_CR_SCREEN_START_HIGH);
+
+  cr_ext = cr_read (CIRRUS_CR_EXTENDED_DISPLAY);
+  cr_ext &= ~(CIRRUS_CR_EXTENDED_DISPLAY_START_MASK1
+	      | CIRRUS_CR_EXTENDED_DISPLAY_START_MASK2);
+  cr_ext |= ((start >> CIRRUS_CR_EXTENDED_DISPLAY_START_SHIFT1)
+	     & CIRRUS_CR_EXTENDED_DISPLAY_START_MASK1);
+  cr_ext |= ((start >> CIRRUS_CR_EXTENDED_DISPLAY_START_SHIFT2)
+	     & CIRRUS_CR_EXTENDED_DISPLAY_START_MASK2);
+  cr_write (cr_ext, CIRRUS_CR_EXTENDED_DISPLAY);
+
+  cr_overlay = cr_read (CIRRUS_CR_EXTENDED_OVERLAY);
+  cr_overlay &= ~(CIRRUS_CR_EXTENDED_OVERLAY_DISPLAY_START_MASK);
+  cr_overlay |= ((start >> CIRRUS_CR_EXTENDED_OVERLAY_DISPLAY_START_SHIFT)
+		 & CIRRUS_CR_EXTENDED_OVERLAY_DISPLAY_START_MASK);
+  cr_write (cr_overlay, CIRRUS_CR_EXTENDED_OVERLAY);
+
+  return GRUB_ERR_NONE;
+}
+
 static grub_err_t
 grub_video_cirrus_setup (unsigned int width, unsigned int height,
 			unsigned int mode_type, unsigned int mode_mask __attribute__ ((unused)))
@@ -310,6 +348,11 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height,
 		       "screen width must be at most %d at bitdepth %d",
 		       CIRRUS_MAX_PITCH / bytes_per_pixel, depth);
 
+  framebuffer.page_size = pitch * height;
+
+  if (framebuffer.page_size > CIRRUS_APERTURE_SIZE)
+    return grub_error (GRUB_ERR_IO, "Not enough video memory for this mode");
+
   grub_pci_iterate (find_card);
   if (!found)
     return grub_error (GRUB_ERR_IO, "Couldn't find graphics card");
@@ -317,6 +360,7 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height,
   if (found && framebuffer.base == 0)
     {
       /* FIXME: change framebuffer base */
+      return grub_error (GRUB_ERR_IO, "PCI BAR not set");
     }
 
   /* We can safely discard volatile attribute.  */
@@ -372,6 +416,8 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height,
 	      | CIRRUS_CR_MODE_NO_HERCULES | CIRRUS_CR_MODE_NO_CGA,
 	      CIRRUS_CR_MODE);
 
+    doublebuf_pageflipping_set_page (0);
+
     sr_ext = CIRRUS_SR_EXTENDED_MODE_LFB_ENABLE
       | CIRRUS_SR_EXTENDED_MODE_ENABLE_EXT;
     switch (depth)
@@ -438,15 +484,17 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height,
 
   framebuffer.mode_info.blit_format = grub_video_get_blit_format (&framebuffer.mode_info);
 
-  err = grub_video_fb_create_render_target_from_pointer (&framebuffer.render_target, &framebuffer.mode_info, framebuffer.ptr);
+  if (CIRRUS_APERTURE_SIZE >= 2 * framebuffer.page_size)
+    err = grub_video_fb_setup (mode_type, mode_mask,
+			       &framebuffer.mode_info,
+			       framebuffer.ptr,
+			       doublebuf_pageflipping_set_page,
+			       framebuffer.ptr + framebuffer.page_size);
+  else
+    err = grub_video_fb_setup (mode_type, mode_mask,
+			       &framebuffer.mode_info,
+			       framebuffer.ptr, 0, 0);
 
-  if (err)
-    return err;
-
-  err = grub_video_fb_set_active_render_target (framebuffer.render_target);
-  
-  if (err)
-    return err;
 
   /* Copy default palette to initialize emulated palette.  */
   err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
@@ -467,34 +515,6 @@ grub_video_cirrus_set_palette (unsigned int start, unsigned int count,
   return grub_video_fb_set_palette (start, count, palette_data);
 }
 
-static grub_err_t
-grub_video_cirrus_swap_buffers (void)
-{
-  /* TODO: Implement buffer swapping.  */
-  return GRUB_ERR_NONE;
-}
-
-static grub_err_t
-grub_video_cirrus_set_active_render_target (struct grub_video_render_target *target)
-{
-  if (target == GRUB_VIDEO_RENDER_TARGET_DISPLAY)
-      target = framebuffer.render_target;
-
-  return grub_video_fb_set_active_render_target (target);
-}
-
-static grub_err_t
-grub_video_cirrus_get_info_and_fini (struct grub_video_mode_info *mode_info,
-				    void **framebuf)
-{
-  grub_memcpy (mode_info, &(framebuffer.mode_info), sizeof (*mode_info));
-  *framebuf = (char *) framebuffer.ptr;
-
-  grub_video_fb_fini ();
-
-  return GRUB_ERR_NONE;
-}
-
 
 static struct grub_video_adapter grub_video_cirrus_adapter =
   {
@@ -505,7 +525,7 @@ static struct grub_video_adapter grub_video_cirrus_adapter =
     .fini = grub_video_cirrus_video_fini,
     .setup = grub_video_cirrus_setup,
     .get_info = grub_video_fb_get_info,
-    .get_info_and_fini = grub_video_cirrus_get_info_and_fini,
+    .get_info_and_fini = grub_video_fb_get_info_and_fini,
     .set_palette = grub_video_cirrus_set_palette,
     .get_palette = grub_video_fb_get_palette,
     .set_viewport = grub_video_fb_set_viewport,
@@ -518,10 +538,10 @@ static struct grub_video_adapter grub_video_cirrus_adapter =
     .blit_bitmap = grub_video_fb_blit_bitmap,
     .blit_render_target = grub_video_fb_blit_render_target,
     .scroll = grub_video_fb_scroll,
-    .swap_buffers = grub_video_cirrus_swap_buffers,
+    .swap_buffers = grub_video_fb_swap_buffers,
     .create_render_target = grub_video_fb_create_render_target,
     .delete_render_target = grub_video_fb_delete_render_target,
-    .set_active_render_target = grub_video_cirrus_set_active_render_target,
+    .set_active_render_target = grub_video_fb_set_active_render_target,
     .get_active_render_target = grub_video_fb_get_active_render_target,
 
     .next = 0

From 63c1b71cbbbc6468fb98ca63dd4248398fe254d9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 16 May 2010 20:44:44 +0200
Subject: [PATCH 0963/1628] Cleanup hidden DAC part.

---
 video/cirrus.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/video/cirrus.c b/video/cirrus.c
index 09dbb2c1d..2e487311e 100644
--- a/video/cirrus.c
+++ b/video/cirrus.c
@@ -121,6 +121,15 @@ enum
 #define CIRRUS_SR_EXTENDED_MODE_16BPP      0x06
 #define CIRRUS_SR_EXTENDED_MODE_32BPP      0x08
 
+#define CIRRUS_HIDDEN_DAC_ENABLE_EXT 0x80
+#define CIRRUS_HIDDEN_DAC_ENABLE_ALL 0x40
+#define CIRRUS_HIDDEN_DAC_15BPP (CIRRUS_HIDDEN_DAC_ENABLE_EXT \
+				 | CIRRUS_HIDDEN_DAC_ENABLE_ALL | 0)
+#define CIRRUS_HIDDEN_DAC_16BPP (CIRRUS_HIDDEN_DAC_ENABLE_EXT \
+				 | CIRRUS_HIDDEN_DAC_ENABLE_ALL | 1)
+#define CIRRUS_HIDDEN_DAC_888COLOR (CIRRUS_HIDDEN_DAC_ENABLE_EXT \
+				    | CIRRUS_HIDDEN_DAC_ENABLE_ALL | 5)
+
 static void
 gr_write (grub_uint8_t val, grub_uint8_t addr)
 {
@@ -377,7 +386,7 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height,
 
   {
     int pitch_reg, overflow_reg = 0, line_compare = 0x3ff;
-    grub_uint8_t sr_ext = 0;
+    grub_uint8_t sr_ext = 0, hidden_dac = 0;
 
     pitch_reg = pitch / CIRRUS_WIDTH_DIVISOR;
 
@@ -422,19 +431,26 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height,
       | CIRRUS_SR_EXTENDED_MODE_ENABLE_EXT;
     switch (depth)
       {
+	/* FIXME: support 8-bit grayscale and 8-bit RGB.  */
       case 32:
+	hidden_dac = CIRRUS_HIDDEN_DAC_888COLOR;
 	sr_ext |= CIRRUS_SR_EXTENDED_MODE_32BPP;
 	break;
       case 24:
+	hidden_dac = CIRRUS_HIDDEN_DAC_888COLOR;
 	sr_ext |= CIRRUS_SR_EXTENDED_MODE_24BPP;
 	break;
       case 16:
+	hidden_dac = CIRRUS_HIDDEN_DAC_16BPP;
+	sr_ext |= CIRRUS_SR_EXTENDED_MODE_16BPP;
+	break;
       case 15:
+	hidden_dac = CIRRUS_HIDDEN_DAC_15BPP;
 	sr_ext |= CIRRUS_SR_EXTENDED_MODE_16BPP;
 	break;
       }
     sr_write (sr_ext, CIRRUS_SR_EXTENDED_MODE);
-    write_hidden_dac (depth == 16);
+    write_hidden_dac (hidden_dac);
   }
 
   /* Fill mode info details.  */

From 31e0ce4d105ac35b4f4d1103713bf66518b0fccf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 16 May 2010 21:18:40 +0200
Subject: [PATCH 0964/1628] Support index color in video_cirrus

---
 video/cirrus.c | 137 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 97 insertions(+), 40 deletions(-)

diff --git a/video/cirrus.c b/video/cirrus.c
index 2e487311e..1e55770b4 100644
--- a/video/cirrus.c
+++ b/video/cirrus.c
@@ -40,12 +40,19 @@ static struct
 
 #define CIRRUS_APERTURE_SIZE 0x200000
 
-#define GR_INDEX 0x3ce
-#define GR_DATA 0x3cf
-#define CR_INDEX 0x3d4
-#define CR_DATA 0x3d5
-#define SR_INDEX 0x3c4
-#define SR_DATA 0x3c5
+enum
+  {
+    SR_INDEX = 0x3c4,
+    SR_DATA = 0x3c5,
+    CIRRUS_PIXEL_MASK = 0x3c6,
+    CIRRUS_PALLETTE_READ_INDEX = 0x3c7,
+    CIRRUS_PALLETTE_WRITE_INDEX = 0x3c8,
+    CIRRUS_PALLETTE_DATA = 0x3c9,
+    GR_INDEX = 0x3ce,
+    GR_DATA = 0x3cf,
+    CR_INDEX = 0x3d4,
+    CR_DATA = 0x3d5,
+  };
 
 #define CIRRUS_MAX_WIDTH 0x800
 #define CIRRUS_WIDTH_DIVISOR 8
@@ -117,12 +124,14 @@ enum
 #define CIRRUS_SR_MEMORY_MODE_NORMAL 0
 #define CIRRUS_SR_EXTENDED_MODE_LFB_ENABLE 0xf0
 #define CIRRUS_SR_EXTENDED_MODE_ENABLE_EXT 0x01
-#define CIRRUS_SR_EXTENDED_MODE_24BPP      0x04
+#define CIRRUS_SR_EXTENDED_MODE_8BPP       0x00
 #define CIRRUS_SR_EXTENDED_MODE_16BPP      0x06
+#define CIRRUS_SR_EXTENDED_MODE_24BPP      0x04
 #define CIRRUS_SR_EXTENDED_MODE_32BPP      0x08
 
 #define CIRRUS_HIDDEN_DAC_ENABLE_EXT 0x80
 #define CIRRUS_HIDDEN_DAC_ENABLE_ALL 0x40
+#define CIRRUS_HIDDEN_DAC_8BPP 0
 #define CIRRUS_HIDDEN_DAC_15BPP (CIRRUS_HIDDEN_DAC_ENABLE_EXT \
 				 | CIRRUS_HIDDEN_DAC_ENABLE_ALL | 0)
 #define CIRRUS_HIDDEN_DAC_16BPP (CIRRUS_HIDDEN_DAC_ENABLE_EXT \
@@ -175,23 +184,43 @@ sr_read (grub_uint8_t addr)
 static void
 write_hidden_dac (grub_uint8_t data)
 {
-  grub_inb (0x3c8);
-  grub_inb (0x3c6);
-  grub_inb (0x3c6);
-  grub_inb (0x3c6);
-  grub_inb (0x3c6);
-  grub_outb (data, 0x3c6);
+  grub_inb (CIRRUS_PALLETTE_WRITE_INDEX);
+  grub_inb (CIRRUS_PIXEL_MASK);
+  grub_inb (CIRRUS_PIXEL_MASK);
+  grub_inb (CIRRUS_PIXEL_MASK);
+  grub_inb (CIRRUS_PIXEL_MASK);
+  grub_outb (data, CIRRUS_PIXEL_MASK);
 }
 
 static grub_uint8_t
 read_hidden_dac (void)
 {
-  grub_inb (0x3c8);
-  grub_inb (0x3c6);
-  grub_inb (0x3c6);
-  grub_inb (0x3c6);
-  grub_inb (0x3c6);
-  return grub_inb (0x3c6);
+  grub_inb (CIRRUS_PALLETTE_WRITE_INDEX);
+  grub_inb (CIRRUS_PIXEL_MASK);
+  grub_inb (CIRRUS_PIXEL_MASK);
+  grub_inb (CIRRUS_PIXEL_MASK);
+  grub_inb (CIRRUS_PIXEL_MASK);
+  return grub_inb (CIRRUS_PIXEL_MASK);
+}
+
+static void
+palette_read (grub_uint8_t addr, grub_uint8_t *r, grub_uint8_t *g,
+	      grub_uint8_t *b)
+{
+  grub_outb (addr, CIRRUS_PALLETTE_READ_INDEX);
+  *r = grub_inb (CIRRUS_PALLETTE_DATA);
+  *g = grub_inb (CIRRUS_PALLETTE_DATA);
+  *b = grub_inb (CIRRUS_PALLETTE_DATA);
+}
+
+static void
+palette_write (grub_uint8_t addr, grub_uint8_t r, grub_uint8_t g,
+	       grub_uint8_t b)
+{
+  grub_outb (addr, CIRRUS_PALLETTE_READ_INDEX);
+  grub_outb (r, CIRRUS_PALLETTE_DATA);
+  grub_outb (g, CIRRUS_PALLETTE_DATA);
+  grub_outb (b, CIRRUS_PALLETTE_DATA);
 }
 
 struct saved_state
@@ -202,6 +231,9 @@ struct saved_state
   grub_uint8_t hidden_dac;
   /* We need to preserve VGA font and VGA text. */
   grub_uint8_t vram[32 * 4 * 256];
+  grub_uint8_t r[256];
+  grub_uint8_t g[256];
+  grub_uint8_t b[256];
 };
 
 static struct saved_state initial_state;
@@ -217,6 +249,9 @@ save_state (struct saved_state *st)
     st->sr[i] = sr_read (i);
   for (i = 0; i < ARRAY_SIZE (st->gr); i++)
     st->gr[i] = gr_read (i);
+  for (i = 0; i < 256; i++)
+    palette_read (i, st->r + i, st->g + i, st->b + i);
+
   st->hidden_dac = read_hidden_dac ();
   sr_write (CIRRUS_SR_MEMORY_MODE_CHAIN4, CIRRUS_SR_MEMORY_MODE);
   grub_memcpy (st->vram, framebuffer.ptr, sizeof (st->vram));
@@ -234,6 +269,9 @@ restore_state (struct saved_state *st)
     sr_write (st->sr[i], i);
   for (i = 0; i < ARRAY_SIZE (st->gr); i++)
     gr_write (st->gr[i], i);
+  for (i = 0; i < 256; i++)
+    palette_write (i, st->r[i], st->g[i], st->b[i]);
+
   write_hidden_dac (st->hidden_dac);
 }
 
@@ -289,9 +327,30 @@ doublebuf_pageflipping_set_page (int page)
   return GRUB_ERR_NONE;
 }
 
+static grub_err_t
+grub_video_cirrus_set_palette (unsigned int start, unsigned int count,
+			       struct grub_video_palette_data *palette_data)
+{
+  if (framebuffer.mode_info.mode_type == GRUB_VIDEO_MODE_TYPE_INDEX_COLOR)
+    {
+      unsigned i;
+      if (start >= 0x100)
+	return GRUB_ERR_NONE;
+      if (start + count >= 0x100)
+	count = 0x100 - start;
+
+      for (i = 0; i < count; i++)
+	palette_write (start + i, palette_data[i].r, palette_data[i].g,
+		       palette_data[i].b);
+    }
+
+  /* Then set color to emulated palette.  */
+  return grub_video_fb_set_palette (start, count, palette_data);
+}
+
 static grub_err_t
 grub_video_cirrus_setup (unsigned int width, unsigned int height,
-			unsigned int mode_type, unsigned int mode_mask __attribute__ ((unused)))
+			 unsigned int mode_type, unsigned int mode_mask)
 {
   int depth;
   grub_err_t err;
@@ -342,12 +401,17 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height,
     return grub_error (GRUB_ERR_IO,
 		       "screen height must be at most %d", CIRRUS_MAX_HEIGHT);
 
-  if (depth == 0)
+  if (depth == 0
+      && !grub_video_check_mode_flag (mode_type, mode_mask,
+				      GRUB_VIDEO_MODE_TYPE_INDEX_COLOR, 0))
     depth = 24;
 
-  if (depth != 32 && depth != 24 && depth != 16 && depth != 15)
-    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-		       "only 32, 24, 16 and 15-bit bpp are supported");
+  if (depth == 0)
+    depth = 8;
+
+  if (depth != 32 && depth != 24 && depth != 16 && depth != 15 && depth != 8)
+    return grub_error (GRUB_ERR_IO, "only 32, 24, 16, 15 and 8-bit bpp are"
+		       " supported by cirrus video");
 
   bytes_per_pixel = (depth + 7) / 8;
   pitch = width * bytes_per_pixel;
@@ -448,6 +512,10 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height,
 	hidden_dac = CIRRUS_HIDDEN_DAC_15BPP;
 	sr_ext |= CIRRUS_SR_EXTENDED_MODE_16BPP;
 	break;
+      case 8:
+	hidden_dac = CIRRUS_HIDDEN_DAC_8BPP;
+	sr_ext |= CIRRUS_SR_EXTENDED_MODE_8BPP;
+	break;
       }
     sr_write (sr_ext, CIRRUS_SR_EXTENDED_MODE);
     write_hidden_dac (hidden_dac);
@@ -466,6 +534,9 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height,
 
   switch (depth)
     {
+    case 8:
+      framebuffer.mode_info.mode_type = GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
+      break;
     case 16:
       framebuffer.mode_info.red_mask_size = 5;
       framebuffer.mode_info.red_field_pos = 11;
@@ -513,25 +584,11 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height,
 
 
   /* Copy default palette to initialize emulated palette.  */
-  err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
-				   grub_video_fbstd_colors);
+  err = grub_video_cirrus_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
+				       grub_video_fbstd_colors);
   return err;
 }
 
-static grub_err_t
-grub_video_cirrus_set_palette (unsigned int start, unsigned int count,
-			       struct grub_video_palette_data *palette_data)
-{
-  /*  if (framebuffer.index_color_mode) */
-    {
-      /* TODO: Implement setting indexed color mode palette to hardware.  */
-    }
-
-  /* Then set color to emulated palette.  */
-  return grub_video_fb_set_palette (start, count, palette_data);
-}
-
-
 static struct grub_video_adapter grub_video_cirrus_adapter =
   {
     .name = "Cirrus CLGD 5446 PCI Video Driver",

From 9a3e298a7ed8f3c2d22dbbee7fc9ea8e67859b7b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 16 May 2010 22:20:19 +0200
Subject: [PATCH 0965/1628] Fix incorrect aperture size

---
 video/cirrus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/video/cirrus.c b/video/cirrus.c
index 1e55770b4..457f38898 100644
--- a/video/cirrus.c
+++ b/video/cirrus.c
@@ -38,7 +38,7 @@ static struct
   grub_pci_device_t dev;
 } framebuffer;
 
-#define CIRRUS_APERTURE_SIZE 0x200000
+#define CIRRUS_APERTURE_SIZE 0x1000000
 
 enum
   {

From 368e544ba6a5b3099fd48d4f4e08d0858e2e4f2b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 17 May 2010 01:18:50 +0200
Subject: [PATCH 0966/1628] Add bochs video support

---
 conf/i386.rmk        |   5 +
 include/grub/video.h |   3 +-
 video/bochs.c        | 500 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 507 insertions(+), 1 deletion(-)
 create mode 100644 video/bochs.c

diff --git a/conf/i386.rmk b/conf/i386.rmk
index ce5d42f0f..5e1191c1e 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -20,6 +20,11 @@ video_cirrus_mod_SOURCES = video/cirrus.c
 video_cirrus_mod_CFLAGS = $(COMMON_CFLAGS)
 video_cirrus_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += video_bochs.mod
+video_bochs_mod_SOURCES = video/bochs.c
+video_bochs_mod_CFLAGS = $(COMMON_CFLAGS)
+video_bochs_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 pkglib_MODULES += relocator.mod
 relocator_mod_SOURCES = lib/i386/relocator.c lib/i386/relocator_asm.S lib/i386/relocator_backward.S
 relocator_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/include/grub/video.h b/include/grub/video.h
index 08ee54938..9ffc58d86 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -183,7 +183,8 @@ typedef enum grub_video_driver_id
     GRUB_VIDEO_DRIVER_EFI_GOP,
     GRUB_VIDEO_DRIVER_SM712,
     GRUB_VIDEO_DRIVER_VGA,
-    GRUB_VIDEO_DRIVER_CIRRUS
+    GRUB_VIDEO_DRIVER_CIRRUS,
+    GRUB_VIDEO_DRIVER_BOCHS
   } grub_video_driver_id_t;
 
 struct grub_video_adapter
diff --git a/video/bochs.c b/video/bochs.c
new file mode 100644
index 000000000..da63b2912
--- /dev/null
+++ b/video/bochs.c
@@ -0,0 +1,500 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2005,2006,2007,2008,2009,2010  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/>.
+ */
+
+#define grub_video_render_target grub_video_fbrender_target
+
+#include <grub/err.h>
+#include <grub/types.h>
+#include <grub/dl.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/video.h>
+#include <grub/video_fb.h>
+#include <grub/pci.h>
+
+static struct
+{
+  struct grub_video_mode_info mode_info;
+
+  grub_uint8_t *ptr;
+  int mapped;
+  grub_uint32_t base;
+  grub_pci_device_t dev;
+} framebuffer;
+
+#define BOCHS_APERTURE_SIZE 0x800000
+#define BOCHS_MAX_WIDTH 1600
+#define BOCHS_MAX_HEIGHT 1200
+#define BOCHS_WIDTH_ALIGN 8
+
+enum
+  {
+    CIRRUS_SR_MEMORY_MODE = 4,
+    CIRRUS_SR_EXTENDED_MODE = 7,
+    CIRRUS_SR_MAX
+  };
+#define CIRRUS_SR_MEMORY_MODE_CHAIN4 8
+
+enum
+  {
+    BOCHS_VBE_INDEX = 0x1ce,
+    BOCHS_VBE_DATA = 0x1cf,
+    SR_INDEX = 0x3c4,
+    SR_DATA = 0x3c5,
+    BOCHS_PALLETTE_READ_INDEX = 0x3c7,
+    BOCHS_PALLETTE_WRITE_INDEX = 0x3c8,
+    BOCHS_PALLETTE_DATA = 0x3c9,
+    GR_INDEX = 0x3ce,
+    GR_DATA = 0x3cf,
+    CR_INDEX = 0x3d4,
+    CR_DATA = 0x3d5,
+  };
+
+enum
+  {
+    BOCHS_VBE_WIDTH = 1,
+    BOCHS_VBE_HEIGHT = 2,
+    BOCHS_VBE_BPP = 3,
+    BOCHS_VBE_ENABLE = 4,
+    BOCHS_VBE_Y_OFFSET = 9,
+    BOCHS_VBE_MAX
+  };
+
+static void
+vbe_write (grub_uint16_t val, grub_uint16_t addr)
+{
+  grub_outw (addr, BOCHS_VBE_INDEX);
+  grub_outw (val, BOCHS_VBE_DATA);
+}
+
+static grub_uint16_t
+vbe_read (grub_uint16_t addr)
+{
+  grub_outw (addr, BOCHS_VBE_INDEX);
+  return grub_inw (BOCHS_VBE_DATA);
+}
+
+static void
+gr_write (grub_uint8_t val, grub_uint8_t addr)
+{
+  grub_outb (addr, GR_INDEX);
+  grub_outb (val, GR_DATA);
+}
+
+static grub_uint8_t
+gr_read (grub_uint8_t addr)
+{
+  grub_outb (addr, GR_INDEX);
+  return grub_inb (GR_DATA);
+}
+
+static void
+cr_write (grub_uint8_t val, grub_uint8_t addr)
+{
+  grub_outb (addr, CR_INDEX);
+  grub_outb (val, CR_DATA);
+}
+
+static grub_uint8_t
+cr_read (grub_uint8_t addr)
+{
+  grub_outb (addr, CR_INDEX);
+  return grub_inb (CR_DATA);
+}
+
+static void
+palette_read (grub_uint8_t addr, grub_uint8_t *r, grub_uint8_t *g,
+	      grub_uint8_t *b)
+{
+  grub_outb (addr, BOCHS_PALLETTE_READ_INDEX);
+  *r = grub_inb (BOCHS_PALLETTE_DATA);
+  *g = grub_inb (BOCHS_PALLETTE_DATA);
+  *b = grub_inb (BOCHS_PALLETTE_DATA);
+}
+
+static void
+palette_write (grub_uint8_t addr, grub_uint8_t r, grub_uint8_t g,
+	       grub_uint8_t b)
+{
+  grub_outb (addr, BOCHS_PALLETTE_READ_INDEX);
+  grub_outb (r, BOCHS_PALLETTE_DATA);
+  grub_outb (g, BOCHS_PALLETTE_DATA);
+  grub_outb (b, BOCHS_PALLETTE_DATA);
+}
+static void
+sr_write (grub_uint8_t val, grub_uint8_t addr)
+{
+  grub_outb (addr, SR_INDEX);
+  grub_outb (val, SR_DATA);
+}
+
+static grub_uint8_t
+sr_read (grub_uint8_t addr)
+{
+  grub_outb (addr, SR_INDEX);
+  return grub_inb (SR_DATA);
+}
+
+
+struct saved_state
+{
+  grub_uint8_t cr[256];
+  grub_uint8_t gr[256];
+  grub_uint8_t sr[256];
+  grub_uint8_t r[256];
+  grub_uint8_t g[256];
+  grub_uint8_t b[256];
+  grub_uint8_t vbe[BOCHS_VBE_MAX];
+  int vbe_enable;
+  /* We need to preserve VGA font and VGA text. */
+  grub_uint8_t vram[32 * 4 * 256];
+};
+
+static struct saved_state initial_state;
+static int state_saved = 0;
+
+static void
+save_state (struct saved_state *st)
+{
+  unsigned i;
+
+  for (i = 0; i < ARRAY_SIZE (st->cr); i++)
+    st->cr[i] = cr_read (i);
+  for (i = 0; i < ARRAY_SIZE (st->gr); i++)
+    st->gr[i] = gr_read (i);
+  for (i = 0; i < ARRAY_SIZE (st->sr); i++)
+    st->sr[i] = sr_read (i);
+  grub_printf ("%d\n", st->cr[1]);
+
+  for (i = 0; i < 256; i++)
+    palette_read (i, st->r + i, st->g + i, st->b + i);
+
+  st->vbe_enable = vbe_read (BOCHS_VBE_ENABLE) & 1;
+  if (st->vbe_enable)
+    for (i = 0; i < ARRAY_SIZE (st->vbe); i++)
+      st->vbe[i] = vbe_read (i);
+
+  sr_write (CIRRUS_SR_MEMORY_MODE_CHAIN4, CIRRUS_SR_MEMORY_MODE);
+  grub_memcpy (st->vram, framebuffer.ptr, sizeof (st->vram));
+  sr_write (st->sr[CIRRUS_SR_MEMORY_MODE], CIRRUS_SR_MEMORY_MODE);
+}
+
+static void
+restore_state (struct saved_state *st)
+{
+  unsigned i;
+
+  if (st->vbe_enable)
+    for (i = 0; i < ARRAY_SIZE (st->vbe); i++)
+      vbe_write (st->vbe[i], i);
+  else
+    vbe_write (0, BOCHS_VBE_ENABLE);
+
+  cr_write (0, 0x11);
+  for (i = 0; i < ARRAY_SIZE (st->cr); i++)
+    cr_write (st->cr[i], i);
+  for (i = 0; i < ARRAY_SIZE (st->sr); i++)
+    sr_write (st->sr[i], i);
+  for (i = 0; i < ARRAY_SIZE (st->gr); i++)
+    gr_write (st->gr[i], i);
+
+  for (i = 0; i < 256; i++)
+    palette_write (i, st->r[i], st->g[i], st->b[i]);
+
+  sr_write (CIRRUS_SR_MEMORY_MODE_CHAIN4, CIRRUS_SR_MEMORY_MODE);
+  grub_memcpy (framebuffer.ptr, st->vram, sizeof (st->vram));
+  sr_write (st->sr[CIRRUS_SR_MEMORY_MODE], CIRRUS_SR_MEMORY_MODE);
+}
+
+static grub_err_t
+grub_video_bochs_video_init (void)
+{
+  /* Reset frame buffer.  */
+  grub_memset (&framebuffer, 0, sizeof(framebuffer));
+
+  return grub_video_fb_init ();
+}
+
+static grub_err_t
+grub_video_bochs_video_fini (void)
+{
+  if (framebuffer.mapped)
+    grub_pci_device_unmap_range (framebuffer.dev, framebuffer.ptr,
+				 BOCHS_APERTURE_SIZE);
+
+  if (state_saved)
+    {
+      restore_state (&initial_state);
+      state_saved = 0;
+    }
+
+  return grub_video_fb_fini ();
+}
+
+static grub_err_t
+doublebuf_pageflipping_set_page (int page)
+{
+  int start = framebuffer.mode_info.height * page;
+
+  vbe_write (start, BOCHS_VBE_Y_OFFSET);
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_video_bochs_set_palette (unsigned int start, unsigned int count,
+			       struct grub_video_palette_data *palette_data)
+{
+  if (framebuffer.mode_info.mode_type == GRUB_VIDEO_MODE_TYPE_INDEX_COLOR)
+    {
+      unsigned i;
+      if (start >= 0x100)
+	return GRUB_ERR_NONE;
+      if (start + count >= 0x100)
+	count = 0x100 - start;
+
+      for (i = 0; i < count; i++)
+	palette_write (start + i, palette_data[i].r, palette_data[i].g,
+		       palette_data[i].b);
+    }
+
+  /* Then set color to emulated palette.  */
+  return grub_video_fb_set_palette (start, count, palette_data);
+}
+
+static grub_err_t
+grub_video_bochs_setup (unsigned int width, unsigned int height,
+			unsigned int mode_type, unsigned int mode_mask)
+{
+  int depth;
+  grub_err_t err;
+  int found = 0;
+  int pitch, bytes_per_pixel;
+  grub_size_t page_size;        /* The size of a page in bytes.  */
+
+  auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)));
+  int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid)
+    {
+      grub_pci_address_t addr;
+      grub_uint32_t class;
+
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
+      class = grub_pci_read (addr);
+
+      if (((class >> 16) & 0xffff) != 0x0300 || pciid != 0x11111234)
+	return 0;
+      
+      found = 1;
+
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
+      framebuffer.base = grub_pci_read (addr) & GRUB_PCI_ADDR_MEM_MASK;
+      framebuffer.dev = dev;
+
+      return 1;
+    }
+
+  /* Decode depth from mode_type.  If it is zero, then autodetect.  */
+  depth = (mode_type & GRUB_VIDEO_MODE_TYPE_DEPTH_MASK)
+          >> GRUB_VIDEO_MODE_TYPE_DEPTH_POS;
+
+  if (width == 0 || height == 0)
+    {
+      width = 800;
+      height = 600;
+    }
+
+  if (width > BOCHS_MAX_WIDTH)
+    return grub_error (GRUB_ERR_IO, "width must be at most",
+		       BOCHS_MAX_WIDTH);
+
+  if (height > BOCHS_MAX_HEIGHT)
+    return grub_error (GRUB_ERR_IO, "height must be at most",
+		       BOCHS_MAX_HEIGHT);
+
+  if (width & (BOCHS_WIDTH_ALIGN - 1))
+    return grub_error (GRUB_ERR_IO, "width must be a multiple of %d",
+		       BOCHS_WIDTH_ALIGN);
+
+  if (depth == 0
+      && !grub_video_check_mode_flag (mode_type, mode_mask,
+				      GRUB_VIDEO_MODE_TYPE_INDEX_COLOR, 0))
+    depth = 24;
+
+  if (depth == 0)
+    depth = 8;
+
+  if (depth != 32 && depth != 24 && depth != 16 && depth != 15 && depth != 8
+      && depth != 4)
+    return grub_error (GRUB_ERR_IO, "only 32, 24, 16, 15 and 8-bpp are"
+		       " supported by bochs video");
+
+  if (depth == 4)
+    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "4-bpp isn't cupported");
+
+  bytes_per_pixel = (depth + 7) / 8;
+  if (depth == 4)
+    pitch = width / 2;
+  else
+    pitch = width * bytes_per_pixel;
+
+  page_size = pitch * height;
+
+  if (page_size > BOCHS_APERTURE_SIZE)
+    return grub_error (GRUB_ERR_IO, "Not enough video memory for this mode");
+
+  grub_pci_iterate (find_card);
+  if (!found)
+    return grub_error (GRUB_ERR_IO, "Couldn't find graphics card");
+
+  if (found && framebuffer.base == 0)
+    {
+      /* FIXME: change framebuffer base */
+      return grub_error (GRUB_ERR_IO, "PCI BAR not set");
+    }
+
+  /* We can safely discard volatile attribute.  */
+  framebuffer.ptr = (void *) grub_pci_device_map_range (framebuffer.dev,
+							framebuffer.base,
+							BOCHS_APERTURE_SIZE);
+  framebuffer.mapped = 1;
+
+  if (!state_saved)
+    {
+      save_state (&initial_state);
+      state_saved = 1;
+    }
+
+  {
+    vbe_write (0, BOCHS_VBE_ENABLE);
+
+    vbe_write (width, BOCHS_VBE_WIDTH);
+    vbe_write (height, BOCHS_VBE_HEIGHT);
+    vbe_write (depth, BOCHS_VBE_BPP);
+
+    vbe_write (1, BOCHS_VBE_ENABLE);
+    doublebuf_pageflipping_set_page (0);
+  }
+
+  /* Fill mode info details.  */
+  framebuffer.mode_info.width = width;
+  framebuffer.mode_info.height = height;
+  framebuffer.mode_info.mode_type = GRUB_VIDEO_MODE_TYPE_RGB;
+  framebuffer.mode_info.bpp = depth;
+  framebuffer.mode_info.bytes_per_pixel = bytes_per_pixel;
+  framebuffer.mode_info.pitch = pitch;
+  framebuffer.mode_info.number_of_colors = 256;
+  framebuffer.mode_info.reserved_mask_size = 0;
+  framebuffer.mode_info.reserved_field_pos = 0;
+
+  switch (depth)
+    {
+    case 4:
+    case 8:
+      framebuffer.mode_info.mode_type = GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
+      break;
+    case 16:
+      framebuffer.mode_info.red_mask_size = 5;
+      framebuffer.mode_info.red_field_pos = 11;
+      framebuffer.mode_info.green_mask_size = 6;
+      framebuffer.mode_info.green_field_pos = 5;
+      framebuffer.mode_info.blue_mask_size = 5;
+      framebuffer.mode_info.blue_field_pos = 0;
+      break;
+
+    case 15:
+      framebuffer.mode_info.red_mask_size = 5;
+      framebuffer.mode_info.red_field_pos = 10;
+      framebuffer.mode_info.green_mask_size = 5;
+      framebuffer.mode_info.green_field_pos = 5;
+      framebuffer.mode_info.blue_mask_size = 5;
+      framebuffer.mode_info.blue_field_pos = 0;
+      break;
+
+    case 32:
+      framebuffer.mode_info.reserved_mask_size = 8;
+      framebuffer.mode_info.reserved_field_pos = 24;
+
+    case 24:
+      framebuffer.mode_info.red_mask_size = 8;
+      framebuffer.mode_info.red_field_pos = 16;
+      framebuffer.mode_info.green_mask_size = 8;
+      framebuffer.mode_info.green_field_pos = 8;
+      framebuffer.mode_info.blue_mask_size = 8;
+      framebuffer.mode_info.blue_field_pos = 0;
+      break;
+    }
+
+  framebuffer.mode_info.blit_format = grub_video_get_blit_format (&framebuffer.mode_info);
+
+  if (BOCHS_APERTURE_SIZE >= 2 * page_size)
+    err = grub_video_fb_setup (mode_type, mode_mask,
+			       &framebuffer.mode_info,
+			       framebuffer.ptr,
+			       doublebuf_pageflipping_set_page,
+			       framebuffer.ptr + page_size);
+  else
+    err = grub_video_fb_setup (mode_type, mode_mask,
+			       &framebuffer.mode_info,
+			       framebuffer.ptr, 0, 0);
+
+
+  /* Copy default palette to initialize emulated palette.  */
+  err = grub_video_bochs_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
+				      grub_video_fbstd_colors);
+  return err;
+}
+
+static struct grub_video_adapter grub_video_bochs_adapter =
+  {
+    .name = "Bochs PCI Video Driver",
+    .id = GRUB_VIDEO_DRIVER_BOCHS,
+
+    .init = grub_video_bochs_video_init,
+    .fini = grub_video_bochs_video_fini,
+    .setup = grub_video_bochs_setup,
+    .get_info = grub_video_fb_get_info,
+    .get_info_and_fini = grub_video_fb_get_info_and_fini,
+    .set_palette = grub_video_bochs_set_palette,
+    .get_palette = grub_video_fb_get_palette,
+    .set_viewport = grub_video_fb_set_viewport,
+    .get_viewport = grub_video_fb_get_viewport,
+    .map_color = grub_video_fb_map_color,
+    .map_rgb = grub_video_fb_map_rgb,
+    .map_rgba = grub_video_fb_map_rgba,
+    .unmap_color = grub_video_fb_unmap_color,
+    .fill_rect = grub_video_fb_fill_rect,
+    .blit_bitmap = grub_video_fb_blit_bitmap,
+    .blit_render_target = grub_video_fb_blit_render_target,
+    .scroll = grub_video_fb_scroll,
+    .swap_buffers = grub_video_fb_swap_buffers,
+    .create_render_target = grub_video_fb_create_render_target,
+    .delete_render_target = grub_video_fb_delete_render_target,
+    .set_active_render_target = grub_video_fb_set_active_render_target,
+    .get_active_render_target = grub_video_fb_get_active_render_target,
+
+    .next = 0
+  };
+
+GRUB_MOD_INIT(video_bochs)
+{
+  grub_video_register (&grub_video_bochs_adapter);
+}
+
+GRUB_MOD_FINI(video_bochs)
+{
+  grub_video_unregister (&grub_video_bochs_adapter);
+}

From 967828eb5afb0ea7981d39299debc1143960a9cd Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 17 May 2010 02:25:37 +0200
Subject: [PATCH 0967/1628] macroify and share VGA registers

---
 include/grub/vga.h      | 161 +++++++++++++++++++++++++++
 term/i386/pc/vga_text.c |  23 +---
 video/bochs.c           | 111 +++----------------
 video/cirrus.c          | 239 +++++++++++-----------------------------
 video/i386/pc/vga.c     |  63 ++---------
 5 files changed, 254 insertions(+), 343 deletions(-)
 create mode 100644 include/grub/vga.h

diff --git a/include/grub/vga.h b/include/grub/vga.h
new file mode 100644
index 000000000..d05ddd69b
--- /dev/null
+++ b/include/grub/vga.h
@@ -0,0 +1,161 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#ifndef GRUB_VGA_HEADER
+#define GRUB_VGA_HEADER	1
+
+enum
+  {
+    GRUB_VGA_IO_SR_INDEX = 0x3c4,
+    GRUB_VGA_IO_SR_DATA = 0x3c5,
+    GRUB_VGA_IO_PIXEL_MASK = 0x3c6,
+    GRUB_VGA_IO_PALLETTE_READ_INDEX = 0x3c7,
+    GRUB_VGA_IO_PALLETTE_WRITE_INDEX = 0x3c8,
+    GRUB_VGA_IO_PALLETTE_DATA = 0x3c9,
+    GRUB_VGA_IO_GR_INDEX = 0x3ce,
+    GRUB_VGA_IO_GR_DATA = 0x3cf,
+    GRUB_VGA_IO_CR_INDEX = 0x3d4,
+    GRUB_VGA_IO_CR_DATA = 0x3d5,
+    GRUB_VGA_IO_INPUT_STATUS1_REGISTER = 0x3da
+  };
+
+#define GRUB_VGA_IO_INPUT_STATUS1_VERTR_BIT 0x08
+
+enum
+  {
+    GRUB_VGA_CR_WIDTH = 0x01,
+    GRUB_VGA_CR_OVERFLOW = 0x07,
+    GRUB_VGA_CR_CELL_HEIGHT = 0x09,
+    GRUB_VGA_CR_CURSOR = 0x0a,
+    GRUB_VGA_CR_START_ADDR_HIGH_REGISTER = 0x0c,
+    GRUB_VGA_CR_START_ADDR_LOW_REGISTER = 0x0d,
+    GRUB_VGA_CR_CURSOR_ADDR_HIGH = 0x0e,
+    GRUB_VGA_CR_CURSOR_ADDR_LOW = 0x0f,
+    GRUB_VGA_CR_VSYNC_END = 0x11,
+    GRUB_VGA_CR_HEIGHT = 0x12,
+    GRUB_VGA_CR_PITCH = 0x13,
+    GRUB_VGA_CR_MODE = 0x17,
+    GRUB_VGA_CR_LINE_COMPARE = 0x18,
+  };
+
+#define GRUB_VGA_CR_WIDTH_DIVISOR 8
+#define GRUB_VGA_CR_OVERFLOW_HEIGHT1_SHIFT 7
+#define GRUB_VGA_CR_OVERFLOW_HEIGHT1_MASK 0x02
+#define GRUB_VGA_CR_OVERFLOW_HEIGHT2_SHIFT 3
+#define GRUB_VGA_CR_OVERFLOW_HEIGHT2_MASK 0xc0
+#define GRUB_VGA_CR_OVERFLOW_LINE_COMPARE_SHIFT 4
+#define GRUB_VGA_CR_OVERFLOW_LINE_COMPARE_MASK 0x10
+
+#define GRUB_VGA_CR_CELL_HEIGHT_LINE_COMPARE_MASK 0x40
+#define GRUB_VGA_CR_CELL_HEIGHT_LINE_COMPARE_SHIFT 3
+
+#define GRUB_VGA_CR_CURSOR_DISABLE	(1 << 5)
+
+#define GRUB_VGA_CR_PITCH_DIVISOR 8
+
+#define GRUB_VGA_CR_MODE_TIMING_ENABLE 0x80
+#define GRUB_VGA_CR_MODE_BYTE_MODE 0x40
+#define GRUB_VGA_CR_MODE_NO_HERCULES 0x02
+#define GRUB_VGA_CR_MODE_NO_CGA 0x01
+
+enum
+  {
+    GRUB_VGA_SR_MAP_MASK_REGISTER = 0x02,
+    GRUB_VGA_SR_MEMORY_MODE = 0x04,
+  };
+
+#define GRUB_VGA_SR_MEMORY_MODE_CHAIN4 8
+#define GRUB_VGA_SR_MEMORY_MODE_NORMAL 0
+
+enum
+  {
+    GRUB_VGA_GR_READ_MAP_REGISTER = 0x04,
+    GRUB_VGA_GR_MODE = 5,
+    GRUB_VGA_GR_GR6 = 6,
+    GRUB_VGA_GR_MAX
+  };
+
+#define GRUB_VGA_GR_GR6_GRAPHICS_MODE 1
+
+#define GRUB_VGA_GR_MODE_256_COLOR 0x40
+#define GRUB_VGA_GR_MODE_READ_MODE1 0x08
+
+static inline void
+grub_vga_gr_write (grub_uint8_t val, grub_uint8_t addr)
+{
+  grub_outb (addr, GRUB_VGA_IO_GR_INDEX);
+  grub_outb (val, GRUB_VGA_IO_GR_DATA);
+}
+
+static inline grub_uint8_t
+grub_vga_gr_read (grub_uint8_t addr)
+{
+  grub_outb (addr, GRUB_VGA_IO_GR_INDEX);
+  return grub_inb (GRUB_VGA_IO_GR_DATA);
+}
+
+static inline void
+grub_vga_cr_write (grub_uint8_t val, grub_uint8_t addr)
+{
+  grub_outb (addr, GRUB_VGA_IO_CR_INDEX);
+  grub_outb (val, GRUB_VGA_IO_CR_DATA);
+}
+
+static inline grub_uint8_t
+grub_vga_cr_read (grub_uint8_t addr)
+{
+  grub_outb (addr, GRUB_VGA_IO_CR_INDEX);
+  return grub_inb (GRUB_VGA_IO_CR_DATA);
+}
+
+static inline void
+grub_vga_sr_write (grub_uint8_t val, grub_uint8_t addr)
+{
+  grub_outb (addr, GRUB_VGA_IO_SR_INDEX);
+  grub_outb (val, GRUB_VGA_IO_SR_DATA);
+}
+
+static inline grub_uint8_t
+grub_vga_sr_read (grub_uint8_t addr)
+{
+  grub_outb (addr, GRUB_VGA_IO_SR_INDEX);
+  return grub_inb (GRUB_VGA_IO_SR_DATA);
+}
+
+static inline void
+grub_vga_palette_read (grub_uint8_t addr, grub_uint8_t *r, grub_uint8_t *g,
+		       grub_uint8_t *b)
+{
+  grub_outb (addr, GRUB_VGA_IO_PALLETTE_READ_INDEX);
+  *r = grub_inb (GRUB_VGA_IO_PALLETTE_DATA);
+  *g = grub_inb (GRUB_VGA_IO_PALLETTE_DATA);
+  *b = grub_inb (GRUB_VGA_IO_PALLETTE_DATA);
+}
+
+static inline void
+grub_vga_palette_write (grub_uint8_t addr, grub_uint8_t r, grub_uint8_t g,
+			grub_uint8_t b)
+{
+  grub_outb (addr, GRUB_VGA_IO_PALLETTE_READ_INDEX);
+  grub_outb (r, GRUB_VGA_IO_PALLETTE_DATA);
+  grub_outb (g, GRUB_VGA_IO_PALLETTE_DATA);
+  grub_outb (b, GRUB_VGA_IO_PALLETTE_DATA);
+}
+
+
+#endif
diff --git a/term/i386/pc/vga_text.c b/term/i386/pc/vga_text.c
index f954cab43..8bc14cb61 100644
--- a/term/i386/pc/vga_text.c
+++ b/term/i386/pc/vga_text.c
@@ -20,6 +20,7 @@
 #include <grub/i386/vga_common.h>
 #include <grub/i386/io.h>
 #include <grub/types.h>
+#include <grub/vga.h>
 
 #define COLS	80
 #define ROWS	25
@@ -28,15 +29,6 @@ static int grub_curr_x, grub_curr_y;
 
 #define VGA_TEXT_SCREEN		0xb8000
 
-#define CRTC_ADDR_PORT		0x3D4
-#define CRTC_DATA_PORT		0x3D5
-
-#define CRTC_CURSOR		0x0a
-#define CRTC_CURSOR_ADDR_HIGH	0x0e
-#define CRTC_CURSOR_ADDR_LOW	0x0f
-
-#define CRTC_CURSOR_DISABLE	(1 << 5)
-
 static void
 screen_write_char (int x, int y, short c)
 {
@@ -53,10 +45,8 @@ static void
 update_cursor (void)
 {
   unsigned int pos = grub_curr_y * COLS + grub_curr_x;
-  grub_outb (CRTC_CURSOR_ADDR_HIGH, CRTC_ADDR_PORT);
-  grub_outb (pos >> 8, CRTC_DATA_PORT);
-  grub_outb (CRTC_CURSOR_ADDR_LOW, CRTC_ADDR_PORT);
-  grub_outb (pos & 0xFF, CRTC_DATA_PORT);
+  grub_vga_cr_write (pos >> 8, GRUB_VGA_CR_CURSOR_ADDR_HIGH);
+  grub_vga_cr_write (pos & 0xFF, GRUB_VGA_CR_CURSOR_ADDR_LOW);
 }
 
 static void
@@ -134,12 +124,11 @@ static void
 grub_vga_text_setcursor (int on)
 {
   grub_uint8_t old;
-  grub_outb (CRTC_CURSOR, CRTC_ADDR_PORT);
-  old = grub_inb (CRTC_DATA_PORT);
+  old = grub_vga_cr_read (GRUB_VGA_CR_CURSOR);
   if (on)
-    grub_outb (old & ~CRTC_CURSOR_DISABLE, CRTC_DATA_PORT);
+    grub_vga_cr_write (old & ~GRUB_VGA_CR_CURSOR_DISABLE, GRUB_VGA_CR_CURSOR);
   else
-    grub_outb (old | CRTC_CURSOR_DISABLE, CRTC_DATA_PORT);
+    grub_vga_cr_write (old | GRUB_VGA_CR_CURSOR_DISABLE, GRUB_VGA_CR_CURSOR);
 }
 
 static grub_err_t
diff --git a/video/bochs.c b/video/bochs.c
index da63b2912..cb04df9fc 100644
--- a/video/bochs.c
+++ b/video/bochs.c
@@ -26,6 +26,7 @@
 #include <grub/video.h>
 #include <grub/video_fb.h>
 #include <grub/pci.h>
+#include <grub/vga.h>
 
 static struct
 {
@@ -42,27 +43,10 @@ static struct
 #define BOCHS_MAX_HEIGHT 1200
 #define BOCHS_WIDTH_ALIGN 8
 
-enum
-  {
-    CIRRUS_SR_MEMORY_MODE = 4,
-    CIRRUS_SR_EXTENDED_MODE = 7,
-    CIRRUS_SR_MAX
-  };
-#define CIRRUS_SR_MEMORY_MODE_CHAIN4 8
-
 enum
   {
     BOCHS_VBE_INDEX = 0x1ce,
     BOCHS_VBE_DATA = 0x1cf,
-    SR_INDEX = 0x3c4,
-    SR_DATA = 0x3c5,
-    BOCHS_PALLETTE_READ_INDEX = 0x3c7,
-    BOCHS_PALLETTE_WRITE_INDEX = 0x3c8,
-    BOCHS_PALLETTE_DATA = 0x3c9,
-    GR_INDEX = 0x3ce,
-    GR_DATA = 0x3cf,
-    CR_INDEX = 0x3d4,
-    CR_DATA = 0x3d5,
   };
 
 enum
@@ -89,68 +73,6 @@ vbe_read (grub_uint16_t addr)
   return grub_inw (BOCHS_VBE_DATA);
 }
 
-static void
-gr_write (grub_uint8_t val, grub_uint8_t addr)
-{
-  grub_outb (addr, GR_INDEX);
-  grub_outb (val, GR_DATA);
-}
-
-static grub_uint8_t
-gr_read (grub_uint8_t addr)
-{
-  grub_outb (addr, GR_INDEX);
-  return grub_inb (GR_DATA);
-}
-
-static void
-cr_write (grub_uint8_t val, grub_uint8_t addr)
-{
-  grub_outb (addr, CR_INDEX);
-  grub_outb (val, CR_DATA);
-}
-
-static grub_uint8_t
-cr_read (grub_uint8_t addr)
-{
-  grub_outb (addr, CR_INDEX);
-  return grub_inb (CR_DATA);
-}
-
-static void
-palette_read (grub_uint8_t addr, grub_uint8_t *r, grub_uint8_t *g,
-	      grub_uint8_t *b)
-{
-  grub_outb (addr, BOCHS_PALLETTE_READ_INDEX);
-  *r = grub_inb (BOCHS_PALLETTE_DATA);
-  *g = grub_inb (BOCHS_PALLETTE_DATA);
-  *b = grub_inb (BOCHS_PALLETTE_DATA);
-}
-
-static void
-palette_write (grub_uint8_t addr, grub_uint8_t r, grub_uint8_t g,
-	       grub_uint8_t b)
-{
-  grub_outb (addr, BOCHS_PALLETTE_READ_INDEX);
-  grub_outb (r, BOCHS_PALLETTE_DATA);
-  grub_outb (g, BOCHS_PALLETTE_DATA);
-  grub_outb (b, BOCHS_PALLETTE_DATA);
-}
-static void
-sr_write (grub_uint8_t val, grub_uint8_t addr)
-{
-  grub_outb (addr, SR_INDEX);
-  grub_outb (val, SR_DATA);
-}
-
-static grub_uint8_t
-sr_read (grub_uint8_t addr)
-{
-  grub_outb (addr, SR_INDEX);
-  return grub_inb (SR_DATA);
-}
-
-
 struct saved_state
 {
   grub_uint8_t cr[256];
@@ -174,24 +96,23 @@ save_state (struct saved_state *st)
   unsigned i;
 
   for (i = 0; i < ARRAY_SIZE (st->cr); i++)
-    st->cr[i] = cr_read (i);
+    st->cr[i] = grub_vga_cr_read (i);
   for (i = 0; i < ARRAY_SIZE (st->gr); i++)
-    st->gr[i] = gr_read (i);
+    st->gr[i] = grub_vga_gr_read (i);
   for (i = 0; i < ARRAY_SIZE (st->sr); i++)
-    st->sr[i] = sr_read (i);
-  grub_printf ("%d\n", st->cr[1]);
+    st->sr[i] = grub_vga_sr_read (i);
 
   for (i = 0; i < 256; i++)
-    palette_read (i, st->r + i, st->g + i, st->b + i);
+    grub_vga_palette_read (i, st->r + i, st->g + i, st->b + i);
 
   st->vbe_enable = vbe_read (BOCHS_VBE_ENABLE) & 1;
   if (st->vbe_enable)
     for (i = 0; i < ARRAY_SIZE (st->vbe); i++)
       st->vbe[i] = vbe_read (i);
 
-  sr_write (CIRRUS_SR_MEMORY_MODE_CHAIN4, CIRRUS_SR_MEMORY_MODE);
+  grub_vga_sr_write (GRUB_VGA_SR_MEMORY_MODE_CHAIN4, GRUB_VGA_SR_MEMORY_MODE);
   grub_memcpy (st->vram, framebuffer.ptr, sizeof (st->vram));
-  sr_write (st->sr[CIRRUS_SR_MEMORY_MODE], CIRRUS_SR_MEMORY_MODE);
+  grub_vga_sr_write (st->sr[GRUB_VGA_SR_MEMORY_MODE], GRUB_VGA_SR_MEMORY_MODE);
 }
 
 static void
@@ -205,20 +126,20 @@ restore_state (struct saved_state *st)
   else
     vbe_write (0, BOCHS_VBE_ENABLE);
 
-  cr_write (0, 0x11);
+  grub_vga_cr_write (0, 0x11);
   for (i = 0; i < ARRAY_SIZE (st->cr); i++)
-    cr_write (st->cr[i], i);
+    grub_vga_cr_write (st->cr[i], i);
   for (i = 0; i < ARRAY_SIZE (st->sr); i++)
-    sr_write (st->sr[i], i);
+    grub_vga_sr_write (st->sr[i], i);
   for (i = 0; i < ARRAY_SIZE (st->gr); i++)
-    gr_write (st->gr[i], i);
+    grub_vga_gr_write (st->gr[i], i);
 
   for (i = 0; i < 256; i++)
-    palette_write (i, st->r[i], st->g[i], st->b[i]);
+    grub_vga_palette_write (i, st->r[i], st->g[i], st->b[i]);
 
-  sr_write (CIRRUS_SR_MEMORY_MODE_CHAIN4, CIRRUS_SR_MEMORY_MODE);
+  grub_vga_sr_write (GRUB_VGA_SR_MEMORY_MODE_CHAIN4, GRUB_VGA_SR_MEMORY_MODE);
   grub_memcpy (framebuffer.ptr, st->vram, sizeof (st->vram));
-  sr_write (st->sr[CIRRUS_SR_MEMORY_MODE], CIRRUS_SR_MEMORY_MODE);
+  grub_vga_sr_write (st->sr[GRUB_VGA_SR_MEMORY_MODE], GRUB_VGA_SR_MEMORY_MODE);
 }
 
 static grub_err_t
@@ -268,8 +189,8 @@ grub_video_bochs_set_palette (unsigned int start, unsigned int count,
 	count = 0x100 - start;
 
       for (i = 0; i < count; i++)
-	palette_write (start + i, palette_data[i].r, palette_data[i].g,
-		       palette_data[i].b);
+	grub_vga_palette_write (start + i, palette_data[i].r, palette_data[i].g,
+				palette_data[i].b);
     }
 
   /* Then set color to emulated palette.  */
diff --git a/video/cirrus.c b/video/cirrus.c
index 457f38898..4a3d8243d 100644
--- a/video/cirrus.c
+++ b/video/cirrus.c
@@ -26,6 +26,7 @@
 #include <grub/video.h>
 #include <grub/video_fb.h>
 #include <grub/pci.h>
+#include <grub/vga.h>
 
 static struct
 {
@@ -40,69 +41,17 @@ static struct
 
 #define CIRRUS_APERTURE_SIZE 0x1000000
 
-enum
-  {
-    SR_INDEX = 0x3c4,
-    SR_DATA = 0x3c5,
-    CIRRUS_PIXEL_MASK = 0x3c6,
-    CIRRUS_PALLETTE_READ_INDEX = 0x3c7,
-    CIRRUS_PALLETTE_WRITE_INDEX = 0x3c8,
-    CIRRUS_PALLETTE_DATA = 0x3c9,
-    GR_INDEX = 0x3ce,
-    GR_DATA = 0x3cf,
-    CR_INDEX = 0x3d4,
-    CR_DATA = 0x3d5,
-  };
-
 #define CIRRUS_MAX_WIDTH 0x800
-#define CIRRUS_WIDTH_DIVISOR 8
 #define CIRRUS_MAX_HEIGHT 0x800
-#define CIRRUS_MAX_PITCH (0x1ff * CIRRUS_WIDTH_DIVISOR)
+#define CIRRUS_MAX_PITCH (0x1ff * GRUB_VGA_CR_PITCH_DIVISOR)
 
 enum
   {
-    CIRRUS_GR_MODE = 5,
-    CIRRUS_GR_GR6 = 6,
-    CIRRUS_GR_MAX
-  };
-
-#define CIRRUS_GR_GR6_GRAPHICS_MODE 1
-
-#define CIRRUS_GR_MODE_256_COLOR 0x40
-#define CIRRUS_GR_MODE_READ_MODE1 0x08
-
-enum
-  {
-    CIRRUS_CR_WIDTH = 0x01,
-    CIRRUS_CR_OVERFLOW = 0x07,
-    CIRRUS_CR_CELL_HEIGHT = 0x09,
-    CIRRUS_CR_SCREEN_START_HIGH = 0xc,
-    CIRRUS_CR_SCREEN_START_LOW = 0xd,
-    CIRRUS_CR_VSYNC_END = 0x11,
-    CIRRUS_CR_HEIGHT = 0x12,
-    CIRRUS_CR_PITCH = 0x13,
-    CIRRUS_CR_MODE = 0x17,
-    CIRRUS_CR_LINE_COMPARE = 0x18,
     CIRRUS_CR_EXTENDED_DISPLAY = 0x1b,
     CIRRUS_CR_EXTENDED_OVERLAY = 0x1d,
     CIRRUS_CR_MAX
   };
 
-#define CIRRUS_CR_CELL_HEIGHT_LINE_COMPARE_MASK 0x40
-#define CIRRUS_CR_CELL_HEIGHT_LINE_COMPARE_SHIFT 3
-
-#define CIRRUS_CR_OVERFLOW_HEIGHT1_SHIFT 7
-#define CIRRUS_CR_OVERFLOW_HEIGHT1_MASK 0x02
-#define CIRRUS_CR_OVERFLOW_HEIGHT2_SHIFT 3
-#define CIRRUS_CR_OVERFLOW_HEIGHT2_MASK 0xc0
-#define CIRRUS_CR_OVERFLOW_LINE_COMPARE_SHIFT 4
-#define CIRRUS_CR_OVERFLOW_LINE_COMPARE_MASK 0x10
-
-#define CIRRUS_CR_MODE_TIMING_ENABLE 0x80
-#define CIRRUS_CR_MODE_BYTE_MODE 0x40
-#define CIRRUS_CR_MODE_NO_HERCULES 0x02
-#define CIRRUS_CR_MODE_NO_CGA 0x01
-
 #define CIRRUS_CR_EXTENDED_DISPLAY_PITCH_MASK 0x10
 #define CIRRUS_CR_EXTENDED_DISPLAY_PITCH_SHIFT 4
 #define CIRRUS_CR_EXTENDED_DISPLAY_START_MASK1 0x1
@@ -113,15 +62,12 @@ enum
 #define CIRRUS_CR_EXTENDED_OVERLAY_DISPLAY_START_MASK 0x80
 #define CIRRUS_CR_EXTENDED_OVERLAY_DISPLAY_START_SHIFT 12
 
-
 enum
   {
-    CIRRUS_SR_MEMORY_MODE = 4,
     CIRRUS_SR_EXTENDED_MODE = 7,
     CIRRUS_SR_MAX
   };
-#define CIRRUS_SR_MEMORY_MODE_CHAIN4 8
-#define CIRRUS_SR_MEMORY_MODE_NORMAL 0
+
 #define CIRRUS_SR_EXTENDED_MODE_LFB_ENABLE 0xf0
 #define CIRRUS_SR_EXTENDED_MODE_ENABLE_EXT 0x01
 #define CIRRUS_SR_EXTENDED_MODE_8BPP       0x00
@@ -139,94 +85,32 @@ enum
 #define CIRRUS_HIDDEN_DAC_888COLOR (CIRRUS_HIDDEN_DAC_ENABLE_EXT \
 				    | CIRRUS_HIDDEN_DAC_ENABLE_ALL | 5)
 
-static void
-gr_write (grub_uint8_t val, grub_uint8_t addr)
-{
-  grub_outb (addr, GR_INDEX);
-  grub_outb (val, GR_DATA);
-}
-
-static grub_uint8_t
-gr_read (grub_uint8_t addr)
-{
-  grub_outb (addr, GR_INDEX);
-  return grub_inb (GR_DATA);
-}
-
-static void
-cr_write (grub_uint8_t val, grub_uint8_t addr)
-{
-  grub_outb (addr, CR_INDEX);
-  grub_outb (val, CR_DATA);
-}
-
-static grub_uint8_t
-cr_read (grub_uint8_t addr)
-{
-  grub_outb (addr, CR_INDEX);
-  return grub_inb (CR_DATA);
-}
-
-static void
-sr_write (grub_uint8_t val, grub_uint8_t addr)
-{
-  grub_outb (addr, SR_INDEX);
-  grub_outb (val, SR_DATA);
-}
-
-static grub_uint8_t
-sr_read (grub_uint8_t addr)
-{
-  grub_outb (addr, SR_INDEX);
-  return grub_inb (SR_DATA);
-}
-
 static void
 write_hidden_dac (grub_uint8_t data)
 {
-  grub_inb (CIRRUS_PALLETTE_WRITE_INDEX);
-  grub_inb (CIRRUS_PIXEL_MASK);
-  grub_inb (CIRRUS_PIXEL_MASK);
-  grub_inb (CIRRUS_PIXEL_MASK);
-  grub_inb (CIRRUS_PIXEL_MASK);
-  grub_outb (data, CIRRUS_PIXEL_MASK);
+  grub_inb (GRUB_VGA_IO_PALLETTE_WRITE_INDEX);
+  grub_inb (GRUB_VGA_IO_PIXEL_MASK);
+  grub_inb (GRUB_VGA_IO_PIXEL_MASK);
+  grub_inb (GRUB_VGA_IO_PIXEL_MASK);
+  grub_inb (GRUB_VGA_IO_PIXEL_MASK);
+  grub_outb (data, GRUB_VGA_IO_PIXEL_MASK);
 }
 
 static grub_uint8_t
 read_hidden_dac (void)
 {
-  grub_inb (CIRRUS_PALLETTE_WRITE_INDEX);
-  grub_inb (CIRRUS_PIXEL_MASK);
-  grub_inb (CIRRUS_PIXEL_MASK);
-  grub_inb (CIRRUS_PIXEL_MASK);
-  grub_inb (CIRRUS_PIXEL_MASK);
-  return grub_inb (CIRRUS_PIXEL_MASK);
-}
-
-static void
-palette_read (grub_uint8_t addr, grub_uint8_t *r, grub_uint8_t *g,
-	      grub_uint8_t *b)
-{
-  grub_outb (addr, CIRRUS_PALLETTE_READ_INDEX);
-  *r = grub_inb (CIRRUS_PALLETTE_DATA);
-  *g = grub_inb (CIRRUS_PALLETTE_DATA);
-  *b = grub_inb (CIRRUS_PALLETTE_DATA);
-}
-
-static void
-palette_write (grub_uint8_t addr, grub_uint8_t r, grub_uint8_t g,
-	       grub_uint8_t b)
-{
-  grub_outb (addr, CIRRUS_PALLETTE_READ_INDEX);
-  grub_outb (r, CIRRUS_PALLETTE_DATA);
-  grub_outb (g, CIRRUS_PALLETTE_DATA);
-  grub_outb (b, CIRRUS_PALLETTE_DATA);
+  grub_inb (GRUB_VGA_IO_PALLETTE_WRITE_INDEX);
+  grub_inb (GRUB_VGA_IO_PIXEL_MASK);
+  grub_inb (GRUB_VGA_IO_PIXEL_MASK);
+  grub_inb (GRUB_VGA_IO_PIXEL_MASK);
+  grub_inb (GRUB_VGA_IO_PIXEL_MASK);
+  return grub_inb (GRUB_VGA_IO_PIXEL_MASK);
 }
 
 struct saved_state
 {
   grub_uint8_t cr[CIRRUS_CR_MAX];
-  grub_uint8_t gr[CIRRUS_GR_MAX];
+  grub_uint8_t gr[GRUB_VGA_GR_MAX];
   grub_uint8_t sr[CIRRUS_SR_MAX];
   grub_uint8_t hidden_dac;
   /* We need to preserve VGA font and VGA text. */
@@ -244,16 +128,16 @@ save_state (struct saved_state *st)
 {
   unsigned i;
   for (i = 0; i < ARRAY_SIZE (st->cr); i++)
-    st->cr[i] = cr_read (i);
+    st->cr[i] = grub_vga_cr_read (i);
   for (i = 0; i < ARRAY_SIZE (st->sr); i++)
-    st->sr[i] = sr_read (i);
+    st->sr[i] = grub_vga_sr_read (i);
   for (i = 0; i < ARRAY_SIZE (st->gr); i++)
-    st->gr[i] = gr_read (i);
+    st->gr[i] = grub_vga_gr_read (i);
   for (i = 0; i < 256; i++)
-    palette_read (i, st->r + i, st->g + i, st->b + i);
+    grub_vga_palette_read (i, st->r + i, st->g + i, st->b + i);
 
   st->hidden_dac = read_hidden_dac ();
-  sr_write (CIRRUS_SR_MEMORY_MODE_CHAIN4, CIRRUS_SR_MEMORY_MODE);
+  grub_vga_sr_write (GRUB_VGA_SR_MEMORY_MODE_CHAIN4, GRUB_VGA_SR_MEMORY_MODE);
   grub_memcpy (st->vram, framebuffer.ptr, sizeof (st->vram));
 }
 
@@ -261,16 +145,16 @@ static void
 restore_state (struct saved_state *st)
 {
   unsigned i;
-  sr_write (CIRRUS_SR_MEMORY_MODE_CHAIN4, CIRRUS_SR_MEMORY_MODE);
+  grub_vga_sr_write (GRUB_VGA_SR_MEMORY_MODE_CHAIN4, GRUB_VGA_SR_MEMORY_MODE);
   grub_memcpy (framebuffer.ptr, st->vram, sizeof (st->vram));
   for (i = 0; i < ARRAY_SIZE (st->cr); i++)
-    cr_write (st->cr[i], i);
+    grub_vga_cr_write (st->cr[i], i);
   for (i = 0; i < ARRAY_SIZE (st->sr); i++)
-    sr_write (st->sr[i], i);
+    grub_vga_sr_write (st->sr[i], i);
   for (i = 0; i < ARRAY_SIZE (st->gr); i++)
-    gr_write (st->gr[i], i);
+    grub_vga_gr_write (st->gr[i], i);
   for (i = 0; i < 256; i++)
-    palette_write (i, st->r[i], st->g[i], st->b[i]);
+    grub_vga_palette_write (i, st->r[i], st->g[i], st->b[i]);
 
   write_hidden_dac (st->hidden_dac);
 }
@@ -306,23 +190,24 @@ doublebuf_pageflipping_set_page (int page)
   int start = framebuffer.page_size * page / 4;
   grub_uint8_t cr_ext, cr_overlay;
 
-  cr_write (start & 0xff, CIRRUS_CR_SCREEN_START_LOW);
-  cr_write ((start & 0xff00) >> 8, CIRRUS_CR_SCREEN_START_HIGH);
+  grub_vga_cr_write (start & 0xff, GRUB_VGA_CR_START_ADDR_LOW_REGISTER);
+  grub_vga_cr_write ((start & 0xff00) >> 8,
+		     GRUB_VGA_CR_START_ADDR_HIGH_REGISTER);
 
-  cr_ext = cr_read (CIRRUS_CR_EXTENDED_DISPLAY);
+  cr_ext = grub_vga_cr_read (CIRRUS_CR_EXTENDED_DISPLAY);
   cr_ext &= ~(CIRRUS_CR_EXTENDED_DISPLAY_START_MASK1
 	      | CIRRUS_CR_EXTENDED_DISPLAY_START_MASK2);
   cr_ext |= ((start >> CIRRUS_CR_EXTENDED_DISPLAY_START_SHIFT1)
 	     & CIRRUS_CR_EXTENDED_DISPLAY_START_MASK1);
   cr_ext |= ((start >> CIRRUS_CR_EXTENDED_DISPLAY_START_SHIFT2)
 	     & CIRRUS_CR_EXTENDED_DISPLAY_START_MASK2);
-  cr_write (cr_ext, CIRRUS_CR_EXTENDED_DISPLAY);
+  grub_vga_cr_write (cr_ext, CIRRUS_CR_EXTENDED_DISPLAY);
 
-  cr_overlay = cr_read (CIRRUS_CR_EXTENDED_OVERLAY);
+  cr_overlay = grub_vga_cr_read (CIRRUS_CR_EXTENDED_OVERLAY);
   cr_overlay &= ~(CIRRUS_CR_EXTENDED_OVERLAY_DISPLAY_START_MASK);
   cr_overlay |= ((start >> CIRRUS_CR_EXTENDED_OVERLAY_DISPLAY_START_SHIFT)
 		 & CIRRUS_CR_EXTENDED_OVERLAY_DISPLAY_START_MASK);
-  cr_write (cr_overlay, CIRRUS_CR_EXTENDED_OVERLAY);
+  grub_vga_cr_write (cr_overlay, CIRRUS_CR_EXTENDED_OVERLAY);
 
   return GRUB_ERR_NONE;
 }
@@ -340,8 +225,8 @@ grub_video_cirrus_set_palette (unsigned int start, unsigned int count,
 	count = 0x100 - start;
 
       for (i = 0; i < count; i++)
-	palette_write (start + i, palette_data[i].r, palette_data[i].g,
-		       palette_data[i].b);
+	grub_vga_palette_write (start + i, palette_data[i].r, palette_data[i].g,
+				palette_data[i].b);
     }
 
   /* Then set color to emulated palette.  */
@@ -388,10 +273,10 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height,
       height = 600;
     }
 
-  if (width & (CIRRUS_WIDTH_DIVISOR - 1))
+  if (width & (GRUB_VGA_CR_WIDTH_DIVISOR - 1))
     return grub_error (GRUB_ERR_IO,
 		       "screen width must be a multiple of %d",
-		       CIRRUS_WIDTH_DIVISOR);
+		       GRUB_VGA_CR_WIDTH_DIVISOR);
 
   if (width > CIRRUS_MAX_WIDTH)
     return grub_error (GRUB_ERR_IO,
@@ -452,42 +337,44 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height,
     int pitch_reg, overflow_reg = 0, line_compare = 0x3ff;
     grub_uint8_t sr_ext = 0, hidden_dac = 0;
 
-    pitch_reg = pitch / CIRRUS_WIDTH_DIVISOR;
+    pitch_reg = pitch / GRUB_VGA_CR_PITCH_DIVISOR;
 
-    gr_write (CIRRUS_GR_MODE_256_COLOR | CIRRUS_GR_MODE_READ_MODE1,
-	      CIRRUS_GR_MODE);
-    gr_write (CIRRUS_GR_GR6_GRAPHICS_MODE, CIRRUS_GR_GR6);
+    grub_vga_gr_write (GRUB_VGA_GR_MODE_256_COLOR | GRUB_VGA_GR_MODE_READ_MODE1,
+		       GRUB_VGA_GR_MODE);
+    grub_vga_gr_write (GRUB_VGA_GR_GR6_GRAPHICS_MODE, GRUB_VGA_GR_GR6);
     
-    sr_write (CIRRUS_SR_MEMORY_MODE_NORMAL, CIRRUS_SR_MEMORY_MODE);
+    grub_vga_sr_write (GRUB_VGA_SR_MEMORY_MODE_NORMAL, GRUB_VGA_SR_MEMORY_MODE);
 
     /* Disable CR0-7 write protection.  */
-    cr_write (0, CIRRUS_CR_VSYNC_END);
+    grub_vga_cr_write (0, GRUB_VGA_CR_VSYNC_END);
 
-    cr_write (width / CIRRUS_WIDTH_DIVISOR - 1, CIRRUS_CR_WIDTH);
-    cr_write ((height - 1) & 0xff, CIRRUS_CR_HEIGHT);
-    overflow_reg |= (((height - 1) >> CIRRUS_CR_OVERFLOW_HEIGHT1_SHIFT) & 
-		     CIRRUS_CR_OVERFLOW_HEIGHT1_MASK)
-      | (((height - 1) >> CIRRUS_CR_OVERFLOW_HEIGHT2_SHIFT) & 
-	 CIRRUS_CR_OVERFLOW_HEIGHT2_MASK);
+    grub_vga_cr_write (width / GRUB_VGA_CR_WIDTH_DIVISOR - 1,
+		       GRUB_VGA_CR_WIDTH);
+    grub_vga_cr_write ((height - 1) & 0xff, GRUB_VGA_CR_HEIGHT);
+    overflow_reg |= (((height - 1) >> GRUB_VGA_CR_OVERFLOW_HEIGHT1_SHIFT) & 
+		     GRUB_VGA_CR_OVERFLOW_HEIGHT1_MASK)
+      | (((height - 1) >> GRUB_VGA_CR_OVERFLOW_HEIGHT2_SHIFT) & 
+	 GRUB_VGA_CR_OVERFLOW_HEIGHT2_MASK);
 
-    cr_write (pitch_reg & 0xff, CIRRUS_CR_PITCH);
+    grub_vga_cr_write (pitch_reg & 0xff, GRUB_VGA_CR_PITCH);
 
-    cr_write (line_compare & 0xff, CIRRUS_CR_LINE_COMPARE);
-    overflow_reg |= (line_compare >> CIRRUS_CR_OVERFLOW_LINE_COMPARE_SHIFT)
-      & CIRRUS_CR_OVERFLOW_LINE_COMPARE_MASK;
+    grub_vga_cr_write (line_compare & 0xff, GRUB_VGA_CR_LINE_COMPARE);
+    overflow_reg |= (line_compare >> GRUB_VGA_CR_OVERFLOW_LINE_COMPARE_SHIFT)
+      & GRUB_VGA_CR_OVERFLOW_LINE_COMPARE_MASK;
 
-    cr_write (overflow_reg, CIRRUS_CR_OVERFLOW);
+    grub_vga_cr_write (overflow_reg, GRUB_VGA_CR_OVERFLOW);
 
-    cr_write ((pitch_reg >> CIRRUS_CR_EXTENDED_DISPLAY_PITCH_SHIFT)
+    grub_vga_cr_write ((pitch_reg >> CIRRUS_CR_EXTENDED_DISPLAY_PITCH_SHIFT)
 	      & CIRRUS_CR_EXTENDED_DISPLAY_PITCH_MASK,
 	      CIRRUS_CR_EXTENDED_DISPLAY);
 
-    cr_write ((line_compare >> CIRRUS_CR_CELL_HEIGHT_LINE_COMPARE_SHIFT)
-	      & CIRRUS_CR_CELL_HEIGHT_LINE_COMPARE_MASK, CIRRUS_CR_CELL_HEIGHT);
+    grub_vga_cr_write ((line_compare >> GRUB_VGA_CR_CELL_HEIGHT_LINE_COMPARE_SHIFT)
+		       & GRUB_VGA_CR_CELL_HEIGHT_LINE_COMPARE_MASK, GRUB_VGA_CR_CELL_HEIGHT);
 
-    cr_write (CIRRUS_CR_MODE_TIMING_ENABLE | CIRRUS_CR_MODE_BYTE_MODE
-	      | CIRRUS_CR_MODE_NO_HERCULES | CIRRUS_CR_MODE_NO_CGA,
-	      CIRRUS_CR_MODE);
+    grub_vga_cr_write (GRUB_VGA_CR_MODE_TIMING_ENABLE
+		       | GRUB_VGA_CR_MODE_BYTE_MODE
+		       | GRUB_VGA_CR_MODE_NO_HERCULES | GRUB_VGA_CR_MODE_NO_CGA,
+		       GRUB_VGA_CR_MODE);
 
     doublebuf_pageflipping_set_page (0);
 
@@ -517,7 +404,7 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height,
 	sr_ext |= CIRRUS_SR_EXTENDED_MODE_8BPP;
 	break;
       }
-    sr_write (sr_ext, CIRRUS_SR_EXTENDED_MODE);
+    grub_vga_sr_write (sr_ext, CIRRUS_SR_EXTENDED_MODE);
     write_hidden_dac (hidden_dac);
   }
 
diff --git a/video/i386/pc/vga.c b/video/i386/pc/vga.c
index 222a71272..7e923bddd 100644
--- a/video/i386/pc/vga.c
+++ b/video/i386/pc/vga.c
@@ -27,6 +27,7 @@
 #include <grub/types.h>
 #include <grub/dl.h>
 #include <grub/misc.h>
+#include <grub/vga.h>
 
 #define VGA_WIDTH	640
 #define VGA_HEIGHT	350
@@ -45,58 +46,26 @@ static struct
   int back_page;
 } framebuffer;
 
-#define SEQUENCER_ADDR_PORT	0x3C4
-#define SEQUENCER_DATA_PORT	0x3C5
-#define MAP_MASK_REGISTER	0x02
-
-#define CRTC_ADDR_PORT		0x3D4
-#define CRTC_DATA_PORT		0x3D5
-#define START_ADDR_HIGH_REGISTER 0x0C
-#define START_ADDR_LOW_REGISTER	0x0D
-
-#define GRAPHICS_ADDR_PORT	0x3CE
-#define GRAPHICS_DATA_PORT	0x3CF
-#define READ_MAP_REGISTER	0x04
-
-#define INPUT_STATUS1_REGISTER	0x3DA
-#define INPUT_STATUS1_VERTR_BIT 0x08
-
 static inline void
 wait_vretrace (void)
 {
   /* Wait until there is a vertical retrace.  */
-  while (! (grub_inb (INPUT_STATUS1_REGISTER) & INPUT_STATUS1_VERTR_BIT));
+  while (! (grub_inb (GRUB_VGA_IO_INPUT_STATUS1_REGISTER)
+	    & GRUB_VGA_IO_INPUT_STATUS1_VERTR_BIT));
 }
 
 /* Get Map Mask Register.  */
 static unsigned char
 get_map_mask (void)
 {
-  unsigned char old_addr;
-  unsigned char old_data;
-
-  old_addr = grub_inb (SEQUENCER_ADDR_PORT);
-  grub_outb (MAP_MASK_REGISTER, SEQUENCER_ADDR_PORT);
-
-  old_data = grub_inb (SEQUENCER_DATA_PORT);
-
-  grub_outb (old_addr, SEQUENCER_ADDR_PORT);
-
-  return old_data;
+  return grub_vga_sr_read (GRUB_VGA_SR_MAP_MASK_REGISTER);
 }
 
 /* Set Map Mask Register.  */
 static void
 set_map_mask (unsigned char mask)
 {
-  unsigned char old_addr;
-
-  old_addr = grub_inb (SEQUENCER_ADDR_PORT);
-  grub_outb (MAP_MASK_REGISTER, SEQUENCER_ADDR_PORT);
-
-  grub_outb (mask, SEQUENCER_DATA_PORT);
-
-  grub_outb (old_addr, SEQUENCER_ADDR_PORT);
+  grub_vga_sr_write (mask, GRUB_VGA_SR_MAP_MASK_REGISTER);
 }
 
 #if 0
@@ -104,14 +73,7 @@ set_map_mask (unsigned char mask)
 static void
 set_read_map (unsigned char map)
 {
-  unsigned char old_addr;
-
-  old_addr = grub_inb (GRAPHICS_ADDR_PORT);
-
-  grub_outb (READ_MAP_REGISTER, GRAPHICS_ADDR_PORT);
-  grub_outb (map, GRAPHICS_DATA_PORT);
-
-  grub_outb (old_addr, GRAPHICS_ADDR_PORT);
+  grub_vga_gr_write (map, GRUB_VGA_GR_READ_MAP_REGISTER);
 }
 #endif
 
@@ -119,17 +81,8 @@ set_read_map (unsigned char map)
 static void
 set_start_address (unsigned int start)
 {
-  unsigned char old_addr;
-
-  old_addr = grub_inb (CRTC_ADDR_PORT);
-
-  grub_outb (START_ADDR_LOW_REGISTER, CRTC_ADDR_PORT);
-  grub_outb (start & 0xFF, CRTC_DATA_PORT);
-
-  grub_outb (START_ADDR_HIGH_REGISTER, CRTC_ADDR_PORT);
-  grub_outb (start >> 8, CRTC_DATA_PORT);
-
-  grub_outb (old_addr, CRTC_ADDR_PORT);
+  grub_vga_cr_write (start & 0xFF, GRUB_VGA_CR_START_ADDR_LOW_REGISTER);
+  grub_vga_cr_write (start >> 8, GRUB_VGA_CR_START_ADDR_HIGH_REGISTER);
 }
 
 static int setup = 0;

From 7e70395f9c8cf179832a9d5070d108fdfe3f82ef Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 17 May 2010 21:35:39 +0200
Subject: [PATCH 0968/1628] Cherrypick bugfixes and coreboot+qemu support from
 expermental

---
 util/grub-mkrescue.in | 147 ++++++++++++++++++++++--------------------
 1 file changed, 77 insertions(+), 70 deletions(-)

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 993ffe0cb..4e105f125 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -30,10 +30,13 @@ target_cpu=@target_cpu@
 native_platform=@platform@
 pkglib_DATA="@pkglib_DATA@"
 
-multiboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-multiboot
-pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/${target_cpu}-pc
+multiboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-multiboot
+coreboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-coreboot
+qemu_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-qemu
+pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-pc
 efi32_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-efi
 efi64_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi
+rom_directory=
 
 # Usage: usage
 # Print the usage.
@@ -44,8 +47,9 @@ Make GRUB rescue image.
 
   -h, --help              print this message and exit
   -v, --version           print the version information and exit
-  --modules=MODULES       pre-load specified modules MODULES
   --output=FILE           save output in FILE [required]
+  --modules=MODULES       pre-load specified modules MODULES
+  --rom-directory=DIR     save rom images in DIR [optional]
 
 $0 generates a bootable rescue image with specified source files or directories.
 
@@ -66,6 +70,8 @@ for option in "$@"; do
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
     --output=*)
 	output_image=`echo "$option" | sed 's/--output=//'` ;;
+    --rom-directory=*)
+	rom_directory=`echo "$option" | sed 's/--rom-directory=//'` ;;
     # Intentionally undocumented
     --override-directory=*)
 	override_dir=`echo "${option}/" | sed 's/--override-directory=//'`
@@ -103,15 +109,15 @@ process_input_dir ()
 {
     input_dir="$1"
     platform="$2"
-    mkdir -p ${iso9660_dir}/boot/grub/${target_cpu}-${platform}
+    mkdir -p ${iso9660_dir}/boot/grub/${platform}
     for file in ${input_dir}/*.mod; do
         if test -f "$file"; then
-            cp -f "$file" ${iso9660_dir}/boot/grub/${target_cpu}-${platform}/
+            cp -f "$file" ${iso9660_dir}/boot/grub/${platform}/
         fi
     done
     for file in ${pkglib_DATA}; do
 	if test -f "${input_dir}/${file}"; then
-            cp -f "${input_dir}/${file}" ${iso9660_dir}/boot/grub/${target_cpu}-${platform}/
+            cp -f "${input_dir}/${file}" ${iso9660_dir}/boot/grub/${platform}/
 	fi
     done
 
@@ -123,28 +129,71 @@ process_input_dir ()
     done
 }
 
+make_image ()
+{
+    source_directory="$1"
+    platform=$2
+    if ! test -e "${source_directory}"; then
+	return;
+    fi
+
+    echo "Enabling $2 support ..."
+
+    memdisk_img=`mktemp "$MKTEMP_TEMPLATE"`
+    memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
+    mkdir -p ${memdisk_dir}/boot/grub
+
+    modules="$(cat ${source_directory}/partmap.lst) ${modules}"
+    cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
+search --fs-uuid --set ${iso_uuid}
+set prefix=(\${root})/boot/grub/${platform}
+source \$prefix/grub.cfg
+EOF
+    (for i in ${modules} ; do
+        echo "insmod $i"
+    done ; \
+    echo "source /boot/grub/grub.cfg") \
+    > ${iso9660_dir}/boot/grub/${platform}/grub.cfg
+
+    tar -C ${memdisk_dir} -cf ${memdisk_img} boot
+    rm -rf ${memdisk_dir}
+    grub-mkimage -O ${platform} -d "${source_directory}" -m "${memdisk_img}" -o "$3" --prefix='(memdisk)/boot/grub' \
+        search iso9660 configfile normal memdisk tar $4
+    rm -rf ${memdisk_img}
+}
+
 if [ "${override_dir}" = "" ] ; then
     if test -e "${multiboot_dir}" ; then
-        process_input_dir ${multiboot_dir} multiboot
+        process_input_dir ${multiboot_dir} i386-multiboot
+    fi
+    if test -e "${coreboot_dir}" ; then
+        process_input_dir ${coreboot_dir} i386-coreboot
+    fi
+    if test -e "${qemu_dir}" ; then
+        process_input_dir ${qemu_dir} i386-qemu
     fi
     if test -e "${pc_dir}" ; then
-        process_input_dir ${pc_dir} pc
+        process_input_dir ${pc_dir} i386-pc
     fi
     if test -e "${efi32_dir}" ; then
-        process_input_dir ${efi32_dir} efi32
+        process_input_dir ${efi32_dir} i386-efi
     fi
     if test -e "${efi64_dir}" ; then
-        process_input_dir ${efi64_dir} efi64
+        process_input_dir ${efi64_dir} x86_64-efi
     fi
 else
-    process_input_dir ${override_dir} ${native_platform}
+    process_input_dir ${override_dir} ${target_cpu}-${native_platform}
     multiboot_dir=
     pc_dir=
     efi32_dir=
     efi64_dir=
+    coreboot_dir=
+    qemu_dir=
     case "${target_cpu}-${native_platform}" in
-        i386-pc) pc_dir=${override_dir} ;;
         i386-multiboot) multiboot_dir=${override_dir} ;;
+        i386-coreboot) coreboot_dir=${override_dir} ;;
+        i386-qemu) qemu_dir=${override_dir} ;;
+        i386-pc) pc_dir=${override_dir} ;;
 	i386-efi) efi32_dir=${override_dir} ;;
 	x86_64-efi) efi64_dir=${override_dir} ;;
     esac
@@ -154,33 +203,6 @@ fi
 iso_uuid=$(date -u +%Y-%m-%d-%H-%M-%S-00)
 grub_mkisofs_arguments="${grub_mkisofs_arguments} --modification-date=$(echo ${iso_uuid} | sed -e s/-//g)"
 
-# build coreboot multiboot.img
-if test -e "${multiboot_dir}" ; then
-    echo "Enabling multiboot support ..."
-    memdisk_img=`mktemp "$MKTEMP_TEMPLATE"`
-    memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
-    mkdir -p ${memdisk_dir}/boot/grub
-
-    modules="$(cat ${multiboot_dir}/partmap.lst) ${modules}"
-    cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
-search --fs-uuid --set ${iso_uuid}
-set prefix=(\${root})/boot/grub/${target_cpu}-multiboot
-source \$prefix/grub.cfg
-EOF
-    (for i in ${modules} ; do
-        echo "insmod $i"
-    done ; \
-    echo "source /boot/grub/grub.cfg") \
-    > ${iso9660_dir}/boot/grub/i386-multiboot/grub.cfg
-
-    tar -C ${memdisk_dir} -cf ${memdisk_img} boot
-    rm -rf ${memdisk_dir}
-    grub-mkimage -O i386-coreboot -d ${multiboot_dir}/ -m ${memdisk_img} -o ${iso9660_dir}/boot/multiboot.img \
-        memdisk tar search iso9660 configfile sh \
-        ata at_keyboard
-    rm -f ${memdisk_img}
-fi
-
 # build BIOS core.img
 if test -e "${pc_dir}" ; then
     echo "Enabling BIOS support ..."
@@ -205,47 +227,32 @@ if test -e "${pc_dir}" ; then
 		--embedded-boot ${embed_img}"
 fi
 
+# build multiboot core.img
+make_image "${multiboot_dir}" i386-multiboot "${iso9660_dir}/boot/multiboot.img" "ata at_keyboard"
+
 if test -e "${efi64_dir}" || test -e "${efi32_dir}"; then
     efi_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
     mkdir -p "${efi_dir}/efi/boot"
-else
-    efi_dir=
-fi
 
-# build bootx64.efi
-if test -e "${efi64_dir}" ; then
-    echo "Enabling EFI64 support ..."
-    memdisk_img=`mktemp "$MKTEMP_TEMPLATE"`
-    memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
-    mkdir -p ${memdisk_dir}/boot/grub
+    # build bootx64.efi
+    make_image "${efi64_dir}" x86_64-efi "${efi_dir}"/efi/boot/bootx64.efi ""
+    # build bootia32.efi
+    make_image "${efi32_dir}" i386-efi "${efi_dir}"/efi/boot/bootia32.efi ""
 
-    cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
-search --fs-uuid --set ${iso_uuid}
-set prefix=(\${root})/boot/grub/${target_cpu}-efi
-source \$prefix/grub.cfg
-EOF
-
-    tar -C ${memdisk_dir} -cf ${memdisk_img} boot
-    rm -rf ${memdisk_dir}
-
-    grub-mkimage -O x86_64-efi -d "${efi64_dir}" -m "${memdisk_img}" -o "${efi_dir}"/efi/boot/bootx64.efi --prefix='(memdisk)/boot/grub' \
-        search iso9660 configfile sh memdisk tar
-    rm -f ${memdisk_img}
-
-    modules="$(cat "${efi64_dir}"/partmap.lst) ${modules}"
-    (for i in ${modules} ; do
-        echo "insmod $i"
-    done ; \
-    echo "source /boot/grub/grub.cfg") \
-    > "${iso9660_dir}"/boot/grub/x86_64-efi/grub.cfg
-fi
-
-if test x"${efi_dir}" != x; then
     mformat -C -f 2880 -L 16 -i "${iso9660_dir}"/efi.img ::
     mcopy -s -i "${iso9660_dir}"/efi.img ${efi_dir}/efi ::/
     grub_mkisofs_arguments="${grub_mkisofs_arguments} --efi-boot efi.img"
 fi
 
+make_image "${qemu_dir}" i386-qemu "${iso9660_dir}/boot/qemu.img" "ata at_keyboard"
+if [ -e "${iso9660_dir}/boot/qemu.img" ] && [ -d "${rom_directory}" ]; then
+    cp "${iso9660_dir}/boot/qemu.img" "${rom_directory}/qemu.img"
+fi
+make_image "${coreboot_dir}" i386-coreboot "${iso9660_dir}/boot/coreboot.elf" "ata at_keyboard"
+if [ -e "${iso9660_dir}/boot/coreboot.elf" ] && [ -d "${rom_directory}" ]; then
+    cp "${iso9660_dir}/boot/coreboot.elf" "${rom_directory}/coreboot.elf"
+fi
+
 # build iso image
 xorriso -pathspecs on -as mkisofs ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} ${source}
 rm -rf ${iso9660_dir}

From 8b26d1d30b1a984ac320c37ea7e8c8986ea9ff16 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 17 May 2010 22:23:22 +0200
Subject: [PATCH 0969/1628] add missing sh.mod

---
 util/grub-mkrescue.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 4e105f125..5f35f084a 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -158,7 +158,7 @@ EOF
     tar -C ${memdisk_dir} -cf ${memdisk_img} boot
     rm -rf ${memdisk_dir}
     grub-mkimage -O ${platform} -d "${source_directory}" -m "${memdisk_img}" -o "$3" --prefix='(memdisk)/boot/grub' \
-        search iso9660 configfile normal memdisk tar $4
+        search iso9660 configfile normal sh memdisk tar $4
     rm -rf ${memdisk_img}
 }
 

From 6198f888c9a9a0f37aac413e16a50198b5843974 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 17 May 2010 22:28:51 +0200
Subject: [PATCH 0970/1628] Revert spurious change in Makefile.in

---
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 3df8b1b72..26a494518 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -287,7 +287,7 @@ build_env.mk: Makefile
 	echo "TARGET_CC=$(TARGET_CC)" ; \
 	echo "TARGET_CFLAGS=$(TARGET_CFLAGS)" ; \
 	echo "TARGET_ASFLAGS=$(TARGET_ASFLAGS)" ; \
-	echo "TARGET_CPPFLAGS=$(TARGET_CPPFLAGS) -I$(libdir) -I$(includedir)" ; \
+	echo "TARGET_CPPFLAGS=$(TARGET_CPPFLAGS) -I$(pkglibdir) -I$(includedir)" ; \
 	echo "STRIP=$(STRIP)" ; \
 	echo "OBJCONV=$(OBJCONV)" ; \
 	echo "TARGET_MODULE_FORMAT=$(TARGET_MODULE_FORMAT)" ; \

From 1d3293d67dabf99bed6dc4e8d22389614821d64c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 17 May 2010 23:33:03 +0200
Subject: [PATCH 0971/1628] 	Remove grub-mkisofs.

	* conf/common.rmk (bin_UTILITIES): Remove grub-mkisofs.
	(grub_mkisofs_SOURCES): Removed.
	(grub_mkisofs_CFLAGS): Removed.
	* util/mkisofs/defaults.h: Removed.
	* util/mkisofs/eltorito.c: Likewise.
	* util/mkisofs/exclude.h: Likewise.
	* util/mkisofs/hash.c: Likewise.
	* util/mkisofs/include/: Likewise.
	* util/mkisofs/include/fctldefs.h: Likewise.
	* util/mkisofs/include/mconfig.h: Likewise.
	* util/mkisofs/include/prototyp.h: Likewise.
	* util/mkisofs/include/statdefs.h: Likewise.
	* util/mkisofs/iso9660.h: Likewise.
	* util/mkisofs/joliet.c: Likewise.
	* util/mkisofs/match.c: Likewise.
	* util/mkisofs/match.h: Likewise.
	* util/mkisofs/mkisofs.c: Likewise.
	* util/mkisofs/mkisofs.h: Likewise.
	* util/mkisofs/msdos_partition.h: Likewise.
	* util/mkisofs/multi.c: Likewise.
	* util/mkisofs/name.c: Likewise.
	* util/mkisofs/rock.c: Likewise.
	* util/mkisofs/tree.c: Likewise.
	* util/mkisofs/write.c: Likewise.
---
 ChangeLog                       |   29 +
 conf/common.rmk                 |   14 -
 util/mkisofs/defaults.h         |   20 -
 util/mkisofs/eltorito.c         |  343 ------
 util/mkisofs/exclude.h          |   10 -
 util/mkisofs/hash.c             |  225 ----
 util/mkisofs/include/fctldefs.h |   57 -
 util/mkisofs/include/mconfig.h  |  253 -----
 util/mkisofs/include/prototyp.h |   74 --
 util/mkisofs/include/statdefs.h |  139 ---
 util/mkisofs/iso9660.h          |  174 ---
 util/mkisofs/joliet.c           | 1023 -----------------
 util/mkisofs/match.c            |   76 --
 util/mkisofs/match.h            |   29 -
 util/mkisofs/mkisofs.c          | 1422 -----------------------
 util/mkisofs/mkisofs.h          |  530 ---------
 util/mkisofs/msdos_partition.h  |   75 --
 util/mkisofs/multi.c            | 1201 --------------------
 util/mkisofs/name.c             |  394 -------
 util/mkisofs/rock.c             |  597 ----------
 util/mkisofs/tree.c             | 1865 -------------------------------
 util/mkisofs/write.c            | 1483 ------------------------
 22 files changed, 29 insertions(+), 10004 deletions(-)
 delete mode 100644 util/mkisofs/defaults.h
 delete mode 100644 util/mkisofs/eltorito.c
 delete mode 100644 util/mkisofs/exclude.h
 delete mode 100644 util/mkisofs/hash.c
 delete mode 100644 util/mkisofs/include/fctldefs.h
 delete mode 100644 util/mkisofs/include/mconfig.h
 delete mode 100644 util/mkisofs/include/prototyp.h
 delete mode 100644 util/mkisofs/include/statdefs.h
 delete mode 100644 util/mkisofs/iso9660.h
 delete mode 100644 util/mkisofs/joliet.c
 delete mode 100644 util/mkisofs/match.c
 delete mode 100644 util/mkisofs/match.h
 delete mode 100644 util/mkisofs/mkisofs.c
 delete mode 100644 util/mkisofs/mkisofs.h
 delete mode 100644 util/mkisofs/msdos_partition.h
 delete mode 100644 util/mkisofs/multi.c
 delete mode 100644 util/mkisofs/name.c
 delete mode 100644 util/mkisofs/rock.c
 delete mode 100644 util/mkisofs/tree.c
 delete mode 100644 util/mkisofs/write.c

diff --git a/ChangeLog b/ChangeLog
index 5f3410ea1..8258400c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2010-05-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Remove grub-mkisofs.
+
+	* conf/common.rmk (bin_UTILITIES): Remove grub-mkisofs.
+	(grub_mkisofs_SOURCES): Removed.
+	(grub_mkisofs_CFLAGS): Removed.
+	* util/mkisofs/defaults.h: Removed.
+	* util/mkisofs/eltorito.c: Likewise.
+	* util/mkisofs/exclude.h: Likewise.
+	* util/mkisofs/hash.c: Likewise.
+	* util/mkisofs/include/: Likewise.
+	* util/mkisofs/include/fctldefs.h: Likewise.
+	* util/mkisofs/include/mconfig.h: Likewise.
+	* util/mkisofs/include/prototyp.h: Likewise.
+	* util/mkisofs/include/statdefs.h: Likewise.
+	* util/mkisofs/iso9660.h: Likewise.
+	* util/mkisofs/joliet.c: Likewise.
+	* util/mkisofs/match.c: Likewise.
+	* util/mkisofs/match.h: Likewise.
+	* util/mkisofs/mkisofs.c: Likewise.
+	* util/mkisofs/mkisofs.h: Likewise.
+	* util/mkisofs/msdos_partition.h: Likewise.
+	* util/mkisofs/multi.c: Likewise.
+	* util/mkisofs/name.c: Likewise.
+	* util/mkisofs/rock.c: Likewise.
+	* util/mkisofs/tree.c: Likewise.
+	* util/mkisofs/write.c: Likewise.
+
 2010-05-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Unify grub-mkimage accross platforms.
diff --git a/conf/common.rmk b/conf/common.rmk
index 00efa78fb..4186c61b2 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -43,20 +43,6 @@ ifeq ($(enable_grub_fstest), yes)
 bin_UTILITIES += grub-fstest
 endif
 
-bin_UTILITIES += grub-mkisofs
-grub_mkisofs_SOURCES = util/mkisofs/eltorito.c 				\
-	util/mkisofs/hash.c util/mkisofs/joliet.c			\
-	util/mkisofs/match.c util/mkisofs/mkisofs.c			\
-	util/mkisofs/multi.c util/mkisofs/name.c			\
-	util/mkisofs/rock.c util/mkisofs/tree.c				\
-	util/mkisofs/write.c						\
-	\
-	gnulib/fnmatch.c gnulib/getopt1.c gnulib/getopt.c		\
-	gnulib/error.c gnulib/progname.c
-grub_mkisofs_CFLAGS = -D_FILE_OFFSET_BITS=64 				\
-	-I$(srcdir)/util/mkisofs/include				\
-	-Wno-all -Werror $(GNULIB_UTIL_CFLAGS)
-
 # For grub-fstest.
 util/grub-fstest.c_DEPENDENCIES = grub_fstest_init.h
 grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c kern/emu/hostfs.c \
diff --git a/util/mkisofs/defaults.h b/util/mkisofs/defaults.h
deleted file mode 100644
index 2ce9e8d6b..000000000
--- a/util/mkisofs/defaults.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Header file defaults.h - assorted default values for character strings in
- * the volume descriptor.
- *
- * 	$Id: defaults.h,v 1.8 1999/03/02 03:41:25 eric Exp $
- */
-
-#define  PREPARER_DEFAULT 	NULL
-#define  PUBLISHER_DEFAULT	NULL
-#ifndef	APPID_DEFAULT
-#define  APPID_DEFAULT 		PACKAGE_NAME " ISO 9660 filesystem builder"
-#endif
-#define  COPYRIGHT_DEFAULT 	NULL
-#define  BIBLIO_DEFAULT 	NULL
-#define  ABSTRACT_DEFAULT 	NULL
-#define  VOLSET_ID_DEFAULT 	NULL
-#define  VOLUME_ID_DEFAULT 	"CDROM"
-#define  BOOT_CATALOG_DEFAULT   "boot.catalog"
-#define  BOOT_IMAGE_DEFAULT     NULL
-#define  SYSTEM_ID_DEFAULT 	"GNU"
diff --git a/util/mkisofs/eltorito.c b/util/mkisofs/eltorito.c
deleted file mode 100644
index 1d2a715e0..000000000
--- a/util/mkisofs/eltorito.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * Program eltorito.c - Handle El Torito specific extensions to iso9660.
- *
-
-   Written by Michael Fulbright <msf@redhat.com> (1996).
-
-   Copyright 1996 RedHat Software, Incorporated
-
-   Copyright (C) 2009  Free Software Foundation, Inc.
-
-   Boot Info Table generation based on code from genisoimage.c
-   (from cdrkit 1.1.9), which was originally licensed under GPLv2+.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include "config.h"
-#include "mkisofs.h"
-#include "iso9660.h"
-
-/* used by Win32 for opening binary file - not used by Unix */
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif /* O_BINARY */
-
-#undef MIN
-#define MIN(a, b) (((a) < (b))? (a): (b))
-
-static struct eltorito_validation_entry valid_desc;
-static struct eltorito_defaultboot_entry default_desc;
-static struct eltorito_boot_descriptor gboot_desc;
-
-static int tvd_write	__PR((FILE * outfile));
-
-/*
- * Check for presence of boot catalog. If it does not exist then make it
- */
-void FDECL1(init_boot_catalog, const char *, path)
-{
-    FILE *bcat;
-    char		* bootpath;                /* filename of boot catalog */
-    char		* buf;
-    struct stat	  statbuf;
-   
-    bootpath = (char *) e_malloc(strlen(boot_catalog)+strlen(path)+2);
-    strcpy(bootpath, path);
-    if (bootpath[strlen(bootpath)-1] != '/')
-    {
-	strcat(bootpath,"/");
-    }
-   
-    strcat(bootpath, boot_catalog);
-   
-    /*
-     * check for the file existing
-     */
-#ifdef DEBUG_TORITO
-    fprintf(stderr,"Looking for boot catalog file %s\n",bootpath);
-#endif
-   
-    if (!stat_filter(bootpath, &statbuf))
-    {
-	/*
-	 * make sure its big enough to hold what we want
-	 */
-	if (statbuf.st_size == 2048)
-	{
-	    /*
-	     * printf("Boot catalog exists, so we do nothing\n");
-	     */
-	    free(bootpath);
-	    return;
-	}
-	else
-	{
-	  fprintf (stderr, _("A boot catalog exists and appears corrupted.\n"));
-	  fprintf (stderr, _("Please check the following file: %s.\n"), bootpath);
-	  fprintf (stderr, _("This file must be removed before a bootable CD can be done.\n"));
-	  free (bootpath);
-	  exit (1);
-	}
-    }
-   
-    /*
-     * file does not exist, so we create it
-     * make it one CD sector long
-     */
-    bcat = fopen (bootpath, "wb");
-    if (bcat == NULL)
-      error (1, errno, _("Error creating boot catalog (%s)"), bootpath);
-   
-    buf = (char *) e_malloc( 2048 );
-    if (fwrite (buf, 1, 2048, bcat) != 2048)
-      error (1, errno, _("Error writing to boot catalog (%s)"), bootpath);
-    fclose (bcat);
-    chmod (bootpath, S_IROTH | S_IRGRP | S_IRWXU);
-
-    free(bootpath);
-} /* init_boot_catalog(... */
-
-void FDECL1(get_torito_desc, struct eltorito_boot_descriptor *, boot_desc)
-{
-    FILE *bootcat;
-    int				checksum;
-    unsigned char		      * checksum_ptr;
-    struct directory_entry      * de;
-    struct directory_entry      * de2;
-    unsigned int		i;
-    int				nsectors;
-   
-    memset(boot_desc, 0, sizeof(*boot_desc));
-    boot_desc->id[0] = 0;
-    memcpy(boot_desc->id2, ISO_STANDARD_ID, sizeof(ISO_STANDARD_ID));
-    boot_desc->version[0] = 1;
-   
-    memcpy(boot_desc->system_id, EL_TORITO_ID, sizeof(EL_TORITO_ID));
-   
-    /*
-     * search from root of iso fs to find boot catalog
-     */
-    de2 = search_tree_file(root, boot_catalog);
-    if (!de2)
-    {
-      fprintf (stderr, _("Boot catalog cannot be found!\n"));
-      exit (1);
-    }
-   
-    set_731(boot_desc->bootcat_ptr,
-	    (unsigned int) get_733(de2->isorec.extent));
-   
-    /*
-     * now adjust boot catalog
-     * lets find boot image first
-     */
-    de=search_tree_file(root, boot_image);
-    if (!de)
-    {
-      fprintf (stderr, _("Boot image cannot be found!\n"));
-      exit (1);
-    }
-   
-    /*
-     * we have the boot image, so write boot catalog information
-     * Next we write out the primary descriptor for the disc
-     */
-    memset(&valid_desc, 0, sizeof(valid_desc));
-    valid_desc.headerid[0] = 1;
-    valid_desc.arch[0] = EL_TORITO_ARCH_x86;
-   
-    /*
-     * we'll shove start of publisher id into id field, may get truncated
-     * but who really reads this stuff!
-     */
-    if (publisher)
-        memcpy_max(valid_desc.id,  publisher, MIN(23, strlen(publisher)));
-   
-    valid_desc.key1[0] = 0x55;
-    valid_desc.key2[0] = 0xAA;
-   
-    /*
-     * compute the checksum
-     */
-    checksum=0;
-    checksum_ptr = (unsigned char *) &valid_desc;
-    for (i=0; i<sizeof(valid_desc); i+=2)
-    {
-	/*
-	 * skip adding in ckecksum word, since we dont have it yet!
-	 */
-	if (i == 28)
-	{
-	    continue;
-	}
-	checksum += (unsigned int)checksum_ptr[i];
-	checksum += ((unsigned int)checksum_ptr[i+1])*256;
-    }
-   
-    /*
-     * now find out the real checksum
-     */
-    checksum = -checksum;
-    set_721(valid_desc.cksum, (unsigned int) checksum);
-   
-    /*
-     * now make the initial/default entry for boot catalog
-     */
-    memset(&default_desc, 0, sizeof(default_desc));
-    default_desc.boot_id[0] = EL_TORITO_BOOTABLE;
-   
-    /*
-     * use default BIOS loadpnt
-     */
-    set_721(default_desc.loadseg, 0);
-    default_desc.arch[0] = EL_TORITO_ARCH_x86;
-   
-    /*
-     * figure out size of boot image in sectors, for now hard code to
-     * assume 512 bytes/sector on a bootable floppy
-     */
-    nsectors = ((de->size + 511) & ~(511))/512;
-    fprintf (stderr, _("\nSize of boot image is %d sectors"), nsectors);
-    fprintf (stderr, " -> ");
-
-    if (! use_eltorito_emul_floppy)
-      {
-	default_desc.boot_media[0] = EL_TORITO_MEDIA_NOEMUL;
-	fprintf (stderr, _("No emulation\n"));
-      }
-    else if (nsectors == 2880 )
-      /*
-       * choose size of emulated floppy based on boot image size
-       */
-      {
-	default_desc.boot_media[0] = EL_TORITO_MEDIA_144FLOP;
-	fprintf (stderr, _("Emulating a 1.44 meg floppy\n"));
-      }
-    else if (nsectors == 5760 )
-      {
-	default_desc.boot_media[0] = EL_TORITO_MEDIA_288FLOP;
-	fprintf (stderr, _("Emulating a 2.88 meg floppy\n"));
-      }
-    else if (nsectors == 2400 )
-      {
-	default_desc.boot_media[0] = EL_TORITO_MEDIA_12FLOP;
-	fprintf (stderr, _("Emulating a 1.2 meg floppy\n"));
-      }
-    else
-      {
-	fprintf (stderr, _("\nError - boot image is not the an allowable size.\n"));
-	exit (1);
-      }
-   
-    /*
-     * FOR NOW LOAD 1 SECTOR, JUST LIKE FLOPPY BOOT!!!
-     */
-    nsectors = 1;
-    set_721(default_desc.nsect, (unsigned int) nsectors );
-#ifdef DEBUG_TORITO
-    fprintf(stderr,"Extent of boot images is %d\n",get_733(de->isorec.extent));
-#endif
-    set_731(default_desc.bootoff,
-	    (unsigned int) get_733(de->isorec.extent));
-   
-    /*
-     * now write it to disk
-     */
-    bootcat = fopen (de2->whole_name, "r+b");
-    if (bootcat == NULL)
-      error (1, errno, _("Error opening boot catalog for update"));
-
-    /*
-     * write out
-     */
-    if (fwrite (&valid_desc, 1, 32, bootcat) != 32)
-      error (1, errno, _("Error writing to boot catalog"));
-    if (fwrite (&default_desc, 1, 32, bootcat) != 32)
-      error (1, errno, _("Error writing to boot catalog"));
-    fclose (bootcat);
-
-    /* If the user has asked for it, patch the boot image */
-    if (use_boot_info_table)
-      {
-	FILE *bootimage;
-	uint32_t bi_checksum;
-	unsigned int total_len;
-	static char csum_buffer[SECTOR_SIZE];
-	int len;
-	struct eltorito_boot_info bi_table;
-	bootimage = fopen (de->whole_name, "r+b");
-	if (bootimage == NULL)
-	  error (1, errno, _("Error opening boot image file `%s' for update"),
-		 de->whole_name);
-	/* Compute checksum of boot image, sans 64 bytes */
-	total_len = 0;
-	bi_checksum = 0;
-	while ((len = fread (csum_buffer, 1, SECTOR_SIZE, bootimage)) > 0)
-	  {
-	    if (total_len & 3)
-	      error (1, 0, _("Odd alignment at non-end-of-file in boot image `%s'"),
-		     de->whole_name);
-	    if (total_len < 64)
-	      memset (csum_buffer, 0, 64 - total_len);
-	    if (len < SECTOR_SIZE)
-	      memset (csum_buffer + len, 0, SECTOR_SIZE - len);
-	    for (i = 0; i < SECTOR_SIZE; i += 4)
-	      bi_checksum += get_731 (&csum_buffer[i]);
-	    total_len += len;
-	  }
-
-	if (total_len != de->size)
-	  error (1, 0, _("Boot image file `%s' changed unexpectedly"),
-		 de->whole_name);
-	/* End of file, set position to byte 8 */
-	fseeko (bootimage, (off_t) 8, SEEK_SET);
-	memset (&bi_table, 0, sizeof (bi_table));
-	/* Is it always safe to assume PVD is at session_start+16? */
-	set_731 (bi_table.pvd_addr, session_start + 16);
-	set_731 (bi_table.file_addr, de->starting_block);
-	set_731 (bi_table.file_length, de->size);
-	set_731 (bi_table.file_checksum, bi_checksum);
-
-	if (fwrite (&bi_table, 1, sizeof (bi_table), bootimage) != sizeof (bi_table))
-	  error (1, errno, _("Error writing to boot image (%s)"), bootimage);
-	fclose (bootimage);
-      }
-
-} /* get_torito_desc(... */
-
-/*
- * Function to write the EVD for the disc.
- */
-static int FDECL1(tvd_write, FILE *, outfile)
-{
-  /*
-   * Next we write out the boot volume descriptor for the disc
-   */
-  get_torito_desc(&gboot_desc);
-  xfwrite(&gboot_desc, 1, 2048, outfile);
-  last_extent_written ++;
-  return 0;
-}
-
-struct output_fragment torito_desc    = {NULL, oneblock_size, NULL,     tvd_write};
diff --git a/util/mkisofs/exclude.h b/util/mkisofs/exclude.h
deleted file mode 100644
index ac1a561ad..000000000
--- a/util/mkisofs/exclude.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * 9-Dec-93 R.-D. Marzusch, marzusch@odiehh.hanse.de:
- * added 'exclude' option (-x) to specify pathnames NOT to be included in
- * CD image.
- *
- * 	$Id: exclude.h,v 1.2 1999/03/02 03:41:25 eric Exp $
- */
-
-void exclude	__PR((char * fn));
-int is_excluded	__PR((char * fn));
diff --git a/util/mkisofs/hash.c b/util/mkisofs/hash.c
deleted file mode 100644
index 41e76b342..000000000
--- a/util/mkisofs/hash.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * File hash.c - generate hash tables for iso9660 filesystem.
-
-   Written by Eric Youngdale (1993).
-
-   Copyright 1993 Yggdrasil Computing, Incorporated
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#include <stdlib.h>
-#include "config.h"
-#include "mkisofs.h"
-
-#define NR_HASH 1024
-
-#define HASH_FN(DEV, INO) ((DEV + INO + (INO >> 2) + (INO << 8)) % NR_HASH)
-
-static struct file_hash * hash_table[NR_HASH] = {0,};
-
-void FDECL1(add_hash, struct directory_entry *, spnt){
-  struct file_hash * s_hash;
-  unsigned int hash_number;
-
-  if(spnt->size == 0 || spnt->starting_block == 0)
-    if(spnt->size != 0 || spnt->starting_block != 0) {
-      fprintf(stderr,"Non zero-length file assigned zero extent.\n");
-      exit(1);
-    };
-
-  if (spnt->dev == (dev_t) UNCACHED_DEVICE || spnt->inode == UNCACHED_INODE) return;
-  hash_number = HASH_FN((unsigned int) spnt->dev, (unsigned int) spnt->inode);
-
-#if 0
-  if (verbose > 1) fprintf(stderr,"%s ",spnt->name);
-#endif
-  s_hash = (struct file_hash *) e_malloc(sizeof(struct file_hash));
-  s_hash->next = hash_table[hash_number];
-  s_hash->inode = spnt->inode;
-  s_hash->dev = spnt->dev;
-  s_hash->starting_block = spnt->starting_block;
-  s_hash->size = spnt->size;
-  hash_table[hash_number] = s_hash;
-}
-
-struct file_hash * FDECL2(find_hash, dev_t, dev, ino_t, inode){
-  unsigned int hash_number;
-  struct file_hash * spnt;
-  hash_number = HASH_FN((unsigned int) dev, (unsigned int) inode);
-  if (dev == (dev_t) UNCACHED_DEVICE || inode == UNCACHED_INODE) return NULL;
-
-  spnt = hash_table[hash_number];
-  while(spnt){
-    if(spnt->inode == inode && spnt->dev == dev) return spnt;
-    spnt = spnt->next;
-  };
-  return NULL;
-}
-
-
-static struct file_hash * directory_hash_table[NR_HASH] = {0,};
-
-void FDECL2(add_directory_hash, dev_t, dev, ino_t, inode){
-  struct file_hash * s_hash;
-  unsigned int hash_number;
-
-  if (dev == (dev_t) UNCACHED_DEVICE || inode == UNCACHED_INODE) return;
-  hash_number = HASH_FN((unsigned int) dev, (unsigned int) inode);
-
-  s_hash = (struct file_hash *) e_malloc(sizeof(struct file_hash));
-  s_hash->next = directory_hash_table[hash_number];
-  s_hash->inode = inode;
-  s_hash->dev = dev;
-  directory_hash_table[hash_number] = s_hash;
-}
-
-struct file_hash * FDECL2(find_directory_hash, dev_t, dev, ino_t, inode){
-  unsigned int hash_number;
-  struct file_hash * spnt;
-  hash_number = HASH_FN((unsigned int) dev, (unsigned int) inode);
-  if (dev == (dev_t) UNCACHED_DEVICE || inode == UNCACHED_INODE) return NULL;
-
-  spnt = directory_hash_table[hash_number];
-  while(spnt){
-    if(spnt->inode == inode && spnt->dev == dev) return spnt;
-    spnt = spnt->next;
-  };
-  return NULL;
-}
-
-struct  name_hash
-{
-  struct name_hash * next;
-  struct directory_entry * de;
-};
-
-#define NR_NAME_HASH 128
-
-static struct name_hash * name_hash_table[NR_NAME_HASH] = {0,};
-
-/*
- * Find the hash bucket for this name.
- */
-static  unsigned int FDECL1(name_hash, const char *, name)
-{
-  unsigned int hash = 0;
-  const char * p;
- 
-  p = name;
- 
-  while (*p)
-    {
-      /*
-       * Don't hash the  iso9660 version number.  This way
-       * we can detect duplicates in cases where we have
-       * directories (i.e. foo) and non-directories
-       * (i.e. foo;1).
-       */
-      if( *p == ';' )
-	{
-	  break;
-	}
-      hash = (hash << 15) + (hash << 3) + (hash >> 3) + *p++;
-    }
-  return hash % NR_NAME_HASH;
-}
-
-void FDECL1(add_file_hash, struct directory_entry *, de){
-	struct name_hash  * new;
-	int hash;
-
-	new = (struct  name_hash *) e_malloc(sizeof(struct name_hash));
-	new->de = de;
-	new->next = NULL;
-	hash = name_hash(de->isorec.name);
-
-	/* Now insert into the hash table */
-	new->next = name_hash_table[hash];
-	name_hash_table[hash] = new;
-}
-
-struct directory_entry * FDECL1(find_file_hash, char *, name)
-{
-  struct name_hash  * nh;
-  char		    * p1;
-  char		    * p2;
- 
-  for(nh = name_hash_table[name_hash(name)]; nh; nh = nh->next)
-    {
-      p1 = name;
-      p2 = nh->de->isorec.name;
-
-      /*
-       * Look for end of string, or a mismatch.
-       */
-      while(1==1)
-	{
-	  if(    (*p1 == '\0' || *p1 == ';')
-	      || (*p2 == '\0' || *p2 == ';')
-	      || (*p1 != *p2) )
-	    {
-	      break;
-	    }
-	  p1++;
-	  p2++;
-	}
-
-      /*
-       * If we are at the end of both strings, then
-       * we have a match.
-       */
-      if(    (*p1 == '\0' || *p1 == ';')
-	  && (*p2 == '\0' || *p2 == ';') )
-	{
-	  return nh->de;
-	}
-    }
-  return NULL;
-}
-
-int FDECL1(delete_file_hash, struct directory_entry *, de){
-	struct name_hash  * nh, *prev;
-	int hash;
-
-	prev = NULL;
-	hash = name_hash(de->isorec.name);
-	for(nh = name_hash_table[hash]; nh; nh = nh->next) {
-		if(nh->de == de) break;
-		prev = nh;
-	}
-	if(!nh) return 1;
-	if(!prev)
-		name_hash_table[hash] = nh->next;
-	else
-		prev->next = nh->next;
-	free(nh);
-	return 0;
-}
-
-void flush_file_hash(){
-	struct name_hash  * nh, *nh1;
-	int i;
-
-	for(i=0; i<NR_NAME_HASH; i++) {
-		nh = name_hash_table[i];
-		while(nh) {
-			nh1 =  nh->next;
-			free(nh);
-			nh = nh1;
-		}
-		name_hash_table[i] =  NULL;
-	
-	}
-}
diff --git a/util/mkisofs/include/fctldefs.h b/util/mkisofs/include/fctldefs.h
deleted file mode 100644
index de6b6a394..000000000
--- a/util/mkisofs/include/fctldefs.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* @(#)fctldefs.h	1.2 98/10/08 Copyright 1996 J. Schilling */
-/*
- *	Generic header for users of open(), creat() and chmod()
- *
- *	Copyright (c) 1996 J. Schilling
- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _FCTLDEFS_H
-#define	_FCTLDEFS_H
-
-#ifndef	_MCONFIG_H
-#include <mconfig.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef	HAVE_FCNTL_H
-
-#	include <fcntl.h>
-
-#else	/* HAVE_FCNTL_H */
-
-#	include <sys/file.h>
-
-#endif	/* HAVE_FCNTL_H */
-
-/*
- * Do not define more than O_RDONLY / O_WRONLY / O_RDWR
- * The values may differ.
- */
-#ifndef	O_RDONLY
-#define	O_RDONLY	0
-#endif
-#ifndef	O_WRONLY
-#define	O_WRONLY	1
-#endif
-#ifndef	O_RDWR
-#define	O_RDWR		2
-#endif
-
-#endif	/* _FCTLDEFS_H */
diff --git a/util/mkisofs/include/mconfig.h b/util/mkisofs/include/mconfig.h
deleted file mode 100644
index 1891d7ded..000000000
--- a/util/mkisofs/include/mconfig.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/* @(#)mconfig.h	1.24 98/12/14 Copyright 1995 J. Schilling */
-/*
- *	definitions for machine configuration
- *
- *	Copyright (c) 1995 J. Schilling
- *
- *	This file must be included before any other file.
- *	Use only cpp instructions.
- *
- *	NOTE: SING: (Schily Is Not Gnu)
- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _MCONFIG_H
-#define _MCONFIG_H
-
-#include <config.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(unix) || defined(__unix) || defined(__unix__)
-#	define	IS_UNIX
-#endif
-
-#ifdef	__MSDOS__
-#	define	IS_MSDOS
-#endif
-
-#if defined(tos) || defined(__tos)
-#	define	IS_TOS
-#endif
-
-#ifdef	THINK_C
-#	define	IS_MAC
-#endif
-
-#if defined(sun) || defined(__sun) || defined(__sun__)
-#	define	IS_SUN
-#endif
-
-#if defined(__CYGWIN32__)
-#       define IS_GCC_WIN32
-#endif
-
-/*--------------------------------------------------------------------------*/
-/*
- * Some magic that cannot (yet) be figured out with autoconf.
- */
-
-#ifdef sparc
-#	ifndef	HAVE_LDSTUB
-#	define	HAVE_LDSTUB
-#	endif
-#	ifndef	HAVE_SCANSTACK
-#	define	HAVE_SCANSTACK
-#	endif
-#endif
-#if	defined(__i386_) || defined(i386)
-#	ifndef	HAVE_XCHG
-#	define	HAVE_XCHG
-#	endif
-#	ifndef	HAVE_SCANSTACK
-#	define	HAVE_SCANSTACK
-#	endif
-#endif
-
-#if	defined(SOL2) || defined(SOL2) || defined(S5R4) || defined(__S5R4) \
-							|| defined(SVR4)
-#	ifndef	__SVR4
-#		define	__SVR4
-#	endif
-#endif
-
-#ifdef	__SVR4
-#	ifndef	SVR4
-#		define	SVR4
-#	endif
-#endif
-
-/*
- * SunOS 4.x / SunOS 5.x
- */
-#if defined(IS_SUN)
-#	define	HAVE_GETAV0
-#endif
-
-/*
- * AIX
- */
-#if	defined(_IBMR2) || defined(_AIX)
-#	define	IS_UNIX		/* ??? really ??? */
-#endif
-
-/*
- * Silicon Graphics	(must be before SVR4)
- */
-#if defined(sgi) || defined(__sgi)
-#	define	__NOT_SVR4__	/* Not a real SVR4 implementation */
-#endif
-
-/*
- * Data General
- */
-#if defined(__DGUX__)
-#ifdef	XXXXXXX
-#	undef	HAVE_MTGET_DSREG
-#	undef	HAVE_MTGET_RESID
-#	undef	HAVE_MTGET_FILENO
-#	undef	HAVE_MTGET_BLKNO
-#endif
-#	define	mt_type		mt_model
-#	define	mt_dsreg	mt_status1
-#	define	mt_erreg	mt_status2
-	/*
-	 * DGUX hides its flock as dg_flock.
-	 */
-#	define	HAVE_FLOCK
-#	define	flock	dg_flock
-	/*
-	 * Use the BSD style wait on DGUX to get the resource usages of child
-	 * processes.
-	 */
-#	define	_BSD_WAIT_FLAVOR
-#endif
-
-/*
- * Apple Rhapsody
- */
-#if defined(__NeXT__) && defined(__TARGET_OSNAME) && __TARGET_OSNAME == rhapsody
-#	define HAVE_OSDEF /* prevent later definitions to overwrite current */
-#endif
-
-/*
- * NextStep
- */
-#if defined(__NeXT__) && !defined(HAVE_OSDEF)
-#define	NO_PRINT_OVR
-#undef	HAVE_USG_STDIO		/*
-				 *  NeXT Step 3.x uses __flsbuf(unsigned char , FILE *)
-				 * instead of __flsbuf(int, FILE *)
-				 */
-#endif
-
-/*
- * NextStep 3.x has a broken linker that does not allow us to override
- * these functions.
- */
-#ifndef	__OPRINTF__
-
-#ifdef	NO_PRINT_OVR
-#	define	printf	Xprintf
-#	define	fprintf	Xfprintf
-#	define	sprintf	Xsprintf
-#endif
-
-#endif	/* __OPRINTF__ */
-
-/*--------------------------------------------------------------------------*/
-/*
- * If there is no flock defined by the system, use emulation
- * through fcntl record locking.
- */
-#ifndef HAVE_FLOCK
-#define LOCK_SH         1       /* shared lock */
-#define LOCK_EX         2       /* exclusive lock */
-#define LOCK_NB         4       /* don't block when locking */
-#define LOCK_UN         8       /* unlock */
-#endif
-
-#include <prototyp.h>
-
-/*
- * gcc 2.x generally implements the long long type.
- */
-#ifdef	__GNUC__
-#	if	__GNUC__ > 1
-#		ifndef	HAVE_LONGLONG
-#			define	HAVE_LONGLONG
-#		endif
-#	endif
-#endif
-
-/*
- * Convert to GNU name
- */
-#ifdef	HAVE_STDC_HEADERS
-#	ifndef	STDC_HEADERS
-#		define	STDC_HEADERS
-#	endif
-#endif
-/*
- * Convert to SCHILY name
- */
-#ifdef	STDC_HEADERS
-#	ifndef	HAVE_STDC_HEADERS
-#		define	HAVE_STDC_HEADERS
-#	endif
-#endif
-
-#ifdef	IS_UNIX
-#	define	PATH_DELIM	'/'
-#	define	PATH_DELIM_STR	"/"
-#	define	far
-#	define	near
-#endif
-
-#ifdef	IS_GCC_WIN32
-#	define	PATH_DELIM	'/'
-#	define	PATH_DELIM_STR	"/"
-#	define	far
-#	define	near
-#endif
-
-#ifdef	IS_MSDOS
-#	define	PATH_DELIM	'\\'
-#	define	PATH_DELIM_STR	"\\"
-#endif
-
-#ifdef	IS_TOS
-#	define	PATH_DELIM	'\\'
-#	define	PATH_DELIM_STR	"\\"
-#	define	far
-#	define	near
-#endif
-
-#ifdef	IS_MAC
-#	define	PATH_DELIM	':'
-#	define	PATH_DELIM_STR	":"
-#	define	far
-#	define	near
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _MCONFIG_H */
diff --git a/util/mkisofs/include/prototyp.h b/util/mkisofs/include/prototyp.h
deleted file mode 100644
index c74ae0af8..000000000
--- a/util/mkisofs/include/prototyp.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* @(#)prototyp.h	1.7 98/10/08 Copyright 1995 J. Schilling */
-/*
- *	Definitions for dealing with ANSI / KR C-Compilers
- *
- *	Copyright (c) 1995 J. Schilling
- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef	_PROTOTYP_H
-#define	_PROTOTYP_H
-
-#ifndef	PROTOTYPES
-	/*
-	 * If this has already been defined,
-	 * someone else knows better than us...
-	 */
-#	ifdef	__STDC__
-#		if	__STDC__				/* ANSI C */
-#			define	PROTOTYPES
-#		endif
-#		if	defined(sun) && __STDC__ - 0 == 0	/* Sun C */
-#			define	PROTOTYPES
-#		endif
-#	endif
-#endif	/* PROTOTYPES */
-
-/*
- * If we have prototypes, we should have stdlib.h string.h stdarg.h
- */
-#ifdef	PROTOTYPES
-#if	!(defined(SABER) && defined(sun))
-#	ifndef	HAVE_STDARG_H
-#		define	HAVE_STDARG_H
-#	endif
-#endif
-#	ifndef	HAVE_STDLIB_H
-#		define	HAVE_STDLIB_H
-#	endif
-#	ifndef	HAVE_STRING_H
-#		define	HAVE_STRING_H
-#	endif
-#	ifndef	HAVE_STDC_HEADERS
-#		define	HAVE_STDC_HEADERS
-#	endif
-#	ifndef	STDC_HEADERS
-#		define	STDC_HEADERS	/* GNU name */
-#	endif
-#endif
-
-#ifdef	NO_PROTOTYPES		/* Force not to use prototypes */
-#	undef	PROTOTYPES
-#endif
-
-#ifdef	PROTOTYPES
-#	define	__PR(a)	a
-#else
-#	define	__PR(a)	()
-#endif
-
-#endif	/* _PROTOTYP_H */
diff --git a/util/mkisofs/include/statdefs.h b/util/mkisofs/include/statdefs.h
deleted file mode 100644
index 0e34805ce..000000000
--- a/util/mkisofs/include/statdefs.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/* @(#)statdefs.h	1.1 98/11/22 Copyright 1998 J. Schilling */
-/*
- *	Definitions for stat() file mode
- *
- *	Copyright (c) 1998 J. Schilling
- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef	_STATDEFS_H
-#define	_STATDEFS_H
-
-#ifndef _MCONFIG_H
-#include <mconfig.h>
-#endif
-
-#ifdef	STAT_MACROS_BROKEN
-#undef	S_ISFIFO			/* Named pipe		*/
-#undef	S_ISCHR				/* Character special	*/
-#undef	S_ISMPC				/* UNUSED multiplexed c	*/
-#undef	S_ISDIR				/* Directory		*/
-#undef	S_ISNAM				/* Named file (XENIX)	*/
-#undef	S_ISBLK				/* Block special	*/
-#undef	S_ISMPB				/* UNUSED multiplexed b	*/
-#undef	S_ISREG				/* Regular file		*/
-#undef	S_ISCNT				/* Contiguous file	*/
-#undef	S_ISLNK				/* Symbolic link	*/
-#undef	S_ISSHAD			/* Solaris shadow inode	*/
-#undef	S_ISSOCK			/* UNIX domain socket	*/
-#undef	S_ISDOOR			/* Solaris DOOR		*/
-#endif
-
-#ifndef	S_ISFIFO			/* Named pipe		*/
-#	ifdef	S_IFIFO
-#		define	S_ISFIFO(m)	(((m) & S_IFMT) == S_IFIFO)
-#	else
-#		define	S_ISFIFO(m)	(0)
-#	endif
-#endif
-#ifndef	S_ISCHR				/* Character special	*/
-#	ifdef	S_IFCHR
-#		define	S_ISCHR(m)	(((m) & S_IFMT) == S_IFCHR)
-#	else
-#		define	S_ISCHR(m)	(0)
-#	endif
-#endif
-#ifndef	S_ISMPC				/* UNUSED multiplexed c	*/
-#	ifdef	S_IFMPC
-#		define	S_ISMPC(m)	(((m) & S_IFMT) == S_IFMPC)
-#	else
-#		define	S_ISMPC(m)	(0)
-#	endif
-#endif
-#ifndef	S_ISDIR				/* Directory		*/
-#	ifdef	S_IFDIR
-#		define	S_ISDIR(m)	(((m) & S_IFMT) == S_IFDIR)
-#	else
-#		define	S_ISDIR(m)	(0)
-#	endif
-#endif
-#ifndef	S_ISNAM				/* Named file (XENIX)	*/
-#	ifdef	S_IFNAM
-#		define	S_ISNAM(m)	(((m) & S_IFMT) == S_IFNAM)
-#	else
-#		define	S_ISNAM(m)	(0)
-#	endif
-#endif
-#ifndef	S_ISBLK				/* Block special	*/
-#	ifdef	S_IFBLK
-#		define	S_ISBLK(m)	(((m) & S_IFMT) == S_IFBLK)
-#	else
-#		define	S_ISBLK(m)	(0)
-#	endif
-#endif
-#ifndef	S_ISMPB				/* UNUSED multiplexed b	*/
-#	ifdef	S_IFMPB
-#		define	S_ISMPB(m)	(((m) & S_IFMT) == S_IFMPB)
-#	else
-#		define	S_ISMPB(m)	(0)
-#	endif
-#endif
-#ifndef	S_ISREG				/* Regular file		*/
-#	ifdef	S_IFREG
-#		define	S_ISREG(m)	(((m) & S_IFMT) == S_IFREG)
-#	else
-#		define	S_ISREG(m)	(0)
-#	endif
-#endif
-#ifndef	S_ISCNT				/* Contiguous file	*/
-#	ifdef	S_IFCNT
-#		define	S_ISCNT(m)	(((m) & S_IFMT) == S_IFCNT)
-#	else
-#		define	S_ISCNT(m)	(0)
-#	endif
-#endif
-#ifndef	S_ISLNK				/* Symbolic link	*/
-#	ifdef	S_IFLNK
-#		define	S_ISLNK(m)	(((m) & S_IFMT) == S_IFLNK)
-#	else
-#		define	S_ISLNK(m)	(0)
-#	endif
-#endif
-#ifndef	S_ISSHAD			/* Solaris shadow inode	*/
-#	ifdef	S_IFSHAD
-#		define	S_ISSHAD(m)	(((m) & S_IFMT) == S_IFSHAD)
-#	else
-#		define	S_ISSHAD(m)	(0)
-#	endif
-#endif
-#ifndef	S_ISSOCK			/* UNIX domain socket	*/
-#	ifdef	S_IFSOCK
-#		define	S_ISSOCK(m)	(((m) & S_IFMT) == S_IFSOCK)
-#	else
-#		define	S_ISSOCK(m)	(0)
-#	endif
-#endif
-#ifndef	S_ISDOOR			/* Solaris DOOR		*/
-#	ifdef	S_IFDOOR
-#		define	S_ISDOOR(m)	(((m) & S_IFMT) == S_IFDOOR)
-#	else
-#		define	S_ISDOOR(m)	(0)
-#	endif
-#endif
-
-#endif	/* _STATDEFS_H */
-
diff --git a/util/mkisofs/iso9660.h b/util/mkisofs/iso9660.h
deleted file mode 100644
index 78a05db92..000000000
--- a/util/mkisofs/iso9660.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Header file iso9660.h - assorted structure definitions and typecasts.
- * specific to iso9660 filesystem.
-
-   Written by Eric Youngdale (1993).
-
-   Copyright 1993 Yggdrasil Computing, Incorporated
-
-   Copyright (C) 2009  Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * 	$Id: iso9660.h,v 1.2 1997/05/17 15:46:44 eric Exp $
- */
-
-#ifndef _ISOFS_FS_H
-#define _ISOFS_FS_H
-
-/*
- * The isofs filesystem constants/structures
- */
-
-/* This part borrowed from the bsd386 isofs */
-#define ISODCL(from, to) (to - from + 1)
-
-struct iso_volume_descriptor {
-	char type[ISODCL(1,1)]; /* 711 */
-	char id[ISODCL(2,6)];
-	char version[ISODCL(7,7)];
-	char data[ISODCL(8,2048)];
-};
-
-/* volume descriptor types */
-#define ISO_VD_PRIMARY       1
-#define ISO_VD_SUPPLEMENTARY 2     /* Used by Joliet */
-#define ISO_VD_END           255
-
-#define ISO_STANDARD_ID "CD001"
-
-#define EL_TORITO_ID "EL TORITO SPECIFICATION"
-#define EL_TORITO_ARCH_x86 0
-#define EL_TORITO_ARCH_PPC 1
-#define EL_TORITO_ARCH_MAC 2
-#define EL_TORITO_BOOTABLE 0x88
-#define EL_TORITO_MEDIA_NOEMUL 0
-#define EL_TORITO_MEDIA_12FLOP  1
-#define EL_TORITO_MEDIA_144FLOP 2
-#define EL_TORITO_MEDIA_288FLOP 3
-#define EL_TORITO_MEDIA_HD      4
-
-struct iso_primary_descriptor {
-	char type			[ISODCL (  1,   1)]; /* 711 */
-	char id				[ISODCL (  2,   6)];
-	char version			[ISODCL (  7,   7)]; /* 711 */
-	char unused1			[ISODCL (  8,   8)];
-	char system_id			[ISODCL (  9,  40)]; /* achars */
-	char volume_id			[ISODCL ( 41,  72)]; /* dchars */
-	char unused2			[ISODCL ( 73,  80)];
-	char volume_space_size		[ISODCL ( 81,  88)]; /* 733 */
-	char escape_sequences		[ISODCL ( 89, 120)];
-	char volume_set_size		[ISODCL (121, 124)]; /* 723 */
-	char volume_sequence_number	[ISODCL (125, 128)]; /* 723 */
-	char logical_block_size		[ISODCL (129, 132)]; /* 723 */
-	char path_table_size		[ISODCL (133, 140)]; /* 733 */
-	char type_l_path_table		[ISODCL (141, 144)]; /* 731 */
-	char opt_type_l_path_table	[ISODCL (145, 148)]; /* 731 */
-	char type_m_path_table		[ISODCL (149, 152)]; /* 732 */
-	char opt_type_m_path_table	[ISODCL (153, 156)]; /* 732 */
-	char root_directory_record	[ISODCL (157, 190)]; /* 9.1 */
-	char volume_set_id		[ISODCL (191, 318)]; /* dchars */
-	char publisher_id		[ISODCL (319, 446)]; /* achars */
-	char preparer_id		[ISODCL (447, 574)]; /* achars */
-	char application_id		[ISODCL (575, 702)]; /* achars */
-	char copyright_file_id		[ISODCL (703, 739)]; /* 7.5 dchars */
-	char abstract_file_id		[ISODCL (740, 776)]; /* 7.5 dchars */
-	char bibliographic_file_id	[ISODCL (777, 813)]; /* 7.5 dchars */
-	char creation_date		[ISODCL (814, 830)]; /* 8.4.26.1 */
-	char modification_date		[ISODCL (831, 847)]; /* 8.4.26.1 */
-	char expiration_date		[ISODCL (848, 864)]; /* 8.4.26.1 */
-	char effective_date		[ISODCL (865, 881)]; /* 8.4.26.1 */
-	char file_structure_version	[ISODCL (882, 882)]; /* 711 */
-	char unused4			[ISODCL (883, 883)];
-	char application_data		[ISODCL (884, 1395)];
-	char unused5			[ISODCL (1396, 2048)];
-};
-
-/* El Torito Boot Record Volume Descriptor */
-struct eltorito_boot_descriptor {
-        char id	           		[ISODCL (  1,    1)]; /* 711 */
-	char id2			[ISODCL (  2,    6)];
-	char version			[ISODCL (  7,    7)]; /* 711 */
-	char system_id			[ISODCL (  8,   39)];
-	char unused2			[ISODCL ( 40,   71)];
-        char bootcat_ptr                [ISODCL ( 72 ,  75)];
-	char unused5			[ISODCL ( 76, 2048)];
-};
-
-/* Validation entry for El Torito */
-struct eltorito_validation_entry {
-        char headerid          		[ISODCL (  1,    1)]; /* 711 */
-	char arch			[ISODCL (  2,    2)];
-	char pad1			[ISODCL (  3,    4)]; /* 711 */
-	char id  			[ISODCL (  5,   28)];
-	char cksum			[ISODCL ( 29,   30)];
-        char key1                       [ISODCL ( 31,   31)];
-	char key2			[ISODCL ( 32,   32)];
-};
-
-/* El Torito initial/default entry in boot catalog */
-struct eltorito_defaultboot_entry {
-        char boot_id           		[ISODCL (  1,    1)]; /* 711 */
-	char boot_media			[ISODCL (  2,    2)];
-	char loadseg			[ISODCL (  3,    4)]; /* 711 */
-	char arch  			[ISODCL (  5,    5)];
-	char pad1			[ISODCL (  6,    6)];
-        char nsect                      [ISODCL (  7,    8)];
-	char bootoff			[ISODCL (  9,   12)];
-        char pad2                       [ISODCL ( 13,   32)];
-};
-
-/* El Torito boot information table */
-struct eltorito_boot_info
-{
-  /* Address of Primary Volume Descriptor.  */
-  char pvd_addr[ISODCL (1, 4)];
-  /* Boot file address.  */
-  char file_addr[ISODCL (5, 8)];
-  /* Boot file length.  */ 
-  char file_length[ISODCL (9, 12)];
-  /* Boot file checksum.  */
-  char file_checksum[ISODCL (13, 16)];
-  char dummy[ISODCL (17, 56)];
-};
-
-
-/* We use this to help us look up the parent inode numbers. */
-
-struct iso_path_table{
-	unsigned char  name_len[2];	/* 721 */
-	char extent[4];		/* 731 */
-	char  parent[2];	/* 721 */
-	char name[1];
-};
-
-struct iso_directory_record {
-	unsigned char length			[ISODCL (1, 1)]; /* 711 */
-	char ext_attr_length		[ISODCL (2, 2)]; /* 711 */
-	char extent			[ISODCL (3, 10)]; /* 733 */
-	char size			[ISODCL (11, 18)]; /* 733 */
-	char date			[ISODCL (19, 25)]; /* 7 by 711 */
-	char flags			[ISODCL (26, 26)];
-	char file_unit_size		[ISODCL (27, 27)]; /* 711 */
-	char interleave			[ISODCL (28, 28)]; /* 711 */
-	char volume_sequence_number	[ISODCL (29, 32)]; /* 723 */
-	unsigned char name_len		[ISODCL (33, 33)]; /* 711 */
-	char name			[34]; /* Not really, but we need something here */
-};
-#endif
-
-
-
diff --git a/util/mkisofs/joliet.c b/util/mkisofs/joliet.c
deleted file mode 100644
index b3c755792..000000000
--- a/util/mkisofs/joliet.c
+++ /dev/null
@@ -1,1023 +0,0 @@
-/*
- * File joliet.c - handle Win95/WinNT long file/unicode extensions for iso9660.
-
-   Copyright 1997 Eric Youngdale.
-
-   Copyright (C) 2009  Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Joliet extensions for ISO9660.  These are spottily documented by
- * Microsoft.  In their infinite stupidity, they completely ignored
- * the possibility of using an SUSP record with the long filename
- * in it, and instead wrote out a duplicate directory tree with the
- * long filenames in it.
- *
- * I am not sure why they did this.  One reason is that they get the path
- * tables with the long filenames in them.
- *
- * There are two basic principles to Joliet, and the non-Unicode variant
- * known as Romeo.  Long filenames seem to be the main one, and the second
- * is that the character set and a few other things is substantially relaxed.
- *
- * The SVD is identical to the PVD, except:
- *
- *	Id is 2, not 1 (indicates SVD).
- *	escape_sequences contains UCS-2 indicator (levels 1, 2 or 3).
- *	The root directory record points to a different extent (with different
- *		size).
- *	There are different path tables for the two sets of directory trees.
- *
- * The following fields are recorded in Unicode:
- *	system_id
- *	volume_id
- *	volume_set_id
- *	publisher_id
- *	preparer_id
- *	application_id
- *	copyright_file_id
- *	abstract_file_id
- *	bibliographic_file_id
- *
- * Unicode strings are always encoded in big-endian format.
- *
- * In a directory record, everything is the same as with iso9660, except
- * that the name is recorded in unicode.  The name length is specified in
- * total bytes, not in number of unicode characters.
- *
- * The character set used for the names is different with UCS - the
- * restrictions are that the following are not allowed:
- *
- *	Characters (00)(00) through (00)(1f) (control chars)
- *	(00)(2a) '*'
- *	(00)(2f) '/'
- *	(00)(3a) ':'
- *	(00)(3b) ';'
- *	(00)(3f) '?'
- *	(00)(5c) '\'
- */
-#include "config.h"
-#include "mkisofs.h"
-#include "iso9660.h"
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <time.h>
-
-static unsigned int jpath_table_index;
-static struct directory ** jpathlist;
-static int next_jpath_index  = 1;
-static int sort_goof;
-
-static int generate_joliet_path_tables	__PR((void));
-static int DECL(joliet_sort_directory, (struct directory_entry ** sort_dir));
-static void DECL(assign_joliet_directory_addresses, (struct directory * node));
-static int jroot_gen	__PR((void));
-
-/*
- * Function:		convert_to_unicode
- *
- * Purpose:		Perform a 1/2 assed unicode conversion on a text
- *			string.
- *
- * Notes:	
- */
-static void FDECL3(convert_to_unicode, unsigned char *, buffer, int, size, char *, source )
-{
-  unsigned char * tmpbuf;
-  int i;
-  int j;
-
-  /*
-   * If we get a NULL pointer for the source, it means we have an inplace
-   * copy, and we need to make a temporary working copy first.
-   */
-  if( source == NULL )
-    {
-      tmpbuf = (uint8_t *) e_malloc(size);
-      memcpy( tmpbuf, buffer, size);
-    }
-  else
-    {
-      tmpbuf = (uint8_t *)source;
-    }
-
-  /*
-   * Now start copying characters.  If the size was specified to be 0, then
-   * assume the input was 0 terminated.
-   */
-  j = 0;
-  for(i=0; i < size ; i += 2, j++)
-    {
-      buffer[i]       = 0;
-	/*
-	 * JS integrated from: Achim_Kaiser@t-online.de
-	 *
-	 * Let all valid unicode characters pass through (assuming ISO-8859-1).
-	 * Others are set to '_' .
-	 */
-	if( tmpbuf[j] != 0 && 
-	   (tmpbuf[j] <= 0x1f || (tmpbuf[j] >= 0x7F && tmpbuf[j] <= 0xA0)) )
-	{
-	  buffer[i+1]     = '_';
-	}
-      else
-	{
-	  switch(tmpbuf[j])
-	    {
-	    case '*':
-	    case '/':
-	    case ':':
-	    case ';':
-	    case '?':
-	    case '\\':
-	      /*
-	       * Even Joliet has some standards as to what is allowed in a pathname.
-	       * Pretty tame in comparison to what DOS restricts you to.
-	       */
-	      buffer[i+1]     = '_';
-	      break;
-	    default:
-	      buffer[i+1]     = tmpbuf[j];
-	      break;
-	    }
-	}
-    }
-
-  if( source == NULL )
-    {
-      free(tmpbuf);
-    }
-}
-
-/*
- * Function:		joliet_strlen
- *
- * Purpose:		Return length in bytes of string after conversion to unicode.
- *
- * Notes:		This is provided mainly as a convenience so that when more intelligent
- *			Unicode conversion for either Multibyte or 8-bit codes is available that
- *			we can easily adapt.
- */
-static int FDECL1(joliet_strlen, const char *, string)
-{
-  int rtn;
-
-  rtn = strlen(string) << 1;
-
-  /*
-   * We do clamp the maximum length of a Joliet string to be the
-   * maximum path size.  This helps to ensure that we don't completely
-   * bolix things up with very long paths.    The Joliet specs say
-   * that the maximum length is 128 bytes, or 64 unicode characters.
-   */
-  if( rtn > 0x80)
-    {
-      rtn = 0x80;
-    }
-  return rtn;
-}
-
-/*
- * Function:		get_joliet_vol_desc
- *
- * Purpose:		generate a Joliet compatible volume desc.
- *
- * Notes:		Assume that we have the non-joliet vol desc
- *			already present in the buffer.  Just modifiy the
- *			appropriate fields.
- */
-static void FDECL1(get_joliet_vol_desc, struct iso_primary_descriptor *, jvol_desc)
-{
-  jvol_desc->type[0] = ISO_VD_SUPPLEMENTARY;
-
-  /*
-   * For now, always do Unicode level 3.  I don't really know what 1 and 2
-   * are - perhaps a more limited Unicode set.
-   *
-   * FIXME(eric) - how does Romeo fit in here?  As mkisofs just
-   * "expands" 8 bit character codes to 16 bits and does nothing
-   * special with the Unicode characters, therefore shouldn't mkisofs
-   * really be stating that it's using UCS-2 Level 1, not Level 3 for
-   * the Joliet directory tree. 
-   */
-  strcpy(jvol_desc->escape_sequences, "%/@");
-
-  /*
-   * Until we have Unicode path tables, leave these unset.
-   */
-  set_733((char *) jvol_desc->path_table_size, jpath_table_size);
-  set_731(jvol_desc->type_l_path_table,     jpath_table[0]);
-  set_731(jvol_desc->opt_type_l_path_table, jpath_table[1]);
-  set_732(jvol_desc->type_m_path_table,     jpath_table[2]);
-  set_732(jvol_desc->opt_type_m_path_table, jpath_table[3]);
-
-  /*
-   * Set this one up.
-   */
-  memcpy(jvol_desc->root_directory_record, &jroot_record,
-	 sizeof(struct iso_directory_record));
-
-  /*
-   * Finally, we have a bunch of strings to convert to Unicode.
-   * FIXME(eric) - I don't know how to do this in general, so we will
-   * just be really lazy and do a char -> short conversion.  We probably
-   * will want to filter any characters >= 0x80.
-   */
-  convert_to_unicode((uint8_t *)jvol_desc->system_id, sizeof(jvol_desc->system_id), NULL);
-  convert_to_unicode((uint8_t *)jvol_desc->volume_id, sizeof(jvol_desc->volume_id), NULL);
-  convert_to_unicode((uint8_t *)jvol_desc->volume_set_id, sizeof(jvol_desc->volume_set_id), NULL);
-  convert_to_unicode((uint8_t *)jvol_desc->publisher_id, sizeof(jvol_desc->publisher_id), NULL);
-  convert_to_unicode((uint8_t *)jvol_desc->preparer_id, sizeof(jvol_desc->preparer_id), NULL);
-  convert_to_unicode((uint8_t *)jvol_desc->application_id, sizeof(jvol_desc->application_id), NULL);
-  convert_to_unicode((uint8_t *)jvol_desc->copyright_file_id, sizeof(jvol_desc->copyright_file_id), NULL);
-  convert_to_unicode((uint8_t *)jvol_desc->abstract_file_id, sizeof(jvol_desc->abstract_file_id), NULL);
-  convert_to_unicode((uint8_t *)jvol_desc->bibliographic_file_id, sizeof(jvol_desc->bibliographic_file_id), NULL);
-
-
-}
-
-static void FDECL1(assign_joliet_directory_addresses, struct directory *, node)
-{
-     int		dir_size;
-     struct directory * dpnt;
-
-     dpnt = node;
-    
-     while (dpnt)
-     {
-	 if( (dpnt->dir_flags & INHIBIT_JOLIET_ENTRY) == 0 )
-	 {
-	     /*
-	      * If we already have an extent for this (i.e. it came from
-	      * a multisession disc), then don't reassign a new extent.
-	      */
-	     dpnt->jpath_index = next_jpath_index++;
-	     if( dpnt->jextent == 0 )
-	     {
-		 dpnt->jextent = last_extent;
-		 dir_size = (dpnt->jsize + (SECTOR_SIZE - 1)) >> 11;
-		 last_extent += dir_size;
-	     }
-	 }
-
-	 /* skip if hidden - but not for the rr_moved dir */
-	 if(dpnt->subdir && (!(dpnt->dir_flags & INHIBIT_JOLIET_ENTRY) || dpnt == reloc_dir))
-	 {
-	     assign_joliet_directory_addresses(dpnt->subdir);
-	 }
-	 dpnt = dpnt->next;
-     }
-}
-
-static
-void FDECL1(build_jpathlist, struct directory *, node)
-{
-     struct directory * dpnt;
-    
-     dpnt = node;
-    
-     while (dpnt)
-
-     {
-       if( (dpnt->dir_flags & INHIBIT_JOLIET_ENTRY) == 0 )
-	 {
-	   jpathlist[dpnt->jpath_index] = dpnt;
-	 }
-       if(dpnt->subdir) build_jpathlist(dpnt->subdir);
-       dpnt = dpnt->next;
-     }
-} /* build_jpathlist(... */
-
-static int FDECL2(joliet_compare_paths, void const *, r, void const *, l)
-{
-  struct directory const *ll = *(struct directory * const *)l;
-  struct directory const *rr = *(struct directory * const *)r;
-  int rparent, lparent;
-
-  rparent = rr->parent->jpath_index;
-  lparent = ll->parent->jpath_index;
-  if( rr->parent == reloc_dir )
-    {
-      rparent = rr->self->parent_rec->filedir->jpath_index;
-    }
-
-  if( ll->parent == reloc_dir )
-    {
-      lparent = ll->self->parent_rec->filedir->jpath_index;
-    }
-
-  if (rparent < lparent)
-  {
-       return -1;
-  }
-
-  if (rparent > lparent)
-  {
-       return 1;
-  }
-
-  return strcmp(rr->self->name, ll->self->name);
- 
-} /* compare_paths(... */
-
-static int generate_joliet_path_tables()
-{
-  struct directory_entry * de;
-  struct directory	 * dpnt;
-  int			   fix;
-  int			   j;
-  int			   namelen;
-  char			 * npnt;
-  char			 * npnt1;
-  int			   tablesize;
-
-  /*
-   * First allocate memory for the tables and initialize the memory
-   */
-  tablesize = jpath_blocks << 11;
-  jpath_table_m = (char *) e_malloc(tablesize);
-  jpath_table_l = (char *) e_malloc(tablesize);
-  memset(jpath_table_l, 0, tablesize);
-  memset(jpath_table_m, 0, tablesize);
-
-  if( next_jpath_index > 0xffff )
-  {
-      fprintf (stderr, _("Unable to generate sane path tables - too many directories (%d)\n"),
-	       next_jpath_index);
-      exit (1);
-  }
-  /*
-   * Now start filling in the path tables.  Start with root directory
-   */
-  jpath_table_index = 0;
-  jpathlist = (struct directory **) e_malloc(sizeof(struct directory *)
-					    * next_jpath_index);
-  memset(jpathlist, 0, sizeof(struct directory *) * next_jpath_index);
-  build_jpathlist(root);
-
-  do
-  {
-       fix = 0;
-#ifdef	__STDC__
-       qsort(&jpathlist[1], next_jpath_index-1, sizeof(struct directory *),
-	     (int (*)(const void *, const void *))joliet_compare_paths);
-#else
-       qsort(&jpathlist[1], next_jpath_index-1, sizeof(struct directory *),
-	     joliet_compare_paths);
-#endif
-
-       for(j=1; j<next_jpath_index; j++)
-       {
-	    if(jpathlist[j]->jpath_index != j)
-	    {
-		 jpathlist[j]->jpath_index = j;
-		 fix++;
-	    }
-       }
-  } while(fix);
-
-  for(j=1; j<next_jpath_index; j++)
-  {
-       dpnt = jpathlist[j];
-       if(!dpnt)
-       {
-	    fprintf (stderr, _("Entry %d not in path tables\n"), j);
-	    exit (1);
-       }
-       npnt = dpnt->de_name;
-      
-       npnt1 = strrchr(npnt, PATH_SEPARATOR);
-       if(npnt1)
-       {
-	    npnt = npnt1 + 1;
-       }
-      
-       de = dpnt->self;
-       if(!de)
-       {
-	    fprintf (stderr, _("Fatal goof - directory has amnesia\n"));
-	    exit (1);
-       }
-      
-       namelen = joliet_strlen(de->name);
-
-       if( dpnt == root )
-	 {
-	   jpath_table_l[jpath_table_index] = 1;
-	   jpath_table_m[jpath_table_index] = 1;
-	 }
-       else
-	 {
-	   jpath_table_l[jpath_table_index] = namelen;
-	   jpath_table_m[jpath_table_index] = namelen;
-	 }
-       jpath_table_index += 2;
-      
-       set_731(jpath_table_l + jpath_table_index, dpnt->jextent);
-       set_732(jpath_table_m + jpath_table_index, dpnt->jextent);
-       jpath_table_index += 4;
-      
-       if( dpnt->parent != reloc_dir )
-	 {
-	   set_721(jpath_table_l + jpath_table_index,
-		   dpnt->parent->jpath_index);
-	   set_722(jpath_table_m + jpath_table_index,
-		   dpnt->parent->jpath_index);
-	 }
-       else
-	 {
-	   set_721(jpath_table_l + jpath_table_index,
-		   dpnt->self->parent_rec->filedir->jpath_index);
-	   set_722(jpath_table_m + jpath_table_index,
-		   dpnt->self->parent_rec->filedir->jpath_index);
-	 }
-
-       jpath_table_index += 2;
-      
-       /*
-	* The root directory is still represented in non-unicode fashion.
-	*/
-       if( dpnt == root )
-	 {
-	   jpath_table_l[jpath_table_index] = 0;
-	   jpath_table_m[jpath_table_index] = 0;
-	   jpath_table_index ++;
-	 }
-       else
-	 {
-	   convert_to_unicode((uint8_t *)jpath_table_l + jpath_table_index, 
-			      namelen, de->name);
-	   convert_to_unicode((uint8_t *)jpath_table_m + jpath_table_index,
-			      namelen, de->name);
-	   jpath_table_index += namelen;
-	 }
-
-       if(jpath_table_index & 1)
-       {
-	    jpath_table_index++;  /* For odd lengths we pad */
-       }
-  }
- 
-  free(jpathlist);
-  if(jpath_table_index != jpath_table_size)
-  {
-       fprintf(stderr, _("Joliet path table lengths do not match %d %d\n"),
-	       jpath_table_index,
-	       jpath_table_size);
-  }
-  return 0;
-} /* generate_path_tables(... */
-
-static void FDECL2(generate_one_joliet_directory, struct directory *, dpnt, FILE *, outfile)
-{
-     unsigned int			  dir_index;
-     char				* directory_buffer;
-     int				  new_reclen;
-     struct directory_entry		* s_entry;
-     struct directory_entry		* s_entry1;
-     struct iso_directory_record	  jrec;
-     unsigned int			  total_size;
-     int				  cvt_len;
-     struct directory			* finddir;
-    
-     total_size = (dpnt->jsize + (SECTOR_SIZE - 1)) &  ~(SECTOR_SIZE - 1);
-     directory_buffer = (char *) e_malloc(total_size);
-     memset(directory_buffer, 0, total_size);
-     dir_index = 0;
-    
-     s_entry = dpnt->jcontents;
-     while(s_entry)
-     {
-	     if(s_entry->de_flags & INHIBIT_JOLIET_ENTRY) {
-		s_entry = s_entry->jnext;
-		continue;
-	     }
-	
-	     /*
-	      * If this entry was a directory that was relocated, we have a bit
-	      * of trouble here.  We need to dig out the real thing and put it
-	      * back here.  In the Joliet tree, there is no relocated rock
-	      * ridge, as there are no depth limits to a directory tree.
-	      */
-	     if( (s_entry->de_flags & RELOCATED_DIRECTORY) != 0 )
-	     {
-		 for(s_entry1 = reloc_dir->contents; s_entry1; s_entry1 = s_entry1->next)
-		 {
-		     if( s_entry1->parent_rec == s_entry )
-		     {
-			 break;
-		     }
-		 }
-		 if( s_entry1 == NULL )
-		 {
-		     /*
-		      * We got trouble.
-		      */
-		     fprintf (stderr, _("Unable to locate relocated directory\n"));
-		     exit (1);
-		 }
-	     }
-	     else
-	     {
-		 s_entry1 = s_entry;
-	     }
-	     
-	     /*
-	      * We do not allow directory entries to cross sector boundaries. 
-	      * Simply pad, and then start the next entry at the next sector
-	      */
-	     new_reclen = s_entry1->jreclen;
-	     if( (dir_index & (SECTOR_SIZE - 1)) + new_reclen >= SECTOR_SIZE )
-	     {
-		 dir_index = (dir_index + (SECTOR_SIZE - 1)) &
-		     ~(SECTOR_SIZE - 1);
-	     }
-	    
-	     memcpy(&jrec, &s_entry1->isorec, sizeof(struct iso_directory_record) -
-		    sizeof(s_entry1->isorec.name));
-	    
-	     cvt_len = joliet_strlen(s_entry1->name);
-	    
-	     /*
-	      * Fix the record length - this was the non-Joliet version we
-	      * were seeing.
-	      */
-	     jrec.name_len[0] = cvt_len;
-	     jrec.length[0] = s_entry1->jreclen;
-	    
-	     /*
-	      * If this is a directory, fix the correct size and extent
-	      * number.
-	      */
-	     if( (jrec.flags[0] & 2) != 0 )
-	     {
-		 if(strcmp(s_entry1->name,".") == 0)
-		 {
-		     jrec.name_len[0] = 1;
-		     set_733((char *) jrec.extent, dpnt->jextent);
-		     set_733((char *) jrec.size, ROUND_UP(dpnt->jsize));
-		 }
-		 else if(strcmp(s_entry1->name,"..") == 0)
-		 {
-		     jrec.name_len[0] = 1;
-		     if( dpnt->parent == reloc_dir )
-		     {
-			 set_733((char *) jrec.extent, dpnt->self->parent_rec->filedir->jextent);
-			 set_733((char *) jrec.size, ROUND_UP(dpnt->self->parent_rec->filedir->jsize));
-		     }
-		     else
-
-		     {
-			 set_733((char *) jrec.extent, dpnt->parent->jextent);
-			 set_733((char *) jrec.size, ROUND_UP(dpnt->parent->jsize));
-		     }
-		 }
-		 else
-		 {
-		     if( (s_entry->de_flags & RELOCATED_DIRECTORY) != 0 )
-		     {
-			 finddir = reloc_dir->subdir;
-		     }
-		     else
-		     {
-			 finddir = dpnt->subdir;
-		     }
-		     while(1==1)
-		     {
-			 if(finddir->self == s_entry1) break;
-			 finddir = finddir->next;
-			 if(!finddir)
-			 {
-			     fprintf (stderr, _("Fatal goof - unable to find directory location\n"));
-			     exit (1);
-			 }
-		     }
-		     set_733((char *) jrec.extent, finddir->jextent);
-		     set_733((char *) jrec.size, ROUND_UP(finddir->jsize));
-		 }
-	     }
-	    
-	     memcpy(directory_buffer + dir_index, &jrec,
-		    sizeof(struct iso_directory_record) -
-		    sizeof(s_entry1->isorec.name));
-	    
-	    
-	     dir_index += sizeof(struct iso_directory_record) -
-		 sizeof (s_entry1->isorec.name);
-	    
-	     /*
-	      * Finally dump the Unicode version of the filename.
-	      * Note - . and .. are the same as with non-Joliet discs.
-	      */
-	     if( (jrec.flags[0] & 2) != 0
-		 && strcmp(s_entry1->name, ".") == 0 )
-	     {
-		 directory_buffer[dir_index++] = 0;
-	     }
-	     else if( (jrec.flags[0] & 2) != 0
-		      && strcmp(s_entry1->name, "..") == 0 )
-	     {
-		 directory_buffer[dir_index++] = 1;
-	     }
-	     else
-	     {
-		 convert_to_unicode((uint8_t *)directory_buffer + dir_index,
-				    cvt_len,
-				    s_entry1->name);
-		 dir_index += cvt_len;
-	     }
-	    
-	     if(dir_index & 1)
-	     {
-		 directory_buffer[dir_index++] = 0;
-	     }
-
-	     s_entry = s_entry->jnext;
-     }
-    
-     if(dpnt->jsize != dir_index)
-     {
-	 fprintf (stderr, _("Unexpected joliet directory length %d %d %s\n"),
-		  dpnt->jsize, dir_index, dpnt->de_name);
-     }
-    
-     xfwrite(directory_buffer, 1, total_size, outfile);
-     last_extent_written += total_size >> 11;
-     free(directory_buffer);
-} /* generate_one_joliet_directory(... */
-
-static int FDECL1(joliet_sort_n_finish, struct directory *, this_dir)
-{
-  struct directory_entry  * s_entry;
-  int			    status = 0;
-
-  /* don't want to skip this directory if it's the reloc_dir at the moment */
-  if(this_dir != reloc_dir && this_dir->dir_flags & INHIBIT_JOLIET_ENTRY)
-    {
-      return 0;
-    }
-
-  for(s_entry = this_dir->contents; s_entry; s_entry = s_entry->next)
-    {
-      /* skip hidden entries */
-      if(  (s_entry->de_flags & INHIBIT_JOLIET_ENTRY) != 0 )
-	{
-	  continue;
-	}
-	 
-      /*
-       * First update the path table sizes for directories.
-       *
-       * Finally, set the length of the directory entry if Joliet is used.
-       * The name is longer, but no Rock Ridge is ever used here, so
-       * depending upon the options the entry size might turn out to be about
-       * the same.  The Unicode name is always a multiple of 2 bytes, so
-       * we always add 1 to make it an even number.
-       */
-      if(s_entry->isorec.flags[0] ==  2)
-	{
-	  if (strcmp(s_entry->name,".") && strcmp(s_entry->name,".."))
-	    {
-	      jpath_table_size += joliet_strlen(s_entry->name) + sizeof(struct iso_path_table) - 1;
-	      if (jpath_table_size & 1)
-		{
-		  jpath_table_size++;
-		}
-	    }
-	  else
-	    {
-	      if (this_dir == root && strlen(s_entry->name) == 1)
-		{
-		  jpath_table_size += sizeof(struct iso_path_table);
-		  if (jpath_table_size & 1) jpath_table_size++;
-		}
-	    }
-	}
-
-      if (strcmp(s_entry->name,".") && strcmp(s_entry->name,".."))
-	{
-	  s_entry->jreclen = 	sizeof(struct iso_directory_record)
-	    - sizeof(s_entry->isorec.name)
-	    + joliet_strlen(s_entry->name)
-	    + 1;
-	}
-      else
-	{
-	  /*
-	   * Special - for '.' and '..' we generate the same records we
-	   * did for non-Joliet discs.
-	   */
-	  s_entry->jreclen = 	sizeof(struct iso_directory_record)
-	    - sizeof(s_entry->isorec.name)
-	    + 1;
-	}
-
-
-    }
-
-  if( (this_dir->dir_flags & INHIBIT_JOLIET_ENTRY) != 0 )
-    {
-      return 0;
-    }
-
-  this_dir->jcontents = this_dir->contents;
-  status = joliet_sort_directory(&this_dir->jcontents);
-
-  /*
-   * Now go through the directory and figure out how large this one will be.
-   * Do not split a directory entry across a sector boundary
-   */
-  s_entry = this_dir->jcontents;
-/*
- * XXX Is it ok to comment this out?
- */
-/*XXX JS  this_dir->ce_bytes = 0;*/
-  for(s_entry = this_dir->jcontents; s_entry; s_entry = s_entry->jnext)
-    {
-      int jreclen;
-
-      if( (s_entry->de_flags & INHIBIT_JOLIET_ENTRY) != 0 )
-	{
-	  continue;
-	}
-
-      jreclen = s_entry->jreclen;
-     
-      if ((this_dir->jsize & (SECTOR_SIZE - 1)) + jreclen >= SECTOR_SIZE)
-	{
-	  this_dir->jsize = (this_dir->jsize + (SECTOR_SIZE - 1)) &
-	    ~(SECTOR_SIZE - 1);
-	}
-      this_dir->jsize += jreclen;
-    }
-  return status;
-}
-
-/*
- * Similar to the iso9660 case, except here we perform a full sort based upon the
- * regular name of the file, not the 8.3 version.
- */
-static int FDECL2(joliet_compare_dirs, const void *, rr, const void *, ll)
-{
-     char * rpnt, *lpnt;
-     struct directory_entry ** r, **l;
-    
-     r = (struct directory_entry **) rr;
-     l = (struct directory_entry **) ll;
-     rpnt = (*r)->name;
-     lpnt = (*l)->name;
-
-     /*
-      * If the entries are the same, this is an error.
-      */
-     if( strcmp(rpnt, lpnt) == 0 )
-       {
-	 sort_goof++;
-       }
-    
-     /*
-      *  Put the '.' and '..' entries on the head of the sorted list.
-      *  For normal ASCII, this always happens to be the case, but out of
-      *  band characters cause this not to be the case sometimes.
-      */
-     if( strcmp(rpnt, ".") == 0 ) return -1;
-     if( strcmp(lpnt, ".") == 0 ) return  1;
-
-     if( strcmp(rpnt, "..") == 0 ) return -1;
-     if( strcmp(lpnt, "..") == 0 ) return  1;
-
-     while(*rpnt && *lpnt)
-     {
-	  if(*rpnt == ';' && *lpnt != ';') return -1;
-	  if(*rpnt != ';' && *lpnt == ';') return 1;
-	 
-	  if(*rpnt == ';' && *lpnt == ';') return 0;
-	 
-	  /*
-	   * Extensions are not special here.  Don't treat the dot as something that
-	   * must be bumped to the start of the list.
-	   */
-#if 0
-	  if(*rpnt == '.' && *lpnt != '.') return -1;
-	  if(*rpnt != '.' && *lpnt == '.') return 1;
-#endif
-	 
-	  if(*rpnt < *lpnt) return -1;
-	  if(*rpnt > *lpnt) return 1;
-	  rpnt++;  lpnt++;
-     }
-     if(*rpnt) return 1;
-     if(*lpnt) return -1;
-     return 0;
-}
-
-
-/*
- * Function:		sort_directory
- *
- * Purpose:		Sort the directory in the appropriate ISO9660
- *			order.
- *
- * Notes:		Returns 0 if OK, returns > 0 if an error occurred.
- */
-static int FDECL1(joliet_sort_directory, struct directory_entry **, sort_dir)
-{
-     int dcount = 0;
-     int i;
-     struct directory_entry * s_entry;
-     struct directory_entry ** sortlist;
-    
-     s_entry = *sort_dir;
-     while(s_entry)
-     {
-	  /* skip hidden entries */
-	  if (!(s_entry->de_flags & INHIBIT_JOLIET_ENTRY))
-	    dcount++;
-	  s_entry = s_entry->next;
-     }
-
-     /*
-      * OK, now we know how many there are.  Build a vector for sorting.
-      */
-     sortlist =   (struct directory_entry **)
-	  e_malloc(sizeof(struct directory_entry *) * dcount);
-
-     dcount = 0;
-     s_entry = *sort_dir;
-     while(s_entry)
-     {
-	  /* skip hidden entries */
-	  if (!(s_entry->de_flags & INHIBIT_JOLIET_ENTRY)) {
-	    sortlist[dcount] = s_entry;
-	    dcount++;
-	  }
-	  s_entry = s_entry->next;
-     }
- 
-     sort_goof = 0;
-#ifdef	__STDC__
-     qsort(sortlist, dcount, sizeof(struct directory_entry *),
-	   (int (*)(const void *, const void *))joliet_compare_dirs);
-#else
-     qsort(sortlist, dcount, sizeof(struct directory_entry *),
-	   joliet_compare_dirs);
-#endif
-    
-     /*
-      * Now reassemble the linked list in the proper sorted order
-      */
-     for(i=0; i<dcount-1; i++)
-     {
-	  sortlist[i]->jnext = sortlist[i+1];
-     }
-
-     sortlist[dcount-1]->jnext = NULL;
-     *sort_dir = sortlist[0];
-    
-     free(sortlist);
-     return sort_goof;
-}
-
-int FDECL1(joliet_sort_tree, struct directory *, node)
-{
-  struct directory * dpnt;
-  int ret = 0;
-
-  dpnt = node;
-
-  while (dpnt){
-    ret = joliet_sort_n_finish(dpnt);
-    if( ret )
-      {
-	break;
-      }
-    if(dpnt->subdir) ret = joliet_sort_tree(dpnt->subdir);
-    if( ret )
-      {
-	break;
-      }
-    dpnt = dpnt->next;
-  }
-  return ret;
-}
-
-static void FDECL2(generate_joliet_directories, struct directory *, node, FILE*, outfile){
-  struct directory * dpnt;
-
-  dpnt = node;
-
-  while (dpnt)
-    {
-      if( (dpnt->dir_flags & INHIBIT_JOLIET_ENTRY) == 0 )
-	{
-	  /*
-	   * In theory we should never reuse a directory, so this doesn't
-	   * make much sense.
-	   */
-	  if( dpnt->jextent > session_start )
-	    {
-	      generate_one_joliet_directory(dpnt, outfile);
-	    }
-	}
-      /* skip if hidden - but not for the rr_moved dir */
-      if(dpnt->subdir && (!(dpnt->dir_flags & INHIBIT_JOLIET_ENTRY) || dpnt == reloc_dir))
-	generate_joliet_directories(dpnt->subdir, outfile);
-      dpnt = dpnt->next;
-    }
-}
-
-
-/*
- * Function to write the EVD for the disc.
- */
-static int FDECL1(jpathtab_write, FILE *, outfile)
-{
-  /*
-   * Next we write the path tables
-   */
-  xfwrite(jpath_table_l, 1, jpath_blocks << 11, outfile);
-  xfwrite(jpath_table_m, 1, jpath_blocks << 11, outfile);
-  last_extent_written += 2*jpath_blocks;
-  free(jpath_table_l);
-  free(jpath_table_m);
-  jpath_table_l = NULL;
-  jpath_table_m = NULL;
-  return 0;
-}
-
-static int FDECL1(jdirtree_size, int, starting_extent)
-{
-  assign_joliet_directory_addresses(root);
-  return 0;
-}
-
-static int jroot_gen()
-{
-     jroot_record.length[0] = 1 + sizeof(struct iso_directory_record)
-	  - sizeof(jroot_record.name);
-     jroot_record.ext_attr_length[0] = 0;
-     set_733((char *) jroot_record.extent, root->jextent);
-     set_733((char *) jroot_record.size, ROUND_UP(root->jsize));
-     iso9660_date(jroot_record.date, root_statbuf.st_mtime);
-     jroot_record.flags[0] = 2;
-     jroot_record.file_unit_size[0] = 0;
-     jroot_record.interleave[0] = 0;
-     set_723(jroot_record.volume_sequence_number, volume_sequence_number);
-     jroot_record.name_len[0] = 1;
-     return 0;
-}
-
-static int FDECL1(jdirtree_write, FILE *, outfile)
-{
-  generate_joliet_directories(root, outfile);
-  return 0;
-}
-
-/*
- * Function to write the EVD for the disc.
- */
-static int FDECL1(jvd_write, FILE *, outfile)
-{
-  struct iso_primary_descriptor jvol_desc;
-
-  /*
-   * Next we write out the boot volume descriptor for the disc
-   */
-  jvol_desc = vol_desc;
-  get_joliet_vol_desc(&jvol_desc);
-  xfwrite(&jvol_desc, 1, 2048, outfile);
-  last_extent_written ++;
-  return 0;
-}
-
-/*
- * Functions to describe padding block at the start of the disc.
- */
-static int FDECL1(jpathtab_size, int, starting_extent)
-{
-  jpath_table[0] = starting_extent;
-  jpath_table[1] = 0;
-  jpath_table[2] = jpath_table[0] + jpath_blocks;
-  jpath_table[3] = 0;
- 
-  last_extent += 2*jpath_blocks;
-  return 0;
-}
-
-struct output_fragment joliet_desc    = {NULL, oneblock_size, jroot_gen,jvd_write};
-struct output_fragment jpathtable_desc= {NULL, jpathtab_size, generate_joliet_path_tables,     jpathtab_write};
-struct output_fragment jdirtree_desc  = {NULL, jdirtree_size, NULL,     jdirtree_write};
diff --git a/util/mkisofs/match.c b/util/mkisofs/match.c
deleted file mode 100644
index 0072b504e..000000000
--- a/util/mkisofs/match.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *  Copyright (C) 2009  Free Software Foundation, Inc.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include "fnmatch.h"
-
-#include "match.h"
-
-struct pattern
-{
-  char *str;
-  struct pattern *next;
-};
-
-static struct pattern *patlist = NULL;
-static struct pattern *i_patlist = NULL;	/* ISO9660/RR */
-static struct pattern *j_patlist = NULL;	/* Joliet */
-
-#define DECL_ADD_MATCH(function, list) \
-void \
-function (char *pattern) \
-{ \
-  struct pattern *new; \
-  new = malloc (sizeof (*new)); \
-  new->str = strdup (pattern); \
-  new->next = list; \
-  list = new; \
-}
-
-DECL_ADD_MATCH (add_match, patlist)
-DECL_ADD_MATCH (i_add_match, i_patlist)
-DECL_ADD_MATCH (j_add_match, j_patlist)
-
-#define DECL_MATCHES(function, list) \
-int \
-function (char *str) \
-{ \
-  struct pattern *i; \
-  for (i = list; i != NULL; i = i->next) \
-    if (fnmatch (i->str, str, FNM_FILE_NAME) != FNM_NOMATCH) \
-      return 1; \
-  return 0; \
-}
-
-DECL_MATCHES (matches, patlist)
-DECL_MATCHES (i_matches, i_patlist)
-DECL_MATCHES (j_matches, j_patlist)
-
-int
-i_ishidden()
-{
-  return (i_patlist != NULL);
-}
-
-
-int j_ishidden()
-{
-  return (j_patlist != NULL);
-}
diff --git a/util/mkisofs/match.h b/util/mkisofs/match.h
deleted file mode 100644
index ee346a24c..000000000
--- a/util/mkisofs/match.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  Copyright (C) 2009  Free Software Foundation, Inc.
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-extern void add_match (char *);
-extern void i_add_match (char *);
-extern void j_add_match (char *);
-
-extern int matches (char *);
-extern int i_matches (char *);
-extern int j_matches (char *);
-
-extern int i_ishidden ();
-extern int j_ishidden ();
diff --git a/util/mkisofs/mkisofs.c b/util/mkisofs/mkisofs.c
deleted file mode 100644
index 16e2f0c7d..000000000
--- a/util/mkisofs/mkisofs.c
+++ /dev/null
@@ -1,1422 +0,0 @@
-/*
- * Program mkisofs.c - generate iso9660 filesystem  based upon directory
- * tree on hard disk.
-
-   Written by Eric Youngdale (1993).
-
-   Copyright 1993 Yggdrasil Computing, Incorporated
-
-   Copyright (C) 2009,2010  Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <errno.h>
-#include "config.h"
-#include "mkisofs.h"
-#include "match.h"
-#include "getopt.h"
-
-#include "iso9660.h"
-#include <ctype.h>
-
-#ifndef VMS
-#include <time.h>
-#else
-#include <sys/time.h>
-#include "vms.h"
-#endif
-
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#ifndef VMS
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#endif
-#include <fctldefs.h>
-
-#include "exclude.h"
-
-#ifdef __NetBSD__
-#include <sys/time.h>
-#include <sys/resource.h>
-#endif
-
-struct directory * root = NULL;
-
-static char version_string[] = "mkisofs 1.12b5";
-
-#include "progname.h"
-
-char * outfile;
-FILE * discimage;
-uint64_t next_extent = 0;
-uint64_t last_extent = 0;
-uint64_t session_start = 0;
-unsigned int path_table_size = 0;
-unsigned int path_table[4] = {0,};
-unsigned int path_blocks = 0;
-
-
-unsigned int jpath_table_size = 0;
-unsigned int jpath_table[4] = {0,};
-unsigned int jpath_blocks = 0;
-
-struct iso_directory_record root_record;
-struct iso_directory_record jroot_record;
-
-char * extension_record = NULL;
-int extension_record_extent = 0;
-int extension_record_size = 0;
-
-/* These variables are associated with command line options */
-int use_eltorito = 0;
-int use_eltorito_emul_floppy = 0;
-int use_embedded_boot = 0;
-int use_protective_msdos_label = 0;
-int use_boot_info_table = 0;
-int use_RockRidge = 0;
-int use_Joliet = 0;
-int verbose = 1;
-int all_files  = 0;
-int follow_links = 0;
-int rationalize = 0;
-int generate_tables = 0;
-int print_size = 0;
-int split_output = 0;
-char *preparer = PREPARER_DEFAULT;
-char *publisher = PUBLISHER_DEFAULT;
-char *appid = APPID_DEFAULT;
-char *copyright = COPYRIGHT_DEFAULT;
-char *biblio = BIBLIO_DEFAULT;
-char *abstract = ABSTRACT_DEFAULT;
-char *volset_id = VOLSET_ID_DEFAULT;
-char *volume_id = VOLUME_ID_DEFAULT;
-char *system_id = SYSTEM_ID_DEFAULT;
-char *boot_catalog = BOOT_CATALOG_DEFAULT;
-char *boot_image = BOOT_IMAGE_DEFAULT;
-char *boot_image_embed = NULL;
-int volume_set_size = 1;
-int volume_sequence_number = 1;
-
-int omit_period = 0;             /* Violates iso9660, but these are a pain */
-int transparent_compression = 0; /* So far only works with linux */
-int omit_version_number = 0;     /* May violate iso9660, but noone uses vers*/
-unsigned int RR_relocation_depth = 6;     /* Violates iso9660, but most systems work */
-int full_iso9660_filenames = 0;  /* Used with Amiga.  Disc will not work with
-				  DOS */
-int allow_leading_dots = 0;	 /* DOS cannot read names with leading dots */
-int split_SL_component = 1;    /* circumvent a bug in the SunOS driver */
-int split_SL_field = 1;                /* circumvent a bug in the SunOS */
-
-struct rcopts{
-  char * tag;
-  char ** variable;
-};
-
-struct rcopts rcopt[] = {
-  {"PREP", &preparer},
-  {"PUBL", &publisher},
-  {"APPI", &appid},
-  {"COPY", &copyright},
-  {"BIBL", &biblio},
-  {"ABST", &abstract},
-  {"VOLS", &volset_id},
-  {"VOLI", &volume_id},
-  {"SYSI", &system_id},
-  {NULL, NULL}
-};
-
-/*
- * In case it isn't obvious, the option handling code was ripped off from GNU-ld.
- */
-struct ld_option
-{
-  /* The long option information.  */
-  struct option opt;
-  /* The short option with the same meaning ('\0' if none).  */
-  char shortopt;
-  /* The name of the argument (NULL if none).  */
-  const char *arg;
-  /* The documentation string.  If this is NULL, this is a synonym for
-     the previous option.  */
-  const char *doc;
-  enum
-    {
-      /* Use one dash before long option name.  */
-      ONE_DASH,
-      /* Use two dashes before long option name.  */
-      TWO_DASHES,
-      /* Don't mention this option in --help output.  */
-      NO_HELP
-    } control;
-};
-
-/* Codes used for the long options with no short synonyms.  150 isn't
-   special; it's just an arbitrary non-ASCII char value.  */
-#define OPTION_HELP			150
-#define OPTION_QUIET			151
-#define OPTION_NOSPLIT_SL_COMPONENT	152
-#define OPTION_NOSPLIT_SL_FIELD		153
-#define OPTION_PRINT_SIZE		154
-#define OPTION_SPLIT_OUTPUT		155
-#define OPTION_ABSTRACT			156
-#define OPTION_BIBLIO			157
-#define OPTION_COPYRIGHT		158
-#define OPTION_SYSID			159
-#define OPTION_VOLSET			160
-#define OPTION_VOLSET_SIZE		161
-#define OPTION_VOLSET_SEQ_NUM		162
-#define OPTION_I_HIDE			163
-#define OPTION_J_HIDE			164
-#define OPTION_LOG_FILE			165
-
-#define OPTION_CREAT_DATE		166
-#define OPTION_MODIF_DATE		167
-#define OPTION_EXPIR_DATE		168
-#define OPTION_EFFEC_DATE		169
-
-#define OPTION_BOOT_INFO_TABLE		170
-#define OPTION_NO_EMUL_BOOT		171
-#define OPTION_ELTORITO_EMUL_FLOPPY	172
-
-#define OPTION_VERSION			173
-
-#define OPTION_PROTECTIVE_MSDOS_LABEL	174
-
-static const struct ld_option ld_options[] =
-{
-  { {"all-files", no_argument, NULL, 'a'},
-      'a', NULL, N_("Process all files (don't skip backup files)"), ONE_DASH },
-  { {"abstract", required_argument, NULL, OPTION_ABSTRACT},
-      '\0', N_("FILE"), N_("Set Abstract filename"), ONE_DASH },
-  { {"appid", required_argument, NULL, 'A'},
-      'A', N_("ID"), N_("Set Application ID"), ONE_DASH },
-  { {"biblio", required_argument, NULL, OPTION_BIBLIO},
-      '\0', N_("FILE"), N_("Set Bibliographic filename"), ONE_DASH },
-  { {"copyright", required_argument, NULL, OPTION_COPYRIGHT},
-      '\0', N_("FILE"), N_("Set Copyright filename"), ONE_DASH },
-  { {"embedded-boot", required_argument, NULL, 'G'},
-      'G', N_("FILE"), N_("Set embedded boot image name"), TWO_DASHES },
-  { {"protective-msdos-label", no_argument, NULL, OPTION_PROTECTIVE_MSDOS_LABEL },
-      '\0', NULL, N_("Patch a protective DOS-style label in the image"), TWO_DASHES },
-  { {"eltorito-boot", required_argument, NULL, 'b'},
-      'b', N_("FILE"), N_("Set El Torito boot image name"), ONE_DASH },
-  { {"eltorito-catalog", required_argument, NULL, 'c'},
-      'c', N_("FILE"), N_("Set El Torito boot catalog name"), ONE_DASH },
-  { {"boot-info-table", no_argument, NULL, OPTION_BOOT_INFO_TABLE },
-      '\0', NULL, N_("Patch Boot Info Table in El Torito boot image"), ONE_DASH },
-  { {"no-emul-boot", no_argument, NULL, OPTION_NO_EMUL_BOOT },
-      '\0', NULL, N_("Dummy option for backward compatibility"), ONE_DASH },
-  { {"eltorito-emul-floppy", no_argument, NULL, OPTION_ELTORITO_EMUL_FLOPPY },
-      '\0', NULL, N_("Enable floppy drive emulation for El Torito"), TWO_DASHES },
-  { {"cdwrite-params", required_argument, NULL, 'C'},
-      'C', N_("PARAMS"), N_("Magic parameters from cdrecord"), ONE_DASH },
-  { {"omit-period", no_argument, NULL, 'd'},
-      'd', NULL, N_("Omit trailing periods from filenames"), ONE_DASH },
-  { {"disable-deep-relocation", no_argument, NULL, 'D'},
-      'D', NULL, N_("Disable deep directory relocation"), ONE_DASH },
-  { {"follow-links", no_argument, NULL, 'f'},
-      'f', NULL, N_("Follow symbolic links"), ONE_DASH },
-  { {"help", no_argument, NULL, OPTION_HELP},
-      '\0', NULL, N_("Print option help"), ONE_DASH },
-  { {"help", no_argument, NULL, OPTION_HELP},
-      '\0', NULL, N_("Print option help"), TWO_DASHES },
-  { {"version", no_argument, NULL, OPTION_VERSION},
-      '\0', NULL, N_("Print version information and exit"), TWO_DASHES },
-  { {"hide", required_argument, NULL, OPTION_I_HIDE},
-      '\0', N_("GLOBFILE"), N_("Hide ISO9660/RR file"), ONE_DASH },
-  { {"hide-joliet", required_argument, NULL, OPTION_J_HIDE},
-      '\0', N_("GLOBFILE"), N_("Hide Joliet file"), ONE_DASH },
-  { {NULL, required_argument, NULL, 'i'},
-      'i', N_("ADD_FILES"), N_("No longer supported"), TWO_DASHES },
-  { {"joliet", no_argument, NULL, 'J'},
-      'J', NULL, N_("Generate Joliet directory information"), ONE_DASH },
-  { {"full-iso9660-filenames", no_argument, NULL, 'l'},
-      'l', NULL, N_("Allow full 32 character filenames for iso9660 names"), ONE_DASH },
-  { {"allow-leading-dots", no_argument, NULL, 'L'},
-      'L', NULL, N_("Allow iso9660 filenames to start with '.'"), ONE_DASH },
-  { {"log-file", required_argument, NULL, OPTION_LOG_FILE},
-      '\0', N_("LOG_FILE"), N_("Re-direct messages to LOG_FILE"), ONE_DASH },
-  { {"exclude", required_argument, NULL, 'm'},
-      'm', N_("GLOBFILE"), N_("Exclude file name"), ONE_DASH },
-  { {"prev-session", required_argument, NULL, 'M'},
-      'M', N_("FILE"), N_("Set path to previous session to merge"), ONE_DASH },
-  { {"omit-version-number", no_argument, NULL, 'N'},
-      'N', NULL, N_("Omit version number from iso9660 filename"), ONE_DASH },
-  { {"no-split-symlink-components", no_argument, NULL, 0},
-      0, NULL, N_("Inhibit splitting symlink components"), ONE_DASH },
-  { {"no-split-symlink-fields", no_argument, NULL, 0},
-      0, NULL, N_("Inhibit splitting symlink fields"), ONE_DASH },
-  { {"output", required_argument, NULL, 'o'},
-      'o', N_("FILE"), N_("Set output file name"), ONE_DASH },
-  { {"preparer", required_argument, NULL, 'p'},
-      'p', N_("PREP"), N_("Set Volume preparer"), ONE_DASH },
-  { {"print-size", no_argument, NULL, OPTION_PRINT_SIZE},
-      '\0', NULL, N_("Print estimated filesystem size and exit"), ONE_DASH },
-  { {"publisher", required_argument, NULL, 'P'},
-      'P', N_("PUB"), N_("Set Volume publisher"), ONE_DASH },
-  { {"quiet", no_argument, NULL, OPTION_QUIET},
-      '\0', NULL, N_("Run quietly"), ONE_DASH },
-  { {"rational-rock", no_argument, NULL, 'r'},
-      'r', NULL, N_("Generate rationalized Rock Ridge directory information"), ONE_DASH },
-  { {"rock", no_argument, NULL, 'R'},
-      'R', NULL, N_("Generate Rock Ridge directory information"), ONE_DASH },
-  { {"split-output", no_argument, NULL, OPTION_SPLIT_OUTPUT},
-      '\0', NULL, N_("Split output into files of approx. 1GB size"), ONE_DASH },
-  { {"sysid", required_argument, NULL, OPTION_SYSID},
-      '\0', N_("ID"), N_("Set System ID"), ONE_DASH },
-  { {"translation-table", no_argument, NULL, 'T'},
-      'T', NULL, N_("Generate translation tables for systems that don't understand long filenames"), ONE_DASH },
-  { {"verbose", no_argument, NULL, 'v'},
-      'v', NULL, N_("Verbose"), ONE_DASH },
-  { {"volid", required_argument, NULL, 'V'},
-      'V', N_("ID"), N_("Set Volume ID"), ONE_DASH },
-  { {"volset", required_argument, NULL, OPTION_VOLSET},
-      '\0', N_("ID"), N_("Set Volume set ID"), ONE_DASH },
-  { {"volset-size", required_argument, NULL, OPTION_VOLSET_SIZE},
-      '\0', "#", N_("Set Volume set size"), ONE_DASH },
-  { {"volset-seqno", required_argument, NULL, OPTION_VOLSET_SEQ_NUM},
-      '\0', "#", N_("Set Volume set sequence number"), ONE_DASH },
-  { {"old-exclude", required_argument, NULL, 'x'},
-    'x', N_("FILE"), N_("Exclude file name (deprecated)"), ONE_DASH },
-#ifdef ERIC_neverdef
-  { {"transparent-compression", no_argument, NULL, 'z'},
-      'z', NULL, "Enable transparent compression of files", ONE_DASH },
-#endif
-  { {"creation-date", required_argument, NULL, OPTION_CREAT_DATE },
-    '\0', NULL, N_("Override creation date"), TWO_DASHES },
-  { {"modification-date", required_argument, NULL, OPTION_MODIF_DATE },
-   '\0', NULL, N_("Override modification date"), TWO_DASHES },
-  { {"expiration-date", required_argument, NULL, OPTION_EXPIR_DATE },
-   '\0', NULL, N_("Override expiration date"), TWO_DASHES },
-  { {"effective-date", required_argument, NULL, OPTION_EFFEC_DATE },
-   '\0', NULL, N_("Override effective date"), TWO_DASHES },
-};
-
-#define OPTION_COUNT (sizeof ld_options / sizeof ld_options[0])
-
-#if defined(ultrix) || defined(_AUX_SOURCE)
-char *strdup(s)
-char *s;{char *c;if(c=(char *)malloc(strlen(s)+1))strcpy(c,s);return c;}
-#endif
-
-	void read_rcfile	__PR((char * appname));
-	void usage		__PR((void));
-static	void hide_reloc_dir	__PR((void));
-
-void FDECL1(read_rcfile, char *, appname)
-{
-  FILE * rcfile;
-  struct rcopts * rco;
-  char * pnt, *pnt1;
-  char linebuffer[256];
-  static char rcfn[] = ".mkisofsrc";
-  char filename[1000];
-  int linum;
-
-  strcpy(filename, rcfn);
-  rcfile = fopen(filename, "r");
-  if (!rcfile && errno != ENOENT)
-    perror(filename);
-
-  if (!rcfile)
-    {
-      pnt = getenv("MKISOFSRC");
-      if (pnt && strlen(pnt) <= sizeof(filename))
-	{
-	  strcpy(filename, pnt);
-	  rcfile = fopen(filename, "r");
-	  if (!rcfile && errno != ENOENT)
-	    perror(filename);
-	}
-    }
-
-  if (!rcfile)
-    {
-      pnt = getenv("HOME");
-      if (pnt && strlen(pnt) + strlen(rcfn) + 2 <= sizeof(filename))
-	{
-	  strcpy(filename, pnt);
-	  strcat(filename, "/");
-	  strcat(filename, rcfn);
-	  rcfile = fopen(filename, "r");
-	  if (!rcfile && errno != ENOENT)
-	    perror(filename);
-	}
-    }
-  if (!rcfile && strlen(appname)+sizeof(rcfn)+2 <= sizeof(filename))
-    {
-      strcpy(filename, appname);
-      pnt = strrchr(filename, '/');
-      if (pnt)
-	{
-	  strcpy(pnt + 1, rcfn);
-	  rcfile = fopen(filename, "r");
-	  if (!rcfile && errno != ENOENT)
-	    perror(filename);
-	}
-    }
-  if (!rcfile)
-    return;
-  if ( verbose > 0 )
-    {
-      fprintf (stderr, _("Using \"%s\"\n"), filename);
-    }
-
-  /* OK, we got it.  Now read in the lines and parse them */
-  linum = 0;
-  while (fgets(linebuffer, sizeof(linebuffer), rcfile))
-    {
-      char *name;
-      char *name_end;
-      ++linum;
-      /* skip any leading white space */
-	pnt = linebuffer;
-      while (*pnt == ' ' || *pnt == '\t')
-	++pnt;
-      /* If we are looking at a # character, this line is a comment. */
-	if (*pnt == '#')
-	  continue;
-      /* The name should begin in the left margin.  Make sure it is in
-	 upper case.  Stop when we see white space or a comment. */
-	name = pnt;
-      while (*pnt && isalpha((unsigned char)*pnt))
-	{
-	  if(islower((unsigned char)*pnt))
-	    *pnt = toupper((unsigned char)*pnt);
-	  pnt++;
-	}
-      if (name == pnt)
-	{
-	  fprintf(stderr, _("%s:%d: name required\n"), filename, linum);
-	  continue;
-	}
-      name_end = pnt;
-      /* Skip past white space after the name */
-      while (*pnt == ' ' || *pnt == '\t')
-	pnt++;
-      /* silently ignore errors in the rc file. */
-      if (*pnt != '=')
-	{
-	  fprintf (stderr, _("%s:%d: equals sign required\n"), filename, linum);
-	  continue;
-	}
-      /* Skip pas the = sign, and any white space following it */
-      pnt++; /* Skip past '=' sign */
-      while (*pnt == ' ' || *pnt == '\t')
-	pnt++;
-
-      /* now it is safe to NUL terminate the name */
-
-	*name_end = 0;
-
-      /* Now get rid of trailing newline */
-
-      pnt1 = pnt;
-      while (*pnt1)
-	{
-	  if (*pnt1 == '\n')
-	    {
-	      *pnt1 = 0;
-	      break;
-	    }
-	  pnt1++;
-	};
-      /* OK, now figure out which option we have */
-      for(rco = rcopt; rco->tag; rco++) {
-	if(strcmp(rco->tag, name) == 0)
-	  {
-	    *rco->variable = strdup(pnt);
-	    break;
-	  };
-      }
-      if (rco->tag == NULL)
-	{
-	  fprintf (stderr, _("%s:%d: field name \"%s\" unknown\n"), filename, linum,
-			     name);
-	}
-     }
-  if (ferror(rcfile))
-    perror(filename);
-  fclose(rcfile);
-}
-
-char * path_table_l = NULL;
-char * path_table_m = NULL;
-
-char * jpath_table_l = NULL;
-char * jpath_table_m = NULL;
-
-int goof = 0;
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-void usage(){
-  unsigned int i;
-/*  const char **targets, **pp;*/
-
-  printf (_("Usage: %s [options] file...\n"), program_name);
-
-  printf (_("Options:\n"));
-  for (i = 0; i < OPTION_COUNT; i++)
-    {
-      if (ld_options[i].doc != NULL)
-	{
-	  int comma;
-	  int len;
-	  unsigned int j;
-	  const char *arg;
-
-	  printf ("  ");
-
-	  comma = FALSE;
-	  len = 2;
-
-	  j = i;
-	  do
-	    {
-	      if (ld_options[j].shortopt != '\0'
-		  && ld_options[j].control != NO_HELP)
-		{
-		  printf ("%s-%c", comma ? ", " : "", ld_options[j].shortopt);
-		  len += (comma ? 2 : 0) + 2;
-		  if (ld_options[j].arg != NULL)
-		    {
-		      if (ld_options[j].opt.has_arg != optional_argument)
-			{
-			  putchar (' ');
-			  ++len;
-			}
-		      arg = gettext (ld_options[j].arg);
-		      printf ("%s", arg);
-		      len += strlen (arg);
-		    }
-		  comma = TRUE;
-		}
-	      ++j;
-	    }
-	  while (j < OPTION_COUNT && ld_options[j].doc == NULL);
-
-	  j = i;
-	  do
-	    {
-	      if (ld_options[j].opt.name != NULL
-		  && ld_options[j].control != NO_HELP)
-		{
-		  printf ("%s-%s%s",
-			  comma ? ", " : "",
-			  ld_options[j].control == TWO_DASHES ? "-" : "",
-			  ld_options[j].opt.name);
-		  len += ((comma ? 2 : 0)
-			  + 1
-			  + (ld_options[j].control == TWO_DASHES ? 1 : 0)
-			  + strlen (ld_options[j].opt.name));
-		  if (ld_options[j].arg != NULL)
-		    {
-		      arg = gettext (ld_options[j].arg);
-		      printf (" %s", arg);
-		      len += 1 + strlen (arg);
-		    }
-		  comma = TRUE;
-		}
-	      ++j;
-	    }
-	  while (j < OPTION_COUNT && ld_options[j].doc == NULL);
-
-	  if (len >= 30)
-	    {
-	      printf ("\n");
-	      len = 0;
-	    }
-
-	  for (; len < 30; len++)
-	    putchar (' ');
-
-	  printf ("%s\n", gettext (ld_options[i].doc));
-	}
-    }
-  exit(1);
-}
-
-
-/*
- * Fill in date in the iso9660 format
- *
- * The standards  state that the timezone offset is in multiples of 15
- * minutes, and is what you add to GMT to get the localtime.  The U.S.
- * is always at a negative offset, from -5h to -8h (can vary a little
- * with DST,  I guess).  The Linux iso9660 filesystem has had the sign
- * of this wrong for ages (mkisofs had it wrong too for the longest time).
- */
-int FDECL2(iso9660_date,char *, result, time_t, crtime){
-  struct tm *local;
-  local = localtime(&crtime);
-  result[0] = local->tm_year;
-  result[1] = local->tm_mon + 1;
-  result[2] = local->tm_mday;
-  result[3] = local->tm_hour;
-  result[4] = local->tm_min;
-  result[5] = local->tm_sec;
-
-  /*
-   * Must recalculate proper timezone offset each time,
-   * as some files use daylight savings time and some don't...
-   */
-  result[6] = local->tm_yday;	/* save yday 'cause gmtime zaps it */
-  local = gmtime(&crtime);
-  local->tm_year -= result[0];
-  local->tm_yday -= result[6];
-  local->tm_hour -= result[3];
-  local->tm_min -= result[4];
-  if (local->tm_year < 0)
-    {
-      local->tm_yday = -1;
-    }
-  else
-    {
-      if (local->tm_year > 0) local->tm_yday = 1;
-    }
-
-  result[6] = -(local->tm_min + 60*(local->tm_hour + 24*local->tm_yday)) / 15;
-
-  return 0;
-}
-
-/* hide "./rr_moved" if all its contents are hidden */
-static void
-hide_reloc_dir()
-{
-	struct directory_entry * s_entry;
-
-	for (s_entry = reloc_dir->contents; s_entry; s_entry = s_entry->next) {
-	    if(strcmp(s_entry->name,".")==0 || strcmp(s_entry->name,"..")==0)
-		continue;
-
-	    if((s_entry->de_flags & INHIBIT_ISO9660_ENTRY) == 0)
-		return;
-	}
-
-	/* all entries are hidden, so hide this directory */
-	reloc_dir->dir_flags |= INHIBIT_ISO9660_ENTRY;
-	reloc_dir->self->de_flags |= INHIBIT_ISO9660_ENTRY;
-}
-
-extern char * cdwrite_data;
-
-int FDECL2(main, int, argc, char **, argv){
-  struct directory_entry de;
-#ifdef HAVE_SBRK
-  unsigned long mem_start;
-#endif
-  struct stat statbuf;
-  char * scan_tree;
-  char * merge_image = NULL;
-  struct iso_directory_record * mrootp = NULL;
-  struct output_fragment * opnt;
-  int longind;
-  char shortopts[OPTION_COUNT * 3 + 2];
-  struct option longopts[OPTION_COUNT + 1];
-  int c;
-  char *log_file = 0;
-
-  set_program_name (argv[0]);
-#if (defined(ENABLE_NLS) && ENABLE_NLS)
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-#endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
-
-  if (argc < 2)
-    usage();
-
-  /* Get the defaults from the .mkisofsrc file */
-  read_rcfile(argv[0]);
-
-  outfile = NULL;
-
-  /*
-   * Copy long option initialization from GNU-ld.
-   */
-  /* Starting the short option string with '-' is for programs that
-     expect options and other ARGV-elements in any order and that care about
-     the ordering of the two.  We describe each non-option ARGV-element
-     as if it were the argument of an option with character code 1.  */
-  {
-    unsigned int i;
-    int is, il;
-    shortopts[0] = '-';
-    is = 1;
-    il = 0;
-    for (i = 0; i < OPTION_COUNT; i++)
-      {
-	if (ld_options[i].shortopt != '\0')
-	  {
-	    shortopts[is] = ld_options[i].shortopt;
-	    ++is;
-	    if (ld_options[i].opt.has_arg == required_argument
-		|| ld_options[i].opt.has_arg == optional_argument)
-	      {
-		shortopts[is] = ':';
-		++is;
-		if (ld_options[i].opt.has_arg == optional_argument)
-		  {
-		    shortopts[is] = ':';
-		    ++is;
-		  }
-	      }
-	  }
-	if (ld_options[i].opt.name != NULL)
-	  {
-	    longopts[il] = ld_options[i].opt;
-	    ++il;
-	  }
-      }
-    shortopts[is] = '\0';
-    longopts[il].name = NULL;
-  }
-
-  while ((c = getopt_long_only (argc, argv, shortopts, longopts, &longind)) != EOF)
-    switch (c)
-      {
-      case 1:
-	/*
-	 * A filename that we take as input.
-	 */
-	optind--;
-	goto parse_input_files;
-      case 'C':
-	/*
-	 * This is a temporary hack until cdwrite gets the proper hooks in
-	 * it.
-	 */
-	cdwrite_data = optarg;
-	break;
-      case 'i':
-	fprintf (stderr, _("-i option no longer supported.\n"));
-	exit(1);
-	break;
-      case 'J':
-	use_Joliet++;
-	break;
-      case 'a':
-	all_files++;
-	break;
-      case 'b':
-	use_eltorito++;
-	boot_image = optarg;  /* pathname of the boot image on cd */
-	if (boot_image == NULL)
-	  error (1, 0, _("Required boot image pathname missing"));
-	break;
-      case 'G':
-	use_embedded_boot = 1;
-	boot_image_embed = optarg;  /* pathname of the boot image on host filesystem */
-	if (boot_image_embed == NULL)
-	  error (1, 0, _("Required boot image pathname missing"));
-	break;
-      case OPTION_PROTECTIVE_MSDOS_LABEL:
-	use_protective_msdos_label = 1;
-	break;
-      case 'c':
-	use_eltorito++;
-	boot_catalog = optarg;  /* pathname of the boot image on cd */
-	if (boot_catalog == NULL)
-	  {
-	    fprintf (stderr, _("Required boot catalog pathname missing\n"));
-	    exit (1);
-	  }
-	break;
-      case OPTION_BOOT_INFO_TABLE:
-	use_boot_info_table = 1;
-	break;
-      case OPTION_NO_EMUL_BOOT:
-	fprintf (stderr, _("Ignoring -no-emul-boot (no-emulation is the default behaviour)\n"));
-	break;
-      case OPTION_ELTORITO_EMUL_FLOPPY:
-	use_eltorito_emul_floppy = 1;
-	break;
-      case OPTION_ABSTRACT:
-	abstract = optarg;
-	if(strlen(abstract) > 37)
-	  {
-	    fprintf (stderr, _("Abstract filename string too long\n"));
-	    exit (1);
-	  };
-	break;
-      case 'A':
-	appid = optarg;
-	if(strlen(appid) > 128)
-	  {
-	    fprintf (stderr, _("Application-id string too long\n"));
-	    exit (1);
-	  };
-	break;
-      case OPTION_BIBLIO:
-	biblio = optarg;
-	if(strlen(biblio) > 37)
-	  {
-	    fprintf (stderr, _("Bibliographic filename string too long\n"));
-	    exit (1);
-	  };
-	break;
-      case OPTION_COPYRIGHT:
-	copyright = optarg;
-	if(strlen(copyright) > 37)
-	  {
-	    fprintf (stderr, _("Copyright filename string too long\n"));
-	    exit (1);
-	  };
-	break;
-      case 'd':
-	omit_period++;
-	break;
-      case 'D':
-	RR_relocation_depth = 32767;
-	break;
-      case 'f':
-	follow_links++;
-	break;
-      case 'l':
-	full_iso9660_filenames++;
-	break;
-      case 'L':
-        allow_leading_dots++;
-        break;
-     case OPTION_LOG_FILE:
-	log_file = optarg;
-	break;
-      case 'M':
-	merge_image = optarg;
-	break;
-      case 'N':
-	omit_version_number++;
-	break;
-      case 'o':
-	outfile = optarg;
-	break;
-      case 'p':
-	preparer = optarg;
-	if(strlen(preparer) > 128)
-	  {
-	    fprintf (stderr, _("Preparer string too long\n"));
-	    exit (1);
-	  };
-	break;
-      case OPTION_PRINT_SIZE:
-	print_size++;
-	break;
-      case 'P':
-	publisher = optarg;
-	if(strlen(publisher) > 128)
-	  {
-	    fprintf (stderr, _("Publisher string too long\n"));
-	    exit (1);
-	  };
-	break;
-      case OPTION_QUIET:
-	verbose = 0;
-	break;
-      case 'R':
-	use_RockRidge++;
-	break;
-      case 'r':
-	rationalize++;
-	use_RockRidge++;
-	break;
-      case OPTION_SPLIT_OUTPUT:
-	split_output++;
-	break;
-      case OPTION_SYSID:
-	system_id = optarg;
-	if(strlen(system_id) > 32)
-	  {
-	    fprintf (stderr, _("System ID string too long\n"));
-	    exit (1);
-	  };
-	break;
-      case 'T':
-	generate_tables++;
-	break;
-      case 'V':
-	volume_id = optarg;
-	if(strlen(volume_id) > 32)
-	  {
-	    fprintf (stderr, _("Volume ID string too long\n"));
-	    exit (1);
-	  };
-	break;
-      case OPTION_VOLSET:
-	volset_id = optarg;
-	if(strlen(volset_id) > 128)
-	  {
-	    fprintf (stderr, _("Volume set ID string too long\n"));
-	    exit (1);
-	  };
-	break;
-      case OPTION_VOLSET_SIZE:
-	volume_set_size = atoi(optarg);
-	break;
-      case OPTION_VOLSET_SEQ_NUM:
-	volume_sequence_number = atoi(optarg);
-	if (volume_sequence_number > volume_set_size)
-	  {
-	    fprintf (stderr, _("Volume set sequence number too big\n"));
-	    exit (1);
-	  }
-	break;
-      case 'v':
-	verbose++;
-	break;
-      case 'z':
-	transparent_compression++;
-	break;
-      case 'x':
-      case 'm':
-	/*
-	 * Somehow two options to do basically the same thing got added somewhere along
-	 * the way.  The 'match' code supports limited globbing, so this is the one
-	 * that got selected.  Unfortunately the 'x' switch is probably more intuitive.
-	 */
-        add_match(optarg);
-	break;
-      case OPTION_I_HIDE:
-	i_add_match(optarg);
-	break;
-      case OPTION_J_HIDE:
-	j_add_match(optarg);
-	break;
-      case OPTION_HELP:
-	usage ();
-	exit (0);
-	break;
-      case OPTION_VERSION:
-	printf ("%s version %s\n", PACKAGE_NAME, PACKAGE_VERSION);
-	exit (0);
-	break;
-      case OPTION_NOSPLIT_SL_COMPONENT:
-	split_SL_component = 0;
-	break;
-      case OPTION_NOSPLIT_SL_FIELD:
-	split_SL_field = 0;
-	break;
-      case OPTION_CREAT_DATE:
-	if (strlen (optarg) != 16)
-	  {
-	    fprintf (stderr, _("date string must be 16 characters.\n"));
-	    exit (1);
-	  }
-	if (creation_date)
-	  free(creation_date);
-	creation_date = strdup(optarg);
-	break;
-      case OPTION_MODIF_DATE:
-	if (strlen (optarg) != 16)
-	  {
-	    fprintf (stderr, _("date string must be 16 characters.\n"));
-	    exit (1);
-	  }
-	if (modification_date)
-	  free(modification_date);
-	modification_date = strdup(optarg);
-	break;
-      case OPTION_EXPIR_DATE:
-	if (strlen (optarg) != 16)
-	  {
-	    fprintf (stderr, _("date string must be 16 characters.\n"));
-	    exit (1);
-	  }
-	if (expiration_date)
-	  free(expiration_date);
-	expiration_date = strdup(optarg);
-	break;
-      case OPTION_EFFEC_DATE:
-	if (strlen (optarg) != 16)
-	  {
-	    fprintf (stderr, _("date string must be 16 characters.\n"));
-	    exit (1);
-	  }
-	if (effective_date)
-	  free(effective_date);
-	effective_date = strdup(optarg);
-	break;
-      default:
-	usage();
-	exit(1);
-      }
-
-parse_input_files:
-
-#ifdef __NetBSD__
-    {
-	int resource;
-    struct rlimit rlp;
-	if (getrlimit(RLIMIT_DATA,&rlp) == -1)
-		perror (_("Warning: getrlimit"));
-	else {
-		rlp.rlim_cur=33554432;
-		if (setrlimit(RLIMIT_DATA,&rlp) == -1)
-			perror (_("Warning: setrlimit"));
-		}
-	}
-#endif
-#ifdef HAVE_SBRK
-  mem_start = (unsigned long) sbrk(0);
-#endif
-
-  /* if the -hide-joliet option has been given, set the Joliet option */
-  if (!use_Joliet && j_ishidden())
-    use_Joliet++;
-
-  if(verbose > 1) fprintf(stderr,"%s\n", version_string);
-
-  if(cdwrite_data == NULL && merge_image != NULL)
-    {
-      fprintf (stderr, _("Multisession usage bug: Must specify -C if -M is used.\n"));
-      exit (0);
-    }
-
-  if(cdwrite_data != NULL && merge_image == NULL)
-    {
-      fprintf (stderr, _("Warning: -C specified without -M: old session data will not be merged.\n"));
-    }
-
-  /*  The first step is to scan the directory tree, and take some notes */
-
-  scan_tree = argv[optind];
-
-
-  if(!scan_tree){
-	  usage();
-	  exit(1);
-  };
-
-#ifndef VMS
-  if(scan_tree[strlen(scan_tree)-1] != '/') {
-    scan_tree = (char *) e_malloc(strlen(argv[optind])+2);
-    strcpy(scan_tree, argv[optind]);
-    strcat(scan_tree, "/");
-  };
-#endif
-
-  if(use_RockRidge){
-#if 1
-	extension_record = generate_rr_extension_record("RRIP_1991A",
-				       "THE ROCK RIDGE INTERCHANGE PROTOCOL PROVIDES SUPPORT FOR POSIX FILE SYSTEM SEMANTICS",
-				       "PLEASE CONTACT DISC PUBLISHER FOR SPECIFICATION SOURCE.  SEE PUBLISHER IDENTIFIER IN PRIMARY VOLUME DESCRIPTOR FOR CONTACT INFORMATION.", &extension_record_size);
-#else
-	extension_record = generate_rr_extension_record("IEEE_P1282",
-				       "THE IEEE P1282 PROTOCOL PROVIDES SUPPORT FOR POSIX FILE SYSTEM SEMANTICS",
-				       "PLEASE CONTACT THE IEEE STANDARDS DEPARTMENT, PISCATAWAY, NJ, USA FOR THE P1282 SPECIFICATION.", &extension_record_size);
-#endif
-  }
-
-  if (log_file) {
-    FILE *lfp;
-    int i;
-
-    /* open log file - test that we can open OK */
-    if ((lfp = fopen(log_file, "w")) == NULL)
-      error (1, errno, _("can't open logfile: %s"), log_file);
-    fclose(lfp);
-
-    /* redirect all stderr message to log_file */
-    fprintf (stderr, _("re-directing all messages to %s\n"), log_file);
-    fflush(stderr);
-
-    /* associate stderr with the log file */
-    if (freopen(log_file, "w", stderr) == NULL)
-      error (1, errno, _("can't open logfile: %s\n"), log_file);
-    if(verbose > 1) {
-      for (i=0;i<argc;i++)
-       fprintf(stderr,"%s ", argv[i]);
-
-      fprintf(stderr,"\n%s\n", version_string);
-    }
-  }
-
-  /*
-   * See if boot catalog file exists in root directory, if not
-   * we will create it.
-   */
-  if (use_eltorito)
-    init_boot_catalog(argv[optind]);
-
-  /*
-   * Find the device and inode number of the root directory.
-   * Record this in the hash table so we don't scan it more than
-   * once.
-   */
-  stat_filter(argv[optind], &statbuf);
-  add_directory_hash(statbuf.st_dev, STAT_INODE(statbuf));
-
-  memset(&de, 0, sizeof(de));
-
-  de.filedir = root;  /* We need this to bootstrap */
-
-  if (cdwrite_data != NULL && merge_image == NULL) {
-    /* in case we want to add a new session, but don't want to merge old one */
-    get_session_start(NULL);
-  }
-
-  if( merge_image != NULL )
-    {
-      mrootp = merge_isofs(merge_image);
-      if( mrootp == NULL )
-	{
-	  /*
-	   * Complain and die.
-	   */
-	  error (1, 0, _("Unable to open previous session image %s\n"),
-		 merge_image);
-	}
-
-      memcpy(&de.isorec.extent, mrootp->extent, 8);     
-    }
-
-  /*
-   * Create an empty root directory. If we ever scan it for real, we will fill in the
-   * contents.
-   */
-  find_or_create_directory(NULL, "", &de, TRUE);
-
-  /*
-   * Scan the actual directory (and any we find below it)
-   * for files to write out to the output image.  Note - we
-   * take multiple source directories and keep merging them
-   * onto the image.
-   */
-  while(optind < argc)
-    {
-      char * node;
-      struct directory * graft_dir;
-      struct stat        st;
-      char             * short_name;
-      int                status;
-      char   graft_point[1024];
-
-      /*
-       * We would like a syntax like:
-       *
-       * /tmp=/usr/tmp/xxx
-       *
-       * where the user can specify a place to graft each
-       * component of the tree.  To do this, we may have to create
-       * directories along the way, of course.
-       * Secondly, I would like to allow the user to do something
-       * like:
-       *
-       * /home/baz/RMAIL=/u3/users/baz/RMAIL
-       *
-       * so that normal files could also be injected into the tree
-       * at an arbitrary point.
-       *
-       * The idea is that the last component of whatever is being
-       * entered would take the name from the last component of
-       * whatever the user specifies.
-       *
-       * The default will be that the file is injected at the
-       * root of the image tree.
-       */
-      node = strchr(argv[optind], '=');
-      short_name = NULL;
-
-      if( node != NULL )
-	{
-	  char * pnt;
-	  char * xpnt;
-
-	  *node = '\0';
-	  strcpy(graft_point, argv[optind]);
-	  *node = '=';
-	  node++;
-
-	  graft_dir = root;
-	  xpnt = graft_point;
-	  if( *xpnt == PATH_SEPARATOR )
-	    {
-	      xpnt++;
-	    }
-
-	  /*
-	   * Loop down deeper and deeper until we
-	   * find the correct insertion spot.
-	   */
-	  while(1==1)
-	    {
-	      pnt = strchr(xpnt, PATH_SEPARATOR);
-	      if( pnt == NULL )
-		{
-		  if( *xpnt != '\0' )
-		    {
-		      short_name = xpnt;
-		    }
-		  break;
-		}
-	      *pnt = '\0';
-	      graft_dir = find_or_create_directory(graft_dir,
-						   graft_point,
-						   NULL, TRUE);
-	      *pnt = PATH_SEPARATOR;
-	      xpnt = pnt + 1;
-	    }
-	}
-      else
-	{
-	  graft_dir = root;
-	  node = argv[optind];
-	}
-
-      /*
-       * Now see whether the user wants to add a regular file,
-       * or a directory at this point.
-       */
-      status = stat_filter(node, &st);
-      if( status != 0 )
-	{
-	  /*
-	   * This is a fatal error - the user won't be getting what
-	   * they want if we were to proceed.
-	   */
-	  error (1, 0, _("Invalid node - %s\n"), node);
-	}
-      else
-	{
-	  if( S_ISDIR(st.st_mode) )
-	    {
-	      if (!scan_directory_tree(graft_dir, node, &de))
-		{
-		  exit(1);
-		}
-	    }
-	  else
-	    {
-	      if( short_name == NULL )
-		{
-		  short_name = strrchr(node, PATH_SEPARATOR);
-		  if( short_name == NULL || short_name < node )
-		    {
-		      short_name = node;
-		    }
-		  else
-		    {
-		      short_name++;
-		    }
-		}
-	      if( !insert_file_entry(graft_dir, node, short_name) )
-		{
-		 exit(1);
-		}
-	    }
-	}
-
-      optind++;
-    }
-
-
-  /*
-   * Now merge in any previous sessions.  This is driven on the source
-   * side, since we may need to create some additional directories.
-   */
-  if( merge_image != NULL )
-    {
-      merge_previous_session(root, mrootp);
-    }
-
-  /* hide "./rr_moved" if all its contents have been hidden */
-  if (reloc_dir && i_ishidden())
-    hide_reloc_dir();
-
-  /*
-   * Sort the directories in the required order (by ISO9660).  Also,
-   * choose the names for the 8.3 filesystem if required, and do
-   * any other post-scan work.
-   */
-  goof += sort_tree(root);
-
-  if( use_Joliet )
-    {
-      goof += joliet_sort_tree(root);
-    }
-
-  if (goof)
-    error (1, 0, _("Joliet tree sort failed.\n"));
- 
-  /*
-   * Fix a couple of things in the root directory so that everything
-   * is self consistent.
-   */
-  root->self = root->contents;  /* Fix this up so that the path
-				   tables get done right */
-
-  /*
-   * OK, ready to write the file.  Open it up, and generate the thing.
-   */
-  if (print_size){
-	  discimage = fopen("/dev/null", "wb");
-	  if (!discimage)
-	    error (1, errno, _("Unable to open /dev/null\n"));
-  } else if (outfile){
-	  discimage = fopen(outfile, "wb");
-	  if (!discimage)
-	    error (1, errno, _("Unable to open disc image file\n"));
-  } else {
-	  discimage =  stdout;
-
-#if	defined(__CYGWIN32__)
-	setmode(fileno(stdout), O_BINARY);
-#endif
-  }
-
-  /* Now assign addresses on the disc for the path table. */
-
-  path_blocks = (path_table_size + (SECTOR_SIZE - 1)) >> 11;
-  if (path_blocks & 1) path_blocks++;
-
-  jpath_blocks = (jpath_table_size + (SECTOR_SIZE - 1)) >> 11;
-  if (jpath_blocks & 1) jpath_blocks++;
-
-  /*
-   * Start to set up the linked list that we use to track the
-   * contents of the disc.
-   */
-  outputlist_insert(&padblock_desc);
-
-  /*
-   * PVD for disc.
-   */
-  outputlist_insert(&voldesc_desc);
-
-  /*
-   * SVD for El Torito. MUST be immediately after the PVD!
-   */
-  if( use_eltorito)
-    {
-      outputlist_insert(&torito_desc);
-    }
-
-  /*
-   * SVD for Joliet.
-   */
-  if( use_Joliet)
-    {
-      outputlist_insert(&joliet_desc);
-    }
-
-  /*
-   * Finally the last volume desctiptor.
-   */
-  outputlist_insert(&end_vol);
-
-
-  outputlist_insert(&pathtable_desc);
-  if( use_Joliet)
-    {
-      outputlist_insert(&jpathtable_desc);
-    }
-
-  outputlist_insert(&dirtree_desc);
-  if( use_Joliet)
-    {
-      outputlist_insert(&jdirtree_desc);
-    }
-
-  outputlist_insert(&dirtree_clean);
-
-  if(extension_record)
-    {
-      outputlist_insert(&extension_desc);
-    }
-
-  outputlist_insert(&files_desc);
-
-  /*
-   * Allow room for the various headers we will be writing.  There
-   * will always be a primary and an end volume descriptor.
-   */
-  last_extent = session_start;
- 
-  /*
-   * Calculate the size of all of the components of the disc, and assign
-   * extent numbers.
-   */
-  for(opnt = out_list; opnt; opnt = opnt->of_next )
-    {
-      if( opnt->of_size != NULL )
-	{
-	  (*opnt->of_size)(last_extent);
-	}
-    }
-
-  /*
-   * Generate the contents of any of the sections that we want to generate.
-   * Not all of the fragments will do anything here - most will generate the
-   * data on the fly when we get to the write pass.
-   */
-  for(opnt = out_list; opnt; opnt = opnt->of_next )
-    {
-      if( opnt->of_generate != NULL )
-	{
-	  (*opnt->of_generate)();
-	}
-    }
-
-  if( in_image != NULL )
-    {
-      fclose(in_image);
-    }
-
-  /*
-   * Now go through the list of fragments and write the data that corresponds to
-   * each one.
-   */
-  for(opnt = out_list; opnt; opnt = opnt->of_next )
-    {
-      if( opnt->of_write != NULL )
-	{
-	  (*opnt->of_write)(discimage);
-	}
-    }
-
-  if( verbose > 0 )
-    {
-#ifdef HAVE_SBRK
-      fprintf (stderr, _("Max brk space used %x\n"),
-	       (unsigned int)(((unsigned long)sbrk(0)) - mem_start));
-#endif
-      fprintf (stderr, _("%llu extents written (%llu MiB)\n"), last_extent, last_extent >> 9);
-    }
-
-#ifdef VMS
-  return 1;
-#else
-  return 0;
-#endif
-}
-
-void *
-FDECL1(e_malloc, size_t, size)
-{
-  void* pt = 0;
-  if( (size > 0) && ((pt = malloc (size)) == NULL))
-    error (1, errno, "malloc");
-return pt;
-}
diff --git a/util/mkisofs/mkisofs.h b/util/mkisofs/mkisofs.h
deleted file mode 100644
index b699516e9..000000000
--- a/util/mkisofs/mkisofs.h
+++ /dev/null
@@ -1,530 +0,0 @@
-/*
- * Header file mkisofs.h - assorted structure definitions and typecasts.
-
-   Written by Eric Youngdale (1993).
-
-   Copyright 1993 Yggdrasil Computing, Incorporated
-
-   Copyright (C) 2009,2010  Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * 	$Id: mkisofs.h,v 1.20 1999/03/02 04:16:41 eric Exp $
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <prototyp.h>
-#include <sys/stat.h>
-
-#if (defined(ENABLE_NLS) && ENABLE_NLS)
-
-#  include <locale.h>
-#  include <libintl.h>
-
-#else /* ! (defined(ENABLE_NLS) && ENABLE_NLS) */
-
-/* Disabled NLS.
-   The casts to 'const char *' serve the purpose of producing warnings
-   for invalid uses of the value returned from these functions.
-   On pre-ANSI systems without 'const', the config.h file is supposed to
-   contain "#define const".  */
-#  define gettext(Msgid) ((const char *) (Msgid))
-#endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
-
-#define _(str) gettext(str)
-#define N_(str) str
-
-/* This symbol is used to indicate that we do not have things like
-   symlinks, devices, and so forth available.  Just files and dirs */
-
-#ifdef VMS
-#define NON_UNIXFS
-#endif
-
-#ifdef DJGPP
-#define NON_UNIXFS
-#endif
-
-#ifdef VMS
-#include <sys/dir.h>
-#define dirent direct
-#endif
-
-#ifdef _WIN32
-#define NON_UNIXFS
-#endif /* _WIN32 */
-
-#ifndef S_IROTH
-#define S_IROTH 0
-#endif
-
-#ifndef S_IRGRP
-#define S_IRGRP 0
-#endif
-
-#ifndef HAVE_GETUID
-static inline int
-getuid ()
-{
-  return 0;
-}
-#endif
-
-#ifndef HAVE_GETGID
-static inline int
-getgid ()
-{
-  return 0;
-}
-#endif
-
-#ifndef HAVE_LSTAT
-static inline int
-lstat (const char *filename, struct stat *buf)
-{
-  return stat (filename, buf);
-}
-#endif
-
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if defined(HAVE_DIRENT_H)
-# include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
-#else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# if defined(HAVE_SYS_NDIR_H)
-#  include <sys/ndir.h>
-# endif
-# if defined(HAVE_SYS_DIR_H)
-#  include <sys/dir.h>
-# endif
-# if defined(HAVE_NDIR_H)
-#  include <ndir.h>
-# endif
-#endif
-
-#if defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#if defined(HAVE_STRINGS_H)
-#include <strings.h>
-#endif
-#endif
-
-#ifdef ultrix
-extern char *strdup();
-#endif
-
-#ifdef __STDC__
-#define DECL(NAME,ARGS) NAME ARGS
-#define FDECL1(NAME,TYPE0, ARG0) \
-	NAME(TYPE0 ARG0)
-#define FDECL2(NAME,TYPE0, ARG0,TYPE1, ARG1) \
-	NAME(TYPE0 ARG0, TYPE1 ARG1)
-#define FDECL3(NAME,TYPE0, ARG0,TYPE1, ARG1, TYPE2, ARG2) \
-	NAME(TYPE0 ARG0, TYPE1 ARG1, TYPE2 ARG2)
-#define FDECL4(NAME,TYPE0, ARG0,TYPE1, ARG1, TYPE2, ARG2, TYPE3, ARG3) \
-	NAME(TYPE0 ARG0, TYPE1 ARG1, TYPE2 ARG2, TYPE3 ARG3)
-#define FDECL5(NAME,TYPE0, ARG0,TYPE1, ARG1, TYPE2, ARG2, TYPE3, ARG3, TYPE4, ARG4) \
-	NAME(TYPE0 ARG0, TYPE1 ARG1, TYPE2 ARG2, TYPE3 ARG3, TYPE4 ARG4)
-#define FDECL6(NAME,TYPE0, ARG0,TYPE1, ARG1, TYPE2, ARG2, TYPE3, ARG3, TYPE4, ARG4, TYPE5, ARG5) \
-	NAME(TYPE0 ARG0, TYPE1 ARG1, TYPE2 ARG2, TYPE3 ARG3, TYPE4 ARG4, TYPE5 ARG5)
-#else
-#define DECL(NAME,ARGS) NAME()
-#define FDECL1(NAME,TYPE0, ARG0) NAME(ARG0) TYPE0 ARG0;
-#define FDECL2(NAME,TYPE0, ARG0,TYPE1, ARG1) NAME(ARG0, ARG1) TYPE0 ARG0; TYPE1 ARG1;
-#define FDECL3(NAME,TYPE0, ARG0,TYPE1, ARG1, TYPE2, ARG2) \
-	NAME(ARG0, ARG1, ARG2) TYPE0 ARG0; TYPE1 ARG1; TYPE2 ARG2;
-#define FDECL4(NAME,TYPE0, ARG0,TYPE1, ARG1, TYPE2, ARG2, TYPE3, ARG3) \
-	NAME(ARG0, ARG1, ARG2, ARG3, ARG4) TYPE0 ARG0; TYPE1 ARG1; TYPE2 ARG2; TYPE3 ARG3;
-#define FDECL5(NAME,TYPE0, ARG0,TYPE1, ARG1, TYPE2, ARG2, TYPE3, ARG3, TYPE4, ARG4) \
-	NAME(ARG0, ARG1, ARG2, ARG3, ARG4) TYPE0 ARG0; TYPE1 ARG1; TYPE2 ARG2; TYPE3 ARG3; TYPE4 ARG4;
-#define FDECL6(NAME,TYPE0, ARG0,TYPE1, ARG1, TYPE2, ARG2, TYPE3, ARG3, TYPE4, ARG4, TYPE5, ARG5) \
-	NAME(ARG0, ARG1, ARG2, ARG3, ARG4, ARG5) TYPE0 ARG0; TYPE1 ARG1; TYPE2 ARG2; TYPE3 ARG3; TYPE4 ARG4; TYPE5 ARG5;
-#define const
-#endif
-
-
-#ifdef __SVR4
-#include <stdlib.h>
-#else
-extern int optind;
-extern char *optarg;
-/* extern int getopt (int __argc, char **__argv, char *__optstring); */
-#endif
-
-#include "iso9660.h"
-#include "defaults.h"
-
-struct directory_entry{
-  struct directory_entry * next;
-  struct directory_entry * jnext;
-  struct iso_directory_record isorec;
-  uint64_t starting_block;
-  uint64_t size;
-  unsigned short priority;
-  unsigned char jreclen;	/* Joliet record len */
-  char * name;
-  char * table;
-  char * whole_name;
-  struct directory * filedir;
-  struct directory_entry * parent_rec;
-  unsigned int de_flags;
-  ino_t inode;  /* Used in the hash table */
-  dev_t dev;  /* Used in the hash table */
-  unsigned char * rr_attributes;
-  unsigned int rr_attr_size;
-  unsigned int total_rr_attr_size;
-  unsigned int got_rr_name;
-};
-
-struct file_hash{
-  struct file_hash * next;
-  ino_t inode;  /* Used in the hash table */
-  dev_t dev;  /* Used in the hash table */
-  unsigned int starting_block;
-  unsigned int size;
-};
- 
-
-/*
- * This structure is used to control the output of fragments to the cdrom
- * image.  Everything that will be written to the output image will eventually
- * go through this structure.   There are two pieces - first is the sizing where
- * we establish extent numbers for everything, and the second is when we actually
- * generate the contents and write it to the output image.
- *
- * This makes it trivial to extend mkisofs to write special things in the image.
- * All you need to do is hook an additional structure in the list, and the rest
- * works like magic.
- *
- * The three passes each do the following:
- *
- * The 'size' pass determines the size of each component and assigns the extent number
- * for that component.
- *
- * The 'generate' pass will adjust the contents and pointers as required now that extent
- * numbers are assigned.   In some cases, the contents of the record are also generated.
- *
- * The 'write' pass actually writes the data to the disc.
- */
-struct	output_fragment
-{
-  struct output_fragment * of_next;
-#ifdef __STDC__
-  int                      (*of_size)(int);
-  int	                   (*of_generate)(void);
-  int	                   (*of_write)(FILE *);
-#else
-  int                      (*of_size)();
-  int	                   (*of_generate)();
-  int	                   (*of_write)();
-#endif
-};
-
-extern struct output_fragment * out_list;
-extern struct output_fragment * out_tail;
-
-extern struct output_fragment padblock_desc;
-extern struct output_fragment voldesc_desc;
-extern struct output_fragment joliet_desc;
-extern struct output_fragment torito_desc;
-extern struct output_fragment end_vol;
-extern struct output_fragment pathtable_desc;
-extern struct output_fragment jpathtable_desc;
-extern struct output_fragment dirtree_desc;
-extern struct output_fragment dirtree_clean;
-extern struct output_fragment jdirtree_desc;
-extern struct output_fragment extension_desc;
-extern struct output_fragment files_desc;
-
-/*
- * This structure describes one complete directory.  It has pointers
- * to other directories in the overall tree so that it is clear where
- * this directory lives in the tree, and it also must contain pointers
- * to the contents of the directory.  Note that subdirectories of this
- * directory exist twice in this stucture.  Once in the subdir chain,
- * and again in the contents chain.
- */
-struct directory{
-  struct directory * next;  /* Next directory at same level as this one */
-  struct directory * subdir; /* First subdirectory in this directory */
-  struct directory * parent;
-  struct directory_entry * contents;
-  struct directory_entry * jcontents;
-  struct directory_entry * self;
-  char * whole_name;  /* Entire path */
-  char * de_name;  /* Entire path */
-  unsigned int ce_bytes;  /* Number of bytes of CE entries reqd for this dir */
-  unsigned int depth;
-  unsigned int size;
-  unsigned int extent;
-  unsigned int jsize;
-  unsigned int jextent;
-  unsigned short path_index;
-  unsigned short jpath_index;
-  unsigned short dir_flags;
-  unsigned short dir_nlink;
-};
-
-extern int goof;
-extern struct directory * root;
-extern struct directory * reloc_dir;
-extern uint64_t next_extent;
-extern uint64_t last_extent;
-extern uint64_t last_extent_written;
-extern uint64_t session_start;
-
-extern unsigned int path_table_size;
-extern unsigned int path_table[4];
-extern unsigned int path_blocks;
-extern char * path_table_l;
-extern char * path_table_m;
-
-extern unsigned int jpath_table_size;
-extern unsigned int jpath_table[4];
-extern unsigned int jpath_blocks;
-extern char * jpath_table_l;
-extern char * jpath_table_m;
-
-extern struct iso_directory_record root_record;
-extern struct iso_directory_record jroot_record;
-
-extern int use_eltorito;
-extern int use_embedded_boot;
-extern int use_protective_msdos_label;
-extern int use_eltorito_emul_floppy;
-extern int use_boot_info_table;
-extern int use_RockRidge;
-extern int use_Joliet;
-extern int rationalize;
-extern int follow_links;
-extern int verbose;
-extern int all_files;
-extern int generate_tables;
-extern int print_size;
-extern int split_output;
-extern int omit_period;
-extern int omit_version_number;
-extern int transparent_compression;
-extern unsigned int RR_relocation_depth;
-extern int full_iso9660_filenames;
-extern int split_SL_component;
-extern int split_SL_field;
-
-/* tree.c */
-extern int DECL(stat_filter, (char *, struct stat *));
-extern int DECL(lstat_filter, (char *, struct stat *));
-extern int DECL(sort_tree,(struct directory *));
-extern struct directory *
-           DECL(find_or_create_directory,(struct directory *, const char *,
-					  struct directory_entry * self, int));
-extern void DECL (finish_cl_pl_entries, (void));
-extern int DECL(scan_directory_tree,(struct directory * this_dir,
-				     char * path,
-				     struct directory_entry * self));
-extern int DECL(insert_file_entry,(struct directory *, char *,
-				   char *));
-
-extern void DECL(generate_iso9660_directories,(struct directory *, FILE*));
-extern void DECL(dump_tree,(struct directory * node));
-extern struct directory_entry * DECL(search_tree_file, (struct
-				directory * node,char * filename));
-extern void DECL(update_nlink_field,(struct directory * node));
-extern void DECL (init_fstatbuf, (void));
-extern struct stat root_statbuf;
-
-/* eltorito.c */
-extern void DECL(init_boot_catalog, (const char * path ));
-extern void DECL(get_torito_desc, (struct eltorito_boot_descriptor * path ));
-
-/* write.c */
-extern int DECL(get_731,(char *));
-extern int DECL(get_733,(char *));
-extern int DECL(isonum_733,(unsigned char *));
-extern void DECL(set_723,(char *, unsigned int));
-extern void DECL(set_731,(char *, unsigned int));
-extern void DECL(set_721,(char *, unsigned int));
-extern void DECL(set_733,(char *, unsigned int));
-extern int  DECL(sort_directory,(struct directory_entry **));
-extern void DECL(generate_one_directory,(struct directory *, FILE*));
-extern void DECL(memcpy_max, (char *, char *, int));
-extern int DECL(oneblock_size, (int starting_extent));
-extern struct iso_primary_descriptor vol_desc;
-extern void DECL(xfwrite, (void * buffer, uint64_t count, uint64_t size, FILE * file));
-extern void DECL(set_732, (char * pnt, unsigned int i));
-extern void DECL(set_722, (char * pnt, unsigned int i));
-extern void DECL(outputlist_insert, (struct output_fragment * frag));
-
-/*
- * Set by user command-line to override default date values
- */
-
-extern char *creation_date;
-extern char *modification_date;
-extern char *expiration_date;
-extern char *effective_date;
-
-/* multi.c */
-
-extern FILE * in_image;
-extern struct iso_directory_record *
-	DECL(merge_isofs,(char * path));
-
-extern int DECL(free_mdinfo, (struct directory_entry **, int len));
-
-extern struct directory_entry **
-	DECL(read_merging_directory,(struct iso_directory_record *, int*));
-extern void
-	DECL(merge_remaining_entries, (struct directory *,
-				       struct directory_entry **, int));
-extern int
-	DECL(merge_previous_session, (struct directory *,
-				      struct iso_directory_record *));
-
-extern int  DECL(get_session_start, (int *));
-
-/* joliet.c */
-int DECL(joliet_sort_tree, (struct directory * node));
-
-/* match.c */
-extern int DECL(matches, (char *));
-extern void DECL(add_match, (char *));
-
-/* files.c */
-struct dirent * DECL(readdir_add_files, (char **, char *, DIR *));
-
-/* */
-
-extern int DECL(iso9660_file_length,(const char* name,
-			       struct directory_entry * sresult, int flag));
-extern int DECL(iso9660_date,(char *, time_t));
-extern void DECL(add_hash,(struct directory_entry *));
-extern struct file_hash * DECL(find_hash,(dev_t, ino_t));
-extern void DECL(add_directory_hash,(dev_t, ino_t));
-extern struct file_hash * DECL(find_directory_hash,(dev_t, ino_t));
-extern void DECL (flush_file_hash, (void));
-extern int DECL(delete_file_hash,(struct directory_entry *));
-extern struct directory_entry * DECL(find_file_hash,(char *));
-extern void DECL(add_file_hash,(struct directory_entry *));
-extern int DECL(generate_rock_ridge_attributes,(char *, char *,
-					  struct directory_entry *,
-					  struct stat *, struct stat *,
-					  int  deep_flag));
-extern char * DECL(generate_rr_extension_record,(char * id,  char  * descriptor,
-				    char * source, int  * size));
-
-extern int    DECL(check_prev_session, (struct directory_entry **, int len,
-				     struct directory_entry *,
-				     struct stat *,
-				     struct stat *,
-				     struct directory_entry **));
-
-#ifdef	USE_SCG
-/* scsi.c */
-#ifdef __STDC__
-extern	int	readsecs(int startsecno, void *buffer, int sectorcount);
-extern	int	scsidev_open(char *path);
-#else
-extern	int	readsecs();
-extern	int	scsidev_open();
-#endif
-#endif
-
-extern char * extension_record;
-extern int extension_record_extent;
-extern int n_data_extents;
-
-/* These are a few goodies that can be specified on the command line, and are
-   filled into the root record */
-
-extern char *preparer;
-extern char *publisher;
-extern char *copyright;
-extern char *biblio;
-extern char *abstract;
-extern char *appid;
-extern char *volset_id;
-extern char *system_id;
-extern char *volume_id;
-extern char *boot_catalog;
-extern char *boot_image;
-extern char *boot_image_embed;
-extern int volume_set_size;
-extern int volume_sequence_number;
-
-extern void * DECL(e_malloc,(size_t));
-
-
-#define SECTOR_SIZE (2048)
-#define ROUND_UP(X)    ((X + (SECTOR_SIZE - 1)) & ~(SECTOR_SIZE - 1))
-
-#define NEED_RE 1
-#define NEED_PL  2
-#define NEED_CL 4
-#define NEED_CE 8
-#define NEED_SP 16
-
-#define PREV_SESS_DEV (sizeof(dev_t) >= 4 ? 0x7ffffffd : 0x7ffd)
-#define TABLE_INODE (sizeof(ino_t) >= 4 ? 0x7ffffffe : 0x7ffe)
-#define UNCACHED_INODE (sizeof(ino_t) >= 4 ? 0x7fffffff : 0x7fff)
-#define UNCACHED_DEVICE (sizeof(dev_t) >= 4 ? 0x7fffffff : 0x7fff)
-
-#ifdef VMS
-#define STAT_INODE(X) (X.st_ino[0])
-#define PATH_SEPARATOR ']'
-#define SPATH_SEPARATOR ""
-#else
-#define STAT_INODE(X) (X.st_ino)
-#define PATH_SEPARATOR '/'
-#define SPATH_SEPARATOR "/"
-#endif
-
-/*
- * When using multi-session, indicates that we can reuse the
- * TRANS.TBL information for this directory entry.  If this flag
- * is set for all entries in a directory, it means we can just
- * reuse the TRANS.TBL and not generate a new one.
- */
-#define SAFE_TO_REUSE_TABLE_ENTRY  0x01
-#define DIR_HAS_DOT		   0x02
-#define DIR_HAS_DOTDOT		   0x04
-#define INHIBIT_JOLIET_ENTRY	   0x08
-#define INHIBIT_RR_ENTRY	   0x10
-#define RELOCATED_DIRECTORY	   0x20
-#define INHIBIT_ISO9660_ENTRY	   0x40
-
-/*
- * Volume sequence number to use in all of the iso directory records.
- */
-#define DEF_VSN		1
-
-/*
- * Make sure we have a definition for this.  If not, take a very conservative
- * guess.  From what I can tell SunOS is the only one with this trouble.
- */
-#ifndef NAME_MAX
-#ifdef FILENAME_MAX
-#define NAME_MAX	FILENAME_MAX
-#else
-#define NAME_MAX	128
-#endif
-#endif
diff --git a/util/mkisofs/msdos_partition.h b/util/mkisofs/msdos_partition.h
deleted file mode 100644
index 13985f7bb..000000000
--- a/util/mkisofs/msdos_partition.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2004,2007  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/>.
- */
-
-#ifndef MSDOS_PARTITION_H
-#define MSDOS_PARTITION_H	1
-
-#include <stdint.h>
-
-/* The signature.  */
-#define MSDOS_PARTITION_SIGNATURE		((0xaa << 8) | 0x55)
-
-/* This is not a flag actually, but used as if it were a flag.  */
-#define MSDOS_PARTITION_TYPE_HIDDEN_FLAG	0x10
-
-/* The partition entry.  */
-struct msdos_partition_entry
-{
-  /* If active, 0x80, otherwise, 0x00.  */
-  uint8_t flag;
-
-  /* The head of the start.  */
-  uint8_t start_head;
-
-  /* (S | ((C >> 2) & 0xC0)) where S is the sector of the start and C
-     is the cylinder of the start. Note that S is counted from one.  */
-  uint8_t start_sector;
-
-  /* (C & 0xFF) where C is the cylinder of the start.  */
-  uint8_t start_cylinder;
-
-  /* The partition type.  */
-  uint8_t type;
-
-  /* The end versions of start_head, start_sector and start_cylinder,
-     respectively.  */
-  uint8_t end_head;
-  uint8_t end_sector;
-  uint8_t end_cylinder;
-
-  /* The start sector. Note that this is counted from zero.  */
-  uint32_t start;
-
-  /* The length in sector units.  */
-  uint32_t length;
-} __attribute__ ((packed));
-
-/* The structure of MBR.  */
-struct msdos_partition_mbr
-{
-  /* The code area (actually, including BPB).  */
-  uint8_t code[446];
-
-  /* Four partition entries.  */
-  struct msdos_partition_entry entries[4];
-
-  /* The signature 0xaa55.  */
-  uint16_t signature;
-} __attribute__ ((packed));
-
-#endif
diff --git a/util/mkisofs/multi.c b/util/mkisofs/multi.c
deleted file mode 100644
index d92f14530..000000000
--- a/util/mkisofs/multi.c
+++ /dev/null
@@ -1,1201 +0,0 @@
-/*
- * File multi.c - scan existing iso9660 image and merge into
- * iso9660 filesystem.  Used for multisession support.
- *
- * Written by Eric Youngdale (1996).
- *
- * Copyright (C) 2009  Free Software Foundation, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include "config.h"
-
-#ifndef VMS
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#else
-#include <sys/file.h>
-#include <vms/fabdef.h>
-#include "vms.h"
-extern char * strdup(const char *);
-#endif
-
-#include "mkisofs.h"
-#include "iso9660.h"
-
-#define TF_CREATE 1
-#define TF_MODIFY 2
-#define TF_ACCESS 4
-#define TF_ATTRIBUTES 8
-
-static int  isonum_711 __PR((unsigned char * p));
-static int  isonum_721 __PR((unsigned char * p));
-static int  isonum_723 __PR((unsigned char * p));
-static int  isonum_731 __PR((unsigned char * p));
-
-static int  DECL(merge_old_directory_into_tree, (struct directory_entry *,
-						 struct directory *));
-
-#ifdef	__STDC__
-static int
-isonum_711 (unsigned char * p)
-#else
-static int
-isonum_711 (p)
-	unsigned char * p;
-#endif
-{
-	return (*p & 0xff);
-}
-
-#ifdef	__STDC__
-static int
-isonum_721 (unsigned char * p)
-#else
-static int
-isonum_721 (p)
-	unsigned char * p;
-#endif
-{
-	return ((p[0] & 0xff) | ((p[1] & 0xff) << 8));
-}
-
-#ifdef	__STDC__
-static int
-isonum_723 (unsigned char * p)
-#else
-static int
-isonum_723 (p)
-	unsigned char * p;
-#endif
-{
-#if 0
-	if (p[0] != p[3] || p[1] != p[2]) {
-		fprintf (stderr, "invalid format 7.2.3 number\n");
-		exit (1);
-	}
-#endif
-	return (isonum_721 (p));
-}
-
-#ifdef	__STDC__
-static int
-isonum_731 (unsigned char * p)
-#else
-static int
-isonum_731 (p)
-	unsigned char * p;
-#endif
-{
-	return ((p[0] & 0xff)
-		| ((p[1] & 0xff) << 8)
-		| ((p[2] & 0xff) << 16)
-		| ((p[3] & 0xff) << 24));
-}
-
-#ifdef	__STDC__
-int
-isonum_733 (unsigned char * p)
-#else
-int
-isonum_733 (p)
-	unsigned char * p;
-#endif
-{
-	return (isonum_731 (p));
-}
-
-FILE * in_image = NULL;
-
-#ifndef	USE_SCG
-/*
- * Don't define readsecs if mkisofs is linked with
- * the SCSI library.
- * readsecs() will be implemented as SCSI command in this case.
- *
- * Use global var in_image directly in readsecs()
- * the SCSI equivalent will not use a FILE* for I/O.
- *
- * The main point of this pointless abstraction is that Solaris won't let
- * you read 2K sectors from the cdrom driver.  The fact that 99.9% of the
- * discs out there have a 2K sectorsize doesn't seem to matter that much.
- * Anyways, this allows the use of a scsi-generics type of interface on
- * Solaris.
- */
-#ifdef	__STDC__
-static int
-readsecs(int startsecno, void *buffer, int sectorcount)
-#else
-static int
-readsecs(startsecno, buffer, sectorcount)
-	int	startsecno;
-	void	*buffer;
-	int	sectorcount;
-#endif
-{
-	int	f = fileno(in_image);
-
-	if (lseek(f, (off_t)startsecno * SECTOR_SIZE, 0) == (off_t)-1)
-	  error (10, errno, _("Seek error on old image\n"));
-	return (read(f, buffer, sectorcount * SECTOR_SIZE));
-}
-#endif
-
-/*
- * Parse the RR attributes so we can find the file name.
- */
-static int
-FDECL3(parse_rr, unsigned char *, pnt, int, len, struct directory_entry *,dpnt)
-{
-	int cont_extent, cont_offset, cont_size;
-	char name_buf[256];
-
-	cont_extent = cont_offset = cont_size = 0;
-
-	while(len >= 4){
-		if(pnt[3] != 1) {
-		  fprintf (stderr, _("**Bad RR version attribute"));
-		  return -1;
-		};
-		if(strncmp((char *) pnt, "NM", 2) == 0) {
-		  strncpy(name_buf, (char *) pnt+5, pnt[2] - 5);
-		  name_buf[pnt[2] - 5] = 0;
-		  dpnt->name = strdup(name_buf);
-		  dpnt->got_rr_name = 1;
-		  return 0;
-		}
-
-		if(strncmp((char *) pnt, "CE", 2) == 0) {
-			cont_extent = isonum_733(pnt+4);
-			cont_offset = isonum_733(pnt+12);
-			cont_size = isonum_733(pnt+20);
-		};
-
-		len -= pnt[2];
-		pnt += pnt[2];
-		if(len <= 3 && cont_extent) {
-		  unsigned char sector[SECTOR_SIZE];
-		  readsecs(cont_extent, sector, 1);
-		  parse_rr(&sector[cont_offset], cont_size, dpnt);
-		};
-	};
-
-	/* Fall back to the iso name if no RR name found */
-	if (dpnt->name == NULL) {
-	  char *cp;
-
-	  strcpy(name_buf, dpnt->isorec.name);
-	  cp = strchr(name_buf, ';');
-	  if (cp != NULL) {
-	    *cp = '\0';
-	  }
-
-	  dpnt->name = strdup(name_buf);
-	}
-
-	return 0;
-} /* parse_rr */
-
-
-static int
-FDECL4(check_rr_dates, struct directory_entry *, dpnt,
-       struct directory_entry *, current,
-       struct stat *, statbuf,
-       struct stat *,lstatbuf)
-{
-	int cont_extent, cont_offset, cont_size;
-	int offset;
-	unsigned char * pnt;
-	int len;
-	int same_file;
-	int same_file_type;
-	mode_t mode;
-	char time_buf[7];
-
-
-	cont_extent = cont_offset = cont_size = 0;
-	same_file = 1;
-	same_file_type = 1;
-
-	pnt = dpnt->rr_attributes;
-	len = dpnt->rr_attr_size;
-	/*
-	 * We basically need to parse the rr attributes again, and
-	 * dig out the dates and file types.
-	 */
-	while(len >= 4){
-		if(pnt[3] != 1) {
-		  fprintf (stderr, _("**Bad RR version attribute"));
-		  return -1;
-		};
-
-		/*
-		 * If we have POSIX file modes, make sure that the file type
-		 * is the same.  If it isn't, then we must always
-		 * write the new file.
-		 */
-		if(strncmp((char *) pnt, "PX", 2) == 0) {
-		  mode = isonum_733(pnt + 4);
-		  if( (lstatbuf->st_mode & S_IFMT) != (mode & S_IFMT) )
-		    {
-		      same_file_type = 0;
-		      same_file = 0;
-		    }
-		}
-
-		if(strncmp((char *) pnt, "TF", 2) == 0) {
-		  offset = 5;
-		  if( pnt[4] & TF_CREATE )
-		    {
-		      iso9660_date((char *) time_buf, lstatbuf->st_ctime);
-		      if(memcmp(time_buf, pnt+offset, 7) == 0)
-			same_file = 0;
-		      offset += 7;
-		    }
-		  if( pnt[4] & TF_MODIFY )
-		    {
-		      iso9660_date((char *) time_buf, lstatbuf->st_mtime);
-		      if(memcmp(time_buf, pnt+offset, 7) == 0)
-			same_file = 0;
-		      offset += 7;
-		    }
-		}
-
-		if(strncmp((char *) pnt, "CE", 2) == 0) {
-			cont_extent = isonum_733(pnt+4);
-			cont_offset = isonum_733(pnt+12);
-			cont_size = isonum_733(pnt+20);
-		};
-
-		len -= pnt[2];
-		pnt += pnt[2];
-		if(len <= 3 && cont_extent) {
-		  unsigned char sector[SECTOR_SIZE];
-
-		  readsecs(cont_extent, sector, 1);
-		  parse_rr(&sector[cont_offset], cont_size, dpnt);
-		};
-	};
-
-	/*
-	 * If we have the same fundamental file type, then it is clearly
-	 * safe to reuse the TRANS.TBL entry.
-	 */
-	if( same_file_type )
-	  {
-	    current->de_flags |= SAFE_TO_REUSE_TABLE_ENTRY;
-	  }
-
-	return same_file;
-}
-
-struct directory_entry **
-FDECL2(read_merging_directory, struct iso_directory_record *, mrootp,
-       int *, nent)
-{
-  unsigned char			* cpnt;
-  unsigned char			* cpnt1;
-  char				* dirbuff;
-  int				  i;
-  struct iso_directory_record	* idr;
-  int				  len;
-  struct directory_entry	**pnt;
-  int				  rlen;
-  struct directory_entry	**rtn;
-  int				  seen_rockridge;
-  unsigned char			* tt_buf;
-  int				  tt_extent;
-  int				  tt_size;
-
-  static int warning_given = 0;
-
-  /*
-   * First, allocate a buffer large enough to read in the entire
-   * directory.
-   */
-  dirbuff = (char *) e_malloc(isonum_733((unsigned char *)mrootp->size));
-
-  readsecs(isonum_733((unsigned char *)mrootp->extent), dirbuff,
-	   isonum_733((unsigned char *)mrootp->size)/SECTOR_SIZE);
-
-  /*
-   * Next look over the directory, and count up how many entries we
-   * have.
-   */
-  len = isonum_733((unsigned char *)mrootp->size);
-  i = 0;
-  *nent = 0;
-  while(i < len )
-    {
-      idr = (struct iso_directory_record *) &dirbuff[i];
-      if(idr->length[0] == 0)
-	{
-	  i = (i + SECTOR_SIZE - 1) & ~(SECTOR_SIZE - 1);
-	  continue;
-	}
-      (*nent)++;
-      i += idr->length[0];
-    }
-
-  /*
-   * Now allocate the buffer which will hold the array we are
-   * about to return.
-   */
-  rtn = (struct directory_entry **) e_malloc(*nent * sizeof(*rtn));
-
-  /*
-   * Finally, scan the directory one last time, and pick out the
-   * relevant bits of information, and store it in the relevant
-   * bits of the structure.
-   */
-  i = 0;
-  pnt = rtn;
-  tt_extent = 0;
-  seen_rockridge = 0;
-  tt_size = 0;
-  while(i < len )
-    {
-      idr = (struct iso_directory_record *) &dirbuff[i];
-      if(idr->length[0] == 0)
-	{
-	  i = (i + SECTOR_SIZE - 1) & ~(SECTOR_SIZE - 1);
-	  continue;
-	}
-      *pnt = (struct directory_entry *) e_malloc(sizeof(**rtn));
-      (*pnt)->next = NULL;
-      (*pnt)->isorec = *idr;
-      (*pnt)->starting_block = isonum_733((unsigned char *)idr->extent);
-      (*pnt)->size = isonum_733((unsigned char *)idr->size);
-      (*pnt)->priority = 0;
-      (*pnt)->name = NULL;
-      (*pnt)->got_rr_name = 0;
-      (*pnt)->table = NULL;
-      (*pnt)->whole_name = NULL;
-      (*pnt)->filedir = NULL;
-      (*pnt)->parent_rec = NULL;
-      /*
-       * Set this information so that we correctly cache previous
-       * session bits of information.
-       */
-      (*pnt)->inode = (*pnt)->starting_block;
-      (*pnt)->dev = PREV_SESS_DEV;
-      (*pnt)->rr_attributes = NULL;
-      (*pnt)->rr_attr_size = 0;
-      (*pnt)->total_rr_attr_size = 0;
-      (*pnt)->de_flags = SAFE_TO_REUSE_TABLE_ENTRY;
-
-      /*
-       * Check for and parse any RR attributes for the file.
-       * All we are really looking for here is the original name
-       * of the file.
-       */
-      rlen = idr->length[0] & 0xff;
-      cpnt = (unsigned char *) idr;
-     
-      rlen -= sizeof(struct iso_directory_record);
-      cpnt += sizeof(struct iso_directory_record);
-     
-      rlen += sizeof(idr->name);
-      cpnt -= sizeof(idr->name);
-     
-      rlen -= idr->name_len[0];
-      cpnt += idr->name_len[0];
-     
-      if((idr->name_len[0] & 1) == 0){
-	cpnt++;
-	rlen--;
-      };
-
-      if( rlen != 0 )
-	{
-	  (*pnt)->total_rr_attr_size =  (*pnt)->rr_attr_size = rlen;
-	  (*pnt)->rr_attributes = e_malloc(rlen);
-	  memcpy((*pnt)->rr_attributes,  cpnt, rlen);
-	  seen_rockridge = 1;
-	}
-
-      /*
-       * Now zero out the remainder of the name field.
-       */
-      cpnt = (unsigned char *) &(*pnt)->isorec.name;
-      cpnt += idr->name_len[0];
-      memset(cpnt, 0, sizeof((*pnt)->isorec.name) - idr->name_len[0]);
-
-      parse_rr((*pnt)->rr_attributes, rlen, *pnt);
-     
-      if(    ((*pnt)->isorec.name_len[0] == 1)
-	  && (    ((*pnt)->isorec.name[0] == 0)
-	       || ((*pnt)->isorec.name[0] == 1)) )
-	{
-	  if( (*pnt)->name != NULL )
-	    {
-	      free((*pnt)->name);
-	    }
-	  if( (*pnt)->whole_name != NULL )
-	    {
-	      free((*pnt)->whole_name);
-	    }
-	  if( (*pnt)->isorec.name[0] == 0 )
-	    {
-	      (*pnt)->name = strdup(".");
-	    }
-	  else
-	    {
-	      (*pnt)->name = strdup("..");
-	    }
-	}
-
-#ifdef DEBUG
-      fprintf(stderr, "got DE name: %s\n", (*pnt)->name);
-#endif
-
-      if( strncmp(idr->name, "TRANS.TBL", 9) == 0)
-	{
-	  if( (*pnt)->name != NULL )
-	    {
-	      free((*pnt)->name);
-	    }
-	  if( (*pnt)->whole_name != NULL )
-	    {
-	      free((*pnt)->whole_name);
-	    }
-	  (*pnt)->name = strdup("<translation table>");
-	  tt_extent = isonum_733((unsigned char *)idr->extent);
-	  tt_size = isonum_733((unsigned char *)idr->size);
-	}
-     
-      pnt++;
-      i += idr->length[0];
-    }
-
-  /*
-   * If there was a TRANS.TBL;1 entry, then grab it, read it, and use it
-   * to get the filenames of the files.  Also, save the table info, just
-   * in case we need to use it.
-   */
-  if( tt_extent != 0 && tt_size != 0 )
-    {
-      tt_buf = (unsigned char *) e_malloc(tt_size);
-      readsecs(tt_extent, tt_buf, tt_size/SECTOR_SIZE);
-
-      /*
-       * Loop through the file, examine each entry, and attempt to
-       * attach it to the correct entry.
-       */
-      cpnt = tt_buf;
-      cpnt1 = tt_buf;
-      while( cpnt - tt_buf < tt_size )
-	{
-	  while(*cpnt1 != '\n' && *cpnt1 != '\0')  cpnt1++;
-	  *cpnt1 = '\0';
-
-	  for(pnt = rtn, i = 0; i <*nent; i++, pnt++)
-	    {
-	      rlen = isonum_711((*pnt)->isorec.name_len);
-	      if( strncmp((char *) cpnt + 2, (*pnt)->isorec.name,
-			  rlen) == 0
-		  && cpnt[2+rlen] == ' ')
-		{
-		  (*pnt)->table = e_malloc(strlen((char*)cpnt) - 33);
-		  sprintf((*pnt)->table, "%c\t%s\n",
-			  *cpnt, cpnt+37);
-		  if( !(*pnt)->got_rr_name )
-		    {
-		      if ((*pnt)->name != NULL) {
-			free((*pnt)->name);
-		      }
-		      (*pnt)->name = strdup((char *) cpnt+37);
-		    }
-		  break;
-		}
-	    }
-	  cpnt = cpnt1 + 1;
-	  cpnt1 = cpnt;
-	}
-     
-      free(tt_buf);
-    }
-  else if( !seen_rockridge && !warning_given )
-    {
-      /*
-       * Warn the user that iso (8.3) names were used because neither
-       * Rock Ridge (-R) nor TRANS.TBL (-T) name translations were found.
-       */
-      fprintf (stderr, _("Warning: Neither Rock Ridge (-R) nor TRANS.TBL (-T) "
-			 "name translations were found on previous session. "
-			 "ISO (8.3) file names have been used instead.\n"));
-      warning_given = 1;
-    }
-
-  if( dirbuff != NULL )
-    {
-      free(dirbuff);
-    }
- 
-  return rtn;
-} /* read_merging_directory */
-
-/*
- * Free any associated data related to the structures.
- */
-int
-FDECL2(free_mdinfo, struct directory_entry **  , ptr, int, len )
-{
-  int		i;
-  struct directory_entry **p;
-
-  p = ptr;
-  for(i=0; i<len; i++, p++)
-    {
-      /*
-       * If the tree-handling code decided that it needed an entry,
-       * it will have removed it from the list.  Thus we must allow
-       * for null pointers here.
-       */
-      if( *p == NULL )
-	{
-	  continue;
-	}
-
-      if( (*p)->name != NULL )
-	{
-	  free((*p)->name);
-	}
-
-      if( (*p)->whole_name != NULL )
-	{
-	  free((*p)->whole_name);
-	}
-
-      if( (*p)->rr_attributes != NULL )
-	{
-	  free((*p)->rr_attributes);
-	}
-
-      if( (*p)->table != NULL )
-	{
-	  free((*p)->table);
-	}
-
-      free(*p);
-
-    }
-
-  free(ptr);
-  return 0;
-}
-
-/*
- * Search the list to see if we have any entries from the previous
- * session that match this entry.  If so, copy the extent number
- * over so we don't bother to write it out to the new session.
- */
-
-int
-FDECL6(check_prev_session, struct directory_entry **  , ptr, int, len,
-       struct directory_entry *, curr_entry,
-       struct stat *, statbuf, struct stat *, lstatbuf,
-       struct directory_entry **, odpnt)
-{
-  int		i;
-
-  for( i=0; i < len; i++ )
-    {
-      if( ptr[i] == NULL )
-	{
-	  continue;
-	}
-
-#if 0
-      if( ptr[i]->name != NULL && ptr[i]->isorec.name_len[0] == 1
-	  && ptr[i]->name[0] == '\0' )
-	{
-	  continue;
-	}
-      if( ptr[i]->name != NULL && ptr[i]->isorec.name_len[0] == 1
-	  && ptr[i]->name[0] == 1)
-	{
-	  continue;
-	}
-#else
-      if( ptr[i]->name != NULL && strcmp(ptr[i]->name, ".") == 0 )
-	{
-	  continue;
-	}
-      if( ptr[i]->name != NULL  && strcmp(ptr[i]->name, "..") == 0 )
-	{
-	  continue;
-	}
-#endif
-
-      if(    ptr[i]->name != NULL
-	  && strcmp(ptr[i]->name, curr_entry->name) != 0 )
-	{
-	  continue;
-	}
-
-      /*
-       * We know that the files have the same name.  If they also have
-       * the same file type (i.e. file, dir, block, etc), then we
-       * can safely reuse the TRANS.TBL entry for this file.
-       * The check_rr_dates function will do this for us.
-       *
-       * Verify that the file type and dates are consistent.
-       * If not, we probably have a different file, and we need
-       * to write it out again.
-       */
-      if(    (ptr[i]->rr_attributes != NULL)
-	  && (check_rr_dates(ptr[i], curr_entry, statbuf, lstatbuf)) )
-	{
-	  goto found_it;
-	}
-
-
-      /*
-       * Verify size and timestamp.  If rock ridge is in use, we need
-       * to compare dates from RR too.  Directories are special, we
-       * calculate their size later.
-       */
-      if(     (curr_entry->isorec.flags[0] & 2) == 0
-	  &&  ptr[i]->size != curr_entry->size )
-	{
-	  goto found_it;
-	}
-
-      if( memcmp(ptr[i]->isorec.date, curr_entry->isorec.date,7) != 0 )
-	{
-	  goto found_it;
-	}
-
-      /*
-       * Never ever reuse directory extents.  See comments in
-       * tree.c for an explaination of why this must be the case.
-       */
-      if( (curr_entry->isorec.flags[0] & 2) != 0 )
-	{
-	  goto found_it;
-	}
-
-      memcpy(curr_entry->isorec.extent, ptr[i]->isorec.extent, 8);
-      curr_entry->de_flags |= SAFE_TO_REUSE_TABLE_ENTRY;
-      goto found_it;
-    }
-  return 0;
-
-found_it:
-  if( odpnt != NULL )
-    {
-      *odpnt = ptr[i];
-    }
-  else
-    {
-      free(ptr[i]);
-    }
-  ptr[i] = NULL;
-  return 0;
-}
-
-/*
- * merge_isofs:  Scan an existing image, and return a pointer
- * to the root directory for this image.
- */
-struct iso_directory_record * FDECL1(merge_isofs, char *, path)
-{
-  char				  buffer[SECTOR_SIZE];
-  int				  file_addr;
-  int				  i;
-  struct iso_primary_descriptor * pri = NULL;
-  struct iso_directory_record   * rootp;
-  struct iso_volume_descriptor  * vdp;
-
-  /*
-   * Start by opening up the image and searching for the volume header.
-   * Ultimately, we need to search for volume headers in multiple places
-   * because we might be starting with a multisession image.
-   * FIXME(eric).
-   */
-
-#ifndef	USE_SCG
-  in_image = fopen(path, "rb");
-  if( in_image == NULL )
-    {
-      return NULL;
-    }
-#else
-  if (strchr(path, '/')) {
-	in_image = fopen(path, "rb");
-	if( in_image == NULL ) {
-		return NULL;
-	}
-  } else {
-	if (scsidev_open(path) < 0)
-		return NULL;
-  }
-#endif
-
-  get_session_start(&file_addr);
-
-  for(i = 0; i< 100; i++)
-    {
-      if (readsecs(file_addr/SECTOR_SIZE, &buffer,
-		   sizeof(buffer)/SECTOR_SIZE) != sizeof(buffer))
-	error (10, errno, _("Read error on old image %s\n"), path);
-
-      vdp = (struct iso_volume_descriptor *)buffer;
-
-      if(    (strncmp(vdp->id, ISO_STANDARD_ID, sizeof vdp->id) == 0)
-	  && (isonum_711((unsigned char *) vdp->type) == ISO_VD_PRIMARY) )
-	{
-	  break;
-	}
-      file_addr += SECTOR_SIZE;
-    }
-
-  if( i == 100 )
-    {
-      return NULL;
-    }
-
-  pri = (struct iso_primary_descriptor *)vdp;
-
-  /*
-   * Check the blocksize of the image to make sure it is compatible.
-   */
-  if(    (isonum_723 ((unsigned char *) pri->logical_block_size) != SECTOR_SIZE)
-      || (isonum_723 ((unsigned char *) pri->volume_set_size) != 1) )
-    {
-      return NULL;
-    }
-
-  /*
-   * Get the location and size of the root directory.
-   */
-  rootp = (struct iso_directory_record *)
-    malloc(sizeof(struct iso_directory_record));
-
-  memcpy(rootp, pri->root_directory_record, sizeof(*rootp));
-
-  return rootp;
-}
-
-void FDECL3(merge_remaining_entries, struct directory *, this_dir,
-	    struct directory_entry **, pnt,
-	    int, n_orig)
-{
-  int i;
-  struct directory_entry * s_entry;
-  unsigned int ttbl_extent = 0;
-  unsigned int ttbl_index  = 0;
-  char whole_path[1024];
-
-  /*
-   * Whatever is leftover in the list needs to get merged back
-   * into the directory.
-   */
-  for( i=0; i < n_orig; i++ )
-    {
-      if( pnt[i] == NULL )
-	{
-	  continue;
-	}
-     
-      if( pnt[i]->name != NULL && pnt[i]->whole_name == NULL)
-       {
-         /*
-          * Set the name for this directory.
-          */
-         strcpy(whole_path, this_dir->de_name);
-         strcat(whole_path, SPATH_SEPARATOR);
-         strcat(whole_path, pnt[i]->name);
-
-         pnt[i]->whole_name = strdup(whole_path);
-       }
-
-      if( pnt[i]->name != NULL
-	  && strcmp(pnt[i]->name, "<translation table>") == 0 )
-	{
-	  ttbl_extent = isonum_733((unsigned char *) pnt[i]->isorec.extent);
-	  ttbl_index = i;
-	  continue;
-	}
-      /*
-       * Skip directories for now - these need to be treated
-       * differently.
-       */
-      if( (pnt[i]->isorec.flags[0] & 2) != 0 )
-	{
-	  /*
-	   * FIXME - we need to insert this directory into the
-	   * tree, so that the path tables we generate will
-	   * be correct.
-	   */
-	  if(    (strcmp(pnt[i]->name, ".") == 0)
-	      || (strcmp(pnt[i]->name, "..") == 0) )
-	    {
-	      free(pnt[i]);
-	      pnt[i] = NULL;
-	      continue;
-	    }
-	  else
-	    {
-	      merge_old_directory_into_tree(pnt[i], this_dir);
-	    }
-	}
-      pnt[i]->next = this_dir->contents;
-      pnt[i]->filedir = this_dir;
-      this_dir->contents = pnt[i];
-      pnt[i] = NULL;
-    }
- 
-
-  /*
-   * If we don't have an entry for the translation table, then
-   * don't bother trying to copy the starting extent over.
-   * Note that it is possible that if we are copying the entire
-   * directory, the entry for the translation table will have already
-   * been inserted into the linked list and removed from the old
-   * entries list, in which case we want to leave the extent number
-   * as it was before.
-   */
-  if( ttbl_extent == 0 )
-    {
-      return;
-    }
-
-  /*
-   * Finally, check the directory we are creating to see whether
-   * there are any new entries in it.  If there are not, we can
-   * reuse the same translation table.
-   */
-  for(s_entry = this_dir->contents; s_entry; s_entry = s_entry->next)
-    {
-      /*
-       * Don't care about '.' or '..'.  They are never in the table
-       * anyways.
-       */
-      if( s_entry->name != NULL && strcmp(s_entry->name, ".") == 0 )
-	{
-	  continue;
-	}
-      if( s_entry->name != NULL && strcmp(s_entry->name, "..") == 0 )
-	{
-	  continue;
-	}
-      if( strcmp(s_entry->name, "<translation table>") == 0)
-	{
-	  continue;
-	}
-      if( (s_entry->de_flags & SAFE_TO_REUSE_TABLE_ENTRY) == 0 )
-	{
-	  return;
-	}
-    }
-
-  /*
-   * Locate the translation table, and re-use the same extent.
-   * It isn't clear that there should ever be one in there already
-   * so for now we try and muddle through the best we can.
-   */
-  for(s_entry = this_dir->contents; s_entry; s_entry = s_entry->next)
-    {
-      if( strcmp(s_entry->name, "<translation table>") == 0)
-	{
-	  fprintf (stderr, "Should never get here\n");
-	  set_733(s_entry->isorec.extent, ttbl_extent);
-	  return;
-	}
-    }
-
-  pnt[ttbl_index]->next = this_dir->contents;
-  pnt[ttbl_index]->filedir = this_dir;
-  this_dir->contents = pnt[ttbl_index];
-  pnt[ttbl_index] = NULL;
-}
-
-
-/*
- * Here we have a case of a directory that has completely disappeared from
- * the face of the earth on the tree we are mastering from.  Go through and
- * merge it into the tree, as well as everything beneath it.
- *
- * Note that if a directory has been moved for some reason, this will
- * incorrectly pick it up and attempt to merge it back into the old
- * location.  FIXME(eric).
- */
-static int
-FDECL2(merge_old_directory_into_tree, struct directory_entry *, dpnt,
-       struct directory *, parent)
-{
-  struct directory_entry	**contents = NULL;
-  int				  i;
-  int				  n_orig;
-  struct directory		* this_dir, *next_brother;
-  char				  whole_path[1024];
-
-  this_dir = (struct directory *) e_malloc(sizeof(struct directory));
-  memset(this_dir, 0, sizeof(struct directory));
-  this_dir->next = NULL;
-  this_dir->subdir = NULL;
-  this_dir->self = dpnt;
-  this_dir->contents = NULL;
-  this_dir->size = 0;
-  this_dir->extent = 0;
-  this_dir->depth = parent->depth + 1;
-  this_dir->parent = parent;
-  if(!parent->subdir)
-    parent->subdir = this_dir;
-  else {
-    next_brother = parent->subdir;
-    while(next_brother->next) next_brother = next_brother->next;
-    next_brother->next = this_dir;
-  }
-
-  /*
-   * Set the name for this directory.
-   */
-  strcpy(whole_path, parent->de_name);
-  strcat(whole_path, SPATH_SEPARATOR);
-  strcat(whole_path, dpnt->name);
-  this_dir->de_name = strdup(whole_path);
-  this_dir->whole_name = strdup(whole_path);
-
-  /*
-   * Now fill this directory using information from the previous
-   * session.
-   */
-  contents = read_merging_directory(&dpnt->isorec, &n_orig);
-  /*
-   * Start by simply copying the '.', '..' and non-directory
-   * entries to this directory.  Technically we could let
-   * merge_remaining_entries handle this, but it gets rather confused
-   * by the '.' and '..' entries.
-   */
-  for(i=0; i < n_orig; i ++ )
-    {
-      /*
-       * We can always reuse the TRANS.TBL in this particular case.
-       */
-      contents[i]->de_flags |= SAFE_TO_REUSE_TABLE_ENTRY;
-
-      if(    ((contents[i]->isorec.flags[0] & 2) != 0)
-	  && (i >= 2) )
-	{
-	  continue;
-	}
-
-      /*
-       * If we have a directory, don't reuse the extent number.
-       */
-      if( (contents[i]->isorec.flags[0] & 2) != 0 )
-	{
-	  memset(contents[i]->isorec.extent, 0, 8);
-
-	  if( strcmp(contents[i]->name, ".") == 0 )
-	      this_dir->dir_flags |= DIR_HAS_DOT;
-
-	  if( strcmp(contents[i]->name, "..") == 0 )
-	      this_dir->dir_flags |= DIR_HAS_DOTDOT;
-	}
-
-      /*
-       * Set the whole name for this file.
-       */
-      strcpy(whole_path, this_dir->whole_name);
-      strcat(whole_path, SPATH_SEPARATOR);
-      strcat(whole_path, contents[i]->name);
-
-      contents[i]->whole_name = strdup(whole_path);
-
-      contents[i]->next = this_dir->contents;
-      contents[i]->filedir = this_dir;
-      this_dir->contents = contents[i];
-      contents[i] = NULL;
-    }
-
-  /*
-   * Zero the extent number for ourselves.
-   */
-  memset(dpnt->isorec.extent, 0, 8);
-
-  /*
-   * Anything that is left are other subdirectories that need to be merged.
-   */
-  merge_remaining_entries(this_dir, contents, n_orig);
-  free_mdinfo(contents, n_orig);
-#if 0
-  /*
-   * This is no longer required.  The post-scan sort will handle
-   * all of this for us.
-   */
-  sort_n_finish(this_dir);
-#endif
-
-  return 0;
-}
-
-
-char * cdwrite_data = NULL;
-
-int
-FDECL1(get_session_start, int *, file_addr)
-{
-  char * pnt;
-
-#ifdef CDWRITE_DETERMINES_FIRST_WRITABLE_ADDRESS
-  /*
-   * FIXME(eric).  We need to coordinate with cdwrite to obtain
-   * the parameters.  For now, we assume we are writing the 2nd session,
-   * so we start from the session that starts at 0.
-   */
-
-  *file_addr = (16 << 11);
-
-  /*
-   * We need to coordinate with cdwrite to get the next writable address
-   * from the device.  Here is where we use it.
-   */
-  session_start = last_extent = last_extent_written = cdwrite_result();
-
-#else
-
-  if( cdwrite_data == NULL )
-    error (1, 0, _("Special parameters for cdwrite not specified with -C\n"));
-
-  /*
-   * Next try and find the ',' in there which delimits the two numbers.
-   */
-  pnt = strchr(cdwrite_data, ',');
-  if( pnt == NULL )
-    error (1, 0, _("Malformed cdwrite parameters\n"));
-
-  *pnt = '\0';
-  if (file_addr != NULL) {
-    *file_addr = atol(cdwrite_data) * SECTOR_SIZE;
-  }
-  pnt++;
-
-  session_start = last_extent = last_extent_written = atol(pnt);
-
-  pnt--;
-  *pnt = ',';
-
-#endif
-  return 0;
-}
-
-/*
- * This function scans the directory tree, looking for files, and it makes
- * note of everything that is found.  We also begin to construct the ISO9660
- * directory entries, so that we can determine how large each directory is.
- */
-
-int
-FDECL2(merge_previous_session,struct directory *, this_dir,
-       struct iso_directory_record *, mrootp)
-{
-  struct directory_entry	**orig_contents = NULL;
-  struct directory_entry        * odpnt = NULL;
-  int				  n_orig;
-  struct directory_entry	* s_entry;
-  int				  status, lstatus;
-  struct stat			  statbuf, lstatbuf;
-
-  /*
-   * Parse the same directory in the image that we are merging
-   * for multisession stuff.
-   */
-  orig_contents = read_merging_directory(mrootp, &n_orig);
-  if( orig_contents == NULL )
-    {
-      return 0;
-    }
-
-
-/* Now we scan the directory itself, and look at what is inside of it. */
-
-  for(s_entry = this_dir->contents; s_entry; s_entry = s_entry->next)
-    {
-      status  =  stat_filter(s_entry->whole_name, &statbuf);
-      lstatus = lstat_filter(s_entry->whole_name, &lstatbuf);
-
-      /*
-       * We always should create an entirely new directory tree whenever
-       * we generate a new session, unless there were *no* changes whatsoever
-       * to any of the directories, in which case it would be kind of pointless
-       * to generate a new session.
-       *
-       * I believe it is possible to rigorously prove that any change anywhere
-       * in the filesystem will force the entire tree to be regenerated
-       * because the modified directory will get a new extent number.  Since
-       * each subdirectory of the changed directory has a '..' entry, all of
-       * them will need to be rewritten too, and since the parent directory
-       * of the modified directory will have an extent pointer to the directory
-       * it too will need to be rewritten.  Thus we will never be able to reuse
-       * any directory information when writing new sessions.
-       *
-       * We still check the previous session so we can mark off the equivalent
-       * entry in the list we got from the original disc, however.
-       */
-
-      /*
-       * The check_prev_session function looks for an identical entry in
-       * the previous session.  If we see it, then we copy the extent
-       * number to s_entry, and cross it off the list.
-       */
-      check_prev_session(orig_contents, n_orig, s_entry,
-			 &statbuf, &lstatbuf, &odpnt);
-
-      if(S_ISDIR(statbuf.st_mode) && odpnt != NULL)
-	{
-	  int dflag;
-
-	  if (strcmp(s_entry->name,".") && strcmp(s_entry->name,".."))
-	    {
-	      struct directory * child;
-
-	      child = find_or_create_directory(this_dir,
-					       s_entry->whole_name,
-					       s_entry, 1);
-	      dflag = merge_previous_session(child,
-					     &odpnt->isorec);
-	      /* If unable to scan directory, mark this as a non-directory */
-	      if(!dflag)
-		lstatbuf.st_mode = (lstatbuf.st_mode & ~S_IFMT) | S_IFREG;
-	      free(odpnt);
-	      odpnt = NULL;
-	    }
-	}
-    }
- 
-  /*
-   * Whatever is left over, are things which are no longer in the tree
-   * on disk.  We need to also merge these into the tree.
-   */
-   merge_remaining_entries(this_dir, orig_contents, n_orig);
-   free_mdinfo(orig_contents, n_orig);
- 
-  return 1;
-}
-
diff --git a/util/mkisofs/name.c b/util/mkisofs/name.c
deleted file mode 100644
index 272471e93..000000000
--- a/util/mkisofs/name.c
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * File name.c - map full Unix file names to unique 8.3 names that
- * would be valid on DOS.
- *
-
-   Written by Eric Youngdale (1993).
-
-   Copyright 1993 Yggdrasil Computing, Incorporated
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#include "config.h"
-#include "mkisofs.h"
-
-#include <ctype.h>
-
-extern int allow_leading_dots;
-  
-/*
- * Function:	iso9660_file_length
- *
- * Purpose:	Map file name to 8.3 format, return length
- *		of result.
- *
- * Arguments:	name	file name we need to map.
- *		sresult	directory entry structure to contain mapped name.
- *		dirflag	flag indicating whether this is a directory or not.
- *
- * Notes:	This procedure probably needs to be rationalized somehow.
- *		New options to affect the behavior of this function
- *		would also be nice to have.
- */
-int FDECL3(iso9660_file_length,
-	   const char*, name,
-	   struct directory_entry *, sresult,
-	   int, dirflag)
-{
-  char		* c;
-  int		  chars_after_dot  = 0;
-  int		  chars_before_dot = 0;
-  int		  current_length   = 0;
-  int		  extra		   = 0;
-  int		  ignore	   = 0;
-  char		* last_dot;
-  const char	* pnt;
-  int		  priority	   = 32767;
-  char		* result;
-  int		  seen_dot	   = 0;
-  int		  seen_semic	   = 0;
-  int		  tildes	   = 0;
-
-  result = sresult->isorec.name;
-
-  /*
-   * For the '.' entry, generate the correct record, and return
-   * 1 for the length.
-   */
-  if(strcmp(name,".") == 0)
-    {
-      if(result)
-	{
-	  *result = 0;
-	}
-      return 1;
-    }
-
-  /*
-   * For the '..' entry, generate the correct record, and return
-   * 1 for the length.
-   */
-  if(strcmp(name,"..") == 0)
-    {
-      if(result)
-	{
-	  *result++ = 1;
-	  *result++ = 0;
-	}
-      return 1;
-    }
-
-  /*
-   * Now scan the directory one character at a time, and figure out
-   * what to do.
-   */
-  pnt = name;
-
-  /*
-   * Find the '.' that we intend to use for the extension.  Usually this
-   * is the last dot, but if we have . followed by nothing or a ~, we
-   * would consider this to be unsatisfactory, and we keep searching.
-   */
-  last_dot = strrchr (pnt,'.');
-  if(    (last_dot != NULL)
-      && (    (last_dot[1] == '~')
- 	   || (last_dot[1] == '\0')) )
-    {
-      c = last_dot;
-      *c = '\0';
-      last_dot = strrchr (pnt,'.');
-      *c = '.';
-    }
-
-  while(*pnt)
-    {
-#ifdef VMS
-      if( strcmp(pnt,".DIR;1") == 0 )
-	{
-	  break;
-	}
-#endif
-
-      /*
-       * This character indicates a Unix style of backup file
-       * generated by some editors.  Lower the priority of
-       * the file.
-       */
-      if(*pnt == '#')
-	{
-	  priority = 1;
-	  pnt++;
-	  continue;
-	}
-
-      /*
-       * This character indicates a Unix style of backup file
-       * generated by some editors.  Lower the priority of
-       * the file.
-       */
-      if(*pnt == '~')
-	{
-	  priority = 1;
-	  tildes++;
-	  pnt++;
-	  continue;
-	}
-
-      /*
-       * This might come up if we had some joker already try and put
-       * iso9660 version numbers into the file names.  This would be
-       * a silly thing to do on a Unix box, but we check for it
-       * anyways.  If we see this, then we don't have to add our
-       * own version number at the end.
-       * UNLESS the ';' is part of the filename and no version
-       * number is following. [VK]
-       */
-       if(*pnt == ';')
-	 {
-	   /* [VK] */
-	   if (pnt[1] != '\0' && (pnt[1] < '0' || pnt[1] > '9'))
-	     {
-	       pnt++;
-	       ignore++;
-	       continue;
-	     }
-	 }
-
-      /*
-       * If we have a name with multiple '.' characters, we ignore everything
-       * after we have gotten the extension.
-       */
-      if(ignore)
-	{
-	  pnt++;
-	  continue;
-	}
-
-      /*
-       * Spin past any iso9660 version number we might have.
-       */
-      if(seen_semic)
-	{
-	  if(*pnt >= '0' && *pnt <= '9')
-	    {
-	      *result++ = *pnt;
-	    }
-	  extra++;
-	  pnt++;
-	  continue;
-	}
-
-	/*
-	 * If we have full names, the names we generate will not
-	 * work on a DOS machine, since they are not guaranteed
-	 * to be 8.3.  Nonetheless, in many cases this is a useful
-	 * option.  We still only allow one '.' character in the
-	 * name, however.
-	 */
-      if(full_iso9660_filenames)
-	{
-	  /* Here we allow a more relaxed syntax. */
-	  if(*pnt == '.')
-	    {
-	      if (seen_dot)
-		{
-		  ignore++;
-		  continue;
-		}
-	      seen_dot++;
-	    }
-	  if(current_length < 30)
-	    {
-	      if( !isascii (*pnt))
-		{
-		  *result++ = '_';
-		}
-	      else
-		{
-		  *result++ = (islower((unsigned char)*pnt) ? toupper((unsigned char)*pnt) : *pnt);
-		}
-	    }
-	}
-      else
-	{
-	  /*
-	   * Dos style filenames.  We really restrict the
-	   * names here.
-	   */
-	  /* It would be nice to have .tar.gz transform to .tgz,
-	   * .ps.gz to .psz, ...
-	   */
-	  if(*pnt == '.')
-	    {
-	      if (!chars_before_dot && !allow_leading_dots)
-		{
-		  /* DOS can't read files with dot first */
-		  chars_before_dot++;
-		  if (result)
-		    {
-		      *result++ = '_'; /* Substitute underscore */
-		    }
-		}
-	      else if( pnt != last_dot )
-		{
-		  /*
-		   * If this isn't the dot that we use for the extension,
-		   * then change the character into a '_' instead.
-		   */
-		  if(chars_before_dot < 8)
-		    {
-		      chars_before_dot++;
-		      if(result)
-			{
-			  *result++ = '_';
-			}
-		    }
-		}
-	      else
-		{
-		  if (seen_dot)
-		    {
-		      ignore++; continue;
-		    }
-		  if(result)
-		    {
-		      *result++ = '.';
-		    }
-		  seen_dot++;
-		}
-	    }
-	  else
-	    {
-	      if(    (seen_dot && (chars_after_dot < 3) && ++chars_after_dot)
-		     || (!seen_dot && (chars_before_dot < 8) && ++chars_before_dot) )
-		{
-		  if(result)
-		    {
-		      switch (*pnt)
-			{
-			default:
-			  if( !isascii (*pnt) )
-			    {
-			      *result++ = '_';
-			    }
-			  else
-			    {
-			      *result++ = islower((unsigned char)*pnt) ? toupper((unsigned char)*pnt) : *pnt;
-			    }
-			  break;
-
-			/*
-			 * Descriptions of DOS's 'Parse Filename'
-			 * (function 29H) describes V1 and V2.0+
-			 * separator and terminator characters.
-			 * These characters in a DOS name make
-			 * the file visible but un-manipulable
-			 * (all useful operations error off.
-			 */
-			/* separators */
-			case '+':
-			case '=':
-			case '%': /* not legal DOS filename */
-			case ':':
-			case ';': /* already handled */
-			case '.': /* already handled */
-			case ',': /* already handled */
-			case '\t':
-			case ' ':
-			  /* V1 only separators */
-			case '/':
-			case '"':
-			case '[':
-			case ']':
-			  /* terminators */
-			case '>':
-			case '<':
-			case '|':
-			  /* Hmm - what to do here?  Skip?
-			   * Win95 looks like it substitutes '_'
-			   */
-			  *result++ = '_';
-			  break;
-			} /* switch (*pnt) */
-		    } /* if (result) */
-		} /* if (chars_{after,before}_dot) ... */
-	    } /* else *pnt == '.' */
-	} /* else DOS file names */
-      current_length++;
-      pnt++;
-    } /* while (*pnt) */
- 
-  /*
-   * OK, that wraps up the scan of the name.  Now tidy up a few other
-   * things.
-   */
-
-  /*
-   * Look for emacs style of numbered backups, like foo.c.~3~.  If
-   * we see this, convert the version number into the priority
-   * number.  In case of name conflicts, this is what would end
-   * up being used as the 'extension'.
-   */
-  if(tildes == 2)
-    {
-      int prio1 = 0;
-      pnt = name;
-      while (*pnt && *pnt != '~')
-	{
-	  pnt++;
-	}
-      if (*pnt)
-	{
-	  pnt++;
-	}
-      while(*pnt && *pnt != '~')
-	{
-	  prio1 = 10*prio1 + *pnt - '0';
-	  pnt++;
-	}
-      priority = prio1;
-    }
- 
-  /*
-   * If this is not a directory, force a '.' in case we haven't
-   * seen one, and add a version number if we haven't seen one
-   * of those either.
-   */
-  if (!dirflag)
-    {
-      if (!seen_dot && !omit_period)
-	{
-	  if (result) *result++ = '.';
-	  extra++;
-	}
-      if(!omit_version_number && !seen_semic)
-	{
-	  if(result)
-	    {
-	      *result++ = ';';
-	      *result++ = '1';
-	    };
-	  extra += 2;
-	}
-    }
-		   
-  if(result)
-    {
-      *result++ = 0;
-    }
-  sresult->priority = priority;
-
-  return (chars_before_dot + chars_after_dot + seen_dot + extra);
-}
diff --git a/util/mkisofs/rock.c b/util/mkisofs/rock.c
deleted file mode 100644
index a7a39f774..000000000
--- a/util/mkisofs/rock.c
+++ /dev/null
@@ -1,597 +0,0 @@
-/*
- * File rock.c - generate RRIP  records for iso9660 filesystems.
-
-   Written by Eric Youngdale (1993).
-
-   Copyright 1993 Yggdrasil Computing, Incorporated
-
-   Copyright (C) 2009,2010  Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdlib.h>
-
-#include "config.h"
-
-#ifndef VMS
-#if defined(MAJOR_IN_SYSMACROS)
-#include <sys/sysmacros.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#endif
-#if defined(MAJOR_IN_MKDEV)
-#include <sys/types.h>
-#include <sys/mkdev.h>
-#endif
-
-#include "mkisofs.h"
-#include "iso9660.h"
-#include <string.h>
-#include <errno.h>
-
-#ifdef	DOESNT_WORK
-
-#ifdef NON_UNIXFS
-#define S_ISLNK(m)	(0)
-#else
-#ifndef S_ISLNK
-#define S_ISLNK(m)	(((m) & S_IFMT) == S_IFLNK)
-#endif
-#endif
-
-#else
-#include <statdefs.h>
-#endif
-
-#define SU_VERSION 1
-
-#define SL_ROOT    8
-#define SL_PARENT  4
-#define SL_CURRENT 2
-#define SL_CONTINUE 1
-
-#define CE_SIZE 28
-#define CL_SIZE 12
-#define ER_SIZE 8
-#define NM_SIZE 5
-#define PL_SIZE 12
-#define PN_SIZE 20
-#define PX_SIZE 36
-#define RE_SIZE 4
-#define SL_SIZE 20
-#define ZZ_SIZE 15
-#ifdef __QNX__
-#define TF_SIZE (5 + 4 * 7)
-#else
-#define TF_SIZE (5 + 3 * 7)
-#endif
-
-/* If we need to store this number of bytes, make sure we
-   do not box ourselves in so that we do not have room for
-   a CE entry for the continuation record */
-
-#define MAYBE_ADD_CE_ENTRY(BYTES) \
-    ((unsigned) ((BYTES) + CE_SIZE + currlen + ipnt) > (unsigned) (recstart + reclimit) ? 1 : 0)
-
-/*
- * Buffer to build RR attributes
- */
-
-static unsigned char Rock[16384];
-static unsigned char symlink_buff[256];
-static int ipnt = 0;
-static int recstart = 0;
-static int currlen = 0;
-static int mainrec = 0;
-static int reclimit;
-
-static void add_CE_entry	__PR((void));
-
-static void add_CE_entry(){
-          if(recstart)
-	    set_733((char*)Rock + recstart - 8, ipnt + 28 - recstart);
-	  Rock[ipnt++] ='C';
-	  Rock[ipnt++] ='E';
-	  Rock[ipnt++] = CE_SIZE;
-	  Rock[ipnt++] = SU_VERSION;
-	  set_733((char*)Rock + ipnt, 0);
-	  ipnt += 8;
-	  set_733((char*)Rock + ipnt, 0);
-	  ipnt += 8;
-	  set_733((char*)Rock + ipnt, 0);
-	  ipnt += 8;
-	  recstart = ipnt;
-	  currlen = 0;
-	  if(!mainrec) mainrec = ipnt;
-	  reclimit = SECTOR_SIZE - 8; /* Limit to one sector */
-}
-
-#ifdef __STDC__
-int generate_rock_ridge_attributes (char * whole_name, char * name,
-				    struct directory_entry * s_entry,
-				    struct stat * statbuf,
-				    struct stat * lstatbuf,
-				    int deep_opt)
-#else
-int generate_rock_ridge_attributes (whole_name, name,
-				    s_entry,
-				    statbuf,
-				    lstatbuf,
-				    deep_opt)
-char * whole_name; char * name; struct directory_entry * s_entry;
-struct stat * statbuf, *lstatbuf;
-int deep_opt;
-#endif
-{
-  int flagpos, flagval;
-  int need_ce;
-
-  statbuf = statbuf;        /* this shuts up unreferenced compiler warnings */
-  mainrec = recstart = ipnt = 0;
-  reclimit = 0xf8;
-
-  /* no need to fill in the RR stuff if we won't see the file */
-  if (s_entry->de_flags & INHIBIT_ISO9660_ENTRY)
-    return 0;
-
-  /* Obtain the amount of space that is currently used for the directory
-     record.  Assume max for name, since name conflicts may cause us
-     to rename the file later on */
-  currlen = sizeof(s_entry->isorec);
-
-  /* Identify that we are using the SUSP protocol */
-  if(deep_opt & NEED_SP){
-	  Rock[ipnt++] ='S';
-	  Rock[ipnt++] ='P';
-	  Rock[ipnt++] = 7;
-	  Rock[ipnt++] = SU_VERSION;
-	  Rock[ipnt++] = 0xbe;
-	  Rock[ipnt++] = 0xef;
-	  Rock[ipnt++] = 0;
-  };
-
-  /* First build the posix name field */
-  Rock[ipnt++] ='R';
-  Rock[ipnt++] ='R';
-  Rock[ipnt++] = 5;
-  Rock[ipnt++] = SU_VERSION;
-  flagpos = ipnt;
-  flagval = 0;
-  Rock[ipnt++] = 0;   /* We go back and fix this later */
-
-  if(strcmp(name,".")  && strcmp(name,"..")){
-    char * npnt;
-    int remain, use;
-
-    remain = strlen(name);
-    npnt = name;
-
-    while(remain){
-          use = remain;
-	  need_ce = 0;
-	  /* Can we fit this SUSP and a CE entry? */
-	  if(use + currlen + CE_SIZE + (ipnt - recstart) > reclimit) {
-	    use = reclimit - currlen - CE_SIZE - (ipnt - recstart);
-	    need_ce++;
-	  }
-
-	  /* Only room for 256 per SUSP field */
-	  if(use > 0xf8) use = 0xf8;
-
-	  /* First build the posix name field */
-	  Rock[ipnt++] ='N';
-	  Rock[ipnt++] ='M';
-	  Rock[ipnt++] = NM_SIZE + use;
-	  Rock[ipnt++] = SU_VERSION;
-	  Rock[ipnt++] = (remain != use ? 1 : 0);
-	  flagval |= (1<<3);
-	  strncpy((char *)&Rock[ipnt], npnt, use);
-	  npnt += use;
-	  ipnt += use;
-	  remain -= use;
-	  if(remain && need_ce) add_CE_entry();
-	};
-  };
-
-  /*
-   * Add the posix modes
-   */
-  if(MAYBE_ADD_CE_ENTRY(PX_SIZE)) add_CE_entry();
-  Rock[ipnt++] ='P';
-  Rock[ipnt++] ='X';
-  Rock[ipnt++] = PX_SIZE;
-  Rock[ipnt++] = SU_VERSION; 
-  flagval |= (1<<0);
-  set_733((char*)Rock + ipnt, lstatbuf->st_mode);
-  ipnt += 8;
-  set_733((char*)Rock + ipnt, lstatbuf->st_nlink);
-  ipnt += 8;
-  set_733((char*)Rock + ipnt, lstatbuf->st_uid);
-  ipnt += 8;
-  set_733((char*)Rock + ipnt, lstatbuf->st_gid);
-  ipnt += 8;
-
-  /*
-   * Check for special devices
-   */
-#ifndef NON_UNIXFS
-  if (S_ISCHR(lstatbuf->st_mode) || S_ISBLK(lstatbuf->st_mode)) {
-    if(MAYBE_ADD_CE_ENTRY(PN_SIZE)) add_CE_entry();
-    Rock[ipnt++] ='P';
-    Rock[ipnt++] ='N';
-    Rock[ipnt++] = PN_SIZE;
-    Rock[ipnt++] = SU_VERSION; 
-    flagval |= (1<<1);
-#if defined(MAJOR_IN_SYSMACROS) || defined(MAJOR_IN_MKDEV)
-    set_733((char*)Rock + ipnt, major(lstatbuf->st_rdev ));
-    ipnt += 8;
-    set_733((char*)Rock + ipnt, minor(lstatbuf->st_rdev));
-    ipnt += 8;
-#else
-    /*
-     * If we don't have sysmacros.h, then we have to guess as to how
-     * best to pick apart the device number for major/minor.
-     * Note: this may very well be wrong for many systems, so
-     * it is always best to use the major/minor macros if the
-     * system supports it.
-     */
-    if(sizeof(dev_t) <= 2) {
-        set_733((char*)Rock + ipnt, (lstatbuf->st_rdev >> 8));
-        ipnt += 8;
-        set_733((char*)Rock + ipnt, lstatbuf->st_rdev & 0xff);
-        ipnt += 8;
-    }
-    else if(sizeof(dev_t) <= 4) {
-        set_733((char*)Rock + ipnt, (lstatbuf->st_rdev >> 8) >> 8);
-        ipnt += 8;
-        set_733((char*)Rock + ipnt, lstatbuf->st_rdev & 0xffff);
-        ipnt += 8;
-    }
-    else {
-        set_733((char*)Rock + ipnt, (lstatbuf->st_rdev >> 16) >> 16);
-        ipnt += 8;
-        set_733((char*)Rock + ipnt, lstatbuf->st_rdev);
-        ipnt += 8;
-    }
-#endif
-  };
-#endif
-  /*
-   * Check for and symbolic links.  VMS does not have these.
-   */
-  if (S_ISLNK(lstatbuf->st_mode)){
-    int lenpos, lenval, j0, j1;
-    int nchar;
-    unsigned char * cpnt, *cpnt1;
-    nchar = readlink(whole_name, (char *)symlink_buff, sizeof(symlink_buff));
-    symlink_buff[nchar < 0 ? 0 : nchar] = 0;
-    nchar = strlen((char *) symlink_buff);
-    set_733(s_entry->isorec.size, 0);
-    cpnt = &symlink_buff[0];
-    flagval |= (1<<2);
-
-    if (! split_SL_field)
-      {
-	int sl_bytes = 0;
-	for (cpnt1 = cpnt; *cpnt1 != '\0'; cpnt1++)
-	  {
-	    if (*cpnt1 == '/')
-	      {
-		sl_bytes += 4;
-	      }
-	    else
-	      {
-		sl_bytes += 1;
-	      }
-	  }
-	if (sl_bytes > 250)
-	  {
-	    /*
-	     * the symbolic link won't fit into one SL System Use Field
-	     * print an error message and continue with splited one
-	     */
-	    fprintf (stderr, _("symbolic link `%s' too long for one SL System Use Field, splitting"), cpnt);
-	  }
-       if(MAYBE_ADD_CE_ENTRY(SL_SIZE + sl_bytes)) add_CE_entry();
-     }
-
-    while(nchar){
-      if(MAYBE_ADD_CE_ENTRY(SL_SIZE)) add_CE_entry();
-      Rock[ipnt++] ='S';
-      Rock[ipnt++] ='L';
-      lenpos = ipnt;
-      Rock[ipnt++] = SL_SIZE;
-      Rock[ipnt++] = SU_VERSION; 
-      Rock[ipnt++] = 0; /* Flags */
-      lenval = 5;
-      while(*cpnt){
-	cpnt1 = (unsigned char *) strchr((char *) cpnt, '/');
-	if(cpnt1) {
-	  nchar--;
-	  *cpnt1 = 0;
-	};
-
-	/* We treat certain components in a special way.  */
-	if(cpnt[0] == '.' && cpnt[1] == '.' && cpnt[2] == 0){
-	  if(MAYBE_ADD_CE_ENTRY(2)) add_CE_entry();
-	  Rock[ipnt++] = SL_PARENT;
-	  Rock[ipnt++] = 0;  /* length is zero */
-	  lenval += 2;
-	  nchar -= 2;
-	} else if(cpnt[0] == '.' && cpnt[1] == 0){
-	  if(MAYBE_ADD_CE_ENTRY(2)) add_CE_entry();
-	  Rock[ipnt++] = SL_CURRENT;
-	  Rock[ipnt++] = 0;  /* length is zero */
-	  lenval += 2;
-	  nchar -= 1;
-	} else if(cpnt[0] == 0){
-	  if(MAYBE_ADD_CE_ENTRY(2)) add_CE_entry();
-	  Rock[ipnt++] = SL_ROOT;
-	  Rock[ipnt++] = 0;  /* length is zero */
-	  lenval += 2;
-	} else {
-	  /* If we do not have enough room for a component, start
-	     a new continuations segment now */
-         if(split_SL_component ? MAYBE_ADD_CE_ENTRY(6) :
-                                 MAYBE_ADD_CE_ENTRY(6 + strlen ((char *) cpnt)))
-	   {
-	     add_CE_entry();
-	     if(cpnt1)
-	       {
-		 *cpnt1 = '/';
-		 nchar++;
-		 cpnt1 = NULL; /* A kluge so that we can restart properly */
-	       }
-	     break;
-	   }
-	  j0 = strlen((char *) cpnt);
-	  while(j0) {
-	    j1 = j0;
-	    if(j1 > 0xf8) j1 = 0xf8;
-	    need_ce = 0;
-	    if(j1 + currlen + CE_SIZE + (ipnt - recstart) > reclimit) {
-	      j1 = reclimit - currlen - CE_SIZE - (ipnt - recstart);
-	      need_ce++;
-	    }
-	    Rock[ipnt++] = (j1 != j0 ? SL_CONTINUE : 0);
-	    Rock[ipnt++] = j1;
-	    strncpy((char *) Rock + ipnt, (char *) cpnt, j1);
-	    ipnt += j1;
-	    lenval += j1 + 2;
-	    cpnt += j1;
-	    nchar -= j1;  /* Number we processed this time */
-	    j0 -= j1;
-	    if(need_ce) {
-	      add_CE_entry();
-	      if(cpnt1) {
-		*cpnt1 = '/';
-                nchar++;
-		cpnt1 = NULL; /* A kluge so that we can restart properly */
-	      }
-	      break;
-	    }
-	  }
-	};
-	if(cpnt1) {
-	  cpnt = cpnt1 + 1;
-	} else
-	  break;
-      }
-      Rock[lenpos] = lenval;
-      if(nchar) Rock[lenpos + 2] = SL_CONTINUE; /* We need another SL entry */
-    } /* while nchar */
-  } /* Is a symbolic link */
-  /*
-   * Add in the Rock Ridge TF time field
-   */
-  if(MAYBE_ADD_CE_ENTRY(TF_SIZE)) add_CE_entry();
-  Rock[ipnt++] ='T';
-  Rock[ipnt++] ='F';
-  Rock[ipnt++] = TF_SIZE;
-  Rock[ipnt++] = SU_VERSION;
-#ifdef __QNX__
-  Rock[ipnt++] = 0x0f;
-#else
-  Rock[ipnt++] = 0x0e;
-#endif
-  flagval |= (1<<7);
-#ifdef __QNX__
-  iso9660_date((char *) &Rock[ipnt], lstatbuf->st_ftime);
-  ipnt += 7;
-#endif
-  iso9660_date((char *) &Rock[ipnt], lstatbuf->st_mtime);
-  ipnt += 7;
-  iso9660_date((char *) &Rock[ipnt], lstatbuf->st_atime);
-  ipnt += 7;
-  iso9660_date((char *) &Rock[ipnt], lstatbuf->st_ctime);
-  ipnt += 7;
-
-  /*
-   * Add in the Rock Ridge RE time field
-   */
-  if(deep_opt & NEED_RE){
-          if(MAYBE_ADD_CE_ENTRY(RE_SIZE)) add_CE_entry();
-	  Rock[ipnt++] ='R';
-	  Rock[ipnt++] ='E';
-	  Rock[ipnt++] = RE_SIZE;
-	  Rock[ipnt++] = SU_VERSION;
-	  flagval |= (1<<6);
-  };
-  /*
-   * Add in the Rock Ridge PL record, if required.
-   */
-  if(deep_opt & NEED_PL){
-          if(MAYBE_ADD_CE_ENTRY(PL_SIZE)) add_CE_entry();
-	  Rock[ipnt++] ='P';
-	  Rock[ipnt++] ='L';
-	  Rock[ipnt++] = PL_SIZE;
-	  Rock[ipnt++] = SU_VERSION;
-	  set_733((char*)Rock + ipnt, 0);
-	  ipnt += 8;
-	  flagval |= (1<<5);
-  };
-
-  /*
-   * Add in the Rock Ridge CL field, if required.
-   */
-  if(deep_opt & NEED_CL){
-          if(MAYBE_ADD_CE_ENTRY(CL_SIZE)) add_CE_entry();
-	  Rock[ipnt++] ='C';
-	  Rock[ipnt++] ='L';
-	  Rock[ipnt++] = CL_SIZE;
-	  Rock[ipnt++] = SU_VERSION;
-	  set_733((char*)Rock + ipnt, 0);
-	  ipnt += 8;
-	  flagval |= (1<<4);
-  };
-
-#ifndef VMS
-  /* If transparent compression was requested, fill in the correct
-     field for this file */
-  if(transparent_compression &&
-     S_ISREG(lstatbuf->st_mode) &&
-     strlen(name) > 3 &&
-     strcmp(name + strlen(name) - 3,".gZ") == 0){
-    FILE * zipfile;
-    char * checkname;
-    unsigned int file_size;
-    unsigned char header[8];
-    int OK_flag;
-
-    /* First open file and verify that the correct algorithm was used */
-    file_size = 0;
-    OK_flag = 1;
-
-    zipfile = fopen(whole_name, "rb");
-    if (fread (header, 1, sizeof (header), zipfile) != sizeof(header))
-      error (1, errno, "fread");
-
-    /* Check some magic numbers from gzip. */
-    if(header[0] != 0x1f || header[1] != 0x8b || header[2] != 8) OK_flag = 0;
-    /* Make sure file was blocksized. */
-    if(((header[3] & 0x40) == 0)) OK_flag = 0;
-    /* OK, now go to the end of the file and get some more info */
-    if(OK_flag){
-      int status;
-      status = (long)lseek(fileno(zipfile), (off_t)(-8), SEEK_END);
-      if(status == -1) OK_flag = 0;
-    }
-    if(OK_flag){
-      if(read(fileno(zipfile), (char*)header, sizeof(header)) != sizeof(header))
-	OK_flag = 0;
-      else {
-	int blocksize;
-	blocksize = (header[3] << 8) | header[2];
-	file_size = ((unsigned int)header[7] << 24) |
-		    ((unsigned int)header[6] << 16) |
-		    ((unsigned int)header[5] << 8)  | header[4];
-#if 0
-	fprintf(stderr,"Blocksize = %d %d\n", blocksize, file_size);
-#endif
-	if(blocksize != SECTOR_SIZE) OK_flag = 0;
-      }
-    }
-    fclose(zipfile);
-
-    checkname = strdup(whole_name);
-    checkname[strlen(whole_name)-3] = 0;
-    zipfile = fopen(checkname, "rb");
-    if(zipfile) {
-      OK_flag = 0;
-      fprintf (stderr, _("Unable to insert transparent compressed file - name conflict\n"));
-      fclose(zipfile);
-    }
-
-    free(checkname);
-
-    if(OK_flag){
-      if(MAYBE_ADD_CE_ENTRY(ZZ_SIZE)) add_CE_entry();
-      Rock[ipnt++] ='Z';
-      Rock[ipnt++] ='Z';
-      Rock[ipnt++] = ZZ_SIZE;
-      Rock[ipnt++] = SU_VERSION;
-      Rock[ipnt++] = 'g'; /* Identify compression technique used */
-      Rock[ipnt++] = 'z';
-      Rock[ipnt++] = 3;
-      set_733((char*)Rock + ipnt, file_size); /* Real file size */
-      ipnt += 8;
-    };
-  }
-#endif
-  /*
-   * Add in the Rock Ridge CE field, if required.  We use  this for the
-   * extension record that is stored in the root directory.
-   */
-  if(deep_opt & NEED_CE) add_CE_entry();
-  /*
-   * Done filling in all of the fields.  Now copy it back to a buffer for the
-   * file in question.
-   */
-
-  /* Now copy this back to the buffer for the file */
-  Rock[flagpos] = flagval;
-
-  /* If there was a CE, fill in the size field */
-  if(recstart)
-    set_733((char*)Rock + recstart - 8, ipnt - recstart);
-
-  s_entry->rr_attributes = (unsigned char *) e_malloc(ipnt);
-  s_entry->total_rr_attr_size = ipnt;
-  s_entry->rr_attr_size = (mainrec ? mainrec : ipnt);
-  memcpy(s_entry->rr_attributes, Rock, ipnt);
-  return ipnt;
-}
-
-/* Guaranteed to  return a single sector with the relevant info */
-
-char * FDECL4(generate_rr_extension_record, char *, id,  char  *, descriptor,
-				    char *, source, int  *, size){
-  int lipnt = 0;
-  char * pnt;
-  int len_id, len_des, len_src;
-
-  len_id = strlen(id);
-  len_des =  strlen(descriptor);
-  len_src = strlen(source);
-  Rock[lipnt++] ='E';
-  Rock[lipnt++] ='R';
-  Rock[lipnt++] = ER_SIZE + len_id + len_des + len_src;
-  Rock[lipnt++] = 1;
-  Rock[lipnt++] = len_id;
-  Rock[lipnt++] = len_des;
-  Rock[lipnt++] = len_src;
-  Rock[lipnt++] = 1;
-
-  memcpy(Rock  + lipnt, id, len_id);
-  lipnt += len_id;
-
-  memcpy(Rock  + lipnt, descriptor, len_des);
-  lipnt += len_des;
-
-  memcpy(Rock  + lipnt, source, len_src);
-  lipnt += len_src;
-
-  if(lipnt  > SECTOR_SIZE)
-    error (1, 0, _("Extension record too long\n"));
-  pnt = (char *) e_malloc(SECTOR_SIZE);
-  memset(pnt, 0,  SECTOR_SIZE);
-  memcpy(pnt, Rock, lipnt);
-  *size = lipnt;
-  return pnt;
-}
diff --git a/util/mkisofs/tree.c b/util/mkisofs/tree.c
deleted file mode 100644
index 0d9cf6143..000000000
--- a/util/mkisofs/tree.c
+++ /dev/null
@@ -1,1865 +0,0 @@
-/*
- * File tree.c - scan directory  tree and build memory structures for iso9660
- * filesystem
-
-   Written by Eric Youngdale (1993).
-
-   Copyright 1993 Yggdrasil Computing, Incorporated
-
-   Copyright (C) 2009  Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-/* ADD_FILES changes made by Ross Biro biro@yggdrasil.com 2/23/95 */
-
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-
-#include "config.h"
-
-#ifndef VMS
-#if defined(MAJOR_IN_SYSMACROS)
-#include <sys/sysmacros.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <fctldefs.h>
-
-#if defined(MAJOR_IN_MKDEV)
-#include <sys/types.h>
-#include <sys/mkdev.h>
-#endif
-#else
-#include <sys/file.h>
-#include <vms/fabdef.h>
-#include "vms.h"
-extern char * strdup(const char *);
-#endif
-
-/*
- * Autoconf should be able to figure this one out for us and let us know
- * whether the system has memmove or not.
- */
-# ifndef HAVE_MEMMOVE
-#  define memmove(d, s, n) bcopy ((s), (d), (n))
-# endif
-
-#include "mkisofs.h"
-#include "iso9660.h"
-#include "match.h"
-
-#include <sys/stat.h>
-
-#include "exclude.h"
-
-#ifdef	DOESNT_WORK
-
-#ifdef NON_UNIXFS
-#define S_ISLNK(m)	(0)
-#define S_ISSOCK(m)	(0)
-#define S_ISFIFO(m)	(0)
-#else
-#ifndef S_ISLNK
-#define S_ISLNK(m)	(((m) & S_IFMT) == S_IFLNK)
-#endif
-#ifndef S_ISSOCK
-# ifdef S_IFSOCK
-#   define S_ISSOCK(m)	(((m) & S_IFMT) == S_IFSOCK)
-# else
-#   define S_ISSOCK(m)	(0)
-# endif
-#endif
-#endif
-
-#else
-#include <statdefs.h>
-#endif
-
-
-#ifdef __SVR4
-extern char * strdup(const char *);
-#endif
-
-static unsigned char symlink_buff[256];
-
-static void stat_fix	__PR((struct stat * st));
-static void generate_reloc_directory __PR((void));
-
-static void DECL(attach_dot_entries, (struct directory * dirnode,
-		   struct stat * parent_stat));
-static void DECL(delete_directory, (struct directory * parent, struct directory * child));
-
-extern int verbose;
-
-struct stat fstatbuf;  /* We use this for the artificial entries we create */
-
-struct stat root_statbuf;  /* Stat buffer for root directory */
-
-struct directory * reloc_dir = NULL;
-
-static void
-FDECL1(stat_fix, struct stat *, st)
-{
-  /* Remove the uid and gid, they will only be useful on the author's
-     system.  */
-  st->st_uid = 0;
-  st->st_gid = 0;
-
- /*
-  * Make sure the file modes make sense.  Turn on all read bits.  Turn
-  * on all exec/search bits if any exec/search bit is set.  Turn off
-  * all write bits, and all special mode bits (on a r/o fs lock bits
-  * are useless, and with uid+gid 0 don't want set-id bits, either).
-  */
-  st->st_mode |= 0444;
-#ifndef _WIN32		/* make all file "executable" */
-  if (st->st_mode & 0111)
-#endif /* _WIN32 */
-    st->st_mode |= 0111;
-  st->st_mode &= ~07222;
-}
-
-int
-FDECL2(stat_filter, char *, path, struct stat *, st)
-{
-  int result = stat(path, st);
-  if (result >= 0 && rationalize)
-    stat_fix(st);
-
-  if ((unsigned) st->st_size > UINT32_MAX)
-    result = -1;
-
-  return result;
-}
-
-int
-FDECL2(lstat_filter, char *, path, struct stat *, st)
-{
-  int result = lstat(path, st);
-  if (result >= 0 && rationalize)
-    stat_fix(st);
-
-  if ((unsigned) st->st_size > UINT32_MAX)
-    result = -1;
-
-  return result;
-}
-
-static int FDECL1(sort_n_finish, struct directory *, this_dir)
-{
-  struct directory_entry  * s_entry;
-  struct directory_entry  * s_entry1;
-  struct directory_entry  * table;
-  int			    count;
-  int			    d1;
-  int			    d2;
-  int			    d3;
-  int			    new_reclen;
-  char			 *  c;
-  int			    status = 0;
-  int			    tablesize = 0;
-  char			    newname[34];
-  char			    rootname[34];
-
-  /* Here we can take the opportunity to toss duplicate entries from the
-     directory.  */
-
-  /* ignore if it's hidden */
-  if(this_dir->dir_flags & INHIBIT_ISO9660_ENTRY)
-    {
-      return 0;
-    }
-
-  table = NULL;
-
-  init_fstatbuf();
-
-  /*
-   * If we had artificially created this directory, then we might be
-   * missing the required '.' entries.  Create these now if we need
-   * them.
-   */
-  if( (this_dir->dir_flags & (DIR_HAS_DOT | DIR_HAS_DOTDOT)) !=
-      (DIR_HAS_DOT | DIR_HAS_DOTDOT) )
-    {
-      attach_dot_entries(this_dir, &fstatbuf);
-    }
-
-  flush_file_hash();
-  s_entry = this_dir->contents;
-  while(s_entry)
-    {
-    /* ignore if it's hidden */
-    if (s_entry->de_flags & INHIBIT_ISO9660_ENTRY)
-      {
-	s_entry = s_entry->next;
-	continue;
-      }
-	 
-      /*
-       * First assume no conflict, and handle this case
-       */
-      if(!(s_entry1 = find_file_hash(s_entry->isorec.name)))
-	{
-	  add_file_hash(s_entry);
-	  s_entry = s_entry->next;
-	  continue;
-	}
-	 
-      if(s_entry1 == s_entry)
-	error (1, 0, _("Fatal goof\n"));
-     
-      /*
-       * OK, handle the conflicts.  Try substitute names until we come
-       * up with a winner
-       */
-      strcpy(rootname, s_entry->isorec.name);
-      if(full_iso9660_filenames)
-	{
-	  if(strlen(rootname) > 27) rootname[27] = 0;
-	}
-
-      /*
-       * Strip off the non-significant part of the name so that we are left
-       * with a sensible root filename.  If we don't find a '.', then try
-       * a ';'.
-       */
-      c  = strchr(rootname, '.');
-      if (c)
-	*c = 0;
-      else
-	{
-	  c  = strchr(rootname, ';');
-	  if (c) *c = 0;
-	}
-      for(d1 = 0; d1 < 36; d1++)
-	{
-	  for(d2 = 0; d2 < 36; d2++)
-	    {
-	      for(d3 = 0; d3 < 36; d3++)
-		{
-		  sprintf(newname,"%s.%c%c%c%s", rootname, 
-			  (d1 <= 9 ? '0' + d1 : 'A' + d1 - 10),
-			  (d2 <= 9 ? '0' + d2 : 'A' + d2 - 10),
-			  (d3 <= 9 ? '0' + d3 : 'A' + d3 - 10),
-			  (s_entry->isorec.flags[0] == 2 ||
-			   omit_version_number ? "" : ";1"));
-		 
-#ifdef VMS
-		  /* Sigh.  VAXCRTL seems to be broken here */
-		  {
-		    int ijk = 0;
-		    while(newname[ijk])
-		      {
-			if(newname[ijk] == ' ') newname[ijk] = '0';
-			ijk++;
-		      }
-		  }
-#endif
-		 
-		  if(!find_file_hash(newname)) goto got_valid_name;
-		}
-	    }
-	}
-
-      /*
-       * If we fell off the bottom here, we were in real trouble.
-       */
-      error (1, 0, _("Unable to  generate unique  name for file %s\n"), s_entry->name);
-
-got_valid_name:     
-      /*
-       * OK, now we have a good replacement name.  Now decide which one
-       * of these two beasts should get the name changed
-       */
-      if(s_entry->priority < s_entry1->priority)
-	{
-	  if( verbose > 0 )
-	    {
-	      fprintf (stderr, _("Using %s for %s%s%s (%s)\n"), newname, 
-		       this_dir->whole_name, SPATH_SEPARATOR,
-		       s_entry->name, s_entry1->name);
-	    }
-	  s_entry->isorec.name_len[0] =  strlen(newname);
-	  new_reclen =  sizeof(struct iso_directory_record) -
-	    sizeof(s_entry->isorec.name) +
-	    strlen(newname);
-	  if(use_RockRidge)
-	    {
-	      if (new_reclen & 1) new_reclen++;  /* Pad to an even byte */
-	      new_reclen += s_entry->rr_attr_size;
-	    }
-	  if (new_reclen & 1) new_reclen++;  /* Pad to an even byte */
-	  s_entry->isorec.length[0] = new_reclen;
-	  strcpy(s_entry->isorec.name, newname);
-	}
-      else
-	{
-	  delete_file_hash(s_entry1);
-	  if( verbose > 0 )
-	    {
-	      fprintf(stderr, _("Using %s for %s%s%s (%s)\n"), newname, 
-		      this_dir->whole_name, SPATH_SEPARATOR,
-		      s_entry1->name, s_entry->name);
-	    }
-	  s_entry1->isorec.name_len[0] =  strlen(newname);
-	  new_reclen =  sizeof(struct iso_directory_record) -
-	    sizeof(s_entry1->isorec.name) +
-	    strlen(newname);
-	  if(use_RockRidge)
-	    {
-	      if (new_reclen & 1) new_reclen++;  /* Pad to an even byte */
-	      new_reclen += s_entry1->rr_attr_size;
-	    }
-	  if (new_reclen & 1) new_reclen++;  /* Pad to an even byte */
-	  s_entry1->isorec.length[0] = new_reclen;
-	  strcpy(s_entry1->isorec.name, newname);
-	  add_file_hash(s_entry1);
-	}
-      add_file_hash(s_entry);
-      s_entry = s_entry->next;
-    }
- 
-  if(generate_tables
-     && !find_file_hash("TRANS.TBL")
-     && (reloc_dir != this_dir)
-     && (this_dir->extent == 0) )
-    {
-      /*
-       * First we need to figure out how big this table is
-       */
-      for (s_entry = this_dir->contents; s_entry; s_entry = s_entry->next)
-	{
-	  if(strcmp(s_entry->name, ".") == 0  ||
-	     strcmp(s_entry->name, "..") == 0) continue;
-	  if(s_entry->de_flags & INHIBIT_ISO9660_ENTRY) continue;
-	  if(s_entry->table) tablesize += 35 + strlen(s_entry->table);
-	}
-    }
-
-  if( tablesize > 0 )
-    {
-      table = (struct directory_entry *)
-	e_malloc(sizeof (struct directory_entry));
-      memset(table, 0, sizeof(struct directory_entry));
-      table->table = NULL;
-      table->next = this_dir->contents;
-      this_dir->contents = table;
-     
-      table->filedir = root;
-      table->isorec.flags[0] = 0;
-      table->priority  = 32768;
-      iso9660_date(table->isorec.date, fstatbuf.st_mtime);
-      table->inode = TABLE_INODE;
-      table->dev = (dev_t) UNCACHED_DEVICE;
-      set_723(table->isorec.volume_sequence_number, volume_sequence_number);
-      set_733((char *) table->isorec.size, tablesize);
-      table->size = tablesize;
-      table->filedir = this_dir;
-#ifdef ERIC_neverdef
-      table->de_flags    |= INHIBIT_JOLIET_ENTRY;
-#endif
-      table->name = strdup("<translation table>");
-      table->table = (char *) e_malloc(ROUND_UP(tablesize));
-      memset(table->table, 0, ROUND_UP(tablesize));
-      iso9660_file_length  ("TRANS.TBL", table, 0);
-     
-      if(use_RockRidge)
-	{
-	  fstatbuf.st_mode = 0444 | S_IFREG;
-	  fstatbuf.st_nlink = 1;
-	  generate_rock_ridge_attributes("",
-					 "TRANS.TBL", table,
-					 &fstatbuf, &fstatbuf, 0);
-	}
-    }
- 
-  /*
-   * We have now chosen the 8.3 names and we should now know the length
-   * of every entry in the directory.
-   */
-  for(s_entry = this_dir->contents; s_entry; s_entry = s_entry->next)
-    {
-      /* skip if it's hidden */
-      if (s_entry->de_flags & INHIBIT_ISO9660_ENTRY)
-	{
-	  continue;
-	}
-
-      new_reclen = strlen(s_entry->isorec.name);
-	 
-      /*
-       * First update the path table sizes for directories.
-       */
-      if(s_entry->isorec.flags[0] ==  2)
-	{
-	  if (strcmp(s_entry->name,".") && strcmp(s_entry->name,".."))
-	    {
-	      path_table_size += new_reclen + sizeof(struct iso_path_table) - 1;
-	      if (new_reclen & 1) path_table_size++;
-	    }
-	  else
-	    {
-	      new_reclen = 1;
-	      if (this_dir == root && strlen(s_entry->name) == 1)
-		{
-		  path_table_size += sizeof(struct iso_path_table);
-		}
-	    }
-	}
-      if(path_table_size & 1) path_table_size++;  /* For odd lengths we pad */
-      s_entry->isorec.name_len[0] = new_reclen;
-     
-      new_reclen +=
-	sizeof(struct iso_directory_record) -
-	sizeof(s_entry->isorec.name);
-     
-      if (new_reclen & 1)
-	new_reclen++;
-     
-      new_reclen += s_entry->rr_attr_size;
-     
-      if (new_reclen & 1) new_reclen++;
-     
-      if(new_reclen > 0xff)
-	error (1, 0, _("Fatal error - RR overflow for file %s\n"),
-	       s_entry->name);
-      s_entry->isorec.length[0] = new_reclen;
-    }
-
-  status = sort_directory(&this_dir->contents);
-  if( status > 0 )
-    {
-      fprintf (stderr, _("Unable to sort directory %s\n"),
-			this_dir->whole_name);
-    }
-
-  /*
-   * If we are filling out a TRANS.TBL, generate the entries that will
-   * go in the thing.
-   */
-  if(table)
-    {
-      count = 0;
-      for (s_entry = this_dir->contents; s_entry; s_entry = s_entry->next){
-	if(s_entry == table) continue;
-	if(!s_entry->table) continue;
-	if(strcmp(s_entry->name, ".") == 0  ||
-	   strcmp(s_entry->name, "..") == 0) continue;
-	if(s_entry->de_flags & INHIBIT_ISO9660_ENTRY) continue;
-	/*
-	 * Warning: we cannot use the return value of sprintf because
-	 * old BSD based sprintf() implementations will return
-	 * a pointer to the result instead of a count.
-	 */
-	sprintf(table->table + count, "%c %-34s%s",
-		s_entry->table[0],
-		s_entry->isorec.name, s_entry->table+1);
-	count += strlen(table->table + count);
-	free(s_entry->table);
-	s_entry->table = NULL;
-      }
-
-      if(count != tablesize)
-	error (1, 0, _("Translation table size mismatch %d %d\n"),
-	       count, tablesize);
-    }
-
-  /*
-   * Now go through the directory and figure out how large this one will be.
-   * Do not split a directory entry across a sector boundary
-   */
-  s_entry = this_dir->contents;
-  this_dir->ce_bytes = 0;
-  while(s_entry)
-    {
-      /* skip if it's hidden */
-      if (s_entry->de_flags & INHIBIT_ISO9660_ENTRY) {
-	s_entry = s_entry->next;
-	continue;
-      }
-
-      new_reclen = s_entry->isorec.length[0];
-      if ((this_dir->size & (SECTOR_SIZE - 1)) + new_reclen >= SECTOR_SIZE)
-	this_dir->size = (this_dir->size + (SECTOR_SIZE - 1)) &
-	~(SECTOR_SIZE - 1);
-      this_dir->size += new_reclen;
-
-      /* See if continuation entries were used on disc */
-      if(use_RockRidge &&
-	 s_entry->rr_attr_size != s_entry->total_rr_attr_size)
-	{
-	  unsigned char * pnt;
-	  int len;
-	  int nbytes;
-	 
-	  pnt = s_entry->rr_attributes;
-	  len = s_entry->total_rr_attr_size;
-	 
-	  /*
-	   * We make sure that each continuation entry record is not
-	   * split across sectors, but each file could in theory have more
-	   * than one CE, so we scan through and figure out what we need.
-	   */
-	  while(len > 3)
-	    {
-	      if(pnt[0] == 'C' && pnt[1] == 'E')
-		{
-		  nbytes = get_733((char *) pnt+20);
-		 
-		  if((this_dir->ce_bytes & (SECTOR_SIZE - 1)) + nbytes >=
-		     SECTOR_SIZE) this_dir->ce_bytes =
-				    ROUND_UP(this_dir->ce_bytes);
-		  /* Now store the block in the ce buffer */
-		  this_dir->ce_bytes += nbytes;
-		  if(this_dir->ce_bytes & 1) this_dir->ce_bytes++;
-		}
-	      len -= pnt[2];
-	      pnt += pnt[2];
-	    }
-	}
-      s_entry = s_entry->next;
-    }
-  return status;
-}
-
-static void generate_reloc_directory()
-{
-	time_t current_time;
-	struct directory_entry  *s_entry;
-
-	/* Create an  entry for our internal tree */
-	time (&current_time);
-	reloc_dir = (struct directory *)
-		e_malloc(sizeof(struct directory));
-	memset(reloc_dir, 0, sizeof(struct directory));
-	reloc_dir->parent = root;
-	reloc_dir->next = root->subdir;
-	root->subdir = reloc_dir;
-	reloc_dir->depth = 1;
-	reloc_dir->whole_name = strdup("./rr_moved");
-	reloc_dir->de_name =  strdup("rr_moved");
-	reloc_dir->extent = 0;
-
-
-	/* Now create an actual directory  entry */
-	s_entry = (struct directory_entry *)
-		e_malloc(sizeof (struct directory_entry));
-	memset(s_entry, 0, sizeof(struct directory_entry));
-	s_entry->next = root->contents;
-	reloc_dir->self = s_entry;
-
-	/*
-	 * The rr_moved entry will not appear in the Joliet tree.
-	 */
-	reloc_dir->dir_flags |= INHIBIT_JOLIET_ENTRY;
-	s_entry->de_flags    |= INHIBIT_JOLIET_ENTRY;
-
-	root->contents = s_entry;
-	root->contents->name = strdup(reloc_dir->de_name);
-	root->contents->filedir = root;
-	root->contents->isorec.flags[0] = 2;
-	root->contents->priority  = 32768;
-	iso9660_date(root->contents->isorec.date, current_time);
-	root->contents->inode = UNCACHED_INODE;
-	root->contents->dev = (dev_t) UNCACHED_DEVICE;
-	set_723(root->contents->isorec.volume_sequence_number, volume_sequence_number);
-	iso9660_file_length (reloc_dir->de_name, root->contents, 1);
-
-	if(use_RockRidge){
-		fstatbuf.st_mode = 0555 | S_IFDIR;
-		fstatbuf.st_nlink = 2;
-		generate_rock_ridge_attributes("",
-					       "rr_moved", s_entry,
-					       &fstatbuf, &fstatbuf, 0);
-	};
-
-	/* Now create the . and .. entries in rr_moved */
-	/* Now create an actual directory  entry */
-	attach_dot_entries(reloc_dir, &root_statbuf);
-}
-
-/*
- * Function:		attach_dot_entries
- *
- * Purpose:		Create . and .. entries for a new directory.
- *
- * Notes:		Only used for artificial directories that
- *			we are creating.
- */
-static void FDECL2(attach_dot_entries, struct directory *, dirnode,
-		   struct stat *, parent_stat)
-{
-	struct directory_entry  *s_entry;
-	struct directory_entry  *orig_contents;
-	int deep_flag = 0;
-
-	init_fstatbuf();
-
-	orig_contents = dirnode->contents;
-
-	if( (dirnode->dir_flags & DIR_HAS_DOTDOT) == 0 )
-	  {
-	    s_entry = (struct directory_entry *)
-	      e_malloc(sizeof (struct directory_entry));
-	    memcpy(s_entry, dirnode->self,
-		   sizeof(struct directory_entry));
-	    s_entry->name = strdup("..");
-	    s_entry->whole_name = NULL;
-	    s_entry->isorec.name_len[0] = 1;
-	    s_entry->isorec.flags[0] = 2; /* Mark as a directory */
-	    iso9660_file_length ("..", s_entry, 1);
-	    iso9660_date(s_entry->isorec.date, fstatbuf.st_mtime);
-	    s_entry->filedir = dirnode->parent;
-
-	    dirnode->contents = s_entry;
-	    dirnode->contents->next = orig_contents;
-	    orig_contents = s_entry;
-
-	    if(use_RockRidge)
-	      {
-		if( parent_stat == NULL )
-		  {
-		    parent_stat = &fstatbuf;
-		  }
-		generate_rock_ridge_attributes("",
-					       "..", s_entry,
-					       parent_stat,
-					       parent_stat, 0);
-	      }
-	    dirnode->dir_flags |= DIR_HAS_DOTDOT;
-	  }
-
-	if( (dirnode->dir_flags & DIR_HAS_DOT) == 0 )
-	  {
-	    s_entry = (struct directory_entry *)
-	      e_malloc(sizeof (struct directory_entry));
-	    memcpy(s_entry, dirnode->self,
-		   sizeof(struct directory_entry));
-	    s_entry->name = strdup(".");
-	    s_entry->whole_name = NULL;
-	    s_entry->isorec.name_len[0] = 1;
-	    s_entry->isorec.flags[0] = 2; /* Mark as a directory */
-	    iso9660_file_length (".", s_entry, 1);
-	    iso9660_date(s_entry->isorec.date, fstatbuf.st_mtime);
-	    s_entry->filedir = dirnode;
-	   
-	    dirnode->contents = s_entry;
-	    dirnode->contents->next = orig_contents;
-
-	    if(use_RockRidge)
-	      {
-		fstatbuf.st_mode = 0555 | S_IFDIR;
-		fstatbuf.st_nlink = 2;
-	
-		if( dirnode == root )
-		  {
-		    deep_flag |= NEED_CE | NEED_SP;  /* For extension record */
-		  }
-	
-		generate_rock_ridge_attributes("",
-					       ".", s_entry,
-					       &fstatbuf, &fstatbuf, deep_flag);
-	      }
-	   
-	    dirnode->dir_flags |= DIR_HAS_DOT;
-	  }
-
-}
-
-static void FDECL2(update_nlink, struct directory_entry *, s_entry, int, value)
-{
-    unsigned char * pnt;
-    int len;
-   
-    pnt = s_entry->rr_attributes;
-    len = s_entry->total_rr_attr_size;
-    while(len)
-    {
-	if(pnt[0] == 'P' && pnt[1] == 'X')
-	{
-	    set_733((char *) pnt+12, value);
-	    break;
-	}
-	len -= pnt[2];
-	pnt += pnt[2];
-    }
-}
-
-static void FDECL1(increment_nlink, struct directory_entry *, s_entry)
-{
-    unsigned char * pnt;
-    int len, nlink;
-   
-    pnt = s_entry->rr_attributes;
-    len = s_entry->total_rr_attr_size;
-    while(len)
-    {
-	if(pnt[0] == 'P' && pnt[1] == 'X')
-	{
-	    nlink =  get_733((char *) pnt+12);
-	    set_733((char *) pnt+12, nlink+1);
-	    break;
-	}
-	len -= pnt[2];
-	pnt += pnt[2];
-    }
-}
-
-void finish_cl_pl_entries(){
-  struct directory_entry  *s_entry, *s_entry1;
-  struct directory *  d_entry;
-
-  /* if the reloc_dir is hidden (empty), then return */
-  if (reloc_dir->dir_flags & INHIBIT_ISO9660_ENTRY)
-    return;
-
-  s_entry = reloc_dir->contents;
-   s_entry  = s_entry->next->next;  /* Skip past . and .. */
-  for(; s_entry; s_entry = s_entry->next){
-	  /* skip if it's hidden */
-	  if(s_entry->de_flags & INHIBIT_ISO9660_ENTRY) {
-	    continue;
-	  }
-	  d_entry = reloc_dir->subdir;
-	  while(d_entry){
-		  if(d_entry->self == s_entry) break;
-		  d_entry = d_entry->next;
-	  };
-	  if(!d_entry)
-	    error (1, 0, _("Unable to locate directory parent\n"));
-
-	  /* First fix the PL pointer in the directory in the rr_reloc dir */
-	  s_entry1 = d_entry->contents->next;
-	  set_733((char *) s_entry1->rr_attributes +  s_entry1->total_rr_attr_size - 8,
-		  s_entry->filedir->extent);
-
-	  /* Now fix the CL pointer */
-	  s_entry1 = s_entry->parent_rec;
-
-	  set_733((char *) s_entry1->rr_attributes +  s_entry1->total_rr_attr_size - 8,
-		  d_entry->extent);
-
-	  s_entry->filedir = reloc_dir;  /* Now we can fix this */
-  }
-  /* Next we need to modify the NLINK terms in the assorted root directory records
-     to account for the presence of the RR_MOVED directory */
-
-  increment_nlink(root->self);
-  increment_nlink(root->self->next);
-  d_entry = root->subdir;
-  while(d_entry){
-    increment_nlink(d_entry->contents->next);
-    d_entry = d_entry->next;
-  };
-}
-
-/*
- * Function:		scan_directory_tree
- *
- * Purpose:		Walk through a directory on the local machine
- *			filter those things we don't want to include
- *			and build our representation of a dir.
- *
- * Notes:
- */
-int
-FDECL3(scan_directory_tree,struct directory *, this_dir,
-       char *, path,
-       struct directory_entry *, de)
-{
-  DIR				* current_dir;
-  char				  whole_path[1024];
-  struct dirent			* d_entry;
-  struct directory		* parent;
-  int				  dflag;
-  char				* old_path;
-
-    if (verbose > 1)
-    {
-      fprintf (stderr, _("Scanning %s\n"), path);
-    }
-
-  current_dir = opendir(path);
-  d_entry = NULL;
-
-  /* Apparently NFS sometimes allows you to open the directory, but
-     then refuses to allow you to read the contents.  Allow for this */
-
-  old_path = path;
-
-  if(current_dir) d_entry = readdir(current_dir);
-
-  if(!current_dir || !d_entry)
-    {
-      fprintf (stderr, _("Unable to open directory %s\n"), path);
-      de->isorec.flags[0] &= ~2; /* Mark as not a directory */
-      if(current_dir) closedir(current_dir);
-      return 0;
-    }
-
-  parent = de->filedir;
-  /* Set up the struct for the current directory, and insert it into the
-     tree */
-
-#ifdef VMS
-  vms_path_fixup(path);
-#endif
-
-  /*
-   * if entry for this sub-directory is hidden, then hide this directory
-   */
-  if (de->de_flags & INHIBIT_ISO9660_ENTRY)
-    this_dir->dir_flags |= INHIBIT_ISO9660_ENTRY;
- 
-  if (de->de_flags & INHIBIT_JOLIET_ENTRY)
-    this_dir->dir_flags |= INHIBIT_JOLIET_ENTRY;
- 
-  /*
-   * Now we scan the directory itself, and look at what is inside of it.
-   */
-  dflag = 0;
-  while(1==1){
-
-    /* The first time through, skip this, since we already asked for
-       the first entry when we opened the directory. */
-    if(dflag) d_entry = readdir(current_dir);
-    dflag++;
-
-    if(!d_entry) break;
-
-    /* OK, got a valid entry */
-
-    /* If we do not want all files, then pitch the backups. */
-    if(!all_files){
-	    if(   strchr(d_entry->d_name,'~')
-	       || strchr(d_entry->d_name,'#'))
-	      {
-		if( verbose > 0 )
-		  {
-		    fprintf (stderr, _("Ignoring file %s\n"), d_entry->d_name);
-		  }
-		continue;
-	      }
-    }
-
-    if(strlen(path)+strlen(d_entry->d_name) + 2 > sizeof(whole_path))
-      error (1, 0, _("Overflow of stat buffer\n"));
-
-    /* Generate the complete ASCII path for this file */
-    strcpy(whole_path, path);
-#ifndef VMS
-    if(whole_path[strlen(whole_path)-1] != '/')
-      strcat(whole_path, "/");
-#endif
-    strcat(whole_path, d_entry->d_name);
-
-    /** Should we exclude this file ? */
-    if (matches(d_entry->d_name) || matches(whole_path)) {
-      if (verbose > 1) {
-	fprintf (stderr, _("Excluded by match: %s\n"), whole_path);
-      }
-      continue;
-    }
-
-    if(    generate_tables
-	&& strcmp(d_entry->d_name, "TRANS.TBL") == 0 )
-      {
-	/*
-	 * Ignore this entry.  We are going to be generating new
-	 * versions of these files, and we need to ignore any
-	 * originals that we might have found.
-	 */
-	if (verbose > 1)
-	  {
-	    fprintf (stderr, _("Excluded: %s\n"), whole_path);
-	  }
-	continue;
-      }
-
-    /*
-     * If we already have a '.' or a '..' entry, then don't
-     * insert new ones.
-     */
-    if( strcmp(d_entry->d_name, ".") == 0
-	&& this_dir->dir_flags & DIR_HAS_DOT )
-      {
-	continue;
-      }
-
-    if( strcmp(d_entry->d_name, "..") == 0
-	&& this_dir->dir_flags & DIR_HAS_DOTDOT )
-      {
-	continue;
-      }
-
-#if 0
-    if (verbose > 1)  fprintf(stderr, "%s\n",whole_path);
-#endif
-    /*
-     * This actually adds the entry to the directory in question.
-     */
-    insert_file_entry(this_dir, whole_path, d_entry->d_name);
-  }
-  closedir(current_dir);
- 
-  return 1;
-}
-
-
-/*
- * Function:		insert_file_entry
- *
- * Purpose:		Insert one entry into our directory node.
- *
- * Note:
- * This function inserts a single entry into the directory.  It
- * is assumed that all filtering and decision making regarding what
- * we want to include has already been made, so the purpose of this
- * is to insert one entry (file, link, dir, etc), into this directory.
- * Note that if the entry is a dir (or if we are following links,
- * and the thing it points to is a dir), then we will scan those
- * trees before we return.
- */
-int
-FDECL3(insert_file_entry,struct directory *, this_dir,
-       char *, whole_path,
-       char *, short_name)
-{
-  struct stat			  statbuf, lstatbuf;
-  struct directory_entry	* s_entry, *s_entry1;
-  int				  lstatus;
-  int				  status;
-  int				  deep_flag;
-
-  status = stat_filter(whole_path, &statbuf);
-
-  lstatus = lstat_filter(whole_path, &lstatbuf);
-
-  if( (status == -1) && (lstatus == -1) )
-    {
-      /*
-       * This means that the file doesn't exist, or isn't accessible.
-       * Sometimes this is because of NFS permissions problems.
-       */
-      fprintf (stderr, _("Non-existant or inaccessible: %s\n"),whole_path);
-      return 0;
-    }
- 
-  if(this_dir == root && strcmp(short_name, ".") == 0)
-    root_statbuf = statbuf;  /* Save this for later on */
- 
-  /* We do this to make sure that the root entries are consistent */
-  if(this_dir == root && strcmp(short_name, "..") == 0)
-    {
-      statbuf = root_statbuf;
-      lstatbuf = root_statbuf;
-    }
-
-  if(S_ISLNK(lstatbuf.st_mode))
-    {
-     
-      /* Here we decide how to handle the symbolic links.  Here
-	 we handle the general case - if we are not following
-	 links or there is an error, then we must change
-	 something.  If RR is in use, it is easy, we let RR
-	 describe the file.  If not, then we punt the file. */
-     
-      if((status || !follow_links))
-	{
-	  if(use_RockRidge)
-	    {
-	      status = 0;
-	      statbuf.st_size = 0;
-	      STAT_INODE(statbuf) = UNCACHED_INODE;
-	      statbuf.st_dev = (dev_t) UNCACHED_DEVICE;
-	      statbuf.st_mode = (statbuf.st_mode & ~S_IFMT) | S_IFREG;
-	    } else {
-	      if(follow_links)
-		{
-		  fprintf (stderr,
-			   _("Unable to stat file %s - ignoring and continuing.\n"),
-			   whole_path);
-		}
-	      else
-		{
-		  fprintf (stderr,
-			   _("Symlink %s ignored - continuing.\n"),
-			   whole_path);
-		  return 0;  /* Non Rock Ridge discs - ignore all symlinks */
-		}
-	    }
-	}
-     
-      /* Here we handle a different kind of case.  Here we have
-	 a symlink, but we want to follow symlinks.  If we run
-	 across a directory loop, then we need to pretend that
-	 we are not following symlinks for this file.  If this
-	 is the first time we have seen this, then make this
-	 seem as if there was no symlink there in the first
-	 place */
-     
-      if( follow_links
-	  && S_ISDIR(statbuf.st_mode) )
-	{
-	  if(   strcmp(short_name, ".")
-		&& strcmp(short_name, "..") )
-	    {
-	      if(find_directory_hash(statbuf.st_dev, STAT_INODE(statbuf)))
-		{
-		  if(!use_RockRidge)
-		    {
-		      fprintf (stderr, _("Already cached directory seen (%s)\n"),
-			       whole_path);
-		      return 0;
-		    }
-		  statbuf.st_size = 0;
-		  STAT_INODE(statbuf) = UNCACHED_INODE;
-		  statbuf.st_dev = (dev_t) UNCACHED_DEVICE;
-		  statbuf.st_mode = (statbuf.st_mode & ~S_IFMT) | S_IFREG;
-		}
-	      else
-		{
-		  lstatbuf = statbuf;
-		  add_directory_hash(statbuf.st_dev, STAT_INODE(statbuf));
-		}
-	    }
-	}
-     
-      /*
-       * For non-directories, we just copy the stat information over
-       * so we correctly include this file.
-       */
-      if( follow_links
-	  && !S_ISDIR(statbuf.st_mode) )
-	{
-	  lstatbuf = statbuf;
-	}
-    }
- 
-  /*
-   * Add directories to the cache so that we don't waste space even
-   * if we are supposed to be following symlinks.
-   */
-  if( follow_links
-      && strcmp(short_name, ".")
-      && strcmp(short_name, "..")
-      && S_ISDIR(statbuf.st_mode) )
-    {
-      add_directory_hash(statbuf.st_dev, STAT_INODE(statbuf));
-    }
-
-  if(S_ISREG(lstatbuf.st_mode) && (status = access(whole_path, R_OK)))
-    {
-      fprintf (stderr, _("File %s is not readable (%s) - ignoring\n"),
-	       whole_path, strerror (errno));
-      return 0;
-    }
- 
-  /* Add this so that we can detect directory loops with hard links.
-     If we are set up to follow symlinks, then we skip this checking. */
-  if(   !follow_links
-	&& S_ISDIR(lstatbuf.st_mode)
-	&& strcmp(short_name, ".")
-	&& strcmp(short_name, "..") )
-    {
-      if(find_directory_hash(statbuf.st_dev, STAT_INODE(statbuf)))
-	error (1, 0, _("Directory loop - fatal goof (%s %lx %lu).\n"),
-	       whole_path, (unsigned long) statbuf.st_dev,
-	       (unsigned long) STAT_INODE(statbuf));
-      add_directory_hash(statbuf.st_dev, STAT_INODE(statbuf));
-    }
- 
-  if (!S_ISCHR(lstatbuf.st_mode) && !S_ISBLK(lstatbuf.st_mode) &&
-      !S_ISFIFO(lstatbuf.st_mode) && !S_ISSOCK(lstatbuf.st_mode)
-      && !S_ISLNK(lstatbuf.st_mode) && !S_ISREG(lstatbuf.st_mode) &&
-      !S_ISDIR(lstatbuf.st_mode)) {
-    fprintf (stderr, _("Unknown file type %s - ignoring and continuing.\n"),
-	     whole_path);
-    return 0;
-  }
- 
-  /* Who knows what trash this is - ignore and continue */
- 
-  if(status)
-    {
-      fprintf (stderr,
-	       _("Unable to stat file %s - ignoring and continuing.\n"),
-	       whole_path);
-      return 0;
-    }
- 
-  /*
-   * Check to see if we have already seen this directory node.
-   * If so, then we don't create a new entry for it, but we do want
-   * to recurse beneath it and add any new files we do find.
-   */
-  if (S_ISDIR(statbuf.st_mode))
-    {
-      int dflag;
-     
-      for( s_entry = this_dir->contents; s_entry; s_entry = s_entry->next)
-	{
-	  if( strcmp(s_entry->name, short_name) == 0 )
-	    {
-	      break;
-	    }
-	}
-      if ( s_entry != NULL
-	   && strcmp(short_name,".")
-	   && strcmp(short_name,".."))
-	{
-	  struct directory * child;
-	 
-	  if ( (s_entry->de_flags & RELOCATED_DIRECTORY) != 0)
-	    {
-	      for( s_entry = reloc_dir->contents; s_entry; s_entry = s_entry->next)
-		{
-		  if( strcmp(s_entry->name, short_name) == 0 )
-		    {
-		      break;
-		    }
-		}
-	      child = find_or_create_directory(reloc_dir, whole_path,
-					       s_entry, 1);
-	    }
-	  else
-	    {
-	      child = find_or_create_directory(this_dir, whole_path,
-					       s_entry, 1);
-	      /* If unable to scan directory, mark this as a non-directory */
-	    }
-	  dflag = scan_directory_tree(child, whole_path, s_entry);
-	  if(!dflag)
-	    {
-	      lstatbuf.st_mode = (lstatbuf.st_mode & ~S_IFMT) | S_IFREG;
-	    }
-	  return 0;
-	}
-    }
- 
-  s_entry = (struct directory_entry *)
-    e_malloc(sizeof (struct directory_entry));
-  s_entry->next = this_dir->contents;
-  memset(s_entry->isorec.extent, 0, 8);
-  this_dir->contents = s_entry;
-  deep_flag = 0;
-  s_entry->table = NULL;
- 
-  s_entry->name = strdup(short_name);
-  s_entry->whole_name = strdup (whole_path);
-
-  s_entry->de_flags = 0;
-
-  /*
-   * If the current directory is hidden, then hide all it's members
-   * otherwise check if this entry needs to be hidden as well */
-  if (this_dir->dir_flags & INHIBIT_ISO9660_ENTRY) {
-    s_entry->de_flags |= INHIBIT_ISO9660_ENTRY;
-  }
-  else if (strcmp(short_name,".") && strcmp(short_name,"..")) {
-    if (i_matches(short_name) || i_matches(whole_path)) {
-      if (verbose > 1) {
-	fprintf (stderr, _("Hidden from ISO9660 tree: %s\n"), whole_path);
-      }
-      s_entry->de_flags |= INHIBIT_ISO9660_ENTRY;
-    }
-  }
-
-  if (this_dir != reloc_dir && this_dir->dir_flags & INHIBIT_JOLIET_ENTRY) {
-    s_entry->de_flags |= INHIBIT_JOLIET_ENTRY;
-  }
-  else if (strcmp(short_name,".") && strcmp(short_name,"..")) {
-    if (j_matches(short_name) || j_matches(whole_path)) {
-      if (verbose > 1) {
-	fprintf (stderr, _("Hidden from Joliet tree: %s\n"), whole_path);
-      }
-      s_entry->de_flags |= INHIBIT_JOLIET_ENTRY;
-    }
-  }
-
-  s_entry->filedir = this_dir;
-  s_entry->isorec.flags[0] = 0;
-  s_entry->isorec.ext_attr_length[0] = 0;
-  iso9660_date(s_entry->isorec.date, statbuf.st_mtime);
-  s_entry->isorec.file_unit_size[0] = 0;
-  s_entry->isorec.interleave[0] = 0;
-
-  if( strcmp(short_name,  ".") == 0)
-    {
-      this_dir->dir_flags |= DIR_HAS_DOT;
-    }
-
-  if( strcmp(short_name,  "..") == 0)
-    {
-      this_dir->dir_flags |= DIR_HAS_DOTDOT;
-    }
-
-  if(   this_dir->parent
-     && this_dir->parent == reloc_dir
-     && strcmp(short_name,  "..") == 0)
-    {
-      s_entry->inode = UNCACHED_INODE;
-      s_entry->dev = (dev_t) UNCACHED_DEVICE;
-      deep_flag  = NEED_PL;
-    }
-  else
-    {
-      s_entry->inode = STAT_INODE(statbuf);
-      s_entry->dev = statbuf.st_dev;
-    }
-  set_723(s_entry->isorec.volume_sequence_number, volume_sequence_number);
-  iso9660_file_length(short_name, s_entry, S_ISDIR(statbuf.st_mode));
-  s_entry->rr_attr_size = 0;
-  s_entry->total_rr_attr_size = 0;
-  s_entry->rr_attributes = NULL;
- 
-  /* Directories are assigned sizes later on */
-  if (!S_ISDIR(statbuf.st_mode))
-    {
-      if (S_ISCHR(lstatbuf.st_mode) || S_ISBLK(lstatbuf.st_mode) ||
-	  S_ISFIFO(lstatbuf.st_mode) || S_ISSOCK(lstatbuf.st_mode)
-	  || S_ISLNK(lstatbuf.st_mode))
-	{
-	  s_entry->size = 0;
-	  statbuf.st_size = 0;
-	}
-      else
-	{
-	  s_entry->size = statbuf.st_size;
-	}
-
-      set_733((char *) s_entry->isorec.size, statbuf.st_size);
-    }
-  else
-    {
-      s_entry->isorec.flags[0] = 2;
-    }
- 
-  if (strcmp(short_name,".") && strcmp(short_name,"..") &&
-      S_ISDIR(statbuf.st_mode) && this_dir->depth > RR_relocation_depth)
-    {
-      struct directory * child;
-
-      if(!reloc_dir) generate_reloc_directory();
-     
-      /*
-       * Replicate the entry for this directory.  The old one will stay where it
-       * is, and it will be neutered so that it no longer looks like a directory.
-       * The new one will look like a directory, and it will be put in the reloc_dir.
-       */
-      s_entry1 = (struct directory_entry *)
-	e_malloc(sizeof (struct directory_entry));
-      memcpy(s_entry1, s_entry,  sizeof(struct directory_entry));
-      s_entry1->table = NULL;
-      s_entry1->name = strdup(this_dir->contents->name);
-      s_entry1->whole_name = strdup(this_dir->contents->whole_name);
-      s_entry1->next = reloc_dir->contents;
-      reloc_dir->contents = s_entry1;
-      s_entry1->priority  =  32768;
-      s_entry1->parent_rec = this_dir->contents;
-     
-      deep_flag = NEED_RE;
-     
-      if(use_RockRidge)
-	{
-	  generate_rock_ridge_attributes(whole_path,
-					 short_name, s_entry1,
-					 &statbuf, &lstatbuf, deep_flag);
-	}
-     
-      deep_flag = 0;
-     
-      /* We need to set this temporarily so that the parent to this
-	 is correctly determined. */
-      s_entry1->filedir = reloc_dir;
-      child = find_or_create_directory(reloc_dir, whole_path,
-				       s_entry1, 0);
-      scan_directory_tree(child, whole_path, s_entry1);
-      s_entry1->filedir = this_dir;
-     
-      statbuf.st_size = 0;
-      statbuf.st_mode &= 0777;
-      set_733((char *) s_entry->isorec.size, 0);
-      s_entry->size = 0;
-      s_entry->isorec.flags[0] = 0;
-      s_entry->inode = UNCACHED_INODE;
-      s_entry->de_flags |= RELOCATED_DIRECTORY;
-      deep_flag = NEED_CL;
-    }
- 
-  if(generate_tables
-     && strcmp(s_entry->name, ".")
-     && strcmp(s_entry->name, ".."))
-    {
-      char  buffer[2048];
-      int nchar;
-      switch(lstatbuf.st_mode & S_IFMT)
-	{
-	case S_IFDIR:
-	  sprintf(buffer,"D\t%s\n",
-		  s_entry->name);
-	  break;
-#ifdef S_IFBLK
-/* extra for WIN32 - if it doesn't have the major/minor defined, then
-   S_IFBLK and S_IFCHR type files are unlikely to exist anyway ...
-   code similar to that in rock.c */
-
-/* for some reason, MAJOR_IN_SYSMACROS isn't defined on a SunOS when
-   it should be, so see if major() is defined instead  */
-/*
-#if !(defined(MAJOR_IN_SYSMACROS) || defined(MAJOR_IN_MKDEV))
-*/
-#ifndef major
-#define major(dev) (sizeof(dev_t) <= 2 ? ((dev) >> 8) : \
-	(sizeof(dev_t) <= 4 ? (((dev) >> 8) >> 8) : \
-	(((dev) >> 16) >> 16)))
-#define minor(dev) (sizeof(dev_t) <= 2 ? (dev) & 0xff : \
-	(sizeof(dev_t) <= 4 ? (dev) & 0xffff : \
-	(dev) & 0xffffffff))
-#endif
-	case S_IFBLK:
-	  sprintf(buffer,"B\t%s\t%lu %lu\n",
-		  s_entry->name,
-		  (unsigned long) major(statbuf.st_rdev),
-		  (unsigned long) minor(statbuf.st_rdev));
-	  break;
-#endif
-#ifdef S_IFIFO
-	case S_IFIFO:
-	  sprintf(buffer,"P\t%s\n",
-		  s_entry->name);
-	  break;
-#endif
-#ifdef S_IFCHR
-	case S_IFCHR:
-	  sprintf(buffer,"C\t%s\t%lu %lu\n",
-		  s_entry->name,
-		  (unsigned long) major(statbuf.st_rdev),
-		  (unsigned long) minor(statbuf.st_rdev));
-	  break;
-#endif
-#ifdef S_IFLNK
-	case S_IFLNK:
-	  nchar = readlink(whole_path,
-			   (char *)symlink_buff,
-			   sizeof(symlink_buff));
-	  symlink_buff[nchar < 0 ? 0 : nchar] = 0;
-	  sprintf(buffer,"L\t%s\t%s\n",
-		  s_entry->name, symlink_buff);
-	  break;
-#endif
-#ifdef S_IFSOCK
-	case S_IFSOCK:
-	  sprintf(buffer,"S\t%s\n",
-		  s_entry->name);
-	  break;
-#endif
-	case S_IFREG:
-	default:
-	  sprintf(buffer,"F\t%s\n",
-		  s_entry->name);
-	  break;
-	};
-      s_entry->table = strdup(buffer);
-    }
- 
-  if(S_ISDIR(statbuf.st_mode))
-    {
-      int dflag;
-      if (strcmp(short_name,".") && strcmp(short_name,".."))
-	{
-	  struct directory * child;
-	 
-	  child = find_or_create_directory(this_dir, whole_path,
-					   s_entry, 1);
-	  dflag = scan_directory_tree(child, whole_path, s_entry);
-	 
-	  if(!dflag)
-	    {
-	      lstatbuf.st_mode = (lstatbuf.st_mode & ~S_IFMT) | S_IFREG;
-	      if( child->contents == NULL )
-		{
-		  delete_directory(this_dir, child);
-		}
-	    }
-	}
-      /* If unable to scan directory, mark this as a non-directory */
-    }
- 
-  if(use_RockRidge && this_dir == root && strcmp(s_entry->name, ".")  == 0)
-    {
-      deep_flag |= NEED_CE | NEED_SP;  /* For extension record */
-    }
- 
-  /* Now figure out how much room this file will take in the
-     directory */
- 
-  if(use_RockRidge)
-    {
-      generate_rock_ridge_attributes(whole_path,
-				     short_name, s_entry,
-				     &statbuf, &lstatbuf, deep_flag);
-     
-    }
- 
-  return 1;
-}
-
-
-void FDECL2(generate_iso9660_directories, struct directory *, node, FILE*, outfile){
-  struct directory * dpnt;
-
-  dpnt = node;
-
-  while (dpnt){
-    if( dpnt->extent > session_start )
-      {
-	generate_one_directory(dpnt, outfile);
-      }
-    if(dpnt->subdir) generate_iso9660_directories(dpnt->subdir, outfile);
-    dpnt = dpnt->next;
-  }
-}
-
-/*
- * Function:	find_or_create_directory
- *
- * Purpose:	Locate a directory entry in the tree, create if needed.
- *
- * Arguments:
- */
-struct directory * FDECL4(find_or_create_directory, struct directory *, parent,
-			  const char *, path,
-			  struct directory_entry *, de, int, flag)
-{
-  struct directory		* dpnt;
-  struct directory_entry	* orig_de;
-  struct directory		* next_brother;
-  const char                    * cpnt;
-  const char			* pnt;
-
-  orig_de = de;
-
-  pnt = strrchr(path, PATH_SEPARATOR);
-  if( pnt == NULL )
-    {
-      pnt = path;
-    }
-  else
-    {
-      pnt++;
-    }
-
-  if( parent != NULL )
-    {
-      dpnt = parent->subdir;
-
-      while (dpnt)
-	{
-	  /*
-	   * Weird hack time - if there are two directories by the
-	   * same name in the reloc_dir, they are not treated as the
-	   * same thing unless the entire path matches completely.
-	   */
-	  if( flag && strcmp(dpnt->de_name, pnt) == 0 )
-	    {
-	      return dpnt;
-	    }
-	  dpnt = dpnt->next;
-	}
-    }
-
-  /*
-   * We don't know if we have a valid directory entry for this one
-   * yet.  If not, we need to create one.
-   */
-  if( de == NULL )
-    {
-      de = (struct directory_entry *)
-	e_malloc(sizeof (struct directory_entry));
-      memset(de, 0, sizeof(struct directory_entry));
-      de->next            = parent->contents;
-      parent->contents    = de;
-      de->name            = strdup(pnt);
-      de->filedir         = parent;
-      de->isorec.flags[0] = 2;
-      de->priority        = 32768;
-      de->inode           = UNCACHED_INODE;
-      de->dev             = (dev_t) UNCACHED_DEVICE;
-      set_723(de->isorec.volume_sequence_number, volume_sequence_number);
-      iso9660_file_length (pnt, de, 1);
-
-      init_fstatbuf();
-      /*
-       * It doesn't exist for real, so we cannot add any Rock Ridge.
-       */
-      if(use_RockRidge)
-	{
-	  fstatbuf.st_mode = 0555 | S_IFDIR;
-	  fstatbuf.st_nlink = 2;
-	  generate_rock_ridge_attributes("",
-					 (char *) pnt, de,
-					 &fstatbuf,
-					 &fstatbuf, 0);
-	}
-      iso9660_date(de->isorec.date, fstatbuf.st_mtime);
-
-    }
-
-  /*
-   * If we don't have a directory for this one yet, then allocate it
-   * now, and patch it into the tree in the appropriate place.
-   */
-  dpnt             = (struct directory *) e_malloc(sizeof(struct directory));
-  memset(dpnt, 0, sizeof(struct directory));
-  dpnt->next       = NULL;
-  dpnt->subdir     = NULL;
-  dpnt->self       = de;
-  dpnt->contents   = NULL;
-  dpnt->whole_name = strdup(path);
-  cpnt             = strrchr(path, PATH_SEPARATOR);
-  if(cpnt)
-    cpnt++;
-  else
-    cpnt = path;
-  dpnt->de_name    = strdup(cpnt);
-  dpnt->size       = 0;
-  dpnt->extent     = 0;
-  dpnt->jextent    = 0;
-  dpnt->jsize      = 0;
-
-  if( orig_de == NULL )
-    {
-      struct stat xstatbuf;
-      int sts;
-
-      /*
-       * Now add a . and .. entry in the directory itself.
-       * This is a little tricky - if the real directory
-       * exists, we need to stat it first.  Otherwise, we
-       * use the fictitious fstatbuf which points to the time
-       * at which mkisofs was started.
-       */
-      sts = stat_filter(parent->whole_name, &xstatbuf);
-      if( sts == 0 )
-	{
-	  attach_dot_entries(dpnt, &xstatbuf);
-	}
-      else
-	{
-	  attach_dot_entries(dpnt, &fstatbuf);
-	}
-    }
-
-  if(!parent || parent == root)
-    {
-      if (!root)
-	{
-	  root = dpnt;  /* First time through for root directory only */
-	  root->depth = 0;
-	  root->parent = root;
-	} else {
-	  dpnt->depth = 1;
-	  if(!root->subdir)
-	    {
-	      root->subdir = dpnt;
-	    }
-	  else
-	    {
-	      next_brother = root->subdir;
-	      while(next_brother->next) next_brother = next_brother->next;
-	      next_brother->next = dpnt;
-	    }
-	  dpnt->parent = parent;
-	}
-    }
-  else
-    {
-      /* Come through here for  normal traversal of  tree */
-#ifdef DEBUG
-      fprintf(stderr,"%s(%d) ", path, dpnt->depth);
-#endif
-      if(parent->depth > RR_relocation_depth)
-	error (1, 0, _("Directories too deep  %s\n"), path);
-     
-      dpnt->parent = parent;
-      dpnt->depth = parent->depth + 1;
-     
-      if(!parent->subdir)
-	{
-	  parent->subdir = dpnt;
-	}
-      else
-	{
-	  next_brother = parent->subdir;
-	  while(next_brother->next) next_brother = next_brother->next;
-	  next_brother->next = dpnt;
-	}
-    }
-
-  return dpnt;
-}
-
-/*
- * Function:	delete_directory
- *
- * Purpose:	Locate a directory entry in the tree, create if needed.
- *
- * Arguments:
- */
-static void FDECL2(delete_directory, struct directory *, parent, struct directory *, child)
-{
-  struct directory		* tdir;
-
-  if( child->contents != NULL )
-    error (1, 0, _("Unable to delete non-empty directory\n"));
-
-  free(child->whole_name);
-  child->whole_name = NULL;
-
-  free(child->de_name);
-  child->de_name = NULL;
-
-  if( parent->subdir == child )
-    {
-      parent->subdir = child->next;
-    }
-  else
-    {
-      for( tdir = parent->subdir; tdir->next != NULL; tdir = tdir->next )
-	{
-	  if( tdir->next == child )
-	    {
-	      tdir->next = child->next;
-	      break;
-	    }
-	}
-      if( tdir == NULL )
-	error (1, 0, _("Unable to locate child directory in parent list\n"));
-    }
-  free(child);
-  return;
-}
-
-int FDECL1(sort_tree, struct directory *, node){
-  struct directory * dpnt;
-  int ret = 0;
-
-  dpnt = node;
-
-  while (dpnt){
-    ret = sort_n_finish(dpnt);
-    if( ret )
-      {
-	break;
-      }
-   
-    if(dpnt->subdir) sort_tree(dpnt->subdir);
-    dpnt = dpnt->next;
-  }
-  return ret;
-}
-
-void FDECL1(dump_tree, struct directory *, node){
-  struct directory * dpnt;
-
-  dpnt = node;
-
-  while (dpnt){
-    fprintf(stderr,"%4d %5d %s\n",dpnt->extent, dpnt->size, dpnt->de_name);
-    if(dpnt->subdir) dump_tree(dpnt->subdir);
-    dpnt = dpnt->next;
-  }
-}
-
-void FDECL1(update_nlink_field, struct directory *, node)
-{
-    struct directory		* dpnt;
-    struct directory		* xpnt;
-    struct directory_entry	* s_entry;
-    int				  i;
-
-    dpnt = node;
-   
-    while (dpnt)
-    {
-	if (dpnt->dir_flags & INHIBIT_ISO9660_ENTRY) {
-	    dpnt = dpnt->next;
-	    continue;
-	}
-
-	/*
-	 * First, count up the number of subdirectories this guy has.
-	 */
-        for(i=0, xpnt = dpnt->subdir; xpnt; xpnt = xpnt->next)
-            if ((xpnt->dir_flags & INHIBIT_ISO9660_ENTRY) == 0)
-                i++;
-	/*
-	 * Next check to see if we have any relocated directories
-	 * in this directory.   The nlink field will include these
-	 * as real directories when they are properly relocated.
-	 *
-	 * In the non-rockridge disk, the relocated entries appear
-	 * as zero length files.
-	 */
-	for(s_entry = dpnt->contents; s_entry; s_entry = s_entry->next)
-	{
-		if( (s_entry->de_flags  & RELOCATED_DIRECTORY) != 0 &&
-			(s_entry->de_flags  & INHIBIT_ISO9660_ENTRY) == 0)
-		{
-			i++;
-		}
-	}
-	/*
-	 * Now update the field in the Rock Ridge entry.
-	 */
-	update_nlink(dpnt->self, i + 2);
-
-	/*
-	 * Update the '.' entry for this directory.
-	 */
-	update_nlink(dpnt->contents, i + 2);
-
-	/*
-	 * Update all of the '..' entries that point to this guy.
-	 */
-	for(xpnt = dpnt->subdir; xpnt; xpnt = xpnt->next)
-	    update_nlink(xpnt->contents->next, i + 2);
-
-	if(dpnt->subdir) update_nlink_field(dpnt->subdir);
-	dpnt = dpnt->next;
-    }
-}
-
-/*
- * something quick and dirty to locate a file given a path
- * recursively walks down path in filename until it finds the
- * directory entry for the desired file
- */
-struct directory_entry * FDECL2(search_tree_file, struct directory *,
-				node,char *, filename)
-{
-  struct directory_entry * depnt;
-  struct directory	 * dpnt;
-  char			 * p1;
-  char			 * rest;
-  char			 * subdir;
-
-  /*
-   * strip off next directory name from filename
-   */
-  subdir = strdup(filename);
-
-  if( (p1=strchr(subdir, '/')) == subdir )
-    {
-      fprintf (stderr, _("call to search_tree_file with an absolute path, stripping\n"));
-      fprintf (stderr, _("initial path separator. Hope this was intended...\n"));
-      memmove(subdir, subdir+1, strlen(subdir)-1);
-      p1 = strchr(subdir, '/');
-    }
-
-  /*
-   * do we need to find a subdirectory
-   */
-  if (p1)
-    {
-      *p1 = '\0';
-
-#ifdef DEBUG_TORITO
-      fprintf(stderr,"Looking for subdir called %s\n",p1);
-#endif
-
-      rest = p1+1;
-
-#ifdef DEBUG_TORITO
-      fprintf(stderr,"Remainder of path name is now %s\n", rest);
-#endif
-     
-      dpnt = node->subdir;
-     while( dpnt )
-       {
-#ifdef DEBUG_TORITO
-	 fprintf(stderr,"%4d %5d %s\n", dpnt->extent, dpnt->size,
-		 dpnt->de_name);
-#endif
-	 if (!strcmp(subdir, dpnt->de_name))
-	   {
-#ifdef DEBUG_TORITO
-	     fprintf(stderr,"Calling next level with filename = %s", rest);
-#endif
-	     return(search_tree_file( dpnt, rest ));
-	   }
-	 dpnt = dpnt->next;
-       }
-     
-     /* if we got here means we couldnt find the subdir */
-     return (NULL);
-    }   
-  else
-    {
-      /*
-       * look for a normal file now
-       */
-      depnt = node->contents;
-      while (depnt)
-	{
-#ifdef DEBUG_TORITO
-	  fprintf(stderr,"%4d %5d %s\n",depnt->isorec.extent,
-		  depnt->size, depnt->name);
-#endif
-	  if (!strcmp(filename, depnt->name))
-	    {
-#ifdef DEBUG_TORITO
-	      fprintf(stderr,"Found our file %s", filename);
-#endif
-	      return(depnt);
-	    }
-	  depnt = depnt->next;
-	}
-      /*
-       * if we got here means we couldnt find the subdir
-       */
-      return (NULL);
-    }
-  fprintf (stderr, "We cant get here in search_tree_file :-/ \n");
-}
-
-void init_fstatbuf()
-{
-  time_t		    current_time;
-
-  if(fstatbuf.st_ctime == 0)
-    {
-      time (&current_time);
-      if( rationalize )
-	{
-	  fstatbuf.st_uid = 0;
-	  fstatbuf.st_gid = 0;
-	}
-      else
-	{
-	  fstatbuf.st_uid = getuid();
-	  fstatbuf.st_gid = getgid();
-	}
-      fstatbuf.st_ctime = current_time;
-      fstatbuf.st_mtime = current_time;
-      fstatbuf.st_atime = current_time;
-    }
-}
diff --git a/util/mkisofs/write.c b/util/mkisofs/write.c
deleted file mode 100644
index e1cdd213e..000000000
--- a/util/mkisofs/write.c
+++ /dev/null
@@ -1,1483 +0,0 @@
-/*
- * Program write.c - dump memory  structures to  file for iso9660 filesystem.
-
-   Written by Eric Youngdale (1993).
-
-   Copyright 1993 Yggdrasil Computing, Incorporated
-
-   Copyright (C) 2009  Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <errno.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <assert.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include "mkisofs.h"
-#include "iso9660.h"
-#include "msdos_partition.h"
-
-#ifdef __SVR4
-extern char * strdup(const char *);
-#endif
-
-#ifdef VMS
-extern char * strdup(const char *);
-#endif
-
-
-/* Max number of sectors we will write at  one time */
-#define NSECT 16
-
-/* Counters for statistics */
-
-static int table_size       = 0;
-static int total_dir_size   = 0;
-static int rockridge_size   = 0;
-static struct directory ** pathlist;
-static int next_path_index  = 1;
-static int sort_goof;
-
-struct output_fragment * out_tail;
-struct output_fragment * out_list;
-
-struct iso_primary_descriptor vol_desc;
-
-static int root_gen	__PR((void));
-static int generate_path_tables	__PR((void));
-static int file_gen	__PR((void));
-static int dirtree_dump	__PR((void));
-
-/* Routines to actually write the disc.  We write sequentially so that
-   we could write a tape, or write the disc directly */
-
-
-#define FILL_SPACE(X)   memset(vol_desc.X, ' ', sizeof(vol_desc.X))
-
-void FDECL2(set_721, char *, pnt, unsigned int, i)
-{
-     pnt[0] = i & 0xff;
-     pnt[1] = (i >> 8) &  0xff;
-}
-
-void FDECL2(set_722, char *, pnt, unsigned int, i)
-{
-     pnt[0] = (i >> 8) &  0xff;
-     pnt[1] = i & 0xff;
-}
-
-void FDECL2(set_723, char *, pnt, unsigned int, i)
-{
-     pnt[3] = pnt[0] = i & 0xff;
-     pnt[2] = pnt[1] = (i >> 8) &  0xff;
-}
-
-void FDECL2(set_731, char *, pnt, unsigned int, i)
-{
-     pnt[0] = i & 0xff;
-     pnt[1] = (i >> 8) &  0xff;
-     pnt[2] = (i >> 16) &  0xff;
-     pnt[3] = (i >> 24) &  0xff;
-}
-
-void FDECL2(set_732, char *, pnt, unsigned int, i)
-{
-     pnt[3] = i & 0xff;
-     pnt[2] = (i >> 8) &  0xff;
-     pnt[1] = (i >> 16) &  0xff;
-     pnt[0] = (i >> 24) &  0xff;
-}
-
-int FDECL1(get_731, char *, p)
-{
-  return ((p[0] & 0xff)
-	  | ((p[1] & 0xff) << 8)
-	  | ((p[2] & 0xff) << 16)
-	  | ((p[3] & 0xff) << 24));
-}
-
-int FDECL1(get_733, char *, p)
-{
-     return ((p[0] & 0xff)
-	     | ((p[1] & 0xff) << 8)
-	     | ((p[2] & 0xff) << 16)
-	     | ((p[3] & 0xff) << 24));
-}
-
-void FDECL2(set_733, char *, pnt, unsigned int, i)
-{
-     pnt[7] = pnt[0] = i & 0xff;
-     pnt[6] = pnt[1] = (i >> 8) &  0xff;
-     pnt[5] = pnt[2] = (i >> 16) &  0xff;
-     pnt[4] = pnt[3] = (i >> 24) &  0xff;
-}
-
-void FDECL4(xfwrite, void *, buffer, uint64_t, count, uint64_t, size, FILE *, file)
-{
-	/*
-	 * This is a hack that could be made better. XXXIs this the only place?
-	 * It is definitely needed on Operating Systems that do not
-	 * allow to write files that are > 2GB.
-	 * If the system is fast enough to be able to feed 1400 KB/s
-	 * writing speed of a DVD-R drive, use stdout.
-	 * If the system cannot do this reliable, you need to use this
-	 * hacky option.
-	 */
-	static	int	idx = 0;
-	if (split_output != 0 &&
-	    (idx == 0 || ftell(file) >= (1024 * 1024 * 1024) )) {
-			char	nbuf[512];
-		extern	char	*outfile;
-
-		if (idx == 0)
-			unlink(outfile);
-		sprintf(nbuf, "%s_%02d", outfile, idx++);
-		file = freopen(nbuf, "wb", file);
-		if (file == NULL)
-		  error (1, errno, _("Cannot open `%s'"), nbuf);
-
-	}
-     while(count)
-     {
-	  size_t got = fwrite (buffer, size, count, file);
-
-	  if (got != count)
-	    error (1, errno, _("cannot fwrite %llu*%llu\n"), size, count);
-	  count-=got,*(char**)&buffer+=size*got;
-     }
-}
-
-struct deferred_write
-{
-  struct deferred_write * next;
-  char			* table;
-  uint64_t		  extent;
-  uint64_t		  size;
-  char			* name;
-};
-
-static struct deferred_write * dw_head = NULL, * dw_tail = NULL;
-
-uint64_t last_extent_written = 0;
-static unsigned int path_table_index;
-static time_t begun;
-
-/* We recursively walk through all of the directories and assign extent
-   numbers to them.  We have already assigned extent numbers to everything that
-   goes in front of them */
-
-static int FDECL1(assign_directory_addresses, struct directory *, node)
-{
-     int		dir_size;
-     struct directory * dpnt;
-
-     dpnt = node;
-    
-     while (dpnt)
-     {
-	  /* skip if it's hidden */
-	  if(dpnt->dir_flags & INHIBIT_ISO9660_ENTRY) {
-	     dpnt = dpnt->next;
-	     continue;
-	  }
-
-	  /*
-	   * If we already have an extent for this (i.e. it came from
-	   * a multisession disc), then don't reassign a new extent.
-	   */
-	  dpnt->path_index = next_path_index++;
-	  if( dpnt->extent == 0 )
-	  {
-	       dpnt->extent = last_extent;
-	       dir_size = (dpnt->size + (SECTOR_SIZE - 1)) >> 11;
-	      
-	       last_extent += dir_size;
-	      
-	       /*
-		* Leave room for the CE entries for this directory.  Keep them
-		* close to the reference directory so that access will be
-		* quick.
-		*/
-	       if(dpnt->ce_bytes)
-	       {
-		    last_extent += ROUND_UP(dpnt->ce_bytes) >> 11;
-	       }
-	  }
-
-	  if(dpnt->subdir)
-	  {
-	       assign_directory_addresses(dpnt->subdir);
-	  }
-
-	  dpnt = dpnt->next;
-     }
-     return 0;
-}
-
-static void FDECL3(write_one_file, char *, filename,
-		   uint64_t, size, FILE *, outfile)
-{
-     char		  buffer[SECTOR_SIZE * NSECT];
-     FILE		* infile;
-     int64_t		  remain;
-     size_t		  use;
-
-
-     if ((infile = fopen(filename, "rb")) == NULL)
-       error (1, errno, _("cannot open %s\n"), filename);
-     remain = size;
-
-     while(remain > 0)
-     {
-	  use =  (remain >  SECTOR_SIZE * NSECT - 1 ? NSECT*SECTOR_SIZE : remain);
-	  use = ROUND_UP(use); /* Round up to nearest sector boundary */
-	  memset(buffer, 0, use);
-	  if (fread(buffer, 1, use, infile) == 0)
-	    error (1, errno, _("cannot read %llu bytes from %s"), use, filename);
-	  xfwrite(buffer, 1, use, outfile);
-	  last_extent_written += use/SECTOR_SIZE;
-#if 0
-	  if((last_extent_written % 1000) < use/SECTOR_SIZE)
-	  {
-	       fprintf(stderr,"%d..", last_extent_written);
-	  }
-#else
-	  if((last_extent_written % 5000) < use/SECTOR_SIZE)
-	  {
-	       time_t now;
-	       time_t the_end;
-	       double frac;
-	      
-	       time(&now);
-	       frac = last_extent_written / (double)last_extent;
-	       the_end = begun + (now - begun) / frac;
-	       fprintf (stderr, _("%6.2f%% done, estimate finish %s"),
-			frac * 100., ctime(&the_end));
-	  }
-#endif
-	  remain -= use;
-     }
-     fclose(infile);
-} /* write_one_file(... */
-
-static void FDECL1(write_files, FILE *, outfile)
-{
-     struct deferred_write * dwpnt, *dwnext;
-     dwpnt = dw_head;
-     while(dwpnt)
-     {
-	  if(dwpnt->table)
-	  {
-	    write_one_file (dwpnt->table, dwpnt->size, outfile);
-	    table_size += dwpnt->size;
-	    free (dwpnt->table);
-	  }
-	  else
-	  {
-
-#ifdef VMS
-	       vms_write_one_file(dwpnt->name, dwpnt->size, outfile);
-#else
-	       write_one_file(dwpnt->name, dwpnt->size, outfile);
-#endif
-	       free(dwpnt->name);
-	  }
-
-	  dwnext = dwpnt;
-	  dwpnt = dwpnt->next;
-	  free(dwnext);
-     }
-} /* write_files(... */
-
-#if 0
-static void dump_filelist()
-{
-     struct deferred_write * dwpnt;
-     dwpnt = dw_head;
-     while(dwpnt)
-     {
-	  fprintf(stderr, "File %s\n",dwpnt->name);
-	  dwpnt = dwpnt->next;
-     }
-     fprintf(stderr,"\n");
-}
-#endif
-
-static int FDECL2(compare_dirs, const void *, rr, const void *, ll)
-{
-     char * rpnt, *lpnt;
-     struct directory_entry ** r, **l;
-    
-     r = (struct directory_entry **) rr;
-     l = (struct directory_entry **) ll;
-     rpnt = (*r)->isorec.name;
-     lpnt = (*l)->isorec.name;
-
-     /*
-      * If the entries are the same, this is an error.
-      */
-     if( strcmp(rpnt, lpnt) == 0 )
-       {
-	 sort_goof++;
-       }
-    
-     /*
-      *  Put the '.' and '..' entries on the head of the sorted list.
-      *  For normal ASCII, this always happens to be the case, but out of
-      *  band characters cause this not to be the case sometimes.
-      *
-      * FIXME(eric) - these tests seem redundant, in taht the name is
-      * never assigned these values.  It will instead be \000 or \001,
-      * and thus should always be sorted correctly.   I need to figure
-      * out why I thought I needed this in the first place.
-      */
-#if 0
-     if( strcmp(rpnt, ".") == 0 ) return -1;
-     if( strcmp(lpnt, ".") == 0 ) return  1;
-
-     if( strcmp(rpnt, "..") == 0 ) return -1;
-     if( strcmp(lpnt, "..") == 0 ) return  1;
-#else
-     /*
-      * The code above is wrong (as explained in Eric's comment), leading to incorrect
-      * sort order iff the -L option ("allow leading dots") is in effect and a directory
-      * contains entries that start with a dot.
-      *
-      * (TF, Tue Dec 29 13:49:24 CET 1998)
-      */
-     if((*r)->isorec.name_len[0] == 1 && *rpnt == 0) return -1; /* '.' */
-     if((*l)->isorec.name_len[0] == 1 && *lpnt == 0) return 1;
-
-     if((*r)->isorec.name_len[0] == 1 && *rpnt == 1) return -1; /* '..' */
-     if((*l)->isorec.name_len[0] == 1 && *lpnt == 1) return 1;
-#endif
-
-     while(*rpnt && *lpnt)
-     {
-	  if(*rpnt == ';' && *lpnt != ';') return -1;
-	  if(*rpnt != ';' && *lpnt == ';') return 1;
-	 
-	  if(*rpnt == ';' && *lpnt == ';') return 0;
-	 
-	  if(*rpnt == '.' && *lpnt != '.') return -1;
-	  if(*rpnt != '.' && *lpnt == '.') return 1;
-	 
-	  if((unsigned char)*rpnt < (unsigned char)*lpnt) return -1;
-	  if((unsigned char)*rpnt > (unsigned char)*lpnt) return 1;
-	  rpnt++;  lpnt++;
-     }
-     if(*rpnt) return 1;
-     if(*lpnt) return -1;
-     return 0;
-}
-
-/*
- * Function:		sort_directory
- *
- * Purpose:		Sort the directory in the appropriate ISO9660
- *			order.
- *
- * Notes:		Returns 0 if OK, returns > 0 if an error occurred.
- */
-int FDECL1(sort_directory, struct directory_entry **, sort_dir)
-{
-     int dcount = 0;
-     int xcount = 0;
-     int j;
-     int i, len;
-     struct directory_entry * s_entry;
-     struct directory_entry ** sortlist;
-    
-     /* need to keep a count of how many entries are hidden */
-     s_entry = *sort_dir;
-     while(s_entry)
-     {
-	  if (s_entry->de_flags & INHIBIT_ISO9660_ENTRY)
-	    xcount++;
-	  dcount++;
-	  s_entry = s_entry->next;
-     }
-
-     if( dcount == 0 )
-     {
-          return 0;
-     }
-
-     /*
-      * OK, now we know how many there are.  Build a vector for sorting.
-      */
-     sortlist =   (struct directory_entry **)
-	  e_malloc(sizeof(struct directory_entry *) * dcount);
-
-     j = dcount - 1;
-     dcount = 0;
-     s_entry = *sort_dir;
-     while(s_entry)
-     {
-	if(s_entry->de_flags & INHIBIT_ISO9660_ENTRY)
-	 {
-	  /* put any hidden entries at the end of the vector */
-	  sortlist[j--] = s_entry;
-	 }
-	else
-	 {
-	  sortlist[dcount] = s_entry;
-	  dcount++;
-	 }
-	 len = s_entry->isorec.name_len[0];
-	 s_entry->isorec.name[len] = 0;
-	 s_entry = s_entry->next;
-     }
- 
-     /*
-      * Each directory is required to contain at least . and ..
-      */
-     if( dcount < 2 )
-       {
-	 sort_goof = 1;
-	
-       }
-     else
-       {
-	 /* only sort the non-hidden entries */
-	 sort_goof = 0;
-#ifdef __STDC__
-	 qsort(sortlist, dcount, sizeof(struct directory_entry *),
-	       (int (*)(const void *, const void *))compare_dirs);
-#else
-	 qsort(sortlist, dcount, sizeof(struct directory_entry *),
-	       compare_dirs);
-#endif
-	
-	 /*
-	  * Now reassemble the linked list in the proper sorted order
-	  * We still need the hidden entries, as they may be used in the
-	  * Joliet tree.
-	  */
-	 for(i=0; i<dcount+xcount-1; i++)
-	   {
-	     sortlist[i]->next = sortlist[i+1];
-	   }
-	
-	 sortlist[dcount+xcount-1]->next = NULL;
-	 *sort_dir = sortlist[0];
-       }
-
-     free(sortlist);
-     return sort_goof;
-}
-
-static int root_gen()
-{
-     init_fstatbuf();
-    
-     root_record.length[0] = 1 + sizeof(struct iso_directory_record)
-	  - sizeof(root_record.name);
-     root_record.ext_attr_length[0] = 0;
-     set_733((char *) root_record.extent, root->extent);
-     set_733((char *) root_record.size, ROUND_UP(root->size));
-     iso9660_date(root_record.date, root_statbuf.st_mtime);
-     root_record.flags[0] = 2;
-     root_record.file_unit_size[0] = 0;
-     root_record.interleave[0] = 0;
-     set_723(root_record.volume_sequence_number, volume_sequence_number);
-     root_record.name_len[0] = 1;
-     return 0;
-}
-
-static void FDECL1(assign_file_addresses, struct directory *, dpnt)
-{
-     struct directory * finddir;
-     struct directory_entry * s_entry;
-     struct file_hash *s_hash;
-     struct deferred_write * dwpnt;
-     char whole_path[1024];
-
-     while (dpnt)
-     {
-	  s_entry = dpnt->contents;
-	  for(s_entry = dpnt->contents; s_entry; s_entry = s_entry->next)
-	  {
-	       /*
-		* If we already have an  extent for this entry,
-		* then don't assign a new one.  It must have come
-		* from a previous session on the disc.  Note that
-		* we don't end up scheduling the thing for writing
-		* either.
-		*/
-	       if( isonum_733((unsigned char *) s_entry->isorec.extent) != 0 )
-	       {
-		    continue;
-	       }
-	      
-	       /*
-		* This saves some space if there are symlinks present
-		*/
-	       s_hash = find_hash(s_entry->dev, s_entry->inode);
-	       if(s_hash)
-	       {
-		    if(verbose > 2)
-		    {
-		      fprintf (stderr, _("Cache hit for %s%s%s\n"), s_entry->filedir->de_name,
-			       SPATH_SEPARATOR, s_entry->name);
-		    }
-		    set_733((char *) s_entry->isorec.extent, s_hash->starting_block);
-		    set_733((char *) s_entry->isorec.size, s_hash->size);
-		    continue;
-	       }
-
-	       /*
-		* If this is for a directory that is not a . or a .. entry,
-		* then look up the information for the entry.  We have already
-		* assigned extents for directories, so we just need to
-		* fill in the blanks here.
-		*/
-	       if (strcmp(s_entry->name,".") && strcmp(s_entry->name,"..") &&
-		   s_entry->isorec.flags[0] == 2)
-	       {
-		    finddir = dpnt->subdir;
-		    while(1==1)
-		    {
-			 if(finddir->self == s_entry) break;
-			 finddir = finddir->next;
-			 if (!finddir)
-			   error (1, 0, _("Fatal goof\n"));
-		    }
-		    set_733((char *) s_entry->isorec.extent, finddir->extent);
-		    s_entry->starting_block = finddir->extent;
-		    s_entry->size = ROUND_UP(finddir->size);
-		    total_dir_size += s_entry->size;
-		    add_hash(s_entry);
-		    set_733((char *) s_entry->isorec.size, ROUND_UP(finddir->size));
-		    continue;
-	       }
-
-
-	       /*
-		* If this is . or .., then look up the relevant info from the
-		* tables.
-		*/
-	       if(strcmp(s_entry->name,".") == 0)
-	       {
-		    set_733((char *) s_entry->isorec.extent, dpnt->extent);
-		   
-		    /*
-		     * Set these so that the hash table has the
-		     * correct information
-		     */
-		    s_entry->starting_block = dpnt->extent;
-		    s_entry->size = ROUND_UP(dpnt->size);
-		   
-		    add_hash(s_entry);
-		    s_entry->starting_block = dpnt->extent;
-		    set_733((char *) s_entry->isorec.size, ROUND_UP(dpnt->size));
-		    continue;
-	       }
-
-	       if(strcmp(s_entry->name,"..") == 0)
-	       {
-		    if(dpnt == root)
-		    {
-			 total_dir_size += root->size;
-		    }
-		    set_733((char *) s_entry->isorec.extent, dpnt->parent->extent);
-		   
-		    /*
-		     * Set these so that the hash table has the
-		     * correct information
-		     */
-		    s_entry->starting_block = dpnt->parent->extent;
-		    s_entry->size = ROUND_UP(dpnt->parent->size);
-		   
-		    add_hash(s_entry);
-		    s_entry->starting_block = dpnt->parent->extent;
-		    set_733((char *) s_entry->isorec.size, ROUND_UP(dpnt->parent->size));
-		    continue;
-	       }
-
-	       /*
-		* Some ordinary non-directory file.  Just schedule the
-		* file to be written.  This is all quite
-		* straightforward, just make a list and assign extents
-		* as we go.  Once we get through writing all of the
-		* directories, we should be ready write out these
-		* files
-		*/
-	       if(s_entry->size)
-	       {
-		    dwpnt = (struct deferred_write *)
-			 e_malloc(sizeof(struct deferred_write));
-		    if(dw_tail)
-		    {
-			 dw_tail->next = dwpnt;
-			 dw_tail = dwpnt;
-		    }
-		    else
-		    {
-			 dw_head = dwpnt;
-			 dw_tail = dwpnt;
-		    }
-		    if(s_entry->inode  ==  TABLE_INODE)
-		    {
-			 dwpnt->table = s_entry->table;
-			 dwpnt->name = NULL;
-			 sprintf(whole_path,"%s%sTRANS.TBL",
-				 s_entry->filedir->whole_name, SPATH_SEPARATOR);
-		    }
-		    else
-		    {
-			 dwpnt->table = NULL;
-			 strcpy(whole_path, s_entry->whole_name);
-			 dwpnt->name = strdup(whole_path);
-		    }
-		    dwpnt->next = NULL;
-		    dwpnt->size = s_entry->size;
-		    dwpnt->extent = last_extent;
-		    set_733((char *) s_entry->isorec.extent, last_extent);
-		    s_entry->starting_block = last_extent;
-		    add_hash(s_entry);
-		    last_extent += ROUND_UP(s_entry->size) >> 11;
-		    if(verbose > 2)
-		    {
-			 fprintf(stderr,"%llu %llu %s\n", s_entry->starting_block,
-				 last_extent-1, whole_path);
-		    }
-#ifdef DBG_ISO
-		    if((ROUND_UP(s_entry->size) >> 11) > 500)
-		    {
-			 fprintf (stderr, "Warning: large file %s\n", whole_path);
-			 fprintf (stderr, "Starting block is %d\n", s_entry->starting_block);
-			 fprintf (stderr, "Reported file size is %d extents\n", s_entry->size);
-			
-		    }
-#endif
-#ifdef	NOT_NEEDED	/* Never use this code if you like to create a DVD */
-
-		    if(last_extent > (800000000 >> 11))
-		    {
-			 /*
-			  * More than 800Mb? Punt
-			  */
-			 fprintf(stderr,"Extent overflow processing file %s\n", whole_path);
-			 fprintf(stderr,"Starting block is %d\n", s_entry->starting_block);
-			 fprintf(stderr,"Reported file size is %d extents\n", s_entry->size);
-			 exit(1);
-		    }
-#endif
-		    continue;
-	       }
-
-	       /*
-		* This is for zero-length files.  If we leave the extent 0,
-		* then we get screwed, because many readers simply drop files
-		* that have an extent of zero.  Thus we leave the size 0,
-		* and just assign the extent number.
-		*/
-	       set_733((char *) s_entry->isorec.extent, last_extent);
-	  }
-	  if(dpnt->subdir)
-	  {
-	       assign_file_addresses(dpnt->subdir);
-	  }
-	  dpnt = dpnt->next;
-     }
-} /* assign_file_addresses(... */
-
-static void FDECL1(free_one_directory, struct directory *, dpnt)
-{
-     struct directory_entry		* s_entry;
-     struct directory_entry		* s_entry_d;
-    
-     s_entry = dpnt->contents;
-     while(s_entry)
-     {
-	 s_entry_d = s_entry;
-	 s_entry = s_entry->next;
-	
-	 if( s_entry_d->name != NULL )
-	 {
-	     free (s_entry_d->name);
-	 }
-	 if( s_entry_d->whole_name != NULL )
-	 {
-	     free (s_entry_d->whole_name);
-	 }
-	 free (s_entry_d);
-     }
-     dpnt->contents = NULL;
-} /* free_one_directory(... */
-
-static void FDECL1(free_directories, struct directory *, dpnt)
-{
-  while (dpnt)
-    {
-      free_one_directory(dpnt);
-      if(dpnt->subdir) free_directories(dpnt->subdir);
-      dpnt = dpnt->next;
-    }
-}
-
-void FDECL2(generate_one_directory, struct directory *, dpnt, FILE *, outfile)
-{
-     unsigned int			  ce_address = 0;
-     char				* ce_buffer;
-     unsigned int			  ce_index = 0;
-     unsigned int			  ce_size;
-     unsigned int			  dir_index;
-     char				* directory_buffer;
-     int				  new_reclen;
-     struct directory_entry		* s_entry;
-     struct directory_entry		* s_entry_d;
-     unsigned int			  total_size;
-    
-     total_size = (dpnt->size + (SECTOR_SIZE - 1)) &  ~(SECTOR_SIZE - 1);
-     directory_buffer = (char *) e_malloc(total_size);
-     memset(directory_buffer, 0, total_size);
-     dir_index = 0;
-    
-     ce_size = (dpnt->ce_bytes + (SECTOR_SIZE - 1)) &  ~(SECTOR_SIZE - 1);
-     ce_buffer = NULL;
-    
-     if(ce_size)
-     {
-	  ce_buffer = (char *) e_malloc(ce_size);
-	  memset(ce_buffer, 0, ce_size);
-	 
-	  ce_index = 0;
-	 
-	  /*
-	   * Absolute byte address of CE entries for this directory
-	   */
-	  ce_address = last_extent_written + (total_size >> 11);
-	  ce_address = ce_address << 11;
-     }
-    
-     s_entry = dpnt->contents;
-     while(s_entry)
-     {
-	  /* skip if it's hidden */
-	  if(s_entry->de_flags & INHIBIT_ISO9660_ENTRY) {
-	    s_entry = s_entry->next;
-	    continue;
-	  }
-
-	  /*
-	   * We do not allow directory entries to cross sector boundaries. 
-	   * Simply pad, and then start the next entry at the next sector
-	   */
-	  new_reclen = s_entry->isorec.length[0];
-	  if( (dir_index & (SECTOR_SIZE - 1)) + new_reclen >= SECTOR_SIZE )
-	  {
-	       dir_index = (dir_index + (SECTOR_SIZE - 1)) &
-		    ~(SECTOR_SIZE - 1);
-	  }
-
-	  memcpy(directory_buffer + dir_index, &s_entry->isorec,
-		 sizeof(struct iso_directory_record) -
-		 sizeof(s_entry->isorec.name) + s_entry->isorec.name_len[0]);
-	  dir_index += sizeof(struct iso_directory_record) -
-	       sizeof (s_entry->isorec.name)+ s_entry->isorec.name_len[0];
-
-	  /*
-	   * Add the Rock Ridge attributes, if present
-	   */
-	  if(s_entry->rr_attr_size)
-	  {
-	       if(dir_index & 1)
-	       {
-		    directory_buffer[dir_index++] = 0;
-	       }
-
-	       /*
-		* If the RR attributes were too long, then write the
-		* CE records, as required.
-		*/
-	       if(s_entry->rr_attr_size != s_entry->total_rr_attr_size)
-	       {
-		    unsigned char * pnt;
-		    int len, nbytes;
-		   
-		    /*
-		     * Go through the entire record and fix up the CE entries
-		     * so that the extent and offset are correct
-		     */
-		   
-		    pnt = s_entry->rr_attributes;
-		    len = s_entry->total_rr_attr_size;
-		    while(len > 3)
-		    {
-#ifdef DEBUG
-			 if (!ce_size)
-			 {
-			      fprintf(stderr,"Warning: ce_index(%d) && ce_address(%d) not initialized\n",
-				      ce_index, ce_address);
-			 }
-#endif
-			
-			 if(pnt[0] == 'C' && pnt[1] == 'E')
-			 {
-			      nbytes = get_733( (char *) pnt+20);
-			     
-			      if((ce_index & (SECTOR_SIZE - 1)) + nbytes >=
-				 SECTOR_SIZE)
-			      {
-				   ce_index = ROUND_UP(ce_index);
-			      }
-			     
-			      set_733( (char *) pnt+4,
-				       (ce_address + ce_index) >> 11);
-			      set_733( (char *) pnt+12,
-				       (ce_address + ce_index) & (SECTOR_SIZE - 1));
-			     
-			     
-			      /*
-			       * Now store the block in the ce buffer
-			       */
-			      memcpy(ce_buffer + ce_index,
-				     pnt + pnt[2], nbytes);
-			      ce_index += nbytes;
-			      if(ce_index & 1)
-			      {
-				   ce_index++;
-			      }
-			 }
-			 len -= pnt[2];
-			 pnt += pnt[2];
-		    }
-		   
-	       }
-
-	       rockridge_size += s_entry->total_rr_attr_size;
-	       memcpy(directory_buffer + dir_index, s_entry->rr_attributes,
-		      s_entry->rr_attr_size);
-	       dir_index += s_entry->rr_attr_size;
-	  }
-	  if(dir_index & 1)
-	  {
-	       directory_buffer[dir_index++] = 0;
-	  }
-	 
-	  s_entry_d = s_entry;
-	  s_entry = s_entry->next;
-	 
-	  /*
-	   * Joliet doesn't use the Rock Ridge attributes, so we free it here.
-	   */
-	  if (s_entry_d->rr_attributes)
-	    {
-	      free(s_entry_d->rr_attributes);
-	      s_entry_d->rr_attributes = NULL;
-	    }
-     }
-
-     if(dpnt->size != dir_index)
-     {
-	  fprintf (stderr, _("Unexpected directory length %d %d %s\n"), dpnt->size,
-		   dir_index, dpnt->de_name);
-     }
-
-     xfwrite(directory_buffer, 1, total_size, outfile);
-     last_extent_written += total_size >> 11;
-     free(directory_buffer);
-
-     if(ce_size)
-     {
-	  if(ce_index != dpnt->ce_bytes)
-	  {
-	    fprintf (stderr, _("Continuation entry record length mismatch (%d %d).\n"),
-		     ce_index, dpnt->ce_bytes);
-	  }
-	  xfwrite(ce_buffer, 1, ce_size, outfile);
-	  last_extent_written += ce_size >> 11;
-	  free(ce_buffer);
-     }
-    
-} /* generate_one_directory(... */
-
-static
-void FDECL1(build_pathlist, struct directory *, node)
-{
-     struct directory * dpnt;
-    
-     dpnt = node;
-    
-     while (dpnt)
-     {
-	/* skip if it's hidden */
-	if( (dpnt->dir_flags & INHIBIT_ISO9660_ENTRY) == 0 )
-	  pathlist[dpnt->path_index] = dpnt;
-
-	if(dpnt->subdir) build_pathlist(dpnt->subdir);
-	dpnt = dpnt->next;
-     }
-} /* build_pathlist(... */
-
-static int FDECL2(compare_paths, void const *, r, void const *, l)
-{
-  struct directory const *ll = *(struct directory * const *)l;
-  struct directory const *rr = *(struct directory * const *)r;
-
-  if (rr->parent->path_index < ll->parent->path_index)
-  {
-       return -1;
-  }
-
-  if (rr->parent->path_index > ll->parent->path_index)
-  {
-       return 1;
-  }
-
-  return strcmp(rr->self->isorec.name, ll->self->isorec.name);
- 
-} /* compare_paths(... */
-
-static int generate_path_tables()
-{
-  struct directory_entry * de;
-  struct directory	 * dpnt;
-  int			   fix;
-  int			   i;
-  int			   j;
-  int			   namelen;
-  char			 * npnt;
-  char			 * npnt1;
-  int			   tablesize;
-
-  /*
-   * First allocate memory for the tables and initialize the memory
-   */
-  tablesize = path_blocks << 11;
-  path_table_m = (char *) e_malloc(tablesize);
-  path_table_l = (char *) e_malloc(tablesize);
-  memset(path_table_l, 0, tablesize);
-  memset(path_table_m, 0, tablesize);
-
-  /*
-   * Now start filling in the path tables.  Start with root directory
-   */
-  if( next_path_index > 0xffff )
-  {
-    error (1, 0, _("Unable to generate sane path tables - too many directories (%d)\n"),
-	   next_path_index);
-  }
-
-  path_table_index = 0;
-  pathlist = (struct directory **) e_malloc(sizeof(struct directory *)
-					    * next_path_index);
-  memset(pathlist, 0, sizeof(struct directory *) * next_path_index);
-  build_pathlist(root);
-
-  do
-  {
-       fix = 0;
-#ifdef __STDC__
-       qsort(&pathlist[1], next_path_index-1, sizeof(struct directory *),
-	     (int (*)(const void *, const void *))compare_paths);
-#else
-       qsort(&pathlist[1], next_path_index-1, sizeof(struct directory *),
-	     compare_paths);
-#endif
-
-       for(j=1; j<next_path_index; j++)
-       {
-	    if(pathlist[j]->path_index != j)
-	    {
-		 pathlist[j]->path_index = j;
-		 fix++;
-	    }
-       }
-  } while(fix);
-
-  for(j=1; j<next_path_index; j++)
-  {
-       dpnt = pathlist[j];
-       if(!dpnt)
-       {
-	 error (1, 0, _("Entry %d not in path tables\n"), j);
-       }
-       npnt = dpnt->de_name;
-      
-       /*
-	* So the root comes out OK
-	*/
-       if( (*npnt == 0) || (dpnt == root) )
-       {
-	    npnt = "."; 
-       }
-       npnt1 = strrchr(npnt, PATH_SEPARATOR);
-       if(npnt1)
-       {
-	    npnt = npnt1 + 1;
-       }
-      
-       de = dpnt->self;
-       if(!de)
-       {
-	 error (1, 0, _("Fatal goof\n"));
-       }
-      
-      
-       namelen = de->isorec.name_len[0];
-      
-       path_table_l[path_table_index] = namelen;
-       path_table_m[path_table_index] = namelen;
-       path_table_index += 2;
-      
-       set_731(path_table_l + path_table_index, dpnt->extent);
-       set_732(path_table_m + path_table_index, dpnt->extent);
-       path_table_index += 4;
-      
-       set_721(path_table_l + path_table_index,
-	       dpnt->parent->path_index);
-       set_722(path_table_m + path_table_index,
-	       dpnt->parent->path_index);
-       path_table_index += 2;
-      
-       for(i =0; i<namelen; i++)
-       {
-	    path_table_l[path_table_index] = de->isorec.name[i];
-	    path_table_m[path_table_index] = de->isorec.name[i];
-	    path_table_index++;
-       }
-       if(path_table_index & 1)
-       {
-	    path_table_index++;  /* For odd lengths we pad */
-       }
-  }
- 
-  free(pathlist);
-  if(path_table_index != path_table_size)
-  {
-    fprintf (stderr, _("Path table lengths do not match %d %d\n"),
-	     path_table_index,
-	     path_table_size);
-  }
-  return 0;
-} /* generate_path_tables(... */
-
-void
-FDECL3(memcpy_max, char *, to, char *, from, int, max)
-{
-  int n = strlen(from);
-  if (n > max)
-  {
-       n = max;
-  }
-  memcpy(to, from, n);
-
-} /* memcpy_max(... */
-
-void FDECL1(outputlist_insert, struct output_fragment *, frag)
-{
-  if( out_tail == NULL )
-    {
-      out_list = out_tail = frag;
-    }
-  else
-    {
-      out_tail->of_next = frag;
-      out_tail = frag;
-    }
-}
-
-static int FDECL1(file_write, FILE *, outfile)
-{
-  int				should_write;
-
-  /*
-   * OK, all done with that crap.  Now write out the directories.
-   * This is where the fur starts to fly, because we need to keep track of
-   * each file as we find it and keep track of where we put it.
-   */
-
-  should_write = last_extent - session_start;
-
-  if( print_size > 0 )
-    {
-      fprintf (stderr, _("Total extents scheduled to be written = %llu\n"),
-	       last_extent - session_start);
-      exit (0);
-    }
-  if( verbose > 2 )
-    {
-#ifdef DBG_ISO
-      fprintf(stderr,"Total directory extents being written = %llu\n", last_extent);
-#endif
-     
-      fprintf (stderr, _("Total extents scheduled to be written = %llu\n"),
-	       last_extent - session_start);
-    }
-
-  /*
-   * Now write all of the files that we need.
-   */
-  write_files(outfile);
- 
-  /*
-   * The rest is just fluff.
-   */
-  if( verbose == 0 )
-    {
-      return 0;
-    }
-
-  fprintf (stderr, _("Total extents actually written = %llu\n"),
-	   last_extent_written - session_start);
-
-  /*
-   * Hard links throw us off here
-   */
-  assert (last_extent > session_start);
-  if(should_write + session_start != last_extent)
-    {
-      fprintf (stderr, _("Number of extents written different than what was predicted.  Please fix.\n"));
-      fprintf (stderr, _("Predicted = %d, written = %llu\n"), should_write, last_extent);
-    }
-
-  fprintf (stderr, _("Total translation table size: %d\n"), table_size);
-  fprintf (stderr, _("Total rockridge attributes bytes: %d\n"), rockridge_size);
-  fprintf (stderr, _("Total directory bytes: %d\n"), total_dir_size);
-  fprintf (stderr, _("Path table size(bytes): %d\n"), path_table_size);
-
-#ifdef DEBUG
-  fprintf(stderr, "next extent, last_extent, last_extent_written %d %d %d\n",
-	  next_extent, last_extent, last_extent_written);
-#endif
-
-  return 0;
-
-} /* iso_write(... */
-
-char *creation_date = NULL;
-char *modification_date = NULL;
-char *expiration_date = NULL;
-char *effective_date = NULL;
-
-/*
- * Function to write the PVD for the disc.
- */
-static int FDECL1(pvd_write, FILE *, outfile)
-{
-  char				iso_time[17];
-  int				should_write;
-  struct tm			local;
-  struct tm			gmt;
-
-
-  time(&begun);
-
-  local = *localtime(&begun);
-  gmt   = *gmtime(&begun);
-
-  /*
-   * This will break  in the year  2000, I supose, but there is no good way
-   * to get the top two digits of the year.
-   */
-  sprintf(iso_time, "%4.4d%2.2d%2.2d%2.2d%2.2d%2.2d00", 1900 + local.tm_year,
-	  local.tm_mon+1, local.tm_mday,
-	  local.tm_hour, local.tm_min, local.tm_sec);
-
-  local.tm_min -= gmt.tm_min;
-  local.tm_hour -= gmt.tm_hour;
-  local.tm_yday -= gmt.tm_yday;
-  iso_time[16] = (local.tm_min + 60*(local.tm_hour + 24*local.tm_yday)) / 15;
-
-  /*
-   * Next we write out the primary descriptor for the disc
-   */
-  memset(&vol_desc, 0, sizeof(vol_desc));
-  vol_desc.type[0] = ISO_VD_PRIMARY;
-  memcpy(vol_desc.id, ISO_STANDARD_ID, sizeof(ISO_STANDARD_ID));
-  vol_desc.version[0] = 1;
- 
-  memset(vol_desc.system_id, ' ', sizeof(vol_desc.system_id));
-  memcpy_max(vol_desc.system_id, system_id, strlen(system_id));
- 
-  memset(vol_desc.volume_id, ' ', sizeof(vol_desc.volume_id));
-  memcpy_max(vol_desc.volume_id, volume_id, strlen(volume_id));
- 
-  should_write = last_extent - session_start;
-  set_733((char *) vol_desc.volume_space_size, should_write);
-  set_723(vol_desc.volume_set_size, volume_set_size);
-  set_723(vol_desc.volume_sequence_number, volume_sequence_number);
-  set_723(vol_desc.logical_block_size, 2048);
- 
-  /*
-   * The path tables are used by DOS based machines to cache directory
-   * locations
-   */
-
-  set_733((char *) vol_desc.path_table_size, path_table_size);
-  set_731(vol_desc.type_l_path_table, path_table[0]);
-  set_731(vol_desc.opt_type_l_path_table, path_table[1]);
-  set_732(vol_desc.type_m_path_table, path_table[2]);
-  set_732(vol_desc.opt_type_m_path_table, path_table[3]);
-
-  /*
-   * Now we copy the actual root directory record
-   */
-  memcpy(vol_desc.root_directory_record, &root_record,
-	 sizeof(struct iso_directory_record) + 1);
-
-  /*
-   * The rest is just fluff.  It looks nice to fill in many of these fields,
-   * though.
-   */
-  FILL_SPACE(volume_set_id);
-  if(volset_id)  memcpy_max(vol_desc.volume_set_id,  volset_id, strlen(volset_id));
-
-  FILL_SPACE(publisher_id);
-  if(publisher)  memcpy_max(vol_desc.publisher_id,  publisher, strlen(publisher));
-
-  FILL_SPACE(preparer_id);
-  if(preparer)  memcpy_max(vol_desc.preparer_id,  preparer, strlen(preparer));
-
-  FILL_SPACE(application_id);
-  if(appid) memcpy_max(vol_desc.application_id, appid, strlen(appid));
-
-  FILL_SPACE(copyright_file_id);
-  if(copyright) memcpy_max(vol_desc.copyright_file_id, copyright,
-		       strlen(copyright));
-
-  FILL_SPACE(abstract_file_id);
-  if(abstract) memcpy_max(vol_desc.abstract_file_id, abstract,
-			  strlen(abstract));
-
-  FILL_SPACE(bibliographic_file_id);
-  if(biblio) memcpy_max(vol_desc.bibliographic_file_id, biblio,
-		       strlen(biblio));
-
-  FILL_SPACE(creation_date);
-  FILL_SPACE(modification_date);
-  FILL_SPACE(expiration_date);
-  FILL_SPACE(effective_date);
-  vol_desc.file_structure_version[0] = 1;
-  FILL_SPACE(application_data);
-
-  memcpy(vol_desc.creation_date, creation_date ? creation_date : iso_time, 17);
-  memcpy(vol_desc.modification_date, modification_date ? modification_date : iso_time, 17);
-  memcpy(vol_desc.expiration_date, expiration_date ? expiration_date : "0000000000000000", 17);
-  memcpy(vol_desc.effective_date, effective_date ? effective_date : iso_time, 17);
-
-  /*
-   * if not a bootable cd do it the old way
-   */
-  xfwrite(&vol_desc, 1, 2048, outfile);
-  last_extent_written++;
-  return 0;
-}
-
-/*
- * Function to write the EVD for the disc.
- */
-static int FDECL1(evd_write, FILE *, outfile)
-{
-  struct iso_primary_descriptor evol_desc;
-
-  /*
-   * Now write the end volume descriptor.  Much simpler than the other one
-   */
-  memset(&evol_desc, 0, sizeof(evol_desc));
-  evol_desc.type[0] = ISO_VD_END;
-  memcpy(evol_desc.id, ISO_STANDARD_ID, sizeof(ISO_STANDARD_ID));
-  evol_desc.version[0] = 1;
-  xfwrite(&evol_desc, 1, 2048, outfile);
-  last_extent_written += 1;
-  return 0;
-}
-
-/*
- * Function to write the EVD for the disc.
- */
-static int FDECL1(pathtab_write, FILE *, outfile)
-{
-  /*
-   * Next we write the path tables
-   */
-  xfwrite(path_table_l, 1, path_blocks << 11, outfile);
-  xfwrite(path_table_m, 1, path_blocks << 11, outfile);
-  last_extent_written += 2*path_blocks;
-  free(path_table_l);
-  free(path_table_m);
-  path_table_l = NULL;
-  path_table_m = NULL;
-  return 0;
-}
-
-static int FDECL1(exten_write, FILE *, outfile)
-{
-  xfwrite(extension_record, 1, SECTOR_SIZE, outfile);
-  last_extent_written++;
-  return 0;
-}
-
-/*
- * Functions to describe padding block at the start of the disc.
- */
-int FDECL1(oneblock_size, int, starting_extent)
-{
-  last_extent++;
-  return 0;
-}
-
-/*
- * Functions to describe padding block at the start of the disc.
- */
-
-#define PADBLOCK_SIZE	16
-
-static int FDECL1(pathtab_size, int, starting_extent)
-{
-  path_table[0] = starting_extent;
-
-  path_table[1] = 0;
-  path_table[2] = path_table[0] + path_blocks;
-  path_table[3] = 0;
-  last_extent += 2*path_blocks;
-  return 0;
-}
-
-static int FDECL1(padblock_size, int, starting_extent)
-{
-  last_extent += PADBLOCK_SIZE;
-  return 0;
-}
-
-static int file_gen()
-{
-  assign_file_addresses(root);
-  return 0;
-}
-
-static int dirtree_dump()
-{
-  if (verbose > 2)
-  {
-      dump_tree(root);
-  }
-  return 0;
-}
-
-static int FDECL1(dirtree_fixup, int, starting_extent)
-{
-  if (use_RockRidge && reloc_dir)
-	  finish_cl_pl_entries();
-
-  if (use_RockRidge )
-	  update_nlink_field(root);
-  return 0;
-}
-
-static int FDECL1(dirtree_size, int, starting_extent)
-{
-  assign_directory_addresses(root);
-  return 0;
-}
-
-static int FDECL1(ext_size, int, starting_extent)
-{
-  extern int extension_record_size;
-  struct directory_entry * s_entry;
-  extension_record_extent = starting_extent;
-  s_entry = root->contents;
-  set_733((char *) s_entry->rr_attributes + s_entry->rr_attr_size - 24,
-	  extension_record_extent);
-  set_733((char *) s_entry->rr_attributes + s_entry->rr_attr_size - 8,
-	  extension_record_size);
-  last_extent++;
-  return 0;
-}
-
-static int FDECL1(dirtree_write, FILE *, outfile)
-{
-  generate_iso9660_directories(root, outfile);
-  return 0;
-}
-
-static int FDECL1(dirtree_cleanup, FILE *, outfile)
-{
-  free_directories(root);
-  return 0;
-}
-
-static int FDECL1(padblock_write, FILE *, outfile)
-{
-  char *buffer;
-
-  buffer = e_malloc (2048 * PADBLOCK_SIZE);
-  memset (buffer, 0, 2048 * PADBLOCK_SIZE);
-
-  if (use_embedded_boot)
-    {
-      FILE *fp = fopen (boot_image_embed, "rb");
-      if (! fp)
-	error (1, errno, _("Unable to open %s"), boot_image_embed);
-
-      if (fread (buffer, 1, 2048 * PADBLOCK_SIZE, fp) == 0)
-	error (1, errno, _("cannot read %d bytes from %s"),
-	       2048 * PADBLOCK_SIZE, boot_image_embed);
-      if (fgetc (fp) != EOF)
-	error (1, 0, _("%s is too big for embed area"), boot_image_embed);
-    }
-
-  if (use_protective_msdos_label)
-    {
-      struct msdos_partition_mbr *mbr = (void *) buffer;
-
-      memset (mbr->entries, 0, sizeof(mbr->entries));
-
-      /* Some idiotic BIOSes refuse to boot if they don't find at least
-	 one partition with active bit set.  */
-      mbr->entries[0].flag = 0x80;
-
-      /* Doesn't really matter, as long as it's non-zero.  It seems that
-         0xCD is used elsewhere, so we follow suit.  */
-      mbr->entries[0].type = 0xcd;
-
-      /* Start immediately (sector 1).  */
-      mbr->entries[0].start = 1;
-
-      /* We don't know yet.  Let's keep it safe.  */
-      mbr->entries[0].length = UINT32_MAX;
-
-      mbr->signature = MSDOS_PARTITION_SIGNATURE;
-    }
-
-  xfwrite (buffer, 1, 2048 * PADBLOCK_SIZE, outfile);
-  last_extent_written += PADBLOCK_SIZE;
-
-  return 0;
-}
-
-struct output_fragment padblock_desc  = {NULL, padblock_size, NULL,     padblock_write};
-struct output_fragment voldesc_desc   = {NULL, oneblock_size, root_gen, pvd_write};
-struct output_fragment end_vol	      = {NULL, oneblock_size, NULL,     evd_write};
-struct output_fragment pathtable_desc = {NULL, pathtab_size,  generate_path_tables,     pathtab_write};
-struct output_fragment dirtree_desc   = {NULL, dirtree_size,  NULL,     dirtree_write};
-struct output_fragment dirtree_clean  = {NULL, dirtree_fixup, dirtree_dump,     dirtree_cleanup};
-struct output_fragment extension_desc = {NULL, ext_size,      NULL,     exten_write};
-struct output_fragment files_desc     = {NULL, NULL,          file_gen, file_write};

From 7fb5c25fd0f02c1b751821915da5d3036f5a5692 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 18 May 2010 11:51:37 +0100
Subject: [PATCH 0972/1628] * util/grub-mkrescue.in: Sync up with grub-install
 in terms of how we handle finding grub-mkimage.  Default to finding
 grub-mkimage in ${bindir} with program_transform_name applied, and provide a
 --grub-mkimage option to override this.

---
 ChangeLog             |  7 +++++++
 util/grub-mkrescue.in | 16 ++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8258400c0..4cfe4c576 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-18  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkrescue.in: Sync up with grub-install in terms of how
+	we handle finding grub-mkimage.  Default to finding grub-mkimage in
+	${bindir} with program_transform_name applied, and provide a
+	--grub-mkimage option to override this.
+
 2010-05-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Remove grub-mkisofs.
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 5f35f084a..6018816b3 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -37,6 +37,7 @@ pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-pc
 efi32_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-efi
 efi64_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi
 rom_directory=
+grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
 
 # Usage: usage
 # Print the usage.
@@ -50,6 +51,7 @@ Make GRUB rescue image.
   --output=FILE           save output in FILE [required]
   --modules=MODULES       pre-load specified modules MODULES
   --rom-directory=DIR     save rom images in DIR [optional]
+  --grub-mkimage=FILE     use FILE as grub-mkimage
 
 $0 generates a bootable rescue image with specified source files or directories.
 
@@ -78,6 +80,8 @@ for option in "$@"; do
 	PATH=${override_dir}:$PATH
 	export PATH
 	;;
+    --grub-mkimage=*)
+	grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
     -*)
 	echo "Unrecognized option \`$option'" 1>&2
 	usage
@@ -94,6 +98,14 @@ if [ "x${output_image}" = x ] ; then
   exit 1
 fi
 
+set $grub_mkimage dummy
+if test -f "$1"; then
+    :
+else
+    echo "$1: Not found." 1>&2
+    exit 1
+fi
+
 if test "x$TMP" != x; then
   MKTEMP_TEMPLATE="$TMP/grub-mkrescue.XXXXXXXXXX"
 elif test "x$TEMP" != x; then
@@ -157,7 +169,7 @@ EOF
 
     tar -C ${memdisk_dir} -cf ${memdisk_img} boot
     rm -rf ${memdisk_dir}
-    grub-mkimage -O ${platform} -d "${source_directory}" -m "${memdisk_img}" -o "$3" --prefix='(memdisk)/boot/grub' \
+    $grub_mkimage -O ${platform} -d "${source_directory}" -m "${memdisk_img}" -o "$3" --prefix='(memdisk)/boot/grub' \
         search iso9660 configfile normal sh memdisk tar $4
     rm -rf ${memdisk_img}
 }
@@ -207,7 +219,7 @@ grub_mkisofs_arguments="${grub_mkisofs_arguments} --modification-date=$(echo ${i
 if test -e "${pc_dir}" ; then
     echo "Enabling BIOS support ..."
     core_img=`mktemp "$MKTEMP_TEMPLATE"`
-    grub-mkimage -O i386-pc -d ${pc_dir}/ -O i386-pc -o ${core_img} --prefix=/boot/grub/i386-pc \
+    $grub_mkimage -O i386-pc -d ${pc_dir}/ -O i386-pc -o ${core_img} --prefix=/boot/grub/i386-pc \
         iso9660 biosdisk
     cat ${pc_dir}/cdboot.img ${core_img} > ${iso9660_dir}/boot/grub/i386-pc/eltorito.img
 

From 355b51e9b50174de0254bc97ec7008f70b21855c Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 18 May 2010 11:57:31 +0100
Subject: [PATCH 0973/1628] Fix build with non-GNU libcs. * util/misc.c
 (canonicalize_file_name): Move to ... * kern/emu/misc.c
 (canonicalize_file_name): ... here.  Needed by
 grub_make_system_path_relative_to_its_root.

---
 ChangeLog       |  8 ++++++++
 kern/emu/misc.c | 13 +++++++++++++
 util/misc.c     | 13 -------------
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4cfe4c576..a3050ee07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-18  Colin Watson  <cjwatson@ubuntu.com>
+
+	Fix build with non-GNU libcs.
+
+	* util/misc.c (canonicalize_file_name): Move to ...
+	* kern/emu/misc.c (canonicalize_file_name): ... here.  Needed by
+	grub_make_system_path_relative_to_its_root.
+
 2010-05-18  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkrescue.in: Sync up with grub-install in terms of how
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index 4888f4a6b..54c808a47 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -176,6 +176,19 @@ grub_get_rtc (void)
 	     * GRUB_TICKS_PER_SECOND / 1000000));
 }
 
+char *
+canonicalize_file_name (const char *path)
+{
+  char *ret;
+#ifdef PATH_MAX
+  ret = xmalloc (PATH_MAX);
+  (void) realpath (path, ret);
+#else
+  ret = realpath (path, NULL);
+#endif
+  return ret;
+}
+
 #ifdef __CYGWIN__
 /* Convert POSIX path to Win32 path,
    remove drive letter, replace backslashes.  */
diff --git a/util/misc.c b/util/misc.c
index 6785eb00f..46e5c6093 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -286,19 +286,6 @@ fail:
 
 #endif /* __MINGW32__ */
 
-char *
-canonicalize_file_name (const char *path)
-{
-  char *ret;
-#ifdef PATH_MAX
-  ret = xmalloc (PATH_MAX);
-  (void) realpath (path, ret);
-#else
-  ret = realpath (path, NULL);
-#endif
-  return ret;
-}
-
 #ifdef GRUB_UTIL
 void
 grub_util_init_nls (void)

From 750067477388b5f74bb3cfd343cb0cfe74de26e0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 18 May 2010 14:20:00 +0200
Subject: [PATCH 0974/1628] 	* po/POTFILES: Rename util/grub-mkrawimage.c
 to util/grub-mkimage.c.

---
 ChangeLog   | 4 ++++
 po/POTFILES | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 89526d020..bf375bc64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* po/POTFILES: Rename util/grub-mkrawimage.c to util/grub-mkimage.c.
+
 2010-05-18  Colin Watson  <cjwatson@ubuntu.com>
 
 	* configure.ac: Check for Linux device-mapper support.
diff --git a/po/POTFILES b/po/POTFILES
index 0dfc3c041..d2c579edb 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -77,5 +77,5 @@ normal/misc.c
 
 term/serial.c
 
-util/grub-mkrawimage.c
+util/grub-mkimage.c
 util/i386/pc/grub-setup.c

From 26966aeba7259cf38d1ede192c7b34f258d470c2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 18 May 2010 14:21:15 +0200
Subject: [PATCH 0975/1628] 2010-05-18  Vladimir Serbinenko 
 <phcoder@gmail.com>

	* util/grub-mkrescue.in: Remove -O i386-pc duplication.
	Reported by: Seth Goldberg.
---
 ChangeLog             | 5 +++++
 util/grub-mkrescue.in | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index bf375bc64..8e864dddb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkrescue.in: Remove -O i386-pc duplication.
+	Reported by: Seth Goldberg.
+
 2010-05-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* po/POTFILES: Rename util/grub-mkrawimage.c to util/grub-mkimage.c.
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 6018816b3..7e7253006 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -219,7 +219,7 @@ grub_mkisofs_arguments="${grub_mkisofs_arguments} --modification-date=$(echo ${i
 if test -e "${pc_dir}" ; then
     echo "Enabling BIOS support ..."
     core_img=`mktemp "$MKTEMP_TEMPLATE"`
-    $grub_mkimage -O i386-pc -d ${pc_dir}/ -O i386-pc -o ${core_img} --prefix=/boot/grub/i386-pc \
+    $grub_mkimage -O i386-pc -d ${pc_dir}/ -o ${core_img} --prefix=/boot/grub/i386-pc \
         iso9660 biosdisk
     cat ${pc_dir}/cdboot.img ${core_img} > ${iso9660_dir}/boot/grub/i386-pc/eltorito.img
 

From 654e1d1e0e0943348b4283e14a9f03607ee4df56 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 18 May 2010 13:45:25 +0200
Subject: [PATCH 0976/1628] 	* util/grub-install.in: Add missing "in"
 keyword.

---
 ChangeLog            | 4 ++++
 util/grub-install.in | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8e864dddb..34e7b76dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-install.in: Add missing "in" keyword.
+
 2010-05-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkrescue.in: Remove -O i386-pc duplication.
diff --git a/util/grub-install.in b/util/grub-install.in
index 8a93ace8c..0db216fd5 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -342,7 +342,7 @@ else
     prefix_drive=`$grub_probe --target=drive --device ${grub_device}` || exit 1
 fi
 
-case "${target_cpu}-${platform}"
+case "${target_cpu}-${platform}" in
     i386-pc) mkimage_target=i386-pc ;;
     sparc64-ieee1275) mkimage_target=sparc64-ieee1275-raw ;;
     mips-yeeloong) mkimage_target=mipsel-yeeloong-elf ;;

From 01b8d2d7870c81d9e6151b3d2f3a936633db296d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 18 May 2010 13:55:26 +0200
Subject: [PATCH 0977/1628] 	* Makefile.in (CPPFLAGS): Replace
 -DGRUB_LIBDIR with 	-DGRUB_PKGLIBROOTDIR= and prepend @PACKAGE_TARNAME@.
 All users updated. 	* util/grub-mkimage.c (image_targets): Add
 i386-multiboot. 	(main): Add a slash after pkglibdirroot.

---
 ChangeLog           |  7 +++++++
 Makefile.in         |  2 +-
 util/grub-mkimage.c | 36 ++++++++++++++++++++++++++++++------
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 34e7b76dd..2ce1c23e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* Makefile.in (CPPFLAGS): Replace -DGRUB_LIBDIR with
+	-DGRUB_PKGLIBROOTDIR= and prepend @PACKAGE_TARNAME@. All users updated.
+	* util/grub-mkimage.c (image_targets): Add i386-multiboot.
+	(main): Add a slash after pkglibdirroot.
+
 2010-05-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-install.in: Add missing "in" keyword.
diff --git a/Makefile.in b/Makefile.in
index 26a494518..75388e3c8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -90,7 +90,7 @@ GNULIB_CFLAGS = $(GNULIB_UTIL_CFLAGS) $(POSIX_CFLAGS)
 ASFLAGS = @ASFLAGS@
 LDFLAGS = @LDFLAGS@ $(LIBS)
 CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/gnulib -I$(srcdir)/include -Wall -W \
-	 -DGRUB_LIBDIR=\"$(libdir)\" -DLOCALEDIR=\"$(localedir)\"
+	 -DGRUB_PKGLIBROOTDIR=\"$(libdir)/`echo @PACKAGE_TARNAME@ | sed '$(transform)'`\" -DLOCALEDIR=\"$(localedir)\"
 TARGET_CC = @TARGET_CC@
 TARGET_CFLAGS = -ffreestanding @TARGET_CFLAGS@
 TARGET_ASFLAGS = -nostdinc -fno-builtin @TARGET_ASFLAGS@
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index cc4a225d4..6366a9803 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -99,6 +99,28 @@ struct image_target_desc image_targets[] =
       .mod_gap = GRUB_KERNEL_I386_COREBOOT_MOD_GAP,
       .mod_align = GRUB_KERNEL_I386_COREBOOT_MOD_ALIGN
     },
+    {
+      .name = "i386-multiboot",
+      .voidp_sizeof = 4,
+      .bigendian = 0,
+      .id = IMAGE_COREBOOT,
+      .flags = PLATFORM_FLAGS_NONE,
+      .prefix = GRUB_KERNEL_I386_COREBOOT_PREFIX,
+      .data_end = GRUB_KERNEL_I386_COREBOOT_DATA_END,
+      .raw_size = 0,
+      .total_module_size = TARGET_NO_FIELD,
+      .kernel_image_size = TARGET_NO_FIELD,
+      .compressed_size = TARGET_NO_FIELD,
+      .section_align = 1,
+      .vaddr_offset = 0,
+      .install_dos_part = TARGET_NO_FIELD,
+      .install_bsd_part = TARGET_NO_FIELD,
+      .link_addr = GRUB_KERNEL_I386_COREBOOT_LINK_ADDR,
+      .elf_target = EM_386,
+      .link_align = 4,
+      .mod_gap = GRUB_KERNEL_I386_COREBOOT_MOD_GAP,
+      .mod_align = GRUB_KERNEL_I386_COREBOOT_MOD_ALIGN
+    },
     {
       .name = "i386-pc",
       .voidp_sizeof = 4,
@@ -1182,7 +1204,7 @@ Make a bootable image of GRUB.\n\
 \n\
 Report bugs to <%s>.\n\
 "), 
-	      program_name, GRUB_LIBDIR, DEFAULT_DIRECTORY,
+	      program_name, GRUB_PKGLIBROOTDIR, DEFAULT_DIRECTORY,
 	      formats,
 	      PACKAGE_BUGREPORT);
       free (formats);
@@ -1320,14 +1342,16 @@ main (int argc, char *argv[])
 	last = strchr (last + 1, '-');
       if (!last)
 	last = image_target->name + strlen (image_target->name);
-      dir = xmalloc (sizeof (GRUB_LIBDIR) + (last - image_target->name));
-      memcpy (dir, GRUB_LIBDIR, sizeof (GRUB_LIBDIR) - 1);
-      memcpy (dir + sizeof (GRUB_LIBDIR) - 1, image_target->name,
+      dir = xmalloc (sizeof (GRUB_PKGLIBROOTDIR) + (last - image_target->name)
+		     + 1);
+      memcpy (dir, GRUB_PKGLIBROOTDIR, sizeof (GRUB_PKGLIBROOTDIR) - 1);
+      *(dir + sizeof (GRUB_PKGLIBROOTDIR) - 1) = '/';
+      memcpy (dir + sizeof (GRUB_PKGLIBROOTDIR), image_target->name,
 	      last - image_target->name);
-      *(dir + sizeof (GRUB_LIBDIR) - 1 +  (last - image_target->name)) = 0;
+      *(dir + sizeof (GRUB_PKGLIBROOTDIR) + (last - image_target->name)) = 0;
     }
 
-  generate_image (dir ? : GRUB_LIBDIR, prefix ? : DEFAULT_DIRECTORY, fp,
+  generate_image (dir, prefix ? : DEFAULT_DIRECTORY, fp,
 		  argv + optind, memdisk, font, config,
 		  image_target, note);
 

From 95b97950e274dc18c16003cd9d5f552c989156a3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 18 May 2010 14:00:51 +0200
Subject: [PATCH 0978/1628] 	* include/grub/i18n.h (gettext): Inline
 instead of using #define. 	(grub_gettext): Likewise. 	(_): Likewise.

---
 ChangeLog           |  6 ++++++
 include/grub/i18n.h | 24 ++++++++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ce1c23e3..4e0f35c1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/i18n.h (gettext): Inline instead of using #define.
+	(grub_gettext): Likewise.
+	(_): Likewise.
+
 2010-05-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* Makefile.in (CPPFLAGS): Replace -DGRUB_LIBDIR with
diff --git a/include/grub/i18n.h b/include/grub/i18n.h
index 9e7f52d45..57ca1c45b 100644
--- a/include/grub/i18n.h
+++ b/include/grub/i18n.h
@@ -42,17 +42,33 @@ extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
    On pre-ANSI systems without 'const', the config.h file is supposed to
    contain "#define const".  */
 # ifdef GRUB_UTIL
-#  define gettext(Msgid) ((const char *) (Msgid))
+static inline const char * __attribute__ ((always_inline))
+gettext (const char *str)
+{
+  return str;
+}
 # else
-#  define grub_gettext(str) ((const char *) (str))
+static inline const char * __attribute__ ((always_inline))
+grub_gettext (const char *str)
+{
+  return str;
+}
 # endif /* GRUB_UTIL */
 
 #endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
 
 #ifdef GRUB_UTIL
-# define _(str) gettext(str)
+static inline const char * __attribute__ ((always_inline))
+_ (const char *str)
+{
+  return gettext(str);
+}
 #else
-# define _(str) grub_gettext(str)
+static inline const char * __attribute__ ((always_inline))
+_ (const char *str)
+{
+  return grub_gettext(str);
+}
 #endif /* GRUB_UTIL */
 
 #define N_(str) str

From 4db50964ad0e96ce4bae73d589160a4b9bd0bd44 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 18 May 2010 13:01:59 +0100
Subject: [PATCH 0979/1628] Add btrfs probing support, currently only in the
 single-device case. * kern/emu/getroot.c (find_root_device_from_mountinfo):
 New function. (grub_guess_root_device): Call find_root_device_from_mountinfo
 before looking in /dev.

---
 ChangeLog.btrfs-probe |  8 +++++
 kern/emu/getroot.c    | 84 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)
 create mode 100644 ChangeLog.btrfs-probe

diff --git a/ChangeLog.btrfs-probe b/ChangeLog.btrfs-probe
new file mode 100644
index 000000000..77c9995c8
--- /dev/null
+++ b/ChangeLog.btrfs-probe
@@ -0,0 +1,8 @@
+2010-05-18  Colin Watson  <cjwatson@ubuntu.com>
+
+	Add btrfs probing support, currently only in the single-device case.
+
+	* kern/emu/getroot.c (find_root_device_from_mountinfo): New
+	function.
+	(grub_guess_root_device): Call find_root_device_from_mountinfo
+	before looking in /dev.
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index 6875044da..da62089fa 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -80,6 +80,84 @@ xgetcwd (void)
   return path;
 }
 
+#ifdef __linux__
+
+/* Statting something on a btrfs filesystem always returns a virtual device
+   major/minor pair rather than the real underlying device, because btrfs
+   can span multiple underlying devices (and even if it's currently only
+   using a single device it can be dynamically extended onto another).  We
+   can't deal with the multiple-device case yet, but in the meantime, we can
+   at least cope with the single-device case by scanning
+   /proc/self/mountinfo.  */
+static char *
+find_root_device_from_mountinfo (const char *dir)
+{
+  FILE *fp;
+  char buf[1024];	/* XXX */
+  char *ret = NULL;
+
+  fp = fopen ("/proc/self/mountinfo", "r");
+  if (! fp)
+    return NULL; /* fall through to other methods */
+
+  while (fgets (buf, sizeof (buf), fp))
+    {
+      int mnt_id, parent_mnt_id;
+      unsigned int major, minor;
+      char enc_root[PATH_MAX], enc_path[PATH_MAX];
+      int count;
+      size_t enc_path_len;
+      const char *sep;
+      char fstype[PATH_MAX], device[PATH_MAX];
+      struct stat st;
+
+      if (sscanf (buf, "%d %d %u:%u %s %s%n",
+		  &mnt_id, &parent_mnt_id, &major, &minor, enc_root, enc_path,
+		  &count) < 6)
+	continue;
+
+      if (strcmp (enc_root, "/") != 0)
+	continue; /* only a subtree is mounted */
+
+      enc_path_len = strlen (enc_path);
+      if (strncmp (dir, enc_path, enc_path_len) != 0 ||
+	  (dir[enc_path_len] && dir[enc_path_len] != '/'))
+	continue;
+
+      /* This is a parent of the requested directory.  /proc/self/mountinfo
+	 is in mount order, so it must be the closest parent we've
+	 encountered so far.  If it's virtual, return its device node;
+	 otherwise, carry on to try to find something closer.  */
+
+      free (ret);
+      ret = NULL;
+
+      if (major != 0)
+	continue; /* not a virtual device */
+
+      sep = strstr (buf + count, " - ");
+      if (!sep)
+	continue;
+
+      sep += strlen (" - ");
+      if (sscanf (sep, "%s %s", fstype, device) != 2)
+	continue;
+
+      if (stat (device, &st) < 0)
+	continue;
+
+      if (!S_ISBLK (st.st_mode))
+	continue; /* not a block device */
+
+      ret = strdup (device);
+    }
+
+  fclose (fp);
+  return ret;
+}
+
+#endif /* __linux__ */
+
 #ifdef __MINGW32__
 
 static char *
@@ -355,6 +433,12 @@ grub_guess_root_device (const char *dir)
 #else /* !__GNU__ */
   struct stat st;
 
+#ifdef __linux__
+  os_dev = find_root_device_from_mountinfo (dir);
+  if (os_dev)
+    return os_dev;
+#endif /* __linux__ */
+
   if (stat (dir, &st) < 0)
     grub_util_error ("cannot stat `%s'", dir);
 

From fff60aba9e0f1d8a6d4800bd6fc3a7b14bb36984 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 18 May 2010 14:29:33 +0200
Subject: [PATCH 0980/1628] Remove leftovers from i386-coreboot.rmk

---
 conf/i386-coreboot.rmk | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index c9eea6470..821431cbb 100644
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -34,7 +34,7 @@ bin_SCRIPTS += grub-mkrescue
 grub_mkrescue_SOURCES = util/grub-mkrescue.in
 
 # Modules.
-pkglib_MODULES = aout.mod halt.mod datetime.mod mmap.mod
+pkglib_MODULES = halt.mod datetime.mod mmap.mod
 
 # For mmap.mod.
 mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
@@ -47,26 +47,6 @@ halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For play.mod.
-play_mod_SOURCES = commands/i386/pc/play.c
-play_mod_CFLAGS = $(COMMON_CFLAGS)
-play_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For memdisk.mod.
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pci.mod
-pci_mod_SOURCES = bus/pci.c
-pci_mod_CFLAGS = $(COMMON_CFLAGS)
-pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lspci.mod
-lspci_mod_SOURCES = commands/lspci.c
-lspci_mod_CFLAGS = $(COMMON_CFLAGS)
-lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For datetime.mod
 datetime_mod_SOURCES = lib/cmos_datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)

From a0b20aad47ff02c7a1a0cd38a0407c4f2564cc08 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 18 May 2010 21:03:35 +0530
Subject: [PATCH 0981/1628] some shell expansion features into grub-script

---
 conf/tests.rmk                 |   4 +
 include/grub/script_sh.h       |   5 +
 script/argv.c                  | 538 ++++++++++++++++++++++++++++++++-
 script/execute.c               |  22 +-
 tests/grub_script_expansion.in |  35 +++
 tests/util/grub-shell.in       |   2 +-
 6 files changed, 593 insertions(+), 13 deletions(-)
 create mode 100644 tests/grub_script_expansion.in

diff --git a/conf/tests.rmk b/conf/tests.rmk
index 9144e5528..94187f150 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -74,6 +74,9 @@ grub_script_comments_SOURCES = tests/grub_script_comments.in
 check_SCRIPTS += grub_script_functions
 grub_script_functions_SOURCES = tests/grub_script_functions.in
 
+check_SCRIPTS += grub_script_expansion
+grub_script_expansion_SOURCES = tests/grub_script_expansion.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -91,6 +94,7 @@ SCRIPTED_TESTS += grub_script_final_semicolon
 SCRIPTED_TESTS += grub_script_dollar
 SCRIPTED_TESTS += grub_script_comments
 SCRIPTED_TESTS += grub_script_functions
+SCRIPTED_TESTS += grub_script_expansion
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 5455fc763..cdf9b731d 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -225,7 +225,12 @@ struct grub_parser_param
 void grub_script_argv_free    (struct grub_script_argv *argv);
 int grub_script_argv_next     (struct grub_script_argv *argv);
 int grub_script_argv_append   (struct grub_script_argv *argv, const char *s);
+int grub_script_argv_append_escaped (struct grub_script_argv *argv,
+				     const char *s);
+int grub_script_argv_append_unescaped (struct grub_script_argv *argv,
+				       const char *s);
 int grub_script_argv_split_append (struct grub_script_argv *argv, char *s);
+int grub_script_argv_expand   (struct grub_script_argv *argv);
 
 struct grub_script_arglist *
 grub_script_create_arglist (struct grub_parser_param *state);
diff --git a/script/argv.c b/script/argv.c
index 1ac81f4b8..8446ded3d 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -18,11 +18,32 @@
  */
 
 #include <grub/mm.h>
+#include <grub/fs.h>
+#include <grub/env.h>
+#include <grub/file.h>
+#include <grub/device.h>
 #include <grub/script_sh.h>
 
+#include <regex.h>
+
 #define ARG_ALLOCATION_UNIT  (32 * sizeof (char))
 #define ARGV_ALLOCATION_UNIT (8 * sizeof (void*))
 
+static inline int regexop (char ch);
+static char ** merge (char **lhs, char **rhs);
+static char *make_dir (const char *prefix, const char *start, const char *end);
+static int make_regex (const char *regex_start, const char *regex_end,
+		       regex_t *regexp);
+static void split_path (char *path, char **suffix_end, char **regex_end);
+static char ** match_devices (const regex_t *regexp);
+static char ** match_files (const char *prefix, const char *suffix_start,
+			    const char *suffix_end, const regex_t *regexp);
+static char ** match_paths_with_escaped_suffix (char **paths,
+						const char *suffix_start,
+						const char *suffix_end,
+						const regex_t *regexp);
+static int expand (char *arg, struct grub_script_argv *argv);
+
 void
 grub_script_argv_free (struct grub_script_argv *argv)
 {
@@ -73,29 +94,85 @@ grub_script_argv_next (struct grub_script_argv *argv)
   return 0;
 }
 
-/* Append `s' to the last argument.  */
-int
-grub_script_argv_append (struct grub_script_argv *argv, const char *s)
+enum append_type {
+  APPEND_RAW,
+  APPEND_ESCAPED,
+  APPEND_UNESCAPED
+};
+
+static int
+append (struct grub_script_argv *argv, const char *s, enum append_type type)
 {
-  int a, b;
+  int a;
+  int b;
+  char ch;
   char *p = argv->args[argv->argc - 1];
 
   if (! s)
     return 0;
 
   a = p ? grub_strlen (p) : 0;
-  b = grub_strlen (s);
+  b = grub_strlen (s) * (type == APPEND_ESCAPED ? 2 : 1);
 
   p = grub_realloc (p, ALIGN_UP ((a + b + 1) * sizeof (char),
 				 ARG_ALLOCATION_UNIT));
   if (! p)
     return 1;
 
-  grub_strcpy (p + a, s);
+  switch (type)
+    {
+    case APPEND_RAW:
+      grub_strcpy (p + a, s);
+      break;
+
+    case APPEND_ESCAPED:
+      while ((ch = *s++))
+	{
+	  if (regexop (ch))
+	    p[a++] = '\\';
+	  p[a++] = ch;
+	}
+      p[a] = '\0';
+      break;
+
+    case APPEND_UNESCAPED:
+      while ((ch = *s++))
+	{
+	  if (ch == '\\' && regexop (*s))
+	    p[a++] = *s++;
+	  else
+	    p[a++] = ch;
+	}
+      p[a] = '\0';
+      break;
+    }
+
   argv->args[argv->argc - 1] = p;
   return 0;
 }
 
+
+/* Append `s' to the last argument.  */
+int
+grub_script_argv_append (struct grub_script_argv *argv, const char *s)
+{
+  return append (argv, s, APPEND_RAW);
+}
+
+/* Append `s' to the last argument, but escape any shell regex ops.  */
+int
+grub_script_argv_append_escaped (struct grub_script_argv *argv, const char *s)
+{
+  return append (argv, s, APPEND_ESCAPED);
+}
+
+/* Append `s' to the last argument, but unescape any escaped shell regex ops.  */
+int
+grub_script_argv_append_unescaped (struct grub_script_argv *argv, const char *s)
+{
+  return append (argv, s, APPEND_UNESCAPED);
+}
+
 /* Split `s' and append words as multiple arguments.  */
 int
 grub_script_argv_split_append (struct grub_script_argv *argv, char *s)
@@ -126,3 +203,452 @@ grub_script_argv_split_append (struct grub_script_argv *argv, char *s)
     }
   return errors;
 }
+
+/* Expand `argv' as per shell expansion rules.  */
+int
+grub_script_argv_expand (struct grub_script_argv *argv)
+{
+  int i;
+  struct grub_script_argv result = { 0, 0 };
+
+  for (i = 0; argv->args[i]; i++)
+    if (expand (argv->args[i], &result))
+      goto fail;
+
+  grub_script_argv_free (argv);
+  *argv = result;
+  return 0;
+
+ fail:
+
+  grub_script_argv_free (&result);
+  return 1;
+}
+
+static char **
+merge (char **dest, char **ps)
+{
+  int i;
+  int j;
+  char **p;
+
+  if (! dest)
+    return ps;
+
+  if (! ps)
+    return dest;
+
+  for (i = 0; dest[i]; i++)
+    ;
+  for (j = 0; ps[j]; j++)
+    ;
+
+  p = grub_realloc (dest, sizeof (char*) * (i + j + 1));
+  if (! p)
+    {
+      grub_free (dest);
+      grub_free (ps);
+      return 0;
+    }
+
+  for (j = 0; ps[j]; j++)
+    dest[i++] = ps[j];
+  dest[i] = 0;
+
+  grub_free (ps);
+  return dest;
+}
+
+static inline int
+regexop (char ch)
+{
+  return grub_strchr ("*.\\", ch) ? 1 : 0;
+}
+
+static char *
+make_dir (const char *prefix, const char *start, const char *end)
+{
+  char ch;
+  unsigned i;
+  unsigned n;
+  char *result;
+
+  i = grub_strlen (prefix);
+  n = i + end - start;
+
+  result = grub_malloc (n + 1);
+  if (! result)
+    return 0;
+
+  grub_strcpy (result, prefix);
+  while (start < end && (ch = *start++))
+    if (ch == '\\' && regexop (*start))
+      result[i++] = *start++;
+    else
+      result[i++] = ch;
+
+  result[i] = '\0';
+  return result;
+}
+
+static int
+make_regex (const char *start, const char *end, regex_t *regexp)
+{
+  char ch;
+  int i = 0;
+  unsigned len = end - start;
+  char *buffer = grub_malloc (len * 2 + 1); /* worst case size. */
+
+  while (start < end)
+    {
+      /* XXX Only * expansion for now.  */
+      switch ((ch = *start++))
+	{
+	case '\\':
+	  buffer[i++] = ch;
+	  if (*start != '\0')
+	    buffer[i++] = *start++;
+	  break;
+
+	case '.':
+	  buffer[i++] = '\\';
+	  buffer[i++] = '.';
+	  break;
+
+	case '*':
+	  buffer[i++] = '.';
+	  buffer[i++] = '*';
+	  break;
+
+	default:
+	  buffer[i++] = ch;
+	}
+    }
+  buffer[i] = '\0';
+
+  if (regcomp (regexp, buffer, RE_SYNTAX_GNU_AWK))
+    {
+      grub_free (buffer);
+      return 1;
+    }
+
+  grub_free (buffer);
+  return 0;
+}
+
+static void
+split_path (char *str, char **suffix_end, char **regex_end)
+{
+  char ch = 0;
+  int regex = 0;
+
+  char *end;
+  char *split;
+
+  split = end = str;
+  while ((ch = *end))
+    {
+      if (ch == '\\' && end[1])
+	end++;
+      else if (regexop (ch))
+	regex = 1;
+      else if (ch == '/' && ! regex)
+	split = end + 1;
+      else if (ch == '/' && regex)
+	break;
+
+      end++;
+    }
+
+  *regex_end = end;
+  if (! regex)
+    *suffix_end = end;
+  else
+    *suffix_end = split;
+}
+
+static char **
+match_devices (const regex_t *regexp)
+{
+  int i;
+  int ndev;
+  char **devs;
+  char *buffer;
+
+  auto int match (const char *name);
+  int match (const char *name)
+  {
+    void *t;
+    unsigned n;
+
+    n = grub_strlen (name);
+    t = grub_realloc (buffer, n + 3);
+    if (! t)
+      return 1;
+
+    buffer = (char *) t;
+    grub_snprintf (buffer, n + 3, "(%s)", name);
+
+    grub_dprintf ("expand", "matching: %s\n", buffer);
+    if (regexec (regexp, buffer, 0, 0, 0))
+      return 0;
+
+    t = grub_realloc (devs, sizeof (char*) * (ndev + 2));
+    if (! t)
+      return 1;
+
+    devs = (char **) t;
+    devs[ndev++] = buffer;
+    devs[ndev] = 0;
+    buffer = 0;
+    return 0;
+  }
+
+  ndev = 0;
+  devs = 0;
+  buffer = 0;
+
+  if (grub_device_iterate (match))
+    goto fail;
+
+  if (buffer)
+    grub_free (buffer);
+
+  return devs;
+
+ fail:
+
+  for (i = 0; devs && devs[i]; i++)
+    grub_free (devs[i]);
+
+  if (devs)
+    grub_free (devs);
+
+  if (buffer)
+    grub_free (buffer);
+
+  return 0;
+}
+
+static char **
+match_files (const char *prefix, const char *suffix, const char *end,
+	     const regex_t *regexp)
+{
+  int i;
+  int error;
+  char **files;
+  char *buffer;
+  unsigned nfile;
+  char *dir;
+  unsigned dirlen;
+  const char *path;
+  char *device_name;
+  grub_fs_t fs;
+  grub_device_t dev;
+
+  auto int match (const char *name, const struct grub_dirhook_info *info);
+  int match (const char *name, const struct grub_dirhook_info *info)
+  {
+    void *t;
+    unsigned n;
+
+    /* skip hidden files, . and .. */
+    if (name[0] == '.')
+      return 0;
+
+    grub_dprintf ("expand", "matching: %s in %s\n", name, dir);
+    if (regexec (regexp, name, 0, 0, 0))
+      return 0;
+
+    n = dirlen + grub_strlen (name);
+    t = grub_realloc (buffer, n + 1);
+    if (! t)
+      return 1;
+
+    buffer = (char *) t;
+    grub_snprintf (buffer, n + 1, "%s%s", dir, name);
+
+    t = grub_realloc (files, sizeof (char*) * (nfile + 2));
+    if (! t)
+      return 1;
+
+    files = (char **) t;
+    files[nfile++] = buffer;
+    files[nfile] = 0;
+    buffer = 0;
+    return 0;
+  }
+
+  nfile = 0;
+  files = 0;
+  dev = 0;
+  buffer = 0;
+  device_name = 0;
+  grub_error_push ();
+
+  dir = make_dir (prefix, suffix, end);
+  if (! dir)
+    goto fail;
+  dirlen = grub_strlen (dir);
+
+  device_name = grub_file_get_device_name (dir);
+  dev = grub_device_open (device_name);
+  if (! dev)
+    goto fail;
+
+  fs = grub_fs_probe (dev);
+  if (! fs)
+    goto fail;
+
+  path = grub_strchr (dir, ')');
+  if (! path)
+    goto fail;
+  path++;
+
+  if (fs->dir (dev, path, match))
+    goto fail;
+
+  if (buffer)
+    grub_free (buffer);
+
+  grub_free (dir);
+  grub_device_close (dev);
+  grub_free (device_name);
+  grub_error_pop ();
+  return files;
+
+ fail:
+
+  if (dir)
+    grub_free (dir);
+
+  for (i = 0; files && files[i]; i++)
+    grub_free (files[i]);
+
+  if (files)
+    grub_free (files);
+
+  if (dev)
+    grub_device_close (dev);
+
+  if (device_name)
+    grub_free (device_name);
+
+  if (buffer)
+    grub_free (buffer);
+
+  grub_error_pop ();
+  return 0;
+}
+
+static char **
+match_paths_with_escaped_suffix (char **paths,
+				 const char *suffix, const char *end,
+				 const regex_t *regexp)
+{
+  if (paths == 0 && suffix == end)
+    return match_devices (regexp);
+
+  else if (paths == 0 && suffix[0] == '(')
+    return match_files ("", suffix, end, regexp);
+
+  else if (paths == 0 && suffix[0] == '/')
+    {
+      char **r;
+      unsigned n;
+      char *root;
+      char *prefix;
+
+      root = grub_env_get ("root");
+      if (! root)
+	return 0;
+
+      n = grub_strlen (root) + 2;
+      prefix = grub_malloc (n + 1);
+      if (! prefix)
+	return 0;
+
+      grub_snprintf (prefix, n + 1, "(%s)", root);
+      r = match_files (prefix, suffix, end, regexp);
+      grub_free (prefix);
+      return r;
+    }
+  else if (paths)
+    {
+      int i, j;
+      char **r = 0;
+
+      for (i = 0; paths[i]; i++)
+	{
+	  char **p;
+
+	  p = match_files (paths[i], suffix, end, regexp);
+	  if (! p)
+	    continue;
+
+	  r = merge (r, p);
+	  if (! r)
+	    return 0;
+	}
+      return r;
+    }
+
+  return 0;
+}
+
+static int
+expand (char *arg, struct grub_script_argv *argv)
+{
+  char *p;
+  char *dir;
+  char *reg;
+  char **paths = 0;
+
+  unsigned i;
+  regex_t regex;
+
+  p = arg;
+  while (*p)
+    {
+      /* split `p' into two components: (p..dir), (dir...reg)
+
+	 (p...dir):  path that doesn't need expansion
+
+	 (dir...reg): part of path that needs expansion
+       */
+      split_path (p, &dir, &reg);
+      if (dir < reg)
+	{
+	  if (make_regex (dir, reg, &regex))
+	    goto fail;
+
+	  paths = match_paths_with_escaped_suffix (paths, p, dir, &regex);
+	  regfree (&regex);
+
+	  if (! paths)
+	    goto done;
+	}
+      p = reg;
+    }
+
+  if (! paths)
+    {
+      grub_script_argv_next (argv);
+      grub_script_argv_append_unescaped (argv, arg);
+    }
+  else
+    for (i = 0; paths[i]; i++)
+      {
+	grub_script_argv_next (argv);
+	grub_script_argv_append (argv, paths[i]);
+      }
+
+ done:
+
+  return 0;
+
+ fail:
+
+  regfree (&regex);
+  return 1;
+}
diff --git a/script/execute.c b/script/execute.c
index 2040be13c..0f31cdc6e 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -177,7 +177,13 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
 		{
 		  if (i != 0)
 		    error += grub_script_argv_next (&result);
-		  error += grub_script_argv_append (&result, values[i]);
+
+		  if (arg->type == GRUB_SCRIPT_ARG_TYPE_VAR)
+		    error += grub_script_argv_append (&result, values[i]);
+		  else
+		    error += grub_script_argv_append_escaped (&result, values[i]);
+
+		  grub_free (values[i]);
 		}
 	      grub_free (values);
 	      break;
@@ -189,19 +195,23 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
 
 	    case GRUB_SCRIPT_ARG_TYPE_DQSTR:
 	    case GRUB_SCRIPT_ARG_TYPE_SQSTR:
-	      error += grub_script_argv_append (&result, arg->str);
+	      error += grub_script_argv_append_escaped (&result, arg->str);
 	      break;
 	    }
 	  arg = arg->next;
 	}
     }
 
-  if (error)
-    return 1;
-
   if (! result.args[result.argc - 1])
     result.argc--;
 
+  error += grub_script_argv_expand (&result);
+  if (error)
+    {
+      grub_script_argv_free (&result);
+      return 1;
+    }
+
   *argv = result;
   return 0;
 }
@@ -287,6 +297,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 	  grub_snprintf (errnobuf, sizeof (errnobuf), "%d", grub_errno);
 	  grub_env_set ("?", errnobuf);
 
+	  grub_script_argv_free (&argv);
 	  grub_print_error ();
 
 	  return 0;
@@ -411,7 +422,6 @@ grub_script_execute_menuentry (struct grub_script_cmd *cmd)
 			      cmd_menuentry->sourcecode);
 
   grub_script_argv_free (&argv);
-
   return grub_errno;
 }
 
diff --git a/tests/grub_script_expansion.in b/tests/grub_script_expansion.in
new file mode 100644
index 000000000..80f0a6afa
--- /dev/null
+++ b/tests/grub_script_expansion.in
@@ -0,0 +1,35 @@
+#! /bin/bash -e
+
+# Run GRUB script in a Qemu instance
+# Copyright (C) 2010  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/>.
+
+disks=`echo ls | @builddir@/grub-shell`
+other=`echo echo '*' | @builddir@/grub-shell`
+for d in $disks; do
+  if ! echo "$other" | grep "$d" >/dev/null; then
+    echo "$d missing from * expansion" >&2
+    exit 1
+  fi
+done
+
+other=`echo echo '(*)' | @builddir@/grub-shell`
+for d in $disks; do
+  if ! echo "$other" | grep "$d" >/dev/null; then
+    echo "$d missing from (*) expansion" >&2
+    exit 1
+  fi
+done
+
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index a41a6f6f4..a28786057 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -95,7 +95,7 @@ done
 if [ "x${source}" = x ] ; then
     tmpfile=`mktemp`
     while read; do
-	echo $REPLY >> ${tmpfile}
+	echo "$REPLY" >> ${tmpfile}
     done
     source=${tmpfile}
 fi

From c4f7b5235917d65f43310c3e0ae895ebfcc663ca Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Tue, 18 May 2010 20:10:37 +0200
Subject: [PATCH 0982/1628] 2010-05-18  Justus Winter 
 <4winter@informatik.uni-hamburg.de>

	* util/grub.d/10_hurd.in: Include all gnumach* kernels, not only
	gnumach and gnumach.gz.
---
 ChangeLog              |  5 +++++
 util/grub.d/10_hurd.in | 39 +++++++++++++++++++++++----------------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4e0f35c1d..e8bb242bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-18  Justus Winter  <4winter@informatik.uni-hamburg.de>
+
+	* util/grub.d/10_hurd.in: Include all gnumach* kernels, not only
+	gnumach and gnumach.gz.
+
 2010-05-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/i18n.h (gettext): Inline instead of using #define.
diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index 8e16e7d9f..e446f10e8 100644
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -35,13 +35,13 @@ all_of_them=true
 
 # FIXME: add l4 here?
 kernel=
-for i in /boot/gnumach.gz /boot/gnumach ; do
+for i in /boot/gnumach* ; do
   if test -e $i ; then
     basename=`basename $i`
     dirname=`dirname $i`
     rel_dirname=`make_system_path_relative_to_its_root $dirname`
     echo "Found GNU Mach: $i" >&2
-    kernel=${rel_dirname}/${basename}
+    kernels="${kernels} ${rel_dirname}/${basename}"
     at_least_one=true
   fi
 done
@@ -71,17 +71,22 @@ if ${all_of_them} && test -e /lib/ld.so.1 ; then : ; else
   exit 1
 fi
 
-cat << EOF
-menuentry "${OS}" ${CLASS} {
+for kernel in ${kernels}
+do
+  kernel_base="`basename "${kernel}"`"
+  KERNEL="using ${kernel_base}"
+
+  cat << EOF
+menuentry "${OS} ${KERNEL}" ${CLASS} {
 EOF
-prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
-cat << EOF
+  prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
+  cat << EOF
 	echo		'$(gettext_quoted "Loading GNU Mach ...")'
 	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/}
 EOF
-save_default_entry | sed -e "s/^/\t/"
-prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
-cat << EOF
+  save_default_entry | sed -e "s/^/\t/"
+  prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
+  cat << EOF
 	echo		'$(gettext_quoted "Loading the Hurd ...")'
 	module		/hurd/${hurd_fs}.static ${hurd_fs} --readonly \\
 			--multiboot-command-line='\${kernel-command-line}' \\
@@ -93,17 +98,17 @@ cat << EOF
 }
 EOF
 
-cat << EOF
-menuentry "${OS} (recovery mode)" {
+  cat << EOF
+menuentry "${OS} ${KERNEL} (recovery mode)" ${CLASS} {
 EOF
-prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
-cat << EOF
+  prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/"
+  cat << EOF
 	echo		'$(gettext_quoted "Loading GNU Mach ...")'
 	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/} -s
 EOF
-save_default_entry | sed -e "s/^/\t/"
-prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
-cat << EOF
+  save_default_entry | sed -e "s/^/\t/"
+  prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
+  cat << EOF
 	echo		'$(gettext_quoted "Loading the Hurd ...")'
 	module		/hurd/${hurd_fs}.static ${hurd_fs} \\
 			--multiboot-command-line='\${kernel-command-line}' \\
@@ -114,3 +119,5 @@ cat << EOF
 	module		/lib/ld.so.1 exec /hurd/exec '\$(exec-task=task-create)'
 }
 EOF
+
+done

From 74276c0df7489cf122c9cc16109291086483f8f3 Mon Sep 17 00:00:00 2001
From: Christian Franke <franke@computer.org>
Date: Tue, 18 May 2010 21:58:49 +0200
Subject: [PATCH 0983/1628] 	* util/grub.d/10_windows.in: Use path names
 instead of 	drive letters to prevent warning from Cygwin 1.7. 	Add
 drivemap command to menuentry if needed.

---
 ChangeLog                 |  6 ++++++
 util/grub.d/10_windows.in | 21 +++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e8bb242bf..46d9e7c34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-18  Christian Franke  <franke@computer.org>
+
+	* util/grub.d/10_windows.in: Use path names instead of
+	drive letters to prevent warning from Cygwin 1.7.
+	Add drivemap command to menuentry if needed.
+
 2010-05-18  Justus Winter  <4winter@informatik.uni-hamburg.de>
 
 	* util/grub.d/10_hurd.in: Include all gnumach* kernels, not only
diff --git a/util/grub.d/10_windows.in b/util/grub.d/10_windows.in
index 35dd4a4cc..7d221eac9 100644
--- a/util/grub.d/10_windows.in
+++ b/util/grub.d/10_windows.in
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # grub-mkconfig helper script.
-# Copyright (C) 2008  Free Software Foundation, Inc.
+# Copyright (C) 2008,2009,2010  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
@@ -28,8 +28,8 @@ esac
 
 # Try C: even if current system is on other partition.
 case "$SYSTEMDRIVE" in
-  [Cc]:)     dirlist="C:"              ;;
-  [D-Zd-z]:) dirlist="C: $SYSTEMDRIVE" ;;
+  [Cc]:)     drives="C:"              ;;
+  [D-Zd-z]:) drives="C: $SYSTEMDRIVE" ;;
   *) exit 0 ;;
 esac
 
@@ -51,7 +51,13 @@ get_os_name_from_boot_ini ()
 }
 
 
-for dir in $dirlist ; do
+for drv in $drives ; do
+
+  # Convert to Cygwin path.
+  dir=`cygpath "$drv"`
+  test -n "$dir" || continue
+
+  needmap=
 
   # Check for Vista bootmgr.
   if [ -f "$dir"/bootmgr -a -f "$dir"/boot/bcd ] ; then
@@ -60,6 +66,7 @@ for dir in $dirlist ; do
   # Check for NTLDR.
   elif [ -f "$dir"/ntldr -a -f "$dir"/ntdetect.com -a -f "$dir"/boot.ini ] ; then
     OS=`get_os_name_from_boot_ini "$dir"/boot.ini` || OS="Windows NT/2000/XP loader"
+    needmap=t
 
   else
     continue
@@ -68,14 +75,16 @@ for dir in $dirlist ; do
   # Get boot /dev/ice.
   dev=`${grub_probe} -t device "$dir" 2>/dev/null` || continue
 
-  echo "Found $OS on $dir ($dev)" >&2
+  echo "Found $OS on $drv ($dev)" >&2
   cat << EOF
 menuentry "$OS" {
 EOF
 
   save_default_entry | sed -e 's,^,\t,'
   prepare_grub_to_access_device "$dev" | sed 's,^,\t,'
-
+  test -z "$needmap" || cat <<EOF
+	drivemap -s (hd0) \$root
+EOF
   cat << EOF
 	chainloader +1
 }

From dada803720619685c1a56bd9c42c108d6d87eece Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 19 May 2010 10:15:48 +0530
Subject: [PATCH 0984/1628] allocate memory in sizes of two powers

---
 script/argv.c | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/script/argv.c b/script/argv.c
index 1ac81f4b8..4974178cc 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -20,8 +20,23 @@
 #include <grub/mm.h>
 #include <grub/script_sh.h>
 
-#define ARG_ALLOCATION_UNIT  (32 * sizeof (char))
-#define ARGV_ALLOCATION_UNIT (8 * sizeof (void*))
+static unsigned
+round_up_exp (unsigned v)
+{
+  v--;
+  v |= v >> 1;
+  v |= v >> 2;
+  v |= v >> 4;
+  v |= v >> 8;
+  v |= v >> 16;
+  if (sizeof (v) > 4)
+    v |= v >> 32;
+
+  v++;
+  v += (v == 0);
+
+  return v;
+}
 
 void
 grub_script_argv_free (struct grub_script_argv *argv)
@@ -48,7 +63,7 @@ grub_script_argv_next (struct grub_script_argv *argv)
 
   if (argv->argc == 0)
     {
-      p = grub_malloc (ALIGN_UP (2 * sizeof (char *), ARG_ALLOCATION_UNIT));
+      p = grub_malloc (2 * sizeof (char *));
       if (! p)
 	return 1;
 
@@ -62,8 +77,7 @@ grub_script_argv_next (struct grub_script_argv *argv)
   if (! argv->args[argv->argc - 1])
     return 0;
 
-  p = grub_realloc (p, ALIGN_UP ((argv->argc + 1) * sizeof (char *),
-				 ARG_ALLOCATION_UNIT));
+  p = grub_realloc (p, round_up_exp ((argv->argc + 1) * sizeof (char *)));
   if (! p)
     return 1;
 
@@ -86,8 +100,7 @@ grub_script_argv_append (struct grub_script_argv *argv, const char *s)
   a = p ? grub_strlen (p) : 0;
   b = grub_strlen (s);
 
-  p = grub_realloc (p, ALIGN_UP ((a + b + 1) * sizeof (char),
-				 ARG_ALLOCATION_UNIT));
+  p = grub_realloc (p, round_up_exp ((a + b + 1) * sizeof (char)));
   if (! p)
     return 1;
 

From 0003008a588020db005454a02b5a192b93254e88 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 19 May 2010 10:25:41 +0530
Subject: [PATCH 0985/1628] memory leak fix in grub_script_execute_cmdline

---
 include/grub/script_sh.h | 2 +-
 script/argv.c            | 3 ++-
 script/execute.c         | 9 +++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 5455fc763..9199a539e 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -66,7 +66,7 @@ struct grub_script_arg
 /* An argument vector.  */
 struct grub_script_argv
 {
-  int argc;
+  unsigned argc;
   char **args;
 };
 
diff --git a/script/argv.c b/script/argv.c
index 4974178cc..56274f263 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -29,6 +29,7 @@ round_up_exp (unsigned v)
   v |= v >> 4;
   v |= v >> 8;
   v |= v >> 16;
+
   if (sizeof (v) > 4)
     v |= v >> 32;
 
@@ -41,7 +42,7 @@ round_up_exp (unsigned v)
 void
 grub_script_argv_free (struct grub_script_argv *argv)
 {
-  int i;
+  unsigned i;
 
   if (argv->args)
     {
diff --git a/script/execute.c b/script/execute.c
index 2040be13c..6a755a040 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -77,7 +77,7 @@ grub_script_env_get (const char *name, grub_script_arg_type_t type)
     }
   else if (grub_strcmp (name, "*") == 0)
     {
-      int i;
+      unsigned i;
 
       for (i = 0; ! errors && i < scope->argv.argc; i++)
 	if (type == GRUB_SCRIPT_ARG_TYPE_VAR)
@@ -97,7 +97,7 @@ grub_script_env_get (const char *name, grub_script_arg_type_t type)
     }
   else if (grub_strcmp (name, "@") == 0)
     {
-      int i;
+      unsigned i;
 
       for (i = 0; ! errors && i < scope->argv.argc; i++)
 	{
@@ -287,6 +287,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 	  grub_snprintf (errnobuf, sizeof (errnobuf), "%d", grub_errno);
 	  grub_env_set ("?", errnobuf);
 
+	  grub_script_argv_free (&argv);
 	  grub_print_error ();
 
 	  return 0;
@@ -353,8 +354,8 @@ grub_script_execute_cmdif (struct grub_script_cmd *cmd)
 grub_err_t
 grub_script_execute_cmdfor (struct grub_script_cmd *cmd)
 {
-  int i;
-  int result;
+  unsigned i;
+  grub_err_t result;
   struct grub_script_argv argv;
   struct grub_script_cmdfor *cmdfor = (struct grub_script_cmdfor *) cmd;
 

From 123b7a8571689a1227f18102546b4a1413f275d7 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 19 May 2010 14:31:43 +0530
Subject: [PATCH 0986/1628] 	Fix grub-mkrescue usage unit testing.

	* tests/util/grub-shell.in: Use --grub-mkimage with grub-mkrescue.
---
 ChangeLog                | 6 ++++++
 tests/util/grub-shell.in | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 46d9e7c34..53a664d2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-19  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	Fix grub-mkrescue usage unit testing.
+
+	* tests/util/grub-shell.in: Use --grub-mkimage with grub-mkrescue.
+
 2010-05-18  Christian Franke  <franke@computer.org>
 
 	* util/grub.d/10_windows.in: Use path names instead of
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index a41a6f6f4..17da6c8c0 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -124,7 +124,8 @@ halt
 EOF
 
 isofile=`mktemp`
-grub-mkrescue --output=${isofile} --override-directory=${builddir} \
+grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage --output=${isofile} \
+  --override-directory=${builddir} \
   /boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \
   >/dev/null 2>&1
 

From 50cd44693d2d3949c5e18f2fdf8ea2b3af511471 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 19 May 2010 20:53:20 +0530
Subject: [PATCH 0987/1628] minor fixes

---
 conf/common.rmk |  2 +-
 script/argv.c   | 62 ++++++++++++++-----------------------------------
 2 files changed, 19 insertions(+), 45 deletions(-)

diff --git a/conf/common.rmk b/conf/common.rmk
index 54146904b..886d10e58 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -662,7 +662,7 @@ normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
 # For sh.mod.
 sh_mod_SOURCES = script/main.c script/script.c script/argv.c script/execute.c \
 	script/function.c script/lexer.c grub_script.tab.c grub_script.yy.c
-sh_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS) -Wno-error
+sh_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS) $(GNULIB_CFLAGS) -Wno-error
 sh_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 ifneq (, $(FONT_SOURCE))
diff --git a/script/argv.c b/script/argv.c
index 8446ded3d..369be49b8 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -373,47 +373,38 @@ match_devices (const regex_t *regexp)
   int i;
   int ndev;
   char **devs;
-  char *buffer;
 
   auto int match (const char *name);
   int match (const char *name)
   {
-    void *t;
-    unsigned n;
-
-    n = grub_strlen (name);
-    t = grub_realloc (buffer, n + 3);
-    if (! t)
+    char **t;
+    char *buffer = grub_xasprintf ("(%s)", name);
+    if (! buffer)
       return 1;
 
-    buffer = (char *) t;
-    grub_snprintf (buffer, n + 3, "(%s)", name);
-
     grub_dprintf ("expand", "matching: %s\n", buffer);
     if (regexec (regexp, buffer, 0, 0, 0))
-      return 0;
+      {
+	grub_free (buffer);
+	return 0;
+      }
 
     t = grub_realloc (devs, sizeof (char*) * (ndev + 2));
     if (! t)
       return 1;
 
-    devs = (char **) t;
+    devs = t;
     devs[ndev++] = buffer;
     devs[ndev] = 0;
-    buffer = 0;
     return 0;
   }
 
   ndev = 0;
   devs = 0;
-  buffer = 0;
 
   if (grub_device_iterate (match))
     goto fail;
 
-  if (buffer)
-    grub_free (buffer);
-
   return devs;
 
  fail:
@@ -424,9 +415,6 @@ match_devices (const regex_t *regexp)
   if (devs)
     grub_free (devs);
 
-  if (buffer)
-    grub_free (buffer);
-
   return 0;
 }
 
@@ -437,10 +425,8 @@ match_files (const char *prefix, const char *suffix, const char *end,
   int i;
   int error;
   char **files;
-  char *buffer;
   unsigned nfile;
   char *dir;
-  unsigned dirlen;
   const char *path;
   char *device_name;
   grub_fs_t fs;
@@ -449,8 +435,8 @@ match_files (const char *prefix, const char *suffix, const char *end,
   auto int match (const char *name, const struct grub_dirhook_info *info);
   int match (const char *name, const struct grub_dirhook_info *info)
   {
-    void *t;
-    unsigned n;
+    char **t;
+    char *buffer;
 
     /* skip hidden files, . and .. */
     if (name[0] == '.')
@@ -460,36 +446,32 @@ match_files (const char *prefix, const char *suffix, const char *end,
     if (regexec (regexp, name, 0, 0, 0))
       return 0;
 
-    n = dirlen + grub_strlen (name);
-    t = grub_realloc (buffer, n + 1);
-    if (! t)
+    buffer = grub_xasprintf ("%s%s", dir, name);
+    if (! buffer)
       return 1;
 
-    buffer = (char *) t;
-    grub_snprintf (buffer, n + 1, "%s%s", dir, name);
-
     t = grub_realloc (files, sizeof (char*) * (nfile + 2));
     if (! t)
-      return 1;
+      {
+	grub_free (buffer);
+	return 1;
+      }
 
-    files = (char **) t;
+    files = t;
     files[nfile++] = buffer;
     files[nfile] = 0;
-    buffer = 0;
     return 0;
   }
 
   nfile = 0;
   files = 0;
   dev = 0;
-  buffer = 0;
   device_name = 0;
   grub_error_push ();
 
   dir = make_dir (prefix, suffix, end);
   if (! dir)
     goto fail;
-  dirlen = grub_strlen (dir);
 
   device_name = grub_file_get_device_name (dir);
   dev = grub_device_open (device_name);
@@ -508,9 +490,6 @@ match_files (const char *prefix, const char *suffix, const char *end,
   if (fs->dir (dev, path, match))
     goto fail;
 
-  if (buffer)
-    grub_free (buffer);
-
   grub_free (dir);
   grub_device_close (dev);
   grub_free (device_name);
@@ -534,9 +513,6 @@ match_files (const char *prefix, const char *suffix, const char *end,
   if (device_name)
     grub_free (device_name);
 
-  if (buffer)
-    grub_free (buffer);
-
   grub_error_pop ();
   return 0;
 }
@@ -563,12 +539,10 @@ match_paths_with_escaped_suffix (char **paths,
       if (! root)
 	return 0;
 
-      n = grub_strlen (root) + 2;
-      prefix = grub_malloc (n + 1);
+      prefix = grub_xasprintf ("(%s)", root);
       if (! prefix)
 	return 0;
 
-      grub_snprintf (prefix, n + 1, "(%s)", root);
       r = match_files (prefix, suffix, end, regexp);
       grub_free (prefix);
       return r;

From fa9d256ee45ed71ab9fc02809a0927d740adca86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Thu, 20 May 2010 02:05:43 +0200
Subject: [PATCH 0988/1628] Fix merge error in NetBSD code.

---
 ChangeLog           | 6 ++++++
 kern/emu/hostdisk.c | 7 ++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 53a664d2f..1348c91c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-20  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* kern/emu/hostdisk.c (grub_util_biosdisk_get_grub_dev) [__NetBSD__]:
+	Fix merge error in NetBSD code.
+	(find_partition_start) [__NetBSD__]: Likewise.
+
 2010-05-19  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Fix grub-mkrescue usage unit testing.
diff --git a/kern/emu/hostdisk.c b/kern/emu/hostdisk.c
index 0ab25ec7d..9c4697552 100644
--- a/kern/emu/hostdisk.c
+++ b/kern/emu/hostdisk.c
@@ -412,7 +412,8 @@ devmapper_fail:
   fd = open (dev, O_RDONLY);
   if (fd == -1)
     {
-      grub_error (GRUB_ERR_BAD_DEVICE, "cannot open `%s' while attempting to get disk geometry", dev);
+      grub_error (GRUB_ERR_BAD_DEVICE,
+		  "cannot open `%s' while attempting to get disk geometry", dev);
       return 0;
     }
 
@@ -434,9 +435,6 @@ devmapper_fail:
 # if !defined(__NetBSD__)
   return hdg.start;
 # else /* defined(__NetBSD__) */
-  /* Since dev and convert_system_partition_to_system_disk (dev) are
-   * different, we know that dev is of the form /dev/r[wsc]d[0-9]+[a-z]
-   * and in particular it cannot be a floppy device.  */
   index = dev[strlen(dev) - 1] - 'a';
 
   if (index >= label.d_npartitions)
@@ -1433,7 +1431,6 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
     /* Since os_dev and convert_system_partition_to_system_disk (os_dev) are
      * different, we know that os_dev is of the form /dev/r[wsc]d[0-9]+[a-z]
      * and in particular it cannot be a floppy device.  */
-    index = os_dev[strlen(os_dev) - 1] - 'a';
 # endif /* !defined(__NetBSD__) */
 
     start = find_partition_start (os_dev);

From 96779aec8ee4e7edfcb1a09a279db528f6ae8f5e Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 20 May 2010 23:16:10 +0100
Subject: [PATCH 0989/1628] * util/misc.c: Move inclusion of <limits.h> to ...
 * kern/emu/misc.c: ... here.  Needed for canonicalize_file_name.

---
 ChangeLog       | 5 +++++
 kern/emu/misc.c | 3 +++
 util/misc.c     | 3 ---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1348c91c6..42b04d1c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-20  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/misc.c: Move inclusion of <limits.h> to ...
+	* kern/emu/misc.c: ... here.  Needed for canonicalize_file_name.
+
 2010-05-20  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* kern/emu/hostdisk.c (grub_util_biosdisk_get_grub_dev) [__NetBSD__]:
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index 54c808a47..a3ccb3076 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -9,6 +9,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
 
 #include <grub/mm.h>
 #include <grub/err.h>
diff --git a/util/misc.c b/util/misc.c
index 46e5c6093..91bc25a55 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -30,9 +30,6 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include <time.h>
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#endif
 
 #include <grub/kernel.h>
 #include <grub/dl.h>

From c0f48e654daf3cc9451c267450ab4b617277baf0 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 20 May 2010 23:27:15 +0100
Subject: [PATCH 0990/1628] * util/grub-mkrelpath.c (usage): Remove excess
 apostrophe.

---
 ChangeLog             | 4 ++++
 util/grub-mkrelpath.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 42b04d1c9..cdff463e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-20  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkrelpath.c (usage): Remove excess apostrophe.
+
 2010-05-20  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/misc.c: Move inclusion of <limits.h> to ...
diff --git a/util/grub-mkrelpath.c b/util/grub-mkrelpath.c
index e771bd873..eccb49cdc 100644
--- a/util/grub-mkrelpath.c
+++ b/util/grub-mkrelpath.c
@@ -41,7 +41,7 @@ usage (int status)
     printf ("\
 Usage: %s [OPTIONS] PATH\n\
 \n\
-Make a system path relative to it's root.\n\
+Make a system path relative to its root.\n\
 \n\
 Options:\n\
   -h, --help                display this message and exit\n\

From f532a574a6b4bd9feb6f17fac74ea64e6244a079 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 21 May 2010 15:34:36 +0530
Subject: [PATCH 0991/1628] write overflow bug fix with cleanup

---
 script/argv.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/script/argv.c b/script/argv.c
index 56274f263..69322779d 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -62,28 +62,18 @@ grub_script_argv_next (struct grub_script_argv *argv)
 {
   char **p = argv->args;
 
-  if (argv->argc == 0)
-    {
-      p = grub_malloc (2 * sizeof (char *));
-      if (! p)
-	return 1;
-
-      argv->argc = 1;
-      argv->args = p;
-      argv->args[0] = 0;
-      argv->args[1] = 0;
-      return 0;
-    }
-
-  if (! argv->args[argv->argc - 1])
+  if (argv->args && argv->args[argv->argc - 1] == 0)
     return 0;
 
-  p = grub_realloc (p, round_up_exp ((argv->argc + 1) * sizeof (char *)));
+  p = grub_realloc (p, round_up_exp ((argv->argc + 2) * sizeof (char *)));
   if (! p)
     return 1;
 
   argv->argc++;
   argv->args = p;
+
+  if (argv->argc == 1)
+    argv->args[0] = 0;
   argv->args[argv->argc] = 0;
   return 0;
 }

From 1702fbc15de595722b8f1c03181ccbaf364a1337 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 21 May 2010 15:43:24 +0530
Subject: [PATCH 0992/1628] replace error handling with goto

---
 script/execute.c | 117 +++++++++++++++++++++++++++--------------------
 1 file changed, 67 insertions(+), 50 deletions(-)

diff --git a/script/execute.c b/script/execute.c
index 6a755a040..4a3f249b0 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -51,65 +51,77 @@ grub_env_special (const char *name)
 static char **
 grub_script_env_get (const char *name, grub_script_arg_type_t type)
 {
-  int errors = 0;
   struct grub_script_argv result = { 0, 0 };
 
-  errors += grub_script_argv_next (&result);
+  if (grub_script_argv_next (&result))
+    goto fail;
+
   if (! grub_env_special (name))
     {
       char *v = grub_env_get (name);
       if (v && v[0])
 	{
 	  if (type == GRUB_SCRIPT_ARG_TYPE_VAR)
-	    errors += grub_script_argv_split_append (&result, v);
+	    {
+	      if (grub_script_argv_split_append (&result, v))
+		goto fail;
+	    }
 	  else
-	    errors += grub_script_argv_append (&result, v);
+	    if (grub_script_argv_append (&result, v))
+	      goto fail;
 	}
     }
   else if (! scope)
-    errors += grub_script_argv_append (&result, 0);
-
+    {
+      if (grub_script_argv_append (&result, 0))
+	goto fail;
+    }
   else if (grub_strcmp (name, "#") == 0)
     {
       char buffer[ERRNO_DIGITS_MAX + 1];
       grub_snprintf (buffer, sizeof (buffer), "%u", scope->argv.argc);
-      errors += grub_script_argv_append (&result, buffer);
+      if (grub_script_argv_append (&result, buffer))
+	goto fail;
     }
   else if (grub_strcmp (name, "*") == 0)
     {
       unsigned i;
 
-      for (i = 0; ! errors && i < scope->argv.argc; i++)
+      for (i = 0; i < scope->argv.argc; i++)
 	if (type == GRUB_SCRIPT_ARG_TYPE_VAR)
 	  {
-	    if (i != 0)
-	      errors += grub_script_argv_next (&result);
-	    errors += grub_script_argv_split_append (&result,
-						     scope->argv.args[i]);
+	    if (i != 0 && grub_script_argv_next (&result))
+	      goto fail;
+
+	    if (grub_script_argv_split_append (&result, scope->argv.args[i]))
+	      goto fail;
 	  }
 	else
 	  {
-	    if (i != 0)
-	      errors += grub_script_argv_append (&result, " ");
-	    errors += grub_script_argv_append (&result,
-					       scope->argv.args[i]);
+	    if (i != 0 && grub_script_argv_append (&result, " "))
+	      goto fail;
+
+	    if (grub_script_argv_append (&result, scope->argv.args[i]))
+	      goto fail;
 	  }
     }
   else if (grub_strcmp (name, "@") == 0)
     {
       unsigned i;
 
-      for (i = 0; ! errors && i < scope->argv.argc; i++)
+      for (i = 0; i < scope->argv.argc; i++)
 	{
-	  if (i != 0)
-	    errors += grub_script_argv_next (&result);
+	  if (i != 0 && grub_script_argv_next (&result))
+	    goto fail;
 
 	  if (type == GRUB_SCRIPT_ARG_TYPE_VAR)
-	    errors += grub_script_argv_split_append (&result,
-						     scope->argv.args[i]);
+	    {
+	      if (grub_script_argv_split_append (&result, scope->argv.args[i]))
+		goto fail;
+	    }
 	  else
-	    errors += grub_script_argv_append (&result,
-					       scope->argv.args[i]);
+	    if (grub_script_argv_append (&result, scope->argv.args[i]))
+	      goto fail;
 	}
     }
   else
@@ -121,21 +133,23 @@ grub_script_env_get (const char *name, grub_script_arg_type_t type)
       else if (num <= scope->argv.argc)
 	{
 	  if (type == GRUB_SCRIPT_ARG_TYPE_VAR)
-	    errors += grub_script_argv_split_append (&result,
-						     scope->argv.args[num - 1]);
+	    {
+	      if (grub_script_argv_split_append (&result,
+						 scope->argv.args[num - 1]))
+		goto fail;
+	    }
 	  else
-	    errors += grub_script_argv_append (&result,
-					       scope->argv.args[num - 1]);
+	    if (grub_script_argv_append (&result, scope->argv.args[num - 1]))
+	      goto fail;
 	}
     }
 
-  if (errors)
-    {
-      grub_script_argv_free (&result);
-      return 0;
-    }
-
   return result.args;
+
+ fail:
+
+  grub_script_argv_free (&result);
+  return 0;
 }
 
 static grub_err_t
@@ -153,21 +167,18 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
 			     struct grub_script_argv *argv)
 {
   int i;
-  int error = 0;
   char **values = 0;
   struct grub_script_arg *arg = 0;
   struct grub_script_argv result = { 0, 0 };
 
-  for (; error == 0 && arglist && arglist->arg; arglist = arglist->next)
+  for (; arglist && arglist->arg; arglist = arglist->next)
     {
-      error += grub_script_argv_next (&result);
+      if (grub_script_argv_next (&result))
+	goto fail;
 
       arg = arglist->arg;
       while (arg)
 	{
-	  if (error)
-	    break;
-
 	  switch (arg->type)
 	    {
 	    case GRUB_SCRIPT_ARG_TYPE_VAR:
@@ -175,35 +186,41 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
 	      values = grub_script_env_get (arg->str, arg->type);
 	      for (i = 0; values && values[i]; i++)
 		{
-		  if (i != 0)
-		    error += grub_script_argv_next (&result);
-		  error += grub_script_argv_append (&result, values[i]);
+		  if (i != 0 && grub_script_argv_next (&result))
+		    goto fail;
+
+		  if (grub_script_argv_append (&result, values[i]))
+		    goto fail;
 		}
 	      grub_free (values);
 	      break;
 
 	    case GRUB_SCRIPT_ARG_TYPE_TEXT:
-	      if (grub_strlen (arg->str))
-		error += grub_script_argv_append (&result, arg->str);
+	      if (grub_strlen (arg->str) &&
+		  grub_script_argv_append (&result, arg->str))
+		goto fail;
 	      break;
 
 	    case GRUB_SCRIPT_ARG_TYPE_DQSTR:
 	    case GRUB_SCRIPT_ARG_TYPE_SQSTR:
-	      error += grub_script_argv_append (&result, arg->str);
+	      if (grub_script_argv_append (&result, arg->str))
+		goto fail;
 	      break;
 	    }
 	  arg = arg->next;
 	}
     }
 
-  if (error)
-    return 1;
-
   if (! result.args[result.argc - 1])
     result.argc--;
 
   *argv = result;
   return 0;
+
+ fail:
+
+  grub_script_argv_free (&result);
+  return 1;
 }
 
 static grub_err_t
@@ -356,7 +373,7 @@ grub_script_execute_cmdfor (struct grub_script_cmd *cmd)
 {
   unsigned i;
   grub_err_t result;
-  struct grub_script_argv argv;
+  struct grub_script_argv argv = { 0, 0 };
   struct grub_script_cmdfor *cmdfor = (struct grub_script_cmdfor *) cmd;
 
   if (grub_script_arglist_to_argv (cmdfor->words, &argv))
@@ -398,7 +415,7 @@ grub_err_t
 grub_script_execute_menuentry (struct grub_script_cmd *cmd)
 {
   struct grub_script_cmd_menuentry *cmd_menuentry;
-  struct grub_script_argv argv = {0, 0};
+  struct grub_script_argv argv = { 0, 0 };
 
   cmd_menuentry = (struct grub_script_cmd_menuentry *) cmd;
 

From 21717c8fcaa20b66568b90a296c86b99626b034b Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 21 May 2010 14:17:15 +0100
Subject: [PATCH 0993/1628] * util/grub-mkconfig.in: Fix handling of -o so that
 it works when not the first option.

---
 ChangeLog             |  5 +++++
 util/grub-mkconfig.in | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cdff463e4..02503a90f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-21  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkconfig.in: Fix handling of -o so that it works when
+	not the first option.
+
 2010-05-20  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkrelpath.c (usage): Remove excess apostrophe.
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 85212f8fc..d1abfa36a 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -50,7 +50,13 @@ EOF
 }
 
 # Check the arguments.
+next_grub_cfg=false
 for option in "$@"; do
+    if $next_grub_cfg; then
+	grub_cfg=$option
+	next_grub_cfg=false
+	continue
+    fi
     case "$option" in
     -h | --help)
 	usage
@@ -59,8 +65,7 @@ for option in "$@"; do
 	echo "$0 (GNU GRUB ${package_version})"
 	exit 0 ;;
     -o)
-	shift
-	grub_cfg=$1
+	next_grub_cfg=:
 	;;
     --output=*)
 	grub_cfg=`echo "$option" | sed 's/--output=//'`
@@ -72,6 +77,11 @@ for option in "$@"; do
 	;;
     esac
 done
+if $next_grub_cfg; then
+    echo "Missing argument to \`-o'" 1>&2
+    usage
+    exit 1
+fi
 
 . ${libdir}/grub/grub-mkconfig_lib
 

From 19dcc4908662fcdaa1a69ccbb8b5b2bf7d481f2f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 21 May 2010 19:45:14 +0200
Subject: [PATCH 0994/1628] xen configuration preliminary support based on
 enhanced version of a kludge I use

---
 conf/common.rmk             |   3 +
 util/grub-mkconfig.in       |   2 +
 util/grub.d/20_linux_xen.in | 139 ++++++++++++++++++++++++++++++++++++
 3 files changed, 144 insertions(+)
 create mode 100644 util/grub.d/20_linux_xen.in

diff --git a/conf/common.rmk b/conf/common.rmk
index beee25be9..641a2c62a 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -219,6 +219,9 @@ grub-mkconfig_SCRIPTS = 00_header 30_os-prober 40_custom
 ifneq (, $(host_kernel))
 grub-mkconfig_SCRIPTS += 10_$(host_kernel)
 endif
+ifeq (linux, $(host_kernel))
+grub-mkconfig_SCRIPTS += 20_linux_xen
+endif
 
 CLEANFILES += $(grub-mkconfig_SCRIPTS)
 
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 85212f8fc..17b7f7e38 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -239,6 +239,8 @@ export GRUB_DEFAULT \
   GRUB_DISTRIBUTOR \
   GRUB_CMDLINE_LINUX \
   GRUB_CMDLINE_LINUX_DEFAULT \
+  GRUB_CMDLINE_XEN \
+  GRUB_CMDLINE_XEN_DEFAULT \
   GRUB_CMDLINE_NETBSD \
   GRUB_CMDLINE_NETBSD_DEFAULT \
   GRUB_TERMINAL_INPUT \
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
new file mode 100644
index 000000000..862f43888
--- /dev/null
+++ b/util/grub.d/20_linux_xen.in
@@ -0,0 +1,139 @@
+#! /bin/sh -e
+
+# grub-mkconfig helper script.
+# Copyright (C) 2006,2007,2008,2009,2010  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/>.
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+libdir=@libdir@
+. ${libdir}/grub/grub-mkconfig_lib
+
+export TEXTDOMAIN=@PACKAGE@
+export TEXTDOMAINDIR=@localedir@
+
+CLASS="--class gnu-linux --class gnu --class os --class xen"
+
+if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+  OS=GNU/Linux
+else
+  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
+  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
+fi
+
+# loop-AES arranges things so that /dev/loop/X can be our root device, but
+# the initrds that Linux uses don't like that.
+case ${GRUB_DEVICE} in
+  /dev/loop/*|/dev/loop[0-9])
+    GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
+  ;;
+esac
+
+if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
+    || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ; then
+  LINUX_ROOT_DEVICE=${GRUB_DEVICE}
+else
+  LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
+fi
+
+linux_entry ()
+{
+  os="$1"
+  version="$2"
+  xen_version="$3"
+  recovery="$4"
+  args="$5"
+  xen_args="$6"
+  if ${recovery} ; then
+    title="$(gettext_quoted "%s, with Linux %s and XEN %s (recovery mode)")"
+  else
+    title="$(gettext_quoted "%s, with Linux %s and XEN %s")"
+  fi
+  printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" "${xen_version}"
+  save_default_entry | sed -e "s/^/\t/"
+
+  if [ -z "${prepare_boot_cache}" ]; then
+    prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
+  fi
+  printf '%s\n' "${prepare_boot_cache}"
+  cat << EOF
+	echo	'$(printf "$(gettext_quoted "Loading Linux %s ...")" ${version})'
+	multiboot	${rel_xen_dirname}/${xen_basename} placeholder ${xen_args}
+	module	${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
+EOF
+  if test -n "${initrd}" ; then
+    cat << EOF
+	echo	'$(gettext_quoted "Loading initial ramdisk ...")'
+	module	${rel_dirname}/${initrd}
+EOF
+  fi
+  cat << EOF
+}
+EOF
+}
+
+linux_list=`for i in /boot/vmlinu[xz]-*jeremy* /vmlinu[xz]-*jeremy* ; do
+        if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+      done`
+xen_list=`for i in /boot/xen*; do
+        if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+      done`
+prepare_boot_cache=
+
+while [ "x${xen_list}" != "x" ] ; do
+    list="${linux_list}"
+    current_xen=`version_find_latest $xen_list`
+    xen_basename=`basename ${current_xen}`
+    xen_dirname=`dirname ${current_xen}`
+    rel_xen_dirname=`make_system_path_relative_to_its_root $xen_dirname`
+    xen_version=`echo $xen_basename | sed -e "s,.gz$,,g;s,^xen-,,g"`
+    while [ "x$list" != "x" ] ; do
+	linux=`version_find_latest $list`
+	echo "Found linux image: $linux" >&2
+	basename=`basename $linux`
+	dirname=`dirname $linux`
+	rel_dirname=`make_system_path_relative_to_its_root $dirname`
+	version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
+	alt_version=`echo $version | sed -e "s,\.old$,,g"`
+	linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+
+	initrd=
+	for i in "initrd.img-${version}" "initrd-${version}.img" \
+	    "initrd-${version}" "initrd.img-${alt_version}" \
+	    "initrd-${alt_version}.img" "initrd-${alt_version}"; do
+	    if test -e "${dirname}/${i}" ; then
+		initrd="$i"
+		break
+	    fi
+	done
+	if test -n "${initrd}" ; then
+	    echo "Found initrd image: ${dirname}/${initrd}" >&2
+	else
+    # "UUID=" magic is parsed by initrds.  Since there's no initrd, it can't work here.
+	    linux_root_device_thisversion=${GRUB_DEVICE}
+	fi
+
+	linux_entry "${OS}" "${version}" "${xen_version}" false \
+	    "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
+	if [ "x${GRUB_DISABLE_LINUX_RECOVERY}" != "xtrue" ]; then
+	    linux_entry "${OS}" "${version}" "${xen_version}" true \
+		"single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}"
+	fi
+
+	list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
+    done
+    xen_list=`echo $xen_list | tr ' ' '\n' | grep -vx $current_xen | tr '\n' ' '`
+done

From 228cfa97caf0a0c907c945bc307f07029439d629 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 21 May 2010 20:08:48 +0200
Subject: [PATCH 0995/1628] 	* kern/i386/pc/init.c (make_install_device):
 Fix a leftover usage of old 	partition naming style.

---
 ChangeLog           | 5 +++++
 kern/i386/pc/init.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 02503a90f..090cd645d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/i386/pc/init.c (make_install_device): Fix a leftover usage of old
+	partition naming style.
+
 2010-05-21  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkconfig.in: Fix handling of -o so that it works when
diff --git a/kern/i386/pc/init.c b/kern/i386/pc/init.c
index fa646df19..d81b1e117 100644
--- a/kern/i386/pc/init.c
+++ b/kern/i386/pc/init.c
@@ -75,8 +75,8 @@ make_install_device (void)
 	  ptr += grub_strlen (ptr);
 
 	  if (grub_install_bsd_part >= 0)
-	    grub_snprintf (ptr, sizeof (dev) - (ptr - dev), ",%c",
-			   grub_install_bsd_part + 'a');
+	    grub_snprintf (ptr, sizeof (dev) - (ptr - dev), ",%u",
+			   grub_install_bsd_part + 1);
 	  ptr += grub_strlen (ptr);
 	}
 

From 39fbb79aa15e66e4516588bb2f74c1052218d8e6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 21 May 2010 20:12:41 +0200
Subject: [PATCH 0996/1628] 	* include/grub/i18n.h: Always enable
 grub_gettext.

---
 ChangeLog           |  4 ++++
 include/grub/i18n.h | 14 +++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 090cd645d..081ea4a1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/i18n.h: Always enable grub_gettext.
+
 2010-05-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/i386/pc/init.c (make_install_device): Fix a leftover usage of old
diff --git a/include/grub/i18n.h b/include/grub/i18n.h
index 57ca1c45b..a91d73346 100644
--- a/include/grub/i18n.h
+++ b/include/grub/i18n.h
@@ -22,10 +22,10 @@
 #include <config.h>
 #include <grub/symbol.h>
 
-extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
-
 /* NLS can be disabled through the configure --disable-nls option.  */
-#if (defined(ENABLE_NLS) && ENABLE_NLS)
+#if (defined(ENABLE_NLS) && ENABLE_NLS) || !defined (GRUB_UTIL)
+
+extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
 
 # ifdef GRUB_UTIL
 
@@ -41,19 +41,11 @@ extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
    for invalid uses of the value returned from these functions.
    On pre-ANSI systems without 'const', the config.h file is supposed to
    contain "#define const".  */
-# ifdef GRUB_UTIL
 static inline const char * __attribute__ ((always_inline))
 gettext (const char *str)
 {
   return str;
 }
-# else
-static inline const char * __attribute__ ((always_inline))
-grub_gettext (const char *str)
-{
-  return str;
-}
-# endif /* GRUB_UTIL */
 
 #endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
 

From 9a25f885d3f9aaa8b4725e5fb3fbc4d410b0c39f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 21 May 2010 20:22:29 +0200
Subject: [PATCH 0997/1628] 	* kern/i386/pc/mmap.c
 (grub_machine_mmap_iterate): Zero-fill entry 	before calling BIOS.

---
 ChangeLog           | 5 +++++
 kern/i386/pc/mmap.c | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 081ea4a1d..02d16e835 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/i386/pc/mmap.c (grub_machine_mmap_iterate): Zero-fill entry
+	before calling BIOS.
+
 2010-05-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/i18n.h: Always enable grub_gettext.
diff --git a/kern/i386/pc/mmap.c b/kern/i386/pc/mmap.c
index 52d8fd597..72a6b3539 100644
--- a/kern/i386/pc/mmap.c
+++ b/kern/i386/pc/mmap.c
@@ -20,6 +20,7 @@
 #include <grub/machine/memory.h>
 #include <grub/err.h>
 #include <grub/types.h>
+#include <grub/misc.h>
 
 grub_err_t
 grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t))
@@ -28,6 +29,8 @@ grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uin
   struct grub_machine_mmap_entry *entry
     = (struct grub_machine_mmap_entry *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
 
+  grub_memset (entry, 0, sizeof (entry));
+
   /* Check if grub_get_mmap_entry works.  */
   cont = grub_get_mmap_entry (entry, 0);
 
@@ -43,6 +46,8 @@ grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uin
 	if (! cont)
 	  break;
 
+	grub_memset (entry, 0, sizeof (entry));
+
 	cont = grub_get_mmap_entry (entry, cont);
       }
     while (entry->size);

From a7208779c3f5260f2cb353b047bdece889906600 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 22 May 2010 23:06:47 +0200
Subject: [PATCH 0998/1628] init PCI DMA and USB controllers

---
 kern/mips/yeeloong/init.c | 54 +++++++++++++++++++++++++++++++--------
 1 file changed, 44 insertions(+), 10 deletions(-)

diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 697e9733c..826659968 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -66,6 +66,49 @@ grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
   return GRUB_ERR_NONE;
 }
 
+static void
+init_pci (void)
+{
+  auto int NESTED_FUNC_ATTR set_card (grub_pci_device_t dev, grub_pci_id_t pciid);
+  int NESTED_FUNC_ATTR set_card (grub_pci_device_t dev, grub_pci_id_t pciid)
+  {
+    grub_pci_address_t addr;
+    /* FIXME: autoscan for BARs and devices.  */
+    switch (pciid)
+      {
+      case 0x00351033:
+	addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
+	grub_pci_write (addr, 0x5025000);
+	addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
+	grub_pci_write (addr, 0x2100146);
+	break;
+      case 0x00e01033:
+	addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
+	grub_pci_write (addr, 0x5026000);
+	addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
+	grub_pci_write (addr, 0x2100146);
+	break;
+      }
+    return 0;
+  }
+
+  *((volatile grub_uint32_t *) GRUB_CPU_LOONGSON_PCI_HIT1_SEL_LO) = 0x8000000c;
+  *((volatile grub_uint32_t *) GRUB_CPU_LOONGSON_PCI_HIT1_SEL_HI) = 0xffffffff;
+
+  /* Setup PCI controller.  */
+  *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER
+				+ GRUB_PCI_REG_COMMAND)) = 0x22b00046;
+  *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER
+				+ GRUB_PCI_REG_CACHELINE)) = 0xff;
+  *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER 
+				+ GRUB_PCI_REG_ADDRESS_REG0))
+    = 0x80000000 | GRUB_PCI_ADDR_MEM_TYPE_64 | GRUB_PCI_ADDR_MEM_PREFETCH;
+  *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER 
+				+ GRUB_PCI_REG_ADDRESS_REG1)) = 0;
+
+  grub_pci_iterate (set_card);
+}
+
 void
 grub_machine_init (void)
 {
@@ -123,16 +166,7 @@ grub_machine_init (void)
 
       grub_cs5536_init_geode (dev);
 
-      /* Setup PCI controller.  */
-      *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER
-				    + GRUB_PCI_REG_COMMAND)) = 0x22b00046;
-      *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER
-				    + GRUB_PCI_REG_CACHELINE)) = 0xff;
-      *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER 
-				    + GRUB_PCI_REG_ADDRESS_REG0))
-	= 0x80000000 | GRUB_PCI_ADDR_MEM_TYPE_64 | GRUB_PCI_ADDR_MEM_PREFETCH;
-      *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER 
-				    + GRUB_PCI_REG_ADDRESS_REG1)) = 0;
+      init_pci ();
     }
 
   modend = grub_modules_get_end ();

From 6e198650e987488632ff81c2bc538bf5ea299fcf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 22 May 2010 23:36:44 +0200
Subject: [PATCH 0999/1628] Enable serial in simulcast with local terminal on
 yeeloong

---
 conf/mips-qemu-mips.rmk   |  6 ++++++
 conf/mips.rmk             |  6 ------
 kern/mips/yeeloong/init.c |  5 +++++
 term/serial.c             | 15 +++++++++++++++
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/conf/mips-qemu-mips.rmk b/conf/mips-qemu-mips.rmk
index 2f80ab2e3..0d81bbe8b 100644
--- a/conf/mips-qemu-mips.rmk
+++ b/conf/mips-qemu-mips.rmk
@@ -20,3 +20,9 @@ kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(LINK_BASE),-Bstatic
 kernel_img_FORMAT = binary
+
+# For serial.mod.
+pkglib_MODULES += serial.mod
+serial_mod_SOURCES = term/serial.c
+serial_mod_CFLAGS = $(COMMON_CFLAGS)
+serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/conf/mips.rmk b/conf/mips.rmk
index 7d30f55f1..26c516fc4 100644
--- a/conf/mips.rmk
+++ b/conf/mips.rmk
@@ -10,12 +10,6 @@ kernel_img_HEADERS += cpu/cache.h
 sbin_SCRIPTS = 
 bin_SCRIPTS = 
 
-# For serial.mod.
-pkglib_MODULES += serial.mod
-serial_mod_SOURCES = term/serial.c
-serial_mod_CFLAGS = $(COMMON_CFLAGS)
-serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For relocator.mod.
 pkglib_MODULES += relocator.mod
 relocator_mod_SOURCES = lib/$(target_cpu)/relocator.c lib/$(target_cpu)/relocator_asm.S
diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 826659968..78586dbd4 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -37,6 +37,8 @@ extern void grub_bitmap_init (void);
 extern void grub_font_init (void);
 extern void grub_gfxterm_init (void);
 extern void grub_at_keyboard_init (void);
+extern void grub_serial_init (void);
+extern void grub_terminfo_init (void);
 
 /* FIXME: use interrupt to count high.  */
 grub_uint64_t
@@ -183,6 +185,9 @@ grub_machine_init (void)
   grub_gfxterm_init ();
 
   grub_at_keyboard_init ();
+
+  grub_terminfo_init ();
+  grub_serial_init ();
 }
 
 void
diff --git a/term/serial.c b/term/serial.c
index b16b608f1..ef9efac2e 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -636,6 +636,21 @@ GRUB_MOD_INIT(serial)
   serial_settings.word_len  = UART_8BITS_WORD;
   serial_settings.parity    = UART_NO_PARITY;
   serial_settings.stop_bits = UART_1_STOP_BIT;
+
+#ifdef GRUB_MACHINE_MIPS_YEELOONG
+  {
+    grub_err_t hwiniterr;
+    hwiniterr = serial_hw_init ();
+
+    if (hwiniterr == GRUB_ERR_NONE)
+      {
+	grub_term_register_input_active ("serial", &grub_serial_term_input);
+	grub_term_register_output_active ("serial", &grub_serial_term_output);
+
+	registered = 1;
+      }
+  }
+#endif
 }
 
 GRUB_MOD_FINI(serial)

From 4b9fa9d70f80349aa97c76a5cedb402395787d8a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 23 May 2010 00:08:52 +0200
Subject: [PATCH 1000/1628] Addmissing definitions

---
 include/grub/mips/loongson.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/grub/mips/loongson.h b/include/grub/mips/loongson.h
index 09b788db2..6cb1178d5 100644
--- a/include/grub/mips/loongson.h
+++ b/include/grub/mips/loongson.h
@@ -64,7 +64,7 @@
 #define GRUB_CPU_LOONGSON_D_CACHE_LOG_WAYS 2
 #define GRUB_CPU_LOONGSON_S_CACHE_LOG_WAYS 2
 
-/* Fixme: determine dynamically.  */
+/* FIXME: determine dynamically.  */
 #define GRUB_CPU_LOONGSON_SECONDARY_CACHE_LOG_SIZE 19
 
 #define GRUB_CPU_LOONGSON_COP0_BADVADDR GRUB_CPU_REGISTER_WRAP($8)
@@ -81,6 +81,9 @@
 #define GRUB_CPU_LOONGSON_CORECFG_DISABLE_DDR2_SPACE 0x100
 #define GRUB_CPU_LOONGSON_CORECFG_BUFFER_CPU 0x200
 
+#define GRUB_CPU_LOONGSON_PCI_HIT1_SEL_LO   0xbfe00150
+#define GRUB_CPU_LOONGSON_PCI_HIT1_SEL_HI   0xbfe00154
+
 #define GRUB_CPU_LOONGSON_GPIOCFG  0xbfe00120
 #define GRUB_CPU_LOONGSON_SHUTDOWN_GPIO 1
 

From 5667f2656d69cfeac04146a92d072b41710fceec Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 23 May 2010 00:09:39 +0200
Subject: [PATCH 1001/1628] Add missing part of serial commit

---
 include/grub/term.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/include/grub/term.h b/include/grub/term.h
index 143aabe1e..9500e1c99 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -213,6 +213,14 @@ grub_term_register_input (const char *name __attribute__ ((unused)),
     }
 }
 
+static inline void
+grub_term_register_input_active (const char *name __attribute__ ((unused)),
+				 grub_term_input_t term)
+{
+  if (! term->init || term->init () == GRUB_ERR_NONE)
+    grub_list_push (GRUB_AS_LIST_P (&grub_term_inputs), GRUB_AS_LIST (term));
+}
+
 static inline void
 grub_term_register_output (const char *name __attribute__ ((unused)),
 			   grub_term_output_t term)
@@ -229,6 +237,15 @@ grub_term_register_output (const char *name __attribute__ ((unused)),
     }
 }
 
+static inline void
+grub_term_register_output_active (const char *name __attribute__ ((unused)),
+				  grub_term_output_t term)
+{
+  if (! term->init || term->init () == GRUB_ERR_NONE)
+    grub_list_push (GRUB_AS_LIST_P (&grub_term_outputs),
+		    GRUB_AS_LIST (term));
+}
+
 static inline void
 grub_term_unregister_input (grub_term_input_t term)
 {

From ae87524ea6e268013a315b230cd23716ef6dd705 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 23 May 2010 00:11:47 +0200
Subject: [PATCH 1002/1628] Fix getvirt function on yeeloong

---
 bus/pci.c          | 4 ++--
 include/grub/pci.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bus/pci.c b/bus/pci.c
index 2fe9d764e..3fec44fc2 100644
--- a/bus/pci.c
+++ b/bus/pci.c
@@ -36,7 +36,7 @@ grub_dma_free (struct grub_pci_dma_chunk *ch)
 #endif
 
 #ifdef GRUB_MACHINE_MIPS_YEELOONG
-void *
+volatile void *
 grub_dma_get_virt (struct grub_pci_dma_chunk *ch)
 {
   return (void *) ((((grub_uint32_t) ch) & 0x1fffffff) | 0xa0000000);
@@ -45,7 +45,7 @@ grub_dma_get_virt (struct grub_pci_dma_chunk *ch)
 grub_uint32_t
 grub_dma_get_phys (struct grub_pci_dma_chunk *ch)
 {
-  return ((grub_uint32_t) ch) & 0x1fffffff;
+  return (((grub_uint32_t) ch) & 0x1fffffff) | 0x80000000;
 }
 #else
 
diff --git a/include/grub/pci.h b/include/grub/pci.h
index fff4d3e3a..51adf9377 100644
--- a/include/grub/pci.h
+++ b/include/grub/pci.h
@@ -115,7 +115,7 @@ struct grub_pci_dma_chunk;
 struct grub_pci_dma_chunk *EXPORT_FUNC(grub_memalign_dma32) (grub_size_t align,
 							     grub_size_t size);
 void EXPORT_FUNC(grub_dma_free) (struct grub_pci_dma_chunk *ch);
-void *EXPORT_FUNC(grub_dma_get_virt) (struct grub_pci_dma_chunk *ch);
+volatile void *EXPORT_FUNC(grub_dma_get_virt) (struct grub_pci_dma_chunk *ch);
 grub_uint32_t EXPORT_FUNC(grub_dma_get_phys) (struct grub_pci_dma_chunk *ch);
 
 #endif

From 980d936688f2308a8db23639201320ccb7d09493 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 23 May 2010 00:12:33 +0200
Subject: [PATCH 1003/1628] Skip ghost USB controllers

---
 bus/pci.c                        | 8 ++++++++
 include/grub/mips/yeeloong/pci.h | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/bus/pci.c b/bus/pci.c
index 3fec44fc2..d8698ba33 100644
--- a/bus/pci.c
+++ b/bus/pci.c
@@ -91,6 +91,14 @@ grub_pci_iterate (grub_pci_iteratefunc_t hook)
 	      if (id >> 16 == 0xFFFF)
 		continue;
 
+	      /* Skip ghosts.  */
+	      if (id == GRUB_YEELOONG_OHCI_PCIID
+		  && dev.function == GRUB_YEELOONG_OHCI_GHOST_FUNCTION)
+		continue;
+	      if (id == GRUB_YEELOONG_EHCI_PCIID
+		  && dev.function == GRUB_YEELOONG_EHCI_GHOST_FUNCTION)
+		continue;
+
 	      if (hook (dev, id))
 		return;
 
diff --git a/include/grub/mips/yeeloong/pci.h b/include/grub/mips/yeeloong/pci.h
index 7c816ac8e..199bac048 100644
--- a/include/grub/mips/yeeloong/pci.h
+++ b/include/grub/mips/yeeloong/pci.h
@@ -24,6 +24,11 @@
 #include <grub/cpu/io.h>
 #endif
 
+#define GRUB_YEELOONG_OHCI_PCIID 0x00351033
+#define GRUB_YEELOONG_EHCI_PCIID 0x00e01033
+#define GRUB_YEELOONG_OHCI_GHOST_FUNCTION 4
+#define GRUB_YEELOONG_EHCI_GHOST_FUNCTION 5
+
 #define GRUB_PCI_NUM_BUS        1
 #define GRUB_PCI_NUM_DEVICES    16
 

From 60c33f8c0fadde0cd6d266d612fa4050bd390db4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 23 May 2010 00:13:37 +0200
Subject: [PATCH 1004/1628] Use DMA memory in usbtrans.c

---
 bus/usb/usbtrans.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bus/usb/usbtrans.c b/bus/usb/usbtrans.c
index f59d5ec77..f6d3d30f9 100644
--- a/bus/usb/usbtrans.c
+++ b/bus/usb/usbtrans.c
@@ -35,12 +35,12 @@ grub_usb_control_msg (grub_usb_device_t dev,
   int i;
   grub_usb_transfer_t transfer;
   int datablocks;
-  struct grub_usb_packet_setup *setupdata;
+  volatile struct grub_usb_packet_setup *setupdata;
   grub_uint32_t setupdata_addr;
   grub_usb_err_t err;
   unsigned int max;
   struct grub_pci_dma_chunk *data_chunk, *setupdata_chunk;
-  char *data;
+  volatile char *data;
   grub_uint32_t data_addr;
   grub_size_t size = size0;
 
@@ -50,7 +50,7 @@ grub_usb_control_msg (grub_usb_device_t dev,
     return GRUB_USB_ERR_INTERNAL;
   data = grub_dma_get_virt (data_chunk);
   data_addr = grub_dma_get_phys (data_chunk);
-  grub_memcpy (data, data_in, size);
+  grub_memcpy ((char *) data, data_in, size);
 
   grub_dprintf ("usb",
 		"control: reqtype=0x%02x req=0x%02x val=0x%02x idx=0x%02x size=%d\n",
@@ -152,7 +152,7 @@ grub_usb_control_msg (grub_usb_device_t dev,
   grub_dma_free (data_chunk);
   grub_dma_free (setupdata_chunk);
 
-  grub_memcpy (data_in, data, size0);
+  grub_memcpy (data_in, (char *) data, size0);
 
   return err;
 }
@@ -168,7 +168,7 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
   unsigned int max;
   grub_usb_err_t err;
   int toggle = dev->toggle[endpoint];
-  char *data;
+  volatile char *data;
   grub_uint32_t data_addr;
   struct grub_pci_dma_chunk *data_chunk;
   grub_size_t size = size0;
@@ -180,7 +180,7 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
   data = grub_dma_get_virt (data_chunk);
   data_addr = grub_dma_get_phys (data_chunk);
   if (type == GRUB_USB_TRANSFER_TYPE_OUT)
-    grub_memcpy (data, data_in, size);
+    grub_memcpy ((char *) data, data_in, size);
 
   /* Use the maximum packet size given in the endpoint descriptor.  */
   if (dev->initialized)
@@ -247,7 +247,7 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
   grub_dma_free (data_chunk);
 
   if (type == GRUB_USB_TRANSFER_TYPE_IN)
-    grub_memcpy (data_in, data, size0);
+    grub_memcpy (data_in, (char *) data, size0);
 
   return err;
 }

From 20ad3a81dc8c9d5c186ecf4361d1c70515008540 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 23 May 2010 00:14:23 +0200
Subject: [PATCH 1005/1628] Macroify USB controllers ID

---
 kern/mips/yeeloong/init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 78586dbd4..46b3af2e1 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -78,13 +78,13 @@ init_pci (void)
     /* FIXME: autoscan for BARs and devices.  */
     switch (pciid)
       {
-      case 0x00351033:
+      case GRUB_YEELOONG_OHCI_PCIID:
 	addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
 	grub_pci_write (addr, 0x5025000);
 	addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
 	grub_pci_write (addr, 0x2100146);
 	break;
-      case 0x00e01033:
+      case GRUB_YEELOONG_EHCI_PCIID:
 	addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
 	grub_pci_write (addr, 0x5026000);
 	addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);

From c710f8cc096a84178931e6a9b867e10f0ae75fa3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 23 May 2010 00:17:16 +0200
Subject: [PATCH 1006/1628] Always write the whole of frame interval register

---
 bus/usb/ohci.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 81ce3294d..b86e78ef2 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -104,10 +104,12 @@ typedef enum
 
 #define GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_MASK 0x8fff0000
 #define GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_SHIFT 16
+#define GRUB_OHCI_REG_FRAME_INTERVAL_FI_SHIFT 0
 
 /* XXX: Is this choice of timings sane?  */
 #define GRUB_OHCI_FSMPS 0x2778
 #define GRUB_OHCI_PERIODIC_START 0x257f
+#define GRUB_OHCI_FRAME_INTERVAL 0x2edf
 
 static grub_uint32_t
 grub_ohci_readreg32 (struct grub_ohci *o, grub_ohci_reg_t reg)
@@ -135,11 +137,11 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   grub_pci_address_t addr;
   struct grub_ohci *o;
   grub_uint32_t revision;
-  grub_uint32_t frame_interval;
   int cs5536;
 
   /* Determine IO base address.  */
   grub_dprintf ("ohci", "pciid = %x\n", pciid);
+
   if (pciid == GRUB_CS5536_PCIID)
     {
       grub_uint64_t basereg;
@@ -215,19 +217,16 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
 			 & ~GRUB_OHCI_RHUB_PORT_POWER_MASK)
 			| GRUB_OHCI_RHUB_PORT_ALL_POWERED);
 
-  /* Backup the frame interval register.  */
-  frame_interval = grub_ohci_readreg32 (o, GRUB_OHCI_REG_FRAME_INTERVAL);
-
   /* Suspend the OHCI by issuing a reset.  */
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, 1); /* XXX: Magic.  */
   grub_millisleep (1);
   grub_dprintf ("ohci", "OHCI reset\n");
 
-  /* Restore the frame interval register.  */
-  frame_interval = (frame_interval & ~GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_MASK)
-    | (GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_SHIFT
-       << GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_SHIFT);
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_FRAME_INTERVAL, frame_interval);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_FRAME_INTERVAL,
+			(GRUB_OHCI_FSMPS
+			 << GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_SHIFT)
+			| (GRUB_OHCI_FRAME_INTERVAL
+			   << GRUB_OHCI_REG_FRAME_INTERVAL_FI_SHIFT));
 
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_PERIODIC_START,
 			GRUB_OHCI_PERIODIC_START);

From e51a665432fafb4016613be732f45f24ffa4eb23 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 23 May 2010 00:17:51 +0200
Subject: [PATCH 1007/1628] Add missing volatile attribute

---
 bus/usb/ohci.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index b86e78ef2..9515423fa 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -64,8 +64,8 @@ struct grub_ohci_td
   grub_uint32_t buffer_end;
 } __attribute__((packed));
 
-typedef struct grub_ohci_td *grub_ohci_td_t;
-typedef struct grub_ohci_ed *grub_ohci_ed_t;
+typedef volatile struct grub_ohci_td *grub_ohci_td_t;
+typedef volatile struct grub_ohci_ed *grub_ohci_ed_t;
 
 struct grub_ohci
 {

From 27cd973df6fc3cc528a43f1f4d078ab296c5ef5f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 23 May 2010 02:41:16 +0200
Subject: [PATCH 1008/1628] Macroify command and status registers

---
 include/grub/pci.h        | 13 +++++++++++++
 kern/mips/yeeloong/init.c | 29 +++++++++++++++++++++++++----
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/include/grub/pci.h b/include/grub/pci.h
index 51adf9377..e6d6488f0 100644
--- a/include/grub/pci.h
+++ b/include/grub/pci.h
@@ -68,6 +68,19 @@
 #define  GRUB_PCI_REG_MIN_GNT      0x3e
 #define  GRUB_PCI_REG_MAX_LAT      0x3f
 
+#define  GRUB_PCI_COMMAND_IO_ENABLED    0x0001
+#define  GRUB_PCI_COMMAND_MEM_ENABLED   0x0002
+#define  GRUB_PCI_COMMAND_BUS_MASTER    0x0004
+#define  GRUB_PCI_COMMAND_PARITY_ERROR  0x0040
+#define  GRUB_PCI_COMMAND_SERR_ENABLE   0x0100
+
+#define  GRUB_PCI_STATUS_CAPABILITIES      0x0010
+#define  GRUB_PCI_STATUS_66MHZ_CAPABLE     0x0020
+#define  GRUB_PCI_STATUS_FAST_B2B_CAPABLE  0x0080
+
+#define  GRUB_PCI_STATUS_DEVSEL_TIMING_SHIFT 9
+#define  GRUB_PCI_STATUS_DEVSEL_TIMING_MASK 0x0600
+
 #ifndef ASM_FILE
 typedef grub_uint32_t grub_pci_id_t;
 
diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 46b3af2e1..523f90282 100644
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -82,13 +82,26 @@ init_pci (void)
 	addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
 	grub_pci_write (addr, 0x5025000);
 	addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
-	grub_pci_write (addr, 0x2100146);
+	grub_pci_write_word (addr, GRUB_PCI_COMMAND_SERR_ENABLE
+			     | GRUB_PCI_COMMAND_PARITY_ERROR
+			     | GRUB_PCI_COMMAND_BUS_MASTER
+			     | GRUB_PCI_COMMAND_MEM_ENABLED);
+
+	addr = grub_pci_make_address (dev, GRUB_PCI_REG_STATUS);
+	grub_pci_write_word (addr, 0x0200 | GRUB_PCI_STATUS_CAPABILITIES);
 	break;
       case GRUB_YEELOONG_EHCI_PCIID:
 	addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
 	grub_pci_write (addr, 0x5026000);
 	addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
-	grub_pci_write (addr, 0x2100146);
+	grub_pci_write_word (addr, GRUB_PCI_COMMAND_SERR_ENABLE
+			     | GRUB_PCI_COMMAND_PARITY_ERROR
+			     | GRUB_PCI_COMMAND_BUS_MASTER
+			     | GRUB_PCI_COMMAND_MEM_ENABLED);
+
+	addr = grub_pci_make_address (dev, GRUB_PCI_REG_STATUS);
+	grub_pci_write_word (addr, (1 << GRUB_PCI_STATUS_DEVSEL_TIMING_SHIFT)
+			     | GRUB_PCI_STATUS_CAPABILITIES);
 	break;
       }
     return 0;
@@ -98,8 +111,16 @@ init_pci (void)
   *((volatile grub_uint32_t *) GRUB_CPU_LOONGSON_PCI_HIT1_SEL_HI) = 0xffffffff;
 
   /* Setup PCI controller.  */
-  *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER
-				+ GRUB_PCI_REG_COMMAND)) = 0x22b00046;
+  *((volatile grub_uint16_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER
+				+ GRUB_PCI_REG_COMMAND))
+    = GRUB_PCI_COMMAND_PARITY_ERROR | GRUB_PCI_COMMAND_BUS_MASTER
+    | GRUB_PCI_COMMAND_MEM_ENABLED;
+  *((volatile grub_uint16_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER
+				+ GRUB_PCI_REG_STATUS))
+    = (1 << GRUB_PCI_STATUS_DEVSEL_TIMING_SHIFT)
+    | GRUB_PCI_STATUS_FAST_B2B_CAPABLE | GRUB_PCI_STATUS_66MHZ_CAPABLE
+    | GRUB_PCI_STATUS_CAPABILITIES;
+
   *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER
 				+ GRUB_PCI_REG_CACHELINE)) = 0xff;
   *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER 

From 5f2316c1fe5ad62c3ae5815c256313041e6a559d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 23 May 2010 13:42:16 +0200
Subject: [PATCH 1009/1628] 	* gfxmenu/gfxmenu.c (grub_gfxmenu_try): Change
 viewport on both buffers. 	* term/gfxterm.c (real_scroll): Likewise.

---
 ChangeLog         |  5 +++++
 gfxmenu/gfxmenu.c |  7 +++++++
 term/gfxterm.c    | 22 +++++++++++++---------
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 02d16e835..cdeee7c2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* gfxmenu/gfxmenu.c (grub_gfxmenu_try): Change viewport on both buffers.
+	* term/gfxterm.c (real_scroll): Likewise.
+
 2010-05-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/i386/pc/mmap.c (grub_machine_mmap_iterate): Zero-fill entry
diff --git a/gfxmenu/gfxmenu.c b/gfxmenu/gfxmenu.c
index a2e765156..1acab9ca7 100644
--- a/gfxmenu/gfxmenu.c
+++ b/gfxmenu/gfxmenu.c
@@ -110,6 +110,13 @@ grub_gfxmenu_try (int entry, grub_menu_t menu, int nested)
   view->nested = nested;
   view->first_timeout = -1;
 
+  grub_video_set_viewport (0, 0, mode_info.width, mode_info.height);
+  if (view->double_repaint)
+    {
+      grub_video_swap_buffers ();
+      grub_video_set_viewport (0, 0, mode_info.width, mode_info.height);
+    }
+
   grub_gfxmenu_view_draw (view);
 
   instance->data = view;
diff --git a/term/gfxterm.c b/term/gfxterm.c
index ecfe4ff3b..c57d0f0fa 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -707,12 +707,6 @@ real_scroll (void)
       draw_cursor (0);
 
       grub_video_set_active_render_target (render_target);
-      /* Save viewport and set it to our window.  */
-      grub_video_get_viewport ((unsigned *) &saved_view.x, 
-                               (unsigned *) &saved_view.y, 
-                               (unsigned *) &saved_view.width, 
-                               (unsigned *) &saved_view.height);
-      grub_video_set_viewport (window.x, window.y, window.width, window.height);
 
       i = window.double_repaint ? 2 : 1;
 
@@ -720,6 +714,15 @@ real_scroll (void)
 
       while (i--)
 	{
+	  /* Save viewport and set it to our window.  */
+	  grub_video_get_viewport ((unsigned *) &saved_view.x, 
+				   (unsigned *) &saved_view.y, 
+				   (unsigned *) &saved_view.width, 
+				   (unsigned *) &saved_view.height);
+
+	  grub_video_set_viewport (window.x, window.y, window.width,
+				   window.height);
+
 	  /* Clear new border area.  */
 	  grub_video_fill_rect (color,
 				virtual_screen.offset_x,
@@ -735,6 +738,10 @@ real_scroll (void)
 	  grub_video_scroll (color, 0, -virtual_screen.normal_char_height
 			     * virtual_screen.total_scroll);
 
+	  /* Restore saved viewport.  */
+	  grub_video_set_viewport (saved_view.x, saved_view.y,
+				   saved_view.width, saved_view.height);
+
 	  if (i)
 	    grub_video_swap_buffers ();
 	}
@@ -746,9 +753,6 @@ real_scroll (void)
       grub_video_scroll (color, 0, -virtual_screen.normal_char_height
 			 * virtual_screen.total_scroll);
 
-      /* Restore saved viewport.  */
-      grub_video_set_viewport (saved_view.x, saved_view.y,
-                               saved_view.width, saved_view.height);
       grub_video_set_active_render_target (render_target);
 
     }

From 3ecb080a33a3cb3e15ca7721c00eeb96d9e8ed3e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 23 May 2010 13:43:38 +0200
Subject: [PATCH 1010/1628] 	* gfxmenu/view.c
 (grub_gfxmenu_draw_terminal_box): Apply only to current 	buffer since
 gfxterm handles double repaint.

---
 ChangeLog      | 5 +++++
 gfxmenu/view.c | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cdeee7c2b..dbf6f23eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* gfxmenu/view.c (grub_gfxmenu_draw_terminal_box): Apply only to current
+	buffer since gfxterm handles double repaint.
+
 2010-05-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* gfxmenu/gfxmenu.c (grub_gfxmenu_try): Change viewport on both buffers.
diff --git a/gfxmenu/view.c b/gfxmenu/view.c
index 9a5671cdd..518c3ba53 100644
--- a/gfxmenu/view.c
+++ b/gfxmenu/view.c
@@ -357,11 +357,6 @@ grub_gfxmenu_draw_terminal_box (void)
   term_box->draw (term_box,
 		  term_rect.x - term_box->get_left_pad (term_box),
 		  term_rect.y - term_box->get_top_pad (term_box));
-  grub_video_swap_buffers ();
-  if (term_view->double_repaint)
-    term_box->draw (term_box,
-		    term_rect.x - term_box->get_left_pad (term_box),
-		    term_rect.y - term_box->get_top_pad (term_box));
 }
 
 static void

From ad603f61a5f61677406aad7b7c041ef21de8957f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 23 May 2010 13:59:50 +0200
Subject: [PATCH 1011/1628] 	* gfxmenu/gui_list.c (draw_menu): Don't add
 scrollbar width to padding. 	Removed drawing_scrollbar argument. All users
 updated 	Fixes #29792. 	Reported by Jo Shields

---
 ChangeLog          |  7 +++++++
 gfxmenu/gui_list.c | 15 ++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dbf6f23eb..65bd6ad03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* gfxmenu/gui_list.c (draw_menu): Don't add scrollbar width to padding.
+	Removed drawing_scrollbar argument. All users updated
+	Fixes #29792.
+	Reported by Jo Shields
+
 2010-05-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* gfxmenu/view.c (grub_gfxmenu_draw_terminal_box): Apply only to current
diff --git a/gfxmenu/gui_list.c b/gfxmenu/gui_list.c
index 0d771413f..8583a214e 100644
--- a/gfxmenu/gui_list.c
+++ b/gfxmenu/gui_list.c
@@ -210,8 +210,7 @@ draw_scrollbar (list_impl_t self,
 
 /* Draw the list of items.  */
 static void
-draw_menu (list_impl_t self, int width, int drawing_scrollbar,
-	   int num_shown_items)
+draw_menu (list_impl_t self, int width, int num_shown_items)
 {
   if (! self->menu_box || ! self->selected_item_box)
     return;
@@ -226,8 +225,6 @@ draw_menu (list_impl_t self, int width, int drawing_scrollbar,
 
   make_selected_item_visible (self);
 
-  int scrollbar_h_space = drawing_scrollbar ? self->scrollbar_width : 0;
-
   grub_gfxmenu_box_t selbox = self->selected_item_box;
   int sel_leftpad = selbox->get_left_pad (selbox);
   int item_top = boxpad;
@@ -244,12 +241,8 @@ draw_menu (list_impl_t self, int width, int drawing_scrollbar,
       if (is_selected)
         {
           int sel_toppad = selbox->get_top_pad (selbox);
-          selbox->set_content_size (selbox,
-                                    (width - 2 * boxpad
-                                     - scrollbar_h_space),
-                                    item_height);
-          selbox->draw (selbox,
-                        item_left - sel_leftpad,
+          selbox->set_content_size (selbox, (width - 2 * boxpad), item_height);
+          selbox->draw (selbox, item_left - sel_leftpad,
                         item_top - sel_toppad);
         }
 
@@ -320,7 +313,7 @@ list_paint (void *vself, const grub_video_rect_t *region)
     box->draw (box, 0, 0);
 
     grub_gui_set_viewport (&content_rect, &vpsave2);
-    draw_menu (self, content_rect.width, drawing_scrollbar, num_shown_items);
+    draw_menu (self, content_rect.width, num_shown_items);
     grub_gui_restore_viewport (&vpsave2);
 
     if (drawing_scrollbar)

From 76e6d0d767b295f2249b8320a719fe0cd8ea66ff Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 23 May 2010 14:11:11 +0200
Subject: [PATCH 1012/1628] Add default/grub support

---
 docs/grub.texi           | 16 +++++++++++
 util/grub-mkconfig.in    |  4 +++
 util/grub.d/00_header.in | 57 +++++++++++++++++++++++++++++++---------
 3 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/docs/grub.texi b/docs/grub.texi
index 704f8b2a3..938fedbaf 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -80,6 +80,7 @@ This edition documents version @value{VERSION}.
 * Configuration::               Writing your own configuration file
 * Network::                     Downloading OS images from a network
 * Serial terminal::             Using GRUB via a serial line
+* Vendor power-on keys::        Changing GRUB behaviour on vendor power-on keys
 * Preset Menu::                 Embedding a configuration file into GRUB
 * Images::                      GRUB image files
 * Filesystem::                  Filesystem syntax and semantics
@@ -747,6 +748,21 @@ implements few VT100 escape sequences. If you specify this option then
 GRUB provides you with an alternative menu interface, because the normal
 menu requires several fancy features of your terminal.
 
+@node Vendor power-on keys
+@chapter Using GRUB with vendor power-on keys
+Some laptop vendor provide an additional power-on button which boots another OS.
+GRUB supports such buttons with GRUB_TIMEOUT_BUTTON, GRUB_DEFAULT_BUTTON,
+GRUB_HIDDEN_TIMEOUT_BUTTON and GRUB_BUTTON_CMOS_ADDRESS variables in
+default/grub. GRUB_TIMEOUT_BUTTON, GRUB_DEFAULT_BUTTON and 
+GRUB_HIDDEN_TIMEOUT_BUTTON are used instead of corresponding variables without
+_BUTTON suffix when powered using special button.
+GRUB_BUTTON_CMOS_ADDRESS is vendor specific and partially model-specific.
+Values known to GRUB team are:
+
+@table @key
+@item Dell XPS M1530
+85:3
+@end table
 
 @node Filesystem
 @chapter Filesystem syntax and semantics
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index d1abfa36a..0095e1ce8 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -246,6 +246,10 @@ export GRUB_DEFAULT \
   GRUB_HIDDEN_TIMEOUT \
   GRUB_HIDDEN_TIMEOUT_QUIET \
   GRUB_TIMEOUT \
+  GRUB_DEFAULT_BUTTON \
+  GRUB_HIDDEN_TIMEOUT_BUTTON \
+  GRUB_TIMEOUT_BUTTON \
+  GRUB_BUTTON_CMOS_ADDRESS \
   GRUB_DISTRIBUTOR \
   GRUB_CMDLINE_LINUX \
   GRUB_CMDLINE_LINUX_DEFAULT \
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index d181fdffc..df8f5dfaa 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -38,11 +38,29 @@ if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then GRUB_DEFAULT='${saved_entry}' ; fi
 if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi
 if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=640x480 ; fi
 
+if [ "x${GRUB_DEFAULT_BUTTON}" = "x" ] ; then GRUB_DEFAULT_BUTTON="$GRUB_DEFAULT" ; fi
+if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved" ] ; then GRUB_DEFAULT_BUTTON='${saved_entry}' ; fi
+if [ "x${GRUB_TIMEOUT_BUTTON}" = "x" ] ; then GRUB_TIMEOUT_BUTTON="$GRUB_TIMEOUT" ; fi
+
 cat << EOF
 if [ -s \$prefix/grubenv ]; then
   load_env
 fi
+EOF
+if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then
+    cat <<EOF
+if cmostest $GRUB_BUTTON_CMOS_ADDRESS ; then
+   set default="${GRUB_DEFAULT_BUTTON}"
+else
+   set default="${GRUB_DEFAULT}"
+fi
+EOF
+else
+    cat <<EOF
 set default="${GRUB_DEFAULT}"
+EOF
+fi
+cat <<EOF
 if [ \${prev_saved_entry} ]; then
   set saved_entry=\${prev_saved_entry}
   save_env saved_entry
@@ -186,21 +204,36 @@ insmod gettext
 EOF
 fi
 
-if [ "x${GRUB_HIDDEN_TIMEOUT}" != "x" ] ; then
-  if [ "x${GRUB_HIDDEN_TIMEOUT_QUIET}" = "xtrue" ] ; then
-    verbose=
-  else
-    verbose=" --verbose"
-  fi
-  cat << EOF
-if sleep$verbose --interruptible ${GRUB_HIDDEN_TIMEOUT} ; then
-  set timeout=${GRUB_TIMEOUT}
+make_timeout ()
+{
+    if [ "x${1}" != "x" ] ; then
+	if [ "x${GRUB_HIDDEN_TIMEOUT_QUIET}" = "xtrue" ] ; then
+	    verbose=
+	else
+	    verbose=" --verbose"
+	fi
+	cat << EOF
+if sleep$verbose --interruptible ${1} ; then
+  set timeout=${2}
 fi
 EOF
-else
-  cat << EOF
-set timeout=${GRUB_TIMEOUT}
+    else
+	cat << EOF
+set timeout=${2}
 EOF
+    fi
+}
+
+if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then
+    cat <<EOF
+if cmostest $GRUB_BUTTON_CMOS_ADDRESS ; then
+EOF
+make_timeout "${GRUB_HIDDEN_TIMEOUT_BUTTON}" "${GRUB_TIMEOUT_BUTTON}"
+echo else
+make_timeout "${GRUB_HIDDEN_TIMEOUT}" "${GRUB_TIMEOUT}"
+echo fi
+else
+make_timeout "${GRUB_HIDDEN_TIMEOUT}" "${GRUB_TIMEOUT}"
 fi
 
 # Play an initial tune

From db4d5813e3dec44c3601037d459f1fcbb04be6a0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 23 May 2010 14:37:28 +0200
Subject: [PATCH 1013/1628] 	* commands/usbtest.c (grub_usb_get_string):
 Properly support UTF-16.

---
 ChangeLog          |  4 ++++
 commands/usbtest.c | 15 ++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 39a658288..01d2dbf7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* commands/usbtest.c (grub_usb_get_string): Properly support UTF-16.
+
 2010-05-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	cmostest support.
diff --git a/commands/usbtest.c b/commands/usbtest.c
index b884a93f1..191c4e4df 100644
--- a/commands/usbtest.c
+++ b/commands/usbtest.c
@@ -83,15 +83,24 @@ grub_usb_get_string (grub_usb_device_t dev, grub_uint8_t index, int langid,
 			      0x06, (3 << 8) | index,
 			      langid, descstr.length, (char *) descstrp);
 
-  *string = grub_malloc (descstr.length / 2);
+  if (descstrp->length == 0)
+    {
+      grub_free (descstrp);
+      *string = grub_strdup ("");
+      if (! *string)
+	return GRUB_USB_ERR_INTERNAL;
+      return GRUB_USB_ERR_NONE;
+    }
+
+  *string = grub_malloc (descstr.length * 2 + 1);
   if (! *string)
     {
       grub_free (descstrp);
       return GRUB_USB_ERR_INTERNAL;
     }
 
-  grub_utf16_to_utf8 ((grub_uint8_t *) *string, descstrp->str, descstrp->length / 2 - 1);
-  (*string)[descstr.length / 2 - 1] = '\0';
+  *grub_utf16_to_utf8 ((grub_uint8_t *) *string, descstrp->str,
+		       descstrp->length / 2 - 1) = 0;
   grub_free (descstrp);
 
   return GRUB_USB_ERR_NONE;

From 7eaef0ed512fb3547b318c571681c7a649865387 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 24 May 2010 20:43:43 +0200
Subject: [PATCH 1014/1628] fix compilation on not-yeeloong

---
 bus/pci.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bus/pci.c b/bus/pci.c
index d8698ba33..3e2126962 100644
--- a/bus/pci.c
+++ b/bus/pci.c
@@ -49,7 +49,7 @@ grub_dma_get_phys (struct grub_pci_dma_chunk *ch)
 }
 #else
 
-void *
+volatile void *
 grub_dma_get_virt (struct grub_pci_dma_chunk *ch)
 {
   return (void *) ch;
@@ -91,6 +91,7 @@ grub_pci_iterate (grub_pci_iteratefunc_t hook)
 	      if (id >> 16 == 0xFFFF)
 		continue;
 
+#ifdef GRUB_MACHINE_MIPS_YEELOONG
 	      /* Skip ghosts.  */
 	      if (id == GRUB_YEELOONG_OHCI_PCIID
 		  && dev.function == GRUB_YEELOONG_OHCI_GHOST_FUNCTION)
@@ -98,6 +99,7 @@ grub_pci_iterate (grub_pci_iteratefunc_t hook)
 	      if (id == GRUB_YEELOONG_EHCI_PCIID
 		  && dev.function == GRUB_YEELOONG_EHCI_GHOST_FUNCTION)
 		continue;
+#endif
 
 	      if (hook (dev, id))
 		return;

From 7d8c0213538e9954d3b466d91c6c7c3c0f10b300 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 25 May 2010 18:24:46 +0530
Subject: [PATCH 1015/1628] 	* INSTALL: Added flex >= 2.5.35 requirement.

---
 ChangeLog | 4 ++++
 INSTALL   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 01d2dbf7c..b8e66c7a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-25  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* INSTALL: Added flex >= 2.5.35 requirement.
+
 2010-05-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* commands/usbtest.c (grub_usb_get_string): Properly support UTF-16.
diff --git a/INSTALL b/INSTALL
index 0dd408bcc..7186d20db 100644
--- a/INSTALL
+++ b/INSTALL
@@ -16,6 +16,7 @@ configuring the GRUB.
 * GNU Bison 2.3 or later
 * GNU gettext 0.17 or later
 * GNU binutils 2.9.1.0.23 or later
+* Flex 2.5.35 or later
 * Other standard GNU/Unix tools
 
 If you use a development snapshot or want to hack on GRUB you may

From 5f02926bbcebc1acaa7475a4c3d39c915605c147 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 26 May 2010 09:56:59 +0530
Subject: [PATCH 1016/1628] emu build fixes for sparc64 and freebsd

---
 conf/any-emu.rmk        | 7 ++++++-
 include/grub/cache.h    | 3 ++-
 include/grub/emu/misc.h | 1 +
 util/misc.c             | 8 --------
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 3f0df06aa..17abc8911 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -1,6 +1,8 @@
 # -*- makefile -*-
 
-COMMON_CFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include)
+ifeq ($(target_cpu), sparc64)
+COMMON_LDFLAGS += -mno-relax
+endif
 
 kernel_img_RELOCATABLE = yes
 pkglib_PROGRAMS = kernel.img
@@ -45,6 +47,9 @@ cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
 endif
 
 grub_emu_LDFLAGS = $(LIBCURSES)
+ifeq ($(target_cpu), sparc64)
+grub_emu_LDFLAGS += -m64 -mno-relax
+endif
 
 ifeq ($(enable_grub_emu_usb), yes)
 kernel_img_HEADERS += libusb.h
diff --git a/include/grub/cache.h b/include/grub/cache.h
index 27e44f0a2..a54bc00f8 100644
--- a/include/grub/cache.h
+++ b/include/grub/cache.h
@@ -23,7 +23,8 @@
 #include <grub/symbol.h>
 #include <grub/types.h>
 
-#if defined (__i386__) || defined (__x86_64__)
+#if defined (__i386__) || defined (__x86_64__) || \
+  (defined (GRUB_MACHINE_EMU) && GRUB_MACHINE_EMU)
 static inline void
 grub_arch_sync_caches (void *address __attribute__ ((unused)),
 		       grub_size_t len __attribute__ ((unused)))
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index e037e6be7..1492e757a 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -46,5 +46,6 @@ int EXPORT_FUNC(asprintf) (char **buf, const char *fmt, ...);
 #endif
 
 char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
+char * canonicalize_file_name (const char *path);
 
 #endif /* GRUB_EMU_MISC_H */
diff --git a/util/misc.c b/util/misc.c
index 91bc25a55..dd0077d72 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -214,14 +214,6 @@ grub_millisleep (grub_uint32_t ms)
 
 #endif
 
-#if !(defined (__i386__) || defined (__x86_64__)) && GRUB_NO_MODULES
-void
-grub_arch_sync_caches (void *address __attribute__ ((unused)),
-		       grub_size_t len __attribute__ ((unused)))
-{
-}
-#endif
-
 #ifdef __MINGW32__
 
 void sync (void)

From c53fe8dfbbf70dcc7f46963015d1636afb3a464a Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 26 May 2010 16:53:43 +0530
Subject: [PATCH 1017/1628] build fixes for sparc64 and freebsd platforms

---
 conf/any-emu.rmk | 5 ++++-
 configure.ac     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 7560c8aba..77ba4f2b7 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -1,6 +1,7 @@
 # -*- makefile -*-
 
 ifeq ($(target_cpu), sparc64)
+COMMON_CFLAGS += -mno-app-regs
 COMMON_LDFLAGS += -mno-relax
 endif
 
@@ -25,10 +26,12 @@ TARGET_NO_STRIP = yes
 noinst_MODULES = emu-full.mod
 emu_full_mod_SOURCES = kern/emu/full.c
 emu_full_mod_CFLAGS = $(COMMON_CFLAGS)
+emu_full_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 noinst_MODULES = emu-lite.mod
 emu_lite_mod_SOURCES = kern/emu/lite.c kern/emu/cache.S symlist.c
 emu_lite_mod_CFLAGS = $(COMMON_CFLAGS)
+emu_lite_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For halt.mod.
 pkglib_MODULES += halt.mod
@@ -45,7 +48,7 @@ endif
 
 grub_emu_LDFLAGS = $(LIBCURSES)
 ifeq ($(target_cpu), sparc64)
-grub_emu_LDFLAGS += -m64 -mno-relax
+grub_emu_LDFLAGS += -m64 -melf64_sparc -mno-relax
 endif
 
 ifeq ($(enable_grub_emu_usb), yes)
diff --git a/configure.ac b/configure.ac
index 9448f792d..54622e5e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,7 +155,7 @@ esac
 machine_CPPFLAGS="$machine_CPPFLAGS -DMACHINE=`echo ${target_cpu}_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`"
 
 CPPFLAGS="$CPPFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
-TARGET_ASFLAGS="$TARGET_ASFLAGS $machine_CPPFLAGS"
+TARGET_ASFLAGS="$TARGET_ASFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
 TARGET_CFLAGS="$TARGET_CFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
 
 AC_SUBST(host_cpu)

From ac4d5ab78330f12c253f39fb6ac6d5a0a244d64b Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 26 May 2010 16:58:29 +0530
Subject: [PATCH 1018/1628] removed kern/emu/dl.c

---
 kern/emu/dl.c | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 kern/emu/dl.c

diff --git a/kern/emu/dl.c b/kern/emu/dl.c
deleted file mode 100644
index 09e2f4a7a..000000000
--- a/kern/emu/dl.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef GRUB_MACHINE_EMU
-#error "This source is only meant for grub-emu platform"
-#endif
-
-#if defined(GRUB_CPU_I386)
-#include "../i386/dl.c"
-#elif defined(GRUB_CPU_X86_64)
-#include "../x86_64/dl.c"
-#elif defined(GRUB_CPU_SPARC64)
-#include "../sparc64/dl.c"
-#elif defined(GRUB_CPU_MIPS)
-#include "../mips/dl.c"
-#elif defined(GRUB_CPU_MIPSEL)
-#include "../mips/dl.c"
-#elif defined(GRUB_CPU_POWERPC)
-#include "../powerpc/dl.c"
-#else
-#error "No target cpu type is defined"
-#endif

From 95ac3c730c58a60ec8a64bf046d235eec95eb790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Wed, 26 May 2010 23:49:52 +0200
Subject: [PATCH 1019/1628] Fix -Wshadow warning with emu build on NetBSD.

---
 ChangeLog           | 5 +++++
 kern/emu/hostdisk.c | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b8e66c7a2..ff7d02b44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-26  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* kern/emu/hostdisk.c (find_partition_start) [__NetBSD__]: Renamed
+	variable index into p_index to suppress a warning with -Wshadow.
+
 2010-05-25  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* INSTALL: Added flex >= 2.5.35 requirement.
diff --git a/kern/emu/hostdisk.c b/kern/emu/hostdisk.c
index 9c4697552..ae2f7d9ad 100644
--- a/kern/emu/hostdisk.c
+++ b/kern/emu/hostdisk.c
@@ -338,7 +338,7 @@ find_partition_start (const char *dev)
   struct hd_geometry hdg;
 # else /* defined(__NetBSD__) */
   struct disklabel label;
-  int index;
+  int p_index;
 # endif /* !defined(__NetBSD__) */
 
 # ifdef HAVE_DEVICE_MAPPER
@@ -435,15 +435,15 @@ devmapper_fail:
 # if !defined(__NetBSD__)
   return hdg.start;
 # else /* defined(__NetBSD__) */
-  index = dev[strlen(dev) - 1] - 'a';
+  p_index = dev[strlen(dev) - 1] - 'a';
 
-  if (index >= label.d_npartitions)
+  if (p_index >= label.d_npartitions)
     {
       grub_error (GRUB_ERR_BAD_DEVICE,
 		  "no disk label entry for `%s'", dev);
       return 0;
     }
-  return (grub_disk_addr_t) label.d_partitions[index].p_offset;
+  return (grub_disk_addr_t) label.d_partitions[p_index].p_offset;
 # endif /* !defined(__NetBSD__) */
 }
 #endif /* __linux__ || __CYGWIN__ */

From d1d368e426d3a0554ec28f52dafbd644fd21816e Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 27 May 2010 12:43:22 +0100
Subject: [PATCH 1020/1628] * util/grub-mkrescue.in: Initialise override_dir
 rather than assuming that it's unset or empty in the environment.

---
 ChangeLog             | 5 +++++
 util/grub-mkrescue.in | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ff7d02b44..22005fbb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-27  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkrescue.in: Initialise override_dir rather than
+	assuming that it's unset or empty in the environment.
+
 2010-05-26  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* kern/emu/hostdisk.c (find_partition_start) [__NetBSD__]: Renamed
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 7e7253006..99b10de7b 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -37,6 +37,7 @@ pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-pc
 efi32_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-efi
 efi64_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/x86_64-efi
 rom_directory=
+override_dir=
 grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
 
 # Usage: usage

From 5fdba519bb35c64a2c90221f069863cc36e00387 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Thu, 27 May 2010 16:38:16 +0200
Subject: [PATCH 1021/1628] 2010-05-27  Robert Millan  <rmh@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Insert
	partmap module to handle cross-partmap setups.
	Reported by Orestes Mas.  Gràcies!
---
 ChangeLog                 | 6 ++++++
 util/grub-mkconfig_lib.in | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 22005fbb9..18c2abeac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-27  Robert Millan  <rmh@gnu.org>
+
+	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Insert
+	partmap module to handle cross-partmap setups.
+	Reported by Orestes Mas.  Gràcies!
+
 2010-05-27  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkrescue.in: Initialise override_dir rather than
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index f4674b257..7ec8cb5be 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -105,6 +105,11 @@ prepare_grub_to_access_device ()
     echo "insmod ${module}"
   done
 
+  partmap="`${grub_probe} --device ${device} --target=partmap`"
+  for module in ${partmap} ; do
+    echo "insmod ${module}"
+  done
+
   fs="`${grub_probe} --device ${device} --target=fs`"
   for module in ${fs} ; do
     echo "insmod ${module}"

From db2102a0468e15c76bb369eef728622a9e51683e Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 27 May 2010 15:45:41 +0100
Subject: [PATCH 1022/1628] * kern/emu/misc.c (canonicalize_file_name):
 realpath can still return NULL for various reasons even if it has a
 maximum-length buffer: for example, there might be a symlink loop, or the
 path might exceed PATH_MAX.  If this happens, return NULL.

---
 ChangeLog       | 7 +++++++
 kern/emu/misc.c | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 18c2abeac..34bc31bf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-27  Colin Watson  <cjwatson@ubuntu.com>
+
+	* kern/emu/misc.c (canonicalize_file_name): realpath can still
+	return NULL for various reasons even if it has a maximum-length
+	buffer: for example, there might be a symlink loop, or the path
+	might exceed PATH_MAX.  If this happens, return NULL.
+
 2010-05-27  Robert Millan  <rmh@gnu.org>
 
 	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Insert
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index a3ccb3076..9437169e0 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -185,7 +185,8 @@ canonicalize_file_name (const char *path)
   char *ret;
 #ifdef PATH_MAX
   ret = xmalloc (PATH_MAX);
-  (void) realpath (path, ret);
+  if (!realpath (path, ret))
+    return NULL;
 #else
   ret = realpath (path, NULL);
 #endif

From d870813427f6e58ddc6877a578ae5b882f6f0898 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 27 May 2010 15:54:18 +0100
Subject: [PATCH 1023/1628] * util/grub-script-check.c (main): Ensure defined
 behaviour on empty input files (in which case exit zero).

---
 ChangeLog                | 5 +++++
 util/grub-script-check.c | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 34bc31bf9..a8e3e5284 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-27  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-script-check.c (main): Ensure defined behaviour on empty
+	input files (in which case exit zero).
+
 2010-05-27  Colin Watson  <cjwatson@ubuntu.com>
 
 	* kern/emu/misc.c (canonicalize_file_name): realpath can still
diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index dc732aa01..e69f787f5 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -145,7 +145,8 @@ main (int argc, char *argv[])
   char *input;
   FILE *file = 0;
   int verbose = 0;
-  struct grub_script *script;
+  int found_input = 0;
+  struct grub_script *script = NULL;
 
   auto grub_err_t get_config_line (char **line, int cont);
   grub_err_t get_config_line (char **line, int cont __attribute__ ((unused)))
@@ -247,6 +248,7 @@ main (int argc, char *argv[])
       get_config_line(&input, 0);
       if (! input) 
 	break;
+      found_input = 1;
 
       script = grub_script_parse (input, get_config_line);
       if (script)
@@ -262,5 +264,5 @@ main (int argc, char *argv[])
   grub_fini_all ();
   if (file) fclose (file);
 
-  return (script == 0);
+  return (found_input && script == 0);
 }

From f17ead43f9e1a27b7b92694c464f61216e2770d5 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <BVKChaitanya@personal-lr2wsx>
Date: Thu, 27 May 2010 17:04:31 -0700
Subject: [PATCH 1024/1628] cygwin fixes

---
 conf/any-emu.rmk | 30 ++++++++++++++++++------------
 genmk.rb         |  1 +
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 77ba4f2b7..0324898d3 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -23,16 +23,6 @@ kernel_img_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-char-subscripts -Wn
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 TARGET_NO_STRIP = yes
 
-noinst_MODULES = emu-full.mod
-emu_full_mod_SOURCES = kern/emu/full.c
-emu_full_mod_CFLAGS = $(COMMON_CFLAGS)
-emu_full_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-noinst_MODULES = emu-lite.mod
-emu_lite_mod_SOURCES = kern/emu/lite.c kern/emu/cache.S symlist.c
-emu_lite_mod_CFLAGS = $(COMMON_CFLAGS)
-emu_lite_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod.
 pkglib_MODULES += halt.mod
 halt_mod_SOURCES = commands/halt.c
@@ -111,12 +101,28 @@ grub_emu_init.o: grub_emu_init.c grub_emu_init.h
 	rm -f $@; $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -DGRUB_FILE=\"grub_init.c\" -c -o $@ $<
 CLEANFILES += grub_emu_init.o
 
+kern_emu_lite.o: kern/emu/lite.c
+	$(TARGET_CC) $(COMMON_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -DGRUB_FILE=\"kern/emu/lite.c\" -c -o $@ $<
+CLEANFILES += kern_emu_lite.o
+
+kern_emu_full.o: kern/emu/full.c
+	$(TARGET_CC) $(COMMON_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -DGRUB_FILE=\"kern/emu/full.c\" -c -o $@ $<
+CLEANFILES += kern_emu_full.o
+
+kern_emu_cache.o: kern/emu/cache.S
+	$(TARGET_CC) $(COMMON_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(TARGET_ASFLAGS) -DGRUB_FILE=\"kern/emu/cache.S\" -c -o $@ $<
+CLEANFILES += kern_emu_cache.o
+
+symlist.o: symlist.c
+	$(TARGET_CC) $(COMMON_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -DGRUB_FILE=\"symlist.c\" -c -o $@ $<
+CLEANFILES += symlist.o
+
 CLEANFILES += grub-emu-lite
-grub-emu-lite: $(pkglib_PROGRAMS) emu-lite.mod
+grub-emu-lite: kern_emu_lite.o kern_emu_cache.o symlist.o kernel.img
 	$(CC) -o $@ $^ $(grub_emu_LDFLAGS) $(LDFLAGS)
 GRUB_EMU_LITE=grub-emu-lite
 
 CLEANFILES += grub-emu
-grub-emu: $(pkglib_MODULES) $(pkglib_PROGRAMS) emu-full.mod grub_emu_init.o
+grub-emu: $(PREMODFILES) kern_emu_full.o grub_emu_init.o kernel.img
 	$(CC) -o $@ $^ $(grub_emu_LDFLAGS) $(LDFLAGS)
 GRUB_EMU=grub-emu
diff --git a/genmk.rb b/genmk.rb
index 6b5ecd1d4..5d06d1153 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -161,6 +161,7 @@ endif
 #{pre_obj}: $(#{prefix}_DEPENDENCIES) #{objs_str}
 	-rm -f $@
 	$(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ #{objs_str}
+PREMODFILES += #{pre_obj}
 
 #{mod_obj}: #{mod_src}
 	$(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(#{prefix}_CFLAGS) -DGRUB_FILE=\\\"#{mod_src}\\\" -c -o $@ $<

From 16eaf6f7c6470e2a7d065ae92e3022f2b640755e Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 28 May 2010 16:18:22 +0530
Subject: [PATCH 1025/1628] fixes for netbsd build

---
 kern/misc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kern/misc.c b/kern/misc.c
index ccc01d43f..be50c671b 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -1058,7 +1058,7 @@ grub_abort (void)
 void abort (void) __attribute__ ((alias ("grub_abort")));
 #endif
 
-#if defined(NEED_ENABLE_EXECUTE_STACK) && !defined(GRUB_UTIL)
+#if defined(NEED_ENABLE_EXECUTE_STACK) && !defined(GRUB_UTIL) && !defined(GRUB_MACHINE_EMU)
 /* Some gcc versions generate a call to this function
    in trampolines for nested functions.  */
 void __enable_execute_stack (void *addr __attribute__ ((unused)))

From 15fb2ae896e6aad4ba947a5b4828f938575c9877 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 28 May 2010 11:51:50 +0100
Subject: [PATCH 1026/1628] Make grub-probe work with symbolic links under
 /dev/mapper as well as with real block devices.  The Linux world seems to be
 (at best) in transition here, and GRUB shouldn't get caught in the middle. *
 kern/emu/getroot.c (find_root_device): Follow symbolic links under
 /dev/mapper.

---
 ChangeLog.mapper-symlink |  8 ++++++++
 kern/emu/getroot.c       | 15 +++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 ChangeLog.mapper-symlink

diff --git a/ChangeLog.mapper-symlink b/ChangeLog.mapper-symlink
new file mode 100644
index 000000000..afcfc6479
--- /dev/null
+++ b/ChangeLog.mapper-symlink
@@ -0,0 +1,8 @@
+2010-05-28  Colin Watson  <cjwatson@ubuntu.com>
+
+	Make grub-probe work with symbolic links under /dev/mapper as well
+	as with real block devices.  The Linux world seems to be (at best)
+	in transition here, and GRUB shouldn't get caught in the middle.
+
+	* kern/emu/getroot.c (find_root_device): Follow symbolic links under
+	/dev/mapper.
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index 6875044da..e62abe089 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -126,9 +126,20 @@ find_root_device (const char *dir, dev_t dev)
 	/* Ignore any error.  */
 	continue;
 
-      if (S_ISLNK (st.st_mode))
-	/* Don't follow symbolic links.  */
+      if (S_ISLNK (st.st_mode)) {
+#ifdef __linux__
+	if (strcmp (dir, "mapper") == 0) {
+	  /* Follow symbolic links under /dev/mapper/; the canonical name
+	     may be something like /dev/dm-0, but the names under
+	     /dev/mapper/ are more human-readable and so we prefer them if
+	     we can get them.  */
+	  if (stat (ent->d_name, &st) < 0)
+	    continue;
+	} else
+#endif /* __linux__ */
+	/* Don't follow other symbolic links.  */
 	continue;
+      }
 
       if (S_ISDIR (st.st_mode))
 	{

From fa4b84900afa71ad9fcf498d509e8f0e8abbb6dc Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 28 May 2010 19:18:45 +0530
Subject: [PATCH 1027/1628] 	Fix grub-emu issues on NetBSD, with gcc 4.1.3.

	* conf/any-emu.rmk: Remove unnecessary COMMON_CFLAGS.
	* include/grub/emu/misc.h (canonicalize_file_name): New Prototype.
	* kern/misc.c (__enable_execute_stack): Disable on
	GRUB_MACHINE_EMU.
---
 ChangeLog               | 9 +++++++++
 conf/any-emu.rmk        | 2 --
 include/grub/emu/misc.h | 1 +
 kern/misc.c             | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 965848669..e3fb344aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-28  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	Fix grub-emu issues on NetBSD, with gcc 4.1.3.
+
+	* conf/any-emu.rmk: Remove unnecessary COMMON_CFLAGS.
+	* include/grub/emu/misc.h (canonicalize_file_name): New Prototype.
+	* kern/misc.c (__enable_execute_stack): Disable on
+	GRUB_MACHINE_EMU.
+
 2010-05-28  Colin Watson  <cjwatson@ubuntu.com>
 
 	Make grub-probe work with symbolic links under /dev/mapper as well
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 3f0df06aa..000996172 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -1,7 +1,5 @@
 # -*- makefile -*-
 
-COMMON_CFLAGS += -nostdinc -isystem $(shell $(TARGET_CC) -print-file-name=include)
-
 kernel_img_RELOCATABLE = yes
 pkglib_PROGRAMS = kernel.img
 kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c kern/env.c	\
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index e037e6be7..0e6ace0e8 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -46,5 +46,6 @@ int EXPORT_FUNC(asprintf) (char **buf, const char *fmt, ...);
 #endif
 
 char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
+extern char * canonicalize_file_name (const char *path);
 
 #endif /* GRUB_EMU_MISC_H */
diff --git a/kern/misc.c b/kern/misc.c
index ccc01d43f..2ba34f235 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -1058,7 +1058,7 @@ grub_abort (void)
 void abort (void) __attribute__ ((alias ("grub_abort")));
 #endif
 
-#if defined(NEED_ENABLE_EXECUTE_STACK) && !defined(GRUB_UTIL)
+#if defined(NEED_ENABLE_EXECUTE_STACK) && !defined(GRUB_UTIL) && !defined(GRUB_MACHINE_EMU)
 /* Some gcc versions generate a call to this function
    in trampolines for nested functions.  */
 void __enable_execute_stack (void *addr __attribute__ ((unused)))
@@ -1075,3 +1075,4 @@ void __deregister_frame_info (void)
 {
 }
 #endif
+

From c7c75cf4cb568889432527f94efc0d971e2cc3b0 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 28 May 2010 18:13:48 +0100
Subject: [PATCH 1028/1628] * configure.ac: AC_PROG_LEX sets LEX to ":" if lex
 is missing, not to the empty string.

---
 ChangeLog    | 5 +++++
 configure.ac | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e3fb344aa..5072a6026 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-28  Colin Watson  <cjwatson@ubuntu.com>
+
+	* configure.ac: AC_PROG_LEX sets LEX to ":" if lex is missing, not
+	to the empty string.
+
 2010-05-28  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Fix grub-emu issues on NetBSD, with gcc 4.1.3.
diff --git a/configure.ac b/configure.ac
index ace6bd81d..31b179d46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,7 +192,7 @@ AC_PROG_LEX
 AC_PROG_MAKE_SET
 AC_PROG_MKDIR_P
 
-if test "x$LEX" = x; then
+if test "x$LEX" = "x:"; then
   AC_MSG_ERROR([flex is not found])
 else
   version=`$LEX --version | $AWK '{ split($NF,x,"."); print x[[1]]*10000+x[[2]]*100+x[[3]]; }'`

From 8148171e96f291ad36b1d58e2332d41552f73992 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 31 May 2010 08:24:33 +0200
Subject: [PATCH 1029/1628] Pad image to 512K for flashrom

---
 util/grub-mkimage.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index bb4a9b2eb..dc9dcc208 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -1015,14 +1015,17 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       boot_size = grub_util_get_image_size (boot_path);
       boot_img = grub_util_read_image (boot_path);
 
-      rom_size = core_size + boot_size;
+      rom_size = ALIGN_UP (core_size + boot_size, 512 * 1024);
 
       rom_img = xmalloc (rom_size);
       memset (rom_img, 0, rom_size); 
 
       memcpy (rom_img, boot_img, boot_size);
 
-      memcpy (rom_img + boot_size, core_img, core_size);      
+      memcpy (rom_img + boot_size, core_img, core_size);
+
+      memset (rom_img + boot_size + core_size, 0,
+	      rom_size - (boot_size + core_size));
 
       free (core_img);
       core_img = rom_img;

From 4fa54f9209d3c71f7e33dd37df0a0c87892524eb Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 31 May 2010 08:25:20 +0200
Subject: [PATCH 1030/1628] Remove leftover message

---
 boot/mips/yeeloong/fwstart.S | 1 -
 1 file changed, 1 deletion(-)

diff --git a/boot/mips/yeeloong/fwstart.S b/boot/mips/yeeloong/fwstart.S
index 239305939..7fe5d7ac2 100644
--- a/boot/mips/yeeloong/fwstart.S
+++ b/boot/mips/yeeloong/fwstart.S
@@ -381,7 +381,6 @@ notification_string:	.asciz "GRUB "
 no_cs5536:	.asciz "No CS5536 found.\n\r"
 cs5536_found:	.asciz "CS5536 at "
 sm_failed: .asciz "SM transaction failed.\n\r"
-not_implemented: .asciz "Nothing more is implemented. Bye.\n\r"
 unhandled_tlb_refill:	.asciz "Unhandled TLB refill.\n\r"
 unhandled_cache_error:	.asciz "Unhandled cache error.\n\r"
 unhandled_exception:	.asciz "Unhandled exception.\n\r"

From 8b1cf5e87f603a30dbc0e0d13c44c3628d67b2bf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 31 May 2010 13:58:18 +0200
Subject: [PATCH 1031/1628] Dedicated DMA allocation functions. CS5536 OHCI
 support.

---
 bus/cs5536.c                     | 215 +++++++++++++++++++++++++++++++
 bus/pci.c                        |  53 ++++++++
 bus/usb/ohci.c                   | 175 +++++++++++++++++--------
 bus/usb/uhci.c                   |   6 +-
 bus/usb/usbtrans.c               |  91 ++++++++++---
 conf/i386.rmk                    |   6 +
 conf/mips-yeeloong.rmk           |  34 ++++-
 include/grub/cs5536.h            | 190 +++++++++++++++++++++++++++
 include/grub/i386/pci.h          |   2 +-
 include/grub/mips/yeeloong/pci.h |  32 +++--
 include/grub/pci.h               |  26 ++++
 include/grub/smbus.h             |  70 ++++++++++
 include/grub/usbtrans.h          |   2 +-
 13 files changed, 817 insertions(+), 85 deletions(-)
 create mode 100644 bus/cs5536.c
 create mode 100644 include/grub/cs5536.h
 create mode 100644 include/grub/smbus.h

diff --git a/bus/cs5536.c b/bus/cs5536.c
new file mode 100644
index 000000000..61b0646b4
--- /dev/null
+++ b/bus/cs5536.c
@@ -0,0 +1,215 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/cs5536.h>
+#include <grub/pci.h>
+#include <grub/time.h>
+#include <grub/ata.h>
+
+int
+grub_cs5536_find (grub_pci_device_t *devp)
+{
+  int found = 0;
+  auto int NESTED_FUNC_ATTR hook (grub_pci_device_t dev,
+				  grub_pci_id_t pciid);
+
+  int NESTED_FUNC_ATTR hook (grub_pci_device_t dev,
+			     grub_pci_id_t pciid)
+  {
+    if (pciid == GRUB_CS5536_PCIID)
+      {
+	*devp = dev;
+	found = 1;
+	return 1;
+      }
+    return 0;
+  }
+
+  grub_pci_iterate (hook);
+
+  return found;
+}
+
+grub_uint64_t
+grub_cs5536_read_msr (grub_pci_device_t dev, grub_uint32_t addr)
+{
+  grub_uint64_t ret = 0;
+  grub_pci_write (grub_pci_make_address (dev, GRUB_CS5536_MSR_MAILBOX_ADDR),
+		  addr);
+  ret = (grub_uint64_t)
+    grub_pci_read (grub_pci_make_address (dev, GRUB_CS5536_MSR_MAILBOX_DATA0));
+  ret |= (((grub_uint64_t) 
+	  grub_pci_read (grub_pci_make_address (dev,
+						GRUB_CS5536_MSR_MAILBOX_DATA1)))
+	  << 32);
+  return ret;
+}
+
+void
+grub_cs5536_write_msr (grub_pci_device_t dev, grub_uint32_t addr,
+		       grub_uint64_t val)
+{
+  grub_pci_write (grub_pci_make_address (dev, GRUB_CS5536_MSR_MAILBOX_ADDR),
+		  addr);
+  grub_pci_write (grub_pci_make_address (dev, GRUB_CS5536_MSR_MAILBOX_DATA0),
+		  val & 0xffffffff);
+  grub_pci_write (grub_pci_make_address (dev, GRUB_CS5536_MSR_MAILBOX_DATA1),
+		  val >> 32);
+}
+
+grub_err_t
+grub_cs5536_smbus_wait (grub_port_t smbbase)
+{
+  grub_uint64_t start = grub_get_time_ms ();
+  while (1)
+    {
+      grub_uint8_t status;
+      status = grub_inb (smbbase + GRUB_CS5536_SMB_REG_STATUS);
+      if (status & GRUB_CS5536_SMB_REG_STATUS_SDAST)
+	return GRUB_ERR_NONE;	
+      if (status & GRUB_CS5536_SMB_REG_STATUS_BER)
+	return grub_error (GRUB_ERR_IO, "SM bus error");
+      if (status & GRUB_CS5536_SMB_REG_STATUS_NACK)
+	return grub_error (GRUB_ERR_IO, "NACK received");
+      if (grub_get_time_ms () > start + 40)
+	return grub_error (GRUB_ERR_IO, "SM stalled");
+    }
+
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_cs5536_read_spd_byte (grub_port_t smbbase, grub_uint8_t dev,
+			   grub_uint8_t addr, grub_uint8_t *res)
+{
+  grub_err_t err;
+
+  /* Send START.  */
+  grub_outb (grub_inb (smbbase + GRUB_CS5536_SMB_REG_CTRL1)
+	     | GRUB_CS5536_SMB_REG_CTRL1_START,
+	     smbbase + GRUB_CS5536_SMB_REG_CTRL1);
+
+  /* Send device address.  */
+  err = grub_cs5536_smbus_wait (smbbase); 
+  if (err) 
+    return err;
+  grub_outb (dev << 1, smbbase + GRUB_CS5536_SMB_REG_DATA);
+
+  /* Send ACK.  */
+  err = grub_cs5536_smbus_wait (smbbase);
+  if (err)
+    return err;
+  grub_outb (grub_inb (smbbase + GRUB_CS5536_SMB_REG_CTRL1)
+	     | GRUB_CS5536_SMB_REG_CTRL1_ACK,
+	     smbbase + GRUB_CS5536_SMB_REG_CTRL1);
+
+  /* Send byte address.  */
+  grub_outb (addr, smbbase + GRUB_CS5536_SMB_REG_DATA);
+
+  /* Send START.  */
+  err = grub_cs5536_smbus_wait (smbbase); 
+  if (err) 
+    return err;
+  grub_outb (grub_inb (smbbase + GRUB_CS5536_SMB_REG_CTRL1)
+	     | GRUB_CS5536_SMB_REG_CTRL1_START,
+	     smbbase + GRUB_CS5536_SMB_REG_CTRL1);
+
+  /* Send device address.  */
+  err = grub_cs5536_smbus_wait (smbbase);
+  if (err)
+    return err;
+  grub_outb ((dev << 1) | 1, smbbase + GRUB_CS5536_SMB_REG_DATA);
+
+  /* Send STOP.  */
+  err = grub_cs5536_smbus_wait (smbbase);
+  if (err)
+    return err;
+  grub_outb (grub_inb (smbbase + GRUB_CS5536_SMB_REG_CTRL1)
+	     | GRUB_CS5536_SMB_REG_CTRL1_STOP,
+	     smbbase + GRUB_CS5536_SMB_REG_CTRL1);
+
+  err = grub_cs5536_smbus_wait (smbbase);
+  if (err) 
+    return err;
+  *res = grub_inb (smbbase + GRUB_CS5536_SMB_REG_DATA);
+
+  return GRUB_ERR_NONE;
+}
+
+grub_err_t
+grub_cs5536_init_smbus (grub_pci_device_t dev, grub_uint16_t divisor,
+			grub_port_t *smbbase)
+{
+  grub_uint64_t smbbar;
+
+  smbbar = grub_cs5536_read_msr (dev, GRUB_CS5536_MSR_SMB_BAR);
+
+  /* FIXME  */
+  if (!(smbbar & GRUB_CS5536_LBAR_ENABLE))
+    return grub_error(GRUB_ERR_IO, "SMB controller not enabled\n");
+  *smbbase = (smbbar & GRUB_CS5536_LBAR_ADDR_MASK) + GRUB_MACHINE_PCI_IO_BASE;
+
+  if (divisor < 8)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid divisor");
+
+  /* Disable SMB.  */
+  grub_outb (0, *smbbase + GRUB_CS5536_SMB_REG_CTRL2);
+
+  /* Disable interrupts.  */
+  grub_outb (0, *smbbase + GRUB_CS5536_SMB_REG_CTRL1);
+
+  /* Set as master.  */
+  grub_outb (GRUB_CS5536_SMB_REG_ADDR_MASTER,
+  	     *smbbase + GRUB_CS5536_SMB_REG_ADDR);
+
+  /* Launch.  */
+  grub_outb (((divisor >> 7) & 0xff), *smbbase + GRUB_CS5536_SMB_REG_CTRL3);
+  grub_outb (((divisor << 1) & 0xfe) | GRUB_CS5536_SMB_REG_CTRL2_ENABLE,
+	     *smbbase + GRUB_CS5536_SMB_REG_CTRL2);
+  
+  return GRUB_ERR_NONE; 
+}
+
+grub_err_t
+grub_cs5536_read_spd (grub_port_t smbbase, grub_uint8_t dev,
+		      struct grub_smbus_spd *res)
+{
+  grub_err_t err;
+  grub_size_t size;
+  grub_uint8_t b;
+  grub_size_t ptr;
+
+  err = grub_cs5536_read_spd_byte (smbbase, dev, 0, &b);
+  if (err)
+    return err;
+  if (b == 0)
+    return grub_error (GRUB_ERR_IO, "no SPD found");
+  size = b;
+  
+  ((grub_uint8_t *) res)[0] = b;
+  for (ptr = 1; ptr < size; ptr++)
+    {
+      err = grub_cs5536_read_spd_byte (smbbase, dev, ptr,
+				       &((grub_uint8_t *) res)[ptr]);
+      if (err)
+	return err;
+    }
+  return GRUB_ERR_NONE;
+}
+
diff --git a/bus/pci.c b/bus/pci.c
index a08e53446..3e2126962 100644
--- a/bus/pci.c
+++ b/bus/pci.c
@@ -19,6 +19,49 @@
 
 #include <grub/dl.h>
 #include <grub/pci.h>
+#include <grub/mm.h>
+
+#if GRUB_TARGET_SIZEOF_VOID_P == 4
+struct grub_pci_dma_chunk *
+grub_memalign_dma32 (grub_size_t align, grub_size_t size)
+{
+  return grub_memalign (align, size);
+}
+
+void
+grub_dma_free (struct grub_pci_dma_chunk *ch)
+{
+  grub_free (ch);
+}
+#endif
+
+#ifdef GRUB_MACHINE_MIPS_YEELOONG
+volatile void *
+grub_dma_get_virt (struct grub_pci_dma_chunk *ch)
+{
+  return (void *) ((((grub_uint32_t) ch) & 0x1fffffff) | 0xa0000000);
+}
+
+grub_uint32_t
+grub_dma_get_phys (struct grub_pci_dma_chunk *ch)
+{
+  return (((grub_uint32_t) ch) & 0x1fffffff) | 0x80000000;
+}
+#else
+
+volatile void *
+grub_dma_get_virt (struct grub_pci_dma_chunk *ch)
+{
+  return (void *) ch;
+}
+
+grub_uint32_t
+grub_dma_get_phys (struct grub_pci_dma_chunk *ch)
+{
+  return (grub_uint32_t) ch;
+}
+
+#endif
 
 grub_pci_address_t
 grub_pci_make_address (grub_pci_device_t dev, int reg)
@@ -48,6 +91,16 @@ grub_pci_iterate (grub_pci_iteratefunc_t hook)
 	      if (id >> 16 == 0xFFFF)
 		continue;
 
+#ifdef GRUB_MACHINE_MIPS_YEELOONG
+	      /* Skip ghosts.  */
+	      if (id == GRUB_YEELOONG_OHCI_PCIID
+		  && dev.function == GRUB_YEELOONG_OHCI_GHOST_FUNCTION)
+		continue;
+	      if (id == GRUB_YEELOONG_EHCI_PCIID
+		  && dev.function == GRUB_YEELOONG_EHCI_GHOST_FUNCTION)
+		continue;
+#endif
+
 	      if (hook (dev, id))
 		return;
 
diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 6d185bc7f..7294fe537 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -24,8 +24,9 @@
 #include <grub/misc.h>
 #include <grub/pci.h>
 #include <grub/cpu/pci.h>
-#include <grub/i386/io.h>
+#include <grub/cpu/io.h>
 #include <grub/time.h>
+#include <grub/cs5536.h>
 
 struct grub_ohci_hcca
 {
@@ -63,13 +64,15 @@ struct grub_ohci_td
   grub_uint32_t buffer_end;
 } __attribute__((packed));
 
-typedef struct grub_ohci_td *grub_ohci_td_t;
-typedef struct grub_ohci_ed *grub_ohci_ed_t;
+typedef volatile struct grub_ohci_td *grub_ohci_td_t;
+typedef volatile struct grub_ohci_ed *grub_ohci_ed_t;
 
 struct grub_ohci
 {
   volatile grub_uint32_t *iobase;
   volatile struct grub_ohci_hcca *hcca;
+  grub_uint32_t hcca_addr;
+  struct grub_pci_dma_chunk *hcca_chunk;
   struct grub_ohci *next;
 };
 
@@ -91,10 +94,23 @@ typedef enum
   GRUB_OHCI_REG_BULKCURR,
   GRUB_OHCI_REG_DONEHEAD,
   GRUB_OHCI_REG_FRAME_INTERVAL,
+  GRUB_OHCI_REG_PERIODIC_START = 16,
   GRUB_OHCI_REG_RHUBA = 18,
   GRUB_OHCI_REG_RHUBPORT = 21
 } grub_ohci_reg_t;
 
+#define GRUB_OHCI_RHUB_PORT_POWER_MASK 0x300
+#define GRUB_OHCI_RHUB_PORT_ALL_POWERED 0x200
+
+#define GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_MASK 0x8fff0000
+#define GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_SHIFT 16
+#define GRUB_OHCI_REG_FRAME_INTERVAL_FI_SHIFT 0
+
+/* XXX: Is this choice of timings sane?  */
+#define GRUB_OHCI_FSMPS 0x2778
+#define GRUB_OHCI_PERIODIC_START 0x257f
+#define GRUB_OHCI_FRAME_INTERVAL 0x2edf
+
 static grub_uint32_t
 grub_ohci_readreg32 (struct grub_ohci *o, grub_ohci_reg_t reg)
 {
@@ -114,51 +130,81 @@ grub_ohci_writereg32 (struct grub_ohci *o,
    controller.  If this is the case, initialize it.  */
 static int NESTED_FUNC_ATTR
 grub_ohci_pci_iter (grub_pci_device_t dev,
-		    grub_pci_id_t pciid __attribute__((unused)))
+		    grub_pci_id_t pciid)
 {
-  grub_uint32_t class_code;
-  grub_uint32_t class;
-  grub_uint32_t subclass;
   grub_uint32_t interf;
   grub_uint32_t base;
   grub_pci_address_t addr;
   struct grub_ohci *o;
   grub_uint32_t revision;
-  grub_uint32_t frame_interval;
-
-  addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
-  class_code = grub_pci_read (addr) >> 8;
-
-  interf = class_code & 0xFF;
-  subclass = (class_code >> 8) & 0xFF;
-  class = class_code >> 16;
-
-  /* If this is not an OHCI controller, just return.  */
-  if (class != 0x0c || subclass != 0x03 || interf != 0x10)
-    return 0;
+  int cs5536;
 
   /* Determine IO base address.  */
-  addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
-  base = grub_pci_read (addr);
+  grub_dprintf ("ohci", "pciid = %x\n", pciid);
+
+  if (pciid == GRUB_CS5536_PCIID)
+    {
+      grub_uint64_t basereg;
+
+      cs5536 = 1;
+      basereg = grub_cs5536_read_msr (dev, GRUB_CS5536_MSR_USB_OHCI_BASE);
+      if (!(basereg & GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE))
+	{
+	  /* Shouldn't happen.  */
+	  grub_dprintf ("ohci", "No OHCI address is assigned\n");
+	  return 0;
+	}
+      base = (basereg & GRUB_CS5536_MSR_USB_BASE_ADDR_MASK);
+      basereg |= GRUB_CS5536_MSR_USB_BASE_BUS_MASTER;
+      basereg &= ~GRUB_CS5536_MSR_USB_BASE_PME_ENABLED;
+      basereg &= ~GRUB_CS5536_MSR_USB_BASE_PME_STATUS;
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_OHCI_BASE, basereg);
+    }
+  else
+    {
+      grub_uint32_t class_code;
+      grub_uint32_t class;
+      grub_uint32_t subclass;
+
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
+      class_code = grub_pci_read (addr) >> 8;
+      
+      interf = class_code & 0xFF;
+      subclass = (class_code >> 8) & 0xFF;
+      class = class_code >> 16;
+
+      /* If this is not an OHCI controller, just return.  */
+      if (class != 0x0c || subclass != 0x03 || interf != 0x10)
+	return 0;
+
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
+      base = grub_pci_read (addr);
 
 #if 0
-  /* Stop if there is no IO space base address defined.  */
-  if (! (base & 1))
-    return 0;
+      /* Stop if there is no IO space base address defined.  */
+      if (! (base & 1))
+	return 0;
 #endif
 
+      grub_dprintf ("ohci", "class=0x%02x 0x%02x interface 0x%02x\n",
+		    class, subclass, interf);
+    }
+
   /* Allocate memory for the controller and register it.  */
   o = grub_malloc (sizeof (*o));
   if (! o)
     return 1;
 
-  o->iobase = (grub_uint32_t *) base;
+  o->iobase = grub_pci_device_map_range (dev, base, 0x100);
+
+  grub_dprintf ("ohci", "base=%p\n", o->iobase);
 
   /* Reserve memory for the HCCA.  */
-  o->hcca = (struct grub_ohci_hcca *) grub_memalign (256, 256);
-
-  grub_dprintf ("ohci", "class=0x%02x 0x%02x interface 0x%02x base=%p\n",
- 		class, subclass, interf, o->iobase);
+  o->hcca_chunk = grub_memalign_dma32 (256, 256);
+  if (! o->hcca_chunk)
+    return 1;
+  o->hcca = grub_dma_get_virt (o->hcca_chunk);
+  o->hcca_addr = grub_dma_get_phys (o->hcca_chunk);
 
   /* Check if the OHCI revision is actually 1.0 as supported.  */
   revision = grub_ohci_readreg32 (o, GRUB_OHCI_REG_REVISION);
@@ -166,19 +212,27 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   if ((revision & 0xFF) != 0x10)
     goto fail;
 
-  /* Backup the frame interval register.  */
-  frame_interval = grub_ohci_readreg32 (o, GRUB_OHCI_REG_FRAME_INTERVAL);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBA,
+			(grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBA)
+			 & ~GRUB_OHCI_RHUB_PORT_POWER_MASK)
+			| GRUB_OHCI_RHUB_PORT_ALL_POWERED);
 
   /* Suspend the OHCI by issuing a reset.  */
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, 1); /* XXX: Magic.  */
   grub_millisleep (1);
   grub_dprintf ("ohci", "OHCI reset\n");
 
-  /* Restore the frame interval register.  */
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_FRAME_INTERVAL, frame_interval);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_FRAME_INTERVAL,
+			(GRUB_OHCI_FSMPS
+			 << GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_SHIFT)
+			| (GRUB_OHCI_FRAME_INTERVAL
+			   << GRUB_OHCI_REG_FRAME_INTERVAL_FI_SHIFT));
+
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_PERIODIC_START,
+			GRUB_OHCI_PERIODIC_START);
 
   /* Setup the HCCA.  */
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, (grub_uint32_t) o->hcca);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, o->hcca_addr);
   grub_dprintf ("ohci", "OHCI HCCA\n");
 
   /* Enable the OHCI.  */
@@ -194,11 +248,13 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   return 0;
 
  fail:
+#ifndef GRUB_MACHINE_MIPS_YEELOONG
   if (o)
     grub_free ((void *) o->hcca);
+#endif
   grub_free (o);
 
-  return 1;
+  return 0;
 }
 
 
@@ -229,7 +285,7 @@ grub_ohci_iterate (int (*hook) (grub_usb_controller_t dev))
 static void
 grub_ohci_transaction (grub_ohci_td_t td,
 		       grub_transfer_type_t type, unsigned int toggle,
-		       grub_size_t size, char *data)
+		       grub_size_t size, grub_uint32_t data)
 {
   grub_uint32_t token;
   grub_uint32_t buffer;
@@ -261,7 +317,7 @@ grub_ohci_transaction (grub_ohci_td_t td,
   token |= toggle << 24;
   token |= 1 << 25;
 
-  buffer = (grub_uint32_t) data;
+  buffer = data;
   buffer_end = buffer + size - 1;
 
   td->token = grub_cpu_to_le32 (token);
@@ -276,7 +332,10 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 {
   struct grub_ohci *o = (struct grub_ohci *) dev->data;
   grub_ohci_ed_t ed;
+  grub_uint32_t ed_addr;
+  struct grub_pci_dma_chunk *ed_chunk, *td_list_chunk;
   grub_ohci_td_t td_list;
+  grub_uint32_t td_list_addr;
   grub_uint32_t target;
   grub_uint32_t td_tail;
   grub_uint32_t td_head;
@@ -286,18 +345,23 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   int i;
 
   /* Allocate an Endpoint Descriptor.  */
-  ed = grub_memalign (16, sizeof (*ed));
-  if (! ed)
+  ed_chunk = grub_memalign_dma32 (256, sizeof (*ed));
+  if (! ed_chunk)
     return GRUB_USB_ERR_INTERNAL;
+  ed = grub_dma_get_virt (ed_chunk);
+  ed_addr = grub_dma_get_phys (ed_chunk);
 
-  td_list = grub_memalign (16, sizeof (*td_list) * (transfer->transcnt + 1));
-  if (! td_list)
+  td_list_chunk = grub_memalign_dma32 (256, sizeof (*td_list)
+				       * (transfer->transcnt + 1));
+  if (! td_list_chunk)
     {
-      grub_free ((void *) ed);
+      grub_dma_free (ed_chunk);
       return GRUB_USB_ERR_INTERNAL;
     }
+  td_list = grub_dma_get_virt (td_list_chunk);
+  td_list_addr = grub_dma_get_phys (td_list_chunk);
 
-  grub_dprintf ("ohci", "alloc=%p\n", td_list);
+  grub_dprintf ("ohci", "alloc=%p/0x%x\n", td_list, td_list_addr);
 
   /* Setup all Transfer Descriptors.  */
   for (i = 0; i < transfer->transcnt; i++)
@@ -307,7 +371,8 @@ grub_ohci_transfer (grub_usb_controller_t dev,
       grub_ohci_transaction (&td_list[i], tr->pid, tr->toggle,
 			     tr->size, tr->data);
 
-      td_list[i].next_td = grub_cpu_to_le32 (&td_list[i + 1]);
+      td_list[i].next_td = grub_cpu_to_le32 (td_list_addr
+					     + (i + 1) * sizeof (td_list[0]));
     }
 
   /* Setup the Endpoint Descriptor.  */
@@ -324,9 +389,9 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   /* Set the maximum packet size.  */
   target |= transfer->max << 16;
 
-  td_head = (grub_uint32_t) td_list;
+  td_head = td_list_addr;
 
-  td_tail = (grub_uint32_t) &td_list[transfer->transcnt];
+  td_tail = td_list_addr + transfer->transcnt * sizeof (*td_list);
 
   ed->target = grub_cpu_to_le32 (target);
   ed->td_head = grub_cpu_to_le32 (td_head);
@@ -353,7 +418,7 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 	status &= ~(1 << 2);
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
 
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, (grub_uint32_t) ed);
+	grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, ed_addr);
 
 	/* Enable the Bulk list.  */
 	control |= 1 << 5;
@@ -380,10 +445,9 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 	status &= ~(1 << 1);
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
 
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD,
-			      (grub_uint32_t) ed);
+	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, ed_addr);
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD+1,
-			      (grub_uint32_t) ed);
+			      ed_addr);
 
 	/* Enable the Control list.  */
 	control |= 1 << 4;
@@ -424,9 +488,12 @@ grub_ohci_transfer (grub_usb_controller_t dev,
     {
       grub_uint8_t errcode;
       grub_ohci_td_t tderr;
+      grub_uint32_t td_err_addr;
 
-      tderr = (grub_ohci_td_t) grub_ohci_readreg32 (o,
-						    GRUB_OHCI_REG_DONEHEAD);
+      td_err_addr = grub_ohci_readreg32 (o, GRUB_OHCI_REG_DONEHEAD);
+
+      tderr = (grub_ohci_td_t) ((char *) td_list
+				+ (td_err_addr - td_list_addr));
       errcode = tderr->token >> 28;
 
       switch (errcode)
@@ -519,8 +586,8 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
 
   /* XXX */
-  grub_free (td_list);
-  grub_free (ed);
+  grub_dma_free (td_list_chunk);
+  grub_dma_free (ed_chunk);
 
   return err;
 }
diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index 947f2367b..6e47c38ef 100644
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -380,7 +380,7 @@ static grub_uhci_td_t
 grub_uhci_transaction (struct grub_uhci *u, unsigned int endp,
 		       grub_transfer_type_t type, unsigned int addr,
 		       unsigned int toggle, grub_size_t size,
-		       char *data)
+		       grub_uint32_t data)
 {
   grub_uhci_td_t td;
   static const unsigned int tf[] = { 0x69, 0xE1, 0x2D };
@@ -398,7 +398,7 @@ grub_uhci_transaction (struct grub_uhci *u, unsigned int endp,
     }
 
   grub_dprintf ("uhci",
-		"transaction: endp=%d, type=%d, addr=%d, toggle=%d, size=%d data=%p td=%p\n",
+		"transaction: endp=%d, type=%d, addr=%d, toggle=%d, size=%d data=0x%x td=%p\n",
 		endp, type, addr, toggle, size, data, td);
 
   /* Don't point to any TD, just terminate.  */
@@ -418,7 +418,7 @@ grub_uhci_transaction (struct grub_uhci *u, unsigned int endp,
   td->token = ((size << 21) | (toggle << 19) | (endp << 15)
 	       | (addr << 8) | tf[type]);
 
-  td->buffer = (grub_uint32_t) data;
+  td->buffer = data;
 
   return td;
 }
diff --git a/bus/usb/usbtrans.c b/bus/usb/usbtrans.c
index 09e7af83e..f6d3d30f9 100644
--- a/bus/usb/usbtrans.c
+++ b/bus/usb/usbtrans.c
@@ -18,6 +18,7 @@
  */
 
 #include <grub/dl.h>
+#include <grub/pci.h>
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/usb.h>
@@ -29,30 +30,59 @@ grub_usb_control_msg (grub_usb_device_t dev,
 		      grub_uint8_t request,
 		      grub_uint16_t value,
 		      grub_uint16_t index,
-		      grub_size_t size, char *data)
+		      grub_size_t size0, char *data_in)
 {
   int i;
   grub_usb_transfer_t transfer;
   int datablocks;
-  struct grub_usb_packet_setup setupdata;
+  volatile struct grub_usb_packet_setup *setupdata;
+  grub_uint32_t setupdata_addr;
   grub_usb_err_t err;
   unsigned int max;
+  struct grub_pci_dma_chunk *data_chunk, *setupdata_chunk;
+  volatile char *data;
+  grub_uint32_t data_addr;
+  grub_size_t size = size0;
+
+  /* FIXME: avoid allocation any kind of buffer in a first place.  */
+  data_chunk = grub_memalign_dma32 (128, size ? : 16);
+  if (!data_chunk)
+    return GRUB_USB_ERR_INTERNAL;
+  data = grub_dma_get_virt (data_chunk);
+  data_addr = grub_dma_get_phys (data_chunk);
+  grub_memcpy ((char *) data, data_in, size);
 
   grub_dprintf ("usb",
 		"control: reqtype=0x%02x req=0x%02x val=0x%02x idx=0x%02x size=%d\n",
 		reqtype, request,  value, index, size);
 
   /* Create a transfer.  */
-  transfer = grub_malloc (sizeof (struct grub_usb_transfer));
+  transfer = grub_malloc (sizeof (*transfer));
   if (! transfer)
-    return grub_errno;
+    {
+      grub_dma_free (data_chunk);
+      return grub_errno;
+    }
+
+  setupdata_chunk = grub_memalign_dma32 (32, sizeof (*setupdata));
+  if (! setupdata_chunk)
+    {
+      grub_free (transfer);
+      grub_dma_free (data_chunk);
+      return grub_errno;
+    }
+
+  setupdata = grub_dma_get_virt (setupdata_chunk);
+  setupdata_addr = grub_dma_get_phys (setupdata_chunk);
 
   /* Determine the maximum packet size.  */
-  if (dev->initialized)
+  if (dev->initialized && dev->descdev.maxsize0)
     max = dev->descdev.maxsize0;
   else
     max = 64;
 
+  grub_dprintf ("usb", "transfer = %p, dev = %p\n", transfer, dev);
+
   datablocks = (size + max - 1) / max;
 
   /* XXX: Discriminate between different types of control
@@ -71,18 +101,20 @@ grub_usb_control_msg (grub_usb_device_t dev,
   if (! transfer->transactions)
     {
       grub_free (transfer);
+      grub_dma_free (setupdata_chunk);
+      grub_dma_free (data_chunk);
       return grub_errno;
     }
 
   /* Build a Setup packet.  XXX: Endianness.  */
-  setupdata.reqtype = reqtype;
-  setupdata.request = request;
-  setupdata.value = value;
-  setupdata.index = index;
-  setupdata.length = size;
-  transfer->transactions[0].size = sizeof (setupdata);
+  setupdata->reqtype = reqtype;
+  setupdata->request = request;
+  setupdata->value = value;
+  setupdata->index = index;
+  setupdata->length = size;
+  transfer->transactions[0].size = sizeof (*setupdata);
   transfer->transactions[0].pid = GRUB_USB_TRANSFER_TYPE_SETUP;
-  transfer->transactions[0].data = (char *) &setupdata;
+  transfer->transactions[0].data = setupdata_addr;
   transfer->transactions[0].toggle = 0;
 
   /* Now the data...  XXX: Is this the right way to transfer control
@@ -99,13 +131,13 @@ grub_usb_control_msg (grub_usb_device_t dev,
 	tr->pid = GRUB_USB_TRANSFER_TYPE_IN;
       else
 	tr->pid = GRUB_USB_TRANSFER_TYPE_OUT;
-      tr->data = &data[i * max];
+      tr->data = data_addr + i * max;
       size -= max;
     }
 
   /* End with an empty OUT transaction.  */
   transfer->transactions[datablocks + 1].size = 0;
-  transfer->transactions[datablocks + 1].data = NULL;
+  transfer->transactions[datablocks + 1].data = 0;
   if (reqtype & 128)
     transfer->transactions[datablocks + 1].pid = GRUB_USB_TRANSFER_TYPE_OUT;
   else
@@ -117,13 +149,17 @@ grub_usb_control_msg (grub_usb_device_t dev,
 
   grub_free (transfer->transactions);
   grub_free (transfer);
+  grub_dma_free (data_chunk);
+  grub_dma_free (setupdata_chunk);
+
+  grub_memcpy (data_in, (char *) data, size0);
 
   return err;
 }
 
 static grub_usb_err_t
 grub_usb_bulk_readwrite (grub_usb_device_t dev,
-			 int endpoint, grub_size_t size, char *data,
+			 int endpoint, grub_size_t size0, char *data_in,
 			 grub_transfer_type_t type)
 {
   int i;
@@ -132,6 +168,19 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
   unsigned int max;
   grub_usb_err_t err;
   int toggle = dev->toggle[endpoint];
+  volatile char *data;
+  grub_uint32_t data_addr;
+  struct grub_pci_dma_chunk *data_chunk;
+  grub_size_t size = size0;
+
+  /* FIXME: avoid allocation any kind of buffer in a first place.  */
+  data_chunk = grub_memalign_dma32 (128, size);
+  if (!data_chunk)
+    return GRUB_USB_ERR_INTERNAL;
+  data = grub_dma_get_virt (data_chunk);
+  data_addr = grub_dma_get_phys (data_chunk);
+  if (type == GRUB_USB_TRANSFER_TYPE_OUT)
+    grub_memcpy ((char *) data, data_in, size);
 
   /* Use the maximum packet size given in the endpoint descriptor.  */
   if (dev->initialized)
@@ -150,7 +199,10 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
   /* Create a transfer.  */
   transfer = grub_malloc (sizeof (struct grub_usb_transfer));
   if (! transfer)
-    return grub_errno;
+    {
+      grub_dma_free (data_chunk);
+      return grub_errno;
+    }
 
   datablocks = ((size + max - 1) / max);
   transfer->transcnt = datablocks;
@@ -167,6 +219,7 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
   if (! transfer->transactions)
     {
       grub_free (transfer);
+      grub_dma_free (data_chunk);
       return grub_errno;
     }
 
@@ -181,7 +234,7 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
       tr->toggle = toggle;
       toggle = toggle ? 0 : 1;
       tr->pid = type;
-      tr->data = &data[i * max];
+      tr->data = data_addr + i * max;
       size -= tr->size;
     }
 
@@ -191,6 +244,10 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
 
   grub_free (transfer->transactions);
   grub_free (transfer);
+  grub_dma_free (data_chunk);
+
+  if (type == GRUB_USB_TRANSFER_TYPE_IN)
+    grub_memcpy (data_in, (char *) data, size0);
 
   return err;
 }
diff --git a/conf/i386.rmk b/conf/i386.rmk
index 02ce39817..73e818f9e 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -56,6 +56,12 @@ pci_mod_SOURCES = bus/pci.c
 pci_mod_CFLAGS = $(COMMON_CFLAGS)
 pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For cs5536.mod
+pkglib_MODULES += cs5536.mod
+cs5536_mod_SOURCES = bus/cs5536.c
+cs5536_mod_CFLAGS = $(COMMON_CFLAGS)
+cs5536_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # For lspci.mod
 pkglib_MODULES += lspci.mod
 lspci_mod_SOURCES = commands/lspci.c
diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 5ce8ede9d..2468985c5 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -4,7 +4,8 @@ target_machine=yeeloong
 COMMON_CFLAGS += -march=mips3
 COMMON_ASFLAGS += -march=mips3
 
-kernel_img_HEADERS += pci.h bitmap.h video.h gfxterm.h font.h bitmap_scale.h bufio.h
+kernel_img_HEADERS += pci.h bitmap.h video.h gfxterm.h font.h \
+		      bitmap_scale.h bufio.h cs5536.h machine/pci.h
 
 include $(srcdir)/conf/mips.mk
 
@@ -26,6 +27,7 @@ kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
 	video/fb/fbfill.c video/fb/fbutil.c video/bitmap.c \
 	video/bitmap_scale.c video/sm712.c bus/pci.c bus/bonito.c \
 	term/gfxterm.c commands/extcmd.c lib/arg.c \
+	bus/cs5536.c \
 	symlist.c
 kernel_img_CFLAGS = $(COMMON_CFLAGS) -DUSE_ASCII_FAILBACK
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
@@ -69,5 +71,35 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For usb.mod
+pkglib_MODULES += usb.mod
+usb_mod_SOURCES = bus/usb/usb.c bus/usb/usbtrans.c bus/usb/usbhub.c
+usb_mod_CFLAGS = $(COMMON_CFLAGS)
+usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usbtest.mod
+pkglib_MODULES += usbtest.mod
+usbtest_mod_SOURCES = commands/usbtest.c
+usbtest_mod_CFLAGS = $(COMMON_CFLAGS)
+usbtest_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For ohci.mod
+pkglib_MODULES += ohci.mod
+ohci_mod_SOURCES = bus/usb/ohci.c
+ohci_mod_CFLAGS = $(COMMON_CFLAGS)
+ohci_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usbms.mod
+pkglib_MODULES += usbms.mod
+usbms_mod_SOURCES = disk/usbms.c
+usbms_mod_CFLAGS = $(COMMON_CFLAGS)
+usbms_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For usb_keyboard.mod
+pkglib_MODULES += usb_keyboard.mod
+usb_keyboard_mod_SOURCES = term/usb_keyboard.c
+usb_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
+usb_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 sbin_SCRIPTS += grub-install
 grub_install_SOURCES = util/grub-install.in
diff --git a/include/grub/cs5536.h b/include/grub/cs5536.h
new file mode 100644
index 000000000..cd17e11fc
--- /dev/null
+++ b/include/grub/cs5536.h
@@ -0,0 +1,190 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#ifndef GRUB_CS5536_HEADER
+#define GRUB_CS5536_HEADER 1
+
+#ifndef ASM_FILE
+#include <grub/pci.h>
+#include <grub/err.h>
+#include <grub/smbus.h>
+#endif
+
+#define GRUB_CS5536_PCIID 0x208f1022
+#define GRUB_CS5536_MSR_MAILBOX_ADDR  0xf4
+#define GRUB_CS5536_MSR_MAILBOX_DATA0 0xf8
+#define GRUB_CS5536_MSR_MAILBOX_DATA1 0xfc
+#define GRUB_CS5536_MSR_IRQ_MAP_BAR 0x80000008
+#define GRUB_CS5536_MSR_SMB_BAR 0x8000000b
+
+#define GRUB_CS5536_SMBUS_REGS_SIZE 8
+#define GRUB_CS5536_GPIO_REGS_SIZE 256
+#define GRUB_CS5536_MFGPT_REGS_SIZE 64
+#define GRUB_CS5536_IRQ_MAP_REGS_SIZE 32
+#define GRUB_CS5536_PM_REGS_SIZE 128
+#define GRUB_CS5536_ACPI_REGS_SIZE 32
+
+#define GRUB_CS5536_USB_OPTION_REGS_SIZE 0x1c
+#define GRUB_CS5536_USB_OPTION_REG_UOCMUX  1
+#define GRUB_CS5536_USB_OPTION_REG_UOCMUX_PMUX_MASK 0x03
+#define GRUB_CS5536_USB_OPTION_REG_UOCMUX_PMUX_HC   0x02
+
+#define GRUB_CS5536_DESTINATION_GLIU     0
+#define GRUB_CS5536_DESTINATION_GLPCI_SB 1
+#define GRUB_CS5536_DESTINATION_USB      2
+#define GRUB_CS5536_DESTINATION_IDE      3
+#define GRUB_CS5536_DESTINATION_DD       4
+#define GRUB_CS5536_DESTINATION_ACC      5
+#define GRUB_CS5536_DESTINATION_GLCP     7
+
+#define GRUB_CS5536_P2D_DEST_SHIFT    61
+#define GRUB_CS5536_P2D_LOG_ALIGN  12
+#define GRUB_CS5536_P2D_ALIGN  (1 << GRUB_CS5536_P2D_LOG_ALIGN)
+#define GRUB_CS5536_P2D_BASE_SHIFT 20
+#define GRUB_CS5536_P2D_MASK_SHIFT 0
+
+#define GRUB_CS5536_MSR_GL_IOD_START 0x000100e0
+#define GRUB_CS5536_IOD_DEST_SHIFT    61
+#define GRUB_CS5536_IOD_BASE_SHIFT    20
+#define GRUB_CS5536_IOD_MASK_SHIFT 0
+#define GRUB_CS5536_IOD_ADDR_MASK     0xfffff
+
+#define GRUB_CS5536_MSR_GPIO_BAR 0x8000000c
+#define GRUB_CS5536_MSR_MFGPT_BAR 0x8000000d
+#define GRUB_CS5536_MSR_ACPI_BAR 0x8000000e
+#define GRUB_CS5536_MSR_PM_BAR 0x8000000f
+#define GRUB_CS5536_MSR_DIVIL_LEG_IO 0x80000014
+#define GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE0 0x00000001
+#define GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1 0x00000002
+#define GRUB_CS5536_MSR_DIVIL_LEG_IO_MODE_X86    0x10000000
+#define GRUB_CS5536_MSR_DIVIL_LEG_IO_F_REMAP     0x04000000
+#define GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_PRIMARY_MASK 0x80000024
+#define GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_LPC_MASK 0x80000025
+#define GRUB_CS5536_DIVIL_LPC_INTERRUPTS 0x1002
+#define GRUB_CS5536_MSR_DIVIL_LPC_SERIAL_IRQ_CONTROL 0x8000004e
+#define GRUB_CS5536_MSR_DIVIL_LPC_SERIAL_IRQ_CONTROL_ENABLE 0x80
+
+#define GRUB_CS5536_MSR_USB_OHCI_BASE 0x40000008
+#define GRUB_CS5536_MSR_USB_EHCI_BASE 0x40000009
+#define GRUB_CS5536_MSR_USB_CONTROLLER_BASE 0x4000000a
+#define GRUB_CS5536_MSR_USB_OPTION_CONTROLLER_BASE 0x4000000b
+#define GRUB_CS5536_MSR_USB_BASE_ADDR_MASK     0x00ffffff00ULL
+#define GRUB_CS5536_MSR_USB_BASE_BUS_MASTER    0x0400000000ULL
+#define GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE 0x0200000000ULL
+#define GRUB_CS5536_MSR_USB_BASE_PME_ENABLED       0x0800000000ULL
+#define GRUB_CS5536_MSR_USB_BASE_PME_STATUS        0x1000000000ULL
+#define GRUB_CS5536_MSR_USB_EHCI_BASE_FLDJ_SHIFT 40
+
+#define GRUB_CS5536_MSR_IDE_IO_BAR 0x60000008
+#define GRUB_CS5536_MSR_IDE_IO_BAR_UNITS 1
+#define GRUB_CS5536_MSR_IDE_IO_BAR_ADDR_MASK 0xfffffff0
+#define GRUB_CS5536_MSR_IDE_CFG 0x60000010
+#define GRUB_CS5536_MSR_IDE_CFG_CHANNEL_ENABLE 2
+#define GRUB_CS5536_MSR_IDE_TIMING 0x60000012
+#define GRUB_CS5536_MSR_IDE_TIMING_PIO0 0x98
+#define GRUB_CS5536_MSR_IDE_TIMING_DRIVE0_SHIFT 24
+#define GRUB_CS5536_MSR_IDE_TIMING_DRIVE1_SHIFT 16
+#define GRUB_CS5536_MSR_IDE_CAS_TIMING 0x60000013
+#define GRUB_CS5536_MSR_IDE_CAS_TIMING_CMD_PIO0 0x99
+#define GRUB_CS5536_MSR_IDE_CAS_TIMING_CMD_SHIFT 24
+#define GRUB_CS5536_MSR_IDE_CAS_TIMING_DRIVE0_SHIFT 6
+#define GRUB_CS5536_MSR_IDE_CAS_TIMING_DRIVE1_SHIFT 4
+#define GRUB_CS5536_MSR_IDE_CAS_TIMING_PIO0 2
+
+#define GRUB_CS5536_MSR_GL_PCI_CTRL 0x00000010
+#define GRUB_CS5536_MSR_GL_PCI_CTRL_MEMORY_ENABLE 1
+#define GRUB_CS5536_MSR_GL_PCI_CTRL_IO_ENABLE 2
+#define GRUB_CS5536_MSR_GL_PCI_CTRL_LATENCY_SHIFT 35
+#define GRUB_CS5536_MSR_GL_PCI_CTRL_OUT_THR_SHIFT 60
+#define GRUB_CS5536_MSR_GL_PCI_CTRL_IN_THR_SHIFT 56
+
+#define GRUB_CS5536_MSR_GL_REGIONS_START 0x00000020
+#define GRUB_CS5536_MSR_GL_REGIONS_NUM   16
+#define GRUB_CS5536_MSR_GL_REGION_ENABLE 1
+#define GRUB_CS5536_MSR_GL_REGION_IO        0x100000000ULL
+#define GRUB_CS5536_MSR_GL_REGION_BASE_MASK 0xfffff000ULL
+#define GRUB_CS5536_MSR_GL_REGION_IO_BASE_SHIFT 12
+#define GRUB_CS5536_MSR_GL_REGION_TOP_MASK 0xfffff00000000000ULL
+#define GRUB_CS5536_MSR_GL_REGION_IO_TOP_SHIFT 44
+
+#define GRUB_CS5536_MSR_GL_P2D_START 0x00010020
+
+#define GRUB_CS5536_SMB_REG_DATA 0x0
+#define GRUB_CS5536_SMB_REG_STATUS 0x1
+#define GRUB_CS5536_SMB_REG_STATUS_SDAST (1 << 6)
+#define GRUB_CS5536_SMB_REG_STATUS_BER (1 << 5)
+#define GRUB_CS5536_SMB_REG_STATUS_NACK (1 << 4)
+#define GRUB_CS5536_SMB_REG_CTRL1 0x3
+#define GRUB_CS5536_SMB_REG_CTRL1_START 0x01
+#define GRUB_CS5536_SMB_REG_CTRL1_STOP  0x02
+#define GRUB_CS5536_SMB_REG_CTRL1_ACK   0x10
+#define GRUB_CS5536_SMB_REG_ADDR 0x4
+#define GRUB_CS5536_SMB_REG_ADDR_MASTER 0x0
+#define GRUB_CS5536_SMB_REG_CTRL2 0x5
+#define GRUB_CS5536_SMB_REG_CTRL2_ENABLE 0x1
+#define GRUB_CS5536_SMB_REG_CTRL3 0x6
+
+#ifdef ASM_FILE
+#define GRUB_ULL(x) x
+#else
+#define GRUB_ULL(x) x ## ULL
+#endif
+
+#define GRUB_CS5536_LBAR_ADDR_MASK GRUB_ULL (0x000000000000fff8)
+#define GRUB_CS5536_LBAR_ENABLE GRUB_ULL (0x0000000100000000)
+#define GRUB_CS5536_LBAR_MASK_MASK GRUB_ULL (0x0000f00000000000)
+#define GRUB_CS5536_LBAR_TURN_ON (GRUB_CS5536_LBAR_ENABLE | GRUB_CS5536_LBAR_MASK_MASK)
+
+/* PMON-compatible LBARs.  */
+#define GRUB_CS5536_LBAR_GPIO      0xb000
+#define GRUB_CS5536_LBAR_ACC       0xb200
+#define GRUB_CS5536_LBAR_PM        0xb280
+#define GRUB_CS5536_LBAR_MFGPT     0xb300
+#define GRUB_CS5536_LBAR_ACPI      0xb340
+#define GRUB_CS5536_LBAR_IRQ_MAP   0xb360
+#define GRUB_CS5536_LBAR_IDE       0xb380
+#define GRUB_CS5536_LBAR_SMBUS     0xb390
+
+#define GRUB_GPIO_SMBUS_PINS ((1 << 14) | (1 << 15))
+#define GRUB_GPIO_REG_OUT_EN 0x4
+#define GRUB_GPIO_REG_OUT_AUX1 0x10
+#define GRUB_GPIO_REG_IN_EN 0x20
+#define GRUB_GPIO_REG_IN_AUX1 0x34
+
+#ifndef ASM_FILE
+int EXPORT_FUNC (grub_cs5536_find) (grub_pci_device_t *devp);
+
+grub_uint64_t EXPORT_FUNC (grub_cs5536_read_msr) (grub_pci_device_t dev,
+						  grub_uint32_t addr);
+void EXPORT_FUNC (grub_cs5536_write_msr) (grub_pci_device_t dev,
+					  grub_uint32_t addr,
+					  grub_uint64_t val);
+grub_err_t grub_cs5536_read_spd_byte (grub_port_t smbbase, grub_uint8_t dev,
+				      grub_uint8_t addr, grub_uint8_t *res);
+grub_err_t EXPORT_FUNC (grub_cs5536_read_spd) (grub_port_t smbbase,
+					       grub_uint8_t dev,
+					       struct grub_smbus_spd *res);
+grub_err_t grub_cs5536_smbus_wait (grub_port_t smbbase);
+grub_err_t EXPORT_FUNC (grub_cs5536_init_smbus) (grub_pci_device_t dev,
+						 grub_uint16_t divisor,
+						 grub_port_t *smbbase);
+
+void grub_cs5536_init_geode (grub_pci_device_t dev);
+#endif
+
+#endif
diff --git a/include/grub/i386/pci.h b/include/grub/i386/pci.h
index bab42adb6..795dec58b 100644
--- a/include/grub/i386/pci.h
+++ b/include/grub/i386/pci.h
@@ -80,7 +80,7 @@ grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),
 
 static inline void
 grub_pci_device_unmap_range (grub_pci_device_t dev __attribute__ ((unused)),
-			     void *mem __attribute__ ((unused)),
+			     volatile void *mem __attribute__ ((unused)),
 			     grub_size_t size __attribute__ ((unused)))
 {
 }
diff --git a/include/grub/mips/yeeloong/pci.h b/include/grub/mips/yeeloong/pci.h
index c7bd31d4f..199bac048 100644
--- a/include/grub/mips/yeeloong/pci.h
+++ b/include/grub/mips/yeeloong/pci.h
@@ -19,16 +19,30 @@
 #ifndef	GRUB_MACHINE_PCI_H
 #define	GRUB_MACHINE_PCI_H	1
 
+#ifndef ASM_FILE
 #include <grub/types.h>
 #include <grub/cpu/io.h>
+#endif
+
+#define GRUB_YEELOONG_OHCI_PCIID 0x00351033
+#define GRUB_YEELOONG_EHCI_PCIID 0x00e01033
+#define GRUB_YEELOONG_OHCI_GHOST_FUNCTION 4
+#define GRUB_YEELOONG_EHCI_GHOST_FUNCTION 5
 
 #define GRUB_PCI_NUM_BUS        1
 #define GRUB_PCI_NUM_DEVICES    16
 
-#define GRUB_MACHINE_PCI_IO_BASE          0xbfd00000
-#define GRUB_MACHINE_PCI_CONFSPACE        0xbfe80000
-#define GRUB_MACHINE_PCI_CONF_CTRL_REG    (*(volatile grub_uint32_t *) 0xbfe00118)
+#define GRUB_MACHINE_PCI_IO_BASE           0xbfd00000
+#define GRUB_MACHINE_PCI_CONFSPACE         0xbfe80000
+#define GRUB_MACHINE_PCI_CONTROLLER_HEADER 0xbfe00000
+
+#define GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR 0xbfe00118
+
+#ifndef ASM_FILE
+#define GRUB_MACHINE_PCI_CONF_CTRL_REG    (*(volatile grub_uint32_t *) \
+					   GRUB_MACHINE_PCI_CONF_CTRL_REG_ADDR)
 #define GRUB_MACHINE_PCI_IO_CTRL_REG      (*(volatile grub_uint32_t *) 0xbfe00110)
+#endif
 #define GRUB_MACHINE_PCI_WIN_MASK_SIZE    6
 #define GRUB_MACHINE_PCI_WIN_MASK         ((1 << GRUB_MACHINE_PCI_WIN_MASK_SIZE) - 1)
 
@@ -46,6 +60,7 @@
 #define GRUB_MACHINE_PCI_WIN2_ADDR        0xb4000000
 #define GRUB_MACHINE_PCI_WIN3_ADDR        0xb8000000
 
+#ifndef ASM_FILE
 static inline grub_uint32_t
 grub_pci_read (grub_pci_address_t addr)
 {
@@ -95,11 +110,12 @@ grub_pci_write_byte (grub_pci_address_t addr, grub_uint8_t data)
 }
 
 volatile void *
-grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),
-			   grub_addr_t base, grub_size_t size);
+EXPORT_FUNC (grub_pci_device_map_range) (grub_pci_device_t dev,
+					 grub_addr_t base, grub_size_t size);
 void
-grub_pci_device_unmap_range (grub_pci_device_t dev __attribute__ ((unused)),
-			     volatile void *mem,
-			     grub_size_t size __attribute__ ((unused)));
+EXPORT_FUNC (grub_pci_device_unmap_range) (grub_pci_device_t dev,
+					   volatile void *mem,
+					   grub_size_t size);
+#endif
 
 #endif /* GRUB_MACHINE_PCI_H */
diff --git a/include/grub/pci.h b/include/grub/pci.h
index 89bd1034a..e6d6488f0 100644
--- a/include/grub/pci.h
+++ b/include/grub/pci.h
@@ -19,8 +19,10 @@
 #ifndef	GRUB_PCI_H
 #define	GRUB_PCI_H	1
 
+#ifndef ASM_FILE
 #include <grub/types.h>
 #include <grub/symbol.h>
+#endif
 
 #define  GRUB_PCI_ADDR_SPACE_MASK	0x01
 #define  GRUB_PCI_ADDR_SPACE_MEMORY	0x00
@@ -66,6 +68,20 @@
 #define  GRUB_PCI_REG_MIN_GNT      0x3e
 #define  GRUB_PCI_REG_MAX_LAT      0x3f
 
+#define  GRUB_PCI_COMMAND_IO_ENABLED    0x0001
+#define  GRUB_PCI_COMMAND_MEM_ENABLED   0x0002
+#define  GRUB_PCI_COMMAND_BUS_MASTER    0x0004
+#define  GRUB_PCI_COMMAND_PARITY_ERROR  0x0040
+#define  GRUB_PCI_COMMAND_SERR_ENABLE   0x0100
+
+#define  GRUB_PCI_STATUS_CAPABILITIES      0x0010
+#define  GRUB_PCI_STATUS_66MHZ_CAPABLE     0x0020
+#define  GRUB_PCI_STATUS_FAST_B2B_CAPABLE  0x0080
+
+#define  GRUB_PCI_STATUS_DEVSEL_TIMING_SHIFT 9
+#define  GRUB_PCI_STATUS_DEVSEL_TIMING_MASK 0x0600
+
+#ifndef ASM_FILE
 typedef grub_uint32_t grub_pci_id_t;
 
 #ifdef GRUB_MACHINE_EMU
@@ -107,4 +123,14 @@ grub_pci_address_t EXPORT_FUNC(grub_pci_make_address) (grub_pci_device_t dev,
 
 void EXPORT_FUNC(grub_pci_iterate) (grub_pci_iteratefunc_t hook);
 
+struct grub_pci_dma_chunk;
+
+struct grub_pci_dma_chunk *EXPORT_FUNC(grub_memalign_dma32) (grub_size_t align,
+							     grub_size_t size);
+void EXPORT_FUNC(grub_dma_free) (struct grub_pci_dma_chunk *ch);
+volatile void *EXPORT_FUNC(grub_dma_get_virt) (struct grub_pci_dma_chunk *ch);
+grub_uint32_t EXPORT_FUNC(grub_dma_get_phys) (struct grub_pci_dma_chunk *ch);
+
+#endif
+
 #endif /* GRUB_PCI_H */
diff --git a/include/grub/smbus.h b/include/grub/smbus.h
new file mode 100644
index 000000000..0b8e6718f
--- /dev/null
+++ b/include/grub/smbus.h
@@ -0,0 +1,70 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#ifndef GRUB_SMBUS_HEADER
+#define GRUB_SMBUS_HEADER 1
+
+#define GRUB_SMB_RAM_START_ADDR 0x50
+#define GRUB_SMB_RAM_NUM_MAX 0x08
+
+#define GRUB_SMBUS_SPD_MEMORY_TYPE_ADDR 2
+#define GRUB_SMBUS_SPD_MEMORY_TYPE_DDR2 8
+#define GRUB_SMBUS_SPD_MEMORY_NUM_BANKS_ADDR 17
+#define GRUB_SMBUS_SPD_MEMORY_NUM_ROWS_ADDR 3
+#define GRUB_SMBUS_SPD_MEMORY_NUM_COLUMNS_ADDR 4
+#define GRUB_SMBUS_SPD_MEMORY_NUM_OF_RANKS_ADDR 5
+#define GRUB_SMBUS_SPD_MEMORY_NUM_OF_RANKS_MASK 0x7
+#define GRUB_SMBUS_SPD_MEMORY_CAS_LATENCY_ADDR 18
+#define GRUB_SMBUS_SPD_MEMORY_CAS_LATENCY_MIN_VALUE 5
+#define GRUB_SMBUS_SPD_MEMORY_TRAS_ADDR 30
+#define GRUB_SMBUS_SPD_MEMORY_TRTP_ADDR 38
+
+#ifndef ASM_FILE
+
+struct grub_smbus_spd
+{
+  grub_uint8_t written_size;
+  grub_uint8_t log_total_flash_size;
+  grub_uint8_t memory_type;
+  union
+  {
+    grub_uint8_t unknown[253];
+    struct {
+      grub_uint8_t num_rows;
+      grub_uint8_t num_columns;
+      grub_uint8_t num_of_ranks;
+      grub_uint8_t unused1[12];
+      grub_uint8_t num_of_banks;
+      grub_uint8_t unused2[2];
+      grub_uint8_t cas_latency;
+      grub_uint8_t unused3[9];
+      grub_uint8_t rank_capacity;
+      grub_uint8_t unused4[1];
+      grub_uint8_t tras;
+      grub_uint8_t unused5[7];
+      grub_uint8_t trtp;
+      grub_uint8_t unused6[31];
+      grub_uint8_t part_number[18];
+      grub_uint8_t unused7[165];
+    } ddr2;
+  };
+};
+
+#endif
+
+#endif
diff --git a/include/grub/usbtrans.h b/include/grub/usbtrans.h
index 7e4a9d7ee..8c739684e 100644
--- a/include/grub/usbtrans.h
+++ b/include/grub/usbtrans.h
@@ -37,7 +37,7 @@ struct grub_usb_transaction
   int size;
   int toggle;
   grub_transfer_type_t pid;
-  char *data;
+  grub_uint32_t data;
 };
 typedef struct grub_usb_transaction *grub_usb_transaction_t;
 

From 7fd08f56ae0d5f76e5f5c7a184414ae8e0e36a91 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 31 May 2010 14:01:38 +0200
Subject: [PATCH 1032/1628] Shut down OHCI on booting

---
 bus/usb/ohci.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 7294fe537..29ab5332a 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -654,6 +654,39 @@ grub_ohci_hubports (grub_usb_controller_t dev)
   return portinfo & 0xFF;
 }
 
+static grub_err_t
+grub_ohci_fini_hw (int noreturn __attribute__ ((unused)))
+{
+  struct grub_ohci *o;
+
+  for (o = ohci; o; o = o->next)
+    {
+      int i, nports = grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBA) & 0xff;
+      for (i = 0; i < nports; i++)
+	grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + i,
+			      GRUB_OHCI_CLEAR_PORT_ENABLE);
+
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, 0);
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, 0);
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLCURR, 0);
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, 0);
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKCURR, 0);
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_DONEHEAD, 0);
+    }
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_ohci_restore_hw (void)
+{
+  struct grub_ohci *o;
+
+  for (o = ohci; o; o = o->next)
+    grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, o->hcca_addr);
+
+  return GRUB_ERR_NONE;
+}
 
 
 static struct grub_usb_controller_dev usb_controller =
@@ -670,9 +703,12 @@ GRUB_MOD_INIT(ohci)
 {
   grub_ohci_inithw ();
   grub_usb_controller_dev_register (&usb_controller);
+  grub_loader_register_preboot_hook (grub_ohci_fini_hw, grub_ohci_restore_hw,
+				     GRUB_LOADER_PREBOOT_HOOK_PRIO_DISK);
 }
 
 GRUB_MOD_FINI(ohci)
 {
+  grub_ohci_fini_hw (0);
   grub_usb_controller_dev_unregister (&usb_controller);
 }

From 778ff32476c08a69d99e56fbfe9e7494e0c26bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Nesrsta?= <starous@volny.cz>
Date: Mon, 31 May 2010 14:11:41 +0200
Subject: [PATCH 1033/1628] Fix a bunch of problems with USB.

---
 bus/usb/ohci.c          | 342 +++++++++++++++++++++++++++++++---------
 bus/usb/uhci.c          |  17 +-
 bus/usb/usb.c           |  12 +-
 bus/usb/usbtrans.c      |   5 +-
 commands/usbtest.c      |   2 +
 disk/scsi.c             | 183 +++++++++++++++++++--
 disk/usbms.c            | 166 ++++++++++++-------
 include/grub/scsicmd.h  |  62 ++++++--
 include/grub/usb.h      |   9 +-
 include/grub/usbtrans.h |   6 +-
 10 files changed, 637 insertions(+), 167 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 29ab5332a..03768d39e 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -27,6 +27,7 @@
 #include <grub/cpu/io.h>
 #include <grub/time.h>
 #include <grub/cs5536.h>
+#include <grub/loader.h>
 
 struct grub_ohci_hcca
 {
@@ -96,7 +97,11 @@ typedef enum
   GRUB_OHCI_REG_FRAME_INTERVAL,
   GRUB_OHCI_REG_PERIODIC_START = 16,
   GRUB_OHCI_REG_RHUBA = 18,
-  GRUB_OHCI_REG_RHUBPORT = 21
+  GRUB_OHCI_REG_RHUBPORT = 21,
+  GRUB_OHCI_REG_LEGACY_CONTROL = 0x100,
+  GRUB_OHCI_REG_LEGACY_INPUT = 0x104,
+  GRUB_OHCI_REG_LEGACY_OUTPUT = 0x108,
+  GRUB_OHCI_REG_LEGACY_STATUS = 0x10c
 } grub_ohci_reg_t;
 
 #define GRUB_OHCI_RHUB_PORT_POWER_MASK 0x300
@@ -195,7 +200,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   if (! o)
     return 1;
 
-  o->iobase = grub_pci_device_map_range (dev, base, 0x100);
+  o->iobase = grub_pci_device_map_range (dev, base, 0x800);
 
   grub_dprintf ("ohci", "base=%p\n", o->iobase);
 
@@ -212,10 +217,48 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   if ((revision & 0xFF) != 0x10)
     goto fail;
 
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBA,
-			(grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBA)
-			 & ~GRUB_OHCI_RHUB_PORT_POWER_MASK)
-			| GRUB_OHCI_RHUB_PORT_ALL_POWERED);
+
+  {
+    grub_uint32_t control;
+    /* Check SMM/BIOS ownership of OHCI (SMM = USB Legacy Support driver for BIOS) */
+    control = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL);
+    if ((control & 0x100) != 0)
+      {
+	unsigned i;
+	grub_dprintf("ohci", "OHCI is owned by SMM\n");
+	/* Do change of ownership */
+	/* Ownership change request */
+	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, (1<<3)); /* XXX: Magic.  */
+	/* Waiting for SMM deactivation */
+	for (i=0; i < 10; i++)
+	  {
+	    if ((grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL) & 0x100) == 0)
+	      {
+		grub_dprintf("ohci", "Ownership changed normally.\n");
+		break;
+	      }
+	    grub_millisleep (100);
+          }
+	if (i >= 10)
+	  {
+	    grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL,
+				  grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL) & ~0x100);
+	    grub_dprintf("ohci", "Ownership changing timeout, change forced !\n");
+	  }
+      }
+    else if (((control & 0x100) == 0) && 
+	     ((control & 0xc0) != 0)) /* Not owned by SMM nor reset */
+      {
+	grub_dprintf("ohci", "OHCI is owned by BIOS\n");
+	/* Do change of ownership - not implemented yet... */
+	/* In fact we probably need to do nothing ...? */
+      }
+    else
+      {
+	grub_dprintf("ohci", "OHCI is not owned by SMM nor BIOS\n");
+	/* We can setup OHCI. */
+      }  
+  }
 
   /* Suspend the OHCI by issuing a reset.  */
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, 1); /* XXX: Magic.  */
@@ -232,15 +275,58 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
 			GRUB_OHCI_PERIODIC_START);
 
   /* Setup the HCCA.  */
+  o->hcca->donehead = 0;
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, o->hcca_addr);
   grub_dprintf ("ohci", "OHCI HCCA\n");
 
+  /* Misc. pre-sets. */
+  o->hcca->donehead = 0;
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1 << 1)); /* Clears WDH */
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, 0);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLCURR, 0);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, 0);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKCURR, 0);
+
+  /* Check OHCI Legacy Support */
+  if ((revision & 0x100) != 0)
+    {
+      grub_dprintf ("ohci", "Legacy Support registers detected\n");
+      grub_dprintf ("ohci", "Current state of legacy control reg.: 0x%04x\n",
+		    grub_ohci_readreg32 (o, GRUB_OHCI_REG_LEGACY_CONTROL));
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_LEGACY_CONTROL,
+			    (grub_ohci_readreg32 (o, GRUB_OHCI_REG_LEGACY_CONTROL)) & ~1);
+      grub_dprintf ("ohci", "OHCI Legacy Support disabled.\n");
+    }
+
   /* Enable the OHCI.  */
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL,
 			(2 << 6));
   grub_dprintf ("ohci", "OHCI enable: 0x%02x\n",
 		(grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL) >> 6) & 3);
 
+  /* Power on all ports */
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBA,
+                       (grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBA)
+                        & ~GRUB_OHCI_RHUB_PORT_POWER_MASK)
+                       | GRUB_OHCI_RHUB_PORT_ALL_POWERED);
+  /* Wait for stable power (100ms) and stable attachment (100ms) */
+  /* I.e. minimum wait time should be probably 200ms. */
+  /* We assume that device is attached when ohci is loaded. */
+  /* Some devices take long time to power-on or indicate attach. */
+  /* Here is some experimental value which should probably mostly work. */
+  /* Cameras with manual USB mode selection and maybe some other similar
+   * devices will not work in some cases - they are repowered during
+   * ownership change and then they are starting slowly and mostly they
+   * are wanting select proper mode again...
+   * The same situation can be on computers where BIOS not set-up OHCI
+   * to be at least powered USB bus (maybe it is Yeelong case...?)
+   * Possible workaround could be for example some prompt
+   * for user with confirmation of proper USB device connection.
+   * Another workaround - "rmmod usbms", "rmmod ohci", proper start
+   * and configuration of USB device and then "insmod ohci"
+   * and "insmod usbms". */
+  grub_millisleep (500);	
+
   /* Link to ohci now that initialisation is successful.  */
   o->next = ohci;
   ohci = o;
@@ -317,13 +403,29 @@ grub_ohci_transaction (grub_ohci_td_t td,
   token |= toggle << 24;
   token |= 1 << 25;
 
+  /* Set "Not accessed" error code */
+  token |= 15 << 28;
+
   buffer = data;
   buffer_end = buffer + size - 1;
 
+  /* Set correct buffer values in TD if zero transfer occurs */
+  if (size)
+    {
+      buffer = (grub_uint32_t) data;
+      buffer_end = buffer + size - 1;
+      td->buffer = grub_cpu_to_le32 (buffer);
+      td->buffer_end = grub_cpu_to_le32 (buffer_end);
+    }
+  else 
+    {
+      td->buffer = 0;
+      td->buffer_end = 0;
+    }
+
+  /* Set the rest of TD */
   td->token = grub_cpu_to_le32 (token);
-  td->buffer = grub_cpu_to_le32 (buffer);
   td->next_td = 0;
-  td->buffer_end = grub_cpu_to_le32 (buffer_end);
 }
 
 static grub_usb_err_t
@@ -342,7 +444,9 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   grub_uint32_t status;
   grub_uint32_t control;
   grub_usb_err_t err;
-  int i;
+  int i, j;
+  grub_uint64_t maxtime;
+  int err_timeout = 0;
 
   /* Allocate an Endpoint Descriptor.  */
   ed_chunk = grub_memalign_dma32 (256, sizeof (*ed));
@@ -375,13 +479,25 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 					     + (i + 1) * sizeof (td_list[0]));
     }
 
+  /* The last-1 TD token we should change to enable interrupt when TD finishes.
+   * As OHCI interrupts are disabled, it does only setting of WDH bit in
+   * HcInterruptStatus register - and that is what we want to safely detect
+   * normal end of all transactions. */
+  td_list[transfer->transcnt - 1].token &= ~(7 << 21);
+
+  td_list[transfer->transcnt].token = 0;
+  td_list[transfer->transcnt].buffer = 0;
+  td_list[transfer->transcnt].buffer_end = 0;
+  td_list[transfer->transcnt].next_td =
+    (grub_uint32_t) &td_list[transfer->transcnt];
+  
   /* Setup the Endpoint Descriptor.  */
 
   /* Set the device address.  */
   target = transfer->devaddr;
 
-  /* Set the endpoint.  */
-  target |= transfer->endpoint << 7;
+  /* Set the endpoint. It should be masked, we need 4 bits only. */
+  target |= (transfer->endpoint & 15) << 7;
 
   /* Set the device speed.  */
   target |= (transfer->dev->speed == GRUB_USB_SPEED_LOW) << 13;
@@ -400,6 +516,30 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 
   grub_dprintf ("ohci", "program OHCI\n");
 
+  /* Disable the Control and Bulk lists.  */
+  control = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL);
+  control &= ~(3 << 4);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, control);
+
+  /* Clear BulkListFilled and ControlListFilled.  */
+  status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS);
+  status &= ~(3 << 1);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
+
+  /* Now we should wait for start of next frame. Because we are not using
+   * interrupt, we reset SF bit and wait when it goes to 1. */
+  /* SF bit reset. (SF bit indicates Start Of Frame (SOF) packet) */
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1<<2));
+  /* Wait for new SOF */
+  while ((grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS) & 0x4) == 0);
+  /* Now it should be safe to change CONTROL and BULK lists. */
+
+  /* This we do for safety's sake - it should be done in previous call
+   * of grub_ohci_transfer and nobody should change it in meantime...
+   * It should be done before start of control or bulk OHCI list. */   
+  o->hcca->donehead = 0;
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1 << 1)); /* Clears WDH */
+
   /* Program the OHCI to actually transfer.  */
   switch (transfer->type)
     {
@@ -407,24 +547,17 @@ grub_ohci_transfer (grub_usb_controller_t dev,
       {
 	grub_dprintf ("ohci", "add to bulk list\n");
 
-	status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS);
-	control = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL);
-
-	/* Disable the Control and Bulk lists.  */
-	control &= ~(3 << 4);
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, control);
-
-	/* Clear BulkListFilled.  */
-	status &= ~(1 << 2);
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
-
+	/* Set BulkList Head and Current */
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, ed_addr);
+	grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKCURR, 0);
 
 	/* Enable the Bulk list.  */
+	control = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL);
 	control |= 1 << 5;
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, control);
 
 	/* Set BulkListFilled.  */
+	status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS);
 	status |= 1 << 2;
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
 
@@ -433,21 +566,9 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 
     case GRUB_USB_TRANSACTION_TYPE_CONTROL:
       {
-	grub_dprintf ("ohci", "add to control list\n");
-	status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS);
-	control = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL);
-
-	/* Disable the Control and Bulk lists.  */
-	control &= ~(3 << 4);
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, control);
-
-	/* Clear ControlListFilled.  */
-	status &= ~(1 << 1);
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
-
+	/* Set ControlList Head and Current */
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, ed_addr);
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD+1,
-			      ed_addr);
+	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLCURR, 0);
 
 	/* Enable the Control list.  */
 	control |= 1 << 4;
@@ -465,36 +586,77 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL),
 		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS));
 
+  /* Safety measure to avoid a hang. */
+  maxtime = grub_get_time_ms () + 1000;
+	
   /* Wait until the transfer is completed or STALLs.  */
-  while ((ed->td_head & ~0xf) != (ed->td_tail & ~0xf))
+  do
     {
       grub_cpu_idle ();
 
-      grub_dprintf ("ohci", "head=0x%02x tail=0x%02x\n", ed->td_head, ed->td_tail);
+      /* Detected a HALT.  */
+      if (grub_le_to_cpu32 (ed->td_head) & 1)
+        break;
+  
+      if ((grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS) & 0x2) != 0)
+        {
+          if ((grub_le_to_cpu32 (o->hcca->donehead) & ~0xf)
+	      == td_list_addr + (transfer->transcnt - 1) * sizeof (td_list[0]))
+	    break;
 
-      /* Detected a STALL.  */
-      if (ed->td_head & 1)
+          /* Done Head can be updated on some another place if ED is halted. */          
+          if (grub_le_to_cpu32 (ed->td_head) & 1)
+            break;
+
+          /* If there is not HALT in ED, it is not correct, so debug it, reset
+           * donehead and WDH and continue waiting. */
+          grub_dprintf ("ohci", "Incorrect HccaDoneHead=0x%08x\n",
+                        o->hcca->donehead);
+          o->hcca->donehead = 0;
+          grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1 << 1));
+          continue;
+        }
+      /* Timeout ? */
+      if (grub_get_time_ms () > maxtime)
+      	{
+	  /* Disable the Control and Bulk lists.  */
+  	  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL,
+	  grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL) & ~(3 << 4));
+      	  err_timeout = 1;
+      	  break;
+      	}
+
+      if ((ed->td_head & ~0xf) == (ed->td_tail & ~0xf))
 	break;
     }
+  while (1);
 
-  grub_dprintf ("ohci", "complete\n");
-
-/*   if (ed->td_head & 1) */
-/*     err = GRUB_USB_ERR_STALL; */
-/*   else if (ed->td */
-
-
-  if (ed->td_head & 1)
+  if (err_timeout)
+    {
+      err = GRUB_ERR_TIMEOUT;
+      grub_dprintf("ohci", "Timeout, target=%08x, head=%08x\n\t\ttail=%08x, next=%08x\n",
+      grub_le_to_cpu32(ed->target),
+      grub_le_to_cpu32(ed->td_head),
+      grub_le_to_cpu32(ed->td_tail),
+      grub_le_to_cpu32(ed->next_ed));
+    }
+  else if (grub_le_to_cpu32 (ed->td_head) & 1)
     {
-      grub_uint8_t errcode;
-      grub_ohci_td_t tderr;
       grub_uint32_t td_err_addr;
+      grub_uint8_t errcode;
+      grub_ohci_td_t tderr = NULL;
 
-      td_err_addr = grub_ohci_readreg32 (o, GRUB_OHCI_REG_DONEHEAD);
+      td_err_addr = (grub_ohci_readreg32 (o, GRUB_OHCI_REG_DONEHEAD) & ~0xf);
+      if (td_err_addr == 0)
+        /* If DONEHEAD==0 it means that correct address is in HCCA.
+         * It should be always now! */
+        td_err_addr = (grub_le_to_cpu32 (o->hcca->donehead) & ~0xf);
 
       tderr = (grub_ohci_td_t) ((char *) td_list
 				+ (td_err_addr - td_list_addr));
-      errcode = tderr->token >> 28;
+ 
+      errcode = grub_le_to_cpu32 (tderr->token) >> 28;      
+      grub_dprintf ("ohci", "OHCI errcode=0x%02x\n", errcode);
 
       switch (errcode)
 	{
@@ -540,11 +702,17 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 	case 8:
 	  /* XXX: Data overrun error.  */
 	  err = GRUB_USB_ERR_DATA;
+	  j = ((grub_uint32_t)tderr - (grub_uint32_t)td_list) / sizeof (*td_list);
+	  grub_dprintf ("ohci", "Overrun, failed TD address: %p, index: %d\n", tderr, j);
 	  break;
 
 	case 9:
 	  /* XXX: Data underrun error.  */
 	  err = GRUB_USB_ERR_DATA;
+	  grub_dprintf ("ohci", "Underrun, number of not transferred bytes: %d\n",
+	                1 + grub_le_to_cpu32 (tderr->buffer_end) - grub_le_to_cpu32 (tderr->buffer));
+	  j = ((grub_uint32_t)tderr - (grub_uint32_t)td_list) / sizeof (*td_list);
+	  grub_dprintf ("ohci", "Underrun, failed TD address: %p, index: %d\n", tderr, j);
 	  break;
 
 	case 10:
@@ -582,43 +750,73 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 
   /* Clear BulkListFilled and ControlListFilled.  */
   status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS);
-  status &= ~((1 << 2) | (1 << 3));
+  status &= ~(3 << 1);
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
-
-  /* XXX */
+   
+  /* Set ED to be skipped - for safety */
+  ed->target |= grub_cpu_to_le32 (1 << 14);
+ 
+  /* Now we should wait for start of next frame.
+   * It is necessary because we will invalidate pointer to ED and it
+   * can be on OHCI active till SOF!
+   * Because we are not using interrupt, we reset SF bit and wait when
+   * it goes to 1. */
+  /* SF bit reset. (SF bit indicates Start Of Frame (SOF) packet) */
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1<<2));
+  /* Wait for new SOF */
+  while ((grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS) & 0x4) == 0);
+  /* Now it should be safe to change CONTROL and BULK lists. */
+   
+  /* Important cleaning. */
+  o->hcca->donehead = 0;
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1 << 1)); /* Clears WDH */
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, 0);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLCURR, 0);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, 0);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKCURR, 0);
+ 
+  grub_dprintf ("ohci", "OHCI finished, freeing, err=0x%02x\n", err);
+   
   grub_dma_free (td_list_chunk);
   grub_dma_free (ed_chunk);
 
   return err;
 }
 
+#define GRUB_OHCI_SET_PORT_ENABLE (1 << 1)
+#define GRUB_OHCI_CLEAR_PORT_ENABLE (1 << 0)
+#define GRUB_OHCI_SET_PORT_RESET (1 << 4)
+#define GRUB_OHCI_SET_PORT_RESET_STATUS_CHANGE (1 << 20)
+
 static grub_err_t
 grub_ohci_portstatus (grub_usb_controller_t dev,
 		      unsigned int port, unsigned int enable)
 {
    struct grub_ohci *o = (struct grub_ohci *) dev->data;
-   grub_uint32_t status;
 
-   /* Reset the port.  */
-   status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port);
-   status |= (1 << 4); /* XXX: Magic.  */
-   grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port, status);
-   grub_millisleep (100);
+   grub_dprintf ("ohci", "begin of portstatus=0x%02x\n",
+                 grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port));
 
-   /* End the reset signaling.  */
-   status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port);
-   status |= (1 << 20); /* XXX: Magic.  */
-   grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port, status);
+   grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port,
+			 GRUB_OHCI_SET_PORT_RESET);
+   grub_millisleep (50); /* For root hub should be nominaly 50ms */
+ 
+    /* End the reset signaling.  */
+   grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port,
+			 GRUB_OHCI_SET_PORT_RESET_STATUS_CHANGE);
    grub_millisleep (10);
 
-   /* Enable the port.  */
-   status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port);
-   status |= (enable << 1); /* XXX: Magic.  */
-   grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port, status);
-
-   status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port);
-   grub_dprintf ("ohci", "portstatus=0x%02x\n", status);
+   if (enable)
+     grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port,
+			   GRUB_OHCI_SET_PORT_ENABLE);
+   else
+     grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port,
+			   GRUB_OHCI_CLEAR_PORT_ENABLE);
+   grub_millisleep (10);
 
+   grub_dprintf ("ohci", "end of portstatus=0x%02x\n",
+		 grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port));
+ 
    return GRUB_ERR_NONE;
 }
 
diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index 6e47c38ef..eb533c926 100644
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -174,14 +174,15 @@ grub_uhci_pci_iter (grub_pci_device_t dev,
     return 1;
 
   u->iobase = base & GRUB_UHCI_IOMASK;
-  grub_dprintf ("uhci", "class=0x%02x 0x%02x interface 0x%02x base=0x%x\n",
-		class, subclass, interf, u->iobase);
 
   /* Reserve a page for the frame list.  */
   u->framelist = grub_memalign (4096, 4096);
   if (! u->framelist)
     goto fail;
 
+  grub_dprintf ("uhci", "class=0x%02x 0x%02x interface 0x%02x base=0x%x framelist=%p\n",
+		class, subclass, interf, u->iobase, u->framelist);
+
   /* The framelist pointer of UHCI is only 32 bits, make sure this
      code works on on 64 bits architectures.  */
 #if GRUB_CPU_SIZEOF_VOID_P == 8
@@ -221,6 +222,9 @@ grub_uhci_pci_iter (grub_pci_device_t dev,
     }
 #endif
 
+  grub_dprintf ("uhci", "QH=%p, TD=%p\n",
+		u->qh, u->td);
+
   /* Link all Transfer Descriptors in a list of available Transfer
      Descriptors.  */
   for (i = 0; i < 256; i++)
@@ -441,6 +445,8 @@ grub_uhci_transfer (grub_usb_controller_t dev,
   if (! qh)
     return grub_errno;
 
+  grub_dprintf ("uhci", "transfer, iobase:%08x\n", u->iobase);
+  
   for (i = 0; i < transfer->transcnt; i++)
     {
       grub_usb_transaction_t tr = &transfer->transactions[i];
@@ -548,7 +554,8 @@ grub_uhci_transfer (grub_usb_controller_t dev,
 
  fail:
 
-  grub_dprintf ("uhci", "transaction failed\n");
+  if (err != GRUB_USB_ERR_NONE)
+    grub_dprintf ("uhci", "transaction failed\n");
 
   /* Place the QH back in the free list and deallocate the associated
      TDs.  */
@@ -583,6 +590,8 @@ grub_uhci_portstatus (grub_usb_controller_t dev,
   unsigned int status;
   grub_uint64_t endtime;
 
+  grub_dprintf ("uhci", "portstatus, iobase:%08x\n", u->iobase);
+  
   grub_dprintf ("uhci", "enable=%d port=%d\n", enable, port);
 
   if (port == 0)
@@ -631,6 +640,8 @@ grub_uhci_detect_dev (grub_usb_controller_t dev, int port)
   int reg;
   unsigned int status;
 
+  grub_dprintf ("uhci", "detect_dev, iobase:%08x\n", u->iobase);
+  
   if (port == 0)
     reg = GRUB_UHCI_REG_PORTSC1;
   else if (port == 1)
diff --git a/bus/usb/usb.c b/bus/usb/usb.c
index 8289185da..7df148333 100644
--- a/bus/usb/usb.c
+++ b/bus/usb/usb.c
@@ -107,7 +107,7 @@ grub_usb_set_configuration (grub_usb_device_t dev, int configuration)
 {
   int i;
 
-  for (i = 0; i < 16; i++)
+  for (i = 0; i < 256; i++)
     dev->toggle[i] = 0;
 
   return grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
@@ -163,6 +163,16 @@ grub_usb_device_initialize (grub_usb_device_t dev)
   grub_usb_err_t err;
   int i;
 
+  /* First we have to read first 8 bytes only and determine
+   * max. size of packet */
+  dev->descdev.maxsize0 = 0; /* invalidating, for safety only, can be removed if it is sure it is zero here */
+  err = grub_usb_get_descriptor (dev, GRUB_USB_DESCRIPTOR_DEVICE,
+				 0, 8, (char *) &dev->descdev);
+  if (err)
+    return err;
+
+  /* Now we have valid value in dev->descdev.maxsize0,
+   * so we can read whole device descriptor */
   err = grub_usb_get_descriptor (dev, GRUB_USB_DESCRIPTOR_DEVICE,
 				 0, sizeof (struct grub_usb_desc_device),
 				 (char *) &dev->descdev);
diff --git a/bus/usb/usbtrans.c b/bus/usb/usbtrans.c
index f6d3d30f9..0bf5ee6de 100644
--- a/bus/usb/usbtrans.c
+++ b/bus/usb/usbtrans.c
@@ -138,7 +138,7 @@ grub_usb_control_msg (grub_usb_device_t dev,
   /* End with an empty OUT transaction.  */
   transfer->transactions[datablocks + 1].size = 0;
   transfer->transactions[datablocks + 1].data = 0;
-  if (reqtype & 128)
+  if ((reqtype & 128) && datablocks)
     transfer->transactions[datablocks + 1].pid = GRUB_USB_TRANSFER_TYPE_OUT;
   else
     transfer->transactions[datablocks + 1].pid = GRUB_USB_TRANSFER_TYPE_IN;
@@ -148,6 +148,7 @@ grub_usb_control_msg (grub_usb_device_t dev,
   err = dev->controller.dev->transfer (&dev->controller, transfer);
 
   grub_free (transfer->transactions);
+  
   grub_free (transfer);
   grub_dma_free (data_chunk);
   grub_dma_free (setupdata_chunk);
@@ -207,7 +208,7 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
   datablocks = ((size + max - 1) / max);
   transfer->transcnt = datablocks;
   transfer->size = size - 1;
-  transfer->endpoint = endpoint;
+  transfer->endpoint = endpoint & 15;
   transfer->devaddr = dev->addr;
   transfer->type = GRUB_USB_TRANSACTION_TYPE_BULK;
   transfer->max = max;
diff --git a/commands/usbtest.c b/commands/usbtest.c
index 191c4e4df..7d1f85cfd 100644
--- a/commands/usbtest.c
+++ b/commands/usbtest.c
@@ -148,6 +148,8 @@ usb_iterate (grub_usb_device_t dev)
 
   grub_printf ("%s speed device\n", usb_devspeed[dev->speed]);
 
+  return 0;
+
   for (i = 0; i < descdev->configcnt; i++)
     {
       struct grub_usb_desc_config *config;
diff --git a/disk/scsi.c b/disk/scsi.c
index eba237287..e8bfb6a3f 100644
--- a/disk/scsi.c
+++ b/disk/scsi.c
@@ -25,6 +25,7 @@
 #include <grub/types.h>
 #include <grub/scsi.h>
 #include <grub/scsicmd.h>
+#include <grub/time.h>
 
 
 static grub_scsi_dev_t grub_scsi_dev_list;
@@ -50,7 +51,62 @@ grub_scsi_dev_unregister (grub_scsi_dev_t dev)
 }
 
 
-/* Determine the the device is removable and the type of the device
+/* Check result of previous operation.  */
+static grub_err_t
+grub_scsi_request_sense (grub_scsi_t scsi)
+{
+  struct grub_scsi_request_sense rs;
+  struct grub_scsi_request_sense_data rsd;
+  grub_err_t err;
+
+  rs.opcode = grub_scsi_cmd_request_sense;
+  rs.lun = scsi->lun << GRUB_SCSI_LUN_SHIFT;
+  rs.reserved1 = 0;
+  rs.reserved2 = 0;
+  rs.alloc_length = 0x12; /* XXX: Hardcoded for now */
+  rs.control = 0;
+  grub_memset (rs.pad, 0, sizeof(rs.pad));
+
+  err = scsi->dev->read (scsi, sizeof (rs), (char *) &rs,
+			 sizeof (rsd), (char *) &rsd);
+  if (err)
+    return err;
+
+  return GRUB_ERR_NONE;
+}
+/* Self commenting... */
+static grub_err_t
+grub_scsi_test_unit_ready (grub_scsi_t scsi)
+{
+  struct grub_scsi_test_unit_ready tur;
+  grub_err_t err;
+  grub_err_t err_sense;
+  
+  tur.opcode = grub_scsi_cmd_test_unit_ready;
+  tur.lun = scsi->lun << GRUB_SCSI_LUN_SHIFT;
+  tur.reserved1 = 0;
+  tur.reserved2 = 0;
+  tur.reserved3 = 0;
+  tur.control = 0;
+  grub_memset (tur.pad, 0, sizeof(tur.pad));
+
+  err = scsi->dev->read (scsi, sizeof (tur), (char *) &tur,
+			 0, NULL);
+
+  /* Each SCSI command should be followed by Request Sense.
+     If not so, many devices STALLs or definitely freezes. */
+  err_sense = grub_scsi_request_sense (scsi);
+  if (err_sense != GRUB_ERR_NONE)
+  	grub_errno = err;
+  /* err_sense is ignored for now and Request Sense Data also... */
+  
+  if (err)
+    return err;
+
+  return GRUB_ERR_NONE;
+}
+
+/* Determine if the device is removable and the type of the device
    SCSI.  */
 static grub_err_t
 grub_scsi_inquiry (grub_scsi_t scsi)
@@ -58,15 +114,26 @@ grub_scsi_inquiry (grub_scsi_t scsi)
   struct grub_scsi_inquiry iq;
   struct grub_scsi_inquiry_data iqd;
   grub_err_t err;
+  grub_err_t err_sense;
 
   iq.opcode = grub_scsi_cmd_inquiry;
   iq.lun = scsi->lun << GRUB_SCSI_LUN_SHIFT;
+  iq.page = 0;
   iq.reserved = 0;
   iq.alloc_length = 0x24; /* XXX: Hardcoded for now */
-  iq.reserved2 = 0;
+  iq.control = 0;
+  grub_memset (iq.pad, 0, sizeof(iq.pad));
 
   err = scsi->dev->read (scsi, sizeof (iq), (char *) &iq,
 			 sizeof (iqd), (char *) &iqd);
+
+  /* Each SCSI command should be followed by Request Sense.
+     If not so, many devices STALLs or definitely freezes. */
+  err_sense = grub_scsi_request_sense (scsi);
+  if (err_sense != GRUB_ERR_NONE)
+  	grub_errno = err;
+  /* err_sense is ignored for now and Request Sense Data also... */
+
   if (err)
     return err;
 
@@ -83,13 +150,27 @@ grub_scsi_read_capacity (grub_scsi_t scsi)
   struct grub_scsi_read_capacity rc;
   struct grub_scsi_read_capacity_data rcd;
   grub_err_t err;
+  grub_err_t err_sense;
 
   rc.opcode = grub_scsi_cmd_read_capacity;
   rc.lun = scsi->lun << GRUB_SCSI_LUN_SHIFT;
-  grub_memset (rc.reserved, 0, sizeof (rc.reserved));
-
+  rc.logical_block_addr = 0;
+  rc.reserved1 = 0;
+  rc.reserved2 = 0;
+  rc.PMI = 0;
+  rc.control = 0;
+  rc.pad = 0;
+	
   err = scsi->dev->read (scsi, sizeof (rc), (char *) &rc,
 			 sizeof (rcd), (char *) &rcd);
+
+  /* Each SCSI command should be followed by Request Sense.
+     If not so, many devices STALLs or definitely freezes. */
+  err_sense = grub_scsi_request_sense (scsi);
+  if (err_sense != GRUB_ERR_NONE)
+  	grub_errno = err;
+/* err_sense is ignored for now and Request Sense Data also... */
+
   if (err)
     return err;
 
@@ -107,6 +188,8 @@ grub_scsi_read10 (grub_disk_t disk, grub_disk_addr_t sector,
 {
   grub_scsi_t scsi;
   struct grub_scsi_read10 rd;
+  grub_err_t err;
+  grub_err_t err_sense;
 
   scsi = disk->data;
 
@@ -118,7 +201,16 @@ grub_scsi_read10 (grub_disk_t disk, grub_disk_addr_t sector,
   rd.reserved2 = 0;
   rd.pad = 0;
 
-  return scsi->dev->read (scsi, sizeof (rd), (char *) &rd, size * scsi->blocksize, buf);
+  err = scsi->dev->read (scsi, sizeof (rd), (char *) &rd, size * scsi->blocksize, buf);
+
+  /* Each SCSI command should be followed by Request Sense.
+     If not so, many devices STALLs or definitely freezes. */
+  err_sense = grub_scsi_request_sense (scsi);
+  if (err_sense != GRUB_ERR_NONE)
+  	grub_errno = err;
+  /* err_sense is ignored for now and Request Sense Data also... */
+
+  return err;
 }
 
 /* Send a SCSI request for DISK: read SIZE sectors starting with
@@ -129,6 +221,8 @@ grub_scsi_read12 (grub_disk_t disk, grub_disk_addr_t sector,
 {
   grub_scsi_t scsi;
   struct grub_scsi_read12 rd;
+  grub_err_t err;
+  grub_err_t err_sense;
 
   scsi = disk->data;
 
@@ -139,7 +233,16 @@ grub_scsi_read12 (grub_disk_t disk, grub_disk_addr_t sector,
   rd.reserved = 0;
   rd.control = 0;
 
-  return scsi->dev->read (scsi, sizeof (rd), (char *) &rd, size * scsi->blocksize, buf);
+  err = scsi->dev->read (scsi, sizeof (rd), (char *) &rd, size * scsi->blocksize, buf);
+
+  /* Each SCSI command should be followed by Request Sense.
+     If not so, many devices STALLs or definitely freezes. */
+  err_sense = grub_scsi_request_sense (scsi);
+  if (err_sense != GRUB_ERR_NONE)
+  	grub_errno = err;
+  /* err_sense is ignored for now and Request Sense Data also... */
+
+  return err;
 }
 
 #if 0
@@ -151,6 +254,8 @@ grub_scsi_write10 (grub_disk_t disk, grub_disk_addr_t sector,
 {
   grub_scsi_t scsi;
   struct grub_scsi_write10 wr;
+  grub_err_t err;
+  grub_err_t err_sense;
 
   scsi = disk->data;
 
@@ -162,7 +267,16 @@ grub_scsi_write10 (grub_disk_t disk, grub_disk_addr_t sector,
   wr.reserved2 = 0;
   wr.pad = 0;
 
-  return scsi->dev->write (scsi, sizeof (wr), (char *) &wr, size * scsi->blocksize, buf);
+  err = scsi->dev->write (scsi, sizeof (wr), (char *) &wr, size * scsi->blocksize, buf);
+
+  /* Each SCSI command should be followed by Request Sense.
+     If not so, many devices STALLs or definitely freezes. */
+  err_sense = grub_scsi_request_sense (scsi);
+  if (err_sense != GRUB_ERR_NONE)
+  	grub_errno = err;
+  /* err_sense is ignored for now and Request Sense Data also... */
+
+  return err;
 }
 
 /* Send a SCSI request for DISK: write the data stored in BUF to SIZE
@@ -172,7 +286,9 @@ grub_scsi_write12 (grub_disk_t disk, grub_disk_addr_t sector,
 		   grub_size_t size, char *buf)
 {
   grub_scsi_t scsi;
-  struct grub_scsi_write10 wr;
+  struct grub_scsi_write12 wr;
+  grub_err_t err;
+  grub_err_t err_sense;
 
   scsi = disk->data;
 
@@ -181,9 +297,18 @@ grub_scsi_write12 (grub_disk_t disk, grub_disk_addr_t sector,
   wr.lba = grub_cpu_to_be32 (sector);
   wr.size = grub_cpu_to_be32 (size);
   wr.reserved = 0;
-  wr.pad = 0;
+  wr.control = 0;
 
-  return scsi->dev->write (scsi, sizeof (wr), (char *) &wr, size * scsi->blocksize, buf);
+  err = scsi->dev->write (scsi, sizeof (wr), (char *) &wr, size * scsi->blocksize, buf);
+
+  /* Each SCSI command should be followed by Request Sense.
+     If not so, many devices STALLs or definitely freezes. */
+  err_sense = grub_scsi_request_sense (scsi);
+  if (err_sense != GRUB_ERR_NONE)
+  	grub_errno = err;
+  /* err_sense is ignored for now and Request Sense Data also... */
+
+  return err;
 }
 #endif
 
@@ -235,6 +360,7 @@ grub_scsi_open (const char *name, grub_disk_t disk)
   grub_err_t err;
   int len;
   int lun;
+  grub_uint64_t maxtime;
 
   scsi = grub_malloc (sizeof (*scsi));
   if (! scsi)
@@ -292,6 +418,31 @@ grub_scsi_open (const char *name, grub_disk_t disk)
       else
 	disk->has_partitions = 1;
 
+
+      /* According to USB MS tests specification, issue Test Unit Ready
+       * until OK */
+      maxtime = grub_get_time_ms () + 1000;
+      do
+        {
+	  /* Timeout is necessary - for example in case when we have
+	   * universal card reader with more LUNs and we have only
+	   * one card inserted (or none), so only one LUN (or none)
+	   * will be ready - and we want not to hang... */
+	  if (grub_get_time_ms () > maxtime)
+            {
+              err = GRUB_ERR_READ_ERROR;
+              grub_free (scsi);
+              grub_dprintf ("scsi", "LUN is not ready - timeout\n");
+              return err;
+            }
+          err = grub_scsi_test_unit_ready (scsi);
+        }
+      while (err == GRUB_ERR_READ_ERROR);
+      /* Reset grub_errno !
+       * It is set to some error code in loop before... */
+      grub_errno = GRUB_ERR_NONE;
+
+      /* Read capacity of media */
       err = grub_scsi_read_capacity (scsi);
       if (err)
 	{
@@ -302,12 +453,14 @@ grub_scsi_open (const char *name, grub_disk_t disk)
 
       /* SCSI blocks can be something else than 512, although GRUB
 	 wants 512 byte blocks.  */
-      disk->total_sectors = ((scsi->size * scsi->blocksize)
-			     << GRUB_DISK_SECTOR_BITS);
+      disk->total_sectors = ((grub_uint64_t)scsi->size
+                             * (grub_uint64_t)scsi->blocksize)
+			    >> GRUB_DISK_SECTOR_BITS;
 
-      grub_dprintf ("scsi", "capacity=%llu, blksize=%d\n",
-		    (unsigned long long) disk->total_sectors,
-		    scsi->blocksize);
+      grub_dprintf ("scsi", "blocks=%u, blocksize=%u\n",
+		    scsi->size, scsi->blocksize);
+      grub_dprintf ("scsi", "Disk total 512 sectors = %llu\n",
+		    disk->total_sectors);
 
       return GRUB_ERR_NONE;
     }
diff --git a/disk/usbms.c b/disk/usbms.c
index 8554b224f..7b719fb84 100644
--- a/disk/usbms.c
+++ b/disk/usbms.c
@@ -84,7 +84,8 @@ grub_usbms_finddevs (void)
       struct grub_usb_desc_device *descdev = &usbdev->descdev;
       int i;
 
-      if (descdev->class != 0 || descdev->subclass || descdev->protocol != 0)
+      if (descdev->class != 0 || descdev->subclass || descdev->protocol != 0
+	  || descdev->configcnt == 0)
 	return 0;
 
       /* XXX: Just check configuration 0 for now.  */
@@ -93,19 +94,31 @@ grub_usbms_finddevs (void)
 	  struct grub_usbms_dev *usbms;
 	  struct grub_usb_desc_if *interf;
 	  int j;
-	  grub_uint8_t luns;
+	  grub_uint8_t luns = 0;
+
+	  grub_dprintf ("usbms", "alive\n");
 
 	  interf = usbdev->config[0].interf[i].descif;
 
 	  /* If this is not a USB Mass Storage device with a supported
 	     protocol, just skip it.  */
+	  grub_dprintf ("usbms", "iterate: interf=%d, class=%d, subclass=%d, protocol=%d\n",
+	                i, interf->class, interf->subclass, interf->protocol);
+
 	  if (interf->class != GRUB_USB_CLASS_MASS_STORAGE
-	      || interf->subclass != GRUB_USBMS_SUBCLASS_BULK
+	      || ( interf->subclass != GRUB_USBMS_SUBCLASS_BULK &&
+	    /* Experimental support of RBC, MMC-2, UFI, SFF-8070i devices */
+	           interf->subclass != GRUB_USBMS_SUBCLASS_RBC &&
+	           interf->subclass != GRUB_USBMS_SUBCLASS_MMC2 &&
+	           interf->subclass != GRUB_USBMS_SUBCLASS_UFI &&
+	           interf->subclass != GRUB_USBMS_SUBCLASS_SFF8070 )
 	      || interf->protocol != GRUB_USBMS_PROTOCOL_BULK)
 	    {
 	      continue;
 	    }
 
+	  grub_dprintf ("usbms", "alive\n");
+
 	  devcnt++;
 	  usbms = grub_zalloc (sizeof (struct grub_usbms_dev));
 	  if (! usbms)
@@ -114,6 +127,8 @@ grub_usbms_finddevs (void)
 	  usbms->dev = usbdev;
 	  usbms->interface = i;
 
+	  grub_dprintf ("usbms", "alive\n");
+
 	  /* Iterate over all endpoints of this interface, at least a
 	     IN and OUT bulk endpoint are required.  */
 	  for (j = 0; j < interf->endpointcnt; j++)
@@ -125,14 +140,16 @@ grub_usbms_finddevs (void)
 		{
 		  /* Bulk IN endpoint.  */
 		  usbms->in = endp;
-		  grub_usb_clear_halt (usbdev, endp->endp_addr & 128);
+		  /* Clear Halt is not possible yet! */
+		  /* grub_usb_clear_halt (usbdev, endp->endp_addr); */
 		  usbms->in_maxsz = endp->maxpacket;
 		}
 	      else if (!(endp->endp_addr & 128) && (endp->attrib & 3) == 2)
 		{
 		  /* Bulk OUT endpoint.  */
 		  usbms->out = endp;
-		  grub_usb_clear_halt (usbdev, endp->endp_addr & 128);
+		  /* Clear Halt is not possible yet! */
+		  /* grub_usb_clear_halt (usbdev, endp->endp_addr); */
 		  usbms->out_maxsz = endp->maxpacket;
 		}
 	    }
@@ -143,51 +160,63 @@ grub_usbms_finddevs (void)
 	      return 0;
 	    }
 
+	  grub_dprintf ("usbms", "alive\n");
+
+	  /* XXX: Activate the first configuration.  */
+	  grub_usb_set_configuration (usbdev, 1);
+
 	  /* Query the amount of LUNs.  */
 	  err = grub_usb_control_msg (usbdev, 0xA1, 254,
 				      0, i, 1, (char *) &luns);
+		
 	  if (err)
 	    {
 	      /* In case of a stall, clear the stall.  */
 	      if (err == GRUB_USB_ERR_STALL)
 		{
-		  grub_usb_clear_halt (usbdev, usbms->in->endp_addr & 3);
-		  grub_usb_clear_halt (usbdev, usbms->out->endp_addr & 3);
+		  grub_usb_clear_halt (usbdev, usbms->in->endp_addr);
+		  grub_usb_clear_halt (usbdev, usbms->out->endp_addr);
 		}
-
 	      /* Just set the amount of LUNs to one.  */
 	      grub_errno = GRUB_ERR_NONE;
 	      usbms->luns = 1;
 	    }
 	  else
-	    usbms->luns = luns;
+            /* luns = 0 means one LUN with ID 0 present ! */
+            /* We get from device not number of LUNs but highest
+             * LUN number. LUNs are numbered from 0, 
+             * i.e. number of LUNs is luns+1 ! */
+	    usbms->luns = luns + 1;
 
-	  /* XXX: Check the magic values, does this really make
-	     sense?  */
-	  grub_usb_control_msg (usbdev, (1 << 6) | 1, 255,
-				0, i, 0, 0);
-
-	  /* XXX: To make Qemu work?  */
-	  if (usbms->luns == 0)
-	    usbms->luns = 1;
+	  grub_dprintf ("usbms", "alive\n");
 
 	  usbms->next = grub_usbms_dev_list;
 	  grub_usbms_dev_list = usbms;
 
-	  /* XXX: Activate the first configuration.  */
-	  grub_usb_set_configuration (usbdev, 1);
-
+#if 0 /* All this part should be probably deleted.
+     * This make trouble on some devices if they are not in
+     * Phase Error state - and there they should be not in such state...
+     * Bulk only mass storage reset procedure should be used only
+     * on place and in time when it is really necessary. */
+	  /* Reset recovery procedure */
 	  /* Bulk-Only Mass Storage Reset, after the reset commands
 	     will be accepted.  */
 	  grub_usbms_reset (usbdev, i);
+	  grub_usb_clear_halt (usbdev, usbms->in->endp_addr);
+	  grub_usb_clear_halt (usbdev, usbms->out->endp_addr);
+#endif
 
 	  return 0;
 	}
 
+      grub_dprintf ("usbms", "alive\n");
       return 0;
     }
+  grub_dprintf ("usbms", "alive\n");
 
   grub_usb_iterate (usb_iterate);
+  grub_dprintf ("usbms", "alive\n");
+
 }
 
 
@@ -225,6 +254,7 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
   static grub_uint32_t tag = 0;
   grub_usb_err_t err = GRUB_USB_ERR_NONE;
   int retrycnt = 3 + 1;
+  grub_size_t i;
 
  retry:
   retrycnt--;
@@ -237,73 +267,89 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
   cbw.tag = tag++;
   cbw.transfer_length = grub_cpu_to_le32 (size);
   cbw.flags = (!read_write) << GRUB_USBMS_DIRECTION_BIT;
-  cbw.lun = scsi->lun << GRUB_SCSI_LUN_SHIFT;
+  cbw.lun = scsi->lun; /* In USB MS CBW are LUN bits on another place than in SCSI CDB, both should be set correctly. */
   cbw.length = cmdsize;
   grub_memcpy (cbw.cbwcb, cmd, cmdsize);
+  
+  /* Debug print of CBW content. */
+  grub_dprintf ("usb", "CBW: sign=0x%08x tag=0x%08x len=0x%08x\n",
+  	cbw.signature, cbw.tag, cbw.transfer_length);
+  grub_dprintf ("usb", "CBW: flags=0x%02x lun=0x%02x CB_len=0x%02x\n",
+  	cbw.flags, cbw.lun, cbw.length);
+  grub_dprintf ("usb", "CBW: cmd:\n %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
+  	cbw.cbwcb[ 0], cbw.cbwcb[ 1], cbw.cbwcb[ 2], cbw.cbwcb[ 3],
+  	cbw.cbwcb[ 4], cbw.cbwcb[ 5], cbw.cbwcb[ 6], cbw.cbwcb[ 7],
+  	cbw.cbwcb[ 8], cbw.cbwcb[ 9], cbw.cbwcb[10], cbw.cbwcb[11],
+  	cbw.cbwcb[12], cbw.cbwcb[13], cbw.cbwcb[14], cbw.cbwcb[15]);
 
-  /* Write the request.  */
-  err = grub_usb_bulk_write (dev->dev, dev->out->endp_addr & 15,
+  /* Write the request.
+   * XXX: Error recovery is maybe still not fully correct. */
+  err = grub_usb_bulk_write (dev->dev, dev->out->endp_addr,
 			     sizeof (cbw), (char *) &cbw);
   if (err)
     {
       if (err == GRUB_USB_ERR_STALL)
 	{
+	  grub_usb_clear_halt (dev->dev, dev->in->endp_addr);
 	  grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
 	  goto retry;
 	}
       return grub_error (GRUB_ERR_IO, "USB Mass Storage request failed");
     }
 
-  /* Read/write the data.  */
-  if (read_write == 0)
+  /* Read/write the data, (maybe) according to specification.  */
+  if (size && (read_write == 0))
     {
-      err = grub_usb_bulk_read (dev->dev, dev->in->endp_addr & 15, size, buf);
-      grub_dprintf ("usb", "read: %d %d\n", err, GRUB_USB_ERR_STALL);
-      if (err)
-	{
-	  if (err == GRUB_USB_ERR_STALL)
-	    {
-	      grub_usb_clear_halt (dev->dev, dev->in->endp_addr);
-	      goto retry;
-	    }
-	  return grub_error (GRUB_ERR_READ_ERROR,
-			     "can't read from USB Mass Storage device");
-	}
+      err = grub_usb_bulk_read (dev->dev, dev->in->endp_addr, size, buf);
+      grub_dprintf ("usb", "read: %d %d\n", err, GRUB_USB_ERR_STALL); 
+      if (err) goto CheckCSW;
+      /* Debug print of received data. */
+      grub_dprintf ("usb", "buf:\n");
+      if (size <= 64)
+        for (i=0; i<size; i++)
+          grub_dprintf ("usb", "0x%02x: 0x%02x\n", i, buf[i]);
+      else
+          grub_dprintf ("usb", "Too much data for debug print...\n");
     }
-  else
+  else if (size)
     {
-      err = grub_usb_bulk_write (dev->dev, dev->in->endp_addr & 15, size, buf);
+      err = grub_usb_bulk_write (dev->dev, dev->out->endp_addr, size, buf);
       grub_dprintf ("usb", "write: %d %d\n", err, GRUB_USB_ERR_STALL);
-      if (err)
-	{
-	  if (err == GRUB_USB_ERR_STALL)
-	    {
-	      grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
-	      goto retry;
-	    }
-	  return grub_error (GRUB_ERR_WRITE_ERROR,
-			     "can't write to USB Mass Storage device");
-	}
+      grub_dprintf ("usb", "buf:\n");
+      /* Debug print of sent data. */
+      if (size <= 256)
+        for (i=0; i<size; i++)
+          grub_dprintf ("usb", "0x%02x: 0x%02x\n", i, buf[i]);
+      else
+          grub_dprintf ("usb", "Too much data for debug print...\n");
     }
 
-  /* Read the status.  */
-  err = grub_usb_bulk_read (dev->dev, dev->in->endp_addr & 15,
-			    sizeof (status), (char *) &status);
+  /* Read the status - (maybe) according to specification.  */
+CheckCSW:
+  err = grub_usb_bulk_read (dev->dev, dev->in->endp_addr,
+		    sizeof (status), (char *) &status);
   if (err)
     {
-      if (err == GRUB_USB_ERR_STALL)
-	{
-	  grub_usb_clear_halt (dev->dev, dev->in->endp_addr);
+      grub_usb_clear_halt (dev->dev, dev->in->endp_addr);
+      err = grub_usb_bulk_read (dev->dev, dev->in->endp_addr,
+			        sizeof (status), (char *) &status);
+      if (err)
+        { /* Bulk-only reset device. */
+          grub_usbms_reset (dev->dev, dev->interface);
+          grub_usb_clear_halt (dev->dev, dev->in->endp_addr);
+          grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
 	  goto retry;
-	}
-      return grub_error (GRUB_ERR_READ_ERROR,
-			 "can't read status from USB Mass Storage device");
+        }
     }
 
-  /* XXX: Magic and check this code.  */
+  /* Debug print of CSW content. */
+  grub_dprintf ("usb", "CSW: sign=0x%08x tag=0x%08x resid=0x%08x\n",
+  	status.signature, status.tag, status.residue);
+  grub_dprintf ("usb", "CSW: status=0x%02x\n", status.status);
+  
+  /* If phase error, do bulk-only reset device. */
   if (status.status == 2)
     {
-      /* XXX: Phase error, reset device.  */
       grub_usbms_reset (dev->dev, dev->interface);
       grub_usb_clear_halt (dev->dev, dev->in->endp_addr);
       grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
diff --git a/include/grub/scsicmd.h b/include/grub/scsicmd.h
index 40f237a17..f9a7cb200 100644
--- a/include/grub/scsicmd.h
+++ b/include/grub/scsicmd.h
@@ -25,14 +25,26 @@
 #define GRUB_SCSI_REMOVABLE_BIT	7
 #define GRUB_SCSI_LUN_SHIFT	5
 
+struct grub_scsi_test_unit_ready
+{
+  grub_uint8_t opcode;
+  grub_uint8_t lun; /* 7-5 LUN, 4-0 reserved */
+  grub_uint8_t reserved1;
+  grub_uint8_t reserved2;
+  grub_uint8_t reserved3;
+  grub_uint8_t control;
+  grub_uint8_t pad[6]; /* To be ATAPI compatible */
+} __attribute__((packed));
+
 struct grub_scsi_inquiry
 {
   grub_uint8_t opcode;
-  grub_uint8_t lun;
-  grub_uint16_t reserved;
-  grub_uint16_t alloc_length;
-  grub_uint8_t reserved2;
-  grub_uint8_t pad[5];
+  grub_uint8_t lun; /* 7-5 LUN, 4-1 reserved, 0 EVPD */
+  grub_uint8_t page; /* page code if EVPD=1 */
+  grub_uint8_t reserved;
+  grub_uint8_t alloc_length;
+  grub_uint8_t control;
+  grub_uint8_t pad[6]; /* To be ATAPI compatible */
 } __attribute__((packed));
 
 struct grub_scsi_inquiry_data
@@ -47,12 +59,42 @@ struct grub_scsi_inquiry_data
   char prodrev[4];
 } __attribute__((packed));
 
+struct grub_scsi_request_sense
+{
+  grub_uint8_t opcode;
+  grub_uint8_t lun; /* 7-5 LUN, 4-0 reserved */
+  grub_uint8_t reserved1;
+  grub_uint8_t reserved2;
+  grub_uint8_t alloc_length;
+  grub_uint8_t control;
+  grub_uint8_t pad[6]; /* To be ATAPI compatible */
+} __attribute__((packed));
+
+struct grub_scsi_request_sense_data
+{
+  grub_uint8_t error_code; /* 7 Valid, 6-0 Err. code */
+  grub_uint8_t segment_number;
+  grub_uint8_t sense_key; /*7 FileMark, 6 EndOfMedia, 5 ILI, 4-0 sense key */
+  grub_uint32_t information;
+  grub_uint8_t additional_sense_length;
+  grub_uint32_t cmd_specific_info;
+  grub_uint8_t additional_sense_code;
+  grub_uint8_t additional_sense_code_qualifier;
+  grub_uint8_t field_replaceable_unit_code;
+  grub_uint8_t sense_key_specific[3];
+  /* there can be additional sense field */
+} __attribute__((packed));
+
 struct grub_scsi_read_capacity
 {
   grub_uint8_t opcode;
-  grub_uint8_t lun;
-  grub_uint8_t reserved[8];
-  grub_uint8_t pad[2];
+  grub_uint8_t lun; /* 7-5 LUN, 4-1 reserved, 0 reserved */
+  grub_uint32_t logical_block_addr; /* only if PMI=1 */
+  grub_uint8_t reserved1;
+  grub_uint8_t reserved2;
+  grub_uint8_t PMI;
+  grub_uint8_t control;
+  grub_uint16_t pad; /* To be ATAPI compatible */
 } __attribute__((packed));
 
 struct grub_scsi_read_capacity_data
@@ -106,11 +148,13 @@ struct grub_scsi_write12
 typedef enum
   {
     grub_scsi_cmd_inquiry = 0x12,
+    grub_scsi_cmd_test_unit_ready = 0x00,
     grub_scsi_cmd_read_capacity = 0x25,
     grub_scsi_cmd_read10 = 0x28,
     grub_scsi_cmd_write10 = 0x2a,
     grub_scsi_cmd_read12 = 0xa8,
-    grub_scsi_cmd_write12 = 0xaa
+    grub_scsi_cmd_write12 = 0xaa,
+    grub_scsi_cmd_request_sense = 0x03
   } grub_scsi_cmd_t;
 
 typedef enum
diff --git a/include/grub/usb.h b/include/grub/usb.h
index dc90e7879..cbbc39303 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -156,7 +156,7 @@ struct grub_usb_device
   int initialized;
 
   /* Data toggle values (used for bulk transfers only).  */
-  int toggle[16];
+  int toggle[256];
 
   /* Device-specific data.  */
   void *data;
@@ -184,7 +184,12 @@ typedef enum
 
 typedef enum
   {
-    GRUB_USBMS_SUBCLASS_BULK = 0x06
+    GRUB_USBMS_SUBCLASS_BULK = 0x06,
+  	/* Experimental support for non-pure SCSI devices */
+    GRUB_USBMS_SUBCLASS_RBC = 0x01,
+    GRUB_USBMS_SUBCLASS_MMC2 = 0x02,
+    GRUB_USBMS_SUBCLASS_UFI = 0x04,
+    GRUB_USBMS_SUBCLASS_SFF8070 = 0x05
   } grub_usbms_subclass_t;
 
 typedef enum
diff --git a/include/grub/usbtrans.h b/include/grub/usbtrans.h
index 8c739684e..cd818e1fc 100644
--- a/include/grub/usbtrans.h
+++ b/include/grub/usbtrans.h
@@ -86,9 +86,9 @@ typedef struct grub_usb_transfer *grub_usb_transfer_t;
 
 #define GRUB_USB_REQ_HUB_GET_PORT_STATUS 0x00
 
-#define GRUB_USB_FEATURE_ENDP_HALT	0x01
-#define GRUB_USB_FEATURE_DEV_REMOTE_WU	0x02
-#define GRUB_USB_FEATURE_TEST_MODE	0x04
+#define GRUB_USB_FEATURE_ENDP_HALT	0x00
+#define GRUB_USB_FEATURE_DEV_REMOTE_WU	0x01
+#define GRUB_USB_FEATURE_TEST_MODE	0x02
 
 #define GRUB_USB_HUB_STATUS_CONNECTED	(1 << 0)
 #define GRUB_USB_HUB_STATUS_LOWSPEED	(1 << 9)

From c837af3f38882470ea30d4392427d17c5132cdea Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 31 May 2010 20:23:51 +0200
Subject: [PATCH 1034/1628] 	* loader/multiboot_elfxx.c
 (grub_multiboot_load_elfXX) [__mips]: Check 	64-bit address as signed on
 MIPS.

---
 ChangeLog                | 5 +++++
 loader/multiboot_elfxx.c | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5072a6026..c6edd3ac3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/multiboot_elfxx.c (grub_multiboot_load_elfXX) [__mips]: Check
+	64-bit address as signed on MIPS.
+
 2010-05-28  Colin Watson  <cjwatson@ubuntu.com>
 
 	* configure.ac: AC_PROG_LEX sets LEX to ":" if lex is missing, not
diff --git a/loader/multiboot_elfxx.c b/loader/multiboot_elfxx.c
index 92a52d3a8..78b7c542c 100644
--- a/loader/multiboot_elfxx.c
+++ b/loader/multiboot_elfxx.c
@@ -74,7 +74,11 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
   if (ehdr->e_phoff + ehdr->e_phnum * ehdr->e_phentsize > MULTIBOOT_SEARCH)
     return grub_error (GRUB_ERR_BAD_OS, "program header at a too high offset");
 
-#ifdef MULTIBOOT_LOAD_ELF64
+#if defined (MULTIBOOT_LOAD_ELF64) && defined (__mips)
+  /* We still in 32-bit mode.  */
+  if (ehdr->e_entry < 0xffffffff80000000ULL)
+    return grub_error (GRUB_ERR_BAD_OS, "invalid entry point for ELF64");
+#else
   /* We still in 32-bit mode.  */
   if (ehdr->e_entry > 0xffffffff)
     return grub_error (GRUB_ERR_BAD_OS, "invalid entry point for ELF64");

From 7620e7debd2a54cb29bab9f74c49f45ec76dcf9d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 31 May 2010 20:40:42 +0200
Subject: [PATCH 1035/1628] 	* commands/setpci.c (grub_setpci_iter): Fix an
 incorrect function check. 	Reported by: Seth Goldberg.

---
 ChangeLog         | 5 +++++
 commands/setpci.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c6edd3ac3..5bbb1c12f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* commands/setpci.c (grub_setpci_iter): Fix an incorrect function check.
+	Reported by: Seth Goldberg.
+
 2010-05-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/multiboot_elfxx.c (grub_multiboot_load_elfXX) [__mips]: Check
diff --git a/commands/setpci.c b/commands/setpci.c
index fbc7c214e..aa09f5bbb 100644
--- a/commands/setpci.c
+++ b/commands/setpci.c
@@ -96,7 +96,7 @@ grub_setpci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)
   if (check_device && grub_pci_get_device (dev) != device)
     return 0;
 
-  if (check_function && grub_pci_get_function (dev) != device)
+  if (check_function && grub_pci_get_function (dev) != function)
     return 0;
 
   addr = grub_pci_make_address (dev, regaddr);

From 5629316656a33304ac15364bf09b6f1d6800b447 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 31 May 2010 20:43:28 +0200
Subject: [PATCH 1036/1628] 	* loader/multiboot_mbi2.c
 (grub_multiboot_make_mbi): Fix incorrect 	addition of dest. 
 Reported by: Seth Goldberg.

---
 ChangeLog               | 6 ++++++
 loader/multiboot_mbi2.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5bbb1c12f..aa9363dd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix incorrect
+	addition of dest.
+	Reported by: Seth Goldberg.
+
 2010-05-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* commands/setpci.c (grub_setpci_iter): Fix an incorrect function check.
diff --git a/loader/multiboot_mbi2.c b/loader/multiboot_mbi2.c
index 7e9cebe49..c9e52e51f 100644
--- a/loader/multiboot_mbi2.c
+++ b/loader/multiboot_mbi2.c
@@ -496,7 +496,7 @@ grub_multiboot_make_mbi (void *orig, grub_uint32_t dest, grub_off_t buf_off,
 	  = (struct multiboot_tag_module *) ptrorig;
 	tag->type = MULTIBOOT_TAG_TYPE_MODULE;
 	tag->size = sizeof (struct multiboot_tag_module) + cur->cmdline_size;
-	tag->mod_start = dest + cur->start;
+	tag->mod_start = cur->start;
 	tag->mod_end = tag->mod_start + cur->size;
 	grub_memcpy (tag->cmdline, cur->cmdline, cur->cmdline_size);
 	ptrorig += ALIGN_UP (tag->size, MULTIBOOT_TAG_ALIGN);

From c2ffc8e956be5df59fd2fa96c4102e02a78f1799 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 31 May 2010 20:46:16 +0200
Subject: [PATCH 1037/1628] 	* normal/main.c (grub_normal_add_menu_entry):
 Avoid going out of args. 	Reported by: Seth Goldberg.

---
 ChangeLog     | 5 +++++
 normal/main.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index aa9363dd7..2d9015cfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* normal/main.c (grub_normal_add_menu_entry): Avoid going out of args.
+	Reported by: Seth Goldberg.
+
 2010-05-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/multiboot_mbi2.c (grub_multiboot_make_mbi): Fix incorrect
diff --git a/normal/main.c b/normal/main.c
index 4ed17e82c..14a25032f 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -204,7 +204,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
   for (i = 0; i < argc; i++)
     {
       /* Capture arguments.  */
-      if (grub_strncmp ("--", args[i], 2) == 0)
+      if (grub_strncmp ("--", args[i], 2) == 0 && i + 1 < argc)
 	{
 	  const char *arg = &args[i][2];
 

From dfbfe00473ad0edb62cc3d0958949578d4a8ecd3 Mon Sep 17 00:00:00 2001
From: Jiro SEKIBA <jir@unicus.jp>
Date: Mon, 31 May 2010 20:49:42 +0200
Subject: [PATCH 1038/1628] 	* include/grub/disk.h
 (GRUB_DISK_SIZE_UNKNOWN): New macro. 	* fs/nilfs.c: Support 2nd super block
 in case 1st one is accidently 	corrupted or not synced properly.

---
 ChangeLog           |  6 ++++
 fs/nilfs2.c         | 67 +++++++++++++++++++++++++++++++++++++--------
 include/grub/disk.h |  3 ++
 3 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2d9015cfb..a35843554 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-31  Jiro SEKIBA <jir@unicus.jp>
+
+	* include/grub/disk.h (GRUB_DISK_SIZE_UNKNOWN): New macro.
+	* fs/nilfs.c: Support 2nd super block in case 1st one is accidently
+	corrupted or not synced properly.
+
 2010-05-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* normal/main.c (grub_normal_add_menu_entry): Avoid going out of args.
diff --git a/fs/nilfs2.c b/fs/nilfs2.c
index 7e0415d12..5d32f5f88 100644
--- a/fs/nilfs2.c
+++ b/fs/nilfs2.c
@@ -49,6 +49,13 @@
 #define NILFS_BTREE_LEVEL_NODE_MIN      (NILFS_BTREE_LEVEL_DATA + 1)
 #define NILFS_BTREE_LEVEL_MAX           14
 
+/* nilfs 1st super block posission from beginning of the partition
+   in 512 block size */
+#define NILFS_1ST_SUPER_BLOCK	2
+/* nilfs 2nd super block posission from end of the partition
+   in 512 block size */
+#define NILFS_2ND_SUPER_BLOCK	8
+
 struct grub_nilfs2_inode
 {
   grub_uint64_t i_blocks;
@@ -703,6 +710,52 @@ grub_nilfs2_valid_sb (struct grub_nilfs2_super_block *sbp)
   return 1;
 }
 
+static grub_err_t
+grub_nilfs2_load_sb (struct grub_nilfs2_data *data)
+{
+  grub_disk_t disk = data->disk;
+  struct grub_nilfs2_super_block sb2;
+  grub_uint64_t partition_size;
+  int valid[2];
+  int swp = 0;
+
+  /* Read first super block. */
+  grub_disk_read (disk, NILFS_1ST_SUPER_BLOCK, 0,
+		  sizeof (struct grub_nilfs2_super_block), &data->sblock);
+  /* Make sure if 1st super block is valid.  */
+  valid[0] = grub_nilfs2_valid_sb (&data->sblock);
+
+  partition_size = grub_disk_get_size (disk);
+  if (partition_size != GRUB_DISK_SIZE_UNKNOWN)
+    {
+      /* Read second super block. */
+      grub_disk_read (disk, partition_size - NILFS_2ND_SUPER_BLOCK, 0,
+		      sizeof (struct grub_nilfs2_super_block), &sb2);
+      /* Make sure if 2nd super block is valid.  */
+      valid[1] = grub_nilfs2_valid_sb (&sb2);
+    }
+  else
+    /* 2nd super block may not exist, so it's invalid. */
+    valid[1] = 0;
+
+
+
+  if (!valid[0] && !valid[1])
+    return grub_error (GRUB_ERR_BAD_FS, "not a nilfs2 filesystem");
+
+  swp = valid[1] && (!valid[0] ||
+		     grub_le_to_cpu64 (data->sblock.s_last_cno) <
+		     grub_le_to_cpu64 (sb2.s_last_cno));
+
+  /* swap if first super block is invalid or older than second one. */
+  if (swp)
+    grub_memcpy (&data->sblock, &sb2,
+		 sizeof (struct grub_nilfs2_super_block));
+
+  grub_errno = GRUB_ERR_NONE;
+  return grub_errno;
+}
+
 static struct grub_nilfs2_data *
 grub_nilfs2_mount (grub_disk_t disk)
 {
@@ -717,19 +770,13 @@ grub_nilfs2_mount (grub_disk_t disk)
   if (!data)
     return 0;
 
+  data->disk = disk;
+
   /* Read the superblock.  */
-  grub_disk_read (disk, 1 * 2, 0, sizeof (struct grub_nilfs2_super_block),
-		  &data->sblock);
+  grub_nilfs2_load_sb (data);
   if (grub_errno)
     goto fail;
 
-  /* Make sure this is an nilfs2 filesystem.  */
-  if (!grub_nilfs2_valid_sb (&data->sblock))
-    {
-      grub_error (GRUB_ERR_BAD_FS, "not a nilfs2 filesystem");
-      goto fail;
-    }
-
   nilfs2_block_count = (1 << LOG2_NILFS2_BLOCK_SIZE (data));
 
   /* Read the last segment summary. */
@@ -748,8 +795,6 @@ grub_nilfs2_mount (grub_disk_t disk)
   if (grub_errno)
     goto fail;
 
-  data->disk = disk;
-
   grub_nilfs2_read_last_checkpoint (data, &last_checkpoint);
 
   if (grub_errno)
diff --git a/include/grub/disk.h b/include/grub/disk.h
index e60b1f3de..e7f807e0e 100644
--- a/include/grub/disk.h
+++ b/include/grub/disk.h
@@ -138,6 +138,9 @@ typedef struct grub_disk_memberlist *grub_disk_memberlist_t;
 #define GRUB_DISK_CACHE_SIZE	8
 #define GRUB_DISK_CACHE_BITS	3
 
+/* Return value of grub_disk_get_size() in case disk size is unknown. */
+#define GRUB_DISK_SIZE_UNKNOWN	 0xffffffffffffffffULL
+
 /* This is called from the memory manager.  */
 void grub_disk_cache_invalidate_all (void);
 

From b1d17e10e031a9d3dbbfb2e227509cf8137015bf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 31 May 2010 21:01:01 +0200
Subject: [PATCH 1039/1628] 	* disk/i386/pc/biosdisk.c
 (grub_biosdisk_open): Use 	GRUB_DISK_SIZE_UNKNOWN. 	*
 disk/ieee1275/ofdisk.c (grub_ofdisk_open): Likewise.

---
 ChangeLog               | 6 ++++++
 disk/i386/pc/biosdisk.c | 3 ++-
 disk/ieee1275/ofdisk.c  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a35843554..c388ebd27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* disk/i386/pc/biosdisk.c (grub_biosdisk_open): Use
+	GRUB_DISK_SIZE_UNKNOWN.
+	* disk/ieee1275/ofdisk.c (grub_ofdisk_open): Likewise.
+
 2010-05-31  Jiro SEKIBA <jir@unicus.jp>
 
 	* include/grub/disk.h (GRUB_DISK_SIZE_UNKNOWN): New macro.
diff --git a/disk/i386/pc/biosdisk.c b/disk/i386/pc/biosdisk.c
index 94d0e3708..f82f91ff0 100644
--- a/disk/i386/pc/biosdisk.c
+++ b/disk/i386/pc/biosdisk.c
@@ -120,7 +120,8 @@ grub_biosdisk_open (const char *name, grub_disk_t disk)
     {
       data->flags = GRUB_BIOSDISK_FLAG_LBA | GRUB_BIOSDISK_FLAG_CDROM;
       data->sectors = 32;
-      total_sectors = GRUB_ULONG_MAX;  /* TODO: get the correct size.  */
+      /* TODO: get the correct size.  */
+      total_sectors = GRUB_DISK_SIZE_UNKNOWN;
     }
   else if (drive & 0x80)
     {
diff --git a/disk/ieee1275/ofdisk.c b/disk/ieee1275/ofdisk.c
index e5a4a67fa..d0d9e894f 100644
--- a/disk/ieee1275/ofdisk.c
+++ b/disk/ieee1275/ofdisk.c
@@ -204,7 +204,7 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
   /* XXX: There is no property to read the number of blocks.  There
      should be a property `#blocks', but it is not there.  Perhaps it
      is possible to use seek for this.  */
-  disk->total_sectors = 0xFFFFFFFFUL;
+  disk->total_sectors = GRUB_DISK_SIZE_UNKNOWN;
 
   disk->id = (unsigned long) op;
 

From 7d4873c26a80e0d05c0952aa45f4bda59e1e3f86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Nesrsta?= <starous@volny.cz>
Date: Tue, 1 Jun 2010 02:10:19 +0200
Subject: [PATCH 1040/1628] =?UTF-8?q?Merge=20Ale=C5=A1'=20latest=20patch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bus/usb/ohci.c          | 156 ++++++++++++++++++++++++++++++----------
 bus/usb/uhci.c          |  19 +++--
 bus/usb/usbtrans.c      |   8 +++
 disk/scsi.c             |  33 ++++++++-
 disk/usbms.c            |  40 ++++++++---
 include/grub/usb.h      |   3 +-
 include/grub/usbtrans.h |   3 +
 term/usb_keyboard.c     |   1 -
 8 files changed, 206 insertions(+), 57 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 03768d39e..ac6f61ee8 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -116,6 +116,11 @@ typedef enum
 #define GRUB_OHCI_PERIODIC_START 0x257f
 #define GRUB_OHCI_FRAME_INTERVAL 0x2edf
 
+#define GRUB_OHCI_SET_PORT_ENABLE (1 << 1)
+#define GRUB_OHCI_CLEAR_PORT_ENABLE (1 << 0)
+#define GRUB_OHCI_SET_PORT_RESET (1 << 4)
+#define GRUB_OHCI_SET_PORT_RESET_STATUS_CHANGE (1 << 20)
+
 static grub_uint32_t
 grub_ohci_readreg32 (struct grub_ohci *o, grub_ohci_reg_t reg)
 {
@@ -281,7 +286,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
 
   /* Misc. pre-sets. */
   o->hcca->donehead = 0;
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1 << 1)); /* Clears WDH */
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, 0x7f); /* Clears everything */
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, 0);
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLCURR, 0);
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, 0);
@@ -396,8 +401,10 @@ grub_ohci_transaction (grub_ohci_td_t td,
       break;
     }
 
+#if 0 /* Always generate interrupt */
   /* Generate no interrupts.  */
   token |= 7 << 21;
+#endif
 
   /* Set the token.  */
   token |= toggle << 24;
@@ -444,9 +451,12 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   grub_uint32_t status;
   grub_uint32_t control;
   grub_usb_err_t err;
-  int i, j;
+  int i;
   grub_uint64_t maxtime;
   int err_timeout = 0;
+  int err_unrec = 0;
+  grub_uint32_t intstatus;
+  grub_uint32_t tderr_addr = 0;
 
   /* Allocate an Endpoint Descriptor.  */
   ed_chunk = grub_memalign_dma32 (256, sizeof (*ed));
@@ -479,11 +489,13 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 					     + (i + 1) * sizeof (td_list[0]));
     }
 
+#if 0 /* Better will be enable interrupt on all TDs. */
   /* The last-1 TD token we should change to enable interrupt when TD finishes.
    * As OHCI interrupts are disabled, it does only setting of WDH bit in
    * HcInterruptStatus register - and that is what we want to safely detect
    * normal end of all transactions. */
   td_list[transfer->transcnt - 1].token &= ~(7 << 21);
+#endif
 
   td_list[transfer->transcnt].token = 0;
   td_list[transfer->transcnt].buffer = 0;
@@ -582,9 +594,11 @@ grub_ohci_transfer (grub_usb_controller_t dev,
     }
 
   grub_dprintf ("ohci", "wait for completion\n");
-  grub_dprintf ("ohci", "control=0x%02x status=0x%02x\n",
+  grub_dprintf ("ohci",
+		"begin: control=0x%02x status=0x%02x\n\t\t intstatus=0x%02x\n",
 		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL),
-		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS));
+		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS),
+		grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS));
 
   /* Safety measure to avoid a hang. */
   maxtime = grub_get_time_ms () + 1000;
@@ -592,30 +606,34 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   /* Wait until the transfer is completed or STALLs.  */
   do
     {
-      grub_cpu_idle ();
+      /* Check transfer status */
+      intstatus = grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS);
+      if ((intstatus & 0x2) != 0)
+        {
+          grub_dprintf ("ohci", "Current HccaDoneHead=0x%08x\n",
+			o->hcca->donehead);
+          /* Remember last successful TD */
+          tderr_addr = grub_le_to_cpu32 (o->hcca->donehead) & ~0xf;
+          /* Reset DoneHead */
+	  o->hcca->donehead = 0;
+          grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1 << 1));
+          /* if TD is last, finish */
+          if (tderr_addr == td_list_addr
+	      + sizeof (td_list[0]) * (transfer->transcnt - 1))
+            break;
+           continue;
+        }
+
+      if ((intstatus & 0x10) != 0)
+        { /* Unrecoverable error - only reset can help...! */
+          err_unrec = 1;
+          break;
+        }
 
       /* Detected a HALT.  */
       if (grub_le_to_cpu32 (ed->td_head) & 1)
         break;
-  
-      if ((grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS) & 0x2) != 0)
-        {
-          if ((grub_le_to_cpu32 (o->hcca->donehead) & ~0xf)
-	      == td_list_addr + (transfer->transcnt - 1) * sizeof (td_list[0]))
-	    break;
 
-          /* Done Head can be updated on some another place if ED is halted. */          
-          if (grub_le_to_cpu32 (ed->td_head) & 1)
-            break;
-
-          /* If there is not HALT in ED, it is not correct, so debug it, reset
-           * donehead and WDH and continue waiting. */
-          grub_dprintf ("ohci", "Incorrect HccaDoneHead=0x%08x\n",
-                        o->hcca->donehead);
-          o->hcca->donehead = 0;
-          grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1 << 1));
-          continue;
-        }
       /* Timeout ? */
       if (grub_get_time_ms () > maxtime)
       	{
@@ -628,9 +646,45 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 
       if ((ed->td_head & ~0xf) == (ed->td_tail & ~0xf))
 	break;
+
+      grub_cpu_idle ();
     }
   while (1);
 
+  grub_dprintf ("ohci", "end: control=0x%02x status=0x%02x\n\t\t intstatus=0x%02x\n",
+		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL),
+		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS),
+		grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS));
+
+  if (!tderr_addr)
+    {
+      /* It means that something wrong happened,
+       * it could be:
+       * - timeout and no TD processed
+       * - some or unrecoverable error and no TD processed
+       * - something unexpected... :-( */
+      /* Try look into DONEHEAD reg., but there should be also zero */
+      grub_dprintf("ohci", "HCCA DoneHead is zero, something is bad!\n");
+      tderr_addr = grub_ohci_readreg32 (o, GRUB_OHCI_REG_DONEHEAD) & ~0xf;
+    }
+  
+  /* Remember last processed transaction (TD) - it is necessary for
+   * proper setting of toggle bit in next transaction. */
+  transfer->last_trans = (tderr_addr - td_list_addr) / sizeof (*td_list);
+  
+  /* Check correct value in last_trans */
+  /* It could happen if timeout happens and no TD was retired */
+  if (transfer->last_trans >= transfer->transcnt || !tderr_addr)
+    {
+      grub_dprintf("ohci", "tder==0 or out of TDs range!\n");
+      grub_dprintf("ohci", "tderr_addr=0x%x, td_list=%p,\n\t\t last_trans=%d, transcnt=%d\n",
+                   tderr_addr, td_list, transfer->last_trans, transfer->transcnt);
+      /* We should set something valid... */
+      transfer->last_trans = -1; /* Probably no TD done */
+      tderr_addr = td_list_addr;
+    }
+ 
+  /* In case of timeout do not detect error from TD */    
   if (err_timeout)
     {
       err = GRUB_ERR_TIMEOUT;
@@ -640,20 +694,25 @@ grub_ohci_transfer (grub_usb_controller_t dev,
       grub_le_to_cpu32(ed->td_tail),
       grub_le_to_cpu32(ed->next_ed));
     }
+  /* In case of unrecoverable error do not detect error from TD */    
+  else if (err_unrec)
+    {
+      err = GRUB_USB_ERR_UNRECOVERABLE;
+      grub_dprintf("ohci",
+		   "Unrecoverable error, target=%08x, head=%08x\n"
+		   "\t\ttail=%08x, next=%08x\n",
+		   grub_le_to_cpu32(ed->target),
+		   grub_le_to_cpu32(ed->td_head),
+		   grub_le_to_cpu32(ed->td_tail),
+		   grub_le_to_cpu32(ed->next_ed));
+    }
   else if (grub_le_to_cpu32 (ed->td_head) & 1)
     {
-      grub_uint32_t td_err_addr;
       grub_uint8_t errcode;
       grub_ohci_td_t tderr = NULL;
 
-      td_err_addr = (grub_ohci_readreg32 (o, GRUB_OHCI_REG_DONEHEAD) & ~0xf);
-      if (td_err_addr == 0)
-        /* If DONEHEAD==0 it means that correct address is in HCCA.
-         * It should be always now! */
-        td_err_addr = (grub_le_to_cpu32 (o->hcca->donehead) & ~0xf);
-
       tderr = (grub_ohci_td_t) ((char *) td_list
-				+ (td_err_addr - td_list_addr));
+				+ (tderr_addr - td_list_addr));
  
       errcode = grub_le_to_cpu32 (tderr->token) >> 28;      
       grub_dprintf ("ohci", "OHCI errcode=0x%02x\n", errcode);
@@ -702,17 +761,17 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 	case 8:
 	  /* XXX: Data overrun error.  */
 	  err = GRUB_USB_ERR_DATA;
-	  j = ((grub_uint32_t)tderr - (grub_uint32_t)td_list) / sizeof (*td_list);
-	  grub_dprintf ("ohci", "Overrun, failed TD address: %p, index: %d\n", tderr, j);
+	  grub_dprintf ("ohci", "Overrun, failed TD address: %p, index: %d\n",
+	                tderr, transfer->last_trans);
 	  break;
 
 	case 9:
 	  /* XXX: Data underrun error.  */
 	  err = GRUB_USB_ERR_DATA;
+	  grub_dprintf ("ohci", "Underrun, failed TD address: %p, index: %d\n",
+	                tderr, transfer->last_trans);
 	  grub_dprintf ("ohci", "Underrun, number of not transferred bytes: %d\n",
 	                1 + grub_le_to_cpu32 (tderr->buffer_end) - grub_le_to_cpu32 (tderr->buffer));
-	  j = ((grub_uint32_t)tderr - (grub_uint32_t)td_list) / sizeof (*td_list);
-	  grub_dprintf ("ohci", "Underrun, failed TD address: %p, index: %d\n", tderr, j);
 	  break;
 
 	case 10:
@@ -764,7 +823,8 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   /* SF bit reset. (SF bit indicates Start Of Frame (SOF) packet) */
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1<<2));
   /* Wait for new SOF */
-  while ((grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS) & 0x4) == 0);
+  while (((grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS) & 0x4) == 0)
+         && !err_unrec);
   /* Now it should be safe to change CONTROL and BULK lists. */
    
   /* Important cleaning. */
@@ -774,7 +834,29 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLCURR, 0);
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, 0);
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKCURR, 0);
- 
+
+ if (err_unrec)
+   {
+     /* Do OHCI reset in case of unrecoverable error - maybe we will need
+      * do more - re-enumerate bus etc. (?) */
+
+     /* Suspend the OHCI by issuing a reset.  */
+     grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, 1); /* XXX: Magic.  */
+     grub_millisleep (1);
+     grub_dprintf ("ohci", "Unrecoverable error - OHCI reset\n");
+
+     /* Misc. resets. */
+     o->hcca->donehead = 0;
+     grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, 0x7f); /* Clears everything */
+     grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, 0);
+     grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLCURR, 0);
+     grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, 0);
+     grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKCURR, 0);
+
+     /* Enable the OHCI.  */
+     grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, (2 << 6));
+   } 
+
   grub_dprintf ("ohci", "OHCI finished, freeing, err=0x%02x\n", err);
    
   grub_dma_free (td_list_chunk);
diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index eb533c926..1510f98e8 100644
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -332,13 +332,20 @@ grub_free_td (struct grub_uhci *u, grub_uhci_td_t td)
 }
 
 static void
-grub_free_queue (struct grub_uhci *u, grub_uhci_td_t td)
+grub_free_queue (struct grub_uhci *u, grub_uhci_td_t td,
+                 grub_usb_transfer_t transfer)
 {
-  /* Free the TDs in this queue.  */
-  while (td)
+  int i; /* Index of TD in transfer */
+  
+  /* Free the TDs in this queue and set last_trans.  */
+  for (i=0; td; i++)
     {
       grub_uhci_td_t tdprev;
 
+      /* Check state of TD and possibly set last_trans */
+      if (transfer && (td->linkptr & 1))
+        transfer->last_trans = i;
+      
       /* Unlink the queue.  */
       tdprev = td;
       td = (grub_uhci_td_t) td->linkptr2;
@@ -461,7 +468,7 @@ grub_uhci_transfer (grub_usb_controller_t dev,
 	  td_prev->linkptr = 1;
 
 	  if (td_first)
-	    grub_free_queue (u, td_first);
+	    grub_free_queue (u, td_first, NULL);
 
 	  return GRUB_USB_ERR_INTERNAL;
 	}
@@ -560,7 +567,7 @@ grub_uhci_transfer (grub_usb_controller_t dev,
   /* Place the QH back in the free list and deallocate the associated
      TDs.  */
   qh->elinkptr = 1;
-  grub_free_queue (u, td_first);
+  grub_free_queue (u, td_first, transfer);
 
   return err;
 }
@@ -609,7 +616,7 @@ grub_uhci_portstatus (grub_usb_controller_t dev,
   grub_uhci_writereg16 (u, reg, enable << 9);
 
   /* Wait for the reset to complete.  XXX: How long exactly?  */
-  grub_millisleep (10);
+  grub_millisleep (50); /* For root hub should be nominaly 50ms */
   status = grub_uhci_readreg16 (u, reg);
   grub_uhci_writereg16 (u, reg, status & ~(1 << 9));
   grub_dprintf ("uhci", "reset completed\n");
diff --git a/bus/usb/usbtrans.c b/bus/usb/usbtrans.c
index 0bf5ee6de..b3ee167a1 100644
--- a/bus/usb/usbtrans.c
+++ b/bus/usb/usbtrans.c
@@ -213,6 +213,7 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
   transfer->type = GRUB_USB_TRANSACTION_TYPE_BULK;
   transfer->max = max;
   transfer->dev = dev;
+  transfer->last_trans = -1; /* Reset index of last processed transaction (TD) */
 
   /* Allocate an array of transfer data structures.  */
   transfer->transactions = grub_malloc (transfer->transcnt
@@ -240,6 +241,13 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
     }
 
   err = dev->controller.dev->transfer (&dev->controller, transfer);
+  /* We must remember proper toggle value even if some transactions
+   * were not processed - correct value should be inversion of last
+   * processed transaction (TD). */
+  if (transfer->last_trans >= 0)
+    toggle = transfer->transactions[transfer->last_trans].toggle ? 0 : 1;
+  else
+    toggle = dev->toggle[endpoint]; /* Nothing done, take original */
   grub_dprintf ("usb", "toggle=%d\n", toggle);
   dev->toggle[endpoint] = toggle;
 
diff --git a/disk/scsi.c b/disk/scsi.c
index e8bfb6a3f..dffabc26e 100644
--- a/disk/scsi.c
+++ b/disk/scsi.c
@@ -421,7 +421,7 @@ grub_scsi_open (const char *name, grub_disk_t disk)
 
       /* According to USB MS tests specification, issue Test Unit Ready
        * until OK */
-      maxtime = grub_get_time_ms () + 1000;
+      maxtime = grub_get_time_ms () + 5000; /* It is safer value */
       do
         {
 	  /* Timeout is necessary - for example in case when we have
@@ -519,6 +519,37 @@ grub_scsi_read (grub_disk_t disk, grub_disk_addr_t sector,
 
   /* XXX: Never reached.  */
   return GRUB_ERR_NONE;
+
+#if 0 /* Workaround - it works - but very slowly, from some reason
+       * unknown to me (specially on OHCI). Do not use it. */
+  /* Split transfer requests to device sector size because */
+  /* some devices are not able to transfer more than 512-1024 bytes */
+  grub_err_t err = GRUB_ERR_NONE;
+
+  for ( ; size; size--)
+    {
+      /* Depending on the type, select a read function.  */
+      switch (scsi->devtype)
+        {
+          case grub_scsi_devtype_direct:
+            err = grub_scsi_read10 (disk, sector, 1, buf);
+            break;
+
+          case grub_scsi_devtype_cdrom:
+            err = grub_scsi_read12 (disk, sector, 1, buf);
+            break;
+
+          default: /* This should not happen */
+            return GRUB_ERR_READ_ERROR;
+        }
+      if (err)
+        return err;
+      sector++;
+      buf += scsi->blocksize;
+    }
+
+  return err;
+#endif
 }
 
 static grub_err_t
diff --git a/disk/usbms.c b/disk/usbms.c
index 7b719fb84..a49b30e7e 100644
--- a/disk/usbms.c
+++ b/disk/usbms.c
@@ -253,6 +253,7 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
   struct grub_usbms_csw status;
   static grub_uint32_t tag = 0;
   grub_usb_err_t err = GRUB_USB_ERR_NONE;
+  grub_usb_err_t errCSW = GRUB_USB_ERR_NONE;
   int retrycnt = 3 + 1;
   grub_size_t i;
 
@@ -290,9 +291,8 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
     {
       if (err == GRUB_USB_ERR_STALL)
 	{
-	  grub_usb_clear_halt (dev->dev, dev->in->endp_addr);
 	  grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
-	  goto retry;
+	  goto CheckCSW;
 	}
       return grub_error (GRUB_ERR_IO, "USB Mass Storage request failed");
     }
@@ -302,7 +302,12 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
     {
       err = grub_usb_bulk_read (dev->dev, dev->in->endp_addr, size, buf);
       grub_dprintf ("usb", "read: %d %d\n", err, GRUB_USB_ERR_STALL); 
-      if (err) goto CheckCSW;
+      if (err)
+        {
+          if (err == GRUB_USB_ERR_STALL)
+	    grub_usb_clear_halt (dev->dev, dev->in->endp_addr);
+          goto CheckCSW;
+        }
       /* Debug print of received data. */
       grub_dprintf ("usb", "buf:\n");
       if (size <= 64)
@@ -316,6 +321,12 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
       err = grub_usb_bulk_write (dev->dev, dev->out->endp_addr, size, buf);
       grub_dprintf ("usb", "write: %d %d\n", err, GRUB_USB_ERR_STALL);
       grub_dprintf ("usb", "buf:\n");
+      if (err)
+        {
+          if (err == GRUB_USB_ERR_STALL)
+	    grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
+          goto CheckCSW;
+        }
       /* Debug print of sent data. */
       if (size <= 256)
         for (i=0; i<size; i++)
@@ -326,15 +337,16 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
 
   /* Read the status - (maybe) according to specification.  */
 CheckCSW:
-  err = grub_usb_bulk_read (dev->dev, dev->in->endp_addr,
+  errCSW = grub_usb_bulk_read (dev->dev, dev->in->endp_addr,
 		    sizeof (status), (char *) &status);
-  if (err)
+  if (errCSW)
     {
       grub_usb_clear_halt (dev->dev, dev->in->endp_addr);
-      err = grub_usb_bulk_read (dev->dev, dev->in->endp_addr,
+      errCSW = grub_usb_bulk_read (dev->dev, dev->in->endp_addr,
 			        sizeof (status), (char *) &status);
-      if (err)
+      if (errCSW)
         { /* Bulk-only reset device. */
+          grub_dprintf ("usb", "Bulk-only reset device - errCSW\n");
           grub_usbms_reset (dev->dev, dev->interface);
           grub_usb_clear_halt (dev->dev, dev->in->endp_addr);
           grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
@@ -347,9 +359,11 @@ CheckCSW:
   	status.signature, status.tag, status.residue);
   grub_dprintf ("usb", "CSW: status=0x%02x\n", status.status);
   
-  /* If phase error, do bulk-only reset device. */
-  if (status.status == 2)
-    {
+  /* If phase error or not valid signature, do bulk-only reset device. */
+  if ((status.status == 2) ||
+      (status.signature != grub_cpu_to_le32(0x53425355)))
+    { /* Bulk-only reset device. */
+      grub_dprintf ("usb", "Bulk-only reset device - bad status\n");
       grub_usbms_reset (dev->dev, dev->interface);
       grub_usb_clear_halt (dev->dev, dev->in->endp_addr);
       grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
@@ -357,9 +371,13 @@ CheckCSW:
       goto retry;
     }
 
-  if (status.status)
+  /* If "command failed" status or data transfer failed -> error */
+  if ((status.status || err) && !read_write)
     return grub_error (GRUB_ERR_READ_ERROR,
 		       "error communication with USB Mass Storage device");
+  else if ((status.status || err) && read_write)
+    return grub_error (GRUB_ERR_WRITE_ERROR,
+		       "error communication with USB Mass Storage device");
 
   return GRUB_ERR_NONE;
 }
diff --git a/include/grub/usb.h b/include/grub/usb.h
index cbbc39303..64dc78d61 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -35,7 +35,8 @@ typedef enum
     GRUB_USB_ERR_NAK,
     GRUB_USB_ERR_BABBLE,
     GRUB_USB_ERR_TIMEOUT,
-    GRUB_USB_ERR_BITSTUFF
+    GRUB_USB_ERR_BITSTUFF,
+    GRUB_USB_ERR_UNRECOVERABLE
   } grub_usb_err_t;
 
 typedef enum
diff --git a/include/grub/usbtrans.h b/include/grub/usbtrans.h
index cd818e1fc..40fc0dd5f 100644
--- a/include/grub/usbtrans.h
+++ b/include/grub/usbtrans.h
@@ -58,6 +58,9 @@ struct grub_usb_transfer
   struct grub_usb_device *dev;
 
   struct grub_usb_transaction *transactions;
+  
+  int last_trans;
+  /* Index of last processed transaction in OHCI/UHCI driver. */
 };
 typedef struct grub_usb_transfer *grub_usb_transfer_t;
 
diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index 5d76c5e02..69d5709b6 100644
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -18,7 +18,6 @@
  */
 
 #include <grub/term.h>
-#include <grub/machine/console.h>
 #include <grub/time.h>
 #include <grub/cpu/io.h>
 #include <grub/misc.h>

From 0d9ff59345a63087e02bb2415a62ae6cd50a6f42 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 1 Jun 2010 18:05:29 +0100
Subject: [PATCH 1041/1628] * kern/emu/getroot.c
 (find_root_device_from_mountinfo): Use getline instead of fgets into a static
 buffer.  Use sizeof instead of strlen on a constant string.  Thanks to
 Vladimir for review.

---
 ChangeLog.btrfs-probe | 2 +-
 kern/emu/getroot.c    | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.btrfs-probe b/ChangeLog.btrfs-probe
index 77c9995c8..c79e6b6a4 100644
--- a/ChangeLog.btrfs-probe
+++ b/ChangeLog.btrfs-probe
@@ -1,4 +1,4 @@
-2010-05-18  Colin Watson  <cjwatson@ubuntu.com>
+2010-06-01  Colin Watson  <cjwatson@ubuntu.com>
 
 	Add btrfs probing support, currently only in the single-device case.
 
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index da62089fa..97c24115b 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -93,14 +93,15 @@ static char *
 find_root_device_from_mountinfo (const char *dir)
 {
   FILE *fp;
-  char buf[1024];	/* XXX */
+  char *buf = NULL;
+  size_t len = 0;
   char *ret = NULL;
 
   fp = fopen ("/proc/self/mountinfo", "r");
   if (! fp)
     return NULL; /* fall through to other methods */
 
-  while (fgets (buf, sizeof (buf), fp))
+  while (getline (&buf, &len, fp) > 0)
     {
       int mnt_id, parent_mnt_id;
       unsigned int major, minor;
@@ -139,7 +140,7 @@ find_root_device_from_mountinfo (const char *dir)
       if (!sep)
 	continue;
 
-      sep += strlen (" - ");
+      sep += sizeof (" - ") - 1;
       if (sscanf (sep, "%s %s", fstype, device) != 2)
 	continue;
 
@@ -152,6 +153,7 @@ find_root_device_from_mountinfo (const char *dir)
       ret = strdup (device);
     }
 
+  free (buf);
   fclose (fp);
   return ret;
 }

From 3b97788878888b16960c3723d86875a01abc3f2f Mon Sep 17 00:00:00 2001
From: Peter Henn <peter.henn@web.de>
Date: Tue, 1 Jun 2010 18:40:03 +0100
Subject: [PATCH 1042/1628] * disk/mdraid_linux.c (grub_mdraid_detect): Fix
 calculation of 1.x chunk size and disk size, which are already given as
 sector counts as distinct from the 0.90 units.  Fetch the correct device
 number from the role table instead of using the table index.

---
 ChangeLog.raid      | 7 +++++++
 disk/mdraid_linux.c | 7 +++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.raid b/ChangeLog.raid
index 854702f41..989f0bc09 100644
--- a/ChangeLog.raid
+++ b/ChangeLog.raid
@@ -1,3 +1,10 @@
+2009-12-15  Peter Henn  <peter.henn@web.de>
+
+	* disk/mdraid_linux.c (grub_mdraid_detect): Fix calculation of 1.x
+	chunk size and disk size, which are already given as sector counts
+	as distinct from the 0.90 units.  Fetch the correct device number
+	from the role table instead of using the table index.
+ 
 2009-11-16  Felix Zielcke  <fzielcke@z-51.de>
 
 	* disk/mdraid_linux.c (grub_mdraid_detect): Remove a wrong call
diff --git a/disk/mdraid_linux.c b/disk/mdraid_linux.c
index d29803719..08e10ab45 100644
--- a/disk/mdraid_linux.c
+++ b/disk/mdraid_linux.c
@@ -371,9 +371,12 @@ superblock_0_90:
   array->level = grub_le_to_cpu32 (sb_1x->level);
   array->layout = grub_le_to_cpu32 (sb_1x->layout);
   array->total_devs = grub_le_to_cpu32 (sb_1x->raid_disks);
-  array->disk_size = grub_le_to_cpu64 (sb_1x->size) * 2;
+  array->disk_size = grub_le_to_cpu64 (sb_1x->size);
   array->chunk_size = grub_le_to_cpu32 (sb_1x->chunksize);
-  array->index = grub_le_to_cpu32 (sb_1x->dev_number);
+  if (grub_le_to_cpu32 (sb_1x->dev_number) < grub_le_to_cpu32 (sb_1x->max_dev))
+    array->index = grub_le_to_cpu16 (sb_1x->dev_roles[grub_le_to_cpu32 (sb_1x->dev_number)]);
+  else
+    array->index = 0xffff;  /* disk will be later not used! */
   array->uuid_len = 16;
   array->uuid = grub_malloc (16);
   if (!array->uuid)

From e726afa89d8fabd1c962655b7a1e2d0bdbaa0e3d Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Tue, 1 Jun 2010 18:40:45 +0100
Subject: [PATCH 1043/1628] fix indentation

---
 disk/raid.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/disk/raid.c b/disk/raid.c
index 07ae606b9..d6a1f1d48 100644
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -562,16 +562,16 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
 	 Use it directly as GRUB device.  */
       if (! array->name)
 	{
-	array->name = grub_malloc (13);
-	if (! array->name)
-	  {
-	    grub_free (array->uuid);
-	    grub_free (array);
+	  array->name = grub_malloc (13);
+	  if (! array->name)
+	    {
+	      grub_free (array->uuid);
+	      grub_free (array);
 
-	    return grub_errno;
-	  }
-	grub_sprintf (array->name, "md%d", array->number);
-      }
+	      return grub_errno;
+	    }
+	  grub_sprintf (array->name, "md%d", array->number);
+	}
       else
 	grub_sprintf (array->name, "%s", array->name);
 

From 390b0676c482abcc47c70a530b2bf4edb10f7479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ale=C5=A1=20Nesrsta?= <starous@volny.cz>
Date: Wed, 2 Jun 2010 02:04:45 +0200
Subject: [PATCH 1044/1628] Use dev->descdev.maxsize0 even if dev->initialized
 isn't set

---
 bus/usb/usbtrans.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bus/usb/usbtrans.c b/bus/usb/usbtrans.c
index b3ee167a1..e1b9097e6 100644
--- a/bus/usb/usbtrans.c
+++ b/bus/usb/usbtrans.c
@@ -76,7 +76,7 @@ grub_usb_control_msg (grub_usb_device_t dev,
   setupdata_addr = grub_dma_get_phys (setupdata_chunk);
 
   /* Determine the maximum packet size.  */
-  if (dev->initialized && dev->descdev.maxsize0)
+  if (dev->descdev.maxsize0)
     max = dev->descdev.maxsize0;
   else
     max = 64;

From ab6316112cc0ea4149168972c47f75b57a7b9eeb Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 2 Jun 2010 01:23:34 +0100
Subject: [PATCH 1045/1628] * conf/any-emu.rmk (kernel_img_SOURCES) [!x86]:
 Include kern/$(target_cpu)/cache.S even if TARGET_NO_MODULES = yes.

---
 ChangeLog        | 5 +++++
 conf/any-emu.rmk | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index de0b62f08..d88c510eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* conf/any-emu.rmk (kernel_img_SOURCES) [!x86]: Include
+	kern/$(target_cpu)/cache.S even if TARGET_NO_MODULES = yes.
+
 2010-06-01  Colin Watson  <cjwatson@ubuntu.com>
 
 	Add btrfs probing support, currently only in the single-device case.
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 000996172..21e139a32 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -20,14 +20,14 @@ TARGET_NO_STRIP = yes
 
 ifneq ($(TARGET_NO_MODULES), yes)
 kernel_img_SOURCES += symlist.c kern/$(target_cpu)/dl.c
+else
+kernel_img_SOURCES += grub_emu_init.c
+endif
 ifneq ($(target_cpu), i386)
 ifneq ($(target_cpu), x86_64)
 kernel_img_SOURCES += kern/$(target_cpu)/cache.S
 endif
 endif
-else
-kernel_img_SOURCES += grub_emu_init.c
-endif
 
 # For halt.mod.
 pkglib_MODULES += halt.mod

From 9121567e16cf77ccd1f4a148580718436101c247 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Wed, 2 Jun 2010 02:37:55 +0100
Subject: [PATCH 1046/1628] * commands/gptsync.c (grub_cmd_gptsync): Fix typos.
 (GRUB_MOD_INIT): Fix capitalisation. * docs/grub.texi (Command-line and menu
 entry commands): Document gettext and gptsync commands.

---
 ChangeLog          |  7 +++++++
 commands/gptsync.c |  8 ++++----
 docs/grub.texi     | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d88c510eb..9c11b2fa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* commands/gptsync.c (grub_cmd_gptsync): Fix typos.
+	(GRUB_MOD_INIT): Fix capitalisation.
+	* docs/grub.texi (Command-line and menu entry commands): Document
+	gettext and gptsync commands.
+
 2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* conf/any-emu.rmk (kernel_img_SOURCES) [!x86]: Include
diff --git a/commands/gptsync.c b/commands/gptsync.c
index d217b5d5c..6364c13f7 100644
--- a/commands/gptsync.c
+++ b/commands/gptsync.c
@@ -138,8 +138,8 @@ grub_cmd_gptsync (grub_command_t cmd __attribute__ ((unused)),
 	{
 	  grub_device_close (dev);
 	  return grub_error (GRUB_ERR_OUT_OF_RANGE,
-			     "only partitions resding in the first 2TB "
-			     "can be presen in hybrid MBR");
+			     "only partitions residing in the first 2TB "
+			     "can be present in hybrid MBR");
 	}
 
 
@@ -243,8 +243,8 @@ GRUB_MOD_INIT(gptsync)
   cmd = grub_register_command ("gptsync", grub_cmd_gptsync,
 			       N_("DEVICE [PARTITION[+/-[TYPE]]] ..."),
 			       N_("Fill hybrid MBR of GPT drive DEVICE. "
-			       "specified partitions will be a part "
-			       "of hybrid mbr. Up to 3 partitions are "
+			       "Specified partitions will be a part "
+			       "of hybrid MBR. Up to 3 partitions are "
 			       "allowed. TYPE is an MBR type. "
 			       "+ means that partition is active. "
 			       "Only one partition can be active."));
diff --git a/docs/grub.texi b/docs/grub.texi
index bcc05c1f8..52aca3fbd 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1139,6 +1139,8 @@ you forget a command, you can run the command @command{help}
 * date::                        Display or set current date and time
 * echo::                        Display a line of text
 * export::                      Export an environment variable
+* gettext::                     Translate a string
+* gptsync::                     Fill an MBR based on GPT entries
 * halt::                        Shut down your computer
 * help::                        Show help messages
 * insmod::                      Insert a module
@@ -1320,6 +1322,38 @@ to subsidiary configuration files loaded using @command{configfile}.
 @end deffn
 
 
+@node gettext
+@subsection gettext
+
+@deffn Command gettext string
+Translate @var{string} into the current language.
+
+The current language code is stored in the @samp{lang} variable in GRUB's
+environment.  Translation files in MO format are read from
+@samp{locale_dir}, usually @file{/boot/grub/locale}.
+@end deffn
+
+
+@node gptsync
+@subsection gptsync
+
+@deffn Command gptsync device [partition[+/-[type]]] @dots{}
+Disks using the GUID Partition Table (GPT) also have a legacy Master Boot
+Record (MBR) partition table for compatibility with the BIOS and with older
+operating systems.  The legacy MBR can only represent a limited subset of
+GPT partition entries.
+
+This command populates the legacy MBR with the specified @var{partition}
+entries on @var{device}.  Up to three partitions may be used.
+
+@var{type} is an MBR partition type code; prefix with @samp{0x} if you want
+to enter this in hexadecimal.  The separator between @var{partition} and
+@var{type} may be @samp{+} to make the partition active, or @samp{-} to make
+it inactive; only one partition may be active.  If both the separator and
+type are omitted, then the partition will be inactive.
+@end deffn
+
+
 @node halt
 @subsection halt
 

From 34c9f0e949cfadddd88a8229f4d10184f3263646 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 2 Jun 2010 02:50:04 +0100
Subject: [PATCH 1047/1628] * docs/grub.texi (direntry): Remove grub-terminfo
 reference. (GNU GRUB manual): Likewise. (General commands): Update
 description of `terminfo' for GRUB 2.

---
 ChangeLog      |  6 ++++++
 docs/grub.texi | 21 +++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9c11b2fa9..8a6f98be1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (direntry): Remove grub-terminfo reference.
+	(GNU GRUB manual): Likewise.
+	(General commands): Update description of `terminfo' for GRUB 2.
+
 2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* commands/gptsync.c (grub_cmd_gptsync): Fix typos.
diff --git a/docs/grub.texi b/docs/grub.texi
index 52aca3fbd..657a5d146 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -34,9 +34,6 @@ Invariant Sections.
 @direntry
 * GRUB: (grub).                 The GRand Unified Bootloader
 * grub-install: (grub)Invoking grub-install.    Install GRUB on your drive
-* grub-terminfo: (grub)Invoking grub-terminfo.  Generate a terminfo
-                                                command from a
-                                                terminfo name
 @end direntry
 
 @setchapternewpage odd
@@ -89,7 +86,6 @@ This edition documents version @value{VERSION}.
 * Troubleshooting::             Error messages produced by GRUB
 * Invoking the grub shell::     How to use the grub shell
 * Invoking grub-install::       How to use the GRUB installer
-* Invoking grub-terminfo::      How to generate a terminfo command
 * Obtaining and Building GRUB:: How to obtain and build GRUB
 * Reporting bugs::              Where you should send a bug report
 * Future::                      Some future plans on GRUB
@@ -1076,7 +1072,7 @@ Commands usable anywhere in the menu and in the command-line.
 
 @menu
 * serial::                      Set up a serial device
-* terminfo::                    Define escape sequences for a terminal
+* terminfo::                    Define terminal type
 @end menu
 
 
@@ -1108,15 +1104,16 @@ support. See also @ref{Serial terminal}.
 @node terminfo
 @subsection terminfo
 
-@deffn Command terminfo @option{--name=name} @option{--cursor-address=seq} [@option{--clear-screen=seq}] [@option{--enter-standout-mode=seq}] [@option{--exit-standout-mode=seq}]
-Define the capabilities of your terminal. Use this command to define
-escape sequences, if it is not vt100-compatible. You may use @samp{\e}
-for @key{ESC} and @samp{^X} for a control character.
+@deffn Command terminfo [term]
+Define the capabilities of your terminal by giving the name of an entry in
+the terminfo database, which should correspond roughly to a @samp{TERM}
+environment variable in Unix.
 
-You can use the utility @command{grub-terminfo} to generate
-appropriate arguments to this command. @xref{Invoking grub-terminfo}.
+At the moment, only @samp{vt100} is supported in GRUB 2.  If you need other
+terminal types, please contact us to discuss the best way to include support
+for these in GRUB.
 
-If no option is specified, the current settings are printed.
+If no option is specified, the current terminal type is printed.
 @end deffn
 
 

From a18c78347304d00b521556ccc76d4c8564d417b0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Jun 2010 04:51:35 +0200
Subject: [PATCH 1048/1628] Fewstylistic fixes

---
 bus/usb/ohci.c | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index ac6f61ee8..de0a4e7ac 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -594,10 +594,10 @@ grub_ohci_transfer (grub_usb_controller_t dev,
     }
 
   grub_dprintf ("ohci", "wait for completion\n");
-  grub_dprintf ("ohci",
-		"begin: control=0x%02x status=0x%02x\n\t\t intstatus=0x%02x\n",
+  grub_dprintf ("ohci", "begin: control=0x%02x status=0x%02x\n",
 		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL),
-		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS),
+		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS));
+  grub_dprintf ("ohci","intstatus=0x%02x\n",
 		grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS));
 
   /* Safety measure to avoid a hang. */
@@ -621,7 +621,7 @@ grub_ohci_transfer (grub_usb_controller_t dev,
           if (tderr_addr == td_list_addr
 	      + sizeof (td_list[0]) * (transfer->transcnt - 1))
             break;
-           continue;
+	  continue;
         }
 
       if ((intstatus & 0x10) != 0)
@@ -651,9 +651,10 @@ grub_ohci_transfer (grub_usb_controller_t dev,
     }
   while (1);
 
-  grub_dprintf ("ohci", "end: control=0x%02x status=0x%02x\n\t\t intstatus=0x%02x\n",
+  grub_dprintf ("ohci", "end: control=0x%02x status=0x%02x\n",
 		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL),
-		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS),
+		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS));
+  grub_dprintf ("ohci", "intstatus=0x%02x\n",
 		grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS));
 
   if (!tderr_addr)
@@ -688,21 +689,22 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   if (err_timeout)
     {
       err = GRUB_ERR_TIMEOUT;
-      grub_dprintf("ohci", "Timeout, target=%08x, head=%08x\n\t\ttail=%08x, next=%08x\n",
-      grub_le_to_cpu32(ed->target),
-      grub_le_to_cpu32(ed->td_head),
-      grub_le_to_cpu32(ed->td_tail),
-      grub_le_to_cpu32(ed->next_ed));
+      grub_dprintf("ohci", "Timeout, target=%08x, head=%08x\n",
+		   grub_le_to_cpu32(ed->target),
+		   grub_le_to_cpu32(ed->td_head));
+      grub_dprintf("ohci", "tail=%08x, next=%08x\n",
+		   grub_le_to_cpu32(ed->td_tail),
+		   grub_le_to_cpu32(ed->next_ed));
     }
   /* In case of unrecoverable error do not detect error from TD */    
   else if (err_unrec)
     {
       err = GRUB_USB_ERR_UNRECOVERABLE;
       grub_dprintf("ohci",
-		   "Unrecoverable error, target=%08x, head=%08x\n"
-		   "\t\ttail=%08x, next=%08x\n",
+		   "Unrecoverable error, target=%08x, head=%08x\n",
 		   grub_le_to_cpu32(ed->target),
-		   grub_le_to_cpu32(ed->td_head),
+		   grub_le_to_cpu32(ed->td_head));
+      grub_dprintf("ohci", "tail=%08x, next=%08x\n",
 		   grub_le_to_cpu32(ed->td_tail),
 		   grub_le_to_cpu32(ed->next_ed));
     }

From 2325800310ce4ac9a5088f5c3fca68e44155e145 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Jun 2010 04:52:35 +0200
Subject: [PATCH 1049/1628] Fix last_trans determination

---
 bus/usb/ohci.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index de0a4e7ac..4d66df0bc 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -671,15 +671,21 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   
   /* Remember last processed transaction (TD) - it is necessary for
    * proper setting of toggle bit in next transaction. */
-  transfer->last_trans = (tderr_addr - td_list_addr) / sizeof (*td_list);
-  
+  transfer->last_trans = ((tderr_addr - td_list_addr) / sizeof (*td_list));
+  grub_dprintf("ohci", "tderr_addr=0x%x, td_list_addr=0x%x,\n",
+	       tderr_addr, td_list_addr);
+
+  if ((ed->td_head & ~0xf) == (ed->td_tail & ~0xf))
+    transfer->last_trans = transfer->transcnt - 1;
+
   /* Check correct value in last_trans */
   /* It could happen if timeout happens and no TD was retired */
   if (transfer->last_trans >= transfer->transcnt || !tderr_addr)
     {
-      grub_dprintf("ohci", "tder==0 or out of TDs range!\n");
-      grub_dprintf("ohci", "tderr_addr=0x%x, td_list=%p,\n\t\t last_trans=%d, transcnt=%d\n",
-                   tderr_addr, td_list, transfer->last_trans, transfer->transcnt);
+      grub_dprintf("ohci", "tderr==0 or out of TDs range!\n");
+      grub_dprintf("ohci", "last_trans=%d, transcnt=%d\n",
+		   transfer->last_trans, transfer->transcnt);
+
       /* We should set something valid... */
       transfer->last_trans = -1; /* Probably no TD done */
       tderr_addr = td_list_addr;
@@ -713,6 +719,8 @@ grub_ohci_transfer (grub_usb_controller_t dev,
       grub_uint8_t errcode;
       grub_ohci_td_t tderr = NULL;
 
+      transfer->last_trans--;
+
       tderr = (grub_ohci_td_t) ((char *) td_list
 				+ (tderr_addr - td_list_addr));
  

From f1cb760c99f77795f1c91f11f8157d6984f4593f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Jun 2010 04:52:52 +0200
Subject: [PATCH 1050/1628] Disable unused list

---
 bus/usb/ohci.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 4d66df0bc..fd378cc8d 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -563,9 +563,14 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, ed_addr);
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKCURR, 0);
 
+#define GRUB_OHCI_REG_CONTROL_BULK_ENABLE (1 << 5)
+#define GRUB_OHCI_REG_CONTROL_CONTROL_ENABLE (1 << 4)
+
 	/* Enable the Bulk list.  */
 	control = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL);
-	control |= 1 << 5;
+	control |= GRUB_OHCI_REG_CONTROL_BULK_ENABLE;
+	control &= ~GRUB_OHCI_REG_CONTROL_CONTROL_ENABLE;
+
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, control);
 
 	/* Set BulkListFilled.  */
@@ -578,12 +583,15 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 
     case GRUB_USB_TRANSACTION_TYPE_CONTROL:
       {
+	grub_dprintf ("ohci", "add to control list\n");
+
 	/* Set ControlList Head and Current */
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, ed_addr);
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLCURR, 0);
 
 	/* Enable the Control list.  */
-	control |= 1 << 4;
+	control |= GRUB_OHCI_REG_CONTROL_CONTROL_ENABLE;
+	control &= ~GRUB_OHCI_REG_CONTROL_BULK_ENABLE;
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, control);
 
 	/* Set ControlListFilled.  */

From d4955444976a90377d0ff9d8140bb906c2c36f46 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Jun 2010 05:00:54 +0200
Subject: [PATCH 1051/1628] Shut down PHCI controller harder

---
 bus/usb/ohci.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index fd378cc8d..a42d9fee1 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -970,7 +970,10 @@ grub_ohci_fini_hw (int noreturn __attribute__ ((unused)))
       grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, 0);
       grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKCURR, 0);
       grub_ohci_writereg32 (o, GRUB_OHCI_REG_DONEHEAD, 0);
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, 0);
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, 1);
     }
+  grub_millisleep (10);
 
   return GRUB_ERR_NONE;
 }

From e5089776308459f799a0c6fc8be6a512373a6417 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 2 Jun 2010 13:51:05 +0530
Subject: [PATCH 1052/1628] review fixes

---
 commands/parttool.c     |  6 ++++++
 configure.ac            | 44 ++++++++++++++++++++---------------------
 include/grub/cache.h    |  3 +--
 include/grub/emu/misc.h |  3 +++
 include/grub/misc.h     |  3 ---
 kern/emu/cache.S        | 12 ++++-------
 kern/emu/lite.c         | 12 +++++------
 kern/emu/main.c         |  3 +++
 kern/main.c             |  2 --
 normal/main.c           |  6 ++++++
 10 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/commands/parttool.c b/commands/parttool.c
index f2a62e581..3dbe129bf 100644
--- a/commands/parttool.c
+++ b/commands/parttool.c
@@ -31,6 +31,10 @@
 #include <grub/command.h>
 #include <grub/i18n.h>
 
+#if defined (GRUB_MACHINE_EMU)
+#include <grub/emu/misc.h>
+#endif
+
 static struct grub_parttool *parts = 0;
 static int curhandle = 0;
 static grub_dl_t mymod;
@@ -175,7 +179,9 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
     }
 
   /* Load modules. */
+#if defined(GRUB_MACHINE_EMU)
   if (! grub_no_autoload)
+#endif
   {
     const char *prefix;
     prefix = grub_env_get ("prefix");
diff --git a/configure.ac b/configure.ac
index 12f89d85e..4cfa29308 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,12 +54,14 @@ case "$target_cpu" in
   amd64)	target_cpu=x86_64 ;;
   sparc)	target_cpu=sparc64 ;;
   mipsel|mips64el)
-                target_cpu=mips;
-		cpu_CPPFLAGS="-DGRUB_CPU_MIPSEL=1";
+                target_cpu=mips;    
+		TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPSEL=1"; 
+		CFLAGS="$CFLAGS -DGRUB_CPU_MIPSEL=1";
 		;;
   mips|mips64)
-                target_cpu=mips;
-		cpu_CPPFLAGS="-DGRUB_CPU_MIPS=1";
+                target_cpu=mips;    
+		TARGET_CFLAGS="$TARGET_CFLAGS -DGRUB_CPU_MIPS=1"; 
+		CFLAGS="$CFLAGS -DGRUB_CPU_MIPS=1";
 		;;
 esac
 
@@ -134,29 +136,25 @@ case "$host_os" in
 esac
 
 case "$platform" in
-  coreboot)	machine_CPPFLAGS="-DGRUB_MACHINE_COREBOOT=1" ;;
-  multiboot)	machine_CPPFLAGS="-DGRUB_MACHINE_MULTIBOOT=1" ;;
-  efi)		machine_CPPFLAGS="-DGRUB_MACHINE_EFI=1" ;;
-  ieee1275)	machine_CPPFLAGS="-DGRUB_MACHINE_IEEE1275=1" ;;
-  qemu)		machine_CPPFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
-  pc)		machine_CPPFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
-  emu)		machine_CPPFLAGS="-DGRUB_MACHINE_EMU=1" ;;
-  yeeloong)	machine_CPPFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
-  qemu-mips)	machine_CPPFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  coreboot)	machine_CFLAGS="-DGRUB_MACHINE_COREBOOT=1" ;;
+  multiboot)	machine_CFLAGS="-DGRUB_MACHINE_MULTIBOOT=1" ;;
+  efi)		machine_CFLAGS="-DGRUB_MACHINE_EFI=1" ;;
+  ieee1275)	machine_CFLAGS="-DGRUB_MACHINE_IEEE1275=1" ;;
+  qemu)		machine_CFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
+  pc)		machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
+  emu)		machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
+  yeeloong)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  qemu-mips)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
 esac
 case "$target_cpu" in
-  i386)         cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_I386";;
-  x86_64)       cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_X86_64";;
-  powerpc)      cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_POWERPC";;
-  mips)      	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS=1" ;; # cpu_CPPFLAGS handled above
-  sparc64)      cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_SPARC64";
-                machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
+  mips)      	machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_MIPS=1" ;;
+  sparc64)      machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
 esac
-machine_CPPFLAGS="$machine_CPPFLAGS -DMACHINE=`echo ${target_cpu}_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`"
+machine_CFLAGS="$machine_CFLAGS -DMACHINE=`echo ${target_cpu}_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`"
 
-CPPFLAGS="$CPPFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
-TARGET_ASFLAGS="$TARGET_ASFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
-TARGET_CFLAGS="$TARGET_CFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
+CFLAGS="$CFLAGS $machine_CFLAGS"
+TARGET_ASFLAGS="$TARGET_ASFLAGS $machine_CFLAGS"
+TARGET_CFLAGS="$TARGET_CFLAGS $machine_CFLAGS"
 
 AC_SUBST(host_cpu)
 AC_SUBST(host_os)
diff --git a/include/grub/cache.h b/include/grub/cache.h
index a54bc00f8..27e44f0a2 100644
--- a/include/grub/cache.h
+++ b/include/grub/cache.h
@@ -23,8 +23,7 @@
 #include <grub/symbol.h>
 #include <grub/types.h>
 
-#if defined (__i386__) || defined (__x86_64__) || \
-  (defined (GRUB_MACHINE_EMU) && GRUB_MACHINE_EMU)
+#if defined (__i386__) || defined (__x86_64__)
 static inline void
 grub_arch_sync_caches (void *address __attribute__ ((unused)),
 		       grub_size_t len __attribute__ ((unused)))
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index bad00de71..32a5e29f8 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -49,4 +49,7 @@ int EXPORT_FUNC(asprintf) (char **buf, const char *fmt, ...);
 char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
 extern char * canonicalize_file_name (const char *path);
 
+/* Flag to control module autoloading in normal mode.  */
+extern int EXPORT_VAR(grub_no_autoload);
+
 #endif /* GRUB_EMU_MISC_H */
diff --git a/include/grub/misc.h b/include/grub/misc.h
index 1ec8bbc5a..9bfc6974e 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -50,9 +50,6 @@
 /* XXX: If grub_memmove is too slow, we must implement grub_memcpy.  */
 #define grub_memcpy(d,s,n)	grub_memmove ((d), (s), (n))
 
-/* Flag to control module autoloading in normal mode.  */
-extern int EXPORT_VAR(grub_no_autoload);
-
 void *EXPORT_FUNC(grub_memmove) (void *dest, const void *src, grub_size_t n);
 char *EXPORT_FUNC(grub_strcpy) (char *dest, const char *src);
 char *EXPORT_FUNC(grub_strncpy) (char *dest, const char *src, int c);
diff --git a/kern/emu/cache.S b/kern/emu/cache.S
index 9975578b8..90a5b5396 100644
--- a/kern/emu/cache.S
+++ b/kern/emu/cache.S
@@ -2,17 +2,13 @@
 #error "This source is only meant for grub-emu platform"
 #endif
 
-#if defined(GRUB_CPU_I386)
+#if defined(__i386__) || defined(__x86_64__)
 /* Nothing is necessary.  */
-#elif defined(GRUB_CPU_X86_64)
-/* Nothing is necessary.  */
-#elif defined(GRUB_CPU_SPARC64)
+#elif defined(__sparc__)
 #include "../sparc64/cache.S"
-#elif defined(GRUB_CPU_MIPS)
+#elif defined(__mips__)
 #include "../mips/cache.S"
-#elif defined(GRUB_CPU_MIPSEL)
-#include "../mips/cache.S"
-#elif defined(GRUB_CPU_POWERPC)
+#elif defined(__powerpc__)
 #include "../powerpc/cache.S"
 #else
 #error "No target cpu type is defined"
diff --git a/kern/emu/lite.c b/kern/emu/lite.c
index 884ddee10..9b3728717 100644
--- a/kern/emu/lite.c
+++ b/kern/emu/lite.c
@@ -5,17 +5,15 @@
 #error "This source is only meant for grub-emu platform"
 #endif
 
-#if defined(GRUB_CPU_I386)
+#if defined(__i386__)
 #include "../i386/dl.c"
-#elif defined(GRUB_CPU_X86_64)
+#elif defined(__x86_64__)
 #include "../x86_64/dl.c"
-#elif defined(GRUB_CPU_SPARC64)
+#elif defined(__sparc__)
 #include "../sparc64/dl.c"
-#elif defined(GRUB_CPU_MIPS)
+#elif defined(__mips__)
 #include "../mips/dl.c"
-#elif defined(GRUB_CPU_MIPSEL)
-#include "../mips/dl.c"
-#elif defined(GRUB_CPU_POWERPC)
+#elif defined(__powerpc__)
 #include "../powerpc/dl.c"
 #else
 #error "No target cpu type is defined"
diff --git a/kern/emu/main.c b/kern/emu/main.c
index 8d6118c93..1915e1a7c 100644
--- a/kern/emu/main.c
+++ b/kern/emu/main.c
@@ -51,6 +51,9 @@ static jmp_buf main_env;
 /* Store the prefix specified by an argument.  */
 static char *prefix = NULL;
 
+/* Flag to control module autoloading in normal mode.  */
+int grub_no_autoload;
+
 grub_addr_t
 grub_arch_modules_addr (void)
 {
diff --git a/kern/main.c b/kern/main.c
index 2541d3295..1fdf4ab07 100644
--- a/kern/main.c
+++ b/kern/main.c
@@ -30,8 +30,6 @@
 #include <grub/reader.h>
 #include <grub/parser.h>
 
-int grub_no_autoload;
-
 void
 grub_module_iterate (int (*hook) (struct grub_module_header *header))
 {
diff --git a/normal/main.c b/normal/main.c
index b3544b99f..d1e95d9b5 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -32,6 +32,10 @@
 #include <grub/i18n.h>
 #include <grub/charset.h>
 
+#if defined (GRUB_MACHINE_EMU)
+#include <grub/emu/misc.h>
+#endif
+
 #define GRUB_DEFAULT_HISTORY_SIZE	50
 
 static int nested_level = 0;
@@ -476,7 +480,9 @@ grub_normal_init_page (struct grub_term_output *term)
 static void
 read_lists (const char *val)
 {
+#if defined(GRUB_MACHINE_EMU)
   if (! grub_no_autoload)
+#endif
     {
       read_command_list (val);
       read_fs_list (val);

From 6d6f13934992f6f59b626b0fab49ef260659a112 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 2 Jun 2010 14:45:07 +0530
Subject: [PATCH 1053/1628] review fixes

---
 commands/parttool.c     | 6 ------
 include/grub/dl.h       | 6 +++---
 include/grub/emu/misc.h | 3 ---
 include/grub/misc.h     | 7 +++++++
 kern/emu/main.c         | 1 -
 normal/main.c           | 6 ------
 6 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/commands/parttool.c b/commands/parttool.c
index 3dbe129bf..f2a62e581 100644
--- a/commands/parttool.c
+++ b/commands/parttool.c
@@ -31,10 +31,6 @@
 #include <grub/command.h>
 #include <grub/i18n.h>
 
-#if defined (GRUB_MACHINE_EMU)
-#include <grub/emu/misc.h>
-#endif
-
 static struct grub_parttool *parts = 0;
 static int curhandle = 0;
 static grub_dl_t mymod;
@@ -179,9 +175,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
     }
 
   /* Load modules. */
-#if defined(GRUB_MACHINE_EMU)
   if (! grub_no_autoload)
-#endif
   {
     const char *prefix;
     prefix = grub_env_get ("prefix");
diff --git a/include/grub/dl.h b/include/grub/dl.h
index 9d5f2af2d..b66b7641e 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -95,13 +95,13 @@ int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);
 int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);
 void EXPORT_FUNC(grub_dl_iterate) (int (*hook) (grub_dl_t mod));
 grub_dl_t EXPORT_FUNC(grub_dl_get) (const char *name);
-grub_err_t EXPORT_FUNC(grub_dl_register_symbol) (const char *name, void *addr,
-						 grub_dl_t mod);
+grub_err_t grub_dl_register_symbol (const char *name, void *addr,
+				    grub_dl_t mod);
 
 grub_err_t grub_arch_dl_check_header (void *ehdr);
 grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
 
-#if defined (_mips) && (! defined (GRUB_MACHINE_EMU) || ! GRUB_MACHINE_EMU)
+#if defined (_mips)
 #define GRUB_LINKER_HAVE_INIT 1
 void grub_arch_dl_init_linker (void);
 #endif
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index 32a5e29f8..bad00de71 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -49,7 +49,4 @@ int EXPORT_FUNC(asprintf) (char **buf, const char *fmt, ...);
 char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
 extern char * canonicalize_file_name (const char *path);
 
-/* Flag to control module autoloading in normal mode.  */
-extern int EXPORT_VAR(grub_no_autoload);
-
 #endif /* GRUB_EMU_MISC_H */
diff --git a/include/grub/misc.h b/include/grub/misc.h
index 9bfc6974e..077069934 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -308,4 +308,11 @@ void EXPORT_FUNC (grub_halt) (int no_apm);
 void EXPORT_FUNC (grub_halt) (void);
 #endif
 
+#ifdef GRUB_MACHINE_EMU
+/* Flag to control module autoloading in normal mode.  */
+extern int EXPORT_VAR(grub_no_autoload);
+#else
+#define grub_no_autoload 0
+#endif
+
 #endif /* ! GRUB_MISC_HEADER */
diff --git a/kern/emu/main.c b/kern/emu/main.c
index 1915e1a7c..e2efd262f 100644
--- a/kern/emu/main.c
+++ b/kern/emu/main.c
@@ -51,7 +51,6 @@ static jmp_buf main_env;
 /* Store the prefix specified by an argument.  */
 static char *prefix = NULL;
 
-/* Flag to control module autoloading in normal mode.  */
 int grub_no_autoload;
 
 grub_addr_t
diff --git a/normal/main.c b/normal/main.c
index d1e95d9b5..b3544b99f 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -32,10 +32,6 @@
 #include <grub/i18n.h>
 #include <grub/charset.h>
 
-#if defined (GRUB_MACHINE_EMU)
-#include <grub/emu/misc.h>
-#endif
-
 #define GRUB_DEFAULT_HISTORY_SIZE	50
 
 static int nested_level = 0;
@@ -480,9 +476,7 @@ grub_normal_init_page (struct grub_term_output *term)
 static void
 read_lists (const char *val)
 {
-#if defined(GRUB_MACHINE_EMU)
   if (! grub_no_autoload)
-#endif
     {
       read_command_list (val);
       read_fs_list (val);

From 288dd6ed3d88420e4fcc28a7aeeef0916c673cd5 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 2 Jun 2010 11:14:02 +0100
Subject: [PATCH 1054/1628] * docs/grub.texi (Configuration): New section,
 documenting configuration file generation using grub-mkconfig.  I've left a
 slot for documenting the full shell scripting format but have not yet started
 on writing that up. (Invoking grub-mkconfig): New section.

---
 ChangeLog      |   8 ++
 docs/grub.texi | 221 ++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 228 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8a6f98be1..214be173c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (Configuration): New section, documenting
+	configuration file generation using grub-mkconfig.  I've left a slot
+	for documenting the full shell scripting format but have not yet
+	started on writing that up.
+	(Invoking grub-mkconfig): New section.
+
 2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (direntry): Remove grub-terminfo reference.
diff --git a/docs/grub.texi b/docs/grub.texi
index 657a5d146..77f151cfc 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -20,7 +20,7 @@
 This manual is for GNU GRUB (version @value{VERSION},
 @value{UPDATED}).
 
-Copyright @copyright{} 1999,2000,2001,2002,2004,2006,2008,2009 Free Software Foundation, Inc.
+Copyright @copyright{} 1999,2000,2001,2002,2004,2006,2008,2009,2010 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -34,6 +34,7 @@ Invariant Sections.
 @direntry
 * GRUB: (grub).                 The GRand Unified Bootloader
 * grub-install: (grub)Invoking grub-install.    Install GRUB on your drive
+* grub-mkconfig: (grub)Invoking grub-mkconfig.  Generate GRUB configuration
 @end direntry
 
 @setchapternewpage odd
@@ -86,6 +87,7 @@ This edition documents version @value{VERSION}.
 * Troubleshooting::             Error messages produced by GRUB
 * Invoking the grub shell::     How to use the grub shell
 * Invoking grub-install::       How to use the GRUB installer
+* Invoking grub-mkconfig::      Generate a GRUB configuration file
 * Obtaining and Building GRUB:: How to obtain and build GRUB
 * Reporting bugs::              Where you should send a bug report
 * Future::                      Some future plans on GRUB
@@ -694,6 +696,197 @@ the size, run the command @command{uppermem} @emph{before} loading the
 kernel. @xref{uppermem}, for more information.
 
 
+@node Configuration
+@chapter Writing your own configuration file
+
+GRUB is configured using @file{grub.cfg}, usually located under
+@file{/boot/grub}.  This file is quite flexible, but most users will not
+need to write the whole thing by hand.
+
+@menu
+* Simple configuration::        Recommended for most users
+* Shell-like scripting::        For power users and developers
+@end menu
+
+
+@node Simple configuration
+@section Simple configuration handling
+
+The program @command{grub-mkconfig} (@pxref{Invoking grub-mkconfig})
+generates @file{grub.cfg} files suitable for most cases.  It is suitable for
+use when upgrading a distribution, and will discover available kernels and
+attempt to generate menu entries for them.
+
+The file @file{/etc/default/grub} controls the operation of
+@command{grub-mkconfig}.  It is sourced by a shell script, and so must be
+valid POSIX shell input; normally, it will just be a sequence of
+@samp{KEY=value} lines, but if the value contains spaces or other special
+characters then it must be quoted.  For example:
+
+@example
+GRUB_TERMINAL_INPUT="console serial"
+@end example
+
+Valid keys in @file{/etc/default/grub} are as follows:
+
+@table @samp
+@item GRUB_DEFAULT
+The default menu entry.  This may be a number, in which case it identifies
+the Nth entry in the generated menu counted from zero, or the full name of a
+menu entry, or the special string @samp{saved}.  Using the full name may be
+useful if you want to set a menu entry as the default even though there may
+be a variable number of entries before it.
+
+If you set this to @samp{saved}, then the default menu entry will be that
+saved by @samp{GRUB_SAVEDEFAULT}, @command{grub-set-default}, or
+@command{grub-reboot}.
+
+The default is @samp{0}.
+
+@item GRUB_SAVEDEFAULT
+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} or @command{grub-reboot}.  Unset by default.
+
+@item GRUB_TIMEOUT
+Boot the default entry this many seconds after the menu is displayed, unless
+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.
+
+@item GRUB_HIDDEN_TIMEOUT
+Wait this many seconds for a key to be pressed before displaying the menu.
+If no key is pressed during that time, boot immediately.  Unset by default.
+
+@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_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}.
+
+@item GRUB_DISTRIBUTOR
+Set by distributors of GRUB to their identifying name.  This is used to
+generate more informative menu entry titles.
+
+@item GRUB_TERMINAL_INPUT
+Select the terminal input device.  You may select multiple devices here,
+separated by spaces.
+
+Valid terminal input names depend on the platform, but may include
+@samp{console} (PC BIOS and EFI consoles), @samp{serial} (serial terminal),
+@samp{ofconsole} (Open Firmware console), @samp{at_keyboard} (PC AT
+keyboard, mainly useful with Coreboot), or @samp{usb_keyboard} (USB keyboard
+using the HID Boot Protocol, for cases where the firmware does not handle
+this).
+
+The default is to use the platform's native terminal input.
+
+@item GRUB_TERMINAL_OUTPUT
+Select the terminal output device.  You may select multiple devices here,
+separated by spaces.
+
+Valid terminal output names depend on the platform, but may include
+@samp{console} (PC BIOS and EFI consoles), @samp{serial} (serial terminal),
+@samp{gfxterm} (graphics-mode output), @samp{ofconsole} (Open Firmware
+console), or @samp{vga_text} (VGA text output, mainly useful with Coreboot).
+
+The default is to use the platform's native terminal input.
+
+@item GRUB_TERMINAL
+If this option is set, it overrides both @samp{GRUB_TERMINAL_INPUT} and
+@samp{GRUB_TERMINAL_OUTPUT} to the same value.
+
+@item GRUB_SERIAL_COMMAND
+A command to configure the serial port when using the serial console.
+@xref{serial}.  Defaults to @samp{serial}.
+
+@item GRUB_CMDLINE_LINUX
+Command-line arguments to add to menu entries for the Linux kernel.
+
+@item GRUB_CMDLINE_LINUX_DEFAULT
+Unless @samp{GRUB_DISABLE_LINUX_RECOVERY} is set, two menu entries will be
+generated for each Linux kernel: one default entry and one entry for
+recovery mode.  This option lists command-line arguments to add only to the
+default menu entry, after those listed in @samp{GRUB_CMDLINE_LINUX}.
+
+@item GRUB_CMDLINE_NETBSD
+@itemx GRUB_CMDLINE_NETBSD_DEFAULT
+As @samp{GRUB_CMDLINE_LINUX} and @samp{GRUB_CMDLINE_LINUX_DEFAULT}, but for
+NetBSD.
+
+@item GRUB_DISABLE_LINUX_UUID
+Normally, @command{grub-mkconfig} will generate menu entries that use
+universally-unique identifiers (UUIDs) to identify the root filesystem to
+the Linux kernel, using a @samp{root=UUID=...} kernel parameter.  This is
+usually more reliable, but in some cases it may not be appropriate.  To
+disable the use of UUIDs, set this option to @samp{true}.
+
+@item GRUB_DISABLE_LINUX_RECOVERY
+Disable the generation of recovery mode menu entries for Linux.
+
+@item GRUB_DISABLE_NETBSD_RECOVERY
+Disable the generation of recovery mode menu entries for NetBSD.
+
+@item GRUB_GFXMODE
+Set the resolution used on the @samp{gfxterm} graphical terminal.  Note that
+you can only use modes which your graphics card supports via VESA BIOS
+Extensions (VBE), so for example native LCD panel resolutions may not be
+available.  The default is @samp{640x480}.
+
+@item GRUB_BACKGROUND
+Set a background image for use with the @samp{gfxterm} graphical terminal.
+The value of this option must be a file readable by GRUB at boot time, and
+it must end with @file{.png}, @file{.tga}, @file{.jpg}, or @file{.jpeg}.
+The image will be scaled if necessary to fit the screen.
+
+@item GRUB_THEME
+Set a theme for use with the @samp{gfxterm} graphical terminal.
+@xref{Themes}.
+
+@item GRUB_GFXPAYLOAD_LINUX
+Set to @samp{text} to force the Linux kernel to boot in normal text mode,
+@samp{keep} to preserve the graphics mode set using @samp{GRUB_GFXMODE},
+@samp{@var{width}x@var{height}}[@samp{x@var{depth}}] to set a particular
+graphics mode, or a sequence of these separated by commas or semicolons to
+try several modes in sequence.
+
+Depending on your kernel, your distribution, your graphics card, and the
+phase of the moon, note that using this option may cause GNU/Linux to suffer
+from various display problems, particularly during the early part of the
+boot sequence.  If you have problems, simply unset this option and GRUB will
+tell Linux to boot in normal text mode.
+
+@item GRUB_DISABLE_OS_PROBER
+Normally, @command{grub-mkconfig} will try to use the external
+@command{os-prober} program, if installed, to discover other operating
+systems installed on the same system and generate appropriate menu entries
+for them.  Set this option to @samp{true} to disable this.
+
+@item GRUB_INIT_TUNE
+Play a tune on the speaker when GRUB starts.  This is particularly useful
+for users unable to see the screen.  The value of this option is passed
+directly to @ref{play}.
+@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
+menu entries; simply type the menu entries you want to add at the end of
+that file, making sure to leave at least the first two lines intact.
+
+
+@node Shell-like scripting
+@section Writing full configuration files directly
+
+
 @node Serial terminal
 @chapter Using GRUB via a serial line
 
@@ -1499,6 +1692,32 @@ into/from your computer.
 @end table
 
 
+@node Invoking grub-mkconfig
+@chapter Invoking grub-mkconfig
+
+The program @command{grub-mkconfig} generates a configuration file for GRUB
+(@pxref{Simple configuration}).
+
+@example
+grub-mkconfig -o /boot/grub/grub.cfg
+@end example
+
+@command{grub-mkconfig} accepts the following options:
+
+@table @option
+@item --help
+Print a summary of the command-line options and exit.
+
+@item --version
+Print the version number of GRUB and exit.
+
+@item -o @var{file}
+@itemx --output=@var{file}
+Send the generated configuration file to @var{file}.  The default is to send
+it to standard output.
+@end table
+
+
 @node Obtaining and Building GRUB
 @appendix How to obtain and build GRUB
 

From bb8ea0f5c324043bd09e024b41a2af262909b659 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 2 Jun 2010 11:26:28 +0100
Subject: [PATCH 1055/1628] * docs/grub.texi (GNU GRUB manual): Remove
 reference to `Invoking the grub shell'. (Installation): Add reference to
 `Making a GRUB bootable CD-ROM'. (Installing GRUB using grub-install): Remove
 reference to the grub shell; mention `grub-mkimage' and `grub-setup' instead.
 (Invoking grub-install): Likewise. (Interface): Add reference to `Menu entry
 editor'. (serial): Remove `--device' option.

---
 ChangeLog      | 11 +++++++++++
 docs/grub.texi | 26 ++++++++++++--------------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 214be173c..905e36edf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (GNU GRUB manual): Remove reference to `Invoking
+	the grub shell'.
+	(Installation): Add reference to `Making a GRUB bootable CD-ROM'.
+	(Installing GRUB using grub-install): Remove reference to the grub
+	shell; mention `grub-mkimage' and `grub-setup' instead.
+	(Invoking grub-install): Likewise.
+	(Interface): Add reference to `Menu entry editor'.
+	(serial): Remove `--device' option.
+
 2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Configuration): New section, documenting
diff --git a/docs/grub.texi b/docs/grub.texi
index 77f151cfc..4c903729b 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -85,7 +85,6 @@ This edition documents version @value{VERSION}.
 * Interface::                   The menu and the command-line
 * Commands::                    The list of available builtin commands
 * Troubleshooting::             Error messages produced by GRUB
-* Invoking the grub shell::     How to use the grub shell
 * Invoking grub-install::       How to use the GRUB installer
 * Invoking grub-mkconfig::      Generate a GRUB configuration file
 * Obtaining and Building GRUB:: How to obtain and build GRUB
@@ -451,6 +450,7 @@ the @dfn{boot directory}.
 
 @menu
 * Installing GRUB using grub-install::
+* Making a GRUB bootable CD-ROM::
 @end menu
 
 
@@ -530,11 +530,11 @@ quite careful. If the output is wrong, it is unlikely that your
 computer will be able to boot with no problem.
 
 Note that @command{grub-install} is actually just a shell script and the
-real task is done by the grub shell @command{grub} (@pxref{Invoking the
-grub shell}). Therefore, you may run @command{grub} directly to install
-GRUB, without using @command{grub-install}. Don't do that, however,
-unless you are very familiar with the internals of GRUB. Installing a
-boot loader on a running OS may be extremely dangerous.
+real task is done by @command{grub-mkimage} and @command{grub-setup}.
+Therefore, you may run those commands directly to install GRUB, without
+using @command{grub-install}. Don't do that, however, unless you are very
+familiar with the internals of GRUB. Installing a boot loader on a running
+OS may be extremely dangerous.
 
 
 @node Making a GRUB bootable CD-ROM
@@ -1073,6 +1073,7 @@ the command-line interface.
 @menu
 * Command-line interface::      The flexible command-line interface
 * Menu interface::              The simple menu interface
+* Menu entry editor::           Editing a menu entry
 @end menu
 
 
@@ -1272,7 +1273,7 @@ Commands usable anywhere in the menu and in the command-line.
 @node serial
 @subsection serial
 
-@deffn Command serial [@option{--unit=unit}] [@option{--port=port}] [@option{--speed=speed}] [@option{--word=word}] [@option{--parity=parity}] [@option{--stop=stop}] [@option{--device=dev}]
+@deffn Command serial [@option{--unit=unit}] [@option{--port=port}] [@option{--speed=speed}] [@option{--word=word}] [@option{--parity=parity}] [@option{--stop=stop}]
 Initialize a serial device. @var{unit} is a number in the range 0-3
 specifying which serial port to use; default is 0, which corresponds to
 the port often called COM1. @var{port} is the I/O port where the UART
@@ -1281,10 +1282,7 @@ is to be found; if specified it takes precedence over @var{unit}.
 @var{stop} are the number of data bits and stop bits. Data bits must
 be in the range 5-8 and stop bits must be 1 or 2. Default is 8 data
 bits and one stop bit. @var{parity} is one of @samp{no}, @samp{odd},
-@samp{even} and defaults to @samp{no}. The option @option{--device}
-can only be used in the grub shell and is used to specify the
-tty device to be used in the host operating system (@pxref{Invoking the
-grub shell}).
+@samp{even} and defaults to @samp{no}.
 
 The serial port is not used as a communication channel unless the
 @command{terminal} command is used (@pxref{terminal}).
@@ -1654,9 +1652,9 @@ Unset the environment variable @var{envvar}.
 @node Invoking grub-install
 @chapter Invoking grub-install
 
-The program @command{grub-install} installs GRUB on your drive using the
-grub shell (@pxref{Invoking the grub shell}). You must specify the
-device name on which you want to install GRUB, like this:
+The program @command{grub-install} installs GRUB on your drive using
+@command{grub-mkimage} and (on some platforms) @command{grub-setup}.  You
+must specify the device name on which you want to install GRUB, like this:
 
 @example
 grub-install @var{install_device}

From 1c41aa7883f3f8ba94e7e0c447f434840a4a0161 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 2 Jun 2010 12:47:11 +0100
Subject: [PATCH 1056/1628] * docs/grub.texi (Chain-loading): New section.
 (DOS/Windows): New section, borrowed from GRUB Legacy with details adjusted
 for GRUB 2. (SCO UnixWare): Likewise. (QNX): Likewise. (chainloader): Add
 reference to `Block list syntax'. (drivemap): New section. (parttool): New
 section.

---
 ChangeLog      |  11 +++
 docs/grub.texi | 187 +++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 193 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 905e36edf..b0fc06848 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (Chain-loading): New section.
+	(DOS/Windows): New section, borrowed from GRUB Legacy with details
+	adjusted for GRUB 2.
+	(SCO UnixWare): Likewise.
+	(QNX): Likewise.
+	(chainloader): Add reference to `Block list syntax'.
+	(drivemap): New section.
+	(parttool): New section.
+
 2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (GNU GRUB manual): Remove reference to `Invoking
diff --git a/docs/grub.texi b/docs/grub.texi
index 4c903729b..5f2e5e36a 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -647,6 +647,35 @@ use more complicated instructions. @xref{DOS/Windows}, for more
 information.
 
 
+@node Chain-loading
+@subsection Chain-loading an OS
+
+Operating systems that do not support Multiboot and do not have specific
+support in GRUB (specific support is available for Linux, FreeBSD, NetBSD
+and OpenBSD) must be chain-loaded, which involves loading another boot
+loader and jumping to it in real mode.
+
+The @command{chainloader} command (@pxref{chainloader}) is used to set this
+up.  It is normally also necessary to load some GRUB modules and set the
+appropriate root device.  Putting this together, we get something like this,
+for a Windows system on the first partition of the first hard disk:
+
+@verbatim
+menuentry "Windows" {
+	insmod chain
+	insmod ntfs
+	set root=(hd0,1)
+	chainloader +1
+}
+@end verbatim
+@c FIXME: document UUIDs.
+
+On systems with multiple hard disks, an additional workaround may be
+required.  @xref{DOS/Windows}.
+
+Chain-loading is only supported on PC BIOS and EFI platforms.
+
+
 @node OS-specific notes
 @section Some caveats on OS-specific issues
 
@@ -655,6 +684,9 @@ Here, we describe some caveats on several operating systems.
 @menu
 * GNU/Hurd::
 * GNU/Linux::
+* DOS/Windows::
+* SCO UnixWare::
+* QNX::
 @end menu
 
 
@@ -696,6 +728,87 @@ the size, run the command @command{uppermem} @emph{before} loading the
 kernel. @xref{uppermem}, for more information.
 
 
+@node DOS/Windows
+@subsection DOS/Windows
+
+GRUB cannot boot DOS or Windows directly, so you must chain-load them
+(@pxref{Chain-loading}). However, their boot loaders have some critical
+deficiencies, so it may not work to just chain-load them. To overcome
+the problems, GRUB provides you with two helper functions.
+
+If you have installed DOS (or Windows) on a non-first hard disk, you
+have to use the disk swapping technique, because that OS cannot boot
+from any disks but the first one. The workaround used in GRUB is the
+command @command{drivemap} (@pxref{drivemap}), like this:
+
+@example
+drivemap -s (hd0) (hd1)
+@end example
+
+This performs a @dfn{virtual} swap between your first and second hard
+drive.
+
+@strong{Caution:} This is effective only if DOS (or Windows) uses BIOS
+to access the swapped disks. If that OS uses a special driver for the
+disks, this probably won't work.
+
+Another problem arises if you installed more than one set of DOS/Windows
+onto one disk, because they could be confused if there are more than one
+primary partitions for DOS/Windows. Certainly you should avoid doing
+this, but there is a solution if you do want to do so. Use the partition
+hiding/unhiding technique.
+
+If GRUB @dfn{hides} a DOS (or Windows) partition (@pxref{parttool}), DOS (or
+Windows) will ignore the partition. If GRUB @dfn{unhides} a DOS (or Windows)
+partition, DOS (or Windows) will detect the partition. Thus, if you have
+installed DOS (or Windows) on the first and the second partition of the
+first hard disk, and you want to boot the copy on the first partition, do
+the following:
+
+@example
+@group
+parttool (hd0,1) hidden-
+parttool (hd0,2) hidden+
+set root=(hd0,1)
+chainloader +1
+parttool @verb{'${root}'} boot+
+boot
+@end group
+@end example
+
+
+@node SCO UnixWare
+@subsection SCO UnixWare
+
+It is known that the signature in the boot loader for SCO UnixWare is
+wrong, so you will have to specify the option @option{--force} to
+@command{chainloader} (@pxref{chainloader}), like this:
+
+@example
+@group
+set root=(hd1,1)
+chainloader --force +1
+parttool @verb{'${root}'} boot+
+boot
+@end group
+@end example
+
+
+@node QNX
+@subsection QNX
+
+QNX seems to use a bigger boot loader, so you need to boot it up, like
+this:
+
+@example
+@group
+set root=(hd1,2)
+chainloader +4
+boot
+@end group
+@end example
+
+
 @node Configuration
 @chapter Writing your own configuration file
 
@@ -1325,6 +1438,7 @@ you forget a command, you can run the command @command{help}
 * configfile::                  Load a configuration file
 * crc::                         Calculate CRC32 checksums
 * date::                        Display or set current date and time
+* drivemap::                    Map a drive to another
 * echo::                        Display a line of text
 * export::                      Export an environment variable
 * gettext::                     Translate a string
@@ -1334,6 +1448,7 @@ you forget a command, you can run the command @command{help}
 * insmod::                      Insert a module
 * keystatus::                   Check key modifier status
 * ls::                          List devices or files
+* parttool::                    Modify partition table entries
 * play::                        Play a tune
 * reboot::                      Reboot your computer
 * set::                         Set an environment variable
@@ -1399,11 +1514,12 @@ grub> @kbd{cat /etc/fstab}
 
 @deffn Command chainloader [@option{--force}] file
 Load @var{file} as a chain-loader. Like any other file loaded by the
-filesystem code, it can use the blocklist notation to grab the first
-sector of the current partition with @samp{+1}. If you specify the
-option @option{--force}, then load @var{file} forcibly, whether it has a
-correct signature or not. This is required when you want to load a
-defective boot loader, such as SCO UnixWare 7.1 (@pxref{SCO UnixWare}).
+filesystem code, it can use the blocklist notation (@pxref{Block list
+syntax}) to grab the first sector of the current partition with @samp{+1}.
+If you specify the option @option{--force}, then load @var{file} forcibly,
+whether it has a correct signature or not. This is required when you want to
+load a defective boot loader, such as SCO UnixWare 7.1 (@pxref{SCO
+UnixWare}).
 @end deffn
 
 
@@ -1458,6 +1574,32 @@ hour, minute, and second unchanged.
 @end deffn
 
 
+@node drivemap
+@subsection drivemap
+
+@deffn Command drivemap @option{-l}|@option{-r}|[@option{-s}] @
+ from_drive to_drive
+Without options, map the drive @var{from_drive} to the drive @var{to_drive}.
+This is necessary when you chain-load some operating systems, such as DOS,
+if such an OS resides at a non-first drive.  For convenience, any partition
+suffix on the drive is ignored, so you can safely use @verb{'${root}'} as a
+drive specification.
+
+With the @option{-s} option, perform the reverse mapping as well, swapping
+the two drives.
+
+With the @option{-l} option, list the current mappings.
+
+With the @option{-r} option, reset all mappings to the default values.
+
+For example:
+
+@example
+drivemap -s (hd0) (hd1)
+@end example
+@end deffn
+
+
 @node echo
 @subsection echo
 
@@ -1605,6 +1747,41 @@ name syntax}), then list the contents of that directory.
 @end deffn
 
 
+@node parttool
+@subsection parttool
+
+@deffn Command parttool partition commands
+Make various modifications to partition table entries.
+
+Each @var{command} is either a boolean option, in which case it must be
+followed with @samp{+} or @samp{-} (with no intervening space) to enable or
+disable that option, or else it takes a value in the form
+@samp{@var{command}=@var{value}}.
+
+Currently, @command{parttool} is only useful on DOS partition tables (also
+known as Master Boot Record, or MBR).  On these partition tables, the
+following commands are available:
+
+@table @asis
+@item @samp{boot} (boolean)
+When enabled, this makes the selected partition be the active (bootable)
+partition on its disk, clearing the active flag on all other partitions.
+This command is limited to @emph{primary} partitions.
+
+@item @samp{type} (value)
+Change the type of an existing partition.  The value must be a number in the
+range 0-0xFF (prefix with @samp{0x} to enter it in hexadecimal).
+
+@item @samp{hidden} (boolean)
+When enabled, this hides the selected partition by setting the @dfn{hidden}
+bit in its partition type code; when disabled, unhides the selected
+partition by clearing this bit.  This is useful only when booting DOS or
+Wwindows and multiple primary FAT partitions exist in one disk.  See also
+@ref{DOS/Windows}.
+@end table
+@end deffn
+
+
 @node play
 @subsection play
 

From ca0afd5bab02d1e26dae496435b48647e44e08a8 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 2 Jun 2010 13:11:33 +0100
Subject: [PATCH 1057/1628] * docs/grub.texi (SCO UnixWare): Remove, at
 Vladimir's request and per the GNU Coding Standards; this is now too obscure
 to be worth documenting. (QNX): Likewise. (chainloader): Remove
 cross-reference to `SCO UnixWare'.

---
 ChangeLog      |  8 ++++++++
 docs/grub.texi | 37 +------------------------------------
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b0fc06848..61e4ea8ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (SCO UnixWare): Remove, at Vladimir's request and
+	per the GNU Coding Standards; this is now too obscure to be worth
+	documenting.
+	(QNX): Likewise.
+	(chainloader): Remove cross-reference to `SCO UnixWare'.
+
 2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Chain-loading): New section.
diff --git a/docs/grub.texi b/docs/grub.texi
index 5f2e5e36a..1f0c2083e 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -685,8 +685,6 @@ Here, we describe some caveats on several operating systems.
 * GNU/Hurd::
 * GNU/Linux::
 * DOS/Windows::
-* SCO UnixWare::
-* QNX::
 @end menu
 
 
@@ -777,38 +775,6 @@ boot
 @end example
 
 
-@node SCO UnixWare
-@subsection SCO UnixWare
-
-It is known that the signature in the boot loader for SCO UnixWare is
-wrong, so you will have to specify the option @option{--force} to
-@command{chainloader} (@pxref{chainloader}), like this:
-
-@example
-@group
-set root=(hd1,1)
-chainloader --force +1
-parttool @verb{'${root}'} boot+
-boot
-@end group
-@end example
-
-
-@node QNX
-@subsection QNX
-
-QNX seems to use a bigger boot loader, so you need to boot it up, like
-this:
-
-@example
-@group
-set root=(hd1,2)
-chainloader +4
-boot
-@end group
-@end example
-
-
 @node Configuration
 @chapter Writing your own configuration file
 
@@ -1518,8 +1484,7 @@ filesystem code, it can use the blocklist notation (@pxref{Block list
 syntax}) to grab the first sector of the current partition with @samp{+1}.
 If you specify the option @option{--force}, then load @var{file} forcibly,
 whether it has a correct signature or not. This is required when you want to
-load a defective boot loader, such as SCO UnixWare 7.1 (@pxref{SCO
-UnixWare}).
+load a defective boot loader, such as SCO UnixWare 7.1.
 @end deffn
 
 

From 0b35b2a9211feafd80a1a203e793a1e68ccbe5a3 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 2 Jun 2010 13:57:13 +0100
Subject: [PATCH 1058/1628] * util/grub.d/00_header.in: Add safety check to
 make sure that ${locale_dir} exists before trying to probe it.

---
 ChangeLog                | 5 +++++
 util/grub.d/00_header.in | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 61e4ea8ec..fb73905e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub.d/00_header.in: Add safety check to make sure that
+	${locale_dir} exists before trying to probe it.
+
 2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (SCO UnixWare): Remove, at Vladimir's request and
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index df8f5dfaa..0a5cfac18 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -195,7 +195,7 @@ EOF
 esac
 
 # Gettext variables and module
-if [ "x${LANG}" != "xC" ] ; then
+if [ "x${LANG}" != "xC" ] && [ -d "${locale_dir}" ] ; then
     prepare_grub_to_access_device $(${grub_probe} --target=device ${locale_dir})
   cat << EOF
 set locale_dir=(\$root)$(make_system_path_relative_to_its_root ${locale_dir})

From 11dccbfd4d2ed5e91e5f4f767161a0095ef01025 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Jun 2010 16:45:43 +0200
Subject: [PATCH 1059/1628] Sort scsi_cmd_t.

---
 include/grub/scsicmd.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/grub/scsicmd.h b/include/grub/scsicmd.h
index f9a7cb200..9cc5afe72 100644
--- a/include/grub/scsicmd.h
+++ b/include/grub/scsicmd.h
@@ -147,14 +147,14 @@ struct grub_scsi_write12
 
 typedef enum
   {
-    grub_scsi_cmd_inquiry = 0x12,
     grub_scsi_cmd_test_unit_ready = 0x00,
+    grub_scsi_cmd_request_sense = 0x03,
+    grub_scsi_cmd_inquiry = 0x12,
     grub_scsi_cmd_read_capacity = 0x25,
     grub_scsi_cmd_read10 = 0x28,
     grub_scsi_cmd_write10 = 0x2a,
     grub_scsi_cmd_read12 = 0xa8,
     grub_scsi_cmd_write12 = 0xaa,
-    grub_scsi_cmd_request_sense = 0x03
   } grub_scsi_cmd_t;
 
 typedef enum

From f0e6cceb813e626d313ae6b15e03683b82b322ca Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Jun 2010 16:46:37 +0200
Subject: [PATCH 1060/1628] Remove leftover early debug exit.

---
 commands/usbtest.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/commands/usbtest.c b/commands/usbtest.c
index 7d1f85cfd..191c4e4df 100644
--- a/commands/usbtest.c
+++ b/commands/usbtest.c
@@ -148,8 +148,6 @@ usb_iterate (grub_usb_device_t dev)
 
   grub_printf ("%s speed device\n", usb_devspeed[dev->speed]);
 
-  return 0;
-
   for (i = 0; i < descdev->configcnt; i++)
     {
       struct grub_usb_desc_config *config;

From 8bd3a1fb3027c7e05be06d5145bd8d16ee1bcbeb Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Jun 2010 16:46:55 +0200
Subject: [PATCH 1061/1628] Add necessarry cast

---
 disk/scsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/disk/scsi.c b/disk/scsi.c
index dffabc26e..5d3e50966 100644
--- a/disk/scsi.c
+++ b/disk/scsi.c
@@ -460,7 +460,7 @@ grub_scsi_open (const char *name, grub_disk_t disk)
       grub_dprintf ("scsi", "blocks=%u, blocksize=%u\n",
 		    scsi->size, scsi->blocksize);
       grub_dprintf ("scsi", "Disk total 512 sectors = %llu\n",
-		    disk->total_sectors);
+		    (unsigned long long) disk->total_sectors);
 
       return GRUB_ERR_NONE;
     }

From f133a8a74b31c085e68831f76a7e78a8c49629da Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Jun 2010 16:48:10 +0200
Subject: [PATCH 1062/1628] Enable USB on 64-bit (still won't work with >= 4GiB
 memory).

---
 bus/pci.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bus/pci.c b/bus/pci.c
index 3e2126962..1635e889b 100644
--- a/bus/pci.c
+++ b/bus/pci.c
@@ -21,7 +21,8 @@
 #include <grub/pci.h>
 #include <grub/mm.h>
 
-#if GRUB_TARGET_SIZEOF_VOID_P == 4
+/* FIXME: correctly support 64-bit architectures.  */
+/* #if GRUB_TARGET_SIZEOF_VOID_P == 4 */
 struct grub_pci_dma_chunk *
 grub_memalign_dma32 (grub_size_t align, grub_size_t size)
 {
@@ -33,7 +34,7 @@ grub_dma_free (struct grub_pci_dma_chunk *ch)
 {
   grub_free (ch);
 }
-#endif
+/* #endif */
 
 #ifdef GRUB_MACHINE_MIPS_YEELOONG
 volatile void *

From 5d538b8b4a17de54cda284ee1ba081afbef8f978 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Jun 2010 16:49:22 +0200
Subject: [PATCH 1063/1628] Use memset

---
 bus/usb/usb.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/bus/usb/usb.c b/bus/usb/usb.c
index 7df148333..c872e9276 100644
--- a/bus/usb/usb.c
+++ b/bus/usb/usb.c
@@ -105,10 +105,7 @@ grub_usb_clear_halt (grub_usb_device_t dev, int endpoint)
 grub_usb_err_t
 grub_usb_set_configuration (grub_usb_device_t dev, int configuration)
 {
-  int i;
-
-  for (i = 0; i < 256; i++)
-    dev->toggle[i] = 0;
+  grub_memset (dev->toggle, 0, sizeof (dev->toggle));
 
   return grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
 				     | GRUB_USB_REQTYPE_STANDARD

From 7db51e329b7e8f0cdeaea60b2fd866105406d9c4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Jun 2010 16:51:54 +0200
Subject: [PATCH 1064/1628] Remove double defines and use dma_free

---
 bus/usb/ohci.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index a42d9fee1..956a27292 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -339,10 +339,8 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   return 0;
 
  fail:
-#ifndef GRUB_MACHINE_MIPS_YEELOONG
   if (o)
-    grub_free ((void *) o->hcca);
-#endif
+    grub_dma_free (o->hcca_chunk);
   grub_free (o);
 
   return 0;
@@ -883,11 +881,6 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   return err;
 }
 
-#define GRUB_OHCI_SET_PORT_ENABLE (1 << 1)
-#define GRUB_OHCI_CLEAR_PORT_ENABLE (1 << 0)
-#define GRUB_OHCI_SET_PORT_RESET (1 << 4)
-#define GRUB_OHCI_SET_PORT_RESET_STATUS_CHANGE (1 << 20)
-
 static grub_err_t
 grub_ohci_portstatus (grub_usb_controller_t dev,
 		      unsigned int port, unsigned int enable)

From 49396b4f61726411e4d7bfaefbf2f62e93763102 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Jun 2010 16:52:16 +0200
Subject: [PATCH 1065/1628] Add ChangeLog

---
 ChangeLog | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5072a6026..a693e4385 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,122 @@
+2010-06-02  Aleš Nesrsta <starous@volny.cz>
+
+	Finally make USB usable.
+
+	* bus/usb/ohci.c (grub_ohci_reg_t): Add missing values.
+	(GRUB_OHCI_RHUB_PORT_POWER_MASK): New macro.
+	(GRUB_OHCI_RHUB_PORT_ALL_POWERED): Likewise.
+	(GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_MASK): Likewise.
+	(GRUB_OHCI_REG_FRAME_INTERVAL_FSMPS_SHIFT): Likewise.
+	(GRUB_OHCI_REG_FRAME_INTERVAL_FI_SHIFT): Likewise.
+	(GRUB_OHCI_FSMPS): Likewise.
+	(GRUB_OHCI_PERIODIC_START): Likewise.
+	(GRUB_OHCI_FRAME_INTERVAL): Likewise.
+	(GRUB_OHCI_SET_PORT_ENABLE): Likewise.
+	(GRUB_OHCI_CLEAR_PORT_ENABLE): Likewise.
+	(GRUB_OHCI_SET_PORT_RESET): Likewise.
+	(GRUB_OHCI_SET_PORT_RESET_STATUS_CHANGE): Likewise.
+	* bus/usb/ohci.c (grub_ohci_pci_iter): Various important fixups.
+	(grub_ohci_transaction): Likewise.
+	(grub_ohci_transfer): Improve condition detection algorithms.
+	Handle toggle property. Program the transactions correctly.
+	Improve error handling. Various important fixups.
+	(grub_ohci_portstatus): Put register writes in right order.
+	* bus/usb/uhci.c (grub_free_queue): Compute last_trans.
+	(grub_uhci_transfer): Don't show "failed" message on success.
+	* bus/usb/usb.c (grub_usb_set_configuration): Zero-fill whole "toggle"
+	array.
+	(grub_usb_device_initialize): Read first 8 bytes of descriptor to
+	determine its size.
+	* bus/usb/usbtrans.c (grub_usb_control_msg): Use descdev.maxsize0 even
+	before initialization is completed. Use IN direction for empty
+	transfers. Use last_trans and compute toggle.
+	* include/grub/usbtrans.h (grub_usb_transfer): New field last_trans.
+	(GRUB_USB_FEATURE_ENDP_HALT): Correct the value.
+	(GRUB_USB_FEATURE_DEV_REMOTE_WU): Likewise.
+	(GRUB_USB_FEATURE_TEST_MODE): Likewise.
+	* include/grub/usb.h (grub_usb_err_t): New value GRUB_USB_ERR_UNRECOVERABLE.
+	(grub_usb_device): Increase toggle to 256.
+	(grub_usbms_subclass_t): New values GRUB_USBMS_SUBCLASS_RBC,
+	GRUB_USBMS_SUBCLASS_MMC2, GRUB_USBMS_SUBCLASS_UFI and
+	GRUB_USBMS_SUBCLASS_SFF8070.
+	* include/grub/scsicmd.h (grub_scsi_test_unit_ready): New structure.
+	(grub_scsi_inquiry): New member page and alloc_length.
+	(grub_scsi_request_sense): New structure.
+	(grub_scsi_request_sense_data): Likewise.
+	(grub_scsi_read_capacity): New fields logical_block_addr, PMI and
+	control.
+	* disk/scsi.c (grub_scsi_request_sense): New function.
+	(grub_scsi_test_unit_ready): Likewise.
+	(grub_scsi_inquiry): Fill new fields.
+	(grub_scsi_read_capacity): Likewise.
+	(grub_scsi_read10): Add request sense at the end.
+	(grub_scsi_read12): Likewise.
+	(grub_scsi_write10): Likewise.
+	(grub_scsi_write12): Likewise.
+	(grub_scsi_open): Add Test Unit Ready.
+	* disk/usbms.c (grub_usbms_finddevs): Check configcnt.
+	Support additional subclasses. Con't clear halt yet. Activate the
+	proper config. Calculate LUNs correctly.
+	(grub_usbms_transfer): Various important fixups.
+
+2010-06-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* bus/pci.c (grub_pci_iterate) [GRUB_MACHINE_MIPS_YEELOONG]: Skip ghosts.
+	* bus/usb/ohci.c (grub_ohci_portstatus): Handle R/WC correctly.
+	(grub_ohci_fini_hw): New function.
+	(grub_ohci_restore_hw): Likewise.
+	(GRUB_MOD_INIT(ohci)): Register preboot hook.
+	(GRUB_MOD_FINI(ohci)): Shutdown OHCI.
+	* term/usb_keyboard.c: Remove include of grub/machine/console.h.
+
+2010-06-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Dedicated DMA allocations.
+
+	* bus/pci.c (grub_memalign_dma32): New function
+	(grub_dma_free): Likewise.
+	(grub_dma_get_virt): Likewise.
+	(grub_dma_get_phys): Likewise.
+	* bus/usb/ohci.c (grub_ohci): New members hcca_addr and hcca_chunk.
+	(grub_ohci_pci_iter): Use dma32_alloc.
+	(grub_ohci_transfer): Likewise.
+	* bus/usb/usbtrans.c (grub_usb_control_msg): Likewise.
+	(grub_usb_bulk_readwrite): Likewise.
+	* include/grub/pci.h: Add declarations.
+
+2010-06-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	CS5536 support.
+
+	* bus/cs5536.c: New file.
+	* bus/usb/ohci.c (grub_ohci_pci_iter): Check for CS5536.
+	* conf/i386.rmk (pkglib_MODULES): Add cs5536.mod.
+	(cs5536_mod_SOURCES): New variable.
+	(cs5536_mod_CFLAGS): Likewise.
+	(cs5536_mod_LDFLAGS): Likewise.
+	* conf/mips-yeeloong.rmk (kernel_img_HEADERS): Add cs5536.h and
+	machine/pci.h.
+	(kernel_img_SOURCES): Add bus/cs5536.c.
+	(pkglib_MODULES): Add usb.mod, usbtest.mod, ohci.mod, usbms.mod and
+	usb_keyboard.mod.
+	(usb_mod_SOURCES): New variable.
+	(usb_mod_CFLAGS): New variable.
+	(usb_mod_LDFLAGS): New variable.
+	(usbtest_mod_SOURCES): New variable.
+	(usbtest_mod_CFLAGS): New variable.
+	(usbtest_mod_LDFLAGS): New variable.
+	(ohci_mod_SOURCES): New variable.
+	(ohci_mod_CFLAGS): New variable.
+	(ohci_mod_LDFLAGS): New variable.
+	(usbms_mod_SOURCES): New variable.
+	(usbms_mod_CFLAGS): New variable.
+	(usbms_mod_LDFLAGS): New variable.
+	(usb_keyboard_mod_SOURCES): New variable.
+	(usb_keyboard_mod_CFLAGS): New variable.
+	(usb_keyboard_mod_LDFLAGS): New variable.
+	* include/grub/smbus.h: New file.
+	* include/grub/cs5536.h: New file.
+
 2010-05-28  Colin Watson  <cjwatson@ubuntu.com>
 
 	* configure.ac: AC_PROG_LEX sets LEX to ":" if lex is missing, not

From 440ab68551062891c45ce12f4577fb4f7294545e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Jun 2010 19:52:17 +0200
Subject: [PATCH 1066/1628] Restructure usbms as a preparation for hotplug

---
 bus/usb/usb.c      |  51 +++++++
 disk/usbms.c       | 325 ++++++++++++++++++++++-----------------------
 include/grub/usb.h |  20 +++
 3 files changed, 227 insertions(+), 169 deletions(-)

diff --git a/bus/usb/usb.c b/bus/usb/usb.c
index c872e9276..79a79e644 100644
--- a/bus/usb/usb.c
+++ b/bus/usb/usb.c
@@ -21,6 +21,7 @@
 #include <grub/mm.h>
 #include <grub/usb.h>
 #include <grub/misc.h>
+#include <grub/list.h>
 
 static grub_usb_controller_dev_t grub_usb_list;
 
@@ -232,3 +233,53 @@ grub_usb_device_initialize (grub_usb_device_t dev)
 
   return err;
 }
+
+struct grub_usb_attach_desc *attach_hooks;
+
+void
+grub_usb_register_attach_hook_class (struct grub_usb_attach_desc *desc)
+{
+  auto int usb_iterate (grub_usb_device_t dev);
+
+  int usb_iterate (grub_usb_device_t usbdev)
+    {
+      struct grub_usb_desc_device *descdev = &usbdev->descdev;
+      int i;
+
+      if (descdev->class != 0 || descdev->subclass || descdev->protocol != 0
+	  || descdev->configcnt == 0)
+	return 0;
+
+      /* XXX: Just check configuration 0 for now.  */
+      for (i = 0; i < usbdev->config[0].descconf->numif; i++)
+	{
+	  struct grub_usb_desc_if *interf;
+
+	  interf = usbdev->config[0].interf[i].descif;
+
+	  grub_dprintf ("usb", "iterate: interf=%d, class=%d, subclass=%d, protocol=%d\n",
+	                i, interf->class, interf->subclass, interf->protocol);
+
+	  if (usbdev->config[0].interf[i].attached)
+	    continue;
+
+	  if (interf->class != desc->class)
+	    continue;
+	  if (desc->hook (usbdev, 0, i))
+	    usbdev->config[0].interf[i].attached = 1;
+	}
+
+      return 0;
+    }
+
+  desc->next = attach_hooks;
+  attach_hooks = desc;
+
+  grub_usb_iterate (usb_iterate);
+}
+
+void
+grub_usb_unregister_attach_hook_class (struct grub_usb_attach_desc *desc)
+{
+  grub_list_remove (GRUB_AS_LIST_P (&attach_hooks), GRUB_AS_LIST (desc));  
+}
diff --git a/disk/usbms.c b/disk/usbms.c
index a49b30e7e..84597aa01 100644
--- a/disk/usbms.c
+++ b/disk/usbms.c
@@ -52,20 +52,19 @@ struct grub_usbms_dev
 
   int luns;
 
+  int config;
   int interface;
   struct grub_usb_desc_endp *in;
   struct grub_usb_desc_endp *out;
 
   int in_maxsz;
   int out_maxsz;
-
-  struct grub_usbms_dev *next;
 };
 typedef struct grub_usbms_dev *grub_usbms_dev_t;
 
-static grub_usbms_dev_t grub_usbms_dev_list;
-
-static int devcnt;
+/* FIXME: remove limit.  */
+#define MAX_USBMS_DEVICES 128
+static grub_usbms_dev_t grub_usbms_devices[MAX_USBMS_DEVICES];
 
 static grub_err_t
 grub_usbms_reset (grub_usb_device_t dev, int interface)
@@ -74,149 +73,133 @@ grub_usbms_reset (grub_usb_device_t dev, int interface)
 }
 
 static void
-grub_usbms_finddevs (void)
+grub_usbms_detach (grub_usb_device_t usbdev, int config, int interface)
 {
-  auto int usb_iterate (grub_usb_device_t dev);
+  unsigned i;
+  for (i = 0; i < ARRAY_SIZE (grub_usbms_devices); i++)
+    if (grub_usbms_devices[i] && grub_usbms_devices[i]->dev == usbdev
+	&& grub_usbms_devices[i]->interface == interface
+	&& grub_usbms_devices[i]->config == config)
+      {
+	grub_free (grub_usbms_devices[i]);
+	grub_usbms_devices[i] = 0;
+      }
+}
 
-  int usb_iterate (grub_usb_device_t usbdev)
+static int
+grub_usbms_attach (grub_usb_device_t usbdev, int configno, int interfno)
+{
+  struct grub_usb_desc_if *interf
+    = usbdev->config[configno].interf[interfno].descif;
+  int j;
+  grub_uint8_t luns = 0;
+  unsigned curnum;
+  grub_usb_err_t err;
+
+  for (curnum = 0; curnum < ARRAY_SIZE (grub_usbms_devices); curnum++)
+    if (!grub_usbms_devices[curnum])
+      break;
+
+  if (curnum == ARRAY_SIZE (grub_usbms_devices))
+    return 0;
+
+  interf = usbdev->config[configno].interf[interfno].descif;
+
+  if ((interf->subclass != GRUB_USBMS_SUBCLASS_BULK
+       /* Experimental support of RBC, MMC-2, UFI, SFF-8070i devices */
+       && interf->subclass != GRUB_USBMS_SUBCLASS_RBC
+       && interf->subclass != GRUB_USBMS_SUBCLASS_MMC2
+       && interf->subclass != GRUB_USBMS_SUBCLASS_UFI 
+       && interf->subclass != GRUB_USBMS_SUBCLASS_SFF8070 )
+      || interf->protocol != GRUB_USBMS_PROTOCOL_BULK)
+    return 0;
+
+  grub_usbms_devices[curnum] = grub_zalloc (sizeof (struct grub_usbms_dev));
+  if (! grub_usbms_devices[curnum])
+    return 0;
+
+  grub_usbms_devices[curnum]->dev = usbdev;
+  grub_usbms_devices[curnum]->interface = interfno;
+
+  grub_dprintf ("usbms", "alive\n");
+
+  /* Iterate over all endpoints of this interface, at least a
+     IN and OUT bulk endpoint are required.  */
+  for (j = 0; j < interf->endpointcnt; j++)
     {
-      grub_usb_err_t err;
-      struct grub_usb_desc_device *descdev = &usbdev->descdev;
-      int i;
+      struct grub_usb_desc_endp *endp;
+      endp = &usbdev->config[0].interf[interfno].descendp[j];
 
-      if (descdev->class != 0 || descdev->subclass || descdev->protocol != 0
-	  || descdev->configcnt == 0)
-	return 0;
-
-      /* XXX: Just check configuration 0 for now.  */
-      for (i = 0; i < usbdev->config[0].descconf->numif; i++)
+      if ((endp->endp_addr & 128) && (endp->attrib & 3) == 2)
 	{
-	  struct grub_usbms_dev *usbms;
-	  struct grub_usb_desc_if *interf;
-	  int j;
-	  grub_uint8_t luns = 0;
-
-	  grub_dprintf ("usbms", "alive\n");
-
-	  interf = usbdev->config[0].interf[i].descif;
-
-	  /* If this is not a USB Mass Storage device with a supported
-	     protocol, just skip it.  */
-	  grub_dprintf ("usbms", "iterate: interf=%d, class=%d, subclass=%d, protocol=%d\n",
-	                i, interf->class, interf->subclass, interf->protocol);
-
-	  if (interf->class != GRUB_USB_CLASS_MASS_STORAGE
-	      || ( interf->subclass != GRUB_USBMS_SUBCLASS_BULK &&
-	    /* Experimental support of RBC, MMC-2, UFI, SFF-8070i devices */
-	           interf->subclass != GRUB_USBMS_SUBCLASS_RBC &&
-	           interf->subclass != GRUB_USBMS_SUBCLASS_MMC2 &&
-	           interf->subclass != GRUB_USBMS_SUBCLASS_UFI &&
-	           interf->subclass != GRUB_USBMS_SUBCLASS_SFF8070 )
-	      || interf->protocol != GRUB_USBMS_PROTOCOL_BULK)
-	    {
-	      continue;
-	    }
-
-	  grub_dprintf ("usbms", "alive\n");
-
-	  devcnt++;
-	  usbms = grub_zalloc (sizeof (struct grub_usbms_dev));
-	  if (! usbms)
-	    return 1;
-
-	  usbms->dev = usbdev;
-	  usbms->interface = i;
-
-	  grub_dprintf ("usbms", "alive\n");
-
-	  /* Iterate over all endpoints of this interface, at least a
-	     IN and OUT bulk endpoint are required.  */
-	  for (j = 0; j < interf->endpointcnt; j++)
-	    {
-	      struct grub_usb_desc_endp *endp;
-	      endp = &usbdev->config[0].interf[i].descendp[j];
-
-	      if ((endp->endp_addr & 128) && (endp->attrib & 3) == 2)
-		{
-		  /* Bulk IN endpoint.  */
-		  usbms->in = endp;
-		  /* Clear Halt is not possible yet! */
-		  /* grub_usb_clear_halt (usbdev, endp->endp_addr); */
-		  usbms->in_maxsz = endp->maxpacket;
-		}
-	      else if (!(endp->endp_addr & 128) && (endp->attrib & 3) == 2)
-		{
-		  /* Bulk OUT endpoint.  */
-		  usbms->out = endp;
-		  /* Clear Halt is not possible yet! */
-		  /* grub_usb_clear_halt (usbdev, endp->endp_addr); */
-		  usbms->out_maxsz = endp->maxpacket;
-		}
-	    }
-
-	  if (!usbms->in || !usbms->out)
-	    {
-	      grub_free (usbms);
-	      return 0;
-	    }
-
-	  grub_dprintf ("usbms", "alive\n");
-
-	  /* XXX: Activate the first configuration.  */
-	  grub_usb_set_configuration (usbdev, 1);
-
-	  /* Query the amount of LUNs.  */
-	  err = grub_usb_control_msg (usbdev, 0xA1, 254,
-				      0, i, 1, (char *) &luns);
-		
-	  if (err)
-	    {
-	      /* In case of a stall, clear the stall.  */
-	      if (err == GRUB_USB_ERR_STALL)
-		{
-		  grub_usb_clear_halt (usbdev, usbms->in->endp_addr);
-		  grub_usb_clear_halt (usbdev, usbms->out->endp_addr);
-		}
-	      /* Just set the amount of LUNs to one.  */
-	      grub_errno = GRUB_ERR_NONE;
-	      usbms->luns = 1;
-	    }
-	  else
-            /* luns = 0 means one LUN with ID 0 present ! */
-            /* We get from device not number of LUNs but highest
-             * LUN number. LUNs are numbered from 0, 
-             * i.e. number of LUNs is luns+1 ! */
-	    usbms->luns = luns + 1;
-
-	  grub_dprintf ("usbms", "alive\n");
-
-	  usbms->next = grub_usbms_dev_list;
-	  grub_usbms_dev_list = usbms;
-
-#if 0 /* All this part should be probably deleted.
-     * This make trouble on some devices if they are not in
-     * Phase Error state - and there they should be not in such state...
-     * Bulk only mass storage reset procedure should be used only
-     * on place and in time when it is really necessary. */
-	  /* Reset recovery procedure */
-	  /* Bulk-Only Mass Storage Reset, after the reset commands
-	     will be accepted.  */
-	  grub_usbms_reset (usbdev, i);
-	  grub_usb_clear_halt (usbdev, usbms->in->endp_addr);
-	  grub_usb_clear_halt (usbdev, usbms->out->endp_addr);
-#endif
-
-	  return 0;
+	  /* Bulk IN endpoint.  */
+	  grub_usbms_devices[curnum]->in = endp;
+	  /* Clear Halt is not possible yet! */
+	  /* grub_usb_clear_halt (usbdev, endp->endp_addr); */
+	  grub_usbms_devices[curnum]->in_maxsz = endp->maxpacket;
 	}
+      else if (!(endp->endp_addr & 128) && (endp->attrib & 3) == 2)
+	{
+	  /* Bulk OUT endpoint.  */
+	  grub_usbms_devices[curnum]->out = endp;
+	  /* Clear Halt is not possible yet! */
+	  /* grub_usb_clear_halt (usbdev, endp->endp_addr); */
+	  grub_usbms_devices[curnum]->out_maxsz = endp->maxpacket;
+	}
+    }
 
-      grub_dprintf ("usbms", "alive\n");
+  if (!grub_usbms_devices[curnum]->in || !grub_usbms_devices[curnum]->out)
+    {
+      grub_free (grub_usbms_devices[curnum]);
+      grub_usbms_devices[curnum] = 0;
       return 0;
     }
+
   grub_dprintf ("usbms", "alive\n");
 
-  grub_usb_iterate (usb_iterate);
+  /* XXX: Activate the first configuration.  */
+  grub_usb_set_configuration (usbdev, 1);
+
+  /* Query the amount of LUNs.  */
+  err = grub_usb_control_msg (usbdev, 0xA1, 254, 0, interfno, 1, (char *) &luns);
+		
+  if (err)
+    {
+      /* In case of a stall, clear the stall.  */
+      if (err == GRUB_USB_ERR_STALL)
+	{
+	  grub_usb_clear_halt (usbdev, grub_usbms_devices[curnum]->in->endp_addr);
+	  grub_usb_clear_halt (usbdev, grub_usbms_devices[curnum]->out->endp_addr);
+	}
+      /* Just set the amount of LUNs to one.  */
+      grub_errno = GRUB_ERR_NONE;
+      grub_usbms_devices[curnum]->luns = 1;
+    }
+  else
+    /* luns = 0 means one LUN with ID 0 present ! */
+    /* We get from device not number of LUNs but highest
+     * LUN number. LUNs are numbered from 0, 
+     * i.e. number of LUNs is luns+1 ! */
+    grub_usbms_devices[curnum]->luns = luns + 1;
+
   grub_dprintf ("usbms", "alive\n");
 
+  usbdev->config[configno].interf[interfno].detach_hook = grub_usbms_detach;
+
+#if 0 /* All this part should be probably deleted.
+       * This make trouble on some devices if they are not in
+       * Phase Error state - and there they should be not in such state...
+       * Bulk only mass storage reset procedure should be used only
+       * on place and in time when it is really necessary. */
+  /* Reset recovery procedure */
+  /* Bulk-Only Mass Storage Reset, after the reset commands
+     will be accepted.  */
+  grub_usbms_reset (usbdev, i);
+  grub_usb_clear_halt (usbdev, usbms->in->endp_addr);
+  grub_usb_clear_halt (usbdev, usbms->out->endp_addr);
+#endif
+
+  return 1;
 }
 
 
@@ -224,22 +207,21 @@ grub_usbms_finddevs (void)
 static int
 grub_usbms_iterate (int (*hook) (const char *name, int luns))
 {
-  grub_usbms_dev_t p;
-  int cnt = 0;
+  unsigned i;
 
-  for (p = grub_usbms_dev_list; p; p = p->next)
-    {
-      char *devname;
-      devname = grub_xasprintf ("usb%d", cnt);
+  for (i = 0; i < ARRAY_SIZE (grub_usbms_devices); i++)
+    if (grub_usbms_devices[i])
+      {
+	char *devname;
+	devname = grub_xasprintf ("usb%d", i);
 
-      if (hook (devname, p->luns))
-	{
-	  grub_free (devname);
-	  return 1;
-	}
-      grub_free (devname);
-      cnt++;
-    }
+	if (hook (devname, grub_usbms_devices[i]->luns))
+	  {
+	    grub_free (devname);
+	    return 1;
+	  }
+	grub_free (devname);
+      }
 
   return 0;
 }
@@ -400,34 +382,24 @@ grub_usbms_write (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
 static grub_err_t
 grub_usbms_open (const char *name, struct grub_scsi *scsi)
 {
-  grub_usbms_dev_t p;
   int devnum;
-  int i = 0;
 
   if (grub_strncmp (name, "usb", 3))
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
 		       "not a USB Mass Storage device");
 
   devnum = grub_strtoul (name + 3, NULL, 10);
-  for (p = grub_usbms_dev_list; p; p = p->next)
-    {
-      /* Check if this is the devnumth device.  */
-      if (devnum == i)
-	{
-	  scsi->data = p;
-	  scsi->name = grub_strdup (name);
-	  scsi->luns = p->luns;
-	  if (! scsi->name)
-	    return grub_errno;
+  if (!grub_usbms_devices[devnum])
+    return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
+		       "not a USB Mass Storage device");
 
-	  return GRUB_ERR_NONE;
-	}
+  scsi->data = grub_usbms_devices[devnum];
+  scsi->name = grub_strdup (name);
+  scsi->luns = grub_usbms_devices[devnum]->luns;
+  if (! scsi->name)
+    return grub_errno;
 
-      i++;
-    }
-
-  return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
-		     "not a USB Mass Storage device");
+  return GRUB_ERR_NONE;
 }
 
 static void
@@ -446,13 +418,28 @@ static struct grub_scsi_dev grub_usbms_dev =
     .write = grub_usbms_write
   };
 
+struct grub_usb_attach_desc attach_hook =
+{
+  .class = GRUB_USB_CLASS_MASS_STORAGE,
+  .hook = grub_usbms_attach
+};
+
 GRUB_MOD_INIT(usbms)
 {
-  grub_usbms_finddevs ();
+  grub_usb_register_attach_hook_class (&attach_hook);
   grub_scsi_dev_register (&grub_usbms_dev);
 }
 
 GRUB_MOD_FINI(usbms)
 {
+  unsigned i;
+  for (i = 0; i < ARRAY_SIZE (grub_usbms_devices); i++)
+    {
+      grub_usbms_devices[i]->dev->config[grub_usbms_devices[i]->config]
+	.interf[grub_usbms_devices[i]->interface].detach_hook = 0;
+      grub_usbms_devices[i]->dev->config[grub_usbms_devices[i]->config]
+	.interf[grub_usbms_devices[i]->interface].attached = 0;
+    }
+  grub_usb_unregister_attach_hook_class (&attach_hook);
   grub_scsi_dev_unregister (&grub_usbms_dev);
 }
diff --git a/include/grub/usb.h b/include/grub/usb.h
index 64dc78d61..239905623 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -125,6 +125,13 @@ struct grub_usb_interface
   struct grub_usb_desc_if *descif;
 
   struct grub_usb_desc_endp *descendp;
+
+  /* A driver is handling this interface. Do we need to support multiple drivers
+     for single interface?
+   */
+  int attached;
+
+  void (*detach_hook) (struct grub_usb_device *dev, int config, int interface);
 };
 
 struct grub_usb_configuration
@@ -207,4 +214,17 @@ grub_usb_get_config_interface (struct grub_usb_desc_config *config)
   return interf;
 }
 
+typedef int (*grub_usb_attach_hook_class) (grub_usb_device_t usbdev,
+					   int configno, int interfno);
+
+struct grub_usb_attach_desc
+{
+  struct grub_usb_attach_desc *next;
+  int class;
+  grub_usb_attach_hook_class hook;
+};
+
+void grub_usb_register_attach_hook_class (struct grub_usb_attach_desc *desc);
+void grub_usb_unregister_attach_hook_class (struct grub_usb_attach_desc *desc);
+
 #endif /* GRUB_USB_H */

From 5434f8bf3abfb5510c8a78096ecad7e3e03c87ac Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Jun 2010 21:54:25 +0200
Subject: [PATCH 1067/1628] Remove extra empty line

---
 bus/usb/ohci.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 956a27292..47cca7ce4 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -222,7 +222,6 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   if ((revision & 0xFF) != 0x10)
     goto fail;
 
-
   {
     grub_uint32_t control;
     /* Check SMM/BIOS ownership of OHCI (SMM = USB Legacy Support driver for BIOS) */

From f5db3949e716e94cb2674aedf38414bd1232616d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Jun 2010 21:54:51 +0200
Subject: [PATCH 1068/1628] Some hotplug support (buggy)

---
 bus/usb/usb.c      |  22 ++++++++-
 bus/usb/usbhub.c   | 113 ++++++++++++++++++++++++++++++++++++---------
 disk/usbms.c       |   5 ++
 include/grub/usb.h |   2 +
 4 files changed, 117 insertions(+), 25 deletions(-)

diff --git a/bus/usb/usb.c b/bus/usb/usb.c
index 79a79e644..9a78f2c4a 100644
--- a/bus/usb/usb.c
+++ b/bus/usb/usb.c
@@ -24,6 +24,7 @@
 #include <grub/list.h>
 
 static grub_usb_controller_dev_t grub_usb_list;
+struct grub_usb_attach_desc *attach_hooks;
 
 void
 grub_usb_controller_dev_register (grub_usb_controller_dev_t usb)
@@ -224,6 +225,25 @@ grub_usb_device_initialize (grub_usb_device_t dev)
 	}
     }
 
+  /* XXX: Just check configuration 0 for now.  */
+  for (i = 0; i < dev->config[0].descconf->numif; i++)
+    {
+      struct grub_usb_desc_if *interf;
+      struct grub_usb_attach_desc *desc;
+
+      interf = dev->config[0].interf[i].descif;
+
+      grub_dprintf ("usb", "iterate: interf=%d, class=%d, subclass=%d, protocol=%d\n",
+		    i, interf->class, interf->subclass, interf->protocol);
+
+      if (dev->config[0].interf[i].attached)
+	continue;
+
+      for (desc = attach_hooks; desc; desc = desc->next)
+	if (interf->class == desc->class && desc->hook (dev, 0, i))
+	  dev->config[0].interf[i].attached = 1;
+    }
+
   return GRUB_USB_ERR_NONE;
 
  fail:
@@ -234,8 +254,6 @@ grub_usb_device_initialize (grub_usb_device_t dev)
   return err;
 }
 
-struct grub_usb_attach_desc *attach_hooks;
-
 void
 grub_usb_register_attach_hook_class (struct grub_usb_attach_desc *desc)
 {
diff --git a/bus/usb/usbhub.c b/bus/usb/usbhub.c
index 523abf93e..48e3ce592 100644
--- a/bus/usb/usbhub.c
+++ b/bus/usb/usbhub.c
@@ -21,10 +21,22 @@
 #include <grub/mm.h>
 #include <grub/usb.h>
 #include <grub/misc.h>
+#include <grub/time.h>
 
 /* USB Supports 127 devices, with device 0 as special case.  */
 static struct grub_usb_device *grub_usb_devs[128];
 
+struct grub_usb_hub
+{
+  struct grub_usb_hub *next;
+  grub_usb_controller_t controller;
+  int nports;
+  grub_usb_speed_t *speed;
+  grub_usb_device_t dev;
+};
+
+struct grub_usb_hub *hubs;
+
 /* Add a device that currently has device number 0 and resides on
    CONTROLLER, the Hub reported that the device speed is SPEED.  */
 static grub_usb_device_t
@@ -137,43 +149,98 @@ grub_usb_add_hub (grub_usb_device_t dev)
   return GRUB_ERR_NONE;
 }
 
+static void
+attach_root_port (grub_usb_controller_t controller, int portno,
+		  grub_usb_speed_t speed)
+{
+  grub_usb_device_t dev;
+  grub_err_t err;
+
+  /* Enable the port.  */
+  err = controller->dev->portstatus (controller, portno, 0);
+  if (err)
+    return;
+
+  /* Enable the port.  */
+  err = controller->dev->portstatus (controller, portno, 1);
+  if (err)
+    return;
+
+  /* Enable the port and create a device.  */
+  dev = grub_usb_hub_add_dev (controller, speed);
+  if (! dev)
+    return;
+
+  /* If the device is a Hub, scan it for more devices.  */
+  if (dev->descdev.class == 0x09)
+    grub_usb_add_hub (dev);
+}
+
 grub_usb_err_t
 grub_usb_root_hub (grub_usb_controller_t controller)
 {
-  grub_err_t err;
-  int ports;
   int i;
+  struct grub_usb_hub *hub;
+
+  hub = grub_malloc (sizeof (*hub));
+  if (!hub)
+    return GRUB_USB_ERR_INTERNAL;
+
+  hub->next = hubs;
+  hubs = hub;
+  hub->controller = grub_malloc (sizeof (*controller));
+  if (!hub->controller)
+    return GRUB_USB_ERR_INTERNAL;
+
+  grub_memcpy (hub->controller, controller, sizeof (*controller));
+  hub->dev = 0;
 
   /* Query the number of ports the root Hub has.  */
-  ports = controller->dev->hubports (controller);
-
-  for (i = 0; i < ports; i++)
+  hub->nports = controller->dev->hubports (controller);
+  hub->speed = grub_malloc (sizeof (hub->speed[0]) * hub->nports);
+  if (!hub->speed)
     {
-      grub_usb_speed_t speed = controller->dev->detect_dev (controller, i);
+      grub_free (hub);
+      return GRUB_USB_ERR_INTERNAL;
+    }
 
-      if (speed != GRUB_USB_SPEED_NONE)
-	{
-	  grub_usb_device_t dev;
+  for (i = 0; i < hub->nports; i++)
+    {
+      hub->speed[i] = controller->dev->detect_dev (hub->controller, i);
 
-	  /* Enable the port.  */
-	  err = controller->dev->portstatus (controller, i, 1);
-	  if (err)
-	    continue;
-
-	  /* Enable the port and create a device.  */
-	  dev = grub_usb_hub_add_dev (controller, speed);
-	  if (! dev)
-	    continue;
-
-	  /* If the device is a Hub, scan it for more devices.  */
-	  if (dev->descdev.class == 0x09)
-	    grub_usb_add_hub (dev);
-	}
+      if (hub->speed[i] != GRUB_USB_SPEED_NONE)
+	attach_root_port (hub->controller, i, hub->speed[i]);
     }
 
   return GRUB_USB_ERR_NONE;
 }
 
+void
+grub_usb_poll_devices (void)
+{
+  struct grub_usb_hub *hub;
+
+  for (hub = hubs; hub; hub = hub->next)
+    {
+      int i;
+      /* Do we have to recheck number of ports?  */
+      for (i = 0; i < hub->nports; i++)
+	{
+	  grub_usb_speed_t speed;
+
+	  speed = hub->controller->dev->detect_dev (hub->controller, i);
+
+	  if (speed == hub->speed[i])
+	    continue;
+
+	  if (hub->speed[i] == GRUB_USB_SPEED_NONE
+	      && speed != GRUB_USB_SPEED_NONE)
+	    attach_root_port (hub->controller, i, speed);
+	  hub->speed[i] = speed;
+	}
+    }
+}
+
 int
 grub_usb_iterate (int (*hook) (grub_usb_device_t dev))
 {
diff --git a/disk/usbms.c b/disk/usbms.c
index 84597aa01..5550ff770 100644
--- a/disk/usbms.c
+++ b/disk/usbms.c
@@ -209,6 +209,8 @@ grub_usbms_iterate (int (*hook) (const char *name, int luns))
 {
   unsigned i;
 
+  grub_usb_poll_devices ();
+
   for (i = 0; i < ARRAY_SIZE (grub_usbms_devices); i++)
     if (grub_usbms_devices[i])
       {
@@ -389,6 +391,9 @@ grub_usbms_open (const char *name, struct grub_scsi *scsi)
 		       "not a USB Mass Storage device");
 
   devnum = grub_strtoul (name + 3, NULL, 10);
+
+  grub_usb_poll_devices ();
+
   if (!grub_usbms_devices[devnum])
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
 		       "not a USB Mass Storage device");
diff --git a/include/grub/usb.h b/include/grub/usb.h
index 239905623..7c9dba12a 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -227,4 +227,6 @@ struct grub_usb_attach_desc
 void grub_usb_register_attach_hook_class (struct grub_usb_attach_desc *desc);
 void grub_usb_unregister_attach_hook_class (struct grub_usb_attach_desc *desc);
 
+void grub_usb_poll_devices (void);
+
 #endif /* GRUB_USB_H */

From 7a4c893eb046a852fee405949c281febe92113a9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 2 Jun 2010 21:55:29 +0200
Subject: [PATCH 1069/1628] Poll device in usbtest

---
 commands/usbtest.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/commands/usbtest.c b/commands/usbtest.c
index 191c4e4df..213288b52 100644
--- a/commands/usbtest.c
+++ b/commands/usbtest.c
@@ -194,6 +194,8 @@ grub_cmd_usbtest (grub_command_t cmd __attribute__ ((unused)),
 		  int argc __attribute__ ((unused)),
 		  char **args __attribute__ ((unused)))
 {
+  grub_usb_poll_devices ();
+
   grub_printf ("USB devices:\n\n");
   grub_usb_iterate (usb_iterate);
 

From 0819fec8a1f8820bfdfac08e9c1e188136bedf29 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Wed, 2 Jun 2010 22:48:13 +0100
Subject: [PATCH 1070/1628] * docs/grub.texi (Simple configuration): Fix
 copy-and-paste typo. Thanks to Jordan Uggla for spotting this.

---
 ChangeLog      | 5 +++++
 docs/grub.texi | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 49583746c..8036c7fdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (Simple configuration): Fix copy-and-paste typo.
+	Thanks to Jordan Uggla for spotting this.
+
 2010-06-02  Aleš Nesrsta <starous@volny.cz>
 
 	Finally make USB usable.
diff --git a/docs/grub.texi b/docs/grub.texi
index 1f0c2083e..d73c03d9b 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -877,7 +877,7 @@ Valid terminal output names depend on the platform, but may include
 @samp{gfxterm} (graphics-mode output), @samp{ofconsole} (Open Firmware
 console), or @samp{vga_text} (VGA text output, mainly useful with Coreboot).
 
-The default is to use the platform's native terminal input.
+The default is to use the platform's native terminal output.
 
 @item GRUB_TERMINAL
 If this option is set, it overrides both @samp{GRUB_TERMINAL_INPUT} and

From 9d9b5833508080ef4146e8fd4db3dcbd91fcf194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Thu, 3 Jun 2010 00:47:22 +0200
Subject: [PATCH 1071/1628] Handle all possible disk device names for NetBSD.

---
 ChangeLog           |  6 ++++++
 kern/emu/hostdisk.c | 41 +++++++++++++++++++++++++++--------------
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8036c7fdb..7279197ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-02  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* kern/emu/hostdisk.c (convert_system_partition_to_system_disk)
+	[__NetBSD__]: Handle all device names matching /dev/r[a-z]+[0-9][a-z].
+	(find_partition_start) [__NetBSD__]: Correct error messages for NetBSD.
+
 2010-06-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Simple configuration): Fix copy-and-paste typo.
diff --git a/kern/emu/hostdisk.c b/kern/emu/hostdisk.c
index ae2f7d9ad..fc62cca26 100644
--- a/kern/emu/hostdisk.c
+++ b/kern/emu/hostdisk.c
@@ -413,7 +413,11 @@ devmapper_fail:
   if (fd == -1)
     {
       grub_error (GRUB_ERR_BAD_DEVICE,
+# if !defined(__NetBSD__)
 		  "cannot open `%s' while attempting to get disk geometry", dev);
+# else /* defined(__NetBSD__) */
+		  "cannot open `%s' while attempting to get disk label", dev);
+# endif /* !defined(__NetBSD__) */
       return 0;
     }
 
@@ -425,7 +429,11 @@ devmapper_fail:
 # endif /* !defined(__NetBSD__) */
     {
       grub_error (GRUB_ERR_BAD_DEVICE,
+# if !defined(__NetBSD__)
 		  "cannot get disk geometry of `%s'", dev);
+# else /* defined(__NetBSD__) */
+		  "cannot get disk label of `%s'", dev);
+# endif /* !defined(__NetBSD__) */
       close (fd);
       return 0;
     }
@@ -1256,22 +1264,28 @@ devmapper_out:
   return path;
 
 #elif defined(__NetBSD__)
-  /* NetBSD uses "/dev/r[wsc]d[0-9]+[a-z]".  */
+  /* NetBSD uses "/dev/r[a-z]+[0-9][a-z]".  */
   char *path = xstrdup (os_dev);
-  if (strncmp ("/dev/rwd", path, 8) == 0 ||
-      strncmp ("/dev/rsd", path, 8) == 0 ||
-      strncmp ("/dev/rcd", path, 8) == 0)
+  if (strncmp ("/dev/r", path, sizeof("/dev/r") - 1) == 0 &&
+      (path[sizeof("/dev/r") - 1] >= 'a' && path[sizeof("/dev/r") - 1] <= 'z') &&
+      strncmp ("fd", path + sizeof("/dev/r") - 1, sizeof("fd") - 1) != 0)    /* not a floppy device name */
     {
-      char *q;
-      q = path + strlen(path) - 1;    /* last character */
-      if (grub_isalpha(*q) && grub_isdigit(*(q-1)))
-        {
-          int rawpart = -1;
+      char *p;
+      for (p = path + sizeof("/dev/r"); *p >= 'a' && *p <= 'z'; p++);
+      if (grub_isdigit(*p))
+	{
+	  p++;
+	  if ((*p >= 'a' && *p <= 'z') && (*(p+1) == '\0'))
+	    {
+	      /* path matches the required regular expression and
+		 p points to its last character.  */
+	      int rawpart = -1;
 # ifdef HAVE_GETRAWPARTITION
-          rawpart = getrawpartition();
+	      rawpart = getrawpartition();
 # endif /* HAVE_GETRAWPARTITION */
-          if (rawpart >= 0)
-            *q = 'a' + rawpart;
+	      if (rawpart >= 0)
+		*p = 'a' + rawpart;
+	    }
         }
     }
   return path;
@@ -1429,8 +1443,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
       return name;
 # else /* defined(__NetBSD__) */
     /* Since os_dev and convert_system_partition_to_system_disk (os_dev) are
-     * different, we know that os_dev is of the form /dev/r[wsc]d[0-9]+[a-z]
-     * and in particular it cannot be a floppy device.  */
+     * different, we know that os_dev cannot be a floppy device.  */
 # endif /* !defined(__NetBSD__) */
 
     start = find_partition_start (os_dev);

From a60f6ee1ac67f2145259ab9674789bbced6078cb Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 3 Jun 2010 11:52:33 +0530
Subject: [PATCH 1072/1628] cleanup

---
 Makefile.am                   |  27 ++----
 autogen.sh                    |  42 +++++----
 configure.ac                  |  19 +---
 configure.common              |  55 +++++++-----
 gentpl.py                     |  35 +++++---
 grub-core/Makefile.extra-dist |  14 +--
 grub-core/Makefile.vars       |  11 +--
 grub-core/configure.ac        |  24 +----
 grub-core/gendistlist.sh      |  46 ----------
 grub-core/genmoddep.awk       |   5 +-
 grub-core/include/grub/dl.h   |   4 +-
 grub-core/modules.def         |  26 ++++++
 mkinstalldirs                 | 161 ----------------------------------
 modules.def                   |   1 +
 tests/util/grub-shell.in      |   4 -
 15 files changed, 131 insertions(+), 343 deletions(-)
 delete mode 100755 grub-core/gendistlist.sh
 delete mode 100644 mkinstalldirs

diff --git a/Makefile.am b/Makefile.am
index c0d6d003b..6b6f9e10c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,6 @@
 AUTOMAKE_OPTIONS = subdir-objects
 DEPDIR = .deps-util
-
-EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def		\
-									\
-	geninit.sh							\
-									\
-	gnulib/progname.h gnulib/fnmatch_loop.c gnulib/alloca.h		\
-	gnulib/error.h gnulib/fnmatch.h gnulib/getopt.h			\
-	gnulib/getopt_int.h gnulib/gettext.h gnulib/progname.h		\
-									\
-	util/mkisofs/mkisofs.h util/mkisofs/iso9660.h			\
-	util/mkisofs/include/prototyp.h util/mkisofs/defaults.h		\
-	util/mkisofs/match.h util/mkisofs/exclude.h			\
-	util/mkisofs/msdos_partition.h util/mkisofs/include/fctldefs.h	\
-	util/mkisofs/include/mconfig.h util/mkisofs/include/statdefs.h
+EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
 
 SUBDIRS = . grub-core po docs
 
@@ -46,15 +33,17 @@ grub_script.yy.c grub_script.yy.h: $(top_srcdir)/grub-core/script/yylex.l
 CLEANFILES += grub_script.yy.c grub_script.yy.h
 
 # For libutil.a
-libutil_a_init.lst: grub_script.tab.h grub_script.yy.h $(libutil_a_SOURCES)
-	rm -f $@
+libutil.pp: grub_script.tab.h grub_script.yy.h $(libutil_a_SOURCES)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutil_a_CPPFLAGS) $(CPPFLAGS) \
-	  -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ \
-	  | grep '@MARKER@' | sed 's/@MARKER@\(.*\)@/\1/g' | sort -u > $@ || (rm -f $@; exit 1)
+	  -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1)
+CLEANFILES += libutil.pp
+
+libutil_a_init.lst: libutil.pp
+	cat $< | grep '@MARKER@' | sed 's/@MARKER@\(.*\)@/\1/g' | sort -u > $@ || (rm -f $@; exit 1)
 CLEANFILES += libutil_a_init.lst
 
 libutil_a_init.c: libutil_a_init.lst $(top_srcdir)/geninit.sh
-	rm -f $@; sh $(top_srcdir)/geninit.sh `cat $<` > $@ || (rm -f $@; exit 1)
+	sh $(top_srcdir)/geninit.sh `cat $<` > $@ || (rm -f $@; exit 1)
 CLEANFILES += libutil_a_init.c
 
 if COND_GRUB_MKFONT
diff --git a/autogen.sh b/autogen.sh
index 5358d45f1..db640702b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,33 +2,39 @@
 
 set -e
 
-ln -sf ../NEWS             grub-core/
-ln -sf ../README           grub-core/
-ln -sf ../INSTALL          grub-core/
-ln -sf ../AUTHORS          grub-core/
-ln -sf ../COPYING          grub-core/
-ln -sf ../ABOUT-NLS        grub-core/
-ln -sf ../ChangeLog        grub-core/
-ln -sf ../aclocal.m4       grub-core/
-ln -sf ../acinclude.m4     grub-core/
-ln -sf ../config.rpath     grub-core/
-ln -sf ../gentpl.py        grub-core/
-ln -sf ../configure.common grub-core/
-
-ln -sf grub-core/include .
-ln -sf grub-core/gnulib .
-ln -sf grub-core/lib .
+echo "Creating symlinks..."
+ln -svf ../NEWS grub-core/
+ln -svf ../TODO grub-core/
+ln -svf ../THANKS grub-core/
+ln -svf ../README grub-core/
+ln -svf ../INSTALL grub-core/
+ln -svf ../AUTHORS grub-core/
+ln -svf ../COPYING grub-core/
+ln -svf ../ABOUT-NLS grub-core/
+ln -svf ../ChangeLog grub-core/
+ln -svf ../aclocal.m4 grub-core/
+ln -svf ../acinclude.m4 grub-core/
+ln -svf ../config.rpath grub-core/
+ln -svf ../gentpl.py grub-core/
+ln -svf ../configure.common grub-core/
 
+echo "Creating Makefile.tpl..."
 python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl
+echo "Running autogen..."
 autogen -T Makefile.tpl modules.def | sed -e '/^$/{N;/^\n$/D;}' > modules.am
 
+echo "Creating grub-core/Makefile.tpl..."
 (cd grub-core && python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl)
+echo "Running autogen..."
 (cd grub-core && autogen -T Makefile.tpl modules.def | sed -e '/^$/{N;/^\n$/D;}' > modules.am)
 
-(cd grub-core && echo timestamp > stamp-h.in)
+echo "Importing libgcrypt..."
 (cd grub-core && python import_gcry.py lib/libgcrypt/ .)
 
+echo "Saving timestamps..."
 echo timestamp > stamp-h.in
-autoreconf -vi
+(cd grub-core && echo timestamp > stamp-h.in)
 
+echo "Running autoreconf..."
+autoreconf -vi
 exit 0
diff --git a/configure.ac b/configure.ac
index 10c527565..dfbc6b8be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,23 +44,10 @@ AC_CONFIG_HEADER([config.h])
 
 m4_include([configure.common])
 
-# Output files.
-grub_CHECK_LINK_DIR
-if test x"$link_dir" = xyes ; then
-  AC_CONFIG_LINKS([include/grub/cpu:grub-core/include/grub/$target_cpu])
-  if test "$platform" != emu ; then
-    AC_CONFIG_LINKS([include/grub/machine:grub-core/include/grub/$target_cpu/$platform])
-  fi
-else
-  mkdir -p include/grub 2>/dev/null
-  rm -rf include/grub/cpu
-  cp -rp $srcdir/grub-core/include/grub/$target_cpu include/grub/cpu 2>/dev/null
-  if test "$platform" != emu ; then
-    rm -rf include/grub/machine
-    cp -rp $srcdir/grub-core/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
-  fi
-fi
+grub_coredir='grub-core'
+AC_SUBST(grub_coredir)
 
+# Output files.
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([po/Makefile])
 AC_CONFIG_FILES([docs/Makefile])
diff --git a/configure.common b/configure.common
index 8c100e2da..ecd9ff190 100644
--- a/configure.common
+++ b/configure.common
@@ -19,12 +19,11 @@
 AC_ARG_PROGRAM
 
 # Optimization flag.  Allow user to override.
-if test "x$CFLAGS" = x; then
-  CFLAGS="$CFLAGS -Os"
+if test "x$TARGET_CFLAGS" = x; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -Os"
 fi
 
 # Default HOST_CPPFLAGS
-CPPFLAGS=''
 HOST_CPPFLAGS="$HOST_CPPFLAGS -Wall -W"
 HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_srcdir)/grub-core/include"
 HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
@@ -43,11 +42,13 @@ case "$target_cpu" in
   sparc)	target_cpu=sparc64 ;;
   mipsel|mips64el)
                 target_cpu=mips;
-		cpu_CPPFLAGS="-DGRUB_CPU_MIPSEL=1";
+		HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_CPU_MIPSEL=1";
+		TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DGRUB_CPU_MIPSEL=1";
 		;;
   mips|mips64)
                 target_cpu=mips;
-		cpu_CPPFLAGS="-DGRUB_CPU_MIPS=1";
+		HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_CPU_MIPS=1";
+		TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DGRUB_CPU_MIPS=1";
 		;;
 esac
 
@@ -122,28 +123,24 @@ case "$host_os" in
 esac
 
 case "$platform" in
-  coreboot)	machine_CPPFLAGS="-DGRUB_MACHINE_COREBOOT=1" ;;
-  multiboot)	machine_CPPFLAGS="-DGRUB_MACHINE_MULTIBOOT=1" ;;
-  efi)		machine_CPPFLAGS="-DGRUB_MACHINE_EFI=1" ;;
-  ieee1275)	machine_CPPFLAGS="-DGRUB_MACHINE_IEEE1275=1" ;;
-  qemu)		machine_CPPFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
-  pc)		machine_CPPFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
-  emu)		machine_CPPFLAGS="-DGRUB_MACHINE_EMU=1" ;;
-  yeeloong)	machine_CPPFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
-  qemu-mips)	machine_CPPFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  coreboot)	machine_CFLAGS="-DGRUB_MACHINE_COREBOOT=1" ;;
+  multiboot)	machine_CFLAGS="-DGRUB_MACHINE_MULTIBOOT=1" ;;
+  efi)		machine_CFLAGS="-DGRUB_MACHINE_EFI=1" ;;
+  ieee1275)	machine_CFLAGS="-DGRUB_MACHINE_IEEE1275=1" ;;
+  qemu)		machine_CFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
+  pc)		machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
+  emu)		machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
+  yeeloong)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  qemu-mips)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
 esac
 case "$target_cpu" in
-  i386)         cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_I386";;
-  x86_64)       cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_X86_64";;
-  powerpc)      cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_POWERPC";;
-  mips)      	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS=1" ;; # cpu_CPPFLAGS handled above
-  sparc64)      cpu_CPPFLAGS="$cpu_CPPFLAGS -DGRUB_CPU_SPARC64";
-                machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
+  mips)      	machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_MIPS=1" ;;
+  sparc64)      machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
 esac
-machine_CPPFLAGS="$machine_CPPFLAGS -DMACHINE=`echo ${target_cpu}_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`"
+machine_CFLAGS="$machine_CFLAGS -DMACHINE=`echo ${target_cpu}_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`"
 
-HOST_CPPFLAGS="$HOST_CPPFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
-TARGET_CPPFLAGS="$TARGET_CPPFLAGS $cpu_CPPFLAGS $machine_CPPFLAGS"
+HOST_CPPFLAGS="$HOST_CPPFLAGS $machine_CFLAGS"
+TARGET_CPPFLAGS="$TARGET_CPPFLAGS $machine_CFLAGS"
 
 AC_SUBST(host_cpu)
 AC_SUBST(host_os)
@@ -464,15 +461,25 @@ if test x"$enable_werror" != xno ; then
   TARGET_CFLAGS="$TARGET_CFLAGS -Werror"
 fi
 
-AC_SUBST(TARGET_MODULE_FORMAT)
+TARGET_CPP="$TARGET_CC -E"
+TARGET_CCAS=$TARGET_CC
+
 AC_SUBST(OBJCONV)
+AC_SUBST(TARGET_CPP)
+AC_SUBST(TARGET_CCAS)
+AC_SUBST(TARGET_OBJ2ELF)
 AC_SUBST(TARGET_APPLE_CC)
+AC_SUBST(TARGET_MODULE_FORMAT)
 
 AC_SUBST(TARGET_CFLAGS)
 AC_SUBST(TARGET_LDFLAGS)
 AC_SUBST(TARGET_CPPFLAGS)
 AC_SUBST(TARGET_CCASFLAGS)
 
+AC_SUBST(TARGET_IMG_LDSCRIPT)
+AC_SUBST(TARGET_IMG_LDFLAGS)
+AC_SUBST(TARGET_IMG_CFLAGS)
+
 AC_SUBST(HOST_CFLAGS)
 AC_SUBST(HOST_LDFLAGS)
 AC_SUBST(HOST_CPPFLAGS)
diff --git a/gentpl.py b/gentpl.py
index 9f1828d49..02369d843 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -131,11 +131,12 @@ def shared_nodist_sources(prefix=""): return collect_values("nodist_shared", pre
 
 def default_sources(prefix=""):        return collect_values("source", prefix)
 def default_nodist_sources(prefix=""): return collect_values("nodist", prefix)
-def default_ldadd():     return collect_values("ldadd")
-def default_cflags():    return collect_values("cflags")
-def default_ldflags():   return collect_values("ldflags")
-def default_cppflags():  return collect_values("cppflags")
-def default_ccasflags(): return collect_values("ccasflags")
+def default_ldadd():        return collect_values("ldadd")
+def default_cflags():       return collect_values("cflags")
+def default_ldflags():      return collect_values("ldflags")
+def default_cppflags():     return collect_values("cppflags")
+def default_ccasflags():    return collect_values("ccasflags")
+def default_extra_dist(): return collect_values("extra_dist")
 
 def group_sources(group, prefix=""):        return collect_values(group, prefix) if group else default_sources(prefix)
 def group_nodist_sources(group, prefix=""): return collect_values(group + "_nodist", prefix) if group else default_nodist_sources(prefix)
@@ -143,12 +144,13 @@ def group_nodist_sources(group, prefix=""): return collect_values(group + "_nodi
 def platform_sources(platform, prefix=""):        return each_group(platform, "", lambda g: collect_values(g, prefix) if g else default_sources(prefix))
 def platform_nodist_sources(platform, prefix=""): return each_group(platform, "_nodist", lambda g: collect_values(g + "_nodist", prefix) if g else default_nodist_sources(prefix))
 
-def platform_ldadd(platform):     return each_group(platform, "_ldadd", lambda g: collect_values(g + "_ldadd") if g else default_ldadd())
-def platform_cflags(platform):    return each_group(platform, "_cflags", lambda g: collect_values(g + "_cflags") if g else default_cflags())
-def platform_ldflags(platform):   return each_group(platform, "_ldflags", lambda g: collect_values(g + "_ldflags") if g else default_ldflags())
-def platform_cppflags(platform):  return each_group(platform, "_cppflags", lambda g: collect_values(g + "_cppflags") if g else default_cppflags())
-def platform_ccasflags(platform): return each_group(platform, "_ccasflags", lambda g: collect_values(g + "_ccasflags") if g else default_ccasflags())
-def platform_format(platform):    return each_group(platform, "_format", lambda g: collect_values(g + "_format") if g else "binary")
+def platform_ldadd(platform):        return each_group(platform, "_ldadd", lambda g: collect_values(g + "_ldadd") if g else default_ldadd())
+def platform_cflags(platform):       return each_group(platform, "_cflags", lambda g: collect_values(g + "_cflags") if g else default_cflags())
+def platform_ldflags(platform):      return each_group(platform, "_ldflags", lambda g: collect_values(g + "_ldflags") if g else default_ldflags())
+def platform_cppflags(platform):     return each_group(platform, "_cppflags", lambda g: collect_values(g + "_cppflags") if g else default_cppflags())
+def platform_ccasflags(platform):    return each_group(platform, "_ccasflags", lambda g: collect_values(g + "_ccasflags") if g else default_ccasflags())
+def platform_extra_dist(platform): return each_group(platform, "_extra_dist", lambda g: collect_values(g + "_extra_dist") if g else default_extra_dist())
+def platform_format(platform):       return each_group(platform, "_format", lambda g: collect_values(g + "_format") if g else "binary")
 
 def module(platform):
     r  = gvar_add("noinst_PROGRAMS", "[+ name +].module")
@@ -164,6 +166,7 @@ def module(platform):
     r += var_set(canonical_module() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_MODULE) " + platform_cppflags(platform))
     r += var_set(canonical_module() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_MODULE) " + platform_ccasflags(platform))
 
+    r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
     r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_module() + "_SOURCES)")
     r += gvar_add("CLEANFILES", "$(nodist_" + canonical_module() + "_SOURCES)")
 
@@ -275,6 +278,7 @@ def kernel(platform):
     r += var_set(canonical_kernel() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) " + platform_cppflags(platform))
     r += var_set(canonical_kernel() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_KERNEL) " + platform_ccasflags(platform))
 
+    r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
     r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_kernel() + "_SOURCES)")
     r += gvar_add("CLEANFILES", "$(nodist_" + canonical_kernel() + "_SOURCES)")
 
@@ -293,10 +297,12 @@ def image(platform):
     r += var_set(canonical_image() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_IMAGE) " + platform_cppflags(platform))
     r += var_set(canonical_image() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_IMAGE) " + platform_ccasflags(platform))
 
+    r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
     r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_image() + "_SOURCES)")
     r += gvar_add("CLEANFILES", "$(nodist_" + canonical_image() + "_SOURCES)")
 
     r += gvar_add("platform_DATA", "[+ name +].img")
+    r += gvar_add("CLEANFILES", "[+ name +].img")
     r += rule("[+ name +].img", "[+ name +].image", """
 if test x$(USE_APPLE_CC_FIXES) = xyes; then \
   $(MACHO2IMG) $< $@; \
@@ -316,6 +322,7 @@ def library(platform):
     r += var_set(canonical_name() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) " + platform_cppflags(platform))
     r += var_set(canonical_name() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_LIBRARY) " + platform_ccasflags(platform))
 
+    r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
     r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_name() + "_SOURCES)")
     r += gvar_add("CLEANFILES", "$(nodist_" + canonical_name() + "_SOURCES)")
 
@@ -352,6 +359,7 @@ def program(platform, test=False):
     r += var_set(canonical_name() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) " + platform_cppflags(platform))
     r += var_set(canonical_name() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM) " + platform_ccasflags(platform))
 
+    r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
     r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_name() + "_SOURCES)")
     r += gvar_add("CLEANFILES", "$(nodist_" + canonical_name() + "_SOURCES)")
 
@@ -366,7 +374,10 @@ def test_program(platform):
     return program(platform, True)
 
 def data(platform):
-    return gvar_add(installdir() + "_DATA", platform_sources(platform))
+    r  = gvar_add("EXTRA_DIST", platform_sources(platform))
+    r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
+    r += gvar_add(installdir() + "_DATA", platform_sources(platform))
+    return r
 
 def script(platform, test=False):
     if test:
diff --git a/grub-core/Makefile.extra-dist b/grub-core/Makefile.extra-dist
index c6516f06a..9979c875b 100644
--- a/grub-core/Makefile.extra-dist
+++ b/grub-core/Makefile.extra-dist
@@ -27,24 +27,14 @@ EXTRA_DIST += genhandlerlist.sh
 EXTRA_DIST += genpartmaplist.sh
 EXTRA_DIST += genparttoollist.sh
 EXTRA_DIST += genterminallist.sh
+
+EXTRA_DIST += lib/libgcrypt_wrap/cipher_wrap.h
 EXTRA_DIST += lib/libgcrypt-grub/cipher/crypto.lst
 
-EXTRA_DIST += script/yylex.l
-EXTRA_DIST += script/parser.y
-
-EXTRA_DIST += lib/relocator.c
-
-EXTRA_DIST += efiemu/loadcore.c
-EXTRA_DIST += efiemu/prepare.c
-
-EXTRA_DIST += loader/machoXX.c
-
-
 EXTRA_DIST += kern/i386/loader.S
 EXTRA_DIST += kern/i386/realmode.S
 EXTRA_DIST += loader/i386/bsdXX.c
 EXTRA_DIST += loader/i386/bsd_pagetable.c
-EXTRA_DIST += loader/i386/multiboot_elfxx.c
 EXTRA_DIST += commands/search.c
 
 EXTRA_DIST += kern/i386/pc/lzma_decode.S
diff --git a/grub-core/Makefile.vars b/grub-core/Makefile.vars
index dd4ee8d56..7d398b4c9 100644
--- a/grub-core/Makefile.vars
+++ b/grub-core/Makefile.vars
@@ -33,21 +33,22 @@ if COND_sparc64_ieee1275
 endif
 
 CPPFLAGS_GRUB = -I$(builddir) -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)
-CPPFLAGS_GRUB += -I$(top_srcdir)/include -I$(top_builddir)/include
+CPPFLAGS_GRUB += -I$(top_srcdir)/$(grub_coredir)/include
+CPPFLAGS_GRUB += -I$(top_builddir)/$(grub_coredir)/include
 
 CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
-CPPFLAGS_GCRY = -I$(top_srcdir)/lib/libgcrypt_wrap
+CPPFLAGS_GCRY = -I$(top_srcdir)/$(grub_coredir)/lib/libgcrypt_wrap
 
 CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))"
-CPPFLAGS_GNULIB = -I$(top_srcdir)/gnulib
+CPPFLAGS_GNULIB = -I$(top_srcdir)/$(grub_coredir)/gnulib
 
 CFLAGS_MKISOFS = -Wno-all -Werror
 CPPFLAGS_MKISOFS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/util/mkisofs/include
 
 CFLAGS_POSIX = -fno-builtin
-CPPFLAGS_POSIX = -I$(top_srcdir)/lib/posix_wrap
+CPPFLAGS_POSIX = -I$(top_srcdir)/$(grub_coredir)/lib/posix_wrap
 
-CPPFLAGS_EFIEMU = -I$(top_srcdir)/efiemu/runtime
+CPPFLAGS_EFIEMU = -I$(top_srcdir)/$(grub_coredir)/efiemu/runtime
 
 # to calm down automake
 BUILT_SOURCES =
diff --git a/grub-core/configure.ac b/grub-core/configure.ac
index ac462ea77..6cac2e75c 100644
--- a/grub-core/configure.ac
+++ b/grub-core/configure.ac
@@ -44,28 +44,12 @@ AC_CONFIG_HEADER([config.h])
 
 m4_include([configure.common])
 
-TARGET_CPP="$TARGET_CC -E"
-TARGET_CCAS=$TARGET_CC
-
 CC=$TARGET_CC
 CPP=$TARGET_CC
 CCAS=$TARGET_CC
 
-AC_SUBST(TARGET_CC)
-AC_SUBST(TARGET_CPP)
-AC_SUBST(TARGET_CCAS)
-AC_SUBST(TARGET_IMG_LDSCRIPT)
-AC_SUBST(TARGET_IMG_LDFLAGS)
-AC_SUBST(TARGET_IMG_CFLAGS)
-AC_SUBST(TARGET_OBJ2ELF)
-AC_SUBST(TARGET_MODULE_FORMAT)
-AC_SUBST(OBJCONV)
-AC_SUBST(TARGET_APPLE_CC)
-AC_SUBST(ASFLAGS)
-AC_SUBST(TARGET_CFLAGS)
-AC_SUBST(TARGET_ASFLAGS)
-AC_SUBST(TARGET_LDFLAGS)
-AC_SUBST(TARGET_CPPFLAGS)
+grub_coredir='.'
+AC_SUBST(grub_coredir)
 
 # Output files.
 grub_CHECK_LINK_DIR
@@ -77,10 +61,10 @@ if test x"$link_dir" = xyes ; then
 else
   mkdir -p include/grub 2>/dev/null
   rm -rf include/grub/cpu
-  cp -rp $srcdir/include/grub/$target_cpu include/grub/cpu 2>/dev/null
+  cp -rp $srcdir/grub-core/include/grub/$target_cpu include/grub/cpu 2>/dev/null
   if test "$platform" != emu ; then
     rm -rf include/grub/machine
-    cp -rp $srcdir/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
+    cp -rp $srcdir/grub-core/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
   fi
 fi
 
diff --git a/grub-core/gendistlist.sh b/grub-core/gendistlist.sh
deleted file mode 100755
index 102c0c11c..000000000
--- a/grub-core/gendistlist.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 2005, 2008, 2009  Free Software Foundation, Inc.
-#
-# This gendistlist.sh is free software; the author
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Generate a list of distributed files.
-
-EXTRA_DISTFILES="AUTHORS COPYING ChangeLog DISTLIST INSTALL NEWS README \
-	THANKS TODO Makefile.in aclocal.m4 autogen.sh config.guess \
-	config.h.in config.sub configure configure.ac gencmdlist.sh \
-	gendistlist.sh genfslist.sh genhandlerlist.sh geninit.sh \
-	geninitheader.sh genkernsyms.sh.in genmk.rb genmoddep.awk \
-	genmodsrc.sh genpartmaplist.sh genparttoollist.sh \
-	genvideolist.sh \
-	gensymlist.sh.in install-sh mkinstalldirs stamp-h.in"
-
-DISTDIRS="boot bus commands conf disk docs efiemu font fs hello hook include io \
-	kern lib loader mmap normal partmap parttool script term util video"
-
-LC_COLLATE=C
-export LC_COLLATE
-
-for f in $EXTRA_DISTFILES; do
-    echo $f
-done
-
-dir=`dirname $0`
-cd $dir
-
-for dir in $DISTDIRS; do
-  for d in `find $dir -type d ! -name .svn ! -name .bzr | sort`; do
-    find $d -maxdepth 1 -name '*.[chSy]' -o -name '*.mk' -o -name '*.rmk' \
-      -o -name '*.rb' -o -name '*.in' -o -name '*.tex' -o -name '*.texi' \
-      -o -name '*.info' -o -name 'grub.cfg' -o -name 'README' \
-      -o -name '*.sc' -o -name 'mdate-sh' -o -name '*.sh' \
-      -o -name 'grub-dumpdevtree' -o -name '*.lua' | sort
-  done
-done
diff --git a/grub-core/genmoddep.awk b/grub-core/genmoddep.awk
index 6c92e2fc7..74487eabf 100644
--- a/grub-core/genmoddep.awk
+++ b/grub-core/genmoddep.awk
@@ -22,10 +22,7 @@ BEGIN {
 {
   module = $2
 
-  # skip if empty
-  if ($1 == "" || $2 == "")
-      ;
-  else if ($1 in symtab) {
+  if ($1 in symtab) {
     modtab[module] = modtab[module] " " symtab[$1];
   }
   else if ($1 != "__gnu_local_gp") {
diff --git a/grub-core/include/grub/dl.h b/grub-core/include/grub/dl.h
index 4ed68b69a..f98539a4e 100644
--- a/grub-core/include/grub/dl.h
+++ b/grub-core/include/grub/dl.h
@@ -105,8 +105,8 @@ int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);
 int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);
 void EXPORT_FUNC(grub_dl_iterate) (int (*hook) (grub_dl_t mod));
 grub_dl_t EXPORT_FUNC(grub_dl_get) (const char *name);
-grub_err_t EXPORT_FUNC(grub_dl_register_symbol) (const char *name, void *addr,
-						 grub_dl_t mod);
+grub_err_t grub_dl_register_symbol (const char *name, void *addr,
+				    grub_dl_t mod);
 
 grub_err_t grub_arch_dl_check_header (void *ehdr);
 grub_err_t grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr);
diff --git a/grub-core/modules.def b/grub-core/modules.def
index 80bb1cbdd..348738971 100644
--- a/grub-core/modules.def
+++ b/grub-core/modules.def
@@ -348,6 +348,19 @@ module = {
 library = {
   name = libgnulib.a;
   source = gnulib/regex.c;
+
+  extra_dist = gnulib/progname.h;
+  extra_dist = gnulib/alloca.h;
+  extra_dist = gnulib/error.h;
+  extra_dist = gnulib/fnmatch.h;
+  extra_dist = gnulib/getopt.h;
+  extra_dist = gnulib/getopt_int.h;
+  extra_dist = gnulib/gettext.h;
+  extra_dist = gnulib/regcomp.c;
+  extra_dist = gnulib/regexec.c;
+  extra_dist = gnulib/fnmatch_loop.c;
+  extra_dist = gnulib/regex_internal.c;
+
   cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
   cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
   common;
@@ -823,6 +836,11 @@ module = {
   i386_pc = efiemu/prepare64.c;
   i386_pc = efiemu/pnvram.c;
   i386_pc = efiemu/i386/coredetect.c;
+
+  extra_dist = efiemu/prepare.c;
+  extra_dist = efiemu/loadcore.c;
+  extra_dist = efiemu/runtime/efiemu.S;
+  extra_dist = efiemu/runtime/efiemu.c;
 };
 
 module = {
@@ -1216,6 +1234,7 @@ module = {
   x86 = lib/i386/relocator.c;
   x86 = lib/i386/relocator_asm.S;
   x86 = lib/i386/relocator_backward.S;
+  extra_dist = lib/relocator.c;
 };
 
 module = {
@@ -1280,6 +1299,7 @@ module = {
   name = multiboot;
   source = loader/multiboot.c;
   source = loader/i386/multiboot_mbi.c;
+  extra_dist = loader/multiboot_elfxx.c;
   x86;
 };
 
@@ -1312,6 +1332,8 @@ module = {
   i386_pc = loader/macho64.c;
   i386_pc = loader/macho.c;
   i386_pc = loader/xnu.c;
+
+  extra_dist = loader/machoXX.c;
 };
 
 module = {
@@ -1445,6 +1467,10 @@ module = {
   nodist = grub_script.yy.c;
   nodist = grub_script.tab.h;
   nodist = grub_script.yy.h;
+
+  extra_dist = script/yylex.l;
+  extra_dist = script/parser.y;
+
   cflags = '$(CFLAGS_POSIX) -Wno-error';
   cppflags = '$(CPPFLAGS_POSIX)';
 };
diff --git a/mkinstalldirs b/mkinstalldirs
deleted file mode 100644
index ef7e16fda..000000000
--- a/mkinstalldirs
+++ /dev/null
@@ -1,161 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2006-05-11.19
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-IFS=" ""	$nl"
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit $?
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit $?
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
-  '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
-    fi
-    ;;
-esac
-
-for file
-do
-  case $file in
-    /*) pathcomp=/ ;;
-    *)  pathcomp= ;;
-  esac
-  oIFS=$IFS
-  IFS=/
-  set fnord $file
-  shift
-  IFS=$oIFS
-
-  for d
-  do
-    test "x$d" = x && continue
-
-    pathcomp=$pathcomp$d
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
-      else
-	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-	  lasterr=
-	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	  if test ! -z "$lasterr"; then
-	    errstatus=$lasterr
-	  fi
-	fi
-      fi
-    fi
-
-    pathcomp=$pathcomp/
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/modules.def b/modules.def
index d9758423f..a91aed83e 100644
--- a/modules.def
+++ b/modules.def
@@ -109,6 +109,7 @@ program = {
 
   source = util/grub-mkimage.c;
   source = util/resolve.c;
+  extra_dist = util/grub-mkimagexx.c;
 
   ldadd = libutil.a;
 
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 4af6a71e3..670494031 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -123,15 +123,11 @@ source /boot/grub/testcase.cfg
 halt
 EOF
 
-rootdir=`mktemp -d`
-(cd @abs_top_builddir@ && make DESTDIR=$rootdir install) >/dev/null 2>&1
-
 isofile=`mktemp`
 sh @abs_top_builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage \
   --override-directory=${builddir}/grub-core --output=${isofile} \
   boot/grub/grub.cfg=${cfgfile} \
   /boot/grub/testcase.cfg=${source} >/dev/null 2>&1
-rm -rf $rootdir
 
 hdafile=`mktemp`
 cp ${isofile} ${hdafile}

From 795b593a475327352308dfba23aeb2217599c8df Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 3 Jun 2010 09:48:23 +0100
Subject: [PATCH 1073/1628] * INSTALL: Document several build requirements for
 optional features (libdevmapper, ncurses, libusb, SDL, FreeType, GNU
 Unifont).

---
 ChangeLog |  5 +++++
 INSTALL   | 15 +++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 7279197ee..d67e7efa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-03  Colin Watson  <cjwatson@ubuntu.com>
+
+	* INSTALL: Document several build requirements for optional features
+	(libdevmapper, ncurses, libusb, SDL, FreeType, GNU Unifont).
+
 2010-06-02  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* kern/emu/hostdisk.c (convert_system_partition_to_system_disk)
diff --git a/INSTALL b/INSTALL
index 7186d20db..44a442253 100644
--- a/INSTALL
+++ b/INSTALL
@@ -19,6 +19,21 @@ configuring the GRUB.
 * Flex 2.5.35 or later
 * Other standard GNU/Unix tools
 
+On GNU/Linux, you also need:
+
+* libdevmapper (recommended)
+
+To build grub-emu, you need:
+
+* ncurses
+* libusb (recommended)
+* SDL (recommended)
+
+To build GRUB's graphical terminal (gfxterm), you need:
+
+* FreeType 2 or later
+* GNU Unifont
+
 If you use a development snapshot or want to hack on GRUB you may
 need the following.
 

From 610c1efd103a09991eb8123490a812f6900e0f02 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 3 Jun 2010 15:30:15 +0530
Subject: [PATCH 1074/1628] more cleanup

---
 Makefile.am                   |  5 ++--
 configure.common              |  6 +++--
 grub-core/Makefile.am         | 12 ++++++----
 grub-core/Makefile.extra-dist | 43 -----------------------------------
 grub-core/Makefile.vars       |  7 +++---
 grub-core/modules.def         | 19 ++++++++++------
 6 files changed, 31 insertions(+), 61 deletions(-)
 delete mode 100644 grub-core/Makefile.extra-dist

diff --git a/Makefile.am b/Makefile.am
index 6b6f9e10c..9ced44636 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,8 @@ CCASFLAGS_LIBRARY = $(CCASFLAGS_PROGRAM)
 
 AM_CFLAGS =
 AM_LDFLAGS =
-AM_CPPFLAGS = $(CPPFLAGS_GRUB) -DGRUB_FILE=\"$(subst $(top_srcdir)/,,$<)\"
-AM_CCASFLAGS = -DASM_FILE=1
+AM_CPPFLAGS = $(CPPFLAGS_GRUB)
+AM_CCASFLAGS = $(CCASFLAGS_GRUB)
 
 include $(srcdir)/modules.am
 
@@ -73,4 +73,5 @@ ascii.h: ascii.bitmaps grub-bin2h
 	cp $@ $(top_builddir)/grub-core/include
 CLEANFILES += ascii.h $(top_builddir)/grub-core/include/ascii.h
 
+# Install config.h into platformdir
 platform_HEADERS = config.h
diff --git a/configure.common b/configure.common
index ecd9ff190..815c76c53 100644
--- a/configure.common
+++ b/configure.common
@@ -779,12 +779,14 @@ fi
 if test x"$device_mapper_excuse" = x ; then
   # Check for device-mapper library.
   AC_CHECK_LIB([devmapper], [dm_task_create],
-               [LDFLAGS="$LDFLAGS -ldevmapper"
+               [HOST_LDFLAGS="$HOST_LDFLAGS -ldevmapper"
                 AC_DEFINE([HAVE_DEVICE_MAPPER], [1],
                           [Define to 1 if you have the devmapper library.])],
                [device_mapper_excuse="need devmapper library"])
 fi
-AC_SUBST(ASFLAGS)
+
+pkglibrootdir='$(libdir)'/`echo $PACKAGE | sed "$program_transform_name"`
+AC_SUBST(pkglibrootdir)
 
 AC_SUBST([FONT_SOURCE])
 AS_IF([test x$target_cpu = xi386 -a x$platform = xpc],
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 1f2657656..71abb5a7a 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -1,8 +1,12 @@
 AUTOMAKE_OPTIONS = subdir-objects
 SUBDIRS = po
 DEPDIR = .deps-core
+EXTRA_DIST = gentpl.py modules.def Makefile.tpl genmoddep.awk
+EXTRA_DIST += genmodsrc.sh gensymlist.sh genemuinit.sh genemuinitheader.sh
+EXTRA_DIST += genfslist.sh gencmdlist.sh genvideolist.sh genhandlerlist.sh
+EXTRA_DIST += genpartmaplist.sh genparttoollist.sh genterminallist.sh
+EXTRA_DIST += $(shell find $(top_srcdir) -name '*.h')
 
-include $(top_srcdir)/Makefile.extra-dist
 include $(top_srcdir)/Makefile.vars
 
 LDADD_KERNEL = -lgcc
@@ -30,10 +34,10 @@ LDFLAGS_PROGRAM = $(TARGET_LDFLAGS) $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM)
 CPPFLAGS_PROGRAM = $(TARGET_CPPFLAGS) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
 CCASFLAGS_PROGRAM = $(TARGET_CCASFLAGS) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
 
-AM_CFLAGS = 
+AM_CFLAGS =
 AM_LDFLAGS =
-AM_CPPFLAGS = $(CPPFLAGS_GRUB) -DGRUB_FILE=\"$(subst $(top_srcdir)/,,$<)\"
-AM_CCASFLAGS = -DASM_FILE=1
+AM_CPPFLAGS = $(CPPFLAGS_GRUB)
+AM_CCASFLAGS = $(CCASFLAGS_GRUB)
 
 # gentrigtables
 gentrigtables: $(top_srcdir)/gentrigtables.c
diff --git a/grub-core/Makefile.extra-dist b/grub-core/Makefile.extra-dist
deleted file mode 100644
index 9979c875b..000000000
--- a/grub-core/Makefile.extra-dist
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Extra files that need to be distributed (in .tar.gz) to build
-# successfully on user site.
-#
-# XXX Remove wildcards;  See 27.3 in automake.info
-#
-
-EXTRA_DIST =
-
-EXTRA_DIST += gentpl.py
-EXTRA_DIST += Makefile.tpl
-EXTRA_DIST += modules.def
-
-EXTRA_DIST += gentrigtables.c
-
-EXTRA_DIST += genmoddep.awk
-EXTRA_DIST += genmodsrc.sh
-EXTRA_DIST += gensymlist.sh
-
-EXTRA_DIST += genemuinit.sh
-EXTRA_DIST += genemuinitheader.sh
-
-EXTRA_DIST += genfslist.sh
-EXTRA_DIST += gencmdlist.sh
-EXTRA_DIST += genvideolist.sh
-EXTRA_DIST += genhandlerlist.sh
-EXTRA_DIST += genpartmaplist.sh
-EXTRA_DIST += genparttoollist.sh
-EXTRA_DIST += genterminallist.sh
-
-EXTRA_DIST += lib/libgcrypt_wrap/cipher_wrap.h
-EXTRA_DIST += lib/libgcrypt-grub/cipher/crypto.lst
-
-EXTRA_DIST += kern/i386/loader.S
-EXTRA_DIST += kern/i386/realmode.S
-EXTRA_DIST += loader/i386/bsdXX.c
-EXTRA_DIST += loader/i386/bsd_pagetable.c
-EXTRA_DIST += commands/search.c
-
-EXTRA_DIST += kern/i386/pc/lzma_decode.S
-
-EXTRA_DIST += $(shell find $(top_srcdir) -name '*.h')
-
diff --git a/grub-core/Makefile.vars b/grub-core/Makefile.vars
index 7d398b4c9..db3c2a7db 100644
--- a/grub-core/Makefile.vars
+++ b/grub-core/Makefile.vars
@@ -1,8 +1,7 @@
 # -*- makefile -*-
 
-pkglibroot = $(libdir)/$(shell echo $(PACKAGE) | sed "$(transform)")
 grubconfdir = $(sysconfdir)/grub.d
-platformdir = $(pkglibroot)/$(target_cpu)-$(platform)
+platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
 
 # Platform specific options
 if COND_i386_pc
@@ -32,9 +31,11 @@ if COND_sparc64_ieee1275
   LDFLAGS_PLATFORM = -melf64_sparc -mno-relax
 endif
 
-CPPFLAGS_GRUB = -I$(builddir) -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)
+CPPFLAGS_GRUB = -DGRUB_FILE=\"`basename $<`\"
+CPPFLAGS_GRUB += -I$(builddir) -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)
 CPPFLAGS_GRUB += -I$(top_srcdir)/$(grub_coredir)/include
 CPPFLAGS_GRUB += -I$(top_builddir)/$(grub_coredir)/include
+CCASFLAGS_GRUB = -DASM_FILE=1
 
 CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
 CPPFLAGS_GCRY = -I$(top_srcdir)/$(grub_coredir)/lib/libgcrypt_wrap
diff --git a/grub-core/modules.def b/grub-core/modules.def
index 348738971..c64217d5d 100644
--- a/grub-core/modules.def
+++ b/grub-core/modules.def
@@ -215,6 +215,10 @@ kernel = {
   emu = kern/emu/console.c;
   emu = disk/host.c;
   emu = gnulib/progname.c;
+
+  extra_dist = kern/i386/loader.S;
+  extra_dist = kern/i386/realmode.S;
+  extra_dist = kern/i386/pc/lzma_decode.S;
 };
 
 program = {
@@ -247,6 +251,7 @@ program = {
 module = {
   name = trig;
   nodist = trigtables.c;
+  extra_dist = gentrigtables.c;
   common;
 };
 
@@ -349,13 +354,6 @@ library = {
   name = libgnulib.a;
   source = gnulib/regex.c;
 
-  extra_dist = gnulib/progname.h;
-  extra_dist = gnulib/alloca.h;
-  extra_dist = gnulib/error.h;
-  extra_dist = gnulib/fnmatch.h;
-  extra_dist = gnulib/getopt.h;
-  extra_dist = gnulib/getopt_int.h;
-  extra_dist = gnulib/gettext.h;
   extra_dist = gnulib/regcomp.c;
   extra_dist = gnulib/regexec.c;
   extra_dist = gnulib/fnmatch_loop.c;
@@ -633,6 +631,7 @@ module = {
   common;
   name = search;
   source = commands/search_wrap.c;
+  extra_dist = commands/search.c;
 };
 
 module = {
@@ -1066,6 +1065,8 @@ module = {
   common;
   name = crypto;
   source = lib/crypto.c;
+
+  extra_dist = lib/libgcrypt-grub/cipher/crypto.lst;
 };
 
 module = {
@@ -1273,6 +1274,10 @@ module = {
   source = loader/i386/bsd64.c;
   source = loader/i386/bsd_helper.S;
   source = loader/i386/bsd_trampoline.S;
+
+  extra_dist = loader/i386/bsdXX.c;
+  extra_dist = loader/i386/bsd_pagetable.c;
+
   i386_pc;
   i386_qemu;
   i386_coreboot;

From 1896a4aacb5ab8e6b446039f88b6536e4f8fb265 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 3 Jun 2010 15:32:21 +0530
Subject: [PATCH 1075/1628] bzignore updates

---
 .bzrignore | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/.bzrignore b/.bzrignore
index f91e72efa..a2fdef858 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -76,4 +76,29 @@ modules.am
 GPATH
 GRTAGS
 GSYMS
-GTAGS
\ No newline at end of file
+GTAGS
+Makefile.tpl
+compile
+depcomp
+mdate-sh
+texinfo.tex
+grub-core/ABOUT-NLS
+grub-core/AUTHORS
+grub-core/COPYING
+grub-core/ChangeLog
+grub-core/INSTALL
+grub-core/Makefile.tpl
+grub-core/NEWS
+grub-core/README
+grub-core/THANKS
+grub-core/TODO
+grub-core/acinclude.m4
+grub-core/compile
+grub-core/config.rpath
+grub-core/configure.common
+grub-core/depcomp
+grub-core/gentpl.py
+grub-core/conf/gcry.rmk
+grub-core/lib/libgcrypt-grub
+grub-core/include/grub/cpu
+grub-core/include/grub/machine

From d5c3b7ce0144fc8bc566b2a069a6af3a6efd8671 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 4 Jun 2010 09:34:28 +0530
Subject: [PATCH 1076/1628] rename libutil to libgrub

---
 Makefile.am           | 20 ++++++++++----------
 grub-core/Makefile.am |  1 +
 modules.def           | 30 +++++++++++++++---------------
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9ced44636..99fd490c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 AUTOMAKE_OPTIONS = subdir-objects
-DEPDIR = .deps-util
-EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
 
+DEPDIR = .deps-util
 SUBDIRS = . grub-core po docs
+EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
 
 include $(top_srcdir)/grub-core/Makefile.vars
 
@@ -32,19 +32,19 @@ grub_script.yy.c grub_script.yy.h: $(top_srcdir)/grub-core/script/yylex.l
 	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(top_srcdir)/grub-core/script/yylex.l
 CLEANFILES += grub_script.yy.c grub_script.yy.h
 
-# For libutil.a
-libutil.pp: grub_script.tab.h grub_script.yy.h $(libutil_a_SOURCES)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libutil_a_CPPFLAGS) $(CPPFLAGS) \
+# For libgrub.a
+libgrub.pp: grub_script.tab.h grub_script.yy.h $(libgrub_a_SOURCES)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgrub_a_CPPFLAGS) $(CPPFLAGS) \
 	  -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1)
-CLEANFILES += libutil.pp
+CLEANFILES += libgrub.pp
 
-libutil_a_init.lst: libutil.pp
+libgrub_a_init.lst: libgrub.pp
 	cat $< | grep '@MARKER@' | sed 's/@MARKER@\(.*\)@/\1/g' | sort -u > $@ || (rm -f $@; exit 1)
-CLEANFILES += libutil_a_init.lst
+CLEANFILES += libgrub_a_init.lst
 
-libutil_a_init.c: libutil_a_init.lst $(top_srcdir)/geninit.sh
+libgrub_a_init.c: libgrub_a_init.lst $(top_srcdir)/geninit.sh
 	sh $(top_srcdir)/geninit.sh `cat $<` > $@ || (rm -f $@; exit 1)
-CLEANFILES += libutil_a_init.c
+CLEANFILES += libgrub_a_init.c
 
 if COND_GRUB_MKFONT
 if COND_HAVE_FONT_SOURCE
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 71abb5a7a..61a69fca6 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS = subdir-objects
+
 SUBDIRS = po
 DEPDIR = .deps-core
 EXTRA_DIST = gentpl.py modules.def Makefile.tpl genmoddep.awk
diff --git a/modules.def b/modules.def
index a91aed83e..5a485f9a5 100644
--- a/modules.def
+++ b/modules.def
@@ -1,13 +1,13 @@
 AutoGen definitions Makefile.tpl;
 
 library = {
-  name = libutil.a;
+  name = libgrub.a;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
 
   nodist = grub_script.tab.c;
   nodist = grub_script.yy.c;
-  nodist = libutil_a_init.c;
+  nodist = libgrub_a_init.c;
 
   source = grub-core/gnulib/error.c;
   source = grub-core/gnulib/fnmatch.c;
@@ -98,7 +98,7 @@ library = {
 program = {
   name = grub-bin2h;
   source = util/bin2h.c;
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   mansection = 1;
   common;
 };
@@ -111,7 +111,7 @@ program = {
   source = util/resolve.c;
   extra_dist = util/grub-mkimagexx.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
 
   cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibroot)\"';
   common;
@@ -123,7 +123,7 @@ program = {
 
   source = util/grub-mkrelpath.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   common;
 };
 
@@ -133,7 +133,7 @@ program = {
 
   source = util/grub-script-check.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   common;
 };
 
@@ -143,7 +143,7 @@ program = {
 
   source = util/grub-editenv.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   common;
 };
 
@@ -153,7 +153,7 @@ program = {
 
   source = util/grub-mkpasswd-pbkdf2.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
   common;
@@ -170,7 +170,7 @@ program = {
   mansection = 1;
   source = util/grub-pe2elf.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
 };
 
 program = {
@@ -178,7 +178,7 @@ program = {
   mansection = 1;
   source = util/grub-fstest.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   enable = COND_GRUB_FSTEST;
   common;
 };
@@ -188,7 +188,7 @@ program = {
   mansection = 1;
   source = util/grub-mkfont.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   cflags = '$(freetype_cflags)';
   ldflags = '$(freetype_libs)';
   common;
@@ -208,7 +208,7 @@ program = {
   sparc64_ieee1275 = util/ieee1275/ofpath.c;
   sparc64_ieee1275 = util/ieee1275/devicemap.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   common;
 };
 
@@ -218,7 +218,7 @@ program = {
   mansection = 8;
   source = util/grub-probe.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   common;
 };
 
@@ -235,7 +235,7 @@ program = {
   sparc64_ieee1275 = util/raid.c;
   sparc64_ieee1275 = util/lvm.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
 };
 
 program = {
@@ -244,7 +244,7 @@ program = {
   source = util/ieee1275/grub-ofpathname.c;
   source = util/ieee1275/ofpath.c;
 
-  ldadd = libutil.a;
+  ldadd = libgrub.a;
   sparc64_ieee1275;
 };
 

From c0bb7fb68fd1ea581d135a5f9ebef14e52289c92 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 4 Jun 2010 10:30:25 +0530
Subject: [PATCH 1077/1628] add -lutil for netbsd

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 99fd490c2..8e26d3403 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
 include $(top_srcdir)/grub-core/Makefile.vars
 
 CFLAGS_PROGRAM = $(HOST_CFLAGS) $(CFLAGS_GNULIB)
-LDFLAGS_PROGRAM = $(HOST_LDFLAGS) $(LDFLAGS_GNULIB) $(LIBINTL)
+LDFLAGS_PROGRAM = $(HOST_LDFLAGS) $(LDFLAGS_GNULIB) $(LIBINTL) $(LIBUTIL)
 CPPFLAGS_PROGRAM = $(HOST_CPPFLAGS) $(CPPFLAGS_GNULIB)
 CCASFLAGS_PROGRAM = $(HOST_CCASFLAGS) $(CCASFLAGS_GNULIB)
 

From b89561390ca9464072f373de1963758c20090cf5 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 4 Jun 2010 15:00:59 +0530
Subject: [PATCH 1078/1628] remove Ruby requirement from INSTALL

---
 INSTALL | 1 -
 1 file changed, 1 deletion(-)

diff --git a/INSTALL b/INSTALL
index 7186d20db..585c7e0b4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -22,7 +22,6 @@ configuring the GRUB.
 If you use a development snapshot or want to hack on GRUB you may
 need the following.
 
-* Ruby 1.6 or later
 * Python 2.5.2 or later
 * Autoconf 2.60 or later
 * Automake 1.10.1 or later

From d3ff5a05ebd200dad68632fbed0d408a8633335a Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 4 Jun 2010 16:48:42 +0530
Subject: [PATCH 1079/1628] fix for cygwin build

---
 configure.ac           | 4 ++--
 configure.common       | 6 +++---
 grub-core/Makefile.am  | 1 +
 grub-core/configure.ac | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index dfbc6b8be..9ea1486b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,11 +42,11 @@ AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR([grub-core/include/grub/dl.h])
 AC_CONFIG_HEADER([config.h])
 
-m4_include([configure.common])
-
 grub_coredir='grub-core'
 AC_SUBST(grub_coredir)
 
+m4_include([configure.common])
+
 # Output files.
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([po/Makefile])
diff --git a/configure.common b/configure.common
index 815c76c53..ac3c4edd4 100644
--- a/configure.common
+++ b/configure.common
@@ -356,10 +356,10 @@ if test x$grub_cv_apple_target_cc = xyes ; then
 else
   TARGET_APPLE_CC=0
 # Use linker script if present, otherwise use builtin -N script.
-if test -f "${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
-  TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
+if test -f "${srcdir}/${grub_coredir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
+  TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/${grub_coredir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
   TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}  -Wl,-Ttext,"
-  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc  -Wl,-Ttext,"
+  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/${grub_coredir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc  -Wl,-Ttext,"
 else
   TARGET_IMG_LDSCRIPT=
   TARGET_IMG_LDFLAGS='-Wl,-N  -Wl,-Ttext,'
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 61a69fca6..85433431d 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -6,6 +6,7 @@ EXTRA_DIST = gentpl.py modules.def Makefile.tpl genmoddep.awk
 EXTRA_DIST += genmodsrc.sh gensymlist.sh genemuinit.sh genemuinitheader.sh
 EXTRA_DIST += genfslist.sh gencmdlist.sh genvideolist.sh genhandlerlist.sh
 EXTRA_DIST += genpartmaplist.sh genparttoollist.sh genterminallist.sh
+EXTRA_DIST += conf/i386-pc-cygwin-img-ld.sc
 EXTRA_DIST += $(shell find $(top_srcdir) -name '*.h')
 
 include $(top_srcdir)/Makefile.vars
diff --git a/grub-core/configure.ac b/grub-core/configure.ac
index 6cac2e75c..8d7d760ac 100644
--- a/grub-core/configure.ac
+++ b/grub-core/configure.ac
@@ -42,15 +42,15 @@ AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR([include/grub/dl.h])
 AC_CONFIG_HEADER([config.h])
 
+grub_coredir='.'
+AC_SUBST(grub_coredir)
+
 m4_include([configure.common])
 
 CC=$TARGET_CC
 CPP=$TARGET_CC
 CCAS=$TARGET_CC
 
-grub_coredir='.'
-AC_SUBST(grub_coredir)
-
 # Output files.
 grub_CHECK_LINK_DIR
 if test x"$link_dir" = xyes ; then

From 9cdfe32f0916b227ed0ae1211bc1089684063207 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 4 Jun 2010 13:38:10 +0100
Subject: [PATCH 1080/1628] * util/grub-mkimage.c: Make target-related error
 messages slightly more helpful; -O talks about "format".  Explicitly point to
 the use of -O if no target is specified. Reported by: Didier Raboud (Debian
 bug #584415).

---
 ChangeLog           | 7 +++++++
 util/grub-mkimage.c | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d67e7efa4..fd2f8ae72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-04  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkimage.c: Make target-related error messages slightly
+	more helpful; -O talks about "format".  Explicitly point to the use
+	of -O if no target is specified.
+	Reported by: Didier Raboud (Debian bug #584415).
+
 2010-06-03  Colin Watson  <cjwatson@ubuntu.com>
 
 	* INSTALL: Document several build requirements for optional features
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 6366a9803..4e39450df 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -1253,7 +1253,7 @@ main (int argc, char *argv[])
 		  image_target = &image_targets[i];
 	      if (!image_target)
 		{
-		  printf ("unknown target %s\n", optarg);
+		  printf ("unknown target format %s\n", optarg);
 		  usage (1);
 		}
 	      break;
@@ -1322,7 +1322,7 @@ main (int argc, char *argv[])
 
   if (!image_target)
     {
-      printf ("Target not specified.\n");
+      printf ("Target format not specified (use the -O option).\n");
       usage (1);
     }
 

From f28a9212b4465c2b106b4abd057779ddc3c69b3b Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 4 Jun 2010 13:53:30 +0100
Subject: [PATCH 1081/1628] =?UTF-8?q?*=20util/grub-mkconfig=5Flib.in=20(pr?=
 =?UTF-8?q?epare=5Fgrub=5Fto=5Faccess=5Fdevice):=20Prepend=20"part=5F"=20t?=
 =?UTF-8?q?o=20partmap=20module=20names,=20in=20line=20with=20grub-install?=
 =?UTF-8?q?.=20Reported=20by:=20Jind=C5=99ich=20Makovi=C4=8Dka=20(Debian?=
 =?UTF-8?q?=20bug=20#584426).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ChangeLog                 | 6 ++++++
 util/grub-mkconfig_lib.in | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fd2f8ae72..65a3c69b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-04  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Prepend
+	"part_" to partmap module names, in line with grub-install.
+	Reported by: Jindřich Makovička (Debian bug #584426).
+
 2010-06-04  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkimage.c: Make target-related error messages slightly
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 7ec8cb5be..14ea1842f 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -107,7 +107,7 @@ prepare_grub_to_access_device ()
 
   partmap="`${grub_probe} --device ${device} --target=partmap`"
   for module in ${partmap} ; do
-    echo "insmod ${module}"
+    echo "insmod part_${module}"
   done
 
   fs="`${grub_probe} --device ${device} --target=fs`"

From 40f8acbc5b0bc14ca023e071013283f76dd24b64 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 5 Jun 2010 11:40:25 +0530
Subject: [PATCH 1082/1628] cleanup

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 8e26d3403..181f3e9ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
 include $(top_srcdir)/grub-core/Makefile.vars
 
 CFLAGS_PROGRAM = $(HOST_CFLAGS) $(CFLAGS_GNULIB)
-LDFLAGS_PROGRAM = $(HOST_LDFLAGS) $(LDFLAGS_GNULIB) $(LIBINTL) $(LIBUTIL)
+LDFLAGS_PROGRAM = $(HOST_LDFLAGS) $(LDFLAGS_GNULIB)
 CPPFLAGS_PROGRAM = $(HOST_CPPFLAGS) $(CPPFLAGS_GNULIB)
 CCASFLAGS_PROGRAM = $(HOST_CCASFLAGS) $(CCASFLAGS_GNULIB)
 

From bf14a41c81b2c743d60a208bf45bd4ff3a2aa1fa Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 5 Jun 2010 12:20:37 +0530
Subject: [PATCH 1083/1628] fixes for netbsd

---
 modules.def | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules.def b/modules.def
index 5a485f9a5..910065083 100644
--- a/modules.def
+++ b/modules.def
@@ -209,6 +209,7 @@ program = {
   sparc64_ieee1275 = util/ieee1275/devicemap.c;
 
   ldadd = libgrub.a;
+  ldadd = '$(LIBUTIL)';
   common;
 };
 
@@ -219,6 +220,7 @@ program = {
   source = util/grub-probe.c;
 
   ldadd = libgrub.a;
+  ldadd = '$(LIBUTIL)';
   common;
 };
 
@@ -236,6 +238,7 @@ program = {
   sparc64_ieee1275 = util/lvm.c;
 
   ldadd = libgrub.a;
+  ldadd = '$(LIBUTIL)';
 };
 
 program = {

From 83fb6e1d48ab01a197986056b51303ba870ec6ba Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 5 Jun 2010 13:15:18 +0530
Subject: [PATCH 1084/1628] freebsd fixes

---
 modules.def | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/modules.def b/modules.def
index 910065083..d62c5566f 100644
--- a/modules.def
+++ b/modules.def
@@ -99,6 +99,7 @@ program = {
   name = grub-bin2h;
   source = util/bin2h.c;
   ldadd = libgrub.a;
+  ldadd = '$(LIBINTL)';
   mansection = 1;
   common;
 };
@@ -112,6 +113,7 @@ program = {
   extra_dist = util/grub-mkimagexx.c;
 
   ldadd = libgrub.a;
+  ldadd = '$(LIBINTL)';
 
   cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibroot)\"';
   common;
@@ -124,6 +126,7 @@ program = {
   source = util/grub-mkrelpath.c;
 
   ldadd = libgrub.a;
+  ldadd = '$(LIBINTL)';
   common;
 };
 
@@ -134,6 +137,7 @@ program = {
   source = util/grub-script-check.c;
 
   ldadd = libgrub.a;
+  ldadd = '$(LIBINTL)';
   common;
 };
 
@@ -144,6 +148,7 @@ program = {
   source = util/grub-editenv.c;
 
   ldadd = libgrub.a;
+  ldadd = '$(LIBINTL)';
   common;
 };
 
@@ -154,6 +159,7 @@ program = {
   source = util/grub-mkpasswd-pbkdf2.c;
 
   ldadd = libgrub.a;
+  ldadd = '$(LIBINTL)';
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
   common;
@@ -179,6 +185,7 @@ program = {
   source = util/grub-fstest.c;
 
   ldadd = libgrub.a;
+  ldadd = '$(LIBINTL)';
   enable = COND_GRUB_FSTEST;
   common;
 };
@@ -188,6 +195,7 @@ program = {
   mansection = 1;
   source = util/grub-mkfont.c;
 
+  ldadd = '$(LIBINTL)';
   ldadd = libgrub.a;
   cflags = '$(freetype_cflags)';
   ldflags = '$(freetype_libs)';
@@ -209,6 +217,7 @@ program = {
   sparc64_ieee1275 = util/ieee1275/devicemap.c;
 
   ldadd = libgrub.a;
+  ldadd = '$(LIBINTL)';
   ldadd = '$(LIBUTIL)';
   common;
 };
@@ -220,6 +229,7 @@ program = {
   source = util/grub-probe.c;
 
   ldadd = libgrub.a;
+  ldadd = '$(LIBINTL)';
   ldadd = '$(LIBUTIL)';
   common;
 };
@@ -238,6 +248,7 @@ program = {
   sparc64_ieee1275 = util/lvm.c;
 
   ldadd = libgrub.a;
+  ldadd = '$(LIBINTL)';
   ldadd = '$(LIBUTIL)';
 };
 

From 71c3809882f5382ef40e434c7ac1a76d020f3577 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sat, 5 Jun 2010 20:44:44 +0100
Subject: [PATCH 1085/1628] * util/grub.d/00_header.in: Quote values assigned
 to `saved_entry', in case they contain spaces.

---
 ChangeLog                | 5 +++++
 util/grub.d/00_header.in | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 65a3c69b8..779973f1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-05  Colin Watson  <cjwatson@debian.org>
+
+	* util/grub.d/00_header.in: Quote values assigned to `saved_entry',
+	in case they contain spaces.
+
 2010-06-04  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Prepend
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 0a5cfac18..199a1d7af 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -62,7 +62,7 @@ EOF
 fi
 cat <<EOF
 if [ \${prev_saved_entry} ]; then
-  set saved_entry=\${prev_saved_entry}
+  set saved_entry="\${prev_saved_entry}"
   save_env saved_entry
   set prev_saved_entry=
   save_env prev_saved_entry
@@ -71,7 +71,7 @@ fi
 
 function savedefault {
   if [ -z \${boot_once} ]; then
-    saved_entry=\${chosen}
+    saved_entry="\${chosen}"
     save_env saved_entry
   fi
 }

From 2d465fb052397edff7b3f1b0c72d552b26d3d367 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 7 Jun 2010 17:23:54 +0530
Subject: [PATCH 1086/1628] cygwin fixes

---
 acinclude.m4              |  2 +-
 configure.ac              |  3 +++
 configure.common          | 21 ++++++++++++--------
 grub-core/Makefile.kernel |  2 +-
 grub-core/configure.ac    |  3 +++
 grub-core/modules.def     | 41 ++++++++++++++++++++++++---------------
 modules.def               | 11 ++++++++---
 7 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 72483b5d0..0615c863a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -93,7 +93,7 @@ else
 fi
 grub_cv_prog_objcopy_absolute=yes
 for link_addr in 0x2000 0x8000 0x7C00; do
-  if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib ${TARGET_IMG_LDFLAGS_AC}$link_addr conftest.o -o conftest.exec]); then :
+  if AC_TRY_COMMAND([${CC-cc} ${CFLAGS} -nostdlib ${TARGET_IMG_LDFLAGS_AC} ${TARGET_IMG_BASE_LDOPT},$link_addr conftest.o -o conftest.exec]); then :
   else
     AC_MSG_ERROR([${CC-cc} cannot link at address $link_addr])
   fi
diff --git a/configure.ac b/configure.ac
index 9ea1486b7..9b9db0ac4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,6 +45,9 @@ AC_CONFIG_HEADER([config.h])
 grub_coredir='grub-core'
 AC_SUBST(grub_coredir)
 
+grub_utildir='.'
+AC_SUBST(grub_utildir)
+
 m4_include([configure.common])
 
 # Output files.
diff --git a/configure.common b/configure.common
index ac3c4edd4..f19e107b1 100644
--- a/configure.common
+++ b/configure.common
@@ -351,19 +351,22 @@ if test x$grub_cv_apple_target_cc = xyes ; then
   fi
   TARGET_IMG_LDSCRIPT=
   TARGET_IMG_CFLAGS="-static"
-  TARGET_IMG_LDFLAGS='-nostdlib -static -Wl,-preload -Wl,-segalign,20 -Wl,-image_base,'
-  TARGET_IMG_LDFLAGS_AC='-nostdlib -static -Wl,-preload -Wl,-segalign,20 -Wl,-image_base,'
+  TARGET_IMG_LDFLAGS='-nostdlib -static -Wl,-preload -Wl,-segalign,20'
+  TARGET_IMG_LDFLAGS_AC='-nostdlib -static -Wl,-preload -Wl,-segalign,20'
+  TARGET_IMG_BASE_LDOPT="-Wl,-image_base"
 else
   TARGET_APPLE_CC=0
 # Use linker script if present, otherwise use builtin -N script.
 if test -f "${srcdir}/${grub_coredir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
   TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/${grub_coredir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
-  TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}  -Wl,-Ttext,"
-  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/${grub_coredir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc  -Wl,-Ttext,"
+  TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}"
+  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/${grub_coredir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
+  TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
 else
   TARGET_IMG_LDSCRIPT=
-  TARGET_IMG_LDFLAGS='-Wl,-N  -Wl,-Ttext,'
-  TARGET_IMG_LDFLAGS_AC='-Wl,-N  -Wl,-Ttext,'
+  TARGET_IMG_LDFLAGS='-Wl,-N'
+  TARGET_IMG_LDFLAGS_AC='-Wl,-N'
+  TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
 fi
 TARGET_IMG_CFLAGS=
 fi
@@ -371,7 +374,7 @@ fi
 # For platforms where ELF is not the default link format.
 AC_MSG_CHECKING([for command to convert module to ELF format])
 case "${host_os}" in
-  cygwin) TARGET_OBJ2ELF='grub-pe2elf';
+  cygwin) TARGET_OBJ2ELF='$(grub_utildir)/grub-pe2elf';
 # FIXME: put proper test here
   AC_DEFINE([NEED_REGISTER_FRAME_INFO], 1,
 	    [Define to 1 if GCC generates calls to __register_frame_info()])
@@ -479,6 +482,7 @@ AC_SUBST(TARGET_CCASFLAGS)
 AC_SUBST(TARGET_IMG_LDSCRIPT)
 AC_SUBST(TARGET_IMG_LDFLAGS)
 AC_SUBST(TARGET_IMG_CFLAGS)
+AC_SUBST(TARGET_IMG_BASE_LDOPT)
 
 AC_SUBST(HOST_CFLAGS)
 AC_SUBST(HOST_LDFLAGS)
@@ -523,7 +527,7 @@ if test "x$target_cpu" = xi386; then
   if test "$platform" != emu && test "x$TARGET_APPLE_CC" != x1 ; then
     if test ! -z "$TARGET_IMG_LDSCRIPT"; then
       # Check symbols provided by linker script.
-      CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC}8000 -Wl,--defsym,___main=0x8100"
+      CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC} ${TARGET_IMG_BASE_LDOPT},8000 -Wl,--defsym,___main=0x8100"
     fi
     grub_CHECK_BSS_START_SYMBOL
     grub_CHECK_END_SYMBOL
@@ -830,4 +834,5 @@ AM_CONDITIONAL([COND_GRUB_EMU_PCI], [test x$enable_grub_emu_pci = xyes])
 AM_CONDITIONAL([COND_GRUB_MKFONT], [test x$enable_grub_mkfont = xyes])
 AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x])
 AM_CONDITIONAL([COND_GRUB_FSTEST], [test x$enable_grub_fstest = xyes])
+AM_CONDITIONAL([COND_GRUB_PE2ELF], [test x$TARGET_OBJ2ELF != x])
 AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes])
diff --git a/grub-core/Makefile.kernel b/grub-core/Makefile.kernel
index 8b48cf153..866626c7a 100644
--- a/grub-core/Makefile.kernel
+++ b/grub-core/Makefile.kernel
@@ -176,8 +176,8 @@ BUILT_SOURCES += symlist.c
 
 noinst_DATA += kernel_syms.lst
 kernel_syms.lst: $(KERNEL_HEADER_FILES) config.h
-	if grep "^#define HAVE_ASM_USCORE" config.h; then u="_"; else u=""; fi
 	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) $(CFLAGS) -DGRUB_SYMBOL_GENERATOR=1 $^ >kernel_syms.input
+	if grep "^#define HAVE_ASM_USCORE" config.h; then u="_"; else u=""; fi; \
 	cat kernel_syms.input | grep -v '^#' | sed -n \
 	  -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
 	  -e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
diff --git a/grub-core/configure.ac b/grub-core/configure.ac
index 8d7d760ac..7c3175fea 100644
--- a/grub-core/configure.ac
+++ b/grub-core/configure.ac
@@ -45,6 +45,9 @@ AC_CONFIG_HEADER([config.h])
 grub_coredir='.'
 AC_SUBST(grub_coredir)
 
+grub_utildir='..'
+AC_SUBST(grub_utildir)
+
 m4_include([configure.common])
 
 CC=$TARGET_CC
diff --git a/grub-core/modules.def b/grub-core/modules.def
index c64217d5d..0e3b53fd8 100644
--- a/grub-core/modules.def
+++ b/grub-core/modules.def
@@ -5,10 +5,15 @@ kernel = {
 
   emu_ldflags              = '-Wl,-r';
   x86_efi_ldflags          = '-Wl,-r';
-  i386_pc_ldflags          = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+
+  i386_pc_ldflags          = '$(TARGET_IMG_LDFLAGS)';
+  i386_pc_ldflags          = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+
+  i386_qemu_ldflags        = '$(TARGET_IMG_LDFLAGS)';
+  i386_qemu_ldflags        = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+
   i386_coreboot_ldflags    = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
   i386_multiboot_ldflags   = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
-  i386_qemu_ldflags        = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
   i386_ieee1275_ldflags    = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
   mips_yeeloong_ldflags    = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
   powerpc_ieee1275_ldflags = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
@@ -258,10 +263,13 @@ module = {
 image = {
   name = boot;
   i386_pc = boot/i386/pc/boot.S;
-  i386_pc_ldflags = "-Wl,-Ttext=0x7C00";
-
   i386_qemu = boot/i386/qemu/boot.S;
-  i386_qemu_ldflags = '-Wl,-Ttext,$(GRUB_BOOT_MACHINE_LINK_ADDR)';
+
+  i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
+  i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00';
+
+  i386_qemu_ldflags = '$(TARGET_IMG_LDFLAGS)';
+  i386_qemu_ldflags = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_BOOT_MACHINE_LINK_ADDR)';
   i386_qemu_ccasflags = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
 
   sparc64_ieee1275 = boot/sparc64/ieee1275/boot.S;
@@ -271,24 +279,25 @@ image = {
 
 image = {
   name = cdboot;
-  source = boot/i386/pc/cdboot.S;
-  ldflags = "-Wl,-Ttext=0x7C00";
-
-  i386_pc;
+  i386_pc = boot/i386/pc/cdboot.S;
+  i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
+  i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00';
 };
 
 image = {
   name = pxeboot;
-  source = boot/i386/pc/pxeboot.S;
-  ldflags = '-Wl,-Ttext=0x7C00';
+  i386_pc = boot/i386/pc/pxeboot.S;
 
-  i386_pc;
+  i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
+  i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00';
 };
 
 image = {
   name = diskboot;
   i386_pc = boot/i386/pc/diskboot.S;
-  i386_pc_ldflags = '-Wl,-Ttext=0x8000';
+
+  i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
+  i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x8000';
 
   sparc64_ieee1275 = boot/sparc64/ieee1275/diskboot.S;
   sparc64_ieee1275_ldflags = '-Wl,-Ttext=0x4200';
@@ -296,10 +305,10 @@ image = {
 
 image = {
   name = lnxboot;
-  source = boot/i386/pc/lnxboot.S;
-  ldflags = '-Wl,-Ttext=0x6000';
+  i386_pc = boot/i386/pc/lnxboot.S;
 
-  i386_pc;
+  i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
+  i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x6000';
 };
 
 module = {
diff --git a/modules.def b/modules.def
index d62c5566f..766c8a604 100644
--- a/modules.def
+++ b/modules.def
@@ -177,6 +177,9 @@ program = {
   source = util/grub-pe2elf.c;
 
   ldadd = libgrub.a;
+  ldadd = '$(LIBINTL)';
+  enable = COND_GRUB_PE2ELF;
+  common;
 };
 
 program = {
@@ -195,10 +198,12 @@ program = {
   mansection = 1;
   source = util/grub-mkfont.c;
 
-  ldadd = '$(LIBINTL)';
-  ldadd = libgrub.a;
   cflags = '$(freetype_cflags)';
-  ldflags = '$(freetype_libs)';
+
+  ldadd = libgrub.a;
+  ldadd = '$(LIBINTL)';
+  ldadd = '$(freetype_libs)';
+
   common;
   enable = COND_GRUB_MKFONT;
 };

From db8fa1ad871ba67c68db1edab10b47587364e14d Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 7 Jun 2010 14:15:57 +0100
Subject: [PATCH 1087/1628] * util/grub-mkpasswd-pbkdf2.c (main): Rename
 top-level `c' variable to `count', fixing variable shadowing that broke the
 -c option.

---
 ChangeLog                   | 7 ++++++-
 util/grub-mkpasswd-pbkdf2.c | 9 +++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 779973f1e..07c262dc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2010-06-05  Colin Watson  <cjwatson@debian.org>
+2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkpasswd-pbkdf2.c (main): Rename top-level `c' variable
+	to `count', fixing variable shadowing that broke the -c option.
+
+2010-06-05  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub.d/00_header.in: Quote values assigned to `saved_entry',
 	in case they contain spaces.
diff --git a/util/grub-mkpasswd-pbkdf2.c b/util/grub-mkpasswd-pbkdf2.c
index a00b1e990..944c6c46a 100644
--- a/util/grub-mkpasswd-pbkdf2.c
+++ b/util/grub-mkpasswd-pbkdf2.c
@@ -112,7 +112,7 @@ hexify (char *hex, grub_uint8_t *bin, grub_size_t n)
 int
 main (int argc, char *argv[])
 {
-  unsigned int c = 10000, buflen = 64, saltlen = 64;
+  unsigned int count = 10000, buflen = 64, saltlen = 64;
   char *pass1, *pass2;
   char *bufhex, *salthex;
   gcry_err_code_t gcry_err;
@@ -137,7 +137,7 @@ main (int argc, char *argv[])
       switch (c)
 	{
 	case 'c':
-	  c = strtoul (optarg, NULL, 0);
+	  count = strtoul (optarg, NULL, 0);
 	  break;
 
 	case 'l':
@@ -307,7 +307,7 @@ main (int argc, char *argv[])
   gcry_err = grub_crypto_pbkdf2 (GRUB_MD_SHA512,
 				 (grub_uint8_t *) pass1, strlen (pass1),
 				 salt, saltlen,
-				 c, buf, buflen);
+				 count, buf, buflen);
   memset (pass1, 0, strlen (pass1));
   free (pass1);
 
@@ -327,7 +327,8 @@ main (int argc, char *argv[])
   hexify (bufhex, buf, buflen);
   hexify (salthex, salt, saltlen);
 
-  printf ("Your PBKDF2 is grub.pbkdf2.sha512.%d.%s.%s\n", c, salthex, bufhex);
+  printf ("Your PBKDF2 is grub.pbkdf2.sha512.%d.%s.%s\n",
+	  count, salthex, bufhex);
   memset (buf, 0, buflen);
   memset (bufhex, 0, 2 * buflen);
   free (buf);

From e1cbcc40a45e7fe0f5d0dbf42a2815eb7b832efe Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 7 Jun 2010 14:22:40 +0100
Subject: [PATCH 1088/1628] * util/grub.d/00_header.in: Add some more quoting
 (of "${prev_saved_entry}" and "${boot_once}") needed to make savedefault work
 again. Reported by: Mario 'BitKoenig' Holbe (Debian bug #584812).

---
 ChangeLog                | 7 +++++++
 util/grub.d/00_header.in | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 07c262dc2..5568cbd3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub.d/00_header.in: Add some more quoting (of
+	"${prev_saved_entry}" and "${boot_once}") needed to make savedefault
+	work again.
+	Reported by: Mario 'BitKoenig' Holbe (Debian bug #584812).
+
 2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkpasswd-pbkdf2.c (main): Rename top-level `c' variable
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 199a1d7af..791840a60 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -61,7 +61,7 @@ set default="${GRUB_DEFAULT}"
 EOF
 fi
 cat <<EOF
-if [ \${prev_saved_entry} ]; then
+if [ "\${prev_saved_entry}" ]; then
   set saved_entry="\${prev_saved_entry}"
   save_env saved_entry
   set prev_saved_entry=
@@ -70,7 +70,7 @@ if [ \${prev_saved_entry} ]; then
 fi
 
 function savedefault {
-  if [ -z \${boot_once} ]; then
+  if [ -z "\${boot_once}" ]; then
     saved_entry="\${chosen}"
     save_env saved_entry
   fi

From 4003dd38df0897ab0e58b1f7e655b13892020337 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 7 Jun 2010 14:32:12 +0100
Subject: [PATCH 1089/1628] * docs/grub.texi (Filesystem): Refer to `search'
 instead of `find'. (password): New section. (password_pbkdf2): New section.
 (search): New section. (Security): New section. (Troubleshooting): New
 section, currently very incomplete. (Invoking grub-mkpasswd-pbkdf2): New
 section. (Internals): New section, currently very incomplete.

---
 ChangeLog      |  11 ++
 docs/grub.texi | 317 ++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 326 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5568cbd3a..3a3df4c5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (Filesystem): Refer to `search' instead of `find'.
+	(password): New section.
+	(password_pbkdf2): New section.
+	(search): New section.
+	(Security): New section.
+	(Troubleshooting): New section, currently very incomplete.
+	(Invoking grub-mkpasswd-pbkdf2): New section.
+	(Internals): New section, currently very incomplete.
+
 2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub.d/00_header.in: Add some more quoting (of
diff --git a/docs/grub.texi b/docs/grub.texi
index d73c03d9b..837607d62 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -35,6 +35,7 @@ Invariant Sections.
 * GRUB: (grub).                 The GRand Unified Bootloader
 * grub-install: (grub)Invoking grub-install.    Install GRUB on your drive
 * grub-mkconfig: (grub)Invoking grub-mkconfig.  Generate GRUB configuration
+* grub-mkpasswd-pbkdf2: (grub)Invoking grub-mkpasswd-pbkdf2.
 @end direntry
 
 @setchapternewpage odd
@@ -84,9 +85,12 @@ This edition documents version @value{VERSION}.
 * Filesystem::                  Filesystem syntax and semantics
 * Interface::                   The menu and the command-line
 * Commands::                    The list of available builtin commands
+* Security::                    Authentication and authorisation
 * Troubleshooting::             Error messages produced by GRUB
 * Invoking grub-install::       How to use the GRUB installer
 * Invoking grub-mkconfig::      Generate a GRUB configuration file
+* Invoking grub-mkpasswd-pbkdf2::
+                                Generate GRUB password hashes
 * Obtaining and Building GRUB:: How to obtain and build GRUB
 * Reporting bugs::              Where you should send a bug report
 * Future::                      Some future plans on GRUB
@@ -1041,8 +1045,8 @@ GRUB uses a special syntax for specifying disk drives which can be
 accessed by BIOS. Because of BIOS limitations, GRUB cannot distinguish
 between IDE, ESDI, SCSI, or others. You must know yourself which BIOS
 device is equivalent to which OS device. Normally, that will be clear if
-you see the files in a device or use the command @command{find}
-(@pxref{find}).
+you see the files in a device or use the command @command{search}
+(@pxref{search}).
 
 @menu
 * Device syntax::               How to specify devices
@@ -1415,8 +1419,11 @@ you forget a command, you can run the command @command{help}
 * keystatus::                   Check key modifier status
 * ls::                          List devices or files
 * parttool::                    Modify partition table entries
+* password::                    Set a clear-text password
+* password_pbkdf2::             Set a hashed password
 * play::                        Play a tune
 * reboot::                      Reboot your computer
+* search::                      Search devices by file, label, or UUID
 * set::                         Set an environment variable
 * unset::                       Unset an environment variable
 @end menu
@@ -1747,6 +1754,25 @@ Wwindows and multiple primary FAT partitions exist in one disk.  See also
 @end deffn
 
 
+@node password
+@subsection password
+
+@deffn Command password user clear-password
+Define a user named @var{user} with password @var{clear-password}.
+@xref{Security}.
+@end deffn
+
+
+@node password_pbkdf2
+@subsection password_pbkdf2
+
+@deffn Command password_pbkdf2 user hashed-password
+Define a user named @var{user} with password hash @var{hashed-password}.
+Use @command{grub-mkpasswd-pbkdf2} (@pxref{Invoking grub-mkpasswd-pbkdf2})
+to generate password hashes.  @xref{Security}.
+@end deffn
+
+
 @node play
 @subsection play
 
@@ -1774,6 +1800,29 @@ Reboot the computer.
 @end deffn
 
 
+@node search
+@subsection search
+
+@deffn Command search @
+ [@option{--file}|@option{--label}|@option{--fs-uuid}] @
+ [@option{--set} var] [@option{--no-floppy}] name
+Search devices by file (@option{-f}, @option{--file}), filesystem label
+(@option{-l}, @option{--label}), or filesystem UUID (@option{-u},
+@option{--fs-uuid}).
+
+If the @option{--set} option is used, the first device found is set as the
+value of environment variable @var{var}.  The default variable is
+@samp{root}.
+
+The @option{--no-floppy} option prevents searching floppy devices, which can
+be slow.
+
+The @samp{search.file}, @samp{search.fs_label}, and @samp{search.fs_uuid}
+commands are aliases for @samp{search --file}, @samp{search --label}, and
+@samp{search --fs-uuid} respectively.
+@end deffn
+
+
 @node set
 @subsection set
 
@@ -1791,6 +1840,135 @@ Unset the environment variable @var{envvar}.
 @end deffn
 
 
+@node Security
+@chapter Authentication and authorisation
+
+By default, the boot loader interface is accessible to anyone with physical
+access to the console: anyone can select and edit any menu entry, and anyone
+can get direct access to a GRUB shell prompt.  For most systems, this is
+reasonable since anyone with direct physical access has a variety of other
+ways to gain full access, and requiring authentication at the boot loader
+level would only serve to make it difficult to recover broken systems.
+
+However, in some environments, such as kiosks, it may be appropriate to lock
+down the boot loader to require authentication before performing certain
+operations.
+
+The @samp{password} (@pxref{password}) and @samp{password_pbkdf2}
+(@pxref{password_pbkdf2}) commands can be used to define users, each of
+which has an associated password.  @samp{password} sets the password in
+plain text, requiring @file{grub.cfg} to be secure; @samp{password_pbkdf2}
+sets the password hashed using the Password-Based Key Derivation Function
+(RFC 2898), requiring the use of @command{grub-mkpasswd-pbkdf2}
+(@pxref{Invoking grub-mkpasswd-pbkdf2}) to generate password hashes.
+
+In order to enable authentication support, the @samp{superusers} environment
+variable must be set to a list of usernames, separated by any of spaces,
+commas, semicolons, pipes, or ampersands.  Superusers are permitted to use
+the GRUB command line, edit menu entries, and execute any menu entry.
+
+Other users may be given access to specific menu entries by giving a list of
+usernames (as above) using the @kbd{--users} option to the @samp{menuentry}
+command (@pxref{menuentry}).
+
+Putting this together, a typical @file{grub.cfg} fragment might look like
+this:
+
+@example
+@group
+set superusers="root"
+password_pbkdf2 root grub.pbkdf2.sha512.10000.biglongstring
+password user1 insecure
+
+menuentry "Superusers only" @{
+	set root=(hd0,1)
+	linux /vmlinuz
+@}
+
+menuentry "May be run by user1" --users user1 @{
+	set root=(hd0,2)
+	chainloader +1
+@}
+@end group
+@end example
+
+The @command{grub-mkconfig} program does not yet have built-in support for
+generating configuration files with authentication.  You can use
+@file{/etc/grub.d/40_custom} to add simple superuser authentication, by
+adding @kbd{set superusers=} and @kbd{password} or @kbd{password_pbkdf2}
+commands.
+
+
+@node Troubleshooting
+@chapter Error messages produced by GRUB
+
+@menu
+* GRUB only offers a rescue shell::
+@end menu
+
+
+@node GRUB only offers a rescue shell
+@section GRUB only offers a rescue shell
+
+GRUB's normal start-up procedure involves setting the @samp{prefix}
+environment variable to a value set in the core image by
+@command{grub-install}, setting the @samp{root} variable to match, loading
+the @samp{normal} module from the prefix, and running the @samp{normal}
+command.  This command is responsible for reading
+@file{/boot/grub/grub.cfg}, running the menu, and doing all the useful
+things GRUB is supposed to do.
+
+If, instead, you only get a rescue shell, this usually means that GRUB
+failed to load the @samp{normal} module for some reason.  It may be possible
+to work around this temporarily: for instance, if the reason for the failure
+is that @samp{prefix} is wrong (perhaps it refers to the wrong device, or
+perhaps the path to @file{/boot/grub} was not correctly made relative to the
+device), then you can correct this and enter normal mode manually:
+
+@example
+@group
+# Inspect the current prefix:
+echo @verb{'${prefix}'}
+# Set to the correct value, which might be something like this:
+set prefix=(hd0,1)/grub
+set root=(hd0,1)
+insmod normal
+normal
+@end group
+@end example
+
+However, any problem that leaves you in the rescue shell probably means that
+GRUB was not correctly installed.  It may be more useful to try to reinstall
+it properly using @kbd{grub-install @var{device}} (@pxref{Invoking
+grub-install}).  When doing this, there are a few things to remember:
+
+@itemize @bullet{}
+@item
+Drive ordering in your operating system may not be the same as the boot
+drive ordering used by your firmware.  Do not assume that your first hard
+drive (e.g. @samp{/dev/sda}) is the one that your firmware will boot from.
+
+@item
+At least on BIOS systems, if you tell @command{grub-install} to install GRUB
+to a partition but GRUB has already been installed in the master boot
+record, then the GRUB installation in the partition will be ignored.
+
+@item
+If possible, it is generally best to avoid installing GRUB to a partition
+(unless it is a special partition for the use of GRUB alone, such as the
+BIOS Boot Partition used on GPT).  Doing this means that GRUB may stop being
+able to read its core image due to a file system moving blocks around, such
+as while defragmenting, running checks, or even during normal operation.
+Installing to the whole disk device is normally more robust.
+
+@item
+Check that GRUB actually knows how to read from the device and file system
+containing @file{/boot/grub}.  It will not be able to read from encrypted
+devices, nor from file systems for which support has not yet been added to
+GRUB.
+@end itemize
+
+
 @node Invoking grub-install
 @chapter Invoking grub-install
 
@@ -1858,6 +2036,34 @@ it to standard output.
 @end table
 
 
+@node Invoking grub-mkpasswd-pbkdf2
+@chapter Invoking grub-mkpasswd-pbkdf2
+
+The program @command{grub-mkpasswd-pbkdf2} generates password hashes for
+GRUB (@pxref{Security}).
+
+@example
+grub-mkpasswd-pbkdf2
+@end example
+
+@command{grub-mkpasswd-pbkdf2} accepts the following options:
+
+@table @option
+@item -c @var{number}
+@itemx --iteration-count=@var{number}
+Number of iterations of the underlying pseudo-random function.  Defaults to
+10000.
+
+@item -l @var{number}
+@itemx --buflen=@var{number}
+Length of the generated hash.  Defaults to 64.
+
+@item -s @var{number}
+@itemx --salt=@var{number}
+Length of the salt.  Defaults to 64.
+@end table
+
+
 @node Obtaining and Building GRUB
 @appendix How to obtain and build GRUB
 
@@ -1976,6 +2182,113 @@ a look at @uref{http://www.gnu.org/software/grub/grub.html, the
 homepage}.
 
 
+@node Internals
+@appendix Hacking GRUB
+
+@menu
+* Getting the source code::
+* Finding your way around::
+@end menu
+
+
+@node Getting the source code
+@section Getting the source code
+
+GRUB is maintained using the @uref{http://bazaar-vcs.org/, Bazaar revision
+control system}.  To fetch the primary development branch:
+
+@example
+bzr get http://bzr.savannah.gnu.org/r/grub/trunk/grub
+@end example
+
+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
+bzr get http://bzr.savannah.gnu.org/r/grub/branches/experimental
+@end example
+
+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 Finding your way around
+@section Finding your way around
+
+Here is a brief map of the GRUB code base.
+
+GRUB uses Autoconf, but not (yet) Automake.  The top-level build rules are
+in @file{configure.ac}, @file{Makefile.in}, and @file{conf/*.rmk}.  Each
+@file{conf/*.rmk} file represents a particular target configuration, and is
+processed into GNU Make rules by @file{genmk.rb} (which you only need to
+look at if you are extending the build system).  If you are adding a new
+module which follows an existing pattern, such as a new command or a new
+filesystem implementation, it is usually easiest to grep @file{conf/*.rmk}
+for an existing example of that pattern to find out where it should be
+added.
+
+Low-level boot code, such as the MBR implementation on PC BIOS systems, is
+in the @file{boot/} directory.
+
+The GRUB kernel is in @file{kern/}.  This contains core facilities such as
+the device, disk, and file frameworks, environment variable handling, list
+processing, and so on.  The kernel should contain enough to get up to a
+rescue prompt.  Header files for kernel facilities, among others, are in
+@file{include/}.
+
+Terminal implementations are in @file{term/}.
+
+Disk access code is spread across @file{disk/} (for accessing the disk
+devices themselves), @file{partmap/} (for interpreting partition table
+data), and @file{fs/} (for accessing filesystems).  Note that, with the odd
+specialised exception, GRUB only contains code to @emph{read} from
+filesystems and tries to avoid containing any code to @emph{write} to
+filesystems; this lets us confidently assure users that GRUB cannot be
+responsible for filesystem corruption.
+
+PCI and USB bus handling is in @file{bus/}.
+
+Video handling code is in @file{video/}.  The graphical menu system uses
+this heavily, but is in a separate directory, @file{gfxmenu/}.
+
+Most commands are implemented by files in @file{commands/}, with the
+following exceptions:
+
+@itemize
+@item
+A few core commands live in @file{kern/corecmd.c}.
+
+@item
+Commands related to normal mode live under @file{normal/}.
+
+@item
+Commands that load and boot kernels live under @file{loader/}.
+
+@item
+The @samp{loopback} command is really a disk device, and so lives in
+@file{disk/loopback.c}.
+
+@item
+The @samp{gettext} command lives under @file{gettext/}.
+
+@item
+The @samp{loadfont} and @samp{lsfonts} commands live under @file{font/}.
+
+@item
+The @samp{serial}, @samp{terminfo}, and @samp{background_image} commands
+live under @file{term/}.
+
+@item
+The @samp{efiemu_*} commands live under @file{efiemu/}.
+@end itemize
+
+There are a few other special-purpose exceptions; grep for them if they
+matter to you.
+
+
 
 @node Copying This Manual
 @appendix Copying This Manual

From e235a2289dcdb5181a91e78cffeb78a65880a71e Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 7 Jun 2010 21:28:37 +0530
Subject: [PATCH 1090/1628] more cygwin fixes

---
 gentpl.py             | 12 ++++++------
 grub-core/modules.def | 18 +++++++++---------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/gentpl.py b/gentpl.py
index 02369d843..7a5986a9e 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -154,7 +154,7 @@ def platform_format(platform):       return each_group(platform, "_format", lamb
 
 def module(platform):
     r  = gvar_add("noinst_PROGRAMS", "[+ name +].module")
-    r += gvar_add("MODULE_FILES", "[+ name +].module")
+    r += gvar_add("MODULE_FILES", "[+ name +].module$(EXEEXT)")
 
     r += var_set(canonical_module() + "_SOURCES", platform_sources(platform) + "## platform sources")
     r += var_add(canonical_module() + "_SOURCES", shared_sources() + "## shared sources")
@@ -192,23 +192,23 @@ def module(platform):
 [+ name +].pp: $(""" + canonical_module() + """_SOURCES) $(nodist_""" + canonical_module() + """_SOURCES)
 	$(TARGET_CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(""" + canonical_module() + """_CPPFLAGS) $(CPPFLAGS) $^ > $@ || (rm -f $@; exit 1)
 
-def-[+ name +].lst: [+ name +].module
+def-[+ name +].lst: [+ name +].module$(EXEEXT)
 	if test x$(USE_APPLE_CC_FIXES) = xyes; then \
 	  $(NM) -g -P -p $< | grep -E '^[a-zA-Z0-9_]* [TDS]' | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@; \
 	else \
 	  $(NM) -g --defined-only -P -p $< | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@; \
 	fi
 
-und-[+ name +].lst: [+ name +].module
+und-[+ name +].lst: [+ name +].module$(EXEEXT)
 	$(NM) -u -P -p $< | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@
 
-mod-[+ name +].c: [+ name +].module $(top_builddir)/moddep.lst $(top_srcdir)/genmodsrc.sh
+mod-[+ name +].c: [+ name +].module$(EXEEXT) $(top_builddir)/moddep.lst $(top_srcdir)/genmodsrc.sh
 	sh $(top_srcdir)/genmodsrc.sh [+ name +] $(top_builddir)/moddep.lst > $@ || (rm -f $@; exit 1)
 
 mod-[+ name +].o: mod-[+ name +].c
 	$(TARGET_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS_MODULE) $(CPPFLAGS) $(CFLAGS_MODULE) $(CFLAGS) -c -o $@ $<
 
-[+ name +].mod: [+ name +].module mod-[+ name +].o
+[+ name +].mod: [+ name +].module$(EXEEXT) mod-[+ name +].o
 	if test x$(USE_APPLE_CC_FIXES) = xyes; then \
 	  $(CCLD) $(LDFLAGS_MODULE) $(LDFLAGS) -o $@.bin $^; \
 	  $(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -nu -nd $@.bin $@; \
@@ -303,7 +303,7 @@ def image(platform):
 
     r += gvar_add("platform_DATA", "[+ name +].img")
     r += gvar_add("CLEANFILES", "[+ name +].img")
-    r += rule("[+ name +].img", "[+ name +].image", """
+    r += rule("[+ name +].img", "[+ name +].image$(EXEEXT)", """
 if test x$(USE_APPLE_CC_FIXES) = xyes; then \
   $(MACHO2IMG) $< $@; \
 else \
diff --git a/grub-core/modules.def b/grub-core/modules.def
index 0e3b53fd8..42c6398a1 100644
--- a/grub-core/modules.def
+++ b/grub-core/modules.def
@@ -233,7 +233,7 @@ program = {
   source = kern/emu/full.c;
   nodist = grub_emu_init.c;
 
-  ldadd = kernel.img;
+  ldadd = 'kernel.img$(EXEEXT)';
   ldadd = '$(MODULE_FILES)';
   ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)';
 
@@ -247,19 +247,12 @@ program = {
   source = kern/emu/cache.S;
   nodist = symlist.c;
 
-  ldadd = kernel.img;
+  ldadd = 'kernel.img$(EXEEXT)';
   ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)';
 
   emu;
 };
 
-module = {
-  name = trig;
-  nodist = trigtables.c;
-  extra_dist = gentrigtables.c;
-  common;
-};
-
 image = {
   name = boot;
   i386_pc = boot/i386/pc/boot.S;
@@ -311,6 +304,13 @@ image = {
   i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x6000';
 };
 
+module = {
+  name = trig;
+  nodist = trigtables.c;
+  extra_dist = gentrigtables.c;
+  common;
+};
+
 module = {
   name = libusb;
   source = bus/usb/emu/usb.c;

From a6a700aa52768f6392337ddbb8798f99a895a018 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 7 Jun 2010 21:10:29 +0100
Subject: [PATCH 1091/1628] * docs/grub.texi (Troubleshooting): `echo' is not
 usually available in the rescue shell, so recommend using `set' instead. 
 Thanks, Jordan Uggla.

---
 ChangeLog      | 6 ++++++
 docs/grub.texi | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a3df4c5d..ddb55f17a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (Troubleshooting): `echo' is not usually available
+	in the rescue shell, so recommend using `set' instead.  Thanks,
+	Jordan Uggla.
+
 2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Filesystem): Refer to `search' instead of `find'.
diff --git a/docs/grub.texi b/docs/grub.texi
index 837607d62..f2d0c41bf 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1927,8 +1927,8 @@ device), then you can correct this and enter normal mode manually:
 
 @example
 @group
-# Inspect the current prefix:
-echo @verb{'${prefix}'}
+# Inspect the current prefix (and other preset variables):
+set
 # Set to the correct value, which might be something like this:
 set prefix=(hd0,1)/grub
 set root=(hd0,1)

From ee75515e69598e0c4e6f53c24b3b8247e4a83170 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 7 Jun 2010 21:26:30 +0100
Subject: [PATCH 1092/1628] * docs/grub.texi (Network): New section. (Device
 syntax): The network device is called `(pxe)' in GRUB 2, not `(nd)' as in
 GRUB Legacy. (pxe_unload): New section.

---
 ChangeLog      |  7 +++++
 docs/grub.texi | 85 +++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ddb55f17a..f9a0d2424 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (Network): New section.
+	(Device syntax): The network device is called `(pxe)' in GRUB 2, not
+	`(nd)' as in GRUB Legacy.
+	(pxe_unload): New section.
+
 2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Troubleshooting): `echo' is not usually available
diff --git a/docs/grub.texi b/docs/grub.texi
index f2d0c41bf..37016b175 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -970,6 +970,78 @@ that file, making sure to leave at least the first two lines intact.
 @section Writing full configuration files directly
 
 
+@node Network
+@chapter Booting GRUB from the network
+
+The following instructions only work on PC BIOS systems where the Preboot
+eXecution Environment (PXE) is available.
+
+To generate a PXE boot image, run:
+
+@example
+@group
+grub-mkimage --format=i386-pc --output=core.img --prefix='(pxe)/boot/grub' pxe pxecmd
+cat /boot/grub/pxeboot.img core.img >grub.pxe
+@end group
+@end example
+
+Copy @file{grub.pxe}, @file{/boot/grub/*.mod}, and @file{/boot/grub/*.lst}
+to the PXE (TFTP) server, ensuring that @file{*.mod} and @file{*.lst} are
+accessible via the @file{/boot/grub/} path from the TFTP server root.  Set
+the DHCP server configuration to offer @file{grub.pxe} as the boot file (the
+@samp{filename} option in ISC dhcpd).
+
+After GRUB has started, files on the TFTP server will be accessible via the
+@samp{(pxe)} device.
+
+The server and gateway IP address can be controlled by changing the
+@samp{(pxe)} device name to @samp{(pxe:@var{server-ip})} or
+@samp{(pxe:@var{server-ip}:@var{gateway-ip})}.  Note that this should be
+changed both in the prefix and in any references to the device name in the
+configuration file.
+
+GRUB provides several environment variables which may be used to inspect or
+change the behaviour of the PXE device:
+
+@table @samp
+@item net_pxe_ip
+The IP address of this machine.  Read-only.
+
+@item net_pxe_mac
+The network interface's MAC address.  Read-only.
+
+@item net_pxe_hostname
+The client host name provided by DHCP.  Read-only.
+
+@item net_pxe_domain
+The client domain name provided by DHCP.  Read-only.
+
+@item net_pxe_rootpath
+The path to the client's root disk provided by DHCP.  Read-only.
+
+@item net_pxe_extensionspath
+The path to additional DHCP vendor extensions provided by DHCP.  Read-only.
+
+@item net_pxe_boot_file
+The boot file name provided by DHCP.  Read-only.
+
+@item net_pxe_dhcp_server_name
+The name of the DHCP server responsible for these boot parameters.
+Read-only.
+
+@item net_pxe_blksize
+The PXE transfer block size.  Read-write, defaults to 512.
+
+@item pxe_default_server
+The default PXE server.  Read-write, although setting this is only useful
+before opening a PXE device.
+
+@item pxe_default_gateway
+The default gateway to use when contacting the PXE server.  Read-write,
+although setting this is only useful before opening a PXE device.
+@end table
+
+
 @node Serial terminal
 @chapter Using GRUB via a serial line
 
@@ -1094,7 +1166,7 @@ MBR when installing GRUB), while the syntax @samp{(hd0,1)}
 represents using the first partition of the disk (or the boot sector
 of the partition when installing GRUB).
 
-If you enabled the network support, the special drive, @samp{(nd)}, is
+If you enabled the network support, the special drive @samp{(pxe)} is
 also available. Before using the network drive, you must initialize the
 network. @xref{Network}, for more information.
 
@@ -1422,6 +1494,7 @@ you forget a command, you can run the command @command{help}
 * password::                    Set a clear-text password
 * password_pbkdf2::             Set a hashed password
 * play::                        Play a tune
+* pxe_unload::                  Unload the PXE environment
 * reboot::                      Reboot your computer
 * search::                      Search devices by file, label, or UUID
 * set::                         Set an environment variable
@@ -1792,6 +1865,16 @@ a rest.
 @end deffn
 
 
+@node pxe_unload
+@subsection pxe_unload
+
+@deffn Command pxe_unload
+Unload the PXE environment (@pxref{Network}).
+
+This command is only available on PC BIOS systems.
+@end deffn
+
+
 @node reboot
 @subsection reboot
 

From 258c2573a659c3b04b2873bcc3da9351a08e8f9a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 7 Jun 2010 21:29:25 +0100
Subject: [PATCH 1093/1628] * fs/i386/pc/pxe.c (grub_pxe_open): Fix parsing of
 gateway_ip.

---
 ChangeLog        | 4 ++++
 fs/i386/pc/pxe.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f9a0d2424..b8f5f80d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
+
+	* fs/i386/pc/pxe.c (grub_pxe_open): Fix parsing of gateway_ip.
+
 2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Network): New section.
diff --git a/fs/i386/pc/pxe.c b/fs/i386/pc/pxe.c
index 82d8ee583..e4d481a8e 100644
--- a/fs/i386/pc/pxe.c
+++ b/fs/i386/pc/pxe.c
@@ -114,7 +114,7 @@ grub_pxe_open (const char *name, grub_disk_t disk)
 	return err;
       if (*ptr == ':')
 	{
-	  err = parse_ip (ptr + 1, &(data->server_ip), 0);
+	  err = parse_ip (ptr + 1, &(data->gateway_ip), 0);
 	  if (err)
 	    return err;
 	}

From fb55c3acf9adec8a576e35551a8d2f5d6684cb88 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 7 Jun 2010 22:13:26 +0100
Subject: [PATCH 1094/1628] * normal/completion.c (grub_normal_do_completion):
 When completing arguments to "set" and the current word contains an equals
 sign, skip to after the equals sign before starting completion.

---
 ChangeLog           | 6 ++++++
 normal/completion.c | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b8f5f80d8..bc1b2686a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
+
+	* normal/completion.c (grub_normal_do_completion): When completing
+	arguments to "set" and the current word contains an equals sign,
+	skip to after the equals sign before starting completion.
+
 2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
 
 	* fs/i386/pc/pxe.c (grub_pxe_open): Fix parsing of gateway_ip.
diff --git a/normal/completion.c b/normal/completion.c
index 13e8f7a6b..334eaea11 100644
--- a/normal/completion.c
+++ b/normal/completion.c
@@ -414,6 +414,14 @@ grub_normal_do_completion (char *buf, int *restore,
   else
     current_word = argv[argc - 1];
 
+  if (argc > 1 && ! grub_strcmp (argv[0], "set"))
+    {
+      char *equals = grub_strchr (current_word, '=');
+      if (equals)
+	/* Complete the value of the variable.  */
+	current_word = equals + 1;
+    }
+
   /* Determine the state the command line is in, depending on the
      state, it can be determined how to complete.  */
   cmdline_state = get_state (buf);

From da90820083ca2a6ca22877068a9d7262cd5629ac Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 7 Jun 2010 22:18:00 +0100
Subject: [PATCH 1095/1628] * docs/grub.texi (Naming convention): Use GRUB 2
 syntax. (File name syntax): Likewise. (help): --all is no longer supported in
 GRUB 2.  Be more precise about pattern matching.

---
 ChangeLog      |  7 +++++++
 docs/grub.texi | 22 ++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bc1b2686a..3a463ab42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (Naming convention): Use GRUB 2 syntax.
+	(File name syntax): Likewise.
+	(help): --all is no longer supported in GRUB 2.  Be more precise
+	about pattern matching.
+
 2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
 
 	* normal/completion.c (grub_normal_do_completion): When completing
diff --git a/docs/grub.texi b/docs/grub.texi
index 37016b175..ffc6b8fe2 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -390,14 +390,14 @@ GRUB searches for the first @sc{pc} slice which has a BSD @samp{a}
 partition.
 
 Of course, to actually access the disks or partitions with GRUB, you
-need to use the device specification in a command, like @samp{root
-(fd0)} or @samp{unhide (hd0,3)}. To help you find out which number
-specifies a partition you want, the GRUB command-line
+need to use the device specification in a command, like @samp{set
+root=(fd0)} or @samp{parttool (hd0,3) hidden-}. To help you find out
+which number specifies a partition you want, the GRUB command-line
 (@pxref{Command-line interface}) options have argument
 completion. This means that, for example, you only need to type
 
 @example
-root (
+set root=(
 @end example
 
 followed by a @key{TAB}, and GRUB will display the list of drives,
@@ -1186,8 +1186,8 @@ example is @samp{(hd0,1)/boot/grub/grub.cfg}. This means the file
 @file{/boot/grub/grub.cfg} in the first partition of the first hard
 disk. If you omit the device name in an absolute file name, GRUB uses
 GRUB's @dfn{root device} implicitly. So if you set the root device to,
-say, @samp{(hd1,1)} by the command @command{root} (@pxref{root}), then
-@code{/boot/kernel} is the same as @code{(hd1,1)/boot/kernel}.
+say, @samp{(hd1,1)} by the command @samp{set root=(hd1,1)} (@pxref{set}),
+then @code{/boot/kernel} is the same as @code{(hd1,1)/boot/kernel}.
 
 
 @node Block list syntax
@@ -1742,15 +1742,13 @@ is shut down using APM.
 @node help
 @subsection help
 
-@deffn Command help @option{--all} [pattern @dots{}]
+@deffn Command help [pattern @dots{}]
 Display helpful information about builtin commands. If you do not
-specify @var{pattern}, this command shows short descriptions of most of
-available commands. If you specify the option @option{--all} to this
-command, short descriptions of rarely used commands (such as
-@ref{testload}) are displayed as well.
+specify @var{pattern}, this command shows short descriptions of all
+available commands.
 
 If you specify any @var{patterns}, it displays longer information
-about each of the commands which match those @var{patterns}.
+about each of the commands whose names begin with those @var{patterns}.
 @end deffn
 
 

From e0f4c438823f1fa82cac8098469cc138bb1fe37d Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 7 Jun 2010 22:41:55 +0100
Subject: [PATCH 1096/1628] * kern/emu/misc.c (device_mapper_null_log): New
 function. (grub_device_mapper_supported): New function. *
 include/grub/emu/misc.h (grub_device_mapper_supported): Add prototype. *
 kern/emu/hostdisk.c (find_partition_start): Check whether device-mapper is
 supported before trying to use it. * util/deviceiter.c
 (grub_util_iterate_devices): Likewise.

---
 ChangeLog               |  10 +++
 include/grub/emu/misc.h |   4 +
 kern/emu/hostdisk.c     |   2 +-
 kern/emu/misc.c         |  39 ++++++++
 util/deviceiter.c       | 194 ++++++++++++++++++++--------------------
 5 files changed, 152 insertions(+), 97 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a463ab42..c28f77bc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
+
+	* kern/emu/misc.c (device_mapper_null_log): New function.
+	(grub_device_mapper_supported): New function.
+	* include/grub/emu/misc.h (grub_device_mapper_supported): Add
+	prototype.
+	* kern/emu/hostdisk.c (find_partition_start): Check whether
+	device-mapper is supported before trying to use it.
+	* util/deviceiter.c (grub_util_iterate_devices): Likewise.
+
 2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Naming convention): Use GRUB 2 syntax.
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index 0e6ace0e8..f34cd4287 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -48,4 +48,8 @@ int EXPORT_FUNC(asprintf) (char **buf, const char *fmt, ...);
 char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
 extern char * canonicalize_file_name (const char *path);
 
+#ifdef HAVE_DEVICE_MAPPER
+int grub_device_mapper_supported (void);
+#endif
+
 #endif /* GRUB_EMU_MISC_H */
diff --git a/kern/emu/hostdisk.c b/kern/emu/hostdisk.c
index fc62cca26..47389195c 100644
--- a/kern/emu/hostdisk.c
+++ b/kern/emu/hostdisk.c
@@ -342,7 +342,7 @@ find_partition_start (const char *dev)
 # endif /* !defined(__NetBSD__) */
 
 # ifdef HAVE_DEVICE_MAPPER
-  if (device_is_mapped (dev)) {
+  if (grub_device_mapper_supported () && device_is_mapped (dev)) {
     struct dm_task *task = NULL;
     grub_uint64_t start, length;
     char *target_type, *params, *space;
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index 9437169e0..38395fca8 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -22,6 +22,10 @@
 #include <grub/time.h>
 #include <grub/emu/misc.h>
 
+#ifdef HAVE_DEVICE_MAPPER
+# include <libdevmapper.h>
+#endif
+
 int verbosity;
 
 void
@@ -311,3 +315,38 @@ grub_make_system_path_relative_to_its_root (const char *path)
 
   return buf3;
 }
+
+#ifdef HAVE_DEVICE_MAPPER
+static void device_mapper_null_log (int level __attribute__ ((unused)),
+				    const char *file __attribute__ ((unused)),
+				    int line __attribute__ ((unused)),
+				    int dm_errno __attribute__ ((unused)),
+				    const char *f __attribute__ ((unused)),
+				    ...)
+{
+}
+
+int
+grub_device_mapper_supported (void)
+{
+  static int supported = -1;
+
+  if (supported == -1)
+    {
+      struct dm_task *dmt;
+
+      /* Suppress annoying log messages.  */
+      dm_log_with_errno_init (&device_mapper_null_log);
+
+      dmt = dm_task_create (DM_DEVICE_VERSION);
+      supported = (dmt != NULL);
+      if (dmt)
+	dm_task_destroy (dmt);
+
+      /* Restore the original logger.  */
+      dm_log_with_errno_init (NULL);
+    }
+
+  return supported;
+}
+#endif /* HAVE_DEVICE_MAPPER */
diff --git a/util/deviceiter.c b/util/deviceiter.c
index 03813bc7d..d7e8f159e 100644
--- a/util/deviceiter.c
+++ b/util/deviceiter.c
@@ -33,6 +33,7 @@
 #include <grub/util/deviceiter.h>
 #include <grub/list.h>
 #include <grub/misc.h>
+#include <grub/emu/misc.h>
 
 #ifdef __linux__
 # if !defined(__GLIBC__) || \
@@ -676,112 +677,113 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
     }
 
   /* DM-RAID.  */
-  {
-    struct dm_tree *tree = NULL;
-    struct dm_task *task = NULL;
-    struct dm_names *names = NULL;
-    unsigned int next = 0;
-    void *top_handle, *second_handle;
-    struct dm_tree_node *root, *top, *second;
-    struct dmraid_seen *seen = NULL;
+  if (grub_device_mapper_supported ())
+    {
+      struct dm_tree *tree = NULL;
+      struct dm_task *task = NULL;
+      struct dm_names *names = NULL;
+      unsigned int next = 0;
+      void *top_handle, *second_handle;
+      struct dm_tree_node *root, *top, *second;
+      struct dmraid_seen *seen = NULL;
 
-    /* Build DM tree for all devices.  */
-    tree = dm_tree_create ();
-    dmraid_check (tree, "dm_tree_create failed\n");
-    task = dm_task_create (DM_DEVICE_LIST);
-    dmraid_check (task, "dm_task_create failed\n");
-    dmraid_check (dm_task_run (task), "dm_task_run failed\n");
-    names = dm_task_get_names (task);
-    dmraid_check (names, "dm_task_get_names failed\n");
-    dmraid_check (names->dev, "No DM devices found\n");
-    do
-      {
-	names = (void *) names + next;
-	dmraid_check (dm_tree_add_dev (tree, MAJOR (names->dev),
-				       MINOR (names->dev)),
-			 "dm_tree_add_dev (%s) failed\n", names->name);
-	next = names->next;
-      }
-    while (next);
+      /* Build DM tree for all devices.  */
+      tree = dm_tree_create ();
+      dmraid_check (tree, "dm_tree_create failed\n");
+      task = dm_task_create (DM_DEVICE_LIST);
+      dmraid_check (task, "dm_task_create failed\n");
+      dmraid_check (dm_task_run (task), "dm_task_run failed\n");
+      names = dm_task_get_names (task);
+      dmraid_check (names, "dm_task_get_names failed\n");
+      dmraid_check (names->dev, "No DM devices found\n");
+      do
+	{
+	  names = (void *) names + next;
+	  dmraid_check (dm_tree_add_dev (tree, MAJOR (names->dev),
+					 MINOR (names->dev)),
+			   "dm_tree_add_dev (%s) failed\n", names->name);
+	  next = names->next;
+	}
+      while (next);
 
-    /* Walk the second-level children of the inverted tree; that is, devices
-       which are directly composed of non-DM devices such as hard disks.
-       This class includes all DM-RAID disks and excludes all DM-RAID
-       partitions.  */
-    root = dm_tree_find_node (tree, 0, 0);
-    top_handle = NULL;
-    top = dm_tree_next_child (&top_handle, root, 1);
-    while (top)
-      {
-	second_handle = NULL;
-	second = dm_tree_next_child (&second_handle, top, 1);
-	while (second)
-	  {
-	    const char *node_name, *node_uuid;
-	    char *name;
-	    struct dmraid_seen *seen_elt;
+      /* Walk the second-level children of the inverted tree; that is, devices
+	 which are directly composed of non-DM devices such as hard disks.
+	 This class includes all DM-RAID disks and excludes all DM-RAID
+	 partitions.  */
+      root = dm_tree_find_node (tree, 0, 0);
+      top_handle = NULL;
+      top = dm_tree_next_child (&top_handle, root, 1);
+      while (top)
+	{
+	  second_handle = NULL;
+	  second = dm_tree_next_child (&second_handle, top, 1);
+	  while (second)
+	    {
+	      const char *node_name, *node_uuid;
+	      char *name;
+	      struct dmraid_seen *seen_elt;
 
-	    node_name = dm_tree_node_get_name (second);
-	    dmraid_check (node_name, "dm_tree_node_get_name failed\n");
-	    node_uuid = dm_tree_node_get_uuid (second);
-	    dmraid_check (node_uuid, "dm_tree_node_get_uuid failed\n");
-	    if (strncmp (node_uuid, "DMRAID-", 7) != 0)
-	      {
-		grub_dprintf ("deviceiter", "%s is not DM-RAID\n", node_name);
-		goto dmraid_next_child;
-	      }
+	      node_name = dm_tree_node_get_name (second);
+	      dmraid_check (node_name, "dm_tree_node_get_name failed\n");
+	      node_uuid = dm_tree_node_get_uuid (second);
+	      dmraid_check (node_uuid, "dm_tree_node_get_uuid failed\n");
+	      if (strncmp (node_uuid, "DMRAID-", 7) != 0)
+		{
+		  grub_dprintf ("deviceiter", "%s is not DM-RAID\n", node_name);
+		  goto dmraid_next_child;
+		}
 
-	    /* Have we already seen this node?  There are typically very few
-	       DM-RAID disks, so a list should be fast enough.  */
-	    if (grub_named_list_find (GRUB_AS_NAMED_LIST (seen), node_name))
-	      {
-		grub_dprintf ("deviceiter", "Already seen DM device %s\n",
-			      node_name);
-		goto dmraid_next_child;
-	      }
+	      /* Have we already seen this node?  There are typically very few
+		 DM-RAID disks, so a list should be fast enough.  */
+	      if (grub_named_list_find (GRUB_AS_NAMED_LIST (seen), node_name))
+		{
+		  grub_dprintf ("deviceiter", "Already seen DM device %s\n",
+				node_name);
+		  goto dmraid_next_child;
+		}
 
-	    name = xasprintf ("/dev/mapper/%s", node_name);
-	    if (check_device (name))
-	      {
-		if (hook (name, 0))
-		  {
-		    free (name);
-		    while (seen)
-		      {
-			struct dmraid_seen *seen_elt =
-			  grub_list_pop (GRUB_AS_LIST_P (&seen));
-			free (seen_elt);
-		      }
-		    if (task)
-		      dm_task_destroy (task);
-		    if (tree)
-		      dm_tree_free (tree);
-		    return;
-		  }
-	      }
-	    free (name);
+	      name = xasprintf ("/dev/mapper/%s", node_name);
+	      if (check_device (name))
+		{
+		  if (hook (name, 0))
+		    {
+		      free (name);
+		      while (seen)
+			{
+			  struct dmraid_seen *seen_elt =
+			    grub_list_pop (GRUB_AS_LIST_P (&seen));
+			  free (seen_elt);
+			}
+		      if (task)
+			dm_task_destroy (task);
+		      if (tree)
+			dm_tree_free (tree);
+		      return;
+		    }
+		}
+	      free (name);
 
-	    seen_elt = xmalloc (sizeof *seen_elt);
-	    seen_elt->name = node_name;
-	    grub_list_push (GRUB_AS_LIST_P (&seen), GRUB_AS_LIST (seen_elt));
+	      seen_elt = xmalloc (sizeof *seen_elt);
+	      seen_elt->name = node_name;
+	      grub_list_push (GRUB_AS_LIST_P (&seen), GRUB_AS_LIST (seen_elt));
 
 dmraid_next_child:
-	    second = dm_tree_next_child (&second_handle, top, 1);
-	  }
-	top = dm_tree_next_child (&top_handle, root, 1);
-      }
+	      second = dm_tree_next_child (&second_handle, top, 1);
+	    }
+	  top = dm_tree_next_child (&top_handle, root, 1);
+	}
 
 dmraid_end:
-    while (seen)
-      {
-	struct dmraid_seen *seen_elt = grub_list_pop (GRUB_AS_LIST_P (&seen));
-	free (seen_elt);
-      }
-    if (task)
-      dm_task_destroy (task);
-    if (tree)
-      dm_tree_free (tree);
-  }
+      while (seen)
+	{
+	  struct dmraid_seen *seen_elt = grub_list_pop (GRUB_AS_LIST_P (&seen));
+	  free (seen_elt);
+	}
+      if (task)
+	dm_task_destroy (task);
+      if (tree)
+	dm_tree_free (tree);
+    }
 # endif /* HAVE_DEVICE_MAPPER */
 #endif /* __linux__ */
 }

From 6ef0ddb4760e58f5dad51169a42e0c77cb5f41d5 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 8 Jun 2010 10:18:53 +0100
Subject: [PATCH 1097/1628] * docs/grub.texi (Security): Menu entries are
 unrestricted by default, not restricted to superusers as I had previously
 thought. Reword to account for this.

---
 ChangeLog      |  6 ++++++
 docs/grub.texi | 18 +++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c28f77bc8..ce24487d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-08  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (Security): Menu entries are unrestricted by
+	default, not restricted to superusers as I had previously thought.
+	Reword to account for this.
+
 2010-06-07  Colin Watson  <cjwatson@ubuntu.com>
 
 	* kern/emu/misc.c (device_mapper_null_log): New function.
diff --git a/docs/grub.texi b/docs/grub.texi
index ffc6b8fe2..1c23460ea 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1946,11 +1946,14 @@ sets the password hashed using the Password-Based Key Derivation Function
 In order to enable authentication support, the @samp{superusers} environment
 variable must be set to a list of usernames, separated by any of spaces,
 commas, semicolons, pipes, or ampersands.  Superusers are permitted to use
-the GRUB command line, edit menu entries, and execute any menu entry.
+the GRUB command line, edit menu entries, and execute any menu entry.  If
+@samp{superusers} is set, then use of the command line is automatically
+restricted to superusers.
 
 Other users may be given access to specific menu entries by giving a list of
-usernames (as above) using the @kbd{--users} option to the @samp{menuentry}
-command (@pxref{menuentry}).
+usernames (as above) using the @option{--users} option to the
+@samp{menuentry} command (@pxref{menuentry}).  If the @option{--users}
+option is not used for a menu entry, then that entry is unrestricted.
 
 Putting this together, a typical @file{grub.cfg} fragment might look like
 this:
@@ -1961,12 +1964,17 @@ set superusers="root"
 password_pbkdf2 root grub.pbkdf2.sha512.10000.biglongstring
 password user1 insecure
 
-menuentry "Superusers only" @{
+menuentry "May be run by any user" @{
 	set root=(hd0,1)
 	linux /vmlinuz
 @}
 
-menuentry "May be run by user1" --users user1 @{
+menuentry "Superusers only" --users "" @{
+	set root=(hd0,1)
+	linux /vmlinuz single
+@}
+
+menuentry "May be run by user1 or a superuser" --users user1 @{
 	set root=(hd0,2)
 	chainloader +1
 @}

From d39f3dec5fefecbc83d64106d39b0a12281efaad Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 8 Jun 2010 10:29:25 +0100
Subject: [PATCH 1098/1628] * docs/grub.texi (History): Expand to cover GRUB 2.
 (Serial terminal): Refer to `terminal_input' and `terminal_output' commands,
 not `terminal'. (serial): Likewise. (terminal_input): New section.
 (terminal_output): New section. (uppermem): New section (stub). (Obtaining
 and Building GRUB): Refer to Bazaar, not Subversion.

---
 ChangeLog      | 11 ++++++++
 docs/grub.texi | 74 +++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ce24487d3..15be02a51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-06-08  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (History): Expand to cover GRUB 2.
+	(Serial terminal): Refer to `terminal_input' and `terminal_output'
+	commands, not `terminal'.
+	(serial): Likewise.
+	(terminal_input): New section.
+	(terminal_output): New section.
+	(uppermem): New section (stub).
+	(Obtaining and Building GRUB): Refer to Bazaar, not Subversion.
+
 2010-06-08  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Security): Menu entries are unrestricted by
diff --git a/docs/grub.texi b/docs/grub.texi
index 1c23460ea..ac3bc2f90 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -174,6 +174,22 @@ official GNU package, and opened its development by making the latest
 sources available via anonymous CVS. @xref{Obtaining and Building
 GRUB}, for more information.
 
+Over the next few years, GRUB was extended to meet many needs, but it
+quickly became clear that its design was not keeping up with the extensions
+being made to it, and we reached the point where it was very difficult to
+make any further changes without breaking existing features.  Around 2002,
+Yoshinori K. Okuji started work on PUPA (Preliminary Universal Programming
+Architecture for GNU GRUB), aiming to rewrite the core of GRUB to make it
+cleaner, safer, more robust, and more powerful.  PUPA was eventually renamed
+to GRUB 2, and the original version of GRUB was renamed to GRUB Legacy.
+Small amounts of maintenance continued to be done on GRUB Legacy, but the
+last release (0.97) was made in 2005 and at the time of writing it seems
+unlikely that there will be another.
+
+By around 2007, GNU/Linux distributions started to use GRUB 2 to limited
+extents, and by the end of 2009 multiple major distributions were installing
+it by default.
+
 
 @node Features
 @section GRUB features
@@ -1078,7 +1094,8 @@ you want to use COM2, you must specify @samp{--unit=1} instead. This
 command accepts many other options, so please refer to @ref{serial},
 for more details.
 
-The command @command{terminal} (@pxref{terminal}) chooses which type of
+The commands @command{terminal_input} (@pxref{terminal_input}) and
+@command{terminal_output} (@pxref{terminal_output} choose which type of
 terminal you want to use. In the case above, the terminal will be a
 serial terminal, but you can also pass @code{console} to the command,
 as @samp{terminal serial console}. In this case, a terminal in which
@@ -1421,6 +1438,8 @@ Commands usable anywhere in the menu and in the command-line.
 
 @menu
 * serial::                      Set up a serial device
+* terminal_input::              Manage input terminals
+* terminal_output::             Manage output terminals
 * terminfo::                    Define terminal type
 @end menu
 
@@ -1440,13 +1459,52 @@ bits and one stop bit. @var{parity} is one of @samp{no}, @samp{odd},
 @samp{even} and defaults to @samp{no}.
 
 The serial port is not used as a communication channel unless the
-@command{terminal} command is used (@pxref{terminal}).
+@command{terminal_input} or @command{terminal_output} command is used
+(@pxref{terminal_input}, @pxref{terminal_output}).
 
 This command is only available if GRUB is compiled with serial
 support. See also @ref{Serial terminal}.
 @end deffn
 
 
+@node terminal_input
+@subsection terminal_input
+
+@deffn Command terminal_input [@option{--append}|@option{--remove}] @
+ [terminal1] [terminal2] @dots{}
+List or select an input terminal.
+
+With no arguments, list the active and available input terminals.
+
+With @option{--append}, add the named terminals to the list of active input
+terminals; any of these may be used to provide input to GRUB.
+
+With @option{--remove}, remove the named terminals from the active list.
+
+With no options but a list of terminal names, make only the listed terminal
+names active.
+@end deffn
+
+
+@node terminal_output
+@subsection terminal_output
+
+@deffn Command terminal_output [@option{--append}|@option{--remove}] @
+ [terminal1] [terminal2] @dots{}
+List or select an output terminal.
+
+With no arguments, list the active and available output terminals.
+
+With @option{--append}, add the named terminals to the list of active output
+terminals; all of these will receive output from GRUB.
+
+With @option{--remove}, remove the named terminals from the active list.
+
+With no options but a list of terminal names, make only the listed terminal
+names active.
+@end deffn
+
+
 @node terminfo
 @subsection terminfo
 
@@ -1499,6 +1557,7 @@ you forget a command, you can run the command @command{help}
 * search::                      Search devices by file, label, or UUID
 * set::                         Set an environment variable
 * unset::                       Unset an environment variable
+* uppermem::                    Set the upper memory size
 @end menu
 
 
@@ -1921,6 +1980,12 @@ Unset the environment variable @var{envvar}.
 @end deffn
 
 
+@node uppermem
+@subsection uppermem
+
+This command is not yet implemented for GRUB 2, although it is planned.
+
+
 @node Security
 @chapter Authentication and authorisation
 
@@ -2190,8 +2255,9 @@ just do:
 @end group
 @end example
 
-Also, the latest version is available from the SVN. See
-@uref{http://savannah.gnu.org/svn/?group=grub} for more information.
+Also, the latest version is available using Bazaar. See
+@uref{http://www.gnu.org/software/grub/grub-download.en.html} for more
+information.
 
 @node Reporting bugs
 @appendix Reporting bugs

From 50e532ca1a421581c6ea63f77a9cd2a5e8c8548a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 8 Jun 2010 10:37:16 +0100
Subject: [PATCH 1099/1628] * .bzrignore: Add ascii.bitmaps, ascii.h,
 grub_script.yy.c, and grub_script.yy.h.

---
 .bzrignore | 4 ++++
 ChangeLog  | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/.bzrignore b/.bzrignore
index 46e8637b6..aa9c4ff84 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -3,6 +3,8 @@
 30_os-prober
 40_custom
 aclocal.m4
+ascii.bitmaps
+ascii.h
 autom4te.cache
 build_env.mk
 .bzrignore
@@ -48,6 +50,8 @@ grub_script_check_init.c
 grub_script_check_init.h
 grub_script.tab.c
 grub_script.tab.h
+grub_script.yy.c
+grub_script.yy.h
 grub-set-default
 grub-setup
 grub_setup_init.c
diff --git a/ChangeLog b/ChangeLog
index 15be02a51..e9570905e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-08  Colin Watson  <cjwatson@ubuntu.com>
+
+	* .bzrignore: Add ascii.bitmaps, ascii.h, grub_script.yy.c, and
+	grub_script.yy.h.
+
 2010-06-08  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (History): Expand to cover GRUB 2.

From f4d095d77d9d87a1275de19411656ff8cfe69b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Tue, 8 Jun 2010 12:09:34 +0200
Subject: [PATCH 1100/1628] Add . to the directories searched for unifont.

---
 ChangeLog    |  4 ++++
 configure.ac | 12 +++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e9570905e..b48b79819 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-08  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* configure.ac: Add `.' to the directories searched for unifont.
+
 2010-06-08  Colin Watson  <cjwatson@ubuntu.com>
 
 	* .bzrignore: Add ascii.bitmaps, ascii.h, grub_script.yy.c, and
diff --git a/configure.ac b/configure.ac
index 31b179d46..97c493e27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,11 +179,13 @@ if test "x$YACC" = x; then
   AC_MSG_ERROR([bison is not found])
 fi
 
-for file in /usr/src/unifont.bdf /usr/share/fonts/X11/misc/unifont.pcf.gz /usr/share/fonts/unifont/unifont.pcf.gz; do
-  if test -e $file ; then
-    AC_SUBST([FONT_SOURCE], [$file])
-    break
-  fi
+for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
+  for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont; do
+    if test -f "$dir/unifont.$ext"; then
+      AC_SUBST([FONT_SOURCE], [$dir/unifont.$ext])
+      break 2
+    fi
+  done
 done
 
 AC_PROG_INSTALL

From e8a6f3b6a5f07e8a63788e33866fa99ed8737297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Tue, 8 Jun 2010 12:23:30 +0200
Subject: [PATCH 1101/1628] Use absolute offsets for start of embedding area.

---
 ChangeLog                 |  5 +++++
 util/i386/pc/grub-setup.c | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b48b79819..45637ac17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-08  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* util/i386/pc/grub-setup.c (setup): Use absolute offsets for start of
+	embedding area.  Use <= instead of == when checking for non-emptiness.
+
 2010-06-08  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* configure.ac: Add `.' to the directories searched for unifont.
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 6e6b2e878..08a76f65c 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -126,8 +126,8 @@ setup (const char *dir,
       /* There's always an embed region, and it starts right after the MBR.  */
       embed_region.start = 1;
 
-      if (embed_region.end > p->start)
-	embed_region.end = p->start;
+      if (embed_region.end > grub_partition_get_start (p))
+	embed_region.end = grub_partition_get_start (p);
 
       return 0;
     }
@@ -147,8 +147,8 @@ setup (const char *dir,
       /* If there's an embed region, it is in a dedicated partition.  */
       if (! memcmp (&gptdata.type, &grub_gpt_partition_type_bios_boot, 16))
 	{
-	  embed_region.start = p->start;
-	  embed_region.end = p->start + p->len;
+	  embed_region.start = grub_partition_get_start (p);
+	  embed_region.end = grub_partition_get_start (p) + grub_partition_get_len (p);
 
 	  return 1;
 	}
@@ -361,7 +361,7 @@ setup (const char *dir,
   else
     grub_util_error (_("No DOS-style partitions found"));
 
-  if (embed_region.end == embed_region.start)
+  if (embed_region.end <= embed_region.start)
     {
       if (! strcmp (dest_partmap, "msdos"))
 	grub_util_warn (_("This msdos-style partition label has no post-MBR gap; embedding won't be possible!"));

From 0ea7c4f93cdacfd650dfba43ee6e410a2414aca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Tue, 8 Jun 2010 12:52:42 +0200
Subject: [PATCH 1102/1628] Make --version uniform and avoid hard-coded program
 name.

---
 ChangeLog                              | 19 +++++++++++++++++++
 util/grub-install.in                   | 10 ++++++----
 util/grub-mkconfig.in                  | 13 ++++++++-----
 util/grub-mkimage.c                    |  2 +-
 util/grub-mkrescue.in                  |  8 +++++---
 util/grub-reboot.in                    |  8 ++++++--
 util/grub-set-default.in               |  8 ++++++--
 util/i386/efi/grub-install.in          | 10 ++++++----
 util/i386/pc/grub-setup.c              |  2 +-
 util/ieee1275/grub-install.in          | 10 ++++++----
 util/powerpc/ieee1275/grub-mkrescue.in |  8 +++++---
 util/sparc64/ieee1275/grub-setup.c     |  2 +-
 12 files changed, 70 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 45637ac17..9bbeae6c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2010-06-08  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	Make --version uniform and avoid hard-coded program name.
+
+	* util/grub-mkimage.c (main): Use `program_name' instead of
+	hard-coded string.
+	* util/i386/pc/grub-setup.c (main): Likewise.
+	* util/sparc64/ieee1275/grub-setup.c (parse_options): Likewise.
+	* util/grub-install.in: Save the basename of $0 in $self, and use the
+	latter in informational messages.  Use the same format for --version
+	as the binary programs.
+	* util/grub-mkconfig.in: Likewise.
+	* util/grub-mkrescue.in: Likewise.
+	* util/grub-reboot.in: Likewise.
+	* util/grub-set-default.in: Likewise.
+	* util/i386/efi/grub-install.in: Likewise.
+	* util/ieee1275/grub-install.in: Likewise.
+	* util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
+
 2010-06-08  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* util/i386/pc/grub-setup.c (setup): Use absolute offsets for start of
diff --git a/util/grub-install.in b/util/grub-install.in
index 0db216fd5..1e7fc1f2e 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -34,6 +34,8 @@ font=@datadir@/@PACKAGE_TARNAME@/ascii.pf2
 pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
 localedir=@datadir@/locale
 
+self=`basename $0`
+
 grub_setup=${sbindir}/`echo grub-setup | sed ${transform}`
 grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
 grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
@@ -61,7 +63,7 @@ fi
 # Print the usage.
 usage () {
     cat <<EOF
-Usage: grub-install [OPTION] install_device
+Usage: $self [OPTION] install_device
 Install GRUB on your drive.
 
   -h, --help              print this message and exit
@@ -91,10 +93,10 @@ fi
 
 INSTALL_DEVICE can be a GRUB device name or a system device filename.
 
-grub-install copies GRUB images into /boot/grub (or /grub on NetBSD and
+$self copies GRUB images into /boot/grub (or /grub on NetBSD and
 OpenBSD), and uses grub-setup to install grub into the boot sector.
 
-If the --root-directory option is used, then grub-install will copy
+If the --root-directory option is used, then $self will copy
 images into the operating system installation rooted at that directory.
 
 Report bugs to <bug-grub@gnu.org>.
@@ -108,7 +110,7 @@ for option in "$@"; do
 	usage
 	exit 0 ;;
     -v | --version)
-	echo "grub-install (GNU GRUB ${PACKAGE_VERSION})"
+	echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
 	exit 0 ;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 0095e1ce8..d916459d6 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -23,7 +23,8 @@ exec_prefix=@exec_prefix@
 sbindir=@sbindir@
 libdir=@libdir@
 sysconfdir=@sysconfdir@
-package_version=@PACKAGE_VERSION@
+PACKAGE_NAME=@PACKAGE_NAME@
+PACKAGE_VERSION=@PACKAGE_VERSION@
 host_os=@host_os@
 datarootdir=@datarootdir@
 datadir=@datadir@
@@ -31,6 +32,8 @@ pkgdatadir=${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`
 grub_cfg=""
 grub_mkconfig_dir=${sysconfdir}/grub.d
 
+self=`basename $0`
+
 grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
 grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
 
@@ -38,7 +41,7 @@ grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
 # Print the usage.
 usage () {
     cat <<EOF
-Usage: $0 [OPTION]
+Usage: $self [OPTION]
 Generate a grub config file
 
   -o, --output=FILE       output generated config to FILE [default=stdout]
@@ -62,7 +65,7 @@ for option in "$@"; do
 	usage
 	exit 0 ;;
     -v | --version)
-	echo "$0 (GNU GRUB ${package_version})"
+	echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
 	exit 0 ;;
     -o)
 	next_grub_cfg=:
@@ -113,7 +116,7 @@ if [ "$EUID" != 0 ] ; then
       done ;;
   esac
   if [ $root != t ] ; then
-    echo "$0: You must run this as root" >&2
+    echo "$self: You must run this as root" >&2
     exit 1
   fi
 fi
@@ -284,7 +287,7 @@ cat << EOF
 #
 # DO NOT EDIT THIS FILE
 #
-# It is automatically generated by $0 using templates
+# It is automatically generated by $self using templates
 # from ${grub_mkconfig_dir} and settings from ${sysconfdir}/default/grub
 #
 EOF
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 4e39450df..7b03c2fd0 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -1307,7 +1307,7 @@ main (int argc, char *argv[])
 	    break;
 
 	  case 'V':
-	    printf ("grub-mkimage (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
+	    printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
 	    return 0;
 
 	  case 'v':
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 99b10de7b..61b0c94f7 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -30,6 +30,8 @@ target_cpu=@target_cpu@
 native_platform=@platform@
 pkglib_DATA="@pkglib_DATA@"
 
+self=`basename $0`
+
 multiboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-multiboot
 coreboot_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-coreboot
 qemu_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-qemu
@@ -44,7 +46,7 @@ grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
 # Print the usage.
 usage () {
     cat <<EOF
-Usage: $0 [OPTION] SOURCE...
+Usage: $self [OPTION] SOURCE...
 Make GRUB rescue image.
 
   -h, --help              print this message and exit
@@ -54,7 +56,7 @@ Make GRUB rescue image.
   --rom-directory=DIR     save rom images in DIR [optional]
   --grub-mkimage=FILE     use FILE as grub-mkimage
 
-$0 generates a bootable rescue image with specified source files or directories.
+$self generates a bootable rescue image with specified source files or directories.
 
 Report bugs to <bug-grub@gnu.org>.
 EOF
@@ -67,7 +69,7 @@ for option in "$@"; do
 	usage
 	exit 0 ;;
     -v | --version)
-	echo "$0 (GNU GRUB ${PACKAGE_VERSION})"
+	echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
 	exit 0 ;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
diff --git a/util/grub-reboot.in b/util/grub-reboot.in
index 20f2b10bc..2c49f5e13 100644
--- a/util/grub-reboot.in
+++ b/util/grub-reboot.in
@@ -22,6 +22,10 @@ transform="@program_transform_name@"
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
+PACKAGE_NAME=@PACKAGE_NAME@
+PACKAGE_VERSION=@PACKAGE_VERSION@
+
+self=`basename $0`
 
 grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}`
 rootdir=
@@ -30,7 +34,7 @@ rootdir=
 # Print the usage.
 usage () {
     cat <<EOF
-Usage: $0 [OPTION] entry
+Usage: $self [OPTION] entry
 Set the default boot entry for GRUB, for the next boot only.
 
   -h, --help              print this message and exit
@@ -51,7 +55,7 @@ for option in "$@"; do
 	usage
 	exit 0 ;;
     -v | --version)
-	echo "grub-reboot (GNU GRUB ${PACKAGE_VERSION})"
+	echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
 	exit 0 ;;
     --root-directory=*)
 	rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
diff --git a/util/grub-set-default.in b/util/grub-set-default.in
index 4d7c10e8e..d8059bfaa 100644
--- a/util/grub-set-default.in
+++ b/util/grub-set-default.in
@@ -22,6 +22,10 @@ transform="@program_transform_name@"
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
+PACKAGE_NAME=@PACKAGE_NAME@
+PACKAGE_VERSION=@PACKAGE_VERSION@
+
+self=`basename $0`
 
 grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}`
 rootdir=
@@ -30,7 +34,7 @@ rootdir=
 # Print the usage.
 usage () {
     cat <<EOF
-Usage: $0 [OPTION] entry
+Usage: $self [OPTION] entry
 Set the default boot entry for GRUB.
 
   -h, --help              print this message and exit
@@ -51,7 +55,7 @@ for option in "$@"; do
 	usage
 	exit 0 ;;
     -v | --version)
-	echo "grub-set-default (GNU GRUB ${PACKAGE_VERSION})"
+	echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
 	exit 0 ;;
     --root-directory=*)
 	rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
diff --git a/util/i386/efi/grub-install.in b/util/i386/efi/grub-install.in
index 9b4270ff6..258381485 100644
--- a/util/i386/efi/grub-install.in
+++ b/util/i386/efi/grub-install.in
@@ -33,6 +33,8 @@ host_os=@host_os@
 pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
 localedir=@datadir@/locale
 
+self=`basename $0`
+
 grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
 grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
 grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
@@ -50,7 +52,7 @@ debug=no
 # Print the usage.
 usage () {
     cat <<EOF
-Usage: grub-install [OPTION]
+Usage: $self [OPTION]
 Install GRUB on your EFI partition.
 
   -h, --help              print this message and exit
@@ -64,7 +66,7 @@ Install GRUB on your EFI partition.
   --no-floppy             do not probe any floppy drive
   --recheck               probe a device map even if it already exists
 
-grub-install copies GRUB images into the DIR/boot directory specified by
+$self copies GRUB images into the DIR/boot directory specified by
 --root-directory.
 
 Report bugs to <bug-grub@gnu.org>.
@@ -78,7 +80,7 @@ for option in "$@"; do
 	usage
 	exit 0 ;;
     -v | --version)
-	echo "grub-install (GNU GRUB ${PACKAGE_VERSION})"
+	echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
 	exit 0 ;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
@@ -219,7 +221,7 @@ $grub_mkimage -O ${target_cpu}-efi --output=${grubdir}/grub.efi $modules || exit
 echo "Installation finished. No error reported."
 echo "This is the contents of the device map $device_map."
 echo "Check if this is correct or not. If any of the lines is incorrect,"
-echo "fix it and re-run the script \`grub-install'."
+echo "fix it and re-run the script \`$self'."
 echo
 
 cat $device_map
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 08a76f65c..ef0f5a990 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -702,7 +702,7 @@ main (int argc, char *argv[])
 	    break;
 
 	  case 'V':
-	    printf ("grub-setup (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
+	    printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
 	    return 0;
 
 	  case 'v':
diff --git a/util/ieee1275/grub-install.in b/util/ieee1275/grub-install.in
index 4d00cc217..72135213d 100644
--- a/util/ieee1275/grub-install.in
+++ b/util/ieee1275/grub-install.in
@@ -34,6 +34,8 @@ target_cpu=@target_cpu@
 platform=@platform@
 pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
 
+self=`basename $0`
+
 grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
 grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
 grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
@@ -53,7 +55,7 @@ nvsetenv=`which nvsetenv`
 # Print the usage.
 usage () {
     cat <<EOF
-Usage: grub-install [OPTION] [install_device]
+Usage: $self [OPTION] [install_device]
 Install GRUB on your drive.
 
   -h, --help              print this message and exit
@@ -66,7 +68,7 @@ Install GRUB on your drive.
   --grub-probe=FILE       use FILE as grub-probe
   --no-nvram              don't update the boot-device NVRAM variable
 
-grub-install copies GRUB images into the DIR/boot directory specified by
+$self copies GRUB images into the DIR/boot directory specified by
 --root-directory, and uses nvsetenv to set the Open Firmware boot-device
 variable.
 
@@ -81,7 +83,7 @@ for option in "$@"; do
 	usage
 	exit 0 ;;
     -v | --version)
-	echo "grub-install (GNU GRUB ${PACKAGE_VERSION})"
+	echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
 	exit 0 ;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
@@ -231,7 +233,7 @@ fi
 echo "Installation finished. No error reported."
 echo "This is the contents of the device map $device_map."
 echo "Check if this is correct or not. If any of the lines is incorrect,"
-echo "fix it and re-run the script \`grub-install'."
+echo "fix it and re-run the script \`$self'."
 echo
 
 cat $device_map
diff --git a/util/powerpc/ieee1275/grub-mkrescue.in b/util/powerpc/ieee1275/grub-mkrescue.in
index 16658505b..d79627862 100644
--- a/util/powerpc/ieee1275/grub-mkrescue.in
+++ b/util/powerpc/ieee1275/grub-mkrescue.in
@@ -30,13 +30,15 @@ target_cpu=@target_cpu@
 platform=@platform@
 pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
 
+self=`basename $0`
+
 grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
 
 # Usage: usage
 # Print the usage.
 usage () {
     cat <<EOF
-Usage: grub-mkrescue [OPTION] output_image
+Usage: $self [OPTION] output_image
 Make GRUB rescue image.
 
   -h, --help              print this message and exit
@@ -46,7 +48,7 @@ Make GRUB rescue image.
                           default: ${pkglibdir}
   --grub-mkimage=FILE     use FILE as grub-mkimage
 
-grub-mkimage generates a bootable rescue CD image for PowerMac and CHRP.
+$self generates a bootable rescue CD image for PowerMac and CHRP.
 
 Report bugs to <bug-grub@gnu.org>.
 EOF
@@ -61,7 +63,7 @@ for option in "$@"; do
 	usage
 	exit 0 ;;
     -v | --version)
-	echo "grub-mkrescue (GNU GRUB ${PACKAGE_VERSION})"
+	echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
 	exit 0 ;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index 8a2d30ba1..93e135eb3 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -503,7 +503,7 @@ parse_options (struct grub_setup_info *gp, int argc, char *argv[])
 	    break;
 
 	  case 'V':
-	    printf ("grub-setup (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION);
+	    printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
 	    return 0;
 
 	  case 'v':

From ff174dbea117ef33d06176e09b8ce648c3d4ae72 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 8 Jun 2010 17:37:17 +0530
Subject: [PATCH 1103/1628] add autogen to INSTALL

---
 INSTALL    | 1 +
 autogen.sh | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/INSTALL b/INSTALL
index 418b3002d..bbfa01f0a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -40,6 +40,7 @@ need the following.
 * 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:
 
diff --git a/autogen.sh b/autogen.sh
index db640702b..46ccc0627 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,6 +2,8 @@
 
 set -e
 
+autogen --version >/dev/null || (echo autogen missing; exit 1)
+
 echo "Creating symlinks..."
 ln -svf ../NEWS grub-core/
 ln -svf ../TODO grub-core/

From d270972ab046a49798cabe73d1e9c1bacc5aad18 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 8 Jun 2010 18:08:45 +0530
Subject: [PATCH 1104/1628] fix pkglibrootdir for grub-mkimage

---
 modules.def | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules.def b/modules.def
index 766c8a604..8b709a869 100644
--- a/modules.def
+++ b/modules.def
@@ -115,7 +115,7 @@ program = {
   ldadd = libgrub.a;
   ldadd = '$(LIBINTL)';
 
-  cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibroot)\"';
+  cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"';
   common;
 };
 

From 6c9aa3df16e5add2b88b96556b5e0d0ba8ce9475 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 9 Jun 2010 11:29:11 +0530
Subject: [PATCH 1105/1628] block params are grub_script with independent
 memory

---
 include/grub/script_sh.h |  2 +-
 script/parser.y          | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index e1bf6f22e..9eccb9028 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -61,7 +61,7 @@ struct grub_script_arg
   char *str;
 
   /* Parsed block argument.  */
-  struct grub_script_cmd *block;
+  struct grub_script block;
 
   /* Next argument part.  */
   struct grub_script_arg *next;
diff --git a/script/parser.y b/script/parser.y
index 9d256a153..6669b783c 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -33,7 +33,10 @@
   struct grub_script_arglist *arglist;
   struct grub_script_arg *arg;
   char *string;
-  unsigned offset;
+  struct {
+    unsigned offset;
+    struct grub_script_mem *memory;
+  };
 }
 
 %token GRUB_PARSER_TOKEN_BAD
@@ -147,24 +150,30 @@ argument : "case"      { $$ = grub_script_add_arglist (state, 0, $1); }
          | word { $$ = $1; }
 ;
 
-block: "{" 
+block: "{"
        {
          grub_script_lexer_ref (state->lexerstate);
          $<offset>$ = grub_script_lexer_record_start (state);
+	 $<memory>$ = grub_script_mem_record (state);
        }
        commands1 delimiters0 "}"
        {
          char *p;
          struct grub_script_arg *arg;
+	 struct grub_script_mem *memory;
 
-         grub_script_lexer_deref (state->lexerstate);
-         if (p = grub_script_lexer_record_stop (state, $<offset>2))
+	 memory = grub_script_mem_record_stop (state, $<memory>2);
+         if ((p = grub_script_lexer_record_stop (state, $<offset>2)))
 	   *grub_strrchr (p, '}') = '\0';
 
          if (arg = grub_script_arg_add (state, 0, GRUB_SCRIPT_ARG_TYPE_BLOCK, p))
-	   arg->block = $3;
+	   {
+	     arg->block.cmd = $3;
+	     arg->block.mem = memory;
+	   }
 
          $$ = grub_script_add_arglist (state, 0, arg);
+         grub_script_lexer_deref (state->lexerstate);
        }
 ;
 

From 9146024736865ce501bd750cb1b7a0b286db48e0 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 9 Jun 2010 20:43:25 +0200
Subject: [PATCH 1106/1628] 2010-06-09  Robert Millan  <rmh@gnu.org>

	* util/grub.d/10_linux.in: Prefer compressed images over non-compressed
	ones, when both are available.
---
 ChangeLog               | 5 +++++
 util/grub.d/10_linux.in | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9bbeae6c2..6158ef4b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-09  Robert Millan  <rmh@gnu.org>
+
+	* util/grub.d/10_linux.in: Prefer compressed images over non-compressed
+	ones, when both are available.
+
 2010-06-08  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	Make --version uniform and avoid hard-coded program name.
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 802d59f51..416ab6ed6 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -97,7 +97,7 @@ EOF
 EOF
 }
 
-list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
+list=`for i in /boot/vmlinu[zx]-* /vmlinu[zx]-* ; do
         if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
       done`
 prepare_boot_cache=

From 6289c3a71507d8b02d859aa2e59d4e4dc81eb417 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 9 Jun 2010 22:24:12 +0200
Subject: [PATCH 1107/1628] 	* docs/grub.texi (Vendor power-on button): Add
 Asus EeePC 1005PE as 	reported by Henrique Ferreiro.

---
 ChangeLog      | 5 +++++
 docs/grub.texi | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6158ef4b3..0575e7c5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* docs/grub.texi (Vendor power-on button): Add Asus EeePC 1005PE as
+	reported by Henrique Ferreiro.
+
 2010-06-09  Robert Millan  <rmh@gnu.org>
 
 	* util/grub.d/10_linux.in: Prefer compressed images over non-compressed
diff --git a/docs/grub.texi b/docs/grub.texi
index ac3bc2f90..9fe197da2 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1123,6 +1123,8 @@ Values known to GRUB team are:
 @table @key
 @item Dell XPS M1530
 85:3
+@item Asus EeePC 1005PE 
+84:1 (unconfirmed)
 @end table
 
 To take full advantage of this function install GRUB into MBR.

From 28be0e94db5c92202a94fe204beb5d0ea0936771 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 10 Jun 2010 12:12:03 +0530
Subject: [PATCH 1108/1628] add example usage to hello command

---
 commands/acpi.c             |  5 ++---
 commands/echo.c             |  4 ++--
 commands/extcmd.c           | 23 ++++++++++++++-----
 commands/hashsum.c          |  6 ++---
 commands/hdparm.c           |  4 ++--
 commands/help.c             |  2 +-
 commands/hexdump.c          |  4 ++--
 commands/i386/cpuid.c       |  2 +-
 commands/i386/pc/drivemap.c | 12 +++++-----
 commands/i386/pc/halt.c     |  4 ++--
 commands/iorw.c             |  8 +++----
 commands/keystatus.c        |  4 ++--
 commands/loadenv.c          | 12 +++++-----
 commands/ls.c               |  4 ++--
 commands/lspci.c            |  4 ++--
 commands/memrw.c            |  8 +++----
 commands/probe.c            |  4 ++--
 commands/search_wrap.c      |  4 ++--
 commands/setpci.c           | 16 ++++++-------
 commands/sleep.c            |  4 ++--
 disk/loopback.c             |  4 ++--
 hello/hello.c               | 38 ++++++++++++++++++++++++++-----
 include/grub/command.h      |  2 ++
 include/grub/extcmd.h       | 22 +++++++++++++++---
 include/grub/script_sh.h    |  3 +++
 loader/i386/bsd.c           | 20 ++++++++---------
 loader/xnu.c                |  6 ++---
 script/argv.c               | 45 +++++++++++++++++++++++++++++++++++--
 script/execute.c            | 25 ++++++++++++++++-----
 script/parser.y             |  2 +-
 script/script.c             |  8 ++++++-
 term/gfxterm.c              |  7 +++---
 term/serial.c               |  4 ++--
 tests/lib/functional_test.c |  2 +-
 34 files changed, 220 insertions(+), 102 deletions(-)

diff --git a/commands/acpi.c b/commands/acpi.c
index 5bbfd008b..bdfdea073 100644
--- a/commands/acpi.c
+++ b/commands/acpi.c
@@ -456,10 +456,9 @@ free_tables (void)
 }
 
 static grub_err_t
-grub_cmd_acpi (struct grub_extcmd *cmd,
-		      int argc, char **args)
+grub_cmd_acpi (struct grub_extcmd_context *ctxt, int argc, char **args)
 {
-  struct grub_arg_list *state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
   struct grub_acpi_rsdp_v10 *rsdp;
   struct efiemu_acpi_table *cur, *t;
   grub_err_t err;
diff --git a/commands/echo.c b/commands/echo.c
index 4fea091cb..6bc00eae8 100644
--- a/commands/echo.c
+++ b/commands/echo.c
@@ -30,9 +30,9 @@ static const struct grub_arg_option options[] =
   };
 
 static grub_err_t
-grub_cmd_echo (grub_extcmd_t cmd, int argc, char **args)
+grub_cmd_echo (grub_extcmd_context_t ctxt, int argc, char **args)
 {
-  struct grub_arg_list *state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
   int newline = 1;
   int i;
 
diff --git a/commands/extcmd.c b/commands/extcmd.c
index 16796febf..76cbe4e26 100644
--- a/commands/extcmd.c
+++ b/commands/extcmd.c
@@ -21,15 +21,17 @@
 #include <grub/list.h>
 #include <grub/misc.h>
 #include <grub/extcmd.h>
+#include <grub/script_sh.h>
 
-static grub_err_t
-grub_extcmd_dispatcher (struct grub_command *cmd,
-			int argc, char **args)
+grub_err_t
+grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
+			struct grub_script **scripts)
 {
   int new_argc;
   char **new_args;
   struct grub_arg_option *parser;
   struct grub_arg_list *state;
+  struct grub_extcmd_context context;
   int maxargs = 0;
   grub_err_t ret;
   grub_extcmd_t ext;
@@ -44,8 +46,11 @@ grub_extcmd_dispatcher (struct grub_command *cmd,
 
   if (grub_arg_parse (ext, argc, args, state, &new_args, &new_argc))
     {
-      ext->state = state;
-      ret = (ext->func) (ext, new_argc, new_args);
+      context.extcmd = ext;
+      context.state = state;
+      context.script_params = scripts;
+
+      ret = (ext->func) (&context, new_argc, new_args);
       grub_free (new_args);
     }
   else
@@ -56,6 +61,12 @@ grub_extcmd_dispatcher (struct grub_command *cmd,
   return ret;
 }
 
+static grub_err_t
+grub_extcmd_dispatch (struct grub_command *cmd, int argc, char **args)
+{
+  return grub_extcmd_dispatcher (cmd, argc, args, 0);
+}
+
 grub_extcmd_t
 grub_register_extcmd (const char *name, grub_extcmd_func_t func,
 		      unsigned flags, const char *summary,
@@ -69,7 +80,7 @@ grub_register_extcmd (const char *name, grub_extcmd_func_t func,
   if (! ext)
     return 0;
 
-  cmd = grub_register_command_prio (name, grub_extcmd_dispatcher,
+  cmd = grub_register_command_prio (name, grub_extcmd_dispatch,
 				    summary, description, 1);
   if (! cmd)
     {
diff --git a/commands/hashsum.c b/commands/hashsum.c
index d5f551dbb..df85015a6 100644
--- a/commands/hashsum.c
+++ b/commands/hashsum.c
@@ -165,10 +165,10 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename,
 }
 
 static grub_err_t
-grub_cmd_hashsum (struct grub_extcmd *cmd,
+grub_cmd_hashsum (struct grub_extcmd_context *ctxt,
 		  int argc, char **args)
 {
-  struct grub_arg_list *state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
   const char *hashname = NULL;
   const char *prefix = NULL;
   const gcry_md_spec_t *hash;
@@ -177,7 +177,7 @@ grub_cmd_hashsum (struct grub_extcmd *cmd,
   unsigned unread = 0;
 
   for (i = 0; i < ARRAY_SIZE (aliases); i++)
-    if (grub_strcmp (cmd->cmd->name, aliases[i].name) == 0)
+    if (grub_strcmp (ctxt->extcmd->cmd->name, aliases[i].name) == 0)
       hashname = aliases[i].hashname;
   if (state[0].set)
     hashname = state[0].arg;
diff --git a/commands/hdparm.c b/commands/hdparm.c
index a3f8bbff0..54724077d 100644
--- a/commands/hdparm.c
+++ b/commands/hdparm.c
@@ -270,9 +270,9 @@ static int get_int_arg (const struct grub_arg_list *state)
 }
 
 static grub_err_t
-grub_cmd_hdparm (grub_extcmd_t cmd, int argc, char **args) // state????
+grub_cmd_hdparm (grub_extcmd_context_t ctxt, int argc, char **args) // state????
 {
-  struct grub_arg_list *state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
 
   /* Check command line.  */
   if (argc != 1)
diff --git a/commands/help.c b/commands/help.c
index c2aad03b2..2b2eeaa84 100644
--- a/commands/help.c
+++ b/commands/help.c
@@ -27,7 +27,7 @@
 #include <grub/charset.h>
 
 static grub_err_t
-grub_cmd_help (grub_extcmd_t ext __attribute__ ((unused)), int argc,
+grub_cmd_help (grub_extcmd_context_t ctxt __attribute__ ((unused)), int argc,
 	       char **args)
 {
   int cnt = 0;
diff --git a/commands/hexdump.c b/commands/hexdump.c
index c1d4ecba9..6c518f649 100644
--- a/commands/hexdump.c
+++ b/commands/hexdump.c
@@ -34,9 +34,9 @@ static const struct grub_arg_option options[] = {
 };
 
 static grub_err_t
-grub_cmd_hexdump (grub_extcmd_t cmd, int argc, char **args)
+grub_cmd_hexdump (grub_extcmd_context_t ctxt, int argc, char **args)
 {
-  struct grub_arg_list *state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
   char buf[GRUB_DISK_SECTOR_SIZE * 4];
   grub_ssize_t size, length;
   grub_disk_addr_t skip;
diff --git a/commands/i386/cpuid.c b/commands/i386/cpuid.c
index 6eebf91a1..412b284d0 100644
--- a/commands/i386/cpuid.c
+++ b/commands/i386/cpuid.c
@@ -43,7 +43,7 @@ static const struct grub_arg_option options[] =
 unsigned char grub_cpuid_has_longmode = 0;
 
 static grub_err_t
-grub_cmd_cpuid (grub_extcmd_t cmd __attribute__ ((unused)),
+grub_cmd_cpuid (grub_extcmd_context_t ctxt __attribute__ ((unused)),
 		int argc __attribute__ ((unused)),
 		char **args __attribute__ ((unused)))
 {
diff --git a/commands/i386/pc/drivemap.c b/commands/i386/pc/drivemap.c
index 4afc43358..7ecfe7454 100644
--- a/commands/i386/pc/drivemap.c
+++ b/commands/i386/pc/drivemap.c
@@ -196,13 +196,13 @@ list_mappings (void)
 }
 
 static grub_err_t
-grub_cmd_drivemap (struct grub_extcmd *cmd, int argc, char **args)
+grub_cmd_drivemap (struct grub_extcmd_context *ctxt, int argc, char **args)
 {
-  if (cmd->state[OPTIDX_LIST].set)
+  if (ctxt->state[OPTIDX_LIST].set)
     {
       return list_mappings ();
     }
-  else if (cmd->state[OPTIDX_RESET].set)
+  else if (ctxt->state[OPTIDX_RESET].set)
     {
       /* Reset: just delete all mappings, freeing their memory.  */
       drivemap_node_t *curnode = map_head;
@@ -216,7 +216,7 @@ grub_cmd_drivemap (struct grub_extcmd *cmd, int argc, char **args)
       map_head = 0;
       return GRUB_ERR_NONE;
     }
-  else if (!cmd->state[OPTIDX_SWAP].set && argc == 0)
+  else if (!ctxt->state[OPTIDX_SWAP].set && argc == 0)
     {
       /* No arguments */
       return list_mappings ();
@@ -248,11 +248,11 @@ grub_cmd_drivemap (struct grub_extcmd *cmd, int argc, char **args)
     }
   /* Set the mapping for the disk (overwrites any existing mapping).  */
   grub_dprintf ("drivemap", "%s %s (%02x) = %s (%02x)\n",
-		cmd->state[OPTIDX_SWAP].set ? "Swapping" : "Mapping",
+		ctxt->state[OPTIDX_SWAP].set ? "Swapping" : "Mapping",
 		args[1], mapto, args[0], mapfrom);
   err = drivemap_set (mapto, mapfrom);
   /* If -s, perform the reverse mapping too (only if the first was OK).  */
-  if (cmd->state[OPTIDX_SWAP].set && err == GRUB_ERR_NONE)
+  if (ctxt->state[OPTIDX_SWAP].set && err == GRUB_ERR_NONE)
     err = drivemap_set (mapfrom, mapto);
   return err;
 }
diff --git a/commands/i386/pc/halt.c b/commands/i386/pc/halt.c
index 4c39612ae..10b298644 100644
--- a/commands/i386/pc/halt.c
+++ b/commands/i386/pc/halt.c
@@ -29,12 +29,12 @@ static const struct grub_arg_option options[] =
   };
 
 static grub_err_t
-grub_cmd_halt (grub_extcmd_t cmd,
+grub_cmd_halt (grub_extcmd_context_t ctxt,
 	       int argc __attribute__ ((unused)),
 	       char **args __attribute__ ((unused)))
 
 {
-  struct grub_arg_list *state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
   int no_apm = 0;
   if (state[0].set)
     no_apm = 1;
diff --git a/commands/iorw.c b/commands/iorw.c
index 474c8712e..bd0183794 100644
--- a/commands/iorw.c
+++ b/commands/iorw.c
@@ -36,7 +36,7 @@ static const struct grub_arg_option options[] =
 
 
 static grub_err_t
-grub_cmd_read (grub_extcmd_t cmd, int argc, char **argv)
+grub_cmd_read (grub_extcmd_context_t ctxt, int argc, char **argv)
 {
   grub_target_addr_t addr;
   grub_uint32_t value = 0;
@@ -46,7 +46,7 @@ grub_cmd_read (grub_extcmd_t cmd, int argc, char **argv)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "Invalid number of arguments");
 
   addr = grub_strtoul (argv[0], 0, 0);
-  switch (cmd->cmd->name[sizeof ("in") - 1])
+  switch (ctxt->extcmd->cmd->name[sizeof ("in") - 1])
     {
     case 'l':
       value = grub_inl (addr);
@@ -61,10 +61,10 @@ grub_cmd_read (grub_extcmd_t cmd, int argc, char **argv)
       break;
     }
 
-  if (cmd->state[0].set)
+  if (ctxt->state[0].set)
     {
       grub_snprintf (buf, sizeof (buf), "%x", value);
-      grub_env_set (cmd->state[0].arg, buf);
+      grub_env_set (ctxt->state[0].arg, buf);
     }
   else
     grub_printf ("0x%x\n", value);
diff --git a/commands/keystatus.c b/commands/keystatus.c
index 838792889..c83c00560 100644
--- a/commands/keystatus.c
+++ b/commands/keystatus.c
@@ -34,11 +34,11 @@ static const struct grub_arg_option options[] =
 #define grub_cur_term_input	grub_term_get_current_input ()
 
 static grub_err_t
-grub_cmd_keystatus (grub_extcmd_t cmd,
+grub_cmd_keystatus (grub_extcmd_context_t ctxt,
 		    int argc __attribute__ ((unused)),
 		    char **args __attribute__ ((unused)))
 {
-  struct grub_arg_list *state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
   int expect_mods = 0;
   int mods;
 
diff --git a/commands/loadenv.c b/commands/loadenv.c
index d763b2d5e..381810a92 100644
--- a/commands/loadenv.c
+++ b/commands/loadenv.c
@@ -111,11 +111,11 @@ read_envblk_file (grub_file_t file)
 }
 
 static grub_err_t
-grub_cmd_load_env (grub_extcmd_t cmd,
+grub_cmd_load_env (grub_extcmd_context_t ctxt,
 		   int argc __attribute__ ((unused)),
 		   char **args __attribute__ ((unused)))
 {
-  struct grub_arg_list *state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
   grub_file_t file;
   grub_envblk_t envblk;
 
@@ -143,11 +143,11 @@ grub_cmd_load_env (grub_extcmd_t cmd,
 }
 
 static grub_err_t
-grub_cmd_list_env (grub_extcmd_t cmd,
+grub_cmd_list_env (grub_extcmd_context_t ctxt,
 		   int argc __attribute__ ((unused)),
 		   char **args __attribute__ ((unused)))
 {
-  struct grub_arg_list *state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
   grub_file_t file;
   grub_envblk_t envblk;
 
@@ -280,9 +280,9 @@ write_blocklists (grub_envblk_t envblk, struct blocklist *blocklists,
 }
 
 static grub_err_t
-grub_cmd_save_env (grub_extcmd_t cmd, int argc, char **args)
+grub_cmd_save_env (grub_extcmd_context_t ctxt, int argc, char **args)
 {
-  struct grub_arg_list *state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
   grub_file_t file;
   grub_envblk_t envblk;
   struct blocklist *head = 0;
diff --git a/commands/ls.c b/commands/ls.c
index eb1049617..6b2f63c19 100644
--- a/commands/ls.c
+++ b/commands/ls.c
@@ -248,9 +248,9 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
 }
 
 static grub_err_t
-grub_cmd_ls (grub_extcmd_t cmd, int argc, char **args)
+grub_cmd_ls (grub_extcmd_context_t ctxt, int argc, char **args)
 {
-  struct grub_arg_list *state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
 
   if (argc == 0)
     grub_ls_list_devices (state[0].set);
diff --git a/commands/lspci.c b/commands/lspci.c
index a69bb35ad..bc52e060a 100644
--- a/commands/lspci.c
+++ b/commands/lspci.c
@@ -211,11 +211,11 @@ grub_lspci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)
 }
 
 static grub_err_t
-grub_cmd_lspci (grub_extcmd_t cmd,
+grub_cmd_lspci (grub_extcmd_context_t ctxt,
 		int argc __attribute__ ((unused)),
 		char **args __attribute__ ((unused)))
 {
-  iospace = cmd->state[0].set;
+  iospace = ctxt->state[0].set;
   grub_pci_iterate (grub_lspci_iter);
   return GRUB_ERR_NONE;
 }
diff --git a/commands/memrw.c b/commands/memrw.c
index 6a4d43be2..d28f45ec1 100644
--- a/commands/memrw.c
+++ b/commands/memrw.c
@@ -35,7 +35,7 @@ static const struct grub_arg_option options[] =
 
 
 static grub_err_t
-grub_cmd_read (grub_extcmd_t cmd, int argc, char **argv)
+grub_cmd_read (grub_extcmd_context_t ctxt, int argc, char **argv)
 {
   grub_target_addr_t addr;
   grub_uint32_t value = 0;
@@ -45,7 +45,7 @@ grub_cmd_read (grub_extcmd_t cmd, int argc, char **argv)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "invalid number of arguments");
 
   addr = grub_strtoul (argv[0], 0, 0);
-  switch (cmd->cmd->name[sizeof ("read_") - 1])
+  switch (ctxt->extcmd->cmd->name[sizeof ("read_") - 1])
     {
     case 'd':
       value = *((volatile grub_uint32_t *) addr);
@@ -60,10 +60,10 @@ grub_cmd_read (grub_extcmd_t cmd, int argc, char **argv)
       break;
     }
 
-  if (cmd->state[0].set)
+  if (ctxt->state[0].set)
     {
       grub_snprintf (buf, sizeof (buf), "%x", value);
-      grub_env_set (cmd->state[0].arg, buf);
+      grub_env_set (ctxt->state[0].arg, buf);
     }
   else
     grub_printf ("0x%x\n", value);
diff --git a/commands/probe.c b/commands/probe.c
index c2cc599e9..f3941e029 100644
--- a/commands/probe.c
+++ b/commands/probe.c
@@ -45,9 +45,9 @@ static const struct grub_arg_option options[] =
   };
 
 static grub_err_t
-grub_cmd_probe (grub_extcmd_t cmd, int argc, char **args)
+grub_cmd_probe (grub_extcmd_context_t ctxt, int argc, char **args)
 {
-  struct grub_arg_list *state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
   grub_device_t dev;
   grub_fs_t fs;
   char *ptr;
diff --git a/commands/search_wrap.c b/commands/search_wrap.c
index 2891d85d7..fff3fb47a 100644
--- a/commands/search_wrap.c
+++ b/commands/search_wrap.c
@@ -50,9 +50,9 @@ enum options
  };
 
 static grub_err_t
-grub_cmd_search (grub_extcmd_t cmd, int argc, char **args)
+grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)
 {
-  struct grub_arg_list *state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
   const char *var = 0;
 
   if (argc == 0)
diff --git a/commands/setpci.c b/commands/setpci.c
index fbc7c214e..89a0085d8 100644
--- a/commands/setpci.c
+++ b/commands/setpci.c
@@ -155,7 +155,7 @@ grub_setpci_iter (grub_pci_device_t dev, grub_pci_id_t pciid)
 }
 
 static grub_err_t
-grub_cmd_setpci (grub_extcmd_t cmd, int argc, char **argv)
+grub_cmd_setpci (grub_extcmd_context_t ctxt, int argc, char **argv)
 {
   const char *ptr;
   unsigned i;
@@ -163,14 +163,14 @@ grub_cmd_setpci (grub_extcmd_t cmd, int argc, char **argv)
   pciid_check_value = 0;
   pciid_check_mask = 0;
 
-  if (cmd->state[0].set)
+  if (ctxt->state[0].set)
     {
-      ptr = cmd->state[0].arg;
+      ptr = ctxt->state[0].arg;
       pciid_check_value |= (grub_strtoul (ptr, (char **) &ptr, 16) & 0xffff);
       if (grub_errno == GRUB_ERR_BAD_NUMBER)
 	{
 	  grub_errno = GRUB_ERR_NONE;
-	  ptr = cmd->state[0].arg;
+	  ptr = ctxt->state[0].arg;
 	}
       else
 	pciid_check_mask |= 0xffff;
@@ -191,11 +191,11 @@ grub_cmd_setpci (grub_extcmd_t cmd, int argc, char **argv)
 
   check_bus = check_device = check_function = 0;
 
-  if (cmd->state[1].set)
+  if (ctxt->state[1].set)
     {
       const char *optr;
       
-      ptr = cmd->state[1].arg;
+      ptr = ctxt->state[1].arg;
       optr = ptr;
       bus = grub_strtoul (ptr, (char **) &ptr, 16);
       if (grub_errno == GRUB_ERR_BAD_NUMBER)
@@ -229,8 +229,8 @@ grub_cmd_setpci (grub_extcmd_t cmd, int argc, char **argv)
 	}
     }
 
-  if (cmd->state[2].set)
-    varname = cmd->state[2].arg;
+  if (ctxt->state[2].set)
+    varname = ctxt->state[2].arg;
   else
     varname = NULL;
 
diff --git a/commands/sleep.c b/commands/sleep.c
index ead279506..ee0875cf7 100644
--- a/commands/sleep.c
+++ b/commands/sleep.c
@@ -60,9 +60,9 @@ grub_interruptible_millisleep (grub_uint32_t ms)
 }
 
 static grub_err_t
-grub_cmd_sleep (grub_extcmd_t cmd, int argc, char **args)
+grub_cmd_sleep (grub_extcmd_context_t ctxt, int argc, char **args)
 {
-  struct grub_arg_list *state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
   int n;
 
   if (argc != 1)
diff --git a/disk/loopback.c b/disk/loopback.c
index 1b525e05f..52929e765 100644
--- a/disk/loopback.c
+++ b/disk/loopback.c
@@ -71,9 +71,9 @@ delete_loopback (const char *name)
 
 /* The command to add and remove loopback devices.  */
 static grub_err_t
-grub_cmd_loopback (grub_extcmd_t cmd, int argc, char **args)
+grub_cmd_loopback (grub_extcmd_context_t ctxt, int argc, char **args)
 {
-  struct grub_arg_list *state = state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
   grub_file_t file;
   struct grub_loopback *newdev;
 
diff --git a/hello/hello.c b/hello/hello.c
index eff07d941..16c3bb5ce 100644
--- a/hello/hello.c
+++ b/hello/hello.c
@@ -26,12 +26,36 @@
 #include <grub/extcmd.h>
 #include <grub/i18n.h>
 
+static struct grub_script *script;
+
 static grub_err_t
-grub_cmd_hello (struct grub_extcmd *cmd __attribute__ ((unused)),
-		int argc __attribute__ ((unused)),
-		char **args __attribute__ ((unused)))
+grub_cmd_hello (grub_extcmd_context_t ctxt,
+		int argc, char **args __attribute__ ((unused)))
 {
-  grub_printf ("Hello World\n");
+  if (argc == 0 && script == 0)
+    grub_printf ("Hello World\n");
+
+  else if (argc == 0)
+    grub_script_execute (script);
+
+  else
+    {
+      if (! ctxt->script_params || ! ctxt->script_params[0])
+	return 1;
+
+      if (script)
+	grub_script_free (script);
+
+      script = grub_malloc (sizeof (*script));
+      if (! script)
+	return 1;
+
+      script->cmd = ctxt->script_params[0]->cmd;
+      script->mem = ctxt->script_params[0]->mem;
+      ctxt->script_params[0]->cmd = 0;
+      ctxt->script_params[0]->mem = 0;
+    }
+
   return 0;
 }
 
@@ -39,11 +63,15 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(hello)
 {
-  cmd = grub_register_extcmd ("hello", grub_cmd_hello, GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("hello", grub_cmd_hello,
+			      GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_BLOCKS,
 			      0, N_("Say \"Hello World\"."), 0);
 }
 
 GRUB_MOD_FINI(hello)
 {
+  if (script)
+    grub_script_free (script);
+
   grub_unregister_extcmd (cmd);
 }
diff --git a/include/grub/command.h b/include/grub/command.h
index 6e9942b60..c2523f288 100644
--- a/include/grub/command.h
+++ b/include/grub/command.h
@@ -37,6 +37,8 @@
 #define GRUB_COMMAND_FLAG_EXTCMD	0x10
 /* This is an dynamic command.  */
 #define GRUB_COMMAND_FLAG_DYNCMD	0x20
+/* This command accepts block arguments.  */
+#define GRUB_COMMAND_FLAG_BLOCKS	0x40
 
 struct grub_command;
 
diff --git a/include/grub/extcmd.h b/include/grub/extcmd.h
index 03eaba8f8..54f0958fe 100644
--- a/include/grub/extcmd.h
+++ b/include/grub/extcmd.h
@@ -21,10 +21,12 @@
 
 #include <grub/lib/arg.h>
 #include <grub/command.h>
+#include <grub/script_sh.h>
 
 struct grub_extcmd;
+struct grub_extcmd_context;
 
-typedef grub_err_t (*grub_extcmd_func_t) (struct grub_extcmd *cmd,
+typedef grub_err_t (*grub_extcmd_func_t) (struct grub_extcmd_context *ctxt,
 					  int argc, char **args);
 
 /* The argcmd description.  */
@@ -38,11 +40,21 @@ struct grub_extcmd
   const struct grub_arg_option *options;
 
   void *data;
-
-  struct grub_arg_list *state;
 };
 typedef struct grub_extcmd *grub_extcmd_t;
 
+/* Command context for each instance of execution.  */
+struct grub_extcmd_context
+{
+  struct grub_extcmd *extcmd;
+
+  struct grub_arg_list *state;
+
+  /* Script parameters, if any.  */
+  struct grub_script **script_params;
+};
+typedef struct grub_extcmd_context *grub_extcmd_context_t;
+
 grub_extcmd_t grub_register_extcmd (const char *name,
 				    grub_extcmd_func_t func,
 				    unsigned flags,
@@ -52,4 +64,8 @@ grub_extcmd_t grub_register_extcmd (const char *name,
 
 void grub_unregister_extcmd (grub_extcmd_t cmd);
 
+grub_err_t
+grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
+			struct grub_script **scripts);
+
 #endif /* ! GRUB_EXTCMD_HEADER */
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 87fb26f93..a17dcca70 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -72,6 +72,7 @@ struct grub_script_argv
 {
   unsigned argc;
   char **args;
+  struct grub_script **scripts;
 };
 
 /* A complete argument.  It consists of a list of one or more `struct
@@ -230,6 +231,8 @@ void grub_script_argv_free    (struct grub_script_argv *argv);
 int grub_script_argv_next     (struct grub_script_argv *argv);
 int grub_script_argv_append   (struct grub_script_argv *argv, const char *s);
 int grub_script_argv_split_append (struct grub_script_argv *argv, char *s);
+int grub_script_argv_script_append (struct grub_script_argv *argv,
+				    struct grub_script *s);
 
 struct grub_script_arglist *
 grub_script_create_arglist (struct grub_parser_param *state);
diff --git a/loader/i386/bsd.c b/loader/i386/bsd.c
index 3c7fe2fee..c92712562 100644
--- a/loader/i386/bsd.c
+++ b/loader/i386/bsd.c
@@ -946,10 +946,10 @@ grub_bsd_parse_flags (const struct grub_arg_list *state,
 }
 
 static grub_err_t
-grub_cmd_freebsd (grub_extcmd_t cmd, int argc, char *argv[])
+grub_cmd_freebsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
 {
   kernel_type = KERNEL_TYPE_FREEBSD;
-  bootflags = grub_bsd_parse_flags (cmd->state, freebsd_flags);
+  bootflags = grub_bsd_parse_flags (ctxt->state, freebsd_flags);
 
   if (grub_bsd_load (argc, argv) == GRUB_ERR_NONE)
     {
@@ -1009,16 +1009,16 @@ grub_cmd_freebsd (grub_extcmd_t cmd, int argc, char *argv[])
 }
 
 static grub_err_t
-grub_cmd_openbsd (grub_extcmd_t cmd, int argc, char *argv[])
+grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
 {
   grub_uint32_t bootdev;
 
   kernel_type = KERNEL_TYPE_OPENBSD;
-  bootflags = grub_bsd_parse_flags (cmd->state, openbsd_flags);
+  bootflags = grub_bsd_parse_flags (ctxt->state, openbsd_flags);
 
-  if (cmd->state[OPENBSD_ROOT_ARG].set)
+  if (ctxt->state[OPENBSD_ROOT_ARG].set)
     {
-      const char *arg = cmd->state[OPENBSD_ROOT_ARG].arg;
+      const char *arg = ctxt->state[OPENBSD_ROOT_ARG].arg;
       int unit, part;
       if (*(arg++) != 'w' || *(arg++) != 'd')
 	return grub_error (GRUB_ERR_BAD_ARGUMENT,
@@ -1049,16 +1049,16 @@ grub_cmd_openbsd (grub_extcmd_t cmd, int argc, char *argv[])
 }
 
 static grub_err_t
-grub_cmd_netbsd (grub_extcmd_t cmd, int argc, char *argv[])
+grub_cmd_netbsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
 {
   kernel_type = KERNEL_TYPE_NETBSD;
-  bootflags = grub_bsd_parse_flags (cmd->state, netbsd_flags);
+  bootflags = grub_bsd_parse_flags (ctxt->state, netbsd_flags);
 
   if (grub_bsd_load (argc, argv) == GRUB_ERR_NONE)
     {
       grub_loader_set (grub_netbsd_boot, grub_bsd_unload, 1);
-      if (cmd->state[NETBSD_ROOT_ARG].set)
-	netbsd_root = grub_strdup (cmd->state[NETBSD_ROOT_ARG].arg);
+      if (ctxt->state[NETBSD_ROOT_ARG].set)
+	netbsd_root = grub_strdup (ctxt->state[NETBSD_ROOT_ARG].arg);
     }
 
   return grub_errno;
diff --git a/loader/xnu.c b/loader/xnu.c
index 8f1d0c641..5c7bd50be 100644
--- a/loader/xnu.c
+++ b/loader/xnu.c
@@ -1368,15 +1368,15 @@ static const struct grub_arg_option xnu_splash_cmd_options[] =
   };
 
 static grub_err_t
-grub_cmd_xnu_splash (grub_extcmd_t cmd,
+grub_cmd_xnu_splash (grub_extcmd_context_t ctxt,
 		     int argc, char *args[])
 {
   grub_err_t err;
   if (argc != 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
 
-  if (cmd->state[XNU_SPLASH_CMD_ARGINDEX_MODE].set &&
-      grub_strcmp (cmd->state[XNU_SPLASH_CMD_ARGINDEX_MODE].arg,
+  if (ctxt->state[XNU_SPLASH_CMD_ARGINDEX_MODE].set &&
+      grub_strcmp (ctxt->state[XNU_SPLASH_CMD_ARGINDEX_MODE].arg,
 		   "stretch") == 0)
     grub_xnu_bitmap_mode = GRUB_XNU_BITMAP_STRETCH;
   else
diff --git a/script/argv.c b/script/argv.c
index 69322779d..f962556d8 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -52,8 +52,17 @@ grub_script_argv_free (struct grub_script_argv *argv)
       grub_free (argv->args);
     }
 
+  if (argv->scripts)
+    {
+      for (i = 0; i < argv->argc; i++)
+	grub_script_free (argv->scripts[i]);
+
+      grub_free (argv->scripts);
+    }
+
   argv->argc = 0;
   argv->args = 0;
+  argv->scripts = 0;
 }
 
 /* Prepare for next argc.  */
@@ -61,20 +70,33 @@ int
 grub_script_argv_next (struct grub_script_argv *argv)
 {
   char **p = argv->args;
+  struct grub_script **q = argv->scripts;
 
-  if (argv->args && argv->args[argv->argc - 1] == 0)
+  if (argv->args && argv->argc && argv->args[argv->argc - 1] == 0)
     return 0;
 
   p = grub_realloc (p, round_up_exp ((argv->argc + 2) * sizeof (char *)));
   if (! p)
     return 1;
 
+  q = grub_realloc (q, round_up_exp ((argv->argc + 2) * sizeof (struct grub_script *)));
+  if (! q)
+    {
+      grub_free (p);
+      return 1;
+    }
+
   argv->argc++;
   argv->args = p;
+  argv->scripts = q;
 
   if (argv->argc == 1)
-    argv->args[0] = 0;
+    {
+      argv->args[0] = 0;
+      argv->scripts[0] = 0;
+    }
   argv->args[argv->argc] = 0;
+  argv->scripts[argv->argc] = 0;
   return 0;
 }
 
@@ -100,6 +122,25 @@ grub_script_argv_append (struct grub_script_argv *argv, const char *s)
   return 0;
 }
 
+/* Append grub_script `s' as the last argument.  */
+int
+grub_script_argv_script_append (struct grub_script_argv *argv,
+				struct grub_script *script)
+{
+  struct grub_script *s;
+
+  s = grub_malloc (sizeof (*s));
+  if (! s)
+    return 1;
+
+  if (argv->scripts[argv->argc - 1])
+    grub_script_free (argv->scripts[argv->argc - 1]);
+
+  *s = *script;
+  argv->scripts[argv->argc - 1] = s;
+  return 0;
+}
+
 /* Split `s' and append words as multiple arguments.  */
 int
 grub_script_argv_split_append (struct grub_script_argv *argv, char *s)
diff --git a/script/execute.c b/script/execute.c
index 691b3c893..0ac42cf4a 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -25,6 +25,7 @@
 #include <grub/menu.h>
 #include <grub/lib/arg.h>
 #include <grub/normal.h>
+#include <grub/extcmd.h>
 
 /* Max digits for a char is 3 (0xFF is 255), similarly for an int it
    is sizeof (int) * 3, and one extra for a possible -ve sign.  */
@@ -51,7 +52,7 @@ grub_env_special (const char *name)
 static char **
 grub_script_env_get (const char *name, grub_script_arg_type_t type)
 {
-  struct grub_script_argv result = { 0, 0 };
+  struct grub_script_argv result = { 0, 0, 0 };
 
   if (grub_script_argv_next (&result))
     goto fail;
@@ -169,7 +170,7 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
   int i;
   char **values = 0;
   struct grub_script_arg *arg = 0;
-  struct grub_script_argv result = { 0, 0 };
+  struct grub_script_argv result = { 0, 0, 0 };
 
   for (; arglist && arglist->arg; arglist = arglist->next)
     {
@@ -196,6 +197,11 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
 	      break;
 
 	    case GRUB_SCRIPT_ARG_TYPE_BLOCK:
+	      if (grub_script_argv_append (&result, arg->str) ||
+		  grub_script_argv_script_append (&result, &arg->block))
+		goto fail;
+	      break;
+
 	    case GRUB_SCRIPT_ARG_TYPE_TEXT:
 	      if (grub_strlen (arg->str) &&
 		  grub_script_argv_append (&result, arg->str))
@@ -270,7 +276,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
   grub_script_function_t func = 0;
   char errnobuf[18];
   char *cmdname;
-  struct grub_script_argv argv = { 0, 0 };
+  struct grub_script_argv argv = { 0, 0, 0 };
 
   /* Lookup the command.  */
   if (grub_script_arglist_to_argv (cmdline->arglist, &argv))
@@ -314,7 +320,14 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 
   /* Execute the GRUB command or function.  */
   if (grubcmd)
-    ret = (grubcmd->func) (grubcmd, argv.argc - 1, argv.args + 1);
+    {
+      if ((grubcmd->flags & GRUB_COMMAND_FLAG_BLOCKS) &&
+	  (grubcmd->flags & GRUB_COMMAND_FLAG_EXTCMD))
+	ret = grub_extcmd_dispatcher (grubcmd, argv.argc - 1, argv.args + 1,
+				      argv.scripts + 1);
+      else
+	ret = (grubcmd->func) (grubcmd, argv.argc - 1, argv.args + 1);
+    }
   else
     ret = grub_script_function_call (func, argv.argc - 1, argv.args + 1);
 
@@ -374,7 +387,7 @@ grub_script_execute_cmdfor (struct grub_script_cmd *cmd)
 {
   unsigned i;
   grub_err_t result;
-  struct grub_script_argv argv = { 0, 0 };
+  struct grub_script_argv argv = { 0, 0, 0 };
   struct grub_script_cmdfor *cmdfor = (struct grub_script_cmdfor *) cmd;
 
   if (grub_script_arglist_to_argv (cmdfor->words, &argv))
@@ -416,7 +429,7 @@ grub_err_t
 grub_script_execute_menuentry (struct grub_script_cmd *cmd)
 {
   struct grub_script_cmd_menuentry *cmd_menuentry;
-  struct grub_script_argv argv = { 0, 0 };
+  struct grub_script_argv argv = { 0, 0, 0 };
 
   cmd_menuentry = (struct grub_script_cmd_menuentry *) cmd;
 
diff --git a/script/parser.y b/script/parser.y
index 653e2bc84..d774ca918 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -164,7 +164,7 @@ block: "{"
          if ((p = grub_script_lexer_record_stop (state, $<offset>2)))
 	   *grub_strrchr (p, '}') = '\0';
 
-         if (arg = grub_script_arg_add (state, 0, GRUB_SCRIPT_ARG_TYPE_BLOCK, p))
+         if ((arg = grub_script_arg_add (state, 0, GRUB_SCRIPT_ARG_TYPE_BLOCK, p)))
 	   {
 	     arg->block.cmd = $3;
 	     arg->block.mem = memory;
diff --git a/script/script.c b/script/script.c
index 9cee40dcb..9017a08e8 100644
--- a/script/script.c
+++ b/script/script.c
@@ -96,7 +96,10 @@ grub_script_free (struct grub_script *script)
 {
   if (!script)
     return;
-  grub_script_mem_free (script->mem);
+
+  if (script->mem)
+    grub_script_mem_free (script->mem);
+
   grub_free (script);
 }
 
@@ -119,6 +122,9 @@ grub_script_arg_add (struct grub_parser_param *state,
     return arg;
 
   argpart->type = type;
+  argpart->block.mem = 0;
+  argpart->block.cmd = 0;
+
   len = grub_strlen (str) + 1;
   argpart->str = grub_script_malloc (state, len);
   if (!argpart->str)
diff --git a/term/gfxterm.c b/term/gfxterm.c
index ecfe4ff3b..ffded5e6b 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -1091,11 +1091,10 @@ static const struct grub_arg_option background_image_cmd_options[] =
   };
 
 static grub_err_t
-grub_gfxterm_background_image_cmd (grub_extcmd_t cmd __attribute__ ((unused)),
-                                   int argc,
-                                   char **args)
+grub_gfxterm_background_image_cmd (grub_extcmd_context_t ctxt,
+                                   int argc, char **args)
 {
-  struct grub_arg_list *state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
 
   /* Check that we have video adapter active.  */
   if (grub_video_get_info(NULL) != GRUB_ERR_NONE)
diff --git a/term/serial.c b/term/serial.c
index 2347bb3ee..168e40bad 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -497,11 +497,11 @@ static struct grub_term_output grub_serial_term_output =
 
 
 static grub_err_t
-grub_cmd_serial (grub_extcmd_t cmd,
+grub_cmd_serial (grub_extcmd_context_t ctxt,
                  int argc __attribute__ ((unused)),
 		 char **args __attribute__ ((unused)))
 {
-  struct grub_arg_list *state = cmd->state;
+  struct grub_arg_list *state = ctxt->state;
   struct serial_port backup_settings = serial_settings;
   grub_err_t hwiniterr;
 
diff --git a/tests/lib/functional_test.c b/tests/lib/functional_test.c
index 8ff08cf8a..8be6c8e89 100644
--- a/tests/lib/functional_test.c
+++ b/tests/lib/functional_test.c
@@ -22,7 +22,7 @@
 #include <grub/test.h>
 
 static grub_err_t
-grub_functional_test (struct grub_extcmd *cmd __attribute__ ((unused)),
+grub_functional_test (grub_extcmd_context_t ctxt __attribute__ ((unused)),
 		      int argc __attribute__ ((unused)),
 		      char **args __attribute__ ((unused)))
 {

From ead4142900803233bc8cc34eac9fe98ab30833ea Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 10 Jun 2010 12:26:07 +0530
Subject: [PATCH 1109/1628] fix hello help msg

---
 hello/hello.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hello/hello.c b/hello/hello.c
index 16c3bb5ce..992c99f71 100644
--- a/hello/hello.c
+++ b/hello/hello.c
@@ -65,7 +65,7 @@ GRUB_MOD_INIT(hello)
 {
   cmd = grub_register_extcmd ("hello", grub_cmd_hello,
 			      GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_BLOCKS,
-			      0, N_("Say \"Hello World\"."), 0);
+			      N_("[BLOCK]"), N_("Say \"Hello World\"."), 0);
 }
 
 GRUB_MOD_FINI(hello)

From 9d0bd7407d9355ef73d63384959b7a89e76b33b1 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 10 Jun 2010 18:15:38 +0530
Subject: [PATCH 1110/1628] remove menuentry from GRUB script

---
 include/grub/script_sh.h | 22 ----------------------
 script/execute.c         | 25 -------------------------
 script/parser.y          | 26 ++------------------------
 script/script.c          | 24 ------------------------
 script/yylex.l           |  1 -
 util/grub-script-check.c |  6 ------
 6 files changed, 2 insertions(+), 102 deletions(-)

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index a17dcca70..88641300f 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -139,21 +139,6 @@ struct grub_script_cmdwhile
   int until;
 };
 
-/* A menu entry generate statement.  */
-struct grub_script_cmd_menuentry
-{
-  struct grub_script_cmd cmd;
-
-  /* The arguments for this menu entry.  */
-  struct grub_script_arglist *arglist;
-
-  /* The sourcecode the entry will be generated from.  */
-  const char *sourcecode;
-
-  /* Options.  XXX: Not used yet.  */
-  int options;
-};
-
 /* State of the lexer as passed to the lexer.  */
 struct grub_lexer_param
 {
@@ -263,12 +248,6 @@ grub_script_create_cmdwhile (struct grub_parser_param *state,
 			     struct grub_script_cmd *list,
 			     int is_an_until_loop);
 
-struct grub_script_cmd *
-grub_script_create_cmdmenu (struct grub_parser_param *state,
-			    struct grub_script_arglist *arglist,
-			    char *sourcecode,
-			    int options);
-
 struct grub_script_cmd *
 grub_script_append_cmd (struct grub_parser_param *state,
 			struct grub_script_cmd *list,
@@ -313,7 +292,6 @@ grub_err_t grub_script_execute_cmdlist (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdif (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdfor (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdwhile (struct grub_script_cmd *cmd);
-grub_err_t grub_script_execute_menuentry (struct grub_script_cmd *cmd);
 
 /* Execute any GRUB pre-parsed command or script.  */
 grub_err_t grub_script_execute (struct grub_script *script);
diff --git a/script/execute.c b/script/execute.c
index 0ac42cf4a..e7a809bd1 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -424,31 +424,6 @@ grub_script_execute_cmdwhile (struct grub_script_cmd *cmd)
   return result;
 }
 
-/* Execute the menu entry generate statement.  */
-grub_err_t
-grub_script_execute_menuentry (struct grub_script_cmd *cmd)
-{
-  struct grub_script_cmd_menuentry *cmd_menuentry;
-  struct grub_script_argv argv = { 0, 0, 0 };
-
-  cmd_menuentry = (struct grub_script_cmd_menuentry *) cmd;
-
-  if (cmd_menuentry->arglist)
-    {
-      if (grub_script_arglist_to_argv (cmd_menuentry->arglist, &argv))
-	return grub_errno;
-    }
-
-  grub_normal_add_menu_entry (argv.argc, (const char **) argv.args,
-			      cmd_menuentry->sourcecode);
-
-  grub_script_argv_free (&argv);
-
-  return grub_errno;
-}
-
-
-
 /* Execute any GRUB pre-parsed command or script.  */
 grub_err_t
 grub_script_execute (struct grub_script *script)
diff --git a/script/parser.y b/script/parser.y
index d774ca918..39cf675a1 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -73,7 +73,6 @@
 %token <arg> GRUB_PARSER_TOKEN_WHILE     "while"
 %token <arg> GRUB_PARSER_TOKEN_TIME      "time"
 %token <arg> GRUB_PARSER_TOKEN_FUNCTION  "function"
-%token <arg> GRUB_PARSER_TOKEN_MENUENTRY "menuentry"
 %token <arg> GRUB_PARSER_TOKEN_NAME      "name"
 %token <arg> GRUB_PARSER_TOKEN_WORD      "word"
 
@@ -81,7 +80,7 @@
 
 %type <cmd> script_init script
 %type <cmd> grubcmd ifclause ifcmd forcmd whilecmd untilcmd
-%type <cmd> command commands1 menuentry statement
+%type <cmd> command commands1 statement
 
 %pure-parser
 %lex-param   { struct grub_parser_param *state };
@@ -127,8 +126,7 @@ word: GRUB_PARSER_TOKEN_NAME { $$ = grub_script_add_arglist (state, 0, $1); }
 
 statement: command   { $$ = $1; }
          | function  { $$ = 0;  }
-         | menuentry { $$ = $1; }
-
+;
 argument : "case"      { $$ = grub_script_add_arglist (state, 0, $1); }
          | "do"        { $$ = grub_script_add_arglist (state, 0, $1); }
          | "done"      { $$ = grub_script_add_arglist (state, 0, $1); }
@@ -144,7 +142,6 @@ argument : "case"      { $$ = grub_script_add_arglist (state, 0, $1); }
          | "until"     { $$ = grub_script_add_arglist (state, 0, $1); }
          | "while"     { $$ = grub_script_add_arglist (state, 0, $1); }
          | "function"  { $$ = grub_script_add_arglist (state, 0, $1); }
-         | "menuentry" { $$ = grub_script_add_arglist (state, 0, $1); }
          | word { $$ = $1; }
 ;
 
@@ -263,25 +260,6 @@ function: "function" "name"
           }
 ;
 
-menuentry: "menuentry"
-           {
-             grub_script_lexer_ref (state->lexerstate);
-           }
-           arguments1
-           {
-             $<offset>$ = grub_script_lexer_record_start (state);
-           }
-           delimiters0 "{" commands1 delimiters1 "}"
-           {
-             char *def;
-             def = grub_script_lexer_record_stop (state, $<offset>4);
-	     *grub_strrchr(def, '}') = '\0';
-
-             grub_script_lexer_deref (state->lexerstate);
-             $$ = grub_script_create_cmdmenu (state, $3, def, 0);
-           }
-;
-
 ifcmd: "if"
 	{
 	  grub_script_lexer_ref (state->lexerstate);
diff --git a/script/script.c b/script/script.c
index 9017a08e8..847e4f077 100644
--- a/script/script.c
+++ b/script/script.c
@@ -273,30 +273,6 @@ grub_script_create_cmdwhile (struct grub_parser_param *state,
   return (struct grub_script_cmd *) cmd;
 }
 
-/* Create a command that adds a menu entry to the menu.  Title is an
-   argument that is parsed to generate a string that can be used as
-   the title.  The sourcecode for this entry is passed in SOURCECODE.
-   The options for this entry are passed in OPTIONS.  */
-struct grub_script_cmd *
-grub_script_create_cmdmenu (struct grub_parser_param *state,
-			    struct grub_script_arglist *arglist,
-			    char *sourcecode, int options)
-{
-  struct grub_script_cmd_menuentry *cmd;
-
-  cmd = grub_script_malloc (state, sizeof (*cmd));
-  if (!cmd)
-    return 0;
-    
-  cmd->cmd.exec = grub_script_execute_menuentry;
-  cmd->cmd.next = 0;
-  cmd->sourcecode = sourcecode;
-  cmd->arglist = arglist;
-  cmd->options = options;
-
-  return (struct grub_script_cmd *) cmd;
-}
-
 /* Create a chain of commands.  LAST contains the command that should
    be added at the end of LIST's list.  If LIST is zero, a new list
    will be created.  */
diff --git a/script/yylex.l b/script/yylex.l
index bfc53a6ff..a084ba1fc 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -169,7 +169,6 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
 "until"         { RECORD; return GRUB_PARSER_TOKEN_UNTIL;     }
 "while"         { RECORD; return GRUB_PARSER_TOKEN_WHILE;     }
 "function"      { RECORD; return GRUB_PARSER_TOKEN_FUNCTION;  }
-"menuentry"     { RECORD; return GRUB_PARSER_TOKEN_MENUENTRY; }
 
 {NAME}          { RECORD; return GRUB_PARSER_TOKEN_NAME; }
 {WORD}          {
diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index 8995520bb..2469d5b06 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -93,12 +93,6 @@ grub_script_execute_cmdwhile (struct grub_script_cmd *cmd __attribute__ ((unused
   return 0;
 }
 
-grub_err_t
-grub_script_execute_menuentry (struct grub_script_cmd *cmd __attribute__ ((unused)))
-{
-  return 0;
-}
-
 grub_err_t
 grub_script_execute (struct grub_script *script)
 {

From a992a71ed8df5188e9cdb3d2f5f502c2cc2e6417 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 10 Jun 2010 20:49:57 +0530
Subject: [PATCH 1111/1628] fix memory issues when used inside loops

---
 hello/hello.c            | 14 ++++----------
 include/grub/script_sh.h | 21 ++++++++++++++++++++-
 script/argv.c            | 14 ++++----------
 script/execute.c         |  2 +-
 script/parser.y          | 14 +++++++-------
 script/script.c          | 17 ++++++-----------
 6 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/hello/hello.c b/hello/hello.c
index 992c99f71..118966291 100644
--- a/hello/hello.c
+++ b/hello/hello.c
@@ -44,16 +44,9 @@ grub_cmd_hello (grub_extcmd_context_t ctxt,
 	return 1;
 
       if (script)
-	grub_script_free (script);
+	grub_script_put (script);
 
-      script = grub_malloc (sizeof (*script));
-      if (! script)
-	return 1;
-
-      script->cmd = ctxt->script_params[0]->cmd;
-      script->mem = ctxt->script_params[0]->mem;
-      ctxt->script_params[0]->cmd = 0;
-      ctxt->script_params[0]->mem = 0;
+      script = grub_script_get (ctxt->script_params[0]);
     }
 
   return 0;
@@ -71,7 +64,8 @@ GRUB_MOD_INIT(hello)
 GRUB_MOD_FINI(hello)
 {
   if (script)
-    grub_script_free (script);
+    grub_script_put (script);
 
+  script = 0;
   grub_unregister_extcmd (cmd);
 }
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index a17dcca70..2ada5d474 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -39,6 +39,7 @@ struct grub_script_cmd
 
 struct grub_script
 {
+  unsigned refcnt;
   struct grub_script_mem *mem;
   struct grub_script_cmd *cmd;
 };
@@ -61,7 +62,7 @@ struct grub_script_arg
   char *str;
 
   /* Parsed block argument.  */
-  struct grub_script block;
+  struct grub_script *block;
 
   /* Next argument part.  */
   struct grub_script_arg *next;
@@ -227,6 +228,8 @@ struct grub_parser_param
   struct grub_lexer_param *lexerstate;
 };
 
+void grub_script_mem_free (struct grub_script_mem *mem);
+
 void grub_script_argv_free    (struct grub_script_argv *argv);
 int grub_script_argv_next     (struct grub_script_argv *argv);
 int grub_script_argv_append   (struct grub_script_argv *argv, const char *s);
@@ -354,4 +357,20 @@ grub_err_t grub_script_function_call (grub_script_function_t func,
 char **
 grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *count);
 
+static inline struct grub_script *
+grub_script_get (struct grub_script *script)
+{
+  script->refcnt++;
+  return script;
+}
+
+static inline void
+grub_script_put (struct grub_script *script)
+{
+  if (script->refcnt == 0)
+    grub_script_free (script);
+  else
+    script->refcnt--;
+}
+
 #endif /* ! GRUB_NORMAL_PARSER_HEADER */
diff --git a/script/argv.c b/script/argv.c
index f962556d8..8dd563345 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -55,7 +55,8 @@ grub_script_argv_free (struct grub_script_argv *argv)
   if (argv->scripts)
     {
       for (i = 0; i < argv->argc; i++)
-	grub_script_free (argv->scripts[i]);
+	if (argv->scripts[i])
+	  grub_script_put (argv->scripts[i]);
 
       grub_free (argv->scripts);
     }
@@ -127,17 +128,10 @@ int
 grub_script_argv_script_append (struct grub_script_argv *argv,
 				struct grub_script *script)
 {
-  struct grub_script *s;
-
-  s = grub_malloc (sizeof (*s));
-  if (! s)
-    return 1;
-
   if (argv->scripts[argv->argc - 1])
-    grub_script_free (argv->scripts[argv->argc - 1]);
+    grub_script_put (argv->scripts[argv->argc - 1]);
 
-  *s = *script;
-  argv->scripts[argv->argc - 1] = s;
+  argv->scripts[argv->argc - 1] = grub_script_get (script);
   return 0;
 }
 
diff --git a/script/execute.c b/script/execute.c
index 0ac42cf4a..c6a6c2484 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -198,7 +198,7 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
 
 	    case GRUB_SCRIPT_ARG_TYPE_BLOCK:
 	      if (grub_script_argv_append (&result, arg->str) ||
-		  grub_script_argv_script_append (&result, &arg->block))
+		  grub_script_argv_script_append (&result, arg->block))
 		goto fail;
 	      break;
 
diff --git a/script/parser.y b/script/parser.y
index d774ca918..1202fef29 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -164,11 +164,9 @@ block: "{"
          if ((p = grub_script_lexer_record_stop (state, $<offset>2)))
 	   *grub_strrchr (p, '}') = '\0';
 
-         if ((arg = grub_script_arg_add (state, 0, GRUB_SCRIPT_ARG_TYPE_BLOCK, p)))
-	   {
-	     arg->block.cmd = $3;
-	     arg->block.mem = memory;
-	   }
+	 arg = grub_script_arg_add (state, 0, GRUB_SCRIPT_ARG_TYPE_BLOCK, p);
+	 if (! arg || ! (arg->block = grub_script_create ($3, memory)))
+	   grub_script_mem_free (memory);
 
          $$ = grub_script_add_arglist (state, 0, arg);
          grub_script_lexer_deref (state->lexerstate);
@@ -256,8 +254,10 @@ function: "function" "name"
             state->func_mem = grub_script_mem_record_stop (state,
                                                            state->func_mem);
             script = grub_script_create ($6, state->func_mem);
-            if (script)
-              grub_script_function_create ($2, script);
+            if (! script)
+	      grub_script_mem_free (state->func_mem);
+	    else
+	      grub_script_function_create ($2, script);
 
             grub_script_lexer_deref (state->lexerstate);
           }
diff --git a/script/script.c b/script/script.c
index 9017a08e8..b7cbdff1d 100644
--- a/script/script.c
+++ b/script/script.c
@@ -54,7 +54,7 @@ grub_script_malloc (struct grub_parser_param *state, grub_size_t size)
 }
 
 /* Free all memory described by MEM.  */
-static void
+void
 grub_script_mem_free (struct grub_script_mem *mem)
 {
   struct grub_script_mem *memfree;
@@ -122,8 +122,7 @@ grub_script_arg_add (struct grub_parser_param *state,
     return arg;
 
   argpart->type = type;
-  argpart->block.mem = 0;
-  argpart->block.cmd = 0;
+  argpart->block = 0;
 
   len = grub_strlen (str) + 1;
   argpart->str = grub_script_malloc (state, len);
@@ -341,16 +340,12 @@ grub_script_create (struct grub_script_cmd *cmd, struct grub_script_mem *mem)
   struct grub_script *parsed;
 
   parsed = grub_malloc (sizeof (*parsed));
-  if (!parsed)
-    {
-      grub_script_mem_free (mem);
-      grub_free (cmd);
-
-      return 0;
-    }
+  if (! parsed)
+    return 0;
 
   parsed->mem = mem;
   parsed->cmd = cmd;
+  parsed->refcnt = 0;
 
   return parsed;
 }
@@ -365,7 +360,7 @@ grub_script_parse (char *script, grub_reader_getline_t getline)
   struct grub_lexer_param *lexstate;
   struct grub_parser_param *parsestate;
 
-  parsed = grub_malloc (sizeof (*parsed));
+  parsed = grub_script_create (0, 0);
   if (!parsed)
     return 0;
 

From 627c30f7f1f6053b5a7e68cc568c921dca745ee6 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 10 Jun 2010 20:50:49 +0530
Subject: [PATCH 1112/1628] initial impl. for menuentry command

---
 commands/menuentry.c | 59 ++++++++++++++++++++++++++++++++++++++++++++
 conf/common.rmk      |  6 +++++
 2 files changed, 65 insertions(+)
 create mode 100644 commands/menuentry.c

diff --git a/commands/menuentry.c b/commands/menuentry.c
new file mode 100644
index 000000000..f27b246b1
--- /dev/null
+++ b/commands/menuentry.c
@@ -0,0 +1,59 @@
+/* menuentry.c - menuentry command */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/err.h>
+#include <grub/dl.h>
+#include <grub/extcmd.h>
+#include <grub/i18n.h>
+#include <grub/normal.h>
+
+static grub_err_t
+grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
+{
+  char *src;
+  grub_err_t r;
+
+  /* XXX Rewrite to make use of already parsed menu definition.  */
+  if (! argc || ! ctxt->script_params || ! ctxt->script_params[argc - 1])
+    return GRUB_ERR_BAD_ARGUMENT;
+
+  src = args[argc - 1];
+  args[argc - 1] = '\0';
+
+  r = 0; //grub_normal_add_menu_entry (argc - 1, (const char **) args, src);
+
+  args[argc - 1] = src;
+  return r;
+}
+
+static grub_extcmd_t cmd;
+
+GRUB_MOD_INIT(menuentry)
+{
+  cmd = grub_register_extcmd ("menuentry", grub_cmd_menuentry,
+			      GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_BLOCKS,
+			      N_("BLOCK"), N_("Define a menuentry."), 0);
+}
+
+GRUB_MOD_FINI(menuentry)
+{
+  grub_unregister_extcmd (cmd);
+}
diff --git a/conf/common.rmk b/conf/common.rmk
index 3674cae07..b9a973f76 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -846,6 +846,12 @@ boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
 boot_mod_CFLAGS = $(COMMON_CFLAGS)
 boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For menuentry.mod.
+pkglib_MODULES += menuentry.mod
+menuentry_mod_SOURCES = commands/menuentry.c
+menuentry_mod_CFLAGS = $(COMMON_CFLAGS)
+menuentry_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 bin_UTILITIES += grub-mkpasswd-pbkdf2
 grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/emu/misc.c kern/emu/mm.c kern/err.c
 grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap -DGRUB_MKPASSWD=1

From 9ced4652e054f624fb871240a443f03b5a438384 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 10 Jun 2010 21:26:03 +0530
Subject: [PATCH 1113/1628] uncomment menuentry addition

---
 commands/menuentry.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commands/menuentry.c b/commands/menuentry.c
index f27b246b1..95ec67bbd 100644
--- a/commands/menuentry.c
+++ b/commands/menuentry.c
@@ -38,7 +38,7 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
   src = args[argc - 1];
   args[argc - 1] = '\0';
 
-  r = 0; //grub_normal_add_menu_entry (argc - 1, (const char **) args, src);
+  r = grub_normal_add_menu_entry (argc - 1, (const char **) args, src);
 
   args[argc - 1] = src;
   return r;

From e2413da90146d0e4de09fc5bfbf44842f6922381 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 11 Jun 2010 13:59:07 +0530
Subject: [PATCH 1114/1628] multiline support for strings

---
 script/yylex.l | 114 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 91 insertions(+), 23 deletions(-)

diff --git a/script/yylex.l b/script/yylex.l
index 7d4ea9e4e..658bcfdf8 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -58,6 +58,7 @@
 #define YY_INPUT(buf,res,max) do { res = 0; } while (0)
 
 /* forward declarations */
+static int resplit (const char *input, yyscan_t yyscanner);
 static void  grub_lexer_yyfree (void *, yyscan_t yyscanner);
 static void* grub_lexer_yyalloc (yy_size_t, yyscan_t yyscanner);
 static void* grub_lexer_yyrealloc (void*, yy_size_t, yyscan_t yyscanner);
@@ -120,14 +121,19 @@ NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
 
 ESC             \\.
 VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|$\?|$\{\?\}
-DQSTR           \"([^\\\"]|{ESC})*\"
-SQSTR           \'[^\']*\'
+DQSTR           \"([^\"]|{ESC})*\"
+SQSTR           \'([^\'])*\'
 WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
 
+DQSTR2          {WORD}?\"({ESC}|[^\"])*\n
+SQSTR2          {WORD}?\'({ESC}|[^\'])*\n
+
 %x              SPLIT
 %x              DQUOTE
 %x              SQUOTE
 %x              VAR
+%x              DQMULTILINE
+%x              SQMULTILINE
 
 %%
 
@@ -173,26 +179,55 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
 {NAME}          { RECORD; return GRUB_PARSER_TOKEN_NAME; }
 {WORD}          {
                   RECORD;
-                  /* resplit yytext */
-		  grub_dprintf ("lexer", "word: [%s]\n", yytext);
-                  yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner);
-                  if (yy_scan_string (yytext, yyscanner))
-                    {
-                      yyextra->lexerstate->merge_start = 1;
-                      yy_push_state (SPLIT, yyscanner);
-                    }
-                  else
-                    {
-                      grub_script_yyerror (yyextra, 0);
-                      yypop_buffer_state (yyscanner);
-                      return GRUB_PARSER_TOKEN_WORD;
-                    }
+		  yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner);
+		  if (resplit (yytext, yyscanner))
+		    {
+		      yypop_buffer_state (yyscanner);
+		      return GRUB_PARSER_TOKEN_WORD;
+		    }
+                }
+{DQSTR2}        {
+		  yy_push_state (DQMULTILINE, yyscanner);
+		  grub_script_lexer_ref (yyextra->lexerstate);
+		  yymore ();
+                }
+<DQMULTILINE>{
+  \"{WORD}?     {
+                  RECORD;
+		  grub_script_lexer_deref (yyextra->lexerstate);
+		  yy_pop_state (yyscanner);
+		  yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner);
+		  if (resplit (yytext, yyscanner))
+		    {
+		      yypop_buffer_state (yyscanner);
+		      return GRUB_PARSER_TOKEN_WORD;
+		    }
+                }
+  {ESC}         { yymore(); }
+  [^\"]         { yymore(); }
+}
+
+{SQSTR2}        {
+		  yy_push_state (SQMULTILINE, yyscanner);
+		  grub_script_lexer_ref (yyextra->lexerstate);
+		  yymore ();
                 }
 
-.|\n            {
-                  grub_script_yyerror (yyextra, "unrecognized token");
-                  return GRUB_PARSER_TOKEN_BAD;
+<SQMULTILINE>{
+  \'{WORD}?     {
+                  RECORD;
+		  grub_script_lexer_deref (yyextra->lexerstate);
+		  yy_pop_state (yyscanner);
+		  yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner);
+		  if (resplit (yytext, yyscanner))
+		    {
+		      yypop_buffer_state (yyscanner);
+		      return GRUB_PARSER_TOKEN_WORD;
+		    }
                 }
+  {ESC}         { yymore(); }
+  [^\']         { yymore(); }
+}
 
  /* Split word into multiple args */
 
@@ -270,6 +305,7 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
   (.|\n)        { COPY (yytext, yyleng); }
 }
 
+.               { /* ignore */ }
 <<EOF>>         {
                   yypop_buffer_state (yyscanner);
                   if (! grub_script_lexer_yywrap (yyextra))
@@ -278,9 +314,29 @@ WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
                       return GRUB_PARSER_TOKEN_EOF;
                     }
                 }
-
 %%
 
+#if 0
+int
+yywrap (yyscan_t yyscanner)
+{
+  char *line = 0;
+  struct grub_lexer_param *lexerstate = yyget_extra(yyscanner)->lexerstate;
+
+  grub_printf ("yywrap\n");
+  if (lexerstate->getline)
+    {
+      lexerstate->getline (&line, 1);
+      if (! line)
+	return 1;
+
+      yy_scan_string (line, yyscanner);
+      return 0;
+    }
+  return 1;
+}
+#endif
+
 static void
 grub_lexer_yyfree (void *ptr, yyscan_t yyscanner __attribute__ ((unused)))
 {
@@ -300,8 +356,6 @@ grub_lexer_yyrealloc (void *ptr, yy_size_t size,
   return grub_realloc (ptr, size);
 }
 
-#define MAX(a,b) ((a) < (b) ? (b) : (a))
-
 static void copy_string (struct grub_parser_param *parser, const char *str, unsigned hint)
 {
   int size;
@@ -311,7 +365,7 @@ static void copy_string (struct grub_parser_param *parser, const char *str, unsi
   len = hint ? hint : grub_strlen (str);
   if (parser->lexerstate->used + len >= parser->lexerstate->size)
     {
-      size = MAX (len, parser->lexerstate->size) * 2;
+      size = grub_max (len, parser->lexerstate->size) * 2;
       ptr = grub_realloc (parser->lexerstate->text, size);
       if (!ptr)
         {
@@ -325,3 +379,17 @@ static void copy_string (struct grub_parser_param *parser, const char *str, unsi
   grub_strcpy (parser->lexerstate->text + parser->lexerstate->used - 1, str);
   parser->lexerstate->used += len;
 }
+
+static int
+resplit (const char *text, yyscan_t yyscanner)
+{
+  /* resplit text */
+  if (yy_scan_string (text, yyscanner))
+    {
+      yyget_extra (yyscanner)->lexerstate->merge_start = 1;
+      yy_push_state (SPLIT, yyscanner);
+      return 0;
+    }
+  grub_script_yyerror (yyget_extra (yyscanner), 0);
+  return 1;
+}

From 56a0d956d196be7828d0845aa225a0514c395e37 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 11 Jun 2010 22:12:16 +0100
Subject: [PATCH 1115/1628] * Makefile.in (install-local): Include
 $(srcdir)/docs/man/$$dest.h2m when generating manual pages. *
 docs/man/grub-bin2h.h2m: New file. * docs/man/grub-editenv.h2m: New file. *
 docs/man/grub-fstest.h2m: New file. * docs/man/grub-install.h2m: New file. *
 docs/man/grub-macho2img.h2m: New file. * docs/man/grub-mkconfig.h2m: New
 file. * docs/man/grub-mkdevicemap.h2m: New file. * docs/man/grub-mkfont.h2m:
 New file. * docs/man/grub-mkimage.h2m: New file. *
 docs/man/grub-mkpasswd-pbkdf2.h2m: New file. * docs/man/grub-mkrelpath.h2m:
 New file. * docs/man/grub-mkrescue.h2m: New file. *
 docs/man/grub-ofpathname.h2m: New file. * docs/man/grub-pe2elf.h2m: New file.
 * docs/man/grub-probe.h2m: New file. * docs/man/grub-reboot.h2m: New file. *
 docs/man/grub-script-check.h2m: New file. * docs/man/grub-set-default.h2m:
 New file. * docs/man/grub-setup.h2m: New file.

---
 ChangeLog                         | 24 ++++++++++++++++++++++++
 Makefile.in                       |  8 ++++----
 docs/man/grub-bin2h.h2m           |  2 ++
 docs/man/grub-editenv.h2m         |  2 ++
 docs/man/grub-fstest.h2m          |  2 ++
 docs/man/grub-install.h2m         |  2 ++
 docs/man/grub-macho2img.h2m       |  2 ++
 docs/man/grub-mkconfig.h2m        |  2 ++
 docs/man/grub-mkdevicemap.h2m     |  2 ++
 docs/man/grub-mkfont.h2m          |  2 ++
 docs/man/grub-mkimage.h2m         |  2 ++
 docs/man/grub-mkpasswd-pbkdf2.h2m |  2 ++
 docs/man/grub-mkrelpath.h2m       |  2 ++
 docs/man/grub-mkrescue.h2m        |  2 ++
 docs/man/grub-ofpathname.h2m      |  2 ++
 docs/man/grub-pe2elf.h2m          |  2 ++
 docs/man/grub-probe.h2m           |  2 ++
 docs/man/grub-reboot.h2m          |  2 ++
 docs/man/grub-script-check.h2m    |  2 ++
 docs/man/grub-set-default.h2m     |  2 ++
 docs/man/grub-setup.h2m           |  2 ++
 21 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 docs/man/grub-bin2h.h2m
 create mode 100644 docs/man/grub-editenv.h2m
 create mode 100644 docs/man/grub-fstest.h2m
 create mode 100644 docs/man/grub-install.h2m
 create mode 100644 docs/man/grub-macho2img.h2m
 create mode 100644 docs/man/grub-mkconfig.h2m
 create mode 100644 docs/man/grub-mkdevicemap.h2m
 create mode 100644 docs/man/grub-mkfont.h2m
 create mode 100644 docs/man/grub-mkimage.h2m
 create mode 100644 docs/man/grub-mkpasswd-pbkdf2.h2m
 create mode 100644 docs/man/grub-mkrelpath.h2m
 create mode 100644 docs/man/grub-mkrescue.h2m
 create mode 100644 docs/man/grub-ofpathname.h2m
 create mode 100644 docs/man/grub-pe2elf.h2m
 create mode 100644 docs/man/grub-probe.h2m
 create mode 100644 docs/man/grub-reboot.h2m
 create mode 100644 docs/man/grub-script-check.h2m
 create mode 100644 docs/man/grub-set-default.h2m
 create mode 100644 docs/man/grub-setup.h2m

diff --git a/ChangeLog b/ChangeLog
index c4a6246ee..43cf36b32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2010-06-11  Colin Watson  <cjwatson@ubuntu.com>
+
+	* Makefile.in (install-local): Include $(srcdir)/docs/man/$$dest.h2m
+	when generating manual pages.
+	* docs/man/grub-bin2h.h2m: New file.
+	* docs/man/grub-editenv.h2m: New file.
+	* docs/man/grub-fstest.h2m: New file.
+	* docs/man/grub-install.h2m: New file.
+	* docs/man/grub-macho2img.h2m: New file.
+	* docs/man/grub-mkconfig.h2m: New file.
+	* docs/man/grub-mkdevicemap.h2m: New file.
+	* docs/man/grub-mkfont.h2m: New file.
+	* docs/man/grub-mkimage.h2m: New file.
+	* docs/man/grub-mkpasswd-pbkdf2.h2m: New file.
+	* docs/man/grub-mkrelpath.h2m: New file.
+	* docs/man/grub-mkrescue.h2m: New file.
+	* docs/man/grub-ofpathname.h2m: New file.
+	* docs/man/grub-pe2elf.h2m: New file.
+	* docs/man/grub-probe.h2m: New file.
+	* docs/man/grub-reboot.h2m: New file.
+	* docs/man/grub-script-check.h2m: New file.
+	* docs/man/grub-set-default.h2m: New file.
+	* docs/man/grub-setup.h2m: New file.
+
 2010-06-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Use FOR_* macros instead of *_iterate whenever possible.
diff --git a/Makefile.in b/Makefile.in
index 75388e3c8..afe4beb6e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -323,26 +323,26 @@ install-local: all
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
-	  $(HELP2MAN) --section=1 -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
+	  $(HELP2MAN) --section=1 -i $(srcdir)/docs/man/$$dest.h2m -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
 	done
 	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8
 	@list='$(sbin_UTILITIES)'; for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
-	  $(HELP2MAN) --section=8 -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
+	  $(HELP2MAN) --section=8 -i $(srcdir)/docs/man/$$dest.h2m -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
 	done
 	@list='$(bin_SCRIPTS)'; for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
-	  $(HELP2MAN) --section=1 -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
+	  $(HELP2MAN) --section=1 -i $(srcdir)/docs/man/$$dest.h2m -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
 	done
 	@list='$(sbin_SCRIPTS)'; for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
-	  $(HELP2MAN) --section=8 -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
+	  $(HELP2MAN) --section=8 -i $(srcdir)/docs/man/$$dest.h2m -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
 	done
 	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/grub.d
 	@list='$(grub-mkconfig_SCRIPTS)'; for file in $$list; do \
diff --git a/docs/man/grub-bin2h.h2m b/docs/man/grub-bin2h.h2m
new file mode 100644
index 000000000..ef463f3d1
--- /dev/null
+++ b/docs/man/grub-bin2h.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-bin2h \- convert a binary file to a C header
diff --git a/docs/man/grub-editenv.h2m b/docs/man/grub-editenv.h2m
new file mode 100644
index 000000000..efbd79070
--- /dev/null
+++ b/docs/man/grub-editenv.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-editenv \- edit GRUB environment block
diff --git a/docs/man/grub-fstest.h2m b/docs/man/grub-fstest.h2m
new file mode 100644
index 000000000..be39429b5
--- /dev/null
+++ b/docs/man/grub-fstest.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-fstest \- debug tool for GRUB filesystem drivers
diff --git a/docs/man/grub-install.h2m b/docs/man/grub-install.h2m
new file mode 100644
index 000000000..65252155c
--- /dev/null
+++ b/docs/man/grub-install.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-install \- install GRUB to a device
diff --git a/docs/man/grub-macho2img.h2m b/docs/man/grub-macho2img.h2m
new file mode 100644
index 000000000..412bf926a
--- /dev/null
+++ b/docs/man/grub-macho2img.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-macho2img \- convert Mach-O to raw image
diff --git a/docs/man/grub-mkconfig.h2m b/docs/man/grub-mkconfig.h2m
new file mode 100644
index 000000000..b0d33ec61
--- /dev/null
+++ b/docs/man/grub-mkconfig.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-mkconfig \- generate a GRUB configuration file
diff --git a/docs/man/grub-mkdevicemap.h2m b/docs/man/grub-mkdevicemap.h2m
new file mode 100644
index 000000000..8ab34ac86
--- /dev/null
+++ b/docs/man/grub-mkdevicemap.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-mkdevicemap \- generate a GRUB device map file automatically
diff --git a/docs/man/grub-mkfont.h2m b/docs/man/grub-mkfont.h2m
new file mode 100644
index 000000000..d8580186f
--- /dev/null
+++ b/docs/man/grub-mkfont.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-mkfont \- make GRUB font files
diff --git a/docs/man/grub-mkimage.h2m b/docs/man/grub-mkimage.h2m
new file mode 100644
index 000000000..71f270940
--- /dev/null
+++ b/docs/man/grub-mkimage.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-mkimage \- make a bootable image of GRUB
diff --git a/docs/man/grub-mkpasswd-pbkdf2.h2m b/docs/man/grub-mkpasswd-pbkdf2.h2m
new file mode 100644
index 000000000..5b2b2ef7f
--- /dev/null
+++ b/docs/man/grub-mkpasswd-pbkdf2.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-mkpasswd-pbkdf2 \- generate hashed password for GRUB
diff --git a/docs/man/grub-mkrelpath.h2m b/docs/man/grub-mkrelpath.h2m
new file mode 100644
index 000000000..ccc0880fa
--- /dev/null
+++ b/docs/man/grub-mkrelpath.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-mkrelpath \- make a system path relative to its root
diff --git a/docs/man/grub-mkrescue.h2m b/docs/man/grub-mkrescue.h2m
new file mode 100644
index 000000000..5e92e0d99
--- /dev/null
+++ b/docs/man/grub-mkrescue.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-mkrescue \- make a GRUB rescue image
diff --git a/docs/man/grub-ofpathname.h2m b/docs/man/grub-ofpathname.h2m
new file mode 100644
index 000000000..f07158cb3
--- /dev/null
+++ b/docs/man/grub-ofpathname.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-ofpathname \- find OpenBOOT path for a device
diff --git a/docs/man/grub-pe2elf.h2m b/docs/man/grub-pe2elf.h2m
new file mode 100644
index 000000000..3fdb88b43
--- /dev/null
+++ b/docs/man/grub-pe2elf.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-pe2elf \- convert PE image to ELF
diff --git a/docs/man/grub-probe.h2m b/docs/man/grub-probe.h2m
new file mode 100644
index 000000000..817ba8ef6
--- /dev/null
+++ b/docs/man/grub-probe.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-probe \- probe device information for GRUB
diff --git a/docs/man/grub-reboot.h2m b/docs/man/grub-reboot.h2m
new file mode 100644
index 000000000..957e4b797
--- /dev/null
+++ b/docs/man/grub-reboot.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-reboot \- set the default boot entry for GRUB, for the next boot only
diff --git a/docs/man/grub-script-check.h2m b/docs/man/grub-script-check.h2m
new file mode 100644
index 000000000..39c0a3ef6
--- /dev/null
+++ b/docs/man/grub-script-check.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-script-check \- check grub.cfg for syntax errors
diff --git a/docs/man/grub-set-default.h2m b/docs/man/grub-set-default.h2m
new file mode 100644
index 000000000..3ac13d7ed
--- /dev/null
+++ b/docs/man/grub-set-default.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-set-default \- set the default boot entry for GRUB
diff --git a/docs/man/grub-setup.h2m b/docs/man/grub-setup.h2m
new file mode 100644
index 000000000..e70e465a4
--- /dev/null
+++ b/docs/man/grub-setup.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-setup \- set up a device to boot using GRUB

From 283af07aff47fdc234e80da3fa4c5891f0ab9289 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 11 Jun 2010 22:15:35 +0100
Subject: [PATCH 1116/1628] * include/grub/efi/uga_draw.h
 (GRUB_EFI_UGA_GLT_MAX): Rename to ... (GRUB_EFI_UGA_BLT_MAX): ... this (typo
 fix).

---
 ChangeLog                   | 5 +++++
 include/grub/efi/uga_draw.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 43cf36b32..ab9415191 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-11  Colin Watson  <cjwatson@ubuntu.com>
+
+	* include/grub/efi/uga_draw.h (GRUB_EFI_UGA_GLT_MAX): Rename to ...
+	(GRUB_EFI_UGA_BLT_MAX): ... this (typo fix).
+
 2010-06-11  Colin Watson  <cjwatson@ubuntu.com>
 
 	* Makefile.in (install-local): Include $(srcdir)/docs/man/$$dest.h2m
diff --git a/include/grub/efi/uga_draw.h b/include/grub/efi/uga_draw.h
index 93504307c..a31f2672e 100644
--- a/include/grub/efi/uga_draw.h
+++ b/include/grub/efi/uga_draw.h
@@ -32,7 +32,7 @@ enum grub_efi_uga_blt_operation
   GRUB_EFI_UGA_VIDEO_TO_BLT,
   GRUB_EFI_UGA_BLT_TO_VIDEO,
   GRUB_EFI_UGA_VIDEO_TO_VIDEO,
-  GRUB_EFI_UGA_GLT_MAX
+  GRUB_EFI_UGA_BLT_MAX
 };
 
 struct grub_efi_uga_pixel

From b06f83e3babd32fe94c9a6ca54153cd6f0e51ebb Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 12 Jun 2010 11:06:02 +0530
Subject: [PATCH 1117/1628] a better fix

---
 include/grub/script_sh.h |   8 ++-
 script/lexer.c           | 126 ++++++++++++++++++---------------------
 script/yylex.l           | 118 ++++++++++++++----------------------
 3 files changed, 110 insertions(+), 142 deletions(-)

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index b55b6a806..447b3a375 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -195,6 +195,12 @@ struct grub_lexer_param
   /* Type of text.  */
   grub_script_arg_type_t type;
 
+  /* Flag to indicate resplit in progres.  */
+  unsigned resplit;
+
+  /* Text that is unput.  */
+  char *prefix;
+
   /* Flex scanner.  */
   void *yyscanner;
 
@@ -284,7 +290,7 @@ void grub_script_lexer_ref (struct grub_lexer_param *);
 void grub_script_lexer_deref (struct grub_lexer_param *);
 void grub_script_lexer_record_start (struct grub_parser_param *);
 char *grub_script_lexer_record_stop (struct grub_parser_param *);
-int  grub_script_lexer_yywrap (struct grub_parser_param *);
+int  grub_script_lexer_yywrap (struct grub_parser_param *, const char *input);
 void grub_script_lexer_record (struct grub_parser_param *, char *);
 
 /* Functions to track allocated memory.  */
diff --git a/script/lexer.c b/script/lexer.c
index 42a570348..63b74e2e0 100644
--- a/script/lexer.c
+++ b/script/lexer.c
@@ -98,8 +98,6 @@ grub_script_lexer_record_stop (struct grub_parser_param *parser)
   return result;
 }
 
-#define MAX(a,b) ((a) < (b) ? (b) : (a))
-
 /* Record STR if input recording is enabled.  */
 void
 grub_script_lexer_record (struct grub_parser_param *parser, char *str)
@@ -115,7 +113,7 @@ grub_script_lexer_record (struct grub_parser_param *parser, char *str)
   if (lexer->recordpos + len + 1 > lexer->recordlen)
     {
       old = lexer->recording;
-      lexer->recordlen = MAX (len, lexer->recordlen) * 2;
+      lexer->recordlen = grub_max (len, lexer->recordlen) * 2;
       lexer->recording = grub_realloc (lexer->recording, lexer->recordlen);
       if (!lexer->recording)
 	{
@@ -131,76 +129,85 @@ grub_script_lexer_record (struct grub_parser_param *parser, char *str)
   lexer->recordpos += len;
 }
 
-/* Append '\n' to SRC, before '\0'  */
-static char *
-append_newline (const char *src)
-{
-  char *line;
-  grub_size_t len;
-
-  len = grub_strlen (src);
-  line = grub_malloc (len + 2);
-  if (!line)
-    return 0;
-
-  grub_strcpy (line, src);
-
-  line[len] = '\n';
-  line[len + 1] = '\0';
-  return line;
-}
-
 /* Read next line of input if necessary, and set yyscanner buffers.  */
 int
-grub_script_lexer_yywrap (struct grub_parser_param *parserstate)
+grub_script_lexer_yywrap (struct grub_parser_param *parserstate,
+			  const char *input)
 {
   int len;
-  char *line;
-  char *line2;
+  char *p = 0;
+  char *line = 0;
   YY_BUFFER_STATE buffer;
   struct grub_lexer_param *lexerstate = parserstate->lexerstate;
 
-  if (!lexerstate->refs)
-    return 0;
+  if (! lexerstate->refs && ! lexerstate->prefix && ! input)
+    return 1;
 
-  if (!lexerstate->getline)
+  if (! lexerstate->getline && ! input)
     {
       grub_script_yyerror (parserstate, "unexpected end of file");
-      return 0;
+      return 1;
     }
 
   line = 0;
-  buffer = 0;
-  lexerstate->getline (&line, 1);
-  if (!line)
+  if (! input)
+    lexerstate->getline (&line, 1);
+  else
+    line = grub_strdup (input);
+  if (! line)
     {
-      grub_script_yyerror (parserstate, 0); /* XXX this could be for ^C case? */
-      return 0;
+      grub_script_yyerror (parserstate, 0);
+      return 1;
     }
 
   len = grub_strlen (line);
-  if (line[len - 1] == '\n')
+  if (lexerstate->prefix)
     {
-      buffer = yy_scan_string (line, lexerstate->yyscanner);
-    }
-  else
-    {
-      line2 = append_newline (line);
-      if (line2)
+      int plen = grub_strlen (lexerstate->prefix);
+
+      p = grub_malloc (len + plen + 2);
+      if (! p)
 	{
-	  buffer = yy_scan_string (line2, lexerstate->yyscanner);
-	  grub_free (line2);
+	  grub_free (line);
+	  return 1;
 	}
+      grub_strcpy (p, lexerstate->prefix);
+      lexerstate->prefix = 0;
+
+      if (! line[0])
+	{
+	  line = "\n";
+	  len = 1;
+	}
+      grub_strcpy (p + plen, line);
+
+      line = p;
+      len = len + plen;
     }
 
+  if (line[len - 1] != '\n')
+    {
+      char *p;
+      p = grub_realloc (line, len + 2);
+      if (! p)
+	{
+	  grub_free (line);
+	  return 1;
+	}
+      line = p;
+      line[len++] = '\n';
+      line[len] = '\0';
+    }
+
+  buffer = yy_scan_string (line, lexerstate->yyscanner);
   grub_free (line);
-  if (!buffer)
+
+  if (! buffer)
     {
       grub_script_yyerror (parserstate, 0);
-      return 0;
+      return 1;
     }
-
-  return 1;
+  return 0;
 }
 
 struct grub_lexer_param *
@@ -231,35 +238,18 @@ grub_script_lexer_init (struct grub_parser_param *parser, char *script,
       grub_free (lexerstate);
       return 0;
     }
+  yyset_extra (parser, lexerstate->yyscanner);
+  parser->lexerstate = lexerstate;
 
-  buffer = 0;
-  script = script ? : "\n";
-  len = grub_strlen (script);
-
-  if (script[len - 1] == '\n')
-    {
-      buffer = yy_scan_string (script, lexerstate->yyscanner);
-    }
-  else
-    {
-      script2 = append_newline (script);
-      if (script2)
-	{
-	  buffer = yy_scan_string (script2, lexerstate->yyscanner);
-	  grub_free (script2);
-	}
-    }
-
-  if (!buffer)
+  if (grub_script_lexer_yywrap (parser, script ?: "\n"))
     {
+      parser->lexerstate = 0;
       yylex_destroy (lexerstate->yyscanner);
       grub_free (lexerstate->yyscanner);
-
       grub_free (lexerstate->text);
       grub_free (lexerstate);
       return 0;
     }
-  yyset_extra (parser, lexerstate->yyscanner);
 
   return lexerstate;
 }
diff --git a/script/yylex.l b/script/yylex.l
index 658bcfdf8..025810da3 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -58,7 +58,9 @@
 #define YY_INPUT(buf,res,max) do { res = 0; } while (0)
 
 /* forward declarations */
-static int resplit (const char *input, yyscan_t yyscanner);
+static int grub_lexer_unput (const char *input, yyscan_t yyscanner);
+static int grub_lexer_resplit (const char *input, yyscan_t yyscanner);
+
 static void  grub_lexer_yyfree (void *, yyscan_t yyscanner);
 static void* grub_lexer_yyalloc (yy_size_t, yyscan_t yyscanner);
 static void* grub_lexer_yyrealloc (void*, yy_size_t, yyscan_t yyscanner);
@@ -100,10 +102,9 @@ typedef size_t yy_size_t;
 %option never-interactive
 
 %option noyyfree noyyalloc noyyrealloc
-%option nounistd nostdinit nodefault noyylineno noyywrap
+%option nounistd nostdinit nodefault noyylineno
 
 /* Reduce lexer size, by not defining these.  */
-%option noyy_top_state
 %option noinput nounput
 %option noyyget_in noyyset_in
 %option noyyget_out noyyset_out
@@ -120,20 +121,19 @@ DIGITS          [[:digit:]]+
 NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
 
 ESC             \\.
+SQCHR           [^\']
+DQCHR           {ESC}|[^\"]
+DQSTR           \"{DQCHR}*\"
+SQSTR           \'{SQCHR}*\'
 VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|$\?|$\{\?\}
-DQSTR           \"([^\"]|{ESC})*\"
-SQSTR           \'([^\'])*\'
 WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
 
-DQSTR2          {WORD}?\"({ESC}|[^\"])*\n
-SQSTR2          {WORD}?\'({ESC}|[^\'])*\n
+MULTILINE       {WORD}?((\"{DQCHR}*)|(\'{SQCHR}*))
 
 %x              SPLIT
 %x              DQUOTE
 %x              SQUOTE
 %x              VAR
-%x              DQMULTILINE
-%x              SQMULTILINE
 
 %%
 
@@ -179,55 +179,22 @@ SQSTR2          {WORD}?\'({ESC}|[^\'])*\n
 {NAME}          { RECORD; return GRUB_PARSER_TOKEN_NAME; }
 {WORD}          {
                   RECORD;
+		  yyextra->lexerstate->resplit = 1;
 		  yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner);
-		  if (resplit (yytext, yyscanner))
+		  if (grub_lexer_resplit (yytext, yyscanner))
 		    {
 		      yypop_buffer_state (yyscanner);
 		      return GRUB_PARSER_TOKEN_WORD;
 		    }
                 }
-{DQSTR2}        {
-		  yy_push_state (DQMULTILINE, yyscanner);
-		  grub_script_lexer_ref (yyextra->lexerstate);
-		  yymore ();
+{MULTILINE}     {
+                  if (grub_lexer_unput (yytext, yyscanner))
+		    return GRUB_PARSER_TOKEN_BAD;
+		}
+.               {
+                  grub_script_yyerror (yyextra, yytext);
+		  return GRUB_PARSER_TOKEN_BAD;
                 }
-<DQMULTILINE>{
-  \"{WORD}?     {
-                  RECORD;
-		  grub_script_lexer_deref (yyextra->lexerstate);
-		  yy_pop_state (yyscanner);
-		  yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner);
-		  if (resplit (yytext, yyscanner))
-		    {
-		      yypop_buffer_state (yyscanner);
-		      return GRUB_PARSER_TOKEN_WORD;
-		    }
-                }
-  {ESC}         { yymore(); }
-  [^\"]         { yymore(); }
-}
-
-{SQSTR2}        {
-		  yy_push_state (SQMULTILINE, yyscanner);
-		  grub_script_lexer_ref (yyextra->lexerstate);
-		  yymore ();
-                }
-
-<SQMULTILINE>{
-  \'{WORD}?     {
-                  RECORD;
-		  grub_script_lexer_deref (yyextra->lexerstate);
-		  yy_pop_state (yyscanner);
-		  yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner);
-		  if (resplit (yytext, yyscanner))
-		    {
-		      yypop_buffer_state (yyscanner);
-		      return GRUB_PARSER_TOKEN_WORD;
-		    }
-                }
-  {ESC}         { yymore(); }
-  [^\']         { yymore(); }
-}
 
  /* Split word into multiple args */
 
@@ -250,6 +217,7 @@ SQSTR2          {WORD}?\'({ESC}|[^\'])*\n
   <<EOF>>       {
                   yy_pop_state (yyscanner);
                   yypop_buffer_state (yyscanner);
+		  yyextra->lexerstate->resplit = 0;
                   yyextra->lexerstate->merge_end = 1;
                   ARG (GRUB_SCRIPT_ARG_TYPE_TEXT);
                 }
@@ -305,37 +273,21 @@ SQSTR2          {WORD}?\'({ESC}|[^\'])*\n
   (.|\n)        { COPY (yytext, yyleng); }
 }
 
-.               { /* ignore */ }
 <<EOF>>         {
                   yypop_buffer_state (yyscanner);
-                  if (! grub_script_lexer_yywrap (yyextra))
-                    {
-                      yyextra->lexerstate->eof = 1;
-                      return GRUB_PARSER_TOKEN_EOF;
-                    }
+		  yyextra->lexerstate->eof = 1;
+		  return GRUB_PARSER_TOKEN_EOF;
                 }
 %%
 
-#if 0
 int
 yywrap (yyscan_t yyscanner)
 {
-  char *line = 0;
-  struct grub_lexer_param *lexerstate = yyget_extra(yyscanner)->lexerstate;
+  if (yyget_extra (yyscanner)->lexerstate->resplit)
+    return 1;
 
-  grub_printf ("yywrap\n");
-  if (lexerstate->getline)
-    {
-      lexerstate->getline (&line, 1);
-      if (! line)
-	return 1;
-
-      yy_scan_string (line, yyscanner);
-      return 0;
-    }
-  return 1;
+  return grub_script_lexer_yywrap (yyget_extra (yyscanner), 0);
 }
-#endif
 
 static void
 grub_lexer_yyfree (void *ptr, yyscan_t yyscanner __attribute__ ((unused)))
@@ -381,7 +333,7 @@ static void copy_string (struct grub_parser_param *parser, const char *str, unsi
 }
 
 static int
-resplit (const char *text, yyscan_t yyscanner)
+grub_lexer_resplit (const char *text, yyscan_t yyscanner)
 {
   /* resplit text */
   if (yy_scan_string (text, yyscanner))
@@ -393,3 +345,23 @@ resplit (const char *text, yyscan_t yyscanner)
   grub_script_yyerror (yyget_extra (yyscanner), 0);
   return 1;
 }
+
+static int
+grub_lexer_unput (const char *text, yyscan_t yyscanner)
+{
+  struct grub_lexer_param *lexerstate = yyget_extra (yyscanner)->lexerstate;
+
+  if (lexerstate->prefix)
+    {
+      grub_free (lexerstate->prefix);
+      lexerstate->prefix = 0;
+    }
+
+  lexerstate->prefix = grub_strdup (text);
+  if (! lexerstate->prefix)
+    {
+      grub_script_yyerror (yyget_extra (yyscanner), "out of memory");
+      return 1;
+    }
+  return 0;
+}

From 94606d3845d316b9619699b32a0685d57213c1f4 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 12 Jun 2010 11:12:38 +0530
Subject: [PATCH 1118/1628] some minor fixes

---
 script/yylex.l | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/script/yylex.l b/script/yylex.l
index 025810da3..c5c5cc4e3 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -105,6 +105,7 @@ typedef size_t yy_size_t;
 %option nounistd nostdinit nodefault noyylineno
 
 /* Reduce lexer size, by not defining these.  */
+%option noyy_top_state
 %option noinput nounput
 %option noyyget_in noyyset_in
 %option noyyget_out noyyset_out
@@ -179,13 +180,13 @@ MULTILINE       {WORD}?((\"{DQCHR}*)|(\'{SQCHR}*))
 {NAME}          { RECORD; return GRUB_PARSER_TOKEN_NAME; }
 {WORD}          {
                   RECORD;
-		  yyextra->lexerstate->resplit = 1;
 		  yypush_buffer_state (YY_CURRENT_BUFFER, yyscanner);
 		  if (grub_lexer_resplit (yytext, yyscanner))
 		    {
 		      yypop_buffer_state (yyscanner);
 		      return GRUB_PARSER_TOKEN_WORD;
 		    }
+		  yyextra->lexerstate->resplit = 1;
                 }
 {MULTILINE}     {
                   if (grub_lexer_unput (yytext, yyscanner))
@@ -352,10 +353,7 @@ grub_lexer_unput (const char *text, yyscan_t yyscanner)
   struct grub_lexer_param *lexerstate = yyget_extra (yyscanner)->lexerstate;
 
   if (lexerstate->prefix)
-    {
-      grub_free (lexerstate->prefix);
-      lexerstate->prefix = 0;
-    }
+    grub_free (lexerstate->prefix);
 
   lexerstate->prefix = grub_strdup (text);
   if (! lexerstate->prefix)

From 4c4a352a9819552d81f0cb58a31fb0b6b0206231 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 12 Jun 2010 11:15:53 +0530
Subject: [PATCH 1119/1628] small fix, large gain (in size)

---
 script/yylex.l | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/yylex.l b/script/yylex.l
index c5c5cc4e3..2e770c49f 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -123,7 +123,7 @@ NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
 
 ESC             \\.
 SQCHR           [^\']
-DQCHR           {ESC}|[^\"]
+DQCHR           {ESC}|[^\\\"]
 DQSTR           \"{DQCHR}*\"
 SQSTR           \'{SQCHR}*\'
 VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|$\?|$\{\?\}

From 2f169df5a48358b07cff6a788b39210818b14a58 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 12 Jun 2010 11:25:44 +0530
Subject: [PATCH 1120/1628] updated echo1 test with multiline strings

---
 tests/grub_script_echo1.in | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/tests/grub_script_echo1.in b/tests/grub_script_echo1.in
index 048907a76..056ea73ad 100644
--- a/tests/grub_script_echo1.in
+++ b/tests/grub_script_echo1.in
@@ -30,3 +30,33 @@ e"$foo"${bar}o hello world
 
 foo=echo
 $foo 1234
+
+echo "one
+"
+echo "one
+\""
+echo "one
+two"
+
+echo one"two
+"three
+echo one"two
+\""three
+echo one"two
+\"three\"
+four"
+
+
+echo 'one
+'
+echo 'one
+\'
+echo 'one
+two'
+echo one'two
+'
+echo one'two
+\'
+echo one'two
+\'three
+

From 0500dfd1b46eb465c2ddbb68651d38d109f29fcc Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 12 Jun 2010 12:02:06 +0530
Subject: [PATCH 1121/1628] cleanup & a fix

---
 script/lexer.c             | 45 +++++++++++++++++++-------------------
 tests/grub_script_echo1.in |  4 ++++
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/script/lexer.c b/script/lexer.c
index 63b74e2e0..208ad0bf6 100644
--- a/script/lexer.c
+++ b/script/lexer.c
@@ -154,18 +154,37 @@ grub_script_lexer_yywrap (struct grub_parser_param *parserstate,
     lexerstate->getline (&line, 1);
   else
     line = grub_strdup (input);
+
+  /* Ensure '\n' at the end.  */
+  if (line && line[0] == '\0')
+    {
+      grub_free (line);
+      line = grub_strdup ("\n");
+    }
+
+  if (line && (len = grub_strlen(line)) && line[len - 1] != '\n')
+    {
+      p = grub_realloc (line, len + 2);
+      if (p)
+	{
+	  p[len++] = '\n';
+	  p[len] = '\0';
+	}
+      line = p;
+    }
+
   if (! line)
     {
-      grub_script_yyerror (parserstate, 0);
+      grub_script_yyerror (parserstate, "out of memory");
       return 1;
     }
 
-  len = grub_strlen (line);
+  /* Prepend any left over unput-text.  */
   if (lexerstate->prefix)
     {
       int plen = grub_strlen (lexerstate->prefix);
 
-      p = grub_malloc (len + plen + 2);
+      p = grub_malloc (len + plen + 1);
       if (! p)
 	{
 	  grub_free (line);
@@ -174,31 +193,13 @@ grub_script_lexer_yywrap (struct grub_parser_param *parserstate,
       grub_strcpy (p, lexerstate->prefix);
       lexerstate->prefix = 0;
 
-      if (! line[0])
-	{
-	  line = "\n";
-	  len = 1;
-	}
       grub_strcpy (p + plen, line);
+      grub_free (line);
 
       line = p;
       len = len + plen;
     }
 
-  if (line[len - 1] != '\n')
-    {
-      char *p;
-      p = grub_realloc (line, len + 2);
-      if (! p)
-	{
-	  grub_free (line);
-	  return 1;
-	}
-      line = p;
-      line[len++] = '\n';
-      line[len] = '\0';
-    }
-
   buffer = yy_scan_string (line, lexerstate->yyscanner);
   grub_free (line);
 
diff --git a/tests/grub_script_echo1.in b/tests/grub_script_echo1.in
index 056ea73ad..13b7364f4 100644
--- a/tests/grub_script_echo1.in
+++ b/tests/grub_script_echo1.in
@@ -60,3 +60,7 @@ echo one'two
 echo one'two
 \'three
 
+# echo "one
+#
+# two"
+

From 7b466fbb9e3cba84dd616e52bb5fe812711242a3 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 12 Jun 2010 12:23:49 +0530
Subject: [PATCH 1122/1628] logical linebreaks support

---
 script/yylex.l             | 14 ++++++++------
 tests/grub_script_echo1.in |  8 ++++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/script/yylex.l b/script/yylex.l
index 2e770c49f..c580b1ed3 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -121,7 +121,7 @@ CHAR            [^{}|&$;<> \t\n\'\"\\]
 DIGITS          [[:digit:]]+
 NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
 
-ESC             \\.
+ESC             \\(.|\n)
 SQCHR           [^\']
 DQCHR           {ESC}|[^\\\"]
 DQSTR           \"{DQCHR}*\"
@@ -129,7 +129,7 @@ SQSTR           \'{SQCHR}*\'
 VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|$\?|$\{\?\}
 WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
 
-MULTILINE       {WORD}?((\"{DQCHR}*)|(\'{SQCHR}*))
+MULTILINE       {WORD}?((\"{DQCHR}*)|(\'{SQCHR}*)|(\\\n))
 
 %x              SPLIT
 %x              DQUOTE
@@ -177,6 +177,11 @@ MULTILINE       {WORD}?((\"{DQCHR}*)|(\'{SQCHR}*))
 "function"      { RECORD; return GRUB_PARSER_TOKEN_FUNCTION;  }
 "menuentry"     { RECORD; return GRUB_PARSER_TOKEN_MENUENTRY; }
 
+{MULTILINE}     {
+                  if (grub_lexer_unput (yytext, yyscanner))
+		    return GRUB_PARSER_TOKEN_BAD;
+		}
+
 {NAME}          { RECORD; return GRUB_PARSER_TOKEN_NAME; }
 {WORD}          {
                   RECORD;
@@ -188,10 +193,6 @@ MULTILINE       {WORD}?((\"{DQCHR}*)|(\'{SQCHR}*))
 		    }
 		  yyextra->lexerstate->resplit = 1;
                 }
-{MULTILINE}     {
-                  if (grub_lexer_unput (yytext, yyscanner))
-		    return GRUB_PARSER_TOKEN_BAD;
-		}
 .               {
                   grub_script_yyerror (yyextra, yytext);
 		  return GRUB_PARSER_TOKEN_BAD;
@@ -201,6 +202,7 @@ MULTILINE       {WORD}?((\"{DQCHR}*)|(\'{SQCHR}*))
 
 <SPLIT>{
   \\.           { COPY (yytext + 1, yyleng - 1); }
+  \\\n          { /* ignore */ }
   \"            {
                   yy_push_state (DQUOTE, yyscanner);
                   ARG (GRUB_SCRIPT_ARG_TYPE_TEXT);
diff --git a/tests/grub_script_echo1.in b/tests/grub_script_echo1.in
index 13b7364f4..2a90fc65f 100644
--- a/tests/grub_script_echo1.in
+++ b/tests/grub_script_echo1.in
@@ -60,6 +60,14 @@ echo one'two
 echo one'two
 \'three
 
+# echo "one\
+# two"
+# echo 'one\
+# two'
+# echo foo\
+# bar
+# \
+# echo foo
 # echo "one
 #
 # two"

From ee62c427e51eb267ccc0e69823c1bb05ca75e2d6 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sat, 12 Jun 2010 12:02:38 +0100
Subject: [PATCH 1123/1628] * util/grub-mkrescue.in (make_image): Remove sh
 module, which has been merged back into normal.

---
 ChangeLog             | 5 +++++
 util/grub-mkrescue.in | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ab9415191..1def7af01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-12  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkrescue.in (make_image): Remove sh module, which has
+	been merged back into normal.
+
 2010-06-11  Colin Watson  <cjwatson@ubuntu.com>
 
 	* include/grub/efi/uga_draw.h (GRUB_EFI_UGA_GLT_MAX): Rename to ...
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 61b0c94f7..ee269d692 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -173,7 +173,7 @@ EOF
     tar -C ${memdisk_dir} -cf ${memdisk_img} boot
     rm -rf ${memdisk_dir}
     $grub_mkimage -O ${platform} -d "${source_directory}" -m "${memdisk_img}" -o "$3" --prefix='(memdisk)/boot/grub' \
-        search iso9660 configfile normal sh memdisk tar $4
+        search iso9660 configfile normal memdisk tar $4
     rm -rf ${memdisk_img}
 }
 

From 57711df6adc0162ec00688faa809258ac0c0e91c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 12 Jun 2010 13:20:21 +0200
Subject: [PATCH 1124/1628] 	custom.cfg support.

	* conf/common.rmk (grub-mkconfig_SCRIPTS): Add 41_custom.
	* util/grub.d/41_custom.in: New file.
---
 ChangeLog                | 7 +++++++
 conf/common.rmk          | 2 +-
 util/grub.d/41_custom.in | 7 +++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 util/grub.d/41_custom.in

diff --git a/ChangeLog b/ChangeLog
index 1def7af01..f148d3204 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	custom.cfg support.
+
+	* conf/common.rmk (grub-mkconfig_SCRIPTS): Add 41_custom.
+	* util/grub.d/41_custom.in: New file.
+
 2010-06-12  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkrescue.in (make_image): Remove sh module, which has
diff --git a/conf/common.rmk b/conf/common.rmk
index 3b9d1e5ce..bf73c2d59 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -201,7 +201,7 @@ CLEANFILES += grub-gettext_lib
 %: util/grub.d/%.in config.status
 	./config.status --file=$@:$<
 	chmod +x $@
-grub-mkconfig_SCRIPTS = 00_header 30_os-prober 40_custom
+grub-mkconfig_SCRIPTS = 00_header 30_os-prober 40_custom 41_custom
 ifneq (, $(host_kernel))
 grub-mkconfig_SCRIPTS += 10_$(host_kernel)
 endif
diff --git a/util/grub.d/41_custom.in b/util/grub.d/41_custom.in
new file mode 100644
index 000000000..64d691c55
--- /dev/null
+++ b/util/grub.d/41_custom.in
@@ -0,0 +1,7 @@
+#!/bin/sh
+cat <<EOF
+if [ -f  \$prefix/custom.cfg ]; then
+  source \$prefix/custom.cfg;
+fi
+EOF
+

From e03e4b24ca473f5fdc7226e6b4a55d982557d31f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 12 Jun 2010 13:44:01 +0200
Subject: [PATCH 1125/1628] 	* util/grub-mkrescue.in: Add --sort-weight
 arguments to xorriso. 	Suggested by: Thomas Schmitt.

---
 ChangeLog             | 5 +++++
 util/grub-mkrescue.in | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f148d3204..9c8b21bd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkrescue.in: Add --sort-weight arguments to xorriso.
+	Suggested by: Thomas Schmitt.
+
 2010-06-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	custom.cfg support.
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index ee269d692..1c8bd8e67 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -269,7 +269,7 @@ if [ -e "${iso9660_dir}/boot/coreboot.elf" ] && [ -d "${rom_directory}" ]; then
 fi
 
 # build iso image
-xorriso -pathspecs on -as mkisofs ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} ${source}
+xorriso -pathspecs on -as mkisofs ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} --sort-weight 0 / --sort-weight 1 /boot ${source}
 rm -rf ${iso9660_dir}
 
 rm -f ${embed_img}

From 25c56d29284144dfab0f01d843caede2a0315525 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 12 Jun 2010 13:47:08 +0200
Subject: [PATCH 1126/1628] 	* util/grub-mkrescue.in: Use -graft-points
 instead of -pathspecs. 	Suggested by: Thomas Schmitt.

---
 ChangeLog             | 5 +++++
 util/grub-mkrescue.in | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9c8b21bd3..798af2e7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkrescue.in: Use -graft-points instead of -pathspecs.
+	Suggested by: Thomas Schmitt.
+
 2010-06-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkrescue.in: Add --sort-weight arguments to xorriso.
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 1c8bd8e67..4d05893ba 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -269,7 +269,7 @@ if [ -e "${iso9660_dir}/boot/coreboot.elf" ] && [ -d "${rom_directory}" ]; then
 fi
 
 # build iso image
-xorriso -pathspecs on -as mkisofs ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} --sort-weight 0 / --sort-weight 1 /boot ${source}
+xorriso -as mkisofs -graft-points ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} --sort-weight 0 / --sort-weight 1 /boot ${source}
 rm -rf ${iso9660_dir}
 
 rm -f ${embed_img}

From a60859731830306a20f2932fd352015bc83e870e Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Sat, 12 Jun 2010 13:54:35 +0200
Subject: [PATCH 1127/1628] 	* util/grub-mkrescue.in: Support --xorriso
 argument.

---
 ChangeLog             | 4 ++++
 util/grub-mkrescue.in | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 798af2e7f..a6a06053f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-12  Thomas Schmitt  <scdbackup@gmx.net>
+
+	* util/grub-mkrescue.in: Support --xorriso argument.
+
 2010-06-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkrescue.in: Use -graft-points instead of -pathspecs.
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 4d05893ba..90c031882 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -42,6 +42,8 @@ rom_directory=
 override_dir=
 grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
 
+xorriso=xorriso
+
 # Usage: usage
 # Print the usage.
 usage () {
@@ -54,6 +56,7 @@ Make GRUB rescue image.
   --output=FILE           save output in FILE [required]
   --modules=MODULES       pre-load specified modules MODULES
   --rom-directory=DIR     save rom images in DIR [optional]
+  --xorriso=FILE          use FILE as xorriso [optional]
   --grub-mkimage=FILE     use FILE as grub-mkimage
 
 $self generates a bootable rescue image with specified source files or directories.
@@ -85,6 +88,8 @@ for option in "$@"; do
 	;;
     --grub-mkimage=*)
 	grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
+    --xorriso=*)
+        xorriso=`echo "${option}/" | sed 's/--xorriso=//'` ;;
     -*)
 	echo "Unrecognized option \`$option'" 1>&2
 	usage
@@ -269,7 +274,7 @@ if [ -e "${iso9660_dir}/boot/coreboot.elf" ] && [ -d "${rom_directory}" ]; then
 fi
 
 # build iso image
-xorriso -as mkisofs -graft-points ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} --sort-weight 0 / --sort-weight 1 /boot ${source}
+"${xorriso}" -as mkisofs -graft-points ${grub_mkisofs_arguments} --protective-msdos-label -o ${output_image} -r ${iso9660_dir} --sort-weight 0 / --sort-weight 1 /boot ${source}
 rm -rf ${iso9660_dir}
 
 rm -f ${embed_img}

From 1c8f0f8d11bb69b18501793f8c29c62644c0460c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Mart=C3=ADn?= <lordhabbit@gmail.com>
Date: Sat, 12 Jun 2010 14:50:07 +0200
Subject: [PATCH 1128/1628] 	* include/grub/types.h: Check for
 GRUB_CPU_SIZEOF_LONG when appropriate.

---
 ChangeLog            | 4 ++++
 include/grub/types.h | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a6a06053f..8f85c127a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-12  Javier Martín <lordhabbit@gmail.com>
+
+	* include/grub/types.h: Check for GRUB_CPU_SIZEOF_LONG when appropriate.
+
 2010-06-12  Thomas Schmitt  <scdbackup@gmx.net>
 
 	* util/grub-mkrescue.in: Support --xorriso argument.
diff --git a/include/grub/types.h b/include/grub/types.h
index 6e9461f1d..a9e8adfd6 100644
--- a/include/grub/types.h
+++ b/include/grub/types.h
@@ -60,7 +60,7 @@
 typedef signed char		grub_int8_t;
 typedef short			grub_int16_t;
 typedef int			grub_int32_t;
-#if GRUB_CPU_SIZEOF_VOID_P == 8
+#if GRUB_CPU_SIZEOF_LONG == 8
 typedef long			grub_int64_t;
 #else
 typedef long long		grub_int64_t;
@@ -69,7 +69,7 @@ typedef long long		grub_int64_t;
 typedef unsigned char		grub_uint8_t;
 typedef unsigned short		grub_uint16_t;
 typedef unsigned		grub_uint32_t;
-#if GRUB_CPU_SIZEOF_VOID_P == 8
+#if GRUB_CPU_SIZEOF_LONG == 8
 typedef unsigned long		grub_uint64_t;
 #else
 typedef unsigned long long	grub_uint64_t;
@@ -98,7 +98,7 @@ typedef grub_uint32_t	grub_size_t;
 typedef grub_int32_t	grub_ssize_t;
 #endif
 
-#if GRUB_CPU_SIZEOF_VOID_P == 8
+#if GRUB_CPU_SIZEOF_LONG == 8
 # define GRUB_ULONG_MAX 18446744073709551615UL
 # define GRUB_LONG_MAX 9223372036854775807L
 # define GRUB_LONG_MIN (-9223372036854775807L - 1)

From 7beac90c5f2a1b8af2e17b7922e0cdf7968046b1 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sat, 12 Jun 2010 14:33:09 +0100
Subject: [PATCH 1129/1628] Avoid false positives in fs.lst, partmap.lst, and
 video.lst due to prototype declarations. * genmk.rb (PModule::rule): Define
 GRUB_LST_GENERATOR when generating fs, partmap, and video lists. *
 include/grub/fs.h (grub_fs_register): Omit prototype if GRUB_LST_GENERATOR is
 defined. * include/grub/partition.h (grub_partition_map_register): Likewise.
 * include/grub/video.h (grub_video_register): Likewise.

---
 ChangeLog                | 12 ++++++++++++
 genmk.rb                 |  6 +++---
 include/grub/fs.h        |  2 ++
 include/grub/partition.h |  2 ++
 include/grub/video.h     |  2 ++
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8f85c127a..aababc845 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-06-12  Colin Watson  <cjwatson@ubuntu.com>
+
+	Avoid false positives in fs.lst, partmap.lst, and video.lst due to
+	prototype declarations.
+
+	* genmk.rb (PModule::rule): Define GRUB_LST_GENERATOR when
+	generating fs, partmap, and video lists.
+	* include/grub/fs.h (grub_fs_register): Omit prototype if
+	GRUB_LST_GENERATOR is defined.
+	* include/grub/partition.h (grub_partition_map_register): Likewise.
+	* include/grub/video.h (grub_video_register): Likewise.
+
 2010-06-12  Javier Martín <lordhabbit@gmail.com>
 
 	* include/grub/types.h: Check for GRUB_CPU_SIZEOF_LONG when appropriate.
diff --git a/genmk.rb b/genmk.rb
index e62dbd4f6..01b969ecf 100644
--- a/genmk.rb
+++ b/genmk.rb
@@ -228,7 +228,7 @@ VIDEOFILES += #{video}
 
 #{fs}: #{src} $(#{src}_DEPENDENCIES) genfslist.sh
 	set -e; \
-	  $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
+	  $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} -DGRUB_LST_GENERATOR $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
 	  | sh $(srcdir)/genfslist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
 
 #{parttool}: #{src} $(#{src}_DEPENDENCIES) genparttoollist.sh
@@ -238,7 +238,7 @@ VIDEOFILES += #{video}
 
 #{partmap}: #{src} $(#{src}_DEPENDENCIES) genpartmaplist.sh
 	set -e; \
-	  $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
+	  $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} -DGRUB_LST_GENERATOR $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
 	  | sh $(srcdir)/genpartmaplist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
 
 #{handler}: #{src} $(#{src}_DEPENDENCIES) genhandlerlist.sh
@@ -253,7 +253,7 @@ VIDEOFILES += #{video}
 
 #{video}: #{src} $(#{src}_DEPENDENCIES) genvideolist.sh
 	set -e; \
-	  $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
+	  $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} -DGRUB_LST_GENERATOR $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
 	  | sh $(srcdir)/genvideolist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
 
 "
diff --git a/include/grub/fs.h b/include/grub/fs.h
index 3368eb553..994eb8080 100644
--- a/include/grub/fs.h
+++ b/include/grub/fs.h
@@ -91,11 +91,13 @@ typedef int (*grub_fs_autoload_hook_t) (void);
 extern grub_fs_autoload_hook_t EXPORT_VAR(grub_fs_autoload_hook);
 extern grub_fs_t EXPORT_VAR (grub_fs_list);
 
+#ifndef GRUB_LST_GENERATOR
 static inline void
 grub_fs_register (grub_fs_t fs)
 {
   grub_list_push (GRUB_AS_LIST_P (&grub_fs_list), GRUB_AS_LIST (fs));
 }
+#endif
 
 static inline void
 grub_fs_unregister (grub_fs_t fs)
diff --git a/include/grub/partition.h b/include/grub/partition.h
index 722c7b3e0..a23e94e07 100644
--- a/include/grub/partition.h
+++ b/include/grub/partition.h
@@ -77,12 +77,14 @@ char *EXPORT_FUNC(grub_partition_get_name) (const grub_partition_t partition);
 
 extern grub_partition_map_t EXPORT_VAR(grub_partition_map_list);
 
+#ifndef GRUB_LST_GENERATOR
 static inline void
 grub_partition_map_register (grub_partition_map_t partmap)
 {
   grub_list_push (GRUB_AS_LIST_P (&grub_partition_map_list),
 		  GRUB_AS_LIST (partmap));
 }
+#endif
 
 static inline void
 grub_partition_map_unregister (grub_partition_map_t partmap)
diff --git a/include/grub/video.h b/include/grub/video.h
index 0a8fe1efe..faf2973ef 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -264,6 +264,7 @@ typedef struct grub_video_adapter *grub_video_adapter_t;
 
 extern grub_video_adapter_t EXPORT_VAR(grub_video_adapter_list);
 
+#ifndef GRUB_LST_GENERATOR
 /* Register video driver.  */
 static inline void
 grub_video_register (grub_video_adapter_t adapter)
@@ -271,6 +272,7 @@ grub_video_register (grub_video_adapter_t adapter)
   grub_list_push (GRUB_AS_LIST_P (&grub_video_adapter_list),
 		  GRUB_AS_LIST (adapter));
 }
+#endif
 
 /* Unregister video driver.  */
 static inline void

From ce08a9fb28c3f66accaf8ddc8c48e5052b484582 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Sat, 12 Jun 2010 16:03:34 +0200
Subject: [PATCH 1130/1628] 	* util/grub-mkrescue.in: Pass unrecognized
 options to xorriso.

---
 ChangeLog             |  4 ++++
 util/grub-mkrescue.in | 10 ++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aababc845..34823d8b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-12  Thomas Schmitt  <scdbackup@gmx.net>
+
+	* util/grub-mkrescue.in: Pass unrecognized options to xorriso.
+
 2010-06-12  Colin Watson  <cjwatson@ubuntu.com>
 
 	Avoid false positives in fs.lst, partmap.lst, and video.lst due to
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 90c031882..f8445a1e3 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -59,9 +59,12 @@ Make GRUB rescue image.
   --xorriso=FILE          use FILE as xorriso [optional]
   --grub-mkimage=FILE     use FILE as grub-mkimage
 
-$self generates a bootable rescue image with specified source files or directories.
+$self generates a bootable rescue image with specified source files, source
+directories, or mkisofs options listed by: xorriso -as mkisofs -help
+Option -- switches to native xorriso command mode. or directories.
 
 Report bugs to <bug-grub@gnu.org>.
+Mail xorriso support requests to <bug-xorriso@gnu.org>.
 EOF
 }
 
@@ -90,11 +93,6 @@ for option in "$@"; do
 	grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
     --xorriso=*)
         xorriso=`echo "${option}/" | sed 's/--xorriso=//'` ;;
-    -*)
-	echo "Unrecognized option \`$option'" 1>&2
-	usage
-	exit 1
-	;;
     *)
 	source="${source} ${option}" ;;
     esac

From 601c84fd16bff48c8fdcd02b0e4381025ff110b5 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sat, 12 Jun 2010 15:06:53 +0100
Subject: [PATCH 1131/1628] * util/grub-mkconfig.in: Capitalise and export
 GRUB_PREFIX. * util/grub.d/00_header.in: Use GRUB_PREFIX rather than
 computing it again. * util/grub.d/10_linux.in (linux_entry): Load all video
 drivers, which may be needed to allow the loader to program modes for the
 kernel.

---
 util/grub-mkconfig.in    | 15 ++++++++-------
 util/grub.d/00_header.in |  5 ++---
 util/grub.d/10_linux.in  | 10 ++++++++++
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index d916459d6..836bd6318 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -92,11 +92,11 @@ case "$host_os" in
 netbsd* | openbsd*)
     # Because /boot is used for the boot block in NetBSD and OpenBSD, use /grub
     # instead of /boot/grub.
-    grub_prefix=`echo /grub | sed ${transform}`
+    GRUB_PREFIX=`echo /grub | sed ${transform}`
     ;;
 *)
     # Use /boot/grub by default.
-    grub_prefix=`echo /boot/grub | sed ${transform}`
+    GRUB_PREFIX=`echo /boot/grub | sed ${transform}`
     ;;
 esac
 
@@ -137,9 +137,9 @@ else
     exit 1
 fi
 
-mkdir -p ${grub_prefix}
+mkdir -p ${GRUB_PREFIX}
 
-if test -e ${grub_prefix}/device.map ; then : ; else
+if test -e ${GRUB_PREFIX}/device.map ; then : ; else
   ${grub_mkdevicemap}
 fi
 
@@ -174,7 +174,7 @@ fi
 for x in ${GRUB_TERMINAL_OUTPUT}; do
     if [ "x${x}" = "xgfxterm" ]; then
         # If this platform supports gfxterm, try to use it.
-	if ! test -e ${grub_prefix}/gfxterm.mod ; then
+	if ! test -e ${GRUB_PREFIX}/gfxterm.mod ; then
 	    if [ "x$termoutdefault" != "x1" ]; then
 		echo "gfxterm isn't available on your platform" >&2 ; exit 1
 	    fi
@@ -183,7 +183,7 @@ for x in ${GRUB_TERMINAL_OUTPUT}; do
 	fi
         # FIXME: this should do something smarter than just loading first
         # video backend.
-	GRUB_VIDEO_BACKEND=$(head -n 1 ${grub_prefix}/video.lst || true)
+	GRUB_VIDEO_BACKEND=$(head -n 1 ${GRUB_PREFIX}/video.lst || true)
 	if [ -z "${GRUB_VIDEO_BACKEND}" ] ; then
 	    if [ "x$termoutdefault" != "x1" ]; then
 		echo "No suitable backend could be found for gfxterm." >&2 ; exit 1
@@ -242,7 +242,8 @@ export GRUB_DEVICE \
   GRUB_FS \
   GRUB_FONT_PATH \
   GRUB_PRELOAD_MODULES \
-  GRUB_VIDEO_BACKEND
+  GRUB_VIDEO_BACKEND \
+  GRUB_PREFIX
 
 # These are optional, user-defined variables.
 export GRUB_DEFAULT \
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 791840a60..76e0bc32d 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -21,8 +21,7 @@ transform="@program_transform_name@"
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-grub_prefix=`echo /boot/grub | sed ${transform}`
-locale_dir=`echo /boot/grub/locale | sed ${transform}`
+locale_dir=`echo ${GRUB_PREFIX}/locale | sed ${transform}`
 grub_lang=`echo $LANG | cut -d _ -f 1`
 
 . ${libdir}/grub/grub-mkconfig_lib
@@ -89,7 +88,7 @@ for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
 done
 
 if [ "x$serial" = x1 ]; then
-    if ! test -e ${grub_prefix}/serial.mod ; then
+    if ! test -e ${GRUB_PREFIX}/serial.mod ; then
 	echo "Serial terminal not available on this platform." >&2 ; exit 1
     fi
 
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 416ab6ed6..b2cff628d 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -78,6 +78,16 @@ EOF
 EOF
   fi
 
+  # Load video drivers, which may be needed to allow the loader to program
+  # modes for the kernel.
+  # TODO: Other kernels may need the same mode programming, especially on
+  # EFI.  Should we move this somewhere more generic?
+  for module in $(cat ${GRUB_PREFIX}/video.lst); do
+    cat << EOF
+	insmod $module
+EOF
+  done
+
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi

From c16be99ba318a111592c63e6419215a4d16965df Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sat, 12 Jun 2010 15:09:38 +0100
Subject: [PATCH 1132/1628] * .bzrignore: Ignore 41_custom.

---
 .bzrignore | 1 +
 ChangeLog  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/.bzrignore b/.bzrignore
index aa9c4ff84..c124c9280 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -2,6 +2,7 @@
 10_*
 30_os-prober
 40_custom
+41_custom
 aclocal.m4
 ascii.bitmaps
 ascii.h
diff --git a/ChangeLog b/ChangeLog
index 34823d8b8..7a564fb14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-12  Colin Watson  <cjwatson@ubuntu.com>
+
+	* .bzrignore: Ignore 41_custom.
+
 2010-06-12  Thomas Schmitt  <scdbackup@gmx.net>
 
 	* util/grub-mkrescue.in: Pass unrecognized options to xorriso.

From d49703d1517149134d8ce6a259d6c8bfb4e0b9d3 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 12 Jun 2010 17:38:48 +0200
Subject: [PATCH 1133/1628] Add priorities support

---
 include/grub/video.h | 21 ++++++++++++++++++---
 video/efi_gop.c      |  2 ++
 video/efi_uga.c      |  2 ++
 video/emu/sdl.c      |  3 +++
 video/i386/pc/vbe.c  |  2 ++
 video/i386/pc/vga.c  |  2 ++
 video/ieee1275.c     |  2 ++
 video/sm712.c        |  2 ++
 8 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/include/grub/video.h b/include/grub/video.h
index faf2973ef..03de1c27b 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -183,9 +183,19 @@ typedef enum grub_video_driver_id
     GRUB_VIDEO_DRIVER_EFI_UGA,
     GRUB_VIDEO_DRIVER_EFI_GOP,
     GRUB_VIDEO_DRIVER_SM712,
-    GRUB_VIDEO_DRIVER_VGA
+    GRUB_VIDEO_DRIVER_VGA,
+    GRUB_VIDEO_DRIVER_SDL
   } grub_video_driver_id_t;
 
+typedef enum grub_video_adapter_prio
+  {
+    GRUB_VIDEO_ADAPTER_PRIO_FALLBACK = 60,
+    GRUB_VIDEO_ADAPTER_PRIO_FIRMWARE_DIRTY = 70,
+    GRUB_VIDEO_ADAPTER_PRIO_FIRMWARE = 80,
+    GRUB_VIDEO_ADAPTER_PRIO_NATIVE = 100
+  } grub_video_adapter_prio_t;
+
+
 struct grub_video_adapter
 {
   /* The next video adapter.  */
@@ -195,6 +205,8 @@ struct grub_video_adapter
   const char *name;
   grub_video_driver_id_t id;
 
+  grub_video_adapter_prio_t prio;
+
   /* Initialize the video adapter.  */
   grub_err_t (*init) (void);
 
@@ -269,8 +281,11 @@ extern grub_video_adapter_t EXPORT_VAR(grub_video_adapter_list);
 static inline void
 grub_video_register (grub_video_adapter_t adapter)
 {
-  grub_list_push (GRUB_AS_LIST_P (&grub_video_adapter_list),
-		  GRUB_AS_LIST (adapter));
+  grub_video_adapter_t *p;
+  for (p = &grub_video_adapter_list; *p && (*p)->prio > adapter->prio; 
+       p = &((*p)->next));
+  adapter->next = *p;
+  *p = adapter;
 }
 #endif
 
diff --git a/video/efi_gop.c b/video/efi_gop.c
index 86a2881f8..4e79b8521 100644
--- a/video/efi_gop.c
+++ b/video/efi_gop.c
@@ -355,6 +355,8 @@ static struct grub_video_adapter grub_video_gop_adapter =
     .name = "EFI GOP driver",
     .id = GRUB_VIDEO_DRIVER_EFI_GOP,
 
+    .prio = GRUB_VIDEO_ADAPTER_PRIO_FIRMWARE,
+
     .init = grub_video_gop_init,
     .fini = grub_video_gop_fini,
     .setup = grub_video_gop_setup,
diff --git a/video/efi_uga.c b/video/efi_uga.c
index eb4e6b42e..6352d4342 100644
--- a/video/efi_uga.c
+++ b/video/efi_uga.c
@@ -302,6 +302,8 @@ static struct grub_video_adapter grub_video_uga_adapter =
     .name = "EFI UGA driver",
     .id = GRUB_VIDEO_DRIVER_EFI_UGA,
 
+    .prio = GRUB_VIDEO_ADAPTER_PRIO_FIRMWARE_DIRTY,
+
     .init = grub_video_uga_init,
     .fini = grub_video_uga_fini,
     .setup = grub_video_uga_setup,
diff --git a/video/emu/sdl.c b/video/emu/sdl.c
index d261db6b0..d66b8b0c0 100644
--- a/video/emu/sdl.c
+++ b/video/emu/sdl.c
@@ -200,6 +200,9 @@ grub_video_sdl_set_active_render_target (struct grub_video_render_target *target
 static struct grub_video_adapter grub_video_sdl_adapter =
   {
     .name = "SDL Video Driver",
+    .id = GRUB_VIDEO_DRIVER_SDL,
+
+    .prio = GRUB_VIDEO_ADAPTER_PRIO_FIRMWARE,
 
     .init = grub_video_sdl_init,
     .fini = grub_video_sdl_fini,
diff --git a/video/i386/pc/vbe.c b/video/i386/pc/vbe.c
index 72b8f1831..0cc9f8000 100644
--- a/video/i386/pc/vbe.c
+++ b/video/i386/pc/vbe.c
@@ -783,6 +783,8 @@ static struct grub_video_adapter grub_video_vbe_adapter =
     .name = "VESA BIOS Extension Video Driver",
     .id = GRUB_VIDEO_DRIVER_VBE,
 
+    .prio = GRUB_VIDEO_ADAPTER_PRIO_FIRMWARE,
+
     .init = grub_video_vbe_init,
     .fini = grub_video_vbe_fini,
     .setup = grub_video_vbe_setup,
diff --git a/video/i386/pc/vga.c b/video/i386/pc/vga.c
index 222a71272..a4fd44ecd 100644
--- a/video/i386/pc/vga.c
+++ b/video/i386/pc/vga.c
@@ -375,6 +375,8 @@ static struct grub_video_adapter grub_video_vga_adapter =
     .name = "VGA Video Driver",
     .id = GRUB_VIDEO_DRIVER_VGA,
 
+    .prio = GRUB_VIDEO_ADAPTER_PRIO_FALLBACK,
+
     .init = grub_video_vga_init,
     .fini = grub_video_vga_fini,
     .setup = grub_video_vga_setup,
diff --git a/video/ieee1275.c b/video/ieee1275.c
index 5c6bc1594..9c9477c2b 100644
--- a/video/ieee1275.c
+++ b/video/ieee1275.c
@@ -254,6 +254,8 @@ static struct grub_video_adapter grub_video_ieee1275_adapter =
   {
     .name = "IEEE1275 video driver",
 
+    .prio = GRUB_VIDEO_ADAPTER_PRIO_FIRMWARE,
+
     .init = grub_video_ieee1275_init,
     .fini = grub_video_ieee1275_fini,
     .setup = grub_video_ieee1275_setup,
diff --git a/video/sm712.c b/video/sm712.c
index 33861beef..98ce523c9 100644
--- a/video/sm712.c
+++ b/video/sm712.c
@@ -193,6 +193,8 @@ static struct grub_video_adapter grub_video_sm712_adapter =
     .name = "SM712 Video Driver",
     .id = GRUB_VIDEO_DRIVER_SM712,
 
+    .prio = GRUB_VIDEO_ADAPTER_PRIO_NATIVE,
+
     .init = grub_video_sm712_video_init,
     .fini = grub_video_sm712_video_fini,
     .setup = grub_video_sm712_setup,

From fcb2d0901143232e084878bbf97fb941a2f20052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Sun, 13 Jun 2010 02:36:39 +0200
Subject: [PATCH 1134/1628] New partition naming style in grub-probe for Linux
 and NetBSD.

---
 ChangeLog            |  6 ++++++
 kern/emu/hostdisk.c  | 30 +++++++++++++-----------------
 util/grub-install.in |  4 ++--
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 15856dc57..766a5053f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-13  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* kern/emu/hostdisk.c (grub_util_biosdisk_get_grub_dev): Use the
+	new partition naming style.
+	* util/grub-install.in: Adapt sed subtitutions in grub-probe calls.
+
 2010-06-12  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Add "-o grub.iso" like cmdline options support.
diff --git a/kern/emu/hostdisk.c b/kern/emu/hostdisk.c
index 47389195c..bc37e9949 100644
--- a/kern/emu/hostdisk.c
+++ b/kern/emu/hostdisk.c
@@ -992,6 +992,11 @@ grub_util_biosdisk_fini (void)
   grub_disk_dev_unregister (&grub_util_biosdisk_dev);
 }
 
+/*
+ * Note: we do not use the new partition naming scheme as dos_part does not
+ * necessarily correspond to an msdos partition.  See e.g. the FreeBSD code
+ * in function grub_util_biosdisk_get_grub_dev.
+ */
 static char *
 make_device_name (int drive, int dos_part, int bsd_part)
 {
@@ -1400,11 +1405,9 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
      For NetBSD, proceed as for Linux, except that the start sector is
      obtained from the disk label.  */
   {
-    char *name;
+    char *name, *partname;
     grub_disk_t disk;
     grub_disk_addr_t start;
-    int dos_part = -1;
-    int bsd_part = -1;
     auto int find_partition (grub_disk_t dsk,
 			     const grub_partition_t partition);
 
@@ -1419,17 +1422,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
 
 	if (start == part_start)
 	  {
-	    if (partition->parent)
-	      {
-		dos_part = partition->parent->number;
-		bsd_part = partition->number;
-	      }
-	    else
-	      {
-		dos_part = partition->number;
-		bsd_part = -1;
-	      }
-
+	    partname = grub_partition_get_name (partition);
 	    return 1;
 	  }
 
@@ -1465,6 +1458,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
     if (! disk)
       return 0;
 
+    partname = NULL;
     grub_partition_iterate (disk, find_partition);
     if (grub_errno != GRUB_ERR_NONE)
       {
@@ -1472,7 +1466,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
 	return 0;
       }
 
-    if (dos_part < 0)
+    if (partname == NULL)
       {
 	grub_disk_close (disk);
 	grub_error (GRUB_ERR_BAD_DEVICE,
@@ -1480,7 +1474,9 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
 	return 0;
       }
 
-    return make_device_name (drive, dos_part, bsd_part);
+    name = grub_xasprintf ("%s,%s", disk->name, partname);
+    free (partname);
+    return name;
   }
 
 #elif defined(__GNU__)
@@ -1525,7 +1521,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
         for (p = os_dev + 5; *p; ++p)
           if (grub_isdigit(*p))
             {
-              p = strchr (p, 's');
+              p = strchr (p, 's');    /* msdos or apple (or ... ?) partition map */
               if (p)
                 {
                   p++;
diff --git a/util/grub-install.in b/util/grub-install.in
index e580ac819..c7e087dd0 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -356,12 +356,12 @@ if [ "x${devabstraction_module}" = "x" ] ; then
       else
         install_drive="`$grub_probe --target=drive --device ${install_device}`" || exit 1
       fi
-      install_drive="`echo ${install_drive} | sed -e s/,[0-9]*[a-z]*//g`"
+      install_drive="`echo ${install_drive} | sed -e s/,[a-z0-9,]*//g`"
     fi
     grub_drive="`$grub_probe --target=drive --device ${grub_device}`" || exit 1
 
     # Strip partition number
-    grub_drive="`echo ${grub_drive} | sed -e s/,[0-9]*[a-z]*//g`"
+    grub_drive="`echo ${grub_drive} | sed -e s/,[a-z0-9,]*//g`"
     if [ "$disk_module" = ata ] ; then
         # generic method (used on coreboot and ata mod)
         uuid="`$grub_probe --target=fs_uuid --device ${grub_device}`"

From b5309cc1b2c6c7a45911134f341c81534819fec4 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sun, 13 Jun 2010 13:17:23 +0100
Subject: [PATCH 1135/1628] * docs/grub.texi (Commands): Document reduced
 command set in rescue mode. (cpuid): New section.

---
 ChangeLog      |  6 ++++++
 docs/grub.texi | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 766a5053f..9ca80ac6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-13  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (Commands): Document reduced command set in rescue
+	mode.
+	(cpuid): New section.
+
 2010-06-13  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* kern/emu/hostdisk.c (grub_util_biosdisk_get_grub_dev): Use the
diff --git a/docs/grub.texi b/docs/grub.texi
index 9fe197da2..714145807 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1378,6 +1378,10 @@ the global section of the configuration file (or ``menu''); most
 of them can be entered on the command-line and can be used either
 anywhere in the menu or specifically in the menu entries.
 
+In rescue mode, only the @command{insmod} (@pxref{insmod}), @command{ls}
+(@pxref{ls}), @command{set} (@pxref{set}), and @command{unset}
+(@pxref{unset}) commands are normally available.
+
 @menu
 * Menu-specific commands::
 * General commands::
@@ -1538,6 +1542,7 @@ you forget a command, you can run the command @command{help}
 * chainloader::                 Chain-load another boot loader
 * cmp::                         Compare two files
 * configfile::                  Load a configuration file
+* cpuid::                       Check for CPU features
 * crc::                         Calculate CRC32 checksums
 * date::                        Display or set current date and time
 * drivemap::                    Map a drive to another
@@ -1659,6 +1664,20 @@ Load @var{file} as a configuration file.
 @end deffn
 
 
+@node cpuid
+@subsection cpuid
+
+@deffn Command cpuid [-l]
+Check for CPU features.  This command is only available on x86 systems.
+
+With the @option{-l} option, return true if the CPU supports long mode
+(64-bit).
+
+If invoked without options, this command currently behaves as if it had been
+invoked with @option{-l}.  This may change in the future.
+@end deffn
+
+
 @node crc
 @subsection crc
 

From 41160e2e6f529ef96cfbfb0f1961753439d285f2 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 14 Jun 2010 15:08:02 +0100
Subject: [PATCH 1136/1628] * docs/man/grub-emu.h2m: New file.

---
 ChangeLog             | 4 ++++
 docs/man/grub-emu.h2m | 2 ++
 2 files changed, 6 insertions(+)
 create mode 100644 docs/man/grub-emu.h2m

diff --git a/ChangeLog b/ChangeLog
index 9ca80ac6f..6d8133fbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-14  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/man/grub-emu.h2m: New file.
+
 2010-06-13  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Commands): Document reduced command set in rescue
diff --git a/docs/man/grub-emu.h2m b/docs/man/grub-emu.h2m
new file mode 100644
index 000000000..09a1f88c1
--- /dev/null
+++ b/docs/man/grub-emu.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-emu \- GRUB emulator

From 8d70754eed95ce1bdf10a21dc10f6400153f0835 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 14 Jun 2010 15:34:47 +0100
Subject: [PATCH 1137/1628] * util/grub-mkconfig.in: Remove vestige of old
 argument parsing that left this script non-functional.

---
 ChangeLog             | 5 +++++
 util/grub-mkconfig.in | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6d8133fbf..6833765ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-14  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkconfig.in: Remove vestige of old argument parsing that
+	left this script non-functional.
+
 2010-06-14  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/man/grub-emu.h2m: New file.
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 0c17d07f6..c9a6df417 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -92,11 +92,6 @@ do
 	;;
     esac
 done
-if $next_grub_cfg; then
-    echo "Missing argument to \`-o'" 1>&2
-    usage
-    exit 1
-fi
 
 . ${libdir}/grub/grub-mkconfig_lib
 

From 662e24d5f39d50a163a27133e6d3ee360eb0c94f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Mon, 14 Jun 2010 20:27:25 +0200
Subject: [PATCH 1138/1628] Remove leftover commands/handler.c in POTFILES.

---
 ChangeLog   | 4 ++++
 po/POTFILES | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6833765ac..5dff53209 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-14  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* po/POTFILES: Remove leftover commands/handler.c.
+
 2010-06-14  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkconfig.in: Remove vestige of old argument parsing that
diff --git a/po/POTFILES b/po/POTFILES
index d2c579edb..cfa1e33cb 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -12,7 +12,6 @@ commands/efi/fixvideo.c
 commands/efi/loadbios.c
 commands/gptsync.c
 commands/halt.c
-commands/handler.c
 commands/hdparm.c
 commands/help.c
 commands/hexdump.c

From 5591324fc6707df39d8dd87f9e654ca016bcd784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Mon, 14 Jun 2010 21:26:48 +0200
Subject: [PATCH 1139/1628] Fix help2man failure with program name
 transformation.

---
 ChangeLog   | 5 +++++
 Makefile.in | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5dff53209..977c33306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-14  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* Makefile.in (install-local): Use $$file.h2m instead of $$dest.h2m
+	for manual page generation.
+
 2010-06-14  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* po/POTFILES: Remove leftover commands/handler.c.
diff --git a/Makefile.in b/Makefile.in
index afe4beb6e..b9b7f3d08 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -323,26 +323,26 @@ install-local: all
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
-	  $(HELP2MAN) --section=1 -i $(srcdir)/docs/man/$$dest.h2m -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
+	  $(HELP2MAN) --section=1 -i $(srcdir)/docs/man/$$file.h2m -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
 	done
 	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8
 	@list='$(sbin_UTILITIES)'; for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
-	  $(HELP2MAN) --section=8 -i $(srcdir)/docs/man/$$dest.h2m -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
+	  $(HELP2MAN) --section=8 -i $(srcdir)/docs/man/$$file.h2m -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
 	done
 	@list='$(bin_SCRIPTS)'; for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
-	  $(HELP2MAN) --section=1 -i $(srcdir)/docs/man/$$dest.h2m -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
+	  $(HELP2MAN) --section=1 -i $(srcdir)/docs/man/$$file.h2m -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
 	done
 	@list='$(sbin_SCRIPTS)'; for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
-	  $(HELP2MAN) --section=8 -i $(srcdir)/docs/man/$$dest.h2m -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
+	  $(HELP2MAN) --section=8 -i $(srcdir)/docs/man/$$file.h2m -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
 	done
 	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/grub.d
 	@list='$(grub-mkconfig_SCRIPTS)'; for file in $$list; do \

From 044e2e60bed2f7f6e0495cb0b51137376179a788 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 16 Jun 2010 12:51:26 +0100
Subject: [PATCH 1140/1628] * util/grub-mkconfig.in: Ignore non-option
 arguments, for compatibility with older versions (before 2010-06-12) which
 did the same.  In particular, this makes it easier to ship an update-grub
 wrapper which is compatible with that used with GRUB Legacy (Debian bug
 #586056).

---
 ChangeLog             | 8 ++++++++
 util/grub-mkconfig.in | 5 +----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 977c33306..88e1e43d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-16  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkconfig.in: Ignore non-option arguments, for
+	compatibility with older versions (before 2010-06-12) which did the
+	same.  In particular, this makes it easier to ship an update-grub
+	wrapper which is compatible with that used with GRUB Legacy (Debian
+	bug #586056).
+
 2010-06-14  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* Makefile.in (install-local): Use $$file.h2m instead of $$dest.h2m
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index c9a6df417..726423590 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -86,10 +86,7 @@ do
 	usage
 	exit 1
 	;;
-    *)
-	echo "Invalid parameter, $option" 1>&2
-	exit 1
-	;;
+    # Explicitly ignore non-option arguments, for compatibility.
     esac
 done
 

From 2164da6b25efcc410b9624c8b95aaabd7340b82e Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 17 Jun 2010 12:15:37 +0100
Subject: [PATCH 1141/1628] Fix i386-pc prefix handling with nested partitions
 (Debian bug #585068).  Note that the case where the core image is booted
 using multiboot and relocated from its original location still requires more
 work. * kern/i386/pc/init.c (make_install_device): If the prefix starts with
 "(,", fill the boot drive in between those two characters, but expect that a
 full partition specification including partition map names will follow. *
 util/i386/pc/grub-setup.c (setup): Unless an explicit prefix was specified,
 write a prefix without the drive name but including a full partition
 specification.

---
 ChangeLog                 | 15 +++++++++++++++
 kern/i386/pc/init.c       |  8 ++++++++
 util/i386/pc/grub-setup.c | 15 +++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 88e1e43d6..e2f240f40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-06-17  Colin Watson  <cjwatson@ubuntu.com>
+
+	Fix i386-pc prefix handling with nested partitions (Debian bug
+	#585068).  Note that the case where the core image is booted using
+	multiboot and relocated from its original location still requires
+	more work.
+
+	* kern/i386/pc/init.c (make_install_device): If the prefix starts
+	with "(,", fill the boot drive in between those two characters, but
+	expect that a full partition specification including partition map
+	names will follow.
+	* util/i386/pc/grub-setup.c (setup): Unless an explicit prefix was
+	specified, write a prefix without the drive name but including a
+	full partition specification.
+
 2010-06-16  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkconfig.in: Ignore non-option arguments, for
diff --git a/kern/i386/pc/init.c b/kern/i386/pc/init.c
index d81b1e117..8cbc757b2 100644
--- a/kern/i386/pc/init.c
+++ b/kern/i386/pc/init.c
@@ -83,6 +83,14 @@ make_install_device (void)
       grub_snprintf (ptr, sizeof (dev) - (ptr - dev), ")%s", grub_prefix);
       grub_strcpy (grub_prefix, dev);
     }
+  else if (grub_prefix[1] == ',' || grub_prefix[1] == ')')
+    {
+      /* We have a prefix, but still need to fill in the boot drive.  */
+      grub_snprintf (dev, sizeof (dev),
+		     "(%cd%u%s", (grub_boot_drive & 0x80) ? 'h' : 'f',
+		     grub_boot_drive & 0x7f, grub_prefix + 1);
+      grub_strcpy (grub_prefix, dev);
+    }
 
   return grub_prefix;
 }
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index f0baf1c89..454fba9fa 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -99,6 +99,7 @@ setup (const char *dir,
   struct grub_boot_blocklist *first_block, *block;
   grub_int32_t *install_dos_part, *install_bsd_part;
   grub_int32_t dos_part, bsd_part;
+  char *prefix;
   char *tmp_img;
   int i;
   grub_disk_addr_t first_sector;
@@ -230,6 +231,8 @@ setup (const char *dir,
 				       + GRUB_KERNEL_MACHINE_INSTALL_DOS_PART);
   install_bsd_part = (grub_int32_t *) (core_img + GRUB_DISK_SECTOR_SIZE
 				       + GRUB_KERNEL_MACHINE_INSTALL_BSD_PART);
+  prefix = (char *) (core_img + GRUB_DISK_SECTOR_SIZE +
+		     GRUB_KERNEL_MACHINE_PREFIX);
 
   /* Open the root device and the destination device.  */
   root_dev = grub_device_open (root);
@@ -305,6 +308,18 @@ setup (const char *dir,
 	      dos_part = root_dev->disk->partition->number;
  	      bsd_part = -1;
  	    }
+
+	  if (prefix[0] != '(')
+	    {
+	      char *root_part_name, *new_prefix;
+
+	      root_part_name =
+		grub_partition_get_name (root_dev->disk->partition);
+	      new_prefix = xasprintf ("(,%s)%s", root_part_name, prefix);
+	      strcpy (prefix, new_prefix);
+	      free (new_prefix);
+	      free (root_part_name);
+	    }
 	}
       else
 	dos_part = bsd_part = -1;

From e4311a9f0f0e59597f4afc68673db0f0f1968967 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 17 Jun 2010 16:01:17 +0100
Subject: [PATCH 1142/1628] * util/grub-mkconfig.in: Stop setting
 GRUB_VIDEO_BACKEND.  Make it available as a user override instead.  Replace
 the gfxterm backend check with a check that ${GRUB_PREFIX}/video.lst is
 non-empty. * util/grub.d/00_header.in (load_video): New generated function.
 Call it before loading gfxterm rather than loading ${GRUB_VIDEO_BACKEND}. *
 util/grub.d/10_linux.in (linux_entry): Call load_video. *
 util/grub.d/30_os-prober.in (osx_entry): Likewise. * docs/grub.texi (Simple
 configuration): Document GRUB_VIDEO_BACKEND.

---
 docs/grub.texi              | 10 ++++++++++
 util/grub-mkconfig.in       |  7 ++-----
 util/grub.d/00_header.in    | 20 +++++++++++++++++++-
 util/grub.d/10_linux.in     | 13 +++----------
 util/grub.d/30_os-prober.in |  2 +-
 5 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/docs/grub.texi b/docs/grub.texi
index 9fe197da2..cea9f6a31 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -934,6 +934,16 @@ Disable the generation of recovery mode menu entries for Linux.
 @item GRUB_DISABLE_NETBSD_RECOVERY
 Disable the generation of recovery mode menu entries for NetBSD.
 
+@item GRUB_VIDEO_BACKEND
+If graphical video support is required, either because the @samp{gfxterm}
+graphical terminal is in use or because @samp{GRUB_GFXPAYLOAD_LINUX} is set,
+then @command{grub-mkconfig} will normally load all available GRUB video
+drivers and use the one most appropriate for your hardware.  If you need to
+override this for some reason, then you can set this option.
+
+After @command{grub-install} has been run, the available video drivers are
+listed in @file{/boot/grub/video.lst}.
+
 @item GRUB_GFXMODE
 Set the resolution used on the @samp{gfxterm} graphical terminal.  Note that
 you can only use modes which your graphics card supports via VESA BIOS
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 836bd6318..6bdc166c9 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -181,10 +181,7 @@ for x in ${GRUB_TERMINAL_OUTPUT}; do
 	    GRUB_TERMINAL_OUTPUT=
 	    break;
 	fi
-        # FIXME: this should do something smarter than just loading first
-        # video backend.
-	GRUB_VIDEO_BACKEND=$(head -n 1 ${GRUB_PREFIX}/video.lst || true)
-	if [ -z "${GRUB_VIDEO_BACKEND}" ] ; then
+	if [ ! -s "${GRUB_PREFIX}/video.lst" ] ; then
 	    if [ "x$termoutdefault" != "x1" ]; then
 		echo "No suitable backend could be found for gfxterm." >&2 ; exit 1
 	    fi
@@ -242,7 +239,6 @@ export GRUB_DEVICE \
   GRUB_FS \
   GRUB_FONT_PATH \
   GRUB_PRELOAD_MODULES \
-  GRUB_VIDEO_BACKEND \
   GRUB_PREFIX
 
 # These are optional, user-defined variables.
@@ -265,6 +261,7 @@ export GRUB_DEFAULT \
   GRUB_DISABLE_LINUX_UUID \
   GRUB_DISABLE_LINUX_RECOVERY \
   GRUB_DISABLE_NETBSD_RECOVERY \
+  GRUB_VIDEO_BACKEND \
   GRUB_GFXMODE \
   GRUB_BACKGROUND \
   GRUB_THEME \
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 76e0bc32d..8040a7c9b 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -74,6 +74,24 @@ function savedefault {
     save_env saved_entry
   fi
 }
+
+function load_video {
+EOF
+if [ -n "${GRUB_VIDEO_BACKEND}" ]; then
+    cat <<EOF
+  insmod ${GRUB_VIDEO_BACKEND}
+EOF
+else
+    # Insert all available backends; GRUB will use the most appropriate.
+    for backend in $(cat "${GRUB_PREFIX}/video.lst"); do
+	cat <<EOF
+  insmod ${backend}
+EOF
+    done
+fi
+cat <<EOF
+}
+
 EOF
 
 serial=0;
@@ -106,8 +124,8 @@ if [ "x$gfxterm" = x1 ]; then
     cat << EOF
 if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT_PATH}"` ; then
   set gfxmode=${GRUB_GFXMODE}
+  load_video
   insmod gfxterm
-  insmod ${GRUB_VIDEO_BACKEND}
 EOF
     if [ "x$GRUB_THEME" != x ] && [ -f "$GRUB_THEME" ] \
 	&& is_path_readable_by_grub "$GRUB_THEME"; then
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index b2cff628d..4b5ddb9d8 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -66,6 +66,9 @@ linux_entry ()
   # Use ELILO's generic "efifb" when it's known to be available.
   # FIXME: We need an interface to select vesafb in case efifb can't be used.
   if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then
+      cat << EOF
+	load_video
+EOF
       if grep -qx "CONFIG_FB_EFI=y" /boot/config-${version} 2> /dev/null \
 	  && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" /boot/config-${version} 2> /dev/null; then
 	  cat << EOF
@@ -78,16 +81,6 @@ EOF
 EOF
   fi
 
-  # Load video drivers, which may be needed to allow the loader to program
-  # modes for the kernel.
-  # TODO: Other kernels may need the same mode programming, especially on
-  # EFI.  Should we move this somewhere more generic?
-  for module in $(cat ${GRUB_PREFIX}/video.lst); do
-    cat << EOF
-	insmod $module
-EOF
-  done
-
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index edef37e66..90e2e3d92 100644
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -44,7 +44,7 @@ EOF
 	save_default_entry | sed -e "s/^/\t/"
 	prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
 	cat << EOF
-        insmod ${GRUB_VIDEO_BACKEND}
+        load_video
         set do_resume=0
         if [ /var/vm/sleepimage -nt10 / ]; then
            if xnu_resume /var/vm/sleepimage; then

From d87ac126cd408b51546e5518ce550d6f1292fce6 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 17 Jun 2010 16:18:41 +0100
Subject: [PATCH 1143/1628] remove temporary debugging printfs

---
 loader/i386/efi/linux.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c
index 9d4db3440..4a0eae58b 100644
--- a/loader/i386/efi/linux.c
+++ b/loader/i386/efi/linux.c
@@ -368,8 +368,6 @@ grub_linux_boot (void)
 
   params = real_mode_mem;
 
-  grub_printf ("%d\n", __LINE__);
-
   grub_dprintf ("linux", "code32_start = %x, idt_desc = %lx, gdt_desc = %lx\n",
 		(unsigned) params->code32_start,
 		(unsigned long) &(idt_desc.limit),
@@ -378,8 +376,6 @@ grub_linux_boot (void)
 		(unsigned) idt_desc.limit, (unsigned long) idt_desc.base,
 		(unsigned) gdt_desc.limit, (unsigned long) gdt_desc.base);
 
-  grub_printf ("%d\n", __LINE__);
-
   auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
   int NESTED_FUNC_ATTR hook (grub_uint64_t addr, grub_uint64_t size, grub_uint32_t type)
     {
@@ -418,8 +414,6 @@ grub_linux_boot (void)
       return 0;
     }
 
-  grub_printf ("%d\n", __LINE__);
-
   e820_num = 0;
   grub_mmap_iterate (hook);
   params->mmap_size = e820_num;

From 094dfb699ea07d142bac35b5fecc7f4318d5a491 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 17 Jun 2010 21:20:43 +0100
Subject: [PATCH 1144/1628] * util/i386/pc/grub-setup.c (usage): Warn against
 running grub-setup directly, and recommend grub-install instead. *
 util/sparc64/ieee1275/grub-setup.c (usage): Likewise.

---
 ChangeLog                          | 6 ++++++
 util/i386/pc/grub-setup.c          | 2 ++
 util/sparc64/ieee1275/grub-setup.c | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e2f240f40..83023d9cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-17  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/i386/pc/grub-setup.c (usage): Warn against running grub-setup
+	directly, and recommend grub-install instead.
+	* util/sparc64/ieee1275/grub-setup.c (usage): Likewise.
+
 2010-06-17  Colin Watson  <cjwatson@ubuntu.com>
 
 	Fix i386-pc prefix handling with nested partitions (Debian bug
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 454fba9fa..d04bf7619 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -608,6 +608,8 @@ Usage: %s [OPTION]... DEVICE\n\
 \n\
 Set up images to boot from DEVICE.\n\
 DEVICE must be a GRUB device (e.g. `(hd0,1)').\n\
+\n\
+You should not normally run %s directly.  Use grub-install instead.
 \n\
   -b, --boot-image=FILE   use FILE as the boot image [default=%s]\n\
   -c, --core-image=FILE   use FILE as the core image [default=%s]\n\
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index 218a0e037..c20d2a046 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -407,6 +407,8 @@ Usage: %s [OPTION]... DEVICE\n\
 \n\
 Set up images to boot from DEVICE.\n\
 DEVICE must be a GRUB device (e.g. `(hd0,1)').\n\
+\n\
+You should not normally run %s directly.  Use grub-install instead.
 \n\
   -b, --boot-image=FILE   use FILE as the boot image [default=%s]\n\
   -c, --core-image=FILE   use FILE as the core image [default=%s]\n\

From c88a83f64491625e0c1cfdf4faa3f574cb5d6bcc Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 17 Jun 2010 21:49:50 +0100
Subject: [PATCH 1145/1628] * util/i386/pc/grub-setup.c (usage): Fix syntax
 error. * util/sparc64/ieee1275/grub-setup.c (usage): Likewise.

---
 ChangeLog                          | 5 +++++
 util/i386/pc/grub-setup.c          | 2 +-
 util/sparc64/ieee1275/grub-setup.c | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83023d9cd..09a2faf12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-17  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/i386/pc/grub-setup.c (usage): Fix syntax error.
+	* util/sparc64/ieee1275/grub-setup.c (usage): Likewise.
+
 2010-06-17  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/i386/pc/grub-setup.c (usage): Warn against running grub-setup
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index d04bf7619..a94d3e30c 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -609,7 +609,7 @@ Usage: %s [OPTION]... DEVICE\n\
 Set up images to boot from DEVICE.\n\
 DEVICE must be a GRUB device (e.g. `(hd0,1)').\n\
 \n\
-You should not normally run %s directly.  Use grub-install instead.
+You should not normally run %s directly.  Use grub-install instead.\n\
 \n\
   -b, --boot-image=FILE   use FILE as the boot image [default=%s]\n\
   -c, --core-image=FILE   use FILE as the core image [default=%s]\n\
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index c20d2a046..354151257 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -408,7 +408,7 @@ Usage: %s [OPTION]... DEVICE\n\
 Set up images to boot from DEVICE.\n\
 DEVICE must be a GRUB device (e.g. `(hd0,1)').\n\
 \n\
-You should not normally run %s directly.  Use grub-install instead.
+You should not normally run %s directly.  Use grub-install instead.\n\
 \n\
   -b, --boot-image=FILE   use FILE as the boot image [default=%s]\n\
   -c, --core-image=FILE   use FILE as the core image [default=%s]\n\

From 7d24e434c5e0cf43c0c78731b1cc1fc33a858991 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 17 Jun 2010 21:54:04 +0100
Subject: [PATCH 1146/1628] * util/i386/pc/grub-setup.c (usage): Pass an extra
 `program_name' argument to printf. * util/sparc64/ieee1275/grub-setup.c
 (usage): Likewise.

---
 ChangeLog                          | 6 ++++++
 util/i386/pc/grub-setup.c          | 2 +-
 util/sparc64/ieee1275/grub-setup.c | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 09a2faf12..5676f3315 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-17  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/i386/pc/grub-setup.c (usage): Pass an extra `program_name'
+	argument to printf.
+	* util/sparc64/ieee1275/grub-setup.c (usage): Likewise.
+
 2010-06-17  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/i386/pc/grub-setup.c (usage): Fix syntax error.
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index a94d3e30c..32f1f90e4 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -624,7 +624,7 @@ You should not normally run %s directly.  Use grub-install instead.\n\
 \n\
 Report bugs to <%s>.\n\
 "),
-	    program_name,
+	    program_name, program_name,
 	    DEFAULT_BOOT_FILE, DEFAULT_CORE_FILE, DEFAULT_DIRECTORY,
 	    DEFAULT_DEVICE_MAP, PACKAGE_BUGREPORT);
 
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index 354151257..e53542263 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -420,7 +420,7 @@ You should not normally run %s directly.  Use grub-install instead.\n\
   -v, --verbose           print verbose messages\n\
 \n\
 Report bugs to <%s>.\n\
-", program_name,
+", program_name, program_name,
 	    DEFAULT_BOOT_FILE, DEFAULT_CORE_FILE, DEFAULT_DIRECTORY,
 	    DEFAULT_DEVICE_MAP, PACKAGE_BUGREPORT);
 

From 0e489b823382755c31f3365a400761a34424c408 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 20 Jun 2010 13:44:31 +0200
Subject: [PATCH 1147/1628] Remove leftover fields in sm712.c

---
 video/sm712.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/video/sm712.c b/video/sm712.c
index 33861beef..c36a19203 100644
--- a/video/sm712.c
+++ b/video/sm712.c
@@ -32,10 +32,7 @@ static struct
   struct grub_video_mode_info mode_info;
   struct grub_video_render_target *render_target;
 
-  unsigned int bytes_per_scan_line;
-  unsigned int bytes_per_pixel;
   grub_uint8_t *ptr;
-  int index_color_mode;
   int mapped;
   grub_uint32_t base;
   grub_pci_device_t dev;

From 6d5a33c9ac70bfe001317ba11a14427862100f1a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 20 Jun 2010 14:17:56 +0200
Subject: [PATCH 1148/1628] Support >3GiB and < 16MiB of RAM in i386-qemu

---
 kern/i386/qemu/mmap.c | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/kern/i386/qemu/mmap.c b/kern/i386/qemu/mmap.c
index c7fc4f45e..f2a998e78 100644
--- a/kern/i386/qemu/mmap.c
+++ b/kern/i386/qemu/mmap.c
@@ -27,21 +27,37 @@
 #define QEMU_CMOS_MEMSIZE_HIGH		0x35
 #define QEMU_CMOS_MEMSIZE_LOW		0x34
 
+#define QEMU_CMOS_MEMSIZE2_HIGH		0x31
+#define QEMU_CMOS_MEMSIZE2_LOW		0x30
+
 #define min(a,b)	((a) > (b) ? (b) : (a))
 
 extern char _start[];
 extern char _end[];
 
-grub_size_t grub_lower_mem, grub_upper_mem;
-grub_uint64_t mem_size;
+static grub_uint64_t mem_size, above_4g;
 
 void
 grub_machine_mmap_init ()
 {
-  mem_size = grub_cmos_read (QEMU_CMOS_MEMSIZE_HIGH) << 24 | grub_cmos_read (QEMU_CMOS_MEMSIZE_LOW) << 16;
+  mem_size = ((grub_uint64_t) grub_cmos_read (QEMU_CMOS_MEMSIZE_HIGH)) << 24
+    | ((grub_uint64_t) grub_cmos_read (QEMU_CMOS_MEMSIZE_LOW)) << 16;
+  if (mem_size > 0)
+    {
+      /* Don't ask... */
+      mem_size += (16 * 1024 * 1024);
+    }
+  else
+    {
+      mem_size
+	= ((((grub_uint64_t) grub_cmos_read (QEMU_CMOS_MEMSIZE2_HIGH)) << 18)
+	   | ((grub_uint64_t) (grub_cmos_read (QEMU_CMOS_MEMSIZE2_LOW)) << 10))
+	+ 1024 * 1024;
+    }
 
-  /* Don't ask... */
-  mem_size += (16 * 1024 * 1024);
+  above_4g = (((grub_uint64_t) grub_cmos_read (0x5b)) << 16)
+    | (((grub_uint64_t) grub_cmos_read (0x5c)) << 24)
+    | (((grub_uint64_t) grub_cmos_read (0x5d)) << 32);
 }
 
 grub_err_t
@@ -57,6 +73,12 @@ grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uin
 	    GRUB_MACHINE_MEMORY_RESERVED))
     return 1;
 
+  /* Everything else is free.  */
+  if (hook (0x100000,
+	    min (mem_size, (grub_uint32_t) -GRUB_BOOT_MACHINE_SIZE) - 0x100000,
+	    GRUB_MACHINE_MEMORY_AVAILABLE))
+    return 1;
+
   /* Protect boot.img, which contains the gdt.  It is mapped at the top of memory
      (it is also mapped below 0x100000, but we already reserved that area).  */
   if (hook ((grub_uint32_t) -GRUB_BOOT_MACHINE_SIZE,
@@ -64,10 +86,8 @@ grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uin
 	    GRUB_MACHINE_MEMORY_RESERVED))
     return 1;
 
-  /* Everything else is free.  */
-  if (hook (0x100000,
-	    min (mem_size, (grub_uint32_t) -GRUB_BOOT_MACHINE_SIZE) - 0x100000,
-	    GRUB_MACHINE_MEMORY_AVAILABLE))
+  if (above_4g != 0 && hook (0x100000000ULL, above_4g,
+			     GRUB_MACHINE_MEMORY_AVAILABLE))
     return 1;
 
   return 0;

From d246fc036887fc456b2aa77fa46d45c83e7a7632 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 21 Jun 2010 00:58:43 +0200
Subject: [PATCH 1149/1628] Improve macroification of VGA registers.

---
 include/grub/vga.h      | 64 +++++++++++++++++++++++++++++++----------
 term/i386/pc/vga_text.c |  8 ++++--
 2 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/include/grub/vga.h b/include/grub/vga.h
index d05ddd69b..a33cf2b67 100644
--- a/include/grub/vga.h
+++ b/include/grub/vga.h
@@ -21,6 +21,7 @@
 
 enum
   {
+    GRUB_VGA_IO_ARX = 0x3c0,
     GRUB_VGA_IO_SR_INDEX = 0x3c4,
     GRUB_VGA_IO_SR_DATA = 0x3c5,
     GRUB_VGA_IO_PIXEL_MASK = 0x3c6,
@@ -41,7 +42,8 @@ enum
     GRUB_VGA_CR_WIDTH = 0x01,
     GRUB_VGA_CR_OVERFLOW = 0x07,
     GRUB_VGA_CR_CELL_HEIGHT = 0x09,
-    GRUB_VGA_CR_CURSOR = 0x0a,
+    GRUB_VGA_CR_CURSOR_START = 0x0a,
+    GRUB_VGA_CR_CURSOR_END = 0x0b,
     GRUB_VGA_CR_START_ADDR_HIGH_REGISTER = 0x0c,
     GRUB_VGA_CR_START_ADDR_LOW_REGISTER = 0x0d,
     GRUB_VGA_CR_CURSOR_ADDR_HIGH = 0x0e,
@@ -64,36 +66,68 @@ enum
 #define GRUB_VGA_CR_CELL_HEIGHT_LINE_COMPARE_MASK 0x40
 #define GRUB_VGA_CR_CELL_HEIGHT_LINE_COMPARE_SHIFT 3
 
-#define GRUB_VGA_CR_CURSOR_DISABLE	(1 << 5)
+enum
+  {
+    GRUB_VGA_CR_CURSOR_START_DISABLE = (1 << 5)
+  };
 
 #define GRUB_VGA_CR_PITCH_DIVISOR 8
 
-#define GRUB_VGA_CR_MODE_TIMING_ENABLE 0x80
-#define GRUB_VGA_CR_MODE_BYTE_MODE 0x40
-#define GRUB_VGA_CR_MODE_NO_HERCULES 0x02
-#define GRUB_VGA_CR_MODE_NO_CGA 0x01
-
 enum
   {
-    GRUB_VGA_SR_MAP_MASK_REGISTER = 0x02,
-    GRUB_VGA_SR_MEMORY_MODE = 0x04,
+    GRUB_VGA_CR_MODE_NO_CGA = 0x01,
+    GRUB_VGA_CR_MODE_NO_HERCULES = 0x02,
+    GRUB_VGA_CR_MODE_BYTE_MODE = 0x40,
+    GRUB_VGA_CR_MODE_TIMING_ENABLE = 0x80
   };
 
-#define GRUB_VGA_SR_MEMORY_MODE_CHAIN4 8
-#define GRUB_VGA_SR_MEMORY_MODE_NORMAL 0
+enum
+  {
+    GRUB_VGA_SR_CLOCKING_MODE = 1,
+    GRUB_VGA_SR_MAP_MASK_REGISTER = 2,
+    GRUB_VGA_SR_MEMORY_MODE = 4,
+  };
 
 enum
   {
-    GRUB_VGA_GR_READ_MAP_REGISTER = 0x04,
+    GRUB_VGA_SR_CLOCKING_MODE_8_DOT_CLOCK = 1
+  };
+
+enum
+  {
+    GRUB_VGA_SR_MEMORY_MODE_NORMAL = 0,
+    GRUB_VGA_SR_MEMORY_MODE_CHAIN4 = 8
+  };
+
+enum
+  {
+    GRUB_VGA_GR_DATA_ROTATE = 3,
+    GRUB_VGA_GR_READ_MAP_REGISTER = 4,
     GRUB_VGA_GR_MODE = 5,
     GRUB_VGA_GR_GR6 = 6,
+    GRUB_VGA_GR_BITMASK = 8,
     GRUB_VGA_GR_MAX
   };
 
-#define GRUB_VGA_GR_GR6_GRAPHICS_MODE 1
+enum
+  {
+    GRUB_VGA_TEXT_TEXT_PLANE = 0,
+    GRUB_VGA_TEXT_ATTR_PLANE = 1,
+    GRUB_VGA_TEXT_FONT_PLANE = 2
+  };
 
-#define GRUB_VGA_GR_MODE_256_COLOR 0x40
-#define GRUB_VGA_GR_MODE_READ_MODE1 0x08
+enum
+  {
+    GRUB_VGA_GR_GR6_GRAPHICS_MODE = 1,
+    GRUB_VGA_GR_GR6_MMAP_CGA = (3 << 2)
+  };
+
+enum
+  {
+    GRUB_VGA_GR_MODE_READ_MODE1 = 0x08,
+    GRUB_VGA_GR_MODE_ODD_EVEN = 0x10,
+    GRUB_VGA_GR_MODE_256_COLOR = 0x40
+  };
 
 static inline void
 grub_vga_gr_write (grub_uint8_t val, grub_uint8_t addr)
diff --git a/term/i386/pc/vga_text.c b/term/i386/pc/vga_text.c
index 8bc14cb61..bfa934a40 100644
--- a/term/i386/pc/vga_text.c
+++ b/term/i386/pc/vga_text.c
@@ -124,11 +124,13 @@ static void
 grub_vga_text_setcursor (int on)
 {
   grub_uint8_t old;
-  old = grub_vga_cr_read (GRUB_VGA_CR_CURSOR);
+  old = grub_vga_cr_read (GRUB_VGA_CR_CURSOR_START);
   if (on)
-    grub_vga_cr_write (old & ~GRUB_VGA_CR_CURSOR_DISABLE, GRUB_VGA_CR_CURSOR);
+    grub_vga_cr_write (old & ~GRUB_VGA_CR_CURSOR_START_DISABLE,
+		       GRUB_VGA_CR_CURSOR_START);
   else
-    grub_vga_cr_write (old | GRUB_VGA_CR_CURSOR_DISABLE, GRUB_VGA_CR_CURSOR);
+    grub_vga_cr_write (old | GRUB_VGA_CR_CURSOR_START_DISABLE,
+		       GRUB_VGA_CR_CURSOR_START);
 }
 
 static grub_err_t

From 8c0346515d6d9aefaf105c57516bef0c32957cc4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 21 Jun 2010 01:01:26 +0200
Subject: [PATCH 1150/1628] Add GRUB_PCI_REG_STATUS_*_ENABLE

---
 include/grub/pci.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/grub/pci.h b/include/grub/pci.h
index 89bd1034a..09eebcd6c 100644
--- a/include/grub/pci.h
+++ b/include/grub/pci.h
@@ -66,6 +66,9 @@
 #define  GRUB_PCI_REG_MIN_GNT      0x3e
 #define  GRUB_PCI_REG_MAX_LAT      0x3f
 
+#define  GRUB_PCI_REG_STATUS_MEMORY_ENABLE   0x02
+#define  GRUB_PCI_REG_STATUS_IO_ENABLE       0x01
+
 typedef grub_uint32_t grub_pci_id_t;
 
 #ifdef GRUB_MACHINE_EMU

From 4d88b9aec7d3fd1786d4e897a8aa7f2cf045365b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 21 Jun 2010 01:02:48 +0200
Subject: [PATCH 1151/1628] Init cirrus ourselves instead of calling videobios

---
 boot/i386/qemu/boot.S           |   3 -
 conf/i386-qemu.rmk              |   6 +-
 conf/i386.rmk                   |   3 +
 configure.ac                    |   7 ++
 include/grub/i386/qemu/kernel.h |   2 +
 kern/i386/coreboot/init.c       |   3 +
 kern/i386/qemu/init.c           | 152 ++++++++++++++++++++++++++++++++
 7 files changed, 172 insertions(+), 4 deletions(-)
 create mode 100644 kern/i386/qemu/init.c

diff --git a/boot/i386/qemu/boot.S b/boot/i386/qemu/boot.S
index 03631a22a..b4d75f776 100644
--- a/boot/i386/qemu/boot.S
+++ b/boot/i386/qemu/boot.S
@@ -36,9 +36,6 @@ VARIABLE(grub_core_entry_addr)
 	.long	0
 1:
 
-	/* Process VGA rom.  */
-	call	$0xc000, $0x3
-
 	/* Set up %ds, %ss, and %es.  */
 	xorw	%ax, %ax
 	movw	%ax, %ds
diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
index 664bef12a..03a18c3a9 100644
--- a/conf/i386-qemu.rmk
+++ b/conf/i386-qemu.rmk
@@ -19,10 +19,13 @@ grub_mkimage_SOURCES = util/grub-mkrawimage.c util/misc.c \
 grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 util/grub-mkrawimage.c_DEPENDENCIES = Makefile
 
+kern/i386/qemu/init.c_DEPENDENCIES = ascii.h
+
 pkglib_IMAGES += kernel.img
 kernel_img_SOURCES = kern/i386/qemu/startup.S \
 	kern/i386/misc.S \
 	kern/i386/coreboot/init.c \
+	kern/i386/qemu/init.c \
 	kern/i386/qemu/mmap.c \
 	kern/i386/halt.c \
 	kern/main.c kern/device.c \
@@ -35,8 +38,9 @@ kernel_img_SOURCES = kern/i386/qemu/startup.S \
 	kern/generic/rtc_get_time_ms.c \
 	kern/generic/millisleep.c \
 	kern/env.c \
-	term/i386/pc/vga_text.c term/i386/vga_common.c \
+	term/i386/pc/vga_text.c term/i386/vga_common.c bus/pci.c \
 	symlist.c
+kernel_img_HEADERS += pci.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR)
diff --git a/conf/i386.rmk b/conf/i386.rmk
index 5e1191c1e..28da1be8d 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -60,11 +60,14 @@ serial_mod_SOURCES = term/serial.c
 serial_mod_CFLAGS = $(COMMON_CFLAGS)
 serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# On qemu it's compiled in
+ifneq ($(platform), qemu)
 # For pci.mod
 pkglib_MODULES += pci.mod
 pci_mod_SOURCES = bus/pci.c
 pci_mod_CFLAGS = $(COMMON_CFLAGS)
 pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
+endif
 
 # For lspci.mod
 pkglib_MODULES += lspci.mod
diff --git a/configure.ac b/configure.ac
index 4e1dd41d8..085146b68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,13 +178,20 @@ if test "x$YACC" = x; then
   AC_MSG_ERROR([bison is not found])
 fi
 
+FONT_SOURCE=
+
 for file in /usr/src/unifont.bdf /usr/share/fonts/X11/misc/unifont.pcf.gz /usr/share/fonts/unifont/unifont.pcf.gz; do
   if test -e $file ; then
+    FONT_SOURCE=$file
     AC_SUBST([FONT_SOURCE], [$file])
     break
   fi
 done
 
+if test "x$FONT_SOURCE" == x && ( test "x$platform" = xqemu || test "x$platform" = xyeeloong ); then
+   AC_MSG_ERROR([qemu and yeeloong ports need unifont])
+fi
+
 AC_PROG_INSTALL
 AC_PROG_AWK
 AC_PROG_LEX
diff --git a/include/grub/i386/qemu/kernel.h b/include/grub/i386/qemu/kernel.h
index bc0b93d4f..d1599ae3a 100644
--- a/include/grub/i386/qemu/kernel.h
+++ b/include/grub/i386/qemu/kernel.h
@@ -48,6 +48,8 @@ extern grub_int32_t grub_total_module_size;
    configuration file are located.  */
 extern char grub_prefix[];
 
+void grub_qemu_init_cirrus (void);
+
 #endif /* ! ASM_FILE */
 
 #endif /* ! GRUB_KERNEL_MACHINE_HEADER */
diff --git a/kern/i386/coreboot/init.c b/kern/i386/coreboot/init.c
index f7b837044..84dd30e0b 100644
--- a/kern/i386/coreboot/init.c
+++ b/kern/i386/coreboot/init.c
@@ -70,6 +70,9 @@ grub_exit (void)
 void
 grub_machine_init (void)
 {
+#ifdef GRUB_MACHINE_QEMU
+  grub_qemu_init_cirrus ();
+#endif
   /* Initialize the console as early as possible.  */
   grub_vga_text_init ();
 
diff --git a/kern/i386/qemu/init.c b/kern/i386/qemu/init.c
new file mode 100644
index 000000000..3bb497e9d
--- /dev/null
+++ b/kern/i386/qemu/init.c
@@ -0,0 +1,152 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/pci.h>
+#include <grub/machine/kernel.h>
+#include <grub/misc.h>
+#include <grub/vga.h>
+
+static struct {grub_uint8_t r, g, b, a; } colors[] =
+  {
+    // {R, G, B, A}
+    {0x00, 0x00, 0x00, 0xFF}, // 0 = black
+    {0x00, 0x00, 0xA8, 0xFF}, // 1 = blue
+    {0x00, 0xA8, 0x00, 0xFF}, // 2 = green
+    {0x00, 0xA8, 0xA8, 0xFF}, // 3 = cyan
+    {0xA8, 0x00, 0x00, 0xFF}, // 4 = red
+    {0xA8, 0x00, 0xA8, 0xFF}, // 5 = magenta
+    {0xA8, 0x54, 0x00, 0xFF}, // 6 = brown
+    {0xA8, 0xA8, 0xA8, 0xFF}, // 7 = light gray
+
+    {0x54, 0x54, 0x54, 0xFF}, // 8 = dark gray
+    {0x54, 0x54, 0xFE, 0xFF}, // 9 = bright blue
+    {0x54, 0xFE, 0x54, 0xFF}, // 10 = bright green
+    {0x54, 0xFE, 0xFE, 0xFF}, // 11 = bright cyan
+    {0xFE, 0x54, 0x54, 0xFF}, // 12 = bright red
+    {0xFE, 0x54, 0xFE, 0xFF}, // 13 = bright magenta
+    {0xFE, 0xFE, 0x54, 0xFF}, // 14 = yellow
+    {0xFE, 0xFE, 0xFE, 0xFF}  // 15 = white
+  };
+
+#include <ascii.h>
+
+static void
+load_font (void)
+{
+  unsigned i;
+
+  grub_vga_gr_write (0 << 2, GRUB_VGA_GR_GR6);
+
+  grub_vga_sr_write (GRUB_VGA_SR_MEMORY_MODE_NORMAL, GRUB_VGA_SR_MEMORY_MODE);
+  grub_vga_sr_write (1 << GRUB_VGA_TEXT_FONT_PLANE,
+		     GRUB_VGA_SR_MAP_MASK_REGISTER);
+
+  grub_vga_gr_write (0, GRUB_VGA_GR_DATA_ROTATE);
+  grub_vga_gr_write (0, GRUB_VGA_GR_MODE);
+  grub_vga_gr_write (0xff, GRUB_VGA_GR_BITMASK);
+
+  for (i = 0; i < 128; i++)
+    grub_memcpy ((void *) (0xa0000 + 32 * i), ascii_bitmaps + 16 * (0x7f - i), 16);
+}
+
+static void
+load_palette (void)
+{
+  unsigned i;
+  for (i = 0; i < 16; i++)
+    {
+      grub_outb (i, GRUB_VGA_IO_ARX);
+      grub_outb (i, GRUB_VGA_IO_ARX);
+    }
+
+  for (i = 0; i < ARRAY_SIZE (colors); i++)
+    grub_vga_palette_write (i, colors[i].r, colors[i].g, colors[i].b);
+}
+
+void
+grub_qemu_init_cirrus (void)
+{
+  auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid);
+  int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)))
+    {
+      grub_pci_address_t addr;
+      grub_uint32_t class;
+
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
+      class = grub_pci_read (addr);
+
+      if (((class >> 16) & 0xffff) != 0x0300)
+	return 0;
+      
+      /* FIXME: chooose addresses dynamically.  */
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
+      grub_pci_write (addr, 0xf0000000 | GRUB_PCI_ADDR_MEM_PREFETCH
+		      | GRUB_PCI_ADDR_SPACE_MEMORY | GRUB_PCI_ADDR_MEM_TYPE_32);
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG1);
+      grub_pci_write (addr, 0xf2000000
+		      | GRUB_PCI_ADDR_SPACE_MEMORY | GRUB_PCI_ADDR_MEM_TYPE_32);
+ 
+      addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
+      grub_pci_write (addr, GRUB_PCI_REG_STATUS_MEMORY_ENABLE
+		      | GRUB_PCI_REG_STATUS_IO_ENABLE);
+      
+      return 1;
+    }
+
+  grub_pci_iterate (find_card);
+
+  grub_outb (1, 0x3c2);
+
+  load_font ();
+
+  grub_vga_gr_write (GRUB_VGA_GR_GR6_MMAP_CGA, GRUB_VGA_GR_GR6);
+  grub_vga_gr_write (GRUB_VGA_GR_MODE_ODD_EVEN, GRUB_VGA_GR_MODE);
+
+  grub_vga_sr_write (GRUB_VGA_SR_MEMORY_MODE_NORMAL, GRUB_VGA_SR_MEMORY_MODE);
+
+  grub_vga_sr_write ((1 << GRUB_VGA_TEXT_TEXT_PLANE)
+		     | (1 << GRUB_VGA_TEXT_ATTR_PLANE),
+		     GRUB_VGA_SR_MAP_MASK_REGISTER);
+
+  grub_vga_cr_write (15, GRUB_VGA_CR_CELL_HEIGHT);
+  grub_vga_cr_write (79, GRUB_VGA_CR_WIDTH);
+  grub_vga_cr_write (40, GRUB_VGA_CR_PITCH);
+
+  int vert = 25 * 16;
+  grub_vga_cr_write (vert & 0xff, GRUB_VGA_CR_HEIGHT);
+  grub_vga_cr_write (((vert >> GRUB_VGA_CR_OVERFLOW_HEIGHT1_SHIFT)
+		      & GRUB_VGA_CR_OVERFLOW_HEIGHT1_MASK)
+		     | ((vert >> GRUB_VGA_CR_OVERFLOW_HEIGHT2_SHIFT)
+			& GRUB_VGA_CR_OVERFLOW_HEIGHT2_MASK),
+		     GRUB_VGA_CR_OVERFLOW);
+
+  load_palette ();
+
+  grub_outb (0x10, 0x3c0);
+  grub_outb (0, 0x3c1);
+  grub_outb (0x14, 0x3c0);
+  grub_outb (0, 0x3c1);
+
+  grub_vga_sr_write (GRUB_VGA_SR_CLOCKING_MODE_8_DOT_CLOCK,
+		     GRUB_VGA_SR_CLOCKING_MODE);
+
+  grub_vga_cr_write (14, GRUB_VGA_CR_CURSOR_START);
+  grub_vga_cr_write (15, GRUB_VGA_CR_CURSOR_END);
+
+  grub_outb (0x20, 0x3c0);
+}

From de24ab9b0ded05e34be80dacff3fd706b3b68210 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 21 Jun 2010 02:07:45 +0200
Subject: [PATCH 1152/1628] Fix grub_vga_palette_write

---
 include/grub/vga.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/grub/vga.h b/include/grub/vga.h
index a33cf2b67..d4a1523a7 100644
--- a/include/grub/vga.h
+++ b/include/grub/vga.h
@@ -185,7 +185,7 @@ static inline void
 grub_vga_palette_write (grub_uint8_t addr, grub_uint8_t r, grub_uint8_t g,
 			grub_uint8_t b)
 {
-  grub_outb (addr, GRUB_VGA_IO_PALLETTE_READ_INDEX);
+  grub_outb (addr, GRUB_VGA_IO_PALLETTE_WRITE_INDEX);
   grub_outb (r, GRUB_VGA_IO_PALLETTE_DATA);
   grub_outb (g, GRUB_VGA_IO_PALLETTE_DATA);
   grub_outb (b, GRUB_VGA_IO_PALLETTE_DATA);

From a29051ec7fcf61a5b55723ebcbfd5190eb4cd7cf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 21 Jun 2010 02:08:19 +0200
Subject: [PATCH 1153/1628] Handle double redraw

---
 commands/videotest.c | 172 ++++++++++++++++++++++---------------------
 1 file changed, 89 insertions(+), 83 deletions(-)

diff --git a/commands/videotest.c b/commands/videotest.c
index 390811a71..f6a786e79 100644
--- a/commands/videotest.c
+++ b/commands/videotest.c
@@ -38,15 +38,8 @@ grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),
   unsigned int width;
   unsigned int height;
   int i;
-  grub_font_t sansbig;
-  grub_font_t sans;
-  grub_font_t sanssmall;
-  grub_font_t fixed;
-  struct grub_font_glyph *glyph;
   struct grub_video_render_target *text_layer;
   grub_video_color_t palette[16];
-  const char *str;
-  int texty;
 
   err = grub_video_set_mode ("auto", GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
   if (err)
@@ -54,102 +47,115 @@ grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),
 
   grub_video_get_viewport (&x, &y, &width, &height);
 
-  grub_video_create_render_target (&text_layer, width, height,
-                                   GRUB_VIDEO_MODE_TYPE_RGB
-                                   | GRUB_VIDEO_MODE_TYPE_ALPHA);
+  {
+    const char *str;
+    int texty;
+    grub_font_t sansbig;
+    grub_font_t sans;
+    grub_font_t sanssmall;
+    grub_font_t fixed;
+    struct grub_font_glyph *glyph;
 
-  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
+    grub_video_create_render_target (&text_layer, width, height,
+				     GRUB_VIDEO_MODE_TYPE_RGB
+				     | GRUB_VIDEO_MODE_TYPE_ALPHA);
 
-  color = grub_video_map_rgb (0, 0, 0);
-  grub_video_fill_rect (color, 0, 0, width, height);
+    grub_video_set_active_render_target (text_layer);
 
-  color = grub_video_map_rgb (255, 0, 0);
-  grub_video_fill_rect (color, 0, 0, 100, 100);
+    color = grub_video_map_rgb (0, 255, 255);
+    sansbig = grub_font_get ("Unknown Regular 16");
+    sans = grub_font_get ("Unknown Regular 16");
+    sanssmall = grub_font_get ("Unknown Regular 16");
+    fixed = grub_font_get ("Fixed 20");
+    if (! sansbig || ! sans || ! sanssmall || ! fixed)
+      return grub_error (GRUB_ERR_BAD_FONT, "no font loaded");
 
-  color = grub_video_map_rgb (0, 255, 255);
-  grub_video_fill_rect (color, 100, 100, 100, 100);
+    glyph = grub_font_get_glyph (fixed, '*');
+    grub_font_draw_glyph (glyph, color, 200 ,0);
 
-  sansbig = grub_font_get ("Unknown Regular 16");
-  sans = grub_font_get ("Unknown Regular 16");
-  sanssmall = grub_font_get ("Unknown Regular 16");
-  fixed = grub_font_get ("Fixed 20");
-  if (! sansbig || ! sans || ! sanssmall || ! fixed)
-    return grub_error (GRUB_ERR_BAD_FONT, "no font loaded");
+    color = grub_video_map_rgb (255, 255, 255);
 
-  glyph = grub_font_get_glyph (fixed, '*');
-  grub_font_draw_glyph (glyph, color, 200 ,0);
+    texty = 32;
+    grub_font_draw_string ("The quick brown fox jumped over the lazy dog.",
+			   sans, color, 16, texty);
+    texty += grub_font_get_descent (sans) + grub_font_get_leading (sans);
 
-  grub_video_set_viewport (x + 150, y + 150,
-                           width - 150 * 2, height - 150 * 2);
-  color = grub_video_map_rgb (77, 33, 77);
-  grub_video_fill_rect (color, 0, 0, width, height);
+    texty += grub_font_get_ascent (fixed);
+    grub_font_draw_string ("The quick brown fox jumped over the lazy dog.",
+			   fixed, color, 16, texty);
+    texty += grub_font_get_descent (fixed) + grub_font_get_leading (fixed);
 
-  grub_video_set_active_render_target (text_layer);
-
-  color = grub_video_map_rgb (255, 255, 255);
-
-  texty = 32;
-  grub_font_draw_string ("The quick brown fox jumped over the lazy dog.",
-                         sans, color, 16, texty);
-  texty += grub_font_get_descent (sans) + grub_font_get_leading (sans);
-
-  texty += grub_font_get_ascent (fixed);
-  grub_font_draw_string ("The quick brown fox jumped over the lazy dog.",
-                         fixed, color, 16, texty);
-  texty += grub_font_get_descent (fixed) + grub_font_get_leading (fixed);
-
-  /* To convert Unicode characters into UTF-8 for this test, the following
-     command is useful:
+    /* To convert Unicode characters into UTF-8 for this test, the following
+       command is useful:
        echo -ne '\x00\x00\x26\x3A' | iconv -f UTF-32BE -t UTF-8 | od -t x1
-     This converts the Unicode character U+263A to UTF-8.  */
+       This converts the Unicode character U+263A to UTF-8.  */
 
-  /* Characters used:
-     Code point  Description                    UTF-8 encoding
-     ----------- ------------------------------ --------------
-     U+263A      unfilled smiley face           E2 98 BA
-     U+00A1      inverted exclamation point     C2 A1
-     U+00A3      British pound currency symbol  C2 A3
-     U+03C4      Greek tau                      CF 84
-     U+00E4      lowercase letter a with umlaut C3 A4
-     U+2124      set 'Z' symbol (integers)      E2 84 A4
-     U+2287      subset symbol                  E2 8A 87
-     U+211D      set 'R' symbol (real numbers)  E2 84 9D  */
+    /* Characters used:
+       Code point  Description                    UTF-8 encoding
+       ----------- ------------------------------ --------------
+       U+263A      unfilled smiley face           E2 98 BA
+       U+00A1      inverted exclamation point     C2 A1
+       U+00A3      British pound currency symbol  C2 A3
+       U+03C4      Greek tau                      CF 84
+       U+00E4      lowercase letter a with umlaut C3 A4
+       U+2124      set 'Z' symbol (integers)      E2 84 A4
+       U+2287      subset symbol                  E2 8A 87
+       U+211D      set 'R' symbol (real numbers)  E2 84 9D  */
 
-  str =
-    "Unicode test: happy\xE2\x98\xBA \xC2\xA3 5.00"
-    " \xC2\xA1\xCF\x84\xC3\xA4u! "
-    " \xE2\x84\xA4\xE2\x8A\x87\xE2\x84\x9D";
-  color = grub_video_map_rgb (128, 128, 255);
+    str =
+      "Unicode test: happy\xE2\x98\xBA \xC2\xA3 5.00"
+      " \xC2\xA1\xCF\x84\xC3\xA4u! "
+      " \xE2\x84\xA4\xE2\x8A\x87\xE2\x84\x9D";
+    color = grub_video_map_rgb (128, 128, 255);
 
-  /* All characters in the string exist in the 'Fixed 20' (10x20) font.  */
-  texty += grub_font_get_ascent(fixed);
-  grub_font_draw_string (str, fixed, color, 16, texty);
-  texty += grub_font_get_descent (fixed) + grub_font_get_leading (fixed);
+    /* All characters in the string exist in the 'Fixed 20' (10x20) font.  */
+    texty += grub_font_get_ascent(fixed);
+    grub_font_draw_string (str, fixed, color, 16, texty);
+    texty += grub_font_get_descent (fixed) + grub_font_get_leading (fixed);
 
-  texty += grub_font_get_ascent(sansbig);
-  grub_font_draw_string (str, sansbig, color, 16, texty);
-  texty += grub_font_get_descent (sansbig) + grub_font_get_leading (sansbig);
+    texty += grub_font_get_ascent(sansbig);
+    grub_font_draw_string (str, sansbig, color, 16, texty);
+    texty += grub_font_get_descent (sansbig) + grub_font_get_leading (sansbig);
 
-  texty += grub_font_get_ascent(sans);
-  grub_font_draw_string (str, sans, color, 16, texty);
-  texty += grub_font_get_descent (sans) + grub_font_get_leading (sans);
+    texty += grub_font_get_ascent(sans);
+    grub_font_draw_string (str, sans, color, 16, texty);
+    texty += grub_font_get_descent (sans) + grub_font_get_leading (sans);
 
-  texty += grub_font_get_ascent(sanssmall);
-  grub_font_draw_string (str, sanssmall, color, 16, texty);
-  texty += (grub_font_get_descent (sanssmall)
-            + grub_font_get_leading (sanssmall));
+    texty += grub_font_get_ascent(sanssmall);
+    grub_font_draw_string (str, sanssmall, color, 16, texty);
+    texty += (grub_font_get_descent (sanssmall)
+	      + grub_font_get_leading (sanssmall));
 
-  glyph = grub_font_get_glyph (fixed, '*');
+    glyph = grub_font_get_glyph (fixed, '*');
 
-  for (i = 0; i < 16; i++)
-    {
-      color = grub_video_map_color (i);
-      palette[i] = color;
-      grub_font_draw_glyph (glyph, color, 16 + i * 16, 220);
-    }
+    for (i = 0; i < 16; i++)
+      {
+	color = grub_video_map_color (i);
+	palette[i] = color;
+	grub_font_draw_glyph (glyph, color, 16 + i * 16, 220);
+      }
+  }
 
   grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
 
+  for (i = 0; i < 2; i++)
+    {
+      color = grub_video_map_rgb (0, 0, 0);
+      grub_video_fill_rect (color, 0, 0, width, height);
+
+      color = grub_video_map_rgb (255, 0, 0);
+      grub_video_fill_rect (color, 0, 0, 100, 100);
+
+      color = grub_video_map_rgb (0, 255, 255);
+      grub_video_fill_rect (color, 100, 100, 100, 100);
+
+      grub_video_set_viewport (x + 150, y + 150,
+			       width - 150 * 2, height - 150 * 2);
+      color = grub_video_map_rgb (77, 33, 77);
+      grub_video_fill_rect (color, 0, 0, width, height);
+      grub_video_swap_buffers ();
+    }
+
   for (i = 0; i < 5; i++)
     {
       color = grub_video_map_rgb (i, 33, 77);

From 5410ebd1f6a44c60220ca630ff34520252930f93 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 21 Jun 2010 02:08:48 +0200
Subject: [PATCH 1154/1628] Don't read outside of VGA screen

---
 term/i386/pc/vga_text.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/term/i386/pc/vga_text.c b/term/i386/pc/vga_text.c
index bfa934a40..717a7576e 100644
--- a/term/i386/pc/vga_text.c
+++ b/term/i386/pc/vga_text.c
@@ -58,9 +58,11 @@ inc_y (void)
   else
     {
       int x, y;
-      for (y = 0; y < ROWS; y++)
+      for (y = 0; y < ROWS - 1; y++)
         for (x = 0; x < COLS; x++)
           screen_write_char (x, y, screen_read_char (x, y + 1));
+      for (x = 0; x < COLS; x++)
+	screen_write_char (x, ROWS - 1, ' ' | (grub_console_cur_color << 8));
     }
 }
 

From 994b0c27ea18c86beacb5b025e8491bbac775070 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 21 Jun 2010 02:23:58 +0200
Subject: [PATCH 1155/1628] Add ChangeLog

---
 ChangeLog | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9fe3fa8b0..5509a9f05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2010-06-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Initialise VGA video on qemu ourselves.
+
+	* boot/i386/qemu/boot.S: Don't call 0xc000.
+	* conf/i386-qemu.rmk (kern/i386/qemu/init.c_DEPENDENCIES): New variable.
+	(kernel_img_SOURCES): Add kern/i386/qemu/init.c and bus/pci.c.
+	(kernel_img_HEADERS): Add pci.h.
+	* conf/i386.rmk (pkglib_MODULES) [qemu]: Remove pci.mod.
+	* configure.ac: Force unifont on qemu and yeeloong.
+	* include/grub/i386/qemu/kernel.h (grub_qemu_init_cirrus): New proto.
+	(grub_vga_palette_write): Use correct register.
+	* kern/i386/coreboot/init.c (grub_machine_init) [GRUB_MACHINE_QEMU]:
+	Call grub_qemu_init_cirrus.
+	* kern/i386/qemu/init.c: New file.
+	* term/i386/pc/vga_text.c (inc_y): Never read outside the screen.
+
+	* commands/videotest.c (grub_cmd_videotest): Handle double buffering.
+
 2010-06-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Support >3GiB and <16MiB RAM in i386-qemu.

From 14d3f08e70aa24328d26f8caea594f2e2fe7536a Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Mon, 21 Jun 2010 20:34:30 +0530
Subject: [PATCH 1156/1628] 	Fix parallel build.

	* conf/common.rmk: Add grub_script.tab.h as a grub-script-check
	dependency.
	* script/parser.y: #include grub_script.tab.h header.
---
 ChangeLog       | 8 ++++++++
 conf/common.rmk | 1 +
 script/parser.y | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9fe3fa8b0..477ccbbae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-21  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	Fix parallel build.
+
+	* conf/common.rmk: Add grub_script.tab.h as a grub-script-check
+	dependency.
+	* script/parser.y: #include grub_script.tab.h header.
+
 2010-06-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Support >3GiB and <16MiB RAM in i386-qemu.
diff --git a/conf/common.rmk b/conf/common.rmk
index bf73c2d59..0f67622b5 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -95,6 +95,7 @@ grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c
 	kern/misc.c kern/env.c grub_script.tab.c \
 	grub_script.yy.c
 grub_script_check_CFLAGS = $(GNULIB_UTIL_CFLAGS)
+grub_script_check_DEPENDENCIES = grub_script.tab.h
 MOSTLYCLEANFILES += symlist.c kernel_syms.lst
 DEFSYMFILES += kernel_syms.lst
 
diff --git a/script/parser.y b/script/parser.y
index b5815ea8d..e85ba624d 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -26,6 +26,7 @@
 #define YYLTYPE_IS_TRIVIAL      0
 #define YYENABLE_NLS    0
 
+#include "grub_script.tab.h"
 %}
 
 %union {
@@ -126,6 +127,7 @@ word: GRUB_PARSER_TOKEN_NAME { $$ = grub_script_add_arglist (state, 0, $1); }
 statement: command   { $$ = $1; }
          | function  { $$ = 0;  }
          | menuentry { $$ = $1; }
+;
 
 argument : "case"      { $$ = grub_script_add_arglist (state, 0, $1); }
          | "do"        { $$ = grub_script_add_arglist (state, 0, $1); }

From d6e98a17d78f44a8cbbb923bd0efe947791059ed Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 21 Jun 2010 17:59:51 +0100
Subject: [PATCH 1157/1628] * kern/efi/mm.c (grub_efi_mm_init): Handle systems
 with memory maps larger than MEMORY_MAP_SIZE.

---
 ChangeLog     |  5 +++++
 kern/efi/mm.c | 23 ++++++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 477ccbbae..94fa54713 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-21  Colin Watson  <cjwatson@ubuntu.com>
+
+	* kern/efi/mm.c (grub_efi_mm_init): Handle systems with memory maps
+	larger than MEMORY_MAP_SIZE.
+
 2010-06-21  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Fix parallel build.
diff --git a/kern/efi/mm.c b/kern/efi/mm.c
index ceb8fc9ba..2abd6325d 100644
--- a/kern/efi/mm.c
+++ b/kern/efi/mm.c
@@ -346,6 +346,7 @@ grub_efi_mm_init (void)
   grub_efi_uintn_t desc_size;
   grub_efi_uint64_t total_pages;
   grub_efi_uint64_t required_pages;
+  int mm_status;
 
   /* First of all, allocate pages to maintain allocations.  */
   allocated_pages
@@ -361,16 +362,32 @@ grub_efi_mm_init (void)
   if (! memory_map)
     grub_fatal ("cannot allocate memory");
 
-  filtered_memory_map = NEXT_MEMORY_DESCRIPTOR (memory_map, MEMORY_MAP_SIZE);
-
   /* Obtain descriptors for available memory.  */
   map_size = MEMORY_MAP_SIZE;
 
-  if (grub_efi_get_memory_map (&map_size, memory_map, 0, &desc_size, 0) < 0)
+  mm_status = grub_efi_get_memory_map (&map_size, memory_map, 0, &desc_size, 0);
+
+  if (mm_status == 0)
+    {
+      grub_efi_free_pages
+	((grub_efi_physical_address_t) ((grub_addr_t) memory_map),
+	 2 * BYTES_TO_PAGES (MEMORY_MAP_SIZE));
+
+      memory_map = grub_efi_allocate_pages (0, 2 * BYTES_TO_PAGES (map_size));
+      if (! memory_map)
+	grub_fatal ("cannot allocate memory");
+
+      mm_status = grub_efi_get_memory_map (&map_size, memory_map, 0,
+					   &desc_size, 0);
+    }
+
+  if (mm_status < 0)
     grub_fatal ("cannot get memory map");
 
   memory_map_end = NEXT_MEMORY_DESCRIPTOR (memory_map, map_size);
 
+  filtered_memory_map = memory_map_end;
+
   filtered_memory_map_end = filter_memory_map (memory_map, filtered_memory_map,
 					       desc_size, memory_map_end);
 

From 12cd7239d9bdc39b728bd7865f26b7fc7df5478c Mon Sep 17 00:00:00 2001
From: starous <starous@pracovna>
Date: Mon, 21 Jun 2010 21:12:20 +0200
Subject: [PATCH 1158/1628] Faster OHCI, USB hub support, UHCI portstatus corr.

---
 bus/usb/ohci.c          | 962 +++++++++++++++++++++++++++-------------
 bus/usb/uhci.c          |  19 +-
 bus/usb/usb.c           |   2 +-
 bus/usb/usbhub.c        |  90 +++-
 bus/usb/usbtrans.c      |   7 +-
 disk/usbms.c            |  24 +-
 include/grub/usbtrans.h |  12 +-
 7 files changed, 778 insertions(+), 338 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 47cca7ce4..fed82d129 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -46,6 +46,23 @@ struct grub_ohci_hcca
   grub_uint8_t reserved[116];
 } __attribute__((packed));
 
+/* OHCI General Transfer Descriptor */
+struct grub_ohci_td
+{
+  /* Information used to construct the TOKEN packet.  */
+  grub_uint32_t token;
+  grub_uint32_t buffer; /* LittleEndian physical address */
+  grub_uint32_t next_td; /* LittleEndian physical address */
+  grub_uint32_t buffer_end; /* LittleEndian physical address */
+  /* next values are not for OHCI HW */
+  grub_uint32_t prev_td_phys; /* we need it to find previous TD
+                               * physical address in CPU endian */
+  grub_uint32_t link_td; /* pointer to next free/chained TD
+                          * pointer as uint32 */
+  grub_uint32_t tr_index; /* index of TD in transfer */
+  grub_uint8_t pad[4]; /* padding to 32 bytes */
+} __attribute__((packed));
+
 /* OHCI Endpoint Descriptor.  */
 struct grub_ohci_ed
 {
@@ -55,26 +72,33 @@ struct grub_ohci_ed
   grub_uint32_t next_ed;
 } __attribute__((packed));
 
-struct grub_ohci_td
-{
-  /* Information used to construct the TOKEN packet.  */
-  grub_uint32_t token;
-
-  grub_uint32_t buffer;
-  grub_uint32_t next_td;
-  grub_uint32_t buffer_end;
-} __attribute__((packed));
-
 typedef volatile struct grub_ohci_td *grub_ohci_td_t;
 typedef volatile struct grub_ohci_ed *grub_ohci_ed_t;
 
+/* Experimental change of ED/TD allocation */
+/* Little bit similar as in UHCI */
+/* Implementation assumes:
+ *      32-bits architecture - XXX: fix for 64-bits
+ *      memory allocated by grub_memalign_dma32 must be continuous
+ *      in virtual and also in physical memory */
 struct grub_ohci
 {
   volatile grub_uint32_t *iobase;
   volatile struct grub_ohci_hcca *hcca;
   grub_uint32_t hcca_addr;
   struct grub_pci_dma_chunk *hcca_chunk;
+  grub_ohci_ed_t ed_ctrl; /* EDs for CONTROL */
+  grub_uint32_t ed_ctrl_addr;
+  struct grub_pci_dma_chunk *ed_ctrl_chunk;
+  grub_ohci_ed_t ed_bulk; /* EDs for BULK */
+  grub_uint32_t ed_bulk_addr;
+  struct grub_pci_dma_chunk *ed_bulk_chunk;
+  grub_ohci_td_t td; /* TDs */
+  grub_uint32_t td_addr;
+  struct grub_pci_dma_chunk *td_chunk;
   struct grub_ohci *next;
+  grub_ohci_td_t td_free; /* Pointer to first free TD */
+  int bad_OHCI;
 };
 
 static struct grub_ohci *ohci;
@@ -121,6 +145,34 @@ typedef enum
 #define GRUB_OHCI_SET_PORT_RESET (1 << 4)
 #define GRUB_OHCI_SET_PORT_RESET_STATUS_CHANGE (1 << 20)
 
+#define GRUB_OHCI_REG_CONTROL_BULK_ENABLE (1 << 5)
+#define GRUB_OHCI_REG_CONTROL_CONTROL_ENABLE (1 << 4)
+
+#define GRUB_OHCI_CTRL_EDS 16
+#define GRUB_OHCI_BULK_EDS 16
+#define GRUB_OHCI_TDS 256
+
+#define GRUB_OHCI_ED_ADDR_MASK 0x7ff
+
+#define GRUB_OHCI_ED_PHYS2VIRT(o, bulk, x) ( !(x) ? NULL : ( \
+  (bulk) ? \
+  (grub_ohci_ed_t)((x) - (o)->ed_bulk_addr + (grub_uint32_t)(o)->ed_bulk) \
+  : \
+  (grub_ohci_ed_t)((x) - (o)->ed_ctrl_addr + (grub_uint32_t)(o)->ed_ctrl) ) )
+  
+#define GRUB_OHCI_ED_VIRT2PHYS(o, bulk, x) ( !(x) ? 0 : ( \
+  (bulk) ? \
+  ((grub_uint32_t)(x) - (grub_uint32_t)(o)->ed_bulk + (o)->ed_bulk_addr) \
+  : \
+  ((grub_uint32_t)(x) - (grub_uint32_t)(o)->ed_ctrl + (o)->ed_ctrl_addr) ) )
+
+#define GRUB_OHCI_TD_PHYS2VIRT(o, x) ( !(x) ? NULL : \
+  (grub_ohci_td_t)((x) - (o)->td_addr + (grub_uint32_t)(o)->td) )
+
+#define GRUB_OHCI_TD_VIRT2PHYS(o, x) ( !(x) ? 0 : \
+  ((grub_uint32_t)(x) - (grub_uint32_t)(o)->td + (o)->td_addr) )
+
+  
 static grub_uint32_t
 grub_ohci_readreg32 (struct grub_ohci *o, grub_ohci_reg_t reg)
 {
@@ -148,7 +200,8 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   struct grub_ohci *o;
   grub_uint32_t revision;
   int cs5536;
-
+  int j;
+  
   /* Determine IO base address.  */
   grub_dprintf ("ohci", "pciid = %x\n", pciid);
 
@@ -204,7 +257,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   o = grub_malloc (sizeof (*o));
   if (! o)
     return 1;
-
+  grub_memset ((void*)o, 0, sizeof (*o));
   o->iobase = grub_pci_device_map_range (dev, base, 0x800);
 
   grub_dprintf ("ohci", "base=%p\n", o->iobase);
@@ -212,9 +265,57 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   /* Reserve memory for the HCCA.  */
   o->hcca_chunk = grub_memalign_dma32 (256, 256);
   if (! o->hcca_chunk)
-    return 1;
+    goto fail;
   o->hcca = grub_dma_get_virt (o->hcca_chunk);
   o->hcca_addr = grub_dma_get_phys (o->hcca_chunk);
+  grub_memset ((void*)o->hcca, 0, sizeof(*o->hcca));
+  grub_dprintf ("ohci", "hcca: chunk=%p, virt=%p, phys=0x%02x\n",
+                o->hcca_chunk, o->hcca, o->hcca_addr);
+
+  /* Reserve memory for ctrl EDs.  */
+  o->ed_ctrl_chunk = grub_memalign_dma32 (16, sizeof(struct grub_ohci_ed)*GRUB_OHCI_CTRL_EDS);
+  if (! o->ed_ctrl_chunk)
+    goto fail;
+  o->ed_ctrl = grub_dma_get_virt (o->ed_ctrl_chunk);
+  o->ed_ctrl_addr = grub_dma_get_phys (o->ed_ctrl_chunk);
+  /* Preset EDs */
+  grub_memset ((void*)o->ed_ctrl, 0, sizeof(struct grub_ohci_ed) * GRUB_OHCI_CTRL_EDS);
+  for (j=0; j < GRUB_OHCI_CTRL_EDS; j++)
+    o->ed_ctrl[j].target = grub_cpu_to_le32 (1 << 14); /* skip */
+    
+  grub_dprintf ("ohci", "EDs-C: chunk=%p, virt=%p, phys=0x%02x\n",
+                o->ed_ctrl_chunk, o->ed_ctrl, o->ed_ctrl_addr);
+
+  /* Reserve memory for bulk EDs.  */
+  o->ed_bulk_chunk = grub_memalign_dma32 (16, sizeof(struct grub_ohci_ed)*GRUB_OHCI_BULK_EDS);
+  if (! o->ed_bulk_chunk)
+    goto fail;
+  o->ed_bulk = grub_dma_get_virt (o->ed_bulk_chunk);
+  o->ed_bulk_addr = grub_dma_get_phys (o->ed_bulk_chunk);
+  /* Preset EDs */
+  grub_memset ((void*)o->ed_bulk, 0, sizeof(struct grub_ohci_ed) * GRUB_OHCI_BULK_EDS);
+  for (j=0; j < GRUB_OHCI_BULK_EDS; j++)
+    o->ed_bulk[j].target = grub_cpu_to_le32 (1 << 14); /* skip */
+
+  grub_dprintf ("ohci", "EDs-B: chunk=%p, virt=%p, phys=0x%02x\n",
+                o->ed_bulk_chunk, o->ed_bulk, o->ed_bulk_addr);
+
+  /* Reserve memory for TDs.  */
+  o->td_chunk = grub_memalign_dma32 (32, sizeof(struct grub_ohci_td)*GRUB_OHCI_TDS);
+  /* Why is it aligned on 32 boundary if spec. says 16 ?
+   * We have structure 32 bytes long and we don't want cross
+   * 4K boundary inside structure. */
+  if (! o->td_chunk)
+    goto fail;
+  o->td_free = o->td = grub_dma_get_virt (o->td_chunk);
+  o->td_addr = grub_dma_get_phys (o->td_chunk);
+  /* Preset free TDs chain in TDs */
+  grub_memset ((void*)o->td, 0, sizeof(struct grub_ohci_td) * GRUB_OHCI_TDS);
+  for (j=0; j < (GRUB_OHCI_TDS-1); j++)
+    o->td[j].link_td = (grub_uint32_t)&o->td[j+1];
+
+  grub_dprintf ("ohci", "TDs: chunk=%p, virt=%p, phys=0x%02x\n",
+                o->td_chunk, o->td, o->td_addr);
 
   /* Check if the OHCI revision is actually 1.0 as supported.  */
   revision = grub_ohci_readreg32 (o, GRUB_OHCI_REG_REVISION);
@@ -286,9 +387,13 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   /* Misc. pre-sets. */
   o->hcca->donehead = 0;
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, 0x7f); /* Clears everything */
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, 0);
+  /* We don't want modify CONTROL/BULK HEAD registers.
+   * So we assign to HEAD registers zero ED from related array
+   * and we will not use this ED, it will be always skipped.
+   * It should not produce notable performance penalty (I hope). */
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, o->ed_ctrl_addr);
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLCURR, 0);
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, 0);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, o->ed_bulk_addr);
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKCURR, 0);
 
   /* Check OHCI Legacy Support */
@@ -302,9 +407,11 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
       grub_dprintf ("ohci", "OHCI Legacy Support disabled.\n");
     }
 
-  /* Enable the OHCI.  */
+  /* Enable the OHCI + enable CONTROL and BULK LIST.  */
   grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL,
-			(2 << 6));
+			(2 << 6)
+			| GRUB_OHCI_REG_CONTROL_CONTROL_ENABLE
+			| GRUB_OHCI_REG_CONTROL_BULK_ENABLE );
   grub_dprintf ("ohci", "OHCI enable: 0x%02x\n",
 		(grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL) >> 6) & 3);
 
@@ -339,10 +446,13 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
 
  fail:
   if (o)
+    grub_dma_free (o->td_chunk);
+    grub_dma_free (o->ed_bulk_chunk);
+    grub_dma_free (o->ed_ctrl_chunk);
     grub_dma_free (o->hcca_chunk);
   grub_free (o);
 
-  return 0;
+  return 1;
 }
 
 
@@ -370,6 +480,114 @@ grub_ohci_iterate (int (*hook) (grub_usb_controller_t dev))
   return 0;
 }
 
+static grub_ohci_ed_t
+grub_ohci_find_ed (struct grub_ohci *o, int bulk, grub_uint32_t target)
+{
+  grub_ohci_ed_t ed, ed_next;
+  grub_uint32_t target_addr = target & GRUB_OHCI_ED_ADDR_MASK;
+  int count;
+  int i;
+
+  /* Use proper values and structures. */
+  if (bulk)
+    {    
+      count = GRUB_OHCI_BULK_EDS;
+      ed = o->ed_bulk;
+      ed_next = GRUB_OHCI_ED_PHYS2VIRT(o, bulk,
+                  grub_le_to_cpu32 (ed->next_ed) );
+    }
+  else
+    {
+      count = GRUB_OHCI_CTRL_EDS;
+      ed = o->ed_ctrl;
+      ed_next = GRUB_OHCI_ED_PHYS2VIRT(o, bulk,
+                  grub_le_to_cpu32 (ed->next_ed) );
+    }
+
+   /* First try to find existing ED with proper target address */
+  for (i = 0; ; )
+    {
+      if (i && /* We ignore zero ED */
+           ((ed->target & GRUB_OHCI_ED_ADDR_MASK) == target_addr))
+        return ed; /* Found proper existing ED */
+      i++;
+      if (ed_next && (i < count))
+        {
+          ed = ed_next;
+          ed_next = GRUB_OHCI_ED_PHYS2VIRT(o, bulk,
+                      grub_le_to_cpu32 (ed->next_ed) );
+          continue;
+        }
+      break;
+    }
+  /* ED with target_addr does not exist, we have to add it */
+  /* Have we any free ED in array ? */
+  if (i >= count) /* No. */
+    return NULL;
+  /* Currently we simply take next ED in array, no allocation
+   * function is used. It should be no problem until hot-plugging
+   * will be implemented, i.e. until we will need to de-allocate EDs
+   * of unplugged devices. */
+  /* We can link new ED to previous ED safely as the new ED should
+   * still have set skip bit. */
+  ed->next_ed = grub_cpu_to_le32 ( GRUB_OHCI_ED_VIRT2PHYS (o,
+                                     bulk, &ed[1]));
+  return &ed[1];
+}
+
+static grub_ohci_td_t
+grub_ohci_alloc_td (struct grub_ohci *o)
+{
+  grub_ohci_td_t ret;
+
+  /* Check if there is a Transfer Descriptor available.  */
+  if (! o->td_free)
+    return NULL;
+
+  ret = o->td_free; /* Take current free TD */
+  o->td_free = (grub_ohci_td_t)ret->link_td; /* Advance to next free TD in chain */
+  ret->link_td = 0; /* Reset link_td in allocated TD */
+  return ret;
+}
+
+static void
+grub_ohci_free_td (struct grub_ohci *o, grub_ohci_td_t td)
+{
+  grub_memset ( (void*)td, 0, sizeof(struct grub_ohci_td) ); 
+  td->link_td = (grub_uint32_t) o->td_free; /* Cahin new free TD & rest */
+  o->td_free = td; /* Change address of first free TD */
+}
+
+static void
+grub_ohci_free_tds (struct grub_ohci *o, grub_ohci_td_t td)
+{
+  if (!td)
+    return;
+    
+  /* Unchain first TD from previous TD if it is chained */
+  if (td->prev_td_phys)
+    {
+      grub_ohci_td_t td_prev_virt = GRUB_OHCI_TD_PHYS2VIRT(o,
+                                      td->prev_td_phys);
+
+      if (td == (grub_ohci_td_t) td_prev_virt->link_td)
+        td_prev_virt->link_td = 0;
+    }
+  
+  /* Free all TDs from td  (chained by link_td) */
+  while (td)
+    {
+      grub_ohci_td_t tdprev;
+      
+      /* Unlink the queue.  */
+      tdprev = td;
+      td = (grub_ohci_td_t) td->link_td;
+
+      /* Free the TD.  */
+      grub_ohci_free_td (o, tdprev);
+    }
+}
+
 static void
 grub_ohci_transaction (grub_ohci_td_t td,
 		       grub_transfer_type_t type, unsigned int toggle,
@@ -398,12 +616,7 @@ grub_ohci_transaction (grub_ohci_td_t td,
       break;
     }
 
-#if 0 /* Always generate interrupt */
-  /* Generate no interrupts.  */
-  token |= 7 << 21;
-#endif
-
-  /* Set the token.  */
+  /* Set the token (Always generate interrupt - bits 21-23 = 0).  */
   token |= toggle << 24;
   token |= 1 << 25;
 
@@ -437,174 +650,180 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 		    grub_usb_transfer_t transfer)
 {
   struct grub_ohci *o = (struct grub_ohci *) dev->data;
-  grub_ohci_ed_t ed;
-  grub_uint32_t ed_addr;
-  struct grub_pci_dma_chunk *ed_chunk, *td_list_chunk;
-  grub_ohci_td_t td_list;
-  grub_uint32_t td_list_addr;
+  grub_ohci_ed_t ed_virt;
+  int bulk = 0;
+  grub_ohci_td_t td_head_virt;
+  grub_ohci_td_t td_current_virt;
+  grub_ohci_td_t td_next_virt;
+  grub_ohci_td_t tderr_virt = NULL;
   grub_uint32_t target;
-  grub_uint32_t td_tail;
-  grub_uint32_t td_head;
+  grub_uint32_t td_head_phys;
+  grub_uint32_t td_tail_phys;
+  grub_uint32_t td_last_phys;
+  grub_uint32_t tderr_phys = 0;
   grub_uint32_t status;
   grub_uint32_t control;
-  grub_usb_err_t err;
+  grub_uint8_t errcode = 0;
+  grub_usb_err_t err = GRUB_USB_ERR_NONE;
   int i;
   grub_uint64_t maxtime;
+  grub_uint64_t bad_OHCI_delay = 0;
+  int err_halt = 0;
   int err_timeout = 0;
   int err_unrec = 0;
   grub_uint32_t intstatus;
-  grub_uint32_t tderr_addr = 0;
-
-  /* Allocate an Endpoint Descriptor.  */
-  ed_chunk = grub_memalign_dma32 (256, sizeof (*ed));
-  if (! ed_chunk)
-    return GRUB_USB_ERR_INTERNAL;
-  ed = grub_dma_get_virt (ed_chunk);
-  ed_addr = grub_dma_get_phys (ed_chunk);
-
-  td_list_chunk = grub_memalign_dma32 (256, sizeof (*td_list)
-				       * (transfer->transcnt + 1));
-  if (! td_list_chunk)
-    {
-      grub_dma_free (ed_chunk);
-      return GRUB_USB_ERR_INTERNAL;
-    }
-  td_list = grub_dma_get_virt (td_list_chunk);
-  td_list_addr = grub_dma_get_phys (td_list_chunk);
-
-  grub_dprintf ("ohci", "alloc=%p/0x%x\n", td_list, td_list_addr);
-
-  /* Setup all Transfer Descriptors.  */
-  for (i = 0; i < transfer->transcnt; i++)
-    {
-      grub_usb_transaction_t tr = &transfer->transactions[i];
-
-      grub_ohci_transaction (&td_list[i], tr->pid, tr->toggle,
-			     tr->size, tr->data);
-
-      td_list[i].next_td = grub_cpu_to_le32 (td_list_addr
-					     + (i + 1) * sizeof (td_list[0]));
-    }
-
-#if 0 /* Better will be enable interrupt on all TDs. */
-  /* The last-1 TD token we should change to enable interrupt when TD finishes.
-   * As OHCI interrupts are disabled, it does only setting of WDH bit in
-   * HcInterruptStatus register - and that is what we want to safely detect
-   * normal end of all transactions. */
-  td_list[transfer->transcnt - 1].token &= ~(7 << 21);
-#endif
-
-  td_list[transfer->transcnt].token = 0;
-  td_list[transfer->transcnt].buffer = 0;
-  td_list[transfer->transcnt].buffer_end = 0;
-  td_list[transfer->transcnt].next_td =
-    (grub_uint32_t) &td_list[transfer->transcnt];
-  
-  /* Setup the Endpoint Descriptor.  */
 
+  /* Pre-set target for ED - we need it to find proper ED */
   /* Set the device address.  */
   target = transfer->devaddr;
-
   /* Set the endpoint. It should be masked, we need 4 bits only. */
   target |= (transfer->endpoint & 15) << 7;
-
   /* Set the device speed.  */
   target |= (transfer->dev->speed == GRUB_USB_SPEED_LOW) << 13;
-
   /* Set the maximum packet size.  */
   target |= transfer->max << 16;
 
-  td_head = td_list_addr;
+  /* Determine if transfer type is bulk - we need to select proper ED */
+  switch (transfer->type)
+    {
+      case GRUB_USB_TRANSACTION_TYPE_BULK:
+        bulk = 1;
+	break;
 
-  td_tail = td_list_addr + transfer->transcnt * sizeof (*td_list);
+      case GRUB_USB_TRANSACTION_TYPE_CONTROL:
+        break;
 
-  ed->target = grub_cpu_to_le32 (target);
-  ed->td_head = grub_cpu_to_le32 (td_head);
-  ed->td_tail = grub_cpu_to_le32 (td_tail);
-  ed->next_ed = grub_cpu_to_le32 (0);
+      default :
+        return GRUB_USB_ERR_INTERNAL;
+    }
+
+  /* Find proper ED or add new ED */
+  ed_virt = grub_ohci_find_ed (o, bulk, target);
+  if (!ed_virt)
+    {
+      grub_dprintf ("ohci","Fatal: No free ED !\n");
+      return GRUB_USB_ERR_INTERNAL;
+    }
+  
+  /* Take pointer to first TD from ED */
+  td_head_phys = grub_le_to_cpu32 (ed_virt->td_head) & ~0xf;
+  td_tail_phys = grub_le_to_cpu32 (ed_virt->td_tail) & ~0xf;
+
+  /* Sanity check - td_head should be equal to td_tail */
+  if (td_head_phys != td_tail_phys) /* Should never happen ! */
+    {
+      grub_dprintf ("ohci", "Fatal: HEAD is not equal to TAIL !\n");
+      grub_dprintf ("ohci", "HEAD = 0x%02x, TAIL = 0x%02x\n",
+                    td_head_phys, td_tail_phys);
+      /* XXX: Fix: What to do ? */
+      return GRUB_USB_ERR_INTERNAL;
+    }
+  
+  /* Now we should handle first TD. If ED is newly allocated,
+   * we must allocate the first TD. */
+  if (!td_head_phys)
+    {
+      td_head_virt = grub_ohci_alloc_td (o);
+      if (!td_head_virt)
+        return GRUB_USB_ERR_INTERNAL; /* We don't need de-allocate ED */
+      /* We can set td_head only when ED is not active, i.e.
+       * when it is newly allocated. */
+      ed_virt->td_head = grub_cpu_to_le32 ( GRUB_OHCI_TD_VIRT2PHYS (o,
+                                              td_head_virt) );
+      ed_virt->td_tail = ed_virt->td_head;
+    }
+  else
+    td_head_virt = GRUB_OHCI_TD_PHYS2VIRT ( o, td_head_phys );
+    
+  /* Set TDs */
+  td_last_phys = td_head_phys; /* initial value to make compiler happy... */
+  for (i = 0, td_current_virt = td_head_virt;
+       i < transfer->transcnt; i++)
+    {
+      grub_usb_transaction_t tr = &transfer->transactions[i];
+
+      grub_ohci_transaction (td_current_virt, tr->pid, tr->toggle,
+			     tr->size, tr->data);
+
+      /* Set index of TD in transfer */
+      td_current_virt->tr_index = (grub_uint32_t) i;
+
+      /* No IRQ request in TD if bad_OHCI set */
+      if (o->bad_OHCI)
+        td_current_virt->token |= grub_cpu_to_le32 ( 7 << 21);
+      
+      /* Remember last used (processed) TD phys. addr. */
+      td_last_phys = GRUB_OHCI_TD_VIRT2PHYS (o, td_current_virt);
+      
+      /* Allocate next TD */
+      td_next_virt = grub_ohci_alloc_td (o);
+      if (!td_next_virt) /* No free TD, cancel transfer and free TDs except head TD */
+        {
+          if (i) /* if i==0 we have nothing to free... */
+            grub_ohci_free_tds (o,
+              GRUB_OHCI_TD_PHYS2VIRT(o,
+                grub_le_to_cpu32 (td_head_virt->next_td) ) );
+          /* Reset head TD */
+          grub_memset ( (void*)td_head_virt, 0,
+                        sizeof(struct grub_ohci_td) );
+          grub_dprintf ("ohci", "Fatal: No free TD !");
+          return GRUB_USB_ERR_INTERNAL;
+        }
+
+      /* Chain TDs */
+      td_current_virt->link_td = (grub_uint32_t) td_next_virt;
+      td_current_virt->next_td = grub_cpu_to_le32 (
+                                   GRUB_OHCI_TD_VIRT2PHYS (o,
+                                     td_next_virt) );
+      td_next_virt->prev_td_phys = GRUB_OHCI_TD_VIRT2PHYS (o,
+                                td_current_virt);
+      td_current_virt = td_next_virt;
+    }
+
+  grub_dprintf ("ohci", "Tail TD (not processed) = %p\n",
+                td_current_virt);
+  
+  /* Setup the Endpoint Descriptor for transfer.  */
+  /* First set necessary fields in TARGET but keep (or set) skip bit */
+  /* Note: It could be simpler if speed, format and max. packet
+   * size never change after first allocation of ED.
+   * But unfortunately max. packet size may change during initial
+   * setup sequence and we must handle it. */
+  ed_virt->target = grub_cpu_to_le32 (target | (1 << 14));
+  /* Set td_tail */
+  ed_virt->td_tail = grub_cpu_to_le32 ( GRUB_OHCI_TD_VIRT2PHYS (o,
+                                          td_current_virt) );
+  /* Now reset skip bit */
+  ed_virt->target = grub_cpu_to_le32 (target);
+  /* ed_virt->td_head = grub_cpu_to_le32 (td_head); Must not be changed, it is maintained by OHCI */
+  /* ed_virt->next_ed = grub_cpu_to_le32 (0); Handled by grub_ohci_find_ed, do not change ! */
 
   grub_dprintf ("ohci", "program OHCI\n");
 
-  /* Disable the Control and Bulk lists.  */
-  control = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL);
-  control &= ~(3 << 4);
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, control);
-
-  /* Clear BulkListFilled and ControlListFilled.  */
-  status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS);
-  status &= ~(3 << 1);
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
-
-  /* Now we should wait for start of next frame. Because we are not using
-   * interrupt, we reset SF bit and wait when it goes to 1. */
-  /* SF bit reset. (SF bit indicates Start Of Frame (SOF) packet) */
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1<<2));
-  /* Wait for new SOF */
-  while ((grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS) & 0x4) == 0);
-  /* Now it should be safe to change CONTROL and BULK lists. */
-
-  /* This we do for safety's sake - it should be done in previous call
-   * of grub_ohci_transfer and nobody should change it in meantime...
-   * It should be done before start of control or bulk OHCI list. */   
-  o->hcca->donehead = 0;
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1 << 1)); /* Clears WDH */
-
   /* Program the OHCI to actually transfer.  */
   switch (transfer->type)
     {
     case GRUB_USB_TRANSACTION_TYPE_BULK:
       {
-	grub_dprintf ("ohci", "add to bulk list\n");
-
-	/* Set BulkList Head and Current */
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, ed_addr);
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKCURR, 0);
-
-#define GRUB_OHCI_REG_CONTROL_BULK_ENABLE (1 << 5)
-#define GRUB_OHCI_REG_CONTROL_CONTROL_ENABLE (1 << 4)
-
-	/* Enable the Bulk list.  */
-	control = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL);
-	control |= GRUB_OHCI_REG_CONTROL_BULK_ENABLE;
-	control &= ~GRUB_OHCI_REG_CONTROL_CONTROL_ENABLE;
-
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, control);
-
+	grub_dprintf ("ohci", "BULK list filled\n");
 	/* Set BulkListFilled.  */
-	status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS);
-	status |= 1 << 2;
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
-
+	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, 1 << 2);
+	/* Read back of register should ensure it is really written */
+	grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS);
 	break;
       }
 
     case GRUB_USB_TRANSACTION_TYPE_CONTROL:
       {
-	grub_dprintf ("ohci", "add to control list\n");
-
-	/* Set ControlList Head and Current */
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, ed_addr);
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLCURR, 0);
-
-	/* Enable the Control list.  */
-	control |= GRUB_OHCI_REG_CONTROL_CONTROL_ENABLE;
-	control &= ~GRUB_OHCI_REG_CONTROL_BULK_ENABLE;
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, control);
-
+	grub_dprintf ("ohci", "CONTROL list filled\n");
 	/* Set ControlListFilled.  */
-	status |= 1 << 1;
-	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
+	grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, 1 << 1);
+	/* Read back of register should ensure it is really written */
+	grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS);
 	break;
       }
     }
 
-  grub_dprintf ("ohci", "wait for completion\n");
-  grub_dprintf ("ohci", "begin: control=0x%02x status=0x%02x\n",
-		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL),
-		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS));
-  grub_dprintf ("ohci","intstatus=0x%02x\n",
-		grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS));
-
   /* Safety measure to avoid a hang. */
   maxtime = grub_get_time_ms () + 1000;
 	
@@ -613,19 +832,22 @@ grub_ohci_transfer (grub_usb_controller_t dev,
     {
       /* Check transfer status */
       intstatus = grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS);
-      if ((intstatus & 0x2) != 0)
+      if (!o->bad_OHCI && (intstatus & 0x2) != 0)
         {
-          grub_dprintf ("ohci", "Current HccaDoneHead=0x%08x\n",
-			o->hcca->donehead);
           /* Remember last successful TD */
-          tderr_addr = grub_le_to_cpu32 (o->hcca->donehead) & ~0xf;
+          tderr_phys = grub_le_to_cpu32 (o->hcca->donehead) & ~0xf;
           /* Reset DoneHead */
 	  o->hcca->donehead = 0;
           grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1 << 1));
+          /* Read back of register should ensure it is really written */
+          grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS);
           /* if TD is last, finish */
-          if (tderr_addr == td_list_addr
-	      + sizeof (td_list[0]) * (transfer->transcnt - 1))
-            break;
+          if (tderr_phys == td_last_phys)
+            {
+              if (grub_le_to_cpu32 (ed_virt->td_head) & 1)
+                err_halt = 1;
+              break;
+            }
 	  continue;
         }
 
@@ -636,102 +858,160 @@ grub_ohci_transfer (grub_usb_controller_t dev,
         }
 
       /* Detected a HALT.  */
-      if (grub_le_to_cpu32 (ed->td_head) & 1)
-        break;
+      if (err_halt || (grub_le_to_cpu32 (ed_virt->td_head) & 1))
+        {
+          err_halt = 1;
+          /* ED is halted, but donehead event can happened in the meantime */
+          intstatus = grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS);
+          if (!o->bad_OHCI && (intstatus & 0x2) != 0)
+            /* Don't break loop now, first do donehead action(s) */
+            continue;
+          break;
+        }
 
+      /* bad OHCI handling */
+      if ( (grub_le_to_cpu32 (ed_virt->td_head) & ~0xf) ==
+           (grub_le_to_cpu32 (ed_virt->td_tail) & ~0xf) ) /* Empty ED */
+        {
+          if (o->bad_OHCI) /* Bad OHCI detected previously */
+            {
+              /* Try get last successful TD. */
+              tderr_phys = grub_le_to_cpu32 (o->hcca->donehead) & ~0xf;
+              if (tderr_phys)/* Reset DoneHead if we were successful */
+                {
+                  o->hcca->donehead = 0;
+                  grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1 << 1));
+                  /* Read back of register should ensure it is really written */
+                  grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS);
+                }
+              /* Check the HALT bit */
+              if (grub_le_to_cpu32 (ed_virt->td_head) & 1)
+                err_halt = 1;
+              break;
+            }
+          else /* Detection of bad OHCI */
+            /* We should wait short time (~2ms) before we say that
+             * it is bad OHCI to prevent some hazard -
+             * donehead can react in the meantime. This waiting is done
+             * only once per OHCI driver "live cycle". */
+            if (!bad_OHCI_delay) /* Set delay time */
+              bad_OHCI_delay = grub_get_time_ms () + 2;
+            else if (grub_get_time_ms () >= bad_OHCI_delay)
+              o->bad_OHCI = 1;
+          continue;
+        }
+        
       /* Timeout ? */
       if (grub_get_time_ms () > maxtime)
       	{
-	  /* Disable the Control and Bulk lists.  */
-  	  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL,
-	  grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL) & ~(3 << 4));
       	  err_timeout = 1;
       	  break;
       	}
 
-      if ((ed->td_head & ~0xf) == (ed->td_tail & ~0xf))
-	break;
-
       grub_cpu_idle ();
     }
   while (1);
 
-  grub_dprintf ("ohci", "end: control=0x%02x status=0x%02x\n",
-		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL),
-		grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS));
-  grub_dprintf ("ohci", "intstatus=0x%02x\n",
-		grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS));
+  /* There are many ways how the loop above can finish:
+   * - normally without any error via INTSTATUS WDH bit
+   *   : tderr_phys == td_last_phys, td_head == td_tail
+   * - normally with error via HALT bit in ED TD HEAD
+   *   : td_head = next TD after TD with error
+   *   : tderr_phys = last processed and retired TD with error,
+   *     i.e. should be != 0
+   *   : if bad_OHCI == TRUE, tderr_phys will be probably invalid
+   * - unrecoverable error - I never seen it but it could be
+   *   : err_unrec == TRUE, other values can contain anything...
+   * - timeout, it can be caused by:
+   *  -- bad USB device - some devices have some bugs, see Linux source
+   *     and related links
+   *  -- bad OHCI controller - e.g. lost interrupts or does not set
+   *     proper bits in INTSTATUS when real IRQ not enabled etc.,
+   *     see Linux source and related links
+   *     One known bug is handled - if transfer finished
+   *     successfully (i.e. HEAD==TAIL, last transfer TD is retired,
+   *     HALT bit is not set) and WDH bit is not set in INTSTATUS - in
+   *     this case we set o->bad_OHCI=TRUE and do alternate loop
+   *     and error handling - but there is problem how to find retired
+   *     TD with error code if HALT occurs and if DONEHEAD is not
+   *     working - we need to find TD previous to current ED HEAD
+   *  -- bad code of this driver or some unknown reasons - :-(
+   *     it can be e.g. bad handling of EDs/TDs/toggle bit...
+   */
 
-  if (!tderr_addr)
+  /* Remember target for debug and set skip flag in ED */
+  /* It should be normaly not necessary but we need it at least
+   * in case of timeout */
+  target = grub_le_to_cpu32 ( ed_virt->target );
+  ed_virt->target = grub_cpu_to_le32 (target | (1 << 14));
+  /* Read registers for debug - they should be read now because
+   * debug prints case unwanted delays, so something can happen
+   * in the meantime... */
+  control = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL);
+  status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS);
+  intstatus = grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS);
+  /* Now print debug values - to have full info what happened */
+  grub_dprintf ("ohci", "loop finished: control=0x%02x status=0x%02x\n",
+		control, status);
+  grub_dprintf ("ohci", "intstatus=0x%02x \n\t\t tderr_phys=0x%02x, td_last_phys=0x%02x\n",
+		intstatus, tderr_phys, td_last_phys);
+  grub_dprintf ("ohci", "err_unrec=%d, err_timeout=%d \n\t\t err_halt=%d, bad_OHCI=%d\n",
+		err_unrec, err_timeout, err_halt, o->bad_OHCI);
+  grub_dprintf ("ohci", "TARGET=0x%02x, HEAD=0x%02x, TAIL=0x%02x\n",
+                target,
+                grub_le_to_cpu32 (ed_virt->td_head),
+                grub_le_to_cpu32 (ed_virt->td_tail) );
+
+  if (!err_halt && !err_unrec && !err_timeout) /* normal finish */
     {
-      /* It means that something wrong happened,
-       * it could be:
-       * - timeout and no TD processed
-       * - some or unrecoverable error and no TD processed
-       * - something unexpected... :-( */
-      /* Try look into DONEHEAD reg., but there should be also zero */
-      grub_dprintf("ohci", "HCCA DoneHead is zero, something is bad!\n");
-      tderr_addr = grub_ohci_readreg32 (o, GRUB_OHCI_REG_DONEHEAD) & ~0xf;
+      /* Simple workaround if donehead is not working */
+      if (o->bad_OHCI &&
+           ( !tderr_phys || (tderr_phys != td_last_phys) ) )
+        {
+          grub_dprintf ("ohci", "normal finish, but tderr_phys corrected\n");
+          tderr_phys = td_last_phys;
+          /* I hope we can do it as transfer (most probably) finished OK */
+        }
+      /* Prepare pointer to last processed TD */
+      tderr_virt = GRUB_OHCI_TD_PHYS2VIRT (o, tderr_phys);
+      /* Set index of last processed TD */
+      if (tderr_virt)
+        transfer->last_trans = tderr_virt->tr_index;
+      else
+        transfer->last_trans = -1;
     }
-  
-  /* Remember last processed transaction (TD) - it is necessary for
-   * proper setting of toggle bit in next transaction. */
-  transfer->last_trans = ((tderr_addr - td_list_addr) / sizeof (*td_list));
-  grub_dprintf("ohci", "tderr_addr=0x%x, td_list_addr=0x%x,\n",
-	       tderr_addr, td_list_addr);
 
-  if ((ed->td_head & ~0xf) == (ed->td_tail & ~0xf))
-    transfer->last_trans = transfer->transcnt - 1;
-
-  /* Check correct value in last_trans */
-  /* It could happen if timeout happens and no TD was retired */
-  if (transfer->last_trans >= transfer->transcnt || !tderr_addr)
+  else if (err_halt) /* error, ED is halted by OHCI, i.e. can be modified */
     {
-      grub_dprintf("ohci", "tderr==0 or out of TDs range!\n");
-      grub_dprintf("ohci", "last_trans=%d, transcnt=%d\n",
-		   transfer->last_trans, transfer->transcnt);
+      /* First we must get proper tderr_phys value */
+      if (o->bad_OHCI) /* In case of bad_OHCI tderr_phys can be wrong */
+        {
+          if ( tderr_phys ) /* check if tderr_phys points to TD with error */
+            errcode = grub_le_to_cpu32 ( GRUB_OHCI_TD_PHYS2VIRT (o,
+                                           tderr_phys)->token )
+                      >> 28;
+          if ( !tderr_phys || !errcode ) /* tderr_phys not valid or points to wrong TD */
+            { /* Retired TD with error should be previous TD to ED->td_head */
+              tderr_phys = GRUB_OHCI_TD_PHYS2VIRT (o,
+                             grub_le_to_cpu32 ( ed_virt->td_head) & ~0xf )
+                           ->prev_td_phys;
+            }
+        }
 
-      /* We should set something valid... */
-      transfer->last_trans = -1; /* Probably no TD done */
-      tderr_addr = td_list_addr;
-    }
- 
-  /* In case of timeout do not detect error from TD */    
-  if (err_timeout)
-    {
-      err = GRUB_ERR_TIMEOUT;
-      grub_dprintf("ohci", "Timeout, target=%08x, head=%08x\n",
-		   grub_le_to_cpu32(ed->target),
-		   grub_le_to_cpu32(ed->td_head));
-      grub_dprintf("ohci", "tail=%08x, next=%08x\n",
-		   grub_le_to_cpu32(ed->td_tail),
-		   grub_le_to_cpu32(ed->next_ed));
-    }
-  /* In case of unrecoverable error do not detect error from TD */    
-  else if (err_unrec)
-    {
-      err = GRUB_USB_ERR_UNRECOVERABLE;
-      grub_dprintf("ohci",
-		   "Unrecoverable error, target=%08x, head=%08x\n",
-		   grub_le_to_cpu32(ed->target),
-		   grub_le_to_cpu32(ed->td_head));
-      grub_dprintf("ohci", "tail=%08x, next=%08x\n",
-		   grub_le_to_cpu32(ed->td_tail),
-		   grub_le_to_cpu32(ed->next_ed));
-    }
-  else if (grub_le_to_cpu32 (ed->td_head) & 1)
-    {
-      grub_uint8_t errcode;
-      grub_ohci_td_t tderr = NULL;
-
-      transfer->last_trans--;
-
-      tderr = (grub_ohci_td_t) ((char *) td_list
-				+ (tderr_addr - td_list_addr));
- 
-      errcode = grub_le_to_cpu32 (tderr->token) >> 28;      
-      grub_dprintf ("ohci", "OHCI errcode=0x%02x\n", errcode);
+      /* Prepare pointer to last processed TD and get error code */
+      tderr_virt = GRUB_OHCI_TD_PHYS2VIRT (o, tderr_phys);
+      /* Set index of last processed TD */
+      if (tderr_virt)
+        {
+          errcode = grub_le_to_cpu32 ( tderr_virt->token ) >> 28;
+          transfer->last_trans = tderr_virt->tr_index;
+        }
+      else
+        transfer->last_trans = -1;
 
+      /* Evaluation of error code */
+      grub_dprintf ("ohci", "OHCI tderr_phys=0x%02x, errcode=0x%02x\n",
+                    tderr_phys, errcode);
       switch (errcode)
 	{
 	case 0:
@@ -777,16 +1057,17 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 	  /* XXX: Data overrun error.  */
 	  err = GRUB_USB_ERR_DATA;
 	  grub_dprintf ("ohci", "Overrun, failed TD address: %p, index: %d\n",
-	                tderr, transfer->last_trans);
+	                tderr_virt, tderr_virt->tr_index);
 	  break;
 
 	case 9:
 	  /* XXX: Data underrun error.  */
 	  err = GRUB_USB_ERR_DATA;
 	  grub_dprintf ("ohci", "Underrun, failed TD address: %p, index: %d\n",
-	                tderr, transfer->last_trans);
+	                tderr_virt, tderr_virt->tr_index);
 	  grub_dprintf ("ohci", "Underrun, number of not transferred bytes: %d\n",
-	                1 + grub_le_to_cpu32 (tderr->buffer_end) - grub_le_to_cpu32 (tderr->buffer));
+	                1 + grub_le_to_cpu32 (tderr_virt->buffer_end)
+	                  - grub_le_to_cpu32 (tderr_virt->buffer));
 	  break;
 
 	case 10:
@@ -813,69 +1094,101 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 	  err = GRUB_USB_ERR_NAK;
 	  break;
 	}
+
+      /* Set empty ED - set HEAD = TAIL = last (not processed) TD */
+      ed_virt->td_head = ed_virt->td_tail & ~0xf; 
     }
-  else
-    err = GRUB_USB_ERR_NONE;
+        
+  else if (err_unrec)      
+    {
+      /* Don't try to get error code and last processed TD for proper
+       * toggle bit value - anything can be invalid */
+      err = GRUB_USB_ERR_UNRECOVERABLE;
+      grub_dprintf("ohci", "Unrecoverable error!");
 
-  /* Disable the Control and Bulk lists.  */
-  control = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CONTROL);
-  control &= ~(3 << 4);
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, control);
+      /* Do OHCI reset in case of unrecoverable error - maybe we will need
+       * do more - re-enumerate bus etc. (?) */
 
-  /* Clear BulkListFilled and ControlListFilled.  */
-  status = grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS);
-  status &= ~(3 << 1);
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, status);
-   
-  /* Set ED to be skipped - for safety */
-  ed->target |= grub_cpu_to_le32 (1 << 14);
- 
-  /* Now we should wait for start of next frame.
-   * It is necessary because we will invalidate pointer to ED and it
-   * can be on OHCI active till SOF!
-   * Because we are not using interrupt, we reset SF bit and wait when
-   * it goes to 1. */
-  /* SF bit reset. (SF bit indicates Start Of Frame (SOF) packet) */
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1<<2));
-  /* Wait for new SOF */
-  while (((grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS) & 0x4) == 0)
-         && !err_unrec);
-  /* Now it should be safe to change CONTROL and BULK lists. */
-   
-  /* Important cleaning. */
+      /* Suspend the OHCI by issuing a reset.  */
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, 1); /* XXX: Magic.  */
+      /* Read back of register should ensure it is really written */
+      grub_ohci_readreg32 (o, GRUB_OHCI_REG_CMDSTATUS);
+      grub_millisleep (1);
+      grub_dprintf ("ohci", "Unrecoverable error - OHCI reset\n");
+
+      /* Misc. resets. */
+      ed_virt->td_head = ed_virt->td_tail & ~0xf; /* Set empty ED - set HEAD = TAIL = last (not processed) TD */
+      o->hcca->donehead = 0;
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, 0x7f); /* Clears everything */
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, o->ed_ctrl_addr);
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLCURR, 0);
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, o->ed_bulk_addr);
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKCURR, 0);
+      /* Read back of register should ensure it is really written */
+      grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS);
+
+      /* Enable the OHCI.  */
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL,
+                            (2 << 6)
+                            | GRUB_OHCI_REG_CONTROL_CONTROL_ENABLE
+                            | GRUB_OHCI_REG_CONTROL_BULK_ENABLE );
+    } 
+
+  else if (err_timeout)
+    {
+      /* In case of timeout do not detect error from TD */    
+      err = GRUB_ERR_TIMEOUT;
+      grub_dprintf("ohci", "Timeout !\n");
+
+      /* We should wait for next SOF to be sure that ED is unaccessed
+       * by OHCI */
+      /* SF bit reset. (SF bit indicates Start Of Frame (SOF) packet) */
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1<<2));
+      /* Wait for new SOF */
+      while ((grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS) & 0x4) == 0);
+
+      /* Now we must find last processed TD if bad_OHCI == TRUE */
+      if (o->bad_OHCI)
+        { /* Retired TD with error should be previous TD to ED->td_head */
+          tderr_phys = GRUB_OHCI_TD_PHYS2VIRT (o,
+                         grub_le_to_cpu32 ( ed_virt->td_head) & ~0xf)
+                       ->prev_td_phys;
+        }
+      tderr_virt = GRUB_OHCI_TD_PHYS2VIRT (o, tderr_phys);
+      if (tderr_virt)
+        transfer->last_trans = tderr_virt->tr_index;
+      else
+        transfer->last_trans = -1;
+
+      /* Set empty ED - set HEAD = TAIL = last (not processed) TD */
+      ed_virt->td_head = ed_virt->td_tail & ~0xf; 
+    }
+
+  /* At this point always should be:
+   * ED has skip bit set and halted or empty or after next SOF,
+   *    i.e. it is safe to free all TDs except last not processed
+   * ED HEAD == TAIL == phys. addr. of td_current_virt */
+
+  /* Reset DoneHead - sanity cleanup */
   o->hcca->donehead = 0;
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1 << 1)); /* Clears WDH */
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, 0);
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLCURR, 0);
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, 0);
-  grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKCURR, 0);
+  grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1 << 1));
+  /* Read back of register should ensure it is really written */
+  grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS);
 
- if (err_unrec)
-   {
-     /* Do OHCI reset in case of unrecoverable error - maybe we will need
-      * do more - re-enumerate bus etc. (?) */
+  /* Un-chainig of last TD */
+  if (td_current_virt->prev_td_phys)
+    {
+      grub_ohci_td_t td_prev_virt
+                = GRUB_OHCI_TD_PHYS2VIRT (o, td_current_virt->prev_td_phys);
 
-     /* Suspend the OHCI by issuing a reset.  */
-     grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, 1); /* XXX: Magic.  */
-     grub_millisleep (1);
-     grub_dprintf ("ohci", "Unrecoverable error - OHCI reset\n");
+      td_next_virt = (grub_ohci_td_t) td_prev_virt->link_td;
+      if (td_current_virt == td_next_virt)
+        td_prev_virt->link_td = 0;
+    }
 
-     /* Misc. resets. */
-     o->hcca->donehead = 0;
-     grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, 0x7f); /* Clears everything */
-     grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, 0);
-     grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLCURR, 0);
-     grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, 0);
-     grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKCURR, 0);
-
-     /* Enable the OHCI.  */
-     grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, (2 << 6));
-   } 
-
-  grub_dprintf ("ohci", "OHCI finished, freeing, err=0x%02x\n", err);
-   
-  grub_dma_free (td_list_chunk);
-  grub_dma_free (ed_chunk);
+  grub_dprintf ("ohci", "OHCI finished, freeing, err=0x%02x, errcode=0x%02x\n",
+                err, errcode);
+  grub_ohci_free_tds (o, td_head_virt);
 
   return err;
 }
@@ -952,10 +1265,32 @@ grub_ohci_fini_hw (int noreturn __attribute__ ((unused)))
   for (o = ohci; o; o = o->next)
     {
       int i, nports = grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBA) & 0xff;
+      grub_uint64_t maxtime;
+
+      /* Set skip in all EDs */
+      if (o->ed_bulk)
+        for (i=0; i < GRUB_OHCI_BULK_EDS; i++)
+          o->ed_bulk[i].target |= grub_cpu_to_le32 (1 << 14); /* skip */
+      if (o->ed_ctrl)
+        for (i=0; i < GRUB_OHCI_CTRL_EDS; i++)
+          o->ed_ctrl[i].target |= grub_cpu_to_le32 (1 << 14); /* skip */
+
+      /* We should wait for next SOF to be sure that all EDs are
+       * unaccessed by OHCI. But OHCI can be non-functional, so
+       * more than 1ms timeout have to be applied. */
+      /* SF bit reset. (SF bit indicates Start Of Frame (SOF) packet) */
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, (1<<2));
+      maxtime = grub_get_time_ms () + 2;
+      /* Wait for new SOF or timeout */
+      while ( ((grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS) & 0x4)
+                 == 0) || (grub_get_time_ms () >= maxtime) );
+
       for (i = 0; i < nports; i++)
 	grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + i,
 			      GRUB_OHCI_CLEAR_PORT_ENABLE);
 
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, 1);
+      grub_millisleep (1);
       grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, 0);
       grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, 0);
       grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLCURR, 0);
@@ -963,7 +1298,22 @@ grub_ohci_fini_hw (int noreturn __attribute__ ((unused)))
       grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKCURR, 0);
       grub_ohci_writereg32 (o, GRUB_OHCI_REG_DONEHEAD, 0);
       grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL, 0);
-      grub_ohci_writereg32 (o, GRUB_OHCI_REG_CMDSTATUS, 1);
+      /* Read back of register should ensure it is really written */
+      grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS);
+
+#if 0 /* Is this necessary before booting? Probably not .(?)
+       * But it must be done if module is removed ! (Or not ?)
+       * How to do it ? - Probably grub_ohci_restore_hw should be more
+       * complicated. (?)
+       * (If we do it, we need to reallocate EDs and TDs in function
+       * grub_ohci_restore_hw ! */
+
+      /* Free allocated EDs and TDs */
+      grub_dma_free (o->td_chunk);
+      grub_dma_free (o->ed_bulk_chunk);
+      grub_dma_free (o->ed_ctrl_chunk);
+      grub_dma_free (o->hcca_chunk);
+#endif
     }
   grub_millisleep (10);
 
@@ -976,7 +1326,23 @@ grub_ohci_restore_hw (void)
   struct grub_ohci *o;
 
   for (o = ohci; o; o = o->next)
-    grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, o->hcca_addr);
+    {
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_HCCA, o->hcca_addr);
+      o->hcca->donehead = 0;
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, 0x7f); /* Clears everything */
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, o->ed_ctrl_addr);
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLCURR, 0);
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKHEAD, o->ed_bulk_addr);
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_BULKCURR, 0);
+      /* Read back of register should ensure it is really written */
+      grub_ohci_readreg32 (o, GRUB_OHCI_REG_INTSTATUS);
+
+      /* Enable the OHCI.  */
+      grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROL,
+                            (2 << 6)
+                            | GRUB_OHCI_REG_CONTROL_CONTROL_ENABLE
+                            | GRUB_OHCI_REG_CONTROL_BULK_ENABLE );
+    }
 
   return GRUB_ERR_NONE;
 }
diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index 1510f98e8..e85f07a6f 100644
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -612,8 +612,23 @@ grub_uhci_portstatus (grub_usb_controller_t dev,
   status = grub_uhci_readreg16 (u, reg);
   grub_dprintf ("uhci", "detect=0x%02x\n", status);
 
+  if (!enable) /* We don't need reset port */
+    {
+      /* Disable the port.  */
+      grub_uhci_writereg16 (u, reg, 0 << 2);
+      grub_dprintf ("uhci", "waiting for the port to be disabled\n");
+      endtime = grub_get_time_ms () + 1000;
+      while ((grub_uhci_readreg16 (u, reg) & (1 << 2)))
+        if (grub_get_time_ms () > endtime)
+          return grub_error (GRUB_ERR_IO, "UHCI Timed out");
+
+      status = grub_uhci_readreg16 (u, reg);
+      grub_dprintf ("uhci", ">3detect=0x%02x\n", status);
+      return GRUB_ERR_NONE;
+    }
+    
   /* Reset the port.  */
-  grub_uhci_writereg16 (u, reg, enable << 9);
+  grub_uhci_writereg16 (u, reg, 1 << 9);
 
   /* Wait for the reset to complete.  XXX: How long exactly?  */
   grub_millisleep (50); /* For root hub should be nominaly 50ms */
@@ -623,7 +638,7 @@ grub_uhci_portstatus (grub_usb_controller_t dev,
   grub_millisleep (10);
 
   /* Enable the port.  */
-  grub_uhci_writereg16 (u, reg, enable << 2);
+  grub_uhci_writereg16 (u, reg, 1 << 2);
   grub_millisleep (10);
 
   grub_dprintf ("uhci", "waiting for the port to be enabled\n");
diff --git a/bus/usb/usb.c b/bus/usb/usb.c
index 9a78f2c4a..4f6f9e54c 100644
--- a/bus/usb/usb.c
+++ b/bus/usb/usb.c
@@ -166,7 +166,7 @@ grub_usb_device_initialize (grub_usb_device_t dev)
    * max. size of packet */
   dev->descdev.maxsize0 = 0; /* invalidating, for safety only, can be removed if it is sure it is zero here */
   err = grub_usb_get_descriptor (dev, GRUB_USB_DESCRIPTOR_DEVICE,
-				 0, 8, (char *) &dev->descdev);
+                                 0, 8, (char *) &dev->descdev);
   if (err)
     return err;
 
diff --git a/bus/usb/usbhub.c b/bus/usb/usbhub.c
index 48e3ce592..f50418069 100644
--- a/bus/usb/usbhub.c
+++ b/bus/usb/usbhub.c
@@ -87,14 +87,47 @@ grub_usb_add_hub (grub_usb_device_t dev)
   struct grub_usb_usb_hubdesc hubdesc;
   grub_err_t err;
   int i;
+  grub_uint64_t timeout;
+  grub_usb_device_t next_dev;
+  
+  err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
+	  		            | GRUB_USB_REQTYPE_CLASS
+			            | GRUB_USB_REQTYPE_TARGET_DEV),
+                              GRUB_USB_REQ_GET_DESCRIPTOR,
+			      (GRUB_USB_DESCRIPTOR_HUB << 8) | 0,
+			      0, sizeof (hubdesc), (char *) &hubdesc);
+  if (err)
+    return err;
+  grub_dprintf ("usb", "Hub descriptor:\n\t\t len:%d, typ:0x%02x, cnt:%d, char:0x%02x, pwg:%d, curr:%d\n",
+                hubdesc.length, hubdesc.type, hubdesc.portcnt,
+                hubdesc.characteristics, hubdesc.pwdgood,
+                hubdesc.current);
 
-  grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
-			      | GRUB_USB_REQTYPE_CLASS
-			      | GRUB_USB_REQTYPE_TARGET_DEV),
-			GRUB_USB_REQ_GET_DESCRIPTOR,
-			(GRUB_USB_DESCRIPTOR_HUB << 8) | 0,
-			0, sizeof (hubdesc), (char *) &hubdesc);
+  /* Activate the first configuration. Hubs should have only one conf. */
+  grub_dprintf ("usb", "Hub set configuration\n");
+  grub_usb_set_configuration (dev, 1);
 
+  /* Power on all Hub ports.  */
+  for (i = 1; i <= hubdesc.portcnt; i++)
+    {
+      grub_dprintf ("usb", "Power on - port %d\n", i);
+      /* Power on the port and wait for possible device connect */
+      err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
+					| GRUB_USB_REQTYPE_CLASS
+					| GRUB_USB_REQTYPE_TARGET_OTHER),
+				  GRUB_USB_REQ_SET_FEATURE,
+				  GRUB_USB_HUB_FEATURE_PORT_POWER,
+				  i, 0, NULL);
+      /* Just ignore the device if some error happened */
+      if (err)
+	continue;
+    }
+  /* Wait for port power-on */
+  if (hubdesc.pwdgood >= 50)
+    grub_millisleep (hubdesc.pwdgood * 2);
+  else
+    grub_millisleep (100);
+    
   /* Iterate over the Hub ports.  */
   for (i = 1; i <= hubdesc.portcnt; i++)
     {
@@ -104,14 +137,14 @@ grub_usb_add_hub (grub_usb_device_t dev)
       err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
 					| GRUB_USB_REQTYPE_CLASS
 					| GRUB_USB_REQTYPE_TARGET_OTHER),
-				  GRUB_USB_REQ_HUB_GET_PORT_STATUS,
+				  GRUB_USB_REQ_GET_STATUS,
 				  0, i, sizeof (status), (char *) &status);
-
       /* Just ignore the device if the Hub does not report the
 	 status.  */
       if (err)
 	continue;
-
+      grub_dprintf ("usb", "Hub port %d status: 0x%02x\n", i, status);
+      	    
       /* If connected, reset and enable the port.  */
       if (status & GRUB_USB_HUB_STATUS_CONNECTED)
 	{
@@ -128,21 +161,46 @@ grub_usb_add_hub (grub_usb_device_t dev)
 		speed = GRUB_USB_SPEED_FULL;
 	    }
 
-	  /* A device is actually connected to this port, not enable
-	     the port.  XXX: Why 0x03?  According to some docs it
-	     should be 0x0.  Check the specification!  */
+	  /* A device is actually connected to this port.
+	   * Now do reset of port. */
+          grub_dprintf ("usb", "Reset hub port - port %d\n", i);
 	  err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
 					    | GRUB_USB_REQTYPE_CLASS
 					    | GRUB_USB_REQTYPE_TARGET_OTHER),
-				      0x3, 0x4, i, 0, 0);
-
+				      GRUB_USB_REQ_SET_FEATURE,
+				      GRUB_USB_HUB_FEATURE_PORT_RESET,
+				      i, 0, 0);
 	  /* If the Hub does not cooperate for this port, just skip
 	     the port.  */
 	  if (err)
 	    continue;
 
+          /* Wait for reset procedure done */
+          timeout = grub_get_time_ms () + 1000;
+          do
+            {
+              /* Get the port status.  */
+              err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
+	   	 			        | GRUB_USB_REQTYPE_CLASS
+					        | GRUB_USB_REQTYPE_TARGET_OTHER),
+				          GRUB_USB_REQ_GET_STATUS,
+				          0, i, sizeof (status), (char *) &status);
+            }
+          while (!err &&
+                 !(status & GRUB_USB_HUB_STATUS_C_PORT_RESET) &&
+                 (grub_get_time_ms() < timeout) );
+          if (err || !(status & GRUB_USB_HUB_STATUS_C_PORT_RESET) )
+            continue;
+   
 	  /* Add the device and assign a device address to it.  */
-	  grub_usb_hub_add_dev (&dev->controller, speed);
+          grub_dprintf ("usb", "Call hub_add_dev - port %d\n", i);
+	  next_dev = grub_usb_hub_add_dev (&dev->controller, speed);
+          if (! next_dev)
+            continue;
+
+          /* If the device is a Hub, scan it for more devices.  */
+          if (next_dev->descdev.class == 0x09)
+            grub_usb_add_hub (next_dev);
 	}
     }
 
@@ -156,7 +214,7 @@ attach_root_port (grub_usb_controller_t controller, int portno,
   grub_usb_device_t dev;
   grub_err_t err;
 
-  /* Enable the port.  */
+  /* Disable the port. XXX: Why? */
   err = controller->dev->portstatus (controller, portno, 0);
   if (err)
     return;
diff --git a/bus/usb/usbtrans.c b/bus/usb/usbtrans.c
index e1b9097e6..4a55cab11 100644
--- a/bus/usb/usbtrans.c
+++ b/bus/usb/usbtrans.c
@@ -81,7 +81,7 @@ grub_usb_control_msg (grub_usb_device_t dev,
   else
     max = 64;
 
-  grub_dprintf ("usb", "transfer = %p, dev = %p\n", transfer, dev);
+  grub_dprintf ("usb", "control: transfer = %p, dev = %p\n", transfer, dev);
 
   datablocks = (size + max - 1) / max;
 
@@ -146,6 +146,7 @@ grub_usb_control_msg (grub_usb_device_t dev,
   transfer->transactions[datablocks + 1].toggle = 1;
 
   err = dev->controller.dev->transfer (&dev->controller, transfer);
+  grub_dprintf ("usb", "control: err=%d\n", err);
 
   grub_free (transfer->transactions);
   
@@ -174,6 +175,8 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
   struct grub_pci_dma_chunk *data_chunk;
   grub_size_t size = size0;
 
+  grub_dprintf ("usb", "bulk: size=0x%02x type=%d\n", size, type);
+
   /* FIXME: avoid allocation any kind of buffer in a first place.  */
   data_chunk = grub_memalign_dma32 (128, size);
   if (!data_chunk)
@@ -248,7 +251,7 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
     toggle = transfer->transactions[transfer->last_trans].toggle ? 0 : 1;
   else
     toggle = dev->toggle[endpoint]; /* Nothing done, take original */
-  grub_dprintf ("usb", "toggle=%d\n", toggle);
+  grub_dprintf ("usb", "bulk: err=%d, toggle=%d\n", err, toggle);
   dev->toggle[endpoint] = toggle;
 
   grub_free (transfer->transactions);
diff --git a/disk/usbms.c b/disk/usbms.c
index 5550ff770..654e40c36 100644
--- a/disk/usbms.c
+++ b/disk/usbms.c
@@ -239,7 +239,6 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
   grub_usb_err_t err = GRUB_USB_ERR_NONE;
   grub_usb_err_t errCSW = GRUB_USB_ERR_NONE;
   int retrycnt = 3 + 1;
-  grub_size_t i;
 
  retry:
   retrycnt--;
@@ -293,30 +292,27 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
           goto CheckCSW;
         }
       /* Debug print of received data. */
-      grub_dprintf ("usb", "buf:\n");
-      if (size <= 64)
-        for (i=0; i<size; i++)
-          grub_dprintf ("usb", "0x%02x: 0x%02x\n", i, buf[i]);
-      else
-          grub_dprintf ("usb", "Too much data for debug print...\n");
+      grub_dprintf ("usb", "First 16 bytes of received data:\n %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
+  	buf[ 0], buf[ 1], buf[ 2], buf[ 3],
+  	buf[ 4], buf[ 5], buf[ 6], buf[ 7],
+  	buf[ 8], buf[ 9], buf[10], buf[11],
+  	buf[12], buf[13], buf[14], buf[15]);
     }
   else if (size)
     {
       err = grub_usb_bulk_write (dev->dev, dev->out->endp_addr, size, buf);
       grub_dprintf ("usb", "write: %d %d\n", err, GRUB_USB_ERR_STALL);
-      grub_dprintf ("usb", "buf:\n");
+      grub_dprintf ("usb", "First 16 bytes of sent data:\n %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
+  	buf[ 0], buf[ 1], buf[ 2], buf[ 3],
+  	buf[ 4], buf[ 5], buf[ 6], buf[ 7],
+  	buf[ 8], buf[ 9], buf[10], buf[11],
+  	buf[12], buf[13], buf[14], buf[15]);
       if (err)
         {
           if (err == GRUB_USB_ERR_STALL)
 	    grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
           goto CheckCSW;
         }
-      /* Debug print of sent data. */
-      if (size <= 256)
-        for (i=0; i<size; i++)
-          grub_dprintf ("usb", "0x%02x: 0x%02x\n", i, buf[i]);
-      else
-          grub_dprintf ("usb", "Too much data for debug print...\n");
     }
 
   /* Read the status - (maybe) according to specification.  */
diff --git a/include/grub/usbtrans.h b/include/grub/usbtrans.h
index 40fc0dd5f..8f49c246f 100644
--- a/include/grub/usbtrans.h
+++ b/include/grub/usbtrans.h
@@ -87,15 +87,17 @@ typedef struct grub_usb_transfer *grub_usb_transfer_t;
 #define GRUB_USB_REQ_SET_INTERFACE	0x0B
 #define GRUB_USB_REQ_SYNC_FRAME		0x0C
 
-#define GRUB_USB_REQ_HUB_GET_PORT_STATUS 0x00
-
 #define GRUB_USB_FEATURE_ENDP_HALT	0x00
 #define GRUB_USB_FEATURE_DEV_REMOTE_WU	0x01
 #define GRUB_USB_FEATURE_TEST_MODE	0x02
 
-#define GRUB_USB_HUB_STATUS_CONNECTED	(1 << 0)
-#define GRUB_USB_HUB_STATUS_LOWSPEED	(1 << 9)
-#define GRUB_USB_HUB_STATUS_HIGHSPEED	(1 << 10)
+#define GRUB_USB_HUB_FEATURE_PORT_RESET   0x04
+#define GRUB_USB_HUB_FEATURE_PORT_POWER   0x08
+
+#define GRUB_USB_HUB_STATUS_CONNECTED	 (1 << 0)
+#define GRUB_USB_HUB_STATUS_LOWSPEED	 (1 << 9)
+#define GRUB_USB_HUB_STATUS_HIGHSPEED	 (1 << 10)
+#define GRUB_USB_HUB_STATUS_C_PORT_RESET (1 << 20)
 
 struct grub_usb_packet_setup
 {

From e726542fa37cf6f66a960e15f91a650c76be2bb0 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 23 Jun 2010 09:16:39 +0100
Subject: [PATCH 1159/1628] Sync up other versions of the Linux loader with
 Robert Millan's change of 2010-01-09, "Make loader output a bit more
 user-friendly". * loader/i386/efi/linux.c (grub_linux_boot): Move debug info
 to grub_dprintf(). (grub_cmd_linux): Likewise. (grub_cmd_initrd): Likewise. *
 loader/i386/ieee1275/linux.c (grub_cmd_linux): Likewise. *
 loader/i386/pc/linux.c (grub_cmd_linux): Likewise.

---
 ChangeLog                    | 12 ++++++++++++
 loader/i386/efi/linux.c      | 14 +++++++-------
 loader/i386/ieee1275/linux.c |  4 ++--
 loader/i386/pc/linux.c       |  5 +++--
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 94fa54713..b97f05d19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-06-23  Colin Watson  <cjwatson@ubuntu.com>
+
+	Sync up other versions of the Linux loader with Robert Millan's
+	change of 2010-01-09, "Make loader output a bit more user-friendly".
+
+	* loader/i386/efi/linux.c (grub_linux_boot): Move debug info to
+	grub_dprintf().
+	(grub_cmd_linux): Likewise.
+	(grub_cmd_initrd): Likewise.
+	* loader/i386/ieee1275/linux.c (grub_cmd_linux): Likewise.
+	* loader/i386/pc/linux.c (grub_cmd_linux): Likewise.
+
 2010-06-21  Colin Watson  <cjwatson@ubuntu.com>
 
 	* kern/efi/mm.c (grub_efi_mm_init): Handle systems with memory maps
diff --git a/loader/i386/efi/linux.c b/loader/i386/efi/linux.c
index 4a0eae58b..d37feb983 100644
--- a/loader/i386/efi/linux.c
+++ b/loader/i386/efi/linux.c
@@ -418,9 +418,9 @@ grub_linux_boot (void)
   grub_mmap_iterate (hook);
   params->mmap_size = e820_num;
 
-  grub_printf ("Trampoline at %p. code32=%x, real_mode_mem=%p\n",
-	       ((char *) prot_mode_mem + (prot_mode_pages << 12)),
-	       (unsigned) params->code32_start, real_mode_mem);
+  grub_dprintf ("linux", "Trampoline at %p. code32=%x, real_mode_mem=%p\n",
+		((char *) prot_mode_mem + (prot_mode_pages << 12)),
+		(unsigned) params->code32_start, real_mode_mem);
 
   modevar = grub_env_get ("gfxpayload");
 
@@ -732,8 +732,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   grub_file_seek (file, real_size + GRUB_DISK_SECTOR_SIZE);
 
   /* XXX there is no way to know if the kernel really supports EFI.  */
-  grub_printf ("   [Linux-bzImage, setup=0x%x, size=0x%x]\n",
-	       (unsigned) real_size, (unsigned) prot_size);
+  grub_dprintf ("linux", "bzImage, setup=0x%x, size=0x%x\n",
+		(unsigned) real_size, (unsigned) prot_size);
 
   /* Detect explicitly specified memory size, if any.  */
   linux_mem_size = 0;
@@ -913,8 +913,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
       goto fail;
     }
 
-  grub_printf ("   [Initrd, addr=0x%x, size=0x%x]\n",
-	       (unsigned) addr, (unsigned) size);
+  grub_dprintf ("linux", "Initrd, addr=0x%x, size=0x%x\n",
+		(unsigned) addr, (unsigned) size);
 
   lh->ramdisk_image = addr;
   lh->ramdisk_size = size;
diff --git a/loader/i386/ieee1275/linux.c b/loader/i386/ieee1275/linux.c
index 8780804fd..9f7556ffa 100644
--- a/loader/i386/ieee1275/linux.c
+++ b/loader/i386/ieee1275/linux.c
@@ -205,8 +205,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   real_size = setup_sects << GRUB_DISK_SECTOR_BITS;
   prot_size = grub_file_size (file) - real_size - GRUB_DISK_SECTOR_SIZE;
 
-  grub_printf ("   [Linux-%s, setup=0x%x, size=0x%x]\n",
-               "bzImage", real_size, prot_size);
+  grub_dprintf ("linux", "Linux-%s, setup=0x%x, size=0x%x\n",
+		"bzImage", real_size, prot_size);
 
   grub_file_seek (file, real_size + GRUB_DISK_SECTOR_SIZE);
   if (grub_errno)
diff --git a/loader/i386/pc/linux.c b/loader/i386/pc/linux.c
index 0fa9abc12..04bc66661 100644
--- a/loader/i386/pc/linux.c
+++ b/loader/i386/pc/linux.c
@@ -182,8 +182,9 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
       goto fail;
     }
 
-  grub_printf ("   [Linux-%s, setup=0x%x, size=0x%x]\n",
-	       grub_linux_is_bzimage ? "bzImage" : "zImage", real_size, prot_size);
+  grub_dprintf ("linux", "Linux-%s, setup=0x%x, size=0x%x\n",
+		grub_linux_is_bzimage ? "bzImage" : "zImage",
+		real_size, prot_size);
 
   for (i = 1; i < argc; i++)
     if (grub_memcmp (argv[i], "vga=", 4) == 0)

From e9b29642bd671973c5747a58124b135a29de66ad Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 23 Jun 2010 09:22:03 +0100
Subject: [PATCH 1160/1628] * loader/i386/multiboot_mbi.c
 (retrieve_video_parameters): Set red field position and mask size to red
 fields from mode_info, not green. * loader/multiboot_mbi2.c
 (retrieve_video_parameters): Likewise. Remove redundant
 tag->common.framebuffer_type assignment. Reported by: Seth Goldberg.

---
 ChangeLog                   | 9 +++++++++
 loader/i386/multiboot_mbi.c | 4 ++--
 loader/multiboot_mbi2.c     | 5 ++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b97f05d19..b37f0eff7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-06-23  Colin Watson  <cjwatson@ubuntu.com>
+
+	* loader/i386/multiboot_mbi.c (retrieve_video_parameters): Set red
+	field position and mask size to red fields from mode_info, not
+	green.
+	* loader/multiboot_mbi2.c (retrieve_video_parameters): Likewise.
+	Remove redundant tag->common.framebuffer_type assignment.
+	Reported by: Seth Goldberg.
+
 2010-06-23  Colin Watson  <cjwatson@ubuntu.com>
 
 	Sync up other versions of the Linux loader with Robert Millan's
diff --git a/loader/i386/multiboot_mbi.c b/loader/i386/multiboot_mbi.c
index 3d974f04e..d984e4e4e 100644
--- a/loader/i386/multiboot_mbi.c
+++ b/loader/i386/multiboot_mbi.c
@@ -295,8 +295,8 @@ retrieve_video_parameters (struct multiboot_info *mbi,
   else
     {
       mbi->framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_RGB;
-      mbi->framebuffer_red_field_position = mode_info.green_field_pos;
-      mbi->framebuffer_red_mask_size = mode_info.green_mask_size;
+      mbi->framebuffer_red_field_position = mode_info.red_field_pos;
+      mbi->framebuffer_red_mask_size = mode_info.red_mask_size;
       mbi->framebuffer_green_field_position = mode_info.green_field_pos;
       mbi->framebuffer_green_mask_size = mode_info.green_mask_size;
       mbi->framebuffer_blue_field_position = mode_info.blue_field_pos;
diff --git a/loader/multiboot_mbi2.c b/loader/multiboot_mbi2.c
index c9e52e51f..3ad6a6c4a 100644
--- a/loader/multiboot_mbi2.c
+++ b/loader/multiboot_mbi2.c
@@ -441,9 +441,8 @@ retrieve_video_parameters (grub_uint8_t **ptrorig)
   else
     {
       tag->common.framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_RGB;
-      tag->common.framebuffer_type = MULTIBOOT_FRAMEBUFFER_TYPE_RGB;
-      tag->framebuffer_red_field_position = mode_info.green_field_pos;
-      tag->framebuffer_red_mask_size = mode_info.green_mask_size;
+      tag->framebuffer_red_field_position = mode_info.red_field_pos;
+      tag->framebuffer_red_mask_size = mode_info.red_mask_size;
       tag->framebuffer_green_field_position = mode_info.green_field_pos;
       tag->framebuffer_green_mask_size = mode_info.green_mask_size;
       tag->framebuffer_blue_field_position = mode_info.blue_field_pos;

From 3fa06487244de28f6d219be3bd8e040747aaa759 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sat, 26 Jun 2010 10:46:54 +0100
Subject: [PATCH 1161/1628] Make the `source' command slightly faster. *
 normal/main.c (grub_normal_execute): Don't re-read list files when nested.

---
 ChangeLog     |  7 +++++++
 normal/main.c | 12 ++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b37f0eff7..52b37640f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-26  Colin Watson  <cjwatson@ubuntu.com>
+
+	Make the `source' command slightly faster.
+
+	* normal/main.c (grub_normal_execute): Don't re-read list files when
+	nested.
+
 2010-06-23  Colin Watson  <cjwatson@ubuntu.com>
 
 	* loader/i386/multiboot_mbi.c (retrieve_video_parameters): Set red
diff --git a/normal/main.c b/normal/main.c
index fdd3c558c..7275b6367 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -464,11 +464,15 @@ void
 grub_normal_execute (const char *config, int nested, int batch)
 {
   grub_menu_t menu = 0;
-  const char *prefix = grub_env_get ("prefix");
+  const char *prefix;
 
-  read_lists (prefix);
-  grub_register_variable_hook ("prefix", NULL, read_lists_hook);
-  grub_command_execute ("parser.grub", 0, 0);
+  if (! nested)
+    {
+      prefix = grub_env_get ("prefix");
+      read_lists (prefix);
+      grub_register_variable_hook ("prefix", NULL, read_lists_hook);
+      grub_command_execute ("parser.grub", 0, 0);
+    }
 
   if (config)
     {

From d8034603577f4712649abb260d2c5f1032e37b89 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sat, 26 Jun 2010 10:50:39 +0100
Subject: [PATCH 1162/1628] * docs/grub.texi (Simple configuration): Explain
 that GRUB_DISABLE_LINUX_RECOVERY and GRUB_DISABLE_NETBSD_RECOVERY must be set
 to `true' to disable their respective recovery entries, not merely set.

---
 ChangeLog      |  7 +++++++
 docs/grub.texi | 15 +++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 52b37640f..d76683823 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-26  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (Simple configuration): Explain that
+	GRUB_DISABLE_LINUX_RECOVERY and GRUB_DISABLE_NETBSD_RECOVERY must be
+	set to `true' to disable their respective recovery entries, not
+	merely set.
+
 2010-06-26  Colin Watson  <cjwatson@ubuntu.com>
 
 	Make the `source' command slightly faster.
diff --git a/docs/grub.texi b/docs/grub.texi
index 822849777..98d3c5f00 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -911,10 +911,11 @@ A command to configure the serial port when using the serial console.
 Command-line arguments to add to menu entries for the Linux kernel.
 
 @item GRUB_CMDLINE_LINUX_DEFAULT
-Unless @samp{GRUB_DISABLE_LINUX_RECOVERY} is set, two menu entries will be
-generated for each Linux kernel: one default entry and one entry for
-recovery mode.  This option lists command-line arguments to add only to the
-default menu entry, after those listed in @samp{GRUB_CMDLINE_LINUX}.
+Unless @samp{GRUB_DISABLE_LINUX_RECOVERY} is set to @samp{true}, two menu
+entries will be generated for each Linux kernel: one default entry and one
+entry for recovery mode.  This option lists command-line arguments to add
+only to the default menu entry, after those listed in
+@samp{GRUB_CMDLINE_LINUX}.
 
 @item GRUB_CMDLINE_NETBSD
 @itemx GRUB_CMDLINE_NETBSD_DEFAULT
@@ -929,10 +930,12 @@ usually more reliable, but in some cases it may not be appropriate.  To
 disable the use of UUIDs, set this option to @samp{true}.
 
 @item GRUB_DISABLE_LINUX_RECOVERY
-Disable the generation of recovery mode menu entries for Linux.
+If this option is set to @samp{true}, disable the generation of recovery
+mode menu entries for Linux.
 
 @item GRUB_DISABLE_NETBSD_RECOVERY
-Disable the generation of recovery mode menu entries for NetBSD.
+If this option is set to @samp{true}, disable the generation of recovery
+mode menu entries for NetBSD.
 
 @item GRUB_VIDEO_BACKEND
 If graphical video support is required, either because the @samp{gfxterm}

From c75be4fb0c28a3124aaabf8e064d07b057205ef0 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Sat, 26 Jun 2010 20:31:40 +0100
Subject: [PATCH 1163/1628] * util/grub.d/10_linux.in: Add support for initrd
 images on Fedora 13.

---
 ChangeLog               | 5 +++++
 util/grub.d/10_linux.in | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d76683823..a002be299 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-26  Pavel Roskin  <proski@gnu.org>
+
+	* util/grub.d/10_linux.in: Add support for initrd images on Fedora
+	13.
+
 2010-06-26  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Simple configuration): Explain that
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 4b5ddb9d8..9e1450f51 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -117,8 +117,9 @@ while [ "x$list" != "x" ] ; do
 
   initrd=
   for i in "initrd.img-${version}" "initrd-${version}.img" \
-	   "initrd-${version}" "initrd.img-${alt_version}" \
-	   "initrd-${alt_version}.img" "initrd-${alt_version}"; do
+	   "initrd-${version}" "initramfs-${version}.img" \
+	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+	   "initrd-${alt_version}" "initramfs-${alt_version}.img"; do
     if test -e "${dirname}/${i}" ; then
       initrd="$i"
       break

From d86e186ff12d6c09ea184a8791ede5c806c674ca Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 28 Jun 2010 02:24:08 +0200
Subject: [PATCH 1164/1628] Fix detection of dom0 kernels

---
 util/grub.d/20_linux_xen.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index 862f43888..9a0136a76 100644
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -85,8 +85,10 @@ EOF
 EOF
 }
 
-linux_list=`for i in /boot/vmlinu[xz]-*jeremy* /vmlinu[xz]-*jeremy* ; do
-        if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
+    	basename=$(basename $i)
+	version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
+        if grub_file_is_not_garbage "$i" && grep -qx "CONFIG_XEN_DOM0=y" /boot/config-${version} 2> /dev/null ; then echo -n "$i " ; fi
       done`
 xen_list=`for i in /boot/xen*; do
         if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi

From bbe346529e999e09dc1aed179c50eed090d28bd3 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 28 Jun 2010 08:51:46 +0100
Subject: [PATCH 1165/1628] * commands/cat.c (options): New variable.
 (grub_cmd_cat): Parse options.  If the --dos option is given, print DOS-style
 "\r\n" line endings as simple newlines (Debian bug #586358). (GRUB_MOD_INIT):
 Use extcmd. (GRUB_MOD_FINI): Likewise. * docs/grub.texi (cat): Document
 --dos.

---
 ChangeLog      | 10 ++++++++++
 commands/cat.c | 31 +++++++++++++++++++++++--------
 docs/grub.texi |  8 +++++++-
 3 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e14460b2f..7f0cc8ba5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-06-28  Colin Watson  <cjwatson@ubuntu.com>
+
+	* commands/cat.c (options): New variable.
+	(grub_cmd_cat): Parse options.  If the --dos option is given, print
+	DOS-style "\r\n" line endings as simple newlines (Debian bug
+	#586358).
+	(GRUB_MOD_INIT): Use extcmd.
+	(GRUB_MOD_FINI): Likewise.
+	* docs/grub.texi (cat): Document --dos.
+
 2010-06-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	XEN with Linux grub-mkconfig support.
diff --git a/commands/cat.c b/commands/cat.c
index 3bdafc4c6..4c0e19bc2 100644
--- a/commands/cat.c
+++ b/commands/cat.c
@@ -23,19 +23,28 @@
 #include <grub/term.h>
 #include <grub/misc.h>
 #include <grub/gzio.h>
-#include <grub/command.h>
+#include <grub/extcmd.h>
 #include <grub/i18n.h>
 
-static grub_err_t
-grub_cmd_cat (grub_command_t cmd __attribute__ ((unused)),
-	      int argc, char **args)
+static const struct grub_arg_option options[] =
+  {
+    {"dos", -1, 0, N_("Accept DOS-style CR/NL line endings."), 0, 0},
+    {0, 0, 0, 0, 0, 0}
+  };
 
+static grub_err_t
+grub_cmd_cat (grub_extcmd_t cmd, int argc, char **args)
 {
+  struct grub_arg_list *state = cmd->state;
+  int dos = 0;
   grub_file_t file;
   char buf[GRUB_DISK_SECTOR_SIZE];
   grub_ssize_t size;
   int key = 0;
 
+  if (state[0].set)
+    dos = 1;
+
   if (argc != 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
 
@@ -54,6 +63,11 @@ grub_cmd_cat (grub_command_t cmd __attribute__ ((unused)),
 
 	  if ((grub_isprint (c) || grub_isspace (c)) && c != '\r')
 	    grub_putchar (c);
+	  else if (dos && c == '\r' && buf[i + 1] == '\n')
+	    {
+	      grub_putchar ('\n');
+	      i++;
+	    }
 	  else
 	    {
 	      grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
@@ -74,15 +88,16 @@ grub_cmd_cat (grub_command_t cmd __attribute__ ((unused)),
   return 0;
 }
 
-static grub_command_t cmd;
+static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(cat)
 {
-  cmd = grub_register_command_p1 ("cat", grub_cmd_cat,
-				  N_("FILE"), N_("Show the contents of a file."));
+  cmd = grub_register_extcmd ("cat", grub_cmd_cat, GRUB_COMMAND_FLAG_BOTH,
+			      N_("FILE"), N_("Show the contents of a file."),
+			      options);
 }
 
 GRUB_MOD_FINI(cat)
 {
-  grub_unregister_command (cmd);
+  grub_unregister_extcmd (cmd);
 }
diff --git a/docs/grub.texi b/docs/grub.texi
index 98d3c5f00..c1981633f 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1624,13 +1624,19 @@ a menu entry).
 @node cat
 @subsection cat
 
-@deffn Command cat file
+@deffn Command cat [@option{--dos}] file
 Display the contents of the file @var{file}. This command may be useful
 to remind you of your OS's root partition:
 
 @example
 grub> @kbd{cat /etc/fstab}
 @end example
+
+If the @option{--dos} option is used, then carriage return / new line pairs
+will be displayed as a simple new line.  Otherwise, the carriage return will
+be displayed as a control character (@samp{<d>}) to make it easier to see
+when boot problems are caused by a file formatted using DOS-style line
+endings.
 @end deffn
 
 

From cb88052ba36b1deb8ed91b703b258645b0876457 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 28 Jun 2010 08:55:05 +0100
Subject: [PATCH 1166/1628] Change grub-mkdevicemap to emit /dev/disk/by-id/
 names where possible on Linux. * util/deviceiter.c (check_device): Rename to
 ... (check_device_readable_unique): ... this.  Update all callers. Maintain
 and check a list of which devices (by canonicalized name) have already been
 seen. (clear_seen_devices): New function. (compare_file_names) [__linux__]:
 New function. (grub_util_iterate_devices): Clear the list of seen devices on
 exit and (just in case) on entry. (grub_util_iterate_devices) [__linux__]:
 Iterate over non-partition devices in /dev/disk/by-id/, in sorted order. 
 Remove DM-RAID seen-devices list, superseded by general code in check_device.

---
 ChangeLog         |  17 ++++
 util/deviceiter.c | 214 ++++++++++++++++++++++++++++++----------------
 2 files changed, 159 insertions(+), 72 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f0cc8ba5..fe6461760 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2010-06-28  Colin Watson  <cjwatson@ubuntu.com>
+
+	Change grub-mkdevicemap to emit /dev/disk/by-id/ names where
+	possible on Linux.
+
+	* util/deviceiter.c (check_device): Rename to ...
+	(check_device_readable_unique): ... this.  Update all callers.
+	Maintain and check a list of which devices (by canonicalized name)
+	have already been seen.
+	(clear_seen_devices): New function.
+	(compare_file_names) [__linux__]: New function.
+	(grub_util_iterate_devices): Clear the list of seen devices on exit
+	and (just in case) on entry.
+	(grub_util_iterate_devices) [__linux__]: Iterate over non-partition
+	devices in /dev/disk/by-id/, in sorted order.  Remove DM-RAID
+	seen-devices list, superseded by general code in check_device.
+
 2010-06-28  Colin Watson  <cjwatson@ubuntu.com>
 
 	* commands/cat.c (options): New variable.
diff --git a/util/deviceiter.c b/util/deviceiter.c
index c3bc508dd..e3a0ab76d 100644
--- a/util/deviceiter.c
+++ b/util/deviceiter.c
@@ -28,6 +28,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
+#include <dirent.h>
 
 #include <grub/util/misc.h>
 #include <grub/util/deviceiter.h>
@@ -345,18 +346,37 @@ get_xvd_disk_name (char *name, int unit)
 }
 #endif
 
-/* Check if DEVICE can be read. If an error occurs, return zero,
-   otherwise return non-zero.  */
-static int
-check_device (const char *device)
+static struct seen_device
 {
+  struct seen_device *next;
+  const char *name;
+} *seen;
+
+/* Check if DEVICE can be read.  Skip any DEVICE that we have already seen.
+   If an error occurs, return zero, otherwise return non-zero.  */
+static int
+check_device_readable_unique (const char *device)
+{
+  char *real_device;
   char buf[512];
   FILE *fp;
+  struct seen_device *seen_elt;
 
   /* If DEVICE is empty, just return error.  */
   if (*device == 0)
     return 0;
 
+  /* Have we seen this device already?  */
+  real_device = canonicalize_file_name (device);
+  if (! real_device)
+    return 0;
+  if (grub_named_list_find (GRUB_AS_NAMED_LIST (seen), real_device))
+    {
+      grub_dprintf ("deviceiter", "Already seen %s (%s)\n",
+		    device, real_device);
+      goto fail;
+    }
+
   fp = fopen (device, "r");
   if (! fp)
     {
@@ -379,7 +399,7 @@ check_device (const char *device)
 	  break;
 	}
       /* Error opening the device.  */
-      return 0;
+      goto fail;
     }
 
   /* Make sure CD-ROMs don't get assigned a BIOS disk number
@@ -387,7 +407,7 @@ check_device (const char *device)
 #ifdef __linux__
 # ifdef CDROM_GET_CAPABILITY
   if (ioctl (fileno (fp), CDROM_GET_CAPABILITY, 0) >= 0)
-    return 0;
+    goto fail;
 # else /* ! CDROM_GET_CAPABILITY */
   /* Check if DEVICE is a CD-ROM drive by the HDIO_GETGEO ioctl.  */
   {
@@ -395,14 +415,14 @@ check_device (const char *device)
     struct stat st;
 
     if (fstat (fileno (fp), &st))
-      return 0;
+      goto fail;
 
     /* If it is a block device and isn't a floppy, check if HDIO_GETGEO
        succeeds.  */
     if (S_ISBLK (st.st_mode)
 	&& MAJOR (st.st_rdev) != FLOPPY_MAJOR
 	&& ioctl (fileno (fp), HDIO_GETGEO, &hdg))
-      return 0;
+      goto fail;
   }
 # endif /* ! CDROM_GET_CAPABILITY */
 #endif /* __linux__ */
@@ -410,7 +430,7 @@ check_device (const char *device)
 #if defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
 # ifdef CDIOCCLRDEBUG
   if (ioctl (fileno (fp), CDIOCCLRDEBUG, 0) >= 0)
-    return 0;
+    goto fail;
 # endif /* CDIOCCLRDEBUG */
 #endif /* __FreeBSD_kernel__ || __NetBSD__ || __OpenBSD__ */
 
@@ -418,21 +438,43 @@ check_device (const char *device)
   if (fread (buf, 1, 512, fp) != 512)
     {
       fclose (fp);
-      return 0;
+      goto fail;
     }
 
+  /* Remember that we've seen this device.  */
+  seen_elt = xmalloc (sizeof (*seen_elt));
+  seen_elt->name = real_device; /* steal memory */
+  grub_list_push (GRUB_AS_LIST_P (&seen), GRUB_AS_LIST (seen_elt));
+
   fclose (fp);
   return 1;
+
+fail:
+  free (real_device);
+  return 0;
+}
+
+static void
+clear_seen_devices (void)
+{
+  while (seen)
+    {
+      struct seen_device *seen_elt = seen;
+      seen = seen->next;
+      free (seen_elt);
+    }
+  seen = NULL;
 }
 
 #ifdef __linux__
-# ifdef HAVE_DEVICE_MAPPER
-struct dmraid_seen
+/* Like strcmp, but doesn't require a cast for use as a qsort comparator.  */
+static int
+compare_file_names (const void *a, const void *b)
 {
-  struct dmraid_seen *next;
-  const char *name;
-};
-# endif /* HAVE_DEVICE_MAPPER */
+  const char *left = *(const char **) a;
+  const char *right = *(const char **) b;
+  return strcmp (left, right);
+}
 #endif /* __linux__ */
 
 void
@@ -441,6 +483,8 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 {
   int i;
 
+  clear_seen_devices ();
+
   /* Floppies.  */
   for (i = 0; i < floppy_disks; i++)
     {
@@ -450,13 +494,63 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
       get_floppy_disk_name (name, i);
       if (stat (name, &st) < 0)
 	break;
-      /* In floppies, write the map, whether check_device succeeds
-	 or not, because the user just may not insert floppies.  */
+      /* In floppies, write the map, whether check_device_readable_unique
+         succeeds or not, because the user just may not insert floppies.  */
       if (hook (name, 1))
-	return;
+	goto out;
     }
 
 #ifdef __linux__
+  {
+    DIR *dir = opendir ("/dev/disk/by-id");
+
+    if (dir)
+      {
+	struct dirent *entry;
+	char **names;
+	size_t names_len = 0, names_max = 1024, i;
+
+	names = xmalloc (names_max * sizeof (*names));
+
+	/* Dump all the directory entries into names, resizing if
+	   necessary.  */
+	for (entry = readdir (dir); entry; entry = readdir (dir))
+	  {
+	    /* Skip partition entries.  */
+	    if (strstr (entry->d_name, "-part"))
+	      continue;
+	    if (names_len >= names_max)
+	      {
+		names_max *= 2;
+		names = xrealloc (names, names_max * sizeof (*names));
+	      }
+	    names[names_len++] = xasprintf (entry->d_name);
+	  }
+
+	/* /dev/disk/by-id/ usually has a few alternative identifications of
+	   devices (e.g. ATA vs. SATA).  check_device_readable_unique will
+	   ensure that we only get one for any given disk, but sort the list
+	   so that the choice of which one we get is stable.  */
+	qsort (names, names_len, sizeof (*names), &compare_file_names);
+
+	closedir (dir);
+
+	/* Now add all the devices in sorted order.  */
+	for (i = 0; i < names_len; ++i)
+	  {
+	    char *path = xasprintf ("/dev/disk/by-id/%s", names[i]);
+	    if (check_device_readable_unique (path))
+	      {
+		if (hook (path, 0))
+		  goto out;
+	      }
+	    free (path);
+	    free (names[i]);
+	  }
+	free (names);
+      }
+  }
+
   if (have_devfs ())
     {
       i = 0;
@@ -476,10 +570,10 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 	    {
 	      strcat (name, "/disc");
 	      if (hook (name, 0))
-		return;
+		goto out;
 	    }
 	}
-      return;
+      goto out;
     }
 #endif /* __linux__ */
 
@@ -489,10 +583,10 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
       char name[16];
 
       get_ide_disk_name (name, i);
-      if (check_device (name))
+      if (check_device_readable_unique (name))
 	{
 	  if (hook (name, 0))
-	    return;
+	    goto out;
 	}
     }
 
@@ -503,10 +597,10 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
       char name[16];
 
       get_virtio_disk_name (name, i);
-      if (check_device (name))
+      if (check_device_readable_unique (name))
 	{
 	  if (hook (name, 0))
-	    return;
+	    goto out;
 	}
     }
 
@@ -516,10 +610,10 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
       char name[20];
 
       get_ataraid_disk_name (name, i);
-      if (check_device (name))
+      if (check_device_readable_unique (name))
 	{
 	  if (hook (name, 0))
-	    return;
+	    goto out;
         }
     }
 
@@ -529,10 +623,10 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
       char name[16];
 
       get_xvd_disk_name (name, i);
-      if (check_device (name))
+      if (check_device_readable_unique (name))
 	{
 	  if (hook (name, 0))
-	    return;
+	    goto out;
 	}
     }
 #endif /* __linux__ */
@@ -543,10 +637,10 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
       char name[16];
 
       get_scsi_disk_name (name, i);
-      if (check_device (name))
+      if (check_device_readable_unique (name))
 	{
 	  if (hook (name, 0))
-	    return;
+	    goto out;
 	}
     }
 
@@ -566,10 +660,10 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 	    char name[24];
 
 	    get_dac960_disk_name (name, controller, drive);
-	    if (check_device (name))
+	    if (check_device_readable_unique (name))
 	      {
 		if (hook (name, 0))
-		  return;
+		  goto out;
 	      }
 	  }
       }
@@ -587,10 +681,10 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 	    char name[24];
 
 	    get_acceleraid_disk_name (name, controller, drive);
-	    if (check_device (name))
+	    if (check_device_readable_unique (name))
 	      {
 		if (hook (name, 0))
-		  return;
+		  goto out;
 	      }
 	  }
       }
@@ -608,10 +702,10 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 	    char name[24];
 
 	    get_cciss_disk_name (name, controller, drive);
-	    if (check_device (name))
+	    if (check_device_readable_unique (name))
 	      {
 		if (hook (name, 0))
-		  return;
+		  goto out;
 	      }
 	  }
       }
@@ -629,10 +723,10 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 	    char name[24];
 
 	    get_ida_disk_name (name, controller, drive);
-	    if (check_device (name))
+	    if (check_device_readable_unique (name))
 	      {
 		if (hook (name, 0))
-		  return;
+		  goto out;
 	      }
 	  }
       }
@@ -647,10 +741,10 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 	char name[24];
 
 	get_i2o_disk_name (name, unit);
-	if (check_device (name))
+	if (check_device_readable_unique (name))
 	  {
 	    if (hook (name, 0))
-	      return;
+	      goto out;
 	  }
       }
   }
@@ -661,10 +755,10 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
       char name[16];
 
       get_mmc_disk_name (name, i);
-      if (check_device (name))
+      if (check_device_readable_unique (name))
 	{
 	  if (hook (name, 0))
-	    return;
+	    goto out;
 	}
     }
 
@@ -685,7 +779,6 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
       unsigned int next = 0;
       void *top_handle, *second_handle;
       struct dm_tree_node *root, *top, *second;
-      struct dmraid_seen *seen = NULL;
 
       /* Build DM tree for all devices.  */
       tree = dm_tree_create ();
@@ -721,7 +814,6 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 	    {
 	      const char *node_name, *node_uuid;
 	      char *name;
-	      struct dmraid_seen *seen_elt;
 
 	      node_name = dm_tree_node_get_name (second);
 	      dmraid_check (node_name, "dm_tree_node_get_name failed\n");
@@ -733,40 +825,21 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 		  goto dmraid_next_child;
 		}
 
-	      /* Have we already seen this node?  There are typically very few
-		 DM-RAID disks, so a list should be fast enough.  */
-	      if (grub_named_list_find (GRUB_AS_NAMED_LIST (seen), node_name))
-		{
-		  grub_dprintf ("deviceiter", "Already seen DM device %s\n",
-				node_name);
-		  goto dmraid_next_child;
-		}
-
 	      name = xasprintf ("/dev/mapper/%s", node_name);
-	      if (check_device (name))
+	      if (check_device_readable_unique (name))
 		{
 		  if (hook (name, 0))
 		    {
 		      free (name);
-		      while (seen)
-			{
-			  struct dmraid_seen *seen_elt = seen;
-			  seen = seen->next;
-			  free (seen_elt);
-			}
 		      if (task)
 			dm_task_destroy (task);
 		      if (tree)
 			dm_tree_free (tree);
-		      return;
+		      goto out;
 		    }
 		}
 	      free (name);
 
-	      seen_elt = xmalloc (sizeof *seen_elt);
-	      seen_elt->name = node_name;
-	      grub_list_push (GRUB_AS_LIST_P (&seen), GRUB_AS_LIST (seen_elt));
-
 dmraid_next_child:
 	      second = dm_tree_next_child (&second_handle, top, 1);
 	    }
@@ -774,12 +847,6 @@ dmraid_next_child:
 	}
 
 dmraid_end:
-      while (seen)
-	{
-	  struct dmraid_seen *seen_elt = seen;
-	  seen = seen->next;
-	  free (seen_elt);
-	}
       if (task)
 	dm_task_destroy (task);
       if (tree)
@@ -787,5 +854,8 @@ dmraid_end:
     }
 # endif /* HAVE_DEVICE_MAPPER */
 #endif /* __linux__ */
+
+out:
+  clear_seen_devices ();
 }
 

From c06e40f7286a568b1237b968fdb3824b158d590a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 28 Jun 2010 09:06:41 +0100
Subject: [PATCH 1167/1628] * util/grub-install.in: Add --debug-image= option.

---
 ChangeLog            |  4 ++++
 util/grub-install.in | 17 +++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fe6461760..1d89f5cbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-28  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-install.in: Add --debug-image= option.
+
 2010-06-28  Colin Watson  <cjwatson@ubuntu.com>
 
 	Change grub-mkdevicemap to emit /dev/disk/by-id/ names where
diff --git a/util/grub-install.in b/util/grub-install.in
index c7e087dd0..4a5b5a1c3 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -50,6 +50,7 @@ no_floppy=
 force_lba=
 recheck=no
 debug=no
+debug_image=
 
 if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
     disk_module=biosdisk
@@ -180,6 +181,11 @@ do
     # This is an undocumented feature...
     --debug)
 	debug=yes ;;
+    --debug-image)
+	debug_image=`argument $option "$@"`; shift;;
+    --debug-image=*)
+	debug_image=`echo "$option" | sed 's/--debug-image=//'` ;;
+
     -f | --force)
         setup_force="--force" ;;
 
@@ -349,6 +355,13 @@ fi
 prefix_drive=
 config_opt=
 
+rm -f ${grubdir}/load.cfg
+
+if [ "x${debug_image}" != x ]; then
+    echo "set debug='${debug_image}'" >> ${grubdir}/load.cfg
+    config_opt="-c ${grubdir}/load.cfg "
+fi
+
 if [ "x${devabstraction_module}" = "x" ] ; then
     if [ x"${install_device}" != x ]; then
       if echo "${install_device}" | grep -qx "(.*)" ; then
@@ -369,7 +382,7 @@ if [ "x${devabstraction_module}" = "x" ] ; then
           echo "UUID needed with ata mod, but the filesystem containing ${grubdir} does not support UUIDs." 1>&2
           exit 1
         fi
-        echo "search.fs_uuid ${uuid} root " > ${grubdir}/load.cfg
+        echo "search.fs_uuid ${uuid} root " >> ${grubdir}/load.cfg
 	echo 'set prefix=($root)'"${relative_grubdir}" >> ${grubdir}/load.cfg
 	config_opt="-c ${grubdir}/load.cfg "
         modules="$modules search_fs_uuid"
@@ -379,7 +392,7 @@ if [ "x${devabstraction_module}" = "x" ] ; then
           echo "You attempted a cross-disk install, but the filesystem containing ${grubdir} does not support UUIDs." 1>&2
           exit 1
         fi
-        echo "search.fs_uuid ${uuid} root " > ${grubdir}/load.cfg
+        echo "search.fs_uuid ${uuid} root " >> ${grubdir}/load.cfg
 	echo 'set prefix=($root)'"${relative_grubdir}" >> ${grubdir}/load.cfg
 	config_opt="-c ${grubdir}/load.cfg "
         modules="$modules search_fs_uuid"

From dec53e635c422f68b2e6b0d532b64f4317f211f9 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Mon, 28 Jun 2010 10:17:57 +0200
Subject: [PATCH 1168/1628] 	* mmap/i386/pc/mmap_helper.S: Set CF on
 return.

---
 ChangeLog                  |  4 ++++
 mmap/i386/pc/mmap_helper.S | 14 ++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1d89f5cbb..74f2b8259 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-28  Josh Triplett  <josh@joshtriplett.org>
+
+	* mmap/i386/pc/mmap_helper.S: Set CF on return.
+
 2010-06-28  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-install.in: Add --debug-image= option.
diff --git a/mmap/i386/pc/mmap_helper.S b/mmap/i386/pc/mmap_helper.S
index 743954574..3302a9a15 100644
--- a/mmap/i386/pc/mmap_helper.S
+++ b/mmap/i386/pc/mmap_helper.S
@@ -59,7 +59,7 @@ LOCAL (e801):
 	movw %bx, %dx
 	pop %ds
 	clc
-	iret
+	jmp LOCAL (iret_cf)
 
 LOCAL (h88):
 	popf
@@ -69,7 +69,7 @@ LOCAL (h88):
 	movw DS (LOCAL (kbin16mb)), %ax
 	pop %ds
 	clc
-	iret
+	jmp LOCAL (iret_cf)
 
 LOCAL (e820):
 	popf
@@ -101,12 +101,18 @@ LOCAL (noclean):
 	mov $0x534d4150, %eax
 	pop %ds
 	clc
-	iret
+	jmp LOCAL (iret_cf)
 LOCAL (errexit):
 	mov $0x534d4150, %eax
 	pop %ds
-	stc
 	xor %bx, %bx
+	stc
+
+LOCAL (iret_cf):
+	push %bp
+	mov %sp, %bp
+	setc 6(%bp)
+	pop %bp
 	iret
 
 VARIABLE(grub_machine_mmaphook_mmap_num)

From bca58c7bb60e63970a6199111278d6fa927d8f82 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 28 Jun 2010 11:32:50 +0100
Subject: [PATCH 1169/1628] * docs/grub.texi (Embedded configuration): New
 section (replacing old "Preset Menu" stub). (Images): New section.
 (configfile): Note that any menu entries defined in `file' are shown
 immediately.

---
 ChangeLog      |   8 ++
 docs/grub.texi | 210 ++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 216 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 74f2b8259..b9f4544b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-28  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (Embedded configuration): New section (replacing
+	old "Preset Menu" stub).
+	(Images): New section.
+	(configfile): Note that any menu entries defined in `file' are shown
+	immediately.
+
 2010-06-28  Josh Triplett  <josh@joshtriplett.org>
 
 	* mmap/i386/pc/mmap_helper.S: Set CF on return.
diff --git a/docs/grub.texi b/docs/grub.texi
index c1981633f..a7750992c 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -80,7 +80,6 @@ This edition documents version @value{VERSION}.
 * Network::                     Downloading OS images from a network
 * Serial terminal::             Using GRUB via a serial line
 * Vendor power-on keys::        Changing GRUB behaviour on vendor power-on keys
-* Preset Menu::                 Embedding a configuration file into GRUB
 * Images::                      GRUB image files
 * Filesystem::                  Filesystem syntax and semantics
 * Interface::                   The menu and the command-line
@@ -805,6 +804,7 @@ need to write the whole thing by hand.
 @menu
 * Simple configuration::        Recommended for most users
 * Shell-like scripting::        For power users and developers
+* Embedded configuration::      Embedding a configuration file into GRUB
 @end menu
 
 
@@ -999,6 +999,74 @@ that file, making sure to leave at least the first two lines intact.
 @section Writing full configuration files directly
 
 
+@node Embedded configuration
+@section Embedding a configuration file into GRUB
+
+GRUB supports embedding a configuration file directly into the core image,
+so that it is loaded before entering normal mode.  This is useful, for
+example, when it is not straightforward to find the real configuration file,
+or when you need to debug problems with loading that file.
+@command{grub-install} uses this feature when it is not using BIOS disk
+functions or when installing to a different disk from the one containing
+@file{/boot/grub}, in which case it needs to use the @command{search}
+command (@pxref{search}) to find @file{/boot/grub}.
+
+To embed a configuration file, use the @option{-c} option to
+@command{grub-mkimage}.  The file is copied into the core image, so it may
+reside anywhere on the file system, and may be removed after running
+@command{grub-mkimage}.
+
+After the embedded configuration file (if any) is executed, GRUB will load
+the @samp{normal} module, which will then read the real configuration file
+from @file{$prefix/grub.cfg}.  By this point, the @code{root} variable will
+also have been set to the root device name.  For example, @code{prefix}
+might be set to @samp{(hd0,1)/boot/grub}, and @code{root} might be set to
+@samp{hd0,1}.  Thus, in most cases, the embedded configuration file only
+needs to set the @code{prefix} and @code{root} variables, and then drop
+through to GRUB's normal processing.  A typical example of this might look
+like this:
+
+@example
+@group
+search.fs_uuid 01234567-89ab-cdef-0123-456789abcdef root
+set prefix=($root)/boot/grub
+@end group
+@end example
+
+(The @samp{search_fs_uuid} module must be included in the core image for this
+example to work.)
+
+In more complex cases, it may be useful to read other configuration files
+directly from the embedded configuration file.  This allows such things as
+reading files not called @file{grub.cfg}, or reading files from a directory
+other than that where GRUB's loadable modules are installed.  To do this,
+include the @samp{configfile} and @samp{normal} modules in the core image,
+and embed a configuration file that uses the @command{configfile} command to
+load another file.  The following example of this also requires the
+@command{echo}, @command{search_label}, and @command{test} modules to be
+included in the core image:
+
+@example
+@group
+search.fs_label grub root
+if [ -e /boot/grub/example/test1.cfg ]; then
+    set prefix=($root)/boot/grub
+    configfile /boot/grub/example/test1.cfg
+else
+    if [ -e /boot/grub/example/test2.cfg ]; then
+        set prefix=($root)/boot/grub
+        configfile /boot/grub/example/test2.cfg
+    else
+        echo "Could not find an example configuration file!"
+    fi
+fi
+@end group
+@end example
+
+The embedded configuration file may not contain menu entries directly, but
+may only read them from elsewhere using @command{configfile}.
+
+
 @node Network
 @chapter Booting GRUB from the network
 
@@ -1122,6 +1190,7 @@ implements few VT100 escape sequences. If you specify this option then
 GRUB provides you with an alternative menu interface, because the normal
 menu requires several fancy features of your terminal.
 
+
 @node Vendor power-on keys
 @chapter Using GRUB with vendor power-on keys
 Some laptop vendor provide an additional power-on button which boots another OS.
@@ -1142,6 +1211,142 @@ Values known to GRUB team are:
 
 To take full advantage of this function install GRUB into MBR.
 
+
+@node Images
+@chapter GRUB image files
+
+@c FIXME: parts of this section are specific to PC BIOS right now.
+
+GRUB consists of several images: a variety of bootstrap images for starting
+GRUB in various ways, a kernel image, and a set of modules which are
+combined with the kernel image to form a core image.  Here is a short
+overview of them.
+
+@table @file
+@item boot.img
+On PC BIOS systems, this image is the first part of GRUB to start.  It is
+written to a master boot record (MBR) or to the boot sector of a partition.
+Because a PC boot sector is 512 bytes, the size of this image is exactly 512
+bytes.
+
+The sole function of @file{boot.img} is to read the first sector of the core
+image from a local disk and jump to it.  Because of the size restriction,
+@file{boot.img} cannot understand any file system structure, so
+@command{grub-setup} hardcodes the location of the first sector of the core
+image into @file{boot.img} when installing GRUB.
+
+@item diskboot.img
+This image is used as the first sector of the core image when booting from a
+hard disk.  It reads the rest of the core image into memory and starts the
+kernel.  Since file system handling is not yet available, it encodes the
+location of the core image using a block list format.
+
+@item cdboot.img
+This image is used as the first sector of the core image when booting from a
+CD-ROM drive.  It performs a similar function to @file{diskboot.img}.
+
+@item pxeboot.img
+This image is used as the start of the core image when booting from the
+network using PXE.  @xref{Network}.
+
+@item lnxboot.img
+This image may be placed at the start of the core image in order to make
+GRUB look enough like a Linux kernel that it can be booted by LILO using an
+@samp{image=} section.
+
+@item kernel.img
+This image contains GRUB's basic run-time facilities: frameworks for device
+and file handling, environment variables, the rescue mode command-line
+parser, and so on.  It is rarely used directly, but is built into all core
+images.
+
+@item core.img
+This is the core image of GRUB.  It is built dynamically from the kernel
+image and an arbitrary list of modules by the @command{grub-mkimage}
+program.  Usually, it contains enough modules to access @file{/boot/grub},
+and loads everything else (including menu handling, the ability to load
+target operating systems, and so on) from the file system at run-time.  The
+modular design allows the core image to be kept small, since the areas of
+disk where it must be installed are often as small as 32KB.
+
+On PC systems using the traditional MBR partition table format, the core
+image is usually installed in the "MBR gap" between the master boot record
+and the first partition, or sometimes it is installed in a file system and
+read directly from that.  The latter is not recommended because GRUB needs
+to encode the location of all the core image sectors in @file{diskboot.img},
+and if the file system ever moves the core image around (as it is entitled
+to do) then GRUB must be reinstalled; it also means that GRUB will not be
+able to reliably find the core image if it resides on a different disk than
+the one to which @file{boot.img} was installed.
+
+On PC systems using the more recent GUID Partition Table (GPT) format, the
+core image should be installed to a BIOS Boot Partition.  This may be
+created by GNU Parted using a command such as the following:
+
+@example
+# @kbd{parted /dev/@var{disk} set @var{partition-number} bios_grub on}
+@end example
+
+@strong{Caution:} Be very careful which partition you select!  When GRUB
+finds a BIOS Boot Partition during installation, it will automatically
+overwrite part of it.  Make sure that the partition does not contain any
+other data.
+
+@item *.mod
+Everything else in GRUB resides in dynamically loadable modules.  These are
+often loaded automatically, or built into the core image if they are
+essential, but may also be loaded manually using the @command{insmod}
+command (@pxref{insmod}).
+@end table
+
+@heading For GRUB Legacy users
+
+GRUB 2 has a different design from GRUB Legacy, and so correspondences with
+the images it used cannot be exact.  Nevertheless, GRUB Legacy users often
+ask questions in the terms they are familiar with, and so here is a brief
+guide to how GRUB 2's images relate to that.
+
+@table @file
+@item stage1
+Stage 1 from GRUB Legacy was very similar to @file{boot.img} in GRUB 2, and
+they serve the same function.
+
+@item *_stage1_5
+In GRUB Legacy, Stage 1.5's function was to include enough filesystem code
+to allow the much larger Stage 2 to be read from an ordinary filesystem.  In
+this respect, its function was similar to @file{core.img} in GRUB 2.
+However, @file{core.img} is much more capable than Stage 1.5 was; since it
+offers a rescue shell, it is sometimes possible to recover manually in the
+event that it is unable to load any other modules, for example if partition
+numbers have changed.  @file{core.img} is built in a more flexible way,
+allowing GRUB 2 to support reading modules from advanced disk types such as
+LVM and RAID.
+
+GRUB Legacy could run with only Stage 1 and Stage 2 in some limited
+configurations, while GRUB 2 requires @file{core.img} and cannot work
+without it.
+
+@item stage2
+GRUB 2 has no single Stage 2 image.  Instead, it loads modules from
+@file{/boot/grub} at run-time.
+
+@item stage2_eltorito
+In GRUB 2, images for booting from CD-ROM drives are now constructed using
+@file{cdboot.img} and @file{core.img}, making sure that the core image
+contains the @samp{iso9660} module.  It is usually best to use the
+@command{grub-mkrescue} program for this.
+
+@item nbgrub
+There is as yet no equivalent for @file{nbgrub} in GRUB 2; it was used by
+Etherboot and some other network boot loaders.
+
+@item pxegrub
+In GRUB 2, images for PXE network booting are now constructed using
+@file{pxeboot.img} and @file{core.img}, making sure that the core image
+contains the @samp{pxe} and @samp{pxecmd} modules.  @xref{Network}.
+@end table
+
+
 @node Filesystem
 @chapter Filesystem syntax and semantics
 
@@ -1679,7 +1884,8 @@ If they are completely identical, nothing will be printed.
 @subsection configfile
 
 @deffn Command configfile file
-Load @var{file} as a configuration file.
+Load @var{file} as a configuration file.  If @var{file} defines any menu
+entries, then show a menu containing them immediately.
 @end deffn
 
 

From 4045dee1b9eafeb912cb7056ea5c2067d688e5a2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 28 Jun 2010 12:42:50 +0200
Subject: [PATCH 1170/1628] 	Use normal parser for menu entries. 
 Reported by: Thomas Frauendorfer

	* include/grub/parser.h (grub_parser_execute): Don't export.
	* normal/menu.c (grub_menu_execute_entry_real): New function.
	(grub_menu_execute_entry): Use grub_menu_execute_entry_real.
---
 ChangeLog             |  9 +++++++++
 include/grub/parser.h |  2 +-
 normal/menu.c         | 41 ++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b9f4544b3..bccc55dea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-06-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Use normal parser for menu entries.
+	Reported by: Thomas Frauendorfer
+
+	* include/grub/parser.h (grub_parser_execute): Don't export.
+	* normal/menu.c (grub_menu_execute_entry_real): New function.
+	(grub_menu_execute_entry): Use grub_menu_execute_entry_real.
+
 2010-06-28  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Embedded configuration): New section (replacing
diff --git a/include/grub/parser.h b/include/grub/parser.h
index 064f73fcb..de4da05ad 100644
--- a/include/grub/parser.h
+++ b/include/grub/parser.h
@@ -83,7 +83,7 @@ struct grub_parser
 };
 typedef struct grub_parser *grub_parser_t;
 
-grub_err_t EXPORT_FUNC(grub_parser_execute) (char *source);
+grub_err_t grub_parser_execute (char *source);
 
 grub_err_t
 grub_rescue_parse_line (char *line, grub_reader_getline_t getline);
diff --git a/normal/menu.c b/normal/menu.c
index 09c5fd1eb..f98cfed66 100644
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -29,6 +29,7 @@
 #include <grub/auth.h>
 #include <grub/i18n.h>
 #include <grub/term.h>
+#include <grub/script_sh.h>
 
 /* Time to delay after displaying an error message about a default/fallback
    entry failing to boot.  */
@@ -141,6 +142,44 @@ get_and_remove_first_entry_number (const char *name)
   return entry;
 }
 
+static void
+grub_menu_execute_entry_real (grub_menu_entry_t entry)
+{
+  const char *source;
+
+  auto grub_err_t getline (char **line, int cont);
+  grub_err_t getline (char **line, int cont __attribute__ ((unused)))
+  {
+    const char *p;
+
+    if (!source)
+      {
+	*line = 0;
+	return 0;
+      }
+
+    p = grub_strchr (source, '\n');
+
+    if (p)
+      *line = grub_strndup (source, p - source);
+    else
+      *line = grub_strdup (source);
+    source = p ? p + 1 : 0;
+    return 0;
+  }
+
+  source = entry->sourcecode;
+
+  while (source)
+    {
+      char *line;
+
+      getline (&line, 0);
+      grub_normal_parse_line (line, getline);
+      grub_free (line);
+    }
+}
+
 /* Run a menu entry.  */
 void
 grub_menu_execute_entry(grub_menu_entry_t entry)
@@ -159,7 +198,7 @@ grub_menu_execute_entry(grub_menu_entry_t entry)
 
   grub_env_set ("chosen", entry->title);
 
-  grub_parser_execute ((char *) entry->sourcecode);
+  grub_menu_execute_entry_real (entry);
 
   if (grub_errno == GRUB_ERR_NONE && grub_loader_is_loaded ())
     /* Implicit execution of boot, only if something is loaded.  */

From 20bc84a6ff0020c91876bc5b0a1c3deefa96fb1c Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 28 Jun 2010 12:02:39 +0100
Subject: [PATCH 1171/1628] * docs/grub.texi (Device map): New section.
 (Themes): New section (stub). * Makefile.in (docs/grub.info): The info
 documentation now builds without errors.  Make sure it stays that way.

---
 ChangeLog      |  7 +++++++
 Makefile.in    |  3 +--
 docs/grub.texi | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bccc55dea..c7d301dcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-28  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (Device map): New section.
+	(Themes): New section (stub).
+	* Makefile.in (docs/grub.info): The info documentation now builds
+	without errors.  Make sure it stays that way.
+
 2010-06-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Use normal parser for menu entries.
diff --git a/Makefile.in b/Makefile.in
index b9b7f3d08..b6b8f0d43 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -247,10 +247,9 @@ docs/stamp-vti: docs/grub.texi configure.ac
 	-@rm -f vti.tmp
 	@cp $(builddir)/docs/version.texi $@
 
-# Use --force until such time as the documentation is cleaned up.
 docs/grub.info: docs/grub.texi docs/version.texi docs/fdl.texi
 	$(MKDIR_P) docs
-	-$(MAKEINFO) -P $(builddir)/docs --no-split --force $< -o $@
+	$(MAKEINFO) -P $(builddir)/docs --no-split $< -o $@
 
 ifeq (, $(FONT_SOURCE))
 else
diff --git a/docs/grub.texi b/docs/grub.texi
index a7750992c..38b046814 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -470,6 +470,7 @@ the @dfn{boot directory}.
 @menu
 * Installing GRUB using grub-install::
 * Making a GRUB bootable CD-ROM::
+* Device map::
 @end menu
 
 
@@ -614,6 +615,50 @@ to @samp{(cd)} when booted from a CD-ROM. It is only necessary to refer to
 @samp{(cd)} if you want to access other drives as well.
 
 
+@node Device map
+@section The map between BIOS drives and OS devices
+
+The @command{grub-mkdevicemap} program can be used to create the @dfn{device
+map file}.  It is often run automatically by tools such as
+@command{grub-install} if the device map file does not already exist.  The
+file name @file{/boot/grub/device.map} is preferred.
+
+If the device map file exists, the GRUB utilities (@command{grub-probe},
+@command{grub-setup}, etc.) read it to map BIOS drives to OS devices.  This
+file consists of lines like this:
+
+@example
+@var{device} @var{file}
+@end example
+
+@var{device} is a drive specified in the GRUB syntax (@pxref{Device
+syntax}), and @var{file} is an OS file, which is normally a device file.
+
+Historically, the device map file was used because GRUB device names had to
+be used in the configuration file, and they were derived from BIOS drive
+numbers.  The map between BIOS drives and OS devices cannot always be
+guessed correctly: for example, GRUB will get the order wrong if you
+exchange the boot sequence between IDE and SCSI in your BIOS.
+
+Unfortunately, even OS device names are not always stable.  Modern versions
+of the Linux kernel may probe drives in a different order from boot to boot,
+and the prefix (@file{/dev/hd*} versus @file{/dev/sd*}) may change depending
+on the driver subsystem in use.  As a result, the device map file required
+frequent editing on some systems.
+
+GRUB avoids this problem nowadays by using UUIDs or file system labels when
+generating @file{grub.cfg}, and we advise that you do the same for any
+custom menu entries you write.  If the device map file does not exist, then
+the GRUB utilities will assume a temporary device map on the fly.  This is
+often good enough, particularly in the common case of single-disk systems.
+
+However, the device map file is not entirely obsolete yet, and there are
+still some situations that require it to exist.  If necessary, you may edit
+the file if @command{grub-mkdevicemap} makes a mistake.  You can put any
+comments in the file if needed, as the GRUB utilities assume that a line is
+just a comment if the first character is @samp{#}.
+
+
 @node Booting
 @chapter Booting
 
@@ -805,6 +850,7 @@ need to write the whole thing by hand.
 * Simple configuration::        Recommended for most users
 * Shell-like scripting::        For power users and developers
 * Embedded configuration::      Embedding a configuration file into GRUB
+* Themes::                      Graphical menu themes
 @end menu
 
 
@@ -1067,6 +1113,10 @@ The embedded configuration file may not contain menu entries directly, but
 may only read them from elsewhere using @command{configfile}.
 
 
+@node Themes
+@section Graphical menu themes
+
+
 @node Network
 @chapter Booting GRUB from the network
 

From d500ed127e737cf1dd40e54e79fa0fe4f160da5b Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Mon, 28 Jun 2010 23:52:03 +0200
Subject: [PATCH 1172/1628] 2010-06-28  Robert Millan  <rmh@gnu.org>

	* util/grub-mkconfig.in: Export `GRUB_BADRAM' variable.
	* util/grub.d/00_header.in: When `GRUB_BADRAM' is set, issue badram
	command using ${GRUB_BADRAM} as parameter.
---
 ChangeLog                | 6 ++++++
 util/grub-mkconfig.in    | 5 +++--
 util/grub.d/00_header.in | 9 +++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c7d301dcc..59c94a44e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-28  Robert Millan  <rmh@gnu.org>
+
+	* util/grub-mkconfig.in: Export `GRUB_BADRAM' variable.
+	* util/grub.d/00_header.in: When `GRUB_BADRAM' is set, issue badram
+	command using ${GRUB_BADRAM} as parameter.
+
 2010-06-28  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Device map): New section.
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 5548da4da..e417b4352 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # Generate grub.cfg by inspecting /boot contents.
-# Copyright (C) 2006,2007,2008,2009 Free Software Foundation, Inc.
+# Copyright (C) 2006,2007,2008,2009,2010 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
@@ -274,7 +274,8 @@ export GRUB_DEFAULT \
   GRUB_GFXPAYLOAD_LINUX \
   GRUB_DISABLE_OS_PROBER \
   GRUB_INIT_TUNE \
-  GRUB_SAVEDEFAULT
+  GRUB_SAVEDEFAULT \
+  GRUB_BADRAM
 
 if test "x${grub_cfg}" != "x"; then
   rm -f ${grub_cfg}.new
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 8040a7c9b..8186ffd2d 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -255,8 +255,9 @@ fi
 
 # Play an initial tune
 if [ "x${GRUB_INIT_TUNE}" != "x" ] ; then
-  cat << EOF
-insmod play
-play ${GRUB_INIT_TUNE}
-EOF
+  echo "play ${GRUB_INIT_TUNE}"
+fi
+
+if [ "x${GRUB_BADRAM}" != "x" ] ; then
+  echo "badram ${GRUB_BADRAM}"
 fi

From dccaf99d10e3c8cfbca40b2a914893cffa6ff6f0 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Tue, 29 Jun 2010 00:48:53 +0200
Subject: [PATCH 1173/1628] 2010-06-29  Robert Millan  <rmh@gnu.org>

	* docs/grub.texi (Simple configuration): Document ${GRUB_BADRAM}.
	(Command-line and menu entry commands): Document `badram' command.
---
 ChangeLog      |  5 +++++
 docs/grub.texi | 27 +++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 59c94a44e..46c0ee188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-29  Robert Millan  <rmh@gnu.org>
+
+	* docs/grub.texi (Simple configuration): Document ${GRUB_BADRAM}.
+	(Command-line and menu entry commands): Document `badram' command.
+
 2010-06-28  Robert Millan  <rmh@gnu.org>
 
 	* util/grub-mkconfig.in: Export `GRUB_BADRAM' variable.
diff --git a/docs/grub.texi b/docs/grub.texi
index 38b046814..ba5b43a1c 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1032,6 +1032,11 @@ for them.  Set this option to @samp{true} to disable this.
 Play a tune on the speaker when GRUB starts.  This is particularly useful
 for users unable to see the screen.  The value of this option is passed
 directly to @ref{play}.
+
+@item GRUB_BADRAM
+If this option is set, GRUB will issue a @ref{badram} command to filter
+out specified regions of RAM.
+
 @end table
 
 For more detailed customisation of @command{grub-mkconfig}'s output, you may
@@ -1804,6 +1809,7 @@ you forget a command, you can run the command @command{help}
 
 @menu
 * acpi::                        Load ACPI tables
+* badram::                      Filter out bad regions of RAM
 * blocklist::                   Print a block list
 * boot::                        Start up your operating system
 * cat::                         Show the contents of a file
@@ -1857,6 +1863,27 @@ Normally, this command will replace the Root System Description Pointer
 GRUB, but may be used by GRUB's EFI emulation.
 @end deffn
 
+@node badram
+@subsection badram
+
+@deffn Command badram addr,mask[,addr,mask...]
+Filter out bad RAM.
+@end deffn
+
+This command notifies the memory manager that specified regions of
+RAM ought to be filtered out (usually, because they're damaged).  This
+remains in effect after a payload kernel has been loaded by GRUB, as
+long as the loaded kernel obtains its memory map from GRUB.  Kernels that
+support this include Linux, GNU Mach, the kernel of FreeBSD and Multiboot
+kernels in general.
+
+Syntax is the same as provided by the @uref{http://www.memtest.org/,
+Memtest86+ utility}: a list of address/mask pairs.  Given a page-aligned
+address and a base address / mask pair, if all the bits of the page-aligned
+address that are enabled by the mask match with the base address, it means
+this page is to be filtered.  This syntax makes it easy to represent patterns
+that are often result of memory damage, due to physical distribution of memory
+cells.
 
 @node blocklist
 @subsection blocklist

From 1ba9b889469abd684e6f6e9519a17565dcf0e394 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 29 Jun 2010 16:15:46 +0100
Subject: [PATCH 1174/1628] * commands/cat.c (grub_cmd_cat): Fix buffer overrun
 if '\r' is the last character in the buffer. Reported by: Vladimir
 Serbinenko.

---
 ChangeLog      | 6 ++++++
 commands/cat.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 46c0ee188..54880f44f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-29  Colin Watson  <cjwatson@ubuntu.com>
+
+	* commands/cat.c (grub_cmd_cat): Fix buffer overrun if '\r' is the
+	last character in the buffer.
+	Reported by: Vladimir Serbinenko.
+
 2010-06-29  Robert Millan  <rmh@gnu.org>
 
 	* docs/grub.texi (Simple configuration): Document ${GRUB_BADRAM}.
diff --git a/commands/cat.c b/commands/cat.c
index 4c0e19bc2..289cf7352 100644
--- a/commands/cat.c
+++ b/commands/cat.c
@@ -63,7 +63,7 @@ grub_cmd_cat (grub_extcmd_t cmd, int argc, char **args)
 
 	  if ((grub_isprint (c) || grub_isspace (c)) && c != '\r')
 	    grub_putchar (c);
-	  else if (dos && c == '\r' && buf[i + 1] == '\n')
+	  else if (dos && c == '\r' && i + 1 < size && buf[i + 1] == '\n')
 	    {
 	      grub_putchar ('\n');
 	      i++;

From 1246efeb8bdf47d8d2dde6349973d7686973b0de Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 29 Jun 2010 16:20:49 +0100
Subject: [PATCH 1175/1628] * util/grub-mkconfig.in: Use 'set -e' rather than
 '#! /bin/sh -e', to avoid accidents when debugging with 'sh -x'. *
 util/grub-mkrescue.in: Likewise. * util/grub.d/00_header.in: Likewise. *
 util/grub.d/10_hurd.in: Likewise. * util/grub.d/10_kfreebsd.in: Likewise. *
 util/grub.d/10_linux.in: Likewise. * util/grub.d/10_netbsd.in: Likewise. *
 util/grub.d/10_windows.in: Likewise. * util/grub.d/20_linux_xen.in: Likewise.
 * util/grub.d/30_os-prober.in: Likewise. *
 util/powerpc/ieee1275/grub-mkrescue.in: Likewise.

---
 ChangeLog                              | 15 +++++++++++++++
 util/grub-mkconfig.in                  |  3 ++-
 util/grub-mkrescue.in                  |  3 ++-
 util/grub.d/00_header.in               |  3 ++-
 util/grub.d/10_hurd.in                 |  3 ++-
 util/grub.d/10_kfreebsd.in             |  3 ++-
 util/grub.d/10_linux.in                |  3 ++-
 util/grub.d/10_netbsd.in               |  3 ++-
 util/grub.d/10_windows.in              |  3 ++-
 util/grub.d/20_linux_xen.in            |  3 ++-
 util/grub.d/30_os-prober.in            |  3 ++-
 util/powerpc/ieee1275/grub-mkrescue.in |  3 ++-
 12 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 54880f44f..f5988e08c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-06-29  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkconfig.in: Use 'set -e' rather than '#! /bin/sh -e',
+	to avoid accidents when debugging with 'sh -x'.
+	* util/grub-mkrescue.in: Likewise.
+	* util/grub.d/00_header.in: Likewise.
+	* util/grub.d/10_hurd.in: Likewise.
+	* util/grub.d/10_kfreebsd.in: Likewise.
+	* util/grub.d/10_linux.in: Likewise.
+	* util/grub.d/10_netbsd.in: Likewise.
+	* util/grub.d/10_windows.in: Likewise.
+	* util/grub.d/20_linux_xen.in: Likewise.
+	* util/grub.d/30_os-prober.in: Likewise.
+	* util/powerpc/ieee1275/grub-mkrescue.in: Likewise.
+
 2010-06-29  Colin Watson  <cjwatson@ubuntu.com>
 
 	* commands/cat.c (grub_cmd_cat): Fix buffer overrun if '\r' is the
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index e417b4352..828b54bce 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # Generate grub.cfg by inspecting /boot contents.
 # Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 36cce31ec..4a16558e4 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # Make GRUB rescue image
 # Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 8186ffd2d..553369e37 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # grub-mkconfig helper script.
 # Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index e446f10e8..350eb30a8 100644
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # grub-mkconfig helper script.
 # Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index f63421617..9915abdf1 100644
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # grub-mkconfig helper script.
 # Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 9e1450f51..57bc1eebc 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # grub-mkconfig helper script.
 # Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in
index 7e5fb34ad..1a8c4eb36 100644
--- a/util/grub.d/10_netbsd.in
+++ b/util/grub.d/10_netbsd.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # grub-mkconfig helper script.
 # Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
diff --git a/util/grub.d/10_windows.in b/util/grub.d/10_windows.in
index 7d221eac9..fd068dd2d 100644
--- a/util/grub.d/10_windows.in
+++ b/util/grub.d/10_windows.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # grub-mkconfig helper script.
 # Copyright (C) 2008,2009,2010  Free Software Foundation, Inc.
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index 9a0136a76..8612c96b0 100644
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # grub-mkconfig helper script.
 # Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 90e2e3d92..601663dcc 100644
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # grub-mkconfig helper script.
 # Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
diff --git a/util/powerpc/ieee1275/grub-mkrescue.in b/util/powerpc/ieee1275/grub-mkrescue.in
index 4ef26f616..aefedff3f 100644
--- a/util/powerpc/ieee1275/grub-mkrescue.in
+++ b/util/powerpc/ieee1275/grub-mkrescue.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # Make GRUB rescue image
 # Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008  Free Software Foundation, Inc.

From ff4a70d2919ccadb9dc12ebde2628c01b8c21ca0 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 30 Jun 2010 13:36:58 +0100
Subject: [PATCH 1176/1628] * Makefile.in (install-local): Temporarily prepend
 $(builddir) to PATH when running help2man and then run it on the unadorned
 executable names, rather than passing $(builddir)/* paths to help2man.  This
 avoids the build directory ending up in generated manual pages.

---
 ChangeLog   | 8 ++++++++
 Makefile.in | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f5988e08c..04a0dc082 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-30  Colin Watson  <cjwatson@ubuntu.com>
+
+	* Makefile.in (install-local): Temporarily prepend $(builddir) to
+	PATH when running help2man and then run it on the unadorned
+	executable names, rather than passing $(builddir)/* paths to
+	help2man.  This avoids the build directory ending up in generated
+	manual pages.
+
 2010-06-29  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkconfig.in: Use 'set -e' rather than '#! /bin/sh -e',
diff --git a/Makefile.in b/Makefile.in
index b6b8f0d43..a4b4ed45f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -322,26 +322,26 @@ install-local: all
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
-	  $(HELP2MAN) --section=1 -i $(srcdir)/docs/man/$$file.h2m -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
+	  PATH="$(builddir):$$PATH" $(HELP2MAN) --section=1 -i $(srcdir)/docs/man/$$file.h2m -o $(DESTDIR)$(mandir)/man1/$$dest.1 $$file; \
 	done
 	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8
 	@list='$(sbin_UTILITIES)'; for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
-	  $(HELP2MAN) --section=8 -i $(srcdir)/docs/man/$$file.h2m -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
+	  PATH="$(builddir):$$PATH" $(HELP2MAN) --section=8 -i $(srcdir)/docs/man/$$file.h2m -o $(DESTDIR)$(mandir)/man8/$$dest.8 $$file; \
 	done
 	@list='$(bin_SCRIPTS)'; for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
-	  $(HELP2MAN) --section=1 -i $(srcdir)/docs/man/$$file.h2m -o $(DESTDIR)$(mandir)/man1/$$dest.1 $(builddir)/$$file; \
+	  PATH="$(builddir):$$PATH" $(HELP2MAN) --section=1 -i $(srcdir)/docs/man/$$file.h2m -o $(DESTDIR)$(mandir)/man1/$$dest.1 $$file; \
 	done
 	@list='$(sbin_SCRIPTS)'; for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
-	  $(HELP2MAN) --section=8 -i $(srcdir)/docs/man/$$file.h2m -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
+	  PATH="$(builddir):$$PATH" $(HELP2MAN) --section=8 -i $(srcdir)/docs/man/$$file.h2m -o $(DESTDIR)$(mandir)/man8/$$dest.8 $$file; \
 	done
 	$(SHELL) $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/grub.d
 	@list='$(grub-mkconfig_SCRIPTS)'; for file in $$list; do \

From b79889ba767ca02de3a7db14ef32a2e9c11169a6 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Thu, 1 Jul 2010 10:52:23 +0200
Subject: [PATCH 1177/1628] 2010-07-01  Robert Millan  <rmh@gnu.org>

	* kern/emu/hostdisk.c (convert_system_partition_to_system_disk):
	Support 'p' as partition separator on kernel of FreeBSD (used
	with GPT labels).
	(grub_util_biosdisk_get_grub_dev): Likewise.
---
 ChangeLog           | 7 +++++++
 kern/emu/hostdisk.c | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 70572f940..f21d94425 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-01  Robert Millan  <rmh@gnu.org>
+
+	* kern/emu/hostdisk.c (convert_system_partition_to_system_disk):
+	Support 'p' as partition separator on kernel of FreeBSD (used
+	with GPT labels).
+	(grub_util_biosdisk_get_grub_dev): Likewise.
+
 2010-07-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Yeeloong firmware port.
diff --git a/kern/emu/hostdisk.c b/kern/emu/hostdisk.c
index bc37e9949..2cdf449e2 100644
--- a/kern/emu/hostdisk.c
+++ b/kern/emu/hostdisk.c
@@ -1260,7 +1260,7 @@ devmapper_out:
       for (p = path + 5; *p; ++p)
         if (grub_isdigit(*p))
           {
-            p = strchr (p, 's');
+            p = strpbrk (p, "sp");
             if (p)
               *p = '\0';
             break;
@@ -1507,7 +1507,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
   }
 
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
-  /* FreeBSD uses "/dev/[a-z]+[0-9]+(s[0-9]+[a-z]?)?".  */
+  /* FreeBSD uses "/dev/[a-z]+[0-9]+([sp][0-9]+[a-z]?)?".  */
   {
     int dos_part = -1;
     int bsd_part = -1;
@@ -1521,7 +1521,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
         for (p = os_dev + 5; *p; ++p)
           if (grub_isdigit(*p))
             {
-              p = strchr (p, 's');    /* msdos or apple (or ... ?) partition map */
+              p = strpbrk (p, "sp");    /* msdos or apple (or ... ?) partition map */
               if (p)
                 {
                   p++;

From 5944958c61a4b8aa11162d01ea61462d02db7ac4 Mon Sep 17 00:00:00 2001
From: Sean Finney <seanius@seanius.net>
Date: Thu, 1 Jul 2010 23:19:11 +0200
Subject: [PATCH 1178/1628] 	* disk/lvm.c (grub_lvm_scan_device): Skip
 snapshots.

2010-07-01  Vladimir Serbinenko  <phcoder@gmail.com>

	* disk/lvm.c (grub_lvm_checkvalue): New function.
	(grub_lvm_check_flag): Likewise.

	Also-By: Vladimir Serbinenko <phcoder@gmail.com>
---
 ChangeLog  |  9 +++++++
 disk/lvm.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f21d94425..341e122f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-01  Sean Finney  <seanius@seanius.net>
+
+	* disk/lvm.c (grub_lvm_scan_device): Skip snapshots.
+
+2010-07-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* disk/lvm.c (grub_lvm_checkvalue): New function.
+	(grub_lvm_check_flag): Likewise.
+
 2010-07-01  Robert Millan  <rmh@gnu.org>
 
 	* kern/emu/hostdisk.c (convert_system_partition_to_system_disk):
diff --git a/disk/lvm.c b/disk/lvm.c
index 7dde40920..71860e853 100644
--- a/disk/lvm.c
+++ b/disk/lvm.c
@@ -45,6 +45,52 @@ grub_lvm_getvalue (char **p, char *str)
   return grub_strtoul (*p, NULL, 10);
 }
 
+static int
+grub_lvm_checkvalue (char **p, char *str, char *tmpl)
+{
+  int tmpllen = grub_strlen (tmpl);
+  *p = grub_strstr (*p, str);
+  if (! *p)
+    return 0;
+  *p += grub_strlen (str);
+  if (**p != '"')
+    return 0;
+  return (grub_memcmp (*p + 1, tmpl, tmpllen) == 0 && (*p)[tmpllen + 1] == '"');
+}
+
+static int
+grub_lvm_check_flag (char *p, char *str, char *flag)
+{
+  int len_str = grub_strlen (str), len_flag = grub_strlen (flag);
+  while (1)
+    {
+      char *q;
+      p = grub_strstr (p, str);
+      if (! p)
+	return 0;
+      p += len_str;
+      if (grub_memcmp (p, " = [", sizeof (" = [") - 1) != 0)
+	continue;
+      q = p + sizeof (" = [") - 1;
+      while (1)
+	{
+	  while (grub_isspace (*q))
+	    q++;
+	  if (*q != '"')
+	    return 0;
+	  q++;
+	  if (grub_memcmp (q, flag, len_flag) == 0 && q[len_flag] == '"')
+	    return 1;
+	  while (*q != '"')
+	    q++;
+	  q++;
+	  if (*q == ']')
+	    return 0;
+	  q++;
+	}
+    }
+}
+
 static int
 grub_lvm_iterate (int (*hook) (const char *name))
 {
@@ -421,6 +467,7 @@ grub_lvm_scan_device (const char *name)
 	  while (1)
 	    {
 	      int s;
+	      int skip_lv = 0;
 	      struct grub_lvm_lv *lv;
 	      struct grub_lvm_segment *seg;
 
@@ -445,6 +492,12 @@ grub_lvm_scan_device (const char *name)
 
 	      lv->size = 0;
 
+	      if (!grub_lvm_check_flag (p, "status", "VISIBLE"))
+		{
+		  skip_lv = 1;
+		  goto lv_parsed;
+		}
+
 	      lv->segment_count = grub_lvm_getvalue (&p, "segment_count = ");
 	      if (p == NULL)
 		goto lvs_fail;
@@ -465,6 +518,14 @@ grub_lvm_scan_device (const char *name)
 		  seg->extent_count = grub_lvm_getvalue (&p, "extent_count = ");
 		  if (p == NULL)
 		    goto lvs_segment_fail;
+
+		  if (grub_lvm_checkvalue (&p, "type = ", "snapshot"))
+		    {
+		      /* Found a snapshot, give up and move on. */
+		      skip_lv = 1;
+		      break;
+		    }
+
 		  seg->stripe_count = grub_lvm_getvalue (&p, "stripe_count = ");
 		  if (p == NULL)
 		    goto lvs_segment_fail;
@@ -531,12 +592,20 @@ grub_lvm_scan_device (const char *name)
 		  goto fail4;
 		}
 
+	    lv_parsed:
 	      if (p != NULL)
 		p = grub_strchr (p, '}');
 	      if (p == NULL)
 		goto lvs_fail;
 	      p += 3;
 
+	      if (skip_lv)
+		{
+		  grub_free (lv->name);
+		  grub_free (lv);
+		  continue;
+		}
+
 	      lv->number = lv_count++;
 	      lv->vg = vg;
 	      lv->next = vg->lvs;

From 105a2e8c6638928330bcf5dfc6063474ac4ceb4a Mon Sep 17 00:00:00 2001
From: Sean Finney <seanius@seanius.net>
Date: Thu, 1 Jul 2010 23:24:21 +0200
Subject: [PATCH 1179/1628] 	* util/grub.d/10_linux.in: Don't use UUID for
 LVM root.

---
 ChangeLog               | 4 ++++
 util/grub.d/10_linux.in | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 341e122f3..e60f1076c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-01  Sean Finney  <seanius@seanius.net>
+
+	* util/grub.d/10_linux.in: Don't use UUID for LVM root.
+
 2010-07-01  Sean Finney  <seanius@seanius.net>
 
 	* disk/lvm.c (grub_lvm_scan_device): Skip snapshots.
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 57bc1eebc..2e0143df2 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -44,7 +44,8 @@ case ${GRUB_DEVICE} in
 esac
 
 if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
-    || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ; then
+    || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
+    || [ "x`grub-probe -t abstraction --device ${GRUB_DEVICE}`" = "xlvm"  ] ; then
   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
 else
   LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}

From b0c4f9564263a169e4d9061e40a45722ea70a53d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 1 Jul 2010 23:35:45 +0200
Subject: [PATCH 1180/1628] 	* util/grub-mkrescue.in: Avoid module
 duplication.

---
 ChangeLog             | 4 ++++
 util/grub-mkrescue.in | 6 ++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e60f1076c..a03294df6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkrescue.in: Avoid module duplication.
+
 2010-07-01  Sean Finney  <seanius@seanius.net>
 
 	* util/grub.d/10_linux.in: Don't use UUID for LVM root.
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 4a16558e4..3bfbbddd4 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -200,13 +200,12 @@ make_image ()
     memdisk_dir=`mktemp -d "$MKTEMP_TEMPLATE"`
     mkdir -p ${memdisk_dir}/boot/grub
 
-    modules="$(cat ${source_directory}/partmap.lst) ${modules}"
     cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
 search --fs-uuid --set ${iso_uuid}
 set prefix=(\${root})/boot/grub/${platform}
 source \$prefix/grub.cfg
 EOF
-    (for i in ${modules} ; do
+    (for i in $(cat ${source_directory}/partmap.lst) ${modules} ; do
         echo "insmod $i"
     done ; \
     echo "source /boot/grub/grub.cfg") \
@@ -273,8 +272,7 @@ if test -e "${pc_dir}" ; then
 
     rm -f ${core_img}
 
-    modules="$(cat ${pc_dir}/partmap.lst) ${modules}"
-    (for i in ${modules} ; do
+    (for i in $(cat ${pc_dir}/partmap.lst) ${modules} ; do
         echo "insmod $i"
     done ; \
     echo "source /boot/grub/grub.cfg") \

From 48f27e87fcbdae34ca056b9c14223a6b5e68f0aa Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Jul 2010 00:40:37 +0200
Subject: [PATCH 1181/1628] 	* loader/multiboot.c (grub_multiboot_boot)
 [GRUB_USE_MULTIBOOT2]: 	Properly align mbi. 	Reported by: Seth
 Goldberg.

---
 ChangeLog          | 6 ++++++
 loader/multiboot.c | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a03294df6..ba99ab2e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/multiboot.c (grub_multiboot_boot) [GRUB_USE_MULTIBOOT2]:
+	Properly align mbi.
+	Reported by: Seth Goldberg.
+
 2010-07-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkrescue.in: Avoid module duplication.
diff --git a/loader/multiboot.c b/loader/multiboot.c
index 592289c45..77a732838 100644
--- a/loader/multiboot.c
+++ b/loader/multiboot.c
@@ -136,8 +136,14 @@ grub_multiboot_boot (void)
       grub_multiboot_alloc_mbi = mbi_size;
     }
 
+#ifdef GRUB_USE_MULTIBOOT2
+  state.MULTIBOOT_MBI_REGISTER = ALIGN_UP (grub_multiboot_payload_dest
+					   + grub_multiboot_pure_size,
+					   MULTIBOOT_TAG_ALIGN);
+#else
   state.MULTIBOOT_MBI_REGISTER = grub_multiboot_payload_dest
     + grub_multiboot_pure_size;
+#endif
   err = grub_multiboot_make_mbi (grub_multiboot_payload_orig,
 				 grub_multiboot_payload_dest,
 				 grub_multiboot_pure_size, mbi_size);

From d9a0c9413e81d3c0affc6383693bdd28dc863a5c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Jul 2010 02:43:09 +0200
Subject: [PATCH 1182/1628] 	* kern/efi/init.c (grub_efi_init): Disable
 watchdog. 	Tested by: Seth Goldberg.

---
 ChangeLog       | 5 +++++
 kern/efi/init.c | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ba99ab2e2..d456f1fca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/efi/init.c (grub_efi_init): Disable watchdog.
+	Tested by: Seth Goldberg.
+
 2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/multiboot.c (grub_multiboot_boot) [GRUB_USE_MULTIBOOT2]:
diff --git a/kern/efi/init.c b/kern/efi/init.c
index b79084a6a..d8a85eddf 100644
--- a/kern/efi/init.c
+++ b/kern/efi/init.c
@@ -36,6 +36,9 @@ grub_efi_init (void)
   /* Initialize the memory management system.  */
   grub_efi_mm_init ();
 
+  efi_call_3 (grub_efi_system_table->boot_services->set_watchdog_timer,
+	      0, 0, 0);
+
   grub_efidisk_init ();
 }
 

From 1c4827beff3f5421c1440b280c8b8b82199ddf86 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Jul 2010 02:47:10 +0200
Subject: [PATCH 1183/1628] 	* partmap/gpt.c (MAX_SECTOR_LOG): New
 definition. 	(gpt_partition_map_iterate): Support non-512B sectors.

---
 ChangeLog     |  5 +++++
 partmap/gpt.c | 21 +++++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d456f1fca..3eff5f884 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* partmap/gpt.c (MAX_SECTOR_LOG): New definition.
+	(gpt_partition_map_iterate): Support non-512B sectors.
+
 2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/efi/init.c (grub_efi_init): Disable watchdog.
diff --git a/partmap/gpt.c b/partmap/gpt.c
index 9dd88bec1..0dd670cce 100644
--- a/partmap/gpt.c
+++ b/partmap/gpt.c
@@ -32,6 +32,9 @@ static grub_uint8_t grub_gpt_magic[8] =
 
 static const grub_gpt_part_type_t grub_gpt_partition_type_empty = GRUB_GPT_PARTITION_TYPE_EMPTY;
 
+/* 512 << 7 = 65536 byte sectors.  */
+#define MAX_SECTOR_LOG 7
+
 static struct grub_partition_map grub_gpt_partition_map;
 
 
@@ -48,6 +51,7 @@ gpt_partition_map_iterate (grub_disk_t disk,
   grub_uint64_t entries;
   unsigned int i;
   int last_offset = 0;
+  int sector_log = 0;
 
   /* Read the protective MBR.  */
   if (grub_disk_read (disk, 0, 0, sizeof (mbr), &mbr))
@@ -62,15 +66,20 @@ gpt_partition_map_iterate (grub_disk_t disk,
     return grub_error (GRUB_ERR_BAD_PART_TABLE, "no GPT partition map found");
 
   /* Read the GPT header.  */
-  if (grub_disk_read (disk, 1, 0, sizeof (gpt), &gpt))
-    return grub_errno;
+  for (sector_log = 0; sector_log < MAX_SECTOR_LOG; sector_log++)
+    {
+      if (grub_disk_read (disk, 1 << sector_log, 0, sizeof (gpt), &gpt))
+	return grub_errno;
 
-  if (grub_memcmp (gpt.magic, grub_gpt_magic, sizeof (grub_gpt_magic)))
+      if (grub_memcmp (gpt.magic, grub_gpt_magic, sizeof (grub_gpt_magic)) == 0)
+	break;
+    }
+  if (sector_log == MAX_SECTOR_LOG)
     return grub_error (GRUB_ERR_BAD_PART_TABLE, "no valid GPT header");
 
   grub_dprintf ("gpt", "Read a valid GPT header\n");
 
-  entries = grub_le_to_cpu64 (gpt.partitions);
+  entries = grub_le_to_cpu64 (gpt.partitions) << sector_log;
   for (i = 0; i < grub_le_to_cpu32 (gpt.maxpart); i++)
     {
       if (grub_disk_read (disk, entries, last_offset,
@@ -81,9 +90,9 @@ gpt_partition_map_iterate (grub_disk_t disk,
 		       sizeof (grub_gpt_partition_type_empty)))
 	{
 	  /* Calculate the first block and the size of the partition.  */
-	  part.start = grub_le_to_cpu64 (entry.start);
+	  part.start = grub_le_to_cpu64 (entry.start) << sector_log;
 	  part.len = (grub_le_to_cpu64 (entry.end)
-		      - grub_le_to_cpu64 (entry.start) + 1);
+		      - grub_le_to_cpu64 (entry.start) + 1)  << sector_log;
 	  part.offset = entries;
 	  part.number = i;
 	  part.index = last_offset;

From 8d4a2fec0dc785b51c3d45a40cfa5b046ede9875 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 2 Jul 2010 10:50:04 +0100
Subject: [PATCH 1184/1628] * util/grub-mkconfig_lib.in
 (grub_file_is_not_garbage): Sometimes grub.d/README accidentally ends up
 executable for one reason or another.  Ignore it.

---
 ChangeLog                 | 6 ++++++
 util/grub-mkconfig_lib.in | 1 +
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 3eff5f884..57209d1f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkconfig_lib.in (grub_file_is_not_garbage): Sometimes
+	grub.d/README accidentally ends up executable for one reason or
+	another.  Ignore it.
+
 2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* partmap/gpt.c (MAX_SECTOR_LOG): New definition.
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 14ea1842f..bdd2b8c6f 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -128,6 +128,7 @@ grub_file_is_not_garbage ()
   if test -f "$1" ; then
     case "$1" in
       *.dpkg-*) return 1 ;; # debian dpkg
+      README*)  return 1 ;; # documentation
     esac
   else
     return 1

From e3c8cd3719b2ce245be0be4ce2542deb39d18617 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 2 Jul 2010 12:13:48 +0100
Subject: [PATCH 1185/1628] * docs/grub.texi (Changes from GRUB Legacy): New
 section. (Future): Fix typo.

---
 ChangeLog      |  5 ++++
 docs/grub.texi | 71 +++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 57209d1f0..badca6588 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (Changes from GRUB Legacy): New section.
+	(Future): Fix typo.
+
 2010-07-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkconfig_lib.in (grub_file_is_not_garbage): Sometimes
diff --git a/docs/grub.texi b/docs/grub.texi
index ba5b43a1c..cf73a2d38 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -106,6 +106,7 @@ This edition documents version @value{VERSION}.
 * Overview::                    What exactly GRUB is and how to use it
 * History::                     From maggot to house fly
 * Features::                    GRUB features
+* Changes from GRUB Legacy::    Differences from previous versions
 * Role of a boot loader::       The role of a boot loader
 @end menu
 
@@ -190,6 +191,74 @@ extents, and by the end of 2009 multiple major distributions were installing
 it by default.
 
 
+@node Changes from GRUB Legacy
+@section Differences from previous versions
+
+GRUB 2 is a rewrite of GRUB (@pxref{History}), although it shares many
+characteristics with the previous version, now known as GRUB Legacy.  Users
+of GRUB Legacy may need some guidance to find their way around this new
+version.
+
+@itemize @bullet
+@item
+The configuration file has a new name (@file{grub.cfg} rather than
+@file{menu.lst} or @file{grub.conf}), new syntax (@pxref{Configuration}) and
+many new commands (@pxref{Commands}).  Configuration cannot be copied over
+directly, although most GRUB Legacy users should not find the syntax too
+surprising.
+
+@item
+@file{grub.cfg} is typically automatically generated by
+@command{grub-mkconfig} (@pxref{Simple configuration}).  This makes it
+easier to handle versioned kernel upgrades.
+
+@item
+Partition numbers in GRUB device names now start at 1, not 0 (@pxref{Naming
+convention}).
+
+@item
+The configuration file is now written in something closer to a full
+scripting language: variables, conditionals, and loops are available.
+
+@item
+A small amount of persistent storage is available across reboots, using the
+@command{save_env} and @command{load_env} commands in GRUB and the
+@command{grub-editenv} utility.
+
+@item
+GRUB 2 has more reliable ways to find its own files and those of target
+kernels on multiple-disk systems, and has commands (@pxref{search}) to find
+devices using file system labels or Universally Unique Identifiers (UUIDs).
+
+@item
+GRUB 2 is available for several other types of system in addition to the PC
+BIOS systems supported by GRUB Legacy: PC EFI, PC coreboot, PowerPC, SPARC,
+and MIPS Lemote Yeeloong are all supported.
+
+@item
+Many more file systems are supported, including but not limited to ext4,
+HFS+, and NTFS.
+
+@item
+GRUB 2 can read files directly from LVM and RAID devices.
+
+@item
+A graphical terminal and a graphical menu system are available.
+
+@item
+GRUB 2's interface can be translated, including menu entry names.
+
+@item
+The image files (@pxref{Images}) that make up GRUB have been reorganised;
+Stage 1, Stage 1.5, and Stage 2 are no more.
+
+@item
+GRUB 2 puts many facilities in dynamically loaded modules, allowing the core
+image to be smaller, and allowing the core image to be built in more
+flexible ways.
+@end itemize
+
+
 @node Features
 @section GRUB features
 
@@ -2655,7 +2724,7 @@ Once we get your report, we will try to fix the bugs.
 We started the next generation of GRUB, GRUB 2. GRUB 2 includes
 internationalization, dynamic module loading, real memory management,
 multiple architecture support, a scripting language, and many other
-nice feature. If you are interested in the development of GRUB 2, take
+nice features. If you are interested in the development of GRUB 2, take
 a look at @uref{http://www.gnu.org/software/grub/grub.html, the
 homepage}.
 

From 507736c87c49712ac618169d17a659bd6c25eecc Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 2 Jul 2010 12:32:05 +0100
Subject: [PATCH 1186/1628] * util/grub-mkconfig_lib.in (uses_abstraction): New
 function. * util/grub.d/10_linux.in: Use it to check for LVM, so that
 LVM-on-RAID is handled correctly.

---
 ChangeLog                 |  6 ++++++
 util/grub-mkconfig_lib.in | 12 ++++++++++++
 util/grub.d/10_linux.in   |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index badca6588..fc139b4ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkconfig_lib.in (uses_abstraction): New function.
+	* util/grub.d/10_linux.in: Use it to check for LVM, so that
+	LVM-on-RAID is handled correctly.
+
 2010-07-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Changes from GRUB Legacy): New section.
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index bdd2b8c6f..9a77d1bdf 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -190,3 +190,15 @@ version_find_latest ()
 gettext_quoted () {
   $gettext "$@" | sed "s/'/'\\\\''/g"
 }
+
+uses_abstraction () {
+  device=$1
+
+  abstraction="`${grub_probe} --device ${device} --target=abstraction`"
+  for module in ${abstraction}; do
+    if test "x${module}" = "x$2"; then
+      return 0
+    fi
+  done
+  return 1
+}
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 2e0143df2..14b85c7f1 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -45,7 +45,7 @@ esac
 
 if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
     || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
-    || [ "x`grub-probe -t abstraction --device ${GRUB_DEVICE}`" = "xlvm"  ] ; then
+    || uses_abstraction "${GRUB_DEVICE}" lvm; then
   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
 else
   LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}

From 47695765a475d114590f94fadcb8cc55acac3824 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 2 Jul 2010 13:42:18 +0100
Subject: [PATCH 1187/1628] * kern/efi/init.c (grub_efi_init):
 set_watchdog_timer takes four arguments, not three.

---
 ChangeLog       | 5 +++++
 kern/efi/init.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fc139b4ca..a8c5b4503 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* kern/efi/init.c (grub_efi_init): set_watchdog_timer takes four
+	arguments, not three.
+
 2010-07-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkconfig_lib.in (uses_abstraction): New function.
diff --git a/kern/efi/init.c b/kern/efi/init.c
index d8a85eddf..c124aa292 100644
--- a/kern/efi/init.c
+++ b/kern/efi/init.c
@@ -36,8 +36,8 @@ grub_efi_init (void)
   /* Initialize the memory management system.  */
   grub_efi_mm_init ();
 
-  efi_call_3 (grub_efi_system_table->boot_services->set_watchdog_timer,
-	      0, 0, 0);
+  efi_call_4 (grub_efi_system_table->boot_services->set_watchdog_timer,
+	      0, 0, 0, NULL);
 
   grub_efidisk_init ();
 }

From e03ed6c1eebe42172070944d4d611cf58626cdd1 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 2 Jul 2010 13:47:14 +0100
Subject: [PATCH 1188/1628] * include/grub/misc.h (grub_reboot): Declare as
 noreturn. * kern/efi/efi.c (grub_reboot): Don't return, even if reset_system
 fails. (grub_halt): Likewise. * kern/ieee1275/openfw.c (grub_reboot): Don't
 return, even if reset-all fails. (grub_halt): Don't return, even if all of
 shut-down, power-off, and poweroff fail.

---
 ChangeLog              | 11 +++++++++++
 include/grub/misc.h    |  2 +-
 kern/efi/efi.c         |  2 ++
 kern/ieee1275/openfw.c |  2 ++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a8c5b4503..e1e7ef00d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* include/grub/misc.h (grub_reboot): Declare as noreturn.
+	* kern/efi/efi.c (grub_reboot): Don't return, even if reset_system
+	fails.
+	(grub_halt): Likewise.
+	* kern/ieee1275/openfw.c (grub_reboot): Don't return, even if
+	reset-all fails.
+	(grub_halt): Don't return, even if all of shut-down, power-off, and
+	poweroff fail.
+
 2010-07-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* kern/efi/init.c (grub_efi_init): set_watchdog_timer takes four
diff --git a/include/grub/misc.h b/include/grub/misc.h
index a1b753250..909e85b5f 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -298,7 +298,7 @@ grub_div_roundup (unsigned int x, unsigned int y)
 }
 
 /* Reboot the machine.  */
-void EXPORT_FUNC (grub_reboot) (void);
+void EXPORT_FUNC (grub_reboot) (void) __attribute__ ((noreturn));
 
 #ifdef GRUB_MACHINE_PCBIOS
 /* Halt the system, using APM if possible. If NO_APM is true, don't
diff --git a/kern/efi/efi.c b/kern/efi/efi.c
index d8b225535..126e40901 100644
--- a/kern/efi/efi.c
+++ b/kern/efi/efi.c
@@ -170,6 +170,7 @@ grub_reboot (void)
   grub_efi_fini ();
   efi_call_4 (grub_efi_system_table->runtime_services->reset_system,
               GRUB_EFI_RESET_COLD, GRUB_EFI_SUCCESS, 0, NULL);
+  for (;;) ;
 }
 #endif
 
@@ -179,6 +180,7 @@ grub_halt (void)
   grub_efi_fini ();
   efi_call_4 (grub_efi_system_table->runtime_services->reset_system,
               GRUB_EFI_RESET_SHUTDOWN, GRUB_EFI_SUCCESS, 0, NULL);
+  for (;;) ;
 }
 
 int
diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index 5693f3be0..75767d13c 100644
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -420,6 +420,7 @@ void
 grub_reboot (void)
 {
   grub_ieee1275_interpret ("reset-all", 0);
+  for (;;) ;
 }
 #endif
 
@@ -431,4 +432,5 @@ grub_halt (void)
   grub_ieee1275_interpret ("shut-down", 0);
   grub_ieee1275_interpret ("power-off", 0);
   grub_ieee1275_interpret ("poweroff", 0);
+  for (;;) ;
 }

From 2bdb2892b339fa253e1ca8016ebef52b477ab65d Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 2 Jul 2010 17:11:42 +0100
Subject: [PATCH 1189/1628] * util/deviceiter.c (grub_util_iterate_devices):
 Skip device-mapper devices when iterating over /dev/disk/by-id; they will be
 handled later if appropriate, which they aren't always (e.g. LVM).

---
 ChangeLog         | 6 ++++++
 util/deviceiter.c | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e1e7ef00d..dcdb3a7ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/deviceiter.c (grub_util_iterate_devices): Skip device-mapper
+	devices when iterating over /dev/disk/by-id; they will be handled
+	later if appropriate, which they aren't always (e.g. LVM).
+
 2010-07-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* include/grub/misc.h (grub_reboot): Declare as noreturn.
diff --git a/util/deviceiter.c b/util/deviceiter.c
index e3a0ab76d..64d1cae87 100644
--- a/util/deviceiter.c
+++ b/util/deviceiter.c
@@ -519,6 +519,10 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 	    /* Skip partition entries.  */
 	    if (strstr (entry->d_name, "-part"))
 	      continue;
+	    /* Skip device-mapper entries; we'll handle the ones we want
+	       later.  */
+	    if (strncmp (entry->d_name, "dm-", sizeof ("dm-") - 1) == 0)
+	      continue;
 	    if (names_len >= names_max)
 	      {
 		names_max *= 2;

From 919e37b0aca8d50578bf043c089056bb5eecdcdf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Jul 2010 18:20:48 +0200
Subject: [PATCH 1190/1628] Inline setcolorstate and move grub_Cls out of
 kernel.img

---
 commands/minicmd.c  | 15 ---------------
 include/grub/term.h | 12 ++++++++++--
 kern/term.c         | 26 --------------------------
 normal/main.c       | 18 ++++++++++++++++++
 normal/term.c       | 17 +++++++++++++++++
 5 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/commands/minicmd.c b/commands/minicmd.c
index 4d0ae19b4..25bda6d23 100644
--- a/commands/minicmd.c
+++ b/commands/minicmd.c
@@ -336,19 +336,8 @@ grub_mini_cmd_exit (struct grub_command *cmd __attribute__ ((unused)),
   return 0;
 }
 
-/* clear */
-static grub_err_t
-grub_mini_cmd_clear (struct grub_command *cmd __attribute__ ((unused)),
-		   int argc __attribute__ ((unused)),
-		   char *argv[] __attribute__ ((unused)))
-{
-  grub_cls ();
-  return 0;
-}
-
 static grub_command_t cmd_cat, cmd_help, cmd_root;
 static grub_command_t cmd_dump, cmd_rmmod, cmd_lsmod, cmd_exit;
-static grub_command_t cmd_clear;
 
 GRUB_MOD_INIT(minicmd)
 {
@@ -373,9 +362,6 @@ GRUB_MOD_INIT(minicmd)
   cmd_exit =
     grub_register_command ("exit", grub_mini_cmd_exit,
 			   0, N_("Exit from GRUB."));
-  cmd_clear =
-    grub_register_command ("clear", grub_mini_cmd_clear,
-			   0, N_("Clear the screen."));
 }
 
 GRUB_MOD_FINI(minicmd)
@@ -387,5 +373,4 @@ GRUB_MOD_FINI(minicmd)
   grub_unregister_command (cmd_rmmod);
   grub_unregister_command (cmd_lsmod);
   grub_unregister_command (cmd_exit);
-  grub_unregister_command (cmd_clear);
 }
diff --git a/include/grub/term.h b/include/grub/term.h
index c744c3fb6..9fab96a69 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -263,8 +263,7 @@ void grub_putcode (grub_uint32_t code, struct grub_term_output *term);
 int EXPORT_FUNC(grub_getkey) (void);
 int EXPORT_FUNC(grub_checkkey) (void);
 int EXPORT_FUNC(grub_getkeystatus) (void);
-void EXPORT_FUNC(grub_cls) (void);
-void EXPORT_FUNC(grub_setcolorstate) (grub_term_color_state state);
+void grub_cls (void);
 void EXPORT_FUNC(grub_refresh) (void);
 void grub_puts_terminal (const char *str, struct grub_term_output *term);
 grub_uint16_t *grub_term_save_pos (void);
@@ -345,6 +344,15 @@ grub_term_setcolorstate (struct grub_term_output *term,
     term->setcolorstate (term, state);
 }
 
+static inline void
+grub_setcolorstate (grub_term_color_state state)
+{
+  struct grub_term_output *term;
+  
+  FOR_ACTIVE_TERM_OUTPUTS(term)
+    grub_term_setcolorstate (term, state);
+}
+
 /* Set the normal color and the highlight color. The format of each
    color is VGA's.  */
 static inline void 
diff --git a/kern/term.c b/kern/term.c
index a1f8b9f93..47bd426fd 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -126,32 +126,6 @@ grub_getkeystatus (void)
   return status;
 }
 
-void
-grub_cls (void)
-{
-  struct grub_term_output *term;
-
-  FOR_ACTIVE_TERM_OUTPUTS(term)  
-  {
-    if ((term->flags & GRUB_TERM_DUMB) || (grub_env_get ("debug")))
-      {
-	grub_putcode_dumb ('\n', term);
-	grub_term_refresh (term);
-      }
-    else
-      (term->cls) (term);
-  }
-}
-
-void
-grub_setcolorstate (grub_term_color_state state)
-{
-  struct grub_term_output *term;
-  
-  FOR_ACTIVE_TERM_OUTPUTS(term)
-    grub_term_setcolorstate (term, state);
-}
-
 void
 grub_refresh (void)
 {
diff --git a/normal/main.c b/normal/main.c
index 7d2459e62..e6b0f729a 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -692,6 +692,18 @@ grub_env_write_pager (struct grub_env_var *var __attribute__ ((unused)),
   return grub_strdup (val);
 }
 
+/* clear */
+static grub_err_t
+grub_mini_cmd_clear (struct grub_command *cmd __attribute__ ((unused)),
+		   int argc __attribute__ ((unused)),
+		   char *argv[] __attribute__ ((unused)))
+{
+  grub_cls ();
+  return 0;
+}
+
+static grub_command_t cmd_clear;
+
 static void (*grub_xputs_saved) (const char *str);
 
 GRUB_MOD_INIT(normal)
@@ -705,6 +717,10 @@ GRUB_MOD_INIT(normal)
   if (mod)
     grub_dl_ref (mod);
 
+  cmd_clear =
+    grub_register_command ("clear", grub_mini_cmd_clear,
+			   0, N_("Clear the screen."));
+
   grub_set_history (GRUB_DEFAULT_HISTORY_SIZE);
 
   grub_register_variable_hook ("pager", 0, grub_env_write_pager);
@@ -734,4 +750,6 @@ GRUB_MOD_FINI(normal)
   grub_register_variable_hook ("pager", 0, 0);
   grub_fs_autoload_hook = 0;
   free_handler_list ();
+
+  grub_unregister_command (cmd_clear);
 }
diff --git a/normal/term.c b/normal/term.c
index 47e61c5e8..46ca95843 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -774,3 +774,20 @@ grub_xputs_normal (const char *str)
     }
   grub_free (unicode_str);
 }
+
+void
+grub_cls (void)
+{
+  struct grub_term_output *term;
+
+  FOR_ACTIVE_TERM_OUTPUTS(term)  
+  {
+    if ((term->flags & GRUB_TERM_DUMB) || (grub_env_get ("debug")))
+      {
+	grub_putcode ('\n', term);
+	grub_term_refresh (term);
+      }
+    else
+      (term->cls) (term);
+  }
+}

From 942a10c71e5de8a106344b91deae991cd3e30a44 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Jul 2010 18:25:42 +0200
Subject: [PATCH 1191/1628] 	* font/font.c
 (grub_font_get_glyph_with_fallback): Avoid dereferencing 	NULL font.

---
 ChangeLog   | 5 +++++
 font/font.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index dcdb3a7ae..f26c62431 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* font/font.c (grub_font_get_glyph_with_fallback): Avoid dereferencing
+	NULL font.
+
 2010-07-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/deviceiter.c (grub_util_iterate_devices): Skip device-mapper
diff --git a/font/font.c b/font/font.c
index 9a89cadc5..89e993146 100644
--- a/font/font.c
+++ b/font/font.c
@@ -1029,6 +1029,8 @@ grub_font_get_glyph_with_fallback (grub_font_t font, grub_uint32_t code)
       next = node->next;
 
       glyph = grub_font_get_glyph_internal (curfont, code);
+      if (glyph && !font)
+	return glyph;
       if (glyph)
 	{
 	  int d;

From 4037210375271ec4eb80e942a518e5f9de5a58f0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Jul 2010 18:28:54 +0200
Subject: [PATCH 1192/1628] 	* gfxmenu/gui_list.c (draw_menu): Use viewport
 to simplify code and fix 	too long captions. 
 (list_get_minimal_size): Take selection box into account.

---
 ChangeLog          |  6 ++++++
 gfxmenu/gui_list.c | 37 ++++++++++++++++++++++++++-----------
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f26c62431..36dd9fb49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* gfxmenu/gui_list.c (draw_menu): Use viewport to simplify code and fix
+	too long captions.
+	(list_get_minimal_size): Take selection box into account.
+
 2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* font/font.c (grub_font_get_glyph_with_fallback): Avoid dereferencing
diff --git a/gfxmenu/gui_list.c b/gfxmenu/gui_list.c
index 8583a214e..8058fcc4f 100644
--- a/gfxmenu/gui_list.c
+++ b/gfxmenu/gui_list.c
@@ -210,7 +210,7 @@ draw_scrollbar (list_impl_t self,
 
 /* Draw the list of items.  */
 static void
-draw_menu (list_impl_t self, int width, int num_shown_items)
+draw_menu (list_impl_t self, int num_shown_items)
 {
   if (! self->menu_box || ! self->selected_item_box)
     return;
@@ -227,10 +227,18 @@ draw_menu (list_impl_t self, int width, int num_shown_items)
 
   grub_gfxmenu_box_t selbox = self->selected_item_box;
   int sel_leftpad = selbox->get_left_pad (selbox);
-  int item_top = boxpad;
-  int item_left = boxpad + sel_leftpad;
+  int sel_toppad = selbox->get_top_pad (selbox);
+  int item_top = sel_toppad;
   int menu_index;
   int visible_index;
+  struct grub_video_rect oviewport;
+
+  grub_video_get_viewport (&oviewport.x, &oviewport.y,
+			   &oviewport.width, &oviewport.height);
+  grub_video_set_viewport (oviewport.x + boxpad, 
+			   oviewport.y + boxpad,
+			   oviewport.width - 2 * boxpad,
+			   oviewport.height - 2 * boxpad);
 
   for (visible_index = 0, menu_index = self->first_shown_index;
        visible_index < num_shown_items && menu_index < self->view->menu->size;
@@ -240,16 +248,16 @@ draw_menu (list_impl_t self, int width, int num_shown_items)
 
       if (is_selected)
         {
-          int sel_toppad = selbox->get_top_pad (selbox);
-          selbox->set_content_size (selbox, (width - 2 * boxpad), item_height);
-          selbox->draw (selbox, item_left - sel_leftpad,
+          selbox->set_content_size (selbox, oviewport.width - 2 * boxpad - 2,
+				    item_height - 1);
+          selbox->draw (selbox, 0,
                         item_top - sel_toppad);
         }
 
       struct grub_video_bitmap *icon;
       if ((icon = get_item_icon (self, menu_index)) != 0)
         grub_video_blit_bitmap (icon, GRUB_VIDEO_BLIT_BLEND,
-                                item_left,
+                                sel_leftpad,
                                 item_top + (item_height - self->icon_height) / 2,
                                 0, 0, self->icon_width, self->icon_height);
 
@@ -266,12 +274,16 @@ draw_menu (list_impl_t self, int width, int num_shown_items)
       grub_font_draw_string (item_title,
                              font,
                              grub_gui_map_color (text_color),
-                             item_left + self->icon_width + icon_text_space,
+                             sel_leftpad + self->icon_width + icon_text_space,
                              (item_top + (item_height - (ascent + descent))
                               / 2 + ascent));
 
       item_top += item_height + item_vspace;
     }
+  grub_video_set_viewport (oviewport.x,
+			   oviewport.y,
+			   oviewport.width,
+			   oviewport.height);
 }
 
 static void
@@ -313,7 +325,7 @@ list_paint (void *vself, const grub_video_rect_t *region)
     box->draw (box, 0, 0);
 
     grub_gui_set_viewport (&content_rect, &vpsave2);
-    draw_menu (self, content_rect.width, num_shown_items);
+    draw_menu (self, num_shown_items);
     grub_gui_restore_viewport (&vpsave2);
 
     if (drawing_scrollbar)
@@ -322,7 +334,7 @@ list_paint (void *vself, const grub_video_rect_t *region)
 		      0, self->view->menu->size,
 		      self->bounds.width - box_right_pad
 		      + self->scrollbar_width,
-		      box_top_pad + self->item_padding,
+		      box_top_pad,
 		      self->bounds.height - box_top_pad - box_bottom_pad);
   }
 
@@ -375,6 +387,9 @@ list_get_minimal_size (void *vself, unsigned *width, unsigned *height)
       int box_right_pad = box->get_right_pad (box);
       int box_bottom_pad = box->get_bottom_pad (box);
       unsigned width_s;
+
+      grub_gfxmenu_box_t selbox = self->selected_item_box;
+      int sel_toppad = selbox->get_top_pad (selbox);
       
       *width = grub_font_get_string_width (self->item_font, "Typical OS");
       width_s = grub_font_get_string_width (self->selected_item_font,
@@ -388,7 +403,7 @@ list_get_minimal_size (void *vself, unsigned *width, unsigned *height)
       *height = (item_height * num_items
                  + item_vspace * (num_items - 1)
                  + 2 * boxpad
-                 + box_top_pad + box_bottom_pad);
+                 + box_top_pad + box_bottom_pad + sel_toppad);
     }
   else
     {

From 50f0bcdab58ff554916fb0dda7bb4505f0ac1484 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 2 Jul 2010 18:04:54 +0100
Subject: [PATCH 1193/1628] * include/grub/types.h: Define the C99-style
 PRIxGRUB_SIZE macro, suitable for using within the format argument of printf
 when converting grub_size_t. * disk/usbms.c (grub_usbms_transfer): Use
 PRIxGRUB_SIZE rather than "x" to convert grub_size_t arguments.

---
 ChangeLog            | 8 ++++++++
 disk/usbms.c         | 4 ++--
 include/grub/types.h | 8 ++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 36dd9fb49..47da0d981 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* include/grub/types.h: Define the C99-style PRIxGRUB_SIZE macro,
+	suitable for using within the format argument of printf when
+	converting grub_size_t.
+	* disk/usbms.c (grub_usbms_transfer): Use PRIxGRUB_SIZE rather than
+	"x" to convert grub_size_t arguments.
+
 2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* gfxmenu/gui_list.c (draw_menu): Use viewport to simplify code and fix
diff --git a/disk/usbms.c b/disk/usbms.c
index a49b30e7e..f913ee3f7 100644
--- a/disk/usbms.c
+++ b/disk/usbms.c
@@ -312,7 +312,7 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
       grub_dprintf ("usb", "buf:\n");
       if (size <= 64)
         for (i=0; i<size; i++)
-          grub_dprintf ("usb", "0x%02x: 0x%02x\n", i, buf[i]);
+          grub_dprintf ("usb", "0x%02" PRIxGRUB_SIZE ": 0x%02x\n", i, buf[i]);
       else
           grub_dprintf ("usb", "Too much data for debug print...\n");
     }
@@ -330,7 +330,7 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
       /* Debug print of sent data. */
       if (size <= 256)
         for (i=0; i<size; i++)
-          grub_dprintf ("usb", "0x%02x: 0x%02x\n", i, buf[i]);
+          grub_dprintf ("usb", "0x%02" PRIxGRUB_SIZE ": 0x%02x\n", i, buf[i]);
       else
           grub_dprintf ("usb", "Too much data for debug print...\n");
     }
diff --git a/include/grub/types.h b/include/grub/types.h
index a9e8adfd6..4499e4538 100644
--- a/include/grub/types.h
+++ b/include/grub/types.h
@@ -92,10 +92,18 @@ typedef grub_int32_t	grub_target_ssize_t;
 typedef grub_uint64_t	grub_addr_t;
 typedef grub_uint64_t	grub_size_t;
 typedef grub_int64_t	grub_ssize_t;
+
+# if GRUB_CPU_SIZEOF_LONG == 8
+#  define PRIxGRUB_SIZE	"lx"
+# else
+#  define PRIxGRUB_SIZE	"llx"
+# endif
 #else
 typedef grub_uint32_t	grub_addr_t;
 typedef grub_uint32_t	grub_size_t;
 typedef grub_int32_t	grub_ssize_t;
+
+# define PRIxGRUB_SIZE	"x"
 #endif
 
 #if GRUB_CPU_SIZEOF_LONG == 8

From a06cec31e7ef6e38c1a139f9ade30fe02fc2d5f7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Jul 2010 20:37:08 +0200
Subject: [PATCH 1194/1628] Skip bidi if no RTL characters are present

---
 normal/charset.c | 290 +++++++++++++++++++++++++----------------------
 1 file changed, 152 insertions(+), 138 deletions(-)

diff --git a/normal/charset.c b/normal/charset.c
index 0fcc2a440..fd377e1c6 100644
--- a/normal/charset.c
+++ b/normal/charset.c
@@ -859,6 +859,7 @@ grub_bidi_line_logical_to_visual (const grub_uint32_t *logical,
   unsigned run_start, run_end;
   struct grub_unicode_glyph *visual;
   unsigned cur_level;
+  int bidi_needed = 0;
 
   auto void push_stack (unsigned new_override, unsigned new_level);
   void push_stack (unsigned new_override, unsigned new_level)
@@ -967,9 +968,11 @@ grub_bidi_line_logical_to_visual (const grub_uint32_t *logical,
 	switch (type)
 	  {
 	  case GRUB_BIDI_TYPE_RLE:
+	    bidi_needed = 1;
 	    push_stack (cur_override, (cur_level | 1) + 1);
 	    break;
 	  case GRUB_BIDI_TYPE_RLO:
+	    bidi_needed = 1;
 	    push_stack (OVERRIDE_R, (cur_level | 1) + 1);
 	    break;
 	  case GRUB_BIDI_TYPE_LRE:
@@ -983,6 +986,9 @@ grub_bidi_line_logical_to_visual (const grub_uint32_t *logical,
 	    break;
 	  case GRUB_BIDI_TYPE_BN:
 	    break;
+	  case GRUB_BIDI_TYPE_R:
+	  case GRUB_BIDI_TYPE_AL:
+	    bidi_needed = 1;
 	  default:
 	    {
 	      if (join_state == JOIN_FORCE)
@@ -1017,166 +1023,174 @@ grub_bidi_line_logical_to_visual (const grub_uint32_t *logical,
       }
   }
 
-  for (run_start = 0; run_start < visual_len; run_start = run_end)
+  if (bidi_needed)
     {
-      unsigned prev_level, next_level, cur_run_level;
-      unsigned last_type, last_strong_type;
-      for (run_end = run_start; run_end < visual_len &&
-	     levels[run_end] == levels[run_start]; run_end++);
-      if (run_start == 0)
-	prev_level = base_level;
-      else
-	prev_level = levels[run_start - 1];
-      if (run_end == visual_len)
-	next_level = base_level;
-      else
-	next_level = levels[run_end];
-      cur_run_level = levels[run_start];
-      if (prev_level & 1)
-	last_type = GRUB_BIDI_TYPE_R;
-      else
-	last_type = GRUB_BIDI_TYPE_L;
-      last_strong_type = last_type;
-      for (i = run_start; i < run_end; i++)
+      for (run_start = 0; run_start < visual_len; run_start = run_end)
 	{
-	  switch (resolved_types[i])
+	  unsigned prev_level, next_level, cur_run_level;
+	  unsigned last_type, last_strong_type;
+	  for (run_end = run_start; run_end < visual_len &&
+		 levels[run_end] == levels[run_start]; run_end++);
+	  if (run_start == 0)
+	    prev_level = base_level;
+	  else
+	    prev_level = levels[run_start - 1];
+	  if (run_end == visual_len)
+	    next_level = base_level;
+	  else
+	    next_level = levels[run_end];
+	  cur_run_level = levels[run_start];
+	  if (prev_level & 1)
+	    last_type = GRUB_BIDI_TYPE_R;
+	  else
+	    last_type = GRUB_BIDI_TYPE_L;
+	  last_strong_type = last_type;
+	  for (i = run_start; i < run_end; i++)
 	    {
-	    case GRUB_BIDI_TYPE_NSM:
-	      resolved_types[i] = last_type;
-	      break;
-	    case GRUB_BIDI_TYPE_EN:
-	      if (last_strong_type == GRUB_BIDI_TYPE_AL)
-		resolved_types[i] = GRUB_BIDI_TYPE_AN;
-	      break;
-	    case GRUB_BIDI_TYPE_L:
-	    case GRUB_BIDI_TYPE_R:
-	      last_strong_type = resolved_types[i];
-	      break;
-	    case GRUB_BIDI_TYPE_ES:
-	      if (last_type == GRUB_BIDI_TYPE_EN
-		  && i + 1 < run_end 
-		  && resolved_types[i + 1] == GRUB_BIDI_TYPE_EN)
-		resolved_types[i] = GRUB_BIDI_TYPE_EN;
-	      else
-		resolved_types[i] = GRUB_BIDI_TYPE_ON;
-	      break;
-	    case GRUB_BIDI_TYPE_ET:
-	      {
-		unsigned j;
-		if (last_type == GRUB_BIDI_TYPE_EN)
-		  {
+	      switch (resolved_types[i])
+		{
+		case GRUB_BIDI_TYPE_NSM:
+		  resolved_types[i] = last_type;
+		  break;
+		case GRUB_BIDI_TYPE_EN:
+		  if (last_strong_type == GRUB_BIDI_TYPE_AL)
+		    resolved_types[i] = GRUB_BIDI_TYPE_AN;
+		  break;
+		case GRUB_BIDI_TYPE_L:
+		case GRUB_BIDI_TYPE_R:
+		  last_strong_type = resolved_types[i];
+		  break;
+		case GRUB_BIDI_TYPE_ES:
+		  if (last_type == GRUB_BIDI_TYPE_EN
+		      && i + 1 < run_end 
+		      && resolved_types[i + 1] == GRUB_BIDI_TYPE_EN)
 		    resolved_types[i] = GRUB_BIDI_TYPE_EN;
-		    break;
-		  }
-		for (j = i; j < run_end
-		       && resolved_types[j] == GRUB_BIDI_TYPE_ET; j++);
-		if (j != run_end && resolved_types[j] == GRUB_BIDI_TYPE_EN)
+		  else
+		    resolved_types[i] = GRUB_BIDI_TYPE_ON;
+		  break;
+		case GRUB_BIDI_TYPE_ET:
 		  {
+		    unsigned j;
+		    if (last_type == GRUB_BIDI_TYPE_EN)
+		      {
+			resolved_types[i] = GRUB_BIDI_TYPE_EN;
+			break;
+		      }
+		    for (j = i; j < run_end
+			   && resolved_types[j] == GRUB_BIDI_TYPE_ET; j++);
+		    if (j != run_end && resolved_types[j] == GRUB_BIDI_TYPE_EN)
+		      {
+			for (; i < run_end
+			       && resolved_types[i] == GRUB_BIDI_TYPE_ET; i++)
+			  resolved_types[i] = GRUB_BIDI_TYPE_EN;
+			i--;
+			break;
+		      }
 		    for (; i < run_end
 			   && resolved_types[i] == GRUB_BIDI_TYPE_ET; i++)
-		      resolved_types[i] = GRUB_BIDI_TYPE_EN;
+		      resolved_types[i] = GRUB_BIDI_TYPE_ON;
 		    i--;
-		    break;
+		    break;		
 		  }
-		for (; i < run_end
-		       && resolved_types[i] == GRUB_BIDI_TYPE_ET; i++)
+		  break;
+		case GRUB_BIDI_TYPE_CS:
+		  if (last_type == GRUB_BIDI_TYPE_EN
+		      && i + 1 < run_end 
+		      && resolved_types[i + 1] == GRUB_BIDI_TYPE_EN)
+		    {
+		      resolved_types[i] = GRUB_BIDI_TYPE_EN;
+		      break;
+		    }
+		  if (last_type == GRUB_BIDI_TYPE_AN
+		      && i + 1 < run_end 
+		      && (resolved_types[i + 1] == GRUB_BIDI_TYPE_AN
+			  || (resolved_types[i + 1] == GRUB_BIDI_TYPE_EN
+			      && last_strong_type == GRUB_BIDI_TYPE_AL)))
+		    {
+		      resolved_types[i] = GRUB_BIDI_TYPE_EN;
+		      break;
+		    }
 		  resolved_types[i] = GRUB_BIDI_TYPE_ON;
-		i--;
-		break;		
-	      }
-	      break;
-	    case GRUB_BIDI_TYPE_CS:
-	      if (last_type == GRUB_BIDI_TYPE_EN
-		  && i + 1 < run_end 
-		  && resolved_types[i + 1] == GRUB_BIDI_TYPE_EN)
-		{
-		  resolved_types[i] = GRUB_BIDI_TYPE_EN;
+		  break;
+		case GRUB_BIDI_TYPE_AL:
+		  last_strong_type = resolved_types[i];
+		  resolved_types[i] = GRUB_BIDI_TYPE_R;
+		  break;
+		default: /* Make GCC happy.  */
 		  break;
 		}
-	      if (last_type == GRUB_BIDI_TYPE_AN
-		  && i + 1 < run_end 
-		  && (resolved_types[i + 1] == GRUB_BIDI_TYPE_AN
-		      || (resolved_types[i + 1] == GRUB_BIDI_TYPE_EN
-			  && last_strong_type == GRUB_BIDI_TYPE_AL)))
-		{
-		  resolved_types[i] = GRUB_BIDI_TYPE_EN;
-		  break;
-		}
-	      resolved_types[i] = GRUB_BIDI_TYPE_ON;
-	      break;
-	    case GRUB_BIDI_TYPE_AL:
-	      last_strong_type = resolved_types[i];
-	      resolved_types[i] = GRUB_BIDI_TYPE_R;
-	      break;
-	    default: /* Make GCC happy.  */
-	      break;
+	      last_type = resolved_types[i];
+	      if (resolved_types[i] == GRUB_BIDI_TYPE_EN
+		  && last_strong_type == GRUB_BIDI_TYPE_L)
+		resolved_types[i] = GRUB_BIDI_TYPE_L;
 	    }
-	  last_type = resolved_types[i];
-	  if (resolved_types[i] == GRUB_BIDI_TYPE_EN
-	      && last_strong_type == GRUB_BIDI_TYPE_L)
-	    resolved_types[i] = GRUB_BIDI_TYPE_L;
-	}
-      if (prev_level & 1)
-	last_type = GRUB_BIDI_TYPE_R;
-      else
-	last_type = GRUB_BIDI_TYPE_L;
-      for (i = run_start; i < run_end; )
-	{
-	  unsigned j;
-	  unsigned next_type;
-	  for (j = i; j < run_end &&
-	  	 (resolved_types[j] == GRUB_BIDI_TYPE_B
-	  	  || resolved_types[j] == GRUB_BIDI_TYPE_S
-	  	  || resolved_types[j] == GRUB_BIDI_TYPE_WS
-	  	  || resolved_types[j] == GRUB_BIDI_TYPE_ON); j++);
-	  if (j == i)
+	  if (prev_level & 1)
+	    last_type = GRUB_BIDI_TYPE_R;
+	  else
+	    last_type = GRUB_BIDI_TYPE_L;
+	  for (i = run_start; i < run_end; )
 	    {
-	      if (resolved_types[i] == GRUB_BIDI_TYPE_L)
-		last_type = GRUB_BIDI_TYPE_L;
+	      unsigned j;
+	      unsigned next_type;
+	      for (j = i; j < run_end &&
+		     (resolved_types[j] == GRUB_BIDI_TYPE_B
+		      || resolved_types[j] == GRUB_BIDI_TYPE_S
+		      || resolved_types[j] == GRUB_BIDI_TYPE_WS
+		      || resolved_types[j] == GRUB_BIDI_TYPE_ON); j++);
+	      if (j == i)
+		{
+		  if (resolved_types[i] == GRUB_BIDI_TYPE_L)
+		    last_type = GRUB_BIDI_TYPE_L;
+		  else
+		    last_type = GRUB_BIDI_TYPE_R;
+		  i++;
+		  continue;
+		}
+	      if (j == run_end)
+		next_type = (next_level & 1) ? GRUB_BIDI_TYPE_R : GRUB_BIDI_TYPE_L;
 	      else
-		last_type = GRUB_BIDI_TYPE_R;
-	      i++;
+		{
+		  if (resolved_types[j] == GRUB_BIDI_TYPE_L)
+		    next_type = GRUB_BIDI_TYPE_L;
+		  else
+		    next_type = GRUB_BIDI_TYPE_R;
+		}
+	      if (next_type == last_type)
+		for (; i < j; i++)
+		  resolved_types[i] = last_type;
+	      else
+		for (; i < j; i++)
+		  resolved_types[i] = (cur_run_level & 1) ? GRUB_BIDI_TYPE_R
+		    : GRUB_BIDI_TYPE_L;
+	    }
+	}
+
+      for (i = 0; i < visual_len; i++)
+	{
+	  if (!(levels[i] & 1) && resolved_types[i] == GRUB_BIDI_TYPE_R)
+	    {
+	      levels[i]++;
 	      continue;
 	    }
-	  if (j == run_end)
-	    next_type = (next_level & 1) ? GRUB_BIDI_TYPE_R : GRUB_BIDI_TYPE_L;
-	  else
+	  if (!(levels[i] & 1) && (resolved_types[i] == GRUB_BIDI_TYPE_AN
+				   || resolved_types[i] == GRUB_BIDI_TYPE_EN))
 	    {
-	      if (resolved_types[j] == GRUB_BIDI_TYPE_L)
-		next_type = GRUB_BIDI_TYPE_L;
-	      else
-		next_type = GRUB_BIDI_TYPE_R;
+	      levels[i] += 2;
+	      continue;
+	    }
+	  if ((levels[i] & 1) && (resolved_types[i] == GRUB_BIDI_TYPE_L
+				  || resolved_types[i] == GRUB_BIDI_TYPE_AN
+				  || resolved_types[i] == GRUB_BIDI_TYPE_EN))
+	    {
+	      levels[i]++;
+	      continue;
 	    }
-	  if (next_type == last_type)
-	    for (; i < j; i++)
-	      resolved_types[i] = last_type;
-	  else
-	    for (; i < j; i++)
-	      resolved_types[i] = (cur_run_level & 1) ? GRUB_BIDI_TYPE_R
-		: GRUB_BIDI_TYPE_L;
 	}
     }
-
-  for (i = 0; i < visual_len; i++)
+  else
     {
-      if (!(levels[i] & 1) && resolved_types[i] == GRUB_BIDI_TYPE_R)
-	{
-	  levels[i]++;
-	  continue;
-	}
-      if (!(levels[i] & 1) && (resolved_types[i] == GRUB_BIDI_TYPE_AN
-			       || resolved_types[i] == GRUB_BIDI_TYPE_EN))
-	{
-	  levels[i] += 2;
-	  continue;
-	}
-      if ((levels[i] & 1) && (resolved_types[i] == GRUB_BIDI_TYPE_L
-			      || resolved_types[i] == GRUB_BIDI_TYPE_AN
-			      || resolved_types[i] == GRUB_BIDI_TYPE_EN))
-	{
-	  levels[i]++;
-	  continue;
-	}
+      for (i = 0; i < visual_len; i++)
+	levels[i] = 0;
     }
   grub_free (resolved_types);
 

From 169ed0dc6948aa75b50ec404615758bbb4c563f5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Jul 2010 22:05:47 +0200
Subject: [PATCH 1195/1628] Add missing include

---
 kern/ieee1275/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kern/ieee1275/init.c b/kern/ieee1275/init.c
index 51668986a..99ce7179b 100644
--- a/kern/ieee1275/init.c
+++ b/kern/ieee1275/init.c
@@ -28,7 +28,7 @@
 #include <grub/env.h>
 #include <grub/misc.h>
 #include <grub/time.h>
-#include <grub/machine/console.h>
+#include <grub/ieee1275/console.h>
 #include <grub/ieee1275/ofdisk.h>
 #include <grub/ieee1275/ieee1275.h>
 #include <grub/offsets.h>

From 41ca7b81a96d09e7a11c609c46e8b117fedd0995 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Jul 2010 22:06:19 +0200
Subject: [PATCH 1196/1628] Fix letters reversing in qemu

---
 kern/i386/qemu/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kern/i386/qemu/init.c b/kern/i386/qemu/init.c
index ff4c7b62f..201ba3633 100644
--- a/kern/i386/qemu/init.c
+++ b/kern/i386/qemu/init.c
@@ -61,7 +61,7 @@ load_font (void)
   grub_vga_gr_write (0xff, GRUB_VGA_GR_BITMASK);
 
   for (i = 0; i < 128; i++)
-    grub_memcpy ((void *) (0xa0000 + 32 * i), ascii_bitmaps + 16 * (0x7f - i), 16);
+    grub_memcpy ((void *) (0xa0000 + 32 * i), ascii_bitmaps + 16 * i, 16);
 }
 
 static void

From fb73efb7944841f98053a0b76a6108e0ab541080 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Jul 2010 22:06:43 +0200
Subject: [PATCH 1197/1628] Fix mismerge

---
 commands/help.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/commands/help.c b/commands/help.c
index 964f8f5ac..7ccfc4fac 100644
--- a/commands/help.c
+++ b/commands/help.c
@@ -49,19 +49,20 @@ grub_cmd_help (grub_extcmd_t ext __attribute__ ((unused)), int argc,
 	  			      
 	    command_help = grub_xasprintf ("%s %s", cmd->name, summary_translated);
 	    if (!command_help)
-	      return 1;
+	      break;
 
 	    grub_utf8_to_ucs4_alloc (command_help, &unicode_command_help,
 				     &unicode_last_position);
+
 	    FOR_ACTIVE_TERM_OUTPUTS(term)
 	    {
 	      unsigned stringwidth;
 	      grub_uint32_t *unicode_last_screen_position;
-	    
+
 	      unicode_last_screen_position = unicode_command_help;
-	    
+
 	      stringwidth = 0;
-	    
+
 	      while (unicode_last_screen_position < unicode_last_position && 
 		     stringwidth < ((grub_term_width (term) / 2) - 2))
 		{

From c23bb3837f05aca785d9885cdc6e5a96113924fc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Jul 2010 22:07:56 +0200
Subject: [PATCH 1198/1628] Update ChangeLog

---
 ChangeLog.bidi | 119 +++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 106 insertions(+), 13 deletions(-)

diff --git a/ChangeLog.bidi b/ChangeLog.bidi
index 972e6e356..64539f5e9 100644
--- a/ChangeLog.bidi
+++ b/ChangeLog.bidi
@@ -7,7 +7,6 @@
 	(TARGET_CFLAGS): Add -DHAVE_UNIFONT_WIDTHSPEC=1 if font was available.
 	* autogen.sh: Generate unidata.c.
 	* commands/cat.c (grub_cmd_cat): Don't use grub_putchar.
-	* commands/handler.c (grub_cmd_handler): Likewise.
 	* commands/ls.c (grub_ls_list_devices): Likewise.
 	(grub_ls_list_files): Likewise.
 	* commands/minicmd.c (grub_mini_cmd_cat): Likewise.
@@ -28,6 +27,12 @@
 	(charset_mod_SOURCES): Removed.
 	(charset_mod_CFLAGS): Likewise.
 	(charset_mod_LDFLAGS): Likewise.
+	(pkglib_MODULES) [ieee1275]: Remove terminfo.mod.
+	* conf/powerpc-ieee1275.rmk (kernel_img_SOURCES): Add term/terminfo.c
+	and term/tparm.c.
+	* conf/sparc64-ieee1275.rmk (kernel_img_SOURCES): Likewise.
+	* conf/i386-ieee1275.rmk (kernel_img_SOURCES): Likewise.
+	(kernel_img_HEADERS): Add terminfo.h.
 	* font/font.c (ascii_glyph_lookup): Return NULL on failure.
 	Fill ->font. Reverse ascii bitmaps.
 	(grub_font_get_xheight): New function.
@@ -67,23 +72,45 @@
 	(grub_normal_get_char_counter): New proto.
 	(grub_normal_reset_more): Likewise.
 	(grub_xputs_normal): Likewise.
+	* include/grub/powerpc/ieee1275/console.h: Removed.
+	* include/grub/sparc64/ieee1275/console.h: Likewise.
 	* include/grub/term.h (GRUB_TERM_CODE_TYPE_MASK): New definition.
 	(GRUB_TERM_CODE_TYPE_ASCII): Likewise.
-	(GRUB_TERM_CODE_TYPE_VGA): Likewise.
+	(GRUB_TERM_CODE_TYPE_CP437): Likewise.
 	(GRUB_TERM_CODE_TYPE_UTF8_LOGICAL): Likewise.
 	(GRUB_TERM_CODE_TYPE_UTF8_VISUAL): Likewise.
 	(GRUB_TERM_CODE_TYPE_VISUAL_GLYPHS): Likewise.
+	(grub_term_input): Pass reference to self. All users updated.
 	(grub_term_output): Pass grub_unicode_glyph to putchar and getcharwidth.
-	All users updated.
+	Pass reference to self. New fields normal_color, highlight_color and
+	data. All users updated.
 	(grub_putchar): Removed.
 	(grub_putcode): Remove EXPORT_FUNC since it's not in kernel anymore.
 	(grub_unicode_estimate_width): New function.
 	(grub_term_getcharwidth): Add defaults.
+	(GRUB_TERM_DEFAULT_NORMAL_COLOR): New definition.
+	(GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR): Likewise.
+	(GRUB_TERM_DEFAULT_STANDARD_COLOR): Likewise.
+	(grub_cls): Remove EXPORT_FUNC.
+	(grub_setcolorstate): Inline.
+	(grub_newline_hook): Removed.
+	* include/grub/terminfo.h: Rewritten. All users updated.
 	* include/grub/unicode.h: New file.
 	* include/grub/video.h (grub_video_signed_rect): New type.
+	* kern/emu/console.c (grub_console_highlight_color): Removed.
+	(grub_console_normal_color): Likewise.
+	(grub_console_standard_color): Made static.
+	(grub_ncurses_putchar): Remove mapping.
+	(grub_ncurses_getcharwidth): Removed.
+	(grub_ncurses_term_output): Declare as GRUB_TERM_CODE_TYPE_ASCII.
+	(grub_ncurses_setcolor): Removed.
+	(grub_ncurses_getcolor): Likewise.
 	* kern/i386/pc/startup.S (grub_console_real_putchar): Renamed to ...
 	(grub_console_putchar): ... this.
 	(grub_console_putchar): Handle argument difference.
+	* kern/ieee1275/init.c (grub_machine_init): Split console_init into
+	console_init_early and console_init_lately.
+	* kern/sparc64/ieee1275/init.c (grub_machine_init): Likewise.
 	* kern/misc.c (grub_puts): Removed.
 	(grub_vprintf): Store UTF-8 string instead of outputting it directly.
 	(grub_vsnprintf_real): Remove str = NULL support.
@@ -94,7 +121,6 @@
 	(grub_putchar): Removed.
 	(grub_xputs_dumb): New function.
 	(grub_xputs): New variable.
-	(grub_cls): Use grub_putcode_dumb.
 	* lib/charset.c: Move from here ...
 	* normal/charset.c: ... to here.
 	(grub_ucs4_to_utf8): New function.
@@ -174,25 +200,89 @@
 	* term/i386/vga_common.c (map_char): Removed.
 	(grub_console_putchar): Likewise.
 	(grub_console_getcharwidth): Likewise.
-	* term/ieee1275/ofconsole.c (grub_ofconsole_putchar): Remove mapping.
+	* term/ieee1275/ofconsole.c: Simplify using terminfo.
+	(colors): Reordered to match terminfo.
+	(grub_ofconsole_normal_color): Removed.
+	(grub_ofconsole_writeesc): Likewise.
+	(grub_ofconsole_highlight_color): Likewise.
+	(grub_ofconsole_getcharwidth): Likewise.
+	(grub_ofconsole_setcolorstate): Likewise.
+	(grub_ofconsole_setcolor): Likewise.
+	(grub_ofconsole_getcolor): Likewise.
+	(grub_ofconsole_readkey): Renamed to ...
+	(readkey): ... this. Remove escape sequence handling. Return -1 on no
+	key.
+	(grub_ofconsole_checkkey): Removed.
+	(grub_ofconsole_getkey): Likewise.
+	(grub_ofconsole_getxy): Likewise.
+	(grub_ofconsole_gotoxy): Likewise.
+	(grub_ofconsole_cls): Likewise.
+	(grub_ofconsole_refresh): Likewise.
+	(grub_ofconsole_terminfo_input): New struct.
+	(grub_ofconsole_terminfo_output): Likewise.
+	(grub_ofconsole_term_input): Use terminfo.
+	(grub_ofconsole_term_output): Likewise.
+	(grub_console_init): Split into ...
+	(grub_console_init_early): ...this and ...
+	(grub_console_init_lately): ...this. Use terminfo.
+	(grub_ofconsole_putchar): Renamed to ...
+	(put): ... this. Remove mapping.
 	(grub_ofconsole_term_output): Declare as GRUB_TERM_CODE_TYPE_ASCII.
-	* term/serial.c (options): New options ascii, utf8 and visual-utf8.
-	(grub_serial_putchar): Remove mapping. Use estimated_width.
-	(grub_cmd_serial): Handle charset arguments.
-	* term/terminfo.c (putstr): Use putchar directly.
+	* term/serial.c: Simplify using terminfo.
+	(xpos): Removed.
+	(ypos): Likewise.
+	(keep_track): Likewise.
+	(registered): Likewise.
+	(input_buf): Likewise.
+	(npending): Likewise.
+	(serial_translate_key_sequence): Likewise.
+	(fill_input_buf): Likewise.
+	(grub_serial_checkkey): Likewise.
+	(grub_serial_getkey): Likewise.
+	(grub_serial_getxy): Likewise.
+	(grub_serial_gotoxy): Likewise.
+	(grub_serial_putchar): Likewise.
+	(grub_serial_cls): Likewise.
+	(grub_serial_setcolorstate): Likewise.
+	(grub_serial_setcursor): Likewise.
+	(serial_hw_init): Use serial_hw_fetch.
+	(grub_serial_terminfo_input): New variable.
+	(grub_serial_terminfo_output): Likewise.
+	(grub_serial_term_input): Use terminfo.
+	(grub_serial_term_output): Likewise.
+	* term/terminfo.c (putstr): Use put.
+	(grub_terminfo_all_free): New function
+	(grub_terminfo_set_current): New types vt100-color, ieee1275 and dumb.
+	(grub_terminfo_output_register): New function.
+	(grub_terminfo_output_unregister): Likewise.
+	(grub_terminfo_getxy): Likewise.
+	(grub_terminfo_readkey): Likewise.
+	(grub_terminfo_checkkey): Likewise.
+	(grub_terminfo_getkey): Likewise.
+	(grub_terminfo_input_init): Likewise.
+	(print_terminfo): Likewise.
+	(grub_cmd_terminfo): Handle encoding.
+	(grub_terminfo_gotoxy): Track position.
+	(grub_terminfo_cls): Likewise.
+	(grub_terminfo_putchar): Likewise.
+	(grub_terminfo_setcolorstate): Handle colors
+	(grub_terminfo_cursor_on): This ...
+	(grub_terminfo_cursor_off): ... and this merged into ...
+	(grub_terminfo_setcursor): ... this.
+	* term/tparm.c (grub_terminfo_tparm): Avoid NULL dereferencing.
 	* unicode/ArabicShaping.txt: New file (imported from Unicode).
 	* unicode/BidiMirroring.txt: Likewise.
 	* unicode/UnicodeData.txt: Likewise.
 	* unicode/COPYING: Likewise.
-	* util/console.c (grub_ncurses_putchar): Remove mapping.
-	(grub_ncurses_getcharwidth): Removed.
-	(grub_ncurses_term_output): Declare as GRUB_TERM_CODE_TYPE_ASCII.
 	* util/grub-editenv.c (grub_putchar): Removed.
 	(grub_xputs_real): New function.
 	(grub_xputs): New variable.
 	* util/grub-fstest.c (grub_putchar): Removed.
 	(grub_xputs_real): New function.
 	(grub_xputs): New variable.
+	* util/grub-mkdevicemap.c (grub_putchar): Removed.
+	(grub_xputs_real): New function.
+	(grub_xputs): New variable.
 	* util/grub-probe.c (grub_putchar): Removed.
 	(grub_xputs_real): New function.
 	(grub_xputs): New variable.
@@ -220,4 +310,7 @@
 	(add_font): Handle GSUB.
 	(write_font_width_spec): New function.
 	(main): Sort glyphs.
-
+	* commands/minicmd.c (grub_mini_cmd_clear): Moved from here ...
+	* normal/main.c (grub_mini_cmd_clear): ..here. All users updated.
+	* kern/term.c (grub_cls): Moved from here...
+	* normal/term.c (grub_cls): ... here.

From 6b654bb0a564e380d5bd2859bdf665c4002d8785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Sun, 4 Jul 2010 11:13:31 +0200
Subject: [PATCH 1199/1628] Do not embed when there are multiple (top-level)
 partmaps.

---
 ChangeLog                 |  5 +++++
 util/i386/pc/grub-setup.c | 17 +++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 090e04cef..136e42185 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-04  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* util/i386/pc/grub-setup.c (setup): Do not embed when there are
+	multiple (top-level) partmaps.
+
 2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Bidi and diacritics support.
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 9407c5d47..3fe7d5622 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -95,6 +95,7 @@ setup (const char *dir,
   grub_uint16_t core_sectors;
   grub_device_t root_dev, dest_dev;
   const char *dest_partmap;
+  int multiple_partmaps;
   grub_uint8_t *boot_drive;
   grub_disk_addr_t *kernel_sector;
   grub_uint16_t *boot_drive_check;
@@ -356,10 +357,17 @@ setup (const char *dir,
     {
       if (p->parent)
 	return 0;
-      dest_partmap = p->partmap->name;
-      return 1;
+      if (dest_partmap == NULL)
+	dest_partmap = p->partmap->name;
+      else if (strcmp (dest_partmap, p->partmap->name) != 0)
+	{
+	  multiple_partmaps = 1;
+	  return 1;
+	}
+      return 0;
     }
   dest_partmap = 0;
+  multiple_partmaps = 0;
   grub_partition_iterate (dest_dev->disk, identify_partmap);
 
   if (! dest_partmap)
@@ -367,6 +375,11 @@ setup (const char *dir,
       grub_util_warn (_("Attempting to install GRUB to a partitionless disk.  This is a BAD idea."));
       goto unable_to_embed;
     }
+  if (multiple_partmaps)
+    {
+      grub_util_warn (_("Attempting to install GRUB to a disk with multiple partition labels.  This is not supported yet."));
+      goto unable_to_embed;
+    }
 
   if (strcmp (dest_partmap, "msdos") == 0)
     grub_partition_iterate (dest_dev->disk, find_usable_region_msdos);

From 653d6e94b0a2f5853a7bbab2597d888cd35cc54b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 4 Jul 2010 14:23:55 +0200
Subject: [PATCH 1200/1628] 	* util/i386/efi/grub-install.in: Don't use
 empty grub_device. 	Reported by: Tito Keitel.

---
 util/i386/efi/grub-install.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/i386/efi/grub-install.in b/util/i386/efi/grub-install.in
index 7fc78b434..269317cd0 100644
--- a/util/i386/efi/grub-install.in
+++ b/util/i386/efi/grub-install.in
@@ -236,7 +236,7 @@ fi
 # this command is allowed to fail (--target=fs already grants us that the
 # filesystem will be accessible).
 partmap_module=
-for x in `$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`; do
+for x in `$grub_probe --target=partmap --device-map=${device_map} ${grubdir} 2> /dev/null`; do
    partmap_module="$partmap_module part_$x";
 done
 

From 72a2026d335662f269eb7e25e54de32065f0fccb Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 4 Jul 2010 14:29:01 +0200
Subject: [PATCH 1201/1628] missing ChangeLog commit.

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 136e42185..b7a478ec9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
 	* util/i386/pc/grub-setup.c (setup): Do not embed when there are
 	multiple (top-level) partmaps.
 
+2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/i386/efi/grub-install.in: Don't use empty grub_device.
+	Reported by: Tito Keitel.
+
 2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Bidi and diacritics support.

From cb7f64b229948b1790bbcc5378b0acc63ac5b0eb Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sun, 4 Jul 2010 22:00:45 +0100
Subject: [PATCH 1202/1628] * kern/emu/getroot.c [__GNU__]: Include
 <sys/mman.h> for munmap.

---
 ChangeLog          | 4 ++++
 kern/emu/getroot.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b7a478ec9..01469ca8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-04  Colin Watson  <cjwatson@ubuntu.com>
+
+	* kern/emu/getroot.c [__GNU__]: Include <sys/mman.h> for munmap.
+
 2010-07-04  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* util/i386/pc/grub-setup.c (setup): Do not embed when there are
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index fa74c384b..24b2cd486 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -33,6 +33,7 @@
 #include <hurd.h>
 #include <hurd/lookup.h>
 #include <hurd/fs.h>
+#include <sys/mman.h>
 #endif
 
 #include <grub/mm.h>

From 57ebd41ef1ac51a21948e762ce95dc67e7522c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Mon, 5 Jul 2010 00:45:14 +0200
Subject: [PATCH 1203/1628] Avoid == in test command, it's not portable.

---
 ChangeLog                   | 5 +++++
 configure.ac                | 2 +-
 util/grub.d/30_os-prober.in | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 01469ca8f..31020644e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-04  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* configure.ac: Avoid == in test command, it's not portable.
+	* util/grub.d/30_os-prober.in: Likewise.
+
 2010-07-04  Colin Watson  <cjwatson@ubuntu.com>
 
 	* kern/emu/getroot.c [__GNU__]: Include <sys/mman.h> for munmap.
diff --git a/configure.ac b/configure.ac
index e5840118c..55c2625cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,7 +190,7 @@ for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
   done
 done
 
-if test "x$FONT_SOURCE" == x && ( test "x$platform" = xqemu || test "x$platform" = xyeeloong ); then
+if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xyeeloong ); then
    AC_MSG_ERROR([qemu and yeeloong ports need unifont])
 fi
 
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 601663dcc..ecd87bb1c 100644
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -52,7 +52,7 @@ EOF
              set do_resume=1
            fi
         fi
-        if [ \$do_resume == 0 ]; then
+        if [ \$do_resume = 0 ]; then
            xnu_uuid ${OSXUUID} uuid
            if [ -f /Extra/DSDT.aml ]; then
               acpi -e /Extra/DSDT.aml

From 38d8f4f3f7510baf4b6eec55036dedc47022bec5 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 5 Jul 2010 01:09:00 +0100
Subject: [PATCH 1204/1628] * util/i386/pc/grub-setup.c (setup): Rename prefix
 to install_prefix, in line with install_dos_part and install_bsd_part. Add
 new prefix variable, which is copied to install_prefix after comparing
 core.img in memory with the one read from disk in the no-embedding case, and
 use that rather than overwriting install_prefix immediately when installing
 to a partition. Fixes Debian bug #586621; based on patches by Matt Kraai and
 M. Vefa Bicakci.

---
 ChangeLog                 | 11 +++++++++++
 util/i386/pc/grub-setup.c | 20 ++++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31020644e..9162f2bdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-05  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/i386/pc/grub-setup.c (setup): Rename prefix to
+	install_prefix, in line with install_dos_part and install_bsd_part.
+	Add new prefix variable, which is copied to install_prefix after
+	comparing core.img in memory with the one read from disk in the
+	no-embedding case, and use that rather than overwriting
+	install_prefix immediately when installing to a partition.
+	Fixes Debian bug #586621; based on patches by Matt Kraai and M. Vefa
+	Bicakci.
+
 2010-07-04  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* configure.ac: Avoid == in test command, it's not portable.
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 3fe7d5622..8b2f52bb4 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -102,7 +102,8 @@ setup (const char *dir,
   struct grub_boot_blocklist *first_block, *block;
   grub_int32_t *install_dos_part, *install_bsd_part;
   grub_int32_t dos_part, bsd_part;
-  char *prefix;
+  char *install_prefix;
+  char *prefix = NULL;
   char *tmp_img;
   int i;
   grub_disk_addr_t first_sector;
@@ -234,8 +235,8 @@ setup (const char *dir,
 				       + GRUB_KERNEL_MACHINE_INSTALL_DOS_PART);
   install_bsd_part = (grub_int32_t *) (core_img + GRUB_DISK_SECTOR_SIZE
 				       + GRUB_KERNEL_MACHINE_INSTALL_BSD_PART);
-  prefix = (char *) (core_img + GRUB_DISK_SECTOR_SIZE +
-		     GRUB_KERNEL_MACHINE_PREFIX);
+  install_prefix = (char *) (core_img + GRUB_DISK_SECTOR_SIZE +
+			     GRUB_KERNEL_MACHINE_PREFIX);
 
   /* Open the root device and the destination device.  */
   root_dev = grub_device_open (root);
@@ -312,15 +313,13 @@ setup (const char *dir,
  	      bsd_part = -1;
  	    }
 
-	  if (prefix[0] != '(')
+	  if (install_prefix[0] != '(')
 	    {
-	      char *root_part_name, *new_prefix;
+	      char *root_part_name;
 
 	      root_part_name =
 		grub_partition_get_name (root_dev->disk->partition);
-	      new_prefix = xasprintf ("(,%s)%s", root_part_name, prefix);
-	      strcpy (prefix, new_prefix);
-	      free (new_prefix);
+	      prefix = xasprintf ("(,%s)%s", root_part_name, install_prefix);
 	      free (root_part_name);
 	    }
 	}
@@ -411,6 +410,8 @@ setup (const char *dir,
 
   *install_dos_part = grub_cpu_to_le32 (dos_part);
   *install_bsd_part = grub_cpu_to_le32 (bsd_part);
+  if (prefix)
+    strcpy (install_prefix, prefix);
 
   /* The first blocklist contains the whole sectors.  */
   first_block->start = grub_cpu_to_le64 (embed_region.start + 1);
@@ -571,6 +572,8 @@ unable_to_embed:
 
   *install_dos_part = grub_cpu_to_le32 (dos_part);
   *install_bsd_part = grub_cpu_to_le32 (bsd_part);
+  if (prefix)
+    strcpy (install_prefix, prefix);
 
   /* Write the first two sectors of the core image onto the disk.  */
   grub_util_info ("opening the core image `%s'", core_path);
@@ -590,6 +593,7 @@ unable_to_embed:
   /* Sync is a Good Thing.  */
   sync ();
 
+  free (prefix);
   free (core_path);
   free (core_img);
   free (boot_img);

From e3f90044e1fd4336a21496d5e022d1e77c037b42 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 5 Jul 2010 01:24:10 +0100
Subject: [PATCH 1205/1628] * Makefile.in (MAINTAINER_CLEANFILES): Add
 unicode/UnicodeData.txt, unicode/BidiMirroring.txt,
 unicode/ArabicShaping.txt, and unidata.c.

---
 ChangeLog   | 5 +++++
 Makefile.in | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9162f2bdd..294c002f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-05  Colin Watson  <cjwatson@ubuntu.com>
+
+	* Makefile.in (MAINTAINER_CLEANFILES): Add unicode/UnicodeData.txt,
+	unicode/BidiMirroring.txt, unicode/ArabicShaping.txt, and unidata.c.
+
 2010-07-05  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/i386/pc/grub-setup.c (setup): Rename prefix to
diff --git a/Makefile.in b/Makefile.in
index 873ccdb75..9fec32c69 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -164,7 +164,10 @@ DISTCLEANFILES = config.status config.cache config.log config.h \
 MAINTAINER_CLEANFILES = $(srcdir)/configure $(srcdir)/aclocal.m4 \
 	$(MKFILES) $(srcdir)/config.guess \
 	$(srcdir)/config.sub $(srcdir)/install-sh $(srcdir)/missing \
-	$(srcdir)/DISTLIST $(srcdir)/config.h.in $(srcdir)/stamp-h.in $(INFOS)
+	$(srcdir)/DISTLIST $(srcdir)/config.h.in $(srcdir)/stamp-h.in \
+	$(srcdir)/unicode/UnicodeData.txt $(srcdir)/unicode/BidiMirroring.txt \
+	$(srcdir)/unicode/ArabicShaping.txt $(srcdir)/unidata.c \
+	$(INFOS)
 
 # The default target.
 all: all-local

From fcda2a1f80e8be57922849929b66af94db413649 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 5 Jul 2010 01:45:25 +0100
Subject: [PATCH 1206/1628] fix typo in reporter name

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 294c002f6..94f90ce73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,7 +31,7 @@
 2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/i386/efi/grub-install.in: Don't use empty grub_device.
-	Reported by: Tito Keitel.
+	Reported by: Tino Keitel.
 
 2010-07-02  Vladimir Serbinenko  <phcoder@gmail.com>
 

From 5cf691510fe69e8a55f97a192ceb6c2510e9a009 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 5 Jul 2010 09:29:02 +0100
Subject: [PATCH 1207/1628] * Makefile.in: Set LINGUAS to empty if ENABLE_NLS
 is undefined.

---
 ChangeLog   | 4 ++++
 Makefile.in | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 94f90ce73..e2bcc44f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-05  Colin Watson  <cjwatson@ubuntu.com>
+
+	* Makefile.in: Set LINGUAS to empty if ENABLE_NLS is undefined.
+
 2010-07-05  Colin Watson  <cjwatson@ubuntu.com>
 
 	* Makefile.in (MAINTAINER_CLEANFILES): Add unicode/UnicodeData.txt,
diff --git a/Makefile.in b/Makefile.in
index 9fec32c69..ec3b72296 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,9 +53,13 @@ XGETTEXT = @XGETTEXT@
 MSGMERGE = @MSGMERGE@
 MSGFMT = @MSGFMT@
 
+ifdef ENABLE_NLS
 LINGUAS = $(shell for i in $(srcdir)/po/*.po ; do \
 			if test -e $$i ; then echo $$i ; fi ; \
 		done | sed -e "s,.*/po/\(.*\)\.po$$,\1,")
+else
+LINGUAS =
+endif
 
 PACKAGE = @PACKAGE@
 PACKAGE_NAME = @PACKAGE_NAME@

From e75056f162880ca73bbc520ae054c1a8b9513edb Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 5 Jul 2010 11:08:04 +0100
Subject: [PATCH 1208/1628] * docs/grub.texi (Features): Update list of
 supported file systems. (GNU/Linux): Update for GRUB 2. (Serial terminal):
 Remove mention of --disable-serial, which was a GRUB Legacy configure option.
  Update instructions to use `terminal_input' and `terminal_output' rather
 than `terminal'. (Vendor power-on keys): Copy-edit.  Add cross-references to
 `Simple configuration' and `Installing GRUB using grub-install'. (Menu entry
 editor): Update for GRUB 2. (terminfo): Add vt100-color, ieee1275, and dumb
 terminal types. Document new -a, -u, and -v options. (initrd): New section.
 (initrd16): New section. (linux): New section. (linux16): New section.
 (search): The `var' argument to `--set' is optional. (GRUB only offers a
 rescue shell): Go into a little more detail on drive ordering.

---
 ChangeLog      |  20 ++++++
 docs/grub.texi | 176 +++++++++++++++++++++++++++++++++++++------------
 2 files changed, 154 insertions(+), 42 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e2bcc44f6..81dfc1c78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2010-07-05  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (Features): Update list of supported file systems.
+	(GNU/Linux): Update for GRUB 2.
+	(Serial terminal): Remove mention of --disable-serial, which was a
+	GRUB Legacy configure option.  Update instructions to use
+	`terminal_input' and `terminal_output' rather than `terminal'.
+	(Vendor power-on keys): Copy-edit.  Add cross-references to `Simple
+	configuration' and `Installing GRUB using grub-install'.
+	(Menu entry editor): Update for GRUB 2.
+	(terminfo): Add vt100-color, ieee1275, and dumb terminal types.
+	Document new -a, -u, and -v options.
+	(initrd): New section.
+	(initrd16): New section.
+	(linux): New section.
+	(linux16): New section.
+	(search): The `var' argument to `--set' is optional.
+	(GRUB only offers a rescue shell): Go into a little more detail on
+	drive ordering.
+
 2010-07-05  Colin Watson  <cjwatson@ubuntu.com>
 
 	* Makefile.in: Set LINGUAS to empty if ENABLE_NLS is undefined.
diff --git a/docs/grub.texi b/docs/grub.texi
index cf73a2d38..5d412ecd4 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -332,10 +332,12 @@ devices, partitions, and files in a directory depending on context.
 
 @item Support multiple filesystem types
 Support multiple filesystem types transparently, plus a useful explicit
-blocklist notation. The currently supported filesystem types are
-@dfn{BSD FFS}, @dfn{DOS FAT16 and FAT32}, @dfn{Minix fs}, @dfn{Linux
-ext2fs}, @dfn{ReiserFS}, @dfn{JFS}, @dfn{XFS}, and @dfn{VSTa
-fs}. @xref{Filesystem}, for more information.
+blocklist notation. The currently supported filesystem types are @dfn{Amiga
+Fast FileSystem (AFFS)}, @dfn{AtheOS fs}, @dfn{BeFS}, @dfn{cpio}, @dfn{Linux
+ext2/ext3/ext4}, @dfn{DOS FAT12/FAT16/FAT32}, @dfn{HFS}, @dfn{HFS+},
+@dfn{ISO9660}, @dfn{JFS}, @dfn{Minix fs}, @dfn{nilfs2}, @dfn{NTFS},
+@dfn{ReiserFS}, @dfn{Amiga Smart FileSystem (SFS)}, @dfn{tar}, @dfn{UDF},
+@dfn{BSD UFS/UFS2}, and @dfn{XFS}. @xref{Filesystem}, for more information.
 
 @item Support automatic decompression
 Can decompress files which were compressed by @command{gzip}. This
@@ -842,11 +844,36 @@ Run the command @command{boot} (@pxref{boot}).
 It is relatively easy to boot GNU/Linux from GRUB, because it somewhat
 resembles to boot a Multiboot-compliant OS.
 
-FIXME: this section is incomplete.
-
 @enumerate
 @item
-Set GRUB's root device to the same drive as GNU/Linux's.
+Set GRUB's root device to the same drive as GNU/Linux's.  The command
+@code{search --file --set /vmlinuz} or similar may help you
+(@pxref{search}).
+
+@item
+Load the kernel using the command @command{linux} (@pxref{linux}):
+
+@example
+grub> @kbd{linux /vmlinuz root=/dev/sda1}
+@end example
+
+If you need to specify some kernel parameters, just append them to the
+command.  For example, to set @option{acpi} to @samp{off}, do this:
+
+@example
+grub> @kbd{linux /vmlinuz root=/dev/sda1 acpi=off}
+@end example
+
+See the documentation in the Linux source tree for complete information on
+the available options.
+
+@item
+If you use an initrd, execute the command @command{initrd} (@pxref{initrd})
+after @command{linux}:
+
+@example
+grub> @kbd{initrd /initrd}
+@end example
 
 @item
 Finally, run the command @command{boot} (@pxref{boot}).
@@ -1278,18 +1305,13 @@ minicom. Refer to a manual of your operating system, for more
 information.
 
 As for GRUB, the instruction to set up a serial terminal is quite
-simple. First of all, make sure that you haven't specified the option
-@option{--disable-serial} to the configure script when you built your
-GRUB images. If you get them in binary form, probably they have serial
-terminal support already.
-
-Then, initialize your serial terminal after GRUB starts up. Here is an
-example:
+simple.  Here is an example:
 
 @example
 @group
 grub> @kbd{serial --unit=0 --speed=9600}
-grub> @kbd{terminal serial}
+grub> @kbd{terminal_input serial}
+grub> @kbd{terminal_output serial}
 @end group
 @end example
 
@@ -1317,14 +1339,16 @@ menu requires several fancy features of your terminal.
 
 @node Vendor power-on keys
 @chapter Using GRUB with vendor power-on keys
-Some laptop vendor provide an additional power-on button which boots another OS.
-GRUB supports such buttons with GRUB_TIMEOUT_BUTTON, GRUB_DEFAULT_BUTTON,
-GRUB_HIDDEN_TIMEOUT_BUTTON and GRUB_BUTTON_CMOS_ADDRESS variables in
-default/grub. GRUB_TIMEOUT_BUTTON, GRUB_DEFAULT_BUTTON and 
-GRUB_HIDDEN_TIMEOUT_BUTTON are used instead of corresponding variables without
-_BUTTON suffix when powered using special button.
-GRUB_BUTTON_CMOS_ADDRESS is vendor specific and partially model-specific.
-Values known to GRUB team are:
+
+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_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 M1530
@@ -1333,7 +1357,8 @@ Values known to GRUB team are:
 84:1 (unconfirmed)
 @end table
 
-To take full advantage of this function install GRUB into MBR.
+To take full advantage of this function, install GRUB into the MBR
+(@pxref{Installing GRUB using grub-install}).
 
 
 @node Images
@@ -1695,19 +1720,12 @@ of entry names.
 If an @key{ESC} is pressed in the editor, it aborts all the changes made
 to the configuration entry and returns to the main menu interface.
 
-When a particular line is selected, the editor places the user in a
-special version of the GRUB command-line to edit that line.  When the
-user hits @key{RET}, GRUB replaces the line in question in the boot
-entry with the changes (unless it was aborted via @key{ESC},
-in which case the changes are thrown away).
+Each line in the menu entry can be edited freely, and you can add new lines
+by pressing @key{RET} at the end of a line.  To boot the edited entry, press
+@key{Ctrl-x}.
 
-If you want to add a new line to the menu entry, press @key{o} if adding
-a line after the current line or press @key{O} if before the current
-line.
-
-To delete a line, hit the key @key{d}. Although GRUB unfortunately
-does not support @dfn{undo}, you can do almost the same thing by just
-returning to the main menu.
+Although GRUB unfortunately does not support @dfn{undo}, you can do almost
+the same thing by just returning to the main menu using @key{ESC}.
 
 
 @node Commands
@@ -1856,16 +1874,23 @@ names active.
 @node terminfo
 @subsection terminfo
 
-@deffn Command terminfo [term]
+@deffn Command terminfo [-a|-u|-v] [term]
 Define the capabilities of your terminal by giving the name of an entry in
 the terminfo database, which should correspond roughly to a @samp{TERM}
 environment variable in Unix.
 
-At the moment, only @samp{vt100} is supported in GRUB 2.  If you need other
-terminal types, please contact us to discuss the best way to include support
-for these in GRUB.
+The currently available terminal types are @samp{vt100}, @samp{vt100-color},
+@samp{ieee1275}, and @samp{dumb}.  If you need other terminal types, please
+contact us to discuss the best way to include support for these in GRUB.
 
-If no option is specified, the current terminal type is printed.
+The @option{-a} (@option{--ascii}), @option{-u} (@option{--utf8}), and
+@option{-v} (@option{--visual-utf8}) options control how non-ASCII text is
+displayed.  @option{-a} specifies an ASCII-only terminal; @option{-u}
+specifies logically-ordered UTF-8; and @option{-v} specifies
+visually-ordered UTF-8.
+
+If no option or terminal type is specified, the current terminal type is
+printed.
 @end deffn
 
 
@@ -1895,8 +1920,12 @@ you forget a command, you can run the command @command{help}
 * gptsync::                     Fill an MBR based on GPT entries
 * halt::                        Shut down your computer
 * help::                        Show help messages
+* initrd::                      Load a Linux initrd
+* initrd16::                    Load a Linux initrd (16-bit mode)
 * insmod::                      Insert a module
 * keystatus::                   Check key modifier status
+* linux::                       Load a Linux kernel
+* linux16::                     Load a Linux kernel (16-bit mode)
 * ls::                          List devices or files
 * parttool::                    Modify partition table entries
 * password::                    Set a clear-text password
@@ -2203,6 +2232,30 @@ about each of the commands whose names begin with those @var{patterns}.
 @end deffn
 
 
+@node initrd
+@subsection initrd
+
+@deffn Command initrd file
+Load an initial ramdisk for a Linux kernel image, and set the appropriate
+parameters in the Linux setup area in memory.  This may only be used after
+the @command{linux} command (@pxref{linux}) has been run.  See also
+@ref{GNU/Linux}.
+@end deffn
+
+
+@node initrd16
+@subsection initrd16
+
+@deffn Command initrd16 file
+Load an initial ramdisk for a Linux kernel image to be booted in 16-bit
+mode, and set the appropriate parameters in the Linux setup area in memory.
+This may only be used after the @command{linux16} command (@pxref{linux16})
+has been run.  See also @ref{GNU/Linux}.
+
+This command is only available on x86 systems.
+@end deffn
+
+
 @node insmod
 @subsection insmod
 
@@ -2225,6 +2278,42 @@ only if checking key modifier status is supported.
 @end deffn
 
 
+@node linux
+@subsection linux
+
+@deffn Command linux file @dots{}
+Load a Linux kernel image from @var{file}.  The rest of the line is passed
+verbatim as the @dfn{kernel command-line}.  Any initrd must be reloaded
+after using this command (@pxref{initrd}).
+
+On x86 systems, the kernel will be booted using the 32-bit boot protocol.
+Note that this means that the @samp{vga=} boot option will not work; if you
+want to set a special video mode, you will need to use GRUB commands such as
+@samp{set gfxpayload=1024x768} or @samp{set gfxpayload=keep} (to keep the
+same mode as used in GRUB) instead.  GRUB can automatically detect some uses
+of @samp{vga=} and translate them to appropriate settings of
+@samp{gfxpayload}.  The @command{linux16} command (@pxref{linux16}) avoids
+this restriction.
+@end deffn
+
+
+@node linux16
+@subsection linux16
+
+@deffn Command linux16 file @dots{}
+Load a Linux kernel image from @var{file} in 16-bit mode.  The rest of the
+line is passed verbatim as the @dfn{kernel command-line}.  Any initrd must
+be reloaded after using this command (@pxref{initrd16}).
+
+The kernel will be booted using the traditional 16-bit boot protocol.  As
+well as bypassing problems with @samp{vga=} described in @ref{linux}, this
+permits booting some other programs that implement the Linux boot protocol
+for the sake of convenience.
+
+This command is only available on x86 systems.
+@end deffn
+
+
 @node ls
 @subsection ls
 
@@ -2337,7 +2426,7 @@ Reboot the computer.
 
 @deffn Command search @
  [@option{--file}|@option{--label}|@option{--fs-uuid}] @
- [@option{--set} var] [@option{--no-floppy}] name
+ [@option{--set} [var]] [@option{--no-floppy}] name
 Search devices by file (@option{-f}, @option{--file}), filesystem label
 (@option{-l}, @option{--label}), or filesystem UUID (@option{-u},
 @option{--fs-uuid}).
@@ -2493,6 +2582,9 @@ grub-install}).  When doing this, there are a few things to remember:
 Drive ordering in your operating system may not be the same as the boot
 drive ordering used by your firmware.  Do not assume that your first hard
 drive (e.g. @samp{/dev/sda}) is the one that your firmware will boot from.
+@file{device.map} (@pxref{Device map}) can be used to override this, but it
+is usually better to use UUIDs or file system labels and avoid depending on
+drive ordering entirely.
 
 @item
 At least on BIOS systems, if you tell @command{grub-install} to install GRUB

From 1a0742d4e2a5a1d041b422391cbf8df7772a1d3a Mon Sep 17 00:00:00 2001
From: starous <starous@pracovna>
Date: Mon, 5 Jul 2010 19:02:05 +0200
Subject: [PATCH 1209/1628] USB hub support

---
 bus/usb/usbhub.c        | 88 ++++++++++++++++++++++++++++++++++-------
 include/grub/usbtrans.h | 12 +++---
 2 files changed, 80 insertions(+), 20 deletions(-)

diff --git a/bus/usb/usbhub.c b/bus/usb/usbhub.c
index 523abf93e..034ccbe8d 100644
--- a/bus/usb/usbhub.c
+++ b/bus/usb/usbhub.c
@@ -75,14 +75,47 @@ grub_usb_add_hub (grub_usb_device_t dev)
   struct grub_usb_usb_hubdesc hubdesc;
   grub_err_t err;
   int i;
+  grub_uint64_t timeout;
+  grub_usb_device_t next_dev;
+  
+  err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
+	  		            | GRUB_USB_REQTYPE_CLASS
+			            | GRUB_USB_REQTYPE_TARGET_DEV),
+                              GRUB_USB_REQ_GET_DESCRIPTOR,
+			      (GRUB_USB_DESCRIPTOR_HUB << 8) | 0,
+			      0, sizeof (hubdesc), (char *) &hubdesc);
+  if (err)
+    return err;
+  grub_dprintf ("usb", "Hub descriptor:\n\t\t len:%d, typ:0x%02x, cnt:%d, char:0x%02x, pwg:%d, curr:%d\n",
+                hubdesc.length, hubdesc.type, hubdesc.portcnt,
+                hubdesc.characteristics, hubdesc.pwdgood,
+                hubdesc.current);
 
-  grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
-			      | GRUB_USB_REQTYPE_CLASS
-			      | GRUB_USB_REQTYPE_TARGET_DEV),
-			GRUB_USB_REQ_GET_DESCRIPTOR,
-			(GRUB_USB_DESCRIPTOR_HUB << 8) | 0,
-			0, sizeof (hubdesc), (char *) &hubdesc);
+  /* Activate the first configuration. Hubs should have only one conf. */
+  grub_dprintf ("usb", "Hub set configuration\n");
+  grub_usb_set_configuration (dev, 1);
 
+  /* Power on all Hub ports.  */
+  for (i = 1; i <= hubdesc.portcnt; i++)
+    {
+      grub_dprintf ("usb", "Power on - port %d\n", i);
+      /* Power on the port and wait for possible device connect */
+      err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
+					| GRUB_USB_REQTYPE_CLASS
+					| GRUB_USB_REQTYPE_TARGET_OTHER),
+				  GRUB_USB_REQ_SET_FEATURE,
+				  GRUB_USB_HUB_FEATURE_PORT_POWER,
+				  i, 0, NULL);
+      /* Just ignore the device if some error happened */
+      if (err)
+	continue;
+    }
+  /* Wait for port power-on */
+  if (hubdesc.pwdgood >= 50)
+    grub_millisleep (hubdesc.pwdgood * 2);
+  else
+    grub_millisleep (100);
+    
   /* Iterate over the Hub ports.  */
   for (i = 1; i <= hubdesc.portcnt; i++)
     {
@@ -92,14 +125,14 @@ grub_usb_add_hub (grub_usb_device_t dev)
       err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
 					| GRUB_USB_REQTYPE_CLASS
 					| GRUB_USB_REQTYPE_TARGET_OTHER),
-				  GRUB_USB_REQ_HUB_GET_PORT_STATUS,
+				  GRUB_USB_REQ_GET_STATUS,
 				  0, i, sizeof (status), (char *) &status);
-
       /* Just ignore the device if the Hub does not report the
 	 status.  */
       if (err)
 	continue;
-
+      grub_dprintf ("usb", "Hub port %d status: 0x%02x\n", i, status);
+      	    
       /* If connected, reset and enable the port.  */
       if (status & GRUB_USB_HUB_STATUS_CONNECTED)
 	{
@@ -116,21 +149,46 @@ grub_usb_add_hub (grub_usb_device_t dev)
 		speed = GRUB_USB_SPEED_FULL;
 	    }
 
-	  /* A device is actually connected to this port, not enable
-	     the port.  XXX: Why 0x03?  According to some docs it
-	     should be 0x0.  Check the specification!  */
+	  /* A device is actually connected to this port.
+	   * Now do reset of port. */
+          grub_dprintf ("usb", "Reset hub port - port %d\n", i);
 	  err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
 					    | GRUB_USB_REQTYPE_CLASS
 					    | GRUB_USB_REQTYPE_TARGET_OTHER),
-				      0x3, 0x4, i, 0, 0);
-
+				      GRUB_USB_REQ_SET_FEATURE,
+				      GRUB_USB_HUB_FEATURE_PORT_RESET,
+				      i, 0, 0);
 	  /* If the Hub does not cooperate for this port, just skip
 	     the port.  */
 	  if (err)
 	    continue;
 
+          /* Wait for reset procedure done */
+          timeout = grub_get_time_ms () + 1000;
+          do
+            {
+              /* Get the port status.  */
+              err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
+	   	 			        | GRUB_USB_REQTYPE_CLASS
+					        | GRUB_USB_REQTYPE_TARGET_OTHER),
+				          GRUB_USB_REQ_GET_STATUS,
+				          0, i, sizeof (status), (char *) &status);
+            }
+          while (!err &&
+                 !(status & GRUB_USB_HUB_STATUS_C_PORT_RESET) &&
+                 (grub_get_time_ms() < timeout) );
+          if (err || !(status & GRUB_USB_HUB_STATUS_C_PORT_RESET) )
+            continue;
+   
 	  /* Add the device and assign a device address to it.  */
-	  grub_usb_hub_add_dev (&dev->controller, speed);
+          grub_dprintf ("usb", "Call hub_add_dev - port %d\n", i);
+	  next_dev = grub_usb_hub_add_dev (&dev->controller, speed);
+          if (! next_dev)
+            continue;
+
+          /* If the device is a Hub, scan it for more devices.  */
+          if (next_dev->descdev.class == 0x09)
+            grub_usb_add_hub (next_dev);
 	}
     }
 
diff --git a/include/grub/usbtrans.h b/include/grub/usbtrans.h
index 40fc0dd5f..8f49c246f 100644
--- a/include/grub/usbtrans.h
+++ b/include/grub/usbtrans.h
@@ -87,15 +87,17 @@ typedef struct grub_usb_transfer *grub_usb_transfer_t;
 #define GRUB_USB_REQ_SET_INTERFACE	0x0B
 #define GRUB_USB_REQ_SYNC_FRAME		0x0C
 
-#define GRUB_USB_REQ_HUB_GET_PORT_STATUS 0x00
-
 #define GRUB_USB_FEATURE_ENDP_HALT	0x00
 #define GRUB_USB_FEATURE_DEV_REMOTE_WU	0x01
 #define GRUB_USB_FEATURE_TEST_MODE	0x02
 
-#define GRUB_USB_HUB_STATUS_CONNECTED	(1 << 0)
-#define GRUB_USB_HUB_STATUS_LOWSPEED	(1 << 9)
-#define GRUB_USB_HUB_STATUS_HIGHSPEED	(1 << 10)
+#define GRUB_USB_HUB_FEATURE_PORT_RESET   0x04
+#define GRUB_USB_HUB_FEATURE_PORT_POWER   0x08
+
+#define GRUB_USB_HUB_STATUS_CONNECTED	 (1 << 0)
+#define GRUB_USB_HUB_STATUS_LOWSPEED	 (1 << 9)
+#define GRUB_USB_HUB_STATUS_HIGHSPEED	 (1 << 10)
+#define GRUB_USB_HUB_STATUS_C_PORT_RESET (1 << 20)
 
 struct grub_usb_packet_setup
 {

From 525ba5f9d0e69b1e7d4f20627a1495ef1779206b Mon Sep 17 00:00:00 2001
From: starous <starous@pracovna>
Date: Mon, 5 Jul 2010 19:06:47 +0200
Subject: [PATCH 1210/1628] UHCI portstatus correction

---
 bus/usb/uhci.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index 1510f98e8..e85f07a6f 100644
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -612,8 +612,23 @@ grub_uhci_portstatus (grub_usb_controller_t dev,
   status = grub_uhci_readreg16 (u, reg);
   grub_dprintf ("uhci", "detect=0x%02x\n", status);
 
+  if (!enable) /* We don't need reset port */
+    {
+      /* Disable the port.  */
+      grub_uhci_writereg16 (u, reg, 0 << 2);
+      grub_dprintf ("uhci", "waiting for the port to be disabled\n");
+      endtime = grub_get_time_ms () + 1000;
+      while ((grub_uhci_readreg16 (u, reg) & (1 << 2)))
+        if (grub_get_time_ms () > endtime)
+          return grub_error (GRUB_ERR_IO, "UHCI Timed out");
+
+      status = grub_uhci_readreg16 (u, reg);
+      grub_dprintf ("uhci", ">3detect=0x%02x\n", status);
+      return GRUB_ERR_NONE;
+    }
+    
   /* Reset the port.  */
-  grub_uhci_writereg16 (u, reg, enable << 9);
+  grub_uhci_writereg16 (u, reg, 1 << 9);
 
   /* Wait for the reset to complete.  XXX: How long exactly?  */
   grub_millisleep (50); /* For root hub should be nominaly 50ms */
@@ -623,7 +638,7 @@ grub_uhci_portstatus (grub_usb_controller_t dev,
   grub_millisleep (10);
 
   /* Enable the port.  */
-  grub_uhci_writereg16 (u, reg, enable << 2);
+  grub_uhci_writereg16 (u, reg, 1 << 2);
   grub_millisleep (10);
 
   grub_dprintf ("uhci", "waiting for the port to be enabled\n");

From f1f7d19ead04bb5fca0352c39fc1039970c2d4f9 Mon Sep 17 00:00:00 2001
From: starous <starous@pracovna>
Date: Mon, 5 Jul 2010 20:34:27 +0200
Subject: [PATCH 1211/1628] ChangeLog & usbhub.c correction

---
 ChangeLog        | 4 ++++
 bus/usb/usbhub.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 81dfc1c78..5b5717c18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-05  Ales Nesrsta <starous@volny.cz>
+	* bus/usb/usbhub.c, usbtrans.h: Simple USB hub support
+	* bus/usb/uhci.c: UHCI portstatus correction
+
 2010-07-05  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Features): Update list of supported file systems.
diff --git a/bus/usb/usbhub.c b/bus/usb/usbhub.c
index 034ccbe8d..2bbc850d0 100644
--- a/bus/usb/usbhub.c
+++ b/bus/usb/usbhub.c
@@ -21,6 +21,7 @@
 #include <grub/mm.h>
 #include <grub/usb.h>
 #include <grub/misc.h>
+#include <grub/time.h>
 
 /* USB Supports 127 devices, with device 0 as special case.  */
 static struct grub_usb_device *grub_usb_devs[128];

From 75d959ea7c4d0a6768afb2fab7a6b934c8cd3960 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 6 Jul 2010 01:55:26 +0200
Subject: [PATCH 1212/1628] =?UTF-8?q?Revert=20latest=20two=20Ale=C5=A1'=20?=
 =?UTF-8?q?commits?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ChangeLog        |  4 ----
 bus/usb/uhci.c   | 19 ++-----------------
 bus/usb/usbhub.c |  1 -
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5b5717c18..81dfc1c78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-2010-07-05  Ales Nesrsta <starous@volny.cz>
-	* bus/usb/usbhub.c, usbtrans.h: Simple USB hub support
-	* bus/usb/uhci.c: UHCI portstatus correction
-
 2010-07-05  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Features): Update list of supported file systems.
diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index e85f07a6f..1510f98e8 100644
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -612,23 +612,8 @@ grub_uhci_portstatus (grub_usb_controller_t dev,
   status = grub_uhci_readreg16 (u, reg);
   grub_dprintf ("uhci", "detect=0x%02x\n", status);
 
-  if (!enable) /* We don't need reset port */
-    {
-      /* Disable the port.  */
-      grub_uhci_writereg16 (u, reg, 0 << 2);
-      grub_dprintf ("uhci", "waiting for the port to be disabled\n");
-      endtime = grub_get_time_ms () + 1000;
-      while ((grub_uhci_readreg16 (u, reg) & (1 << 2)))
-        if (grub_get_time_ms () > endtime)
-          return grub_error (GRUB_ERR_IO, "UHCI Timed out");
-
-      status = grub_uhci_readreg16 (u, reg);
-      grub_dprintf ("uhci", ">3detect=0x%02x\n", status);
-      return GRUB_ERR_NONE;
-    }
-    
   /* Reset the port.  */
-  grub_uhci_writereg16 (u, reg, 1 << 9);
+  grub_uhci_writereg16 (u, reg, enable << 9);
 
   /* Wait for the reset to complete.  XXX: How long exactly?  */
   grub_millisleep (50); /* For root hub should be nominaly 50ms */
@@ -638,7 +623,7 @@ grub_uhci_portstatus (grub_usb_controller_t dev,
   grub_millisleep (10);
 
   /* Enable the port.  */
-  grub_uhci_writereg16 (u, reg, 1 << 2);
+  grub_uhci_writereg16 (u, reg, enable << 2);
   grub_millisleep (10);
 
   grub_dprintf ("uhci", "waiting for the port to be enabled\n");
diff --git a/bus/usb/usbhub.c b/bus/usb/usbhub.c
index 2bbc850d0..034ccbe8d 100644
--- a/bus/usb/usbhub.c
+++ b/bus/usb/usbhub.c
@@ -21,7 +21,6 @@
 #include <grub/mm.h>
 #include <grub/usb.h>
 #include <grub/misc.h>
-#include <grub/time.h>
 
 /* USB Supports 127 devices, with device 0 as special case.  */
 static struct grub_usb_device *grub_usb_devs[128];

From c8c069533f5c240855f292f7f77b3c784c5f7946 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 6 Jul 2010 09:42:37 +0100
Subject: [PATCH 1213/1628] * util/grub.d/00_header.in: Process GRUB_THEME and
 GRUB_BACKGROUND after setting gfxterm as the active terminal. 
 GRUB_BACKGROUND doesn't work otherwise.

---
 ChangeLog                |   6 +++
 util/grub.d/00_header.in | 103 ++++++++++++++++++++-------------------
 2 files changed, 58 insertions(+), 51 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 81dfc1c78..108379321 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-06  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub.d/00_header.in: Process GRUB_THEME and GRUB_BACKGROUND
+	after setting gfxterm as the active terminal.  GRUB_BACKGROUND
+	doesn't work otherwise.
+
 2010-07-05  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Features): Update list of supported file systems.
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 553369e37..75c8b0fa2 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -127,57 +127,6 @@ if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT_PATH}"` ; then
   set gfxmode=${GRUB_GFXMODE}
   load_video
   insmod gfxterm
-EOF
-    if [ "x$GRUB_THEME" != x ] && [ -f "$GRUB_THEME" ] \
-	&& is_path_readable_by_grub "$GRUB_THEME"; then
-	echo "Found theme: $GRUB_THEME" >&2
-	prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"` | sed -e "s/^/  /"
-	cat << EOF
-  insmod gfxmenu
-EOF
-	themedir="`dirname "$GRUB_THEME"`"
-	for x in "$themedir"/*.pf2 "$themedir"/f/*.pf2; do
-	    if [ -f "$x" ]; then
-		cat << EOF
-  loadfont (\$root)`make_system_path_relative_to_its_root $x`
-EOF
-	    fi
-	done
-	if [ x"`echo "$themedir"/*.jpg`" != x"$themedir/*.jpg" ] || [ x"`echo "$themedir"/*.jpeg`" != x"$themedir/*.jpeg" ]; then
-	    cat << EOF
-  insmod jpeg
-EOF
-	fi
-	if [ x"`echo "$themedir"/*.png`" != x"$themedir/*.png" ]; then
-	    cat << EOF
-  insmod png
-EOF
-	fi
-	if [ x"`echo "$themedir"/*.tga`" != x"$themedir/*.tga" ]; then
-	    cat << EOF
-  insmod tga
-EOF
-	fi
-	    
-	cat << EOF
-  set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
-EOF
-    elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \
-	    && is_path_readable_by_grub "$GRUB_BACKGROUND"; then
-	echo "Found background: $GRUB_BACKGROUND" >&2
-	case "$GRUB_BACKGROUND" in 
-	    *.png)         reader=png ;;
-	    *.tga)         reader=tga ;;
-	    *.jpg|*.jpeg)  reader=jpeg ;;
-	    *)             echo "Unsupported image format" >&2; exit 1 ;;
-	esac
-	prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"` | sed -e "s/^/  /"
-	cat << EOF
-  insmod $reader
-  background_image -m stretch `make_system_path_relative_to_its_root "$GRUB_BACKGROUND"`
-EOF
-    fi
-    cat << EOF
 fi
 EOF
 fi
@@ -212,6 +161,58 @@ EOF
   ;;
 esac
 
+if [ "x$gfxterm" = x1 ]; then
+    if [ "x$GRUB_THEME" != x ] && [ -f "$GRUB_THEME" ] \
+	&& is_path_readable_by_grub "$GRUB_THEME"; then
+	echo "Found theme: $GRUB_THEME" >&2
+	prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"`
+	cat << EOF
+insmod gfxmenu
+EOF
+	themedir="`dirname "$GRUB_THEME"`"
+	for x in "$themedir"/*.pf2 "$themedir"/f/*.pf2; do
+	    if [ -f "$x" ]; then
+		cat << EOF
+loadfont (\$root)`make_system_path_relative_to_its_root $x`
+EOF
+	    fi
+	done
+	if [ x"`echo "$themedir"/*.jpg`" != x"$themedir/*.jpg" ] || [ x"`echo "$themedir"/*.jpeg`" != x"$themedir/*.jpeg" ]; then
+	    cat << EOF
+insmod jpeg
+EOF
+	fi
+	if [ x"`echo "$themedir"/*.png`" != x"$themedir/*.png" ]; then
+	    cat << EOF
+insmod png
+EOF
+	fi
+	if [ x"`echo "$themedir"/*.tga`" != x"$themedir/*.tga" ]; then
+	    cat << EOF
+insmod tga
+EOF
+	fi
+	    
+	cat << EOF
+set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
+EOF
+    elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \
+	    && is_path_readable_by_grub "$GRUB_BACKGROUND"; then
+	echo "Found background: $GRUB_BACKGROUND" >&2
+	case "$GRUB_BACKGROUND" in 
+	    *.png)         reader=png ;;
+	    *.tga)         reader=tga ;;
+	    *.jpg|*.jpeg)  reader=jpeg ;;
+	    *)             echo "Unsupported image format" >&2; exit 1 ;;
+	esac
+	prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"`
+	cat << EOF
+insmod $reader
+background_image -m stretch `make_system_path_relative_to_its_root "$GRUB_BACKGROUND"`
+EOF
+    fi
+fi
+
 # Gettext variables and module
 if [ "x${LANG}" != "xC" ] && [ -d "${locale_dir}" ] ; then
     prepare_grub_to_access_device $(${grub_probe} --target=device ${locale_dir})

From 37582066cd74c544ecf9bbbc94c1d3b0ccdf4a7a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 6 Jul 2010 09:51:42 +0100
Subject: [PATCH 1214/1628] * fs/reiserfs.c (grub_reiserfs_iterate_dir): Zero
 out first byte of entry_name also for entries without stat blocks (e.g.
 ".."); fixes corruption of the first entry in a directory.

---
 ChangeLog     | 6 ++++++
 fs/reiserfs.c | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 108379321..714aa308f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-06  Colin Watson  <cjwatson@ubuntu.com>
+
+	* fs/reiserfs.c (grub_reiserfs_iterate_dir): Zero out first byte of
+	entry_name also for entries without stat blocks (e.g. ".."); fixes
+	corruption of the first entry in a directory.
+
 2010-07-06  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub.d/00_header.in: Process GRUB_THEME and GRUB_BACKGROUND
diff --git a/fs/reiserfs.c b/fs/reiserfs.c
index 5acd339c5..e92279554 100644
--- a/fs/reiserfs.c
+++ b/fs/reiserfs.c
@@ -929,7 +929,7 @@ grub_reiserfs_iterate_dir (grub_fshelp_node_t item,
                                       "Warning : %s has no stat block !\n",
                                       entry_name);
                       grub_free (entry_item);
-                      continue;
+                      goto next;
                     }
                 }
               if (hook (entry_name, entry_type, entry_item))
@@ -940,6 +940,7 @@ grub_reiserfs_iterate_dir (grub_fshelp_node_t item,
                   goto found;
                 }
 
+next:
               *entry_name = 0; /* Make sure next entry name (which is just
                                   before this one in disk order) stops before
                                   the current one.  */

From 29d7e783d2499ba439126a5026260451f39d0eed Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Tue, 6 Jul 2010 14:53:55 +0530
Subject: [PATCH 1215/1628] 	* bus/usb/usbhub.c: #include time.h header.

---
 ChangeLog        | 4 ++++
 bus/usb/usbhub.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 714aa308f..4219dab75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-06  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* bus/usb/usbhub.c: #include time.h header.
+
 2010-07-06  Colin Watson  <cjwatson@ubuntu.com>
 
 	* fs/reiserfs.c (grub_reiserfs_iterate_dir): Zero out first byte of
diff --git a/bus/usb/usbhub.c b/bus/usb/usbhub.c
index 034ccbe8d..2bbc850d0 100644
--- a/bus/usb/usbhub.c
+++ b/bus/usb/usbhub.c
@@ -21,6 +21,7 @@
 #include <grub/mm.h>
 #include <grub/usb.h>
 #include <grub/misc.h>
+#include <grub/time.h>
 
 /* USB Supports 127 devices, with device 0 as special case.  */
 static struct grub_usb_device *grub_usb_devs[128];

From 5357687a559895b5eec6c24756451e5d4d92145a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 6 Jul 2010 15:10:36 +0100
Subject: [PATCH 1216/1628] * util/deviceiter.c (grub_util_iterate_devices):
 Skip MD devices, which we expect to be handled by upper layers.

---
 ChangeLog         | 5 +++++
 util/deviceiter.c | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 4219dab75..a37ac98f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-06  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/deviceiter.c (grub_util_iterate_devices): Skip MD devices,
+	which we expect to be handled by upper layers.
+
 2010-07-06  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* bus/usb/usbhub.c: #include time.h header.
diff --git a/util/deviceiter.c b/util/deviceiter.c
index 64d1cae87..bbcc00a91 100644
--- a/util/deviceiter.c
+++ b/util/deviceiter.c
@@ -523,6 +523,9 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 	       later.  */
 	    if (strncmp (entry->d_name, "dm-", sizeof ("dm-") - 1) == 0)
 	      continue;
+	    /* Skip RAID entries; they are handled by upper layers.  */
+	    if (strncmp (entry->d_name, "md-", sizeof ("md-") - 1) == 0)
+	      continue;
 	    if (names_len >= names_max)
 	      {
 		names_max *= 2;

From 1e54546914014193c64757b1b58f6a01ee96a28e Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 6 Jul 2010 18:31:45 +0100
Subject: [PATCH 1217/1628] * term/gfxterm.c (repaint_schedulded): Rename to
 ... (repaint_scheduled): ... this.  Update all callers.
 (repaint_was_schedulded): Rename to ... (repaint_was_scheduled): ... this. 
 Update all callers.

---
 ChangeLog      |  7 +++++++
 term/gfxterm.c | 16 ++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a37ac98f1..9d2210b30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-06  Colin Watson  <cjwatson@ubuntu.com>
+
+	* term/gfxterm.c (repaint_schedulded): Rename to ...
+	(repaint_scheduled): ... this.  Update all callers.
+	(repaint_was_schedulded): Rename to ...
+	(repaint_was_scheduled): ... this.  Update all callers.
+
 2010-07-06  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/deviceiter.c (grub_util_iterate_devices): Skip MD devices,
diff --git a/term/gfxterm.c b/term/gfxterm.c
index a1886f7e8..44f6b191a 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -118,8 +118,8 @@ void (*grub_gfxterm_decorator_hook) (void) = NULL;
 static struct grub_gfxterm_window window;
 static struct grub_virtual_screen virtual_screen;
 static grub_gfxterm_repaint_callback_t repaint_callback;
-static int repaint_schedulded = 0;
-static int repaint_was_schedulded = 0;
+static int repaint_scheduled = 0;
+static int repaint_was_scheduled = 0;
 
 static void destroy_window (void);
 
@@ -278,7 +278,7 @@ grub_virtual_screen_setup (unsigned int x, unsigned int y,
 void
 grub_gfxterm_schedule_repaint (void)
 {
-  repaint_schedulded = 1;
+  repaint_scheduled = 1;
 }
 
 grub_err_t
@@ -510,7 +510,7 @@ dirty_region_reset (void)
   dirty_region.top_left_y = -1;
   dirty_region.bottom_right_x = -1;
   dirty_region.bottom_right_y = -1;
-  repaint_was_schedulded = 0;
+  repaint_was_scheduled = 0;
 }
 
 static int
@@ -530,14 +530,14 @@ dirty_region_add (int x, int y, unsigned int width, unsigned int height)
   if ((width == 0) || (height == 0))
     return;
 
-  if (repaint_schedulded)
+  if (repaint_scheduled)
     {
       x = virtual_screen.offset_x;
       y = virtual_screen.offset_y;
       width = virtual_screen.width;
       height = virtual_screen.height;
-      repaint_schedulded = 0;
-      repaint_was_schedulded = 1;
+      repaint_scheduled = 0;
+      repaint_was_scheduled = 1;
     }
 
   if (dirty_region_is_empty ())
@@ -586,7 +586,7 @@ dirty_region_redraw (void)
   width = dirty_region.bottom_right_x - x + 1;
   height = dirty_region.bottom_right_y - y + 1;
 
-  if (repaint_was_schedulded && grub_gfxterm_decorator_hook)
+  if (repaint_was_scheduled && grub_gfxterm_decorator_hook)
     grub_gfxterm_decorator_hook ();
 
   redraw_screen_rect (x, y, width, height);

From 0b0f9620f2257c3ed44ddaff4b99d8b2d369ea57 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 6 Jul 2010 19:27:55 +0100
Subject: [PATCH 1218/1628] * conf/common.rmk (grub_probe_SOURCES): Add
 disk/raid5_recover.c and disk/raid6_recover.c. * conf/i386-pc.rmk
 (grub_setup_SOURCES): Likewise. * conf/sparc64-ieee1275.rmk
 (grub_setup_SOURCES): Likewise.

---
 ChangeLog                 | 7 +++++++
 conf/common.rmk           | 3 ++-
 conf/i386-pc.rmk          | 3 ++-
 conf/sparc64-ieee1275.rmk | 3 ++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9d2210b30..91f48f0d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-06  Colin Watson  <cjwatson@ubuntu.com>
+
+	* conf/common.rmk (grub_probe_SOURCES): Add disk/raid5_recover.c
+	and disk/raid6_recover.c.
+	* conf/i386-pc.rmk (grub_setup_SOURCES): Likewise.
+	* conf/sparc64-ieee1275.rmk (grub_setup_SOURCES): Likewise.
+
 2010-07-06  Colin Watson  <cjwatson@ubuntu.com>
 
 	* term/gfxterm.c (repaint_schedulded): Rename to ...
diff --git a/conf/common.rmk b/conf/common.rmk
index 1af14f7fd..f92e5bc4c 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -38,7 +38,8 @@ grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c	\
 	partmap/msdos.c partmap/bsdlabel.c partmap/apple.c \
 	partmap/sun.c partmap/sunpc.c partmap/gpt.c \
 	kern/fs.c kern/env.c fs/fshelp.c			\
-	disk/raid.c disk/mdraid_linux.c disk/lvm.c grub_probe_init.c
+	disk/raid.c disk/raid5_recover.c disk/raid6_recover.c	\
+	disk/mdraid_linux.c disk/lvm.c grub_probe_init.c
 
 ifeq ($(enable_grub_fstest), yes)
 bin_UTILITIES += grub-fstest
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 96058e807..c157aaf01 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -78,7 +78,8 @@ grub_setup_SOURCES = gnulib/progname.c util/i386/pc/grub-setup.c	\
 	partmap/msdos.c partmap/bsdlabel.c partmap/sunpc.c		\
 	partmap/gpt.c							\
 									\
-	disk/raid.c disk/mdraid_linux.c disk/lvm.c			\
+	disk/raid.c disk/raid5_recover.c disk/raid6_recover.c		\
+	disk/mdraid_linux.c disk/lvm.c					\
 	util/raid.c util/lvm.c						\
 	grub_setup_init.c
 
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index cb6b070a1..d343ac349 100644
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -62,7 +62,8 @@ grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c			\
 	partmap/amiga.c	partmap/apple.c partmap/msdos.c			\
 	partmap/bsdlabel.c partmap/sun.c partmap/acorn.c		\
 									\
-	disk/raid.c disk/mdraid_linux.c disk/lvm.c util/raid.c		\
+	disk/raid.c disk/raid5_recover.c disk/raid6_recover.c		\
+	disk/mdraid_linux.c disk/lvm.c util/raid.c			\
 	util/lvm.c gnulib/progname.c grub_setup_init.c
 
 # For grub-ofpathname.

From f7bf0918aae95cfdb4495335d0c662e4f633993d Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 7 Jul 2010 14:12:16 +0100
Subject: [PATCH 1219/1628] * term/gfxterm.c
 (grub_gfxterm_background_image_cmd): Fix indentation.

---
 ChangeLog      |  5 ++++
 term/gfxterm.c | 70 +++++++++++++++++++++++++-------------------------
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 91f48f0d1..e4b5143d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-07  Colin Watson  <cjwatson@ubuntu.com>
+
+	* term/gfxterm.c (grub_gfxterm_background_image_cmd): Fix
+	indentation.
+
 2010-07-06  Colin Watson  <cjwatson@ubuntu.com>
 
 	* conf/common.rmk (grub_probe_SOURCES): Add disk/raid5_recover.c
diff --git a/term/gfxterm.c b/term/gfxterm.c
index 44f6b191a..bf9705abd 100644
--- a/term/gfxterm.c
+++ b/term/gfxterm.c
@@ -1134,44 +1134,44 @@ grub_gfxterm_background_image_cmd (grub_extcmd_t cmd __attribute__ ((unused)),
   /* If filename was provided, try to load that.  */
   if (argc >= 1)
     {
-    /* Try to load new one.  */
-    grub_video_bitmap_load (&bitmap, args[0]);
-    if (grub_errno != GRUB_ERR_NONE)
-      return grub_errno;
+      /* Try to load new one.  */
+      grub_video_bitmap_load (&bitmap, args[0]);
+      if (grub_errno != GRUB_ERR_NONE)
+        return grub_errno;
 
-    /* Determine if the bitmap should be scaled to fit the screen.  */
-    if (!state[BACKGROUND_CMD_ARGINDEX_MODE].set
-        || grub_strcmp (state[BACKGROUND_CMD_ARGINDEX_MODE].arg,
-                        "stretch") == 0)
+      /* Determine if the bitmap should be scaled to fit the screen.  */
+      if (!state[BACKGROUND_CMD_ARGINDEX_MODE].set
+          || grub_strcmp (state[BACKGROUND_CMD_ARGINDEX_MODE].arg,
+                          "stretch") == 0)
+          {
+            if (window.width != grub_video_bitmap_get_width (bitmap)
+                || window.height != grub_video_bitmap_get_height (bitmap))
+              {
+                struct grub_video_bitmap *scaled_bitmap;
+                grub_video_bitmap_create_scaled (&scaled_bitmap,
+                                                 window.width, 
+                                                 window.height,
+                                                 bitmap,
+                                                 GRUB_VIDEO_BITMAP_SCALE_METHOD_BEST);
+                if (grub_errno == GRUB_ERR_NONE)
+                  {
+                    /* Replace the original bitmap with the scaled one.  */
+                    grub_video_bitmap_destroy (bitmap);
+                    bitmap = scaled_bitmap;
+                  }
+              }
+          }
+
+      /* If bitmap was loaded correctly, display it.  */
+      if (bitmap)
         {
-          if (window.width != grub_video_bitmap_get_width (bitmap)
-              || window.height != grub_video_bitmap_get_height (bitmap))
-            {
-              struct grub_video_bitmap *scaled_bitmap;
-              grub_video_bitmap_create_scaled (&scaled_bitmap,
-                                               window.width, 
-                                               window.height,
-                                               bitmap,
-                                               GRUB_VIDEO_BITMAP_SCALE_METHOD_BEST);
-              if (grub_errno == GRUB_ERR_NONE)
-                {
-                  /* Replace the original bitmap with the scaled one.  */
-                  grub_video_bitmap_destroy (bitmap);
-                  bitmap = scaled_bitmap;
-                }
-            }
+          /* Determine bitmap dimensions.  */
+          bitmap_width = grub_video_bitmap_get_width (bitmap);
+          bitmap_height = grub_video_bitmap_get_height (bitmap);
+
+          /* Mark whole screen as dirty.  */
+          dirty_region_add (0, 0, window.width, window.height);
         }
-
-    /* If bitmap was loaded correctly, display it.  */
-    if (bitmap)
-      {
-        /* Determine bitmap dimensions.  */
-        bitmap_width = grub_video_bitmap_get_width (bitmap);
-        bitmap_height = grub_video_bitmap_get_height (bitmap);
-
-        /* Mark whole screen as dirty.  */
-        dirty_region_add (0, 0, window.width, window.height);
-      }
     }
 
   /* All was ok.  */

From becce1b16a92a81f57ef1db3d02f53d3106907e1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 7 Jul 2010 17:51:26 +0200
Subject: [PATCH 1220/1628] 	* tests/util/grub-shell.in: Remove bashisms
 and declare as sh script.

---
 ChangeLog                | 4 ++++
 tests/util/grub-shell.in | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e4b5143d4..789ebd391 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-07  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* tests/util/grub-shell.in: Remove bashisms and declare as sh script.
+
 2010-07-07  Colin Watson  <cjwatson@ubuntu.com>
 
 	* term/gfxterm.c (grub_gfxterm_background_image_cmd): Fix
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 17da6c8c0..2cd256131 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -1,4 +1,4 @@
-#! /bin/bash -e
+#! /bin/sh -e
 
 # Run GRUB script in a Qemu instance
 # Copyright (C) 2009,2010  Free Software Foundation, Inc.
@@ -94,7 +94,7 @@ done
 
 if [ "x${source}" = x ] ; then
     tmpfile=`mktemp`
-    while read; do
+    while read REPLY; do
 	echo $REPLY >> ${tmpfile}
     done
     source=${tmpfile}

From 1b43dba911d92eb3f4fe9e9e8c3a588d893e077f Mon Sep 17 00:00:00 2001
From: starous <starous@pracovna>
Date: Thu, 8 Jul 2010 22:54:35 +0200
Subject: [PATCH 1221/1628] USB hot-plugging

---
 bus/usb/ohci.c          |  81 +++++++++------
 bus/usb/uhci.c          |  11 ++-
 bus/usb/usb.c           |  23 +++--
 bus/usb/usbhub.c        | 213 ++++++++++++++++++++++++++++++++++++----
 include/grub/usb.h      |   4 +-
 include/grub/usbtrans.h |   2 +
 6 files changed, 271 insertions(+), 63 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index fed82d129..36bb5dd44 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -148,6 +148,7 @@ typedef enum
 #define GRUB_OHCI_REG_CONTROL_BULK_ENABLE (1 << 5)
 #define GRUB_OHCI_REG_CONTROL_CONTROL_ENABLE (1 << 4)
 
+#define GRUB_OHCI_RESET_CONNECT_CHANGE (1 << 16)
 #define GRUB_OHCI_CTRL_EDS 16
 #define GRUB_OHCI_BULK_EDS 16
 #define GRUB_OHCI_TDS 256
@@ -420,23 +421,8 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
                        (grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBA)
                         & ~GRUB_OHCI_RHUB_PORT_POWER_MASK)
                        | GRUB_OHCI_RHUB_PORT_ALL_POWERED);
-  /* Wait for stable power (100ms) and stable attachment (100ms) */
-  /* I.e. minimum wait time should be probably 200ms. */
-  /* We assume that device is attached when ohci is loaded. */
-  /* Some devices take long time to power-on or indicate attach. */
-  /* Here is some experimental value which should probably mostly work. */
-  /* Cameras with manual USB mode selection and maybe some other similar
-   * devices will not work in some cases - they are repowered during
-   * ownership change and then they are starting slowly and mostly they
-   * are wanting select proper mode again...
-   * The same situation can be on computers where BIOS not set-up OHCI
-   * to be at least powered USB bus (maybe it is Yeelong case...?)
-   * Possible workaround could be for example some prompt
-   * for user with confirmation of proper USB device connection.
-   * Another workaround - "rmmod usbms", "rmmod ohci", proper start
-   * and configuration of USB device and then "insmod ohci"
-   * and "insmod usbms". */
-  grub_millisleep (500);	
+  /* Now we have hot-plugging, we need to wait for stable power only */
+  grub_millisleep (100);
 
   /* Link to ohci now that initialisation is successful.  */
   o->next = ohci;
@@ -998,6 +984,15 @@ grub_ohci_transfer (grub_usb_controller_t dev,
             }
         }
 
+      /* Even if we have "good" OHCI, in some cases
+       * tderr_phys can be zero, check it */
+      else if ( !tderr_phys )
+        { /* Retired TD with error should be previous TD to ED->td_head */
+          tderr_phys = GRUB_OHCI_TD_PHYS2VIRT (o,
+                         grub_le_to_cpu32 ( ed_virt->td_head) & ~0xf )
+                       ->prev_td_phys;
+        }
+
       /* Prepare pointer to last processed TD and get error code */
       tderr_virt = GRUB_OHCI_TD_PHYS2VIRT (o, tderr_phys);
       /* Set index of last processed TD */
@@ -1095,8 +1090,6 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 	  break;
 	}
 
-      /* Set empty ED - set HEAD = TAIL = last (not processed) TD */
-      ed_virt->td_head = ed_virt->td_tail & ~0xf; 
     }
         
   else if (err_unrec)      
@@ -1117,7 +1110,6 @@ grub_ohci_transfer (grub_usb_controller_t dev,
       grub_dprintf ("ohci", "Unrecoverable error - OHCI reset\n");
 
       /* Misc. resets. */
-      ed_virt->td_head = ed_virt->td_tail & ~0xf; /* Set empty ED - set HEAD = TAIL = last (not processed) TD */
       o->hcca->donehead = 0;
       grub_ohci_writereg32 (o, GRUB_OHCI_REG_INTSTATUS, 0x7f); /* Clears everything */
       grub_ohci_writereg32 (o, GRUB_OHCI_REG_CONTROLHEAD, o->ed_ctrl_addr);
@@ -1160,10 +1152,12 @@ grub_ohci_transfer (grub_usb_controller_t dev,
       else
         transfer->last_trans = -1;
 
-      /* Set empty ED - set HEAD = TAIL = last (not processed) TD */
-      ed_virt->td_head = ed_virt->td_tail & ~0xf; 
     }
 
+    /* Set empty ED - set HEAD = TAIL = last (not processed) TD */
+    ed_virt->td_head = grub_cpu_to_le32 ( grub_le_to_cpu32 (
+                                            ed_virt->td_tail) & ~0xf); 
+
   /* At this point always should be:
    * ED has skip bit set and halted or empty or after next SOF,
    *    i.e. it is safe to free all TDs except last not processed
@@ -1198,10 +1192,28 @@ grub_ohci_portstatus (grub_usb_controller_t dev,
 		      unsigned int port, unsigned int enable)
 {
    struct grub_ohci *o = (struct grub_ohci *) dev->data;
+   grub_uint64_t endtime;
 
    grub_dprintf ("ohci", "begin of portstatus=0x%02x\n",
                  grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port));
 
+   if (!enable) /* We don't need reset port */
+     {
+       /* Disable the port and wait for it. */
+       grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port,
+                             GRUB_OHCI_CLEAR_PORT_ENABLE);
+       endtime = grub_get_time_ms () + 1000;
+       while ((grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port)
+               & (1 << 1)))
+         if (grub_get_time_ms () > endtime)
+           return grub_error (GRUB_ERR_IO, "OHCI Timed out - disable");
+
+       grub_dprintf ("ohci", "end of portstatus=0x%02x\n",
+         grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port));
+       return GRUB_ERR_NONE;
+     }
+     
+   /* Reset the port */
    grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port,
 			 GRUB_OHCI_SET_PORT_RESET);
    grub_millisleep (50); /* For root hub should be nominaly 50ms */
@@ -1211,14 +1223,21 @@ grub_ohci_portstatus (grub_usb_controller_t dev,
 			 GRUB_OHCI_SET_PORT_RESET_STATUS_CHANGE);
    grub_millisleep (10);
 
-   if (enable)
-     grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port,
-			   GRUB_OHCI_SET_PORT_ENABLE);
-   else
-     grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port,
-			   GRUB_OHCI_CLEAR_PORT_ENABLE);
+   /* Enable the port and wait for it. */
+   grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port,
+                         GRUB_OHCI_SET_PORT_ENABLE);
+   endtime = grub_get_time_ms () + 1000;
+   while (! (grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port)
+           & (1 << 1)))
+     if (grub_get_time_ms () > endtime)
+       return grub_error (GRUB_ERR_IO, "OHCI Timed out - enable");
+
    grub_millisleep (10);
 
+   /* Reset bit Connect Status Change */
+   grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port,
+                         GRUB_OHCI_RESET_CONNECT_CHANGE);
+
    grub_dprintf ("ohci", "end of portstatus=0x%02x\n",
 		 grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port));
  
@@ -1226,7 +1245,7 @@ grub_ohci_portstatus (grub_usb_controller_t dev,
 }
 
 static grub_usb_speed_t
-grub_ohci_detect_dev (grub_usb_controller_t dev, int port)
+grub_ohci_detect_dev (grub_usb_controller_t dev, int port, int *changed)
 {
    struct grub_ohci *o = (struct grub_ohci *) dev->data;
    grub_uint32_t status;
@@ -1235,6 +1254,9 @@ grub_ohci_detect_dev (grub_usb_controller_t dev, int port)
 
    grub_dprintf ("ohci", "detect_dev status=0x%02x\n", status);
 
+  /* Connect Status Change bit - it detects change of connection */
+  *changed = ((status & GRUB_OHCI_RESET_CONNECT_CHANGE) != 0);
+
    if (! (status & 1))
      return GRUB_USB_SPEED_NONE;
    else if (status & (1 << 9))
@@ -1253,7 +1275,6 @@ grub_ohci_hubports (grub_usb_controller_t dev)
 
   grub_dprintf ("ohci", "root hub ports=%d\n", portinfo & 0xFF);
 
-  /* The root hub has exactly two ports.  */
   return portinfo & 0xFF;
 }
 
diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index e85f07a6f..efdf3aceb 100644
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -644,10 +644,14 @@ grub_uhci_portstatus (grub_usb_controller_t dev,
   grub_dprintf ("uhci", "waiting for the port to be enabled\n");
 
   endtime = grub_get_time_ms () + 1000;
-  while (! (grub_uhci_readreg16 (u, reg) & (1 << 2)))
+  while (! ((status = grub_uhci_readreg16 (u, reg)) & (1 << 2)))
     if (grub_get_time_ms () > endtime)
       return grub_error (GRUB_ERR_IO, "UHCI Timed out");
 
+  /* Reset bit Connect Status Change */
+  grub_uhci_writereg16 (u, reg, status | (1 << 1));
+
+  /* Read final port status */
   status = grub_uhci_readreg16 (u, reg);
   grub_dprintf ("uhci", ">3detect=0x%02x\n", status);
 
@@ -656,7 +660,7 @@ grub_uhci_portstatus (grub_usb_controller_t dev,
 }
 
 static grub_usb_speed_t
-grub_uhci_detect_dev (grub_usb_controller_t dev, int port)
+grub_uhci_detect_dev (grub_usb_controller_t dev, int port, int *changed)
 {
   struct grub_uhci *u = (struct grub_uhci *) dev->data;
   int reg;
@@ -676,6 +680,9 @@ grub_uhci_detect_dev (grub_usb_controller_t dev, int port)
 
   grub_dprintf ("uhci", "detect=0x%02x port=%d\n", status, port);
 
+  /* Connect Status Change bit - it detects change of connection */
+  *changed = ((status & (1 << 1)) != 0);
+    
   if (! (status & 1))
     return GRUB_USB_SPEED_NONE;
   else if (status & (1 << 8))
diff --git a/bus/usb/usb.c b/bus/usb/usb.c
index 4f6f9e54c..f6a0a8b56 100644
--- a/bus/usb/usb.c
+++ b/bus/usb/usb.c
@@ -225,6 +225,20 @@ grub_usb_device_initialize (grub_usb_device_t dev)
 	}
     }
 
+  return GRUB_USB_ERR_NONE;
+
+ fail:
+
+  for (i = 0; i < 8; i++)
+    grub_free (dev->config[i].descconf);
+
+  return err;
+}
+
+void grub_usb_device_attach (grub_usb_device_t dev)
+{
+  int i;
+  
   /* XXX: Just check configuration 0 for now.  */
   for (i = 0; i < dev->config[0].descconf->numif; i++)
     {
@@ -243,15 +257,6 @@ grub_usb_device_initialize (grub_usb_device_t dev)
 	if (interf->class == desc->class && desc->hook (dev, 0, i))
 	  dev->config[0].interf[i].attached = 1;
     }
-
-  return GRUB_USB_ERR_NONE;
-
- fail:
-
-  for (i = 0; i < 8; i++)
-    grub_free (dev->config[i].descconf);
-
-  return err;
 }
 
 void
diff --git a/bus/usb/usbhub.c b/bus/usb/usbhub.c
index f50418069..6c14f4b8d 100644
--- a/bus/usb/usbhub.c
+++ b/bus/usb/usbhub.c
@@ -23,8 +23,10 @@
 #include <grub/misc.h>
 #include <grub/time.h>
 
+#define GRUB_USBHUB_MAX_DEVICES 128
+
 /* USB Supports 127 devices, with device 0 as special case.  */
-static struct grub_usb_device *grub_usb_devs[128];
+static struct grub_usb_device *grub_usb_devs[GRUB_USBHUB_MAX_DEVICES];
 
 struct grub_usb_hub
 {
@@ -44,6 +46,7 @@ grub_usb_hub_add_dev (grub_usb_controller_t controller, grub_usb_speed_t speed)
 {
   grub_usb_device_t dev;
   int i;
+  grub_usb_err_t err;
 
   dev = grub_zalloc (sizeof (struct grub_usb_device));
   if (! dev)
@@ -52,31 +55,51 @@ grub_usb_hub_add_dev (grub_usb_controller_t controller, grub_usb_speed_t speed)
   dev->controller = *controller;
   dev->speed = speed;
 
-  grub_usb_device_initialize (dev);
+  err = grub_usb_device_initialize (dev);
+  if (err)
+    {
+      grub_free (dev);
+      return NULL;
+    }
 
   /* Assign a new address to the device.  */
-  for (i = 1; i < 128; i++)
+  for (i = 1; i < GRUB_USBHUB_MAX_DEVICES; i++)
     {
       if (! grub_usb_devs[i])
 	break;
     }
-  if (i == 128)
+  if (i == GRUB_USBHUB_MAX_DEVICES)
     {
       grub_error (GRUB_ERR_IO, "can't assign address to USB device");
+      for (i = 0; i < 8; i++)
+        grub_free (dev->config[i].descconf);
+      grub_free (dev);
       return NULL;
     }
 
-  grub_usb_control_msg (dev,
-			(GRUB_USB_REQTYPE_OUT
-			 | GRUB_USB_REQTYPE_STANDARD
-			 | GRUB_USB_REQTYPE_TARGET_DEV),
-			GRUB_USB_REQ_SET_ADDRESS,
-			i, 0, 0, NULL);
+  err = grub_usb_control_msg (dev,
+			      (GRUB_USB_REQTYPE_OUT
+			       | GRUB_USB_REQTYPE_STANDARD
+			       | GRUB_USB_REQTYPE_TARGET_DEV),
+			      GRUB_USB_REQ_SET_ADDRESS,
+			      i, 0, 0, NULL);
+  if (err)
+    {
+      for (i = 0; i < 8; i++)
+        grub_free (dev->config[i].descconf);
+      grub_free (dev);
+      return NULL;
+    }
 
   dev->addr = i;
   dev->initialized = 1;
   grub_usb_devs[i] = dev;
 
+  /* Wait "recovery interval", spec. says 2ms */
+  grub_millisleep (2);
+  
+  grub_usb_device_attach (dev);
+  
   return dev;
 }
 
@@ -144,7 +167,7 @@ grub_usb_add_hub (grub_usb_device_t dev)
       if (err)
 	continue;
       grub_dprintf ("usb", "Hub port %d status: 0x%02x\n", i, status);
-      	    
+
       /* If connected, reset and enable the port.  */
       if (status & GRUB_USB_HUB_STATUS_CONNECTED)
 	{
@@ -191,7 +214,22 @@ grub_usb_add_hub (grub_usb_device_t dev)
                  (grub_get_time_ms() < timeout) );
           if (err || !(status & GRUB_USB_HUB_STATUS_C_PORT_RESET) )
             continue;
+
+          /* Wait a recovery time after reset, spec. says 10ms */
+          grub_millisleep (10);
    
+          /* Do reset of connection change bit */
+          err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
+                                            | GRUB_USB_REQTYPE_CLASS
+                                            | GRUB_USB_REQTYPE_TARGET_OTHER),
+                                      GRUB_USB_REQ_CLEAR_FEATURE,
+				      GRUB_USB_HUB_FEATURE_C_CONNECTED,
+				      i, 0, 0);
+          /* Just ignore the device if the Hub reports some error */
+          if (err)
+	     continue;
+          grub_dprintf ("usb", "Hub port - cleared connection change\n");
+
 	  /* Add the device and assign a device address to it.  */
           grub_dprintf ("usb", "Call hub_add_dev - port %d\n", i);
 	  next_dev = grub_usb_hub_add_dev (&dev->controller, speed);
@@ -239,6 +277,7 @@ grub_usb_root_hub (grub_usb_controller_t controller)
 {
   int i;
   struct grub_usb_hub *hub;
+  int changed=0;
 
   hub = grub_malloc (sizeof (*hub));
   if (!hub)
@@ -248,7 +287,10 @@ grub_usb_root_hub (grub_usb_controller_t controller)
   hubs = hub;
   hub->controller = grub_malloc (sizeof (*controller));
   if (!hub->controller)
-    return GRUB_USB_ERR_INTERNAL;
+    {
+      grub_free (hub);
+      return GRUB_USB_ERR_INTERNAL;
+    }
 
   grub_memcpy (hub->controller, controller, sizeof (*controller));
   hub->dev = 0;
@@ -258,13 +300,15 @@ grub_usb_root_hub (grub_usb_controller_t controller)
   hub->speed = grub_malloc (sizeof (hub->speed[0]) * hub->nports);
   if (!hub->speed)
     {
+      grub_free (hub->controller);
       grub_free (hub);
       return GRUB_USB_ERR_INTERNAL;
     }
 
   for (i = 0; i < hub->nports; i++)
     {
-      hub->speed[i] = controller->dev->detect_dev (hub->controller, i);
+      hub->speed[i] = controller->dev->detect_dev (hub->controller, i,
+                                                   &changed);
 
       if (hub->speed[i] != GRUB_USB_SPEED_NONE)
 	attach_root_port (hub->controller, i, hub->speed[i]);
@@ -273,30 +317,157 @@ grub_usb_root_hub (grub_usb_controller_t controller)
   return GRUB_USB_ERR_NONE;
 }
 
+static void
+poll_nonroot_hub (grub_usb_device_t dev)
+{
+  struct grub_usb_usb_hubdesc hubdesc;
+  grub_err_t err;
+  int i;
+  grub_uint64_t timeout;
+  grub_usb_device_t next_dev;
+  
+  err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
+	  		            | GRUB_USB_REQTYPE_CLASS
+			            | GRUB_USB_REQTYPE_TARGET_DEV),
+                              GRUB_USB_REQ_GET_DESCRIPTOR,
+			      (GRUB_USB_DESCRIPTOR_HUB << 8) | 0,
+			      0, sizeof (hubdesc), (char *) &hubdesc);
+  if (err)
+    return;
+    
+  /* Iterate over the Hub ports.  */
+  for (i = 1; i <= hubdesc.portcnt; i++)
+    {
+      grub_uint32_t status;
+
+      /* Get the port status.  */
+      err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
+					| GRUB_USB_REQTYPE_CLASS
+					| GRUB_USB_REQTYPE_TARGET_OTHER),
+				  GRUB_USB_REQ_GET_STATUS,
+				  0, i, sizeof (status), (char *) &status);
+      /* Just ignore the device if the Hub does not report the
+	 status.  */
+      if (err)
+	continue;
+      	    
+      /* Connected and status of connection changed ? */
+      if ((status & GRUB_USB_HUB_STATUS_CONNECTED)
+          && (status & GRUB_USB_HUB_STATUS_C_CONNECTED))
+	{
+	  grub_usb_speed_t speed;
+
+	  /* Determine the device speed.  */
+	  if (status & GRUB_USB_HUB_STATUS_LOWSPEED)
+	    speed = GRUB_USB_SPEED_LOW;
+	  else
+	    {
+	      if (status & GRUB_USB_HUB_STATUS_HIGHSPEED)
+		speed = GRUB_USB_SPEED_HIGH;
+	      else
+		speed = GRUB_USB_SPEED_FULL;
+	    }
+
+	  /* A device is actually connected to this port.
+	   * Now do reset of port. */
+	  err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
+					    | GRUB_USB_REQTYPE_CLASS
+					    | GRUB_USB_REQTYPE_TARGET_OTHER),
+				      GRUB_USB_REQ_SET_FEATURE,
+				      GRUB_USB_HUB_FEATURE_PORT_RESET,
+				      i, 0, 0);
+	  /* If the Hub does not cooperate for this port, just skip
+	     the port.  */
+	  if (err)
+	    continue;
+
+          /* Wait for reset procedure done */
+          timeout = grub_get_time_ms () + 1000;
+          do
+            {
+              /* Get the port status.  */
+              err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
+	   	 			        | GRUB_USB_REQTYPE_CLASS
+					        | GRUB_USB_REQTYPE_TARGET_OTHER),
+				          GRUB_USB_REQ_GET_STATUS,
+				          0, i, sizeof (status), (char *) &status);
+            }
+          while (!err &&
+                 !(status & GRUB_USB_HUB_STATUS_C_PORT_RESET) &&
+                 (grub_get_time_ms() < timeout) );
+          if (err || !(status & GRUB_USB_HUB_STATUS_C_PORT_RESET) )
+            continue;
+
+          /* Wait a recovery time after reset, spec. says 10ms */
+          grub_millisleep (10);
+
+          /* Do reset of connection change bit */
+          err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_OUT
+                                            | GRUB_USB_REQTYPE_CLASS
+                                            | GRUB_USB_REQTYPE_TARGET_OTHER),
+                                      GRUB_USB_REQ_CLEAR_FEATURE,
+				      GRUB_USB_HUB_FEATURE_C_CONNECTED,
+				      i, 0, 0);
+          /* Just ignore the device if the Hub reports some error */
+          if (err)
+	     continue;
+
+	  /* Add the device and assign a device address to it.  */
+	  next_dev = grub_usb_hub_add_dev (&dev->controller, speed);
+          if (! next_dev)
+            continue;
+
+          /* If the device is a Hub, scan it for more devices.  */
+          if (next_dev->descdev.class == 0x09)
+            grub_usb_add_hub (next_dev);
+	}
+    }
+
+  return;
+}
+
 void
 grub_usb_poll_devices (void)
 {
   struct grub_usb_hub *hub;
+  int i;
 
   for (hub = hubs; hub; hub = hub->next)
     {
-      int i;
+      int changed=0;
       /* Do we have to recheck number of ports?  */
+      /* No, it should be never changed, it should be constant. */
       for (i = 0; i < hub->nports; i++)
 	{
 	  grub_usb_speed_t speed;
 
-	  speed = hub->controller->dev->detect_dev (hub->controller, i);
+	  speed = hub->controller->dev->detect_dev (hub->controller, i,
+	                                            &changed);
 
-	  if (speed == hub->speed[i])
-	    continue;
+	  if (speed != GRUB_USB_SPEED_NONE)
+	    {
+              if (changed)
+                attach_root_port (hub->controller, i, speed);
+	    }
 
-	  if (hub->speed[i] == GRUB_USB_SPEED_NONE
-	      && speed != GRUB_USB_SPEED_NONE)
-	    attach_root_port (hub->controller, i, speed);
+          /* XXX: There should be also handling
+           * of disconnected devices. */
+           
 	  hub->speed[i] = speed;
 	}
     }
+
+  /* We should check changes of non-root hubs too. */
+  for (i = 0; i < GRUB_USBHUB_MAX_DEVICES; i++)
+    {
+      grub_usb_device_t dev = grub_usb_devs[i];
+
+      if (dev && dev->descdev.class == 0x09)
+	{
+          poll_nonroot_hub (dev);
+	}
+    }
+
 }
 
 int
@@ -304,7 +475,7 @@ grub_usb_iterate (int (*hook) (grub_usb_device_t dev))
 {
   int i;
 
-  for (i = 0; i < 128; i++)
+  for (i = 0; i < GRUB_USBHUB_MAX_DEVICES; i++)
     {
       if (grub_usb_devs[i])
 	{
diff --git a/include/grub/usb.h b/include/grub/usb.h
index 7c9dba12a..3c17318fc 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -104,7 +104,7 @@ struct grub_usb_controller_dev
   grub_err_t (*portstatus) (grub_usb_controller_t dev, unsigned int port,
 			    unsigned int enable);
 
-  grub_usb_speed_t (*detect_dev) (grub_usb_controller_t dev, int port);
+  grub_usb_speed_t (*detect_dev) (grub_usb_controller_t dev, int port, int *changed);
 
   /* The next host controller.  */
   struct grub_usb_controller_dev *next;
@@ -229,4 +229,6 @@ void grub_usb_unregister_attach_hook_class (struct grub_usb_attach_desc *desc);
 
 void grub_usb_poll_devices (void);
 
+void grub_usb_device_attach (grub_usb_device_t dev);
+
 #endif /* GRUB_USB_H */
diff --git a/include/grub/usbtrans.h b/include/grub/usbtrans.h
index 8f49c246f..e68698c1d 100644
--- a/include/grub/usbtrans.h
+++ b/include/grub/usbtrans.h
@@ -93,10 +93,12 @@ typedef struct grub_usb_transfer *grub_usb_transfer_t;
 
 #define GRUB_USB_HUB_FEATURE_PORT_RESET   0x04
 #define GRUB_USB_HUB_FEATURE_PORT_POWER   0x08
+#define GRUB_USB_HUB_FEATURE_C_CONNECTED  0x10
 
 #define GRUB_USB_HUB_STATUS_CONNECTED	 (1 << 0)
 #define GRUB_USB_HUB_STATUS_LOWSPEED	 (1 << 9)
 #define GRUB_USB_HUB_STATUS_HIGHSPEED	 (1 << 10)
+#define GRUB_USB_HUB_STATUS_C_CONNECTED  (1 << 16)
 #define GRUB_USB_HUB_STATUS_C_PORT_RESET (1 << 20)
 
 struct grub_usb_packet_setup

From 3eaac1a13e88b5f84d4d322c55c4e3985ec52b07 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 10 Jul 2010 02:15:49 +0200
Subject: [PATCH 1222/1628] 	* util/grub-mkrescue.in: Don't use tar GNU-ism
 since it's not necessary 	in this context.

---
 ChangeLog             | 5 +++++
 util/grub-mkrescue.in | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 789ebd391..567736b39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkrescue.in: Don't use tar GNU-ism since it's not necessary
+	in this context.
+
 2010-07-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* tests/util/grub-shell.in: Remove bashisms and declare as sh script.
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 3bfbbddd4..e498acee7 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -211,7 +211,7 @@ EOF
     echo "source /boot/grub/grub.cfg") \
     > ${iso9660_dir}/boot/grub/${platform}/grub.cfg
 
-    tar -C ${memdisk_dir} -cf ${memdisk_img} boot
+    (cd "${memdisk_dir}"; tar -cf - boot) > "${memdisk_img}"
     rm -rf ${memdisk_dir}
     $grub_mkimage -O ${platform} -d "${source_directory}" -m "${memdisk_img}" -o "$3" --prefix='(memdisk)/boot/grub' \
         search iso9660 configfile normal memdisk tar $4

From 249975ba6b1439f385078c4b874505eb585207f8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 10 Jul 2010 02:23:48 +0200
Subject: [PATCH 1223/1628] 	* normal/term.c (put_glyphs_terminal): Fix
 state->num_lines counting. 	Reported and tested by: Colin Watson.

---
 ChangeLog     |  5 +++++
 normal/term.c | 20 +++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 567736b39..35ac24639 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* normal/term.c (put_glyphs_terminal): Fix state->num_lines counting.
+	Reported and tested by: Colin Watson.
+
 2010-07-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkrescue.in: Don't use tar GNU-ism since it's not necessary
diff --git a/normal/term.c b/normal/term.c
index 46ca95843..4f5779abe 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -616,16 +616,18 @@ put_glyphs_terminal (const struct grub_unicode_glyph *visual,
       if (visual_ptr->base == '\n')
 	grub_print_spaces (term, margin_right);
       putglyph (visual_ptr, term);
-      if (state && ++state->num_lines
-	  >= (grub_ssize_t) grub_term_height (term) - 2)
-      {
-	state->backlog_glyphs = visual_ptr + 1;
-	state->backlog_len = visual_len - (visual - visual_ptr) - 1;
-	return 1;
-      }
-
       if (visual_ptr->base == '\n')
-	grub_print_spaces (term, margin_left);
+	{
+	  if (state && ++state->num_lines
+	      >= (grub_ssize_t) grub_term_height (term) - 2)
+	    {
+	      state->backlog_glyphs = visual_ptr + 1;
+	      state->backlog_len = visual_len - (visual - visual_ptr) - 1;
+	      return 1;
+	    }
+
+	  grub_print_spaces (term, margin_left);
+	}
       grub_free (visual_ptr->combining);
     }
   return 0;

From 5bc24388fb151cf3547027a1ed0d0a62e9c7202d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 10 Jul 2010 02:40:41 +0200
Subject: [PATCH 1224/1628] 	* commands/help.c (grub_cmd_help): Fix a typo.

---
 ChangeLog       | 4 ++++
 commands/help.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 35ac24639..a8a6abcae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* commands/help.c (grub_cmd_help): Fix a typo.
+
 2010-07-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* normal/term.c (put_glyphs_terminal): Fix state->num_lines counting.
diff --git a/commands/help.c b/commands/help.c
index 7ccfc4fac..e7d108c33 100644
--- a/commands/help.c
+++ b/commands/help.c
@@ -115,7 +115,7 @@ grub_cmd_help (grub_extcmd_t ext __attribute__ ((unused)), int argc,
 		    if (cmd->flags & GRUB_COMMAND_FLAG_EXTCMD)
 		      grub_arg_show_help ((grub_extcmd_t) cmd->data);
 		    else
-		      grub_printf ("%s %s %s\n%s\b", _("Usage:"), cmd->name, _(cmd->summary),
+		      grub_printf ("%s %s %s\n%s\n", _("Usage:"), cmd->name, _(cmd->summary),
 				   _(cmd->description));
 		  }
 	      }

From 4274c30fbca588313f224c869dc97afcbbecb9f5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 10 Jul 2010 02:59:33 +0200
Subject: [PATCH 1225/1628] =?UTF-8?q?=09Restructure=20SCSI=20.id=20handlin?=
 =?UTF-8?q?g.=20=09Reported=20and=20tested=20by:=20Ale=C5=A1=20Nesrsta.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* disk/ata.c (grub_atapi_close): Removed. All users updated.
	(grub_atapi_dev): Changed .name to "ata". New field .id.
	* disk/usbms.c (grub_usbms_close): Removed. All users updated.
	(grub_usbms_dev): New field .id.
	* disk/scsi.c (grub_scsi_iterate): Generate name.
	(grub_scsi_open): Parse name.
	* include/grub/scsi.h (grub_make_scsi_id): New function.
	(grub_scsi_dev): Change iterate and open to number instead of naming
	busses. All users updated.
	(grub_scsi): Remove name. Add .bus.
---
 ChangeLog           | 16 +++++++++++
 disk/ata.c          | 28 +++++--------------
 disk/scsi.c         | 65 +++++++++++++++++++++++++++++----------------
 disk/usbms.c        | 33 ++++-------------------
 include/grub/scsi.h | 28 +++++++++++++++----
 5 files changed, 93 insertions(+), 77 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8a6abcae..126285a58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-07-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Restructure SCSI .id handling.
+	Reported and tested by: Aleš Nesrsta.
+
+	* disk/ata.c (grub_atapi_close): Removed. All users updated.
+	(grub_atapi_dev): Changed .name to "ata". New field .id.
+	* disk/usbms.c (grub_usbms_close): Removed. All users updated.
+	(grub_usbms_dev): New field .id.
+	* disk/scsi.c (grub_scsi_iterate): Generate name.
+	(grub_scsi_open): Parse name.
+	* include/grub/scsi.h (grub_make_scsi_id): New function.
+	(grub_scsi_dev): Change iterate and open to number instead of naming
+	busses. All users updated.
+	(grub_scsi): Remove name. Add .bus.
+
 2010-07-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* commands/help.c (grub_cmd_help): Fix a typo.
diff --git a/disk/ata.c b/disk/ata.c
index 1b55ee680..cfd58a6d5 100644
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -768,14 +768,12 @@ static struct grub_disk_dev grub_atadisk_dev =
 /* ATAPI code.  */
 
 static int
-grub_atapi_iterate (int (*hook) (const char *name, int luns))
+grub_atapi_iterate (int (*hook) (int bus, int luns))
 {
   struct grub_ata_device *dev;
 
   for (dev = grub_ata_devices; dev; dev = dev->next)
     {
-      char devname[10];
-
       grub_err_t err;
 
       err = check_device (dev);
@@ -785,13 +783,10 @@ grub_atapi_iterate (int (*hook) (const char *name, int luns))
 	  continue;
 	}
 
-      grub_snprintf (devname, sizeof (devname),
-		     "ata%d", dev->port * 2 + dev->device);
-
       if (! dev->atapi)
 	continue;
 
-      if (hook (devname, 1))
+      if (hook (dev->port * 2 + dev->device, 1))
 	return 1;
     }
 
@@ -851,7 +846,7 @@ grub_atapi_write (struct grub_scsi *scsi __attribute__((unused)),
 }
 
 static grub_err_t
-grub_atapi_open (const char *name, struct grub_scsi *scsi)
+grub_atapi_open (int devnum, struct grub_scsi *scsi)
 {
   struct grub_ata_device *dev;
   struct grub_ata_device *devfnd = 0;
@@ -859,18 +854,14 @@ grub_atapi_open (const char *name, struct grub_scsi *scsi)
 
   for (dev = grub_ata_devices; dev; dev = dev->next)
     {
-      char devname[10];
-      grub_snprintf (devname, sizeof (devname),
-		     "ata%d", dev->port * 2 + dev->device);
-
-      if (!grub_strcmp (devname, name))
+      if (dev->port * 2 + dev->device == devnum)
 	{
 	  devfnd = dev;
 	  break;
 	}
     }
 
-  grub_dprintf ("ata", "opening ATAPI dev `%s'\n", name);
+  grub_dprintf ("ata", "opening ATAPI dev `ata%d'\n", devnum);
 
   if (! devfnd)
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "no such ATAPI device");
@@ -887,18 +878,13 @@ grub_atapi_open (const char *name, struct grub_scsi *scsi)
   return GRUB_ERR_NONE;
 }
 
-static void
-grub_atapi_close (struct grub_scsi *scsi)
-{
-  grub_free (scsi->name);
-}
 
 static struct grub_scsi_dev grub_atapi_dev =
   {
-    .name = "ATAPI",
+    .name = "ata",
+    .id = GRUB_SCSI_SUBSYSTEM_ATAPI,
     .iterate = grub_atapi_iterate,
     .open = grub_atapi_open,
-    .close = grub_atapi_close,
     .read = grub_atapi_read,
     .write = grub_atapi_write
   };
diff --git a/disk/scsi.c b/disk/scsi.c
index 5d3e50966..5f04d9ef7 100644
--- a/disk/scsi.c
+++ b/disk/scsi.c
@@ -318,15 +318,24 @@ grub_scsi_iterate (int (*hook) (const char *name))
 {
   grub_scsi_dev_t p;
 
-  auto int scsi_iterate (const char *name, int luns);
+  auto int scsi_iterate (int bus, int luns);
 
-  int scsi_iterate (const char *name, int luns)
+  int scsi_iterate (int bus, int luns)
     {
       int i;
 
       /* In case of a single LUN, just return `usbX'.  */
       if (luns == 1)
-	return hook (name);
+	{
+	  char *sname;
+	  int ret;
+	  sname = grub_xasprintf ("%s%d", p->name, bus);
+	  if (!sname)
+	    return 1;
+	  ret = hook (sname);
+	  grub_free (sname);
+	  return ret;
+	}
 
       /* In case of multiple LUNs, every LUN will get a prefix to
 	 distinguish it.  */
@@ -334,7 +343,7 @@ grub_scsi_iterate (int (*hook) (const char *name))
 	{
 	  char *sname;
 	  int ret;
-	  sname = grub_xasprintf ("%s%c", name, 'a' + i);
+	  sname = grub_xasprintf ("%s%d%c", p->name, bus, 'a' + i);
 	  if (!sname)
 	    return 1;
 	  ret = hook (sname);
@@ -358,37 +367,46 @@ grub_scsi_open (const char *name, grub_disk_t disk)
   grub_scsi_dev_t p;
   grub_scsi_t scsi;
   grub_err_t err;
-  int len;
-  int lun;
+  int lun, bus;
   grub_uint64_t maxtime;
+  const char *nameend;
+
+  nameend = name + grub_strlen (name) - 1;
+  /* Try to detect a LUN ('a'-'z'), otherwise just use the first
+     LUN.  */
+  if (nameend >= name && *nameend >= 'a' && *nameend <= 'z')
+    {
+      lun = *nameend - 'a';
+      nameend--;
+    }
+  else
+    lun = 0;
+
+  while (nameend >= name && grub_isdigit (*nameend))
+    nameend--;
+
+  if (!nameend[1] || !grub_isdigit (nameend[1]))
+    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a SCSI disk");
+
+  bus = grub_strtoul (nameend + 1, 0, 0);
 
   scsi = grub_malloc (sizeof (*scsi));
   if (! scsi)
     return grub_errno;
 
-  len = grub_strlen (name);
-  lun = name[len - 1] - 'a';
-
-  /* Try to detect a LUN ('a'-'z'), otherwise just use the first
-     LUN.  */
-  if (lun < 0 || lun > 26)
-    lun = 0;
-
   for (p = grub_scsi_dev_list; p; p = p->next)
     {
-      if (p->open (name, scsi))
+      if (grub_strncmp (p->name, name, nameend - name) != 0)
 	continue;
 
-      disk->id = (unsigned long) "scsi"; /* XXX */
+      if (p->open (bus, scsi))
+	continue;
+
+      disk->id = grub_make_scsi_id (scsi->dev->id, bus, lun);
       disk->data = scsi;
       scsi->dev = p;
       scsi->lun = lun;
-      scsi->name = grub_strdup (name);
-      if (! scsi->name)
-	{
-	  grub_free (scsi);
-	  return grub_errno;
-	}
+      scsi->bus = bus;
 
       grub_dprintf ("scsi", "dev opened\n");
 
@@ -476,7 +494,8 @@ grub_scsi_close (grub_disk_t disk)
   grub_scsi_t scsi;
 
   scsi = disk->data;
-  scsi->dev->close (scsi);
+  if (scsi->dev->close)
+    scsi->dev->close (scsi);
   grub_free (scsi);
 }
 
diff --git a/disk/usbms.c b/disk/usbms.c
index f913ee3f7..1301791e5 100644
--- a/disk/usbms.c
+++ b/disk/usbms.c
@@ -222,22 +222,15 @@ grub_usbms_finddevs (void)
 
 
 static int
-grub_usbms_iterate (int (*hook) (const char *name, int luns))
+grub_usbms_iterate (int (*hook) (int bus, int luns))
 {
   grub_usbms_dev_t p;
   int cnt = 0;
 
   for (p = grub_usbms_dev_list; p; p = p->next)
     {
-      char *devname;
-      devname = grub_xasprintf ("usb%d", cnt);
-
-      if (hook (devname, p->luns))
-	{
-	  grub_free (devname);
-	  return 1;
-	}
-      grub_free (devname);
+      if (hook (cnt, p->luns))
+	return 1;
       cnt++;
     }
 
@@ -398,28 +391,18 @@ grub_usbms_write (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
 }
 
 static grub_err_t
-grub_usbms_open (const char *name, struct grub_scsi *scsi)
+grub_usbms_open (int devnum, struct grub_scsi *scsi)
 {
   grub_usbms_dev_t p;
-  int devnum;
   int i = 0;
 
-  if (grub_strncmp (name, "usb", 3))
-    return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
-		       "not a USB Mass Storage device");
-
-  devnum = grub_strtoul (name + 3, NULL, 10);
   for (p = grub_usbms_dev_list; p; p = p->next)
     {
       /* Check if this is the devnumth device.  */
       if (devnum == i)
 	{
 	  scsi->data = p;
-	  scsi->name = grub_strdup (name);
 	  scsi->luns = p->luns;
-	  if (! scsi->name)
-	    return grub_errno;
-
 	  return GRUB_ERR_NONE;
 	}
 
@@ -430,18 +413,12 @@ grub_usbms_open (const char *name, struct grub_scsi *scsi)
 		     "not a USB Mass Storage device");
 }
 
-static void
-grub_usbms_close (struct grub_scsi *scsi)
-{
-  grub_free (scsi->name);
-}
-
 static struct grub_scsi_dev grub_usbms_dev =
   {
     .name = "usb",
+    .id = GRUB_SCSI_SUBSYSTEM_USBMS,
     .iterate = grub_usbms_iterate,
     .open = grub_usbms_open,
-    .close = grub_usbms_close,
     .read = grub_usbms_read,
     .write = grub_usbms_write
   };
diff --git a/include/grub/scsi.h b/include/grub/scsi.h
index fbe4582ca..b3c60f3e8 100644
--- a/include/grub/scsi.h
+++ b/include/grub/scsi.h
@@ -26,16 +26,35 @@ void grub_scsi_dev_unregister (grub_scsi_dev_t dev);
 
 struct grub_scsi;
 
+enum
+  {
+    GRUB_SCSI_SUBSYSTEM_USBMS,
+    GRUB_SCSI_SUBSYSTEM_ATAPI
+  };
+
+#define GRUB_SCSI_ID_SUBSYSTEM_SHIFT 24
+#define GRUB_SCSI_ID_BUS_SHIFT 8
+#define GRUB_SCSI_ID_LUN_SHIFT 0
+
+static inline grub_uint32_t
+grub_make_scsi_id (int subsystem, int bus, int lun)
+{
+  return (subsystem << GRUB_SCSI_ID_SUBSYSTEM_SHIFT)
+    | (bus << GRUB_SCSI_ID_BUS_SHIFT) | (lun << GRUB_SCSI_ID_BUS_SHIFT);
+}
+
 struct grub_scsi_dev
 {
   /* The device name.  */
   const char *name;
 
+  grub_uint8_t id;
+
   /* Call HOOK with each device name, until HOOK returns non-zero.  */
-  int (*iterate) (int (*hook) (const char *name, int luns));
+  int (*iterate) (int (*hook) (int bus, int luns));
 
   /* Open the device named NAME, and set up SCSI.  */
-  grub_err_t (*open) (const char *name, struct grub_scsi *scsi);
+  grub_err_t (*open) (int bus, struct grub_scsi *scsi);
 
   /* Close the scsi device SCSI.  */
   void (*close) (struct grub_scsi *scsi);
@@ -56,15 +75,14 @@ struct grub_scsi_dev
 
 struct grub_scsi
 {
-  /* The scsi device name.  */
-  char *name;
-
   /* The underlying scsi device.  */
   grub_scsi_dev_t dev;
 
   /* Type of SCSI device.  XXX: Make enum.  */
   grub_uint8_t devtype;
 
+  int bus;
+
   /* Number of LUNs.  */
   int luns;
 

From e4f4eafc912a6b802731ea407cd00ab8438d8446 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sat, 10 Jul 2010 22:37:05 +0100
Subject: [PATCH 1226/1628] * Makefile.in (MAINTAINER_CLEANFILES): Remove
 unicode/UnicodeData.txt, unicode/BidiMirroring.txt, and
 unicode/ArabicShaping.txt again; these are inputs to autogen.sh, not outputs.

---
 ChangeLog   | 7 +++++++
 Makefile.in | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 126285a58..1fdf98bf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-10  Colin Watson  <cjwatson@ubuntu.com>
+
+	* Makefile.in (MAINTAINER_CLEANFILES): Remove
+	unicode/UnicodeData.txt, unicode/BidiMirroring.txt, and
+	unicode/ArabicShaping.txt again; these are inputs to autogen.sh, not
+	outputs.
+
 2010-07-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Restructure SCSI .id handling.
diff --git a/Makefile.in b/Makefile.in
index ec3b72296..ce407e0cc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -169,8 +169,7 @@ MAINTAINER_CLEANFILES = $(srcdir)/configure $(srcdir)/aclocal.m4 \
 	$(MKFILES) $(srcdir)/config.guess \
 	$(srcdir)/config.sub $(srcdir)/install-sh $(srcdir)/missing \
 	$(srcdir)/DISTLIST $(srcdir)/config.h.in $(srcdir)/stamp-h.in \
-	$(srcdir)/unicode/UnicodeData.txt $(srcdir)/unicode/BidiMirroring.txt \
-	$(srcdir)/unicode/ArabicShaping.txt $(srcdir)/unidata.c \
+	$(srcdir)/unidata.c \
 	$(INFOS)
 
 # The default target.

From 811b0dcab848a85b5eb8faafa8a38036041e06ff Mon Sep 17 00:00:00 2001
From: Jiro SEKIBA <jir@unicus.jp>
Date: Tue, 13 Jul 2010 11:47:30 +0200
Subject: [PATCH 1227/1628] 	* fs/nilfs2.c: fix macro NILFS_2ND_SUPER_BLOCK
 to calculate 	2nd superblock position from partition size.

---
 ChangeLog   | 5 +++++
 fs/nilfs2.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1fdf98bf1..844d9f181 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-13  Jiro SEKIBA <jir@unicus.jp>
+
+	* fs/nilfs2.c: fix macro NILFS_2ND_SUPER_BLOCK to calculate
+	2nd superblock position from partition size.
+
 2010-07-10  Colin Watson  <cjwatson@ubuntu.com>
 
 	* Makefile.in (MAINTAINER_CLEANFILES): Remove
diff --git a/fs/nilfs2.c b/fs/nilfs2.c
index 5d32f5f88..8329c01a1 100644
--- a/fs/nilfs2.c
+++ b/fs/nilfs2.c
@@ -52,9 +52,9 @@
 /* nilfs 1st super block posission from beginning of the partition
    in 512 block size */
 #define NILFS_1ST_SUPER_BLOCK	2
-/* nilfs 2nd super block posission from end of the partition
+/* nilfs 2nd super block posission from beginning of the partition
    in 512 block size */
-#define NILFS_2ND_SUPER_BLOCK	8
+#define NILFS_2ND_SUPER_BLOCK(devsize)	(((devsize >> 3) - 1) << 3)
 
 struct grub_nilfs2_inode
 {
@@ -729,7 +729,7 @@ grub_nilfs2_load_sb (struct grub_nilfs2_data *data)
   if (partition_size != GRUB_DISK_SIZE_UNKNOWN)
     {
       /* Read second super block. */
-      grub_disk_read (disk, partition_size - NILFS_2ND_SUPER_BLOCK, 0,
+      grub_disk_read (disk, NILFS_2ND_SUPER_BLOCK (partition_size), 0,
 		      sizeof (struct grub_nilfs2_super_block), &sb2);
       /* Make sure if 2nd super block is valid.  */
       valid[1] = grub_nilfs2_valid_sb (&sb2);

From 1a1f1e67943b6c6b493a6b7a1d14a7db7c3a2a39 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 13 Jul 2010 12:20:32 +0100
Subject: [PATCH 1228/1628] * README: Point to the Info manual.

---
 ChangeLog |  4 ++++
 README    | 12 ++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 844d9f181..595f22756 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-13  Colin Watson  <cjwatson@ubuntu.com>
+
+	* README: Point to the Info manual.
+
 2010-07-13  Jiro SEKIBA <jir@unicus.jp>
 
 	* fs/nilfs2.c: fix macro NILFS_2ND_SUPER_BLOCK to calculate
diff --git a/README b/README
index b6c7fd6d7..b30a4b68b 100644
--- a/README
+++ b/README
@@ -10,5 +10,13 @@ GRUB 2 data and program files.
 Please visit the official web page of GRUB 2, for more information.
 The URL is <http://www.gnu.org/software/grub/grub.html>.
 
-For now, there is not much documentation yet. Please look at the GRUB
-Wiki <http://grub.enbug.org> for testing procedures.
+More extensive documentation is available in the Info manual,
+accessible using 'info grub' after building and installing GRUB 2.
+Please look at the GRUB Wiki <http://grub.enbug.org> for testing
+procedures.
+
+There are a number of important user-visible differences from the
+first version of GRUB, now known as GRUB Legacy. For a summary, please
+see:
+
+  info grub Introduction 'Changes from GRUB Legacy'

From 19563c25c1438db615543e3ff9c3c2c1111bf96a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 13 Jul 2010 12:24:07 +0100
Subject: [PATCH 1229/1628] * Makefile.in (.SUFFIX): Spell correctly, as ...
 (.SUFFIXES): ... this.  Fixes bug where `make foo' (where foo is a bare
 module name without `.mod', e.g. `test') tried to invoke a Modula-2 compiler.

---
 ChangeLog   | 7 +++++++
 Makefile.in | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 595f22756..e894a479c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-13  Colin Watson  <cjwatson@ubuntu.com>
+
+	* Makefile.in (.SUFFIX): Spell correctly, as ...
+	(.SUFFIXES): ... this.  Fixes bug where `make foo' (where foo is a
+	bare module name without `.mod', e.g. `test') tried to invoke a
+	Modula-2 compiler.
+
 2010-07-13  Colin Watson  <cjwatson@ubuntu.com>
 
 	* README: Point to the Info manual.
diff --git a/Makefile.in b/Makefile.in
index ce407e0cc..3dc7e6f19 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -524,8 +524,8 @@ check: all $(UNIT_TESTS) $(FUNCTIONAL_TESTS) $(SCRIPTED_TESTS)
 	  $(builddir)/$$file; \
 	done
 
-.SUFFIX:
-.SUFFIX: .c .o .S .d
+.SUFFIXES:
+.SUFFIXES: .c .o .S .d
 
 # Regenerate configure and Makefile automatically.
 $(srcdir)/aclocal.m4: configure.ac acinclude.m4

From 911bd64013d0f9398df278e41dd53ca8995a34eb Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 13 Jul 2010 23:35:24 +0530
Subject: [PATCH 1230/1628] make build by default

---
 configure.common       |   1 +
 gentpl.py              | 350 ++++++++++++++++---------------------
 grub-core/configure.ac |   2 +
 grub-core/modules.def  | 381 +++++++++++++++++------------------------
 modules.def            | 119 +++++--------
 5 files changed, 354 insertions(+), 499 deletions(-)

diff --git a/configure.common b/configure.common
index 46a3fd5e4..a9e5665dd 100644
--- a/configure.common
+++ b/configure.common
@@ -848,4 +848,5 @@ AM_CONDITIONAL([COND_GRUB_MKFONT], [test x$enable_grub_mkfont = xyes])
 AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x])
 AM_CONDITIONAL([COND_GRUB_FSTEST], [test x$enable_grub_fstest = xyes])
 AM_CONDITIONAL([COND_GRUB_PE2ELF], [test x$TARGET_OBJ2ELF != x])
+AM_CONDITIONAL([COND_APPLE_CC], [test x$TARGET_APPLE_CC != x])
 AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes])
diff --git a/gentpl.py b/gentpl.py
index de2efe80a..5081cf483 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -17,7 +17,6 @@ GROUPS["sparc64"] = [ "sparc64_ieee1275" ]
 GROUPS["powerpc"] = [ "powerpc_ieee1275" ]
 GROUPS["x86"]     = GROUPS["i386"] + GROUPS["x86_64"]
 GROUPS["x86_efi"] = [ "i386_efi", "x86_64_efi" ]
-GROUPS["common"]  = GRUB_PLATFORMS[:]
 GROUPS["nonemu"]  = GRUB_PLATFORMS[:]
 GROUPS["nonemu"].remove("emu")
 
@@ -75,100 +74,92 @@ def var_add(var, value):
 # Autogen constructs
 #
 
-def if_tag(tag, closure):
-    return "[+ IF " + tag + " +]" + closure() + "[+ ENDIF +]"
+def set_canonical_name_suffix(suffix): return "[+ % name `export cname=$(echo -n %s" + suffix + " | sed -e 's/[^0-9A-Za-z@_]/_/g')` +]"
+def cname(): return "[+ % name `echo $cname` +]"
 
-def if_tag_defined(tag, closure):
-    return "[+ IF " + tag + " defined +]" + closure() + "[+ ENDIF +]"
-
-def for_tag(tag, closure):
-    return "[+ FOR ." + tag + " +]" + closure() + "[+ ENDFOR +]"
-
-def collect_values(tag, prefix=""):
-    return for_tag(tag, lambda: prefix + "[+ ." + tag + " +] ")
-
-def each_group(platform, suffix, closure):
-    r = None
-    for group in RMAP[platform]:
-        if r == None:
-            r = "[+ IF ." + group + suffix + " +]"
-        else:
-            r += "[+ ELIF ." + group + suffix + " +]"
-            
-        r += closure(group)
-
-    if r:
-        r += "[+ ELSE +]"
-        r += closure(None)
-        r += "[+ ENDIF +]"
+def rule(target, source, cmd):
+    if cmd[0] == "\n":
+        return "\n" + target + ": " + source + cmd.replace("\n", "\n\t") + "\n"
     else:
-        r = closure(None)
+        return "\n" + target + ": " + source + "\n\t" + cmd.replace("\n", "\n\t") + "\n"
 
+def if_platform_tagged(platform, tag, closure, c2=None):
+    r = ""
+    r += "[+ IF " + tag + " defined +]"
+    r += "[+ FOR " + tag + " +][+ CASE " + tag + " +]"
+    for group in RMAP[platform]:
+        r += "[+ = \"" + group + "\" +]" + closure()
+    r += "[+ ESAC +][+ ENDFOR +]"
+
+    if c2 == None:
+        r += "[+ ENDIF +]"
+        return r
+
+    r += "[+ ELSE +]" + c2() + "[+ ENDIF +]"
     return r
 
+def platform_values(platform, group_tag, default_tag):
+    r = ""
+    for group in RMAP[platform]:
+        gtag = group + group_tag
+
+        if group == RMAP[platform][0]:
+            r += "[+ IF " + gtag + " +]"
+        else:
+            r += "[+ ELIF " + gtag + " +]"
+
+        r += "[+ FOR " + gtag + " +][+ ." + gtag + " +] [+ ENDFOR +]"
+    r += "[+ ELSE +][+ FOR " + default_tag + " +][+ ." + default_tag + " +] [+ ENDFOR +][+ ENDIF +]"
+    return r
+
+def under_conditional(x):
+    return "[+ IF condition +]\nif [+ condition +]\n[+ ENDIF +]" + x + "[+ IF condition +]\nendif\n[+ ENDIF +]"
+
 def each_platform(closure):
-    r = ""
+    r = "[+ IF - enable undefined +]"
     for platform in GRUB_PLATFORMS:
-        for group in RMAP[platform]:
-            if group == RMAP[platform][0]:
-                r += "[+ IF ." + group + " defined +]"
-            else:
-                r += "[+ ELIF ." + group + " defined +]"
+        r += "\nif COND_" + platform + "\n" + closure(platform) + "endif\n"
+    r += "[+ ELSE +]"
+    for platform in GRUB_PLATFORMS:
+        x = "\nif COND_" + platform + "\n" + closure(platform) + "endif\n"
+        r += if_platform_tagged(platform, "enable", lambda: x)
+    r += "[+ ENDIF +]"
+    return r;
 
-            r += "if COND_" + platform + "\n"
-            r += closure(platform)
-            r += "endif\n"
-        r += "[+ ENDIF +]"
-    return r
+def shared_sources(): return "[+ FOR shared +][+ .shared +] [+ ENDFOR +]"
+def shared_nodist_sources(): return "[+ FOR nodist_shared +] [+ .nodist_shared +][+ ENDFOR +]"
 
-def canonical_name():   return "[+ % name `echo -n %s | sed -e 's/[^0-9A-Za-z@_]/_/g'` +]"
-def canonical_module(): return canonical_name() + "_module"
-def canonical_kernel(): return canonical_name() + "_img"
-def canonical_image(): return canonical_name() + "_image"
+def platform_sources(p): return platform_values(p, "", "source")
+def platform_nodist_sources(p): return platform_values(p, "_nodist", "nodist")
+def platform_extra_dist(p): return platform_values(p, "_extra_dist", "extra_dist")
 
-def shared_sources(prefix=""):        return collect_values("shared", prefix)
-def shared_nodist_sources(prefix=""): return collect_values("nodist_shared", prefix)
-
-def default_sources(prefix=""):        return collect_values("source", prefix)
-def default_nodist_sources(prefix=""): return collect_values("nodist", prefix)
-def default_ldadd():        return collect_values("ldadd")
-def default_cflags():       return collect_values("cflags")
-def default_ldflags():      return collect_values("ldflags")
-def default_cppflags():     return collect_values("cppflags")
-def default_ccasflags():    return collect_values("ccasflags")
-def default_extra_dist(): return collect_values("extra_dist")
-
-def group_sources(group, prefix=""):        return collect_values(group, prefix) if group else default_sources(prefix)
-def group_nodist_sources(group, prefix=""): return collect_values(group + "_nodist", prefix) if group else default_nodist_sources(prefix)
-
-def platform_sources(platform, prefix=""):        return each_group(platform, "", lambda g: collect_values(g, prefix) if g else default_sources(prefix))
-def platform_nodist_sources(platform, prefix=""): return each_group(platform, "_nodist", lambda g: collect_values(g + "_nodist", prefix) if g else default_nodist_sources(prefix))
-
-def platform_ldadd(platform):        return each_group(platform, "_ldadd", lambda g: collect_values(g + "_ldadd") if g else default_ldadd())
-def platform_cflags(platform):       return each_group(platform, "_cflags", lambda g: collect_values(g + "_cflags") if g else default_cflags())
-def platform_ldflags(platform):      return each_group(platform, "_ldflags", lambda g: collect_values(g + "_ldflags") if g else default_ldflags())
-def platform_cppflags(platform):     return each_group(platform, "_cppflags", lambda g: collect_values(g + "_cppflags") if g else default_cppflags())
-def platform_ccasflags(platform):    return each_group(platform, "_ccasflags", lambda g: collect_values(g + "_ccasflags") if g else default_ccasflags())
-def platform_extra_dist(platform): return each_group(platform, "_extra_dist", lambda g: collect_values(g + "_extra_dist") if g else default_extra_dist())
-def platform_format(platform):       return each_group(platform, "_format", lambda g: collect_values(g + "_format") if g else "binary")
+def platform_ldadd(p): return platform_values(p, "_ldadd", "ldadd")
+def platform_cflags(p): return platform_values(p, "_cflags", "cflags")
+def platform_ldflags(p): return platform_values(p, "_ldflags", "ldflags")
+def platform_cppflags(p): return platform_values(p, "_cppflags", "cppflags")
+def platform_ccasflags(p): return platform_values(p, "_ccasflags", "ccasflags")
+def platform_stripflags(p): return platform_values(p, "_stripflags", "stripflags")
+def platform_objcopyflags(p): return platform_values(p, "_objcopyflags", "objcopyflags")
 
 def module(platform):
-    r  = gvar_add("noinst_PROGRAMS", "[+ name +].module")
+    r = set_canonical_name_suffix(".module")
+
+    r += gvar_add("noinst_PROGRAMS", "[+ name +].module")
     r += gvar_add("MODULE_FILES", "[+ name +].module$(EXEEXT)")
 
-    r += var_set(canonical_module() + "_SOURCES", platform_sources(platform) + "## platform sources")
-    r += var_add(canonical_module() + "_SOURCES", shared_sources() + "## shared sources")
-    r += var_set("nodist_" + canonical_module() + "_SOURCES", platform_nodist_sources(platform) + "## platform nodist sources")
-    r += var_add("nodist_" + canonical_module() + "_SOURCES", shared_nodist_sources() + "## shared nodist sources")
-    r += var_set(canonical_module() + "_LDADD", platform_ldadd(platform))
-    r += var_set(canonical_module() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_MODULE) " + platform_cflags(platform))
-    r += var_set(canonical_module() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_MODULE) " + platform_ldflags(platform))
-    r += var_set(canonical_module() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_MODULE) " + platform_cppflags(platform))
-    r += var_set(canonical_module() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_MODULE) " + platform_ccasflags(platform))
+    r += var_set(cname() + "_SOURCES", platform_sources(platform) + " ## platform sources")
+    r += var_add(cname() + "_SOURCES", shared_sources() + " ## shared sources")
+    r += var_set("nodist_" + cname() + "_SOURCES", platform_nodist_sources(platform) + " ## platform nodist sources")
+    r += var_add("nodist_" + cname() + "_SOURCES", shared_nodist_sources() + " ## shared nodist sources")
+    r += var_set(cname() + "_LDADD", platform_ldadd(platform))
+    r += var_set(cname() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_MODULE) " + platform_cflags(platform))
+    r += var_set(cname() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_MODULE) " + platform_ldflags(platform))
+    r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_MODULE) " + platform_cppflags(platform))
+    r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_MODULE) " + platform_ccasflags(platform))
 
     r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
-    r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_module() + "_SOURCES)")
-    r += gvar_add("CLEANFILES", "$(nodist_" + canonical_module() + "_SOURCES)")
+    r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
+    r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")
 
     r += gvar_add("DEF_FILES", "def-[+ name +].lst")
     r += gvar_add("UND_FILES", "und-[+ name +].lst")
@@ -189,8 +180,8 @@ def module(platform):
 
     r += gvar_add("CLEANFILES", "[+ name +].pp")
     r += """
-[+ name +].pp: $(""" + canonical_module() + """_SOURCES) $(nodist_""" + canonical_module() + """_SOURCES)
-	$(TARGET_CPP) -DGRUB_LST_GENERATOR $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(""" + canonical_module() + """_CPPFLAGS) $(CPPFLAGS) $^ > $@ || (rm -f $@; exit 1)
+[+ name +].pp: $(""" + cname() + """_SOURCES) $(nodist_""" + cname() + """_SOURCES)
+	$(TARGET_CPP) -DGRUB_LST_GENERATOR $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(""" + cname() + """_CPPFLAGS) $(CPPFLAGS) $^ > $@ || (rm -f $@; exit 1)
 
 def-[+ name +].lst: [+ name +].module$(EXEEXT)
 	if test x$(USE_APPLE_CC_FIXES) = xyes; then \
@@ -242,64 +233,47 @@ terminal-[+ name +].lst: [+ name +].pp $(top_srcdir)/genterminallist.sh
 """
     return r
 
-def rule(target, source, cmd):
-    if cmd[0] == "\n":
-        return "\n" + target + ": " + source + cmd.replace("\n", "\n\t") + "\n"
-    else:
-        return "\n" + target + ": " + source + "\n\t" + cmd.replace("\n", "\n\t") + "\n"
-
-def image_nostrip(platform):
-    return if_tag_defined("image_nostrip." + platform, lambda: rule("[+ name +].img", "[+ name +].exec", "cp $< $@"))
-
-def image_strip(platform):
-    return if_tag_defined("image_strip." + platform, lambda: rule("[+ name +].img", "[+ name +].exec", "$(STRIP) -o $@ -R .rel.dyn -R .reginfo -R .note -R .comment $<"))
-
-def image_strip_keep_kernel(platform):
-    return if_tag_defined("image_strip_keep_kernel." + platform, lambda: rule("[+ name +].img", "[+ name +].exec", "$(STRIP) -o $@ --strip-unneeded -K start -R .note -R .comment $<"))
-
-def image_strip_macho2img(platform):
-    return if_tag_defined("image_strip_macho2img." + platform, lambda: rule("[+ name +].img", "[+ name +].exec", """
-if test "x$(TARGET_APPLE_CC)" = x1; then \
-  $(MACHO2IMG) --bss $< $@ || exit 1; \
-else \
-  $(STRIP) -o $@ -O binary --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< || exit 1; \
-fi
-"""))
-
 def kernel(platform):
-    r  = gvar_add("noinst_PROGRAMS", "[+ name +].img")
-    r += var_set(canonical_kernel() + "_SOURCES", platform_sources(platform))
-    r += var_add(canonical_kernel() + "_SOURCES", shared_sources())
-    r += var_set("nodist_" + canonical_kernel() + "_SOURCES", platform_nodist_sources(platform) + "## platform nodist sources")
-    r += var_add("nodist_" + canonical_kernel() + "_SOURCES", shared_nodist_sources() + "## shared nodist sources")
-    r += var_set(canonical_kernel() + "_LDADD", platform_ldadd(platform))
-    r += var_set(canonical_kernel() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_KERNEL) " + platform_cflags(platform))
-    r += var_set(canonical_kernel() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_KERNEL) " + platform_ldflags(platform))
-    r += var_set(canonical_kernel() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) " + platform_cppflags(platform))
-    r += var_set(canonical_kernel() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_KERNEL) " + platform_ccasflags(platform))
+    r = set_canonical_name_suffix(".exec")
+    r += gvar_add("noinst_PROGRAMS", "[+ name +].exec")
+    r += var_set(cname() + "_SOURCES", platform_sources(platform))
+    r += var_add(cname() + "_SOURCES", shared_sources())
+    r += var_set("nodist_" + cname() + "_SOURCES", platform_nodist_sources(platform) + " ## platform nodist sources")
+    r += var_add("nodist_" + cname() + "_SOURCES", shared_nodist_sources() + " ## shared nodist sources")
+    r += var_set(cname() + "_LDADD", platform_ldadd(platform))
+    r += var_set(cname() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_KERNEL) " + platform_cflags(platform))
+    r += var_set(cname() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_KERNEL) " + platform_ldflags(platform))
+    r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) " + platform_cppflags(platform))
+    r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_KERNEL) " + platform_ccasflags(platform))
+    r += var_set(cname() + "_STRIPFLAGS", "$(AM_STRIPFLAGS) $(STRIPFLAGS_KERNEL) " + platform_stripflags(platform))
 
     r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
-    r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_kernel() + "_SOURCES)")
-    r += gvar_add("CLEANFILES", "$(nodist_" + canonical_kernel() + "_SOURCES)")
+    r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
+    r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")
 
     r += gvar_add("platform_DATA", "[+ name +].img")
+    r += gvar_add("CLEANFILES", "[+ name +].img")
+    r += rule("[+ name +].img", "[+ name +].exec$(EXEEXT)",
+              if_platform_tagged(platform, "nostrip", lambda: "cp $@ $<",
+                                 lambda: "$(STRIP) $(" + cname() + "_STRIPFLAGS) -o $@ $<"))
     return r
 
 def image(platform):
-    r  = gvar_add("noinst_PROGRAMS", "[+ name +].image")
-    r += var_set(canonical_image() + "_SOURCES", platform_sources(platform))
-    r += var_add(canonical_image() + "_SOURCES", shared_sources())
-    r += var_set("nodist_" + canonical_image() + "_SOURCES", platform_nodist_sources(platform) + "## platform nodist sources")
-    r += var_add("nodist_" + canonical_image() + "_SOURCES", shared_nodist_sources() + "## shared nodist sources")
-    r += var_set(canonical_image() + "_LDADD", platform_ldadd(platform))
-    r += var_set(canonical_image() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_IMAGE) " + platform_cflags(platform))
-    r += var_set(canonical_image() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_IMAGE) " + platform_ldflags(platform))
-    r += var_set(canonical_image() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_IMAGE) " + platform_cppflags(platform))
-    r += var_set(canonical_image() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_IMAGE) " + platform_ccasflags(platform))
+    r = set_canonical_name_suffix(".image")
+    r += gvar_add("noinst_PROGRAMS", "[+ name +].image")
+    r += var_set(cname() + "_SOURCES", platform_sources(platform))
+    r += var_add(cname() + "_SOURCES", shared_sources())
+    r += var_set("nodist_" + cname() + "_SOURCES", platform_nodist_sources(platform) + "## platform nodist sources")
+    r += var_add("nodist_" + cname() + "_SOURCES", shared_nodist_sources() + "## shared nodist sources")
+    r += var_set(cname() + "_LDADD", platform_ldadd(platform))
+    r += var_set(cname() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_IMAGE) " + platform_cflags(platform))
+    r += var_set(cname() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_IMAGE) " + platform_ldflags(platform))
+    r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_IMAGE) " + platform_cppflags(platform))
+    r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_IMAGE) " + platform_ccasflags(platform))
 
     r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
-    r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_image() + "_SOURCES)")
-    r += gvar_add("CLEANFILES", "$(nodist_" + canonical_image() + "_SOURCES)")
+    r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
+    r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")
 
     r += gvar_add("platform_DATA", "[+ name +].img")
     r += gvar_add("CLEANFILES", "[+ name +].img")
@@ -307,24 +281,25 @@ def image(platform):
 if test x$(USE_APPLE_CC_FIXES) = xyes; then \
   $(MACHO2IMG) $< $@; \
 else \
-  $(OBJCOPY) -O """ + platform_format(platform) + """ --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< $@; \
+  $(OBJCOPY) """ + platform_objcopyflags(platform) + """ --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< $@; \
 fi
 """)
     return r
 
 def library(platform):
-    r  = gvar_add("noinst_LIBRARIES", "[+ name +]")
-    r += var_set(canonical_name() + "_SOURCES", platform_sources(platform))
-    r += var_add(canonical_name() + "_SOURCES", shared_sources())
-    r += var_set("nodist_" + canonical_name() + "_SOURCES", platform_nodist_sources(platform))
-    r += var_add("nodist_" + canonical_name() + "_SOURCES", shared_nodist_sources())
-    r += var_set(canonical_name() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_LIBRARY) " + platform_cflags(platform))
-    r += var_set(canonical_name() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) " + platform_cppflags(platform))
-    r += var_set(canonical_name() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_LIBRARY) " + platform_ccasflags(platform))
+    r = set_canonical_name_suffix("")
+    r += gvar_add("noinst_LIBRARIES", "[+ name +]")
+    r += var_set(cname() + "_SOURCES", platform_sources(platform))
+    r += var_add(cname() + "_SOURCES", shared_sources())
+    r += var_set("nodist_" + cname() + "_SOURCES", platform_nodist_sources(platform))
+    r += var_add("nodist_" + cname() + "_SOURCES", shared_nodist_sources())
+    r += var_set(cname() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_LIBRARY) " + platform_cflags(platform))
+    r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) " + platform_cppflags(platform))
+    r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_LIBRARY) " + platform_ccasflags(platform))
 
     r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
-    r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_name() + "_SOURCES)")
-    r += gvar_add("CLEANFILES", "$(nodist_" + canonical_name() + "_SOURCES)")
+    r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
+    r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")
 
     return r
 
@@ -344,46 +319,45 @@ PATH=$(builddir):$$PATH $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/
     return r
 
 def program(platform, test=False):
-    if test:
-        r = gvar_add("check_PROGRAMS", "[+ name +]")
-    else:
-        r  = gvar_add(installdir() + "_PROGRAMS", "[+ name +]")
+    r = set_canonical_name_suffix("")
 
-    r += var_set(canonical_name() + "_SOURCES", platform_sources(platform))
-    r += var_add(canonical_name() + "_SOURCES", shared_sources())
-    r += var_set("nodist_" + canonical_name() + "_SOURCES", platform_nodist_sources(platform))
-    r += var_add("nodist_" + canonical_name() + "_SOURCES", shared_nodist_sources())
-    r += var_set(canonical_name() + "_LDADD", platform_ldadd(platform))
-    r += var_set(canonical_name() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_PROGRAM) " + platform_cflags(platform))
-    r += var_set(canonical_name() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_PROGRAM) " + platform_ldflags(platform))
-    r += var_set(canonical_name() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) " + platform_cppflags(platform))
-    r += var_set(canonical_name() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM) " + platform_ccasflags(platform))
+    r += "[+ IF testcase defined +]"
+    r += gvar_add("check_PROGRAMS", "[+ name +]")
+    r += gvar_add("TESTS", "[+ name +]")
+    r += "[+ ELSE +]"
+    r += gvar_add(installdir() + "_PROGRAMS", "[+ name +]")
+    r += "[+ IF mansection +]" + manpage() + "[+ ENDIF +]"
+    r += "[+ ENDIF +]"
+
+    r += var_set(cname() + "_SOURCES", platform_sources(platform))
+    r += var_add(cname() + "_SOURCES", shared_sources())
+    r += var_set("nodist_" + cname() + "_SOURCES", platform_nodist_sources(platform))
+    r += var_add("nodist_" + cname() + "_SOURCES", shared_nodist_sources())
+    r += var_set(cname() + "_LDADD", platform_ldadd(platform))
+    r += var_set(cname() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_PROGRAM) " + platform_cflags(platform))
+    r += var_set(cname() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_PROGRAM) " + platform_ldflags(platform))
+    r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) " + platform_cppflags(platform))
+    r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM) " + platform_ccasflags(platform))
 
     r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
-    r += gvar_add("BUILT_SOURCES", "$(nodist_" + canonical_name() + "_SOURCES)")
-    r += gvar_add("CLEANFILES", "$(nodist_" + canonical_name() + "_SOURCES)")
-
-    if test:
-        r += if_tag_defined("enable", lambda: gvar_add("TESTS", "[+ name +]"))
-    else:
-        r += if_tag("mansection", lambda: manpage())
-
+    r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
+    r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")
     return r
 
-def test_program(platform):
-    return program(platform, True)
-
 def data(platform):
     r  = gvar_add("EXTRA_DIST", platform_sources(platform))
     r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
     r += gvar_add(installdir() + "_DATA", platform_sources(platform))
     return r
 
-def script(platform, test=False):
-    if test:
-        r = gvar_add("check_SCRIPTS", "[+ name +]")
-    else:
-        r  = gvar_add(installdir() + "_SCRIPTS", "[+ name +]")
+def script(platform):
+    r  = "[+ IF testcase defined +]"
+    r += gvar_add("check_SCRIPTS", "[+ name +]")
+    r += gvar_add ("TESTS", "[+ name +]")
+    r += "[+ ELSE +]"
+    r += gvar_add(installdir() + "_SCRIPTS", "[+ name +]")
+    r += "[+ IF mansection +]" + manpage() + "[+ ENDIF +]"
+    r += "[+ ENDIF +]"
 
     r += rule("[+ name +]", "$(top_builddir)/config.status " + platform_sources(platform), """
 $(top_builddir)/config.status --file=-:""" + platform_sources(platform) + """ \
@@ -393,46 +367,28 @@ chmod a+x [+ name +]
 
     r += gvar_add("CLEANFILES", "[+ name +]")
     r += gvar_add("EXTRA_DIST", platform_sources(platform))
-
-    if test:
-        r += if_tag_defined("enable", lambda: gvar_add("TESTS", "[+ name +]"))
-    else:
-        r += if_tag("mansection", lambda: manpage())
-
     return r
 
-def test_script(platform):
-    return script(platform, True)
-
-def with_enable_condition(x):
-    return "[+ IF enable +]if [+ enable +]\n" + x + "endif\n[+ ELSE +]" + x + "[+ ENDIF +]"
-
 def module_rules():
-    return for_tag("module", lambda: with_enable_condition(each_platform(lambda p: module(p))))
+    return "[+ FOR module +]" + under_conditional(each_platform(lambda p: module(p))) + "[+ ENDFOR +]"
 
 def kernel_rules():
-    return for_tag("kernel", lambda: with_enable_condition(each_platform(lambda p: kernel(p))))
+    return "[+ FOR kernel +]" + under_conditional(each_platform(lambda p: kernel(p))) + "[+ ENDFOR +]"
 
 def image_rules():
-    return for_tag("image", lambda: with_enable_condition(each_platform(lambda p: image(p))))
+    return "[+ FOR image +]" + under_conditional(each_platform(lambda p: image(p))) + "[+ ENDFOR +]"
 
 def library_rules():
-    return for_tag("library", lambda: with_enable_condition(each_platform(lambda p: library(p))))
+    return "[+ FOR library +]" + under_conditional(each_platform(lambda p: library(p))) + "[+ ENDFOR +]"
 
 def program_rules():
-    return for_tag("program", lambda: with_enable_condition(each_platform(lambda p: program(p))))
+    return "[+ FOR program +]" + under_conditional(each_platform(lambda p: program(p))) + "[+ ENDFOR +]"
 
 def script_rules():
-    return for_tag("script", lambda: with_enable_condition(each_platform(lambda p: script(p))))
+    return "[+ FOR script +]" + under_conditional(each_platform(lambda p: script(p))) + "[+ ENDFOR +]"
 
 def data_rules():
-    return for_tag("data", lambda: with_enable_condition(each_platform(lambda p: data(p))))
-
-def test_program_rules():
-    return for_tag("test_program", lambda: with_enable_condition(each_platform(lambda p: test_program(p))))
-
-def test_script_rules():
-    return for_tag("test_script", lambda: with_enable_condition(each_platform(lambda p: test_script(p))))
+    return "[+ FOR data +]" + under_conditional(each_platform(lambda p: data(p))) + "[+ ENDFOR +]"
 
 print "[+ AutoGen5 template +]\n"
 a = module_rules()
@@ -442,11 +398,9 @@ d = library_rules()
 e = program_rules()
 f = script_rules()
 g = data_rules()
-h = test_program_rules()
-i = test_script_rules()
 z = global_variable_initializers()
 
-print z # initializer for all vars
+# print z # initializer for all vars
 print a
 print b
 print c
@@ -454,8 +408,6 @@ print d
 print e
 print f
 print g
-print h
-print i
 
 print """.PRECIOUS: modules.am
 $(srcdir)/modules.am: $(srcdir)/modules.def $(top_srcdir)/Makefile.tpl
diff --git a/grub-core/configure.ac b/grub-core/configure.ac
index 7c3175fea..5ba5962a3 100644
--- a/grub-core/configure.ac
+++ b/grub-core/configure.ac
@@ -33,6 +33,8 @@ dnl package (in grub-core directory) builds with TARGETCC.
 AC_INIT([GRUB],[1.98],[bug-grub@gnu.org])
 AC_CONFIG_AUX_DIR([.])
 
+: ${CFLAGS=""} # We don't want -g -O2
+
 # Checks for host and target systems.
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
diff --git a/grub-core/modules.def b/grub-core/modules.def
index 08eb6e4ea..b63c70922 100644
--- a/grub-core/modules.def
+++ b/grub-core/modules.def
@@ -3,8 +3,9 @@ AutoGen definitions Makefile.tpl;
 kernel = {
   name = kernel;
 
-  emu_ldflags              = '-Wl,-r';
-  x86_efi_ldflags          = '-Wl,-r';
+  emu_ldflags              = '-Wl,-r,-d';
+  x86_efi_ldflags          = '-Wl,-r,-d';
+  x86_efi_stripflags       = '--strip-unneeded -K start -R .note -R .comment';
 
   i386_pc_ldflags          = '$(TARGET_IMG_LDFLAGS)';
   i386_pc_ldflags          = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
@@ -246,7 +247,7 @@ program = {
   ldadd = '$(MODULE_FILES)';
   ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)';
 
-  emu;
+  enable = emu;
 };
 
 program = {
@@ -259,7 +260,7 @@ program = {
   ldadd = 'kernel.img$(EXEEXT)';
   ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)';
 
-  emu;
+  enable = emu;
 };
 
 image = {
@@ -275,8 +276,13 @@ image = {
   i386_qemu_ccasflags = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
 
   sparc64_ieee1275 = boot/sparc64/ieee1275/boot.S;
-  sparc64_ieee1275_format = a.out-sunos-big;
+  sparc64_ieee1275_objcopyflags = '-O a.out-sunos-big';
   sparc64_ieee1275_ldflags = ' -Wl,-Ttext=0x4000';
+
+  objcopyflags = '-O binary';
+  enable = i386_pc;
+  enable = i386_qemu;
+  enable = sparc64_ieee1275;
 };
 
 image = {
@@ -284,6 +290,8 @@ image = {
   i386_pc = boot/i386/pc/cdboot.S;
   i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
   i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00';
+  objcopyflags = '-O binary';
+  enable = i386_pc;
 };
 
 image = {
@@ -292,6 +300,9 @@ image = {
 
   i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
   i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00';
+
+  objcopyflags = '-O binary';
+  enable = i386_pc;
 };
 
 image = {
@@ -303,6 +314,11 @@ image = {
 
   sparc64_ieee1275 = boot/sparc64/ieee1275/diskboot.S;
   sparc64_ieee1275_ldflags = '-Wl,-Ttext=0x4200';
+
+  objcopyflags = '-O binary';
+
+  enable = i386_pc;
+  enable = sparc64_ieee1275;
 };
 
 image = {
@@ -311,44 +327,49 @@ image = {
 
   i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
   i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x6000';
+
+  objcopyflags = '-O binary';
+  enable = i386_pc;
 };
 
 image = {
   name = fwstart;
   mips_yeeloong = boot/mips/yeeloong/fwstart.S;
+  objcopyflags = '-O binary';
+  enable = mips_yeeloong;
 };
 
 module = {
   name = trig;
   nodist = trigtables.c;
   extra_dist = gentrigtables.c;
-  common;
 };
 
 module = {
   name = cs5536;
   source = bus/cs5536.c;
-  i386;
+  enable = i386;
 };
 
 module = {
   name = libusb;
   source = bus/usb/emu/usb.c;
-  emu;
-  enable = COND_GRUB_EMU_USB;
+  enable = emu;
+  condition = COND_GRUB_EMU_USB;
 };
 
 module = {
   name = lsspd;
   mips_yeeloong = commands/mips/yeeloong/lsspd.c;
+  enable = mips_yeeloong;
 };
 
 module = {
   name = pci;
   source = bus/emu/pci.c;
   source = commands/lspci.c;
-  emu;
-  enable = COND_GRUB_EMU_PCI;
+  enable = emu;
+  condition = COND_GRUB_EMU_PCI;
 };
 
 module = {
@@ -356,37 +377,37 @@ module = {
   source = bus/usb/usb.c;
   source = bus/usb/usbtrans.c;
   source = bus/usb/usbhub.c;
-  i386;
-  mips_yeeloong;
+  enable = i386;
+  enable = mips_yeeloong;
 };
 
 module = {
   name = usb;
   source = bus/usb/usb.c;
-  emu;
-  enable = COND_GRUB_EMU_USB;
+  enable = emu;
+  condition = COND_GRUB_EMU_USB;
 };
 
 module = {
   name = uhci;
   source = bus/usb/uhci.c;
-  x86;
+  enable = x86;
 };
 
 module = {
   name = ohci;
   source = bus/usb/ohci.c;
-  x86;
-  mips_yeeloong;
+  enable = x86;
+  enable = mips_yeeloong;
 };
 
 module = {
   name = pci;
   source = bus/pci.c;
-  i386_pc;
-  i386_efi;
-  i386_ieee1275;
-  i386_coreboot;
+  enable = i386_pc;
+  enable = i386_efi;
+  enable = i386_ieee1275;
+  enable = i386_coreboot;
 };
 
 library = {
@@ -400,13 +421,12 @@ library = {
 
   cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
   cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
-  common;
 };
 
 module = {
   name = iorw;
   source = commands/iorw.c;
-  i386;
+  enable = i386;
 };
 
 module = {
@@ -415,7 +435,6 @@ module = {
   ldadd = libgnulib.a;
   cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
   cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
-  common;
 };
 
 module = {
@@ -426,16 +445,17 @@ module = {
 
   i386_pc = commands/acpi.c;
   i386_pc = commands/i386/pc/acpi.c;
+
+  enable = x86_efi;
+  enable = i386_pc;
 };
 
 module = {
-  common;
   name = blocklist;
   source = commands/blocklist.c;
 };
 
 module = {
-  common;
   name = boot;
   source = commands/boot.c;
 
@@ -444,19 +464,16 @@ module = {
 };
 
 module = {
-  common;
   name = cat;
   source = commands/cat.c;
 };
 
 module = {
-  common;
   name = cmp;
   source = commands/cmp.c;
 };
 
 module = {
-  common;
   name = configfile;
   source = commands/configfile.c;
 };
@@ -465,23 +482,18 @@ module = {
   name = cpuid;
   source = commands/i386/cpuid.c;
 
-  x86;
+  enable = x86;
 };
 
 module = {
-  common;
   name = crc;
   source = commands/crc.c;
   source = lib/crc.c;
 };
 
 module = {
-  common;
   name = date;
   source = commands/date.c;
-
-  x86;
-  mips;
 };
 
 module = {
@@ -489,16 +501,15 @@ module = {
 
   i386_pc = commands/i386/pc/drivemap.c;
   i386_pc = commands/i386/pc/drivemap_int13h.S;
+  enable = i386_pc;
 };
 
 module = {
-  common;
   name = echo;
   source = commands/echo.c;
 };
 
 module = {
-  common;
   name = extcmd;
   source = commands/extcmd.c;
   source = lib/arg.c;
@@ -507,10 +518,10 @@ module = {
 module = {
   name = fixvideo;
   x86_efi = commands/efi/fixvideo.c;
+  enable = x86_efi;
 };
 
 module = {
-  common;
   name = gptsync;
   source = commands/gptsync.c;
 };
@@ -520,15 +531,9 @@ module = {
   source = commands/halt.c;
 
   i386_pc = commands/i386/pc/halt.c;
-  emu;
-  x86;
-  sparc64;
-  powerpc;
-  mips_yeeloong;
 };
 
 module = {
-  common;
   name = hashsum;
   source = commands/hashsum.c;
 };
@@ -538,24 +543,21 @@ module = {
   source = commands/hdparm.c;
   source = lib/hexdump.c;
 
-  i386_pc;
+  enable = i386_pc;
 };
 
 module = {
-  common;
   name = help;
   source = commands/help.c;
 };
 
 module = {
-  common;
   name = hexdump;
   source = commands/hexdump.c;
   source = lib/hexdump.c;
 };
 
 module = {
-  common;
   name = keystatus;
   source = commands/keystatus.c;
 };
@@ -563,69 +565,62 @@ module = {
 module = {
   name = loadbios;
   x86_efi = commands/efi/loadbios.c;
+  enable = x86_efi;
 };
 
 module = {
-  common;
   name = loadenv;
   source = commands/loadenv.c;
   source = lib/envblk.c;
 };
 
 module = {
-  common;
   name = ls;
   source = commands/ls.c;
 };
 
 module = {
-  common;
   name = lsmmap;
   source = commands/lsmmap.c;
 
-  i386_pc;
-  i386_qemu;
-  i386_coreboot;
-  i386_multiboot;
-  i386_ieee1275;
-  mips_yeeloong;
-  powerpc_ieee1275;
+  enable = i386_pc;
+  enable = i386_qemu;
+  enable = i386_coreboot;
+  enable = i386_multiboot;
+  enable = i386_ieee1275;
+  enable = mips_yeeloong;
+  enable = powerpc_ieee1275;
 };
 
 module = {
   name = lspci;
   source = commands/lspci.c;
 
-  x86;
-  mips;
+  enable = x86;
+  enable = mips;
 };
 
 module = {
-  common;
   name = memrw;
   source = commands/memrw.c;
 };
 
 module = {
-  common;
   name = minicmd;
   source = commands/minicmd.c;
 };
 
 module = {
-  common;
   name = parttool;
   source = commands/parttool.c;
 };
 
 module = {
-  common;
   name = password;
   source = commands/password.c;
 };
 
 module = {
-  common;
   name = password_pbkdf2;
   source = commands/password_pbkdf2.c;
 };
@@ -633,11 +628,10 @@ module = {
 module = {
   name = play;
   source = commands/i386/pc/play.c;
-  i386;
+  enable = i386;
 };
 
 module = {
-  common;
   name = probe;
   source = commands/probe.c;
 };
@@ -645,43 +639,36 @@ module = {
 module = {
   name = pxecmd;
   i386_pc = commands/i386/pc/pxecmd.c;
+  enable = i386_pc;
 };
 
 module = {
-  common;
   name = read;
   source = commands/read.c;
 };
 
 module = {
-  common;
   name = reboot;
   source = commands/reboot.c;
-
-  x86; powerpc; sparc64;
 };
 
 module = {
-  common;
   name = search;
   source = commands/search_wrap.c;
   extra_dist = commands/search.c;
 };
 
 module = {
-  common;
   name = search_fs_file;
   source = commands/search_file.c;
 };
 
 module = {
-  common;
   name = search_fs_uuid;
   source = commands/search_uuid.c;
 };
 
 module = {
-  common;
   name = search_label;
   source = commands/search_label.c;
 };
@@ -690,11 +677,10 @@ module = {
   name = setpci;
   source = commands/setpci.c;
 
-  x86;
+  enable = x86;
 };
 
 module = {
-  common;
   name = sleep;
   source = commands/sleep.c;
 };
@@ -702,24 +688,21 @@ module = {
 module = {
   name = suspend;
   source = commands/ieee1275/suspend.c;
-  i386_ieee1275;
-  powerpc_ieee1275;
+  enable = i386_ieee1275;
+  enable = powerpc_ieee1275;
 };
 
 module = {
-  common;
   name = terminal;
   source = commands/terminal.c;
 };
 
 module = {
-  common;
   name = test;
   source = commands/test.c;
 };
 
 module = {
-  common;
   name = true;
   source = commands/true.c;
 };
@@ -727,89 +710,80 @@ module = {
 module = {
   name = usbtest;
   source = commands/usbtest.c;
-  i386_pc;
-  mips_yeeloong;
+  enable = i386_pc;
+  enable = mips_yeeloong;
 };
 
 module = {
   name = usbtest;
   source = commands/usbtest.c;
-  emu;
-  enable = COND_GRUB_EMU_USB;
+  enable = emu;
+  condition = COND_GRUB_EMU_USB;
 };
 
 module = {
   name = vbeinfo;
   i386_pc = commands/i386/pc/vbeinfo.c;
+  enable = i386_pc;
 };
 
 module = {
   name = vbetest;
   i386_pc = commands/i386/pc/vbetest.c;
+  enable = i386_pc;
 };
 
 module = {
-  common;
   name = videotest;
   source = commands/videotest.c;
 };
 
 module = {
-  common;
   name = xnu_uuid;
   source = commands/xnu_uuid.c;
 };
 
 module = {
-  common;
   name = dm_nv;
   source = disk/dmraid_nvidia.c;
 };
 
 module = {
-  common;
   name = loopback;
   source = disk/loopback.c;
 };
 
 module = {
-  common;
   name = lvm;
   source = disk/lvm.c;
 };
 
 module = {
-  common;
   name = mdraid;
   source = disk/mdraid_linux.c;
 };
 
 module = {
-  common;
   name = raid;
   source = disk/raid.c;
 };
 
 module = {
-  common;
   name = raid5rec;
   source = disk/raid5_recover.c;
 };
 
 module = {
-  common;
   name = raid6rec;
   source = disk/raid6_recover.c;
 };
 
 module = {
-  common;
   name = scsi;
   source = disk/scsi.c;
 };
 
 module = {
-  common;
   name = memdisk;
   source = disk/memdisk.c;
 };
@@ -818,42 +792,43 @@ module = {
   name = ata;
   source = disk/ata.c;
 
-  x86;
-  mips;
+  enable = x86;
+  enable = mips;
 };
 
 module = {
   name = ata_pthru;
   source = disk/ata_pthru.c;
 
-  x86;
-  mips_yeeloong;
+  enable = x86;
+  enable = mips_yeeloong;
 };
 
 module = {
   name = biosdisk;
   i386_pc = disk/i386/pc/biosdisk.c;
+  enable = i386_pc;
 };
 
 module = {
   name = usbms;
   source = disk/usbms.c;
-  i386_pc;
-  mips_yeeloong;
+  enable = i386_pc;
+  enable = mips_yeeloong;
 };
 
 module = {
   name = usbms;
   source = disk/usbms.c;
-  emu;
-  enable = COND_GRUB_EMU_USB;
+  enable = emu;
+  condition = COND_GRUB_EMU_USB;
 };
 
 module = {
   name = nand;
   source = disk/ieee1275/nand.c;
 
-  i386_ieee1275;
+  enable = i386_ieee1275;
 };
 
 module = {
@@ -876,158 +851,136 @@ module = {
   extra_dist = efiemu/loadcore.c;
   extra_dist = efiemu/runtime/efiemu.S;
   extra_dist = efiemu/runtime/efiemu.c;
+
+  enable = i386_pc;
 };
 
 module = {
   name = font;
   source = font/font.c;
   source = font/font_cmd.c;
-  emu;
-  x86;
-  sparc64;
-  powerpc;
+  enable = emu;
+  enable = x86;
+  enable = sparc64;
+  enable = powerpc;
 };
 
 module = {
-  common;
   name = affs;
   source = fs/affs.c;
 };
 
 module = {
-  common;
   name = afs;
   source = fs/afs.c;
 };
 
 module = {
-  common;
   name = afs_be;
   source = fs/afs_be.c;
 };
 
 module = {
-  common;
   name = befs;
   source = fs/befs.c;
 };
 
 module = {
-  common;
   name = befs_be;
   source = fs/befs_be.c;
 };
 
 module = {
-  common;
   name = cpio;
   source = fs/cpio.c;
 };
 
 module = {
-  common;
   name = ext2;
   source = fs/ext2.c;
 };
 
 module = {
-  common;
   name = fat;
   source = fs/fat.c;
 };
 
 module = {
-  common;
   name = fshelp;
   source = fs/fshelp.c;
 };
 
 module = {
-  common;
   name = hfs;
   source = fs/hfs.c;
 };
 
 module = {
-  common;
   name = hfsplus;
   source = fs/hfsplus.c;
 };
 
 module = {
-  common;
   name = iso9660;
   source = fs/iso9660.c;
 };
 
 module = {
-  common;
   name = jfs;
   source = fs/jfs.c;
 };
 
 module = {
-  common;
   name = minix;
   source = fs/minix.c;
 };
 
 module = {
-  common;
   name = nilfs2;
   source = fs/nilfs2.c;
 };
 
 module = {
-  common;
   name = ntfs;
   source = fs/ntfs.c;
 };
 
 module = {
-  common;
   name = ntfscomp;
   source = fs/ntfscomp.c;
 };
 
 module = {
-  common;
   name = reiserfs;
   source = fs/reiserfs.c;
 };
 
 module = {
-  common;
   name = sfs;
   source = fs/sfs.c;
 };
 
 module = {
-  common;
   name = tar;
   source = fs/tar.c;
 };
 
 module = {
-  common;
   name = udf;
   source = fs/udf.c;
 };
 
 module = {
-  common;
   name = ufs1;
   source = fs/ufs.c;
 };
 
 module = {
-  common;
   name = ufs2;
   source = fs/ufs2.c;
 };
 
 module = {
-  common;
   name = xfs;
   source = fs/xfs.c;
 };
@@ -1035,16 +988,15 @@ module = {
 module = {
   name = pxe;
   i386_pc = fs/i386/pc/pxe.c;
+  enable = i386_pc;
 };
 
 module = {
   name = gettext;
   source = gettext/gettext.c;
-  common;
 };
 
 module = {
-  common;
   name = gfxmenu;
   source = gfxmenu/gfxmenu.c;
   source = gfxmenu/model.c;
@@ -1066,13 +1018,11 @@ module = {
 };
 
 module = {
-  common;
   name = hello;
   source = hello/hello.c;
 };
 
 module = {
-  common;
   name = gzio;
   source = io/gzio.c;
 };
@@ -1080,20 +1030,18 @@ module = {
 module = {
   name = bufio;
   source = io/bufio.c;
-  emu;
-  x86;
-  sparc64;
-  powerpc;
+  enable = emu;
+  enable = x86;
+  enable = sparc64;
+  enable = powerpc;
 };
 
 module = {
-  common;
   name = elf;
   source = kern/elf.c;
 };
 
 module = {
-  common;
   name = crypto;
   source = lib/crypto.c;
 
@@ -1101,7 +1049,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_arcfour;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1109,7 +1056,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_blowfish;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1117,7 +1063,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_camellia;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1126,7 +1071,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_cast5;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1134,7 +1078,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_crc;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1142,7 +1085,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_des;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1150,7 +1092,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_md4;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1158,7 +1099,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_md5;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1166,7 +1106,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_rfc2268;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1174,7 +1113,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_rijndael;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1182,7 +1120,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_rmd160;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1190,7 +1127,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_seed;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1198,7 +1134,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_serpent;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1206,7 +1141,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_sha1;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1214,7 +1148,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_sha256;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1222,7 +1155,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_sha512;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1230,7 +1162,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_tiger;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1238,7 +1169,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_twofish;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1246,7 +1176,6 @@ module = {
 };
 
 module = {
-  common;
   name = gcry_whirlpool;
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
@@ -1254,7 +1183,6 @@ module = {
 };
 
 module = {
-  common;
   name = pbkdf2;
   source = lib/pbkdf2.c;
 };
@@ -1267,6 +1195,8 @@ module = {
   x86 = lib/i386/relocator_asm.S;
   x86 = lib/i386/relocator_backward.S;
   extra_dist = lib/relocator.c;
+  enable = mips;
+  enable = x86;
 };
 
 module = {
@@ -1275,8 +1205,10 @@ module = {
   x86_efi = lib/efi/datetime.c;
   sparc64_ieee1275 = lib/ieee1275/datetime.c;
   powerpc_ieee1275 = lib/ieee1275/datetime.c;
-  x86;
-  mips;
+  enable = x86;
+  enable = mips;
+  enable = sparc64_ieee1275;
+  enable = powerpc_ieee1275;
 };
 
 module = {
@@ -1291,11 +1223,11 @@ module = {
 module = {
   name = aout;
   source = loader/aout.c;
-  i386_pc;
-  i386_qemu;
-  i386_coreboot;
-  i386_multiboot;
-  i386_ieee1275;
+  enable = i386_pc;
+  enable = i386_qemu;
+  enable = i386_coreboot;
+  enable = i386_multiboot;
+  enable = i386_ieee1275;
 };
 
 module = {
@@ -1309,16 +1241,16 @@ module = {
   extra_dist = loader/i386/bsdXX.c;
   extra_dist = loader/i386/bsd_pagetable.c;
 
-  i386_pc;
-  i386_qemu;
-  i386_coreboot;
-  i386_multiboot;
+  enable = i386_pc;
+  enable = i386_qemu;
+  enable = i386_coreboot;
+  enable = i386_multiboot;
 };
 
 module = {
   name = linux16;
   source = loader/i386/pc/linux.c;
-  i386_pc;
+  enable = i386_pc;
 };
 
 module = {
@@ -1327,8 +1259,8 @@ module = {
 
   source = loader/multiboot.c;
   source = loader/multiboot_mbi2.c;
-  x86;
-  mips;
+  enable = x86;
+  enable = mips;
 };
 
 module = {
@@ -1336,7 +1268,7 @@ module = {
   source = loader/multiboot.c;
   source = loader/i386/multiboot_mbi.c;
   extra_dist = loader/multiboot_elfxx.c;
-  x86;
+  enable = x86;
 };
 
 module = {
@@ -1349,6 +1281,7 @@ module = {
   mips = loader/mips/linux.c;
   powerpc_ieee1275 = loader/powerpc/ieee1275/linux.c;
   sparc64_ieee1275 = loader/sparc64/ieee1275/linux.c;
+  enable = nonemu;
 };
 
 module = {
@@ -1368,17 +1301,22 @@ module = {
   i386_pc = loader/xnu.c;
 
   extra_dist = loader/machoXX.c;
+  enable = i386_pc;
+  enable = x86_efi;
 };
 
 module = {
   name = appleldr;
   x86_efi = loader/efi/appleloader.c;
+  enable = x86_efi;
 };
 
 module = {
   name = chain;
   x86_efi = loader/efi/chainloader.c;
   i386_pc = loader/i386/pc/chainloader.c;
+  enable = i386_pc;
+  enable = x86_efi;
 };
 
 module = {
@@ -1412,10 +1350,12 @@ module = {
 
   mips_yeeloong = mmap/mmap.c;
   mips_yeeloong = mmap/mips/yeeloong/uppermem.c;
+
+  enable = x86;
+  enable = mips_yeeloong;
 };
 
 module = {
-  common;
   name = normal;
   source = normal/main.c;
   source = normal/cmdline.c;
@@ -1454,55 +1394,46 @@ module = {
 };
 
 module = {
-  common;
   name = part_acorn;
   source = partmap/acorn.c;
 };
 
 module = {
-  common;
   name = part_amiga;
   source = partmap/amiga.c;
 };
 
 module = {
-  common;
   name = part_apple;
   source = partmap/apple.c;
 };
 
 module = {
-  common;
   name = part_gpt;
   source = partmap/gpt.c;
 };
 
 module = {
-  common;
   name = part_msdos;
   source = partmap/msdos.c;
 };
 
 module = {
-  common;
   name = part_sun;
   source = partmap/sun.c;
 };
 
 module = {
-  common;
   name = part_bsd;
   source = partmap/bsdlabel.c;
 };
 
 module = {
-  common;
   name = part_sunpc;
   source = partmap/sunpc.c;
 };
 
 module = {
-  common;
   name = msdospart;
   source = parttool/msdospart.c;
 };
@@ -1510,26 +1441,25 @@ module = {
 module = {
   name = at_keyboard;
   source = term/at_keyboard.c;
-  x86;
+  enable = x86;
 };
 
 module = {
   name = gfxterm;
   source = term/gfxterm.c;
-  emu;
-  x86;
-  sparc64;
-  powerpc;
+  enable = emu;
+  enable = x86;
+  enable = sparc64;
+  enable = powerpc;
 };
 
 module = {
   name = serial;
   source = term/serial.c;
-  i386;
+  enable = i386;
 };
 
 module = {
-  common;
   name = terminfo;
   source = term/terminfo.c;
   source = term/tparm.c;
@@ -1538,87 +1468,88 @@ module = {
 module = {
   name = usb_keyboard;
   source = term/usb_keyboard.c;
-  i386_pc;
-  mips_yeeloong;
+  enable = i386_pc;
+  enable = mips_yeeloong;
 };
 
 module = {
   name = vga;
   i386_pc = video/i386/pc/vga.c;
+  enable = i386_pc;
 };
 
 module = {
   name = vga_text;
   x86 = term/i386/pc/vga_text.c;
   x86 = term/i386/vga_common.c;
+  enable = x86;
 };
 
 module = {
   name = video_cirrus;
   i386 = video/cirrus.c;
+  enable = i386;
 };
 
 module = {
   name = video_bochs;
   i386 = video/bochs.c;
+  enable = i386;
 };
 
 module = {
   name = functional_test;
   source = tests/lib/functional_test.c;
   source = tests/lib/test.c;
-  common;
 };
 
 module = {
   name = example_functional_test;
   source = tests/example_functional_test.c;
   cflags = -Wno-format;
-  common;
 };
 
 module = {
   name = bitmap;
   source = video/bitmap.c;
-  emu;
-  x86;
-  sparc64;
-  powerpc;
+  enable = emu;
+  enable = x86;
+  enable = sparc64;
+  enable = powerpc;
 };
 
 module = {
   name = bitmap_scale;
   source = video/bitmap_scale.c;
-  emu;
-  x86;
-  sparc64;
-  powerpc;
+  enable = emu;
+  enable = x86;
+  enable = sparc64;
+  enable = powerpc;
 };
 
 module = {
   name = efi_gop;
   x86_efi = video/efi_gop.c;
+  enable = x86_efi;
 };
 
 module = {
   name = efi_uga;
   x86_efi = video/efi_uga.c;
+  enable = x86_efi;
 };
 
 module = {
-  common;
   name = jpeg;
   source = video/readers/jpeg.c;
 };
 
 module = {
-  common;
   name = png;
   source = video/readers/png.c;
 };
 
 module = {
-  common;
   name = tga;
   source = video/readers/tga.c;
 };
@@ -1626,6 +1557,7 @@ module = {
 module = {
   name = vbe;
   i386_pc = video/i386/pc/vbe.c;
+  enable = i386_pc;
 };
 
 module = {
@@ -1634,37 +1566,36 @@ module = {
   source = video/fb/fbblit.c;
   source = video/fb/fbfill.c;
   source = video/fb/fbutil.c;
-  emu;
-  x86;
-  sparc64;
-  powerpc;
+  enable = emu;
+  enable = x86;
+  enable = sparc64;
+  enable = powerpc;
 };
 
 module = {
   name = video;
   source = video/video.c;
-  emu;
-  x86;
-  sparc64;
-  powerpc;
+  enable = emu;
+  enable = x86;
+  enable = sparc64;
+  enable = powerpc;
 };
 
 module = {
   name = ieee1275_fb;
   source = video/ieee1275.c;
-  powerpc;
-  sparc64;
+  enable = powerpc;
+  enable = sparc64;
 };
 
 module = {
   name = sdl;
   source = video/emu/sdl.c;
-  enable = COND_GRUB_EMU_SDL;
-  emu;
+  condition = COND_GRUB_EMU_SDL;
+  enable = emu;
 };
 
 module = {
   name = datehook;
   source = hook/datehook.c;
-  common;
 };
diff --git a/modules.def b/modules.def
index c8ce44cbe..23d7d14cd 100644
--- a/modules.def
+++ b/modules.def
@@ -90,7 +90,6 @@ library = {
   source = grub-core/script/lexer.c;
   source = grub-core/script/main.c;
   source = grub-core/script/script.c;
-  common;
 };
 
 program = {
@@ -99,7 +98,6 @@ program = {
   ldadd = libgrub.a;
   ldadd = '$(LIBINTL)';
   mansection = 1;
-  common;
 };
 
 program = {
@@ -114,7 +112,6 @@ program = {
   ldadd = '$(LIBINTL)';
 
   cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"';
-  common;
 };
 
 program = {
@@ -125,7 +122,6 @@ program = {
 
   ldadd = libgrub.a;
   ldadd = '$(LIBINTL)';
-  common;
 };
 
 program = {
@@ -136,7 +132,6 @@ program = {
 
   ldadd = libgrub.a;
   ldadd = '$(LIBINTL)';
-  common;
 };
 
 program = {
@@ -147,7 +142,6 @@ program = {
 
   ldadd = libgrub.a;
   ldadd = '$(LIBINTL)';
-  common;
 };
 
 program = {
@@ -160,13 +154,13 @@ program = {
   ldadd = '$(LIBINTL)';
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
-  common;
 };
 
 program = {
   name = grub-macho2img;
   mansection = 1;
   source = util/grub-macho2img.c;
+  condition = COND_APPLE_CC;
 };
 
 program = {
@@ -176,8 +170,7 @@ program = {
 
   ldadd = libgrub.a;
   ldadd = '$(LIBINTL)';
-  enable = COND_GRUB_PE2ELF;
-  common;
+  condition = COND_GRUB_PE2ELF;
 };
 
 program = {
@@ -187,8 +180,7 @@ program = {
 
   ldadd = libgrub.a;
   ldadd = '$(LIBINTL)';
-  enable = COND_GRUB_FSTEST;
-  common;
+  condition = COND_GRUB_FSTEST;
 };
 
 program = {
@@ -202,9 +194,7 @@ program = {
   ldadd = libgrub.a;
   ldadd = '$(LIBINTL)';
   ldadd = '$(freetype_libs)';
-
-  common;
-  enable = COND_GRUB_MKFONT;
+  condition = COND_GRUB_MKFONT;
 };
 
 program = {
@@ -223,7 +213,6 @@ program = {
   ldadd = libgrub.a;
   ldadd = '$(LIBINTL)';
   ldadd = '$(LIBUTIL)';
-  common;
 };
 
 program = {
@@ -235,7 +224,6 @@ program = {
   ldadd = libgrub.a;
   ldadd = '$(LIBINTL)';
   ldadd = '$(LIBUTIL)';
-  common;
 };
 
 program = {
@@ -254,6 +242,9 @@ program = {
   ldadd = libgrub.a;
   ldadd = '$(LIBINTL)';
   ldadd = '$(LIBUTIL)';
+
+  enable = i386_pc;
+  enable = sparc64_ieee1275;
 };
 
 program = {
@@ -263,20 +254,18 @@ program = {
   source = util/ieee1275/ofpath.c;
 
   ldadd = libgrub.a;
-  sparc64_ieee1275;
+  enable = sparc64_ieee1275;
 };
 
 data = {
   source = util/grub.d/README;
   installdir = grubconf;
-  common;
 };
 
 script = {
   name = '00_header';
   source = util/grub.d/00_header.in;
   installdir = grubconf;
-  common;
 };
 
 script = {
@@ -295,28 +284,24 @@ script = {
   name = '10_linux';
   source = util/grub.d/10_linux.in;
   installdir = grubconf;
-  common;
 };
 
 script = {
   name = '30_os-prober';
   source = util/grub.d/30_os-prober.in;
   installdir = grubconf;
-  common;
 };
 
 script = {
   name = '40_custom';
   source = util/grub.d/40_custom.in;
   installdir = grubconf;
-  common;
 };
 
 script = {
   name = '41_custom';
   source = util/grub.d/41_custom.in;
   installdir = grubconf;
-  common;
 };
 
 script = {
@@ -324,9 +309,10 @@ script = {
   name = grub-mkrescue;
   source = util/grub-mkrescue.in;
   powerpc_ieee1275 = util/powerpc/ieee1275/grub-mkrescue.in;
-  i386_pc;
-  i386_qemu;
-  i386_coreboot;
+  enable = i386_pc;
+  enable = i386_qemu;
+  enable = i386_coreboot;
+  enable = powerpc_ieee1275;
 };
 
 script = {
@@ -337,10 +323,10 @@ script = {
   x86_efi = util/i386/efi/grub-install.in;
   i386_ieee1275 = util/ieee1275/grub-install.in;
   powerpc_ieee1275 = util/ieee1275/grub-install.in;
-  mips;
-  i386_pc;
-  i386_qemu;
-  i386_coreboot;
+
+  enable = x86;
+  enable = mips;
+  enable = powerpc_ieee1275;
 };
 
 script = {
@@ -348,7 +334,6 @@ script = {
   source = util/grub-mkconfig.in;
   mansection = 8;
   installdir = sbin;
-  common;
 };
 
 script = {
@@ -356,7 +341,6 @@ script = {
   source = util/grub-set-default.in;
   mansection = 8;
   installdir = sbin;
-  common;
 };
 
 script = {
@@ -364,118 +348,104 @@ script = {
   source = util/grub-reboot.in;
   mansection = 8;
   installdir = sbin;
-  common;
 };
 
 script = {
   name = grub-mkconfig_lib;
   source = util/grub-mkconfig_lib.in;
   installdir = pkglib;
-  common;
 };
 
 script = {
   name = update-grub_lib;
   source = util/update-grub_lib.in;
   installdir = pkglib;
-  common;
 };
 
-test_script = {
+script = {
   name = grub-shell;
   source = tests/util/grub-shell.in;
-  common;
 };
 
-test_script = {
+script = {
   name = grub-shell-tester;
   source = tests/util/grub-shell-tester.in;
-  common;
 };
 
-test_script = {
+script = {
+  testcase;
   name = example_scripted_test;
   source = tests/example_scripted_test.in;
-  common;
 };
 
-test_script = {
+script = {
+  testcase;
   name = example_grub_script_test;
   source = tests/example_grub_script_test.in;
-  common;
 };
 
-test_script = {
+script = {
+  testcase;
   name = grub_script_echo1;
   source = tests/grub_script_echo1.in;
-  common;
-  enable;
 };
 
-test_script = {
+script = {
+  testcase;
   name = grub_script_echo_keywords;
   source = tests/grub_script_echo_keywords.in;
-  common;
-  enable;
 };
 
-test_script = {
+script = {
+  testcase;
   name = grub_script_vars1;
   source = tests/grub_script_vars1.in;
-  common;
-  enable;
 };
 
-test_script = {
+script = {
+  testcase;
   name = grub_script_for1;
   source = tests/grub_script_for1.in;
-  common;
-  enable;
 };
 
-test_script = {
+script = {
+  testcase;
   name = grub_script_while1;
   source = tests/grub_script_while1.in;
-  common;
-  enable;
 };
 
-test_script = {
+script = {
+  testcase;
   name = grub_script_if;
   source = tests/grub_script_if.in;
-  common;
-  enable;
 };
 
-test_script = {
+script = {
+  testcase;
   name = grub_script_blanklines;
   source = tests/grub_script_blanklines.in;
-  common;
-  enable;
 };
 
-test_script = {
+script = {
+  testcase;
   name = grub_script_final_semicolon;
   source = tests/grub_script_final_semicolon.in;
-  common;
-  enable;
 };
 
-test_script = {
+script = {
+  testcase;
   name = grub_script_dollar;
   source = tests/grub_script_dollar.in;
-  common;
-  enable;
 };
 
-test_script = {
+script = {
+  testcase;
   name = grub_script_comments;
   source = tests/grub_script_comments.in;
-  common;
-  enable;
 };
 
-test_program = {
+program = {
+  testcase;
   name = example_unit_test;
   source = tests/example_unit_test.c;
   source = tests/lib/unit_test.c;
@@ -484,5 +454,4 @@ test_program = {
   source = grub-core/tests/lib/test.c;
   cflags = -Wno-format;
   ldadd = libgrub.a;
-  common;
 };

From c1c6e4c0176baf20a4dc60296a1ac781bb93ab8b Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 13 Jul 2010 23:58:30 +0530
Subject: [PATCH 1231/1628] emu platform fixes

---
 gentpl.py             | 2 +-
 grub-core/modules.def | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gentpl.py b/gentpl.py
index 5081cf483..a85dd3ed9 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -254,7 +254,7 @@ def kernel(platform):
     r += gvar_add("platform_DATA", "[+ name +].img")
     r += gvar_add("CLEANFILES", "[+ name +].img")
     r += rule("[+ name +].img", "[+ name +].exec$(EXEEXT)",
-              if_platform_tagged(platform, "nostrip", lambda: "cp $@ $<",
+              if_platform_tagged(platform, "nostrip", lambda: "cp $< $@",
                                  lambda: "$(STRIP) $(" + cname() + "_STRIPFLAGS) -o $@ $<"))
     return r
 
diff --git a/grub-core/modules.def b/grub-core/modules.def
index b63c70922..b2d57a6fd 100644
--- a/grub-core/modules.def
+++ b/grub-core/modules.def
@@ -3,6 +3,8 @@ AutoGen definitions Makefile.tpl;
 kernel = {
   name = kernel;
 
+  nostrip = emu;
+
   emu_ldflags              = '-Wl,-r,-d';
   x86_efi_ldflags          = '-Wl,-r,-d';
   x86_efi_stripflags       = '--strip-unneeded -K start -R .note -R .comment';
@@ -1218,6 +1220,7 @@ module = {
   mips = lib/mips/setjmp.S;
   sparc64 = lib/sparc64/setjmp.S;
   powerpc = lib/powerpc/setjmp.S;
+  emu = 'lib/$(target_cpu)/setjmp.S';
 };
 
 module = {

From 8d9a5b15e3b0f83ed26a6131a8f099a6a7dcf5ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Wed, 14 Jul 2010 11:26:17 +0200
Subject: [PATCH 1232/1628] Discard improperly nested partitions.

---
 ChangeLog                | 13 ++++++++++
 include/grub/partition.h |  4 +--
 kern/partition.c         | 56 +++++++++++++++++++++++++++++++++-------
 partmap/bsdlabel.c       | 40 +++++++++++++++++++++++-----
 4 files changed, 95 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e894a479c..8511fa2cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-14  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* kern/partition.c (grub_partition_check_containment): New function to
+	check that a partition is physically contained in a parent.  Since
+	offsets are relative (and non-negative), this reduces to checking that
+	the partition ends before its parent.
+	(grub_partition_map_probe): Discard out-of-range sub-partitions.
+	(grub_partition_iterate): Likewise.
+	* include/grub/partition.h (grub_partition_map): Slightly more detailed
+	comments.
+	* partmap/bsdlabel.c (bsdlabel_partition_map_iterate): Discard
+	partitions that start before their parent, and add debug printfs.
+
 2010-07-13  Colin Watson  <cjwatson@ubuntu.com>
 
 	* Makefile.in (.SUFFIX): Spell correctly, as ...
diff --git a/include/grub/partition.h b/include/grub/partition.h
index a23e94e07..20705c527 100644
--- a/include/grub/partition.h
+++ b/include/grub/partition.h
@@ -48,7 +48,7 @@ struct grub_partition
   /* The partition number.  */
   int number;
 
-  /* The start sector.  */
+  /* The start sector (relative to parent).  */
   grub_disk_addr_t start;
 
   /* The length in sector units.  */
@@ -60,7 +60,7 @@ struct grub_partition
   /* The index of this partition in the partition table.  */
   int index;
 
-  /* Parent partition map.  */
+  /* Parent partition (physically contains this partition).  */
   struct grub_partition *parent;
 
   /* The type partition map.  */
diff --git a/kern/partition.c b/kern/partition.c
index 2a33ac329..a1e37f675 100644
--- a/kern/partition.c
+++ b/kern/partition.c
@@ -23,6 +23,37 @@
 
 grub_partition_map_t grub_partition_map_list;
 
+/*
+ * Checks that disk->partition contains part.  This function assumes that the
+ * start of part is relative to the start of disk->partition.  Returns 1 if
+ * disk->partition is null.
+ */
+static int
+grub_partition_check_containment (const grub_disk_t disk,
+				  const grub_partition_t part)
+{
+  if (disk->partition == NULL)
+    return 1;
+
+  if (part->start + part->len > disk->partition->len)
+    {
+      char *partname;
+
+      partname = grub_partition_get_name (disk->partition);
+      grub_dprintf ("partition", "sub-partition %s%d of (%s,%s) ends after parent.\n",
+		    part->partmap->name, part->number + 1, disk->name, partname);
+#ifdef GRUB_UTIL
+      grub_util_warn ("Discarding improperly nested partition (%s,%s,%s%d)",
+		      disk->name, partname, part->partmap->name, part->number + 1);
+#endif
+      grub_free (partname);
+
+      return 0;
+    }
+
+  return 1;
+}
+
 static grub_partition_t
 grub_partition_map_probe (const grub_partition_map_t partmap,
 			  grub_disk_t disk, int partnum)
@@ -31,20 +62,21 @@ grub_partition_map_probe (const grub_partition_map_t partmap,
 
   auto int find_func (grub_disk_t d, const grub_partition_t partition);
 
-  int find_func (grub_disk_t d __attribute__ ((unused)),
+  int find_func (grub_disk_t dsk,
 		 const grub_partition_t partition)
     {
-      if (partnum == partition->number)
-	{
-	  p = (grub_partition_t) grub_malloc (sizeof (*p));
-	  if (! p)
-	    return 1;
+      if (partnum != partition->number)
+	return 0;
 
-	  grub_memcpy (p, partition, sizeof (*p));
-	  return 1;
-	}
+      if (!(grub_partition_check_containment (dsk, partition)))
+	return 0;
 
-      return 0;
+      p = (grub_partition_t) grub_malloc (sizeof (*p));
+      if (! p)
+	return 1;
+
+      grub_memcpy (p, partition, sizeof (*p));
+      return 1;
     }
 
   partmap->iterate (disk, find_func);
@@ -138,6 +170,10 @@ grub_partition_iterate (struct grub_disk *disk,
 		    const grub_partition_t partition)
     {
       struct grub_partition p = *partition;
+
+      if (!(grub_partition_check_containment (dsk, partition)))
+	return 0;
+
       p.parent = dsk->partition;
       dsk->partition = 0;
       if (hook (dsk, &p))
diff --git a/partmap/bsdlabel.c b/partmap/bsdlabel.c
index d28f36d07..d38a0eaf3 100644
--- a/partmap/bsdlabel.c
+++ b/partmap/bsdlabel.c
@@ -54,7 +54,7 @@ bsdlabel_partition_map_iterate (grub_disk_t disk,
 
   for (p.number = 0;
        p.number < grub_cpu_to_le16 (label.num_partitions);
-       p.number++)
+       p.number++, pos += sizeof (struct grub_partition_bsd_entry))
     {
       struct grub_partition_bsd_entry be;
 
@@ -64,15 +64,43 @@ bsdlabel_partition_map_iterate (grub_disk_t disk,
       if (grub_disk_read (disk, p.offset, p.index, sizeof (be),  &be))
 	return grub_errno;
 
-      p.start = grub_le_to_cpu32 (be.offset) - delta;
+      p.start = grub_le_to_cpu32 (be.offset);
       p.len = grub_le_to_cpu32 (be.size);
       p.partmap = &grub_bsdlabel_partition_map;
 
-      if (be.fs_type != GRUB_PC_PARTITION_BSD_TYPE_UNUSED)
-	if (hook (disk, &p))
-	  return grub_errno;
+      grub_dprintf ("partition",
+		    "partition %d: type 0x%x, start 0x%llx, len 0x%llx\n",
+		    p.number, be.fs_type,
+		    (unsigned long long) p.start,
+		    (unsigned long long) p.len);
 
-      pos += sizeof (struct grub_partition_bsd_entry);
+      if (be.fs_type == GRUB_PC_PARTITION_BSD_TYPE_UNUSED)
+	continue;
+
+      if (p.start < delta)
+	{
+#ifdef GRUB_UTIL
+	  char *partname;
+#endif
+	  grub_dprintf ("partition",
+			"partition %d: invalid start (found 0x%llx, wanted >= 0x%llx)\n",
+			p.number,
+			(unsigned long long) p.start,
+			(unsigned long long) delta);
+#ifdef GRUB_UTIL
+	  /* disk->partition != NULL as 0 < delta */
+	  partname = grub_partition_get_name (disk->partition);
+	  grub_util_warn ("Discarding improperly nested partition (%s,%s,%s%d)",
+			  disk->name, partname, p.partmap->name, p.number + 1);
+	  grub_free (partname);
+#endif
+	  continue;
+	}
+
+      p.start -= delta;
+
+      if (hook (disk, &p))
+	return grub_errno;
     }
 
   return GRUB_ERR_NONE;

From 18075f6254cd47235acb173dd079a0e8a54451f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Sutre?= <gregoire.sutre@gmail.com>
Date: Wed, 14 Jul 2010 16:47:28 +0200
Subject: [PATCH 1233/1628] Fix condition in Makefile.in's LINGUAS assignment.

---
 ChangeLog   | 4 ++++
 Makefile.in | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8511fa2cf..99a177f66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-14  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* Makefile.in: Use the substituted @USE_NLS@ instead of ENABLE_NLS.
+
 2010-07-14  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* kern/partition.c (grub_partition_check_containment): New function to
diff --git a/Makefile.in b/Makefile.in
index 3dc7e6f19..39061be4d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,7 +53,7 @@ XGETTEXT = @XGETTEXT@
 MSGMERGE = @MSGMERGE@
 MSGFMT = @MSGFMT@
 
-ifdef ENABLE_NLS
+ifeq (@USE_NLS@,yes)
 LINGUAS = $(shell for i in $(srcdir)/po/*.po ; do \
 			if test -e $$i ; then echo $$i ; fi ; \
 		done | sed -e "s,.*/po/\(.*\)\.po$$,\1,")

From 99be513c3ba7ec9247ff29a8c2031fc8dbbaebfb Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Wed, 14 Jul 2010 16:47:45 +0100
Subject: [PATCH 1234/1628] * loader/powerpc/ieee1275/linux.c (grub_cmd_linux):
 Do not reject ET_DYN files.

---
 ChangeLog                       | 5 +++++
 loader/powerpc/ieee1275/linux.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 99a177f66..835293aec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-14  Anton Blanchard  <anton@samba.org>
+
+	* loader/powerpc/ieee1275/linux.c (grub_cmd_linux): Do not reject
+	ET_DYN files.
+
 2010-07-14  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* Makefile.in: Use the substituted @USE_NLS@ instead of ENABLE_NLS.
diff --git a/loader/powerpc/ieee1275/linux.c b/loader/powerpc/ieee1275/linux.c
index 930c0cb41..6b17a47ad 100644
--- a/loader/powerpc/ieee1275/linux.c
+++ b/loader/powerpc/ieee1275/linux.c
@@ -220,7 +220,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
   if (! elf)
     goto out;
 
-  if (elf->ehdr.ehdr32.e_type != ET_EXEC)
+  if (elf->ehdr.ehdr32.e_type != ET_EXEC && elf->ehdr.ehdr32.e_type != ET_DYN)
     {
       grub_error (GRUB_ERR_UNKNOWN_OS,
 		  "this ELF file is not of the right type");

From d9b78bce4a1c8d9334712890fc44008197cd4b92 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 15 Jul 2010 02:02:01 +0530
Subject: [PATCH 1235/1628] more build fixes

---
 .bzrignore            |  2 +
 autogen.sh            |  3 ++
 gentpl.py             | 98 ++++++++++++++++++++++++++++---------------
 grub-core/modules.def | 22 +++++-----
 4 files changed, 81 insertions(+), 44 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index a1835ce07..ac5e3f86d 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -105,6 +105,8 @@ grub-core/configure.common
 grub-core/depcomp
 grub-core/gentpl.py
 grub-core/conf/gcry.rmk
+grub-core/docs
+grub-core/docs/man
 grub-core/lib/libgcrypt-grub
 grub-core/include/grub/cpu
 grub-core/include/grub/machine
diff --git a/autogen.sh b/autogen.sh
index e41caa5f2..49cd1fca5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -20,6 +20,9 @@ ln -svf ../config.rpath grub-core/
 ln -svf ../gentpl.py grub-core/
 ln -svf ../configure.common grub-core/
 
+mkdir -vp grub-core/docs/man
+ln -svf ../../../docs/man/grub-emu.h2m grub-core/docs/man
+
 echo "Creating Makefile.tpl..."
 python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl
 echo "Running autogen..."
diff --git a/gentpl.py b/gentpl.py
index a85dd3ed9..baaae51bc 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -83,38 +83,53 @@ def rule(target, source, cmd):
     else:
         return "\n" + target + ": " + source + "\n\t" + cmd.replace("\n", "\n\t") + "\n"
 
-def if_platform_tagged(platform, tag, closure, c2=None):
+#
+# Template for keys with platform names as values, for example:
+#
+# kernel = {
+#   nostrip = emu;
+#   nostrip = i386_pc;
+# }
+#
+def if_platform_tagged(platform, tag, snippet_if, snippet_else=None):
     r = ""
     r += "[+ IF " + tag + " defined +]"
     r += "[+ FOR " + tag + " +][+ CASE " + tag + " +]"
     for group in RMAP[platform]:
-        r += "[+ = \"" + group + "\" +]" + closure()
+        r += "[+ = \"" + group + "\" +]" + snippet_if
+
+    if snippet_else != None: r += "[+ * +]" + snippet_if
     r += "[+ ESAC +][+ ENDFOR +]"
 
-    if c2 == None:
+    if snippet_else == None:
         r += "[+ ENDIF +]"
         return r
 
-    r += "[+ ELSE +]" + c2() + "[+ ENDIF +]"
+    r += "[+ ELSE +]" + snippet_else + "[+ ENDIF +]"
     return r
 
-def platform_values(platform, group_tag, default_tag):
+#
+# Template for handling platform specific values, for example:
+#
+# module = {
+#   cflags = '-Wall';
+#   emu_cflags = '-Wall -DGRUB_EMU=1';
+# }
+#
+def foreach_platform_value(platform, tag, suffix, closure):
     r = ""
     for group in RMAP[platform]:
-        gtag = group + group_tag
+        gtag = group + suffix
 
         if group == RMAP[platform][0]:
             r += "[+ IF " + gtag + " +]"
         else:
             r += "[+ ELIF " + gtag + " +]"
 
-        r += "[+ FOR " + gtag + " +][+ ." + gtag + " +] [+ ENDFOR +]"
-    r += "[+ ELSE +][+ FOR " + default_tag + " +][+ ." + default_tag + " +] [+ ENDFOR +][+ ENDIF +]"
+        r += "[+ FOR " + gtag + " +]" + closure("[+ ." + gtag + " +]") + "[+ ENDFOR +]"
+    r += "[+ ELSE +][+ FOR " + tag + " +]" + closure("[+ ." + tag + " +]") + "[+ ENDFOR +][+ ENDIF +]"
     return r
 
-def under_conditional(x):
-    return "[+ IF condition +]\nif [+ condition +]\n[+ ENDIF +]" + x + "[+ IF condition +]\nendif\n[+ ENDIF +]"
-
 def each_platform(closure):
     r = "[+ IF - enable undefined +]"
     for platform in GRUB_PLATFORMS:
@@ -122,24 +137,33 @@ def each_platform(closure):
     r += "[+ ELSE +]"
     for platform in GRUB_PLATFORMS:
         x = "\nif COND_" + platform + "\n" + closure(platform) + "endif\n"
-        r += if_platform_tagged(platform, "enable", lambda: x)
+        r += if_platform_tagged(platform, "enable", x)
     r += "[+ ENDIF +]"
-    return r;
+    return r
+
+def under_platform_specific_conditionals(platform, snippet):
+    r  = foreach_platform_value(platform, "condition", "_condition", lambda cond: "if " + cond + "\n")
+    r += snippet
+    r += foreach_platform_value(platform, "condition", "_condition", lambda cond: "endif " + cond + "\n")
+    return r
+
+def platform_specific_values(platform, tag, suffix):
+    return foreach_platform_value(platform, tag, suffix, lambda value: value + " ")
 
 def shared_sources(): return "[+ FOR shared +][+ .shared +] [+ ENDFOR +]"
 def shared_nodist_sources(): return "[+ FOR nodist_shared +] [+ .nodist_shared +][+ ENDFOR +]"
 
-def platform_sources(p): return platform_values(p, "", "source")
-def platform_nodist_sources(p): return platform_values(p, "_nodist", "nodist")
-def platform_extra_dist(p): return platform_values(p, "_extra_dist", "extra_dist")
+def platform_sources(p): return platform_specific_values(p, "source", "")
+def platform_nodist_sources(p): return platform_specific_values(p, "nodist", "_nodist")
+def platform_extra_dist(p): return platform_specific_values(p, "extra_dist", "_extra_dist")
 
-def platform_ldadd(p): return platform_values(p, "_ldadd", "ldadd")
-def platform_cflags(p): return platform_values(p, "_cflags", "cflags")
-def platform_ldflags(p): return platform_values(p, "_ldflags", "ldflags")
-def platform_cppflags(p): return platform_values(p, "_cppflags", "cppflags")
-def platform_ccasflags(p): return platform_values(p, "_ccasflags", "ccasflags")
-def platform_stripflags(p): return platform_values(p, "_stripflags", "stripflags")
-def platform_objcopyflags(p): return platform_values(p, "_objcopyflags", "objcopyflags")
+def platform_ldadd(p): return platform_specific_values(p, "ldadd", "_ldadd")
+def platform_cflags(p): return platform_specific_values(p, "cflags", "_cflags")
+def platform_ldflags(p): return platform_specific_values(p, "ldflags", "_ldflags")
+def platform_cppflags(p): return platform_specific_values(p, "cppflags", "_cppflags")
+def platform_ccasflags(p): return platform_specific_values(p, "ccasflags", "_ccasflags")
+def platform_stripflags(p): return platform_specific_values(p, "stripflags", "_stripflags")
+def platform_objcopyflags(p): return platform_specific_values(p, "objcopyflags", "_objcopyflags")
 
 def module(platform):
     r = set_canonical_name_suffix(".module")
@@ -254,8 +278,8 @@ def kernel(platform):
     r += gvar_add("platform_DATA", "[+ name +].img")
     r += gvar_add("CLEANFILES", "[+ name +].img")
     r += rule("[+ name +].img", "[+ name +].exec$(EXEEXT)",
-              if_platform_tagged(platform, "nostrip", lambda: "cp $< $@",
-                                 lambda: "$(STRIP) $(" + cname() + "_STRIPFLAGS) -o $@ $<"))
+              if_platform_tagged(platform, "nostrip", "cp $< $@",
+                                 "$(STRIP) $(" + cname() + "_STRIPFLAGS) -o $@ $<"))
     return r
 
 def image(platform):
@@ -270,6 +294,7 @@ def image(platform):
     r += var_set(cname() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_IMAGE) " + platform_ldflags(platform))
     r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_IMAGE) " + platform_cppflags(platform))
     r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_IMAGE) " + platform_ccasflags(platform))
+    r += var_set(cname() + "_OBJCOPYFLAGS", "$(OBJCOPYFLAGS_IMAGE) " + platform_objcopyflags(platform))
 
     r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
     r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
@@ -281,7 +306,7 @@ def image(platform):
 if test x$(USE_APPLE_CC_FIXES) = xyes; then \
   $(MACHO2IMG) $< $@; \
 else \
-  $(OBJCOPY) """ + platform_objcopyflags(platform) + """ --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< $@; \
+  $(OBJCOPY) $(""" + cname() + """_OBJCOPYFLAGS) --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< $@; \
 fi
 """)
     return r
@@ -370,25 +395,32 @@ chmod a+x [+ name +]
     return r
 
 def module_rules():
-    return "[+ FOR module +]" + under_conditional(each_platform(lambda p: module(p))) + "[+ ENDFOR +]"
+    return "[+ FOR module +]" + each_platform(
+        lambda p: under_platform_specific_conditionals(p, module(p))) + "[+ ENDFOR +]"
 
 def kernel_rules():
-    return "[+ FOR kernel +]" + under_conditional(each_platform(lambda p: kernel(p))) + "[+ ENDFOR +]"
+    return "[+ FOR kernel +]" + each_platform(
+        lambda p: under_platform_specific_conditionals(p, kernel(p))) + "[+ ENDFOR +]"
 
 def image_rules():
-    return "[+ FOR image +]" + under_conditional(each_platform(lambda p: image(p))) + "[+ ENDFOR +]"
+    return "[+ FOR image +]" + each_platform(
+        lambda p: under_platform_specific_conditionals(p, image(p))) + "[+ ENDFOR +]"
 
 def library_rules():
-    return "[+ FOR library +]" + under_conditional(each_platform(lambda p: library(p))) + "[+ ENDFOR +]"
+    return "[+ FOR library +]" + each_platform(
+        lambda p: under_platform_specific_conditionals(p, library(p))) + "[+ ENDFOR +]"
 
 def program_rules():
-    return "[+ FOR program +]" + under_conditional(each_platform(lambda p: program(p))) + "[+ ENDFOR +]"
+    return "[+ FOR program +]" + each_platform(
+        lambda p: under_platform_specific_conditionals(p, program(p))) + "[+ ENDFOR +]"
 
 def script_rules():
-    return "[+ FOR script +]" + under_conditional(each_platform(lambda p: script(p))) + "[+ ENDFOR +]"
+    return "[+ FOR script +]" + each_platform(
+        lambda p: under_platform_specific_conditionals(p, script(p))) + "[+ ENDFOR +]"
 
 def data_rules():
-    return "[+ FOR data +]" + under_conditional(each_platform(lambda p: data(p))) + "[+ ENDFOR +]"
+    return "[+ FOR data +]" + each_platform(
+        lambda p: under_platform_specific_conditionals(p, data(p))) + "[+ ENDFOR +]"
 
 print "[+ AutoGen5 template +]\n"
 a = module_rules()
diff --git a/grub-core/modules.def b/grub-core/modules.def
index b2d57a6fd..4e4db8d36 100644
--- a/grub-core/modules.def
+++ b/grub-core/modules.def
@@ -141,6 +141,8 @@ kernel = {
   i386_ieee1275 = kern/ieee1275/ieee1275.c;
   i386_ieee1275 = term/ieee1275/ofconsole.c;
   i386_ieee1275 = disk/ieee1275/ofdisk.c;
+  i386_ieee1275 = term/terminfo.c;
+  i386_ieee1275 = term/tparm.c;
 
   x86_64_efi = kern/x86_64/efi/startup.S;
   x86_64_efi = kern/x86_64/efi/callwrap.S;
@@ -366,14 +368,6 @@ module = {
   enable = mips_yeeloong;
 };
 
-module = {
-  name = pci;
-  source = bus/emu/pci.c;
-  source = commands/lspci.c;
-  enable = emu;
-  condition = COND_GRUB_EMU_PCI;
-};
-
 module = {
   name = usb;
   source = bus/usb/usb.c;
@@ -393,23 +387,29 @@ module = {
 module = {
   name = uhci;
   source = bus/usb/uhci.c;
-  enable = x86;
+  enable = i386_pc;
 };
 
 module = {
   name = ohci;
   source = bus/usb/ohci.c;
-  enable = x86;
+  enable = i386_pc;
   enable = mips_yeeloong;
 };
 
 module = {
   name = pci;
   source = bus/pci.c;
+  emu = bus/emu/pci.c;
+  emu = commands/lspci.c;
+
+  enable = emu;
   enable = i386_pc;
-  enable = i386_efi;
+  enable = x86_efi;
   enable = i386_ieee1275;
   enable = i386_coreboot;
+
+  emu_condition = COND_GRUB_EMU_PCI;
 };
 
 library = {

From f6023b613f46ae5bd884a656d3d9b054244a72b3 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 17 Jul 2010 01:32:36 +0530
Subject: [PATCH 1236/1628] comments

---
 gentpl.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gentpl.py b/gentpl.py
index baaae51bc..d584a0b7d 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -88,7 +88,7 @@ def rule(target, source, cmd):
 #
 # kernel = {
 #   nostrip = emu;
-#   nostrip = i386_pc;
+#   ...
 # }
 #
 def if_platform_tagged(platform, tag, snippet_if, snippet_else=None):
@@ -114,6 +114,7 @@ def if_platform_tagged(platform, tag, snippet_if, snippet_else=None):
 # module = {
 #   cflags = '-Wall';
 #   emu_cflags = '-Wall -DGRUB_EMU=1';
+#   ...
 # }
 #
 def foreach_platform_value(platform, tag, suffix, closure):

From 9c17c6411aa36e72c0d5f28f651eab0297309052 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 17 Jul 2010 00:56:38 +0200
Subject: [PATCH 1237/1628] Fix mismerge

---
 disk/usbms.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/disk/usbms.c b/disk/usbms.c
index 654e40c36..0a781ccec 100644
--- a/disk/usbms.c
+++ b/disk/usbms.c
@@ -292,11 +292,15 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
           goto CheckCSW;
         }
       /* Debug print of received data. */
-      grub_dprintf ("usb", "First 16 bytes of received data:\n %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
-  	buf[ 0], buf[ 1], buf[ 2], buf[ 3],
-  	buf[ 4], buf[ 5], buf[ 6], buf[ 7],
-  	buf[ 8], buf[ 9], buf[10], buf[11],
-  	buf[12], buf[13], buf[14], buf[15]);
+      grub_dprintf ("usb", "buf:\n");
+      if (size <= 64)
+	{
+	  unsigned i;
+	  for (i = 0; i < size; i++)
+	    grub_dprintf ("usb", "0x%02x: 0x%02x\n", i, buf[i]);
+	}
+      else
+          grub_dprintf ("usb", "Too much data for debug print...\n");
     }
   else if (size)
     {
@@ -313,6 +317,15 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
 	    grub_usb_clear_halt (dev->dev, dev->out->endp_addr);
           goto CheckCSW;
         }
+      /* Debug print of sent data. */
+      if (size <= 256)
+	{
+	  unsigned i;
+	  for (i=0; i<size; i++)
+	    grub_dprintf ("usb", "0x%02x: 0x%02x\n", i, buf[i]);
+	}
+      else
+          grub_dprintf ("usb", "Too much data for debug print...\n");
     }
 
   /* Read the status - (maybe) according to specification.  */

From 36f84f1a7c476b8c484ef27be474b106c231799d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 17 Jul 2010 00:57:14 +0200
Subject: [PATCH 1238/1628] Use inline functions instead of macros

---
 bus/usb/ohci.c | 93 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 57 insertions(+), 36 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 36bb5dd44..57ca24065 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -155,23 +155,44 @@ typedef enum
 
 #define GRUB_OHCI_ED_ADDR_MASK 0x7ff
 
-#define GRUB_OHCI_ED_PHYS2VIRT(o, bulk, x) ( !(x) ? NULL : ( \
-  (bulk) ? \
-  (grub_ohci_ed_t)((x) - (o)->ed_bulk_addr + (grub_uint32_t)(o)->ed_bulk) \
-  : \
-  (grub_ohci_ed_t)((x) - (o)->ed_ctrl_addr + (grub_uint32_t)(o)->ed_ctrl) ) )
-  
-#define GRUB_OHCI_ED_VIRT2PHYS(o, bulk, x) ( !(x) ? 0 : ( \
-  (bulk) ? \
-  ((grub_uint32_t)(x) - (grub_uint32_t)(o)->ed_bulk + (o)->ed_bulk_addr) \
-  : \
-  ((grub_uint32_t)(x) - (grub_uint32_t)(o)->ed_ctrl + (o)->ed_ctrl_addr) ) )
+static inline grub_ohci_ed_t
+grub_ohci_ed_phys2virt (struct grub_ohci *o, int bulk, grub_uint32_t x)
+{
+  if (!x)
+    return NULL;
+  if (bulk)
+    return (grub_ohci_ed_t) (x - o->ed_bulk_addr
+			     + (grub_uint8_t *) o->ed_bulk);
+  return (grub_ohci_ed_t) (x - o->ed_ctrl_addr
+			   + (grub_uint8_t *) o->ed_ctrl);
+}
 
-#define GRUB_OHCI_TD_PHYS2VIRT(o, x) ( !(x) ? NULL : \
-  (grub_ohci_td_t)((x) - (o)->td_addr + (grub_uint32_t)(o)->td) )
+static grub_uint32_t
+grub_ohci_virt_to_phys (struct grub_ohci *o, int bulk, grub_ohci_ed_t x)
+{
+  if (!x)
+    return 0;
 
-#define GRUB_OHCI_TD_VIRT2PHYS(o, x) ( !(x) ? 0 : \
-  ((grub_uint32_t)(x) - (grub_uint32_t)(o)->td + (o)->td_addr) )
+  if (bulk)
+    return (grub_uint8_t *) x - (grub_uint8_t *) o->ed_bulk + o->ed_bulk_addr;
+  return (grub_uint8_t *) x - (grub_uint8_t *) o->ed_ctrl + o->ed_ctrl_addr;
+}
+
+static inline grub_ohci_td_t
+grub_ohci_td_phys2virt (struct grub_ohci *o, grub_uint32_t x)
+{
+  if (!x)
+    return NULL;
+  return (grub_ohci_td_t) (x - o->td_addr + (grub_uint8_t *) o->td);
+}
+
+static grub_uint32_t
+grub_ohci_td_virt2phys (struct grub_ohci *o,  grub_ohci_td_t x)
+{
+  if (!x)
+    return 0;
+  return (grub_uint8_t *)x - (grub_uint8_t *)o->td + o->td_addr;
+}
 
   
 static grub_uint32_t
@@ -479,14 +500,14 @@ grub_ohci_find_ed (struct grub_ohci *o, int bulk, grub_uint32_t target)
     {    
       count = GRUB_OHCI_BULK_EDS;
       ed = o->ed_bulk;
-      ed_next = GRUB_OHCI_ED_PHYS2VIRT(o, bulk,
+      ed_next = grub_ohci_ed_phys2virt(o, bulk,
                   grub_le_to_cpu32 (ed->next_ed) );
     }
   else
     {
       count = GRUB_OHCI_CTRL_EDS;
       ed = o->ed_ctrl;
-      ed_next = GRUB_OHCI_ED_PHYS2VIRT(o, bulk,
+      ed_next = grub_ohci_ed_phys2virt(o, bulk,
                   grub_le_to_cpu32 (ed->next_ed) );
     }
 
@@ -500,7 +521,7 @@ grub_ohci_find_ed (struct grub_ohci *o, int bulk, grub_uint32_t target)
       if (ed_next && (i < count))
         {
           ed = ed_next;
-          ed_next = GRUB_OHCI_ED_PHYS2VIRT(o, bulk,
+          ed_next = grub_ohci_ed_phys2virt(o, bulk,
                       grub_le_to_cpu32 (ed->next_ed) );
           continue;
         }
@@ -516,7 +537,7 @@ grub_ohci_find_ed (struct grub_ohci *o, int bulk, grub_uint32_t target)
    * of unplugged devices. */
   /* We can link new ED to previous ED safely as the new ED should
    * still have set skip bit. */
-  ed->next_ed = grub_cpu_to_le32 ( GRUB_OHCI_ED_VIRT2PHYS (o,
+  ed->next_ed = grub_cpu_to_le32 ( grub_ohci_virt_to_phys (o,
                                      bulk, &ed[1]));
   return &ed[1];
 }
@@ -553,7 +574,7 @@ grub_ohci_free_tds (struct grub_ohci *o, grub_ohci_td_t td)
   /* Unchain first TD from previous TD if it is chained */
   if (td->prev_td_phys)
     {
-      grub_ohci_td_t td_prev_virt = GRUB_OHCI_TD_PHYS2VIRT(o,
+      grub_ohci_td_t td_prev_virt = grub_ohci_td_phys2virt(o,
                                       td->prev_td_phys);
 
       if (td == (grub_ohci_td_t) td_prev_virt->link_td)
@@ -714,12 +735,12 @@ grub_ohci_transfer (grub_usb_controller_t dev,
         return GRUB_USB_ERR_INTERNAL; /* We don't need de-allocate ED */
       /* We can set td_head only when ED is not active, i.e.
        * when it is newly allocated. */
-      ed_virt->td_head = grub_cpu_to_le32 ( GRUB_OHCI_TD_VIRT2PHYS (o,
+      ed_virt->td_head = grub_cpu_to_le32 ( grub_ohci_td_virt2phys (o,
                                               td_head_virt) );
       ed_virt->td_tail = ed_virt->td_head;
     }
   else
-    td_head_virt = GRUB_OHCI_TD_PHYS2VIRT ( o, td_head_phys );
+    td_head_virt = grub_ohci_td_phys2virt ( o, td_head_phys );
     
   /* Set TDs */
   td_last_phys = td_head_phys; /* initial value to make compiler happy... */
@@ -739,7 +760,7 @@ grub_ohci_transfer (grub_usb_controller_t dev,
         td_current_virt->token |= grub_cpu_to_le32 ( 7 << 21);
       
       /* Remember last used (processed) TD phys. addr. */
-      td_last_phys = GRUB_OHCI_TD_VIRT2PHYS (o, td_current_virt);
+      td_last_phys = grub_ohci_td_virt2phys (o, td_current_virt);
       
       /* Allocate next TD */
       td_next_virt = grub_ohci_alloc_td (o);
@@ -747,7 +768,7 @@ grub_ohci_transfer (grub_usb_controller_t dev,
         {
           if (i) /* if i==0 we have nothing to free... */
             grub_ohci_free_tds (o,
-              GRUB_OHCI_TD_PHYS2VIRT(o,
+              grub_ohci_td_phys2virt(o,
                 grub_le_to_cpu32 (td_head_virt->next_td) ) );
           /* Reset head TD */
           grub_memset ( (void*)td_head_virt, 0,
@@ -759,9 +780,9 @@ grub_ohci_transfer (grub_usb_controller_t dev,
       /* Chain TDs */
       td_current_virt->link_td = (grub_uint32_t) td_next_virt;
       td_current_virt->next_td = grub_cpu_to_le32 (
-                                   GRUB_OHCI_TD_VIRT2PHYS (o,
+                                   grub_ohci_td_virt2phys (o,
                                      td_next_virt) );
-      td_next_virt->prev_td_phys = GRUB_OHCI_TD_VIRT2PHYS (o,
+      td_next_virt->prev_td_phys = grub_ohci_td_virt2phys (o,
                                 td_current_virt);
       td_current_virt = td_next_virt;
     }
@@ -777,8 +798,8 @@ grub_ohci_transfer (grub_usb_controller_t dev,
    * setup sequence and we must handle it. */
   ed_virt->target = grub_cpu_to_le32 (target | (1 << 14));
   /* Set td_tail */
-  ed_virt->td_tail = grub_cpu_to_le32 ( GRUB_OHCI_TD_VIRT2PHYS (o,
-                                          td_current_virt) );
+  ed_virt->td_tail
+    = grub_cpu_to_le32 (grub_ohci_td_virt2phys (o, td_current_virt));
   /* Now reset skip bit */
   ed_virt->target = grub_cpu_to_le32 (target);
   /* ed_virt->td_head = grub_cpu_to_le32 (td_head); Must not be changed, it is maintained by OHCI */
@@ -959,7 +980,7 @@ grub_ohci_transfer (grub_usb_controller_t dev,
           /* I hope we can do it as transfer (most probably) finished OK */
         }
       /* Prepare pointer to last processed TD */
-      tderr_virt = GRUB_OHCI_TD_PHYS2VIRT (o, tderr_phys);
+      tderr_virt = grub_ohci_td_phys2virt (o, tderr_phys);
       /* Set index of last processed TD */
       if (tderr_virt)
         transfer->last_trans = tderr_virt->tr_index;
@@ -973,12 +994,12 @@ grub_ohci_transfer (grub_usb_controller_t dev,
       if (o->bad_OHCI) /* In case of bad_OHCI tderr_phys can be wrong */
         {
           if ( tderr_phys ) /* check if tderr_phys points to TD with error */
-            errcode = grub_le_to_cpu32 ( GRUB_OHCI_TD_PHYS2VIRT (o,
+            errcode = grub_le_to_cpu32 ( grub_ohci_td_phys2virt (o,
                                            tderr_phys)->token )
                       >> 28;
           if ( !tderr_phys || !errcode ) /* tderr_phys not valid or points to wrong TD */
             { /* Retired TD with error should be previous TD to ED->td_head */
-              tderr_phys = GRUB_OHCI_TD_PHYS2VIRT (o,
+              tderr_phys = grub_ohci_td_phys2virt (o,
                              grub_le_to_cpu32 ( ed_virt->td_head) & ~0xf )
                            ->prev_td_phys;
             }
@@ -988,13 +1009,13 @@ grub_ohci_transfer (grub_usb_controller_t dev,
        * tderr_phys can be zero, check it */
       else if ( !tderr_phys )
         { /* Retired TD with error should be previous TD to ED->td_head */
-          tderr_phys = GRUB_OHCI_TD_PHYS2VIRT (o,
+          tderr_phys = grub_ohci_td_phys2virt (o,
                          grub_le_to_cpu32 ( ed_virt->td_head) & ~0xf )
                        ->prev_td_phys;
         }
 
       /* Prepare pointer to last processed TD and get error code */
-      tderr_virt = GRUB_OHCI_TD_PHYS2VIRT (o, tderr_phys);
+      tderr_virt = grub_ohci_td_phys2virt (o, tderr_phys);
       /* Set index of last processed TD */
       if (tderr_virt)
         {
@@ -1142,11 +1163,11 @@ grub_ohci_transfer (grub_usb_controller_t dev,
       /* Now we must find last processed TD if bad_OHCI == TRUE */
       if (o->bad_OHCI)
         { /* Retired TD with error should be previous TD to ED->td_head */
-          tderr_phys = GRUB_OHCI_TD_PHYS2VIRT (o,
+          tderr_phys = grub_ohci_td_phys2virt (o,
                          grub_le_to_cpu32 ( ed_virt->td_head) & ~0xf)
                        ->prev_td_phys;
         }
-      tderr_virt = GRUB_OHCI_TD_PHYS2VIRT (o, tderr_phys);
+      tderr_virt = grub_ohci_td_phys2virt (o, tderr_phys);
       if (tderr_virt)
         transfer->last_trans = tderr_virt->tr_index;
       else
@@ -1173,7 +1194,7 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   if (td_current_virt->prev_td_phys)
     {
       grub_ohci_td_t td_prev_virt
-                = GRUB_OHCI_TD_PHYS2VIRT (o, td_current_virt->prev_td_phys);
+                = grub_ohci_td_phys2virt (o, td_current_virt->prev_td_phys);
 
       td_next_virt = (grub_ohci_td_t) td_prev_virt->link_td;
       if (td_current_virt == td_next_virt)

From 986aad56c1416ffcf738657e0dd0710b36254189 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 17 Jul 2010 01:52:41 +0200
Subject: [PATCH 1239/1628] 	* disk/scsi.c (grub_scsi_open): Fix incorrect
 pointer dereference.

---
 ChangeLog   | 4 ++++
 disk/scsi.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 835293aec..3fd31efaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* disk/scsi.c (grub_scsi_open): Fix incorrect pointer dereference.
+
 2010-07-14  Anton Blanchard  <anton@samba.org>
 
 	* loader/powerpc/ieee1275/linux.c (grub_cmd_linux): Do not reject
diff --git a/disk/scsi.c b/disk/scsi.c
index 5f04d9ef7..60192bef5 100644
--- a/disk/scsi.c
+++ b/disk/scsi.c
@@ -402,7 +402,7 @@ grub_scsi_open (const char *name, grub_disk_t disk)
       if (p->open (bus, scsi))
 	continue;
 
-      disk->id = grub_make_scsi_id (scsi->dev->id, bus, lun);
+      disk->id = grub_make_scsi_id (p->id, bus, lun);
       disk->data = scsi;
       scsi->dev = p;
       scsi->lun = lun;

From 139b714a9362ded418c3d8819c672148e554b1d2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 17 Jul 2010 01:55:01 +0200
Subject: [PATCH 1240/1628] 	* kern/partition.c [GRUB_UTIL]: Add missing
 util/misc.h inclusion. 	* partmap/bsdlabel.c [GRUB_UTIL]: Likewise.

---
 ChangeLog          | 5 +++++
 kern/partition.c   | 4 ++++
 partmap/bsdlabel.c | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 3fd31efaf..a367f6891 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/partition.c [GRUB_UTIL]: Add missing util/misc.h inclusion.
+	* partmap/bsdlabel.c [GRUB_UTIL]: Likewise.
+
 2010-07-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* disk/scsi.c (grub_scsi_open): Fix incorrect pointer dereference.
diff --git a/kern/partition.c b/kern/partition.c
index a1e37f675..a2f5dd722 100644
--- a/kern/partition.c
+++ b/kern/partition.c
@@ -21,6 +21,10 @@
 #include <grub/partition.h>
 #include <grub/disk.h>
 
+#ifdef GRUB_UTIL
+#include <grub/util/misc.h>
+#endif
+
 grub_partition_map_t grub_partition_map_list;
 
 /*
diff --git a/partmap/bsdlabel.c b/partmap/bsdlabel.c
index d38a0eaf3..f671f76d8 100644
--- a/partmap/bsdlabel.c
+++ b/partmap/bsdlabel.c
@@ -24,6 +24,10 @@
 #include <grub/misc.h>
 #include <grub/dl.h>
 
+#ifdef GRUB_UTIL
+#include <grub/util/misc.h>
+#endif
+
 static struct grub_partition_map grub_bsdlabel_partition_map;
 
 

From 3222efaff353b7e49ddbca581fb1f01e51ed5d8b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 17 Jul 2010 01:57:48 +0200
Subject: [PATCH 1241/1628] 	* include/grub/bsdlabel.h
 (GRUB_PC_PARTITION_BSD_LABEL_WHOLE_DISK_PARTITION): New definition. 	*
 partmap/bsdlabel.c (bsdlabel_partition_map_iterate): Use FreeBSD 	delta
 determination style. Works with most NetBSD partitions too.

---
 ChangeLog               |  6 ++++++
 include/grub/bsdlabel.h |  2 ++
 partmap/bsdlabel.c      | 26 ++++++++++++++++++++++----
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a367f6891..0ab95813a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-17  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/bsdlabel.h (GRUB_PC_PARTITION_BSD_LABEL_WHOLE_DISK_PARTITION): New definition.
+	* partmap/bsdlabel.c (bsdlabel_partition_map_iterate): Use FreeBSD
+	delta determination style. Works with most NetBSD partitions too.
+
 2010-07-17  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/partition.c [GRUB_UTIL]: Add missing util/misc.h inclusion.
diff --git a/include/grub/bsdlabel.h b/include/grub/bsdlabel.h
index d88b25353..636bd41a1 100644
--- a/include/grub/bsdlabel.h
+++ b/include/grub/bsdlabel.h
@@ -63,6 +63,8 @@
 #define	GRUB_PC_PARTITION_OPENBSD_TYPE_NTFS	18
 #define	GRUB_PC_PARTITION_OPENBSD_TYPE_RAID	19
 
+#define GRUB_PC_PARTITION_BSD_LABEL_WHOLE_DISK_PARTITION 2
+
 /* The BSD partition entry.  */
 struct grub_partition_bsd_entry
 {
diff --git a/partmap/bsdlabel.c b/partmap/bsdlabel.c
index f671f76d8..a27b8eaec 100644
--- a/partmap/bsdlabel.c
+++ b/partmap/bsdlabel.c
@@ -41,9 +41,6 @@ bsdlabel_partition_map_iterate (grub_disk_t disk,
   grub_disk_addr_t delta = 0;
   unsigned pos;
 
-  /* BSDLabel offsets are absolute even when it's embed inside partition.  */
-  delta = grub_partition_get_start (disk->partition);
-
   /* Read the BSD label.  */
   if (grub_disk_read (disk, GRUB_PC_PARTITION_BSD_LABEL_SECTOR,
 		      0, sizeof (label), &label))
@@ -53,6 +50,24 @@ bsdlabel_partition_map_iterate (grub_disk_t disk,
   if (label.magic != grub_cpu_to_le32 (GRUB_PC_PARTITION_BSD_LABEL_MAGIC))
     return grub_error (GRUB_ERR_BAD_PART_TABLE, "no signature");
 
+  /* A kludge to determine a base of be.offset.  */
+  if (GRUB_PC_PARTITION_BSD_LABEL_WHOLE_DISK_PARTITION
+      < grub_cpu_to_le16 (label.num_partitions))
+    {
+      struct grub_partition_bsd_entry whole_disk_be;
+
+      pos = sizeof (label) + GRUB_PC_PARTITION_BSD_LABEL_SECTOR
+	* GRUB_DISK_SECTOR_SIZE + sizeof (struct grub_partition_bsd_entry)
+	* GRUB_PC_PARTITION_BSD_LABEL_WHOLE_DISK_PARTITION;
+
+      if (grub_disk_read (disk, pos / GRUB_DISK_SECTOR_SIZE,
+			  pos % GRUB_DISK_SECTOR_SIZE, sizeof (whole_disk_be),
+			  &whole_disk_be))
+	return grub_errno;
+
+      delta = grub_le_to_cpu32 (whole_disk_be.offset);
+    }
+
   pos = sizeof (label) + GRUB_PC_PARTITION_BSD_LABEL_SECTOR
     * GRUB_DISK_SECTOR_SIZE;
 
@@ -62,6 +77,9 @@ bsdlabel_partition_map_iterate (grub_disk_t disk,
     {
       struct grub_partition_bsd_entry be;
 
+      if (p.number == GRUB_PC_PARTITION_BSD_LABEL_WHOLE_DISK_PARTITION)
+	continue;
+
       p.offset = pos / GRUB_DISK_SECTOR_SIZE;
       p.index = pos % GRUB_DISK_SECTOR_SIZE;
 
@@ -78,7 +96,7 @@ bsdlabel_partition_map_iterate (grub_disk_t disk,
 		    (unsigned long long) p.start,
 		    (unsigned long long) p.len);
 
-      if (be.fs_type == GRUB_PC_PARTITION_BSD_TYPE_UNUSED)
+      if (p.len == 0)
 	continue;
 
       if (p.start < delta)

From 3a2537696721bc0bf6a90bdc27b327768e79e635 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 17 Jul 2010 03:57:59 +0200
Subject: [PATCH 1242/1628] Detect usb keyboard properly, support keyboard
 hotpluanad multiple keyboards

---
 term/usb_keyboard.c | 116 +++++++++++++++++++++++++++++++-------------
 1 file changed, 82 insertions(+), 34 deletions(-)

diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index ae9c41035..f010aa9e4 100644
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -54,7 +54,6 @@ static char keyboard_map_shift[128] =
     '?'
   };
 
-static grub_usb_device_t usbdev;
 
 /* Valid values for bmRequestType.  See HID definition version 1.11 section
    7.2.  */
@@ -69,36 +68,64 @@ static grub_usb_device_t usbdev;
 #define USB_HID_SET_IDLE	0x0A
 #define USB_HID_SET_PROTOCOL	0x0B
 
+static int grub_usb_keyboard_checkkey (struct grub_term_input *term);
+static int grub_usb_keyboard_getkey (struct grub_term_input *term);
+static int grub_usb_keyboard_getkeystatus (struct grub_term_input *term);
+
+static struct grub_term_input grub_usb_keyboard_term =
+  {
+    .checkkey = grub_usb_keyboard_checkkey,
+    .getkey = grub_usb_keyboard_getkey,
+    .getkeystatus = grub_usb_keyboard_getkeystatus,
+    .next = 0
+  };
+
+static struct grub_term_input grub_usb_keyboards[16];
+
 static void
-grub_usb_hid (void)
+grub_usb_keyboard_detach (grub_usb_device_t usbdev,
+			  int config __attribute__ ((unused)),
+			  int interface __attribute__ ((unused)))
 {
-  struct grub_usb_desc_device *descdev;
+  unsigned i;
+  for (i = 0; i < ARRAY_SIZE (grub_usb_keyboards); i++)
+    if (grub_usb_keyboards[i].data && grub_usb_keyboards[i].data == usbdev)
+      {
+	grub_term_unregister_input (&grub_usb_keyboards[i]);
+	grub_free ((char *) grub_usb_keyboards[i].name);
+	grub_usb_keyboards[i].name = NULL;
+	grub_usb_keyboards[i].data = 0;
+      }
+}
 
-  auto int usb_iterate (grub_usb_device_t dev);
-  int usb_iterate (grub_usb_device_t dev)
-    {
-      descdev = &dev->descdev;
+static int
+grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)
+{
+  unsigned curnum;
 
-      grub_dprintf ("usb_keyboard", "%x %x %x\n",
-		   descdev->class, descdev->subclass, descdev->protocol);
+  grub_dprintf ("usb_keyboard", "%x %x %x %d %d\n",
+		usbdev->descdev.class, usbdev->descdev.subclass,
+		usbdev->descdev.protocol, configno, interfno);
+
+  for (curnum = 0; curnum < ARRAY_SIZE (grub_usb_keyboards); curnum++)
+    if (!grub_usb_keyboards[curnum].data)
+      break;
+
+  if (curnum == ARRAY_SIZE (grub_usb_keyboards))
+    return 0;
 
 #if 0
-      if (descdev->class != 0x09
-	  || descdev->subclass == 0x01
-	  || descdev->protocol != 0x02)
+  if (descdev->class != 0x09
+      || descdev->subclass == 0x01
+      || descdev->protocol != 0x02)
 	return 0;
 #endif
 
-      if (descdev->class != 0 || descdev->subclass != 0 || descdev->protocol != 0)
-	return 0;
+  if (usbdev->descdev.class != 0 
+      || usbdev->descdev.subclass != 0 || usbdev->descdev.protocol != 0)
+    return 0;
 
-      grub_printf ("HID found!\n");
-
-      usbdev = dev;
-
-      return 1;
-    }
-  grub_usb_iterate (usb_iterate);
+  grub_printf ("HID found!\n");
 
   /* Place the device in boot mode.  */
   grub_usb_control_msg (usbdev, USB_HID_HOST_TO_DEVICE, USB_HID_SET_PROTOCOL,
@@ -107,6 +134,19 @@ grub_usb_hid (void)
   /* Reports every time an event occurs and not more often than that.  */
   grub_usb_control_msg (usbdev, USB_HID_HOST_TO_DEVICE, USB_HID_SET_IDLE,
 			0<<8, 0, 0, 0);
+
+  grub_memcpy (&grub_usb_keyboards[curnum], &grub_usb_keyboard_term,
+	       sizeof (grub_usb_keyboards[curnum]));
+  grub_usb_keyboards[curnum].data = usbdev;
+  usbdev->config[configno].interf[interfno].detach_hook
+    = grub_usb_keyboard_detach;
+  grub_usb_keyboards[curnum].name = grub_xasprintf ("usb_keyboard%d", curnum);
+  if (!grub_usb_keyboards[curnum].name)
+    return 0;
+  grub_term_register_input_active ("usb_keyboard", &grub_usb_keyboards[curnum]);
+
+
+  return 1;
 }
 
 static grub_err_t
@@ -119,13 +159,14 @@ grub_usb_keyboard_getreport (grub_usb_device_t dev, grub_uint8_t *report)
 
 
 static int
-grub_usb_keyboard_checkkey (struct grub_term_input *term __attribute__ ((unused)))
+grub_usb_keyboard_checkkey (struct grub_term_input *term)
 {
   grub_uint8_t data[8];
   int key;
   grub_err_t err;
   grub_uint64_t currtime;
   int timeout = 50;
+  grub_usb_device_t usbdev = term->data;
 
   data[2] = 0;
   currtime = grub_get_time_ms ();
@@ -196,6 +237,7 @@ grub_usb_keyboard_getkey (struct grub_term_input *term)
   grub_uint64_t currtime;
   int timeout;
   static grub_usb_keyboard_repeat_t repeat = GRUB_HIDBOOT_REPEAT_NONE;
+  grub_usb_device_t usbdev = term->data;
 
  again:
 
@@ -253,13 +295,14 @@ grub_usb_keyboard_getkey (struct grub_term_input *term)
 }
 
 static int
-grub_usb_keyboard_getkeystatus (struct grub_term_input *term __attribute__ ((unused)))
+grub_usb_keyboard_getkeystatus (struct grub_term_input *term)
 {
   grub_uint8_t data[8];
   int mods = 0;
   grub_err_t err;
   grub_uint64_t currtime;
   int timeout = 50;
+  grub_usb_device_t usbdev = term->data;
 
   /* Set idle time to the minimum offered by the spec (4 milliseconds) so
      that we can find out the current state.  */
@@ -307,22 +350,27 @@ grub_usb_keyboard_getkeystatus (struct grub_term_input *term __attribute__ ((unu
   return mods;
 }
 
-static struct grub_term_input grub_usb_keyboard_term =
-  {
-    .name = "usb_keyboard",
-    .checkkey = grub_usb_keyboard_checkkey,
-    .getkey = grub_usb_keyboard_getkey,
-    .getkeystatus = grub_usb_keyboard_getkeystatus,
-    .next = 0
-  };
+struct grub_usb_attach_desc attach_hook =
+{
+  .class = GRUB_USB_CLASS_HID,
+  .hook = grub_usb_keyboard_attach
+};
 
 GRUB_MOD_INIT(usb_keyboard)
 {
-  grub_usb_hid ();
-  grub_term_register_input ("usb_keyboard", &grub_usb_keyboard_term);
+  grub_usb_register_attach_hook_class (&attach_hook);
 }
 
 GRUB_MOD_FINI(usb_keyboard)
 {
-  grub_term_unregister_input (&grub_usb_keyboard_term);
+  unsigned i;
+  for (i = 0; i < ARRAY_SIZE (grub_usb_keyboards); i++)
+    if (grub_usb_keyboards[i].data)
+      {
+	grub_term_unregister_input (&grub_usb_keyboards[i]);
+	grub_free ((char *) grub_usb_keyboards[i].name);
+	grub_usb_keyboards[i].name = NULL;
+	grub_usb_keyboards[i].data = 0;
+      }
+  grub_usb_unregister_attach_hook_class (&attach_hook);
 }

From a17b90f0ec5802967577ed71ab825c915d7e2ab6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 17 Jul 2010 03:58:23 +0200
Subject: [PATCH 1243/1628] Support USB device drivers autoloading

---
 bus/usb/usb.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/bus/usb/usb.c b/bus/usb/usb.c
index f6a0a8b56..804cbaff0 100644
--- a/bus/usb/usb.c
+++ b/bus/usb/usb.c
@@ -22,6 +22,7 @@
 #include <grub/usb.h>
 #include <grub/misc.h>
 #include <grub/list.h>
+#include <grub/dl.h>
 
 static grub_usb_controller_dev_t grub_usb_list;
 struct grub_usb_attach_desc *attach_hooks;
@@ -256,6 +257,19 @@ void grub_usb_device_attach (grub_usb_device_t dev)
       for (desc = attach_hooks; desc; desc = desc->next)
 	if (interf->class == desc->class && desc->hook (dev, 0, i))
 	  dev->config[0].interf[i].attached = 1;
+
+      if (dev->config[0].interf[i].attached)
+	continue;
+
+      switch (interf->class)
+	{
+	case GRUB_USB_CLASS_MASS_STORAGE:
+	  grub_dl_load ("usbms");
+	  break;
+	case GRUB_USB_CLASS_HID:
+	  grub_dl_load ("usb_keyboard");
+	  break;
+	}
     }
 }
 

From 5771289a14bc26e3145917b79910026c6bc298b6 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sat, 17 Jul 2010 19:27:18 +0100
Subject: [PATCH 1244/1628] * util/import_unicode.py: Remove unnecessary
 imports.

---
 ChangeLog              | 4 ++++
 util/import_unicode.py | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f2e9356f..8ebb35067 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-17  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/import_unicode.py: Remove unnecessary imports.
+
 2010-07-17  Aleš Nesrsta <starous@volny.cz>
 
 	Hotplugging and USB hub support.
diff --git a/util/import_unicode.py b/util/import_unicode.py
index 1ee162d3f..8d17e7ef6 100644
--- a/util/import_unicode.py
+++ b/util/import_unicode.py
@@ -18,8 +18,6 @@
 
 import re
 import sys
-import os
-import datetime
 
 if len (sys.argv) < 3:
     print ("Usage: %s SOURCE DESTINATION" % sys.argv[0])

From 03f286ea9fc4336eaf4b56f3412c794f78238a65 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 01:35:55 +0200
Subject: [PATCH 1245/1628] Always show class

---
 commands/usbtest.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/commands/usbtest.c b/commands/usbtest.c
index 213288b52..7f00c8856 100644
--- a/commands/usbtest.c
+++ b/commands/usbtest.c
@@ -29,11 +29,11 @@
 
 static const char *usb_classes[] =
   {
-    "",
+    "Unknown",
     "Audio",
     "Communication Interface",
     "HID",
-    "",
+    "Unknown",
     "Physical",
     "Image",
     "Printer",
@@ -138,10 +138,10 @@ usb_iterate (grub_usb_device_t dev)
   usb_print_str ("Vendor", dev, descdev->strvendor);
   usb_print_str ("Serial", dev, descdev->strserial);
 
-  if (descdev->class > 0 && descdev->class <= 0x0E)
-    grub_printf ("Class: (0x%02x) %s, Subclass: 0x%02x, Protocol: 0x%02x\n",
-		 descdev->class, usb_classes[descdev->class],
-		 descdev->subclass, descdev->protocol);
+  grub_printf ("Class: (0x%02x) %s, Subclass: 0x%02x, Protocol: 0x%02x\n",
+	       descdev->class, descdev->class < ARRAY_SIZE (usb_classes)
+	       ? usb_classes[descdev->class] : "Unknown",
+	       descdev->subclass, descdev->protocol);
   grub_printf ("USB version %d.%d, VendorID: 0x%02x, ProductID: 0x%02x, #conf: %d\n",
 	       descdev->usbrel >> 8, (descdev->usbrel >> 4) & 0x0F,
 	       descdev->vendorid, descdev->prodid, descdev->configcnt);
@@ -164,10 +164,10 @@ usb_iterate (grub_usb_device_t dev)
 
       grub_printf ("Interface #%d: #Endpoints: %d   ",
 		   i, interf->endpointcnt);
-      if (interf->class > 0 && interf->class <= 0x0E)
-	grub_printf ("Class: (0x%02x) %s, Subclass: 0x%02x, Protocol: 0x%02x\n",
-		     interf->class, usb_classes[interf->class],
-		     interf->subclass, interf->protocol);
+      grub_printf ("Class: (0x%02x) %s, Subclass: 0x%02x, Protocol: 0x%02x\n",
+		   interf->class, interf->class < ARRAY_SIZE (usb_classes)
+		   ? usb_classes[interf->class] : "Unknown",
+		   interf->subclass, interf->protocol);
 
       usb_print_str ("Interface", dev, interf->strif);
 

From 75eb7d11168d9fcf70b9e7f6d861c4809160db7b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 01:37:19 +0200
Subject: [PATCH 1246/1628] Restructure serial in order to prepare for
 usbserial. As a byproduct simultaneous serial consoles are possible

---
 commands/terminal.c     |  15 +-
 conf/i386.rmk           |   2 +-
 include/grub/ns8250.h   |  67 ++++++
 include/grub/serial.h   | 100 +++++----
 include/grub/terminfo.h |   4 +-
 include/grub/usb.h      |   1 +
 term/ns8250.c           | 212 +++++++++++++++++++
 term/serial.c           | 439 ++++++++++++++++++----------------------
 term/terminfo.c         |  23 ++-
 term/usbserial.c        | 165 +++++++++++++++
 10 files changed, 733 insertions(+), 295 deletions(-)
 create mode 100644 include/grub/ns8250.h
 create mode 100644 term/ns8250.c
 create mode 100644 term/usbserial.c

diff --git a/commands/terminal.c b/commands/terminal.c
index d34602a1b..c8b1b6315 100644
--- a/commands/terminal.c
+++ b/commands/terminal.c
@@ -59,11 +59,17 @@ handle_command (int argc, char **args, struct abstract_terminal **enabled,
       for (aut = autoloads; aut; aut = aut->next)
        {
          for (term = *disabled; term; term = term->next)
-           if (grub_strcmp (term->name, aut->name) == 0)
+           if (grub_strcmp (term->name, aut->name) == 0
+	       || (aut->name[0] && aut->name[grub_strlen (aut->name) - 1] == '*'
+		   && grub_memcmp (term->name, aut->name,
+				   grub_strlen (aut->name) - 1) == 0))
              break;
          if (!term)
            for (term = *enabled; term; term = term->next)
-             if (grub_strcmp (term->name, aut->name) == 0)
+             if (grub_strcmp (term->name, aut->name) == 0
+		 || (aut->name[0] && aut->name[grub_strlen (aut->name) - 1] == '*'
+		     && grub_memcmp (term->name, aut->name,
+				     grub_strlen (aut->name) - 1) == 0))
                break;
          if (!term)
            grub_printf ("%s ", aut->name);
@@ -98,7 +104,10 @@ handle_command (int argc, char **args, struct abstract_terminal **enabled,
            return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown terminal '%s'\n",
                               args[i]);
          for (aut = autoloads; aut; aut = aut->next)
-           if (grub_strcmp (args[i], aut->name) == 0)
+           if (grub_strcmp (args[i], aut->name) == 0
+	       || (aut->name[0] && aut->name[grub_strlen (aut->name) - 1] == '*'
+		   && grub_memcmp (args[i], aut->name,
+				   grub_strlen (aut->name) - 1) == 0))
              {
                grub_dl_t mod;
                mod = grub_dl_load (aut->modname);
diff --git a/conf/i386.rmk b/conf/i386.rmk
index b1df584a6..6bf1b3410 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -56,7 +56,7 @@ multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
 # For serial.mod.
 pkglib_MODULES += serial.mod
-serial_mod_SOURCES = term/serial.c
+serial_mod_SOURCES = term/serial.c term/ns8250.c
 serial_mod_CFLAGS = $(COMMON_CFLAGS)
 serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/include/grub/ns8250.h b/include/grub/ns8250.h
new file mode 100644
index 000000000..f21a1a3e3
--- /dev/null
+++ b/include/grub/ns8250.h
@@ -0,0 +1,67 @@
+/* serial.h - serial device interface */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2000,2001,2002,2005,2007  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/>.
+ */
+
+#ifndef GRUB_NS8250_HEADER
+#define GRUB_NS8250_HEADER	1
+
+/* Macros.  */
+
+/* The offsets of UART registers.  */
+#define UART_TX		0
+#define UART_RX		0
+#define UART_DLL	0
+#define UART_IER	1
+#define UART_DLH	1
+#define UART_IIR	2
+#define UART_FCR	2
+#define UART_LCR	3
+#define UART_MCR	4
+#define UART_LSR	5
+#define UART_MSR	6
+#define UART_SR		7
+
+/* For LSR bits.  */
+#define UART_DATA_READY		0x01
+#define UART_EMPTY_TRANSMITTER	0x20
+
+/* The type of parity.  */
+#define UART_NO_PARITY		0x00
+#define UART_ODD_PARITY		0x08
+#define UART_EVEN_PARITY	0x18
+
+/* The type of the length of stop bit.  */
+#define UART_1_STOP_BIT		0x00
+#define UART_2_STOP_BITS	0x04
+
+/* the switch of DLAB.  */
+#define UART_DLAB	0x80
+
+/* Enable the FIFO.  */
+#define UART_ENABLE_FIFO_TRIGGER14	0xC7
+
+/* Enable the FIFO.  */
+#define UART_ENABLE_FIFO_TRIGGER1       0x07
+
+/* Turn on DTR, RTS, and OUT2.  */
+#define UART_ENABLE_DTRRTS	0x03
+
+/* Turn on DTR, RTS, and OUT2.  */
+#define UART_ENABLE_OUT2	0x08
+
+#endif /* ! GRUB_SERIAL_MACHINE_HEADER */
diff --git a/include/grub/serial.h b/include/grub/serial.h
index 758b6fb3e..063282112 100644
--- a/include/grub/serial.h
+++ b/include/grub/serial.h
@@ -1,7 +1,7 @@
 /* serial.h - serial device interface */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2000,2001,2002,2005,2007  Free Software Foundation, Inc.
+ *  Copyright (C) 2010  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
@@ -20,30 +20,51 @@
 #ifndef GRUB_SERIAL_HEADER
 #define GRUB_SERIAL_HEADER	1
 
-/* Macros.  */
+#include <grub/types.h>
+#include <grub/cpu/io.h>
+#include <grub/usb.h>
+#include <grub/list.h>
 
-/* The offsets of UART registers.  */
-#define UART_TX		0
-#define UART_RX		0
-#define UART_DLL	0
-#define UART_IER	1
-#define UART_DLH	1
-#define UART_IIR	2
-#define UART_FCR	2
-#define UART_LCR	3
-#define UART_MCR	4
-#define UART_LSR	5
-#define UART_MSR	6
-#define UART_SR		7
+struct grub_serial_port;
 
-/* For LSR bits.  */
-#define UART_DATA_READY		0x01
-#define UART_EMPTY_TRANSMITTER	0x20
+struct grub_serial_driver
+{
+  grub_err_t (*configure) (struct grub_serial_port *port,
+			   unsigned speed,
+			   unsigned short word_len,
+			   unsigned int   parity,
+			   unsigned short stop_bits);
+  int (*fetch) (struct grub_serial_port *port);
+  void (*put) (struct grub_serial_port *port, const int c);
+};
 
-/* The type of parity.  */
-#define UART_NO_PARITY		0x00
-#define UART_ODD_PARITY		0x08
-#define UART_EVEN_PARITY	0x18
+struct grub_serial_port
+{
+  struct grub_serial_port *next;
+  char *name;
+  unsigned speed;
+  unsigned short word_len;
+  unsigned int   parity;
+  unsigned short stop_bits;
+  struct grub_serial_driver *driver;
+  /* This should be void *data but since serial is useful as an early console
+     when malloc isn't available it's a union.
+   */
+  union
+  {
+    grub_port_t port;
+    struct
+    {
+      grub_usb_device_t dev;
+      int in_endp;
+      int out_endp;
+    };
+  };
+};
+
+grub_err_t grub_serial_register (struct grub_serial_port *port);
+
+void grub_serial_unregister (struct grub_serial_port *port);
 
 /* The type of word length.  */
 #define UART_5BITS_WORD	0x00
@@ -51,23 +72,30 @@
 #define UART_7BITS_WORD	0x02
 #define UART_8BITS_WORD	0x03
 
+/* The type of parity.  */
+#define UART_NO_PARITY		0x00
+#define UART_ODD_PARITY		0x08
+#define UART_EVEN_PARITY	0x18
+
 /* The type of the length of stop bit.  */
 #define UART_1_STOP_BIT		0x00
 #define UART_2_STOP_BITS	0x04
 
-/* the switch of DLAB.  */
-#define UART_DLAB	0x80
+static inline void
+grub_serial_fill_defaults (struct grub_serial_port *port)
+{
+  /* Set default settings.  */
+#ifdef GRUB_MACHINE_MIPS_YEELOONG
+  port->speed     = 115200;
+#else
+  port->speed     = 9600;
+#endif
+  port->word_len  = UART_8BITS_WORD;
+  port->parity    = UART_NO_PARITY;
+  port->stop_bits = UART_1_STOP_BIT;
+}
 
-/* Enable the FIFO.  */
-#define UART_ENABLE_FIFO_TRIGGER14	0xC7
+void grub_ns8250_init (void);
+char *grub_serial_ns8250_add_port (grub_port_t port);
 
-/* Enable the FIFO.  */
-#define UART_ENABLE_FIFO_TRIGGER1       0x07
-
-/* Turn on DTR, RTS, and OUT2.  */
-#define UART_ENABLE_DTRRTS	0x03
-
-/* Turn on DTR, RTS, and OUT2.  */
-#define UART_ENABLE_OUT2	0x08
-
-#endif /* ! GRUB_SERIAL_MACHINE_HEADER */
+#endif
diff --git a/include/grub/terminfo.h b/include/grub/terminfo.h
index d6907d7f0..85ddb5779 100644
--- a/include/grub/terminfo.h
+++ b/include/grub/terminfo.h
@@ -32,7 +32,7 @@ struct grub_terminfo_input_state
 {
   int input_buf[GRUB_TERMINFO_READKEY_MAX_LEN];
   int npending;
-  int (*readkey) (void);
+  int (*readkey) (struct grub_term_input *term);
 };
 
 struct grub_terminfo_output_state
@@ -51,7 +51,7 @@ struct grub_terminfo_output_state
 
   unsigned int xpos, ypos;
 
-  void (*put) (const int c);
+  void (*put) (struct grub_term_output *term, const int c);
 };
 
 void EXPORT_FUNC(grub_terminfo_gotoxy) (grub_term_output_t term,
diff --git a/include/grub/usb.h b/include/grub/usb.h
index 3c17318fc..f9c3d61ff 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -19,6 +19,7 @@
 #ifndef	GRUB_USB_H
 #define	GRUB_USB_H	1
 
+#include <grub/err.h>
 #include <grub/usbdesc.h>
 #include <grub/usbtrans.h>
 
diff --git a/term/ns8250.c b/term/ns8250.c
new file mode 100644
index 000000000..4f09c7606
--- /dev/null
+++ b/term/ns8250.c
@@ -0,0 +1,212 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2000,2001,2002,2003,2004,2005,2007,2008,2009,2010  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/machine/memory.h>
+#include <grub/serial.h>
+#include <grub/ns8250.h>
+#include <grub/types.h>
+#include <grub/dl.h>
+#include <grub/misc.h>
+#include <grub/cpu/io.h>
+#include <grub/mm.h>
+
+#ifdef GRUB_MACHINE_PCBIOS
+static const unsigned short *serial_hw_io_addr = (const unsigned short *) GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR;
+#define GRUB_SERIAL_PORT_NUM 4
+#else
+#include <grub/machine/serial.h>
+static const grub_port_t serial_hw_io_addr[] = GRUB_MACHINE_SERIAL_PORTS;
+#define GRUB_SERIAL_PORT_NUM (ARRAY_SIZE(serial_hw_io_addr))
+#endif
+
+/* Fetch a key.  */
+static int
+serial_hw_fetch (struct grub_serial_port *port)
+{
+  if (grub_inb (port->port + UART_LSR) & UART_DATA_READY)
+    return grub_inb (port->port + UART_RX);
+
+  return -1;
+}
+
+/* Put a character.  */
+static void
+serial_hw_put (struct grub_serial_port *port, const int c)
+{
+  unsigned int timeout = 100000;
+
+  /* Wait until the transmitter holding register is empty.  */
+  while ((grub_inb (port->port + UART_LSR) & UART_EMPTY_TRANSMITTER) == 0)
+    {
+      if (--timeout == 0)
+        /* There is something wrong. But what can I do?  */
+        return;
+    }
+
+  grub_outb (c, port->port + UART_TX);
+}
+
+/* Convert speed to divisor.  */
+static unsigned short
+serial_get_divisor (unsigned int speed)
+{
+  unsigned int i;
+
+  /* The structure for speed vs. divisor.  */
+  struct divisor
+  {
+    unsigned int speed;
+    unsigned short div;
+  };
+
+  /* The table which lists common configurations.  */
+  /* 1843200 / (speed * 16)  */
+  static struct divisor divisor_tab[] =
+    {
+      { 2400,   0x0030 },
+      { 4800,   0x0018 },
+      { 9600,   0x000C },
+      { 19200,  0x0006 },
+      { 38400,  0x0003 },
+      { 57600,  0x0002 },
+      { 115200, 0x0001 }
+    };
+
+  /* Set the baud rate.  */
+  for (i = 0; i < sizeof (divisor_tab) / sizeof (divisor_tab[0]); i++)
+    if (divisor_tab[i].speed == speed)
+  /* UART in Yeeloong runs twice the usual rate.  */
+#ifdef GRUB_MACHINE_MIPS_YEELOONG
+      return 2 * divisor_tab[i].div;
+#else
+      return divisor_tab[i].div;
+#endif
+  return 0;
+}
+
+/* Initialize a serial device. PORT is the port number for a serial device.
+   SPEED is a DTE-DTE speed which must be one of these: 2400, 4800, 9600,
+   19200, 38400, 57600 and 115200. WORD_LEN is the word length to be used
+   for the device. Likewise, PARITY is the type of the parity and
+   STOP_BIT_LEN is the length of the stop bit. The possible values for
+   WORD_LEN, PARITY and STOP_BIT_LEN are defined in the header file as
+   macros.  */
+static grub_err_t
+serial_hw_configure (struct grub_serial_port *port,
+		     unsigned speed, unsigned short word_len,
+		     unsigned int   parity, unsigned short stop_bits)
+{
+  unsigned char status = 0;
+  unsigned short divisor;
+
+  divisor = serial_get_divisor (speed);
+  if (divisor == 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad speed");
+
+  port->speed = speed;
+  port->word_len = word_len;
+  port->parity = parity;
+  port->stop_bits = stop_bits;
+
+  /* Turn off the interrupt.  */
+  grub_outb (0, port->port + UART_IER);
+
+  /* Set DLAB.  */
+  grub_outb (UART_DLAB, port->port + UART_LCR);
+
+  /* Set the baud rate.  */
+  grub_outb (divisor & 0xFF, port->port + UART_DLL);
+  grub_outb (divisor >> 8, port->port + UART_DLH);
+
+  /* Set the line status.  */
+  status |= (port->parity | port->word_len | port->stop_bits);
+  grub_outb (status, port->port + UART_LCR);
+
+  /* In Yeeloong serial port has only 3 wires.  */
+#ifndef GRUB_MACHINE_MIPS_YEELOONG
+  /* Enable the FIFO.  */
+  grub_outb (UART_ENABLE_FIFO_TRIGGER1, port->port + UART_FCR);
+
+  /* Turn on DTR and RTS.  */
+  grub_outb (UART_ENABLE_DTRRTS, port->port + UART_MCR);
+#else
+  /* Enable the FIFO.  */
+  grub_outb (UART_ENABLE_FIFO_TRIGGER14, port->port + UART_FCR);
+
+  /* Turn on DTR, RTS, and OUT2.  */
+  grub_outb (UART_ENABLE_DTRRTS | UART_ENABLE_OUT2, port->port + UART_MCR);
+#endif
+
+  /* Drain the input buffer.  */
+  while (serial_hw_fetch (port) != -1);
+
+  /*  FIXME: should check if the serial terminal was found.  */
+
+  return GRUB_ERR_NONE;
+}
+
+static struct grub_serial_driver grub_ns8250_driver =
+  {
+    .configure = serial_hw_configure,
+    .fetch = serial_hw_fetch,
+    .put = serial_hw_put
+  };
+
+static char com_names[GRUB_SERIAL_PORT_NUM][20];
+static struct grub_serial_port com_ports[GRUB_SERIAL_PORT_NUM];
+
+void
+grub_ns8250_init (void)
+{
+  int i;
+  for (i = 0; i < GRUB_SERIAL_PORT_NUM; i++)
+    //if (serial_hw_io_addr[i])
+      {
+	grub_snprintf (com_names[i], sizeof (com_names[i]), "com%d", i);
+	com_ports[i].name = com_names[i];
+	com_ports[i].driver = &grub_ns8250_driver;
+	grub_serial_fill_defaults (&com_ports[i]);
+	com_ports[i].port = serial_hw_io_addr[i];
+	grub_serial_register (&com_ports[i]);
+      }
+}
+
+char *
+grub_serial_ns8250_add_port (grub_port_t port)
+{
+  struct grub_serial_port *p;
+  int i;
+  for (i = 0; i < GRUB_SERIAL_PORT_NUM; i++)
+    if (com_ports[i].port == port)
+      return com_names[i];
+  p = grub_malloc (sizeof (*p));
+  if (!p)
+    return NULL;
+  p->name = grub_xasprintf ("port%lx", (unsigned long) port);
+  if (!p->name)
+    {
+      grub_free (p);
+      return NULL;
+    }
+  p->driver = &grub_ns8250_driver;
+  grub_serial_fill_defaults (p);
+  p->port = port;
+  grub_serial_register (p);  
+
+  return p->name;
+}
diff --git a/term/serial.c b/term/serial.c
index cf7759ef2..1f54a83ec 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2000,2001,2002,2003,2004,2005,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2000,2001,2002,2003,2004,2005,2007,2008,2009,2010  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
@@ -16,7 +16,6 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <grub/machine/memory.h>
 #include <grub/serial.h>
 #include <grub/term.h>
 #include <grub/types.h>
@@ -26,8 +25,9 @@
 #include <grub/cpu/io.h>
 #include <grub/extcmd.h>
 #include <grub/i18n.h>
+#include <grub/list.h>
 
-static unsigned int registered = 0;
+#define FOR_SERIAL_PORTS(var) FOR_LIST_ELEMENTS((var), (grub_serial_ports))
 
 /* Argument options.  */
 static const struct grub_arg_option options[] =
@@ -41,154 +41,19 @@ static const struct grub_arg_option options[] =
   {0, 0, 0, 0, 0, 0}
 };
 
-/* Serial port settings.  */
-struct serial_port
+struct grub_serial_port *grub_serial_ports;
+
+struct grub_serial_output_state
 {
-  grub_port_t port;
-  unsigned short divisor;
-  unsigned short word_len;
-  unsigned int   parity;
-  unsigned short stop_bits;
+  struct grub_terminfo_output_state tinfo;
+  struct grub_serial_port *port;
 };
 
-/* Serial port settings.  */
-static struct serial_port serial_settings;
-
-#ifdef GRUB_MACHINE_PCBIOS
-static const unsigned short *serial_hw_io_addr = (const unsigned short *) GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR;
-#define GRUB_SERIAL_PORT_NUM 4
-#else
-#include <grub/machine/serial.h>
-static const grub_port_t serial_hw_io_addr[] = GRUB_MACHINE_SERIAL_PORTS;
-#define GRUB_SERIAL_PORT_NUM (ARRAY_SIZE(serial_hw_io_addr))
-#endif
-
-/* Return the port number for the UNITth serial device.  */
-static inline grub_port_t
-serial_hw_get_port (const unsigned int unit)
+struct grub_serial_input_state
 {
-  if (unit < GRUB_SERIAL_PORT_NUM)
-    return serial_hw_io_addr[unit];
-  else
-    return 0;
-}
-
-/* Fetch a key.  */
-static int
-serial_hw_fetch (void)
-{
-  if (grub_inb (serial_settings.port + UART_LSR) & UART_DATA_READY)
-    return grub_inb (serial_settings.port + UART_RX);
-
-  return -1;
-}
-
-/* Put a character.  */
-static void
-serial_hw_put (const int c)
-{
-  unsigned int timeout = 100000;
-
-  /* Wait until the transmitter holding register is empty.  */
-  while ((grub_inb (serial_settings.port + UART_LSR) & UART_EMPTY_TRANSMITTER) == 0)
-    {
-      if (--timeout == 0)
-        /* There is something wrong. But what can I do?  */
-        return;
-    }
-
-  grub_outb (c, serial_settings.port + UART_TX);
-}
-
-/* Convert speed to divisor.  */
-static unsigned short
-serial_get_divisor (unsigned int speed)
-{
-  unsigned int i;
-
-  /* The structure for speed vs. divisor.  */
-  struct divisor
-  {
-    unsigned int speed;
-    unsigned short div;
-  };
-
-  /* The table which lists common configurations.  */
-  /* 1843200 / (speed * 16)  */
-  static struct divisor divisor_tab[] =
-    {
-      { 2400,   0x0030 },
-      { 4800,   0x0018 },
-      { 9600,   0x000C },
-      { 19200,  0x0006 },
-      { 38400,  0x0003 },
-      { 57600,  0x0002 },
-      { 115200, 0x0001 }
-    };
-
-  /* Set the baud rate.  */
-  for (i = 0; i < sizeof (divisor_tab) / sizeof (divisor_tab[0]); i++)
-    if (divisor_tab[i].speed == speed)
-  /* UART in Yeeloong runs twice the usual rate.  */
-#ifdef GRUB_MACHINE_MIPS_YEELOONG
-      return 2 * divisor_tab[i].div;
-#else
-      return divisor_tab[i].div;
-#endif
-  return 0;
-}
-
-/* Initialize a serial device. PORT is the port number for a serial device.
-   SPEED is a DTE-DTE speed which must be one of these: 2400, 4800, 9600,
-   19200, 38400, 57600 and 115200. WORD_LEN is the word length to be used
-   for the device. Likewise, PARITY is the type of the parity and
-   STOP_BIT_LEN is the length of the stop bit. The possible values for
-   WORD_LEN, PARITY and STOP_BIT_LEN are defined in the header file as
-   macros.  */
-static grub_err_t
-serial_hw_init (void)
-{
-  unsigned char status = 0;
-
-  /* Turn off the interrupt.  */
-  grub_outb (0, serial_settings.port + UART_IER);
-
-  /* Set DLAB.  */
-  grub_outb (UART_DLAB, serial_settings.port + UART_LCR);
-
-  /* Set the baud rate.  */
-  grub_outb (serial_settings.divisor & 0xFF, serial_settings.port + UART_DLL);
-  grub_outb (serial_settings.divisor >> 8, serial_settings.port + UART_DLH);
-
-  /* Set the line status.  */
-  status |= (serial_settings.parity
-	     | serial_settings.word_len
-	     | serial_settings.stop_bits);
-  grub_outb (status, serial_settings.port + UART_LCR);
-
-  /* In Yeeloong serial port has only 3 wires.  */
-#ifndef GRUB_MACHINE_MIPS_YEELOONG
-  /* Enable the FIFO.  */
-  grub_outb (UART_ENABLE_FIFO_TRIGGER1, serial_settings.port + UART_FCR);
-
-  /* Turn on DTR and RTS.  */
-  grub_outb (UART_ENABLE_DTRRTS, serial_settings.port + UART_MCR);
-#else
-  /* Enable the FIFO.  */
-  grub_outb (UART_ENABLE_FIFO_TRIGGER14, serial_settings.port + UART_FCR);
-
-  /* Turn on DTR, RTS, and OUT2.  */
-  grub_outb (UART_ENABLE_DTRRTS | UART_ENABLE_OUT2,
-	     serial_settings.port + UART_MCR);
-#endif
-
-  /* Drain the input buffer.  */
-  while (serial_hw_fetch () != -1);
-
-  /*  FIXME: should check if the serial terminal was found.  */
-
-  return GRUB_ERR_NONE;
-}
+  struct grub_terminfo_input_state tinfo;
+  struct grub_serial_port *port;
+};
 
 static grub_uint16_t
 grub_serial_getwh (struct grub_term_output *term __attribute__ ((unused)))
@@ -198,16 +63,38 @@ grub_serial_getwh (struct grub_term_output *term __attribute__ ((unused)))
   return (TEXT_WIDTH << 8) | TEXT_HEIGHT;
 }
 
-struct grub_terminfo_input_state grub_serial_terminfo_input =
+static void 
+serial_put (grub_term_output_t term, const int c)
+{
+  struct grub_serial_output_state *data = term->data;
+  data->port->driver->put (data->port, c);
+}
+
+static int
+serial_fetch (grub_term_input_t term)
+{
+  struct grub_serial_input_state *data = term->data;
+  return data->port->driver->fetch (data->port);
+}
+
+struct grub_serial_input_state grub_serial_terminfo_input =
   {
-    .readkey = serial_hw_fetch
+    .tinfo =
+    {
+      .readkey = serial_fetch
+    }
   };
 
-struct grub_terminfo_output_state grub_serial_terminfo_output =
+struct grub_serial_output_state grub_serial_terminfo_output =
   {
-    .put = serial_hw_put
+    .tinfo =
+    {
+      .put = serial_put
+    }
   };
 
+int registered = 0;
+
 static struct grub_term_input grub_serial_term_input =
 {
   .name = "serial",
@@ -235,122 +122,200 @@ static struct grub_term_output grub_serial_term_output =
 
 
 
+static struct grub_serial_port *
+grub_serial_find (char *name)
+{
+  struct grub_serial_port *port;
+
+  FOR_SERIAL_PORTS (port)
+    if (grub_strcmp (port->name, name) == 0)
+      break;
+
+  if (!port && grub_memcmp (name, "port", sizeof ("port") - 1) == 0
+      && grub_isdigit (name [sizeof ("port") - 1]))
+    {
+      name = grub_serial_ns8250_add_port (grub_strtoul (&name[sizeof ("port") - 1],
+							0, 16));
+      if (!name)
+	return NULL;
+
+      FOR_SERIAL_PORTS (port)
+	if (grub_strcmp (port->name, name) == 0)
+	  break;
+    }
+
+  return port;
+}
+
 static grub_err_t
-grub_cmd_serial (grub_extcmd_t cmd,
-                 int argc __attribute__ ((unused)),
-		 char **args __attribute__ ((unused)))
+grub_cmd_serial (grub_extcmd_t cmd, int argc, char **args)
 {
   struct grub_arg_list *state = cmd->state;
-  struct serial_port backup_settings = serial_settings;
-  grub_err_t hwiniterr;
+  char pname[40];
+  char *name = NULL;
+  struct grub_serial_port *port;
+  signed speed = -1;
+  signed short word_len = -1;
+  signed int   parity = -1;
+  signed short stop_bits = -1;
+  grub_err_t err;
 
   if (state[0].set)
     {
-      unsigned int unit;
-
-      unit = grub_strtoul (state[0].arg, 0, 0);
-      serial_settings.port = serial_hw_get_port (unit);
-      if (!serial_settings.port)
-	return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad unit number");
+      grub_snprintf (pname, sizeof (pname), "com%ld",
+		     grub_strtoul (state[0].arg, 0, 0));
+      name = pname;
     }
 
   if (state[1].set)
-    serial_settings.port = (grub_port_t) grub_strtoul (state[1].arg, 0, 0);
+    {
+      grub_snprintf (pname, sizeof (pname), "port%lx",
+		     grub_strtoul (state[1].arg, 0, 0));
+      name = pname;
+    }
+
+  if (argc >= 1)
+    name = args[0];
+
+  if (!name)
+    name = "com0";
+
+  port = grub_serial_find (name);
+  if (!port)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown serial port");
+
+  speed = port->speed;
+  word_len = port->word_len;
+  parity = port->parity;
+  stop_bits = port->stop_bits;
 
   if (state[2].set)
-    {
-      unsigned long speed;
-
-      speed = grub_strtoul (state[2].arg, 0, 0);
-      serial_settings.divisor = serial_get_divisor ((unsigned int) speed);
-      if (serial_settings.divisor == 0)
-	{
-	  serial_settings = backup_settings;
-	  return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad speed");
-	}
-    }
+    speed = grub_strtoul (state[2].arg, 0, 0);
 
   if (state[3].set)
     {
       if (! grub_strcmp (state[3].arg, "5"))
-	serial_settings.word_len = UART_5BITS_WORD;
+	word_len = UART_5BITS_WORD;
       else if (! grub_strcmp (state[3].arg, "6"))
-	serial_settings.word_len = UART_6BITS_WORD;
+	word_len = UART_6BITS_WORD;
       else if (! grub_strcmp (state[3].arg, "7"))
-	serial_settings.word_len = UART_7BITS_WORD;
+	word_len = UART_7BITS_WORD;
       else if (! grub_strcmp (state[3].arg, "8"))
-	serial_settings.word_len = UART_8BITS_WORD;
+	word_len = UART_8BITS_WORD;
       else
-	{
-	  serial_settings = backup_settings;
-	  return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad word length");
-	}
+	return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad word length");
     }
 
   if (state[4].set)
     {
       if (! grub_strcmp (state[4].arg, "no"))
-	serial_settings.parity = UART_NO_PARITY;
+	parity = UART_NO_PARITY;
       else if (! grub_strcmp (state[4].arg, "odd"))
-	serial_settings.parity = UART_ODD_PARITY;
+	parity = UART_ODD_PARITY;
       else if (! grub_strcmp (state[4].arg, "even"))
-	serial_settings.parity = UART_EVEN_PARITY;
+	parity = UART_EVEN_PARITY;
       else
-	{
-	  serial_settings = backup_settings;
-	  return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad parity");
-	}
+	return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad parity");
     }
 
   if (state[5].set)
     {
       if (! grub_strcmp (state[5].arg, "1"))
-	serial_settings.stop_bits = UART_1_STOP_BIT;
+	stop_bits = UART_1_STOP_BIT;
       else if (! grub_strcmp (state[5].arg, "2"))
-	serial_settings.stop_bits = UART_2_STOP_BITS;
+	stop_bits = UART_2_STOP_BITS;
       else
-	{
-	  serial_settings = backup_settings;
-	  return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad number of stop bits");
-	}
+	return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad number of stop bits");
     }
 
   /* Initialize with new settings.  */
-  hwiniterr = serial_hw_init ();
-
-  if (hwiniterr == GRUB_ERR_NONE)
+  err = port->driver->configure (port, speed, word_len, parity, stop_bits);
+  if (err)
+    return err;
+  if (!registered)
     {
-      /* Register terminal if not yet registered.  */
-      if (registered == 0)
-	{
-	  grub_term_register_input ("serial", &grub_serial_term_input);
-	  grub_term_register_output ("serial", &grub_serial_term_output);
-	  grub_terminfo_output_register (&grub_serial_term_output, "vt100");
-	  registered = 1;
-	}
+      grub_term_register_input ("serial", &grub_serial_term_input);
+      grub_term_register_output ("serial", &grub_serial_term_output);
     }
-  else
-    {
-      /* Initialization with new settings failed.  */
-      if (registered == 1)
-	{
-	  /* If the terminal is registered, attempt to restore previous
-	     settings.  */
-	  serial_settings = backup_settings;
-	  if (serial_hw_init () != GRUB_ERR_NONE)
-	    {
-	      /* If unable to restore settings, unregister terminal.  */
-	      grub_term_unregister_input (&grub_serial_term_input);
-	      grub_term_unregister_output (&grub_serial_term_output);
-	      grub_terminfo_output_unregister (&grub_serial_term_output);
-	      registered = 0;
-	    }
-	}
-    }
-
-  return hwiniterr;
+  grub_serial_terminfo_output.port = port;
+  grub_serial_terminfo_input.port = port;
+  registered = 1;
+  return GRUB_ERR_NONE;
 }
 
+grub_err_t
+grub_serial_register (struct grub_serial_port *port)
+{
+  struct grub_term_input *in;
+  struct grub_term_output *out;
+  struct grub_serial_input_state *indata;
+  struct grub_serial_output_state *outdata;
+
+  in = grub_malloc (sizeof (*in));
+  if (!in)
+    return grub_errno;
+
+  indata = grub_malloc (sizeof (*indata));
+  if (!indata)
+    {
+      grub_free (in);
+      return grub_errno;
+    }
+
+  grub_memcpy (in, &grub_serial_term_input, sizeof (*in));
+  in->data = indata;
+  in->name = grub_xasprintf ("serial_%s", port->name);
+  grub_memcpy (indata, &grub_serial_terminfo_input, sizeof (*indata));
+
+  if (!in->name)
+    {
+      grub_free (in);
+      grub_free (indata);
+      return grub_errno;
+    }
+  
+  out = grub_malloc (sizeof (*out));
+  if (!out)
+    {
+      grub_free (in);
+      grub_free (indata);
+      grub_free ((char *) in->name);
+      return grub_errno;
+    }
+
+  outdata = grub_malloc (sizeof (*outdata));
+  if (!outdata)
+    {
+      grub_free (in);
+      grub_free (indata);
+      grub_free ((char *) in->name);
+      grub_free (out);
+      return grub_errno;
+    }
+
+  grub_memcpy (out, &grub_serial_term_output, sizeof (*out));
+  out->data = outdata;
+  out->name = in->name;
+  grub_memcpy (outdata, &grub_serial_terminfo_output, sizeof (*outdata));
+
+  grub_list_push (GRUB_AS_LIST_P (&grub_serial_ports), GRUB_AS_LIST (port));
+  ((struct grub_serial_input_state *) in->data)->port = port;
+  ((struct grub_serial_output_state *) out->data)->port = port;
+  grub_term_register_input ("serial_*", in);
+  grub_term_register_output ("serial_*", out);
+  grub_terminfo_output_register (out, "vt100");
+
+  return GRUB_ERR_NONE;
+}
+
+void
+grub_serial_unregister (struct grub_serial_port *port)
+{
+  grub_list_remove (GRUB_AS_LIST_P (&grub_serial_ports), GRUB_AS_LIST (port));
+  /* FIXME */
+}
+
+
 static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(serial)
@@ -360,21 +325,13 @@ GRUB_MOD_INIT(serial)
 			      N_("[OPTIONS...]"),
 			      N_("Configure serial port."), options);
 
-  /* Set default settings.  */
-  serial_settings.port      = serial_hw_get_port (0);
-#ifdef GRUB_MACHINE_MIPS_YEELOONG
-  serial_settings.divisor   = serial_get_divisor (115200);
-#else
-  serial_settings.divisor   = serial_get_divisor (9600);
-#endif
-  serial_settings.word_len  = UART_8BITS_WORD;
-  serial_settings.parity    = UART_NO_PARITY;
-  serial_settings.stop_bits = UART_1_STOP_BIT;
+  grub_ns8250_init ();
 
 #ifdef GRUB_MACHINE_MIPS_YEELOONG
   {
     grub_err_t hwiniterr;
-    hwiniterr = serial_hw_init ();
+    hwiniterr = grub_ns8250_driver.init ("com0", &serial_settings);
+    serial_settings.driver = &grub_ns8250_driver;
 
     if (hwiniterr == GRUB_ERR_NONE)
       {
@@ -389,11 +346,7 @@ GRUB_MOD_INIT(serial)
 
 GRUB_MOD_FINI(serial)
 {
+  while (grub_serial_ports)
+    grub_serial_unregister (grub_serial_ports);
   grub_unregister_extcmd (cmd);
-  if (registered == 1)		/* Unregister terminal only if registered. */
-    {
-      grub_term_unregister_input (&grub_serial_term_input);
-      grub_term_unregister_output (&grub_serial_term_output);
-      grub_terminfo_output_unregister (&grub_serial_term_output);
-    }
 }
diff --git a/term/terminfo.c b/term/terminfo.c
index ff54e5dba..5691b9cc6 100644
--- a/term/terminfo.c
+++ b/term/terminfo.c
@@ -195,7 +195,7 @@ putstr (struct grub_term_output *term, const char *str)
   struct grub_terminfo_output_state *data
     = (struct grub_terminfo_output_state *) term->data;
   while (*str)
-    data->put (*str++);
+    data->put (term, *str++);
 }
 
 grub_uint16_t
@@ -225,7 +225,7 @@ grub_terminfo_gotoxy (struct grub_term_output *term,
   else
     {
       if ((y == data->ypos) && (x == data->xpos - 1))
-	data->put ('\b');
+	data->put (term, '\b');
     }
 
   data->xpos = x;
@@ -348,20 +348,21 @@ grub_terminfo_putchar (struct grub_term_output *term,
 	  data->xpos = 0;
 	  if (data->ypos < grub_term_height (term) - 1)
 	    data->ypos++;
-	  data->put ('\r');
-	  data->put ('\n');
+	  data->put (term, '\r');
+	  data->put (term, '\n');
 	}
       data->xpos += c->estimated_width;
       break;
     }
 
-  data->put (c->base);
+  data->put (term, c->base);
 }
 
 #define ANSI_C0 0x9b
 
 static void
-grub_terminfo_readkey (int *keys, int *len, int (*readkey) (void))
+grub_terminfo_readkey (struct grub_term_input *term, int *keys, int *len,
+		       int (*readkey) (struct grub_term_input *term))
 {
   int c;
 
@@ -371,7 +372,7 @@ grub_terminfo_readkey (int *keys, int *len, int (*readkey) (void))
     /* On 9600 we have to wait up to 12 milliseconds.  */	\
     start = grub_get_time_ms ();				\
     do								\
-      c = readkey ();						\
+      c = readkey (term);					\
     while (c == -1 && grub_get_time_ms () - start < 12);	\
     if (c == -1)						\
       return;							\
@@ -380,7 +381,7 @@ grub_terminfo_readkey (int *keys, int *len, int (*readkey) (void))
     (*len)++;							\
   }
 
-  c = readkey ();
+  c = readkey (term);
   if (c < 0)
     {
       *len = 0;
@@ -475,7 +476,8 @@ grub_terminfo_checkkey (struct grub_term_input *termi)
   if (data->npending)
     return data->input_buf[0];
 
-  grub_terminfo_readkey (data->input_buf, &data->npending, data->readkey);
+  grub_terminfo_readkey (termi, data->input_buf,
+			 &data->npending, data->readkey);
 
   if (data->npending)
     return data->input_buf[0];
@@ -491,7 +493,8 @@ grub_terminfo_getkey (struct grub_term_input *termi)
     = (struct grub_terminfo_input_state *) (termi->data);
   int ret;
   while (! data->npending)
-    grub_terminfo_readkey (data->input_buf, &data->npending, data->readkey);
+    grub_terminfo_readkey (termi, data->input_buf, &data->npending,
+			   data->readkey);
 
   ret = data->input_buf[0];
   data->npending--;
diff --git a/term/usbserial.c b/term/usbserial.c
new file mode 100644
index 000000000..5a63348fb
--- /dev/null
+++ b/term/usbserial.c
@@ -0,0 +1,165 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2000,2001,2002,2003,2004,2005,2007,2008,2009  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/machine/memory.h>
+#include <grub/serial.h>
+#include <grub/term.h>
+#include <grub/types.h>
+#include <grub/dl.h>
+#include <grub/misc.h>
+#include <grub/terminfo.h>
+#include <grub/cpu/io.h>
+#include <grub/extcmd.h>
+#include <grub/i18n.h>
+
+static unsigned int registered = 0;
+
+/* Argument options.  */
+static const struct grub_arg_option options[] =
+{
+  {"unit",   'u', 0, N_("Set the serial unit."),             0, ARG_TYPE_INT},
+  {"speed",  's', 0, N_("Set the serial port speed."),       0, ARG_TYPE_INT},
+  {"word",   'w', 0, N_("Set the serial port word length."), 0, ARG_TYPE_INT},
+  {"parity", 'r', 0, N_("Set the serial port parity."),      0, ARG_TYPE_STRING},
+  {"stop",   't', 0, N_("Set the serial port stop bits."),   0, ARG_TYPE_INT},
+  {0, 0, 0, 0, 0, 0}
+};
+
+/* Serial port settings.  */
+struct usbserial_port
+{
+  grub_usb_device_t usbdev;
+  int in_endp;
+  int out_endp;
+  unsigned short divisor;
+  unsigned short word_len;
+  unsigned int   parity;
+  unsigned short stop_bits;
+};
+
+/* Serial port settings.  */
+static struct serial_port serial_settings;
+
+/* Fetch a key.  */
+static int
+serial_hw_fetch (void)
+{
+  /* FIXME */
+  return -1;
+}
+
+/* Put a character.  */
+static void
+usbserial_hw_put (struct usbserial_port *port, const int c)
+{
+  char cc = c;
+  grub_usb_bulk_write (port->usbdev, port->out_endp, 1, &cc);
+}
+
+static grub_uint16_t
+grub_serial_getwh (struct grub_term_output *term __attribute__ ((unused)))
+{
+  const grub_uint8_t TEXT_WIDTH = 80;
+  const grub_uint8_t TEXT_HEIGHT = 24;
+  return (TEXT_WIDTH << 8) | TEXT_HEIGHT;
+}
+
+struct grub_terminfo_input_state grub_serial_terminfo_input =
+  {
+    .readkey = serial_hw_fetch
+  };
+
+struct grub_terminfo_output_state grub_serial_terminfo_output =
+  {
+    .put = usbserial_hw_put
+  };
+
+static struct grub_term_input grub_serial_term_input =
+{
+  .name = "usbserial",
+  .init = grub_terminfo_input_init,
+  .checkkey = grub_terminfo_checkkey,
+  .getkey = grub_terminfo_getkey,
+  .data = &grub_serial_terminfo_input
+};
+
+static struct grub_term_output grub_serial_term_output =
+{
+  .name = "usbserial",
+  .putchar = grub_terminfo_putchar,
+  .getwh = grub_serial_getwh,
+  .getxy = grub_terminfo_getxy,
+  .gotoxy = grub_terminfo_gotoxy,
+  .cls = grub_terminfo_cls,
+  .setcolorstate = grub_terminfo_setcolorstate,
+  .setcursor = grub_terminfo_setcursor,
+  .flags = GRUB_TERM_CODE_TYPE_ASCII,
+  .data = &grub_serial_terminfo_output,
+  .normal_color = GRUB_TERM_DEFAULT_NORMAL_COLOR,
+  .highlight_color = GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR,
+};
+
+
+
+
+static grub_extcmd_t cmd;
+
+GRUB_MOD_INIT(serial)
+{
+  cmd = grub_register_extcmd ("serial", grub_cmd_serial,
+			      GRUB_COMMAND_FLAG_BOTH,
+			      N_("[OPTIONS...]"),
+			      N_("Configure serial port."), options);
+
+  /* Set default settings.  */
+  serial_settings.port      = serial_hw_get_port (0);
+#ifdef GRUB_MACHINE_MIPS_YEELOONG
+  serial_settings.divisor   = serial_get_divisor (115200);
+#else
+  serial_settings.divisor   = serial_get_divisor (9600);
+#endif
+  serial_settings.word_len  = UART_8BITS_WORD;
+  serial_settings.parity    = UART_NO_PARITY;
+  serial_settings.stop_bits = UART_1_STOP_BIT;
+
+#ifdef GRUB_MACHINE_MIPS_YEELOONG
+  {
+    grub_err_t hwiniterr;
+    hwiniterr = serial_hw_init ();
+
+    if (hwiniterr == GRUB_ERR_NONE)
+      {
+	grub_term_register_input_active ("serial", &grub_serial_term_input);
+	grub_term_register_output_active ("serial", &grub_serial_term_output);
+
+	registered = 1;
+      }
+  }
+#endif
+}
+
+GRUB_MOD_FINI(serial)
+{
+  grub_unregister_extcmd (cmd);
+  if (registered == 1)		/* Unregister terminal only if registered. */
+    {
+      grub_term_unregister_input (&grub_serial_term_input);
+      grub_term_unregister_output (&grub_serial_term_output);
+      grub_terminfo_output_unregister (&grub_serial_term_output);
+    }
+}

From 7b5502f30b0e8a110f91fc2be6286bc303269649 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 01:41:08 +0200
Subject: [PATCH 1247/1628] Remove debug comment-out

---
 term/ns8250.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/term/ns8250.c b/term/ns8250.c
index 4f09c7606..ee2eeb8f5 100644
--- a/term/ns8250.c
+++ b/term/ns8250.c
@@ -175,7 +175,7 @@ grub_ns8250_init (void)
 {
   int i;
   for (i = 0; i < GRUB_SERIAL_PORT_NUM; i++)
-    //if (serial_hw_io_addr[i])
+    if (serial_hw_io_addr[i])
       {
 	grub_snprintf (com_names[i], sizeof (com_names[i]), "com%d", i);
 	com_ports[i].name = com_names[i];

From cbf41813b307e62fcb8ca424429d26a2084c8704 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 12:53:08 +0200
Subject: [PATCH 1248/1628] Don't check transaction active flag as it's not
 updated and creates problems for usbserial

---
 bus/usb/uhci.c | 51 +++++++++++++++++++++++---------------------------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index efdf3aceb..5b4432018 100644
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -512,42 +512,37 @@ grub_uhci_transfer (grub_usb_controller_t dev,
 
       grub_dprintf ("uhci", "t status=0x%02x\n", errtd->ctrl_status);
 
-      /* Check if the TD is not longer active.  */
-      if (! (errtd->ctrl_status & (1 << 23)))
-	{
-	  grub_dprintf ("uhci", ">>t status=0x%02x\n", errtd->ctrl_status);
+      /* Check if the endpoint is stalled.  */
+      if (errtd->ctrl_status & (1 << 22))
+	err = GRUB_USB_ERR_STALL;
 
-	  /* Check if the endpoint is stalled.  */
-	  if (errtd->ctrl_status & (1 << 22))
-	    err = GRUB_USB_ERR_STALL;
+      /* Check if an error related to the data buffer occurred.  */
+      if (errtd->ctrl_status & (1 << 21))
+	err = GRUB_USB_ERR_DATA;
 
-	  /* Check if an error related to the data buffer occurred.  */
-	  if (errtd->ctrl_status & (1 << 21))
-	    err = GRUB_USB_ERR_DATA;
+      /* Check if a babble error occurred.  */
+      if (errtd->ctrl_status & (1 << 20))
+	err = GRUB_USB_ERR_BABBLE;
 
-	  /* Check if a babble error occurred.  */
-	  if (errtd->ctrl_status & (1 << 20))
-	    err = GRUB_USB_ERR_BABBLE;
+      /* Check if a NAK occurred.  */
+      if (errtd->ctrl_status & (1 << 19))
+	err = GRUB_USB_ERR_NAK;
 
-	  /* Check if a NAK occurred.  */
-	  if (errtd->ctrl_status & (1 << 19))
-	    err = GRUB_USB_ERR_NAK;
+      /* Check if a timeout occurred.  */
+      if (errtd->ctrl_status & (1 << 18))
+	err = GRUB_USB_ERR_TIMEOUT;
 
-	  /* Check if a timeout occurred.  */
-	  if (errtd->ctrl_status & (1 << 18))
-	    err = GRUB_USB_ERR_TIMEOUT;
+      /* Check if a bitstuff error occurred.  */
+      if (errtd->ctrl_status & (1 << 17))
+	err = GRUB_USB_ERR_BITSTUFF;
 
-	  /* Check if a bitstuff error occurred.  */
-	  if (errtd->ctrl_status & (1 << 17))
-	    err = GRUB_USB_ERR_BITSTUFF;
+      if (err)
+	goto fail;
 
-	  if (err)
-	    goto fail;
+      /* Fall through, no errors occurred, so the QH might be
+	 updated.  */
+      grub_dprintf ("uhci", "transaction fallthrough\n");
 
-	  /* Fall through, no errors occurred, so the QH might be
-	     updated.  */
-	  grub_dprintf ("uhci", "transaction fallthrough\n");
-	}
       if (grub_get_time_ms () > endtime)
 	{
 	  err = GRUB_USB_ERR_STALL;

From 34364df689ec64226f3d5de06e08a1844166a926 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 12:53:35 +0200
Subject: [PATCH 1249/1628] usbserial basic support. Works in qemu

---
 bus/usb/usb.c         |   3 +
 conf/i386-pc.rmk      |   6 ++
 include/grub/serial.h |  24 ++---
 term/ns8250.c         | 124 ++++++++++++++----------
 term/serial.c         |   1 -
 term/usbserial.c      | 212 ++++++++++++++++++------------------------
 6 files changed, 189 insertions(+), 181 deletions(-)

diff --git a/bus/usb/usb.c b/bus/usb/usb.c
index 804cbaff0..ba052e5ee 100644
--- a/bus/usb/usb.c
+++ b/bus/usb/usb.c
@@ -269,6 +269,9 @@ void grub_usb_device_attach (grub_usb_device_t dev)
 	case GRUB_USB_CLASS_HID:
 	  grub_dl_load ("usb_keyboard");
 	  break;
+	case 0xff:
+	  grub_dl_load ("usbserial");
+	  break;
 	}
     }
 }
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index c157aaf01..e1cfe1468 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -195,6 +195,12 @@ usb_mod_SOURCES = bus/usb/usb.c bus/usb/usbtrans.c bus/usb/usbhub.c
 usb_mod_CFLAGS = $(COMMON_CFLAGS)
 usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For serial.mod.
+pkglib_MODULES += usbserial.mod
+usbserial_mod_SOURCES = term/usbserial.c
+usbserial_mod_CFLAGS = $(COMMON_CFLAGS)
+usbserial_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # For usbtest.mod
 usbtest_mod_SOURCES = commands/usbtest.c
 usbtest_mod_CFLAGS = $(COMMON_CFLAGS)
diff --git a/include/grub/serial.h b/include/grub/serial.h
index 063282112..97e97004c 100644
--- a/include/grub/serial.h
+++ b/include/grub/serial.h
@@ -47,6 +47,7 @@ struct grub_serial_port
   unsigned int   parity;
   unsigned short stop_bits;
   struct grub_serial_driver *driver;
+  int configured;
   /* This should be void *data but since serial is useful as an early console
      when malloc isn't available it's a union.
    */
@@ -55,9 +56,9 @@ struct grub_serial_port
     grub_port_t port;
     struct
     {
-      grub_usb_device_t dev;
-      int in_endp;
-      int out_endp;
+      grub_usb_device_t usbdev;
+      struct grub_usb_desc_endp *in_endp;
+      struct grub_usb_desc_endp *out_endp;
     };
   };
 };
@@ -81,18 +82,19 @@ void grub_serial_unregister (struct grub_serial_port *port);
 #define UART_1_STOP_BIT		0x00
 #define UART_2_STOP_BITS	0x04
 
-static inline void
-grub_serial_fill_defaults (struct grub_serial_port *port)
-{
   /* Set default settings.  */
+static inline grub_err_t
+grub_serial_config_defaults (struct grub_serial_port *port)
+{
+  return port->driver->configure (port,
+
 #ifdef GRUB_MACHINE_MIPS_YEELOONG
-  port->speed     = 115200;
+				  115200,
 #else
-  port->speed     = 9600;
+				  9600,
 #endif
-  port->word_len  = UART_8BITS_WORD;
-  port->parity    = UART_NO_PARITY;
-  port->stop_bits = UART_1_STOP_BIT;
+				  UART_8BITS_WORD, UART_NO_PARITY,
+				  UART_1_STOP_BIT);
 }
 
 void grub_ns8250_init (void);
diff --git a/term/ns8250.c b/term/ns8250.c
index ee2eeb8f5..53e94b899 100644
--- a/term/ns8250.c
+++ b/term/ns8250.c
@@ -34,33 +34,6 @@ static const grub_port_t serial_hw_io_addr[] = GRUB_MACHINE_SERIAL_PORTS;
 #define GRUB_SERIAL_PORT_NUM (ARRAY_SIZE(serial_hw_io_addr))
 #endif
 
-/* Fetch a key.  */
-static int
-serial_hw_fetch (struct grub_serial_port *port)
-{
-  if (grub_inb (port->port + UART_LSR) & UART_DATA_READY)
-    return grub_inb (port->port + UART_RX);
-
-  return -1;
-}
-
-/* Put a character.  */
-static void
-serial_hw_put (struct grub_serial_port *port, const int c)
-{
-  unsigned int timeout = 100000;
-
-  /* Wait until the transmitter holding register is empty.  */
-  while ((grub_inb (port->port + UART_LSR) & UART_EMPTY_TRANSMITTER) == 0)
-    {
-      if (--timeout == 0)
-        /* There is something wrong. But what can I do?  */
-        return;
-    }
-
-  grub_outb (c, port->port + UART_TX);
-}
-
 /* Convert speed to divisor.  */
 static unsigned short
 serial_get_divisor (unsigned int speed)
@@ -99,29 +72,19 @@ serial_get_divisor (unsigned int speed)
   return 0;
 }
 
-/* Initialize a serial device. PORT is the port number for a serial device.
-   SPEED is a DTE-DTE speed which must be one of these: 2400, 4800, 9600,
-   19200, 38400, 57600 and 115200. WORD_LEN is the word length to be used
-   for the device. Likewise, PARITY is the type of the parity and
-   STOP_BIT_LEN is the length of the stop bit. The possible values for
-   WORD_LEN, PARITY and STOP_BIT_LEN are defined in the header file as
-   macros.  */
-static grub_err_t
-serial_hw_configure (struct grub_serial_port *port,
-		     unsigned speed, unsigned short word_len,
-		     unsigned int   parity, unsigned short stop_bits)
+static void
+do_real_config (struct grub_serial_port *port)
 {
+  int divisor;
   unsigned char status = 0;
-  unsigned short divisor;
 
-  divisor = serial_get_divisor (speed);
+  if (port->configured)
+    return;
+
+  divisor = serial_get_divisor (port->speed);
+  /* Shouldn't happen.  */
   if (divisor == 0)
-    return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad speed");
-
-  port->speed = speed;
-  port->word_len = word_len;
-  port->parity = parity;
-  port->stop_bits = stop_bits;
+    return;
 
   /* Turn off the interrupt.  */
   grub_outb (0, port->port + UART_IER);
@@ -153,7 +116,66 @@ serial_hw_configure (struct grub_serial_port *port,
 #endif
 
   /* Drain the input buffer.  */
-  while (serial_hw_fetch (port) != -1);
+  while (grub_inb (port->port + UART_LSR) & UART_DATA_READY)
+    grub_inb (port->port + UART_RX);
+
+  port->configured = 1;
+}
+
+/* Fetch a key.  */
+static int
+serial_hw_fetch (struct grub_serial_port *port)
+{
+  do_real_config (port);
+  if (grub_inb (port->port + UART_LSR) & UART_DATA_READY)
+    return grub_inb (port->port + UART_RX);
+
+  return -1;
+}
+
+/* Put a character.  */
+static void
+serial_hw_put (struct grub_serial_port *port, const int c)
+{
+  unsigned int timeout = 100000;
+
+  do_real_config (port);
+
+  /* Wait until the transmitter holding register is empty.  */
+  while ((grub_inb (port->port + UART_LSR) & UART_EMPTY_TRANSMITTER) == 0)
+    {
+      if (--timeout == 0)
+        /* There is something wrong. But what can I do?  */
+        return;
+    }
+
+  grub_outb (c, port->port + UART_TX);
+}
+
+/* Initialize a serial device. PORT is the port number for a serial device.
+   SPEED is a DTE-DTE speed which must be one of these: 2400, 4800, 9600,
+   19200, 38400, 57600 and 115200. WORD_LEN is the word length to be used
+   for the device. Likewise, PARITY is the type of the parity and
+   STOP_BIT_LEN is the length of the stop bit. The possible values for
+   WORD_LEN, PARITY and STOP_BIT_LEN are defined in the header file as
+   macros.  */
+static grub_err_t
+serial_hw_configure (struct grub_serial_port *port,
+		     unsigned speed, unsigned short word_len,
+		     unsigned int   parity, unsigned short stop_bits)
+{
+  unsigned short divisor;
+
+  divisor = serial_get_divisor (speed);
+  if (divisor == 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad speed");
+
+  port->speed = speed;
+  port->word_len = word_len;
+  port->parity = parity;
+  port->stop_bits = stop_bits;
+
+  port->configured = 0;
 
   /*  FIXME: should check if the serial terminal was found.  */
 
@@ -177,11 +199,15 @@ grub_ns8250_init (void)
   for (i = 0; i < GRUB_SERIAL_PORT_NUM; i++)
     if (serial_hw_io_addr[i])
       {
+	grub_err_t err;
 	grub_snprintf (com_names[i], sizeof (com_names[i]), "com%d", i);
 	com_ports[i].name = com_names[i];
 	com_ports[i].driver = &grub_ns8250_driver;
-	grub_serial_fill_defaults (&com_ports[i]);
 	com_ports[i].port = serial_hw_io_addr[i];
+	err = grub_serial_config_defaults (&com_ports[i]);
+	if (err)
+	  grub_print_error ();
+
 	grub_serial_register (&com_ports[i]);
       }
 }
@@ -204,7 +230,7 @@ grub_serial_ns8250_add_port (grub_port_t port)
       return NULL;
     }
   p->driver = &grub_ns8250_driver;
-  grub_serial_fill_defaults (p);
+  grub_serial_config_defaults (p);
   p->port = port;
   grub_serial_register (p);  
 
diff --git a/term/serial.c b/term/serial.c
index 1f54a83ec..d3b2ba143 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -315,7 +315,6 @@ grub_serial_unregister (struct grub_serial_port *port)
   /* FIXME */
 }
 
-
 static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(serial)
diff --git a/term/usbserial.c b/term/usbserial.c
index 5a63348fb..e25084548 100644
--- a/term/usbserial.c
+++ b/term/usbserial.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2000,2001,2002,2003,2004,2005,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2000,2001,2002,2003,2004,2005,2007,2008,2009,2010  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
@@ -16,150 +16,122 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <grub/machine/memory.h>
 #include <grub/serial.h>
-#include <grub/term.h>
 #include <grub/types.h>
 #include <grub/dl.h>
 #include <grub/misc.h>
-#include <grub/terminfo.h>
-#include <grub/cpu/io.h>
-#include <grub/extcmd.h>
-#include <grub/i18n.h>
-
-static unsigned int registered = 0;
-
-/* Argument options.  */
-static const struct grub_arg_option options[] =
-{
-  {"unit",   'u', 0, N_("Set the serial unit."),             0, ARG_TYPE_INT},
-  {"speed",  's', 0, N_("Set the serial port speed."),       0, ARG_TYPE_INT},
-  {"word",   'w', 0, N_("Set the serial port word length."), 0, ARG_TYPE_INT},
-  {"parity", 'r', 0, N_("Set the serial port parity."),      0, ARG_TYPE_STRING},
-  {"stop",   't', 0, N_("Set the serial port stop bits."),   0, ARG_TYPE_INT},
-  {0, 0, 0, 0, 0, 0}
-};
-
-/* Serial port settings.  */
-struct usbserial_port
-{
-  grub_usb_device_t usbdev;
-  int in_endp;
-  int out_endp;
-  unsigned short divisor;
-  unsigned short word_len;
-  unsigned int   parity;
-  unsigned short stop_bits;
-};
-
-/* Serial port settings.  */
-static struct serial_port serial_settings;
+#include <grub/mm.h>
+#include <grub/usb.h>
 
 /* Fetch a key.  */
 static int
-serial_hw_fetch (void)
+usbserial_hw_fetch (struct grub_serial_port *port)
 {
-  /* FIXME */
-  return -1;
+  char cc[3];
+  grub_usb_err_t err;
+  err = grub_usb_bulk_read (port->usbdev, port->in_endp->endp_addr, 2, cc);
+  if (err != GRUB_USB_ERR_NAK)
+    return -1;
+
+  err = grub_usb_bulk_read (port->usbdev, port->in_endp->endp_addr, 3, cc);
+  if (err != GRUB_USB_ERR_NONE)
+    return -1;
+
+  return cc[2];
 }
 
 /* Put a character.  */
 static void
-usbserial_hw_put (struct usbserial_port *port, const int c)
+usbserial_hw_put (struct grub_serial_port *port, const int c)
 {
   char cc = c;
-  grub_usb_bulk_write (port->usbdev, port->out_endp, 1, &cc);
+  grub_usb_bulk_write (port->usbdev, port->out_endp->endp_addr, 1, &cc);
 }
 
-static grub_uint16_t
-grub_serial_getwh (struct grub_term_output *term __attribute__ ((unused)))
+/* FIXME */
+static grub_err_t
+usbserial_hw_configure (struct grub_serial_port *port,
+			unsigned speed, unsigned short word_len,
+			unsigned int   parity, unsigned short stop_bits)
 {
-  const grub_uint8_t TEXT_WIDTH = 80;
-  const grub_uint8_t TEXT_HEIGHT = 24;
-  return (TEXT_WIDTH << 8) | TEXT_HEIGHT;
+  port->speed = speed;
+  port->word_len = word_len;
+  port->parity = parity;
+  port->stop_bits = stop_bits;
+
+  port->configured = 0;
+
+  return GRUB_ERR_NONE;
 }
 
-struct grub_terminfo_input_state grub_serial_terminfo_input =
-  {
-    .readkey = serial_hw_fetch
-  };
-
-struct grub_terminfo_output_state grub_serial_terminfo_output =
+static struct grub_serial_driver grub_usbserial_driver =
   {
+    .configure = usbserial_hw_configure,
+    .fetch = usbserial_hw_fetch,
     .put = usbserial_hw_put
   };
 
-static struct grub_term_input grub_serial_term_input =
+static int
+grub_usbserial_attach (grub_usb_device_t usbdev, int configno, int interfno)
 {
-  .name = "usbserial",
-  .init = grub_terminfo_input_init,
-  .checkkey = grub_terminfo_checkkey,
-  .getkey = grub_terminfo_getkey,
-  .data = &grub_serial_terminfo_input
-};
+  static struct grub_serial_port *port;
+  int j;
+  struct grub_usb_desc_if *interf
+    = usbdev->config[configno].interf[interfno].descif;
 
-static struct grub_term_output grub_serial_term_output =
-{
-  .name = "usbserial",
-  .putchar = grub_terminfo_putchar,
-  .getwh = grub_serial_getwh,
-  .getxy = grub_terminfo_getxy,
-  .gotoxy = grub_terminfo_gotoxy,
-  .cls = grub_terminfo_cls,
-  .setcolorstate = grub_terminfo_setcolorstate,
-  .setcursor = grub_terminfo_setcursor,
-  .flags = GRUB_TERM_CODE_TYPE_ASCII,
-  .data = &grub_serial_terminfo_output,
-  .normal_color = GRUB_TERM_DEFAULT_NORMAL_COLOR,
-  .highlight_color = GRUB_TERM_DEFAULT_HIGHLIGHT_COLOR,
-};
-
-
-
-
-static grub_extcmd_t cmd;
-
-GRUB_MOD_INIT(serial)
-{
-  cmd = grub_register_extcmd ("serial", grub_cmd_serial,
-			      GRUB_COMMAND_FLAG_BOTH,
-			      N_("[OPTIONS...]"),
-			      N_("Configure serial port."), options);
-
-  /* Set default settings.  */
-  serial_settings.port      = serial_hw_get_port (0);
-#ifdef GRUB_MACHINE_MIPS_YEELOONG
-  serial_settings.divisor   = serial_get_divisor (115200);
-#else
-  serial_settings.divisor   = serial_get_divisor (9600);
-#endif
-  serial_settings.word_len  = UART_8BITS_WORD;
-  serial_settings.parity    = UART_NO_PARITY;
-  serial_settings.stop_bits = UART_1_STOP_BIT;
-
-#ifdef GRUB_MACHINE_MIPS_YEELOONG
-  {
-    grub_err_t hwiniterr;
-    hwiniterr = serial_hw_init ();
-
-    if (hwiniterr == GRUB_ERR_NONE)
-      {
-	grub_term_register_input_active ("serial", &grub_serial_term_input);
-	grub_term_register_output_active ("serial", &grub_serial_term_output);
-
-	registered = 1;
-      }
-  }
-#endif
-}
-
-GRUB_MOD_FINI(serial)
-{
-  grub_unregister_extcmd (cmd);
-  if (registered == 1)		/* Unregister terminal only if registered. */
+  port = grub_malloc (sizeof (*port));
+  if (!port)
     {
-      grub_term_unregister_input (&grub_serial_term_input);
-      grub_term_unregister_output (&grub_serial_term_output);
-      grub_terminfo_output_unregister (&grub_serial_term_output);
+      grub_print_error ();
+      return 0;
     }
+
+  port->name = grub_xasprintf ("usb%d", usbdev->addr);
+  if (!port->name)
+    {
+      grub_free (port);
+      grub_print_error ();
+      return 0;
+    }
+
+  port->usbdev = usbdev;
+  port->driver = &grub_usbserial_driver;
+  for (j = 0; j < interf->endpointcnt; j++)
+    {
+      struct grub_usb_desc_endp *endp;
+      endp = &usbdev->config[0].interf[interfno].descendp[j];
+
+      if ((endp->endp_addr & 128) && (endp->attrib & 3) == 2)
+	{
+	  /* Bulk IN endpoint.  */
+	  port->in_endp = endp;
+	}
+      else if (!(endp->endp_addr & 128) && (endp->attrib & 3) == 2)
+	{
+	  /* Bulk OUT endpoint.  */
+	  port->out_endp = endp;
+	}
+    }
+  if (!port->out_endp || !port->in_endp)
+    {
+      grub_free (port->name);
+      grub_free (port);
+      return 0;
+    }
+
+  grub_serial_config_defaults (port);
+  grub_serial_register (port);
+
+  return 1;
+}
+
+struct grub_usb_attach_desc attach_hook =
+{
+  .class = 0xff,
+  .hook = grub_usbserial_attach
+};
+
+GRUB_MOD_INIT(usbserial)
+{
+  grub_usb_register_attach_hook_class (&attach_hook);
 }

From 8c8e2699068c433c069004431354d4f3361924f5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 13:40:48 +0200
Subject: [PATCH 1250/1628] Encapsulate serial config in dedicated structure

---
 include/grub/serial.h | 35 +++++++++++++++++++++--------------
 include/grub/usb.h    |  5 +++++
 term/ns8250.c         | 16 ++++++----------
 term/serial.c         | 32 +++++++++++++-------------------
 term/usbserial.c      | 24 +++++++++++++++++-------
 5 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/include/grub/serial.h b/include/grub/serial.h
index 97e97004c..7828a7c98 100644
--- a/include/grub/serial.h
+++ b/include/grub/serial.h
@@ -26,27 +26,30 @@
 #include <grub/list.h>
 
 struct grub_serial_port;
+struct grub_serial_config;
 
 struct grub_serial_driver
 {
   grub_err_t (*configure) (struct grub_serial_port *port,
-			   unsigned speed,
-			   unsigned short word_len,
-			   unsigned int   parity,
-			   unsigned short stop_bits);
+			   struct grub_serial_config *config);
   int (*fetch) (struct grub_serial_port *port);
   void (*put) (struct grub_serial_port *port, const int c);
 };
 
+struct grub_serial_config
+{
+  unsigned speed;
+  unsigned short word_len;
+  unsigned int   parity;
+  unsigned short stop_bits;
+};
+
 struct grub_serial_port
 {
   struct grub_serial_port *next;
   char *name;
-  unsigned speed;
-  unsigned short word_len;
-  unsigned int   parity;
-  unsigned short stop_bits;
   struct grub_serial_driver *driver;
+  struct grub_serial_config config;
   int configured;
   /* This should be void *data but since serial is useful as an early console
      when malloc isn't available it's a union.
@@ -86,15 +89,19 @@ void grub_serial_unregister (struct grub_serial_port *port);
 static inline grub_err_t
 grub_serial_config_defaults (struct grub_serial_port *port)
 {
-  return port->driver->configure (port,
-
+  struct grub_serial_config config =
+    {
 #ifdef GRUB_MACHINE_MIPS_YEELOONG
-				  115200,
+      .speed = 115200,
 #else
-				  9600,
+      .speed = 9600,
 #endif
-				  UART_8BITS_WORD, UART_NO_PARITY,
-				  UART_1_STOP_BIT);
+      .word_len = UART_8BITS_WORD,
+      .parity = UART_NO_PARITY,
+      .stop_bits = UART_1_STOP_BIT
+    };
+
+  return port->driver->configure (port, &config);
 }
 
 void grub_ns8250_init (void);
diff --git a/include/grub/usb.h b/include/grub/usb.h
index f9c3d61ff..b3acd3c5e 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -48,6 +48,11 @@ typedef enum
     GRUB_USB_SPEED_HIGH
   } grub_usb_speed_t;
 
+enum
+  {
+    GRUB_USB_REQTYPE_VENDOR_OUT = 0x40
+  };
+
 /* Call HOOK with each device, until HOOK returns non-zero.  */
 int grub_usb_iterate (int (*hook) (grub_usb_device_t dev));
 
diff --git a/term/ns8250.c b/term/ns8250.c
index 53e94b899..c63bc6494 100644
--- a/term/ns8250.c
+++ b/term/ns8250.c
@@ -81,7 +81,7 @@ do_real_config (struct grub_serial_port *port)
   if (port->configured)
     return;
 
-  divisor = serial_get_divisor (port->speed);
+  divisor = serial_get_divisor (port->config.speed);
   /* Shouldn't happen.  */
   if (divisor == 0)
     return;
@@ -97,7 +97,8 @@ do_real_config (struct grub_serial_port *port)
   grub_outb (divisor >> 8, port->port + UART_DLH);
 
   /* Set the line status.  */
-  status |= (port->parity | port->word_len | port->stop_bits);
+  status |= (port->config.parity | port->config.word_len
+	     | port->config.stop_bits);
   grub_outb (status, port->port + UART_LCR);
 
   /* In Yeeloong serial port has only 3 wires.  */
@@ -161,20 +162,15 @@ serial_hw_put (struct grub_serial_port *port, const int c)
    macros.  */
 static grub_err_t
 serial_hw_configure (struct grub_serial_port *port,
-		     unsigned speed, unsigned short word_len,
-		     unsigned int   parity, unsigned short stop_bits)
+		     struct grub_serial_config *config)
 {
   unsigned short divisor;
 
-  divisor = serial_get_divisor (speed);
+  divisor = serial_get_divisor (config->speed);
   if (divisor == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad speed");
 
-  port->speed = speed;
-  port->word_len = word_len;
-  port->parity = parity;
-  port->stop_bits = stop_bits;
-
+  port->config = *config;
   port->configured = 0;
 
   /*  FIXME: should check if the serial terminal was found.  */
diff --git a/term/serial.c b/term/serial.c
index d3b2ba143..00214cb4c 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -154,10 +154,7 @@ grub_cmd_serial (grub_extcmd_t cmd, int argc, char **args)
   char pname[40];
   char *name = NULL;
   struct grub_serial_port *port;
-  signed speed = -1;
-  signed short word_len = -1;
-  signed int   parity = -1;
-  signed short stop_bits = -1;
+  struct grub_serial_config config;
   grub_err_t err;
 
   if (state[0].set)
@@ -184,24 +181,21 @@ grub_cmd_serial (grub_extcmd_t cmd, int argc, char **args)
   if (!port)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown serial port");
 
-  speed = port->speed;
-  word_len = port->word_len;
-  parity = port->parity;
-  stop_bits = port->stop_bits;
+  config = port->config;
 
   if (state[2].set)
-    speed = grub_strtoul (state[2].arg, 0, 0);
+    config.speed = grub_strtoul (state[2].arg, 0, 0);
 
   if (state[3].set)
     {
       if (! grub_strcmp (state[3].arg, "5"))
-	word_len = UART_5BITS_WORD;
+	config.word_len = UART_5BITS_WORD;
       else if (! grub_strcmp (state[3].arg, "6"))
-	word_len = UART_6BITS_WORD;
+	config.word_len = UART_6BITS_WORD;
       else if (! grub_strcmp (state[3].arg, "7"))
-	word_len = UART_7BITS_WORD;
+	config.word_len = UART_7BITS_WORD;
       else if (! grub_strcmp (state[3].arg, "8"))
-	word_len = UART_8BITS_WORD;
+	config.word_len = UART_8BITS_WORD;
       else
 	return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad word length");
     }
@@ -209,11 +203,11 @@ grub_cmd_serial (grub_extcmd_t cmd, int argc, char **args)
   if (state[4].set)
     {
       if (! grub_strcmp (state[4].arg, "no"))
-	parity = UART_NO_PARITY;
+	config.parity = UART_NO_PARITY;
       else if (! grub_strcmp (state[4].arg, "odd"))
-	parity = UART_ODD_PARITY;
+	config.parity = UART_ODD_PARITY;
       else if (! grub_strcmp (state[4].arg, "even"))
-	parity = UART_EVEN_PARITY;
+	config.parity = UART_EVEN_PARITY;
       else
 	return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad parity");
     }
@@ -221,15 +215,15 @@ grub_cmd_serial (grub_extcmd_t cmd, int argc, char **args)
   if (state[5].set)
     {
       if (! grub_strcmp (state[5].arg, "1"))
-	stop_bits = UART_1_STOP_BIT;
+	config.stop_bits = UART_1_STOP_BIT;
       else if (! grub_strcmp (state[5].arg, "2"))
-	stop_bits = UART_2_STOP_BITS;
+	config.stop_bits = UART_2_STOP_BITS;
       else
 	return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad number of stop bits");
     }
 
   /* Initialize with new settings.  */
-  err = port->driver->configure (port, speed, word_len, parity, stop_bits);
+  err = port->driver->configure (port, &config);
   if (err)
     return err;
   if (!registered)
diff --git a/term/usbserial.c b/term/usbserial.c
index e25084548..258187ff9 100644
--- a/term/usbserial.c
+++ b/term/usbserial.c
@@ -23,12 +23,24 @@
 #include <grub/mm.h>
 #include <grub/usb.h>
 
+static void
+real_config (struct grub_serial_port *port)
+{
+  if (port->configured)
+    return;
+
+  port->configured = 1;
+}
+
 /* Fetch a key.  */
 static int
 usbserial_hw_fetch (struct grub_serial_port *port)
 {
   char cc[3];
   grub_usb_err_t err;
+
+  real_config (port);
+
   err = grub_usb_bulk_read (port->usbdev, port->in_endp->endp_addr, 2, cc);
   if (err != GRUB_USB_ERR_NAK)
     return -1;
@@ -45,20 +57,18 @@ static void
 usbserial_hw_put (struct grub_serial_port *port, const int c)
 {
   char cc = c;
+
+  real_config (port);
+
   grub_usb_bulk_write (port->usbdev, port->out_endp->endp_addr, 1, &cc);
 }
 
 /* FIXME */
 static grub_err_t
 usbserial_hw_configure (struct grub_serial_port *port,
-			unsigned speed, unsigned short word_len,
-			unsigned int   parity, unsigned short stop_bits)
+			struct grub_serial_config *config)
 {
-  port->speed = speed;
-  port->word_len = word_len;
-  port->parity = parity;
-  port->stop_bits = stop_bits;
-
+  port->config = *config;
   port->configured = 0;
 
   return GRUB_ERR_NONE;

From 1da07b142b14c60c5527c5bbdd644335fd3a76ee Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 14:43:23 +0200
Subject: [PATCH 1251/1628] some serial config support

---
 include/grub/serial.h | 31 +++++++++-------
 term/ns8250.c         | 25 ++++++++++---
 term/serial.c         | 10 +++---
 term/usbserial.c      | 82 ++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 124 insertions(+), 24 deletions(-)

diff --git a/include/grub/serial.h b/include/grub/serial.h
index 7828a7c98..5afc1f172 100644
--- a/include/grub/serial.h
+++ b/include/grub/serial.h
@@ -36,12 +36,26 @@ struct grub_serial_driver
   void (*put) (struct grub_serial_port *port, const int c);
 };
 
+/* The type of parity.  */
+typedef enum
+  {
+    GRUB_SERIAL_PARITY_NONE,
+    GRUB_SERIAL_PARITY_ODD,
+    GRUB_SERIAL_PARITY_EVEN,
+  } grub_serial_parity_t;
+
+typedef enum
+  {
+    GRUB_SERIAL_STOP_BITS_1,
+    GRUB_SERIAL_STOP_BITS_2,
+  } grub_serial_stop_bits_t;
+
 struct grub_serial_config
 {
   unsigned speed;
   unsigned short word_len;
-  unsigned int   parity;
-  unsigned short stop_bits;
+  grub_serial_parity_t parity;
+  grub_serial_stop_bits_t stop_bits;
 };
 
 struct grub_serial_port
@@ -76,15 +90,6 @@ void grub_serial_unregister (struct grub_serial_port *port);
 #define UART_7BITS_WORD	0x02
 #define UART_8BITS_WORD	0x03
 
-/* The type of parity.  */
-#define UART_NO_PARITY		0x00
-#define UART_ODD_PARITY		0x08
-#define UART_EVEN_PARITY	0x18
-
-/* The type of the length of stop bit.  */
-#define UART_1_STOP_BIT		0x00
-#define UART_2_STOP_BITS	0x04
-
   /* Set default settings.  */
 static inline grub_err_t
 grub_serial_config_defaults (struct grub_serial_port *port)
@@ -97,8 +102,8 @@ grub_serial_config_defaults (struct grub_serial_port *port)
       .speed = 9600,
 #endif
       .word_len = UART_8BITS_WORD,
-      .parity = UART_NO_PARITY,
-      .stop_bits = UART_1_STOP_BIT
+      .parity = GRUB_SERIAL_PARITY_NONE,
+      .stop_bits = GRUB_SERIAL_STOP_BITS_1
     };
 
   return port->driver->configure (port, &config);
diff --git a/term/ns8250.c b/term/ns8250.c
index c63bc6494..a69c683f2 100644
--- a/term/ns8250.c
+++ b/term/ns8250.c
@@ -77,14 +77,20 @@ do_real_config (struct grub_serial_port *port)
 {
   int divisor;
   unsigned char status = 0;
+  const unsigned char parities[] = {
+    [GRUB_SERIAL_PARITY_NONE] = UART_NO_PARITY,
+    [GRUB_SERIAL_PARITY_ODD] = UART_ODD_PARITY,
+    [GRUB_SERIAL_PARITY_EVEN] = UART_EVEN_PARITY
+  };
+  const unsigned char stop_bits[] = {
+    [GRUB_SERIAL_STOP_BITS_1] = UART_1_STOP_BIT,
+    [GRUB_SERIAL_STOP_BITS_2] = UART_2_STOP_BITS,
+  };
 
   if (port->configured)
     return;
 
   divisor = serial_get_divisor (port->config.speed);
-  /* Shouldn't happen.  */
-  if (divisor == 0)
-    return;
 
   /* Turn off the interrupt.  */
   grub_outb (0, port->port + UART_IER);
@@ -97,8 +103,8 @@ do_real_config (struct grub_serial_port *port)
   grub_outb (divisor >> 8, port->port + UART_DLH);
 
   /* Set the line status.  */
-  status |= (port->config.parity | port->config.word_len
-	     | port->config.stop_bits);
+  status |= (parities[port->config.parity]
+	     | port->config.word_len | stop_bits[port->config.stop_bits]);
   grub_outb (status, port->port + UART_LCR);
 
   /* In Yeeloong serial port has only 3 wires.  */
@@ -170,6 +176,15 @@ serial_hw_configure (struct grub_serial_port *port,
   if (divisor == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad speed");
 
+  if (config->parity != GRUB_SERIAL_PARITY_NONE
+      && config->parity != GRUB_SERIAL_PARITY_ODD
+      && config->parity != GRUB_SERIAL_PARITY_EVEN)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported parity");
+
+  if (config->stop_bits != GRUB_SERIAL_STOP_BITS_1
+      && config->stop_bits != GRUB_SERIAL_STOP_BITS_2)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported stop bits");
+
   port->config = *config;
   port->configured = 0;
 
diff --git a/term/serial.c b/term/serial.c
index 00214cb4c..5f27b16b6 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -203,11 +203,11 @@ grub_cmd_serial (grub_extcmd_t cmd, int argc, char **args)
   if (state[4].set)
     {
       if (! grub_strcmp (state[4].arg, "no"))
-	config.parity = UART_NO_PARITY;
+	config.parity = GRUB_SERIAL_PARITY_NONE;
       else if (! grub_strcmp (state[4].arg, "odd"))
-	config.parity = UART_ODD_PARITY;
+	config.parity = GRUB_SERIAL_PARITY_ODD;
       else if (! grub_strcmp (state[4].arg, "even"))
-	config.parity = UART_EVEN_PARITY;
+	config.parity = GRUB_SERIAL_PARITY_EVEN;
       else
 	return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad parity");
     }
@@ -215,9 +215,9 @@ grub_cmd_serial (grub_extcmd_t cmd, int argc, char **args)
   if (state[5].set)
     {
       if (! grub_strcmp (state[5].arg, "1"))
-	config.stop_bits = UART_1_STOP_BIT;
+	config.stop_bits = GRUB_SERIAL_STOP_BITS_1;
       else if (! grub_strcmp (state[5].arg, "2"))
-	config.stop_bits = UART_2_STOP_BITS;
+	config.stop_bits = GRUB_SERIAL_STOP_BITS_2;
       else
 	return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad number of stop bits");
     }
diff --git a/term/usbserial.c b/term/usbserial.c
index 258187ff9..b2a89d56c 100644
--- a/term/usbserial.c
+++ b/term/usbserial.c
@@ -23,12 +23,78 @@
 #include <grub/mm.h>
 #include <grub/usb.h>
 
+enum
+  {
+    GRUB_USBSERIAL_MODEM_CTRL = 0x01,
+    GRUB_USBSERIAL_FLOW_CTRL = 0x02,
+    GRUB_USBSERIAL_SPEED_CTRL = 0x03,
+    GRUB_USBSERIAL_DATA_CTRL = 0x04
+  };
+
+#define GRUB_USBSERIAL_MODEM_CTRL_DTRRTS 3
+#define GRUB_USBSERIAL_FLOW_CTRL_DTRRTS 3
+
+/* Convert speed to divisor.  */
+static grub_uint32_t
+get_divisor (unsigned int speed)
+{
+  unsigned int i;
+
+  /* The structure for speed vs. divisor.  */
+  struct divisor
+  {
+    unsigned int speed;
+    grub_uint32_t div;
+  };
+
+  /* The table which lists common configurations.  */
+  static struct divisor divisor_tab[] =
+    {
+      { 9600,   0x4138 },
+    };
+
+  /* Set the baud rate.  */
+  for (i = 0; i < sizeof (divisor_tab) / sizeof (divisor_tab[0]); i++)
+    if (divisor_tab[i].speed == speed)
+      return divisor_tab[i].div;
+  return 0;
+}
+
 static void
 real_config (struct grub_serial_port *port)
 {
+  grub_uint32_t divisor;
+  const grub_uint16_t parities[] = {
+    [GRUB_SERIAL_PARITY_NONE] = 0x0000,
+    [GRUB_SERIAL_PARITY_ODD] = 0x0100,
+    [GRUB_SERIAL_PARITY_EVEN] = 0x0200
+  };
+  const grub_uint16_t stop_bits[] = {
+    [GRUB_SERIAL_STOP_BITS_1] = 0x0000,
+    [GRUB_SERIAL_STOP_BITS_2] = 0x1000,
+  };
+
   if (port->configured)
     return;
 
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
+			GRUB_USBSERIAL_MODEM_CTRL,
+			GRUB_USBSERIAL_MODEM_CTRL_DTRRTS, 0, 0, 0);
+
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
+			GRUB_USBSERIAL_FLOW_CTRL,
+			GRUB_USBSERIAL_FLOW_CTRL_DTRRTS, 0, 0, 0);
+
+  divisor = get_divisor (port->config.speed);
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
+			GRUB_USBSERIAL_SPEED_CTRL,
+			divisor & 0xffff, divisor >> 16, 0, 0);
+
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
+			GRUB_USBSERIAL_DATA_CTRL,
+			parities[port->config.parity]
+			| stop_bits[port->config.stop_bits] , 0, 0, 0);
+
   port->configured = 1;
 }
 
@@ -63,11 +129,25 @@ usbserial_hw_put (struct grub_serial_port *port, const int c)
   grub_usb_bulk_write (port->usbdev, port->out_endp->endp_addr, 1, &cc);
 }
 
-/* FIXME */
 static grub_err_t
 usbserial_hw_configure (struct grub_serial_port *port,
 			struct grub_serial_config *config)
 {
+  grub_uint16_t divisor;
+
+  divisor = get_divisor (config->speed);
+  if (divisor == 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad speed");
+
+  if (config->parity != GRUB_SERIAL_PARITY_NONE
+      && config->parity != GRUB_SERIAL_PARITY_ODD
+      && config->parity != GRUB_SERIAL_PARITY_EVEN)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported parity");
+
+  if (config->stop_bits != GRUB_SERIAL_STOP_BITS_1
+      && config->stop_bits != GRUB_SERIAL_STOP_BITS_2)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported stop bits");
+
   port->config = *config;
   port->configured = 0;
 

From 91d135a12c6be53cd67f9b45b7c4d9c6f957aea7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 15:00:50 +0200
Subject: [PATCH 1252/1628] Support variable speed

---
 term/ns8250.c    | 2 +-
 term/usbserial.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/term/ns8250.c b/term/ns8250.c
index a69c683f2..9677913be 100644
--- a/term/ns8250.c
+++ b/term/ns8250.c
@@ -61,7 +61,7 @@ serial_get_divisor (unsigned int speed)
     };
 
   /* Set the baud rate.  */
-  for (i = 0; i < sizeof (divisor_tab) / sizeof (divisor_tab[0]); i++)
+  for (i = 0; i < ARRAY_SIZE (divisor_tab); i++)
     if (divisor_tab[i].speed == speed)
   /* UART in Yeeloong runs twice the usual rate.  */
 #ifdef GRUB_MACHINE_MIPS_YEELOONG
diff --git a/term/usbserial.c b/term/usbserial.c
index b2a89d56c..7a5aead2c 100644
--- a/term/usbserial.c
+++ b/term/usbserial.c
@@ -48,13 +48,20 @@ get_divisor (unsigned int speed)
   };
 
   /* The table which lists common configurations.  */
+  /* Computed with a division formula with 3MHz as base frequency. */
   static struct divisor divisor_tab[] =
     {
+      { 2400,   0x04e2 },
+      { 4800,   0x0271 },
       { 9600,   0x4138 },
+      { 19200,  0x809c },
+      { 38400,  0xc04e },
+      { 57600,  0xc034 },
+      { 115200, 0x001a }
     };
 
   /* Set the baud rate.  */
-  for (i = 0; i < sizeof (divisor_tab) / sizeof (divisor_tab[0]); i++)
+  for (i = 0; i < ARRAY_SIZE (divisor_tab); i++)
     if (divisor_tab[i].speed == speed)
       return divisor_tab[i].div;
   return 0;

From fd5b6637939816e80ed8bb7fc6efb68b9f174a7b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 15:07:59 +0200
Subject: [PATCH 1253/1628] Configure word length

---
 include/grub/ns8250.h |  6 ++++++
 include/grub/serial.h | 10 ++--------
 term/ns8250.c         |  6 +++++-
 term/serial.c         | 13 +------------
 term/usbserial.c      |  6 +++++-
 5 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/include/grub/ns8250.h b/include/grub/ns8250.h
index f21a1a3e3..f8b9c3a8c 100644
--- a/include/grub/ns8250.h
+++ b/include/grub/ns8250.h
@@ -45,6 +45,12 @@
 #define UART_ODD_PARITY		0x08
 #define UART_EVEN_PARITY	0x18
 
+/* The type of word length.  */
+#define UART_5BITS_WORD	0x00
+#define UART_6BITS_WORD	0x01
+#define UART_7BITS_WORD	0x02
+#define UART_8BITS_WORD	0x03
+
 /* The type of the length of stop bit.  */
 #define UART_1_STOP_BIT		0x00
 #define UART_2_STOP_BITS	0x04
diff --git a/include/grub/serial.h b/include/grub/serial.h
index 5afc1f172..e66dcf80d 100644
--- a/include/grub/serial.h
+++ b/include/grub/serial.h
@@ -53,7 +53,7 @@ typedef enum
 struct grub_serial_config
 {
   unsigned speed;
-  unsigned short word_len;
+  int word_len;
   grub_serial_parity_t parity;
   grub_serial_stop_bits_t stop_bits;
 };
@@ -84,12 +84,6 @@ grub_err_t grub_serial_register (struct grub_serial_port *port);
 
 void grub_serial_unregister (struct grub_serial_port *port);
 
-/* The type of word length.  */
-#define UART_5BITS_WORD	0x00
-#define UART_6BITS_WORD	0x01
-#define UART_7BITS_WORD	0x02
-#define UART_8BITS_WORD	0x03
-
   /* Set default settings.  */
 static inline grub_err_t
 grub_serial_config_defaults (struct grub_serial_port *port)
@@ -101,7 +95,7 @@ grub_serial_config_defaults (struct grub_serial_port *port)
 #else
       .speed = 9600,
 #endif
-      .word_len = UART_8BITS_WORD,
+      .word_len = 8,
       .parity = GRUB_SERIAL_PARITY_NONE,
       .stop_bits = GRUB_SERIAL_STOP_BITS_1
     };
diff --git a/term/ns8250.c b/term/ns8250.c
index 9677913be..93a5e215e 100644
--- a/term/ns8250.c
+++ b/term/ns8250.c
@@ -104,7 +104,8 @@ do_real_config (struct grub_serial_port *port)
 
   /* Set the line status.  */
   status |= (parities[port->config.parity]
-	     | port->config.word_len | stop_bits[port->config.stop_bits]);
+	     | (port->config.word_len - 5)
+	     | stop_bits[port->config.stop_bits]);
   grub_outb (status, port->port + UART_LCR);
 
   /* In Yeeloong serial port has only 3 wires.  */
@@ -185,6 +186,9 @@ serial_hw_configure (struct grub_serial_port *port,
       && config->stop_bits != GRUB_SERIAL_STOP_BITS_2)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported stop bits");
 
+  if (config->word_len < 5 || config->word_len > 8)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported word length");
+
   port->config = *config;
   port->configured = 0;
 
diff --git a/term/serial.c b/term/serial.c
index 5f27b16b6..aeaec5c88 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -187,18 +187,7 @@ grub_cmd_serial (grub_extcmd_t cmd, int argc, char **args)
     config.speed = grub_strtoul (state[2].arg, 0, 0);
 
   if (state[3].set)
-    {
-      if (! grub_strcmp (state[3].arg, "5"))
-	config.word_len = UART_5BITS_WORD;
-      else if (! grub_strcmp (state[3].arg, "6"))
-	config.word_len = UART_6BITS_WORD;
-      else if (! grub_strcmp (state[3].arg, "7"))
-	config.word_len = UART_7BITS_WORD;
-      else if (! grub_strcmp (state[3].arg, "8"))
-	config.word_len = UART_8BITS_WORD;
-      else
-	return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad word length");
-    }
+    config.word_len = grub_strtoul (state[3].arg, 0, 0);
 
   if (state[4].set)
     {
diff --git a/term/usbserial.c b/term/usbserial.c
index 7a5aead2c..b27df8ae2 100644
--- a/term/usbserial.c
+++ b/term/usbserial.c
@@ -100,7 +100,8 @@ real_config (struct grub_serial_port *port)
   grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
 			GRUB_USBSERIAL_DATA_CTRL,
 			parities[port->config.parity]
-			| stop_bits[port->config.stop_bits] , 0, 0, 0);
+			| stop_bits[port->config.stop_bits]
+			| port->config.word_len, 0, 0, 0);
 
   port->configured = 1;
 }
@@ -155,6 +156,9 @@ usbserial_hw_configure (struct grub_serial_port *port,
       && config->stop_bits != GRUB_SERIAL_STOP_BITS_2)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported stop bits");
 
+  if (config->word_len < 5 || config->word_len > 8)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported word length");
+
   port->config = *config;
   port->configured = 0;
 

From dd20a7868b291fd5fe6cfc8625f5eca733bf1b74 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 16:31:42 +0200
Subject: [PATCH 1254/1628] Rename usbserial to usbserial_ftdi

---
 term/usbserial.c => bus/usb/serial/ftdi.c | 32 ++++++++++++++++++++---
 bus/usb/usb.c                             |  3 ++-
 conf/i386-pc.rmk                          |  8 +++---
 3 files changed, 34 insertions(+), 9 deletions(-)
 rename term/usbserial.c => bus/usb/serial/ftdi.c (90%)

diff --git a/term/usbserial.c b/bus/usb/serial/ftdi.c
similarity index 90%
rename from term/usbserial.c
rename to bus/usb/serial/ftdi.c
index b27df8ae2..c7a7554ee 100644
--- a/term/usbserial.c
+++ b/bus/usb/serial/ftdi.c
@@ -172,13 +172,22 @@ static struct grub_serial_driver grub_usbserial_driver =
     .put = usbserial_hw_put
   };
 
+static const struct 
+{
+  grub_uint16_t vendor, product;
+} products[] =
+  {
+    {0x0403, 0x6001} /* QEMU virtual USBserial.  */
+  };
+
 static int
-grub_usbserial_attach (grub_usb_device_t usbdev, int configno, int interfno)
+grub_ftdi_attach (grub_usb_device_t usbdev, int configno, int interfno)
 {
   static struct grub_serial_port *port;
   int j;
-  struct grub_usb_desc_if *interf
-    = usbdev->config[configno].interf[interfno].descif;
+  struct grub_usb_desc_if *interf;
+
+  interf = usbdev->config[configno].interf[interfno].descif;
 
   port = grub_malloc (sizeof (*port));
   if (!port)
@@ -226,13 +235,28 @@ grub_usbserial_attach (grub_usb_device_t usbdev, int configno, int interfno)
   return 1;
 }
 
+static int
+grub_usbserial_attach (grub_usb_device_t usbdev, int configno, int interfno)
+{
+  unsigned j;
+
+  for (j = 0; j < ARRAY_SIZE (products); j++)
+    if (usbdev->descdev.vendorid == products[j].vendor
+	&& usbdev->descdev.prodid == products[j].product)
+      break;
+  if (j == ARRAY_SIZE (products))
+    return 0;
+
+  return grub_ftdi_attach (usbdev, configno, interfno);
+}
+
 struct grub_usb_attach_desc attach_hook =
 {
   .class = 0xff,
   .hook = grub_usbserial_attach
 };
 
-GRUB_MOD_INIT(usbserial)
+GRUB_MOD_INIT(usbserial_ftdi)
 {
   grub_usb_register_attach_hook_class (&attach_hook);
 }
diff --git a/bus/usb/usb.c b/bus/usb/usb.c
index ba052e5ee..b49caacdb 100644
--- a/bus/usb/usb.c
+++ b/bus/usb/usb.c
@@ -270,7 +270,8 @@ void grub_usb_device_attach (grub_usb_device_t dev)
 	  grub_dl_load ("usb_keyboard");
 	  break;
 	case 0xff:
-	  grub_dl_load ("usbserial");
+	  /* FIXME: don't load useless modules.  */
+	  grub_dl_load ("usbserial_ftdi");
 	  break;
 	}
     }
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index e1cfe1468..2e95133f3 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -196,10 +196,10 @@ usb_mod_CFLAGS = $(COMMON_CFLAGS)
 usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For serial.mod.
-pkglib_MODULES += usbserial.mod
-usbserial_mod_SOURCES = term/usbserial.c
-usbserial_mod_CFLAGS = $(COMMON_CFLAGS)
-usbserial_mod_LDFLAGS = $(COMMON_LDFLAGS)
+pkglib_MODULES += usbserial_ftdi.mod
+usbserial_ftdi_mod_SOURCES = bus/usb/serial/ftdi.c
+usbserial_ftdi_mod_CFLAGS = $(COMMON_CFLAGS)
+usbserial_ftdi_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For usbtest.mod
 usbtest_mod_SOURCES = commands/usbtest.c

From 139ab97dc3035212e28d7890f6ec0773ca5103ee Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sun, 18 Jul 2010 15:53:14 +0100
Subject: [PATCH 1255/1628] * disk/raid.c (insert_array): Use md/%s to name
 mdadm 1.x devices, removing the homehost if present. * kern/emu/getroot.c
 (get_mdadm_name) [__linux__]: New function. (grub_util_get_grub_dev): Use
 md/%s to name mdadm 1.x devices, removing the homehost if present.
 (grub_util_get_grub_dev) [__linux__]: Get the array name from mdadm if
 possible. * util/i386/pc/grub-setup.c (main): Handle md/* devices.

---
 ChangeLog.raid            |  11 +++++
 disk/raid.c               |   9 +++-
 kern/emu/getroot.c        | 101 +++++++++++++++++++++++++++++++++++++-
 util/i386/pc/grub-setup.c |   4 +-
 4 files changed, 120 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.raid b/ChangeLog.raid
index 989f0bc09..c546a7632 100644
--- a/ChangeLog.raid
+++ b/ChangeLog.raid
@@ -1,3 +1,14 @@
+2010-07-18  Colin Watson  <cjwatson@ubuntu.com>
+
+	* disk/raid.c (insert_array): Use md/%s to name mdadm 1.x devices,
+	removing the homehost if present.
+	* kern/emu/getroot.c (get_mdadm_name) [__linux__]: New function.
+	(grub_util_get_grub_dev): Use md/%s to name mdadm 1.x devices,
+	removing the homehost if present.
+	(grub_util_get_grub_dev) [__linux__]: Get the array name from mdadm
+	if possible.
+	* util/i386/pc/grub-setup.c (main): Handle md/* devices.
+
 2009-12-15  Peter Henn  <peter.henn@web.de>
 
 	* disk/mdraid_linux.c (grub_mdraid_detect): Fix calculation of 1.x
diff --git a/disk/raid.c b/disk/raid.c
index 87e713f30..1dc361e8e 100644
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -563,7 +563,14 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
       if (! array->name)
 	array->name = grub_xasprintf ("md%d", array->number);
       else
-	array->name = grub_xasprintf ("%s", array->name);
+	{
+	  /* Strip off the homehost if present.  */
+	  char *colon = grub_strchr (array->name, ':');
+	  char *new_name = grub_xasprintf ("md/%s",
+					   colon ? colon + 1 : array->name);
+	  grub_free (array->name);
+	  array->name = new_name;
+	}
 
       grub_dprintf ("raid", "Found array %s (%s)\n", array->name,
                     scanner_name);
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index 5b0849a98..2d7469c9d 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -36,6 +36,11 @@
 #include <sys/mman.h>
 #endif
 
+#ifdef __linux__
+# include <sys/types.h>
+# include <sys/wait.h>
+#endif
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
@@ -516,10 +521,89 @@ grub_util_get_dev_abstraction (const char *os_dev __attribute__((unused)))
   return GRUB_DEV_ABSTRACTION_NONE;
 }
 
+#ifdef __linux__
+static char *
+get_mdadm_name (const char *os_dev)
+{
+  int mdadm_pipe[2];
+  pid_t mdadm_pid;
+  char *name = NULL;
+
+  if (pipe (mdadm_pipe) < 0)
+    {
+      grub_util_warn ("Unable to create pipe for mdadm: %s", strerror (errno));
+      return NULL;
+    }
+
+  mdadm_pid = fork ();
+  if (mdadm_pid < 0)
+    grub_util_warn ("Unable to fork mdadm: %s", strerror (errno));
+  else if (mdadm_pid == 0)
+    {
+      /* Child.  */
+      char *argv[5];
+
+      close (mdadm_pipe[0]);
+      dup2 (mdadm_pipe[1], STDOUT_FILENO);
+      close (mdadm_pipe[1]);
+
+      /* execvp has inconvenient types, hence the casts.  None of these
+         strings will actually be modified.  */
+      argv[0] = (char *) "mdadm";
+      argv[1] = (char *) "--detail";
+      argv[2] = (char *) "--export";
+      argv[3] = (char *) os_dev;
+      argv[4] = NULL;
+      execvp ("mdadm", argv);
+      exit (127);
+    }
+  else
+    {
+      /* Parent.  Read mdadm's output.  */
+      FILE *mdadm;
+      char *buf = NULL;
+      size_t len = 0;
+
+      close (mdadm_pipe[1]);
+      mdadm = fdopen (mdadm_pipe[0], "r");
+      if (! mdadm)
+	{
+	  grub_util_warn ("Unable to open stream from mdadm: %s",
+			  strerror (errno));
+	  goto out;
+	}
+
+      while (getline (&buf, &len, mdadm) > 0)
+	{
+	  if (strncmp (buf, "MD_NAME=", sizeof ("MD_NAME=") - 1) == 0)
+	    {
+	      char *name_start, *colon;
+	      size_t name_len;
+
+	      free (name);
+	      name_start = buf + sizeof ("MD_NAME=") - 1;
+	      /* Strip off the homehost if present.  */
+	      colon = strchr (name_start, ':');
+	      name = strdup (colon ? colon + 1 : name_start);
+	      name_len = strlen (name);
+	      if (name[name_len - 1] == '\n')
+		name[name_len - 1] = '\0';
+	    }
+	}
+
+out:
+      close (mdadm_pipe[0]);
+      waitpid (mdadm_pid, NULL, 0);
+    }
+
+  return name;
+}
+#endif /* __linux__ */
+
 char *
 grub_util_get_grub_dev (const char *os_dev)
 {
-  char *grub_dev;
+  char *grub_dev = NULL;
 
   switch (grub_util_get_dev_abstraction (os_dev))
     {
@@ -611,12 +695,25 @@ grub_util_get_grub_dev (const char *os_dev)
 	  if (q)
 	    *q = ',';
 
-	  asprintf (&grub_dev, "%s", p);
+	  asprintf (&grub_dev, "md/%s", p);
 	  free (p);
 	}
       else
 	grub_util_error ("unknown kind of RAID device `%s'", os_dev);
 
+#ifdef __linux__
+      {
+	char *mdadm_name = get_mdadm_name (os_dev);
+
+	if (mdadm_name)
+	  {
+	    free (grub_dev);
+	    asprintf (&grub_dev, "md/%s", mdadm_name);
+	    free (mdadm_name);
+	  }
+      }
+#endif /* __linux__ */
+
       break;
 
     default:  /* GRUB_DEV_ABSTRACTION_NONE */
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 8b2f52bb4..524572fad 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -812,14 +812,14 @@ main (int argc, char *argv[])
     must_embed = 1;
 
   if (root_dev[0] == 'm' && root_dev[1] == 'd'
-      && root_dev[2] >= '0' && root_dev[2] <= '9')
+      && ((root_dev[2] >= '0' && root_dev[2] <= '9') || root_dev[2] == '/'))
     {
       /* FIXME: we can avoid this on RAID1.  */
       must_embed = 1;
     }
 
   if (dest_dev[0] == 'm' && dest_dev[1] == 'd'
-      && dest_dev[2] >= '0' && dest_dev[2] <= '9')
+      && ((dest_dev[2] >= '0' && dest_dev[2] <= '9') || dest_dev[2] == '/'))
     {
       char **devicelist;
       int i;

From f6e59c46e1a32e38e0dc73e417db3cafab54668a Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sun, 18 Jul 2010 20:46:21 +0530
Subject: [PATCH 1256/1628] update dynamic cmd dispatch with scripts support

---
 commands/extcmd.c     | 21 ++++++++++++++++-----
 include/grub/extcmd.h |  8 ++++++++
 normal/dyncmd.c       | 36 ++++++++++++++++++++++++++----------
 3 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/commands/extcmd.c b/commands/extcmd.c
index 76cbe4e26..173dea193 100644
--- a/commands/extcmd.c
+++ b/commands/extcmd.c
@@ -68,10 +68,11 @@ grub_extcmd_dispatch (struct grub_command *cmd, int argc, char **args)
 }
 
 grub_extcmd_t
-grub_register_extcmd (const char *name, grub_extcmd_func_t func,
-		      unsigned flags, const char *summary,
-		      const char *description,
-		      const struct grub_arg_option *parser)
+grub_register_extcmd_prio (const char *name, grub_extcmd_func_t func,
+			   unsigned flags, const char *summary,
+			   const char *description,
+			   const struct grub_arg_option *parser,
+			   int prio)
 {
   grub_extcmd_t ext;
   grub_command_t cmd;
@@ -81,7 +82,7 @@ grub_register_extcmd (const char *name, grub_extcmd_func_t func,
     return 0;
 
   cmd = grub_register_command_prio (name, grub_extcmd_dispatch,
-				    summary, description, 1);
+				    summary, description, prio);
   if (! cmd)
     {
       grub_free (ext);
@@ -99,6 +100,16 @@ grub_register_extcmd (const char *name, grub_extcmd_func_t func,
   return ext;
 }
 
+grub_extcmd_t
+grub_register_extcmd (const char *name, grub_extcmd_func_t func,
+		      unsigned flags, const char *summary,
+		      const char *description,
+		      const struct grub_arg_option *parser)
+{
+  return grub_register_extcmd_prio (name, func, flags,
+				    summary, description, parser, 1);
+}
+
 void
 grub_unregister_extcmd (grub_extcmd_t ext)
 {
diff --git a/include/grub/extcmd.h b/include/grub/extcmd.h
index 54f0958fe..a5e4d18fe 100644
--- a/include/grub/extcmd.h
+++ b/include/grub/extcmd.h
@@ -62,6 +62,14 @@ grub_extcmd_t grub_register_extcmd (const char *name,
 				    const char *description,
 				    const struct grub_arg_option *parser);
 
+grub_extcmd_t grub_register_extcmd_prio (const char *name,
+					 grub_extcmd_func_t func,
+					 unsigned flags,
+					 const char *summary,
+					 const char *description,
+					 const struct grub_arg_option *parser,
+					 int prio);
+
 void grub_unregister_extcmd (grub_extcmd_t cmd);
 
 grub_err_t
diff --git a/normal/dyncmd.c b/normal/dyncmd.c
index a3cafa514..172baa44e 100644
--- a/normal/dyncmd.c
+++ b/normal/dyncmd.c
@@ -23,16 +23,21 @@
 #include <grub/misc.h>
 #include <grub/command.h>
 #include <grub/normal.h>
+#include <grub/extcmd.h>
+#include <grub/script_sh.h>
 #include <grub/i18n.h>
 
 static grub_err_t
-grub_dyncmd_dispatcher (struct grub_command *cmd,
+grub_dyncmd_dispatcher (struct grub_extcmd_context *ctxt,
 			int argc, char **args)
 {
-  char *modname = cmd->data;
+  char *modname;
   grub_dl_t mod;
   grub_err_t ret;
+  grub_extcmd_t extcmd = ctxt->extcmd;
+  grub_command_t cmd = extcmd->cmd;
 
+  modname = extcmd->data;
   mod = grub_dl_load (modname);
   if (mod)
     {
@@ -42,11 +47,18 @@ grub_dyncmd_dispatcher (struct grub_command *cmd,
       grub_dl_ref (mod);
 
       name = (char *) cmd->name;
-      grub_unregister_command (cmd);
+      grub_unregister_extcmd (extcmd);
 
       cmd = grub_command_find (name);
       if (cmd)
-	ret = (cmd->func) (cmd, argc, args);
+	{
+	  if (cmd->flags & GRUB_COMMAND_FLAG_BLOCKS &&
+	      cmd->flags & GRUB_COMMAND_FLAG_EXTCMD)
+	    ret = grub_extcmd_dispatcher (cmd, argc, args,
+					  ctxt->script_params);
+	  else
+	    ret = (cmd->func) (cmd, argc, args);
+	}
       else
 	ret = grub_errno;
 
@@ -81,13 +93,14 @@ read_command_list (const char *prefix)
 	      for (ptr = grub_command_list; ptr; ptr = next)
 		{
 		  next = ptr->next;
-		  if (ptr->func == grub_dyncmd_dispatcher)
+		  if (ptr->flags & GRUB_COMMAND_FLAG_DYNCMD)
 		    {
 		      if (last)
 			last->next = ptr->next;
 		      else
 			grub_command_list = ptr->next;
 		      grub_free (ptr);
+		      grub_free (ptr->data); /* extcmd struct */
 		    }
 		  else
 		    last = ptr;
@@ -96,7 +109,7 @@ read_command_list (const char *prefix)
 	      for (;; grub_free (buf))
 		{
 		  char *p, *name, *modname;
-		  grub_command_t cmd;
+		  grub_extcmd_t cmd;
 		  int prio = 0;
 
 		  buf = grub_file_getline (file);
@@ -139,16 +152,19 @@ read_command_list (const char *prefix)
 		      continue;
 		    }
 
-		  cmd = grub_register_command_prio (name,
-						    grub_dyncmd_dispatcher,
-						    0, N_("not loaded"), prio);
+		  cmd = grub_register_extcmd_prio (name,
+						   grub_dyncmd_dispatcher,
+						   GRUB_COMMAND_FLAG_BLOCKS
+						   | GRUB_COMMAND_FLAG_EXTCMD
+						   | GRUB_COMMAND_FLAG_DYNCMD,
+						   0, N_("not loaded"), 0,
+						   prio);
 		  if (! cmd)
 		    {
 		      grub_free (name);
 		      grub_free (modname);
 		      continue;
 		    }
-		  cmd->flags |= GRUB_COMMAND_FLAG_DYNCMD;
 		  cmd->data = modname;
 
 		  /* Update the active flag.  */

From 93889c47179b98729f7f501901d4e670ab7d5d2a Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sun, 18 Jul 2010 21:00:58 +0530
Subject: [PATCH 1257/1628] undo changes to hello command

---
 hello/hello.c | 34 ++++++----------------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/hello/hello.c b/hello/hello.c
index 118966291..183ee7798 100644
--- a/hello/hello.c
+++ b/hello/hello.c
@@ -26,29 +26,12 @@
 #include <grub/extcmd.h>
 #include <grub/i18n.h>
 
-static struct grub_script *script;
-
 static grub_err_t
-grub_cmd_hello (grub_extcmd_context_t ctxt,
-		int argc, char **args __attribute__ ((unused)))
+grub_cmd_hello (grub_extcmd_context_t ctxt __attribute__ ((unused)),
+		int argc __attribute__ ((unused)),
+		char **args __attribute__ ((unused)))
 {
-  if (argc == 0 && script == 0)
-    grub_printf ("Hello World\n");
-
-  else if (argc == 0)
-    grub_script_execute (script);
-
-  else
-    {
-      if (! ctxt->script_params || ! ctxt->script_params[0])
-	return 1;
-
-      if (script)
-	grub_script_put (script);
-
-      script = grub_script_get (ctxt->script_params[0]);
-    }
-
+  grub_printf ("Hello World\n");
   return 0;
 }
 
@@ -56,16 +39,11 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(hello)
 {
-  cmd = grub_register_extcmd ("hello", grub_cmd_hello,
-			      GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_BLOCKS,
-			      N_("[BLOCK]"), N_("Say \"Hello World\"."), 0);
+  cmd = grub_register_extcmd ("hello", grub_cmd_hello, GRUB_COMMAND_FLAG_BOTH,
+			      0, N_("Say \"Hello World\"."), 0);
 }
 
 GRUB_MOD_FINI(hello)
 {
-  if (script)
-    grub_script_put (script);
-
-  script = 0;
   grub_unregister_extcmd (cmd);
 }

From 24494d478adad49868af2a75d7afa307379e6547 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 17:40:42 +0200
Subject: [PATCH 1258/1628] Add fini routines for usbserial and rename
 grub_usbserial to grub_ftdi

---
 bus/usb/serial/ftdi.c | 87 ++++++++++++++++++++++++++++---------------
 include/grub/serial.h |  8 ++++
 include/grub/usb.h    |  5 +--
 term/ns8250.c         |  2 +-
 term/serial.c         | 74 +++++++++++++++++++++++-------------
 5 files changed, 118 insertions(+), 58 deletions(-)

diff --git a/bus/usb/serial/ftdi.c b/bus/usb/serial/ftdi.c
index c7a7554ee..4495b055c 100644
--- a/bus/usb/serial/ftdi.c
+++ b/bus/usb/serial/ftdi.c
@@ -25,14 +25,14 @@
 
 enum
   {
-    GRUB_USBSERIAL_MODEM_CTRL = 0x01,
-    GRUB_USBSERIAL_FLOW_CTRL = 0x02,
-    GRUB_USBSERIAL_SPEED_CTRL = 0x03,
-    GRUB_USBSERIAL_DATA_CTRL = 0x04
+    GRUB_FTDI_MODEM_CTRL = 0x01,
+    GRUB_FTDI_FLOW_CTRL = 0x02,
+    GRUB_FTDI_SPEED_CTRL = 0x03,
+    GRUB_FTDI_DATA_CTRL = 0x04
   };
 
-#define GRUB_USBSERIAL_MODEM_CTRL_DTRRTS 3
-#define GRUB_USBSERIAL_FLOW_CTRL_DTRRTS 3
+#define GRUB_FTDI_MODEM_CTRL_DTRRTS 3
+#define GRUB_FTDI_FLOW_CTRL_DTRRTS 3
 
 /* Convert speed to divisor.  */
 static grub_uint32_t
@@ -85,20 +85,20 @@ real_config (struct grub_serial_port *port)
     return;
 
   grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
-			GRUB_USBSERIAL_MODEM_CTRL,
-			GRUB_USBSERIAL_MODEM_CTRL_DTRRTS, 0, 0, 0);
+			GRUB_FTDI_MODEM_CTRL,
+			GRUB_FTDI_MODEM_CTRL_DTRRTS, 0, 0, 0);
 
   grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
-			GRUB_USBSERIAL_FLOW_CTRL,
-			GRUB_USBSERIAL_FLOW_CTRL_DTRRTS, 0, 0, 0);
+			GRUB_FTDI_FLOW_CTRL,
+			GRUB_FTDI_FLOW_CTRL_DTRRTS, 0, 0, 0);
 
   divisor = get_divisor (port->config.speed);
   grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
-			GRUB_USBSERIAL_SPEED_CTRL,
+			GRUB_FTDI_SPEED_CTRL,
 			divisor & 0xffff, divisor >> 16, 0, 0);
 
   grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
-			GRUB_USBSERIAL_DATA_CTRL,
+			GRUB_FTDI_DATA_CTRL,
 			parities[port->config.parity]
 			| stop_bits[port->config.stop_bits]
 			| port->config.word_len, 0, 0, 0);
@@ -108,17 +108,13 @@ real_config (struct grub_serial_port *port)
 
 /* Fetch a key.  */
 static int
-usbserial_hw_fetch (struct grub_serial_port *port)
+ftdi_hw_fetch (struct grub_serial_port *port)
 {
   char cc[3];
   grub_usb_err_t err;
 
   real_config (port);
 
-  err = grub_usb_bulk_read (port->usbdev, port->in_endp->endp_addr, 2, cc);
-  if (err != GRUB_USB_ERR_NAK)
-    return -1;
-
   err = grub_usb_bulk_read (port->usbdev, port->in_endp->endp_addr, 3, cc);
   if (err != GRUB_USB_ERR_NONE)
     return -1;
@@ -128,7 +124,7 @@ usbserial_hw_fetch (struct grub_serial_port *port)
 
 /* Put a character.  */
 static void
-usbserial_hw_put (struct grub_serial_port *port, const int c)
+ftdi_hw_put (struct grub_serial_port *port, const int c)
 {
   char cc = c;
 
@@ -138,7 +134,7 @@ usbserial_hw_put (struct grub_serial_port *port, const int c)
 }
 
 static grub_err_t
-usbserial_hw_configure (struct grub_serial_port *port,
+ftdi_hw_configure (struct grub_serial_port *port,
 			struct grub_serial_config *config)
 {
   grub_uint16_t divisor;
@@ -165,11 +161,19 @@ usbserial_hw_configure (struct grub_serial_port *port,
   return GRUB_ERR_NONE;
 }
 
-static struct grub_serial_driver grub_usbserial_driver =
+static void
+ftdi_fini (struct grub_serial_port *port)
+{
+  port->usbdev->config[port->configno].interf[port->interfno].detach_hook = 0;
+  port->usbdev->config[port->configno].interf[port->interfno].attached = 0;
+}
+
+static struct grub_serial_driver grub_ftdi_driver =
   {
-    .configure = usbserial_hw_configure,
-    .fetch = usbserial_hw_fetch,
-    .put = usbserial_hw_put
+    .configure = ftdi_hw_configure,
+    .fetch = ftdi_hw_fetch,
+    .put = ftdi_hw_put,
+    .fini = ftdi_fini
   };
 
 static const struct 
@@ -180,8 +184,19 @@ static const struct
     {0x0403, 0x6001} /* QEMU virtual USBserial.  */
   };
 
+static int ftdinum = 0;
+
+static void
+ftdi_detach (grub_usb_device_t usbdev, int configno, int interfno)
+{
+  static struct grub_serial_port *port;
+  port = usbdev->config[configno].interf[interfno].detach_data;
+
+  grub_serial_unregister (port);
+}
+
 static int
-grub_ftdi_attach (grub_usb_device_t usbdev, int configno, int interfno)
+grub_ftdi_attach_real (grub_usb_device_t usbdev, int configno, int interfno)
 {
   static struct grub_serial_port *port;
   int j;
@@ -196,7 +211,7 @@ grub_ftdi_attach (grub_usb_device_t usbdev, int configno, int interfno)
       return 0;
     }
 
-  port->name = grub_xasprintf ("usb%d", usbdev->addr);
+  port->name = grub_xasprintf ("ftdi%d", ftdinum++);
   if (!port->name)
     {
       grub_free (port);
@@ -205,7 +220,7 @@ grub_ftdi_attach (grub_usb_device_t usbdev, int configno, int interfno)
     }
 
   port->usbdev = usbdev;
-  port->driver = &grub_usbserial_driver;
+  port->driver = &grub_ftdi_driver;
   for (j = 0; j < interf->endpointcnt; j++)
     {
       struct grub_usb_desc_endp *endp;
@@ -229,14 +244,22 @@ grub_ftdi_attach (grub_usb_device_t usbdev, int configno, int interfno)
       return 0;
     }
 
+  port->configno = configno;
+  port->interfno = interfno;
+
   grub_serial_config_defaults (port);
   grub_serial_register (port);
 
+  port->usbdev->config[port->configno].interf[port->interfno].detach_hook
+    = ftdi_detach;
+  port->usbdev->config[port->configno].interf[port->interfno].detach_data
+    = port;
+
   return 1;
 }
 
 static int
-grub_usbserial_attach (grub_usb_device_t usbdev, int configno, int interfno)
+grub_ftdi_attach (grub_usb_device_t usbdev, int configno, int interfno)
 {
   unsigned j;
 
@@ -247,16 +270,22 @@ grub_usbserial_attach (grub_usb_device_t usbdev, int configno, int interfno)
   if (j == ARRAY_SIZE (products))
     return 0;
 
-  return grub_ftdi_attach (usbdev, configno, interfno);
+  return grub_ftdi_attach_real (usbdev, configno, interfno);
 }
 
 struct grub_usb_attach_desc attach_hook =
 {
   .class = 0xff,
-  .hook = grub_usbserial_attach
+  .hook = grub_ftdi_attach
 };
 
 GRUB_MOD_INIT(usbserial_ftdi)
 {
   grub_usb_register_attach_hook_class (&attach_hook);
 }
+
+GRUB_MOD_FINI(usbserial_ftdi)
+{
+  grub_serial_unregister_driver (&grub_ftdi_driver);
+  grub_usb_unregister_attach_hook_class (&attach_hook);
+}
diff --git a/include/grub/serial.h b/include/grub/serial.h
index e66dcf80d..fd601a6d9 100644
--- a/include/grub/serial.h
+++ b/include/grub/serial.h
@@ -24,6 +24,7 @@
 #include <grub/cpu/io.h>
 #include <grub/usb.h>
 #include <grub/list.h>
+#include <grub/term.h>
 
 struct grub_serial_port;
 struct grub_serial_config;
@@ -34,6 +35,7 @@ struct grub_serial_driver
 			   struct grub_serial_config *config);
   int (*fetch) (struct grub_serial_port *port);
   void (*put) (struct grub_serial_port *port, const int c);
+  void (*fini) (struct grub_serial_port *port);
 };
 
 /* The type of parity.  */
@@ -74,10 +76,14 @@ struct grub_serial_port
     struct
     {
       grub_usb_device_t usbdev;
+      int configno;
+      int interfno;
       struct grub_usb_desc_endp *in_endp;
       struct grub_usb_desc_endp *out_endp;
     };
   };
+  grub_term_output_t term_out;
+  grub_term_input_t term_in;
 };
 
 grub_err_t grub_serial_register (struct grub_serial_port *port);
@@ -105,5 +111,7 @@ grub_serial_config_defaults (struct grub_serial_port *port)
 
 void grub_ns8250_init (void);
 char *grub_serial_ns8250_add_port (grub_port_t port);
+extern struct grub_serial_driver grub_ns8250_driver;
+void grub_serial_unregister_driver (struct grub_serial_driver *driver);
 
 #endif
diff --git a/include/grub/usb.h b/include/grub/usb.h
index b3acd3c5e..595cbd6d3 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -138,6 +138,8 @@ struct grub_usb_interface
   int attached;
 
   void (*detach_hook) (struct grub_usb_device *dev, int config, int interface);
+
+  void *detach_data;
 };
 
 struct grub_usb_configuration
@@ -171,9 +173,6 @@ struct grub_usb_device
 
   /* Data toggle values (used for bulk transfers only).  */
   int toggle[256];
-
-  /* Device-specific data.  */
-  void *data;
 };
 
 
diff --git a/term/ns8250.c b/term/ns8250.c
index 93a5e215e..6bf8c5b59 100644
--- a/term/ns8250.c
+++ b/term/ns8250.c
@@ -197,7 +197,7 @@ serial_hw_configure (struct grub_serial_port *port,
   return GRUB_ERR_NONE;
 }
 
-static struct grub_serial_driver grub_ns8250_driver =
+struct grub_serial_driver grub_ns8250_driver =
   {
     .configure = serial_hw_configure,
     .fetch = serial_hw_fetch,
diff --git a/term/serial.c b/term/serial.c
index aeaec5c88..20dec7347 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -215,14 +215,18 @@ grub_cmd_serial (grub_extcmd_t cmd, int argc, char **args)
   err = port->driver->configure (port, &config);
   if (err)
     return err;
-  if (!registered)
+  /* Compatibility kludge.  */
+  if (port->driver == &grub_ns8250_driver)
     {
-      grub_term_register_input ("serial", &grub_serial_term_input);
-      grub_term_register_output ("serial", &grub_serial_term_output);
+      if (!registered)
+	{
+	  grub_term_register_input ("serial", &grub_serial_term_input);
+	  grub_term_register_output ("serial", &grub_serial_term_output);
+	}
+      grub_serial_terminfo_output.port = port;
+      grub_serial_terminfo_input.port = port;
+      registered = 1;
     }
-  grub_serial_terminfo_output.port = port;
-  grub_serial_terminfo_input.port = port;
-  registered = 1;
   return GRUB_ERR_NONE;
 }
 
@@ -284,9 +288,21 @@ grub_serial_register (struct grub_serial_port *port)
   grub_list_push (GRUB_AS_LIST_P (&grub_serial_ports), GRUB_AS_LIST (port));
   ((struct grub_serial_input_state *) in->data)->port = port;
   ((struct grub_serial_output_state *) out->data)->port = port;
-  grub_term_register_input ("serial_*", in);
-  grub_term_register_output ("serial_*", out);
+  port->term_in = in;
+  port->term_out = out;
   grub_terminfo_output_register (out, "vt100");
+#ifdef GRUB_MACHINE_MIPS_YEELOONG
+  if (grub_strcmp (port->name, "com0") == 0)
+    {
+      grub_term_register_input_active ("serial_*", in);
+      grub_term_register_output_active ("serial_*", out);
+    }
+  else
+#endif
+    {
+      grub_term_register_input ("serial_*", in);
+      grub_term_register_output ("serial_*", out);
+    }
 
   return GRUB_ERR_NONE;
 }
@@ -294,8 +310,27 @@ grub_serial_register (struct grub_serial_port *port)
 void
 grub_serial_unregister (struct grub_serial_port *port)
 {
+  if (port->driver->fini)
+    port->driver->fini (port);
+  
+  if (port->term_in)
+    grub_term_unregister_input (port->term_in);
+  if (port->term_out)
+    grub_term_unregister_output (port->term_out);
+
   grub_list_remove (GRUB_AS_LIST_P (&grub_serial_ports), GRUB_AS_LIST (port));
-  /* FIXME */
+}
+
+void
+grub_serial_unregister_driver (struct grub_serial_driver *driver)
+{
+  struct grub_serial_port *port, *next;
+  for (port = grub_serial_ports; port; port = next)
+    {
+      next = port->next;
+      if (port->driver == driver)
+	grub_serial_unregister (port);
+    }
 }
 
 static grub_extcmd_t cmd;
@@ -308,27 +343,16 @@ GRUB_MOD_INIT(serial)
 			      N_("Configure serial port."), options);
 
   grub_ns8250_init ();
-
-#ifdef GRUB_MACHINE_MIPS_YEELOONG
-  {
-    grub_err_t hwiniterr;
-    hwiniterr = grub_ns8250_driver.init ("com0", &serial_settings);
-    serial_settings.driver = &grub_ns8250_driver;
-
-    if (hwiniterr == GRUB_ERR_NONE)
-      {
-	grub_term_register_input_active ("serial", &grub_serial_term_input);
-	grub_term_register_output_active ("serial", &grub_serial_term_output);
-
-	registered = 1;
-      }
-  }
-#endif
 }
 
 GRUB_MOD_FINI(serial)
 {
   while (grub_serial_ports)
     grub_serial_unregister (grub_serial_ports);
+  if (registered)
+    {
+      grub_term_unregister_input (&grub_serial_term_input);
+      grub_term_unregister_output (&grub_serial_term_output);
+    }
   grub_unregister_extcmd (cmd);
 }

From 44e7b8cb491aafc0e1b238b2aedb671e40ef9947 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 19:09:54 +0200
Subject: [PATCH 1259/1628] account for absence of NS8250 on emu

---
 term/serial.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/term/serial.c b/term/serial.c
index 20dec7347..2268788af 100644
--- a/term/serial.c
+++ b/term/serial.c
@@ -131,6 +131,7 @@ grub_serial_find (char *name)
     if (grub_strcmp (port->name, name) == 0)
       break;
 
+#ifndef GRUB_MACHINE_EMU
   if (!port && grub_memcmp (name, "port", sizeof ("port") - 1) == 0
       && grub_isdigit (name [sizeof ("port") - 1]))
     {
@@ -143,6 +144,7 @@ grub_serial_find (char *name)
 	if (grub_strcmp (port->name, name) == 0)
 	  break;
     }
+#endif
 
   return port;
 }
@@ -215,6 +217,7 @@ grub_cmd_serial (grub_extcmd_t cmd, int argc, char **args)
   err = port->driver->configure (port, &config);
   if (err)
     return err;
+#ifndef GRUB_MACHINE_EMU
   /* Compatibility kludge.  */
   if (port->driver == &grub_ns8250_driver)
     {
@@ -227,6 +230,7 @@ grub_cmd_serial (grub_extcmd_t cmd, int argc, char **args)
       grub_serial_terminfo_input.port = port;
       registered = 1;
     }
+#endif
   return GRUB_ERR_NONE;
 }
 
@@ -341,8 +345,9 @@ GRUB_MOD_INIT(serial)
 			      GRUB_COMMAND_FLAG_BOTH,
 			      N_("[OPTIONS...]"),
 			      N_("Configure serial port."), options);
-
+#ifndef GRUB_MACHINE_EMU
   grub_ns8250_init ();
+#endif
 }
 
 GRUB_MOD_FINI(serial)

From a531fd134de9e809444af4d5dad09d793621a029 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 19:10:57 +0200
Subject: [PATCH 1260/1628] Split common usbserial function. PL2303 skeleton

---
 bus/usb/serial/common.c  | 102 +++++++++++++++++++
 bus/usb/serial/ftdi.c    |  89 +---------------
 bus/usb/serial/pl2303.c  | 212 +++++++++++++++++++++++++++++++++++++++
 conf/i386-pc.rmk         |  12 +++
 include/grub/usbserial.h |  31 ++++++
 5 files changed, 362 insertions(+), 84 deletions(-)
 create mode 100644 bus/usb/serial/common.c
 create mode 100644 bus/usb/serial/pl2303.c
 create mode 100644 include/grub/usbserial.h

diff --git a/bus/usb/serial/common.c b/bus/usb/serial/common.c
new file mode 100644
index 000000000..1da1c5bcf
--- /dev/null
+++ b/bus/usb/serial/common.c
@@ -0,0 +1,102 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2000,2001,2002,2003,2004,2005,2007,2008,2009,2010  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/serial.h>
+#include <grub/usbserial.h>
+
+void
+grub_usbserial_fini (struct grub_serial_port *port)
+{
+  port->usbdev->config[port->configno].interf[port->interfno].detach_hook = 0;
+  port->usbdev->config[port->configno].interf[port->interfno].attached = 0;
+}
+
+void
+grub_usbserial_detach (grub_usb_device_t usbdev, int configno, int interfno)
+{
+  static struct grub_serial_port *port;
+  port = usbdev->config[configno].interf[interfno].detach_data;
+
+  grub_serial_unregister (port);
+}
+
+static int usbnum = 0;
+
+int
+grub_usbserial_attach (grub_usb_device_t usbdev, int configno, int interfno,
+		       struct grub_serial_driver *driver)
+{
+  struct grub_serial_port *port;
+  int j;
+  struct grub_usb_desc_if *interf;
+
+  interf = usbdev->config[configno].interf[interfno].descif;
+
+  port = grub_malloc (sizeof (*port));
+  if (!port)
+    {
+      grub_print_error ();
+      return 0;
+    }
+
+  port->name = grub_xasprintf ("usb%d", usbnum++);
+  if (!port->name)
+    {
+      grub_free (port);
+      grub_print_error ();
+      return 0;
+    }
+
+  port->usbdev = usbdev;
+  port->driver = driver;
+  for (j = 0; j < interf->endpointcnt; j++)
+    {
+      struct grub_usb_desc_endp *endp;
+      endp = &usbdev->config[0].interf[interfno].descendp[j];
+
+      if ((endp->endp_addr & 128) && (endp->attrib & 3) == 2)
+	{
+	  /* Bulk IN endpoint.  */
+	  port->in_endp = endp;
+	}
+      else if (!(endp->endp_addr & 128) && (endp->attrib & 3) == 2)
+	{
+	  /* Bulk OUT endpoint.  */
+	  port->out_endp = endp;
+	}
+    }
+  if (!port->out_endp || !port->in_endp)
+    {
+      grub_free (port->name);
+      grub_free (port);
+      return 0;
+    }
+
+  port->configno = configno;
+  port->interfno = interfno;
+
+  grub_serial_config_defaults (port);
+  grub_serial_register (port);
+
+  port->usbdev->config[port->configno].interf[port->interfno].detach_hook
+    = grub_usbserial_detach;
+  port->usbdev->config[port->configno].interf[port->interfno].detach_data
+    = port;
+
+  return 1;
+}
diff --git a/bus/usb/serial/ftdi.c b/bus/usb/serial/ftdi.c
index 4495b055c..a4d88dbae 100644
--- a/bus/usb/serial/ftdi.c
+++ b/bus/usb/serial/ftdi.c
@@ -22,6 +22,7 @@
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/usb.h>
+#include <grub/usbserial.h>
 
 enum
   {
@@ -161,19 +162,12 @@ ftdi_hw_configure (struct grub_serial_port *port,
   return GRUB_ERR_NONE;
 }
 
-static void
-ftdi_fini (struct grub_serial_port *port)
-{
-  port->usbdev->config[port->configno].interf[port->interfno].detach_hook = 0;
-  port->usbdev->config[port->configno].interf[port->interfno].attached = 0;
-}
-
 static struct grub_serial_driver grub_ftdi_driver =
   {
     .configure = ftdi_hw_configure,
     .fetch = ftdi_hw_fetch,
     .put = ftdi_hw_put,
-    .fini = ftdi_fini
+    .fini = grub_usbserial_fini
   };
 
 static const struct 
@@ -184,80 +178,6 @@ static const struct
     {0x0403, 0x6001} /* QEMU virtual USBserial.  */
   };
 
-static int ftdinum = 0;
-
-static void
-ftdi_detach (grub_usb_device_t usbdev, int configno, int interfno)
-{
-  static struct grub_serial_port *port;
-  port = usbdev->config[configno].interf[interfno].detach_data;
-
-  grub_serial_unregister (port);
-}
-
-static int
-grub_ftdi_attach_real (grub_usb_device_t usbdev, int configno, int interfno)
-{
-  static struct grub_serial_port *port;
-  int j;
-  struct grub_usb_desc_if *interf;
-
-  interf = usbdev->config[configno].interf[interfno].descif;
-
-  port = grub_malloc (sizeof (*port));
-  if (!port)
-    {
-      grub_print_error ();
-      return 0;
-    }
-
-  port->name = grub_xasprintf ("ftdi%d", ftdinum++);
-  if (!port->name)
-    {
-      grub_free (port);
-      grub_print_error ();
-      return 0;
-    }
-
-  port->usbdev = usbdev;
-  port->driver = &grub_ftdi_driver;
-  for (j = 0; j < interf->endpointcnt; j++)
-    {
-      struct grub_usb_desc_endp *endp;
-      endp = &usbdev->config[0].interf[interfno].descendp[j];
-
-      if ((endp->endp_addr & 128) && (endp->attrib & 3) == 2)
-	{
-	  /* Bulk IN endpoint.  */
-	  port->in_endp = endp;
-	}
-      else if (!(endp->endp_addr & 128) && (endp->attrib & 3) == 2)
-	{
-	  /* Bulk OUT endpoint.  */
-	  port->out_endp = endp;
-	}
-    }
-  if (!port->out_endp || !port->in_endp)
-    {
-      grub_free (port->name);
-      grub_free (port);
-      return 0;
-    }
-
-  port->configno = configno;
-  port->interfno = interfno;
-
-  grub_serial_config_defaults (port);
-  grub_serial_register (port);
-
-  port->usbdev->config[port->configno].interf[port->interfno].detach_hook
-    = ftdi_detach;
-  port->usbdev->config[port->configno].interf[port->interfno].detach_data
-    = port;
-
-  return 1;
-}
-
 static int
 grub_ftdi_attach (grub_usb_device_t usbdev, int configno, int interfno)
 {
@@ -270,10 +190,11 @@ grub_ftdi_attach (grub_usb_device_t usbdev, int configno, int interfno)
   if (j == ARRAY_SIZE (products))
     return 0;
 
-  return grub_ftdi_attach_real (usbdev, configno, interfno);
+  return grub_usbserial_attach (usbdev, configno, interfno,
+				&grub_ftdi_driver);
 }
 
-struct grub_usb_attach_desc attach_hook =
+static struct grub_usb_attach_desc attach_hook =
 {
   .class = 0xff,
   .hook = grub_ftdi_attach
diff --git a/bus/usb/serial/pl2303.c b/bus/usb/serial/pl2303.c
new file mode 100644
index 000000000..eeb53402e
--- /dev/null
+++ b/bus/usb/serial/pl2303.c
@@ -0,0 +1,212 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2000,2001,2002,2003,2004,2005,2007,2008,2009,2010  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/serial.h>
+#include <grub/types.h>
+#include <grub/dl.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/usb.h>
+#include <grub/usbserial.h>
+
+enum
+  {
+    GRUB_FTDI_MODEM_CTRL = 0x01,
+    GRUB_FTDI_FLOW_CTRL = 0x02,
+    GRUB_FTDI_SPEED_CTRL = 0x03,
+    GRUB_FTDI_DATA_CTRL = 0x04
+  };
+
+#define GRUB_FTDI_MODEM_CTRL_DTRRTS 3
+#define GRUB_FTDI_FLOW_CTRL_DTRRTS 3
+
+/* Convert speed to divisor.  */
+static grub_uint32_t
+get_divisor (unsigned int speed)
+{
+  unsigned int i;
+
+  /* The structure for speed vs. divisor.  */
+  struct divisor
+  {
+    unsigned int speed;
+    grub_uint32_t div;
+  };
+
+  /* The table which lists common configurations.  */
+  /* Computed with a division formula with 3MHz as base frequency. */
+  static struct divisor divisor_tab[] =
+    {
+      { 2400,   0x04e2 },
+      { 4800,   0x0271 },
+      { 9600,   0x4138 },
+      { 19200,  0x809c },
+      { 38400,  0xc04e },
+      { 57600,  0xc034 },
+      { 115200, 0x001a }
+    };
+
+  /* Set the baud rate.  */
+  for (i = 0; i < ARRAY_SIZE (divisor_tab); i++)
+    if (divisor_tab[i].speed == speed)
+      return divisor_tab[i].div;
+  return 0;
+}
+
+static void
+real_config (struct grub_serial_port *port)
+{
+  grub_uint32_t divisor;
+  const grub_uint16_t parities[] = {
+    [GRUB_SERIAL_PARITY_NONE] = 0x0000,
+    [GRUB_SERIAL_PARITY_ODD] = 0x0100,
+    [GRUB_SERIAL_PARITY_EVEN] = 0x0200
+  };
+  const grub_uint16_t stop_bits[] = {
+    [GRUB_SERIAL_STOP_BITS_1] = 0x0000,
+    [GRUB_SERIAL_STOP_BITS_2] = 0x1000,
+  };
+
+  //  if (port->configured)
+    return;
+
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
+			GRUB_FTDI_MODEM_CTRL,
+			GRUB_FTDI_MODEM_CTRL_DTRRTS, 0, 0, 0);
+
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
+			GRUB_FTDI_FLOW_CTRL,
+			GRUB_FTDI_FLOW_CTRL_DTRRTS, 0, 0, 0);
+
+  divisor = get_divisor (port->config.speed);
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
+			GRUB_FTDI_SPEED_CTRL,
+			divisor & 0xffff, divisor >> 16, 0, 0);
+
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
+			GRUB_FTDI_DATA_CTRL,
+			parities[port->config.parity]
+			| stop_bits[port->config.stop_bits]
+			| port->config.word_len, 0, 0, 0);
+
+  port->configured = 1;
+}
+
+/* Fetch a key.  */
+static int
+pl2303_hw_fetch (struct grub_serial_port *port)
+{
+  char cc;
+  grub_usb_err_t err;
+
+  real_config (port);
+
+  err = grub_usb_bulk_read (port->usbdev, port->in_endp->endp_addr, 1, &cc);
+  if (err != GRUB_USB_ERR_NONE)
+    return -1;
+
+  return cc;
+}
+
+/* Put a character.  */
+static void
+pl2303_hw_put (struct grub_serial_port *port, const int c)
+{
+  char cc = c;
+
+  real_config (port);
+
+  grub_usb_bulk_write (port->usbdev, port->out_endp->endp_addr, 1, &cc);
+}
+
+static grub_err_t
+pl2303_hw_configure (struct grub_serial_port *port,
+			struct grub_serial_config *config)
+{
+  grub_uint16_t divisor;
+
+  divisor = get_divisor (config->speed);
+  if (divisor == 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad speed");
+
+  if (config->parity != GRUB_SERIAL_PARITY_NONE
+      && config->parity != GRUB_SERIAL_PARITY_ODD
+      && config->parity != GRUB_SERIAL_PARITY_EVEN)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported parity");
+
+  if (config->stop_bits != GRUB_SERIAL_STOP_BITS_1
+      && config->stop_bits != GRUB_SERIAL_STOP_BITS_2)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported stop bits");
+
+  if (config->word_len < 5 || config->word_len > 8)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "unsupported word length");
+
+  port->config = *config;
+  port->configured = 0;
+
+  return GRUB_ERR_NONE;
+}
+
+static struct grub_serial_driver grub_pl2303_driver =
+  {
+    .configure = pl2303_hw_configure,
+    .fetch = pl2303_hw_fetch,
+    .put = pl2303_hw_put,
+    .fini = grub_usbserial_fini
+  };
+
+static const struct 
+{
+  grub_uint16_t vendor, product;
+} products[] =
+  {
+    {0x067b, 0x2303}
+  };
+
+static int
+grub_pl2303_attach (grub_usb_device_t usbdev, int configno, int interfno)
+{
+  unsigned j;
+
+  for (j = 0; j < ARRAY_SIZE (products); j++)
+    if (usbdev->descdev.vendorid == products[j].vendor
+	&& usbdev->descdev.prodid == products[j].product)
+      break;
+  if (j == ARRAY_SIZE (products))
+    return 0;
+
+  return grub_usbserial_attach (usbdev, configno, interfno,
+				&grub_pl2303_driver);
+}
+
+static struct grub_usb_attach_desc attach_hook =
+{
+  .class = 0xff,
+  .hook = grub_pl2303_attach
+};
+
+GRUB_MOD_INIT(usbserial_pl2303)
+{
+  grub_usb_register_attach_hook_class (&attach_hook);
+}
+
+GRUB_MOD_FINI(usbserial_pl2303)
+{
+  grub_serial_unregister_driver (&grub_pl2303_driver);
+  grub_usb_unregister_attach_hook_class (&attach_hook);
+}
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 2e95133f3..9c77a9d1d 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -195,6 +195,18 @@ usb_mod_SOURCES = bus/usb/usb.c bus/usb/usbtrans.c bus/usb/usbhub.c
 usb_mod_CFLAGS = $(COMMON_CFLAGS)
 usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For serial.mod.
+pkglib_MODULES += usbserial_common.mod
+usbserial_common_mod_SOURCES = bus/usb/serial/common.c
+usbserial_common_mod_CFLAGS = $(COMMON_CFLAGS)
+usbserial_common_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For serial.mod.
+pkglib_MODULES += usbserial_pl2303.mod
+usbserial_pl2303_mod_SOURCES = bus/usb/serial/pl2303.c
+usbserial_pl2303_mod_CFLAGS = $(COMMON_CFLAGS)
+usbserial_pl2303_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # For serial.mod.
 pkglib_MODULES += usbserial_ftdi.mod
 usbserial_ftdi_mod_SOURCES = bus/usb/serial/ftdi.c
diff --git a/include/grub/usbserial.h b/include/grub/usbserial.h
new file mode 100644
index 000000000..786eff7fe
--- /dev/null
+++ b/include/grub/usbserial.h
@@ -0,0 +1,31 @@
+/* serial.h - serial device interface */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#ifndef GRUB_USBSERIAL_HEADER
+#define GRUB_USBSERIAL_HEADER	1
+
+void grub_usbserial_fini (struct grub_serial_port *port);
+
+void grub_usbserial_detach (grub_usb_device_t usbdev, int configno,
+			    int interfno);
+
+int
+grub_usbserial_attach (grub_usb_device_t usbdev, int configno, int interfno,
+		       struct grub_serial_driver *driver);
+#endif

From aa86530e3897931e90011e1d4bf388155d701361 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 19:11:09 +0200
Subject: [PATCH 1261/1628] enable usbserial on grub-emu

---
 conf/any-emu.rmk | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 958da2bee..8272bf25e 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -70,6 +70,30 @@ usbms_mod_SOURCES = disk/usbms.c
 usbms_mod_CFLAGS = $(COMMON_CFLAGS)
 usbms_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For serial.mod.
+pkglib_MODULES += usbserial_common.mod
+usbserial_common_mod_SOURCES = bus/usb/serial/common.c
+usbserial_common_mod_CFLAGS = $(COMMON_CFLAGS)
+usbserial_common_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For serial.mod.
+pkglib_MODULES += usbserial_pl2303.mod
+usbserial_pl2303_mod_SOURCES = bus/usb/serial/pl2303.c
+usbserial_pl2303_mod_CFLAGS = $(COMMON_CFLAGS)
+usbserial_pl2303_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For serial.mod.
+pkglib_MODULES += usbserial_ftdi.mod
+usbserial_ftdi_mod_SOURCES = bus/usb/serial/ftdi.c
+usbserial_ftdi_mod_CFLAGS = $(COMMON_CFLAGS)
+usbserial_ftdi_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For serial.mod.
+pkglib_MODULES += serial.mod
+serial_mod_SOURCES = term/serial.c
+serial_mod_CFLAGS = $(COMMON_CFLAGS)
+serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 grub_emu_LDFLAGS += $(LIBUSB)
 endif
 

From 1c785436daacfd914f8066fdb639fc22bd17ddbe Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sun, 18 Jul 2010 18:31:10 +0100
Subject: [PATCH 1262/1628] * disk/dmraid_nvidia.c (grub_dmraid_nv_detect): Add
 start_sector parameter.  Set its pointer target to 0. * disk/mdraid_linux.c
 (grub_mdraid_detect): Add start_sector parameter.  Set its pointer target to
 0 for 0.9 metadata, or to the `data_offset' value from the superblock for 1.x
 metadata. * disk/raid.c (grub_raid_read): Offset reads by the start sector of
 data on the device. (insert_array): Record the start sector of data on the
 device. (grub_raid_register): Pass start_sector parameters to
 grub_raid_list->detect and insert_array. * include/grub/raid.h (struct
 grub_raid_array): Add start_sector member. (struct grub_raid): Add
 start_sector parameter to `detect'.

---
 ChangeLog.raid       | 16 ++++++++++++++++
 disk/dmraid_nvidia.c |  5 ++++-
 disk/mdraid_linux.c  |  7 ++++++-
 disk/raid.c          | 15 ++++++++++-----
 include/grub/raid.h  |  5 ++++-
 5 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/ChangeLog.raid b/ChangeLog.raid
index c546a7632..a66bd6905 100644
--- a/ChangeLog.raid
+++ b/ChangeLog.raid
@@ -1,3 +1,19 @@
+2010-07-18  Colin Watson  <cjwatson@ubuntu.com>
+
+	* disk/dmraid_nvidia.c (grub_dmraid_nv_detect): Add start_sector
+	parameter.  Set its pointer target to 0.
+	* disk/mdraid_linux.c (grub_mdraid_detect): Add start_sector
+	parameter.  Set its pointer target to 0 for 0.9 metadata, or to the
+	`data_offset' value from the superblock for 1.x metadata.
+	* disk/raid.c (grub_raid_read): Offset reads by the start sector of
+	data on the device.
+	(insert_array): Record the start sector of data on the device.
+	(grub_raid_register): Pass start_sector parameters to
+	grub_raid_list->detect and insert_array.
+	* include/grub/raid.h (struct grub_raid_array): Add start_sector
+	member.
+	(struct grub_raid): Add start_sector parameter to `detect'.
+
 2010-07-18  Colin Watson  <cjwatson@ubuntu.com>
 
 	* disk/raid.c (insert_array): Use md/%s to name mdadm 1.x devices,
diff --git a/disk/dmraid_nvidia.c b/disk/dmraid_nvidia.c
index 3e4ae33be..d3f45935c 100644
--- a/disk/dmraid_nvidia.c
+++ b/disk/dmraid_nvidia.c
@@ -89,7 +89,8 @@ struct grub_nv_super
 } __attribute__ ((packed));
 
 static grub_err_t
-grub_dmraid_nv_detect (grub_disk_t disk, struct grub_raid_array *array)
+grub_dmraid_nv_detect (grub_disk_t disk, struct grub_raid_array *array,
+                       grub_disk_addr_t *start_sector)
 {
   grub_disk_addr_t sector;
   struct grub_nv_super sb;
@@ -145,6 +146,8 @@ grub_dmraid_nv_detect (grub_disk_t disk, struct grub_raid_array *array)
   grub_memcpy (array->uuid, (char *) &sb.array.signature,
                sizeof (sb.array.signature));
 
+  *start_sector = 0;
+
   return 0;
 }
 
diff --git a/disk/mdraid_linux.c b/disk/mdraid_linux.c
index 08e10ab45..b97e458ce 100644
--- a/disk/mdraid_linux.c
+++ b/disk/mdraid_linux.c
@@ -229,7 +229,8 @@ struct grub_raid_super_1x
 #define WriteMostly1    1	/* Mask for writemostly flag in above devflags.  */
 
 static grub_err_t
-grub_mdraid_detect (grub_disk_t disk, struct grub_raid_array *array)
+grub_mdraid_detect (grub_disk_t disk, struct grub_raid_array *array,
+		    grub_disk_addr_t *start_sector)
 {
   grub_disk_addr_t sector;
   grub_uint64_t size, sb_size;
@@ -328,6 +329,8 @@ superblock_0_90:
   uuid[2] = sb.set_uuid2;
   uuid[3] = sb.set_uuid3;
 
+  *start_sector = 0;
+
   return 0;
 
  superblock_1_x:
@@ -387,6 +390,8 @@ superblock_0_90:
 
   grub_memcpy (array->uuid, sb_1x->set_uuid, 16);
 
+  *start_sector = sb_1x->data_offset;
+
   grub_free (sb_1x);
   return 0;
 }
diff --git a/disk/raid.c b/disk/raid.c
index 1dc361e8e..30d4b7ac4 100644
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -254,7 +254,8 @@ grub_raid_read (grub_disk_t disk, grub_disk_addr_t sector,
                           grub_errno = GRUB_ERR_NONE;
 
                         err = grub_disk_read (array->device[k],
-                                              read_sector + j * far_ofs + b,
+                                              array->start_sector[k] +
+                                                read_sector + j * far_ofs + b,
                                               0,
                                               read_size << GRUB_DISK_SECTOR_BITS,
                                               buf);
@@ -366,7 +367,8 @@ grub_raid_read (grub_disk_t disk, grub_disk_addr_t sector,
                   grub_errno = GRUB_ERR_NONE;
 
                 err = grub_disk_read (array->device[disknr],
-                                      read_sector + b, 0,
+                                      array->start_sector[disknr] +
+                                        read_sector + b, 0,
                                       read_size << GRUB_DISK_SECTOR_BITS,
                                       buf);
 
@@ -475,7 +477,7 @@ grub_raid_write (grub_disk_t disk __attribute ((unused)),
 
 static grub_err_t
 insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
-              const char *scanner_name)
+              grub_disk_addr_t start_sector, const char *scanner_name)
 {
   struct grub_raid_array *array = 0, *p;
 
@@ -524,6 +526,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
       *array = *new_array;
       array->nr_devs = 0;
       grub_memset (&array->device, 0, sizeof (array->device));
+      grub_memset (&array->start_sector, 0, sizeof (array->start_sector));
 
       if (array->name)
 	goto skip_duplicate_check;
@@ -587,6 +590,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
 
   /* Add the device to the array. */
   array->device[new_array->index] = disk;
+  array->start_sector[new_array->index] = start_sector;
   array->nr_devs++;
 
   return 0;
@@ -628,6 +632,7 @@ grub_raid_register (grub_raid_t raid)
     {
       grub_disk_t disk;
       struct grub_raid_array array;
+      grub_disk_addr_t start_sector;
 
       grub_dprintf ("raid", "Scanning for RAID devices on disk %s\n", name);
 
@@ -636,8 +641,8 @@ grub_raid_register (grub_raid_t raid)
         return 0;
 
       if ((disk->total_sectors != GRUB_ULONG_MAX) &&
-	  (! grub_raid_list->detect (disk, &array)) &&
-	  (! insert_array (disk, &array, grub_raid_list->name)))
+	  (! grub_raid_list->detect (disk, &array, &start_sector)) &&
+	  (! insert_array (disk, &array, start_sector, grub_raid_list->name)))
 	return 0;
 
       /* This error usually means it's not raid, no need to display
diff --git a/include/grub/raid.h b/include/grub/raid.h
index 8fa4c3814..00df9c10c 100644
--- a/include/grub/raid.h
+++ b/include/grub/raid.h
@@ -51,6 +51,8 @@ struct grub_raid_array
   char *name;              /* That will be "md<number>". */
   unsigned int nr_devs;    /* The number of devices we've found so far. */
   grub_disk_t device[GRUB_RAID_MAX_DEVICES];  /* Array of total_devs devices. */
+  grub_disk_addr_t start_sector[GRUB_RAID_MAX_DEVICES];
+			   /* Start of each device, in 512 byte sectors. */
   struct grub_raid_array *next;
 };
 
@@ -58,7 +60,8 @@ struct grub_raid
 {
   const char *name;
 
-  grub_err_t (*detect) (grub_disk_t disk, struct grub_raid_array *array);
+  grub_err_t (*detect) (grub_disk_t disk, struct grub_raid_array *array,
+                        grub_disk_addr_t *start_sector);
 
   struct grub_raid *next;
 };

From 9b65d8c4f50e6c9a244895837a2843f2e926af6b Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 19 Jul 2010 00:44:21 +0530
Subject: [PATCH 1263/1628] fix automatic option parsing for dynamic commands

---
 commands/extcmd.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/commands/extcmd.c b/commands/extcmd.c
index 173dea193..349e9bfc7 100644
--- a/commands/extcmd.c
+++ b/commands/extcmd.c
@@ -34,9 +34,20 @@ grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
   struct grub_extcmd_context context;
   int maxargs = 0;
   grub_err_t ret;
-  grub_extcmd_t ext;
+  grub_extcmd_t ext = cmd->data;
+
+  context.state = 0;
+  context.extcmd = ext;
+  context.script_params = scripts;
+
+  /* Dynamic commands should not perform option parsing before
+     corresponding module gets loaded.  */
+  if (cmd->flags & GRUB_COMMAND_FLAG_DYNCMD)
+    {
+      ret = (ext->func) (&context, argc, args);
+      return ret;
+    }
 
-  ext = cmd->data;
   parser = (struct grub_arg_option *) ext->options;
   while (parser && (parser++)->doc)
     maxargs++;
@@ -46,10 +57,7 @@ grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
 
   if (grub_arg_parse (ext, argc, args, state, &new_args, &new_argc))
     {
-      context.extcmd = ext;
       context.state = state;
-      context.script_params = scripts;
-
       ret = (ext->func) (&context, new_argc, new_args);
       grub_free (new_args);
     }

From 57a095bc01f08d2e803331d521c09a90f8e33970 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Mon, 19 Jul 2010 01:01:53 +0530
Subject: [PATCH 1264/1628] fix a memory leak

---
 lib/arg.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/arg.c b/lib/arg.c
index 400314d30..04e0ea8ba 100644
--- a/lib/arg.c
+++ b/lib/arg.c
@@ -228,9 +228,13 @@ grub_arg_parse (grub_extcmd_t cmd, int argc, char **argv,
 
   grub_err_t add_arg (char *s)
     {
+      char **p = argl;
       argl = grub_realloc (argl, (++num) * sizeof (char *));
       if (! argl)
-	return grub_errno;
+	{
+	  grub_free (p);
+	  return grub_errno;
+	}
       argl[num - 1] = s;
       return 0;
     }

From d5562777511a3718d43a03eb86954d06acd012ce Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 21:35:22 +0200
Subject: [PATCH 1265/1628] Add possibility of bulk reading with short timeout

---
 bus/usb/ohci.c     |  4 ++--
 bus/usb/uhci.c     |  5 +++--
 bus/usb/usbtrans.c | 19 ++++++++++++++-----
 include/grub/usb.h |  8 +++++++-
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 57ca24065..73e3e01e8 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -654,7 +654,7 @@ grub_ohci_transaction (grub_ohci_td_t td,
 
 static grub_usb_err_t
 grub_ohci_transfer (grub_usb_controller_t dev,
-		    grub_usb_transfer_t transfer)
+		    grub_usb_transfer_t transfer, int timeout)
 {
   struct grub_ohci *o = (struct grub_ohci *) dev->data;
   grub_ohci_ed_t ed_virt;
@@ -832,7 +832,7 @@ grub_ohci_transfer (grub_usb_controller_t dev,
     }
 
   /* Safety measure to avoid a hang. */
-  maxtime = grub_get_time_ms () + 1000;
+  maxtime = grub_get_time_ms () + timeout;
 	
   /* Wait until the transfer is completed or STALLs.  */
   do
diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index 5b4432018..d211de369 100644
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -436,7 +436,8 @@ grub_uhci_transaction (struct grub_uhci *u, unsigned int endp,
 
 static grub_usb_err_t
 grub_uhci_transfer (grub_usb_controller_t dev,
-		    grub_usb_transfer_t transfer)
+		    grub_usb_transfer_t transfer,
+		    int timeout)
 {
   struct grub_uhci *u = (struct grub_uhci *) dev->data;
   grub_uhci_qh_t qh;
@@ -496,7 +497,7 @@ grub_uhci_transfer (grub_usb_controller_t dev,
 
   /* Wait until either the transaction completed or an error
      occurred.  */
-  endtime = grub_get_time_ms () + 1000;
+  endtime = grub_get_time_ms () + timeout;
   for (;;)
     {
       grub_uhci_td_t errtd;
diff --git a/bus/usb/usbtrans.c b/bus/usb/usbtrans.c
index 4a55cab11..9dfef509f 100644
--- a/bus/usb/usbtrans.c
+++ b/bus/usb/usbtrans.c
@@ -145,7 +145,7 @@ grub_usb_control_msg (grub_usb_device_t dev,
 
   transfer->transactions[datablocks + 1].toggle = 1;
 
-  err = dev->controller.dev->transfer (&dev->controller, transfer);
+  err = dev->controller.dev->transfer (&dev->controller, transfer, 1000);
   grub_dprintf ("usb", "control: err=%d\n", err);
 
   grub_free (transfer->transactions);
@@ -162,7 +162,7 @@ grub_usb_control_msg (grub_usb_device_t dev,
 static grub_usb_err_t
 grub_usb_bulk_readwrite (grub_usb_device_t dev,
 			 int endpoint, grub_size_t size0, char *data_in,
-			 grub_transfer_type_t type)
+			 grub_transfer_type_t type, int timeout)
 {
   int i;
   grub_usb_transfer_t transfer;
@@ -243,7 +243,7 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
       size -= tr->size;
     }
 
-  err = dev->controller.dev->transfer (&dev->controller, transfer);
+  err = dev->controller.dev->transfer (&dev->controller, transfer, timeout);
   /* We must remember proper toggle value even if some transactions
    * were not processed - correct value should be inversion of last
    * processed transaction (TD). */
@@ -269,7 +269,7 @@ grub_usb_bulk_write (grub_usb_device_t dev,
 		     int endpoint, grub_size_t size, char *data)
 {
   return grub_usb_bulk_readwrite (dev, endpoint, size, data,
-				  GRUB_USB_TRANSFER_TYPE_OUT);
+				  GRUB_USB_TRANSFER_TYPE_OUT, 1000);
 }
 
 grub_usb_err_t
@@ -277,5 +277,14 @@ grub_usb_bulk_read (grub_usb_device_t dev,
 		    int endpoint, grub_size_t size, char *data)
 {
   return grub_usb_bulk_readwrite (dev, endpoint, size, data,
-				  GRUB_USB_TRANSFER_TYPE_IN);
+				  GRUB_USB_TRANSFER_TYPE_IN, 1000);
+}
+
+grub_usb_err_t
+grub_usb_bulk_read_timeout (grub_usb_device_t dev,
+			    int endpoint, grub_size_t size, char *data,
+			    int timeout)
+{
+  return grub_usb_bulk_readwrite (dev, endpoint, size, data,
+				  GRUB_USB_TRANSFER_TYPE_IN, timeout);
 }
diff --git a/include/grub/usb.h b/include/grub/usb.h
index 595cbd6d3..aba2fccc7 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -50,6 +50,7 @@ typedef enum
 
 enum
   {
+    GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT = 0x21,
     GRUB_USB_REQTYPE_VENDOR_OUT = 0x40
   };
 
@@ -103,7 +104,8 @@ struct grub_usb_controller_dev
   int (*iterate) (int (*hook) (grub_usb_controller_t dev));
 
   grub_usb_err_t (*transfer) (grub_usb_controller_t dev,
-			      grub_usb_transfer_t transfer);
+			      grub_usb_transfer_t transfer,
+			      int timeout);
 
   int (*hubports) (grub_usb_controller_t dev);
 
@@ -235,5 +237,9 @@ void grub_usb_unregister_attach_hook_class (struct grub_usb_attach_desc *desc);
 void grub_usb_poll_devices (void);
 
 void grub_usb_device_attach (grub_usb_device_t dev);
+grub_usb_err_t
+grub_usb_bulk_read_timeout (grub_usb_device_t dev,
+			    int endpoint, grub_size_t size, char *data,
+			    int timeout);
 
 #endif /* GRUB_USB_H */

From 9edd681bbc114fbcf22e78de10092b650ead9653 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 21:36:00 +0200
Subject: [PATCH 1266/1628] Somewhat working although a lot of hardcoding
 pl2303

---
 bus/usb/serial/pl2303.c | 59 +++++++++++++++--------------------------
 bus/usb/usb.c           |  1 +
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/bus/usb/serial/pl2303.c b/bus/usb/serial/pl2303.c
index eeb53402e..b7b25daf3 100644
--- a/bus/usb/serial/pl2303.c
+++ b/bus/usb/serial/pl2303.c
@@ -24,17 +24,6 @@
 #include <grub/usb.h>
 #include <grub/usbserial.h>
 
-enum
-  {
-    GRUB_FTDI_MODEM_CTRL = 0x01,
-    GRUB_FTDI_FLOW_CTRL = 0x02,
-    GRUB_FTDI_SPEED_CTRL = 0x03,
-    GRUB_FTDI_DATA_CTRL = 0x04
-  };
-
-#define GRUB_FTDI_MODEM_CTRL_DTRRTS 3
-#define GRUB_FTDI_FLOW_CTRL_DTRRTS 3
-
 /* Convert speed to divisor.  */
 static grub_uint32_t
 get_divisor (unsigned int speed)
@@ -68,41 +57,36 @@ get_divisor (unsigned int speed)
   return 0;
 }
 
+#define GRUB_PL2303_REQUEST_CONFIG 1
+
 static void
 real_config (struct grub_serial_port *port)
 {
-  grub_uint32_t divisor;
-  const grub_uint16_t parities[] = {
-    [GRUB_SERIAL_PARITY_NONE] = 0x0000,
-    [GRUB_SERIAL_PARITY_ODD] = 0x0100,
-    [GRUB_SERIAL_PARITY_EVEN] = 0x0200
-  };
-  const grub_uint16_t stop_bits[] = {
-    [GRUB_SERIAL_STOP_BITS_1] = 0x0000,
-    [GRUB_SERIAL_STOP_BITS_2] = 0x1000,
-  };
+  struct req20
+  {
+    char data[7];
+  } req20;
 
-  //  if (port->configured)
+  if (port->configured)
     return;
 
   grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
-			GRUB_FTDI_MODEM_CTRL,
-			GRUB_FTDI_MODEM_CTRL_DTRRTS, 0, 0, 0);
-
+			GRUB_PL2303_REQUEST_CONFIG, 0, 0x61, 0, 0);
   grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
-			GRUB_FTDI_FLOW_CTRL,
-			GRUB_FTDI_FLOW_CTRL_DTRRTS, 0, 0, 0);
-
-  divisor = get_divisor (port->config.speed);
+			GRUB_PL2303_REQUEST_CONFIG, 1, 0, 0, 0);
   grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
-			GRUB_FTDI_SPEED_CTRL,
-			divisor & 0xffff, divisor >> 16, 0, 0);
-
+			GRUB_PL2303_REQUEST_CONFIG, 2, 0x44, 0, 0);
   grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
-			GRUB_FTDI_DATA_CTRL,
-			parities[port->config.parity]
-			| stop_bits[port->config.stop_bits]
-			| port->config.word_len, 0, 0, 0);
+			GRUB_PL2303_REQUEST_CONFIG, 8, 0, 0, 0);
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
+			GRUB_PL2303_REQUEST_CONFIG, 9, 0, 0, 0);
+
+  grub_memset (&req20, 0, sizeof (req20));
+  req20.data[6] = 8;
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT,
+			0x20, 0, 0, sizeof (req20), (char *) &req20);
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT,
+			0x22, 3, 0, 0, 0);
 
   port->configured = 1;
 }
@@ -116,7 +100,8 @@ pl2303_hw_fetch (struct grub_serial_port *port)
 
   real_config (port);
 
-  err = grub_usb_bulk_read (port->usbdev, port->in_endp->endp_addr, 1, &cc);
+  err = grub_usb_bulk_read_timeout (port->usbdev, port->in_endp->endp_addr,
+				    1, &cc, 10);
   if (err != GRUB_USB_ERR_NONE)
     return -1;
 
diff --git a/bus/usb/usb.c b/bus/usb/usb.c
index b49caacdb..a961e0b48 100644
--- a/bus/usb/usb.c
+++ b/bus/usb/usb.c
@@ -272,6 +272,7 @@ void grub_usb_device_attach (grub_usb_device_t dev)
 	case 0xff:
 	  /* FIXME: don't load useless modules.  */
 	  grub_dl_load ("usbserial_ftdi");
+	  grub_dl_load ("usbserial_pl2303");
 	  break;
 	}
     }

From 9685412782b19c0a771151d9057a302baa3a0c39 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 18 Jul 2010 23:12:08 +0200
Subject: [PATCH 1267/1628] PL2303 works and is configurable. But sometime
 input is lost

---
 bus/usb/serial/pl2303.c | 121 +++++++++++++++++++++++++---------------
 include/grub/usb.h      |   3 +-
 2 files changed, 77 insertions(+), 47 deletions(-)

diff --git a/bus/usb/serial/pl2303.c b/bus/usb/serial/pl2303.c
index b7b25daf3..ae1a4c1b3 100644
--- a/bus/usb/serial/pl2303.c
+++ b/bus/usb/serial/pl2303.c
@@ -26,68 +26,100 @@
 
 /* Convert speed to divisor.  */
 static grub_uint32_t
-get_divisor (unsigned int speed)
+is_speed_supported (unsigned int speed)
 {
   unsigned int i;
+  unsigned int supported[] = { 2400, 4800, 9600, 19200, 38400, 57600, 115200};
 
-  /* The structure for speed vs. divisor.  */
-  struct divisor
-  {
-    unsigned int speed;
-    grub_uint32_t div;
-  };
-
-  /* The table which lists common configurations.  */
-  /* Computed with a division formula with 3MHz as base frequency. */
-  static struct divisor divisor_tab[] =
-    {
-      { 2400,   0x04e2 },
-      { 4800,   0x0271 },
-      { 9600,   0x4138 },
-      { 19200,  0x809c },
-      { 38400,  0xc04e },
-      { 57600,  0xc034 },
-      { 115200, 0x001a }
-    };
-
-  /* Set the baud rate.  */
-  for (i = 0; i < ARRAY_SIZE (divisor_tab); i++)
-    if (divisor_tab[i].speed == speed)
-      return divisor_tab[i].div;
+  for (i = 0; i < ARRAY_SIZE (supported); i++)
+    if (supported[i] == speed)
+      return 1;
   return 0;
 }
 
-#define GRUB_PL2303_REQUEST_CONFIG 1
+#define GRUB_PL2303_REQUEST_SET_CONFIG 0x20
+#define GRUB_PL2303_STOP_BITS_1 0x0
+#define GRUB_PL2303_STOP_BITS_2 0x2
+
+#define GRUB_PL2303_PARITY_NONE 0
+#define GRUB_PL2303_PARITY_ODD  1
+#define GRUB_PL2303_PARITY_EVEN 2
+
+struct grub_pl2303_config
+{
+  grub_uint32_t speed;
+  grub_uint8_t stop_bits;
+  grub_uint8_t parity;
+  grub_uint8_t word_len;
+} __attribute__ ((packed));
 
 static void
 real_config (struct grub_serial_port *port)
 {
-  struct req20
-  {
-    char data[7];
-  } req20;
+  struct grub_pl2303_config config_pl2303;
+  char xx;
 
   if (port->configured)
     return;
 
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_IN,
+			1, 0x8484, 0, 1, &xx);
   grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
-			GRUB_PL2303_REQUEST_CONFIG, 0, 0x61, 0, 0);
-  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
-			GRUB_PL2303_REQUEST_CONFIG, 1, 0, 0, 0);
-  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
-			GRUB_PL2303_REQUEST_CONFIG, 2, 0x44, 0, 0);
-  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
-			GRUB_PL2303_REQUEST_CONFIG, 8, 0, 0, 0);
-  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
-			GRUB_PL2303_REQUEST_CONFIG, 9, 0, 0, 0);
+			1, 0x0404, 0, 0, 0);
 
-  grub_memset (&req20, 0, sizeof (req20));
-  req20.data[6] = 8;
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_IN,
+			1, 0x8484, 0, 1, &xx);
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_IN,
+			1, 0x8383, 0, 1, &xx);
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_IN,
+			1, 0x8484, 0, 1, &xx);
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
+			1, 0x0404, 1, 0, 0);
+
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_IN,
+			1, 0x8484, 0, 1, &xx);
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_IN,
+			1, 0x8383, 0, 1, &xx);
+
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
+			1, 0, 1, 0, 0);
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
+			1, 1, 0, 0, 0);
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
+			1, 2, 0x44, 0, 0);
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
+			1, 8, 0, 0, 0);
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
+			1, 9, 0, 0, 0);
+
+  if (port->config.stop_bits == GRUB_SERIAL_STOP_BITS_2)
+    config_pl2303.stop_bits = GRUB_PL2303_STOP_BITS_2;
+  else
+    config_pl2303.stop_bits = GRUB_PL2303_STOP_BITS_1;
+
+  switch (port->config.parity)
+    {
+    case GRUB_SERIAL_PARITY_NONE:
+      config_pl2303.parity = GRUB_PL2303_PARITY_NONE;
+      break;
+    case GRUB_SERIAL_PARITY_ODD:
+      config_pl2303.parity = GRUB_PL2303_PARITY_ODD;
+      break;
+    case GRUB_SERIAL_PARITY_EVEN:
+      config_pl2303.parity = GRUB_PL2303_PARITY_EVEN;
+      break;
+    }
+
+  config_pl2303.word_len = port->config.word_len;
+  config_pl2303.speed = port->config.speed;
   grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT,
-			0x20, 0, 0, sizeof (req20), (char *) &req20);
+			GRUB_PL2303_REQUEST_SET_CONFIG, 0, 0,
+			sizeof (config_pl2303), (char *) &config_pl2303);
   grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT,
 			0x22, 3, 0, 0, 0);
 
+  grub_usb_control_msg (port->usbdev, GRUB_USB_REQTYPE_VENDOR_OUT,
+			1, 0, 0x61, 0, 0);
   port->configured = 1;
 }
 
@@ -123,10 +155,7 @@ static grub_err_t
 pl2303_hw_configure (struct grub_serial_port *port,
 			struct grub_serial_config *config)
 {
-  grub_uint16_t divisor;
-
-  divisor = get_divisor (config->speed);
-  if (divisor == 0)
+  if (!is_speed_supported (config->speed))
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad speed");
 
   if (config->parity != GRUB_SERIAL_PARITY_NONE
diff --git a/include/grub/usb.h b/include/grub/usb.h
index aba2fccc7..8b54e869f 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -51,7 +51,8 @@ typedef enum
 enum
   {
     GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT = 0x21,
-    GRUB_USB_REQTYPE_VENDOR_OUT = 0x40
+    GRUB_USB_REQTYPE_VENDOR_OUT = 0x40,
+    GRUB_USB_REQTYPE_VENDOR_IN = 0xc0
   };
 
 /* Call HOOK with each device, until HOOK returns non-zero.  */

From ac2534273bd10fde16fcd367a65e9fe575e20872 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 19 Jul 2010 00:12:59 +0200
Subject: [PATCH 1268/1628] fix losing pl2303 input at the price of losing some
 input bytes sometimes.

---
 bus/usb/serial/pl2303.c | 15 ++++++++++++---
 include/grub/serial.h   |  2 ++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/bus/usb/serial/pl2303.c b/bus/usb/serial/pl2303.c
index ae1a4c1b3..e2dcd606e 100644
--- a/bus/usb/serial/pl2303.c
+++ b/bus/usb/serial/pl2303.c
@@ -127,17 +127,26 @@ real_config (struct grub_serial_port *port)
 static int
 pl2303_hw_fetch (struct grub_serial_port *port)
 {
-  char cc;
   grub_usb_err_t err;
 
   real_config (port);
 
+  if (port->bufstart < port->bufend)
+    return port->buf[port->bufstart++];
+
   err = grub_usb_bulk_read_timeout (port->usbdev, port->in_endp->endp_addr,
-				    1, &cc, 10);
+				    sizeof (port->buf), port->buf, 10);
   if (err != GRUB_USB_ERR_NONE)
     return -1;
 
-  return cc;
+  port->bufstart = 0;
+  /* FIXME: nearly always only one byte is transfered.
+     It happens however that more are transfered.
+     Setting sizeof (port->buf) to 1 leads code to stop reading after
+     such transfer.  */
+  port->bufend = 1;
+
+  return port->buf[port->bufstart++];
 }
 
 /* Put a character.  */
diff --git a/include/grub/serial.h b/include/grub/serial.h
index fd601a6d9..a7d37c7de 100644
--- a/include/grub/serial.h
+++ b/include/grub/serial.h
@@ -67,6 +67,8 @@ struct grub_serial_port
   struct grub_serial_driver *driver;
   struct grub_serial_config config;
   int configured;
+  char buf[64];
+  int bufstart, bufend;
   /* This should be void *data but since serial is useful as an early console
      when malloc isn't available it's a union.
    */

From 824e1447accec3af43d6b0f31adab4a99523b8cb Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 19 Jul 2010 00:13:06 +0200
Subject: [PATCH 1269/1628] Use generic description of HID endpoints

---
 include/grub/usb.h  |  1 +
 term/usb_keyboard.c | 27 +++++++++++----------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/include/grub/usb.h b/include/grub/usb.h
index 8b54e869f..0ebb39478 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -52,6 +52,7 @@ enum
   {
     GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT = 0x21,
     GRUB_USB_REQTYPE_VENDOR_OUT = 0x40,
+    GRUB_USB_REQTYPE_CLASS_INTERFACE_IN = 0xa1,
     GRUB_USB_REQTYPE_VENDOR_IN = 0xc0
   };
 
diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index f010aa9e4..1c0ce228f 100644
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -55,11 +55,6 @@ static char keyboard_map_shift[128] =
   };
 
 
-/* Valid values for bmRequestType.  See HID definition version 1.11 section
-   7.2.  */
-#define USB_HID_HOST_TO_DEVICE	0x21
-#define USB_HID_DEVICE_TO_HOST	0xA1
-
 /* Valid values for bRequest.  See HID definition version 1.11 section 7.2. */
 #define USB_HID_GET_REPORT	0x01
 #define USB_HID_GET_IDLE	0x02
@@ -128,12 +123,12 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)
   grub_printf ("HID found!\n");
 
   /* Place the device in boot mode.  */
-  grub_usb_control_msg (usbdev, USB_HID_HOST_TO_DEVICE, USB_HID_SET_PROTOCOL,
-			0, 0, 0, 0);
+  grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT,
+			USB_HID_SET_PROTOCOL, 0, 0, 0, 0);
 
   /* Reports every time an event occurs and not more often than that.  */
-  grub_usb_control_msg (usbdev, USB_HID_HOST_TO_DEVICE, USB_HID_SET_IDLE,
-			0<<8, 0, 0, 0);
+  grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT,
+			USB_HID_SET_IDLE, 0<<8, 0, 0, 0);
 
   grub_memcpy (&grub_usb_keyboards[curnum], &grub_usb_keyboard_term,
 	       sizeof (grub_usb_keyboards[curnum]));
@@ -152,8 +147,8 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)
 static grub_err_t
 grub_usb_keyboard_getreport (grub_usb_device_t dev, grub_uint8_t *report)
 {
-  return grub_usb_control_msg (dev, USB_HID_DEVICE_TO_HOST, USB_HID_GET_REPORT,
-			       0, 0, 8, (char *) report);
+  return grub_usb_control_msg (dev, GRUB_USB_REQTYPE_CLASS_INTERFACE_IN,
+			       USB_HID_GET_REPORT, 0, 0, 8, (char *) report);
 }
 
 
@@ -205,7 +200,7 @@ grub_usb_keyboard_checkkey (struct grub_term_input *term)
   /* Wait until the key is released.  */
   while (!err && data[2])
     {
-      err = grub_usb_control_msg (usbdev, USB_HID_DEVICE_TO_HOST,
+      err = grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_IN,
 				  USB_HID_GET_REPORT, 0, 0,
 				  sizeof (data), (char *) data);
       grub_dprintf ("usb_keyboard",
@@ -306,8 +301,8 @@ grub_usb_keyboard_getkeystatus (struct grub_term_input *term)
 
   /* Set idle time to the minimum offered by the spec (4 milliseconds) so
      that we can find out the current state.  */
-  grub_usb_control_msg (usbdev, USB_HID_HOST_TO_DEVICE, USB_HID_SET_IDLE,
-			0<<8, 0, 0, 0);
+  grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT,
+			USB_HID_SET_IDLE, 0<<8, 0, 0, 0);
 
   currtime = grub_get_time_ms ();
   do
@@ -323,8 +318,8 @@ grub_usb_keyboard_getkeystatus (struct grub_term_input *term)
 
   /* Go back to reporting every time an event occurs and not more often than
      that.  */
-  grub_usb_control_msg (usbdev, USB_HID_HOST_TO_DEVICE, USB_HID_SET_IDLE,
-			0<<8, 0, 0, 0);
+  grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT,
+			USB_HID_SET_IDLE, 0<<8, 0, 0, 0);
 
   /* We allowed a while for modifiers to show up in the report, but it is
      not an error if they never did.  */

From 34787305df83999507efdab0cc9279de8f243f47 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 19 Jul 2010 08:43:01 +0200
Subject: [PATCH 1270/1628] Allow psartial transfers and use them for usbserial

---
 bus/usb/ohci.c           | 23 ++++++++++++++---------
 bus/usb/serial/common.c  | 23 +++++++++++++++++++++++
 bus/usb/serial/ftdi.c    |  9 +--------
 bus/usb/serial/pl2303.c  | 19 +------------------
 bus/usb/uhci.c           | 23 ++++++++++++++++-------
 bus/usb/usbtrans.c       | 39 ++++++++++++++++++++++++++++-----------
 include/grub/serial.h    |  4 ++--
 include/grub/usb.h       |  8 ++++----
 include/grub/usbserial.h |  3 +++
 include/grub/usbtrans.h  |  1 +
 10 files changed, 93 insertions(+), 59 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 73e3e01e8..d8abb343a 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -654,7 +654,8 @@ grub_ohci_transaction (grub_ohci_td_t td,
 
 static grub_usb_err_t
 grub_ohci_transfer (grub_usb_controller_t dev,
-		    grub_usb_transfer_t transfer, int timeout)
+		    grub_usb_transfer_t transfer, int timeout,
+		    grub_size_t *actual)
 {
   struct grub_ohci *o = (struct grub_ohci *) dev->data;
   grub_ohci_ed_t ed_virt;
@@ -680,6 +681,8 @@ grub_ohci_transfer (grub_usb_controller_t dev,
   int err_unrec = 0;
   grub_uint32_t intstatus;
 
+  *actual = 0;
+
   /* Pre-set target for ED - we need it to find proper ED */
   /* Set the device address.  */
   target = transfer->devaddr;
@@ -1078,12 +1081,14 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 
 	case 9:
 	  /* XXX: Data underrun error.  */
-	  err = GRUB_USB_ERR_DATA;
 	  grub_dprintf ("ohci", "Underrun, failed TD address: %p, index: %d\n",
 	                tderr_virt, tderr_virt->tr_index);
-	  grub_dprintf ("ohci", "Underrun, number of not transferred bytes: %d\n",
-	                1 + grub_le_to_cpu32 (tderr_virt->buffer_end)
-	                  - grub_le_to_cpu32 (tderr_virt->buffer));
+	  if (transfer->last_trans == -1)
+	    break;
+	  *actual = transfer->transactions[transfer->last_trans].size
+	    - (grub_le_to_cpu32 (tderr_virt->buffer_end)
+	       - grub_le_to_cpu32 (tderr_virt->buffer))
+	    + transfer->transactions[transfer->last_trans].preceding;
 	  break;
 
 	case 10:
@@ -1172,12 +1177,12 @@ grub_ohci_transfer (grub_usb_controller_t dev,
         transfer->last_trans = tderr_virt->tr_index;
       else
         transfer->last_trans = -1;
-
     }
+  else
+    *actual = transfer->size;
 
-    /* Set empty ED - set HEAD = TAIL = last (not processed) TD */
-    ed_virt->td_head = grub_cpu_to_le32 ( grub_le_to_cpu32 (
-                                            ed_virt->td_tail) & ~0xf); 
+  /* Set empty ED - set HEAD = TAIL = last (not processed) TD */
+  ed_virt->td_head = grub_cpu_to_le32 (grub_le_to_cpu32 (ed_virt->td_tail) & ~0xf); 
 
   /* At this point always should be:
    * ED has skip bit set and halted or empty or after next SOF,
diff --git a/bus/usb/serial/common.c b/bus/usb/serial/common.c
index 1da1c5bcf..6b5b90059 100644
--- a/bus/usb/serial/common.c
+++ b/bus/usb/serial/common.c
@@ -100,3 +100,26 @@ grub_usbserial_attach (grub_usb_device_t usbdev, int configno, int interfno,
 
   return 1;
 }
+
+int
+grub_usbserial_fetch (struct grub_serial_port *port, grub_size_t header_size)
+{
+  grub_usb_err_t err;
+  grub_size_t actual;
+
+  if (port->bufstart < port->bufend)
+    return port->buf[port->bufstart++];
+
+  err = grub_usb_bulk_read_extended (port->usbdev, port->in_endp->endp_addr,
+				     sizeof (port->buf), port->buf, 10,
+				     &actual);
+  if (err != GRUB_USB_ERR_NONE)
+    return -1;
+
+  port->bufstart = header_size;
+  port->bufend = actual;
+  if (port->bufstart >= port->bufend)
+    return -1;
+
+  return port->buf[port->bufstart++];
+}
diff --git a/bus/usb/serial/ftdi.c b/bus/usb/serial/ftdi.c
index a4d88dbae..bd1713b27 100644
--- a/bus/usb/serial/ftdi.c
+++ b/bus/usb/serial/ftdi.c
@@ -111,16 +111,9 @@ real_config (struct grub_serial_port *port)
 static int
 ftdi_hw_fetch (struct grub_serial_port *port)
 {
-  char cc[3];
-  grub_usb_err_t err;
-
   real_config (port);
 
-  err = grub_usb_bulk_read (port->usbdev, port->in_endp->endp_addr, 3, cc);
-  if (err != GRUB_USB_ERR_NONE)
-    return -1;
-
-  return cc[2];
+  return grub_usbserial_fetch (port, 2);
 }
 
 /* Put a character.  */
diff --git a/bus/usb/serial/pl2303.c b/bus/usb/serial/pl2303.c
index e2dcd606e..9e3b9ae7e 100644
--- a/bus/usb/serial/pl2303.c
+++ b/bus/usb/serial/pl2303.c
@@ -127,26 +127,9 @@ real_config (struct grub_serial_port *port)
 static int
 pl2303_hw_fetch (struct grub_serial_port *port)
 {
-  grub_usb_err_t err;
-
   real_config (port);
 
-  if (port->bufstart < port->bufend)
-    return port->buf[port->bufstart++];
-
-  err = grub_usb_bulk_read_timeout (port->usbdev, port->in_endp->endp_addr,
-				    sizeof (port->buf), port->buf, 10);
-  if (err != GRUB_USB_ERR_NONE)
-    return -1;
-
-  port->bufstart = 0;
-  /* FIXME: nearly always only one byte is transfered.
-     It happens however that more are transfered.
-     Setting sizeof (port->buf) to 1 leads code to stop reading after
-     such transfer.  */
-  port->bufend = 1;
-
-  return port->buf[port->bufstart++];
+  return grub_usbserial_fetch (port, 0);
 }
 
 /* Put a character.  */
diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index d211de369..69fae60fd 100644
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -75,8 +75,10 @@ struct grub_uhci_td
      This is GRUB specific.  */
   grub_uint32_t linkptr2;
 
-  /* 3 additional 32 bits words reserved for the Host Controller Driver.  */
-  grub_uint32_t data[3];
+  grub_uint32_t buffer0;
+
+  /* 2 additional 32 bits words reserved for the Host Controller Driver.  */
+  grub_uint32_t data[2];
 } __attribute__ ((packed));
 
 typedef volatile struct grub_uhci_td *grub_uhci_td_t;
@@ -333,9 +335,11 @@ grub_free_td (struct grub_uhci *u, grub_uhci_td_t td)
 
 static void
 grub_free_queue (struct grub_uhci *u, grub_uhci_td_t td,
-                 grub_usb_transfer_t transfer)
+                 grub_usb_transfer_t transfer, grub_size_t *actual)
 {
   int i; /* Index of TD in transfer */
+
+  *actual = 0;
   
   /* Free the TDs in this queue and set last_trans.  */
   for (i=0; td; i++)
@@ -345,6 +349,8 @@ grub_free_queue (struct grub_uhci *u, grub_uhci_td_t td,
       /* Check state of TD and possibly set last_trans */
       if (transfer && (td->linkptr & 1))
         transfer->last_trans = i;
+
+      *actual += (td->ctrl_status + 1) & 0x7ff;
       
       /* Unlink the queue.  */
       tdprev = td;
@@ -430,6 +436,7 @@ grub_uhci_transaction (struct grub_uhci *u, unsigned int endp,
 	       | (addr << 8) | tf[type]);
 
   td->buffer = data;
+  td->buffer0 = data;
 
   return td;
 }
@@ -437,7 +444,7 @@ grub_uhci_transaction (struct grub_uhci *u, unsigned int endp,
 static grub_usb_err_t
 grub_uhci_transfer (grub_usb_controller_t dev,
 		    grub_usb_transfer_t transfer,
-		    int timeout)
+		    int timeout, grub_size_t *actual)
 {
   struct grub_uhci *u = (struct grub_uhci *) dev->data;
   grub_uhci_qh_t qh;
@@ -448,10 +455,12 @@ grub_uhci_transfer (grub_usb_controller_t dev,
   int i;
   grub_uint64_t endtime;
 
+  *actual = 0;
+
   /* Allocate a queue head for the transfer queue.  */
   qh = grub_alloc_qh (u, GRUB_USB_TRANSACTION_TYPE_CONTROL);
   if (! qh)
-    return grub_errno;
+    return GRUB_USB_ERR_INTERNAL;
 
   grub_dprintf ("uhci", "transfer, iobase:%08x\n", u->iobase);
   
@@ -469,7 +478,7 @@ grub_uhci_transfer (grub_usb_controller_t dev,
 	  td_prev->linkptr = 1;
 
 	  if (td_first)
-	    grub_free_queue (u, td_first, NULL);
+	    grub_free_queue (u, td_first, NULL, actual);
 
 	  return GRUB_USB_ERR_INTERNAL;
 	}
@@ -563,7 +572,7 @@ grub_uhci_transfer (grub_usb_controller_t dev,
   /* Place the QH back in the free list and deallocate the associated
      TDs.  */
   qh->elinkptr = 1;
-  grub_free_queue (u, td_first, transfer);
+  grub_free_queue (u, td_first, transfer, actual);
 
   return err;
 }
diff --git a/bus/usb/usbtrans.c b/bus/usb/usbtrans.c
index 9dfef509f..db2ec097a 100644
--- a/bus/usb/usbtrans.c
+++ b/bus/usb/usbtrans.c
@@ -43,6 +43,7 @@ grub_usb_control_msg (grub_usb_device_t dev,
   volatile char *data;
   grub_uint32_t data_addr;
   grub_size_t size = size0;
+  grub_size_t actual;
 
   /* FIXME: avoid allocation any kind of buffer in a first place.  */
   data_chunk = grub_memalign_dma32 (128, size ? : 16);
@@ -132,6 +133,7 @@ grub_usb_control_msg (grub_usb_device_t dev,
       else
 	tr->pid = GRUB_USB_TRANSFER_TYPE_OUT;
       tr->data = data_addr + i * max;
+      tr->preceding = i * max;
       size -= max;
     }
 
@@ -145,7 +147,8 @@ grub_usb_control_msg (grub_usb_device_t dev,
 
   transfer->transactions[datablocks + 1].toggle = 1;
 
-  err = dev->controller.dev->transfer (&dev->controller, transfer, 1000);
+  err = dev->controller.dev->transfer (&dev->controller, transfer,
+				       1000, &actual);
   grub_dprintf ("usb", "control: err=%d\n", err);
 
   grub_free (transfer->transactions);
@@ -162,7 +165,8 @@ grub_usb_control_msg (grub_usb_device_t dev,
 static grub_usb_err_t
 grub_usb_bulk_readwrite (grub_usb_device_t dev,
 			 int endpoint, grub_size_t size0, char *data_in,
-			 grub_transfer_type_t type, int timeout)
+			 grub_transfer_type_t type, int timeout,
+			 grub_size_t *actual)
 {
   int i;
   grub_usb_transfer_t transfer;
@@ -240,10 +244,12 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
       toggle = toggle ? 0 : 1;
       tr->pid = type;
       tr->data = data_addr + i * max;
+      tr->preceding = i * max;
       size -= tr->size;
     }
 
-  err = dev->controller.dev->transfer (&dev->controller, transfer, timeout);
+  err = dev->controller.dev->transfer (&dev->controller, transfer, timeout,
+				       actual);
   /* We must remember proper toggle value even if some transactions
    * were not processed - correct value should be inversion of last
    * processed transaction (TD). */
@@ -268,23 +274,34 @@ grub_usb_err_t
 grub_usb_bulk_write (grub_usb_device_t dev,
 		     int endpoint, grub_size_t size, char *data)
 {
-  return grub_usb_bulk_readwrite (dev, endpoint, size, data,
-				  GRUB_USB_TRANSFER_TYPE_OUT, 1000);
+  grub_size_t actual;
+  grub_usb_err_t err;
+
+  err = grub_usb_bulk_readwrite (dev, endpoint, size, data,
+				 GRUB_USB_TRANSFER_TYPE_OUT, 1000, &actual);
+  if (!err && actual != size)
+    err = GRUB_USB_ERR_DATA;
+  return err;
 }
 
 grub_usb_err_t
 grub_usb_bulk_read (grub_usb_device_t dev,
 		    int endpoint, grub_size_t size, char *data)
 {
-  return grub_usb_bulk_readwrite (dev, endpoint, size, data,
-				  GRUB_USB_TRANSFER_TYPE_IN, 1000);
+  grub_size_t actual;
+  grub_usb_err_t err;
+  err = grub_usb_bulk_readwrite (dev, endpoint, size, data,
+				 GRUB_USB_TRANSFER_TYPE_IN, 1000, &actual);
+  if (!err && actual != size)
+    err = GRUB_USB_ERR_DATA;
+  return err;
 }
 
 grub_usb_err_t
-grub_usb_bulk_read_timeout (grub_usb_device_t dev,
-			    int endpoint, grub_size_t size, char *data,
-			    int timeout)
+grub_usb_bulk_read_extended (grub_usb_device_t dev,
+			     int endpoint, grub_size_t size, char *data,
+			     int timeout, grub_size_t *actual)
 {
   return grub_usb_bulk_readwrite (dev, endpoint, size, data,
-				  GRUB_USB_TRANSFER_TYPE_IN, timeout);
+				  GRUB_USB_TRANSFER_TYPE_IN, timeout, actual);
 }
diff --git a/include/grub/serial.h b/include/grub/serial.h
index a7d37c7de..68cec6fdf 100644
--- a/include/grub/serial.h
+++ b/include/grub/serial.h
@@ -67,8 +67,6 @@ struct grub_serial_port
   struct grub_serial_driver *driver;
   struct grub_serial_config config;
   int configured;
-  char buf[64];
-  int bufstart, bufend;
   /* This should be void *data but since serial is useful as an early console
      when malloc isn't available it's a union.
    */
@@ -80,6 +78,8 @@ struct grub_serial_port
       grub_usb_device_t usbdev;
       int configno;
       int interfno;
+      char buf[64];
+      int bufstart, bufend;
       struct grub_usb_desc_endp *in_endp;
       struct grub_usb_desc_endp *out_endp;
     };
diff --git a/include/grub/usb.h b/include/grub/usb.h
index 0ebb39478..b2dc77ce4 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -107,7 +107,7 @@ struct grub_usb_controller_dev
 
   grub_usb_err_t (*transfer) (grub_usb_controller_t dev,
 			      grub_usb_transfer_t transfer,
-			      int timeout);
+			      int timeout, grub_size_t *actual);
 
   int (*hubports) (grub_usb_controller_t dev);
 
@@ -240,8 +240,8 @@ void grub_usb_poll_devices (void);
 
 void grub_usb_device_attach (grub_usb_device_t dev);
 grub_usb_err_t
-grub_usb_bulk_read_timeout (grub_usb_device_t dev,
-			    int endpoint, grub_size_t size, char *data,
-			    int timeout);
+grub_usb_bulk_read_extended (grub_usb_device_t dev,
+			     int endpoint, grub_size_t size, char *data,
+			     int timeout, grub_size_t *actual);
 
 #endif /* GRUB_USB_H */
diff --git a/include/grub/usbserial.h b/include/grub/usbserial.h
index 786eff7fe..74201256e 100644
--- a/include/grub/usbserial.h
+++ b/include/grub/usbserial.h
@@ -28,4 +28,7 @@ void grub_usbserial_detach (grub_usb_device_t usbdev, int configno,
 int
 grub_usbserial_attach (grub_usb_device_t usbdev, int configno, int interfno,
 		       struct grub_serial_driver *driver);
+int
+grub_usbserial_fetch (struct grub_serial_port *port, grub_size_t header_size);
+
 #endif
diff --git a/include/grub/usbtrans.h b/include/grub/usbtrans.h
index e68698c1d..a5bb2e8b2 100644
--- a/include/grub/usbtrans.h
+++ b/include/grub/usbtrans.h
@@ -38,6 +38,7 @@ struct grub_usb_transaction
   int toggle;
   grub_transfer_type_t pid;
   grub_uint32_t data;
+  grub_size_t preceding;
 };
 typedef struct grub_usb_transaction *grub_usb_transaction_t;
 

From 68ac8c8d151cc3dc41c3e5ca578f6fea2a5941fe Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 19 Jul 2010 11:35:16 +0100
Subject: [PATCH 1271/1628] * disk/mdraid_linux.c (struct grub_raid_super_1x):
 Remove __attribute__ ((packed)), leaving a comment. (grub_mdraid_detect):
 Split out 0.9 and 1.x detection to ... (grub_mdraid_detect_09): ... here and
 ... (grub_mdraid_detect_1x): ... here. * disk/raid.c (insert_array): Check
 for grub_xasprintf returning NULL.

---
 ChangeLog.raid      |  10 ++
 disk/mdraid_linux.c | 261 +++++++++++++++++++++++---------------------
 disk/raid.c         |  20 +++-
 3 files changed, 165 insertions(+), 126 deletions(-)

diff --git a/ChangeLog.raid b/ChangeLog.raid
index a66bd6905..d91f584c0 100644
--- a/ChangeLog.raid
+++ b/ChangeLog.raid
@@ -1,3 +1,13 @@
+2010-07-19  Colin Watson  <cjwatson@ubuntu.com>
+
+	* disk/mdraid_linux.c (struct grub_raid_super_1x): Remove
+	__attribute__ ((packed)), leaving a comment.
+	(grub_mdraid_detect): Split out 0.9 and 1.x detection to ...
+	(grub_mdraid_detect_09): ... here and ...
+	(grub_mdraid_detect_1x): ... here.
+	* disk/raid.c (insert_array): Check for grub_xasprintf returning
+	NULL.
+
 2010-07-18  Colin Watson  <cjwatson@ubuntu.com>
 
 	* disk/dmraid_nvidia.c (grub_dmraid_nv_detect): Add start_sector
diff --git a/disk/mdraid_linux.c b/disk/mdraid_linux.c
index b97e458ce..b1199c6ef 100644
--- a/disk/mdraid_linux.c
+++ b/disk/mdraid_linux.c
@@ -224,31 +224,152 @@ struct grub_raid_super_1x
    * have a meaningful role.
    */
   grub_uint16_t dev_roles[0];	/* Role in array, or 0xffff for a spare, or 0xfffe for faulty.  */
-} __attribute__ ((packed));
+};
+/* 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.  */
 
 #define WriteMostly1    1	/* Mask for writemostly flag in above devflags.  */
 
+static grub_err_t
+grub_mdraid_detect_09 (grub_disk_addr_t sector,
+		       struct grub_raid_super_09 *sb,
+		       struct grub_raid_array *array,
+		       grub_disk_addr_t *start_sector)
+{
+  grub_uint32_t *uuid;
+
+  if (sb->major_version != 0 || sb->minor_version != 90)
+    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+		       "unsupported RAID version: %d.%d",
+		       sb->major_version, sb->minor_version);
+
+  /* FIXME: Check the checksum.  */
+
+  /* Multipath.  */
+  if ((int) sb->level == -4)
+    sb->level = 1;
+
+  if (sb->level != 0 && sb->level != 1 && sb->level != 4 &&
+      sb->level != 5 && sb->level != 6 && sb->level != 10)
+    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+		       "unsupported RAID level: %d", sb->level);
+
+  array->name = NULL;
+  array->number = sb->md_minor;
+  array->level = sb->level;
+  array->layout = sb->layout;
+  array->total_devs = sb->raid_disks;
+  array->disk_size = (sb->size) ? sb->size * 2 : sector;
+  array->chunk_size = sb->chunk_size >> 9;
+  array->index = sb->this_disk.number;
+  array->uuid_len = 16;
+  array->uuid = grub_malloc (16);
+  if (!array->uuid)
+      return grub_errno;
+
+  uuid = (grub_uint32_t *) array->uuid;
+  uuid[0] = sb->set_uuid0;
+  uuid[1] = sb->set_uuid1;
+  uuid[2] = sb->set_uuid2;
+  uuid[3] = sb->set_uuid3;
+
+  *start_sector = 0;
+
+  return 0;
+}
+
+static grub_err_t
+grub_mdraid_detect_1x (grub_disk_t disk, grub_disk_addr_t sector,
+		       struct grub_raid_super_1x *sb,
+		       struct grub_raid_array *array,
+		       grub_disk_addr_t *start_sector)
+{
+  grub_uint64_t sb_size;
+  struct grub_raid_super_1x *real_sb;
+
+  if (sb->major_version != 1)
+    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+		       "Unsupported RAID version: %d",
+		       sb->major_version);
+
+  /* Multipath.  */
+  if ((int) sb->level == -4)
+    sb->level = 1;
+
+  if (sb->level != 0 && sb->level != 1 && sb->level != 4 &&
+      sb->level != 5 && sb->level != 6 && sb->level != 10)
+    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+		       "Unsupported RAID level: %d", sb->level);
+
+  /* 1.x superblocks don't have a fixed size on disk.  So we have to
+     read it again now that we now the max device count.  */
+  sb_size = sizeof (struct grub_raid_super_1x) + 2 * grub_le_to_cpu32 (sb->max_dev);
+  real_sb = grub_malloc (sb_size);
+  if (! real_sb)
+    return grub_errno;
+
+  if (grub_disk_read (disk, sector, 0, sb_size, real_sb))
+    {
+      grub_free (real_sb);
+      return grub_errno;
+    }
+
+  array->name = grub_strdup (real_sb->set_name);
+  if (! array->name)
+    {
+      grub_free (real_sb);
+      return grub_errno;
+    }
+
+  array->number = 0;
+  array->level = grub_le_to_cpu32 (real_sb->level);
+  array->layout = grub_le_to_cpu32 (real_sb->layout);
+  array->total_devs = grub_le_to_cpu32 (real_sb->raid_disks);
+  array->disk_size = grub_le_to_cpu64 (real_sb->size);
+  array->chunk_size = grub_le_to_cpu32 (real_sb->chunksize);
+  if (grub_le_to_cpu32 (real_sb->dev_number) <
+      grub_le_to_cpu32 (real_sb->max_dev))
+    array->index = grub_le_to_cpu16
+      (real_sb->dev_roles[grub_le_to_cpu32 (real_sb->dev_number)]);
+  else
+    array->index = 0xffff;  /* disk will be later not used! */
+  array->uuid_len = 16;
+  array->uuid = grub_malloc (16);
+  if (!array->uuid)
+    {
+      grub_free (real_sb);
+      return grub_errno;
+    }
+
+  grub_memcpy (array->uuid, real_sb->set_uuid, 16);
+
+  *start_sector = real_sb->data_offset;
+
+  grub_free (real_sb);
+  return 0;
+}
+
 static grub_err_t
 grub_mdraid_detect (grub_disk_t disk, struct grub_raid_array *array,
 		    grub_disk_addr_t *start_sector)
 {
   grub_disk_addr_t sector;
-  grub_uint64_t size, sb_size;
-  struct grub_raid_super_09 sb;
-  struct grub_raid_super_1x *sb_1x;
-  grub_uint32_t *uuid;
+  grub_uint64_t size;
+  struct grub_raid_super_09 sb_09;
+  struct grub_raid_super_1x sb_1x;
   grub_uint8_t minor_version;
 
   /* The sector where the mdraid 0.90 superblock is stored, if available.  */
   size = grub_disk_get_size (disk);
   sector = NEW_SIZE_SECTORS (size);
 
-  if (grub_disk_read (disk, sector, 0, SB_BYTES, &sb))
+  if (grub_disk_read (disk, sector, 0, SB_BYTES, &sb_09))
     return grub_errno;
 
   /* Look whether there is a mdraid 0.90 superblock.  */
-  if (sb.md_magic == SB_MAGIC)
-    goto superblock_0_90;
+  if (sb_09.md_magic == SB_MAGIC)
+    return grub_mdraid_detect_09 (sector, &sb_09, array, start_sector);
 
   /* Check for an 1.x superblock.
    * It's always aligned to a 4K boundary
@@ -258,10 +379,6 @@ grub_mdraid_detect (grub_disk_t disk, struct grub_raid_array *array,
    * 2: 4K from start of device.
    */
 
-  sb_1x = grub_malloc (sizeof (struct grub_raid_super_1x));
-  if (!sb_1x)
-    return grub_errno;
-
   for (minor_version = 0; minor_version < 3; ++minor_version)
     {
       switch (minor_version)
@@ -277,123 +394,17 @@ grub_mdraid_detect (grub_disk_t disk, struct grub_raid_array *array,
 	  break;
 	}
 
-      if (grub_disk_read
-	  (disk, sector, 0, sizeof (struct grub_raid_super_1x), sb_1x))
-	{
-	  grub_free (sb_1x);
-	  return grub_errno;
-	}
+      if (grub_disk_read (disk, sector, 0, sizeof (struct grub_raid_super_1x),
+			  &sb_1x))
+	return grub_errno;
 
-      if (sb_1x->magic == SB_MAGIC)
-	goto superblock_1_x;
+      if (sb_1x.magic == SB_MAGIC)
+	return grub_mdraid_detect_1x (disk, sector, &sb_1x, array,
+				      start_sector);
     }
 
   /* Neither 0.90 nor 1.x.  */
-  if (grub_le_to_cpu32 (sb_1x->magic) != SB_MAGIC)
-    return grub_error (GRUB_ERR_OUT_OF_RANGE, "not raid");
-
-superblock_0_90:
-
-  if (sb.major_version != 0 || sb.minor_version != 90)
-    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-		       "unsupported RAID version: %d.%d",
-		       sb.major_version, sb.minor_version);
-
-  /* FIXME: Check the checksum.  */
-
-  /* Multipath.  */
-  if ((int) sb.level == -4)
-    sb.level = 1;
-
-  if (sb.level != 0 && sb.level != 1 && sb.level != 4 &&
-      sb.level != 5 && sb.level != 6 && sb.level != 10)
-    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-		       "unsupported RAID level: %d", sb.level);
-
-  array->name = NULL;
-  array->number = sb.md_minor;
-  array->level = sb.level;
-  array->layout = sb.layout;
-  array->total_devs = sb.raid_disks;
-  array->disk_size = (sb.size) ? sb.size * 2 : sector;
-  array->chunk_size = sb.chunk_size >> 9;
-  array->index = sb.this_disk.number;
-  array->uuid_len = 16;
-  array->uuid = grub_malloc (16);
-  if (!array->uuid)
-      return grub_errno;
-
-  uuid = (grub_uint32_t *) array->uuid;
-  uuid[0] = sb.set_uuid0;
-  uuid[1] = sb.set_uuid1;
-  uuid[2] = sb.set_uuid2;
-  uuid[3] = sb.set_uuid3;
-
-  *start_sector = 0;
-
-  return 0;
-
- superblock_1_x:
-
-  if (sb_1x->major_version != 1)
-    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-		       "Unsupported RAID version: %d",
-		       sb_1x->major_version);
-  /* Multipath.  */
-  if ((int) sb_1x->level == -4)
-    sb_1x->level = 1;
-
-  if (sb_1x->level != 0 && sb_1x->level != 1 && sb_1x->level != 4 &&
-      sb_1x->level != 5 && sb_1x->level != 6 && sb_1x->level != 10)
-    {
-      return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-			 "Unsupported RAID level: %d", sb_1x->level);
-      grub_free (sb_1x);
-    }
-  /* 1.x superblocks don't have a fixed size on disk.  So we have to
-     read it again now that we now the max device count.  */
-  sb_size = sizeof (struct grub_raid_super_1x) + 2 * grub_le_to_cpu32 (sb_1x->max_dev);
-  sb_1x = grub_realloc (sb_1x, sb_size);
-  if (! sb_1x)
-    return grub_errno;
-
-  if (grub_disk_read (disk, sector, 0, sb_size, sb_1x))
-    {
-      grub_free (sb_1x);
-      return grub_errno;
-    }
-
-  array->name = grub_strdup (sb_1x->set_name);
-  if (! array->name)
-    {
-      grub_free (sb_1x);
-      return grub_errno;
-    }
-
-  array->number = 0;
-  array->level = grub_le_to_cpu32 (sb_1x->level);
-  array->layout = grub_le_to_cpu32 (sb_1x->layout);
-  array->total_devs = grub_le_to_cpu32 (sb_1x->raid_disks);
-  array->disk_size = grub_le_to_cpu64 (sb_1x->size);
-  array->chunk_size = grub_le_to_cpu32 (sb_1x->chunksize);
-  if (grub_le_to_cpu32 (sb_1x->dev_number) < grub_le_to_cpu32 (sb_1x->max_dev))
-    array->index = grub_le_to_cpu16 (sb_1x->dev_roles[grub_le_to_cpu32 (sb_1x->dev_number)]);
-  else
-    array->index = 0xffff;  /* disk will be later not used! */
-  array->uuid_len = 16;
-  array->uuid = grub_malloc (16);
-  if (!array->uuid)
-    {
-      grub_free (sb_1x);
-      return grub_errno;
-    }
-
-  grub_memcpy (array->uuid, sb_1x->set_uuid, 16);
-
-  *start_sector = sb_1x->data_offset;
-
-  grub_free (sb_1x);
-  return 0;
+  return grub_error (GRUB_ERR_OUT_OF_RANGE, "not raid");
 }
 
 static struct grub_raid grub_mdraid_dev = {
diff --git a/disk/raid.c b/disk/raid.c
index 30d4b7ac4..2f70e256f 100644
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -564,13 +564,31 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
       /* mdraid 1.x superblocks have only a name stored not a number.
 	 Use it directly as GRUB device.  */
       if (! array->name)
-	array->name = grub_xasprintf ("md%d", array->number);
+	{
+	  array->name = grub_xasprintf ("md%d", array->number);
+	  if (! array->name)
+	    {
+	      grub_free (array->uuid);
+	      grub_free (array);
+
+	      return grub_errno;
+	    }
+	}
       else
 	{
 	  /* Strip off the homehost if present.  */
 	  char *colon = grub_strchr (array->name, ':');
 	  char *new_name = grub_xasprintf ("md/%s",
 					   colon ? colon + 1 : array->name);
+
+	  if (! new_name)
+	    {
+	      grub_free (array->uuid);
+	      grub_free (array);
+
+	      return grub_errno;
+	    }
+
 	  grub_free (array->name);
 	  array->name = new_name;
 	}

From 15ee6f9dc7744859d494ca69a6c9738ed7721138 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 20 Jul 2010 00:10:44 +0530
Subject: [PATCH 1272/1628] add {} around block-arg that is passed through argv

---
 script/execute.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/script/execute.c b/script/execute.c
index c6a6c2484..1e9cd00b7 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -197,7 +197,9 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
 	      break;
 
 	    case GRUB_SCRIPT_ARG_TYPE_BLOCK:
-	      if (grub_script_argv_append (&result, arg->str) ||
+	      if (grub_script_argv_append (&result, "{") ||
+		  grub_script_argv_append (&result, arg->str) ||
+		  grub_script_argv_append (&result, "}") ||
 		  grub_script_argv_script_append (&result, arg->block))
 		goto fail;
 	      break;

From b14906860b578b5911cf35bfa10c93182fd62efb Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 20 Jul 2010 02:33:57 +0530
Subject: [PATCH 1273/1628] full menuentry command support

---
 commands/extcmd.c    | 5 +----
 commands/menuentry.c | 6 +++++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/commands/extcmd.c b/commands/extcmd.c
index 349e9bfc7..9dbb0a2ce 100644
--- a/commands/extcmd.c
+++ b/commands/extcmd.c
@@ -40,9 +40,7 @@ grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
   context.extcmd = ext;
   context.script_params = scripts;
 
-  /* Dynamic commands should not perform option parsing before
-     corresponding module gets loaded.  */
-  if (cmd->flags & GRUB_COMMAND_FLAG_DYNCMD)
+  if (! ext->options)
     {
       ret = (ext->func) (&context, argc, args);
       return ret;
@@ -65,7 +63,6 @@ grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
     ret = grub_errno;
 
   grub_free (state);
-
   return ret;
 }
 
diff --git a/commands/menuentry.c b/commands/menuentry.c
index 95ec67bbd..0ce5a9e0e 100644
--- a/commands/menuentry.c
+++ b/commands/menuentry.c
@@ -29,6 +29,7 @@ static grub_err_t
 grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
 {
   char *src;
+  unsigned len;
   grub_err_t r;
 
   /* XXX Rewrite to make use of already parsed menu definition.  */
@@ -37,9 +38,12 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
 
   src = args[argc - 1];
   args[argc - 1] = '\0';
+  len = grub_strlen(src);
+  src[len - 1] = '\0';
 
-  r = grub_normal_add_menu_entry (argc - 1, (const char **) args, src);
+  r = grub_normal_add_menu_entry (argc - 1, (const char **) args, src + 1);
 
+  src[len - 1] = '}';
   args[argc - 1] = src;
   return r;
 }

From 31cfe714f21c325f9acf3e3213f7a1361e8b5bfd Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 20 Jul 2010 11:10:49 +0100
Subject: [PATCH 1274/1628] * disk/mdraid_linux.c: Update copyright years. *
 disk/raid.c: Likewise. * include/grub/raid.h: Likewise. * kern/emu/getroot.c:
 Likewise.

---
 ChangeLog.raid      | 7 +++++++
 disk/mdraid_linux.c | 2 +-
 disk/raid.c         | 2 +-
 include/grub/raid.h | 2 +-
 kern/emu/getroot.c  | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.raid b/ChangeLog.raid
index d91f584c0..10215f7fd 100644
--- a/ChangeLog.raid
+++ b/ChangeLog.raid
@@ -1,3 +1,10 @@
+2010-07-20  Colin Watson  <cjwatson@ubuntu.com>
+
+	* disk/mdraid_linux.c: Update copyright years.
+	* disk/raid.c: Likewise.
+	* include/grub/raid.h: Likewise.
+	* kern/emu/getroot.c: Likewise.
+
 2010-07-19  Colin Watson  <cjwatson@ubuntu.com>
 
 	* disk/mdraid_linux.c (struct grub_raid_super_1x): Remove
diff --git a/disk/mdraid_linux.c b/disk/mdraid_linux.c
index b1199c6ef..d5a0aad47 100644
--- a/disk/mdraid_linux.c
+++ b/disk/mdraid_linux.c
@@ -1,7 +1,7 @@
 /* mdraid_linux.c - module to handle Linux Software RAID.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2008,2009,2010  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
diff --git a/disk/raid.c b/disk/raid.c
index 2f70e256f..43d2a29ff 100644
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -1,7 +1,7 @@
 /* raid.c - module to read RAID arrays.  */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 2006,2007,2008,2009,2010  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
diff --git a/include/grub/raid.h b/include/grub/raid.h
index 00df9c10c..711a7f79c 100644
--- a/include/grub/raid.h
+++ b/include/grub/raid.h
@@ -1,7 +1,7 @@
 /* raid.h - On disk structures for RAID. */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2006,2007,2008  Free Software Foundation, Inc.
+ *  Copyright (C) 2006,2007,2008,2010  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
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index 2d7469c9d..9f89bf657 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -1,7 +1,7 @@
 /* getroot.c - Get root device */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2006,2007,2008,2009  Free Software Foundation, Inc.
+ *  Copyright (C) 1999,2000,2001,2002,2003,2006,2007,2008,2009,2010  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

From 4b761da90280153c13ff850c9e0e1b19daf719b1 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 20 Jul 2010 11:20:23 +0100
Subject: [PATCH 1275/1628] * .bzrignore: Ignore 20_linux_xen.

---
 .bzrignore | 1 +
 ChangeLog  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/.bzrignore b/.bzrignore
index daf9da53a..32b96b154 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,5 +1,6 @@
 00_header
 10_*
+20_linux_xen
 30_os-prober
 40_custom
 41_custom
diff --git a/ChangeLog b/ChangeLog
index 8ebb35067..200058f29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-20  Colin Watson  <cjwatson@ubuntu.com>
+
+	* .bzrignore: Ignore 20_linux_xen.
+
 2010-07-17  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/import_unicode.py: Remove unnecessary imports.

From 39d824e8f9379e957b3389c63419ffa787a80aa1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 20 Jul 2010 14:42:32 +0200
Subject: [PATCH 1276/1628] 	* commands/acpi.c (setup_common_tables): Use
 sizeof instead of 	hardcoding size. 	(setv1table): Likewise.

---
 ChangeLog       |  6 ++++++
 commands/acpi.c | 14 ++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fab3ecb22..66d810e91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* commands/acpi.c (setup_common_tables): Use sizeof instead of
+	hardcoding size.
+	(setv1table): Likewise.
+
 2010-07-20  Colin Watson  <cjwatson@ubuntu.com>
 
 	* disk/raid.c (insert_array): Use md/%s to name mdadm 1.x devices,
diff --git a/commands/acpi.c b/commands/acpi.c
index 5bbfd008b..884ddf000 100644
--- a/commands/acpi.c
+++ b/commands/acpi.c
@@ -325,7 +325,8 @@ setup_common_tables (void)
 
       /* If it's FADT correct DSDT and FACS addresses. */
       fadt = (struct grub_acpi_fadt *) cur->addr;
-      if (grub_memcmp (fadt->hdr.signature, "FACP", 4) == 0)
+      if (grub_memcmp (fadt->hdr.signature, "FACP",
+		       sizeof (fadt->hdr.signature)) == 0)
 	{
 	  fadt->dsdt_addr = PTR_TO_UINT32 (table_dsdt);
 	  fadt->facs_addr = facs_addr;
@@ -351,16 +352,16 @@ setup_common_tables (void)
   rsdt_addr = rsdt = (struct grub_acpi_table_header *) playground_ptr;
   playground_ptr += sizeof (struct grub_acpi_table_header) + 4 * numoftables;
 
-  rsdt_entry = (grub_uint32_t *)(rsdt + 1);
+  rsdt_entry = (grub_uint32_t *) (rsdt + 1);
 
   /* Fill RSDT header. */
   grub_memcpy (&(rsdt->signature), "RSDT", 4);
   rsdt->length = sizeof (struct grub_acpi_table_header) + 4 * numoftables;
   rsdt->revision = 1;
-  grub_memcpy (&(rsdt->oemid), root_oemid, 6);
-  grub_memcpy (&(rsdt->oemtable), root_oemtable, 4);
+  grub_memcpy (&(rsdt->oemid), root_oemid, sizeof (rsdt->oemid));
+  grub_memcpy (&(rsdt->oemtable), root_oemtable, sizeof (rsdt->oemtable));
   rsdt->oemrev = root_oemrev;
-  grub_memcpy (&(rsdt->creator_id), root_creator_id, 6);
+  grub_memcpy (&(rsdt->creator_id), root_creator_id, sizeof (rsdt->creator_id));
   rsdt->creator_rev = root_creator_rev;
 
   for (cur = acpi_tables; cur; cur = cur->next)
@@ -378,7 +379,8 @@ setv1table (void)
   /* Create RSDP. */
   rsdpv1_new = (struct grub_acpi_rsdp_v10 *) playground_ptr;
   playground_ptr += sizeof (struct grub_acpi_rsdp_v10);
-  grub_memcpy (&(rsdpv1_new->signature), "RSD PTR ", 8);
+  grub_memcpy (&(rsdpv1_new->signature), "RSD PTR ",
+	       sizeof (rsdpv1_new->signature));
   grub_memcpy (&(rsdpv1_new->oemid), root_oemid, sizeof  (rsdpv1_new->oemid));
   rsdpv1_new->revision = 0;
   rsdpv1_new->rsdt_addr = PTR_TO_UINT32 (rsdt_addr);

From a29d6a4bc516c1f7cb0f142714ad4b85e9b3a1b2 Mon Sep 17 00:00:00 2001
From: Thomas Frauendorfer <Thomas.Frauendorfer@googlemail.com>
Date: Tue, 20 Jul 2010 15:59:56 +0200
Subject: [PATCH 1277/1628] 	* lib/i386/relocator_asm.S [! __x86_64__]:
 Don't try to disable amd64 	on i386.

---
 ChangeLog                | 5 +++++
 lib/i386/relocator_asm.S | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 66d810e91..d5e655b90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-20  Thomas Frauendorfer  <Thomas.Frauendorfer@googlemail.com>
+
+	* lib/i386/relocator_asm.S [! __x86_64__]: Don't try to disable amd64
+	on i386.
+
 2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* commands/acpi.c (setup_common_tables): Use sizeof instead of
diff --git a/lib/i386/relocator_asm.S b/lib/i386/relocator_asm.S
index 6b803db13..22490a3f8 100644
--- a/lib/i386/relocator_asm.S
+++ b/lib/i386/relocator_asm.S
@@ -157,11 +157,13 @@ LOCAL(cont1):
 	andl	$(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax
 	movl	%eax, %cr0
 
+#ifdef __x86_64__
 	/* Disable amd64. */
 	movl	$GRUB_MEMORY_CPU_AMD64_MSR, %ecx
 	rdmsr
 	andl	$(~GRUB_MEMORY_CPU_AMD64_MSR_ON), %eax
 	wrmsr
+#endif
 
 	/* Turn off PAE. */
 	movl	%cr4, %eax

From ab8ba957608a44a6f6ccf3a9f6055dd71f853f78 Mon Sep 17 00:00:00 2001
From: Vadim Solomin <vadic052@gmail.com>
Date: Tue, 20 Jul 2010 17:14:00 +0100
Subject: [PATCH 1278/1628] 2010-07-20  Vadim Solomin  <vadic052@gmail.com>
 2010-07-20  Colin Watson  <cjwatson@ubuntu.com>

	Generate device.map in something closer to the old ordering.

	* util/deviceiter.c (struct device): New declaration.
	(compare_file_names): Rename to ...
	(compare_devices): ... this.  Sort by kernel name in preference to
	the stable by-id name, but keep the latter as a fallback comparison.
	Update header comment.
	(grub_util_iterate_devices) [__linux__]: Construct and sort an array
	of `struct device' rather than of plain file names.

	Also-By: Colin Watson <cjwatson@ubuntu.com>
---
 ChangeLog         | 13 ++++++++++
 util/deviceiter.c | 66 +++++++++++++++++++++++++++++------------------
 2 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d5e655b90..aa4d0b530 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-20  Vadim Solomin  <vadic052@gmail.com>
+2010-07-20  Colin Watson  <cjwatson@ubuntu.com>
+
+	Generate device.map in something closer to the old ordering.
+
+	* util/deviceiter.c (struct device): New declaration.
+	(compare_file_names): Rename to ...
+	(compare_devices): ... this.  Sort by kernel name in preference to
+	the stable by-id name, but keep the latter as a fallback comparison.
+	Update header comment.
+	(grub_util_iterate_devices) [__linux__]: Construct and sort an array
+	of `struct device' rather than of plain file names.
+
 2010-07-20  Thomas Frauendorfer  <Thomas.Frauendorfer@googlemail.com>
 
 	* lib/i386/relocator_asm.S [! __x86_64__]: Don't try to disable amd64
diff --git a/util/deviceiter.c b/util/deviceiter.c
index bbcc00a91..1cf511934 100644
--- a/util/deviceiter.c
+++ b/util/deviceiter.c
@@ -467,13 +467,30 @@ clear_seen_devices (void)
 }
 
 #ifdef __linux__
-/* Like strcmp, but doesn't require a cast for use as a qsort comparator.  */
-static int
-compare_file_names (const void *a, const void *b)
+struct device
 {
-  const char *left = *(const char **) a;
-  const char *right = *(const char **) b;
-  return strcmp (left, right);
+	char *stable;
+	char *kernel;
+};
+
+/* Sort by the kernel name for preference since that most closely matches
+   older device.map files, but sort by stable by-id names as a fallback.
+   This is because /dev/disk/by-id/ usually has a few alternative
+   identifications of devices (e.g. ATA vs. SATA).
+   check_device_readable_unique will ensure that we only get one for any
+   given disk, but sort the list so that the choice of which one we get is
+   stable.  */
+static int
+compare_devices (const void *a, const void *b)
+{
+  const struct device *left = (const struct device *) a;
+  const struct device *right = (const struct device *) b;
+  int ret;
+  ret = strcmp (left->kernel, right->kernel);
+  if (ret)
+    return ret;
+  else
+    return strcmp (left->stable, right->stable);
 }
 #endif /* __linux__ */
 
@@ -507,10 +524,10 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
     if (dir)
       {
 	struct dirent *entry;
-	char **names;
-	size_t names_len = 0, names_max = 1024, i;
+	struct device *devs;
+	size_t devs_len = 0, devs_max = 1024, i;
 
-	names = xmalloc (names_max * sizeof (*names));
+	devs = xmalloc (devs_max * sizeof (*devs));
 
 	/* Dump all the directory entries into names, resizing if
 	   necessary.  */
@@ -526,35 +543,34 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 	    /* Skip RAID entries; they are handled by upper layers.  */
 	    if (strncmp (entry->d_name, "md-", sizeof ("md-") - 1) == 0)
 	      continue;
-	    if (names_len >= names_max)
+	    if (devs_len >= devs_max)
 	      {
-		names_max *= 2;
-		names = xrealloc (names, names_max * sizeof (*names));
+		devs_max *= 2;
+		devs = xrealloc (devs, devs_max * sizeof (*devs));
 	      }
-	    names[names_len++] = xasprintf (entry->d_name);
+	    devs[devs_len].stable =
+	      xasprintf ("/dev/disk/by-id/%s", entry->d_name);
+	    devs[devs_len].kernel =
+	      canonicalize_file_name (devs[devs_len].stable);
+	    devs_len++;
 	  }
 
-	/* /dev/disk/by-id/ usually has a few alternative identifications of
-	   devices (e.g. ATA vs. SATA).  check_device_readable_unique will
-	   ensure that we only get one for any given disk, but sort the list
-	   so that the choice of which one we get is stable.  */
-	qsort (names, names_len, sizeof (*names), &compare_file_names);
+	qsort (devs, devs_len, sizeof (*devs), &compare_devices);
 
 	closedir (dir);
 
 	/* Now add all the devices in sorted order.  */
-	for (i = 0; i < names_len; ++i)
+	for (i = 0; i < devs_len; ++i)
 	  {
-	    char *path = xasprintf ("/dev/disk/by-id/%s", names[i]);
-	    if (check_device_readable_unique (path))
+	    if (check_device_readable_unique (devs[i].stable))
 	      {
-		if (hook (path, 0))
+		if (hook (devs[i].stable, 0))
 		  goto out;
 	      }
-	    free (path);
-	    free (names[i]);
+	    free (devs[i].stable);
+	    free (devs[i].kernel);
 	  }
-	free (names);
+	free (devs);
       }
   }
 

From 64a638b0d9d428a757c2d067131d2fbf1e88b2ec Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 20 Jul 2010 20:22:52 +0200
Subject: [PATCH 1279/1628] 	* docs/grub.texi (Naming convention): Document
 new naming convention.

---
 ChangeLog      |  4 ++++
 docs/grub.texi | 22 ++++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aa4d0b530..8fccf3490 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* docs/grub.texi (Naming convention): Document new naming convention.
+
 2010-07-20  Vadim Solomin  <vadic052@gmail.com>
 2010-07-20  Colin Watson  <cjwatson@ubuntu.com>
 
diff --git a/docs/grub.texi b/docs/grub.texi
index 5d412ecd4..a191ef9ef 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -444,12 +444,13 @@ disk. The number @samp{0} is the drive number, which is counted from
 disk.
 
 @example
-(hd0,2)
+(hd0,msdos2)
 @end example
 
 Here, @samp{hd} means it is a hard disk drive. The first integer
-@samp{0} indicates the drive number, that is, the first hard disk, while
-the second integer, @samp{1}, indicates the partition number (or the
+@samp{0} indicates the drive number, that is, the first hard disk,
+the string @samp{msdos} indicates the partition scheme, while
+the second integer, @samp{2}, indicates the partition number (or the
 @sc{pc} slice number in the BSD terminology). The partition numbers are
 counted from @emph{one}, not from zero (as was the case in previous
 versions of GRUB). This expression means the second partition of the
@@ -457,7 +458,7 @@ first hard disk drive. In this case, GRUB uses one partition of the
 disk, instead of the whole disk.
 
 @example
-(hd0,5)
+(hd0,msdos5)
 @end example
 
 This specifies the first @dfn{extended partition} of the first hard disk
@@ -466,18 +467,15 @@ counted from @samp{5}, regardless of the actual number of primary
 partitions on your hard disk.
 
 @example
-(hd1,a)
+(hd1,msdos1,bsd1)
 @end example
 
-This means the BSD @samp{a} partition of the second hard disk. If you
-need to specify which @sc{pc} slice number should be used, use something
-like this: @samp{(hd1,1,a)}. If the @sc{pc} slice number is omitted,
-GRUB searches for the first @sc{pc} slice which has a BSD @samp{a}
-partition.
+This means the BSD @samp{a} partition on first @sc{pc} slice number
+of the second hard disk.
 
 Of course, to actually access the disks or partitions with GRUB, you
 need to use the device specification in a command, like @samp{set
-root=(fd0)} or @samp{parttool (hd0,3) hidden-}. To help you find out
+root=(fd0)} or @samp{parttool (hd0,msdos3) hidden-}. To help you find out
 which number specifies a partition you want, the GRUB command-line
 (@pxref{Command-line interface}) options have argument
 completion. This means that, for example, you only need to type
@@ -501,7 +499,7 @@ Now the question is, how to specify a file? Again, consider an
 example:
 
 @example
-(hd0,1)/vmlinuz
+(hd0,msdos1)/vmlinuz
 @end example
 
 This specifies the file named @samp{vmlinuz}, found on the first

From a6a11f3cac8703b662c7a8424fea21a1e2c3ffd0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 20 Jul 2010 20:36:11 +0200
Subject: [PATCH 1280/1628] 	* util/i386/efi/grub-install.in: Revert to
 platform-specific behaviour 	with -p "". 	Reported by: Tito Keitel.

---
 ChangeLog                     | 6 ++++++
 util/i386/efi/grub-install.in | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8fccf3490..2e6853371 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/i386/efi/grub-install.in: Revert to platform-specific behaviour
+	with -p "".
+	Reported by: Tito Keitel.
+
 2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* docs/grub.texi (Naming convention): Document new naming convention.
diff --git a/util/i386/efi/grub-install.in b/util/i386/efi/grub-install.in
index 269317cd0..d8554a328 100644
--- a/util/i386/efi/grub-install.in
+++ b/util/i386/efi/grub-install.in
@@ -246,7 +246,7 @@ devabstraction_module=`$grub_probe --target=abstraction --device-map=${device_ma
 # The order in this list is critical.  Be careful when modifying it.
 modules="$modules $fs_module $partmap_module $devabstraction_module"
 
-$grub_mkimage -O ${target_cpu}-efi --output=${grubdir}/grub.efi $modules || exit 1
+$grub_mkimage -p "" -O ${target_cpu}-efi --output=${grubdir}/grub.efi $modules || exit 1
 
 # Prompt the user to check if the device map is correct.
 echo "Installation finished. No error reported."

From afaec079d13d3c71976c449d7f1cc7f1c3a65a6a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 20 Jul 2010 21:56:00 +0200
Subject: [PATCH 1281/1628] 	* disk/loopback.c (grub_loopback): Replace
 filename with file. 	(delete_loopback): Handle new semantics. 
 (grub_cmd_loopback): Likewise. 	(grub_loopback_iterate): Likewise. 
 (grub_loopback_close): Likewise.

---
 ChangeLog       |  8 ++++++++
 disk/loopback.c | 33 ++++++++-------------------------
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2e6853371..2fc4a9793 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* disk/loopback.c (grub_loopback): Replace filename with file.
+	(delete_loopback): Handle new semantics.
+	(grub_cmd_loopback): Likewise.
+	(grub_loopback_iterate): Likewise.
+	(grub_loopback_close): Likewise.
+
 2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/i386/efi/grub-install.in: Revert to platform-specific behaviour
diff --git a/disk/loopback.c b/disk/loopback.c
index 1b525e05f..4990da710 100644
--- a/disk/loopback.c
+++ b/disk/loopback.c
@@ -28,7 +28,7 @@
 struct grub_loopback
 {
   char *devname;
-  char *filename;
+  grub_file_t file;
   int has_partitions;
   struct grub_loopback *next;
 };
@@ -63,7 +63,7 @@ delete_loopback (const char *name)
   *prev = dev->next;
 
   grub_free (dev->devname);
-  grub_free (dev->filename);
+  grub_file_close (dev->file);
   grub_free (dev);
 
   return 0;
@@ -91,9 +91,6 @@ grub_cmd_loopback (grub_extcmd_t cmd, int argc, char **args)
   if (! file)
     return grub_errno;
 
-  /* Close the file, the only reason for opening it is validation.  */
-  grub_file_close (file);
-
   /* First try to replace the old device.  */
   for (newdev = loopback_list; newdev; newdev = newdev->next)
     if (grub_strcmp (newdev->devname, args[0]) == 0)
@@ -105,8 +102,8 @@ grub_cmd_loopback (grub_extcmd_t cmd, int argc, char **args)
       if (! newname)
 	return grub_errno;
 
-      grub_free (newdev->filename);
-      newdev->filename = newname;
+      grub_file_close (newdev->file);
+      newdev->file = file;
 
       /* Set has_partitions when `--partitions' was used.  */
       newdev->has_partitions = state[1].set;
@@ -126,13 +123,7 @@ grub_cmd_loopback (grub_extcmd_t cmd, int argc, char **args)
       return grub_errno;
     }
 
-  newdev->filename = grub_strdup (args[1]);
-  if (! newdev->filename)
-    {
-      grub_free (newdev->devname);
-      grub_free (newdev);
-      return grub_errno;
-    }
+  newdev->file = file;
 
   /* Set has_partitions when `--partitions' was used.  */
   newdev->has_partitions = state[1].set;
@@ -160,7 +151,6 @@ grub_loopback_iterate (int (*hook) (const char *name))
 static grub_err_t
 grub_loopback_open (const char *name, grub_disk_t disk)
 {
-  grub_file_t file;
   struct grub_loopback *dev;
 
   for (dev = loopback_list; dev; dev = dev->next)
@@ -170,27 +160,20 @@ grub_loopback_open (const char *name, grub_disk_t disk)
   if (! dev)
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
 
-  file = grub_file_open (dev->filename);
-  if (! file)
-    return grub_errno;
-
   /* Use the filesize for the disk size, round up to a complete sector.  */
-  disk->total_sectors = ((file->size + GRUB_DISK_SECTOR_SIZE - 1)
+  disk->total_sectors = ((dev->file->size + GRUB_DISK_SECTOR_SIZE - 1)
 			 / GRUB_DISK_SECTOR_SIZE);
   disk->id = (unsigned long) dev;
 
   disk->has_partitions = dev->has_partitions;
-  disk->data = file;
+  disk->data = dev->file;
 
   return 0;
 }
 
 static void
-grub_loopback_close (grub_disk_t disk)
+grub_loopback_close (grub_disk_t disk __attribute__  ((unused)))
 {
-  grub_file_t file = (grub_file_t) disk->data;
-
-  grub_file_close (file);
 }
 
 static grub_err_t

From 5e3bec6716529da996700270d51bca17232da01c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 20 Jul 2010 22:10:23 +0200
Subject: [PATCH 1282/1628] 	* tests/util/grub-shell-tester.in: Remove
 bashism and declare as 	sh script.

---
 ChangeLog                       | 5 +++++
 tests/util/grub-shell-tester.in | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2fc4a9793..5e3b7ff04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* tests/util/grub-shell-tester.in: Remove bashism and declare as
+	sh script.
+
 2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* disk/loopback.c (grub_loopback): Replace filename with file.
diff --git a/tests/util/grub-shell-tester.in b/tests/util/grub-shell-tester.in
index e9507c8f5..ed34a5e17 100644
--- a/tests/util/grub-shell-tester.in
+++ b/tests/util/grub-shell-tester.in
@@ -1,4 +1,4 @@
-#! /bin/bash -e
+#! /bin/sh -e
 
 # Compares GRUB script output with BASH output.
 # Copyright (C) 2009,2010  Free Software Foundation, Inc.
@@ -84,7 +84,7 @@ done
 
 if [ "x${source}" = x ] ; then
   tmpfile=`mktemp`
-  while read; do
+  while read REPLY; do
     echo $REPLY >> ${tmpfile}
   done
   source=${tmpfile}

From dd8ff5c9e9aae0cbfe27b6195ba3a256ba454351 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 20 Jul 2010 22:00:18 +0100
Subject: [PATCH 1283/1628] Disable EFI cursor when the EFI console becomes
 inactive. * term/efi/console.c (grub_efi_console_init): New function.
 (grub_efi_console_fini): New function. (grub_console_term_output): Register
 init and fini methods.

---
 ChangeLog          |  8 ++++++++
 term/efi/console.c | 16 ++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5e3b7ff04..681b6fd24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-20  Colin Watson  <cjwatson@ubuntu.com>
+
+	Disable EFI cursor when the EFI console becomes inactive.
+
+	* term/efi/console.c (grub_efi_console_init): New function.
+	(grub_efi_console_fini): New function.
+	(grub_console_term_output): Register init and fini methods.
+
 2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* tests/util/grub-shell-tester.in: Remove bashism and declare as
diff --git a/term/efi/console.c b/term/efi/console.c
index d3240590b..dca002910 100644
--- a/term/efi/console.c
+++ b/term/efi/console.c
@@ -311,6 +311,20 @@ grub_console_setcursor (struct grub_term_output *term __attribute__ ((unused)),
   efi_call_2 (o->enable_cursor, o, on);
 }
 
+static grub_err_t
+grub_efi_console_init (struct grub_term_output *term)
+{
+  grub_console_setcursor (term, 1);
+  return 0;
+}
+
+static grub_err_t
+grub_efi_console_fini (struct grub_term_output *term)
+{
+  grub_console_setcursor (term, 0);
+  return 0;
+}
+
 static struct grub_term_input grub_console_term_input =
   {
     .name = "console",
@@ -321,6 +335,8 @@ static struct grub_term_input grub_console_term_input =
 static struct grub_term_output grub_console_term_output =
   {
     .name = "console",
+    .init = grub_efi_console_init,
+    .fini = grub_efi_console_fini,
     .putchar = grub_console_putchar,
     .getwh = grub_console_getwh,
     .getxy = grub_console_getxy,

From efc9d7f175cd1750d286be0aeec8414084394226 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 20 Jul 2010 22:14:26 +0100
Subject: [PATCH 1284/1628] * disk/loopback.c (grub_cmd_loopback): Don't leak a
 grub_file_t handle on failure. (grub_loopback_close): Remove empty function.
 (grub_loopback_dev): Remove close method.

---
 ChangeLog       |  7 +++++++
 disk/loopback.c | 18 +++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 681b6fd24..482874788 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-20  Colin Watson  <cjwatson@ubuntu.com>
+
+	* disk/loopback.c (grub_cmd_loopback): Don't leak a grub_file_t
+	handle on failure.
+	(grub_loopback_close): Remove empty function.
+	(grub_loopback_dev): Remove close method.
+
 2010-07-20  Colin Watson  <cjwatson@ubuntu.com>
 
 	Disable EFI cursor when the EFI console becomes inactive.
diff --git a/disk/loopback.c b/disk/loopback.c
index 4990da710..509e9e33f 100644
--- a/disk/loopback.c
+++ b/disk/loopback.c
@@ -76,6 +76,7 @@ grub_cmd_loopback (grub_extcmd_t cmd, int argc, char **args)
   struct grub_arg_list *state = state = cmd->state;
   grub_file_t file;
   struct grub_loopback *newdev;
+  grub_err_t ret;
 
   if (argc < 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "device name required");
@@ -100,7 +101,7 @@ grub_cmd_loopback (grub_extcmd_t cmd, int argc, char **args)
     {
       char *newname = grub_strdup (args[1]);
       if (! newname)
-	return grub_errno;
+	goto fail;
 
       grub_file_close (newdev->file);
       newdev->file = file;
@@ -114,13 +115,13 @@ grub_cmd_loopback (grub_extcmd_t cmd, int argc, char **args)
   /* Unable to replace it, make a new entry.  */
   newdev = grub_malloc (sizeof (struct grub_loopback));
   if (! newdev)
-    return grub_errno;
+    goto fail;
 
   newdev->devname = grub_strdup (args[0]);
   if (! newdev->devname)
     {
       grub_free (newdev);
-      return grub_errno;
+      goto fail;
     }
 
   newdev->file = file;
@@ -133,6 +134,11 @@ grub_cmd_loopback (grub_extcmd_t cmd, int argc, char **args)
   loopback_list = newdev;
 
   return 0;
+
+fail:
+  ret = grub_errno;
+  grub_file_close (file);
+  return ret;
 }
 
 
@@ -171,11 +177,6 @@ grub_loopback_open (const char *name, grub_disk_t disk)
   return 0;
 }
 
-static void
-grub_loopback_close (grub_disk_t disk __attribute__  ((unused)))
-{
-}
-
 static grub_err_t
 grub_loopback_read (grub_disk_t disk, grub_disk_addr_t sector,
 		    grub_size_t size, char *buf)
@@ -217,7 +218,6 @@ static struct grub_disk_dev grub_loopback_dev =
     .id = GRUB_DISK_DEVICE_LOOPBACK_ID,
     .iterate = grub_loopback_iterate,
     .open = grub_loopback_open,
-    .close = grub_loopback_close,
     .read = grub_loopback_read,
     .write = grub_loopback_write,
     .next = 0

From b26f1c116062715690eb91dc301cdbd844d8f793 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 20 Jul 2010 23:09:45 +0100
Subject: [PATCH 1285/1628] * kern/emu/getroot.c (grub_util_get_grub_dev): Use
 xasprintf.

---
 ChangeLog          | 4 ++++
 kern/emu/getroot.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 482874788..0d06dee3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-20  Colin Watson  <cjwatson@ubuntu.com>
+
+	* kern/emu/getroot.c (grub_util_get_grub_dev): Use xasprintf.
+
 2010-07-20  Colin Watson  <cjwatson@ubuntu.com>
 
 	* disk/loopback.c (grub_cmd_loopback): Don't leak a grub_file_t
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index 9f89bf657..58dbac9b4 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -695,7 +695,7 @@ grub_util_get_grub_dev (const char *os_dev)
 	  if (q)
 	    *q = ',';
 
-	  asprintf (&grub_dev, "md/%s", p);
+	  grub_dev = xasprintf ("md/%s", p);
 	  free (p);
 	}
       else
@@ -708,7 +708,7 @@ grub_util_get_grub_dev (const char *os_dev)
 	if (mdadm_name)
 	  {
 	    free (grub_dev);
-	    asprintf (&grub_dev, "md/%s", mdadm_name);
+	    grub_dev = xasprintf ("md/%s", mdadm_name);
 	    free (mdadm_name);
 	  }
       }

From c03507dfb87adb5ab6e5eb619ab9dd9d3d30642c Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 20 Jul 2010 23:16:32 +0100
Subject: [PATCH 1286/1628] * bus/usb/emu/usb.c (grub_usb_poll_devices): Add a
 dummy implementation of this so that grub-emu links again, with a note that
 this should support hotplugging in the future.

---
 ChangeLog         | 6 ++++++
 bus/usb/emu/usb.c | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0d06dee3b..c05891b96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-20  Colin Watson  <cjwatson@ubuntu.com>
+
+	* bus/usb/emu/usb.c (grub_usb_poll_devices): Add a dummy
+	implementation of this so that grub-emu links again, with a note
+	that this should support hotplugging in the future.
+
 2010-07-20  Colin Watson  <cjwatson@ubuntu.com>
 
 	* kern/emu/getroot.c (grub_util_get_grub_dev): Use xasprintf.
diff --git a/bus/usb/emu/usb.c b/bus/usb/emu/usb.c
index 187857b5b..7d52decb2 100644
--- a/bus/usb/emu/usb.c
+++ b/bus/usb/emu/usb.c
@@ -78,6 +78,12 @@ grub_libusb_devices (void)
   return GRUB_USB_ERR_NONE;
 }
 
+void
+grub_usb_poll_devices (void)
+{
+  /* TODO: recheck grub_usb_devs */
+}
+
 
 int
 grub_usb_iterate (int (*hook) (grub_usb_device_t dev))

From 9ebedc24f2e7f3e5d63b18e9db226bdc15445ec5 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 21 Jul 2010 03:47:30 +0530
Subject: [PATCH 1287/1628] restrict to only one block-arg (as last) param per
 command

---
 commands/extcmd.c        |  4 ++--
 include/grub/extcmd.h    |  6 +++---
 include/grub/script_sh.h |  6 ++----
 normal/dyncmd.c          |  3 +--
 script/argv.c            | 38 ++------------------------------------
 script/execute.c         |  6 +++---
 script/parser.y          | 37 +++++++++++++++++--------------------
 script/script.c          |  2 +-
 8 files changed, 31 insertions(+), 71 deletions(-)

diff --git a/commands/extcmd.c b/commands/extcmd.c
index 349e9bfc7..cc0362e14 100644
--- a/commands/extcmd.c
+++ b/commands/extcmd.c
@@ -25,7 +25,7 @@
 
 grub_err_t
 grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
-			struct grub_script **scripts)
+			struct grub_script *script)
 {
   int new_argc;
   char **new_args;
@@ -38,7 +38,7 @@ grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
 
   context.state = 0;
   context.extcmd = ext;
-  context.script_params = scripts;
+  context.script = script;
 
   /* Dynamic commands should not perform option parsing before
      corresponding module gets loaded.  */
diff --git a/include/grub/extcmd.h b/include/grub/extcmd.h
index a5e4d18fe..773e47854 100644
--- a/include/grub/extcmd.h
+++ b/include/grub/extcmd.h
@@ -50,8 +50,8 @@ struct grub_extcmd_context
 
   struct grub_arg_list *state;
 
-  /* Script parameters, if any.  */
-  struct grub_script **script_params;
+  /* Script parameter, if any.  */
+  struct grub_script *script;
 };
 typedef struct grub_extcmd_context *grub_extcmd_context_t;
 
@@ -74,6 +74,6 @@ void grub_unregister_extcmd (grub_extcmd_t cmd);
 
 grub_err_t
 grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
-			struct grub_script **scripts);
+			struct grub_script *script);
 
 #endif /* ! GRUB_EXTCMD_HEADER */
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 6471c7de3..43791d040 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -62,7 +62,7 @@ struct grub_script_arg
   char *str;
 
   /* Parsed block argument.  */
-  struct grub_script *block;
+  struct grub_script *script;
 
   /* Next argument part.  */
   struct grub_script_arg *next;
@@ -73,7 +73,7 @@ struct grub_script_argv
 {
   unsigned argc;
   char **args;
-  struct grub_script **scripts;
+  struct grub_script *script;
 };
 
 /* A complete argument.  It consists of a list of one or more `struct
@@ -234,8 +234,6 @@ void grub_script_argv_free    (struct grub_script_argv *argv);
 int grub_script_argv_next     (struct grub_script_argv *argv);
 int grub_script_argv_append   (struct grub_script_argv *argv, const char *s);
 int grub_script_argv_split_append (struct grub_script_argv *argv, char *s);
-int grub_script_argv_script_append (struct grub_script_argv *argv,
-				    struct grub_script *s);
 
 struct grub_script_arglist *
 grub_script_create_arglist (struct grub_parser_param *state);
diff --git a/normal/dyncmd.c b/normal/dyncmd.c
index 172baa44e..ed98855eb 100644
--- a/normal/dyncmd.c
+++ b/normal/dyncmd.c
@@ -54,8 +54,7 @@ grub_dyncmd_dispatcher (struct grub_extcmd_context *ctxt,
 	{
 	  if (cmd->flags & GRUB_COMMAND_FLAG_BLOCKS &&
 	      cmd->flags & GRUB_COMMAND_FLAG_EXTCMD)
-	    ret = grub_extcmd_dispatcher (cmd, argc, args,
-					  ctxt->script_params);
+	    ret = grub_extcmd_dispatcher (cmd, argc, args, ctxt->script);
 	  else
 	    ret = (cmd->func) (cmd, argc, args);
 	}
diff --git a/script/argv.c b/script/argv.c
index 8dd563345..42d573a0a 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -18,6 +18,7 @@
  */
 
 #include <grub/mm.h>
+#include <grub/misc.h>
 #include <grub/script_sh.h>
 
 static unsigned
@@ -52,18 +53,8 @@ grub_script_argv_free (struct grub_script_argv *argv)
       grub_free (argv->args);
     }
 
-  if (argv->scripts)
-    {
-      for (i = 0; i < argv->argc; i++)
-	if (argv->scripts[i])
-	  grub_script_put (argv->scripts[i]);
-
-      grub_free (argv->scripts);
-    }
-
   argv->argc = 0;
   argv->args = 0;
-  argv->scripts = 0;
 }
 
 /* Prepare for next argc.  */
@@ -71,7 +62,6 @@ int
 grub_script_argv_next (struct grub_script_argv *argv)
 {
   char **p = argv->args;
-  struct grub_script **q = argv->scripts;
 
   if (argv->args && argv->argc && argv->args[argv->argc - 1] == 0)
     return 0;
@@ -80,24 +70,12 @@ grub_script_argv_next (struct grub_script_argv *argv)
   if (! p)
     return 1;
 
-  q = grub_realloc (q, round_up_exp ((argv->argc + 2) * sizeof (struct grub_script *)));
-  if (! q)
-    {
-      grub_free (p);
-      return 1;
-    }
-
   argv->argc++;
   argv->args = p;
-  argv->scripts = q;
 
   if (argv->argc == 1)
-    {
-      argv->args[0] = 0;
-      argv->scripts[0] = 0;
-    }
+    argv->args[0] = 0;
   argv->args[argv->argc] = 0;
-  argv->scripts[argv->argc] = 0;
   return 0;
 }
 
@@ -123,18 +101,6 @@ grub_script_argv_append (struct grub_script_argv *argv, const char *s)
   return 0;
 }
 
-/* Append grub_script `s' as the last argument.  */
-int
-grub_script_argv_script_append (struct grub_script_argv *argv,
-				struct grub_script *script)
-{
-  if (argv->scripts[argv->argc - 1])
-    grub_script_put (argv->scripts[argv->argc - 1]);
-
-  argv->scripts[argv->argc - 1] = grub_script_get (script);
-  return 0;
-}
-
 /* Split `s' and append words as multiple arguments.  */
 int
 grub_script_argv_split_append (struct grub_script_argv *argv, char *s)
diff --git a/script/execute.c b/script/execute.c
index 1e9cd00b7..932be6635 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -199,9 +199,9 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
 	    case GRUB_SCRIPT_ARG_TYPE_BLOCK:
 	      if (grub_script_argv_append (&result, "{") ||
 		  grub_script_argv_append (&result, arg->str) ||
-		  grub_script_argv_append (&result, "}") ||
-		  grub_script_argv_script_append (&result, arg->block))
+		  grub_script_argv_append (&result, "}"))
 		goto fail;
+	      result.script = arg->script;
 	      break;
 
 	    case GRUB_SCRIPT_ARG_TYPE_TEXT:
@@ -326,7 +326,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
       if ((grubcmd->flags & GRUB_COMMAND_FLAG_BLOCKS) &&
 	  (grubcmd->flags & GRUB_COMMAND_FLAG_EXTCMD))
 	ret = grub_extcmd_dispatcher (grubcmd, argv.argc - 1, argv.args + 1,
-				      argv.scripts + 1);
+				      argv.script);
       else
 	ret = (grubcmd->func) (grubcmd, argv.argc - 1, argv.args + 1);
     }
diff --git a/script/parser.y b/script/parser.y
index eea7ba111..76dc3fbca 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -79,7 +79,8 @@
 %token <arg> GRUB_PARSER_TOKEN_NAME      "name"
 %token <arg> GRUB_PARSER_TOKEN_WORD      "word"
 
-%type <arglist> word argument block parameters0 parameters1 arguments0 arguments1
+%type <arg> block block0
+%type <arglist> word argument parameters0 parameters1 arguments0 arguments1
 
 %type <cmd> script_init script
 %type <cmd> grubcmd ifclause ifcmd forcmd whilecmd untilcmd
@@ -160,21 +161,22 @@ block: "{"
        commands1 delimiters0 "}"
        {
          char *p;
-         struct grub_script_arg *arg;
 	 struct grub_script_mem *memory;
 
 	 memory = grub_script_mem_record_stop (state, $<memory>2);
          if ((p = grub_script_lexer_record_stop (state, $<offset>2)))
 	   *grub_strrchr (p, '}') = '\0';
 
-	 arg = grub_script_arg_add (state, 0, GRUB_SCRIPT_ARG_TYPE_BLOCK, p);
-	 if (! arg || ! (arg->block = grub_script_create ($3, memory)))
+	 $$ = grub_script_arg_add (state, 0, GRUB_SCRIPT_ARG_TYPE_BLOCK, p);
+	 if (! $$ || ! ($$->script = grub_script_create ($3, memory)))
 	   grub_script_mem_free (memory);
 
-         $$ = grub_script_add_arglist (state, 0, arg);
          grub_script_lexer_deref (state->lexerstate);
        }
 ;
+block0: /* Empty */ { $$ = 0; }
+      | block { $$ = $1; }
+;
 
 arguments0: /* Empty */ { $$ = 0; }
           | arguments1  { $$ = $1; }
@@ -201,27 +203,22 @@ parameters1: argument parameters0
                  }
                $$ = $1;
              }
-           | block parameters0
-             {
-               if ($1 && $2)
-                 {
-                   $1->next = $2;
-                   $1->argcount += $2->argcount;
-                   $2->argcount = 0;
-                 }
-               $$ = $1;
-             }
 ;
 parameters0: /* Empty */ { $$ = 0; }
            | parameters1 { $$ = $1; }
 ;
 
-grubcmd: word parameters0
+grubcmd: word parameters0 block0
          {
-           if ($1 && $2) {
-             $1->next = $2;
-             $1->argcount += $2->argcount;
-             $2->argcount = 0;
+	   struct grub_script_arglist *x = $2;
+
+	   if ($3)
+	     x = grub_script_add_arglist (state, $2, $3);
+
+           if ($1 && x) {
+             $1->next = x;
+             $1->argcount += x->argcount;
+             x->argcount = 0;
            }
            $$ = grub_script_create_cmdline (state, $1);
          }
diff --git a/script/script.c b/script/script.c
index b7cbdff1d..7cf2f6bae 100644
--- a/script/script.c
+++ b/script/script.c
@@ -122,7 +122,7 @@ grub_script_arg_add (struct grub_parser_param *state,
     return arg;
 
   argpart->type = type;
-  argpart->block = 0;
+  argpart->script = 0;
 
   len = grub_strlen (str) + 1;
   argpart->str = grub_script_malloc (state, len);

From a9600892c190269c25613fede79892a17f0490e0 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 22 Jul 2010 09:38:06 +0100
Subject: [PATCH 1288/1628] * disk/raid.c (insert_array): Don't count named
 arrays when looking for unused array numbers. Reported and tested by: maru.

---
 ChangeLog   | 6 ++++++
 disk/raid.c | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c05891b96..e3677b0e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-22  Colin Watson  <cjwatson@ubuntu.com>
+
+	* disk/raid.c (insert_array): Don't count named arrays when looking
+	for unused array numbers.
+	Reported and tested by: maru.
+
 2010-07-20  Colin Watson  <cjwatson@ubuntu.com>
 
 	* bus/usb/emu/usb.c (grub_usb_poll_devices): Add a dummy
diff --git a/disk/raid.c b/disk/raid.c
index 43d2a29ff..7dfd4bd81 100644
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -533,7 +533,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
       /* Check whether we don't have multiple arrays with the same number.  */
       for (p = array_list; p != NULL; p = p->next)
         {
-          if (p->number == array->number) 
+          if (! p->name && p->number == array->number) 
 	    break;
         }
 
@@ -546,7 +546,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
 	    {
 	      for (p = array_list; p != NULL; p = p->next)
 		{
-		  if (p->number == i)
+		  if (! p->name && p->number == i)
 		    break;
 		}
 

From 697e053c44e75734ad4ae7520e63a80a83df4059 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 22 Jul 2010 09:44:19 +0100
Subject: [PATCH 1289/1628] real name for Michael Guntsche

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e3677b0e2..e0c2096bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 
 	* disk/raid.c (insert_array): Don't count named arrays when looking
 	for unused array numbers.
-	Reported and tested by: maru.
+	Reported and tested by: Michael Guntsche.
 
 2010-07-20  Colin Watson  <cjwatson@ubuntu.com>
 

From 0ac33bf5eb13bd185c903ac29a3ec36f0502c74f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 21 Jul 2010 06:44:38 +0200
Subject: [PATCH 1290/1628] 	* util/grub.d/00_header.in: Remove
 compatibility with terminal.mod 	prior to
 terminal_input/terminal_output separation. It's been over 1.5 	years and
 those versions weren't widely deployed.

---
 ChangeLog                |  6 ++++++
 util/grub.d/00_header.in | 12 ++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e0c2096bb..de1edebb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,12 @@
 	(grub_efi_console_fini): New function.
 	(grub_console_term_output): Register init and fini methods.
 
+2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub.d/00_header.in: Remove compatibility with terminal.mod
+	prior to terminal_input/terminal_output separation. It's been over 1.5
+	years and those versions weren't widely deployed.
+
 2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* tests/util/grub-shell-tester.in: Remove bashism and declare as
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 75c8b0fa2..2f39650e9 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -137,11 +137,7 @@ case x${GRUB_TERMINAL_INPUT} in
   ;;
   x*)
     cat << EOF
-if terminal_input ${GRUB_TERMINAL_INPUT} ; then true ; else
-  # For backward compatibility with versions of terminal.mod that don't
-  # understand terminal_input
-  terminal ${GRUB_TERMINAL_INPUT}
-fi
+terminal_input ${GRUB_TERMINAL_INPUT}
 EOF
   ;;
 esac
@@ -152,11 +148,7 @@ case x${GRUB_TERMINAL_OUTPUT} in
   ;;
   x*)
     cat << EOF
-if terminal_output ${GRUB_TERMINAL_OUTPUT} ; then true ; else
-  # For backward compatibility with versions of terminal.mod that don't
-  # understand terminal_output
-  terminal ${GRUB_TERMINAL_OUTPUT}
-fi
+terminal_output ${GRUB_TERMINAL_OUTPUT}
 EOF
   ;;
 esac

From 3a082b7f2a92bad9630fd931fff58e33057e537c Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 22 Jul 2010 04:49:05 +0530
Subject: [PATCH 1291/1628] memory management for block parameters

---
 include/grub/script_sh.h | 13 +++++++++-
 script/argv.c            |  3 +++
 script/execute.c         |  2 +-
 script/main.c            |  2 +-
 script/parser.y          | 53 ++++++++++++++++++++++++++++++++++++++--
 script/script.c          | 10 ++++++++
 6 files changed, 78 insertions(+), 5 deletions(-)

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 43791d040..7618633ad 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -42,6 +42,10 @@ struct grub_script
   unsigned refcnt;
   struct grub_script_mem *mem;
   struct grub_script_cmd *cmd;
+
+  /* Other grub_script's from block arguments.  */
+  struct grub_script *siblings;
+  struct grub_script *children;
 };
 
 typedef enum
@@ -222,6 +226,9 @@ struct grub_parser_param
   /* The memory that was used while parsing and scanning.  */
   struct grub_script_mem *memused;
 
+  /* The block argument scripts.  */
+  struct grub_script *scripts;
+
   /* The result of the parser.  */
   struct grub_script_cmd *parsed;
 
@@ -365,13 +372,17 @@ grub_normal_parse_line (char *line, grub_reader_getline_t getline);
 static inline struct grub_script *
 grub_script_get (struct grub_script *script)
 {
-  script->refcnt++;
+  if (script)
+    script->refcnt++;
   return script;
 }
 
 static inline void
 grub_script_put (struct grub_script *script)
 {
+  if (! script)
+    return;
+
   if (script->refcnt == 0)
     grub_script_free (script);
   else
diff --git a/script/argv.c b/script/argv.c
index 42d573a0a..a7acbc23e 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -52,9 +52,12 @@ grub_script_argv_free (struct grub_script_argv *argv)
 
       grub_free (argv->args);
     }
+  if (argv->script)
+    grub_script_put (argv->script);
 
   argv->argc = 0;
   argv->args = 0;
+  argv->script = 0;
 }
 
 /* Prepare for next argc.  */
diff --git a/script/execute.c b/script/execute.c
index 932be6635..b9538c29b 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -201,7 +201,7 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
 		  grub_script_argv_append (&result, arg->str) ||
 		  grub_script_argv_append (&result, "}"))
 		goto fail;
-	      result.script = arg->script;
+	      result.script = grub_script_get (arg->script);
 	      break;
 
 	    case GRUB_SCRIPT_ARG_TYPE_TEXT:
diff --git a/script/main.c b/script/main.c
index 752a8cd8a..19ce88c43 100644
--- a/script/main.c
+++ b/script/main.c
@@ -34,7 +34,7 @@ grub_normal_parse_line (char *line, grub_reader_getline_t getline)
       grub_script_execute (parsed_script);
 
       /* The parsed script was executed, throw it away.  */
-      grub_script_free (parsed_script);
+      grub_script_put (parsed_script);
     }
 
   return grub_errno;
diff --git a/script/parser.y b/script/parser.y
index 76dc3fbca..4f57ea4ff 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -38,6 +38,7 @@
   struct {
     unsigned offset;
     struct grub_script_mem *memory;
+    struct grub_script *scripts;
   };
 }
 
@@ -152,16 +153,45 @@ argument : "case"      { $$ = grub_script_add_arglist (state, 0, $1); }
          | word { $$ = $1; }
 ;
 
+/*
+  Block parameter is passed to commands in two forms: as unparsed
+  string and as pre-parsed grub_script object.  Passing as grub_script
+  object makes memory management difficult, because:
+
+  (1) Command may want to keep a reference to grub_script objects for
+      later use, so script framework may not free the grub_script
+      object after command completes.
+
+  (2) Command may get called multiple times with same grub_script
+      object under loops, so we should not let command implementation
+      to free the grub_script object.
+
+  To solve above problems, we rely on reference counting for
+  grub_script objects.  Commands that want to keep the grub_script
+  object must take a reference to it.
+
+  Other complexity comes with arbitrary nesting of grub_script
+  objects: a grub_script object may have commands with several block
+  parameters, and each block parameter may further contain multiple
+  block parameters nested.  We use temporary variable, state->scripts
+  to collect nested child scripts (that are linked by siblings and
+  children members), and will build grub_scripts tree from bottom.
+ */
 block: "{"
        {
          grub_script_lexer_ref (state->lexerstate);
          $<offset>$ = grub_script_lexer_record_start (state);
 	 $<memory>$ = grub_script_mem_record (state);
+
+	 /* save currently known scripts.  */
+	 $<scripts>$ = state->scripts;
+	 state->scripts = 0;
        }
        commands1 delimiters0 "}"
        {
          char *p;
 	 struct grub_script_mem *memory;
+	 struct grub_script *s = $<scripts>2;
 
 	 memory = grub_script_mem_record_stop (state, $<memory>2);
          if ((p = grub_script_lexer_record_stop (state, $<offset>2)))
@@ -171,6 +201,19 @@ block: "{"
 	 if (! $$ || ! ($$->script = grub_script_create ($3, memory)))
 	   grub_script_mem_free (memory);
 
+	 else {
+	   /* attach nested scripts to $$->script as children */
+	   $$->script->children = state->scripts;
+
+	   /* restore old scripts; append $$->script to siblings. */
+	   state->scripts = $<scripts>2 ?: $$->script;
+	   if (s) {
+	     while (s->siblings)
+	       s = s->siblings;
+	     s->siblings = $$->script;
+	   }
+	 }
+
          grub_script_lexer_deref (state->lexerstate);
        }
 ;
@@ -243,10 +286,13 @@ commands1: newlines0 command
            }
 ;
 
-function: "function" "name" 
+function: "function" "name"
           {
             grub_script_lexer_ref (state->lexerstate);
             state->func_mem = grub_script_mem_record (state);
+
+	    $<scripts>$ = state->scripts;
+	    state->scripts = 0;
           }
           delimiters0 "{" commands1 delimiters1 "}"
           {
@@ -256,9 +302,12 @@ function: "function" "name"
             script = grub_script_create ($6, state->func_mem);
             if (! script)
 	      grub_script_mem_free (state->func_mem);
-	    else
+	    else {
+	      script->children = state->scripts;
 	      grub_script_function_create ($2, script);
+	    }
 
+	    state->scripts = $<scripts>3;
             grub_script_lexer_deref (state->lexerstate);
           }
 ;
diff --git a/script/script.c b/script/script.c
index 7cf2f6bae..6509b5f5d 100644
--- a/script/script.c
+++ b/script/script.c
@@ -94,12 +94,19 @@ grub_script_mem_record_stop (struct grub_parser_param *state,
 void
 grub_script_free (struct grub_script *script)
 {
+  struct grub_script *s;
+
   if (!script)
     return;
 
   if (script->mem)
     grub_script_mem_free (script->mem);
 
+  s = script->children;
+  while (s) {
+    grub_script_put (s);
+    s = s->siblings;
+  }
   grub_free (script);
 }
 
@@ -346,6 +353,8 @@ grub_script_create (struct grub_script_cmd *cmd, struct grub_script_mem *mem)
   parsed->mem = mem;
   parsed->cmd = cmd;
   parsed->refcnt = 0;
+  parsed->siblings = 0;
+  parsed->children = 0;
 
   return parsed;
 }
@@ -394,6 +403,7 @@ grub_script_parse (char *script, grub_reader_getline_t getline)
 
   parsed->mem = grub_script_mem_record_stop (parsestate, membackup);
   parsed->cmd = parsestate->parsed;
+  parsed->children = parsestate->scripts;
 
   grub_script_lexer_fini (lexstate);
   grub_free (parsestate);

From 1d0546767810ccce6c2090b675f6b5006f2b307a Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 22 Jul 2010 05:05:49 +0530
Subject: [PATCH 1292/1628] simplify

---
 commands/extcmd.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/commands/extcmd.c b/commands/extcmd.c
index cc0362e14..ecf2d4133 100644
--- a/commands/extcmd.c
+++ b/commands/extcmd.c
@@ -40,9 +40,7 @@ grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
   context.extcmd = ext;
   context.script = script;
 
-  /* Dynamic commands should not perform option parsing before
-     corresponding module gets loaded.  */
-  if (cmd->flags & GRUB_COMMAND_FLAG_DYNCMD)
+  if (! ext->options)
     {
       ret = (ext->func) (&context, argc, args);
       return ret;

From 639cc5ab447f41f2d4e3c325ca7acb25c84ec598 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 22 Jul 2010 19:01:40 +0530
Subject: [PATCH 1293/1628] menuentry option parsing is done using lib/arg.c

---
 commands/extcmd.c      |  20 ++--
 commands/menuentry.c   | 141 +++++++++++++++++++++++++++-
 include/grub/lib/arg.h |   9 +-
 include/grub/normal.h  |   2 -
 lib/arg.c              |  60 +++++++++++-
 normal/main.c          | 203 -----------------------------------------
 script/script.c        |   2 +-
 7 files changed, 208 insertions(+), 229 deletions(-)

diff --git a/commands/extcmd.c b/commands/extcmd.c
index 8fe2ead35..4b3d9d36b 100644
--- a/commands/extcmd.c
+++ b/commands/extcmd.c
@@ -29,10 +29,8 @@ grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
 {
   int new_argc;
   char **new_args;
-  struct grub_arg_option *parser;
   struct grub_arg_list *state;
   struct grub_extcmd_context context;
-  int maxargs = 0;
   grub_err_t ret;
   grub_extcmd_t ext = cmd->data;
 
@@ -46,24 +44,20 @@ grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
       return ret;
     }
 
-  parser = (struct grub_arg_option *) ext->options;
-  while (parser && (parser++)->doc)
-    maxargs++;
-
-  /* Set up the option state.  */
-  state = grub_zalloc (sizeof (struct grub_arg_list) * maxargs);
-
+  state = grub_arg_list_alloc (ext, argc, args);
   if (grub_arg_parse (ext, argc, args, state, &new_args, &new_argc))
     {
       context.state = state;
       ret = (ext->func) (&context, new_argc, new_args);
       grub_free (new_args);
+      grub_free (state);
+      return ret;
     }
-  else
-    ret = grub_errno;
 
-  grub_free (state);
-  return ret;
+  if (state)
+    grub_free (state);
+
+  return grub_errno;
 }
 
 static grub_err_t
diff --git a/commands/menuentry.c b/commands/menuentry.c
index 2d389e942..6b7214d62 100644
--- a/commands/menuentry.c
+++ b/commands/menuentry.c
@@ -25,25 +25,156 @@
 #include <grub/i18n.h>
 #include <grub/normal.h>
 
+static const struct grub_arg_option options[] =
+  {
+    {"class", 1, GRUB_ARG_OPTION_REPEATABLE,
+     N_("Menu entry type."), "STRING", ARG_TYPE_STRING},
+    {"users", 2, 0,
+     N_("Users allowed to boot this entry."), "USERNAME", ARG_TYPE_STRING},
+    {"hotkey", 3, 0,
+     N_("Keyboard key for this entry."), "KEY", ARG_TYPE_STRING},
+    {0, 0, 0, 0, 0, 0}
+  };
+
+static struct
+{
+  char *name;
+  int key;
+} hotkey_aliases[] =
+  {
+    {"backspace", '\b'},
+    {"tab", '\t'},
+    {"delete", GRUB_TERM_DC}
+  };
+
+/* Add a menu entry to the current menu context (as given by the environment
+   variable data slot `menu').  As the configuration file is read, the script
+   parser calls this when a menu entry is to be created.  */
+static grub_err_t
+add_menu_entry (int argc, const char **args, char **classes,
+		const char *users, const char *hotkey,
+		const char *sourcecode)
+{
+  unsigned i;
+  int menu_hotkey = 0;
+  char *menu_users = NULL;
+  char *menu_title = NULL;
+  char *menu_sourcecode = NULL;
+  struct grub_menu_entry_class *menu_classes = NULL;
+
+  grub_menu_t menu;
+  grub_menu_entry_t *last;
+
+  menu = grub_env_get_menu ();
+  if (! menu)
+    return grub_error (GRUB_ERR_MENU, "no menu context");
+
+  last = &menu->entry_list;
+
+  menu_sourcecode = grub_strdup (sourcecode);
+  if (! menu_sourcecode)
+    return grub_errno;
+
+  if (classes)
+    {
+      for (i = 0; classes[i]; i++); /* count # of menuentry classes */
+      menu_classes = grub_zalloc (sizeof (struct grub_menu_entry_class) * i);
+      if (! menu_classes)
+	goto fail;
+
+      for (i = 0; classes[i]; i++)
+	{
+	  menu_classes[i].name = grub_strdup (classes[i]);
+	  if (! menu_classes[i].name)
+	    goto fail;
+	  menu_classes[i].next = classes[i + 1] ? &menu_classes[i + 1] : NULL;
+	}
+    }
+
+  if (users)
+    {
+      menu_users = grub_strdup (users);
+      if (! menu_users)
+	goto fail;
+    }
+
+  if (hotkey)
+    {
+      for (i = 0; i < ARRAY_SIZE (hotkey_aliases); i++)
+	if (grub_strcmp (hotkey, hotkey_aliases[i].name) == 0)
+	  {
+	    menu_hotkey = hotkey_aliases[i].key;
+	    break;
+	  }
+      if (i > ARRAY_SIZE (hotkey_aliases))
+	goto fail;
+    }
+
+  if (! argc)
+    {
+      grub_error (GRUB_ERR_MENU, "menuentry is missing title");
+      goto fail;
+    }
+
+  menu_title = grub_strdup (args[0]);
+  if (! menu_title)
+    goto fail;
+
+  /* XXX: pass args[1..end] as parameters to block arg. */
+
+  /* Add the menu entry at the end of the list.  */
+  while (*last)
+    last = &(*last)->next;
+
+  *last = grub_zalloc (sizeof (**last));
+  if (! *last)
+    goto fail;
+
+  (*last)->title = menu_title;
+  (*last)->hotkey = menu_hotkey;
+  (*last)->classes = menu_classes;
+  if (menu_users)
+    (*last)->restricted = 1;
+  (*last)->users = menu_users;
+  (*last)->sourcecode = menu_sourcecode;
+
+  menu->size++;
+  return GRUB_ERR_NONE;
+
+ fail:
+
+  grub_free (menu_sourcecode);
+  for (i = 0; menu_classes && menu_classes[i].name; i++)
+    grub_free (menu_classes[i].name);
+  grub_free (menu_classes);
+  grub_free (menu_users);
+  grub_free (menu_title);
+  return grub_errno;
+}
+
 static grub_err_t
 grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
 {
+  char ch;
   char *src;
   unsigned len;
   grub_err_t r;
 
-  /* XXX Rewrite to make use of already parsed menu definition.  */
   if (! argc || ! ctxt->script)
     return GRUB_ERR_BAD_ARGUMENT;
 
   src = args[argc - 1];
-  args[argc - 1] = '\0';
+  args[argc - 1] = NULL;
+
   len = grub_strlen(src);
+  ch = src[len - 1];
   src[len - 1] = '\0';
 
-  r = grub_normal_add_menu_entry (argc - 1, (const char **) args, src + 1);
+  r = add_menu_entry (argc - 1, (const char **) args,
+		      ctxt->state[0].args, ctxt->state[1].arg,
+		      ctxt->state[2].arg, src + 1);
 
-  src[len - 1] = '}';
+  src[len - 1] = ch;
   args[argc - 1] = src;
   return r;
 }
@@ -54,7 +185,7 @@ GRUB_MOD_INIT(menuentry)
 {
   cmd = grub_register_extcmd ("menuentry", grub_cmd_menuentry,
 			      GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_BLOCKS,
-			      N_("BLOCK"), N_("Define a menuentry."), 0);
+			      N_("BLOCK"), N_("Define a menuentry."), options);
 }
 
 GRUB_MOD_FINI(menuentry)
diff --git a/include/grub/lib/arg.h b/include/grub/lib/arg.h
index e6af60cf9..3bab27781 100644
--- a/include/grub/lib/arg.h
+++ b/include/grub/lib/arg.h
@@ -38,6 +38,8 @@ typedef enum grub_arg_type grub_arg_type_t;
 
 /* Flags for the option field op grub_arg_option.  */
 #define GRUB_ARG_OPTION_OPTIONAL	(1 << 1)
+/* Flags for an option that can appear multiple times.  */
+#define GRUB_ARG_OPTION_REPEATABLE      (1 << 2)
 
 enum grub_key_type
   {
@@ -59,7 +61,10 @@ struct grub_arg_option
 struct grub_arg_list
 {
   int set;
-  char *arg;
+  union {
+    char *arg;
+    char **args;
+  };
 };
 
 struct grub_extcmd;
@@ -68,5 +73,7 @@ int grub_arg_parse (struct grub_extcmd *cmd, int argc, char **argv,
 		    struct grub_arg_list *usr, char ***args, int *argnum);
 
 void grub_arg_show_help (struct grub_extcmd *cmd);
+struct grub_arg_list* grub_arg_list_alloc (struct grub_extcmd *cmd,
+					   int argc, char *argv[]);
 
 #endif /* ! GRUB_ARG_HEADER */
diff --git a/include/grub/normal.h b/include/grub/normal.h
index a33e42e61..04d08a557 100644
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -54,8 +54,6 @@ void grub_normal_execute (const char *config, int nested, int batch);
 void grub_menu_init_page (int nested, int edit,
 			  struct grub_term_output *term);
 void grub_normal_init_page (struct grub_term_output *term);
-grub_err_t grub_normal_add_menu_entry (int argc, const char **args,
-				       const char *sourcecode);
 char *grub_file_getline (grub_file_t file);
 void grub_cmdline_run (int nested);
 
diff --git a/lib/arg.c b/lib/arg.c
index 04e0ea8ba..a11496d5b 100644
--- a/lib/arg.c
+++ b/lib/arg.c
@@ -207,8 +207,16 @@ parse_option (grub_extcmd_t cmd, int key, char *arg, struct grub_arg_list *usr)
 	if (found == -1)
 	  return -1;
 
-	usr[found].set = 1;
-	usr[found].arg = arg;
+	if (opt->flags & GRUB_ARG_OPTION_REPEATABLE)
+	  {
+	    usr[found].args[usr[found].set++] = arg;
+	    usr[found].args[usr[found].set] = NULL;
+	  }
+	else
+	  {
+	    usr[found].set = 1;
+	    usr[found].arg = arg;
+	  }
       }
     }
 
@@ -229,13 +237,14 @@ grub_arg_parse (grub_extcmd_t cmd, int argc, char **argv,
   grub_err_t add_arg (char *s)
     {
       char **p = argl;
-      argl = grub_realloc (argl, (++num) * sizeof (char *));
+      argl = grub_realloc (argl, (++num + 1) * sizeof (char *));
       if (! argl)
 	{
 	  grub_free (p);
 	  return grub_errno;
 	}
       argl[num - 1] = s;
+      argl[num] = NULL;
       return 0;
     }
 
@@ -312,8 +321,11 @@ grub_arg_parse (grub_extcmd_t cmd, int argc, char **argv,
 	  if (option) {
 	    arglen = option - arg - 2;
 	    option++;
-	  } else
+	  } else {
 	    arglen = grub_strlen (arg) - 2;
+	    if (argv[curarg + 1])
+	      option = argv[curarg + 1][0] == '-' ? 0 : argv[++curarg];
+	  }
 
 	  opt = find_long (cmd->options, arg + 2, arglen);
 	  if (! opt)
@@ -392,3 +404,43 @@ grub_arg_parse (grub_extcmd_t cmd, int argc, char **argv,
  fail:
   return complete;
 }
+
+struct grub_arg_list*
+grub_arg_list_alloc(grub_extcmd_t extcmd, int argc,
+		    char **argv __attribute__((unused)))
+{
+  int i;
+  char **args;
+  unsigned argcnt;
+  struct grub_arg_list *list;
+  const struct grub_arg_option *options;
+
+  options = extcmd->options;
+  if (! options)
+    return 0;
+
+  argcnt = 0;
+  for (i = 0; options[i].doc; i++)
+    {
+      if (options[i].flags & GRUB_ARG_OPTION_REPEATABLE)
+	argcnt += (argc + 1) / 2 + 1; /* max possible for any option */
+    }
+
+  list = grub_zalloc (sizeof (*list) * i + sizeof (char*) * argcnt);
+  if (! list)
+    return 0;
+
+  args = (char**) (list + i);
+  for (i = 0; options[i].doc; i++)
+    {
+      list[i].set = 0;
+      list[i].arg = 0;
+
+      if (options[i].flags & GRUB_ARG_OPTION_REPEATABLE)
+	{
+	  list[i].args = args;
+	  args += argc / 2 + 1;
+	}
+    }
+  return list;
+}
diff --git a/normal/main.c b/normal/main.c
index 710b68d14..6997b5d6a 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -141,209 +141,6 @@ free_menu (grub_menu_t menu)
   grub_env_unset_menu ();
 }
 
-static void
-free_menu_entry_classes (struct grub_menu_entry_class *head)
-{
-  /* Free all the classes.  */
-  while (head)
-    {
-      struct grub_menu_entry_class *next;
-
-      grub_free (head->name);
-      next = head->next;
-      grub_free (head);
-      head = next;
-    }
-}
-
-static struct
-{
-  char *name;
-  int key;
-} hotkey_aliases[] =
-  {
-    {"backspace", '\b'},
-    {"tab", '\t'},
-    {"delete", GRUB_TERM_DC}
-  };
-
-/* Add a menu entry to the current menu context (as given by the environment
-   variable data slot `menu').  As the configuration file is read, the script
-   parser calls this when a menu entry is to be created.  */
-grub_err_t
-grub_normal_add_menu_entry (int argc, const char **args,
-			    const char *sourcecode)
-{
-  const char *menutitle = 0;
-  const char *menusourcecode;
-  grub_menu_t menu;
-  grub_menu_entry_t *last;
-  int failed = 0;
-  int i;
-  struct grub_menu_entry_class *classes_head;  /* Dummy head node for list.  */
-  struct grub_menu_entry_class *classes_tail;
-  char *users = NULL;
-  int hotkey = 0;
-
-  /* Allocate dummy head node for class list.  */
-  classes_head = grub_zalloc (sizeof (struct grub_menu_entry_class));
-  if (! classes_head)
-    return grub_errno;
-  classes_tail = classes_head;
-
-  menu = grub_env_get_menu ();
-  if (! menu)
-    return grub_error (GRUB_ERR_MENU, "no menu context");
-
-  last = &menu->entry_list;
-
-  menusourcecode = grub_strdup (sourcecode);
-  if (! menusourcecode)
-    return grub_errno;
-
-  /* Parse menu arguments.  */
-  for (i = 0; i < argc; i++)
-    {
-      /* Capture arguments.  */
-      if (grub_strncmp ("--", args[i], 2) == 0 && i + 1 < argc)
-	{
-	  const char *arg = &args[i][2];
-
-	  /* Handle menu class.  */
-	  if (grub_strcmp(arg, "class") == 0)
-	    {
-	      char *class_name;
-	      struct grub_menu_entry_class *new_class;
-
-	      i++;
-	      class_name = grub_strdup (args[i]);
-	      if (! class_name)
-		{
-		  failed = 1;
-		  break;
-		}
-
-	      /* Create a new class and add it at the tail of the list.  */
-	      new_class = grub_zalloc (sizeof (struct grub_menu_entry_class));
-	      if (! new_class)
-		{
-		  grub_free (class_name);
-		  failed = 1;
-		  break;
-		}
-	      /* Fill in the new class node.  */
-	      new_class->name = class_name;
-	      /* Link the tail to it, and make it the new tail.  */
-	      classes_tail->next = new_class;
-	      classes_tail = new_class;
-	      continue;
-	    }
-	  else if (grub_strcmp(arg, "users") == 0)
-	    {
-	      i++;
-	      users = grub_strdup (args[i]);
-	      if (! users)
-		{
-		  failed = 1;
-		  break;
-		}
-
-	      continue;
-	    }
-	  else if (grub_strcmp(arg, "hotkey") == 0)
-	    {
-	      unsigned j;
-
-	      i++;
-	      if (args[i][1] == 0)
-		{
-		  hotkey = args[i][0];
-		  continue;
-		}
-
-	      for (j = 0; j < ARRAY_SIZE (hotkey_aliases); j++)
-		if (grub_strcmp (args[i], hotkey_aliases[j].name) == 0)
-		  {
-		    hotkey = hotkey_aliases[j].key;
-		    break;
-		  }
-
-	      if (j < ARRAY_SIZE (hotkey_aliases))
-		continue;
-
-	      failed = 1;
-	      grub_error (GRUB_ERR_MENU,
-			  "Invalid hotkey: '%s'.", args[i]);
-	      break;
-	    }
-	  else
-	    {
-	      /* Handle invalid argument.  */
-	      failed = 1;
-	      grub_error (GRUB_ERR_MENU,
-			  "invalid argument for menuentry: %s", args[i]);
-	      break;
-	    }
-	}
-
-      /* Capture title.  */
-      if (! menutitle)
-	{
-	  menutitle = grub_strdup (args[i]);
-	}
-      else
-	{
-	  failed = 1;
-	  grub_error (GRUB_ERR_MENU,
-		      "too many titles for menuentry: %s", args[i]);
-	  break;
-	}
-    }
-
-  /* Validate arguments.  */
-  if ((! failed) && (! menutitle))
-    {
-      grub_error (GRUB_ERR_MENU, "menuentry is missing title");
-      failed = 1;
-    }
-
-  /* If argument parsing failed, free any allocated resources.  */
-  if (failed)
-    {
-      free_menu_entry_classes (classes_head);
-      grub_free ((void *) menutitle);
-      grub_free ((void *) menusourcecode);
-
-      /* Here we assume that grub_error has been used to specify failure details.  */
-      return grub_errno;
-    }
-
-  /* Add the menu entry at the end of the list.  */
-  while (*last)
-    last = &(*last)->next;
-
-  *last = grub_zalloc (sizeof (**last));
-  if (! *last)
-    {
-      free_menu_entry_classes (classes_head);
-      grub_free ((void *) menutitle);
-      grub_free ((void *) menusourcecode);
-      return grub_errno;
-    }
-
-  (*last)->title = menutitle;
-  (*last)->hotkey = hotkey;
-  (*last)->classes = classes_head;
-  if (users)
-    (*last)->restricted = 1;
-  (*last)->users = users;
-  (*last)->sourcecode = menusourcecode;
-
-  menu->size++;
-
-  return GRUB_ERR_NONE;
-}
-
 static grub_menu_t
 read_config_file (const char *config)
 {
diff --git a/script/script.c b/script/script.c
index bcefd81d8..c1b5cf8cd 100644
--- a/script/script.c
+++ b/script/script.c
@@ -104,8 +104,8 @@ grub_script_free (struct grub_script *script)
 
   s = script->children;
   while (s) {
-    grub_script_put (s);
     s = s->siblings;
+    grub_script_put (s);
   }
   grub_free (script);
 }

From 70abc7023b42b2e19cc41760df09cf9a82bded6e Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 22 Jul 2010 21:13:45 +0530
Subject: [PATCH 1294/1628] fix a memory issue

---
 script/script.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/script/script.c b/script/script.c
index 6509b5f5d..8d856c493 100644
--- a/script/script.c
+++ b/script/script.c
@@ -95,8 +95,9 @@ void
 grub_script_free (struct grub_script *script)
 {
   struct grub_script *s;
+  struct grub_script *t;
 
-  if (!script)
+  if (! script)
     return;
 
   if (script->mem)
@@ -104,8 +105,9 @@ grub_script_free (struct grub_script *script)
 
   s = script->children;
   while (s) {
+    t = s->siblings;
     grub_script_put (s);
-    s = s->siblings;
+    s = t;
   }
   grub_free (script);
 }

From 1767f7096ca2398bd725879021e4db0e66b77c70 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 22 Jul 2010 21:15:14 +0530
Subject: [PATCH 1295/1628] menuentry can pass parameters to its definition

---
 commands/menuentry.c     | 33 ++++++++++++++++++-----
 include/grub/menu.h      |  4 +++
 include/grub/script_sh.h |  1 +
 normal/menu.c            | 41 +----------------------------
 script/execute.c         | 56 ++++++++++++++++++++++++++++++++++++++++
 script/script.c          |  4 ++-
 6 files changed, 91 insertions(+), 48 deletions(-)

diff --git a/commands/menuentry.c b/commands/menuentry.c
index 6b7214d62..be4fa3347 100644
--- a/commands/menuentry.c
+++ b/commands/menuentry.c
@@ -51,12 +51,13 @@ static struct
    variable data slot `menu').  As the configuration file is read, the script
    parser calls this when a menu entry is to be created.  */
 static grub_err_t
-add_menu_entry (int argc, const char **args, char **classes,
-		const char *users, const char *hotkey,
-		const char *sourcecode)
+append_menu_entry (int argc, const char **args, char **classes,
+		   const char *users, const char *hotkey,
+		   const char *sourcecode)
 {
   unsigned i;
   int menu_hotkey = 0;
+  char **menu_args = NULL;
   char *menu_users = NULL;
   char *menu_title = NULL;
   char *menu_sourcecode = NULL;
@@ -120,7 +121,18 @@ add_menu_entry (int argc, const char **args, char **classes,
   if (! menu_title)
     goto fail;
 
-  /* XXX: pass args[1..end] as parameters to block arg. */
+  /* Save argc, args to pass as parameters to block arg later. */
+  menu_args = grub_malloc (sizeof (char*) * (argc + 1));
+  if (! menu_args)
+    goto fail;
+
+  for (i = 0; args[i]; i++)
+    {
+      menu_args[i] = grub_strdup (args[i]);
+      if (! menu_args[i])
+	goto fail;
+    }
+  menu_args[argc] = NULL;
 
   /* Add the menu entry at the end of the list.  */
   while (*last)
@@ -136,6 +148,8 @@ add_menu_entry (int argc, const char **args, char **classes,
   if (menu_users)
     (*last)->restricted = 1;
   (*last)->users = menu_users;
+  (*last)->argc = argc;
+  (*last)->args = menu_args;
   (*last)->sourcecode = menu_sourcecode;
 
   menu->size++;
@@ -147,6 +161,11 @@ add_menu_entry (int argc, const char **args, char **classes,
   for (i = 0; menu_classes && menu_classes[i].name; i++)
     grub_free (menu_classes[i].name);
   grub_free (menu_classes);
+
+  for (i = 0; menu_args && menu_args[i]; i++)
+    grub_free (menu_args[i]);
+  grub_free (menu_args);
+
   grub_free (menu_users);
   grub_free (menu_title);
   return grub_errno;
@@ -170,9 +189,9 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
   ch = src[len - 1];
   src[len - 1] = '\0';
 
-  r = add_menu_entry (argc - 1, (const char **) args,
-		      ctxt->state[0].args, ctxt->state[1].arg,
-		      ctxt->state[2].arg, src + 1);
+  r = append_menu_entry (argc - 1, (const char **) args,
+			 ctxt->state[0].args, ctxt->state[1].arg,
+			 ctxt->state[2].arg, src + 1);
 
   src[len - 1] = ch;
   args[argc - 1] = src;
diff --git a/include/grub/menu.h b/include/grub/menu.h
index e5e5fb110..9dc257ab7 100644
--- a/include/grub/menu.h
+++ b/include/grub/menu.h
@@ -47,6 +47,10 @@ struct grub_menu_entry
   /* The sourcecode of the menu entry, used by the editor.  */
   const char *sourcecode;
 
+  /* Parameters to be passed to menu definition.  */
+  int argc;
+  char **args;
+
   int hotkey;
 
   /* The next element.  */
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 122d89862..7869a4680 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -303,6 +303,7 @@ grub_err_t grub_script_execute_cmdwhile (struct grub_script_cmd *cmd);
 
 /* Execute any GRUB pre-parsed command or script.  */
 grub_err_t grub_script_execute (struct grub_script *script);
+grub_err_t grub_script_execute_sourcecode (const char *source, int argc, char **args);
 
 /* This variable points to the parsed command.  This is used to
    communicate with the bison code.  */
diff --git a/normal/menu.c b/normal/menu.c
index b57990b0d..f483349e4 100644
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -142,44 +142,6 @@ get_and_remove_first_entry_number (const char *name)
   return entry;
 }
 
-static void
-grub_menu_execute_entry_real (grub_menu_entry_t entry)
-{
-  const char *source;
-
-  auto grub_err_t getline (char **line, int cont);
-  grub_err_t getline (char **line, int cont __attribute__ ((unused)))
-  {
-    const char *p;
-
-    if (!source)
-      {
-	*line = 0;
-	return 0;
-      }
-
-    p = grub_strchr (source, '\n');
-
-    if (p)
-      *line = grub_strndup (source, p - source);
-    else
-      *line = grub_strdup (source);
-    source = p ? p + 1 : 0;
-    return 0;
-  }
-
-  source = entry->sourcecode;
-
-  while (source)
-    {
-      char *line;
-
-      getline (&line, 0);
-      grub_normal_parse_line (line, getline);
-      grub_free (line);
-    }
-}
-
 /* Run a menu entry.  */
 void
 grub_menu_execute_entry(grub_menu_entry_t entry)
@@ -197,8 +159,7 @@ grub_menu_execute_entry(grub_menu_entry_t entry)
     }
 
   grub_env_set ("chosen", entry->title);
-
-  grub_menu_execute_entry_real (entry);
+  grub_script_execute_sourcecode (entry->sourcecode, entry->argc, entry->args);
 
   if (grub_errno == GRUB_ERR_NONE && grub_loader_is_loaded ())
     /* Implicit execution of boot, only if something is loaded.  */
diff --git a/script/execute.c b/script/execute.c
index 4b906b06f..43a8bd1d7 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -268,6 +268,62 @@ grub_script_function_call (grub_script_function_t func, int argc, char **args)
   return ret;
 }
 
+/* Execute a source script.  */
+grub_err_t
+grub_script_execute_sourcecode (const char *source, int argc, char **args)
+{
+  grub_err_t ret = 0;
+  struct grub_script *parsed_script;
+  struct grub_script_scope new_scope;
+  struct grub_script_scope *old_scope;
+
+  auto grub_err_t getline (char **line, int cont);
+  grub_err_t getline (char **line, int cont __attribute__ ((unused)))
+  {
+    const char *p;
+
+    if (! source)
+      {
+	*line = 0;
+	return 0;
+      }
+
+    p = grub_strchr (source, '\n');
+
+    if (p)
+      *line = grub_strndup (source, p - source);
+    else
+      *line = grub_strdup (source);
+    source = p ? p + 1 : 0;
+    return 0;
+  }
+
+  new_scope.argv.argc = argc;
+  new_scope.argv.args = args;
+
+  old_scope = scope;
+  scope = &new_scope;
+
+  while (source)
+    {
+      char *line;
+
+      getline (&line, 0);
+      parsed_script = grub_script_parse (line, getline);
+      if (! parsed_script)
+	{
+	  ret = grub_errno;
+	  break;
+	}
+
+      ret = grub_script_execute (parsed_script);
+      grub_free (line);
+    }
+
+  scope = old_scope;
+  return ret;
+}
+
 /* Execute a single command line.  */
 grub_err_t
 grub_script_execute_cmdline (struct grub_script_cmd *cmd)
diff --git a/script/script.c b/script/script.c
index c1b5cf8cd..6da4b72cd 100644
--- a/script/script.c
+++ b/script/script.c
@@ -95,6 +95,7 @@ void
 grub_script_free (struct grub_script *script)
 {
   struct grub_script *s;
+  struct grub_script *t;
 
   if (!script)
     return;
@@ -104,8 +105,9 @@ grub_script_free (struct grub_script *script)
 
   s = script->children;
   while (s) {
-    s = s->siblings;
+    t = s->siblings;
     grub_script_put (s);
+    s = t;
   }
   grub_free (script);
 }

From 88513a523636adfd76db27cdab93ad183fd1d2d2 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 22 Jul 2010 22:50:04 +0530
Subject: [PATCH 1296/1628] removed unnecessary grammar rules

---
 script/parser.y | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/script/parser.y b/script/parser.y
index 4f57ea4ff..ce97ab174 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -81,7 +81,7 @@
 %token <arg> GRUB_PARSER_TOKEN_WORD      "word"
 
 %type <arg> block block0
-%type <arglist> word argument parameters0 parameters1 arguments0 arguments1
+%type <arglist> word argument arguments0 arguments1
 
 %type <cmd> script_init script
 %type <cmd> grubcmd ifclause ifcmd forcmd whilecmd untilcmd
@@ -236,22 +236,7 @@ arguments1: argument arguments0
             }
 ;
 
-parameters1: argument parameters0
-             {
-               if ($1 && $2)
-                 {
-                   $1->next = $2;
-                   $1->argcount += $2->argcount;
-                   $2->argcount = 0;
-                 }
-               $$ = $1;
-             }
-;
-parameters0: /* Empty */ { $$ = 0; }
-           | parameters1 { $$ = $1; }
-;
-
-grubcmd: word parameters0 block0
+grubcmd: word arguments0 block0
          {
 	   struct grub_script_arglist *x = $2;
 

From 1a60d363b0808700bfaa8b475852c5063eda7f21 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 22 Jul 2010 23:22:36 +0530
Subject: [PATCH 1297/1628] cleanup

---
 commands/extcmd.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/commands/extcmd.c b/commands/extcmd.c
index 4b3d9d36b..44a4b6cfd 100644
--- a/commands/extcmd.c
+++ b/commands/extcmd.c
@@ -54,9 +54,7 @@ grub_extcmd_dispatcher (struct grub_command *cmd, int argc, char **args,
       return ret;
     }
 
-  if (state)
-    grub_free (state);
-
+  grub_free (state);
   return grub_errno;
 }
 

From 645505004e6f935ea3221bbf3750b9ee27a877be Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 23 Jul 2010 02:57:02 +0530
Subject: [PATCH 1298/1628] suppress unwanted shell expansion

---
 tests/util/grub-shell.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 2cd256131..3ad658438 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -95,7 +95,7 @@ done
 if [ "x${source}" = x ] ; then
     tmpfile=`mktemp`
     while read REPLY; do
-	echo $REPLY >> ${tmpfile}
+	echo "$REPLY" >> ${tmpfile}
     done
     source=${tmpfile}
 fi

From 31784795aac5370ee65a23aea91d2bd47cec3006 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 23 Jul 2010 03:30:26 +0530
Subject: [PATCH 1299/1628] separate expansions for disks and partitions

---
 script/argv.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/script/argv.c b/script/argv.c
index 8fe8971d3..1941b5672 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -54,7 +54,7 @@ static char *make_dir (const char *prefix, const char *start, const char *end);
 static int make_regex (const char *regex_start, const char *regex_end,
 		       regex_t *regexp);
 static void split_path (char *path, char **suffix_end, char **regex_end);
-static char ** match_devices (const regex_t *regexp);
+static char ** match_devices (const regex_t *regexp, int noparts);
 static char ** match_files (const char *prefix, const char *suffix_start,
 			    const char *suffix_end, const regex_t *regexp);
 static char ** match_paths_with_escaped_suffix (char **paths,
@@ -375,7 +375,7 @@ split_path (char *str, char **suffix_end, char **regex_end)
 }
 
 static char **
-match_devices (const regex_t *regexp)
+match_devices (const regex_t *regexp, int noparts)
 {
   int i;
   int ndev;
@@ -385,7 +385,13 @@ match_devices (const regex_t *regexp)
   int match (const char *name)
   {
     char **t;
-    char *buffer = grub_xasprintf ("(%s)", name);
+    char *buffer;
+
+    /* skip partitions if asked to. */
+    if (noparts && grub_strchr(name, ','))
+      return 0;
+
+    buffer = grub_xasprintf ("(%s)", name);
     if (! buffer)
       return 1;
 
@@ -530,7 +536,7 @@ match_paths_with_escaped_suffix (char **paths,
 				 const regex_t *regexp)
 {
   if (paths == 0 && suffix == end)
-    return match_devices (regexp);
+    return match_devices (regexp, *suffix != '(');
 
   else if (paths == 0 && suffix[0] == '(')
     return match_files ("", suffix, end, regexp);

From f2bf127859506b888cd81ed52f684a5b9a69a78c Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 23 Jul 2010 04:05:15 +0530
Subject: [PATCH 1300/1628] add comment

---
 script/argv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/argv.c b/script/argv.c
index 69322779d..b69ee39c5 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -20,6 +20,7 @@
 #include <grub/mm.h>
 #include <grub/script_sh.h>
 
+/* Return nearest power of two that is >= v.  */
 static unsigned
 round_up_exp (unsigned v)
 {

From 463711215f2420d12fad9b45d9a02b8a01668651 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 28 Jul 2010 18:25:48 +0300
Subject: [PATCH 1301/1628] 	* util/ieee1275/grub-install.in: Don't use
 empty grub_device. 	Reported by: Lennart Sorensen.

---
 ChangeLog                     | 17 +++++++++++------
 util/ieee1275/grub-install.in |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index de1edebb1..a2b6a2bc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/ieee1275/grub-install.in: Don't use empty grub_device.
+	Reported by: Lennart Sorensen.
+
+2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub.d/00_header.in: Remove compatibility with terminal.mod
+	prior to terminal_input/terminal_output separation. It's been over 1.5
+	years and those versions weren't widely deployed.
+
 2010-07-22  Colin Watson  <cjwatson@ubuntu.com>
 
 	* disk/raid.c (insert_array): Don't count named arrays when looking
@@ -29,12 +40,6 @@
 	(grub_efi_console_fini): New function.
 	(grub_console_term_output): Register init and fini methods.
 
-2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
-
-	* util/grub.d/00_header.in: Remove compatibility with terminal.mod
-	prior to terminal_input/terminal_output separation. It's been over 1.5
-	years and those versions weren't widely deployed.
-
 2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* tests/util/grub-shell-tester.in: Remove bashism and declare as
diff --git a/util/ieee1275/grub-install.in b/util/ieee1275/grub-install.in
index 98fd5d65a..98de5f348 100644
--- a/util/ieee1275/grub-install.in
+++ b/util/ieee1275/grub-install.in
@@ -212,7 +212,7 @@ fi
 # this command is allowed to fail (--target=fs already grants us that the
 # filesystem will be accessible).
 partmap_module=
-for x in `$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`; do
+for x in `$grub_probe --target=partmap --device-map=${device_map} ${grubdir} 2> /dev/null`; do
    partmap_module="$partmap_module part_$x";
 done
 

From 1c24bab4be20965548a5118236ae1b89900c3cb7 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 29 Jul 2010 16:59:49 +0530
Subject: [PATCH 1302/1628] updated testcase

---
 tests/grub_script_expansion.in | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/tests/grub_script_expansion.in b/tests/grub_script_expansion.in
index 1ec58e3a9..11aafc853 100644
--- a/tests/grub_script_expansion.in
+++ b/tests/grub_script_expansion.in
@@ -17,19 +17,26 @@
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
 disks=`echo ls | @builddir@/grub-shell`
-other=`echo echo \\* | @builddir@/grub-shell`
+other=`echo echo \* | @builddir@/grub-shell`
 for d in $disks; do
-  if ! echo "$other" | grep "$d" >/dev/null; then
-    echo "$d missing from * expansion" >&2
-    exit 1
-  fi
+    if echo "$d" |grep ',' >/dev/null; then
+	if echo "$other" | grep "$d" >/dev/null; then
+	    echo "$d should not occur in * expansion" >&2
+	    exit 1
+	fi
+    else
+	if ! echo "$other" | grep "$d" >/dev/null; then
+	    echo "$d missing from * expansion" >&2
+	    exit 1
+	fi
+    fi
 done
 
 other=`echo echo '(*)' | @builddir@/grub-shell`
 for d in $disks; do
-  if ! echo "$other" | grep "$d" >/dev/null; then
-    echo "$d missing from (*) expansion" >&2
-    exit 1
-  fi
+    if ! echo "$other" | grep "$d" >/dev/null; then
+	echo "$d missing from (*) expansion" >&2
+	exit 1
+    fi
 done
 

From 9f841f5cbfcdf52cb7a5e0f51e5239466f6fd67f Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Thu, 29 Jul 2010 15:06:39 +0200
Subject: [PATCH 1303/1628] 2010-07-29  Robert Millan  <rmh@gnu.org>

	* configure.ac: Remove grub-mkisofs checks.
---
 ChangeLog    | 4 ++++
 configure.ac | 7 -------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a2b6a2bc1..af48d4039 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-29  Robert Millan  <rmh@gnu.org>
+
+	* configure.ac: Remove grub-mkisofs checks.
+
 2010-07-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/ieee1275/grub-install.in: Don't use empty grub_device.
diff --git a/configure.ac b/configure.ac
index 55c2625cb..aa7f3a151 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,13 +249,6 @@ fi
 # Check for functions.
 AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf)
 
-# For grub-mkisofs
-AC_HEADER_MAJOR
-AC_HEADER_DIRENT
-AC_CHECK_FUNCS(memmove sbrk strdup lstat getuid getgid)
-AC_CHECK_HEADERS(sys/mkdev.h sys/sysmacros.h malloc.h termios.h sys/types.h)
-AC_CHECK_HEADERS(unistd.h string.h strings.h sys/stat.h sys/fcntl.h limits.h)
-
 # For opendisk() and getrawpartition() on NetBSD.
 # Used in util/deviceiter.c and in util/hostdisk.c.
 AC_CHECK_HEADER([util.h], [

From 8c184ffa19676b52dab8cd5b8e82e5beb21f8c29 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 29 Jul 2010 21:09:18 +0530
Subject: [PATCH 1304/1628] cleanup

---
 include/grub/wildcard.h |  34 +++++
 script/argv.c           | 316 +++++++++++++++++++++++-----------------
 2 files changed, 218 insertions(+), 132 deletions(-)
 create mode 100644 include/grub/wildcard.h

diff --git a/include/grub/wildcard.h b/include/grub/wildcard.h
new file mode 100644
index 000000000..8157b9db6
--- /dev/null
+++ b/include/grub/wildcard.h
@@ -0,0 +1,34 @@
+/* wildcard.h  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#ifndef GRUB_WILDCARD_HEADER
+#define GRUB_WILDCARD_HEADER
+
+/* Pluggable wildcard expansion engine.  */
+struct grub_wildcard_translator
+{
+  char *(*escape) (const char *str);
+  char *(*unescape) (const char *str);
+
+  grub_err_t (*expand) (const char *str, char ***expansions);
+
+  struct grub_wildcard_translator *next;
+};
+
+#endif /* GRUB_WILDCARD_HEADER */
diff --git a/script/argv.c b/script/argv.c
index 1941b5672..10e180457 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -23,6 +23,7 @@
 #include <grub/file.h>
 #include <grub/device.h>
 #include <grub/script_sh.h>
+#include <grub/wildcard.h>
 
 #include <regex.h>
 
@@ -48,20 +49,26 @@ round_up_exp (unsigned v)
   return v;
 }
 
-static inline int regexop (char ch);
+static inline int isregexop (char ch);
 static char ** merge (char **lhs, char **rhs);
 static char *make_dir (const char *prefix, const char *start, const char *end);
 static int make_regex (const char *regex_start, const char *regex_end,
 		       regex_t *regexp);
-static void split_path (char *path, char **suffix_end, char **regex_end);
+static void split_path (const char *path, const char **suffix_end, const char **regex_end);
 static char ** match_devices (const regex_t *regexp, int noparts);
 static char ** match_files (const char *prefix, const char *suffix_start,
 			    const char *suffix_end, const regex_t *regexp);
-static char ** match_paths_with_escaped_suffix (char **paths,
-						const char *suffix_start,
-						const char *suffix_end,
-						const regex_t *regexp);
-static int expand (char *arg, struct grub_script_argv *argv);
+
+static char* wildcard_escape (const char *s);
+static char* wildcard_unescape (const char *s);
+static grub_err_t wildcard_expand (const char *s, char ***strs);
+
+static struct grub_wildcard_translator foo = {
+  .expand = wildcard_expand,
+  .escape = wildcard_escape,
+  .unescape = wildcard_unescape
+};
+
 
 void
 grub_script_argv_free (struct grub_script_argv *argv)
@@ -109,7 +116,7 @@ enum append_type {
 };
 
 static int
-append (struct grub_script_argv *argv, const char *s, enum append_type type)
+append (struct grub_script_argv *argv, const char *s)
 {
   int a;
   int b;
@@ -120,41 +127,15 @@ append (struct grub_script_argv *argv, const char *s, enum append_type type)
     return 0;
 
   a = p ? grub_strlen (p) : 0;
-  b = grub_strlen (s) * (type == APPEND_ESCAPED ? 2 : 1);
+  b = grub_strlen (s);
 
   p = grub_realloc (p, round_up_exp ((a + b + 1) * sizeof (char)));
   if (! p)
     return 1;
 
-  switch (type)
-    {
-    case APPEND_RAW:
-      grub_strcpy (p + a, s);
-      break;
-
-    case APPEND_ESCAPED:
-      while ((ch = *s++))
-	{
-	  if (regexop (ch))
-	    p[a++] = '\\';
-	  p[a++] = ch;
-	}
-      p[a] = '\0';
-      break;
-
-    case APPEND_UNESCAPED:
-      while ((ch = *s++))
-	{
-	  if (ch == '\\' && regexop (*s))
-	    p[a++] = *s++;
-	  else
-	    p[a++] = ch;
-	}
-      p[a] = '\0';
-      break;
-    }
-
+  grub_strcpy (p + a, s);
   argv->args[argv->argc - 1] = p;
+
   return 0;
 }
 
@@ -163,21 +144,37 @@ append (struct grub_script_argv *argv, const char *s, enum append_type type)
 int
 grub_script_argv_append (struct grub_script_argv *argv, const char *s)
 {
-  return append (argv, s, APPEND_RAW);
+  return append (argv, s);
 }
 
 /* Append `s' to the last argument, but escape any shell regex ops.  */
 int
 grub_script_argv_append_escaped (struct grub_script_argv *argv, const char *s)
 {
-  return append (argv, s, APPEND_ESCAPED);
+  int r;
+  char *p = wildcard_escape (s);
+
+  if (! p)
+    return 1;
+
+  r = append (argv, p);
+  grub_free (p);
+  return r;
 }
 
 /* Append `s' to the last argument, but unescape any escaped shell regex ops.  */
 int
 grub_script_argv_append_unescaped (struct grub_script_argv *argv, const char *s)
 {
-  return append (argv, s, APPEND_UNESCAPED);
+  int r;
+  char *p = wildcard_unescape (s);
+
+  if (! p)
+    return 1;
+
+  r = append (argv, p);
+  grub_free (p);
+  return r;
 }
 
 /* Split `s' and append words as multiple arguments.  */
@@ -216,11 +213,33 @@ int
 grub_script_argv_expand (struct grub_script_argv *argv)
 {
   int i;
+  int j;
+  char *p;
+  char **expansions;
   struct grub_script_argv result = { 0, 0 };
 
   for (i = 0; argv->args[i]; i++)
-    if (expand (argv->args[i], &result))
-      goto fail;
+    {
+      expansions = 0;
+      if (wildcard_expand (argv->args[i], &expansions))
+	goto fail;
+
+      if (! expansions)
+	{
+	  grub_script_argv_next (&result);
+	  grub_script_argv_append_unescaped (&result, argv->args[i]);
+	}
+      else
+	{
+	  for (j = 0; expansions[j]; j++)
+	    {
+	      grub_script_argv_next (&result);
+	      grub_script_argv_append (&result, expansions[j]);
+	      grub_free (expansions[j]);
+	    }
+	  grub_free (expansions);
+	}
+    }
 
   grub_script_argv_free (argv);
   *argv = result;
@@ -267,7 +286,7 @@ merge (char **dest, char **ps)
 }
 
 static inline int
-regexop (char ch)
+isregexop (char ch)
 {
   return grub_strchr ("*.\\", ch) ? 1 : 0;
 }
@@ -289,7 +308,7 @@ make_dir (const char *prefix, const char *start, const char *end)
 
   grub_strcpy (result, prefix);
   while (start < end && (ch = *start++))
-    if (ch == '\\' && regexop (*start))
+    if (ch == '\\' && isregexop (*start))
       result[i++] = *start++;
     else
       result[i++] = ch;
@@ -343,35 +362,41 @@ make_regex (const char *start, const char *end, regex_t *regexp)
   return 0;
 }
 
+/* Split `str' into two parts: (1) dirname that is regexop free (2)
+   dirname that has a regexop.  */
 static void
-split_path (char *str, char **suffix_end, char **regex_end)
+split_path (const char *str, const char **noregexop, const char **regexop)
 {
   char ch = 0;
   int regex = 0;
 
-  char *end;
-  char *split;
+  const char *end;
+  const char *split;  /* points till the end of dirnaname that doesn't
+			 need expansion.  */
 
   split = end = str;
   while ((ch = *end))
     {
       if (ch == '\\' && end[1])
 	end++;
-      else if (regexop (ch))
+
+      else if (isregexop (ch))
 	regex = 1;
+
       else if (ch == '/' && ! regex)
-	split = end + 1;
+	split = end + 1;  /* forward to next regexop-free dirname */
+
       else if (ch == '/' && regex)
-	break;
+	break;  /* stop at the first dirname with a regexop */
 
       end++;
     }
 
-  *regex_end = end;
+  *regexop = end;
   if (! regex)
-    *suffix_end = end;
+    *noregexop = end;
   else
-    *suffix_end = split;
+    *noregexop = split;
 }
 
 static char **
@@ -530,112 +555,139 @@ match_files (const char *prefix, const char *suffix, const char *end,
   return 0;
 }
 
-static char **
-match_paths_with_escaped_suffix (char **paths,
-				 const char *suffix, const char *end,
-				 const regex_t *regexp)
+static char*
+wildcard_escape (const char *s)
 {
-  if (paths == 0 && suffix == end)
-    return match_devices (regexp, *suffix != '(');
+  int i;
+  int len;
+  char ch;
+  char *p;
 
-  else if (paths == 0 && suffix[0] == '(')
-    return match_files ("", suffix, end, regexp);
+  len = grub_strlen (s);
+  p = grub_malloc (len * 2 + 1);
+  if (! p)
+    return NULL;
 
-  else if (paths == 0 && suffix[0] == '/')
+  i = 0;
+  while ((ch = *s++))
     {
-      char **r;
-      unsigned n;
-      char *root;
-      char *prefix;
-
-      root = grub_env_get ("root");
-      if (! root)
-	return 0;
-
-      prefix = grub_xasprintf ("(%s)", root);
-      if (! prefix)
-	return 0;
-
-      r = match_files (prefix, suffix, end, regexp);
-      grub_free (prefix);
-      return r;
+      if (isregexop (ch))
+	p[i++] = '\\';
+      p[i++] = ch;
     }
-  else if (paths)
-    {
-      int i, j;
-      char **r = 0;
-
-      for (i = 0; paths[i]; i++)
-	{
-	  char **p;
-
-	  p = match_files (paths[i], suffix, end, regexp);
-	  if (! p)
-	    continue;
-
-	  r = merge (r, p);
-	  if (! r)
-	    return 0;
-	}
-      return r;
-    }
-
-  return 0;
+  p[i] = '\0';
+  return p;
 }
 
-static int
-expand (char *arg, struct grub_script_argv *argv)
+static char*
+wildcard_unescape (const char *s)
 {
+  int i;
+  int len;
+  char ch;
   char *p;
-  char *dir;
-  char *reg;
+
+  len = grub_strlen (s);
+  p = grub_malloc (len + 1);
+  if (! p)
+    return NULL;
+
+  i = 0;
+  while ((ch = *s++))
+    {
+      if (ch == '\\' && isregexop (*s))
+	p[i++] = *s++;
+      else
+	p[i++] = ch;
+    }
+  p[i] = '\0';
+  return p;
+}
+
+static grub_err_t
+wildcard_expand (const char *s, char ***strs)
+{
+  const char *start;
+  const char *regexop;
+  const char *noregexop;
   char **paths = 0;
 
   unsigned i;
-  regex_t regex;
+  regex_t regexp;
 
-  p = arg;
-  while (*p)
+  start = s;
+  while (*start)
     {
-      /* split `p' into two components: (p..dir), (dir...reg)
+      split_path (start, &noregexop, &regexop);
+      if (noregexop >= regexop) /* no more wildcards */
+	break;
 
-	 (p...dir):  path that doesn't need expansion
+      if (make_regex (noregexop, regexop, &regexp))
+	goto fail;
 
-	 (dir...reg): part of path that needs expansion
-       */
-      split_path (p, &dir, &reg);
-      if (dir < reg)
+      if (paths == 0)
 	{
-	  if (make_regex (dir, reg, &regex))
-	    goto fail;
+	  if (start == noregexop) /* device part has regexop */
+	    paths = match_devices (&regexp, *start != '(');
 
-	  paths = match_paths_with_escaped_suffix (paths, p, dir, &regex);
-	  regfree (&regex);
+	  else if (*start == '(') /* device part explicit wo regexop */
+	    paths = match_files ("", start, noregexop, &regexp);
 
-	  if (! paths)
-	    goto done;
+	  else if (*start == '/') /* no device part */
+	    {
+	      char **r;
+	      unsigned n;
+	      char *root;
+	      char *prefix;
+
+	      root = grub_env_get ("root");
+	      if (! root)
+		goto fail;
+
+	      prefix = grub_xasprintf ("(%s)", root);
+	      if (! prefix)
+		goto fail;
+
+	      paths = match_files (prefix, start, noregexop, &regexp);
+	      grub_free (prefix);
+	    }
 	}
-      p = reg;
-    }
+      else
+	{
+	  char **r = 0;
 
-  if (! paths)
-    {
-      grub_script_argv_next (argv);
-      grub_script_argv_append_unescaped (argv, arg);
+	  for (i = 0; paths[i]; i++)
+	    {
+	      char **p;
+
+	      p = match_files (paths[i], start, noregexop, &regexp);
+	      if (! p)
+		continue;
+
+	      r = merge (r, p);
+	      if (! r)
+		goto fail;
+	    }
+	  paths = r;
+	}
+
+      regfree (&regexp);
+      if (! paths)
+	goto done;
+
+      start = regexop;
     }
-  else
-    for (i = 0; paths[i]; i++)
-      {
-	grub_script_argv_next (argv);
-	grub_script_argv_append (argv, paths[i]);
-      }
 
  done:
 
+  *strs = paths;
   return 0;
 
  fail:
 
-  regfree (&regex);
-  return 1;
+  for (i = 0; paths && paths[i]; i++)
+    grub_free (paths[i]);
+  grub_free (paths[i]);
+  regfree (&regexp);
+  return grub_errno;
 }

From 0806b63c0964c456e667415a1d8d3fa8521ac14b Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Thu, 29 Jul 2010 18:46:42 +0200
Subject: [PATCH 1305/1628] 2010-07-29  Robert Millan  <rmh@gnu.org>

	* util/grub-probe.c (PRINT_FS_LABEL): New enum value.
	(probe): Handle `PRINT_FS_LABEL'.
	(main): Handle `-t fs_label'.
---
 ChangeLog         |  6 ++++++
 util/grub-probe.c | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index af48d4039..94b6741d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-29  Robert Millan  <rmh@gnu.org>
+
+	* util/grub-probe.c (PRINT_FS_LABEL): New enum value.
+	(probe): Handle `PRINT_FS_LABEL'.
+	(main): Handle `-t fs_label'.
+
 2010-07-29  Robert Millan  <rmh@gnu.org>
 
 	* configure.ac: Remove grub-mkisofs checks.
diff --git a/util/grub-probe.c b/util/grub-probe.c
index dff87907a..56cbc5592 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -50,6 +50,7 @@
 enum {
   PRINT_FS,
   PRINT_FS_UUID,
+  PRINT_FS_LABEL,
   PRINT_DRIVE,
   PRINT_DEVICE,
   PRINT_PARTMAP,
@@ -291,6 +292,16 @@ probe (const char *path, char *device_name)
 
       printf ("%s\n", uuid);
     }
+  else if (print == PRINT_FS_LABEL)
+    {
+      char *label;
+      if (! fs->label)
+	grub_util_error ("%s does not support labels", fs->name);
+
+      fs->label (dev, &label);
+
+      printf ("%s\n", label);
+    }
 
  end:
   if (dev)
@@ -326,7 +337,7 @@ Probe device information for a given path (or device, if the -d option is given)
 \n\
   -d, --device              given argument is a system device, not a path\n\
   -m, --device-map=FILE     use FILE as the device map [default=%s]\n\
-  -t, --target=(fs|fs_uuid|drive|device|partmap|abstraction)\n\
+  -t, --target=(fs|fs_uuid|fs_label|drive|device|partmap|abstraction)\n\
                             print filesystem module, GRUB drive, system device, partition map module or abstraction module [default=fs]\n\
   -h, --help                display this message and exit\n\
   -V, --version             print version information and exit\n\
@@ -375,6 +386,8 @@ main (int argc, char *argv[])
 	      print = PRINT_FS;
 	    else if (!strcmp (optarg, "fs_uuid"))
 	      print = PRINT_FS_UUID;
+	    else if (!strcmp (optarg, "fs_label"))
+	      print = PRINT_FS_LABEL;
 	    else if (!strcmp (optarg, "drive"))
 	      print = PRINT_DRIVE;
 	    else if (!strcmp (optarg, "device"))

From 9e3e24e47fca36b1a00b4cbe0a98527b2dd9d3c2 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 29 Jul 2010 22:52:09 +0530
Subject: [PATCH 1306/1628] cleanup

---
 include/grub/script_sh.h | 14 +++---
 include/grub/wildcard.h  | 34 --------------
 script/argv.c            | 97 +++-------------------------------------
 script/execute.c         | 71 +++++++++++++++++++++++++++--
 4 files changed, 81 insertions(+), 135 deletions(-)
 delete mode 100644 include/grub/wildcard.h

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index d79fc048a..1564799f6 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -70,6 +70,15 @@ struct grub_script_argv
   char **args;
 };
 
+/* Pluggable wildcard translator.  */
+struct grub_script_wildcard_translator
+{
+  char *(*escape) (const char *str);
+  char *(*unescape) (const char *str);
+  grub_err_t (*expand) (const char *str, char ***expansions);
+};
+extern struct grub_script_wildcard_translator *wildcard_translator;
+
 /* A complete argument.  It consists of a list of one or more `struct
    grub_script_arg's.  */
 struct grub_script_arglist
@@ -225,12 +234,7 @@ struct grub_parser_param
 void grub_script_argv_free    (struct grub_script_argv *argv);
 int grub_script_argv_next     (struct grub_script_argv *argv);
 int grub_script_argv_append   (struct grub_script_argv *argv, const char *s);
-int grub_script_argv_append_escaped (struct grub_script_argv *argv,
-				     const char *s);
-int grub_script_argv_append_unescaped (struct grub_script_argv *argv,
-				       const char *s);
 int grub_script_argv_split_append (struct grub_script_argv *argv, char *s);
-int grub_script_argv_expand   (struct grub_script_argv *argv);
 
 struct grub_script_arglist *
 grub_script_create_arglist (struct grub_parser_param *state);
diff --git a/include/grub/wildcard.h b/include/grub/wildcard.h
deleted file mode 100644
index 8157b9db6..000000000
--- a/include/grub/wildcard.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* wildcard.h  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2010  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/>.
- */
-
-#ifndef GRUB_WILDCARD_HEADER
-#define GRUB_WILDCARD_HEADER
-
-/* Pluggable wildcard expansion engine.  */
-struct grub_wildcard_translator
-{
-  char *(*escape) (const char *str);
-  char *(*unescape) (const char *str);
-
-  grub_err_t (*expand) (const char *str, char ***expansions);
-
-  struct grub_wildcard_translator *next;
-};
-
-#endif /* GRUB_WILDCARD_HEADER */
diff --git a/script/argv.c b/script/argv.c
index 10e180457..3294a90ad 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -23,7 +23,6 @@
 #include <grub/file.h>
 #include <grub/device.h>
 #include <grub/script_sh.h>
-#include <grub/wildcard.h>
 
 #include <regex.h>
 
@@ -63,12 +62,12 @@ static char* wildcard_escape (const char *s);
 static char* wildcard_unescape (const char *s);
 static grub_err_t wildcard_expand (const char *s, char ***strs);
 
-static struct grub_wildcard_translator foo = {
+static struct grub_script_wildcard_translator translator = {
   .expand = wildcard_expand,
   .escape = wildcard_escape,
   .unescape = wildcard_unescape
 };
-
+struct grub_script_wildcard_translator *wildcard_translator = &translator;
 
 void
 grub_script_argv_free (struct grub_script_argv *argv)
@@ -109,14 +108,9 @@ grub_script_argv_next (struct grub_script_argv *argv)
   return 0;
 }
 
-enum append_type {
-  APPEND_RAW,
-  APPEND_ESCAPED,
-  APPEND_UNESCAPED
-};
-
-static int
-append (struct grub_script_argv *argv, const char *s)
+/* Append `s' to the last argument.  */
+int
+grub_script_argv_append (struct grub_script_argv *argv, const char *s)
 {
   int a;
   int b;
@@ -139,44 +133,6 @@ append (struct grub_script_argv *argv, const char *s)
   return 0;
 }
 
-
-/* Append `s' to the last argument.  */
-int
-grub_script_argv_append (struct grub_script_argv *argv, const char *s)
-{
-  return append (argv, s);
-}
-
-/* Append `s' to the last argument, but escape any shell regex ops.  */
-int
-grub_script_argv_append_escaped (struct grub_script_argv *argv, const char *s)
-{
-  int r;
-  char *p = wildcard_escape (s);
-
-  if (! p)
-    return 1;
-
-  r = append (argv, p);
-  grub_free (p);
-  return r;
-}
-
-/* Append `s' to the last argument, but unescape any escaped shell regex ops.  */
-int
-grub_script_argv_append_unescaped (struct grub_script_argv *argv, const char *s)
-{
-  int r;
-  char *p = wildcard_unescape (s);
-
-  if (! p)
-    return 1;
-
-  r = append (argv, p);
-  grub_free (p);
-  return r;
-}
-
 /* Split `s' and append words as multiple arguments.  */
 int
 grub_script_argv_split_append (struct grub_script_argv *argv, char *s)
@@ -208,49 +164,6 @@ grub_script_argv_split_append (struct grub_script_argv *argv, char *s)
   return errors;
 }
 
-/* Expand `argv' as per shell expansion rules.  */
-int
-grub_script_argv_expand (struct grub_script_argv *argv)
-{
-  int i;
-  int j;
-  char *p;
-  char **expansions;
-  struct grub_script_argv result = { 0, 0 };
-
-  for (i = 0; argv->args[i]; i++)
-    {
-      expansions = 0;
-      if (wildcard_expand (argv->args[i], &expansions))
-	goto fail;
-
-      if (! expansions)
-	{
-	  grub_script_argv_next (&result);
-	  grub_script_argv_append_unescaped (&result, argv->args[i]);
-	}
-      else
-	{
-	  for (j = 0; expansions[j]; j++)
-	    {
-	      grub_script_argv_next (&result);
-	      grub_script_argv_append (&result, expansions[j]);
-	      grub_free (expansions[j]);
-	    }
-	  grub_free (expansions);
-	}
-    }
-
-  grub_script_argv_free (argv);
-  *argv = result;
-  return 0;
-
- fail:
-
-  grub_script_argv_free (&result);
-  return 1;
-}
-
 static char **
 merge (char **dest, char **ps)
 {
diff --git a/script/execute.c b/script/execute.c
index 47e47b6eb..a41719091 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -161,7 +161,7 @@ grub_script_env_set (const char *name, const char *val)
   return grub_env_set (name, val);
 }
 
-/* Expand arguments in ARGLIST into multiple arguments.  */
+/* Convert arguments in ARGLIST into ARGV form.  */
 static int
 grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
 			     struct grub_script_argv *argv)
@@ -171,6 +171,28 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
   struct grub_script_arg *arg = 0;
   struct grub_script_argv result = { 0, 0 };
 
+  auto int append (char *s, int escape_type);
+  int append (char *s, int escape_type)
+  {
+    int r;
+    char *p = 0;
+
+    if (! wildcard_translator || escape_type == 0)
+      return grub_script_argv_append (&result, s);
+
+    if (escape_type > 0)
+      p = wildcard_translator->escape (s);
+    else if (escape_type < 0)
+      p = wildcard_translator->unescape (s);
+
+    if (! p)
+      return 1;
+
+    r = grub_script_argv_append (&result, p);
+    grub_free (p);
+    return r;
+  }
+
   for (; arglist && arglist->arg; arglist = arglist->next)
     {
       if (grub_script_argv_next (&result))
@@ -196,7 +218,7 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
 		    }
 		  else
 		    {
-		      if (grub_script_argv_append_escaped (&result, values[i]))
+		      if (append (values[i], 1))
 			goto fail;
 		    }
 
@@ -224,8 +246,49 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
   if (! result.args[result.argc - 1])
     result.argc--;
 
-  if (grub_script_argv_expand (&result))
-    goto fail;
+  /* Perform wildcard expansion.  */
+
+  if (wildcard_translator)
+    {
+      int j;
+      int failed = 0;
+      char **expansions = 0;
+      struct grub_script_argv unexpanded = result;
+
+      result.argc = 0;
+      result.args = 0;
+      for (i = 0; unexpanded.args[i]; i++)
+	{
+	  if (wildcard_translator->expand (unexpanded.args[i], &expansions))
+	    {
+	      grub_script_argv_free (&unexpanded);
+	      goto fail;
+	    }
+
+	  if (! expansions)
+	    {
+	      grub_script_argv_next (&result);
+	      append (unexpanded.args[i], -1);
+	    }
+	  else
+	    {
+	      for (j = 0; expansions[j]; j++)
+		{
+		  failed = (failed || grub_script_argv_next (&result) ||
+			    append (expansions[j], -1));
+		  grub_free (expansions[j]);
+		}
+	      grub_free (expansions);
+
+	      if (failed)
+		{
+		  grub_script_argv_free (&unexpanded);
+		  goto fail;
+		}
+	    }
+	}
+      grub_script_argv_free (&unexpanded);
+    }
 
   *argv = result;
   return 0;

From 479a8efacacfbadd242a89e5c750726a61d79a65 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 29 Jul 2010 22:54:07 +0530
Subject: [PATCH 1307/1628] removed an unused variabled

---
 script/argv.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/script/argv.c b/script/argv.c
index 3294a90ad..15c6c6ed4 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -114,7 +114,6 @@ grub_script_argv_append (struct grub_script_argv *argv, const char *s)
 {
   int a;
   int b;
-  char ch;
   char *p = argv->args[argv->argc - 1];
 
   if (! s)

From 3c6a9151ad2a27c4729a0ac20db0fa38d5a20cd7 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Thu, 29 Jul 2010 23:32:56 +0530
Subject: [PATCH 1308/1628] move wildcard translator into regexp module

---
 commands/regexp.c              |   6 +
 commands/wildcard.c            | 493 +++++++++++++++++++++++++++++++++
 conf/common.rmk                |   4 +-
 script/argv.c                  | 472 +------------------------------
 script/execute.c               |   3 +
 tests/grub_script_expansion.in |   4 +-
 6 files changed, 507 insertions(+), 475 deletions(-)
 create mode 100644 commands/wildcard.c

diff --git a/commands/regexp.c b/commands/regexp.c
index e8e8243b5..05f6d55ad 100644
--- a/commands/regexp.c
+++ b/commands/regexp.c
@@ -22,6 +22,7 @@
 #include <grub/mm.h>
 #include <grub/command.h>
 #include <grub/i18n.h>
+#include <grub/script_sh.h>
 #include <regex.h>
 
 static grub_err_t
@@ -69,9 +70,14 @@ static grub_command_t cmd;
 
 GRUB_MOD_INIT(regexp)
 {
+  extern struct grub_script_wildcard_translator translator;
+
   cmd = grub_register_command ("regexp", grub_cmd_regexp,
 			       N_("REGEXP STRING"),
 			       N_("Test if REGEXP matches STRING."));
+
+  /* Setup GRUB script wildcard translator.  */
+  wildcard_translator = &translator;
 }
 
 GRUB_MOD_FINI(regexp)
diff --git a/commands/wildcard.c b/commands/wildcard.c
new file mode 100644
index 000000000..7f37c84eb
--- /dev/null
+++ b/commands/wildcard.c
@@ -0,0 +1,493 @@
+/* wildcard.c - Wildcard character expansion for GRUB script.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/mm.h>
+#include <grub/fs.h>
+#include <grub/env.h>
+#include <grub/file.h>
+#include <grub/device.h>
+#include <grub/script_sh.h>
+
+#include <regex.h>
+
+static inline int isregexop (char ch);
+static char ** merge (char **lhs, char **rhs);
+static char *make_dir (const char *prefix, const char *start, const char *end);
+static int make_regex (const char *regex_start, const char *regex_end,
+		       regex_t *regexp);
+static void split_path (const char *path, const char **suffix_end, const char **regex_end);
+static char ** match_devices (const regex_t *regexp, int noparts);
+static char ** match_files (const char *prefix, const char *suffix_start,
+			    const char *suffix_end, const regex_t *regexp);
+
+static char* wildcard_escape (const char *s);
+static char* wildcard_unescape (const char *s);
+static grub_err_t wildcard_expand (const char *s, char ***strs);
+
+struct grub_script_wildcard_translator translator = {
+  .expand = wildcard_expand,
+  .escape = wildcard_escape,
+  .unescape = wildcard_unescape
+};
+
+static char **
+merge (char **dest, char **ps)
+{
+  int i;
+  int j;
+  char **p;
+
+  if (! dest)
+    return ps;
+
+  if (! ps)
+    return dest;
+
+  for (i = 0; dest[i]; i++)
+    ;
+  for (j = 0; ps[j]; j++)
+    ;
+
+  p = grub_realloc (dest, sizeof (char*) * (i + j + 1));
+  if (! p)
+    {
+      grub_free (dest);
+      grub_free (ps);
+      return 0;
+    }
+
+  for (j = 0; ps[j]; j++)
+    dest[i++] = ps[j];
+  dest[i] = 0;
+
+  grub_free (ps);
+  return dest;
+}
+
+static inline int
+isregexop (char ch)
+{
+  return grub_strchr ("*.\\", ch) ? 1 : 0;
+}
+
+static char *
+make_dir (const char *prefix, const char *start, const char *end)
+{
+  char ch;
+  unsigned i;
+  unsigned n;
+  char *result;
+
+  i = grub_strlen (prefix);
+  n = i + end - start;
+
+  result = grub_malloc (n + 1);
+  if (! result)
+    return 0;
+
+  grub_strcpy (result, prefix);
+  while (start < end && (ch = *start++))
+    if (ch == '\\' && isregexop (*start))
+      result[i++] = *start++;
+    else
+      result[i++] = ch;
+
+  result[i] = '\0';
+  return result;
+}
+
+static int
+make_regex (const char *start, const char *end, regex_t *regexp)
+{
+  char ch;
+  int i = 0;
+  unsigned len = end - start;
+  char *buffer = grub_malloc (len * 2 + 2 + 1); /* worst case size. */
+
+  if (! buffer)
+    return 1;
+
+  buffer[i++] = '^';
+  while (start < end)
+    {
+      /* XXX Only * expansion for now.  */
+      switch ((ch = *start++))
+	{
+	case '\\':
+	  buffer[i++] = ch;
+	  if (*start != '\0')
+	    buffer[i++] = *start++;
+	  break;
+
+	case '.':
+	  buffer[i++] = '\\';
+	  buffer[i++] = '.';
+	  break;
+
+	case '*':
+	  buffer[i++] = '.';
+	  buffer[i++] = '*';
+	  break;
+
+	default:
+	  buffer[i++] = ch;
+	}
+    }
+  buffer[i++] = '$';
+  buffer[i] = '\0';
+
+  if (regcomp (regexp, buffer, RE_SYNTAX_GNU_AWK))
+    {
+      grub_free (buffer);
+      return 1;
+    }
+
+  grub_free (buffer);
+  return 0;
+}
+
+/* Split `str' into two parts: (1) dirname that is regexop free (2)
+   dirname that has a regexop.  */
+static void
+split_path (const char *str, const char **noregexop, const char **regexop)
+{
+  char ch = 0;
+  int regex = 0;
+
+  const char *end;
+  const char *split;  /* points till the end of dirnaname that doesn't
+			 need expansion.  */
+
+  split = end = str;
+  while ((ch = *end))
+    {
+      if (ch == '\\' && end[1])
+	end++;
+
+      else if (isregexop (ch))
+	regex = 1;
+
+      else if (ch == '/' && ! regex)
+	split = end + 1;  /* forward to next regexop-free dirname */
+
+      else if (ch == '/' && regex)
+	break;  /* stop at the first dirname with a regexop */
+
+      end++;
+    }
+
+  *regexop = end;
+  if (! regex)
+    *noregexop = end;
+  else
+    *noregexop = split;
+}
+
+static char **
+match_devices (const regex_t *regexp, int noparts)
+{
+  int i;
+  int ndev;
+  char **devs;
+
+  auto int match (const char *name);
+  int match (const char *name)
+  {
+    char **t;
+    char *buffer;
+
+    /* skip partitions if asked to. */
+    if (noparts && grub_strchr(name, ','))
+      return 0;
+
+    buffer = grub_xasprintf ("(%s)", name);
+    if (! buffer)
+      return 1;
+
+    grub_dprintf ("expand", "matching: %s\n", buffer);
+    if (regexec (regexp, buffer, 0, 0, 0))
+      {
+	grub_free (buffer);
+	return 0;
+      }
+
+    t = grub_realloc (devs, sizeof (char*) * (ndev + 2));
+    if (! t)
+      return 1;
+
+    devs = t;
+    devs[ndev++] = buffer;
+    devs[ndev] = 0;
+    return 0;
+  }
+
+  ndev = 0;
+  devs = 0;
+
+  if (grub_device_iterate (match))
+    goto fail;
+
+  return devs;
+
+ fail:
+
+  for (i = 0; devs && devs[i]; i++)
+    grub_free (devs[i]);
+
+  if (devs)
+    grub_free (devs);
+
+  return 0;
+}
+
+static char **
+match_files (const char *prefix, const char *suffix, const char *end,
+	     const regex_t *regexp)
+{
+  int i;
+  int error;
+  char **files;
+  unsigned nfile;
+  char *dir;
+  const char *path;
+  char *device_name;
+  grub_fs_t fs;
+  grub_device_t dev;
+
+  auto int match (const char *name, const struct grub_dirhook_info *info);
+  int match (const char *name, const struct grub_dirhook_info *info)
+  {
+    char **t;
+    char *buffer;
+
+    /* skip hidden files, . and .. */
+    if (name[0] == '.')
+      return 0;
+
+    grub_dprintf ("expand", "matching: %s in %s\n", name, dir);
+    if (regexec (regexp, name, 0, 0, 0))
+      return 0;
+
+    buffer = grub_xasprintf ("%s%s", dir, name);
+    if (! buffer)
+      return 1;
+
+    t = grub_realloc (files, sizeof (char*) * (nfile + 2));
+    if (! t)
+      {
+	grub_free (buffer);
+	return 1;
+      }
+
+    files = t;
+    files[nfile++] = buffer;
+    files[nfile] = 0;
+    return 0;
+  }
+
+  nfile = 0;
+  files = 0;
+  dev = 0;
+  device_name = 0;
+  grub_error_push ();
+
+  dir = make_dir (prefix, suffix, end);
+  if (! dir)
+    goto fail;
+
+  device_name = grub_file_get_device_name (dir);
+  dev = grub_device_open (device_name);
+  if (! dev)
+    goto fail;
+
+  fs = grub_fs_probe (dev);
+  if (! fs)
+    goto fail;
+
+  path = grub_strchr (dir, ')');
+  if (! path)
+    goto fail;
+  path++;
+
+  if (fs->dir (dev, path, match))
+    goto fail;
+
+  grub_free (dir);
+  grub_device_close (dev);
+  grub_free (device_name);
+  grub_error_pop ();
+  return files;
+
+ fail:
+
+  if (dir)
+    grub_free (dir);
+
+  for (i = 0; files && files[i]; i++)
+    grub_free (files[i]);
+
+  if (files)
+    grub_free (files);
+
+  if (dev)
+    grub_device_close (dev);
+
+  if (device_name)
+    grub_free (device_name);
+
+  grub_error_pop ();
+  return 0;
+}
+
+static char*
+wildcard_escape (const char *s)
+{
+  int i;
+  int len;
+  char ch;
+  char *p;
+
+  len = grub_strlen (s);
+  p = grub_malloc (len * 2 + 1);
+  if (! p)
+    return NULL;
+
+  i = 0;
+  while ((ch = *s++))
+    {
+      if (isregexop (ch))
+	p[i++] = '\\';
+      p[i++] = ch;
+    }
+  p[i] = '\0';
+  return p;
+}
+
+static char*
+wildcard_unescape (const char *s)
+{
+  int i;
+  int len;
+  char ch;
+  char *p;
+
+  len = grub_strlen (s);
+  p = grub_malloc (len + 1);
+  if (! p)
+    return NULL;
+
+  i = 0;
+  while ((ch = *s++))
+    {
+      if (ch == '\\' && isregexop (*s))
+	p[i++] = *s++;
+      else
+	p[i++] = ch;
+    }
+  p[i] = '\0';
+  return p;
+}
+
+static grub_err_t
+wildcard_expand (const char *s, char ***strs)
+{
+  const char *start;
+  const char *regexop;
+  const char *noregexop;
+  char **paths = 0;
+
+  unsigned i;
+  regex_t regexp;
+
+  start = s;
+  while (*start)
+    {
+      split_path (start, &noregexop, &regexop);
+      if (noregexop >= regexop) /* no more wildcards */
+	break;
+
+      if (make_regex (noregexop, regexop, &regexp))
+	goto fail;
+
+      if (paths == 0)
+	{
+	  if (start == noregexop) /* device part has regexop */
+	    paths = match_devices (&regexp, *start != '(');
+
+	  else if (*start == '(') /* device part explicit wo regexop */
+	    paths = match_files ("", start, noregexop, &regexp);
+
+	  else if (*start == '/') /* no device part */
+	    {
+	      char **r;
+	      unsigned n;
+	      char *root;
+	      char *prefix;
+
+	      root = grub_env_get ("root");
+	      if (! root)
+		goto fail;
+
+	      prefix = grub_xasprintf ("(%s)", root);
+	      if (! prefix)
+		goto fail;
+
+	      paths = match_files (prefix, start, noregexop, &regexp);
+	      grub_free (prefix);
+	    }
+	}
+      else
+	{
+	  char **r = 0;
+
+	  for (i = 0; paths[i]; i++)
+	    {
+	      char **p;
+
+	      p = match_files (paths[i], start, noregexop, &regexp);
+	      if (! p)
+		continue;
+
+	      r = merge (r, p);
+	      if (! r)
+		goto fail;
+	    }
+	  paths = r;
+	}
+
+      regfree (&regexp);
+      if (! paths)
+	goto done;
+
+      start = regexop;
+    }
+
+ done:
+
+  *strs = paths;
+  return 0;
+
+ fail:
+
+  for (i = 0; paths && paths[i]; i++)
+    grub_free (paths[i]);
+  grub_free (paths[i]);
+  regfree (&regexp);
+  return grub_errno;
+}
diff --git a/conf/common.rmk b/conf/common.rmk
index 24d7921f5..24baa3bfc 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -638,7 +638,7 @@ normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
 	normal/misc.c normal/crypto.c normal/term.c normal/context.c \
 	script/main.c script/script.c script/execute.c script/argv.c unidata.c \
 	script/function.c script/lexer.c grub_script.tab.c grub_script.yy.c
-normal_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS) $(GNULIB_CFLAGS) -Wno-error
+normal_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS) -Wno-error
 normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 ifneq (, $(FONT_SOURCE))
@@ -764,7 +764,7 @@ setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
 setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 pkglib_MODULES += regexp.mod
-regexp_mod_SOURCES = gnulib/regex.c commands/regexp.c
+regexp_mod_SOURCES = gnulib/regex.c commands/regexp.c commands/wildcard.c
 regexp_mod_CFLAGS = $(COMMON_CFLAGS) $(GNULIB_CFLAGS)
 regexp_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
diff --git a/script/argv.c b/script/argv.c
index 15c6c6ed4..6e93edaee 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -18,17 +18,9 @@
  */
 
 #include <grub/mm.h>
-#include <grub/fs.h>
-#include <grub/env.h>
-#include <grub/file.h>
-#include <grub/device.h>
+#include <grub/misc.h>
 #include <grub/script_sh.h>
 
-#include <regex.h>
-
-#define ARG_ALLOCATION_UNIT  (32 * sizeof (char))
-#define ARGV_ALLOCATION_UNIT (8 * sizeof (void*))
-
 static unsigned
 round_up_exp (unsigned v)
 {
@@ -48,27 +40,6 @@ round_up_exp (unsigned v)
   return v;
 }
 
-static inline int isregexop (char ch);
-static char ** merge (char **lhs, char **rhs);
-static char *make_dir (const char *prefix, const char *start, const char *end);
-static int make_regex (const char *regex_start, const char *regex_end,
-		       regex_t *regexp);
-static void split_path (const char *path, const char **suffix_end, const char **regex_end);
-static char ** match_devices (const regex_t *regexp, int noparts);
-static char ** match_files (const char *prefix, const char *suffix_start,
-			    const char *suffix_end, const regex_t *regexp);
-
-static char* wildcard_escape (const char *s);
-static char* wildcard_unescape (const char *s);
-static grub_err_t wildcard_expand (const char *s, char ***strs);
-
-static struct grub_script_wildcard_translator translator = {
-  .expand = wildcard_expand,
-  .escape = wildcard_escape,
-  .unescape = wildcard_unescape
-};
-struct grub_script_wildcard_translator *wildcard_translator = &translator;
-
 void
 grub_script_argv_free (struct grub_script_argv *argv)
 {
@@ -162,444 +133,3 @@ grub_script_argv_split_append (struct grub_script_argv *argv, char *s)
     }
   return errors;
 }
-
-static char **
-merge (char **dest, char **ps)
-{
-  int i;
-  int j;
-  char **p;
-
-  if (! dest)
-    return ps;
-
-  if (! ps)
-    return dest;
-
-  for (i = 0; dest[i]; i++)
-    ;
-  for (j = 0; ps[j]; j++)
-    ;
-
-  p = grub_realloc (dest, sizeof (char*) * (i + j + 1));
-  if (! p)
-    {
-      grub_free (dest);
-      grub_free (ps);
-      return 0;
-    }
-
-  for (j = 0; ps[j]; j++)
-    dest[i++] = ps[j];
-  dest[i] = 0;
-
-  grub_free (ps);
-  return dest;
-}
-
-static inline int
-isregexop (char ch)
-{
-  return grub_strchr ("*.\\", ch) ? 1 : 0;
-}
-
-static char *
-make_dir (const char *prefix, const char *start, const char *end)
-{
-  char ch;
-  unsigned i;
-  unsigned n;
-  char *result;
-
-  i = grub_strlen (prefix);
-  n = i + end - start;
-
-  result = grub_malloc (n + 1);
-  if (! result)
-    return 0;
-
-  grub_strcpy (result, prefix);
-  while (start < end && (ch = *start++))
-    if (ch == '\\' && isregexop (*start))
-      result[i++] = *start++;
-    else
-      result[i++] = ch;
-
-  result[i] = '\0';
-  return result;
-}
-
-static int
-make_regex (const char *start, const char *end, regex_t *regexp)
-{
-  char ch;
-  int i = 0;
-  unsigned len = end - start;
-  char *buffer = grub_malloc (len * 2 + 1); /* worst case size. */
-
-  while (start < end)
-    {
-      /* XXX Only * expansion for now.  */
-      switch ((ch = *start++))
-	{
-	case '\\':
-	  buffer[i++] = ch;
-	  if (*start != '\0')
-	    buffer[i++] = *start++;
-	  break;
-
-	case '.':
-	  buffer[i++] = '\\';
-	  buffer[i++] = '.';
-	  break;
-
-	case '*':
-	  buffer[i++] = '.';
-	  buffer[i++] = '*';
-	  break;
-
-	default:
-	  buffer[i++] = ch;
-	}
-    }
-  buffer[i] = '\0';
-
-  if (regcomp (regexp, buffer, RE_SYNTAX_GNU_AWK))
-    {
-      grub_free (buffer);
-      return 1;
-    }
-
-  grub_free (buffer);
-  return 0;
-}
-
-/* Split `str' into two parts: (1) dirname that is regexop free (2)
-   dirname that has a regexop.  */
-static void
-split_path (const char *str, const char **noregexop, const char **regexop)
-{
-  char ch = 0;
-  int regex = 0;
-
-  const char *end;
-  const char *split;  /* points till the end of dirnaname that doesn't
-			 need expansion.  */
-
-  split = end = str;
-  while ((ch = *end))
-    {
-      if (ch == '\\' && end[1])
-	end++;
-
-      else if (isregexop (ch))
-	regex = 1;
-
-      else if (ch == '/' && ! regex)
-	split = end + 1;  /* forward to next regexop-free dirname */
-
-      else if (ch == '/' && regex)
-	break;  /* stop at the first dirname with a regexop */
-
-      end++;
-    }
-
-  *regexop = end;
-  if (! regex)
-    *noregexop = end;
-  else
-    *noregexop = split;
-}
-
-static char **
-match_devices (const regex_t *regexp, int noparts)
-{
-  int i;
-  int ndev;
-  char **devs;
-
-  auto int match (const char *name);
-  int match (const char *name)
-  {
-    char **t;
-    char *buffer;
-
-    /* skip partitions if asked to. */
-    if (noparts && grub_strchr(name, ','))
-      return 0;
-
-    buffer = grub_xasprintf ("(%s)", name);
-    if (! buffer)
-      return 1;
-
-    grub_dprintf ("expand", "matching: %s\n", buffer);
-    if (regexec (regexp, buffer, 0, 0, 0))
-      {
-	grub_free (buffer);
-	return 0;
-      }
-
-    t = grub_realloc (devs, sizeof (char*) * (ndev + 2));
-    if (! t)
-      return 1;
-
-    devs = t;
-    devs[ndev++] = buffer;
-    devs[ndev] = 0;
-    return 0;
-  }
-
-  ndev = 0;
-  devs = 0;
-
-  if (grub_device_iterate (match))
-    goto fail;
-
-  return devs;
-
- fail:
-
-  for (i = 0; devs && devs[i]; i++)
-    grub_free (devs[i]);
-
-  if (devs)
-    grub_free (devs);
-
-  return 0;
-}
-
-static char **
-match_files (const char *prefix, const char *suffix, const char *end,
-	     const regex_t *regexp)
-{
-  int i;
-  int error;
-  char **files;
-  unsigned nfile;
-  char *dir;
-  const char *path;
-  char *device_name;
-  grub_fs_t fs;
-  grub_device_t dev;
-
-  auto int match (const char *name, const struct grub_dirhook_info *info);
-  int match (const char *name, const struct grub_dirhook_info *info)
-  {
-    char **t;
-    char *buffer;
-
-    /* skip hidden files, . and .. */
-    if (name[0] == '.')
-      return 0;
-
-    grub_dprintf ("expand", "matching: %s in %s\n", name, dir);
-    if (regexec (regexp, name, 0, 0, 0))
-      return 0;
-
-    buffer = grub_xasprintf ("%s%s", dir, name);
-    if (! buffer)
-      return 1;
-
-    t = grub_realloc (files, sizeof (char*) * (nfile + 2));
-    if (! t)
-      {
-	grub_free (buffer);
-	return 1;
-      }
-
-    files = t;
-    files[nfile++] = buffer;
-    files[nfile] = 0;
-    return 0;
-  }
-
-  nfile = 0;
-  files = 0;
-  dev = 0;
-  device_name = 0;
-  grub_error_push ();
-
-  dir = make_dir (prefix, suffix, end);
-  if (! dir)
-    goto fail;
-
-  device_name = grub_file_get_device_name (dir);
-  dev = grub_device_open (device_name);
-  if (! dev)
-    goto fail;
-
-  fs = grub_fs_probe (dev);
-  if (! fs)
-    goto fail;
-
-  path = grub_strchr (dir, ')');
-  if (! path)
-    goto fail;
-  path++;
-
-  if (fs->dir (dev, path, match))
-    goto fail;
-
-  grub_free (dir);
-  grub_device_close (dev);
-  grub_free (device_name);
-  grub_error_pop ();
-  return files;
-
- fail:
-
-  if (dir)
-    grub_free (dir);
-
-  for (i = 0; files && files[i]; i++)
-    grub_free (files[i]);
-
-  if (files)
-    grub_free (files);
-
-  if (dev)
-    grub_device_close (dev);
-
-  if (device_name)
-    grub_free (device_name);
-
-  grub_error_pop ();
-  return 0;
-}
-
-static char*
-wildcard_escape (const char *s)
-{
-  int i;
-  int len;
-  char ch;
-  char *p;
-
-  len = grub_strlen (s);
-  p = grub_malloc (len * 2 + 1);
-  if (! p)
-    return NULL;
-
-  i = 0;
-  while ((ch = *s++))
-    {
-      if (isregexop (ch))
-	p[i++] = '\\';
-      p[i++] = ch;
-    }
-  p[i] = '\0';
-  return p;
-}
-
-static char*
-wildcard_unescape (const char *s)
-{
-  int i;
-  int len;
-  char ch;
-  char *p;
-
-  len = grub_strlen (s);
-  p = grub_malloc (len + 1);
-  if (! p)
-    return NULL;
-
-  i = 0;
-  while ((ch = *s++))
-    {
-      if (ch == '\\' && isregexop (*s))
-	p[i++] = *s++;
-      else
-	p[i++] = ch;
-    }
-  p[i] = '\0';
-  return p;
-}
-
-static grub_err_t
-wildcard_expand (const char *s, char ***strs)
-{
-  const char *start;
-  const char *regexop;
-  const char *noregexop;
-  char **paths = 0;
-
-  unsigned i;
-  regex_t regexp;
-
-  start = s;
-  while (*start)
-    {
-      split_path (start, &noregexop, &regexop);
-      if (noregexop >= regexop) /* no more wildcards */
-	break;
-
-      if (make_regex (noregexop, regexop, &regexp))
-	goto fail;
-
-      if (paths == 0)
-	{
-	  if (start == noregexop) /* device part has regexop */
-	    paths = match_devices (&regexp, *start != '(');
-
-	  else if (*start == '(') /* device part explicit wo regexop */
-	    paths = match_files ("", start, noregexop, &regexp);
-
-	  else if (*start == '/') /* no device part */
-	    {
-	      char **r;
-	      unsigned n;
-	      char *root;
-	      char *prefix;
-
-	      root = grub_env_get ("root");
-	      if (! root)
-		goto fail;
-
-	      prefix = grub_xasprintf ("(%s)", root);
-	      if (! prefix)
-		goto fail;
-
-	      paths = match_files (prefix, start, noregexop, &regexp);
-	      grub_free (prefix);
-	    }
-	}
-      else
-	{
-	  char **r = 0;
-
-	  for (i = 0; paths[i]; i++)
-	    {
-	      char **p;
-
-	      p = match_files (paths[i], start, noregexop, &regexp);
-	      if (! p)
-		continue;
-
-	      r = merge (r, p);
-	      if (! r)
-		goto fail;
-	    }
-	  paths = r;
-	}
-
-      regfree (&regexp);
-      if (! paths)
-	goto done;
-
-      start = regexop;
-    }
-
- done:
-
-  *strs = paths;
-  return 0;
-
- fail:
-
-  for (i = 0; paths && paths[i]; i++)
-    grub_free (paths[i]);
-  grub_free (paths[i]);
-  regfree (&regexp);
-  return grub_errno;
-}
diff --git a/script/execute.c b/script/execute.c
index a41719091..20ad42add 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -37,6 +37,9 @@ struct grub_script_scope
 };
 static struct grub_script_scope *scope = 0;
 
+/* Wildcard translator for GRUB script.  */
+struct grub_script_wildcard_translator *wildcard_translator;
+
 static int
 grub_env_special (const char *name)
 {
diff --git a/tests/grub_script_expansion.in b/tests/grub_script_expansion.in
index 11aafc853..d1e8d55c9 100644
--- a/tests/grub_script_expansion.in
+++ b/tests/grub_script_expansion.in
@@ -17,7 +17,7 @@
 # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
 
 disks=`echo ls | @builddir@/grub-shell`
-other=`echo echo \* | @builddir@/grub-shell`
+other=`echo insmod regexp\; echo \* | @builddir@/grub-shell`
 for d in $disks; do
     if echo "$d" |grep ',' >/dev/null; then
 	if echo "$other" | grep "$d" >/dev/null; then
@@ -32,7 +32,7 @@ for d in $disks; do
     fi
 done
 
-other=`echo echo '(*)' | @builddir@/grub-shell`
+other=`echo insmod regexp\; echo '(*)' | @builddir@/grub-shell`
 for d in $disks; do
     if ! echo "$other" | grep "$d" >/dev/null; then
 	echo "$d missing from (*) expansion" >&2

From 1c34fc8fec49958b71e37dbc0f75536b845f0c28 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 30 Jul 2010 02:31:14 +0530
Subject: [PATCH 1309/1628] fix help message logic

---
 commands/help.c | 3 ++-
 normal/dyncmd.c | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/commands/help.c b/commands/help.c
index fecc6f665..1ca46aa7e 100644
--- a/commands/help.c
+++ b/commands/help.c
@@ -112,7 +112,8 @@ grub_cmd_help (grub_extcmd_context_t ctxt __attribute__ ((unused)), int argc,
 		    if (cnt++ > 0)
 		      grub_printf ("\n\n");
 
-		    if (cmd->flags & GRUB_COMMAND_FLAG_EXTCMD)
+		    if ((cmd->flags & GRUB_COMMAND_FLAG_EXTCMD) &&
+			! (cmd->flags & GRUB_COMMAND_FLAG_DYNCMD))
 		      grub_arg_show_help ((grub_extcmd_t) cmd->data);
 		    else
 		      grub_printf ("%s %s %s\n%s\n", _("Usage:"), cmd->name, _(cmd->summary),
diff --git a/normal/dyncmd.c b/normal/dyncmd.c
index ed98855eb..3519253f6 100644
--- a/normal/dyncmd.c
+++ b/normal/dyncmd.c
@@ -155,6 +155,7 @@ read_command_list (const char *prefix)
 						   grub_dyncmd_dispatcher,
 						   GRUB_COMMAND_FLAG_BLOCKS
 						   | GRUB_COMMAND_FLAG_EXTCMD
+						   | GRUB_COMMAND_FLAG_CMDLINE
 						   | GRUB_COMMAND_FLAG_DYNCMD,
 						   0, N_("not loaded"), 0,
 						   prio);

From 530a9ff6bc825e9a616ae4de157cdac170988662 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Fri, 30 Jul 2010 03:40:33 +0530
Subject: [PATCH 1310/1628] includes hidden files

---
 commands/wildcard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/commands/wildcard.c b/commands/wildcard.c
index 7f37c84eb..2eec9631d 100644
--- a/commands/wildcard.c
+++ b/commands/wildcard.c
@@ -277,7 +277,7 @@ match_files (const char *prefix, const char *suffix, const char *end,
     char *buffer;
 
     /* skip hidden files, . and .. */
-    if (name[0] == '.')
+    if (grub_strcmp(".", name) == 0 || grub_strcmp("..", name) == 0)
       return 0;
 
     grub_dprintf ("expand", "matching: %s in %s\n", name, dir);

From f7790cdd5d0b97b2246478ec15efb25898fbb253 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Fri, 30 Jul 2010 11:27:02 +0200
Subject: [PATCH 1311/1628] 2010-07-30  Robert Millan  <rmh@gnu.org>

	* include/grub/emu/misc.h (grub_make_system_path_relative_to_its_root)
	(xmalloc, xrealloc, xstrdup, xasprintf): Add
	`warn_unused_result' attribute.
	* include/grub/misc.h (grub_strdup, grub_strndup, grub_strlen)
	(grub_xasprintf, grub_xvasprintf): Likewise.
	* include/grub/emu/misc.h (xasprintf): Remove duplicate prototype.
---
 ChangeLog               |  9 +++++++++
 include/grub/emu/misc.h | 11 +++++------
 include/grub/misc.h     | 10 +++++-----
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 94b6741d3..4026428a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-30  Robert Millan  <rmh@gnu.org>
+
+	* include/grub/emu/misc.h (grub_make_system_path_relative_to_its_root)
+	(xmalloc, xrealloc, xstrdup, xasprintf): Add
+	`warn_unused_result' attribute.
+	* include/grub/misc.h (grub_strdup, grub_strndup, grub_strlen)
+	(grub_xasprintf, grub_xvasprintf): Likewise.
+	* include/grub/emu/misc.h (xasprintf): Remove duplicate prototype.
+
 2010-07-29  Robert Millan  <rmh@gnu.org>
 
 	* util/grub-probe.c (PRINT_FS_LABEL): New enum value.
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index f34cd4287..07257e511 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -26,12 +26,12 @@ extern const char *program_name;
 void grub_init_all (void);
 void grub_fini_all (void);
 
-char *grub_make_system_path_relative_to_its_root (const char *path);
+char *grub_make_system_path_relative_to_its_root (const char *path) __attribute__ ((warn_unused_result));
 
-void * EXPORT_FUNC(xmalloc) (grub_size_t size);
-void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size);
-char * EXPORT_FUNC(xstrdup) (const char *str);
-char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
+void * EXPORT_FUNC(xmalloc) (grub_size_t size) __attribute__ ((warn_unused_result));
+void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size) __attribute__ ((warn_unused_result));
+char * EXPORT_FUNC(xstrdup) (const char *str) __attribute__ ((warn_unused_result));
+char * EXPORT_FUNC(xasprintf) (const char *fmt, ...) __attribute__ ((warn_unused_result));
 
 void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...);
 void EXPORT_FUNC(grub_util_info) (const char *fmt, ...);
@@ -45,7 +45,6 @@ int EXPORT_FUNC(vasprintf) (char **buf, const char *fmt, va_list ap);
 int EXPORT_FUNC(asprintf) (char **buf, const char *fmt, ...);
 #endif
 
-char * EXPORT_FUNC(xasprintf) (const char *fmt, ...);
 extern char * canonicalize_file_name (const char *path);
 
 #ifdef HAVE_DEVICE_MAPPER
diff --git a/include/grub/misc.h b/include/grub/misc.h
index 9194ca8ad..eab01b0fb 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -231,10 +231,10 @@ grub_strtol (const char *str, char **end, int base)
     }
 }
 
-char *EXPORT_FUNC(grub_strdup) (const char *s);
-char *EXPORT_FUNC(grub_strndup) (const char *s, grub_size_t n);
+char *EXPORT_FUNC(grub_strdup) (const char *s) __attribute__ ((warn_unused_result));
+char *EXPORT_FUNC(grub_strndup) (const char *s, grub_size_t n) __attribute__ ((warn_unused_result));
 void *EXPORT_FUNC(grub_memset) (void *s, int c, grub_size_t n);
-grub_size_t EXPORT_FUNC(grub_strlen) (const char *s);
+grub_size_t EXPORT_FUNC(grub_strlen) (const char *s) __attribute__ ((warn_unused_result));
 int EXPORT_FUNC(grub_printf) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
 int EXPORT_FUNC(grub_printf_) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));
 
@@ -261,8 +261,8 @@ int EXPORT_FUNC(grub_snprintf) (char *str, grub_size_t n, const char *fmt, ...)
 int EXPORT_FUNC(grub_vsnprintf) (char *str, grub_size_t n, const char *fmt,
 				 va_list args);
 char *EXPORT_FUNC(grub_xasprintf) (const char *fmt, ...)
-     __attribute__ ((format (printf, 1, 2)));
-char *EXPORT_FUNC(grub_xvasprintf) (const char *fmt, va_list args);
+     __attribute__ ((format (printf, 1, 2))) __attribute__ ((warn_unused_result));
+char *EXPORT_FUNC(grub_xvasprintf) (const char *fmt, va_list args) __attribute__ ((warn_unused_result));
 void EXPORT_FUNC(grub_exit) (void) __attribute__ ((noreturn));
 void EXPORT_FUNC(grub_abort) (void) __attribute__ ((noreturn));
 grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,

From a184f9c80105bafacccbfaea596d406db3bce362 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Fri, 30 Jul 2010 21:43:12 +0200
Subject: [PATCH 1312/1628] 2010-07-30  Robert Millan  <rmh@gnu.org>

	Enable `grub-probe -t device' resolution on ZFS.

	* configure.ac: Check for getfsstat(), libzfs and libnvpair.
	* include/grub/util/libnvpair.h: New file.
	* include/grub/util/libzfs.h: New file.

	* kern/emu/getroot.c: Include `<assert.h>' and `<error.h>'.
	[HAVE_LIBZFS && HAVE_LIBNVPAIR]: Include `<grub/util/libzfs.h>' and
	`<grub/util/libnvpair.h>'.
	[HAVE_GETFSSTAT]: Include `<sys/mount.h>'.

	(find_mount_point_from_dir): New static function.
	[HAVE_LIBZFS && HAVE_LIBNVPAIR] (find_root_device_from_libzfs): New
	function.
	[HAVE_LIBZFS && HAVE_LIBNVPAIR] (grub_guess_root_device): Use
	find_root_device_from_libzfs() before ressorting to find_root_device().

	* include/grub/util/misc.h (grub_util_init_libzfs): New function
	prototype.
	* util/misc.c: Include `<grub/util/libzfs.h>'.
	(grub_util_init_libzfs): New function.
	[HAVE_LIBZFS] (libzfs_handle): New global variable.
	[HAVE_LIBZFS] (fini_libzfs): New static function.
	(grub_util_init_libzfs): New function.
	* util/grub-probe.c (main): Call grub_util_init_libzfs().
---
 ChangeLog                     |  28 ++++++
 configure.ac                  |  11 ++-
 include/grub/util/libnvpair.h |  31 +++++++
 include/grub/util/libzfs.h    |  39 +++++++++
 include/grub/util/misc.h      |   1 +
 kern/emu/getroot.c            | 155 ++++++++++++++++++++++++++++++++++
 util/grub-probe.c             |   1 +
 util/misc.c                   |  20 +++++
 8 files changed, 285 insertions(+), 1 deletion(-)
 create mode 100644 include/grub/util/libnvpair.h
 create mode 100644 include/grub/util/libzfs.h

diff --git a/ChangeLog b/ChangeLog
index 4026428a7..041f9cadd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2010-07-30  Robert Millan  <rmh@gnu.org>
+
+	Enable `grub-probe -t device' resolution on ZFS.
+
+	* configure.ac: Check for getfsstat(), libzfs and libnvpair.
+	* include/grub/util/libnvpair.h: New file.
+	* include/grub/util/libzfs.h: New file.
+
+	* kern/emu/getroot.c: Include `<assert.h>' and `<error.h>'.
+	[HAVE_LIBZFS && HAVE_LIBNVPAIR]: Include `<grub/util/libzfs.h>' and
+	`<grub/util/libnvpair.h>'.
+	[HAVE_GETFSSTAT]: Include `<sys/mount.h>'.
+
+	(find_mount_point_from_dir): New static function.
+	[HAVE_LIBZFS && HAVE_LIBNVPAIR] (find_root_device_from_libzfs): New
+	function.
+	[HAVE_LIBZFS && HAVE_LIBNVPAIR] (grub_guess_root_device): Use
+	find_root_device_from_libzfs() before ressorting to find_root_device().
+
+	* include/grub/util/misc.h (grub_util_init_libzfs): New function
+	prototype.
+	* util/misc.c: Include `<grub/util/libzfs.h>'.
+	(grub_util_init_libzfs): New function.
+	[HAVE_LIBZFS] (libzfs_handle): New global variable.
+	[HAVE_LIBZFS] (fini_libzfs): New static function.
+	(grub_util_init_libzfs): New function.
+	* util/grub-probe.c (main): Call grub_util_init_libzfs().
+
 2010-07-30  Robert Millan  <rmh@gnu.org>
 
 	* include/grub/emu/misc.h (grub_make_system_path_relative_to_its_root)
diff --git a/configure.ac b/configure.ac
index aa7f3a151..cc97c7f77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,7 +247,7 @@ else
 fi
 
 # Check for functions.
-AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf)
+AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf getfsstat)
 
 # For opendisk() and getrawpartition() on NetBSD.
 # Used in util/deviceiter.c and in util/hostdisk.c.
@@ -799,6 +799,15 @@ if test x"$device_mapper_excuse" = x ; then
                [device_mapper_excuse="need devmapper library"])
 fi
 
+AC_CHECK_LIB([zfs], [libzfs_init],
+             [LDFLAGS="$LDFLAGS -lzfs"
+              AC_DEFINE([HAVE_LIBZFS], [1],
+                        [Define to 1 if you have the ZFS library.])],)
+AC_CHECK_LIB([nvpair], [nvlist_print],
+             [LDFLAGS="$LDFLAGS -lnvpair"
+              AC_DEFINE([HAVE_LIBNVPAIR], [1],
+                        [Define to 1 if you have the NVPAIR library.])],)
+
 AC_SUBST(ASFLAGS)
 
 # Output files.
diff --git a/include/grub/util/libnvpair.h b/include/grub/util/libnvpair.h
new file mode 100644
index 000000000..c4fe174ea
--- /dev/null
+++ b/include/grub/util/libnvpair.h
@@ -0,0 +1,31 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#ifndef GRUB_LIBNVPAIR_UTIL_HEADER
+#define GRUB_LIBNVPAIR_UTIL_HEADER 1
+
+#include <stdio.h>	/* FILE */
+
+typedef void nvlist_t;
+
+int nvlist_lookup_string (nvlist_t *, const char *, char **);
+int nvlist_lookup_nvlist (nvlist_t *, const char *, nvlist_t **);
+int nvlist_lookup_nvlist_array (nvlist_t *, const char *, nvlist_t ***, unsigned int *);
+void nvlist_print (FILE *, nvlist_t *);
+
+#endif
diff --git a/include/grub/util/libzfs.h b/include/grub/util/libzfs.h
new file mode 100644
index 000000000..a17c47e20
--- /dev/null
+++ b/include/grub/util/libzfs.h
@@ -0,0 +1,39 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
+#ifndef GRUB_LIBZFS_UTIL_HEADER
+#define GRUB_LIBZFS_UTIL_HEADER 1
+
+#include <grub/util/libnvpair.h>
+
+typedef void libzfs_handle_t;
+typedef void zpool_handle_t;
+
+extern libzfs_handle_t *libzfs_init ();
+extern void libzfs_fini (libzfs_handle_t *);
+
+extern zpool_handle_t *zpool_open (libzfs_handle_t *, const char *);
+extern void zpool_close (zpool_handle_t *);
+
+extern int zpool_get_physpath (zpool_handle_t *, const char *);
+
+extern nvlist_t *zpool_get_config (zpool_handle_t *, nvlist_t **);
+
+extern libzfs_handle_t *libzfs_handle;
+
+#endif
diff --git a/include/grub/util/misc.h b/include/grub/util/misc.h
index 48dfbb868..699b9cf2c 100644
--- a/include/grub/util/misc.h
+++ b/include/grub/util/misc.h
@@ -59,5 +59,6 @@ char *make_system_path_relative_to_its_root (const char *path);
 char *canonicalize_file_name (const char *path);
 
 void grub_util_init_nls (void);
+void grub_util_init_libzfs (void);
 
 #endif /* ! GRUB_UTIL_MISC_HEADER */
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index 58dbac9b4..f2f6311ff 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -20,11 +20,13 @@
 #include <config.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <assert.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
 #include <dirent.h>
 #include <errno.h>
+#include <error.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -41,6 +43,15 @@
 # include <sys/wait.h>
 #endif
 
+#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+# include <grub/util/libzfs.h>
+# include <grub/util/libnvpair.h>
+#endif
+
+#ifdef HAVE_GETFSSTAT
+# include <sys/mount.h>
+#endif
+
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
@@ -86,6 +97,62 @@ xgetcwd (void)
   return path;
 }
 
+static char *
+find_mount_point_from_dir (const char *dir)
+{
+  struct stat st;
+  typeof (st.st_dev) fs;
+  char *prev, *next, *slash, *statdir;
+
+  if (stat (dir, &st) == -1)
+    error (1, errno, "stat (%s)", dir);
+
+  fs = st.st_dev;
+
+  prev = xstrdup (dir);
+
+  while (1)
+    {
+      /* Remove last slash.  */
+      next = xstrdup (prev);
+      slash = strrchr (next, '/');
+      if (! slash)
+	{
+	  free (next);
+	  free (prev);
+	  return NULL;
+	}
+      *slash = '\0';
+
+      /* A next empty string counts as /.  */
+      if (next[0] == '\0')
+	statdir = "/";
+      else
+	statdir = next;
+
+      if (stat (statdir, &st) == -1)
+	error (1, errno, "stat (%s)", next);
+
+      if (st.st_dev != fs)
+	{
+	  /* Found mount point.  */
+	  free (next);
+	  return prev;
+	}
+
+      free (prev);
+      prev = next;
+
+      /* We've already seen an empty string, which means we
+         reached /.  Nothing left to do.  */
+      if (prev[0] == '\0')
+	{
+	  free (prev);
+	  return xstrdup ("/");
+	}
+    }
+}
+
 #ifdef __linux__
 
 /* Statting something on a btrfs filesystem always returns a virtual device
@@ -166,6 +233,88 @@ find_root_device_from_mountinfo (const char *dir)
 
 #endif /* __linux__ */
 
+#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+
+/* ZFS has similar problems to those of btrfs (see above).  */
+static char *
+find_root_device_from_libzfs (const char *dir)
+{
+  char *device = NULL;
+  char *poolname = NULL;
+  char *poolfs = NULL;
+  char *mnt_point;
+  char *slash;
+
+  mnt_point = find_mount_point_from_dir (dir);
+
+#ifdef HAVE_GETFSSTAT
+  {
+    int mnt_count = getfsstat (NULL, 0, MNT_WAIT);
+    if (mnt_count == -1)
+      error (1, errno, "getfsstat");
+
+    struct statfs *mnt = xmalloc (mnt_count * sizeof (*mnt));
+
+    mnt_count = getfsstat (mnt, mnt_count * sizeof (*mnt), MNT_WAIT);
+    if (mnt_count == -1)
+      error (1, errno, "getfsstat");
+
+    unsigned int i;
+    for (i = 0; i < (unsigned) mnt_count; i++)
+      if (!strcmp (mnt[i].f_fstypename, "zfs")
+	  && !strcmp (mnt[i].f_mntonname, mnt_point))
+	{
+	  poolname = xstrdup (mnt[i].f_mntfromname);
+	  break;
+	}
+
+    free (mnt);
+  }
+#endif
+
+  if (! poolname)
+    return NULL;
+
+  slash = strchr (poolname, '/');
+  if (slash)
+    {
+      *slash = '\0';
+      poolfs = slash + 1;
+    }
+
+  {
+    zpool_handle_t *zpool;
+    nvlist_t *nvlist;
+    nvlist_t **nvlist_array;
+    unsigned int nvlist_count;
+
+    zpool = zpool_open (libzfs_handle, poolname);
+    nvlist = zpool_get_config (zpool, NULL);
+
+    if (nvlist_lookup_nvlist (nvlist, "vdev_tree", &nvlist) != 0)
+      error (1, errno, "nvlist_lookup_nvlist (\"vdev_tree\")");
+
+    if (nvlist_lookup_nvlist_array (nvlist, "children", &nvlist_array, &nvlist_count) != 0)
+      error (1, errno, "nvlist_lookup_nvlist_array (\"children\")");
+
+    do
+      {
+	assert (nvlist_count > 0);
+      } while (nvlist_lookup_nvlist_array (nvlist_array[0], "children",
+					   &nvlist_array, &nvlist_count) == 0);
+
+    if (nvlist_lookup_string (nvlist_array[0], "path", &device) != 0)
+      error (1, errno, "nvlist_lookup_string (\"path\")");
+
+    zpool_close (zpool);
+  }
+
+  free (poolname);
+
+  return device;
+}
+#endif
+
 #ifdef __MINGW32__
 
 static char *
@@ -458,6 +607,12 @@ grub_guess_root_device (const char *dir)
     return os_dev;
 #endif /* __linux__ */
 
+#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+  os_dev = find_root_device_from_libzfs (dir);
+  if (os_dev)
+    return os_dev;
+#endif
+
   if (stat (dir, &st) < 0)
     grub_util_error ("cannot stat `%s'", dir);
 
diff --git a/util/grub-probe.c b/util/grub-probe.c
index 56cbc5592..52f2b3747 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -359,6 +359,7 @@ main (int argc, char *argv[])
   set_program_name (argv[0]);
 
   grub_util_init_nls ();
+  grub_util_init_libzfs ();
 
   /* Check for options.  */
   while (1)
diff --git a/util/misc.c b/util/misc.c
index 91bc25a55..0859197bf 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -36,6 +36,7 @@
 #include <grub/misc.h>
 #include <grub/cache.h>
 #include <grub/util/misc.h>
+#include <grub/util/libzfs.h>
 #include <grub/mm.h>
 #include <grub/term.h>
 #include <grub/time.h>
@@ -293,6 +294,25 @@ grub_util_init_nls (void)
   textdomain (PACKAGE);
 #endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
 }
+
+#ifdef HAVE_LIBZFS
+libzfs_handle_t *libzfs_handle;
+
+static void
+fini_libzfs (void)
+{
+  libzfs_fini (libzfs_handle);
+}
+#endif
+
+void
+grub_util_init_libzfs (void)
+{
+#ifdef HAVE_LIBZFS
+  libzfs_handle = libzfs_init ();
+  atexit (fini_libzfs);
+#endif
+}
 #endif
 
 int

From c9a00aeeaa0d9c4d6b254fe2e221b67b951a48e7 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Fri, 30 Jul 2010 22:01:10 +0200
Subject: [PATCH 1313/1628] 2010-07-30  Robert Millan  <rmh@gnu.org>

	* include/grub/emu/misc.h: Add missing license header.
---
 ChangeLog               |  4 ++++
 include/grub/emu/misc.h | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 041f9cadd..86aba2914 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-30  Robert Millan  <rmh@gnu.org>
+
+	* include/grub/emu/misc.h: Add missing license header.
+
 2010-07-30  Robert Millan  <rmh@gnu.org>
 
 	Enable `grub-probe -t device' resolution on ZFS.
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index 07257e511..dc48d91a8 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -1,3 +1,21 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+
 #ifndef GRUB_EMU_MISC_H
 #define GRUB_EMU_MISC_H 1
 

From 3169f4c76a37a1545d7382a5dd483e36d00da5c3 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sat, 31 Jul 2010 12:22:01 +0200
Subject: [PATCH 1314/1628] 2010-07-31  Robert Millan  <rmh@gnu.org>

	* configure.ac: Check for `libzfs.h' and `libnvpair.h'.

	* include/grub/util/libnvpair.h: Include `<config.h>'.
	[HAVE_LIBNVPAIR_H]: Include `<libnvpair.h>' instead of
	declaring libnvpair prototypes ourselves.
	* include/grub/util/libzfs.h: Include `<config.h>'.
	[HAVE_LIBZFS_H]: Include `<libzfs.h>' instead of
	declaring libzfs prototypes ourselves.

	(libzfs_handle): Moved to ...
	* include/grub/util/misc.h (libzfs_handle): ... here.
	Include `<grub/util/libzfs.h>'.
---
 ChangeLog                     | 15 +++++++++++++++
 configure.ac                  |  3 ++-
 include/grub/util/libnvpair.h |  8 ++++++++
 include/grub/util/libzfs.h    |  8 +++++++-
 include/grub/util/misc.h      |  3 +++
 5 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 86aba2914..58b821da9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-07-31  Robert Millan  <rmh@gnu.org>
+
+	* configure.ac: Check for `libzfs.h' and `libnvpair.h'.
+
+	* include/grub/util/libnvpair.h: Include `<config.h>'.
+	[HAVE_LIBNVPAIR_H]: Include `<libnvpair.h>' instead of
+	declaring libnvpair prototypes ourselves.
+	* include/grub/util/libzfs.h: Include `<config.h>'.
+	[HAVE_LIBZFS_H]: Include `<libzfs.h>' instead of
+	declaring libzfs prototypes ourselves.
+
+	(libzfs_handle): Moved to ...
+	* include/grub/util/misc.h (libzfs_handle): ... here.
+	Include `<grub/util/libzfs.h>'.
+
 2010-07-30  Robert Millan  <rmh@gnu.org>
 
 	* include/grub/emu/misc.h: Add missing license header.
diff --git a/configure.ac b/configure.ac
index cc97c7f77..6169a2fb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,8 +246,9 @@ else
   AC_PATH_PROG(HELP2MAN, help2man)
 fi
 
-# Check for functions.
+# Check for functions and headers.
 AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf getfsstat)
+AC_CHECK_HEADERS(libzfs.h libnvpair.h)
 
 # For opendisk() and getrawpartition() on NetBSD.
 # Used in util/deviceiter.c and in util/hostdisk.c.
diff --git a/include/grub/util/libnvpair.h b/include/grub/util/libnvpair.h
index c4fe174ea..26f7e9d0f 100644
--- a/include/grub/util/libnvpair.h
+++ b/include/grub/util/libnvpair.h
@@ -19,6 +19,12 @@
 #ifndef GRUB_LIBNVPAIR_UTIL_HEADER
 #define GRUB_LIBNVPAIR_UTIL_HEADER 1
 
+#include <config.h>
+
+#ifdef HAVE_LIBNVPAIR_H
+#include <libnvpair.h>
+#else /* ! HAVE_LIBNVPAIR_H */
+
 #include <stdio.h>	/* FILE */
 
 typedef void nvlist_t;
@@ -28,4 +34,6 @@ int nvlist_lookup_nvlist (nvlist_t *, const char *, nvlist_t **);
 int nvlist_lookup_nvlist_array (nvlist_t *, const char *, nvlist_t ***, unsigned int *);
 void nvlist_print (FILE *, nvlist_t *);
 
+#endif /* ! HAVE_LIBNVPAIR_H */
+
 #endif
diff --git a/include/grub/util/libzfs.h b/include/grub/util/libzfs.h
index a17c47e20..9fbfd40d1 100644
--- a/include/grub/util/libzfs.h
+++ b/include/grub/util/libzfs.h
@@ -19,6 +19,12 @@
 #ifndef GRUB_LIBZFS_UTIL_HEADER
 #define GRUB_LIBZFS_UTIL_HEADER 1
 
+#include <config.h>
+
+#ifdef HAVE_LIBZFS_H
+#include <libzfs.h>
+#else /* ! HAVE_LIBZFS_H */
+
 #include <grub/util/libnvpair.h>
 
 typedef void libzfs_handle_t;
@@ -34,6 +40,6 @@ extern int zpool_get_physpath (zpool_handle_t *, const char *);
 
 extern nvlist_t *zpool_get_config (zpool_handle_t *, nvlist_t **);
 
-extern libzfs_handle_t *libzfs_handle;
+#endif /* ! HAVE_LIBZFS_H */
 
 #endif
diff --git a/include/grub/util/misc.h b/include/grub/util/misc.h
index 699b9cf2c..3614c79c2 100644
--- a/include/grub/util/misc.h
+++ b/include/grub/util/misc.h
@@ -29,6 +29,7 @@
 #include <grub/types.h>
 #include <grub/symbol.h>
 #include <grub/emu/misc.h>
+#include <grub/util/libzfs.h>
 
 char *grub_util_get_path (const char *dir, const char *file);
 size_t grub_util_get_fp_size (FILE *fp);
@@ -59,6 +60,8 @@ char *make_system_path_relative_to_its_root (const char *path);
 char *canonicalize_file_name (const char *path);
 
 void grub_util_init_nls (void);
+
 void grub_util_init_libzfs (void);
+extern libzfs_handle_t *libzfs_handle;
 
 #endif /* ! GRUB_UTIL_MISC_HEADER */

From 8072efebf210fbc610ae852750e3f400305dfc69 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sat, 31 Jul 2010 18:45:57 +0200
Subject: [PATCH 1315/1628] 2010-07-31  Robert Millan  <rmh@gnu.org>

	* kern/emu/misc.c: Add missing license header.
---
 ChangeLog       |  4 ++++
 kern/emu/misc.c | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 58b821da9..24303ff17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-31  Robert Millan  <rmh@gnu.org>
+
+	* kern/emu/misc.c: Add missing license header.
+
 2010-07-31  Robert Millan  <rmh@gnu.org>
 
 	* configure.ac: Check for `libzfs.h' and `libnvpair.h'.
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index 38395fca8..851da7a07 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -1,3 +1,21 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002,2003,2005,2006,2007,2008,2009,2010  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 <config.h>
 
 #include <errno.h>

From 3710bb6b96ba84767e9315b8eecfd31c8b2386de Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sun, 1 Aug 2010 02:14:07 +0200
Subject: [PATCH 1316/1628] 2010-07-31  Robert Millan  <rmh@gnu.org>

	* util/grub.d/10_kfreebsd.in: Make module handling more generic.
---
 ChangeLog                  |  4 ++++
 util/grub.d/10_kfreebsd.in | 25 ++++++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 24303ff17..249256083 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-07-31  Robert Millan  <rmh@gnu.org>
+
+	* util/grub.d/10_kfreebsd.in: Make module handling more generic.
+
 2010-07-31  Robert Millan  <rmh@gnu.org>
 
 	* kern/emu/misc.c: Add missing license header.
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index 9915abdf1..f32da3013 100644
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -51,6 +51,10 @@ kfreebsd_entry ()
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi
+  if [ -z "${prepare_module_dir_cache}" ]; then
+    prepare_module_dir_cache="$(prepare_grub_to_access_device $(grub-probe -t device "${module_dir}") | sed -e "s/^/\t/")"
+  fi
+
   printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
 	echo			'$(printf "$(gettext_quoted "Loading kernel of FreeBSD %s ...")" ${version})'
@@ -63,9 +67,10 @@ EOF
 EOF
   fi
 
-  if test -n "${acpi_ko}" ; then
+  if test -e "${module_dir}/acpi.ko" ; then
+    printf '%s\n' "${prepare_module_dir_cache}"
     cat << EOF
-	kfreebsd_module_elf	${acpi_ko_rel_dirname}/${acpi_ko_basename}
+	kfreebsd_module_elf	${module_dir_rel}/acpi.ko
 EOF
   fi
 
@@ -103,19 +108,17 @@ while [ "x$list" != "x" ] ; do
   version=`echo $basename | sed -e "s,^[^0-9]*-,,g;s/\.gz$//g"`
   alt_version=`echo $version | sed -e "s,\.old$,,g"`
 
-  acpi_ko=
-  for i in "/lib/modules/${version}/acpi.ko" "/lib/modules/${alt_version}/acpi.ko" \
-      "/boot/kernel/acpi.ko"; do
+  module_dir=
+  for i in "/lib/modules/${version}" "/lib/modules/${alt_version}" \
+      "/boot/kernel"; do
     if test -e "$i" ; then
-      acpi_ko="$i"
+      module_dir="$i"
       break
     fi
   done
-  if test -n "${acpi_ko}" ; then
-    echo "Found ACPI module: ${acpi_ko}" >&2
-    acpi_ko_basename=`basename ${acpi_ko}`
-    acpi_ko_dirname=`dirname ${acpi_ko}`
-    acpi_ko_rel_dirname=`make_system_path_relative_to_its_root $acpi_ko_dirname`
+  if test -n "${module_dir}" ; then
+    echo "Found kernel module directory: ${module_dir}" >&2
+    module_dir_rel=$(make_system_path_relative_to_its_root $module_dir)
   fi
 
   kfreebsd_entry "${OS}" "${version}"

From ebf53056b8e17487c9f56effe9130f5772a93e02 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sun, 1 Aug 2010 14:47:14 +0200
Subject: [PATCH 1317/1628] 2010-08-01  Robert Millan  <rmh@gnu.org>

	* kern/emu/getroot.c: Include `<grub/util/misc.h>'.
---
 ChangeLog          | 4 ++++
 kern/emu/getroot.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 249256083..f34ed35c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-01  Robert Millan  <rmh@gnu.org>
+
+	* kern/emu/getroot.c: Include `<grub/util/misc.h>'.
+	
 2010-07-31  Robert Millan  <rmh@gnu.org>
 
 	* util/grub.d/10_kfreebsd.in: Make module handling more generic.
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index f2f6311ff..6caae08e6 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <grub/util/misc.h>
 
 #ifdef __GNU__
 #include <hurd.h>

From ce04ef47e2ef22cc3886b88beba2e58e8d115702 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sun, 1 Aug 2010 08:54:10 -0500
Subject: [PATCH 1318/1628] * util/grub.d/20_linux_xen.in: Don't use UUID for
 LVM root (matching util/grub.d/10_linux.in).  Fixes Debian bug #591093.

---
 ChangeLog                   | 5 +++++
 util/grub.d/20_linux_xen.in | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f34ed35c9..abe698574 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-01  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub.d/20_linux_xen.in: Don't use UUID for LVM root (matching
+	util/grub.d/10_linux.in).  Fixes Debian bug #591093.
+
 2010-08-01  Robert Millan  <rmh@gnu.org>
 
 	* kern/emu/getroot.c: Include `<grub/util/misc.h>'.
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
index 8612c96b0..e631c0a4a 100644
--- a/util/grub.d/20_linux_xen.in
+++ b/util/grub.d/20_linux_xen.in
@@ -44,7 +44,8 @@ case ${GRUB_DEVICE} in
 esac
 
 if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
-    || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ; then
+    || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
+    || uses_abstraction "${GRUB_DEVICE}" lvm; then
   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
 else
   LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}

From deb0caa38ebc69aa7135d56896a6e61d0642ba3c Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sun, 1 Aug 2010 15:23:44 +0200
Subject: [PATCH 1319/1628] 2010-08-01  Robert Millan  <rmh@gnu.org>

	Prevent accidental use of uninitialized libzfs_handle.

	* util/grub-probe.c (main): Move grub_util_init_libzfs() call to ...
	* kern/emu/getroot.c (find_root_device_from_libzfs): ... here.
	* util/misc.c (grub_util_init_libzfs): Make this function idempotent.
---
 ChangeLog          | 8 ++++++++
 kern/emu/getroot.c | 2 ++
 util/grub-probe.c  | 1 -
 util/misc.c        | 7 +++++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index abe698574..20094fec8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-01  Robert Millan  <rmh@gnu.org>
+
+	Prevent accidental use of uninitialized libzfs_handle.
+
+	* util/grub-probe.c (main): Move grub_util_init_libzfs() call to ...
+	* kern/emu/getroot.c (find_root_device_from_libzfs): ... here.
+	* util/misc.c (grub_util_init_libzfs): Make this function idempotent.
+
 2010-08-01  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub.d/20_linux_xen.in: Don't use UUID for LVM root (matching
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index 6caae08e6..f8eda2294 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -289,6 +289,8 @@ find_root_device_from_libzfs (const char *dir)
     nvlist_t **nvlist_array;
     unsigned int nvlist_count;
 
+    grub_util_init_libzfs ();
+
     zpool = zpool_open (libzfs_handle, poolname);
     nvlist = zpool_get_config (zpool, NULL);
 
diff --git a/util/grub-probe.c b/util/grub-probe.c
index 52f2b3747..56cbc5592 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -359,7 +359,6 @@ main (int argc, char *argv[])
   set_program_name (argv[0]);
 
   grub_util_init_nls ();
-  grub_util_init_libzfs ();
 
   /* Check for options.  */
   while (1)
diff --git a/util/misc.c b/util/misc.c
index 0859197bf..2eff256bf 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -309,8 +309,11 @@ void
 grub_util_init_libzfs (void)
 {
 #ifdef HAVE_LIBZFS
-  libzfs_handle = libzfs_init ();
-  atexit (fini_libzfs);
+  if (! libzfs_handle)
+    {
+      libzfs_handle = libzfs_init ();
+      atexit (fini_libzfs);
+    }
 #endif
 }
 #endif

From 7decd202a72cbed9d1e1d445d6fbea9532703866 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sun, 1 Aug 2010 09:44:36 -0500
Subject: [PATCH 1320/1628] * kern/misc.c (grub_memset): Optimise to reduce
 cache stalls. 	Also-By: Colin Watson <cjwatson@ubuntu.com>

---
 ChangeLog   |  5 +++++
 kern/misc.c | 35 +++++++++++++++++++++++++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 20094fec8..d00fd9d51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-01  Vladimir Serbinenko  <phcoder@gmail.com>
+2010-08-01  Colin Watson  <cjwatson@ubuntu.com>
+
+	* kern/misc.c (grub_memset): Optimise to reduce cache stalls.
+
 2010-08-01  Robert Millan  <rmh@gnu.org>
 
 	Prevent accidental use of uninitialized libzfs_handle.
diff --git a/kern/misc.c b/kern/misc.c
index c13c96e30..b37ef230c 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -518,12 +518,39 @@ grub_strndup (const char *s, grub_size_t n)
 }
 
 void *
-grub_memset (void *s, int c, grub_size_t n)
+grub_memset (void *s, int c, grub_size_t len)
 {
-  unsigned char *p = (unsigned char *) s;
+  void *p = s;
+  grub_uint8_t pattern8 = c;
 
-  while (n--)
-    *p++ = (unsigned char) c;
+  if (len >= 3 * sizeof (unsigned long))
+    {
+      unsigned long patternl = 0;
+      grub_size_t i;
+
+      for (i = 0; i < sizeof (unsigned long); i++)
+	patternl |= ((unsigned long) pattern8) << (8 * i);
+
+      while (len > 0 && (((grub_addr_t) p) & (sizeof (unsigned long) - 1)))
+	{
+	  *(grub_uint8_t *) p = pattern8;
+	  p = (grub_uint8_t *) p + 1;
+	  len--;
+	}
+      while (len >= sizeof (unsigned long))
+	{
+	  *(unsigned long *) p = patternl;
+	  p = (unsigned long *) p + 1;
+	  len -= sizeof (unsigned long);
+	}
+    }
+
+  while (len > 0)
+    {
+      *(grub_uint8_t *) p = pattern8;
+      p = (grub_uint8_t *) p + 1;
+      len--;
+    }
 
   return s;
 }

From 2cfb45df5ed7be7b55c69dc0f809343e189afdb9 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sun, 1 Aug 2010 11:25:09 -0500
Subject: [PATCH 1321/1628] * docs/grub.texi (Simple configuration): Document
 GRUB_CMDLINE_XEN and GRUB_CMDLINE_XEN_DEFAULT.  Recommend setting
 GRUB_GFXPAYLOAD_LINUX=text rather than unsetting it in order to disable
 gfxpayload. (Shell-like scripting): Add real content. (Serial terminal):
 Suggest `terminal_input serial; terminal_output serial' rather than putting
 the two commands on separate lines, since console input will be inoperative
 after the first command. (menuentry): Document --class, --users, and --hotkey
 options. (terminfo): Describe what `visually-ordered UTF-8' means (thanks,
 Vladimir Serbinenko).

---
 ChangeLog      |  14 ++++
 docs/grub.texi | 182 ++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 186 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d00fd9d51..1c1533841 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-01  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi (Simple configuration): Document GRUB_CMDLINE_XEN
+	and GRUB_CMDLINE_XEN_DEFAULT.  Recommend setting
+	GRUB_GFXPAYLOAD_LINUX=text rather than unsetting it in order to
+	disable gfxpayload.
+	(Shell-like scripting): Add real content.
+	(Serial terminal): Suggest `terminal_input serial; terminal_output
+	serial' rather than putting the two commands on separate lines,
+	since console input will be inoperative after the first command.
+	(menuentry): Document --class, --users, and --hotkey options.
+	(terminfo): Describe what `visually-ordered UTF-8' means (thanks,
+	Vladimir Serbinenko).
+
 2010-08-01  Vladimir Serbinenko  <phcoder@gmail.com>
 2010-08-01  Colin Watson  <cjwatson@ubuntu.com>
 
diff --git a/docs/grub.texi b/docs/grub.texi
index a191ef9ef..583cf98cb 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1062,6 +1062,11 @@ only to the default menu entry, after those listed in
 As @samp{GRUB_CMDLINE_LINUX} and @samp{GRUB_CMDLINE_LINUX_DEFAULT}, but for
 NetBSD.
 
+@item GRUB_CMDLINE_XEN
+@itemx GRUB_CMDLINE_XEN_DEFAULT
+As @samp{GRUB_CMDLINE_LINUX} and @samp{GRUB_CMDLINE_LINUX_DEFAULT}, but for
+Linux and Xen.
+
 @item GRUB_DISABLE_LINUX_UUID
 Normally, @command{grub-mkconfig} will generate menu entries that use
 universally-unique identifiers (UUIDs) to identify the root filesystem to
@@ -1113,8 +1118,8 @@ try several modes in sequence.
 Depending on your kernel, your distribution, your graphics card, and the
 phase of the moon, note that using this option may cause GNU/Linux to suffer
 from various display problems, particularly during the early part of the
-boot sequence.  If you have problems, simply unset this option and GRUB will
-tell Linux to boot in normal text mode.
+boot sequence.  If you have problems, set this option to @samp{text} and
+GRUB will tell Linux to boot in normal text mode.
 
 @item GRUB_DISABLE_OS_PROBER
 Normally, @command{grub-mkconfig} will try to use the external
@@ -1143,6 +1148,142 @@ that file, making sure to leave at least the first two lines intact.
 @node Shell-like scripting
 @section Writing full configuration files directly
 
+@c Some of this section is derived from the GNU Bash manual page, also
+@c copyrighted by the FSF.
+
+@file{grub.cfg} is written in GRUB's built-in scripting language, which has
+a syntax quite similar to that of GNU Bash and other Bourne shell
+derivatives.
+
+@heading Words
+
+A @dfn{word} is a sequence of characters considered as a single unit by
+GRUB.  Words are separated by @dfn{metacharacters}, which are the following
+plus space, tab, and newline:
+
+@example
+@{ @} | & $ ; < >
+@end example
+ 
+Quoting may be used to include metacharacters in words; see below.
+
+@heading Reserved words
+
+Reserved words have a special meaning to GRUB.  The following words are
+recognised as reserved when unquoted and either the first word of a simple
+command or the third word of a @code{for} command:
+
+@example
+! [[ ]] @{ @}
+case do done elif else esac fi for function
+if in menuentry select then time until while
+@end example
+
+Not all of these reserved words have a useful purpose yet; some are reserved
+for future expansion.
+
+@heading Quoting
+
+Quoting is used to remove the special meaning of certain characters or
+words.  It can be used to treat metacharacters as part of a word, to prevent
+reserved words from being recognised as such, and to prevent variable
+expansion.
+
+There are three quoting mechanisms: the escape character, single quotes, and
+double quotes.
+
+A non-quoted backslash (\) is the @dfn{escape character}.  It preserves the
+literal value of the next character that follows, with the exception of
+newline.
+
+Enclosing characters in single quotes preserves the literal value of each
+character within the quotes.  A single quote may not occur between single
+quotes, even when preceded by a backslash.
+
+Enclosing characters in double quotes preserves the literal value of all
+characters within the quotes, with the exception of @samp{$} and @samp{\}.
+The @samp{$} character retains its special meaning within double quotes.
+The backslash retains its special meaning only when followed by one of the
+following characters: @samp{$}, @samp{"}, @samp{\}, or newline.  A
+backslash-newline pair is treated as a line continuation (that is, it is
+removed from the input stream and effectively ignored).  A double quote may
+be quoted within double quotes by preceding it with a backslash.
+
+@heading Variable expansion
+
+The @samp{$} character introduces variable expansion.  The variable name to
+be expanded may be enclosed in braces, which are optional but serve to
+protect the variable to be expanded from characters immediately following it
+which could be interpreted as part of the name.
+
+Normal variable names begin with an alphabetic character, followed by zero
+or more alphanumeric characters.
+
+Positional variable names consist of one or more digits.  These are reserved
+for future expansion.
+
+The special variable name @samp{?} expands to the exit status of the most
+recently executed command.
+
+@heading Comments
+
+A word beginning with @samp{#} causes that word and all remaining characters
+on that line to be ignored.
+
+@heading Simple commands
+
+A @dfn{simple command} is a sequence of words separated by spaces or tabs
+and terminated by a semicolon or a newline.  The first word specifies the
+command to be executed.  The remaining words are passed as arguments to the
+invoked command.
+
+The return value of a simple command is its exit status.
+
+@heading Compound commands
+
+A @dfn{compound command} is one of the following:
+
+@table @asis
+@item for @var{name} in @var{word} @dots{}; do @var{list}; done
+The list of words following @code{in} is expanded, generating a list of
+items.  The variable @var{name} is set to each element of this list in turn,
+and @var{list} is executed each time.  The return value is the exit status
+of the last command that executes.  If the expansion of the items following
+@code{in} results in an empty list, no commands are executed, and the return
+status is 0.
+
+@item if @var{list}; then @var{list}; [elif @var{list}; then @var{list};] @dots{} [else @var{list};] fi
+The @code{if} @var{list} is executed.  If its exit status is zero, the
+@code{then} @var{list} is executed.  Otherwise, each @code{elif} @var{list}
+is executed in turn, and if its exit status is zero, the corresponding
+@code{then} @var{list} is executed and the command completes.  Otherwise,
+the @code{else} @var{list} is executed, if present.  The exit status is the
+exit status of the last command executed, or zero if no condition tested
+true.
+
+@item while @var{cond}; do @var{list}; done
+@itemx until @var{cond}; do @var{list}; done
+The @code{while} command continuously executes the @code{do} @var{list} as
+long as the last command in @var{cond} returns an exit status of zero.  The
+@code{until} command is identical to the @code{while} command, except that
+the test is negated; the @code{do} @var{list} is executed as long as the
+last command in @var{cond} returns a non-zero exit status.  The exit status
+of the @code{while} and @code{until} commands is the exit status of the last
+@code{do} @var{list} command executed, or zero if none was executed.
+
+@item function @var{name} @{ @var{command}; @dots{} @}
+This defines a function named @var{name}.  The @dfn{body} of the function is
+the list of commands within braces, each of which must be terminated with a
+semicolon or a newline.  This list of commands will be executed whenever
+@var{name} is specified as the name of a simple command.  Function
+definitions do not affect the exit status in @code{$?}.  When executed, the
+exit status of a function is the exit status of the last command executed in
+the body.
+
+@item menuentry @var{title} [@option{--class=class} @dots{}] [@option{--users=users}] [@option{--hotkey=key}] @{ @var{command}; @dots{} @}
+@xref{menuentry}.
+@end table
+
 
 @node Embedded configuration
 @section Embedding a configuration file into GRUB
@@ -1308,8 +1449,7 @@ simple.  Here is an example:
 @example
 @group
 grub> @kbd{serial --unit=0 --speed=9600}
-grub> @kbd{terminal_input serial}
-grub> @kbd{terminal_output serial}
+grub> @kbd{terminal_input serial; terminal_output serial}
 @end group
 @end example
 
@@ -1320,11 +1460,14 @@ command accepts many other options, so please refer to @ref{serial},
 for more details.
 
 The commands @command{terminal_input} (@pxref{terminal_input}) and
-@command{terminal_output} (@pxref{terminal_output} choose which type of
+@command{terminal_output} (@pxref{terminal_output}) choose which type of
 terminal you want to use. In the case above, the terminal will be a
 serial terminal, but you can also pass @code{console} to the command,
 as @samp{terminal serial console}. In this case, a terminal in which
-you press any key will be selected as a GRUB terminal.
+you press any key will be selected as a GRUB terminal. In the example above,
+note that you need to put both commands on the same command line, as you
+will lose the ability to type commands on the console after the first
+command.
 
 However, note that GRUB assumes that your terminal emulator is
 compatible with VT100 by default. This is true for most terminal
@@ -1789,9 +1932,26 @@ These commands can only be used in the menu:
 @node menuentry
 @subsection menuentry
 
-@deffn Command title name @dots{}
-Start a new boot entry, and set its name to the contents of the rest of
-the line, starting with the first non-space character.
+@deffn Command menuentry @var{title} @
+ [@option{--class=class} @dots{}] [@option{--users=users}] @
+ [@option{--hotkey=key}] @
+ @{ @var{command}; @dots{} @}
+This defines a GRUB menu entry named @var{title}.  When this entry is
+selected from the menu, GRUB will set the @var{chosen} environment variable
+to @var{title}, execute the list of commands given within braces, and if the
+last command in the list returned successfully and a kernel was loaded it
+will execute the @command{boot} command.
+
+The @option{--class} option may be used any number of times to group menu
+entries into classes.  Menu themes may display different classes using
+different styles.
+
+The @option{--users} option grants specific users access to specific menu
+entries.  @xref{Security}.
+
+The @option{--hotkey} option associates a hotkey with a menu entry.
+@var{key} may be a single letter, or one of the aliases @samp{backspace},
+@samp{tab}, or @samp{delete}.
 @end deffn
 
 
@@ -1885,7 +2045,9 @@ The @option{-a} (@option{--ascii}), @option{-u} (@option{--utf8}), and
 @option{-v} (@option{--visual-utf8}) options control how non-ASCII text is
 displayed.  @option{-a} specifies an ASCII-only terminal; @option{-u}
 specifies logically-ordered UTF-8; and @option{-v} specifies
-visually-ordered UTF-8.
+"visually-ordered UTF-8" (in other words, arranged such that a terminal
+emulator without bidirectional text support will display right-to-left text
+in the proper order; this is not really proper UTF-8, but a workaround).
 
 If no option or terminal type is specified, the current terminal type is
 printed.

From 6eea041aa4dae2be3ffe42786dce894d8d89dfba Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sun, 1 Aug 2010 11:28:12 -0500
Subject: [PATCH 1322/1628] * script/yylex.l (NAME): Remove [:digit:],
 redundant with [:alnum:].

---
 ChangeLog      | 4 ++++
 script/yylex.l | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1c1533841..83ac0b37b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-01  Colin Watson  <cjwatson@ubuntu.com>
+
+	* script/yylex.l (NAME): Remove [:digit:], redundant with [:alnum:].
+
 2010-08-01  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi (Simple configuration): Document GRUB_CMDLINE_XEN
diff --git a/script/yylex.l b/script/yylex.l
index 7d4ea9e4e..e9659832b 100644
--- a/script/yylex.l
+++ b/script/yylex.l
@@ -116,7 +116,7 @@ COMMENT         #.*$
 
 CHAR            [^{}|&$;<> \t\n\'\"\\]
 DIGITS          [[:digit:]]+
-NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
+NAME            [[:alpha:]_][[:alnum:]_]*
 
 ESC             \\.
 VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|$\?|$\{\?\}

From ea9be8eadb4d899eb6bc740b360de292695aacf9 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sun, 1 Aug 2010 11:30:03 -0500
Subject: [PATCH 1323/1628] * util/grub-mkrescue.in: Remove ${efi_dir} after
 building efi.img.

---
 ChangeLog             | 4 ++++
 util/grub-mkrescue.in | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 83ac0b37b..9729f71d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-01  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkrescue.in: Remove ${efi_dir} after building efi.img.
+
 2010-08-01  Colin Watson  <cjwatson@ubuntu.com>
 
 	* script/yylex.l (NAME): Remove [:digit:], redundant with [:alnum:].
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index e498acee7..b7d9eb4eb 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -296,6 +296,7 @@ if test -e "${efi64_dir}" || test -e "${efi32_dir}"; then
 
     mformat -C -f 2880 -L 16 -i "${iso9660_dir}"/efi.img ::
     mcopy -s -i "${iso9660_dir}"/efi.img ${efi_dir}/efi ::/
+    rm -rf ${efi_dir}
     grub_mkisofs_arguments="${grub_mkisofs_arguments} --efi-boot efi.img"
 fi
 

From 8687cf071e646a5c949b7cbcf14f6ea9334ec466 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 1 Aug 2010 16:11:27 +0200
Subject: [PATCH 1324/1628] 	* kern/emu/getroot.c
 (find_mount_point_from_dir): Compile only if 	[HAVE_LIBZFS &&
 HAVE_LIBNVPAIR]

---
 ChangeLog          | 7 ++++++-
 kern/emu/getroot.c | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9729f71d8..2e8c0daa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/emu/getroot.c (find_mount_point_from_dir): Compile only if
+	[HAVE_LIBZFS && HAVE_LIBNVPAIR]
+
 2010-08-01  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkrescue.in: Remove ${efi_dir} after building efi.img.
@@ -41,7 +46,7 @@
 2010-08-01  Robert Millan  <rmh@gnu.org>
 
 	* kern/emu/getroot.c: Include `<grub/util/misc.h>'.
-	
+
 2010-07-31  Robert Millan  <rmh@gnu.org>
 
 	* util/grub.d/10_kfreebsd.in: Make module handling more generic.
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index f8eda2294..032608d1b 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -98,6 +98,8 @@ xgetcwd (void)
   return path;
 }
 
+#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+
 static char *
 find_mount_point_from_dir (const char *dir)
 {
@@ -154,6 +156,8 @@ find_mount_point_from_dir (const char *dir)
     }
 }
 
+#endif
+
 #ifdef __linux__
 
 /* Statting something on a btrfs filesystem always returns a virtual device

From 553df63d76cf4a5b6fa63042021320e5b6d6a5d4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 1 Aug 2010 21:01:05 +0200
Subject: [PATCH 1325/1628] 	* lib/arg.c (grub_arg_show_help): Add the
 necessary spacing.

---
 ChangeLog | 4 ++++
 lib/arg.c | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2e8c0daa5..bc6b8fd18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* lib/arg.c (grub_arg_show_help): Add the necessary spacing.
+
 2010-08-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/emu/getroot.c (find_mount_point_from_dir): Compile only if
diff --git a/lib/arg.c b/lib/arg.c
index 400314d30..a9b8a520e 100644
--- a/lib/arg.c
+++ b/lib/arg.c
@@ -144,8 +144,10 @@ grub_arg_show_help (grub_extcmd_t cmd)
 		}
 	    }
 
-	  /* FIXME: add spacing back.  */
-	  grub_xputs (_(opt->doc));
+	  while (spacing--)
+	    grub_xputs (" ");
+
+	  grub_printf ("%s\n", _(opt->doc));
 
 	  switch (opt->shortarg)
 	    {

From 8bfe31d82b187f4dbaa9df652bd170bd5915c818 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Sun, 1 Aug 2010 16:41:46 -0500
Subject: [PATCH 1326/1628] * include/grub/util/libzfs.h (libzfs_init): Set
 argument list to (void) rather than () so that this is a proper prototype.

---
 ChangeLog                  | 5 +++++
 include/grub/util/libzfs.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index bc6b8fd18..daf5517dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-01  Colin Watson  <cjwatson@ubuntu.com>
+
+	* include/grub/util/libzfs.h (libzfs_init): Set argument list to
+	(void) rather than () so that this is a proper prototype.
+
 2010-08-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* lib/arg.c (grub_arg_show_help): Add the necessary spacing.
diff --git a/include/grub/util/libzfs.h b/include/grub/util/libzfs.h
index 9fbfd40d1..0500f70d7 100644
--- a/include/grub/util/libzfs.h
+++ b/include/grub/util/libzfs.h
@@ -30,7 +30,7 @@
 typedef void libzfs_handle_t;
 typedef void zpool_handle_t;
 
-extern libzfs_handle_t *libzfs_init ();
+extern libzfs_handle_t *libzfs_init (void);
 extern void libzfs_fini (libzfs_handle_t *);
 
 extern zpool_handle_t *zpool_open (libzfs_handle_t *, const char *);

From c882acc031c3ee096c01ee73963ab4628155f3cc Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sun, 1 Aug 2010 22:59:02 +0200
Subject: [PATCH 1327/1628] 2010-08-01  Robert Millan  <rmh@gnu.org>

	* include/grub/emu/misc.h (grub_find_mount_point_from_dir)
	(grub_find_zpool_from_mount_point): New function prototypes.

	* kern/emu/getroot.c [HAVE_GETFSSTAT]: Move `<sys/mount.h>' to ...
	* kern/emu/misc.c [HAVE_GETFSSTAT]: ... here.

	* kern/emu/getroot.c (find_mount_point_from_dir): Move to ...
	* kern/emu/misc.c (grub_find_mount_point_from_dir): ... this.  Remove
	`static' attribute.

	* kern/emu/getroot.c (find_root_device_from_libzfs): Split code for
	finding zpool from mount point into ...
	* kern/emu/misc.c (grub_find_zpool_from_mount_point): ... this.

	* kern/emu/misc.c (grub_make_system_path_relative_to_its_root): When
	requested path is part of a ZFS pool, use
	grub_find_zpool_from_mount_point() to detect its filesystem name,
	and generate a path with `/fsname@path' syntax.
---
 ChangeLog               |  42 ++++++++++++
 include/grub/emu/misc.h |   8 ++-
 kern/emu/getroot.c      | 112 +++-----------------------------
 kern/emu/misc.c         | 140 +++++++++++++++++++++++++++++++++++++++-
 4 files changed, 196 insertions(+), 106 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index daf5517dc..2956129b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2010-08-01  Robert Millan  <rmh@gnu.org>
+
+	* include/grub/emu/misc.h (grub_find_mount_point_from_dir)
+	(grub_find_zpool_from_mount_point): New function prototypes.
+
+	* kern/emu/getroot.c [HAVE_GETFSSTAT]: Move `<sys/mount.h>' to ...
+	* kern/emu/misc.c [HAVE_GETFSSTAT]: ... here.
+
+	* kern/emu/getroot.c (find_mount_point_from_dir): Move to ...
+	* kern/emu/misc.c (grub_find_mount_point_from_dir): ... this.  Remove
+	`static' attribute.
+
+	* kern/emu/getroot.c (find_root_device_from_libzfs): Split code for
+	finding zpool from mount point into ...
+	* kern/emu/misc.c (grub_find_zpool_from_mount_point): ... this.
+
+	* kern/emu/misc.c (grub_make_system_path_relative_to_its_root): When
+	requested path is part of a ZFS pool, use
+	grub_find_zpool_from_mount_point() to detect its filesystem name,
+	and generate a path with `/fsname@path' syntax.
+
 2010-08-01  Colin Watson  <cjwatson@ubuntu.com>
 
 	* include/grub/util/libzfs.h (libzfs_init): Set argument list to
@@ -39,6 +60,27 @@
 
 	* kern/misc.c (grub_memset): Optimise to reduce cache stalls.
 
+2010-08-01  Robert Millan  <rmh@gnu.org>
+
+	* include/grub/emu/misc.h (grub_find_mount_point_from_dir)
+	(grub_find_zpool_from_mount_point): New function prototypes.
+
+	* kern/emu/getroot.c [HAVE_GETFSSTAT]: Move `<sys/mount.h>' to ...
+	* kern/emu/misc.c [HAVE_GETFSSTAT]: ... here.
+
+	* kern/emu/getroot.c (find_mount_point_from_dir): Move to ...
+	* kern/emu/misc.c (grub_find_mount_point_from_dir): ... this.  Remove
+	`static' attribute.
+
+	* kern/emu/getroot.c (find_root_device_from_libzfs): Split code for
+	finding zpool from mount point into ...
+	* kern/emu/misc.c (grub_find_zpool_from_mount_point): ... this.
+
+	* kern/emu/misc.c (grub_make_system_path_relative_to_its_root): When
+	requested path is part of a ZFS pool, use
+	grub_find_zpool_from_mount_point() to detect its filesystem name,
+	and generate a path with `/fsname@path' syntax.
+
 2010-08-01  Robert Millan  <rmh@gnu.org>
 
 	Prevent accidental use of uninitialized libzfs_handle.
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index dc48d91a8..5047a9406 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -44,7 +44,13 @@ extern const char *program_name;
 void grub_init_all (void);
 void grub_fini_all (void);
 
-char *grub_make_system_path_relative_to_its_root (const char *path) __attribute__ ((warn_unused_result));
+char *grub_find_mount_point_from_dir (const char *dir)
+  __attribute__ ((warn_unused_result));
+void grub_find_zpool_from_mount_point (const char *mnt_point,
+				       char **poolname, char **poolfs);
+
+char *grub_make_system_path_relative_to_its_root (const char *path)
+  __attribute__ ((warn_unused_result));
 
 void * EXPORT_FUNC(xmalloc) (grub_size_t size) __attribute__ ((warn_unused_result));
 void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size) __attribute__ ((warn_unused_result));
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index 032608d1b..32044536d 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -49,10 +49,6 @@
 # include <grub/util/libnvpair.h>
 #endif
 
-#ifdef HAVE_GETFSSTAT
-# include <sys/mount.h>
-#endif
-
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
@@ -98,66 +94,6 @@ xgetcwd (void)
   return path;
 }
 
-#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
-
-static char *
-find_mount_point_from_dir (const char *dir)
-{
-  struct stat st;
-  typeof (st.st_dev) fs;
-  char *prev, *next, *slash, *statdir;
-
-  if (stat (dir, &st) == -1)
-    error (1, errno, "stat (%s)", dir);
-
-  fs = st.st_dev;
-
-  prev = xstrdup (dir);
-
-  while (1)
-    {
-      /* Remove last slash.  */
-      next = xstrdup (prev);
-      slash = strrchr (next, '/');
-      if (! slash)
-	{
-	  free (next);
-	  free (prev);
-	  return NULL;
-	}
-      *slash = '\0';
-
-      /* A next empty string counts as /.  */
-      if (next[0] == '\0')
-	statdir = "/";
-      else
-	statdir = next;
-
-      if (stat (statdir, &st) == -1)
-	error (1, errno, "stat (%s)", next);
-
-      if (st.st_dev != fs)
-	{
-	  /* Found mount point.  */
-	  free (next);
-	  return prev;
-	}
-
-      free (prev);
-      prev = next;
-
-      /* We've already seen an empty string, which means we
-         reached /.  Nothing left to do.  */
-      if (prev[0] == '\0')
-	{
-	  free (prev);
-	  return xstrdup ("/");
-	}
-    }
-}
-
-#endif
-
 #ifdef __linux__
 
 /* Statting something on a btrfs filesystem always returns a virtual device
@@ -239,52 +175,20 @@ find_root_device_from_mountinfo (const char *dir)
 #endif /* __linux__ */
 
 #if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
-
-/* ZFS has similar problems to those of btrfs (see above).  */
 static char *
 find_root_device_from_libzfs (const char *dir)
 {
-  char *device = NULL;
-  char *poolname = NULL;
-  char *poolfs = NULL;
+  char *device;
+  char *poolname;
+  char *poolfs;
   char *mnt_point;
-  char *slash;
-
-  mnt_point = find_mount_point_from_dir (dir);
-
-#ifdef HAVE_GETFSSTAT
-  {
-    int mnt_count = getfsstat (NULL, 0, MNT_WAIT);
-    if (mnt_count == -1)
-      error (1, errno, "getfsstat");
-
-    struct statfs *mnt = xmalloc (mnt_count * sizeof (*mnt));
-
-    mnt_count = getfsstat (mnt, mnt_count * sizeof (*mnt), MNT_WAIT);
-    if (mnt_count == -1)
-      error (1, errno, "getfsstat");
-
-    unsigned int i;
-    for (i = 0; i < (unsigned) mnt_count; i++)
-      if (!strcmp (mnt[i].f_fstypename, "zfs")
-	  && !strcmp (mnt[i].f_mntonname, mnt_point))
-	{
-	  poolname = xstrdup (mnt[i].f_mntfromname);
-	  break;
-	}
-
-    free (mnt);
-  }
-#endif
 
+  mnt_point = grub_find_mount_point_from_dir (dir);
+  grub_find_zpool_from_mount_point (mnt_point, &poolname, &poolfs);
   if (! poolname)
-    return NULL;
-
-  slash = strchr (poolname, '/');
-  if (slash)
     {
-      *slash = '\0';
-      poolfs = slash + 1;
+      free (mnt_point);
+      return NULL;
     }
 
   {
@@ -317,6 +221,8 @@ find_root_device_from_libzfs (const char *dir)
   }
 
   free (poolname);
+  if (poolfs)
+    free (poolfs);
 
   return device;
 }
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index 851da7a07..0d71ef3d6 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -19,6 +19,7 @@
 #include <config.h>
 
 #include <errno.h>
+#include <error.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -44,6 +45,15 @@
 # include <libdevmapper.h>
 #endif
 
+#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+# include <grub/util/libzfs.h>
+# include <grub/util/libnvpair.h>
+#endif
+
+#ifdef HAVE_GETFSSTAT
+# include <sys/mount.h>
+#endif
+
 int verbosity;
 
 void
@@ -236,6 +246,114 @@ get_win32_path (const char *path)
 }
 #endif
 
+#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+/* Not ZFS-specific in itself, but for now it's only used by ZFS-related code.  */
+char *
+grub_find_mount_point_from_dir (const char *dir)
+{
+  struct stat st;
+  typeof (st.st_dev) fs;
+  char *prev, *next, *slash, *statdir;
+
+  if (stat (dir, &st) == -1)
+    error (1, errno, "stat (%s)", dir);
+
+  fs = st.st_dev;
+
+  prev = xstrdup (dir);
+
+  while (1)
+    {
+      /* Remove last slash.  */
+      next = xstrdup (prev);
+      slash = strrchr (next, '/');
+      if (! slash)
+	{
+	  free (next);
+	  free (prev);
+	  return NULL;
+	}
+      *slash = '\0';
+
+      /* A next empty string counts as /.  */
+      if (next[0] == '\0')
+	statdir = "/";
+      else
+	statdir = next;
+
+      if (stat (statdir, &st) == -1)
+	error (1, errno, "stat (%s)", next);
+
+      if (st.st_dev != fs)
+	{
+	  /* Found mount point.  */
+	  free (next);
+	  return prev;
+	}
+
+      free (prev);
+      prev = next;
+
+      /* We've already seen an empty string, which means we
+         reached /.  Nothing left to do.  */
+      if (prev[0] == '\0')
+	{
+	  free (prev);
+	  return xstrdup ("/");
+	}
+    }
+}
+#endif
+
+#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+
+/* ZFS has similar problems to those of btrfs (see above).  */
+void
+grub_find_zpool_from_mount_point (const char *mnt_point, char **poolname, char **poolfs)
+{
+  char *slash;
+
+  *poolname = *poolfs = NULL;
+
+#ifdef HAVE_GETFSSTAT
+  {
+    int mnt_count = getfsstat (NULL, 0, MNT_WAIT);
+    if (mnt_count == -1)
+      error (1, errno, "getfsstat");
+
+    struct statfs *mnt = xmalloc (mnt_count * sizeof (*mnt));
+
+    mnt_count = getfsstat (mnt, mnt_count * sizeof (*mnt), MNT_WAIT);
+    if (mnt_count == -1)
+      error (1, errno, "getfsstat");
+
+    unsigned int i;
+    for (i = 0; i < (unsigned) mnt_count; i++)
+      if (!strcmp (mnt[i].f_fstypename, "zfs")
+	  && !strcmp (mnt[i].f_mntonname, mnt_point))
+	{
+	  *poolname = xstrdup (mnt[i].f_mntfromname);
+	  break;
+	}
+
+    free (mnt);
+  }
+#endif
+
+  if (! *poolname)
+    return;
+
+  slash = strchr (*poolname, '/');
+  if (slash)
+    {
+      *slash = '\0';
+      *poolfs = xstrdup (slash + 1);
+    }
+  else
+    *poolfs = xstrdup ("");
+}
+#endif
+
 /* This function never prints trailing slashes (so that its output
    can be appended a slash unconditionally).  */
 char *
@@ -243,16 +361,26 @@ grub_make_system_path_relative_to_its_root (const char *path)
 {
   struct stat st;
   char *p, *buf, *buf2, *buf3;
+  char *mnt_point, *poolname = NULL, *poolfs = NULL, *ret;
   uintptr_t offset = 0;
   dev_t num;
   size_t len;
 
   /* canonicalize.  */
   p = canonicalize_file_name (path);
-
   if (p == NULL)
     grub_util_error ("failed to get canonical path of %s", path);
 
+#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+  /* For ZFS sub-pool filesystems, could be extended to others (btrfs?).  */
+  mnt_point = grub_find_mount_point_from_dir (p);
+  if (mnt_point)
+    {
+      grub_find_zpool_from_mount_point (mnt_point, &poolname, &poolfs);
+      free (mnt_point);
+    }
+#endif
+
   len = strlen (p) + 1;
   buf = xstrdup (p);
   free (p);
@@ -331,7 +459,15 @@ grub_make_system_path_relative_to_its_root (const char *path)
       len--;
     }
 
-  return buf3;
+  if (poolfs)
+    {
+      ret = xasprintf ("/%s@%s", poolfs, buf3);
+      free (buf3);
+    }
+  else
+    ret = buf3;
+
+  return ret;
 }
 
 #ifdef HAVE_DEVICE_MAPPER

From 443a6c4b21198a80b9723c2aff7b787fad6c291c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 1 Aug 2010 23:08:03 +0200
Subject: [PATCH 1328/1628] Skip unexpected descriptors

---
 bus/usb/usb.c          | 13 +++++++++++--
 include/grub/usbdesc.h |  6 ++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/bus/usb/usb.c b/bus/usb/usb.c
index a961e0b48..b3eaeba0e 100644
--- a/bus/usb/usb.c
+++ b/bus/usb/usb.c
@@ -209,14 +209,23 @@ grub_usb_device_initialize (grub_usb_device_t dev)
 	goto fail;
 
       /* Skip the configuration descriptor.  */
-      pos = sizeof (struct grub_usb_desc_config);
+      pos = dev->config[i].descconf->length;
 
       /* Read all interfaces.  */
       for (currif = 0; currif < dev->config[i].descconf->numif; currif++)
 	{
+	  while (pos < config.totallen
+		 && ((struct grub_usb_desc *)&data[pos])->type
+		 != GRUB_USB_DESCRIPTOR_INTERFACE)
+	    pos += ((struct grub_usb_desc *)&data[pos])->length;
 	  dev->config[i].interf[currif].descif
 	    = (struct grub_usb_desc_if *) &data[pos];
-	  pos += sizeof (struct grub_usb_desc_if);
+	  pos += dev->config[i].interf[currif].descif->length;
+
+	  while (pos < config.totallen
+		 && ((struct grub_usb_desc *)&data[pos])->type
+		 != GRUB_USB_DESCRIPTOR_ENDPOINT)
+	    pos += ((struct grub_usb_desc *)&data[pos])->length;
 
 	  /* Point to the first endpoint.  */
 	  dev->config[i].interf[currif].descendp
diff --git a/include/grub/usbdesc.h b/include/grub/usbdesc.h
index 2f711d755..84b723a62 100644
--- a/include/grub/usbdesc.h
+++ b/include/grub/usbdesc.h
@@ -31,6 +31,12 @@ typedef enum {
   GRUB_USB_DESCRIPTOR_HUB = 0x29
 } grub_usb_descriptor_t;
 
+struct grub_usb_desc
+{
+  grub_uint8_t length;
+  grub_uint8_t type;
+} __attribute__ ((packed));
+
 struct grub_usb_desc_device
 {
   grub_uint8_t length;

From 9c98ae89113d5ccfa1aedf3277805c82f2b5909e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 1 Aug 2010 23:08:33 +0200
Subject: [PATCH 1329/1628] Skip non-boot usb_keyboard interface

---
 term/usb_keyboard.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index 1c0ce228f..f2d74d71c 100644
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -63,6 +63,9 @@ static char keyboard_map_shift[128] =
 #define USB_HID_SET_IDLE	0x0A
 #define USB_HID_SET_PROTOCOL	0x0B
 
+#define USB_HID_BOOT_SUBCLASS	0x01
+#define USB_HID_KBD_PROTOCOL	0x01
+
 static int grub_usb_keyboard_checkkey (struct grub_term_input *term);
 static int grub_usb_keyboard_getkey (struct grub_term_input *term);
 static int grub_usb_keyboard_getkeystatus (struct grub_term_input *term);
@@ -120,6 +123,12 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)
       || usbdev->descdev.subclass != 0 || usbdev->descdev.protocol != 0)
     return 0;
 
+  if (usbdev->config[configno].interf[interfno].descif->subclass
+      != USB_HID_BOOT_SUBCLASS
+      || usbdev->config[configno].interf[interfno].descif->protocol
+      != USB_HID_KBD_PROTOCOL)
+    return 0;
+
   grub_printf ("HID found!\n");
 
   /* Place the device in boot mode.  */

From f7abdefbdd861ec752cf3df6eda42c26c522cdb9 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sun, 1 Aug 2010 23:12:24 +0200
Subject: [PATCH 1330/1628] 2010-08-01  Robert Millan  <rmh@gnu.org>

	Make it even harder to use uninitialized `libzfs_handle' (and
	make the interface a bit simpler).

	* include/grub/util/misc.h (grub_util_init_libzfs)
	(libzfs_handle): Remove.
	(grub_get_libzfs_handle): New prototype.

	* util/misc.c [HAVE_LIBZFS] (libzfs_handle): Add `static'
	attribute.
	(grub_util_init_libzfs): Remove.
	(grub_get_libzfs_handle): New function.

	* kern/emu/getroot.c (find_root_device_from_libzfs): Use
	grub_get_libzfs_handle() to obtain a libzfs handle instead of
	accessing `libzfs_handle' directly.
---
 ChangeLog                | 18 ++++++++++++++++++
 include/grub/util/misc.h |  3 +--
 kern/emu/getroot.c       |  4 +---
 util/misc.c              | 14 +++++++-------
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2956129b3..d4a63c4ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2010-08-01  Robert Millan  <rmh@gnu.org>
+
+	Make it even harder to use uninitialized `libzfs_handle' (and
+	make the interface a bit simpler).
+
+	* include/grub/util/misc.h (grub_util_init_libzfs)
+	(libzfs_handle): Remove.
+	(grub_get_libzfs_handle): New prototype.
+
+	* util/misc.c [HAVE_LIBZFS] (libzfs_handle): Add `static'
+	attribute.
+	(grub_util_init_libzfs): Remove.
+	(grub_get_libzfs_handle): New function.
+
+	* kern/emu/getroot.c (find_root_device_from_libzfs): Use
+	grub_get_libzfs_handle() to obtain a libzfs handle instead of
+	accessing `libzfs_handle' directly.
+
 2010-08-01  Robert Millan  <rmh@gnu.org>
 
 	* include/grub/emu/misc.h (grub_find_mount_point_from_dir)
diff --git a/include/grub/util/misc.h b/include/grub/util/misc.h
index 3614c79c2..7ce3d3291 100644
--- a/include/grub/util/misc.h
+++ b/include/grub/util/misc.h
@@ -61,7 +61,6 @@ char *canonicalize_file_name (const char *path);
 
 void grub_util_init_nls (void);
 
-void grub_util_init_libzfs (void);
-extern libzfs_handle_t *libzfs_handle;
+libzfs_handle_t *grub_get_libzfs_handle (void);
 
 #endif /* ! GRUB_UTIL_MISC_HEADER */
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index 32044536d..ee6e1c7ba 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -197,9 +197,7 @@ find_root_device_from_libzfs (const char *dir)
     nvlist_t **nvlist_array;
     unsigned int nvlist_count;
 
-    grub_util_init_libzfs ();
-
-    zpool = zpool_open (libzfs_handle, poolname);
+    zpool = zpool_open (grub_get_libzfs_handle (), poolname);
     nvlist = zpool_get_config (zpool, NULL);
 
     if (nvlist_lookup_nvlist (nvlist, "vdev_tree", &nvlist) != 0)
diff --git a/util/misc.c b/util/misc.c
index 2eff256bf..274c182c2 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -296,27 +296,27 @@ grub_util_init_nls (void)
 }
 
 #ifdef HAVE_LIBZFS
-libzfs_handle_t *libzfs_handle;
+static libzfs_handle_t *libzfs_handle;
 
 static void
 fini_libzfs (void)
 {
   libzfs_fini (libzfs_handle);
 }
-#endif
 
-void
-grub_util_init_libzfs (void)
+libzfs_handle_t *
+grub_get_libzfs_handle (void)
 {
-#ifdef HAVE_LIBZFS
   if (! libzfs_handle)
     {
       libzfs_handle = libzfs_init ();
       atexit (fini_libzfs);
     }
-#endif
+
+  return libzfs_handle;
 }
-#endif
+#endif /* HAVE_LIBZFS */
+#endif /* GRUB_UTIL */
 
 int
 grub_dl_ref (grub_dl_t mod)

From c7db243b92d530b870bc71ae85e74bb8e3377cf0 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sun, 1 Aug 2010 23:21:09 +0200
Subject: [PATCH 1331/1628] 2010-08-01  Robert Millan  <rmh@gnu.org>

	* util/grub.d/10_kfreebsd.in: Initialize ${kfreebsd_device} as the
	kFreeBSD device name, except on ZFS where the filesystem label is
	used.
	(kfreebsd_entry): On ZFS root, load `opensolaris.ko', `zfs.ko' and
	`/boot/zfs/zpool.cache'.
	Set mountfrom kernel variable using ${kfreebsd_device}.
---
 ChangeLog                  |  9 +++++++++
 util/grub.d/10_kfreebsd.in | 26 +++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d4a63c4ec..65d6cb667 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-01  Robert Millan  <rmh@gnu.org>
+
+	* util/grub.d/10_kfreebsd.in: Initialize ${kfreebsd_device} as the
+	kFreeBSD device name, except on ZFS where the filesystem label is
+	used.
+	(kfreebsd_entry): On ZFS root, load `opensolaris.ko', `zfs.ko' and
+	`/boot/zfs/zpool.cache'.
+	Set mountfrom kernel variable using ${kfreebsd_device}.
+
 2010-08-01  Robert Millan  <rmh@gnu.org>
 
 	Make it even harder to use uninitialized `libzfs_handle' (and
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index f32da3013..bc5201ab9 100644
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -74,8 +74,27 @@ EOF
 EOF
   fi
 
+  case "${kfreebsd_fs}" in
+    zfs)
+      test -e "${module_dir}/opensolaris.ko"
+      test -e "${module_dir}/zfs.ko"
+      test -e "${dirname}/zfs/zpool.cache"
+
+      printf '%s\n' "${prepare_module_dir_cache}"
+      cat << EOF
+	kfreebsd_module_elf	${module_dir_rel}/opensolaris.ko
+	kfreebsd_module_elf	${module_dir_rel}/zfs.ko
+EOF
+
+      printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
-	set kFreeBSD.vfs.root.mountfrom=${kfreebsd_fs}:${GRUB_DEVICE}
+	kfreebsd_module		${rel_dirname}/zfs/zpool.cache type=/boot/zfs/zpool.cache
+EOF
+    ;;
+  esac
+
+  cat << EOF
+	set kFreeBSD.vfs.root.mountfrom=${kfreebsd_fs}:${kfreebsd_device}
 	set kFreeBSD.vfs.root.mountfrom.options=rw
 }
 EOF
@@ -105,6 +124,11 @@ while [ "x$list" != "x" ] ; do
     *)                  kfreebsd_fs=${GRUB_FS} ;;
   esac
 
+  case ${GRUB_FS} in
+    zfs)		kfreebsd_device=$(grub-probe -t label --device ${GRUB_DEVICE}) ;;
+    *)			kfreebsd_device=${GRUB_DEVICE} ;;
+  esac
+
   version=`echo $basename | sed -e "s,^[^0-9]*-,,g;s/\.gz$//g"`
   alt_version=`echo $version | sed -e "s,\.old$,,g"`
 

From a870a783be2eed43b59c7d537a37484ea05a668c Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 2 Aug 2010 09:51:23 -0500
Subject: [PATCH 1332/1628] * disk/raid.c (insert_array): Select unique numbers
 for named arrays as well, for use as keys in the disk cache.

---
 ChangeLog   |  5 +++++
 disk/raid.c | 29 ++++++++++++++++-------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 65d6cb667..83afffca3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* disk/raid.c (insert_array): Select unique numbers for named arrays
+	as well, for use as keys in the disk cache.
+
 2010-08-01  Robert Millan  <rmh@gnu.org>
 
 	* util/grub.d/10_kfreebsd.in: Initialize ${kfreebsd_device} as the
diff --git a/disk/raid.c b/disk/raid.c
index 7dfd4bd81..51a4b00e2 100644
--- a/disk/raid.c
+++ b/disk/raid.c
@@ -528,25 +528,28 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
       grub_memset (&array->device, 0, sizeof (array->device));
       grub_memset (&array->start_sector, 0, sizeof (array->start_sector));
 
-      if (array->name)
-	goto skip_duplicate_check;
-      /* Check whether we don't have multiple arrays with the same number.  */
-      for (p = array_list; p != NULL; p = p->next)
-        {
-          if (! p->name && p->number == array->number) 
-	    break;
-        }
+      if (! array->name)
+	{
+	  for (p = array_list; p != NULL; p = p->next)
+	    {
+	      if (! p->name && p->number == array->number) 
+		break;
+	    }
+	}
 
-      if (p)
+      if (array->name || p)
         {
-          /* The number is already in use, so we need to find a new one.  */
-          int i = 0;
+	  /* The number is already in use, so we need to find a new one.
+	     (Or, in the case of named arrays, the array doesn't have its
+	     own number, but we need one that doesn't clash for use as a key
+	     in the disk cache.  */
+          int i = array->name ? 0x40000000 : 0;
 
 	  while (1)
 	    {
 	      for (p = array_list; p != NULL; p = p->next)
 		{
-		  if (! p->name && p->number == i)
+		  if (p->number == i)
 		    break;
 		}
 
@@ -560,7 +563,7 @@ insert_array (grub_disk_t disk, struct grub_raid_array *new_array,
 	      i++;
 	    }
 	}
-    skip_duplicate_check:
+
       /* mdraid 1.x superblocks have only a name stored not a number.
 	 Use it directly as GRUB device.  */
       if (! array->name)

From c9f7ff97cfa5107da90469beb01058c952a433e4 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Tue, 3 Aug 2010 11:56:36 +0530
Subject: [PATCH 1333/1628] 	* script/execute.c
 (grub_script_execute_cmdline): Check for NULL 	as command name case.

---
 ChangeLog        | 5 +++++
 script/execute.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 83afffca3..d4da9f96c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-03  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* script/execute.c (grub_script_execute_cmdline): Check for NULL
+	as command name case.
+
 2010-08-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* disk/raid.c (insert_array): Select unique numbers for named arrays
diff --git a/script/execute.c b/script/execute.c
index 40f161267..c45a15d29 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -207,7 +207,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 
   /* Lookup the command.  */
   args = grub_script_execute_arglist_to_argv (cmdline->arglist, &argcount);
-  if (!args)
+  if (! args || ! args[0])
     return grub_errno;
 
   cmdname = args[0];

From 262b2d73c73f0f9b4b2e9d0a9a32c1ea36ab118b Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Tue, 3 Aug 2010 16:33:36 +0530
Subject: [PATCH 1334/1628] regexp sets matches to $match*

---
 commands/regexp.c | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/commands/regexp.c b/commands/regexp.c
index e8e8243b5..2e84c3b0d 100644
--- a/commands/regexp.c
+++ b/commands/regexp.c
@@ -20,6 +20,8 @@
 #include <grub/dl.h>
 #include <grub/misc.h>
 #include <grub/mm.h>
+#include <grub/err.h>
+#include <grub/env.h>
 #include <grub/command.h>
 #include <grub/i18n.h>
 #include <regex.h>
@@ -29,28 +31,50 @@ grub_cmd_regexp (grub_command_t cmd __attribute__ ((unused)),
 		 int argc, char **args)
 {
   int argn = 0;
-  int matches = 0;
   regex_t regex;
   int ret;
   grub_size_t s;
   char *comperr;
   grub_err_t err;
+  regmatch_t *matches = 0;
 
   if (argc != 2)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "2 arguments expected");
 
-  ret = regcomp (&regex, args[0], RE_SYNTAX_GNU_AWK);
+  ret = regcomp (&regex, args[0], REG_EXTENDED);
   if (ret)
     goto fail;
 
-  ret = regexec (&regex, args[1], 0, 0, 0);
+  matches = grub_zalloc (sizeof (*matches) * (regex.re_nsub + 1));
+  if (! matches)
+    goto fail;
+
+  ret = regexec (&regex, args[1], regex.re_nsub + 1, matches, 0);
   if (!ret)
     {
+      int i;
+      char ch;
+      char buf[5 + sizeof (size_t) * 3];
+
+      for (i = 0; i <= regex.re_nsub && matches[i].rm_so != -1; i++)
+	{
+	  ch = args[1][matches[i].rm_eo];
+	  args[1][matches[i].rm_eo] = '\0';
+
+	  grub_snprintf (buf, sizeof (buf), "%s%u", "match", i);
+	  if (grub_env_set (buf, args[1] + matches[i].rm_so))
+	    break;
+
+	  args[1][matches[i].rm_eo] = ch;
+	}
+
       regfree (&regex);
+      grub_free (matches);
       return GRUB_ERR_NONE;
     }
 
  fail:
+  grub_free (matches);
   s = regerror (ret, &regex, 0, 0);
   comperr = grub_malloc (s);
   if (!comperr)

From 9dd6fd50b4e69a3e4b68120ece98e5657a453a5b Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Tue, 3 Aug 2010 23:51:48 +0200
Subject: [PATCH 1335/1628] 2010-08-03  Robert Millan  <rmh@gnu.org>

	Fix grub-emu build.

	* include/grub/util/misc.h: Move `<grub/util/libzfs.h>' to ...
	* include/grub/emu/misc.h: ... here.

	* include/grub/util/misc.h (grub_get_libzfs_handle): Move function ...
	* include/grub/emu/misc.h (grub_get_libzfs_handle): ... here.

	* util/misc.c: Remove `<grub/util/libzfs.h>'.
	[HAVE_LIBZFS] (libzfs_handle, fini_libzfs)
	(grub_get_libzfs_handle): Move to ...
	* kern/emu/misc.c [HAVE_LIBZFS] (__libzfs_handle, fini_libzfs)
	(grub_get_libzfs_handle): ... here.
---
 ChangeLog                | 16 ++++++++++++++++
 include/grub/emu/misc.h  |  3 +++
 include/grub/util/misc.h |  3 ---
 kern/emu/misc.c          | 27 ++++++++++++++++++++++++++-
 util/misc.c              | 22 ----------------------
 5 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d4da9f96c..b3e7bc67f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-03  Robert Millan  <rmh@gnu.org>
+
+	Fix grub-emu build.
+
+	* include/grub/util/misc.h: Move `<grub/util/libzfs.h>' to ...
+	* include/grub/emu/misc.h: ... here.
+
+	* include/grub/util/misc.h (grub_get_libzfs_handle): Move function ...
+	* include/grub/emu/misc.h (grub_get_libzfs_handle): ... here.
+
+	* util/misc.c: Remove `<grub/util/libzfs.h>'.
+	[HAVE_LIBZFS] (libzfs_handle, fini_libzfs)
+	(grub_get_libzfs_handle): Move to ...
+	* kern/emu/misc.c [HAVE_LIBZFS] (__libzfs_handle, fini_libzfs)
+	(grub_get_libzfs_handle): ... here.
+
 2010-08-03  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* script/execute.c (grub_script_execute_cmdline): Check for NULL
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index 5047a9406..70cf05e0d 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -21,6 +21,7 @@
 
 #include <grub/symbol.h>
 #include <grub/types.h>
+#include <grub/util/libzfs.h>
 
 #ifdef __CYGWIN__
 # include <sys/fcntl.h>
@@ -75,4 +76,6 @@ extern char * canonicalize_file_name (const char *path);
 int grub_device_mapper_supported (void);
 #endif
 
+libzfs_handle_t *grub_get_libzfs_handle (void);
+
 #endif /* GRUB_EMU_MISC_H */
diff --git a/include/grub/util/misc.h b/include/grub/util/misc.h
index 7ce3d3291..48dfbb868 100644
--- a/include/grub/util/misc.h
+++ b/include/grub/util/misc.h
@@ -29,7 +29,6 @@
 #include <grub/types.h>
 #include <grub/symbol.h>
 #include <grub/emu/misc.h>
-#include <grub/util/libzfs.h>
 
 char *grub_util_get_path (const char *dir, const char *file);
 size_t grub_util_get_fp_size (FILE *fp);
@@ -61,6 +60,4 @@ char *canonicalize_file_name (const char *path);
 
 void grub_util_init_nls (void);
 
-libzfs_handle_t *grub_get_libzfs_handle (void);
-
 #endif /* ! GRUB_UTIL_MISC_HEADER */
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index 0d71ef3d6..0838dc3c0 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -45,8 +45,11 @@
 # include <libdevmapper.h>
 #endif
 
-#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+#ifdef HAVE_LIBZFS
 # include <grub/util/libzfs.h>
+#endif
+
+#ifdef HAVE_LIBNVPAIR
 # include <grub/util/libnvpair.h>
 #endif
 
@@ -246,6 +249,28 @@ get_win32_path (const char *path)
 }
 #endif
 
+#ifdef HAVE_LIBZFS
+static libzfs_handle_t *__libzfs_handle;
+
+static void
+fini_libzfs (void)
+{
+  libzfs_fini (__libzfs_handle);
+}
+
+libzfs_handle_t *
+grub_get_libzfs_handle (void)
+{
+  if (! __libzfs_handle)
+    {
+      __libzfs_handle = libzfs_init ();
+      atexit (fini_libzfs);
+    }
+
+  return __libzfs_handle;
+}
+#endif /* HAVE_LIBZFS */
+
 #if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
 /* Not ZFS-specific in itself, but for now it's only used by ZFS-related code.  */
 char *
diff --git a/util/misc.c b/util/misc.c
index 274c182c2..21dd211e1 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -36,7 +36,6 @@
 #include <grub/misc.h>
 #include <grub/cache.h>
 #include <grub/util/misc.h>
-#include <grub/util/libzfs.h>
 #include <grub/mm.h>
 #include <grub/term.h>
 #include <grub/time.h>
@@ -295,27 +294,6 @@ grub_util_init_nls (void)
 #endif /* (defined(ENABLE_NLS) && ENABLE_NLS) */
 }
 
-#ifdef HAVE_LIBZFS
-static libzfs_handle_t *libzfs_handle;
-
-static void
-fini_libzfs (void)
-{
-  libzfs_fini (libzfs_handle);
-}
-
-libzfs_handle_t *
-grub_get_libzfs_handle (void)
-{
-  if (! libzfs_handle)
-    {
-      libzfs_handle = libzfs_init ();
-      atexit (fini_libzfs);
-    }
-
-  return libzfs_handle;
-}
-#endif /* HAVE_LIBZFS */
 #endif /* GRUB_UTIL */
 
 int

From 62858144fe582fe4a908d277842cd50e00eba634 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 4 Aug 2010 00:15:29 +0200
Subject: [PATCH 1336/1628] 2010-08-04  Robert Millan  <rmh@gnu.org>

	Support OpenSolaris in ZFS device resolution.

	* configure.ac: Check for getmntany().
	* kern/emu/misc.c [HAVE_GETMNTANY]: Include `<sys/mnttab.h>'.
	[HAVE_GETMNTANY] (grub_find_zpool_from_mount_point): Add OpenSolaris
	support.
---
 ChangeLog       |  9 +++++++++
 configure.ac    |  2 +-
 kern/emu/misc.c | 24 +++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b3e7bc67f..958c55c79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-04  Robert Millan  <rmh@gnu.org>
+
+	Support OpenSolaris in ZFS device resolution.
+
+	* configure.ac: Check for getmntany().
+	* kern/emu/misc.c [HAVE_GETMNTANY]: Include `<sys/mnttab.h>'.
+	[HAVE_GETMNTANY] (grub_find_zpool_from_mount_point): Add OpenSolaris
+	support.
+
 2010-08-03  Robert Millan  <rmh@gnu.org>
 
 	Fix grub-emu build.
diff --git a/configure.ac b/configure.ac
index 6169a2fb5..41072eb4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,7 +247,7 @@ else
 fi
 
 # Check for functions and headers.
-AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf getfsstat)
+AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf getfsstat getmntany)
 AC_CHECK_HEADERS(libzfs.h libnvpair.h)
 
 # For opendisk() and getrawpartition() on NetBSD.
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index 0838dc3c0..5a148c708 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -32,6 +32,10 @@
 #include <limits.h>
 #endif
 
+#ifdef HAVE_GETMNTANY
+# include <sys/mnttab.h>
+#endif
+
 #include <grub/mm.h>
 #include <grub/err.h>
 #include <grub/env.h>
@@ -340,7 +344,7 @@ grub_find_zpool_from_mount_point (const char *mnt_point, char **poolname, char *
 
   *poolname = *poolfs = NULL;
 
-#ifdef HAVE_GETFSSTAT
+#if defined(HAVE_GETFSSTAT) /* FreeBSD and GNU/kFreeBSD */
   {
     int mnt_count = getfsstat (NULL, 0, MNT_WAIT);
     if (mnt_count == -1)
@@ -363,6 +367,24 @@ grub_find_zpool_from_mount_point (const char *mnt_point, char **poolname, char *
 
     free (mnt);
   }
+#elif defined(HAVE_GETMNTANY) /* OpenSolaris */
+  {
+    FILE *mnttab = fopen ("/etc/mnttab", "r");
+    struct mnttab mp;
+    struct mnttab mpref =
+      {
+	.mnt_special = NULL,
+	.mnt_mountp = mnt_point,
+	.mnt_fstype = "zfs",
+	.mnt_mntopts = NULL,
+	.mnt_time = NULL,
+      };
+
+    if (getmntany (mnttab, &mp, &mpref) == 0)
+      *poolname = xstrdup (mp.mnt_special);
+
+    fclose (mnttab);
+  }
 #endif
 
   if (! *poolname)

From 1355b096f6613d8aed2bf878b02ad26fee8ca3ab Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Wed, 4 Aug 2010 11:08:26 +0530
Subject: [PATCH 1337/1628] regexp can take variable names to update with
 matches

---
 commands/regexp.c | 92 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 67 insertions(+), 25 deletions(-)

diff --git a/commands/regexp.c b/commands/regexp.c
index 2e84c3b0d..8edf818a3 100644
--- a/commands/regexp.c
+++ b/commands/regexp.c
@@ -22,13 +22,69 @@
 #include <grub/mm.h>
 #include <grub/err.h>
 #include <grub/env.h>
-#include <grub/command.h>
+#include <grub/extcmd.h>
 #include <grub/i18n.h>
 #include <regex.h>
 
+static const struct grub_arg_option options[] =
+  {
+    { "set", 's', GRUB_ARG_OPTION_REPEATABLE,
+      N_("Variable names to update with matches."),
+      N_("[NUMBER:]VARNAME"), ARG_TYPE_STRING },
+    { 0, 0, 0, 0, 0, 0 }
+  };
+
 static grub_err_t
-grub_cmd_regexp (grub_command_t cmd __attribute__ ((unused)),
-		 int argc, char **args)
+set_matches (char **varnames, char *str, grub_size_t nmatches,
+	     regmatch_t *matches)
+{
+  int i;
+  char ch;
+  char *p;
+  char *q;
+  grub_err_t err;
+  unsigned long j;
+
+  auto void setvar (char *v, regmatch_t *m);
+  void setvar (char *v, regmatch_t *m)
+  {
+    ch = str[m->rm_eo];
+    str[m->rm_eo] = '\0';
+    err = grub_env_set (v, str + m->rm_so);
+    str[m->rm_eo] = ch;
+  }
+
+  for (i = 0; varnames && varnames[i]; i++)
+    {
+      if (! (p = grub_strchr (varnames[i], ':')))
+	{
+	  /* varname w/o index defaults to 1 */
+	  if (nmatches < 2 || matches[1].rm_so == -1)
+	    grub_env_unset (varnames[i]);
+	  else
+	    setvar (varnames[i], &matches[1]);
+	}
+      else
+	{
+	  j = grub_strtoul (varnames[i], &q, 10);
+	  if (q != p)
+	    return grub_error (GRUB_ERR_BAD_ARGUMENT,
+			       "invalid variable name format %s", varnames[i]);
+
+	  if (nmatches <= j || matches[j].rm_so == -1)
+	    grub_env_unset (p + 1);
+	  else
+	    setvar (p + 1, &matches[j]);
+	}
+
+      if (err != GRUB_ERR_NONE)
+	return err;
+    }
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_cmd_regexp (grub_extcmd_context_t ctxt, int argc, char **args)
 {
   int argn = 0;
   regex_t regex;
@@ -52,25 +108,11 @@ grub_cmd_regexp (grub_command_t cmd __attribute__ ((unused)),
   ret = regexec (&regex, args[1], regex.re_nsub + 1, matches, 0);
   if (!ret)
     {
-      int i;
-      char ch;
-      char buf[5 + sizeof (size_t) * 3];
-
-      for (i = 0; i <= regex.re_nsub && matches[i].rm_so != -1; i++)
-	{
-	  ch = args[1][matches[i].rm_eo];
-	  args[1][matches[i].rm_eo] = '\0';
-
-	  grub_snprintf (buf, sizeof (buf), "%s%u", "match", i);
-	  if (grub_env_set (buf, args[1] + matches[i].rm_so))
-	    break;
-
-	  args[1][matches[i].rm_eo] = ch;
-	}
-
+      err = set_matches (ctxt->state[0].args, args[1],
+			 regex.re_nsub + 1, matches);
       regfree (&regex);
       grub_free (matches);
-      return GRUB_ERR_NONE;
+      return err;
     }
 
  fail:
@@ -89,16 +131,16 @@ grub_cmd_regexp (grub_command_t cmd __attribute__ ((unused)),
   return err;
 }
 
-static grub_command_t cmd;
+static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(regexp)
 {
-  cmd = grub_register_command ("regexp", grub_cmd_regexp,
-			       N_("REGEXP STRING"),
-			       N_("Test if REGEXP matches STRING."));
+  cmd = grub_register_extcmd ("regexp", grub_cmd_regexp,
+			      GRUB_COMMAND_FLAG_BOTH, N_("REGEXP STRING"),
+			      N_("Test if REGEXP matches STRING."), options);
 }
 
 GRUB_MOD_FINI(regexp)
 {
-  grub_unregister_command (cmd);
+  grub_unregister_extcmd (cmd);
 }

From b0ecfcd3603bf2dbca3960676ee196cf4fc75367 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Wed, 4 Aug 2010 11:21:08 +0530
Subject: [PATCH 1338/1628] fixed reference counting bug

---
 script/argv.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/script/argv.c b/script/argv.c
index a7acbc23e..63b44e322 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -52,9 +52,6 @@ grub_script_argv_free (struct grub_script_argv *argv)
 
       grub_free (argv->args);
     }
-  if (argv->script)
-    grub_script_put (argv->script);
-
   argv->argc = 0;
   argv->args = 0;
   argv->script = 0;

From 0de22aa997fa162d626ed1c4f472bad4915e8e7f Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 4 Aug 2010 13:29:13 +0200
Subject: [PATCH 1339/1628] 2010-08-04  Robert Millan  <rmh@gnu.org>

	* include/grub/emu/misc.h (grub_find_mount_point_from_dir)
	(grub_find_zpool_from_mount_point): Merge into ...
	(grub_find_zpool_from_dir): ... this.
	* kern/emu/misc.c: Likewise.

	* kern/emu/misc.c
	(grub_make_system_path_relative_to_its_root): Replace
	grub_find_mount_point_from_dir() / grub_find_zpool_from_mount_point()
	with grub_find_zpool_from_dir().
	* kern/emu/getroot.c (find_root_device_from_libzfs): Likewise.
---
 ChangeLog               | 13 +++++++++++++
 include/grub/emu/misc.h |  6 ++----
 kern/emu/getroot.c      |  9 ++-------
 kern/emu/misc.c         | 21 ++++++++-------------
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 958c55c79..daa85e4a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-04  Robert Millan  <rmh@gnu.org>
+
+	* include/grub/emu/misc.h (grub_find_mount_point_from_dir)
+	(grub_find_zpool_from_mount_point): Merge into ...
+	(grub_find_zpool_from_dir): ... this.
+	* kern/emu/misc.c: Likewise.
+
+	* kern/emu/misc.c
+	(grub_make_system_path_relative_to_its_root): Replace
+	grub_find_mount_point_from_dir() / grub_find_zpool_from_mount_point()
+	with grub_find_zpool_from_dir().
+	* kern/emu/getroot.c (find_root_device_from_libzfs): Likewise.
+
 2010-08-04  Robert Millan  <rmh@gnu.org>
 
 	Support OpenSolaris in ZFS device resolution.
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index 70cf05e0d..ebb81a37f 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -45,10 +45,8 @@ extern const char *program_name;
 void grub_init_all (void);
 void grub_fini_all (void);
 
-char *grub_find_mount_point_from_dir (const char *dir)
-  __attribute__ ((warn_unused_result));
-void grub_find_zpool_from_mount_point (const char *mnt_point,
-				       char **poolname, char **poolfs);
+void grub_find_zpool_from_dir (const char *dir,
+			       char **poolname, char **poolfs);
 
 char *grub_make_system_path_relative_to_its_root (const char *path)
   __attribute__ ((warn_unused_result));
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index ee6e1c7ba..321b33bb3 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -181,15 +181,10 @@ find_root_device_from_libzfs (const char *dir)
   char *device;
   char *poolname;
   char *poolfs;
-  char *mnt_point;
 
-  mnt_point = grub_find_mount_point_from_dir (dir);
-  grub_find_zpool_from_mount_point (mnt_point, &poolname, &poolfs);
+  grub_find_zpool_from_dir (dir, &poolname, &poolfs);
   if (! poolname)
-    {
-      free (mnt_point);
-      return NULL;
-    }
+    return NULL;
 
   {
     zpool_handle_t *zpool;
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index 5a148c708..de22e3bff 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -277,8 +277,8 @@ grub_get_libzfs_handle (void)
 
 #if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
 /* Not ZFS-specific in itself, but for now it's only used by ZFS-related code.  */
-char *
-grub_find_mount_point_from_dir (const char *dir)
+static char *
+find_mount_point_from_dir (const char *dir)
 {
   struct stat st;
   typeof (st.st_dev) fs;
@@ -332,18 +332,18 @@ grub_find_mount_point_from_dir (const char *dir)
 	}
     }
 }
-#endif
-
-#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
 
 /* ZFS has similar problems to those of btrfs (see above).  */
 void
-grub_find_zpool_from_mount_point (const char *mnt_point, char **poolname, char **poolfs)
+grub_find_zpool_from_dir (const char *dir, char **poolname, char **poolfs)
 {
   char *slash;
+  char *mnt_point;
 
   *poolname = *poolfs = NULL;
 
+  mnt_point = find_mount_point_from_dir (dir);
+
 #if defined(HAVE_GETFSSTAT) /* FreeBSD and GNU/kFreeBSD */
   {
     int mnt_count = getfsstat (NULL, 0, MNT_WAIT);
@@ -408,7 +408,7 @@ grub_make_system_path_relative_to_its_root (const char *path)
 {
   struct stat st;
   char *p, *buf, *buf2, *buf3;
-  char *mnt_point, *poolname = NULL, *poolfs = NULL, *ret;
+  char *poolname = NULL, *poolfs = NULL, *ret;
   uintptr_t offset = 0;
   dev_t num;
   size_t len;
@@ -420,12 +420,7 @@ grub_make_system_path_relative_to_its_root (const char *path)
 
 #if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
   /* For ZFS sub-pool filesystems, could be extended to others (btrfs?).  */
-  mnt_point = grub_find_mount_point_from_dir (p);
-  if (mnt_point)
-    {
-      grub_find_zpool_from_mount_point (mnt_point, &poolname, &poolfs);
-      free (mnt_point);
-    }
+  grub_find_zpool_from_dir (p, &poolname, &poolfs);
 #endif
 
   len = strlen (p) + 1;

From d3dd9e80f63b76ad061b02b1c2aac4ed1af67662 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 4 Aug 2010 14:45:58 +0200
Subject: [PATCH 1340/1628] 2010-08-04  Robert Millan  <rmh@gnu.org>

	* configure.ac: Remove checks for getfsstat() and getmntany().
	Add checks for `<sys/param.h>' and `<sys/mount.h>'.
	* kern/emu/misc.c [HAVE_GETMNTANY]: Remove `<sys/mnttab.h>'.
	[HAVE_SYS_PARAM_H]: Include `<sys/param.h>'.
	[HAVE_SYS_MOUNT_H]: Include `<sys/mount.h>'.
	[HAVE_LIBZFS && HAVE_LIBNVPAIR] (find_mount_point_from_dir): Remove
	function.
	(grub_find_zpool_from_dir): Use statfs() instead of indirect matching
	via find_mount_point_from_dir() and getfsstat() / getmntany().
---
 ChangeLog       |  12 +++++
 configure.ac    |   4 +-
 kern/emu/misc.c | 118 ++++--------------------------------------------
 3 files changed, 23 insertions(+), 111 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index daa85e4a3..417cc4a6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-04  Robert Millan  <rmh@gnu.org>
+
+	* configure.ac: Remove checks for getfsstat() and getmntany().
+	Add checks for `<sys/param.h>' and `<sys/mount.h>'.
+	* kern/emu/misc.c [HAVE_GETMNTANY]: Remove `<sys/mnttab.h>'.
+	[HAVE_SYS_PARAM_H]: Include `<sys/param.h>'.
+	[HAVE_SYS_MOUNT_H]: Include `<sys/mount.h>'.
+	[HAVE_LIBZFS && HAVE_LIBNVPAIR] (find_mount_point_from_dir): Remove
+	function.
+	(grub_find_zpool_from_dir): Use statfs() instead of indirect matching
+	via find_mount_point_from_dir() and getfsstat() / getmntany().
+
 2010-08-04  Robert Millan  <rmh@gnu.org>
 
 	* include/grub/emu/misc.h (grub_find_mount_point_from_dir)
diff --git a/configure.ac b/configure.ac
index 41072eb4f..19d782609 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,8 +247,8 @@ else
 fi
 
 # Check for functions and headers.
-AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf getfsstat getmntany)
-AC_CHECK_HEADERS(libzfs.h libnvpair.h)
+AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf)
+AC_CHECK_HEADERS(libzfs.h libnvpair.h sys/param.h sys/mount.h)
 
 # For opendisk() and getrawpartition() on NetBSD.
 # Used in util/deviceiter.c and in util/hostdisk.c.
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index de22e3bff..b9afa167f 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -32,10 +32,6 @@
 #include <limits.h>
 #endif
 
-#ifdef HAVE_GETMNTANY
-# include <sys/mnttab.h>
-#endif
-
 #include <grub/mm.h>
 #include <grub/err.h>
 #include <grub/env.h>
@@ -57,7 +53,11 @@
 # include <grub/util/libnvpair.h>
 #endif
 
-#ifdef HAVE_GETFSSTAT
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+
+#ifdef HAVE_SYS_MOUNT_H
 # include <sys/mount.h>
 #endif
 
@@ -276,120 +276,20 @@ grub_get_libzfs_handle (void)
 #endif /* HAVE_LIBZFS */
 
 #if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
-/* Not ZFS-specific in itself, but for now it's only used by ZFS-related code.  */
-static char *
-find_mount_point_from_dir (const char *dir)
-{
-  struct stat st;
-  typeof (st.st_dev) fs;
-  char *prev, *next, *slash, *statdir;
-
-  if (stat (dir, &st) == -1)
-    error (1, errno, "stat (%s)", dir);
-
-  fs = st.st_dev;
-
-  prev = xstrdup (dir);
-
-  while (1)
-    {
-      /* Remove last slash.  */
-      next = xstrdup (prev);
-      slash = strrchr (next, '/');
-      if (! slash)
-	{
-	  free (next);
-	  free (prev);
-	  return NULL;
-	}
-      *slash = '\0';
-
-      /* A next empty string counts as /.  */
-      if (next[0] == '\0')
-	statdir = "/";
-      else
-	statdir = next;
-
-      if (stat (statdir, &st) == -1)
-	error (1, errno, "stat (%s)", next);
-
-      if (st.st_dev != fs)
-	{
-	  /* Found mount point.  */
-	  free (next);
-	  return prev;
-	}
-
-      free (prev);
-      prev = next;
-
-      /* We've already seen an empty string, which means we
-         reached /.  Nothing left to do.  */
-      if (prev[0] == '\0')
-	{
-	  free (prev);
-	  return xstrdup ("/");
-	}
-    }
-}
-
 /* ZFS has similar problems to those of btrfs (see above).  */
 void
 grub_find_zpool_from_dir (const char *dir, char **poolname, char **poolfs)
 {
+  struct statfs mnt;
   char *slash;
-  char *mnt_point;
 
   *poolname = *poolfs = NULL;
 
-  mnt_point = find_mount_point_from_dir (dir);
-
-#if defined(HAVE_GETFSSTAT) /* FreeBSD and GNU/kFreeBSD */
-  {
-    int mnt_count = getfsstat (NULL, 0, MNT_WAIT);
-    if (mnt_count == -1)
-      error (1, errno, "getfsstat");
-
-    struct statfs *mnt = xmalloc (mnt_count * sizeof (*mnt));
-
-    mnt_count = getfsstat (mnt, mnt_count * sizeof (*mnt), MNT_WAIT);
-    if (mnt_count == -1)
-      error (1, errno, "getfsstat");
-
-    unsigned int i;
-    for (i = 0; i < (unsigned) mnt_count; i++)
-      if (!strcmp (mnt[i].f_fstypename, "zfs")
-	  && !strcmp (mnt[i].f_mntonname, mnt_point))
-	{
-	  *poolname = xstrdup (mnt[i].f_mntfromname);
-	  break;
-	}
-
-    free (mnt);
-  }
-#elif defined(HAVE_GETMNTANY) /* OpenSolaris */
-  {
-    FILE *mnttab = fopen ("/etc/mnttab", "r");
-    struct mnttab mp;
-    struct mnttab mpref =
-      {
-	.mnt_special = NULL,
-	.mnt_mountp = mnt_point,
-	.mnt_fstype = "zfs",
-	.mnt_mntopts = NULL,
-	.mnt_time = NULL,
-      };
-
-    if (getmntany (mnttab, &mp, &mpref) == 0)
-      *poolname = xstrdup (mp.mnt_special);
-
-    fclose (mnttab);
-  }
-#endif
-
-  if (! *poolname)
+  if (statfs (dir, &mnt) != 0)
     return;
 
+  *poolname = xstrdup (mnt.f_mntfromname);
+
   slash = strchr (*poolname, '/');
   if (slash)
     {

From cd838e22c2ed09788abc79e3a0056b30af90025c Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Wed, 4 Aug 2010 19:21:18 +0530
Subject: [PATCH 1341/1628] added a testcase

---
 conf/tests.rmk       |  4 ++++
 tests/regexp_vars.in | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 tests/regexp_vars.in

diff --git a/conf/tests.rmk b/conf/tests.rmk
index 9144e5528..f7ec76366 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -74,6 +74,9 @@ grub_script_comments_SOURCES = tests/grub_script_comments.in
 check_SCRIPTS += grub_script_functions
 grub_script_functions_SOURCES = tests/grub_script_functions.in
 
+check_SCRIPTS += regexp_vars
+regexp_vars_SOURCES = tests/regexp_vars.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -91,6 +94,7 @@ SCRIPTED_TESTS += grub_script_final_semicolon
 SCRIPTED_TESTS += grub_script_dollar
 SCRIPTED_TESTS += grub_script_comments
 SCRIPTED_TESTS += grub_script_functions
+SCRIPTED_TESTS += regexp_vars
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/tests/regexp_vars.in b/tests/regexp_vars.in
new file mode 100644
index 000000000..43b479fec
--- /dev/null
+++ b/tests/regexp_vars.in
@@ -0,0 +1,41 @@
+#! /bin/bash -e
+
+# Run GRUB script in a Qemu instance
+# Copyright (C) 2010  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/>.
+
+cmd='regexp -s version "vm-(.*)" vm-1.2.3; echo $version'
+v=`echo "$cmd" | @builddir@/grub-shell`
+if test "$v" != 1.2.3; then echo "error: $cmd" >&2; exit 1; fi
+
+cmd='regexp -s 1:version "vm-(.*)" vm-1.2.3; echo $version'
+v=`echo "$cmd" | @builddir@/grub-shell`
+if test "$v" != 1.2.3; then echo "error: $cmd" >&2; exit 1; fi
+
+cmd='regexp -s 0:match "vm-(.*)" vm-1.2.3; echo $match'
+v=`echo "$cmd" | @builddir@/grub-shell`
+if test "$v" != vm-1.2.3; then echo "error: $cmd" >&2; exit 1; fi
+
+cmd='regexp -s 2:match "vm-(.*)" vm-1.2.3; echo $match'
+v=`echo "$cmd" | @builddir@/grub-shell`
+if test -n "$v"; then echo "error: $cmd" >&2; exit 1; fi
+
+cmd='regexp -s match "\\\((.*)\\\)" (hd0,msdos1); echo $match'
+v=`echo "$cmd" | @builddir@/grub-shell`
+if test "$v" != "hd0,msdos1"; then echo "error: $cmd" >&2; exit 1; fi
+
+cmd='regexp -s match "hd([0-9]+)" hd0; echo $match'
+v=`echo "$cmd" | @builddir@/grub-shell`
+if test "$v" != "0"; then echo "error: $cmd" >&2; exit 1; fi

From 02c9030aaeced235008b7ea8a01bf0ab450884a6 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Fri, 6 Aug 2010 10:01:54 +0530
Subject: [PATCH 1342/1628] builds w/o custom DEPDIR

---
 Makefile.am            |  7 ++++---
 docs/Makefile.am       |  2 +-
 gentpl.py              |  8 ++++++++
 grub-core/Makefile.am  | 11 ++++-------
 grub-core/configure.ac |  4 +++-
 grub-core/modules.def  | 36 ++++++++----------------------------
 modules.def            | 38 ++++++++++++++++++++------------------
 7 files changed, 48 insertions(+), 58 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c181a5f77..c7f3614d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
-DEPDIR = .deps-util
 SUBDIRS = . grub-core po docs
 EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
 
@@ -23,13 +22,15 @@ AM_CCASFLAGS = $(CCASFLAGS_GRUB)
 include $(srcdir)/modules.am
 
 # XXX Use Automake's LEX & YACC support
-grub_script.tab.c grub_script.tab.h: $(top_srcdir)/grub-core/script/parser.y
+grub_script.tab.h: $(top_srcdir)/grub-core/script/parser.y
 	$(YACC) -d -p grub_script_yy -b grub_script $(top_srcdir)/grub-core/script/parser.y
+grub_script.tab.c: grub_script.tab.h
 CLEANFILES += grub_script.tab.c grub_script.tab.h
 
 # For the lexer.
-grub_script.yy.c grub_script.yy.h: $(top_srcdir)/grub-core/script/yylex.l
+grub_script.yy.h: $(top_srcdir)/grub-core/script/yylex.l
 	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(top_srcdir)/grub-core/script/yylex.l
+grub_script.yy.c: grub_script.yy.h
 CLEANFILES += grub_script.yy.c grub_script.yy.h
 
 # For libgrub.a
diff --git a/docs/Makefile.am b/docs/Makefile.am
index ab65a8dd2..1b302d262 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = subdir-objects
-AM_MAKEINFOFLAGS = --force --no-split --no-validate
 
+AM_MAKEINFOFLAGS = --force --no-split --no-validate
 info_TEXINFOS = grub.texi
 grub_TEXINFOS = fdl.texi
 
diff --git a/gentpl.py b/gentpl.py
index d584a0b7d..ba776d642 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -17,6 +17,8 @@ GROUPS["sparc64"] = [ "sparc64_ieee1275" ]
 GROUPS["powerpc"] = [ "powerpc_ieee1275" ]
 GROUPS["x86"]     = GROUPS["i386"] + GROUPS["x86_64"]
 GROUPS["x86_efi"] = [ "i386_efi", "x86_64_efi" ]
+GROUPS["ieee1275"] = [ "i386_ieee1275", "sparc64_ieee1275", "powerpc_ieee1275" ]
+GROUPS["pci"]      = GROUPS["x86"] + GROUPS["mips"]
 GROUPS["nonemu"]  = GRUB_PLATFORMS[:]
 GROUPS["nonemu"].remove("emu")
 
@@ -157,6 +159,7 @@ def shared_nodist_sources(): return "[+ FOR nodist_shared +] [+ .nodist_shared +
 def platform_sources(p): return platform_specific_values(p, "source", "")
 def platform_nodist_sources(p): return platform_specific_values(p, "nodist", "_nodist")
 def platform_extra_dist(p): return platform_specific_values(p, "extra_dist", "_extra_dist")
+def platform_dependencies(p): return platform_specific_values(p, "dependencies", "_dependencies")
 
 def platform_ldadd(p): return platform_specific_values(p, "ldadd", "_ldadd")
 def platform_cflags(p): return platform_specific_values(p, "cflags", "_cflags")
@@ -181,6 +184,7 @@ def module(platform):
     r += var_set(cname() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_MODULE) " + platform_ldflags(platform))
     r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_MODULE) " + platform_cppflags(platform))
     r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_MODULE) " + platform_ccasflags(platform))
+    # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform))
 
     r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
     r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
@@ -271,6 +275,7 @@ def kernel(platform):
     r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) " + platform_cppflags(platform))
     r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_KERNEL) " + platform_ccasflags(platform))
     r += var_set(cname() + "_STRIPFLAGS", "$(AM_STRIPFLAGS) $(STRIPFLAGS_KERNEL) " + platform_stripflags(platform))
+    # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform))
 
     r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
     r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
@@ -296,6 +301,7 @@ def image(platform):
     r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_IMAGE) " + platform_cppflags(platform))
     r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_IMAGE) " + platform_ccasflags(platform))
     r += var_set(cname() + "_OBJCOPYFLAGS", "$(OBJCOPYFLAGS_IMAGE) " + platform_objcopyflags(platform))
+    # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform))
 
     r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
     r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
@@ -322,6 +328,7 @@ def library(platform):
     r += var_set(cname() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_LIBRARY) " + platform_cflags(platform))
     r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) " + platform_cppflags(platform))
     r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_LIBRARY) " + platform_ccasflags(platform))
+    # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform))
 
     r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
     r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
@@ -364,6 +371,7 @@ def program(platform, test=False):
     r += var_set(cname() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_PROGRAM) " + platform_ldflags(platform))
     r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) " + platform_cppflags(platform))
     r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM) " + platform_ccasflags(platform))
+    # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform))
 
     r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
     r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 85433431d..654a7e9a4 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -1,7 +1,6 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 SUBDIRS = po
-DEPDIR = .deps-core
 EXTRA_DIST = gentpl.py modules.def Makefile.tpl genmoddep.awk
 EXTRA_DIST += genmodsrc.sh gensymlist.sh genemuinit.sh genemuinitheader.sh
 EXTRA_DIST += genfslist.sh gencmdlist.sh genvideolist.sh genhandlerlist.sh
@@ -53,17 +52,15 @@ trigtables.c: gentrigtables.c configure.ac
 CLEANFILES += trigtables.c
 
 # XXX Use Automake's LEX & YACC support
-# See Recording Dependencies Manually in automake doc for below rules
-script/sh_module-lexer.$(OBJEXT):grub_script.tab.h
-grub_script.tab.c grub_script.tab.h: $(top_srcdir)/script/parser.y
+grub_script.tab.h: $(top_srcdir)/script/parser.y
 	$(YACC) -d -p grub_script_yy -b grub_script $(top_srcdir)/script/parser.y
+grub_script.tab.c: grub_script.tab.h
 CLEANFILES += grub_script.tab.c grub_script.tab.h
 
 # For the lexer.
-# See Recording Dependencies Manually in automake doc for below rules
-script/sh_module-lexer.$(OBJEXT):grub_script.yy.h
-grub_script.yy.c grub_script.yy.h: $(top_srcdir)/script/yylex.l
+grub_script.yy.h: $(top_srcdir)/script/yylex.l
 	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(top_srcdir)/script/yylex.l
+grub_script.yy.c: grub_script.yy.h
 CLEANFILES += grub_script.yy.c grub_script.yy.h
 
 include $(srcdir)/modules.am
diff --git a/grub-core/configure.ac b/grub-core/configure.ac
index 5ba5962a3..691876cac 100644
--- a/grub-core/configure.ac
+++ b/grub-core/configure.ac
@@ -60,13 +60,15 @@ CCAS=$TARGET_CC
 grub_CHECK_LINK_DIR
 if test x"$link_dir" = xyes ; then
   AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu])
+  cp -rp $srcdir/lib/$target_cpu lib/target_cpu
   if test "$platform" != emu ; then
     AC_CONFIG_LINKS([include/grub/machine:include/grub/$target_cpu/$platform])
   fi
 else
   mkdir -p include/grub 2>/dev/null
   rm -rf include/grub/cpu
-  cp -rp $srcdir/grub-core/include/grub/$target_cpu include/grub/cpu 2>/dev/null
+  cp -rp $srcdir/include/grub/$target_cpu include/grub/cpu 2>/dev/null
+  cp -rp $srcdir/lib/$target_cpu lib/target_cpu 2>/dev/null
   if test "$platform" != emu ; then
     rm -rf include/grub/machine
     cp -rp $srcdir/grub-core/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
diff --git a/grub-core/modules.def b/grub-core/modules.def
index 4e4db8d36..8e65f277c 100644
--- a/grub-core/modules.def
+++ b/grub-core/modules.def
@@ -584,14 +584,6 @@ module = {
 module = {
   name = lsmmap;
   source = commands/lsmmap.c;
-
-  enable = i386_pc;
-  enable = i386_qemu;
-  enable = i386_coreboot;
-  enable = i386_multiboot;
-  enable = i386_ieee1275;
-  enable = mips_yeeloong;
-  enable = powerpc_ieee1275;
 };
 
 module = {
@@ -1215,12 +1207,7 @@ module = {
 
 module = {
   name = setjmp;
-  i386 = lib/i386/setjmp.S;
-  x86_64 = lib/x86_64/setjmp.S;
-  mips = lib/mips/setjmp.S;
-  sparc64 = lib/sparc64/setjmp.S;
-  powerpc = lib/powerpc/setjmp.S;
-  emu = 'lib/$(target_cpu)/setjmp.S';
+  source = lib/target_cpu/setjmp.S;
 };
 
 module = {
@@ -1289,19 +1276,12 @@ module = {
 
 module = {
   name = xnu;
-  x86_efi = loader/xnu_resume.c;
-  x86_efi = loader/i386/xnu.c;
-  x86_efi = loader/macho32.c;
-  x86_efi = loader/macho64.c;
-  x86_efi = loader/macho.c;
-  x86_efi = loader/xnu.c;
-
-  i386_pc = loader/xnu_resume.c;
-  i386_pc = loader/i386/xnu.c;
-  i386_pc = loader/macho32.c;
-  i386_pc = loader/macho64.c;
-  i386_pc = loader/macho.c;
-  i386_pc = loader/xnu.c;
+  source = loader/xnu_resume.c;
+  source = loader/i386/xnu.c;
+  source = loader/macho32.c;
+  source = loader/macho64.c;
+  source = loader/macho.c;
+  source = loader/xnu.c;
 
   extra_dist = loader/machoXX.c;
   enable = i386_pc;
@@ -1383,7 +1363,7 @@ module = {
   source = script/function.c;
   source = script/lexer.c;
 
-  nodist = unidata.c;
+  source = unidata.c;
   nodist = grub_script.tab.c;
   nodist = grub_script.yy.c;
   nodist = grub_script.tab.h;
diff --git a/modules.def b/modules.def
index 23d7d14cd..8fb97cd40 100644
--- a/modules.def
+++ b/modules.def
@@ -90,13 +90,16 @@ library = {
   source = grub-core/script/lexer.c;
   source = grub-core/script/main.c;
   source = grub-core/script/script.c;
+
+  nodist = grub_script.yy.h;
+  nodist = grub_script.tab.h;
 };
 
 program = {
   name = grub-bin2h;
   source = util/bin2h.c;
   ldadd = libgrub.a;
-  ldadd = '$(LIBINTL)';
+  ldflags = '$(LIBINTL)';
   mansection = 1;
 };
 
@@ -109,8 +112,7 @@ program = {
   extra_dist = util/grub-mkimagexx.c;
 
   ldadd = libgrub.a;
-  ldadd = '$(LIBINTL)';
-
+  ldflags = '$(LIBINTL)';
   cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"';
 };
 
@@ -121,7 +123,7 @@ program = {
   source = util/grub-mkrelpath.c;
 
   ldadd = libgrub.a;
-  ldadd = '$(LIBINTL)';
+  ldflags = '$(LIBINTL)';
 };
 
 program = {
@@ -131,7 +133,7 @@ program = {
   source = util/grub-script-check.c;
 
   ldadd = libgrub.a;
-  ldadd = '$(LIBINTL)';
+  ldflags = '$(LIBINTL)';
 };
 
 program = {
@@ -141,7 +143,7 @@ program = {
   source = util/grub-editenv.c;
 
   ldadd = libgrub.a;
-  ldadd = '$(LIBINTL)';
+  ldflags = '$(LIBINTL)';
 };
 
 program = {
@@ -151,7 +153,7 @@ program = {
   source = util/grub-mkpasswd-pbkdf2.c;
 
   ldadd = libgrub.a;
-  ldadd = '$(LIBINTL)';
+  ldflags = '$(LIBINTL)';
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
 };
@@ -169,7 +171,7 @@ program = {
   source = util/grub-pe2elf.c;
 
   ldadd = libgrub.a;
-  ldadd = '$(LIBINTL)';
+  ldflags = '$(LIBINTL)';
   condition = COND_GRUB_PE2ELF;
 };
 
@@ -179,7 +181,7 @@ program = {
   source = util/grub-fstest.c;
 
   ldadd = libgrub.a;
-  ldadd = '$(LIBINTL)';
+  ldflags = '$(LIBINTL)';
   condition = COND_GRUB_FSTEST;
 };
 
@@ -187,13 +189,13 @@ program = {
   name = grub-mkfont;
   mansection = 1;
   source = util/grub-mkfont.c;
-  nodist = grub-core/unidata.c;
+  source = grub-core/unidata.c;
 
   cflags = '$(freetype_cflags)';
 
   ldadd = libgrub.a;
-  ldadd = '$(LIBINTL)';
-  ldadd = '$(freetype_libs)';
+  ldflags = '$(LIBINTL)';
+  ldflags = '$(freetype_libs)';
   condition = COND_GRUB_MKFONT;
 };
 
@@ -211,8 +213,8 @@ program = {
   sparc64_ieee1275 = util/ieee1275/devicemap.c;
 
   ldadd = libgrub.a;
-  ldadd = '$(LIBINTL)';
-  ldadd = '$(LIBUTIL)';
+  ldflags = '$(LIBINTL)';
+  ldflags = '$(LIBUTIL)';
 };
 
 program = {
@@ -222,8 +224,8 @@ program = {
   source = util/grub-probe.c;
 
   ldadd = libgrub.a;
-  ldadd = '$(LIBINTL)';
-  ldadd = '$(LIBUTIL)';
+  ldflags = '$(LIBINTL)';
+  ldflags = '$(LIBUTIL)';
 };
 
 program = {
@@ -240,8 +242,8 @@ program = {
   sparc64_ieee1275 = util/lvm.c;
 
   ldadd = libgrub.a;
-  ldadd = '$(LIBINTL)';
-  ldadd = '$(LIBUTIL)';
+  ldflags = '$(LIBINTL)';
+  ldflags = '$(LIBUTIL)';
 
   enable = i386_pc;
   enable = sparc64_ieee1275;

From 55dd292477766438556c92fd614cd437c90971f7 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sun, 8 Aug 2010 15:45:33 +0200
Subject: [PATCH 1343/1628] 2010-08-08  Robert Millan  <rmh@gnu.org>

	Fix grub-probe invocation.

	* util/grub.d/10_kfreebsd.in: s/label/fs_label/g.
---
 ChangeLog                  | 6 ++++++
 util/grub.d/10_kfreebsd.in | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 417cc4a6a..65120fc25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-08  Robert Millan  <rmh@gnu.org>
+
+	Fix grub-probe invocation.
+
+	* util/grub.d/10_kfreebsd.in: s/label/fs_label/g.
+
 2010-08-04  Robert Millan  <rmh@gnu.org>
 
 	* configure.ac: Remove checks for getfsstat() and getmntany().
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index bc5201ab9..29737f990 100644
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -125,7 +125,7 @@ while [ "x$list" != "x" ] ; do
   esac
 
   case ${GRUB_FS} in
-    zfs)		kfreebsd_device=$(grub-probe -t label --device ${GRUB_DEVICE}) ;;
+    zfs)		kfreebsd_device=$(grub-probe -t fs_label --device ${GRUB_DEVICE}) ;;
     *)			kfreebsd_device=${GRUB_DEVICE} ;;
   esac
 

From 0d8286f32816067967817eceade37e5924b16c5d Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sun, 8 Aug 2010 16:27:58 +0200
Subject: [PATCH 1344/1628] 2010-08-08  Robert Millan  <rmh@gnu.org>

	* util/grub.d/10_kfreebsd.in: When files required for ZFS do not
	exist, issue a proper error message (rely on `ls' for translated
	strings).
---
 ChangeLog                  | 6 ++++++
 util/grub.d/10_kfreebsd.in | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 65120fc25..df8d040fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-08  Robert Millan  <rmh@gnu.org>
+
+	* util/grub.d/10_kfreebsd.in: When files required for ZFS do not
+	exist, issue a proper error message (rely on `ls' for translated
+	strings).
+
 2010-08-08  Robert Millan  <rmh@gnu.org>
 
 	Fix grub-probe invocation.
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index 29737f990..3a42de529 100644
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -76,9 +76,10 @@ EOF
 
   case "${kfreebsd_fs}" in
     zfs)
-      test -e "${module_dir}/opensolaris.ko"
-      test -e "${module_dir}/zfs.ko"
-      test -e "${dirname}/zfs/zpool.cache"
+      for i in "${module_dir}/opensolaris.ko" "${module_dir}/zfs.ko" \
+          "${dirname}/zfs/zpool.cache" ; do
+        ls "$i" > /dev/null
+      done
 
       printf '%s\n' "${prepare_module_dir_cache}"
       cat << EOF

From 7117542069db6660f2d40d5f79a51ab2db0fa89e Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sun, 8 Aug 2010 22:47:32 +0200
Subject: [PATCH 1345/1628] 2010-08-08  Robert Millan  <rmh@gnu.org>

	* util/grub-fstest.c (read_file, cmd_cmp): Improve error message.
---
 ChangeLog          | 4 ++++
 util/grub-fstest.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index df8d040fd..4d7361472 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-08  Robert Millan  <rmh@gnu.org>
+
+	* util/grub-fstest.c (read_file, cmd_cmp): Improve error message.
+
 2010-08-08  Robert Millan  <rmh@gnu.org>
 
 	* util/grub.d/10_kfreebsd.in: When files required for ZFS do not
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index f1692c0a3..2c80b964c 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -157,7 +157,7 @@ read_file (char *pathname, int (*hook) (grub_off_t ofs, char *buf, int len))
       sz = grub_file_read (file, buf, (len > BUF_SIZE) ? BUF_SIZE : len);
       if (sz < 0)
 	{
-	  grub_util_error ("read error at offset %llu", ofs);
+	  grub_util_error ("read error at offset %llu: %s", ofs, grub_errmsg);
 	  break;
 	}
 
@@ -211,7 +211,7 @@ cmd_cmp (char *src, char *dest)
   {
     if ((int) fread (buf_1, 1, len, ff) != len)
       {
-	grub_util_error ("read error at offset %llu", ofs);
+	grub_util_error ("read error at offset %llu: %s", ofs, grub_errmsg);
 	return 1;
       }
 

From 346c207240bf1a21ba212601b3a3647e2e4a17d1 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Mon, 9 Aug 2010 00:11:19 +0200
Subject: [PATCH 1346/1628] 2010-08-08  Robert Millan  <rmh@gnu.org>

	Fix path generation for sub-filesystems in ZFS.

	* kern/emu/misc.c (grub_make_system_path_relative_to_its_root): Add
	missing slash.
---
 ChangeLog       | 7 +++++++
 kern/emu/misc.c | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 4d7361472..3619b00fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-08  Robert Millan  <rmh@gnu.org>
+
+	Fix path generation for sub-filesystems in ZFS.
+
+	* kern/emu/misc.c (grub_make_system_path_relative_to_its_root): Add
+	missing slash.
+
 2010-08-08  Robert Millan  <rmh@gnu.org>
 
 	* util/grub-fstest.c (read_file, cmd_cmp): Improve error message.
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index b9afa167f..d1a92de30 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -403,7 +403,7 @@ grub_make_system_path_relative_to_its_root (const char *path)
 
   if (poolfs)
     {
-      ret = xasprintf ("/%s@%s", poolfs, buf3);
+      ret = xasprintf ("/%s/@%s", poolfs, buf3);
       free (buf3);
     }
   else

From 07f360e92dda7197912b1ba4340e3cdbadf7d8af Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Mon, 9 Aug 2010 17:44:24 +0200
Subject: [PATCH 1347/1628] 2010-08-09  Robert Millan  <rmh@gnu.org>

	* kern/emu/misc.c (grub_make_system_path_relative_to_its_root): Filter
	out unused variables on non-ZFS build.
---
 ChangeLog       |  5 +++++
 kern/emu/misc.c | 14 +++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3619b00fa..b0cbd54a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-09  Robert Millan  <rmh@gnu.org>
+
+	* kern/emu/misc.c (grub_make_system_path_relative_to_its_root): Filter
+	out unused variables on non-ZFS build.
+
 2010-08-08  Robert Millan  <rmh@gnu.org>
 
 	Fix path generation for sub-filesystems in ZFS.
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index d1a92de30..760471ebb 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -307,12 +307,15 @@ char *
 grub_make_system_path_relative_to_its_root (const char *path)
 {
   struct stat st;
-  char *p, *buf, *buf2, *buf3;
-  char *poolname = NULL, *poolfs = NULL, *ret;
+  char *p, *buf, *buf2, *buf3, *ret;
   uintptr_t offset = 0;
   dev_t num;
   size_t len;
 
+#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+  char *poolfs = NULL;
+#endif
+
   /* canonicalize.  */
   p = canonicalize_file_name (path);
   if (p == NULL)
@@ -320,7 +323,10 @@ grub_make_system_path_relative_to_its_root (const char *path)
 
 #if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
   /* For ZFS sub-pool filesystems, could be extended to others (btrfs?).  */
-  grub_find_zpool_from_dir (p, &poolname, &poolfs);
+  {
+    char *dummy;
+    grub_find_zpool_from_dir (p, &dummy, &poolfs);
+  }
 #endif
 
   len = strlen (p) + 1;
@@ -401,12 +407,14 @@ grub_make_system_path_relative_to_its_root (const char *path)
       len--;
     }
 
+#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
   if (poolfs)
     {
       ret = xasprintf ("/%s/@%s", poolfs, buf3);
       free (buf3);
     }
   else
+#endif
     ret = buf3;
 
   return ret;

From 67a9e4d95d551594830b3635ec2cdf7acf0035cd Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Mon, 9 Aug 2010 21:42:24 +0530
Subject: [PATCH 1348/1628] review fixes and a testcase

---
 conf/tests.rmk                |  9 +++++++
 include/grub/script_sh.h      |  8 +++---
 script/execute.c              |  2 +-
 script/main.c                 |  2 +-
 script/parser.y               | 17 ++++++------
 script/script.c               |  6 ++---
 tests/grub_script_blockarg.in | 41 ++++++++++++++++++++++++++++
 tests/test_blockarg.c         | 51 +++++++++++++++++++++++++++++++++++
 8 files changed, 119 insertions(+), 17 deletions(-)
 create mode 100644 tests/grub_script_blockarg.in
 create mode 100644 tests/test_blockarg.c

diff --git a/conf/tests.rmk b/conf/tests.rmk
index 9144e5528..a7fdf4033 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -19,6 +19,11 @@ functional_test_mod_SOURCES = tests/lib/functional_test.c tests/lib/test.c
 functional_test_mod_CFLAGS  = $(COMMON_CFLAGS)
 functional_test_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+pkglib_MODULES += test_blockarg.mod
+test_blockarg_mod_SOURCES = tests/test_blockarg.c
+test_blockarg_mod_CFLAGS = $(COMMON_CFLAGS)
+test_blockarg_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # Rules for unit tests
 check_UTILITIES += example_unit_test
 example_unit_test_SOURCES = tests/example_unit_test.c kern/list.c kern/misc.c tests/lib/test.c tests/lib/unit_test.c
@@ -74,6 +79,9 @@ grub_script_comments_SOURCES = tests/grub_script_comments.in
 check_SCRIPTS += grub_script_functions
 grub_script_functions_SOURCES = tests/grub_script_functions.in
 
+check_SCRIPTS += grub_script_blockarg
+grub_script_blockarg_SOURCES = tests/grub_script_blockarg.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -91,6 +99,7 @@ SCRIPTED_TESTS += grub_script_final_semicolon
 SCRIPTED_TESTS += grub_script_dollar
 SCRIPTED_TESTS += grub_script_comments
 SCRIPTED_TESTS += grub_script_functions
+SCRIPTED_TESTS += grub_script_blockarg
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index ffedf5c75..6a959e16f 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -43,8 +43,8 @@ struct grub_script
   struct grub_script_mem *mem;
   struct grub_script_cmd *cmd;
 
-  /* Other grub_script's from block arguments.  */
-  struct grub_script *siblings;
+  /* grub_scripts from block arguments.  */
+  struct grub_script *next_siblings;
   struct grub_script *children;
 };
 
@@ -371,7 +371,7 @@ grub_err_t
 grub_normal_parse_line (char *line, grub_reader_getline_t getline);
 
 static inline struct grub_script *
-grub_script_get (struct grub_script *script)
+grub_script_ref (struct grub_script *script)
 {
   if (script)
     script->refcnt++;
@@ -379,7 +379,7 @@ grub_script_get (struct grub_script *script)
 }
 
 static inline void
-grub_script_put (struct grub_script *script)
+grub_script_unref (struct grub_script *script)
 {
   if (! script)
     return;
diff --git a/script/execute.c b/script/execute.c
index b9538c29b..932be6635 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -201,7 +201,7 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
 		  grub_script_argv_append (&result, arg->str) ||
 		  grub_script_argv_append (&result, "}"))
 		goto fail;
-	      result.script = grub_script_get (arg->script);
+	      result.script = arg->script;
 	      break;
 
 	    case GRUB_SCRIPT_ARG_TYPE_TEXT:
diff --git a/script/main.c b/script/main.c
index 19ce88c43..620d9deac 100644
--- a/script/main.c
+++ b/script/main.c
@@ -34,7 +34,7 @@ grub_normal_parse_line (char *line, grub_reader_getline_t getline)
       grub_script_execute (parsed_script);
 
       /* The parsed script was executed, throw it away.  */
-      grub_script_put (parsed_script);
+      grub_script_unref (parsed_script);
     }
 
   return grub_errno;
diff --git a/script/parser.y b/script/parser.y
index ce97ab174..3faaf4736 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -208,9 +208,9 @@ block: "{"
 	   /* restore old scripts; append $$->script to siblings. */
 	   state->scripts = $<scripts>2 ?: $$->script;
 	   if (s) {
-	     while (s->siblings)
-	       s = s->siblings;
-	     s->siblings = $$->script;
+	     while (s->next_siblings)
+	       s = s->next_siblings;
+	     s->next_siblings = $$->script;
 	   }
 	 }
 
@@ -243,11 +243,12 @@ grubcmd: word arguments0 block0
 	   if ($3)
 	     x = grub_script_add_arglist (state, $2, $3);
 
-           if ($1 && x) {
-             $1->next = x;
-             $1->argcount += x->argcount;
-             x->argcount = 0;
-           }
+           if ($1 && x)
+	     {
+	       $1->next = x;
+	       $1->argcount += x->argcount;
+	       x->argcount = 0;
+	     }
            $$ = grub_script_create_cmdline (state, $1);
          }
 ;
diff --git a/script/script.c b/script/script.c
index 8d856c493..25a34be0d 100644
--- a/script/script.c
+++ b/script/script.c
@@ -105,8 +105,8 @@ grub_script_free (struct grub_script *script)
 
   s = script->children;
   while (s) {
-    t = s->siblings;
-    grub_script_put (s);
+    t = s->next_siblings;
+    grub_script_unref (s);
     s = t;
   }
   grub_free (script);
@@ -355,8 +355,8 @@ grub_script_create (struct grub_script_cmd *cmd, struct grub_script_mem *mem)
   parsed->mem = mem;
   parsed->cmd = cmd;
   parsed->refcnt = 0;
-  parsed->siblings = 0;
   parsed->children = 0;
+  parsed->next_siblings = 0;
 
   return parsed;
 }
diff --git a/tests/grub_script_blockarg.in b/tests/grub_script_blockarg.in
new file mode 100644
index 000000000..783cee8e0
--- /dev/null
+++ b/tests/grub_script_blockarg.in
@@ -0,0 +1,41 @@
+#! /bin/bash
+
+# Run GRUB script in a Qemu instance
+# Copyright (C) 2010  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/>.
+
+error_if_not () {
+    if test "$1" != "$2"; then
+	echo "[$1]" != "[$2]"
+	exit 1
+    fi
+}
+
+cmd='test_blockarg { true }'
+v=`echo "$cmd" | @builddir@/grub-shell`
+error_if_not "$v" '{ true }'
+
+tmp=`mktemp`
+cmd='test_blockarg { test_blockarg { true } }'
+echo "$cmd" | @builddir@/grub-shell >$tmp
+error_if_not "`head -n1 $tmp|tail -n1`" '{ test_blockarg { true } }'
+error_if_not "`head -n2 $tmp|tail -n1`" '{ true }'
+
+cmd='test_blockarg { test_blockarg { test_blockarg { true } }; test_blockarg { true } }'
+echo "$cmd" | @builddir@/grub-shell >$tmp
+error_if_not "`head -n1 $tmp|tail -n1`" '{ test_blockarg { test_blockarg { true } }; test_blockarg { true } }'
+error_if_not "`head -n2 $tmp|tail -n1`" '{ test_blockarg { true } }'
+error_if_not "`head -n3 $tmp|tail -n1`" '{ true }'
+error_if_not "`head -n4 $tmp|tail -n1`" '{ true }'
diff --git a/tests/test_blockarg.c b/tests/test_blockarg.c
new file mode 100644
index 000000000..bb6f3c3f0
--- /dev/null
+++ b/tests/test_blockarg.c
@@ -0,0 +1,51 @@
+/* test_blockarg.c - print and execute block argument  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/err.h>
+#include <grub/misc.h>
+#include <grub/i18n.h>
+#include <grub/extcmd.h>
+#include <grub/script_sh.h>
+
+static grub_err_t
+test_blockarg (grub_extcmd_context_t ctxt, int argc, char **args)
+{
+  if (! ctxt->script)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no block parameter");
+
+  grub_printf ("%s\n", args[argc - 1]);
+  grub_script_execute (ctxt->script);
+  return GRUB_ERR_NONE;
+}
+
+static grub_extcmd_t cmd;
+
+GRUB_MOD_INIT(test_blockarg)
+{
+  cmd = grub_register_extcmd ("test_blockarg", test_blockarg,
+			      GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_BLOCKS,
+			      N_("BLOCK"),
+			      N_("Print and execute block argument."), 0);
+}
+
+GRUB_MOD_FINI(test_blockarg)
+{
+  grub_unregister_extcmd (cmd);
+}

From cf0c775ed41b7ee256ef496588f5ee2871d63dac Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 10 Aug 2010 13:43:43 +0200
Subject: [PATCH 1349/1628] 	* include/grub/vga.h (grub_vga_gr_write): Add
 GRUB_MACHINE_PCI_IO_BASE. 	(grub_vga_gr_read): Likewise. 
 (grub_vga_cr_write): Likewise. 	(grub_vga_cr_read): Likewise. 
 (grub_vga_sr_write): Likewise. 	(grub_vga_sr_read): Likewise. 
 (grub_vga_palette_read): Likewise. 	(grub_vga_palette_write): Likewise. 
 * video/sm712.c (GRUB_SM712_REG_BASE): New definition. 
 (grub_sm712_sr_read): New function. 	(grub_video_sm712_setup): Use
 grub_vga_sr_write and grub_sm712_sr_read. 	* video/sm712_init.c
 (sm712_init): Substract GRUB_MACHINE_PCI_IO_BASE.

---
 ChangeLog          |   15 +
 include/grub/vga.h |   41 +-
 video/sm712.c      |   35 +-
 video/sm712_init.c | 1068 ++++++++++++++++++++++----------------------
 4 files changed, 589 insertions(+), 570 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b0cbd54a0..0829eb83e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/vga.h (grub_vga_gr_write): Add GRUB_MACHINE_PCI_IO_BASE.
+	(grub_vga_gr_read): Likewise.
+	(grub_vga_cr_write): Likewise.
+	(grub_vga_cr_read): Likewise.
+	(grub_vga_sr_write): Likewise.
+	(grub_vga_sr_read): Likewise.
+	(grub_vga_palette_read): Likewise.
+	(grub_vga_palette_write): Likewise.
+	* video/sm712.c (GRUB_SM712_REG_BASE): New definition.
+	(grub_sm712_sr_read): New function.
+	(grub_video_sm712_setup): Use grub_vga_sr_write and grub_sm712_sr_read.
+	* video/sm712_init.c (sm712_init): Substract GRUB_MACHINE_PCI_IO_BASE.
+
 2010-08-09  Robert Millan  <rmh@gnu.org>
 
 	* kern/emu/misc.c (grub_make_system_path_relative_to_its_root): Filter
diff --git a/include/grub/vga.h b/include/grub/vga.h
index d4a1523a7..0ca56e37f 100644
--- a/include/grub/vga.h
+++ b/include/grub/vga.h
@@ -132,64 +132,63 @@ enum
 static inline void
 grub_vga_gr_write (grub_uint8_t val, grub_uint8_t addr)
 {
-  grub_outb (addr, GRUB_VGA_IO_GR_INDEX);
-  grub_outb (val, GRUB_VGA_IO_GR_DATA);
+  grub_outb (addr, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_GR_INDEX);
+  grub_outb (val, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_GR_DATA);
 }
 
 static inline grub_uint8_t
 grub_vga_gr_read (grub_uint8_t addr)
 {
-  grub_outb (addr, GRUB_VGA_IO_GR_INDEX);
-  return grub_inb (GRUB_VGA_IO_GR_DATA);
+  grub_outb (addr, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_GR_INDEX);
+  return grub_inb (GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_GR_DATA);
 }
 
 static inline void
 grub_vga_cr_write (grub_uint8_t val, grub_uint8_t addr)
 {
-  grub_outb (addr, GRUB_VGA_IO_CR_INDEX);
-  grub_outb (val, GRUB_VGA_IO_CR_DATA);
+  grub_outb (addr, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_CR_INDEX);
+  grub_outb (val, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_CR_DATA);
 }
 
 static inline grub_uint8_t
 grub_vga_cr_read (grub_uint8_t addr)
 {
-  grub_outb (addr, GRUB_VGA_IO_CR_INDEX);
-  return grub_inb (GRUB_VGA_IO_CR_DATA);
+  grub_outb (addr, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_CR_INDEX);
+  return grub_inb (GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_CR_DATA);
 }
 
 static inline void
 grub_vga_sr_write (grub_uint8_t val, grub_uint8_t addr)
 {
-  grub_outb (addr, GRUB_VGA_IO_SR_INDEX);
-  grub_outb (val, GRUB_VGA_IO_SR_DATA);
+  grub_outb (addr, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_SR_INDEX);
+  grub_outb (val, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_SR_DATA);
 }
 
 static inline grub_uint8_t
 grub_vga_sr_read (grub_uint8_t addr)
 {
-  grub_outb (addr, GRUB_VGA_IO_SR_INDEX);
-  return grub_inb (GRUB_VGA_IO_SR_DATA);
+  grub_outb (addr, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_SR_INDEX);
+  return grub_inb (GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_SR_DATA);
 }
 
 static inline void
 grub_vga_palette_read (grub_uint8_t addr, grub_uint8_t *r, grub_uint8_t *g,
 		       grub_uint8_t *b)
 {
-  grub_outb (addr, GRUB_VGA_IO_PALLETTE_READ_INDEX);
-  *r = grub_inb (GRUB_VGA_IO_PALLETTE_DATA);
-  *g = grub_inb (GRUB_VGA_IO_PALLETTE_DATA);
-  *b = grub_inb (GRUB_VGA_IO_PALLETTE_DATA);
+  grub_outb (addr, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_PALLETTE_READ_INDEX);
+  *r = grub_inb (GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_PALLETTE_DATA);
+  *g = grub_inb (GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_PALLETTE_DATA);
+  *b = grub_inb (GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_PALLETTE_DATA);
 }
 
 static inline void
 grub_vga_palette_write (grub_uint8_t addr, grub_uint8_t r, grub_uint8_t g,
 			grub_uint8_t b)
 {
-  grub_outb (addr, GRUB_VGA_IO_PALLETTE_WRITE_INDEX);
-  grub_outb (r, GRUB_VGA_IO_PALLETTE_DATA);
-  grub_outb (g, GRUB_VGA_IO_PALLETTE_DATA);
-  grub_outb (b, GRUB_VGA_IO_PALLETTE_DATA);
+  grub_outb (addr, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_PALLETTE_WRITE_INDEX);
+  grub_outb (r, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_PALLETTE_DATA);
+  grub_outb (g, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_PALLETTE_DATA);
+  grub_outb (b, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_PALLETTE_DATA);
 }
 
-
 #endif
diff --git a/video/sm712.c b/video/sm712.c
index a58032c42..db7494a62 100644
--- a/video/sm712.c
+++ b/video/sm712.c
@@ -26,10 +26,12 @@
 #include <grub/video.h>
 #include <grub/video_fb.h>
 #include <grub/pci.h>
+#include <grub/vga.h>
 
 #include "sm712_init.c"
 
 #define GRUB_SM712_TOTAL_MEMORY_SPACE  0x700400
+#define GRUB_SM712_REG_BASE 0x700000
 
 static struct
 {
@@ -61,6 +63,15 @@ grub_video_sm712_video_fini (void)
   return grub_video_fb_fini ();
 }
 
+static inline grub_uint8_t
+grub_sm712_sr_read (grub_uint8_t addr)
+{
+  *(volatile grub_uint8_t *) (framebuffer.ptr + GRUB_SM712_REG_BASE
+			      + GRUB_VGA_IO_SR_INDEX) = addr;
+  return *(volatile grub_uint8_t *) (framebuffer.ptr + GRUB_SM712_REG_BASE
+				     + GRUB_VGA_IO_SR_DATA);
+}
+
 static grub_err_t
 grub_video_sm712_setup (unsigned int width, unsigned int height,
 			unsigned int mode_type, unsigned int mode_mask __attribute__ ((unused)))
@@ -148,8 +159,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
   framebuffer.mapped = 1;
 
   /* Initialise SM712.  */
-  grub_outb (0x18, GRUB_MACHINE_PCI_IO_BASE + 0x3c4);
-  grub_outb (0x11, GRUB_MACHINE_PCI_IO_BASE + 0x3c5);
+  grub_vga_sr_write (0x11, 0x18);
 
   /* Prevent garbage from appearing on the screen.  */
   grub_memset (framebuffer.ptr, 0, 
@@ -159,26 +169,27 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
     switch (sm712_init[i].directive)
       {
       case 1:
-	*(volatile grub_uint8_t *) ((char *) framebuffer.ptr 
+	*(volatile grub_uint8_t *) ((char *) framebuffer.ptr
+				    + GRUB_SM712_REG_BASE
 				    + sm712_init[i].addr) = sm712_init[i].val;
 	break;
       case -1:
 	{
 	  grub_uint8_t val = *(volatile grub_uint8_t *) 
-	    ((char *) framebuffer.ptr + sm712_init[i].addr);
+	    ((char *) framebuffer.ptr + GRUB_SM712_REG_BASE
+	     + sm712_init[i].addr);
 	  (void) val;
 	}
 	break;
-      case 2:
-	*(volatile grub_uint16_t *) ((char *) framebuffer.ptr 
-				     + sm712_init[i].addr) = sm712_init[i].val;
-	break;
-      case 4:
-	*(volatile grub_uint32_t *) ((char *) framebuffer.ptr 
-				     + sm712_init[i].addr) = sm712_init[i].val;
-	break;
       }
 
+  *(volatile grub_uint32_t *) ((char *) framebuffer.ptr + 0x40c00c) = 0;
+  *(volatile grub_uint32_t *) ((char *) framebuffer.ptr + 0x40c040) = 0;
+  *(volatile grub_uint32_t *) ((char *) framebuffer.ptr + 0x40c000) = 0x20000;
+  *(volatile grub_uint32_t *) ((char *) framebuffer.ptr + 0x40c010) = 0x1020100;
+
+  (void) grub_sm712_sr_read (0x16);
+
   err = grub_video_fb_create_render_target_from_pointer (&framebuffer.render_target, &framebuffer.mode_info, framebuffer.ptr);
 
   if (err)
diff --git a/video/sm712_init.c b/video/sm712_init.c
index 02c64c453..58dbbbbf9 100644
--- a/video/sm712_init.c
+++ b/video/sm712_init.c
@@ -6,541 +6,535 @@ static struct
   grub_uint32_t val;
 } sm712_init[] =
 {
-  {1, 0x7003c4, 0x21},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x62},
-  {1, 0x7003c5, 0x7a},
-  {1, 0x7003c4, 0x6a},
-  {1, 0x7003c5, 0x16},
-  {1, 0x7003c4, 0x6b},
-  {1, 0x7003c5, 0x2},
-  {1, 0x7003c6, 0x0},
-  {1, 0x7003c4, 0x0},
-  {1, 0x7003c5, 0x1},
-  {1, 0x7003c2, 0xeb},
-  {1, 0x7003c4, 0x0},
-  {1, 0x7003c5, 0x3},
-  {1, 0x7003c4, 0x1},
-  {1, 0x7003c5, 0x1},
-  {1, 0x7003c4, 0x2},
-  {1, 0x7003c5, 0xf},
-  {1, 0x7003c4, 0x3},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x4},
-  {1, 0x7003c5, 0xe},
-  {1, 0x7003c4, 0x10},
-  {1, 0x7003c5, 0xc8},
-  {1, 0x7003c4, 0x11},
-  {1, 0x7003c5, 0x40},
-  {1, 0x7003c4, 0x12},
-  {1, 0x7003c5, 0x14},
-  {1, 0x7003c4, 0x13},
-  {1, 0x7003c5, 0x60},
-  {1, 0x7003c4, 0x14},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x15},
-  {1, 0x7003c5, 0xa},
-  {1, 0x7003c4, 0x16},
-  {1, 0x7003c5, 0x92},
-  {1, 0x7003c4, 0x17},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x18},
-  {1, 0x7003c5, 0x51},
-  {1, 0x7003c4, 0x19},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x1a},
-  {1, 0x7003c5, 0x1},
-  {1, 0x7003c4, 0x1b},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x1c},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x1d},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x1e},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x1f},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x20},
-  {1, 0x7003c5, 0xc4},
-  {1, 0x7003c4, 0x21},
-  {1, 0x7003c5, 0x30},
-  {1, 0x7003c4, 0x22},
-  {1, 0x7003c5, 0x2},
-  {1, 0x7003c4, 0x23},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x24},
-  {1, 0x7003c5, 0x1},
-  {1, 0x7003c4, 0x30},
-  {1, 0x7003c5, 0x28},
-  {1, 0x7003c4, 0x31},
-  {1, 0x7003c5, 0x3},
-  {1, 0x7003c4, 0x32},
-  {1, 0x7003c5, 0x24},
-  {1, 0x7003c4, 0x33},
-  {1, 0x7003c5, 0x9},
-  {1, 0x7003c4, 0x34},
-  {1, 0x7003c5, 0xc0},
-  {1, 0x7003c4, 0x35},
-  {1, 0x7003c5, 0x3a},
-  {1, 0x7003c4, 0x36},
-  {1, 0x7003c5, 0x3a},
-  {1, 0x7003c4, 0x37},
-  {1, 0x7003c5, 0x3a},
-  {1, 0x7003c4, 0x38},
-  {1, 0x7003c5, 0x3a},
-  {1, 0x7003c4, 0x39},
-  {1, 0x7003c5, 0x3a},
-  {1, 0x7003c4, 0x3a},
-  {1, 0x7003c5, 0x3a},
-  {1, 0x7003c4, 0x3b},
-  {1, 0x7003c5, 0x3a},
-  {1, 0x7003c4, 0x3c},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x3d},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x3e},
-  {1, 0x7003c5, 0x3},
-  {1, 0x7003c4, 0x3f},
-  {1, 0x7003c5, 0xff},
-  {1, 0x7003c4, 0x40},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x41},
-  {1, 0x7003c5, 0xfc},
-  {1, 0x7003c4, 0x42},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x43},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x44},
-  {1, 0x7003c5, 0x20},
-  {1, 0x7003c4, 0x45},
-  {1, 0x7003c5, 0x18},
-  {1, 0x7003c4, 0x46},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x47},
-  {1, 0x7003c5, 0xfc},
-  {1, 0x7003c4, 0x48},
-  {1, 0x7003c5, 0x20},
-  {1, 0x7003c4, 0x49},
-  {1, 0x7003c5, 0xc},
-  {1, 0x7003c4, 0x4a},
-  {1, 0x7003c5, 0x44},
-  {1, 0x7003c4, 0x4b},
-  {1, 0x7003c5, 0x20},
-  {1, 0x7003c4, 0x4c},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x4d},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x4e},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x4f},
-  {1, 0x7003c5, 0x3a},
-  {1, 0x7003c4, 0x50},
-  {1, 0x7003c5, 0x6},
-  {1, 0x7003c4, 0x51},
-  {1, 0x7003c5, 0x68},
-  {1, 0x7003c4, 0x52},
-  {1, 0x7003c5, 0xa7},
-  {1, 0x7003c4, 0x53},
-  {1, 0x7003c5, 0x7f},
-  {1, 0x7003c4, 0x54},
-  {1, 0x7003c5, 0x83},
-  {1, 0x7003c4, 0x55},
-  {1, 0x7003c5, 0x24},
-  {1, 0x7003c4, 0x56},
-  {1, 0x7003c5, 0xff},
-  {1, 0x7003c4, 0x57},
-  {1, 0x7003c5, 0x3},
-  {1, 0x7003c4, 0x58},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x59},
-  {1, 0x7003c5, 0x60},
-  {1, 0x7003c4, 0x5a},
-  {1, 0x7003c5, 0x59},
-  {1, 0x7003c4, 0x5b},
-  {1, 0x7003c5, 0x3a},
-  {1, 0x7003c4, 0x5c},
-  {1, 0x7003c5, 0x3a},
-  {1, 0x7003c4, 0x5d},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x5e},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x5f},
-  {1, 0x7003c5, 0x3a},
-  {1, 0x7003c4, 0x60},
-  {1, 0x7003c5, 0x1},
-  {1, 0x7003c4, 0x61},
-  {1, 0x7003c5, 0x80},
-  {1, 0x7003c4, 0x63},
-  {1, 0x7003c5, 0x1a},
-  {1, 0x7003c4, 0x64},
-  {1, 0x7003c5, 0x1a},
-  {1, 0x7003c4, 0x65},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x66},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x67},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x68},
-  {1, 0x7003c5, 0x50},
-  {1, 0x7003c4, 0x69},
-  {1, 0x7003c5, 0x3},
-  {1, 0x7003c4, 0x6c},
-  {1, 0x7003c5, 0x52},
-  {1, 0x7003c4, 0x6d},
-  {1, 0x7003c5, 0x89},
-  {1, 0x7003c4, 0x6e},
-  {1, 0x7003c5, 0x9},
-  {1, 0x7003c4, 0x6f},
-  {1, 0x7003c5, 0x2},
-  {1, 0x7003c4, 0x70},
-  {1, 0x7003c5, 0x4},
-  {1, 0x7003c4, 0x71},
-  {1, 0x7003c5, 0x45},
-  {1, 0x7003c4, 0x72},
-  {1, 0x7003c5, 0x30},
-  {1, 0x7003c4, 0x73},
-  {1, 0x7003c5, 0x30},
-  {1, 0x7003c4, 0x74},
-  {1, 0x7003c5, 0x40},
-  {1, 0x7003c4, 0x75},
-  {1, 0x7003c5, 0x20},
-  {1, 0x7003c4, 0x80},
-  {1, 0x7003c5, 0xff},
-  {1, 0x7003c4, 0x81},
-  {1, 0x7003c5, 0x7},
-  {1, 0x7003c4, 0x82},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x83},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x84},
-  {1, 0x7003c5, 0x8},
-  {1, 0x7003c4, 0x85},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x86},
-  {1, 0x7003c5, 0x42},
-  {1, 0x7003c4, 0x87},
-  {1, 0x7003c5, 0x3a},
-  {1, 0x7003c4, 0x88},
-  {1, 0x7003c5, 0x59},
-  {1, 0x7003c4, 0x89},
-  {1, 0x7003c5, 0x2},
-  {1, 0x7003c4, 0x8a},
-  {1, 0x7003c5, 0x44},
-  {1, 0x7003c4, 0x8b},
-  {1, 0x7003c5, 0x2},
-  {1, 0x7003c4, 0x8c},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x8d},
-  {1, 0x7003c5, 0xff},
-  {1, 0x7003c4, 0x8e},
-  {1, 0x7003c5, 0x3a},
-  {1, 0x7003c4, 0x8f},
-  {1, 0x7003c5, 0x3a},
-  {1, 0x7003c4, 0x90},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x91},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x92},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0x93},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0xa0},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0xa1},
-  {1, 0x7003c5, 0x10},
-  {1, 0x7003c4, 0xa2},
-  {1, 0x7003c5, 0x8},
-  {1, 0x7003c4, 0xa3},
-  {1, 0x7003c5, 0x0},
-  {1, 0x7003c4, 0xa4},
-  {1, 0x7003c5, 0x2},
-  {1, 0x7003c4, 0xa5},
-  {1, 0x7003c5, 0xed},
-  {1, 0x7003c4, 0xa6},
-  {1, 0x7003c5, 0xed},
-  {1, 0x7003c4, 0xa7},
-  {1, 0x7003c5, 0xed},
-  {1, 0x7003c4, 0xa8},
-  {1, 0x7003c5, 0x7b},
-  {1, 0x7003c4, 0xa9},
-  {1, 0x7003c5, 0xfb},
-  {1, 0x7003c4, 0xaa},
-  {1, 0x7003c5, 0xff},
-  {1, 0x7003c4, 0xab},
-  {1, 0x7003c5, 0xff},
-  {1, 0x7003c4, 0xac},
-  {1, 0x7003c5, 0x97},
-  {1, 0x7003c4, 0xad},
-  {1, 0x7003c5, 0xef},
-  {1, 0x7003c4, 0xae},
-  {1, 0x7003c5, 0xbf},
-  {1, 0x7003c4, 0xaf},
-  {1, 0x7003c5, 0xdf},
-  {1, 0x7003ce, 0x0},
-  {1, 0x7003cf, 0x0},
-  {1, 0x7003ce, 0x1},
-  {1, 0x7003cf, 0x0},
-  {1, 0x7003ce, 0x2},
-  {1, 0x7003cf, 0x0},
-  {1, 0x7003ce, 0x3},
-  {1, 0x7003cf, 0x0},
-  {1, 0x7003ce, 0x4},
-  {1, 0x7003cf, 0x0},
-  {1, 0x7003ce, 0x5},
-  {1, 0x7003cf, 0x40},
-  {1, 0x7003ce, 0x6},
-  {1, 0x7003cf, 0x5},
-  {1, 0x7003ce, 0x7},
-  {1, 0x7003cf, 0xf},
-  {1, 0x7003ce, 0x8},
-  {1, 0x7003cf, 0xff},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0x0},
-  {-1, 0x7003c1, 0x3e},
-  {1, 0x7003c0, 0x0},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0x1},
-  {-1, 0x7003c1, 0x3b},
-  {1, 0x7003c0, 0x1},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0x2},
-  {-1, 0x7003c1, 0x3f},
-  {1, 0x7003c0, 0x2},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0x3},
-  {-1, 0x7003c1, 0x3f},
-  {1, 0x7003c0, 0x3},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0x4},
-  {-1, 0x7003c1, 0x3b},
-  {1, 0x7003c0, 0x4},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0x5},
-  {-1, 0x7003c1, 0x2f},
-  {1, 0x7003c0, 0x5},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0x6},
-  {-1, 0x7003c1, 0x3f},
-  {1, 0x7003c0, 0x6},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0x7},
-  {-1, 0x7003c1, 0x3f},
-  {1, 0x7003c0, 0x7},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0x8},
-  {-1, 0x7003c1, 0x3f},
-  {1, 0x7003c0, 0x8},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0x9},
-  {-1, 0x7003c1, 0x3d},
-  {1, 0x7003c0, 0x9},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0xa},
-  {-1, 0x7003c1, 0x1f},
-  {1, 0x7003c0, 0xa},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0xb},
-  {-1, 0x7003c1, 0x1f},
-  {1, 0x7003c0, 0xb},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0xc},
-  {-1, 0x7003c1, 0x3f},
-  {1, 0x7003c0, 0xc},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0xd},
-  {-1, 0x7003c1, 0x3f},
-  {1, 0x7003c0, 0xd},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0xe},
-  {-1, 0x7003c1, 0x3f},
-  {1, 0x7003c0, 0xe},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0xf},
-  {-1, 0x7003c1, 0x2e},
-  {1, 0x7003c0, 0xf},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0x10},
-  {-1, 0x7003c1, 0x0},
-  {1, 0x7003c0, 0x41},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0x11},
-  {-1, 0x7003c1, 0x0},
-  {1, 0x7003c0, 0x0},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0x12},
-  {-1, 0x7003c1, 0x0},
-  {1, 0x7003c0, 0xf},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0x13},
-  {-1, 0x7003c1, 0x0},
-  {1, 0x7003c0, 0x0},
-  {-1, 0x7003da, 0x5},
-  {1, 0x7003c0, 0x14},
-  {-1, 0x7003c1, 0x0},
-  {1, 0x7003c0, 0x0},
-  {1, 0x7003d4, 0x0},
-  {1, 0x7003d5, 0xa3},
-  {1, 0x7003d4, 0x1},
-  {1, 0x7003d5, 0x7f},
-  {1, 0x7003d4, 0x2},
-  {1, 0x7003d5, 0x7f},
-  {1, 0x7003d4, 0x3},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x4},
-  {1, 0x7003d5, 0x85},
-  {1, 0x7003d4, 0x5},
-  {1, 0x7003d5, 0x16},
-  {1, 0x7003d4, 0x6},
-  {1, 0x7003d5, 0x24},
-  {1, 0x7003d4, 0x7},
-  {1, 0x7003d5, 0xf5},
-  {1, 0x7003d4, 0x8},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x9},
-  {1, 0x7003d5, 0x60},
-  {1, 0x7003d4, 0xa},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0xb},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0xc},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0xd},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0xe},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0xf},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x10},
-  {1, 0x7003d5, 0x3},
-  {1, 0x7003d4, 0x11},
-  {1, 0x7003d5, 0x9},
-  {1, 0x7003d4, 0x12},
-  {1, 0x7003d5, 0xff},
-  {1, 0x7003d4, 0x13},
-  {1, 0x7003d5, 0x80},
-  {1, 0x7003d4, 0x14},
-  {1, 0x7003d5, 0x40},
-  {1, 0x7003d4, 0x15},
-  {1, 0x7003d5, 0xff},
-  {1, 0x7003d4, 0x16},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x17},
-  {1, 0x7003d5, 0xe3},
-  {1, 0x7003d4, 0x18},
-  {1, 0x7003d5, 0xff},
-  {1, 0x7003d4, 0x30},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x31},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x32},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x33},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x34},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x35},
-  {1, 0x7003d5, 0x80},
-  {1, 0x7003d4, 0x36},
-  {1, 0x7003d5, 0x2},
-  {1, 0x7003d4, 0x37},
-  {1, 0x7003d5, 0x20},
-  {1, 0x7003d4, 0x38},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x39},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x3a},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x3b},
-  {1, 0x7003d5, 0x40},
-  {1, 0x7003d4, 0x3c},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x3d},
-  {1, 0x7003d5, 0xff},
-  {1, 0x7003d4, 0x3e},
-  {1, 0x7003d5, 0x46},
-  {1, 0x7003d4, 0x3f},
-  {1, 0x7003d5, 0x91},
-  {1, 0x7003d4, 0x40},
-  {1, 0x7003d5, 0xa3},
-  {1, 0x7003d4, 0x41},
-  {1, 0x7003d5, 0x7f},
-  {1, 0x7003d4, 0x42},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x43},
-  {1, 0x7003d5, 0x86},
-  {1, 0x7003d4, 0x44},
-  {1, 0x7003d5, 0x15},
-  {1, 0x7003d4, 0x45},
-  {1, 0x7003d5, 0x24},
-  {1, 0x7003d4, 0x46},
-  {1, 0x7003d5, 0xff},
-  {1, 0x7003d4, 0x47},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x48},
-  {1, 0x7003d5, 0x1},
-  {1, 0x7003d4, 0x49},
-  {1, 0x7003d5, 0x7},
-  {1, 0x7003d4, 0x4a},
-  {1, 0x7003d5, 0xe5},
-  {1, 0x7003d4, 0x4b},
-  {1, 0x7003d5, 0x20},
-  {1, 0x7003d4, 0x4c},
-  {1, 0x7003d5, 0x7f},
-  {1, 0x7003d4, 0x4d},
-  {1, 0x7003d5, 0x57},
-  {1, 0x7003d4, 0x90},
-  {1, 0x7003d5, 0x55},
-  {1, 0x7003d4, 0x91},
-  {1, 0x7003d5, 0xd5},
-  {1, 0x7003d4, 0x92},
-  {1, 0x7003d5, 0x5d},
-  {1, 0x7003d4, 0x93},
-  {1, 0x7003d5, 0xdd},
-  {1, 0x7003d4, 0x94},
-  {1, 0x7003d5, 0x86},
-  {1, 0x7003d4, 0x95},
-  {1, 0x7003d5, 0x17},
-  {1, 0x7003d4, 0x96},
-  {1, 0x7003d5, 0x8e},
-  {1, 0x7003d4, 0x97},
-  {1, 0x7003d5, 0xaa},
-  {1, 0x7003d4, 0x98},
-  {1, 0x7003d5, 0x8a},
-  {1, 0x7003d4, 0x99},
-  {1, 0x7003d5, 0xa3},
-  {1, 0x7003d4, 0x9a},
-  {1, 0x7003d5, 0xde},
-  {1, 0x7003d4, 0x9b},
-  {1, 0x7003d5, 0xab},
-  {1, 0x7003d4, 0x9c},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x9d},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x9e},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0x9f},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0xa0},
-  {1, 0x7003d5, 0x2},
-  {1, 0x7003d4, 0xa1},
-  {1, 0x7003d5, 0x2},
-  {1, 0x7003d4, 0xa2},
-  {1, 0x7003d5, 0x2},
-  {1, 0x7003d4, 0xa3},
-  {1, 0x7003d5, 0x15},
-  {1, 0x7003d4, 0xa4},
-  {1, 0x7003d5, 0x2},
-  {1, 0x7003d4, 0xa5},
-  {1, 0x7003d5, 0x6},
-  {1, 0x7003d4, 0xa6},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003d4, 0xa7},
-  {1, 0x7003d5, 0x0},
-  {1, 0x7003c2, 0x67},
-  {4, 0x40c00c, 0x0},
-  {4, 0x40c040, 0x0},
-  {4, 0x40c000, 0x20000},
-  {4, 0x40c010, 0x1020100},
-  {1, 0x7003c4, 0x16},
-  {-1, 0x7003c5, 0x17}
+  {1, 0x3c4, 0x21},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x62},
+  {1, 0x3c5, 0x7a},
+  {1, 0x3c4, 0x6a},
+  {1, 0x3c5, 0x16},
+  {1, 0x3c4, 0x6b},
+  {1, 0x3c5, 0x2},
+  {1, 0x3c6, 0x0},
+  {1, 0x3c4, 0x0},
+  {1, 0x3c5, 0x1},
+  {1, 0x3c2, 0xeb},
+  {1, 0x3c4, 0x0},
+  {1, 0x3c5, 0x3},
+  {1, 0x3c4, 0x1},
+  {1, 0x3c5, 0x1},
+  {1, 0x3c4, 0x2},
+  {1, 0x3c5, 0xf},
+  {1, 0x3c4, 0x3},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x4},
+  {1, 0x3c5, 0xe},
+  {1, 0x3c4, 0x10},
+  {1, 0x3c5, 0xc8},
+  {1, 0x3c4, 0x11},
+  {1, 0x3c5, 0x40},
+  {1, 0x3c4, 0x12},
+  {1, 0x3c5, 0x14},
+  {1, 0x3c4, 0x13},
+  {1, 0x3c5, 0x60},
+  {1, 0x3c4, 0x14},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x15},
+  {1, 0x3c5, 0xa},
+  {1, 0x3c4, 0x16},
+  {1, 0x3c5, 0x92},
+  {1, 0x3c4, 0x17},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x18},
+  {1, 0x3c5, 0x51},
+  {1, 0x3c4, 0x19},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x1a},
+  {1, 0x3c5, 0x1},
+  {1, 0x3c4, 0x1b},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x1c},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x1d},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x1e},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x1f},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x20},
+  {1, 0x3c5, 0xc4},
+  {1, 0x3c4, 0x21},
+  {1, 0x3c5, 0x30},
+  {1, 0x3c4, 0x22},
+  {1, 0x3c5, 0x2},
+  {1, 0x3c4, 0x23},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x24},
+  {1, 0x3c5, 0x1},
+  {1, 0x3c4, 0x30},
+  {1, 0x3c5, 0x28},
+  {1, 0x3c4, 0x31},
+  {1, 0x3c5, 0x3},
+  {1, 0x3c4, 0x32},
+  {1, 0x3c5, 0x24},
+  {1, 0x3c4, 0x33},
+  {1, 0x3c5, 0x9},
+  {1, 0x3c4, 0x34},
+  {1, 0x3c5, 0xc0},
+  {1, 0x3c4, 0x35},
+  {1, 0x3c5, 0x3a},
+  {1, 0x3c4, 0x36},
+  {1, 0x3c5, 0x3a},
+  {1, 0x3c4, 0x37},
+  {1, 0x3c5, 0x3a},
+  {1, 0x3c4, 0x38},
+  {1, 0x3c5, 0x3a},
+  {1, 0x3c4, 0x39},
+  {1, 0x3c5, 0x3a},
+  {1, 0x3c4, 0x3a},
+  {1, 0x3c5, 0x3a},
+  {1, 0x3c4, 0x3b},
+  {1, 0x3c5, 0x3a},
+  {1, 0x3c4, 0x3c},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x3d},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x3e},
+  {1, 0x3c5, 0x3},
+  {1, 0x3c4, 0x3f},
+  {1, 0x3c5, 0xff},
+  {1, 0x3c4, 0x40},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x41},
+  {1, 0x3c5, 0xfc},
+  {1, 0x3c4, 0x42},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x43},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x44},
+  {1, 0x3c5, 0x20},
+  {1, 0x3c4, 0x45},
+  {1, 0x3c5, 0x18},
+  {1, 0x3c4, 0x46},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x47},
+  {1, 0x3c5, 0xfc},
+  {1, 0x3c4, 0x48},
+  {1, 0x3c5, 0x20},
+  {1, 0x3c4, 0x49},
+  {1, 0x3c5, 0xc},
+  {1, 0x3c4, 0x4a},
+  {1, 0x3c5, 0x44},
+  {1, 0x3c4, 0x4b},
+  {1, 0x3c5, 0x20},
+  {1, 0x3c4, 0x4c},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x4d},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x4e},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x4f},
+  {1, 0x3c5, 0x3a},
+  {1, 0x3c4, 0x50},
+  {1, 0x3c5, 0x6},
+  {1, 0x3c4, 0x51},
+  {1, 0x3c5, 0x68},
+  {1, 0x3c4, 0x52},
+  {1, 0x3c5, 0xa7},
+  {1, 0x3c4, 0x53},
+  {1, 0x3c5, 0x7f},
+  {1, 0x3c4, 0x54},
+  {1, 0x3c5, 0x83},
+  {1, 0x3c4, 0x55},
+  {1, 0x3c5, 0x24},
+  {1, 0x3c4, 0x56},
+  {1, 0x3c5, 0xff},
+  {1, 0x3c4, 0x57},
+  {1, 0x3c5, 0x3},
+  {1, 0x3c4, 0x58},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x59},
+  {1, 0x3c5, 0x60},
+  {1, 0x3c4, 0x5a},
+  {1, 0x3c5, 0x59},
+  {1, 0x3c4, 0x5b},
+  {1, 0x3c5, 0x3a},
+  {1, 0x3c4, 0x5c},
+  {1, 0x3c5, 0x3a},
+  {1, 0x3c4, 0x5d},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x5e},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x5f},
+  {1, 0x3c5, 0x3a},
+  {1, 0x3c4, 0x60},
+  {1, 0x3c5, 0x1},
+  {1, 0x3c4, 0x61},
+  {1, 0x3c5, 0x80},
+  {1, 0x3c4, 0x63},
+  {1, 0x3c5, 0x1a},
+  {1, 0x3c4, 0x64},
+  {1, 0x3c5, 0x1a},
+  {1, 0x3c4, 0x65},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x66},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x67},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x68},
+  {1, 0x3c5, 0x50},
+  {1, 0x3c4, 0x69},
+  {1, 0x3c5, 0x3},
+  {1, 0x3c4, 0x6c},
+  {1, 0x3c5, 0x52},
+  {1, 0x3c4, 0x6d},
+  {1, 0x3c5, 0x89},
+  {1, 0x3c4, 0x6e},
+  {1, 0x3c5, 0x9},
+  {1, 0x3c4, 0x6f},
+  {1, 0x3c5, 0x2},
+  {1, 0x3c4, 0x70},
+  {1, 0x3c5, 0x4},
+  {1, 0x3c4, 0x71},
+  {1, 0x3c5, 0x45},
+  {1, 0x3c4, 0x72},
+  {1, 0x3c5, 0x30},
+  {1, 0x3c4, 0x73},
+  {1, 0x3c5, 0x30},
+  {1, 0x3c4, 0x74},
+  {1, 0x3c5, 0x40},
+  {1, 0x3c4, 0x75},
+  {1, 0x3c5, 0x20},
+  {1, 0x3c4, 0x80},
+  {1, 0x3c5, 0xff},
+  {1, 0x3c4, 0x81},
+  {1, 0x3c5, 0x7},
+  {1, 0x3c4, 0x82},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x83},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x84},
+  {1, 0x3c5, 0x8},
+  {1, 0x3c4, 0x85},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x86},
+  {1, 0x3c5, 0x42},
+  {1, 0x3c4, 0x87},
+  {1, 0x3c5, 0x3a},
+  {1, 0x3c4, 0x88},
+  {1, 0x3c5, 0x59},
+  {1, 0x3c4, 0x89},
+  {1, 0x3c5, 0x2},
+  {1, 0x3c4, 0x8a},
+  {1, 0x3c5, 0x44},
+  {1, 0x3c4, 0x8b},
+  {1, 0x3c5, 0x2},
+  {1, 0x3c4, 0x8c},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x8d},
+  {1, 0x3c5, 0xff},
+  {1, 0x3c4, 0x8e},
+  {1, 0x3c5, 0x3a},
+  {1, 0x3c4, 0x8f},
+  {1, 0x3c5, 0x3a},
+  {1, 0x3c4, 0x90},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x91},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x92},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0x93},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0xa0},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0xa1},
+  {1, 0x3c5, 0x10},
+  {1, 0x3c4, 0xa2},
+  {1, 0x3c5, 0x8},
+  {1, 0x3c4, 0xa3},
+  {1, 0x3c5, 0x0},
+  {1, 0x3c4, 0xa4},
+  {1, 0x3c5, 0x2},
+  {1, 0x3c4, 0xa5},
+  {1, 0x3c5, 0xed},
+  {1, 0x3c4, 0xa6},
+  {1, 0x3c5, 0xed},
+  {1, 0x3c4, 0xa7},
+  {1, 0x3c5, 0xed},
+  {1, 0x3c4, 0xa8},
+  {1, 0x3c5, 0x7b},
+  {1, 0x3c4, 0xa9},
+  {1, 0x3c5, 0xfb},
+  {1, 0x3c4, 0xaa},
+  {1, 0x3c5, 0xff},
+  {1, 0x3c4, 0xab},
+  {1, 0x3c5, 0xff},
+  {1, 0x3c4, 0xac},
+  {1, 0x3c5, 0x97},
+  {1, 0x3c4, 0xad},
+  {1, 0x3c5, 0xef},
+  {1, 0x3c4, 0xae},
+  {1, 0x3c5, 0xbf},
+  {1, 0x3c4, 0xaf},
+  {1, 0x3c5, 0xdf},
+  {1, 0x3ce, 0x0},
+  {1, 0x3cf, 0x0},
+  {1, 0x3ce, 0x1},
+  {1, 0x3cf, 0x0},
+  {1, 0x3ce, 0x2},
+  {1, 0x3cf, 0x0},
+  {1, 0x3ce, 0x3},
+  {1, 0x3cf, 0x0},
+  {1, 0x3ce, 0x4},
+  {1, 0x3cf, 0x0},
+  {1, 0x3ce, 0x5},
+  {1, 0x3cf, 0x40},
+  {1, 0x3ce, 0x6},
+  {1, 0x3cf, 0x5},
+  {1, 0x3ce, 0x7},
+  {1, 0x3cf, 0xf},
+  {1, 0x3ce, 0x8},
+  {1, 0x3cf, 0xff},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0x0},
+  {-1, 0x3c1, 0x3e},
+  {1, 0x3c0, 0x0},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0x1},
+  {-1, 0x3c1, 0x3b},
+  {1, 0x3c0, 0x1},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0x2},
+  {-1, 0x3c1, 0x3f},
+  {1, 0x3c0, 0x2},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0x3},
+  {-1, 0x3c1, 0x3f},
+  {1, 0x3c0, 0x3},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0x4},
+  {-1, 0x3c1, 0x3b},
+  {1, 0x3c0, 0x4},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0x5},
+  {-1, 0x3c1, 0x2f},
+  {1, 0x3c0, 0x5},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0x6},
+  {-1, 0x3c1, 0x3f},
+  {1, 0x3c0, 0x6},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0x7},
+  {-1, 0x3c1, 0x3f},
+  {1, 0x3c0, 0x7},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0x8},
+  {-1, 0x3c1, 0x3f},
+  {1, 0x3c0, 0x8},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0x9},
+  {-1, 0x3c1, 0x3d},
+  {1, 0x3c0, 0x9},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0xa},
+  {-1, 0x3c1, 0x1f},
+  {1, 0x3c0, 0xa},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0xb},
+  {-1, 0x3c1, 0x1f},
+  {1, 0x3c0, 0xb},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0xc},
+  {-1, 0x3c1, 0x3f},
+  {1, 0x3c0, 0xc},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0xd},
+  {-1, 0x3c1, 0x3f},
+  {1, 0x3c0, 0xd},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0xe},
+  {-1, 0x3c1, 0x3f},
+  {1, 0x3c0, 0xe},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0xf},
+  {-1, 0x3c1, 0x2e},
+  {1, 0x3c0, 0xf},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0x10},
+  {-1, 0x3c1, 0x0},
+  {1, 0x3c0, 0x41},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0x11},
+  {-1, 0x3c1, 0x0},
+  {1, 0x3c0, 0x0},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0x12},
+  {-1, 0x3c1, 0x0},
+  {1, 0x3c0, 0xf},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0x13},
+  {-1, 0x3c1, 0x0},
+  {1, 0x3c0, 0x0},
+  {-1, 0x3da, 0x5},
+  {1, 0x3c0, 0x14},
+  {-1, 0x3c1, 0x0},
+  {1, 0x3c0, 0x0},
+  {1, 0x3d4, 0x0},
+  {1, 0x3d5, 0xa3},
+  {1, 0x3d4, 0x1},
+  {1, 0x3d5, 0x7f},
+  {1, 0x3d4, 0x2},
+  {1, 0x3d5, 0x7f},
+  {1, 0x3d4, 0x3},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x4},
+  {1, 0x3d5, 0x85},
+  {1, 0x3d4, 0x5},
+  {1, 0x3d5, 0x16},
+  {1, 0x3d4, 0x6},
+  {1, 0x3d5, 0x24},
+  {1, 0x3d4, 0x7},
+  {1, 0x3d5, 0xf5},
+  {1, 0x3d4, 0x8},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x9},
+  {1, 0x3d5, 0x60},
+  {1, 0x3d4, 0xa},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0xb},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0xc},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0xd},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0xe},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0xf},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x10},
+  {1, 0x3d5, 0x3},
+  {1, 0x3d4, 0x11},
+  {1, 0x3d5, 0x9},
+  {1, 0x3d4, 0x12},
+  {1, 0x3d5, 0xff},
+  {1, 0x3d4, 0x13},
+  {1, 0x3d5, 0x80},
+  {1, 0x3d4, 0x14},
+  {1, 0x3d5, 0x40},
+  {1, 0x3d4, 0x15},
+  {1, 0x3d5, 0xff},
+  {1, 0x3d4, 0x16},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x17},
+  {1, 0x3d5, 0xe3},
+  {1, 0x3d4, 0x18},
+  {1, 0x3d5, 0xff},
+  {1, 0x3d4, 0x30},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x31},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x32},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x33},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x34},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x35},
+  {1, 0x3d5, 0x80},
+  {1, 0x3d4, 0x36},
+  {1, 0x3d5, 0x2},
+  {1, 0x3d4, 0x37},
+  {1, 0x3d5, 0x20},
+  {1, 0x3d4, 0x38},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x39},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x3a},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x3b},
+  {1, 0x3d5, 0x40},
+  {1, 0x3d4, 0x3c},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x3d},
+  {1, 0x3d5, 0xff},
+  {1, 0x3d4, 0x3e},
+  {1, 0x3d5, 0x46},
+  {1, 0x3d4, 0x3f},
+  {1, 0x3d5, 0x91},
+  {1, 0x3d4, 0x40},
+  {1, 0x3d5, 0xa3},
+  {1, 0x3d4, 0x41},
+  {1, 0x3d5, 0x7f},
+  {1, 0x3d4, 0x42},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x43},
+  {1, 0x3d5, 0x86},
+  {1, 0x3d4, 0x44},
+  {1, 0x3d5, 0x15},
+  {1, 0x3d4, 0x45},
+  {1, 0x3d5, 0x24},
+  {1, 0x3d4, 0x46},
+  {1, 0x3d5, 0xff},
+  {1, 0x3d4, 0x47},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x48},
+  {1, 0x3d5, 0x1},
+  {1, 0x3d4, 0x49},
+  {1, 0x3d5, 0x7},
+  {1, 0x3d4, 0x4a},
+  {1, 0x3d5, 0xe5},
+  {1, 0x3d4, 0x4b},
+  {1, 0x3d5, 0x20},
+  {1, 0x3d4, 0x4c},
+  {1, 0x3d5, 0x7f},
+  {1, 0x3d4, 0x4d},
+  {1, 0x3d5, 0x57},
+  {1, 0x3d4, 0x90},
+  {1, 0x3d5, 0x55},
+  {1, 0x3d4, 0x91},
+  {1, 0x3d5, 0xd5},
+  {1, 0x3d4, 0x92},
+  {1, 0x3d5, 0x5d},
+  {1, 0x3d4, 0x93},
+  {1, 0x3d5, 0xdd},
+  {1, 0x3d4, 0x94},
+  {1, 0x3d5, 0x86},
+  {1, 0x3d4, 0x95},
+  {1, 0x3d5, 0x17},
+  {1, 0x3d4, 0x96},
+  {1, 0x3d5, 0x8e},
+  {1, 0x3d4, 0x97},
+  {1, 0x3d5, 0xaa},
+  {1, 0x3d4, 0x98},
+  {1, 0x3d5, 0x8a},
+  {1, 0x3d4, 0x99},
+  {1, 0x3d5, 0xa3},
+  {1, 0x3d4, 0x9a},
+  {1, 0x3d5, 0xde},
+  {1, 0x3d4, 0x9b},
+  {1, 0x3d5, 0xab},
+  {1, 0x3d4, 0x9c},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x9d},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x9e},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0x9f},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0xa0},
+  {1, 0x3d5, 0x2},
+  {1, 0x3d4, 0xa1},
+  {1, 0x3d5, 0x2},
+  {1, 0x3d4, 0xa2},
+  {1, 0x3d5, 0x2},
+  {1, 0x3d4, 0xa3},
+  {1, 0x3d5, 0x15},
+  {1, 0x3d4, 0xa4},
+  {1, 0x3d5, 0x2},
+  {1, 0x3d4, 0xa5},
+  {1, 0x3d5, 0x6},
+  {1, 0x3d4, 0xa6},
+  {1, 0x3d5, 0x0},
+  {1, 0x3d4, 0xa7},
+  {1, 0x3d5, 0x0},
+  {1, 0x3c2, 0x67},
 };

From 2764da3ba20d7a5a1cf9d1b905810cb885937cfb Mon Sep 17 00:00:00 2001
From: Yves Blusseau <blusseau@zetam.org>
Date: Tue, 10 Aug 2010 16:32:48 +0200
Subject: [PATCH 1350/1628] 2010-08-10  Yves Blusseau  <blusseau@zetam.org>

    * util/grub-macho2img.c (main): fix typo
---
 ChangeLog             | 4 ++++
 util/grub-macho2img.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0829eb83e..86f3246bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-10  Yves Blusseau  <blusseau@zetam.org>
+
+	* util/grub-macho2img.c (main): fix typo
+
 2010-08-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/vga.h (grub_vga_gr_write): Add GRUB_MACHINE_PCI_IO_BASE.
diff --git a/util/grub-macho2img.c b/util/grub-macho2img.c
index 8683587be..23ffafb04 100644
--- a/util/grub-macho2img.c
+++ b/util/grub-macho2img.c
@@ -79,7 +79,7 @@ main (int argc, char **argv)
       fclose (in);
       fclose (out);
       free (buf);
-      printf ("Invalid Mach-O fle\n");
+      printf ("Invalid Mach-O file\n");
       return 4;
     }
   curcmd = (struct grub_macho_segment32 *) (buf + sizeof (*head));

From f0206638bf28aa05a8971cb9318a3e126233a6bc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 11 Aug 2010 04:00:06 +0200
Subject: [PATCH 1351/1628] 	* include/grub/vga.h: Add missing grub/pci.h
 include.

---
 ChangeLog          | 4 ++++
 include/grub/vga.h | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 86f3246bd..1f5efd32a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/vga.h: Add missing grub/pci.h include.
+
 2010-08-10  Yves Blusseau  <blusseau@zetam.org>
 
 	* util/grub-macho2img.c (main): fix typo
diff --git a/include/grub/vga.h b/include/grub/vga.h
index 0ca56e37f..5f321d589 100644
--- a/include/grub/vga.h
+++ b/include/grub/vga.h
@@ -19,6 +19,8 @@
 #ifndef GRUB_VGA_HEADER
 #define GRUB_VGA_HEADER	1
 
+#include <grub/pci.h>
+
 enum
   {
     GRUB_VGA_IO_ARX = 0x3c0,

From f947ab49b03350df958528214304ccafd8599b71 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 11 Aug 2010 04:18:07 +0200
Subject: [PATCH 1352/1628] 	Remove the dump of sm712 initialisation
 sequence.

	* include/grub/pci.h (GRUB_PCI_CLASS_SUBCLASS_VGA): New const.
	* include/grub/vga.h (GRUB_VGA_IO_ARX_READ): New register.
	(GRUB_VGA_IO_MISC_WRITE): Likewise.
	(GRUB_VGA_CR_*): Added many registers.
	(GRUB_VGA_SR_*): Likewise.
	(GRUB_VGA_GR_*): Likewise.
	(grub_vga_write_arx): New function.
	(grub_video_hw_config): New struct.
	(grub_vga_set_geometry): New function.
	* kern/i386/qemu/init.c (load_palette): Use grub_vga_write_arx and
	GRUB_PCI_CLASS_SUBCLASS_VGA.
	* video/cirrus.c (grub_video_cirrus_setup): Use grub_vga_set_geometry.
	* video/sm712.c (grub_sm712_write_reg): New function
	(grub_sm712_read_reg): Likewise.
	(grub_sm712_sr_write): Likewise.
	(grub_sm712_gr_write): Likewise.
	(grub_sm712_cr_write): Likewise.
	(grub_sm712_write_arx): Likewise.
	(grub_sm712_cr_shadow_write): Likewise.
	(grub_sm712_write_dda_lookup): Likewise.
	(grub_video_sm712_setup): Initialise the video rather then
	blindly replay the dump.
	(main) [TEST]: Add a routine to be able to compile as standalone for
	tests.
	* video/sm712_init.c (sm712_init): Removed.
	(sm712_sr_seq1): New array.
	(sm712_sr_seq2): Likewise.
---
 ChangeLog             |  32 +++
 include/grub/pci.h    |   1 +
 include/grub/vga.h    | 183 +++++++++++++-
 kern/i386/qemu/init.c |  15 +-
 video/cirrus.c        |  35 +--
 video/sm712.c         | 558 ++++++++++++++++++++++++++++++++++++++++--
 video/sm712_init.c    | 552 +----------------------------------------
 7 files changed, 772 insertions(+), 604 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f5efd32a..5d9d7a759 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2010-08-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Remove the dump of sm712 initialisation sequence.
+
+	* include/grub/pci.h (GRUB_PCI_CLASS_SUBCLASS_VGA): New const.
+	* include/grub/vga.h (GRUB_VGA_IO_ARX_READ): New register.
+	(GRUB_VGA_IO_MISC_WRITE): Likewise.
+	(GRUB_VGA_CR_*): Added many registers.
+	(GRUB_VGA_SR_*): Likewise.
+	(GRUB_VGA_GR_*): Likewise.
+	(grub_vga_write_arx): New function.
+	(grub_video_hw_config): New struct.
+	(grub_vga_set_geometry): New function.
+	* kern/i386/qemu/init.c (load_palette): Use grub_vga_write_arx and
+	GRUB_PCI_CLASS_SUBCLASS_VGA.
+	* video/cirrus.c (grub_video_cirrus_setup): Use grub_vga_set_geometry.
+	* video/sm712.c (grub_sm712_write_reg): New function
+	(grub_sm712_read_reg): Likewise.
+	(grub_sm712_sr_write): Likewise.
+	(grub_sm712_gr_write): Likewise.
+	(grub_sm712_cr_write): Likewise.
+	(grub_sm712_write_arx): Likewise.
+	(grub_sm712_cr_shadow_write): Likewise.
+	(grub_sm712_write_dda_lookup): Likewise.
+	(grub_video_sm712_setup): Initialise the video rather then
+	blindly replay the dump.
+	(main) [TEST]: Add a routine to be able to compile as standalone for
+	tests.
+	* video/sm712_init.c (sm712_init): Removed.
+	(sm712_sr_seq1): New array.
+	(sm712_sr_seq2): Likewise.
+
 2010-08-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/vga.h: Add missing grub/pci.h include.
diff --git a/include/grub/pci.h b/include/grub/pci.h
index e6d6488f0..f34e3d907 100644
--- a/include/grub/pci.h
+++ b/include/grub/pci.h
@@ -80,6 +80,7 @@
 
 #define  GRUB_PCI_STATUS_DEVSEL_TIMING_SHIFT 9
 #define  GRUB_PCI_STATUS_DEVSEL_TIMING_MASK 0x0600
+#define  GRUB_PCI_CLASS_SUBCLASS_VGA  0x0300
 
 #ifndef ASM_FILE
 typedef grub_uint32_t grub_pci_id_t;
diff --git a/include/grub/vga.h b/include/grub/vga.h
index 5f321d589..7f112d83a 100644
--- a/include/grub/vga.h
+++ b/include/grub/vga.h
@@ -24,6 +24,8 @@
 enum
   {
     GRUB_VGA_IO_ARX = 0x3c0,
+    GRUB_VGA_IO_ARX_READ = 0x3c1,
+    GRUB_VGA_IO_MISC_WRITE = 0x3c2,
     GRUB_VGA_IO_SR_INDEX = 0x3c4,
     GRUB_VGA_IO_SR_DATA = 0x3c5,
     GRUB_VGA_IO_PIXEL_MASK = 0x3c6,
@@ -41,8 +43,15 @@ enum
 
 enum
   {
-    GRUB_VGA_CR_WIDTH = 0x01,
+    GRUB_VGA_CR_HTOTAL = 0x00,
+    GRUB_VGA_CR_HORIZ_END = 0x01,
+    GRUB_VGA_CR_HBLANK_START = 0x02,    
+    GRUB_VGA_CR_HBLANK_END = 0x03,    
+    GRUB_VGA_CR_HORIZ_SYNC_PULSE_START = 0x04,
+    GRUB_VGA_CR_HORIZ_SYNC_PULSE_END = 0x05,
+    GRUB_VGA_CR_VERT_TOTAL = 0x06,
     GRUB_VGA_CR_OVERFLOW = 0x07,
+    GRUB_VGA_CR_BYTE_PANNING = 0x08,
     GRUB_VGA_CR_CELL_HEIGHT = 0x09,
     GRUB_VGA_CR_CURSOR_START = 0x0a,
     GRUB_VGA_CR_CURSOR_END = 0x0b,
@@ -50,14 +59,71 @@ enum
     GRUB_VGA_CR_START_ADDR_LOW_REGISTER = 0x0d,
     GRUB_VGA_CR_CURSOR_ADDR_HIGH = 0x0e,
     GRUB_VGA_CR_CURSOR_ADDR_LOW = 0x0f,
+    GRUB_VGA_CR_VSYNC_START = 0x10,
     GRUB_VGA_CR_VSYNC_END = 0x11,
-    GRUB_VGA_CR_HEIGHT = 0x12,
+    GRUB_VGA_CR_VDISPLAY_END = 0x12,
     GRUB_VGA_CR_PITCH = 0x13,
+    GRUB_VGA_CR_UNDERLINE_LOCATION = 0x14,
+    GRUB_VGA_CR_VERTICAL_BLANK_START = 0x15,
+    GRUB_VGA_CR_VERTICAL_BLANK_END = 0x16,
     GRUB_VGA_CR_MODE = 0x17,
     GRUB_VGA_CR_LINE_COMPARE = 0x18,
   };
 
+enum
+  {
+    GRUB_VGA_CR_BYTE_PANNING_NORMAL = 0
+  };
+
+enum
+  {
+    GRUB_VGA_CR_UNDERLINE_LOCATION_DWORD_MODE = 0x40
+  };
+
+enum
+  {
+    GRUB_VGA_IO_MISC_COLOR = 0x01,
+    GRUB_VGA_IO_MISC_ENABLE_VRAM_ACCESS = 0x02,
+    GRUB_VGA_IO_MISC_EXTERNAL_CLOCK_0 = 0x08,
+    GRUB_VGA_IO_MISC_28MHZ = 0x04,
+    GRUB_VGA_IO_MISC_UPPER_64K = 0x20,
+    GRUB_VGA_IO_MISC_NEGATIVE_HORIZ_POLARITY = 0x40,
+    GRUB_VGA_IO_MISC_NEGATIVE_VERT_POLARITY = 0x80,
+  };
+
+enum
+  {
+    GRUB_VGA_ARX_MODE = 0x10,
+    GRUB_VGA_ARX_OVERSCAN = 0x11,
+    GRUB_VGA_ARX_COLOR_PLANE_ENABLE = 0x12,
+    GRUB_VGA_ARX_HORIZONTAL_PANNING = 0x13,
+    GRUB_VGA_ARX_COLOR_SELECT = 0x14
+  };
+
+enum
+  {
+    GRUB_VGA_ARX_MODE_TEXT = 0x00,
+    GRUB_VGA_ARX_MODE_GRAPHICS = 0x01,
+    GRUB_VGA_ARX_MODE_ENABLE_256COLOR = 0x40
+  };
+
 #define GRUB_VGA_CR_WIDTH_DIVISOR 8
+
+#define GRUB_VGA_CR_OVERFLOW_VERT_DISPLAY_ENABLE_END1_SHIFT 7
+#define GRUB_VGA_CR_OVERFLOW_VERT_DISPLAY_ENABLE_END1_MASK 0x02
+#define GRUB_VGA_CR_OVERFLOW_VERT_DISPLAY_ENABLE_END2_SHIFT 3
+#define GRUB_VGA_CR_OVERFLOW_VERT_DISPLAY_ENABLE_END2_MASK 0x40
+
+#define GRUB_VGA_CR_OVERFLOW_VERT_TOTAL1_SHIFT 8
+#define GRUB_VGA_CR_OVERFLOW_VERT_TOTAL1_MASK 0x01
+#define GRUB_VGA_CR_OVERFLOW_VERT_TOTAL2_SHIFT 4
+#define GRUB_VGA_CR_OVERFLOW_VERT_TOTAL2_MASK 0x20
+
+#define GRUB_VGA_CR_OVERFLOW_VSYNC_START1_SHIFT 6
+#define GRUB_VGA_CR_OVERFLOW_VSYNC_START1_MASK 0x04
+#define GRUB_VGA_CR_OVERFLOW_VSYNC_START2_SHIFT 2
+#define GRUB_VGA_CR_OVERFLOW_VSYNC_START2_MASK 0x80
+
 #define GRUB_VGA_CR_OVERFLOW_HEIGHT1_SHIFT 7
 #define GRUB_VGA_CR_OVERFLOW_HEIGHT1_MASK 0x02
 #define GRUB_VGA_CR_OVERFLOW_HEIGHT2_SHIFT 3
@@ -67,7 +133,9 @@ enum
 
 #define GRUB_VGA_CR_CELL_HEIGHT_LINE_COMPARE_MASK 0x40
 #define GRUB_VGA_CR_CELL_HEIGHT_LINE_COMPARE_SHIFT 3
-
+#define GRUB_VGA_CR_CELL_HEIGHT_VERTICAL_BLANK_MASK 0x20
+#define GRUB_VGA_CR_CELL_HEIGHT_VERTICAL_BLANK_SHIFT 4
+#define GRUB_VGA_CR_CELL_HEIGHT_DOUBLE_SCAN 0x80
 enum
   {
     GRUB_VGA_CR_CURSOR_START_DISABLE = (1 << 5)
@@ -79,17 +147,26 @@ enum
   {
     GRUB_VGA_CR_MODE_NO_CGA = 0x01,
     GRUB_VGA_CR_MODE_NO_HERCULES = 0x02,
+    GRUB_VGA_CR_MODE_ADDRESS_WRAP = 0x20,
     GRUB_VGA_CR_MODE_BYTE_MODE = 0x40,
     GRUB_VGA_CR_MODE_TIMING_ENABLE = 0x80
   };
 
 enum
   {
+    GRUB_VGA_SR_RESET = 0,
     GRUB_VGA_SR_CLOCKING_MODE = 1,
     GRUB_VGA_SR_MAP_MASK_REGISTER = 2,
+    GRUB_VGA_SR_CHAR_MAP_SELECT = 3,
     GRUB_VGA_SR_MEMORY_MODE = 4,
   };
 
+enum
+  {
+    GRUB_VGA_SR_RESET_ASYNC = 1,
+    GRUB_VGA_SR_RESET_SYNC = 2
+  };
+
 enum
   {
     GRUB_VGA_SR_CLOCKING_MODE_8_DOT_CLOCK = 1
@@ -98,19 +175,33 @@ enum
 enum
   {
     GRUB_VGA_SR_MEMORY_MODE_NORMAL = 0,
-    GRUB_VGA_SR_MEMORY_MODE_CHAIN4 = 8
+    GRUB_VGA_SR_MEMORY_MODE_EXTERNAL_VIDEO_MEMORY = 2,
+    GRUB_VGA_SR_MEMORY_MODE_SEQUENTIAL_ADDRESSING = 4,
+    GRUB_VGA_SR_MEMORY_MODE_CHAIN4 = 8,
   };
 
 enum
   {
+    GRUB_VGA_GR_SET_RESET_PLANE = 0,
+    GRUB_VGA_GR_SET_RESET_PLANE_ENABLE = 1,
+    GRUB_VGA_GR_COLOR_COMPARE = 2,
     GRUB_VGA_GR_DATA_ROTATE = 3,
     GRUB_VGA_GR_READ_MAP_REGISTER = 4,
     GRUB_VGA_GR_MODE = 5,
     GRUB_VGA_GR_GR6 = 6,
+    GRUB_VGA_GR_COLOR_COMPARE_DISABLE = 7,
     GRUB_VGA_GR_BITMASK = 8,
     GRUB_VGA_GR_MAX
   };
 
+#define GRUB_VGA_ALL_PLANES 0xf
+#define GRUB_VGA_NO_PLANES 0x0
+
+enum
+  {
+    GRUB_VGA_GR_DATA_ROTATE_NOP = 0
+  };
+
 enum
   {
     GRUB_VGA_TEXT_TEXT_PLANE = 0,
@@ -121,6 +212,7 @@ enum
 enum
   {
     GRUB_VGA_GR_GR6_GRAPHICS_MODE = 1,
+    GRUB_VGA_GR_GR6_MMAP_A0 = (1 << 2),
     GRUB_VGA_GR_GR6_MMAP_CGA = (3 << 2)
   };
 
@@ -128,6 +220,7 @@ enum
   {
     GRUB_VGA_GR_MODE_READ_MODE1 = 0x08,
     GRUB_VGA_GR_MODE_ODD_EVEN = 0x10,
+    GRUB_VGA_GR_MODE_ODD_EVEN_SHIFT = 0x20,
     GRUB_VGA_GR_MODE_256_COLOR = 0x40
   };
 
@@ -193,4 +286,86 @@ grub_vga_palette_write (grub_uint8_t addr, grub_uint8_t r, grub_uint8_t g,
   grub_outb (b, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_PALLETTE_DATA);
 }
 
+static inline void
+grub_vga_write_arx (grub_uint8_t val, grub_uint8_t addr)
+{
+  grub_inb (GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_INPUT_STATUS1_REGISTER);
+  grub_outb (addr, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_ARX);
+  grub_inb (GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_ARX_READ);
+  grub_outb (val, GRUB_MACHINE_PCI_IO_BASE + GRUB_VGA_IO_ARX);
+}
+
+struct grub_video_hw_config
+{
+  unsigned vertical_total;
+  unsigned vertical_blank_start;
+  unsigned vertical_blank_end;
+  unsigned vertical_sync_start;
+  unsigned vertical_sync_end;
+  unsigned line_compare;
+  unsigned vdisplay_end;
+  unsigned pitch;
+  unsigned horizontal_total;
+  unsigned horizontal_blank_start;
+  unsigned horizontal_blank_end;
+  unsigned horizontal_sync_pulse_start;
+  unsigned horizontal_sync_pulse_end;
+  unsigned horizontal_end;
+};
+  
+static inline void
+grub_vga_set_geometry (struct grub_video_hw_config *config,
+		       void (*cr_write) (grub_uint8_t val, grub_uint8_t addr))
+{
+  unsigned vertical_total = config->vertical_total - 2;
+  unsigned vertical_blank_start = config->vertical_blank_start - 1;
+  unsigned vdisplay_end = config->vdisplay_end - 1;
+  grub_uint8_t overflow, cell_height_reg;
+
+  /* Disable CR0-7 write protection.  */
+  cr_write (0, GRUB_VGA_CR_VSYNC_END);
+
+  overflow = ((vertical_total >> GRUB_VGA_CR_OVERFLOW_VERT_TOTAL1_SHIFT)
+	      & GRUB_VGA_CR_OVERFLOW_VERT_TOTAL1_MASK)
+    | ((vertical_total >> GRUB_VGA_CR_OVERFLOW_VERT_TOTAL2_SHIFT)
+       & GRUB_VGA_CR_OVERFLOW_VERT_TOTAL2_MASK)
+    | ((config->vertical_sync_start >> GRUB_VGA_CR_OVERFLOW_VSYNC_START2_SHIFT)
+       & GRUB_VGA_CR_OVERFLOW_VSYNC_START2_MASK)
+    | ((config->vertical_sync_start >> GRUB_VGA_CR_OVERFLOW_VSYNC_START1_SHIFT)
+       & GRUB_VGA_CR_OVERFLOW_VSYNC_START1_MASK)
+    | ((vdisplay_end >> GRUB_VGA_CR_OVERFLOW_VERT_DISPLAY_ENABLE_END1_SHIFT)
+       & GRUB_VGA_CR_OVERFLOW_VERT_DISPLAY_ENABLE_END1_MASK)
+    | ((vdisplay_end >> GRUB_VGA_CR_OVERFLOW_VERT_DISPLAY_ENABLE_END2_SHIFT)
+       & GRUB_VGA_CR_OVERFLOW_VERT_DISPLAY_ENABLE_END2_MASK)
+    | ((config->vertical_sync_start >> GRUB_VGA_CR_OVERFLOW_VSYNC_START1_SHIFT)
+       & GRUB_VGA_CR_OVERFLOW_VSYNC_START1_MASK)
+    | ((config->line_compare >> GRUB_VGA_CR_OVERFLOW_LINE_COMPARE_SHIFT)
+       & GRUB_VGA_CR_OVERFLOW_LINE_COMPARE_MASK);
+
+  cell_height_reg = ((vertical_blank_start
+		      >> GRUB_VGA_CR_CELL_HEIGHT_VERTICAL_BLANK_SHIFT)
+		     & GRUB_VGA_CR_CELL_HEIGHT_VERTICAL_BLANK_MASK)
+    | ((config->line_compare >> GRUB_VGA_CR_CELL_HEIGHT_LINE_COMPARE_SHIFT)
+       & GRUB_VGA_CR_CELL_HEIGHT_LINE_COMPARE_MASK);
+
+  cr_write (config->horizontal_total - 1, GRUB_VGA_CR_HTOTAL);
+  cr_write (config->horizontal_end - 1, GRUB_VGA_CR_HORIZ_END);
+  cr_write (config->horizontal_blank_start - 1, GRUB_VGA_CR_HBLANK_START);
+  cr_write (config->horizontal_blank_end, GRUB_VGA_CR_HBLANK_END);
+  cr_write (config->horizontal_sync_pulse_start,
+	    GRUB_VGA_CR_HORIZ_SYNC_PULSE_START);
+  cr_write (config->horizontal_sync_pulse_end,
+	    GRUB_VGA_CR_HORIZ_SYNC_PULSE_END);
+  cr_write (vertical_total & 0xff, GRUB_VGA_CR_VERT_TOTAL);
+  cr_write (overflow, GRUB_VGA_CR_OVERFLOW);
+  cr_write (cell_height_reg, GRUB_VGA_CR_CELL_HEIGHT);
+  cr_write (config->vertical_sync_start & 0xff, GRUB_VGA_CR_VSYNC_START);
+  cr_write (config->vertical_sync_end & 0x0f, GRUB_VGA_CR_VSYNC_END);
+  cr_write (vdisplay_end & 0xff, GRUB_VGA_CR_VDISPLAY_END);
+  cr_write (config->pitch & 0xff, GRUB_VGA_CR_PITCH);
+  cr_write (vertical_blank_start & 0xff, GRUB_VGA_CR_VERTICAL_BLANK_START);
+  cr_write (config->vertical_blank_end & 0xff, GRUB_VGA_CR_VERTICAL_BLANK_END);
+  cr_write (config->line_compare & 0xff, GRUB_VGA_CR_LINE_COMPARE);
+}
+
 #endif
diff --git a/kern/i386/qemu/init.c b/kern/i386/qemu/init.c
index 201ba3633..bd12953df 100644
--- a/kern/i386/qemu/init.c
+++ b/kern/i386/qemu/init.c
@@ -69,10 +69,7 @@ load_palette (void)
 {
   unsigned i;
   for (i = 0; i < 16; i++)
-    {
-      grub_outb (i, GRUB_VGA_IO_ARX);
-      grub_outb (i, GRUB_VGA_IO_ARX);
-    }
+    grub_vga_write_arx (i, i);
 
   for (i = 0; i < ARRAY_SIZE (colors); i++)
     grub_vga_palette_write (i, colors[i].r, colors[i].g, colors[i].b);
@@ -90,7 +87,7 @@ grub_qemu_init_cirrus (void)
       addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
       class = grub_pci_read (addr);
 
-      if (((class >> 16) & 0xffff) != 0x0300)
+      if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA)
 	return 0;
       
       /* FIXME: chooose addresses dynamically.  */
@@ -110,7 +107,7 @@ grub_qemu_init_cirrus (void)
 
   grub_pci_iterate (find_card);
 
-  grub_outb (1, 0x3c2);
+  grub_outb (GRUB_VGA_IO_MISC_COLOR, GRUB_VGA_IO_MISC_WRITE);
 
   load_font ();
 
@@ -137,10 +134,8 @@ grub_qemu_init_cirrus (void)
 
   load_palette ();
 
-  grub_outb (0x10, 0x3c0);
-  grub_outb (0, 0x3c1);
-  grub_outb (0x14, 0x3c0);
-  grub_outb (0, 0x3c1);
+  grub_vga_write_arx (GRUB_VGA_ARX_MODE_TEXT, GRUB_VGA_ARX_MODE);
+  grub_vga_write_arx (0, GRUB_VGA_ARX_COLOR_SELECT);
 
   grub_vga_sr_write (GRUB_VGA_SR_CLOCKING_MODE_8_DOT_CLOCK,
 		     GRUB_VGA_SR_CLOCKING_MODE);
diff --git a/video/cirrus.c b/video/cirrus.c
index ccbab9d15..b8b0142ad 100644
--- a/video/cirrus.c
+++ b/video/cirrus.c
@@ -334,43 +334,26 @@ grub_video_cirrus_setup (unsigned int width, unsigned int height,
     }
 
   {
-    int pitch_reg, overflow_reg = 0, line_compare = 0x3ff;
+    struct grub_video_hw_config config = {
+      .pitch = pitch / GRUB_VGA_CR_PITCH_DIVISOR,
+      .line_compare = 0x3ff,
+      .vdisplay_end = height - 1,
+      .horizontal_end = width / GRUB_VGA_CR_WIDTH_DIVISOR
+    };
     grub_uint8_t sr_ext = 0, hidden_dac = 0;
 
-    pitch_reg = pitch / GRUB_VGA_CR_PITCH_DIVISOR;
-
+    grub_vga_set_geometry (&config, grub_vga_cr_write);
+    
     grub_vga_gr_write (GRUB_VGA_GR_MODE_256_COLOR | GRUB_VGA_GR_MODE_READ_MODE1,
 		       GRUB_VGA_GR_MODE);
     grub_vga_gr_write (GRUB_VGA_GR_GR6_GRAPHICS_MODE, GRUB_VGA_GR_GR6);
     
     grub_vga_sr_write (GRUB_VGA_SR_MEMORY_MODE_NORMAL, GRUB_VGA_SR_MEMORY_MODE);
 
-    /* Disable CR0-7 write protection.  */
-    grub_vga_cr_write (0, GRUB_VGA_CR_VSYNC_END);
-
-    grub_vga_cr_write (width / GRUB_VGA_CR_WIDTH_DIVISOR - 1,
-		       GRUB_VGA_CR_WIDTH);
-    grub_vga_cr_write ((height - 1) & 0xff, GRUB_VGA_CR_HEIGHT);
-    overflow_reg |= (((height - 1) >> GRUB_VGA_CR_OVERFLOW_HEIGHT1_SHIFT) & 
-		     GRUB_VGA_CR_OVERFLOW_HEIGHT1_MASK)
-      | (((height - 1) >> GRUB_VGA_CR_OVERFLOW_HEIGHT2_SHIFT) & 
-	 GRUB_VGA_CR_OVERFLOW_HEIGHT2_MASK);
-
-    grub_vga_cr_write (pitch_reg & 0xff, GRUB_VGA_CR_PITCH);
-
-    grub_vga_cr_write (line_compare & 0xff, GRUB_VGA_CR_LINE_COMPARE);
-    overflow_reg |= (line_compare >> GRUB_VGA_CR_OVERFLOW_LINE_COMPARE_SHIFT)
-      & GRUB_VGA_CR_OVERFLOW_LINE_COMPARE_MASK;
-
-    grub_vga_cr_write (overflow_reg, GRUB_VGA_CR_OVERFLOW);
-
-    grub_vga_cr_write ((pitch_reg >> CIRRUS_CR_EXTENDED_DISPLAY_PITCH_SHIFT)
+    grub_vga_cr_write ((config.pitch >> CIRRUS_CR_EXTENDED_DISPLAY_PITCH_SHIFT)
 	      & CIRRUS_CR_EXTENDED_DISPLAY_PITCH_MASK,
 	      CIRRUS_CR_EXTENDED_DISPLAY);
 
-    grub_vga_cr_write ((line_compare >> GRUB_VGA_CR_CELL_HEIGHT_LINE_COMPARE_SHIFT)
-		       & GRUB_VGA_CR_CELL_HEIGHT_LINE_COMPARE_MASK, GRUB_VGA_CR_CELL_HEIGHT);
-
     grub_vga_cr_write (GRUB_VGA_CR_MODE_TIMING_ENABLE
 		       | GRUB_VGA_CR_MODE_BYTE_MODE
 		       | GRUB_VGA_CR_MODE_NO_HERCULES | GRUB_VGA_CR_MODE_NO_CGA,
diff --git a/video/sm712.c b/video/sm712.c
index db7494a62..60f2c9089 100644
--- a/video/sm712.c
+++ b/video/sm712.c
@@ -32,6 +32,162 @@
 
 #define GRUB_SM712_TOTAL_MEMORY_SPACE  0x700400
 #define GRUB_SM712_REG_BASE 0x700000
+#define GRUB_SM712_PCIID 0x0712126f
+
+enum
+  {
+    GRUB_SM712_SR_TV_CONTROL = 0x65,
+    GRUB_SM712_SR_RAM_LUT = 0x66,
+    GRUB_SM712_SR_CLOCK_CONTROL1 = 0x68,
+    GRUB_SM712_SR_CLOCK_CONTROL2 = 0x69,
+    GRUB_SM712_SR_VCLK_NUM = 0x6c,
+    GRUB_SM712_SR_VCLK_DENOM = 0x6d,
+    GRUB_SM712_SR_VCLK2_NUM = 0x6e,
+    GRUB_SM712_SR_VCLK2_DENOM = 0x6f,
+    GRUB_SM712_SR_POPUP_ICON_LOW = 0x80,
+    GRUB_SM712_SR_POPUP_ICON_HIGH = 0x81,
+    GRUB_SM712_SR_POPUP_ICON_CTRL = 0x82,
+    GRUB_SM712_SR_POPUP_ICON_COLOR1 = 0x84,
+    GRUB_SM712_SR_POPUP_ICON_COLOR2 = 0x85,
+    GRUB_SM712_SR_POPUP_ICON_COLOR3 = 0x86,
+
+    GRUB_SM712_SR_HW_CURSOR_UPPER_LEFT_X_LOW = 0x88,
+    GRUB_SM712_SR_HW_CURSOR_UPPER_LEFT_X_HIGH = 0x89,
+    GRUB_SM712_SR_HW_CURSOR_UPPER_LEFT_Y_LOW = 0x8a,
+    GRUB_SM712_SR_HW_CURSOR_UPPER_LEFT_Y_HIGH = 0x8b,
+    GRUB_SM712_SR_HW_CURSOR_FG_COLOR = 0x8c,
+    GRUB_SM712_SR_HW_CURSOR_BG_COLOR = 0x8d,
+
+    GRUB_SM712_SR_POPUP_ICON_X_LOW = 0x90,
+    GRUB_SM712_SR_POPUP_ICON_X_HIGH = 0x91,
+    GRUB_SM712_SR_POPUP_ICON_Y_LOW = 0x92,
+    GRUB_SM712_SR_POPUP_ICON_Y_HIGH = 0x93,
+    GRUB_SM712_SR_PANEL_HW_VIDEO_CONTROL = 0xa0,
+    GRUB_SM712_SR_PANEL_HW_VIDEO_COLOR_KEY_LOW = 0xa1,
+    GRUB_SM712_SR_PANEL_HW_VIDEO_COLOR_KEY_HIGH = 0xa2,
+    GRUB_SM712_SR_PANEL_HW_VIDEO_COLOR_KEY_MASK_LOW = 0xa3,
+    GRUB_SM712_SR_PANEL_HW_VIDEO_COLOR_KEY_MASK_HIGH = 0xa4,
+    GRUB_SM712_SR_PANEL_HW_VIDEO_RED_CONSTANT = 0xa5,
+    GRUB_SM712_SR_PANEL_HW_VIDEO_GREEN_CONSTANT = 0xa6,
+    GRUB_SM712_SR_PANEL_HW_VIDEO_BLUE_CONSTANT = 0xa7,
+    GRUB_SM712_SR_PANEL_HW_VIDEO_TOP_BOUNDARY = 0xa8,
+    GRUB_SM712_SR_PANEL_HW_VIDEO_LEFT_BOUNDARY = 0xa9,
+    GRUB_SM712_SR_PANEL_HW_VIDEO_BOTTOM_BOUNDARY = 0xaa,
+    GRUB_SM712_SR_PANEL_HW_VIDEO_RIGHT_BOUNDARY = 0xab,
+    GRUB_SM712_SR_PANEL_HW_VIDEO_TOP_LEFT_OVERFLOW_BOUNDARY = 0xac,
+    GRUB_SM712_SR_PANEL_HW_VIDEO_BOTTOM_RIGHT_OVERFLOW_BOUNDARY = 0xad,
+    GRUB_SM712_SR_PANEL_HW_VIDEO_VERTICAL_STRETCH_FACTOR = 0xae,
+    GRUB_SM712_SR_PANEL_HW_VIDEO_HORIZONTAL_STRETCH_FACTOR = 0xaf,
+  };
+enum
+  {
+    GRUB_SM712_SR_TV_CRT_SRAM = 0x00,
+    GRUB_SM712_SR_TV_LCD_SRAM = 0x08
+  };
+enum
+  {
+    GRUB_SM712_SR_TV_ALT_CLOCK = 0x00,
+    GRUB_SM712_SR_TV_FREE_RUN_CLOCK = 0x04
+  };
+enum
+  {
+    GRUB_SM712_SR_TV_CLOCK_CKIN_NTSC = 0x00,
+    GRUB_SM712_SR_TV_CLOCK_REFCLK_PAL = 0x04
+  };
+enum
+  {
+    GRUB_SM712_SR_TV_HSYNC = 0x00,
+    GRUB_SM712_SR_TV_COMPOSITE_HSYNC = 0x01
+  };
+enum
+  {
+    GRUB_SM712_SR_RAM_LUT_NORMAL = 0,
+    GRUB_SM712_SR_RAM_LUT_LCD_RAM_OFF = 0x80,
+    GRUB_SM712_SR_RAM_LUT_CRT_RAM_OFF = 0x40,
+    GRUB_SM712_SR_RAM_LUT_LCD_RAM_NO_WRITE = 0x20,
+    GRUB_SM712_SR_RAM_LUT_CRT_RAM_NO_WRITE = 0x10,
+    GRUB_SM712_SR_RAM_LUT_CRT_8BIT = 0x08,
+    GRUB_SM712_SR_RAM_LUT_CRT_GAMMA = 0x04
+  };
+
+enum
+  {
+    GRUB_SM712_SR_CLOCK_CONTROL1_VCLK_FROM_CCR = 0x40,
+    GRUB_SM712_SR_CLOCK_CONTROL1_8DOT_CLOCK = 0x10,
+  };
+
+enum
+  {
+    GRUB_SM712_SR_CLOCK_CONTROL2_PROGRAM_VCLOCK = 0x03
+  };
+
+#define GRUB_SM712_SR_POPUP_ICON_HIGH_MASK 0x7
+#define GRUB_SM712_SR_POPUP_ICON_HIGH_HW_CURSOR_EN 0x80
+  enum
+  {
+    GRUB_SM712_SR_POPUP_ICON_CTRL_DISABLED = 0,
+    GRUB_SM712_SR_POPUP_ICON_CTRL_ZOOM_ENABLED = 0x40,
+    GRUB_SM712_SR_POPUP_ICON_CTRL_ENABLED = 0x80
+  };
+#define RGB332_BLACK 0
+#define RGB332_WHITE 0xff
+
+  enum
+  {
+    GRUB_SM712_CR_OVERFLOW_INTERLACE = 0x30,
+    GRUB_SM712_CR_INTERLACE_RETRACE = 0x31,
+    GRUB_SM712_CR_TV_VDISPLAY_START = 0x32,
+    GRUB_SM712_CR_TV_VDISPLAY_END_HIGH = 0x33,
+    GRUB_SM712_CR_TV_VDISPLAY_END_LOW = 0x34,
+    GRUB_SM712_CR_DDA_CONTROL_LOW = 0x35,
+    GRUB_SM712_CR_DDA_CONTROL_HIGH = 0x36,
+    GRUB_SM712_CR_TV_EQUALIZER = 0x38,
+    GRUB_SM712_CR_TV_SERRATION = 0x39,
+    GRUB_SM712_CR_HSYNC_CTRL = 0x3a,
+    GRUB_SM712_CR_DEBUG = 0x3c,
+    GRUB_SM712_CR_SHADOW_VGA_HTOTAL = 0x40,
+    GRUB_SM712_CR_SHADOW_VGA_HBLANK_START = 0x41,
+    GRUB_SM712_CR_SHADOW_VGA_HBLANK_END = 0x42,
+    GRUB_SM712_CR_SHADOW_VGA_HRETRACE_START = 0x43,
+    GRUB_SM712_CR_SHADOW_VGA_HRETRACE_END = 0x44,
+    GRUB_SM712_CR_SHADOW_VGA_VERTICAL_TOTAL = 0x45,
+    GRUB_SM712_CR_SHADOW_VGA_VBLANK_START = 0x46,
+    GRUB_SM712_CR_SHADOW_VGA_VBLANK_END = 0x47,
+    GRUB_SM712_CR_SHADOW_VGA_VRETRACE_START = 0x48,
+    GRUB_SM712_CR_SHADOW_VGA_VRETRACE_END = 0x49,    
+    GRUB_SM712_CR_SHADOW_VGA_OVERFLOW = 0x4a,
+    GRUB_SM712_CR_SHADOW_VGA_CELL_HEIGHT = 0x4b,
+    GRUB_SM712_CR_SHADOW_VGA_HDISPLAY_END = 0x4c,
+    GRUB_SM712_CR_SHADOW_VGA_VDISPLAY_END = 0x4d,
+    GRUB_SM712_CR_DDA_LOOKUP_REG3_START = 0x90,
+    GRUB_SM712_CR_DDA_LOOKUP_REG2_START = 0x91,
+    GRUB_SM712_CR_DDA_LOOKUP_REG1_START = 0xa0,
+    GRUB_SM712_CR_VCENTERING_OFFSET = 0xa6,
+    GRUB_SM712_CR_HCENTERING_OFFSET = 0xa7,
+  };
+
+#define GRUB_SM712_CR_DEBUG_NONE 0
+
+#define SM712_DDA_REG3_COMPARE_SHIFT 2
+#define SM712_DDA_REG3_COMPARE_MASK  0xfc
+#define SM712_DDA_REG3_DDA_SHIFT 8
+#define SM712_DDA_REG3_DDA_MASK  0x3
+#define SM712_DDA_REG2_DDA_MASK  0xff
+#define SM712_DDA_REG2_VCENTER_MASK 0x3f
+
+static struct
+{
+  grub_uint8_t compare;
+  grub_uint16_t dda;
+  grub_uint8_t vcentering;
+} dda_lookups[] = {
+  { 21, 469,  2},
+  { 23, 477,  2},
+  { 33, 535,  2},
+  { 35, 682, 21},
+  { 34, 675,  2},
+  { 55, 683,  6},
+};
 
 static struct
 {
@@ -44,6 +200,7 @@ static struct
   grub_pci_device_t dev;
 } framebuffer;
 
+#ifndef TEST
 static grub_err_t
 grub_video_sm712_video_init (void)
 {
@@ -62,14 +219,117 @@ grub_video_sm712_video_fini (void)
 
   return grub_video_fb_fini ();
 }
+#endif
+
+static inline void
+grub_sm712_write_reg (grub_uint8_t val, grub_uint16_t addr)
+{
+#ifdef TEST
+  printf ("  {1, 0x%x, 0x%x},\n", addr, val);
+#else
+   *(volatile grub_uint8_t *) (framebuffer.ptr + GRUB_SM712_REG_BASE
+			       + addr) = val;
+#endif
+}
+
+static inline grub_uint8_t
+grub_sm712_read_reg (grub_uint16_t addr)
+{
+#ifdef TEST
+  printf ("  {-1, 0x%x, 0x5},\n", addr);
+#else
+  return *(volatile grub_uint8_t *) (framebuffer.ptr + GRUB_SM712_REG_BASE
+				     + addr);
+#endif
+}
 
 static inline grub_uint8_t
 grub_sm712_sr_read (grub_uint8_t addr)
 {
-  *(volatile grub_uint8_t *) (framebuffer.ptr + GRUB_SM712_REG_BASE
-			      + GRUB_VGA_IO_SR_INDEX) = addr;
-  return *(volatile grub_uint8_t *) (framebuffer.ptr + GRUB_SM712_REG_BASE
-				     + GRUB_VGA_IO_SR_DATA);
+  grub_sm712_write_reg (addr, GRUB_VGA_IO_SR_INDEX);
+  return grub_sm712_read_reg (GRUB_VGA_IO_SR_DATA);
+}
+
+static inline void
+grub_sm712_sr_write (grub_uint8_t val, grub_uint8_t addr)
+{
+  grub_sm712_write_reg (addr, GRUB_VGA_IO_SR_INDEX);
+  grub_sm712_write_reg (val, GRUB_VGA_IO_SR_DATA);
+}
+
+static inline void
+grub_sm712_gr_write (grub_uint8_t val, grub_uint8_t addr)
+{
+  grub_sm712_write_reg (addr, GRUB_VGA_IO_GR_INDEX);
+  grub_sm712_write_reg (val, GRUB_VGA_IO_GR_DATA);
+}
+
+static inline void
+grub_sm712_cr_write (grub_uint8_t val, grub_uint8_t addr)
+{
+  grub_sm712_write_reg (addr, GRUB_VGA_IO_CR_INDEX);
+  grub_sm712_write_reg (val, GRUB_VGA_IO_CR_DATA);
+}
+
+static inline void
+grub_sm712_write_arx (grub_uint8_t val, grub_uint8_t addr)
+{
+  grub_sm712_read_reg (GRUB_VGA_IO_INPUT_STATUS1_REGISTER);
+  grub_sm712_write_reg (addr, GRUB_VGA_IO_ARX);
+  grub_sm712_read_reg (GRUB_VGA_IO_ARX_READ);
+  grub_sm712_write_reg (val, GRUB_VGA_IO_ARX);
+}
+
+static inline void
+grub_sm712_cr_shadow_write (grub_uint8_t val, grub_uint8_t addr)
+{
+  grub_uint8_t mapping[] =
+    {
+      [GRUB_VGA_CR_HTOTAL] = GRUB_SM712_CR_SHADOW_VGA_HTOTAL,
+      [GRUB_VGA_CR_HORIZ_END] = 0xff,
+      [GRUB_VGA_CR_HBLANK_START] = GRUB_SM712_CR_SHADOW_VGA_HBLANK_START,
+      [GRUB_VGA_CR_HBLANK_END] = GRUB_SM712_CR_SHADOW_VGA_HBLANK_END,
+      [GRUB_VGA_CR_HORIZ_SYNC_PULSE_START] = GRUB_SM712_CR_SHADOW_VGA_HRETRACE_START,
+      [GRUB_VGA_CR_HORIZ_SYNC_PULSE_END] = GRUB_SM712_CR_SHADOW_VGA_HRETRACE_END,
+      [GRUB_VGA_CR_VERT_TOTAL] = GRUB_SM712_CR_SHADOW_VGA_VERTICAL_TOTAL,
+      [GRUB_VGA_CR_OVERFLOW] = GRUB_SM712_CR_SHADOW_VGA_OVERFLOW,
+      [GRUB_VGA_CR_BYTE_PANNING] = 0xff,
+      [GRUB_VGA_CR_CELL_HEIGHT] = GRUB_SM712_CR_SHADOW_VGA_CELL_HEIGHT,
+      [GRUB_VGA_CR_CURSOR_START] = 0xff,
+      [GRUB_VGA_CR_CURSOR_END] = 0xff,
+      [GRUB_VGA_CR_START_ADDR_HIGH_REGISTER] = 0xff,
+      [GRUB_VGA_CR_START_ADDR_LOW_REGISTER] = 0xff,
+      [GRUB_VGA_CR_CURSOR_ADDR_HIGH] = 0xff,
+      [GRUB_VGA_CR_CURSOR_ADDR_LOW] = 0xff,
+      [GRUB_VGA_CR_VSYNC_START] = GRUB_SM712_CR_SHADOW_VGA_VRETRACE_START,
+      [GRUB_VGA_CR_VSYNC_END] = GRUB_SM712_CR_SHADOW_VGA_VRETRACE_END,
+      [GRUB_VGA_CR_VDISPLAY_END] = GRUB_SM712_CR_SHADOW_VGA_VDISPLAY_END,
+      [GRUB_VGA_CR_PITCH] = GRUB_SM712_CR_SHADOW_VGA_HDISPLAY_END,
+      [GRUB_VGA_CR_UNDERLINE_LOCATION] = 0xff,
+
+      [GRUB_VGA_CR_VERTICAL_BLANK_START] = GRUB_SM712_CR_SHADOW_VGA_VBLANK_START,
+      [GRUB_VGA_CR_VERTICAL_BLANK_END] = GRUB_SM712_CR_SHADOW_VGA_VBLANK_END,
+      [GRUB_VGA_CR_MODE] = 0xff,
+      [GRUB_VGA_CR_LINE_COMPARE] = 0xff
+    };
+  if (addr >= ARRAY_SIZE (mapping) || mapping[addr] == 0xff)
+    return;
+  grub_sm712_cr_write (val, mapping[addr]);
+}
+
+static inline void
+grub_sm712_write_dda_lookup (int idx, grub_uint8_t compare, grub_uint16_t dda,
+			     grub_uint8_t vcentering)
+{
+  grub_sm712_cr_write (((compare << SM712_DDA_REG3_COMPARE_SHIFT)
+			& SM712_DDA_REG3_COMPARE_MASK)
+		       | ((dda >> SM712_DDA_REG3_DDA_SHIFT)
+			  & SM712_DDA_REG3_DDA_MASK),
+		       GRUB_SM712_CR_DDA_LOOKUP_REG3_START + 2 * idx);
+  grub_sm712_cr_write (dda & SM712_DDA_REG2_DDA_MASK,
+		       GRUB_SM712_CR_DDA_LOOKUP_REG2_START + 2 * idx);
+  grub_sm712_cr_write (vcentering & SM712_DDA_REG2_VCENTER_MASK,
+		       GRUB_SM712_CR_DDA_LOOKUP_REG1_START + idx);
 }
 
 static grub_err_t
@@ -81,6 +341,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
   int found = 0;
   unsigned i;
 
+#ifndef TEST
   auto int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)));
   int NESTED_FUNC_ATTR find_card (grub_pci_device_t dev, grub_pci_id_t pciid __attribute__ ((unused)))
     {
@@ -90,7 +351,8 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
       addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
       class = grub_pci_read (addr);
 
-      if (((class >> 16) & 0xffff) != 0x0300 || pciid != 0x0712126f)
+      if (((class >> 16) & 0xffff) != GRUB_PCI_CLASS_SUBCLASS_VGA
+	  || pciid != GRUB_SM712_PCIID)
 	return 0;
       
       found = 1;
@@ -114,7 +376,7 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
   grub_pci_iterate (find_card);
   if (!found)
     return grub_error (GRUB_ERR_IO, "Couldn't find graphics card");
-
+#endif
   /* Fill mode info details.  */
   framebuffer.mode_info.width = 1024;
   framebuffer.mode_info.height = 600;
@@ -131,8 +393,12 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
   framebuffer.mode_info.blue_field_pos = 0;
   framebuffer.mode_info.reserved_mask_size = 0;
   framebuffer.mode_info.reserved_field_pos = 0;
-  framebuffer.mode_info.blit_format = grub_video_get_blit_format (&framebuffer.mode_info);
+#ifndef TEST
+  framebuffer.mode_info.blit_format
+    = grub_video_get_blit_format (&framebuffer.mode_info);
+#endif
 
+#ifndef TEST
   if (found && framebuffer.base == 0)
     {
       grub_pci_address_t addr;
@@ -150,47 +416,280 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
       addr = grub_pci_make_address (framebuffer.dev, GRUB_PCI_REG_COMMAND);
       grub_pci_write (addr, 0x7);
     }
+#endif
 
   /* We can safely discard volatile attribute.  */
+#ifndef TEST
   framebuffer.ptr
     = (void *) grub_pci_device_map_range (framebuffer.dev,
 					  framebuffer.base,
 					  GRUB_SM712_TOTAL_MEMORY_SPACE);
+#endif
   framebuffer.mapped = 1;
 
   /* Initialise SM712.  */
+#ifndef TEST
+  /* FIXME */
   grub_vga_sr_write (0x11, 0x18);
+#endif
 
+#ifndef TEST
   /* Prevent garbage from appearing on the screen.  */
   grub_memset (framebuffer.ptr, 0, 
 	       framebuffer.mode_info.height * framebuffer.mode_info.pitch);
+#endif
 
-  for (i = 0; i < ARRAY_SIZE (sm712_init); i++)
-    switch (sm712_init[i].directive)
+  /* FIXME */
+  grub_sm712_sr_write (0, 0x21);
+  grub_sm712_sr_write (0x7a, 0x62);
+  grub_sm712_sr_write (0x16, 0x6a);
+  grub_sm712_sr_write (0x2, 0x6b);
+  grub_sm712_write_reg (0, GRUB_VGA_IO_PIXEL_MASK);
+  grub_sm712_sr_write (GRUB_VGA_SR_RESET_ASYNC, GRUB_VGA_SR_RESET);
+  grub_sm712_write_reg (GRUB_VGA_IO_MISC_NEGATIVE_VERT_POLARITY 
+			| GRUB_VGA_IO_MISC_NEGATIVE_HORIZ_POLARITY
+			| GRUB_VGA_IO_MISC_UPPER_64K
+			| GRUB_VGA_IO_MISC_EXTERNAL_CLOCK_0
+			| GRUB_VGA_IO_MISC_ENABLE_VRAM_ACCESS
+			| GRUB_VGA_IO_MISC_COLOR, GRUB_VGA_IO_MISC_WRITE);
+  grub_sm712_sr_write (GRUB_VGA_SR_RESET_ASYNC | GRUB_VGA_SR_RESET_SYNC,
+		       GRUB_VGA_SR_RESET);
+  grub_sm712_sr_write (GRUB_VGA_SR_CLOCKING_MODE_8_DOT_CLOCK,
+		       GRUB_VGA_SR_CLOCKING_MODE);
+  grub_sm712_sr_write (GRUB_VGA_ALL_PLANES, GRUB_VGA_SR_MAP_MASK_REGISTER);
+  grub_sm712_sr_write (0, GRUB_VGA_SR_CHAR_MAP_SELECT);
+  grub_sm712_sr_write (GRUB_VGA_SR_MEMORY_MODE_CHAIN4
+		       | GRUB_VGA_SR_MEMORY_MODE_SEQUENTIAL_ADDRESSING
+		       | GRUB_VGA_SR_MEMORY_MODE_EXTERNAL_VIDEO_MEMORY,
+		       GRUB_VGA_SR_MEMORY_MODE);
+
+  for (i = 0; i < ARRAY_SIZE (sm712_sr_seq1); i++)
+    grub_sm712_sr_write (sm712_sr_seq1[i], 0x10 + i);
+
+  for (i = 0; i < ARRAY_SIZE (sm712_sr_seq2); i++)
+    grub_sm712_sr_write (sm712_sr_seq2[i], 0x30 + i);
+
+  /* Undocumented.  */
+  grub_sm712_sr_write (0x1a, 0x63);
+  /* Undocumented.  */
+  grub_sm712_sr_write (0x1a, 0x64);
+
+  grub_sm712_sr_write (GRUB_SM712_SR_TV_CRT_SRAM | GRUB_SM712_SR_TV_ALT_CLOCK
+		       | GRUB_SM712_SR_TV_CLOCK_CKIN_NTSC
+		       | GRUB_SM712_SR_TV_HSYNC,
+		       GRUB_SM712_SR_TV_CONTROL);
+
+  grub_sm712_sr_write (GRUB_SM712_SR_RAM_LUT_NORMAL, GRUB_SM712_SR_RAM_LUT);
+
+  /* Undocumented.  */
+  grub_sm712_sr_write (0x00, 0x67);
+
+  grub_sm712_sr_write (GRUB_SM712_SR_CLOCK_CONTROL1_VCLK_FROM_CCR
+		       | GRUB_SM712_SR_CLOCK_CONTROL1_8DOT_CLOCK,
+		       GRUB_SM712_SR_CLOCK_CONTROL1);
+  grub_sm712_sr_write (GRUB_SM712_SR_CLOCK_CONTROL2_PROGRAM_VCLOCK,
+		       GRUB_SM712_SR_CLOCK_CONTROL2);
+
+  grub_sm712_sr_write (82, GRUB_SM712_SR_VCLK_NUM);
+  grub_sm712_sr_write (137, GRUB_SM712_SR_VCLK_DENOM);
+
+  grub_sm712_sr_write (9, GRUB_SM712_SR_VCLK2_NUM);
+  grub_sm712_sr_write (2, GRUB_SM712_SR_VCLK2_DENOM);
+  /* FIXME */
+  grub_sm712_sr_write (0x04, 0x70);
+  /* FIXME */
+  grub_sm712_sr_write (0x45, 0x71);
+  /* Undocumented */
+  grub_sm712_sr_write (0x30, 0x72);
+  /* Undocumented */
+  grub_sm712_sr_write (0x30, 0x73);
+  /* Undocumented */
+  grub_sm712_sr_write (0x40, 0x74);
+  /* Undocumented */
+  grub_sm712_sr_write (0x20, 0x75);
+
+  grub_sm712_sr_write (0xff, GRUB_SM712_SR_POPUP_ICON_LOW);
+  grub_sm712_sr_write (GRUB_SM712_SR_POPUP_ICON_HIGH_MASK,
+		       GRUB_SM712_SR_POPUP_ICON_HIGH);
+  grub_sm712_sr_write (GRUB_SM712_SR_POPUP_ICON_CTRL_DISABLED,
+		       GRUB_SM712_SR_POPUP_ICON_CTRL);
+  /* Undocumented */
+  grub_sm712_sr_write (0x0, 0x83);
+
+  grub_sm712_sr_write (8, GRUB_SM712_SR_POPUP_ICON_COLOR1);
+  grub_sm712_sr_write (0, GRUB_SM712_SR_POPUP_ICON_COLOR2);
+  grub_sm712_sr_write (0x42, GRUB_SM712_SR_POPUP_ICON_COLOR3);
+
+  /* Undocumented */
+  grub_sm712_sr_write (0x3a, 0x87);
+
+  /* Why theese coordinates?  */
+  grub_sm712_sr_write (0x59, GRUB_SM712_SR_HW_CURSOR_UPPER_LEFT_X_LOW);
+  grub_sm712_sr_write (0x02, GRUB_SM712_SR_HW_CURSOR_UPPER_LEFT_X_HIGH);
+  grub_sm712_sr_write (0x44, GRUB_SM712_SR_HW_CURSOR_UPPER_LEFT_Y_LOW);
+  grub_sm712_sr_write (0x02, GRUB_SM712_SR_HW_CURSOR_UPPER_LEFT_Y_HIGH);
+
+  grub_sm712_sr_write (RGB332_BLACK, GRUB_SM712_SR_HW_CURSOR_FG_COLOR);
+  grub_sm712_sr_write (RGB332_WHITE, GRUB_SM712_SR_HW_CURSOR_BG_COLOR);
+
+  /* Undocumented */
+  grub_sm712_sr_write (0x3a, 0x8e);
+  grub_sm712_sr_write (0x3a, 0x8f);
+
+  grub_sm712_sr_write (0, GRUB_SM712_SR_POPUP_ICON_X_LOW);
+  grub_sm712_sr_write (0, GRUB_SM712_SR_POPUP_ICON_X_HIGH);
+  grub_sm712_sr_write (0, GRUB_SM712_SR_POPUP_ICON_Y_LOW);
+  grub_sm712_sr_write (0, GRUB_SM712_SR_POPUP_ICON_Y_HIGH);
+
+  grub_sm712_sr_write (0, GRUB_SM712_SR_PANEL_HW_VIDEO_CONTROL);
+  grub_sm712_sr_write (0x10, GRUB_SM712_SR_PANEL_HW_VIDEO_COLOR_KEY_LOW);
+  grub_sm712_sr_write (0x08, GRUB_SM712_SR_PANEL_HW_VIDEO_COLOR_KEY_HIGH);
+  grub_sm712_sr_write (0x00, GRUB_SM712_SR_PANEL_HW_VIDEO_COLOR_KEY_MASK_LOW);
+  grub_sm712_sr_write (0x02, GRUB_SM712_SR_PANEL_HW_VIDEO_COLOR_KEY_MASK_HIGH);
+  grub_sm712_sr_write (0xed, GRUB_SM712_SR_PANEL_HW_VIDEO_RED_CONSTANT);
+  grub_sm712_sr_write (0xed, GRUB_SM712_SR_PANEL_HW_VIDEO_GREEN_CONSTANT);
+  grub_sm712_sr_write (0xed, GRUB_SM712_SR_PANEL_HW_VIDEO_BLUE_CONSTANT);
+
+  grub_sm712_sr_write (0x7b, GRUB_SM712_SR_PANEL_HW_VIDEO_TOP_BOUNDARY);
+  grub_sm712_sr_write (0xfb, GRUB_SM712_SR_PANEL_HW_VIDEO_LEFT_BOUNDARY);
+  grub_sm712_sr_write (0xff, GRUB_SM712_SR_PANEL_HW_VIDEO_BOTTOM_BOUNDARY);
+  grub_sm712_sr_write (0xff, GRUB_SM712_SR_PANEL_HW_VIDEO_RIGHT_BOUNDARY);
+  /* Doesn't match documentation?  */
+  grub_sm712_sr_write (0x97, GRUB_SM712_SR_PANEL_HW_VIDEO_TOP_LEFT_OVERFLOW_BOUNDARY);
+  grub_sm712_sr_write (0xef, GRUB_SM712_SR_PANEL_HW_VIDEO_BOTTOM_RIGHT_OVERFLOW_BOUNDARY);
+
+  grub_sm712_sr_write (0xbf, GRUB_SM712_SR_PANEL_HW_VIDEO_VERTICAL_STRETCH_FACTOR);
+  grub_sm712_sr_write (0xdf, GRUB_SM712_SR_PANEL_HW_VIDEO_HORIZONTAL_STRETCH_FACTOR);
+
+  grub_sm712_gr_write (GRUB_VGA_NO_PLANES, GRUB_VGA_GR_SET_RESET_PLANE);
+  grub_sm712_gr_write (GRUB_VGA_NO_PLANES, GRUB_VGA_GR_SET_RESET_PLANE_ENABLE);
+  grub_sm712_gr_write (GRUB_VGA_NO_PLANES, GRUB_VGA_GR_COLOR_COMPARE);
+  grub_sm712_gr_write (GRUB_VGA_GR_DATA_ROTATE_NOP, GRUB_VGA_GR_DATA_ROTATE);
+  grub_sm712_gr_write (GRUB_VGA_NO_PLANES, GRUB_VGA_GR_READ_MAP_REGISTER);
+  grub_sm712_gr_write (GRUB_VGA_GR_MODE_256_COLOR, GRUB_VGA_GR_MODE);
+  grub_sm712_gr_write (GRUB_VGA_GR_GR6_MMAP_A0
+		       | GRUB_VGA_GR_GR6_GRAPHICS_MODE, GRUB_VGA_GR_GR6);
+  grub_sm712_gr_write (GRUB_VGA_ALL_PLANES, GRUB_VGA_GR_COLOR_COMPARE_DISABLE);
+  grub_sm712_gr_write (0xff, GRUB_VGA_GR_BITMASK);
+
+  /* Write palette mapping.  */
+  for (i = 0; i < 16; i++)
+    grub_sm712_write_arx (i, i);
+
+  grub_sm712_write_arx (GRUB_VGA_ARX_MODE_ENABLE_256COLOR
+			| GRUB_VGA_ARX_MODE_GRAPHICS, GRUB_VGA_ARX_MODE);
+  grub_sm712_write_arx (0, GRUB_VGA_ARX_OVERSCAN);
+  grub_sm712_write_arx (GRUB_VGA_ALL_PLANES, GRUB_VGA_ARX_COLOR_PLANE_ENABLE);
+  grub_sm712_write_arx (0, GRUB_VGA_ARX_HORIZONTAL_PANNING);
+  grub_sm712_write_arx (0, GRUB_VGA_ARX_COLOR_SELECT);
+
+  /* FIXME: compute this generically.  */
+  {
+    struct grub_video_hw_config config =
       {
-      case 1:
-	*(volatile grub_uint8_t *) ((char *) framebuffer.ptr
-				    + GRUB_SM712_REG_BASE
-				    + sm712_init[i].addr) = sm712_init[i].val;
-	break;
-      case -1:
-	{
-	  grub_uint8_t val = *(volatile grub_uint8_t *) 
-	    ((char *) framebuffer.ptr + GRUB_SM712_REG_BASE
-	     + sm712_init[i].addr);
-	  (void) val;
-	}
-	break;
-      }
+	.vertical_total = 806,
+	.vertical_blank_start = 0x300,
+	.vertical_blank_end = 0,
+	.vertical_sync_start = 0x303,
+	.vertical_sync_end = 0x9,
+	.line_compare = 0x3ff,
+	.vdisplay_end = 0x300,
+	.pitch = 0x80,
+	.horizontal_total = 164,
+	.horizontal_end = 128,
+	.horizontal_blank_start = 128,
+	.horizontal_blank_end = 0,
+	.horizontal_sync_pulse_start = 133,
+	.horizontal_sync_pulse_end = 22
+      };
+    grub_vga_set_geometry (&config, grub_sm712_cr_write);
+    config.horizontal_sync_pulse_start = 134;
+    config.horizontal_sync_pulse_end = 21;
+    config.vertical_sync_start = 0x301;
+    config.vertical_sync_end = 0x0;
+    config.line_compare = 0x0ff;
+    config.vdisplay_end = 0x258;
+    config.pitch = 0x7f;
+    grub_vga_set_geometry (&config, grub_sm712_cr_shadow_write);
+  }
 
+  grub_sm712_cr_write (GRUB_VGA_CR_BYTE_PANNING_NORMAL,
+		       GRUB_VGA_CR_BYTE_PANNING);
+  grub_sm712_cr_write (0, GRUB_VGA_CR_CURSOR_START);
+  grub_sm712_cr_write (0, GRUB_VGA_CR_CURSOR_END);
+  grub_sm712_cr_write (0, GRUB_VGA_CR_START_ADDR_HIGH_REGISTER);
+  grub_sm712_cr_write (0, GRUB_VGA_CR_START_ADDR_LOW_REGISTER);
+  grub_sm712_cr_write (0, GRUB_VGA_CR_CURSOR_ADDR_HIGH);
+  grub_sm712_cr_write (0, GRUB_VGA_CR_CURSOR_ADDR_LOW);
+  grub_sm712_cr_write (GRUB_VGA_CR_UNDERLINE_LOCATION_DWORD_MODE,
+		       GRUB_VGA_CR_UNDERLINE_LOCATION);
+  grub_sm712_cr_write (GRUB_VGA_CR_MODE_ADDRESS_WRAP
+		       | GRUB_VGA_CR_MODE_BYTE_MODE
+		       | GRUB_VGA_CR_MODE_TIMING_ENABLE
+		       | GRUB_VGA_CR_MODE_NO_CGA
+		       | GRUB_VGA_CR_MODE_NO_HERCULES,
+		       GRUB_VGA_CR_MODE);
+
+  grub_sm712_cr_write (0, GRUB_SM712_CR_OVERFLOW_INTERLACE);
+  grub_sm712_cr_write (0, GRUB_SM712_CR_INTERLACE_RETRACE);
+  grub_sm712_cr_write (0, GRUB_SM712_CR_TV_VDISPLAY_START);
+  grub_sm712_cr_write (0, GRUB_SM712_CR_TV_VDISPLAY_END_HIGH);
+  grub_sm712_cr_write (0, GRUB_SM712_CR_TV_VDISPLAY_END_LOW);
+  grub_sm712_cr_write (0x80, GRUB_SM712_CR_DDA_CONTROL_LOW);
+  grub_sm712_cr_write (0x02, GRUB_SM712_CR_DDA_CONTROL_HIGH);
+
+  /* Undocumented */
+  grub_sm712_cr_write (0x20, 0x37);
+
+  grub_sm712_cr_write (0, GRUB_SM712_CR_TV_EQUALIZER);
+  grub_sm712_cr_write (0, GRUB_SM712_CR_TV_SERRATION);
+  grub_sm712_cr_write (0, GRUB_SM712_CR_HSYNC_CTRL);
+
+  /* Undocumented */
+  grub_sm712_cr_write (0x40, 0x3b);
+
+  grub_sm712_cr_write (GRUB_SM712_CR_DEBUG_NONE, GRUB_SM712_CR_DEBUG);
+
+  /* Undocumented */
+  grub_sm712_cr_write (0xff, 0x3d);
+  grub_sm712_cr_write (0x46, 0x3e);
+  grub_sm712_cr_write (0x91, 0x3f);
+
+  for (i = 0; i < ARRAY_SIZE (dda_lookups); i++)
+    grub_sm712_write_dda_lookup (i, dda_lookups[i].compare, dda_lookups[i].dda,
+				 dda_lookups[i].vcentering);
+  
+  /* Undocumented  */
+  grub_sm712_cr_write (0, 0x9c);
+  grub_sm712_cr_write (0, 0x9d);
+  grub_sm712_cr_write (0, 0x9e);
+  grub_sm712_cr_write (0, 0x9f);
+
+  grub_sm712_cr_write (0, GRUB_SM712_CR_VCENTERING_OFFSET);
+  grub_sm712_cr_write (0, GRUB_SM712_CR_HCENTERING_OFFSET);
+
+  grub_sm712_write_reg (GRUB_VGA_IO_MISC_NEGATIVE_HORIZ_POLARITY
+			| GRUB_VGA_IO_MISC_UPPER_64K
+			| GRUB_VGA_IO_MISC_28MHZ
+			| GRUB_VGA_IO_MISC_ENABLE_VRAM_ACCESS
+			| GRUB_VGA_IO_MISC_COLOR,
+			GRUB_VGA_IO_MISC_WRITE);
+
+#ifndef TEST
+  /* Undocumented? */
   *(volatile grub_uint32_t *) ((char *) framebuffer.ptr + 0x40c00c) = 0;
   *(volatile grub_uint32_t *) ((char *) framebuffer.ptr + 0x40c040) = 0;
   *(volatile grub_uint32_t *) ((char *) framebuffer.ptr + 0x40c000) = 0x20000;
   *(volatile grub_uint32_t *) ((char *) framebuffer.ptr + 0x40c010) = 0x1020100;
+#endif
 
   (void) grub_sm712_sr_read (0x16);
 
-  err = grub_video_fb_create_render_target_from_pointer (&framebuffer.render_target, &framebuffer.mode_info, framebuffer.ptr);
+#ifndef TEST
+  err = grub_video_fb_create_render_target_from_pointer (&framebuffer
+							 .render_target,
+							 &framebuffer.mode_info,
+							 framebuffer.ptr);
 
   if (err)
     return err;
@@ -203,9 +702,12 @@ grub_video_sm712_setup (unsigned int width, unsigned int height,
   /* Copy default palette to initialize emulated palette.  */
   err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
 				   grub_video_fbstd_colors);
+#endif
   return err;
 }
 
+#ifndef TEST
+
 static grub_err_t
 grub_video_sm712_swap_buffers (void)
 {
@@ -234,7 +736,6 @@ grub_video_sm712_get_info_and_fini (struct grub_video_mode_info *mode_info,
   return GRUB_ERR_NONE;
 }
 
-
 static struct grub_video_adapter grub_video_sm712_adapter =
   {
     .name = "SM712 Video Driver",
@@ -277,3 +778,10 @@ GRUB_MOD_FINI(video_sm712)
 {
   grub_video_unregister (&grub_video_sm712_adapter);
 }
+#else
+int
+main ()
+{
+  grub_video_sm712_setup (1024, 600, 0, 0);
+}
+#endif
diff --git a/video/sm712_init.c b/video/sm712_init.c
index 58dbbbbf9..cdb0b7383 100644
--- a/video/sm712_init.c
+++ b/video/sm712_init.c
@@ -1,540 +1,14 @@
 /* Following sequence is a capture of sm712 initialisation sequence.  */
-static struct 
-{
-  int directive;
-  grub_uint32_t addr;
-  grub_uint32_t val;
-} sm712_init[] =
-{
-  {1, 0x3c4, 0x21},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x62},
-  {1, 0x3c5, 0x7a},
-  {1, 0x3c4, 0x6a},
-  {1, 0x3c5, 0x16},
-  {1, 0x3c4, 0x6b},
-  {1, 0x3c5, 0x2},
-  {1, 0x3c6, 0x0},
-  {1, 0x3c4, 0x0},
-  {1, 0x3c5, 0x1},
-  {1, 0x3c2, 0xeb},
-  {1, 0x3c4, 0x0},
-  {1, 0x3c5, 0x3},
-  {1, 0x3c4, 0x1},
-  {1, 0x3c5, 0x1},
-  {1, 0x3c4, 0x2},
-  {1, 0x3c5, 0xf},
-  {1, 0x3c4, 0x3},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x4},
-  {1, 0x3c5, 0xe},
-  {1, 0x3c4, 0x10},
-  {1, 0x3c5, 0xc8},
-  {1, 0x3c4, 0x11},
-  {1, 0x3c5, 0x40},
-  {1, 0x3c4, 0x12},
-  {1, 0x3c5, 0x14},
-  {1, 0x3c4, 0x13},
-  {1, 0x3c5, 0x60},
-  {1, 0x3c4, 0x14},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x15},
-  {1, 0x3c5, 0xa},
-  {1, 0x3c4, 0x16},
-  {1, 0x3c5, 0x92},
-  {1, 0x3c4, 0x17},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x18},
-  {1, 0x3c5, 0x51},
-  {1, 0x3c4, 0x19},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x1a},
-  {1, 0x3c5, 0x1},
-  {1, 0x3c4, 0x1b},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x1c},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x1d},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x1e},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x1f},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x20},
-  {1, 0x3c5, 0xc4},
-  {1, 0x3c4, 0x21},
-  {1, 0x3c5, 0x30},
-  {1, 0x3c4, 0x22},
-  {1, 0x3c5, 0x2},
-  {1, 0x3c4, 0x23},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x24},
-  {1, 0x3c5, 0x1},
-  {1, 0x3c4, 0x30},
-  {1, 0x3c5, 0x28},
-  {1, 0x3c4, 0x31},
-  {1, 0x3c5, 0x3},
-  {1, 0x3c4, 0x32},
-  {1, 0x3c5, 0x24},
-  {1, 0x3c4, 0x33},
-  {1, 0x3c5, 0x9},
-  {1, 0x3c4, 0x34},
-  {1, 0x3c5, 0xc0},
-  {1, 0x3c4, 0x35},
-  {1, 0x3c5, 0x3a},
-  {1, 0x3c4, 0x36},
-  {1, 0x3c5, 0x3a},
-  {1, 0x3c4, 0x37},
-  {1, 0x3c5, 0x3a},
-  {1, 0x3c4, 0x38},
-  {1, 0x3c5, 0x3a},
-  {1, 0x3c4, 0x39},
-  {1, 0x3c5, 0x3a},
-  {1, 0x3c4, 0x3a},
-  {1, 0x3c5, 0x3a},
-  {1, 0x3c4, 0x3b},
-  {1, 0x3c5, 0x3a},
-  {1, 0x3c4, 0x3c},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x3d},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x3e},
-  {1, 0x3c5, 0x3},
-  {1, 0x3c4, 0x3f},
-  {1, 0x3c5, 0xff},
-  {1, 0x3c4, 0x40},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x41},
-  {1, 0x3c5, 0xfc},
-  {1, 0x3c4, 0x42},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x43},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x44},
-  {1, 0x3c5, 0x20},
-  {1, 0x3c4, 0x45},
-  {1, 0x3c5, 0x18},
-  {1, 0x3c4, 0x46},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x47},
-  {1, 0x3c5, 0xfc},
-  {1, 0x3c4, 0x48},
-  {1, 0x3c5, 0x20},
-  {1, 0x3c4, 0x49},
-  {1, 0x3c5, 0xc},
-  {1, 0x3c4, 0x4a},
-  {1, 0x3c5, 0x44},
-  {1, 0x3c4, 0x4b},
-  {1, 0x3c5, 0x20},
-  {1, 0x3c4, 0x4c},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x4d},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x4e},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x4f},
-  {1, 0x3c5, 0x3a},
-  {1, 0x3c4, 0x50},
-  {1, 0x3c5, 0x6},
-  {1, 0x3c4, 0x51},
-  {1, 0x3c5, 0x68},
-  {1, 0x3c4, 0x52},
-  {1, 0x3c5, 0xa7},
-  {1, 0x3c4, 0x53},
-  {1, 0x3c5, 0x7f},
-  {1, 0x3c4, 0x54},
-  {1, 0x3c5, 0x83},
-  {1, 0x3c4, 0x55},
-  {1, 0x3c5, 0x24},
-  {1, 0x3c4, 0x56},
-  {1, 0x3c5, 0xff},
-  {1, 0x3c4, 0x57},
-  {1, 0x3c5, 0x3},
-  {1, 0x3c4, 0x58},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x59},
-  {1, 0x3c5, 0x60},
-  {1, 0x3c4, 0x5a},
-  {1, 0x3c5, 0x59},
-  {1, 0x3c4, 0x5b},
-  {1, 0x3c5, 0x3a},
-  {1, 0x3c4, 0x5c},
-  {1, 0x3c5, 0x3a},
-  {1, 0x3c4, 0x5d},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x5e},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x5f},
-  {1, 0x3c5, 0x3a},
-  {1, 0x3c4, 0x60},
-  {1, 0x3c5, 0x1},
-  {1, 0x3c4, 0x61},
-  {1, 0x3c5, 0x80},
-  {1, 0x3c4, 0x63},
-  {1, 0x3c5, 0x1a},
-  {1, 0x3c4, 0x64},
-  {1, 0x3c5, 0x1a},
-  {1, 0x3c4, 0x65},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x66},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x67},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x68},
-  {1, 0x3c5, 0x50},
-  {1, 0x3c4, 0x69},
-  {1, 0x3c5, 0x3},
-  {1, 0x3c4, 0x6c},
-  {1, 0x3c5, 0x52},
-  {1, 0x3c4, 0x6d},
-  {1, 0x3c5, 0x89},
-  {1, 0x3c4, 0x6e},
-  {1, 0x3c5, 0x9},
-  {1, 0x3c4, 0x6f},
-  {1, 0x3c5, 0x2},
-  {1, 0x3c4, 0x70},
-  {1, 0x3c5, 0x4},
-  {1, 0x3c4, 0x71},
-  {1, 0x3c5, 0x45},
-  {1, 0x3c4, 0x72},
-  {1, 0x3c5, 0x30},
-  {1, 0x3c4, 0x73},
-  {1, 0x3c5, 0x30},
-  {1, 0x3c4, 0x74},
-  {1, 0x3c5, 0x40},
-  {1, 0x3c4, 0x75},
-  {1, 0x3c5, 0x20},
-  {1, 0x3c4, 0x80},
-  {1, 0x3c5, 0xff},
-  {1, 0x3c4, 0x81},
-  {1, 0x3c5, 0x7},
-  {1, 0x3c4, 0x82},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x83},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x84},
-  {1, 0x3c5, 0x8},
-  {1, 0x3c4, 0x85},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x86},
-  {1, 0x3c5, 0x42},
-  {1, 0x3c4, 0x87},
-  {1, 0x3c5, 0x3a},
-  {1, 0x3c4, 0x88},
-  {1, 0x3c5, 0x59},
-  {1, 0x3c4, 0x89},
-  {1, 0x3c5, 0x2},
-  {1, 0x3c4, 0x8a},
-  {1, 0x3c5, 0x44},
-  {1, 0x3c4, 0x8b},
-  {1, 0x3c5, 0x2},
-  {1, 0x3c4, 0x8c},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x8d},
-  {1, 0x3c5, 0xff},
-  {1, 0x3c4, 0x8e},
-  {1, 0x3c5, 0x3a},
-  {1, 0x3c4, 0x8f},
-  {1, 0x3c5, 0x3a},
-  {1, 0x3c4, 0x90},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x91},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x92},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0x93},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0xa0},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0xa1},
-  {1, 0x3c5, 0x10},
-  {1, 0x3c4, 0xa2},
-  {1, 0x3c5, 0x8},
-  {1, 0x3c4, 0xa3},
-  {1, 0x3c5, 0x0},
-  {1, 0x3c4, 0xa4},
-  {1, 0x3c5, 0x2},
-  {1, 0x3c4, 0xa5},
-  {1, 0x3c5, 0xed},
-  {1, 0x3c4, 0xa6},
-  {1, 0x3c5, 0xed},
-  {1, 0x3c4, 0xa7},
-  {1, 0x3c5, 0xed},
-  {1, 0x3c4, 0xa8},
-  {1, 0x3c5, 0x7b},
-  {1, 0x3c4, 0xa9},
-  {1, 0x3c5, 0xfb},
-  {1, 0x3c4, 0xaa},
-  {1, 0x3c5, 0xff},
-  {1, 0x3c4, 0xab},
-  {1, 0x3c5, 0xff},
-  {1, 0x3c4, 0xac},
-  {1, 0x3c5, 0x97},
-  {1, 0x3c4, 0xad},
-  {1, 0x3c5, 0xef},
-  {1, 0x3c4, 0xae},
-  {1, 0x3c5, 0xbf},
-  {1, 0x3c4, 0xaf},
-  {1, 0x3c5, 0xdf},
-  {1, 0x3ce, 0x0},
-  {1, 0x3cf, 0x0},
-  {1, 0x3ce, 0x1},
-  {1, 0x3cf, 0x0},
-  {1, 0x3ce, 0x2},
-  {1, 0x3cf, 0x0},
-  {1, 0x3ce, 0x3},
-  {1, 0x3cf, 0x0},
-  {1, 0x3ce, 0x4},
-  {1, 0x3cf, 0x0},
-  {1, 0x3ce, 0x5},
-  {1, 0x3cf, 0x40},
-  {1, 0x3ce, 0x6},
-  {1, 0x3cf, 0x5},
-  {1, 0x3ce, 0x7},
-  {1, 0x3cf, 0xf},
-  {1, 0x3ce, 0x8},
-  {1, 0x3cf, 0xff},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0x0},
-  {-1, 0x3c1, 0x3e},
-  {1, 0x3c0, 0x0},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0x1},
-  {-1, 0x3c1, 0x3b},
-  {1, 0x3c0, 0x1},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0x2},
-  {-1, 0x3c1, 0x3f},
-  {1, 0x3c0, 0x2},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0x3},
-  {-1, 0x3c1, 0x3f},
-  {1, 0x3c0, 0x3},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0x4},
-  {-1, 0x3c1, 0x3b},
-  {1, 0x3c0, 0x4},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0x5},
-  {-1, 0x3c1, 0x2f},
-  {1, 0x3c0, 0x5},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0x6},
-  {-1, 0x3c1, 0x3f},
-  {1, 0x3c0, 0x6},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0x7},
-  {-1, 0x3c1, 0x3f},
-  {1, 0x3c0, 0x7},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0x8},
-  {-1, 0x3c1, 0x3f},
-  {1, 0x3c0, 0x8},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0x9},
-  {-1, 0x3c1, 0x3d},
-  {1, 0x3c0, 0x9},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0xa},
-  {-1, 0x3c1, 0x1f},
-  {1, 0x3c0, 0xa},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0xb},
-  {-1, 0x3c1, 0x1f},
-  {1, 0x3c0, 0xb},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0xc},
-  {-1, 0x3c1, 0x3f},
-  {1, 0x3c0, 0xc},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0xd},
-  {-1, 0x3c1, 0x3f},
-  {1, 0x3c0, 0xd},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0xe},
-  {-1, 0x3c1, 0x3f},
-  {1, 0x3c0, 0xe},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0xf},
-  {-1, 0x3c1, 0x2e},
-  {1, 0x3c0, 0xf},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0x10},
-  {-1, 0x3c1, 0x0},
-  {1, 0x3c0, 0x41},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0x11},
-  {-1, 0x3c1, 0x0},
-  {1, 0x3c0, 0x0},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0x12},
-  {-1, 0x3c1, 0x0},
-  {1, 0x3c0, 0xf},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0x13},
-  {-1, 0x3c1, 0x0},
-  {1, 0x3c0, 0x0},
-  {-1, 0x3da, 0x5},
-  {1, 0x3c0, 0x14},
-  {-1, 0x3c1, 0x0},
-  {1, 0x3c0, 0x0},
-  {1, 0x3d4, 0x0},
-  {1, 0x3d5, 0xa3},
-  {1, 0x3d4, 0x1},
-  {1, 0x3d5, 0x7f},
-  {1, 0x3d4, 0x2},
-  {1, 0x3d5, 0x7f},
-  {1, 0x3d4, 0x3},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x4},
-  {1, 0x3d5, 0x85},
-  {1, 0x3d4, 0x5},
-  {1, 0x3d5, 0x16},
-  {1, 0x3d4, 0x6},
-  {1, 0x3d5, 0x24},
-  {1, 0x3d4, 0x7},
-  {1, 0x3d5, 0xf5},
-  {1, 0x3d4, 0x8},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x9},
-  {1, 0x3d5, 0x60},
-  {1, 0x3d4, 0xa},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0xb},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0xc},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0xd},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0xe},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0xf},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x10},
-  {1, 0x3d5, 0x3},
-  {1, 0x3d4, 0x11},
-  {1, 0x3d5, 0x9},
-  {1, 0x3d4, 0x12},
-  {1, 0x3d5, 0xff},
-  {1, 0x3d4, 0x13},
-  {1, 0x3d5, 0x80},
-  {1, 0x3d4, 0x14},
-  {1, 0x3d5, 0x40},
-  {1, 0x3d4, 0x15},
-  {1, 0x3d5, 0xff},
-  {1, 0x3d4, 0x16},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x17},
-  {1, 0x3d5, 0xe3},
-  {1, 0x3d4, 0x18},
-  {1, 0x3d5, 0xff},
-  {1, 0x3d4, 0x30},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x31},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x32},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x33},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x34},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x35},
-  {1, 0x3d5, 0x80},
-  {1, 0x3d4, 0x36},
-  {1, 0x3d5, 0x2},
-  {1, 0x3d4, 0x37},
-  {1, 0x3d5, 0x20},
-  {1, 0x3d4, 0x38},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x39},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x3a},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x3b},
-  {1, 0x3d5, 0x40},
-  {1, 0x3d4, 0x3c},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x3d},
-  {1, 0x3d5, 0xff},
-  {1, 0x3d4, 0x3e},
-  {1, 0x3d5, 0x46},
-  {1, 0x3d4, 0x3f},
-  {1, 0x3d5, 0x91},
-  {1, 0x3d4, 0x40},
-  {1, 0x3d5, 0xa3},
-  {1, 0x3d4, 0x41},
-  {1, 0x3d5, 0x7f},
-  {1, 0x3d4, 0x42},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x43},
-  {1, 0x3d5, 0x86},
-  {1, 0x3d4, 0x44},
-  {1, 0x3d5, 0x15},
-  {1, 0x3d4, 0x45},
-  {1, 0x3d5, 0x24},
-  {1, 0x3d4, 0x46},
-  {1, 0x3d5, 0xff},
-  {1, 0x3d4, 0x47},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x48},
-  {1, 0x3d5, 0x1},
-  {1, 0x3d4, 0x49},
-  {1, 0x3d5, 0x7},
-  {1, 0x3d4, 0x4a},
-  {1, 0x3d5, 0xe5},
-  {1, 0x3d4, 0x4b},
-  {1, 0x3d5, 0x20},
-  {1, 0x3d4, 0x4c},
-  {1, 0x3d5, 0x7f},
-  {1, 0x3d4, 0x4d},
-  {1, 0x3d5, 0x57},
-  {1, 0x3d4, 0x90},
-  {1, 0x3d5, 0x55},
-  {1, 0x3d4, 0x91},
-  {1, 0x3d5, 0xd5},
-  {1, 0x3d4, 0x92},
-  {1, 0x3d5, 0x5d},
-  {1, 0x3d4, 0x93},
-  {1, 0x3d5, 0xdd},
-  {1, 0x3d4, 0x94},
-  {1, 0x3d5, 0x86},
-  {1, 0x3d4, 0x95},
-  {1, 0x3d5, 0x17},
-  {1, 0x3d4, 0x96},
-  {1, 0x3d5, 0x8e},
-  {1, 0x3d4, 0x97},
-  {1, 0x3d5, 0xaa},
-  {1, 0x3d4, 0x98},
-  {1, 0x3d5, 0x8a},
-  {1, 0x3d4, 0x99},
-  {1, 0x3d5, 0xa3},
-  {1, 0x3d4, 0x9a},
-  {1, 0x3d5, 0xde},
-  {1, 0x3d4, 0x9b},
-  {1, 0x3d5, 0xab},
-  {1, 0x3d4, 0x9c},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x9d},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x9e},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0x9f},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0xa0},
-  {1, 0x3d5, 0x2},
-  {1, 0x3d4, 0xa1},
-  {1, 0x3d5, 0x2},
-  {1, 0x3d4, 0xa2},
-  {1, 0x3d5, 0x2},
-  {1, 0x3d4, 0xa3},
-  {1, 0x3d5, 0x15},
-  {1, 0x3d4, 0xa4},
-  {1, 0x3d5, 0x2},
-  {1, 0x3d4, 0xa5},
-  {1, 0x3d5, 0x6},
-  {1, 0x3d4, 0xa6},
-  {1, 0x3d5, 0x0},
-  {1, 0x3d4, 0xa7},
-  {1, 0x3d5, 0x0},
-  {1, 0x3c2, 0x67},
-};
+static grub_uint8_t sm712_sr_seq1[] =
+  { 0xc8, 0x40, 0x14, 0x60, 0x0, 0xa, 0x92, 0x0,
+    0x51, 0x00, 0x01, 0x00, 0x0, 0x0, 0x00, 0x0,
+    0xc4, 0x30, 0x02, 0x00, 0x1 };
+
+static grub_uint8_t sm712_sr_seq2[] =
+  { 0x28, 0x03, 0x24, 0x09, 0xc0, 0x3a, 0x3a, 0x3a,
+    0x3a, 0x3a, 0x3a, 0x3a, 0x00, 0x00, 0x03, 0xff,
+    0x00, 0xfc, 0x00, 0x00, 0x20, 0x18, 0x00, 0xfc,
+    0x20, 0x0c, 0x44, 0x20, 0x00, 0x00, 0x00, 0x3a,
+    0x06, 0x68, 0xa7, 0x7f, 0x83, 0x24, 0xff, 0x03,
+    0x00, 0x60, 0x59, 0x3a, 0x3a, 0x00, 0x00, 0x3a,
+    0x01, 0x80 };

From d04b9414a8ab42944596950514f6353c8734eb60 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 11 Aug 2010 04:25:56 +0200
Subject: [PATCH 1353/1628] 	* kern/i386/qemu/init.c
 (grub_qemu_init_cirrus): Fix compilation error.

---
 ChangeLog             | 4 ++++
 kern/i386/qemu/init.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5d9d7a759..dae79ab7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/i386/qemu/init.c (grub_qemu_init_cirrus): Fix compilation error.
+
 2010-08-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Remove the dump of sm712 initialisation sequence.
diff --git a/kern/i386/qemu/init.c b/kern/i386/qemu/init.c
index bd12953df..054dfa86b 100644
--- a/kern/i386/qemu/init.c
+++ b/kern/i386/qemu/init.c
@@ -121,11 +121,11 @@ grub_qemu_init_cirrus (void)
 		     GRUB_VGA_SR_MAP_MASK_REGISTER);
 
   grub_vga_cr_write (15, GRUB_VGA_CR_CELL_HEIGHT);
-  grub_vga_cr_write (79, GRUB_VGA_CR_WIDTH);
+  grub_vga_cr_write (79, GRUB_VGA_CR_HORIZ_END);
   grub_vga_cr_write (40, GRUB_VGA_CR_PITCH);
 
   int vert = 25 * 16;
-  grub_vga_cr_write (vert & 0xff, GRUB_VGA_CR_HEIGHT);
+  grub_vga_cr_write (vert & 0xff, GRUB_VGA_CR_VDISPLAY_END);
   grub_vga_cr_write (((vert >> GRUB_VGA_CR_OVERFLOW_HEIGHT1_SHIFT)
 		      & GRUB_VGA_CR_OVERFLOW_HEIGHT1_MASK)
 		     | ((vert >> GRUB_VGA_CR_OVERFLOW_HEIGHT2_SHIFT)

From 79a6ba6101bfbcab861d0e2cb9bcc4552b042cd6 Mon Sep 17 00:00:00 2001
From: Yves Blusseau <blusseau@zetam.org>
Date: Wed, 11 Aug 2010 13:24:37 +0200
Subject: [PATCH 1354/1628] 2010-08-11  Yves Blusseau  <blusseau@zetam.org>

    * .bzrignore: add grub-macho2img
---
 .bzrignore | 1 +
 ChangeLog  | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/.bzrignore b/.bzrignore
index 32b96b154..26558087a 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -40,6 +40,7 @@ grub-fstest
 grub_fstest_init.c
 grub_fstest_init.h
 grub-install
+grub-macho2img
 grub-mk*
 grub-pbkdf2
 grub-pe2elf
diff --git a/ChangeLog b/ChangeLog
index dae79ab7e..005428b5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-11  Yves Blusseau  <blusseau@zetam.org>
+
+	* .bzrignore: add grub-macho2img
+
 2010-08-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/i386/qemu/init.c (grub_qemu_init_cirrus): Fix compilation error.

From 681440aa5bda1d517158d7f1fd821971419b9ea8 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Thu, 12 Aug 2010 20:45:55 +0530
Subject: [PATCH 1355/1628] fix bad color name handling

---
 include/grub/normal.h |  2 +-
 normal/color.c        | 25 ++++++++++++++-----------
 normal/main.c         |  4 ++++
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/include/grub/normal.h b/include/grub/normal.h
index a33e42e61..2a0298bc6 100644
--- a/include/grub/normal.h
+++ b/include/grub/normal.h
@@ -73,7 +73,7 @@ grub_err_t grub_normal_print_device_info (const char *name);
 /* Defined in `color.c'.  */
 char *grub_env_write_color_normal (struct grub_env_var *var, const char *val);
 char *grub_env_write_color_highlight (struct grub_env_var *var, const char *val);
-void grub_parse_color_name_pair (grub_uint8_t *ret, const char *name);
+int grub_parse_color_name_pair (grub_uint8_t *ret, const char *name);
 
 /* Defined in `menu_text.c'.  */
 void grub_wait_after_message (void);
diff --git a/normal/color.c b/normal/color.c
index bae082911..a16d1c2f9 100644
--- a/normal/color.c
+++ b/normal/color.c
@@ -56,22 +56,23 @@ parse_color_name (grub_uint8_t *ret, char *name)
   return -1;
 }
 
-void
-grub_parse_color_name_pair (grub_uint8_t *ret, const char *name)
+int
+grub_parse_color_name_pair (grub_uint8_t *color, const char *name)
 {
+  int result = 1;
   grub_uint8_t fg, bg;
   char *fg_name, *bg_name;
 
   /* nothing specified by user */
   if (name == NULL)
-    return;
+    return result;
 
   fg_name = grub_strdup (name);
   if (fg_name == NULL)
     {
       /* "out of memory" message was printed by grub_strdup() */
       grub_wait_after_message ();
-      return;
+      return result;
     }
 
   bg_name = grub_strchr (fg_name, '/');
@@ -97,10 +98,12 @@ grub_parse_color_name_pair (grub_uint8_t *ret, const char *name)
       goto free_and_return;
     }
 
-  *ret = (bg << 4) | fg;
+  *color = (bg << 4) | fg;
+  result = 0;
 
 free_and_return:
   grub_free (fg_name);
+  return result;
 }
 
 static grub_uint8_t color_normal, color_highlight;
@@ -122,10 +125,10 @@ set_colors (void)
 
 /* Replace default `normal' colors with the ones specified by user (if any).  */
 char *
-grub_env_write_color_normal (struct grub_env_var *var __attribute__ ((unused)),
-			     const char *val)
+grub_env_write_color_normal (struct grub_env_var *var, const char *val)
 {
-  grub_parse_color_name_pair (&color_normal, val);
+  if (grub_parse_color_name_pair (&color_normal, val))
+    return 0;
 
   set_colors ();
 
@@ -134,10 +137,10 @@ grub_env_write_color_normal (struct grub_env_var *var __attribute__ ((unused)),
 
 /* Replace default `highlight' colors with the ones specified by user (if any).  */
 char *
-grub_env_write_color_highlight (struct grub_env_var *var __attribute__ ((unused)),
-				const char *val)
+grub_env_write_color_highlight (struct grub_env_var *var, const char *val)
 {
-  grub_parse_color_name_pair (&color_highlight, val);
+  if (grub_parse_color_name_pair (&color_highlight, val))
+    return 0;
 
   set_colors ();
 
diff --git a/normal/main.c b/normal/main.c
index 5df889466..49658fd24 100644
--- a/normal/main.c
+++ b/normal/main.c
@@ -705,6 +705,10 @@ GRUB_MOD_INIT(normal)
   /* Preserve hooks after context changes.  */
   grub_env_export ("color_normal");
   grub_env_export ("color_highlight");
+
+  /* Set default color names.  */
+  grub_env_set ("color_normal", "white/black");
+  grub_env_set ("color_highlight", "black/white");
 }
 
 GRUB_MOD_FINI(normal)

From f3710e088ce80dcc038b6c890191f7646461a101 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sat, 14 Aug 2010 16:53:25 +0200
Subject: [PATCH 1356/1628] 2010-08-14  Robert Millan  <rmh@gnu.org>

	* kern/emu/misc.c (grub_find_zpool_from_dir): Abort function if
	filesystem is not ZFS.
---
 ChangeLog       | 5 +++++
 kern/emu/misc.c | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 3703337d8..b88eae46f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-14  Robert Millan  <rmh@gnu.org>
+
+	* kern/emu/misc.c (grub_find_zpool_from_dir): Abort function if
+	filesystem is not ZFS.
+
 2010-08-12  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Fix for misspelled color names defaulting to black/black (bug
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index 760471ebb..29be87720 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -288,6 +288,9 @@ grub_find_zpool_from_dir (const char *dir, char **poolname, char **poolfs)
   if (statfs (dir, &mnt) != 0)
     return;
 
+  if (strcmp (mnt.f_fstypename, "zfs") != 0)
+    return;
+
   *poolname = xstrdup (mnt.f_mntfromname);
 
   slash = strchr (*poolname, '/');

From 3a20130e7a667e89c369346d122a7f900f65990b Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Sun, 15 Aug 2010 12:02:33 +0530
Subject: [PATCH 1357/1628] setparams command to set positional parameters

---
 conf/tests.rmk                 |  4 +++
 include/grub/script_sh.h       |  4 +++
 script/argv.c                  | 17 ++++++++++
 script/execute.c               | 61 +++++++++++++++++++++++++++++++---
 script/main.c                  |  8 +++++
 tests/grub_script_setparams.in | 59 ++++++++++++++++++++++++++++++++
 util/grub-script-check.c       |  8 +++++
 7 files changed, 156 insertions(+), 5 deletions(-)
 create mode 100644 tests/grub_script_setparams.in

diff --git a/conf/tests.rmk b/conf/tests.rmk
index c14fe0fda..0d41a711b 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -83,6 +83,9 @@ grub_script_continue_SOURCES = tests/grub_script_continue.in
 check_SCRIPTS += grub_script_shift
 grub_script_shift_SOURCES = tests/grub_script_shift.in
 
+check_SCRIPTS += grub_script_setparams
+grub_script_setparams_SOURCES = tests/grub_script_setparams.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -103,6 +106,7 @@ SCRIPTED_TESTS += grub_script_functions
 SCRIPTED_TESTS += grub_script_break
 SCRIPTED_TESTS += grub_script_continue
 SCRIPTED_TESTS += grub_script_shift
+SCRIPTED_TESTS += grub_script_setparams
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 77e807360..e0ed5c005 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -227,6 +227,7 @@ void grub_script_init (void);
 void grub_script_fini (void);
 
 void grub_script_argv_free    (struct grub_script_argv *argv);
+int grub_script_argv_make     (struct grub_script_argv *argv, int argc, char **args);
 int grub_script_argv_next     (struct grub_script_argv *argv);
 int grub_script_argv_append   (struct grub_script_argv *argv, const char *s);
 int grub_script_argv_split_append (struct grub_script_argv *argv, char *s);
@@ -321,6 +322,9 @@ grub_err_t grub_script_break (grub_command_t cmd, int argc, char *argv[]);
 /* SHIFT command for GRUB script.  */
 grub_err_t grub_script_shift (grub_command_t cmd, int argc, char *argv[]);
 
+/* SETPARAMS command for GRUB script functions.  */
+grub_err_t grub_script_setparams (grub_command_t cmd, int argc, char *argv[]);
+
 /* This variable points to the parsed command.  This is used to
    communicate with the bison code.  */
 extern struct grub_script_cmd *grub_script_parsed;
diff --git a/script/argv.c b/script/argv.c
index b69ee39c5..c642ea9c5 100644
--- a/script/argv.c
+++ b/script/argv.c
@@ -57,6 +57,23 @@ grub_script_argv_free (struct grub_script_argv *argv)
   argv->args = 0;
 }
 
+/* Make argv from argc, args pair.  */
+int
+grub_script_argv_make (struct grub_script_argv *argv, int argc, char **args)
+{
+  int i;
+  struct grub_script_argv r = { 0, 0};
+
+  for (i = 0; i < argc; i++)
+    if (grub_script_argv_next (&r) || grub_script_argv_append (&r, args[i]))
+      {
+	grub_script_argv_free (&r);
+	return 1;
+      }
+  *argv = r;
+  return 0;
+}
+
 /* Prepare for next argc.  */
 int
 grub_script_argv_next (struct grub_script_argv *argv)
diff --git a/script/execute.c b/script/execute.c
index 26a46b12b..b911163f7 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -34,13 +34,35 @@ static unsigned long is_continue;
 static unsigned long active_loops;
 static unsigned long active_breaks;
 
+#define GRUB_SCRIPT_SCOPE_MALLOCED      1
+#define GRUB_SCRIPT_SCOPE_ARGS_MALLOCED 2
+
 /* Scope for grub script functions.  */
 struct grub_script_scope
 {
+  unsigned flags;
+  unsigned shifts;
   struct grub_script_argv argv;
 };
 static struct grub_script_scope *scope = 0;
 
+static void
+replace_scope (struct grub_script_scope *new_scope)
+{
+  if (scope)
+    {
+      scope->argv.argc += scope->shifts;
+      scope->argv.args -= scope->shifts;
+
+      if (scope->flags & GRUB_SCRIPT_SCOPE_ARGS_MALLOCED)
+	grub_script_argv_free (&scope->argv);
+
+      if (scope->flags & GRUB_SCRIPT_SCOPE_MALLOCED)
+	grub_free (scope);
+    }
+  scope = new_scope;
+}
+
 grub_err_t
 grub_script_break (grub_command_t cmd, int argc, char *argv[])
 {
@@ -85,11 +107,41 @@ grub_script_shift (grub_command_t cmd __attribute__((unused)),
   if (n > scope->argv.argc)
     return GRUB_ERR_BAD_ARGUMENT;
 
+  scope->shifts += n;
   scope->argv.argc -= n;
   scope->argv.args += n;
   return GRUB_ERR_NONE;
 }
 
+grub_err_t
+grub_script_setparams (grub_command_t cmd __attribute__((unused)),
+		       int argc, char **args)
+{
+  struct grub_script_scope *new_scope;
+  struct grub_script_argv argv = { 0, 0 };
+
+  if (! scope)
+    return GRUB_ERR_INVALID_COMMAND;
+
+  new_scope = grub_malloc (sizeof (*new_scope));
+  if (! new_scope)
+    return grub_errno;
+
+  if (grub_script_argv_make (&argv, argc, args))
+    {
+      grub_free (new_scope);
+      return grub_errno;
+    }
+
+  new_scope->shifts = 0;
+  new_scope->argv = argv;
+  new_scope->flags = GRUB_SCRIPT_SCOPE_MALLOCED |
+    GRUB_SCRIPT_SCOPE_ARGS_MALLOCED;
+
+  replace_scope (new_scope);
+  return GRUB_ERR_NONE;
+}
+
 static int
 grub_env_special (const char *name)
 {
@@ -104,6 +156,7 @@ grub_env_special (const char *name)
 static char **
 grub_script_env_get (const char *name, grub_script_arg_type_t type)
 {
+  unsigned i;
   struct grub_script_argv result = { 0, 0 };
 
   if (grub_script_argv_next (&result))
@@ -138,8 +191,6 @@ grub_script_env_get (const char *name, grub_script_arg_type_t type)
     }
   else if (grub_strcmp (name, "*") == 0)
     {
-      unsigned i;
-
       for (i = 0; i < scope->argv.argc; i++)
 	if (type == GRUB_SCRIPT_ARG_TYPE_VAR)
 	  {
@@ -160,8 +211,6 @@ grub_script_env_get (const char *name, grub_script_arg_type_t type)
     }
   else if (grub_strcmp (name, "@") == 0)
     {
-      unsigned i;
-
       for (i = 0; i < scope->argv.argc; i++)
 	{
 	  if (i != 0 && grub_script_argv_next (&result))
@@ -302,6 +351,8 @@ grub_script_function_call (grub_script_function_t func, int argc, char **args)
   struct grub_script_scope new_scope;
 
   active_loops = 0;
+  new_scope.flags = 0;
+  new_scope.shifts = 0;
   new_scope.argv.argc = argc;
   new_scope.argv.args = args;
 
@@ -311,7 +362,7 @@ grub_script_function_call (grub_script_function_t func, int argc, char **args)
   ret = grub_script_execute (func->func);
 
   active_loops = loops;
-  scope = old_scope;
+  replace_scope (old_scope); /* free any scopes by setparams */
   return ret;
 }
 
diff --git a/script/main.c b/script/main.c
index ff714d060..a16a65c13 100644
--- a/script/main.c
+++ b/script/main.c
@@ -44,6 +44,7 @@ grub_normal_parse_line (char *line, grub_reader_getline_t getline)
 static grub_command_t cmd_break;
 static grub_command_t cmd_continue;
 static grub_command_t cmd_shift;
+static grub_command_t cmd_setparams;
 
 void
 grub_script_init (void)
@@ -54,6 +55,9 @@ grub_script_init (void)
 					N_("[n]"), N_("Continue loops"));
   cmd_shift = grub_register_command ("shift", grub_script_shift,
 				     N_("[n]"), N_("Shift positional parameters."));
+  cmd_setparams = grub_register_command ("setparams", grub_script_setparams,
+					 N_("[VALUE]..."),
+					 N_("Set positional parameters."));
 }
 
 void
@@ -70,4 +74,8 @@ grub_script_fini (void)
   if (cmd_shift)
     grub_unregister_command (cmd_shift);
   cmd_shift = 0;
+
+  if (cmd_setparams)
+    grub_unregister_command (cmd_setparams);
+  cmd_setparams = 0;
 }
diff --git a/tests/grub_script_setparams.in b/tests/grub_script_setparams.in
new file mode 100644
index 000000000..82d316813
--- /dev/null
+++ b/tests/grub_script_setparams.in
@@ -0,0 +1,59 @@
+#! @builddir@/grub-shell-tester
+
+# Run GRUB script in a Qemu instance
+# Copyright (C) 2010  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/>.
+
+if test x$grubshell = xyes; then cmd=setparams; else cmd=set; fi
+
+function f1 {
+    echo $#
+    echo "$#"
+
+    echo $@
+    echo "$@"
+
+    echo $*
+    echo "$*"
+
+    echo $1 $2
+    for v in "$@"; do echo $v; done
+    shift
+    echo $1 $2
+    for v in "$@"; do echo $v; done
+
+    $cmd 1 2 3 4
+
+    echo $#
+    echo "$#"
+
+    echo $@
+    echo "$@"
+
+    echo $*
+    echo "$*"
+
+    echo $1 $2
+    for v in "$@"; do echo $v; done
+    shift
+    echo $1 $2
+    for v in "$@"; do echo $v; done
+}
+# f1
+# f1 a
+f1 a b
+f1 a b c
+f1 a b c d
+f1 a b c d e
diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index 4ca85c4bd..375d064d4 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -73,6 +73,14 @@ grub_script_shift (grub_command_t cmd __attribute__((unused)),
   return 0;
 }
 
+grub_err_t
+grub_script_setparams (grub_command_t cmd __attribute__((unused)),
+		       int argc __attribute__((unused)),
+		       char *argv[] __attribute__((unused)))
+{
+  return 0;
+}
+
 char *
 grub_script_execute_argument_to_string (struct grub_script_arg *arg __attribute__ ((unused)))
 {

From db4122ba305f95060232e80c5b8c5578cad3e970 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Sun, 15 Aug 2010 20:40:24 +0530
Subject: [PATCH 1358/1628] fix for grub-core parallel build failure

---
 grub-core/configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grub-core/configure.ac b/grub-core/configure.ac
index 691876cac..eed7f354f 100644
--- a/grub-core/configure.ac
+++ b/grub-core/configure.ac
@@ -60,7 +60,7 @@ CCAS=$TARGET_CC
 grub_CHECK_LINK_DIR
 if test x"$link_dir" = xyes ; then
   AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu])
-  cp -rp $srcdir/lib/$target_cpu lib/target_cpu
+  cp -r $srcdir/lib/$target_cpu/* lib/target_cpu
   if test "$platform" != emu ; then
     AC_CONFIG_LINKS([include/grub/machine:include/grub/$target_cpu/$platform])
   fi

From 0a4fc180ec48e4a84c23b83ebd664b764a3bea25 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Sun, 15 Aug 2010 21:09:37 +0530
Subject: [PATCH 1359/1628] parallel build fix for utils

---
 gentpl.py              | 3 +--
 grub-core/configure.ac | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gentpl.py b/gentpl.py
index ba776d642..6dd5e84a2 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -342,8 +342,7 @@ def installdir(default="bin"):
 def manpage():
     r  = "if COND_MAN_PAGES\n"
     r += gvar_add("man_MANS", "[+ name +].[+ mansection +]\n")
-    r += rule("[+ name +].[+ mansection +]", "", """
-$(MAKE) $(AM_MAKEFLAGS) [+ name +]
+    r += rule("[+ name +].[+ mansection +]", "[+ name +]", """
 chmod a+x [+ name +]
 PATH=$(builddir):$$PATH $(HELP2MAN) --section=[+ mansection +] -i $(top_srcdir)/docs/man/[+ name +].h2m -o $@ [+ name +]
 """)
diff --git a/grub-core/configure.ac b/grub-core/configure.ac
index eed7f354f..6a84c16e1 100644
--- a/grub-core/configure.ac
+++ b/grub-core/configure.ac
@@ -60,6 +60,7 @@ CCAS=$TARGET_CC
 grub_CHECK_LINK_DIR
 if test x"$link_dir" = xyes ; then
   AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu])
+  mkdir -p lib/target_cpu
   cp -r $srcdir/lib/$target_cpu/* lib/target_cpu
   if test "$platform" != emu ; then
     AC_CONFIG_LINKS([include/grub/machine:include/grub/$target_cpu/$platform])

From 729a0f2e0c59b342292ceb47fbc014f00c409524 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Sun, 15 Aug 2010 22:48:23 +0200
Subject: [PATCH 1360/1628] 2010-08-15  Robert Millan  <rmh@gnu.org>

	* kern/emu/misc.c (grub_get_libzfs_handle): Handle libzfs_init()
	errors.
	* kern/emu/getroot.c (find_root_device_from_libzfs): Handle
	grub_get_libzfs_handle() errors.
---
 ChangeLog          | 7 +++++++
 kern/emu/getroot.c | 7 ++++++-
 kern/emu/misc.c    | 4 +++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b88eae46f..b662428bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-15  Robert Millan  <rmh@gnu.org>
+
+	* kern/emu/misc.c (grub_get_libzfs_handle): Handle libzfs_init()
+	errors.
+	* kern/emu/getroot.c (find_root_device_from_libzfs): Handle
+	grub_get_libzfs_handle() errors.
+
 2010-08-14  Robert Millan  <rmh@gnu.org>
 
 	* kern/emu/misc.c (grub_find_zpool_from_dir): Abort function if
diff --git a/kern/emu/getroot.c b/kern/emu/getroot.c
index 321b33bb3..c0a10d22b 100644
--- a/kern/emu/getroot.c
+++ b/kern/emu/getroot.c
@@ -188,11 +188,16 @@ find_root_device_from_libzfs (const char *dir)
 
   {
     zpool_handle_t *zpool;
+    libzfs_handle_t *libzfs;
     nvlist_t *nvlist;
     nvlist_t **nvlist_array;
     unsigned int nvlist_count;
 
-    zpool = zpool_open (grub_get_libzfs_handle (), poolname);
+    libzfs = grub_get_libzfs_handle ();
+    if (! libzfs)
+      return NULL;
+
+    zpool = zpool_open (libzfs, poolname);
     nvlist = zpool_get_config (zpool, NULL);
 
     if (nvlist_lookup_nvlist (nvlist, "vdev_tree", &nvlist) != 0)
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index 29be87720..82f579616 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -268,7 +268,9 @@ grub_get_libzfs_handle (void)
   if (! __libzfs_handle)
     {
       __libzfs_handle = libzfs_init ();
-      atexit (fini_libzfs);
+
+      if (__libzfs_handle)
+	atexit (fini_libzfs);
     }
 
   return __libzfs_handle;

From 1ec4a279280d34ad2c5f19ef8a8024321aff8607 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Mon, 16 Aug 2010 15:04:30 +0530
Subject: [PATCH 1361/1628] export command supports multiple args

---
 normal/context.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/normal/context.c b/normal/context.c
index 27adf287a..68f7626b9 100644
--- a/normal/context.c
+++ b/normal/context.c
@@ -158,11 +158,15 @@ static grub_err_t
 grub_cmd_export (struct grub_command *cmd __attribute__ ((unused)),
 		 int argc, char **args)
 {
+  int i;
+
   if (argc < 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT,
 		       "no environment variable specified");
 
-  grub_env_export (args[0]);
+  for (i = 0; i < argc; i++)
+    grub_env_export (args[i]);
+
   return 0;
 }
 
@@ -173,7 +177,8 @@ grub_context_init (void)
   grub_env_export ("prefix");
 
   export_cmd = grub_register_command ("export", grub_cmd_export,
-				      N_("ENVVAR"), N_("Export a variable."));
+				      N_("ENVVAR..."),
+				      N_("Export variables."));
 }
 
 void

From 6304d2925501183585ad37573ba2a88dc9e8b640 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Tue, 17 Aug 2010 19:03:22 +0530
Subject: [PATCH 1362/1628] working copy, wo nested packaging

---
 autogen.sh                                    |  29 +-
 {grub-core/conf => conf}/any-emu.rmk          |   0
 {grub-core/conf => conf}/common.rmk           |   0
 {grub-core/conf => conf}/i386-coreboot.rmk    |   0
 {grub-core/conf => conf}/i386-efi.rmk         |   0
 {grub-core/conf => conf}/i386-ieee1275.rmk    |   0
 {grub-core/conf => conf}/i386-multiboot.rmk   |   0
 .../conf => conf}/i386-pc-cygwin-img-ld.sc    |   0
 {grub-core/conf => conf}/i386-pc.rmk          |   0
 {grub-core/conf => conf}/i386-qemu.rmk        |   0
 {grub-core/conf => conf}/i386.rmk             |   0
 {grub-core/conf => conf}/mips-qemu-mips.rmk   |   0
 {grub-core/conf => conf}/mips-yeeloong.rmk    |   0
 {grub-core/conf => conf}/mips.rmk             |   0
 {grub-core/conf => conf}/powerpc-ieee1275.rmk |   0
 {grub-core/conf => conf}/sparc64-ieee1275.rmk |   0
 {grub-core/conf => conf}/tests.rmk            |   0
 {grub-core/conf => conf}/x86-efi.rmk          |   0
 {grub-core/conf => conf}/x86_64-efi.rmk       |   0
 configure.ac                                  |  25 +-
 gentpl.py                                     |  32 +-
 grub-core/Makefile.am                         | 326 +++++++++++++++++-
 grub-core/Makefile.kernel                     | 250 +++++++-------
 grub-core/Makefile.vars                       |   4 +-
 .../include => include}/grub/acorn_filecore.h |   0
 {grub-core/include => include}/grub/acpi.h    |   0
 {grub-core/include => include}/grub/aout.h    |   0
 .../include => include}/grub/at_keyboard.h    |   0
 {grub-core/include => include}/grub/ata.h     |   0
 {grub-core/include => include}/grub/auth.h    |   0
 {grub-core/include => include}/grub/autoefi.h |   0
 {grub-core/include => include}/grub/bitmap.h  |   0
 .../include => include}/grub/bitmap_scale.h   |   0
 {grub-core/include => include}/grub/boot.h    |   0
 .../include => include}/grub/bsdlabel.h       |   0
 {grub-core/include => include}/grub/bufio.h   |   0
 {grub-core/include => include}/grub/cache.h   |   0
 {grub-core/include => include}/grub/charset.h |   0
 {grub-core/include => include}/grub/cmos.h    |   0
 {grub-core/include => include}/grub/command.h |   0
 {grub-core/include => include}/grub/crypto.h  |   0
 {grub-core/include => include}/grub/cs5536.h  |   0
 .../include => include}/grub/datetime.h       |   0
 {grub-core/include => include}/grub/device.h  |   0
 {grub-core/include => include}/grub/disk.h    |   0
 {grub-core/include => include}/grub/dl.h      |   0
 {grub-core/include => include}/grub/efi/api.h |   0
 .../include => include}/grub/efi/console.h    |   0
 .../grub/efi/console_control.h                |   0
 .../include => include}/grub/efi/disk.h       |   0
 {grub-core/include => include}/grub/efi/efi.h |   0
 .../grub/efi/graphics_output.h                |   0
 .../include => include}/grub/efi/memory.h     |   0
 .../include => include}/grub/efi/pe32.h       |   0
 .../include => include}/grub/efi/time.h       |   0
 .../include => include}/grub/efi/uga_draw.h   |   0
 .../include => include}/grub/efiemu/efiemu.h  |   0
 .../include => include}/grub/efiemu/runtime.h |   0
 {grub-core/include => include}/grub/elf.h     |   0
 {grub-core/include => include}/grub/elfload.h |   0
 .../include => include}/grub/emu/console.h    |   0
 .../include => include}/grub/emu/getroot.h    |   0
 .../include => include}/grub/emu/hostdisk.h   |   0
 .../include => include}/grub/emu/misc.h       |   0
 {grub-core/include => include}/grub/env.h     |   0
 .../include => include}/grub/env_private.h    |   0
 {grub-core/include => include}/grub/err.h     |   0
 {grub-core/include => include}/grub/extcmd.h  |   0
 {grub-core/include => include}/grub/fbblit.h  |   0
 {grub-core/include => include}/grub/fbfill.h  |   0
 {grub-core/include => include}/grub/fbutil.h  |   0
 {grub-core/include => include}/grub/file.h    |   0
 {grub-core/include => include}/grub/font.h    |   0
 .../include => include}/grub/fontformat.h     |   0
 {grub-core/include => include}/grub/fs.h      |   0
 {grub-core/include => include}/grub/fshelp.h  |   0
 .../include => include}/grub/gfxmenu_model.h  |   0
 .../include => include}/grub/gfxmenu_view.h   |   0
 {grub-core/include => include}/grub/gfxterm.h |   0
 .../include => include}/grub/gfxwidgets.h     |   0
 .../include => include}/grub/gpt_partition.h  |   0
 {grub-core/include => include}/grub/gui.h     |   0
 .../grub/gui_string_util.h                    |   0
 {grub-core/include => include}/grub/gzio.h    |   0
 {grub-core/include => include}/grub/hfs.h     |   0
 {grub-core/include => include}/grub/i18n.h    |   0
 .../grub/i386/at_keyboard.h                   |   0
 .../include => include}/grub/i386/bsd.h       |   0
 .../include => include}/grub/i386/cmos.h      |   0
 .../grub/i386/coreboot/boot.h                 |   0
 .../grub/i386/coreboot/console.h              |   0
 .../grub/i386/coreboot/init.h                 |   0
 .../grub/i386/coreboot/loader.h               |   0
 .../grub/i386/coreboot/memory.h               |   0
 .../grub/i386/coreboot/serial.h               |   0
 .../grub/i386/coreboot/time.h                 |   0
 .../include => include}/grub/i386/cpuid.h     |   0
 .../grub/i386/efi/loader.h                    |   0
 .../grub/i386/efi/memory.h                    |   0
 .../grub/i386/efi/serial.h                    |   0
 .../include => include}/grub/i386/efi/time.h  |   0
 .../include => include}/grub/i386/efiemu.h    |   0
 .../grub/i386/freebsd_linker.h                |   0
 .../grub/i386/freebsd_reboot.h                |   0
 .../grub/i386/ieee1275/ieee1275.h             |   0
 .../grub/i386/ieee1275/loader.h               |   0
 .../grub/i386/ieee1275/memory.h               |   0
 .../grub/i386/ieee1275/serial.h               |   0
 .../grub/i386/ieee1275/time.h                 |   0
 {grub-core/include => include}/grub/i386/io.h |   0
 .../include => include}/grub/i386/linux.h     |   0
 .../include => include}/grub/i386/loader.h    |   0
 .../include => include}/grub/i386/macho.h     |   0
 .../include => include}/grub/i386/memory.h    |   0
 .../include => include}/grub/i386/multiboot.h |   0
 .../grub/i386/multiboot/boot.h                |   0
 .../grub/i386/multiboot/console.h             |   0
 .../grub/i386/multiboot/init.h                |   0
 .../grub/i386/multiboot/kernel.h              |   0
 .../grub/i386/multiboot/loader.h              |   0
 .../grub/i386/multiboot/memory.h              |   0
 .../grub/i386/multiboot/serial.h              |   0
 .../grub/i386/multiboot/time.h                |   0
 .../grub/i386/netbsd_bootinfo.h               |   0
 .../grub/i386/netbsd_reboot.h                 |   0
 .../grub/i386/openbsd_bootarg.h               |   0
 .../grub/i386/openbsd_reboot.h                |   0
 .../grub/i386/pc/biosdisk.h                   |   0
 .../grub/i386/pc/biosnum.h                    |   0
 .../include => include}/grub/i386/pc/boot.h   |   0
 .../grub/i386/pc/chainloader.h                |   0
 .../grub/i386/pc/console.h                    |   0
 .../include => include}/grub/i386/pc/efiemu.h |   0
 .../include => include}/grub/i386/pc/init.h   |   0
 .../include => include}/grub/i386/pc/kernel.h |   0
 .../include => include}/grub/i386/pc/loader.h |   0
 .../include => include}/grub/i386/pc/memory.h |   0
 .../include => include}/grub/i386/pc/pxe.h    |   0
 .../include => include}/grub/i386/pc/time.h   |   0
 .../include => include}/grub/i386/pc/vbe.h    |   0
 .../include => include}/grub/i386/pc/vga.h    |   0
 .../include => include}/grub/i386/pci.h       |   0
 .../include => include}/grub/i386/pit.h       |   0
 .../include => include}/grub/i386/qemu/boot.h |   0
 .../grub/i386/qemu/console.h                  |   0
 .../include => include}/grub/i386/qemu/init.h |   0
 .../grub/i386/qemu/kernel.h                   |   0
 .../grub/i386/qemu/loader.h                   |   0
 .../grub/i386/qemu/memory.h                   |   0
 .../grub/i386/qemu/serial.h                   |   0
 .../include => include}/grub/i386/qemu/time.h |   0
 .../include => include}/grub/i386/relocator.h |   0
 .../include => include}/grub/i386/setjmp.h    |   0
 .../include => include}/grub/i386/time.h      |   0
 .../include => include}/grub/i386/tsc.h       |   0
 .../include => include}/grub/i386/types.h     |   0
 .../grub/i386/vga_common.h                    |   0
 .../include => include}/grub/i386/xnu.h       |   0
 .../include => include}/grub/icon_manager.h   |   0
 .../grub/ieee1275/console.h                   |   0
 .../grub/ieee1275/ieee1275.h                  |   0
 .../grub/ieee1275/ofdisk.h                    |   0
 {grub-core/include => include}/grub/kernel.h  |   0
 .../include => include}/grub/lib/LzFind.h     |   0
 .../include => include}/grub/lib/LzHash.h     |   0
 .../include => include}/grub/lib/LzmaDec.h    |   0
 .../include => include}/grub/lib/LzmaEnc.h    |   0
 .../include => include}/grub/lib/LzmaTypes.h  |   0
 {grub-core/include => include}/grub/lib/arg.h |   0
 {grub-core/include => include}/grub/lib/crc.h |   0
 .../include => include}/grub/lib/envblk.h     |   0
 .../include => include}/grub/lib/hexdump.h    |   0
 {grub-core/include => include}/grub/libgcc.h  |   0
 .../include => include}/grub/libpciaccess.h   |   0
 {grub-core/include => include}/grub/libusb.h  |   0
 {grub-core/include => include}/grub/list.h    |   0
 {grub-core/include => include}/grub/loader.h  |   0
 {grub-core/include => include}/grub/lvm.h     |   0
 {grub-core/include => include}/grub/macho.h   |   0
 .../include => include}/grub/machoload.h      |   0
 {grub-core/include => include}/grub/memory.h  |   0
 {grub-core/include => include}/grub/menu.h    |   0
 .../include => include}/grub/menu_viewer.h    |   0
 .../grub/mips/at_keyboard.h                   |   0
 .../include => include}/grub/mips/cache.h     |   0
 .../include => include}/grub/mips/cmos.h      |   0
 {grub-core/include => include}/grub/mips/io.h |   0
 .../include => include}/grub/mips/loongson.h  |   0
 .../include => include}/grub/mips/multiboot.h |   0
 .../include => include}/grub/mips/pci.h       |   0
 .../grub/mips/qemu-mips/kernel.h              |   0
 .../grub/mips/qemu-mips/loader.h              |   0
 .../grub/mips/qemu-mips/memory.h              |   0
 .../grub/mips/qemu-mips/serial.h              |   0
 .../grub/mips/qemu-mips/time.h                |   0
 .../include => include}/grub/mips/relocator.h |   0
 .../include => include}/grub/mips/setjmp.h    |   0
 .../include => include}/grub/mips/time.h      |   0
 .../include => include}/grub/mips/types.h     |   0
 .../grub/mips/yeeloong/at_keyboard.h          |   0
 .../grub/mips/yeeloong/cmos.h                 |   0
 .../grub/mips/yeeloong/ec.h                   |   0
 .../grub/mips/yeeloong/kernel.h               |   0
 .../grub/mips/yeeloong/loader.h               |   0
 .../grub/mips/yeeloong/memory.h               |   0
 .../grub/mips/yeeloong/pci.h                  |   0
 .../grub/mips/yeeloong/serial.h               |   0
 .../grub/mips/yeeloong/time.h                 |   0
 {grub-core/include => include}/grub/misc.h    |   0
 {grub-core/include => include}/grub/mm.h      |   0
 .../grub/msdos_partition.h                    |   0
 .../include => include}/grub/multiboot.h      |   0
 .../grub/multiboot_loader.h                   |   0
 {grub-core/include => include}/grub/net.h     |   0
 {grub-core/include => include}/grub/normal.h  |   0
 {grub-core/include => include}/grub/ntfs.h    |   0
 {grub-core/include => include}/grub/offsets.h |   0
 {grub-core/include => include}/grub/parser.h  |   0
 .../include => include}/grub/partition.h      |   0
 .../include => include}/grub/parttool.h       |   0
 {grub-core/include => include}/grub/pci.h     |   0
 .../include => include}/grub/pciutils.h       |   0
 .../grub/powerpc/ieee1275/biosdisk.h          |   0
 .../grub/powerpc/ieee1275/ieee1275.h          |   0
 .../grub/powerpc/ieee1275/loader.h            |   0
 .../grub/powerpc/ieee1275/memory.h            |   0
 .../grub/powerpc/ieee1275/time.h              |   0
 .../grub/powerpc/ieee1275/util/biosdisk.h     |   0
 .../include => include}/grub/powerpc/kernel.h |   0
 .../include => include}/grub/powerpc/setjmp.h |   0
 .../include => include}/grub/powerpc/time.h   |   0
 .../include => include}/grub/powerpc/types.h  |   0
 {grub-core/include => include}/grub/raid.h    |   0
 {grub-core/include => include}/grub/reader.h  |   0
 .../include => include}/grub/script_sh.h      |   0
 {grub-core/include => include}/grub/scsi.h    |   0
 {grub-core/include => include}/grub/scsicmd.h |   0
 {grub-core/include => include}/grub/sdl.h     |   0
 {grub-core/include => include}/grub/search.h  |   0
 {grub-core/include => include}/grub/serial.h  |   0
 {grub-core/include => include}/grub/setjmp.h  |   0
 {grub-core/include => include}/grub/smbus.h   |   0
 .../grub/sparc64/ieee1275/boot.h              |   0
 .../grub/sparc64/ieee1275/ieee1275.h          |   0
 .../grub/sparc64/ieee1275/kernel.h            |   0
 .../grub/sparc64/ieee1275/loader.h            |   0
 .../grub/sparc64/ieee1275/memory.h            |   0
 .../grub/sparc64/ieee1275/time.h              |   0
 .../include => include}/grub/sparc64/setjmp.h |   0
 .../include => include}/grub/sparc64/time.h   |   0
 .../include => include}/grub/sparc64/types.h  |   0
 {grub-core/include => include}/grub/symbol.h  |   0
 {grub-core/include => include}/grub/term.h    |   0
 .../include => include}/grub/terminfo.h       |   0
 {grub-core/include => include}/grub/test.h    |   0
 {grub-core/include => include}/grub/time.h    |   0
 {grub-core/include => include}/grub/tparm.h   |   0
 {grub-core/include => include}/grub/trig.h    |   0
 {grub-core/include => include}/grub/types.h   |   0
 {grub-core/include => include}/grub/unicode.h |   0
 {grub-core/include => include}/grub/usb.h     |   0
 {grub-core/include => include}/grub/usbdesc.h |   0
 .../include => include}/grub/usbtrans.h       |   0
 .../grub/util/deviceiter.h                    |   0
 .../include => include}/grub/util/lvm.h       |   0
 .../include => include}/grub/util/misc.h      |   0
 .../include => include}/grub/util/ofpath.h    |   0
 .../include => include}/grub/util/raid.h      |   0
 .../include => include}/grub/util/resolve.h   |   0
 {grub-core/include => include}/grub/vga.h     |   0
 {grub-core/include => include}/grub/video.h   |   0
 .../include => include}/grub/video_fb.h       |   0
 .../grub/x86_64/at_keyboard.h                 |   0
 .../grub/x86_64/efi/boot.h                    |   0
 .../grub/x86_64/efi/loader.h                  |   0
 .../grub/x86_64/efi/memory.h                  |   0
 .../grub/x86_64/efi/serial.h                  |   0
 .../grub/x86_64/efi/time.h                    |   0
 .../include => include}/grub/x86_64/io.h      |   0
 .../include => include}/grub/x86_64/linux.h   |   0
 .../include => include}/grub/x86_64/macho.h   |   0
 .../grub/x86_64/multiboot.h                   |   0
 .../include => include}/grub/x86_64/pci.h     |   0
 .../grub/x86_64/relocator.h                   |   0
 .../include => include}/grub/x86_64/setjmp.h  |   0
 .../include => include}/grub/x86_64/time.h    |   0
 .../include => include}/grub/x86_64/types.h   |   0
 .../include => include}/grub/x86_64/xnu.h     |   0
 {grub-core/include => include}/grub/xnu.h     |   0
 {grub-core/include => include}/multiboot.h    |   0
 {grub-core/include => include}/multiboot2.h   |   0
 {grub-core => util}/import_gcry.py            |   2 +-
 292 files changed, 481 insertions(+), 187 deletions(-)
 rename {grub-core/conf => conf}/any-emu.rmk (100%)
 rename {grub-core/conf => conf}/common.rmk (100%)
 rename {grub-core/conf => conf}/i386-coreboot.rmk (100%)
 rename {grub-core/conf => conf}/i386-efi.rmk (100%)
 rename {grub-core/conf => conf}/i386-ieee1275.rmk (100%)
 rename {grub-core/conf => conf}/i386-multiboot.rmk (100%)
 rename {grub-core/conf => conf}/i386-pc-cygwin-img-ld.sc (100%)
 rename {grub-core/conf => conf}/i386-pc.rmk (100%)
 rename {grub-core/conf => conf}/i386-qemu.rmk (100%)
 rename {grub-core/conf => conf}/i386.rmk (100%)
 rename {grub-core/conf => conf}/mips-qemu-mips.rmk (100%)
 rename {grub-core/conf => conf}/mips-yeeloong.rmk (100%)
 rename {grub-core/conf => conf}/mips.rmk (100%)
 rename {grub-core/conf => conf}/powerpc-ieee1275.rmk (100%)
 rename {grub-core/conf => conf}/sparc64-ieee1275.rmk (100%)
 rename {grub-core/conf => conf}/tests.rmk (100%)
 rename {grub-core/conf => conf}/x86-efi.rmk (100%)
 rename {grub-core/conf => conf}/x86_64-efi.rmk (100%)
 rename {grub-core/include => include}/grub/acorn_filecore.h (100%)
 rename {grub-core/include => include}/grub/acpi.h (100%)
 rename {grub-core/include => include}/grub/aout.h (100%)
 rename {grub-core/include => include}/grub/at_keyboard.h (100%)
 rename {grub-core/include => include}/grub/ata.h (100%)
 rename {grub-core/include => include}/grub/auth.h (100%)
 rename {grub-core/include => include}/grub/autoefi.h (100%)
 rename {grub-core/include => include}/grub/bitmap.h (100%)
 rename {grub-core/include => include}/grub/bitmap_scale.h (100%)
 rename {grub-core/include => include}/grub/boot.h (100%)
 rename {grub-core/include => include}/grub/bsdlabel.h (100%)
 rename {grub-core/include => include}/grub/bufio.h (100%)
 rename {grub-core/include => include}/grub/cache.h (100%)
 rename {grub-core/include => include}/grub/charset.h (100%)
 rename {grub-core/include => include}/grub/cmos.h (100%)
 rename {grub-core/include => include}/grub/command.h (100%)
 rename {grub-core/include => include}/grub/crypto.h (100%)
 rename {grub-core/include => include}/grub/cs5536.h (100%)
 rename {grub-core/include => include}/grub/datetime.h (100%)
 rename {grub-core/include => include}/grub/device.h (100%)
 rename {grub-core/include => include}/grub/disk.h (100%)
 rename {grub-core/include => include}/grub/dl.h (100%)
 rename {grub-core/include => include}/grub/efi/api.h (100%)
 rename {grub-core/include => include}/grub/efi/console.h (100%)
 rename {grub-core/include => include}/grub/efi/console_control.h (100%)
 rename {grub-core/include => include}/grub/efi/disk.h (100%)
 rename {grub-core/include => include}/grub/efi/efi.h (100%)
 rename {grub-core/include => include}/grub/efi/graphics_output.h (100%)
 rename {grub-core/include => include}/grub/efi/memory.h (100%)
 rename {grub-core/include => include}/grub/efi/pe32.h (100%)
 rename {grub-core/include => include}/grub/efi/time.h (100%)
 rename {grub-core/include => include}/grub/efi/uga_draw.h (100%)
 rename {grub-core/include => include}/grub/efiemu/efiemu.h (100%)
 rename {grub-core/include => include}/grub/efiemu/runtime.h (100%)
 rename {grub-core/include => include}/grub/elf.h (100%)
 rename {grub-core/include => include}/grub/elfload.h (100%)
 rename {grub-core/include => include}/grub/emu/console.h (100%)
 rename {grub-core/include => include}/grub/emu/getroot.h (100%)
 rename {grub-core/include => include}/grub/emu/hostdisk.h (100%)
 rename {grub-core/include => include}/grub/emu/misc.h (100%)
 rename {grub-core/include => include}/grub/env.h (100%)
 rename {grub-core/include => include}/grub/env_private.h (100%)
 rename {grub-core/include => include}/grub/err.h (100%)
 rename {grub-core/include => include}/grub/extcmd.h (100%)
 rename {grub-core/include => include}/grub/fbblit.h (100%)
 rename {grub-core/include => include}/grub/fbfill.h (100%)
 rename {grub-core/include => include}/grub/fbutil.h (100%)
 rename {grub-core/include => include}/grub/file.h (100%)
 rename {grub-core/include => include}/grub/font.h (100%)
 rename {grub-core/include => include}/grub/fontformat.h (100%)
 rename {grub-core/include => include}/grub/fs.h (100%)
 rename {grub-core/include => include}/grub/fshelp.h (100%)
 rename {grub-core/include => include}/grub/gfxmenu_model.h (100%)
 rename {grub-core/include => include}/grub/gfxmenu_view.h (100%)
 rename {grub-core/include => include}/grub/gfxterm.h (100%)
 rename {grub-core/include => include}/grub/gfxwidgets.h (100%)
 rename {grub-core/include => include}/grub/gpt_partition.h (100%)
 rename {grub-core/include => include}/grub/gui.h (100%)
 rename {grub-core/include => include}/grub/gui_string_util.h (100%)
 rename {grub-core/include => include}/grub/gzio.h (100%)
 rename {grub-core/include => include}/grub/hfs.h (100%)
 rename {grub-core/include => include}/grub/i18n.h (100%)
 rename {grub-core/include => include}/grub/i386/at_keyboard.h (100%)
 rename {grub-core/include => include}/grub/i386/bsd.h (100%)
 rename {grub-core/include => include}/grub/i386/cmos.h (100%)
 rename {grub-core/include => include}/grub/i386/coreboot/boot.h (100%)
 rename {grub-core/include => include}/grub/i386/coreboot/console.h (100%)
 rename {grub-core/include => include}/grub/i386/coreboot/init.h (100%)
 rename {grub-core/include => include}/grub/i386/coreboot/loader.h (100%)
 rename {grub-core/include => include}/grub/i386/coreboot/memory.h (100%)
 rename {grub-core/include => include}/grub/i386/coreboot/serial.h (100%)
 rename {grub-core/include => include}/grub/i386/coreboot/time.h (100%)
 rename {grub-core/include => include}/grub/i386/cpuid.h (100%)
 rename {grub-core/include => include}/grub/i386/efi/loader.h (100%)
 rename {grub-core/include => include}/grub/i386/efi/memory.h (100%)
 rename {grub-core/include => include}/grub/i386/efi/serial.h (100%)
 rename {grub-core/include => include}/grub/i386/efi/time.h (100%)
 rename {grub-core/include => include}/grub/i386/efiemu.h (100%)
 rename {grub-core/include => include}/grub/i386/freebsd_linker.h (100%)
 rename {grub-core/include => include}/grub/i386/freebsd_reboot.h (100%)
 rename {grub-core/include => include}/grub/i386/ieee1275/ieee1275.h (100%)
 rename {grub-core/include => include}/grub/i386/ieee1275/loader.h (100%)
 rename {grub-core/include => include}/grub/i386/ieee1275/memory.h (100%)
 rename {grub-core/include => include}/grub/i386/ieee1275/serial.h (100%)
 rename {grub-core/include => include}/grub/i386/ieee1275/time.h (100%)
 rename {grub-core/include => include}/grub/i386/io.h (100%)
 rename {grub-core/include => include}/grub/i386/linux.h (100%)
 rename {grub-core/include => include}/grub/i386/loader.h (100%)
 rename {grub-core/include => include}/grub/i386/macho.h (100%)
 rename {grub-core/include => include}/grub/i386/memory.h (100%)
 rename {grub-core/include => include}/grub/i386/multiboot.h (100%)
 rename {grub-core/include => include}/grub/i386/multiboot/boot.h (100%)
 rename {grub-core/include => include}/grub/i386/multiboot/console.h (100%)
 rename {grub-core/include => include}/grub/i386/multiboot/init.h (100%)
 rename {grub-core/include => include}/grub/i386/multiboot/kernel.h (100%)
 rename {grub-core/include => include}/grub/i386/multiboot/loader.h (100%)
 rename {grub-core/include => include}/grub/i386/multiboot/memory.h (100%)
 rename {grub-core/include => include}/grub/i386/multiboot/serial.h (100%)
 rename {grub-core/include => include}/grub/i386/multiboot/time.h (100%)
 rename {grub-core/include => include}/grub/i386/netbsd_bootinfo.h (100%)
 rename {grub-core/include => include}/grub/i386/netbsd_reboot.h (100%)
 rename {grub-core/include => include}/grub/i386/openbsd_bootarg.h (100%)
 rename {grub-core/include => include}/grub/i386/openbsd_reboot.h (100%)
 rename {grub-core/include => include}/grub/i386/pc/biosdisk.h (100%)
 rename {grub-core/include => include}/grub/i386/pc/biosnum.h (100%)
 rename {grub-core/include => include}/grub/i386/pc/boot.h (100%)
 rename {grub-core/include => include}/grub/i386/pc/chainloader.h (100%)
 rename {grub-core/include => include}/grub/i386/pc/console.h (100%)
 rename {grub-core/include => include}/grub/i386/pc/efiemu.h (100%)
 rename {grub-core/include => include}/grub/i386/pc/init.h (100%)
 rename {grub-core/include => include}/grub/i386/pc/kernel.h (100%)
 rename {grub-core/include => include}/grub/i386/pc/loader.h (100%)
 rename {grub-core/include => include}/grub/i386/pc/memory.h (100%)
 rename {grub-core/include => include}/grub/i386/pc/pxe.h (100%)
 rename {grub-core/include => include}/grub/i386/pc/time.h (100%)
 rename {grub-core/include => include}/grub/i386/pc/vbe.h (100%)
 rename {grub-core/include => include}/grub/i386/pc/vga.h (100%)
 rename {grub-core/include => include}/grub/i386/pci.h (100%)
 rename {grub-core/include => include}/grub/i386/pit.h (100%)
 rename {grub-core/include => include}/grub/i386/qemu/boot.h (100%)
 rename {grub-core/include => include}/grub/i386/qemu/console.h (100%)
 rename {grub-core/include => include}/grub/i386/qemu/init.h (100%)
 rename {grub-core/include => include}/grub/i386/qemu/kernel.h (100%)
 rename {grub-core/include => include}/grub/i386/qemu/loader.h (100%)
 rename {grub-core/include => include}/grub/i386/qemu/memory.h (100%)
 rename {grub-core/include => include}/grub/i386/qemu/serial.h (100%)
 rename {grub-core/include => include}/grub/i386/qemu/time.h (100%)
 rename {grub-core/include => include}/grub/i386/relocator.h (100%)
 rename {grub-core/include => include}/grub/i386/setjmp.h (100%)
 rename {grub-core/include => include}/grub/i386/time.h (100%)
 rename {grub-core/include => include}/grub/i386/tsc.h (100%)
 rename {grub-core/include => include}/grub/i386/types.h (100%)
 rename {grub-core/include => include}/grub/i386/vga_common.h (100%)
 rename {grub-core/include => include}/grub/i386/xnu.h (100%)
 rename {grub-core/include => include}/grub/icon_manager.h (100%)
 rename {grub-core/include => include}/grub/ieee1275/console.h (100%)
 rename {grub-core/include => include}/grub/ieee1275/ieee1275.h (100%)
 rename {grub-core/include => include}/grub/ieee1275/ofdisk.h (100%)
 rename {grub-core/include => include}/grub/kernel.h (100%)
 rename {grub-core/include => include}/grub/lib/LzFind.h (100%)
 rename {grub-core/include => include}/grub/lib/LzHash.h (100%)
 rename {grub-core/include => include}/grub/lib/LzmaDec.h (100%)
 rename {grub-core/include => include}/grub/lib/LzmaEnc.h (100%)
 rename {grub-core/include => include}/grub/lib/LzmaTypes.h (100%)
 rename {grub-core/include => include}/grub/lib/arg.h (100%)
 rename {grub-core/include => include}/grub/lib/crc.h (100%)
 rename {grub-core/include => include}/grub/lib/envblk.h (100%)
 rename {grub-core/include => include}/grub/lib/hexdump.h (100%)
 rename {grub-core/include => include}/grub/libgcc.h (100%)
 rename {grub-core/include => include}/grub/libpciaccess.h (100%)
 rename {grub-core/include => include}/grub/libusb.h (100%)
 rename {grub-core/include => include}/grub/list.h (100%)
 rename {grub-core/include => include}/grub/loader.h (100%)
 rename {grub-core/include => include}/grub/lvm.h (100%)
 rename {grub-core/include => include}/grub/macho.h (100%)
 rename {grub-core/include => include}/grub/machoload.h (100%)
 rename {grub-core/include => include}/grub/memory.h (100%)
 rename {grub-core/include => include}/grub/menu.h (100%)
 rename {grub-core/include => include}/grub/menu_viewer.h (100%)
 rename {grub-core/include => include}/grub/mips/at_keyboard.h (100%)
 rename {grub-core/include => include}/grub/mips/cache.h (100%)
 rename {grub-core/include => include}/grub/mips/cmos.h (100%)
 rename {grub-core/include => include}/grub/mips/io.h (100%)
 rename {grub-core/include => include}/grub/mips/loongson.h (100%)
 rename {grub-core/include => include}/grub/mips/multiboot.h (100%)
 rename {grub-core/include => include}/grub/mips/pci.h (100%)
 rename {grub-core/include => include}/grub/mips/qemu-mips/kernel.h (100%)
 rename {grub-core/include => include}/grub/mips/qemu-mips/loader.h (100%)
 rename {grub-core/include => include}/grub/mips/qemu-mips/memory.h (100%)
 rename {grub-core/include => include}/grub/mips/qemu-mips/serial.h (100%)
 rename {grub-core/include => include}/grub/mips/qemu-mips/time.h (100%)
 rename {grub-core/include => include}/grub/mips/relocator.h (100%)
 rename {grub-core/include => include}/grub/mips/setjmp.h (100%)
 rename {grub-core/include => include}/grub/mips/time.h (100%)
 rename {grub-core/include => include}/grub/mips/types.h (100%)
 rename {grub-core/include => include}/grub/mips/yeeloong/at_keyboard.h (100%)
 rename {grub-core/include => include}/grub/mips/yeeloong/cmos.h (100%)
 rename {grub-core/include => include}/grub/mips/yeeloong/ec.h (100%)
 rename {grub-core/include => include}/grub/mips/yeeloong/kernel.h (100%)
 rename {grub-core/include => include}/grub/mips/yeeloong/loader.h (100%)
 rename {grub-core/include => include}/grub/mips/yeeloong/memory.h (100%)
 rename {grub-core/include => include}/grub/mips/yeeloong/pci.h (100%)
 rename {grub-core/include => include}/grub/mips/yeeloong/serial.h (100%)
 rename {grub-core/include => include}/grub/mips/yeeloong/time.h (100%)
 rename {grub-core/include => include}/grub/misc.h (100%)
 rename {grub-core/include => include}/grub/mm.h (100%)
 rename {grub-core/include => include}/grub/msdos_partition.h (100%)
 rename {grub-core/include => include}/grub/multiboot.h (100%)
 rename {grub-core/include => include}/grub/multiboot_loader.h (100%)
 rename {grub-core/include => include}/grub/net.h (100%)
 rename {grub-core/include => include}/grub/normal.h (100%)
 rename {grub-core/include => include}/grub/ntfs.h (100%)
 rename {grub-core/include => include}/grub/offsets.h (100%)
 rename {grub-core/include => include}/grub/parser.h (100%)
 rename {grub-core/include => include}/grub/partition.h (100%)
 rename {grub-core/include => include}/grub/parttool.h (100%)
 rename {grub-core/include => include}/grub/pci.h (100%)
 rename {grub-core/include => include}/grub/pciutils.h (100%)
 rename {grub-core/include => include}/grub/powerpc/ieee1275/biosdisk.h (100%)
 rename {grub-core/include => include}/grub/powerpc/ieee1275/ieee1275.h (100%)
 rename {grub-core/include => include}/grub/powerpc/ieee1275/loader.h (100%)
 rename {grub-core/include => include}/grub/powerpc/ieee1275/memory.h (100%)
 rename {grub-core/include => include}/grub/powerpc/ieee1275/time.h (100%)
 rename {grub-core/include => include}/grub/powerpc/ieee1275/util/biosdisk.h (100%)
 rename {grub-core/include => include}/grub/powerpc/kernel.h (100%)
 rename {grub-core/include => include}/grub/powerpc/setjmp.h (100%)
 rename {grub-core/include => include}/grub/powerpc/time.h (100%)
 rename {grub-core/include => include}/grub/powerpc/types.h (100%)
 rename {grub-core/include => include}/grub/raid.h (100%)
 rename {grub-core/include => include}/grub/reader.h (100%)
 rename {grub-core/include => include}/grub/script_sh.h (100%)
 rename {grub-core/include => include}/grub/scsi.h (100%)
 rename {grub-core/include => include}/grub/scsicmd.h (100%)
 rename {grub-core/include => include}/grub/sdl.h (100%)
 rename {grub-core/include => include}/grub/search.h (100%)
 rename {grub-core/include => include}/grub/serial.h (100%)
 rename {grub-core/include => include}/grub/setjmp.h (100%)
 rename {grub-core/include => include}/grub/smbus.h (100%)
 rename {grub-core/include => include}/grub/sparc64/ieee1275/boot.h (100%)
 rename {grub-core/include => include}/grub/sparc64/ieee1275/ieee1275.h (100%)
 rename {grub-core/include => include}/grub/sparc64/ieee1275/kernel.h (100%)
 rename {grub-core/include => include}/grub/sparc64/ieee1275/loader.h (100%)
 rename {grub-core/include => include}/grub/sparc64/ieee1275/memory.h (100%)
 rename {grub-core/include => include}/grub/sparc64/ieee1275/time.h (100%)
 rename {grub-core/include => include}/grub/sparc64/setjmp.h (100%)
 rename {grub-core/include => include}/grub/sparc64/time.h (100%)
 rename {grub-core/include => include}/grub/sparc64/types.h (100%)
 rename {grub-core/include => include}/grub/symbol.h (100%)
 rename {grub-core/include => include}/grub/term.h (100%)
 rename {grub-core/include => include}/grub/terminfo.h (100%)
 rename {grub-core/include => include}/grub/test.h (100%)
 rename {grub-core/include => include}/grub/time.h (100%)
 rename {grub-core/include => include}/grub/tparm.h (100%)
 rename {grub-core/include => include}/grub/trig.h (100%)
 rename {grub-core/include => include}/grub/types.h (100%)
 rename {grub-core/include => include}/grub/unicode.h (100%)
 rename {grub-core/include => include}/grub/usb.h (100%)
 rename {grub-core/include => include}/grub/usbdesc.h (100%)
 rename {grub-core/include => include}/grub/usbtrans.h (100%)
 rename {grub-core/include => include}/grub/util/deviceiter.h (100%)
 rename {grub-core/include => include}/grub/util/lvm.h (100%)
 rename {grub-core/include => include}/grub/util/misc.h (100%)
 rename {grub-core/include => include}/grub/util/ofpath.h (100%)
 rename {grub-core/include => include}/grub/util/raid.h (100%)
 rename {grub-core/include => include}/grub/util/resolve.h (100%)
 rename {grub-core/include => include}/grub/vga.h (100%)
 rename {grub-core/include => include}/grub/video.h (100%)
 rename {grub-core/include => include}/grub/video_fb.h (100%)
 rename {grub-core/include => include}/grub/x86_64/at_keyboard.h (100%)
 rename {grub-core/include => include}/grub/x86_64/efi/boot.h (100%)
 rename {grub-core/include => include}/grub/x86_64/efi/loader.h (100%)
 rename {grub-core/include => include}/grub/x86_64/efi/memory.h (100%)
 rename {grub-core/include => include}/grub/x86_64/efi/serial.h (100%)
 rename {grub-core/include => include}/grub/x86_64/efi/time.h (100%)
 rename {grub-core/include => include}/grub/x86_64/io.h (100%)
 rename {grub-core/include => include}/grub/x86_64/linux.h (100%)
 rename {grub-core/include => include}/grub/x86_64/macho.h (100%)
 rename {grub-core/include => include}/grub/x86_64/multiboot.h (100%)
 rename {grub-core/include => include}/grub/x86_64/pci.h (100%)
 rename {grub-core/include => include}/grub/x86_64/relocator.h (100%)
 rename {grub-core/include => include}/grub/x86_64/setjmp.h (100%)
 rename {grub-core/include => include}/grub/x86_64/time.h (100%)
 rename {grub-core/include => include}/grub/x86_64/types.h (100%)
 rename {grub-core/include => include}/grub/x86_64/xnu.h (100%)
 rename {grub-core/include => include}/grub/xnu.h (100%)
 rename {grub-core/include => include}/multiboot.h (100%)
 rename {grub-core/include => include}/multiboot2.h (100%)
 rename {grub-core => util}/import_gcry.py (99%)

diff --git a/autogen.sh b/autogen.sh
index 49cd1fca5..60139cfb3 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,44 +4,21 @@ set -e
 
 autogen --version >/dev/null || (echo autogen missing; exit 1)
 
-echo "Creating symlinks..."
-ln -svf ../NEWS grub-core/
-ln -svf ../TODO grub-core/
-ln -svf ../THANKS grub-core/
-ln -svf ../README grub-core/
-ln -svf ../INSTALL grub-core/
-ln -svf ../AUTHORS grub-core/
-ln -svf ../COPYING grub-core/
-ln -svf ../ABOUT-NLS grub-core/
-ln -svf ../ChangeLog grub-core/
-ln -svf ../aclocal.m4 grub-core/
-ln -svf ../acinclude.m4 grub-core/
-ln -svf ../config.rpath grub-core/
-ln -svf ../gentpl.py grub-core/
-ln -svf ../configure.common grub-core/
-
-mkdir -vp grub-core/docs/man
-ln -svf ../../../docs/man/grub-emu.h2m grub-core/docs/man
-
 echo "Creating Makefile.tpl..."
 python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl
+
 echo "Running autogen..."
 autogen -T Makefile.tpl modules.def | sed -e '/^$/{N;/^\n$/D;}' > modules.am
-
-echo "Creating grub-core/Makefile.tpl..."
-(cd grub-core && python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl)
-echo "Running autogen..."
-(cd grub-core && autogen -T Makefile.tpl modules.def | sed -e '/^$/{N;/^\n$/D;}' > modules.am)
+autogen -T Makefile.tpl grub-core/modules.def | sed -e '/^$/{N;/^\n$/D;}' > grub-core/modules.am
 
 echo "Importing unicode..."
 python util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt unicode/ArabicShaping.txt grub-core/unidata.c
 
 echo "Importing libgcrypt..."
-(cd grub-core && python import_gcry.py lib/libgcrypt/ .)
+python util/import_gcry.py grub-core/lib/libgcrypt/ grub-core
 
 echo "Saving timestamps..."
 echo timestamp > stamp-h.in
-(cd grub-core && echo timestamp > stamp-h.in)
 
 echo "Running autoreconf..."
 autoreconf -vi
diff --git a/grub-core/conf/any-emu.rmk b/conf/any-emu.rmk
similarity index 100%
rename from grub-core/conf/any-emu.rmk
rename to conf/any-emu.rmk
diff --git a/grub-core/conf/common.rmk b/conf/common.rmk
similarity index 100%
rename from grub-core/conf/common.rmk
rename to conf/common.rmk
diff --git a/grub-core/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
similarity index 100%
rename from grub-core/conf/i386-coreboot.rmk
rename to conf/i386-coreboot.rmk
diff --git a/grub-core/conf/i386-efi.rmk b/conf/i386-efi.rmk
similarity index 100%
rename from grub-core/conf/i386-efi.rmk
rename to conf/i386-efi.rmk
diff --git a/grub-core/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
similarity index 100%
rename from grub-core/conf/i386-ieee1275.rmk
rename to conf/i386-ieee1275.rmk
diff --git a/grub-core/conf/i386-multiboot.rmk b/conf/i386-multiboot.rmk
similarity index 100%
rename from grub-core/conf/i386-multiboot.rmk
rename to conf/i386-multiboot.rmk
diff --git a/grub-core/conf/i386-pc-cygwin-img-ld.sc b/conf/i386-pc-cygwin-img-ld.sc
similarity index 100%
rename from grub-core/conf/i386-pc-cygwin-img-ld.sc
rename to conf/i386-pc-cygwin-img-ld.sc
diff --git a/grub-core/conf/i386-pc.rmk b/conf/i386-pc.rmk
similarity index 100%
rename from grub-core/conf/i386-pc.rmk
rename to conf/i386-pc.rmk
diff --git a/grub-core/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
similarity index 100%
rename from grub-core/conf/i386-qemu.rmk
rename to conf/i386-qemu.rmk
diff --git a/grub-core/conf/i386.rmk b/conf/i386.rmk
similarity index 100%
rename from grub-core/conf/i386.rmk
rename to conf/i386.rmk
diff --git a/grub-core/conf/mips-qemu-mips.rmk b/conf/mips-qemu-mips.rmk
similarity index 100%
rename from grub-core/conf/mips-qemu-mips.rmk
rename to conf/mips-qemu-mips.rmk
diff --git a/grub-core/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
similarity index 100%
rename from grub-core/conf/mips-yeeloong.rmk
rename to conf/mips-yeeloong.rmk
diff --git a/grub-core/conf/mips.rmk b/conf/mips.rmk
similarity index 100%
rename from grub-core/conf/mips.rmk
rename to conf/mips.rmk
diff --git a/grub-core/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
similarity index 100%
rename from grub-core/conf/powerpc-ieee1275.rmk
rename to conf/powerpc-ieee1275.rmk
diff --git a/grub-core/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
similarity index 100%
rename from grub-core/conf/sparc64-ieee1275.rmk
rename to conf/sparc64-ieee1275.rmk
diff --git a/grub-core/conf/tests.rmk b/conf/tests.rmk
similarity index 100%
rename from grub-core/conf/tests.rmk
rename to conf/tests.rmk
diff --git a/grub-core/conf/x86-efi.rmk b/conf/x86-efi.rmk
similarity index 100%
rename from grub-core/conf/x86-efi.rmk
rename to conf/x86-efi.rmk
diff --git a/grub-core/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
similarity index 100%
rename from grub-core/conf/x86_64-efi.rmk
rename to conf/x86_64-efi.rmk
diff --git a/configure.ac b/configure.ac
index 9b9db0ac4..dafea4545 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,13 +33,15 @@ dnl package (in grub-core directory) builds with TARGETCC.
 AC_INIT([GRUB],[1.98],[bug-grub@gnu.org])
 AC_CONFIG_AUX_DIR([.])
 
+: ${CFLAGS=""} # We don't want -g -O2
+
 # Checks for host and target systems.
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
 AM_INIT_AUTOMAKE()
 AC_PREREQ(2.60)
-AC_CONFIG_SRCDIR([grub-core/include/grub/dl.h])
+AC_CONFIG_SRCDIR([include/grub/dl.h])
 AC_CONFIG_HEADER([config.h])
 
 grub_coredir='grub-core'
@@ -51,12 +53,31 @@ AC_SUBST(grub_utildir)
 m4_include([configure.common])
 
 # Output files.
+grub_CHECK_LINK_DIR
+if test x"$link_dir" = xyes ; then
+  AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu])
+  mkdir -p grub-core/lib
+  cp -rp $srcdir/grub-core/lib/$target_cpu grub-core/lib/target_cpu
+  if test "$platform" != emu ; then
+    AC_CONFIG_LINKS([include/grub/machine:include/grub/$target_cpu/$platform])
+  fi
+else
+  mkdir -p include/grub 2>/dev/null
+  rm -rf include/grub/cpu
+  cp -rp $srcdir/include/grub/$target_cpu include/grub/cpu 2>/dev/null
+  cp -rp $srcdir/grub-core/lib/$target_cpu grub-core/lib/target_cpu 2>/dev/null
+  if test "$platform" != emu ; then
+    rm -rf include/grub/machine
+    cp -rp $srcdir/grub-core/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
+  fi
+fi
+
 AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([grub-core/Makefile])
 AC_CONFIG_FILES([po/Makefile])
 AC_CONFIG_FILES([docs/Makefile])
 AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
 
-AC_CONFIG_SUBDIRS([grub-core])
 AC_OUTPUT
 [
 echo "*******************************************************"
diff --git a/gentpl.py b/gentpl.py
index 6dd5e84a2..4d7ed0aa3 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -222,8 +222,8 @@ def-[+ name +].lst: [+ name +].module$(EXEEXT)
 und-[+ name +].lst: [+ name +].module$(EXEEXT)
 	$(NM) -u -P -p $< | sed "s/^\\([^ ]*\\).*/\\1 [+ name +]/" >> $@
 
-mod-[+ name +].c: [+ name +].module$(EXEEXT) $(top_builddir)/moddep.lst $(top_srcdir)/genmodsrc.sh
-	sh $(top_srcdir)/genmodsrc.sh [+ name +] $(top_builddir)/moddep.lst > $@ || (rm -f $@; exit 1)
+mod-[+ name +].c: [+ name +].module$(EXEEXT) moddep.lst genmodsrc.sh
+	sh $(srcdir)/genmodsrc.sh [+ name +] moddep.lst > $@ || (rm -f $@; exit 1)
 
 mod-[+ name +].o: mod-[+ name +].c
 	$(TARGET_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS_MODULE) $(CPPFLAGS) $(CFLAGS_MODULE) $(CFLAGS) -c -o $@ $<
@@ -239,26 +239,26 @@ mod-[+ name +].o: mod-[+ name +].c
 	  $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K _grub_mod_init -K _grub_mod_fini -R .note -R .comment $@; \
 	fi
 
-command-[+ name +].lst: [+ name +].pp $(top_srcdir)/gencmdlist.sh
-	cat $< | sh $(top_srcdir)/gencmdlist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+command-[+ name +].lst: [+ name +].pp $(srcdir)/gencmdlist.sh
+	cat $< | sh $(srcdir)/gencmdlist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-fs-[+ name +].lst: [+ name +].pp $(top_srcdir)/genfslist.sh
-	cat $< | sh $(top_srcdir)/genfslist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+fs-[+ name +].lst: [+ name +].pp $(srcdir)/genfslist.sh
+	cat $< | sh $(srcdir)/genfslist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-video-[+ name +].lst: [+ name +].pp $(top_srcdir)/genvideolist.sh
-	cat $< | sh $(top_srcdir)/genvideolist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+video-[+ name +].lst: [+ name +].pp $(srcdir)/genvideolist.sh
+	cat $< | sh $(srcdir)/genvideolist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-partmap-[+ name +].lst: [+ name +].pp $(top_srcdir)/genpartmaplist.sh
-	cat $< | sh $(top_srcdir)/genpartmaplist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+partmap-[+ name +].lst: [+ name +].pp $(srcdir)/genpartmaplist.sh
+	cat $< | sh $(srcdir)/genpartmaplist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-parttool-[+ name +].lst: [+ name +].pp $(top_srcdir)/genparttoollist.sh
-	cat $< | sh $(top_srcdir)/genparttoollist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+parttool-[+ name +].lst: [+ name +].pp $(srcdir)/genparttoollist.sh
+	cat $< | sh $(srcdir)/genparttoollist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-handler-[+ name +].lst: [+ name +].pp $(top_srcdir)/genhandlerlist.sh
-	cat $< | sh $(top_srcdir)/genhandlerlist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+handler-[+ name +].lst: [+ name +].pp $(srcdir)/genhandlerlist.sh
+	cat $< | sh $(srcdir)/genhandlerlist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 
-terminal-[+ name +].lst: [+ name +].pp $(top_srcdir)/genterminallist.sh
-	cat $< | sh $(top_srcdir)/genterminallist.sh [+ name +] > $@ || (rm -f $@; exit 1)
+terminal-[+ name +].lst: [+ name +].pp $(srcdir)/genterminallist.sh
+	cat $< | sh $(srcdir)/genterminallist.sh [+ name +] > $@ || (rm -f $@; exit 1)
 """
     return r
 
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 654a7e9a4..437835c83 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -1,6 +1,9 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
-SUBDIRS = po
+CC=$(TARGET_CC)
+CPP=$(TARGET_CC)
+CCAS=$(TARGET_CC)
+
 EXTRA_DIST = gentpl.py modules.def Makefile.tpl genmoddep.awk
 EXTRA_DIST += genmodsrc.sh gensymlist.sh genemuinit.sh genemuinitheader.sh
 EXTRA_DIST += genfslist.sh gencmdlist.sh genvideolist.sh genhandlerlist.sh
@@ -8,7 +11,88 @@ EXTRA_DIST += genpartmaplist.sh genparttoollist.sh genterminallist.sh
 EXTRA_DIST += conf/i386-pc-cygwin-img-ld.sc
 EXTRA_DIST += $(shell find $(top_srcdir) -name '*.h')
 
-include $(top_srcdir)/Makefile.vars
+grubconfdir = $(sysconfdir)/grub.d
+platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
+
+# to calm down automake
+BUILT_SOURCES =
+CLEANFILES =
+COMMAND_FILES =
+DEF_FILES =
+FS_FILES =
+HANDLER_FILES =
+IMG_FILES =
+MOD_FILES =
+MODULE_FILES =
+PARTMAP_FILES =
+PARTTOOL_FILES =
+TERMINAL_FILES =
+TESTS =
+UND_FILES =
+VIDEO_FILES =
+bin_PROGRAMS =
+bin_SCRIPTS =
+check_PROGRAMS =
+check_SCRIPTS =
+grubconf_DATA =
+grubconf_SCRIPTS =
+man_MANS =
+noinst_DATA =
+noinst_LIBRARIES =
+noinst_PROGRAMS =
+pkglib_SCRIPTS =
+platform_DATA =
+sbin_PROGRAMS =
+sbin_SCRIPTS =
+KERNEL_HEADER_FILES =
+
+# Platform specific options
+if COND_i386_pc
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_efi
+  LDFLAGS_PLATFORM = -melf_i386
+endif
+if COND_x86_64_efi
+  LDFLAGS_PLATFORM = -melf_x86_64
+endif
+if COND_i386_qemu
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_coreboot
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_ieee1275
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_mips_yeeloong
+  CFLAGS_PLATFORM = -march=mips3 -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
+  CCASFLAGS_PLATFORM = -march=mips3
+endif
+if COND_sparc64_ieee1275
+  CFLAGS_PLATFORM = -mno-app-regs
+  LDFLAGS_PLATFORM = -melf64_sparc -mno-relax
+endif
+
+CPPFLAGS_GRUB = -DGRUB_FILE=\"`basename $<`\"
+CPPFLAGS_GRUB += -I$(builddir) -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)
+CPPFLAGS_GRUB += -I$(top_srcdir)/include
+CPPFLAGS_GRUB += -I$(top_builddir)/include
+CCASFLAGS_GRUB = -DASM_FILE=1
+
+CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
+CPPFLAGS_GCRY = -I$(top_srcdir)/$(grub_coredir)/lib/libgcrypt_wrap
+
+CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))"
+CPPFLAGS_GNULIB = -I$(top_srcdir)/$(grub_coredir)/gnulib
+
+CFLAGS_MKISOFS = -Wno-all -Werror
+CPPFLAGS_MKISOFS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/util/mkisofs/include
+
+CFLAGS_POSIX = -fno-builtin
+CPPFLAGS_POSIX = -I$(top_srcdir)/$(grub_coredir)/lib/posix_wrap
+
+CPPFLAGS_EFIEMU = -I$(top_srcdir)/$(grub_coredir)/efiemu/runtime
 
 LDADD_KERNEL = -lgcc
 CFLAGS_KERNEL = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
@@ -41,30 +125,231 @@ AM_CPPFLAGS = $(CPPFLAGS_GRUB)
 AM_CCASFLAGS = $(CCASFLAGS_GRUB)
 
 # gentrigtables
-gentrigtables: $(top_srcdir)/gentrigtables.c
+gentrigtables: gentrigtables.c
 	$(BUILD_CC) -o $@ -I$(top_srcdir)/include $(CPPFLAGS) -lm $<
 CLEANFILES += gentrigtables
 
 # trigtables.c
-trigtables.c: gentrigtables.c configure.ac
+trigtables.c: gentrigtables.c $(top_srcdir)/configure.ac
 	$(MAKE) $(AM_MAKEFLAGS) gentrigtables
-	$(top_builddir)/gentrigtables > $@
+	$(builddir)/gentrigtables > $@
 CLEANFILES += trigtables.c
 
 # XXX Use Automake's LEX & YACC support
-grub_script.tab.h: $(top_srcdir)/script/parser.y
-	$(YACC) -d -p grub_script_yy -b grub_script $(top_srcdir)/script/parser.y
+grub_script.tab.h: script/parser.y
+	$(YACC) -d -p grub_script_yy -b grub_script $<
 grub_script.tab.c: grub_script.tab.h
 CLEANFILES += grub_script.tab.c grub_script.tab.h
 
 # For the lexer.
-grub_script.yy.h: $(top_srcdir)/script/yylex.l
-	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(top_srcdir)/script/yylex.l
+grub_script.yy.h: script/yylex.l
+	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $<
 grub_script.yy.c: grub_script.yy.h
 CLEANFILES += grub_script.yy.c grub_script.yy.h
 
 include $(srcdir)/modules.am
-include $(srcdir)/Makefile.kernel
+
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cache.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/disk.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dl.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elf.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elfload.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/file.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fs.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/kernel.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/list.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/misc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/reader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/symbol.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/types.h
+
+if COND_i386_pc
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/biosdisk.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vga.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vbe.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pxe.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
+endif
+
+if COND_i386_efi
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
+endif
+
+if COND_i386_coreboot
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+endif
+
+if COND_i386_multiboot
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+endif
+
+if COND_i386_qemu
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
+endif
+
+if COND_i386_ieee1275
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
+endif
+
+if COND_x86_64_efi
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
+endif
+
+if COND_mips_yeeloong
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap_scale.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cs5536.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pci.h
+endif
+
+if COND_powerpc_ieee1275
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+endif
+
+if COND_sparc64_ieee1275
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sparc64/ieee1275/ieee1275.h
+endif
+
+if COND_emu
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/time.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/types.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gzio.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/menu.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/datetime.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/misc.h
+if COND_GRUB_EMU_SDL
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sdl.h
+endif
+if COND_GRUB_EMU_USB
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libusb.h
+endif
+if COND_GRUB_EMU_PCI
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libpciaccess.h
+endif
+endif
+
+symlist.h: $(top_builddir)/config.h $(KERNEL_HEADER_FILES)
+	@list='$^'; \
+	for p in $$list; do \
+	  echo "#include <$$p>" >> $@ || (rm -f $@; exit 1); \
+	done
+CLEANFILES += symlist.h
+BUILT_SOURCES += symlist.h
+
+symlist.c: symlist.h gensymlist.sh
+	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) -DGRUB_SYMBOL_GENERATOR=1 symlist.h > symlist.p || (rm -f symlist.p; exit 1)
+	cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh $(top_builddir)/config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
+	rm -f symlist.p
+CLEANFILES += symlist.c
+BUILT_SOURCES += symlist.c
+
+noinst_DATA += kernel_syms.lst
+kernel_syms.lst: $(KERNEL_HEADER_FILES) $(top_builddir)/config.h
+	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) $(CFLAGS) -DGRUB_SYMBOL_GENERATOR=1 $^ >kernel_syms.input
+	if grep "^#define HAVE_ASM_USCORE" $(top_builddir)/config.h; then u="_"; else u=""; fi; \
+	cat kernel_syms.input | grep -v '^#' | sed -n \
+	  -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
+	  -e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
+	  | sort -u >$@
+	rm -f kernel_syms.input
+CLEANFILES += kernel_syms.lst
+
+if COND_emu
+kern/emu/grub_emu-main.$(OBJEXT):grub_emu_init.h
+grub_emu-grub_emu_init.$(OBJEXT):grub_emu_init.h
+kern/emu/grub_emu_dyn-main.$(OBJEXT):grub_emu_init.h
+grub_emu_dyn-grub_emu_init.$(OBJEXT):grub_emu_init.h
+
+grub_emu_init.h: genemuinitheader.sh $(MOD_FILES)
+	rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinitheader.sh $(NM) > $@
+CLEANFILES += grub_emu_init.h
+
+grub_emu_init.c: grub_emu_init.h genemuinit.sh $(MOD_FILES)
+	rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinit.sh $(NM) > $@
+CLEANFILES += grub_emu_init.c
+endif
 
 # .lst files
 platform_DATA += moddep.lst
@@ -77,9 +362,6 @@ platform_DATA += parttool.lst
 platform_DATA += video.lst
 platform_DATA += crypto.lst
 CLEANFILES += moddep.lst
-CLEANFILES += fs.lst
-CLEANFILES += command.lst
-CLEANFILES += partmap.lst
 CLEANFILES += handler.lst
 CLEANFILES += terminal.lst
 CLEANFILES += parttool.lst
@@ -88,27 +370,41 @@ CLEANFILES += crypto.lst
 
 fs.lst: $(FS_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += fs.lst
+
 command.lst: $(COMMAND_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += command.lst
+
 partmap.lst: $(PARTMAP_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += partmap.lst
+
 handler.lst: $(HANDLER_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += handler.lst
+
 terminal.lst: $(TERMINAL_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += terminal.lst
+
 parttool.lst: $(PARTTOOL_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += parttool.lst
+
 video.lst: $(VIDEO_FILES)
 	cat $^ /dev/null | sort | uniq > $@
+CLEANFILES += video.lst
 
 # but, crypto.lst is simply copied
-crypto.lst: $(top_srcdir)/lib/libgcrypt-grub/cipher/crypto.lst
+crypto.lst: $(srcdir)/lib/libgcrypt-grub/cipher/crypto.lst
 	cp $^ $@
+CLEANFILES += crypto.lst
 
 # generate global module dependencies list
 moddep.lst: kernel_syms.lst genmoddep.awk $(DEF_FILES) $(UND_FILES)
 	cat $(DEF_FILES) kernel_syms.lst /dev/null \
-	  | $(AWK) -f $(top_srcdir)/genmoddep.awk $(UND_FILES) > $@ \
+	  | $(AWK) -f $(srcdir)/genmoddep.awk $(UND_FILES) > $@ \
 	  || (rm -f $@; exit 1)
 
 if COND_i386_pc
diff --git a/grub-core/Makefile.kernel b/grub-core/Makefile.kernel
index b03563676..69c20a4fc 100644
--- a/grub-core/Makefile.kernel
+++ b/grub-core/Makefile.kernel
@@ -1,168 +1,168 @@
 # -*- makefile -*-
 
 KERNEL_HEADER_FILES =
-KERNEL_HEADER_FILES += include/grub/cache.h
-KERNEL_HEADER_FILES += include/grub/command.h
-KERNEL_HEADER_FILES += include/grub/device.h
-KERNEL_HEADER_FILES += include/grub/disk.h
-KERNEL_HEADER_FILES += include/grub/dl.h
-KERNEL_HEADER_FILES += include/grub/elf.h
-KERNEL_HEADER_FILES += include/grub/elfload.h
-KERNEL_HEADER_FILES += include/grub/env.h
-KERNEL_HEADER_FILES += include/grub/env_private.h
-KERNEL_HEADER_FILES += include/grub/err.h
-KERNEL_HEADER_FILES += include/grub/file.h
-KERNEL_HEADER_FILES += include/grub/fs.h
-KERNEL_HEADER_FILES += include/grub/i18n.h
-KERNEL_HEADER_FILES += include/grub/kernel.h
-KERNEL_HEADER_FILES += include/grub/list.h
-KERNEL_HEADER_FILES += include/grub/misc.h
-KERNEL_HEADER_FILES += include/grub/mm.h
-KERNEL_HEADER_FILES += include/grub/net.h
-KERNEL_HEADER_FILES += include/grub/parser.h
-KERNEL_HEADER_FILES += include/grub/partition.h
-KERNEL_HEADER_FILES += include/grub/reader.h
-KERNEL_HEADER_FILES += include/grub/symbol.h
-KERNEL_HEADER_FILES += include/grub/term.h
-KERNEL_HEADER_FILES += include/grub/time.h
-KERNEL_HEADER_FILES += include/grub/types.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cache.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/disk.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dl.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elf.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elfload.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/file.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fs.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/kernel.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/list.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/misc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/reader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/symbol.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/types.h
 
 if COND_i386_pc
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/machine/biosdisk.h
-KERNEL_HEADER_FILES += include/grub/machine/boot.h
-KERNEL_HEADER_FILES += include/grub/machine/console.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
-KERNEL_HEADER_FILES += include/grub/machine/vga.h
-KERNEL_HEADER_FILES += include/grub/machine/vbe.h
-KERNEL_HEADER_FILES += include/grub/machine/kernel.h
-KERNEL_HEADER_FILES += include/grub/machine/pxe.h
-KERNEL_HEADER_FILES += include/grub/i386/pit.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/biosdisk.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vga.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vbe.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pxe.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 endif
 
 if COND_i386_efi
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/efi/efi.h
-KERNEL_HEADER_FILES += include/grub/efi/time.h
-KERNEL_HEADER_FILES += include/grub/efi/disk.h
-KERNEL_HEADER_FILES += include/grub/i386/pit.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 endif
 
 if COND_i386_coreboot
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/machine/boot.h
-KERNEL_HEADER_FILES += include/grub/machine/console.h
-KERNEL_HEADER_FILES += include/grub/machine/init.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
 endif
 
 if COND_i386_multiboot
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/machine/boot.h
-KERNEL_HEADER_FILES += include/grub/machine/console.h
-KERNEL_HEADER_FILES += include/grub/machine/init.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
 endif
 
 if COND_i386_qemu
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/machine/boot.h
-KERNEL_HEADER_FILES += include/grub/machine/console.h
-KERNEL_HEADER_FILES += include/grub/machine/init.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
-KERNEL_HEADER_FILES += include/grub/pci.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
 endif
 
 if COND_i386_ieee1275
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/ieee1275/ieee1275.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/terminfo.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
 endif
 
 if COND_x86_64_efi
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/efi/efi.h
-KERNEL_HEADER_FILES += include/grub/efi/time.h
-KERNEL_HEADER_FILES += include/grub/efi/disk.h
-KERNEL_HEADER_FILES += include/grub/machine/loader.h
-KERNEL_HEADER_FILES += include/grub/i386/pit.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 endif
 
 if COND_mips_yeeloong
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/machine/kernel.h
-KERNEL_HEADER_FILES += include/grub/machine/memory.h
-KERNEL_HEADER_FILES += include/grub/cpu/cache.h
-KERNEL_HEADER_FILES += include/grub/bitmap.h
-KERNEL_HEADER_FILES += include/grub/video.h
-KERNEL_HEADER_FILES += include/grub/gfxterm.h
-KERNEL_HEADER_FILES += include/grub/font.h
-KERNEL_HEADER_FILES += include/grub/bitmap_scale.h
-KERNEL_HEADER_FILES += include/grub/bufio.h
-KERNEL_HEADER_FILES += include/grub/pci.h
-KERNEL_HEADER_FILES += include/grub/libgcc.h
-KERNEL_HEADER_FILES += include/grub/cs5536.h
-KERNEL_HEADER_FILES += include/grub/machine/pci.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap_scale.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cs5536.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pci.h
 endif
 
 if COND_powerpc_ieee1275
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/ieee1275/ieee1275.h
-KERNEL_HEADER_FILES += include/grub/libgcc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
 endif
 
 if COND_sparc64_ieee1275
-KERNEL_HEADER_FILES += include/grub/boot.h
-KERNEL_HEADER_FILES += include/grub/loader.h
-KERNEL_HEADER_FILES += include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += include/grub/libgcc.h
-KERNEL_HEADER_FILES += include/grub/ieee1275/ieee1275.h
-KERNEL_HEADER_FILES += include/grub/machine/kernel.h
-KERNEL_HEADER_FILES += include/grub/sparc64/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sparc64/ieee1275/ieee1275.h
 endif
 
 if COND_emu
-KERNEL_HEADER_FILES += include/grub/cpu/time.h
-KERNEL_HEADER_FILES += include/grub/cpu/types.h
-KERNEL_HEADER_FILES += include/grub/gzio.h
-KERNEL_HEADER_FILES += include/grub/menu.h
-KERNEL_HEADER_FILES += include/grub/datetime.h
-KERNEL_HEADER_FILES += include/grub/emu/misc.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/time.h
+KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/types.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gzio.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/menu.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/datetime.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/misc.h
 if COND_GRUB_EMU_SDL
-KERNEL_HEADER_FILES += include/grub/sdl.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sdl.h
 endif
 if COND_GRUB_EMU_USB
-KERNEL_HEADER_FILES += include/grub/libusb.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libusb.h
 endif
 if COND_GRUB_EMU_PCI
-KERNEL_HEADER_FILES += include/grub/libpciaccess.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libpciaccess.h
 endif
 endif
 
-symlist.h: config.h $(KERNEL_HEADER_FILES)
+symlist.h: $(top_builddir)/config.h $(KERNEL_HEADER_FILES)
 	@list='$^'; \
 	for p in $$list; do \
 	  echo "#include <$$p>" >> $@ || (rm -f $@; exit 1); \
@@ -172,15 +172,15 @@ BUILT_SOURCES += symlist.h
 
 symlist.c: symlist.h gensymlist.sh
 	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) -DGRUB_SYMBOL_GENERATOR=1 symlist.h > symlist.p || (rm -f symlist.p; exit 1)
-	cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
+	cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh $(top_builddir)/config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
 	rm -f symlist.p
 CLEANFILES += symlist.c
 BUILT_SOURCES += symlist.c
 
 noinst_DATA += kernel_syms.lst
-kernel_syms.lst: $(KERNEL_HEADER_FILES) config.h
+kernel_syms.lst: $(KERNEL_HEADER_FILES) $(top_builddir)/config.h
 	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) $(CFLAGS) -DGRUB_SYMBOL_GENERATOR=1 $^ >kernel_syms.input
-	if grep "^#define HAVE_ASM_USCORE" config.h; then u="_"; else u=""; fi; \
+	if grep "^#define HAVE_ASM_USCORE" $(top_builddir)/config.h; then u="_"; else u=""; fi; \
 	cat kernel_syms.input | grep -v '^#' | sed -n \
 	  -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
 	  -e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
diff --git a/grub-core/Makefile.vars b/grub-core/Makefile.vars
index db3c2a7db..6dc536139 100644
--- a/grub-core/Makefile.vars
+++ b/grub-core/Makefile.vars
@@ -33,8 +33,8 @@ endif
 
 CPPFLAGS_GRUB = -DGRUB_FILE=\"`basename $<`\"
 CPPFLAGS_GRUB += -I$(builddir) -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)
-CPPFLAGS_GRUB += -I$(top_srcdir)/$(grub_coredir)/include
-CPPFLAGS_GRUB += -I$(top_builddir)/$(grub_coredir)/include
+CPPFLAGS_GRUB += -I$(top_srcdir)/include
+CPPFLAGS_GRUB += -I$(top_builddir)/include
 CCASFLAGS_GRUB = -DASM_FILE=1
 
 CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
diff --git a/grub-core/include/grub/acorn_filecore.h b/include/grub/acorn_filecore.h
similarity index 100%
rename from grub-core/include/grub/acorn_filecore.h
rename to include/grub/acorn_filecore.h
diff --git a/grub-core/include/grub/acpi.h b/include/grub/acpi.h
similarity index 100%
rename from grub-core/include/grub/acpi.h
rename to include/grub/acpi.h
diff --git a/grub-core/include/grub/aout.h b/include/grub/aout.h
similarity index 100%
rename from grub-core/include/grub/aout.h
rename to include/grub/aout.h
diff --git a/grub-core/include/grub/at_keyboard.h b/include/grub/at_keyboard.h
similarity index 100%
rename from grub-core/include/grub/at_keyboard.h
rename to include/grub/at_keyboard.h
diff --git a/grub-core/include/grub/ata.h b/include/grub/ata.h
similarity index 100%
rename from grub-core/include/grub/ata.h
rename to include/grub/ata.h
diff --git a/grub-core/include/grub/auth.h b/include/grub/auth.h
similarity index 100%
rename from grub-core/include/grub/auth.h
rename to include/grub/auth.h
diff --git a/grub-core/include/grub/autoefi.h b/include/grub/autoefi.h
similarity index 100%
rename from grub-core/include/grub/autoefi.h
rename to include/grub/autoefi.h
diff --git a/grub-core/include/grub/bitmap.h b/include/grub/bitmap.h
similarity index 100%
rename from grub-core/include/grub/bitmap.h
rename to include/grub/bitmap.h
diff --git a/grub-core/include/grub/bitmap_scale.h b/include/grub/bitmap_scale.h
similarity index 100%
rename from grub-core/include/grub/bitmap_scale.h
rename to include/grub/bitmap_scale.h
diff --git a/grub-core/include/grub/boot.h b/include/grub/boot.h
similarity index 100%
rename from grub-core/include/grub/boot.h
rename to include/grub/boot.h
diff --git a/grub-core/include/grub/bsdlabel.h b/include/grub/bsdlabel.h
similarity index 100%
rename from grub-core/include/grub/bsdlabel.h
rename to include/grub/bsdlabel.h
diff --git a/grub-core/include/grub/bufio.h b/include/grub/bufio.h
similarity index 100%
rename from grub-core/include/grub/bufio.h
rename to include/grub/bufio.h
diff --git a/grub-core/include/grub/cache.h b/include/grub/cache.h
similarity index 100%
rename from grub-core/include/grub/cache.h
rename to include/grub/cache.h
diff --git a/grub-core/include/grub/charset.h b/include/grub/charset.h
similarity index 100%
rename from grub-core/include/grub/charset.h
rename to include/grub/charset.h
diff --git a/grub-core/include/grub/cmos.h b/include/grub/cmos.h
similarity index 100%
rename from grub-core/include/grub/cmos.h
rename to include/grub/cmos.h
diff --git a/grub-core/include/grub/command.h b/include/grub/command.h
similarity index 100%
rename from grub-core/include/grub/command.h
rename to include/grub/command.h
diff --git a/grub-core/include/grub/crypto.h b/include/grub/crypto.h
similarity index 100%
rename from grub-core/include/grub/crypto.h
rename to include/grub/crypto.h
diff --git a/grub-core/include/grub/cs5536.h b/include/grub/cs5536.h
similarity index 100%
rename from grub-core/include/grub/cs5536.h
rename to include/grub/cs5536.h
diff --git a/grub-core/include/grub/datetime.h b/include/grub/datetime.h
similarity index 100%
rename from grub-core/include/grub/datetime.h
rename to include/grub/datetime.h
diff --git a/grub-core/include/grub/device.h b/include/grub/device.h
similarity index 100%
rename from grub-core/include/grub/device.h
rename to include/grub/device.h
diff --git a/grub-core/include/grub/disk.h b/include/grub/disk.h
similarity index 100%
rename from grub-core/include/grub/disk.h
rename to include/grub/disk.h
diff --git a/grub-core/include/grub/dl.h b/include/grub/dl.h
similarity index 100%
rename from grub-core/include/grub/dl.h
rename to include/grub/dl.h
diff --git a/grub-core/include/grub/efi/api.h b/include/grub/efi/api.h
similarity index 100%
rename from grub-core/include/grub/efi/api.h
rename to include/grub/efi/api.h
diff --git a/grub-core/include/grub/efi/console.h b/include/grub/efi/console.h
similarity index 100%
rename from grub-core/include/grub/efi/console.h
rename to include/grub/efi/console.h
diff --git a/grub-core/include/grub/efi/console_control.h b/include/grub/efi/console_control.h
similarity index 100%
rename from grub-core/include/grub/efi/console_control.h
rename to include/grub/efi/console_control.h
diff --git a/grub-core/include/grub/efi/disk.h b/include/grub/efi/disk.h
similarity index 100%
rename from grub-core/include/grub/efi/disk.h
rename to include/grub/efi/disk.h
diff --git a/grub-core/include/grub/efi/efi.h b/include/grub/efi/efi.h
similarity index 100%
rename from grub-core/include/grub/efi/efi.h
rename to include/grub/efi/efi.h
diff --git a/grub-core/include/grub/efi/graphics_output.h b/include/grub/efi/graphics_output.h
similarity index 100%
rename from grub-core/include/grub/efi/graphics_output.h
rename to include/grub/efi/graphics_output.h
diff --git a/grub-core/include/grub/efi/memory.h b/include/grub/efi/memory.h
similarity index 100%
rename from grub-core/include/grub/efi/memory.h
rename to include/grub/efi/memory.h
diff --git a/grub-core/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
similarity index 100%
rename from grub-core/include/grub/efi/pe32.h
rename to include/grub/efi/pe32.h
diff --git a/grub-core/include/grub/efi/time.h b/include/grub/efi/time.h
similarity index 100%
rename from grub-core/include/grub/efi/time.h
rename to include/grub/efi/time.h
diff --git a/grub-core/include/grub/efi/uga_draw.h b/include/grub/efi/uga_draw.h
similarity index 100%
rename from grub-core/include/grub/efi/uga_draw.h
rename to include/grub/efi/uga_draw.h
diff --git a/grub-core/include/grub/efiemu/efiemu.h b/include/grub/efiemu/efiemu.h
similarity index 100%
rename from grub-core/include/grub/efiemu/efiemu.h
rename to include/grub/efiemu/efiemu.h
diff --git a/grub-core/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h
similarity index 100%
rename from grub-core/include/grub/efiemu/runtime.h
rename to include/grub/efiemu/runtime.h
diff --git a/grub-core/include/grub/elf.h b/include/grub/elf.h
similarity index 100%
rename from grub-core/include/grub/elf.h
rename to include/grub/elf.h
diff --git a/grub-core/include/grub/elfload.h b/include/grub/elfload.h
similarity index 100%
rename from grub-core/include/grub/elfload.h
rename to include/grub/elfload.h
diff --git a/grub-core/include/grub/emu/console.h b/include/grub/emu/console.h
similarity index 100%
rename from grub-core/include/grub/emu/console.h
rename to include/grub/emu/console.h
diff --git a/grub-core/include/grub/emu/getroot.h b/include/grub/emu/getroot.h
similarity index 100%
rename from grub-core/include/grub/emu/getroot.h
rename to include/grub/emu/getroot.h
diff --git a/grub-core/include/grub/emu/hostdisk.h b/include/grub/emu/hostdisk.h
similarity index 100%
rename from grub-core/include/grub/emu/hostdisk.h
rename to include/grub/emu/hostdisk.h
diff --git a/grub-core/include/grub/emu/misc.h b/include/grub/emu/misc.h
similarity index 100%
rename from grub-core/include/grub/emu/misc.h
rename to include/grub/emu/misc.h
diff --git a/grub-core/include/grub/env.h b/include/grub/env.h
similarity index 100%
rename from grub-core/include/grub/env.h
rename to include/grub/env.h
diff --git a/grub-core/include/grub/env_private.h b/include/grub/env_private.h
similarity index 100%
rename from grub-core/include/grub/env_private.h
rename to include/grub/env_private.h
diff --git a/grub-core/include/grub/err.h b/include/grub/err.h
similarity index 100%
rename from grub-core/include/grub/err.h
rename to include/grub/err.h
diff --git a/grub-core/include/grub/extcmd.h b/include/grub/extcmd.h
similarity index 100%
rename from grub-core/include/grub/extcmd.h
rename to include/grub/extcmd.h
diff --git a/grub-core/include/grub/fbblit.h b/include/grub/fbblit.h
similarity index 100%
rename from grub-core/include/grub/fbblit.h
rename to include/grub/fbblit.h
diff --git a/grub-core/include/grub/fbfill.h b/include/grub/fbfill.h
similarity index 100%
rename from grub-core/include/grub/fbfill.h
rename to include/grub/fbfill.h
diff --git a/grub-core/include/grub/fbutil.h b/include/grub/fbutil.h
similarity index 100%
rename from grub-core/include/grub/fbutil.h
rename to include/grub/fbutil.h
diff --git a/grub-core/include/grub/file.h b/include/grub/file.h
similarity index 100%
rename from grub-core/include/grub/file.h
rename to include/grub/file.h
diff --git a/grub-core/include/grub/font.h b/include/grub/font.h
similarity index 100%
rename from grub-core/include/grub/font.h
rename to include/grub/font.h
diff --git a/grub-core/include/grub/fontformat.h b/include/grub/fontformat.h
similarity index 100%
rename from grub-core/include/grub/fontformat.h
rename to include/grub/fontformat.h
diff --git a/grub-core/include/grub/fs.h b/include/grub/fs.h
similarity index 100%
rename from grub-core/include/grub/fs.h
rename to include/grub/fs.h
diff --git a/grub-core/include/grub/fshelp.h b/include/grub/fshelp.h
similarity index 100%
rename from grub-core/include/grub/fshelp.h
rename to include/grub/fshelp.h
diff --git a/grub-core/include/grub/gfxmenu_model.h b/include/grub/gfxmenu_model.h
similarity index 100%
rename from grub-core/include/grub/gfxmenu_model.h
rename to include/grub/gfxmenu_model.h
diff --git a/grub-core/include/grub/gfxmenu_view.h b/include/grub/gfxmenu_view.h
similarity index 100%
rename from grub-core/include/grub/gfxmenu_view.h
rename to include/grub/gfxmenu_view.h
diff --git a/grub-core/include/grub/gfxterm.h b/include/grub/gfxterm.h
similarity index 100%
rename from grub-core/include/grub/gfxterm.h
rename to include/grub/gfxterm.h
diff --git a/grub-core/include/grub/gfxwidgets.h b/include/grub/gfxwidgets.h
similarity index 100%
rename from grub-core/include/grub/gfxwidgets.h
rename to include/grub/gfxwidgets.h
diff --git a/grub-core/include/grub/gpt_partition.h b/include/grub/gpt_partition.h
similarity index 100%
rename from grub-core/include/grub/gpt_partition.h
rename to include/grub/gpt_partition.h
diff --git a/grub-core/include/grub/gui.h b/include/grub/gui.h
similarity index 100%
rename from grub-core/include/grub/gui.h
rename to include/grub/gui.h
diff --git a/grub-core/include/grub/gui_string_util.h b/include/grub/gui_string_util.h
similarity index 100%
rename from grub-core/include/grub/gui_string_util.h
rename to include/grub/gui_string_util.h
diff --git a/grub-core/include/grub/gzio.h b/include/grub/gzio.h
similarity index 100%
rename from grub-core/include/grub/gzio.h
rename to include/grub/gzio.h
diff --git a/grub-core/include/grub/hfs.h b/include/grub/hfs.h
similarity index 100%
rename from grub-core/include/grub/hfs.h
rename to include/grub/hfs.h
diff --git a/grub-core/include/grub/i18n.h b/include/grub/i18n.h
similarity index 100%
rename from grub-core/include/grub/i18n.h
rename to include/grub/i18n.h
diff --git a/grub-core/include/grub/i386/at_keyboard.h b/include/grub/i386/at_keyboard.h
similarity index 100%
rename from grub-core/include/grub/i386/at_keyboard.h
rename to include/grub/i386/at_keyboard.h
diff --git a/grub-core/include/grub/i386/bsd.h b/include/grub/i386/bsd.h
similarity index 100%
rename from grub-core/include/grub/i386/bsd.h
rename to include/grub/i386/bsd.h
diff --git a/grub-core/include/grub/i386/cmos.h b/include/grub/i386/cmos.h
similarity index 100%
rename from grub-core/include/grub/i386/cmos.h
rename to include/grub/i386/cmos.h
diff --git a/grub-core/include/grub/i386/coreboot/boot.h b/include/grub/i386/coreboot/boot.h
similarity index 100%
rename from grub-core/include/grub/i386/coreboot/boot.h
rename to include/grub/i386/coreboot/boot.h
diff --git a/grub-core/include/grub/i386/coreboot/console.h b/include/grub/i386/coreboot/console.h
similarity index 100%
rename from grub-core/include/grub/i386/coreboot/console.h
rename to include/grub/i386/coreboot/console.h
diff --git a/grub-core/include/grub/i386/coreboot/init.h b/include/grub/i386/coreboot/init.h
similarity index 100%
rename from grub-core/include/grub/i386/coreboot/init.h
rename to include/grub/i386/coreboot/init.h
diff --git a/grub-core/include/grub/i386/coreboot/loader.h b/include/grub/i386/coreboot/loader.h
similarity index 100%
rename from grub-core/include/grub/i386/coreboot/loader.h
rename to include/grub/i386/coreboot/loader.h
diff --git a/grub-core/include/grub/i386/coreboot/memory.h b/include/grub/i386/coreboot/memory.h
similarity index 100%
rename from grub-core/include/grub/i386/coreboot/memory.h
rename to include/grub/i386/coreboot/memory.h
diff --git a/grub-core/include/grub/i386/coreboot/serial.h b/include/grub/i386/coreboot/serial.h
similarity index 100%
rename from grub-core/include/grub/i386/coreboot/serial.h
rename to include/grub/i386/coreboot/serial.h
diff --git a/grub-core/include/grub/i386/coreboot/time.h b/include/grub/i386/coreboot/time.h
similarity index 100%
rename from grub-core/include/grub/i386/coreboot/time.h
rename to include/grub/i386/coreboot/time.h
diff --git a/grub-core/include/grub/i386/cpuid.h b/include/grub/i386/cpuid.h
similarity index 100%
rename from grub-core/include/grub/i386/cpuid.h
rename to include/grub/i386/cpuid.h
diff --git a/grub-core/include/grub/i386/efi/loader.h b/include/grub/i386/efi/loader.h
similarity index 100%
rename from grub-core/include/grub/i386/efi/loader.h
rename to include/grub/i386/efi/loader.h
diff --git a/grub-core/include/grub/i386/efi/memory.h b/include/grub/i386/efi/memory.h
similarity index 100%
rename from grub-core/include/grub/i386/efi/memory.h
rename to include/grub/i386/efi/memory.h
diff --git a/grub-core/include/grub/i386/efi/serial.h b/include/grub/i386/efi/serial.h
similarity index 100%
rename from grub-core/include/grub/i386/efi/serial.h
rename to include/grub/i386/efi/serial.h
diff --git a/grub-core/include/grub/i386/efi/time.h b/include/grub/i386/efi/time.h
similarity index 100%
rename from grub-core/include/grub/i386/efi/time.h
rename to include/grub/i386/efi/time.h
diff --git a/grub-core/include/grub/i386/efiemu.h b/include/grub/i386/efiemu.h
similarity index 100%
rename from grub-core/include/grub/i386/efiemu.h
rename to include/grub/i386/efiemu.h
diff --git a/grub-core/include/grub/i386/freebsd_linker.h b/include/grub/i386/freebsd_linker.h
similarity index 100%
rename from grub-core/include/grub/i386/freebsd_linker.h
rename to include/grub/i386/freebsd_linker.h
diff --git a/grub-core/include/grub/i386/freebsd_reboot.h b/include/grub/i386/freebsd_reboot.h
similarity index 100%
rename from grub-core/include/grub/i386/freebsd_reboot.h
rename to include/grub/i386/freebsd_reboot.h
diff --git a/grub-core/include/grub/i386/ieee1275/ieee1275.h b/include/grub/i386/ieee1275/ieee1275.h
similarity index 100%
rename from grub-core/include/grub/i386/ieee1275/ieee1275.h
rename to include/grub/i386/ieee1275/ieee1275.h
diff --git a/grub-core/include/grub/i386/ieee1275/loader.h b/include/grub/i386/ieee1275/loader.h
similarity index 100%
rename from grub-core/include/grub/i386/ieee1275/loader.h
rename to include/grub/i386/ieee1275/loader.h
diff --git a/grub-core/include/grub/i386/ieee1275/memory.h b/include/grub/i386/ieee1275/memory.h
similarity index 100%
rename from grub-core/include/grub/i386/ieee1275/memory.h
rename to include/grub/i386/ieee1275/memory.h
diff --git a/grub-core/include/grub/i386/ieee1275/serial.h b/include/grub/i386/ieee1275/serial.h
similarity index 100%
rename from grub-core/include/grub/i386/ieee1275/serial.h
rename to include/grub/i386/ieee1275/serial.h
diff --git a/grub-core/include/grub/i386/ieee1275/time.h b/include/grub/i386/ieee1275/time.h
similarity index 100%
rename from grub-core/include/grub/i386/ieee1275/time.h
rename to include/grub/i386/ieee1275/time.h
diff --git a/grub-core/include/grub/i386/io.h b/include/grub/i386/io.h
similarity index 100%
rename from grub-core/include/grub/i386/io.h
rename to include/grub/i386/io.h
diff --git a/grub-core/include/grub/i386/linux.h b/include/grub/i386/linux.h
similarity index 100%
rename from grub-core/include/grub/i386/linux.h
rename to include/grub/i386/linux.h
diff --git a/grub-core/include/grub/i386/loader.h b/include/grub/i386/loader.h
similarity index 100%
rename from grub-core/include/grub/i386/loader.h
rename to include/grub/i386/loader.h
diff --git a/grub-core/include/grub/i386/macho.h b/include/grub/i386/macho.h
similarity index 100%
rename from grub-core/include/grub/i386/macho.h
rename to include/grub/i386/macho.h
diff --git a/grub-core/include/grub/i386/memory.h b/include/grub/i386/memory.h
similarity index 100%
rename from grub-core/include/grub/i386/memory.h
rename to include/grub/i386/memory.h
diff --git a/grub-core/include/grub/i386/multiboot.h b/include/grub/i386/multiboot.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot.h
rename to include/grub/i386/multiboot.h
diff --git a/grub-core/include/grub/i386/multiboot/boot.h b/include/grub/i386/multiboot/boot.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot/boot.h
rename to include/grub/i386/multiboot/boot.h
diff --git a/grub-core/include/grub/i386/multiboot/console.h b/include/grub/i386/multiboot/console.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot/console.h
rename to include/grub/i386/multiboot/console.h
diff --git a/grub-core/include/grub/i386/multiboot/init.h b/include/grub/i386/multiboot/init.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot/init.h
rename to include/grub/i386/multiboot/init.h
diff --git a/grub-core/include/grub/i386/multiboot/kernel.h b/include/grub/i386/multiboot/kernel.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot/kernel.h
rename to include/grub/i386/multiboot/kernel.h
diff --git a/grub-core/include/grub/i386/multiboot/loader.h b/include/grub/i386/multiboot/loader.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot/loader.h
rename to include/grub/i386/multiboot/loader.h
diff --git a/grub-core/include/grub/i386/multiboot/memory.h b/include/grub/i386/multiboot/memory.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot/memory.h
rename to include/grub/i386/multiboot/memory.h
diff --git a/grub-core/include/grub/i386/multiboot/serial.h b/include/grub/i386/multiboot/serial.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot/serial.h
rename to include/grub/i386/multiboot/serial.h
diff --git a/grub-core/include/grub/i386/multiboot/time.h b/include/grub/i386/multiboot/time.h
similarity index 100%
rename from grub-core/include/grub/i386/multiboot/time.h
rename to include/grub/i386/multiboot/time.h
diff --git a/grub-core/include/grub/i386/netbsd_bootinfo.h b/include/grub/i386/netbsd_bootinfo.h
similarity index 100%
rename from grub-core/include/grub/i386/netbsd_bootinfo.h
rename to include/grub/i386/netbsd_bootinfo.h
diff --git a/grub-core/include/grub/i386/netbsd_reboot.h b/include/grub/i386/netbsd_reboot.h
similarity index 100%
rename from grub-core/include/grub/i386/netbsd_reboot.h
rename to include/grub/i386/netbsd_reboot.h
diff --git a/grub-core/include/grub/i386/openbsd_bootarg.h b/include/grub/i386/openbsd_bootarg.h
similarity index 100%
rename from grub-core/include/grub/i386/openbsd_bootarg.h
rename to include/grub/i386/openbsd_bootarg.h
diff --git a/grub-core/include/grub/i386/openbsd_reboot.h b/include/grub/i386/openbsd_reboot.h
similarity index 100%
rename from grub-core/include/grub/i386/openbsd_reboot.h
rename to include/grub/i386/openbsd_reboot.h
diff --git a/grub-core/include/grub/i386/pc/biosdisk.h b/include/grub/i386/pc/biosdisk.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/biosdisk.h
rename to include/grub/i386/pc/biosdisk.h
diff --git a/grub-core/include/grub/i386/pc/biosnum.h b/include/grub/i386/pc/biosnum.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/biosnum.h
rename to include/grub/i386/pc/biosnum.h
diff --git a/grub-core/include/grub/i386/pc/boot.h b/include/grub/i386/pc/boot.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/boot.h
rename to include/grub/i386/pc/boot.h
diff --git a/grub-core/include/grub/i386/pc/chainloader.h b/include/grub/i386/pc/chainloader.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/chainloader.h
rename to include/grub/i386/pc/chainloader.h
diff --git a/grub-core/include/grub/i386/pc/console.h b/include/grub/i386/pc/console.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/console.h
rename to include/grub/i386/pc/console.h
diff --git a/grub-core/include/grub/i386/pc/efiemu.h b/include/grub/i386/pc/efiemu.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/efiemu.h
rename to include/grub/i386/pc/efiemu.h
diff --git a/grub-core/include/grub/i386/pc/init.h b/include/grub/i386/pc/init.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/init.h
rename to include/grub/i386/pc/init.h
diff --git a/grub-core/include/grub/i386/pc/kernel.h b/include/grub/i386/pc/kernel.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/kernel.h
rename to include/grub/i386/pc/kernel.h
diff --git a/grub-core/include/grub/i386/pc/loader.h b/include/grub/i386/pc/loader.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/loader.h
rename to include/grub/i386/pc/loader.h
diff --git a/grub-core/include/grub/i386/pc/memory.h b/include/grub/i386/pc/memory.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/memory.h
rename to include/grub/i386/pc/memory.h
diff --git a/grub-core/include/grub/i386/pc/pxe.h b/include/grub/i386/pc/pxe.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/pxe.h
rename to include/grub/i386/pc/pxe.h
diff --git a/grub-core/include/grub/i386/pc/time.h b/include/grub/i386/pc/time.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/time.h
rename to include/grub/i386/pc/time.h
diff --git a/grub-core/include/grub/i386/pc/vbe.h b/include/grub/i386/pc/vbe.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/vbe.h
rename to include/grub/i386/pc/vbe.h
diff --git a/grub-core/include/grub/i386/pc/vga.h b/include/grub/i386/pc/vga.h
similarity index 100%
rename from grub-core/include/grub/i386/pc/vga.h
rename to include/grub/i386/pc/vga.h
diff --git a/grub-core/include/grub/i386/pci.h b/include/grub/i386/pci.h
similarity index 100%
rename from grub-core/include/grub/i386/pci.h
rename to include/grub/i386/pci.h
diff --git a/grub-core/include/grub/i386/pit.h b/include/grub/i386/pit.h
similarity index 100%
rename from grub-core/include/grub/i386/pit.h
rename to include/grub/i386/pit.h
diff --git a/grub-core/include/grub/i386/qemu/boot.h b/include/grub/i386/qemu/boot.h
similarity index 100%
rename from grub-core/include/grub/i386/qemu/boot.h
rename to include/grub/i386/qemu/boot.h
diff --git a/grub-core/include/grub/i386/qemu/console.h b/include/grub/i386/qemu/console.h
similarity index 100%
rename from grub-core/include/grub/i386/qemu/console.h
rename to include/grub/i386/qemu/console.h
diff --git a/grub-core/include/grub/i386/qemu/init.h b/include/grub/i386/qemu/init.h
similarity index 100%
rename from grub-core/include/grub/i386/qemu/init.h
rename to include/grub/i386/qemu/init.h
diff --git a/grub-core/include/grub/i386/qemu/kernel.h b/include/grub/i386/qemu/kernel.h
similarity index 100%
rename from grub-core/include/grub/i386/qemu/kernel.h
rename to include/grub/i386/qemu/kernel.h
diff --git a/grub-core/include/grub/i386/qemu/loader.h b/include/grub/i386/qemu/loader.h
similarity index 100%
rename from grub-core/include/grub/i386/qemu/loader.h
rename to include/grub/i386/qemu/loader.h
diff --git a/grub-core/include/grub/i386/qemu/memory.h b/include/grub/i386/qemu/memory.h
similarity index 100%
rename from grub-core/include/grub/i386/qemu/memory.h
rename to include/grub/i386/qemu/memory.h
diff --git a/grub-core/include/grub/i386/qemu/serial.h b/include/grub/i386/qemu/serial.h
similarity index 100%
rename from grub-core/include/grub/i386/qemu/serial.h
rename to include/grub/i386/qemu/serial.h
diff --git a/grub-core/include/grub/i386/qemu/time.h b/include/grub/i386/qemu/time.h
similarity index 100%
rename from grub-core/include/grub/i386/qemu/time.h
rename to include/grub/i386/qemu/time.h
diff --git a/grub-core/include/grub/i386/relocator.h b/include/grub/i386/relocator.h
similarity index 100%
rename from grub-core/include/grub/i386/relocator.h
rename to include/grub/i386/relocator.h
diff --git a/grub-core/include/grub/i386/setjmp.h b/include/grub/i386/setjmp.h
similarity index 100%
rename from grub-core/include/grub/i386/setjmp.h
rename to include/grub/i386/setjmp.h
diff --git a/grub-core/include/grub/i386/time.h b/include/grub/i386/time.h
similarity index 100%
rename from grub-core/include/grub/i386/time.h
rename to include/grub/i386/time.h
diff --git a/grub-core/include/grub/i386/tsc.h b/include/grub/i386/tsc.h
similarity index 100%
rename from grub-core/include/grub/i386/tsc.h
rename to include/grub/i386/tsc.h
diff --git a/grub-core/include/grub/i386/types.h b/include/grub/i386/types.h
similarity index 100%
rename from grub-core/include/grub/i386/types.h
rename to include/grub/i386/types.h
diff --git a/grub-core/include/grub/i386/vga_common.h b/include/grub/i386/vga_common.h
similarity index 100%
rename from grub-core/include/grub/i386/vga_common.h
rename to include/grub/i386/vga_common.h
diff --git a/grub-core/include/grub/i386/xnu.h b/include/grub/i386/xnu.h
similarity index 100%
rename from grub-core/include/grub/i386/xnu.h
rename to include/grub/i386/xnu.h
diff --git a/grub-core/include/grub/icon_manager.h b/include/grub/icon_manager.h
similarity index 100%
rename from grub-core/include/grub/icon_manager.h
rename to include/grub/icon_manager.h
diff --git a/grub-core/include/grub/ieee1275/console.h b/include/grub/ieee1275/console.h
similarity index 100%
rename from grub-core/include/grub/ieee1275/console.h
rename to include/grub/ieee1275/console.h
diff --git a/grub-core/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
similarity index 100%
rename from grub-core/include/grub/ieee1275/ieee1275.h
rename to include/grub/ieee1275/ieee1275.h
diff --git a/grub-core/include/grub/ieee1275/ofdisk.h b/include/grub/ieee1275/ofdisk.h
similarity index 100%
rename from grub-core/include/grub/ieee1275/ofdisk.h
rename to include/grub/ieee1275/ofdisk.h
diff --git a/grub-core/include/grub/kernel.h b/include/grub/kernel.h
similarity index 100%
rename from grub-core/include/grub/kernel.h
rename to include/grub/kernel.h
diff --git a/grub-core/include/grub/lib/LzFind.h b/include/grub/lib/LzFind.h
similarity index 100%
rename from grub-core/include/grub/lib/LzFind.h
rename to include/grub/lib/LzFind.h
diff --git a/grub-core/include/grub/lib/LzHash.h b/include/grub/lib/LzHash.h
similarity index 100%
rename from grub-core/include/grub/lib/LzHash.h
rename to include/grub/lib/LzHash.h
diff --git a/grub-core/include/grub/lib/LzmaDec.h b/include/grub/lib/LzmaDec.h
similarity index 100%
rename from grub-core/include/grub/lib/LzmaDec.h
rename to include/grub/lib/LzmaDec.h
diff --git a/grub-core/include/grub/lib/LzmaEnc.h b/include/grub/lib/LzmaEnc.h
similarity index 100%
rename from grub-core/include/grub/lib/LzmaEnc.h
rename to include/grub/lib/LzmaEnc.h
diff --git a/grub-core/include/grub/lib/LzmaTypes.h b/include/grub/lib/LzmaTypes.h
similarity index 100%
rename from grub-core/include/grub/lib/LzmaTypes.h
rename to include/grub/lib/LzmaTypes.h
diff --git a/grub-core/include/grub/lib/arg.h b/include/grub/lib/arg.h
similarity index 100%
rename from grub-core/include/grub/lib/arg.h
rename to include/grub/lib/arg.h
diff --git a/grub-core/include/grub/lib/crc.h b/include/grub/lib/crc.h
similarity index 100%
rename from grub-core/include/grub/lib/crc.h
rename to include/grub/lib/crc.h
diff --git a/grub-core/include/grub/lib/envblk.h b/include/grub/lib/envblk.h
similarity index 100%
rename from grub-core/include/grub/lib/envblk.h
rename to include/grub/lib/envblk.h
diff --git a/grub-core/include/grub/lib/hexdump.h b/include/grub/lib/hexdump.h
similarity index 100%
rename from grub-core/include/grub/lib/hexdump.h
rename to include/grub/lib/hexdump.h
diff --git a/grub-core/include/grub/libgcc.h b/include/grub/libgcc.h
similarity index 100%
rename from grub-core/include/grub/libgcc.h
rename to include/grub/libgcc.h
diff --git a/grub-core/include/grub/libpciaccess.h b/include/grub/libpciaccess.h
similarity index 100%
rename from grub-core/include/grub/libpciaccess.h
rename to include/grub/libpciaccess.h
diff --git a/grub-core/include/grub/libusb.h b/include/grub/libusb.h
similarity index 100%
rename from grub-core/include/grub/libusb.h
rename to include/grub/libusb.h
diff --git a/grub-core/include/grub/list.h b/include/grub/list.h
similarity index 100%
rename from grub-core/include/grub/list.h
rename to include/grub/list.h
diff --git a/grub-core/include/grub/loader.h b/include/grub/loader.h
similarity index 100%
rename from grub-core/include/grub/loader.h
rename to include/grub/loader.h
diff --git a/grub-core/include/grub/lvm.h b/include/grub/lvm.h
similarity index 100%
rename from grub-core/include/grub/lvm.h
rename to include/grub/lvm.h
diff --git a/grub-core/include/grub/macho.h b/include/grub/macho.h
similarity index 100%
rename from grub-core/include/grub/macho.h
rename to include/grub/macho.h
diff --git a/grub-core/include/grub/machoload.h b/include/grub/machoload.h
similarity index 100%
rename from grub-core/include/grub/machoload.h
rename to include/grub/machoload.h
diff --git a/grub-core/include/grub/memory.h b/include/grub/memory.h
similarity index 100%
rename from grub-core/include/grub/memory.h
rename to include/grub/memory.h
diff --git a/grub-core/include/grub/menu.h b/include/grub/menu.h
similarity index 100%
rename from grub-core/include/grub/menu.h
rename to include/grub/menu.h
diff --git a/grub-core/include/grub/menu_viewer.h b/include/grub/menu_viewer.h
similarity index 100%
rename from grub-core/include/grub/menu_viewer.h
rename to include/grub/menu_viewer.h
diff --git a/grub-core/include/grub/mips/at_keyboard.h b/include/grub/mips/at_keyboard.h
similarity index 100%
rename from grub-core/include/grub/mips/at_keyboard.h
rename to include/grub/mips/at_keyboard.h
diff --git a/grub-core/include/grub/mips/cache.h b/include/grub/mips/cache.h
similarity index 100%
rename from grub-core/include/grub/mips/cache.h
rename to include/grub/mips/cache.h
diff --git a/grub-core/include/grub/mips/cmos.h b/include/grub/mips/cmos.h
similarity index 100%
rename from grub-core/include/grub/mips/cmos.h
rename to include/grub/mips/cmos.h
diff --git a/grub-core/include/grub/mips/io.h b/include/grub/mips/io.h
similarity index 100%
rename from grub-core/include/grub/mips/io.h
rename to include/grub/mips/io.h
diff --git a/grub-core/include/grub/mips/loongson.h b/include/grub/mips/loongson.h
similarity index 100%
rename from grub-core/include/grub/mips/loongson.h
rename to include/grub/mips/loongson.h
diff --git a/grub-core/include/grub/mips/multiboot.h b/include/grub/mips/multiboot.h
similarity index 100%
rename from grub-core/include/grub/mips/multiboot.h
rename to include/grub/mips/multiboot.h
diff --git a/grub-core/include/grub/mips/pci.h b/include/grub/mips/pci.h
similarity index 100%
rename from grub-core/include/grub/mips/pci.h
rename to include/grub/mips/pci.h
diff --git a/grub-core/include/grub/mips/qemu-mips/kernel.h b/include/grub/mips/qemu-mips/kernel.h
similarity index 100%
rename from grub-core/include/grub/mips/qemu-mips/kernel.h
rename to include/grub/mips/qemu-mips/kernel.h
diff --git a/grub-core/include/grub/mips/qemu-mips/loader.h b/include/grub/mips/qemu-mips/loader.h
similarity index 100%
rename from grub-core/include/grub/mips/qemu-mips/loader.h
rename to include/grub/mips/qemu-mips/loader.h
diff --git a/grub-core/include/grub/mips/qemu-mips/memory.h b/include/grub/mips/qemu-mips/memory.h
similarity index 100%
rename from grub-core/include/grub/mips/qemu-mips/memory.h
rename to include/grub/mips/qemu-mips/memory.h
diff --git a/grub-core/include/grub/mips/qemu-mips/serial.h b/include/grub/mips/qemu-mips/serial.h
similarity index 100%
rename from grub-core/include/grub/mips/qemu-mips/serial.h
rename to include/grub/mips/qemu-mips/serial.h
diff --git a/grub-core/include/grub/mips/qemu-mips/time.h b/include/grub/mips/qemu-mips/time.h
similarity index 100%
rename from grub-core/include/grub/mips/qemu-mips/time.h
rename to include/grub/mips/qemu-mips/time.h
diff --git a/grub-core/include/grub/mips/relocator.h b/include/grub/mips/relocator.h
similarity index 100%
rename from grub-core/include/grub/mips/relocator.h
rename to include/grub/mips/relocator.h
diff --git a/grub-core/include/grub/mips/setjmp.h b/include/grub/mips/setjmp.h
similarity index 100%
rename from grub-core/include/grub/mips/setjmp.h
rename to include/grub/mips/setjmp.h
diff --git a/grub-core/include/grub/mips/time.h b/include/grub/mips/time.h
similarity index 100%
rename from grub-core/include/grub/mips/time.h
rename to include/grub/mips/time.h
diff --git a/grub-core/include/grub/mips/types.h b/include/grub/mips/types.h
similarity index 100%
rename from grub-core/include/grub/mips/types.h
rename to include/grub/mips/types.h
diff --git a/grub-core/include/grub/mips/yeeloong/at_keyboard.h b/include/grub/mips/yeeloong/at_keyboard.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/at_keyboard.h
rename to include/grub/mips/yeeloong/at_keyboard.h
diff --git a/grub-core/include/grub/mips/yeeloong/cmos.h b/include/grub/mips/yeeloong/cmos.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/cmos.h
rename to include/grub/mips/yeeloong/cmos.h
diff --git a/grub-core/include/grub/mips/yeeloong/ec.h b/include/grub/mips/yeeloong/ec.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/ec.h
rename to include/grub/mips/yeeloong/ec.h
diff --git a/grub-core/include/grub/mips/yeeloong/kernel.h b/include/grub/mips/yeeloong/kernel.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/kernel.h
rename to include/grub/mips/yeeloong/kernel.h
diff --git a/grub-core/include/grub/mips/yeeloong/loader.h b/include/grub/mips/yeeloong/loader.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/loader.h
rename to include/grub/mips/yeeloong/loader.h
diff --git a/grub-core/include/grub/mips/yeeloong/memory.h b/include/grub/mips/yeeloong/memory.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/memory.h
rename to include/grub/mips/yeeloong/memory.h
diff --git a/grub-core/include/grub/mips/yeeloong/pci.h b/include/grub/mips/yeeloong/pci.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/pci.h
rename to include/grub/mips/yeeloong/pci.h
diff --git a/grub-core/include/grub/mips/yeeloong/serial.h b/include/grub/mips/yeeloong/serial.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/serial.h
rename to include/grub/mips/yeeloong/serial.h
diff --git a/grub-core/include/grub/mips/yeeloong/time.h b/include/grub/mips/yeeloong/time.h
similarity index 100%
rename from grub-core/include/grub/mips/yeeloong/time.h
rename to include/grub/mips/yeeloong/time.h
diff --git a/grub-core/include/grub/misc.h b/include/grub/misc.h
similarity index 100%
rename from grub-core/include/grub/misc.h
rename to include/grub/misc.h
diff --git a/grub-core/include/grub/mm.h b/include/grub/mm.h
similarity index 100%
rename from grub-core/include/grub/mm.h
rename to include/grub/mm.h
diff --git a/grub-core/include/grub/msdos_partition.h b/include/grub/msdos_partition.h
similarity index 100%
rename from grub-core/include/grub/msdos_partition.h
rename to include/grub/msdos_partition.h
diff --git a/grub-core/include/grub/multiboot.h b/include/grub/multiboot.h
similarity index 100%
rename from grub-core/include/grub/multiboot.h
rename to include/grub/multiboot.h
diff --git a/grub-core/include/grub/multiboot_loader.h b/include/grub/multiboot_loader.h
similarity index 100%
rename from grub-core/include/grub/multiboot_loader.h
rename to include/grub/multiboot_loader.h
diff --git a/grub-core/include/grub/net.h b/include/grub/net.h
similarity index 100%
rename from grub-core/include/grub/net.h
rename to include/grub/net.h
diff --git a/grub-core/include/grub/normal.h b/include/grub/normal.h
similarity index 100%
rename from grub-core/include/grub/normal.h
rename to include/grub/normal.h
diff --git a/grub-core/include/grub/ntfs.h b/include/grub/ntfs.h
similarity index 100%
rename from grub-core/include/grub/ntfs.h
rename to include/grub/ntfs.h
diff --git a/grub-core/include/grub/offsets.h b/include/grub/offsets.h
similarity index 100%
rename from grub-core/include/grub/offsets.h
rename to include/grub/offsets.h
diff --git a/grub-core/include/grub/parser.h b/include/grub/parser.h
similarity index 100%
rename from grub-core/include/grub/parser.h
rename to include/grub/parser.h
diff --git a/grub-core/include/grub/partition.h b/include/grub/partition.h
similarity index 100%
rename from grub-core/include/grub/partition.h
rename to include/grub/partition.h
diff --git a/grub-core/include/grub/parttool.h b/include/grub/parttool.h
similarity index 100%
rename from grub-core/include/grub/parttool.h
rename to include/grub/parttool.h
diff --git a/grub-core/include/grub/pci.h b/include/grub/pci.h
similarity index 100%
rename from grub-core/include/grub/pci.h
rename to include/grub/pci.h
diff --git a/grub-core/include/grub/pciutils.h b/include/grub/pciutils.h
similarity index 100%
rename from grub-core/include/grub/pciutils.h
rename to include/grub/pciutils.h
diff --git a/grub-core/include/grub/powerpc/ieee1275/biosdisk.h b/include/grub/powerpc/ieee1275/biosdisk.h
similarity index 100%
rename from grub-core/include/grub/powerpc/ieee1275/biosdisk.h
rename to include/grub/powerpc/ieee1275/biosdisk.h
diff --git a/grub-core/include/grub/powerpc/ieee1275/ieee1275.h b/include/grub/powerpc/ieee1275/ieee1275.h
similarity index 100%
rename from grub-core/include/grub/powerpc/ieee1275/ieee1275.h
rename to include/grub/powerpc/ieee1275/ieee1275.h
diff --git a/grub-core/include/grub/powerpc/ieee1275/loader.h b/include/grub/powerpc/ieee1275/loader.h
similarity index 100%
rename from grub-core/include/grub/powerpc/ieee1275/loader.h
rename to include/grub/powerpc/ieee1275/loader.h
diff --git a/grub-core/include/grub/powerpc/ieee1275/memory.h b/include/grub/powerpc/ieee1275/memory.h
similarity index 100%
rename from grub-core/include/grub/powerpc/ieee1275/memory.h
rename to include/grub/powerpc/ieee1275/memory.h
diff --git a/grub-core/include/grub/powerpc/ieee1275/time.h b/include/grub/powerpc/ieee1275/time.h
similarity index 100%
rename from grub-core/include/grub/powerpc/ieee1275/time.h
rename to include/grub/powerpc/ieee1275/time.h
diff --git a/grub-core/include/grub/powerpc/ieee1275/util/biosdisk.h b/include/grub/powerpc/ieee1275/util/biosdisk.h
similarity index 100%
rename from grub-core/include/grub/powerpc/ieee1275/util/biosdisk.h
rename to include/grub/powerpc/ieee1275/util/biosdisk.h
diff --git a/grub-core/include/grub/powerpc/kernel.h b/include/grub/powerpc/kernel.h
similarity index 100%
rename from grub-core/include/grub/powerpc/kernel.h
rename to include/grub/powerpc/kernel.h
diff --git a/grub-core/include/grub/powerpc/setjmp.h b/include/grub/powerpc/setjmp.h
similarity index 100%
rename from grub-core/include/grub/powerpc/setjmp.h
rename to include/grub/powerpc/setjmp.h
diff --git a/grub-core/include/grub/powerpc/time.h b/include/grub/powerpc/time.h
similarity index 100%
rename from grub-core/include/grub/powerpc/time.h
rename to include/grub/powerpc/time.h
diff --git a/grub-core/include/grub/powerpc/types.h b/include/grub/powerpc/types.h
similarity index 100%
rename from grub-core/include/grub/powerpc/types.h
rename to include/grub/powerpc/types.h
diff --git a/grub-core/include/grub/raid.h b/include/grub/raid.h
similarity index 100%
rename from grub-core/include/grub/raid.h
rename to include/grub/raid.h
diff --git a/grub-core/include/grub/reader.h b/include/grub/reader.h
similarity index 100%
rename from grub-core/include/grub/reader.h
rename to include/grub/reader.h
diff --git a/grub-core/include/grub/script_sh.h b/include/grub/script_sh.h
similarity index 100%
rename from grub-core/include/grub/script_sh.h
rename to include/grub/script_sh.h
diff --git a/grub-core/include/grub/scsi.h b/include/grub/scsi.h
similarity index 100%
rename from grub-core/include/grub/scsi.h
rename to include/grub/scsi.h
diff --git a/grub-core/include/grub/scsicmd.h b/include/grub/scsicmd.h
similarity index 100%
rename from grub-core/include/grub/scsicmd.h
rename to include/grub/scsicmd.h
diff --git a/grub-core/include/grub/sdl.h b/include/grub/sdl.h
similarity index 100%
rename from grub-core/include/grub/sdl.h
rename to include/grub/sdl.h
diff --git a/grub-core/include/grub/search.h b/include/grub/search.h
similarity index 100%
rename from grub-core/include/grub/search.h
rename to include/grub/search.h
diff --git a/grub-core/include/grub/serial.h b/include/grub/serial.h
similarity index 100%
rename from grub-core/include/grub/serial.h
rename to include/grub/serial.h
diff --git a/grub-core/include/grub/setjmp.h b/include/grub/setjmp.h
similarity index 100%
rename from grub-core/include/grub/setjmp.h
rename to include/grub/setjmp.h
diff --git a/grub-core/include/grub/smbus.h b/include/grub/smbus.h
similarity index 100%
rename from grub-core/include/grub/smbus.h
rename to include/grub/smbus.h
diff --git a/grub-core/include/grub/sparc64/ieee1275/boot.h b/include/grub/sparc64/ieee1275/boot.h
similarity index 100%
rename from grub-core/include/grub/sparc64/ieee1275/boot.h
rename to include/grub/sparc64/ieee1275/boot.h
diff --git a/grub-core/include/grub/sparc64/ieee1275/ieee1275.h b/include/grub/sparc64/ieee1275/ieee1275.h
similarity index 100%
rename from grub-core/include/grub/sparc64/ieee1275/ieee1275.h
rename to include/grub/sparc64/ieee1275/ieee1275.h
diff --git a/grub-core/include/grub/sparc64/ieee1275/kernel.h b/include/grub/sparc64/ieee1275/kernel.h
similarity index 100%
rename from grub-core/include/grub/sparc64/ieee1275/kernel.h
rename to include/grub/sparc64/ieee1275/kernel.h
diff --git a/grub-core/include/grub/sparc64/ieee1275/loader.h b/include/grub/sparc64/ieee1275/loader.h
similarity index 100%
rename from grub-core/include/grub/sparc64/ieee1275/loader.h
rename to include/grub/sparc64/ieee1275/loader.h
diff --git a/grub-core/include/grub/sparc64/ieee1275/memory.h b/include/grub/sparc64/ieee1275/memory.h
similarity index 100%
rename from grub-core/include/grub/sparc64/ieee1275/memory.h
rename to include/grub/sparc64/ieee1275/memory.h
diff --git a/grub-core/include/grub/sparc64/ieee1275/time.h b/include/grub/sparc64/ieee1275/time.h
similarity index 100%
rename from grub-core/include/grub/sparc64/ieee1275/time.h
rename to include/grub/sparc64/ieee1275/time.h
diff --git a/grub-core/include/grub/sparc64/setjmp.h b/include/grub/sparc64/setjmp.h
similarity index 100%
rename from grub-core/include/grub/sparc64/setjmp.h
rename to include/grub/sparc64/setjmp.h
diff --git a/grub-core/include/grub/sparc64/time.h b/include/grub/sparc64/time.h
similarity index 100%
rename from grub-core/include/grub/sparc64/time.h
rename to include/grub/sparc64/time.h
diff --git a/grub-core/include/grub/sparc64/types.h b/include/grub/sparc64/types.h
similarity index 100%
rename from grub-core/include/grub/sparc64/types.h
rename to include/grub/sparc64/types.h
diff --git a/grub-core/include/grub/symbol.h b/include/grub/symbol.h
similarity index 100%
rename from grub-core/include/grub/symbol.h
rename to include/grub/symbol.h
diff --git a/grub-core/include/grub/term.h b/include/grub/term.h
similarity index 100%
rename from grub-core/include/grub/term.h
rename to include/grub/term.h
diff --git a/grub-core/include/grub/terminfo.h b/include/grub/terminfo.h
similarity index 100%
rename from grub-core/include/grub/terminfo.h
rename to include/grub/terminfo.h
diff --git a/grub-core/include/grub/test.h b/include/grub/test.h
similarity index 100%
rename from grub-core/include/grub/test.h
rename to include/grub/test.h
diff --git a/grub-core/include/grub/time.h b/include/grub/time.h
similarity index 100%
rename from grub-core/include/grub/time.h
rename to include/grub/time.h
diff --git a/grub-core/include/grub/tparm.h b/include/grub/tparm.h
similarity index 100%
rename from grub-core/include/grub/tparm.h
rename to include/grub/tparm.h
diff --git a/grub-core/include/grub/trig.h b/include/grub/trig.h
similarity index 100%
rename from grub-core/include/grub/trig.h
rename to include/grub/trig.h
diff --git a/grub-core/include/grub/types.h b/include/grub/types.h
similarity index 100%
rename from grub-core/include/grub/types.h
rename to include/grub/types.h
diff --git a/grub-core/include/grub/unicode.h b/include/grub/unicode.h
similarity index 100%
rename from grub-core/include/grub/unicode.h
rename to include/grub/unicode.h
diff --git a/grub-core/include/grub/usb.h b/include/grub/usb.h
similarity index 100%
rename from grub-core/include/grub/usb.h
rename to include/grub/usb.h
diff --git a/grub-core/include/grub/usbdesc.h b/include/grub/usbdesc.h
similarity index 100%
rename from grub-core/include/grub/usbdesc.h
rename to include/grub/usbdesc.h
diff --git a/grub-core/include/grub/usbtrans.h b/include/grub/usbtrans.h
similarity index 100%
rename from grub-core/include/grub/usbtrans.h
rename to include/grub/usbtrans.h
diff --git a/grub-core/include/grub/util/deviceiter.h b/include/grub/util/deviceiter.h
similarity index 100%
rename from grub-core/include/grub/util/deviceiter.h
rename to include/grub/util/deviceiter.h
diff --git a/grub-core/include/grub/util/lvm.h b/include/grub/util/lvm.h
similarity index 100%
rename from grub-core/include/grub/util/lvm.h
rename to include/grub/util/lvm.h
diff --git a/grub-core/include/grub/util/misc.h b/include/grub/util/misc.h
similarity index 100%
rename from grub-core/include/grub/util/misc.h
rename to include/grub/util/misc.h
diff --git a/grub-core/include/grub/util/ofpath.h b/include/grub/util/ofpath.h
similarity index 100%
rename from grub-core/include/grub/util/ofpath.h
rename to include/grub/util/ofpath.h
diff --git a/grub-core/include/grub/util/raid.h b/include/grub/util/raid.h
similarity index 100%
rename from grub-core/include/grub/util/raid.h
rename to include/grub/util/raid.h
diff --git a/grub-core/include/grub/util/resolve.h b/include/grub/util/resolve.h
similarity index 100%
rename from grub-core/include/grub/util/resolve.h
rename to include/grub/util/resolve.h
diff --git a/grub-core/include/grub/vga.h b/include/grub/vga.h
similarity index 100%
rename from grub-core/include/grub/vga.h
rename to include/grub/vga.h
diff --git a/grub-core/include/grub/video.h b/include/grub/video.h
similarity index 100%
rename from grub-core/include/grub/video.h
rename to include/grub/video.h
diff --git a/grub-core/include/grub/video_fb.h b/include/grub/video_fb.h
similarity index 100%
rename from grub-core/include/grub/video_fb.h
rename to include/grub/video_fb.h
diff --git a/grub-core/include/grub/x86_64/at_keyboard.h b/include/grub/x86_64/at_keyboard.h
similarity index 100%
rename from grub-core/include/grub/x86_64/at_keyboard.h
rename to include/grub/x86_64/at_keyboard.h
diff --git a/grub-core/include/grub/x86_64/efi/boot.h b/include/grub/x86_64/efi/boot.h
similarity index 100%
rename from grub-core/include/grub/x86_64/efi/boot.h
rename to include/grub/x86_64/efi/boot.h
diff --git a/grub-core/include/grub/x86_64/efi/loader.h b/include/grub/x86_64/efi/loader.h
similarity index 100%
rename from grub-core/include/grub/x86_64/efi/loader.h
rename to include/grub/x86_64/efi/loader.h
diff --git a/grub-core/include/grub/x86_64/efi/memory.h b/include/grub/x86_64/efi/memory.h
similarity index 100%
rename from grub-core/include/grub/x86_64/efi/memory.h
rename to include/grub/x86_64/efi/memory.h
diff --git a/grub-core/include/grub/x86_64/efi/serial.h b/include/grub/x86_64/efi/serial.h
similarity index 100%
rename from grub-core/include/grub/x86_64/efi/serial.h
rename to include/grub/x86_64/efi/serial.h
diff --git a/grub-core/include/grub/x86_64/efi/time.h b/include/grub/x86_64/efi/time.h
similarity index 100%
rename from grub-core/include/grub/x86_64/efi/time.h
rename to include/grub/x86_64/efi/time.h
diff --git a/grub-core/include/grub/x86_64/io.h b/include/grub/x86_64/io.h
similarity index 100%
rename from grub-core/include/grub/x86_64/io.h
rename to include/grub/x86_64/io.h
diff --git a/grub-core/include/grub/x86_64/linux.h b/include/grub/x86_64/linux.h
similarity index 100%
rename from grub-core/include/grub/x86_64/linux.h
rename to include/grub/x86_64/linux.h
diff --git a/grub-core/include/grub/x86_64/macho.h b/include/grub/x86_64/macho.h
similarity index 100%
rename from grub-core/include/grub/x86_64/macho.h
rename to include/grub/x86_64/macho.h
diff --git a/grub-core/include/grub/x86_64/multiboot.h b/include/grub/x86_64/multiboot.h
similarity index 100%
rename from grub-core/include/grub/x86_64/multiboot.h
rename to include/grub/x86_64/multiboot.h
diff --git a/grub-core/include/grub/x86_64/pci.h b/include/grub/x86_64/pci.h
similarity index 100%
rename from grub-core/include/grub/x86_64/pci.h
rename to include/grub/x86_64/pci.h
diff --git a/grub-core/include/grub/x86_64/relocator.h b/include/grub/x86_64/relocator.h
similarity index 100%
rename from grub-core/include/grub/x86_64/relocator.h
rename to include/grub/x86_64/relocator.h
diff --git a/grub-core/include/grub/x86_64/setjmp.h b/include/grub/x86_64/setjmp.h
similarity index 100%
rename from grub-core/include/grub/x86_64/setjmp.h
rename to include/grub/x86_64/setjmp.h
diff --git a/grub-core/include/grub/x86_64/time.h b/include/grub/x86_64/time.h
similarity index 100%
rename from grub-core/include/grub/x86_64/time.h
rename to include/grub/x86_64/time.h
diff --git a/grub-core/include/grub/x86_64/types.h b/include/grub/x86_64/types.h
similarity index 100%
rename from grub-core/include/grub/x86_64/types.h
rename to include/grub/x86_64/types.h
diff --git a/grub-core/include/grub/x86_64/xnu.h b/include/grub/x86_64/xnu.h
similarity index 100%
rename from grub-core/include/grub/x86_64/xnu.h
rename to include/grub/x86_64/xnu.h
diff --git a/grub-core/include/grub/xnu.h b/include/grub/xnu.h
similarity index 100%
rename from grub-core/include/grub/xnu.h
rename to include/grub/xnu.h
diff --git a/grub-core/include/multiboot.h b/include/multiboot.h
similarity index 100%
rename from grub-core/include/multiboot.h
rename to include/multiboot.h
diff --git a/grub-core/include/multiboot2.h b/include/multiboot2.h
similarity index 100%
rename from grub-core/include/multiboot2.h
rename to include/multiboot2.h
diff --git a/grub-core/import_gcry.py b/util/import_gcry.py
similarity index 99%
rename from grub-core/import_gcry.py
rename to util/import_gcry.py
index b9c3edcde..b63fb5501 100644
--- a/grub-core/import_gcry.py
+++ b/util/import_gcry.py
@@ -40,7 +40,7 @@ except:
     print ("WARNING: %s already exists" % cipher_dir_out)
 
 cipher_files = os.listdir (cipher_dir_in)
-conf = open (os.path.join (outdir, "conf", "gcry.rmk"), "w")
+conf = open (os.path.join ("conf", "gcry.rmk"), "w")
 conf.write ("# -*- makefile -*-\n\n")
 chlog = ""
 

From 5c2d039c58dc40e2d559ac7bd0f1cdd4676463e4 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Tue, 17 Aug 2010 19:04:35 +0530
Subject: [PATCH 1363/1628] update .bzrignore

---
 .bzrignore | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index ac5e3f86d..7347c0950 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -88,26 +88,5 @@ compile
 depcomp
 mdate-sh
 texinfo.tex
-grub-core/ABOUT-NLS
-grub-core/AUTHORS
-grub-core/COPYING
-grub-core/ChangeLog
-grub-core/INSTALL
-grub-core/Makefile.tpl
-grub-core/NEWS
-grub-core/README
-grub-core/THANKS
-grub-core/TODO
-grub-core/acinclude.m4
-grub-core/compile
-grub-core/config.rpath
-grub-core/configure.common
-grub-core/depcomp
-grub-core/gentpl.py
-grub-core/conf/gcry.rmk
-grub-core/docs
-grub-core/docs/man
 grub-core/lib/libgcrypt-grub
-grub-core/include/grub/cpu
-grub-core/include/grub/machine
 

From c49e5dfff81d1e4af75c5fe6bd9c0ab096503950 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Tue, 17 Aug 2010 19:17:57 +0530
Subject: [PATCH 1364/1628] remove Makefile.kernel and Makefile.vars

---
 Makefile.am               |  82 ++++++++++++++-
 grub-core/Makefile.kernel | 204 --------------------------------------
 grub-core/Makefile.vars   |  83 ----------------
 3 files changed, 81 insertions(+), 288 deletions(-)
 delete mode 100644 grub-core/Makefile.kernel
 delete mode 100644 grub-core/Makefile.vars

diff --git a/Makefile.am b/Makefile.am
index c7f3614d4..51203c00d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,87 @@ AUTOMAKE_OPTIONS = subdir-objects
 SUBDIRS = . grub-core po docs
 EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
 
-include $(top_srcdir)/grub-core/Makefile.vars
+grubconfdir = $(sysconfdir)/grub.d
+platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
+
+# Platform specific options
+if COND_i386_pc
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_efi
+  LDFLAGS_PLATFORM = -melf_i386
+endif
+if COND_x86_64_efi
+  LDFLAGS_PLATFORM = -melf_x86_64
+endif
+if COND_i386_qemu
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_coreboot
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_ieee1275
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_mips_yeeloong
+  CFLAGS_PLATFORM = -march=mips3 -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
+  CCASFLAGS_PLATFORM = -march=mips3
+endif
+if COND_sparc64_ieee1275
+  CFLAGS_PLATFORM = -mno-app-regs
+  LDFLAGS_PLATFORM = -melf64_sparc -mno-relax
+endif
+
+CPPFLAGS_GRUB = -DGRUB_FILE=\"`basename $<`\"
+CPPFLAGS_GRUB += -I$(builddir) -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)
+CPPFLAGS_GRUB += -I$(top_srcdir)/include
+CPPFLAGS_GRUB += -I$(top_builddir)/include
+CCASFLAGS_GRUB = -DASM_FILE=1
+
+CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
+CPPFLAGS_GCRY = -I$(top_srcdir)/$(grub_coredir)/lib/libgcrypt_wrap
+
+CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))"
+CPPFLAGS_GNULIB = -I$(top_srcdir)/$(grub_coredir)/gnulib
+
+CFLAGS_MKISOFS = -Wno-all -Werror
+CPPFLAGS_MKISOFS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/util/mkisofs/include
+
+CFLAGS_POSIX = -fno-builtin
+CPPFLAGS_POSIX = -I$(top_srcdir)/$(grub_coredir)/lib/posix_wrap
+
+CPPFLAGS_EFIEMU = -I$(top_srcdir)/$(grub_coredir)/efiemu/runtime
+
+# to calm down automake
+BUILT_SOURCES =
+CLEANFILES =
+COMMAND_FILES =
+DEF_FILES =
+FS_FILES =
+HANDLER_FILES =
+IMG_FILES =
+MOD_FILES =
+MODULE_FILES =
+PARTMAP_FILES =
+PARTTOOL_FILES =
+TERMINAL_FILES =
+TESTS =
+UND_FILES =
+VIDEO_FILES =
+bin_PROGRAMS =
+bin_SCRIPTS =
+check_PROGRAMS =
+check_SCRIPTS =
+grubconf_DATA =
+grubconf_SCRIPTS =
+man_MANS =
+noinst_DATA =
+noinst_LIBRARIES =
+noinst_PROGRAMS =
+pkglib_SCRIPTS =
+platform_DATA =
+sbin_PROGRAMS =
+sbin_SCRIPTS =
 
 CFLAGS_PROGRAM = $(HOST_CFLAGS) $(CFLAGS_GNULIB)
 LDFLAGS_PROGRAM = $(HOST_LDFLAGS) $(LDFLAGS_GNULIB)
diff --git a/grub-core/Makefile.kernel b/grub-core/Makefile.kernel
deleted file mode 100644
index 69c20a4fc..000000000
--- a/grub-core/Makefile.kernel
+++ /dev/null
@@ -1,204 +0,0 @@
-# -*- makefile -*-
-
-KERNEL_HEADER_FILES =
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cache.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/disk.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dl.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elf.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elfload.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/file.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fs.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/kernel.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/list.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/misc.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/reader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/symbol.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/types.h
-
-if COND_i386_pc
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/biosdisk.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vga.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vbe.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pxe.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
-endif
-
-if COND_i386_efi
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
-endif
-
-if COND_i386_coreboot
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
-endif
-
-if COND_i386_multiboot
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
-endif
-
-if COND_i386_qemu
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
-endif
-
-if COND_i386_ieee1275
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
-endif
-
-if COND_x86_64_efi
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
-endif
-
-if COND_mips_yeeloong
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap_scale.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cs5536.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pci.h
-endif
-
-if COND_powerpc_ieee1275
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
-endif
-
-if COND_sparc64_ieee1275
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sparc64/ieee1275/ieee1275.h
-endif
-
-if COND_emu
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/time.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/types.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gzio.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/menu.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/datetime.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/misc.h
-if COND_GRUB_EMU_SDL
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sdl.h
-endif
-if COND_GRUB_EMU_USB
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libusb.h
-endif
-if COND_GRUB_EMU_PCI
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libpciaccess.h
-endif
-endif
-
-symlist.h: $(top_builddir)/config.h $(KERNEL_HEADER_FILES)
-	@list='$^'; \
-	for p in $$list; do \
-	  echo "#include <$$p>" >> $@ || (rm -f $@; exit 1); \
-	done
-CLEANFILES += symlist.h
-BUILT_SOURCES += symlist.h
-
-symlist.c: symlist.h gensymlist.sh
-	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) -DGRUB_SYMBOL_GENERATOR=1 symlist.h > symlist.p || (rm -f symlist.p; exit 1)
-	cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh $(top_builddir)/config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
-	rm -f symlist.p
-CLEANFILES += symlist.c
-BUILT_SOURCES += symlist.c
-
-noinst_DATA += kernel_syms.lst
-kernel_syms.lst: $(KERNEL_HEADER_FILES) $(top_builddir)/config.h
-	$(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) $(CFLAGS) -DGRUB_SYMBOL_GENERATOR=1 $^ >kernel_syms.input
-	if grep "^#define HAVE_ASM_USCORE" $(top_builddir)/config.h; then u="_"; else u=""; fi; \
-	cat kernel_syms.input | grep -v '^#' | sed -n \
-	  -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
-	  -e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
-	  | sort -u >$@
-	rm -f kernel_syms.input
-CLEANFILES += kernel_syms.lst
-
-if COND_emu
-kern/emu/grub_emu-main.$(OBJEXT):grub_emu_init.h
-grub_emu-grub_emu_init.$(OBJEXT):grub_emu_init.h
-kern/emu/grub_emu_dyn-main.$(OBJEXT):grub_emu_init.h
-grub_emu_dyn-grub_emu_init.$(OBJEXT):grub_emu_init.h
-
-grub_emu_init.h: genemuinitheader.sh $(MOD_FILES)
-	rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinitheader.sh $(NM) > $@
-CLEANFILES += grub_emu_init.h
-
-grub_emu_init.c: grub_emu_init.h genemuinit.sh $(MOD_FILES)
-	rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinit.sh $(NM) > $@
-CLEANFILES += grub_emu_init.c
-endif
diff --git a/grub-core/Makefile.vars b/grub-core/Makefile.vars
deleted file mode 100644
index 6dc536139..000000000
--- a/grub-core/Makefile.vars
+++ /dev/null
@@ -1,83 +0,0 @@
-# -*- makefile -*-
-
-grubconfdir = $(sysconfdir)/grub.d
-platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
-
-# Platform specific options
-if COND_i386_pc
-  CFLAGS_PLATFORM = -mrtd -mregparm=3
-endif
-if COND_i386_efi
-  LDFLAGS_PLATFORM = -melf_i386
-endif
-if COND_x86_64_efi
-  LDFLAGS_PLATFORM = -melf_x86_64
-endif
-if COND_i386_qemu
-  CFLAGS_PLATFORM = -mrtd -mregparm=3
-endif
-if COND_i386_coreboot
-  CFLAGS_PLATFORM = -mrtd -mregparm=3
-endif
-if COND_i386_ieee1275
-  CFLAGS_PLATFORM = -mrtd -mregparm=3
-endif
-if COND_mips_yeeloong
-  CFLAGS_PLATFORM = -march=mips3 -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
-  CCASFLAGS_PLATFORM = -march=mips3
-endif
-if COND_sparc64_ieee1275
-  CFLAGS_PLATFORM = -mno-app-regs
-  LDFLAGS_PLATFORM = -melf64_sparc -mno-relax
-endif
-
-CPPFLAGS_GRUB = -DGRUB_FILE=\"`basename $<`\"
-CPPFLAGS_GRUB += -I$(builddir) -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)
-CPPFLAGS_GRUB += -I$(top_srcdir)/include
-CPPFLAGS_GRUB += -I$(top_builddir)/include
-CCASFLAGS_GRUB = -DASM_FILE=1
-
-CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
-CPPFLAGS_GCRY = -I$(top_srcdir)/$(grub_coredir)/lib/libgcrypt_wrap
-
-CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))"
-CPPFLAGS_GNULIB = -I$(top_srcdir)/$(grub_coredir)/gnulib
-
-CFLAGS_MKISOFS = -Wno-all -Werror
-CPPFLAGS_MKISOFS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/util/mkisofs/include
-
-CFLAGS_POSIX = -fno-builtin
-CPPFLAGS_POSIX = -I$(top_srcdir)/$(grub_coredir)/lib/posix_wrap
-
-CPPFLAGS_EFIEMU = -I$(top_srcdir)/$(grub_coredir)/efiemu/runtime
-
-# to calm down automake
-BUILT_SOURCES =
-CLEANFILES =
-COMMAND_FILES =
-DEF_FILES =
-FS_FILES =
-HANDLER_FILES =
-IMG_FILES =
-MOD_FILES =
-MODULE_FILES =
-PARTMAP_FILES =
-PARTTOOL_FILES =
-TERMINAL_FILES =
-TESTS =
-UND_FILES =
-VIDEO_FILES =
-bin_PROGRAMS =
-bin_SCRIPTS =
-check_PROGRAMS =
-check_SCRIPTS =
-grubconf_DATA =
-grubconf_SCRIPTS =
-man_MANS =
-noinst_DATA =
-noinst_LIBRARIES =
-noinst_PROGRAMS =
-pkglib_SCRIPTS =
-platform_DATA =
-sbin_PROGRAMS =
-sbin_SCRIPTS =

From a6b384931412a218326b3eb2e488eceb6af2fc18 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Tue, 17 Aug 2010 19:23:26 +0530
Subject: [PATCH 1365/1628] move grub-core/po back

---
 grub-core/po/Makefile.am            | 0
 po/Makefile.am                      | 0
 {grub-core/po => po}/POTFILES       | 0
 {grub-core/po => po}/POTFILES-shell | 0
 {grub-core/po => po}/README         | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 grub-core/po/Makefile.am
 delete mode 100644 po/Makefile.am
 rename {grub-core/po => po}/POTFILES (100%)
 rename {grub-core/po => po}/POTFILES-shell (100%)
 rename {grub-core/po => po}/README (100%)

diff --git a/grub-core/po/Makefile.am b/grub-core/po/Makefile.am
deleted file mode 100644
index e69de29bb..000000000
diff --git a/po/Makefile.am b/po/Makefile.am
deleted file mode 100644
index e69de29bb..000000000
diff --git a/grub-core/po/POTFILES b/po/POTFILES
similarity index 100%
rename from grub-core/po/POTFILES
rename to po/POTFILES
diff --git a/grub-core/po/POTFILES-shell b/po/POTFILES-shell
similarity index 100%
rename from grub-core/po/POTFILES-shell
rename to po/POTFILES-shell
diff --git a/grub-core/po/README b/po/README
similarity index 100%
rename from grub-core/po/README
rename to po/README

From adf4ef86af926513d1480b0c31187b642338a53d Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Tue, 17 Aug 2010 19:23:50 +0530
Subject: [PATCH 1366/1628] add po/Makefile.am

---
 po/Makefile.am | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 po/Makefile.am

diff --git a/po/Makefile.am b/po/Makefile.am
new file mode 100644
index 000000000..e69de29bb

From 76ed06b92156e16e34837183616ec71dce4df4eb Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Tue, 17 Aug 2010 19:41:43 +0530
Subject: [PATCH 1367/1628] moved configure.common back to configure.ac

---
 Makefile.am           |   8 +-
 configure.ac          | 865 ++++++++++++++++++++++++++++++++++++++++--
 configure.common      | 852 -----------------------------------------
 grub-core/Makefile.am |   8 +-
 4 files changed, 846 insertions(+), 887 deletions(-)
 delete mode 100644 configure.common

diff --git a/Makefile.am b/Makefile.am
index 51203c00d..4063a6476 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,18 +41,18 @@ CPPFLAGS_GRUB += -I$(top_builddir)/include
 CCASFLAGS_GRUB = -DASM_FILE=1
 
 CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
-CPPFLAGS_GCRY = -I$(top_srcdir)/$(grub_coredir)/lib/libgcrypt_wrap
+CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap
 
 CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))"
-CPPFLAGS_GNULIB = -I$(top_srcdir)/$(grub_coredir)/gnulib
+CPPFLAGS_GNULIB = -I$(top_srcdir)/grub-core/gnulib
 
 CFLAGS_MKISOFS = -Wno-all -Werror
 CPPFLAGS_MKISOFS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/util/mkisofs/include
 
 CFLAGS_POSIX = -fno-builtin
-CPPFLAGS_POSIX = -I$(top_srcdir)/$(grub_coredir)/lib/posix_wrap
+CPPFLAGS_POSIX = -I$(top_srcdir)/grub-core/lib/posix_wrap
 
-CPPFLAGS_EFIEMU = -I$(top_srcdir)/$(grub_coredir)/efiemu/runtime
+CPPFLAGS_EFIEMU = -I$(top_srcdir)/grub-core/efiemu/runtime
 
 # to calm down automake
 BUILT_SOURCES =
diff --git a/configure.ac b/configure.ac
index dafea4545..ee01049ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,8 @@
+# -*- autoconf -*-
+
 # Process this file with autoconf to produce a configure script.
 
-# Copyright (C) 2010  Free Software Foundation, Inc.
+# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010  Free Software Foundation, Inc.
 #
 # This configure.ac is free software; the author
 # gives unlimited permission to copy and/or distribute it,
@@ -11,29 +13,10 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-dnl This configure script is complicated, because GRUB needs to deal
-dnl with three potentially different types:
-dnl
-dnl   build  -- the environment for building GRUB
-dnl   host   -- the environment for running utilities
-dnl   target -- the environment for running GRUB
-dnl
-dnl In addition, GRUB needs to deal with a platform specification
-dnl which specifies the system running GRUB, such as firmware.
-dnl This is necessary because the target type in autoconf does not
-dnl describe such a system very well.
-dnl
-dnl The current strategy is to build utilities using host
-dnl cross-compiler and grub core and modules using target
-dnl cross-compiler.  For this we use nested packages approach, where
-dnl top-level package grub utilities is built with HOSTCC and nested
-dnl package (in grub-core directory) builds with TARGETCC.
-
-# NOTE: grub-core/configure.ac must also be updated.
 AC_INIT([GRUB],[1.98],[bug-grub@gnu.org])
-AC_CONFIG_AUX_DIR([.])
 
-: ${CFLAGS=""} # We don't want -g -O2
+# We don't want -g -O2 by default in CFLAGS
+: ${CFLAGS=""}
 
 # Checks for host and target systems.
 AC_CANONICAL_HOST
@@ -44,13 +27,841 @@ AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR([include/grub/dl.h])
 AC_CONFIG_HEADER([config.h])
 
-grub_coredir='grub-core'
-AC_SUBST(grub_coredir)
+# Program name transformations
+AC_ARG_PROGRAM
 
-grub_utildir='.'
-AC_SUBST(grub_utildir)
+# Optimization flag.  Allow user to override.
+if test "x$TARGET_CFLAGS" = x; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -Os"
+fi
 
-m4_include([configure.common])
+# Default HOST_CPPFLAGS
+HOST_CPPFLAGS="$HOST_CPPFLAGS -Wall -W"
+HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_srcdir)/grub-core/include"
+HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
+HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_srcdir)/grub-core/gnulib"
+HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_UTIL=1"
+HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_LIBDIR=\\\"\$(pkglibdir)\\\""
+HOST_CPPFLAGS="$HOST_CPPFLAGS -DLOCALEDIR=\\\"\$(localedir)\\\""
+
+TARGET_CPPFLAGS="$TARGET_CPPFLAGS -Wall -W"
+TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_srcdir)/include"
+TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_builddir)/include"
+
+case "$target_cpu" in
+  i[[3456]]86)	target_cpu=i386 ;;
+  amd64)	target_cpu=x86_64 ;;
+  sparc)	target_cpu=sparc64 ;;
+  mipsel|mips64el)
+                target_cpu=mips;
+		HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_CPU_MIPSEL=1";
+		TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DGRUB_CPU_MIPSEL=1";
+		;;
+  mips|mips64)
+                target_cpu=mips;
+		HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_CPU_MIPS=1";
+		TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DGRUB_CPU_MIPS=1";
+		;;
+esac
+
+# Specify the platform (such as firmware).
+AC_ARG_WITH([platform],
+            AS_HELP_STRING([--with-platform=PLATFORM],
+                           [select the host platform [[guessed]]]))
+
+# Guess the platform if not specified.
+if test "x$with_platform" = x; then
+  case "$target_cpu"-"$target_vendor" in
+    i386-apple) platform=efi ;;
+    i386-*) platform=pc ;;
+    x86_64-apple) platform=efi ;;
+    x86_64-*) platform=pc ;;
+    powerpc-*) platform=ieee1275 ;;
+    powerpc64-*) platform=ieee1275 ;;
+    sparc64-*) platform=ieee1275 ;;
+    mips-*) platform=yeeloong ;;
+    *) AC_MSG_ERROR([unsupported CPU: "$target_cpu"]) ;;
+  esac
+else
+  platform="$with_platform"
+fi
+
+# Adjust CPU unless target was explicitly specified.
+if test -z "$target_alias"; then
+  case "$target_cpu"-"$platform" in
+    x86_64-efi) ;;
+    x86_64-emu) ;;
+    x86_64-*) target_cpu=i386 ;;
+    powerpc64-ieee1275) target_cpu=powerpc ;;
+  esac
+fi
+
+# Check if the platform is supported, make final adjustments.
+case "$target_cpu"-"$platform" in
+  i386-efi) ;;
+  x86_64-efi) ;;
+  i386-pc) ;;
+  i386-multiboot) ;;
+  i386-coreboot) ;;
+  i386-linuxbios) platform=coreboot ;;
+  i386-ieee1275) ;;
+  i386-qemu) ;;
+  powerpc-ieee1275) ;;
+  sparc64-ieee1275) ;;
+  mips-qemu-mips) ;;
+  mips-yeeloong) ;;
+  *-emu) ;;
+  *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
+esac
+
+case "$target_cpu" in
+  i386 | powerpc) target_m32=1 ;;
+  x86_64 | sparc64) target_m64=1 ;;
+esac
+
+case "$host_os" in
+  mingw32*) host_os=cygwin ;;
+esac
+
+# This normalizes the names, and creates a new variable ("host_kernel")
+# while at it, since the mapping is not always 1:1 (e.g. different OSes
+# using the same kernel type).
+case "$host_os" in
+  gnu*)				host_kernel=hurd ;;
+  linux*)			host_kernel=linux ;;
+  freebsd* | kfreebsd*-gnu)	host_kernel=kfreebsd ;;
+  netbsd*)			host_kernel=netbsd ;;
+  cygwin)			host_kernel=windows ;;
+esac
+
+case "$platform" in
+  coreboot)	machine_CFLAGS="-DGRUB_MACHINE_COREBOOT=1" ;;
+  multiboot)	machine_CFLAGS="-DGRUB_MACHINE_MULTIBOOT=1" ;;
+  efi)		machine_CFLAGS="-DGRUB_MACHINE_EFI=1" ;;
+  ieee1275)	machine_CFLAGS="-DGRUB_MACHINE_IEEE1275=1" ;;
+  qemu)		machine_CFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
+  pc)		machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
+  emu)		machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
+  yeeloong)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  qemu-mips)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+esac
+case "$target_cpu" in
+  mips)      	machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_MIPS=1" ;;
+  sparc64)      machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
+esac
+machine_CFLAGS="$machine_CFLAGS -DMACHINE=`echo ${target_cpu}_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`"
+
+HOST_CPPFLAGS="$HOST_CPPFLAGS $machine_CFLAGS"
+TARGET_CPPFLAGS="$TARGET_CPPFLAGS $machine_CFLAGS"
+
+AC_SUBST(host_cpu)
+AC_SUBST(host_os)
+AC_SUBST(host_kernel)
+
+AC_SUBST(target_cpu)
+AC_SUBST(platform)
+
+#
+# Checks for build programs.
+#
+
+# Although cmp is listed in the GNU Coding Standards as a command which
+# can used directly, OpenBSD lacks cmp in the default installation.
+AC_CHECK_PROGS([CMP], [cmp])
+if test "x$CMP" = x; then
+  AC_MSG_ERROR([cmp is not found])
+fi
+
+AC_CHECK_PROGS([YACC], [bison])
+if test "x$YACC" = x; then
+  AC_MSG_ERROR([bison is not found])
+fi
+
+FONT_SOURCE=
+
+for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
+  for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont; do
+    if test -f "$dir/unifont.$ext"; then
+      FONT_SOURCE="$dir/unifont.$ext"
+      break 2
+    fi
+  done
+done
+
+if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xyeeloong ); then
+   AC_MSG_ERROR([qemu and yeeloong ports need unifont])
+fi
+
+AC_SUBST([FONT_SOURCE])
+
+AC_PROG_RANLIB
+AC_PROG_INSTALL
+AC_PROG_AWK
+AC_PROG_LEX
+AC_PROG_YACC
+AC_PROG_MAKE_SET
+AC_PROG_MKDIR_P
+
+if test "x$LEX" = "x:"; then
+  AC_MSG_ERROR([flex is not found])
+else
+  version=`$LEX --version | $AWK '{ split($NF,x,"."); print x[[1]]*10000+x[[2]]*100+x[[3]]; }'`
+  if test -n "$version" -a "$version" -ge 20535; then
+    :
+  else
+    AC_MSG_ERROR([flex is too old. GRUB requires 2.5.35 or above])
+  fi
+fi
+
+# These are not a "must".
+AC_PATH_PROG(MAKEINFO, makeinfo)
+
+#
+# Checks for host programs.
+#
+
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_AS
+
+# Must be GCC.
+test "x$GCC" = xyes || AC_MSG_ERROR([GCC is required])
+
+AC_GNU_SOURCE
+AM_GNU_GETTEXT([external])
+AC_SYS_LARGEFILE
+
+# Identify characteristics of the host architecture.
+AC_C_BIGENDIAN
+AC_CHECK_SIZEOF(void *)
+AC_CHECK_SIZEOF(long)
+
+grub_apple_cc
+if test x$grub_cv_apple_cc = xyes ; then
+  HOST_CPPFLAGS="$HOST_CPPFLAGS -DAPPLE_CC=1"
+  HOST_CFLAGS="$HOST_CFLAGS -fnested-functions"
+fi
+
+if test "x$cross_compiling" = xyes; then
+  AC_MSG_WARN([cannot generate manual pages while cross compiling])
+else
+  AC_PATH_PROG(HELP2MAN, help2man)
+fi
+
+# Check for functions.
+AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf)
+
+# For grub-mkisofs
+AC_HEADER_MAJOR
+AC_HEADER_DIRENT
+AC_CHECK_FUNCS(memmove sbrk strdup lstat getuid getgid)
+AC_CHECK_HEADERS(sys/mkdev.h sys/sysmacros.h malloc.h termios.h sys/types.h)
+AC_CHECK_HEADERS(unistd.h string.h strings.h sys/stat.h sys/fcntl.h limits.h)
+
+# For opendisk() and getrawpartition() on NetBSD.
+# Used in util/deviceiter.c and in util/hostdisk.c.
+AC_CHECK_HEADER([util.h], [
+  AC_CHECK_LIB([util], [opendisk], [
+    LIBUTIL="-lutil"
+    AC_DEFINE(HAVE_OPENDISK, 1, [Define if opendisk() in -lutil can be used])
+  ])
+  AC_CHECK_LIB([util], [getrawpartition], [
+    LIBUTIL="-lutil"
+    AC_DEFINE(HAVE_GETRAWPARTITION, 1, [Define if getrawpartition() in -lutil can be used])
+  ])
+])
+AC_SUBST([LIBUTIL])
+
+#
+# Check for host and build compilers.
+#
+HOST_CC=$CC
+AC_CHECK_PROGS(BUILD_CC, [gcc egcs cc],
+                 [AC_MSG_ERROR([none of gcc, egcs and cc is found. set BUILD_CC manually.])])
+
+#
+# Check for target programs.
+#
+
+# Find tools for the target.
+if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then
+  tmp_ac_tool_prefix="$ac_tool_prefix"
+  ac_tool_prefix=$target_alias-
+
+  AC_CHECK_TOOLS(TARGET_CC, [gcc egcs cc],
+                 [AC_MSG_ERROR([none of gcc, egcs and cc is found. set TARGET_CC manually.])])
+  AC_CHECK_TOOL(OBJCOPY, objcopy)
+  AC_CHECK_TOOL(STRIP, strip)
+  AC_CHECK_TOOL(NM, nm)
+
+  ac_tool_prefix="$tmp_ac_tool_prefix"
+else
+  if test "x$TARGET_CC" = x; then
+    TARGET_CC=$CC
+  fi
+  AC_CHECK_TOOL(OBJCOPY, objcopy)
+  AC_CHECK_TOOL(STRIP, strip)
+  AC_CHECK_TOOL(NM, nm)
+fi
+AC_SUBST(HOST_CC)
+AC_SUBST(BUILD_CC)
+AC_SUBST(TARGET_CC)
+
+# Test the C compiler for the target environment.
+tmp_CC="$CC"
+tmp_CFLAGS="$CFLAGS"
+tmp_LDFLAGS="$LDFLAGS"
+tmp_CPPFLAGS="$CPPFLAGS"
+tmp_LIBS="$LIBS"
+CC="$TARGET_CC"
+CFLAGS="$TARGET_CFLAGS"
+CPPFLAGS="$TARGET_CPPFLAGS"
+LDFLAGS="$TARGET_LDFLAGS"
+LIBS=""
+
+# debug flags.
+TARGET_CFLAGS="$TARGET_CFLAGS -Wall -W -Wshadow -Wpointer-arith -Wmissing-prototypes -Wundef -Wstrict-prototypes -g"
+TARGET_CCASFLAGS="$TARGET_CCASFLAGS -g"
+
+# Force no alignment to save space on i386.
+if test "x$target_cpu" = xi386; then
+  AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
+    CFLAGS="$CFLAGS -falign-loops=1"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+        [grub_cv_cc_falign_loop=yes],
+	[grub_cv_cc_falign_loop=no])
+  ])
+
+  if test "x$grub_cv_cc_falign_loop" = xyes; then
+    TARGET_CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1"
+  else
+    TARGET_CFLAGS="$TARGET_CFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1"
+  fi
+
+  # Some toolchains enable these features by default, but they need
+  # registers that aren't set up properly in GRUB.
+  TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-3dnow"
+fi
+
+# By default, GCC 4.4 generates .eh_frame sections containing unwind
+# information in some cases where it previously did not. GRUB doesn't need
+# these and they just use up vital space. Restore the old compiler
+# behaviour.
+AC_CACHE_CHECK([whether -fno-dwarf2-cfi-asm works], [grub_cv_cc_fno_dwarf2_cfi_asm], [
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -fno-dwarf2-cfi-asm"
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+      [grub_cv_cc_fno_dwarf2_cfi_asm=yes],
+      [grub_cv_cc_fno_dwarf2_cfi_asm=no])
+  CFLAGS="$SAVE_CFLAGS"
+])
+
+if test "x$grub_cv_cc_fno_dwarf2_cfi_asm" = xyes; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -fno-dwarf2-cfi-asm"
+fi
+
+grub_apple_target_cc
+if test x$grub_cv_apple_target_cc = xyes ; then
+  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DAPPLE_CC=1"
+  TARGET_CFLAGS="$TARGET_CFLAGS -fnested-functions"
+
+  CFLAGS="$CFLAGS -DAPPLE_CC=1 -fnested-functions"
+  TARGET_APPLE_CC=1
+  AC_CHECK_PROG([OBJCONV], [objconv], [objconv], [])
+  if test "x$OBJCONV" = x ; then
+     AC_CHECK_PROG([OBJCONV], [objconv], [./objconv], [], [.])
+  fi
+  if test "x$OBJCONV" = x ; then
+    AC_MSG_ERROR([objconv not found which is required when building with apple compiler])
+  fi
+  TARGET_IMG_LDSCRIPT=
+  TARGET_IMG_CFLAGS="-static"
+  TARGET_IMG_LDFLAGS='-nostdlib -static -Wl,-preload -Wl,-segalign,20'
+  TARGET_IMG_LDFLAGS_AC='-nostdlib -static -Wl,-preload -Wl,-segalign,20'
+  TARGET_IMG_BASE_LDOPT="-Wl,-image_base"
+else
+  TARGET_APPLE_CC=0
+# Use linker script if present, otherwise use builtin -N script.
+if test -f "${srcdir}/${grub_coredir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
+  TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/${grub_coredir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
+  TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}"
+  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/${grub_coredir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
+  TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
+else
+  TARGET_IMG_LDSCRIPT=
+  TARGET_IMG_LDFLAGS='-Wl,-N'
+  TARGET_IMG_LDFLAGS_AC='-Wl,-N'
+  TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
+fi
+TARGET_IMG_CFLAGS=
+fi
+
+# For platforms where ELF is not the default link format.
+AC_MSG_CHECKING([for command to convert module to ELF format])
+case "${host_os}" in
+  cygwin) TARGET_OBJ2ELF='$(grub_utildir)/grub-pe2elf';
+# FIXME: put proper test here
+  AC_DEFINE([NEED_REGISTER_FRAME_INFO], 1,
+	    [Define to 1 if GCC generates calls to __register_frame_info()])
+  ;;
+  *) ;;
+esac
+AC_MSG_RESULT([$TARGET_OBJ2ELF])
+
+if test "x$target_m32" = x1; then
+  # Force 32-bit mode.
+  TARGET_CFLAGS="$TARGET_CFLAGS -m32"
+  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m32"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
+  TARGET_MODULE_FORMAT="elf32"
+fi
+
+if test "x$target_m64" = x1; then
+  # Force 64-bit mode.
+  TARGET_CFLAGS="$TARGET_CFLAGS -m64"
+  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m64"
+  TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
+  TARGET_MODULE_FORMAT="elf64"
+fi
+
+if test "$target_cpu"-"$platform" = x86_64-efi; then
+  # Use large model to support 4G memory
+  AC_CACHE_CHECK([whether option -mcmodel=large works], grub_cv_cc_mcmodel, [
+    SAVED_CFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS -m64 -mcmodel=large"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+		      [grub_cv_cc_mcmodel=yes],
+		      [grub_cv_cc_mcmodel=no])
+  ])
+  if test "x$grub_cv_cc_mcmodel" = xno; then
+    AC_MSG_ERROR([-mcmodel=large not supported. Upgrade your gcc.])
+  else
+    TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large"
+  fi
+
+  # EFI writes to stack below %rsp, we must not use the red zone
+  AC_CACHE_CHECK([whether option -mno-red-zone works], grub_cv_cc_no_red_zone, [
+    CFLAGS="$CFLAGS -m64 -mno-red-zone"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+		      [grub_cv_cc_no_red_zone=yes],
+		      [grub_cv_cc_no_red_zone=no])
+  ])
+  if test "x$grub_cv_cc_no_red_zone" = xno; then
+    AC_MSG_ERROR([-mno-red-zone not supported, upgrade your gcc])
+  fi
+
+  TARGET_CFLAGS="$TARGET_CFLAGS -mno-red-zone"
+fi
+
+#
+# Compiler features.
+#
+
+# Need __enable_execute_stack() for nested function trampolines?
+grub_CHECK_ENABLE_EXECUTE_STACK
+
+# Position independent executable.
+grub_CHECK_PIE
+[# Need that, because some distributions ship compilers that include
+# `-fPIE' in the default specs.
+if [ x"$pie_possible" = xyes ]; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE"
+fi]
+
+# Smashing stack protector.
+grub_CHECK_STACK_PROTECTOR
+# Need that, because some distributions ship compilers that include
+# `-fstack-protector' in the default specs.
+if test "x$ssp_possible" = xyes; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -fno-stack-protector"
+fi
+grub_CHECK_STACK_ARG_PROBE
+# Cygwin's GCC uses alloca() to probe the stackframe on static
+# stack allocations above some threshold.
+if test x"$sap_possible" = xyes; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -mno-stack-arg-probe"
+fi
+
+AC_ARG_ENABLE([werror],
+	      [AS_HELP_STRING([--disable-werror],
+                             [do not use -Werror when building GRUB])])
+if test x"$enable_werror" != xno ; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -Werror"
+fi
+
+TARGET_CPP="$TARGET_CC -E"
+TARGET_CCAS=$TARGET_CC
+
+AC_SUBST(OBJCONV)
+AC_SUBST(TARGET_CPP)
+AC_SUBST(TARGET_CCAS)
+AC_SUBST(TARGET_OBJ2ELF)
+AC_SUBST(TARGET_APPLE_CC)
+AC_SUBST(TARGET_MODULE_FORMAT)
+
+AC_SUBST(TARGET_CFLAGS)
+AC_SUBST(TARGET_LDFLAGS)
+AC_SUBST(TARGET_CPPFLAGS)
+AC_SUBST(TARGET_CCASFLAGS)
+
+AC_SUBST(TARGET_IMG_LDSCRIPT)
+AC_SUBST(TARGET_IMG_LDFLAGS)
+AC_SUBST(TARGET_IMG_CFLAGS)
+AC_SUBST(TARGET_IMG_BASE_LDOPT)
+
+AC_SUBST(HOST_CFLAGS)
+AC_SUBST(HOST_LDFLAGS)
+AC_SUBST(HOST_CPPFLAGS)
+AC_SUBST(HOST_CCASFLAGS)
+
+# Set them to their new values for the tests below.
+CC="$TARGET_CC"
+if test "x$TARGET_APPLE_CC" = x1 ; then
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wno-error"
+else
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100 -Wno-error"
+fi
+CPPFLAGS="$TARGET_CPPFLAGS"
+LDFLAGS="$TARGET_LDFLAGS"
+LIBS=-lgcc
+
+grub_ASM_USCORE
+if test x$grub_cv_asm_uscore = xyes; then
+CFLAGS="$CFLAGS -Wl,--defsym,_abort=_main"
+else
+CFLAGS="$CFLAGS -Wl,--defsym,abort=main"
+fi
+
+# Check for libgcc symbols
+AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __trampoline_setup __ucmpdi2 _restgpr_14_x)
+
+if test "x$TARGET_APPLE_CC" = x1 ; then
+CFLAGS="$TARGET_CFLAGS -nostdlib"
+else
+CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100"
+fi
+LIBS=""
+
+# Defined in aclocal.m4.
+grub_PROG_TARGET_CC
+if test "x$TARGET_APPLE_CC" != x1 ; then
+grub_PROG_OBJCOPY_ABSOLUTE
+fi
+grub_PROG_LD_BUILD_ID_NONE
+if test "x$target_cpu" = xi386; then
+  if test "$platform" != emu && test "x$TARGET_APPLE_CC" != x1 ; then
+    if test ! -z "$TARGET_IMG_LDSCRIPT"; then
+      # Check symbols provided by linker script.
+      CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC} ${TARGET_IMG_BASE_LDOPT},8000 -Wl,--defsym,___main=0x8100"
+    fi
+    grub_CHECK_BSS_START_SYMBOL
+    grub_CHECK_END_SYMBOL
+  fi
+  CFLAGS="$TARGET_CFLAGS"
+  grub_I386_ASM_PREFIX_REQUIREMENT
+  grub_I386_ASM_ADDR32
+  grub_I386_ASM_ABSOLUTE_WITHOUT_ASTERISK
+else
+  AC_DEFINE([NESTED_FUNC_ATTR], [], [Catch gcc bug])
+fi
+
+AH_BOTTOM([#if defined(__i386__) && !defined(GRUB_UTIL)
+#define NESTED_FUNC_ATTR __attribute__ ((__regparm__ (1)))
+#else
+#define NESTED_FUNC_ATTR
+#endif])
+
+AC_ARG_ENABLE([efiemu],
+	      [AS_HELP_STRING([--enable-efiemu],
+                             [build and install the efiemu runtimes (default=guessed)])])
+if test x"$enable_efiemu" = xno ; then
+  efiemu_excuse="explicitly disabled"
+fi
+if test x"$efiemu_excuse" = x ; then
+  AC_CACHE_CHECK([whether options required for efiemu work], grub_cv_cc_efiemu, [
+    CFLAGS="$CFLAGS -m64 -mcmodel=large -mno-red-zone -nostdlib"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+		      [grub_cv_cc_efiemu=yes],
+		      [grub_cv_cc_efiemu=no])
+  ])
+  if test x$grub_cv_cc_efiemu = xno; then
+     efiemu_excuse="cannot compile with -m64 -mcmodel=large -mno-red-zone -nostdlib"
+  fi
+fi
+if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then
+  AC_MSG_ERROR([efiemu runtime was explicitly requested but can't be compiled])
+fi
+if test x"$efiemu_excuse" = x ; then
+enable_efiemu=yes
+else
+enable_efiemu=no
+fi
+AC_SUBST([enable_efiemu])
+
+if test "$platform" != emu; then
+AC_CACHE_CHECK([whether -nostdinc -isystem works], [grub_cv_cc_isystem], [
+  SAVED_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+int va_arg_func (int fixed, va_list args);]], [[]])],
+      [grub_cv_cc_isystem=yes],
+      [grub_cv_cc_isystem=no])
+  CPPFLAGS="$SAVED_CPPFLAGS"
+])
+
+if test x"$grub_cv_cc_isystem" = xyes ; then
+  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
+fi
+fi
+
+# Restore the flags.
+CC="$tmp_CC"
+CFLAGS="$tmp_CFLAGS"
+CPPFLAGS="$tmp_CPPFLAGS"
+LDFLAGS="$tmp_LDFLAGS"
+LIBS="$tmp_LIBS"
+
+#
+# Check for options.
+#
+
+# Memory manager debugging.
+AC_ARG_ENABLE([mm-debug],
+	      AS_HELP_STRING([--enable-mm-debug],
+                             [include memory manager debugging]),
+              [AC_DEFINE([MM_DEBUG], [1],
+                         [Define to 1 if you enable memory manager debugging.])])
+
+AC_ARG_ENABLE([grub-emu-usb],
+	      [AS_HELP_STRING([--enable-grub-emu-usb],
+                             [build and install the `grub-emu' debugging utility with USB support (default=guessed)])])
+
+AC_ARG_ENABLE([grub-emu-sdl],
+	      [AS_HELP_STRING([--enable-grub-emu-sdl],
+                             [build and install the `grub-emu' debugging utility with SDL support (default=guessed)])])
+
+AC_ARG_ENABLE([grub-emu-pci],
+	      [AS_HELP_STRING([--enable-grub-emu-pci],
+                             [build and install the `grub-emu' debugging utility with PCI support (potentially dangerous) (default=no)])])
+
+if test "$platform" = emu; then
+  missing_ncurses=
+[# Check for curses libraries.]
+  AC_CHECK_LIB([ncurses], [wgetch], [LIBCURSES="-lncurses"],
+    [AC_CHECK_LIB([curses], [wgetch], [LIBCURSES="-lcurses"],
+      [missing_ncurses=[true]])])
+  AC_SUBST([LIBCURSES])
+[if [ x"$missing_ncurses" = x ]; then ]
+  [# Check for headers.]
+  AC_CHECK_HEADERS([ncurses/curses.h], [],
+    [AC_CHECK_HEADERS([ncurses.h], [],
+      [AC_CHECK_HEADERS([curses.h], [],
+	[missing_ncurses=[true]])])])
+[fi]
+if test x"$missing_ncurses" = xtrue ; then
+  AC_MSG_ERROR([grub-emu can't be compiled without ncurses])
+fi
+
+if test x"$enable_grub_emu_usb" = xno ; then
+  grub_emu_usb_excuse="explicitly disabled"
+fi
+
+if test x"$enable_grub_emu_pci" = xyes ; then
+   grub_emu_usb_excuse="conflicts with PCI support"
+fi
+
+[if [ x"$grub_emu_usb_excuse" = x ]; then
+    # Check for libusb libraries.]
+AC_CHECK_LIB([usb], [usb_claim_interface], [LIBUSB="-lusb"],
+    [grub_emu_usb_excuse=["need libusb library"]])
+    AC_SUBST([LIBUSB])
+[fi]
+[if [ x"$grub_emu_usb_excuse" = x ]; then
+    # Check for headers.]
+    AC_CHECK_HEADERS([usb.h], [],
+      [grub_emu_usb_excuse=["need libusb headers"]])
+[fi]
+if test x"$enable_grub_emu_usb" = xyes && test x"$grub_emu_usb_excuse" != x ; then
+  AC_MSG_ERROR([USB support for grub-emu was explicitly requested but can't be compiled])
+fi
+if test x"$grub_emu_usb_excuse" = x ; then
+enable_grub_emu_usb=yes
+else
+enable_grub_emu_usb=no
+fi
+
+if test x"$enable_grub_emu_sdl" = xno ; then
+  grub_emu_sdl_excuse="explicitely disabled"
+fi
+[if [ x"$grub_emu_sdl_excuse" = x ]; then
+    # Check for libSDL libraries.]
+AC_CHECK_LIB([SDL], [SDL_Init], [LIBSDL="-lSDL"],
+    [grub_emu_sdl_excuse=["libSDL libraries are required to build \`grub-emu' with SDL support"]])
+    AC_SUBST([LIBSDL])
+[fi]
+
+[if [ x"$grub_emu_sdl_excuse" = x ]; then
+    # Check for headers.]
+    AC_CHECK_HEADERS([SDL/SDL.h], [],
+      [grub_emu_sdl_excuse=["libSDL header file is required to build \`grub-emu' with SDL support"]])
+[fi]
+
+if test x"enable_grub_emu_sdl" = xyes && test x"$grub_emu_sdl_excuse" != x ; then
+  AC_MSG_ERROR([SDL support for grub-emu was explicitely requested but can't be compiled])
+fi
+if test x"$grub_emu_sdl_excuse" = x ; then
+enable_grub_emu_sdl=yes
+else
+enable_grub_emu_sdl=no
+fi
+
+if test x"$enable_grub_emu_pci" != xyes ; then
+   grub_emu_pci_excuse="not enabled"
+fi
+
+if test x"$enable_grub_emu_usb" = xyes ; then
+   grub_emu_pci_excuse="conflicts with USB support"
+fi
+
+[if [ x"$grub_emu_pci_excuse" = x ]; then
+      # Check for libpci libraries.]
+   AC_CHECK_LIB([pciaccess], [pci_system_init], [LIBPCIACCESS="-lpciaccess"],
+      [grub_emu_pci_excuse=["need libpciaccess library"]])
+    AC_SUBST([LIBPCIACCESS])
+[fi]
+[if [ x"$grub_emu_pci_excuse" = x ]; then
+    # Check for headers.]
+    AC_CHECK_HEADERS([pci/pci.h], [],
+      [grub_emu_pci_excuse=["need libpciaccess headers"]])
+[fi]
+
+if test x"$grub_emu_pci_excuse" = x ; then
+enable_grub_emu_pci=yes
+else
+
+enable_grub_emu_pci=no
+fi
+
+AC_SUBST([enable_grub_emu_sdl])
+AC_SUBST([enable_grub_emu_usb])
+AC_SUBST([enable_grub_emu_pci])
+fi
+
+AC_ARG_ENABLE([grub-fstest],
+	      [AS_HELP_STRING([--enable-grub-fstest],
+                             [build and install the `grub-fstest' debugging utility (default=guessed)])])
+if test x"$enable_grub_fstest" = xno ; then
+  grub_fstest_excuse="explicitly disabled"
+fi
+if test x"$grub_fstest_excuse" = x ; then
+enable_grub_fstest=yes
+else
+enable_grub_fstest=no
+fi
+AC_SUBST([enable_grub_fstest])
+
+AC_ARG_ENABLE([grub-mkfont],
+	      [AS_HELP_STRING([--enable-grub-mkfont],
+                             [build and install the `grub-mkfont' utility (default=guessed)])])
+if test x"$enable_grub_mkfont" = xno ; then
+  grub_mkfont_excuse="explicitly disabled"
+fi
+
+if test x"$grub_mkfont_excuse" = x ; then
+  # Check for freetype libraries.
+  AC_CHECK_PROGS([FREETYPE], [freetype-config])
+  if test "x$FREETYPE" = x ; then
+    grub_mkfont_excuse=["need freetype2 library"]
+  fi
+  freetype_cflags=`freetype-config --cflags`
+  freetype_libs=`freetype-config --libs`
+fi
+
+if test x"$grub_mkfont_excuse" = x ; then
+  # Check for freetype libraries.
+  SAVED_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $freetype_cflags"
+  AC_CHECK_HEADERS([ft2build.h], [],
+  	[grub_mkfont_excuse=["need freetype2 headers"]])
+  CPPFLAGS="$SAVED_CPPFLAGS"
+fi
+
+if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; then
+  AC_MSG_ERROR([grub-mkfont was explicitly requested but can't be compiled])
+fi
+if test x"$grub_mkfont_excuse" = x ; then
+enable_grub_mkfont=yes
+else
+enable_grub_mkfont=no
+fi
+AC_SUBST([enable_grub_mkfont])
+AC_SUBST([freetype_cflags])
+AC_SUBST([freetype_libs])
+
+AC_ARG_ENABLE([device-mapper],
+              [AS_HELP_STRING([--enable-device-mapper],
+                              [enable Linux device-mapper support (default=guessed)])])
+if test x"$enable_device_mapper" = xno ; then
+  device_mapper_excuse="explicitly disabled"
+fi
+
+if test x"$device_mapper_excuse" = x ; then
+  # Check for device-mapper library.
+  AC_CHECK_LIB([devmapper], [dm_task_create],
+               [HOST_LDFLAGS="$HOST_LDFLAGS -ldevmapper"
+                AC_DEFINE([HAVE_DEVICE_MAPPER], [1],
+                          [Define to 1 if you have the devmapper library.])],
+               [device_mapper_excuse="need devmapper library"])
+fi
+
+pkglibrootdir='$(libdir)'/`echo $PACKAGE | sed "$program_transform_name"`
+AC_SUBST(pkglibrootdir)
+
+AC_SUBST([FONT_SOURCE])
+AS_IF([test x$target_cpu = xi386 -a x$platform = xpc],
+	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
+AS_IF([test x$target_cpu = xi386 -a x$platform = xcoreboot],
+	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
+AS_IF([test x$target_cpu = xi386 -a x$platform = xmultiboot],
+	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
+AS_IF([test x$target_cpu = xmips -a x$platform = xyeeloong],
+	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x80200000)])
+AS_IF([test x$target_cpu = xpowerpc -a x$platform = xieee1275],
+	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x200000)])
+AS_IF([test x$target_cpu = xi386 -a x$platform = xqemu],
+	    [AC_SUBST([GRUB_BOOT_MACHINE_LINK_ADDR], 0xffe00)])
+AS_IF([test x$target_cpu = xi386 -a x$platform = xieee1275],
+	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x10000)])
+AS_IF([test x$TARGET_APPLE_CC = x1],
+	    [AC_SUBST([USE_APPLE_CC_FIXES], yes)])
+
+#
+# Automake conditionals
+#
+
+AM_CONDITIONAL([COND_emu], [test x$platform = xemu])
+AM_CONDITIONAL([COND_i386_pc], [test x$target_cpu = xi386 -a x$platform = xpc])
+AM_CONDITIONAL([COND_i386_efi], [test x$target_cpu = xi386 -a x$platform = xefi])
+AM_CONDITIONAL([COND_i386_qemu], [test x$target_cpu = xi386 -a x$platform = xqemu])
+AM_CONDITIONAL([COND_i386_ieee1275], [test x$target_cpu = xi386 -a x$platform = xieee1275])
+AM_CONDITIONAL([COND_i386_coreboot], [test x$target_cpu = xi386 -a x$platform = xcoreboot])
+AM_CONDITIONAL([COND_i386_multiboot], [test x$target_cpu = xi386 -a x$platform = xmultiboot])
+AM_CONDITIONAL([COND_x86_64_efi], [test x$target_cpu = xx86_64 -a x$platform = xefi])
+AM_CONDITIONAL([COND_mips_yeeloong], [test x$target_cpu = xmips -a x$platform = xyeeloong])
+AM_CONDITIONAL([COND_mips_qemu_mips], [test x$target_cpu = xmips -a x$platform = xqemu_mips])
+AM_CONDITIONAL([COND_sparc64_ieee1275], [test x$target_cpu = xsparc64 -a x$platform = xieee1275])
+AM_CONDITIONAL([COND_powerpc_ieee1275], [test x$target_cpu = xpowerpc -a x$platform = xieee1275])
+
+AM_CONDITIONAL([COND_MAN_PAGES], [test x$cross_compiling = xno -a x$HELP2MAN != x])
+AM_CONDITIONAL([COND_GRUB_EMU_USB], [test x$enable_grub_emu_usb = xyes])
+AM_CONDITIONAL([COND_GRUB_EMU_SDL], [test x$enable_grub_emu_sdl = xyes])
+AM_CONDITIONAL([COND_GRUB_EMU_PCI], [test x$enable_grub_emu_pci = xyes])
+AM_CONDITIONAL([COND_GRUB_MKFONT], [test x$enable_grub_mkfont = xyes])
+AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x])
+AM_CONDITIONAL([COND_GRUB_FSTEST], [test x$enable_grub_fstest = xyes])
+AM_CONDITIONAL([COND_GRUB_PE2ELF], [test x$TARGET_OBJ2ELF != x])
+AM_CONDITIONAL([COND_APPLE_CC], [test x$TARGET_APPLE_CC != x])
+AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes])
 
 # Output files.
 grub_CHECK_LINK_DIR
diff --git a/configure.common b/configure.common
deleted file mode 100644
index a9e5665dd..000000000
--- a/configure.common
+++ /dev/null
@@ -1,852 +0,0 @@
-# -*- autoconf -*-
-
-# Process this file with autoconf to produce a configure script.
-
-# Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010  Free Software Foundation, Inc.
-#
-# This configure.ac is free software; the author
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# This file is shared between grub-core and util configure scripts.
-
-# Program name transformations
-AC_ARG_PROGRAM
-
-# Optimization flag.  Allow user to override.
-if test "x$TARGET_CFLAGS" = x; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -Os"
-fi
-
-# Default HOST_CPPFLAGS
-HOST_CPPFLAGS="$HOST_CPPFLAGS -Wall -W"
-HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_srcdir)/grub-core/include"
-HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
-HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_srcdir)/grub-core/gnulib"
-HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_UTIL=1"
-HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_LIBDIR=\\\"\$(pkglibdir)\\\""
-HOST_CPPFLAGS="$HOST_CPPFLAGS -DLOCALEDIR=\\\"\$(localedir)\\\""
-
-TARGET_CPPFLAGS="$TARGET_CPPFLAGS -Wall -W"
-TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_srcdir)/include"
-TARGET_CPPFLAGS="$TARGET_CPPFLAGS -I\$(top_builddir)/include"
-
-case "$target_cpu" in
-  i[[3456]]86)	target_cpu=i386 ;;
-  amd64)	target_cpu=x86_64 ;;
-  sparc)	target_cpu=sparc64 ;;
-  mipsel|mips64el)
-                target_cpu=mips;
-		HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_CPU_MIPSEL=1";
-		TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DGRUB_CPU_MIPSEL=1";
-		;;
-  mips|mips64)
-                target_cpu=mips;
-		HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_CPU_MIPS=1";
-		TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DGRUB_CPU_MIPS=1";
-		;;
-esac
-
-# Specify the platform (such as firmware).
-AC_ARG_WITH([platform],
-            AS_HELP_STRING([--with-platform=PLATFORM],
-                           [select the host platform [[guessed]]]))
-
-# Guess the platform if not specified.
-if test "x$with_platform" = x; then
-  case "$target_cpu"-"$target_vendor" in
-    i386-apple) platform=efi ;;
-    i386-*) platform=pc ;;
-    x86_64-apple) platform=efi ;;
-    x86_64-*) platform=pc ;;
-    powerpc-*) platform=ieee1275 ;;
-    powerpc64-*) platform=ieee1275 ;;
-    sparc64-*) platform=ieee1275 ;;
-    mips-*) platform=yeeloong ;;
-    *) AC_MSG_ERROR([unsupported CPU: "$target_cpu"]) ;;
-  esac
-else
-  platform="$with_platform"
-fi
-
-# Adjust CPU unless target was explicitly specified.
-if test -z "$target_alias"; then
-  case "$target_cpu"-"$platform" in
-    x86_64-efi) ;;
-    x86_64-emu) ;;
-    x86_64-*) target_cpu=i386 ;;
-    powerpc64-ieee1275) target_cpu=powerpc ;;
-  esac
-fi
-
-# Check if the platform is supported, make final adjustments.
-case "$target_cpu"-"$platform" in
-  i386-efi) ;;
-  x86_64-efi) ;;
-  i386-pc) ;;
-  i386-multiboot) ;;
-  i386-coreboot) ;;
-  i386-linuxbios) platform=coreboot ;;
-  i386-ieee1275) ;;
-  i386-qemu) ;;
-  powerpc-ieee1275) ;;
-  sparc64-ieee1275) ;;
-  mips-qemu-mips) ;;
-  mips-yeeloong) ;;
-  *-emu) ;;
-  *) AC_MSG_ERROR([platform "$platform" is not supported for target CPU "$target_cpu"]) ;;
-esac
-
-case "$target_cpu" in
-  i386 | powerpc) target_m32=1 ;;
-  x86_64 | sparc64) target_m64=1 ;;
-esac
-
-case "$host_os" in
-  mingw32*) host_os=cygwin ;;
-esac
-
-# This normalizes the names, and creates a new variable ("host_kernel")
-# while at it, since the mapping is not always 1:1 (e.g. different OSes
-# using the same kernel type).
-case "$host_os" in
-  gnu*)				host_kernel=hurd ;;
-  linux*)			host_kernel=linux ;;
-  freebsd* | kfreebsd*-gnu)	host_kernel=kfreebsd ;;
-  netbsd*)			host_kernel=netbsd ;;
-  cygwin)			host_kernel=windows ;;
-esac
-
-case "$platform" in
-  coreboot)	machine_CFLAGS="-DGRUB_MACHINE_COREBOOT=1" ;;
-  multiboot)	machine_CFLAGS="-DGRUB_MACHINE_MULTIBOOT=1" ;;
-  efi)		machine_CFLAGS="-DGRUB_MACHINE_EFI=1" ;;
-  ieee1275)	machine_CFLAGS="-DGRUB_MACHINE_IEEE1275=1" ;;
-  qemu)		machine_CFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
-  pc)		machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
-  emu)		machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
-  yeeloong)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
-  qemu-mips)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
-esac
-case "$target_cpu" in
-  mips)      	machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_MIPS=1" ;;
-  sparc64)      machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
-esac
-machine_CFLAGS="$machine_CFLAGS -DMACHINE=`echo ${target_cpu}_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`"
-
-HOST_CPPFLAGS="$HOST_CPPFLAGS $machine_CFLAGS"
-TARGET_CPPFLAGS="$TARGET_CPPFLAGS $machine_CFLAGS"
-
-AC_SUBST(host_cpu)
-AC_SUBST(host_os)
-AC_SUBST(host_kernel)
-
-AC_SUBST(target_cpu)
-AC_SUBST(platform)
-
-#
-# Checks for build programs.
-#
-
-# Although cmp is listed in the GNU Coding Standards as a command which
-# can used directly, OpenBSD lacks cmp in the default installation.
-AC_CHECK_PROGS([CMP], [cmp])
-if test "x$CMP" = x; then
-  AC_MSG_ERROR([cmp is not found])
-fi
-
-AC_CHECK_PROGS([YACC], [bison])
-if test "x$YACC" = x; then
-  AC_MSG_ERROR([bison is not found])
-fi
-
-FONT_SOURCE=
-
-for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do
-  for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont; do
-    if test -f "$dir/unifont.$ext"; then
-      FONT_SOURCE="$dir/unifont.$ext"
-      break 2
-    fi
-  done
-done
-
-if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xyeeloong ); then
-   AC_MSG_ERROR([qemu and yeeloong ports need unifont])
-fi
-
-AC_SUBST([FONT_SOURCE])
-
-AC_PROG_RANLIB
-AC_PROG_INSTALL
-AC_PROG_AWK
-AC_PROG_LEX
-AC_PROG_YACC
-AC_PROG_MAKE_SET
-AC_PROG_MKDIR_P
-
-if test "x$LEX" = "x:"; then
-  AC_MSG_ERROR([flex is not found])
-else
-  version=`$LEX --version | $AWK '{ split($NF,x,"."); print x[[1]]*10000+x[[2]]*100+x[[3]]; }'`
-  if test -n "$version" -a "$version" -ge 20535; then
-    :
-  else
-    AC_MSG_ERROR([flex is too old. GRUB requires 2.5.35 or above])
-  fi
-fi
-
-# These are not a "must".
-AC_PATH_PROG(MAKEINFO, makeinfo)
-
-#
-# Checks for host programs.
-#
-
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_AS
-
-# Must be GCC.
-test "x$GCC" = xyes || AC_MSG_ERROR([GCC is required])
-
-AC_GNU_SOURCE
-AM_GNU_GETTEXT([external])
-AC_SYS_LARGEFILE
-
-# Identify characteristics of the host architecture.
-AC_C_BIGENDIAN
-AC_CHECK_SIZEOF(void *)
-AC_CHECK_SIZEOF(long)
-
-grub_apple_cc
-if test x$grub_cv_apple_cc = xyes ; then
-  HOST_CPPFLAGS="$HOST_CPPFLAGS -DAPPLE_CC=1"
-  HOST_CFLAGS="$HOST_CFLAGS -fnested-functions"
-fi
-
-if test "x$cross_compiling" = xyes; then
-  AC_MSG_WARN([cannot generate manual pages while cross compiling])
-else
-  AC_PATH_PROG(HELP2MAN, help2man)
-fi
-
-# Check for functions.
-AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf)
-
-# For grub-mkisofs
-AC_HEADER_MAJOR
-AC_HEADER_DIRENT
-AC_CHECK_FUNCS(memmove sbrk strdup lstat getuid getgid)
-AC_CHECK_HEADERS(sys/mkdev.h sys/sysmacros.h malloc.h termios.h sys/types.h)
-AC_CHECK_HEADERS(unistd.h string.h strings.h sys/stat.h sys/fcntl.h limits.h)
-
-# For opendisk() and getrawpartition() on NetBSD.
-# Used in util/deviceiter.c and in util/hostdisk.c.
-AC_CHECK_HEADER([util.h], [
-  AC_CHECK_LIB([util], [opendisk], [
-    LIBUTIL="-lutil"
-    AC_DEFINE(HAVE_OPENDISK, 1, [Define if opendisk() in -lutil can be used])
-  ])
-  AC_CHECK_LIB([util], [getrawpartition], [
-    LIBUTIL="-lutil"
-    AC_DEFINE(HAVE_GETRAWPARTITION, 1, [Define if getrawpartition() in -lutil can be used])
-  ])
-])
-AC_SUBST([LIBUTIL])
-
-#
-# Check for host and build compilers.
-#
-HOST_CC=$CC
-AC_CHECK_PROGS(BUILD_CC, [gcc egcs cc],
-                 [AC_MSG_ERROR([none of gcc, egcs and cc is found. set BUILD_CC manually.])])
-
-#
-# Check for target programs.
-#
-
-# Find tools for the target.
-if test "x$target_alias" != x && test "x$host_alias" != "x$target_alias"; then
-  tmp_ac_tool_prefix="$ac_tool_prefix"
-  ac_tool_prefix=$target_alias-
-
-  AC_CHECK_TOOLS(TARGET_CC, [gcc egcs cc],
-                 [AC_MSG_ERROR([none of gcc, egcs and cc is found. set TARGET_CC manually.])])
-  AC_CHECK_TOOL(OBJCOPY, objcopy)
-  AC_CHECK_TOOL(STRIP, strip)
-  AC_CHECK_TOOL(NM, nm)
-
-  ac_tool_prefix="$tmp_ac_tool_prefix"
-else
-  if test "x$TARGET_CC" = x; then
-    TARGET_CC=$CC
-  fi
-  AC_CHECK_TOOL(OBJCOPY, objcopy)
-  AC_CHECK_TOOL(STRIP, strip)
-  AC_CHECK_TOOL(NM, nm)
-fi
-AC_SUBST(HOST_CC)
-AC_SUBST(BUILD_CC)
-AC_SUBST(TARGET_CC)
-
-# Test the C compiler for the target environment.
-tmp_CC="$CC"
-tmp_CFLAGS="$CFLAGS"
-tmp_LDFLAGS="$LDFLAGS"
-tmp_CPPFLAGS="$CPPFLAGS"
-tmp_LIBS="$LIBS"
-CC="$TARGET_CC"
-CFLAGS="$TARGET_CFLAGS"
-CPPFLAGS="$TARGET_CPPFLAGS"
-LDFLAGS="$TARGET_LDFLAGS"
-LIBS=""
-
-# debug flags.
-TARGET_CFLAGS="$TARGET_CFLAGS -Wall -W -Wshadow -Wpointer-arith -Wmissing-prototypes -Wundef -Wstrict-prototypes -g"
-TARGET_CCASFLAGS="$TARGET_CCASFLAGS -g"
-
-# Force no alignment to save space on i386.
-if test "x$target_cpu" = xi386; then
-  AC_CACHE_CHECK([whether -falign-loops works], [grub_cv_cc_falign_loop], [
-    CFLAGS="$CFLAGS -falign-loops=1"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-        [grub_cv_cc_falign_loop=yes],
-	[grub_cv_cc_falign_loop=no])
-  ])
-
-  if test "x$grub_cv_cc_falign_loop" = xyes; then
-    TARGET_CFLAGS="$TARGET_CFLAGS -falign-jumps=1 -falign-loops=1 -falign-functions=1"
-  else
-    TARGET_CFLAGS="$TARGET_CFLAGS -malign-jumps=1 -malign-loops=1 -malign-functions=1"
-  fi
-
-  # Some toolchains enable these features by default, but they need
-  # registers that aren't set up properly in GRUB.
-  TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-3dnow"
-fi
-
-# By default, GCC 4.4 generates .eh_frame sections containing unwind
-# information in some cases where it previously did not. GRUB doesn't need
-# these and they just use up vital space. Restore the old compiler
-# behaviour.
-AC_CACHE_CHECK([whether -fno-dwarf2-cfi-asm works], [grub_cv_cc_fno_dwarf2_cfi_asm], [
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -fno-dwarf2-cfi-asm"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-      [grub_cv_cc_fno_dwarf2_cfi_asm=yes],
-      [grub_cv_cc_fno_dwarf2_cfi_asm=no])
-  CFLAGS="$SAVE_CFLAGS"
-])
-
-if test "x$grub_cv_cc_fno_dwarf2_cfi_asm" = xyes; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -fno-dwarf2-cfi-asm"
-fi
-
-grub_apple_target_cc
-if test x$grub_cv_apple_target_cc = xyes ; then
-  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DAPPLE_CC=1"
-  TARGET_CFLAGS="$TARGET_CFLAGS -fnested-functions"
-
-  CFLAGS="$CFLAGS -DAPPLE_CC=1 -fnested-functions"
-  TARGET_APPLE_CC=1
-  AC_CHECK_PROG([OBJCONV], [objconv], [objconv], [])
-  if test "x$OBJCONV" = x ; then
-     AC_CHECK_PROG([OBJCONV], [objconv], [./objconv], [], [.])
-  fi
-  if test "x$OBJCONV" = x ; then
-    AC_MSG_ERROR([objconv not found which is required when building with apple compiler])
-  fi
-  TARGET_IMG_LDSCRIPT=
-  TARGET_IMG_CFLAGS="-static"
-  TARGET_IMG_LDFLAGS='-nostdlib -static -Wl,-preload -Wl,-segalign,20'
-  TARGET_IMG_LDFLAGS_AC='-nostdlib -static -Wl,-preload -Wl,-segalign,20'
-  TARGET_IMG_BASE_LDOPT="-Wl,-image_base"
-else
-  TARGET_APPLE_CC=0
-# Use linker script if present, otherwise use builtin -N script.
-if test -f "${srcdir}/${grub_coredir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"; then
-  TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/${grub_coredir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
-  TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}"
-  TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/${grub_coredir}/conf/${target_cpu}-${platform}-${host_os}-img-ld.sc"
-  TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
-else
-  TARGET_IMG_LDSCRIPT=
-  TARGET_IMG_LDFLAGS='-Wl,-N'
-  TARGET_IMG_LDFLAGS_AC='-Wl,-N'
-  TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"
-fi
-TARGET_IMG_CFLAGS=
-fi
-
-# For platforms where ELF is not the default link format.
-AC_MSG_CHECKING([for command to convert module to ELF format])
-case "${host_os}" in
-  cygwin) TARGET_OBJ2ELF='$(grub_utildir)/grub-pe2elf';
-# FIXME: put proper test here
-  AC_DEFINE([NEED_REGISTER_FRAME_INFO], 1,
-	    [Define to 1 if GCC generates calls to __register_frame_info()])
-  ;;
-  *) ;;
-esac
-AC_MSG_RESULT([$TARGET_OBJ2ELF])
-
-if test "x$target_m32" = x1; then
-  # Force 32-bit mode.
-  TARGET_CFLAGS="$TARGET_CFLAGS -m32"
-  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m32"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -m32"
-  TARGET_MODULE_FORMAT="elf32"
-fi
-
-if test "x$target_m64" = x1; then
-  # Force 64-bit mode.
-  TARGET_CFLAGS="$TARGET_CFLAGS -m64"
-  TARGET_CCASFLAGS="$TARGET_CCASFLAGS -m64"
-  TARGET_LDFLAGS="$TARGET_LDFLAGS -m64"
-  TARGET_MODULE_FORMAT="elf64"
-fi
-
-if test "$target_cpu"-"$platform" = x86_64-efi; then
-  # Use large model to support 4G memory
-  AC_CACHE_CHECK([whether option -mcmodel=large works], grub_cv_cc_mcmodel, [
-    SAVED_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -m64 -mcmodel=large"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-		      [grub_cv_cc_mcmodel=yes],
-		      [grub_cv_cc_mcmodel=no])
-  ])
-  if test "x$grub_cv_cc_mcmodel" = xno; then
-    AC_MSG_ERROR([-mcmodel=large not supported. Upgrade your gcc.])
-  else
-    TARGET_CFLAGS="$TARGET_CFLAGS -mcmodel=large"
-  fi
-
-  # EFI writes to stack below %rsp, we must not use the red zone
-  AC_CACHE_CHECK([whether option -mno-red-zone works], grub_cv_cc_no_red_zone, [
-    CFLAGS="$CFLAGS -m64 -mno-red-zone"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-		      [grub_cv_cc_no_red_zone=yes],
-		      [grub_cv_cc_no_red_zone=no])
-  ])
-  if test "x$grub_cv_cc_no_red_zone" = xno; then
-    AC_MSG_ERROR([-mno-red-zone not supported, upgrade your gcc])
-  fi
-
-  TARGET_CFLAGS="$TARGET_CFLAGS -mno-red-zone"
-fi
-
-#
-# Compiler features.
-#
-
-# Need __enable_execute_stack() for nested function trampolines?
-grub_CHECK_ENABLE_EXECUTE_STACK
-
-# Position independent executable.
-grub_CHECK_PIE
-[# Need that, because some distributions ship compilers that include
-# `-fPIE' in the default specs.
-if [ x"$pie_possible" = xyes ]; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE"
-fi]
-
-# Smashing stack protector.
-grub_CHECK_STACK_PROTECTOR
-# Need that, because some distributions ship compilers that include
-# `-fstack-protector' in the default specs.
-if test "x$ssp_possible" = xyes; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -fno-stack-protector"
-fi
-grub_CHECK_STACK_ARG_PROBE
-# Cygwin's GCC uses alloca() to probe the stackframe on static
-# stack allocations above some threshold.
-if test x"$sap_possible" = xyes; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -mno-stack-arg-probe"
-fi
-
-AC_ARG_ENABLE([werror],
-	      [AS_HELP_STRING([--disable-werror],
-                             [do not use -Werror when building GRUB])])
-if test x"$enable_werror" != xno ; then
-  TARGET_CFLAGS="$TARGET_CFLAGS -Werror"
-fi
-
-TARGET_CPP="$TARGET_CC -E"
-TARGET_CCAS=$TARGET_CC
-
-AC_SUBST(OBJCONV)
-AC_SUBST(TARGET_CPP)
-AC_SUBST(TARGET_CCAS)
-AC_SUBST(TARGET_OBJ2ELF)
-AC_SUBST(TARGET_APPLE_CC)
-AC_SUBST(TARGET_MODULE_FORMAT)
-
-AC_SUBST(TARGET_CFLAGS)
-AC_SUBST(TARGET_LDFLAGS)
-AC_SUBST(TARGET_CPPFLAGS)
-AC_SUBST(TARGET_CCASFLAGS)
-
-AC_SUBST(TARGET_IMG_LDSCRIPT)
-AC_SUBST(TARGET_IMG_LDFLAGS)
-AC_SUBST(TARGET_IMG_CFLAGS)
-AC_SUBST(TARGET_IMG_BASE_LDOPT)
-
-AC_SUBST(HOST_CFLAGS)
-AC_SUBST(HOST_LDFLAGS)
-AC_SUBST(HOST_CPPFLAGS)
-AC_SUBST(HOST_CCASFLAGS)
-
-# Set them to their new values for the tests below.
-CC="$TARGET_CC"
-if test "x$TARGET_APPLE_CC" = x1 ; then
-CFLAGS="$TARGET_CFLAGS -nostdlib -Wno-error"
-else
-CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100 -Wno-error"
-fi
-CPPFLAGS="$TARGET_CPPFLAGS"
-LDFLAGS="$TARGET_LDFLAGS"
-LIBS=-lgcc
-
-grub_ASM_USCORE
-if test x$grub_cv_asm_uscore = xyes; then
-CFLAGS="$CFLAGS -Wl,--defsym,_abort=_main"
-else
-CFLAGS="$CFLAGS -Wl,--defsym,abort=main"
-fi
-
-# Check for libgcc symbols
-AC_CHECK_FUNCS(__bswapsi2 __bswapdi2 __ashldi3 __ashrdi3 __lshrdi3 __trampoline_setup __ucmpdi2 _restgpr_14_x)
-
-if test "x$TARGET_APPLE_CC" = x1 ; then
-CFLAGS="$TARGET_CFLAGS -nostdlib"
-else
-CFLAGS="$TARGET_CFLAGS -nostdlib -Wl,--defsym,___main=0x8100"
-fi
-LIBS=""
-
-# Defined in aclocal.m4.
-grub_PROG_TARGET_CC
-if test "x$TARGET_APPLE_CC" != x1 ; then
-grub_PROG_OBJCOPY_ABSOLUTE
-fi
-grub_PROG_LD_BUILD_ID_NONE
-if test "x$target_cpu" = xi386; then
-  if test "$platform" != emu && test "x$TARGET_APPLE_CC" != x1 ; then
-    if test ! -z "$TARGET_IMG_LDSCRIPT"; then
-      # Check symbols provided by linker script.
-      CFLAGS="$TARGET_CFLAGS -nostdlib ${TARGET_IMG_LDFLAGS_AC} ${TARGET_IMG_BASE_LDOPT},8000 -Wl,--defsym,___main=0x8100"
-    fi
-    grub_CHECK_BSS_START_SYMBOL
-    grub_CHECK_END_SYMBOL
-  fi
-  CFLAGS="$TARGET_CFLAGS"
-  grub_I386_ASM_PREFIX_REQUIREMENT
-  grub_I386_ASM_ADDR32
-  grub_I386_ASM_ABSOLUTE_WITHOUT_ASTERISK
-else
-  AC_DEFINE([NESTED_FUNC_ATTR], [], [Catch gcc bug])
-fi
-
-AH_BOTTOM([#if defined(__i386__) && !defined(GRUB_UTIL)
-#define NESTED_FUNC_ATTR __attribute__ ((__regparm__ (1)))
-#else
-#define NESTED_FUNC_ATTR
-#endif])
-
-AC_ARG_ENABLE([efiemu],
-	      [AS_HELP_STRING([--enable-efiemu],
-                             [build and install the efiemu runtimes (default=guessed)])])
-if test x"$enable_efiemu" = xno ; then
-  efiemu_excuse="explicitly disabled"
-fi
-if test x"$efiemu_excuse" = x ; then
-  AC_CACHE_CHECK([whether options required for efiemu work], grub_cv_cc_efiemu, [
-    CFLAGS="$CFLAGS -m64 -mcmodel=large -mno-red-zone -nostdlib"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-		      [grub_cv_cc_efiemu=yes],
-		      [grub_cv_cc_efiemu=no])
-  ])
-  if test x$grub_cv_cc_efiemu = xno; then
-     efiemu_excuse="cannot compile with -m64 -mcmodel=large -mno-red-zone -nostdlib"
-  fi
-fi
-if test x"$enable_efiemu" = xyes && test x"$efiemu_excuse" != x ; then
-  AC_MSG_ERROR([efiemu runtime was explicitly requested but can't be compiled])
-fi
-if test x"$efiemu_excuse" = x ; then
-enable_efiemu=yes
-else
-enable_efiemu=no
-fi
-AC_SUBST([enable_efiemu])
-
-if test "$platform" != emu; then
-AC_CACHE_CHECK([whether -nostdinc -isystem works], [grub_cv_cc_isystem], [
-  SAVED_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
-int va_arg_func (int fixed, va_list args);]], [[]])],
-      [grub_cv_cc_isystem=yes],
-      [grub_cv_cc_isystem=no])
-  CPPFLAGS="$SAVED_CPPFLAGS"
-])
-
-if test x"$grub_cv_cc_isystem" = xyes ; then
-  TARGET_CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
-fi
-fi
-
-# Restore the flags.
-CC="$tmp_CC"
-CFLAGS="$tmp_CFLAGS"
-CPPFLAGS="$tmp_CPPFLAGS"
-LDFLAGS="$tmp_LDFLAGS"
-LIBS="$tmp_LIBS"
-
-#
-# Check for options.
-#
-
-# Memory manager debugging.
-AC_ARG_ENABLE([mm-debug],
-	      AS_HELP_STRING([--enable-mm-debug],
-                             [include memory manager debugging]),
-              [AC_DEFINE([MM_DEBUG], [1],
-                         [Define to 1 if you enable memory manager debugging.])])
-
-AC_ARG_ENABLE([grub-emu-usb],
-	      [AS_HELP_STRING([--enable-grub-emu-usb],
-                             [build and install the `grub-emu' debugging utility with USB support (default=guessed)])])
-
-AC_ARG_ENABLE([grub-emu-sdl],
-	      [AS_HELP_STRING([--enable-grub-emu-sdl],
-                             [build and install the `grub-emu' debugging utility with SDL support (default=guessed)])])
-
-AC_ARG_ENABLE([grub-emu-pci],
-	      [AS_HELP_STRING([--enable-grub-emu-pci],
-                             [build and install the `grub-emu' debugging utility with PCI support (potentially dangerous) (default=no)])])
-
-if test "$platform" = emu; then
-  missing_ncurses=
-[# Check for curses libraries.]
-  AC_CHECK_LIB([ncurses], [wgetch], [LIBCURSES="-lncurses"],
-    [AC_CHECK_LIB([curses], [wgetch], [LIBCURSES="-lcurses"],
-      [missing_ncurses=[true]])])
-  AC_SUBST([LIBCURSES])
-[if [ x"$missing_ncurses" = x ]; then ]
-  [# Check for headers.]
-  AC_CHECK_HEADERS([ncurses/curses.h], [],
-    [AC_CHECK_HEADERS([ncurses.h], [],
-      [AC_CHECK_HEADERS([curses.h], [],
-	[missing_ncurses=[true]])])])
-[fi]
-if test x"$missing_ncurses" = xtrue ; then
-  AC_MSG_ERROR([grub-emu can't be compiled without ncurses])
-fi
-
-if test x"$enable_grub_emu_usb" = xno ; then
-  grub_emu_usb_excuse="explicitly disabled"
-fi
-
-if test x"$enable_grub_emu_pci" = xyes ; then
-   grub_emu_usb_excuse="conflicts with PCI support"
-fi
-
-[if [ x"$grub_emu_usb_excuse" = x ]; then
-    # Check for libusb libraries.]
-AC_CHECK_LIB([usb], [usb_claim_interface], [LIBUSB="-lusb"],
-    [grub_emu_usb_excuse=["need libusb library"]])
-    AC_SUBST([LIBUSB])
-[fi]
-[if [ x"$grub_emu_usb_excuse" = x ]; then
-    # Check for headers.]
-    AC_CHECK_HEADERS([usb.h], [],
-      [grub_emu_usb_excuse=["need libusb headers"]])
-[fi]
-if test x"$enable_grub_emu_usb" = xyes && test x"$grub_emu_usb_excuse" != x ; then
-  AC_MSG_ERROR([USB support for grub-emu was explicitly requested but can't be compiled])
-fi
-if test x"$grub_emu_usb_excuse" = x ; then
-enable_grub_emu_usb=yes
-else
-enable_grub_emu_usb=no
-fi
-
-if test x"$enable_grub_emu_sdl" = xno ; then
-  grub_emu_sdl_excuse="explicitely disabled"
-fi
-[if [ x"$grub_emu_sdl_excuse" = x ]; then
-    # Check for libSDL libraries.]
-AC_CHECK_LIB([SDL], [SDL_Init], [LIBSDL="-lSDL"],
-    [grub_emu_sdl_excuse=["libSDL libraries are required to build \`grub-emu' with SDL support"]])
-    AC_SUBST([LIBSDL])
-[fi]
-
-[if [ x"$grub_emu_sdl_excuse" = x ]; then
-    # Check for headers.]
-    AC_CHECK_HEADERS([SDL/SDL.h], [],
-      [grub_emu_sdl_excuse=["libSDL header file is required to build \`grub-emu' with SDL support"]])
-[fi]
-
-if test x"enable_grub_emu_sdl" = xyes && test x"$grub_emu_sdl_excuse" != x ; then
-  AC_MSG_ERROR([SDL support for grub-emu was explicitely requested but can't be compiled])
-fi
-if test x"$grub_emu_sdl_excuse" = x ; then
-enable_grub_emu_sdl=yes
-else
-enable_grub_emu_sdl=no
-fi
-
-if test x"$enable_grub_emu_pci" != xyes ; then
-   grub_emu_pci_excuse="not enabled"
-fi
-
-if test x"$enable_grub_emu_usb" = xyes ; then
-   grub_emu_pci_excuse="conflicts with USB support"
-fi
-
-[if [ x"$grub_emu_pci_excuse" = x ]; then
-      # Check for libpci libraries.]
-   AC_CHECK_LIB([pciaccess], [pci_system_init], [LIBPCIACCESS="-lpciaccess"],
-      [grub_emu_pci_excuse=["need libpciaccess library"]])
-    AC_SUBST([LIBPCIACCESS])
-[fi]
-[if [ x"$grub_emu_pci_excuse" = x ]; then
-    # Check for headers.]
-    AC_CHECK_HEADERS([pci/pci.h], [],
-      [grub_emu_pci_excuse=["need libpciaccess headers"]])
-[fi]
-
-if test x"$grub_emu_pci_excuse" = x ; then
-enable_grub_emu_pci=yes
-else
-
-enable_grub_emu_pci=no
-fi
-
-AC_SUBST([enable_grub_emu_sdl])
-AC_SUBST([enable_grub_emu_usb])
-AC_SUBST([enable_grub_emu_pci])
-fi
-
-AC_ARG_ENABLE([grub-fstest],
-	      [AS_HELP_STRING([--enable-grub-fstest],
-                             [build and install the `grub-fstest' debugging utility (default=guessed)])])
-if test x"$enable_grub_fstest" = xno ; then
-  grub_fstest_excuse="explicitly disabled"
-fi
-if test x"$grub_fstest_excuse" = x ; then
-enable_grub_fstest=yes
-else
-enable_grub_fstest=no
-fi
-AC_SUBST([enable_grub_fstest])
-
-AC_ARG_ENABLE([grub-mkfont],
-	      [AS_HELP_STRING([--enable-grub-mkfont],
-                             [build and install the `grub-mkfont' utility (default=guessed)])])
-if test x"$enable_grub_mkfont" = xno ; then
-  grub_mkfont_excuse="explicitly disabled"
-fi
-
-if test x"$grub_mkfont_excuse" = x ; then
-  # Check for freetype libraries.
-  AC_CHECK_PROGS([FREETYPE], [freetype-config])
-  if test "x$FREETYPE" = x ; then
-    grub_mkfont_excuse=["need freetype2 library"]
-  fi
-  freetype_cflags=`freetype-config --cflags`
-  freetype_libs=`freetype-config --libs`
-fi
-
-if test x"$grub_mkfont_excuse" = x ; then
-  # Check for freetype libraries.
-  SAVED_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $freetype_cflags"
-  AC_CHECK_HEADERS([ft2build.h], [],
-  	[grub_mkfont_excuse=["need freetype2 headers"]])
-  CPPFLAGS="$SAVED_CPPFLAGS"
-fi
-
-if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; then
-  AC_MSG_ERROR([grub-mkfont was explicitly requested but can't be compiled])
-fi
-if test x"$grub_mkfont_excuse" = x ; then
-enable_grub_mkfont=yes
-else
-enable_grub_mkfont=no
-fi
-AC_SUBST([enable_grub_mkfont])
-AC_SUBST([freetype_cflags])
-AC_SUBST([freetype_libs])
-
-AC_ARG_ENABLE([device-mapper],
-              [AS_HELP_STRING([--enable-device-mapper],
-                              [enable Linux device-mapper support (default=guessed)])])
-if test x"$enable_device_mapper" = xno ; then
-  device_mapper_excuse="explicitly disabled"
-fi
-
-if test x"$device_mapper_excuse" = x ; then
-  # Check for device-mapper library.
-  AC_CHECK_LIB([devmapper], [dm_task_create],
-               [HOST_LDFLAGS="$HOST_LDFLAGS -ldevmapper"
-                AC_DEFINE([HAVE_DEVICE_MAPPER], [1],
-                          [Define to 1 if you have the devmapper library.])],
-               [device_mapper_excuse="need devmapper library"])
-fi
-
-pkglibrootdir='$(libdir)'/`echo $PACKAGE | sed "$program_transform_name"`
-AC_SUBST(pkglibrootdir)
-
-AC_SUBST([FONT_SOURCE])
-AS_IF([test x$target_cpu = xi386 -a x$platform = xpc],
-	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
-AS_IF([test x$target_cpu = xi386 -a x$platform = xcoreboot],
-	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
-AS_IF([test x$target_cpu = xi386 -a x$platform = xmultiboot],
-	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
-AS_IF([test x$target_cpu = xmips -a x$platform = xyeeloong],
-	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x80200000)])
-AS_IF([test x$target_cpu = xpowerpc -a x$platform = xieee1275],
-	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x200000)])
-AS_IF([test x$target_cpu = xi386 -a x$platform = xqemu],
-	    [AC_SUBST([GRUB_BOOT_MACHINE_LINK_ADDR], 0xffe00)])
-AS_IF([test x$target_cpu = xi386 -a x$platform = xieee1275],
-	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x10000)])
-AS_IF([test x$TARGET_APPLE_CC = x1],
-	    [AC_SUBST([USE_APPLE_CC_FIXES], yes)])
-
-#
-# Automake conditionals
-#
-
-AM_CONDITIONAL([COND_emu], [test x$platform = xemu])
-AM_CONDITIONAL([COND_i386_pc], [test x$target_cpu = xi386 -a x$platform = xpc])
-AM_CONDITIONAL([COND_i386_efi], [test x$target_cpu = xi386 -a x$platform = xefi])
-AM_CONDITIONAL([COND_i386_qemu], [test x$target_cpu = xi386 -a x$platform = xqemu])
-AM_CONDITIONAL([COND_i386_ieee1275], [test x$target_cpu = xi386 -a x$platform = xieee1275])
-AM_CONDITIONAL([COND_i386_coreboot], [test x$target_cpu = xi386 -a x$platform = xcoreboot])
-AM_CONDITIONAL([COND_i386_multiboot], [test x$target_cpu = xi386 -a x$platform = xmultiboot])
-AM_CONDITIONAL([COND_x86_64_efi], [test x$target_cpu = xx86_64 -a x$platform = xefi])
-AM_CONDITIONAL([COND_mips_yeeloong], [test x$target_cpu = xmips -a x$platform = xyeeloong])
-AM_CONDITIONAL([COND_mips_qemu_mips], [test x$target_cpu = xmips -a x$platform = xqemu_mips])
-AM_CONDITIONAL([COND_sparc64_ieee1275], [test x$target_cpu = xsparc64 -a x$platform = xieee1275])
-AM_CONDITIONAL([COND_powerpc_ieee1275], [test x$target_cpu = xpowerpc -a x$platform = xieee1275])
-
-AM_CONDITIONAL([COND_MAN_PAGES], [test x$cross_compiling = xno -a x$HELP2MAN != x])
-AM_CONDITIONAL([COND_GRUB_EMU_USB], [test x$enable_grub_emu_usb = xyes])
-AM_CONDITIONAL([COND_GRUB_EMU_SDL], [test x$enable_grub_emu_sdl = xyes])
-AM_CONDITIONAL([COND_GRUB_EMU_PCI], [test x$enable_grub_emu_pci = xyes])
-AM_CONDITIONAL([COND_GRUB_MKFONT], [test x$enable_grub_mkfont = xyes])
-AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x])
-AM_CONDITIONAL([COND_GRUB_FSTEST], [test x$enable_grub_fstest = xyes])
-AM_CONDITIONAL([COND_GRUB_PE2ELF], [test x$TARGET_OBJ2ELF != x])
-AM_CONDITIONAL([COND_APPLE_CC], [test x$TARGET_APPLE_CC != x])
-AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes])
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 437835c83..0f7886b3a 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -81,18 +81,18 @@ CPPFLAGS_GRUB += -I$(top_builddir)/include
 CCASFLAGS_GRUB = -DASM_FILE=1
 
 CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
-CPPFLAGS_GCRY = -I$(top_srcdir)/$(grub_coredir)/lib/libgcrypt_wrap
+CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap
 
 CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))"
-CPPFLAGS_GNULIB = -I$(top_srcdir)/$(grub_coredir)/gnulib
+CPPFLAGS_GNULIB = -I$(top_srcdir)/grub-core/gnulib
 
 CFLAGS_MKISOFS = -Wno-all -Werror
 CPPFLAGS_MKISOFS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/util/mkisofs/include
 
 CFLAGS_POSIX = -fno-builtin
-CPPFLAGS_POSIX = -I$(top_srcdir)/$(grub_coredir)/lib/posix_wrap
+CPPFLAGS_POSIX = -I$(top_srcdir)/grub-core/lib/posix_wrap
 
-CPPFLAGS_EFIEMU = -I$(top_srcdir)/$(grub_coredir)/efiemu/runtime
+CPPFLAGS_EFIEMU = -I$(top_srcdir)/grub-core/efiemu/runtime
 
 LDADD_KERNEL = -lgcc
 CFLAGS_KERNEL = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding

From a525bb9ae47d64b94e2d260d5095f577c10cd405 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Tue, 17 Aug 2010 19:43:37 +0530
Subject: [PATCH 1368/1628] rm grub-core/configure.ac

---
 grub-core/configure.ac | 83 ------------------------------------------
 1 file changed, 83 deletions(-)
 delete mode 100644 grub-core/configure.ac

diff --git a/grub-core/configure.ac b/grub-core/configure.ac
deleted file mode 100644
index 6a84c16e1..000000000
--- a/grub-core/configure.ac
+++ /dev/null
@@ -1,83 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-
-# Copyright (C) 2010  Free Software Foundation, Inc.
-#
-# This configure.ac is free software; the author
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-dnl This configure script is complicated, because GRUB needs to deal
-dnl with three potentially different types:
-dnl
-dnl   build  -- the environment for building GRUB
-dnl   host   -- the environment for running utilities
-dnl   target -- the environment for running GRUB
-dnl
-dnl In addition, GRUB needs to deal with a platform specification
-dnl which specifies the system running GRUB, such as firmware.
-dnl This is necessary because the target type in autoconf does not
-dnl describe such a system very well.
-dnl
-dnl The current strategy is to build utilities using host
-dnl cross-compiler and grub core and modules using target
-dnl cross-compiler.  For this we use nested packages approach, where
-dnl top-level package grub utilities is built with HOSTCC and nested
-dnl package (in grub-core directory) builds with TARGETCC.
-
-# NOTE: ../configure.ac must also be updated.
-AC_INIT([GRUB],[1.98],[bug-grub@gnu.org])
-AC_CONFIG_AUX_DIR([.])
-
-: ${CFLAGS=""} # We don't want -g -O2
-
-# Checks for host and target systems.
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-
-AM_INIT_AUTOMAKE()
-AC_PREREQ(2.60)
-AC_CONFIG_SRCDIR([include/grub/dl.h])
-AC_CONFIG_HEADER([config.h])
-
-grub_coredir='.'
-AC_SUBST(grub_coredir)
-
-grub_utildir='..'
-AC_SUBST(grub_utildir)
-
-m4_include([configure.common])
-
-CC=$TARGET_CC
-CPP=$TARGET_CC
-CCAS=$TARGET_CC
-
-# Output files.
-grub_CHECK_LINK_DIR
-if test x"$link_dir" = xyes ; then
-  AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu])
-  mkdir -p lib/target_cpu
-  cp -r $srcdir/lib/$target_cpu/* lib/target_cpu
-  if test "$platform" != emu ; then
-    AC_CONFIG_LINKS([include/grub/machine:include/grub/$target_cpu/$platform])
-  fi
-else
-  mkdir -p include/grub 2>/dev/null
-  rm -rf include/grub/cpu
-  cp -rp $srcdir/include/grub/$target_cpu include/grub/cpu 2>/dev/null
-  cp -rp $srcdir/lib/$target_cpu lib/target_cpu 2>/dev/null
-  if test "$platform" != emu ; then
-    rm -rf include/grub/machine
-    cp -rp $srcdir/grub-core/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
-  fi
-fi
-
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([po/Makefile])
-AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
-
-AC_OUTPUT

From f99b0464dfd9273744238040c69368ad34054b0e Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Tue, 17 Aug 2010 19:46:13 +0530
Subject: [PATCH 1369/1628] rm grub-core/video/emu.moved


From 2b6c00842db2f2fcb74fdc0f0ea393de38c3fb91 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Wed, 18 Aug 2010 11:57:51 +0530
Subject: [PATCH 1370/1628] distcheck almost done

---
 Makefile.am           |  1 +
 configure.ac          |  9 ++++++--
 docs/Makefile.am      |  3 +++
 grub-core/Makefile.am | 49 ++++++++++++++++++++++++++++++++++++++++---
 grub-core/modules.def |  7 ++++++-
 5 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4063a6476..09c2fa43e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 SUBDIRS = . grub-core po docs
 EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
+EXTRA_DIST += include conf/i386-pc-cygwin-img-ld.sc
 
 grubconfdir = $(sysconfdir)/grub.d
 platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
diff --git a/configure.ac b/configure.ac
index ee01049ac..23988a17e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -867,8 +867,6 @@ AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes])
 grub_CHECK_LINK_DIR
 if test x"$link_dir" = xyes ; then
   AC_CONFIG_LINKS([include/grub/cpu:include/grub/$target_cpu])
-  mkdir -p grub-core/lib
-  cp -rp $srcdir/grub-core/lib/$target_cpu grub-core/lib/target_cpu
   if test "$platform" != emu ; then
     AC_CONFIG_LINKS([include/grub/machine:include/grub/$target_cpu/$platform])
   fi
@@ -883,6 +881,13 @@ else
   fi
 fi
 
+# Copy */setjmp.S to target_cpu/
+AC_CONFIG_COMMANDS([grub-core/lib/target_cpu],
+  [mkdir -p grub-core/lib/target_cpu])
+AC_CONFIG_COMMANDS([setjmp.S],
+  [cp -rp $srcdir/grub-core/lib/$target_cpu/setjmp.S grub-core/lib/target_cpu/],
+  [target_cpu=$target_cpu srcdir=$srcdir])
+
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([grub-core/Makefile])
 AC_CONFIG_FILES([po/Makefile])
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 1b302d262..a2e83dcd6 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,6 +1,9 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
+EXTRA_DIST = grub.cfg man
+
 AM_MAKEINFOFLAGS = --force --no-split --no-validate
 info_TEXINFOS = grub.texi
 grub_TEXINFOS = fdl.texi
 
+
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 0f7886b3a..efce4d22e 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -4,12 +4,55 @@ CC=$(TARGET_CC)
 CPP=$(TARGET_CC)
 CCAS=$(TARGET_CC)
 
-EXTRA_DIST = gentpl.py modules.def Makefile.tpl genmoddep.awk
+EXTRA_DIST =
+EXTRA_DIST += modules.def genmoddep.awk
 EXTRA_DIST += genmodsrc.sh gensymlist.sh genemuinit.sh genemuinitheader.sh
 EXTRA_DIST += genfslist.sh gencmdlist.sh genvideolist.sh genhandlerlist.sh
 EXTRA_DIST += genpartmaplist.sh genparttoollist.sh genterminallist.sh
-EXTRA_DIST += conf/i386-pc-cygwin-img-ld.sc
-EXTRA_DIST += $(shell find $(top_srcdir) -name '*.h')
+EXTRA_DIST += lib/libgcrypt_wrap/cipher_wrap.h
+EXTRA_DIST += lib/libgcrypt/cipher/rijndael-tables.h
+EXTRA_DIST += lib/libgcrypt/cipher/bithelp.h
+EXTRA_DIST += lib/libgcrypt/cipher/rmd.h
+EXTRA_DIST += lib/libgcrypt/cipher/hash-common.h
+EXTRA_DIST += lib/libgcrypt/cipher/camellia.h
+EXTRA_DIST += lib/posix_wrap/localcharset.h
+EXTRA_DIST += lib/posix_wrap/ctype.h
+EXTRA_DIST += lib/posix_wrap/limits.h
+EXTRA_DIST += lib/posix_wrap/stdio.h
+EXTRA_DIST += lib/posix_wrap/sys/types.h
+EXTRA_DIST += lib/posix_wrap/unistd.h
+EXTRA_DIST += lib/posix_wrap/locale.h
+EXTRA_DIST += lib/posix_wrap/wchar.h
+EXTRA_DIST += lib/posix_wrap/string.h
+EXTRA_DIST += lib/posix_wrap/langinfo.h
+EXTRA_DIST += lib/posix_wrap/wctype.h
+EXTRA_DIST += lib/posix_wrap/stdint.h
+EXTRA_DIST += lib/posix_wrap/stdlib.h
+EXTRA_DIST += lib/posix_wrap/assert.h
+EXTRA_DIST += lib/posix_wrap/errno.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/types.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/cipher.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/rijndael-tables.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/memory.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/bithelp.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/g10lib.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/rmd.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/hash-common.h
+EXTRA_DIST += lib/libgcrypt-grub/cipher/camellia.h
+EXTRA_DIST += efiemu/runtime/config.h
+EXTRA_DIST += gnulib/getopt.h
+EXTRA_DIST += gnulib/argp-version-etc.h
+EXTRA_DIST += gnulib/fnmatch.h
+EXTRA_DIST += gnulib/error.h
+EXTRA_DIST += gnulib/argp-namefrob.h
+EXTRA_DIST += gnulib/argp.h
+EXTRA_DIST += gnulib/argp-fmtstream.h
+EXTRA_DIST += gnulib/gettext.h
+EXTRA_DIST += gnulib/regex_internal.h
+EXTRA_DIST += gnulib/progname.h
+EXTRA_DIST += gnulib/regex.h
+EXTRA_DIST += gnulib/alloca.h
+EXTRA_DIST += gnulib/getopt_int.h
 
 grubconfdir = $(sysconfdir)/grub.d
 platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
diff --git a/grub-core/modules.def b/grub-core/modules.def
index 8e65f277c..3d222dd74 100644
--- a/grub-core/modules.def
+++ b/grub-core/modules.def
@@ -1207,7 +1207,12 @@ module = {
 
 module = {
   name = setjmp;
-  source = lib/target_cpu/setjmp.S;
+  nodist = lib/target_cpu/setjmp.S;
+  extra_dist = lib/i386/setjmp.S;
+  extra_dist = lib/mips/setjmp.S;
+  extra_dist = lib/x86_64/setjmp.S;
+  extra_dist = lib/sparc64/setjmp.S;
+  extra_dist = lib/powerpc/setjmp.S;
 };
 
 module = {

From 9da94e0576bb2f0f5d24ab8972a5a4b6de239d8f Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 18 Aug 2010 11:08:00 +0100
Subject: [PATCH 1371/1628] * acinclude.m4 (grub_ASM_USCORE): Use a more
 accurate grep pattern, to avoid false positives with some assemblers that
 output things like "someprefix_func" as part of their output.

---
 ChangeLog    | 6 ++++++
 acinclude.m4 | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b662428bc..d5e67639e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-18  Colin Watson  <cjwatson@ubuntu.com>
+
+	* acinclude.m4 (grub_ASM_USCORE): Use a more accurate grep pattern,
+	to avoid false positives with some assemblers that output things
+	like "someprefix_func" as part of their output.
+
 2010-08-15  Robert Millan  <rmh@gnu.org>
 
 	* kern/emu/misc.c (grub_get_libzfs_handle): Handle libzfs_init()
diff --git a/acinclude.m4 b/acinclude.m4
index 72483b5d0..49760d5f0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -38,6 +38,7 @@ dnl Written by Pavel Roskin. Based on grub_ASM_EXT_C written by
 dnl Erich Boleyn and modified by Yoshinori K. Okuji.
 AC_DEFUN([grub_ASM_USCORE],
 [AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_EGREP])
 AC_MSG_CHECKING([if C symbols get an underscore after compilation])
 AC_CACHE_VAL(grub_cv_asm_uscore,
 [cat > conftest.c <<\EOF
@@ -56,7 +57,7 @@ else
   AC_MSG_ERROR([${CC-cc} failed to produce assembly code])
 fi
 
-if grep _func conftest.s >/dev/null 2>&1; then
+if $EGREP '(^|[^_[:alnum]])_func' conftest.s >/dev/null 2>&1; then
   grub_cv_asm_uscore=yes
 else
   grub_cv_asm_uscore=no

From 51f1f5afab3f3e581c54b78af0b91780c4f78b68 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 18 Aug 2010 11:15:08 +0100
Subject: [PATCH 1372/1628] * configure.ac: Move AM_INIT_AUTOMAKE after
 AC_CANONICAL_TARGET to fix warnings from Autoconf.

---
 ChangeLog    | 5 +++++
 configure.ac | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d5e67639e..bf1a0cfbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-18  Colin Watson  <cjwatson@ubuntu.com>
+
+	* configure.ac: Move AM_INIT_AUTOMAKE after AC_CANONICAL_TARGET to
+	fix warnings from Autoconf.
+
 2010-08-18  Colin Watson  <cjwatson@ubuntu.com>
 
 	* acinclude.m4 (grub_ASM_USCORE): Use a more accurate grep pattern,
diff --git a/configure.ac b/configure.ac
index 19d782609..4091b4fa2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,6 @@ dnl type.
 
 
 AC_INIT([GRUB],[1.98],[bug-grub@gnu.org])
-AM_INIT_AUTOMAKE()
 AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR([include/grub/dl.h])
 AC_CONFIG_HEADER([config.h])
@@ -41,6 +40,8 @@ AC_CONFIG_HEADER([config.h])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
+AM_INIT_AUTOMAKE()
+
 # Program name transformations
 AC_ARG_PROGRAM
 

From 019be613d094e6b25759c959a1a96ad29a8e225e Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Wed, 18 Aug 2010 16:53:11 +0530
Subject: [PATCH 1373/1628] fixed distcheck

---
 Makefile.am           | 2 +-
 configure.ac          | 2 --
 grub-core/Makefile.am | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 09c2fa43e..e96a540da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
+DEPDIR = .deps-util
 SUBDIRS = . grub-core po docs
 EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
 EXTRA_DIST += include conf/i386-pc-cygwin-img-ld.sc
@@ -152,7 +153,6 @@ CLEANFILES += ascii.bitmaps
 
 ascii.h: ascii.bitmaps grub-bin2h
 	$(builddir)/grub-bin2h ascii_bitmaps < $< > $@
-	cp $@ $(top_builddir)/grub-core/include
 CLEANFILES += ascii.h $(top_builddir)/grub-core/include/ascii.h
 
 widthspec.bin: $(FONT_SOURCE) grub-mkfont
diff --git a/configure.ac b/configure.ac
index 23988a17e..c0cd11b65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,9 +37,7 @@ fi
 
 # Default HOST_CPPFLAGS
 HOST_CPPFLAGS="$HOST_CPPFLAGS -Wall -W"
-HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_srcdir)/grub-core/include"
 HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_builddir)/include"
-HOST_CPPFLAGS="$HOST_CPPFLAGS -I\$(top_srcdir)/grub-core/gnulib"
 HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_UTIL=1"
 HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_LIBDIR=\\\"\$(pkglibdir)\\\""
 HOST_CPPFLAGS="$HOST_CPPFLAGS -DLOCALEDIR=\\\"\$(localedir)\\\""
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index efce4d22e..e1f45eb38 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 CC=$(TARGET_CC)
 CPP=$(TARGET_CC)
 CCAS=$(TARGET_CC)
+DEPDIR=.deps-core
 
 EXTRA_DIST =
 EXTRA_DIST += modules.def genmoddep.awk

From 62f7d20835799167be1561b5803b8c858f99a054 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Wed, 18 Aug 2010 20:25:16 +0530
Subject: [PATCH 1374/1628] fixed grub-emu build

---
 configure.ac          |  3 ++-
 grub-core/modules.def |  4 ++--
 modules.def           | 25 +++++++++++--------------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index c0cd11b65..b4dd0e9e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -806,11 +806,12 @@ fi
 if test x"$device_mapper_excuse" = x ; then
   # Check for device-mapper library.
   AC_CHECK_LIB([devmapper], [dm_task_create],
-               [HOST_LDFLAGS="$HOST_LDFLAGS -ldevmapper"
+               [LIBDEVMAPPER="-ldevmapper"
                 AC_DEFINE([HAVE_DEVICE_MAPPER], [1],
                           [Define to 1 if you have the devmapper library.])],
                [device_mapper_excuse="need devmapper library"])
 fi
+AC_SUBST([LIBDEVMAPPER])
 
 pkglibrootdir='$(libdir)'/`echo $PACKAGE | sed "$program_transform_name"`
 AC_SUBST(pkglibrootdir)
diff --git a/grub-core/modules.def b/grub-core/modules.def
index 3d222dd74..416e20dd1 100644
--- a/grub-core/modules.def
+++ b/grub-core/modules.def
@@ -249,7 +249,7 @@ program = {
 
   ldadd = 'kernel.img$(EXEEXT)';
   ldadd = '$(MODULE_FILES)';
-  ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)';
+  ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)';
 
   enable = emu;
 };
@@ -262,7 +262,7 @@ program = {
   nodist = symlist.c;
 
   ldadd = 'kernel.img$(EXEEXT)';
-  ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS)';
+  ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)';
 
   enable = emu;
 };
diff --git a/modules.def b/modules.def
index 8fb97cd40..a3de5877d 100644
--- a/modules.def
+++ b/modules.def
@@ -99,7 +99,7 @@ program = {
   name = grub-bin2h;
   source = util/bin2h.c;
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL)';
+  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
   mansection = 1;
 };
 
@@ -112,7 +112,7 @@ program = {
   extra_dist = util/grub-mkimagexx.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL)';
+  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
   cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"';
 };
 
@@ -123,7 +123,7 @@ program = {
   source = util/grub-mkrelpath.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL)';
+  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
 };
 
 program = {
@@ -133,7 +133,7 @@ program = {
   source = util/grub-script-check.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL)';
+  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
 };
 
 program = {
@@ -143,7 +143,7 @@ program = {
   source = util/grub-editenv.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL)';
+  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
 };
 
 program = {
@@ -153,7 +153,7 @@ program = {
   source = util/grub-mkpasswd-pbkdf2.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL)';
+  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
 };
@@ -181,7 +181,7 @@ program = {
   source = util/grub-fstest.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL)';
+  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
   condition = COND_GRUB_FSTEST;
 };
 
@@ -194,7 +194,7 @@ program = {
   cflags = '$(freetype_cflags)';
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL)';
+  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
   ldflags = '$(freetype_libs)';
   condition = COND_GRUB_MKFONT;
 };
@@ -213,8 +213,7 @@ program = {
   sparc64_ieee1275 = util/ieee1275/devicemap.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL)';
-  ldflags = '$(LIBUTIL)';
+  ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
 };
 
 program = {
@@ -224,8 +223,7 @@ program = {
   source = util/grub-probe.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL)';
-  ldflags = '$(LIBUTIL)';
+  ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
 };
 
 program = {
@@ -242,8 +240,7 @@ program = {
   sparc64_ieee1275 = util/lvm.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL)';
-  ldflags = '$(LIBUTIL)';
+  ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
 
   enable = i386_pc;
   enable = sparc64_ieee1275;

From 7afdce98a64663ff8f07d64c95383ee801d960e1 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Thu, 19 Aug 2010 15:47:38 +0530
Subject: [PATCH 1375/1628] fix example_unit_test build

---
 modules.def | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules.def b/modules.def
index a3de5877d..c7574e928 100644
--- a/modules.def
+++ b/modules.def
@@ -453,4 +453,5 @@ program = {
   source = grub-core/tests/lib/test.c;
   cflags = -Wno-format;
   ldadd = libgrub.a;
+  ldflags = '$(LIBDEVMAPPER)';
 };

From 34980574fc30594028d132b1414f155e71fdf9b2 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Thu, 19 Aug 2010 17:50:05 +0530
Subject: [PATCH 1376/1628] minor cleanups

---
 configure.ac                      | 22 ++++++++++++++++++++--
 tests/example_grub_script_test.in |  2 +-
 tests/util/grub-shell-tester.in   |  2 +-
 tests/util/grub-shell.in          |  2 +-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9b918f1bc..0923bf08f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,25 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+dnl This configure script is complicated, because GRUB needs to deal
+dnl with three potentially different types:
+dnl
+dnl   build  -- the environment for building GRUB
+dnl   host   -- the environment for running utilities
+dnl   target -- the environment for running GRUB
+dnl
+dnl In addition, GRUB needs to deal with a platform specification
+dnl which specifies the system running GRUB, such as firmware.
+dnl This is necessary because the target type in autoconf does not
+dnl describe such a system very well.
+dnl
+dnl The current strategy is to use variables with no prefix (such as
+dnl CC, CFLAGS, etc.) for the host type as well as the build type,
+dnl because GRUB does not need to use those variables for the build
+dnl type, so there is no conflict. Variables with the prefix "TARGET_"
+dnl (such as TARGET_CC, TARGET_CFLAGS, etc.) are used for the target
+dnl type.
+
 AC_INIT([GRUB],[1.98],[bug-grub@gnu.org])
 
 # We don't want -g -O2 by default in CFLAGS
@@ -879,10 +898,9 @@ else
   mkdir -p include/grub 2>/dev/null
   rm -rf include/grub/cpu
   cp -rp $srcdir/include/grub/$target_cpu include/grub/cpu 2>/dev/null
-  cp -rp $srcdir/grub-core/lib/$target_cpu grub-core/lib/target_cpu 2>/dev/null
   if test "$platform" != emu ; then
     rm -rf include/grub/machine
-    cp -rp $srcdir/grub-core/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
+    cp -rp $srcdir/include/grub/$target_cpu/$platform include/grub/machine 2>/dev/null
   fi
 fi
 
diff --git a/tests/example_grub_script_test.in b/tests/example_grub_script_test.in
index 6fa3dc98a..93a90a18e 100644
--- a/tests/example_grub_script_test.in
+++ b/tests/example_grub_script_test.in
@@ -1,3 +1,3 @@
-#! @abs_top_builddir@/grub-shell-tester --modules=echo
+#! @builddir@/grub-shell-tester --modules=echo
 
 echo "hello world"
diff --git a/tests/util/grub-shell-tester.in b/tests/util/grub-shell-tester.in
index d2a9af3ab..ed34a5e17 100644
--- a/tests/util/grub-shell-tester.in
+++ b/tests/util/grub-shell-tester.in
@@ -91,7 +91,7 @@ if [ "x${source}" = x ] ; then
 fi
 
 outfile1=`mktemp`
-@abs_top_builddir@/grub-shell --qemu-opts="${qemuopts}" --modules=${modules} ${source} >${outfile1}
+@builddir@/grub-shell --qemu-opts="${qemuopts}" --modules=${modules} ${source} >${outfile1}
 
 outfile2=`mktemp`
 bash ${source} >${outfile2}
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index fc1e01ef5..3f25fe7bb 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -124,7 +124,7 @@ halt
 EOF
 
 isofile=`mktemp`
-sh @abs_top_builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage \
+sh @builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage \
   --override-directory=${builddir}/grub-core --output=${isofile} \
   boot/grub/grub.cfg=${cfgfile} \
   /boot/grub/testcase.cfg=${source} >/dev/null 2>&1

From b4ece5e11ea3db37861db6767202abcde693ffc4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 19 Aug 2010 21:03:14 +0200
Subject: [PATCH 1377/1628] 	Implement sendkey support.

	* commands/i386/pc/sendkey.c: New file.
	* conf/i386-pc.rmk (pkglib_MODULES): Add sendkey.mod.
	(sendkey_mod_SOURCES): New variable.
	(sendkey_mod_CFLAGS): Likewise.
	(sendkey_mod_LDFLAGS): Likewise.
---
 ChangeLog                  |  10 +
 commands/i386/pc/sendkey.c | 381 +++++++++++++++++++++++++++++++++++++
 conf/i386-pc.rmk           |   6 +
 3 files changed, 397 insertions(+)
 create mode 100644 commands/i386/pc/sendkey.c

diff --git a/ChangeLog b/ChangeLog
index bf1a0cfbf..a20e76892 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Implement sendkey support.
+
+	* commands/i386/pc/sendkey.c: New file.
+	* conf/i386-pc.rmk (pkglib_MODULES): Add sendkey.mod.
+	(sendkey_mod_SOURCES): New variable.
+	(sendkey_mod_CFLAGS): Likewise.
+	(sendkey_mod_LDFLAGS): Likewise.
+
 2010-08-18  Colin Watson  <cjwatson@ubuntu.com>
 
 	* configure.ac: Move AM_INIT_AUTOMAKE after AC_CANONICAL_TARGET to
diff --git a/commands/i386/pc/sendkey.c b/commands/i386/pc/sendkey.c
new file mode 100644
index 000000000..aa7ffdb59
--- /dev/null
+++ b/commands/i386/pc/sendkey.c
@@ -0,0 +1,381 @@
+/* sendkey.c - fake keystroke. */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009  Free Software Foundation, Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <grub/types.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/err.h>
+#include <grub/dl.h>
+#include <grub/extcmd.h>
+#include <grub/cpu/io.h>
+#include <grub/loader.h>
+
+static char sendkey[0x20];
+/* Length of sendkey.  */
+static int keylen = 0;
+static int noled = 0;
+static const struct grub_arg_option options[] =
+  {
+    {"num", 'n', 0, "set numlock mode", "[keep|on|off]", ARG_TYPE_STRING},
+    {"caps", 'c', 0, "set capslock mode", "[keep|on|off]", ARG_TYPE_STRING},
+    {"scroll", 's', 0, "set scrolllock mode", "[keep|on|off]", ARG_TYPE_STRING},
+    {"insert", 0, 0, "set insert mode", "[keep|on|off]", ARG_TYPE_STRING},
+    {"wait", 0, 0, "set wait mode", "[keep|on|off]", ARG_TYPE_STRING},
+    {"left-shift", 0, 0, "press left shift", "[keep|on|off]", ARG_TYPE_STRING},
+    {"right-shift", 0, 0, "press right shift", "[keep|on|off]", ARG_TYPE_STRING},
+    {"sysreq", 0, 0, "press sysreq", "[keep|on|off]", ARG_TYPE_STRING},
+    {"numkey", 0, 0, "press NumLock key", "[keep|on|off]", ARG_TYPE_STRING},
+    {"capskey", 0, 0, "press CapsLock key", "[keep|on|off]", ARG_TYPE_STRING},
+    {"scrollkey", 0, 0, "press ScrollLock key", "[keep|on|off]", ARG_TYPE_STRING},
+    {"inserkey", 0, 0, "press Insert key", "[keep|on|off]", ARG_TYPE_STRING},
+    {"left-alt", 0, 0, "press left alt", "[keep|on|off]", ARG_TYPE_STRING},
+    {"right-alt", 0, 0, "press rightt alt", "[keep|on|off]", ARG_TYPE_STRING},
+    {"left-ctrl", 0, 0, "press left ctrl", "[keep|on|off]", ARG_TYPE_STRING},
+    {"right-ctrl", 0, 0, "press rightt ctrl", "[keep|on|off]", ARG_TYPE_STRING},
+    {"no-led", 0, 0, "don't update LED state", 0, 0},
+    {0, 0, 0, 0, 0, 0}
+  };
+static int simple_flag_offsets[] 
+= {5, 6, 4, 7, 11, 1, 0, 10, 13, 14, 12, 15, 9, 3, 8, 2};
+
+static grub_uint32_t andmask = 0xffffffff, ormask = 0;
+
+struct 
+keysym
+{
+  char *unshifted_name;			/* the name in unshifted state */
+  char *shifted_name;			/* the name in shifted state */
+  unsigned char unshifted_ascii;	/* the ascii code in unshifted state */
+  unsigned char shifted_ascii;		/* the ascii code in shifted state */
+  unsigned char keycode;		/* keyboard scancode */
+};
+
+/* The table for key symbols. If the "shifted" member of an entry is
+   NULL, the entry does not have shifted state. Copied from GRUB Legacy setkey fuction  */
+static struct keysym keysym_table[] =
+{
+  {"escape",		0,		0x1b,	0,	0x01},
+  {"1",			"exclam",	'1',	'!',	0x02},
+  {"2",			"at",		'2',	'@',	0x03},
+  {"3",			"numbersign",	'3',	'#',	0x04},
+  {"4",			"dollar",	'4',	'$',	0x05},
+  {"5",			"percent",	'5',	'%',	0x06},
+  {"6",			"caret",	'6',	'^',	0x07},
+  {"7",			"ampersand",	'7',	'&',	0x08},
+  {"8",			"asterisk",	'8',	'*',	0x09},
+  {"9",			"parenleft",	'9',	'(',	0x0a},
+  {"0",			"parenright",	'0',	')',	0x0b},
+  {"minus",		"underscore",	'-',	'_',	0x0c},
+  {"equal",		"plus",		'=',	'+',	0x0d},
+  {"backspace",		0,		'\b',	0,	0x0e},
+  {"tab",		0,		'\t',	0,	0x0f},
+  {"q",			"Q",		'q',	'Q',	0x10},
+  {"w",			"W",		'w',	'W',	0x11},
+  {"e",			"E",		'e',	'E',	0x12},
+  {"r",			"R",		'r',	'R',	0x13},
+  {"t",			"T",		't',	'T',	0x14},
+  {"y",			"Y",		'y',	'Y',	0x15},
+  {"u",			"U",		'u',	'U',	0x16},
+  {"i",			"I",		'i',	'I',	0x17},
+  {"o",			"O",		'o',	'O',	0x18},
+  {"p",			"P",		'p',	'P',	0x19},
+  {"bracketleft",	"braceleft",	'[',	'{',	0x1a},
+  {"bracketright",	"braceright",	']',	'}',	0x1b},
+  {"enter",		0,		'\r',	0,	0x1c},
+  {"control",		0,		0,	0,	0x1d},
+  {"a",			"A",		'a',	'A',	0x1e},
+  {"s",			"S",		's',	'S',	0x1f},
+  {"d",			"D",		'd',	'D',	0x20},
+  {"f",			"F",		'f',	'F',	0x21},
+  {"g",			"G",		'g',	'G',	0x22},
+  {"h",			"H",		'h',	'H',	0x23},
+  {"j",			"J",		'j',	'J',	0x24},
+  {"k",			"K",		'k',	'K',	0x25},
+  {"l",			"L",		'l',	'L',	0x26},
+  {"semicolon",		"colon",	';',	':',	0x27},
+  {"quote",		"doublequote",	'\'',	'"',	0x28},
+  {"backquote",		"tilde",	'`',	'~',	0x29},
+  {"shift",		0,		0,	0,	0x2a},
+  {"backslash",		"bar",		'\\',	'|',	0x2b},
+  {"z",			"Z",		'z',	'Z',	0x2c},
+  {"x",			"X",		'x',	'X',	0x2d},
+  {"c",			"C",		'c',	'C',	0x2e},
+  {"v",			"V",		'v',	'V',	0x2f},
+  {"b",			"B",		'b',	'B',	0x30},
+  {"n",			"N",		'n',	'N',	0x31},
+  {"m",			"M",		'm',	'M',	0x32},
+  {"comma",		"less",		',',	'<',	0x33},
+  {"period",		"greater",	'.',	'>',	0x34},
+  {"slash",		"question",	'/',	'?',	0x35},
+  {"rshift",		0,		0,	0,	0x36},
+  {"numasterisk",		0,		'*',	0,	0x37},
+  {"alt",		0,		0,	0,	0x38},
+  {"space",		0,		' ',	0,	0x39},
+  {"capslock",		0,		0,	0,	0x3a},
+  {"F1",		0,		0,	0,	0x3b},
+  {"F2",		0,		0,	0,	0x3c},
+  {"F3",		0,		0,	0,	0x3d},
+  {"F4",		0,		0,	0,	0x3e},
+  {"F5",		0,		0,	0,	0x3f},
+  {"F6",	 	0,		0,	0,	0x40},
+  {"F7",		0,		0,	0,	0x41},
+  {"F8",		0,		0,	0,	0x42},
+  {"F9",		0,		0,	0,	0x43},
+  {"F10",		0,		0,	0,	0x44},
+  {"num7",		"numhome",		'7',	0,	0x47},
+  {"num8",		"numup",		'8',	0,	0x48},
+  {"num9",		"numpgup",		'9',	0,	0x49},
+  {"numminus",		0,		'-',	0,	0x4a},
+  {"num4",		"numleft",		'4',	0,	0x4b},
+  {"num5",		"num5numlock",		'5',	0,	0x4c},
+  {"num6",		"numright",		'6',	0,	0x4d},
+  {"numplus",		0,		'-',	0,	0x4e},
+  {"num1",		"numend",		'1',	0,	0x4f},
+  {"num2",		"numdown",		'2',	0,	0x50},
+  {"num3",		"numpgdown",		'3',	0,	0x51},
+  {"num0",		"numinsert",		'0',	0,	0x52},
+  {"numperiod",	"numdelete", 0,	0x7f,		0x53},
+  {"F11",		0,		0,	0,	0x57},
+  {"F12",		0,		0,	0,	0x58},
+  {"numenter",		0,		'\r',	0,	0xe0},
+  {"numslash",		0,		'/',	0,	0xe0},
+  {"delete",		0,		0x7f,	0,	0xe0},
+  {"insert",		0,		0xe0,	0,	0x52},
+  {"home",		0,		0xe0,	0,	0x47},
+  {"end",		0,		0xe0,	0,	0x4f},
+  {"pgdown",		0,		0xe0,	0,	0x51},
+  {"pgup",		0,		0xe0,	0,	0x49},
+  {"down",		0,		0xe0,	0,	0x50},
+  {"up",		0,		0xe0,	0,	0x48},
+  {"left",		0,		0xe0,	0,	0x4b},
+  {"right",		0,		0xe0,	0,	0x4d}
+};
+
+/* Set a simple flag in flags variable  
+   OUTOFFSET - offset of flag in FLAGS,
+   OP - action id
+*/
+static void
+grub_sendkey_set_simple_flag (int outoffset, int op)
+{      
+  if (op == 2)
+    {
+      andmask |= (1 << outoffset);
+      ormask &= ~(1 << outoffset);
+    }
+  else
+    {
+      andmask &= (~(1 << outoffset));
+      if (op == 1)
+	ormask |= (1 << outoffset);
+      else
+	ormask &= ~(1 << outoffset);
+    }
+}
+
+static int
+grub_sendkey_parse_op (struct grub_arg_list state)
+{
+  if (! state.set)
+    return 2;
+
+  if (grub_strcmp (state.arg, "off") == 0 || grub_strcmp (state.arg, "0") == 0 
+      || grub_strcmp (state.arg, "unpress") == 0)
+    return 0;
+
+  if (grub_strcmp (state.arg, "on")  == 0 || grub_strcmp (state.arg, "1")  == 0
+      || grub_strcmp (state.arg, "press") == 0)
+    return 1;
+
+  return 2;
+}
+
+static grub_uint32_t oldflags;
+
+static grub_err_t
+grub_sendkey_postboot (void)
+{
+  /* For convention: pointer to flags.  */
+  grub_uint32_t *flags = (grub_uint32_t *) 0x417;
+
+  *flags = oldflags;
+
+  *((char *) 0x41a) = 0x1e;
+  *((char *) 0x41c) = 0x1e;
+
+  return GRUB_ERR_NONE;
+}
+
+/* Set keyboard buffer to our sendkey  */
+static grub_err_t
+grub_sendkey_preboot (int noret __attribute__ ((unused)))
+{
+  /* For convention: pointer to flags.  */
+  grub_uint32_t *flags = (grub_uint32_t *) 0x417;
+
+  oldflags = *flags;
+  
+  /* Set the sendkey.  */
+  *((char *) 0x41a) = 0x1e;
+  *((char *) 0x41c) = keylen + 0x1e;
+  grub_memcpy ((char *) 0x41e, sendkey, 0x20);
+
+  /* Transform "any ctrl" to "right ctrl" flag.  */
+  if (*flags & (1 << 8))
+    *flags &= ~(1 << 2);
+
+  /* Transform "any alt" to "right alt" flag.  */
+  if (*flags & (1 << 9))
+    *flags &= ~(1 << 3);
+  
+  *flags = (*flags & andmask) | ormask;
+
+  /* Transform "right ctrl" to "any ctrl" flag.  */
+  if (*flags & (1 << 8))
+    *flags |= (1 << 2);
+
+  /* Transform "right alt" to "any alt" flag.  */
+  if (*flags & (1 << 9))
+    *flags |= (1 << 3);
+
+  /* Write new LED state  */
+  if (!noled)
+    {
+      int value = 0;
+      int failed;
+      /* Try 5 times  */
+      for (failed = 0; failed < 5; failed++)
+	{
+	  value = 0;
+	  /* Send command change LEDs  */
+	  grub_outb (0xed, 0x60);
+
+	  /* Wait */
+	  do
+	    value = grub_inb (0x60);
+	  while ((value != 0xfa) && (value != 0xfe));
+
+	  if (value == 0xfa)
+	    {
+	      /* Set new LEDs*/
+	      grub_outb ((*flags >> 4) & 7, 0x60);
+	      break;
+	    }
+	}
+    }
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_cmd_sendkey (grub_extcmd_t cmd, int argc, char **args)
+{
+  struct grub_arg_list *state = cmd->state;
+
+  auto int find_key_code (char *key); 
+  auto int find_ascii_code (char *key);
+
+  int find_key_code (char *key)
+    {
+      unsigned i;
+
+      for (i = 0; i < sizeof (keysym_table) / sizeof (keysym_table[0]); i++)
+	{
+	  if (keysym_table[i].unshifted_name 
+	      && grub_strcmp (key, keysym_table[i].unshifted_name) == 0)
+	    return keysym_table[i].keycode;
+	  else if (keysym_table[i].shifted_name 
+		   && grub_strcmp (key, keysym_table[i].shifted_name) == 0)
+	    return keysym_table[i].keycode;
+	}
+
+      return 0;
+    }
+
+  int find_ascii_code (char *key)
+    {
+      unsigned i;
+
+      for (i = 0; i < sizeof (keysym_table) / sizeof (keysym_table[0]); i++)
+	{
+	  if (keysym_table[i].unshifted_name 
+	      && grub_strcmp (key, keysym_table[i].unshifted_name) == 0)
+	    return keysym_table[i].unshifted_ascii;
+	  else if (keysym_table[i].shifted_name 
+		   && grub_strcmp (key, keysym_table[i].shifted_name) == 0)
+	    return keysym_table[i].shifted_ascii;
+	}
+
+      return 0;
+    }
+
+  {
+    int i;
+
+    keylen = 0;
+
+    for (i = 0; i < argc && keylen < 0x20; i++)
+      {
+	int key_code;
+	
+	key_code = find_key_code (args[i]);
+	if (key_code)
+	  {
+	    sendkey[keylen++] = find_ascii_code (args[i]);
+	    sendkey[keylen++] = key_code;
+	  }
+      }
+  }
+
+  {
+    unsigned i;
+    for (i = 0; i < sizeof (simple_flag_offsets) 
+	   / sizeof (simple_flag_offsets[0]); i++)
+      grub_sendkey_set_simple_flag (simple_flag_offsets[i], 
+				    grub_sendkey_parse_op(state[i]));
+  }
+
+  /* Set noled. */
+  noled = (state[sizeof (simple_flag_offsets) 
+		 / sizeof (simple_flag_offsets[0])].set);
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_extcmd_t cmd;
+static void *preboot_hook;
+
+GRUB_MOD_INIT (sendkey)
+{
+  cmd = grub_register_extcmd ("sendkey", grub_cmd_sendkey, 
+			      GRUB_COMMAND_FLAG_BOTH,
+			      "sendkey [KEYSTROKE1] [KEYSTROKE2] ...",
+			      "Emulate a keystroke", options);
+
+  preboot_hook 
+    = grub_loader_register_preboot_hook (grub_sendkey_preboot, 
+					 grub_sendkey_postboot,
+					 GRUB_LOADER_PREBOOT_HOOK_PRIO_CONSOLE);
+}
+
+GRUB_MOD_FINI (sendkey)
+{
+  grub_unregister_extcmd (cmd);
+  grub_loader_unregister_preboot_hook (preboot_hook);
+}
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index c157aaf01..5e9ec882f 100644
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -235,6 +235,12 @@ datetime_mod_SOURCES = lib/cmos_datetime.c
 datetime_mod_CFLAGS = $(COMMON_CFLAGS)
 datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For sendkey.mod
+pkglib_MODULES += sendkey.mod
+sendkey_mod_SOURCES = commands/i386/pc/sendkey.c
+sendkey_mod_CFLAGS = $(COMMON_CFLAGS)
+sendkey_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # For ata_pthru.mod.
 ata_pthru_mod_SOURCES = disk/ata_pthru.c
 ata_pthru_mod_CFLAGS = $(COMMON_CFLAGS)

From 93541d660df8aa3c5afdec7b26d57d08bb098b91 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 19 Aug 2010 21:53:50 +0100
Subject: [PATCH 1378/1628] * commands/i386/pc/sendkey.c (options): Fix three
 typos.

---
 ChangeLog                  | 4 ++++
 commands/i386/pc/sendkey.c | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a20e76892..0eba757db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-19  Colin Watson  <cjwatson@ubuntu.com>
+
+	* commands/i386/pc/sendkey.c (options): Fix three typos.
+
 2010-08-19  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Implement sendkey support.
diff --git a/commands/i386/pc/sendkey.c b/commands/i386/pc/sendkey.c
index aa7ffdb59..60cb5c902 100644
--- a/commands/i386/pc/sendkey.c
+++ b/commands/i386/pc/sendkey.c
@@ -44,11 +44,11 @@ static const struct grub_arg_option options[] =
     {"numkey", 0, 0, "press NumLock key", "[keep|on|off]", ARG_TYPE_STRING},
     {"capskey", 0, 0, "press CapsLock key", "[keep|on|off]", ARG_TYPE_STRING},
     {"scrollkey", 0, 0, "press ScrollLock key", "[keep|on|off]", ARG_TYPE_STRING},
-    {"inserkey", 0, 0, "press Insert key", "[keep|on|off]", ARG_TYPE_STRING},
+    {"insertkey", 0, 0, "press Insert key", "[keep|on|off]", ARG_TYPE_STRING},
     {"left-alt", 0, 0, "press left alt", "[keep|on|off]", ARG_TYPE_STRING},
-    {"right-alt", 0, 0, "press rightt alt", "[keep|on|off]", ARG_TYPE_STRING},
+    {"right-alt", 0, 0, "press right alt", "[keep|on|off]", ARG_TYPE_STRING},
     {"left-ctrl", 0, 0, "press left ctrl", "[keep|on|off]", ARG_TYPE_STRING},
-    {"right-ctrl", 0, 0, "press rightt ctrl", "[keep|on|off]", ARG_TYPE_STRING},
+    {"right-ctrl", 0, 0, "press right ctrl", "[keep|on|off]", ARG_TYPE_STRING},
     {"no-led", 0, 0, "don't update LED state", 0, 0},
     {0, 0, 0, 0, 0, 0}
   };

From c4d165425604a43f9a32f97e157d2e4298c5a6c7 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 20 Aug 2010 00:05:14 +0100
Subject: [PATCH 1379/1628] * commands/i386/pc/sendkey.c (options): Remove
 "keep" from all status flag options; simply omitting the option is equivalent
 and simpler.  Rename "wait" to "pause".  Rename "sysreq" to "sysrq".
 (keysym_table): Rename "num5numlock" to "numlock". (grub_cmd_sendkey):
 Reinitialise `andmask' and `ormask', so that we can uniformly say that only
 the last of multiple `sendkey' invocations has any effect. * docs/grub.texi
 (sendkey): New section.

---
 ChangeLog                  |  11 +++
 commands/i386/pc/sendkey.c |  37 ++++-----
 docs/grub.texi             | 149 +++++++++++++++++++++++++++++++++++++
 3 files changed, 180 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0eba757db..a8f4c6f47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-20  Colin Watson  <cjwatson@ubuntu.com>
+
+	* commands/i386/pc/sendkey.c (options): Remove "keep" from all
+	status flag options; simply omitting the option is equivalent and
+	simpler.  Rename "wait" to "pause".  Rename "sysreq" to "sysrq".
+	(keysym_table): Rename "num5numlock" to "numlock".
+	(grub_cmd_sendkey): Reinitialise `andmask' and `ormask', so that we
+	can uniformly say that only the last of multiple `sendkey'
+	invocations has any effect.
+	* docs/grub.texi (sendkey): New section.
+
 2010-08-19  Colin Watson  <cjwatson@ubuntu.com>
 
 	* commands/i386/pc/sendkey.c (options): Fix three typos.
diff --git a/commands/i386/pc/sendkey.c b/commands/i386/pc/sendkey.c
index 60cb5c902..32e0e2551 100644
--- a/commands/i386/pc/sendkey.c
+++ b/commands/i386/pc/sendkey.c
@@ -33,22 +33,22 @@ static int keylen = 0;
 static int noled = 0;
 static const struct grub_arg_option options[] =
   {
-    {"num", 'n', 0, "set numlock mode", "[keep|on|off]", ARG_TYPE_STRING},
-    {"caps", 'c', 0, "set capslock mode", "[keep|on|off]", ARG_TYPE_STRING},
-    {"scroll", 's', 0, "set scrolllock mode", "[keep|on|off]", ARG_TYPE_STRING},
-    {"insert", 0, 0, "set insert mode", "[keep|on|off]", ARG_TYPE_STRING},
-    {"wait", 0, 0, "set wait mode", "[keep|on|off]", ARG_TYPE_STRING},
-    {"left-shift", 0, 0, "press left shift", "[keep|on|off]", ARG_TYPE_STRING},
-    {"right-shift", 0, 0, "press right shift", "[keep|on|off]", ARG_TYPE_STRING},
-    {"sysreq", 0, 0, "press sysreq", "[keep|on|off]", ARG_TYPE_STRING},
-    {"numkey", 0, 0, "press NumLock key", "[keep|on|off]", ARG_TYPE_STRING},
-    {"capskey", 0, 0, "press CapsLock key", "[keep|on|off]", ARG_TYPE_STRING},
-    {"scrollkey", 0, 0, "press ScrollLock key", "[keep|on|off]", ARG_TYPE_STRING},
-    {"insertkey", 0, 0, "press Insert key", "[keep|on|off]", ARG_TYPE_STRING},
-    {"left-alt", 0, 0, "press left alt", "[keep|on|off]", ARG_TYPE_STRING},
-    {"right-alt", 0, 0, "press right alt", "[keep|on|off]", ARG_TYPE_STRING},
-    {"left-ctrl", 0, 0, "press left ctrl", "[keep|on|off]", ARG_TYPE_STRING},
-    {"right-ctrl", 0, 0, "press right ctrl", "[keep|on|off]", ARG_TYPE_STRING},
+    {"num", 'n', 0, "set numlock mode", "[on|off]", ARG_TYPE_STRING},
+    {"caps", 'c', 0, "set capslock mode", "[on|off]", ARG_TYPE_STRING},
+    {"scroll", 's', 0, "set scrolllock mode", "[on|off]", ARG_TYPE_STRING},
+    {"insert", 0, 0, "set insert mode", "[on|off]", ARG_TYPE_STRING},
+    {"pause", 0, 0, "set pause mode", "[on|off]", ARG_TYPE_STRING},
+    {"left-shift", 0, 0, "press left shift", "[on|off]", ARG_TYPE_STRING},
+    {"right-shift", 0, 0, "press right shift", "[on|off]", ARG_TYPE_STRING},
+    {"sysrq", 0, 0, "press SysRq", "[on|off]", ARG_TYPE_STRING},
+    {"numkey", 0, 0, "press NumLock key", "[on|off]", ARG_TYPE_STRING},
+    {"capskey", 0, 0, "press CapsLock key", "[on|off]", ARG_TYPE_STRING},
+    {"scrollkey", 0, 0, "press ScrollLock key", "[on|off]", ARG_TYPE_STRING},
+    {"insertkey", 0, 0, "press Insert key", "[on|off]", ARG_TYPE_STRING},
+    {"left-alt", 0, 0, "press left alt", "[on|off]", ARG_TYPE_STRING},
+    {"right-alt", 0, 0, "press right alt", "[on|off]", ARG_TYPE_STRING},
+    {"left-ctrl", 0, 0, "press left ctrl", "[on|off]", ARG_TYPE_STRING},
+    {"right-ctrl", 0, 0, "press right ctrl", "[on|off]", ARG_TYPE_STRING},
     {"no-led", 0, 0, "don't update LED state", 0, 0},
     {0, 0, 0, 0, 0, 0}
   };
@@ -144,7 +144,7 @@ static struct keysym keysym_table[] =
   {"num9",		"numpgup",		'9',	0,	0x49},
   {"numminus",		0,		'-',	0,	0x4a},
   {"num4",		"numleft",		'4',	0,	0x4b},
-  {"num5",		"num5numlock",		'5',	0,	0x4c},
+  {"num5",		"numlock",		'5',	0,	0x4c},
   {"num6",		"numright",		'6',	0,	0x4d},
   {"numplus",		0,		'-',	0,	0x4e},
   {"num1",		"numend",		'1',	0,	0x4f},
@@ -325,6 +325,9 @@ grub_cmd_sendkey (grub_extcmd_t cmd, int argc, char **args)
       return 0;
     }
 
+  andmask = 0xffffffff;
+  ormask = 0;
+
   {
     int i;
 
diff --git a/docs/grub.texi b/docs/grub.texi
index 583cf98cb..725807c56 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -2094,6 +2094,7 @@ you forget a command, you can run the command @command{help}
 * pxe_unload::                  Unload the PXE environment
 * reboot::                      Reboot your computer
 * search::                      Search devices by file, label, or UUID
+* sendkey::                     Emulate keystrokes
 * set::                         Set an environment variable
 * unset::                       Unset an environment variable
 * uppermem::                    Set the upper memory size
@@ -2604,6 +2605,154 @@ commands are aliases for @samp{search --file}, @samp{search --label}, and
 @end deffn
 
 
+@node sendkey
+@subsection sendkey
+
+@deffn Command sendkey @
+ [@option{--num}|@option{--caps}|@option{--scroll}|@option{--insert}|@
+@option{--pause}|@option{--left-shift}|@option{--right-shift}|@
+@option{--sysrq}|@option{--numkey}|@option{--capskey}|@option{--scrollkey}|@
+@option{--insertkey}|@option{--left-alt}|@option{--right-alt}|@
+@option{--left-ctrl}|@option{--right-ctrl} @
+ @samp{on}|@samp{off}]@dots{} @
+ [@option{no-led}] @
+ keystroke
+Insert keystrokes into the keyboard buffer when booting.  Sometimes an
+operating system or chainloaded boot loader requires particular keys to be
+pressed: for example, one might need to press a particular key to enter
+"safe mode", or when chainloading another boot loader one might send
+keystrokes to it to navigate its menu.  
+
+You may provide up to 16 keystrokes (the length of the BIOS keyboard
+buffer).  Keystroke names may be upper-case or lower-case letters, digits,
+or taken from the following table:
+
+@c Please keep this table in the same order as in
+@c commands/i386/pc/sendkey.c, for ease of maintenance.
+@c Exception: The function and numeric keys are sorted, for aesthetics.
+
+@multitable @columnfractions .4 .5
+@headitem Name @tab Key
+@item escape @tab Escape
+@item exclam @tab !
+@item at @tab @@
+@item numbersign @tab #
+@item dollar @tab $
+@item percent @tab %
+@item caret @tab ^
+@item ampersand @tab &
+@item asterisk @tab *
+@item parenleft @tab (
+@item parenright @tab )
+@item minus @tab -
+@item underscore @tab _
+@item equal @tab =
+@item plus @tab +
+@item backspace @tab Backspace
+@item tab @tab Tab
+@item bracketleft @tab [
+@item braceleft @tab @{
+@item bracketright @tab ]
+@item braceright @tab @}
+@item enter @tab Enter
+@item control @tab press and release Control
+@item semicolon @tab ;
+@item colon @tab :
+@item quote @tab '
+@item doublequote @tab "
+@item backquote @tab `
+@item tilde @tab ~
+@item shift @tab press and release left Shift
+@item backslash @tab \
+@item bar @tab |
+@item comma @tab ,
+@item less @tab <
+@item period @tab .
+@item greater @tab >
+@item slash @tab /
+@item question @tab ?
+@item rshift @tab press and release right Shift
+@item alt @tab press and release Alt
+@item space @tab space bar
+@item capslock @tab Caps Lock
+@item F1 @tab F1
+@item F2 @tab F2
+@item F3 @tab F3
+@item F4 @tab F4
+@item F5 @tab F5
+@item F6 @tab F6
+@item F7 @tab F7
+@item F8 @tab F8
+@item F9 @tab F9
+@item F10 @tab F10
+@item F11 @tab F11
+@item F12 @tab F12
+@item num1 @tab 1 (numeric keypad)
+@item num2 @tab 2 (numeric keypad)
+@item num3 @tab 3 (numeric keypad)
+@item num4 @tab 4 (numeric keypad)
+@item num5 @tab 5 (numeric keypad)
+@item num6 @tab 6 (numeric keypad)
+@item num7 @tab 7 (numeric keypad)
+@item num8 @tab 8 (numeric keypad)
+@item num9 @tab 9 (numeric keypad)
+@item num0 @tab 0 (numeric keypad)
+@item numperiod @tab . (numeric keypad)
+@item numend @tab End (numeric keypad)
+@item numdown @tab Down (numeric keypad)
+@item numpgdown @tab Page Down (numeric keypad)
+@item numleft @tab Left (numeric keypad)
+@item numlock @tab Num Lock (numeric keypad)
+@item numright @tab Right (numeric keypad)
+@item numhome @tab Home (numeric keypad)
+@item numup @tab Up (numeric keypad)
+@item numpgup @tab Page Up (numeric keypad)
+@item numinsert @tab Insert (numeric keypad)
+@item numdelete @tab Delete (numeric keypad)
+@item numasterisk @tab * (numeric keypad)
+@item numminus @tab - (numeric keypad)
+@item numplus @tab + (numeric keypad)
+@item numslash @tab / (numeric keypad)
+@item numenter @tab Enter (numeric keypad)
+@item delete @tab Delete
+@item insert @tab Insert
+@item home @tab Home
+@item end @tab End
+@item pgdown @tab Page Down
+@item pgup @tab Page Up
+@item down @tab Down
+@item up @tab Up
+@item left @tab Left
+@item right @tab Right
+@end multitable
+
+As well as keystrokes, the @command{sendkey} command takes various options
+that affect the BIOS keyboard status flags.  These options take an @samp{on}
+or @samp{off} parameter, specifying that the corresponding status flag be
+set or unset; omitting the option for a given status flag will leave that
+flag at its initial state at boot.  The @option{--num}, @option{--caps},
+@option{--scroll}, and @option{--insert} options emulate setting the
+corresponding mode, while the @option{--numkey}, @option{--capskey},
+@option{--scrollkey}, and @option{--insertkey} options emulate pressing and
+holding the corresponding key.  The other status flag options are
+self-explanatory.
+
+If the @option{--no-led} option is given, the status flag options will have
+no effect on keyboard LEDs.
+
+If the @command{sendkey} command is given multiple times, then only the last
+invocation has any effect.
+
+Since @command{sendkey} manipulates the BIOS keyboard buffer, it may cause
+hangs, reboots, or other misbehaviour on some systems.  If the operating
+system or boot loader that runs after GRUB uses its own keyboard driver
+rather than the BIOS keyboard functions, then @command{sendkey} will have no
+effect.
+
+This command is only available on PC BIOS systems.
+@end deffn
+
+
 @node set
 @subsection set
 

From 63c734a63ed766ef0f8b0ab5b73fd3626b28de50 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 20 Aug 2010 00:15:23 +0100
Subject: [PATCH 1380/1628] * commands/i386/pc/sendkey.c (keysym_table): Rename
 "numlock" to "numcenter" (I misunderstood the purpose of this entry). *
 docs/grub.texi (sendkey): Likewise.

---
 ChangeLog                  | 6 ++++++
 commands/i386/pc/sendkey.c | 2 +-
 docs/grub.texi             | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8f4c6f47..7d82e08fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-20  Colin Watson  <cjwatson@ubuntu.com>
+
+	* commands/i386/pc/sendkey.c (keysym_table): Rename "numlock" to
+	"numcenter" (I misunderstood the purpose of this entry).
+	* docs/grub.texi (sendkey): Likewise.
+
 2010-08-20  Colin Watson  <cjwatson@ubuntu.com>
 
 	* commands/i386/pc/sendkey.c (options): Remove "keep" from all
diff --git a/commands/i386/pc/sendkey.c b/commands/i386/pc/sendkey.c
index 32e0e2551..6c5602dec 100644
--- a/commands/i386/pc/sendkey.c
+++ b/commands/i386/pc/sendkey.c
@@ -144,7 +144,7 @@ static struct keysym keysym_table[] =
   {"num9",		"numpgup",		'9',	0,	0x49},
   {"numminus",		0,		'-',	0,	0x4a},
   {"num4",		"numleft",		'4',	0,	0x4b},
-  {"num5",		"numlock",		'5',	0,	0x4c},
+  {"num5",		"numcenter",		'5',	0,	0x4c},
   {"num6",		"numright",		'6',	0,	0x4d},
   {"numplus",		0,		'-',	0,	0x4e},
   {"num1",		"numend",		'1',	0,	0x4f},
diff --git a/docs/grub.texi b/docs/grub.texi
index 725807c56..9845c7a6f 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -2702,7 +2702,7 @@ or taken from the following table:
 @item numdown @tab Down (numeric keypad)
 @item numpgdown @tab Page Down (numeric keypad)
 @item numleft @tab Left (numeric keypad)
-@item numlock @tab Num Lock (numeric keypad)
+@item numcenter @tab 5 with Num Lock inactive (numeric keypad)
 @item numright @tab Right (numeric keypad)
 @item numhome @tab Home (numeric keypad)
 @item numup @tab Up (numeric keypad)

From a5a3bccd54e0a34595086f461a462d0039292809 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Fri, 20 Aug 2010 10:14:29 +0530
Subject: [PATCH 1381/1628] added conf/Makefile.common and
 conf/Makefile.extra-dist

---
 Makefile.am              | 105 +++-------------------
 conf/Makefile.common     | 118 ++++++++++++++++++++++++
 conf/Makefile.extra-dist |  75 ++++++++++++++++
 docs/Makefile.am         |   2 -
 gentpl.py                |   6 +-
 grub-core/Makefile.am    | 188 +++++----------------------------------
 6 files changed, 227 insertions(+), 267 deletions(-)
 create mode 100644 conf/Makefile.common
 create mode 100644 conf/Makefile.extra-dist

diff --git a/Makefile.am b/Makefile.am
index e96a540da..ed482eea2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,104 +2,19 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 DEPDIR = .deps-util
 SUBDIRS = . grub-core po docs
-EXTRA_DIST = autogen.sh gentpl.py Makefile.tpl modules.def geninit.sh
-EXTRA_DIST += include conf/i386-pc-cygwin-img-ld.sc
 
-grubconfdir = $(sysconfdir)/grub.d
-platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
+include $(top_srcdir)/conf/Makefile.common
+include $(top_srcdir)/conf/Makefile.extra-dist
 
-# Platform specific options
-if COND_i386_pc
-  CFLAGS_PLATFORM = -mrtd -mregparm=3
-endif
-if COND_i386_efi
-  LDFLAGS_PLATFORM = -melf_i386
-endif
-if COND_x86_64_efi
-  LDFLAGS_PLATFORM = -melf_x86_64
-endif
-if COND_i386_qemu
-  CFLAGS_PLATFORM = -mrtd -mregparm=3
-endif
-if COND_i386_coreboot
-  CFLAGS_PLATFORM = -mrtd -mregparm=3
-endif
-if COND_i386_ieee1275
-  CFLAGS_PLATFORM = -mrtd -mregparm=3
-endif
-if COND_mips_yeeloong
-  CFLAGS_PLATFORM = -march=mips3 -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
-  CCASFLAGS_PLATFORM = -march=mips3
-endif
-if COND_sparc64_ieee1275
-  CFLAGS_PLATFORM = -mno-app-regs
-  LDFLAGS_PLATFORM = -melf64_sparc -mno-relax
-endif
+AM_CFLAGS = $(HOST_CFLAGS)
+AM_LDFLAGS = $(HOST_LDFLAGS)
+AM_CPPFLAGS = $(HOST_CPPFLAGS) $(CPPFLAGS_DEFAULT)
+AM_CCASFLAGS = $(HOST_CCASFLAGS) $(CCASFLAGS_DEFAULT)
 
-CPPFLAGS_GRUB = -DGRUB_FILE=\"`basename $<`\"
-CPPFLAGS_GRUB += -I$(builddir) -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)
-CPPFLAGS_GRUB += -I$(top_srcdir)/include
-CPPFLAGS_GRUB += -I$(top_builddir)/include
-CCASFLAGS_GRUB = -DASM_FILE=1
-
-CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
-CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap
-
-CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))"
-CPPFLAGS_GNULIB = -I$(top_srcdir)/grub-core/gnulib
-
-CFLAGS_MKISOFS = -Wno-all -Werror
-CPPFLAGS_MKISOFS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/util/mkisofs/include
-
-CFLAGS_POSIX = -fno-builtin
-CPPFLAGS_POSIX = -I$(top_srcdir)/grub-core/lib/posix_wrap
-
-CPPFLAGS_EFIEMU = -I$(top_srcdir)/grub-core/efiemu/runtime
-
-# to calm down automake
-BUILT_SOURCES =
-CLEANFILES =
-COMMAND_FILES =
-DEF_FILES =
-FS_FILES =
-HANDLER_FILES =
-IMG_FILES =
-MOD_FILES =
-MODULE_FILES =
-PARTMAP_FILES =
-PARTTOOL_FILES =
-TERMINAL_FILES =
-TESTS =
-UND_FILES =
-VIDEO_FILES =
-bin_PROGRAMS =
-bin_SCRIPTS =
-check_PROGRAMS =
-check_SCRIPTS =
-grubconf_DATA =
-grubconf_SCRIPTS =
-man_MANS =
-noinst_DATA =
-noinst_LIBRARIES =
-noinst_PROGRAMS =
-pkglib_SCRIPTS =
-platform_DATA =
-sbin_PROGRAMS =
-sbin_SCRIPTS =
-
-CFLAGS_PROGRAM = $(HOST_CFLAGS) $(CFLAGS_GNULIB)
-LDFLAGS_PROGRAM = $(HOST_LDFLAGS) $(LDFLAGS_GNULIB)
-CPPFLAGS_PROGRAM = $(HOST_CPPFLAGS) $(CPPFLAGS_GNULIB)
-CCASFLAGS_PROGRAM = $(HOST_CCASFLAGS) $(CCASFLAGS_GNULIB)
-
-CFLAGS_LIBRARY = $(CFLAGS_PROGRAM)
-CPPFLAGS_LIBRARY = $(CPPFLAGS_PROGRAM)
-CCASFLAGS_LIBRARY = $(CCASFLAGS_PROGRAM)
-
-AM_CFLAGS =
-AM_LDFLAGS =
-AM_CPPFLAGS = $(CPPFLAGS_GRUB)
-AM_CCASFLAGS = $(CCASFLAGS_GRUB)
+CFLAGS_PROGRAM += $(CFLAGS_GNULIB)
+LDFLAGS_PROGRAM += $(LDFLAGS_GNULIB)
+CPPFLAGS_PROGRAM += $(CPPFLAGS_GNULIB)
+CCASFLAGS_PROGRAM += $(CCASFLAGS_GNULIB)
 
 include $(srcdir)/modules.am
 
diff --git a/conf/Makefile.common b/conf/Makefile.common
new file mode 100644
index 000000000..db3c13c73
--- /dev/null
+++ b/conf/Makefile.common
@@ -0,0 +1,118 @@
+# Platform specific options
+if COND_i386_pc
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_efi
+  LDFLAGS_PLATFORM = -melf_i386
+endif
+if COND_x86_64_efi
+  LDFLAGS_PLATFORM = -melf_x86_64
+endif
+if COND_i386_qemu
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_coreboot
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_i386_ieee1275
+  CFLAGS_PLATFORM = -mrtd -mregparm=3
+endif
+if COND_mips_yeeloong
+  CFLAGS_PLATFORM = -march=mips3 -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
+  CCASFLAGS_PLATFORM = -march=mips3
+endif
+if COND_sparc64_ieee1275
+  CFLAGS_PLATFORM = -mno-app-regs
+  LDFLAGS_PLATFORM = -melf64_sparc -mno-relax
+endif
+
+# Other options
+
+CPPFLAGS_DEFAULT = -DGRUB_FILE=\"`basename $<`\"
+CPPFLAGS_DEFAULT += -I$(builddir)
+CPPFLAGS_DEFAULT += -I$(srcdir)
+CPPFLAGS_DEFAULT += -I$(top_builddir)
+CPPFLAGS_DEFAULT += -I$(top_srcdir)
+CPPFLAGS_DEFAULT += -I$(top_srcdir)/include
+CPPFLAGS_DEFAULT += -I$(top_builddir)/include
+CCASFLAGS_DEFAULT = -DASM_FILE=1
+
+LDADD_KERNEL = -lgcc
+CFLAGS_KERNEL = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
+LDFLAGS_KERNEL = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N -static-libgcc
+CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
+CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+
+CFLAGS_MODULE = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
+LDFLAGS_MODULE = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N,-r,-d
+CPPFLAGS_MODULE = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
+CCASFLAGS_MODULE = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+
+CFLAGS_IMAGE = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -fno-builtin
+LDFLAGS_IMAGE = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N,-S
+CPPFLAGS_IMAGE = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
+CCASFLAGS_IMAGE = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+
+CFLAGS_PROGRAM =
+LDFLAGS_PROGRAM =
+CPPFLAGS_PROGRAM =
+CCASFLAGS_PROGRAM =
+
+CFLAGS_LIBRARY = $(CFLAGS_PROGRAM)
+CPPFLAGS_LIBRARY = $(CPPFLAGS_PROGRAM)
+CCASFLAGS_LIBRARY = $(CCASFLAGS_PROGRAM)
+
+# Other variables
+
+grubconfdir = $(sysconfdir)/grub.d
+platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
+
+CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
+CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap
+
+CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))"
+CPPFLAGS_GNULIB = -I$(top_srcdir)/grub-core/gnulib
+
+CFLAGS_MKISOFS = -Wno-all -Werror
+CPPFLAGS_MKISOFS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/util/mkisofs/include
+
+CFLAGS_POSIX = -fno-builtin
+CPPFLAGS_POSIX = -I$(top_srcdir)/grub-core/lib/posix_wrap
+
+CPPFLAGS_EFIEMU = -I$(top_srcdir)/grub-core/efiemu/runtime
+
+# Define these variables to calm down automake
+
+FS_FILES =
+DEF_FILES =
+UND_FILES =
+IMG_FILES =
+MOD_FILES =
+VIDEO_FILES =
+MODULE_FILES =
+HANDLER_FILES =
+PARTMAP_FILES =
+COMMAND_FILES =
+PARTTOOL_FILES =
+TERMINAL_FILES =
+KERNEL_HEADER_FILES =
+
+man_MANS =
+noinst_DATA =
+bin_SCRIPTS =
+sbin_SCRIPTS =
+bin_PROGRAMS =
+platform_DATA =
+sbin_PROGRAMS =
+check_SCRIPTS =
+grubconf_DATA =
+check_PROGRAMS =
+pkglib_SCRIPTS =
+noinst_PROGRAMS =
+grubconf_SCRIPTS =
+noinst_LIBRARIES =
+
+TESTS =
+EXTRA_DIST =
+CLEANFILES =
+BUILT_SOURCES =
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
new file mode 100644
index 000000000..ae4b8fbde
--- /dev/null
+++ b/conf/Makefile.extra-dist
@@ -0,0 +1,75 @@
+EXTRA_DIST += include
+
+EXTRA_DIST += autogen.sh
+EXTRA_DIST += geninit.sh
+
+EXTRA_DIST += gentpl.py
+EXTRA_DIST += modules.def
+EXTRA_DIST += Makefile.tpl
+
+EXTRA_DIST += docs/man
+EXTRA_DIST += docs/grub.cfg
+
+EXTRA_DIST += conf/i386-pc-cygwin-img-ld.sc
+
+EXTRA_DIST += grub-core/modules.def
+EXTRA_DIST += grub-core/genmoddep.awk
+EXTRA_DIST += grub-core/genmodsrc.sh
+EXTRA_DIST += grub-core/genfslist.sh
+EXTRA_DIST += grub-core/gencmdlist.sh
+EXTRA_DIST += grub-core/gensymlist.sh
+EXTRA_DIST += grub-core/genemuinit.sh
+EXTRA_DIST += grub-core/genvideolist.sh
+EXTRA_DIST += grub-core/genhandlerlist.sh
+EXTRA_DIST += grub-core/genpartmaplist.sh
+EXTRA_DIST += grub-core/genterminallist.sh
+EXTRA_DIST += grub-core/genparttoollist.sh
+EXTRA_DIST += grub-core/genemuinitheader.sh
+
+EXTRA_DIST += grub-core/gnulib/getopt.h
+EXTRA_DIST += grub-core/gnulib/argp-version-etc.h
+EXTRA_DIST += grub-core/gnulib/fnmatch.h
+EXTRA_DIST += grub-core/gnulib/error.h
+EXTRA_DIST += grub-core/gnulib/argp-namefrob.h
+EXTRA_DIST += grub-core/gnulib/argp.h
+EXTRA_DIST += grub-core/gnulib/argp-fmtstream.h
+EXTRA_DIST += grub-core/gnulib/gettext.h
+EXTRA_DIST += grub-core/gnulib/regex_internal.h
+EXTRA_DIST += grub-core/gnulib/progname.h
+EXTRA_DIST += grub-core/gnulib/regex.h
+EXTRA_DIST += grub-core/gnulib/alloca.h
+EXTRA_DIST += grub-core/gnulib/getopt_int.h
+EXTRA_DIST += grub-core/efiemu/runtime/config.h
+
+EXTRA_DIST += grub-core/lib/posix_wrap/localcharset.h
+EXTRA_DIST += grub-core/lib/posix_wrap/ctype.h
+EXTRA_DIST += grub-core/lib/posix_wrap/limits.h
+EXTRA_DIST += grub-core/lib/posix_wrap/stdio.h
+EXTRA_DIST += grub-core/lib/posix_wrap/sys/types.h
+EXTRA_DIST += grub-core/lib/posix_wrap/unistd.h
+EXTRA_DIST += grub-core/lib/posix_wrap/locale.h
+EXTRA_DIST += grub-core/lib/posix_wrap/wchar.h
+EXTRA_DIST += grub-core/lib/posix_wrap/string.h
+EXTRA_DIST += grub-core/lib/posix_wrap/langinfo.h
+EXTRA_DIST += grub-core/lib/posix_wrap/wctype.h
+EXTRA_DIST += grub-core/lib/posix_wrap/stdint.h
+EXTRA_DIST += grub-core/lib/posix_wrap/stdlib.h
+EXTRA_DIST += grub-core/lib/posix_wrap/assert.h
+EXTRA_DIST += grub-core/lib/posix_wrap/errno.h
+
+EXTRA_DIST += grub-core/lib/libgcrypt_wrap/cipher_wrap.h
+EXTRA_DIST += grub-core/lib/libgcrypt/cipher/rijndael-tables.h
+EXTRA_DIST += grub-core/lib/libgcrypt/cipher/bithelp.h
+EXTRA_DIST += grub-core/lib/libgcrypt/cipher/rmd.h
+EXTRA_DIST += grub-core/lib/libgcrypt/cipher/hash-common.h
+EXTRA_DIST += grub-core/lib/libgcrypt/cipher/camellia.h
+
+EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/types.h
+EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/cipher.h
+EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/rijndael-tables.h
+EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/memory.h
+EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/bithelp.h
+EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/g10lib.h
+EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/rmd.h
+EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/hash-common.h
+EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/camellia.h
diff --git a/docs/Makefile.am b/docs/Makefile.am
index a2e83dcd6..103240bcc 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,7 +1,5 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
-EXTRA_DIST = grub.cfg man
-
 AM_MAKEINFOFLAGS = --force --no-split --no-validate
 info_TEXINFOS = grub.texi
 grub_TEXINFOS = fdl.texi
diff --git a/gentpl.py b/gentpl.py
index 4d7ed0aa3..eb790751c 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -226,15 +226,15 @@ mod-[+ name +].c: [+ name +].module$(EXEEXT) moddep.lst genmodsrc.sh
 	sh $(srcdir)/genmodsrc.sh [+ name +] moddep.lst > $@ || (rm -f $@; exit 1)
 
 mod-[+ name +].o: mod-[+ name +].c
-	$(TARGET_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS_MODULE) $(CPPFLAGS) $(CFLAGS_MODULE) $(CFLAGS) -c -o $@ $<
+	$(TARGET_CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(""" + cname() + """_CPPFLAGS) $(CPPFLAGS) $(""" + cname() + """_CFLAGS) $(CFLAGS) -c -o $@ $<
 
 [+ name +].mod: [+ name +].module$(EXEEXT) mod-[+ name +].o
 	if test x$(USE_APPLE_CC_FIXES) = xyes; then \
-	  $(CCLD) $(LDFLAGS_MODULE) $(LDFLAGS) -o $@.bin $^; \
+	  $(CCLD) $(""" + cname() + """_LDFLAGS) $(LDFLAGS) -o $@.bin $^; \
 	  $(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -nu -nd $@.bin $@; \
 	  rm -f $@.bin; \
 	else \
-	  $(CCLD) -o $@ $(LDFLAGS_MODULE) $(LDFLAGS) $^; \
+	  $(CCLD) -o $@ $(""" + cname() + """_LDFLAGS) $(LDFLAGS) $^; \
 	  if test ! -z '$(TARGET_OBJ2ELF)'; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
 	  $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K _grub_mod_init -K _grub_mod_fini -R .note -R .comment $@; \
 	fi
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index e1f45eb38..d91448149 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -1,172 +1,26 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
+DEPDIR=.deps-core
+
+include $(top_srcdir)/conf/Makefile.common
+
 CC=$(TARGET_CC)
 CPP=$(TARGET_CC)
 CCAS=$(TARGET_CC)
-DEPDIR=.deps-core
 
-EXTRA_DIST =
-EXTRA_DIST += modules.def genmoddep.awk
-EXTRA_DIST += genmodsrc.sh gensymlist.sh genemuinit.sh genemuinitheader.sh
-EXTRA_DIST += genfslist.sh gencmdlist.sh genvideolist.sh genhandlerlist.sh
-EXTRA_DIST += genpartmaplist.sh genparttoollist.sh genterminallist.sh
-EXTRA_DIST += lib/libgcrypt_wrap/cipher_wrap.h
-EXTRA_DIST += lib/libgcrypt/cipher/rijndael-tables.h
-EXTRA_DIST += lib/libgcrypt/cipher/bithelp.h
-EXTRA_DIST += lib/libgcrypt/cipher/rmd.h
-EXTRA_DIST += lib/libgcrypt/cipher/hash-common.h
-EXTRA_DIST += lib/libgcrypt/cipher/camellia.h
-EXTRA_DIST += lib/posix_wrap/localcharset.h
-EXTRA_DIST += lib/posix_wrap/ctype.h
-EXTRA_DIST += lib/posix_wrap/limits.h
-EXTRA_DIST += lib/posix_wrap/stdio.h
-EXTRA_DIST += lib/posix_wrap/sys/types.h
-EXTRA_DIST += lib/posix_wrap/unistd.h
-EXTRA_DIST += lib/posix_wrap/locale.h
-EXTRA_DIST += lib/posix_wrap/wchar.h
-EXTRA_DIST += lib/posix_wrap/string.h
-EXTRA_DIST += lib/posix_wrap/langinfo.h
-EXTRA_DIST += lib/posix_wrap/wctype.h
-EXTRA_DIST += lib/posix_wrap/stdint.h
-EXTRA_DIST += lib/posix_wrap/stdlib.h
-EXTRA_DIST += lib/posix_wrap/assert.h
-EXTRA_DIST += lib/posix_wrap/errno.h
-EXTRA_DIST += lib/libgcrypt-grub/cipher/types.h
-EXTRA_DIST += lib/libgcrypt-grub/cipher/cipher.h
-EXTRA_DIST += lib/libgcrypt-grub/cipher/rijndael-tables.h
-EXTRA_DIST += lib/libgcrypt-grub/cipher/memory.h
-EXTRA_DIST += lib/libgcrypt-grub/cipher/bithelp.h
-EXTRA_DIST += lib/libgcrypt-grub/cipher/g10lib.h
-EXTRA_DIST += lib/libgcrypt-grub/cipher/rmd.h
-EXTRA_DIST += lib/libgcrypt-grub/cipher/hash-common.h
-EXTRA_DIST += lib/libgcrypt-grub/cipher/camellia.h
-EXTRA_DIST += efiemu/runtime/config.h
-EXTRA_DIST += gnulib/getopt.h
-EXTRA_DIST += gnulib/argp-version-etc.h
-EXTRA_DIST += gnulib/fnmatch.h
-EXTRA_DIST += gnulib/error.h
-EXTRA_DIST += gnulib/argp-namefrob.h
-EXTRA_DIST += gnulib/argp.h
-EXTRA_DIST += gnulib/argp-fmtstream.h
-EXTRA_DIST += gnulib/gettext.h
-EXTRA_DIST += gnulib/regex_internal.h
-EXTRA_DIST += gnulib/progname.h
-EXTRA_DIST += gnulib/regex.h
-EXTRA_DIST += gnulib/alloca.h
-EXTRA_DIST += gnulib/getopt_int.h
+AM_CFLAGS = $(TARGET_CFLAGS)
+AM_LDFLAGS = $(TARGET_LDFLAGS)
+AM_CPPFLAGS = $(TARGET_CPPFLAGS) $(CPPFLAGS_DEFAULT)
+AM_CCASFLAGS = $(TARGET_CCASFLAGS) $(CCASFLAGS_DEFAULT)
 
-grubconfdir = $(sysconfdir)/grub.d
-platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
+CFLAGS_PROGRAM += $(CFLAGS_PLATFORM)
+LDFLAGS_PROGRAM += $(LDFLAGS_PLATFORM)
+CPPFLAGS_PROGRAM += $(CPPFLAGS_PLATFORM)
+CCASFLAGS_PROGRAM += $(CCASFLAGS_PLATFORM)
 
-# to calm down automake
-BUILT_SOURCES =
-CLEANFILES =
-COMMAND_FILES =
-DEF_FILES =
-FS_FILES =
-HANDLER_FILES =
-IMG_FILES =
-MOD_FILES =
-MODULE_FILES =
-PARTMAP_FILES =
-PARTTOOL_FILES =
-TERMINAL_FILES =
-TESTS =
-UND_FILES =
-VIDEO_FILES =
-bin_PROGRAMS =
-bin_SCRIPTS =
-check_PROGRAMS =
-check_SCRIPTS =
-grubconf_DATA =
-grubconf_SCRIPTS =
-man_MANS =
-noinst_DATA =
-noinst_LIBRARIES =
-noinst_PROGRAMS =
-pkglib_SCRIPTS =
-platform_DATA =
-sbin_PROGRAMS =
-sbin_SCRIPTS =
-KERNEL_HEADER_FILES =
-
-# Platform specific options
-if COND_i386_pc
-  CFLAGS_PLATFORM = -mrtd -mregparm=3
-endif
-if COND_i386_efi
-  LDFLAGS_PLATFORM = -melf_i386
-endif
-if COND_x86_64_efi
-  LDFLAGS_PLATFORM = -melf_x86_64
-endif
-if COND_i386_qemu
-  CFLAGS_PLATFORM = -mrtd -mregparm=3
-endif
-if COND_i386_coreboot
-  CFLAGS_PLATFORM = -mrtd -mregparm=3
-endif
-if COND_i386_ieee1275
-  CFLAGS_PLATFORM = -mrtd -mregparm=3
-endif
-if COND_mips_yeeloong
-  CFLAGS_PLATFORM = -march=mips3 -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
-  CCASFLAGS_PLATFORM = -march=mips3
-endif
-if COND_sparc64_ieee1275
-  CFLAGS_PLATFORM = -mno-app-regs
-  LDFLAGS_PLATFORM = -melf64_sparc -mno-relax
-endif
-
-CPPFLAGS_GRUB = -DGRUB_FILE=\"`basename $<`\"
-CPPFLAGS_GRUB += -I$(builddir) -I$(srcdir) -I$(top_builddir) -I$(top_srcdir)
-CPPFLAGS_GRUB += -I$(top_srcdir)/include
-CPPFLAGS_GRUB += -I$(top_builddir)/include
-CCASFLAGS_GRUB = -DASM_FILE=1
-
-CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
-CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap
-
-CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))"
-CPPFLAGS_GNULIB = -I$(top_srcdir)/grub-core/gnulib
-
-CFLAGS_MKISOFS = -Wno-all -Werror
-CPPFLAGS_MKISOFS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/util/mkisofs/include
-
-CFLAGS_POSIX = -fno-builtin
-CPPFLAGS_POSIX = -I$(top_srcdir)/grub-core/lib/posix_wrap
-
-CPPFLAGS_EFIEMU = -I$(top_srcdir)/grub-core/efiemu/runtime
-
-LDADD_KERNEL = -lgcc
-CFLAGS_KERNEL = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
-LDFLAGS_KERNEL = $(TARGET_LDFLAGS) $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N -static-libgcc
-CPPFLAGS_KERNEL = $(TARGET_CPPFLAGS) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
-CCASFLAGS_KERNEL = $(TARGET_CCASFLAGS) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
-
-CFLAGS_MODULE = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
-LDFLAGS_MODULE = $(TARGET_LDFLAGS) $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N,-r,-d
-CPPFLAGS_MODULE = $(TARGET_CPPFLAGS) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
-CCASFLAGS_MODULE = $(TARGET_CCASFLAGS) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
-
-CFLAGS_IMAGE = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -fno-builtin
-LDFLAGS_IMAGE = $(TARGET_LDFLAGS) $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N,-S
-CPPFLAGS_IMAGE = $(TARGET_CPPFLAGS) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
-CCASFLAGS_IMAGE = $(TARGET_CCASFLAGS) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
-
-CFLAGS_LIBRARY = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -fno-builtin
-CPPFLAGS_LIBRARY = $(TARGET_CPPFLAGS) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
-CCASFLAGS_LIBRARY = $(TARGET_CCASFLAGS) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
-
-CFLAGS_PROGRAM = $(TARGET_CFLAGS) $(CFLAGS_CPU) $(CFLAGS_PLATFORM)
-LDFLAGS_PROGRAM = $(TARGET_LDFLAGS) $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM)
-CPPFLAGS_PROGRAM = $(TARGET_CPPFLAGS) $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
-CCASFLAGS_PROGRAM = $(TARGET_CCASFLAGS) $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
-
-AM_CFLAGS =
-AM_LDFLAGS =
-AM_CPPFLAGS = $(CPPFLAGS_GRUB)
-AM_CCASFLAGS = $(CCASFLAGS_GRUB)
+CFLAGS_LIBRARY += $(CFLAGS_PLATFORM) -fno-builtin
+CPPFLAGS_LIBRARY += $(CPPFLAGS_PLATFORM)
+CCASFLAGS_LIBRARY += $(CCASFLAGS_PLATFORM)
 
 # gentrigtables
 gentrigtables: gentrigtables.c
@@ -456,27 +310,27 @@ if COND_ENABLE_EFIEMU
 efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
 	-rm -f $@; \
 	if test "x$(TARGET_APPLE_CC)" = x1; then \
-	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_GRUB) -DELF32 -DAPPLE_CC -m32 -Wall -Werror -nostdlib -O2 -c -o $@.bin $< || exit 1; \
+	  $(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 \
-	  $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_GRUB) -DELF32 -m32 -Wall -Werror -nostdlib -O2 -c -o $@ $< || exit 1; \
+	  $(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_GRUB) -DELF64 -DAPPLE_CC=1 -m64 -nostdlib -Wall -Werror -mno-red-zone -c -o $@ $< || exit 1; \
+	  $(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_GRUB) -DELF64 -m64 -nostdlib -Wall -Werror -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
+	  $(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_GRUB) -DELF64 -DAPPLE_CC=1 -m64 -Wall -Werror -nostdlib -O2 -mno-red-zone -c -o $@ $< || exit 1; \
+	  $(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_GRUB) -DELF64 -m64 -Wall -Werror -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
+	  $(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)

From 02a6605e7e9528b06ae466893784a35a5eb20342 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Fri, 20 Aug 2010 11:10:42 +0530
Subject: [PATCH 1382/1628] minor fixes

---
 conf/Makefile.common | 3 ++-
 gentpl.py            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf/Makefile.common b/conf/Makefile.common
index db3c13c73..47067596b 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -28,7 +28,7 @@ endif
 
 # Other options
 
-CPPFLAGS_DEFAULT = -DGRUB_FILE=\"`basename $<`\"
+CPPFLAGS_DEFAULT = -DGRUB_FILE=\"`echo $< | sed "s@$(top_srcdir)/@@g"`\"
 CPPFLAGS_DEFAULT += -I$(builddir)
 CPPFLAGS_DEFAULT += -I$(srcdir)
 CPPFLAGS_DEFAULT += -I$(top_builddir)
@@ -42,6 +42,7 @@ CFLAGS_KERNEL = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
 LDFLAGS_KERNEL = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N -static-libgcc
 CPPFLAGS_KERNEL = $(CPPFLAGS_CPU) $(CPPFLAGS_PLATFORM)
 CCASFLAGS_KERNEL = $(CCASFLAGS_CPU) $(CCASFLAGS_PLATFORM)
+STRIPFLAGS_KERNEL = -R .rel.dyn -R .reginfo -R .note -R .comment
 
 CFLAGS_MODULE = $(CFLAGS_CPU) $(CFLAGS_PLATFORM) -ffreestanding
 LDFLAGS_MODULE = $(LDFLAGS_CPU) $(LDFLAGS_PLATFORM) -nostdlib -Wl,-N,-r,-d
diff --git a/gentpl.py b/gentpl.py
index eb790751c..632b4c13e 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -100,7 +100,7 @@ def if_platform_tagged(platform, tag, snippet_if, snippet_else=None):
     for group in RMAP[platform]:
         r += "[+ = \"" + group + "\" +]" + snippet_if
 
-    if snippet_else != None: r += "[+ * +]" + snippet_if
+    if snippet_else != None: r += "[+ * +]" + snippet_else
     r += "[+ ESAC +][+ ENDFOR +]"
 
     if snippet_else == None:

From a26187d7c0d39e05f0c8df5e1d5d3a57ab5ee8cb Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Fri, 20 Aug 2010 11:13:37 +0530
Subject: [PATCH 1383/1628] update .bzrignore

---
 .bzrignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.bzrignore b/.bzrignore
index cdc55d00b..1672efd65 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -91,4 +91,5 @@ depcomp
 mdate-sh
 texinfo.tex
 grub-core/lib/libgcrypt-grub
-
+**/.deps-util
+**/.deps-core

From 07daa815afa40e8ced4da557b6e9c9efecdab794 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Fri, 20 Aug 2010 11:39:47 +0530
Subject: [PATCH 1384/1628] better fix for setjmp module

---
 configure.ac           |  7 -------
 grub-core/lib/setjmp.S | 13 +++++++++++++
 grub-core/modules.def  |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 grub-core/lib/setjmp.S

diff --git a/configure.ac b/configure.ac
index 0923bf08f..9c1440775 100644
--- a/configure.ac
+++ b/configure.ac
@@ -904,13 +904,6 @@ else
   fi
 fi
 
-# Copy */setjmp.S to target_cpu/
-AC_CONFIG_COMMANDS([grub-core/lib/target_cpu],
-  [mkdir -p grub-core/lib/target_cpu])
-AC_CONFIG_COMMANDS([setjmp.S],
-  [cp -rp $srcdir/grub-core/lib/$target_cpu/setjmp.S grub-core/lib/target_cpu/],
-  [target_cpu=$target_cpu srcdir=$srcdir])
-
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([grub-core/Makefile])
 AC_CONFIG_FILES([po/Makefile])
diff --git a/grub-core/lib/setjmp.S b/grub-core/lib/setjmp.S
new file mode 100644
index 000000000..c39c91b9c
--- /dev/null
+++ b/grub-core/lib/setjmp.S
@@ -0,0 +1,13 @@
+#if defined(__i386__)
+#include "./i386/setjmp.S"
+#elif defined(__x86_64__)
+#include "./x86_64/setjmp.S"
+#elif defined(__sparc__)
+#include "./sparc64/setjmp.S"
+#elif defined(__mips__)
+#include "./mips/setjmp.S"
+#elif defined(__powerpc__)
+#include "./powerpc/setjmp.S"
+#else
+#error "Unknwon target cpu type"
+#endif
diff --git a/grub-core/modules.def b/grub-core/modules.def
index 71215aba0..fa830e779 100644
--- a/grub-core/modules.def
+++ b/grub-core/modules.def
@@ -1214,7 +1214,7 @@ module = {
 
 module = {
   name = setjmp;
-  nodist = lib/target_cpu/setjmp.S;
+  source = lib/setjmp.S;
   extra_dist = lib/i386/setjmp.S;
   extra_dist = lib/mips/setjmp.S;
   extra_dist = lib/x86_64/setjmp.S;

From 771111e53dd69d2a2026bceea4da9336079388fe Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Fri, 20 Aug 2010 13:00:11 +0530
Subject: [PATCH 1385/1628] fix COND_APPLE_CC definition

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 9c1440775..cd0869187 100644
--- a/configure.ac
+++ b/configure.ac
@@ -884,7 +884,7 @@ AM_CONDITIONAL([COND_GRUB_MKFONT], [test x$enable_grub_mkfont = xyes])
 AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x])
 AM_CONDITIONAL([COND_GRUB_FSTEST], [test x$enable_grub_fstest = xyes])
 AM_CONDITIONAL([COND_GRUB_PE2ELF], [test x$TARGET_OBJ2ELF != x])
-AM_CONDITIONAL([COND_APPLE_CC], [test x$TARGET_APPLE_CC != x])
+AM_CONDITIONAL([COND_APPLE_CC], [test x$TARGET_APPLE_CC = x1])
 AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes])
 
 # Output files.

From 537f3753211bfe432032aaa060824a64000f04e8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Aug 2010 12:22:23 +0200
Subject: [PATCH 1386/1628] Fix control msg type

---
 term/usb_keyboard.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index f2d74d71c..2157e26d7 100644
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -133,11 +133,11 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)
 
   /* Place the device in boot mode.  */
   grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT,
-			USB_HID_SET_PROTOCOL, 0, 0, 0, 0);
+  			USB_HID_SET_PROTOCOL, 0, 0, 0, 0);
 
   /* Reports every time an event occurs and not more often than that.  */
   grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT,
-			USB_HID_SET_IDLE, 0<<8, 0, 0, 0);
+  			USB_HID_SET_IDLE, 0<<8, 0, 0, 0);
 
   grub_memcpy (&grub_usb_keyboards[curnum], &grub_usb_keyboard_term,
 	       sizeof (grub_usb_keyboards[curnum]));
@@ -157,7 +157,7 @@ static grub_err_t
 grub_usb_keyboard_getreport (grub_usb_device_t dev, grub_uint8_t *report)
 {
   return grub_usb_control_msg (dev, GRUB_USB_REQTYPE_CLASS_INTERFACE_IN,
-			       USB_HID_GET_REPORT, 0, 0, 8, (char *) report);
+			       USB_HID_GET_REPORT, 0x0100, 0, 8, (char *) report);
 }
 
 

From a17e3c978b05b40124b0f1501f6865be8756384f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Aug 2010 14:36:29 +0200
Subject: [PATCH 1387/1628] Use GetReport only at initialisation as specified
 in the USBHID spec

---
 term/usb_keyboard.c | 233 ++++++++++++++------------------------------
 1 file changed, 73 insertions(+), 160 deletions(-)

diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index 2157e26d7..d318a04ff 100644
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -78,6 +78,13 @@ static struct grub_term_input grub_usb_keyboard_term =
     .next = 0
   };
 
+struct grub_usb_keyboard_data
+{
+  grub_usb_device_t usbdev;
+  grub_uint8_t status;
+  int key;
+};
+
 static struct grub_term_input grub_usb_keyboards[16];
 
 static void
@@ -92,6 +99,7 @@ grub_usb_keyboard_detach (grub_usb_device_t usbdev,
 	grub_term_unregister_input (&grub_usb_keyboards[i]);
 	grub_free ((char *) grub_usb_keyboards[i].name);
 	grub_usb_keyboards[i].name = NULL;
+	grub_free (grub_usb_keyboards[i].data);
 	grub_usb_keyboards[i].data = 0;
       }
 }
@@ -100,6 +108,7 @@ static int
 grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)
 {
   unsigned curnum;
+  struct grub_usb_keyboard_data *data;
 
   grub_dprintf ("usb_keyboard", "%x %x %x %d %d\n",
 		usbdev->descdev.class, usbdev->descdev.subclass,
@@ -112,13 +121,6 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)
   if (curnum == ARRAY_SIZE (grub_usb_keyboards))
     return 0;
 
-#if 0
-  if (descdev->class != 0x09
-      || descdev->subclass == 0x01
-      || descdev->protocol != 0x02)
-	return 0;
-#endif
-
   if (usbdev->descdev.class != 0 
       || usbdev->descdev.subclass != 0 || usbdev->descdev.protocol != 0)
     return 0;
@@ -131,6 +133,15 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)
 
   grub_printf ("HID found!\n");
 
+  data = grub_malloc (sizeof (*data));
+  if (!data)
+    {
+      grub_print_error ();
+      return 0;
+    }
+
+  data->usbdev = usbdev;
+
   /* Place the device in boot mode.  */
   grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT,
   			USB_HID_SET_PROTOCOL, 0, 0, 0, 0);
@@ -141,51 +152,64 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)
 
   grub_memcpy (&grub_usb_keyboards[curnum], &grub_usb_keyboard_term,
 	       sizeof (grub_usb_keyboards[curnum]));
-  grub_usb_keyboards[curnum].data = usbdev;
+  grub_usb_keyboards[curnum].data = data;
   usbdev->config[configno].interf[interfno].detach_hook
     = grub_usb_keyboard_detach;
   grub_usb_keyboards[curnum].name = grub_xasprintf ("usb_keyboard%d", curnum);
   if (!grub_usb_keyboards[curnum].name)
-    return 0;
+    {
+      grub_print_error ();
+      return 0;
+    }
+
+  {
+    grub_uint8_t report[8];
+    grub_usb_err_t err;
+    grub_memset (report, 0, sizeof (report));
+    err = grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_IN,
+    				USB_HID_GET_REPORT, 0x0000, interfno,
+				sizeof (report), (char *) report);
+    if (err)
+      {
+	data->status = 0;
+	data->key = -1;
+      }
+    else
+      {
+	data->status = report[0];
+	data->key = report[2] ? : -1;
+      }
+  }
+
   grub_term_register_input_active ("usb_keyboard", &grub_usb_keyboards[curnum]);
 
-
   return 1;
 }
 
-static grub_err_t
-grub_usb_keyboard_getreport (grub_usb_device_t dev, grub_uint8_t *report)
-{
-  return grub_usb_control_msg (dev, GRUB_USB_REQTYPE_CLASS_INTERFACE_IN,
-			       USB_HID_GET_REPORT, 0x0100, 0, 8, (char *) report);
-}
-
 
 
 static int
 grub_usb_keyboard_checkkey (struct grub_term_input *term)
 {
   grub_uint8_t data[8];
-  int key;
-  grub_err_t err;
-  grub_uint64_t currtime;
-  int timeout = 50;
-  grub_usb_device_t usbdev = term->data;
+  grub_usb_err_t err;
+  struct grub_usb_keyboard_data *termdata = term->data;
+  grub_size_t actual;
+
+  if (termdata->key != -1)
+    return termdata->key;
 
   data[2] = 0;
-  currtime = grub_get_time_ms ();
-  do
-    {
-      /* Get_Report.  */
-      err = grub_usb_keyboard_getreport (usbdev, data);
+  /* Poll interrupt pipe.  */
+  err = grub_usb_bulk_read_extended (termdata->usbdev, 1, sizeof (data),
+				     (char *) data, 1, &actual);
 
-      /* Implement a timeout.  */
-      if (grub_get_time_ms () > currtime + timeout)
-	break;
-    }
-  while (err || !data[2]);
+  if (err)
+    return -1;
 
-  if (err || !data[2])
+  termdata->status = data[0];
+
+  if (actual < 3 || !data[2])
     return -1;
 
   grub_dprintf ("usb_keyboard",
@@ -196,161 +220,50 @@ grub_usb_keyboard_checkkey (struct grub_term_input *term)
 
   /* Check if the Control or Shift key was pressed.  */
   if (data[0] & 0x01 || data[0] & 0x10)
-    key = keyboard_map[data[2]] - 'a' + 1;
+    termdata->key = keyboard_map[data[2]] - 'a' + 1;
   else if (data[0] & 0x02 || data[0] & 0x20)
-    key = keyboard_map_shift[data[2]];
+    termdata->key = keyboard_map_shift[data[2]];
   else
-    key = keyboard_map[data[2]];
+    termdata->key = keyboard_map[data[2]];
 
-  if (key == 0)
+  if (termdata->key == 0)
     grub_printf ("Unknown key 0x%x detected\n", data[2]);
 
-#if 0
-  /* Wait until the key is released.  */
-  while (!err && data[2])
-    {
-      err = grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_IN,
-				  USB_HID_GET_REPORT, 0, 0,
-				  sizeof (data), (char *) data);
-      grub_dprintf ("usb_keyboard",
-		    "report2: 0x%02x 0x%02x 0x%02x 0x%02x"
-		    " 0x%02x 0x%02x 0x%02x 0x%02x\n",
-		    data[0], data[1], data[2], data[3],
-		    data[4], data[5], data[6], data[7]);
-    }
-#endif
-
   grub_errno = GRUB_ERR_NONE;
 
-  return key;
+  return termdata->key;
 }
 
-typedef enum
-{
-  GRUB_HIDBOOT_REPEAT_NONE,
-  GRUB_HIDBOOT_REPEAT_FIRST,
-  GRUB_HIDBOOT_REPEAT
-} grub_usb_keyboard_repeat_t;
-
 static int
 grub_usb_keyboard_getkey (struct grub_term_input *term)
 {
-  int key;
-  grub_err_t err;
-  grub_uint8_t data[8];
-  grub_uint64_t currtime;
-  int timeout;
-  static grub_usb_keyboard_repeat_t repeat = GRUB_HIDBOOT_REPEAT_NONE;
-  grub_usb_device_t usbdev = term->data;
+  int ret;
+  struct grub_usb_keyboard_data *termdata = term->data;
 
- again:
+  while (termdata->key == -1)
+    grub_usb_keyboard_checkkey (term);
 
-  do
-    {
-      key = grub_usb_keyboard_checkkey (term);
-    } while (key == -1);
+  ret = termdata->key;
 
-  data[2] = !0; /* Or whatever.  */
-  err = 0;
+  termdata->key = -1;
 
-  switch (repeat)
-    {
-    case GRUB_HIDBOOT_REPEAT_FIRST:
-      timeout = 500;
-      break;
-    case GRUB_HIDBOOT_REPEAT:
-      timeout = 50;
-      break;
-    default:
-      timeout = 100;
-      break;
-    }
-
-  /* Wait until the key is released.  */
-  currtime = grub_get_time_ms ();
-  while (!err && data[2])
-    {
-      /* Implement a timeout.  */
-      if (grub_get_time_ms () > currtime + timeout)
-	{
-	  if (repeat == 0)
-	    repeat = 1;
-	  else
-	    repeat = 2;
-
-	  grub_errno = GRUB_ERR_NONE;
-	  return key;
-	}
-
-      err = grub_usb_keyboard_getreport (usbdev, data);
-    }
-
-  if (repeat)
-    {
-      repeat = 0;
-      goto again;
-    }
-
-  repeat = 0;
-
-  grub_errno = GRUB_ERR_NONE;
-
-  return key;
+  return ret;
 }
 
 static int
 grub_usb_keyboard_getkeystatus (struct grub_term_input *term)
 {
-  grub_uint8_t data[8];
+  struct grub_usb_keyboard_data *termdata = term->data;
   int mods = 0;
-  grub_err_t err;
-  grub_uint64_t currtime;
-  int timeout = 50;
-  grub_usb_device_t usbdev = term->data;
-
-  /* Set idle time to the minimum offered by the spec (4 milliseconds) so
-     that we can find out the current state.  */
-  grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT,
-			USB_HID_SET_IDLE, 0<<8, 0, 0, 0);
-
-  currtime = grub_get_time_ms ();
-  do
-    {
-      /* Get_Report.  */
-      err = grub_usb_keyboard_getreport (usbdev, data);
-
-      /* Implement a timeout.  */
-      if (grub_get_time_ms () > currtime + timeout)
-	break;
-    }
-  while (err || !data[0]);
-
-  /* Go back to reporting every time an event occurs and not more often than
-     that.  */
-  grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT,
-			USB_HID_SET_IDLE, 0<<8, 0, 0, 0);
-
-  /* We allowed a while for modifiers to show up in the report, but it is
-     not an error if they never did.  */
-  if (err)
-    return -1;
-
-  grub_dprintf ("usb_keyboard",
-		"report: 0x%02x 0x%02x 0x%02x 0x%02x"
-		" 0x%02x 0x%02x 0x%02x 0x%02x\n",
-		data[0], data[1], data[2], data[3],
-		data[4], data[5], data[6], data[7]);
 
   /* Check Shift, Control, and Alt status.  */
-  if (data[0] & 0x02 || data[0] & 0x20)
+  if (termdata->status & 0x02 || termdata->status & 0x20)
     mods |= GRUB_TERM_STATUS_SHIFT;
-  if (data[0] & 0x01 || data[0] & 0x10)
+  if (termdata->status & 0x01 || termdata->status & 0x10)
     mods |= GRUB_TERM_STATUS_CTRL;
-  if (data[0] & 0x04 || data[0] & 0x40)
+  if (termdata->status & 0x04 || termdata->status & 0x40)
     mods |= GRUB_TERM_STATUS_ALT;
 
-  grub_errno = GRUB_ERR_NONE;
-
   return mods;
 }
 

From 3d9d3542972693ecedc0d3de595c18ef61472298 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Fri, 20 Aug 2010 18:21:31 +0530
Subject: [PATCH 1388/1628] generate gcry rules from import_gcry

---
 .bzrignore                                   |   6 +-
 Makefile.am                                  |   3 +-
 modules.def => Makefile.util.def             |   0
 autogen.sh                                   |  15 ++-
 conf/Makefile.common                         |  24 ++++
 gentpl.py                                    |  11 --
 grub-core/Makefile.am                        |   3 +-
 grub-core/{modules.def => Makefile.core.def} | 134 -------------------
 util/import_gcry.py                          |  18 +--
 9 files changed, 49 insertions(+), 165 deletions(-)
 rename modules.def => Makefile.util.def (100%)
 rename grub-core/{modules.def => Makefile.core.def} (90%)

diff --git a/.bzrignore b/.bzrignore
index 1672efd65..3c7150afb 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -19,7 +19,6 @@ config.status
 config.sub
 configure
 conf/*.mk
-conf/gcry.rmk
 *.d
 DISTLIST
 docs/*.info
@@ -80,7 +79,6 @@ trigtables.c
 update-grub_lib
 unidata.c
 Makefile.in
-modules.am
 GPATH
 GRTAGS
 GSYMS
@@ -93,3 +91,7 @@ texinfo.tex
 grub-core/lib/libgcrypt-grub
 **/.deps-util
 **/.deps-core
+Makefile.util.am
+grub-core/Makefile.core.am
+grub-core/Makefile.gcry.am
+grub-core/Makefile.gcry.def
diff --git a/Makefile.am b/Makefile.am
index ed482eea2..b0d374b75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ LDFLAGS_PROGRAM += $(LDFLAGS_GNULIB)
 CPPFLAGS_PROGRAM += $(CPPFLAGS_GNULIB)
 CCASFLAGS_PROGRAM += $(CCASFLAGS_GNULIB)
 
-include $(srcdir)/modules.am
+include $(srcdir)/Makefile.util.am
 
 # XXX Use Automake's LEX & YACC support
 grub_script.tab.h: $(top_srcdir)/grub-core/script/parser.y
@@ -82,3 +82,4 @@ CLEANFILES += widthspec.h
 
 # Install config.h into platformdir
 platform_HEADERS = config.h
+
diff --git a/modules.def b/Makefile.util.def
similarity index 100%
rename from modules.def
rename to Makefile.util.def
diff --git a/autogen.sh b/autogen.sh
index 60139cfb3..31a269e0f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,19 +4,20 @@ set -e
 
 autogen --version >/dev/null || (echo autogen missing; exit 1)
 
-echo "Creating Makefile.tpl..."
-python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl
-
-echo "Running autogen..."
-autogen -T Makefile.tpl modules.def | sed -e '/^$/{N;/^\n$/D;}' > modules.am
-autogen -T Makefile.tpl grub-core/modules.def | sed -e '/^$/{N;/^\n$/D;}' > grub-core/modules.am
-
 echo "Importing unicode..."
 python util/import_unicode.py unicode/UnicodeData.txt unicode/BidiMirroring.txt unicode/ArabicShaping.txt grub-core/unidata.c
 
 echo "Importing libgcrypt..."
 python util/import_gcry.py grub-core/lib/libgcrypt/ grub-core
 
+echo "Creating Makefile.tpl..."
+python gentpl.py | sed -e '/^$/{N;/^\n$/D;}' > Makefile.tpl
+
+echo "Running autogen..."
+autogen -T Makefile.tpl Makefile.util.def | sed -e '/^$/{N;/^\n$/D;}' > Makefile.util.am
+autogen -T Makefile.tpl grub-core/Makefile.core.def | sed -e '/^$/{N;/^\n$/D;}' > grub-core/Makefile.core.am
+autogen -T Makefile.tpl grub-core/Makefile.gcry.def | sed -e '/^$/{N;/^\n$/D;}' > grub-core/Makefile.gcry.am
+
 echo "Saving timestamps..."
 echo timestamp > stamp-h.in
 
diff --git a/conf/Makefile.common b/conf/Makefile.common
index 47067596b..3bb8b9c0e 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -1,3 +1,5 @@
+# -*- makefile -*-
+
 # Platform specific options
 if COND_i386_pc
   CFLAGS_PLATFORM = -mrtd -mregparm=3
@@ -117,3 +119,25 @@ TESTS =
 EXTRA_DIST =
 CLEANFILES =
 BUILT_SOURCES =
+
+# 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)/Makefile.util.def $(top_srcdir)/Makefile.tpl
+	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)/grub-core/Makefile.core.def $(top_srcdir)/Makefile.tpl
+	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.gcry.am
+$(top_srcdir)/grub-core/Makefile.gcry.am: $(top_srcdir)/grub-core/Makefile.gcry.def $(top_srcdir)/Makefile.tpl
+	autogen -T $(top_srcdir)/Makefile.tpl $< | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
+	mv $@.new $@
diff --git a/gentpl.py b/gentpl.py
index 632b4c13e..59950bb0e 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -448,14 +448,3 @@ print d
 print e
 print f
 print g
-
-print """.PRECIOUS: modules.am
-$(srcdir)/modules.am: $(srcdir)/modules.def $(top_srcdir)/Makefile.tpl
-	autogen -T $(top_srcdir)/Makefile.tpl $(srcdir)/modules.def | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
-	mv $@.new $@
-
-.PRECIOUS: $(top_srcdir)/Makefile.tpl
-$(top_srcdir)/Makefile.tpl: $(top_srcdir)/gentpl.py
-	python $(top_srcdir)/gentpl.py | sed -e '/^$$/{N;/^\\n$$/D;}' > $@.new || (rm -f $@.new; exit 1)
-	mv $@.new $@
-"""
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index d91448149..770f1a6bb 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -45,7 +45,8 @@ grub_script.yy.h: script/yylex.l
 grub_script.yy.c: grub_script.yy.h
 CLEANFILES += grub_script.yy.c grub_script.yy.h
 
-include $(srcdir)/modules.am
+include $(srcdir)/Makefile.core.am
+include $(srcdir)/Makefile.gcry.am
 
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cache.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
diff --git a/grub-core/modules.def b/grub-core/Makefile.core.def
similarity index 90%
rename from grub-core/modules.def
rename to grub-core/Makefile.core.def
index fa830e779..73caf0771 100644
--- a/grub-core/modules.def
+++ b/grub-core/Makefile.core.def
@@ -1049,140 +1049,6 @@ module = {
   extra_dist = lib/libgcrypt-grub/cipher/crypto.lst;
 };
 
-module = {
-  name = gcry_arcfour;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/arcfour.c;
-};
-
-module = {
-  name = gcry_blowfish;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/blowfish.c;
-};
-
-module = {
-  name = gcry_camellia;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/camellia.c;
-  source = lib/libgcrypt-grub/cipher/camellia-glue.c;
-};
-
-module = {
-  name = gcry_cast5;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/cast5.c;
-};
-
-module = {
-  name = gcry_crc;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/crc.c;
-};
-
-module = {
-  name = gcry_des;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/des.c;
-};
-
-module = {
-  name = gcry_md4;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/md4.c;
-};
-
-module = {
-  name = gcry_md5;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/md5.c;
-};
-
-module = {
-  name = gcry_rfc2268;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/rfc2268.c;
-};
-
-module = {
-  name = gcry_rijndael;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/rijndael.c;
-};
-
-module = {
-  name = gcry_rmd160;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/rmd160.c;
-};
-
-module = {
-  name = gcry_seed;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/seed.c;
-};
-
-module = {
-  name = gcry_serpent;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/serpent.c;
-};
-
-module = {
-  name = gcry_sha1;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/sha1.c;
-};
-
-module = {
-  name = gcry_sha256;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/sha256.c;
-};
-
-module = {
-  name = gcry_sha512;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/sha512.c;
-};
-
-module = {
-  name = gcry_tiger;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/tiger.c;
-};
-
-module = {
-  name = gcry_twofish;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/twofish.c;
-};
-
-module = {
-  name = gcry_whirlpool;
-  cflags = '$(CFLAGS_GCRY)';
-  cppflags = '$(CPPFLAGS_GCRY)';
-  source = lib/libgcrypt-grub/cipher/whirlpool.c;
-};
-
 module = {
   name = pbkdf2;
   source = lib/pbkdf2.c;
diff --git a/util/import_gcry.py b/util/import_gcry.py
index b63fb5501..6280f001e 100644
--- a/util/import_gcry.py
+++ b/util/import_gcry.py
@@ -40,8 +40,8 @@ except:
     print ("WARNING: %s already exists" % cipher_dir_out)
 
 cipher_files = os.listdir (cipher_dir_in)
-conf = open (os.path.join ("conf", "gcry.rmk"), "w")
-conf.write ("# -*- makefile -*-\n\n")
+conf = open (os.path.join ("grub-core", "Makefile.gcry.def"), "w")
+conf.write ("AutoGen definitions Makefile.tpl;\n\n")
 chlog = ""
 
 # Strictly speaking CRC32/CRC24 work on bytes so this value should be 1
@@ -62,7 +62,6 @@ mdblocksizes = {"_gcry_digest_spec_crc32" : 64,
                 "_gcry_digest_spec_whirlpool" : 64}
 
 cryptolist = open (os.path.join (cipher_dir_out, "crypto.lst"), "w")
-conf.write ("MAINTAINER_CLEANFILES += $(srcdir)/conf/gcry.rmk $(srcdir)/lib/libgcrypt-grub/cipher/ChangeLog $(srcdir)/lib/libgcrypt-grub/cipher/cipher.h $(srcdir)/lib/libgcrypt-grub/cipher/crypto.lst $(srcdir)/lib/libgcrypt-grub/cipher/g10lib.h $(srcdir)/lib/libgcrypt-grub/cipher/memory.h $(srcdir)/lib/libgcrypt-grub/cipher/types.h\n");
 
 # rijndael is the only cipher using aliases. So no need for mangling, just
 # hardcode it
@@ -88,7 +87,6 @@ for cipher_file in cipher_files:
         continue
     nch = False
     if re.match (".*\.[ch]$", cipher_file):
-        conf.write ("MAINTAINER_CLEANFILES += $(srcdir)/lib/libgcrypt-grub/cipher/" + cipher_file + "\n");
         isc = re.match (".*\.c$", cipher_file)
         f = open (infile, "r")
         fw = open (outfile, "w")
@@ -276,11 +274,13 @@ for cipher_file in cipher_files:
                 chlognew = "%s\n	%s" % (chlognew, chmsg)
                 fw.write ("  grub_md_unregister (&%s);\n" % mdname)
             fw.write ("}\n")
-            conf.write ("pkglib_MODULES += %s.mod\n" % modname)
-            conf.write ("%s_mod_SOURCES = %s\n" %\
-                            (modname, modfiles))
-            conf.write ("%s_mod_CFLAGS = $(COMMON_CFLAGS) -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap\n" % modname)
-            conf.write ("%s_mod_LDFLAGS = $(COMMON_LDFLAGS)\n\n" % modname)
+            conf.write ("module = {\n")
+            conf.write ("  name = %s;\n" % modname)
+            for src in modfiles.split():
+                conf.write ("  source = %s;\n" % src)
+            conf.write ("  cflags = '$(CFLAGS_GCRY)';\n");
+            conf.write ("  cppflags = '$(CPPFLAGS_GCRY)';\n");
+            conf.write ("};\n\n")
         elif isc and cipher_file != "camellia.c":
             print ("WARNING: C file isn't a module: %s" % cipher_file)
         f.close ()

From 34cf2b8aea3dd9434a894185437eeccd41dafc2f Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Fri, 20 Aug 2010 18:47:22 +0530
Subject: [PATCH 1389/1628] fix distcheck

---
 conf/Makefile.extra-dist | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
index ae4b8fbde..60feea34f 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -4,15 +4,17 @@ EXTRA_DIST += autogen.sh
 EXTRA_DIST += geninit.sh
 
 EXTRA_DIST += gentpl.py
-EXTRA_DIST += modules.def
 EXTRA_DIST += Makefile.tpl
+EXTRA_DIST += Makefile.util.def
 
 EXTRA_DIST += docs/man
 EXTRA_DIST += docs/grub.cfg
 
 EXTRA_DIST += conf/i386-pc-cygwin-img-ld.sc
 
-EXTRA_DIST += grub-core/modules.def
+EXTRA_DIST += grub-core/Makefile.core.def
+EXTRA_DIST += grub-core/Makefile.gcry.def
+
 EXTRA_DIST += grub-core/genmoddep.awk
 EXTRA_DIST += grub-core/genmodsrc.sh
 EXTRA_DIST += grub-core/genfslist.sh

From 9ba74de61a9c6adfe14bf51a3226111e645a6c18 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Aug 2010 16:34:34 +0200
Subject: [PATCH 1390/1628] Scan descriptor rather than elying on hardcoded
 endpoint number

---
 include/grub/usb.h  | 14 ++++++++++++++
 term/usb_keyboard.c | 21 +++++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/include/grub/usb.h b/include/grub/usb.h
index b2dc77ce4..5d0eb2082 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -181,6 +181,20 @@ struct grub_usb_device
 
 
 
+typedef enum grub_usb_ep_type
+  {
+    GRUB_USB_EP_CONTROL,
+    GRUB_USB_EP_ISOCHRONOUS,
+    GRUB_USB_EP_BULK,
+    GRUB_USB_EP_INTERRUPT
+  } grub_usb_ep_type_t;
+
+static inline enum grub_usb_ep_type
+grub_usb_get_ep_type (struct grub_usb_desc_endp *ep)
+{
+  return ep->attrib & 3;
+}
+
 typedef enum
   {
     GRUB_USB_CLASS_NOTHERE,
diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index d318a04ff..5fcb570b7 100644
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -83,6 +83,7 @@ struct grub_usb_keyboard_data
   grub_usb_device_t usbdev;
   grub_uint8_t status;
   int key;
+  struct grub_usb_desc_endp *endp;
 };
 
 static struct grub_term_input grub_usb_keyboards[16];
@@ -109,6 +110,8 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)
 {
   unsigned curnum;
   struct grub_usb_keyboard_data *data;
+  struct grub_usb_desc_endp *endp = NULL;
+  int j;
 
   grub_dprintf ("usb_keyboard", "%x %x %x %d %d\n",
 		usbdev->descdev.class, usbdev->descdev.subclass,
@@ -131,6 +134,18 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)
       != USB_HID_KBD_PROTOCOL)
     return 0;
 
+  for (j = 0; j < usbdev->config[configno].interf[interfno].descif->endpointcnt;
+       j++)
+    {
+      endp = &usbdev->config[configno].interf[interfno].descendp[j];
+
+      if ((endp->endp_addr & 128) && grub_usb_get_ep_type(endp)
+	  == GRUB_USB_EP_INTERRUPT)
+	break;
+    }
+  if (j == usbdev->config[configno].interf[interfno].descif->endpointcnt)
+    return 0;
+
   grub_printf ("HID found!\n");
 
   data = grub_malloc (sizeof (*data));
@@ -141,6 +156,7 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)
     }
 
   data->usbdev = usbdev;
+  data->endp = endp;
 
   /* Place the device in boot mode.  */
   grub_usb_control_msg (usbdev, GRUB_USB_REQTYPE_CLASS_INTERFACE_OUT,
@@ -201,8 +217,9 @@ grub_usb_keyboard_checkkey (struct grub_term_input *term)
 
   data[2] = 0;
   /* Poll interrupt pipe.  */
-  err = grub_usb_bulk_read_extended (termdata->usbdev, 1, sizeof (data),
-				     (char *) data, 1, &actual);
+  err = grub_usb_bulk_read_extended (termdata->usbdev,
+				     termdata->endp->endp_addr, sizeof (data),
+				     (char *) data, 10, &actual);
 
   if (err)
     return -1;

From 21a313dedc50ebb175f930199de4d915882cc14b Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Fri, 20 Aug 2010 16:36:07 +0200
Subject: [PATCH 1391/1628] 2010-08-20  Robert Millan  <rmh@gnu.org>

	Make kFreeBSD code more generic to support ext2fs as root, ufs as
	a separate module and maybe other interesting combinations.

	* util/grub.d/10_kfreebsd.in (load_kfreebsd_module): New function.
	(kfreebsd_entry): Use load_kfreebsd_module() to load modules.
	(kfreebsd_entry): Add generic filesystem module load routine.
	Map GRUB `ext2' to kFreeBSD `ext2fs'.
---
 ChangeLog                  | 10 +++++++
 util/grub.d/10_kfreebsd.in | 54 +++++++++++++++++++++++---------------
 2 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7d82e08fb..fa2178875 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-20  Robert Millan  <rmh@gnu.org>
+
+	Make kFreeBSD code more generic to support ext2fs as root, ufs as
+	a separate module and maybe other interesting combinations.
+
+	* util/grub.d/10_kfreebsd.in (load_kfreebsd_module): New function.
+	(kfreebsd_entry): Use load_kfreebsd_module() to load modules.
+	(kfreebsd_entry): Add generic filesystem module load routine.
+	Map GRUB `ext2' to kFreeBSD `ext2fs'.
+
 2010-08-20  Colin Watson  <cjwatson@ubuntu.com>
 
 	* commands/i386/pc/sendkey.c (keysym_table): Rename "numlock" to
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index 3a42de529..40ac240c7 100644
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -39,6 +39,31 @@ case "${GRUB_DISTRIBUTOR}" in
   ;;
 esac
 
+load_kfreebsd_module ()
+{
+  mod="$1"
+  allow_fail="$2"
+
+  if ! test -e "${module_dir}/${mod}.ko" ; then
+    if [ "${allow_fail}" = "true" ] ; then
+      # Return silently
+      return
+    else
+      # Print an error and fail.
+      ls "${module_dir}/${mod}.ko" > /dev/null
+    fi
+  fi
+
+  if [ -z "${prepare_module_dir_cache}" ]; then
+    prepare_module_dir_cache="$(prepare_grub_to_access_device $(grub-probe -t device "${module_dir}") | sed -e "s/^/\t/")"
+  fi
+
+  printf '%s\n' "${prepare_module_dir_cache}"
+  cat << EOF
+	kfreebsd_module_elf	${module_dir_rel}/${mod}.ko
+EOF
+}
+
 kfreebsd_entry ()
 {
   os="$1"
@@ -51,9 +76,6 @@ kfreebsd_entry ()
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi
-  if [ -z "${prepare_module_dir_cache}" ]; then
-    prepare_module_dir_cache="$(prepare_grub_to_access_device $(grub-probe -t device "${module_dir}") | sed -e "s/^/\t/")"
-  fi
 
   printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
@@ -67,26 +89,13 @@ EOF
 EOF
   fi
 
-  if test -e "${module_dir}/acpi.ko" ; then
-    printf '%s\n' "${prepare_module_dir_cache}"
-    cat << EOF
-	kfreebsd_module_elf	${module_dir_rel}/acpi.ko
-EOF
-  fi
+  load_kfreebsd_module acpi true
 
   case "${kfreebsd_fs}" in
     zfs)
-      for i in "${module_dir}/opensolaris.ko" "${module_dir}/zfs.ko" \
-          "${dirname}/zfs/zpool.cache" ; do
-        ls "$i" > /dev/null
-      done
-
-      printf '%s\n' "${prepare_module_dir_cache}"
-      cat << EOF
-	kfreebsd_module_elf	${module_dir_rel}/opensolaris.ko
-	kfreebsd_module_elf	${module_dir_rel}/zfs.ko
-EOF
+      load_kfreebsd_module opensolaris false
 
+      ls "${dirname}/zfs/zpool.cache" > /dev/null
       printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
 	kfreebsd_module		${rel_dirname}/zfs/zpool.cache type=/boot/zfs/zpool.cache
@@ -94,6 +103,8 @@ EOF
     ;;
   esac
 
+  load_kfreebsd_module ${kfreebsd_fs} false
+
   cat << EOF
 	set kFreeBSD.vfs.root.mountfrom=${kfreebsd_fs}:${kfreebsd_device}
 	set kFreeBSD.vfs.root.mountfrom.options=rw
@@ -121,8 +132,9 @@ while [ "x$list" != "x" ] ; do
   fi
 
   case ${GRUB_FS} in
-    ufs1 | ufs2)        kfreebsd_fs=ufs ;;
-    *)                  kfreebsd_fs=${GRUB_FS} ;;
+    ufs1 | ufs2)	kfreebsd_fs=ufs ;;
+    ext2)		kfreebsd_fs=ext2fs ;;
+    *)			kfreebsd_fs=${GRUB_FS} ;;
   esac
 
   case ${GRUB_FS} in

From 15bd1f9ccfa4405626b9e733505497ed3899758b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Aug 2010 16:49:24 +0200
Subject: [PATCH 1392/1628] Don't update status on 0 message

---
 term/usb_keyboard.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index 5fcb570b7..62f5df352 100644
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -220,8 +220,7 @@ grub_usb_keyboard_checkkey (struct grub_term_input *term)
   err = grub_usb_bulk_read_extended (termdata->usbdev,
 				     termdata->endp->endp_addr, sizeof (data),
 				     (char *) data, 10, &actual);
-
-  if (err)
+  if (err || actual < 1)
     return -1;
 
   termdata->status = data[0];

From 24582ab39b8353f4acae89f2a377f3f8eca60977 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Aug 2010 16:56:03 +0200
Subject: [PATCH 1393/1628] Correct *actual counting in OHCI

---
 bus/usb/ohci.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index aa96ed5e6..39e47ffee 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -989,6 +989,7 @@ grub_ohci_transfer (grub_usb_controller_t dev,
         transfer->last_trans = tderr_virt->tr_index;
       else
         transfer->last_trans = -1;
+      *actual = transfer->size;
     }
 
   else if (err_halt) /* error, ED is halted by OHCI, i.e. can be modified */
@@ -1178,8 +1179,6 @@ grub_ohci_transfer (grub_usb_controller_t dev,
       else
         transfer->last_trans = -1;
     }
-  else
-    *actual = transfer->size;
 
   /* Set empty ED - set HEAD = TAIL = last (not processed) TD */
   ed_virt->td_head = grub_cpu_to_le32 (grub_le_to_cpu32 (ed_virt->td_tail) & ~0xf); 

From a71e47197598e709e23281a07b2af99337aa51fa Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Fri, 20 Aug 2010 21:01:13 +0530
Subject: [PATCH 1394/1628] fix distcheck from source tree

---
 conf/Makefile.extra-dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
index 60feea34f..17a169284 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -1,4 +1,4 @@
-EXTRA_DIST += include
+EXTRA_DIST += $(shell find $(top_srcdir)/include -name '*.h')
 
 EXTRA_DIST += autogen.sh
 EXTRA_DIST += geninit.sh

From 00d064849105356cbb239ded246d257eaeb79f68 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Fri, 20 Aug 2010 22:34:19 +0530
Subject: [PATCH 1395/1628] fix emu build on netbsd

---
 grub-core/Makefile.core.def | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 73caf0771..83aa3b1db 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -249,7 +249,7 @@ program = {
 
   ldadd = 'kernel.img$(EXEEXT)';
   ldadd = '$(MODULE_FILES)';
-  ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)';
+  ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)';
 
   enable = emu;
 };
@@ -262,7 +262,7 @@ program = {
   nodist = symlist.c;
 
   ldadd = 'kernel.img$(EXEEXT)';
-  ldadd = '$(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)';
+  ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)';
 
   enable = emu;
 };

From 60c1ffdfdc325c571bab525e2608a943f87343b5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Aug 2010 19:33:44 +0200
Subject: [PATCH 1396/1628] Fix OHCI error message

---
 bus/usb/ohci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 39e47ffee..974bed6cd 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -1036,7 +1036,7 @@ grub_ohci_transfer (grub_usb_controller_t dev,
 	{
 	case 0:
 	  /* XXX: Should not happen!  */
-	  grub_error (GRUB_ERR_IO, "OHCI without reporting the reason");
+	  grub_error (GRUB_ERR_IO, "OHCI failed without reporting the reason");
 	  err = GRUB_USB_ERR_INTERNAL;
 	  break;
 

From 52d8255d2021ce28ce89a351750c50b27b273cf6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Aug 2010 19:34:29 +0200
Subject: [PATCH 1397/1628] Support hot unplugging

---
 bus/usb/usb.c       |  13 +++++-
 bus/usb/usbhub.c    | 107 +++++++++++++++++++++++++++++---------------
 disk/usbms.c        |  10 ++---
 include/grub/term.h |   1 +
 include/grub/usb.h  |   6 +++
 kern/term.c         |  11 +++++
 term/usb_keyboard.c |  23 ++++++----
 7 files changed, 120 insertions(+), 51 deletions(-)

diff --git a/bus/usb/usb.c b/bus/usb/usb.c
index b3eaeba0e..2bd805ef2 100644
--- a/bus/usb/usb.c
+++ b/bus/usb/usb.c
@@ -22,7 +22,7 @@
 #include <grub/usb.h>
 #include <grub/misc.h>
 #include <grub/list.h>
-#include <grub/dl.h>
+#include <grub/term.h>
 
 static grub_usb_controller_dev_t grub_usb_list;
 struct grub_usb_attach_desc *attach_hooks;
@@ -334,3 +334,14 @@ grub_usb_unregister_attach_hook_class (struct grub_usb_attach_desc *desc)
 {
   grub_list_remove (GRUB_AS_LIST_P (&attach_hooks), GRUB_AS_LIST (desc));  
 }
+
+
+GRUB_MOD_INIT(usb)
+{
+  grub_term_poll_usb = grub_usb_poll_devices;
+}
+
+GRUB_MOD_FINI(usb)
+{
+  grub_term_poll_usb = NULL;
+}
diff --git a/bus/usb/usbhub.c b/bus/usb/usbhub.c
index 6c14f4b8d..7f2c8d24b 100644
--- a/bus/usb/usbhub.c
+++ b/bus/usb/usbhub.c
@@ -33,7 +33,7 @@ struct grub_usb_hub
   struct grub_usb_hub *next;
   grub_usb_controller_t controller;
   int nports;
-  grub_usb_speed_t *speed;
+  struct grub_usb_device **devices;
   grub_usb_device_t dev;
 };
 
@@ -104,7 +104,7 @@ grub_usb_hub_add_dev (grub_usb_controller_t controller, grub_usb_speed_t speed)
 }
 
 
-static grub_err_t
+static grub_usb_err_t
 grub_usb_add_hub (grub_usb_device_t dev)
 {
   struct grub_usb_usb_hubdesc hubdesc;
@@ -112,6 +112,7 @@ grub_usb_add_hub (grub_usb_device_t dev)
   int i;
   grub_uint64_t timeout;
   grub_usb_device_t next_dev;
+  grub_usb_device_t *attached_devices;
   
   err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
 	  		            | GRUB_USB_REQTYPE_CLASS
@@ -130,6 +131,13 @@ grub_usb_add_hub (grub_usb_device_t dev)
   grub_dprintf ("usb", "Hub set configuration\n");
   grub_usb_set_configuration (dev, 1);
 
+  attached_devices = grub_zalloc (hubdesc.portcnt
+				  * sizeof (attached_devices[0]));
+  if (!attached_devices)
+    return GRUB_USB_ERR_INTERNAL;
+  dev->children = attached_devices;
+  dev->nports = hubdesc.portcnt;
+
   /* Power on all Hub ports.  */
   for (i = 1; i <= hubdesc.portcnt; i++)
     {
@@ -236,6 +244,8 @@ grub_usb_add_hub (grub_usb_device_t dev)
           if (! next_dev)
             continue;
 
+	  attached_devices[i - 1] = next_dev;
+
           /* If the device is a Hub, scan it for more devices.  */
           if (next_dev->descdev.class == 0x09)
             grub_usb_add_hub (next_dev);
@@ -246,27 +256,29 @@ grub_usb_add_hub (grub_usb_device_t dev)
 }
 
 static void
-attach_root_port (grub_usb_controller_t controller, int portno,
+attach_root_port (struct grub_usb_hub *hub, int portno,
 		  grub_usb_speed_t speed)
 {
   grub_usb_device_t dev;
   grub_err_t err;
 
   /* Disable the port. XXX: Why? */
-  err = controller->dev->portstatus (controller, portno, 0);
+  err = hub->controller->dev->portstatus (hub->controller, portno, 0);
   if (err)
     return;
 
   /* Enable the port.  */
-  err = controller->dev->portstatus (controller, portno, 1);
+  err = hub->controller->dev->portstatus (hub->controller, portno, 1);
   if (err)
     return;
 
   /* Enable the port and create a device.  */
-  dev = grub_usb_hub_add_dev (controller, speed);
+  dev = grub_usb_hub_add_dev (hub->controller, speed);
   if (! dev)
     return;
 
+  hub->devices[portno] = dev;
+
   /* If the device is a Hub, scan it for more devices.  */
   if (dev->descdev.class == 0x09)
     grub_usb_add_hub (dev);
@@ -297,8 +309,8 @@ grub_usb_root_hub (grub_usb_controller_t controller)
 
   /* Query the number of ports the root Hub has.  */
   hub->nports = controller->dev->hubports (controller);
-  hub->speed = grub_malloc (sizeof (hub->speed[0]) * hub->nports);
-  if (!hub->speed)
+  hub->devices = grub_zalloc (sizeof (hub->devices[0]) * hub->nports);
+  if (!hub->devices)
     {
       grub_free (hub->controller);
       grub_free (hub);
@@ -307,36 +319,54 @@ grub_usb_root_hub (grub_usb_controller_t controller)
 
   for (i = 0; i < hub->nports; i++)
     {
-      hub->speed[i] = controller->dev->detect_dev (hub->controller, i,
-                                                   &changed);
+      grub_usb_speed_t speed;
+      speed = controller->dev->detect_dev (hub->controller, i,
+					   &changed);
 
-      if (hub->speed[i] != GRUB_USB_SPEED_NONE)
-	attach_root_port (hub->controller, i, hub->speed[i]);
+      if (speed != GRUB_USB_SPEED_NONE)
+	attach_root_port (hub, i, speed);
     }
 
   return GRUB_USB_ERR_NONE;
 }
 
+static void detach_device (grub_usb_device_t dev);
+
+static void
+detach_device (grub_usb_device_t dev)
+{
+  unsigned i;
+  int k;
+  if (!dev)
+    return;
+  if (dev->descdev.class == GRUB_USB_CLASS_HUB)
+    {
+      for (i = 0; i < dev->nports; i++)
+	detach_device (dev->children[i]);
+      grub_free (dev->children);
+    }
+  for (i = 0; i < ARRAY_SIZE (dev->config); i++)
+    if (dev->config[i].descconf)
+      for (k = 0; k < dev->config[i].descconf->numif; k++)
+	{
+	  struct grub_usb_interface *inter = &dev->config[i].interf[k];
+	  if (inter && inter->detach_hook)
+	    inter->detach_hook (dev, i, k);
+	}
+  grub_usb_devs[dev->addr] = 0;
+}
+
 static void
 poll_nonroot_hub (grub_usb_device_t dev)
 {
-  struct grub_usb_usb_hubdesc hubdesc;
   grub_err_t err;
-  int i;
+  unsigned i;
   grub_uint64_t timeout;
   grub_usb_device_t next_dev;
-  
-  err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
-	  		            | GRUB_USB_REQTYPE_CLASS
-			            | GRUB_USB_REQTYPE_TARGET_DEV),
-                              GRUB_USB_REQ_GET_DESCRIPTOR,
-			      (GRUB_USB_DESCRIPTOR_HUB << 8) | 0,
-			      0, sizeof (hubdesc), (char *) &hubdesc);
-  if (err)
-    return;
-    
+  grub_usb_device_t *attached_devices = dev->children;
+      
   /* Iterate over the Hub ports.  */
-  for (i = 1; i <= hubdesc.portcnt; i++)
+  for (i = 1; i <= dev->nports; i++)
     {
       grub_uint32_t status;
 
@@ -350,6 +380,12 @@ poll_nonroot_hub (grub_usb_device_t dev)
 	 status.  */
       if (err)
 	continue;
+
+      if (status & GRUB_USB_HUB_STATUS_C_CONNECTED)
+	{
+	  detach_device (attached_devices[i-1]);
+	  attached_devices[i - 1] = NULL;
+	}
       	    
       /* Connected and status of connection changed ? */
       if ((status & GRUB_USB_HUB_STATUS_CONNECTED)
@@ -417,6 +453,8 @@ poll_nonroot_hub (grub_usb_device_t dev)
           if (! next_dev)
             continue;
 
+	  attached_devices[i - 1] = next_dev;
+
           /* If the device is a Hub, scan it for more devices.  */
           if (next_dev->descdev.class == 0x09)
             grub_usb_add_hub (next_dev);
@@ -434,26 +472,23 @@ grub_usb_poll_devices (void)
 
   for (hub = hubs; hub; hub = hub->next)
     {
-      int changed=0;
       /* Do we have to recheck number of ports?  */
       /* No, it should be never changed, it should be constant. */
       for (i = 0; i < hub->nports; i++)
 	{
 	  grub_usb_speed_t speed;
+	  int changed = 0;
 
 	  speed = hub->controller->dev->detect_dev (hub->controller, i,
 	                                            &changed);
 
-	  if (speed != GRUB_USB_SPEED_NONE)
+	  if (changed)
 	    {
-              if (changed)
-                attach_root_port (hub->controller, i, speed);
+	      detach_device (hub->devices[i]);
+	      hub->devices[i] = NULL;
+	      if (speed != GRUB_USB_SPEED_NONE)
+                attach_root_port (hub, i, speed);
 	    }
-
-          /* XXX: There should be also handling
-           * of disconnected devices. */
-           
-	  hub->speed[i] = speed;
 	}
     }
 
@@ -463,9 +498,7 @@ grub_usb_poll_devices (void)
       grub_usb_device_t dev = grub_usb_devs[i];
 
       if (dev && dev->descdev.class == 0x09)
-	{
-          poll_nonroot_hub (dev);
-	}
+	poll_nonroot_hub (dev);
     }
 
 }
diff --git a/disk/usbms.c b/disk/usbms.c
index 225761e0f..e63105ccc 100644
--- a/disk/usbms.c
+++ b/disk/usbms.c
@@ -65,6 +65,7 @@ typedef struct grub_usbms_dev *grub_usbms_dev_t;
 /* FIXME: remove limit.  */
 #define MAX_USBMS_DEVICES 128
 static grub_usbms_dev_t grub_usbms_devices[MAX_USBMS_DEVICES];
+static int first_available_slot = 0;
 
 static grub_err_t
 grub_usbms_reset (grub_usb_device_t dev, int interface)
@@ -96,13 +97,12 @@ grub_usbms_attach (grub_usb_device_t usbdev, int configno, int interfno)
   unsigned curnum;
   grub_usb_err_t err;
 
-  for (curnum = 0; curnum < ARRAY_SIZE (grub_usbms_devices); curnum++)
-    if (!grub_usbms_devices[curnum])
-      break;
-
-  if (curnum == ARRAY_SIZE (grub_usbms_devices))
+  if (first_available_slot == ARRAY_SIZE (grub_usbms_devices))
     return 0;
 
+  curnum = first_available_slot;
+  first_available_slot++;
+
   interf = usbdev->config[configno].interf[interfno].descif;
 
   if ((interf->subclass != GRUB_USBMS_SUBCLASS_BULK
diff --git a/include/grub/term.h b/include/grub/term.h
index f40d935e4..734e4ab17 100644
--- a/include/grub/term.h
+++ b/include/grub/term.h
@@ -459,6 +459,7 @@ grub_print_spaces (struct grub_term_output *term, int number_spaces)
     grub_putcode (' ', term);
 }
 
+extern void (*EXPORT_VAR (grub_term_poll_usb)) (void);
 
 /* For convenience.  */
 #define GRUB_TERM_ASCII_CHAR(c)	((c) & 0xff)
diff --git a/include/grub/usb.h b/include/grub/usb.h
index 5d0eb2082..674f7ec46 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -177,6 +177,12 @@ struct grub_usb_device
 
   /* Data toggle values (used for bulk transfers only).  */
   int toggle[256];
+
+  /* Array of children for a hub.  */
+  grub_usb_device_t *children;
+
+  /* Number of hub ports.  */
+  unsigned nports;
 };
 
 
diff --git a/kern/term.c b/kern/term.c
index 47bd426fd..360539e50 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -28,6 +28,8 @@ struct grub_term_input *grub_term_inputs_disabled;
 struct grub_term_output *grub_term_outputs;
 struct grub_term_input *grub_term_inputs;
 
+void (*grub_term_poll_usb) (void) = NULL;
+
 /* Put a Unicode character.  */
 static void
 grub_putcode_dumb (grub_uint32_t code,
@@ -85,6 +87,9 @@ grub_getkey (void)
 
   while (1)
     {
+      if (grub_term_poll_usb)
+	grub_term_poll_usb ();
+
       FOR_ACTIVE_TERM_INPUTS(term)
       {
 	int key = term->checkkey (term);
@@ -101,6 +106,9 @@ grub_checkkey (void)
 {
   grub_term_input_t term;
 
+  if (grub_term_poll_usb)
+    grub_term_poll_usb ();
+
   FOR_ACTIVE_TERM_INPUTS(term)
   {
     int key = term->checkkey (term);
@@ -117,6 +125,9 @@ grub_getkeystatus (void)
   int status = 0;
   grub_term_input_t term;
 
+  if (grub_term_poll_usb)
+    grub_term_poll_usb ();
+
   FOR_ACTIVE_TERM_INPUTS(term)
   {
     if (term->getkeystatus)
diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index 62f5df352..b6bc05dbe 100644
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -95,14 +95,21 @@ grub_usb_keyboard_detach (grub_usb_device_t usbdev,
 {
   unsigned i;
   for (i = 0; i < ARRAY_SIZE (grub_usb_keyboards); i++)
-    if (grub_usb_keyboards[i].data && grub_usb_keyboards[i].data == usbdev)
-      {
-	grub_term_unregister_input (&grub_usb_keyboards[i]);
-	grub_free ((char *) grub_usb_keyboards[i].name);
-	grub_usb_keyboards[i].name = NULL;
-	grub_free (grub_usb_keyboards[i].data);
-	grub_usb_keyboards[i].data = 0;
-      }
+    {
+      struct grub_usb_keyboard_data *data = grub_usb_keyboards[i].data;
+
+      if (!data)
+	continue;
+
+      if (data->usbdev != usbdev)
+	continue;
+
+      grub_term_unregister_input (&grub_usb_keyboards[i]);
+      grub_free ((char *) grub_usb_keyboards[i].name);
+      grub_usb_keyboards[i].name = NULL;
+      grub_free (grub_usb_keyboards[i].data);
+      grub_usb_keyboards[i].data = 0;
+    }
 }
 
 static int

From 2823526d28c3467accc7965fa8bd9fcce8df5fec Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Aug 2010 19:54:40 +0200
Subject: [PATCH 1398/1628] Acount for transfer->size being size-1 when
 counting *actual

---
 bus/usb/ohci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index 974bed6cd..7f757485c 100644
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -989,7 +989,7 @@ grub_ohci_transfer (grub_usb_controller_t dev,
         transfer->last_trans = tderr_virt->tr_index;
       else
         transfer->last_trans = -1;
-      *actual = transfer->size;
+      *actual = transfer->size + 1;
     }
 
   else if (err_halt) /* error, ED is halted by OHCI, i.e. can be modified */

From ccedc09bc702c4c7a1110b5527ebd2ae9ffac71d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Aug 2010 20:26:57 +0200
Subject: [PATCH 1399/1628] Make HID found dprintf instead of printf

---
 term/usb_keyboard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/term/usb_keyboard.c b/term/usb_keyboard.c
index b6bc05dbe..d875ac00a 100644
--- a/term/usb_keyboard.c
+++ b/term/usb_keyboard.c
@@ -153,7 +153,7 @@ grub_usb_keyboard_attach (grub_usb_device_t usbdev, int configno, int interfno)
   if (j == usbdev->config[configno].interf[interfno].descif->endpointcnt)
     return 0;
 
-  grub_printf ("HID found!\n");
+  grub_dprintf ("usb_keyboard", "HID found!\n");
 
   data = grub_malloc (sizeof (*data));
   if (!data)

From 2bd591d03ec75699072725f7993b8cd8d13b8728 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Sat, 21 Aug 2010 00:50:12 +0530
Subject: [PATCH 1400/1628] add USE_ASCII_FAILBACK define

---
 Makefile.am           | 2 --
 conf/Makefile.common  | 1 +
 grub-core/Makefile.am | 6 ++++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b0d374b75..a5c4a874d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,8 +78,6 @@ widthspec.h: widthspec.bin grub-bin2h
 	$(builddir)/grub-bin2h widthspec < $< > $@
 CLEANFILES += widthspec.h
 
-# XXX: TARGET_CFLAGS += -DUSE_ASCII_FAILBACK=1 -DHAVE_UNIFONT_WIDTHSPEC=1
-
 # Install config.h into platformdir
 platform_HEADERS = config.h
 
diff --git a/conf/Makefile.common b/conf/Makefile.common
index 3bb8b9c0e..511813404 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -21,6 +21,7 @@ if COND_i386_ieee1275
 endif
 if COND_mips_yeeloong
   CFLAGS_PLATFORM = -march=mips3 -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
+  CPPFLAGS_PLATFORM = -DUSE_ASCII_FAILBACK
   CCASFLAGS_PLATFORM = -march=mips3
 endif
 if COND_sparc64_ieee1275
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 770f1a6bb..cea7014b1 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -8,6 +8,12 @@ CC=$(TARGET_CC)
 CPP=$(TARGET_CC)
 CCAS=$(TARGET_CC)
 
+if COND_GRUB_MKFONT
+if COND_HAVE_FONT_SOURCE
+TARGET_CFLAGS += -DUSE_ASCII_FAILBACK=1 -DHAVE_UNIFONT_WIDTHSPEC=1
+endif
+endif
+
 AM_CFLAGS = $(TARGET_CFLAGS)
 AM_LDFLAGS = $(TARGET_LDFLAGS)
 AM_CPPFLAGS = $(TARGET_CPPFLAGS) $(CPPFLAGS_DEFAULT)

From 1420c1d54a33ae75a8bd6b902fc8f9cb961d804d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Aug 2010 21:25:20 +0200
Subject: [PATCH 1401/1628] Remove unused buffer0

---
 bus/usb/uhci.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index 69fae60fd..0bba24b54 100644
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -75,10 +75,8 @@ struct grub_uhci_td
      This is GRUB specific.  */
   grub_uint32_t linkptr2;
 
-  grub_uint32_t buffer0;
-
-  /* 2 additional 32 bits words reserved for the Host Controller Driver.  */
-  grub_uint32_t data[2];
+  /* 3 additional 32 bits words reserved for the Host Controller Driver.  */
+  grub_uint32_t data[3];
 } __attribute__ ((packed));
 
 typedef volatile struct grub_uhci_td *grub_uhci_td_t;
@@ -436,7 +434,6 @@ grub_uhci_transaction (struct grub_uhci *u, unsigned int endp,
 	       | (addr << 8) | tf[type]);
 
   td->buffer = data;
-  td->buffer0 = data;
 
   return td;
 }

From 41e46ae6484ba99a0a94965e393977fe941b681c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Aug 2010 21:26:04 +0200
Subject: [PATCH 1402/1628] Enable usbserial on yeeloong

---
 conf/mips-yeeloong.rmk | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 365ca1ca5..90949866c 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -97,6 +97,24 @@ usb_mod_SOURCES = bus/usb/usb.c bus/usb/usbtrans.c bus/usb/usbhub.c
 usb_mod_CFLAGS = $(COMMON_CFLAGS)
 usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For serial.mod.
+pkglib_MODULES += usbserial_common.mod
+usbserial_common_mod_SOURCES = bus/usb/serial/common.c
+usbserial_common_mod_CFLAGS = $(COMMON_CFLAGS)
+usbserial_common_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For serial.mod.
+pkglib_MODULES += usbserial_pl2303.mod
+usbserial_pl2303_mod_SOURCES = bus/usb/serial/pl2303.c
+usbserial_pl2303_mod_CFLAGS = $(COMMON_CFLAGS)
+usbserial_pl2303_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
+# For serial.mod.
+pkglib_MODULES += usbserial_ftdi.mod
+usbserial_ftdi_mod_SOURCES = bus/usb/serial/ftdi.c
+usbserial_ftdi_mod_CFLAGS = $(COMMON_CFLAGS)
+usbserial_ftdi_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # For usbtest.mod
 pkglib_MODULES += usbtest.mod
 usbtest_mod_SOURCES = commands/usbtest.c

From fb1d7b7975e3a6dde8e01cbbad43ba32c8f4b3e7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Aug 2010 21:26:27 +0200
Subject: [PATCH 1403/1628] Add ChangeLog

---
 ChangeLog | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 7d82e08fb..72a8d3601 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,82 @@
+2010-08-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	USB hotunplugging and USB serial support.
+
+	* bus/usb/ohci.c (grub_ohci_transfer): Fill *actual and respect timeout.
+	* bus/usb/uhci.c (grub_free_queue): Compute *actual.
+	(grub_uhci_transfer): Respect timeout and set *actual.
+	* bus/usb/usb.c (grub_usb_device_initialize): Correctly skip fields of
+	non-standard length.
+	(grub_usb_device_attach): Autoload modules.
+	(GRUB_MOD_INIT): Set grub_term_poll_usb.
+	(GRUB_MOD_FINI): Unset grub_term_poll_usb.
+	* bus/usb/usbhub.c (grub_usb_hub): Replace speed with devices. All
+	users updated.
+	(grub_usb_add_hub): Fill nports and children.
+	(attach_root_port): Receive hub instead of controller.
+	All users updated. Fill hub->devices.
+	(grub_usb_root_hub): Allocate hub->devices.
+	(detach_device): New function.
+	(poll_nonroot_hub): Fill children and detach devices.
+	* bus/usb/usbtrans.c (grub_usb_bulk_readwrite): Accept timeout and
+	actual arguments. All users updated.
+	(grub_usb_bulk_read_extended): New function.
+	* bus/usb/serial/common.c: New file.
+	* bus/usb/serial/ftdi.c: Likewise.
+	* bus/usb/serial/pl2303.c: Likewise.
+	* commands/terminal.c (handle_command): Support wildcard.
+	* commands/usbtest.c: Output "Unknown" instead of empty string.
+	* conf/any-emu.rmk (pkglib_MODULES): Add usbserial_common.mod.
+	(usbserial_common_mod_SOURCES): New variable.
+	(usbserial_common_mod_CFLAGS): Likewise.
+	(usbserial_common_mod_LDFLAGS): Likewise.
+	(pkglib_MODULES): Add usbserial_pl2303.mod.
+	(usbserial_pl2303_mod_SOURCES): New variable.
+	(usbserial_pl2303_mod_CFLAGS): Likewise.
+	(usbserial_pl2303_mod_LDFLAGS): Likewise.
+	(pkglib_MODULES): Add usbserial_ftdi.mod.
+	(usbserial_ftdi_mod_SOURCES): New variable.
+	(usbserial_ftdi_mod_CFLAGS): Likewise.
+	(usbserial_ftdi_mod_LDFLAGS): Likewise.
+	(pkglib_MODULES): Add serial.mod.
+	(serial_mod_SOURCES): New variable.
+	(serial_mod_CFLAGS): Likewise.
+	(serial_mod_LDFLAGS): Likewise.
+	* conf/i386-pc.rmk: Likewise.
+	* conf/mips-yeeloong.rmk: Likewise.
+	* conf/i386.rmk (serial_mod_SOURCES): Add term/ns8250.c.
+	* conf/mips-yeeloong.rmk (kernel_img_SOURCES): Likewise.
+	* disk/usbms.c (first_available_slot): New variable.
+	(grub_usbms_attach): Don't reuse free slots due to potential cache
+	problems.
+	* include/grub/serial.h: Moved to ..
+	* include/grub/ns8250.h: ...this.
+	* include/grub/serial.h: New file.
+	* include/grub/term.h (grub_term_poll_usb): New variable.
+	* include/grub/terminfo.h (grub_terminfo_input_state): Pass term to
+	readkey. All users updated.
+	(grub_terminfo_output_state): Pass term to put.
+	* include/grub/usb.h (GRUB_USB_REQTYPE): New enum.
+	(grub_usb_controller_dev): Add timeout and actual arguments to
+	transfer. All users updated.
+	(grub_usb_interface): New field detach_data.
+	(grub_usb_device): New fields children and nports.
+	(grub_usb_ep_type_t): New type.
+	(grub_usb_get_ep_type): New function.
+	(grub_usb_bulk_read_extended): Likewise.
+	* include/grub/usbdesc.h (grub_usb_desc): New type.
+	* include/grub/usbserial.h: New file.
+	* include/grub/usbtrans.h (grub_usb_transaction): New field preceding.
+	* kern/term.c (grub_term_poll_usb): New variable.
+	(grub_getkey): Call grub_term_poll_usb if set.
+	(grub_checkkey): Likewise.
+	(grub_getkeystatus): Likewise.
+	* term/serial.c: Moved controller-specific parts to ...
+	* term/ns8250.c: ... here.
+	* term/serial.c: Mostly rewritten.
+	* term/usb_keyboard.c: Reorganised to use GET_REPORT only on attaching
+	according to spec.
+
 2010-08-20  Colin Watson  <cjwatson@ubuntu.com>
 
 	* commands/i386/pc/sendkey.c (keysym_table): Rename "numlock" to

From d6f66ca2a0c9f4934f9512601da3b251d09dcfd0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 20 Aug 2010 21:31:33 +0200
Subject: [PATCH 1404/1628] Export serial-related functions from kernel

---
 conf/mips-yeeloong.rmk | 2 +-
 include/grub/serial.h  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
index 90949866c..9cbbdf472 100644
--- a/conf/mips-yeeloong.rmk
+++ b/conf/mips-yeeloong.rmk
@@ -5,7 +5,7 @@ COMMON_CFLAGS += -march=mips3
 COMMON_ASFLAGS += -march=mips3
 
 kernel_img_HEADERS += pci.h bitmap.h video.h gfxterm.h font.h \
-		      bitmap_scale.h bufio.h cs5536.h machine/pci.h
+		      bitmap_scale.h bufio.h cs5536.h machine/pci.h serial.h
 
 include $(srcdir)/conf/mips.mk
 
diff --git a/include/grub/serial.h b/include/grub/serial.h
index 68cec6fdf..652268b2e 100644
--- a/include/grub/serial.h
+++ b/include/grub/serial.h
@@ -88,9 +88,9 @@ struct grub_serial_port
   grub_term_input_t term_in;
 };
 
-grub_err_t grub_serial_register (struct grub_serial_port *port);
+grub_err_t EXPORT_FUNC(grub_serial_register) (struct grub_serial_port *port);
 
-void grub_serial_unregister (struct grub_serial_port *port);
+void EXPORT_FUNC(grub_serial_unregister) (struct grub_serial_port *port);
 
   /* Set default settings.  */
 static inline grub_err_t
@@ -114,6 +114,6 @@ grub_serial_config_defaults (struct grub_serial_port *port)
 void grub_ns8250_init (void);
 char *grub_serial_ns8250_add_port (grub_port_t port);
 extern struct grub_serial_driver grub_ns8250_driver;
-void grub_serial_unregister_driver (struct grub_serial_driver *driver);
+void EXPORT_FUNC(grub_serial_unregister_driver) (struct grub_serial_driver *driver);
 
 #endif

From dee5057594f6d3a20f9d574a3fd74e91193dffa1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 21 Aug 2010 00:57:12 +0200
Subject: [PATCH 1405/1628] 	* loader/multiboot.c (grub_cmd_module): Don't
 unzip module if 	--nounzip is passed.

---
 ChangeLog          |  5 +++++
 loader/multiboot.c | 16 +++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e840254ec..71a62267b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* loader/multiboot.c (grub_cmd_module): Don't unzip module if
+	--nounzip is passed.
+
 2010-08-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	USB hotunplugging and USB serial support.
diff --git a/loader/multiboot.c b/loader/multiboot.c
index 77a732838..b4ea8bf21 100644
--- a/loader/multiboot.c
+++ b/loader/multiboot.c
@@ -295,6 +295,17 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
   grub_ssize_t size;
   char *module = 0;
   grub_err_t err;
+  int nounzip = 0;
+
+  if (argc == 0)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no module specified");
+
+  if (grub_strcmp (argv[0], "--nounzip") == 0)
+    {
+      argv++;
+      argc--;
+      nounzip = 1;
+    }
 
   if (argc == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "no module specified");
@@ -303,7 +314,10 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
     return grub_error (GRUB_ERR_BAD_ARGUMENT,
 		       "you need to load the multiboot kernel first");
 
-  file = grub_gzfile_open (argv[0], 1);
+  if (nounzip)
+    file = grub_file_open (argv[0]);
+  else
+    file = grub_gzfile_open (argv[0], 1);
   if (! file)
     return grub_errno;
 

From b40ea81bc7924e4c0d25840ab545d2bb100ca9b6 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat, 21 Aug 2010 01:36:02 +0200
Subject: [PATCH 1406/1628] 2010-08-21  Samuel Thibault 
 <samuel.thibault@ens-lyon.org>

	* docs/grub.texi (GNU/Hurd): Document booting GNU/Hurd.
---
 ChangeLog      |  4 ++++
 docs/grub.texi | 25 ++++++++++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 71a62267b..89ebcce1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-21  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* docs/grub.texi (GNU/Hurd): Document booting GNU/Hurd.
+
 2010-08-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* loader/multiboot.c (grub_cmd_module): Don't unzip module if
diff --git a/docs/grub.texi b/docs/grub.texi
index 9845c7a6f..f533a029c 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -828,11 +828,30 @@ Since GNU/Hurd is Multiboot-compliant, it is easy to boot it; there is
 nothing special about it. But do not forget that you have to specify a
 root partition to the kernel.
 
-FIXME: this section is incomplete.
-
 @enumerate
 @item
-Run the command @command{boot} (@pxref{boot}).
+Set GRUB's root device to the same drive as GNU/Hurd's.  The command
+@code{search --file --set /boot/gnumach.gz} or similar may help you
+(@pxref{search}).
+
+@item 
+Load the kernel and the modules, like this:
+
+@example
+@group
+grub> @kbd{multiboot /boot/gnumach.gz root=device:hd0s1}
+grub> @kbd{module  /hurd/ext2fs.static ext2fs --readonly \
+                   --multiboot-command-line='$@{kernel-command-line@}' \
+                   --host-priv-port='$@{host-port@}' \
+                   --device-master-port='$@{device-port@}' \
+                   --exec-server-task='$@{exec-task@}' -T typed '$@{root@}' \
+                   '$(task-create)' '$(task-resume)'}
+grub> @kbd{module /lib/ld.so.1 exec /hurd/exec '$(exec-task=task-create)'}
+@end group
+@end example
+
+@item
+Finally, run the command @command{boot} (@pxref{boot}).
 @end enumerate
 
 

From df2624193935a23459b39d27334a8fe714b78057 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 21 Aug 2010 02:09:16 +0200
Subject: [PATCH 1407/1628] 	* include/grub/usb.h (grub_usb_device): Add
 'data' field back. It's 	needed by libusb wrapper.

---
 ChangeLog          | 5 +++++
 include/grub/usb.h | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 89ebcce1a..6b6a82a35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-21  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/usb.h (grub_usb_device): Add 'data' field back. It's
+	needed by libusb wrapper.
+
 2010-08-21  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* docs/grub.texi (GNU/Hurd): Document booting GNU/Hurd.
diff --git a/include/grub/usb.h b/include/grub/usb.h
index 674f7ec46..bb3336580 100644
--- a/include/grub/usb.h
+++ b/include/grub/usb.h
@@ -178,6 +178,9 @@ struct grub_usb_device
   /* Data toggle values (used for bulk transfers only).  */
   int toggle[256];
 
+  /* Used by libusb wrapper.  Schedulded for removal. */
+  void *data;
+
   /* Array of children for a hub.  */
   grub_usb_device_t *children;
 

From bdf0d623215fb98d5c910f632978f5c90d8e3563 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Sat, 21 Aug 2010 09:48:27 +0530
Subject: [PATCH 1408/1628] review comments

---
 Makefile.am              |  2 +-
 Makefile.util.def        |  2 ++
 conf/Makefile.common     |  3 ---
 conf/Makefile.extra-dist | 54 ++++------------------------------------
 configure.ac             |  6 ++---
 docs/Makefile.am         |  2 +-
 grub-core/Makefile.am    |  3 +--
 7 files changed, 12 insertions(+), 60 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a5c4a874d..4b7aa5e3a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ CLEANFILES += libgrub_a_init.c
 
 if COND_GRUB_MKFONT
 if COND_HAVE_FONT_SOURCE
-pkgdata_DATA = unicode.pf2 ascii.pf2 ascii.h
+pkgdata_DATA = unicode.pf2 ascii.pf2 ascii.h widthspec.h
 endif
 endif
 
diff --git a/Makefile.util.def b/Makefile.util.def
index 50b5ac0d6..d44fbabdf 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -268,6 +268,7 @@ script = {
   installdir = grubconf;
 };
 
+/*
 script = {
   name = '10_windows';
   source = util/grub.d/10_windows.in;
@@ -279,6 +280,7 @@ script = {
   source = util/grub.d/10_hurd.in;
   installdir = grubconf;
 };
+*/
 
 script = {
   name = '10_linux';
diff --git a/conf/Makefile.common b/conf/Makefile.common
index 511813404..9637c0f7c 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -77,9 +77,6 @@ CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap
 CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -D_GL_UNUSED="__attribute__ ((unused))"
 CPPFLAGS_GNULIB = -I$(top_srcdir)/grub-core/gnulib
 
-CFLAGS_MKISOFS = -Wno-all -Werror
-CPPFLAGS_MKISOFS = -D_FILE_OFFSET_BITS=64 -I$(top_srcdir)/util/mkisofs/include
-
 CFLAGS_POSIX = -fno-builtin
 CPPFLAGS_POSIX = -I$(top_srcdir)/grub-core/lib/posix_wrap
 
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
index 17a169284..3acef7af7 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -1,5 +1,3 @@
-EXTRA_DIST += $(shell find $(top_srcdir)/include -name '*.h')
-
 EXTRA_DIST += autogen.sh
 EXTRA_DIST += geninit.sh
 
@@ -28,50 +26,8 @@ EXTRA_DIST += grub-core/genterminallist.sh
 EXTRA_DIST += grub-core/genparttoollist.sh
 EXTRA_DIST += grub-core/genemuinitheader.sh
 
-EXTRA_DIST += grub-core/gnulib/getopt.h
-EXTRA_DIST += grub-core/gnulib/argp-version-etc.h
-EXTRA_DIST += grub-core/gnulib/fnmatch.h
-EXTRA_DIST += grub-core/gnulib/error.h
-EXTRA_DIST += grub-core/gnulib/argp-namefrob.h
-EXTRA_DIST += grub-core/gnulib/argp.h
-EXTRA_DIST += grub-core/gnulib/argp-fmtstream.h
-EXTRA_DIST += grub-core/gnulib/gettext.h
-EXTRA_DIST += grub-core/gnulib/regex_internal.h
-EXTRA_DIST += grub-core/gnulib/progname.h
-EXTRA_DIST += grub-core/gnulib/regex.h
-EXTRA_DIST += grub-core/gnulib/alloca.h
-EXTRA_DIST += grub-core/gnulib/getopt_int.h
-EXTRA_DIST += grub-core/efiemu/runtime/config.h
-
-EXTRA_DIST += grub-core/lib/posix_wrap/localcharset.h
-EXTRA_DIST += grub-core/lib/posix_wrap/ctype.h
-EXTRA_DIST += grub-core/lib/posix_wrap/limits.h
-EXTRA_DIST += grub-core/lib/posix_wrap/stdio.h
-EXTRA_DIST += grub-core/lib/posix_wrap/sys/types.h
-EXTRA_DIST += grub-core/lib/posix_wrap/unistd.h
-EXTRA_DIST += grub-core/lib/posix_wrap/locale.h
-EXTRA_DIST += grub-core/lib/posix_wrap/wchar.h
-EXTRA_DIST += grub-core/lib/posix_wrap/string.h
-EXTRA_DIST += grub-core/lib/posix_wrap/langinfo.h
-EXTRA_DIST += grub-core/lib/posix_wrap/wctype.h
-EXTRA_DIST += grub-core/lib/posix_wrap/stdint.h
-EXTRA_DIST += grub-core/lib/posix_wrap/stdlib.h
-EXTRA_DIST += grub-core/lib/posix_wrap/assert.h
-EXTRA_DIST += grub-core/lib/posix_wrap/errno.h
-
-EXTRA_DIST += grub-core/lib/libgcrypt_wrap/cipher_wrap.h
-EXTRA_DIST += grub-core/lib/libgcrypt/cipher/rijndael-tables.h
-EXTRA_DIST += grub-core/lib/libgcrypt/cipher/bithelp.h
-EXTRA_DIST += grub-core/lib/libgcrypt/cipher/rmd.h
-EXTRA_DIST += grub-core/lib/libgcrypt/cipher/hash-common.h
-EXTRA_DIST += grub-core/lib/libgcrypt/cipher/camellia.h
-
-EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/types.h
-EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/cipher.h
-EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/rijndael-tables.h
-EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/memory.h
-EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/bithelp.h
-EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/g10lib.h
-EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/rmd.h
-EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/hash-common.h
-EXTRA_DIST += grub-core/lib/libgcrypt-grub/cipher/camellia.h
+EXTRA_DIST += $(shell find $(top_srcdir)/include -name '*.h')
+EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/gnulib -name '*.h')
+EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/efiemu -name '*.h')
+EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/lib/posix_wrap -name '*.h')
+EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/lib/libgcrypt_wrap -name '*.h')
diff --git a/configure.ac b/configure.ac
index cd0869187..b57a8580a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,13 +71,11 @@ case "$target_cpu" in
   sparc)	target_cpu=sparc64 ;;
   mipsel|mips64el)
                 target_cpu=mips;
-		HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_CPU_MIPSEL=1";
-		TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DGRUB_CPU_MIPSEL=1";
+		machine_CFLAGS="-DGRUB_CPU_MIPSEL=1";
 		;;
   mips|mips64)
                 target_cpu=mips;
-		HOST_CPPFLAGS="$HOST_CPPFLAGS -DGRUB_CPU_MIPS=1";
-		TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DGRUB_CPU_MIPS=1";
+		machine_CFLAGS="-DGRUB_CPU_MIPS=1";
 		;;
 esac
 
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 103240bcc..8d9fb8445 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
-AM_MAKEINFOFLAGS = --force --no-split --no-validate
+# AM_MAKEINFOFLAGS = --no-split --no-validate
 info_TEXINFOS = grub.texi
 grub_TEXINFOS = fdl.texi
 
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index cea7014b1..83101e650 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -34,8 +34,7 @@ gentrigtables: gentrigtables.c
 CLEANFILES += gentrigtables
 
 # trigtables.c
-trigtables.c: gentrigtables.c $(top_srcdir)/configure.ac
-	$(MAKE) $(AM_MAKEFLAGS) gentrigtables
+trigtables.c: gentrigtables gentrigtables.c $(top_srcdir)/configure.ac
 	$(builddir)/gentrigtables > $@
 CLEANFILES += trigtables.c
 

From 8427685faa8304f13c75ca0185584b05b610a449 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Sat, 21 Aug 2010 14:27:31 +0530
Subject: [PATCH 1409/1628] *_sources now collect all values of all its groups

---
 Makefile.util.def           | 286 +++++++-------
 gentpl.py                   | 195 +++++++---
 grub-core/Makefile.core.def | 739 ++++++++++++++++--------------------
 util/import_gcry.py         |   2 +-
 4 files changed, 606 insertions(+), 616 deletions(-)

diff --git a/Makefile.util.def b/Makefile.util.def
index d44fbabdf..04b3d6f1c 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -5,100 +5,99 @@ library = {
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
 
-  nodist = grub_script.tab.c;
-  nodist = grub_script.yy.c;
-  nodist = libgrub_a_init.c;
+  common_nodist = grub_script.tab.c;
+  common_nodist = grub_script.yy.c;
+  common_nodist = libgrub_a_init.c;
+  common_nodist = grub_script.yy.h;
+  common_nodist = grub_script.tab.h;
 
-  source = grub-core/gnulib/error.c;
-  source = grub-core/gnulib/fnmatch.c;
-  source = grub-core/gnulib/getdelim.c;
-  source = grub-core/gnulib/getline.c;
-  source = grub-core/gnulib/getopt1.c;
-  source = grub-core/gnulib/getopt.c;
-  source = grub-core/gnulib/progname.c;
+  common = grub-core/gnulib/error.c;
+  common = grub-core/gnulib/fnmatch.c;
+  common = grub-core/gnulib/getdelim.c;
+  common = grub-core/gnulib/getline.c;
+  common = grub-core/gnulib/getopt1.c;
+  common = grub-core/gnulib/getopt.c;
+  common = grub-core/gnulib/progname.c;
 
-  source = util/misc.c;
-  source = grub-core/kern/misc.c;
-  source = grub-core/kern/emu/mm.c;
-  source = grub-core/kern/emu/misc.c;
-  source = grub-core/kern/emu/hostfs.c;
-  source = grub-core/kern/emu/getroot.c;
-  source = grub-core/kern/emu/hostdisk.c;
+  common = util/misc.c;
+  common = grub-core/kern/misc.c;
+  common = grub-core/kern/emu/mm.c;
+  common = grub-core/kern/emu/misc.c;
+  common = grub-core/kern/emu/hostfs.c;
+  common = grub-core/kern/emu/getroot.c;
+  common = grub-core/kern/emu/hostdisk.c;
 
-  source = grub-core/commands/blocklist.c;
-  source = grub-core/commands/extcmd.c;
-  source = grub-core/commands/ls.c;
-  source = grub-core/disk/dmraid_nvidia.c;
-  source = grub-core/disk/host.c;
-  source = grub-core/disk/loopback.c;
-  source = grub-core/disk/lvm.c;
-  source = grub-core/disk/mdraid_linux.c;
-  source = grub-core/disk/raid5_recover.c;
-  source = grub-core/disk/raid6_recover.c;
-  source = grub-core/disk/raid.c;
-  source = grub-core/fs/affs.c;
-  source = grub-core/fs/afs_be.c;
-  source = grub-core/fs/afs.c;
-  source = grub-core/fs/befs_be.c;
-  source = grub-core/fs/befs.c;
-  source = grub-core/fs/cpio.c;
-  source = grub-core/fs/ext2.c;
-  source = grub-core/fs/fat.c;
-  source = grub-core/fs/fshelp.c;
-  source = grub-core/fs/hfs.c;
-  source = grub-core/fs/hfsplus.c;
-  source = grub-core/fs/iso9660.c;
-  source = grub-core/fs/jfs.c;
-  source = grub-core/fs/minix.c;
-  source = grub-core/fs/nilfs2.c;
-  source = grub-core/fs/ntfs.c;
-  source = grub-core/fs/ntfscomp.c;
-  source = grub-core/fs/reiserfs.c;
-  source = grub-core/fs/sfs.c;
-  source = grub-core/fs/tar.c;
-  source = grub-core/fs/udf.c;
-  source = grub-core/fs/ufs2.c;
-  source = grub-core/fs/ufs.c;
-  source = grub-core/fs/xfs.c;
-  source = grub-core/kern/command.c;
-  source = grub-core/kern/device.c;
-  source = grub-core/kern/disk.c;
-  source = grub-core/kern/env.c;
-  source = grub-core/kern/err.c;
-  source = grub-core/kern/file.c;
-  source = grub-core/kern/fs.c;
-  source = grub-core/kern/list.c;
-  source = grub-core/kern/partition.c;
-  source = grub-core/lib/arg.c;
-  source = grub-core/lib/crc.c;
-  source = grub-core/lib/crypto.c;
-  source = grub-core/lib/envblk.c;
-  source = grub-core/lib/hexdump.c;
-  source = grub-core/lib/libgcrypt-grub/cipher/sha512.c;
-  source = grub-core/lib/LzFind.c;
-  source = grub-core/lib/LzmaEnc.c;
-  source = grub-core/lib/pbkdf2.c;
-  source = grub-core/normal/datetime.c;
-  source = grub-core/normal/misc.c;
-  source = grub-core/partmap/acorn.c;
-  source = grub-core/partmap/amiga.c;
-  source = grub-core/partmap/apple.c;
-  source = grub-core/partmap/gpt.c;
-  source = grub-core/partmap/msdos.c;
-  source = grub-core/partmap/sun.c;
-  source = grub-core/script/function.c;
-  source = grub-core/script/lexer.c;
-  source = grub-core/script/main.c;
-  source = grub-core/script/script.c;
-  source = grub-core/script/argv.c;
-
-  nodist = grub_script.yy.h;
-  nodist = grub_script.tab.h;
+  common = grub-core/commands/blocklist.c;
+  common = grub-core/commands/extcmd.c;
+  common = grub-core/commands/ls.c;
+  common = grub-core/disk/dmraid_nvidia.c;
+  common = grub-core/disk/host.c;
+  common = grub-core/disk/loopback.c;
+  common = grub-core/disk/lvm.c;
+  common = grub-core/disk/mdraid_linux.c;
+  common = grub-core/disk/raid5_recover.c;
+  common = grub-core/disk/raid6_recover.c;
+  common = grub-core/disk/raid.c;
+  common = grub-core/fs/affs.c;
+  common = grub-core/fs/afs_be.c;
+  common = grub-core/fs/afs.c;
+  common = grub-core/fs/befs_be.c;
+  common = grub-core/fs/befs.c;
+  common = grub-core/fs/cpio.c;
+  common = grub-core/fs/ext2.c;
+  common = grub-core/fs/fat.c;
+  common = grub-core/fs/fshelp.c;
+  common = grub-core/fs/hfs.c;
+  common = grub-core/fs/hfsplus.c;
+  common = grub-core/fs/iso9660.c;
+  common = grub-core/fs/jfs.c;
+  common = grub-core/fs/minix.c;
+  common = grub-core/fs/nilfs2.c;
+  common = grub-core/fs/ntfs.c;
+  common = grub-core/fs/ntfscomp.c;
+  common = grub-core/fs/reiserfs.c;
+  common = grub-core/fs/sfs.c;
+  common = grub-core/fs/tar.c;
+  common = grub-core/fs/udf.c;
+  common = grub-core/fs/ufs2.c;
+  common = grub-core/fs/ufs.c;
+  common = grub-core/fs/xfs.c;
+  common = grub-core/kern/command.c;
+  common = grub-core/kern/device.c;
+  common = grub-core/kern/disk.c;
+  common = grub-core/kern/env.c;
+  common = grub-core/kern/err.c;
+  common = grub-core/kern/file.c;
+  common = grub-core/kern/fs.c;
+  common = grub-core/kern/list.c;
+  common = grub-core/kern/partition.c;
+  common = grub-core/lib/arg.c;
+  common = grub-core/lib/crc.c;
+  common = grub-core/lib/crypto.c;
+  common = grub-core/lib/envblk.c;
+  common = grub-core/lib/hexdump.c;
+  common = grub-core/lib/libgcrypt-grub/cipher/sha512.c;
+  common = grub-core/lib/LzFind.c;
+  common = grub-core/lib/LzmaEnc.c;
+  common = grub-core/lib/pbkdf2.c;
+  common = grub-core/normal/datetime.c;
+  common = grub-core/normal/misc.c;
+  common = grub-core/partmap/acorn.c;
+  common = grub-core/partmap/amiga.c;
+  common = grub-core/partmap/apple.c;
+  common = grub-core/partmap/gpt.c;
+  common = grub-core/partmap/msdos.c;
+  common = grub-core/partmap/sun.c;
+  common = grub-core/script/function.c;
+  common = grub-core/script/lexer.c;
+  common = grub-core/script/main.c;
+  common = grub-core/script/script.c;
+  common = grub-core/script/argv.c;
 };
 
 program = {
   name = grub-bin2h;
-  source = util/bin2h.c;
+  common = util/bin2h.c;
   ldadd = libgrub.a;
   ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
   mansection = 1;
@@ -108,8 +107,8 @@ program = {
   name = grub-mkimage;
   mansection = 1;
 
-  source = util/grub-mkimage.c;
-  source = util/resolve.c;
+  common = util/grub-mkimage.c;
+  common = util/resolve.c;
   extra_dist = util/grub-mkimagexx.c;
 
   ldadd = libgrub.a;
@@ -121,7 +120,7 @@ program = {
   name = grub-mkrelpath;
   mansection = 1;
 
-  source = util/grub-mkrelpath.c;
+  common = util/grub-mkrelpath.c;
 
   ldadd = libgrub.a;
   ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
@@ -131,7 +130,7 @@ program = {
   name = grub-script-check;
   mansection = 1;
 
-  source = util/grub-script-check.c;
+  common = util/grub-script-check.c;
 
   ldadd = libgrub.a;
   ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
@@ -141,7 +140,7 @@ program = {
   name = grub-editenv;
   mansection = 1;
 
-  source = util/grub-editenv.c;
+  common = util/grub-editenv.c;
 
   ldadd = libgrub.a;
   ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
@@ -151,7 +150,7 @@ program = {
   name = grub-mkpasswd-pbkdf2;
   mansection = 1;
 
-  source = util/grub-mkpasswd-pbkdf2.c;
+  common = util/grub-mkpasswd-pbkdf2.c;
 
   ldadd = libgrub.a;
   ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
@@ -162,14 +161,14 @@ program = {
 program = {
   name = grub-macho2img;
   mansection = 1;
-  source = util/grub-macho2img.c;
+  common = util/grub-macho2img.c;
   condition = COND_APPLE_CC;
 };
 
 program = {
   name = grub-pe2elf;
   mansection = 1;
-  source = util/grub-pe2elf.c;
+  common = util/grub-pe2elf.c;
 
   ldadd = libgrub.a;
   ldflags = '$(LIBINTL)';
@@ -179,7 +178,7 @@ program = {
 program = {
   name = grub-fstest;
   mansection = 1;
-  source = util/grub-fstest.c;
+  common = util/grub-fstest.c;
 
   ldadd = libgrub.a;
   ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
@@ -189,8 +188,8 @@ program = {
 program = {
   name = grub-mkfont;
   mansection = 1;
-  source = util/grub-mkfont.c;
-  source = grub-core/unidata.c;
+  common = util/grub-mkfont.c;
+  common = grub-core/unidata.c;
 
   cflags = '$(freetype_cflags)';
 
@@ -204,9 +203,9 @@ program = {
   name = grub-mkdevicemap;
   installdir = sbin;
   mansection = 8;
-  source = util/grub-mkdevicemap.c;
-  source = util/deviceiter.c;
-  source = util/devicemap.c;
+  nosparc64 = util/grub-mkdevicemap.c;
+  nosparc64 = util/deviceiter.c;
+  nosparc64 = util/devicemap.c;
 
   sparc64_ieee1275 = util/grub-mkdevicemap.c;
   sparc64_ieee1275 = util/deviceiter.c;
@@ -221,7 +220,7 @@ program = {
   name = grub-probe;
   installdir = sbin;
   mansection = 8;
-  source = util/grub-probe.c;
+  common = util/grub-probe.c;
 
   ldadd = libgrub.a;
   ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
@@ -250,66 +249,66 @@ program = {
 program = {
   name = grub-ofpathname;
   installdir = sbin;
-  source = util/ieee1275/grub-ofpathname.c;
-  source = util/ieee1275/ofpath.c;
+  ieee1275 = util/ieee1275/grub-ofpathname.c;
+  ieee1275 = util/ieee1275/ofpath.c;
 
   ldadd = libgrub.a;
   enable = sparc64_ieee1275;
 };
 
 data = {
-  source = util/grub.d/README;
+  common = util/grub.d/README;
   installdir = grubconf;
 };
 
 script = {
   name = '00_header';
-  source = util/grub.d/00_header.in;
+  common = util/grub.d/00_header.in;
   installdir = grubconf;
 };
 
 /*
 script = {
   name = '10_windows';
-  source = util/grub.d/10_windows.in;
+  common = util/grub.d/10_windows.in;
   installdir = grubconf;
 };
 
 script = {
   name = '10_hurd';
-  source = util/grub.d/10_hurd.in;
+  common = util/grub.d/10_hurd.in;
   installdir = grubconf;
 };
 */
 
 script = {
   name = '10_linux';
-  source = util/grub.d/10_linux.in;
+  common = util/grub.d/10_linux.in;
   installdir = grubconf;
 };
 
 script = {
   name = '30_os-prober';
-  source = util/grub.d/30_os-prober.in;
+  common = util/grub.d/30_os-prober.in;
   installdir = grubconf;
 };
 
 script = {
   name = '40_custom';
-  source = util/grub.d/40_custom.in;
+  common = util/grub.d/40_custom.in;
   installdir = grubconf;
 };
 
 script = {
   name = '41_custom';
-  source = util/grub.d/41_custom.in;
+  common = util/grub.d/41_custom.in;
   installdir = grubconf;
 };
 
 script = {
   mansection = 1;
   name = grub-mkrescue;
-  source = util/grub-mkrescue.in;
+  i386_pc_qemu_coreboot = util/grub-mkrescue.in;
   powerpc_ieee1275 = util/powerpc/ieee1275/grub-mkrescue.in;
   enable = i386_pc;
   enable = i386_qemu;
@@ -321,7 +320,10 @@ script = {
   mansection = 8;
   installdir = sbin;
   name = grub-install;
-  source = util/grub-install.in;
+
+  mips = util/grub-install.in;
+  i386_noefi_noieee1275 = util/grub-install.in;
+
   x86_efi = util/i386/efi/grub-install.in;
   i386_ieee1275 = util/ieee1275/grub-install.in;
   powerpc_ieee1275 = util/ieee1275/grub-install.in;
@@ -333,151 +335,151 @@ script = {
 
 script = {
   name = grub-mkconfig;
-  source = util/grub-mkconfig.in;
+  common = util/grub-mkconfig.in;
   mansection = 8;
   installdir = sbin;
 };
 
 script = {
   name = grub-set-default;
-  source = util/grub-set-default.in;
+  common = util/grub-set-default.in;
   mansection = 8;
   installdir = sbin;
 };
 
 script = {
   name = grub-reboot;
-  source = util/grub-reboot.in;
+  common = util/grub-reboot.in;
   mansection = 8;
   installdir = sbin;
 };
 
 script = {
   name = grub-mkconfig_lib;
-  source = util/grub-mkconfig_lib.in;
+  common = util/grub-mkconfig_lib.in;
   installdir = pkglib;
 };
 
 script = {
   name = update-grub_lib;
-  source = util/update-grub_lib.in;
+  common = util/update-grub_lib.in;
   installdir = pkglib;
 };
 
 script = {
   name = grub-shell;
-  source = tests/util/grub-shell.in;
+  common = tests/util/grub-shell.in;
 };
 
 script = {
   name = grub-shell-tester;
-  source = tests/util/grub-shell-tester.in;
+  common = tests/util/grub-shell-tester.in;
 };
 
 script = {
   testcase;
   name = example_scripted_test;
-  source = tests/example_scripted_test.in;
+  common = tests/example_scripted_test.in;
 };
 
 script = {
   testcase;
   name = example_grub_script_test;
-  source = tests/example_grub_script_test.in;
+  common = tests/example_grub_script_test.in;
 };
 
 script = {
   testcase;
   name = grub_script_echo1;
-  source = tests/grub_script_echo1.in;
+  common = tests/grub_script_echo1.in;
 };
 
 script = {
   testcase;
   name = grub_script_echo_keywords;
-  source = tests/grub_script_echo_keywords.in;
+  common = tests/grub_script_echo_keywords.in;
 };
 
 script = {
   testcase;
   name = grub_script_vars1;
-  source = tests/grub_script_vars1.in;
+  common = tests/grub_script_vars1.in;
 };
 
 script = {
   testcase;
   name = grub_script_for1;
-  source = tests/grub_script_for1.in;
+  common = tests/grub_script_for1.in;
 };
 
 script = {
   testcase;
   name = grub_script_while1;
-  source = tests/grub_script_while1.in;
+  common = tests/grub_script_while1.in;
 };
 
 script = {
   testcase;
   name = grub_script_if;
-  source = tests/grub_script_if.in;
+  common = tests/grub_script_if.in;
 };
 
 script = {
   testcase;
   name = grub_script_blanklines;
-  source = tests/grub_script_blanklines.in;
+  common = tests/grub_script_blanklines.in;
 };
 
 script = {
   testcase;
   name = grub_script_final_semicolon;
-  source = tests/grub_script_final_semicolon.in;
+  common = tests/grub_script_final_semicolon.in;
 };
 
 script = {
   testcase;
   name = grub_script_dollar;
-  source = tests/grub_script_dollar.in;
+  common = tests/grub_script_dollar.in;
 };
 
 script = {
   testcase;
   name = grub_script_comments;
-  source = tests/grub_script_comments.in;
+  common = tests/grub_script_comments.in;
 };
 
 script = {
   testcase;
   name = grub_script_functions;
-  source = tests/grub_script_functions.in;
+  common = tests/grub_script_functions.in;
 };
 
 script = {
   testcase;
   name = grub_script_break;
-  source = tests/grub_script_break.in;
+  common = tests/grub_script_break.in;
 };
 
 script = {
   testcase;
   name = grub_script_continue;
-  source = tests/grub_script_continue.in;
+  common = tests/grub_script_continue.in;
 };
 
 script = {
   testcase;
   name = grub_script_shift;
-  source = tests/grub_script_shift.in;
+  common = tests/grub_script_shift.in;
 };
 
 program = {
   testcase;
   name = example_unit_test;
-  source = tests/example_unit_test.c;
-  source = tests/lib/unit_test.c;
-  source = grub-core/kern/list.c;
-  source = grub-core/kern/misc.c;
-  source = grub-core/tests/lib/test.c;
+  common = tests/example_unit_test.c;
+  common = tests/lib/unit_test.c;
+  common = grub-core/kern/list.c;
+  common = grub-core/kern/misc.c;
+  common = grub-core/tests/lib/test.c;
   cflags = -Wno-format;
   ldadd = libgrub.a;
   ldflags = '$(LIBDEVMAPPER)';
diff --git a/gentpl.py b/gentpl.py
index 59950bb0e..18672bdcd 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -10,17 +10,44 @@ GRUB_PLATFORMS = [ "emu", "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot",
                    "powerpc_ieee1275" ]
 
 GROUPS = {}
-GROUPS["i386"]    = [ "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot", "i386_multiboot", "i386_ieee1275" ]
-GROUPS["x86_64"]  = [ "x86_64_efi" ]
-GROUPS["mips"]    = [ "mips_yeeloong" ]
-GROUPS["sparc64"] = [ "sparc64_ieee1275" ]
-GROUPS["powerpc"] = [ "powerpc_ieee1275" ]
-GROUPS["x86"]     = GROUPS["i386"] + GROUPS["x86_64"]
-GROUPS["x86_efi"] = [ "i386_efi", "x86_64_efi" ]
-GROUPS["ieee1275"] = [ "i386_ieee1275", "sparc64_ieee1275", "powerpc_ieee1275" ]
+GROUPS["i386"]     = [ "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot", "i386_multiboot", "i386_ieee1275" ]
+GROUPS["x86_64"]   = [ "x86_64_efi" ]
+GROUPS["x86"]      = GROUPS["i386"] + GROUPS["x86_64"]
+GROUPS["x86_efi"]  = [ "i386_efi", "x86_64_efi" ]
+
+GROUPS["nopc"] = GRUB_PLATFORMS[:]; GROUPS["nopc"].remove("i386_pc")
+
+GROUPS["x86_noefi"] = GROUPS["x86"][:]; GROUPS["x86_noefi"].remove("i386_efi"); GROUPS["x86_noefi"].remove("x86_64_efi")
+GROUPS["i386_noefi"] = GROUPS["i386"][:]; GROUPS["i386_noefi"].remove("i386_efi")
+
+GROUPS["x86_noieee1275"] = GROUPS["x86"][:]; GROUPS["x86_noieee1275"].remove("i386_ieee1275")
+GROUPS["i386_noieee1275"] = GROUPS["i386"][:]; GROUPS["i386_noieee1275"].remove("i386_ieee1275")
+
+GROUPS["i386_noefi_noieee1275"] = GROUPS["i386_noefi"][:]; GROUPS["i386_noefi_noieee1275"].remove("i386_ieee1275")
+
+GROUPS["i386_pc_qemu_coreboot"] = ["i386_pc", "i386_qemu", "i386_coreboot"]
+GROUPS["i386_coreboot_multiboot"] = ["i386_coreboot", "i386_multiboot"]
+GROUPS["i386_coreboot_multiboot_qemu"] = ["i386_coreboot", "i386_multiboot", "i386_qemu"]
+GROUPS["i386_pc_coreboot_multiboot_qemu"] = ["i386_pc", "i386_coreboot", "i386_multiboot", "i386_qemu"]
+
+GROUPS["mips"]     = [ "mips_yeeloong" ]
+GROUPS["sparc64"]  = [ "sparc64_ieee1275" ]
+GROUPS["powerpc"]  = [ "powerpc_ieee1275" ]
+
+GROUPS["nosparc64"] = GRUB_PLATFORMS[:]; GROUPS["nosparc64"].remove("sparc64_ieee1275")
+GROUPS["x86_noefi_mips"] = GROUPS["x86_noefi"] + GROUPS["mips"]
+
+GROUPS["ieee1275"]   = [ "i386_ieee1275", "sparc64_ieee1275", "powerpc_ieee1275" ]
+GROUPS["noieee1275"] = GRUB_PLATFORMS[:]
+for i in GROUPS["ieee1275"]: GROUPS["noieee1275"].remove(i)
+
 GROUPS["pci"]      = GROUPS["x86"] + GROUPS["mips"]
-GROUPS["nonemu"]  = GRUB_PLATFORMS[:]
-GROUPS["nonemu"].remove("emu")
+
+GROUPS["noemu"]   = GRUB_PLATFORMS[:]; GROUPS["noemu"].remove("emu")
+GROUPS["noemu_noieee1275"] = GRUB_PLATFORMS[:]
+for i in ["emu"] + GROUPS["ieee1275"]: GROUPS["noemu_noieee1275"].remove(i)
+
+GROUPS["common"]   = GRUB_PLATFORMS[:]
 
 #
 # Create platform => groups reverse map, where groups covering that
@@ -111,7 +138,19 @@ def if_platform_tagged(platform, tag, snippet_if, snippet_else=None):
     return r
 
 #
-# Template for handling platform specific values, for example:
+# Template for tagged values
+#
+# module = {
+#   extra_dist = ...
+#   extra_dist = ...
+#   ...
+# };
+#
+def foreach_value(tag, closure):
+    return "[+ FOR " + tag + " +]" + closure("[+ ." + tag + " +]") + "[+ ENDFOR +]"
+
+#
+# Template for handling best matched values for a platform, for example:
 #
 # module = {
 #   cflags = '-Wall';
@@ -119,7 +158,7 @@ def if_platform_tagged(platform, tag, snippet_if, snippet_else=None):
 #   ...
 # }
 #
-def foreach_platform_value(platform, tag, suffix, closure):
+def foreach_platform_specific_value(platform, suffix, nonetag, closure):
     r = ""
     for group in RMAP[platform]:
         gtag = group + suffix
@@ -130,10 +169,46 @@ def foreach_platform_value(platform, tag, suffix, closure):
             r += "[+ ELIF " + gtag + " +]"
 
         r += "[+ FOR " + gtag + " +]" + closure("[+ ." + gtag + " +]") + "[+ ENDFOR +]"
-    r += "[+ ELSE +][+ FOR " + tag + " +]" + closure("[+ ." + tag + " +]") + "[+ ENDFOR +][+ ENDIF +]"
+    r += "[+ ELSE +][+ FOR " + nonetag + " +]" + closure("[+ ." + nonetag + " +]") + "[+ ENDFOR +][+ ENDIF +]"
     return r
 
-def each_platform(closure):
+#
+# Template for handling values from sum of all groups for a platform,
+# for example:
+#
+# module = {
+#   common = kern/misc.c;
+#   emu = kern/emu/misc.c;
+#   ...
+# }
+#
+def foreach_platform_value (platform, suffix, closure):
+    r = ""
+    for group in RMAP[platform]:
+        gtag = group + suffix
+
+        r += "[+ IF " + gtag + " +]"
+        r += "[+ FOR " + gtag + " +]" + closure("[+ ." + gtag + " +]") + "[+ ENDFOR +]"
+        r += "[+ ENDIF +]"
+    return r
+
+#
+# Template for gaurding with platform specific "enable" keys, for example:
+#
+#  module = {
+#    name = pci;
+#    noemu = bus/pci.c;
+#    emu = bus/emu/pci.c;
+#    emu = commands/lspci.c;
+#
+#    enable = emu;
+#    enable = i386_pc;
+#    enable = x86_efi;
+#    enable = i386_ieee1275;
+#    enable = i386_coreboot;
+#  };
+#
+def foreach_enabled_platform(closure):
     r = "[+ IF - enable undefined +]"
     for platform in GRUB_PLATFORMS:
         r += "\nif COND_" + platform + "\n" + closure(platform) + "endif\n"
@@ -144,30 +219,49 @@ def each_platform(closure):
     r += "[+ ENDIF +]"
     return r
 
+#
+# Template for gaurding with platform specific automake conditionals,
+# for example:
+#
+#  module = {
+#    name = usb;
+#    common = bus/usb/usb.c;
+#    noemu = bus/usb/usbtrans.c;
+#    noemu = bus/usb/usbhub.c;
+#    enable = emu;
+#    enable = i386;
+#    enable = mips_yeeloong;
+#    emu_condition = COND_GRUB_EMU_USB;
+#  };
+#
 def under_platform_specific_conditionals(platform, snippet):
-    r  = foreach_platform_value(platform, "condition", "_condition", lambda cond: "if " + cond + "\n")
+    r  = foreach_platform_specific_value(platform, "_condition", "condition", lambda cond: "if " + cond + "\n")
     r += snippet
-    r += foreach_platform_value(platform, "condition", "_condition", lambda cond: "endif " + cond + "\n")
+    r += foreach_platform_specific_value(platform, "_condition", "condition", lambda cond: "endif " + cond + "\n")
     return r
 
-def platform_specific_values(platform, tag, suffix):
-    return foreach_platform_value(platform, tag, suffix, lambda value: value + " ")
+def platform_specific_values(platform, suffix, nonetag):
+    return foreach_platform_specific_value(platform, suffix, nonetag,
+                                           lambda value: value + " ")
 
-def shared_sources(): return "[+ FOR shared +][+ .shared +] [+ ENDFOR +]"
-def shared_nodist_sources(): return "[+ FOR nodist_shared +] [+ .nodist_shared +][+ ENDFOR +]"
+def platform_values(platform, suffix):
+    return foreach_platform_value(platform, suffix, lambda value: value + " ")
 
-def platform_sources(p): return platform_specific_values(p, "source", "")
-def platform_nodist_sources(p): return platform_specific_values(p, "nodist", "_nodist")
-def platform_extra_dist(p): return platform_specific_values(p, "extra_dist", "_extra_dist")
-def platform_dependencies(p): return platform_specific_values(p, "dependencies", "_dependencies")
+def extra_dist():
+    return foreach_value("extra_dist", lambda value: value + " ")
 
-def platform_ldadd(p): return platform_specific_values(p, "ldadd", "_ldadd")
-def platform_cflags(p): return platform_specific_values(p, "cflags", "_cflags")
-def platform_ldflags(p): return platform_specific_values(p, "ldflags", "_ldflags")
-def platform_cppflags(p): return platform_specific_values(p, "cppflags", "_cppflags")
-def platform_ccasflags(p): return platform_specific_values(p, "ccasflags", "_ccasflags")
-def platform_stripflags(p): return platform_specific_values(p, "stripflags", "_stripflags")
-def platform_objcopyflags(p): return platform_specific_values(p, "objcopyflags", "_objcopyflags")
+def platform_sources(p): return platform_values(p, "")
+def platform_nodist_sources(p): return platform_values(p, "_nodist")
+def platform_dependencies(p): return platform_values(p, "dependencies", "_dependencies")
+
+def platform_startup(p): return platform_specific_values(p, "_startup", "startup")
+def platform_ldadd(p): return platform_specific_values(p, "_ldadd", "ldadd")
+def platform_cflags(p): return platform_specific_values(p, "_cflags", "cflags")
+def platform_ldflags(p): return platform_specific_values(p, "_ldflags", "ldflags")
+def platform_cppflags(p): return platform_specific_values(p, "_cppflags", "cppflags")
+def platform_ccasflags(p): return platform_specific_values(p, "_ccasflags", "ccasflags")
+def platform_stripflags(p): return platform_specific_values(p, "_stripflags", "stripflags")
+def platform_objcopyflags(p): return platform_specific_values(p, "_objcopyflags", "objcopyflags")
 
 def module(platform):
     r = set_canonical_name_suffix(".module")
@@ -176,9 +270,7 @@ def module(platform):
     r += gvar_add("MODULE_FILES", "[+ name +].module$(EXEEXT)")
 
     r += var_set(cname() + "_SOURCES", platform_sources(platform) + " ## platform sources")
-    r += var_add(cname() + "_SOURCES", shared_sources() + " ## shared sources")
     r += var_set("nodist_" + cname() + "_SOURCES", platform_nodist_sources(platform) + " ## platform nodist sources")
-    r += var_add("nodist_" + cname() + "_SOURCES", shared_nodist_sources() + " ## shared nodist sources")
     r += var_set(cname() + "_LDADD", platform_ldadd(platform))
     r += var_set(cname() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_MODULE) " + platform_cflags(platform))
     r += var_set(cname() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_MODULE) " + platform_ldflags(platform))
@@ -186,7 +278,7 @@ def module(platform):
     r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_MODULE) " + platform_ccasflags(platform))
     # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform))
 
-    r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
+    r += gvar_add("EXTRA_DIST", extra_dist())
     r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
     r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")
 
@@ -265,10 +357,9 @@ terminal-[+ name +].lst: [+ name +].pp $(srcdir)/genterminallist.sh
 def kernel(platform):
     r = set_canonical_name_suffix(".exec")
     r += gvar_add("noinst_PROGRAMS", "[+ name +].exec")
-    r += var_set(cname() + "_SOURCES", platform_sources(platform))
-    r += var_add(cname() + "_SOURCES", shared_sources())
+    r += var_set(cname() + "_SOURCES", platform_startup(platform))
+    r += var_add(cname() + "_SOURCES", platform_sources(platform))
     r += var_set("nodist_" + cname() + "_SOURCES", platform_nodist_sources(platform) + " ## platform nodist sources")
-    r += var_add("nodist_" + cname() + "_SOURCES", shared_nodist_sources() + " ## shared nodist sources")
     r += var_set(cname() + "_LDADD", platform_ldadd(platform))
     r += var_set(cname() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_KERNEL) " + platform_cflags(platform))
     r += var_set(cname() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_KERNEL) " + platform_ldflags(platform))
@@ -277,7 +368,7 @@ def kernel(platform):
     r += var_set(cname() + "_STRIPFLAGS", "$(AM_STRIPFLAGS) $(STRIPFLAGS_KERNEL) " + platform_stripflags(platform))
     # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform))
 
-    r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
+    r += gvar_add("EXTRA_DIST", extra_dist())
     r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
     r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")
 
@@ -292,9 +383,7 @@ def image(platform):
     r = set_canonical_name_suffix(".image")
     r += gvar_add("noinst_PROGRAMS", "[+ name +].image")
     r += var_set(cname() + "_SOURCES", platform_sources(platform))
-    r += var_add(cname() + "_SOURCES", shared_sources())
     r += var_set("nodist_" + cname() + "_SOURCES", platform_nodist_sources(platform) + "## platform nodist sources")
-    r += var_add("nodist_" + cname() + "_SOURCES", shared_nodist_sources() + "## shared nodist sources")
     r += var_set(cname() + "_LDADD", platform_ldadd(platform))
     r += var_set(cname() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_IMAGE) " + platform_cflags(platform))
     r += var_set(cname() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_IMAGE) " + platform_ldflags(platform))
@@ -303,7 +392,7 @@ def image(platform):
     r += var_set(cname() + "_OBJCOPYFLAGS", "$(OBJCOPYFLAGS_IMAGE) " + platform_objcopyflags(platform))
     # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform))
 
-    r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
+    r += gvar_add("EXTRA_DIST", extra_dist())
     r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
     r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")
 
@@ -322,15 +411,13 @@ def library(platform):
     r = set_canonical_name_suffix("")
     r += gvar_add("noinst_LIBRARIES", "[+ name +]")
     r += var_set(cname() + "_SOURCES", platform_sources(platform))
-    r += var_add(cname() + "_SOURCES", shared_sources())
     r += var_set("nodist_" + cname() + "_SOURCES", platform_nodist_sources(platform))
-    r += var_add("nodist_" + cname() + "_SOURCES", shared_nodist_sources())
     r += var_set(cname() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_LIBRARY) " + platform_cflags(platform))
     r += var_set(cname() + "_CPPFLAGS", "$(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) " + platform_cppflags(platform))
     r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_LIBRARY) " + platform_ccasflags(platform))
     # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform))
 
-    r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
+    r += gvar_add("EXTRA_DIST", extra_dist())
     r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
     r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")
 
@@ -362,9 +449,7 @@ def program(platform, test=False):
     r += "[+ ENDIF +]"
 
     r += var_set(cname() + "_SOURCES", platform_sources(platform))
-    r += var_add(cname() + "_SOURCES", shared_sources())
     r += var_set("nodist_" + cname() + "_SOURCES", platform_nodist_sources(platform))
-    r += var_add("nodist_" + cname() + "_SOURCES", shared_nodist_sources())
     r += var_set(cname() + "_LDADD", platform_ldadd(platform))
     r += var_set(cname() + "_CFLAGS", "$(AM_CFLAGS) $(CFLAGS_PROGRAM) " + platform_cflags(platform))
     r += var_set(cname() + "_LDFLAGS", "$(AM_LDFLAGS) $(LDFLAGS_PROGRAM) " + platform_ldflags(platform))
@@ -372,14 +457,14 @@ def program(platform, test=False):
     r += var_set(cname() + "_CCASFLAGS", "$(AM_CCASFLAGS) $(CCASFLAGS_PROGRAM) " + platform_ccasflags(platform))
     # r += var_set(cname() + "_DEPENDENCIES", platform_dependencies(platform) + " " + platform_ldadd(platform))
 
-    r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
+    r += gvar_add("EXTRA_DIST", extra_dist())
     r += gvar_add("BUILT_SOURCES", "$(nodist_" + cname() + "_SOURCES)")
     r += gvar_add("CLEANFILES", "$(nodist_" + cname() + "_SOURCES)")
     return r
 
 def data(platform):
     r  = gvar_add("EXTRA_DIST", platform_sources(platform))
-    r += gvar_add("EXTRA_DIST", platform_extra_dist(platform))
+    r += gvar_add("EXTRA_DIST", extra_dist())
     r += gvar_add(installdir() + "_DATA", platform_sources(platform))
     return r
 
@@ -403,31 +488,31 @@ chmod a+x [+ name +]
     return r
 
 def module_rules():
-    return "[+ FOR module +]" + each_platform(
+    return "[+ FOR module +]" + foreach_enabled_platform(
         lambda p: under_platform_specific_conditionals(p, module(p))) + "[+ ENDFOR +]"
 
 def kernel_rules():
-    return "[+ FOR kernel +]" + each_platform(
+    return "[+ FOR kernel +]" + foreach_enabled_platform(
         lambda p: under_platform_specific_conditionals(p, kernel(p))) + "[+ ENDFOR +]"
 
 def image_rules():
-    return "[+ FOR image +]" + each_platform(
+    return "[+ FOR image +]" + foreach_enabled_platform(
         lambda p: under_platform_specific_conditionals(p, image(p))) + "[+ ENDFOR +]"
 
 def library_rules():
-    return "[+ FOR library +]" + each_platform(
+    return "[+ FOR library +]" + foreach_enabled_platform(
         lambda p: under_platform_specific_conditionals(p, library(p))) + "[+ ENDFOR +]"
 
 def program_rules():
-    return "[+ FOR program +]" + each_platform(
+    return "[+ FOR program +]" + foreach_enabled_platform(
         lambda p: under_platform_specific_conditionals(p, program(p))) + "[+ ENDFOR +]"
 
 def script_rules():
-    return "[+ FOR script +]" + each_platform(
+    return "[+ FOR script +]" + foreach_enabled_platform(
         lambda p: under_platform_specific_conditionals(p, script(p))) + "[+ ENDFOR +]"
 
 def data_rules():
-    return "[+ FOR data +]" + each_platform(
+    return "[+ FOR data +]" + foreach_enabled_platform(
         lambda p: under_platform_specific_conditionals(p, data(p))) + "[+ ENDFOR +]"
 
 print "[+ AutoGen5 template +]\n"
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 83aa3b1db..b7c52b9d7 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -31,209 +31,139 @@ kernel = {
   powerpc_ldadd = '-lgcc';
   sparc64_ldadd = '-lgcc';
 
-  nonemu_nodist = symlist.c;
+  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_qemu_startup = kern/i386/qemu/startup.S;
+  i386_ieee1275_startup = kern/i386/ieee1275/startup.S;
+  i386_coreboot_multiboot_startup = kern/i386/coreboot/startup.S;
+  mips_yeeloong_startup = kern/mips/startup.S;
+  sparc64_ieee1275_startup = kern/sparc64/ieee1275/crt0.S;
+  powerpc_ieee1275_startup = kern/powerpc/ieee1275/startup.S;
 
-  shared = kern/command.c;
-  shared = kern/corecmd.c;
-  shared = kern/device.c;
-  shared = kern/disk.c;
-  shared = kern/dl.c;
-  shared = kern/env.c;
-  shared = kern/err.c;
-  shared = kern/file.c;
-  shared = kern/fs.c;
-  shared = kern/list.c;
-  shared = kern/main.c;
-  shared = kern/misc.c;
-  shared = kern/parser.c;
-  shared = kern/partition.c;
-  shared = kern/rescue_parser.c;
-  shared = kern/rescue_reader.c;
-  shared = kern/term.c;
+  common = kern/command.c;
+  common = kern/corecmd.c;
+  common = kern/device.c;
+  common = kern/disk.c;
+  common = kern/dl.c;
+  common = kern/env.c;
+  common = kern/err.c;
+  common = kern/file.c;
+  common = kern/fs.c;
+  common = kern/list.c;
+  common = kern/main.c;
+  common = kern/misc.c;
+  common = kern/parser.c;
+  common = kern/partition.c;
+  common = kern/rescue_parser.c;
+  common = kern/rescue_reader.c;
+  common = kern/term.c;
+
+  noemu = kern/mm.c;
+  noemu = kern/time.c;
+  noemu = kern/generic/millisleep.c;
+
+  noemu_nodist = symlist.c;
+
+  noemu_noieee1275 = kern/generic/rtc_get_time_ms.c;
+
+  ieee1275 = disk/ieee1275/ofdisk.c;
+  ieee1275 = kern/ieee1275/cmain.c;
+  ieee1275 = kern/ieee1275/ieee1275.c;
+  ieee1275 = kern/ieee1275/mmap.c;
+  ieee1275 = kern/ieee1275/openfw.c;
+  ieee1275 = term/ieee1275/ofconsole.c;
+
+  ieee1275_mips = term/terminfo.c;
+  ieee1275_mips = term/tparm.c;
+
+  i386 = kern/i386/dl.c;
+
+  i386_coreboot_multiboot_qemu = kern/i386/coreboot/init.c;
+  i386_coreboot_multiboot_qemu = kern/i386/halt.c;
+  i386_coreboot_multiboot_qemu = term/i386/pc/vga_text.c;
+
+  i386_pc_coreboot_multiboot_qemu = term/i386/vga_common.c;
+
+  i386_noefi = kern/i386/misc.S;
+
+  x86_noieee1275 = kern/i386/pit.c;
+
+  x86_efi = disk/efi/efidisk.c;
+  x86_efi = kern/efi/efi.c;
+  x86_efi = kern/efi/init.c;
+  x86_efi = kern/efi/mm.c;
+  x86_efi = kern/i386/efi/init.c;
+  x86_efi = term/efi/console.c;
+
+  i386_efi = kern/i386/tsc.c;
+
+  x86_64_efi = kern/i386/tsc.c;
+  x86_64_efi = kern/x86_64/dl.c;
+  x86_64_efi = kern/x86_64/efi/callwrap.S;
 
-  i386_pc = kern/i386/pc/startup.S;
-  i386_pc = kern/i386/misc.S;
-  i386_pc = kern/mm.c;
-  i386_pc = kern/time.c;
-  i386_pc = kern/i386/dl.c;
   i386_pc = kern/i386/pc/init.c;
   i386_pc = kern/i386/pc/mmap.c;
   i386_pc = kern/i386/tsc.c;
-  i386_pc = kern/i386/pit.c;
-  i386_pc = kern/generic/rtc_get_time_ms.c;
-  i386_pc = kern/generic/millisleep.c;
   i386_pc = term/i386/pc/console.c;
-  i386_pc = term/i386/vga_common.c;
 
-  i386_efi = kern/i386/efi/startup.S;
-  i386_efi = kern/mm.c;
-  i386_efi = kern/i386/dl.c;
-  i386_efi = kern/i386/efi/init.c;
-  i386_efi = kern/efi/efi.c;
-  i386_efi = kern/efi/init.c;
-  i386_efi = kern/efi/mm.c;
-  i386_efi = kern/time.c;
-  i386_efi = kern/i386/tsc.c;
-  i386_efi = kern/i386/pit.c;
-  i386_efi = kern/generic/rtc_get_time_ms.c;
-  i386_efi = kern/generic/millisleep.c;
-  i386_efi = term/efi/console.c;
-  i386_efi = disk/efi/efidisk.c;
-
-  i386_coreboot = kern/i386/coreboot/startup.S;
-  i386_coreboot = kern/i386/misc.S;
-  i386_coreboot = kern/i386/coreboot/init.c;
-  i386_coreboot = kern/i386/coreboot/mmap.c;
-  i386_coreboot = kern/i386/halt.c;
-  i386_coreboot = kern/mm.c;
-  i386_coreboot = kern/time.c;
-  i386_coreboot = kern/i386/dl.c;
-  i386_coreboot = kern/i386/tsc.c;
-  i386_coreboot = kern/i386/pit.c;
-  i386_coreboot = kern/generic/rtc_get_time_ms.c;
-  i386_coreboot = kern/generic/millisleep.c;
-  i386_coreboot = term/i386/pc/vga_text.c;
-  i386_coreboot = term/i386/vga_common.c;
-
-  i386_multiboot = kern/i386/coreboot/startup.S;
-  i386_multiboot = kern/i386/misc.S;
-  i386_multiboot = kern/i386/coreboot/init.c;
-  i386_multiboot = kern/i386/multiboot_mmap.c;
-  i386_multiboot = kern/i386/halt.c;
-  i386_multiboot = kern/mm.c;
-  i386_multiboot = kern/time.c;
-  i386_multiboot = kern/i386/dl.c;
-  i386_multiboot = kern/i386/tsc.c;
-  i386_multiboot = kern/i386/pit.c;
-  i386_multiboot = kern/generic/rtc_get_time_ms.c;
-  i386_multiboot = kern/generic/millisleep.c;
-  i386_multiboot = term/i386/pc/vga_text.c;
-  i386_multiboot = term/i386/vga_common.c;
-
-  i386_qemu = kern/i386/qemu/startup.S;
-  i386_qemu = kern/i386/misc.S;
-  i386_qemu = kern/i386/qemu/init.c;
-  i386_qemu = kern/i386/coreboot/init.c;
-  i386_qemu = kern/i386/qemu/mmap.c;
-  i386_qemu = kern/i386/halt.c;
-  i386_qemu = kern/mm.c;
-  i386_qemu = kern/time.c;
-  i386_qemu = kern/i386/dl.c;
-  i386_qemu = kern/i386/tsc.c;
-  i386_qemu = kern/i386/pit.c;
-  i386_qemu = kern/generic/rtc_get_time_ms.c;
-  i386_qemu = kern/generic/millisleep.c;
-  i386_qemu = term/i386/pc/vga_text.c;
-  i386_qemu = term/i386/vga_common.c;
   i386_qemu = bus/pci.c;
+  i386_qemu = kern/i386/qemu/init.c;
+  i386_qemu = kern/i386/qemu/mmap.c;
+  i386_qemu = kern/i386/tsc.c;
+
+  i386_coreboot = kern/i386/coreboot/mmap.c;
+  i386_coreboot = kern/i386/tsc.c;
+
+  i386_multiboot = kern/i386/multiboot_mmap.c;
+  i386_multiboot = kern/i386/tsc.c;
 
-  i386_ieee1275 = kern/i386/ieee1275/startup.S;
-  i386_ieee1275 = kern/i386/misc.S;
   i386_ieee1275 = kern/i386/ieee1275/init.c;
   i386_ieee1275 = kern/ieee1275/init.c;
-  i386_ieee1275 = kern/ieee1275/mmap.c;
-  i386_ieee1275 = kern/ieee1275/cmain.c;
-  i386_ieee1275 = kern/ieee1275/openfw.c;
-  i386_ieee1275 = kern/mm.c;
-  i386_ieee1275 = kern/i386/dl.c;
-  i386_ieee1275 = kern/time.c;
-  i386_ieee1275 = kern/generic/millisleep.c;
-  i386_ieee1275 = kern/ieee1275/ieee1275.c;
-  i386_ieee1275 = term/ieee1275/ofconsole.c;
-  i386_ieee1275 = disk/ieee1275/ofdisk.c;
-  i386_ieee1275 = term/terminfo.c;
-  i386_ieee1275 = term/tparm.c;
 
-  x86_64_efi = kern/x86_64/efi/startup.S;
-  x86_64_efi = kern/x86_64/efi/callwrap.S;
-  x86_64_efi = kern/mm.c;
-  x86_64_efi = kern/x86_64/dl.c;
-  x86_64_efi = kern/i386/efi/init.c;
-  x86_64_efi = kern/efi/efi.c;
-  x86_64_efi = kern/efi/init.c;
-  x86_64_efi = kern/efi/mm.c;
-  x86_64_efi = kern/time.c;
-  x86_64_efi = kern/i386/tsc.c;
-  x86_64_efi = kern/i386/pit.c;
-  x86_64_efi = kern/generic/millisleep.c;
-  x86_64_efi = kern/generic/rtc_get_time_ms.c;
-  x86_64_efi = term/efi/console.c;
-  x86_64_efi = disk/efi/efidisk.c;
-
-  mips_yeeloong = kern/mips/startup.S;
+  mips_yeeloong = bus/bonito.c;
+  mips_yeeloong = bus/cs5536.c;
+  mips_yeeloong = bus/pci.c;
+  mips_yeeloong = commands/extcmd.c;
+  mips_yeeloong = font/font.c;
+  mips_yeeloong = font/font_cmd.c;
+  mips_yeeloong = io/bufio.c;
+  mips_yeeloong = kern/mips/cache.S;
+  mips_yeeloong = kern/mips/dl.c;
   mips_yeeloong = kern/mips/init.c;
   mips_yeeloong = kern/mips/yeeloong/init.c;
-  mips_yeeloong = kern/mm.c;
-  mips_yeeloong = kern/mips/dl.c;
-  mips_yeeloong = kern/generic/millisleep.c;
-  mips_yeeloong = kern/generic/rtc_get_time_ms.c;
-  mips_yeeloong = kern/time.c;
-  mips_yeeloong = kern/mips/cache.S;
-  mips_yeeloong = io/bufio.c;
   mips_yeeloong = lib/arg.c;
-  mips_yeeloong = commands/extcmd.c;
-  mips_yeeloong = bus/pci.c;
-  mips_yeeloong = bus/bonito.c;
-  mips_yeeloong = font/font_cmd.c;
-  mips_yeeloong = font/font.c;
   mips_yeeloong = term/at_keyboard.c;
   mips_yeeloong = term/gfxterm.c;
-  mips_yeeloong = video/video.c;
-  mips_yeeloong = video/fb/video_fb.c;
+  mips_yeeloong = term/serial.c;
+  mips_yeeloong = video/bitmap.c;
+  mips_yeeloong = video/bitmap_scale.c;
   mips_yeeloong = video/fb/fbblit.c;
   mips_yeeloong = video/fb/fbfill.c;
   mips_yeeloong = video/fb/fbutil.c;
-  mips_yeeloong = video/bitmap.c;
-  mips_yeeloong = video/bitmap_scale.c;
+  mips_yeeloong = video/fb/video_fb.c;
   mips_yeeloong = video/sm712.c;
-  mips_yeeloong = bus/cs5536.c;
-  mips_yeeloong = term/serial.c;
-  mips_yeeloong = term/terminfo.c;
-  mips_yeeloong = term/tparm.c;
+  mips_yeeloong = video/video.c;
 
-  powerpc_ieee1275 = kern/powerpc/ieee1275/startup.S;
-  powerpc_ieee1275 = kern/ieee1275/cmain.c;
-  powerpc_ieee1275 = kern/ieee1275/ieee1275.c;
-  powerpc_ieee1275 = kern/mm.c;
   powerpc_ieee1275 = kern/ieee1275/init.c;
-  powerpc_ieee1275 = kern/ieee1275/mmap.c;
-  powerpc_ieee1275 = kern/ieee1275/openfw.c;
-  powerpc_ieee1275 = kern/powerpc/dl.c;
-  powerpc_ieee1275 = kern/generic/millisleep.c;
-  powerpc_ieee1275 = kern/time.c;
   powerpc_ieee1275 = kern/powerpc/cache.S;
-  powerpc_ieee1275 = term/ieee1275/ofconsole.c;
-  powerpc_ieee1275 = disk/ieee1275/ofdisk.c;
-  powerpc_ieee1275 = term/terminfo.c;
-  powerpc_ieee1275 = term/tparm.c;
+  powerpc_ieee1275 = kern/powerpc/dl.c;
 
-  sparc64_ieee1275 = kern/sparc64/ieee1275/crt0.S;
-  sparc64_ieee1275 = kern/ieee1275/cmain.c;
-  sparc64_ieee1275 = kern/ieee1275/ieee1275.c;
-  sparc64_ieee1275 = kern/mm.c;
+  sparc64_ieee1275 = kern/sparc64/cache.S;
+  sparc64_ieee1275 = kern/sparc64/dl.c;
   sparc64_ieee1275 = kern/sparc64/ieee1275/ieee1275.c;
   sparc64_ieee1275 = kern/sparc64/ieee1275/init.c;
-  sparc64_ieee1275 = kern/ieee1275/mmap.c;
-  sparc64_ieee1275 = kern/ieee1275/openfw.c;
-  sparc64_ieee1275 = kern/sparc64/dl.c;
-  sparc64_ieee1275 = kern/generic/millisleep.c;
-  sparc64_ieee1275 = kern/time.c;
-  sparc64_ieee1275 = kern/sparc64/cache.S;
-  sparc64_ieee1275 = disk/ieee1275/ofdisk.c;
-  sparc64_ieee1275 = term/ieee1275/ofconsole.c;
-  sparc64_ieee1275 = term/terminfo.c;
-  sparc64_ieee1275 = term/tparm.c;
 
-  emu = kern/emu/mm.c;
-  emu = kern/emu/main.c;
-  emu = kern/emu/misc.c;
-  emu = kern/emu/getroot.c;
-  emu = kern/emu/time.c;
-  emu = kern/emu/hostdisk.c;
-  emu = kern/emu/hostfs.c;
-  emu = kern/emu/console.c;
   emu = disk/host.c;
   emu = gnulib/progname.c;
+  emu = kern/emu/console.c;
+  emu = kern/emu/getroot.c;
+  emu = kern/emu/hostdisk.c;
+  emu = kern/emu/hostfs.c;
+  emu = kern/emu/main.c;
+  emu = kern/emu/misc.c;
+  emu = kern/emu/mm.c;
+  emu = kern/emu/time.c;
 
   extra_dist = kern/i386/loader.S;
   extra_dist = kern/i386/realmode.S;
@@ -244,8 +174,8 @@ program = {
   name = grub-emu;
   mansection = 1;
 
-  source = kern/emu/full.c;
-  nodist = grub_emu_init.c;
+  emu = kern/emu/full.c;
+  emu_nodist = grub_emu_init.c;
 
   ldadd = 'kernel.img$(EXEEXT)';
   ldadd = '$(MODULE_FILES)';
@@ -257,9 +187,9 @@ program = {
 program = {
   name = grub-emu-lite;
 
-  source = kern/emu/lite.c;
-  source = kern/emu/cache.S;
-  nodist = symlist.c;
+  emu = kern/emu/lite.c;
+  emu = kern/emu/cache.S;
+  emu_nodist = symlist.c;
 
   ldadd = 'kernel.img$(EXEEXT)';
   ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)';
@@ -271,6 +201,7 @@ image = {
   name = boot;
   i386_pc = boot/i386/pc/boot.S;
   i386_qemu = boot/i386/qemu/boot.S;
+  sparc64_ieee1275 = boot/sparc64/ieee1275/boot.S;
 
   i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
   i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00';
@@ -279,7 +210,6 @@ image = {
   i386_qemu_ldflags = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_BOOT_MACHINE_LINK_ADDR)';
   i386_qemu_ccasflags = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
 
-  sparc64_ieee1275 = boot/sparc64/ieee1275/boot.S;
   sparc64_ieee1275_objcopyflags = '-O a.out-sunos-big';
   sparc64_ieee1275_ldflags = ' -Wl,-Ttext=0x4000';
 
@@ -345,19 +275,19 @@ image = {
 
 module = {
   name = trig;
-  nodist = trigtables.c;
+  common_nodist = trigtables.c;
   extra_dist = gentrigtables.c;
 };
 
 module = {
   name = cs5536;
-  source = bus/cs5536.c;
+  i386 = bus/cs5536.c;
   enable = i386;
 };
 
 module = {
   name = libusb;
-  source = bus/usb/emu/usb.c;
+  emu = bus/usb/emu/usb.c;
   enable = emu;
   condition = COND_GRUB_EMU_USB;
 };
@@ -370,36 +300,31 @@ module = {
 
 module = {
   name = usb;
-  source = bus/usb/usb.c;
-  source = bus/usb/usbtrans.c;
-  source = bus/usb/usbhub.c;
+  common = bus/usb/usb.c;
+  noemu = bus/usb/usbtrans.c;
+  noemu = bus/usb/usbhub.c;
+  enable = emu;
   enable = i386;
   enable = mips_yeeloong;
-};
-
-module = {
-  name = usb;
-  source = bus/usb/usb.c;
-  enable = emu;
-  condition = COND_GRUB_EMU_USB;
+  emu_condition = COND_GRUB_EMU_USB;
 };
 
 module = {
   name = uhci;
-  source = bus/usb/uhci.c;
+  common = bus/usb/uhci.c;
   enable = i386_pc;
 };
 
 module = {
   name = ohci;
-  source = bus/usb/ohci.c;
+  common = bus/usb/ohci.c;
   enable = i386_pc;
   enable = mips_yeeloong;
 };
 
 module = {
   name = pci;
-  source = bus/pci.c;
+  noemu = bus/pci.c;
   emu = bus/emu/pci.c;
   emu = commands/lspci.c;
 
@@ -408,13 +333,12 @@ module = {
   enable = x86_efi;
   enable = i386_ieee1275;
   enable = i386_coreboot;
-
   emu_condition = COND_GRUB_EMU_PCI;
 };
 
 library = {
   name = libgnulib.a;
-  source = gnulib/regex.c;
+  common = gnulib/regex.c;
 
   extra_dist = gnulib/regcomp.c;
   extra_dist = gnulib/regexec.c;
@@ -427,20 +351,20 @@ library = {
 
 module = {
   name = cmostest;
-  source = commands/i386/cmostest.c;
+  i386 = commands/i386/cmostest.c;
   enable = i386_pc;
   enable = i386_coreboot;
 };
 
 module = {
   name = iorw;
-  source = commands/iorw.c;
+  common = commands/iorw.c;
   enable = i386;
 };
 
 module = {
   name = regexp;
-  source = commands/regexp.c;
+  common = commands/regexp.c;
   ldadd = libgnulib.a;
   cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
   cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
@@ -449,10 +373,8 @@ module = {
 module = {
   name = acpi;
 
-  x86_efi = commands/acpi.c;
+  i386 = commands/acpi.c;
   x86_efi = commands/efi/acpi.c;
-
-  i386_pc = commands/acpi.c;
   i386_pc = commands/i386/pc/acpi.c;
 
   enable = x86_efi;
@@ -461,48 +383,45 @@ module = {
 
 module = {
   name = blocklist;
-  source = commands/blocklist.c;
+  common = commands/blocklist.c;
 };
 
 module = {
   name = boot;
-  source = commands/boot.c;
-
-  i386_pc = commands/boot.c;
+  common = commands/boot.c;
   i386_pc = lib/i386/pc/biosnum.c;
 };
 
 module = {
   name = cat;
-  source = commands/cat.c;
+  common = commands/cat.c;
 };
 
 module = {
   name = cmp;
-  source = commands/cmp.c;
+  common = commands/cmp.c;
 };
 
 module = {
   name = configfile;
-  source = commands/configfile.c;
+  common = commands/configfile.c;
 };
 
 module = {
   name = cpuid;
-  source = commands/i386/cpuid.c;
-
+  i386 = commands/i386/cpuid.c;
   enable = x86;
 };
 
 module = {
   name = crc;
-  source = commands/crc.c;
-  source = lib/crc.c;
+  common = commands/crc.c;
+  common = lib/crc.c;
 };
 
 module = {
   name = date;
-  source = commands/date.c;
+  common = commands/date.c;
 };
 
 module = {
@@ -515,13 +434,13 @@ module = {
 
 module = {
   name = echo;
-  source = commands/echo.c;
+  common = commands/echo.c;
 };
 
 module = {
   name = extcmd;
-  source = commands/extcmd.c;
-  source = lib/arg.c;
+  common = commands/extcmd.c;
+  common = lib/arg.c;
 };
 
 module = {
@@ -532,43 +451,41 @@ module = {
 
 module = {
   name = gptsync;
-  source = commands/gptsync.c;
+  common = commands/gptsync.c;
 };
 
 module = {
   name = halt;
-  source = commands/halt.c;
-
+  nopc = commands/halt.c;
   i386_pc = commands/i386/pc/halt.c;
 };
 
 module = {
   name = hashsum;
-  source = commands/hashsum.c;
+  common = commands/hashsum.c;
 };
 
 module = {
   name = hdparm;
-  source = commands/hdparm.c;
-  source = lib/hexdump.c;
-
+  common = commands/hdparm.c;
+  common = lib/hexdump.c;
   enable = i386_pc;
 };
 
 module = {
   name = help;
-  source = commands/help.c;
+  common = commands/help.c;
 };
 
 module = {
   name = hexdump;
-  source = commands/hexdump.c;
-  source = lib/hexdump.c;
+  common = commands/hexdump.c;
+  common = lib/hexdump.c;
 };
 
 module = {
   name = keystatus;
-  source = commands/keystatus.c;
+  common = commands/keystatus.c;
 };
 
 module = {
@@ -579,23 +496,23 @@ module = {
 
 module = {
   name = loadenv;
-  source = commands/loadenv.c;
-  source = lib/envblk.c;
+  common = commands/loadenv.c;
+  common = lib/envblk.c;
 };
 
 module = {
   name = ls;
-  source = commands/ls.c;
+  common = commands/ls.c;
 };
 
 module = {
   name = lsmmap;
-  source = commands/lsmmap.c;
+  common = commands/lsmmap.c;
 };
 
 module = {
   name = lspci;
-  source = commands/lspci.c;
+  common = commands/lspci.c;
 
   enable = x86;
   enable = mips;
@@ -603,38 +520,38 @@ module = {
 
 module = {
   name = memrw;
-  source = commands/memrw.c;
+  common = commands/memrw.c;
 };
 
 module = {
   name = minicmd;
-  source = commands/minicmd.c;
+  common = commands/minicmd.c;
 };
 
 module = {
   name = parttool;
-  source = commands/parttool.c;
+  common = commands/parttool.c;
 };
 
 module = {
   name = password;
-  source = commands/password.c;
+  common = commands/password.c;
 };
 
 module = {
   name = password_pbkdf2;
-  source = commands/password_pbkdf2.c;
+  common = commands/password_pbkdf2.c;
 };
 
 module = {
   name = play;
-  source = commands/i386/pc/play.c;
+  i386 = commands/i386/pc/play.c;
   enable = i386;
 };
 
 module = {
   name = probe;
-  source = commands/probe.c;
+  common = commands/probe.c;
 };
 
 module = {
@@ -645,81 +562,75 @@ module = {
 
 module = {
   name = read;
-  source = commands/read.c;
+  common = commands/read.c;
 };
 
 module = {
   name = reboot;
-  source = commands/reboot.c;
+  common = commands/reboot.c;
 };
 
 module = {
   name = search;
-  source = commands/search_wrap.c;
+  common = commands/search_wrap.c;
   extra_dist = commands/search.c;
 };
 
 module = {
   name = search_fs_file;
-  source = commands/search_file.c;
+  common = commands/search_file.c;
 };
 
 module = {
   name = search_fs_uuid;
-  source = commands/search_uuid.c;
+  common = commands/search_uuid.c;
 };
 
 module = {
   name = search_label;
-  source = commands/search_label.c;
+  common = commands/search_label.c;
 };
 
 module = {
   name = setpci;
-  source = commands/setpci.c;
-
+  common = commands/setpci.c;
   enable = x86;
 };
 
 module = {
   name = sleep;
-  source = commands/sleep.c;
+  common = commands/sleep.c;
 };
 
 module = {
   name = suspend;
-  source = commands/ieee1275/suspend.c;
+  ieee1275 = commands/ieee1275/suspend.c;
   enable = i386_ieee1275;
   enable = powerpc_ieee1275;
 };
 
 module = {
   name = terminal;
-  source = commands/terminal.c;
+  common = commands/terminal.c;
 };
 
 module = {
   name = test;
-  source = commands/test.c;
+  common = commands/test.c;
 };
 
 module = {
   name = true;
-  source = commands/true.c;
+  common = commands/true.c;
 };
 
 module = {
   name = usbtest;
-  source = commands/usbtest.c;
+  common = commands/usbtest.c;
   enable = i386_pc;
   enable = mips_yeeloong;
-};
-
-module = {
-  name = usbtest;
-  source = commands/usbtest.c;
   enable = emu;
-  condition = COND_GRUB_EMU_USB;
+  emu_condition = COND_GRUB_EMU_USB;
 };
 
 module = {
@@ -736,71 +647,69 @@ module = {
 
 module = {
   name = videotest;
-  source = commands/videotest.c;
+  common = commands/videotest.c;
 };
 
 module = {
   name = xnu_uuid;
-  source = commands/xnu_uuid.c;
+  common = commands/xnu_uuid.c;
 };
 
 module = {
   name = dm_nv;
-  source = disk/dmraid_nvidia.c;
+  common = disk/dmraid_nvidia.c;
 };
 
 module = {
   name = loopback;
-  source = disk/loopback.c;
+  common = disk/loopback.c;
 };
 
 module = {
   name = lvm;
-  source = disk/lvm.c;
+  common = disk/lvm.c;
 };
 
 module = {
   name = mdraid;
-  source = disk/mdraid_linux.c;
+  common = disk/mdraid_linux.c;
 };
 
 module = {
   name = raid;
-  source = disk/raid.c;
+  common = disk/raid.c;
 };
 
 module = {
   name = raid5rec;
-  source = disk/raid5_recover.c;
+  common = disk/raid5_recover.c;
 };
 
 module = {
   name = raid6rec;
-  source = disk/raid6_recover.c;
+  common = disk/raid6_recover.c;
 };
 
 module = {
   name = scsi;
-  source = disk/scsi.c;
+  common = disk/scsi.c;
 };
 
 module = {
   name = memdisk;
-  source = disk/memdisk.c;
+  common = disk/memdisk.c;
 };
 
 module = {
   name = ata;
-  source = disk/ata.c;
-
+  common = disk/ata.c;
   enable = x86;
   enable = mips;
 };
 
 module = {
   name = ata_pthru;
-  source = disk/ata_pthru.c;
-
+  common = disk/ata_pthru.c;
   enable = x86;
   enable = mips_yeeloong;
 };
@@ -813,22 +722,16 @@ module = {
 
 module = {
   name = usbms;
-  source = disk/usbms.c;
+  common = disk/usbms.c;
   enable = i386_pc;
   enable = mips_yeeloong;
-};
-
-module = {
-  name = usbms;
-  source = disk/usbms.c;
   enable = emu;
-  condition = COND_GRUB_EMU_USB;
+  emu_condition = COND_GRUB_EMU_USB;
 };
 
 module = {
   name = nand;
-  source = disk/ieee1275/nand.c;
-
+  ieee1275 = disk/ieee1275/nand.c;
   enable = i386_ieee1275;
 };
 
@@ -858,8 +761,8 @@ module = {
 
 module = {
   name = font;
-  source = font/font.c;
-  source = font/font_cmd.c;
+  common = font/font.c;
+  common = font/font_cmd.c;
   enable = emu;
   enable = x86;
   enable = sparc64;
@@ -868,122 +771,122 @@ module = {
 
 module = {
   name = affs;
-  source = fs/affs.c;
+  common = fs/affs.c;
 };
 
 module = {
   name = afs;
-  source = fs/afs.c;
+  common = fs/afs.c;
 };
 
 module = {
   name = afs_be;
-  source = fs/afs_be.c;
+  common = fs/afs_be.c;
 };
 
 module = {
   name = befs;
-  source = fs/befs.c;
+  common = fs/befs.c;
 };
 
 module = {
   name = befs_be;
-  source = fs/befs_be.c;
+  common = fs/befs_be.c;
 };
 
 module = {
   name = cpio;
-  source = fs/cpio.c;
+  common = fs/cpio.c;
 };
 
 module = {
   name = ext2;
-  source = fs/ext2.c;
+  common = fs/ext2.c;
 };
 
 module = {
   name = fat;
-  source = fs/fat.c;
+  common = fs/fat.c;
 };
 
 module = {
   name = fshelp;
-  source = fs/fshelp.c;
+  common = fs/fshelp.c;
 };
 
 module = {
   name = hfs;
-  source = fs/hfs.c;
+  common = fs/hfs.c;
 };
 
 module = {
   name = hfsplus;
-  source = fs/hfsplus.c;
+  common = fs/hfsplus.c;
 };
 
 module = {
   name = iso9660;
-  source = fs/iso9660.c;
+  common = fs/iso9660.c;
 };
 
 module = {
   name = jfs;
-  source = fs/jfs.c;
+  common = fs/jfs.c;
 };
 
 module = {
   name = minix;
-  source = fs/minix.c;
+  common = fs/minix.c;
 };
 
 module = {
   name = nilfs2;
-  source = fs/nilfs2.c;
+  common = fs/nilfs2.c;
 };
 
 module = {
   name = ntfs;
-  source = fs/ntfs.c;
+  common = fs/ntfs.c;
 };
 
 module = {
   name = ntfscomp;
-  source = fs/ntfscomp.c;
+  common = fs/ntfscomp.c;
 };
 
 module = {
   name = reiserfs;
-  source = fs/reiserfs.c;
+  common = fs/reiserfs.c;
 };
 
 module = {
   name = sfs;
-  source = fs/sfs.c;
+  common = fs/sfs.c;
 };
 
 module = {
   name = tar;
-  source = fs/tar.c;
+  common = fs/tar.c;
 };
 
 module = {
   name = udf;
-  source = fs/udf.c;
+  common = fs/udf.c;
 };
 
 module = {
   name = ufs1;
-  source = fs/ufs.c;
+  common = fs/ufs.c;
 };
 
 module = {
   name = ufs2;
-  source = fs/ufs2.c;
+  common = fs/ufs2.c;
 };
 
 module = {
   name = xfs;
-  source = fs/xfs.c;
+  common = fs/xfs.c;
 };
 
 module = {
@@ -994,43 +897,43 @@ module = {
 
 module = {
   name = gettext;
-  source = gettext/gettext.c;
+  common = gettext/gettext.c;
 };
 
 module = {
   name = gfxmenu;
-  source = gfxmenu/gfxmenu.c;
-  source = gfxmenu/model.c;
-  source = gfxmenu/view.c;
-  source = gfxmenu/font.c;
-  source = gfxmenu/icon_manager.c;
-  source = gfxmenu/theme_loader.c;
-  source = gfxmenu/widget-box.c;
-  source = gfxmenu/gui_canvas.c;
-  source = gfxmenu/gui_circular_progress.c;
-  source = gfxmenu/gui_box.c;
-  source = gfxmenu/gui_label.c;
-  source = gfxmenu/gui_list.c;
-  source = gfxmenu/gui_image.c;
-  source = gfxmenu/gui_progress_bar.c;
-  source = gfxmenu/gui_util.c;
-  source = gfxmenu/gui_string_util.c;
-  source = gfxmenu/named_colors.c;
+  common = gfxmenu/gfxmenu.c;
+  common = gfxmenu/model.c;
+  common = gfxmenu/view.c;
+  common = gfxmenu/font.c;
+  common = gfxmenu/icon_manager.c;
+  common = gfxmenu/theme_loader.c;
+  common = gfxmenu/widget-box.c;
+  common = gfxmenu/gui_canvas.c;
+  common = gfxmenu/gui_circular_progress.c;
+  common = gfxmenu/gui_box.c;
+  common = gfxmenu/gui_label.c;
+  common = gfxmenu/gui_list.c;
+  common = gfxmenu/gui_image.c;
+  common = gfxmenu/gui_progress_bar.c;
+  common = gfxmenu/gui_util.c;
+  common = gfxmenu/gui_string_util.c;
+  common = gfxmenu/named_colors.c;
 };
 
 module = {
   name = hello;
-  source = hello/hello.c;
+  common = hello/hello.c;
 };
 
 module = {
   name = gzio;
-  source = io/gzio.c;
+  common = io/gzio.c;
 };
 
 module = {
   name = bufio;
-  source = io/bufio.c;
+  common = io/bufio.c;
   enable = emu;
   enable = x86;
   enable = sparc64;
@@ -1039,19 +942,19 @@ module = {
 
 module = {
   name = elf;
-  source = kern/elf.c;
+  common = kern/elf.c;
 };
 
 module = {
   name = crypto;
-  source = lib/crypto.c;
+  common = lib/crypto.c;
 
   extra_dist = lib/libgcrypt-grub/cipher/crypto.lst;
 };
 
 module = {
   name = pbkdf2;
-  source = lib/pbkdf2.c;
+  common = lib/pbkdf2.c;
 };
 
 module = {
@@ -1068,7 +971,7 @@ module = {
 
 module = {
   name = datetime;
-  source = lib/cmos_datetime.c;
+  x86_noefi_mips = lib/cmos_datetime.c;
   x86_efi = lib/efi/datetime.c;
   sparc64_ieee1275 = lib/ieee1275/datetime.c;
   powerpc_ieee1275 = lib/ieee1275/datetime.c;
@@ -1080,7 +983,7 @@ module = {
 
 module = {
   name = setjmp;
-  source = lib/setjmp.S;
+  common = lib/setjmp.S;
   extra_dist = lib/i386/setjmp.S;
   extra_dist = lib/mips/setjmp.S;
   extra_dist = lib/x86_64/setjmp.S;
@@ -1090,7 +993,7 @@ module = {
 
 module = {
   name = aout;
-  source = loader/aout.c;
+  common = loader/aout.c;
   enable = i386_pc;
   enable = i386_qemu;
   enable = i386_coreboot;
@@ -1100,11 +1003,11 @@ module = {
 
 module = {
   name = bsd;
-  source = loader/i386/bsd.c;
-  source = loader/i386/bsd32.c;
-  source = loader/i386/bsd64.c;
-  source = loader/i386/bsd_helper.S;
-  source = loader/i386/bsd_trampoline.S;
+  i386 = loader/i386/bsd.c;
+  i386 = loader/i386/bsd32.c;
+  i386 = loader/i386/bsd64.c;
+  i386 = loader/i386/bsd_helper.S;
+  i386 = loader/i386/bsd_trampoline.S;
 
   extra_dist = loader/i386/bsdXX.c;
   extra_dist = loader/i386/bsd_pagetable.c;
@@ -1117,7 +1020,7 @@ module = {
 
 module = {
   name = linux16;
-  source = loader/i386/pc/linux.c;
+  i386_pc = loader/i386/pc/linux.c;
   enable = i386_pc;
 };
 
@@ -1125,41 +1028,41 @@ module = {
   name = multiboot2;
   cppflags = "-DGRUB_USE_MULTIBOOT2";
 
-  source = loader/multiboot.c;
-  source = loader/multiboot_mbi2.c;
+  common = loader/multiboot.c;
+  common = loader/multiboot_mbi2.c;
   enable = x86;
   enable = mips;
 };
 
 module = {
   name = multiboot;
-  source = loader/multiboot.c;
-  source = loader/i386/multiboot_mbi.c;
+  common = loader/multiboot.c;
+  x86 = loader/i386/multiboot_mbi.c;
   extra_dist = loader/multiboot_elfxx.c;
   enable = x86;
 };
 
 module = {
   name = linux;
-  i386 = loader/i386/linux.c;
-  i386_efi = loader/i386/efi/linux.c;
-  i386_ieee1275 = loader/i386/ieee1275/linux.c;
-  x86_64_efi = loader/i386/efi/linux.c;
+  i386_noefi_noieee1275 = loader/i386/linux.c;
+
+  x86_efi = loader/i386/efi/linux.c;
   x86_64_efi = loader/i386/linux_trampoline.S;
+  i386_ieee1275 = loader/i386/ieee1275/linux.c;
   mips = loader/mips/linux.c;
   powerpc_ieee1275 = loader/powerpc/ieee1275/linux.c;
   sparc64_ieee1275 = loader/sparc64/ieee1275/linux.c;
-  enable = nonemu;
+  enable = noemu;
 };
 
 module = {
   name = xnu;
-  source = loader/xnu_resume.c;
-  source = loader/i386/xnu.c;
-  source = loader/macho32.c;
-  source = loader/macho64.c;
-  source = loader/macho.c;
-  source = loader/xnu.c;
+  i386 = loader/xnu_resume.c;
+  i386 = loader/i386/xnu.c;
+  i386 = loader/macho32.c;
+  i386 = loader/macho64.c;
+  i386 = loader/macho.c;
+  i386 = loader/xnu.c;
 
   extra_dist = loader/machoXX.c;
   enable = i386_pc;
@@ -1218,35 +1121,35 @@ module = {
 
 module = {
   name = normal;
-  source = normal/main.c;
-  source = normal/cmdline.c;
-  source = normal/dyncmd.c;
-  source = normal/auth.c;
-  source = normal/autofs.c;
-  source = normal/color.c;
-  source = normal/completion.c;
-  source = normal/datetime.c;
-  source = normal/menu.c;
-  source = normal/menu_entry.c;
-  source = normal/menu_text.c;
-  source = normal/misc.c;
-  source = normal/crypto.c;
-  source = normal/term.c;
-  source = normal/context.c;
-  source = normal/charset.c;
+  common = normal/main.c;
+  common = normal/cmdline.c;
+  common = normal/dyncmd.c;
+  common = normal/auth.c;
+  common = normal/autofs.c;
+  common = normal/color.c;
+  common = normal/completion.c;
+  common = normal/datetime.c;
+  common = normal/menu.c;
+  common = normal/menu_entry.c;
+  common = normal/menu_text.c;
+  common = normal/misc.c;
+  common = normal/crypto.c;
+  common = normal/term.c;
+  common = normal/context.c;
+  common = normal/charset.c;
 
-  source = script/main.c;
-  source = script/script.c;
-  source = script/execute.c;
-  source = script/function.c;
-  source = script/lexer.c;
-  source = script/argv.c;
+  common = script/main.c;
+  common = script/script.c;
+  common = script/execute.c;
+  common = script/function.c;
+  common = script/lexer.c;
+  common = script/argv.c;
 
-  source = unidata.c;
-  nodist = grub_script.tab.c;
-  nodist = grub_script.yy.c;
-  nodist = grub_script.tab.h;
-  nodist = grub_script.yy.h;
+  common = unidata.c;
+  common_nodist = grub_script.tab.c;
+  common_nodist = grub_script.yy.c;
+  common_nodist = grub_script.tab.h;
+  common_nodist = grub_script.yy.h;
 
   extra_dist = script/yylex.l;
   extra_dist = script/parser.y;
@@ -1257,58 +1160,58 @@ module = {
 
 module = {
   name = part_acorn;
-  source = partmap/acorn.c;
+  common = partmap/acorn.c;
 };
 
 module = {
   name = part_amiga;
-  source = partmap/amiga.c;
+  common = partmap/amiga.c;
 };
 
 module = {
   name = part_apple;
-  source = partmap/apple.c;
+  common = partmap/apple.c;
 };
 
 module = {
   name = part_gpt;
-  source = partmap/gpt.c;
+  common = partmap/gpt.c;
 };
 
 module = {
   name = part_msdos;
-  source = partmap/msdos.c;
+  common = partmap/msdos.c;
 };
 
 module = {
   name = part_sun;
-  source = partmap/sun.c;
+  common = partmap/sun.c;
 };
 
 module = {
   name = part_bsd;
-  source = partmap/bsdlabel.c;
+  common = partmap/bsdlabel.c;
 };
 
 module = {
   name = part_sunpc;
-  source = partmap/sunpc.c;
+  common = partmap/sunpc.c;
 };
 
 module = {
   name = msdospart;
-  source = parttool/msdospart.c;
+  common = parttool/msdospart.c;
 };
 
 module = {
   name = at_keyboard;
-  source = term/at_keyboard.c;
+  common = term/at_keyboard.c;
   enable = x86;
 };
 
 module = {
   name = gfxterm;
-  source = term/gfxterm.c;
+  common = term/gfxterm.c;
   enable = emu;
   enable = x86;
   enable = sparc64;
@@ -1317,19 +1220,19 @@ module = {
 
 module = {
   name = serial;
-  source = term/serial.c;
+  common = term/serial.c;
   enable = i386;
 };
 
 module = {
   name = terminfo;
-  source = term/terminfo.c;
-  source = term/tparm.c;
+  common = term/terminfo.c;
+  common = term/tparm.c;
 };
 
 module = {
   name = usb_keyboard;
-  source = term/usb_keyboard.c;
+  common = term/usb_keyboard.c;
   enable = i386_pc;
   enable = mips_yeeloong;
 };
@@ -1361,19 +1264,19 @@ module = {
 
 module = {
   name = functional_test;
-  source = tests/lib/functional_test.c;
-  source = tests/lib/test.c;
+  common = tests/lib/functional_test.c;
+  common = tests/lib/test.c;
 };
 
 module = {
   name = example_functional_test;
-  source = tests/example_functional_test.c;
+  common = tests/example_functional_test.c;
   cflags = -Wno-format;
 };
 
 module = {
   name = bitmap;
-  source = video/bitmap.c;
+  common = video/bitmap.c;
   enable = emu;
   enable = x86;
   enable = sparc64;
@@ -1382,7 +1285,7 @@ module = {
 
 module = {
   name = bitmap_scale;
-  source = video/bitmap_scale.c;
+  common = video/bitmap_scale.c;
   enable = emu;
   enable = x86;
   enable = sparc64;
@@ -1403,17 +1306,17 @@ module = {
 
 module = {
   name = jpeg;
-  source = video/readers/jpeg.c;
+  common = video/readers/jpeg.c;
 };
 
 module = {
   name = png;
-  source = video/readers/png.c;
+  common = video/readers/png.c;
 };
 
 module = {
   name = tga;
-  source = video/readers/tga.c;
+  common = video/readers/tga.c;
 };
 
 module = {
@@ -1424,10 +1327,10 @@ module = {
 
 module = {
   name = video_fb;
-  source = video/fb/video_fb.c;
-  source = video/fb/fbblit.c;
-  source = video/fb/fbfill.c;
-  source = video/fb/fbutil.c;
+  common = video/fb/video_fb.c;
+  common = video/fb/fbblit.c;
+  common = video/fb/fbfill.c;
+  common = video/fb/fbutil.c;
   enable = emu;
   enable = x86;
   enable = sparc64;
@@ -1436,7 +1339,7 @@ module = {
 
 module = {
   name = video;
-  source = video/video.c;
+  common = video/video.c;
   enable = emu;
   enable = x86;
   enable = sparc64;
@@ -1445,19 +1348,19 @@ module = {
 
 module = {
   name = ieee1275_fb;
-  source = video/ieee1275.c;
+  ieee1275 = video/ieee1275.c;
   enable = powerpc;
   enable = sparc64;
 };
 
 module = {
   name = sdl;
-  source = video/emu/sdl.c;
-  condition = COND_GRUB_EMU_SDL;
+  emu = video/emu/sdl.c;
   enable = emu;
+  condition = COND_GRUB_EMU_SDL;
 };
 
 module = {
   name = datehook;
-  source = hook/datehook.c;
+  common = hook/datehook.c;
 };
diff --git a/util/import_gcry.py b/util/import_gcry.py
index 6280f001e..494a4ae7b 100644
--- a/util/import_gcry.py
+++ b/util/import_gcry.py
@@ -277,7 +277,7 @@ for cipher_file in cipher_files:
             conf.write ("module = {\n")
             conf.write ("  name = %s;\n" % modname)
             for src in modfiles.split():
-                conf.write ("  source = %s;\n" % src)
+                conf.write ("  common = %s;\n" % src)
             conf.write ("  cflags = '$(CFLAGS_GCRY)';\n");
             conf.write ("  cppflags = '$(CPPFLAGS_GCRY)';\n");
             conf.write ("};\n\n")

From c721825b4fc6ad3d1e3f869bc7291037195f320e Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Sat, 21 Aug 2010 17:11:40 +0530
Subject: [PATCH 1410/1628] build fixes for mips and ieee1275 platforms

---
 configure.ac | 32 ++++++++++++++++----------------
 gentpl.py    |  1 +
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index b57a8580a..c05b506c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,11 +71,11 @@ case "$target_cpu" in
   sparc)	target_cpu=sparc64 ;;
   mipsel|mips64el)
                 target_cpu=mips;
-		machine_CFLAGS="-DGRUB_CPU_MIPSEL=1";
+		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_CPU_MIPSEL=1";
 		;;
   mips|mips64)
                 target_cpu=mips;
-		machine_CFLAGS="-DGRUB_CPU_MIPS=1";
+		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_CPU_MIPS=1";
 		;;
 esac
 
@@ -150,24 +150,24 @@ case "$host_os" in
 esac
 
 case "$platform" in
-  coreboot)	machine_CFLAGS="-DGRUB_MACHINE_COREBOOT=1" ;;
-  multiboot)	machine_CFLAGS="-DGRUB_MACHINE_MULTIBOOT=1" ;;
-  efi)		machine_CFLAGS="-DGRUB_MACHINE_EFI=1" ;;
-  ieee1275)	machine_CFLAGS="-DGRUB_MACHINE_IEEE1275=1" ;;
-  qemu)		machine_CFLAGS="-DGRUB_MACHINE_QEMU=1" ;;
-  pc)		machine_CFLAGS="-DGRUB_MACHINE_PCBIOS=1" ;;
-  emu)		machine_CFLAGS="-DGRUB_MACHINE_EMU=1" ;;
-  yeeloong)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
-  qemu-mips)	machine_CFLAGS="-DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  coreboot)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_COREBOOT=1" ;;
+  multiboot)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MULTIBOOT=1" ;;
+  efi)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_EFI=1" ;;
+  ieee1275)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_IEEE1275=1" ;;
+  qemu)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_QEMU=1" ;;
+  pc)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_PCBIOS=1" ;;
+  emu)		machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_EMU=1" ;;
+  yeeloong)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS_YEELOONG=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
+  qemu-mips)	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS_QEMU_MIPS=1 -DGRUB_MACHINE_MIPS_BONITO=1" ;;
 esac
 case "$target_cpu" in
-  mips)      	machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_MIPS=1" ;;
-  sparc64)      machine_CFLAGS="$machine_CFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
+  mips)      	machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_MIPS=1" ;;
+  sparc64)      machine_CPPFLAGS="$machine_CPPFLAGS -DGRUB_MACHINE_SPARC64=1" ;;
 esac
-machine_CFLAGS="$machine_CFLAGS -DMACHINE=`echo ${target_cpu}_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`"
+machine_CPPFLAGS="$machine_CPPFLAGS -DMACHINE=`echo ${target_cpu}_$platform | sed y,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,`"
 
-HOST_CPPFLAGS="$HOST_CPPFLAGS $machine_CFLAGS"
-TARGET_CPPFLAGS="$TARGET_CPPFLAGS $machine_CFLAGS"
+HOST_CPPFLAGS="$HOST_CPPFLAGS $machine_CPPFLAGS"
+TARGET_CPPFLAGS="$TARGET_CPPFLAGS $machine_CPPFLAGS"
 
 AC_SUBST(host_cpu)
 AC_SUBST(host_os)
diff --git a/gentpl.py b/gentpl.py
index 18672bdcd..bbec62413 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -40,6 +40,7 @@ GROUPS["x86_noefi_mips"] = GROUPS["x86_noefi"] + GROUPS["mips"]
 GROUPS["ieee1275"]   = [ "i386_ieee1275", "sparc64_ieee1275", "powerpc_ieee1275" ]
 GROUPS["noieee1275"] = GRUB_PLATFORMS[:]
 for i in GROUPS["ieee1275"]: GROUPS["noieee1275"].remove(i)
+GROUPS["ieee1275_mips"] = GROUPS["ieee1275"] + GROUPS["mips"]
 
 GROUPS["pci"]      = GROUPS["x86"] + GROUPS["mips"]
 

From 354128c8af84945e43a2d4a5ff6b0284d778cc56 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Sat, 21 Aug 2010 17:22:19 +0530
Subject: [PATCH 1411/1628] fix x86_64_efi build

---
 gentpl.py                   |  1 +
 grub-core/Makefile.core.def | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gentpl.py b/gentpl.py
index bbec62413..5b7987390 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -16,6 +16,7 @@ GROUPS["x86"]      = GROUPS["i386"] + GROUPS["x86_64"]
 GROUPS["x86_efi"]  = [ "i386_efi", "x86_64_efi" ]
 
 GROUPS["nopc"] = GRUB_PLATFORMS[:]; GROUPS["nopc"].remove("i386_pc")
+GROUPS["x86_efi_pc"] = GROUPS["x86_efi"] + ["i386_pc"]
 
 GROUPS["x86_noefi"] = GROUPS["x86"][:]; GROUPS["x86_noefi"].remove("i386_efi"); GROUPS["x86_noefi"].remove("x86_64_efi")
 GROUPS["i386_noefi"] = GROUPS["i386"][:]; GROUPS["i386_noefi"].remove("i386_efi")
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index b7c52b9d7..fd07012f7 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -409,7 +409,7 @@ module = {
 
 module = {
   name = cpuid;
-  i386 = commands/i386/cpuid.c;
+  x86 = commands/i386/cpuid.c;
   enable = x86;
 };
 
@@ -1057,12 +1057,12 @@ module = {
 
 module = {
   name = xnu;
-  i386 = loader/xnu_resume.c;
-  i386 = loader/i386/xnu.c;
-  i386 = loader/macho32.c;
-  i386 = loader/macho64.c;
-  i386 = loader/macho.c;
-  i386 = loader/xnu.c;
+  x86_efi_pc = loader/xnu_resume.c;
+  x86_efi_pc = loader/i386/xnu.c;
+  x86_efi_pc = loader/macho32.c;
+  x86_efi_pc = loader/macho64.c;
+  x86_efi_pc = loader/macho.c;
+  x86_efi_pc = loader/xnu.c;
 
   extra_dist = loader/machoXX.c;
   enable = i386_pc;

From 5815f2c19a74ff4ad566163680fa915875a2acea Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Sat, 21 Aug 2010 21:03:26 +0530
Subject: [PATCH 1412/1628] picks 10_${host_kernel} script

---
 Makefile.util.def | 26 ++++++++++++++++++++------
 configure.ac      |  5 +++++
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/Makefile.util.def b/Makefile.util.def
index 04b3d6f1c..2ad7f6a57 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -203,12 +203,11 @@ program = {
   name = grub-mkdevicemap;
   installdir = sbin;
   mansection = 8;
-  nosparc64 = util/grub-mkdevicemap.c;
-  nosparc64 = util/deviceiter.c;
+
+  common = util/grub-mkdevicemap.c;
+  common = util/deviceiter.c;
   nosparc64 = util/devicemap.c;
 
-  sparc64_ieee1275 = util/grub-mkdevicemap.c;
-  sparc64_ieee1275 = util/deviceiter.c;
   sparc64_ieee1275 = util/ieee1275/ofpath.c;
   sparc64_ieee1275 = util/ieee1275/devicemap.c;
 
@@ -267,24 +266,39 @@ script = {
   installdir = grubconf;
 };
 
-/*
 script = {
   name = '10_windows';
   common = util/grub.d/10_windows.in;
   installdir = grubconf;
+  condition = COND_host_windows;
 };
 
 script = {
   name = '10_hurd';
   common = util/grub.d/10_hurd.in;
   installdir = grubconf;
+  condition = COND_host_hurd;
+};
+
+script = {
+  name = '10_kfreebsd.in';
+  common = util/grub.d/10_kfreebsd.in;
+  installdir = grubconf;
+  condition = COND_host_kfreebsd;
+};
+
+script = {
+  name = '10_netbsd.in';
+  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 = {
diff --git a/configure.ac b/configure.ac
index c05b506c7..19ea08c9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -873,6 +873,11 @@ AM_CONDITIONAL([COND_mips_yeeloong], [test x$target_cpu = xmips -a x$platform =
 AM_CONDITIONAL([COND_mips_qemu_mips], [test x$target_cpu = xmips -a x$platform = xqemu_mips])
 AM_CONDITIONAL([COND_sparc64_ieee1275], [test x$target_cpu = xsparc64 -a x$platform = xieee1275])
 AM_CONDITIONAL([COND_powerpc_ieee1275], [test x$target_cpu = xpowerpc -a x$platform = xieee1275])
+AM_CONDITIONAL([COND_host_hurd], [test x$host_kernel = xhurd])
+AM_CONDITIONAL([COND_host_linux], [test x$host_kernel = xlinux])
+AM_CONDITIONAL([COND_host_netbsd], [test x$host_kernel = xnetbsd])
+AM_CONDITIONAL([COND_host_windows], [test x$host_kernel = xwindows])
+AM_CONDITIONAL([COND_host_kfreebsd], [test x$host_kernel = xkfreebsd])
 
 AM_CONDITIONAL([COND_MAN_PAGES], [test x$cross_compiling = xno -a x$HELP2MAN != x])
 AM_CONDITIONAL([COND_GRUB_EMU_USB], [test x$enable_grub_emu_usb = xyes])

From f51c98c48531f4bb9b936a7c7c2c339a42e252d3 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Sat, 21 Aug 2010 21:23:42 +0530
Subject: [PATCH 1413/1628] remove wrong extension

---
 Makefile.util.def | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.util.def b/Makefile.util.def
index 2ad7f6a57..357722797 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -281,14 +281,14 @@ script = {
 };
 
 script = {
-  name = '10_kfreebsd.in';
+  name = '10_kfreebsd';
   common = util/grub.d/10_kfreebsd.in;
   installdir = grubconf;
   condition = COND_host_kfreebsd;
 };
 
 script = {
-  name = '10_netbsd.in';
+  name = '10_netbsd';
   common = util/grub.d/10_netbsd.in;
   installdir = grubconf;
   condition = COND_host_netbsd;

From 0677694455a056b1a45ddcc6ad5044a1b08f5902 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 22 Aug 2010 17:10:39 +0200
Subject: [PATCH 1414/1628] 	* term/at_keyboard.c
 (grub_at_keyboard_getkey_noblock): Don't discard 	a key after CapsLock
 or NumLock. It's just a qemu bug.

---
 ChangeLog          | 5 +++++
 term/at_keyboard.c | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b6a82a35..758b5cb5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-22  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* term/at_keyboard.c (grub_at_keyboard_getkey_noblock): Don't discard
+	a key after CapsLock or NumLock. It's just a qemu bug.
+
 2010-08-21  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/usb.h (grub_usb_device): Add 'data' field back. It's
diff --git a/term/at_keyboard.c b/term/at_keyboard.c
index c3e71ea2d..25f32a0a5 100644
--- a/term/at_keyboard.c
+++ b/term/at_keyboard.c
@@ -181,9 +181,6 @@ grub_at_keyboard_getkey_noblock (void)
   switch (code)
     {
       case CAPS_LOCK:
-	/* Caps lock sends scan code twice.  Get the second one and discard it.  */
-	while (grub_keyboard_getkey () == -1);
-
 	at_keyboard_status ^= KEYBOARD_STATUS_CAPS_LOCK;
 	led_status ^= KEYBOARD_LED_CAPS;
 	keyboard_controller_led (led_status);
@@ -194,9 +191,6 @@ grub_at_keyboard_getkey_noblock (void)
 	key = -1;
 	break;
       case NUM_LOCK:
-	/* Num lock sends scan code twice.  Get the second one and discard it.  */
-	while (grub_keyboard_getkey () == -1);
-
 	at_keyboard_status ^= KEYBOARD_STATUS_NUM_LOCK;
 	led_status ^= KEYBOARD_LED_NUM;
 	keyboard_controller_led (led_status);

From 30c4f234ccf699a7b6668ee5a0efdfce49ba7333 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Mon, 23 Aug 2010 10:31:08 +0530
Subject: [PATCH 1415/1628] fix emu build

---
 grub-core/Makefile.core.def | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index fd1fb3d24..0733ef1c2 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -316,6 +316,7 @@ module = {
   enable = emu;
   enable = i386_pc;
   enable = mips_yeeloong;
+  emu_condition = COND_GRUB_EMU_USB;
 };
 
 module = {
@@ -324,6 +325,7 @@ module = {
   enable = emu;
   enable = i386_pc;
   enable = mips_yeeloong;
+  emu_condition = COND_GRUB_EMU_USB;
 };
 
 module = {
@@ -332,6 +334,7 @@ module = {
   enable = emu;
   enable = i386_pc;
   enable = mips_yeeloong;
+  emu_condition = COND_GRUB_EMU_USB;
 };
 
 module = {

From f7711f5ef1b493530e9127a22909d626b3aeb26d Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Mon, 23 Aug 2010 13:23:56 +0530
Subject: [PATCH 1416/1628] final touches

---
 Makefile.am                 |   4 +-
 Makefile.util.def           |  26 +-
 conf/Makefile.common        |   3 +
 conf/any-emu.rmk            | 152 -------
 conf/common.rmk             | 837 ------------------------------------
 conf/i386-coreboot.rmk      |  78 ----
 conf/i386-efi.rmk           |   5 -
 conf/i386-ieee1275.rmk      |  82 ----
 conf/i386-multiboot.rmk     |  74 ----
 conf/i386-pc.rmk            | 325 --------------
 conf/i386-qemu.rmk          |  86 ----
 conf/i386.rmk               |  94 ----
 conf/mips-yeeloong.rmk      | 143 ------
 conf/mips.rmk               |  27 --
 conf/powerpc-ieee1275.rmk   |  68 ---
 conf/sparc64-ieee1275.rmk   | 104 -----
 conf/tests.rmk              | 110 -----
 conf/x86-efi.rmk            | 112 -----
 conf/x86_64-efi.rmk         |   5 -
 configure.ac                |  11 +-
 grub-core/Makefile.core.def |  19 +-
 21 files changed, 40 insertions(+), 2325 deletions(-)
 delete mode 100644 conf/any-emu.rmk
 delete mode 100644 conf/common.rmk
 delete mode 100644 conf/i386-coreboot.rmk
 delete mode 100644 conf/i386-efi.rmk
 delete mode 100644 conf/i386-ieee1275.rmk
 delete mode 100644 conf/i386-multiboot.rmk
 delete mode 100644 conf/i386-pc.rmk
 delete mode 100644 conf/i386-qemu.rmk
 delete mode 100644 conf/i386.rmk
 delete mode 100644 conf/mips-yeeloong.rmk
 delete mode 100644 conf/mips.rmk
 delete mode 100644 conf/powerpc-ieee1275.rmk
 delete mode 100644 conf/sparc64-ieee1275.rmk
 delete mode 100644 conf/tests.rmk
 delete mode 100644 conf/x86-efi.rmk
 delete mode 100644 conf/x86_64-efi.rmk

diff --git a/Makefile.am b/Makefile.am
index 4b7aa5e3a..f49a92ead 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ CLEANFILES += libgrub_a_init.c
 
 if COND_GRUB_MKFONT
 if COND_HAVE_FONT_SOURCE
-pkgdata_DATA = unicode.pf2 ascii.pf2 ascii.h widthspec.h
+grubdata_DATA = unicode.pf2 ascii.pf2 ascii.h widthspec.h
 endif
 endif
 
@@ -81,3 +81,5 @@ CLEANFILES += widthspec.h
 # Install config.h into platformdir
 platform_HEADERS = config.h
 
+pkglib_DATA += grub-mkconfig_lib
+pkglib_DATA += update-grub_lib
\ No newline at end of file
diff --git a/Makefile.util.def b/Makefile.util.def
index 357722797..89328d619 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -270,35 +270,42 @@ script = {
   name = '10_windows';
   common = util/grub.d/10_windows.in;
   installdir = grubconf;
-  condition = COND_host_windows;
+  condition = COND_HOST_WINDOWS;
 };
 
 script = {
   name = '10_hurd';
   common = util/grub.d/10_hurd.in;
   installdir = grubconf;
-  condition = COND_host_hurd;
+  condition = COND_HOST_HURD;
 };
 
 script = {
   name = '10_kfreebsd';
   common = util/grub.d/10_kfreebsd.in;
   installdir = grubconf;
-  condition = COND_host_kfreebsd;
+  condition = COND_HOST_KFREEBSD;
 };
 
 script = {
   name = '10_netbsd';
   common = util/grub.d/10_netbsd.in;
   installdir = grubconf;
-  condition = COND_host_netbsd;
+  condition = COND_HOST_NETBSD;
 };
 
 script = {
   name = '10_linux';
   common = util/grub.d/10_linux.in;
   installdir = grubconf;
-  condition = COND_host_linux;
+  condition = COND_HOST_LINUX;
+};
+
+script = {
+  name = '20_linux_xen';
+  common = util/grub.d/20_linux_xen.in;
+  installdir = grubconf;
+  condition = COND_HOST_LINUX;
 };
 
 script = {
@@ -322,9 +329,10 @@ script = {
 script = {
   mansection = 1;
   name = grub-mkrescue;
-  i386_pc_qemu_coreboot = util/grub-mkrescue.in;
+  i386_noieee1275 = util/grub-mkrescue.in;
   powerpc_ieee1275 = util/powerpc/ieee1275/grub-mkrescue.in;
   enable = i386_pc;
+  enable = x86_efi;
   enable = i386_qemu;
   enable = i386_coreboot;
   enable = powerpc_ieee1275;
@@ -371,23 +379,25 @@ script = {
 script = {
   name = grub-mkconfig_lib;
   common = util/grub-mkconfig_lib.in;
-  installdir = pkglib;
+  installdir = noinst;
 };
 
 script = {
   name = update-grub_lib;
   common = util/update-grub_lib.in;
-  installdir = pkglib;
+  installdir = noinst;
 };
 
 script = {
   name = grub-shell;
   common = tests/util/grub-shell.in;
+  installdir = noinst;
 };
 
 script = {
   name = grub-shell-tester;
   common = tests/util/grub-shell-tester.in;
+  installdir = noinst;
 };
 
 script = {
diff --git a/conf/Makefile.common b/conf/Makefile.common
index 9e8d64361..eb70f7f77 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -69,6 +69,7 @@ CCASFLAGS_LIBRARY = $(CCASFLAGS_PROGRAM)
 # Other variables
 
 grubconfdir = $(sysconfdir)/grub.d
+grubdatadir = $(datadir)/`echo @PACKAGE_TARNAME@ | sed '$(transform)'`
 platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
 
 CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
@@ -100,6 +101,7 @@ KERNEL_HEADER_FILES =
 
 man_MANS =
 noinst_DATA =
+pkglib_DATA =
 bin_SCRIPTS =
 sbin_SCRIPTS =
 bin_PROGRAMS =
@@ -108,6 +110,7 @@ sbin_PROGRAMS =
 check_SCRIPTS =
 grubconf_DATA =
 check_PROGRAMS =
+noinst_SCRIPTS =
 pkglib_SCRIPTS =
 noinst_PROGRAMS =
 grubconf_SCRIPTS =
diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
deleted file mode 100644
index 1b98a0e40..000000000
--- a/conf/any-emu.rmk
+++ /dev/null
@@ -1,152 +0,0 @@
-# -*- makefile -*-
-
-ifeq ($(target_cpu), sparc64)
-COMMON_CFLAGS += -mno-app-regs
-COMMON_LDFLAGS += -mno-relax
-endif
-
-kernel_img_RELOCATABLE = yes
-pkglib_PROGRAMS = kernel.img
-kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c kern/env.c	\
-	kern/err.c kern/list.c kern/command.c		\
-	kern/corecmd.c kern/file.c kern/fs.c kern/main.c kern/misc.c	\
-	kern/parser.c kern/partition.c kern/term.c			\
-	kern/rescue_reader.c kern/rescue_parser.c			\
-									\
-	kern/emu/main.c kern/emu/mm.c kern/emu/misc.c			\
-	kern/emu/getroot.c kern/emu/time.c kern/emu/hostdisk.c		\
-	kern/emu/hostfs.c kern/emu/console.c				\
-									\
-	gnulib/progname.c disk/host.c
-kernel_img_HEADERS += datetime.h emu/misc.h
-kernel_img_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -Wno-char-subscripts -Wno-unused -Wno-deprecated-declarations -Wno-undef -I$(srcdir)/gnulib
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
-TARGET_NO_STRIP = yes
-
-# For halt.mod.
-pkglib_MODULES += halt.mod
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-ifeq ($(target_cpu), i386)
-pkglib_MODULES += cpuid.mod
-cpuid_mod_SOURCES = commands/i386/cpuid.c
-cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
-cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-endif
-
-grub_emu_LDFLAGS = $(LIBCURSES)
-ifeq ($(target_cpu), sparc64)
-grub_emu_LDFLAGS += -m64 -melf64_sparc -mno-relax
-endif
-
-ifeq ($(enable_grub_emu_usb), yes)
-kernel_img_HEADERS += libusb.h
-
-pkglib_MODULES += libusb.mod
-libusb_mod_SOURCES = bus/usb/emu/usb.c
-libusb_mod_CFLAGS = 
-libusb_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usb.mod
-pkglib_MODULES += usb.mod
-usb_mod_SOURCES = bus/usb/usb.c
-usb_mod_CFLAGS = $(COMMON_CFLAGS)
-usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usbtest.mod
-pkglib_MODULES += usbtest.mod
-usbtest_mod_SOURCES = commands/usbtest.c
-usbtest_mod_CFLAGS = $(COMMON_CFLAGS)
-usbtest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usbms.mod
-pkglib_MODULES += usbms.mod
-usbms_mod_SOURCES = disk/usbms.c
-usbms_mod_CFLAGS = $(COMMON_CFLAGS)
-usbms_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For serial.mod.
-pkglib_MODULES += usbserial_common.mod
-usbserial_common_mod_SOURCES = bus/usb/serial/common.c
-usbserial_common_mod_CFLAGS = $(COMMON_CFLAGS)
-usbserial_common_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For serial.mod.
-pkglib_MODULES += usbserial_pl2303.mod
-usbserial_pl2303_mod_SOURCES = bus/usb/serial/pl2303.c
-usbserial_pl2303_mod_CFLAGS = $(COMMON_CFLAGS)
-usbserial_pl2303_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For serial.mod.
-pkglib_MODULES += usbserial_ftdi.mod
-usbserial_ftdi_mod_SOURCES = bus/usb/serial/ftdi.c
-usbserial_ftdi_mod_CFLAGS = $(COMMON_CFLAGS)
-usbserial_ftdi_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For serial.mod.
-pkglib_MODULES += serial.mod
-serial_mod_SOURCES = term/serial.c
-serial_mod_CFLAGS = $(COMMON_CFLAGS)
-serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-grub_emu_LDFLAGS += $(LIBUSB)
-endif
-
-ifeq ($(enable_grub_emu_sdl), yes)
-pkglib_MODULES += sdl.mod
-sdl_mod_SOURCES = video/emu/sdl.c
-sdl_mod_CFLAGS = 
-sdl_mod_LDFLAGS = $(COMMON_LDFLAGS)
-grub_emu_LDFLAGS += $(LIBSDL)
-kernel_img_HEADERS += sdl.h
-endif
-
-ifeq ($(enable_grub_emu_pci), yes)
-pkglib_MODULES += pci.mod
-pci_mod_SOURCES = bus/emu/pci.c commands/lspci.c
-pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-grub_emu_LDFLAGS += $(LIBPCIACCESS)
-kernel_img_HEADERS += libpciaccess.h
-endif
-
-include $(srcdir)/conf/common.mk
-
-grub_emu_init.h: genemuinitheader.sh $(pkglib_MODULES)
-	rm -f $@; echo $(pkglib_MODULES) | sh $(srcdir)/genemuinitheader.sh $(NM)  > $@
-DISTCLEANFILES += grub_emu_init.h
-
-grub_emu_init.c: genemuinit.sh $(pkglib_MODULES) grub_emu_init.h
-	rm -f $@; echo $(pkglib_MODULES) | sh $(srcdir)/genemuinit.sh $(NM) > $@
-DISTCLEANFILES += grub_emu_init.c
-
-grub_emu_init.o: grub_emu_init.c grub_emu_init.h
-	rm -f $@; $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -DGRUB_FILE=\"grub_init.c\" -c -o $@ $<
-CLEANFILES += grub_emu_init.o
-
-kern_emu_lite.o: kern/emu/lite.c
-	$(TARGET_CC) $(COMMON_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -DGRUB_FILE=\"kern/emu/lite.c\" -c -o $@ $<
-CLEANFILES += kern_emu_lite.o
-
-kern_emu_full.o: kern/emu/full.c
-	$(TARGET_CC) $(COMMON_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -DGRUB_FILE=\"kern/emu/full.c\" -c -o $@ $<
-CLEANFILES += kern_emu_full.o
-
-kern_emu_cache.o: kern/emu/cache.S
-	$(TARGET_CC) $(COMMON_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(TARGET_ASFLAGS) -DGRUB_FILE=\"kern/emu/cache.S\" -c -o $@ $<
-CLEANFILES += kern_emu_cache.o
-
-symlist.o: symlist.c
-	$(TARGET_CC) $(COMMON_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -DGRUB_FILE=\"symlist.c\" -c -o $@ $<
-CLEANFILES += symlist.o
-
-CLEANFILES += grub-emu-lite
-grub-emu-lite: kern_emu_lite.o kern_emu_cache.o symlist.o kernel.img
-	$(CC) -o $@ $^ $(grub_emu_LDFLAGS) $(LDFLAGS)
-GRUB_EMU_LITE=grub-emu-lite
-
-CLEANFILES += grub-emu
-grub-emu: $(PREMODFILES) kern_emu_full.o grub_emu_init.o kernel.img
-	$(CC) -o $@ $^ $(grub_emu_LDFLAGS) $(LDFLAGS)
-GRUB_EMU=grub-emu
diff --git a/conf/common.rmk b/conf/common.rmk
deleted file mode 100644
index 908bd74e8..000000000
--- a/conf/common.rmk
+++ /dev/null
@@ -1,837 +0,0 @@
-# -*- makefile -*-
-
-# Used by various components.  These rules need to precede them.
-script/lexer.c_DEPENDENCIES = grub_script.tab.h grub_script.yy.h
-
-sbin_UTILITIES += grub-mkdevicemap
-grub_mkdevicemap_SOURCES = gnulib/progname.c util/grub-mkdevicemap.c \
-	util/deviceiter.c \
-	util/misc.c kern/emu/misc.c \
-	kern/env.c kern/err.c kern/list.c kern/misc.c kern/emu/mm.c
-
-ifeq ($(target_cpu)-$(platform), sparc64-ieee1275)
-grub_mkdevicemap_SOURCES += util/ieee1275/ofpath.c util/ieee1275/devicemap.c
-else
-grub_mkdevicemap_SOURCES += util/devicemap.c
-endif
-
-# For grub-mkimage.
-bin_UTILITIES += grub-mkimage
-grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkimage.c util/misc.c \
-	util/resolve.c kern/emu/misc.c lib/LzmaEnc.c lib/LzFind.c
-util/grub-mkimage.c_DEPENDENCIES = Makefile
-
-# For grub-probe.
-sbin_UTILITIES += grub-probe
-util/grub-probe.c_DEPENDENCIES = grub_probe_init.h
-grub_probe_SOURCES = gnulib/progname.c util/grub-probe.c	\
-	kern/emu/hostdisk.c util/misc.c kern/emu/misc.c kern/emu/getroot.c kern/emu/mm.c	\
-	kern/device.c kern/disk.c kern/err.c kern/misc.c	\
-	kern/partition.c kern/file.c kern/list.c	\
-	\
-	fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c		\
-	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c	\
-	fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c	\
-	fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c		\
-	fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c		\
-	\
-	partmap/msdos.c partmap/bsdlabel.c partmap/apple.c \
-	partmap/sun.c partmap/sunpc.c partmap/gpt.c \
-	kern/fs.c kern/env.c fs/fshelp.c			\
-	disk/raid.c disk/raid5_recover.c disk/raid6_recover.c	\
-	disk/mdraid_linux.c disk/lvm.c grub_probe_init.c
-
-ifeq ($(enable_grub_fstest), yes)
-bin_UTILITIES += grub-fstest
-endif
-
-# For grub-fstest.
-util/grub-fstest.c_DEPENDENCIES = grub_fstest_init.h
-grub_fstest_SOURCES = gnulib/progname.c util/grub-fstest.c kern/emu/hostfs.c \
-	util/misc.c kern/emu/misc.c kern/emu/mm.c 	\
-	kern/file.c kern/device.c kern/disk.c kern/err.c kern/misc.c	\
-	disk/host.c disk/loopback.c kern/list.c kern/command.c		\
-	lib/arg.c commands/extcmd.c normal/datetime.c normal/misc.c	\
-	lib/hexdump.c lib/crc.c commands/blocklist.c commands/ls.c 	\
-	\
-	fs/affs.c fs/cpio.c fs/fat.c fs/ext2.c fs/hfs.c			\
-	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c		\
-	fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c	\
-	fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c fs/befs.c 	\
-	fs/befs_be.c fs/tar.c			\
-	\
-	kern/partition.c partmap/msdos.c partmap/bsdlabel.c 		\
-	partmap/apple.c partmap/sun.c partmap/sunpc.c partmap/gpt.c	\
-	kern/fs.c kern/env.c fs/fshelp.c disk/raid.c			\
-	disk/raid5_recover.c disk/raid6_recover.c 			\
-	disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c 		\
-	grub_fstest_init.c
-
-# For grub-mkfont.
-ifeq ($(enable_grub_mkfont), yes)
-bin_UTILITIES += grub-mkfont
-grub_mkfont_SOURCES = gnulib/progname.c util/grub-mkfont.c util/misc.c \
-	unidata.c kern/emu/misc.c
-grub_mkfont_CFLAGS = $(freetype_cflags)
-grub_mkfont_LDFLAGS = $(freetype_libs)
-endif
-
-# For grub-mkrelpath.
-bin_UTILITIES += grub-mkrelpath
-grub_mkrelpath_SOURCES = gnulib/progname.c util/grub-mkrelpath.c util/misc.c kern/emu/misc.c
-
-bin_UTILITIES += grub-bin2h
-grub_bin2h_SOURCES = gnulib/progname.c util/bin2h.c
-
-# For the lexer.
-grub_script.yy.c grub_script.yy.h: script/yylex.l
-	$(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $(srcdir)/script/yylex.l
-DISTCLEANFILES += grub_script.yy.c grub_script.yy.h
-
-# For grub-script-check.
-bin_UTILITIES += grub-script-check
-grub_script_check_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c \
-	util/grub-script-check.c util/misc.c kern/emu/misc.c kern/emu/mm.c \
-	script/main.c script/script.c script/function.c script/lexer.c \
-	kern/err.c kern/list.c \
-	kern/command.c kern/misc.c kern/env.c grub_script.tab.c \
-	grub_script.yy.c
-grub_script_check_CFLAGS = $(GNULIB_UTIL_CFLAGS)
-grub_script_check_DEPENDENCIES = grub_script.tab.h
-MOSTLYCLEANFILES += symlist.c kernel_syms.lst
-DEFSYMFILES += kernel_syms.lst
-
-kernel_img_HEADERS += boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
-	env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
-	partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-	list.h command.h i18n.h env_private.h libgcc.h
-
-ifneq ($(platform), emu)
-kernel_img_HEADERS += machine/memory.h machine/loader.h
-endif
-
-symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
-	/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
-	/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-
-# For the parser.
-grub_script.tab.c grub_script.tab.h: script/parser.y
-	$(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/parser.y
-DISTCLEANFILES += grub_script.tab.c grub_script.tab.h
-
-# For grub-probe.
-grub_probe_init.lst: geninit.sh $(filter-out grub_probe_init.c,$(grub_probe_SOURCES))
-	rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
-DISTCLEANFILES += grub_probe_init.lst
-
-grub_probe_init.h: grub_probe_init.lst $(filter-out grub_probe_init.c,$(grub_probe_SOURCES)) geninitheader.sh
-	rm -f $@; sh $(srcdir)/geninitheader.sh $< > $@
-DISTCLEANFILES += grub_probe_init.h
-
-grub_probe_init.c: grub_probe_init.lst $(filter-out grub_probe_init.c,$(grub_probe_SOURCES)) geninit.sh grub_probe_init.h
-	rm -f $@; sh $(srcdir)/geninit.sh $< $(filter %.c,$^) > $@
-DISTCLEANFILES += grub_probe_init.c
-
-# For grub-setup.
-grub_setup_init.lst: geninit.sh $(filter-out grub_setup_init.c,$(grub_setup_SOURCES))
-	rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
-DISTCLEANFILES += grub_setup_init.lst
-
-grub_setup_init.h: grub_setup_init.lst $(filter-out grub_setup_init.c,$(grub_setup_SOURCES)) geninitheader.sh
-	rm -f $@; sh $(srcdir)/geninitheader.sh $< > $@
-DISTCLEANFILES += grub_setup_init.h
-
-grub_setup_init.c: grub_setup_init.lst $(filter-out grub_setup_init.c,$(grub_setup_SOURCES)) geninit.sh grub_setup_init.h
-	rm -f $@; sh $(srcdir)/geninit.sh $< $(filter %.c,$^) > $@
-DISTCLEANFILES += grub_setup_init.c
-
-# For grub-fstest.
-grub_fstest_init.lst: geninit.sh $(filter-out grub_fstest_init.c,$(grub_fstest_SOURCES))
-	rm -f $@; grep GRUB_MOD_INIT $(filter %.c,$^) /dev/null > $@
-DISTCLEANFILES += grub_fstest_init.lst
-
-grub_fstest_init.h: grub_fstest_init.lst $(filter-out grub_fstest_init.c,$(grub_fstest_SOURCES)) geninitheader.sh
-	rm -f $@; sh $(srcdir)/geninitheader.sh $< > $@
-DISTCLEANFILES += grub_fstest_init.h
-
-grub_fstest_init.c: grub_fstest_init.lst $(filter-out grub_fstest_init.c,$(grub_fstest_SOURCES)) geninit.sh grub_fstest_init.h
-	rm -f $@; sh $(srcdir)/geninit.sh $< $(filter %.c,$^) > $@
-DISTCLEANFILES += grub_fstest_init.c
-
-# for grub-editenv
-bin_UTILITIES += grub-editenv
-grub_editenv_SOURCES = gnulib/progname.c util/grub-editenv.c lib/envblk.c util/misc.c kern/emu/misc.c kern/emu/mm.c kern/misc.c kern/err.c
-CLEANFILES += grub-editenv
-
-# Needed for genmk.rb to work
-ifeq (0,1)
-bin_UTILITIES += grub-macho2img grub-pe2elf
-endif
-
-grub_pe2elf_SOURCES = gnulib/progname.c util/grub-pe2elf.c util/misc.c kern/emu/misc.c
-CLEANFILES += grub-pe2elf
-
-grub_macho2img_SOURCES = util/grub-macho2img.c
-CLEANFILES += grub-macho2img
-
-# For grub-mkconfig
-grub-mkconfig: util/grub-mkconfig.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-sbin_SCRIPTS += grub-mkconfig
-CLEANFILES += grub-mkconfig
-
-grub-mkconfig_lib: util/grub-mkconfig_lib.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-lib_SCRIPTS += grub-mkconfig_lib
-CLEANFILES += grub-mkconfig_lib
-
-update-grub_lib: util/update-grub_lib.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-lib_SCRIPTS += update-grub_lib
-CLEANFILES += update-grub_lib
-
-grub-gettext_lib: util/grub-gettext_lib.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-lib_DATA += grub-gettext_lib
-CLEANFILES += grub-gettext_lib
-
-%: util/grub.d/%.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-grub-mkconfig_SCRIPTS = 00_header 30_os-prober 40_custom 41_custom
-ifneq (, $(host_kernel))
-grub-mkconfig_SCRIPTS += 10_$(host_kernel)
-endif
-ifeq (linux, $(host_kernel))
-grub-mkconfig_SCRIPTS += 20_linux_xen
-endif
-
-CLEANFILES += $(grub-mkconfig_SCRIPTS)
-
-grub-mkconfig_DATA += util/grub.d/README
-
-# For grub-set-default.
-grub-set-default: util/grub-set-default.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-sbin_SCRIPTS += grub-set-default
-CLEANFILES += grub-set-default
-
-# For grub-reboot.
-grub-reboot: util/grub-reboot.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-sbin_SCRIPTS += grub-reboot
-CLEANFILES += grub-reboot
-
-# Filing systems.
-pkglib_MODULES += fshelp.mod fat.mod ufs1.mod ufs2.mod ext2.mod ntfs.mod \
-	ntfscomp.mod minix.mod hfs.mod jfs.mod iso9660.mod xfs.mod	\
-	affs.mod sfs.mod hfsplus.mod reiserfs.mod cpio.mod tar.mod	\
-	udf.mod	afs.mod afs_be.mod befs.mod befs_be.mod
-
-# For fshelp.mod.
-fshelp_mod_SOURCES = fs/fshelp.c
-fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
-fshelp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For fat.mod.
-fat_mod_SOURCES = fs/fat.c
-fat_mod_CFLAGS = $(COMMON_CFLAGS)
-fat_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ufs1.mod.
-ufs1_mod_SOURCES = fs/ufs.c
-ufs1_mod_CFLAGS = $(COMMON_CFLAGS)
-ufs1_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ufs2.mod.
-ufs2_mod_SOURCES = fs/ufs2.c
-ufs2_mod_CFLAGS = $(COMMON_CFLAGS)
-ufs2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ext2.mod.
-ext2_mod_SOURCES = fs/ext2.c
-ext2_mod_CFLAGS = $(COMMON_CFLAGS)
-ext2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ntfs.mod.
-ntfs_mod_SOURCES = fs/ntfs.c
-ntfs_mod_CFLAGS = $(COMMON_CFLAGS)
-ntfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ntfscomp.mod.
-ntfscomp_mod_SOURCES = fs/ntfscomp.c
-ntfscomp_mod_CFLAGS = $(COMMON_CFLAGS)
-ntfscomp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For minix.mod.
-minix_mod_SOURCES = fs/minix.c
-minix_mod_CFLAGS = $(COMMON_CFLAGS)
-minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For nilfs2.mod.
-pkglib_MODULES += nilfs2.mod
-nilfs2_mod_SOURCES = fs/nilfs2.c
-nilfs2_mod_CFLAGS = $(COMMON_CFLAGS)
-nilfs2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For hfs.mod.
-hfs_mod_SOURCES = fs/hfs.c
-hfs_mod_CFLAGS = $(COMMON_CFLAGS)
-hfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For jfs.mod.
-jfs_mod_SOURCES = fs/jfs.c
-jfs_mod_CFLAGS = $(COMMON_CFLAGS)
-jfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For iso9660.mod.
-iso9660_mod_SOURCES = fs/iso9660.c
-iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
-iso9660_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For xfs.mod.
-xfs_mod_SOURCES = fs/xfs.c
-xfs_mod_CFLAGS = $(COMMON_CFLAGS)
-xfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For affs.mod.
-affs_mod_SOURCES = fs/affs.c
-affs_mod_CFLAGS = $(COMMON_CFLAGS)
-affs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sfs.mod.
-sfs_mod_SOURCES = fs/sfs.c
-sfs_mod_CFLAGS = $(COMMON_CFLAGS)
-sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For hfsplus.mod.
-hfsplus_mod_SOURCES = fs/hfsplus.c
-hfsplus_mod_CFLAGS = $(COMMON_CFLAGS)
-hfsplus_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For reiserfs.mod.
-reiserfs_mod_SOURCES = fs/reiserfs.c
-reiserfs_mod_CFLAGS = $(COMMON_CFLAGS)
-reiserfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cpio.mod.
-cpio_mod_SOURCES = fs/cpio.c
-cpio_mod_CFLAGS = $(COMMON_CFLAGS)
-cpio_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For tar.mod.
-tar_mod_SOURCES = fs/tar.c
-tar_mod_CFLAGS = $(COMMON_CFLAGS)
-tar_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For udf.mod.
-udf_mod_SOURCES = fs/udf.c
-udf_mod_CFLAGS = $(COMMON_CFLAGS)
-udf_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For afs.mod.
-afs_mod_SOURCES = fs/afs.c
-afs_mod_CFLAGS = $(COMMON_CFLAGS)
-afs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For afs_be.mod.
-afs_be_mod_SOURCES = fs/afs_be.c
-afs_be_mod_CFLAGS = $(COMMON_CFLAGS)
-afs_be_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For befs.mod.
-befs_mod_SOURCES = fs/befs.c
-befs_mod_CFLAGS = $(COMMON_CFLAGS)
-befs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For befs_be.mod.
-befs_be_mod_SOURCES = fs/befs_be.c
-befs_be_mod_CFLAGS = $(COMMON_CFLAGS)
-befs_be_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# Partition maps.
-
-pkglib_MODULES += part_amiga.mod
-part_amiga_mod_SOURCES = partmap/amiga.c
-part_amiga_mod_CFLAGS = $(COMMON_CFLAGS)
-part_amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += part_apple.mod
-part_apple_mod_SOURCES = partmap/apple.c
-part_apple_mod_CFLAGS = $(COMMON_CFLAGS)
-part_apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += part_msdos.mod
-part_msdos_mod_SOURCES = partmap/msdos.c
-part_msdos_mod_CFLAGS = $(COMMON_CFLAGS)
-part_msdos_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += part_sun.mod
-part_sun_mod_SOURCES = partmap/sun.c
-part_sun_mod_CFLAGS = $(COMMON_CFLAGS)
-part_sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += part_acorn.mod
-part_acorn_mod_SOURCES = partmap/acorn.c
-part_acorn_mod_CFLAGS = $(COMMON_CFLAGS)
-part_acorn_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += part_gpt.mod
-part_gpt_mod_SOURCES = partmap/gpt.c
-part_gpt_mod_CFLAGS = $(COMMON_CFLAGS)
-part_gpt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += part_bsd.mod
-part_bsd_mod_SOURCES = partmap/bsdlabel.c
-part_bsd_mod_CFLAGS = $(COMMON_CFLAGS)
-part_bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += part_sunpc.mod
-part_sunpc_mod_SOURCES = partmap/sunpc.c
-part_sunpc_mod_CFLAGS = $(COMMON_CFLAGS)
-part_sunpc_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# Special disk structures and generic drivers
-
-pkglib_MODULES += raid.mod raid5rec.mod raid6rec.mod mdraid.mod dm_nv.mod \
-	lvm.mod scsi.mod
-
-# For raid.mod
-raid_mod_SOURCES = disk/raid.c
-raid_mod_CFLAGS = $(COMMON_CFLAGS)
-raid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For raid5rec.mod
-raid5rec_mod_SOURCES = disk/raid5_recover.c
-raid5rec_mod_CFLAGS = $(COMMON_CFLAGS)
-raid5rec_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For raid6rec.mod
-raid6rec_mod_SOURCES = disk/raid6_recover.c
-raid6rec_mod_CFLAGS = $(COMMON_CFLAGS)
-raid6rec_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For mdraid.mod
-mdraid_mod_SOURCES = disk/mdraid_linux.c
-mdraid_mod_CFLAGS = $(COMMON_CFLAGS)
-mdraid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For dm_nv.mod
-dm_nv_mod_SOURCES = disk/dmraid_nvidia.c
-dm_nv_mod_CFLAGS = $(COMMON_CFLAGS)
-dm_nv_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lvm.mod
-lvm_mod_SOURCES = disk/lvm.c
-lvm_mod_CFLAGS = $(COMMON_CFLAGS)
-lvm_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For scsi.mod
-scsi_mod_SOURCES = disk/scsi.c
-scsi_mod_CFLAGS = $(COMMON_CFLAGS)
-scsi_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# Commands.
-pkglib_MODULES += minicmd.mod extcmd.mod hello.mod 	\
-	ls.mod cmp.mod cat.mod help.mod search.mod loopback.mod	\
-	configfile.mod echo.mod		\
-	test.mod blocklist.mod hexdump.mod		\
-	read.mod sleep.mod loadenv.mod crc.mod parttool.mod	\
-	msdospart.mod memrw.mod normal.mod 			\
-	gptsync.mod true.mod probe.mod password.mod		\
-	keystatus.mod
-
-# For password.mod.
-password_mod_SOURCES = commands/password.c
-password_mod_CFLAGS = $(COMMON_CFLAGS)
-password_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For gptsync.mod.
-gptsync_mod_SOURCES = commands/gptsync.c
-gptsync_mod_CFLAGS = $(COMMON_CFLAGS)
-gptsync_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For minicmd.mod.
-minicmd_mod_SOURCES = commands/minicmd.c
-minicmd_mod_CFLAGS = $(COMMON_CFLAGS)
-minicmd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For extcmd.mod.
-extcmd_mod_SOURCES = commands/extcmd.c lib/arg.c
-extcmd_mod_CFLAGS = $(COMMON_CFLAGS)
-extcmd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For hello.mod.
-hello_mod_SOURCES = hello/hello.c
-hello_mod_CFLAGS = $(COMMON_CFLAGS)
-hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For gfxmenu.mod.
-pkglib_MODULES += gfxmenu.mod
-gfxmenu_mod_SOURCES = \
-	gfxmenu/gfxmenu.c \
-	gfxmenu/model.c \
-	gfxmenu/view.c \
-	gfxmenu/icon_manager.c \
-	gfxmenu/theme_loader.c \
-	gfxmenu/widget-box.c \
-	gfxmenu/gui_canvas.c \
-	gfxmenu/gui_circular_progress.c \
-	gfxmenu/gui_box.c \
-	gfxmenu/gui_label.c \
-	gfxmenu/gui_list.c \
-	gfxmenu/gui_image.c \
-	gfxmenu/gui_progress_bar.c \
-	gfxmenu/gui_util.c \
-	gfxmenu/gui_string_util.c \
-	gfxmenu/named_colors.c \
-	gfxmenu/font.c
-gfxmenu_mod_CFLAGS = $(COMMON_CFLAGS)
-gfxmenu_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For parttool.mod.
-parttool_mod_SOURCES = commands/parttool.c
-parttool_mod_CFLAGS = $(COMMON_CFLAGS)
-parttool_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For msdospart.mod.
-msdospart_mod_SOURCES = parttool/msdospart.c
-msdospart_mod_CFLAGS = $(COMMON_CFLAGS)
-msdospart_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ls.mod.
-ls_mod_SOURCES = commands/ls.c
-ls_mod_CFLAGS = $(COMMON_CFLAGS)
-ls_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cmp.mod.
-cmp_mod_SOURCES = commands/cmp.c
-cmp_mod_CFLAGS = $(COMMON_CFLAGS)
-cmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cat.mod.
-cat_mod_SOURCES = commands/cat.c
-cat_mod_CFLAGS = $(COMMON_CFLAGS)
-cat_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For echo.mod
-echo_mod_SOURCES = commands/echo.c
-echo_mod_CFLAGS = $(COMMON_CFLAGS)
-echo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For help.mod.
-help_mod_SOURCES = commands/help.c
-help_mod_CFLAGS = $(COMMON_CFLAGS)
-help_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For search.mod.
-search_mod_SOURCES = commands/search_wrap.c
-search_mod_CFLAGS = $(COMMON_CFLAGS)
-search_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += search_fs_file.mod search_fs_uuid.mod search_label.mod
-
-# For search.mod.
-search_fs_file_mod_SOURCES = commands/search_file.c
-search_fs_file_mod_CFLAGS = $(COMMON_CFLAGS)
-search_fs_file_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For search.mod.
-search_label_mod_SOURCES = commands/search_label.c
-search_label_mod_CFLAGS = $(COMMON_CFLAGS)
-search_label_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For search.mod.
-search_fs_uuid_mod_SOURCES = commands/search_uuid.c
-search_fs_uuid_mod_CFLAGS = $(COMMON_CFLAGS)
-search_fs_uuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For test.mod.
-test_mod_SOURCES = commands/test.c
-test_mod_CFLAGS = $(COMMON_CFLAGS)
-test_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For loopback.mod
-loopback_mod_SOURCES = disk/loopback.c
-loopback_mod_CFLAGS = $(COMMON_CFLAGS)
-loopback_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For configfile.mod
-configfile_mod_SOURCES = commands/configfile.c
-configfile_mod_CFLAGS = $(COMMON_CFLAGS)
-configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-ifneq ($(platform), ieee1275)
-# For terminfo.mod.
-pkglib_MODULES += terminfo.mod
-terminfo_mod_SOURCES = term/terminfo.c term/tparm.c
-terminfo_mod_CFLAGS = $(COMMON_CFLAGS)
-terminfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-endif
-
-# For blocklist.mod.
-blocklist_mod_SOURCES = commands/blocklist.c
-blocklist_mod_CFLAGS = $(COMMON_CFLAGS)
-blocklist_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For hexdump.mod.
-hexdump_mod_SOURCES = commands/hexdump.c lib/hexdump.c
-hexdump_mod_CFLAGS = $(COMMON_CFLAGS)
-hexdump_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For read.mod.
-read_mod_SOURCES = commands/read.c
-read_mod_CFLAGS = $(COMMON_CFLAGS)
-read_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sleep.mod.
-sleep_mod_SOURCES = commands/sleep.c
-sleep_mod_CFLAGS = $(COMMON_CFLAGS)
-sleep_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For loadenv.mod.
-loadenv_mod_SOURCES = commands/loadenv.c lib/envblk.c
-loadenv_mod_CFLAGS = $(COMMON_CFLAGS)
-loadenv_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For crc.mod.
-crc_mod_SOURCES = commands/crc.c lib/crc.c
-crc_mod_CFLAGS = $(COMMON_CFLAGS)
-crc_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For memrw.mod.
-memrw_mod_SOURCES = commands/memrw.c
-memrw_mod_CFLAGS = $(COMMON_CFLAGS)
-memrw_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For true.mod
-true_mod_SOURCES = commands/true.c
-true_mod_CFLAGS = $(COMMON_CFLAGS)
-true_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For probe.mod.
-probe_mod_SOURCES = commands/probe.c
-probe_mod_CFLAGS = $(COMMON_CFLAGS)
-probe_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For keystatus.mod.
-keystatus_mod_SOURCES = commands/keystatus.c
-keystatus_mod_CFLAGS = $(COMMON_CFLAGS)
-keystatus_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For normal.mod.
-ifneq (, $(FONT_SOURCE))
-normal/charset.c_DEPENDENCIES = widthspec.h
-endif
-normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
-	normal/auth.c normal/autofs.c  \
-	normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
-	normal/menu_entry.c normal/menu_text.c normal/charset.c \
-	normal/misc.c normal/crypto.c normal/term.c normal/context.c \
-	script/main.c script/script.c script/execute.c script/argv.c unidata.c \
-	script/function.c script/lexer.c grub_script.tab.c grub_script.yy.c
-normal_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS) -Wno-error
-normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-ifneq (, $(FONT_SOURCE))
-font/font.c_DEPENDENCIES = ascii.h
-endif
-
-# Common Video Subsystem specific modules.
-# On Yeeloong it's part of kernel
-ifneq ($(platform), yeeloong)
-
-# For video.mod.
-pkglib_MODULES += video.mod
-video_mod_SOURCES = video/video.c
-video_mod_CFLAGS = $(COMMON_CFLAGS)
-video_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += video_fb.mod
-video_fb_mod_SOURCES = video/fb/video_fb.c video/fb/fbblit.c \
-		  video/fb/fbfill.c video/fb/fbutil.c
-video_fb_mod_CFLAGS = $(COMMON_CFLAGS)
-video_fb_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For bitmap.mod
-pkglib_MODULES += bitmap.mod
-bitmap_mod_SOURCES = video/bitmap.c
-bitmap_mod_CFLAGS = $(COMMON_CFLAGS)
-bitmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For bitmap_scale.mod
-pkglib_MODULES += bitmap_scale.mod
-bitmap_scale_mod_SOURCES = video/bitmap_scale.c
-bitmap_scale_mod_CFLAGS = $(COMMON_CFLAGS)
-bitmap_scale_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += font.mod
-font_mod_SOURCES = font/font_cmd.c font/font.c
-font_mod_CFLAGS = $(COMMON_CFLAGS)
-font_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For gfxterm.mod.
-pkglib_MODULES += gfxterm.mod
-gfxterm_mod_SOURCES = term/gfxterm.c
-gfxterm_mod_CFLAGS = $(COMMON_CFLAGS)
-gfxterm_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-endif
-
-# For videotest.mod.
-pkglib_MODULES += videotest.mod
-videotest_mod_SOURCES = commands/videotest.c
-videotest_mod_CFLAGS = $(COMMON_CFLAGS)
-videotest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For tga.mod
-pkglib_MODULES += tga.mod
-tga_mod_SOURCES = video/readers/tga.c
-tga_mod_CFLAGS = $(COMMON_CFLAGS)
-tga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For jpeg.mod.
-pkglib_MODULES += jpeg.mod
-jpeg_mod_SOURCES = video/readers/jpeg.c
-jpeg_mod_CFLAGS = $(COMMON_CFLAGS)
-jpeg_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For png.mod.
-pkglib_MODULES += png.mod
-png_mod_SOURCES = video/readers/png.c
-png_mod_CFLAGS = $(COMMON_CFLAGS)
-png_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# Misc.
-pkglib_MODULES += gzio.mod elf.mod
-
-# For elf.mod.
-elf_mod_SOURCES = kern/elf.c
-elf_mod_CFLAGS = $(COMMON_CFLAGS)
-elf_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For gzio.mod.
-gzio_mod_SOURCES = io/gzio.c
-gzio_mod_CFLAGS = $(COMMON_CFLAGS)
-gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# On Yeeloong it's part of kernel
-ifneq ($(platform), yeeloong)
-# For bufio.mod.
-pkglib_MODULES += bufio.mod
-bufio_mod_SOURCES = io/bufio.c
-bufio_mod_CFLAGS = $(COMMON_CFLAGS)
-bufio_mod_LDFLAGS = $(COMMON_LDFLAGS)
-endif
-
-# For gettext.mod.
-pkglib_MODULES += gettext.mod
-gettext_mod_SOURCES = gettext/gettext.c
-gettext_mod_CFLAGS = $(COMMON_CFLAGS)
-gettext_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# Misc.
-pkglib_MODULES += xnu_uuid.mod
-
-# For elf.mod.
-xnu_uuid_mod_SOURCES = commands/xnu_uuid.c
-xnu_uuid_mod_CFLAGS = $(COMMON_CFLAGS)
-xnu_uuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += trig.mod
-trig_mod_SOURCES = trigtables.c
-trig_mod_CFLAGS = $(COMMON_CFLAGS)
-trig_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-trigtables.c: gentrigtables
-	./gentrigtables > $@
-DISTCLEANFILES += trigtables.c
-gentrigtables: gentrigtables.c
-	$(CC) -o $@ $^ $(CPPFLAGS) -lm
-DISTCLEANFILES += gentrigtables
-
-pkglib_MODULES += setjmp.mod
-setjmp_mod_SOURCES = lib/$(target_cpu)/setjmp.S
-setjmp_mod_ASFLAGS = $(COMMON_ASFLAGS)
-setjmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += regexp.mod
-regexp_mod_SOURCES = gnulib/regex.c commands/regexp.c
-regexp_mod_CFLAGS = $(COMMON_CFLAGS) $(GNULIB_CFLAGS)
-regexp_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += terminal.mod
-terminal_mod_SOURCES = commands/terminal.c
-terminal_mod_CFLAGS = $(COMMON_CFLAGS)
-terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += crypto.mod
-crypto_mod_SOURCES = lib/crypto.c
-crypto_mod_CFLAGS = $(COMMON_CFLAGS)
-crypto_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += hashsum.mod
-hashsum_mod_SOURCES = commands/hashsum.c
-hashsum_mod_CFLAGS = $(COMMON_CFLAGS)
-hashsum_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += pbkdf2.mod
-pbkdf2_mod_SOURCES = lib/pbkdf2.c
-pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
-pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For password_pbkdf2.mod.
-pkglib_MODULES += password_pbkdf2.mod
-password_pbkdf2_mod_SOURCES = commands/password_pbkdf2.c
-password_pbkdf2_mod_CFLAGS = $(COMMON_CFLAGS)
-password_pbkdf2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For memdisk.mod.
-pkglib_MODULES += memdisk.mod
-memdisk_mod_SOURCES = disk/memdisk.c
-memdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-memdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For reboot.mod.
-pkglib_MODULES += reboot.mod
-reboot_mod_SOURCES = commands/reboot.c
-reboot_mod_CFLAGS = $(COMMON_CFLAGS)
-reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For date.mod
-pkglib_MODULES += date.mod
-date_mod_SOURCES = commands/date.c
-date_mod_CFLAGS = $(COMMON_CFLAGS)
-date_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datehook.mod
-pkglib_MODULES += datehook.mod
-datehook_mod_SOURCES = hook/datehook.c
-datehook_mod_CFLAGS = $(COMMON_CFLAGS)
-datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lsmmap.mod
-pkglib_MODULES += lsmmap.mod
-lsmmap_mod_SOURCES = commands/lsmmap.c
-lsmmap_mod_CFLAGS = $(COMMON_CFLAGS)
-lsmmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For boot.mod.
-pkglib_MODULES += boot.mod
-boot_mod_SOURCES = commands/boot.c lib/i386/pc/biosnum.c
-boot_mod_CFLAGS = $(COMMON_CFLAGS)
-boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-bin_UTILITIES += grub-mkpasswd-pbkdf2
-grub_mkpasswd_pbkdf2_SOURCES = gnulib/progname.c gnulib/getdelim.c gnulib/getline.c util/grub-mkpasswd-pbkdf2.c lib/crypto.c lib/libgcrypt-grub/cipher/sha512.c lib/pbkdf2.c util/misc.c kern/emu/misc.c kern/emu/mm.c kern/err.c
-grub_mkpasswd_pbkdf2_CFLAGS += -Wno-missing-field-initializers -Wno-error -I$(srcdir)/lib/libgcrypt_wrap -DGRUB_MKPASSWD=1
-
-include $(srcdir)/conf/gcry.mk
diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
deleted file mode 100644
index 259f4e162..000000000
--- a/conf/i386-coreboot.rmk
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- makefile -*-
-
-COMMON_CFLAGS = -mrtd -mregparm=3 
-
-# Images.
-
-pkglib_PROGRAMS += kernel.img
-kernel_img_SOURCES = kern/i386/coreboot/startup.S \
-	kern/i386/misc.S \
-	kern/i386/coreboot/init.c \
-       kern/i386/coreboot/mmap.c \
-	kern/i386/halt.c \
-	kern/main.c kern/device.c \
-	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-	kern/misc.c kern/mm.c kern/term.c \
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/time.c kern/list.c  kern/command.c kern/corecmd.c \
-	kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
-	kern/i386/tsc.c kern/i386/pit.c \
-	kern/generic/rtc_get_time_ms.c \
-	kern/generic/millisleep.c \
-	kern/env.c \
-	term/i386/pc/vga_text.c term/i386/vga_common.c \
-	symlist.c
-kernel_img_CFLAGS = $(COMMON_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x8200,-Bstatic
-
-sbin_SCRIPTS += grub-install
-grub_install_SOURCES = util/grub-install.in
-
-bin_SCRIPTS += grub-mkrescue
-grub_mkrescue_SOURCES = util/grub-mkrescue.in
-
-# Modules.
-pkglib_MODULES = linux.mod aout.mod halt.mod datetime.mod mmap.mod
-
-# For mmap.mod.
-mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
-mmap_mod_CFLAGS = $(COMMON_CFLAGS)
-mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For halt.mod.
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For aout.mod.
-aout_mod_SOURCES = loader/aout.c
-aout_mod_CFLAGS = $(COMMON_CFLAGS)
-aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For bsd.mod
-pkglib_MODULES += bsd.mod
-bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c loader/i386/bsd_helper.S loader/i386/bsd_trampoline.S
-bsd_mod_CFLAGS = $(COMMON_CFLAGS)
-bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For datetime.mod
-datetime_mod_SOURCES = lib/cmos_datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cmostest.mod
-pkglib_MODULES += cmostest.mod
-cmostest_mod_SOURCES = commands/i386/cmostest.c
-cmostest_mod_CFLAGS = $(COMMON_CFLAGS)
-cmostest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-include $(srcdir)/conf/i386.mk
-include $(srcdir)/conf/common.mk
diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
deleted file mode 100644
index e826cb333..000000000
--- a/conf/i386-efi.rmk
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- makefile -*-
-
-COMMON_LDFLAGS = -melf_i386
-
-include $(srcdir)/conf/x86-efi.mk
diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
deleted file mode 100644
index 29b3ade3c..000000000
--- a/conf/i386-ieee1275.rmk
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- makefile -*-
-
-COMMON_CFLAGS	= -mrtd -mregparm=3
-
-# Images.
-pkglib_PROGRAMS = kernel.img
-
-# For kernel.img.
-kernel_img_SOURCES = kern/i386/ieee1275/startup.S \
-	kern/i386/misc.S \
-	kern/i386/ieee1275/init.c \
-	kern/ieee1275/init.c \
-	kern/ieee1275/mmap.c \
-	kern/ieee1275/cmain.c kern/ieee1275/openfw.c \
-	kern/main.c kern/device.c \
-	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-	kern/misc.c kern/mm.c kern/term.c \
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
-	kern/env.c \
-	kern/time.c kern/list.c  kern/command.c kern/corecmd.c \
-	kern/generic/millisleep.c \
-	kern/ieee1275/ieee1275.c \
-	term/ieee1275/ofconsole.c \
-	term/terminfo.c term/tparm.c 	\
-	disk/ieee1275/ofdisk.c \
-	symlist.c
-kernel_img_HEADERS += ieee1275/ieee1275.h terminfo.h
-kernel_img_CFLAGS = $(COMMON_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x10000,-Bstatic
-
-# Scripts.
-sbin_SCRIPTS = grub-install
-
-# For grub-install.
-grub_install_SOURCES = util/ieee1275/grub-install.in
-
-# Modules.
-pkglib_MODULES = halt.mod suspend.mod		\
-	aout.mod linux.mod	\
-	nand.mod datetime.mod	\
-	mmap.mod
-
-# For mmap.mod.
-mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
-mmap_mod_CFLAGS = $(COMMON_CFLAGS)
-mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For aout.mod.
-aout_mod_SOURCES = loader/aout.c
-aout_mod_CFLAGS = $(COMMON_CFLAGS)
-aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For suspend.mod
-suspend_mod_SOURCES = commands/ieee1275/suspend.c
-suspend_mod_CFLAGS = $(COMMON_CFLAGS)
-suspend_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For halt.mod
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/ieee1275/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For nand.mod.
-nand_mod_SOURCES = disk/ieee1275/nand.c
-nand_mod_CFLAGS = $(COMMON_CFLAGS)
-nand_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datetime.mod
-datetime_mod_SOURCES = lib/cmos_datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-include $(srcdir)/conf/i386.mk
-include $(srcdir)/conf/common.mk
diff --git a/conf/i386-multiboot.rmk b/conf/i386-multiboot.rmk
deleted file mode 100644
index 69b8e9a48..000000000
--- a/conf/i386-multiboot.rmk
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- makefile -*-
-
-COMMON_CFLAGS = -mrtd -mregparm=3 
-
-# Images.
-
-GRUB_KERNEL_MACHINE_LINK_ADDR	= 0x8200
-
-pkglib_PROGRAMS += kernel.img
-kernel_img_SOURCES = kern/i386/coreboot/startup.S \
-	kern/i386/misc.S \
-	kern/i386/coreboot/init.c \
-	kern/i386/multiboot_mmap.c \
-	kern/i386/halt.c \
-	kern/main.c kern/device.c \
-	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-	kern/misc.c kern/mm.c kern/term.c \
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
-	kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
-	kern/i386/tsc.c kern/i386/pit.c \
-	kern/generic/rtc_get_time_ms.c \
-	kern/generic/millisleep.c \
-	kern/env.c \
-	term/i386/pc/vga_text.c term/i386/vga_common.c \
-	symlist.c
-kernel_img_CFLAGS = $(COMMON_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR),-Bstatic
-
-sbin_SCRIPTS += grub-install
-grub_install_SOURCES = util/grub-install.in
-
-bin_SCRIPTS += grub-mkrescue
-grub_mkrescue_SOURCES = util/grub-mkrescue.in
-
-# Modules.
-pkglib_MODULES = linux.mod aout.mod halt.mod datetime.mod mmap.mod
-
-# For mmap.mod.
-mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
-mmap_mod_CFLAGS = $(COMMON_CFLAGS)
-mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For halt.mod.
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For aout.mod.
-aout_mod_SOURCES = loader/aout.c
-aout_mod_CFLAGS = $(COMMON_CFLAGS)
-aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For bsd.mod
-pkglib_MODULES += bsd.mod
-bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c loader/i386/bsd_helper.S loader/i386/bsd_trampoline.S
-bsd_mod_CFLAGS = $(COMMON_CFLAGS)
-bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For datetime.mod
-datetime_mod_SOURCES = lib/cmos_datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-include $(srcdir)/conf/i386.mk
-include $(srcdir)/conf/common.mk
diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
deleted file mode 100644
index e9c0b4202..000000000
--- a/conf/i386-pc.rmk
+++ /dev/null
@@ -1,325 +0,0 @@
-# -*- makefile -*-
-
-COMMON_CFLAGS = -mrtd -mregparm=3
-
-# Images.
-pkglib_IMAGES = boot.img cdboot.img diskboot.img lnxboot.img pxeboot.img
-
-# For boot.img.
-boot_img_SOURCES = boot/i386/pc/boot.S
-boot_img_ASFLAGS = $(COMMON_ASFLAGS)
-boot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x7C00
-boot_img_FORMAT = binary
-
-# For pxeboot.img
-pxeboot_img_SOURCES = boot/i386/pc/pxeboot.S
-pxeboot_img_ASFLAGS = $(COMMON_ASFLAGS)
-pxeboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x7C00
-pxeboot_img_FORMAT = binary
-
-# For diskboot.img.
-diskboot_img_SOURCES = boot/i386/pc/diskboot.S
-diskboot_img_ASFLAGS = $(COMMON_ASFLAGS)
-diskboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x8000
-diskboot_img_FORMAT = binary
-
-# For lnxboot.img.
-lnxboot_img_SOURCES = boot/i386/pc/lnxboot.S
-lnxboot_img_ASFLAGS = $(COMMON_ASFLAGS)
-lnxboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x6000
-lnxboot_img_FORMAT = binary
-
-# For cdboot.img.
-cdboot_img_SOURCES = boot/i386/pc/cdboot.S
-cdboot_img_ASFLAGS = $(COMMON_ASFLAGS)
-cdboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x7C00
-cdboot_img_FORMAT = binary
-
-# For kernel.img.
-pkglib_PROGRAMS = kernel.img
-kernel_img_SOURCES = kern/i386/pc/startup.S \
-	kern/i386/misc.S \
-	kern/main.c kern/device.c \
-	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-	kern/misc.c kern/mm.c kern/term.c \
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/time.c kern/list.c kern/command.c kern/corecmd.c \
-	kern/$(target_cpu)/dl.c kern/i386/pc/init.c kern/i386/pc/mmap.c \
-	kern/parser.c kern/partition.c \
-	kern/i386/tsc.c kern/i386/pit.c \
-	kern/generic/rtc_get_time_ms.c \
-	kern/generic/millisleep.c \
-	kern/env.c \
-	term/i386/pc/console.c term/i386/vga_common.c \
-	symlist.c
-kernel_img_HEADERS += machine/biosdisk.h machine/vga.h machine/vbe.h \
-	machine/pxe.h i386/pit.h machine/kernel.h
-kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x8200 $(COMMON_CFLAGS)
-
-# Utilities.
-sbin_UTILITIES = grub-setup
-
-# For grub-setup.
-util/i386/pc/grub-setup.c_DEPENDENCIES = grub_setup_init.h
-grub_setup_SOURCES = gnulib/progname.c util/i386/pc/grub-setup.c	\
-	util/misc.c kern/emu/misc.c kern/emu/getroot.c			\
-	kern/emu/hostdisk.c kern/device.c kern/disk.c kern/err.c	\
-	kern/misc.c kern/partition.c kern/file.c			\
-	kern/emu/mm.c kern/fs.c kern/env.c kern/list.c fs/fshelp.c	\
-									\
-	fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c			\
-	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c		\
-	fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c		\
-	fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c			\
-	fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c			\
-									\
-	partmap/msdos.c partmap/bsdlabel.c partmap/sunpc.c		\
-	partmap/gpt.c							\
-									\
-	disk/raid.c disk/raid5_recover.c disk/raid6_recover.c		\
-	disk/mdraid_linux.c disk/lvm.c					\
-	util/raid.c util/lvm.c						\
-	grub_setup_init.c
-
-sbin_SCRIPTS += grub-install
-grub_install_SOURCES = util/grub-install.in
-
-bin_SCRIPTS += grub-mkrescue
-grub_mkrescue_SOURCES = util/grub-mkrescue.in
-
-pkglib_MODULES = biosdisk.mod chain.mod 				\
-	halt.mod				\
-	vbe.mod vbetest.mod vbeinfo.mod 		\
-	vga.mod				\
-	aout.mod bsd.mod pxe.mod pxecmd.mod datetime.mod  	\
-	ata_pthru.mod hdparm.mod 		\
-	usb.mod uhci.mod ohci.mod usbtest.mod usbms.mod usb_keyboard.mod \
-	efiemu.mod mmap.mod acpi.mod drivemap.mod
-
-# For drivemap.mod.
-drivemap_mod_SOURCES = commands/i386/pc/drivemap.c \
-                       commands/i386/pc/drivemap_int13h.S
-drivemap_mod_ASFLAGS = $(COMMON_ASFLAGS)
-drivemap_mod_CFLAGS = $(COMMON_CFLAGS)
-drivemap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For efiemu.mod.
-efiemu_mod_SOURCES = efiemu/main.c efiemu/i386/loadcore32.c \
-		     efiemu/i386/loadcore64.c efiemu/i386/pc/cfgtables.c \
-		     efiemu/mm.c efiemu/loadcore_common.c efiemu/symbols.c \
-		     efiemu/loadcore32.c efiemu/loadcore64.c \
-		     efiemu/prepare32.c efiemu/prepare64.c efiemu/pnvram.c \
-		     efiemu/i386/coredetect.c
-efiemu_mod_CFLAGS = $(COMMON_CFLAGS)
-efiemu_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For acpi.mod.
-acpi_mod_SOURCES = commands/acpi.c commands/i386/pc/acpi.c
-acpi_mod_CFLAGS = $(COMMON_CFLAGS)
-acpi_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For mmap.mod.
-mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c \
-		   mmap/i386/pc/mmap.c mmap/i386/pc/mmap_helper.S
-mmap_mod_CFLAGS = $(COMMON_CFLAGS)
-mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For biosdisk.mod.
-biosdisk_mod_SOURCES = disk/i386/pc/biosdisk.c
-biosdisk_mod_CFLAGS = $(COMMON_CFLAGS)
-biosdisk_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For chain.mod.
-chain_mod_SOURCES = loader/i386/pc/chainloader.c
-chain_mod_CFLAGS = $(COMMON_CFLAGS)
-chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += linux16.mod
-linux16_mod_SOURCES = loader/i386/pc/linux.c
-linux16_mod_CFLAGS = $(COMMON_CFLAGS)
-linux16_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += linux.mod
-linux_mod_SOURCES = loader/i386/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += xnu.mod
-xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c \
-	 loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
-xnu_mod_CFLAGS = $(COMMON_CFLAGS)
-xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
-xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For halt.mod.
-halt_mod_SOURCES = commands/i386/pc/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For vbe.mod.
-vbe_mod_SOURCES = video/i386/pc/vbe.c
-vbe_mod_CFLAGS = $(COMMON_CFLAGS)
-vbe_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For vbeinfo.mod.
-vbeinfo_mod_SOURCES = commands/i386/pc/vbeinfo.c
-vbeinfo_mod_CFLAGS = $(COMMON_CFLAGS)
-vbeinfo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For vbetest.mod.
-vbetest_mod_SOURCES = commands/i386/pc/vbetest.c
-vbetest_mod_CFLAGS = $(COMMON_CFLAGS)
-vbetest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For vga.mod.
-vga_mod_SOURCES = video/i386/pc/vga.c
-vga_mod_CFLAGS = $(COMMON_CFLAGS)
-vga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For aout.mod
-aout_mod_SOURCES = loader/aout.c
-aout_mod_CFLAGS = $(COMMON_CFLAGS)
-aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For bsd.mod
-bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c loader/i386/bsd_helper.S loader/i386/bsd_trampoline.S
-bsd_mod_CFLAGS = $(COMMON_CFLAGS)
-bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For usb.mod
-usb_mod_SOURCES = bus/usb/usb.c bus/usb/usbtrans.c bus/usb/usbhub.c
-usb_mod_CFLAGS = $(COMMON_CFLAGS)
-usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For serial.mod.
-pkglib_MODULES += usbserial_common.mod
-usbserial_common_mod_SOURCES = bus/usb/serial/common.c
-usbserial_common_mod_CFLAGS = $(COMMON_CFLAGS)
-usbserial_common_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For serial.mod.
-pkglib_MODULES += usbserial_pl2303.mod
-usbserial_pl2303_mod_SOURCES = bus/usb/serial/pl2303.c
-usbserial_pl2303_mod_CFLAGS = $(COMMON_CFLAGS)
-usbserial_pl2303_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For serial.mod.
-pkglib_MODULES += usbserial_ftdi.mod
-usbserial_ftdi_mod_SOURCES = bus/usb/serial/ftdi.c
-usbserial_ftdi_mod_CFLAGS = $(COMMON_CFLAGS)
-usbserial_ftdi_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usbtest.mod
-usbtest_mod_SOURCES = commands/usbtest.c
-usbtest_mod_CFLAGS = $(COMMON_CFLAGS)
-usbtest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For uhci.mod
-uhci_mod_SOURCES = bus/usb/uhci.c
-uhci_mod_CFLAGS = $(COMMON_CFLAGS)
-uhci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ohci.mod
-ohci_mod_SOURCES = bus/usb/ohci.c
-ohci_mod_CFLAGS = $(COMMON_CFLAGS)
-ohci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usbms.mod
-usbms_mod_SOURCES = disk/usbms.c
-usbms_mod_CFLAGS = $(COMMON_CFLAGS)
-usbms_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usb_keyboard.mod
-usb_keyboard_mod_SOURCES = term/usb_keyboard.c
-usb_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
-usb_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pxe.mod
-pxe_mod_SOURCES = fs/i386/pc/pxe.c
-pxe_mod_CFLAGS = $(COMMON_CFLAGS)
-pxe_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For pxecmd.mod
-pxecmd_mod_SOURCES = commands/i386/pc/pxecmd.c
-pxecmd_mod_CFLAGS = $(COMMON_CFLAGS)
-pxecmd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datetime.mod
-datetime_mod_SOURCES = lib/cmos_datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For sendkey.mod
-pkglib_MODULES += sendkey.mod
-sendkey_mod_SOURCES = commands/i386/pc/sendkey.c
-sendkey_mod_CFLAGS = $(COMMON_CFLAGS)
-sendkey_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ata_pthru.mod.
-ata_pthru_mod_SOURCES = disk/ata_pthru.c
-ata_pthru_mod_CFLAGS = $(COMMON_CFLAGS)
-ata_pthru_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For hdparm.mod.
-hdparm_mod_SOURCES = commands/hdparm.c lib/hexdump.c
-hdparm_mod_CFLAGS = $(COMMON_CFLAGS)
-hdparm_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For cmostest.mod
-pkglib_MODULES += cmostest.mod
-cmostest_mod_SOURCES = commands/i386/cmostest.c
-cmostest_mod_CFLAGS = $(COMMON_CFLAGS)
-cmostest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-ifeq ($(enable_efiemu), yes)
-
-efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
-	-rm -f $@
-ifeq ($(TARGET_APPLE_CC), 1)
-	-rm -f $@.bin
-	$(TARGET_CC) -c -m32 -DELF32 -DAPPLE_CC -o $@.bin -Wall -Werror $< -nostdlib -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-	$(OBJCONV) -felf32 -nu -nd $@.bin $@
-	-rm -f $@.bin
-else
-	$(TARGET_CC) -c -m32 -DELF32 -o $@ -Wall -Werror $< -nostdlib -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-	if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi
-endif
-
-efiemu64_c.o: efiemu/runtime/efiemu.c
-ifeq ($(TARGET_APPLE_CC), 1)
-	$(TARGET_CC) -c -m64 -DAPPLE_CC=1 -DELF64 -o $@ -Wall -Werror $< -nostdlib -mno-red-zone -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-else
-	$(TARGET_CC) -c -m64 -DELF64 -o $@ -Wall -Werror $< -nostdlib  -mcmodel=large -mno-red-zone -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-endif
-
-efiemu64_s.o: efiemu/runtime/efiemu.S
-	-rm -f $@
-ifeq ($(TARGET_APPLE_CC), 1)
-	$(TARGET_CC) -c -m64 -DAPPLE_CC=1 -DELF64 -o $@ -Wall -Werror $< -nostdlib -mno-red-zone -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-else
-	$(TARGET_CC) -c -m64 -DELF64 -o $@ -Wall -Werror $< -nostdlib  -mcmodel=large -mno-red-zone -O2 -I$(srcdir)/efiemu/runtime -I$(srcdir)/include -Iinclude
-endif
-
-efiemu64.o: efiemu64_c.o efiemu64_s.o  $(TARGET_OBJ2ELF)
-	-rm -f $@
-ifeq ($(TARGET_APPLE_CC), 1)
-	-rm -f $@.bin
-	$(TARGET_CC) -m64 -o $@.bin -Wl,-r $^ -nostdlib
-	$(OBJCONV) -felf64 -nu -nd $@.bin $@
-	-rm -f $@.bin
-else
-	$(TARGET_CC) -m64 -o $@ -Wl,-r $^ -nostdlib
-	if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi
-endif
-
-CLEANFILES += efiemu32.o efiemu64.o efiemu64_c.o efiemu64_s.o
-pkglib_DATA += efiemu32.o efiemu64.o
-
-endif
-
-include $(srcdir)/conf/i386.mk
-include $(srcdir)/conf/common.mk
diff --git a/conf/i386-qemu.rmk b/conf/i386-qemu.rmk
deleted file mode 100644
index adb5f7f0f..000000000
--- a/conf/i386-qemu.rmk
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- makefile -*-
-
-COMMON_CFLAGS = -mrtd -mregparm=3
-
-# Images.
-
-GRUB_KERNEL_MACHINE_LINK_ADDR	= 0x8200
-GRUB_BOOT_MACHINE_LINK_ADDR	= 0xffe00
-
-pkglib_IMAGES += boot.img
-boot_img_SOURCES = boot/i386/qemu/boot.S
-boot_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
-boot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_BOOT_MACHINE_LINK_ADDR)
-boot_img_FORMAT = binary
-
-kern/i386/qemu/init.c_DEPENDENCIES = ascii.h
-
-pkglib_PROGRAMS += kernel.img
-kernel_img_SOURCES = kern/i386/qemu/startup.S \
-	kern/i386/misc.S \
-	kern/i386/coreboot/init.c \
-	kern/i386/qemu/init.c \
-	kern/i386/qemu/mmap.c \
-	kern/i386/halt.c \
-	kern/main.c kern/device.c \
-	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-	kern/misc.c kern/mm.c kern/term.c \
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/time.c kern/list.c  kern/command.c kern/corecmd.c \
-	kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
-	kern/i386/tsc.c kern/i386/pit.c \
-	kern/generic/rtc_get_time_ms.c \
-	kern/generic/millisleep.c \
-	kern/env.c \
-	term/i386/pc/vga_text.c term/i386/vga_common.c bus/pci.c \
-	symlist.c
-kernel_img_HEADERS += pci.h
-kernel_img_CFLAGS = $(COMMON_CFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-kernel_img_FORMAT = binary
-
-sbin_SCRIPTS += grub-install
-grub_install_SOURCES = util/grub-install.in
-
-bin_SCRIPTS += grub-mkrescue
-grub_mkrescue_SOURCES = util/grub-mkrescue.in
-
-# Modules.
-pkglib_MODULES = linux.mod aout.mod halt.mod datetime.mod mmap.mod
-
-# For mmap.mod.
-mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c
-mmap_mod_CFLAGS = $(COMMON_CFLAGS)
-mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For linux.mod.
-linux_mod_SOURCES = loader/i386/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For halt.mod.
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For aout.mod.
-aout_mod_SOURCES = loader/aout.c
-aout_mod_CFLAGS = $(COMMON_CFLAGS)
-aout_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For bsd.mod
-pkglib_MODULES += bsd.mod
-bsd_mod_SOURCES = loader/i386/bsd.c loader/i386/bsd32.c loader/i386/bsd64.c loader/i386/bsd_helper.S loader/i386/bsd_trampoline.S
-bsd_mod_CFLAGS = $(COMMON_CFLAGS)
-bsd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-bsd_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For datetime.mod
-datetime_mod_SOURCES = lib/cmos_datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-include $(srcdir)/conf/i386.mk
-include $(srcdir)/conf/common.mk
diff --git a/conf/i386.rmk b/conf/i386.rmk
deleted file mode 100644
index 6bf1b3410..000000000
--- a/conf/i386.rmk
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- makefile -*-
-
-pkglib_MODULES += cpuid.mod
-cpuid_mod_SOURCES = commands/i386/cpuid.c
-cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
-cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += at_keyboard.mod
-at_keyboard_mod_SOURCES = term/at_keyboard.c
-at_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
-at_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += vga_text.mod
-vga_text_mod_SOURCES = term/i386/pc/vga_text.c term/i386/vga_common.c
-vga_text_mod_CFLAGS = $(COMMON_CFLAGS)
-vga_text_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += video_cirrus.mod
-video_cirrus_mod_SOURCES = video/cirrus.c
-video_cirrus_mod_CFLAGS = $(COMMON_CFLAGS)
-video_cirrus_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += video_bochs.mod
-video_bochs_mod_SOURCES = video/bochs.c
-video_bochs_mod_CFLAGS = $(COMMON_CFLAGS)
-video_bochs_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += relocator.mod
-relocator_mod_SOURCES = lib/i386/relocator.c lib/i386/relocator_asm.S lib/i386/relocator_backward.S
-relocator_mod_CFLAGS = $(COMMON_CFLAGS)
-relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
-relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += ata.mod
-ata_mod_SOURCES = disk/ata.c
-ata_mod_CFLAGS = $(COMMON_CFLAGS)
-ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For setpci.mod
-pkglib_MODULES += setpci.mod
-setpci_mod_SOURCES = commands/setpci.c
-setpci_mod_CFLAGS = $(COMMON_CFLAGS)
-setpci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += multiboot.mod
-multiboot_mod_SOURCES = loader/multiboot.c loader/i386/multiboot_mbi.c
-multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
-multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-multiboot_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-pkglib_MODULES += multiboot2.mod
-multiboot2_mod_SOURCES = loader/multiboot.c loader/multiboot_mbi2.c
-multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
-multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For serial.mod.
-pkglib_MODULES += serial.mod
-serial_mod_SOURCES = term/serial.c term/ns8250.c
-serial_mod_CFLAGS = $(COMMON_CFLAGS)
-serial_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# On qemu it's compiled in
-ifneq ($(platform), qemu)
-# For pci.mod
-pkglib_MODULES += pci.mod
-pci_mod_SOURCES = bus/pci.c
-pci_mod_CFLAGS = $(COMMON_CFLAGS)
-pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-endif
-
-# For cs5536.mod
-pkglib_MODULES += cs5536.mod
-cs5536_mod_SOURCES = bus/cs5536.c
-cs5536_mod_CFLAGS = $(COMMON_CFLAGS)
-cs5536_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lspci.mod
-pkglib_MODULES += lspci.mod
-lspci_mod_SOURCES = commands/lspci.c
-lspci_mod_CFLAGS = $(COMMON_CFLAGS)
-lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For play.mod.
-pkglib_MODULES += play.mod
-play_mod_SOURCES = commands/i386/pc/play.c
-play_mod_CFLAGS = $(COMMON_CFLAGS)
-play_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For iorw.mod.
-pkglib_MODULES += iorw.mod
-iorw_mod_SOURCES = commands/iorw.c
-iorw_mod_CFLAGS = $(COMMON_CFLAGS)
-iorw_mod_LDFLAGS = $(COMMON_LDFLAGS)
diff --git a/conf/mips-yeeloong.rmk b/conf/mips-yeeloong.rmk
deleted file mode 100644
index 9cbbdf472..000000000
--- a/conf/mips-yeeloong.rmk
+++ /dev/null
@@ -1,143 +0,0 @@
-# -*- makefile -*-
-LINK_BASE = 0x80200000
-target_machine=yeeloong
-COMMON_CFLAGS += -march=mips3
-COMMON_ASFLAGS += -march=mips3
-
-kernel_img_HEADERS += pci.h bitmap.h video.h gfxterm.h font.h \
-		      bitmap_scale.h bufio.h cs5536.h machine/pci.h serial.h
-
-include $(srcdir)/conf/mips.mk
-
-pkglib_PROGRAMS = kernel.img
-kernel_img_SOURCES = kern/$(target_cpu)/startup.S \
-	kern/main.c kern/device.c kern/$(target_cpu)/init.c \
-	kern/$(target_cpu)/$(target_machine)/init.c 		\
-	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c 		\
-	kern/misc.c kern/mm.c kern/term.c 	\
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/list.c  kern/command.c kern/corecmd.c	\
-	kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c 	\
-	kern/generic/millisleep.c kern/generic/rtc_get_time_ms.c kern/time.c    \
-	kern/$(target_cpu)/cache.S \
-	\
-	term/at_keyboard.c \
-	font/font_cmd.c font/font.c io/bufio.c \
-	video/video.c video/fb/video_fb.c video/fb/fbblit.c \
-	video/fb/fbfill.c video/fb/fbutil.c video/bitmap.c \
-	video/bitmap_scale.c video/sm712.c bus/pci.c bus/bonito.c \
-	term/gfxterm.c commands/extcmd.c lib/arg.c \
-	bus/cs5536.c term/serial.c term/ns8250.c term/terminfo.c term/tparm.c \
-	symlist.c
-kernel_img_CFLAGS = $(COMMON_CFLAGS) -DUSE_ASCII_FAILBACK
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(LINK_BASE),-Bstatic
-kernel_img_FORMAT = binary
-
-pkglib_IMAGES += fwstart.img
-fwstart_img_SOURCES = boot/$(target_cpu)/$(target_machine)/fwstart.S
-fwstart_img_CFLAGS = $(COMMON_CFLAGS)
-fwstart_img_ASFLAGS = $(COMMON_ASFLAGS)
-fwstart_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
-	-Wl,-N,-S,-Ttext,0xbfc00000,-Bstatic
-fwstart_img_FORMAT = binary
-
-# For ata.mod.
-pkglib_MODULES += ata.mod
-ata_mod_SOURCES = disk/ata.c
-ata_mod_CFLAGS = $(COMMON_CFLAGS)
-ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lspci.mod
-pkglib_MODULES += lspci.mod
-lspci_mod_SOURCES = commands/lspci.c
-lspci_mod_CFLAGS = $(COMMON_CFLAGS)
-lspci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ata_pthru.mod.
-pkglib_MODULES += ata_pthru.mod
-ata_pthru_mod_SOURCES = disk/ata_pthru.c
-ata_pthru_mod_CFLAGS = $(COMMON_CFLAGS)
-ata_pthru_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For mmap.mod.
-pkglib_MODULES += mmap.mod
-mmap_mod_SOURCES = mmap/mmap.c mmap/mips/yeeloong/uppermem.c
-mmap_mod_CFLAGS = $(COMMON_CFLAGS)
-mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-# For datetime.mod
-pkglib_MODULES += datetime.mod
-datetime_mod_SOURCES = lib/cmos_datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For lsspd.mod
-pkglib_MODULES += lsspd.mod
-lsspd_mod_SOURCES = commands/mips/yeeloong/lsspd.c
-lsspd_mod_CFLAGS = $(COMMON_CFLAGS)
-lsspd_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += linux.mod
-linux_mod_SOURCES = loader/$(target_cpu)/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For halt.mod.
-pkglib_MODULES += halt.mod
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usb.mod
-pkglib_MODULES += usb.mod
-usb_mod_SOURCES = bus/usb/usb.c bus/usb/usbtrans.c bus/usb/usbhub.c
-usb_mod_CFLAGS = $(COMMON_CFLAGS)
-usb_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For serial.mod.
-pkglib_MODULES += usbserial_common.mod
-usbserial_common_mod_SOURCES = bus/usb/serial/common.c
-usbserial_common_mod_CFLAGS = $(COMMON_CFLAGS)
-usbserial_common_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For serial.mod.
-pkglib_MODULES += usbserial_pl2303.mod
-usbserial_pl2303_mod_SOURCES = bus/usb/serial/pl2303.c
-usbserial_pl2303_mod_CFLAGS = $(COMMON_CFLAGS)
-usbserial_pl2303_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For serial.mod.
-pkglib_MODULES += usbserial_ftdi.mod
-usbserial_ftdi_mod_SOURCES = bus/usb/serial/ftdi.c
-usbserial_ftdi_mod_CFLAGS = $(COMMON_CFLAGS)
-usbserial_ftdi_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usbtest.mod
-pkglib_MODULES += usbtest.mod
-usbtest_mod_SOURCES = commands/usbtest.c
-usbtest_mod_CFLAGS = $(COMMON_CFLAGS)
-usbtest_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For ohci.mod
-pkglib_MODULES += ohci.mod
-ohci_mod_SOURCES = bus/usb/ohci.c
-ohci_mod_CFLAGS = $(COMMON_CFLAGS)
-ohci_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usbms.mod
-pkglib_MODULES += usbms.mod
-usbms_mod_SOURCES = disk/usbms.c
-usbms_mod_CFLAGS = $(COMMON_CFLAGS)
-usbms_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For usb_keyboard.mod
-pkglib_MODULES += usb_keyboard.mod
-usb_keyboard_mod_SOURCES = term/usb_keyboard.c
-usb_keyboard_mod_CFLAGS = $(COMMON_CFLAGS)
-usb_keyboard_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-sbin_SCRIPTS += grub-install
-grub_install_SOURCES = util/grub-install.in
diff --git a/conf/mips.rmk b/conf/mips.rmk
deleted file mode 100644
index 26c516fc4..000000000
--- a/conf/mips.rmk
+++ /dev/null
@@ -1,27 +0,0 @@
-
-# -*- makefile -*-
-
-COMMON_CFLAGS += -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
-
-# Images.
-kernel_img_HEADERS += cpu/cache.h
-
-# Scripts.
-sbin_SCRIPTS = 
-bin_SCRIPTS = 
-
-# For relocator.mod.
-pkglib_MODULES += relocator.mod
-relocator_mod_SOURCES = lib/$(target_cpu)/relocator.c lib/$(target_cpu)/relocator_asm.S
-relocator_mod_CFLAGS = $(COMMON_CFLAGS)
-relocator_mod_ASFLAGS = $(COMMON_ASFLAGS)
-relocator_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += multiboot2.mod
-multiboot2_mod_SOURCES = loader/multiboot.c \
-			 loader/multiboot_mbi2.c
-multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
-multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
-multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-include $(srcdir)/conf/common.mk
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
deleted file mode 100644
index 3ec5ec906..000000000
--- a/conf/powerpc-ieee1275.rmk
+++ /dev/null
@@ -1,68 +0,0 @@
-
-# -*- makefile -*-
-
-# Images.
-
-kernel_img_HEADERS += ieee1275/ieee1275.h
-
-# Programs
-pkglib_PROGRAMS = kernel.img
-
-kernel_img_SOURCES = kern/powerpc/ieee1275/startup.S kern/ieee1275/cmain.c \
-	kern/ieee1275/ieee1275.c kern/main.c kern/device.c 		\
-	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c 		\
-	kern/misc.c kern/mm.c kern/term.c 	\
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/list.c  kern/command.c kern/corecmd.c	\
-	kern/ieee1275/init.c 						\
-	kern/ieee1275/mmap.c						\
-	term/ieee1275/ofconsole.c term/terminfo.c term/tparm.c 		\
-	kern/ieee1275/openfw.c disk/ieee1275/ofdisk.c 		\
-	kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c 	\
-	kern/generic/millisleep.c kern/time.c                            \
-	symlist.c kern/$(target_cpu)/cache.S
-kernel_img_CFLAGS = $(COMMON_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS += $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x200000,-Bstatic
-
-# Scripts.
-sbin_SCRIPTS = grub-install
-bin_SCRIPTS = grub-mkrescue
-
-# For grub-install.
-grub_install_SOURCES = util/ieee1275/grub-install.in
-
-# For grub-mkrescue.
-grub_mkrescue_SOURCES = util/powerpc/ieee1275/grub-mkrescue.in
-
-# Modules.
-pkglib_MODULES += ieee1275_fb.mod 
-ieee1275_fb_mod_SOURCES = video/ieee1275.c
-ieee1275_fb_mod_CFLAGS = $(COMMON_CFLAGS)
-ieee1275_fb_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For linux.mod.
-pkglib_MODULES += linux.mod
-linux_mod_SOURCES = loader/powerpc/ieee1275/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For suspend.mod
-pkglib_MODULES += suspend.mod
-suspend_mod_SOURCES = commands/ieee1275/suspend.c
-suspend_mod_CFLAGS = $(COMMON_CFLAGS)
-suspend_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For halt.mod
-pkglib_MODULES += halt.mod
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datetime.mod
-pkglib_MODULES += datetime.mod
-datetime_mod_SOURCES = lib/ieee1275/datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-include $(srcdir)/conf/common.mk
diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
deleted file mode 100644
index d343ac349..000000000
--- a/conf/sparc64-ieee1275.rmk
+++ /dev/null
@@ -1,104 +0,0 @@
-
-# -*- makefile -*-
-
-COMMON_CFLAGS = -mno-app-regs
-COMMON_LDFLAGS = -melf64_sparc -mno-relax
-
-# Images.
-pkglib_IMAGES = boot.img diskboot.img
-pkglib_PROGRAMS = kernel.img
-
-# For boot.img.
-boot_img_SOURCES = boot/sparc64/ieee1275/boot.S
-boot_img_ASFLAGS = $(COMMON_ASFLAGS)
-boot_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-Ttext,0x4000
-boot_img_FORMAT = a.out-sunos-big
-
-# For diskboot.img.
-diskboot_img_SOURCES = boot/sparc64/ieee1275/diskboot.S
-diskboot_img_ASFLAGS = $(COMMON_ASFLAGS)
-diskboot_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-Ttext,0x4200
-diskboot_img_FORMAT = binary
-
-kernel_img_HEADERS += ieee1275/ieee1275.h cpu/ieee1275/ieee1275.h
-kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c	\
-	kern/ieee1275/ieee1275.c kern/main.c kern/device.c		\
-	kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c		\
-	kern/misc.c kern/mm.c kern/term.c			\
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/list.c  kern/command.c kern/corecmd.c	\
-	kern/sparc64/ieee1275/ieee1275.c 				\
-	kern/sparc64/ieee1275/init.c 					\
-	kern/ieee1275/mmap.c						\
-	term/ieee1275/ofconsole.c 					\
-	kern/ieee1275/openfw.c term/terminfo.c term/tparm.c		\
-	disk/ieee1275/ofdisk.c	\
-	kern/parser.c kern/partition.c kern/env.c kern/$(target_cpu)/dl.c	\
-	kern/generic/millisleep.c kern/time.c				\
-	symlist.c kern/$(target_cpu)/cache.S
-kernel_img_CFLAGS = $(COMMON_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS += -nostdlib -Wl,-N,-Ttext,0x4400,-Bstatic,-melf64_sparc
-kernel_img_FORMAT = binary
-
-# Utilities.
-sbin_UTILITIES = grub-setup grub-ofpathname
-
-# For grub-setup.
-util/sparc64/ieee1275/grub-setup.c_DEPENDENCIES = grub_setup_init.h
-grub_setup_SOURCES = util/sparc64/ieee1275/grub-setup.c			\
-	util/ieee1275/ofpath.c util/misc.c kern/emu/hostdisk.c		\
-	kern/emu/misc.c kern/emu/getroot.c kern/emu/mm.c kern/device.c	\
-	kern/disk.c kern/err.c kern/misc.c 				\
-	kern/partition.c kern/file.c kern/fs.c kern/env.c kern/list.c	\
-	fs/fshelp.c							\
-									\
-	fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c			\
-	fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c		\
-	fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c		\
-	fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c			\
-	fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c			\
-									\
-	partmap/amiga.c	partmap/apple.c partmap/msdos.c			\
-	partmap/bsdlabel.c partmap/sun.c partmap/acorn.c		\
-									\
-	disk/raid.c disk/raid5_recover.c disk/raid6_recover.c		\
-	disk/mdraid_linux.c disk/lvm.c util/raid.c			\
-	util/lvm.c gnulib/progname.c grub_setup_init.c
-
-# For grub-ofpathname.
-grub_ofpathname_SOURCES = util/ieee1275/grub-ofpathname.c	\
-	util/ieee1275/ofpath.c util/misc.c kern/emu/misc.c	\
-	gnulib/progname.c
-
-# Scripts.
-sbin_SCRIPTS = grub-install
-
-# For grub-install.
-grub_install_SOURCES = util/grub-install.in
-
-# Modules.
-pkglib_MODULES += ieee1275_fb.mod 
-ieee1275_fb_mod_SOURCES = video/ieee1275.c
-ieee1275_fb_mod_CFLAGS = $(COMMON_CFLAGS)
-ieee1275_fb_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For linux.mod.
-pkglib_MODULES += linux.mod 
-linux_mod_SOURCES = loader/sparc64/ieee1275/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For halt.mod.
-pkglib_MODULES += halt.mod
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datetime.mod
-pkglib_MODULES += datetime.mod
-datetime_mod_SOURCES = lib/ieee1275/datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-include $(srcdir)/conf/common.mk
diff --git a/conf/tests.rmk b/conf/tests.rmk
deleted file mode 100644
index c14fe0fda..000000000
--- a/conf/tests.rmk
+++ /dev/null
@@ -1,110 +0,0 @@
-# -*- makefile -*-
-
-# For grub-shell
-grub-shell: tests/util/grub-shell.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-check_SCRIPTS += grub-shell
-CLEANFILES += grub-shell
-
-# For grub-shell-tester
-grub-shell-tester: tests/util/grub-shell-tester.in config.status
-	./config.status --file=$@:$<
-	chmod +x $@
-check_SCRIPTS += grub-shell-tester
-CLEANFILES += grub-shell-tester
-
-pkglib_MODULES += functional_test.mod
-functional_test_mod_SOURCES = tests/lib/functional_test.c tests/lib/test.c
-functional_test_mod_CFLAGS  = $(COMMON_CFLAGS)
-functional_test_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# Rules for unit tests
-check_UTILITIES += example_unit_test
-example_unit_test_SOURCES = tests/example_unit_test.c kern/list.c kern/misc.c tests/lib/test.c tests/lib/unit_test.c
-example_unit_test_CFLAGS  = -Wno-format
-
-# Rules for functional tests
-pkglib_MODULES += example_functional_test.mod
-example_functional_test_mod_SOURCES = tests/example_functional_test.c
-example_functional_test_mod_CFLAGS  = -Wno-format $(COMMON_CFLAGS)
-example_functional_test_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# Rules for scripted tests
-check_SCRIPTS += example_scripted_test
-example_scripted_test_SOURCES = tests/example_scripted_test.in
-
-check_SCRIPTS += example_grub_script_test
-example_grub_script_test_SOURCES = tests/example_grub_script_test.in
-
-#
-# Rules for real tests
-#
-
-check_SCRIPTS += grub_script_echo1
-grub_script_echo1_SOURCES = tests/grub_script_echo1.in
-
-check_SCRIPTS += grub_script_echo_keywords
-grub_script_echo_keywords_SOURCES = tests/grub_script_echo_keywords.in
-
-check_SCRIPTS += grub_script_vars1
-grub_script_vars1_SOURCES = tests/grub_script_vars1.in
-
-check_SCRIPTS += grub_script_for1
-grub_script_for1_SOURCES = tests/grub_script_for1.in
-
-check_SCRIPTS += grub_script_while1
-grub_script_while1_SOURCES = tests/grub_script_while1.in
-
-check_SCRIPTS += grub_script_if
-grub_script_if_SOURCES = tests/grub_script_if.in
-
-check_SCRIPTS += grub_script_blanklines
-grub_script_blanklines_SOURCES = tests/grub_script_blanklines.in
-
-check_SCRIPTS += grub_script_final_semicolon
-grub_script_final_semicolon_SOURCES = tests/grub_script_final_semicolon.in
-
-check_SCRIPTS += grub_script_dollar
-grub_script_dollar_SOURCES = tests/grub_script_dollar.in
-
-check_SCRIPTS += grub_script_comments
-grub_script_comments_SOURCES = tests/grub_script_comments.in
-
-check_SCRIPTS += grub_script_functions
-grub_script_functions_SOURCES = tests/grub_script_functions.in
-
-check_SCRIPTS += grub_script_break
-grub_script_break_SOURCES = tests/grub_script_break.in
-
-check_SCRIPTS += grub_script_continue
-grub_script_continue_SOURCES = tests/grub_script_continue.in
-
-check_SCRIPTS += grub_script_shift
-grub_script_shift_SOURCES = tests/grub_script_shift.in
-
-# List of tests to execute on "make check"
-# SCRIPTED_TESTS    = example_scripted_test
-# SCRIPTED_TESTS   += example_grub_script_test
-# UNIT_TESTS        = example_unit_test
-# FUNCTIONAL_TESTS  = example_functional_test.mod
-
-SCRIPTED_TESTS  = grub_script_echo1
-SCRIPTED_TESTS += grub_script_echo_keywords
-SCRIPTED_TESTS += grub_script_vars1
-SCRIPTED_TESTS += grub_script_for1
-SCRIPTED_TESTS += grub_script_while1
-SCRIPTED_TESTS += grub_script_if
-SCRIPTED_TESTS += grub_script_blanklines
-SCRIPTED_TESTS += grub_script_final_semicolon
-SCRIPTED_TESTS += grub_script_dollar
-SCRIPTED_TESTS += grub_script_comments
-SCRIPTED_TESTS += grub_script_functions
-SCRIPTED_TESTS += grub_script_break
-SCRIPTED_TESTS += grub_script_continue
-SCRIPTED_TESTS += grub_script_shift
-
-# dependencies between tests and testing-tools
-$(SCRIPTED_TESTS): grub-shell grub-shell-tester
-$(FUNCTIONAL_TESTS): functional_test.mod
-
diff --git a/conf/x86-efi.rmk b/conf/x86-efi.rmk
deleted file mode 100644
index f9f07684e..000000000
--- a/conf/x86-efi.rmk
+++ /dev/null
@@ -1,112 +0,0 @@
-# -*- makefile -*-
-
-# Scripts.
-sbin_SCRIPTS = grub-install
-
-# For grub-install.
-grub_install_SOURCES = util/i386/efi/grub-install.in
-
-bin_SCRIPTS += grub-mkrescue
-grub_mkrescue_SOURCES = util/grub-mkrescue.in
-
-# Modules.
-pkglib_PROGRAMS = kernel.img
-pkglib_MODULES = chain.mod appleldr.mod \
-	linux.mod halt.mod  \
-	datetime.mod loadbios.mod \
-	fixvideo.mod mmap.mod acpi.mod
-
-# For kernel.img.
-kernel_img_RELOCATABLE = yes
-kernel_img_SOURCES = kern/$(target_cpu)/efi/startup.S kern/main.c kern/device.c \
-	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
-	kern/misc.c kern/mm.c kern/term.c \
-	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/$(target_cpu)/dl.c kern/i386/efi/init.c kern/parser.c kern/partition.c \
-	kern/env.c symlist.c kern/efi/efi.c kern/efi/init.c kern/efi/mm.c \
-	term/efi/console.c disk/efi/efidisk.c \
-	kern/time.c kern/list.c  kern/command.c kern/corecmd.c \
-	kern/i386/tsc.c kern/i386/pit.c \
-	kern/generic/rtc_get_time_ms.c \
-	kern/generic/millisleep.c
-ifeq ($(target_cpu),x86_64)
-kernel_img_SOURCES += kern/x86_64/efi/callwrap.S
-endif
-kernel_img_HEADERS += efi/efi.h efi/time.h efi/disk.h i386/pit.h
-kernel_img_CFLAGS = $(COMMON_CFLAGS)
-kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS += $(COMMON_LDFLAGS)
-
-# For acpi.mod.
-acpi_mod_SOURCES = commands/acpi.c commands/efi/acpi.c
-acpi_mod_CFLAGS = $(COMMON_CFLAGS)
-acpi_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For mmap.mod.
-mmap_mod_SOURCES = mmap/mmap.c mmap/i386/uppermem.c mmap/i386/mmap.c \
-		   mmap/efi/mmap.c
-mmap_mod_CFLAGS = $(COMMON_CFLAGS)
-mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For chain.mod.
-chain_mod_SOURCES = loader/efi/chainloader.c
-chain_mod_CFLAGS = $(COMMON_CFLAGS)
-chain_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For appleldr.mod.
-appleldr_mod_SOURCES = loader/efi/appleloader.c
-appleldr_mod_CFLAGS = $(COMMON_CFLAGS)
-appleldr_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For linux.mod.
-ifeq ($(target_cpu), x86_64)
-linux_mod_SOURCES = loader/i386/efi/linux.c loader/i386/linux_trampoline.S
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-else
-linux_mod_SOURCES = loader/i386/efi/linux.c
-linux_mod_CFLAGS = $(COMMON_CFLAGS)
-linux_mod_ASFLAGS = $(COMMON_ASFLAGS)
-linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
-endif
-
-# For halt.mod.
-halt_mod_SOURCES = commands/halt.c
-halt_mod_CFLAGS = $(COMMON_CFLAGS)
-halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For datetime.mod
-datetime_mod_SOURCES = lib/efi/datetime.c
-datetime_mod_CFLAGS = $(COMMON_CFLAGS)
-datetime_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For loadbios.mod
-loadbios_mod_SOURCES = commands/efi/loadbios.c
-loadbios_mod_CFLAGS = $(COMMON_CFLAGS)
-loadbios_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-# For fixvideo.mod
-fixvideo_mod_SOURCES = commands/efi/fixvideo.c
-fixvideo_mod_CFLAGS = $(COMMON_CFLAGS)
-fixvideo_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += efi_uga.mod
-efi_uga_mod_SOURCES = video/efi_uga.c
-efi_uga_mod_CFLAGS = $(COMMON_CFLAGS)
-efi_uga_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += efi_gop.mod
-efi_gop_mod_SOURCES = video/efi_gop.c
-efi_gop_mod_CFLAGS = $(COMMON_CFLAGS)
-efi_gop_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
-pkglib_MODULES += xnu.mod
-xnu_mod_SOURCES = loader/xnu_resume.c loader/i386/xnu.c \
-	loader/macho32.c loader/macho64.c loader/macho.c loader/xnu.c
-xnu_mod_CFLAGS = $(COMMON_CFLAGS)
-xnu_mod_LDFLAGS = $(COMMON_LDFLAGS)
-xnu_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
-include $(srcdir)/conf/i386.mk
-include $(srcdir)/conf/common.mk
diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
deleted file mode 100644
index 200621280..000000000
--- a/conf/x86_64-efi.rmk
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- makefile -*-
-
-COMMON_LDFLAGS = -melf_x86_64
-
-include $(srcdir)/conf/x86-efi.mk
diff --git a/configure.ac b/configure.ac
index 19ea08c9d..dd2e82e3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -873,11 +873,12 @@ AM_CONDITIONAL([COND_mips_yeeloong], [test x$target_cpu = xmips -a x$platform =
 AM_CONDITIONAL([COND_mips_qemu_mips], [test x$target_cpu = xmips -a x$platform = xqemu_mips])
 AM_CONDITIONAL([COND_sparc64_ieee1275], [test x$target_cpu = xsparc64 -a x$platform = xieee1275])
 AM_CONDITIONAL([COND_powerpc_ieee1275], [test x$target_cpu = xpowerpc -a x$platform = xieee1275])
-AM_CONDITIONAL([COND_host_hurd], [test x$host_kernel = xhurd])
-AM_CONDITIONAL([COND_host_linux], [test x$host_kernel = xlinux])
-AM_CONDITIONAL([COND_host_netbsd], [test x$host_kernel = xnetbsd])
-AM_CONDITIONAL([COND_host_windows], [test x$host_kernel = xwindows])
-AM_CONDITIONAL([COND_host_kfreebsd], [test x$host_kernel = xkfreebsd])
+
+AM_CONDITIONAL([COND_HOST_HURD], [test x$host_kernel = xhurd])
+AM_CONDITIONAL([COND_HOST_LINUX], [test x$host_kernel = xlinux])
+AM_CONDITIONAL([COND_HOST_NETBSD], [test x$host_kernel = xnetbsd])
+AM_CONDITIONAL([COND_HOST_WINDOWS], [test x$host_kernel = xwindows])
+AM_CONDITIONAL([COND_HOST_KFREEBSD], [test x$host_kernel = xkfreebsd])
 
 AM_CONDITIONAL([COND_MAN_PAGES], [test x$cross_compiling = xno -a x$HELP2MAN != x])
 AM_CONDITIONAL([COND_GRUB_EMU_USB], [test x$enable_grub_emu_usb = xyes])
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 0733ef1c2..0257bbac4 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -282,8 +282,8 @@ module = {
 
 module = {
   name = cs5536;
-  i386 = bus/cs5536.c;
-  enable = i386;
+  x86 = bus/cs5536.c;
+  enable = x86;
 };
 
 module = {
@@ -387,7 +387,7 @@ module = {
 module = {
   name = iorw;
   common = commands/iorw.c;
-  enable = i386;
+  enable = x86;
 };
 
 module = {
@@ -573,8 +573,8 @@ module = {
 
 module = {
   name = play;
-  i386 = commands/i386/pc/play.c;
-  enable = i386;
+  x86 = commands/i386/pc/play.c;
+  enable = x86;
 };
 
 module = {
@@ -1254,6 +1254,7 @@ module = {
   enable = emu;
   enable = i386;
   enable = x86_64_efi;
+  emu_condition = COND_GRUB_EMU_USB;
 };
 
 module = {
@@ -1290,14 +1291,14 @@ module = {
 
 module = {
   name = video_cirrus;
-  i386 = video/cirrus.c;
-  enable = i386;
+  x86 = video/cirrus.c;
+  enable = x86;
 };
 
 module = {
   name = video_bochs;
-  i386 = video/bochs.c;
-  enable = i386;
+  x86 = video/bochs.c;
+  enable = x86;
 };
 
 module = {

From 40a4a8a9ed704686f95c05c582921c1c3b91d274 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Mon, 23 Aug 2010 13:32:59 +0530
Subject: [PATCH 1417/1628] fix exit 1 in autogen.sh

---
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index 31a269e0f..adc457ea5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-autogen --version >/dev/null || (echo autogen missing; exit 1)
+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

From 9e860d5437f2027303d0641c168598d7a71a337a Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Mon, 23 Aug 2010 14:07:29 +0530
Subject: [PATCH 1418/1628] force bash for autogen.sh

---
 autogen.sh | 2 +-
 gentpl.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index adc457ea5..f052499ae 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /usr/bin/env bash
 
 set -e
 
diff --git a/gentpl.py b/gentpl.py
index 5b7987390..17bda02c6 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -105,7 +105,7 @@ def var_add(var, value):
 # Autogen constructs
 #
 
-def set_canonical_name_suffix(suffix): return "[+ % name `export cname=$(echo -n %s" + suffix + " | sed -e 's/[^0-9A-Za-z@_]/_/g')` +]"
+def set_canonical_name_suffix(suffix): return "[+ % name `export cname=$(echo %s" + suffix + " | sed -e 's/[^0-9A-Za-z@_]/_/g')` +]"
 def cname(): return "[+ % name `echo $cname` +]"
 
 def rule(target, source, cmd):

From f86a4030ed43240e5d3ebb4d26822772e2b06acf Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Mon, 23 Aug 2010 12:55:47 +0100
Subject: [PATCH 1419/1628] * kern/mips/startup.S (grub_prefix): Update comment
 to refer to grub-mkimage rather than grub-mkelfimage. *
 kern/powerpc/ieee1275/startup.S (grub_prefix): Likewise.

---
 ChangeLog                       | 6 ++++++
 kern/mips/startup.S             | 2 +-
 kern/powerpc/ieee1275/startup.S | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 758b5cb5f..241b59b76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-23  Colin Watson  <cjwatson@ubuntu.com>
+
+	* kern/mips/startup.S (grub_prefix): Update comment to refer to
+	grub-mkimage rather than grub-mkelfimage.
+	* kern/powerpc/ieee1275/startup.S (grub_prefix): Likewise.
+
 2010-08-22  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* term/at_keyboard.c (grub_at_keyboard_getkey_noblock): Don't discard
diff --git a/kern/mips/startup.S b/kern/mips/startup.S
index c67bb9742..134853a9d 100644
--- a/kern/mips/startup.S
+++ b/kern/mips/startup.S
@@ -148,7 +148,7 @@ compressed:
 
 VARIABLE(grub_prefix)
 
-	/* to be filled by grub-mkelfimage */
+	/* to be filled by grub-mkimage */
 
 	/*
 	 *  Leave some breathing room for the prefix.
diff --git a/kern/powerpc/ieee1275/startup.S b/kern/powerpc/ieee1275/startup.S
index 96d153778..526df1d91 100644
--- a/kern/powerpc/ieee1275/startup.S
+++ b/kern/powerpc/ieee1275/startup.S
@@ -33,7 +33,7 @@ _start:
 	. = _start + GRUB_KERNEL_MACHINE_PREFIX
 
 VARIABLE(grub_prefix)
-	/* to be filled by grub-mkelfimage */
+	/* to be filled by grub-mkimage */
 
 	/*
 	 *  Leave some breathing room for the prefix.

From 41b016a481f590258fdba25f8e184f83a8db0600 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Mon, 23 Aug 2010 21:23:39 +0530
Subject: [PATCH 1420/1628] fix x86_64-efi build

---
 Makefile.util.def | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.util.def b/Makefile.util.def
index 89328d619..fd3428e76 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -329,7 +329,7 @@ script = {
 script = {
   mansection = 1;
   name = grub-mkrescue;
-  i386_noieee1275 = util/grub-mkrescue.in;
+  x86_noieee1275 = util/grub-mkrescue.in;
   powerpc_ieee1275 = util/powerpc/ieee1275/grub-mkrescue.in;
   enable = i386_pc;
   enable = x86_efi;

From 04ddcc6a8855138cd2fa6925eb2c597cc5e58111 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 23 Aug 2010 22:41:14 +0200
Subject: [PATCH 1421/1628] 2010-08-23  Samuel Thibault 
 <samuel.thibault@ens-lyon.org>

	* util/grub.d/30_os-prober.in: Fix conversion from grub-probe
	--target=drive output to Mach device name.
---
 ChangeLog                   | 5 +++++
 util/grub.d/30_os-prober.in | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 2db022484..3887cc5bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-23  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* util/grub.d/30_os-prober.in: Fix conversion from grub-probe
+	--target=drive output to Mach device name.
+
 2010-08-23  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	New Automake based build system for GRUB.
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index ecd87bb1c..76857aeea 100644
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -179,7 +179,7 @@ EOF
       save_default_entry | sed -e "s/^/\t/"
       prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
       grub_device="`${grub_probe} --device ${DEVICE} --target=drive`"
-      mach_device="`echo "${grub_device}" | tr -d '()' | tr , s`"
+      mach_device="`echo "${grub_device}" | sed -e 's/(\(hd.*\),msdos\(.*\))/\1s\2/'`"
       grub_fs="`${grub_probe} --device ${DEVICE} --target=fs`"
       case "${grub_fs}" in
 	*fs)	hurd_fs="${grub_fs}" ;;

From a797a26ee832a12c384da7c1a4404fa6ac626665 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 24 Aug 2010 08:57:18 +0200
Subject: [PATCH 1422/1628] Unify and macroify some code in x86 relocators

---
 lib/i386/relocator16.S      | 71 ++++++++------------------------
 lib/i386/relocator32.S      | 61 ++++-----------------------
 lib/i386/relocator64.S      | 54 ++++--------------------
 lib/i386/relocator_common.S | 82 +++++++++++++++++++++++++++++++++++++
 4 files changed, 114 insertions(+), 154 deletions(-)
 create mode 100644 lib/i386/relocator_common.S

diff --git a/lib/i386/relocator16.S b/lib/i386/relocator16.S
index 510d3a1ed..c3768f4eb 100644
--- a/lib/i386/relocator16.S
+++ b/lib/i386/relocator16.S
@@ -15,18 +15,7 @@
  *  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/symbol.h>
-#include <grub/i386/memory.h>
-
-#ifdef __x86_64__
-#define RAX %rax
-#define RSI %rsi
-#else
-#define RAX %eax
-#define RSI %esi
-#endif
-
+	
 /* The code segment of the protected mode.  */
 #define CODE_SEGMENT	0x08
 
@@ -37,50 +26,41 @@
 
 #define PSEUDO_REAL_DSEG 0x20
 
+#include "relocator_common.S"
+	
 	.p2align	4	/* force 16-byte alignment */
 
 VARIABLE(grub_relocator16_start)
-LOCAL(base):
-	/* %rax contains now our new 'base'.  */
-	mov	RAX, RSI
-	add	$(LOCAL(cont0) - LOCAL(base)), RAX
-	jmp	*RAX
-LOCAL(cont0):
-	lea	(LOCAL(cont1) - LOCAL(base)) (RSI, 1), RAX
-	movl	%eax, (LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
-
-	lea	(LOCAL(gdt) - LOCAL(base)) (RSI, 1), RAX
-	mov	RAX, (LOCAL(gdt_addr) - LOCAL(base)) (RSI, 1)
+	PREAMBLE
 
 	movl 	%esi, %eax
 	movw	%ax, (LOCAL (cs_base_bytes12) - LOCAL (base)) (RSI, 1)
 	shrl	$16, %eax
 	movb	%al, (LOCAL (cs_base_byte3) - LOCAL (base)) (RSI, 1)
 
-	/* Switch to compatibility mode. */
-
-	lgdt	(LOCAL(gdtdesc) - LOCAL(base)) (RSI, 1)
-
-	/* Update %cs.  */
-	ljmp	*(LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
-
-LOCAL(cont1):
+	RELOAD_GDT
 	.code32
+	/* Update other registers. */
+	movl	$DATA_SEGMENT, %eax
+	movl	%eax, %ds
+	movl	%eax, %es
+	movl	%eax, %fs
+	movl	%eax, %gs
+	movl	%eax, %ss
 
-	/* Disable paging. */
-	movl	%cr0, %eax
-	andl	$(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax
-	movl	%eax, %cr0
+	DISABLE_PAGING
 
+#ifdef __x86_64__
 	/* Disable amd64. */
 	movl	$GRUB_MEMORY_CPU_AMD64_MSR, %ecx
 	rdmsr
 	andl	$(~GRUB_MEMORY_CPU_AMD64_MSR_ON), %eax
 	wrmsr
+#endif
 
 	/* Turn off PAE. */
 	movl	%cr4, %eax
-	andl	$GRUB_MEMORY_CPU_CR4_PAE_ON, %eax
+	andl	$(~GRUB_MEMORY_CPU_CR4_PAE_ON), %eax
 	movl	%eax, %cr4
 
 	/* Update other registers. */
@@ -208,23 +188,6 @@ LOCAL(cs_base_byte3):
 	 */
 	.word	0xFFFF, 0
 	.byte	0, 0x92, 0, 0
-
-	.p2align	4
-LOCAL(gdtdesc):
-	.word	0x27
-LOCAL(gdt_addr):
-#ifdef __x86_64__
-	/* Filled by the code. */
-	.quad	0
-#else
-	/* Filled by the code. */
-	.long	0
-#endif
-
-	.p2align	4
-LOCAL(jump_vector):
-	/* Jump location. Is filled by the code */
-	.long	0
-	.long	CODE_SEGMENT
+LOCAL(gdt_end):
 
 VARIABLE(grub_relocator16_end)
diff --git a/lib/i386/relocator32.S b/lib/i386/relocator32.S
index 4f79151e2..b581305a5 100644
--- a/lib/i386/relocator32.S
+++ b/lib/i386/relocator32.S
@@ -16,48 +16,21 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <grub/symbol.h>
-#include <grub/i386/memory.h>
-
-#ifdef __x86_64__
-#define RAX %rax
-#define RSI %rsi
-#else
-#define RAX %eax
-#define RSI %esi
-#endif
-
 /* The code segment of the protected mode.  */
 #define CODE_SEGMENT	0x10
 
 /* The data segment of the protected mode.  */
 #define DATA_SEGMENT	0x18
 
+#include "relocator_common.S"
+
 	.p2align	4	/* force 16-byte alignment */
 
 VARIABLE(grub_relocator32_start)
-LOCAL(base):
-	/* %rax contains now our new 'base'.  */
-	mov	RAX, RSI
-	add	$(LOCAL(cont0) - LOCAL(base)), RAX
-	jmp	*RAX
-LOCAL(cont0):
-	lea	(LOCAL(cont1) - LOCAL(base)) (RSI, 1), RAX
-	movl	%eax, (LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
+	PREAMBLE
 
-	lea	(LOCAL(gdt) - LOCAL(base)) (RSI, 1), RAX
-	mov	RAX, (LOCAL(gdt_addr) - LOCAL(base)) (RSI, 1)
-
-	/* Switch to compatibility mode. */
-
-	lgdt	(LOCAL(gdtdesc) - LOCAL(base)) (RSI, 1)
-
-	/* Update %cs.  */
-	ljmp	*(LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
-
-LOCAL(cont1):
+	RELOAD_GDT
 	.code32
-
 	/* Update other registers. */
 	movl	$DATA_SEGMENT, %eax
 	movl	%eax, %ds
@@ -66,16 +39,15 @@ LOCAL(cont1):
 	movl	%eax, %gs
 	movl	%eax, %ss
 
-	/* Disable paging. */
-	movl	%cr0, %eax
-	andl	$(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax
-	movl	%eax, %cr0
+	DISABLE_PAGING
 
+#ifdef __x86_64__
 	/* Disable amd64. */
 	movl	$GRUB_MEMORY_CPU_AMD64_MSR, %ecx
 	rdmsr
 	andl	$(~GRUB_MEMORY_CPU_AMD64_MSR_ON), %eax
 	wrmsr
+#endif
 
 	/* Turn off PAE. */
 	movl	%cr4, %eax
@@ -143,23 +115,6 @@ LOCAL(gdt):
 
 	/* Data segment.  */
 	.byte 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x92, 0xCF, 0x00
-
-	.p2align	4
-LOCAL(gdtdesc):
-	.word	0x27
-LOCAL(gdt_addr):
-#ifdef __x86_64__
-	/* Filled by the code. */
-	.quad	0
-#else
-	/* Filled by the code. */
-	.long	0
-#endif
-
-	.p2align	4
-LOCAL(jump_vector):
-	/* Jump location. Is filled by the code */
-	.long	0
-	.long	CODE_SEGMENT
+LOCAL(gdt_end):
 
 VARIABLE(grub_relocator32_end)
diff --git a/lib/i386/relocator64.S b/lib/i386/relocator64.S
index 37a77b3b5..bb086418c 100644
--- a/lib/i386/relocator64.S
+++ b/lib/i386/relocator64.S
@@ -16,44 +16,20 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <grub/symbol.h>
-#include <grub/i386/memory.h>
-
-#ifdef __x86_64__
-#define RAX %rax
-#define RSI %rsi
-#else
-#define RAX %eax
-#define RSI %esi
-#endif
-
 #define CODE32_SEGMENT	0x18
-#define CODE64_SEGMENT	0x08
+#define CODE_SEGMENT	0x08
 
 /* The data segment of the protected mode.  */
 #define DATA_SEGMENT	0x10
 
+#include "relocator_common.S"
+
 	.p2align	4	/* force 16-byte alignment */
 
 VARIABLE(grub_relocator64_start)
-LOCAL(base):
-	/* %rax contains now our new 'base'.  */
-	mov	RAX, RSI
-
-	add	$(LOCAL(cont0) - LOCAL(base)), RAX
-	jmp	*RAX
-LOCAL(cont0):
+	PREAMBLE
 #ifndef __x86_64__
-	lea	(LOCAL(cont1) - LOCAL(base)) (RSI, 1), RAX
-	mov	RAX, (LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
-
-	lea	(LOCAL(gdt) - LOCAL(base)) (RSI, 1), RAX
-	mov	RAX, (LOCAL(gdt_addr) - LOCAL(base)) (RSI, 1)
-
-	/* Disable paging. */
-	movl	%cr0, %eax
-	andl	$(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax
-	movl	%eax, %cr0
+	DISABLE_PAGING
 
 	/* Turn on PAE. */
 	movl	%cr4, %eax
@@ -77,11 +53,7 @@ VARIABLE(grub_relocator64_cr3)
 	orl	$GRUB_MEMORY_CPU_CR0_PAGING_ON, %eax
 	movl	%eax, %cr0
 
-	/* Load GDT. */
-	lgdt	(LOCAL(gdtdesc) - LOCAL(base)) (RSI, 1)
-
-	/* Update %cs.  */
-	ljmp	*(LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
+	RELOAD_GDT
 #else
 	/* mov imm64, %rax */
 	.byte 	0x48
@@ -91,7 +63,6 @@ VARIABLE(grub_relocator64_cr3)
 	movq	%rax, %cr3
 #endif
 
-LOCAL(cont1):
 	.code64
 
 	/* mov imm64, %rax */
@@ -183,18 +154,7 @@ LOCAL(gdt):
 	       | (1 << 7) /* 4K granular.  */)
 	.byte 0x00 /* Base 00xxxxxx.  */
 
-	.p2align	4
-LOCAL(gdtdesc):
-	.word	0x20
-LOCAL(gdt_addr):
-	/* Filled by the code. */
-	.long	0
-
-	.p2align	4
-LOCAL(jump_vector):
-	/* Jump location. Is filled by the code */
-	.long	0
-	.long	CODE64_SEGMENT
+LOCAL(gdt_end):
 #endif
 
 VARIABLE(grub_relocator64_end)
diff --git a/lib/i386/relocator_common.S b/lib/i386/relocator_common.S
new file mode 100644
index 000000000..bd5b53f95
--- /dev/null
+++ b/lib/i386/relocator_common.S
@@ -0,0 +1,82 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2009,2010  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/symbol.h>
+#include <grub/i386/memory.h>
+
+#ifdef __x86_64__
+#define RAX %rax
+#define RSI %rsi
+#else
+#define RAX %eax
+#define RSI %esi
+#endif
+
+	.macro DISABLE_PAGING
+#ifdef GRUB_MACHINE_IEEE1275
+#endif
+
+	movl	%cr0, %eax
+	andl	$(~GRUB_MEMORY_CPU_CR0_PAGING_ON), %eax
+	movl	%eax, %cr0
+	.endm
+
+	.macro PREAMBLE
+LOCAL(base):
+	/* %rax contains now our new 'base'.  */
+	mov	RAX, RSI
+
+	add	$(LOCAL(cont0) - LOCAL(base)), RAX
+	jmp	*RAX
+LOCAL(cont0):
+	.endm
+
+	.macro RELOAD_GDT
+	lea	(LOCAL(cont1) - LOCAL(base)) (RSI, 1), RAX
+	movl	%eax, (LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
+
+	lea	(LOCAL(gdt) - LOCAL(base)) (RSI, 1), RAX
+	mov	RAX, (LOCAL(gdt_addr) - LOCAL(base)) (RSI, 1)
+	
+	/* Switch to compatibility mode. */
+	lgdt	(LOCAL(gdtdesc) - LOCAL(base)) (RSI, 1)
+
+	/* Update %cs.  */
+	ljmp	*(LOCAL(jump_vector) - LOCAL(base)) (RSI, 1)
+
+	.p2align	4
+LOCAL(gdtdesc):
+	.word	LOCAL(gdt_end) - LOCAL(gdt)
+LOCAL(gdt_addr):
+#ifdef __x86_64__
+	/* Filled by the code. */
+	.quad	0
+#else
+	/* Filled by the code. */
+	.long	0
+#endif
+
+	.p2align	4
+LOCAL(jump_vector):
+	/* Jump location. Is filled by the code */
+	.long	0
+	.long	CODE_SEGMENT
+	
+LOCAL(cont1):
+	.endm

From 79f8b757ce4c5733341d00c9c9e5a489fadda3b5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 24 Aug 2010 08:57:53 +0200
Subject: [PATCH 1423/1628] fix multiboot compilation

---
 conf/i386-multiboot.rmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/i386-multiboot.rmk b/conf/i386-multiboot.rmk
index 6475e6763..0fcfa9c66 100644
--- a/conf/i386-multiboot.rmk
+++ b/conf/i386-multiboot.rmk
@@ -16,7 +16,7 @@ kernel_img_SOURCES = kern/i386/coreboot/startup.S \
 	kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \
 	kern/misc.c kern/mm.c kern/term.c \
 	kern/rescue_parser.c kern/rescue_reader.c \
-	kern/time.c kern/list.c kern/handler.c kern/command.c kern/corecmd.c \
+	kern/time.c kern/list.c kern/command.c kern/corecmd.c \
 	kern/$(target_cpu)/dl.c kern/parser.c kern/partition.c \
 	kern/i386/tsc.c kern/i386/pit.c \
 	kern/generic/rtc_get_time_ms.c \

From ffadea42bbabab54882210b7cd740f08370d311b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 24 Aug 2010 19:33:08 +0200
Subject: [PATCH 1424/1628] Fix non-loading of BSS

---
 loader/multiboot_elfxx.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/loader/multiboot_elfxx.c b/loader/multiboot_elfxx.c
index 7d08eda2a..024b44747 100644
--- a/loader/multiboot_elfxx.c
+++ b/loader/multiboot_elfxx.c
@@ -88,7 +88,7 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
   /* Load every loadable segment in memory.  */
   for (i = 0; i < ehdr->e_phnum; i++)
     {
-      if (phdr(i)->p_type == PT_LOAD && phdr(i)->p_filesz != 0)
+      if (phdr(i)->p_type == PT_LOAD)
         {
 	  grub_err_t err;
 	  void *source;
@@ -109,15 +109,18 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
 	    source = get_virtual_current_address (ch);
 	  }
 
-	  if (grub_file_seek (file, (grub_off_t) phdr(i)->p_offset)
-	      == (grub_off_t) -1)
-	    return grub_error (GRUB_ERR_BAD_OS,
-			       "invalid offset in program header");
+	  if (phdr(i)->p_filesz != 0)
+	    {
+	      if (grub_file_seek (file, (grub_off_t) phdr(i)->p_offset)
+		  == (grub_off_t) -1)
+		return grub_error (GRUB_ERR_BAD_OS,
+				   "invalid offset in program header");
 
-          if (grub_file_read (file, source, phdr(i)->p_filesz)
-              != (grub_ssize_t) phdr(i)->p_filesz)
-	    return grub_error (GRUB_ERR_BAD_OS,
-			       "couldn't read segment from file");
+	      if (grub_file_read (file, source, phdr(i)->p_filesz)
+		  != (grub_ssize_t) phdr(i)->p_filesz)
+		return grub_error (GRUB_ERR_BAD_OS,
+				   "couldn't read segment from file");
+	    }
 
           if (phdr(i)->p_filesz < phdr(i)->p_memsz)
             grub_memset ((grub_uint8_t *) source + phdr(i)->p_filesz, 0,

From 262d4a94a0e6dacdb3d7f47d640c672f82cff2fc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 25 Aug 2010 02:15:21 +0200
Subject: [PATCH 1425/1628] Add mips multiboot2 mbi address calculation

---
 loader/multiboot_mbi2.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/loader/multiboot_mbi2.c b/loader/multiboot_mbi2.c
index 8cade2f2f..d1b306bbf 100644
--- a/loader/multiboot_mbi2.c
+++ b/loader/multiboot_mbi2.c
@@ -489,7 +489,13 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
     return err;
 
   ptrorig = get_virtual_current_address (ch);
+#if defined (__i386__) || defined (__x86_64__)
   *target = get_physical_target_address (ch);
+#elif defined (__mips)
+  *target = get_physical_target_address (ch) | 0x80000000;
+#else
+#error Please complete this
+#endif
 
   mbistart = ptrorig;
   ptrorig += 2 * sizeof (grub_uint32_t);

From d24c6190aedb2e60401b915675bdf9b4698162b7 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Wed, 25 Aug 2010 18:34:20 +0530
Subject: [PATCH 1426/1628] add changelog

---
 ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2db022484..bd03c490e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-25  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	Multiple variable names support to "export" command.
+
+	* normal/context.c (grub_cmd_export): "export" command supports
+	multiple variable names.
+
 2010-08-23  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	New Automake based build system for GRUB.

From cd6891117fee18f2a6c594ed39a5fccb85afd8fc Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Wed, 25 Aug 2010 18:39:00 +0530
Subject: [PATCH 1427/1628] review comment fixes

---
 grub-core/normal/context.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grub-core/normal/context.c b/grub-core/normal/context.c
index 68f7626b9..ec718952d 100644
--- a/grub-core/normal/context.c
+++ b/grub-core/normal/context.c
@@ -177,7 +177,7 @@ grub_context_init (void)
   grub_env_export ("prefix");
 
   export_cmd = grub_register_command ("export", grub_cmd_export,
-				      N_("ENVVAR..."),
+				      N_("ENVVAR [ENVVAR] ..."),
 				      N_("Export variables."));
 }
 

From aa5cd41af5b603b06f0082be797e668be3f7e256 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Wed, 25 Aug 2010 19:35:52 +0530
Subject: [PATCH 1428/1628] return command for functions

---
 ChangeLog                   |  11 +++
 Makefile.util.def           |   6 ++
 grub-core/script/execute.c  |  60 +++++++++++++---
 grub-core/script/main.c     |   7 ++
 include/grub/script_sh.h    |   3 +
 tests/grub_script_return.in | 134 ++++++++++++++++++++++++++++++++++++
 6 files changed, 212 insertions(+), 9 deletions(-)
 create mode 100644 tests/grub_script_return.in

diff --git a/ChangeLog b/ChangeLog
index 2db022484..0ce38240f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-25  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	"return" command for GRUB script functions.
+
+	* grub-core/script/main.c: Register/unregister return command.
+	* grub-core/script/execute.c (grub_script_return): New function.
+	* include/grub/script_sh.h (grub_script_return): New prototype.
+
+	* tests/grub_script_return.in: New test for return command.
+	* Makefile.util.def: Rules for grub_script_return test.
+
 2010-08-23  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	New Automake based build system for GRUB.
diff --git a/Makefile.util.def b/Makefile.util.def
index fd3428e76..4998bd254 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -496,6 +496,12 @@ script = {
   common = tests/grub_script_shift.in;
 };
 
+script = {
+  testcase;
+  name = grub_script_return;
+  common = tests/grub_script_return.in;
+};
+
 program = {
   testcase;
   name = example_unit_test;
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
index 26a46b12b..e78a41bb5 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -33,6 +33,7 @@
 static unsigned long is_continue;
 static unsigned long active_loops;
 static unsigned long active_breaks;
+static unsigned long function_return;
 
 /* Scope for grub script functions.  */
 struct grub_script_scope
@@ -90,6 +91,30 @@ grub_script_shift (grub_command_t cmd __attribute__((unused)),
   return GRUB_ERR_NONE;
 }
 
+grub_err_t
+grub_script_return (grub_command_t cmd __attribute__((unused)),
+		    int argc, char *argv[])
+{
+  char *p;
+  unsigned long n;
+
+  if (! scope || argc > 1)
+    return GRUB_ERR_BAD_ARGUMENT;
+
+  if (argc == 0)
+    {
+      function_return = 1;
+      return grub_strtoul (grub_env_get ("?"), NULL, 10);
+    }
+
+  n = grub_strtoul (argv[0], &p, 10);
+  if (*p != '\0')
+    return GRUB_ERR_BAD_ARGUMENT;
+
+  function_return = 1;
+  return n;
+}
+
 static int
 grub_env_special (const char *name)
 {
@@ -310,6 +335,7 @@ grub_script_function_call (grub_script_function_t func, int argc, char **args)
 
   ret = grub_script_execute (func->func);
 
+  function_return = 0;
   active_loops = loops;
   scope = old_scope;
   return ret;
@@ -395,8 +421,16 @@ grub_script_execute_cmdlist (struct grub_script_cmd *list)
   struct grub_script_cmd *cmd;
 
   /* Loop over every command and execute it.  */
-  for (cmd = list->next; cmd && ! active_breaks; cmd = cmd->next)
-    ret = grub_script_execute_cmd (cmd);
+  for (cmd = list->next; cmd; cmd = cmd->next)
+    {
+      if (active_breaks)
+	break;
+
+      ret = grub_script_execute_cmd (cmd);
+
+      if (function_return)
+	break;
+    }
 
   return ret;
 }
@@ -405,14 +439,17 @@ grub_script_execute_cmdlist (struct grub_script_cmd *list)
 grub_err_t
 grub_script_execute_cmdif (struct grub_script_cmd *cmd)
 {
-  struct grub_script_cmdif *cmdif = (struct grub_script_cmdif *) cmd;
+  int ret;
   char *result;
+  struct grub_script_cmdif *cmdif = (struct grub_script_cmdif *) cmd;
 
   /* Check if the commands results in a true or a false.  The value is
      read from the env variable `?'.  */
-  grub_script_execute_cmd (cmdif->exec_to_evaluate);
-  result = grub_env_get ("?");
+  ret = grub_script_execute_cmd (cmdif->exec_to_evaluate);
+  if (function_return)
+    return ret;
 
+  result = grub_env_get ("?");
   grub_errno = GRUB_ERR_NONE;
 
   /* Execute the `if' or the `else' part depending on the value of
@@ -447,6 +484,8 @@ grub_script_execute_cmdfor (struct grub_script_cmd *cmd)
 	{
 	  grub_script_env_set (cmdfor->name->str, argv.args[i]);
 	  result = grub_script_execute_cmd (cmdfor->list);
+	  if (function_return)
+	    break;
 	}
     }
 
@@ -462,18 +501,21 @@ grub_script_execute_cmdfor (struct grub_script_cmd *cmd)
 grub_err_t
 grub_script_execute_cmdwhile (struct grub_script_cmd *cmd)
 {
-  int cond;
   int result;
   struct grub_script_cmdwhile *cmdwhile = (struct grub_script_cmdwhile *) cmd;
 
   active_loops++;
-  result = 0;
   do {
-    cond = grub_script_execute_cmd (cmdwhile->cond);
-    if (cmdwhile->until ? !cond : cond)
+    result = grub_script_execute_cmd (cmdwhile->cond);
+    if (function_return)
+      break;
+
+    if (cmdwhile->until ? !result : result)
       break;
 
     result = grub_script_execute_cmd (cmdwhile->list);
+    if (function_return)
+      break;
 
     if (active_breaks == 1 && is_continue)
       active_breaks = 0;
diff --git a/grub-core/script/main.c b/grub-core/script/main.c
index ff714d060..7caeb2661 100644
--- a/grub-core/script/main.c
+++ b/grub-core/script/main.c
@@ -44,6 +44,7 @@ grub_normal_parse_line (char *line, grub_reader_getline_t getline)
 static grub_command_t cmd_break;
 static grub_command_t cmd_continue;
 static grub_command_t cmd_shift;
+static grub_command_t cmd_return;
 
 void
 grub_script_init (void)
@@ -54,6 +55,8 @@ grub_script_init (void)
 					N_("[n]"), N_("Continue loops"));
   cmd_shift = grub_register_command ("shift", grub_script_shift,
 				     N_("[n]"), N_("Shift positional parameters."));
+  cmd_return = grub_register_command ("return", grub_script_return,
+				      N_("[n]"), N_("Return from a function."));
 }
 
 void
@@ -70,4 +73,8 @@ grub_script_fini (void)
   if (cmd_shift)
     grub_unregister_command (cmd_shift);
   cmd_shift = 0;
+
+  if (cmd_return)
+    grub_unregister_command (cmd_return);
+  cmd_return = 0;
 }
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 77e807360..844ef7930 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -321,6 +321,9 @@ grub_err_t grub_script_break (grub_command_t cmd, int argc, char *argv[]);
 /* SHIFT command for GRUB script.  */
 grub_err_t grub_script_shift (grub_command_t cmd, int argc, char *argv[]);
 
+/* RETURN command for functions.  */
+grub_err_t grub_script_return (grub_command_t cmd, int argc, char *argv[]);
+
 /* This variable points to the parsed command.  This is used to
    communicate with the bison code.  */
 extern struct grub_script_cmd *grub_script_parsed;
diff --git a/tests/grub_script_return.in b/tests/grub_script_return.in
new file mode 100644
index 000000000..712d1dfcf
--- /dev/null
+++ b/tests/grub_script_return.in
@@ -0,0 +1,134 @@
+#! @builddir@/grub-shell-tester
+
+# Run GRUB script in a Qemu instance
+# Copyright (C) 2010  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/>.
+
+function f1 {
+    return
+    echo one
+}
+f1
+
+function f2 {
+    true
+    return
+    echo one
+}
+if f2; then echo true; else echo false; fi
+
+function f3 {
+    false
+    return
+    echo one
+}
+if f3; then echo true; else echo false; fi
+
+function f4 {
+    true
+    return 1;
+    echo one
+}
+if f4; then echo true; else echo false; fi
+
+function f5 {
+    false
+    return 0;
+    echo one
+}
+if f5; then echo true; else echo false; fi
+
+function f6 {
+    echo one
+    if true; then
+	echo two
+	return 0
+    else
+	echo three
+	return 1
+    fi
+    echo four
+}
+if f6; then echo true; else echo false; fi
+
+function f7 {
+    if return 1; then
+	echo one
+    else
+	echo no
+    fi
+}
+if f7; then echo true; else echo false; fi
+
+function f8 {
+    echo one
+    for v in 1 2 3 4 5; do
+	echo $v
+	if test $v = 3; then return 1; fi
+    done
+    echo two
+}
+if f8; then echo true; else echo false; fi
+
+function f9 {
+    x=1
+    echo one
+    until test x = 11111111; do
+	echo $x
+	x="1$x"
+	if test $x = 1111; then return 0; fi
+    done
+    echo two
+}
+if f9; then echo true; else echo false; fi
+
+function f10 {
+    echo one
+    while return 0; do
+	echo two
+    done
+    echo three
+}
+if f10; then echo true; else echo false; fi
+
+function f11 {
+    f1
+    f2
+    f3
+    f4
+    f5
+    f6
+    f7
+    f8
+    f9
+    f10
+}
+if f11; then echo true; else echo false; fi
+
+function f12 {
+    echo one
+    f11
+    return 1
+    echo two
+}
+if f12; then echo true; else echo false; fi
+
+function f13 {
+    echo one
+    f12
+    echo two
+    return 0
+}
+if f13; then echo true; else echo false; fi

From 5ad6967b19306efe28b047b97b21b839b74f7077 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 25 Aug 2010 16:59:11 +0200
Subject: [PATCH 1429/1628] Enable boottests

---
 Makefile.am                                   | 144 +++++++++++++++++-
 {tests => grub-core/tests}/boot/kfreebsd.cfg  |   0
 .../tests}/boot/kfreebsd.init-i386.S          |   0
 .../tests}/boot/kfreebsd.init-x86_64.S        |   0
 {tests => grub-core/tests}/boot/knetbsd.cfg   |   0
 .../tests}/boot/knetbsd.init-i386.S           |   0
 .../tests}/boot/knetbsd.init-x86_64.S         |   0
 {tests => grub-core/tests}/boot/linux.cfg     |   0
 .../tests}/boot/linux.init-i386.S             |   0
 .../tests}/boot/linux.init-x86_64.S           |   0
 {tests => grub-core/tests}/boot/linux16.cfg   |   0
 tests/util/grub-shell.in                      |   2 +-
 12 files changed, 144 insertions(+), 2 deletions(-)
 rename {tests => grub-core/tests}/boot/kfreebsd.cfg (100%)
 rename {tests => grub-core/tests}/boot/kfreebsd.init-i386.S (100%)
 rename {tests => grub-core/tests}/boot/kfreebsd.init-x86_64.S (100%)
 rename {tests => grub-core/tests}/boot/knetbsd.cfg (100%)
 rename {tests => grub-core/tests}/boot/knetbsd.init-i386.S (100%)
 rename {tests => grub-core/tests}/boot/knetbsd.init-x86_64.S (100%)
 rename {tests => grub-core/tests}/boot/linux.cfg (100%)
 rename {tests => grub-core/tests}/boot/linux.init-i386.S (100%)
 rename {tests => grub-core/tests}/boot/linux.init-x86_64.S (100%)
 rename {tests => grub-core/tests}/boot/linux16.cfg (100%)

diff --git a/Makefile.am b/Makefile.am
index f49a92ead..9988c4099 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,4 +82,146 @@ CLEANFILES += widthspec.h
 platform_HEADERS = config.h
 
 pkglib_DATA += grub-mkconfig_lib
-pkglib_DATA += update-grub_lib
\ No newline at end of file
+pkglib_DATA += update-grub_lib
+
+
+if COND_i386_coreboot
+BOOTTARGET=coreboot
+QEMU32=qemu-system-i386
+endif
+
+if COND_i386_multiboot
+BOOTTARGET=cd
+QEMU32=qemu-system-i386
+endif
+
+if COND_i386_ieee1275
+BOOTTARGET=cd
+QEMU32=qemu-system-i386
+endif
+
+if COND_i386_qemu
+BOOTTARGET=qemu
+QEMU32=qemu-system-i386
+endif
+
+if COND_i386_pc
+BOOTTARGET=cd
+QEMU32=qemu-system-i386
+endif
+
+if COND_i386_efi
+QEMU32=qemu-system-i386
+BOOTTARGET=cd
+endif
+
+if COND_x86_64_efi
+QEMU32=qemu-system-x86_64
+BOOTTARGET=cd
+endif
+
+linux.init.x86_64: $(srcdir)/grub-core/tests/boot/linux.init-x86_64.S
+	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+
+linux.init.i386: $(srcdir)/grub-core/tests/boot/linux.init-i386.S
+	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+
+kfreebsd.init.x86_64: $(srcdir)/grub-core/tests/boot/kfreebsd.init-x86_64.S
+	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
+
+kfreebsd.init.i386: $(srcdir)/grub-core/tests/boot/kfreebsd.init-i386.S
+	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
+
+knetbsd.init.i386: $(srcdir)/grub-core/tests/boot/knetbsd.init-i386.S
+	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+
+knetbsd.init.x86_64: $(srcdir)/grub-core/tests/boot/knetbsd.init-x86_64.S
+	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+
+linux-initramfs.i386: linux.init.i386 Makefile
+	TDIR=`mktemp -d`; cp $< $$TDIR/init; (cd $$TDIR; echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@; rm -rf $$TDIR
+
+linux-initramfs.x86_64: linux.init.x86_64 Makefile
+	TDIR=`mktemp -d`; cp $< $$TDIR/init; (cd $$TDIR; echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@; rm -rf $$TDIR
+
+kfreebsd-mfsroot.i386.img: kfreebsd.init.i386 Makefile
+	TDIR=`mktemp -d`; mkdir $$TDIR/dev; mkdir $$TDIR/sbin; cp $< $$TDIR/sbin/init; makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR; rm -rf $$TDIR
+
+knetbsd.image.i386: knetbsd.init.i386
+	TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
+
+knetbsd.miniroot-image.i386.img: knetbsd.image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386
+	$(OBJCOPY) --add-section=miniroot=$< $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386 $@
+
+kfreebsd-mfsroot.x86_64.img: kfreebsd.init.x86_64 Makefile
+	TDIR=`mktemp -d`; mkdir $$TDIR/dev; mkdir $$TDIR/sbin; cp $< $$TDIR/sbin/init; makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR; rm -rf $$TDIR
+
+knetbsd.image.x86_64: knetbsd.init.x86_64
+	TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
+
+knetbsd.miniroot-image.x86_64.img: knetbsd.image.x86_64 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.x86_64
+	$(OBJCOPY) --add-section=miniroot=$< $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.x86_64 $@
+
+CLEANFILES += linux.init.i386 kfreebsd.init.i386 linux.init.x86_64 linux-initramfs.i386 linux-initramfs.x86_64
+
+kfreebsd-mfsroot.i386.gz: kfreebsd-mfsroot.i386.img
+	gzip < $< > $@
+
+bootcheck-kfreebsd-i386: kfreebsd-mfsroot.i386.gz $(GRUB_PAYLOADS_DIR)/kfreebsd.i386 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/grub-core/tests/boot/kfreebsd.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/mfsroot.gz=kfreebsd-mfsroot.i386.gz --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.i386 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.i386 $(srcdir)/grub-core/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+kfreebsd-mfsroot.x86_64.gz: kfreebsd-mfsroot.x86_64.img
+	gzip < $< > $@
+
+bootcheck-kfreebsd-x86_64: kfreebsd-mfsroot.x86_64.gz $(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 $(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/grub-core/tests/boot/kfreebsd.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/mfsroot.gz=kfreebsd-mfsroot.x86_64.gz --files=/kfreebsd=$(GRUB_PAYLOADS_DIR)/kfreebsd.x86_64 --files=/kfreebsd_env=$(GRUB_PAYLOADS_DIR)/kfreebsd_env.x86_64 $(srcdir)/grub-core/tests/boot/kfreebsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+knetbsd.miniroot-image.i386.gz: knetbsd.miniroot-image.i386.img
+	gzip < $< > $@
+
+bootcheck-knetbsd-i386: knetbsd.miniroot-image.i386.gz $(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/grub-core/tests/boot/knetbsd.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/miniroot.gz=knetbsd.miniroot-image.i386.gz --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/grub-core/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+knetbsd.miniroot-image.x86_64.gz: knetbsd.miniroot-image.x86_64.img
+	gzip < $< > $@
+
+bootcheck-knetbsd-x86_64: knetbsd.miniroot-image.x86_64.gz $(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/grub-core/tests/boot/knetbsd.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/miniroot.gz=knetbsd.miniroot-image.x86_64.gz --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.x86_64 $(srcdir)/grub-core/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-linux-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/grub-core/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-linux-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/grub-core/tests/boot/linux.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-linux16-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/initrd=linux-initramfs.i386 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.i386 $(srcdir)/grub-core/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-linux16-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/grub-core/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+BOOTCHECKS= 
+
+BOOTCHECKS += bootcheck-linux16-i386 bootcheck-linux16-x86_64
+
+BOOTCHECKS += bootcheck-linux-i386 bootcheck-linux-x86_64 
+
+# Crashes because memory at 0-0x1000 is occupied
+BOOTCHECKS += bootcheck-kfreebsd-i386 bootcheck-knetbsd-x86_64
+
+# Requires ACPI
+BOOTCHECKS += bootcheck-kfreebsd-x86_64
+# Crashes early on non-BIOS
+BOOTCHECKS += bootcheck-knetbsd-i386
+
+
+.PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
+       bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \
+       bootcheck-knetbsd-i386 bootcheck-knetbsd-x86_64
+
+# Randomly generated
+SUCCESSFUL_BOOT_STRING=3e49994fd5d82b7c9298d672d774080d
+# tianocore cd access is very slow
+BOOTCHECK_TIMEOUT=180
+
+bootcheck: $(BOOTCHECKS)
diff --git a/tests/boot/kfreebsd.cfg b/grub-core/tests/boot/kfreebsd.cfg
similarity index 100%
rename from tests/boot/kfreebsd.cfg
rename to grub-core/tests/boot/kfreebsd.cfg
diff --git a/tests/boot/kfreebsd.init-i386.S b/grub-core/tests/boot/kfreebsd.init-i386.S
similarity index 100%
rename from tests/boot/kfreebsd.init-i386.S
rename to grub-core/tests/boot/kfreebsd.init-i386.S
diff --git a/tests/boot/kfreebsd.init-x86_64.S b/grub-core/tests/boot/kfreebsd.init-x86_64.S
similarity index 100%
rename from tests/boot/kfreebsd.init-x86_64.S
rename to grub-core/tests/boot/kfreebsd.init-x86_64.S
diff --git a/tests/boot/knetbsd.cfg b/grub-core/tests/boot/knetbsd.cfg
similarity index 100%
rename from tests/boot/knetbsd.cfg
rename to grub-core/tests/boot/knetbsd.cfg
diff --git a/tests/boot/knetbsd.init-i386.S b/grub-core/tests/boot/knetbsd.init-i386.S
similarity index 100%
rename from tests/boot/knetbsd.init-i386.S
rename to grub-core/tests/boot/knetbsd.init-i386.S
diff --git a/tests/boot/knetbsd.init-x86_64.S b/grub-core/tests/boot/knetbsd.init-x86_64.S
similarity index 100%
rename from tests/boot/knetbsd.init-x86_64.S
rename to grub-core/tests/boot/knetbsd.init-x86_64.S
diff --git a/tests/boot/linux.cfg b/grub-core/tests/boot/linux.cfg
similarity index 100%
rename from tests/boot/linux.cfg
rename to grub-core/tests/boot/linux.cfg
diff --git a/tests/boot/linux.init-i386.S b/grub-core/tests/boot/linux.init-i386.S
similarity index 100%
rename from tests/boot/linux.init-i386.S
rename to grub-core/tests/boot/linux.init-i386.S
diff --git a/tests/boot/linux.init-x86_64.S b/grub-core/tests/boot/linux.init-x86_64.S
similarity index 100%
rename from tests/boot/linux.init-x86_64.S
rename to grub-core/tests/boot/linux.init-x86_64.S
diff --git a/tests/boot/linux16.cfg b/grub-core/tests/boot/linux16.cfg
similarity index 100%
rename from tests/boot/linux16.cfg
rename to grub-core/tests/boot/linux16.cfg
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 09847db2b..e21cc95f4 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -164,7 +164,7 @@ if [ x$boot = xcoreboot ]; then
     device=cdrom
 fi
 
-${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | tr -d "\r"
+${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | cat | tr -d "\r"
 rm -f "${isofile}" "${imgfile}"
 rm -rf "${rom_directory}"
 if [ x$boot = xcoreboot ]; then

From 1e82303f1d8aed2e00920e09f725c2fa3c38c89e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 25 Aug 2010 20:34:07 +0200
Subject: [PATCH 1430/1628] multiboot and multiboot2 bootchecks

---
 Makefile.am                         | 16 +++++-
 grub-core/tests/boot/multiboot.S    | 89 +++++++++++++++++++++++++++++
 grub-core/tests/boot/multiboot.cfg  |  4 ++
 grub-core/tests/boot/multiboot2.cfg |  4 ++
 4 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 grub-core/tests/boot/multiboot.S
 create mode 100644 grub-core/tests/boot/multiboot.cfg
 create mode 100644 grub-core/tests/boot/multiboot2.cfg

diff --git a/Makefile.am b/Makefile.am
index 9988c4099..f948a7a2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,6 +126,12 @@ linux.init.x86_64: $(srcdir)/grub-core/tests/boot/linux.init-x86_64.S
 linux.init.i386: $(srcdir)/grub-core/tests/boot/linux.init-i386.S
 	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 
+multiboot.elf: $(srcdir)/grub-core/tests/boot/multiboot.S
+	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include
+
+multiboot2.elf: $(srcdir)/grub-core/tests/boot/multiboot.S
+	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include -DMULTIBOOT2=1
+
 kfreebsd.init.x86_64: $(srcdir)/grub-core/tests/boot/kfreebsd.init-x86_64.S
 	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
 
@@ -200,11 +206,19 @@ bootcheck-linux16-i386: linux-initramfs.i386 $(GRUB_PAYLOADS_DIR)/linux.i386 $(s
 bootcheck-linux16-x86_64: linux-initramfs.x86_64 $(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/grub-core/tests/boot/linux.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/initrd=linux-initramfs.x86_64 --files=/linux=$(GRUB_PAYLOADS_DIR)/linux.x86_64 $(srcdir)/grub-core/tests/boot/linux16.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
+bootcheck-multiboot: multiboot.elf $(srcdir)/grub-core/tests/boot/multiboot.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/multiboot.elf=multiboot.elf $(srcdir)/grub-core/tests/boot/multiboot.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-multiboot2: multiboot2.elf $(srcdir)/grub-core/tests/boot/multiboot2.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/multiboot2.elf=multiboot2.elf $(srcdir)/grub-core/tests/boot/multiboot2.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
 BOOTCHECKS= 
 
+BOOTCHECKS += bootcheck-multiboot bootcheck-multiboot2
+
 BOOTCHECKS += bootcheck-linux16-i386 bootcheck-linux16-x86_64
 
-BOOTCHECKS += bootcheck-linux-i386 bootcheck-linux-x86_64 
+BOOTCHECKS += bootcheck-linux-i386 bootcheck-linux-x86_64
 
 # Crashes because memory at 0-0x1000 is occupied
 BOOTCHECKS += bootcheck-kfreebsd-i386 bootcheck-knetbsd-x86_64
diff --git a/grub-core/tests/boot/multiboot.S b/grub-core/tests/boot/multiboot.S
new file mode 100644
index 000000000..b9c0059c0
--- /dev/null
+++ b/grub-core/tests/boot/multiboot.S
@@ -0,0 +1,89 @@
+#define ASM_FILE	1
+#ifdef MULTIBOOT2
+#include <multiboot2.h>
+#else
+#include <multiboot.h>
+#endif
+
+#define SHUTDOWN_PORT 0x8900
+
+	.text
+	/* Align 32 bits boundary.  */
+	.align	8
+
+#ifdef MULTIBOOT2
+	/* Multiboot header.  */
+multiboot_header:
+	/* magic */
+	.long	MULTIBOOT2_HEADER_MAGIC
+	/* ISA: i386 */
+	.long   MULTIBOOT_ARCHITECTURE_I386
+	/* Header length.  */
+	.long	multiboot_header_end - multiboot_header
+	/* checksum */
+	.long	-(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT_ARCHITECTURE_I386 + (multiboot_header_end - multiboot_header))
+	.short MULTIBOOT_HEADER_TAG_END
+	.short 0
+	.long 8
+multiboot_header_end:
+#else
+	/* Multiboot header.  */
+multiboot_header:
+	/* magic */
+	.long	MULTIBOOT_HEADER_MAGIC
+	/* flags */
+	.long	0
+	/* checksum */
+	.long	-MULTIBOOT_HEADER_MAGIC
+#endif
+	
+	.global start
+portmsg:
+	xorl %eax, %eax
+1:	
+	movb 0(%esi), %al
+	test %eax, %eax
+	jz 1f
+	outb %al, %dx
+	incl %esi
+	jmp 1b
+1:
+	ret
+
+serialmsg:	
+1:	
+	movb 0(%esi), %bl
+	testb %bl, %bl
+	jz 1f
+	movw $0x3fd, %dx
+2:	
+	inb %dx, %al
+	testb $0x20, %al
+	jz   2b
+
+	movw $0x3f8, %dx
+	movb %bl, %al
+	outb %al, %dx
+	incl %esi
+	jmp 1b
+1:
+	ret
+
+	.globl _start
+_start:
+	lea message, %esi
+	call serialmsg
+	lea shutdown, %esi
+	movw $SHUTDOWN_PORT, %dx
+	call portmsg
+
+1:
+	hlt
+	jmp 1b
+
+shutdown:
+	.ascii "Shutdown"
+	.byte 0
+message:
+	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
+	.byte 0
diff --git a/grub-core/tests/boot/multiboot.cfg b/grub-core/tests/boot/multiboot.cfg
new file mode 100644
index 000000000..0942ec67c
--- /dev/null
+++ b/grub-core/tests/boot/multiboot.cfg
@@ -0,0 +1,4 @@
+multiboot /multiboot.elf
+boot
+# Shouln't happen
+halt
diff --git a/grub-core/tests/boot/multiboot2.cfg b/grub-core/tests/boot/multiboot2.cfg
new file mode 100644
index 000000000..2bec9e6d1
--- /dev/null
+++ b/grub-core/tests/boot/multiboot2.cfg
@@ -0,0 +1,4 @@
+multiboot2 /multiboot2.elf
+boot
+# Shouln't happen
+halt

From 89e07694dc1716d7c296fa151f4251e5e619a9d8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 25 Aug 2010 21:19:45 +0200
Subject: [PATCH 1431/1628] Remove grub_dl_unload_all. It's unnecessary and
 causes trouble

---
 grub-core/kern/dl.c              | 17 -----------------
 grub-core/kern/i386/pc/startup.S |  2 --
 include/grub/dl.h                |  1 -
 3 files changed, 20 deletions(-)

diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
index 09849f174..02d785b9b 100644
--- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c
@@ -682,20 +682,3 @@ grub_dl_unload_unneeded (void)
       p = p->next;
     }
 }
-
-/* Unload all modules.  */
-void
-grub_dl_unload_all (void)
-{
-  while (grub_dl_head)
-    {
-      grub_dl_t p;
-
-      grub_dl_unload_unneeded ();
-
-      /* Force to decrement the ref count. This will purge pre-loaded
-	 modules and manually inserted modules.  */
-      for (p = grub_dl_head; p; p = p->next)
-	p->ref_count--;
-    }
-}
diff --git a/grub-core/kern/i386/pc/startup.S b/grub-core/kern/i386/pc/startup.S
index a73e27ad6..7ae901712 100644
--- a/grub-core/kern/i386/pc/startup.S
+++ b/grub-core/kern/i386/pc/startup.S
@@ -546,8 +546,6 @@ FUNCTION(grub_chainloader_real_boot)
 	pushl	%edx
 	pushl	%eax
 
-	call	EXT_C(grub_dl_unload_all)
-
 	/* Turn off Gate A20 */
 	xorl	%eax, %eax
 	call	EXT_C(grub_gate_a20)
diff --git a/include/grub/dl.h b/include/grub/dl.h
index 9db610467..afc4af41a 100644
--- a/include/grub/dl.h
+++ b/include/grub/dl.h
@@ -101,7 +101,6 @@ grub_dl_t EXPORT_FUNC(grub_dl_load) (const char *name);
 grub_dl_t grub_dl_load_core (void *addr, grub_size_t size);
 int EXPORT_FUNC(grub_dl_unload) (grub_dl_t mod);
 void grub_dl_unload_unneeded (void);
-void grub_dl_unload_all (void);
 int EXPORT_FUNC(grub_dl_ref) (grub_dl_t mod);
 int EXPORT_FUNC(grub_dl_unref) (grub_dl_t mod);
 extern grub_dl_t EXPORT_VAR(grub_dl_head);

From e8ea4b8424953e4b43044488556a433b8e10a9a2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 25 Aug 2010 21:55:48 +0200
Subject: [PATCH 1432/1628] pc-chainloader bootcheck

---
 Makefile.am                             | 13 +++++
 grub-core/tests/boot/pc-chainloader.S   | 63 +++++++++++++++++++++++++
 grub-core/tests/boot/pc-chainloader.cfg |  4 ++
 3 files changed, 80 insertions(+)
 create mode 100644 grub-core/tests/boot/pc-chainloader.S
 create mode 100644 grub-core/tests/boot/pc-chainloader.cfg

diff --git a/Makefile.am b/Makefile.am
index f948a7a2f..b97f012bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -129,6 +129,12 @@ linux.init.i386: $(srcdir)/grub-core/tests/boot/linux.init-i386.S
 multiboot.elf: $(srcdir)/grub-core/tests/boot/multiboot.S
 	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include
 
+pc-chainloader.elf: $(srcdir)/grub-core/tests/boot/pc-chainloader.S
+	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0x7c00 -m32
+
+pc-chainloader.bin: pc-chainloader.elf
+	$(OBJCOPY) -O binary --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< $@;
+
 multiboot2.elf: $(srcdir)/grub-core/tests/boot/multiboot.S
 	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include -DMULTIBOOT2=1
 
@@ -212,8 +218,15 @@ bootcheck-multiboot: multiboot.elf $(srcdir)/grub-core/tests/boot/multiboot.cfg
 bootcheck-multiboot2: multiboot2.elf $(srcdir)/grub-core/tests/boot/multiboot2.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/multiboot2.elf=multiboot2.elf $(srcdir)/grub-core/tests/boot/multiboot2.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
+bootcheck-pc-chainloader: pc-chainloader.bin $(srcdir)/grub-core/tests/boot/pc-chainloader.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/pc-chainloader.bin=pc-chainloader.bin $(srcdir)/grub-core/tests/boot/pc-chainloader.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
 BOOTCHECKS= 
 
+if COND_i386_pc
+BOOTCHECKS += bootcheck-pc-chainloader
+endif
+
 BOOTCHECKS += bootcheck-multiboot bootcheck-multiboot2
 
 BOOTCHECKS += bootcheck-linux16-i386 bootcheck-linux16-x86_64
diff --git a/grub-core/tests/boot/pc-chainloader.S b/grub-core/tests/boot/pc-chainloader.S
new file mode 100644
index 000000000..fc7429940
--- /dev/null
+++ b/grub-core/tests/boot/pc-chainloader.S
@@ -0,0 +1,63 @@
+
+#define SHUTDOWN_PORT 0x8900
+
+	.text
+	.globl _start
+_start:
+base:	
+	.code16
+	jmp cont
+
+portmsg:
+	xorw %ax, %ax
+1:	
+	movb 0(%si), %al
+	test %ax, %ax
+	jz 1f
+	outb %al, %dx
+	incw %si
+	jmp 1b
+1:
+	ret
+
+serialmsg:	
+1:	
+	movb 0(%si), %bl
+	testb %bl, %bl
+	jz 1f
+	movw $0x3fd, %dx
+2:	
+	inb %dx, %al
+	testb $0x20, %al
+	jz   2b
+
+	movw $0x3f8, %dx
+	movb %bl, %al
+	outb %al, %dx
+	incw %si
+	jmp 1b
+1:
+	ret
+
+cont:	
+	xorw %ax, %ax
+	movw %ax, %ds
+	lea message, %si
+	call serialmsg
+	lea shutdown, %si
+	movw $SHUTDOWN_PORT, %dx
+	call portmsg
+
+1:
+	hlt
+	jmp 1b
+
+shutdown:
+	.ascii "Shutdown"
+	.byte 0
+message:
+	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
+	.byte 0
+
+	. = base + 510
+	.short 0xaa55
\ No newline at end of file
diff --git a/grub-core/tests/boot/pc-chainloader.cfg b/grub-core/tests/boot/pc-chainloader.cfg
new file mode 100644
index 000000000..1e80a5b96
--- /dev/null
+++ b/grub-core/tests/boot/pc-chainloader.cfg
@@ -0,0 +1,4 @@
+chainloader /pc-chainloader.bin
+boot
+# Shouln't happen
+halt

From e35e46fce182084c5719a6e67433f061fa5358b0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 25 Aug 2010 22:32:17 +0200
Subject: [PATCH 1433/1628] 	* grub-core/term/ieee1275/ofconsole.c (put):
 Correct prototype. 	(readkey): Likewise.

---
 ChangeLog                           | 5 +++++
 grub-core/term/ieee1275/ofconsole.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f4f3359e..e46c027b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/term/ieee1275/ofconsole.c (put): Correct prototype.
+	(readkey): Likewise.
+
 2010-08-25  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Multiple variable names support to "export" command.
diff --git a/grub-core/term/ieee1275/ofconsole.c b/grub-core/term/ieee1275/ofconsole.c
index 604906ceb..9ec85631b 100644
--- a/grub-core/term/ieee1275/ofconsole.c
+++ b/grub-core/term/ieee1275/ofconsole.c
@@ -55,7 +55,7 @@ static struct color colors[] =
   };
 
 static void
-put (const int c)
+put (struct grub_term_output *term __attribute__ ((unused)), const int c)
 {
   char chr = c;
 
@@ -63,7 +63,7 @@ put (const int c)
 }
 
 static int
-readkey (void)
+readkey (struct grub_term_input *term __attribute__ ((unused)))
 {
   grub_uint8_t c;
   grub_ssize_t actual = 0;

From 8218d8b6e804504b8815e4c1becf86e4c40050c8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 25 Aug 2010 22:34:15 +0200
Subject: [PATCH 1434/1628] Fix efiemu compilation on ieee1275

---
 grub-core/Makefile.core.def | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index b91609826..62c08928a 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -772,7 +772,10 @@ module = {
   common = efiemu/main.c;
   common = efiemu/i386/loadcore32.c;
   common = efiemu/i386/loadcore64.c;
-  common = efiemu/i386/pc/cfgtables.c;
+  i386_pc = efiemu/i386/pc/cfgtables.c;
+  i386_coreboot = efiemu/i386/pc/cfgtables.c;
+  i386_multiboot = efiemu/i386/pc/cfgtables.c;
+  i386_ieee1275 = efiemu/i386/nocfgtables.c;
   common = efiemu/mm.c;
   common = efiemu/loadcore_common.c;
   common = efiemu/symbols.c;
@@ -789,7 +792,7 @@ module = {
   extra_dist = efiemu/runtime/efiemu.c;
 
   enable = i386_pc;
-  enable = i386_coeboot;
+  enable = i386_coreboot;
   enable = i386_ieee1275;
   enable = i386_multiboot;
 };

From ecde61b4909e2a4683bf17ee30232994df0b5712 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 26 Aug 2010 02:46:30 +0200
Subject: [PATCH 1435/1628] openbsd ramdisk support

---
 grub-core/loader/i386/bsd.c   |  70 ++++++++++++++++++++-
 grub-core/loader/i386/bsdXX.c | 114 ++++++++++++++++++++++++++++++++++
 include/grub/i386/bsd.h       |  16 +++++
 3 files changed, 197 insertions(+), 3 deletions(-)

diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
index 6399cb1e3..770c6f278 100644
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -67,6 +67,7 @@ static grub_uint32_t bootflags;
 static int is_elf_kernel, is_64bit;
 static grub_uint32_t openbsd_root;
 struct grub_relocator *relocator = NULL;
+static struct grub_openbsd_ramdisk_descriptor openbsd_ramdisk;
 
 struct bsd_tag
 {
@@ -1253,7 +1254,13 @@ grub_bsd_load_elf (grub_elf_t elf)
 
       kern_chunk_src = get_virtual_current_address (ch);
 
-      return grub_elf32_load (elf, grub_bsd_elf32_hook, 0, 0);
+      err = grub_elf32_load (elf, grub_bsd_elf32_hook, 0, 0);
+      if (err)
+	return err;
+      if (kernel_type != KERNEL_TYPE_OPENBSD)
+	return GRUB_ERR_NONE;
+      return grub_openbsd_find_ramdisk32 (elf->file, kern_start,
+					  kern_chunk_src, &openbsd_ramdisk);
     }
   else if (grub_elf_is_elf64 (elf))
     {
@@ -1290,7 +1297,13 @@ grub_bsd_load_elf (grub_elf_t elf)
 	kern_chunk_src = get_virtual_current_address (ch);
       }
 
-      return grub_elf64_load (elf, grub_bsd_elf64_hook, 0, 0);
+      err = grub_elf64_load (elf, grub_bsd_elf64_hook, 0, 0);
+      if (err)
+	return err;
+      if (kernel_type != KERNEL_TYPE_OPENBSD)
+	return GRUB_ERR_NONE;
+      return grub_openbsd_find_ramdisk64 (elf->file, kern_start,
+					  kern_chunk_src, &openbsd_ramdisk);
     }
   else
     return grub_error (GRUB_ERR_BAD_OS, "invalid ELF");
@@ -1306,6 +1319,8 @@ grub_bsd_load (int argc, char *argv[])
 
   grub_loader_unset ();
 
+  grub_memset (&openbsd_ramdisk, 0, sizeof (openbsd_ramdisk));
+
   if (argc == 0)
     {
       grub_error (GRUB_ERR_BAD_ARGUMENT, "no kernel specified");
@@ -1874,11 +1889,55 @@ grub_cmd_freebsd_module_elf (grub_command_t cmd __attribute__ ((unused)),
   return err;
 }
 
+static grub_err_t
+grub_cmd_openbsd_ramdisk (grub_command_t cmd __attribute__ ((unused)),
+		      int argc, char *args[])
+{
+  grub_file_t file;
+  grub_size_t size;
+
+  if (argc != 1)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
+
+  if (kernel_type != KERNEL_TYPE_OPENBSD)
+    return grub_error (GRUB_ERR_BAD_OS, "no kOpenBSD loaded");
+
+  if (!openbsd_ramdisk.max_size)
+    return grub_error (GRUB_ERR_BAD_OS, "your kOpenBSD doesn't support ramdisk");
+
+  file = grub_gzfile_open (args[0], 1);
+  if (! file)
+    return grub_error (GRUB_ERR_FILE_NOT_FOUND,
+		       "couldn't load ramdisk");
+
+  size = grub_file_size (file);
+
+  if (size > openbsd_ramdisk.max_size)
+    {
+      grub_file_close (file);
+      return grub_error (GRUB_ERR_BAD_OS, "your kOpenBSD supports ramdisk only"
+			 " up to %u bytes, however you supplied a %u bytes one",
+			 openbsd_ramdisk.max_size, size);
+    }
+
+  if (grub_file_read (file, openbsd_ramdisk.target, size)
+      != (grub_ssize_t) (size))
+    {
+      grub_file_close (file);
+      grub_error_push ();
+      return grub_error (GRUB_ERR_BAD_OS, "couldn't read file %s", args[0]);
+    }
+  grub_memset (openbsd_ramdisk.target + size, 0,
+	       openbsd_ramdisk.max_size - size);
+  *openbsd_ramdisk.size = ALIGN_UP (size, 512);
+
+  return GRUB_ERR_NONE;
+}
 
 static grub_extcmd_t cmd_freebsd, cmd_openbsd, cmd_netbsd;
 static grub_command_t cmd_freebsd_loadenv, cmd_freebsd_module;
 static grub_command_t cmd_netbsd_module, cmd_freebsd_module_elf;
-static grub_command_t cmd_netbsd_module_elf;
+static grub_command_t cmd_netbsd_module_elf, cmd_openbsd_ramdisk;
 
 GRUB_MOD_INIT (bsd)
 {
@@ -1910,6 +1969,10 @@ GRUB_MOD_INIT (bsd)
     grub_register_command ("kfreebsd_module_elf", grub_cmd_freebsd_module_elf,
 			   0, N_("Load FreeBSD kernel module (ELF)."));
 
+  cmd_openbsd_ramdisk = grub_register_command ("kopenbsd_ramdisk",
+					       grub_cmd_openbsd_ramdisk, 0,
+					       "Load kOpenBSD ramdisk. ");
+
   my_mod = mod;
 }
 
@@ -1924,6 +1987,7 @@ GRUB_MOD_FINI (bsd)
   grub_unregister_command (cmd_netbsd_module);
   grub_unregister_command (cmd_freebsd_module_elf);
   grub_unregister_command (cmd_netbsd_module_elf);
+  grub_unregister_command (cmd_openbsd_ramdisk);
 
   grub_bsd_unload ();
 }
diff --git a/grub-core/loader/i386/bsdXX.c b/grub-core/loader/i386/bsdXX.c
index f053e7e13..073f01da2 100644
--- a/grub-core/loader/i386/bsdXX.c
+++ b/grub-core/loader/i386/bsdXX.c
@@ -503,4 +503,118 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
   return GRUB_ERR_NONE;
 }
 
+grub_err_t
+SUFFIX(grub_openbsd_find_ramdisk) (grub_file_t file,
+				   grub_addr_t kern_start,
+				   void *kern_chunk_src,
+				   struct grub_openbsd_ramdisk_descriptor *desc)
+{
+  unsigned symoff, stroff, symsize, strsize, symentsize;
 
+  {
+    grub_err_t err;
+    Elf_Ehdr e;
+    Elf_Shdr *s;
+    char *shdr;
+    
+    err = read_headers (file, &e, &shdr);
+    if (err)
+      return err;
+
+    for (s = (Elf_Shdr *) shdr; s < (Elf_Shdr *) (shdr
+						  + e.e_shnum * e.e_shentsize);
+	 s = (Elf_Shdr *) ((char *) s + e.e_shentsize))
+      if (s->sh_type == SHT_SYMTAB)
+	break;
+    if (s >= (Elf_Shdr *) ((char *) shdr + e.e_shnum * e.e_shentsize))
+      {
+	grub_free (shdr);
+	return GRUB_ERR_NONE;
+      }
+
+    symsize = s->sh_size;
+    symentsize = s->sh_entsize;
+    symoff = s->sh_offset;
+    
+    s = (Elf_Shdr *) (shdr + e.e_shentsize * s->sh_link);
+    stroff = s->sh_offset;
+    strsize = s->sh_size;
+    grub_free (shdr);
+  }
+  {
+    Elf_Sym *syms, *sym, *imagesym = NULL, *sizesym = NULL;
+    unsigned i;
+    char *strs;
+
+    syms = grub_malloc (symsize);
+    if (!syms)
+      return grub_errno;
+
+    if (grub_file_seek (file, symoff) == (grub_off_t) -1)
+      {
+	grub_free (syms);
+	return grub_errno;
+      }
+    if (grub_file_read (file, syms, symsize) != (grub_ssize_t) symsize)
+      {
+	grub_free (syms);
+	if (! grub_errno)
+	  return grub_error (GRUB_ERR_BAD_OS, "invalid ELF");
+	return grub_errno;
+      }
+
+    strs = grub_malloc (strsize);
+    if (!strs)
+      {
+	grub_free (syms);
+	return grub_errno;
+      }
+
+    if (grub_file_seek (file, stroff) == (grub_off_t) -1)
+      return grub_errno;
+    if (grub_file_read (file, strs, strsize) != (grub_ssize_t) strsize)
+      {
+	grub_free (syms);
+	grub_free (strs);
+	if (! grub_errno)
+	  return grub_error (GRUB_ERR_BAD_OS, "invalid ELF");
+	return grub_errno;
+      }
+
+    for (i = 0, sym = syms; i < symsize / symentsize;
+       i++, sym = (Elf_Sym *) ((char *) sym + symentsize))
+      {
+	if (ELF_ST_TYPE (sym->st_info) != STT_OBJECT)
+	  continue;
+	if (!sym->st_name)
+	  continue;
+	if (grub_strcmp (strs + sym->st_name, "rd_root_image") == 0)
+	  imagesym = sym;
+	if (grub_strcmp (strs + sym->st_name, "rd_root_size") == 0)
+	  sizesym = sym;
+	if (imagesym && sizesym)
+	  break;
+      }
+    if (!imagesym || !sizesym)
+      {
+	grub_free (syms);
+	grub_free (strs);
+	return GRUB_ERR_NONE;
+      }
+    if (sizeof (*desc->size) != sizesym->st_size)
+      {
+	grub_free (syms);
+	grub_free (strs);
+	return grub_error (GRUB_ERR_BAD_OS, "unexpected size of rd_root_size");
+      }
+    desc->max_size = imagesym->st_size;
+    desc->target = (imagesym->st_value & 0xFFFFFF) - kern_start
+      + (grub_uint8_t *) kern_chunk_src;
+    desc->size = (grub_uint32_t *) ((sizesym->st_value & 0xFFFFFF) - kern_start
+				    + (grub_uint8_t *) kern_chunk_src);
+    grub_free (syms);
+    grub_free (strs);
+
+    return GRUB_ERR_NONE;
+  }
+}
diff --git a/include/grub/i386/bsd.h b/include/grub/i386/bsd.h
index a6abd7e90..53008cdaf 100644
--- a/include/grub/i386/bsd.h
+++ b/include/grub/i386/bsd.h
@@ -99,6 +99,22 @@ grub_err_t grub_freebsd_add_meta_module (char *filename, char *type,
 					 int argc, char **argv,
 					 grub_addr_t addr, grub_uint32_t size);
 
+struct grub_openbsd_ramdisk_descriptor
+{
+  grub_size_t max_size;
+  grub_uint8_t *target;
+  grub_uint32_t *size;
+};
+
+grub_err_t grub_openbsd_find_ramdisk32 (grub_file_t file,
+					grub_addr_t kern_start,
+					void *kern_chunk_src,
+					struct grub_openbsd_ramdisk_descriptor *desc);
+grub_err_t grub_openbsd_find_ramdisk64 (grub_file_t file,
+					grub_addr_t kern_start,
+					void *kern_chunk_src,
+					struct grub_openbsd_ramdisk_descriptor *desc);
+
 extern grub_uint8_t grub_bsd64_trampoline_start, grub_bsd64_trampoline_end;
 extern grub_uint32_t grub_bsd64_trampoline_selfjump;
 extern grub_uint32_t grub_bsd64_trampoline_gdt;

From 671404469ce9e624395e136b2bd67d06dd8a8ad9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 27 Aug 2010 03:44:55 +0200
Subject: [PATCH 1436/1628] 	Handle USB pendrives exposed as floppies.

	* grub-core/boot/i386/pc/boot.S: Check LBA even on what appears to be
	floppy.
	* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_open): Likewise.
	Check for partitions on all devices.
---
 ChangeLog                         | 9 +++++++++
 grub-core/boot/i386/pc/boot.S     | 4 ----
 grub-core/disk/i386/pc/biosdisk.c | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e46c027b0..7043faf97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Handle USB pendrives exposed as floppies.
+
+	* grub-core/boot/i386/pc/boot.S: Check LBA even on what appears to be
+	floppy.
+	* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_open): Likewise.
+	Check for partitions on all devices.
+
 2010-08-25  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/term/ieee1275/ofconsole.c (put): Correct prototype.
diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
index 4afc57349..6b16a913a 100644
--- a/grub-core/boot/i386/pc/boot.S
+++ b/grub-core/boot/i386/pc/boot.S
@@ -153,10 +153,6 @@ real_start:
 	/* set %si to the disk address packet */
 	movw	$disk_address_packet, %si
 
-	/* do not probe LBA if the drive is a floppy */
-	testb	$GRUB_BOOT_MACHINE_BIOS_HD_FLAG, %dl
-	jz	LOCAL(chs_mode)
-
 	/* check if LBA is supported */
 	movb	$0x41, %ah
 	movw	$0x55aa, %bx
diff --git a/grub-core/disk/i386/pc/biosdisk.c b/grub-core/disk/i386/pc/biosdisk.c
index f82f91ff0..a00236e50 100644
--- a/grub-core/disk/i386/pc/biosdisk.c
+++ b/grub-core/disk/i386/pc/biosdisk.c
@@ -107,7 +107,7 @@ grub_biosdisk_open (const char *name, grub_disk_t disk)
   if (drive < 0)
     return grub_errno;
 
-  disk->has_partitions = ((drive & 0x80) && (drive != cd_drive));
+  disk->has_partitions = 1;
   disk->id = drive;
 
   data = (struct grub_biosdisk_data *) grub_zalloc (sizeof (*data));
@@ -123,7 +123,7 @@ grub_biosdisk_open (const char *name, grub_disk_t disk)
       /* TODO: get the correct size.  */
       total_sectors = GRUB_DISK_SIZE_UNKNOWN;
     }
-  else if (drive & 0x80)
+  else
     {
       /* HDD */
       int version;

From e95616a173849b5c89faeb77c53628cccbc018b5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 03:17:07 +0200
Subject: [PATCH 1437/1628] REmove leftover declaration

---
 grub-core/loader/i386/linux.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index e05225f25..debcdb71f 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -531,11 +531,6 @@ grub_linux_setup_video (struct linux_kernel_params *params)
   return GRUB_ERR_NONE;
 }
 
-#ifdef __x86_64__
-extern grub_uint8_t grub_linux_trampoline_start[];
-extern grub_uint8_t grub_linux_trampoline_end[];
-#endif
-
 static grub_err_t
 grub_linux_boot (void)
 {

From dc1bff761fcb5dcb7690268878037b723b1c6136 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 03:17:59 +0200
Subject: [PATCH 1438/1628] Simplify knetbsd bootcheck by using specfile

---
 Makefile.am                                |  9 +++--
 grub-core/tests/boot/kbsd.spec.txt         |  3 ++
 grub-core/tests/boot/knetbsd.init-i386.S   | 45 ----------------------
 grub-core/tests/boot/knetbsd.init-x86_64.S | 45 ----------------------
 4 files changed, 9 insertions(+), 93 deletions(-)
 create mode 100644 grub-core/tests/boot/kbsd.spec.txt

diff --git a/Makefile.am b/Makefile.am
index b97f012bc..4b0ef7f4c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -159,7 +159,10 @@ linux-initramfs.x86_64: linux.init.x86_64 Makefile
 kfreebsd-mfsroot.i386.img: kfreebsd.init.i386 Makefile
 	TDIR=`mktemp -d`; mkdir $$TDIR/dev; mkdir $$TDIR/sbin; cp $< $$TDIR/sbin/init; makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR; rm -rf $$TDIR
 
-knetbsd.image.i386: knetbsd.init.i386
+knetbsd.image.i386: knetbsd.init.i386 $(srcdir)/grub-core/tests/boot/kbsd.spec.txt
+	TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -F $(srcdir)/grub-core/tests/boot/kbsd.spec.txt -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
+
+kopenbsd.image.i386: kopenbsd.init.i386
 	TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
 
 knetbsd.miniroot-image.i386.img: knetbsd.image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386
@@ -168,8 +171,8 @@ knetbsd.miniroot-image.i386.img: knetbsd.image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd
 kfreebsd-mfsroot.x86_64.img: kfreebsd.init.x86_64 Makefile
 	TDIR=`mktemp -d`; mkdir $$TDIR/dev; mkdir $$TDIR/sbin; cp $< $$TDIR/sbin/init; makefs -t ffs -s 30m -f 1000 -o minfree=0,version=1 $@ $$TDIR; rm -rf $$TDIR
 
-knetbsd.image.x86_64: knetbsd.init.x86_64
-	TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
+knetbsd.image.x86_64: knetbsd.init.x86_64 $(srcdir)/grub-core/tests/boot/kbsd.spec.txt
+	TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -F $(srcdir)/grub-core/tests/boot/kbsd.spec.txt -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
 
 knetbsd.miniroot-image.x86_64.img: knetbsd.image.x86_64 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.x86_64
 	$(OBJCOPY) --add-section=miniroot=$< $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.x86_64 $@
diff --git a/grub-core/tests/boot/kbsd.spec.txt b/grub-core/tests/boot/kbsd.spec.txt
new file mode 100644
index 000000000..af171bc56
--- /dev/null
+++ b/grub-core/tests/boot/kbsd.spec.txt
@@ -0,0 +1,3 @@
+. type=dir
+	dev type=dir
+		console type=char device=0 mode=666 gid=0 uid=0
diff --git a/grub-core/tests/boot/knetbsd.init-i386.S b/grub-core/tests/boot/knetbsd.init-i386.S
index c751421ba..587b4f41f 100644
--- a/grub-core/tests/boot/knetbsd.init-i386.S
+++ b/grub-core/tests/boot/knetbsd.init-i386.S
@@ -22,8 +22,6 @@
 #define SYSCALL_WRITE 4
 #define SYSCALL_RESET 208
 #define SYSCALL_EXIT 1
-#define SYSCALL_MKNOD 14
-#define SYSCALL_MOUNT 410
 #define SYSCALL_INT 0x80
 
 #define RESET_NOSYNC 0x4
@@ -34,27 +32,6 @@
 	.global start,_start
 start:
 _start:
-	/* mount.  */
-	movl $SYSCALL_MOUNT, %eax
-	push $(tmpfs_args_end - tmpfs_args)
-	push $tmpfs_args
-	push $0
-	push $devfsdir
-	push $devfstype
-	pushl $0
-	int $SYSCALL_INT
-	addl $20, %esp
-
-	/* mknod.  */
-	movl $SYSCALL_MKNOD, %eax
-	pushl $0
-	pushl $0x2140
-	leal device, %ebx
-	pushl %ebx
-	pushl $0
-	int $SYSCALL_INT
-	addl $16, %esp
-
 	/* open.  */
 	movl $SYSCALL_OPEN, %eax
 	pushl $FLAGS_NONE
@@ -107,25 +84,3 @@ device:
 message:
 	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
 messageend:
-devfstype:
-	.ascii "tmpfs"
-	.byte 0
-devfsdir:
-	.ascii "/dev"
-	.byte 0
-tmpfs_args:
-	/* Version.  */
-	.long 1
-
-	/* Maximum inodes.  */
-	.quad 	0
-	/* Maximum size.  */
-	.quad   0
-
-	/* UID */
-	.long		0
-	/* GID */
-	.long 		0
-	/* Mode */
-	.long		0777
-tmpfs_args_end:	
\ No newline at end of file
diff --git a/grub-core/tests/boot/knetbsd.init-x86_64.S b/grub-core/tests/boot/knetbsd.init-x86_64.S
index 05a494594..1a19f3603 100644
--- a/grub-core/tests/boot/knetbsd.init-x86_64.S
+++ b/grub-core/tests/boot/knetbsd.init-x86_64.S
@@ -22,9 +22,7 @@
 #define SYSCALL_WRITE 4
 #define SYSCALL_RESET 208
 #define SYSCALL_EXIT 1
-#define SYSCALL_MKNOD 14
 #define SYSCALL_ARCH 165
-#define SYSCALL_MOUNT 410
 #define SYSCALL_INT 0x80
 #define SYSCALL_ARCH_IOPL	2
 
@@ -37,22 +35,6 @@
 	.global start,_start
 start:
 _start:
-	/* mount.  */
-	movq $SYSCALL_MOUNT, %rax
-	movq $devfstype, %rdi
-	movq $devfsdir, %rsi
-	movq $0, %rdx
-	movq $tmpfs_args, %r10
-	movq $(tmpfs_args_end - tmpfs_args), %r8
-	syscall
-
-	/* mknod.  */
-	movq $SYSCALL_MKNOD, %rax
-	leaq device, %rdi
-	movq $0x2140, %rsi
-	movq $0, %rdx
-	syscall
-
 	/* open.  */
 	movq $SYSCALL_OPEN, %rax
 	leaq device, %rdi
@@ -119,32 +101,5 @@ device:
 message:
 	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
 messageend:
-devfstype:
-	.ascii "tmpfs"
-	.byte 0
-devfsdir:
-	.ascii "/dev"
-	.byte 0
-tmpfs_args:
-	/* Version.  */
-	.long 1
-
-	/* Alignment long.  */
-	.long 0
-
-	/* Maximum inodes.  */
-	.quad 	0
-	/* Maximum size.  */
-	.quad   0
-
-	/* UID */
-	.long		0
-	/* GID */
-	.long 		0
-	/* Mode */
-	.long		0777
-	/* Alignment long.  */
-	.long 0
-tmpfs_args_end:
 iopl_arg:
 	.long 3
\ No newline at end of file

From 4619710a056e841fabd43e302347d5901e55e0e7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 11:32:49 +0200
Subject: [PATCH 1439/1628] Don't try to malloc if grub_mm_base is 0

---
 grub-core/kern/mm.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
index fd4fde81c..dec07bc1b 100644
--- a/grub-core/kern/mm.c
+++ b/grub-core/kern/mm.c
@@ -284,6 +284,9 @@ grub_memalign (grub_size_t align, grub_size_t size)
   grub_size_t n = ((size + GRUB_MM_ALIGN - 1) >> GRUB_MM_ALIGN_LOG2) + 1;
   int count = 0;
 
+  if (!grub_mm_base)
+    goto fail;
+
   align = (align >> GRUB_MM_ALIGN_LOG2);
   if (align == 0)
     align = 1;
@@ -318,6 +321,7 @@ grub_memalign (grub_size_t align, grub_size_t size)
       break;
     }
 
+ fail:
   grub_error (GRUB_ERR_OUT_OF_MEMORY, "out of memory");
   return 0;
 }

From 4aa5499064f6781699846b2272dd9ea67ee06d5a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 11:34:05 +0200
Subject: [PATCH 1440/1628] Prevent deadloop in term.c in case of out-of-memory

---
 grub-core/normal/charset.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
index fd377e1c6..b7f775c4f 100644
--- a/grub-core/normal/charset.c
+++ b/grub-core/normal/charset.c
@@ -297,13 +297,10 @@ grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg,
 {
   grub_size_t msg_len = grub_strlen (msg);
 
-  *unicode_msg = grub_malloc (grub_strlen (msg) * sizeof (grub_uint32_t));
+  *unicode_msg = grub_malloc (msg_len * sizeof (grub_uint32_t));
  
   if (!*unicode_msg)
-    {
-      grub_printf ("utf8_to_ucs4 ERROR1: %s", msg);
-      return -1;
-    }
+    return -1;
 
   msg_len = grub_utf8_to_ucs4 (*unicode_msg, msg_len,
   			      (grub_uint8_t *) msg, -1, 0);
@@ -1215,6 +1212,8 @@ grub_bidi_logical_to_visual (const grub_uint32_t *logical,
   struct grub_unicode_glyph *visual_ptr;
   *visual_out = visual_ptr = grub_malloc (2 * sizeof (visual_ptr[0])
 					  * logical_len);
+  if (!visual_ptr)
+    return -1;
   for (ptr = logical; ptr <= logical + logical_len; ptr++)
     {
       if (ptr == logical + logical_len || *ptr == '\n')

From d1dce5d35684d23b4ce4af0b224c9a7005e3973e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 11:34:33 +0200
Subject: [PATCH 1441/1628] Add DEBUG_RELOCATOR parts

---
 grub-core/lib/relocator.c | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
index 9f9927929..0acd59b94 100644
--- a/grub-core/lib/relocator.c
+++ b/grub-core/lib/relocator.c
@@ -1283,6 +1283,25 @@ grub_relocator_alloc_chunk_addr (struct grub_relocator *rel,
 
   chunk->srcv = grub_map_memory (chunk->src, chunk->size);
   *out = chunk;
+#ifdef DEBUG_RELOCATOR
+  {
+    grub_mm_region_t r;
+    grub_mm_header_t p;
+    grub_memset (chunk->srcv, 0xfa, chunk->size);
+    for (r = grub_mm_base; r; r = r->next)
+      {
+	p = r->first;
+	do
+	  {
+	    if ((grub_addr_t) p < (grub_addr_t) (r + 1)
+		|| (grub_addr_t) p >= (grub_addr_t) (r + 1) + r->size)
+	      grub_fatal (__FILE__ ":%d: out of range pointer: %p\n", __LINE__, p);
+	    p = p->next;
+	  }
+	while (p != r->first);
+      }
+  }
+#endif
   return GRUB_ERR_NONE;
 }
 
@@ -1416,6 +1435,26 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
 		rel->chunks->next);
   chunk->srcv = grub_map_memory (chunk->src, chunk->size);
   *out = chunk;
+#ifdef DEBUG_RELOCATOR
+  {
+    grub_mm_region_t r;
+    grub_mm_header_t p;
+
+    grub_memset (chunk->srcv, 0xfa, chunk->size);
+    for (r = grub_mm_base; r; r = r->next)
+      {
+	p = r->first;
+	do
+	  {
+	    if ((grub_addr_t) p < (grub_addr_t) (r + 1)
+		|| (grub_addr_t) p >= (grub_addr_t) (r + 1) + r->size)
+	      grub_fatal (__FILE__ "%d: out of range pointer: %p\n", __LINE__, p);
+	    p = p->next;
+	  }
+	while (p != r->first);
+      }
+  }
+#endif
   return GRUB_ERR_NONE;
 }
 

From dcc953eecb077923049b6e6b50fbef3055122a2e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 11:35:02 +0200
Subject: [PATCH 1442/1628] Fallback to dumb printf if malloc failes

---
 grub-core/normal/term.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c
index 4f5779abe..a5fdbe4e9 100644
--- a/grub-core/normal/term.c
+++ b/grub-core/normal/term.c
@@ -751,6 +751,34 @@ grub_xputs_normal (const char *str)
   if (!unicode_str)
     {
       grub_errno = GRUB_ERR_NONE;
+      for (; *str; str++)
+	{
+	  grub_term_output_t term;
+	  grub_uint32_t code = *str;
+	  if (code > 0x7f)
+	    code = '?';
+
+	  FOR_ACTIVE_TERM_OUTPUTS(term)
+	  {
+	    struct grub_unicode_glyph c =
+	      {
+		.base = code,
+		.variant = 0,
+		.attributes = 0,
+		.ncomb = 0,
+		.combining = 0,
+		.estimated_width = 1
+	      };
+
+	    (term->putchar) (term, &c);
+	    if (code == '\n')
+	      {
+		c.base = '\r';
+		(term->putchar) (term, &c);
+	      }
+	  }
+	}
+
       return;
     }
 

From 0f6a963e9b013eed61bc829dc5a49e6b5beeab99 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 14:51:54 +0200
Subject: [PATCH 1443/1628] kOpenBSD bootcheck

---
 Makefile.am                                   | 16 +++++---
 .../{knetbsd.init-i386.S => kbsd.init-i386.S} | 41 ++++++++++++++++++-
 grub-core/tests/boot/kopenbsd.cfg             |  5 +++
 grub-core/tests/boot/kopenbsdlabel.txt        |  3 ++
 4 files changed, 59 insertions(+), 6 deletions(-)
 rename grub-core/tests/boot/{knetbsd.init-i386.S => kbsd.init-i386.S} (76%)
 create mode 100644 grub-core/tests/boot/kopenbsd.cfg
 create mode 100644 grub-core/tests/boot/kopenbsdlabel.txt

diff --git a/Makefile.am b/Makefile.am
index 4b0ef7f4c..35f93bfb6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -144,8 +144,11 @@ kfreebsd.init.x86_64: $(srcdir)/grub-core/tests/boot/kfreebsd.init-x86_64.S
 kfreebsd.init.i386: $(srcdir)/grub-core/tests/boot/kfreebsd.init-i386.S
 	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
 
-knetbsd.init.i386: $(srcdir)/grub-core/tests/boot/knetbsd.init-i386.S
-	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+knetbsd.init.i386: $(srcdir)/grub-core/tests/boot/kbsd.init-i386.S
+	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DTARGET_NETBSD=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+
+kopenbsd.init.i386: $(srcdir)/grub-core/tests/boot/kbsd.init-i386.S
+	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DTARGET_OPENBSD=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 
 knetbsd.init.x86_64: $(srcdir)/grub-core/tests/boot/knetbsd.init-x86_64.S
 	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
@@ -162,8 +165,8 @@ kfreebsd-mfsroot.i386.img: kfreebsd.init.i386 Makefile
 knetbsd.image.i386: knetbsd.init.i386 $(srcdir)/grub-core/tests/boot/kbsd.spec.txt
 	TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -F $(srcdir)/grub-core/tests/boot/kbsd.spec.txt -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
 
-kopenbsd.image.i386: kopenbsd.init.i386
-	TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -t ffs -s 64k -f 10 -o minfree=0,version=1 $@ $$TDIR && rm -rf $$TDIR
+kopenbsd.image.i386: kopenbsd.init.i386 $(srcdir)/grub-core/tests/boot/kopenbsdlabel.txt
+	TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -F $(srcdir)/grub-core/tests/boot/kbsd.spec.txt -t ffs -s 128k -f 10 -o minfree=0,version=1 $@ $$TDIR && bsdlabel -f -R $@ $(srcdir)/grub-core/tests/boot/kopenbsdlabel.txt && rm -rf $$TDIR || rm -f $@
 
 knetbsd.miniroot-image.i386.img: knetbsd.image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386
 	$(OBJCOPY) --add-section=miniroot=$< $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386 $@
@@ -195,7 +198,10 @@ knetbsd.miniroot-image.i386.gz: knetbsd.miniroot-image.i386.img
 	gzip < $< > $@
 
 bootcheck-knetbsd-i386: knetbsd.miniroot-image.i386.gz $(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/grub-core/tests/boot/knetbsd.cfg grub-shell
-	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-i386 --files=/miniroot.gz=knetbsd.miniroot-image.i386.gz --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/grub-core/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/miniroot.gz=knetbsd.miniroot-image.i386.gz --files=/knetbsd=$(GRUB_PAYLOADS_DIR)/knetbsd.i386 $(srcdir)/grub-core/tests/boot/knetbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
+bootcheck-kopenbsd-i386: kopenbsd.image.i386 $(GRUB_PAYLOADS_DIR)/kopenbsd.i386 $(srcdir)/grub-core/tests/boot/kopenbsd.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/ramdisk=kopenbsd.image.i386 --files=/kopenbsd=$(GRUB_PAYLOADS_DIR)/kopenbsd.i386 $(srcdir)/grub-core/tests/boot/kopenbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
 knetbsd.miniroot-image.x86_64.gz: knetbsd.miniroot-image.x86_64.img
 	gzip < $< > $@
diff --git a/grub-core/tests/boot/knetbsd.init-i386.S b/grub-core/tests/boot/kbsd.init-i386.S
similarity index 76%
rename from grub-core/tests/boot/knetbsd.init-i386.S
rename to grub-core/tests/boot/kbsd.init-i386.S
index 587b4f41f..7011c79ff 100644
--- a/grub-core/tests/boot/knetbsd.init-i386.S
+++ b/grub-core/tests/boot/kbsd.init-i386.S
@@ -16,18 +16,29 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifdef TARGET_NETBSD
+#define SYSCALL_RESET 208
+#elif defined (TARGET_OPENBSD)
+#define SYSCALL_RESET 55
+#else
+#error unknown target
+#endif
+
 #define MODE_RDRW 2
 #define FLAGS_NONE 0
 #define SYSCALL_OPEN 5
 #define SYSCALL_WRITE 4
-#define SYSCALL_RESET 208
 #define SYSCALL_EXIT 1
+#define SYSCALL_ARCH 165
 #define SYSCALL_INT 0x80
+#define SYSCALL_ARCH_IOPL	2
 
 #define RESET_NOSYNC 0x4
 #define RESET_HALT 0x8
 #define RESET_POWEROFF 0x800
 
+#define SHUTDOWN_PORT 0x8900
+
 	.section ".init", "ax"
 	.global start,_start
 start:
@@ -53,6 +64,32 @@ _start:
 	int $SYSCALL_INT
 	addl $16, %esp
 
+	/* IOPL.  */
+	movl $SYSCALL_ARCH, %eax
+	pushl $iopl_arg
+	pushl $SYSCALL_ARCH_IOPL
+	pushl $0
+	int $SYSCALL_INT
+	addl $12, %esp
+
+	movw $SHUTDOWN_PORT, %dx
+	movb $'S', %al
+	outb %al, %dx
+	movb $'h', %al
+	outb %al, %dx
+	movb $'u', %al
+	outb %al, %dx
+	movb $'t', %al
+	outb %al, %dx
+	movb $'d', %al
+	outb %al, %dx
+	movb $'o', %al
+	outb %al, %dx
+	movb $'w', %al
+	outb %al, %dx
+	movb $'n', %al
+	outb %al, %dx
+
 	/* shutdown.  */
 	movl $SYSCALL_RESET, %eax
 	pushl $0
@@ -84,3 +121,5 @@ device:
 message:
 	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
 messageend:
+iopl_arg:
+	.long 3
diff --git a/grub-core/tests/boot/kopenbsd.cfg b/grub-core/tests/boot/kopenbsd.cfg
new file mode 100644
index 000000000..132bec4b6
--- /dev/null
+++ b/grub-core/tests/boot/kopenbsd.cfg
@@ -0,0 +1,5 @@
+kopenbsd /kopenbsd -h
+kopenbsd_ramdisk /ramdisk
+boot
+# Shouln't happen
+halt
diff --git a/grub-core/tests/boot/kopenbsdlabel.txt b/grub-core/tests/boot/kopenbsdlabel.txt
new file mode 100644
index 000000000..bb141133b
--- /dev/null
+++ b/grub-core/tests/boot/kopenbsdlabel.txt
@@ -0,0 +1,3 @@
+#        size   offset    fstype   [fsize bsize bps/cpg]
+  a:      256        0    4.2BSD        0     0     1 
+  c:      256        0    unused        0     0         # "raw" part, don't edit

From 4fc95be2e7206ca85a6b0ba1380b063f72c3f9cc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 14:52:25 +0200
Subject: [PATCH 1444/1628] fix grub-emu compilation

---
 include/grub/mm_private.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/grub/mm_private.h b/include/grub/mm_private.h
index 2927f16c4..c2c4cb151 100644
--- a/include/grub/mm_private.h
+++ b/include/grub/mm_private.h
@@ -57,6 +57,8 @@ typedef struct grub_mm_region
 }
 *grub_mm_region_t;
 
+#ifndef GRUB_MACHINE_EMU
 extern grub_mm_region_t EXPORT_VAR (grub_mm_base);
+#endif
 
 #endif

From 8e4ac346e86483619de8da601fb3fead85371f7f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 15:05:26 +0200
Subject: [PATCH 1445/1628] OpenBSD64 bootcheck

---
 Makefile.am                                       | 15 +++++++++++++--
 .../{knetbsd.init-x86_64.S => kbsd.init-x86_64.S} |  6 ++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 rename grub-core/tests/boot/{knetbsd.init-x86_64.S => kbsd.init-x86_64.S} (95%)

diff --git a/Makefile.am b/Makefile.am
index 35f93bfb6..53439fd42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -150,8 +150,11 @@ knetbsd.init.i386: $(srcdir)/grub-core/tests/boot/kbsd.init-i386.S
 kopenbsd.init.i386: $(srcdir)/grub-core/tests/boot/kbsd.init-i386.S
 	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DTARGET_OPENBSD=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 
-knetbsd.init.x86_64: $(srcdir)/grub-core/tests/boot/knetbsd.init-x86_64.S
-	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+knetbsd.init.x86_64: $(srcdir)/grub-core/tests/boot/kbsd.init-x86_64.S
+	$(TARGET_CC) -o $@ $< -m64 -DTARGET_NETBSD=1 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
+
+kopenbsd.init.x86_64: $(srcdir)/grub-core/tests/boot/kbsd.init-x86_64.S
+	$(TARGET_CC) -o $@ $< -m64 -DTARGET_OPENBSD=1 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 
 linux-initramfs.i386: linux.init.i386 Makefile
 	TDIR=`mktemp -d`; cp $< $$TDIR/init; (cd $$TDIR; echo ./init | cpio --quiet --dereference -o -H newc) | gzip > $@; rm -rf $$TDIR
@@ -168,6 +171,9 @@ knetbsd.image.i386: knetbsd.init.i386 $(srcdir)/grub-core/tests/boot/kbsd.spec.t
 kopenbsd.image.i386: kopenbsd.init.i386 $(srcdir)/grub-core/tests/boot/kopenbsdlabel.txt
 	TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -F $(srcdir)/grub-core/tests/boot/kbsd.spec.txt -t ffs -s 128k -f 10 -o minfree=0,version=1 $@ $$TDIR && bsdlabel -f -R $@ $(srcdir)/grub-core/tests/boot/kopenbsdlabel.txt && rm -rf $$TDIR || rm -f $@
 
+kopenbsd.image.x86_64: kopenbsd.init.x86_64 $(srcdir)/grub-core/tests/boot/kopenbsdlabel.txt
+	TDIR=`mktemp -d` && mkdir $$TDIR/dev && mkdir $$TDIR/sbin && cp $< $$TDIR/sbin/init && makefs -F $(srcdir)/grub-core/tests/boot/kbsd.spec.txt -t ffs -s 128k -f 10 -o minfree=0,version=1 $@ $$TDIR && bsdlabel -f -R $@ $(srcdir)/grub-core/tests/boot/kopenbsdlabel.txt && rm -rf $$TDIR || rm -f $@
+
 knetbsd.miniroot-image.i386.img: knetbsd.image.i386 $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386
 	$(OBJCOPY) --add-section=miniroot=$< $(GRUB_PAYLOADS_DIR)/knetbsd.miniroot.i386 $@
 
@@ -203,6 +209,9 @@ bootcheck-knetbsd-i386: knetbsd.miniroot-image.i386.gz $(GRUB_PAYLOADS_DIR)/knet
 bootcheck-kopenbsd-i386: kopenbsd.image.i386 $(GRUB_PAYLOADS_DIR)/kopenbsd.i386 $(srcdir)/grub-core/tests/boot/kopenbsd.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/ramdisk=kopenbsd.image.i386 --files=/kopenbsd=$(GRUB_PAYLOADS_DIR)/kopenbsd.i386 $(srcdir)/grub-core/tests/boot/kopenbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
+bootcheck-kopenbsd-x86_64: kopenbsd.image.x86_64 $(GRUB_PAYLOADS_DIR)/kopenbsd.x86_64 $(srcdir)/grub-core/tests/boot/kopenbsd.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=qemu-system-x86_64 --files=/ramdisk=kopenbsd.image.x86_64 --files=/kopenbsd=$(GRUB_PAYLOADS_DIR)/kopenbsd.x86_64 $(srcdir)/grub-core/tests/boot/kopenbsd.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
 knetbsd.miniroot-image.x86_64.gz: knetbsd.miniroot-image.x86_64.img
 	gzip < $< > $@
 
@@ -236,6 +245,8 @@ if COND_i386_pc
 BOOTCHECKS += bootcheck-pc-chainloader
 endif
 
+BOOTCHECKS += bootcheck-kopenbsd-i386 bootcheck-kopenbsd-x86_64
+
 BOOTCHECKS += bootcheck-multiboot bootcheck-multiboot2
 
 BOOTCHECKS += bootcheck-linux16-i386 bootcheck-linux16-x86_64
diff --git a/grub-core/tests/boot/knetbsd.init-x86_64.S b/grub-core/tests/boot/kbsd.init-x86_64.S
similarity index 95%
rename from grub-core/tests/boot/knetbsd.init-x86_64.S
rename to grub-core/tests/boot/kbsd.init-x86_64.S
index 1a19f3603..58400db0d 100644
--- a/grub-core/tests/boot/knetbsd.init-x86_64.S
+++ b/grub-core/tests/boot/kbsd.init-x86_64.S
@@ -20,7 +20,13 @@
 #define FLAGS_NONE 0
 #define SYSCALL_OPEN 5
 #define SYSCALL_WRITE 4
+#ifdef TARGET_NETBSD
 #define SYSCALL_RESET 208
+#elif defined (TARGET_OPENBSD)
+#define SYSCALL_RESET 55
+#else
+#error unknown target
+#endif
 #define SYSCALL_EXIT 1
 #define SYSCALL_ARCH 165
 #define SYSCALL_INT 0x80

From b17540cbd92d554c2dd4a82d0d7be0d9318f914b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 15:25:12 +0200
Subject: [PATCH 1446/1628] 	* grub-core/fs/nilfs2.c (grub_nilfs2_load_sb):
 Handle grub_disk_read 	errors.

---
 ChangeLog             |  5 +++++
 grub-core/fs/nilfs2.c | 26 ++++++++++++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7043faf97..dc24ebf00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/nilfs2.c (grub_nilfs2_load_sb): Handle grub_disk_read
+	errors.
+
 2010-08-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Handle USB pendrives exposed as floppies.
diff --git a/grub-core/fs/nilfs2.c b/grub-core/fs/nilfs2.c
index 8329c01a1..e529775f4 100644
--- a/grub-core/fs/nilfs2.c
+++ b/grub-core/fs/nilfs2.c
@@ -718,10 +718,13 @@ grub_nilfs2_load_sb (struct grub_nilfs2_data *data)
   grub_uint64_t partition_size;
   int valid[2];
   int swp = 0;
+  grub_err_t err;
 
   /* Read first super block. */
-  grub_disk_read (disk, NILFS_1ST_SUPER_BLOCK, 0,
-		  sizeof (struct grub_nilfs2_super_block), &data->sblock);
+  err = grub_disk_read (disk, NILFS_1ST_SUPER_BLOCK, 0,
+			sizeof (struct grub_nilfs2_super_block), &data->sblock);
+  if (err)
+    return err;
   /* Make sure if 1st super block is valid.  */
   valid[0] = grub_nilfs2_valid_sb (&data->sblock);
 
@@ -729,17 +732,21 @@ grub_nilfs2_load_sb (struct grub_nilfs2_data *data)
   if (partition_size != GRUB_DISK_SIZE_UNKNOWN)
     {
       /* Read second super block. */
-      grub_disk_read (disk, NILFS_2ND_SUPER_BLOCK (partition_size), 0,
-		      sizeof (struct grub_nilfs2_super_block), &sb2);
-      /* Make sure if 2nd super block is valid.  */
-      valid[1] = grub_nilfs2_valid_sb (&sb2);
+      err = grub_disk_read (disk, NILFS_2ND_SUPER_BLOCK (partition_size), 0,
+			    sizeof (struct grub_nilfs2_super_block), &sb2);
+      if (err)
+	{
+	  valid[1] = 0;
+	  grub_errno = GRUB_ERR_NONE;
+	}
+      else
+	/* Make sure if 2nd super block is valid.  */
+	valid[1] = grub_nilfs2_valid_sb (&sb2);
     }
   else
     /* 2nd super block may not exist, so it's invalid. */
     valid[1] = 0;
 
-
-
   if (!valid[0] && !valid[1])
     return grub_error (GRUB_ERR_BAD_FS, "not a nilfs2 filesystem");
 
@@ -752,8 +759,7 @@ grub_nilfs2_load_sb (struct grub_nilfs2_data *data)
     grub_memcpy (&data->sblock, &sb2,
 		 sizeof (struct grub_nilfs2_super_block));
 
-  grub_errno = GRUB_ERR_NONE;
-  return grub_errno;
+  return GRUB_ERR_NONE;
 }
 
 static struct grub_nilfs2_data *

From 3393cf16d676a67cfc1f1024cac039c76082e4dc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 15:28:08 +0200
Subject: [PATCH 1447/1628] 	* grub-core/term/gfxterm.c
 (grub_gfxterm_term_fini): Free the text buffer. 	(scroll_up): Fix a
 memory leak.

---
 ChangeLog                |  5 +++++
 grub-core/term/gfxterm.c | 16 +++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dc24ebf00..fb5f6ef91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/term/gfxterm.c (grub_gfxterm_term_fini): Free the text buffer.
+	(scroll_up): Fix a memory leak.
+
 2010-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/nilfs2.c (grub_nilfs2_load_sb): Handle grub_disk_read
diff --git a/grub-core/term/gfxterm.c b/grub-core/term/gfxterm.c
index bf9705abd..5f88f91ed 100644
--- a/grub-core/term/gfxterm.c
+++ b/grub-core/term/gfxterm.c
@@ -405,9 +405,16 @@ destroy_window (void)
 static grub_err_t
 grub_gfxterm_term_fini (struct grub_term_output *term __attribute__ ((unused)))
 {
+  unsigned i;
   destroy_window ();
   grub_video_restore ();
 
+  for (i = 0; i < virtual_screen.columns * virtual_screen.rows; i++)
+    {
+      grub_free (virtual_screen.text_buffer[i].code);
+      virtual_screen.text_buffer[i].code = 0;
+    }
+
   /* Clear error state.  */
   grub_errno = GRUB_ERR_NONE;
   return GRUB_ERR_NONE;
@@ -793,13 +800,8 @@ scroll_up (void)
   unsigned int i;
 
   /* Clear first line in text buffer.  */
-  for (i = 0;
-       i < virtual_screen.columns;
-       i++)
-    {
-      virtual_screen.text_buffer[i].code = 0;
-      clear_char (&(virtual_screen.text_buffer[i]));
-    }
+  for (i = 0; i < virtual_screen.columns; i++)
+    grub_free (virtual_screen.text_buffer[i].code);
 
   /* Scroll text buffer with one line to up.  */
   grub_memmove (virtual_screen.text_buffer,

From 9e0fa3f606df14b774967e06fce6f64bd67d8972 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 15:29:44 +0200
Subject: [PATCH 1448/1628] 	* grub-core/normal/cmdline.c
 (grub_cmdline_get): Free cl_terms on 	return.

---
 ChangeLog                  | 5 +++++
 grub-core/normal/cmdline.c | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index fb5f6ef91..39e6a4f16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/cmdline.c (grub_cmdline_get): Free cl_terms on
+	return.
+
 2010-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/term/gfxterm.c (grub_gfxterm_term_fini): Free the text buffer.
diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c
index daa0a1adb..3647dcd3a 100644
--- a/grub-core/normal/cmdline.c
+++ b/grub-core/normal/cmdline.c
@@ -585,6 +585,7 @@ grub_cmdline_get (const char *prompt)
 	  break;
 
 	case '\e':
+	  grub_free (cl_terms);
 	  return 0;
 
 	case '\b':
@@ -635,5 +636,6 @@ grub_cmdline_get (const char *prompt)
 
   ret = grub_ucs4_to_utf8_alloc (buf + lpos, llen - lpos + 1);
   grub_free (buf);
+  grub_free (cl_terms);
   return ret;
 }

From 46422ebf1acf49b9f7fe7cb7cfc48a6dcb525b63 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 15:31:21 +0200
Subject: [PATCH 1449/1628] 	* grub-core/normal/completion.c
 (grub_normal_do_completion): Free argv 	on failure.

---
 ChangeLog                     | 5 +++++
 grub-core/normal/completion.c | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 39e6a4f16..0779d7c8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/completion.c (grub_normal_do_completion): Free argv
+	on failure.
+
 2010-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/normal/cmdline.c (grub_cmdline_get): Free cl_terms on
diff --git a/grub-core/normal/completion.c b/grub-core/normal/completion.c
index 40a645fb4..d127f9baf 100644
--- a/grub-core/normal/completion.c
+++ b/grub-core/normal/completion.c
@@ -499,7 +499,10 @@ grub_normal_do_completion (char *buf, int *restore,
 
  fail:
   if (argc != 0)
-    grub_free (argv[0]);
+    {
+      grub_free (argv);
+      grub_free (argv[0]);
+    }
   grub_free (match);
   grub_errno = GRUB_ERR_NONE;
 

From 2053cc077b873646d7977c37e53115087312a718 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 15:34:29 +0200
Subject: [PATCH 1450/1628] 	* grub-core/script/script.c
 (grub_script_parse): Free parsed on 	failure.

---
 ChangeLog                 | 5 +++++
 grub-core/script/script.c | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0779d7c8f..2ffbbcd7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/script/script.c (grub_script_parse): Free parsed on
+	failure.
+
 2010-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/normal/completion.c (grub_normal_do_completion): Free argv
diff --git a/grub-core/script/script.c b/grub-core/script/script.c
index 9cee40dcb..448bdf775 100644
--- a/grub-core/script/script.c
+++ b/grub-core/script/script.c
@@ -365,7 +365,10 @@ grub_script_parse (char *script, grub_reader_getline_t getline)
 
   parsestate = grub_zalloc (sizeof (*parsestate));
   if (!parsestate)
-    return 0;
+    {
+      grub_free (parsed);
+      return 0;
+    }
 
   /* Initialize the lexer.  */
   lexstate = grub_script_lexer_init (parsestate, script, getline);
@@ -388,6 +391,7 @@ grub_script_parse (char *script, grub_reader_getline_t getline)
       grub_script_mem_free (memfree);
       grub_script_lexer_fini (lexstate);
       grub_free (parsestate);
+      grub_free (parsed);
       return 0;
     }
 

From 3c7079670dfa210b4134649aba5dcc5d2a0d40ca Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 15:35:43 +0200
Subject: [PATCH 1451/1628] 	* grub-core/script/lexer.c
 (grub_script_lexer_init): Don't look before 	the begining of the string

---
 ChangeLog                | 5 +++++
 grub-core/script/lexer.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 2ffbbcd7b..612669367 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/script/lexer.c (grub_script_lexer_init): Don't look before
+	the begining of the string
+
 2010-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/script/script.c (grub_script_parse): Free parsed on
diff --git a/grub-core/script/lexer.c b/grub-core/script/lexer.c
index 42a570348..64da45ed8 100644
--- a/grub-core/script/lexer.c
+++ b/grub-core/script/lexer.c
@@ -236,7 +236,7 @@ grub_script_lexer_init (struct grub_parser_param *parser, char *script,
   script = script ? : "\n";
   len = grub_strlen (script);
 
-  if (script[len - 1] == '\n')
+  if (len != 0 && script[len - 1] == '\n')
     {
       buffer = yy_scan_string (script, lexerstate->yyscanner);
     }

From 902f75f64567d04fe6a01afad191df6cc703cded Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 15:39:34 +0200
Subject: [PATCH 1452/1628] 	* grub-core/normal/term.c (print_more): Fix a
 memory leak. 	(grub_puts_terminal): Revert to dumb puts if memory allocation
 fails. 	(grub_xputs_normal): Likewise.

---
 ChangeLog               |  6 ++++++
 grub-core/normal/term.c | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 612669367..0b9d6c30a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/term.c (print_more): Fix a memory leak.
+	(grub_puts_terminal): Revert to dumb puts if memory allocation fails.
+	(grub_xputs_normal): Likewise.
+
 2010-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/script/lexer.c (grub_script_lexer_init): Don't look before
diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c
index 4f5779abe..e6ef002d0 100644
--- a/grub-core/normal/term.c
+++ b/grub-core/normal/term.c
@@ -44,6 +44,9 @@ static int grub_more;
 
 static int grub_normal_char_counter = 0;
 
+static void
+putcode_real (grub_uint32_t code, struct grub_term_output *term);
+
 int
 grub_normal_get_char_counter (void)
 {
@@ -94,6 +97,7 @@ print_more (void)
   FOR_ACTIVE_TERM_OUTPUTS(term)
     grub_print_spaces (term, 8);
   grub_term_restore_pos (pos);
+  grub_free (pos);
 
   /* Scroll one lines or an entire page, depending on the key.  */
 
@@ -204,6 +208,20 @@ grub_puts_terminal (const char *str, struct grub_term_output *term)
   grub_uint32_t *unicode_str, *unicode_last_position;
   grub_utf8_to_ucs4_alloc (str, &unicode_str,
 			   &unicode_last_position);
+  if (!unicode_str)
+    {
+      for (; str; str++)
+	{
+	  grub_uint32_t code = *str;
+	  if (code > 0x7f)
+	    code = '?';
+
+	  putcode_real (term, code);
+	  if (code == '\n')
+	    putcode_real (term, '\r');
+	}
+      return;
+    }
 
   grub_print_ucs4 (unicode_str, unicode_last_position, 0, 0, term);
   grub_free (unicode_str);
@@ -751,6 +769,21 @@ grub_xputs_normal (const char *str)
   if (!unicode_str)
     {
       grub_errno = GRUB_ERR_NONE;
+      for (; *str; str++)
+	{
+	  grub_term_output_t term;
+	  grub_uint32_t code = *str;
+	  if (code > 0x7f)
+	    code = '?';
+
+	  FOR_ACTIVE_TERM_OUTPUTS(term)
+	  {
+	    putcode_real (term, code);
+	    if (code == '\n')
+	      putcode_real (term, '\r');
+	  }
+	}
+
       return;
     }
 

From 0101a723ce52d6962b2a32028425f915c8a8598c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 16:05:20 +0200
Subject: [PATCH 1453/1628] ntldr bootcheck

---
 Makefile.am                           | 13 +++++++++++--
 grub-core/tests/boot/ntldr.cfg        |  4 ++++
 grub-core/tests/boot/pc-chainloader.S |  8 +++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 grub-core/tests/boot/ntldr.cfg

diff --git a/Makefile.am b/Makefile.am
index 53439fd42..64c9c7e0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,11 +130,17 @@ multiboot.elf: $(srcdir)/grub-core/tests/boot/multiboot.S
 	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include
 
 pc-chainloader.elf: $(srcdir)/grub-core/tests/boot/pc-chainloader.S
-	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0x7c00 -m32
+	$(TARGET_CC) -o $@ $< -DTARGET_CHAINLOADER=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0x7c00 -m32
 
 pc-chainloader.bin: pc-chainloader.elf
 	$(OBJCOPY) -O binary --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< $@;
 
+ntldr.elf: $(srcdir)/grub-core/tests/boot/pc-chainloader.S
+	$(TARGET_CC) -o $@ $< -DTARGET_NTLDR=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0 -m32
+
+ntldr.bin: ntldr.elf
+	$(OBJCOPY) -O binary --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< $@;
+
 multiboot2.elf: $(srcdir)/grub-core/tests/boot/multiboot.S
 	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include -DMULTIBOOT2=1
 
@@ -239,10 +245,13 @@ bootcheck-multiboot2: multiboot2.elf $(srcdir)/grub-core/tests/boot/multiboot2.c
 bootcheck-pc-chainloader: pc-chainloader.bin $(srcdir)/grub-core/tests/boot/pc-chainloader.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/pc-chainloader.bin=pc-chainloader.bin $(srcdir)/grub-core/tests/boot/pc-chainloader.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
+bootcheck-ntldr: ntldr.bin $(srcdir)/grub-core/tests/boot/ntldr.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/ntldr.bin=ntldr.bin $(srcdir)/grub-core/tests/boot/ntldr.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
 BOOTCHECKS= 
 
 if COND_i386_pc
-BOOTCHECKS += bootcheck-pc-chainloader
+BOOTCHECKS += bootcheck-pc-chainloader bootcheck-ntldr
 endif
 
 BOOTCHECKS += bootcheck-kopenbsd-i386 bootcheck-kopenbsd-x86_64
diff --git a/grub-core/tests/boot/ntldr.cfg b/grub-core/tests/boot/ntldr.cfg
new file mode 100644
index 000000000..cd438a4bc
--- /dev/null
+++ b/grub-core/tests/boot/ntldr.cfg
@@ -0,0 +1,4 @@
+ntldr /ntldr.bin
+boot
+# Shouln't happen
+halt
diff --git a/grub-core/tests/boot/pc-chainloader.S b/grub-core/tests/boot/pc-chainloader.S
index fc7429940..20040dabc 100644
--- a/grub-core/tests/boot/pc-chainloader.S
+++ b/grub-core/tests/boot/pc-chainloader.S
@@ -39,8 +39,14 @@ serialmsg:
 1:
 	ret
 
-cont:	
+cont:
+#ifdef TARGET_NTLDR
+	movw $0x2000, %ax
+#elif defined (TARGET_CHAINLOADER)
 	xorw %ax, %ax
+#else
+#error unsupported target
+#endif
 	movw %ax, %ds
 	lea message, %si
 	call serialmsg

From 9bd44ab21ac53f307028a051c3c91121179c6da7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 16:21:45 +0200
Subject: [PATCH 1454/1628] kfreebsd-aout bootchecks

---
 Makefile.am                            | 13 ++++++++++++-
 grub-core/tests/boot/kfreebsd-aout.cfg |  4 ++++
 grub-core/tests/boot/multiboot.S       |  8 ++++----
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 grub-core/tests/boot/kfreebsd-aout.cfg

diff --git a/Makefile.am b/Makefile.am
index 64c9c7e0f..ea9a64ce2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,8 +127,14 @@ linux.init.i386: $(srcdir)/grub-core/tests/boot/linux.init-i386.S
 	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 
 multiboot.elf: $(srcdir)/grub-core/tests/boot/multiboot.S
+	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -DTARGET_MULTIBOOT=1 -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include
+
+kfreebsd.elf: $(srcdir)/grub-core/tests/boot/multiboot.S
 	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include
 
+kfreebsd.aout: kfreebsd.elf
+	$(OBJCOPY) -O a.out-i386-linux $< $@ -R .note.gnu.build-id
+
 pc-chainloader.elf: $(srcdir)/grub-core/tests/boot/pc-chainloader.S
 	$(TARGET_CC) -o $@ $< -DTARGET_CHAINLOADER=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0x7c00 -m32
 
@@ -142,7 +148,7 @@ ntldr.bin: ntldr.elf
 	$(OBJCOPY) -O binary --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< $@;
 
 multiboot2.elf: $(srcdir)/grub-core/tests/boot/multiboot.S
-	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include -DMULTIBOOT2=1
+	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include -DTARGET_MULTIBOOT2=1
 
 kfreebsd.init.x86_64: $(srcdir)/grub-core/tests/boot/kfreebsd.init-x86_64.S
 	$(TARGET_CC) -o $@ $< -m64 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" && freebsd-brandelf -t FreeBSD $@
@@ -242,6 +248,9 @@ bootcheck-multiboot: multiboot.elf $(srcdir)/grub-core/tests/boot/multiboot.cfg
 bootcheck-multiboot2: multiboot2.elf $(srcdir)/grub-core/tests/boot/multiboot2.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/multiboot2.elf=multiboot2.elf $(srcdir)/grub-core/tests/boot/multiboot2.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
+bootcheck-kfreebsd-aout: kfreebsd.aout $(srcdir)/grub-core/tests/boot/kfreebsd-aout.cfg grub-shell
+	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/kfreebsd.aout=kfreebsd.aout $(srcdir)/grub-core/tests/boot/kfreebsd-aout.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
+
 bootcheck-pc-chainloader: pc-chainloader.bin $(srcdir)/grub-core/tests/boot/pc-chainloader.cfg grub-shell
 	timeout -s KILL $(BOOTCHECK_TIMEOUT) ./grub-shell --qemu-opts="$(GRUB_QEMU_OPTS)" --boot=$(BOOTTARGET) --qemu=$(QEMU32) --files=/pc-chainloader.bin=pc-chainloader.bin $(srcdir)/grub-core/tests/boot/pc-chainloader.cfg | grep $(SUCCESSFUL_BOOT_STRING) > /dev/null
 
@@ -254,6 +263,8 @@ if COND_i386_pc
 BOOTCHECKS += bootcheck-pc-chainloader bootcheck-ntldr
 endif
 
+BOOTCHECKS += bootcheck-kfreebsd-aout
+
 BOOTCHECKS += bootcheck-kopenbsd-i386 bootcheck-kopenbsd-x86_64
 
 BOOTCHECKS += bootcheck-multiboot bootcheck-multiboot2
diff --git a/grub-core/tests/boot/kfreebsd-aout.cfg b/grub-core/tests/boot/kfreebsd-aout.cfg
new file mode 100644
index 000000000..31e34b4ee
--- /dev/null
+++ b/grub-core/tests/boot/kfreebsd-aout.cfg
@@ -0,0 +1,4 @@
+kfreebsd /kfreebsd.aout
+boot
+# Shouln't happen
+halt
diff --git a/grub-core/tests/boot/multiboot.S b/grub-core/tests/boot/multiboot.S
index b9c0059c0..904b0d4c7 100644
--- a/grub-core/tests/boot/multiboot.S
+++ b/grub-core/tests/boot/multiboot.S
@@ -1,7 +1,7 @@
 #define ASM_FILE	1
-#ifdef MULTIBOOT2
+#ifdef TARGET_MULTIBOOT2
 #include <multiboot2.h>
-#else
+#elif defined (TARGET_MULTIBOOT)
 #include <multiboot.h>
 #endif
 
@@ -11,7 +11,7 @@
 	/* Align 32 bits boundary.  */
 	.align	8
 
-#ifdef MULTIBOOT2
+#ifdef TARGET_MULTIBOOT2
 	/* Multiboot header.  */
 multiboot_header:
 	/* magic */
@@ -26,7 +26,7 @@ multiboot_header:
 	.short 0
 	.long 8
 multiboot_header_end:
-#else
+#elif defined (TARGET_MULTIBOOT)
 	/* Multiboot header.  */
 multiboot_header:
 	/* magic */

From 9b1cb542dba38fb25b54c8c6e059b8bb7679f3b5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 16:51:36 +0200
Subject: [PATCH 1455/1628] Rename test kernels

---
 Makefile.am                                            | 10 +++++-----
 .../tests/boot/{pc-chainloader.S => kernel-8086.S}     |  0
 grub-core/tests/boot/{multiboot.S => kernel-i386.S}    |  0
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename grub-core/tests/boot/{pc-chainloader.S => kernel-8086.S} (100%)
 rename grub-core/tests/boot/{multiboot.S => kernel-i386.S} (100%)

diff --git a/Makefile.am b/Makefile.am
index ea9a64ce2..986d5234f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,28 +126,28 @@ linux.init.x86_64: $(srcdir)/grub-core/tests/boot/linux.init-x86_64.S
 linux.init.i386: $(srcdir)/grub-core/tests/boot/linux.init-i386.S
 	$(TARGET_CC) -o $@ $< -m32 -nostdlib -nostdinc -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\"
 
-multiboot.elf: $(srcdir)/grub-core/tests/boot/multiboot.S
+multiboot.elf: $(srcdir)/grub-core/tests/boot/kernel-i386.S
 	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -DTARGET_MULTIBOOT=1 -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include
 
-kfreebsd.elf: $(srcdir)/grub-core/tests/boot/multiboot.S
+kfreebsd.elf: $(srcdir)/grub-core/tests/boot/kernel-i386.S
 	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include
 
 kfreebsd.aout: kfreebsd.elf
 	$(OBJCOPY) -O a.out-i386-linux $< $@ -R .note.gnu.build-id
 
-pc-chainloader.elf: $(srcdir)/grub-core/tests/boot/pc-chainloader.S
+pc-chainloader.elf: $(srcdir)/grub-core/tests/boot/kernel-8086.S
 	$(TARGET_CC) -o $@ $< -DTARGET_CHAINLOADER=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0x7c00 -m32
 
 pc-chainloader.bin: pc-chainloader.elf
 	$(OBJCOPY) -O binary --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< $@;
 
-ntldr.elf: $(srcdir)/grub-core/tests/boot/pc-chainloader.S
+ntldr.elf: $(srcdir)/grub-core/tests/boot/kernel-8086.S
 	$(TARGET_CC) -o $@ $< -DTARGET_NTLDR=1 -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0 -m32
 
 ntldr.bin: ntldr.elf
 	$(OBJCOPY) -O binary --strip-unneeded -R .note -R .comment -R .note.gnu.build-id -R .reginfo -R .rel.dyn $< $@;
 
-multiboot2.elf: $(srcdir)/grub-core/tests/boot/multiboot.S
+multiboot2.elf: $(srcdir)/grub-core/tests/boot/kernel-i386.S
 	$(TARGET_CC) -o $@ $< -DSUCCESSFUL_BOOT_STRING=\"$(SUCCESSFUL_BOOT_STRING)\" -ffreestanding -nostdlib -nostdinc -Wl,-N -Wl,-Ttext,0x100000 -m32 -I$(srcdir)/include -DTARGET_MULTIBOOT2=1
 
 kfreebsd.init.x86_64: $(srcdir)/grub-core/tests/boot/kfreebsd.init-x86_64.S
diff --git a/grub-core/tests/boot/pc-chainloader.S b/grub-core/tests/boot/kernel-8086.S
similarity index 100%
rename from grub-core/tests/boot/pc-chainloader.S
rename to grub-core/tests/boot/kernel-8086.S
diff --git a/grub-core/tests/boot/multiboot.S b/grub-core/tests/boot/kernel-i386.S
similarity index 100%
rename from grub-core/tests/boot/multiboot.S
rename to grub-core/tests/boot/kernel-i386.S

From 4a842991dbba38df15767a8def9f3e8363abdf37 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 17:33:32 +0200
Subject: [PATCH 1456/1628] simplify normal/term.c and fix mismerge

---
 grub-core/normal/term.c | 66 ++++++++++++++++++++++++++++++-----------
 1 file changed, 48 insertions(+), 18 deletions(-)

diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c
index e6ef002d0..02850ef4e 100644
--- a/grub-core/normal/term.c
+++ b/grub-core/normal/term.c
@@ -206,19 +206,36 @@ void
 grub_puts_terminal (const char *str, struct grub_term_output *term)
 {
   grub_uint32_t *unicode_str, *unicode_last_position;
+  grub_error_push ();
   grub_utf8_to_ucs4_alloc (str, &unicode_str,
 			   &unicode_last_position);
+  grub_error_pop ();
   if (!unicode_str)
     {
-      for (; str; str++)
+      for (; *str; str++)
 	{
-	  grub_uint32_t code = *str;
-	  if (code > 0x7f)
-	    code = '?';
+	  struct grub_unicode_glyph c =
+	    {
+	      .variant = 0,
+	      .attributes = 0,
+	      .ncomb = 0,
+	      .combining = 0,
+	      .estimated_width = 1,
+	      .base = *str
+	    };
 
-	  putcode_real (term, code);
-	  if (code == '\n')
-	    putcode_real (term, '\r');
+	  FOR_ACTIVE_TERM_OUTPUTS(term)
+	  {
+	    (term->putchar) (term, &c);
+	  }
+	  if (*str == '\n')
+	    {
+	      c.base = '\r';
+	      FOR_ACTIVE_TERM_OUTPUTS(term)
+	      {
+		(term->putchar) (term, &c);
+	      }
+	    }
 	}
       return;
     }
@@ -760,28 +777,41 @@ grub_print_ucs4 (const grub_uint32_t * str,
 void
 grub_xputs_normal (const char *str)
 {
-  grub_term_output_t term;
-  grub_uint32_t *unicode_str, *unicode_last_position;
+  grub_uint32_t *unicode_str = NULL, *unicode_last_position;
   int backlog = 0;
+  grub_term_output_t term;
+
+  grub_error_push ();
   grub_utf8_to_ucs4_alloc (str, &unicode_str,
-			   &unicode_last_position);
+  			   &unicode_last_position);
+  grub_error_pop ();
 
   if (!unicode_str)
     {
-      grub_errno = GRUB_ERR_NONE;
       for (; *str; str++)
 	{
-	  grub_term_output_t term;
-	  grub_uint32_t code = *str;
-	  if (code > 0x7f)
-	    code = '?';
+	  struct grub_unicode_glyph c =
+	    {
+	      .variant = 0,
+	      .attributes = 0,
+	      .ncomb = 0,
+	      .combining = 0,
+	      .estimated_width = 1,
+	      .base = *str
+	    };
 
 	  FOR_ACTIVE_TERM_OUTPUTS(term)
 	  {
-	    putcode_real (term, code);
-	    if (code == '\n')
-	      putcode_real (term, '\r');
+	    (term->putchar) (term, &c);
 	  }
+	  if (*str == '\n')
+	    {
+	      c.base = '\r';
+	      FOR_ACTIVE_TERM_OUTPUTS(term)
+	      {
+		(term->putchar) (term, &c);
+	      }
+	    }
 	}
 
       return;

From 197eb519e5edee9ee5e8c6bdde3939440ae70041 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 19:27:30 +0200
Subject: [PATCH 1457/1628] Remove leftover _printf

---
 grub-core/lib/i386/relocator.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/grub-core/lib/i386/relocator.c b/grub-core/lib/i386/relocator.c
index 55e6b5578..f06a6ef86 100644
--- a/grub-core/lib/i386/relocator.c
+++ b/grub-core/lib/i386/relocator.c
@@ -218,8 +218,6 @@ grub_relocator16_boot (struct grub_relocator *rel,
   if (err)
     return err;
 
-  grub_printf ("%p\n", relst);
-
   asm volatile ("cli");
   ((void (*) (void)) relst) ();
 

From c6785a2380185a960efeb16555c8610160831951 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 21:25:35 +0200
Subject: [PATCH 1458/1628] Don't allocate relocator twice when loading aout

---
 grub-core/loader/i386/bsd.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
index 770c6f278..d6a22da5b 100644
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -1129,10 +1129,6 @@ grub_bsd_load_aout (grub_file_t file)
   else
     bss_size = 0;
 
-  relocator = grub_relocator_new ();
-  if (!relocator)
-    return grub_errno;
-
   {
     grub_relocator_chunk_t ch;
 

From 328951ac24132cfef37f4c6a5558fe0e388a7f75 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 28 Aug 2010 21:27:10 +0200
Subject: [PATCH 1459/1628] Add safety checks in relocator and add a
 GRUB_MM_CHECK macro

---
 grub-core/lib/relocator.c | 36 +++++++++++++++++++++++++++++++++++-
 include/grub/mm.h         |  3 +++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
index 0acd59b94..90b383301 100644
--- a/grub-core/lib/relocator.c
+++ b/grub-core/lib/relocator.c
@@ -582,8 +582,15 @@ malloc_in_range (struct grub_relocator *rel,
       int pre_added = 0;
       pa = r->first;
       p = pa->next;
+      if (p->magic == GRUB_MM_ALLOC_MAGIC)
+	continue;
       do 
-	{	  
+	{
+	  grub_dprintf ("relocator", "free block %p+0x%x\n",
+			p, p->size);
+	  if (p->magic != GRUB_MM_FREE_MAGIC)
+	    grub_fatal (__FILE__":%d free magic broken at %p (0x%x)\n",
+			__LINE__, p, p->magic);
 	  if (p == (grub_mm_header_t) (r + 1))
 	    {
 	      pre_added = 1;
@@ -1586,3 +1593,30 @@ grub_relocator_prepare_relocs (struct grub_relocator *rel, grub_addr_t addr,
   grub_free (sorted);
   return GRUB_ERR_NONE;
 }
+
+void
+grub_mm_check_real (char *file, int line)
+{
+  grub_mm_region_t r;
+  grub_mm_header_t p, pa;
+
+  for (r = grub_mm_base; r; r = r->next)
+    {
+      pa = r->first;
+      p = pa->next;
+      if (p->magic == GRUB_MM_ALLOC_MAGIC)
+	continue;
+      do 
+	{
+	  if ((grub_addr_t) p < (grub_addr_t) (r + 1)
+	      || (grub_addr_t) p >= (grub_addr_t) (r + 1) + r->size)
+	    grub_fatal ("%s:%d: out of range pointer: %p\n", file, line, p);
+	  if (p->magic != GRUB_MM_FREE_MAGIC)
+	    grub_fatal ("%s:%d free magic broken at %p (0x%x)\n", file,
+			line, p, p->magic);
+	  pa = p;
+	  p = pa->next;
+	}
+      while (pa != r->first);
+    }
+}
diff --git a/include/grub/mm.h b/include/grub/mm.h
index 38dd39646..cc115907a 100644
--- a/include/grub/mm.h
+++ b/include/grub/mm.h
@@ -35,6 +35,9 @@ void EXPORT_FUNC(grub_free) (void *ptr);
 void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t size);
 void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);
 
+void grub_mm_check_real (char *file, int line);
+#define GRUB_MM_CHECK grub_mm_check_real (__FILE__, __LINE__);
+
 /* For debugging.  */
 #if defined(MM_DEBUG) && !defined(GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)
 /* Set this variable to 1 when you want to trace all memory function calls.  */

From 04a0a4cdf4bfd778b7992491b73c78fd74163234 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 00:19:13 +0200
Subject: [PATCH 1460/1628] Fix a bug in memory allocation

---
 grub-core/kern/mm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
index dec07bc1b..8d9b5db78 100644
--- a/grub-core/kern/mm.c
+++ b/grub-core/kern/mm.c
@@ -171,6 +171,7 @@ grub_real_malloc (grub_mm_header_t *first, grub_size_t n, grub_size_t align)
 
       if (p->size >= n + extra)
 	{
+	  extra += (p->size - extra - n) & (~(align - 1));
 	  if (extra == 0 && p->size == n)
 	    {
 	      /* There is no special alignment requirement and memory block
@@ -246,7 +247,6 @@ grub_real_malloc (grub_mm_header_t *first, grub_size_t n, grub_size_t align)
 	       */
 	      grub_mm_header_t r;
 
-	      extra += (p->size - extra - n) & (~(align - 1));
 	      r = p + extra + n;
 	      r->magic = GRUB_MM_FREE_MAGIC;
 	      r->size = p->size - extra - n;

From 5407820787a7bd8b60ba4dbc009001ad20071d28 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 00:20:22 +0200
Subject: [PATCH 1461/1628] Adjust kfreebsd.cfg for EFI

---
 grub-core/tests/boot/kfreebsd.cfg | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/grub-core/tests/boot/kfreebsd.cfg b/grub-core/tests/boot/kfreebsd.cfg
index 5534f3c03..f28ee7998 100644
--- a/grub-core/tests/boot/kfreebsd.cfg
+++ b/grub-core/tests/boot/kfreebsd.cfg
@@ -1,7 +1,8 @@
-kfreebsd /kfreebsd -h
+kfreebsd /kfreebsd -hv
 kfreebsd_loadenv /kfreebsd_env
 kfreebsd_module /mfsroot.gz type=mfs_root
 set kFreeBSD.hw.hasbrokenint12=1
+fakebios
 boot
 # Shouln't happen
 halt

From 02a16ba94c3c8659709281663a194e37d0270ad2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 00:21:02 +0200
Subject: [PATCH 1462/1628] Disable some bootcheck on some platforms

---
 Makefile.am | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 986d5234f..fc3d273f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -260,7 +260,23 @@ bootcheck-ntldr: ntldr.bin $(srcdir)/grub-core/tests/boot/ntldr.cfg grub-shell
 BOOTCHECKS= 
 
 if COND_i386_pc
-BOOTCHECKS += bootcheck-pc-chainloader bootcheck-ntldr
+#pc chainloader by definition is only for i386-pc
+BOOTCHECKS += bootcheck-pc-chainloader
+#ntldr and bootmgr require BIOS.
+BOOTCHECKS += bootcheck-ntldr
+#legacy protocol makes early BIOS calls.
+BOOTCHECKS += bootcheck-linux16-i386 bootcheck-linux16-x86_64
+# Crashes early on non-BIOS
+BOOTCHECKS += bootcheck-knetbsd-i386
+endif
+
+if !COND_i386_coreboot
+# Crashes because memory at 0-0x1000 is occupied
+BOOTCHECKS += bootcheck-kfreebsd-x86_64
+# Likewise.
+BOOTCHECKS += bootcheck-knetbsd-x86_64
+
+BOOTCHECKS += bootcheck-kfreebsd-i386
 endif
 
 BOOTCHECKS += bootcheck-kfreebsd-aout
@@ -269,18 +285,8 @@ BOOTCHECKS += bootcheck-kopenbsd-i386 bootcheck-kopenbsd-x86_64
 
 BOOTCHECKS += bootcheck-multiboot bootcheck-multiboot2
 
-BOOTCHECKS += bootcheck-linux16-i386 bootcheck-linux16-x86_64
-
 BOOTCHECKS += bootcheck-linux-i386 bootcheck-linux-x86_64
 
-# Crashes because memory at 0-0x1000 is occupied
-BOOTCHECKS += bootcheck-kfreebsd-i386 bootcheck-knetbsd-x86_64
-
-# Requires ACPI
-BOOTCHECKS += bootcheck-kfreebsd-x86_64
-# Crashes early on non-BIOS
-BOOTCHECKS += bootcheck-knetbsd-i386
-
 
 .PHONY: bootcheck-linux-i386 bootcheck-linux-x86_64 \
        bootcheck-kfreebsd-i386 bootcheck-kfreebsd-x86_64 \

From 5dc598851fec1c0783fda53018e2a007835ba4e1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 00:21:16 +0200
Subject: [PATCH 1463/1628] Document newreloc

---
 docs/grub.texi | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/docs/grub.texi b/docs/grub.texi
index f533a029c..85316fced 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -85,6 +85,7 @@ This edition documents version @value{VERSION}.
 * Interface::                   The menu and the command-line
 * Commands::                    The list of available builtin commands
 * Security::                    Authentication and authorisation
+* Supported kernels::           The list of supported kernels
 * Troubleshooting::             Error messages produced by GRUB
 * Invoking grub-install::       How to use the GRUB installer
 * Invoking grub-mkconfig::      Generate a GRUB configuration file
@@ -2862,6 +2863,74 @@ adding @kbd{set superusers=} and @kbd{password} or @kbd{password_pbkdf2}
 commands.
 
 
+@node Supported kernels
+@chapter Supported boot targets
+
+X86 support is summarised in following table. ``Yes'' means that kernel works on the given platform, ``crashes'' means an early kernel crash which we hove will be fixed by concerned kernel developpers. ``no'' means GRUB doesn't load given kernel on a given platform. ``headless'' means that the kernel works but lacks console drivers (you can still use serial or network console).  In case of ``no'' and ``crashes'' the reason is given in footnote.
+@multitable @columnfractions .50 .15 .15 .15
+@item                                @tab BIOS @tab Coreboot   @tab 32-bit EFI
+@item BIOS chainloading              @tab yes  @tab no (1)     @tab no (1)
+@item NTLDR                          @tab yes  @tab no (1)     @tab no (1)
+@item FreeBSD bootloader             @tab yes  @tab crashes (1)@tab crashes (1)
+@item 32-bit kFreeBSD                @tab yes  @tab ?          @tab headless
+@item 64-bit kFreeBSD                @tab yes  @tab crashes (2)@tab headless
+@item 32-bit kNetBSD                 @tab yes  @tab crashes (1)@tab crashes (1)
+@item 64-bit kNetBSD                 @tab yes  @tab crashes (2)@tab yes
+@item 32-bit kOpenBSD                @tab yes  @tab yes        @tab headless
+@item 64-bit kOpenBSD                @tab yes  @tab yes        @tab headless
+@item Multiboot                      @tab yes  @tab yes        @tab yes
+@item Multiboot2                     @tab yes  @tab yes        @tab yes
+@item 32-bit Linux (legacy protocol) @tab yes  @tab no (1)     @tab no (1)
+@item 64-bit Linux (legacy protocol) @tab yes  @tab no (1)     @tab no (1)
+@item 32-bit Linux (modern protocol) @tab yes  @tab yes        @tab yes
+@item 64-bit Linux (modern protocol) @tab yes  @tab yes        @tab yes
+@item 32-bit XNU                     @tab yes  @tab ?          @tab yes
+@item 64-bit XNU                     @tab yes  @tab ?          @tab yes (5)
+@item 32-bit EFI chainloader         @tab no (3)  @tab no (3)  @tab yes
+@item 64-bit EFI chainloader         @tab no (3)  @tab no (3)  @tab no (4)
+@item Appleloader                    @tab no (3)  @tab no (3)  @tab yes
+@end multitable
+
+@enumerate
+@item Requires BIOS
+@item Crashes because the memory at 0x0-0x1000 isn't available
+@item EFI only
+@item 32-bit and 64-bit EFI have different structures and work in different CPU modes so it's not possible to chainload 32-bit bootloader on 64-bit platform and vice-versa
+@item Some modules may need to be disabled
+@end enumerate
+
+
+PowerPC and Sparc ports support only Linux.
+MIPS port supports Linux and multiboot2.
+
+@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 multiboot and 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.
+
+Following variables must be defined:
+
+@multitable  @columnfractions .30 .65
+@item GRUB_PAYLOADS_DIR @tab directory containing the required kernels
+@item GRUB_CBFSTOOL @tab cbfstoll from Coreboot package (for coreboot platform only)
+@item GRUB_COREBOOT_ROM @tab empty Coreboot ROM
+@item GRUB_QEMU_OPTS @tab additional options to be supplied to QEMU
+@end multitable
+
+Required files are:
+
+@multitable  @columnfractions .40 .55
+@item kfreebsd_env.i386 @tab 32-bit kFreeBSD device hints
+@item kfreebsd.i386 @tab 32-bit FreeBSD kernel image
+@item kfreebsd.x86_64, kfreebsd_env.x86_64 @tab same from 64-bit kFreeBSD
+@item knetbsd.i386 @tab 32-bit NetBSD kernel image
+@item knetbsd.miniroot.i386 @tab 32-bit kNetBSD miniroot.kmod.
+@item knetbsd.x86_64, knetbsd.miniroot.x86_64  @tab same from 64-bit kNetBSD
+@item kopenbsd.i386 @tab 32-bit OpenBSD kernel bsd.rd image
+@item kopenbsd.x86_64 @tab same from 64-bit kOpenBSD
+@item linux.i386 @tab 32-bit Linux
+@item linux.x86_64 @tab 64-bit Linux
+@end multitable
+
 @node Troubleshooting
 @chapter Error messages produced by GRUB
 

From f0b05761f49596a276794f8c3082a75b7510821d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 00:46:36 +0200
Subject: [PATCH 1464/1628] fix multiboot compilation

---
 grub-core/Makefile.core.def | 1 +
 include/grub/offsets.h      | 4 ++++
 util/grub-mkimage.c         | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 62c08928a..0917e749c 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -361,6 +361,7 @@ module = {
   enable = x86_efi;
   enable = i386_ieee1275;
   enable = i386_coreboot;
+  enable = i386_multiboot;
   emu_condition = COND_GRUB_EMU_PCI;
 };
 
diff --git a/include/grub/offsets.h b/include/grub/offsets.h
index ae0b2557e..7763e488c 100644
--- a/include/grub/offsets.h
+++ b/include/grub/offsets.h
@@ -123,12 +123,16 @@
 #define GRUB_KERNEL_I386_COREBOOT_DATA_END	0x42
 #define GRUB_KERNEL_I386_COREBOOT_LINK_ADDR	0x8200
 
+#define GRUB_KERNEL_I386_MULTIBOOT_PREFIX	GRUB_KERNEL_I386_COREBOOT_PREFIX
+#define GRUB_KERNEL_I386_MULTIBOOT_DATA_END	GRUB_KERNEL_I386_COREBOOT_DATA_END
+
 #define GRUB_KERNEL_I386_IEEE1275_PREFIX	0x2
 #define GRUB_KERNEL_I386_IEEE1275_DATA_END	0x42
 #define GRUB_KERNEL_I386_IEEE1275_LINK_ADDR	0x10000
 
 #define GRUB_KERNEL_I386_IEEE1275_MOD_ALIGN	0x1000
 #define GRUB_KERNEL_I386_COREBOOT_MOD_ALIGN	0x1
+#define GRUB_KERNEL_I386_MULTIBOOT_MOD_ALIGN	GRUB_KERNEL_I386_COREBOOT_MOD_ALIGN
 
 /* Non-zero value is only needed for PowerMacs.  */
 #define GRUB_KERNEL_I386_IEEE1275_MOD_GAP 0x0
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index c46f0700f..38c530b91 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -106,8 +106,8 @@ struct image_target_desc image_targets[] =
       .bigendian = 0,
       .id = IMAGE_COREBOOT,
       .flags = PLATFORM_FLAGS_NONE,
-      .prefix = GRUB_KERNEL_I386_COREBOOT_PREFIX,
-      .data_end = GRUB_KERNEL_I386_COREBOOT_DATA_END,
+      .prefix = GRUB_KERNEL_I386_MULTIBOOT_PREFIX,
+      .data_end = GRUB_KERNEL_I386_MULTIBOOT_DATA_END,
       .raw_size = 0,
       .total_module_size = TARGET_NO_FIELD,
       .kernel_image_size = TARGET_NO_FIELD,

From 6f8157cb8974d36a9e505549d2ec740b4eab0207 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 00:53:09 +0200
Subject: [PATCH 1465/1628] Fix qemu compilation

---
 grub-core/Makefile.core.def | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 0917e749c..709fd6cd7 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -777,6 +777,7 @@ module = {
   i386_coreboot = efiemu/i386/pc/cfgtables.c;
   i386_multiboot = efiemu/i386/pc/cfgtables.c;
   i386_ieee1275 = efiemu/i386/nocfgtables.c;
+  i386_qemu = efiemu/i386/nocfgtables.c;
   common = efiemu/mm.c;
   common = efiemu/loadcore_common.c;
   common = efiemu/symbols.c;
@@ -796,6 +797,7 @@ module = {
   enable = i386_coreboot;
   enable = i386_ieee1275;
   enable = i386_multiboot;
+  enable = i386_qemu;
 };
 
 module = {

From f5c1e402d3ccaead39281145790eb2ce4d33de41 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 01:26:48 +0200
Subject: [PATCH 1466/1628] enable grub-mkrescue on i386-multiboot

---
 Makefile.util.def | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.util.def b/Makefile.util.def
index fd3428e76..db3b6e5c6 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -334,6 +334,7 @@ script = {
   enable = i386_pc;
   enable = x86_efi;
   enable = i386_qemu;
+  enable = i386_multiboot;
   enable = i386_coreboot;
   enable = powerpc_ieee1275;
 };

From 5d9bdcf167596a3b55f2ac43e64f791dc3918978 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 02:28:15 +0200
Subject: [PATCH 1467/1628] Fix x86_64-efi compilation error

---
 grub-core/lib/relocator.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
index 90b383301..53acda52f 100644
--- a/grub-core/lib/relocator.c
+++ b/grub-core/lib/relocator.c
@@ -586,8 +586,8 @@ malloc_in_range (struct grub_relocator *rel,
 	continue;
       do 
 	{
-	  grub_dprintf ("relocator", "free block %p+0x%x\n",
-			p, p->size);
+	  grub_dprintf ("relocator", "free block %p+0x%lx\n",
+			p, (unsigned long) p->size);
 	  if (p->magic != GRUB_MM_FREE_MAGIC)
 	    grub_fatal (__FILE__":%d free magic broken at %p (0x%x)\n",
 			__LINE__, p, p->magic);

From 303f59958e9cb23056e8f35dc4263dc08e522d36 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 02:29:01 +0200
Subject: [PATCH 1468/1628] Disable kfreebsd bootcheck on qemu and multiboot

---
 Makefile.am | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index fc3d273f2..1cf2297bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -272,12 +272,16 @@ endif
 
 if !COND_i386_coreboot
 # Crashes because memory at 0-0x1000 is occupied
-BOOTCHECKS += bootcheck-kfreebsd-x86_64
-# Likewise.
 BOOTCHECKS += bootcheck-knetbsd-x86_64
 
+# Likewise and require ACPI.
+if !COND_i386_multiboot
+if !COND_i386_qemu
+BOOTCHECKS += bootcheck-kfreebsd-x86_64
 BOOTCHECKS += bootcheck-kfreebsd-i386
 endif
+endif
+endif
 
 BOOTCHECKS += bootcheck-kfreebsd-aout
 

From a30f510eac6f3ee39add695a6e3e49861988d43b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 02:29:14 +0200
Subject: [PATCH 1469/1628] newreloc documentation upgrade

---
 docs/grub.texi | 123 ++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 97 insertions(+), 26 deletions(-)

diff --git a/docs/grub.texi b/docs/grub.texi
index 85316fced..4c96f254f 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -2867,28 +2867,100 @@ commands.
 @chapter Supported boot targets
 
 X86 support is summarised in following table. ``Yes'' means that kernel works on the given platform, ``crashes'' means an early kernel crash which we hove will be fixed by concerned kernel developpers. ``no'' means GRUB doesn't load given kernel on a given platform. ``headless'' means that the kernel works but lacks console drivers (you can still use serial or network console).  In case of ``no'' and ``crashes'' the reason is given in footnote.
-@multitable @columnfractions .50 .15 .15 .15
-@item                                @tab BIOS @tab Coreboot   @tab 32-bit EFI
-@item BIOS chainloading              @tab yes  @tab no (1)     @tab no (1)
-@item NTLDR                          @tab yes  @tab no (1)     @tab no (1)
-@item FreeBSD bootloader             @tab yes  @tab crashes (1)@tab crashes (1)
-@item 32-bit kFreeBSD                @tab yes  @tab ?          @tab headless
-@item 64-bit kFreeBSD                @tab yes  @tab crashes (2)@tab headless
-@item 32-bit kNetBSD                 @tab yes  @tab crashes (1)@tab crashes (1)
-@item 64-bit kNetBSD                 @tab yes  @tab crashes (2)@tab yes
-@item 32-bit kOpenBSD                @tab yes  @tab yes        @tab headless
-@item 64-bit kOpenBSD                @tab yes  @tab yes        @tab headless
-@item Multiboot                      @tab yes  @tab yes        @tab yes
-@item Multiboot2                     @tab yes  @tab yes        @tab yes
-@item 32-bit Linux (legacy protocol) @tab yes  @tab no (1)     @tab no (1)
-@item 64-bit Linux (legacy protocol) @tab yes  @tab no (1)     @tab no (1)
-@item 32-bit Linux (modern protocol) @tab yes  @tab yes        @tab yes
-@item 64-bit Linux (modern protocol) @tab yes  @tab yes        @tab yes
-@item 32-bit XNU                     @tab yes  @tab ?          @tab yes
-@item 64-bit XNU                     @tab yes  @tab ?          @tab yes (5)
-@item 32-bit EFI chainloader         @tab no (3)  @tab no (3)  @tab yes
-@item 64-bit EFI chainloader         @tab no (3)  @tab no (3)  @tab no (4)
-@item Appleloader                    @tab no (3)  @tab no (3)  @tab yes
+@multitable @columnfractions .50 .22 .22
+@item                                @tab BIOS    @tab Coreboot
+@item BIOS chainloading              @tab yes     @tab no (1)
+@item NTLDR                          @tab yes     @tab no (1)
+@item FreeBSD bootloader             @tab yes     @tab crashes (1)
+@item 32-bit kFreeBSD                @tab yes     @tab crashes (2,6)
+@item 64-bit kFreeBSD                @tab yes     @tab crashes (2,6)
+@item 32-bit kNetBSD                 @tab yes     @tab crashes (1)
+@item 64-bit kNetBSD                 @tab yes     @tab crashes (2)
+@item 32-bit kOpenBSD                @tab yes     @tab yes
+@item 64-bit kOpenBSD                @tab yes     @tab yes
+@item Multiboot                      @tab yes     @tab yes
+@item Multiboot2                     @tab yes     @tab yes
+@item 32-bit Linux (legacy protocol) @tab yes     @tab no (1)
+@item 64-bit Linux (legacy protocol) @tab yes     @tab no (1)
+@item 32-bit Linux (modern protocol) @tab yes     @tab yes
+@item 64-bit Linux (modern protocol) @tab yes     @tab yes
+@item 32-bit XNU                     @tab yes     @tab ?
+@item 64-bit XNU                     @tab yes     @tab ?
+@item 32-bit EFI chainloader         @tab no (3)  @tab no (3)
+@item 64-bit EFI chainloader         @tab no (3)  @tab no (3)
+@item Appleloader                    @tab no (3)  @tab no (3)
+@end multitable
+
+@multitable @columnfractions .50 .22 .22
+@item                                @tab Multiboot    @tab Qemu 
+@item BIOS chainloading              @tab no (1)       @tab no (1)
+@item NTLDR                          @tab no (1)       @tab no (1)
+@item FreeBSD bootloader             @tab crashes (1)  @tab crashes (1)
+@item 32-bit kFreeBSD                @tab crashes (6)  @tab crashes (6)
+@item 64-bit kFreeBSD                @tab crashes (6)  @tab crashes (6)
+@item 32-bit kNetBSD                 @tab crashes (1)  @tab crashes (1)  
+@item 64-bit kNetBSD                 @tab yes          @tab yes
+@item 32-bit kOpenBSD                @tab yes          @tab yes
+@item 64-bit kOpenBSD                @tab yes          @tab yes
+@item Multiboot                      @tab yes          @tab yes
+@item Multiboot2                     @tab yes          @tab yes
+@item 32-bit Linux (legacy protocol) @tab no (1)       @tab no (1)
+@item 64-bit Linux (legacy protocol) @tab no (1)       @tab no (1)
+@item 32-bit Linux (modern protocol) @tab yes          @tab yes
+@item 64-bit Linux (modern protocol) @tab yes          @tab yes
+@item 32-bit XNU                     @tab ?            @tab ?
+@item 64-bit XNU                     @tab ?            @tab ?
+@item 32-bit EFI chainloader         @tab no (3)       @tab no (3)
+@item 64-bit EFI chainloader         @tab no (3)       @tab no (3)
+@item Appleloader                    @tab no (3)       @tab no (3)
+@end multitable
+
+@multitable @columnfractions .50 .22 .22
+@item                                @tab 32-bit EFI    @tab 64-bit EFI
+@item BIOS chainloading              @tab no (1)        @tab no (1)
+@item NTLDR                          @tab no (1)        @tab no (1)
+@item FreeBSD bootloader             @tab crashes (1)   @tab crashes (1)
+@item 32-bit kFreeBSD                @tab headless      @tab headless
+@item 64-bit kFreeBSD                @tab headless      @tab headless
+@item 32-bit kNetBSD                 @tab crashes (1)   @tab crashes (1)
+@item 64-bit kNetBSD                 @tab yes           @tab yes
+@item 32-bit kOpenBSD                @tab headless      @tab headless
+@item 64-bit kOpenBSD                @tab headless      @tab headless
+@item Multiboot                      @tab yes           @tab yes
+@item Multiboot2                     @tab yes           @tab yes
+@item 32-bit Linux (legacy protocol) @tab no (1)        @tab no (1)
+@item 64-bit Linux (legacy protocol) @tab no (1)        @tab no (1)
+@item 32-bit Linux (modern protocol) @tab yes           @tab yes
+@item 64-bit Linux (modern protocol) @tab yes           @tab yes
+@item 32-bit XNU                     @tab yes           @tab yes
+@item 64-bit XNU                     @tab yes (5)       @tab yes
+@item 32-bit EFI chainloader         @tab yes           @tab no (4)
+@item 64-bit EFI chainloader         @tab no (4)        @tab yes
+@item Appleloader                    @tab yes           @tab yes
+@end multitable
+
+@multitable @columnfractions .50 .22 .22
+@item                                @tab IEEE1275
+@item BIOS chainloading              @tab no (1)
+@item NTLDR                          @tab no (1)
+@item FreeBSD bootloader             @tab crashes (1)
+@item 32-bit kFreeBSD                @tab crashes (6)
+@item 64-bit kFreeBSD                @tab crashes (6)
+@item 32-bit kNetBSD                 @tab crashes (1)
+@item 64-bit kNetBSD                 @tab ?
+@item 32-bit kOpenBSD                @tab ?
+@item 64-bit kOpenBSD                @tab ?
+@item Multiboot                      @tab ?
+@item Multiboot2                     @tab ?
+@item 32-bit Linux (legacy protocol) @tab no (1)
+@item 64-bit Linux (legacy protocol) @tab no (1)
+@item 32-bit Linux (modern protocol) @tab ?
+@item 64-bit Linux (modern protocol) @tab ?
+@item 32-bit XNU                     @tab ?
+@item 64-bit XNU                     @tab ?
+@item 32-bit EFI chainloader         @tab no (3)
+@item 64-bit EFI chainloader         @tab no (3)
+@item Appleloader                    @tab no (3)
 @end multitable
 
 @enumerate
@@ -2897,15 +2969,14 @@ X86 support is summarised in following table. ``Yes'' means that kernel works on
 @item EFI only
 @item 32-bit and 64-bit EFI have different structures and work in different CPU modes so it's not possible to chainload 32-bit bootloader on 64-bit platform and vice-versa
 @item Some modules may need to be disabled
+@item Requires ACPI
 @end enumerate
 
-
-PowerPC and Sparc ports support only Linux.
-MIPS port supports Linux and multiboot2.
+PowerPC and Sparc ports support only Linux. MIPS port supports Linux and multiboot2.
 
 @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 multiboot and 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.
+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.
 
 Following variables must be defined:
 

From a7363f53c87787e8eeb35ab0e9ad7589cfd2d594 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Sun, 29 Aug 2010 09:33:13 +0530
Subject: [PATCH 1470/1628] Use ldadd instead of ldflags for libraries

---
 ChangeLog         |  4 ++++
 Makefile.util.def | 28 ++++++++++++++--------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0b9d6c30a..7aab54c00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-29  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* Makefile.util.def: Use ldadd instead of ldflags for libraries.
+
 2010-08-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/normal/term.c (print_more): Fix a memory leak.
diff --git a/Makefile.util.def b/Makefile.util.def
index fd3428e76..019b0e3a4 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -99,7 +99,7 @@ program = {
   name = grub-bin2h;
   common = util/bin2h.c;
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
   mansection = 1;
 };
 
@@ -112,7 +112,7 @@ program = {
   extra_dist = util/grub-mkimagexx.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
   cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"';
 };
 
@@ -123,7 +123,7 @@ program = {
   common = util/grub-mkrelpath.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
 };
 
 program = {
@@ -133,7 +133,7 @@ program = {
   common = util/grub-script-check.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
 };
 
 program = {
@@ -143,7 +143,7 @@ program = {
   common = util/grub-editenv.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
 };
 
 program = {
@@ -153,7 +153,7 @@ program = {
   common = util/grub-mkpasswd-pbkdf2.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
   cflags = '$(CFLAGS_GCRY)';
   cppflags = '$(CPPFLAGS_GCRY)';
 };
@@ -171,7 +171,7 @@ program = {
   common = util/grub-pe2elf.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL)';
+  ldadd = '$(LIBINTL)';
   condition = COND_GRUB_PE2ELF;
 };
 
@@ -181,7 +181,7 @@ program = {
   common = util/grub-fstest.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
   condition = COND_GRUB_FSTEST;
 };
 
@@ -194,8 +194,8 @@ program = {
   cflags = '$(freetype_cflags)';
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL) $(LIBDEVMAPPER)';
-  ldflags = '$(freetype_libs)';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
+  ldadd = '$(freetype_libs)';
   condition = COND_GRUB_MKFONT;
 };
 
@@ -212,7 +212,7 @@ program = {
   sparc64_ieee1275 = util/ieee1275/devicemap.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
 };
 
 program = {
@@ -222,7 +222,7 @@ program = {
   common = util/grub-probe.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
 };
 
 program = {
@@ -239,7 +239,7 @@ program = {
   sparc64_ieee1275 = util/lvm.c;
 
   ldadd = libgrub.a;
-  ldflags = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
 
   enable = i386_pc;
   enable = sparc64_ieee1275;
@@ -506,5 +506,5 @@ program = {
   common = grub-core/tests/lib/test.c;
   cflags = -Wno-format;
   ldadd = libgrub.a;
-  ldflags = '$(LIBDEVMAPPER)';
+  ldadd = '$(LIBDEVMAPPER)';
 };

From 6d387bafaf6149cd33845af4d68ca909e1cb43cf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 13:45:36 +0200
Subject: [PATCH 1471/1628] Fix compilation on yeeloong

---
 include/grub/ns8250.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/grub/ns8250.h b/include/grub/ns8250.h
index 2dcd07f14..7947ba9c9 100644
--- a/include/grub/ns8250.h
+++ b/include/grub/ns8250.h
@@ -70,9 +70,11 @@
 /* Turn on DTR, RTS, and OUT2.  */
 #define UART_ENABLE_OUT2	0x08
 
+#ifndef ASM_FILE
 #include <grub/cpu/io.h>
 
 grub_port_t
 grub_ns8250_hw_get_port (const unsigned int unit);
+#endif
 
 #endif /* ! GRUB_SERIAL_MACHINE_HEADER */

From 506e4d1e7fdea605ba8fdb3ef00d905bfeac25e2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 15:45:21 +0200
Subject: [PATCH 1472/1628] Use kseg0 entry address on mips

---
 grub-core/loader/multiboot_elfxx.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c
index 024b44747..0c29fe9c2 100644
--- a/grub-core/loader/multiboot_elfxx.c
+++ b/grub-core/loader/multiboot_elfxx.c
@@ -140,6 +140,14 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
   if (i == ehdr->e_phnum)
     return grub_error (GRUB_ERR_BAD_OS, "entry point isn't in a segment");
 
+#if defined (__i386__) || defined (__x86_64__)
+  
+#elif defined (__mips)
+  grub_multiboot_payload_eip |= 0x80000000;
+#else
+#error Please complete this
+#endif
+
   if (ehdr->e_shnum)
     {
       grub_uint8_t *shdr, *shdrptr;

From 3626810e5391d3f7a35e8e714985b0002a64ada1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 17:17:52 +0200
Subject: [PATCH 1473/1628] 	* grub-core/kern/misc.c (grub_real_dprintf):
 Always refresh after 	dprintf.

---
 ChangeLog             | 5 +++++
 grub-core/kern/misc.c | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 7aab54c00..98893a472 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/misc.c (grub_real_dprintf): Always refresh after
+	dprintf.
+
 2010-08-29  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* Makefile.util.def: Use ldadd instead of ldflags for libraries.
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
index b37ef230c..69fdc3d42 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -184,6 +184,7 @@ grub_real_dprintf (const char *file, const int line, const char *condition,
       va_start (args, fmt);
       grub_vprintf (fmt, args);
       va_end (args);
+      grub_refresh ();
     }
 }
 

From 5bf84df429ba8cec67a466ba35eb0c25934973cc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 17:49:37 +0200
Subject: [PATCH 1474/1628] 	* Makefile.util.def (grub-ofpathname): Add
 missing ldadd.

---
 ChangeLog         | 4 ++++
 Makefile.util.def | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 98893a472..2693b2859 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* Makefile.util.def (grub-ofpathname): Add missing ldadd.
+
 2010-08-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/misc.c (grub_real_dprintf): Always refresh after
diff --git a/Makefile.util.def b/Makefile.util.def
index 019b0e3a4..24cd25d9e 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -252,6 +252,7 @@ program = {
   ieee1275 = util/ieee1275/ofpath.c;
 
   ldadd = libgrub.a;
+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
   enable = sparc64_ieee1275;
 };
 

From 72c47aed8d2e91d9477b24d9ba1341e2177030d0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 18:52:04 +0200
Subject: [PATCH 1475/1628] 	* grub-core/efiemu/runtime/efiemu.sh: Removed.

---
 grub-core/efiemu/runtime/efiemu.sh | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 grub-core/efiemu/runtime/efiemu.sh

diff --git a/grub-core/efiemu/runtime/efiemu.sh b/grub-core/efiemu/runtime/efiemu.sh
deleted file mode 100644
index 5a492dc2f..000000000
--- a/grub-core/efiemu/runtime/efiemu.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-gcc -c -m32 -DELF32 -o efiemu32.o ./efiemu.c -Wall -Werror -nostdlib -O2 -I. -I../../include
-gcc -c -m64 -DELF64 -o efiemu64_c.o ./efiemu.c -Wall -Werror -mcmodel=large -O2 -I. -I../../include
-gcc -c -m64 -DELF64 -o efiemu64_s.o ./efiemu.S -Wall -Werror -mcmodel=large -O2 -I. -I../../include
-ld -o efiemu64.o -r efiemu64_s.o efiemu64_c.o -nostdlib

From d768d15986189c40ba8eb589b2c4470ca6966192 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 18:53:56 +0200
Subject: [PATCH 1476/1628] 	* grub-core/Makefile.core.def (kernel): Add
 kern/mips/cache_flush.S to 	extra_dist.

---
 ChangeLog                   | 9 +++++++++
 grub-core/Makefile.core.def | 1 +
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2693b2859..c2ebd6173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/Makefile.core.def (kernel): Add kern/mips/cache_flush.S to
+	extra_dist.
+
+2010-08-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/efiemu/runtime/efiemu.sh: Removed.
+
 2010-08-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* Makefile.util.def (grub-ofpathname): Add missing ldadd.
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 0257bbac4..5961e8697 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -169,6 +169,7 @@ kernel = {
   extra_dist = kern/i386/loader.S;
   extra_dist = kern/i386/realmode.S;
   extra_dist = kern/i386/pc/lzma_decode.S;
+  extra_dist = kern/mips/cache_flush.S;
 };
 
 program = {

From cb601aad52eca95c4d1a40a5329f4786afa3ec40 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 18:54:33 +0200
Subject: [PATCH 1477/1628] Fix failing make dist

---
 grub-core/Makefile.core.def | 1 -
 1 file changed, 1 deletion(-)

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 709fd6cd7..8533d3131 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -166,7 +166,6 @@ kernel = {
   emu = kern/emu/mm.c;
   emu = kern/emu/time.c;
 
-  extra_dist = kern/i386/loader.S;
   extra_dist = kern/i386/realmode.S;
   extra_dist = kern/i386/pc/lzma_decode.S;
 };

From 5303b85d446f1937245f2b989c60071bdcc80496 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 21:57:37 +0200
Subject: [PATCH 1478/1628] 	* grub-core/normal/charset.c
 (grub_utf8_to_ucs4_alloc): Avoid deadloop 	on malloc error. 
 (grub_bidi_logical_to_visual): Check that malloc succeded. 	*
 grub-core/normal/term.c (grub_puts_terminal): Fix fallback to dumb 	puts. 
 (grub_xputs_normal): Likewise.

---
 ChangeLog                  |  9 ++++++
 grub-core/normal/charset.c |  9 +++---
 grub-core/normal/term.c    | 66 +++++++++++++++++++++++++++-----------
 3 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c2ebd6173..b3b6c342b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/charset.c (grub_utf8_to_ucs4_alloc): Avoid deadloop
+	on malloc error.
+	(grub_bidi_logical_to_visual): Check that malloc succeded.
+	* grub-core/normal/term.c (grub_puts_terminal): Fix fallback to dumb
+	puts.
+	(grub_xputs_normal): Likewise.
+
 2010-08-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/Makefile.core.def (kernel): Add kern/mips/cache_flush.S to
diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
index fd377e1c6..b7f775c4f 100644
--- a/grub-core/normal/charset.c
+++ b/grub-core/normal/charset.c
@@ -297,13 +297,10 @@ grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg,
 {
   grub_size_t msg_len = grub_strlen (msg);
 
-  *unicode_msg = grub_malloc (grub_strlen (msg) * sizeof (grub_uint32_t));
+  *unicode_msg = grub_malloc (msg_len * sizeof (grub_uint32_t));
  
   if (!*unicode_msg)
-    {
-      grub_printf ("utf8_to_ucs4 ERROR1: %s", msg);
-      return -1;
-    }
+    return -1;
 
   msg_len = grub_utf8_to_ucs4 (*unicode_msg, msg_len,
   			      (grub_uint8_t *) msg, -1, 0);
@@ -1215,6 +1212,8 @@ grub_bidi_logical_to_visual (const grub_uint32_t *logical,
   struct grub_unicode_glyph *visual_ptr;
   *visual_out = visual_ptr = grub_malloc (2 * sizeof (visual_ptr[0])
 					  * logical_len);
+  if (!visual_ptr)
+    return -1;
   for (ptr = logical; ptr <= logical + logical_len; ptr++)
     {
       if (ptr == logical + logical_len || *ptr == '\n')
diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c
index e6ef002d0..02850ef4e 100644
--- a/grub-core/normal/term.c
+++ b/grub-core/normal/term.c
@@ -206,19 +206,36 @@ void
 grub_puts_terminal (const char *str, struct grub_term_output *term)
 {
   grub_uint32_t *unicode_str, *unicode_last_position;
+  grub_error_push ();
   grub_utf8_to_ucs4_alloc (str, &unicode_str,
 			   &unicode_last_position);
+  grub_error_pop ();
   if (!unicode_str)
     {
-      for (; str; str++)
+      for (; *str; str++)
 	{
-	  grub_uint32_t code = *str;
-	  if (code > 0x7f)
-	    code = '?';
+	  struct grub_unicode_glyph c =
+	    {
+	      .variant = 0,
+	      .attributes = 0,
+	      .ncomb = 0,
+	      .combining = 0,
+	      .estimated_width = 1,
+	      .base = *str
+	    };
 
-	  putcode_real (term, code);
-	  if (code == '\n')
-	    putcode_real (term, '\r');
+	  FOR_ACTIVE_TERM_OUTPUTS(term)
+	  {
+	    (term->putchar) (term, &c);
+	  }
+	  if (*str == '\n')
+	    {
+	      c.base = '\r';
+	      FOR_ACTIVE_TERM_OUTPUTS(term)
+	      {
+		(term->putchar) (term, &c);
+	      }
+	    }
 	}
       return;
     }
@@ -760,28 +777,41 @@ grub_print_ucs4 (const grub_uint32_t * str,
 void
 grub_xputs_normal (const char *str)
 {
-  grub_term_output_t term;
-  grub_uint32_t *unicode_str, *unicode_last_position;
+  grub_uint32_t *unicode_str = NULL, *unicode_last_position;
   int backlog = 0;
+  grub_term_output_t term;
+
+  grub_error_push ();
   grub_utf8_to_ucs4_alloc (str, &unicode_str,
-			   &unicode_last_position);
+  			   &unicode_last_position);
+  grub_error_pop ();
 
   if (!unicode_str)
     {
-      grub_errno = GRUB_ERR_NONE;
       for (; *str; str++)
 	{
-	  grub_term_output_t term;
-	  grub_uint32_t code = *str;
-	  if (code > 0x7f)
-	    code = '?';
+	  struct grub_unicode_glyph c =
+	    {
+	      .variant = 0,
+	      .attributes = 0,
+	      .ncomb = 0,
+	      .combining = 0,
+	      .estimated_width = 1,
+	      .base = *str
+	    };
 
 	  FOR_ACTIVE_TERM_OUTPUTS(term)
 	  {
-	    putcode_real (term, code);
-	    if (code == '\n')
-	      putcode_real (term, '\r');
+	    (term->putchar) (term, &c);
 	  }
+	  if (*str == '\n')
+	    {
+	      c.base = '\r';
+	      FOR_ACTIVE_TERM_OUTPUTS(term)
+	      {
+		(term->putchar) (term, &c);
+	      }
+	    }
 	}
 
       return;

From c7fef4da8b3ef241e24aba8f6451f9491c2f10c5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 21:58:58 +0200
Subject: [PATCH 1479/1628] make tags variables statis as intended

---
 grub-core/loader/i386/bsd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
index d6a22da5b..cfea3b6a1 100644
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -81,7 +81,7 @@ struct bsd_tag
   } data[0];
 };
 
-struct bsd_tag *tags, *tags_last;
+static struct bsd_tag *tags, *tags_last;
 
 struct netbsd_module
 {
@@ -89,7 +89,7 @@ struct netbsd_module
   struct grub_netbsd_btinfo_module mod;
 };
 
-struct netbsd_module *netbsd_mods, *netbsd_mods_last;
+static struct netbsd_module *netbsd_mods, *netbsd_mods_last;
 
 static const struct grub_arg_option freebsd_opts[] =
   {

From 0b986c402b9e98f3859997763487c3ab68b54518 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 22:03:28 +0200
Subject: [PATCH 1480/1628] First part of ChangeLog

---
 ChangeLog | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 280 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index c2ebd6173..6162b2eca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,283 @@
+2010-08-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	New relocator. Allows for more kernel support and more straightforward
+	loader writing.
+
+	* Makefile.am (BOOTTARGET): New variable.
+	(QEMU32): Likewise.
+	(linux.init.x86_64): New target.
+	(linux.init.i386): Likewise.
+	(multiboot.elf): Likewise.
+	(kfreebsd.elf): Likewise.
+	(kfreebsd.aout): Likewise.
+	(pc-chainloader.elf): Likewise.
+	(pc-chainloader.bin): Likewise.
+	(ntldr.elf): Likewise.
+	(ntldr.bin): Likewise.
+	(multiboot2.elf): Likewise.
+	(kfreebsd.init.x86_64): Likewise.
+	(kfreebsd.init.i386): Likewise.
+	(knetbsd.init.i386): Likewise.
+	(kopenbsd.init.i386): Likewise.
+	(knetbsd.init.x86_64): Likewise.
+	(kopenbsd.init.x86_64): Likewise.
+	(linux-initramfs.i386): Likewise.
+	(linux-initramfs.x86_64): Likewise.
+	(kfreebsd-mfsroot.i386.img): Likewise.
+	(knetbsd.image.i386): Likewise.
+	(kopenbsd.image.i386): Likewise.
+	(kopenbsd.image.x86_64): Likewise.
+	(knetbsd.miniroot-image.i386.img): Likewise.
+	(kfreebsd-mfsroot.x86_64.img): Likewise.
+	(knetbsd.image.x86_64): Likewise.
+	(knetbsd.miniroot-image.x86_64.img): Likewise.
+	(kfreebsd-mfsroot.i386.gz): Likewise.
+	(bootcheck-kfreebsd-i386): Likewise.
+	(kfreebsd-mfsroot.x86_64.gz): Likewise.
+	(bootcheck-kfreebsd-x86_64): Likewise.
+	(knetbsd.miniroot-image.i386.gz): Likewise.
+	(bootcheck-knetbsd-i386): Likewise.
+	(bootcheck-kopenbsd-i386): Likewise.
+	(bootcheck-kopenbsd-x86_64): Likewise.
+	(knetbsd.miniroot-image.x86_64.gz): Likewise.
+	(bootcheck-knetbsd-x86_64): Likewise.
+	(bootcheck-linux-i386): Likewise.
+	(bootcheck-linux-x86_64): Likewise.
+	(bootcheck-linux16-i386): Likewise.
+	(bootcheck-linux16-x86_64): Likewise.
+	(bootcheck-multiboot): Likewise.
+	(bootcheck-multiboot2): Likewise.
+	(bootcheck-kfreebsd-aout): Likewise.
+	(bootcheck-pc-chainloader): Likewise.
+	(bootcheck-ntldr): Likewise.
+	(CLEANFILES): Add new targets.
+	(BOOTCHECKS): New variable.
+	(.PHONY): Add bootchecks.
+	(SUCCESSFUL_BOOT_STRING): New variable.
+	(BOOTCHECK_TIMEOUT): Likewise.
+	(bootcheck): New target
+	* Makefile.util.def (grub-mkrescue): Enable on i386-multiboot.
+	* configure.ac: Correct efiemu excuse.
+	* docs/grub.texi (Supported kernels): New chapter.
+	* grub-core/Makefile.am (KERNEL_HEADER_FILES): Add
+	include/grub/mm_private.h. Simplify inclusion of
+	include/grub/boot.h, include/grub/loader.h
+	and include/grub/msdos_partition.h
+	(KERNEL_HEADER_FILES) [i386_coreboot]:
+	Remove include/grub/machine/loader.h. Add include/grub/i386/pit.h.
+	(KERNEL_HEADER_FILES) [i386_multiboot]: Likewise.
+	(KERNEL_HEADER_FILES) [i386_qemu]: Likewise.
+	(KERNEL_HEADER_FILES) [i386_ieee1275]: Remove
+	include/grub/machine/loader.h.
+	(KERNEL_HEADER_FILES) [x86_64-efi]: Likewise.
+	* grub-core/Makefile.core.def (kernel): Remove kern/i386/loader.S from
+	extra_dist.
+	(pci.mod): Enable on i386-multiboot.
+	(acpi.mod): Enable on i386-multiboot and i386-coreboot.
+	(efiemu.mod): Enable on i386-coreboot, i386-ieee1275, i386-multiboot and
+	i386-qemu.
+	(relocator.mod): Rewritten.
+	(aout.mod): Enable on all x86.
+	(bsd.mod): Likewise.
+	(ntldr.mod): New module.
+	(linux.mod): Use loader/i386/linux.c on all x86.
+	(xnu.mod): Enable on all x86.
+	(vga_text.mod): disable on EFI and QEMU.
+	* grub-core/efiemu/i386/coredetect.c: Remove useless include.
+	* grub-core/efiemu/i386/pc/cfgtables.c: Likewise.
+	* grub-core/efiemu/loadcore.c: Likewise.
+	* grub-core/efiemu/main.c: Likewise.
+	(grub_efiemu_exit_boot_services): Removed.
+	(grub_efiemu_finish_boot_services): Likewise.
+	* grub-core/efiemu/mm.c (grub_efiemu_finish_boot_services): New
+	function.
+	* grub-core/efiemu/i386/nocfgtables.c: New file.
+	* grub-core/kern/dl.c (grub_dl_unload_all): Removed.
+	* grub-core/kern/efi/efi.c (grub_efi_exit_boot_services): Removed.
+	(grub_efi_finish_boot_services): Moved from here ...
+	* grub-core/kern/efi/mm.c (grub_efi_finish_boot_services): ...here.
+	Fille finish memory map and related data.
+	(finish_mmap_buf): New variable.
+	(grub_efi_uintn_t finish_mmap_size): Likewise.
+	(grub_efi_uintn_t finish_key): Likewise.
+	(grub_efi_uintn_t finish_desc_size): Likewise.
+	(grub_efi_uint32_t finish_desc_version): Likewise.
+	(grub_efi_is_finished): Likewise.
+	(grub_efi_get_memory_map): Use saved memory map if EFI is already
+	finished.
+	* grub-core/kern/elf.c (grub_elf32_phdr_iterate): Make global.
+	(grub_elf64_phdr_iterate): Likewise.
+	* grub-core/kern/i386/coreboot/init.c (grub_os_area_addr): Removed.
+	(grub_os_area_size): Likewise.
+	(grub_machine_init): Don't reserve os area.
+	* grub-core/kern/i386/coreboot/startup.S: Don't include loader.S.
+	* grub-core/kern/i386/ieee1275/startup.S: Likewise.
+	* grub-core/kern/i386/loader.S: Removed.
+	* grub-core/kern/i386/pc/init.c (grub_os_area_addr): Removed.
+	(grub_os_area_size): Likewise.
+	(grub_machine_init): Don't reserve os area.
+	* grub-core/kern/i386/pc/startup.S (grub_chainloader_real_boot):
+	Don't call grub_dl_unload_all.
+	Don't include loader.S.
+	* grub-core/kern/i386/qemu/mmap.c (grub_machine_mmap_iterate):
+	Declare the memory after _end as available.
+	* grub-core/kern/mm.c (GRUB_MM_FREE_MAGIC): Moved from here...
+	(GRUB_MM_ALLOC_MAGIC): Moved from here...
+	(grub_mm_header)
+	(GRUB_MM_ALIGN)
+	* grub-core/kern/mm.c (grub_mm_region): Moved from here ...
+	(grub_mm_region): ..here. Removed addr. Added pre_size.
+	All users updated.
+	* grub-core/kern/mm.c (base): Renamed to ...
+	(grub_mm_base): ... this. Made global.
+	(grub_real_malloc): Alloc from end of region.
+	(grub_memalign): Don't attempt to malloc if grub_mm_base is NULL.
+	* grub-core/kern/powerpc/cache.S (grub_arch_sync_caches): Move to ...
+	* grub-core/kern/powerpc/cache_flush.S: ... here.
+	* grub-core/lib/efi/relocator.c: New file.
+	* grub-core/lib/i386/relocator.c: Rewritten.
+	* grub-core/lib/i386/relocator16.S: New file.
+	* grub-core/lib/i386/relocator32.S: Likewise.
+	* grub-core/lib/i386/relocator64.S: Likewise.
+	* grub-core/lib/i386/relocator_asm.S: Rewritten.
+	* grub-core/lib/i386/relocator_common.S: New file.
+	* grub-core/lib/ieee1275/relocator.c: Likewise.
+	* grub-core/lib/mips/relocator.c: Rewritten.
+	* grub-core/lib/mips/relocator_asm.S: Renamed variables and minor
+	stylistic adjustments.
+	* grub-core/lib/powerpc/relocator.c: New file.
+	* grub-core/lib/powerpc/relocator_asm.S: Likewise.
+	* grub-core/lib/relocator.c: Rewritten.
+	* grub-core/lib/x86_64/relocator_asm.S: New file.
+	* grub-core/loader/aout.c (grub_aout_load): Make load_addr a void *.
+	* grub-core/loader/i386/bsd.c (NETBSD_DEFAULT_VIDEO_MODE): New const.
+	(bsd_tag): New struct.
+	(tags): New variable.
+	(tags_last): Likewise.
+	(netbsd_module): New struct.
+	(netbsd_mods): New variable.
+	(netbsd_mods_last): Likewise.
+	(openbsd_opts): New parameter "serial".
+	(OPENBSD_SERIAL_ARG): New definition.
+	(netbsd_opts): New parameter "serial".
+	(NETBSD_SERIAL_ARG): New definition.
+	(grub_freebsd_add_meta): Reorganised into ...
+	(grub_bsd_add_meta): ...this. All users updated.
+	(grub_freebsd_add_mmap): Reorganised into ...
+	(generate_e820_mmap):  ...this...
+	(grub_bsd_add_mmap): ...and this.  All users updated.
+	(grub_freebsd_list_modules): Use tags.
+	(grub_netbsd_add_meta_module): New function.
+	(grub_netbsd_list_modules): Likewise.
+	(grub_freebsd_boot): Use relocator and finish EFI.
+	(grub_openbsd_boot): Likewise.
+	(grub_netbsd_setup_video): New function.
+	(grub_netbsd_add_modules): Likewise.
+	(grub_netbsd_boot): Use grub_netbsd_add_modules, relocator, netbsd_tags
+	and finish EFI.
+	(grub_bsd_unload): Unload tags.
+	(grub_bsd_load_aout): Use relocator.
+	(grub_bsd_elf32_size_hook): New function.
+	(grub_bsd_elf32_hook): Use relocator.
+	(grub_bsd_elf64_size_hook): New function.
+	(grub_bsd_elf64_hook): Use relocator.
+	(grub_bsd_load_elf): Use relocator and call grub_openbsd_find_ramdisk.
+	(grub_bsd_load): Zero-out openbsd_ramdisk.
+	(grub_bsd_load): Use relocator.
+	(grub_cmd_openbsd): Support serial.
+	(grub_cmd_netbsd): Support modules.
+	(grub_cmd_freebsd_module): Use relocator.
+	(grub_netbsd_module_load): New function.
+	(grub_cmd_netbsd_module): Likewise.
+	(grub_cmd_openbsd_ramdisk): Likewise.
+	(GRUB_MOD_INIT): Register knetbsd_module, knetbsd_module_elf and
+	kopenbsd_ramdisk.
+	(GRUB_MOD_FINI): Unregister new commands.
+	* grub-core/loader/i386/bsdXX.c (load): Remove useless checks.
+	(grub_freebsd_load_elfmodule_obj): Use relocator.
+	(grub_freebsd_load_elfmodule): Likewise.
+	(grub_freebsd_load_elf_meta): Likewise.
+	(grub_netbsd_load_elf_meta): New function.
+	(grub_openbsd_find_ramdisk): Likewise.
+	* grub-core/loader/i386/bsd_helper.S: Removed.
+	* grub-core/loader/i386/bsd_pagetable.c: Support relocator.
+	* grub-core/loader/i386/bsd_trampoline.S: Removed.
+	* grub-core/loader/i386/efi/linux.c: Likewise.
+	* grub-core/loader/i386/ieee1275/linux.c: Likewise.
+	* grub-core/loader/i386/linux.c (HAS_VGA_TEXT): New const.
+	(DEFAULT_VIDEO_MODE): Likewise.
+	(real_mode_target): New variable.
+	(prot_mode_target): Likewise.
+	(initrd_mem_target): Likewise.
+	(relocator): Likewise.
+	(efi_mmap_buf): Likewise.
+	(efi_mmap_size): Likewise.
+	(find_efi_mmap_size): Moved from grub-core/loader/i386/efi/linux.c.
+	(free_pages): Use relocator.
+	(allocate_pages): Account for efi_mmap and use relocator. Return error.
+	(grub_linux_setup_video): Return error.
+	(grub_linux_trampoline_start): Removed.
+	(grub_linux_trampoline_end): Likewise.
+	(grub_linux_boot): Use relocator and DEFAULT_VIDEO_MODE. Pass console
+	andd video parameters depending on firmware.
+	[GRUB_MACHINE_IEEE1275]: Pass OFW parameters.
+	[GRUB_MACHINE_EFI]: Pass EFI parameters.
+	(grub_cmd_linux) [GRUB_MACHINE_EFI]: Likewise.
+	(grub_cmd_initrd): Use relocator.
+	* grub-core/loader/i386/linux_trampoline.S: Removed.
+	* grub-core/loader/i386/multiboot_mbi.c (elf_sec_num): New variable.
+	(elf_sec_entsize): Likewise.
+	(elf_sec_shstrndx): Likewise.
+	(elf_sections): Likewise.
+	(grub_multiboot_load): Use relocator.
+	(grub_multiboot_get_mbi_size): Account for sections.
+	(grub_multiboot_make_mbi): Use relocator and support sections.
+	(grub_multiboot_add_elfsyms): New function.
+	(grub_multiboot_free_mbi): Free sections.
+	* grub-core/loader/i386/pc/linux.c (relocator): New variable.
+	(grub_linux_real_target): Likewise.
+	(grub_linux_real_chunk): Likewise.
+	(grub_linux16_prot_size): Likewise.
+	(grub_linux16_boot): Use relocator.
+	(grub_linux_unload): Unload relocator.
+	(grub_cmd_linux): Use relocator.
+	(grub_cmd_initrd): Likewise.
+	* grub-core/loader/i386/pc/ntldr.c: New file.
+	* grub-core/loader/i386/xnu.c (guessfsb) [GRUB_MACHINE_IEEE1275]:
+	Don't try to guess CPU frequency.
+	(grub_xnu_set_video): Stretch bitmap.
+	(grub_xnu_boot): Use relocator.
+	* grub-core/loader/mips/linux.c (grub_linux_boot): Use relocator.
+	(grub_linux_unload): Free relocator.
+	(grub_linux_load32): Use relocator.
+	(grub_linux_load64): Likewise.
+	(grub_cmd_initrd): Likewise.
+	* grub-core/loader/multiboot.c (grub_multiboot_boot): Use relocator.
+	(grub_multiboot_unload): Unload relocator.
+	(grub_cmd_multiboot): Use relocator.
+	(grub_cmd_module): Likewise.
+	* grub-core/loader/multiboot_elfxx.c (grub_multiboot_load_elfXX):
+	Use relocator and support sections.
+	* grub-core/loader/multiboot_mbi2.c(elf_sec_num): New variable.
+	(elf_sec_entsize): Likewise.
+	(elf_sec_shstrndx): Likewise.
+	(elf_sections): Likewise.
+	(grub_multiboot_load): Use relocator.
+	(grub_multiboot_get_mbi_size): Account for sections.
+	(grub_multiboot_make_mbi): Use relocator and support sections.
+	(grub_multiboot_add_elfsyms): New function.
+	* grub-core/loader/powerpc/ieee1275/linux.c: Remove useless include.
+	* grub-core/loader/sparc64/ieee1275/linux.c: Likewise.
+	* grub-core/loader/xnu.c (grub_xnu_heap_malloc): Use relocator.
+	Prototype changed. All users updated.
+	(grub_xnu_align_heap): Simplified.
+	(grub_xnu_writetree_toheap): Likewise.
+	(grub_xnu_unload): Unload relocator.
+	(grub_cmd_xnu_kernel): Use relocator.
+	(grub_cmd_xnu_kernel64): Likewise.
+	(grub_xnu_register_memory): Simplified.
+	* grub-core/loader/xnu_resume.c (grub_xnu_resume): Use relocator.
+
 2010-08-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/Makefile.core.def (kernel): Add kern/mips/cache_flush.S to

From 7542126ac2775ab63e8a41c387978f9755d9eb36 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 23:07:44 +0200
Subject: [PATCH 1481/1628] Add missing newlines

---
 grub-core/tests/boot/kbsd.init-x86_64.S     | 2 +-
 grub-core/tests/boot/kfreebsd.init-x86_64.S | 2 +-
 grub-core/tests/boot/linux.init-i386.S      | 1 -
 grub-core/tests/boot/linux.init-x86_64.S    | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/grub-core/tests/boot/kbsd.init-x86_64.S b/grub-core/tests/boot/kbsd.init-x86_64.S
index 58400db0d..81f810e2c 100644
--- a/grub-core/tests/boot/kbsd.init-x86_64.S
+++ b/grub-core/tests/boot/kbsd.init-x86_64.S
@@ -108,4 +108,4 @@ message:
 	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
 messageend:
 iopl_arg:
-	.long 3
\ No newline at end of file
+	.long 3
diff --git a/grub-core/tests/boot/kfreebsd.init-x86_64.S b/grub-core/tests/boot/kfreebsd.init-x86_64.S
index d2907b3a8..0a9ff511e 100644
--- a/grub-core/tests/boot/kfreebsd.init-x86_64.S
+++ b/grub-core/tests/boot/kfreebsd.init-x86_64.S
@@ -95,4 +95,4 @@ messageend:
 iopl_arg:
 	.long SHUTDOWN_PORT
 	.long 1
-	.long 1
\ No newline at end of file
+	.long 1
diff --git a/grub-core/tests/boot/linux.init-i386.S b/grub-core/tests/boot/linux.init-i386.S
index f3eca6d88..5b0088e00 100644
--- a/grub-core/tests/boot/linux.init-i386.S
+++ b/grub-core/tests/boot/linux.init-i386.S
@@ -77,4 +77,3 @@ start:
 message:
 	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
 messageend:
-	
\ No newline at end of file
diff --git a/grub-core/tests/boot/linux.init-x86_64.S b/grub-core/tests/boot/linux.init-x86_64.S
index 63dca5e20..fc32dfd91 100644
--- a/grub-core/tests/boot/linux.init-x86_64.S
+++ b/grub-core/tests/boot/linux.init-x86_64.S
@@ -76,4 +76,3 @@ start:
 message:
 	.ascii "Boot Test Passed Successfully\n" SUCCESSFUL_BOOT_STRING "\n"
 messageend:
-	
\ No newline at end of file

From 1935c0773e0abe1d7878f1d361eff87a9c71aabc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 23:08:06 +0200
Subject: [PATCH 1482/1628] Finish Changelog

---
 ChangeLog | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 143 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ef81d87e9..4d5d6653a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -122,9 +122,13 @@
 	* grub-core/kern/i386/qemu/mmap.c (grub_machine_mmap_iterate):
 	Declare the memory after _end as available.
 	* grub-core/kern/mm.c (GRUB_MM_FREE_MAGIC): Moved from here...
+	* include/grub/mm_private.h (GRUB_MM_FREE_MAGIC): ... here.
 	(GRUB_MM_ALLOC_MAGIC): Moved from here...
-	(grub_mm_header)
-	(GRUB_MM_ALIGN)
+	* include/grub/mm_private.h (GRUB_MM_ALLOC_MAGIC): ... here.
+	* grub-core/kern/mm.c (grub_mm_header): Moved from here...
+	* include/grub/mm_private.h (grub_mm_header): ... here.
+	* grub-core/kern/mm.c (GRUB_MM_ALIGN): Moved from here...
+	* include/grub/mm_private.h (GRUB_MM_ALIGN): ... here.
 	* grub-core/kern/mm.c (grub_mm_region): Moved from here ...
 	(grub_mm_region): ..here. Removed addr. Added pre_size.
 	All users updated.
@@ -277,6 +281,143 @@
 	(grub_cmd_xnu_kernel64): Likewise.
 	(grub_xnu_register_memory): Simplified.
 	* grub-core/loader/xnu_resume.c (grub_xnu_resume): Use relocator.
+	* grub-core/term/efi/console.c (grub_console_putchar): Abort if
+	EFI is finished.
+	(grub_console_checkkey): Likewise.
+	(grub_console_getkey): Likewise.
+	(grub_console_getwh): Likewise.
+	(grub_console_getxy): Likewise.
+	(grub_console_gotoxy): Likewise.
+	(grub_console_cls): Likewise.
+	(grub_console_setcolorstate): Likewise.
+	(grub_console_setcursor): Likewise.
+	* grub-core/term/ns8250.c (grub_ns8250_hw_get_port): New function.
+	* grub-core/tests/boot/kbsd.init-i386.S: New file.
+	* grub-core/tests/boot/kbsd.init-x86_64.S: Likewise.
+	* grub-core/tests/boot/kbsd.spec.txt: Likewise.
+	* grub-core/tests/boot/kernel-8086.S: Likewise.
+	* grub-core/tests/boot/kernel-i386.S: Likewise.
+	* grub-core/tests/boot/kfreebsd-aout.cfg: Likewise.
+	* grub-core/tests/boot/kfreebsd.cfg: Likewise.
+	* grub-core/tests/boot/kfreebsd.init-i386.S: Likewise.
+	* grub-core/tests/boot/kfreebsd.init-x86_64.S: Likewise.
+	* grub-core/tests/boot/knetbsd.cfg: Likewise.
+	* grub-core/tests/boot/kopenbsd.cfg: Likewise.
+	* grub-core/tests/boot/kopenbsdlabel.txt: Likewise.
+	* grub-core/tests/boot/linux.cfg: Likewise.
+	* grub-core/tests/boot/linux.init-i386.S: Likewise.
+	* grub-core/tests/boot/linux.init-x86_64.S: Likewise.
+	* grub-core/tests/boot/linux16.cfg: Likewise.
+	* grub-core/tests/boot/multiboot.cfg: Likewise.
+	* grub-core/tests/boot/multiboot2.cfg: Likewise.
+	* grub-core/tests/boot/ntldr.cfg: Likewise.
+	* grub-core/tests/boot/pc-chainloader.cfg: Likewise.
+	* include/grub/aout.h (grub_aout_load): Make load_addr a void *.
+	* include/grub/autoefi.h (grub_autoefi_finish_boot_services):
+	New definition.
+	* include/grub/dl.h (grub_dl_unload_all): Removed.
+	* include/grub/efi/efi.h (grub_efi_exit_boot_services): Likewise.
+	(grub_efi_finish_boot_services): Change prototype.
+	(grub_efi_is_finished): New variable.
+	* include/grub/efiemu/efiemu.h (grub_efiemu_finish_boot_services):
+	Changed prototype.
+	(grub_efiemu_finish_boot_services): Removed.
+	(grub_machine_efiemu_init_tables): New prototype.
+	* include/grub/elfload.h (grub_elf32_phdr_iterate): Likewise.
+	(grub_elf64_phdr_iterate): Likewise.
+	* include/grub/i386/bsd.h: Include relocator.h.
+	(freebsd_tag_header): New struct.
+	(grub_openbsd_bios_mmap): Removed.
+	(grub_unix_real_boot): Removed.
+	(grub_freebsd_load_elfmodule32): Changed prototype.
+	(grub_freebsd_load_elfmodule_obj64): Likewise.
+	(grub_freebsd_load_elf_meta32): Likewise.
+	(grub_freebsd_load_elf_meta64): Likewise.
+	(grub_freebsd_add_meta): Removed.
+	(grub_netbsd_load_elf_meta32): New prototype.
+	(grub_netbsd_load_elf_meta64): Likewise.
+	(grub_bsd_add_meta): Likewise.
+	(grub_openbsd_ramdisk_descriptor): New struct.
+	(grub_openbsd_find_ramdisk32): New prototype.
+	(grub_openbsd_find_ramdisk64): Likewise.
+	* include/grub/i386/coreboot/loader.h: Removed.
+	* include/grub/i386/efi/loader.h: Likewise.
+	* include/grub/i386/ieee1275/loader.h: Likewise.
+	* include/grub/i386/linux.h (linux_kernel_header): Change void *
+	to grub_uint32_t.
+	* include/grub/i386/loader.h: Removed.
+	* include/grub/i386/memory.h (GRUB_MEMORY_CPU_CR4_PAE_ON): Correct the
+	value.
+	(GRUB_MEMORY_CPU_CR4_PSE_ON): New definition.
+	(grub_phys_addr_t): New type.
+	(grub_vtop): New inline function.
+	(grub_map_memory): Likewise.
+	(grub_unmap_memory): Likewise.
+	* include/grub/i386/multiboot/loader.h: Removed.
+	* include/grub/i386/netbsd_bootinfo.h (NETBSD_BTINFO_BOOTDISK): Removed.
+	(NETBSD_BTINFO_CONSOLE): New definition.
+	(NETBSD_BTINFO_SYMTAB): Likewise.
+	(NETBSD_BTINFO_MODULES): Likewise.
+	(NETBSD_BTINFO_FRAMEBUF): Likewise.
+	(grub_netbsd_bootinfo): New struct.
+	(grub_netbsd_btinfo_common): Use explicit bitsize.
+	(grub_netbsd_btinfo_mmap_entry): Removed.
+	(GRUB_NETBSD_MAX_BOOTPATH_LEN): New definition.
+	(grub_netbsd_btinfo_bootdisk): New struct.
+	(grub_netbsd_btinfo_symtab): Likewise.
+	(grub_netbsd_btinfo_serial): Likewise.
+	(grub_netbsd_btinfo_modules): Likewise.
+	(grub_netbsd_btinfo_framebuf): Likewise.
+	(GRUB_NETBSD_MAX_ROOTDEVICE_LEN): New definition.
+	* include/grub/i386/openbsd_bootarg.h (OPENBSD_BOOTARG_CONSOLE):
+	Likewise.
+	(grub_openbsd_bootargs): Use explicit bitsize.
+	(grub_openbsd_bootarg_console): New struct.
+	(GRUB_OPENBSD_COM_MAJOR): New definition.
+	(GRUB_OPENBSD_VGA_MAJOR): Likewise.
+	* include/grub/i386/pc/efiemu.h: Removed.
+	* include/grub/i386/pc/loader.h: Don't include cpu/loader.h.
+	* include/grub/i386/qemu/loader.h: Removed.
+	* include/grub/i386/relocator.h: Rewritten.
+	* include/grub/i386/xnu.h (grub_xnu_heap_will_be_at): Removed.
+	* include/grub/mips/memory.h: New file.
+	* include/grub/mips/multiboot.h: Rewritten.
+	* include/grub/mips/relocator.h: Rewritten.
+	* include/grub/mips/yeeloong/memory.h (grub_phys_addr_t): New type.
+	(grub_vtop): New function.
+	(grub_map_memory): Likewise.
+	(grub_unmap_memory): Likewise.
+	* include/grub/misc.h (ALIGN_DOWN): New definition.
+	* include/grub/mm.h (grub_mm_check_real): New proto.
+	(GRUB_MM_CHECK): New definition.
+	* include/grub/mm_private.h: New file.
+	* include/grub/multiboot.h (grub_multiboot_relocator): New variable.
+	(grub_multiboot_get_mbi_size): Removed.
+	(grub_multiboot_make_mbi): Change prottype.
+	(grub_multiboot_set_accepts_video): New proto.
+	(grub_multiboot_add_elfsyms): Likewise.
+	(grub_multiboot_payload_eip): New variable.
+	* include/grub/ns8250.h (grub_ns8250_hw_get_port) [!ASM_FILE]:
+	New prototype.
+	* include/grub/offsets.h (GRUB_KERNEL_I386_MULTIBOOT_PREFIX):
+	New definition.
+	(GRUB_KERNEL_I386_MULTIBOOT_DATA_END): Likewise.
+	(GRUB_KERNEL_I386_MULTIBOOT_MOD_ALIGN): Likewise.
+	* include/grub/powerpc/ieee1275/loader.h: Removed.
+	* include/grub/powerpc/memory.h: New file.
+	* include/grub/powerpc/relocator.h: Likewise.
+	* include/grub/relocator.h: Likewise.
+	* include/grub/relocator_private.h: Likewise.
+	* include/grub/sparc64/ieee1275/loader.h: Removed.
+	* include/grub/x86_64/memory.h: New file.
+	* include/grub/xnu.h (grub_xnu_writetree_toheap): Changed prototype.
+	(grub_xnu_heap_malloc): Likewise.
+	(grub_xnu_heap_real_start): Removed.
+	(grub_xnu_heap_start): Likewise.
+	(grub_xnu_relocator): New variable.
+	(grub_xnu_heap_target_start): Likewise.
+	* tests/util/grub-shell.in: Support non-pc.
+	* util/grub-mkimage.c (image_targets): Fix multiboot target.
 
 2010-08-29  Vladimir Serbinenko  <phcoder@gmail.com>
 

From 37e67a273bbe6c1ed26883c9b4b4033b9fed510d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Aug 2010 00:54:15 +0200
Subject: [PATCH 1483/1628] Add missing emu/halt.c

---
 grub-core/lib/emu/halt.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 grub-core/lib/emu/halt.c

diff --git a/grub-core/lib/emu/halt.c b/grub-core/lib/emu/halt.c
new file mode 100644
index 000000000..620935b5a
--- /dev/null
+++ b/grub-core/lib/emu/halt.c
@@ -0,0 +1,25 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2003,2004,2005,2006,2007,2008,2009,2010  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>
+
+void
+grub_halt (void)
+{
+  grub_reboot ();
+}

From 3dca01d7e3b7f798d3d38dd3e52c8e90fd952bc6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Aug 2010 01:09:28 +0200
Subject: [PATCH 1484/1628] 	* grub-core/term/i386/vga_common.c
 (grub_console_setcolorstate): 	Mask out the bit 0x80 since it has other
 meaning that specifiing color.

---
 ChangeLog                        | 5 +++++
 grub-core/term/i386/vga_common.c | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d5d6653a..9e84cc88b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/term/i386/vga_common.c (grub_console_setcolorstate):
+	Mask out the bit 0x80 since it has other meaning that specifiing color.
+
 2010-08-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	New relocator. Allows for more kernel support and more straightforward
diff --git a/grub-core/term/i386/vga_common.c b/grub-core/term/i386/vga_common.c
index 02fb5c02d..0c217697b 100644
--- a/grub-core/term/i386/vga_common.c
+++ b/grub-core/term/i386/vga_common.c
@@ -34,13 +34,13 @@ grub_console_setcolorstate (struct grub_term_output *term,
 {
   switch (state) {
     case GRUB_TERM_COLOR_STANDARD:
-      grub_console_cur_color = GRUB_TERM_DEFAULT_STANDARD_COLOR;
+      grub_console_cur_color = GRUB_TERM_DEFAULT_STANDARD_COLOR & 0x7f;
       break;
     case GRUB_TERM_COLOR_NORMAL:
-      grub_console_cur_color = term->normal_color;
+      grub_console_cur_color = term->normal_color & 0x7f;
       break;
     case GRUB_TERM_COLOR_HIGHLIGHT:
-      grub_console_cur_color = term->highlight_color;
+      grub_console_cur_color = term->highlight_color & 0x7f;
       break;
     default:
       break;

From 9a9de209a2302aae260285531675e21762a62b32 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Aug 2010 01:11:12 +0200
Subject: [PATCH 1485/1628] 	* grub-core/normal/term.c (print_more): Return
 to normal and not 	to standard state after printing "---MORE---".

---
 ChangeLog               | 5 +++++
 grub-core/normal/term.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9e84cc88b..b59a69569 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/term.c (print_more): Return to normal and not
+	to standard state after printing "---MORE---".
+
 2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/term/i386/vga_common.c (grub_console_setcolorstate):
diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c
index 02850ef4e..b55c0f06a 100644
--- a/grub-core/normal/term.c
+++ b/grub-core/normal/term.c
@@ -86,7 +86,7 @@ print_more (void)
   {
     grub_print_ucs4 (unicode_str, unicode_last_position, 0, 0, term);
   }
-  grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
+  grub_setcolorstate (GRUB_TERM_COLOR_NORMAL);
 
   grub_free (unicode_str);
   

From f21db0332f801a8c027e5d775358a8611164a77d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Aug 2010 01:12:37 +0200
Subject: [PATCH 1486/1628] 	* grub-core/normal/color.c
 (grub_env_write_color_normal): Fix a warning. 
 (grub_env_write_color_highlight): Likewise.

---
 ChangeLog                |  5 +++++
 grub-core/normal/color.c | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b59a69569..1f7bbfa6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/color.c (grub_env_write_color_normal): Fix a warning.
+	(grub_env_write_color_highlight): Likewise.
+
 2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/normal/term.c (print_more): Return to normal and not
diff --git a/grub-core/normal/color.c b/grub-core/normal/color.c
index a16d1c2f9..2e6c80b94 100644
--- a/grub-core/normal/color.c
+++ b/grub-core/normal/color.c
@@ -125,10 +125,11 @@ set_colors (void)
 
 /* Replace default `normal' colors with the ones specified by user (if any).  */
 char *
-grub_env_write_color_normal (struct grub_env_var *var, const char *val)
+grub_env_write_color_normal (struct grub_env_var *var __attribute__ ((unused)),
+			     const char *val)
 {
   if (grub_parse_color_name_pair (&color_normal, val))
-    return 0;
+    return NULL;
 
   set_colors ();
 
@@ -137,10 +138,11 @@ grub_env_write_color_normal (struct grub_env_var *var, const char *val)
 
 /* Replace default `highlight' colors with the ones specified by user (if any).  */
 char *
-grub_env_write_color_highlight (struct grub_env_var *var, const char *val)
+grub_env_write_color_highlight (struct grub_env_var *var __attribute__ ((unused)),
+				const char *val)
 {
   if (grub_parse_color_name_pair (&color_highlight, val))
-    return 0;
+    return NULL;
 
   set_colors ();
 

From 8920a08d8794d4f3c6d6a529461a70ac5e1809a5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Aug 2010 01:14:07 +0200
Subject: [PATCH 1487/1628] 	* grub-core/normal/menu.c
 (grub_wait_after_message): Add a 10 second 	timeout to avoid indefinite
 boot stalling.

---
 ChangeLog               |  5 +++++
 grub-core/normal/menu.c | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1f7bbfa6c..095cec7f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/menu.c (grub_wait_after_message): Add a 10 second
+	timeout to avoid indefinite boot stalling.
+
 2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/normal/color.c (grub_env_write_color_normal): Fix a warning.
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
index b57990b0d..cc84ce38c 100644
--- a/grub-core/normal/menu.c
+++ b/grub-core/normal/menu.c
@@ -43,9 +43,20 @@ grub_err_t (*grub_gfxmenu_try_hook) (int entry, grub_menu_t menu,
 void
 grub_wait_after_message (void)
 {
+  grub_uint64_t endtime;
   grub_xputs ("\n");
   grub_printf_ (N_("Press any key to continue..."));
-  (void) grub_getkey ();
+  grub_refresh ();
+
+  endtime = grub_get_time_ms () + 10000;
+
+  while (grub_get_time_ms () < endtime)
+    if (grub_checkkey () >= 0)
+      {
+	grub_getkey ();
+	break;
+      }
+
   grub_xputs ("\n");
 }
 

From b4c1aae0f172c77599b284ebe1b301376c01d903 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Aug 2010 01:56:35 +0200
Subject: [PATCH 1488/1628] 	* docs/grub.texi (Network): Fix reference to
 pxe_blksize.

---
 ChangeLog      | 4 ++++
 docs/grub.texi | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 095cec7f7..eb4c8a51b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* docs/grub.texi (Network): Fix reference to pxe_blksize.
+
 2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/normal/menu.c (grub_wait_after_message): Add a 10 second
diff --git a/docs/grub.texi b/docs/grub.texi
index 4c96f254f..18dc39389 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1436,7 +1436,7 @@ The boot file name provided by DHCP.  Read-only.
 The name of the DHCP server responsible for these boot parameters.
 Read-only.
 
-@item net_pxe_blksize
+@item pxe_blksize
 The PXE transfer block size.  Read-write, defaults to 512.
 
 @item pxe_default_server

From e176a764eeaa321278a359a4d72781919a46614a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Aug 2010 02:01:59 +0200
Subject: [PATCH 1489/1628] Add missing Reported by

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index eb4c8a51b..1a0085d9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* docs/grub.texi (Network): Fix reference to pxe_blksize.
+	Reported by: Ian Turner
 
 2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
 

From ebd65b82dcdd85b11babd5c56029e8a23f7fae94 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Mon, 30 Aug 2010 09:37:35 +0530
Subject: [PATCH 1490/1628] remove leading / in dprintf output

---
 ChangeLog            | 5 +++++
 conf/Makefile.common | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1a0085d9a..d3519b139 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-30  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* conf/Makefile.common (CPPFLAGS_DEFAULT): Remove leading / from
+	dprintf output.
+
 2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* docs/grub.texi (Network): Fix reference to pxe_blksize.
diff --git a/conf/Makefile.common b/conf/Makefile.common
index eb70f7f77..fe14c0e18 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -31,7 +31,7 @@ endif
 
 # Other options
 
-CPPFLAGS_DEFAULT = -DGRUB_FILE=\"$(subst $(srcdir),,$<)\"
+CPPFLAGS_DEFAULT = -DGRUB_FILE=\"$(subst $(srcdir)/,,$<)\"
 CPPFLAGS_DEFAULT += -I$(builddir)
 CPPFLAGS_DEFAULT += -I$(srcdir)
 CPPFLAGS_DEFAULT += -I$(top_builddir)

From eefe8abd521893e077396bca09a38d828cdee4d8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Aug 2010 15:13:38 +0200
Subject: [PATCH 1491/1628] Dimplify tags and enable USB on more platforms

---
 ChangeLog                        |   9 ++
 Makefile.util.def                |  12 ++-
 gentpl.py                        |  50 ++++------
 grub-core/Makefile.am            |  25 +----
 grub-core/Makefile.core.def      | 161 +++++++++++--------------------
 grub-core/bus/usb/ohci.c         |  14 +--
 grub-core/bus/usb/uhci.c         |  26 ++---
 grub-core/bus/usb/usbtrans.c     |   7 +-
 grub-core/loader/i386/pc/linux.c |   2 +-
 grub-core/loader/i386/xnu.c      |   4 -
 10 files changed, 121 insertions(+), 189 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a0085d9a..b15fc7fe7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Interrupt wrapping and code simplifications.
+
+	* grub-core/Makefile.am (KERNEL_HEADER_FILES): Remove
+	include/grub/machine/vga.h, include/grub/machine/vbe.h,
+	(KERNEL_HEADER_FILES) [i386-pc]: Add include/grub/machine/int.h.
+	Remove include/grub/machine/init.h.
+
 2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* docs/grub.texi (Network): Fix reference to pxe_blksize.
diff --git a/Makefile.util.def b/Makefile.util.def
index 6b4949fd9..9565dde65 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -330,7 +330,7 @@ script = {
 script = {
   mansection = 1;
   name = grub-mkrescue;
-  x86_noieee1275 = util/grub-mkrescue.in;
+  x86 = util/grub-mkrescue.in;
   powerpc_ieee1275 = util/powerpc/ieee1275/grub-mkrescue.in;
   enable = i386_pc;
   enable = x86_efi;
@@ -346,15 +346,17 @@ script = {
   name = grub-install;
 
   mips = util/grub-install.in;
-  i386_noefi_noieee1275 = util/grub-install.in;
+  i386_pc = util/grub-install.in;
+  i386_qemu = util/grub-install.in;
+  i386_coreboot = util/grub-install.in;
+  i386_multiboot = util/grub-install.in;
+  sparc64_ieee1275 = util/grub-install.in;
 
   x86_efi = util/i386/efi/grub-install.in;
   i386_ieee1275 = util/ieee1275/grub-install.in;
   powerpc_ieee1275 = util/ieee1275/grub-install.in;
 
-  enable = x86;
-  enable = mips;
-  enable = powerpc_ieee1275;
+  enable = noemu;
 };
 
 script = {
diff --git a/gentpl.py b/gentpl.py
index 17bda02c6..abfb20444 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -10,46 +10,38 @@ GRUB_PLATFORMS = [ "emu", "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot",
                    "powerpc_ieee1275" ]
 
 GROUPS = {}
+
+GROUPS["common"]   = GRUB_PLATFORMS[:]
+
+# Groups based on CPU
 GROUPS["i386"]     = [ "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot", "i386_multiboot", "i386_ieee1275" ]
 GROUPS["x86_64"]   = [ "x86_64_efi" ]
 GROUPS["x86"]      = GROUPS["i386"] + GROUPS["x86_64"]
-GROUPS["x86_efi"]  = [ "i386_efi", "x86_64_efi" ]
-
-GROUPS["nopc"] = GRUB_PLATFORMS[:]; GROUPS["nopc"].remove("i386_pc")
-GROUPS["x86_efi_pc"] = GROUPS["x86_efi"] + ["i386_pc"]
-
-GROUPS["x86_noefi"] = GROUPS["x86"][:]; GROUPS["x86_noefi"].remove("i386_efi"); GROUPS["x86_noefi"].remove("x86_64_efi")
-GROUPS["i386_noefi"] = GROUPS["i386"][:]; GROUPS["i386_noefi"].remove("i386_efi")
-
-GROUPS["x86_noieee1275"] = GROUPS["x86"][:]; GROUPS["x86_noieee1275"].remove("i386_ieee1275")
-GROUPS["i386_noieee1275"] = GROUPS["i386"][:]; GROUPS["i386_noieee1275"].remove("i386_ieee1275")
-
-GROUPS["i386_noefi_noieee1275"] = GROUPS["i386_noefi"][:]; GROUPS["i386_noefi_noieee1275"].remove("i386_ieee1275")
-
-GROUPS["i386_pc_qemu_coreboot"] = ["i386_pc", "i386_qemu", "i386_coreboot"]
-GROUPS["i386_coreboot_multiboot"] = ["i386_coreboot", "i386_multiboot"]
-GROUPS["i386_coreboot_multiboot_qemu"] = ["i386_coreboot", "i386_multiboot", "i386_qemu"]
-GROUPS["i386_pc_coreboot_multiboot_qemu"] = ["i386_pc", "i386_coreboot", "i386_multiboot", "i386_qemu"]
-
 GROUPS["mips"]     = [ "mips_yeeloong" ]
 GROUPS["sparc64"]  = [ "sparc64_ieee1275" ]
 GROUPS["powerpc"]  = [ "powerpc_ieee1275" ]
 
-GROUPS["nosparc64"] = GRUB_PLATFORMS[:]; GROUPS["nosparc64"].remove("sparc64_ieee1275")
-GROUPS["x86_noefi_mips"] = GROUPS["x86_noefi"] + GROUPS["mips"]
-
+# Groups based on firmware
+GROUPS["x86_efi"]  = [ "i386_efi", "x86_64_efi" ]
 GROUPS["ieee1275"]   = [ "i386_ieee1275", "sparc64_ieee1275", "powerpc_ieee1275" ]
-GROUPS["noieee1275"] = GRUB_PLATFORMS[:]
-for i in GROUPS["ieee1275"]: GROUPS["noieee1275"].remove(i)
-GROUPS["ieee1275_mips"] = GROUPS["ieee1275"] + GROUPS["mips"]
-
-GROUPS["pci"]      = GROUPS["x86"] + GROUPS["mips"]
 
+# emu is a special case so many core functionality isn't needed on this platform
 GROUPS["noemu"]   = GRUB_PLATFORMS[:]; GROUPS["noemu"].remove("emu")
-GROUPS["noemu_noieee1275"] = GRUB_PLATFORMS[:]
-for i in ["emu"] + GROUPS["ieee1275"]: GROUPS["noemu_noieee1275"].remove(i)
 
-GROUPS["common"]   = GRUB_PLATFORMS[:]
+# Groups based on hardware features
+GROUPS["cmos"] = GROUPS["x86"][:] + ["mips_yeeloong"]; GROUPS["cmos"].remove("i386_efi"); GROUPS["cmos"].remove("x86_64_efi")
+GROUPS["pci"]      = GROUPS["x86"] + GROUPS["mips"]
+GROUPS["usb"]      = GROUPS["pci"]
+
+# If gfxterm is main output console integrate it into kernel
+GROUPS["videoinkernel"] = ["mips_yeeloong"]
+GROUPS["videomodules"]   = GRUB_PLATFORMS[:];
+for i in GROUPS["videoinkernel"]: GROUPS["videomodules"].remove(i)
+
+# Miscelaneous groups schedulded to disappear in future
+GROUPS["nosparc64"] = GRUB_PLATFORMS[:]; GROUPS["nosparc64"].remove("sparc64_ieee1275")
+GROUPS["i386_coreboot_multiboot_qemu"] = ["i386_coreboot", "i386_multiboot", "i386_qemu"]
+GROUPS["nopc"] = GRUB_PLATFORMS[:]; GROUPS["nopc"].remove("i386_pc")
 
 #
 # Create platform => groups reverse map, where groups covering that
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 2dd34ee78..5d13d0313 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -58,8 +58,6 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/disk.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dl.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elf.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elfload.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
@@ -70,23 +68,14 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/kernel.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/list.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/misc.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/reader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/symbol.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/types.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm_private.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
 
 if COND_i386_pc
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/biosdisk.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
@@ -103,33 +92,26 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 endif
 
 if COND_i386_coreboot
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 endif
 
 if COND_i386_multiboot
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 endif
 
 if COND_i386_qemu
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 endif
 
 if COND_i386_ieee1275
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
 endif
 
 if COND_x86_64_efi
@@ -164,15 +146,10 @@ endif
 if COND_sparc64_ieee1275
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sparc64/ieee1275/ieee1275.h
 endif
 
 if COND_emu
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/time.h
-KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/types.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gzio.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/menu.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/datetime.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/misc.h
 if COND_GRUB_EMU_SDL
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index b573ccf84..353b9d123 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -36,7 +36,8 @@ kernel = {
   x86_64_efi_startup = kern/x86_64/efi/startup.S;
   i386_qemu_startup = kern/i386/qemu/startup.S;
   i386_ieee1275_startup = kern/i386/ieee1275/startup.S;
-  i386_coreboot_multiboot_startup = kern/i386/coreboot/startup.S;
+  i386_coreboot_startup = kern/i386/coreboot/startup.S;
+  i386_multiboot_startup = kern/i386/coreboot/startup.S;
   mips_yeeloong_startup = kern/mips/startup.S;
   sparc64_ieee1275_startup = kern/sparc64/ieee1275/crt0.S;
   powerpc_ieee1275_startup = kern/powerpc/ieee1275/startup.S;
@@ -65,7 +66,12 @@ kernel = {
 
   noemu_nodist = symlist.c;
 
-  noemu_noieee1275 = kern/generic/rtc_get_time_ms.c;
+  i386_pc = kern/generic/rtc_get_time_ms.c;
+  x86_efi = kern/generic/rtc_get_time_ms.c;
+  i386_qemu = kern/generic/rtc_get_time_ms.c;
+  i386_coreboot = kern/generic/rtc_get_time_ms.c;
+  i386_multiboot = kern/generic/rtc_get_time_ms.c;
+  mips_yeeloong = kern/generic/rtc_get_time_ms.c;
 
   ieee1275 = disk/ieee1275/ofdisk.c;
   ieee1275 = kern/ieee1275/cmain.c;
@@ -74,17 +80,20 @@ kernel = {
   ieee1275 = kern/ieee1275/openfw.c;
   ieee1275 = term/ieee1275/ofconsole.c;
 
-  ieee1275_mips = term/terminfo.c;
-  ieee1275_mips = term/tparm.c;
+  ieee1275 = term/terminfo.c;
+  ieee1275 = term/tparm.c;
+  mips = term/terminfo.c;
+  mips = term/tparm.c;
 
   i386 = kern/i386/dl.c;
 
   i386_coreboot_multiboot_qemu = kern/i386/coreboot/init.c;
   i386_coreboot_multiboot_qemu = term/i386/pc/vga_text.c;
 
-  i386_pc_coreboot_multiboot_qemu = term/i386/vga_common.c;
+  i386_coreboot_multiboot_qemu = term/i386/vga_common.c;
+  i386_pc = term/i386/vga_common.c;
 
-  x86_noieee1275 = kern/i386/pit.c;
+  x86 = kern/i386/pit.c;
 
   x86_efi = disk/efi/efidisk.c;
   x86_efi = kern/efi/efi.c;
@@ -121,26 +130,13 @@ kernel = {
   mips_yeeloong = bus/bonito.c;
   mips_yeeloong = bus/cs5536.c;
   mips_yeeloong = bus/pci.c;
-  mips_yeeloong = commands/extcmd.c;
-  mips_yeeloong = font/font.c;
-  mips_yeeloong = font/font_cmd.c;
-  mips_yeeloong = io/bufio.c;
   mips_yeeloong = kern/mips/cache.S;
   mips_yeeloong = kern/mips/dl.c;
   mips_yeeloong = kern/mips/init.c;
   mips_yeeloong = kern/mips/yeeloong/init.c;
-  mips_yeeloong = lib/arg.c;
   mips_yeeloong = term/at_keyboard.c;
-  mips_yeeloong = term/gfxterm.c;
   mips_yeeloong = term/serial.c;
-  mips_yeeloong = video/bitmap.c;
-  mips_yeeloong = video/bitmap_scale.c;
-  mips_yeeloong = video/fb/fbblit.c;
-  mips_yeeloong = video/fb/fbfill.c;
-  mips_yeeloong = video/fb/fbutil.c;
-  mips_yeeloong = video/fb/video_fb.c;
   mips_yeeloong = video/sm712.c;
-  mips_yeeloong = video/video.c;
 
   powerpc_ieee1275 = kern/ieee1275/init.c;
   powerpc_ieee1275 = kern/powerpc/cache.S;
@@ -162,6 +158,20 @@ kernel = {
   emu = kern/emu/mm.c;
   emu = kern/emu/time.c;
 
+  videoinkernel = lib/arg.c;
+  videoinkernel = term/gfxterm.c;
+  videoinkernel = commands/extcmd.c;
+  videoinkernel = font/font.c;
+  videoinkernel = font/font_cmd.c;
+  videoinkernel = io/bufio.c;
+  videoinkernel = video/bitmap.c;
+  videoinkernel = video/bitmap_scale.c;
+  videoinkernel = video/fb/fbblit.c;
+  videoinkernel = video/fb/fbfill.c;
+  videoinkernel = video/fb/fbutil.c;
+  videoinkernel = video/fb/video_fb.c;
+  videoinkernel = video/video.c;
+
   extra_dist = kern/i386/realmode.S;
   extra_dist = kern/i386/pc/lzma_decode.S;
   extra_dist = kern/mips/cache_flush.S;
@@ -301,8 +311,7 @@ module = {
   noemu = bus/usb/usbtrans.c;
   noemu = bus/usb/usbhub.c;
   enable = emu;
-  enable = i386;
-  enable = mips_yeeloong;
+  enable = usb;
   emu_condition = COND_GRUB_EMU_USB;
 };
 
@@ -310,8 +319,7 @@ module = {
   name = usbserial_common;
   common = bus/usb/serial/common.c;
   enable = emu;
-  enable = i386_pc;
-  enable = mips_yeeloong;
+  enable = usb;
   emu_condition = COND_GRUB_EMU_USB;
 };
 
@@ -319,8 +327,7 @@ module = {
   name = usbserial_pl2303;
   common = bus/usb/serial/pl2303.c;
   enable = emu;
-  enable = i386_pc;
-  enable = mips_yeeloong;
+  enable = usb;
   emu_condition = COND_GRUB_EMU_USB;
 };
 
@@ -328,22 +335,20 @@ module = {
   name = usbserial_ftdi;
   common = bus/usb/serial/ftdi.c;
   enable = emu;
-  enable = i386_pc;
-  enable = mips_yeeloong;
+  enable = usb;
   emu_condition = COND_GRUB_EMU_USB;
 };
 
 module = {
   name = uhci;
   common = bus/usb/uhci.c;
-  enable = i386_pc;
+  enable = x86;
 };
 
 module = {
   name = ohci;
   common = bus/usb/ohci.c;
-  enable = i386_pc;
-  enable = mips_yeeloong;
+  enable = pci;
 };
 
 module = {
@@ -376,9 +381,8 @@ library = {
 
 module = {
   name = cmostest;
-  i386 = commands/i386/cmostest.c;
-  enable = i386_pc;
-  enable = i386_coreboot;
+  common = commands/i386/cmostest.c;
+  enable = cmos;
 };
 
 module = {
@@ -398,7 +402,7 @@ module = {
 module = {
   name = acpi;
 
-  i386 = commands/acpi.c;
+  x86 = commands/acpi.c;
   x86_efi = commands/efi/acpi.c;
   i386_pc = commands/i386/pc/acpi.c;
   i386_coreboot = commands/i386/pc/acpi.c;
@@ -504,7 +508,7 @@ module = {
   name = hdparm;
   common = commands/hdparm.c;
   common = lib/hexdump.c;
-  enable = i386_pc;
+  enable = pci;
 };
 
 module = {
@@ -549,8 +553,7 @@ module = {
   name = lspci;
   common = commands/lspci.c;
 
-  enable = x86;
-  enable = mips;
+  enable = pci;
 };
 
 module = {
@@ -662,8 +665,7 @@ module = {
 module = {
   name = usbtest;
   common = commands/usbtest.c;
-  enable = i386_pc;
-  enable = mips_yeeloong;
+  enable = usb;
   enable = emu;
   emu_condition = COND_GRUB_EMU_USB;
 };
@@ -738,15 +740,13 @@ module = {
 module = {
   name = ata;
   common = disk/ata.c;
-  enable = x86;
-  enable = mips;
+  enable = pci;
 };
 
 module = {
   name = ata_pthru;
   common = disk/ata_pthru.c;
-  enable = x86;
-  enable = mips_yeeloong;
+  enable = pci;
 };
 
 module = {
@@ -758,8 +758,7 @@ module = {
 module = {
   name = usbms;
   common = disk/usbms.c;
-  enable = i386_pc;
-  enable = mips_yeeloong;
+  enable = usb;
   enable = emu;
   emu_condition = COND_GRUB_EMU_USB;
 };
@@ -806,10 +805,7 @@ module = {
   name = font;
   common = font/font.c;
   common = font/font_cmd.c;
-  enable = emu;
-  enable = x86;
-  enable = sparc64;
-  enable = powerpc;
+  enable = videomodules;
 };
 
 module = {
@@ -977,10 +973,7 @@ module = {
 module = {
   name = bufio;
   common = io/bufio.c;
-  enable = emu;
-  enable = x86;
-  enable = sparc64;
-  enable = powerpc;
+  enable = videomodules;
 };
 
 module = {
@@ -1023,14 +1016,11 @@ module = {
 
 module = {
   name = datetime;
-  x86_noefi_mips = lib/cmos_datetime.c;
+  cmos = lib/cmos_datetime.c;
   x86_efi = lib/efi/datetime.c;
   sparc64_ieee1275 = lib/ieee1275/datetime.c;
   powerpc_ieee1275 = lib/ieee1275/datetime.c;
-  enable = x86;
-  enable = mips;
-  enable = sparc64_ieee1275;
-  enable = powerpc_ieee1275;
+  enable = noemu;
 };
 
 module = {
@@ -1129,34 +1119,15 @@ module = {
 
 module = {
   name = mmap;
-  i386_pc = mmap/mmap.c;
-  i386_pc = mmap/i386/uppermem.c;
-  i386_pc = mmap/i386/mmap.c;
+  common = mmap/mmap.c;
+  x86 = mmap/i386/uppermem.c;
+  x86 = mmap/i386/mmap.c;
+
   i386_pc = mmap/i386/pc/mmap.c;
   i386_pc = mmap/i386/pc/mmap_helper.S;
 
-  x86_efi = mmap/mmap.c;
-  x86_efi = mmap/i386/uppermem.c;
-  x86_efi = mmap/i386/mmap.c;
   x86_efi = mmap/efi/mmap.c;
 
-  i386_coreboot = mmap/mmap.c;
-  i386_coreboot = mmap/i386/uppermem.c;
-  i386_coreboot = mmap/i386/mmap.c;
-
-  i386_multiboot = mmap/mmap.c;
-  i386_multiboot = mmap/i386/uppermem.c;
-  i386_multiboot = mmap/i386/mmap.c;
-
-  i386_qemu = mmap/mmap.c;
-  i386_qemu = mmap/i386/uppermem.c;
-  i386_qemu = mmap/i386/mmap.c;
-
-  i386_ieee1275 = mmap/mmap.c;
-  i386_ieee1275 = mmap/i386/uppermem.c;
-  i386_ieee1275 = mmap/i386/mmap.c;
-
-  mips_yeeloong = mmap/mmap.c;
   mips_yeeloong = mmap/mips/yeeloong/uppermem.c;
 
   enable = x86;
@@ -1256,10 +1227,7 @@ module = {
 module = {
   name = gfxterm;
   common = term/gfxterm.c;
-  enable = emu;
-  enable = x86;
-  enable = sparc64;
-  enable = powerpc;
+  enable = videomodules;
 };
 
 module = {
@@ -1288,8 +1256,7 @@ module = {
 module = {
   name = usb_keyboard;
   common = term/usb_keyboard.c;
-  enable = i386_pc;
-  enable = mips_yeeloong;
+  enable = usb;
 };
 
 module = {
@@ -1334,19 +1301,13 @@ module = {
 module = {
   name = bitmap;
   common = video/bitmap.c;
-  enable = emu;
-  enable = x86;
-  enable = sparc64;
-  enable = powerpc;
+  enable = videomodules;
 };
 
 module = {
   name = bitmap_scale;
   common = video/bitmap_scale.c;
-  enable = emu;
-  enable = x86;
-  enable = sparc64;
-  enable = powerpc;
+  enable = videomodules;
 };
 
 module = {
@@ -1388,19 +1349,13 @@ module = {
   common = video/fb/fbblit.c;
   common = video/fb/fbfill.c;
   common = video/fb/fbutil.c;
-  enable = emu;
-  enable = x86;
-  enable = sparc64;
-  enable = powerpc;
+  enable = videomodules;
 };
 
 module = {
   name = video;
   common = video/video.c;
-  enable = emu;
-  enable = x86;
-  enable = sparc64;
-  enable = powerpc;
+  enable = videomodules;
 };
 
 module = {
diff --git a/grub-core/bus/usb/ohci.c b/grub-core/bus/usb/ohci.c
index 7f757485c..3373e8038 100644
--- a/grub-core/bus/usb/ohci.c
+++ b/grub-core/bus/usb/ohci.c
@@ -57,10 +57,10 @@ struct grub_ohci_td
   /* next values are not for OHCI HW */
   grub_uint32_t prev_td_phys; /* we need it to find previous TD
                                * physical address in CPU endian */
-  grub_uint32_t link_td; /* pointer to next free/chained TD
+  volatile struct grub_ohci_td *link_td; /* pointer to next free/chained TD
                           * pointer as uint32 */
   grub_uint32_t tr_index; /* index of TD in transfer */
-  grub_uint8_t pad[4]; /* padding to 32 bytes */
+  grub_uint8_t pad[8 - sizeof (volatile struct grub_ohci_td *)]; /* padding to 32 bytes */
 } __attribute__((packed));
 
 /* OHCI Endpoint Descriptor.  */
@@ -334,7 +334,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev,
   /* Preset free TDs chain in TDs */
   grub_memset ((void*)o->td, 0, sizeof(struct grub_ohci_td) * GRUB_OHCI_TDS);
   for (j=0; j < (GRUB_OHCI_TDS-1); j++)
-    o->td[j].link_td = (grub_uint32_t)&o->td[j+1];
+    o->td[j].link_td = &o->td[j+1];
 
   grub_dprintf ("ohci", "TDs: chunk=%p, virt=%p, phys=0x%02x\n",
                 o->td_chunk, o->td, o->td_addr);
@@ -561,7 +561,7 @@ static void
 grub_ohci_free_td (struct grub_ohci *o, grub_ohci_td_t td)
 {
   grub_memset ( (void*)td, 0, sizeof(struct grub_ohci_td) ); 
-  td->link_td = (grub_uint32_t) o->td_free; /* Cahin new free TD & rest */
+  td->link_td = o->td_free; /* Cahin new free TD & rest */
   o->td_free = td; /* Change address of first free TD */
 }
 
@@ -604,8 +604,8 @@ grub_ohci_transaction (grub_ohci_td_t td,
   grub_uint32_t buffer;
   grub_uint32_t buffer_end;
 
-  grub_dprintf ("ohci", "OHCI transaction td=%p type=%d, toggle=%d, size=%d\n",
-		td, type, toggle, size);
+  grub_dprintf ("ohci", "OHCI transaction td=%p type=%d, toggle=%d, size=%lu\n",
+		td, type, toggle, (unsigned long) size);
 
   switch (type)
     {
@@ -781,7 +781,7 @@ grub_ohci_transfer (grub_usb_controller_t dev,
         }
 
       /* Chain TDs */
-      td_current_virt->link_td = (grub_uint32_t) td_next_virt;
+      td_current_virt->link_td = td_next_virt;
       td_current_virt->next_td = grub_cpu_to_le32 (
                                    grub_ohci_td_virt2phys (o,
                                      td_next_virt) );
diff --git a/grub-core/bus/usb/uhci.c b/grub-core/bus/usb/uhci.c
index 0bba24b54..1fe86f5d4 100644
--- a/grub-core/bus/usb/uhci.c
+++ b/grub-core/bus/usb/uhci.c
@@ -228,7 +228,7 @@ grub_uhci_pci_iter (grub_pci_device_t dev,
   /* Link all Transfer Descriptors in a list of available Transfer
      Descriptors.  */
   for (i = 0; i < 256; i++)
-    u->td[i].linkptr = (grub_uint32_t) &u->td[i + 1];
+    u->td[i].linkptr = (grub_uint32_t) (grub_addr_t) &u->td[i + 1];
   u->td[255 - 1].linkptr = 0;
   u->tdfree = u->td;
 
@@ -238,20 +238,20 @@ grub_uhci_pci_iter (grub_pci_device_t dev,
   /* Setup the frame list pointers.  Since no isochronous transfers
      are and will be supported, they all point to the (same!) queue
      head.  */
-  fp = (grub_uint32_t) u->qh & (~15);
+  fp = (grub_uint32_t) (grub_addr_t) u->qh & (~15);
   /* Mark this as a queue head.  */
   fp |= 2;
   for (i = 0; i < 1024; i++)
     u->framelist[i] = fp;
   /* Program the framelist address into the UHCI controller.  */
   grub_uhci_writereg32 (u, GRUB_UHCI_REG_FLBASEADD,
-			(grub_uint32_t) u->framelist);
+			(grub_uint32_t) (grub_addr_t) u->framelist);
 
   /* Make the Queue Heads point to each other.  */
   for (i = 0; i < 256; i++)
     {
       /* Point to the next QH.  */
-      u->qh[i].linkptr = (grub_uint32_t) (&u->qh[i + 1]) & (~15);
+      u->qh[i].linkptr = (grub_uint32_t) (grub_addr_t) (&u->qh[i + 1]) & (~15);
 
       /* This is a QH.  */
       u->qh[i].linkptr |= GRUB_UHCI_LINK_QUEUE_HEAD;
@@ -319,7 +319,7 @@ grub_alloc_td (struct grub_uhci *u)
     return NULL;
 
   ret = u->tdfree;
-  u->tdfree = (grub_uhci_td_t) u->tdfree->linkptr;
+  u->tdfree = (grub_uhci_td_t) (grub_addr_t) u->tdfree->linkptr;
 
   return ret;
 }
@@ -327,7 +327,7 @@ grub_alloc_td (struct grub_uhci *u)
 static void
 grub_free_td (struct grub_uhci *u, grub_uhci_td_t td)
 {
-  td->linkptr = (grub_uint32_t) u->tdfree;
+  td->linkptr = (grub_uint32_t) (grub_addr_t) u->tdfree;
   u->tdfree = td;
 }
 
@@ -352,7 +352,7 @@ grub_free_queue (struct grub_uhci *u, grub_uhci_td_t td,
       
       /* Unlink the queue.  */
       tdprev = td;
-      td = (grub_uhci_td_t) td->linkptr2;
+      td = (grub_uhci_td_t) (grub_addr_t) td->linkptr2;
 
       /* Free the TD.  */
       grub_free_td (u, tdprev);
@@ -413,8 +413,8 @@ grub_uhci_transaction (struct grub_uhci *u, unsigned int endp,
     }
 
   grub_dprintf ("uhci",
-		"transaction: endp=%d, type=%d, addr=%d, toggle=%d, size=%d data=0x%x td=%p\n",
-		endp, type, addr, toggle, size, data, td);
+		"transaction: endp=%d, type=%d, addr=%d, toggle=%d, size=%lu data=0x%x td=%p\n",
+		endp, type, addr, toggle, (unsigned long) size, data, td);
 
   /* Don't point to any TD, just terminate.  */
   td->linkptr = 1;
@@ -484,8 +484,8 @@ grub_uhci_transfer (grub_usb_controller_t dev,
 	td_first = td;
       else
 	{
-	  td_prev->linkptr2 = (grub_uint32_t) td;
-	  td_prev->linkptr = (grub_uint32_t) td;
+	  td_prev->linkptr2 = (grub_uint32_t) (grub_addr_t) td;
+	  td_prev->linkptr = (grub_uint32_t) (grub_addr_t) td;
 	  td_prev->linkptr |= 4;
 	}
       td_prev = td;
@@ -497,7 +497,7 @@ grub_uhci_transfer (grub_usb_controller_t dev,
 
   /* Link it into the queue and terminate.  Now the transaction can
      take place.  */
-  qh->elinkptr = (grub_uint32_t) td_first;
+  qh->elinkptr = (grub_uint32_t) (grub_addr_t) td_first;
 
   grub_dprintf ("uhci", "initiate transaction\n");
 
@@ -508,7 +508,7 @@ grub_uhci_transfer (grub_usb_controller_t dev,
     {
       grub_uhci_td_t errtd;
 
-      errtd = (grub_uhci_td_t) (qh->elinkptr & ~0x0f);
+      errtd = (grub_uhci_td_t) (grub_addr_t) (qh->elinkptr & ~0x0f);
 
       grub_dprintf ("uhci", ">t status=0x%02x data=0x%02x td=%p\n",
 		    errtd->ctrl_status, errtd->buffer & (~15), errtd);
diff --git a/grub-core/bus/usb/usbtrans.c b/grub-core/bus/usb/usbtrans.c
index db2ec097a..13f5c28ed 100644
--- a/grub-core/bus/usb/usbtrans.c
+++ b/grub-core/bus/usb/usbtrans.c
@@ -54,8 +54,8 @@ grub_usb_control_msg (grub_usb_device_t dev,
   grub_memcpy ((char *) data, data_in, size);
 
   grub_dprintf ("usb",
-		"control: reqtype=0x%02x req=0x%02x val=0x%02x idx=0x%02x size=%d\n",
-		reqtype, request,  value, index, size);
+		"control: reqtype=0x%02x req=0x%02x val=0x%02x idx=0x%02x size=%lu\n",
+		reqtype, request,  value, index, (unsigned long)size);
 
   /* Create a transfer.  */
   transfer = grub_malloc (sizeof (*transfer));
@@ -179,7 +179,8 @@ grub_usb_bulk_readwrite (grub_usb_device_t dev,
   struct grub_pci_dma_chunk *data_chunk;
   grub_size_t size = size0;
 
-  grub_dprintf ("usb", "bulk: size=0x%02x type=%d\n", size, type);
+  grub_dprintf ("usb", "bulk: size=0x%02lx type=%d\n", (unsigned long) size,
+		type);
 
   /* FIXME: avoid allocation any kind of buffer in a first place.  */
   data_chunk = grub_memalign_dma32 (128, size);
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
index 1e34b6c85..0719cfb26 100644
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -34,7 +34,7 @@
 #include <grub/mm.h>
 #include <grub/cpu/relocator.h>
 #include <grub/video.h>
-#include <grub/floppy.h>
+#include <grub/i386/floppy.h>
 
 #define GRUB_LINUX_CL_OFFSET		0x9000
 #define GRUB_LINUX_CL_END_OFFSET	0x90FF
diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
index 643a895e8..556f1dbf1 100644
--- a/grub-core/loader/i386/xnu.c
+++ b/grub-core/loader/i386/xnu.c
@@ -123,7 +123,6 @@ static grub_uint64_t
 guessfsb (void)
 {
   const grub_uint64_t sane_value = 100000000;
-#ifndef GRUB_MACHINE_IEEE1275
   grub_uint32_t manufacturer[3], max_cpuid, capabilities, msrlow;
   grub_uint64_t start_tsc;
   grub_uint64_t end_tsc;
@@ -209,9 +208,6 @@ guessfsb (void)
 
   return grub_divmod64 (2000 * tsc_ticks_per_ms,
 			((msrlow >> 7) & 0x3e) + ((msrlow >> 14) & 1), 0);
-#else
-  return sane_value;
-#endif
 }
 
 struct property_descriptor

From 949737be16d6e2381497c24c432c45430615aebf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Aug 2010 16:25:14 +0200
Subject: [PATCH 1492/1628] Fix alignment and add explicit assert for td and ed
 size

---
 grub-core/bus/usb/ohci.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/grub-core/bus/usb/ohci.c b/grub-core/bus/usb/ohci.c
index 3373e8038..587a36420 100644
--- a/grub-core/bus/usb/ohci.c
+++ b/grub-core/bus/usb/ohci.c
@@ -55,10 +55,10 @@ struct grub_ohci_td
   grub_uint32_t next_td; /* LittleEndian physical address */
   grub_uint32_t buffer_end; /* LittleEndian physical address */
   /* next values are not for OHCI HW */
-  grub_uint32_t prev_td_phys; /* we need it to find previous TD
-                               * physical address in CPU endian */
   volatile struct grub_ohci_td *link_td; /* pointer to next free/chained TD
                           * pointer as uint32 */
+  grub_uint32_t prev_td_phys; /* we need it to find previous 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 */
 } __attribute__((packed));
@@ -1406,6 +1406,8 @@ static struct grub_usb_controller_dev usb_controller =
 
 GRUB_MOD_INIT(ohci)
 {
+  COMPILE_TIME_ASSERT (sizeof (struct grub_ohci_td) == 32);
+  COMPILE_TIME_ASSERT (sizeof (struct grub_ohci_ed) == 16);
   grub_ohci_inithw ();
   grub_usb_controller_dev_register (&usb_controller);
   grub_loader_register_preboot_hook (grub_ohci_fini_hw, grub_ohci_restore_hw,

From b0ea3a5a93c3ec4eaef2b4bd5fb3126b5b0cae1c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Aug 2010 16:25:39 +0200
Subject: [PATCH 1493/1628] Add missing noreturn

---
 include/grub/misc.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/grub/misc.h b/include/grub/misc.h
index c516b3dc2..774dc5843 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -321,9 +321,9 @@ void EXPORT_FUNC (grub_reboot) (void) __attribute__ ((noreturn));
 #ifdef GRUB_MACHINE_PCBIOS
 /* Halt the system, using APM if possible. If NO_APM is true, don't
  * use APM even if it is available.  */
-void grub_halt (int no_apm);
+void grub_halt (int no_apm) __attribute__ ((noreturn));
 #else
-void grub_halt (void);
+void grub_halt (void) __attribute__ ((noreturn));
 #endif
 
 #ifdef GRUB_MACHINE_EMU

From 0f40441b91d1c993fddde8b6b51b0d566547cbf0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Aug 2010 16:26:05 +0200
Subject: [PATCH 1494/1628] Remove useless prototypes

---
 include/grub/i386/pc/biosdisk.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/grub/i386/pc/biosdisk.h b/include/grub/i386/pc/biosdisk.h
index 69a240a2e..f8a9b463f 100644
--- a/include/grub/i386/pc/biosdisk.h
+++ b/include/grub/i386/pc/biosdisk.h
@@ -106,7 +106,4 @@ struct grub_biosdisk_dap
   grub_uint64_t block;
 } __attribute__ ((packed));
 
-void grub_biosdisk_init (void);
-void grub_biosdisk_fini (void);
-
 #endif /* ! GRUB_BIOSDISK_MACHINE_HEADER */

From 9494ef9aaf5b98466e347a192296deedb79c0a12 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Aug 2010 16:28:01 +0200
Subject: [PATCH 1495/1628] Add ChangeLog

---
 ChangeLog | 230 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 228 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b15fc7fe7..e52a07849 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,10 +2,236 @@
 
 	Interrupt wrapping and code simplifications.
 
+	* Makefile.util.def (grub-mkrescue): Use x86 tg instead of
+	x86_noieee1275 which are functionaly equivalent in this case.
+	(grub-install): Make source on each platform explicit. Enable on
+	all noemu.
+	* gentpl.py (x86_efi_pc): Removed group.
+	(x86_noefi): Likewise.
+	(i386_noefi): Likewise.
+	(x86_noieee1275): Likewise.
+	(i386_noieee1275): Likewise.
+	(i386_noefi_noieee1275): Likewise.
+	(i386_pc_qemu_coreboot): Likewise.
+	(i386_coreboot_multiboot): Likewise.
+	(i386_pc_coreboot_multiboot_qemu): Likewise.
+	(x86_noefi_mips): Likewise.
+	(noieee1275): Likewise.
+	(ieee1275_mips): Likewise.
+	(noemu_noieee1275): Likewise.
+	(cmos): New group.
+	(usb): Likewise.
+	(videoinkernel): Likewise.
+	(videomodules): Likewise.
 	* grub-core/Makefile.am (KERNEL_HEADER_FILES): Remove
-	include/grub/machine/vga.h, include/grub/machine/vbe.h,
+	include/grub/elf.h, include/grub/elfload.h, include/grub/net.h,
+	include/grub/reader.h, include/grub/symbol.h, include/grub/types.h,
+	include/grub/loader.h, include/grub/msdos_partition.h,
+	include/grub/machine/biosdisk.h, include/grub/machine/boot.h,
+	include/grub/machine/console.h, include/grub/machine/vga.h,
+	include/grub/machine/vbe.h, include/grub/machine/init.h,
+	include/grub/machine/kernel.h, include/grub/cpu/time.h,
+	include/grub/cpu/types.h, include/grub/gzio.h and include/grub/menu.h
 	(KERNEL_HEADER_FILES) [i386-pc]: Add include/grub/machine/int.h.
-	Remove include/grub/machine/init.h.
+	(KERNEL_HEADER_FILES) [i386-ieee1275]: Add include/grub/i386/pit.h
+	* grub-core/Makefile.core.def (kernel): Explicit the source for
+	startup. Explicit the platforms using kern/generic/rtc_get_time_ms.c.
+	Split ieee1275_mips. Remove kern/i386/halt.c. Remove kern/i386/misc.S.
+	Enable kern/i386/pit.c on all x86. Remove kern/i386/ieee1275/init.c.
+	Use videoinkernel tag.
+	(usb): Enable on all usb.
+	(usbserial_common): Likewise.
+	(usbserial_pl2303): Likewise.
+	(usbserial_ftdi): Likewise.
+	(uhci): Enable on all x86.
+	(ohci): Enable on all pci.
+	(cmostest): Enable on all CMOS.
+	(acpi): Include commands/acpi.c on all platforms.
+	(halt): Add relevant lib/*/halt.c.
+	(hdparm): Enable on all pci.
+	(lspci): Likewise.
+	(usbtest): Enable on all usb.
+	(ata): Enable on all pci.
+	(ata_pthru): Likewise.
+	(usbms): Enable on all usb.
+	(usb_keyboard): Likewise.
+	(font): Use tag videomodules.
+	(bufio): Likewise.
+	(datetime): Use tag cmos. Enable on all noemu.
+	(mmap): Use tags common and x86.
+	(gfxterm): Use tag videomodules.
+	(bitmap): Likewise.
+	(bitmap_scale): Likewise.
+	(video_fb): Likewise.
+	(video): Likewise.
+	* grub-core/bus/usb/ohci.c (grub_ohci_td): Make link_td a pointer and
+	adjust padding accordingly. All users updated.
+	(grub_ohci_transaction): Fix bad format specification.
+	(GRUB_MOD_INIT): Add asserts for struct size.
+	* grub-core/bus/usb/uhci.c (grub_uhci_pci_iter): Add explicit casts.
+	(grub_alloc_td): Likewise.
+	(grub_free_queue): Likewise.
+	(grub_uhci_transfer): Likewise.
+	(grub_uhci_transaction): Fix bad format specification.
+	* grub-core/bus/usb/usbtrans.c (grub_usb_control_msg): Likewise.
+	(grub_usb_bulk_readwrite): Likewise.
+	* grub-core/kern/i386/misc.S (grub_stop): Moved from here ...
+	* grub-core/commands/i386/pc/halt.c (stop): ...here. Transformed into C.
+	Made static.
+	* grub-core/lib/i386/halt.c (stop): ... and here. Transformed into C.
+	Made static.
+	* grub-core/kern/i386/pc/startup.S (grub_halt): Moved from here ...
+	* grub-core/commands/i386/pc/halt.c (grub_halt): ...here.
+	Transformed into C.
+	* grub-core/kern/i386/pc/startup.S (grub_biosdisk_rw_int13_extensions):
+	Moved from here ...
+	* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_rw_int13_extensions):
+	... here. Transformed into C. Made static.
+	* grub-core/kern/i386/pc/startup.S (grub_biosdisk_rw_standard):
+	Moved from here ...
+	* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_rw_standard):
+	... here. Transformed into C. Made static.
+	* grub-core/kern/i386/pc/startup.S
+	(grub_biosdisk_check_int13_extensions): Moved from here ...
+	* grub-core/disk/i386/pc/biosdisk.c
+	(grub_biosdisk_check_int13_extensions): ... here. Transformed into C.
+	Made static.
+	* grub-core/kern/i386/pc/startup.S
+	(grub_biosdisk_get_cdinfo_int13_extensions): Moved from here ...
+	* grub-core/disk/i386/pc/biosdisk.c
+	(grub_biosdisk_get_cdinfo_int13_extensions): ... here.
+	Transformed into C. Made static.
+	* grub-core/kern/i386/pc/startup.S
+	(grub_biosdisk_get_diskinfo_int13_extensions): Moved from here ...
+	* grub-core/disk/i386/pc/biosdisk.c
+	(grub_biosdisk_get_diskinfo_int13_extensions): ... here.
+	Transformed into C. Made static.
+	* grub-core/kern/i386/pc/startup.S
+	(grub_biosdisk_get_diskinfo_standard): Moved from here ...
+	* grub-core/disk/i386/pc/biosdisk.c
+	(grub_biosdisk_get_diskinfo_standard): ... here.
+	Transformed into C. Made static.
+	* grub-core/kern/i386/pc/startup.S
+	(grub_biosdisk_get_num_floppies): Moved from here ...
+	* grub-core/disk/i386/pc/biosdisk.c
+	(grub_biosdisk_get_num_floppies): ... here.
+	Transformed into C. Made static.
+	* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_get_diskinfo_real):
+	New function.
+	* grub-core/kern/i386/pc/startup.S (grub_pxe_scan): Moved from here ...
+	* grub-core/fs/i386/pc/pxe.c (grub_pxe_scan): ... here.
+	Transformed into C. Made static.
+	* grub-core/kern/i386/pc/startup.S (grub_rm_entry): Moved from here ...
+	* grub-core/fs/i386/pc/pxe.c (grub_rm_entry): ... here.
+	Transformed into C. Made static.
+	* grub-core/kern/i386/ieee1275/init.c: Removed.
+	* grub-core/kern/i386/misc.S: Likewise.
+	* grub-core/kern/i386/pc/startup.S (grub_get_memsize):
+	Splitted from here ...
+	* grub-core/kern/i386/pc/init.c (grub_get_conv_memsize): ... here.
+	Transformed into C. Made static. All users updated.
+	* grub-core/kern/i386/pc/mmap.c (grub_get_ext_memsize): ... and here.
+	Transformed into C. Made static. All users updated.
+	* grub-core/kern/i386/pc/startup.S (grub_get_eisa_mmap):
+	Moved from here...
+	* grub-core/kern/i386/pc/mmap.c (grub_get_eisa_mmap): ... here.
+	Transformed into C. Made static. All users updated.
+	* grub-core/kern/i386/pc/startup.S (grub_get_mmap_entry):
+	Moved from here...
+	* grub-core/kern/i386/pc/mmap.c (grub_get_mmap_entry): ... here.
+	Transformed into C. Made static. All users updated.
+	* grub-core/kern/i386/pc/startup.S (grub_stop_floppy):
+	Removed (replaced by C version).
+	* grub-core/kern/i386/pc/startup.S (grub_vga_set_mode):
+	Moved from here...
+	* grub-core/video/i386/pc/vga.c (grub_vga_set_mode): ...here.
+	Transformed into C. Made static.
+	* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_controller_info):
+	Moved from here...
+	* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_controller_info):
+	... here. Transformed into C.
+	* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_mode_info):
+	Moved from here...
+	* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_mode_info):
+	... here. Transformed into C.
+	* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_set_mode):
+	Moved from here...
+	* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_set_mode):
+	... here. Transformed into C. Made static.
+	* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_mode):
+	Moved from here...
+	* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_mode):
+	... here. Transformed into C.
+	* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_getset_dac_palette_width):
+	Moved from here...
+	* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_getset_dac_palette_width):
+	... here. Transformed into C.
+	* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_set_memory_window):
+	Moved from here...
+	* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_set_memory_window):
+	... here. Transformed into C.
+	* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_memory_window):
+	Moved from here...
+	* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_memory_window):
+	... here. Transformed into C.
+	* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_set_scanline_length):
+	Moved from here...
+	* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_set_scanline_length):
+	... here. Transformed into C.
+	* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_scanline_length):
+	Moved from here...
+	* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_scanline_length):
+	... here. Transformed into C.
+	* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_set_display_start):
+	Moved from here...
+	* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_set_display_start):
+	... here. Transformed into C. Made static.
+	* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_get_display_start):
+	Moved from here...
+	* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_get_display_start):
+	... here. Transformed into C. Made static.
+	* grub-core/kern/i386/pc/startup.S (grub_vbe_bios_set_palette_data):
+	Moved from here...
+	* grub-core/video/i386/pc/vbe.c (grub_vbe_bios_set_palette_data):
+	... here. Transformed into C. Made static.
+	* grub-core/kern/i386/pc/startup.S (grub_pxe_call): Receive
+	pxe_rm_entry as third argument.
+	(grub_bios_interrupt): New function.
+	* grub-core/kern/i386/qemu/mmap.c: Remove useless include.
+	* grub-core/kern/i386/qemu/startup.S (codestart): Do cli;hlt instead
+	of calling grub_stop.
+	* grub-core/kern/efi/efi.c (grub_halt): Moved from here ...
+	* grub-core/lib/efi/halt.c (grub_halt): ...here.
+	* grub-core/kern/emu/main.c (grub_halt): Moved from here ...
+	* grub-core/lib/emu/halt.c (grub_halt): ... here.
+	* grub-core/lib/i386/halt.c: Moved from here ...
+	* grub-core/lib/i386/halt.c: ... here.
+	* grub-core/kern/ieee1275/openfw.c (grub_halt): Moved from here ...
+	* grub-core/lib/ieee1275/halt.c (grub_halt): ... here.
+	* grub-core/loader/i386/pc/linux.c (grub_linux16_boot): Call
+	grub_stop_floppy.
+	* grub-core/loader/i386/xnu.c (guessfsb) [IEEE1275]: Enable.
+	* include/grub/i386/coreboot/init.h: Removed.
+	* include/grub/i386/multiboot/init.h: Likewise.
+	* include/grub/i386/pc/biosdisk.h: Removed all function prototypes.
+	* include/grub/i386/pc/init.h: Likewise except grub_gate_a20.
+	* include/grub/i386/pc/int.h: New file.
+	* include/grub/i386/pc/pxe.h (GRUB_PXE_SIGNATURE): New definition.
+	(grub_pxe_scan): Removed.
+	(grub_pxe_call): Update prototype.
+	* include/grub/i386/pc/vbe.h: Removed EXPORT_FUNC and useless
+	prototypes.
+	* include/grub/i386/pc/vga.h (grub_vga_set_mode): Removed.
+	* include/grub/i386/qemu/init.h: Removed.
+	* include/grub/mips/yeeloong/kernel.h (grub_reboot): Add missing
+	noreturn.
+	(grub_halt): Likewise.
+	* include/grub/misc.h (grub_halt): Removed EXPORT_FUNC.
+	(grub_reboot): Likewise.
+	* grub-core/kern/i386/coreboot/init.c (grub_stop_floppy): Moved from here...
+	* include/grub/i386/floppy.h (grub_stop_floppy): ...here. Inlined.
+
+	* grub-core/kern/i386/pc/startup.S (grub_hard_stop)
 
 2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
 

From 11721d192661d14be0b994662b4be73639d4a2c9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 30 Aug 2010 20:23:04 +0200
Subject: [PATCH 1496/1628] 	Remove leftover embedding of font objects.

	* include/grub/kernel.h (OBJ_TYPE_FONT): Removed.
	* util/grub-install.in (font): Removed.
	* util/grub-mkimage.c (generate_image): Remove font support. All users
	updated.
---
 ChangeLog             |  9 +++++++++
 include/grub/kernel.h |  3 +--
 util/grub-install.in  | 13 ++++---------
 util/grub-mkimage.c   | 34 +++-------------------------------
 4 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d3519b139..fe07a5a31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,15 @@
 	* conf/Makefile.common (CPPFLAGS_DEFAULT): Remove leading / from
 	dprintf output.
 
+2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Remove leftover embedding of font objects.
+
+	* include/grub/kernel.h (OBJ_TYPE_FONT): Removed.
+	* util/grub-install.in (font): Removed.
+	* util/grub-mkimage.c (generate_image): Remove font support. All users
+	updated.
+
 2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* docs/grub.texi (Network): Fix reference to pxe_blksize.
diff --git a/include/grub/kernel.h b/include/grub/kernel.h
index fed875db1..2ecc73df4 100644
--- a/include/grub/kernel.h
+++ b/include/grub/kernel.h
@@ -26,8 +26,7 @@ enum
 {
   OBJ_TYPE_ELF,
   OBJ_TYPE_MEMDISK,
-  OBJ_TYPE_CONFIG,
-  OBJ_TYPE_FONT
+  OBJ_TYPE_CONFIG
 };
 
 /* The module header.  */
diff --git a/util/grub-install.in b/util/grub-install.in
index 4a5b5a1c3..e6521f069 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -30,7 +30,6 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 target_cpu=@target_cpu@
 platform=@platform@
 host_os=@host_os@
-font=@datadir@/@PACKAGE_TARNAME@/ascii.pf2
 pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
 localedir=@datadir@/locale
 
@@ -84,11 +83,6 @@ if [ "${target_cpu}-${platform}" = "i386-pc" ] ; then
     cat <<EOF
   --disk-module=MODULE    disk module to use
 EOF
-fi
-if [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
-    cat <<EOF
-  --font=FILE             font file to use
-EOF
 fi
     cat <<EOF
 
@@ -134,10 +128,11 @@ do
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
 
+# Accept and ignore for compatibility
     --font)
-	font=`argument $option "$@"`; shift;;
+        shift;;
     --font=*)
-	font=`echo "$option" | sed 's/--font=//'` ;;
+	;;
 
     --root-directory)
 	rootdir=`argument $option "$@"`; shift;;
@@ -415,7 +410,7 @@ if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}"
     $grub_setup ${setup_verbose} ${setup_force} --directory=${grubdir} --device-map=${device_map} \
         ${install_device} || exit 1
 elif [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then
-    $grub_mkimage ${config_opt} -f ${font} -d ${pkglibdir} -O ${mkimage_target} --output=/boot/grub.elf --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
+    $grub_mkimage ${config_opt} -d ${pkglibdir} -O ${mkimage_target} --output=/boot/grub.elf --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 else
     $grub_mkimage -O ${mkimage_target} ${config_opt} -d ${pkglibdir} --output=/boot/multiboot.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 fi
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 38c530b91..0e82afae9 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -507,12 +507,12 @@ struct fixup_block_list
 
 static void
 generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
-		char *memdisk_path, char *font_path, char *config_path,
+		char *memdisk_path, char *config_path,
 		struct image_target_desc *image_target, int note)
 {
   char *kernel_img, *core_img;
   size_t kernel_size, total_module_size, core_size, exec_size;
-  size_t memdisk_size = 0, font_size = 0, config_size = 0, config_size_pure = 0;
+  size_t memdisk_size = 0, config_size = 0, config_size_pure = 0;
   char *kernel_path;
   size_t offset;
   struct grub_util_path_list *path_list, *p, *next;
@@ -536,12 +536,6 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       total_module_size += memdisk_size + sizeof (struct grub_module_header);
     }
 
-  if (font_path)
-    {
-      font_size = ALIGN_ADDR (grub_util_get_image_size (font_path));
-      total_module_size += font_size + sizeof (struct grub_module_header);
-    }
-
   if (config_path)
     {
       config_size_pure = grub_util_get_image_size (config_path) + 1;
@@ -625,20 +619,6 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
       offset += memdisk_size;
     }
 
-  if (font_path)
-    {
-      struct grub_module_header *header;
-
-      header = (struct grub_module_header *) (kernel_img + offset);
-      memset (header, 0, sizeof (struct grub_module_header));
-      header->type = grub_host_to_target32 (OBJ_TYPE_FONT);
-      header->size = grub_host_to_target32 (font_size + sizeof (*header));
-      offset += sizeof (*header);
-
-      grub_util_load_image (font_path, kernel_img + offset);
-      offset += font_size;
-    }
-
   if (config_path)
     {
       struct grub_module_header *header;
@@ -1241,7 +1221,6 @@ Make a bootable image of GRUB.\n\
   -d, --directory=DIR     use images and modules under DIR [default=%s/@platform@]\n\
   -p, --prefix=DIR        set grub_prefix directory [default=%s]\n\
   -m, --memdisk=FILE      embed FILE as a memdisk image\n\
-  -f, --font=FILE         embed FILE as a boot font\n\
   -c, --config=FILE       embed FILE as boot config\n\
   -n, --note              add NOTE segment for CHRP Open Firmware\n\
   -o, --output=FILE       output a generated image to FILE [default=stdout]\n\
@@ -1330,13 +1309,6 @@ main (int argc, char *argv[])
 	    prefix = xstrdup ("(memdisk)/boot/grub");
 	    break;
 
-	  case 'f':
-	    if (font)
-	      free (font);
-
-	    font = xstrdup (optarg);
-	    break;
-
 	  case 'c':
 	    if (config)
 	      free (config);
@@ -1401,7 +1373,7 @@ main (int argc, char *argv[])
     }
 
   generate_image (dir, prefix ? : DEFAULT_DIRECTORY, fp,
-		  argv + optind, memdisk, font, config,
+		  argv + optind, memdisk, config,
 		  image_target, note);
 
   fclose (fp);

From 215dd4716e448d47777c3f4484c7958bf2fab9b8 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Mon, 30 Aug 2010 21:55:10 +0200
Subject: [PATCH 1497/1628] 2010-08-30  Robert Millan  <rmh@gnu.org>

	* NEWS: Document addition of ZFS support in `grub-install' and
	`grub-mkconfig'.
---
 ChangeLog | 5 +++++
 NEWS      | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index fe07a5a31..aa4eed058 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-30  Robert Millan  <rmh@gnu.org>
+
+	* NEWS: Document addition of ZFS support in `grub-install' and
+	`grub-mkconfig'.
+
 2010-08-30  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* conf/Makefile.common (CPPFLAGS_DEFAULT): Remove leading / from
diff --git a/NEWS b/NEWS
index 1e3334f18..e16504342 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+New in 1.99:
+
+* ZFS support in `grub-install' and `grub-mkconfig'.  Note: complete
+  functionality requires external ZFS implementation (available from
+  grub-extras).
+
 New in 1.98 - 2010-03-06:
 
 * Multiboot on EFI support.

From 1782b135e50c7bf98b348ef4e02d9833d738ae2b Mon Sep 17 00:00:00 2001
From: Tristan Gingold <gingold@free.fr>
Date: Wed, 1 Sep 2010 01:05:32 +0200
Subject: [PATCH 1498/1628] 	* commands/lsacpi.c: New file. 	*
 grub-core/Makefile.core.def (lsacpi): New module. 	* include/grub/acpi.h
 (GRUB_ACPI_FADT_SIGNATURE): New definition. 	(GRUB_ACPI_MADT_SIGNATURE):
 Likewise. 	(grub_acpi_madt_entry_header): New struct. 
 (grub_acpi_madt): Likewise. 	(grub_acpi_madt_entry_interrupt_override):
 Likewise. 	(grub_acpi_madt_entry_sapic): Likewise. 
 (grub_acpi_madt_entry_lsapic): Likewise. 
 (grub_acpi_madt_entry_platform_int_source): Likewise. 	* include/grub/types.h
 (PRIxGRUB_UINT32_T): New definition. 	(PRIuGRUB_UINT32_T): Likewise. 
 (PRIxGRUB_UINT64_T): Likewise.

	Also-By: Robert Millan <rmh.grub@aybabtu.com>

	Also-By: Vladimir Serbinenko <phcoder@gmail.com>
---
 ChangeLog.gingold1          |  17 +++
 grub-core/Makefile.core.def |  13 +-
 grub-core/commands/acpi.c   |   4 +-
 grub-core/commands/lsacpi.c | 250 ++++++++++++++++++++++++++++++++++++
 include/grub/acpi.h         |  73 +++++++++++
 include/grub/types.h        |   4 +
 6 files changed, 358 insertions(+), 3 deletions(-)
 create mode 100644 ChangeLog.gingold1
 create mode 100644 grub-core/commands/lsacpi.c

diff --git a/ChangeLog.gingold1 b/ChangeLog.gingold1
new file mode 100644
index 000000000..b2bef5d0c
--- /dev/null
+++ b/ChangeLog.gingold1
@@ -0,0 +1,17 @@
+2008-01-28  Tristan Gingold  <gingold@free.fr>
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+2010-08-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* commands/lsacpi.c: New file.
+	* grub-core/Makefile.core.def (lsacpi): New module.
+	* include/grub/acpi.h (GRUB_ACPI_FADT_SIGNATURE): New definition.
+	(GRUB_ACPI_MADT_SIGNATURE): Likewise.
+	(grub_acpi_madt_entry_header): New struct.
+	(grub_acpi_madt): Likewise.
+	(grub_acpi_madt_entry_interrupt_override): Likewise.
+	(grub_acpi_madt_entry_sapic): Likewise.
+	(grub_acpi_madt_entry_lsapic): Likewise.
+	(grub_acpi_madt_entry_platform_int_source): Likewise.
+	* include/grub/types.h (PRIxGRUB_UINT32_T): New definition.
+	(PRIuGRUB_UINT32_T): Likewise.
+	(PRIxGRUB_UINT64_T): Likewise.
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 353b9d123..6f116770e 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -402,7 +402,7 @@ module = {
 module = {
   name = acpi;
 
-  x86 = commands/acpi.c;
+  common = commands/acpi.c;
   x86_efi = commands/efi/acpi.c;
   i386_pc = commands/i386/pc/acpi.c;
   i386_coreboot = commands/i386/pc/acpi.c;
@@ -414,6 +414,17 @@ module = {
   enable = i386_multiboot;
 };
 
+module = {
+  name = lsacpi;
+
+  common = commands/lsacpi.c;
+
+  enable = x86_efi;
+  enable = i386_pc;
+  enable = i386_coreboot;
+  enable = i386_multiboot;
+};
+
 module = {
   name = blocklist;
   common = commands/blocklist.c;
diff --git a/grub-core/commands/acpi.c b/grub-core/commands/acpi.c
index 884ddf000..016e6fd9c 100644
--- a/grub-core/commands/acpi.c
+++ b/grub-core/commands/acpi.c
@@ -325,7 +325,7 @@ setup_common_tables (void)
 
       /* If it's FADT correct DSDT and FACS addresses. */
       fadt = (struct grub_acpi_fadt *) cur->addr;
-      if (grub_memcmp (fadt->hdr.signature, "FACP",
+      if (grub_memcmp (fadt->hdr.signature, GRUB_ACPI_FADT_SIGNATURE,
 		       sizeof (fadt->hdr.signature)) == 0)
 	{
 	  fadt->dsdt_addr = PTR_TO_UINT32 (table_dsdt);
@@ -529,7 +529,7 @@ grub_cmd_acpi (struct grub_extcmd *cmd,
 	      struct grub_acpi_fadt *fadt = (struct grub_acpi_fadt *) curtable;
 
 	      /* Set root header variables to the same values
-		 as FACP by default. */
+		 as FADT by default. */
 	      grub_memcpy (&root_oemid, &(fadt->hdr.oemid),
 			   sizeof (root_oemid));
 	      grub_memcpy (&root_oemtable, &(fadt->hdr.oemtable),
diff --git a/grub-core/commands/lsacpi.c b/grub-core/commands/lsacpi.c
new file mode 100644
index 000000000..d20b80fed
--- /dev/null
+++ b/grub-core/commands/lsacpi.c
@@ -0,0 +1,250 @@
+/* acpi.c  - Display acpi tables.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/misc.h>
+#include <grub/normal.h>
+#include <grub/acpi.h>
+#include <grub/extcmd.h>
+#include <grub/i18n.h>
+#include <grub/dl.h>
+
+static void
+print_strn (grub_uint8_t *str, grub_size_t len)
+{
+  for (; *str && len; str++, len--)
+    grub_printf ("%c", *str);
+  for (len++; len; len--)
+    grub_printf (" ");  
+}
+
+#define print_field(x) print_strn(x, sizeof (x))
+
+static void
+disp_acpi_table (struct grub_acpi_table_header *t)
+{
+  print_field (t->signature);
+  grub_printf ("%4" PRIuGRUB_UINT32_T "B rev=%u OEM=", t->length, t->revision);
+  print_field (t->oemid);
+  print_field (t->oemtable);
+  grub_printf ("OEMrev=%08" PRIxGRUB_UINT32_T " ", t->oemrev);
+  print_field (t->creator_id);
+  grub_printf (" %08" PRIxGRUB_UINT32_T "\n", t->creator_rev);
+}
+
+static void
+disp_madt_table (struct grub_acpi_madt *t)
+{
+  struct grub_acpi_madt_entry_header *d;
+  grub_uint32_t len;
+
+  disp_acpi_table (&t->hdr);
+  grub_printf ("Local APIC=%08" PRIxGRUB_UINT32_T "  Flags=%08"
+	       PRIxGRUB_UINT32_T "\n",
+	       t->lapic_addr, t->flags);
+  len = t->hdr.length - sizeof (struct grub_acpi_madt);
+  d = t->entries;
+  for (;len > 0; len -= d->len, d = (void *) ((grub_uint8_t *) d + d->len))
+    {
+      grub_printf ("  type=%x l=%u ", d->type, d->len);
+
+      switch (d->type)
+	{
+	case GRUB_ACPI_MADT_ENTRY_TYPE_INTERRUPT_OVERRIDE:
+	  {
+	    struct grub_acpi_madt_entry_interrupt_override *dt = (void *) d;
+	    grub_printf ("Int Override bus=%x src=%x GSI=%08x Flags=%04x\n",
+			 dt->bus, dt->source, dt->global_sys_interrupt,
+			 dt->flags);
+	  }
+	  break;
+	case GRUB_ACPI_MADT_ENTRY_TYPE_SAPIC:
+	  {
+	    struct grub_acpi_madt_entry_sapic *dt = (void *) d;
+	    grub_printf ("IOSAPIC Id=%02x GSI=%08x Addr=%016" PRIxGRUB_UINT64_T
+			 "\n",
+			 dt->id, dt->global_sys_interrupt_base,
+			 dt->addr);
+	  }
+	  break;
+	case GRUB_ACPI_MADT_ENTRY_TYPE_LSAPIC:
+	  {
+	    struct grub_acpi_madt_entry_lsapic *dt = (void *) d;
+	    grub_printf ("LSAPIC ProcId=%02x ID=%02x EID=%02x Flags=%x",
+			 dt->cpu_id, dt->id, dt->eid, dt->flags);
+	    if (dt->flags & GRUB_ACPI_MADT_ENTRY_SAPIC_FLAGS_ENABLED)
+	      grub_printf (" Enabled\n");
+	    else
+	      grub_printf (" Disabled\n");
+	    if (d->len > sizeof (struct grub_acpi_madt_entry_sapic))
+	      grub_printf ("    UID val=%08x, Str=%s\n", dt->cpu_uid,
+			   dt->cpu_uid_str);
+	  }
+	  break;
+	case GRUB_ACPI_MADT_ENTRY_TYPE_PLATFORM_INT_SOURCE:
+	  {
+	    struct grub_acpi_madt_entry_platform_int_source *dt = (void *) d;
+	    static const char * const platint_type[] =
+	      {"Nul", "PMI", "INIT", "CPEI"};
+
+	    grub_printf ("Platform INT flags=%04x type=%02x (%s)"
+			 " ID=%02x EID=%02x\n",
+			 dt->flags, dt->inttype,
+			 (dt->inttype < ARRAY_SIZE (platint_type))
+			 ? platint_type[dt->inttype] : "??", dt->cpu_id,
+			 dt->cpu_eid);
+	    grub_printf ("      IOSAPIC Vec=%02x GSI=%08x source flags=%08x\n",
+			 dt->sapic_vector, dt->global_sys_int, dt->src_flags);
+	  }
+	  break;
+	default:
+	  grub_printf (" ??\n");
+	}
+    }
+}
+
+static void
+disp_acpi_xsdt_table (struct grub_acpi_table_header *t)
+{
+  grub_uint32_t len;
+  grub_uint64_t *desc;
+
+  disp_acpi_table (t);
+  len = t->length - sizeof (*t);
+  desc = (grub_uint64_t *) (t + 1);
+  for (; len > 0; desc++, len -= sizeof (*desc))
+    {
+      if (sizeof (grub_addr_t) == 4 && *desc >= (1ULL << 32))
+	{
+	  grub_printf ("Unreachable table\n");
+	  continue;
+	}
+      t = (struct grub_acpi_table_header *) (grub_addr_t) *desc;
+
+      if (t == NULL)
+	continue;
+
+      if (grub_memcmp (t->signature, GRUB_ACPI_MADT_SIGNATURE,
+		       sizeof (t->signature)) == 0)
+	disp_madt_table ((struct grub_acpi_madt *) t);
+      else
+	disp_acpi_table (t);
+    }
+}
+
+static void
+disp_acpi_rsdt_table (struct grub_acpi_table_header *t)
+{
+  grub_uint32_t len;
+  grub_uint32_t *desc;
+
+  disp_acpi_table (t);
+  len = t->length - sizeof (*t);
+  desc = (grub_uint32_t *) (t + 1);
+  for (; len > 0; desc++, len -= sizeof (*desc))
+    {
+      t = (struct grub_acpi_table_header *) (grub_addr_t) *desc;
+
+      if (t == NULL)
+	continue;
+
+      if (grub_memcmp (t->signature, GRUB_ACPI_MADT_SIGNATURE,
+		       sizeof (t->signature)) == 0)
+	disp_madt_table ((struct grub_acpi_madt *) t);
+      else
+	disp_acpi_table (t);
+    }
+}
+
+static void
+disp_acpi_rsdpv1 (struct grub_acpi_rsdp_v10 *rsdp)
+{
+  print_field (rsdp->signature);
+  grub_printf ("chksum:%02x, OEM-ID: ", rsdp->checksum);
+  print_field (rsdp->oemid);
+  grub_printf ("rev=%d\n", rsdp->revision);
+  grub_printf ("RSDT=%08" PRIxGRUB_UINT32_T "\n", rsdp->rsdt_addr);
+}
+
+static void
+disp_acpi_rsdpv2 (struct grub_acpi_rsdp_v20 *rsdp)
+{
+  disp_acpi_rsdpv1 (&rsdp->rsdpv1);
+  grub_printf ("len=%d XSDT=%016" PRIxGRUB_UINT64_T "\n", rsdp->length,
+	       rsdp->xsdt_addr);
+}
+
+static const struct grub_arg_option options[] = {
+  {"v1", '1', 0, N_("Show v1 tables only."), 0, ARG_TYPE_NONE},
+  {"v2", '2', 0, N_("Show v2 and v3 tablesv only."), 0, ARG_TYPE_NONE}
+};
+
+static grub_err_t
+grub_cmd_lsacpi (struct grub_extcmd *cmd, int argc __attribute__ ((unused)),
+		 char **args __attribute__ ((unused)))
+{
+  if (!cmd->state[1].set)
+    {
+      struct grub_acpi_rsdp_v10 *rsdp1 = grub_acpi_get_rsdpv1 ();
+      if (!rsdp1)
+	grub_printf ("No RSDPv1\n");
+      else
+	{
+	  grub_printf ("RSDPv1 signature:");
+	  disp_acpi_rsdpv1 (rsdp1);
+	  disp_acpi_rsdt_table ((void *) (grub_addr_t) rsdp1->rsdt_addr);
+	}
+    }
+
+  if (!cmd->state[0].set)
+    {
+      struct grub_acpi_rsdp_v20 *rsdp2 = grub_acpi_get_rsdpv2 ();
+      if (!rsdp2)
+	grub_printf ("No RSDPv2\n");
+      else
+	{
+	  if (sizeof (grub_addr_t) == 4 && rsdp2->xsdt_addr >= (1ULL << 32))
+	      grub_printf ("Unreachable RSDPv2\n");
+	  else
+	    {
+	      grub_printf ("RSDPv2 signature:");
+	      disp_acpi_rsdpv2 (rsdp2);
+	      disp_acpi_xsdt_table ((void *) (grub_addr_t) rsdp2->xsdt_addr);
+	      grub_printf ("\n");
+	    }
+	}
+    }
+  return GRUB_ERR_NONE;
+}
+
+static grub_extcmd_t cmd;
+
+GRUB_MOD_INIT(lsapi)
+{
+  cmd = grub_register_extcmd ("lsacpi", grub_cmd_lsacpi, GRUB_COMMAND_FLAG_BOTH,
+			      N_("[-1|-2]"),
+			      N_("Show ACPI information."), options);
+}
+
+GRUB_MOD_FINI(lsacpi)
+{
+  grub_unregister_extcmd (cmd);
+}
+
+
diff --git a/include/grub/acpi.h b/include/grub/acpi.h
index 7933db824..17ffd7686 100644
--- a/include/grub/acpi.h
+++ b/include/grub/acpi.h
@@ -53,6 +53,8 @@ struct grub_acpi_table_header
   grub_uint32_t creator_rev;
 } __attribute__ ((packed));
 
+#define GRUB_ACPI_FADT_SIGNATURE "FACP"
+
 struct grub_acpi_fadt
 {
   struct grub_acpi_table_header hdr;
@@ -64,6 +66,77 @@ struct grub_acpi_fadt
   grub_uint8_t somefields2[96];
 } __attribute__ ((packed));
 
+#define GRUB_ACPI_MADT_SIGNATURE "APIC"
+
+struct grub_acpi_madt_entry_header
+{
+  grub_uint8_t type;
+  grub_uint8_t len;
+};
+
+struct grub_acpi_madt
+{
+  struct grub_acpi_table_header hdr;
+  grub_uint32_t lapic_addr;
+  grub_uint32_t flags;
+  struct grub_acpi_madt_entry_header entries[0];
+};
+
+enum
+  {
+    GRUB_ACPI_MADT_ENTRY_TYPE_INTERRUPT_OVERRIDE = 2,
+    GRUB_ACPI_MADT_ENTRY_TYPE_SAPIC = 6,
+    GRUB_ACPI_MADT_ENTRY_TYPE_LSAPIC = 7,
+    GRUB_ACPI_MADT_ENTRY_TYPE_PLATFORM_INT_SOURCE = 8
+  };
+
+struct grub_acpi_madt_entry_interrupt_override
+{
+  struct grub_acpi_madt_entry_header hdr;
+  grub_uint8_t bus;
+  grub_uint8_t source;
+  grub_uint32_t global_sys_interrupt;
+  grub_uint16_t flags;
+};
+
+struct grub_acpi_madt_entry_sapic
+{
+  struct grub_acpi_madt_entry_header hdr;
+  grub_uint8_t id;
+  grub_uint8_t pad;
+  grub_uint32_t global_sys_interrupt_base;
+  grub_uint64_t addr;
+};
+
+struct grub_acpi_madt_entry_lsapic
+{
+  struct grub_acpi_madt_entry_header hdr;
+  grub_uint8_t cpu_id;
+  grub_uint8_t id;
+  grub_uint8_t eid;
+  grub_uint8_t pad[3];
+  grub_uint32_t flags;
+  grub_uint32_t cpu_uid;
+  grub_uint8_t cpu_uid_str[0];
+};
+
+struct grub_acpi_madt_entry_platform_int_source
+{
+  struct grub_acpi_madt_entry_header hdr;
+  grub_uint16_t flags;
+  grub_uint8_t inttype;
+  grub_uint8_t cpu_id;
+  grub_uint8_t cpu_eid;
+  grub_uint8_t sapic_vector;
+  grub_uint32_t global_sys_int;
+  grub_uint32_t src_flags;
+};
+
+enum
+  {
+    GRUB_ACPI_MADT_ENTRY_SAPIC_FLAGS_ENABLED = 1
+  };
+
 struct grub_acpi_rsdp_v10 *grub_acpi_get_rsdpv1 (void);
 struct grub_acpi_rsdp_v20 *grub_acpi_get_rsdpv2 (void);
 struct grub_acpi_rsdp_v10 *grub_machine_acpi_get_rsdpv1 (void);
diff --git a/include/grub/types.h b/include/grub/types.h
index 4499e4538..1cabc2ecf 100644
--- a/include/grub/types.h
+++ b/include/grub/types.h
@@ -69,10 +69,14 @@ typedef long long		grub_int64_t;
 typedef unsigned char		grub_uint8_t;
 typedef unsigned short		grub_uint16_t;
 typedef unsigned		grub_uint32_t;
+# define PRIxGRUB_UINT32_T	"x"
+# define PRIuGRUB_UINT32_T	"u"
 #if GRUB_CPU_SIZEOF_LONG == 8
 typedef unsigned long		grub_uint64_t;
+# define PRIxGRUB_UINT64_T	"lx"
 #else
 typedef unsigned long long	grub_uint64_t;
+# define PRIxGRUB_UINT64_T	"llx"
 #endif
 
 /* Misc types.  */

From ad717faeff732986f1f3d6f55b540e3546782776 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 1 Sep 2010 01:09:00 +0200
Subject: [PATCH 1499/1628] 	* Makefile.util.def (libgrub.a): Add missing
 sunpc. 	Reported by: Seth Goldberg.

---
 ChangeLog         | 5 +++++
 Makefile.util.def | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f624a70ad..e63b30284 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* Makefile.util.def (libgrub.a): Add missing sunpc.
+	Reported by: Seth Goldberg.
+
 2010-08-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Interrupt wrapping and code simplifications.
diff --git a/Makefile.util.def b/Makefile.util.def
index 9565dde65..35bcd81b2 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -88,6 +88,7 @@ library = {
   common = grub-core/partmap/gpt.c;
   common = grub-core/partmap/msdos.c;
   common = grub-core/partmap/sun.c;
+  common = grub-core/partmap/sunpc.c;
   common = grub-core/script/function.c;
   common = grub-core/script/lexer.c;
   common = grub-core/script/main.c;

From 105de6a758c1015f7999d35a3afa484fa69906f1 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <gingold@free.fr>
Date: Wed, 1 Sep 2010 02:37:17 +0200
Subject: [PATCH 1500/1628] 	* grub-core/commands/efi/lsefisystab.c: New
 file. 	* grub-core/commands/efi/lssal.c: Likewise. 	*
 grub-core/Makefile.core.def (lsacpi): New module. 	(lsefisystab):
 Likewise. 	* include/grub/efi/api.h (GRUB_EFI_SAL_TABLE_GUID): New
 definition. 	(GRUB_EFI_HCDP_TABLE_GUID): Likewise. 
 (grub_efi_sal_system_table): New struct. 
 (grub_efi_sal_system_table_entrypoint_descriptor): Likewise. 
 (grub_efi_sal_system_table_memory_descriptor): Likewise. 
 (grub_efi_sal_system_table_platform_features): Likewise. 
 (grub_efi_sal_system_table_translation_register_descriptor): Likewise. 
 (grub_efi_sal_system_table_purge_translation_coherence): Likewise. 
 (grub_efi_sal_system_table_ap_wakeup): Likewise. 	* include/grub/types.h
 (PRIuGRUB_UINT64_T): New definition.

	Also-By: Robert Millan <rmh.grub@aybabtu.com>

	Also-By: Vladimir Serbinenko <phcoder@gmail.com>
---
 ChangeLog.gingold2                   |  18 +++
 grub-core/Makefile.core.def          |  16 +++
 grub-core/commands/efi/lsefisystab.c | 106 ++++++++++++++++++
 grub-core/commands/efi/lssal.c       | 162 +++++++++++++++++++++++++++
 include/grub/efi/api.h               | 103 +++++++++++++++++
 include/grub/types.h                 |   2 +
 6 files changed, 407 insertions(+)
 create mode 100644 ChangeLog.gingold2
 create mode 100644 grub-core/commands/efi/lsefisystab.c
 create mode 100644 grub-core/commands/efi/lssal.c

diff --git a/ChangeLog.gingold2 b/ChangeLog.gingold2
new file mode 100644
index 000000000..517a2cce1
--- /dev/null
+++ b/ChangeLog.gingold2
@@ -0,0 +1,18 @@
+2008-01-28  Tristan Gingold  <gingold@free.fr>
+2010-01-18  Robert Millan  <rmh.grub@aybabtu.com>
+2010-08-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/efi/lsefisystab.c: New file.
+	* grub-core/commands/efi/lssal.c: Likewise.
+	* grub-core/Makefile.core.def (lsacpi): New module.
+	(lsefisystab): Likewise.
+	* include/grub/efi/api.h (GRUB_EFI_SAL_TABLE_GUID): New definition.
+	(GRUB_EFI_HCDP_TABLE_GUID): Likewise.
+	(grub_efi_sal_system_table): New struct.
+	(grub_efi_sal_system_table_entrypoint_descriptor): Likewise.
+	(grub_efi_sal_system_table_memory_descriptor): Likewise.
+	(grub_efi_sal_system_table_platform_features): Likewise.
+	(grub_efi_sal_system_table_translation_register_descriptor): Likewise.
+	(grub_efi_sal_system_table_purge_translation_coherence): Likewise.
+	(grub_efi_sal_system_table_ap_wakeup): Likewise.
+	* include/grub/types.h (PRIuGRUB_UINT64_T): New definition.
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 6f116770e..f9cf382f2 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -425,6 +425,22 @@ module = {
   enable = i386_multiboot;
 };
 
+module = {
+  name = lsefisystab;
+
+  common = commands/efi/lsefisystab.c;
+
+  enable = x86_efi;
+};
+
+module = {
+  name = lssal;
+
+  common = commands/efi/lssal.c;
+
+  enable = x86_efi;
+};
+
 module = {
   name = blocklist;
   common = commands/blocklist.c;
diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c
new file mode 100644
index 000000000..90f7bf0d1
--- /dev/null
+++ b/grub-core/commands/efi/lsefisystab.c
@@ -0,0 +1,106 @@
+/* systab.c  - Display EFI systab.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/misc.h>
+#include <grub/normal.h>
+#include <grub/charset.h>
+#include <grub/efi/api.h>
+#include <grub/efi/efi.h>
+
+struct guid_mapping
+{
+  grub_efi_guid_t guid;
+  const char *name;
+};
+
+static const struct guid_mapping guid_mappings[] =
+  {
+    { GRUB_EFI_ACPI_20_TABLE_GUID, "ACPI-2.0"},
+    { GRUB_EFI_ACPI_TABLE_GUID, "ACPI-1.0"},
+    { GRUB_EFI_SAL_TABLE_GUID, "SAL"},
+    { GRUB_EFI_SMBIOS_TABLE_GUID, "SMBIOS"},
+    { GRUB_EFI_MPS_TABLE_GUID, "MPS"},
+    { GRUB_EFI_HCDP_TABLE_GUID, "HCDP"}
+  };
+
+static grub_err_t
+grub_cmd_lsefisystab (struct grub_command *cmd __attribute__ ((unused)),
+		      int argc __attribute__ ((unused)),
+		      char **args __attribute__ ((unused)))
+{
+  const grub_efi_system_table_t *st = grub_efi_system_table;
+  grub_efi_configuration_table_t *t;
+  unsigned int i;
+
+  grub_printf ("Signature: %016" PRIxGRUB_UINT64_T " revision: %08x\n",
+	       st->hdr.signature, st->hdr.revision);
+  {
+    char *vendor;
+    grub_uint16_t *vendor_utf16;
+    grub_printf ("Vendor: ");
+    
+    for (vendor_utf16 = st->firmware_vendor; *vendor_utf16; vendor_utf16++);
+    vendor = grub_malloc (4 * (vendor_utf16 - st->firmware_vendor) + 1);
+    if (!vendor)
+      return grub_errno;
+    *grub_utf16_to_utf8 ((grub_uint8_t *) vendor, st->firmware_vendor,
+			 vendor_utf16 - st->firmware_vendor) = 0;
+    grub_printf ("%s", vendor);
+  }
+
+  grub_printf (", Version=%x\n", st->firmware_revision);
+
+  grub_printf ("%ld tables:\n", st->num_table_entries);
+  t = st->configuration_table;
+  for (i = 0; i < st->num_table_entries; i++)
+    {
+      unsigned int j;
+
+      grub_printf ("%p  ", t->vendor_table);
+
+      grub_printf ("%08x-%04x-%04x-",
+		   t->vendor_guid.data1, t->vendor_guid.data2,
+		   t->vendor_guid.data3);
+      for (j = 0; j < 8; j++)
+	grub_printf ("%02x", t->vendor_guid.data4[j]);
+      
+      for (j = 0; j < ARRAY_SIZE (guid_mappings); j++)
+	if (grub_memcmp (&guid_mappings[j].guid, &t->vendor_guid,
+			 sizeof (grub_efi_guid_t)) == 0)
+	  grub_printf ("   %s", guid_mappings[j].name);
+
+      grub_printf ("\n");
+      t++;
+    }
+  return GRUB_ERR_NONE;
+}
+
+static grub_command_t cmd;
+
+GRUB_MOD_INIT(lsefisystab)
+{
+  cmd = grub_register_command ("lsefisystab", grub_cmd_lsefisystab, 
+			       "", "Display EFI system tables.");
+}
+
+GRUB_MOD_FINI(lsefisystab)
+{
+  grub_unregister_command (cmd);
+}
diff --git a/grub-core/commands/efi/lssal.c b/grub-core/commands/efi/lssal.c
new file mode 100644
index 000000000..245883f90
--- /dev/null
+++ b/grub-core/commands/efi/lssal.c
@@ -0,0 +1,162 @@
+/* systab.c  - Display EFI systab.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2008  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/misc.h>
+#include <grub/normal.h>
+#include <grub/charset.h>
+#include <grub/efi/api.h>
+#include <grub/efi/efi.h>
+
+static void
+disp_sal (void *table)
+{
+  struct grub_efi_sal_system_table *t = table;
+  void *desc;
+  grub_uint32_t len, l;
+
+  grub_printf ("SAL rev: %02x, signature: %x, len:%x\n",
+	       t->sal_rev, t->signature, t->total_table_len);
+  grub_printf ("nbr entry: %d, chksum: %02x, SAL version A: %02x B: %02x\n",
+	       t->entry_count, t->checksum,
+	       t->sal_a_version, t->sal_b_version);
+  grub_printf ("OEM-ID: %-32s\n", t->oem_id);
+  grub_printf ("Product-ID: %-32s\n", t->product_id);
+
+  desc = t->entries;
+  len = t->total_table_len - sizeof (struct grub_efi_sal_system_table);
+  while (len > 0)
+    {
+      switch (*(grub_uint8_t *) desc)
+	{
+	case GRUB_EFI_SAL_SYSTEM_TABLE_TYPE_ENTRYPOINT_DESCRIPTOR:
+	  {
+	    struct grub_efi_sal_system_table_entrypoint_descriptor *c = desc;
+	    l = sizeof (*c);
+	    grub_printf (" Entry point: PAL=%016" PRIxGRUB_UINT64_T
+			 " SAL=%016" PRIxGRUB_UINT64_T " GP=%016"
+			 PRIxGRUB_UINT64_T "\n",
+			 c->pal_proc_addr, c->sal_proc_addr,
+			 c->global_data_ptr);
+	  }
+	  break;
+	case GRUB_EFI_SAL_SYSTEM_TABLE_TYPE_MEMORY_DESCRIPTOR:
+	  {
+	    struct grub_efi_sal_system_table_memory_descriptor *c = desc;
+	    l = sizeof (*c);
+	    grub_printf (" Memory descriptor entry addr=%016" PRIxGRUB_UINT64_T
+			 " len=%" PRIuGRUB_UINT64_T "KB\n",
+			 c->addr, c->len * 4);
+	    grub_printf ("     sal_used=%d attr=%x AR=%x attr_mask=%x "
+			 "type=%x usage=%x\n",
+			 c->sal_used, c->attr, c->ar, c->attr_mask, c->mem_type,
+			 c->usage);
+	  }
+	  break;
+	case GRUB_EFI_SAL_SYSTEM_TABLE_TYPE_PLATFORM_FEATURES:
+	  {
+	    struct grub_efi_sal_system_table_platform_features *c = desc;
+	    l = sizeof (*c);
+	    grub_printf (" Platform features: %02x", c->flags);
+	    if (c->flags & GRUB_EFI_SAL_SYSTEM_TABLE_PLATFORM_FEATURE_BUSLOCK)
+	      grub_printf (" BusLock");
+	    if (c->flags & GRUB_EFI_SAL_SYSTEM_TABLE_PLATFORM_FEATURE_IRQREDIRECT)
+	      grub_printf (" IrqRedirect");
+	    if (c->flags & GRUB_EFI_SAL_SYSTEM_TABLE_PLATFORM_FEATURE_IPIREDIRECT)
+
+	      grub_printf (" IPIRedirect");
+	    if (c->flags & GRUB_EFI_SAL_SYSTEM_TABLE_PLATFORM_FEATURE_ITCDRIFT)
+
+	      grub_printf (" ITCDrift");
+	    grub_printf ("\n");
+	  }
+	  break;
+	case GRUB_EFI_SAL_SYSTEM_TABLE_TYPE_TRANSLATION_REGISTER_DESCRIPTOR:
+	  {
+	    struct grub_efi_sal_system_table_translation_register_descriptor *c
+	      = desc;
+	    l = sizeof (*c);
+	    grub_printf (" TR type=%d num=%d va=%016" PRIxGRUB_UINT64_T
+			 " pte=%016" PRIxGRUB_UINT64_T "\n",
+			 c->register_type, c->register_number,
+			 c->addr, c->page_size);
+	  }
+	  break;
+	case GRUB_EFI_SAL_SYSTEM_TABLE_TYPE_PURGE_TRANSLATION_COHERENCE:
+	  {
+	    struct grub_efi_sal_system_table_purge_translation_coherence *c
+	      = desc;
+	    l = sizeof (*c);
+	    grub_printf (" PTC coherence nbr=%d addr=%016" PRIxGRUB_UINT64_T "\n",
+			 c->ndomains, c->coherence);
+	  }
+	  break;
+	case GRUB_EFI_SAL_SYSTEM_TABLE_TYPE_AP_WAKEUP:
+	  {
+	    struct grub_efi_sal_system_table_ap_wakeup *c = desc;
+	    l = sizeof (*c);
+	    grub_printf (" AP wake-up: mec=%d vect=%" PRIxGRUB_UINT64_T "\n",
+			 c->mechanism, c->vector);
+	  }
+	  break;
+	default:
+	  grub_printf (" unknown entry 0x%x\n", *(grub_uint8_t *)desc);
+	  return;
+	}
+      desc = (grub_uint8_t *)desc + l;
+      len -= l;
+    }
+}
+
+static grub_err_t
+grub_cmd_lssal (struct grub_command *cmd __attribute__ ((unused)),
+		int argc __attribute__ ((unused)),
+		char **args __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_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_guid_t)) == 0)
+	{
+	  disp_sal (t->vendor_table);
+	  return GRUB_ERR_NONE;
+	}
+      t++;
+    }
+  grub_printf ("SAL not found\n");
+  return GRUB_ERR_NONE;
+}
+
+static grub_command_t cmd;
+
+GRUB_MOD_INIT(lssal)
+{
+  cmd = grub_register_command ("lssal", grub_cmd_lssal, "",
+			       "Display SAL system table.");
+}
+
+GRUB_MOD_FINI(lssal)
+{
+  grub_unregister_command (cmd);
+}
diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
index 36363ae1e..5eededdc2 100644
--- a/include/grub/efi/api.h
+++ b/include/grub/efi/api.h
@@ -109,6 +109,109 @@
     { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
   }
 
+#define GRUB_EFI_SAL_TABLE_GUID \
+  { 0xeb9d2d32, 0x2d88, 0x11d3, \
+      { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \
+  }
+
+#define GRUB_EFI_HCDP_TABLE_GUID \
+  { 0xf951938d, 0x620b, 0x42ef, \
+      { 0x82, 0x79, 0xa8, 0x4b, 0x79, 0x61, 0x78, 0x98 } \
+  }
+
+struct grub_efi_sal_system_table
+{
+  grub_uint32_t signature;
+  grub_uint32_t total_table_len;
+  grub_uint16_t sal_rev;
+  grub_uint16_t entry_count;
+  grub_uint8_t checksum;
+  grub_uint8_t reserved1[7];
+  grub_uint16_t sal_a_version;
+  grub_uint16_t sal_b_version;
+  grub_uint8_t oem_id[32];
+  grub_uint8_t product_id[32];
+  grub_uint8_t reserved2[8];
+  grub_uint8_t entries[0];
+};
+
+enum
+  {
+    GRUB_EFI_SAL_SYSTEM_TABLE_TYPE_ENTRYPOINT_DESCRIPTOR = 0,
+    GRUB_EFI_SAL_SYSTEM_TABLE_TYPE_MEMORY_DESCRIPTOR = 1,
+    GRUB_EFI_SAL_SYSTEM_TABLE_TYPE_PLATFORM_FEATURES = 2,
+    GRUB_EFI_SAL_SYSTEM_TABLE_TYPE_TRANSLATION_REGISTER_DESCRIPTOR = 3,
+    GRUB_EFI_SAL_SYSTEM_TABLE_TYPE_PURGE_TRANSLATION_COHERENCE = 4,
+    GRUB_EFI_SAL_SYSTEM_TABLE_TYPE_AP_WAKEUP = 5
+  };
+
+struct grub_efi_sal_system_table_entrypoint_descriptor
+{
+  grub_uint8_t type;
+  grub_uint8_t pad[7];
+  grub_uint64_t pal_proc_addr;
+  grub_uint64_t sal_proc_addr;
+  grub_uint64_t global_data_ptr;
+  grub_uint64_t reserved[2];
+};
+
+struct grub_efi_sal_system_table_memory_descriptor
+{
+  grub_uint8_t type;
+  grub_uint8_t sal_used;
+  grub_uint8_t attr;
+  grub_uint8_t ar;
+  grub_uint8_t attr_mask;
+  grub_uint8_t mem_type;
+  grub_uint8_t usage;
+  grub_uint8_t unknown;
+  grub_uint64_t addr;
+  grub_uint64_t len;
+  grub_uint64_t unknown2;
+};
+
+struct grub_efi_sal_system_table_platform_features
+{
+  grub_uint8_t type;
+  grub_uint8_t flags;
+  grub_uint8_t reserved[14];
+};
+
+struct grub_efi_sal_system_table_translation_register_descriptor
+{
+  grub_uint8_t type;
+  grub_uint8_t register_type;
+  grub_uint8_t register_number;
+  grub_uint8_t reserved[5];
+  grub_uint64_t addr;
+  grub_uint64_t page_size;
+  grub_uint64_t reserver;
+};
+
+struct grub_efi_sal_system_table_purge_translation_coherence
+{
+  grub_uint8_t type;
+  grub_uint8_t reserved[3];  
+  grub_uint32_t ndomains;
+  grub_uint64_t coherence;
+};
+
+struct grub_efi_sal_system_table_ap_wakeup
+{
+  grub_uint8_t type;
+  grub_uint8_t mechanism;
+  grub_uint8_t reserved[6];
+  grub_uint64_t vector;
+};
+
+enum
+  {
+    GRUB_EFI_SAL_SYSTEM_TABLE_PLATFORM_FEATURE_BUSLOCK = 1,
+    GRUB_EFI_SAL_SYSTEM_TABLE_PLATFORM_FEATURE_IRQREDIRECT = 2,
+    GRUB_EFI_SAL_SYSTEM_TABLE_PLATFORM_FEATURE_IPIREDIRECT = 4,
+    GRUB_EFI_SAL_SYSTEM_TABLE_PLATFORM_FEATURE_ITCDRIFT = 8,
+  };
+
 /* Enumerations.  */
 enum grub_efi_timer_delay
   {
diff --git a/include/grub/types.h b/include/grub/types.h
index 1cabc2ecf..766eddf07 100644
--- a/include/grub/types.h
+++ b/include/grub/types.h
@@ -74,9 +74,11 @@ typedef unsigned		grub_uint32_t;
 #if GRUB_CPU_SIZEOF_LONG == 8
 typedef unsigned long		grub_uint64_t;
 # define PRIxGRUB_UINT64_T	"lx"
+# define PRIuGRUB_UINT64_T	"lu"
 #else
 typedef unsigned long long	grub_uint64_t;
 # define PRIxGRUB_UINT64_T	"llx"
+# define PRIuGRUB_UINT64_T	"llu"
 #endif
 
 /* Misc types.  */

From 48798b6a1e4553a0d19eb1df62c5ce6218377a17 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 1 Sep 2010 09:34:09 +0200
Subject: [PATCH 1501/1628] Fix memory leak

---
 grub-core/commands/efi/lsefisystab.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c
index 90f7bf0d1..ac84fc426 100644
--- a/grub-core/commands/efi/lsefisystab.c
+++ b/grub-core/commands/efi/lsefisystab.c
@@ -63,6 +63,7 @@ grub_cmd_lsefisystab (struct grub_command *cmd __attribute__ ((unused)),
     *grub_utf16_to_utf8 ((grub_uint8_t *) vendor, st->firmware_vendor,
 			 vendor_utf16 - st->firmware_vendor) = 0;
     grub_printf ("%s", vendor);
+    grub_free (vendor);
   }
 
   grub_printf (", Version=%x\n", st->firmware_revision);

From da2891f9620a706847bbe8f36c06e5b56b31ed40 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 1 Sep 2010 10:29:30 +0100
Subject: [PATCH 1502/1628] * docs/grub.texi: Add myself as an author.

---
 ChangeLog      | 4 ++++
 docs/grub.texi | 1 +
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e63b30284..d8851c641 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-01  Colin Watson  <cjwatson@ubuntu.com>
+
+	* docs/grub.texi: Add myself as an author.
+
 2010-09-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* Makefile.util.def (libgrub.a): Add missing sunpc.
diff --git a/docs/grub.texi b/docs/grub.texi
index 18dc39389..fb0907a59 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -46,6 +46,7 @@ Invariant Sections.
 @subtitle The GRand Unified Bootloader, version @value{VERSION}, @value{UPDATED}.
 @author Gordon Matzigkeit
 @author Yoshinori K. Okuji
+@author Colin Watson
 @c The following two commands start the copyright page.
 @page
 @vskip 0pt plus 1filll

From 4066f57f1946f459472fc2a8c8f69eab2fd23cab Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 1 Sep 2010 10:32:34 +0100
Subject: [PATCH 1503/1628] * util/grub-mkrescue.in (usage): Tidy up usage
 output (and hence generated manual page) a little.

---
 ChangeLog             | 5 +++++
 util/grub-mkrescue.in | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d8851c641..220cc61fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-01  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkrescue.in (usage): Tidy up usage output (and hence
+	generated manual page) a little.
+
 2010-09-01  Colin Watson  <cjwatson@ubuntu.com>
 
 	* docs/grub.texi: Add myself as an author.
diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 0f40e92cc..142ee85cd 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -62,7 +62,8 @@ Make GRUB rescue image.
 
 $self generates a bootable rescue image with specified source files, source
 directories, or mkisofs options listed by: xorriso -as mkisofs -help
-Option -- switches to native xorriso command mode. or directories.
+
+Option -- switches to native xorriso command mode.
 
 Report bugs to <bug-grub@gnu.org>.
 Mail xorriso support requests to <bug-xorriso@gnu.org>.

From f9cefc4eb38f867ccf0419ae7a172d41ec0cd442 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 1 Sep 2010 18:15:46 +0100
Subject: [PATCH 1504/1628] * NEWS: Document most of the important changes
 since 1.98.

---
 ChangeLog |  4 +++
 NEWS      | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 220cc61fe..c78bcef7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-01  Colin Watson  <cjwatson@ubuntu.com>
+
+	* NEWS: Document most of the important changes since 1.98.
+
 2010-09-01  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkrescue.in (usage): Tidy up usage output (and hence
diff --git a/NEWS b/NEWS
index e16504342..bb6b8df3f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,98 @@
 New in 1.99:
 
+* New relocator.  Allows for more kernel support and more
+  straightforward loader writing.
+
+* Handle USB pendrives exposed as floppies.
+
+* New Automake-based build system.
+
+* Add `sendkey' command (i386-pc only).
+
 * ZFS support in `grub-install' and `grub-mkconfig'.  Note: complete
   functionality requires external ZFS implementation (available from
   grub-extras).
 
+* Support 1.x versions of mdadm metadata.
+
+* Fix corruption when reading Reiserfs directory entries.
+
+* Bidirectional text and diacritics support.
+
+* Skip LVM snapshots.
+
+* MIPS Yeeloong firmware port.
+
+* Change grub-mkdevicemap to emit /dev/disk/by-id/ names where possible
+  on GNU/Linux.
+
+* Add `grub-mkconfig' support for Xen with Linux.
+
+* Add `grub-mkconfig' support for initrd images on Fedora 13.
+
+* Support >3GiB and <16MiB RAM in i386-qemu.
+
+* Add support for Cirrus 5446 and Bochs video cards.
+
+* Load more appropriate video drivers automatically in `grub-mkconfig'.
+
+* USB improvements, including hotplugging/hotunplugging, hub support,
+  and USB serial support.
+
+* AMD Geode CS5536 support.
+
+* Extensive updates to the Texinfo documentation.
+
+* Add `grub-probe' support for the btrfs filesystem, permitting / to
+  reside on btrfs as long as /boot is on a filesystem natively supported
+  by GRUB.
+
+* Handle symbolic links under /dev/mapper on GNU/Linux.
+
+* Handle installation across multiple partition table types.
+
+* Add `cmostest' command (i386/x86_64 only).
+
+* Add support for DM-RAID disk devices on GNU/Linux.
+
+* Remove `grub-mkisofs'.  `grub-mkrescue' now uses GNU xorriso to build
+  CD images.
+
+* `grub-mkrescue' support for EFI, coreboot, and QEMU platforms.
+
+* Unify `grub-mkimage' source code across platforms.
+
+* Fix VGA (as opposed to VBE) video driver, formerly a terminal driver.
+
+* Add menu hotkey support.
+
+* Add support for the nilfs2 filesystem.
+
+* `grub-probe' and `grub-mkconfig' support for NetBSD.
+
+* Support setting a background image in `grub-mkconfig'.
+
+* Support multiple terminals in `grub-mkconfig'.
+
+* Regexp support.
+
+* MIPS multiboot2 support.
+
+* Multiboot2 tag support.
+
+* sunpc partition table support.
+
+* Add a number of new language features to GRUB script: `for', `while',
+  `until', `elif', function parameters, `break', `continue', and
+  `shift'.
+
+* Support nested partition tables.  GRUB now prefers to name partitions
+  in the form `(hd0,msdos1,bsd1)' rather than `(hd0,1,a)'.
+
+* Speed up consecutive hostdisk operations on the same device.
+
+* Compile parts of `grub-emu' as modules.
+
 New in 1.98 - 2010-03-06:
 
 * Multiboot on EFI support.

From 9a093920572de083c853b85b7372c6ca608b1677 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 2 Sep 2010 15:47:03 +0200
Subject: [PATCH 1505/1628] 	Fix grub_pxe_scan.

	* grub-core/fs/i386/pc/pxe.c (grub_pxe_pxenv): Put correct type bangpxe.
	(grub_pxe_scan): Fix types and pxe_rm_entry computation.
	All users updated.
	* include/grub/i386/pc/pxe.h (grub_pxe_bangpxe): New struct.
	(grub_pxe_pxenv): Correct type.
---
 ChangeLog                  | 10 ++++++++++
 grub-core/fs/i386/pc/pxe.c | 36 +++++++++++++++++++++---------------
 include/grub/i386/pc/pxe.h | 15 ++++++++++++++-
 3 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c78bcef7d..ce3141985 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Fix grub_pxe_scan.
+
+	* grub-core/fs/i386/pc/pxe.c (grub_pxe_pxenv): Put correct type bangpxe.
+	(grub_pxe_scan): Fix types and pxe_rm_entry computation.
+	All users updated.
+	* include/grub/i386/pc/pxe.h (grub_pxe_bangpxe): New struct.
+	(grub_pxe_pxenv): Correct type.
+
 2010-09-01  Colin Watson  <cjwatson@ubuntu.com>
 
 	* NEWS: Document most of the important changes since 1.98.
diff --git a/grub-core/fs/i386/pc/pxe.c b/grub-core/fs/i386/pc/pxe.c
index 0dd44a30a..ee8c55416 100644
--- a/grub-core/fs/i386/pc/pxe.c
+++ b/grub-core/fs/i386/pc/pxe.c
@@ -41,7 +41,7 @@ struct grub_pxe_disk_data
   grub_uint32_t gateway_ip;
 };
 
-struct grub_pxenv *grub_pxe_pxenv;
+struct grub_pxe_bangpxe *grub_pxe_pxenv;
 static grub_uint32_t grub_pxe_your_ip;
 static grub_uint32_t grub_pxe_default_server_ip;
 static grub_uint32_t grub_pxe_default_gateway_ip;
@@ -58,41 +58,47 @@ struct grub_pxe_data
 
 static grub_uint32_t pxe_rm_entry = 0;
 
-static struct grub_pxenv *
+static struct grub_pxe_bangpxe *
 grub_pxe_scan (void)
 {
   struct grub_bios_int_registers regs;
-  struct grub_pxenv *ret;
-  void *pxe;
+  struct grub_pxenv *pxenv;
+  struct grub_pxe_bangpxe *bangpxe;
 
   regs.flags = GRUB_CPU_INT_FLAGS_DEFAULT;
 
   regs.ebx = 0;
   regs.ecx = 0;
   regs.eax = 0x5650;
+  regs.es = 0;
 
   grub_bios_interrupt (0x1a, &regs);
 
   if ((regs.eax & 0xffff) != 0x564e)
     return NULL;
-  ret = (struct grub_pxenv *) ((regs.es << 4) + (regs.ebx & 0xffff));
-  if (grub_memcmp (ret->signature, GRUB_PXE_SIGNATURE, sizeof (ret->signature))
+
+  pxenv = (struct grub_pxenv *) ((regs.es << 4) + (regs.ebx & 0xffff));
+  if (grub_memcmp (pxenv->signature, GRUB_PXE_SIGNATURE,
+		   sizeof (pxenv->signature))
       != 0)
     return NULL;
-  if (ret->version < 0x201)
+
+  if (pxenv->version < 0x201)
     return NULL;
 
-  pxe = (void *) ((((ret->pxe_ptr & 0xffff0000) >> 16) << 4)
-		  + (ret->pxe_ptr & 0xffff));
-  if (!pxe)
+  bangpxe = (void *) ((((pxenv->pxe_ptr & 0xffff0000) >> 16) << 4)
+		      + (pxenv->pxe_ptr & 0xffff));
+
+  if (!bangpxe)
     return NULL;
 
-  /* !PXE  */
-  if (*(grub_uint32_t *) pxe !=	0x45585021)
+  if (grub_memcmp (bangpxe->signature, GRUB_PXE_BANGPXE_SIGNATURE,
+		   sizeof (bangpxe->signature)) != 0)
     return NULL;
 
-  pxe_rm_entry = ret->rm_entry;
-  return ret;
+  pxe_rm_entry = bangpxe->rm_entry;
+
+  return bangpxe;
 }
 
 static int
@@ -483,7 +489,7 @@ parse_dhcp_vendor (void *vend, int limit)
 static void
 grub_pxe_detect (void)
 {
-  struct grub_pxenv *pxenv;
+  struct grub_pxe_bangpxe *pxenv;
   struct grub_pxenv_get_cached_info ci;
   struct grub_pxenv_boot_player *bp;
 
diff --git a/include/grub/i386/pc/pxe.h b/include/grub/i386/pc/pxe.h
index 049dd1950..62ece21b0 100644
--- a/include/grub/i386/pc/pxe.h
+++ b/include/grub/i386/pc/pxe.h
@@ -192,6 +192,19 @@ struct grub_pxenv
   grub_uint32_t pxe_ptr;	/* SEG:OFF to !PXE struct.  */
 } __attribute__ ((packed));
 
+struct grub_pxe_bangpxe
+{
+  grub_uint8_t signature[4];
+#define GRUB_PXE_BANGPXE_SIGNATURE "!PXE"
+  grub_uint8_t length;
+  grub_uint8_t chksum;
+  grub_uint8_t rev;
+  grub_uint8_t reserved;
+  grub_uint32_t undiromid;
+  grub_uint32_t baseromid;
+  grub_uint32_t rm_entry;
+} __attribute__ ((packed));
+
 struct grub_pxenv_get_cached_info
 {
   grub_uint16_t status;
@@ -306,7 +319,7 @@ struct grub_pxenv_unload_stack
 
 int EXPORT_FUNC(grub_pxe_call) (int func, void * data, grub_uint32_t pxe_rm_entry);
 
-extern struct grub_pxenv *grub_pxe_pxenv;
+extern struct grub_pxe_bangpxe *grub_pxe_pxenv;
 
 void grub_pxe_unload (void);
 

From 529cc99acf9bbb8ac07d95e30af99fa1fefdac4b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 2 Sep 2010 16:07:52 +0200
Subject: [PATCH 1506/1628] 	Add i386-pc-pxe image target.

	* util/grub-mkimage.c (image_target_desc): New enum value
	IMAGE_I386_PC_PXE.
	(image_targets): New target i386-pc-pxe.
	(generate_image): Handle i386-pc-pxe image.
---
 ChangeLog           |  9 +++++++++
 util/grub-mkimage.c | 36 +++++++++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ce3141985..4b1ccafd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Add i386-pc-pxe image target.
+
+	* util/grub-mkimage.c (image_target_desc): New enum value
+	IMAGE_I386_PC_PXE.
+	(image_targets): New target i386-pc-pxe.
+	(generate_image): Handle i386-pc-pxe image.
+
 2010-09-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix grub_pxe_scan.
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 0e82afae9..4e151dd62 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -54,7 +54,8 @@ struct image_target_desc
   enum {
     IMAGE_I386_PC, IMAGE_EFI, IMAGE_COREBOOT,
     IMAGE_SPARC64_AOUT, IMAGE_SPARC64_RAW, IMAGE_I386_IEEE1275,
-    IMAGE_YEELOONG_ELF, IMAGE_QEMU, IMAGE_PPC, IMAGE_YEELOONG_FLASH
+    IMAGE_YEELOONG_ELF, IMAGE_QEMU, IMAGE_PPC, IMAGE_YEELOONG_FLASH,
+    IMAGE_I386_PC_PXE
   } id;
   enum
     {
@@ -140,6 +141,24 @@ struct image_target_desc image_targets[] =
       .install_bsd_part = GRUB_KERNEL_I386_PC_INSTALL_BSD_PART,
       .link_addr = GRUB_KERNEL_I386_PC_LINK_ADDR
     },
+    {
+      .name = "i386-pc-pxe",
+      .voidp_sizeof = 4,
+      .bigendian = 0,
+      .id = IMAGE_I386_PC_PXE, 
+      .flags = PLATFORM_FLAGS_LZMA,
+      .prefix = GRUB_KERNEL_I386_PC_PREFIX,
+      .data_end = GRUB_KERNEL_I386_PC_DATA_END,
+      .raw_size = GRUB_KERNEL_I386_PC_RAW_SIZE,
+      .total_module_size = GRUB_KERNEL_I386_PC_TOTAL_MODULE_SIZE,
+      .kernel_image_size = GRUB_KERNEL_I386_PC_KERNEL_IMAGE_SIZE,
+      .compressed_size = GRUB_KERNEL_I386_PC_COMPRESSED_SIZE,
+      .section_align = 1,
+      .vaddr_offset = 0,
+      .install_dos_part = GRUB_KERNEL_I386_PC_INSTALL_DOS_PART,
+      .install_bsd_part = GRUB_KERNEL_I386_PC_INSTALL_BSD_PART,
+      .link_addr = GRUB_KERNEL_I386_PC_LINK_ADDR
+    },
     {
       .name = "i386-efi",
       .voidp_sizeof = 4,
@@ -664,6 +683,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
   switch (image_target->id)
     {
     case IMAGE_I386_PC:
+    case IMAGE_I386_PC_PXE:
       {
 	unsigned num;
 	char *boot_path, *boot_img;
@@ -678,6 +698,20 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 	if (num > 0xffff)
 	  grub_util_error (_("the core image is too big"));
 
+	if (image_target->id == IMAGE_I386_PC_PXE)
+	  {
+	    char *pxeboot_path, *pxeboot_img;
+	    size_t pxeboot_size;
+	    
+	    pxeboot_path = grub_util_get_path (dir, "pxeboot.img");
+	    pxeboot_size = grub_util_get_image_size (pxeboot_path);
+	    pxeboot_img = grub_util_read_image (pxeboot_path);
+	    
+	    grub_util_write_image (pxeboot_img, pxeboot_size, out);
+	    free (pxeboot_img);
+	    free (pxeboot_path);
+	  }
+
 	boot_path = grub_util_get_path (dir, "diskboot.img");
 	boot_size = grub_util_get_image_size (boot_path);
 	if (boot_size != GRUB_DISK_SECTOR_SIZE)

From 8395034beca005a90c7c9fc870ab319860b6ae7c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 2 Sep 2010 17:15:53 +0200
Subject: [PATCH 1507/1628] 	Add i386-pc-pxe image target.

	* util/grub-mkimage.c (image_target_desc): New enum value
	IMAGE_I386_PC_PXE.
	(image_targets): New target i386-pc-pxe.
	(generate_image): Handle i386-pc-pxe image.
---
 ChangeLog.mknet          |   7 ++
 Makefile.util.def        |   8 ++
 tests/util/grub-shell.in |  24 +++-
 util/grub-mknetdir.in    | 230 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 263 insertions(+), 6 deletions(-)
 create mode 100644 ChangeLog.mknet
 create mode 100644 util/grub-mknetdir.in

diff --git a/ChangeLog.mknet b/ChangeLog.mknet
new file mode 100644
index 000000000..92de7b2d4
--- /dev/null
+++ b/ChangeLog.mknet
@@ -0,0 +1,7 @@
+2010-09-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	grub-mknetdir script.
+
+	* Makefile.util.def (grub-mknetdir): New module.
+	* tests/util/grub-shell.in: Support boot=net
+	* util/grub-mknetdir.in: New file.
diff --git a/Makefile.util.def b/Makefile.util.def
index 35bcd81b2..747eb7837 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -360,6 +360,14 @@ script = {
   enable = noemu;
 };
 
+script = {
+  mansection = 8;
+  installdir = sbin;
+  name = grub-mknetdir;
+
+  common = util/grub-mknetdir.in;
+};
+
 script = {
   name = grub-mkconfig;
   common = util/grub-mkconfig.in;
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index e21cc95f4..a59714b44 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -28,6 +28,7 @@ PACKAGE_NAME=@PACKAGE_NAME@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 PACKAGE_VERSION=@PACKAGE_VERSION@
 target_cpu=@target_cpu@
+platform=@platform@
 
 # Force build directory components
 PATH=${builddir}:$PATH
@@ -42,7 +43,7 @@ Run GRUB script in a Qemu instance.
 
   -h, --help              print this message and exit
   -v, --version           print the version information and exit
-  --boot=[fd|hd|cd]       boot method for Qemu instance
+  --boot=[fd|hd|cd|net]       boot method for Qemu instance
   --modules=MODULES       pre-load specified modules MODULES
   --qemu=FILE             Name of qemu binary
   --qemu-opts=OPTIONS     extra options to pass to Qemu instance
@@ -83,6 +84,7 @@ for option in "$@"; do
 	if   [ "$dev" = "fd" ] ; then boot=fd;
 	elif [ "$dev" = "hd" ] ; then boot=hd;
 	elif [ "$dev" = "cd" ] ; then boot=cd;
+	elif [ "$dev" = "net" ] ; then boot=net;
 	elif [ "$dev" = "qemu" ] ; then boot=qemu;
 	elif [ "$dev" = "coreboot" ] ; then boot=coreboot;
 	else
@@ -134,10 +136,12 @@ halt
 EOF
 
 isofile=`mktemp`
-sh @builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage --output=${isofile} --override-directory=${builddir}/grub-core \
-    --rom-directory="${rom_directory}" \
-    /boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \
-    ${files} >/dev/null 2>&1
+if [ x$boot != xnet ]; then
+    sh @builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage --output=${isofile} --override-directory=${builddir}/grub-core \
+	--rom-directory="${rom_directory}" \
+	/boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \
+	${files} >/dev/null 2>&1
+fi
 if [ x$boot = xhd ]; then
     device=hda
     bootdev="-boot c"
@@ -164,7 +168,15 @@ if [ x$boot = xcoreboot ]; then
     device=cdrom
 fi
 
-${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | cat | tr -d "\r"
+if [ x$boot = xnet ]; then
+    netdir=`mktemp -d`
+    sh @builddir@/grub-mknetdir --grub-mkimage=${builddir}/grub-mkimage --override-directory=${builddir}/grub-core --net-directory=$netdir
+    cp ${cfgfile} $netdir/boot/grub/grub.cfg
+    cp ${source} $netdir/boot/grub/testcase.cfg
+    ${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -boot n -net user,tftp=$netdir,bootfile=/boot/grub/$target_cpu-$platform/core.0  -net nic  | cat | tr -d "\r"
+else
+    ${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | cat | tr -d "\r"
+fi
 rm -f "${isofile}" "${imgfile}"
 rm -rf "${rom_directory}"
 if [ x$boot = xcoreboot ]; then
diff --git a/util/grub-mknetdir.in b/util/grub-mknetdir.in
new file mode 100644
index 000000000..b353e98b9
--- /dev/null
+++ b/util/grub-mknetdir.in
@@ -0,0 +1,230 @@
+#! /bin/sh
+
+# Install GRUB on your drive.
+# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010  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/>.
+
+# Initialize some variables.
+transform="@program_transform_name@"
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+sbindir=@sbindir@
+bindir=@bindir@
+libdir=@libdir@
+PACKAGE_NAME=@PACKAGE_NAME@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
+PACKAGE_VERSION=@PACKAGE_VERSION@
+target_cpu=@target_cpu@
+platform=@platform@
+host_os=@host_os@
+pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
+localedir=@datadir@/locale
+native_platform=@platform@
+pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst"
+
+self=`basename $0`
+
+grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
+rootdir=/srv/tftp
+grub_prefix=`echo /boot/grub | sed ${transform}`
+modules=
+
+install_device=
+no_floppy=
+recheck=no
+debug=no
+debug_image=
+subdir=`echo /boot/grub | sed ${transform}`
+pc_dir=${libdir}/$(echo ${PACKAGE_TARNAME} | sed ${transform})/i386-pc
+
+# Usage: usage
+# Print the usage.
+usage () {
+    cat <<EOF
+Usage: $self [OPTION] install_device
+Install GRUB on your drive.
+
+  -h, --help              print this message and exit
+  -v, --version           print the version information and exit
+  --modules=MODULES       pre-load specified modules MODULES
+  --net-directory=DIR     root directory of TFTP server
+  --subdir=DIR            relative subdirectory on network server
+  --grub-mkimage=FILE     use FILE as grub-mkimage
+
+$self copies GRUB images into net_directory/subdir/${target_cpu}-${platform}
+
+Report bugs to <bug-grub@gnu.org>.
+EOF
+}
+
+argument () {
+  opt=$1
+  shift
+
+  if test $# -eq 0; then
+      echo "$0: option requires an argument -- '$opt'" 1>&2
+      exit 1
+  fi
+  echo $1
+}
+
+# Check the arguments.
+while test $# -gt 0
+do
+    option=$1
+    shift
+
+    case "$option" in
+    -h | --help)
+	usage
+	exit 0 ;;
+    -v | --version)
+	echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
+	exit 0 ;;
+
+    --modules)
+	modules=`argument $option "$@"`; shift;;
+    --modules=*)
+	modules=`echo "$option" | sed 's/--modules=//'` ;;
+
+    --net-directory)
+	rootdir=`argument $option "$@"`; shift;;
+    --net-directory=*)
+	rootdir=`echo "$option" | sed 's/--net-directory=//'` ;;
+
+    --subdir)
+	subdir=`argument $option "$@"`; shift;;
+    --subdir=*)
+	subdir=`echo "$option" | sed 's/--subdir=//'` ;;
+
+    --grub-mkimage)
+	grub_mkimage=`argument $option "$@"`; shift;;
+    --grub-mkimage=*)
+	grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
+
+    # This is an undocumented feature...
+    --debug)
+	debug=yes ;;
+    --debug-image)
+	debug_image=`argument $option "$@"`; shift;;
+    --debug-image=*)
+	debug_image=`echo "$option" | sed 's/--debug-image=//'` ;;
+
+    # Intentionally undocumented
+    --override-directory)
+        override_dir=`argument $option "$@"`
+	shift
+	PATH=${override_dir}:$PATH
+	export PATH
+	;;
+    --override-directory=*)
+	override_dir=`echo "${option}/" | sed 's/--override-directory=//'`
+	PATH=${override_dir}:$PATH
+	export PATH
+	;;
+
+    -*)
+	echo "Unrecognized option \`$option'" 1>&2
+	usage
+	exit 1
+	;;
+    *)
+	if test "x$install_device" != x; then
+	    echo "More than one install_devices?" 1>&2
+	    usage
+	    exit 1
+	fi
+	install_device="${option}" ;;
+    esac
+done
+
+set $grub_mkimage dummy
+if test -f "$1"; then
+    :
+else
+    echo "$1: Not found." 1>&2
+    exit 1
+fi
+
+# Create the GRUB directory if it is not present.
+mkdir -p "${rootdir}/${subdir}" || exit 1
+
+process_input_dir ()
+{ 
+    input_dir="$1"
+    platform="$2"
+    grubdir="${rootdir}/${subdir}/${platform}"
+    config_opt=
+    mkdir -p "$grubdir" || exit 1
+
+    for file in ${grubdir}/*.mod ${grubdir}/*.lst ${grubdir}/*.img ${grubdir}/efiemu??.o; do
+	if test -f $file && [ "`basename $file`" != menu.lst ]; then
+	    rm -f $file || exit 1
+	fi
+    done
+    for file in ${input_dir}/*.mod; do
+        if test -f "$file"; then
+            cp -f "$file" "$grubdir/"
+        fi
+    done
+    for file in ${pkglib_DATA}; do
+	if test -f "${input_dir}/${file}"; then
+            cp -f "${input_dir}/${file}" "$grubdir/"
+	fi
+    done
+
+    mkdir -p "$grubdir/locale"
+    for file in ${input_dir}/po/*.mo; do
+        if test -f "$file"; then
+	    cp -f "$file" "$grubdir/locale/"
+	fi
+    done
+
+    rm -f ${grubdir}/load.cfg
+
+    if [ "x${debug_image}" != x ]; then
+       echo "set debug='${debug_image}'" >> ${grubdir}/load.cfg
+       config_opt="-c ${grubdir}/load.cfg "
+    fi
+
+    case "${platform}" in
+    	 i386-pc) mkimage_target=i386-pc-pxe;
+	 	  netmodules="pxe";
+		  prefix="(pxe)/${subdir}/${platform}";
+		  ext=0 ;;
+    	 *) echo Unsupported platform ${platform};
+    	    exit 1;;
+    esac
+
+    cat << EOF > ${grubdir}/grub.cfg
+source ${subdir}/grub.cfg
+EOF
+
+    $grub_mkimage ${config_opt} -d "${input_dir}" -O ${mkimage_target} --output=${grubdir}/core.$ext --prefix=$prefix $modules $netmodules || exit 1
+    echo "Netboot directory for ${platform} created. Configure your DHCP server to point to ${subdir}/${platform}/core.$ext"
+}
+
+if [ "${override_dir}" = "" ] ; then
+    if test -e "${pc_dir}" ; then
+        process_input_dir ${pc_dir} i386-pc
+    fi
+else
+    process_input_dir ${override_dir} ${target_cpu}-${native_platform}
+fi
+
+
+# Bye.
+exit 0

From 9056cbf38e490413e7fb66702e7b1809eaf7a1ee Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 2 Sep 2010 22:36:09 +0100
Subject: [PATCH 1508/1628] Zero %ebp and %edi when entering Linux's 32-bit
 entry point, as required by the boot protocol. *
 include/grub/i386/relocator.h (struct grub_relocator32_state): Add ebp and
 edi members. * grub-core/lib/i386/relocator.c (grub_relocator_boot): Handle
 state.ebp and state.edi. * grub-core/lib/i386/relocator32.S
 (grub_relocator32_start): Set %ebp and %edi according to grub_relocator32_ebp
 and grub_relocator32_edi respectively. * grub-core/loader/i386/linux.c
 (grub_linux_boot): Zero state.ebp and state.edi.

---
 ChangeLog                        | 15 +++++++++++++++
 grub-core/lib/i386/relocator.c   |  4 ++++
 grub-core/lib/i386/relocator32.S | 16 +++++++++++++++-
 grub-core/loader/i386/linux.c    |  2 +-
 include/grub/i386/relocator.h    |  2 ++
 5 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b1ccafd3..a12035634 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	Zero %ebp and %edi when entering Linux's 32-bit entry point, as
+	required by the boot protocol.
+
+	* include/grub/i386/relocator.h (struct grub_relocator32_state): Add
+	ebp and edi members.
+	* grub-core/lib/i386/relocator.c (grub_relocator_boot): Handle
+	state.ebp and state.edi.
+	* grub-core/lib/i386/relocator32.S (grub_relocator32_start): Set
+	%ebp and %edi according to grub_relocator32_ebp and
+	grub_relocator32_edi respectively.
+	* grub-core/loader/i386/linux.c (grub_linux_boot): Zero state.ebp
+	and state.edi.
+
 2010-09-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Add i386-pc-pxe image target.
diff --git a/grub-core/lib/i386/relocator.c b/grub-core/lib/i386/relocator.c
index f06a6ef86..1bc4240c3 100644
--- a/grub-core/lib/i386/relocator.c
+++ b/grub-core/lib/i386/relocator.c
@@ -59,7 +59,9 @@ extern grub_uint32_t grub_relocator32_ecx;
 extern grub_uint32_t grub_relocator32_edx;
 extern grub_uint32_t grub_relocator32_eip;
 extern grub_uint32_t grub_relocator32_esp;
+extern grub_uint32_t grub_relocator32_ebp;
 extern grub_uint32_t grub_relocator32_esi;
+extern grub_uint32_t grub_relocator32_edi;
 
 extern grub_uint8_t grub_relocator64_start;
 extern grub_uint8_t grub_relocator64_end;
@@ -165,7 +167,9 @@ grub_relocator32_boot (struct grub_relocator *rel,
   grub_relocator32_edx = state.edx;
   grub_relocator32_eip = state.eip;
   grub_relocator32_esp = state.esp;
+  grub_relocator32_ebp = state.ebp;
   grub_relocator32_esi = state.esi;
+  grub_relocator32_edi = state.edi;
 
   grub_memmove (get_virtual_current_address (ch), &grub_relocator32_start,
 		RELOCATOR_SIZEOF (32));
diff --git a/grub-core/lib/i386/relocator32.S b/grub-core/lib/i386/relocator32.S
index b581305a5..09ce56ad0 100644
--- a/grub-core/lib/i386/relocator32.S
+++ b/grub-core/lib/i386/relocator32.S
@@ -65,13 +65,27 @@ VARIABLE(grub_relocator32_esp)
 
 	movl	%eax, %esp
 
+	/* mov imm32, %eax */
+	.byte	0xb8
+VARIABLE(grub_relocator32_ebp)
+	.long	0
+
+	movl	%eax, %ebp
+
 	/* mov imm32, %eax */
 	.byte	0xb8
 VARIABLE(grub_relocator32_esi)
 	.long	0
 
 	movl	%eax, %esi
-	
+
+	/* mov imm32, %eax */
+	.byte	0xb8
+VARIABLE(grub_relocator32_edi)
+	.long	0
+
+	movl	%eax, %edi
+
 	/* mov imm32, %eax */
 	.byte	0xb8
 VARIABLE(grub_relocator32_eax)
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index debcdb71f..9cb26a0c2 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -716,7 +716,7 @@ grub_linux_boot (void)
 
   /* FIXME.  */
   /*  asm volatile ("lidt %0" : : "m" (idt_desc)); */
-  state.ebx = 0;
+  state.ebp = state.edi = state.ebx = 0;
   state.esi = real_mode_target;
   state.esp = real_mode_target;
   state.eip = params->code32_start;
diff --git a/include/grub/i386/relocator.h b/include/grub/i386/relocator.h
index 891235f9b..6ff5c6631 100644
--- a/include/grub/i386/relocator.h
+++ b/include/grub/i386/relocator.h
@@ -26,12 +26,14 @@
 struct grub_relocator32_state
 {
   grub_uint32_t esp;
+  grub_uint32_t ebp;
   grub_uint32_t eax;
   grub_uint32_t ebx;
   grub_uint32_t ecx;
   grub_uint32_t edx;
   grub_uint32_t eip;
   grub_uint32_t esi;
+  grub_uint32_t edi;
 };
 
 struct grub_relocator16_state

From c2a4eba698d6d928aaf974d06ffa28dbda7a2052 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 2 Sep 2010 22:42:36 +0100
Subject: [PATCH 1509/1628] * .bzrignore: Add *.pp, **/.dirstamp,
 grub-core/*.module, and grub-core/*.pp.

---
 .bzrignore | 4 ++++
 ChangeLog  | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/.bzrignore b/.bzrignore
index 3c7150afb..cfdd069fd 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -69,6 +69,7 @@ Makefile
 mod-*.c
 missing
 *.pf2
+*.pp
 po/*.mo
 po/grub.pot
 stamp-h
@@ -91,7 +92,10 @@ texinfo.tex
 grub-core/lib/libgcrypt-grub
 **/.deps-util
 **/.deps-core
+**/.dirstamp
 Makefile.util.am
 grub-core/Makefile.core.am
 grub-core/Makefile.gcry.am
 grub-core/Makefile.gcry.def
+grub-core/*.module
+grub-core/*.pp
diff --git a/ChangeLog b/ChangeLog
index a12035634..0f04c8c79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* .bzrignore: Add *.pp, **/.dirstamp, grub-core/*.module, and
+	grub-core/*.pp.
+
 2010-09-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	Zero %ebp and %edi when entering Linux's 32-bit entry point, as

From 03e261d84cb3cde4776185f573088165c9a353a6 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 2 Sep 2010 23:50:07 +0200
Subject: [PATCH 1510/1628] 	* grub-core/kern/i386/multiboot_mmap.c: Remove
 leftover include.

---
 ChangeLog                            | 4 ++++
 grub-core/kern/i386/multiboot_mmap.c | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0f04c8c79..b144c9507 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/i386/multiboot_mmap.c: Remove leftover include.
+
 2010-09-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* .bzrignore: Add *.pp, **/.dirstamp, grub-core/*.module, and
diff --git a/grub-core/kern/i386/multiboot_mmap.c b/grub-core/kern/i386/multiboot_mmap.c
index 0f463c23c..73c82049f 100644
--- a/grub-core/kern/i386/multiboot_mmap.c
+++ b/grub-core/kern/i386/multiboot_mmap.c
@@ -16,7 +16,6 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <grub/machine/init.h>
 #include <grub/machine/memory.h>
 #include <grub/types.h>
 #include <grub/multiboot.h>

From ef8e0ec8ed9a598f6818ff08a775261a1ff3742d Mon Sep 17 00:00:00 2001
From: Ian Turner <Ian.Turner@deshaw.com>
Date: Thu, 2 Sep 2010 23:59:27 +0200
Subject: [PATCH 1511/1628] 	* grub-core/fs/i386/pc/pxe.c
 (grub_pxefs_read): Keep the blocksize 	constant for the same file.

---
 ChangeLog                  | 5 +++++
 grub-core/fs/i386/pc/pxe.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b144c9507..6587cf6b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-02  Ian Turner  <Ian.Turner@deshaw.com>
+
+	* grub-core/fs/i386/pc/pxe.c (grub_pxefs_read): Keep the blocksize
+	constant for the same file.
+
 2010-09-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/i386/multiboot_mmap.c: Remove leftover include.
diff --git a/grub-core/fs/i386/pc/pxe.c b/grub-core/fs/i386/pc/pxe.c
index ee8c55416..90dfd5067 100644
--- a/grub-core/fs/i386/pc/pxe.c
+++ b/grub-core/fs/i386/pc/pxe.c
@@ -327,7 +327,7 @@ grub_pxefs_read (grub_file_t file, char *buf, grub_size_t len)
       o.gateway_ip = disk_data->gateway_ip;
       grub_strcpy ((char *)&o.filename[0], data->filename);
       o.tftp_port = grub_cpu_to_be16 (GRUB_PXE_TFTP_PORT);
-      o.packet_size = grub_pxe_blksize;
+      o.packet_size = data->block_size;
       grub_pxe_call (GRUB_PXENV_TFTP_OPEN, &o, pxe_rm_entry);
       if (o.status)
 	{

From 61d720e53536d3c6bb57b26e427bc11d2dbf9e4f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 3 Sep 2010 00:53:41 +0200
Subject: [PATCH 1512/1628] 	* configure.ac: Check for
 dm_log_with_errno_init in libdevmapper and 	echo if libdevmapper will be
 used.

---
 ChangeLog    |  5 +++++
 configure.ac | 24 ++++++++++++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6587cf6b6..e0249e4ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Check for dm_log_with_errno_init in libdevmapper and
+	echo if libdevmapper will be used.
+
 2010-09-02  Ian Turner  <Ian.Turner@deshaw.com>
 
 	* grub-core/fs/i386/pc/pxe.c (grub_pxefs_read): Keep the blocksize
diff --git a/configure.ac b/configure.ac
index 9fa460620..d71d94522 100644
--- a/configure.ac
+++ b/configure.ac
@@ -822,12 +822,23 @@ fi
 
 if test x"$device_mapper_excuse" = x ; then
   # Check for device-mapper library.
-  AC_CHECK_LIB([devmapper], [dm_task_create],
-               [LIBDEVMAPPER="-ldevmapper"
-                AC_DEFINE([HAVE_DEVICE_MAPPER], [1],
-                          [Define to 1 if you have the devmapper library.])],
+  AC_CHECK_LIB([devmapper], [dm_task_create], [],
                [device_mapper_excuse="need devmapper library"])
 fi
+
+if test x"$device_mapper_excuse" = x ; then
+  # Check for device-mapper library.
+  AC_CHECK_LIB([devmapper], [dm_log_with_errno_init],
+               [],
+               [device_mapper_excuse="need devmapper library"])
+fi
+
+if test x"$device_mapper_excuse" = x ; then
+   LIBDEVMAPPER="-ldevmapper";
+   AC_DEFINE([HAVE_DEVICE_MAPPER], [1],
+             [Define to 1 if you have the devmapper library.])
+fi
+
 AC_SUBST([LIBDEVMAPPER])
 
 AC_CHECK_LIB([zfs], [libzfs_init],
@@ -942,6 +953,11 @@ else
 echo PCI support for grub-emu: No "($grub_emu_pci_excuse)"
 fi
 fi
+if test x"$device_mapper_excuse" = x ; then
+echo With devmapper support: Yes
+else
+echo With devmapper support: No "($device_mapper_excuse)"
+fi
 if [ x"$enable_mm_debug" = xyes ]; then
 echo With memory debugging: Yes
 else

From efa1bee7a153f4f73aa6a9b33c23b5ccedb6b1d3 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 2 Sep 2010 23:57:21 +0100
Subject: [PATCH 1513/1628] * INSTALL: Document that libdevmapper needs to be
 1.02.34 or later.

---
 ChangeLog | 4 ++++
 INSTALL   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e0249e4ba..2e9be10c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* INSTALL: Document that libdevmapper needs to be 1.02.34 or later.
+
 2010-09-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Check for dm_log_with_errno_init in libdevmapper and
diff --git a/INSTALL b/INSTALL
index bbfa01f0a..e325fa2b2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -21,7 +21,7 @@ configuring the GRUB.
 
 On GNU/Linux, you also need:
 
-* libdevmapper (recommended)
+* libdevmapper 1.02.34 or later (recommended)
 
 To build grub-emu, you need:
 

From 9f915872efad66036efff88ecbc705daa0350299 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 3 Sep 2010 03:26:22 +0200
Subject: [PATCH 1514/1628] 	* configure.ac: Clean LIBS variable after
 tests.

---
 ChangeLog    | 4 ++++
 configure.ac | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2e9be10c5..69d46b55c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Clean LIBS variable after tests.
+
 2010-09-02  Colin Watson  <cjwatson@ubuntu.com>
 
 	* INSTALL: Document that libdevmapper needs to be 1.02.34 or later.
diff --git a/configure.ac b/configure.ac
index d71d94522..d362f68a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -853,6 +853,8 @@ AC_CHECK_LIB([nvpair], [nvlist_print],
                         [Define to 1 if you have the NVPAIR library.])],)
 AC_SUBST([LIBNVPAIR])
 
+LIBS=""
+
 pkglibrootdir='$(libdir)'/`echo $PACKAGE | sed "$program_transform_name"`
 AC_SUBST(pkglibrootdir)
 

From a7c00cdb94b9792a74f1ed75c8172c6ee851d094 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 3 Sep 2010 14:05:19 +0200
Subject: [PATCH 1515/1628] 	* grub-core/loader/i386/bsd.c
 (grub_freebsd_boot): Set %ebp to sane 	value. 	(grub_openbsd_boot): Likewise.
 	(grub_netbsd_boot): Likewise. 	* grub-core/loader/i386/xnu.c
 (grub_xnu_boot_resume): Likewise. 	(grub_xnu_boot): Likewise.

---
 ChangeLog                   | 9 +++++++++
 grub-core/loader/i386/bsd.c | 5 ++++-
 grub-core/loader/i386/xnu.c | 2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 69d46b55c..6c9e3bf6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/loader/i386/bsd.c (grub_freebsd_boot): Set %ebp to sane
+	value.
+	(grub_openbsd_boot): Likewise.
+	(grub_netbsd_boot): Likewise.
+	* grub-core/loader/i386/xnu.c (grub_xnu_boot_resume): Likewise.
+	(grub_xnu_boot): Likewise.
+
 2010-09-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Clean LIBS variable after tests.
diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
index cfea3b6a1..d72c8195a 100644
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -746,6 +746,7 @@ grub_freebsd_boot (void)
       grub_memcpy (&stack[9], &bi, sizeof (bi));
       state.eip = entry;
       state.esp = stack_target;
+      state.ebp = stack_target;
       stack[0] = entry; /* "Return" address.  */
       stack[1] = bootflags | FREEBSD_RB_BOOTINFO;
       stack[2] = bootdev;
@@ -830,7 +831,8 @@ grub_openbsd_boot (void)
 #endif
 
   state.eip = entry;
-  state.esp = ((grub_uint8_t *) stack - (grub_uint8_t *) buf0) + buf_target;
+  state.ebp = state.esp
+    = ((grub_uint8_t *) stack - (grub_uint8_t *) buf0) + buf_target;
   stack[0] = entry;
   stack[1] = bootflags;
   stack[2] = openbsd_root;
@@ -1045,6 +1047,7 @@ grub_netbsd_boot (void)
 
   state.eip = entry;
   state.esp = stack_target;
+  state.ebp = stack_target;
   stack[0] = entry;
   stack[1] = bootflags;
   stack[2] = 0;
diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
index 556f1dbf1..d35e9e0aa 100644
--- a/grub-core/loader/i386/xnu.c
+++ b/grub-core/loader/i386/xnu.c
@@ -836,6 +836,7 @@ grub_xnu_boot_resume (void)
   struct grub_relocator32_state state;
 
   state.esp = grub_xnu_stack;
+  state.ebp = grub_xnu_stack;
   state.eip = grub_xnu_entry_point;
   state.eax = grub_xnu_arg1;
 
@@ -1114,6 +1115,7 @@ grub_xnu_boot (void)
   state.eip = grub_xnu_entry_point;
   state.eax = grub_xnu_arg1;
   state.esp = grub_xnu_stack;
+  state.ebp = grub_xnu_stack;
   return grub_relocator32_boot (grub_xnu_relocator, state);
 }
 

From c8e7bf5ff7bb4fb1b2b9b98ddab057f2dc03a7cf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 3 Sep 2010 14:54:04 +0200
Subject: [PATCH 1516/1628] 	Compress grub_prefix.

	* grub-core/boot/i386/pc/lnxboot.S: Use
	GRUB_KERNEL_I386_PC_MULTIBOOT_SIGNATURE.
	* grub-core/kern/i386/pc/startup.S: Move grub_prefix to compressed part.
	* include/grub/offsets.h: Rename GRUB_MACHINE_DATA_END to
	GRUB_MACHINE_PREFIX_END. All users updated.
	(GRUB_KERNEL_I386_PC_PREFIX): Set to GRUB_KERNEL_I386_PC_RAW_SIZE.
	(GRUB_KERNEL_I386_PC_PREFIX_END): Set to GRUB_KERNEL_I386_PC_PREFIX
	+ 0x40.
	(GRUB_KERNEL_I386_PC_RAW_SIZE): Decrease.
	* util/grub-mkimage.c (image_target_desc): Change data_end to
	prefix_end. All users updated.
---
 ChangeLog                                 | 16 +++++++++++
 grub-core/boot/i386/pc/lnxboot.S          |  2 +-
 grub-core/kern/i386/coreboot/startup.S    |  2 +-
 grub-core/kern/i386/ieee1275/startup.S    |  2 +-
 grub-core/kern/i386/pc/startup.S          | 18 ++++++------
 grub-core/kern/i386/qemu/startup.S        |  2 +-
 grub-core/kern/mips/startup.S             |  2 +-
 grub-core/kern/powerpc/ieee1275/startup.S |  2 +-
 grub-core/kern/sparc64/ieee1275/crt0.S    |  2 +-
 include/grub/offsets.h                    | 35 ++++++++++++-----------
 util/grub-mkimage.c                       | 30 +++++++++----------
 11 files changed, 67 insertions(+), 46 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6c9e3bf6d..cbd0337ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Compress grub_prefix.
+
+	* grub-core/boot/i386/pc/lnxboot.S: Use
+	GRUB_KERNEL_I386_PC_MULTIBOOT_SIGNATURE.
+	* grub-core/kern/i386/pc/startup.S: Move grub_prefix to compressed part.
+	* include/grub/offsets.h: Rename GRUB_MACHINE_DATA_END to
+	GRUB_MACHINE_PREFIX_END. All users updated.
+	(GRUB_KERNEL_I386_PC_PREFIX): Set to GRUB_KERNEL_I386_PC_RAW_SIZE.
+	(GRUB_KERNEL_I386_PC_PREFIX_END): Set to GRUB_KERNEL_I386_PC_PREFIX
+	+ 0x40.
+	(GRUB_KERNEL_I386_PC_RAW_SIZE): Decrease.
+	* util/grub-mkimage.c (image_target_desc): Change data_end to
+	prefix_end. All users updated.
+
 2010-09-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/loader/i386/bsd.c (grub_freebsd_boot): Set %ebp to sane
diff --git a/grub-core/boot/i386/pc/lnxboot.S b/grub-core/boot/i386/pc/lnxboot.S
index b4f0030b8..9348553c3 100644
--- a/grub-core/boot/i386/pc/lnxboot.S
+++ b/grub-core/boot/i386/pc/lnxboot.S
@@ -185,7 +185,7 @@ real_code_2:
 	call	LOCAL(move_memory)
 
 	/* Check for multiboot signature.  */
-	cmpl	$MULTIBOOT_HEADER_MAGIC, %ss:(DATA_ADDR + GRUB_KERNEL_MACHINE_DATA_END)
+	cmpl	$MULTIBOOT_HEADER_MAGIC, %ss:(DATA_ADDR + GRUB_KERNEL_I386_PC_MULTIBOOT_SIGNATURE)
 	jz	1f
 
 	movl	(ramdisk_image - start), %esi
diff --git a/grub-core/kern/i386/coreboot/startup.S b/grub-core/kern/i386/coreboot/startup.S
index ec3a0e64b..592073776 100644
--- a/grub-core/kern/i386/coreboot/startup.S
+++ b/grub-core/kern/i386/coreboot/startup.S
@@ -51,7 +51,7 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = _start + GRUB_KERNEL_MACHINE_DATA_END
+	. = _start + GRUB_KERNEL_MACHINE_PREFIX_END
 
 /*
  *  Support for booting GRUB from a Multiboot boot loader (e.g. GRUB itself).
diff --git a/grub-core/kern/i386/ieee1275/startup.S b/grub-core/kern/i386/ieee1275/startup.S
index 2a04753df..3ecf09598 100644
--- a/grub-core/kern/i386/ieee1275/startup.S
+++ b/grub-core/kern/i386/ieee1275/startup.S
@@ -51,7 +51,7 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = _start + GRUB_KERNEL_MACHINE_DATA_END
+	. = _start + GRUB_KERNEL_MACHINE_PREFIX_END
 
 codestart:
 	movl %eax, EXT_C(grub_ieee1275_entry_fn)
diff --git a/grub-core/kern/i386/pc/startup.S b/grub-core/kern/i386/pc/startup.S
index b5e9a9b85..9b53deeb2 100644
--- a/grub-core/kern/i386/pc/startup.S
+++ b/grub-core/kern/i386/pc/startup.S
@@ -100,14 +100,6 @@ VARIABLE(grub_install_dos_part)
 	.long	0xFFFFFFFF
 VARIABLE(grub_install_bsd_part)
 	.long	0xFFFFFFFF
-VARIABLE(grub_prefix)
-	/* to be filled by grub-mkimage */
-
-	/*
-	 *  Leave some breathing room for the prefix.
-	 */
-
-	. = _start + GRUB_KERNEL_MACHINE_DATA_END
 
 #ifdef APPLE_CC
 bss_start:
@@ -450,6 +442,16 @@ gate_a20_check_state:
  */
 	. = _start + GRUB_KERNEL_MACHINE_RAW_SIZE
 
+	. = _start + GRUB_KERNEL_MACHINE_PREFIX
+VARIABLE(grub_prefix)
+	/* to be filled by grub-mkimage */
+
+	/*
+	 *  Leave some breathing room for the prefix.
+	 */
+	. = _start + GRUB_KERNEL_MACHINE_PREFIX_END
+
+
 
 /*
  * grub_exit()
diff --git a/grub-core/kern/i386/qemu/startup.S b/grub-core/kern/i386/qemu/startup.S
index e705953b5..680de9dc4 100644
--- a/grub-core/kern/i386/qemu/startup.S
+++ b/grub-core/kern/i386/qemu/startup.S
@@ -39,7 +39,7 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = _start + GRUB_KERNEL_MACHINE_DATA_END
+	. = _start + GRUB_KERNEL_MACHINE_PREFIX_END
 
 codestart:
 	/* Relocate to low memory.  First we figure out our location.
diff --git a/grub-core/kern/mips/startup.S b/grub-core/kern/mips/startup.S
index 134853a9d..6811353ea 100644
--- a/grub-core/kern/mips/startup.S
+++ b/grub-core/kern/mips/startup.S
@@ -154,7 +154,7 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = _start + GRUB_KERNEL_MACHINE_DATA_END
+	. = _start + GRUB_KERNEL_MACHINE_PREFIX_END
 #ifdef GRUB_MACHINE_MIPS_YEELOONG
 VARIABLE (grub_arch_busclock)
 	.long 0
diff --git a/grub-core/kern/powerpc/ieee1275/startup.S b/grub-core/kern/powerpc/ieee1275/startup.S
index 526df1d91..0b1c23346 100644
--- a/grub-core/kern/powerpc/ieee1275/startup.S
+++ b/grub-core/kern/powerpc/ieee1275/startup.S
@@ -39,7 +39,7 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = _start + GRUB_KERNEL_MACHINE_DATA_END
+	. = _start + GRUB_KERNEL_MACHINE_PREFIX_END
 
 codestart:
 	li      2, 0
diff --git a/grub-core/kern/sparc64/ieee1275/crt0.S b/grub-core/kern/sparc64/ieee1275/crt0.S
index f0f47416d..f178f5d3c 100644
--- a/grub-core/kern/sparc64/ieee1275/crt0.S
+++ b/grub-core/kern/sparc64/ieee1275/crt0.S
@@ -42,7 +42,7 @@ VARIABLE(grub_prefix)
 	 *  Leave some breathing room for the prefix.
 	 */
 
-	. = EXT_C(_start) + GRUB_KERNEL_MACHINE_DATA_END
+	. = EXT_C(_start) + GRUB_KERNEL_MACHINE_PREFIX_END
 
 codestart:
 	/* Copy the modules past the end of the kernel image.
diff --git a/include/grub/offsets.h b/include/grub/offsets.h
index 7763e488c..47eb6c9bd 100644
--- a/include/grub/offsets.h
+++ b/include/grub/offsets.h
@@ -34,14 +34,17 @@
 /* The offset of GRUB_INSTALL_BSD_PART.  */
 #define GRUB_KERNEL_I386_PC_INSTALL_BSD_PART	0x18
 
-/* The offset of GRUB_PREFIX.  */
-#define GRUB_KERNEL_I386_PC_PREFIX		0x1c
-
-/* End of the data section. */
-#define GRUB_KERNEL_I386_PC_DATA_END		0x5c
+/* The offset of multiboot signature.  */
+#define GRUB_KERNEL_I386_PC_MULTIBOOT_SIGNATURE 0x1c
 
 /* The size of the first region which won't be compressed.  */
-#define GRUB_KERNEL_I386_PC_RAW_SIZE		(GRUB_KERNEL_I386_PC_DATA_END + 0x5F0)
+#define GRUB_KERNEL_I386_PC_RAW_SIZE		0x5D8
+
+/* The offset of GRUB_PREFIX.  */
+#define GRUB_KERNEL_I386_PC_PREFIX		GRUB_KERNEL_I386_PC_RAW_SIZE
+
+/* End of the data section. */
+#define GRUB_KERNEL_I386_PC_PREFIX_END		(GRUB_KERNEL_I386_PC_PREFIX + 0x40)
 
 /* The segment where the kernel is loaded.  */
 #define GRUB_BOOT_I386_PC_KERNEL_SEG	0x800
@@ -65,7 +68,7 @@
 #define GRUB_KERNEL_I386_QEMU_PREFIX		0x10
 
 /* End of the data section. */
-#define GRUB_KERNEL_I386_QEMU_DATA_END		0x50
+#define GRUB_KERNEL_I386_QEMU_PREFIX_END		0x50
 
 #define GRUB_KERNEL_I386_QEMU_LINK_ADDR         0x8200
 
@@ -82,7 +85,7 @@
 #define GRUB_KERNEL_SPARC64_IEEE1275_PREFIX		0x14
 
 /* End of the data section. */
-#define GRUB_KERNEL_SPARC64_IEEE1275_DATA_END		0x114
+#define GRUB_KERNEL_SPARC64_IEEE1275_PREFIX_END		0x114
 
 #define GRUB_BOOT_SPARC64_IEEE1275_LIST_SIZE	12
 
@@ -91,7 +94,7 @@
 #define GRUB_KERNEL_SPARC64_IEEE1275_LINK_ADDR 0x4400
 
 #define GRUB_KERNEL_POWERPC_IEEE1275_PREFIX		0x4
-#define GRUB_KERNEL_POWERPC_IEEE1275_DATA_END	0x44
+#define GRUB_KERNEL_POWERPC_IEEE1275_PREFIX_END	0x44
 #define GRUB_KERNEL_POWERPC_IEEE1275_LINK_ALIGN 4
 #define GRUB_KERNEL_POWERPC_IEEE1275_LINK_ADDR 0x200000
 
@@ -105,29 +108,29 @@
 #define GRUB_KERNEL_MIPS_YEELOONG_KERNEL_IMAGE_SIZE      0x10
 
 #define GRUB_KERNEL_MIPS_YEELOONG_PREFIX	        GRUB_KERNEL_MIPS_YEELOONG_RAW_SIZE
-#define GRUB_KERNEL_MIPS_YEELOONG_DATA_END	GRUB_KERNEL_MIPS_YEELOONG_RAW_SIZE + 0x48
+#define GRUB_KERNEL_MIPS_YEELOONG_PREFIX_END	GRUB_KERNEL_MIPS_YEELOONG_RAW_SIZE + 0x48
 
 /* The offset of GRUB_PREFIX.  */
 #define GRUB_KERNEL_I386_EFI_PREFIX		0x8
 
 /* End of the data section. */
-#define GRUB_KERNEL_I386_EFI_DATA_END		0x50
+#define GRUB_KERNEL_I386_EFI_PREFIX_END		0x50
 
 /* The offset of GRUB_PREFIX.  */
 #define GRUB_KERNEL_X86_64_EFI_PREFIX		0x8
 
 /* End of the data section. */
-#define GRUB_KERNEL_X86_64_EFI_DATA_END		0x50
+#define GRUB_KERNEL_X86_64_EFI_PREFIX_END		0x50
 
 #define GRUB_KERNEL_I386_COREBOOT_PREFIX	0x2
-#define GRUB_KERNEL_I386_COREBOOT_DATA_END	0x42
+#define GRUB_KERNEL_I386_COREBOOT_PREFIX_END	0x42
 #define GRUB_KERNEL_I386_COREBOOT_LINK_ADDR	0x8200
 
 #define GRUB_KERNEL_I386_MULTIBOOT_PREFIX	GRUB_KERNEL_I386_COREBOOT_PREFIX
-#define GRUB_KERNEL_I386_MULTIBOOT_DATA_END	GRUB_KERNEL_I386_COREBOOT_DATA_END
+#define GRUB_KERNEL_I386_MULTIBOOT_PREFIX_END	GRUB_KERNEL_I386_COREBOOT_PREFIX_END
 
 #define GRUB_KERNEL_I386_IEEE1275_PREFIX	0x2
-#define GRUB_KERNEL_I386_IEEE1275_DATA_END	0x42
+#define GRUB_KERNEL_I386_IEEE1275_PREFIX_END	0x42
 #define GRUB_KERNEL_I386_IEEE1275_LINK_ADDR	0x10000
 
 #define GRUB_KERNEL_I386_IEEE1275_MOD_ALIGN	0x1000
@@ -157,7 +160,7 @@
 #define GRUB_KERNEL_MACHINE_COMPRESSED_SIZE GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _COMPRESSED_SIZE)
 
 #define GRUB_KERNEL_MACHINE_PREFIX GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _PREFIX)
-#define GRUB_KERNEL_MACHINE_DATA_END GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _DATA_END)
+#define GRUB_KERNEL_MACHINE_PREFIX_END GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _PREFIX_END)
 #define GRUB_BOOT_MACHINE_KERNEL_SEG GRUB_OFFSETS_CONCAT (GRUB_BOOT_, MACHINE, _KERNEL_SEG)
 #define GRUB_MEMORY_MACHINE_UPPER GRUB_OFFSETS_CONCAT (GRUB_MEMORY_, MACHINE, _UPPER)
 #define GRUB_KERNEL_MACHINE_RAW_SIZE GRUB_OFFSETS_CONCAT (GRUB_KERNEL_, MACHINE, _RAW_SIZE)
diff --git a/util/grub-mkimage.c b/util/grub-mkimage.c
index 4e151dd62..d798ad052 100644
--- a/util/grub-mkimage.c
+++ b/util/grub-mkimage.c
@@ -63,7 +63,7 @@ struct image_target_desc
       PLATFORM_FLAGS_LZMA = 1
     } flags;
   unsigned prefix;
-  unsigned data_end;
+  unsigned prefix_end;
   unsigned raw_size;
   unsigned total_module_size;
   unsigned kernel_image_size;
@@ -86,7 +86,7 @@ struct image_target_desc image_targets[] =
       .id = IMAGE_COREBOOT,
       .flags = PLATFORM_FLAGS_NONE,
       .prefix = GRUB_KERNEL_I386_COREBOOT_PREFIX,
-      .data_end = GRUB_KERNEL_I386_COREBOOT_DATA_END,
+      .prefix_end = GRUB_KERNEL_I386_COREBOOT_PREFIX_END,
       .raw_size = 0,
       .total_module_size = TARGET_NO_FIELD,
       .kernel_image_size = TARGET_NO_FIELD,
@@ -108,7 +108,7 @@ struct image_target_desc image_targets[] =
       .id = IMAGE_COREBOOT,
       .flags = PLATFORM_FLAGS_NONE,
       .prefix = GRUB_KERNEL_I386_MULTIBOOT_PREFIX,
-      .data_end = GRUB_KERNEL_I386_MULTIBOOT_DATA_END,
+      .prefix_end = GRUB_KERNEL_I386_MULTIBOOT_PREFIX_END,
       .raw_size = 0,
       .total_module_size = TARGET_NO_FIELD,
       .kernel_image_size = TARGET_NO_FIELD,
@@ -130,7 +130,7 @@ struct image_target_desc image_targets[] =
       .id = IMAGE_I386_PC, 
       .flags = PLATFORM_FLAGS_LZMA,
       .prefix = GRUB_KERNEL_I386_PC_PREFIX,
-      .data_end = GRUB_KERNEL_I386_PC_DATA_END,
+      .prefix_end = GRUB_KERNEL_I386_PC_PREFIX_END,
       .raw_size = GRUB_KERNEL_I386_PC_RAW_SIZE,
       .total_module_size = GRUB_KERNEL_I386_PC_TOTAL_MODULE_SIZE,
       .kernel_image_size = GRUB_KERNEL_I386_PC_KERNEL_IMAGE_SIZE,
@@ -148,7 +148,7 @@ struct image_target_desc image_targets[] =
       .id = IMAGE_I386_PC_PXE, 
       .flags = PLATFORM_FLAGS_LZMA,
       .prefix = GRUB_KERNEL_I386_PC_PREFIX,
-      .data_end = GRUB_KERNEL_I386_PC_DATA_END,
+      .prefix_end = GRUB_KERNEL_I386_PC_PREFIX_END,
       .raw_size = GRUB_KERNEL_I386_PC_RAW_SIZE,
       .total_module_size = GRUB_KERNEL_I386_PC_TOTAL_MODULE_SIZE,
       .kernel_image_size = GRUB_KERNEL_I386_PC_KERNEL_IMAGE_SIZE,
@@ -166,7 +166,7 @@ struct image_target_desc image_targets[] =
       .id = IMAGE_EFI,
       .flags = PLATFORM_FLAGS_NONE,
       .prefix = GRUB_KERNEL_I386_EFI_PREFIX,
-      .data_end = GRUB_KERNEL_I386_EFI_DATA_END,
+      .prefix_end = GRUB_KERNEL_I386_EFI_PREFIX_END,
       .raw_size = 0,
       .total_module_size = TARGET_NO_FIELD,
       .kernel_image_size = TARGET_NO_FIELD,
@@ -188,7 +188,7 @@ struct image_target_desc image_targets[] =
       .id = IMAGE_I386_IEEE1275, 
       .flags = PLATFORM_FLAGS_NONE,
       .prefix = GRUB_KERNEL_I386_IEEE1275_PREFIX,
-      .data_end = GRUB_KERNEL_I386_IEEE1275_DATA_END,
+      .prefix_end = GRUB_KERNEL_I386_IEEE1275_PREFIX_END,
       .raw_size = 0,
       .total_module_size = TARGET_NO_FIELD,
       .kernel_image_size = TARGET_NO_FIELD,
@@ -210,7 +210,7 @@ struct image_target_desc image_targets[] =
       .id = IMAGE_QEMU, 
       .flags = PLATFORM_FLAGS_NONE,
       .prefix = GRUB_KERNEL_I386_QEMU_PREFIX,
-      .data_end = GRUB_KERNEL_I386_QEMU_DATA_END,
+      .prefix_end = GRUB_KERNEL_I386_QEMU_PREFIX_END,
       .raw_size = 0,
       .total_module_size = TARGET_NO_FIELD,
       .compressed_size = TARGET_NO_FIELD,
@@ -228,7 +228,7 @@ struct image_target_desc image_targets[] =
       .id = IMAGE_EFI, 
       .flags = PLATFORM_FLAGS_NONE,
       .prefix = GRUB_KERNEL_X86_64_EFI_PREFIX,
-      .data_end = GRUB_KERNEL_X86_64_EFI_DATA_END,
+      .prefix_end = GRUB_KERNEL_X86_64_EFI_PREFIX_END,
       .raw_size = 0,
       .total_module_size = TARGET_NO_FIELD,
       .kernel_image_size = TARGET_NO_FIELD,
@@ -250,7 +250,7 @@ struct image_target_desc image_targets[] =
       .id = IMAGE_YEELOONG_FLASH, 
       .flags = PLATFORM_FLAGS_NONE,
       .prefix = GRUB_KERNEL_MIPS_YEELOONG_PREFIX,
-      .data_end = GRUB_KERNEL_MIPS_YEELOONG_DATA_END,
+      .prefix_end = GRUB_KERNEL_MIPS_YEELOONG_PREFIX_END,
       .raw_size = GRUB_KERNEL_MIPS_YEELOONG_RAW_SIZE,
       .total_module_size = GRUB_KERNEL_MIPS_YEELOONG_TOTAL_MODULE_SIZE,
       .compressed_size = GRUB_KERNEL_MIPS_YEELOONG_COMPRESSED_SIZE,
@@ -270,7 +270,7 @@ struct image_target_desc image_targets[] =
       .id = IMAGE_YEELOONG_ELF, 
       .flags = PLATFORM_FLAGS_NONE,
       .prefix = GRUB_KERNEL_MIPS_YEELOONG_PREFIX,
-      .data_end = GRUB_KERNEL_MIPS_YEELOONG_DATA_END,
+      .prefix_end = GRUB_KERNEL_MIPS_YEELOONG_PREFIX_END,
       .raw_size = GRUB_KERNEL_MIPS_YEELOONG_RAW_SIZE,
       .total_module_size = GRUB_KERNEL_MIPS_YEELOONG_TOTAL_MODULE_SIZE,
       .compressed_size = GRUB_KERNEL_MIPS_YEELOONG_COMPRESSED_SIZE,
@@ -290,7 +290,7 @@ struct image_target_desc image_targets[] =
       .id = IMAGE_PPC, 
       .flags = PLATFORM_FLAGS_NONE,
       .prefix = GRUB_KERNEL_POWERPC_IEEE1275_PREFIX,
-      .data_end = GRUB_KERNEL_POWERPC_IEEE1275_DATA_END,
+      .prefix_end = GRUB_KERNEL_POWERPC_IEEE1275_PREFIX_END,
       .raw_size = 0,
       .total_module_size = TARGET_NO_FIELD,
       .kernel_image_size = TARGET_NO_FIELD,
@@ -312,7 +312,7 @@ struct image_target_desc image_targets[] =
       .id = IMAGE_SPARC64_RAW,
       .flags = PLATFORM_FLAGS_NONE,
       .prefix = GRUB_KERNEL_SPARC64_IEEE1275_PREFIX,
-      .data_end = GRUB_KERNEL_SPARC64_IEEE1275_DATA_END,
+      .prefix_end = GRUB_KERNEL_SPARC64_IEEE1275_PREFIX_END,
       .raw_size = GRUB_KERNEL_SPARC64_IEEE1275_RAW_SIZE,
       .total_module_size = GRUB_KERNEL_SPARC64_IEEE1275_TOTAL_MODULE_SIZE,
       .kernel_image_size = GRUB_KERNEL_SPARC64_IEEE1275_KERNEL_IMAGE_SIZE,
@@ -330,7 +330,7 @@ struct image_target_desc image_targets[] =
       .id = IMAGE_SPARC64_AOUT,
       .flags = PLATFORM_FLAGS_NONE,
       .prefix = GRUB_KERNEL_SPARC64_IEEE1275_PREFIX,
-      .data_end = GRUB_KERNEL_SPARC64_IEEE1275_DATA_END,
+      .prefix_end = GRUB_KERNEL_SPARC64_IEEE1275_PREFIX_END,
       .raw_size = GRUB_KERNEL_SPARC64_IEEE1275_RAW_SIZE,
       .total_module_size = GRUB_KERNEL_SPARC64_IEEE1275_TOTAL_MODULE_SIZE,
       .kernel_image_size = GRUB_KERNEL_SPARC64_IEEE1275_KERNEL_IMAGE_SIZE,
@@ -578,7 +578,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
 			       total_module_size, &start_address, &rel_section,
 			       &reloc_size, &align, image_target);
 
-  if (image_target->prefix + strlen (prefix) + 1 > image_target->data_end)
+  if (image_target->prefix + strlen (prefix) + 1 > image_target->prefix_end)
     grub_util_error (_("prefix is too long"));
   strcpy (kernel_img + image_target->prefix, prefix);
 

From cc7b1ab4d6c17b4f698a8c2a0107cf14adead9c4 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Fri, 3 Sep 2010 20:35:23 +0530
Subject: [PATCH 1517/1628] review comments

---
 grub-core/commands/regexp.c   |  5 ++---
 grub-core/commands/wildcard.c |  4 ++--
 grub-core/script/execute.c    | 13 +++++++------
 include/grub/script_sh.h      |  3 ++-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/grub-core/commands/regexp.c b/grub-core/commands/regexp.c
index 05f6d55ad..8e0ec5a3a 100644
--- a/grub-core/commands/regexp.c
+++ b/grub-core/commands/regexp.c
@@ -70,17 +70,16 @@ static grub_command_t cmd;
 
 GRUB_MOD_INIT(regexp)
 {
-  extern struct grub_script_wildcard_translator translator;
-
   cmd = grub_register_command ("regexp", grub_cmd_regexp,
 			       N_("REGEXP STRING"),
 			       N_("Test if REGEXP matches STRING."));
 
   /* Setup GRUB script wildcard translator.  */
-  wildcard_translator = &translator;
+  grub_wildcard_translator = &grub_filename_translator;
 }
 
 GRUB_MOD_FINI(regexp)
 {
   grub_unregister_command (cmd);
+  grub_wildcard_translator = 0;
 }
diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
index 2eec9631d..bba99dcc8 100644
--- a/grub-core/commands/wildcard.c
+++ b/grub-core/commands/wildcard.c
@@ -40,7 +40,7 @@ static char* wildcard_escape (const char *s);
 static char* wildcard_unescape (const char *s);
 static grub_err_t wildcard_expand (const char *s, char ***strs);
 
-struct grub_script_wildcard_translator translator = {
+struct grub_script_wildcard_translator grub_filename_translator = {
   .expand = wildcard_expand,
   .escape = wildcard_escape,
   .unescape = wildcard_unescape
@@ -276,7 +276,7 @@ match_files (const char *prefix, const char *suffix, const char *end,
     char **t;
     char *buffer;
 
-    /* skip hidden files, . and .. */
+    /* skip . and .. names */
     if (grub_strcmp(".", name) == 0 || grub_strcmp("..", name) == 0)
       return 0;
 
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
index 108e5cc5d..056110fd5 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -42,7 +42,7 @@ struct grub_script_scope
 static struct grub_script_scope *scope = 0;
 
 /* Wildcard translator for GRUB script.  */
-struct grub_script_wildcard_translator *wildcard_translator;
+struct grub_script_wildcard_translator *grub_wildcard_translator;
 
 grub_err_t
 grub_script_break (grub_command_t cmd, int argc, char *argv[])
@@ -233,13 +233,13 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
     int r;
     char *p = 0;
 
-    if (! wildcard_translator || escape_type == 0)
+    if (! grub_wildcard_translator || escape_type == 0)
       return grub_script_argv_append (&result, s);
 
     if (escape_type > 0)
-      p = wildcard_translator->escape (s);
+      p = grub_wildcard_translator->escape (s);
     else if (escape_type < 0)
-      p = wildcard_translator->unescape (s);
+      p = grub_wildcard_translator->unescape (s);
 
     if (! p)
       return 1;
@@ -304,7 +304,7 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
 
   /* Perform wildcard expansion.  */
 
-  if (wildcard_translator)
+  if (grub_wildcard_translator)
     {
       int j;
       int failed = 0;
@@ -315,7 +315,8 @@ grub_script_arglist_to_argv (struct grub_script_arglist *arglist,
       result.args = 0;
       for (i = 0; unexpanded.args[i]; i++)
 	{
-	  if (wildcard_translator->expand (unexpanded.args[i], &expansions))
+	  if (grub_wildcard_translator->expand (unexpanded.args[i],
+						&expansions))
 	    {
 	      grub_script_argv_free (&unexpanded);
 	      goto fail;
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 9140d280a..e33739b41 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -78,7 +78,8 @@ struct grub_script_wildcard_translator
   char *(*unescape) (const char *str);
   grub_err_t (*expand) (const char *str, char ***expansions);
 };
-extern struct grub_script_wildcard_translator *wildcard_translator;
+extern struct grub_script_wildcard_translator *grub_wildcard_translator;
+extern struct grub_script_wildcard_translator *grub_filename_translator;
 
 /* A complete argument.  It consists of a list of one or more `struct
    grub_script_arg's.  */

From 78780e7005c687d35d9a4a0ba09059520a1ecff6 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Fri, 3 Sep 2010 20:53:38 +0530
Subject: [PATCH 1518/1628] fix hotkey handling

---
 grub-core/commands/menuentry.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
index be4fa3347..b6662bb96 100644
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -107,8 +107,8 @@ append_menu_entry (int argc, const char **args, char **classes,
 	    menu_hotkey = hotkey_aliases[i].key;
 	    break;
 	  }
-      if (i > ARRAY_SIZE (hotkey_aliases))
-	goto fail;
+      if (i == ARRAY_SIZE (hotkey_aliases))
+	menu_hotkey = hotkey[0];
     }
 
   if (! argc)

From 9284756e17c87a76c2ec22b1c59f5e5eab2f3a1b Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Fri, 3 Sep 2010 21:08:12 +0530
Subject: [PATCH 1519/1628] merge menuentry.mod into normal.mod

---
 grub-core/Makefile.core.def    | 7 ++-----
 grub-core/commands/menuentry.c | 6 ++++--
 grub-core/normal/main.c        | 2 ++
 include/grub/menu.h            | 3 +++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index bba3503a6..be005378b 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1173,6 +1173,8 @@ module = {
   common = script/lexer.c;
   common = script/argv.c;
 
+  common = commands/menuentry.c;
+
   common = unidata.c;
   common_nodist = grub_script.tab.c;
   common_nodist = grub_script.yy.c;
@@ -1408,8 +1410,3 @@ module = {
   name = test_blockarg;
   common = tests/test_blockarg.c;
 };
-
-module = {
-  name = menuentry;
-  common = commands/menuentry.c;
-};
\ No newline at end of file
diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
index b6662bb96..5e20d4285 100644
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -200,14 +200,16 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
 
 static grub_extcmd_t cmd;
 
-GRUB_MOD_INIT(menuentry)
+void
+grub_menu_init (void)
 {
   cmd = grub_register_extcmd ("menuentry", grub_cmd_menuentry,
 			      GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_BLOCKS,
 			      N_("BLOCK"), N_("Define a menuentry."), options);
 }
 
-GRUB_MOD_FINI(menuentry)
+void
+grub_menu_fini (void)
 {
   grub_unregister_extcmd (cmd);
 }
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index 64d438a91..6a008f577 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -476,6 +476,7 @@ GRUB_MOD_INIT(normal)
 {
   grub_context_init ();
   grub_script_init ();
+  grub_menu_init ();
 
   grub_xputs_saved = grub_xputs;
   grub_xputs = grub_xputs_normal;
@@ -515,6 +516,7 @@ GRUB_MOD_FINI(normal)
 {
   grub_context_fini ();
   grub_script_fini ();
+  grub_menu_fini ();
 
   grub_xputs = grub_xputs_saved;
 
diff --git a/include/grub/menu.h b/include/grub/menu.h
index 9dc257ab7..608253863 100644
--- a/include/grub/menu.h
+++ b/include/grub/menu.h
@@ -100,4 +100,7 @@ void grub_menu_execute_with_fallback (grub_menu_t menu,
 void grub_menu_entry_run (grub_menu_entry_t entry);
 int grub_menu_get_default_entry_index (grub_menu_t menu);
 
+void grub_menu_init (void);
+void grub_menu_fini (void);
+
 #endif /* GRUB_MENU_HEADER */

From 6556eba9c62854f7afcece7db1944bc91f511e7e Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Fri, 3 Sep 2010 21:23:00 +0530
Subject: [PATCH 1520/1628] 	Add missing files into "make dist" tarball for
 other platforms.

	* gentpl.py (script): Use dist_noinst_DATA instead of EXTRA_DIST.
	* conf/Makefile.common (dist_noinst_DATA): New variable.
	* conf/Makefile.extra-dist: Added missing make dist files.
	* grub-core/Makefile.core.def: Likewise.
---
 ChangeLog                   | 9 +++++++++
 conf/Makefile.common        | 1 +
 conf/Makefile.extra-dist    | 9 +++++++--
 gentpl.py                   | 2 +-
 grub-core/Makefile.core.def | 4 ++++
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cbd0337ab..5c64e0207 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-03  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	Add missing files into "make dist" tarball for other platforms.
+
+	* gentpl.py (script): Use dist_noinst_DATA instead of EXTRA_DIST.
+	* conf/Makefile.common (dist_noinst_DATA): New variable.
+	* conf/Makefile.extra-dist: Added missing make dist files.
+	* grub-core/Makefile.core.def: Likewise.
+
 2010-09-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Compress grub_prefix.
diff --git a/conf/Makefile.common b/conf/Makefile.common
index fe14c0e18..fca0f67ae 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -115,6 +115,7 @@ pkglib_SCRIPTS =
 noinst_PROGRAMS =
 grubconf_SCRIPTS =
 noinst_LIBRARIES =
+dist_noinst_DATA =
 
 TESTS =
 EXTRA_DIST =
diff --git a/conf/Makefile.extra-dist b/conf/Makefile.extra-dist
index 3acef7af7..afedc7d28 100644
--- a/conf/Makefile.extra-dist
+++ b/conf/Makefile.extra-dist
@@ -5,6 +5,11 @@ EXTRA_DIST += gentpl.py
 EXTRA_DIST += Makefile.tpl
 EXTRA_DIST += Makefile.util.def
 
+EXTRA_DIST += unicode
+
+EXTRA_DIST += util/import_gcry.py
+EXTRA_DIST += util/import_unicode.py
+
 EXTRA_DIST += docs/man
 EXTRA_DIST += docs/grub.cfg
 
@@ -26,8 +31,8 @@ EXTRA_DIST += grub-core/genterminallist.sh
 EXTRA_DIST += grub-core/genparttoollist.sh
 EXTRA_DIST += grub-core/genemuinitheader.sh
 
+EXTRA_DIST += grub-core/lib/libgcrypt/cipher
 EXTRA_DIST += $(shell find $(top_srcdir)/include -name '*.h')
 EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/gnulib -name '*.h')
 EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/efiemu -name '*.h')
-EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/lib/posix_wrap -name '*.h')
-EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/lib/libgcrypt_wrap -name '*.h')
+EXTRA_DIST += $(shell find $(top_srcdir)/grub-core/lib -name '*.h')
diff --git a/gentpl.py b/gentpl.py
index abfb20444..cd34fccff 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -478,7 +478,7 @@ chmod a+x [+ name +]
 """)
 
     r += gvar_add("CLEANFILES", "[+ name +]")
-    r += gvar_add("EXTRA_DIST", platform_sources(platform))
+    r += gvar_add("dist_noinst_DATA", platform_sources(platform))
     return r
 
 def module_rules():
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 353b9d123..b953adfb9 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -137,6 +137,7 @@ kernel = {
   mips_yeeloong = term/at_keyboard.c;
   mips_yeeloong = term/serial.c;
   mips_yeeloong = video/sm712.c;
+  extra_dist = video/sm712_init.c;
 
   powerpc_ieee1275 = kern/ieee1275/init.c;
   powerpc_ieee1275 = kern/powerpc/cache.S;
@@ -1009,6 +1010,9 @@ module = {
   powerpc = lib/powerpc/relocator_asm.S;
   powerpc = lib/powerpc/relocator.c;
 
+  extra_dist = lib/i386/relocator_common.S;
+  extra_dist = kern/powerpc/cache_flush.S;
+
   enable = mips;
   enable = powerpc;
   enable = x86;

From e89f9ec539fdae1e5425d207a60a6ce1e9384106 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Fri, 3 Sep 2010 22:28:16 +0530
Subject: [PATCH 1521/1628] add setparams prefix

---
 grub-core/commands/menuentry.c | 63 ++++++++++++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 3 deletions(-)

diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
index 5e20d4285..6fdb172b6 100644
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -53,7 +53,7 @@ static struct
 static grub_err_t
 append_menu_entry (int argc, const char **args, char **classes,
 		   const char *users, const char *hotkey,
-		   const char *sourcecode)
+		   const char *prefix, const char *sourcecode)
 {
   unsigned i;
   int menu_hotkey = 0;
@@ -72,7 +72,7 @@ append_menu_entry (int argc, const char **args, char **classes,
 
   last = &menu->entry_list;
 
-  menu_sourcecode = grub_strdup (sourcecode);
+  menu_sourcecode = grub_xasprintf ("%s%s", prefix ?: "", sourcecode);
   if (! menu_sourcecode)
     return grub_errno;
 
@@ -171,11 +171,63 @@ append_menu_entry (int argc, const char **args, char **classes,
   return grub_errno;
 }
 
+static char *
+setparams_prefix (int argc, char **args)
+{
+  int i;
+  int j;
+  char *p;
+  char *result;
+  grub_size_t len = 10;
+  static const char *escape_characters = "\"\\";
+
+  auto char *strescpy (char *, const char *, const char *);
+  char * strescpy (char *d, const char *s, const char *escapes)
+  {
+    while (*s)
+      {
+	if (grub_strchr (escapes, *s))
+	  *d++ = '\\';
+	*d++ = *s++;
+      }
+    *d = '\0';
+    return d;
+  }
+
+  /* Count resulting string length */
+  for (i = 0; i < argc; i++)
+    {
+      len += 3; /* 3 = 1 space + 2 quotes */
+      p = args[i];
+      while (*p)
+	len += grub_strchr (escape_characters, *p++) ? 2 : 1;
+    }
+
+  result = grub_malloc (len + 2);
+  if (! result)
+    return 0;
+
+  grub_strcpy (result, "setparams");
+  i = 9;
+
+  for (j = 0; j < argc; j++)
+    {
+      result[i++] = ' ';
+      result[i++] = '"';
+      i = strescpy (result + i, args[j], escape_characters) - result;
+      result[i++] = '"';
+    }
+  result[i++] = '\n';
+  result[i] = '\0';
+  return result;
+}
+
 static grub_err_t
 grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
 {
   char ch;
   char *src;
+  char *prefix;
   unsigned len;
   grub_err_t r;
 
@@ -189,12 +241,17 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
   ch = src[len - 1];
   src[len - 1] = '\0';
 
+  prefix = setparams_prefix (argc - 1, args);
+  if (! prefix)
+    return grub_errno;
+
   r = append_menu_entry (argc - 1, (const char **) args,
 			 ctxt->state[0].args, ctxt->state[1].arg,
-			 ctxt->state[2].arg, src + 1);
+			 ctxt->state[2].arg, prefix, src + 1);
 
   src[len - 1] = ch;
   args[argc - 1] = src;
+  grub_free (prefix);
   return r;
 }
 

From 540e2fe18579c7c63945f7a416c1a4de37fa9628 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 3 Sep 2010 21:19:22 +0200
Subject: [PATCH 1522/1628] Initial videoinfo implementation

---
 grub-core/Makefile.core.def    |   5 +
 grub-core/commands/videoinfo.c | 101 ++++++++++++++++++
 grub-core/video/i386/pc/vbe.c  | 185 +++++++++++++++++++--------------
 include/grub/video.h           |   2 +
 4 files changed, 216 insertions(+), 77 deletions(-)
 create mode 100644 grub-core/commands/videoinfo.c

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 353b9d123..cf497964d 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -676,6 +676,11 @@ module = {
   enable = i386_pc;
 };
 
+module = {
+  name = videoinfo;
+  common = commands/videoinfo.c;
+};
+
 module = {
   name = vbetest;
   i386_pc = commands/i386/pc/vbetest.c;
diff --git a/grub-core/commands/videoinfo.c b/grub-core/commands/videoinfo.c
new file mode 100644
index 000000000..405c73774
--- /dev/null
+++ b/grub-core/commands/videoinfo.c
@@ -0,0 +1,101 @@
+/* videoinfo.c - command to list video modes.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2005,2007,2008,2009,2010  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/video.h>
+#include <grub/dl.h>
+#include <grub/env.h>
+#include <grub/misc.h>
+#include <grub/mm.h>
+#include <grub/command.h>
+#include <grub/i18n.h>
+
+static int
+hook (const struct grub_video_mode_info *info)
+{
+  grub_printf ("  %4d x %4d x %2d  ", info->height, info->width, info->bpp);
+
+  /* Show mask and position details for direct color modes.  */
+  if (info->mode_type & GRUB_VIDEO_MODE_TYPE_RGB)
+    grub_printf ("D, mask: %d/%d/%d/%d  pos: %d/%d/%d/%d",
+		 info->red_mask_size,
+		 info->green_mask_size,
+		 info->blue_mask_size,
+		 info->reserved_mask_size,
+		 info->red_field_pos,
+		 info->green_field_pos,
+		 info->blue_field_pos,
+		 info->reserved_field_pos);
+  if (info->mode_type & GRUB_VIDEO_MODE_TYPE_INDEX_COLOR)
+    grub_printf ("P");
+  grub_printf ("\n");
+
+  return 0;
+}
+
+static grub_err_t
+grub_cmd_videoinfo (grub_command_t cmd __attribute__ ((unused)),
+		    int argc __attribute__ ((unused)),
+		    char **args __attribute__ ((unused)))
+{
+  grub_video_adapter_t adapter;
+  grub_video_driver_id_t id = grub_video_get_driver_id ();
+
+  grub_printf ("List of supported video modes:\n");
+  grub_printf ("Legend: P=Packed pixel, D=Direct color, "
+	       "mask/pos=R/G/B/reserved\n");
+
+  FOR_VIDEO_ADAPTERS (adapter)
+  {
+    if (adapter->id != id)
+      {
+	if (adapter->init ())
+	  {
+	    grub_errno = GRUB_ERR_NONE;
+	    continue;
+	  }
+      }
+
+    grub_printf ("Adapter '%s':\n", adapter->name);
+    adapter->iterate (hook);
+
+    if (adapter->id != id)
+      {
+	if (adapter->fini ())
+	  {
+	    grub_errno = GRUB_ERR_NONE;
+	    continue;
+	  }
+      }
+  }
+  return GRUB_ERR_NONE;
+}
+
+static grub_command_t cmd;
+
+GRUB_MOD_INIT(videoinfo)
+{
+  cmd = grub_register_command ("videoinfo", grub_cmd_videoinfo, 0,
+			       N_("List available video modes."));
+}
+
+GRUB_MOD_FINI(videoinfo)
+{
+  grub_unregister_command (cmd);
+}
+
diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c
index 3817b3f68..082c9bc84 100644
--- a/grub-core/video/i386/pc/vbe.c
+++ b/grub-core/video/i386/pc/vbe.c
@@ -33,7 +33,6 @@
 static int vbe_detected = -1;
 
 static struct grub_vbe_info_block controller_info;
-static struct grub_vbe_mode_info_block active_vbe_mode_info;
 
 /* Track last mode to support cards which fail on get_mode.  */
 static grub_uint32_t last_set_mode = 3;
@@ -42,11 +41,7 @@ static struct
 {
   struct grub_video_mode_info mode_info;
 
-  unsigned int bytes_per_scan_line;
-  unsigned int bytes_per_pixel;
-  grub_uint32_t active_vbe_mode;
   grub_uint8_t *ptr;
-  int index_color_mode;
 } framebuffer;
 
 static grub_uint32_t initial_vbe_mode;
@@ -332,21 +327,12 @@ grub_vbe_set_video_mode (grub_uint32_t vbe_mode,
       vbe_mode |= 1 << 14;
 
       /* Determine frame buffer pixel format.  */
-      switch (new_vbe_mode_info.memory_model)
-        {
-        case GRUB_VBE_MEMORY_MODEL_PACKED_PIXEL:
-          framebuffer.index_color_mode = 1;
-          break;
-
-        case GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR:
-          framebuffer.index_color_mode = 0;
-          break;
-
-        default:
-          return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
-                             "unsupported pixel format 0x%x",
-                             new_vbe_mode_info.memory_model);
-        }
+      if (new_vbe_mode_info.memory_model != GRUB_VBE_MEMORY_MODEL_PACKED_PIXEL
+	  && new_vbe_mode_info.memory_model
+	  != GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR)
+	return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+			   "unsupported pixel format 0x%x",
+			   new_vbe_mode_info.memory_model);
     }
 
   /* Get current mode.  */
@@ -360,24 +346,14 @@ grub_vbe_set_video_mode (grub_uint32_t vbe_mode,
     return grub_error (GRUB_ERR_BAD_DEVICE, "cannot set VBE mode %x", vbe_mode);
   last_set_mode = vbe_mode;
 
-  /* Save information for later usage.  */
-  framebuffer.active_vbe_mode = vbe_mode;
-  grub_memcpy (&active_vbe_mode_info, &new_vbe_mode_info, sizeof (active_vbe_mode_info));
-
   if (vbe_mode < 0x100)
     {
       /* If this is not a VESA mode, guess address.  */
       framebuffer.ptr = (grub_uint8_t *) GRUB_MEMORY_MACHINE_VGA_ADDR;
-      framebuffer.index_color_mode = 1;
     }
   else
     {
       framebuffer.ptr = (grub_uint8_t *) new_vbe_mode_info.phys_base_addr;
-
-      if (controller_info.version >= 0x300)
-        framebuffer.bytes_per_scan_line = new_vbe_mode_info.lin_bytes_per_scan_line;
-      else
-        framebuffer.bytes_per_scan_line = new_vbe_mode_info.bytes_per_scan_line;
     }
 
   /* Check whether mode is text mode or graphics mode.  */
@@ -392,25 +368,9 @@ grub_vbe_set_video_mode (grub_uint32_t vbe_mode,
     {
       /* Graphics mode.  */
 
-      /* Calculate bytes_per_pixel value.  */
-      switch(new_vbe_mode_info.bits_per_pixel)
-	{
-	case 32: framebuffer.bytes_per_pixel = 4; break;
-	case 24: framebuffer.bytes_per_pixel = 3; break;
-	case 16: framebuffer.bytes_per_pixel = 2; break;
-	case 15: framebuffer.bytes_per_pixel = 2; break;
-	case 8: framebuffer.bytes_per_pixel = 1; break;
-	default:
-	  grub_vbe_bios_set_mode (old_vbe_mode, 0);
-	  last_set_mode = old_vbe_mode;
-	  return grub_error (GRUB_ERR_BAD_DEVICE,
-			     "cannot set VBE mode %x",
-			     vbe_mode);
-	  break;
-	}
-
       /* If video mode is in indexed color, setup default VGA palette.  */
-      if (framebuffer.index_color_mode)
+      if (vbe_mode < 0x100 || new_vbe_mode_info.memory_model
+	  == GRUB_VBE_MEMORY_MODEL_PACKED_PIXEL)
 	{
 	  struct grub_vbe_palette_data *palette
 	    = (struct grub_vbe_palette_data *) GRUB_MEMORY_MACHINE_SCRATCH_ADDR;
@@ -548,10 +508,13 @@ grub_video_vbe_fini (void)
   grub_err_t err;
 
   /* Restore old video mode.  */
-  status = grub_vbe_bios_set_mode (initial_vbe_mode, 0);
-  if (status != GRUB_VBE_STATUS_OK)
-    /* TODO: Decide, is this something we want to do.  */
-    return grub_errno;
+  if (last_set_mode != initial_vbe_mode)
+    {
+      status = grub_vbe_bios_set_mode (initial_vbe_mode, 0);
+      if (status != GRUB_VBE_STATUS_OK)
+	/* TODO: Decide, is this something we want to do.  */
+	return grub_errno;
+    }
   last_set_mode = initial_vbe_mode;
 
   /* TODO: Free any resources allocated by driver.  */
@@ -583,6 +546,86 @@ doublebuf_pageflipping_set_page (int page)
   return 0;
 }
 
+static void
+vbe2videoinfo (const struct grub_vbe_mode_info_block *vbeinfo,
+	       struct grub_video_mode_info *mode_info)
+{
+  mode_info->width = vbeinfo->x_resolution;
+  mode_info->height = vbeinfo->y_resolution;
+  switch (vbeinfo->memory_model)
+    {
+    case GRUB_VBE_MEMORY_MODEL_PACKED_PIXEL:
+      mode_info->mode_type = GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
+      break;
+	  
+    case GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR:
+      mode_info->mode_type = GRUB_VIDEO_MODE_TYPE_RGB;
+      break;
+    }
+
+  mode_info->bpp = vbeinfo->bits_per_pixel;
+  /* Calculate bytes_per_pixel value.  */
+  switch(vbeinfo->bits_per_pixel)
+    {
+    case 32:
+      mode_info->bytes_per_pixel = 4;
+      break;
+    case 24:
+      mode_info->bytes_per_pixel = 3;
+      break;
+    case 16:
+      mode_info->bytes_per_pixel = 2;
+      break;
+    case 15:
+      mode_info->bytes_per_pixel = 2;
+      break;
+    case 8:
+      mode_info->bytes_per_pixel = 1;
+      break;  
+    }
+
+  if (controller_info.version >= 0x300)
+    mode_info->pitch = vbeinfo->lin_bytes_per_scan_line;
+  else
+    mode_info->pitch = vbeinfo->bytes_per_scan_line;
+
+  mode_info->number_of_colors = 256; /* TODO: fix me.  */
+  mode_info->red_mask_size = vbeinfo->red_mask_size;
+  mode_info->red_field_pos = vbeinfo->red_field_position;
+  mode_info->green_mask_size = vbeinfo->green_mask_size;
+  mode_info->green_field_pos = vbeinfo->green_field_position;
+  mode_info->blue_mask_size = vbeinfo->blue_mask_size;
+  mode_info->blue_field_pos = vbeinfo->blue_field_position;
+  mode_info->reserved_mask_size = vbeinfo->rsvd_mask_size;
+  mode_info->reserved_field_pos = vbeinfo->rsvd_field_position;
+
+  mode_info->blit_format = grub_video_get_blit_format (mode_info);
+}
+
+static int
+grub_video_vbe_iterate (int (*hook) (const struct grub_video_mode_info *info))
+{
+  grub_uint16_t *p;
+  struct grub_vbe_mode_info_block vbe_mode_info;
+  struct grub_video_mode_info mode_info;
+
+  for (p = vbe_mode_list; *p != 0xFFFF; p++)
+    {
+      grub_vbe_get_video_mode_info (*p, &vbe_mode_info);
+      if (grub_errno != GRUB_ERR_NONE)
+        {
+          /* Could not retrieve mode info, retreat.  */
+          grub_errno = GRUB_ERR_NONE;
+          break;
+        }
+
+      vbe2videoinfo (&vbe_mode_info, &mode_info);
+      if (hook (&mode_info))
+	return 1;
+    }
+  return 0;
+}
+
 static grub_err_t
 grub_video_vbe_setup (unsigned int width, unsigned int height,
                       unsigned int mode_type, unsigned int mode_mask)
@@ -631,6 +674,14 @@ grub_video_vbe_setup (unsigned int width, unsigned int height,
         /* Not compatible memory model.  */
         continue;
 
+      if (vbe_mode_info.bits_per_pixel != 8
+	  && vbe_mode_info.bits_per_pixel != 15
+	  && vbe_mode_info.bits_per_pixel != 16
+	  && vbe_mode_info.bits_per_pixel != 24
+	  && vbe_mode_info.bits_per_pixel != 32)
+	/* Unsupported bitdepth . */
+        continue;
+
       if (((vbe_mode_info.x_resolution != width)
 	   || (vbe_mode_info.y_resolution != height)) && width != 0 && height != 0)
         /* Non matching resolution.  */
@@ -676,36 +727,15 @@ grub_video_vbe_setup (unsigned int width, unsigned int height,
   if (best_vbe_mode != 0)
     {
       grub_err_t err;
+      static struct grub_vbe_mode_info_block active_vbe_mode_info;
       /* If this fails, then we have mode selection heuristics problem,
          or adapter failure.  */
-      /* grub_vbe_set_video_mode already sets active_vbe_mode_info. */
-      grub_vbe_set_video_mode (best_vbe_mode, NULL);
+      grub_vbe_set_video_mode (best_vbe_mode, &active_vbe_mode_info);
       if (grub_errno != GRUB_ERR_NONE)
         return grub_errno;
 
       /* Fill mode info details.  */
-      framebuffer.mode_info.width = active_vbe_mode_info.x_resolution;
-      framebuffer.mode_info.height = active_vbe_mode_info.y_resolution;
-
-      if (framebuffer.index_color_mode)
-        framebuffer.mode_info.mode_type = GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
-      else
-        framebuffer.mode_info.mode_type = GRUB_VIDEO_MODE_TYPE_RGB;
-
-      framebuffer.mode_info.bpp = active_vbe_mode_info.bits_per_pixel;
-      framebuffer.mode_info.bytes_per_pixel = framebuffer.bytes_per_pixel;
-      framebuffer.mode_info.pitch = framebuffer.bytes_per_scan_line;
-      framebuffer.mode_info.number_of_colors = 256; /* TODO: fix me.  */
-      framebuffer.mode_info.red_mask_size = active_vbe_mode_info.red_mask_size;
-      framebuffer.mode_info.red_field_pos = active_vbe_mode_info.red_field_position;
-      framebuffer.mode_info.green_mask_size = active_vbe_mode_info.green_mask_size;
-      framebuffer.mode_info.green_field_pos = active_vbe_mode_info.green_field_position;
-      framebuffer.mode_info.blue_mask_size = active_vbe_mode_info.blue_mask_size;
-      framebuffer.mode_info.blue_field_pos = active_vbe_mode_info.blue_field_position;
-      framebuffer.mode_info.reserved_mask_size = active_vbe_mode_info.rsvd_mask_size;
-      framebuffer.mode_info.reserved_field_pos = active_vbe_mode_info.rsvd_field_position;
-
-      framebuffer.mode_info.blit_format = grub_video_get_blit_format (&framebuffer.mode_info);
+      vbe2videoinfo (&active_vbe_mode_info, &framebuffer.mode_info);
 
       {
 	/* Get video RAM size in bytes.  */
@@ -740,7 +770,7 @@ static grub_err_t
 grub_video_vbe_set_palette (unsigned int start, unsigned int count,
                             struct grub_video_palette_data *palette_data)
 {
-  if (framebuffer.index_color_mode)
+  if (framebuffer.mode_info.mode_type == GRUB_VIDEO_MODE_TYPE_INDEX_COLOR)
     {
       /* TODO: Implement setting indexed color mode palette to hardware.  */
       //status = grub_vbe_bios_set_palette_data (sizeof (vga_colors)
@@ -793,6 +823,7 @@ static struct grub_video_adapter grub_video_vbe_adapter =
     .delete_render_target = grub_video_fb_delete_render_target,
     .set_active_render_target = grub_video_fb_set_active_render_target,
     .get_active_render_target = grub_video_fb_get_active_render_target,
+    .iterate = grub_video_vbe_iterate,
 
     .next = 0
   };
diff --git a/include/grub/video.h b/include/grub/video.h
index 24167281f..d530ab415 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -282,6 +282,8 @@ struct grub_video_adapter
   grub_err_t (*set_active_render_target) (struct grub_video_render_target *target);
 
   grub_err_t (*get_active_render_target) (struct grub_video_render_target **target);
+
+  int (*iterate) (int (*hook) (const struct grub_video_mode_info *info));
 };
 typedef struct grub_video_adapter *grub_video_adapter_t;
 

From 4787931fe0b44613c0758d34234f2510ac24e3cf Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 3 Sep 2010 21:40:40 +0200
Subject: [PATCH 1523/1628] Show mode id

---
 grub-core/commands/videoinfo.c | 10 +++++++---
 grub-core/video/i386/pc/vbe.c  | 10 +++++++---
 include/grub/video.h           |  3 +++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/grub-core/commands/videoinfo.c b/grub-core/commands/videoinfo.c
index 405c73774..e03b3372d 100644
--- a/grub-core/commands/videoinfo.c
+++ b/grub-core/commands/videoinfo.c
@@ -28,11 +28,15 @@
 static int
 hook (const struct grub_video_mode_info *info)
 {
-  grub_printf ("  %4d x %4d x %2d  ", info->height, info->width, info->bpp);
+  if (info->mode_number == GRUB_VIDEO_MODE_NUMBER_INVALID)
+    grub_printf ("        ");
+  else
+    grub_printf ("  0x%03x ", info->mode_number);
+  grub_printf ("%4d x %4d x %2d  ", info->height, info->width, info->bpp);
 
   /* Show mask and position details for direct color modes.  */
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_RGB)
-    grub_printf ("D, mask: %d/%d/%d/%d  pos: %d/%d/%d/%d",
+    grub_printf ("Direct, mask: %d/%d/%d/%d  pos: %d/%d/%d/%d",
 		 info->red_mask_size,
 		 info->green_mask_size,
 		 info->blue_mask_size,
@@ -42,7 +46,7 @@ hook (const struct grub_video_mode_info *info)
 		 info->blue_field_pos,
 		 info->reserved_field_pos);
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_INDEX_COLOR)
-    grub_printf ("P");
+    grub_printf ("Packed");
   grub_printf ("\n");
 
   return 0;
diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c
index 082c9bc84..6b089db04 100644
--- a/grub-core/video/i386/pc/vbe.c
+++ b/grub-core/video/i386/pc/vbe.c
@@ -547,9 +547,12 @@ doublebuf_pageflipping_set_page (int page)
 }
 
 static void
-vbe2videoinfo (const struct grub_vbe_mode_info_block *vbeinfo,
+vbe2videoinfo (grub_uint32_t mode,
+	       const struct grub_vbe_mode_info_block *vbeinfo,
 	       struct grub_video_mode_info *mode_info)
 {
+  mode_info->mode_number = mode;
+
   mode_info->width = vbeinfo->x_resolution;
   mode_info->height = vbeinfo->y_resolution;
   switch (vbeinfo->memory_model)
@@ -619,7 +622,7 @@ grub_video_vbe_iterate (int (*hook) (const struct grub_video_mode_info *info))
           break;
         }
 
-      vbe2videoinfo (&vbe_mode_info, &mode_info);
+      vbe2videoinfo (*p, &vbe_mode_info, &mode_info);
       if (hook (&mode_info))
 	return 1;
     }
@@ -735,7 +738,8 @@ grub_video_vbe_setup (unsigned int width, unsigned int height,
         return grub_errno;
 
       /* Fill mode info details.  */
-      vbe2videoinfo (&active_vbe_mode_info, &framebuffer.mode_info);
+      vbe2videoinfo (best_vbe_mode, &active_vbe_mode_info,
+		     &framebuffer.mode_info);
 
       {
 	/* Get video RAM size in bytes.  */
diff --git a/include/grub/video.h b/include/grub/video.h
index d530ab415..40bd5e615 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -117,6 +117,9 @@ struct grub_video_mode_info
   /* In index color mode, number of colors.  In RGB mode this is 256.  */
   unsigned int number_of_colors;
 
+  unsigned int mode_number;
+#define GRUB_VIDEO_MODE_NUMBER_INVALID 0xffffffff
+
   /* Optimization hint how binary data is coded.  */
   enum grub_video_blit_format blit_format;
 

From 380c39cb25e2905d66cefda5638ddbf448430149 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 3 Sep 2010 22:11:22 +0200
Subject: [PATCH 1524/1628] Show adapter-specific info

---
 grub-core/commands/videoinfo.c | 13 ++++++++++++-
 grub-core/video/i386/pc/vbe.c  | 15 +++++++++++++++
 include/grub/video.h           |  2 ++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/grub-core/commands/videoinfo.c b/grub-core/commands/videoinfo.c
index e03b3372d..a9e8be745 100644
--- a/grub-core/commands/videoinfo.c
+++ b/grub-core/commands/videoinfo.c
@@ -66,16 +66,27 @@ grub_cmd_videoinfo (grub_command_t cmd __attribute__ ((unused)),
 
   FOR_VIDEO_ADAPTERS (adapter)
   {
+    grub_printf ("Adapter '%s':\n", adapter->name);
+
+    if (!adapter->iterate)
+      {
+	grub_printf ("  No info available\n");
+	continue;
+      }
+
     if (adapter->id != id)
       {
 	if (adapter->init ())
 	  {
+	    grub_printf ("  Failed\n");
 	    grub_errno = GRUB_ERR_NONE;
 	    continue;
 	  }
       }
 
-    grub_printf ("Adapter '%s':\n", adapter->name);
+    if (adapter->print_adapter_specific_info)
+      adapter->print_adapter_specific_info ();
+
     adapter->iterate (hook);
 
     if (adapter->id != id)
diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c
index 6b089db04..1d2a9ac76 100644
--- a/grub-core/video/i386/pc/vbe.c
+++ b/grub-core/video/i386/pc/vbe.c
@@ -798,6 +798,20 @@ grub_video_vbe_get_info_and_fini (struct grub_video_mode_info *mode_info,
   return grub_video_fb_get_info_and_fini (mode_info, framebuf);
 }
 
+static void
+grub_video_vbe_print_adapter_specific_info (void)
+{
+  grub_printf ("  VBE info:   version: %d.%d  OEM software rev: %d.%d\n",
+	       controller_info.version >> 8,
+               controller_info.version & 0xFF,
+               controller_info.oem_software_rev >> 8,
+               controller_info.oem_software_rev & 0xFF);
+
+  /* The total_memory field is in 64 KiB units.  */
+  grub_printf ("              total memory: %d KiB\n",
+               (controller_info.total_memory << 16) / 1024);
+}
+
 static struct grub_video_adapter grub_video_vbe_adapter =
   {
     .name = "VESA BIOS Extension Video Driver",
@@ -828,6 +842,7 @@ static struct grub_video_adapter grub_video_vbe_adapter =
     .set_active_render_target = grub_video_fb_set_active_render_target,
     .get_active_render_target = grub_video_fb_get_active_render_target,
     .iterate = grub_video_vbe_iterate,
+    .print_adapter_specific_info = grub_video_vbe_print_adapter_specific_info,
 
     .next = 0
   };
diff --git a/include/grub/video.h b/include/grub/video.h
index 40bd5e615..1c1bf16ab 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -287,6 +287,8 @@ struct grub_video_adapter
   grub_err_t (*get_active_render_target) (struct grub_video_render_target **target);
 
   int (*iterate) (int (*hook) (const struct grub_video_mode_info *info));
+
+  void (*print_adapter_specific_info) (void);
 };
 typedef struct grub_video_adapter *grub_video_adapter_t;
 

From 4ab5f27548ce1f443c3385d7c68821c7d5b415a9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 3 Sep 2010 22:21:48 +0200
Subject: [PATCH 1525/1628] Remove vbetest and vbeinfo in favour of videotest
 and videoinfo

---
 grub-core/Makefile.core.def          |  12 --
 grub-core/commands/i386/pc/vbeinfo.c | 185 ---------------------------
 grub-core/commands/i386/pc/vbetest.c | 179 --------------------------
 grub-core/commands/videoinfo.c       |  19 ++-
 grub-core/commands/videotest.c       |  15 +++
 5 files changed, 33 insertions(+), 377 deletions(-)
 delete mode 100644 grub-core/commands/i386/pc/vbeinfo.c
 delete mode 100644 grub-core/commands/i386/pc/vbetest.c

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index cf497964d..e8728e0da 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -670,23 +670,11 @@ module = {
   emu_condition = COND_GRUB_EMU_USB;
 };
 
-module = {
-  name = vbeinfo;
-  i386_pc = commands/i386/pc/vbeinfo.c;
-  enable = i386_pc;
-};
-
 module = {
   name = videoinfo;
   common = commands/videoinfo.c;
 };
 
-module = {
-  name = vbetest;
-  i386_pc = commands/i386/pc/vbetest.c;
-  enable = i386_pc;
-};
-
 module = {
   name = videotest;
   common = commands/videotest.c;
diff --git a/grub-core/commands/i386/pc/vbeinfo.c b/grub-core/commands/i386/pc/vbeinfo.c
deleted file mode 100644
index c266bbfcb..000000000
--- a/grub-core/commands/i386/pc/vbeinfo.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* vbeinfo.c - command to list compatible VBE video modes.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007,2008,2009  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/env.h>
-#include <grub/misc.h>
-#include <grub/machine/init.h>
-#include <grub/machine/vbe.h>
-#include <grub/mm.h>
-#include <grub/command.h>
-#include <grub/i18n.h>
-
-static void *
-real2pm (grub_vbe_farptr_t ptr)
-{
-  return (void *) ((((unsigned long) ptr & 0xFFFF0000) >> 12UL)
-		   + ((unsigned long) ptr & 0x0000FFFF));
-}
-
-static grub_err_t
-grub_cmd_vbeinfo (grub_command_t cmd __attribute__ ((unused)),
-		  int argc __attribute__ ((unused)),
-		  char **args __attribute__ ((unused)))
-{
-  struct grub_vbe_info_block controller_info;
-  struct grub_vbe_mode_info_block mode_info_tmp;
-  grub_uint32_t use_mode = GRUB_VBE_DEFAULT_VIDEO_MODE;
-  grub_uint16_t *video_mode_list;
-  grub_uint16_t *p;
-  grub_uint16_t *saved_video_mode_list;
-  grub_size_t video_mode_list_size;
-  grub_err_t err;
-  char *modevar;
-
-  err = grub_vbe_probe (&controller_info);
-  if (err != GRUB_ERR_NONE)
-    return err;
-
-  grub_printf ("VBE info:   version: %d.%d  OEM software rev: %d.%d\n",
-	       controller_info.version >> 8,
-               controller_info.version & 0xFF,
-               controller_info.oem_software_rev >> 8,
-               controller_info.oem_software_rev & 0xFF);
-
-  /* The total_memory field is in 64 KiB units.  */
-  grub_printf ("            total memory: %d KiB\n",
-               (controller_info.total_memory << 16) / 1024);
-
-  /* Because the information on video modes is stored in a temporary place,
-     it is better to copy it to somewhere safe.  */
-  p = video_mode_list = real2pm (controller_info.video_mode_ptr);
-  while (*p++ != 0xFFFF)
-    ;
-
-  video_mode_list_size = (grub_addr_t) p - (grub_addr_t) video_mode_list;
-  saved_video_mode_list = grub_malloc (video_mode_list_size);
-  if (! saved_video_mode_list)
-    return grub_errno;
-
-  grub_memcpy (saved_video_mode_list, video_mode_list, video_mode_list_size);
-
-  grub_printf ("List of compatible video modes:\n");
-  grub_printf ("Legend: P=Packed pixel, D=Direct color, "
-	       "mask/pos=R/G/B/reserved\n");
-
-  /* Walk through all video modes listed.  */
-  for (p = saved_video_mode_list; *p != 0xFFFF; p++)
-    {
-      const char *memory_model = 0;
-      grub_uint32_t mode = (grub_uint32_t) *p;
-
-      err = grub_vbe_get_video_mode_info (mode, &mode_info_tmp);
-      if (err != GRUB_ERR_NONE)
-	{
-	  grub_errno = GRUB_ERR_NONE;
-	  continue;
-	}
-
-      if ((mode_info_tmp.mode_attributes & GRUB_VBE_MODEATTR_SUPPORTED) == 0)
-	/* If not available, skip it.  */
-	continue;
-
-      if ((mode_info_tmp.mode_attributes & GRUB_VBE_MODEATTR_RESERVED_1) == 0)
-	/* Not enough information.  */
-	continue;
-
-      if ((mode_info_tmp.mode_attributes & GRUB_VBE_MODEATTR_COLOR) == 0)
-	/* Monochrome is unusable.  */
-	continue;
-
-      if ((mode_info_tmp.mode_attributes & GRUB_VBE_MODEATTR_LFB_AVAIL) == 0)
-	/* We support only linear frame buffer modes.  */
-	continue;
-
-      if ((mode_info_tmp.mode_attributes & GRUB_VBE_MODEATTR_GRAPHICS) == 0)
-	/* We allow only graphical modes.  */
-	continue;
-
-      switch (mode_info_tmp.memory_model)
-	{
-	case GRUB_VBE_MEMORY_MODEL_PACKED_PIXEL:
-	  memory_model = "Packed";
-	  break;
-	case GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR:
-	  memory_model = "Direct";
-	  break;
-
-	default:
-	  break;
-	}
-
-      if (! memory_model)
-	continue;
-
-      grub_printf ("0x%03x:  %4d x %4d x %2d  %s",
-                   mode,
-                   mode_info_tmp.x_resolution,
-                   mode_info_tmp.y_resolution,
-                   mode_info_tmp.bits_per_pixel,
-                   memory_model);
-
-      /* Show mask and position details for direct color modes.  */
-      if (mode_info_tmp.memory_model == GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR)
-        grub_printf (", mask: %d/%d/%d/%d  pos: %d/%d/%d/%d",
-                     mode_info_tmp.red_mask_size,
-                     mode_info_tmp.green_mask_size,
-                     mode_info_tmp.blue_mask_size,
-                     mode_info_tmp.rsvd_mask_size,
-                     mode_info_tmp.red_field_position,
-                     mode_info_tmp.green_field_position,
-                     mode_info_tmp.blue_field_position,
-                     mode_info_tmp.rsvd_field_position);
-      grub_printf ("\n");
-    }
-
-  grub_free (saved_video_mode_list);
-
-  /* Check existence of vbe_mode environment variable.  */
-  modevar = grub_env_get ("vbe_mode");
-
-  if (modevar != 0)
-    {
-      unsigned long value;
-
-      value = grub_strtoul (modevar, 0, 0);
-      if (grub_errno == GRUB_ERR_NONE)
-	use_mode = value;
-      else
-	grub_errno = GRUB_ERR_NONE;
-    }
-
-  grub_printf ("Configured VBE mode (vbe_mode) = 0x%03x\n", use_mode);
-
-  return 0;
-}
-
-static grub_command_t cmd;
-
-GRUB_MOD_INIT(vbeinfo)
-{
-  cmd =
-    grub_register_command ("vbeinfo", grub_cmd_vbeinfo, 0,
-			   N_("List compatible VESA BIOS extension video modes."));
-}
-
-GRUB_MOD_FINI(vbeinfo)
-{
-  grub_unregister_command (cmd);
-}
diff --git a/grub-core/commands/i386/pc/vbetest.c b/grub-core/commands/i386/pc/vbetest.c
deleted file mode 100644
index d2921c09d..000000000
--- a/grub-core/commands/i386/pc/vbetest.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/* vbetest.c - command to test VESA BIOS Extension 2.0+ support.  */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007  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/normal.h>
-#include <grub/dl.h>
-#include <grub/env.h>
-#include <grub/misc.h>
-#include <grub/term.h>
-#include <grub/machine/init.h>
-#include <grub/machine/vbe.h>
-#include <grub/video.h>
-#include <grub/err.h>
-#include <grub/i18n.h>
-
-static grub_err_t
-grub_cmd_vbetest (grub_command_t cmd __attribute__ ((unused)),
-		  int argc __attribute__ ((unused)),
-		  char **args __attribute__ ((unused)))
-{
-  grub_err_t err;
-  char *modevar;
-  struct grub_vbe_mode_info_block mode_info;
-  struct grub_vbe_info_block controller_info;
-  grub_uint32_t use_mode = GRUB_VBE_DEFAULT_VIDEO_MODE;
-  grub_uint32_t old_mode;
-  grub_uint8_t *framebuffer = 0;
-  grub_uint32_t bytes_per_scan_line = 0;
-  unsigned char *ptr;
-  int i;
-
-  grub_printf ("Probing for VESA BIOS Extension ... ");
-
-  /* Check if VESA BIOS exists.  */
-  err = grub_vbe_probe (&controller_info);
-  if (err != GRUB_ERR_NONE)
-    return err;
-
-  grub_printf ("found!\n");
-
-  /* Dump out controller information.  */
-  grub_printf ("VBE signature = %c%c%c%c\n",
-	       controller_info.signature[0],
-	       controller_info.signature[1],
-	       controller_info.signature[2],
-	       controller_info.signature[3]);
-
-  grub_printf ("VBE version = %d.%d\n",
-	       controller_info.version >> 8,
-	       controller_info.version & 0xFF);
-  grub_printf ("OEM string ptr = %08x\n",
-	       controller_info.oem_string_ptr);
-  grub_printf ("Total memory = %d\n",
-	       controller_info.total_memory);
-
-  err = grub_vbe_get_video_mode (&old_mode);
-  grub_printf ("Get video mode err = %04x\n", err);
-
-  if (err == GRUB_ERR_NONE)
-    grub_printf ("Old video mode = %04x\n", old_mode);
-  else
-    grub_errno = GRUB_ERR_NONE;
-
-  /* Check existence of vbe_mode environment variable.  */
-  modevar = grub_env_get ("vbe_mode");
-  if (modevar != 0)
-    {
-      unsigned long value;
-
-      value = grub_strtoul (modevar, 0, 0);
-      if (grub_errno == GRUB_ERR_NONE)
-	use_mode = value;
-      else
-	grub_errno = GRUB_ERR_NONE;
-    }
-
-  err = grub_vbe_get_video_mode_info (use_mode, &mode_info);
-  if (err != GRUB_ERR_NONE)
-    return err;
-
-  /* Dump out details about the mode being tested.  */
-  grub_printf ("mode: 0x%03x\n",
-               use_mode);
-  grub_printf ("width : %d\n",
-               mode_info.x_resolution);
-  grub_printf ("height: %d\n",
-               mode_info.y_resolution);
-  grub_printf ("memory model: %02x\n",
-               mode_info.memory_model);
-  grub_printf ("bytes/scanline: %d\n",
-               mode_info.bytes_per_scan_line);
-  grub_printf ("bytes/scanline (lin): %d\n",
-               mode_info.lin_bytes_per_scan_line);
-  grub_printf ("base address: %08x\n",
-               mode_info.phys_base_addr);
-  grub_printf ("red mask/pos: %d/%d\n",
-               mode_info.red_mask_size,
-               mode_info.red_field_position);
-  grub_printf ("green mask/pos: %d/%d\n",
-               mode_info.green_mask_size,
-               mode_info.green_field_position);
-  grub_printf ("blue mask/pos: %d/%d\n",
-               mode_info.blue_mask_size,
-               mode_info.blue_field_position);
-
-  grub_printf ("Press any key to continue.\n");
-
-  grub_getkey ();
-
-  /* Setup GFX mode.  */
-  err = grub_vbe_set_video_mode (use_mode, &mode_info);
-  if (err != GRUB_ERR_NONE)
-    return err;
-
-  /* Determine framebuffer address and how many bytes are in scan line.  */
-  framebuffer = (grub_uint8_t *) mode_info.phys_base_addr;
-  ptr = framebuffer;
-
-  if (controller_info.version >= 0x300)
-    {
-      bytes_per_scan_line = mode_info.lin_bytes_per_scan_line;
-    }
-  else
-    {
-      bytes_per_scan_line = mode_info.bytes_per_scan_line;
-    }
-
-  /* Draw some random data to screen.  */
-  for (i = 0; i < 256 * 256; i++)
-    {
-      ptr[i] = i & 0x0F;
-    }
-
-  /* Draw white line to screen.  */
-  for (i = 0; i < 100; i++)
-    {
-      ptr[mode_info.bytes_per_scan_line * 50 + i] = 0x0F;
-    }
-
-  /* Draw another white line to screen.  */
-  grub_memset (ptr + bytes_per_scan_line * 51, 0x0f, bytes_per_scan_line);
-
-  grub_getkey ();
-
-  grub_video_restore ();
-
-  /* Restore old video mode.  */
-  grub_vbe_set_video_mode (old_mode, 0);
-
-  return grub_errno;
-}
-
-static grub_command_t cmd;
-
-GRUB_MOD_INIT(vbetest)
-{
-  cmd = grub_register_command ("vbetest", grub_cmd_vbetest,
-			       0, N_("Test VESA BIOS Extension 2.0+ support."));
-}
-
-GRUB_MOD_FINI(vbetest)
-{
-  grub_unregister_command (cmd);
-}
diff --git a/grub-core/commands/videoinfo.c b/grub-core/commands/videoinfo.c
index a9e8be745..caa32c939 100644
--- a/grub-core/commands/videoinfo.c
+++ b/grub-core/commands/videoinfo.c
@@ -58,7 +58,14 @@ grub_cmd_videoinfo (grub_command_t cmd __attribute__ ((unused)),
 		    char **args __attribute__ ((unused)))
 {
   grub_video_adapter_t adapter;
-  grub_video_driver_id_t id = grub_video_get_driver_id ();
+  grub_video_driver_id_t id;
+
+#ifdef GRUB_MACHINE_PCBIOS
+  if (grub_strcmp (cmd->name, "vbeinfo") == 0)
+    grub_dl_load ("vbe");
+#endif
+
+  id = grub_video_get_driver_id ();
 
   grub_printf ("List of supported video modes:\n");
   grub_printf ("Legend: P=Packed pixel, D=Direct color, "
@@ -102,15 +109,25 @@ grub_cmd_videoinfo (grub_command_t cmd __attribute__ ((unused)),
 }
 
 static grub_command_t cmd;
+#ifdef GRUB_MACHINE_PCBIOS
+static grub_command_t cmd_vbe;
+#endif
 
 GRUB_MOD_INIT(videoinfo)
 {
   cmd = grub_register_command ("videoinfo", grub_cmd_videoinfo, 0,
 			       N_("List available video modes."));
+#ifdef GRUB_MACHINE_PCBIOS
+  cmd_vbe = grub_register_command ("vbeinfo", grub_cmd_videoinfo, 0,
+				   N_("List available video modes."));
+#endif
 }
 
 GRUB_MOD_FINI(videoinfo)
 {
   grub_unregister_command (cmd);
+#ifdef GRUB_MACHINE_PCBIOS
+  grub_unregister_command (cmd_vbe);
+#endif
 }
 
diff --git a/grub-core/commands/videotest.c b/grub-core/commands/videotest.c
index c544d1839..22bd648d0 100644
--- a/grub-core/commands/videotest.c
+++ b/grub-core/commands/videotest.c
@@ -42,6 +42,11 @@ grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),
   struct grub_video_render_target *text_layer;
   grub_video_color_t palette[16];
 
+#ifdef GRUB_MACHINE_PCBIOS
+  if (grub_strcmp (cmd->name, "vbetest") == 0)
+    grub_dl_load ("vbe");
+#endif
+
   err = grub_video_set_mode ("auto", GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
   if (err)
     return err;
@@ -180,14 +185,24 @@ grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),
 }
 
 static grub_command_t cmd;
+#ifdef GRUB_MACHINE_PCBIOS
+static grub_command_t cmd_vbe;
+#endif
 
 GRUB_MOD_INIT(videotest)
 {
   cmd = grub_register_command ("videotest", grub_cmd_videotest,
 			       0, N_("Test video subsystem."));
+#ifdef GRUB_MACHINE_PCBIOS
+  cmd_vbe = grub_register_command ("vbetest", grub_cmd_videotest,
+			       0, N_("Test video subsystem."));
+#endif
 }
 
 GRUB_MOD_FINI(videotest)
 {
   grub_unregister_command (cmd);
+#ifdef GRUB_MACHINE_PCBIOS
+  grub_unregister_command (cmd_vbe);
+#endif
 }

From 03199f1909e8f2181b60de2f45ea571fe4a8f75c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 3 Sep 2010 22:50:11 +0200
Subject: [PATCH 1526/1628] Fix order of dimensions in videoinfo

---
 grub-core/commands/videoinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grub-core/commands/videoinfo.c b/grub-core/commands/videoinfo.c
index caa32c939..febb56aba 100644
--- a/grub-core/commands/videoinfo.c
+++ b/grub-core/commands/videoinfo.c
@@ -32,7 +32,7 @@ hook (const struct grub_video_mode_info *info)
     grub_printf ("        ");
   else
     grub_printf ("  0x%03x ", info->mode_number);
-  grub_printf ("%4d x %4d x %2d  ", info->height, info->width, info->bpp);
+  grub_printf ("%4d x %4d x %2d  ", info->width, info->height, info->bpp);
 
   /* Show mask and position details for direct color modes.  */
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_RGB)

From 30d71dbcedb44f7e13b9b8ebd38dfab2991c021b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 3 Sep 2010 22:50:27 +0200
Subject: [PATCH 1527/1628] dd GOP mode listing

---
 grub-core/video/efi_gop.c | 43 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c
index 4e79b8521..cb04667eb 100644
--- a/grub-core/video/efi_gop.c
+++ b/grub-core/video/efi_gop.c
@@ -127,9 +127,11 @@ grub_video_gop_get_bitmask (grub_uint32_t mask, unsigned int *mask_size,
 }
 
 static grub_err_t
-grub_video_gop_fill_mode_info (struct grub_efi_gop_mode_info *in,
+grub_video_gop_fill_mode_info (unsigned mode,
+			       struct grub_efi_gop_mode_info *in,
 			       struct grub_video_mode_info *out)
 {
+  out->mode_number = mode;
   out->number_of_colors = 256;
   out->width = in->width;
   out->height = in->height;
@@ -183,6 +185,39 @@ grub_video_gop_fill_mode_info (struct grub_efi_gop_mode_info *in,
   return GRUB_ERR_NONE;
 }
 
+static int
+grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info))
+{
+  unsigned mode;
+
+  for (mode = 0; mode < gop->mode->max_mode; mode++)
+    {
+      grub_efi_uintn_t size;
+      grub_efi_status_t status;
+      struct grub_efi_gop_mode_info *info = NULL;
+      grub_err_t err;
+      struct grub_video_mode_info mode_info;
+	 
+      status = efi_call_4 (gop->query_mode, gop, mode, &size, &info);
+
+      if (status)
+	{
+	  info = 0;
+	  continue;
+	}
+
+      err = grub_video_gop_fill_mode_info (mode, info, &mode_info);
+      if (err)
+	{
+	  grub_errno = GRUB_ERR_NONE;
+	  continue;
+	}
+      if (hook (&mode_info))
+	return 1;
+    }
+  return 0;
+}
+
 static grub_err_t
 grub_video_gop_setup (unsigned int width, unsigned int height,
 		      unsigned int mode_type, unsigned int mode_mask __attribute__ ((unused)))
@@ -226,7 +261,7 @@ grub_video_gop_setup (unsigned int width, unsigned int height,
 	  if (status)
 	    {
 	      info = 0;
-	      break;
+	      continue;
 	    }
 
 	  grub_dprintf ("video", "GOP: mode %d: %dx%d\n", mode, info->width,
@@ -281,7 +316,8 @@ grub_video_gop_setup (unsigned int width, unsigned int height,
 
   info = gop->mode->info;
 
-  err = grub_video_gop_fill_mode_info (info, &framebuffer.mode_info);
+  err = grub_video_gop_fill_mode_info (gop->mode->mode, info,
+				       &framebuffer.mode_info);
   if (err)
     {
       grub_dprintf ("video", "GOP: couldn't fill mode info\n");
@@ -379,6 +415,7 @@ static struct grub_video_adapter grub_video_gop_adapter =
     .delete_render_target = grub_video_fb_delete_render_target,
     .set_active_render_target = grub_video_gop_set_active_render_target,
     .get_active_render_target = grub_video_fb_get_active_render_target,
+    .iterate = grub_video_gop_iterate,
 
     .next = 0
   };

From 2550da89ecea329e6d2c01adc62b9f7b5b15ef56 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 4 Sep 2010 01:52:04 +0200
Subject: [PATCH 1528/1628] Add missing h2m

---
 docs/man/grub-mknetdir.h2m | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 docs/man/grub-mknetdir.h2m

diff --git a/docs/man/grub-mknetdir.h2m b/docs/man/grub-mknetdir.h2m
new file mode 100644
index 000000000..26defe876
--- /dev/null
+++ b/docs/man/grub-mknetdir.h2m
@@ -0,0 +1,2 @@
+[NAME]
+grub-mknetdir \- prepare a GRUB netboot directory.

From dda060dd0fb1e0db8735e449908fbaaee91f4a75 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 4 Sep 2010 02:18:48 +0200
Subject: [PATCH 1529/1628] 	* grub-core/kern/misc.c: Don't add abort alias
 in utils. 	Reported by: echoline.

---
 ChangeLog             | 5 +++++
 grub-core/kern/misc.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5c64e0207..dcd16e8e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/misc.c: Don't add abort alias in utils.
+	Reported by: echoline.
+
 2010-09-03  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Add missing files into "make dist" tarball for other platforms.
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
index 69fdc3d42..0bfa08992 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -990,7 +990,7 @@ grub_abort (void)
   grub_exit ();
 }
 
-#ifndef APPLE_CC
+#if ! defined (APPLE_CC) && !defined (GRUB_UTIL)
 /* GCC emits references to abort().  */
 void abort (void) __attribute__ ((alias ("grub_abort")));
 #endif

From 80f5b97cdce1cf615da9ad4fccfdbd9af6c3d47a Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Sat, 4 Sep 2010 08:14:50 +0530
Subject: [PATCH 1530/1628] --source option for menuentry

---
 grub-core/commands/menuentry.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
index 6fdb172b6..fc1ae71c7 100644
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -33,6 +33,8 @@ static const struct grub_arg_option options[] =
      N_("Users allowed to boot this entry."), "USERNAME", ARG_TYPE_STRING},
     {"hotkey", 3, 0,
      N_("Keyboard key for this entry."), "KEY", ARG_TYPE_STRING},
+    {"source", 4, 0,
+     N_("Menu entry definition as a string."), "STRING", ARG_TYPE_STRING},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -231,8 +233,19 @@ grub_cmd_menuentry (grub_extcmd_context_t ctxt, int argc, char **args)
   unsigned len;
   grub_err_t r;
 
-  if (! argc || ! ctxt->script)
-    return GRUB_ERR_BAD_ARGUMENT;
+  if (! argc)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "missing arguments");
+
+  if (ctxt->state[3].set && ctxt->script)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "multiple menuentry definitions");
+
+  if (! ctxt->state[3].set && ! ctxt->script)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no menuentry definition");
+
+  if (! ctxt->script)
+    return append_menu_entry (argc, (const char **) args,
+			      ctxt->state[0].args, ctxt->state[1].arg,
+			      ctxt->state[2].arg, 0, ctxt->state[3].arg);
 
   src = args[argc - 1];
   args[argc - 1] = NULL;

From 25b60c913b4708f5dce0466a630e696b03e4be23 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Sat, 4 Sep 2010 14:19:04 +0530
Subject: [PATCH 1531/1628] 	* grub-core/normal/completion.c
 (grub_normal_do_completion): Fix 	grub_free order.

---
 ChangeLog                     | 5 +++++
 grub-core/normal/completion.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 44c2d178d..371e910c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-04  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* grub-core/normal/completion.c (grub_normal_do_completion): Fix
+	grub_free order.
+
 2010-09-04  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Support for passing block of commands as an argument to extcmds.
diff --git a/grub-core/normal/completion.c b/grub-core/normal/completion.c
index d127f9baf..1b51dab3a 100644
--- a/grub-core/normal/completion.c
+++ b/grub-core/normal/completion.c
@@ -500,8 +500,8 @@ grub_normal_do_completion (char *buf, int *restore,
  fail:
   if (argc != 0)
     {
-      grub_free (argv);
       grub_free (argv[0]);
+      grub_free (argv);
     }
   grub_free (match);
   grub_errno = GRUB_ERR_NONE;

From 854bd47cb875c9b0127cf23c5a95163e4f991cbf Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Sat, 4 Sep 2010 14:22:51 +0530
Subject: [PATCH 1532/1628] fix memory leak and out-of-range writes

---
 grub-core/commands/wildcard.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
index bba99dcc8..cbe32e0ff 100644
--- a/grub-core/commands/wildcard.c
+++ b/grub-core/commands/wildcard.c
@@ -72,6 +72,7 @@ merge (char **dest, char **ps)
       return 0;
     }
 
+  dest = p;
   for (j = 0; ps[j]; j++)
     dest[i++] = ps[j];
   dest[i] = 0;

From 49649ac85d1c384597a3834948249fa9aac7ddd5 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Sat, 4 Sep 2010 14:32:59 +0530
Subject: [PATCH 1533/1628] review comments

---
 grub-core/script/execute.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
index e78a41bb5..2c3772ed8 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -99,7 +99,7 @@ grub_script_return (grub_command_t cmd __attribute__((unused)),
   unsigned long n;
 
   if (! scope || argc > 1)
-    return GRUB_ERR_BAD_ARGUMENT;
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "not in function scope");
 
   if (argc == 0)
     {
@@ -109,10 +109,10 @@ grub_script_return (grub_command_t cmd __attribute__((unused)),
 
   n = grub_strtoul (argv[0], &p, 10);
   if (*p != '\0')
-    return GRUB_ERR_BAD_ARGUMENT;
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "bad argument");
 
   function_return = 1;
-  return n;
+  return n ? grub_error (GRUB_ERR_TEST_FAILURE, "false") : GRUB_ERR_NONE;
 }
 
 static int

From 3759a35f757924867450ec3c8ffca6e64cd9b7c5 Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon@janc.net.pl>
Date: Sat, 4 Sep 2010 18:28:42 +0200
Subject: [PATCH 1534/1628] 	* include/grub/file.h (grub_file): New member
 not_easly_seekable. 	(grub_file_seekable): New inline function. 	*
 grub-core/io/gzio.c (test_header): Don't test end magic if file isn't 	easily
 seekable. 	(grub_gzio_open): Set not_easly_seekable. 	*
 grub-core/fs/i386/pc/pxe.c (grub_pxefs_open): Set not_easily_seekable. 
 * grub-core/io/bufio.c (grub_bufio_open): Propagate not_easily_seekable.

---
 ChangeLog                  | 10 ++++++++++
 grub-core/fs/i386/pc/pxe.c |  1 +
 grub-core/io/bufio.c       |  1 +
 grub-core/io/gzio.c        | 11 +++++++----
 include/grub/file.h        |  9 +++++++++
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a155853d9..fee952996 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-04  Szymon Janc <szymon@janc.net.pl>
+
+	* include/grub/file.h (grub_file): New member not_easly_seekable.
+	(grub_file_seekable): New inline function.
+	* grub-core/io/gzio.c (test_header): Don't test end magic if file isn't
+	easily seekable.
+	(grub_gzio_open): Set not_easly_seekable.
+	* grub-core/fs/i386/pc/pxe.c (grub_pxefs_open): Set not_easily_seekable.
+	* grub-core/io/bufio.c (grub_bufio_open): Propagate not_easily_seekable.
+
 2010-09-04  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Support for options to appear multiple times on cmdline.
diff --git a/grub-core/fs/i386/pc/pxe.c b/grub-core/fs/i386/pc/pxe.c
index 90dfd5067..baaff0ffc 100644
--- a/grub-core/fs/i386/pc/pxe.c
+++ b/grub-core/fs/i386/pc/pxe.c
@@ -282,6 +282,7 @@ grub_pxefs_open (struct grub_file *file, const char *name)
     }
 
   file->data = data;
+  file->not_easly_seekable = 1;
   grub_memcpy (file_int, file, sizeof (struct grub_file));
   curr_file = file_int;
 
diff --git a/grub-core/io/bufio.c b/grub-core/io/bufio.c
index 92f29279e..8a72ecd79 100644
--- a/grub-core/io/bufio.c
+++ b/grub-core/io/bufio.c
@@ -74,6 +74,7 @@ grub_bufio_open (grub_file_t io, int size)
   file->data = bufio;
   file->read_hook = 0;
   file->fs = &grub_bufio_fs;
+  file->not_easly_seekable = io->not_easly_seekable;
 
   return file;
 }
diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
index 9bf609105..0545e32bd 100644
--- a/grub-core/io/gzio.c
+++ b/grub-core/io/gzio.c
@@ -214,12 +214,14 @@ test_header (grub_file_t file)
 
   grub_file_seek (gzio->file, grub_file_size (gzio->file) - 4);
 
-  if (grub_file_read (gzio->file, &orig_len, 4) != 4)
+  if (grub_file_seekable (gzio->file))
     {
-      grub_error (GRUB_ERR_BAD_FILE_TYPE, "unsupported gzip format");
-      return 0;
+      if (grub_file_read (gzio->file, &orig_len, 4) != 4)
+	{
+	  grub_error (GRUB_ERR_BAD_FILE_TYPE, "unsupported gzip format");
+	  return 0;
+	}
     }
-
   /* FIXME: this does not handle files whose original size is over 4GB.
      But how can we know the real original size?  */
   file->size = grub_le_to_cpu32 (orig_len);
@@ -1135,6 +1137,7 @@ grub_gzio_open (grub_file_t io, int transparent)
   file->data = gzio;
   file->read_hook = 0;
   file->fs = &grub_gzio_fs;
+  file->not_easly_seekable = 1;
 
   if (! test_header (file))
     {
diff --git a/include/grub/file.h b/include/grub/file.h
index 2aacf936f..05c9907d5 100644
--- a/include/grub/file.h
+++ b/include/grub/file.h
@@ -39,6 +39,9 @@ struct grub_file
   /* The file size.  */
   grub_off_t size;
 
+  /* If file is not easly seekable. Should be set by underlying layer.  */
+  int not_easly_seekable;
+
   /* Filesystem-specific data.  */
   void *data;
 
@@ -69,4 +72,10 @@ grub_file_tell (const grub_file_t file)
   return file->offset;
 }
 
+static inline int
+grub_file_seekable (const grub_file_t file)
+{
+  return !file->not_easly_seekable;
+}
+
 #endif /* ! GRUB_FILE_HEADER */

From 1bce65c7b14696a43ad795eb6b71c67f3d3fb9c8 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk@dbook>
Date: Sun, 5 Sep 2010 14:57:28 +0530
Subject: [PATCH 1535/1628] not command (!) support

---
 Makefile.util.def          |  6 ++++
 grub-core/script/execute.c | 29 +++++++++++++++---
 grub-core/script/yylex.l   |  1 -
 tests/grub_script_not.in   | 62 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 93 insertions(+), 5 deletions(-)
 create mode 100644 tests/grub_script_not.in

diff --git a/Makefile.util.def b/Makefile.util.def
index dd38774fd..e0900c73f 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -531,6 +531,12 @@ script = {
   common = tests/grub_script_expansion.in;
 };
 
+script = {
+  testcase;
+  name = grub_script_not;
+  common = tests/grub_script_not.in;
+};
+
 program = {
   testcase;
   name = example_unit_test;
diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
index a7baee96c..b43ec85e1 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -547,13 +547,32 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
   grub_script_function_t func = 0;
   char errnobuf[18];
   char *cmdname;
+  int argc;
+  char **args;
+  int invert;
   struct grub_script_argv argv = { 0, 0, 0 };
 
   /* Lookup the command.  */
   if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args[0])
     return grub_errno;
 
+  invert = 0;
+  argc = argv.argc - 1;
+  args = argv.args + 1;
   cmdname = argv.args[0];
+  if (grub_strcmp (cmdname, "!") == 0)
+    {
+      if (argv.argc < 2 || ! argv.args[1])
+	{
+	  grub_script_argv_free (&argv);
+	  return grub_error (GRUB_ERR_BAD_ARGUMENT, "missing arguments");
+	}
+
+      invert = 1;
+      argc = argv.argc - 2;
+      args = argv.args + 2;
+      cmdname = argv.args[1];
+    }
   grubcmd = grub_command_find (cmdname);
   if (! grubcmd)
     {
@@ -594,13 +613,15 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
     {
       if ((grubcmd->flags & GRUB_COMMAND_FLAG_BLOCKS) &&
 	  (grubcmd->flags & GRUB_COMMAND_FLAG_EXTCMD))
-	ret = grub_extcmd_dispatcher (grubcmd, argv.argc - 1, argv.args + 1,
-				      argv.script);
+	ret = grub_extcmd_dispatcher (grubcmd, argc, args, argv.script);
       else
-	ret = (grubcmd->func) (grubcmd, argv.argc - 1, argv.args + 1);
+	ret = (grubcmd->func) (grubcmd, argc, args);
     }
   else
-    ret = grub_script_function_call (func, argv.argc - 1, argv.args + 1);
+    ret = grub_script_function_call (func, argc, args);
+
+  if (invert)
+    ret = ! ret;
 
   /* Free arguments.  */
   grub_script_argv_free (&argv);
diff --git a/grub-core/script/yylex.l b/grub-core/script/yylex.l
index d4cad8097..55620b6bd 100644
--- a/grub-core/script/yylex.l
+++ b/grub-core/script/yylex.l
@@ -155,7 +155,6 @@ MULTILINE       {WORD}?((\"{DQCHR}*)|(\'{SQCHR}*)|(\\\n))
 ">"             { RECORD; return GRUB_PARSER_TOKEN_GT;      }
 
  /* Reserved words */
-"!"             { RECORD; return GRUB_PARSER_TOKEN_NOT;       }
 "{"             { RECORD; return GRUB_PARSER_TOKEN_LBR;       }
 "}"             { RECORD; return GRUB_PARSER_TOKEN_RBR;       }
 "[["            { RECORD; return GRUB_PARSER_TOKEN_RSQBR2;    }
diff --git a/tests/grub_script_not.in b/tests/grub_script_not.in
new file mode 100644
index 000000000..ff71039a6
--- /dev/null
+++ b/tests/grub_script_not.in
@@ -0,0 +1,62 @@
+#! @builddir@/grub-shell-tester
+#
+# Copyright (C) 2010  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/>.
+
+true
+echo $?
+
+! true
+echo $?
+
+false
+echo $?
+
+! false
+echo $?
+
+#
+# Negated forms (copied from grub_script_if.in)
+#
+
+#basic if, execute
+if ! true; then echo yes; fi
+
+#basic if, no execution
+if ! false; then echo no; fi
+
+#if else, execute if path
+if ! true; then echo yes; else echo no; fi
+
+#if else, execute else path
+if ! false; then echo no; else echo yes; fi
+
+#if elif, execute elif
+if ! false; then echo no; elif ! true; then echo yes; fi
+
+#if elif else, execute else
+if ! false; then echo no; elif ! false; then echo no; else echo yes; fi
+
+#if elif(1) elif(2), execute elif(2)
+if false; then echo no; elif ! false; then echo no; elif ! true; then echo yes; fi
+
+#if elif(1) elif(2) else, execute else
+if false; then echo no; elif false; then echo no; elif ! false; then echo no; else echo yes; fi
+
+#if {if elif else}, execute elif
+if true; then if false; then echo no; elif ! true; then echo yes; else echo no; fi; fi
+
+#if {if elif} else, execute elif. ofcourse no dangling-else problem due to "fi"
+if true; then if ! false; then echo no; elif true; then echo yes; fi; else echo no; fi

From fc2ef1172ca4e5b5407b5ca5d83221c2d4a325a8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 5 Sep 2010 13:05:36 +0200
Subject: [PATCH 1536/1628] 	* grub-core/io/gzio.c (grub_gzio_open):
 Removed "transparent" parameter. 	Made static. 	(grub_gzfile_open):
 Removed. All users updated. 	(GRUB_MOD_INIT): New function. 
 (GRUB_MOD_FINI): Likewise. 	* grub-core/kern/file.c
 (grub_file_filters_all): New variable. 	(grub_file_filters_enabled):
 Likewise. 	(grub_file_open): Handle filters. 	*
 grub-core/loader/i386/bsd.c (GRUB_MOD_INIT): Load gzio. 	*
 grub-core/normal/main.c (GRUB_MOD_INIT): Likewise. 	* include/grub/file.h
 (grub_file_filter_id_t): New type. 	(grub_file_filter_t): Likewise. 
 (grub_file_filters_all): New extern variable. 	(grub_file_filters_enabled):
 Likewise. 	(grub_file_filter_register): New inline function. 
 (grub_file_filter_unregister): Likewise. 	(grub_file_filter_disable):
 Likewise. 	(grub_file_filter_disable_compression): Likewise. 	*
 include/grub/gzio.h: Removed.

---
 ChangeLog                                 | 22 ++++++++++++
 grub-core/commands/acpi.c                 |  3 +-
 grub-core/commands/blocklist.c            |  1 +
 grub-core/commands/cat.c                  |  3 +-
 grub-core/commands/cmp.c                  |  5 ++-
 grub-core/commands/crc.c                  |  1 +
 grub-core/commands/hashsum.c              |  7 +++-
 grub-core/commands/hexdump.c              |  3 +-
 grub-core/commands/loadenv.c              |  2 ++
 grub-core/commands/ls.c                   |  2 ++
 grub-core/commands/search.c               |  1 +
 grub-core/commands/test.c                 |  1 +
 grub-core/gettext/gettext.c               |  5 ++-
 grub-core/io/gzio.c                       | 40 ++++++++-------------
 grub-core/kern/elf.c                      |  3 +-
 grub-core/kern/file.c                     | 26 ++++++++++++--
 grub-core/loader/i386/bsd.c               | 20 ++++++-----
 grub-core/loader/i386/linux.c             |  1 +
 grub-core/loader/i386/pc/chainloader.c    |  1 +
 grub-core/loader/i386/pc/linux.c          |  1 +
 grub-core/loader/i386/xnu.c               |  3 +-
 grub-core/loader/macho.c                  |  3 +-
 grub-core/loader/mips/linux.c             |  1 +
 grub-core/loader/multiboot.c              |  9 +++--
 grub-core/loader/powerpc/ieee1275/linux.c |  1 +
 grub-core/loader/sparc64/ieee1275/linux.c |  3 +-
 grub-core/loader/xnu.c                    | 13 ++++---
 grub-core/loader/xnu_resume.c             |  1 +
 grub-core/normal/main.c                   |  3 ++
 include/grub/file.h                       | 44 +++++++++++++++++++++++
 include/grub/gzio.h                       | 28 ---------------
 util/grub-fstest.c                        |  1 +
 util/grub-probe.c                         |  1 +
 util/i386/pc/grub-setup.c                 |  2 ++
 util/sparc64/ieee1275/grub-setup.c        |  2 ++
 35 files changed, 165 insertions(+), 98 deletions(-)
 delete mode 100644 include/grub/gzio.h

diff --git a/ChangeLog b/ChangeLog
index 77f9232db..33de07ea1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/io/gzio.c (grub_gzio_open): Removed "transparent" parameter.
+	Made static.
+	(grub_gzfile_open): Removed. All users updated.
+	(GRUB_MOD_INIT): New function.
+	(GRUB_MOD_FINI): Likewise.
+	* grub-core/kern/file.c (grub_file_filters_all): New variable.
+	(grub_file_filters_enabled): Likewise.
+	(grub_file_open): Handle filters.
+	* grub-core/loader/i386/bsd.c (GRUB_MOD_INIT): Load gzio.
+	* grub-core/normal/main.c (GRUB_MOD_INIT): Likewise.
+	* include/grub/file.h (grub_file_filter_id_t): New type.
+	(grub_file_filter_t): Likewise.
+	(grub_file_filters_all): New extern variable.
+	(grub_file_filters_enabled): Likewise.
+	(grub_file_filter_register): New inline function.
+	(grub_file_filter_unregister): Likewise.
+	(grub_file_filter_disable): Likewise.
+	(grub_file_filter_disable_compression): Likewise.
+	* include/grub/gzio.h: Removed.
+
 2010-09-04  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Filename expansion support for wildcards in GRUB script.
diff --git a/grub-core/commands/acpi.c b/grub-core/commands/acpi.c
index 1f17b63d6..b2edcc9cd 100644
--- a/grub-core/commands/acpi.c
+++ b/grub-core/commands/acpi.c
@@ -23,7 +23,6 @@
 #include <grub/disk.h>
 #include <grub/term.h>
 #include <grub/misc.h>
-#include <grub/gzio.h>
 #include <grub/acpi.h>
 #include <grub/mm.h>
 #include <grub/machine/memory.h>
@@ -628,7 +627,7 @@ grub_cmd_acpi (struct grub_extcmd_context *ctxt, int argc, char **args)
       grub_size_t size;
       char *buf;
 
-      file = grub_gzfile_open (args[i], 1);
+      file = grub_file_open (args[i]);
       if (! file)
 	{
 	  free_tables ();
diff --git a/grub-core/commands/blocklist.c b/grub-core/commands/blocklist.c
index cace31113..4651fb32a 100644
--- a/grub-core/commands/blocklist.c
+++ b/grub-core/commands/blocklist.c
@@ -82,6 +82,7 @@ grub_cmd_blocklist (grub_command_t cmd __attribute__ ((unused)),
   if (argc < 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "no file specified");
 
+  grub_file_filter_disable_compression ();
   file = grub_file_open (args[0]);
   if (! file)
     return grub_errno;
diff --git a/grub-core/commands/cat.c b/grub-core/commands/cat.c
index a70118517..68ca83c5d 100644
--- a/grub-core/commands/cat.c
+++ b/grub-core/commands/cat.c
@@ -22,7 +22,6 @@
 #include <grub/disk.h>
 #include <grub/term.h>
 #include <grub/misc.h>
-#include <grub/gzio.h>
 #include <grub/extcmd.h>
 #include <grub/i18n.h>
 
@@ -48,7 +47,7 @@ grub_cmd_cat (grub_extcmd_context_t ctxt, int argc, char **args)
   if (argc != 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
 
-  file = grub_gzfile_open (args[0], 1);
+  file = grub_file_open (args[0]);
   if (! file)
     return grub_errno;
 
diff --git a/grub-core/commands/cmp.c b/grub-core/commands/cmp.c
index 626e1d022..d9e76a4d7 100644
--- a/grub-core/commands/cmp.c
+++ b/grub-core/commands/cmp.c
@@ -21,7 +21,6 @@
 #include <grub/misc.h>
 #include <grub/file.h>
 #include <grub/mm.h>
-#include <grub/gzio.h>
 #include <grub/command.h>
 #include <grub/i18n.h>
 
@@ -44,8 +43,8 @@ grub_cmd_cmp (grub_command_t cmd __attribute__ ((unused)),
   grub_printf ("Compare file `%s' with `%s':\n", args[0],
 	       args[1]);
 
-  file1 = grub_gzfile_open (args[0], 1);
-  file2 = grub_gzfile_open (args[1], 1);
+  file1 = grub_file_open (args[0]);
+  file2 = grub_file_open (args[1]);
   if (! file1 || ! file2)
     goto cleanup;
 
diff --git a/grub-core/commands/crc.c b/grub-core/commands/crc.c
index 1c1a690aa..f165e1aaf 100644
--- a/grub-core/commands/crc.c
+++ b/grub-core/commands/crc.c
@@ -38,6 +38,7 @@ grub_cmd_crc (grub_command_t cmd __attribute__ ((unused)),
   if (argc != 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
 
+  grub_file_filter_disable_compression ();
   file = grub_file_open (args[0]);
   if (! file)
     return 0;
diff --git a/grub-core/commands/hashsum.c b/grub-core/commands/hashsum.c
index df85015a6..54f487cc7 100644
--- a/grub-core/commands/hashsum.c
+++ b/grub-core/commands/hashsum.c
@@ -115,11 +115,15 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename,
 	  filename = grub_xasprintf ("%s/%s", prefix, p);
 	  if (!filename)
 	    return grub_errno;
+	  grub_file_filter_disable_compression ();
 	  file = grub_file_open (filename);
 	  grub_free (filename);
 	}
       else
-	file = grub_file_open (p);
+	{
+	  grub_file_filter_disable_compression ();
+	  file = grub_file_open (p);
+	}
       if (!file)
 	{
 	  grub_file_close (hashlist);
@@ -206,6 +210,7 @@ grub_cmd_hashsum (struct grub_extcmd_context *ctxt,
       grub_file_t file;
       grub_err_t err;
       unsigned j;
+      grub_file_filter_disable_compression ();
       file = grub_file_open (args[i]);
       if (!file)
 	{
diff --git a/grub-core/commands/hexdump.c b/grub-core/commands/hexdump.c
index 6c518f649..08a94eb64 100644
--- a/grub-core/commands/hexdump.c
+++ b/grub-core/commands/hexdump.c
@@ -21,7 +21,6 @@
 #include <grub/file.h>
 #include <grub/disk.h>
 #include <grub/misc.h>
-#include <grub/gzio.h>
 #include <grub/lib/hexdump.h>
 #include <grub/extcmd.h>
 #include <grub/i18n.h>
@@ -89,7 +88,7 @@ grub_cmd_hexdump (grub_extcmd_context_t ctxt, int argc, char **args)
     {
       grub_file_t file;
 
-      file = grub_gzfile_open (args[0], 1);
+      file = grub_file_open (args[0]);
       if (! file)
 	return 0;
 
diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
index 381810a92..9a1873ba9 100644
--- a/grub-core/commands/loadenv.c
+++ b/grub-core/commands/loadenv.c
@@ -56,6 +56,7 @@ open_envblk_file (char *filename)
           grub_strcpy (filename, prefix);
           filename[len] = '/';
           grub_strcpy (filename + len + 1, GRUB_ENVBLK_DEFCFG);
+	  grub_file_filter_disable_compression ();
           file = grub_file_open (filename);
           grub_free (filename);
           return file;
@@ -67,6 +68,7 @@ open_envblk_file (char *filename)
         }
     }
 
+  grub_file_filter_disable_compression ();
   return grub_file_open (filename);
 }
 
diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c
index b91ef2942..02915bac4 100644
--- a/grub-core/commands/ls.c
+++ b/grub-core/commands/ls.c
@@ -105,6 +105,7 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
 
 	  /* XXX: For ext2fs symlinks are detected as files while they
 	     should be reported as directories.  */
+	  grub_file_filter_disable_compression ();
 	  file = grub_file_open (pathname);
 	  if (! file)
 	    {
@@ -211,6 +212,7 @@ grub_ls_list_files (char *dirname, int longlist, int all, int human)
 	  struct grub_dirhook_info info;
 	  grub_errno = 0;
 
+	  grub_file_filter_disable_compression ();
 	  file = grub_file_open (dirname);
 	  if (! file)
 	    goto fail;
diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c
index 71267b117..8a646b452 100644
--- a/grub-core/commands/search.c
+++ b/grub-core/commands/search.c
@@ -54,6 +54,7 @@ FUNC_NAME (const char *key, const char *var, int no_floppy)
 	if (! buf)
 	  return 1;
 
+	grub_file_filter_disable_compression ();
 	file = grub_file_open (buf);
 	if (file)
 	  {
diff --git a/grub-core/commands/test.c b/grub-core/commands/test.c
index 6995165cf..97b7fe6e4 100644
--- a/grub-core/commands/test.c
+++ b/grub-core/commands/test.c
@@ -334,6 +334,7 @@ test_parse (char **args, int *argn, int argc)
 	  if (grub_strcmp (args[*argn], "-s") == 0)
 	    {
 	      grub_file_t file;
+	      grub_file_filter_disable_compression ();
 	      file = grub_file_open (args[*argn + 1]);
 	      update_val (file && (grub_file_size (file) != 0));
 	      if (file)
diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
index bc7d42824..2f94ac030 100644
--- a/grub-core/gettext/gettext.c
+++ b/grub-core/gettext/gettext.c
@@ -26,7 +26,6 @@
 #include <grub/normal.h>
 #include <grub/file.h>
 #include <grub/kernel.h>
-#include <grub/gzio.h>
 #include <grub/i18n.h>
 
 /*
@@ -219,7 +218,7 @@ grub_gettext_translate (const char *orig)
   return ret;
 }
 
-/* This is similar to grub_gzfile_open. */
+/* This is similar to grub_file_open. */
 static grub_file_t
 grub_mofile_open (const char *filename)
 {
@@ -229,7 +228,7 @@ grub_mofile_open (const char *filename)
   /* Using fd_mo and not another variable because
      it's needed for grub_gettext_get_info.  */
 
-  fd_mo = grub_gzfile_open (filename, 1);
+  fd_mo = grub_file_open (filename);
   grub_errno = GRUB_ERR_NONE;
 
   if (!fd_mo)
diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
index 0545e32bd..96b54790a 100644
--- a/grub-core/io/gzio.c
+++ b/grub-core/io/gzio.c
@@ -40,7 +40,7 @@
 #include <grub/misc.h>
 #include <grub/fs.h>
 #include <grub/file.h>
-#include <grub/gzio.h>
+#include <grub/dl.h>
 
 /*
  *  Window Size
@@ -1113,8 +1113,8 @@ initialize_tables (grub_file_t file)
 /* Open a new decompressing object on the top of IO. If TRANSPARENT is true,
    even if IO does not contain data compressed by gzip, return a valid file
    object. Note that this function won't close IO, even if an error occurs.  */
-grub_file_t
-grub_gzio_open (grub_file_t io, int transparent)
+static grub_file_t
+grub_gzio_open (grub_file_t io)
 {
   grub_file_t file;
   grub_gzio_t gzio = 0;
@@ -1145,33 +1145,11 @@ grub_gzio_open (grub_file_t io, int transparent)
       grub_free (file);
       grub_file_seek (io, 0);
 
-      if (grub_errno == GRUB_ERR_BAD_FILE_TYPE && transparent)
+      if (grub_errno == GRUB_ERR_BAD_FILE_TYPE)
 	{
 	  grub_errno = GRUB_ERR_NONE;
 	  return io;
 	}
-      else
-	return 0;
-    }
-
-  return file;
-}
-
-/* This is similar to grub_gzio_open, but takes a file name as an argument.  */
-grub_file_t
-grub_gzfile_open (const char *name, int transparent)
-{
-  grub_file_t io, file;
-
-  io = grub_file_open (name);
-  if (! io)
-    return 0;
-
-  file = grub_gzio_open (io, transparent);
-  if (! file)
-    {
-      grub_file_close (io);
-      return 0;
     }
 
   return file;
@@ -1252,3 +1230,13 @@ static struct grub_fs grub_gzio_fs =
     .label = 0,
     .next = 0
   };
+
+GRUB_MOD_INIT(gzio)
+{
+  grub_file_filter_register (GRUB_FILE_FILTER_GZIO, grub_gzio_open);
+}
+
+GRUB_MOD_FINI(gzio)
+{
+  grub_file_filter_unregister (GRUB_FILE_FILTER_GZIO);
+}
diff --git a/grub-core/kern/elf.c b/grub-core/kern/elf.c
index 875a855ea..4be408c31 100644
--- a/grub-core/kern/elf.c
+++ b/grub-core/kern/elf.c
@@ -21,7 +21,6 @@
 #include <grub/elf.h>
 #include <grub/elfload.h>
 #include <grub/file.h>
-#include <grub/gzio.h>
 #include <grub/misc.h>
 #include <grub/mm.h>
 
@@ -95,7 +94,7 @@ grub_elf_open (const char *name)
   grub_file_t file;
   grub_elf_t elf;
 
-  file = grub_gzfile_open (name, 1);
+  file = grub_file_open (name);
   if (! file)
     return 0;
 
diff --git a/grub-core/kern/file.c b/grub-core/kern/file.c
index e17c35f95..c93fbf737 100644
--- a/grub-core/kern/file.c
+++ b/grub-core/kern/file.c
@@ -24,6 +24,9 @@
 #include <grub/fs.h>
 #include <grub/device.h>
 
+grub_file_filter_t grub_file_filters_all[GRUB_FILE_FILTER_MAX];
+grub_file_filter_t grub_file_filters_enabled[GRUB_FILE_FILTER_MAX];
+
 /* Get the device part of the filename NAME. It is enclosed by parentheses.  */
 char *
 grub_file_get_device_name (const char *name)
@@ -54,14 +57,15 @@ grub_file_get_device_name (const char *name)
 grub_file_t
 grub_file_open (const char *name)
 {
-  grub_device_t device;
-  grub_file_t file = 0;
+  grub_device_t device = 0;
+  grub_file_t file = 0, last_file = 0;
   char *device_name;
   char *file_name;
+  grub_file_filter_id_t filter;
 
   device_name = grub_file_get_device_name (name);
   if (grub_errno)
-    return 0;
+    goto fail;
 
   /* Get the file part of NAME.  */
   file_name = grub_strchr (name, ')');
@@ -94,6 +98,19 @@ grub_file_open (const char *name)
   if ((file->fs->open) (file, file_name) != GRUB_ERR_NONE)
     goto fail;
 
+  for (filter = 0; file && filter < ARRAY_SIZE (grub_file_filters_enabled);
+       filter++)
+    if (grub_file_filters_enabled[filter])
+      {
+	last_file = file;
+	file = grub_file_filters_enabled[filter] (file);
+      }
+  if (!file)
+    grub_file_close (last_file);
+    
+  grub_memcpy (grub_file_filters_enabled, grub_file_filters_all,
+	       sizeof (grub_file_filters_enabled));
+
   return file;
 
  fail:
@@ -104,6 +121,9 @@ grub_file_open (const char *name)
 
   grub_free (file);
 
+  grub_memcpy (grub_file_filters_enabled, grub_file_filters_all,
+	       sizeof (grub_file_filters_enabled));
+
   return 0;
 }
 
diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
index 84459b15b..2e92bc42f 100644
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -28,7 +28,6 @@
 #include <grub/elfload.h>
 #include <grub/env.h>
 #include <grub/misc.h>
-#include <grub/gzio.h>
 #include <grub/aout.h>
 #include <grub/command.h>
 #include <grub/extcmd.h>
@@ -1326,7 +1325,7 @@ grub_bsd_load (int argc, char *argv[])
       goto fail;
     }
 
-  file = grub_gzfile_open (argv[0], 1);
+  file = grub_file_open (argv[0]);
   if (!file)
     goto fail;
 
@@ -1396,7 +1395,7 @@ grub_cmd_freebsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
 	  if (err)
 	    return err;
 
-	  file = grub_gzfile_open (argv[0], 1);
+	  file = grub_file_open (argv[0]);
 	  if (! file)
 	    return grub_errno;
 
@@ -1526,7 +1525,7 @@ grub_cmd_netbsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
 	{
 	  grub_file_t file;
 
-	  file = grub_gzfile_open (argv[0], 1);
+	  file = grub_file_open (argv[0]);
 	  if (! file)
 	    return grub_errno;
 
@@ -1630,7 +1629,7 @@ grub_cmd_freebsd_loadenv (grub_command_t cmd __attribute__ ((unused)),
       goto fail;
     }
 
-  file = grub_gzfile_open (argv[0], 1);
+  file = grub_file_open (argv[0]);
   if ((!file) || (!file->size))
     goto fail;
 
@@ -1731,7 +1730,7 @@ grub_cmd_freebsd_module (grub_command_t cmd __attribute__ ((unused)),
       return 0;
     }
 
-  file = grub_gzfile_open (argv[0], 1);
+  file = grub_file_open (argv[0]);
   if ((!file) || (!file->size))
     goto fail;
 
@@ -1782,7 +1781,7 @@ grub_netbsd_module_load (char *filename, grub_uint32_t type)
   void *src;
   grub_err_t err;
 
-  file = grub_gzfile_open (filename, 1);
+  file = grub_file_open (filename);
   if ((!file) || (!file->size))
     goto fail;
 
@@ -1868,7 +1867,7 @@ grub_cmd_freebsd_module_elf (grub_command_t cmd __attribute__ ((unused)),
       return 0;
     }
 
-  file = grub_gzfile_open (argv[0], 1);
+  file = grub_file_open (argv[0]);
   if (!file)
     return grub_errno;
   if (!file->size)
@@ -1904,7 +1903,7 @@ grub_cmd_openbsd_ramdisk (grub_command_t cmd __attribute__ ((unused)),
   if (!openbsd_ramdisk.max_size)
     return grub_error (GRUB_ERR_BAD_OS, "your kOpenBSD doesn't support ramdisk");
 
-  file = grub_gzfile_open (args[0], 1);
+  file = grub_file_open (args[0]);
   if (! file)
     return grub_error (GRUB_ERR_FILE_NOT_FOUND,
 		       "couldn't load ramdisk");
@@ -1940,6 +1939,9 @@ static grub_command_t cmd_netbsd_module_elf, cmd_openbsd_ramdisk;
 
 GRUB_MOD_INIT (bsd)
 {
+  /* Net and OpenBSD kernels are often compressed.  */
+  grub_dl_load ("gzio");
+
   cmd_freebsd = grub_register_extcmd ("kfreebsd", grub_cmd_freebsd,
 				      GRUB_COMMAND_FLAG_BOTH,
 				      N_("FILE"), N_("Load kernel of FreeBSD."),
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index 9cb26a0c2..cc2d20af3 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -1069,6 +1069,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
       goto fail;
     }
 
+  grub_file_filter_disable_compression ();
   file = grub_file_open (argv[0]);
   if (! file)
     goto fail;
diff --git a/grub-core/loader/i386/pc/chainloader.c b/grub-core/loader/i386/pc/chainloader.c
index 502031d0e..e76f84f08 100644
--- a/grub-core/loader/i386/pc/chainloader.c
+++ b/grub-core/loader/i386/pc/chainloader.c
@@ -69,6 +69,7 @@ grub_chainloader_cmd (const char *filename, grub_chainloader_flags_t flags)
 
   grub_dl_ref (my_mod);
 
+  grub_file_filter_disable_compression ();
   file = grub_file_open (filename);
   if (! file)
     goto fail;
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
index 0719cfb26..2f5dfec70 100644
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -401,6 +401,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
 
   addr_min = GRUB_LINUX_BZIMAGE_ADDR + grub_linux16_prot_size;
 
+  grub_file_filter_disable_compression ();
   file = grub_file_open (argv[0]);
   if (!file)
     goto fail;
diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
index d35e9e0aa..a9435eff3 100644
--- a/grub-core/loader/i386/xnu.c
+++ b/grub-core/loader/i386/xnu.c
@@ -31,7 +31,6 @@
 #include <grub/charset.h>
 #include <grub/term.h>
 #include <grub/command.h>
-#include <grub/gzio.h>
 #include <grub/i18n.h>
 #include <grub/bitmap_scale.h>
 
@@ -535,7 +534,7 @@ grub_cmd_devprop_load (grub_command_t cmd __attribute__ ((unused)),
   if (argc != 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "file name required");
 
-  file = grub_gzfile_open (args[0], 1);
+  file = grub_file_open (args[0]);
   if (! file)
     return grub_error (GRUB_ERR_FILE_NOT_FOUND,
 		       "couldn't load device-propertie dump");
diff --git a/grub-core/loader/macho.c b/grub-core/loader/macho.c
index 199d6f111..ecf0d8c53 100644
--- a/grub-core/loader/macho.c
+++ b/grub-core/loader/macho.c
@@ -26,7 +26,6 @@
 #include <grub/cpu/macho.h>
 #include <grub/machoload.h>
 #include <grub/file.h>
-#include <grub/gzio.h>
 #include <grub/misc.h>
 #include <grub/mm.h>
 
@@ -149,7 +148,7 @@ grub_macho_open (const char *name)
   grub_file_t file;
   grub_macho_t macho;
 
-  file = grub_gzfile_open (name, 1);
+  file = grub_file_open (name);
   if (! file)
     return 0;
 
diff --git a/grub-core/loader/mips/linux.c b/grub-core/loader/mips/linux.c
index 018cfdcc5..48f77dffb 100644
--- a/grub-core/loader/mips/linux.c
+++ b/grub-core/loader/mips/linux.c
@@ -344,6 +344,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
   if (initrd_loaded)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "only one initrd can be loaded.");
 
+  grub_file_filter_disable_compression ();
   file = grub_file_open (argv[0]);
   if (! file)
     return grub_errno;
diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
index 1de1def86..8780ec061 100644
--- a/grub-core/loader/multiboot.c
+++ b/grub-core/loader/multiboot.c
@@ -39,7 +39,6 @@
 #include <grub/dl.h>
 #include <grub/mm.h>
 #include <grub/misc.h>
-#include <grub/gzio.h>
 #include <grub/env.h>
 #include <grub/cpu/relocator.h>
 #include <grub/video.h>
@@ -225,7 +224,7 @@ grub_cmd_multiboot (grub_command_t cmd __attribute__ ((unused)),
   if (argc == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "no kernel specified");
 
-  file = grub_gzfile_open (argv[0], 1);
+  file = grub_file_open (argv[0]);
   if (! file)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "couldn't open file");
 
@@ -291,9 +290,9 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
 		       "you need to load the multiboot kernel first");
 
   if (nounzip)
-    file = grub_file_open (argv[0]);
-  else
-    file = grub_gzfile_open (argv[0], 1);
+    grub_file_filter_disable_compression ();
+
+  file = grub_file_open (argv[0]);
   if (! file)
     return grub_errno;
 
diff --git a/grub-core/loader/powerpc/ieee1275/linux.c b/grub-core/loader/powerpc/ieee1275/linux.c
index 351d050e5..249238d45 100644
--- a/grub-core/loader/powerpc/ieee1275/linux.c
+++ b/grub-core/loader/powerpc/ieee1275/linux.c
@@ -301,6 +301,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
       goto fail;
     }
 
+  grub_file_filter_disable_compression ();
   file = grub_file_open (argv[0]);
   if (! file)
     goto fail;
diff --git a/grub-core/loader/sparc64/ieee1275/linux.c b/grub-core/loader/sparc64/ieee1275/linux.c
index 948729a5d..177a6976e 100644
--- a/grub-core/loader/sparc64/ieee1275/linux.c
+++ b/grub-core/loader/sparc64/ieee1275/linux.c
@@ -305,7 +305,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
       goto out;
     }
 
-  file = grub_gzfile_open (argv[0], 1);
+  file = grub_file_open (argv[0]);
   if (!file)
     goto out;
 
@@ -393,6 +393,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
       goto fail;
     }
 
+  grub_file_filter_disable_compression ();
   file = grub_file_open (argv[0]);
   if (! file)
     goto fail;
diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
index 92532ed35..ece65611a 100644
--- a/grub-core/loader/xnu.c
+++ b/grub-core/loader/xnu.c
@@ -28,7 +28,6 @@
 #include <grub/machoload.h>
 #include <grub/macho.h>
 #include <grub/cpu/macho.h>
-#include <grub/gzio.h>
 #include <grub/command.h>
 #include <grub/misc.h>
 #include <grub/extcmd.h>
@@ -661,7 +660,7 @@ grub_xnu_load_driver (char *infoplistname, grub_file_t binaryfile)
     macho = 0;
 
   if (infoplistname)
-    infoplist = grub_gzfile_open (infoplistname, 1);
+    infoplist = grub_file_open (infoplistname);
   else
     infoplist = 0;
   grub_errno = GRUB_ERR_NONE;
@@ -756,7 +755,7 @@ grub_cmd_xnu_mkext (grub_command_t cmd __attribute__ ((unused)),
   if (! grub_xnu_heap_size)
     return grub_error (GRUB_ERR_BAD_OS, "no xnu kernel loaded");
 
-  file = grub_gzfile_open (args[0], 1);
+  file = grub_file_open (args[0]);
   if (! file)
     return grub_error (GRUB_ERR_FILE_NOT_FOUND,
 		       "couldn't load driver package");
@@ -869,7 +868,7 @@ grub_cmd_xnu_ramdisk (grub_command_t cmd __attribute__ ((unused)),
   if (! grub_xnu_heap_size)
     return grub_error (GRUB_ERR_BAD_OS, "no xnu kernel loaded");
 
-  file = grub_gzfile_open (args[0], 1);
+  file = grub_file_open (args[0]);
   if (! file)
     return grub_error (GRUB_ERR_FILE_NOT_FOUND,
 		       "couldn't load ramdisk");
@@ -909,7 +908,7 @@ grub_xnu_check_os_bundle_required (char *plistname, char *osbundlereq,
   if (binname)
     *binname = 0;
 
-  file = grub_gzfile_open (plistname, 1);
+  file = grub_file_open (plistname);
   if (! file)
     {
       grub_file_close (file);
@@ -1166,7 +1165,7 @@ grub_xnu_load_kext_from_dir (char *dirname, char *osbundlerequired,
 		grub_strcpy (binname + grub_strlen (binname), "/");
 	      grub_strcpy (binname + grub_strlen (binname), binsuffix);
 	      grub_dprintf ("xnu", "%s:%s\n", plistname, binname);
-	      binfile = grub_gzfile_open (binname, 1);
+	      binfile = grub_file_open (binname);
 	      if (! binfile)
 		grub_errno = GRUB_ERR_NONE;
 
@@ -1204,7 +1203,7 @@ grub_cmd_xnu_kext (grub_command_t cmd __attribute__ ((unused)),
       /* User explicitly specified plist and binary. */
       if (grub_strcmp (args[1], "-") != 0)
 	{
-	  binfile = grub_gzfile_open (args[1], 1);
+	  binfile = grub_file_open (args[1]);
 	  if (! binfile)
 	    {
 	      grub_error (GRUB_ERR_BAD_OS, "can't open file");
diff --git a/grub-core/loader/xnu_resume.c b/grub-core/loader/xnu_resume.c
index 6aebc1f34..8f0e24483 100644
--- a/grub-core/loader/xnu_resume.c
+++ b/grub-core/loader/xnu_resume.c
@@ -52,6 +52,7 @@ grub_xnu_resume (char *imagename)
   grub_addr_t target_image;
   grub_err_t err;
 
+  grub_file_filter_disable_compression ();
   file = grub_file_open (imagename);
   if (! file)
     return 0;
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
index 6a008f577..c7e83fba0 100644
--- a/grub-core/normal/main.c
+++ b/grub-core/normal/main.c
@@ -474,6 +474,9 @@ static void (*grub_xputs_saved) (const char *str);
 
 GRUB_MOD_INIT(normal)
 {
+  /* Previously many modules depended on gzio. Be nice to user and load it.  */
+  grub_dl_load ("gzio");
+
   grub_context_init ();
   grub_script_init ();
   grub_menu_init ();
diff --git a/include/grub/file.h b/include/grub/file.h
index 05c9907d5..a9f9552da 100644
--- a/include/grub/file.h
+++ b/include/grub/file.h
@@ -51,6 +51,50 @@ struct grub_file
 };
 typedef struct grub_file *grub_file_t;
 
+/* Filters with lower ID are executed first.  */
+typedef enum grub_file_filter_id
+  {
+    GRUB_FILE_FILTER_GZIO,
+    GRUB_FILE_FILTER_MAX,
+    GRUB_FILE_FILTER_COMPRESSION_FIRST = GRUB_FILE_FILTER_GZIO,
+    GRUB_FILE_FILTER_COMPRESSION_LAST = GRUB_FILE_FILTER_GZIO,
+  } grub_file_filter_id_t;
+
+typedef grub_file_t (*grub_file_filter_t) (grub_file_t in);
+
+extern grub_file_filter_t EXPORT_VAR(grub_file_filters_all)[GRUB_FILE_FILTER_MAX];
+extern grub_file_filter_t EXPORT_VAR(grub_file_filters_enabled)[GRUB_FILE_FILTER_MAX];
+
+static inline void
+grub_file_filter_register (grub_file_filter_id_t id, grub_file_filter_t filter)
+{
+  grub_file_filters_all[id] = filter;
+  grub_file_filters_enabled[id] = filter;
+};
+
+static inline void
+grub_file_filter_unregister (grub_file_filter_id_t id)
+{
+  grub_file_filters_all[id] = 0;
+  grub_file_filters_enabled[id] = 0;
+};
+
+static inline void
+grub_file_filter_disable (grub_file_filter_id_t id)
+{
+  grub_file_filters_enabled[id] = 0;
+};
+
+static inline void
+grub_file_filter_disable_compression (void)
+{
+  grub_file_filter_id_t id;
+
+  for (id = GRUB_FILE_FILTER_COMPRESSION_FIRST;
+       id <= GRUB_FILE_FILTER_COMPRESSION_LAST; id++)
+    grub_file_filters_enabled[id] = 0;
+};
+
 /* Get a device name from NAME.  */
 char *EXPORT_FUNC(grub_file_get_device_name) (const char *name);
 
diff --git a/include/grub/gzio.h b/include/grub/gzio.h
deleted file mode 100644
index cd7f39793..000000000
--- a/include/grub/gzio.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* gzio.h - prototypes for gzio */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007  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/>.
- */
-
-#ifndef GRUB_GZIO_H
-#define GRUB_GZIO_H	1
-
-#include <grub/file.h>
-
-grub_file_t grub_gzio_open (grub_file_t io, int transparent);
-grub_file_t grub_gzfile_open (const char *name, int transparent);
-
-#endif /* ! GRUB_GZIO_H */
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index 48fcbc57f..3935ce08b 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -107,6 +107,7 @@ read_file (char *pathname, int (*hook) (grub_off_t ofs, char *buf, int len))
       return;
     }
 
+  grub_file_filter_disable_compression ();
   file = grub_file_open (pathname);
   if (!file)
     {
diff --git a/util/grub-probe.c b/util/grub-probe.c
index ab3e2713e..62206bf0e 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -245,6 +245,7 @@ probe (const char *path, char *device_name)
 	      grub_path = xasprintf ("(%s)%s", drive_name, rel_path);
 	      free (rel_path);
 	      grub_util_info ("reading %s via GRUB facilities", grub_path);
+	      grub_file_filter_disable_compression ();
 	      file = grub_file_open (grub_path);
 	      if (! file)
 		grub_util_error ("cannot open %s via GRUB facilities", grub_path);
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 9788efe4a..642d9d104 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -454,6 +454,7 @@ unable_to_embed:
 
       grub_disk_cache_invalidate_all ();
 
+      grub_file_filter_disable_compression ();
       file = grub_file_open (core_path_dev);
       if (file)
 	{
@@ -524,6 +525,7 @@ unable_to_embed:
     }
 
   /* Now read the core image to determine where the sectors are.  */
+  grub_file_filter_disable_compression ();
   file = grub_file_open (core_path_dev);
   if (! file)
     grub_util_error ("%s", grub_errmsg);
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index 94734b977..d8481295f 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -228,6 +228,7 @@ setup (const char *prefix, const char *dir,
 
       grub_disk_cache_invalidate_all ();
 
+      grub_file_filter_disable_compression ();
       file = grub_file_open (core_path);
       if (file)
 	{
@@ -297,6 +298,7 @@ setup (const char *prefix, const char *dir,
     }
 
   /* Now read the core image to determine where the sectors are.  */
+  grub_file_filter_disable_compression ();
   file = grub_file_open (core_path);
   if (! file)
     grub_util_error ("%s", grub_errmsg);

From b81e40a379a51e3daec16acdd67d33801d7b72d7 Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon@janc.net.pl>
Date: Sun, 5 Sep 2010 14:18:31 +0200
Subject: [PATCH 1537/1628] 	* include/grub/crypto.h (GRUB_MD_CRC32): New
 definition.

---
 ChangeLog             | 4 ++++
 include/grub/crypto.h | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 33de07ea1..6b81f6c67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-05  Szymon Janc <szymon@janc.net.pl>
+
+	* include/grub/crypto.h (GRUB_MD_CRC32): New definition.
+
 2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/io/gzio.c (grub_gzio_open): Removed "transparent" parameter.
diff --git a/include/grub/crypto.h b/include/grub/crypto.h
index 48b52ee65..ebe78e7a1 100644
--- a/include/grub/crypto.h
+++ b/include/grub/crypto.h
@@ -243,10 +243,12 @@ extern gcry_md_spec_t _gcry_digest_spec_md5;
 extern gcry_md_spec_t _gcry_digest_spec_sha1;
 extern gcry_md_spec_t _gcry_digest_spec_sha256;
 extern gcry_md_spec_t _gcry_digest_spec_sha512;
+extern gcry_md_spec_t _gcry_digest_spec_crc32;
 #define GRUB_MD_MD5 ((const gcry_md_spec_t *) &_gcry_digest_spec_md5)
 #define GRUB_MD_SHA1 ((const gcry_md_spec_t *) &_gcry_digest_spec_sha1)
 #define GRUB_MD_SHA256 ((const gcry_md_spec_t *) &_gcry_digest_spec_sha256)
 #define GRUB_MD_SHA512 ((const gcry_md_spec_t *) &_gcry_digest_spec_sha512)
+#define GRUB_MD_CRC32 ((const gcry_md_spec_t *) &_gcry_digest_spec_crc32)
 
 /* Implement PKCS#5 PBKDF2 as per RFC 2898.  The PRF to use is HMAC variant
    of digest supplied by MD.  Inputs are the password P of length PLEN,

From a17792c324d8be2c4e4e68513c5460217b2ce2f8 Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon@janc.net.pl>
Date: Sun, 5 Sep 2010 14:24:39 +0200
Subject: [PATCH 1538/1628] 	* grub-core/lib/posix_wrap/sys/types.h (bool):
 Transform into an enum. 	(uint8_t): New type. 	(uint16_t): Likewise. 
 (uint32_t): Likewise. 	(uint64_t): Likewise.

---
 ChangeLog                            | 8 ++++++++
 grub-core/lib/posix_wrap/sys/types.h | 9 ++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b81f6c67..d932ffc1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-05  Szymon Janc <szymon@janc.net.pl>
+
+	* grub-core/lib/posix_wrap/sys/types.h (bool): Transform into an enum.
+	(uint8_t): New type.
+	(uint16_t): Likewise.
+	(uint32_t): Likewise.
+	(uint64_t): Likewise.
+
 2010-09-05  Szymon Janc <szymon@janc.net.pl>
 
 	* include/grub/crypto.h (GRUB_MD_CRC32): New definition.
diff --git a/grub-core/lib/posix_wrap/sys/types.h b/grub-core/lib/posix_wrap/sys/types.h
index ce3794087..28e354759 100644
--- a/grub-core/lib/posix_wrap/sys/types.h
+++ b/grub-core/lib/posix_wrap/sys/types.h
@@ -22,11 +22,14 @@
 #include <grub/misc.h>
 
 typedef grub_size_t size_t;
-typedef int bool;
-static const bool true = 1;
-static const bool false = 0;
+typedef enum { false = 0, true = 1 } bool;
 
 #define ULONG_MAX GRUB_ULONG_MAX
 #define UCHAR_MAX 0xff
 
+typedef grub_uint8_t uint8_t;
+typedef grub_uint16_t uint16_t;
+typedef grub_uint32_t uint32_t;
+typedef grub_uint64_t uint64_t;
+
 #endif

From 06f701171640be4cdbd8fe55d1694ffc82f014de Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 5 Sep 2010 16:40:41 +0200
Subject: [PATCH 1539/1628] 	Reintroduce testload.

	* grub-core/commands/minicmd.c (grub_rescue_cmd_testload) [0]: Moved
	from here ...
	* grub-core/commands/testload.c (grub_cmd_testload): ... here.
	(GRUB_MOD_INIT): New function.
	(GRUB_MOD_FINI): Likewise.
	* grub-core/Makefile.core.def (testload): New module.
---
 grub-core/Makefile.core.def   |   5 ++
 grub-core/commands/minicmd.c  | 106 -----------------------
 grub-core/commands/testload.c | 155 ++++++++++++++++++++++++++++++++++
 3 files changed, 160 insertions(+), 106 deletions(-)
 create mode 100644 grub-core/commands/testload.c

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 0d1e9da4f..d119cf9f5 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1388,3 +1388,8 @@ module = {
   name = test_blockarg;
   common = tests/test_blockarg.c;
 };
+
+module = {
+  name = testload;
+  common = commands/testload.c;
+};
diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
index d71174598..3d5f59719 100644
--- a/grub-core/commands/minicmd.c
+++ b/grub-core/commands/minicmd.c
@@ -142,112 +142,6 @@ grub_mini_cmd_root (struct grub_command *cmd __attribute__ ((unused)),
   return 0;
 }
 
-#if 0
-static void
-grub_rescue_cmd_testload (int argc, char *argv[])
-{
-  grub_file_t file;
-  char *buf;
-  grub_ssize_t size;
-  grub_ssize_t pos;
-  auto void read_func (unsigned long sector, unsigned offset, unsigned len);
-
-  void read_func (unsigned long sector __attribute__ ((unused)),
-		  unsigned offset __attribute__ ((unused)),
-		  unsigned len __attribute__ ((unused)))
-    {
-      grub_putchar ('.');
-      grub_refresh ();
-    }
-
-  if (argc < 1)
-    {
-      grub_error (GRUB_ERR_BAD_ARGUMENT, "no file specified");
-      return;
-    }
-
-  file = grub_file_open (argv[0]);
-  if (! file)
-    return;
-
-  size = grub_file_size (file) & ~(GRUB_DISK_SECTOR_SIZE - 1);
-  if (size == 0)
-    {
-      grub_file_close (file);
-      return;
-    }
-
-  buf = grub_malloc (size);
-  if (! buf)
-    goto fail;
-
-  grub_printf ("Reading %s sequentially", argv[0]);
-  file->read_hook = read_func;
-  if (grub_file_read (file, buf, size) != size)
-    goto fail;
-  grub_printf (" Done.\n");
-
-  /* Read sequentially again.  */
-  grub_printf ("Reading %s sequentially again", argv[0]);
-  if (grub_file_seek (file, 0) < 0)
-    goto fail;
-
-  for (pos = 0; pos < size; pos += GRUB_DISK_SECTOR_SIZE)
-    {
-      char sector[GRUB_DISK_SECTOR_SIZE];
-
-      if (grub_file_read (file, sector, GRUB_DISK_SECTOR_SIZE)
-	  != GRUB_DISK_SECTOR_SIZE)
-	goto fail;
-
-      if (grub_memcmp (sector, buf + pos, GRUB_DISK_SECTOR_SIZE) != 0)
-	{
-	  grub_printf ("\nDiffers in %d\n", pos);
-	  goto fail;
-	}
-    }
-  grub_printf (" Done.\n");
-
-  /* Read backwards and compare.  */
-  grub_printf ("Reading %s backwards", argv[0]);
-  pos = size;
-  while (pos > 0)
-    {
-      char sector[GRUB_DISK_SECTOR_SIZE];
-
-      pos -= GRUB_DISK_SECTOR_SIZE;
-
-      if (grub_file_seek (file, pos) < 0)
-	goto fail;
-
-      if (grub_file_read (file, sector, GRUB_DISK_SECTOR_SIZE)
-	  != GRUB_DISK_SECTOR_SIZE)
-	goto fail;
-
-      if (grub_memcmp (sector, buf + pos, GRUB_DISK_SECTOR_SIZE) != 0)
-	{
-	  int i;
-
-	  grub_printf ("\nDiffers in %d\n", pos);
-
-	  for (i = 0; i < GRUB_DISK_SECTOR_SIZE; i++)
-	    grub_putchar (buf[pos + i]);
-
-	  if (i)
-	    grub_refresh ();
-
-	  goto fail;
-	}
-    }
-  grub_printf (" Done.\n");
-
- fail:
-
-  grub_file_close (file);
-  grub_free (buf);
-}
-#endif
-
 /* dump ADDRESS [SIZE] */
 static grub_err_t
 grub_mini_cmd_dump (struct grub_command *cmd __attribute__ ((unused)),
diff --git a/grub-core/commands/testload.c b/grub-core/commands/testload.c
new file mode 100644
index 000000000..3b6ddfae3
--- /dev/null
+++ b/grub-core/commands/testload.c
@@ -0,0 +1,155 @@
+/* minicmd.c - commands for the rescue mode */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2003,2005,2006,2007,2009,2010  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/mm.h>
+#include <grub/err.h>
+#include <grub/env.h>
+#include <grub/misc.h>
+#include <grub/file.h>
+#include <grub/disk.h>
+#include <grub/term.h>
+#include <grub/loader.h>
+#include <grub/command.h>
+#include <grub/i18n.h>
+
+static grub_err_t
+grub_cmd_testload (struct grub_command *cmd __attribute__ ((unused)),
+		   int argc, char *argv[])
+{
+  grub_file_t file;
+  char *buf;
+  grub_size_t size;
+  grub_off_t pos;
+  auto void NESTED_FUNC_ATTR read_func (grub_disk_addr_t sector, unsigned offset, unsigned len);
+
+  void NESTED_FUNC_ATTR read_func (grub_disk_addr_t sector __attribute__ ((unused)),
+		  unsigned offset __attribute__ ((unused)),
+		  unsigned len __attribute__ ((unused)))
+    {
+      grub_xputs (".");
+      grub_refresh ();
+    }
+
+  if (argc < 1)
+    return grub_error (GRUB_ERR_BAD_ARGUMENT, "no file specified");
+
+  file = grub_file_open (argv[0]);
+  if (! file)
+    return grub_errno;
+
+  size = grub_file_size (file) & ~(GRUB_DISK_SECTOR_SIZE - 1);
+  if (size == 0)
+    {
+      grub_file_close (file);
+      return GRUB_ERR_NONE;
+    }
+
+  buf = grub_malloc (size);
+  if (! buf)
+    goto fail;
+
+  grub_printf ("Reading %s sequentially", argv[0]);
+  file->read_hook = read_func;
+  if (grub_file_read (file, buf, size) != (grub_ssize_t) size)
+    goto fail;
+  grub_printf (" Done.\n");
+
+  /* Read sequentially again.  */
+  grub_printf ("Reading %s sequentially again", argv[0]);
+  grub_file_seek (file, 0);
+
+  for (pos = 0; pos < size; pos += GRUB_DISK_SECTOR_SIZE)
+    {
+      char sector[GRUB_DISK_SECTOR_SIZE];
+
+      if (grub_file_read (file, sector, GRUB_DISK_SECTOR_SIZE)
+	  != GRUB_DISK_SECTOR_SIZE)
+	goto fail;
+
+      if (grub_memcmp (sector, buf + pos, GRUB_DISK_SECTOR_SIZE) != 0)
+	{
+	  grub_printf ("\nDiffers in %lld\n", (unsigned long long) pos);
+	  goto fail;
+	}
+    }
+  grub_printf (" Done.\n");
+
+  /* Read backwards and compare.  */
+  grub_printf ("Reading %s backwards", argv[0]);
+  pos = size;
+  while (pos > 0)
+    {
+      char sector[GRUB_DISK_SECTOR_SIZE];
+
+      pos -= GRUB_DISK_SECTOR_SIZE;
+
+      grub_file_seek (file, pos);
+
+      if (grub_file_read (file, sector, GRUB_DISK_SECTOR_SIZE)
+	  != GRUB_DISK_SECTOR_SIZE)
+	goto fail;
+
+      if (grub_memcmp (sector, buf + pos, GRUB_DISK_SECTOR_SIZE) != 0)
+	{
+	  int i;
+
+	  grub_printf ("\nDiffers in %lld\n", (unsigned long long) pos);
+
+	  for (i = 0; i < GRUB_DISK_SECTOR_SIZE; i++)
+	    {
+	      grub_printf ("%02x ", buf[pos + i]);
+	      if ((i & 15) == 15)
+		grub_printf ("\n");
+	    }
+
+	  if (i)
+	    grub_refresh ();
+
+	  goto fail;
+	}
+    }
+  grub_printf (" Done.\n");
+
+  return GRUB_ERR_NONE;
+
+ fail:
+
+  grub_file_close (file);
+  grub_free (buf);
+
+  if (!grub_errno)
+    grub_error (GRUB_ERR_IO, "bad read");
+  return grub_errno;
+}
+
+static grub_command_t cmd;
+
+GRUB_MOD_INIT(testload)
+{
+  cmd =
+    grub_register_command ("testload", grub_cmd_testload,
+			   N_("FILE"),
+			   N_("Load the same file in multiple ways."));
+}
+
+GRUB_MOD_FINI(testload)
+{
+  grub_unregister_command (cmd);
+}

From 9aadb3d1466795ae405fa79c4df7230a6deab02e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 5 Sep 2010 16:43:31 +0200
Subject: [PATCH 1540/1628] Add missing ChangeLog entry

---
 ChangeLog | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d932ffc1a..2f4dd8f15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Reintroduce testload.
+
+	* grub-core/commands/minicmd.c (grub_rescue_cmd_testload) [0]: Moved
+	from here ...
+	* grub-core/commands/testload.c (grub_cmd_testload): ... here.
+	(GRUB_MOD_INIT): New function.
+	(GRUB_MOD_FINI): Likewise.
+	* grub-core/Makefile.core.def (testload): New module.
+
 2010-09-05  Szymon Janc <szymon@janc.net.pl>
 
 	* grub-core/lib/posix_wrap/sys/types.h (bool): Transform into an enum.

From 5124ae6d4f63e21d36a0241a911b98de9d47031e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 5 Sep 2010 16:48:54 +0200
Subject: [PATCH 1541/1628] 	Uncompressed checksum support.

	* grub-core/commands/hashsum.c (options): Add option --uncompress.
	(check_list): New parameter uncompress.
	(grub_cmd_hashsum): Handle --uncompress.
---
 ChangeLog                    |  8 ++++++++
 grub-core/commands/hashsum.c | 15 ++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f4dd8f15..682787021 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Uncompressed checksum support.
+
+	* grub-core/commands/hashsum.c (options): Add option --uncompress.
+	(check_list): New parameter uncompress.
+	(grub_cmd_hashsum): Handle --uncompress.
+
 2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Reintroduce testload.
diff --git a/grub-core/commands/hashsum.c b/grub-core/commands/hashsum.c
index 54f487cc7..6f65b4ab3 100644
--- a/grub-core/commands/hashsum.c
+++ b/grub-core/commands/hashsum.c
@@ -32,6 +32,7 @@ static const struct grub_arg_option options[] = {
   {"prefix", 'p', 0, N_("Base directory for hash list."), N_("DIRECTORY"),
    ARG_TYPE_STRING},
   {"keep-going", 'k', 0, N_("Don't stop after first error."), 0, 0},
+  {"uncompress", 'u', 0, N_("Uncompress file before checksumming."), 0, 0},
   {0, 0, 0, 0, 0, 0}
 };
 
@@ -80,7 +81,7 @@ hash_file (grub_file_t file, const gcry_md_spec_t *hash, void *result)
 
 static grub_err_t
 check_list (const gcry_md_spec_t *hash, const char *hashfilename,
-	    const char *prefix, int keep)
+	    const char *prefix, int keep, int uncompress)
 {
   grub_file_t hashlist, file;
   char *buf = NULL;
@@ -115,13 +116,15 @@ check_list (const gcry_md_spec_t *hash, const char *hashfilename,
 	  filename = grub_xasprintf ("%s/%s", prefix, p);
 	  if (!filename)
 	    return grub_errno;
-	  grub_file_filter_disable_compression ();
+	  if (!uncompress)
+	    grub_file_filter_disable_compression ();
 	  file = grub_file_open (filename);
 	  grub_free (filename);
 	}
       else
 	{
-	  grub_file_filter_disable_compression ();
+	  if (!uncompress)
+	    grub_file_filter_disable_compression ();
 	  file = grub_file_open (p);
 	}
       if (!file)
@@ -178,6 +181,7 @@ grub_cmd_hashsum (struct grub_extcmd_context *ctxt,
   const gcry_md_spec_t *hash;
   unsigned i;
   int keep = state[3].set;
+  int uncompress = state[4].set;
   unsigned unread = 0;
 
   for (i = 0; i < ARRAY_SIZE (aliases); i++)
@@ -201,7 +205,7 @@ grub_cmd_hashsum (struct grub_extcmd_context *ctxt,
       if (argc != 0)
 	return grub_error (GRUB_ERR_BAD_ARGUMENT,
 			   "--check is incompatible with file list");
-      return check_list (hash, state[1].arg, prefix, keep);
+      return check_list (hash, state[1].arg, prefix, keep, uncompress);
     }
 
   for (i = 0; i < (unsigned) argc; i++)
@@ -210,7 +214,8 @@ grub_cmd_hashsum (struct grub_extcmd_context *ctxt,
       grub_file_t file;
       grub_err_t err;
       unsigned j;
-      grub_file_filter_disable_compression ();
+      if (!uncompress)
+	grub_file_filter_disable_compression ();
       file = grub_file_open (args[i]);
       if (!file)
 	{

From 3579415d205d7289d56756e00cac70b140cbbe99 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 5 Sep 2010 16:55:49 +0200
Subject: [PATCH 1542/1628] 	* include/grub/err.h (grub_err_t): Replace
 GRUB_ERR_BAD_GZIP_DATA with 	GRUB_ERR_BAD_COMPRESSED_DATA. All users
 updated.

---
 ChangeLog           |  5 +++++
 grub-core/io/gzio.c | 28 ++++++++++++++--------------
 include/grub/err.h  |  2 +-
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 682787021..416b660c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/err.h (grub_err_t): Replace GRUB_ERR_BAD_GZIP_DATA with
+	GRUB_ERR_BAD_COMPRESSED_DATA. All users updated.
+
 2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Uncompressed checksum support.
diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
index 96b54790a..43b67c373 100644
--- a/grub-core/io/gzio.c
+++ b/grub-core/io/gzio.c
@@ -206,7 +206,7 @@ test_header (grub_file_t file)
       || ((hdr.flags & ORIG_NAME) && eat_field (gzio->file, -1))
       || ((hdr.flags & COMMENT) && eat_field (gzio->file, -1)))
     {
-      grub_error (GRUB_ERR_BAD_GZIP_DATA, "unsupported gzip format");
+      grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "unsupported gzip format");
       return 0;
     }
 
@@ -646,7 +646,7 @@ inflate_codes_in_window (grub_file_t file)
 	      {
 		if (e == 99)
 		  {
-		    grub_error (GRUB_ERR_BAD_GZIP_DATA,
+		    grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
 				"an unused code found");
 		    return 1;
 		  }
@@ -685,7 +685,7 @@ inflate_codes_in_window (grub_file_t file)
 		  {
 		    if (e == 99)
 		      {
-			grub_error (GRUB_ERR_BAD_GZIP_DATA,
+			grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
 				    "an unused code found");
 			return 1;
 		      }
@@ -771,7 +771,7 @@ init_stored_block (grub_file_t file)
   DUMPBITS (16);
   NEEDBITS (16);
   if (gzio->block_len != (int) ((~b) & 0xffff))
-    grub_error (GRUB_ERR_BAD_GZIP_DATA,
+    grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
 		"the length of a stored block does not match");
   DUMPBITS (16);
 
@@ -805,7 +805,7 @@ init_fixed_block (grub_file_t file)
   if (huft_build (l, 288, 257, cplens, cplext, &gzio->tl, &gzio->bl) != 0)
     {
       if (grub_errno == GRUB_ERR_NONE)
-	grub_error (GRUB_ERR_BAD_GZIP_DATA,
+	grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
 		    "failed in building a Huffman code table");
       return;
     }
@@ -817,7 +817,7 @@ init_fixed_block (grub_file_t file)
   if (huft_build (l, 30, 0, cpdist, cpdext, &gzio->td, &gzio->bd) > 1)
     {
       if (grub_errno == GRUB_ERR_NONE)
-	grub_error (GRUB_ERR_BAD_GZIP_DATA,
+	grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
 		    "failed in building a Huffman code table");
       huft_free (gzio->tl);
       gzio->tl = 0;
@@ -864,7 +864,7 @@ init_dynamic_block (grub_file_t file)
   DUMPBITS (4);
   if (nl > 286 || nd > 30)
     {
-      grub_error (GRUB_ERR_BAD_GZIP_DATA, "too much data");
+      grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "too much data");
       return;
     }
 
@@ -882,7 +882,7 @@ init_dynamic_block (grub_file_t file)
   gzio->bl = 7;
   if (huft_build (ll, 19, 19, NULL, NULL, &gzio->tl, &gzio->bl) != 0)
     {
-      grub_error (GRUB_ERR_BAD_GZIP_DATA,
+      grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
 		  "failed in building a Huffman code table");
       return;
     }
@@ -906,7 +906,7 @@ init_dynamic_block (grub_file_t file)
 	  DUMPBITS (2);
 	  if ((unsigned) i + j > n)
 	    {
-	      grub_error (GRUB_ERR_BAD_GZIP_DATA, "too many codes found");
+	      grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "too many codes found");
 	      return;
 	    }
 	  while (j--)
@@ -919,7 +919,7 @@ init_dynamic_block (grub_file_t file)
 	  DUMPBITS (3);
 	  if ((unsigned) i + j > n)
 	    {
-	      grub_error (GRUB_ERR_BAD_GZIP_DATA, "too many codes found");
+	      grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "too many codes found");
 	      return;
 	    }
 	  while (j--)
@@ -934,7 +934,7 @@ init_dynamic_block (grub_file_t file)
 	  DUMPBITS (7);
 	  if ((unsigned) i + j > n)
 	    {
-	      grub_error (GRUB_ERR_BAD_GZIP_DATA, "too many codes found");
+	      grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "too many codes found");
 	      return;
 	    }
 	  while (j--)
@@ -956,7 +956,7 @@ init_dynamic_block (grub_file_t file)
   gzio->bl = lbits;
   if (huft_build (ll, nl, 257, cplens, cplext, &gzio->tl, &gzio->bl) != 0)
     {
-      grub_error (GRUB_ERR_BAD_GZIP_DATA,
+      grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
 		  "failed in building a Huffman code table");
       return;
     }
@@ -965,7 +965,7 @@ init_dynamic_block (grub_file_t file)
     {
       huft_free (gzio->tl);
       gzio->tl = 0;
-      grub_error (GRUB_ERR_BAD_GZIP_DATA,
+      grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
 		  "failed in building a Huffman code table");
       return;
     }
@@ -1041,7 +1041,7 @@ inflate_window (grub_file_t file)
 	}
 
       if (gzio->block_type > INFLATE_DYNAMIC)
-	grub_error (GRUB_ERR_BAD_GZIP_DATA,
+	grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
 		    "unknown block type %d", gzio->block_type);
 
       if (grub_errno != GRUB_ERR_NONE)
diff --git a/include/grub/err.h b/include/grub/err.h
index e44705389..d35bba474 100644
--- a/include/grub/err.h
+++ b/include/grub/err.h
@@ -50,7 +50,7 @@ typedef enum
     GRUB_ERR_BAD_FONT,
     GRUB_ERR_NOT_IMPLEMENTED_YET,
     GRUB_ERR_SYMLINK_LOOP,
-    GRUB_ERR_BAD_GZIP_DATA,
+    GRUB_ERR_BAD_COMPRESSED_DATA,
     GRUB_ERR_MENU,
     GRUB_ERR_TIMEOUT,
     GRUB_ERR_IO,

From 82a85062149a8b22c18d7a803c202a4f6ac9e3bc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 5 Sep 2010 17:01:16 +0200
Subject: [PATCH 1543/1628] 	* include/grub/file.h
 (GRUB_FILE_SIZE_UNKNOWN): New definition. 	* grub-core/disk/loopback.c
 (grub_loopback_open): Handle unknown file 	size.

---
 ChangeLog                 | 6 ++++++
 grub-core/disk/loopback.c | 7 +++++--
 include/grub/file.h       | 3 +++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 416b660c0..93fedc014 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/file.h (GRUB_FILE_SIZE_UNKNOWN): New definition.
+	* grub-core/disk/loopback.c (grub_loopback_open): Handle unknown file
+	size.
+
 2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/err.h (grub_err_t): Replace GRUB_ERR_BAD_GZIP_DATA with
diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c
index 8153478ed..878369e5f 100644
--- a/grub-core/disk/loopback.c
+++ b/grub-core/disk/loopback.c
@@ -167,8 +167,11 @@ grub_loopback_open (const char *name, grub_disk_t disk)
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
 
   /* Use the filesize for the disk size, round up to a complete sector.  */
-  disk->total_sectors = ((dev->file->size + GRUB_DISK_SECTOR_SIZE - 1)
-			 / GRUB_DISK_SECTOR_SIZE);
+  if (dev->file->size != GRUB_FILE_SIZE_UNKNOWN)
+    disk->total_sectors = ((dev->file->size + GRUB_DISK_SECTOR_SIZE - 1)
+			   / GRUB_DISK_SECTOR_SIZE);
+  else
+    disk->total_sectors = GRUB_DISK_SIZE_UNKNOWN;
   disk->id = (unsigned long) dev;
 
   disk->has_partitions = dev->has_partitions;
diff --git a/include/grub/file.h b/include/grub/file.h
index a9f9552da..0986c98b8 100644
--- a/include/grub/file.h
+++ b/include/grub/file.h
@@ -104,6 +104,9 @@ grub_ssize_t EXPORT_FUNC(grub_file_read) (grub_file_t file, void *buf,
 grub_off_t EXPORT_FUNC(grub_file_seek) (grub_file_t file, grub_off_t offset);
 grub_err_t EXPORT_FUNC(grub_file_close) (grub_file_t file);
 
+/* Return value of grub_file_size() in case file size is unknown. */
+#define GRUB_FILE_SIZE_UNKNOWN	 0xffffffffffffffffULL
+
 static inline grub_off_t
 grub_file_size (const grub_file_t file)
 {

From f0aff67c477cac0fa9e4ccc89170d43f0059e4c1 Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon@janc.net.pl>
Date: Sun, 5 Sep 2010 17:12:13 +0200
Subject: [PATCH 1544/1628] 	* grub-core/Makefile.core.def (xzio): New
 module. 	* grub-core/io/xzio.c: New file. 	*
 grub-core/lib/xzembed/xz.h: New file (from xembed). 	*
 grub-core/lib/xzembed/xz_config.h: Likewise. 	*
 grub-core/lib/xzembed/xz_dec_bcj.c: Likewise. 	*
 grub-core/lib/xzembed/xz_dec_lzma2.c: Likewise. 	*
 grub-core/lib/xzembed/xz_dec_stream.c: Likewise. 	*
 grub-core/lib/xzembed/xz_lzma2.h: Likewise. 	*
 grub-core/lib/xzembed/xz_private.h: Likewise. 	*
 grub-core/lib/xzembed/xz_stream.h: Likewise. 	* include/grub/file.h
 (grub_file_filter_id): New compression filter 	GRUB_FILE_FILTER_XZIO.

---
 ChangeLog                             |   15 +
 grub-core/Makefile.core.def           |    9 +
 grub-core/io/xzio.c                   |  353 ++++++++
 grub-core/lib/xzembed/xz.h            |  180 ++++
 grub-core/lib/xzembed/xz_config.h     |  141 +++
 grub-core/lib/xzembed/xz_dec_bcj.c    |  569 ++++++++++++
 grub-core/lib/xzembed/xz_dec_lzma2.c  | 1168 +++++++++++++++++++++++++
 grub-core/lib/xzembed/xz_dec_stream.c |  854 ++++++++++++++++++
 grub-core/lib/xzembed/xz_lzma2.h      |  236 +++++
 grub-core/lib/xzembed/xz_private.h    |   96 ++
 grub-core/lib/xzembed/xz_stream.h     |   53 ++
 include/grub/file.h                   |    3 +-
 12 files changed, 3676 insertions(+), 1 deletion(-)
 create mode 100644 grub-core/io/xzio.c
 create mode 100644 grub-core/lib/xzembed/xz.h
 create mode 100644 grub-core/lib/xzembed/xz_config.h
 create mode 100644 grub-core/lib/xzembed/xz_dec_bcj.c
 create mode 100644 grub-core/lib/xzembed/xz_dec_lzma2.c
 create mode 100644 grub-core/lib/xzembed/xz_dec_stream.c
 create mode 100644 grub-core/lib/xzembed/xz_lzma2.h
 create mode 100644 grub-core/lib/xzembed/xz_private.h
 create mode 100644 grub-core/lib/xzembed/xz_stream.h

diff --git a/ChangeLog b/ChangeLog
index 93fedc014..104ca1ed0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-05  Szymon Janc <szymon@janc.net.pl>
+
+	* grub-core/Makefile.core.def (xzio): New module.
+	* grub-core/io/xzio.c: New file.
+	* grub-core/lib/xzembed/xz.h: New file (from xembed).
+	* grub-core/lib/xzembed/xz_config.h: Likewise.
+	* grub-core/lib/xzembed/xz_dec_bcj.c: Likewise.
+	* grub-core/lib/xzembed/xz_dec_lzma2.c: Likewise.
+	* grub-core/lib/xzembed/xz_dec_stream.c: Likewise.
+	* grub-core/lib/xzembed/xz_lzma2.h: Likewise.
+	* grub-core/lib/xzembed/xz_private.h: Likewise.
+	* grub-core/lib/xzembed/xz_stream.h: Likewise.
+	* include/grub/file.h (grub_file_filter_id): New compression filter
+	GRUB_FILE_FILTER_XZIO.
+
 2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/file.h (GRUB_FILE_SIZE_UNKNOWN): New definition.
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index d119cf9f5..59d99a326 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1389,6 +1389,15 @@ module = {
   common = tests/test_blockarg.c;
 };
 
+module = {
+  name = xzio;
+  common = io/xzio.c;
+  common = lib/xzembed/xz_dec_bcj.c;
+  common = lib/xzembed/xz_dec_lzma2.c;
+  common = lib/xzembed/xz_dec_stream.c;
+  cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/xzembed';
+};
+
 module = {
   name = testload;
   common = commands/testload.c;
diff --git a/grub-core/io/xzio.c b/grub-core/io/xzio.c
new file mode 100644
index 000000000..1a22bdc70
--- /dev/null
+++ b/grub-core/io/xzio.c
@@ -0,0 +1,353 @@
+/* xzio.c - decompression support for xz */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/err.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/file.h>
+#include <grub/fs.h>
+#include <grub/dl.h>
+
+#include "xz.h"
+#include "xz_stream.h"
+
+#define XZBUFSIZ 0x2000
+#define VLI_MAX_DIGITS 9
+#define XZ_STREAM_FOOTER_SIZE 12
+
+struct grub_xzio
+{
+  grub_file_t file;
+  struct xz_buf buf;
+  struct xz_dec *dec;
+  grub_uint8_t inbuf[XZBUFSIZ];
+  grub_uint8_t outbuf[XZBUFSIZ];
+  grub_off_t saved_offset;
+};
+
+typedef struct grub_xzio *grub_xzio_t;
+static struct grub_fs grub_xzio_fs;
+
+static grub_size_t
+decode_vli (const grub_uint8_t buf[], grub_size_t size_max,
+	    grub_uint64_t * num)
+{
+  if (size_max == 0)
+    return 0;
+
+  if (size_max > VLI_MAX_DIGITS)
+    size_max = VLI_MAX_DIGITS;
+
+  *num = buf[0] & 0x7F;
+  grub_size_t i = 0;
+
+  while (buf[i++] & 0x80)
+    {
+      if (i >= size_max || buf[i] == 0x00)
+	return 0;
+
+      *num |= (uint64_t) (buf[i] & 0x7F) << (i * 7);
+    }
+
+  return i;
+}
+
+static grub_ssize_t
+read_vli (grub_file_t file, grub_uint64_t * num)
+{
+  grub_uint8_t buf[VLI_MAX_DIGITS];
+  grub_ssize_t read;
+  grub_size_t dec;
+
+  read = grub_file_read (file, buf, VLI_MAX_DIGITS);
+  if (read < 0)
+    return -1;
+
+  dec = decode_vli (buf, read, num);
+  grub_file_seek (file, file->offset - (read - dec));
+  return dec;
+}
+
+/* Function xz_dec_run() should consume header and ask for more (XZ_OK)
+ * else file is corrupted (or options not supported) or not xz.  */
+static int
+test_header (grub_file_t file)
+{
+  grub_xzio_t xzio = file->data;
+  xzio->buf.in_size = grub_file_read (xzio->file, xzio->inbuf,
+				      STREAM_HEADER_SIZE);
+
+  if (xzio->buf.in_size != STREAM_HEADER_SIZE)
+    {
+      grub_error (GRUB_ERR_BAD_FILE_TYPE, "no xz magic found");
+      return 0;
+    }
+
+  enum xz_ret ret = xz_dec_run (xzio->dec, &xzio->buf);
+
+  if (ret == XZ_FORMAT_ERROR)
+    {
+      grub_error (GRUB_ERR_BAD_FILE_TYPE, "no xz magic found");
+      return 0;
+    }
+
+  if (ret != XZ_OK)
+    {
+      grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "not supported xz options");
+      return 0;
+    }
+
+  return 1;
+}
+
+/* Try to find out size of uncompressed data,
+ * also do some footer sanity checks.  */
+static int
+test_footer (grub_file_t file)
+{
+  grub_xzio_t xzio = file->data;
+  grub_uint8_t footer[FOOTER_MAGIC_SIZE];
+  grub_uint32_t backsize;
+  grub_uint8_t imarker;
+  grub_uint64_t uncompressed_size_total = 0;
+  grub_uint64_t uncompressed_size;
+  grub_uint64_t records;
+
+  grub_file_seek (xzio->file, xzio->file->size - FOOTER_MAGIC_SIZE);
+  if (grub_file_read (xzio->file, footer, FOOTER_MAGIC_SIZE) !=
+      FOOTER_MAGIC_SIZE
+      || grub_memcmp (footer, FOOTER_MAGIC, FOOTER_MAGIC_SIZE) != 0)
+    goto ERROR;
+
+  grub_file_seek (xzio->file, xzio->file->size - 8);
+  if (grub_file_read (xzio->file, &backsize, sizeof (backsize))
+      != sizeof (backsize))
+    goto ERROR;
+
+  /* Calculate real backward size.  */
+  backsize = (grub_le_to_cpu32 (backsize) + 1) * 4;
+
+  /* Set file to the beginning of stream index.  */
+  grub_file_seek (xzio->file,
+		  xzio->file->size - XZ_STREAM_FOOTER_SIZE - backsize);
+
+  /* Test index marker.  */
+  if (grub_file_read (xzio->file, &imarker, sizeof (imarker)) !=
+      sizeof (imarker) && imarker != 0x00)
+    goto ERROR;
+
+  if (read_vli (xzio->file, &records) <= 0)
+    goto ERROR;
+
+  for (; records != 0; records--)
+    {
+      if (read_vli (xzio->file, &uncompressed_size) <= 0)	/* Ignore unpadded.  */
+	goto ERROR;
+      if (read_vli (xzio->file, &uncompressed_size) <= 0)	/* Uncompressed.  */
+	goto ERROR;
+
+      uncompressed_size_total += uncompressed_size;
+    }
+
+  file->size = uncompressed_size_total;
+  grub_file_seek (xzio->file, STREAM_HEADER_SIZE);
+  return 1;
+
+ERROR:
+  grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "bad footer magic");
+  return 0;
+}
+
+static grub_file_t
+grub_xzio_open (grub_file_t io)
+{
+  grub_file_t file;
+  grub_xzio_t xzio;
+
+  file = (grub_file_t) grub_zalloc (sizeof (*file));
+  if (!file)
+    return 0;
+
+  xzio = grub_zalloc (sizeof (*xzio));
+  if (!xzio)
+    {
+      grub_free (file);
+      return 0;
+    }
+
+  xzio->file = io;
+  xzio->saved_offset = 0;
+
+  file->device = io->device;
+  file->offset = 0;
+  file->data = xzio;
+  file->read_hook = 0;
+  file->fs = &grub_xzio_fs;
+  file->size = GRUB_FILE_SIZE_UNKNOWN;
+  file->not_easly_seekable = 1;
+
+  if (grub_file_tell (xzio->file) != 0)
+    grub_file_seek (xzio->file, 0);
+
+  /* Allocated 64KiB for dictionary.
+   * Decoder will relocate if bigger is needed.  */
+  xzio->dec = xz_dec_init (1 << 16);
+  if (!xzio->dec)
+    {
+      grub_free (file);
+      grub_free (xzio);
+      return 0;
+    }
+
+  xzio->buf.in = xzio->inbuf;
+  xzio->buf.in_pos = 0;
+  xzio->buf.in_size = 0;
+  xzio->buf.out = xzio->outbuf;
+  xzio->buf.out_pos = 0;
+  xzio->buf.out_size = XZBUFSIZ;
+
+  if (!test_header (file) || !(grub_file_seekable (io) && test_footer (file)))
+    {
+      grub_errno = GRUB_ERR_NONE;
+      grub_file_seek (io, 0);
+      xz_dec_end (xzio->dec);
+      grub_free (xzio);
+      grub_free (file);
+
+      return io;
+    }
+
+  return file;
+}
+
+static grub_ssize_t
+grub_xzio_read (grub_file_t file, char *buf, grub_size_t len)
+{
+  grub_ssize_t ret = 0;
+  grub_ssize_t readret;
+  enum xz_ret xzret;
+  grub_xzio_t xzio = file->data;
+  grub_off_t current_offset;
+
+  /* If seek backward need to reset decoder and start from beginning of file.
+     TODO Possible improvement by jumping blocks.  */
+  if (file->offset < xzio->saved_offset)
+    {
+      xz_dec_reset (xzio->dec);
+      xzio->saved_offset = 0;
+      xzio->buf.out_pos = 0;
+      xzio->buf.in_pos = 0;
+      xzio->buf.in_size = 0;
+      grub_file_seek (xzio->file, 0);
+    }
+
+  current_offset = xzio->saved_offset;
+
+  while (len > 0)
+    {
+      xzio->buf.out_size = grub_min (file->offset + ret + len - current_offset,
+				     XZBUFSIZ);
+
+      /* Feed input.  */
+      if (xzio->buf.in_pos == xzio->buf.in_size)
+	{
+	  readret = grub_file_read (xzio->file, xzio->inbuf, XZBUFSIZ);
+	  if (readret < 0)
+	    return -1;
+	  xzio->buf.in_size = readret;
+	  xzio->buf.in_pos = 0;
+	}
+
+      xzret = xz_dec_run (xzio->dec, &xzio->buf);
+      switch (xzret)
+	{
+	case XZ_MEMLIMIT_ERROR:
+	case XZ_FORMAT_ERROR:
+	case XZ_OPTIONS_ERROR:
+	case XZ_DATA_ERROR:
+	case XZ_BUF_ERROR:
+	  grub_error (GRUB_ERR_BAD_COMPRESSED_DATA,
+		      "file corrupted or unsupported block options");
+	  return -1;
+	default:
+	  break;
+	}
+
+      {
+	grub_off_t new_offset = current_offset + xzio->buf.out_pos;
+	
+	if (file->offset <= new_offset)
+	  /* Store first chunk of data in buffer.  */
+	  {
+	    grub_size_t delta = new_offset - (file->offset + ret);
+	    grub_memmove (buf, xzio->buf.out + (xzio->buf.out_pos - delta),
+			  delta);
+	    len -= delta;
+	    buf += delta;
+	    ret += delta;
+	  }
+	current_offset = new_offset;
+      }
+      xzio->buf.out_pos = 0;
+
+      if (xzret == XZ_STREAM_END)	/* Stream end, EOF.  */
+	break;
+    }
+
+  if (ret >= 0)
+    xzio->saved_offset = file->offset + ret;
+
+  return ret;
+}
+
+/* Release everything, including the underlying file object.  */
+static grub_err_t
+grub_xzio_close (grub_file_t file)
+{
+  grub_xzio_t xzio = file->data;
+
+  xz_dec_end (xzio->dec);
+
+  grub_file_close (xzio->file);
+  grub_free (xzio);
+
+  /* Device must not be closed twice.  */
+  file->device = 0;
+  return grub_errno;
+}
+
+static struct grub_fs grub_xzio_fs = {
+  .name = "xzio",
+  .dir = 0,
+  .open = 0,
+  .read = grub_xzio_read,
+  .close = grub_xzio_close,
+  .label = 0,
+  .next = 0
+};
+
+GRUB_MOD_INIT (xzio)
+{
+  grub_file_filter_register (GRUB_FILE_FILTER_XZIO, grub_xzio_open);
+}
+
+GRUB_MOD_FINI (xzio)
+{
+  grub_file_filter_unregister (GRUB_FILE_FILTER_XZIO);
+}
diff --git a/grub-core/lib/xzembed/xz.h b/grub-core/lib/xzembed/xz.h
new file mode 100644
index 000000000..f0a7dbbca
--- /dev/null
+++ b/grub-core/lib/xzembed/xz.h
@@ -0,0 +1,180 @@
+/* xz.h - XZ decompressor */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+/*
+ * This file is based on code from XZ embedded project
+ * http://tukaani.org/xz/embedded.html
+ */
+
+#ifndef XZ_H
+#define XZ_H
+
+#include <stdint.h>
+
+/**
+ * enum xz_ret - Return codes
+ * @XZ_OK:              Everything is OK so far. More input or more output
+ *                      space is required to continue.
+ * @XZ_STREAM_END:      Operation finished successfully.
+ * @XZ_MEMLIMIT_ERROR:  Not enough memory was preallocated at decoder
+ *                      initialization time.
+ * @XZ_FORMAT_ERROR:    File format was not recognized (wrong magic bytes).
+ * @XZ_OPTIONS_ERROR:   This implementation doesn't support the requested
+ *                      compression options. In the decoder this means that
+ *                      the header CRC32 matches, but the header itself
+ *                      specifies something that we don't support.
+ * @XZ_DATA_ERROR:      Compressed data is corrupt.
+ * @XZ_BUF_ERROR:       Cannot make any progress. Details are slightly
+ *                      different between multi-call and single-call mode;
+ *                      more information below.
+ *
+ * In multi-call mode, XZ_BUF_ERROR is returned when two consecutive calls
+ * to XZ code cannot consume any input and cannot produce any new output.
+ * This happens when there is no new input available, or the output buffer
+ * is full while at least one output byte is still pending. Assuming your
+ * code is not buggy, you can get this error only when decoding a compressed
+ * stream that is truncated or otherwise corrupt.
+ *
+ * In single-call mode, XZ_BUF_ERROR is returned only when the output buffer
+ * is too small, or the compressed input is corrupt in a way that makes the
+ * decoder produce more output than the caller expected. When it is
+ * (relatively) clear that the compressed input is truncated, XZ_DATA_ERROR
+ * is used instead of XZ_BUF_ERROR.
+ */
+enum xz_ret {
+	XZ_OK,
+	XZ_STREAM_END,
+	XZ_MEMLIMIT_ERROR,
+	XZ_FORMAT_ERROR,
+	XZ_OPTIONS_ERROR,
+	XZ_DATA_ERROR,
+	XZ_BUF_ERROR
+};
+
+/**
+ * struct xz_buf - Passing input and output buffers to XZ code
+ * @in:         Beginning of the input buffer. This may be NULL if and only
+ *              if in_pos is equal to in_size.
+ * @in_pos:     Current position in the input buffer. This must not exceed
+ *              in_size.
+ * @in_size:    Size of the input buffer
+ * @out:        Beginning of the output buffer. This may be NULL if and only
+ *              if out_pos is equal to out_size.
+ * @out_pos:    Current position in the output buffer. This must not exceed
+ *              out_size.
+ * @out_size:   Size of the output buffer
+ *
+ * Only the contents of the output buffer from out[out_pos] onward, and
+ * the variables in_pos and out_pos are modified by the XZ code.
+ */
+struct xz_buf {
+	const uint8_t *in;
+	size_t in_pos;
+	size_t in_size;
+
+	uint8_t *out;
+	size_t out_pos;
+	size_t out_size;
+};
+
+/**
+ * struct xz_dec - Opaque type to hold the XZ decoder state
+ */
+struct xz_dec;
+
+/**
+ * xz_dec_init() - Allocate and initialize a XZ decoder state
+ * @dict_max:   Maximum size of the LZMA2 dictionary (history buffer) for
+ *              multi-call decoding, or special value of zero to indicate
+ *              single-call decoding mode.
+ *
+ * If dict_max > 0, the decoder is initialized to work in multi-call mode.
+ * dict_max number of bytes of memory is preallocated for the LZMA2
+ * dictionary. This way there is no risk that xz_dec_run() could run out
+ * of memory, since xz_dec_run() will never allocate any memory. Instead,
+ * if the preallocated dictionary is too small for decoding the given input
+ * stream, xz_dec_run() will return XZ_MEMLIMIT_ERROR. Thus, it is important
+ * to know what kind of data will be decoded to avoid allocating excessive
+ * amount of memory for the dictionary.
+ *
+ * LZMA2 dictionary is always 2^n bytes or 2^n + 2^(n-1) bytes (the latter
+ * sizes are less common in practice). In the kernel, dictionary sizes of
+ * 64 KiB, 128 KiB, 256 KiB, 512 KiB, and 1 MiB are probably the only
+ * reasonable values.
+ *
+ * If dict_max == 0, the decoder is initialized to work in single-call mode.
+ * In single-call mode, xz_dec_run() decodes the whole stream at once. The
+ * caller must provide enough output space or the decoding will fail. The
+ * output space is used as the dictionary buffer, which is why there is
+ * no need to allocate the dictionary as part of the decoder's internal
+ * state.
+ *
+ * Because the output buffer is used as the workspace, streams encoded using
+ * a big dictionary are not a problem in single-call. It is enough that the
+ * output buffer is is big enough to hold the actual uncompressed data; it
+ * can be smaller than the dictionary size stored in the stream headers.
+ *
+ * On success, xz_dec_init() returns a pointer to struct xz_dec, which is
+ * ready to be used with xz_dec_run(). On error, xz_dec_init() returns NULL.
+ */
+struct xz_dec * xz_dec_init(uint32_t dict_max);
+
+/**
+ * xz_dec_run() - Run the XZ decoder
+ * @s:          Decoder state allocated using xz_dec_init()
+ * @b:          Input and output buffers
+ *
+ * In multi-call mode, this function may return any of the values listed in
+ * enum xz_ret.
+ *
+ * In single-call mode, this function never returns XZ_OK. If an error occurs
+ * in single-call mode (return value is not XZ_STREAM_END), b->in_pos and
+ * b->out_pos are not modified, and the contents of the output buffer from
+ * b->out[b->out_pos] onward are undefined.
+ *
+ * NOTE: In single-call mode, the contents of the output buffer are undefined
+ * also after XZ_BUF_ERROR. This is because with some filter chains, there
+ * may be a second pass over the output buffer, and this pass cannot be
+ * properly done if the output buffer is truncated. Thus, you cannot give
+ * the single-call decoder a too small buffer and then expect to get that
+ * amount valid data from the beginning of the stream. You must use the
+ * multi-call decoder if you don't want to uncompress the whole stream.
+ */
+enum xz_ret xz_dec_run(struct xz_dec *s, struct xz_buf *b);
+
+/**
+ * xz_dec_reset() - Reset an already allocated decoder state
+ * @s:          Decoder state allocated using xz_dec_init()
+ *
+ * This function can be used to reset the multi-call decoder state without
+ * freeing and reallocating memory with xz_dec_end() and xz_dec_init().
+ *
+ * In single-call mode, xz_dec_reset() is always called in the beginning of
+ * xz_dec_run(). Thus, explicit call to xz_dec_reset() is useful only in
+ * multi-call mode.
+ */
+void xz_dec_reset(struct xz_dec *s);
+
+/**
+ * xz_dec_end() - Free the memory allocated for the decoder state
+ * @s:          Decoder state allocated using xz_dec_init(). If s is NULL,
+ *              this function does nothing.
+ */
+void xz_dec_end(struct xz_dec *s);
+
+#endif
diff --git a/grub-core/lib/xzembed/xz_config.h b/grub-core/lib/xzembed/xz_config.h
new file mode 100644
index 000000000..0af0d2b81
--- /dev/null
+++ b/grub-core/lib/xzembed/xz_config.h
@@ -0,0 +1,141 @@
+/* xz_config.h - Private includes and definitions for userspace use */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+/*
+ * This file is based on code from XZ embedded project
+ * http://tukaani.org/xz/embedded.html
+ */
+
+#ifndef XZ_CONFIG_H
+#define XZ_CONFIG_H
+
+/* Enable BCJ filter decoders. */
+
+#if defined(__i386__) || defined(__x86_64__)
+  #define XZ_DEC_X86
+#endif
+
+#ifdef __powerpc__
+  #define XZ_DEC_POWERPC
+#endif
+
+#ifdef __ia64__
+  #define XZ_DEC_IA64
+#endif
+
+#ifdef __arm__
+  #define XZ_DEC_ARM
+#endif
+
+#ifdef __thumb__
+  #define XZ_DEC_ARMTHUMB
+#endif
+
+#ifdef __sparc__
+  #define XZ_DEC_SPARC
+#endif
+
+
+#include "xz.h"
+#include <stdlib.h>
+
+#define kmalloc(size, flags) malloc(size)
+#define kfree(ptr) free(ptr)
+#define vmalloc(size) malloc(size)
+#define vfree(ptr) free(ptr)
+
+#define memeq(a, b, size) (memcmp(a, b, size) == 0)
+#define memzero(buf, size) memset(buf, 0, size)
+
+#define min(x, y) ((x) < (y) ? (x) : (y))
+#define min_t(type, x, y) min(x, y)
+
+/*
+ * Some functions have been marked with __always_inline to keep the
+ * performance reasonable even when the compiler is optimizing for
+ * small code size. You may be able to save a few bytes by #defining
+ * __always_inline to plain inline, but don't complain if the code
+ * becomes slow.
+ *
+ * NOTE: System headers on GNU/Linux may #define this macro already,
+ * so if you want to change it, it you need to #undef it first.
+ */
+#ifndef __always_inline
+#	ifdef __GNUC__
+#		define __always_inline \
+			inline __attribute__((__always_inline__))
+#	else
+#		define __always_inline inline
+#	endif
+#endif
+
+/*
+ * Some functions are marked to never be inlined to reduce stack usage.
+ * If you don't care about stack usage, you may want to modify this so
+ * that noinline_for_stack is #defined to be empty even when using GCC.
+ * Doing so may save a few bytes in binary size.
+ */
+#ifndef noinline_for_stack
+#	ifdef __GNUC__
+#		define noinline_for_stack __attribute__((__noinline__))
+#	else
+#		define noinline_for_stack
+#	endif
+#endif
+
+/* Inline functions to access unaligned unsigned 32-bit integers */
+static inline uint32_t get_unaligned_le32(const uint8_t *buf)
+{
+	return (uint32_t)buf[0]
+			| ((uint32_t)buf[1] << 8)
+			| ((uint32_t)buf[2] << 16)
+			| ((uint32_t)buf[3] << 24);
+}
+
+static inline uint32_t get_unaligned_be32(const uint8_t *buf)
+{
+	return (uint32_t)(buf[0] << 24)
+			| ((uint32_t)buf[1] << 16)
+			| ((uint32_t)buf[2] << 8)
+			| (uint32_t)buf[3];
+}
+
+static inline void put_unaligned_le32(uint32_t val, uint8_t *buf)
+{
+	buf[0] = (uint8_t)val;
+	buf[1] = (uint8_t)(val >> 8);
+	buf[2] = (uint8_t)(val >> 16);
+	buf[3] = (uint8_t)(val >> 24);
+}
+
+static inline void put_unaligned_be32(uint32_t val, uint8_t *buf)
+{
+	buf[0] = (uint8_t)(val >> 24);
+	buf[1] = (uint8_t)(val >> 16);
+	buf[2] = (uint8_t)(val >> 8);
+	buf[3] = (uint8_t)val;
+}
+
+/*
+ * Use get_unaligned_le32() also for aligned access for simplicity. On
+ * little endian systems, #define get_le32(ptr) (*(const uint32_t *)(ptr))
+ * could save a few bytes in code size.
+ */
+#define get_le32 get_unaligned_le32
+
+#endif
diff --git a/grub-core/lib/xzembed/xz_dec_bcj.c b/grub-core/lib/xzembed/xz_dec_bcj.c
new file mode 100644
index 000000000..7eec9de7d
--- /dev/null
+++ b/grub-core/lib/xzembed/xz_dec_bcj.c
@@ -0,0 +1,569 @@
+/* xz_dec_bcj.c - Branch/Call/Jump (BCJ) filter decoders */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+/*
+ * This file is based on code from XZ embedded project
+ * http://tukaani.org/xz/embedded.html
+ */
+
+#include "xz_private.h"
+
+struct xz_dec_bcj {
+	/* Type of the BCJ filter being used */
+	enum {
+		BCJ_X86 = 4,        /* x86 or x86-64 */
+		BCJ_POWERPC = 5,    /* Big endian only */
+		BCJ_IA64 = 6,       /* Big or little endian */
+		BCJ_ARM = 7,        /* Little endian only */
+		BCJ_ARMTHUMB = 8,   /* Little endian only */
+		BCJ_SPARC = 9       /* Big or little endian */
+	} type;
+
+	/*
+	 * Return value of the next filter in the chain. We need to preserve
+	 * this information across calls, because we must not call the next
+	 * filter anymore once it has returned XZ_STREAM_END.
+	 */
+	enum xz_ret ret;
+
+	/* True if we are operating in single-call mode. */
+	bool single_call;
+
+	/*
+	 * Absolute position relative to the beginning of the uncompressed
+	 * data (in a single .xz Block). We care only about the lowest 32
+	 * bits so this doesn't need to be uint64_t even with big files.
+	 */
+	uint32_t pos;
+
+	/* x86 filter state */
+	uint32_t x86_prev_mask;
+
+	/* Temporary space to hold the variables from struct xz_buf */
+	uint8_t *out;
+	size_t out_pos;
+	size_t out_size;
+
+	struct {
+		/* Amount of already filtered data in the beginning of buf */
+		size_t filtered;
+
+		/* Total amount of data currently stored in buf  */
+		size_t size;
+
+		/*
+		 * Buffer to hold a mix of filtered and unfiltered data. This
+		 * needs to be big enough to hold Alignment + 2 * Look-ahead:
+		 *
+		 * Type         Alignment   Look-ahead
+		 * x86              1           4
+		 * PowerPC          4           0
+		 * IA-64           16           0
+		 * ARM              4           0
+		 * ARM-Thumb        2           2
+		 * SPARC            4           0
+		 */
+		uint8_t buf[16];
+	} temp;
+};
+
+#ifdef XZ_DEC_X86
+/*
+ * This is macro used to test the most significant byte of a memory address
+ * in an x86 instruction.
+ */
+#define bcj_x86_test_msbyte(b) ((b) == 0x00 || (b) == 0xFF)
+
+static noinline_for_stack size_t bcj_x86(
+		struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+{
+	static const bool mask_to_allowed_status[8]
+		= { true, true, true, false, true, false, false, false };
+
+	static const uint8_t mask_to_bit_num[8] = { 0, 1, 2, 2, 3, 3, 3, 3 };
+
+	size_t i;
+	size_t prev_pos = (size_t)-1;
+	uint32_t prev_mask = s->x86_prev_mask;
+	uint32_t src;
+	uint32_t dest;
+	uint32_t j;
+	uint8_t b;
+
+	if (size <= 4)
+		return 0;
+
+	size -= 4;
+	for (i = 0; i < size; ++i) {
+		if ((buf[i] & 0xFE) != 0xE8)
+			continue;
+
+		prev_pos = i - prev_pos;
+		if (prev_pos > 3) {
+			prev_mask = 0;
+		} else {
+			prev_mask = (prev_mask << (prev_pos - 1)) & 7;
+			if (prev_mask != 0) {
+				b = buf[i + 4 - mask_to_bit_num[prev_mask]];
+				if (!mask_to_allowed_status[prev_mask]
+						|| bcj_x86_test_msbyte(b)) {
+					prev_pos = i;
+					prev_mask = (prev_mask << 1) | 1;
+					continue;
+				}
+			}
+		}
+
+		prev_pos = i;
+
+		if (bcj_x86_test_msbyte(buf[i + 4])) {
+			src = get_unaligned_le32(buf + i + 1);
+			while (true) {
+				dest = src - (s->pos + (uint32_t)i + 5);
+				if (prev_mask == 0)
+					break;
+
+				j = mask_to_bit_num[prev_mask] * 8;
+				b = (uint8_t)(dest >> (24 - j));
+				if (!bcj_x86_test_msbyte(b))
+					break;
+
+				src = dest ^ (((uint32_t)1 << (32 - j)) - 1);
+			}
+
+			dest &= 0x01FFFFFF;
+			dest |= (uint32_t)0 - (dest & 0x01000000);
+			put_unaligned_le32(dest, buf + i + 1);
+			i += 4;
+		} else {
+			prev_mask = (prev_mask << 1) | 1;
+		}
+	}
+
+	prev_pos = i - prev_pos;
+	s->x86_prev_mask = prev_pos > 3 ? 0 : prev_mask << (prev_pos - 1);
+	return i;
+}
+#endif
+
+#ifdef XZ_DEC_POWERPC
+static noinline_for_stack size_t bcj_powerpc(
+		struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+{
+	size_t i;
+	uint32_t instr;
+
+	for (i = 0; i + 4 <= size; i += 4) {
+		instr = get_unaligned_be32(buf + i);
+		if ((instr & 0xFC000003) == 0x48000001) {
+			instr &= 0x03FFFFFC;
+			instr -= s->pos + (uint32_t)i;
+			instr &= 0x03FFFFFC;
+			instr |= 0x48000001;
+			put_unaligned_be32(instr, buf + i);
+		}
+	}
+
+	return i;
+}
+#endif
+
+#ifdef XZ_DEC_IA64
+static noinline_for_stack size_t bcj_ia64(
+		struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+{
+	static const uint8_t branch_table[32] = {
+		0, 0, 0, 0, 0, 0, 0, 0,
+		0, 0, 0, 0, 0, 0, 0, 0,
+		4, 4, 6, 6, 0, 0, 7, 7,
+		4, 4, 0, 0, 4, 4, 0, 0
+	};
+
+	/*
+	 * The local variables take a little bit stack space, but it's less
+	 * than what LZMA2 decoder takes, so it doesn't make sense to reduce
+	 * stack usage here without doing that for the LZMA2 decoder too.
+	 */
+
+	/* Loop counters */
+	size_t i;
+	size_t j;
+
+	/* Instruction slot (0, 1, or 2) in the 128-bit instruction word */
+	uint32_t slot;
+
+	/* Bitwise offset of the instruction indicated by slot */
+	uint32_t bit_pos;
+
+	/* bit_pos split into byte and bit parts */
+	uint32_t byte_pos;
+	uint32_t bit_res;
+
+	/* Address part of an instruction */
+	uint32_t addr;
+
+	/* Mask used to detect which instructions to convert */
+	uint32_t mask;
+
+	/* 41-bit instruction stored somewhere in the lowest 48 bits */
+	uint64_t instr;
+
+	/* Instruction normalized with bit_res for easier manipulation */
+	uint64_t norm;
+
+	for (i = 0; i + 16 <= size; i += 16) {
+		mask = branch_table[buf[i] & 0x1F];
+		for (slot = 0, bit_pos = 5; slot < 3; ++slot, bit_pos += 41) {
+			if (((mask >> slot) & 1) == 0)
+				continue;
+
+			byte_pos = bit_pos >> 3;
+			bit_res = bit_pos & 7;
+			instr = 0;
+			for (j = 0; j < 6; ++j)
+				instr |= (uint64_t)(buf[i + j + byte_pos])
+						<< (8 * j);
+
+			norm = instr >> bit_res;
+
+			if (((norm >> 37) & 0x0F) == 0x05
+					&& ((norm >> 9) & 0x07) == 0) {
+				addr = (norm >> 13) & 0x0FFFFF;
+				addr |= ((uint32_t)(norm >> 36) & 1) << 20;
+				addr <<= 4;
+				addr -= s->pos + (uint32_t)i;
+				addr >>= 4;
+
+				norm &= ~((uint64_t)0x8FFFFF << 13);
+				norm |= (uint64_t)(addr & 0x0FFFFF) << 13;
+				norm |= (uint64_t)(addr & 0x100000)
+						<< (36 - 20);
+
+				instr &= (1 << bit_res) - 1;
+				instr |= norm << bit_res;
+
+				for (j = 0; j < 6; j++)
+					buf[i + j + byte_pos]
+						= (uint8_t)(instr >> (8 * j));
+			}
+		}
+	}
+
+	return i;
+}
+#endif
+
+#ifdef XZ_DEC_ARM
+static noinline_for_stack size_t bcj_arm(
+		struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+{
+	size_t i;
+	uint32_t addr;
+
+	for (i = 0; i + 4 <= size; i += 4) {
+		if (buf[i + 3] == 0xEB) {
+			addr = (uint32_t)buf[i] | ((uint32_t)buf[i + 1] << 8)
+					| ((uint32_t)buf[i + 2] << 16);
+			addr <<= 2;
+			addr -= s->pos + (uint32_t)i + 8;
+			addr >>= 2;
+			buf[i] = (uint8_t)addr;
+			buf[i + 1] = (uint8_t)(addr >> 8);
+			buf[i + 2] = (uint8_t)(addr >> 16);
+		}
+	}
+
+	return i;
+}
+#endif
+
+#ifdef XZ_DEC_ARMTHUMB
+static noinline_for_stack size_t bcj_armthumb(
+		struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+{
+	size_t i;
+	uint32_t addr;
+
+	for (i = 0; i + 4 <= size; i += 2) {
+		if ((buf[i + 1] & 0xF8) == 0xF0
+				&& (buf[i + 3] & 0xF8) == 0xF8) {
+			addr = (((uint32_t)buf[i + 1] & 0x07) << 19)
+					| ((uint32_t)buf[i] << 11)
+					| (((uint32_t)buf[i + 3] & 0x07) << 8)
+					| (uint32_t)buf[i + 2];
+			addr <<= 1;
+			addr -= s->pos + (uint32_t)i + 4;
+			addr >>= 1;
+			buf[i + 1] = (uint8_t)(0xF0 | ((addr >> 19) & 0x07));
+			buf[i] = (uint8_t)(addr >> 11);
+			buf[i + 3] = (uint8_t)(0xF8 | ((addr >> 8) & 0x07));
+			buf[i + 2] = (uint8_t)addr;
+			i += 2;
+		}
+	}
+
+	return i;
+}
+#endif
+
+#ifdef XZ_DEC_SPARC
+static noinline_for_stack size_t bcj_sparc(
+		struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+{
+	size_t i;
+	uint32_t instr;
+
+	for (i = 0; i + 4 <= size; i += 4) {
+		instr = get_unaligned_be32(buf + i);
+		if ((instr >> 22) == 0x100 || (instr >> 22) == 0x1FF) {
+			instr <<= 2;
+			instr -= s->pos + (uint32_t)i;
+			instr >>= 2;
+			instr = ((uint32_t)0x40000000 - (instr & 0x400000))
+					| 0x40000000 | (instr & 0x3FFFFF);
+			put_unaligned_be32(instr, buf + i);
+		}
+	}
+
+	return i;
+}
+#endif
+
+/*
+ * Apply the selected BCJ filter. Update *pos and s->pos to match the amount
+ * of data that got filtered.
+ *
+ * NOTE: This is implemented as a switch statement to avoid using function
+ * pointers, which could be problematic in the kernel boot code, which must
+ * avoid pointers to static data (at least on x86).
+ */
+static void bcj_apply(struct xz_dec_bcj *s,
+		uint8_t *buf, size_t *pos, size_t size)
+{
+	size_t filtered;
+
+	buf += *pos;
+	size -= *pos;
+
+	switch (s->type) {
+#ifdef XZ_DEC_X86
+	case BCJ_X86:
+		filtered = bcj_x86(s, buf, size);
+		break;
+#endif
+#ifdef XZ_DEC_POWERPC
+	case BCJ_POWERPC:
+		filtered = bcj_powerpc(s, buf, size);
+		break;
+#endif
+#ifdef XZ_DEC_IA64
+	case BCJ_IA64:
+		filtered = bcj_ia64(s, buf, size);
+		break;
+#endif
+#ifdef XZ_DEC_ARM
+	case BCJ_ARM:
+		filtered = bcj_arm(s, buf, size);
+		break;
+#endif
+#ifdef XZ_DEC_ARMTHUMB
+	case BCJ_ARMTHUMB:
+		filtered = bcj_armthumb(s, buf, size);
+		break;
+#endif
+#ifdef XZ_DEC_SPARC
+	case BCJ_SPARC:
+		filtered = bcj_sparc(s, buf, size);
+		break;
+#endif
+	default:
+		/* Never reached but silence compiler warnings. */
+		filtered = 0;
+		break;
+	}
+
+	*pos += filtered;
+	s->pos += filtered;
+}
+
+/*
+ * Flush pending filtered data from temp to the output buffer.
+ * Move the remaining mixture of possibly filtered and unfiltered
+ * data to the beginning of temp.
+ */
+static void bcj_flush(struct xz_dec_bcj *s, struct xz_buf *b)
+{
+	size_t copy_size;
+
+	copy_size = min_t(size_t, s->temp.filtered, b->out_size - b->out_pos);
+	memcpy(b->out + b->out_pos, s->temp.buf, copy_size);
+	b->out_pos += copy_size;
+
+	s->temp.filtered -= copy_size;
+	s->temp.size -= copy_size;
+	memmove(s->temp.buf, s->temp.buf + copy_size, s->temp.size);
+}
+
+/*
+ * The BCJ filter functions are primitive in sense that they process the
+ * data in chunks of 1-16 bytes. To hide this issue, this function does
+ * some buffering.
+ */
+enum xz_ret xz_dec_bcj_run(struct xz_dec_bcj *s,
+		struct xz_dec_lzma2 *lzma2, struct xz_buf *b)
+{
+	size_t out_start;
+
+	/*
+	 * Flush pending already filtered data to the output buffer. Return
+	 * immediatelly if we couldn't flush everything, or if the next
+	 * filter in the chain had already returned XZ_STREAM_END.
+	 */
+	if (s->temp.filtered > 0) {
+		bcj_flush(s, b);
+		if (s->temp.filtered > 0)
+			return XZ_OK;
+
+		if (s->ret == XZ_STREAM_END)
+			return XZ_STREAM_END;
+	}
+
+	/*
+	 * If we have more output space than what is currently pending in
+	 * temp, copy the unfiltered data from temp to the output buffer
+	 * and try to fill the output buffer by decoding more data from the
+	 * next filter in the chain. Apply the BCJ filter on the new data
+	 * in the output buffer. If everything cannot be filtered, copy it
+	 * to temp and rewind the output buffer position accordingly.
+	 */
+	if (s->temp.size < b->out_size - b->out_pos) {
+		out_start = b->out_pos;
+		memcpy(b->out + b->out_pos, s->temp.buf, s->temp.size);
+		b->out_pos += s->temp.size;
+
+		s->ret = xz_dec_lzma2_run(lzma2, b);
+		if (s->ret != XZ_STREAM_END
+				&& (s->ret != XZ_OK || s->single_call))
+			return s->ret;
+
+		bcj_apply(s, b->out, &out_start, b->out_pos);
+
+		/*
+		 * As an exception, if the next filter returned XZ_STREAM_END,
+		 * we can do that too, since the last few bytes that remain
+		 * unfiltered are meant to remain unfiltered.
+		 */
+		if (s->ret == XZ_STREAM_END)
+			return XZ_STREAM_END;
+
+		s->temp.size = b->out_pos - out_start;
+		b->out_pos -= s->temp.size;
+		memcpy(s->temp.buf, b->out + b->out_pos, s->temp.size);
+	}
+
+	/*
+	 * If we have unfiltered data in temp, try to fill by decoding more
+	 * data from the next filter. Apply the BCJ filter on temp. Then we
+	 * hopefully can fill the actual output buffer by copying filtered
+	 * data from temp. A mix of filtered and unfiltered data may be left
+	 * in temp; it will be taken care on the next call to this function.
+	 */
+	if (s->temp.size > 0) {
+		/* Make b->out{,_pos,_size} temporarily point to s->temp. */
+		s->out = b->out;
+		s->out_pos = b->out_pos;
+		s->out_size = b->out_size;
+		b->out = s->temp.buf;
+		b->out_pos = s->temp.size;
+		b->out_size = sizeof(s->temp.buf);
+
+		s->ret = xz_dec_lzma2_run(lzma2, b);
+
+		s->temp.size = b->out_pos;
+		b->out = s->out;
+		b->out_pos = s->out_pos;
+		b->out_size = s->out_size;
+
+		if (s->ret != XZ_OK && s->ret != XZ_STREAM_END)
+			return s->ret;
+
+		bcj_apply(s, s->temp.buf, &s->temp.filtered, s->temp.size);
+
+		/*
+		 * If the next filter returned XZ_STREAM_END, we mark that
+		 * everything is filtered, since the last unfiltered bytes
+		 * of the stream are meant to be left as is.
+		 */
+		if (s->ret == XZ_STREAM_END)
+			s->temp.filtered = s->temp.size;
+
+		bcj_flush(s, b);
+		if (s->temp.filtered > 0)
+			return XZ_OK;
+	}
+
+	return s->ret;
+}
+
+struct xz_dec_bcj * xz_dec_bcj_create(bool single_call)
+{
+	struct xz_dec_bcj *s = kmalloc(sizeof(*s), GFP_KERNEL);
+	if (s != NULL)
+		s->single_call = single_call;
+
+	return s;
+}
+
+enum xz_ret xz_dec_bcj_reset(
+		struct xz_dec_bcj *s, uint8_t id)
+{
+	switch (id) {
+#ifdef XZ_DEC_X86
+	case BCJ_X86:
+#endif
+#ifdef XZ_DEC_POWERPC
+	case BCJ_POWERPC:
+#endif
+#ifdef XZ_DEC_IA64
+	case BCJ_IA64:
+#endif
+#ifdef XZ_DEC_ARM
+	case BCJ_ARM:
+#endif
+#ifdef XZ_DEC_ARMTHUMB
+	case BCJ_ARMTHUMB:
+#endif
+#ifdef XZ_DEC_SPARC
+	case BCJ_SPARC:
+#endif
+		break;
+
+	default:
+		/* Unsupported Filter ID */
+		return XZ_OPTIONS_ERROR;
+	}
+
+	s->type = id;
+	s->ret = XZ_OK;
+	s->pos = 0;
+	s->x86_prev_mask = 0;
+	s->temp.filtered = 0;
+	s->temp.size = 0;
+
+	return XZ_OK;
+}
diff --git a/grub-core/lib/xzembed/xz_dec_lzma2.c b/grub-core/lib/xzembed/xz_dec_lzma2.c
new file mode 100644
index 000000000..a0d422697
--- /dev/null
+++ b/grub-core/lib/xzembed/xz_dec_lzma2.c
@@ -0,0 +1,1168 @@
+/* xz_dec_lzma2.c - LZMA2 decoder */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+/*
+ * This file is based on code from XZ embedded project
+ * http://tukaani.org/xz/embedded.html
+ */
+
+#include "xz_private.h"
+#include "xz_lzma2.h"
+
+/*
+ * Range decoder initialization eats the first five bytes of each LZMA chunk.
+ */
+#define RC_INIT_BYTES 5
+
+/*
+ * Minimum number of usable input buffer to safely decode one LZMA symbol.
+ * The worst case is that we decode 22 bits using probabilities and 26
+ * direct bits. This may decode at maximum of 20 bytes of input. However,
+ * lzma_main() does an extra normalization before returning, thus we
+ * need to put 21 here.
+ */
+#define LZMA_IN_REQUIRED 21
+
+/*
+ * Dictionary (history buffer)
+ *
+ * These are always true:
+ *    start <= pos <= full <= end
+ *    pos <= limit <= end
+ *
+ * In multi-call mode, also these are true:
+ *    end == size
+ *    size <= allocated
+ *
+ * Most of these variables are size_t to support single-call mode,
+ * in which the dictionary variables address the actual output
+ * buffer directly.
+ */
+struct dictionary {
+	/* Beginning of the history buffer */
+	uint8_t *buf;
+
+	/* Old position in buf (before decoding more data) */
+	size_t start;
+
+	/* Position in buf */
+	size_t pos;
+
+	/*
+	 * How full dictionary is. This is used to detect corrupt input that
+	 * would read beyond the beginning of the uncompressed stream.
+	 */
+	size_t full;
+
+	/* Write limit; we don't write to buf[limit] or later bytes. */
+	size_t limit;
+
+	/*
+	 * End of the dictionary buffer. In multi-call mode, this is
+	 * the same as the dictionary size. In single-call mode, this
+	 * indicates the size of the output buffer.
+	 */
+	size_t end;
+
+	/*
+	 * Size of the dictionary as specified in Block Header. This is used
+	 * together with "full" to detect corrupt input that would make us
+	 * read beyond the beginning of the uncompressed stream.
+	 */
+	uint32_t size;
+
+	/*
+	 * Amount of memory allocated for the dictionary. A special
+	 * value of zero indicates that we are in single-call mode,
+	 * where the output buffer works as the dictionary.
+	 */
+	uint32_t allocated;
+};
+
+/* Range decoder */
+struct rc_dec {
+	uint32_t range;
+	uint32_t code;
+
+	/*
+	 * Number of initializing bytes remaining to be read
+	 * by rc_read_init().
+	 */
+	uint32_t init_bytes_left;
+
+	/*
+	 * Buffer from which we read our input. It can be either
+	 * temp.buf or the caller-provided input buffer.
+	 */
+	const uint8_t *in;
+	size_t in_pos;
+	size_t in_limit;
+};
+
+/* Probabilities for a length decoder. */
+struct lzma_len_dec {
+	/* Probability of match length being at least 10 */
+	uint16_t choice;
+
+	/* Probability of match length being at least 18 */
+	uint16_t choice2;
+
+	/* Probabilities for match lengths 2-9 */
+	uint16_t low[POS_STATES_MAX][LEN_LOW_SYMBOLS];
+
+	/* Probabilities for match lengths 10-17 */
+	uint16_t mid[POS_STATES_MAX][LEN_MID_SYMBOLS];
+
+	/* Probabilities for match lengths 18-273 */
+	uint16_t high[LEN_HIGH_SYMBOLS];
+};
+
+struct lzma_dec {
+	/*
+	 * LZMA properties or related bit masks (number of literal
+	 * context bits, a mask dervied from the number of literal
+	 * position bits, and a mask dervied from the number
+	 * position bits)
+	 */
+	uint32_t lc;
+	uint32_t literal_pos_mask; /* (1 << lp) - 1 */
+	uint32_t pos_mask;         /* (1 << pb) - 1 */
+
+	/* Types of the most recently seen LZMA symbols */
+	enum lzma_state state;
+
+	/* Distances of latest four matches */
+	uint32_t rep0;
+	uint32_t rep1;
+	uint32_t rep2;
+	uint32_t rep3;
+
+	/*
+	 * Length of a match. This is updated so that dict_repeat can
+	 * be called again to finish repeating the whole match.
+	 */
+	uint32_t len;
+
+	/* If 1, it's a match. Otherwise it's a single 8-bit literal. */
+	uint16_t is_match[STATES][POS_STATES_MAX];
+
+	/* If 1, it's a repeated match. The distance is one of rep0 .. rep3. */
+	uint16_t is_rep[STATES];
+
+	/*
+	 * If 0, distance of a repeated match is rep0.
+	 * Otherwise check is_rep1.
+	 */
+	uint16_t is_rep0[STATES];
+
+	/*
+	 * If 0, distance of a repeated match is rep1.
+	 * Otherwise check is_rep2.
+	 */
+	uint16_t is_rep1[STATES];
+
+	/* If 0, distance of a repeated match is rep2. Otherwise it is rep3. */
+	uint16_t is_rep2[STATES];
+
+	/*
+	 * If 1, the repeated match has length of one byte. Otherwise
+	 * the length is decoded from rep_len_decoder.
+	 */
+	uint16_t is_rep0_long[STATES][POS_STATES_MAX];
+
+	/*
+	 * Probability tree for the highest two bits of the match
+	 * distance. There is a separate probability tree for match
+	 * lengths of 2 (i.e. MATCH_LEN_MIN), 3, 4, and [5, 273].
+	 */
+	uint16_t dist_slot[DIST_STATES][DIST_SLOTS];
+
+	/*
+	 * Probility trees for additional bits for match distance
+	 * when the distance is in the range [4, 127].
+	 */
+	uint16_t dist_special[FULL_DISTANCES - DIST_MODEL_END];
+
+	/*
+	 * Probability tree for the lowest four bits of a match
+	 * distance that is equal to or greater than 128.
+	 */
+	uint16_t dist_align[ALIGN_SIZE];
+
+	/* Length of a normal match */
+	struct lzma_len_dec match_len_dec;
+
+	/* Length of a repeated match */
+	struct lzma_len_dec rep_len_dec;
+
+	/* Probabilities of literals */
+	uint16_t literal[LITERAL_CODERS_MAX][LITERAL_CODER_SIZE];
+};
+
+struct xz_dec_lzma2 {
+	/* LZMA2 */
+	struct {
+		/* Position in xz_dec_lzma2_run(). */
+		enum lzma2_seq {
+			SEQ_CONTROL,
+			SEQ_UNCOMPRESSED_1,
+			SEQ_UNCOMPRESSED_2,
+			SEQ_COMPRESSED_0,
+			SEQ_COMPRESSED_1,
+			SEQ_PROPERTIES,
+			SEQ_LZMA_PREPARE,
+			SEQ_LZMA_RUN,
+			SEQ_COPY
+		} sequence;
+
+		/*
+		 * Next position after decoding the compressed size of
+		 * the chunk.
+		 */
+		enum lzma2_seq next_sequence;
+
+		/* Uncompressed size of LZMA chunk (2 MiB at maximum) */
+		uint32_t uncompressed;
+
+		/*
+		 * Compressed size of LZMA chunk or compressed/uncompressed
+		 * size of uncompressed chunk (64 KiB at maximum)
+		 */
+		uint32_t compressed;
+
+		/*
+		 * True if dictionary reset is needed. This is false before
+		 * the first chunk (LZMA or uncompressed).
+		 */
+		bool need_dict_reset;
+
+		/*
+		 * True if new LZMA properties are needed. This is false
+		 * before the first LZMA chunk.
+		 */
+		bool need_props;
+	} lzma2;
+
+	/*
+	 * Temporary buffer which holds small number of input bytes between
+	 * decoder calls. See lzma2_lzma() for details.
+	 */
+	struct {
+		uint32_t size;
+		uint8_t buf[3 * LZMA_IN_REQUIRED];
+	} temp;
+
+	struct dictionary dict;
+	struct rc_dec rc;
+	struct lzma_dec lzma;
+};
+
+/**************
+ * Dictionary *
+ **************/
+
+/*
+ * Reset the dictionary state. When in single-call mode, set up the beginning
+ * of the dictionary to point to the actual output buffer.
+ */
+static void dict_reset(struct dictionary *dict, struct xz_buf *b)
+{
+	if (dict->allocated == 0) {
+		dict->buf = b->out + b->out_pos;
+		dict->end = b->out_size - b->out_pos;
+	}
+	dict->start = 0;
+	dict->pos = 0;
+	dict->limit = 0;
+	dict->full = 0;
+}
+
+/* Set dictionary write limit */
+static void dict_limit(struct dictionary *dict, size_t out_max)
+{
+	if (dict->end - dict->pos <= out_max)
+		dict->limit = dict->end;
+	else
+		dict->limit = dict->pos + out_max;
+}
+
+/* Return true if at least one byte can be written into the dictionary. */
+static inline bool dict_has_space(const struct dictionary *dict)
+{
+	return dict->pos < dict->limit;
+}
+
+/*
+ * Get a byte from the dictionary at the given distance. The distance is
+ * assumed to valid, or as a special case, zero when the dictionary is
+ * still empty. This special case is needed for single-call decoding to
+ * avoid writing a '\0' to the end of the destination buffer.
+ */
+static inline uint32_t dict_get(
+		const struct dictionary *dict, uint32_t dist)
+{
+	size_t offset = dict->pos - dist - 1;
+
+	if (dist >= dict->pos)
+		offset += dict->end;
+
+	return dict->full > 0 ? dict->buf[offset] : 0;
+}
+
+/*
+ * Put one byte into the dictionary. It is assumed that there is space for it.
+ */
+static inline void dict_put(struct dictionary *dict, uint8_t byte)
+{
+	dict->buf[dict->pos++] = byte;
+
+	if (dict->full < dict->pos)
+		dict->full = dict->pos;
+}
+
+/*
+ * Repeat given number of bytes from the given distance. If the distance is
+ * invalid, false is returned. On success, true is returned and *len is
+ * updated to indicate how many bytes were left to be repeated.
+ */
+static bool dict_repeat(
+		struct dictionary *dict, uint32_t *len, uint32_t dist)
+{
+	size_t back;
+	uint32_t left;
+
+	if (dist >= dict->full || dist >= dict->size)
+		return false;
+
+	left = min_t(size_t, dict->limit - dict->pos, *len);
+	*len -= left;
+
+	back = dict->pos - dist - 1;
+	if (dist >= dict->pos)
+		back += dict->end;
+
+	do {
+		dict->buf[dict->pos++] = dict->buf[back++];
+		if (back == dict->end)
+			back = 0;
+	} while (--left > 0);
+
+	if (dict->full < dict->pos)
+		dict->full = dict->pos;
+
+	return true;
+}
+
+/* Copy uncompressed data as is from input to dictionary and output buffers. */
+static void dict_uncompressed(
+		struct dictionary *dict, struct xz_buf *b, uint32_t *left)
+{
+	size_t copy_size;
+
+	while (*left > 0 && b->in_pos < b->in_size
+			&& b->out_pos < b->out_size) {
+		copy_size = min(b->in_size - b->in_pos,
+				b->out_size - b->out_pos);
+		if (copy_size > dict->end - dict->pos)
+			copy_size = dict->end - dict->pos;
+		if (copy_size > *left)
+			copy_size = *left;
+
+		*left -= copy_size;
+
+		memcpy(dict->buf + dict->pos, b->in + b->in_pos, copy_size);
+		dict->pos += copy_size;
+
+		if (dict->full < dict->pos)
+			dict->full = dict->pos;
+
+		if (dict->allocated != 0) {
+			if (dict->pos == dict->end)
+				dict->pos = 0;
+
+			memcpy(b->out + b->out_pos, b->in + b->in_pos,
+					copy_size);
+		}
+
+		dict->start = dict->pos;
+
+		b->out_pos += copy_size;
+		b->in_pos += copy_size;
+
+	}
+}
+
+/*
+ * Flush pending data from dictionary to b->out. It is assumed that there is
+ * enough space in b->out. This is guaranteed because caller uses dict_limit()
+ * before decoding data into the dictionary.
+ */
+static uint32_t dict_flush(struct dictionary *dict, struct xz_buf *b)
+{
+	size_t copy_size = dict->pos - dict->start;
+
+	if (dict->allocated != 0) {
+		if (dict->pos == dict->end)
+			dict->pos = 0;
+
+		memcpy(b->out + b->out_pos, dict->buf + dict->start,
+				copy_size);
+	}
+
+	dict->start = dict->pos;
+	b->out_pos += copy_size;
+	return copy_size;
+}
+
+/*****************
+ * Range decoder *
+ *****************/
+
+/* Reset the range decoder. */
+static void rc_reset(struct rc_dec *rc)
+{
+	rc->range = (uint32_t)-1;
+	rc->code = 0;
+	rc->init_bytes_left = RC_INIT_BYTES;
+}
+
+/*
+ * Read the first five initial bytes into rc->code if they haven't been
+ * read already. (Yes, the first byte gets completely ignored.)
+ */
+static bool rc_read_init(struct rc_dec *rc, struct xz_buf *b)
+{
+	while (rc->init_bytes_left > 0) {
+		if (b->in_pos == b->in_size)
+			return false;
+
+		rc->code = (rc->code << 8) + b->in[b->in_pos++];
+		--rc->init_bytes_left;
+	}
+
+	return true;
+}
+
+/* Return true if there may not be enough input for the next decoding loop. */
+static inline bool rc_limit_exceeded(const struct rc_dec *rc)
+{
+	return rc->in_pos > rc->in_limit;
+}
+
+/*
+ * Return true if it is possible (from point of view of range decoder) that
+ * we have reached the end of the LZMA chunk.
+ */
+static inline bool rc_is_finished(const struct rc_dec *rc)
+{
+	return rc->code == 0;
+}
+
+/* Read the next input byte if needed. */
+static __always_inline void rc_normalize(struct rc_dec *rc)
+{
+	if (rc->range < RC_TOP_VALUE) {
+		rc->range <<= RC_SHIFT_BITS;
+		rc->code = (rc->code << RC_SHIFT_BITS) + rc->in[rc->in_pos++];
+	}
+}
+
+/*
+ * Decode one bit. In some versions, this function has been splitted in three
+ * functions so that the compiler is supposed to be able to more easily avoid
+ * an extra branch. In this particular version of the LZMA decoder, this
+ * doesn't seem to be a good idea (tested with GCC 3.3.6, 3.4.6, and 4.3.3
+ * on x86). Using a non-splitted version results in nicer looking code too.
+ *
+ * NOTE: This must return an int. Do not make it return a bool or the speed
+ * of the code generated by GCC 3.x decreases 10-15 %. (GCC 4.3 doesn't care,
+ * and it generates 10-20 % faster code than GCC 3.x from this file anyway.)
+ */
+static __always_inline int rc_bit(struct rc_dec *rc, uint16_t *prob)
+{
+	uint32_t bound;
+	int bit;
+
+	rc_normalize(rc);
+	bound = (rc->range >> RC_BIT_MODEL_TOTAL_BITS) * *prob;
+	if (rc->code < bound) {
+		rc->range = bound;
+		*prob += (RC_BIT_MODEL_TOTAL - *prob) >> RC_MOVE_BITS;
+		bit = 0;
+	} else {
+		rc->range -= bound;
+		rc->code -= bound;
+		*prob -= *prob >> RC_MOVE_BITS;
+		bit = 1;
+	}
+
+	return bit;
+}
+
+/* Decode a bittree starting from the most significant bit. */
+static __always_inline uint32_t rc_bittree(
+		struct rc_dec *rc, uint16_t *probs, uint32_t limit)
+{
+	uint32_t symbol = 1;
+
+	do {
+		if (rc_bit(rc, &probs[symbol]))
+			symbol = (symbol << 1) + 1;
+		else
+			symbol <<= 1;
+	} while (symbol < limit);
+
+	return symbol;
+}
+
+/* Decode a bittree starting from the least significant bit. */
+static __always_inline void rc_bittree_reverse(struct rc_dec *rc,
+		uint16_t *probs, uint32_t *dest, uint32_t limit)
+{
+	uint32_t symbol = 1;
+	uint32_t i = 0;
+
+	do {
+		if (rc_bit(rc, &probs[symbol])) {
+			symbol = (symbol << 1) + 1;
+			*dest += 1 << i;
+		} else {
+			symbol <<= 1;
+		}
+	} while (++i < limit);
+}
+
+/* Decode direct bits (fixed fifty-fifty probability) */
+static inline void rc_direct(
+		struct rc_dec *rc, uint32_t *dest, uint32_t limit)
+{
+	uint32_t mask;
+
+	do {
+		rc_normalize(rc);
+		rc->range >>= 1;
+		rc->code -= rc->range;
+		mask = (uint32_t)0 - (rc->code >> 31);
+		rc->code += rc->range & mask;
+		*dest = (*dest << 1) + (mask + 1);
+	} while (--limit > 0);
+}
+
+/********
+ * LZMA *
+ ********/
+
+/* Get pointer to literal coder probability array. */
+static uint16_t * lzma_literal_probs(struct xz_dec_lzma2 *s)
+{
+	uint32_t prev_byte = dict_get(&s->dict, 0);
+	uint32_t low = prev_byte >> (8 - s->lzma.lc);
+	uint32_t high = (s->dict.pos & s->lzma.literal_pos_mask) << s->lzma.lc;
+	return s->lzma.literal[low + high];
+}
+
+/* Decode a literal (one 8-bit byte) */
+static void lzma_literal(struct xz_dec_lzma2 *s)
+{
+	uint16_t *probs;
+	uint32_t symbol;
+	uint32_t match_byte;
+	uint32_t match_bit;
+	uint32_t offset;
+	uint32_t i;
+
+	probs = lzma_literal_probs(s);
+
+	if (lzma_state_is_literal(s->lzma.state)) {
+		symbol = rc_bittree(&s->rc, probs, 0x100);
+	} else {
+		symbol = 1;
+		match_byte = dict_get(&s->dict, s->lzma.rep0) << 1;
+		offset = 0x100;
+
+		do {
+			match_bit = match_byte & offset;
+			match_byte <<= 1;
+			i = offset + match_bit + symbol;
+
+			if (rc_bit(&s->rc, &probs[i])) {
+				symbol = (symbol << 1) + 1;
+				offset &= match_bit;
+			} else {
+				symbol <<= 1;
+				offset &= ~match_bit;
+			}
+		} while (symbol < 0x100);
+	}
+
+	dict_put(&s->dict, (uint8_t)symbol);
+	lzma_state_literal(&s->lzma.state);
+}
+
+/* Decode the length of the match into s->lzma.len. */
+static void lzma_len(struct xz_dec_lzma2 *s, struct lzma_len_dec *l,
+		uint32_t pos_state)
+{
+	uint16_t *probs;
+	uint32_t limit;
+
+	if (!rc_bit(&s->rc, &l->choice)) {
+		probs = l->low[pos_state];
+		limit = LEN_LOW_SYMBOLS;
+		s->lzma.len = MATCH_LEN_MIN;
+	} else {
+		if (!rc_bit(&s->rc, &l->choice2)) {
+			probs = l->mid[pos_state];
+			limit = LEN_MID_SYMBOLS;
+			s->lzma.len = MATCH_LEN_MIN + LEN_LOW_SYMBOLS;
+		} else {
+			probs = l->high;
+			limit = LEN_HIGH_SYMBOLS;
+			s->lzma.len = MATCH_LEN_MIN + LEN_LOW_SYMBOLS
+					+ LEN_MID_SYMBOLS;
+		}
+	}
+
+	s->lzma.len += rc_bittree(&s->rc, probs, limit) - limit;
+}
+
+/* Decode a match. The distance will be stored in s->lzma.rep0. */
+static void lzma_match(struct xz_dec_lzma2 *s, uint32_t pos_state)
+{
+	uint16_t *probs;
+	uint32_t dist_slot;
+	uint32_t limit;
+
+	lzma_state_match(&s->lzma.state);
+
+	s->lzma.rep3 = s->lzma.rep2;
+	s->lzma.rep2 = s->lzma.rep1;
+	s->lzma.rep1 = s->lzma.rep0;
+
+	lzma_len(s, &s->lzma.match_len_dec, pos_state);
+
+	probs = s->lzma.dist_slot[lzma_get_dist_state(s->lzma.len)];
+	dist_slot = rc_bittree(&s->rc, probs, DIST_SLOTS) - DIST_SLOTS;
+
+	if (dist_slot < DIST_MODEL_START) {
+		s->lzma.rep0 = dist_slot;
+	} else {
+		limit = (dist_slot >> 1) - 1;
+		s->lzma.rep0 = 2 + (dist_slot & 1);
+
+		if (dist_slot < DIST_MODEL_END) {
+			s->lzma.rep0 <<= limit;
+			probs = s->lzma.dist_special + s->lzma.rep0
+					- dist_slot - 1;
+			rc_bittree_reverse(&s->rc, probs,
+					&s->lzma.rep0, limit);
+		} else {
+			rc_direct(&s->rc, &s->lzma.rep0, limit - ALIGN_BITS);
+			s->lzma.rep0 <<= ALIGN_BITS;
+			rc_bittree_reverse(&s->rc, s->lzma.dist_align,
+					&s->lzma.rep0, ALIGN_BITS);
+		}
+	}
+}
+
+/*
+ * Decode a repeated match. The distance is one of the four most recently
+ * seen matches. The distance will be stored in s->lzma.rep0.
+ */
+static void lzma_rep_match(struct xz_dec_lzma2 *s, uint32_t pos_state)
+{
+	uint32_t tmp;
+
+	if (!rc_bit(&s->rc, &s->lzma.is_rep0[s->lzma.state])) {
+		if (!rc_bit(&s->rc, &s->lzma.is_rep0_long[
+				s->lzma.state][pos_state])) {
+			lzma_state_short_rep(&s->lzma.state);
+			s->lzma.len = 1;
+			return;
+		}
+	} else {
+		if (!rc_bit(&s->rc, &s->lzma.is_rep1[s->lzma.state])) {
+			tmp = s->lzma.rep1;
+		} else {
+			if (!rc_bit(&s->rc, &s->lzma.is_rep2[s->lzma.state])) {
+				tmp = s->lzma.rep2;
+			} else {
+				tmp = s->lzma.rep3;
+				s->lzma.rep3 = s->lzma.rep2;
+			}
+
+			s->lzma.rep2 = s->lzma.rep1;
+		}
+
+		s->lzma.rep1 = s->lzma.rep0;
+		s->lzma.rep0 = tmp;
+	}
+
+	lzma_state_long_rep(&s->lzma.state);
+	lzma_len(s, &s->lzma.rep_len_dec, pos_state);
+}
+
+/* LZMA decoder core */
+static bool lzma_main(struct xz_dec_lzma2 *s)
+{
+	uint32_t pos_state;
+
+	/*
+	 * If the dictionary was reached during the previous call, try to
+	 * finish the possibly pending repeat in the dictionary.
+	 */
+	if (dict_has_space(&s->dict) && s->lzma.len > 0)
+		dict_repeat(&s->dict, &s->lzma.len, s->lzma.rep0);
+
+	/*
+	 * Decode more LZMA symbols. One iteration may consume up to
+	 * LZMA_IN_REQUIRED - 1 bytes.
+	 */
+	while (dict_has_space(&s->dict) && !rc_limit_exceeded(&s->rc)) {
+		pos_state = s->dict.pos & s->lzma.pos_mask;
+
+		if (!rc_bit(&s->rc, &s->lzma.is_match[
+				s->lzma.state][pos_state])) {
+			lzma_literal(s);
+		} else {
+			if (rc_bit(&s->rc, &s->lzma.is_rep[s->lzma.state]))
+				lzma_rep_match(s, pos_state);
+			else
+				lzma_match(s, pos_state);
+
+			if (!dict_repeat(&s->dict, &s->lzma.len, s->lzma.rep0))
+				return false;
+		}
+	}
+
+	/*
+	 * Having the range decoder always normalized when we are outside
+	 * this function makes it easier to correctly handle end of the chunk.
+	 */
+	rc_normalize(&s->rc);
+
+	return true;
+}
+
+/*
+ * Reset the LZMA decoder and range decoder state. Dictionary is nore reset
+ * here, because LZMA state may be reset without resetting the dictionary.
+ */
+static void lzma_reset(struct xz_dec_lzma2 *s)
+{
+	uint16_t *probs;
+	size_t i;
+
+	s->lzma.state = STATE_LIT_LIT;
+	s->lzma.rep0 = 0;
+	s->lzma.rep1 = 0;
+	s->lzma.rep2 = 0;
+	s->lzma.rep3 = 0;
+
+	/*
+	 * All probabilities are initialized to the same value. This hack
+	 * makes the code smaller by avoiding a separate loop for each
+	 * probability array.
+	 *
+	 * This could be optimized so that only that part of literal
+	 * probabilities that are actually required. In the common case
+	 * we would write 12 KiB less.
+	 */
+	probs = s->lzma.is_match[0];
+	for (i = 0; i < PROBS_TOTAL; ++i)
+		probs[i] = RC_BIT_MODEL_TOTAL / 2;
+
+	rc_reset(&s->rc);
+}
+
+/*
+ * Decode and validate LZMA properties (lc/lp/pb) and calculate the bit masks
+ * from the decoded lp and pb values. On success, the LZMA decoder state is
+ * reset and true is returned.
+ */
+static bool lzma_props(struct xz_dec_lzma2 *s, uint8_t props)
+{
+	if (props > (4 * 5 + 4) * 9 + 8)
+		return false;
+
+	s->lzma.pos_mask = 0;
+	while (props >= 9 * 5) {
+		props -= 9 * 5;
+		++s->lzma.pos_mask;
+	}
+
+	s->lzma.pos_mask = (1 << s->lzma.pos_mask) - 1;
+
+	s->lzma.literal_pos_mask = 0;
+	while (props >= 9) {
+		props -= 9;
+		++s->lzma.literal_pos_mask;
+	}
+
+	s->lzma.lc = props;
+
+	if (s->lzma.lc + s->lzma.literal_pos_mask > 4)
+		return false;
+
+	s->lzma.literal_pos_mask = (1 << s->lzma.literal_pos_mask) - 1;
+
+	lzma_reset(s);
+
+	return true;
+}
+
+/*********
+ * LZMA2 *
+ *********/
+
+/*
+ * The LZMA decoder assumes that if the input limit (s->rc.in_limit) hasn't
+ * been exceeded, it is safe to read up to LZMA_IN_REQUIRED bytes. This
+ * wrapper function takes care of making the LZMA decoder's assumption safe.
+ *
+ * As long as there is plenty of input left to be decoded in the current LZMA
+ * chunk, we decode directly from the caller-supplied input buffer until
+ * there's LZMA_IN_REQUIRED bytes left. Those remaining bytes are copied into
+ * s->temp.buf, which (hopefully) gets filled on the next call to this
+ * function. We decode a few bytes from the temporary buffer so that we can
+ * continue decoding from the caller-supplied input buffer again.
+ */
+static bool lzma2_lzma(struct xz_dec_lzma2 *s, struct xz_buf *b)
+{
+	size_t in_avail;
+	uint32_t tmp;
+
+	in_avail = b->in_size - b->in_pos;
+	if (s->temp.size > 0 || s->lzma2.compressed == 0) {
+		tmp = 2 * LZMA_IN_REQUIRED - s->temp.size;
+		if (tmp > s->lzma2.compressed - s->temp.size)
+			tmp = s->lzma2.compressed - s->temp.size;
+		if (tmp > in_avail)
+			tmp = in_avail;
+
+		memcpy(s->temp.buf + s->temp.size, b->in + b->in_pos, tmp);
+
+		if (s->temp.size + tmp == s->lzma2.compressed) {
+			memzero(s->temp.buf + s->temp.size + tmp,
+					sizeof(s->temp.buf)
+						- s->temp.size - tmp);
+			s->rc.in_limit = s->temp.size + tmp;
+		} else if (s->temp.size + tmp < LZMA_IN_REQUIRED) {
+			s->temp.size += tmp;
+			b->in_pos += tmp;
+			return true;
+		} else {
+			s->rc.in_limit = s->temp.size + tmp - LZMA_IN_REQUIRED;
+		}
+
+		s->rc.in = s->temp.buf;
+		s->rc.in_pos = 0;
+
+		if (!lzma_main(s) || s->rc.in_pos > s->temp.size + tmp)
+			return false;
+
+		s->lzma2.compressed -= s->rc.in_pos;
+
+		if (s->rc.in_pos < s->temp.size) {
+			s->temp.size -= s->rc.in_pos;
+			memmove(s->temp.buf, s->temp.buf + s->rc.in_pos,
+					s->temp.size);
+			return true;
+		}
+
+		b->in_pos += s->rc.in_pos - s->temp.size;
+		s->temp.size = 0;
+	}
+
+	in_avail = b->in_size - b->in_pos;
+	if (in_avail >= LZMA_IN_REQUIRED) {
+		s->rc.in = b->in;
+		s->rc.in_pos = b->in_pos;
+
+		if (in_avail >= s->lzma2.compressed + LZMA_IN_REQUIRED)
+			s->rc.in_limit = b->in_pos + s->lzma2.compressed;
+		else
+			s->rc.in_limit = b->in_size - LZMA_IN_REQUIRED;
+
+		if (!lzma_main(s))
+			return false;
+
+		in_avail = s->rc.in_pos - b->in_pos;
+		if (in_avail > s->lzma2.compressed)
+			return false;
+
+		s->lzma2.compressed -= in_avail;
+		b->in_pos = s->rc.in_pos;
+	}
+
+	in_avail = b->in_size - b->in_pos;
+	if (in_avail < LZMA_IN_REQUIRED) {
+		if (in_avail > s->lzma2.compressed)
+			in_avail = s->lzma2.compressed;
+
+		memcpy(s->temp.buf, b->in + b->in_pos, in_avail);
+		s->temp.size = in_avail;
+		b->in_pos += in_avail;
+	}
+
+	return true;
+}
+
+/*
+ * Take care of the LZMA2 control layer, and forward the job of actual LZMA
+ * decoding or copying of uncompressed chunks to other functions.
+ */
+enum xz_ret xz_dec_lzma2_run(
+		struct xz_dec_lzma2 *s, struct xz_buf *b)
+{
+	uint32_t tmp;
+
+	while (b->in_pos < b->in_size || s->lzma2.sequence == SEQ_LZMA_RUN) {
+		switch (s->lzma2.sequence) {
+		case SEQ_CONTROL:
+			/*
+			 * LZMA2 control byte
+			 *
+			 * Exact values:
+			 *   0x00   End marker
+			 *   0x01   Dictionary reset followed by
+			 *          an uncompressed chunk
+			 *   0x02   Uncompressed chunk (no dictionary reset)
+			 *
+			 * Highest three bits (s->control & 0xE0):
+			 *   0xE0   Dictionary reset, new properties and state
+			 *          reset, followed by LZMA compressed chunk
+			 *   0xC0   New properties and state reset, followed
+			 *          by LZMA compressed chunk (no dictionary
+			 *          reset)
+			 *   0xA0   State reset using old properties,
+			 *          followed by LZMA compressed chunk (no
+			 *          dictionary reset)
+			 *   0x80   LZMA chunk (no dictionary or state reset)
+			 *
+			 * For LZMA compressed chunks, the lowest five bits
+			 * (s->control & 1F) are the highest bits of the
+			 * uncompressed size (bits 16-20).
+			 *
+			 * A new LZMA2 stream must begin with a dictionary
+			 * reset. The first LZMA chunk must set new
+			 * properties and reset the LZMA state.
+			 *
+			 * Values that don't match anything described above
+			 * are invalid and we return XZ_DATA_ERROR.
+			 */
+			tmp = b->in[b->in_pos++];
+
+			if (tmp >= 0xE0 || tmp == 0x01) {
+				s->lzma2.need_props = true;
+				s->lzma2.need_dict_reset = false;
+				dict_reset(&s->dict, b);
+			} else if (s->lzma2.need_dict_reset) {
+				return XZ_DATA_ERROR;
+			}
+
+			if (tmp >= 0x80) {
+				s->lzma2.uncompressed = (tmp & 0x1F) << 16;
+				s->lzma2.sequence = SEQ_UNCOMPRESSED_1;
+
+				if (tmp >= 0xC0) {
+					/*
+					 * When there are new properties,
+					 * state reset is done at
+					 * SEQ_PROPERTIES.
+					 */
+					s->lzma2.need_props = false;
+					s->lzma2.next_sequence
+							= SEQ_PROPERTIES;
+
+				} else if (s->lzma2.need_props) {
+					return XZ_DATA_ERROR;
+
+				} else {
+					s->lzma2.next_sequence
+							= SEQ_LZMA_PREPARE;
+					if (tmp >= 0xA0)
+						lzma_reset(s);
+				}
+			} else {
+				if (tmp == 0x00)
+					return XZ_STREAM_END;
+
+				if (tmp > 0x02)
+					return XZ_DATA_ERROR;
+
+				s->lzma2.sequence = SEQ_COMPRESSED_0;
+				s->lzma2.next_sequence = SEQ_COPY;
+			}
+
+			break;
+
+		case SEQ_UNCOMPRESSED_1:
+			s->lzma2.uncompressed
+					+= (uint32_t)b->in[b->in_pos++] << 8;
+			s->lzma2.sequence = SEQ_UNCOMPRESSED_2;
+			break;
+
+		case SEQ_UNCOMPRESSED_2:
+			s->lzma2.uncompressed
+					+= (uint32_t)b->in[b->in_pos++] + 1;
+			s->lzma2.sequence = SEQ_COMPRESSED_0;
+			break;
+
+		case SEQ_COMPRESSED_0:
+			s->lzma2.compressed
+					= (uint32_t)b->in[b->in_pos++] << 8;
+			s->lzma2.sequence = SEQ_COMPRESSED_1;
+			break;
+
+		case SEQ_COMPRESSED_1:
+			s->lzma2.compressed
+					+= (uint32_t)b->in[b->in_pos++] + 1;
+			s->lzma2.sequence = s->lzma2.next_sequence;
+			break;
+
+		case SEQ_PROPERTIES:
+			if (!lzma_props(s, b->in[b->in_pos++]))
+				return XZ_DATA_ERROR;
+
+			s->lzma2.sequence = SEQ_LZMA_PREPARE;
+
+		case SEQ_LZMA_PREPARE:
+			if (s->lzma2.compressed < RC_INIT_BYTES)
+				return XZ_DATA_ERROR;
+
+			if (!rc_read_init(&s->rc, b))
+				return XZ_OK;
+
+			s->lzma2.compressed -= RC_INIT_BYTES;
+			s->lzma2.sequence = SEQ_LZMA_RUN;
+
+		case SEQ_LZMA_RUN:
+			/*
+			 * Set dictionary limit to indicate how much we want
+			 * to be encoded at maximum. Decode new data into the
+			 * dictionary. Flush the new data from dictionary to
+			 * b->out. Check if we finished decoding this chunk.
+			 * In case the dictionary got full but we didn't fill
+			 * the output buffer yet, we may run this loop
+			 * multiple times without changing s->lzma2.sequence.
+			 */
+			dict_limit(&s->dict, min_t(size_t,
+					b->out_size - b->out_pos,
+					s->lzma2.uncompressed));
+			if (!lzma2_lzma(s, b))
+				return XZ_DATA_ERROR;
+
+			s->lzma2.uncompressed -= dict_flush(&s->dict, b);
+
+			if (s->lzma2.uncompressed == 0) {
+				if (s->lzma2.compressed > 0 || s->lzma.len > 0
+						|| !rc_is_finished(&s->rc))
+					return XZ_DATA_ERROR;
+
+				rc_reset(&s->rc);
+				s->lzma2.sequence = SEQ_CONTROL;
+
+			} else if (b->out_pos == b->out_size
+					|| (b->in_pos == b->in_size
+						&& s->temp.size
+						< s->lzma2.compressed)) {
+				return XZ_OK;
+			}
+
+			break;
+
+		case SEQ_COPY:
+			dict_uncompressed(&s->dict, b, &s->lzma2.compressed);
+			if (s->lzma2.compressed > 0)
+				return XZ_OK;
+
+			s->lzma2.sequence = SEQ_CONTROL;
+			break;
+		}
+	}
+
+	return XZ_OK;
+}
+
+struct xz_dec_lzma2 * xz_dec_lzma2_create(uint32_t dict_max)
+{
+	struct xz_dec_lzma2 *s;
+
+	/* Maximum supported dictionary by this implementation is 3 GiB. */
+	if (dict_max > ((uint32_t)3 << 30))
+		return NULL;
+
+	s = kmalloc(sizeof(*s), GFP_KERNEL);
+	if (s == NULL)
+		return NULL;
+
+	if (dict_max > 0) {
+		s->dict.buf = vmalloc(dict_max);
+		if (s->dict.buf == NULL) {
+			kfree(s);
+			return NULL;
+		}
+	}
+
+	s->dict.allocated = dict_max;
+
+	return s;
+}
+
+enum xz_ret xz_dec_lzma2_reset(
+		struct xz_dec_lzma2 *s, uint8_t props)
+{
+	/* This limits dictionary size to 3 GiB (39) to keep parsing simpler. */
+	if (props > ( min (DICT_BIT_SIZE,39)) )
+		return XZ_OPTIONS_ERROR;
+
+	s->dict.size = 2 + (props & 1);
+	s->dict.size <<= (props >> 1) + 11;
+
+	if (s->dict.allocated > 0 && s->dict.allocated < s->dict.size)
+	{
+		/* enlarge dictionary buffer */
+		uint8_t * newdict = realloc(s->dict.buf,s->dict.size);
+
+		if (! newdict)
+			return XZ_MEMLIMIT_ERROR;
+
+		s->dict.buf = newdict;
+		s->dict.allocated = s->dict.size;
+	}
+
+	s->dict.end = s->dict.size;
+
+	s->lzma.len = 0;
+
+	s->lzma2.sequence = SEQ_CONTROL;
+	s->lzma2.need_dict_reset = true;
+
+	s->temp.size = 0;
+
+	return XZ_OK;
+}
+
+void xz_dec_lzma2_end(struct xz_dec_lzma2 *s)
+{
+	if (s->dict.allocated > 0)
+		vfree(s->dict.buf);
+
+	kfree(s);
+}
diff --git a/grub-core/lib/xzembed/xz_dec_stream.c b/grub-core/lib/xzembed/xz_dec_stream.c
new file mode 100644
index 000000000..642492483
--- /dev/null
+++ b/grub-core/lib/xzembed/xz_dec_stream.c
@@ -0,0 +1,854 @@
+/* xz_dec_stream.c - .xz Stream decoder */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+/*
+ * This file is based on code from XZ embedded project
+ * http://tukaani.org/xz/embedded.html
+ */
+
+#include "xz_config.h"
+#include "xz_private.h"
+#include "xz_stream.h"
+
+#include <grub/crypto.h>
+
+/* Hash used to validate the Index field */
+struct xz_dec_hash {
+	vli_type unpadded;
+	vli_type uncompressed;
+	uint8_t *crc32_context;
+};
+
+struct xz_dec {
+	/* Position in dec_main() */
+	enum {
+		SEQ_STREAM_HEADER,
+		SEQ_BLOCK_START,
+		SEQ_BLOCK_HEADER,
+		SEQ_BLOCK_UNCOMPRESS,
+		SEQ_BLOCK_PADDING,
+		SEQ_BLOCK_CHECK,
+		SEQ_INDEX,
+		SEQ_INDEX_PADDING,
+		SEQ_INDEX_CRC32,
+		SEQ_STREAM_FOOTER
+	} sequence;
+
+	/* Position in variable-length integers and Check fields */
+	uint32_t pos;
+
+	/* Variable-length integer decoded by dec_vli() */
+	vli_type vli;
+
+	/* Saved in_pos and out_pos */
+	size_t in_start;
+	size_t out_start;
+
+	/* CRC32 value in Block or Index */
+	uint32_t crc32_temp; /* need for crc32_validate*/
+	uint8_t *crc32_context;
+
+	/* True if CRC32 is calculated from uncompressed data */
+	bool has_crc32;
+
+	/* True if we are operating in single-call mode. */
+	bool single_call;
+
+	/*
+	 * True if the next call to xz_dec_run() is allowed to return
+	 * XZ_BUF_ERROR.
+	 */
+	bool allow_buf_error;
+
+	/* Information stored in Block Header */
+	struct {
+		/*
+		 * Value stored in the Compressed Size field, or
+		 * VLI_UNKNOWN if Compressed Size is not present.
+		 */
+		vli_type compressed;
+
+		/*
+		 * Value stored in the Uncompressed Size field, or
+		 * VLI_UNKNOWN if Uncompressed Size is not present.
+		 */
+		vli_type uncompressed;
+
+		/* Size of the Block Header field */
+		uint32_t size;
+	} block_header;
+
+	/* Information collected when decoding Blocks */
+	struct {
+		/* Observed compressed size of the current Block */
+		vli_type compressed;
+
+		/* Observed uncompressed size of the current Block */
+		vli_type uncompressed;
+
+		/* Number of Blocks decoded so far */
+		vli_type count;
+
+		/*
+		 * Hash calculated from the Block sizes. This is used to
+		 * validate the Index field.
+		 */
+		struct xz_dec_hash hash;
+	} block;
+
+	/* Variables needed when verifying the Index field */
+	struct {
+		/* Position in dec_index() */
+		enum {
+			SEQ_INDEX_COUNT,
+			SEQ_INDEX_UNPADDED,
+			SEQ_INDEX_UNCOMPRESSED
+		} sequence;
+
+		/* Size of the Index in bytes */
+		vli_type size;
+
+		/* Number of Records (matches block.count in valid files) */
+		vli_type count;
+
+		/*
+		 * Hash calculated from the Records (matches block.hash in
+		 * valid files).
+		 */
+		struct xz_dec_hash hash;
+	} index;
+
+	/*
+	 * Temporary buffer needed to hold Stream Header, Block Header,
+	 * and Stream Footer. The Block Header is the biggest (1 KiB)
+	 * so we reserve space according to that. buf[] has to be aligned
+	 * to a multiple of four bytes; the size_t variables before it
+	 * should guarantee this.
+	 */
+	struct {
+		size_t pos;
+		size_t size;
+		uint8_t buf[1024];
+	} temp;
+
+	struct xz_dec_lzma2 *lzma2;
+
+#ifdef XZ_DEC_BCJ
+	struct xz_dec_bcj *bcj;
+	bool bcj_active;
+#endif
+};
+
+/*
+ * Fill s->temp by copying data starting from b->in[b->in_pos]. Caller
+ * must have set s->temp.pos to indicate how much data we are supposed
+ * to copy into s->temp.buf. Return true once s->temp.pos has reached
+ * s->temp.size.
+ */
+static bool fill_temp(struct xz_dec *s, struct xz_buf *b)
+{
+	size_t copy_size = min_t(size_t,
+			b->in_size - b->in_pos, s->temp.size - s->temp.pos);
+
+	memcpy(s->temp.buf + s->temp.pos, b->in + b->in_pos, copy_size);
+	b->in_pos += copy_size;
+	s->temp.pos += copy_size;
+
+	if (s->temp.pos == s->temp.size) {
+		s->temp.pos = 0;
+		return true;
+	}
+
+	return false;
+}
+
+/* Decode a variable-length integer (little-endian base-128 encoding) */
+static enum xz_ret dec_vli(struct xz_dec *s,
+		const uint8_t *in, size_t *in_pos, size_t in_size)
+{
+	uint8_t byte;
+
+	if (s->pos == 0)
+		s->vli = 0;
+
+	while (*in_pos < in_size) {
+		byte = in[*in_pos];
+		++*in_pos;
+
+		s->vli |= (vli_type)(byte & 0x7F) << s->pos;
+
+		if ((byte & 0x80) == 0) {
+			/* Don't allow non-minimal encodings. */
+			if (byte == 0 && s->pos != 0)
+				return XZ_DATA_ERROR;
+
+			s->pos = 0;
+			return XZ_STREAM_END;
+		}
+
+		s->pos += 7;
+		if (s->pos == 7 * VLI_BYTES_MAX)
+			return XZ_DATA_ERROR;
+	}
+
+	return XZ_OK;
+}
+
+/*
+ * Decode the Compressed Data field from a Block. Update and validate
+ * the observed compressed and uncompressed sizes of the Block so that
+ * they don't exceed the values possibly stored in the Block Header
+ * (validation assumes that no integer overflow occurs, since vli_type
+ * is normally uint64_t). Update the CRC32 if presence of the CRC32
+ * field was indicated in Stream Header.
+ *
+ * Once the decoding is finished, validate that the observed sizes match
+ * the sizes possibly stored in the Block Header. Update the hash and
+ * Block count, which are later used to validate the Index field.
+ */
+static enum xz_ret dec_block(struct xz_dec *s, struct xz_buf *b)
+{
+	enum xz_ret ret;
+
+	s->in_start = b->in_pos;
+	s->out_start = b->out_pos;
+
+#ifdef XZ_DEC_BCJ
+	if (s->bcj_active)
+		ret = xz_dec_bcj_run(s->bcj, s->lzma2, b);
+	else
+#endif
+		ret = xz_dec_lzma2_run(s->lzma2, b);
+
+	s->block.compressed += b->in_pos - s->in_start;
+	s->block.uncompressed += b->out_pos - s->out_start;
+
+	/*
+	 * There is no need to separately check for VLI_UNKNOWN, since
+	 * the observed sizes are always smaller than VLI_UNKNOWN.
+	 */
+	if (s->block.compressed > s->block_header.compressed
+			|| s->block.uncompressed
+				> s->block_header.uncompressed)
+		return XZ_DATA_ERROR;
+
+	if (s->has_crc32)
+	  GRUB_MD_CRC32->write(s->crc32_context,b->out + s->out_start,
+				b->out_pos - s->out_start);
+
+	if (ret == XZ_STREAM_END) {
+		if (s->block_header.compressed != VLI_UNKNOWN
+				&& s->block_header.compressed
+					!= s->block.compressed)
+			return XZ_DATA_ERROR;
+
+		if (s->block_header.uncompressed != VLI_UNKNOWN
+				&& s->block_header.uncompressed
+					!= s->block.uncompressed)
+			return XZ_DATA_ERROR;
+
+		s->block.hash.unpadded += s->block_header.size
+				+ s->block.compressed;
+		if (s->has_crc32)
+			s->block.hash.unpadded += 4;
+
+		s->block.hash.uncompressed += s->block.uncompressed;
+
+		GRUB_MD_CRC32->write(s->block.hash.crc32_context,
+				(const uint8_t *)&s->block.hash, sizeof(s->block.hash));
+
+		++s->block.count;
+	}
+
+	return ret;
+}
+
+/* Update the Index size and the CRC32 value. */
+static void index_update(struct xz_dec *s, const struct xz_buf *b)
+{
+	size_t in_used = b->in_pos - s->in_start;
+	s->index.size += in_used;
+	GRUB_MD_CRC32->write(s->crc32_context,b->in + s->in_start, in_used);
+}
+
+/*
+ * Decode the Number of Records, Unpadded Size, and Uncompressed Size
+ * fields from the Index field. That is, Index Padding and CRC32 are not
+ * decoded by this function.
+ *
+ * This can return XZ_OK (more input needed), XZ_STREAM_END (everything
+ * successfully decoded), or XZ_DATA_ERROR (input is corrupt).
+ */
+static enum xz_ret dec_index(struct xz_dec *s, struct xz_buf *b)
+{
+	enum xz_ret ret;
+
+	do {
+		ret = dec_vli(s, b->in, &b->in_pos, b->in_size);
+		if (ret != XZ_STREAM_END) {
+			index_update(s, b);
+			return ret;
+		}
+
+		switch (s->index.sequence) {
+		case SEQ_INDEX_COUNT:
+			s->index.count = s->vli;
+
+			/*
+			 * Validate that the Number of Records field
+			 * indicates the same number of Records as
+			 * there were Blocks in the Stream.
+			 */
+			if (s->index.count != s->block.count)
+				return XZ_DATA_ERROR;
+
+			s->index.sequence = SEQ_INDEX_UNPADDED;
+			break;
+
+		case SEQ_INDEX_UNPADDED:
+			s->index.hash.unpadded += s->vli;
+			s->index.sequence = SEQ_INDEX_UNCOMPRESSED;
+			break;
+
+		case SEQ_INDEX_UNCOMPRESSED:
+			s->index.hash.uncompressed += s->vli;
+
+			GRUB_MD_CRC32->write(s->index.hash.crc32_context,
+					(const uint8_t *)&s->index.hash,
+					sizeof(s->index.hash));
+
+			--s->index.count;
+			s->index.sequence = SEQ_INDEX_UNPADDED;
+			break;
+		}
+	} while (s->index.count > 0);
+
+	return XZ_STREAM_END;
+}
+
+/*
+ * Validate that the next four input bytes match the value of s->crc32.
+ * s->pos must be zero when starting to validate the first byte.
+ */
+static enum xz_ret crc32_validate(struct xz_dec *s, struct xz_buf *b)
+{
+	if(s->crc32_temp == 0)
+	{
+	  GRUB_MD_CRC32->final(s->crc32_context);
+		s->crc32_temp = get_unaligned_be32(GRUB_MD_CRC32->read(s->crc32_context));
+	}
+
+	do {
+		if (b->in_pos == b->in_size)
+			return XZ_OK;
+
+		if (((s->crc32_temp >> s->pos) & 0xFF) != b->in[b->in_pos++])
+			return XZ_DATA_ERROR;
+
+		s->pos += 8;
+
+	} while (s->pos < 32);
+
+	GRUB_MD_CRC32->init(s->crc32_context);
+	s->crc32_temp = 0;
+	s->pos = 0;
+
+	return XZ_STREAM_END;
+}
+
+/* Decode the Stream Header field (the first 12 bytes of the .xz Stream). */
+static enum xz_ret dec_stream_header(struct xz_dec *s)
+{
+	if (! memeq(s->temp.buf, HEADER_MAGIC, HEADER_MAGIC_SIZE))
+		return XZ_FORMAT_ERROR;
+
+	uint8_t crc32_context[GRUB_MD_CRC32->contextsize];
+
+	GRUB_MD_CRC32->init(crc32_context);
+	GRUB_MD_CRC32->write(crc32_context,s->temp.buf + HEADER_MAGIC_SIZE, 2);
+	GRUB_MD_CRC32->final(crc32_context);
+
+	uint32_t resultcrc = get_unaligned_be32(GRUB_MD_CRC32->read(crc32_context));
+	uint32_t readcrc = get_unaligned_le32(s->temp.buf + HEADER_MAGIC_SIZE + 2);
+
+	if(resultcrc != readcrc)
+		return XZ_DATA_ERROR;
+
+	/*
+	 * Decode the Stream Flags field. Of integrity checks, we support
+	 * only none (Check ID = 0) and CRC32 (Check ID = 1).
+	 */
+	if (s->temp.buf[HEADER_MAGIC_SIZE] != 0
+			|| s->temp.buf[HEADER_MAGIC_SIZE + 1] > 1)
+		return XZ_OPTIONS_ERROR;
+
+	s->has_crc32 = s->temp.buf[HEADER_MAGIC_SIZE + 1];
+
+	return XZ_OK;
+}
+
+/* Decode the Stream Footer field (the last 12 bytes of the .xz Stream) */
+static enum xz_ret dec_stream_footer(struct xz_dec *s)
+{
+	if (! memeq(s->temp.buf + 10, FOOTER_MAGIC, FOOTER_MAGIC_SIZE))
+		return XZ_DATA_ERROR;
+
+	uint8_t crc32_context[GRUB_MD_CRC32->contextsize];
+
+	GRUB_MD_CRC32->init(crc32_context);
+	GRUB_MD_CRC32->write(crc32_context, s->temp.buf + 4, 6);
+	GRUB_MD_CRC32->final(crc32_context);
+
+	uint32_t resultcrc = get_unaligned_be32(GRUB_MD_CRC32->read(crc32_context));
+	uint32_t readcrc = get_unaligned_le32(s->temp.buf);
+
+	if(resultcrc != readcrc)
+		return XZ_DATA_ERROR;
+
+	/*
+	 * Validate Backward Size. Note that we never added the size of the
+	 * Index CRC32 field to s->index.size, thus we use s->index.size / 4
+	 * instead of s->index.size / 4 - 1.
+	 */
+	if ((s->index.size >> 2) != get_le32(s->temp.buf + 4))
+		return XZ_DATA_ERROR;
+
+	if (s->temp.buf[8] != 0 || s->temp.buf[9] != s->has_crc32)
+		return XZ_DATA_ERROR;
+
+	/*
+	 * Use XZ_STREAM_END instead of XZ_OK to be more convenient
+	 * for the caller.
+	 */
+	return XZ_STREAM_END;
+}
+
+/* Decode the Block Header and initialize the filter chain. */
+static enum xz_ret dec_block_header(struct xz_dec *s)
+{
+	enum xz_ret ret;
+
+	/*
+	 * Validate the CRC32. We know that the temp buffer is at least
+	 * eight bytes so this is safe.
+	 */
+	s->temp.size -= 4;
+
+	uint8_t crc32_context[GRUB_MD_CRC32->contextsize];
+
+	GRUB_MD_CRC32->init(crc32_context);
+	GRUB_MD_CRC32->write(crc32_context, s->temp.buf, s->temp.size);
+	GRUB_MD_CRC32->final(crc32_context);
+
+	uint32_t resultcrc = get_unaligned_be32(GRUB_MD_CRC32->read(crc32_context));
+	uint32_t readcrc = get_unaligned_le32(s->temp.buf + s->temp.size);
+
+	if (resultcrc != readcrc)
+		return XZ_DATA_ERROR;
+
+	s->temp.pos = 2;
+
+	/*
+	 * Catch unsupported Block Flags. We support only one or two filters
+	 * in the chain, so we catch that with the same test.
+	 */
+#ifdef XZ_DEC_BCJ
+	if (s->temp.buf[1] & 0x3E)
+#else
+	if (s->temp.buf[1] & 0x3F)
+#endif
+		return XZ_OPTIONS_ERROR;
+
+	/* Compressed Size */
+	if (s->temp.buf[1] & 0x40) {
+		if (dec_vli(s, s->temp.buf, &s->temp.pos, s->temp.size)
+					!= XZ_STREAM_END)
+			return XZ_DATA_ERROR;
+
+		s->block_header.compressed = s->vli;
+	} else {
+		s->block_header.compressed = VLI_UNKNOWN;
+	}
+
+	/* Uncompressed Size */
+	if (s->temp.buf[1] & 0x80) {
+		if (dec_vli(s, s->temp.buf, &s->temp.pos, s->temp.size)
+				!= XZ_STREAM_END)
+			return XZ_DATA_ERROR;
+
+		s->block_header.uncompressed = s->vli;
+	} else {
+		s->block_header.uncompressed = VLI_UNKNOWN;
+	}
+
+#ifdef XZ_DEC_BCJ
+	/* If there are two filters, the first one must be a BCJ filter. */
+	s->bcj_active = s->temp.buf[1] & 0x01;
+	if (s->bcj_active) {
+		if (s->temp.size - s->temp.pos < 2)
+			return XZ_OPTIONS_ERROR;
+
+		ret = xz_dec_bcj_reset(s->bcj, s->temp.buf[s->temp.pos++]);
+		if (ret != XZ_OK)
+			return ret;
+
+		/*
+		 * We don't support custom start offset,
+		 * so Size of Properties must be zero.
+		 */
+		if (s->temp.buf[s->temp.pos++] != 0x00)
+			return XZ_OPTIONS_ERROR;
+	}
+#endif
+
+	/* Valid Filter Flags always take at least two bytes. */
+	if (s->temp.size - s->temp.pos < 2)
+		return XZ_DATA_ERROR;
+
+	/* Filter ID = LZMA2 */
+	if (s->temp.buf[s->temp.pos++] != 0x21)
+		return XZ_OPTIONS_ERROR;
+
+	/* Size of Properties = 1-byte Filter Properties */
+	if (s->temp.buf[s->temp.pos++] != 0x01)
+		return XZ_OPTIONS_ERROR;
+
+	/* Filter Properties contains LZMA2 dictionary size. */
+	if (s->temp.size - s->temp.pos < 1)
+		return XZ_DATA_ERROR;
+
+	ret = xz_dec_lzma2_reset(s->lzma2, s->temp.buf[s->temp.pos++]);
+	if (ret != XZ_OK)
+		return ret;
+
+	/* The rest must be Header Padding. */
+	while (s->temp.pos < s->temp.size)
+		if (s->temp.buf[s->temp.pos++] != 0x00)
+			return XZ_OPTIONS_ERROR;
+
+	s->temp.pos = 0;
+	s->block.compressed = 0;
+	s->block.uncompressed = 0;
+
+	return XZ_OK;
+}
+
+static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b)
+{
+	enum xz_ret ret;
+
+	/*
+	 * Store the start position for the case when we are in the middle
+	 * of the Index field.
+	 */
+	s->in_start = b->in_pos;
+
+	while (true) {
+		switch (s->sequence) {
+		case SEQ_STREAM_HEADER:
+			/*
+			 * Stream Header is copied to s->temp, and then
+			 * decoded from there. This way if the caller
+			 * gives us only little input at a time, we can
+			 * still keep the Stream Header decoding code
+			 * simple. Similar approach is used in many places
+			 * in this file.
+			 */
+			if (!fill_temp(s, b))
+				return XZ_OK;
+
+			ret = dec_stream_header(s);
+			if (ret != XZ_OK)
+				return ret;
+
+			s->sequence = SEQ_BLOCK_START;
+
+		case SEQ_BLOCK_START:
+			/* We need one byte of input to continue. */
+			if (b->in_pos == b->in_size)
+				return XZ_OK;
+
+			/* See if this is the beginning of the Index field. */
+			if (b->in[b->in_pos] == 0) {
+				s->in_start = b->in_pos++;
+				s->sequence = SEQ_INDEX;
+				break;
+			}
+
+			/*
+			 * Calculate the size of the Block Header and
+			 * prepare to decode it.
+			 */
+			s->block_header.size
+				= ((uint32_t)b->in[b->in_pos] + 1) * 4;
+
+			s->temp.size = s->block_header.size;
+			s->temp.pos = 0;
+			s->sequence = SEQ_BLOCK_HEADER;
+
+		case SEQ_BLOCK_HEADER:
+			if (!fill_temp(s, b))
+				return XZ_OK;
+
+			ret = dec_block_header(s);
+			if (ret != XZ_OK)
+				return ret;
+
+			s->sequence = SEQ_BLOCK_UNCOMPRESS;
+
+		case SEQ_BLOCK_UNCOMPRESS:
+			ret = dec_block(s, b);
+			if (ret != XZ_STREAM_END)
+				return ret;
+
+			s->sequence = SEQ_BLOCK_PADDING;
+
+		case SEQ_BLOCK_PADDING:
+			/*
+			 * Size of Compressed Data + Block Padding
+			 * must be a multiple of four. We don't need
+			 * s->block.compressed for anything else
+			 * anymore, so we use it here to test the size
+			 * of the Block Padding field.
+			 */
+			while (s->block.compressed & 3) {
+				if (b->in_pos == b->in_size)
+					return XZ_OK;
+
+				if (b->in[b->in_pos++] != 0)
+					return XZ_DATA_ERROR;
+
+				++s->block.compressed;
+			}
+
+			s->sequence = SEQ_BLOCK_CHECK;
+
+		case SEQ_BLOCK_CHECK:
+			if (s->has_crc32) {
+				ret = crc32_validate(s, b);
+				if (ret != XZ_STREAM_END)
+					return ret;
+			}
+
+			s->sequence = SEQ_BLOCK_START;
+			break;
+
+		case SEQ_INDEX:
+			ret = dec_index(s, b);
+			if (ret != XZ_STREAM_END)
+				return ret;
+
+			s->sequence = SEQ_INDEX_PADDING;
+
+		case SEQ_INDEX_PADDING:
+			while ((s->index.size + (b->in_pos - s->in_start))
+					& 3) {
+				if (b->in_pos == b->in_size) {
+					index_update(s, b);
+					return XZ_OK;
+				}
+
+				if (b->in[b->in_pos++] != 0)
+					return XZ_DATA_ERROR;
+			}
+
+			/* Finish the CRC32 value and Index size. */
+			index_update(s, b);
+
+			/* Compare the hashes to validate the Index field. */
+			if (! memeq(&s->block.hash, &s->index.hash, sizeof(s->block.hash)))
+				return XZ_DATA_ERROR;
+
+			s->sequence = SEQ_INDEX_CRC32;
+
+		case SEQ_INDEX_CRC32:
+			ret = crc32_validate(s, b);
+			if (ret != XZ_STREAM_END)
+				return ret;
+
+			s->temp.size = STREAM_HEADER_SIZE;
+			s->sequence = SEQ_STREAM_FOOTER;
+
+		case SEQ_STREAM_FOOTER:
+			if (!fill_temp(s, b))
+				return XZ_OK;
+
+			return dec_stream_footer(s);
+		}
+	}
+
+	/* Never reached */
+}
+
+/*
+ * xz_dec_run() is a wrapper for dec_main() to handle some special cases in
+ * multi-call and single-call decoding.
+ *
+ * In multi-call mode, we must return XZ_BUF_ERROR when it seems clear that we
+ * are not going to make any progress anymore. This is to prevent the caller
+ * from calling us infinitely when the input file is truncated or otherwise
+ * corrupt. Since zlib-style API allows that the caller fills the input buffer
+ * only when the decoder doesn't produce any new output, we have to be careful
+ * to avoid returning XZ_BUF_ERROR too easily: XZ_BUF_ERROR is returned only
+ * after the second consecutive call to xz_dec_run() that makes no progress.
+ *
+ * In single-call mode, if we couldn't decode everything and no error
+ * occurred, either the input is truncated or the output buffer is too small.
+ * Since we know that the last input byte never produces any output, we know
+ * that if all the input was consumed and decoding wasn't finished, the file
+ * must be corrupt. Otherwise the output buffer has to be too small or the
+ * file is corrupt in a way that decoding it produces too big output.
+ *
+ * If single-call decoding fails, we reset b->in_pos and b->out_pos back to
+ * their original values. This is because with some filter chains there won't
+ * be any valid uncompressed data in the output buffer unless the decoding
+ * actually succeeds (that's the price to pay of using the output buffer as
+ * the workspace).
+ */
+enum xz_ret xz_dec_run(struct xz_dec *s, struct xz_buf *b)
+{
+	size_t in_start;
+	size_t out_start;
+	enum xz_ret ret;
+
+	if (s->single_call)
+		xz_dec_reset(s);
+
+	in_start = b->in_pos;
+	out_start = b->out_pos;
+	ret = dec_main(s, b);
+
+	if (s->single_call) {
+		if (ret == XZ_OK)
+			ret = b->in_pos == b->in_size
+					? XZ_DATA_ERROR : XZ_BUF_ERROR;
+
+		if (ret != XZ_STREAM_END) {
+			b->in_pos = in_start;
+			b->out_pos = out_start;
+		}
+
+	} else if (ret == XZ_OK && in_start == b->in_pos
+			&& out_start == b->out_pos) {
+		if (s->allow_buf_error)
+			ret = XZ_BUF_ERROR;
+
+		s->allow_buf_error = true;
+	} else {
+		s->allow_buf_error = false;
+	}
+
+	return ret;
+}
+
+struct xz_dec * xz_dec_init(uint32_t dict_max)
+{
+	struct xz_dec *s = kmalloc(sizeof(*s), GFP_KERNEL);
+	if (s == NULL)
+		return NULL;
+
+	/* prepare CRC32 calculators */
+	if(GRUB_MD_CRC32 == NULL)
+	{
+		kfree(s);
+		return NULL;
+	}
+
+	s->crc32_context = kmalloc(GRUB_MD_CRC32->contextsize, GFP_KERNEL);
+	if (s->crc32_context == NULL)
+	{
+		kfree(s);
+		return NULL;
+	}
+
+	s->index.hash.crc32_context = kmalloc(GRUB_MD_CRC32->contextsize, GFP_KERNEL);
+	if (s->index.hash.crc32_context == NULL)
+	{
+		kfree(s->crc32_context);
+		kfree(s);
+		return NULL;
+	}
+
+	s->block.hash.crc32_context = kmalloc(GRUB_MD_CRC32->contextsize, GFP_KERNEL);
+	if (s->block.hash.crc32_context == NULL)
+	{
+		kfree(s->index.hash.crc32_context);
+		kfree(s->crc32_context);
+		kfree(s);
+		return NULL;
+	}
+
+
+	GRUB_MD_CRC32->init(s->crc32_context);
+	s->crc32_temp = 0;
+	GRUB_MD_CRC32->init(s->index.hash.crc32_context);
+	GRUB_MD_CRC32->init(s->block.hash.crc32_context);
+
+
+	s->single_call = dict_max == 0;
+
+#ifdef XZ_DEC_BCJ
+	s->bcj = xz_dec_bcj_create(s->single_call);
+	if (s->bcj == NULL)
+		goto error_bcj;
+#endif
+
+	s->lzma2 = xz_dec_lzma2_create(dict_max);
+	if (s->lzma2 == NULL)
+		goto error_lzma2;
+
+	xz_dec_reset(s);
+	return s;
+
+error_lzma2:
+#ifdef XZ_DEC_BCJ
+	xz_dec_bcj_end(s->bcj);
+error_bcj:
+#endif
+	kfree(s);
+	return NULL;
+}
+
+void xz_dec_reset(struct xz_dec *s)
+{
+	s->sequence = SEQ_STREAM_HEADER;
+	s->allow_buf_error = false;
+	s->pos = 0;
+
+	memzero(&s->block, sizeof(s->block));
+	memzero(&s->index, sizeof(s->index));
+	s->temp.pos = 0;
+	s->temp.size = STREAM_HEADER_SIZE;
+
+	GRUB_MD_CRC32->init(s->crc32_context);
+	s->crc32_temp = 0;
+	GRUB_MD_CRC32->init(s->index.hash.crc32_context);
+	GRUB_MD_CRC32->init(s->block.hash.crc32_context);
+
+}
+
+void xz_dec_end(struct xz_dec *s)
+{
+	if (s != NULL) {
+		xz_dec_lzma2_end(s->lzma2);
+#ifdef XZ_DEC_BCJ
+		xz_dec_bcj_end(s->bcj);
+#endif
+		kfree(s);
+	}
+}
diff --git a/grub-core/lib/xzembed/xz_lzma2.h b/grub-core/lib/xzembed/xz_lzma2.h
new file mode 100644
index 000000000..15e553dc0
--- /dev/null
+++ b/grub-core/lib/xzembed/xz_lzma2.h
@@ -0,0 +1,236 @@
+/* xz_lzma2.h - LZMA2 definitions */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+/*
+ * This file is based on code from XZ embedded project
+ * http://tukaani.org/xz/embedded.html
+ */
+
+#ifndef XZ_LZMA2_H
+#define XZ_LZMA2_H
+
+/* dictionary size hard limit
+ * actual size limit is calculated as shown in 5.3.1
+ * http://tukaani.org/xz/xz-file-format.txt
+ *
+ * if bits > 39 dictionary_size = UINT32_MAX
+ * else
+ * dictionary_size = 2 | (bits & 1);
+ * dictionary_size <<= bits / 2 + 11;
+ *
+ * i.e.
+ * 0  - 4 KiB
+ * 6  - 32 KiB
+ * 30 - 128MiB
+ * 39 - 3072 MiB
+ * 40 - 4096 MiB - 1 B
+ * note: implementation supports 39 at maximum
+ */
+#define DICT_BIT_SIZE 30
+
+/* Range coder constants */
+#define RC_SHIFT_BITS 8
+#define RC_TOP_BITS 24
+#define RC_TOP_VALUE (1 << RC_TOP_BITS)
+#define RC_BIT_MODEL_TOTAL_BITS 11
+#define RC_BIT_MODEL_TOTAL (1 << RC_BIT_MODEL_TOTAL_BITS)
+#define RC_MOVE_BITS 5
+
+/*
+ * Maximum number of position states. A position state is the lowest pb
+ * number of bits of the current uncompressed offset. In some places there
+ * are different sets of probabilities for different position states.
+ */
+#define POS_STATES_MAX (1 << 4)
+
+/*
+ * This enum is used to track which LZMA symbols have occurred most recently
+ * and in which order. This information is used to predict the next symbol.
+ *
+ * Symbols:
+ *  - Literal: One 8-bit byte
+ *  - Match: Repeat a chunk of data at some distance
+ *  - Long repeat: Multi-byte match at a recently seen distance
+ *  - Short repeat: One-byte repeat at a recently seen distance
+ *
+ * The symbol names are in from STATE_oldest_older_previous. REP means
+ * either short or long repeated match, and NONLIT means any non-literal.
+ */
+enum lzma_state {
+	STATE_LIT_LIT,
+	STATE_MATCH_LIT_LIT,
+	STATE_REP_LIT_LIT,
+	STATE_SHORTREP_LIT_LIT,
+	STATE_MATCH_LIT,
+	STATE_REP_LIT,
+	STATE_SHORTREP_LIT,
+	STATE_LIT_MATCH,
+	STATE_LIT_LONGREP,
+	STATE_LIT_SHORTREP,
+	STATE_NONLIT_MATCH,
+	STATE_NONLIT_REP
+};
+
+/* Total number of states */
+#define STATES 12
+
+/* The lowest 7 states indicate that the previous state was a literal. */
+#define LIT_STATES 7
+
+/* Indicate that the latest symbol was a literal. */
+static inline void lzma_state_literal(enum lzma_state *state)
+{
+	if (*state <= STATE_SHORTREP_LIT_LIT)
+		*state = STATE_LIT_LIT;
+	else if (*state <= STATE_LIT_SHORTREP)
+		*state -= 3;
+	else
+		*state -= 6;
+}
+
+/* Indicate that the latest symbol was a match. */
+static inline void lzma_state_match(enum lzma_state *state)
+{
+	*state = *state < LIT_STATES ? STATE_LIT_MATCH : STATE_NONLIT_MATCH;
+}
+
+/* Indicate that the latest state was a long repeated match. */
+static inline void lzma_state_long_rep(enum lzma_state *state)
+{
+	*state = *state < LIT_STATES ? STATE_LIT_LONGREP : STATE_NONLIT_REP;
+}
+
+/* Indicate that the latest symbol was a short match. */
+static inline void lzma_state_short_rep(enum lzma_state *state)
+{
+	*state = *state < LIT_STATES ? STATE_LIT_SHORTREP : STATE_NONLIT_REP;
+}
+
+/* Test if the previous symbol was a literal. */
+static inline bool lzma_state_is_literal(enum lzma_state state)
+{
+	return state < LIT_STATES;
+}
+
+/* Each literal coder is divided in three sections:
+ *   - 0x001-0x0FF: Without match byte
+ *   - 0x101-0x1FF: With match byte; match bit is 0
+ *   - 0x201-0x2FF: With match byte; match bit is 1
+ *
+ * Match byte is used when the previous LZMA symbol was something else than
+ * a literal (that is, it was some kind of match).
+ */
+#define LITERAL_CODER_SIZE 0x300
+
+/* Maximum number of literal coders */
+#define LITERAL_CODERS_MAX (1 << 4)
+
+/* Minimum length of a match is two bytes. */
+#define MATCH_LEN_MIN 2
+
+/* Match length is encoded with 4, 5, or 10 bits.
+ *
+ * Length   Bits
+ *  2-9      4 = Choice=0 + 3 bits
+ * 10-17     5 = Choice=1 + Choice2=0 + 3 bits
+ * 18-273   10 = Choice=1 + Choice2=1 + 8 bits
+ */
+#define LEN_LOW_BITS 3
+#define LEN_LOW_SYMBOLS (1 << LEN_LOW_BITS)
+#define LEN_MID_BITS 3
+#define LEN_MID_SYMBOLS (1 << LEN_MID_BITS)
+#define LEN_HIGH_BITS 8
+#define LEN_HIGH_SYMBOLS (1 << LEN_HIGH_BITS)
+#define LEN_SYMBOLS (LEN_LOW_SYMBOLS + LEN_MID_SYMBOLS + LEN_HIGH_SYMBOLS)
+
+/*
+ * Maximum length of a match is 273 which is a result of the encoding
+ * described above.
+ */
+#define MATCH_LEN_MAX (MATCH_LEN_MIN + LEN_SYMBOLS - 1)
+
+/*
+ * Different sets of probabilities are used for match distances that have
+ * very short match length: Lengths of 2, 3, and 4 bytes have a separate
+ * set of probabilities for each length. The matches with longer length
+ * use a shared set of probabilities.
+ */
+#define DIST_STATES 4
+
+/*
+ * Get the index of the appropriate probability array for decoding
+ * the distance slot.
+ */
+static inline uint32_t lzma_get_dist_state(uint32_t len)
+{
+	return len < DIST_STATES + MATCH_LEN_MIN
+			? len - MATCH_LEN_MIN : DIST_STATES - 1;
+}
+
+/*
+ * The highest two bits of a 32-bit match distance are encoded using six bits.
+ * This six-bit value is called a distance slot. This way encoding a 32-bit
+ * value takes 6-36 bits, larger values taking more bits.
+ */
+#define DIST_SLOT_BITS 6
+#define DIST_SLOTS (1 << DIST_SLOT_BITS)
+
+/* Match distances up to 127 are fully encoded using probabilities. Since
+ * the highest two bits (distance slot) are always encoded using six bits,
+ * the distances 0-3 don't need any additional bits to encode, since the
+ * distance slot itself is the same as the actual distance. DIST_MODEL_START
+ * indicates the first distance slot where at least one additional bit is
+ * needed.
+ */
+#define DIST_MODEL_START 4
+
+/*
+ * Match distances greater than 127 are encoded in three pieces:
+ *   - distance slot: the highest two bits
+ *   - direct bits: 2-26 bits below the highest two bits
+ *   - alignment bits: four lowest bits
+ *
+ * Direct bits don't use any probabilities.
+ *
+ * The distance slot value of 14 is for distances 128-191.
+ */
+#define DIST_MODEL_END 14
+
+/* Distance slots that indicate a distance <= 127. */
+#define FULL_DISTANCES_BITS (DIST_MODEL_END / 2)
+#define FULL_DISTANCES (1 << FULL_DISTANCES_BITS)
+
+/*
+ * For match distances greater than 127, only the highest two bits and the
+ * lowest four bits (alignment) is encoded using probabilities.
+ */
+#define ALIGN_BITS 4
+#define ALIGN_SIZE (1 << ALIGN_BITS)
+#define ALIGN_MASK (ALIGN_SIZE - 1)
+
+/* Total number of all probability variables */
+#define PROBS_TOTAL (1846 + LITERAL_CODERS_MAX * LITERAL_CODER_SIZE)
+
+/*
+ * LZMA remembers the four most recent match distances. Reusing these
+ * distances tends to take less space than re-encoding the actual
+ * distance value.
+ */
+#define REPS 4
+
+#endif
diff --git a/grub-core/lib/xzembed/xz_private.h b/grub-core/lib/xzembed/xz_private.h
new file mode 100644
index 000000000..fc845c92d
--- /dev/null
+++ b/grub-core/lib/xzembed/xz_private.h
@@ -0,0 +1,96 @@
+/* xz_private.h - Private includes and definitions */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+/*
+ * This file is based on code from XZ embedded project
+ * http://tukaani.org/xz/embedded.html
+ */
+
+#ifndef XZ_PRIVATE_H
+#define XZ_PRIVATE_H
+
+/*
+ * For userspace builds, use a separate header to define the required
+ * macros and functions. This makes it easier to adapt the code into
+ * different environments and avoids clutter in the Linux kernel tree.
+ */
+#include "xz_config.h"
+
+/*
+ * If any of the BCJ filter decoders are wanted, define XZ_DEC_BCJ.
+ * XZ_DEC_BCJ is used to enable generic support for BCJ decoders.
+ */
+#ifndef XZ_DEC_BCJ
+#	if defined(XZ_DEC_X86) || defined(XZ_DEC_POWERPC) \
+			|| defined(XZ_DEC_IA64) || defined(XZ_DEC_ARM) \
+			|| defined(XZ_DEC_ARM) || defined(XZ_DEC_ARMTHUMB) \
+			|| defined(XZ_DEC_SPARC)
+#		define XZ_DEC_BCJ
+#	endif
+#endif
+
+/*
+ * Allocate memory for LZMA2 decoder. xz_dec_lzma2_reset() must be used
+ * before calling xz_dec_lzma2_run().
+ */
+struct xz_dec_lzma2 * xz_dec_lzma2_create(
+		uint32_t dict_max);
+
+/*
+ * Decode the LZMA2 properties (one byte) and reset the decoder. Return
+ * XZ_OK on success, XZ_MEMLIMIT_ERROR if the preallocated dictionary is not
+ * big enough, and XZ_OPTIONS_ERROR if props indicates something that this
+ * decoder doesn't support.
+ */
+enum xz_ret xz_dec_lzma2_reset(
+		struct xz_dec_lzma2 *s, uint8_t props);
+
+/* Decode raw LZMA2 stream from b->in to b->out. */
+enum xz_ret xz_dec_lzma2_run(
+		struct xz_dec_lzma2 *s, struct xz_buf *b);
+
+/* Free the memory allocated for the LZMA2 decoder. */
+void xz_dec_lzma2_end(struct xz_dec_lzma2 *s);
+
+/*
+ * Allocate memory for BCJ decoders. xz_dec_bcj_reset() must be used before
+ * calling xz_dec_bcj_run().
+ */
+struct xz_dec_bcj * xz_dec_bcj_create(bool single_call);
+
+/*
+ * Decode the Filter ID of a BCJ filter. This implementation doesn't
+ * support custom start offsets, so no decoding of Filter Properties
+ * is needed. Returns XZ_OK if the given Filter ID is supported.
+ * Otherwise XZ_OPTIONS_ERROR is returned.
+ */
+enum xz_ret xz_dec_bcj_reset(
+		struct xz_dec_bcj *s, uint8_t id);
+
+/*
+ * Decode raw BCJ + LZMA2 stream. This must be used only if there actually is
+ * a BCJ filter in the chain. If the chain has only LZMA2, xz_dec_lzma2_run()
+ * must be called directly.
+ */
+enum xz_ret xz_dec_bcj_run(struct xz_dec_bcj *s,
+		struct xz_dec_lzma2 *lzma2, struct xz_buf *b);
+
+/* Free the memory allocated for the BCJ filters. */
+#define xz_dec_bcj_end(s) kfree(s)
+
+#endif
diff --git a/grub-core/lib/xzembed/xz_stream.h b/grub-core/lib/xzembed/xz_stream.h
new file mode 100644
index 000000000..f58397a15
--- /dev/null
+++ b/grub-core/lib/xzembed/xz_stream.h
@@ -0,0 +1,53 @@
+/* xz_stream.h - Definitions for handling the .xz file format */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/>.
+ */
+/*
+ * This file is based on code from XZ embedded project
+ * http://tukaani.org/xz/embedded.html
+ */
+
+#ifndef XZ_STREAM_H
+#define XZ_STREAM_H
+
+/*
+ * See the .xz file format specification at
+ * http://tukaani.org/xz/xz-file-format.txt
+ * to understand the container format.
+ */
+
+#define STREAM_HEADER_SIZE 12
+
+#define HEADER_MAGIC "\3757zXZ\0"
+#define HEADER_MAGIC_SIZE 6
+
+#define FOOTER_MAGIC "YZ"
+#define FOOTER_MAGIC_SIZE 2
+
+/*
+ * Variable-length integer can hold a 63-bit unsigned integer, or a special
+ * value to indicate that the value is unknown.
+ */
+typedef uint64_t vli_type;
+
+#define VLI_MAX ((vli_type)-1 / 2)
+#define VLI_UNKNOWN ((vli_type)-1)
+
+/* Maximum encoded size of a VLI */
+#define VLI_BYTES_MAX (sizeof(vli_type) * 8 / 7)
+
+#endif
diff --git a/include/grub/file.h b/include/grub/file.h
index 0986c98b8..72cd45468 100644
--- a/include/grub/file.h
+++ b/include/grub/file.h
@@ -55,9 +55,10 @@ typedef struct grub_file *grub_file_t;
 typedef enum grub_file_filter_id
   {
     GRUB_FILE_FILTER_GZIO,
+    GRUB_FILE_FILTER_XZIO,
     GRUB_FILE_FILTER_MAX,
     GRUB_FILE_FILTER_COMPRESSION_FIRST = GRUB_FILE_FILTER_GZIO,
-    GRUB_FILE_FILTER_COMPRESSION_LAST = GRUB_FILE_FILTER_GZIO,
+    GRUB_FILE_FILTER_COMPRESSION_LAST = GRUB_FILE_FILTER_XZIO,
   } grub_file_filter_id_t;
 
 typedef grub_file_t (*grub_file_filter_t) (grub_file_t in);

From 506e9a1ce0423e948c2feb11aa805ff68b3673b5 Mon Sep 17 00:00:00 2001
From: Colin D Bennett <colin@gibibit.com>
Date: Sun, 5 Sep 2010 20:04:10 +0200
Subject: [PATCH 1545/1628] 	Gfxmenu documentation.

	* docs/grub.texi (Theme file format): New chapter.
---
 ChangeLog      |   6 +
 docs/grub.texi | 360 ++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 362 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 104ca1ed0..a425f9e84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-05  Colin D Bennett  <colin@gibibit.com>
+
+	Gfxmenu documentation.
+
+	* docs/grub.texi (Theme file format): New chapter.
+
 2010-09-05  Szymon Janc <szymon@janc.net.pl>
 
 	* grub-core/Makefile.core.def (xzio): New module.
diff --git a/docs/grub.texi b/docs/grub.texi
index fb0907a59..19f095d02 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -47,6 +47,7 @@ Invariant Sections.
 @author Gordon Matzigkeit
 @author Yoshinori K. Okuji
 @author Colin Watson
+@author Colin D. Bennett
 @c The following two commands start the copyright page.
 @page
 @vskip 0pt plus 1filll
@@ -78,6 +79,7 @@ This edition documents version @value{VERSION}.
 * Installation::                Installing GRUB on your drive
 * Booting::                     How to boot different operating systems
 * Configuration::               Writing your own configuration file
+* Theme file format::           Format of GRUB theme files
 * Network::                     Downloading OS images from a network
 * Serial terminal::             Using GRUB via a serial line
 * Vendor power-on keys::        Changing GRUB behaviour on vendor power-on keys
@@ -965,7 +967,6 @@ need to write the whole thing by hand.
 * Simple configuration::        Recommended for most users
 * Shell-like scripting::        For power users and developers
 * Embedded configuration::      Embedding a configuration file into GRUB
-* Themes::                      Graphical menu themes
 @end menu
 
 
@@ -1127,7 +1128,6 @@ The image will be scaled if necessary to fit the screen.
 
 @item GRUB_THEME
 Set a theme for use with the @samp{gfxterm} graphical terminal.
-@xref{Themes}.
 
 @item GRUB_GFXPAYLOAD_LINUX
 Set to @samp{text} to force the Linux kernel to boot in normal text mode,
@@ -1373,9 +1373,361 @@ fi
 The embedded configuration file may not contain menu entries directly, but
 may only read them from elsewhere using @command{configfile}.
 
+@node Theme file format
+@chapter Theme file format
+@section Introduction
+The GRUB graphical menu supports themes that can customize the layout and
+appearance of the GRUB boot menu.  The theme is configured through a plain
+text file that specifies the layout of the various GUI components (including
+the boot menu, timeout progress bar, and text messages) as well as the
+appearance using colors, fonts, and images. Example is available in docs/example_theme.txt
+
+@section Theme Elements
+@subsection Colors
+
+Colors can be specified in several ways:
+
+@itemize
+@item HTML-style ``#RRGGBB'' or ``#RGB'' format, where *R*, *G*, and *B* are hexadecimal digits (e.g., ``#8899FF'')
+@item as comma-separated decimal RGB values (e.g., ``128, 128, 255'')
+@item with ``SVG 1.0 color names'' (e.g., ``cornflowerblue'') which must be specified in lowercase.
+@end itemize
+@subsection Fonts
+The fonts GRUB uses ``PFF2 font format'' bitmap fonts.  Fonts are specified
+with full font names.  Currently there is no
+provision for a preference list of fonts, or deriving one font from another.
+Fonts are loaded with the ``loadfont'' command in GRUB.  To see the list of
+loaded fonts, execute the ``lsfonts'' command.  If there are too many fonts to
+fit on screen, do ``set pager=1'' before executing ``lsfonts''.
+
+
+@subsection Progress Bar
+
+@float Figure, Pixmap-styled progress bar
+@c @image{Theme_progress_bar,,,,.png}
+@end float
+
+@float Figure, Plain progress bar, drawn with solid color.
+@c @image{Theme_progress_bar_filled,,,,.png}
+@end float
+
+Progress bars are used to display the remaining time before GRUB boots the
+default menu entry.  To create a progress bar that will display the remaining
+time before automatic boot, simply create a ``progress_bar'' component with
+the id ``__timeout__''.  This indicates to GRUB that the progress bar should
+be updated as time passes, and it should be made invisible if the countdown to
+automatic boot is interrupted by the user.
+
+Progress bars may optionally have text displayed on them.  This is controlled
+through the ``show_text'' property, which can be set to either ``true'' or
+``false'' to control whether text is displayed.  When GRUB is counting down to
+automatic boot, the text informs the user of the number of seconds remaining.
+
+
+@subsection Circular Progress Indicator
+
+@c @image{Theme_circular_progress,,,,.png}
+
+The circular progress indicator functions similarly to the progress bar.  When
+given an id of ``__timeout__'', GRUB updates the circular progress indicator's
+value to indicate the time remaining.  For the circular progress indicator,
+there are two images used to render it:  the *center* image, and the *tick*
+image.  The center image is rendered in the center of the component, while the
+tick image is used to render each mark along the circumference of the
+indicator.
+
+
+@subsection Labels
+
+Text labels can be placed on the boot screen.  The font, color, and horizontal
+alignment can be specified for labels.  If a label is given the id
+``__timeout__'', then the ``text'' property for that label is also updated
+with a message informing the user of the number of seconds remaining until
+automatic boot.  This is useful in case you want the text displayed somewhere
+else instead of directly on the progress bar.
+
+
+@subsection Boot Menu
+
+@c @image{Theme_boot_menu,,,,.png}
+
+The boot menu where GRUB displays the menu entries from the ``grub.cfg'' file.
+It is a list of items, where each item has a title and an optional icon.  The
+icon is selected based on the *classes* specified for the menu entry.  If
+there is a PNG file named ``myclass.png'' in the ``grub/themes/icons''
+directory, it will be displayed for items which have the class *myclass*.  The
+boot menu can be customized in several ways, such as the font and color used
+for the menu entry title, and by specifying styled boxes for the menu itself
+and for the selected item highlight.
+
+
+@subsection Styled Boxes
+
+One of the most important features for customizing the layout is the use of
+ *styled boxes*.  A styled box is composed of 9 rectangular (and potentially
+empty) regions, which are used to seamlessly draw the styled box on screen:
+
+@float Figure, The 9 slices that make up a box.  The abbreviation below each name is used to identify the image for that slice.
+@c @image{Box_slice_names,,,,.png}
+@end float
+
+
+To support any size of box on screen, the center slice and the slices for the
+top, bottom, and sides are all scaled to the correct size for the component on
+screen, using the following rules:
+
+@enumerate
+@item The edge slices (north, south, east, and west) are scaled in the direction of the edge they are adjacent to.  For instance, the west slice is scaled vertically.
+@item The corner slices (northwest, northeast, southeast, and southwest) are not scaled.
+@item The center slice is scaled to fill the remaining space in the middle.
+@end enumerate
+
+As an example of how an image might be sliced up, consider the styled box
+used for a terminal view.
+
+@float Figure, An example of the slices (in red) used for a terminal window. This drawing was created and sliced in Inkscape_, as the next section explains.
+@c @image{Box_slice_example_terminal,,,,.png}
+@end float
+   
+@subsection Creating Styled Box Images
+
+The Inkscape_ scalable vector graphics editor is a very useful tool for
+creating styled box images.  One process that works well for slicing a drawing
+into the necessary image slices is:
+
+@enumerate
+@item Create or open the drawing you'd like use.
+@item Create a new layer on the top of the layer stack.  Make it visible.  Select this layer as the current layer.
+@item Draw 9 rectangles on your drawing where you'd like the slices to be.  Clear the fill option, and set the stroke to 1 pixel wide solid stroke.  The corners of the slices must meet precisely; if it is off by a single pixel, it will probably be evident when the styled box is rendered in the GRUB menu.  You should probably go to File | Document Properties | Grids and enable a grid or create a guide (click on one of the rulers next to the drawing and drag over the drawing; release the mouse button to place the guide) to help place the rectangles precisely.
+@item Right click on the center slice rectangle and choose Object Properties. Change the "Id" to ``slice_c`` and click Set.  Repeat this for the remaining 8 rectangles, giving them Id values of ``slice_n``, ``slice_ne``, ``slice_e``, and so on according to the location.
+@item Save the drawing.
+@item Select all the slice rectangles.  With the slice layer selected, you can simply press Ctrl+A to select all rectangles.  The status bar should indicate that 9 rectangles are selected.
+@item Click the layer hide icon for the slice layer in the layer palette.  The rectangles will remain selected, even though they are hidden.
+@item Choose File | Export Bitmap and check the *Batch export 9 selected objects* box.  Make sure that *Hide all except selected* is unchecked. click *Export*.  This will create PNG files in the same directory as the drawing, named after the slices.  These can now be used for a styled box in a GRUB theme.
+@end enumerate
+
+@section Theme File Manual
+
+The theme file is a plain text file.  Lines that begin with ``#`` are ignored
+and considered comments.  (Note: This may not be the case if the previous line
+ended where a value was expected.)
+
+The theme file contains two types of statements:
+@enumerate
+@item Global properties.
+@item Component construction.
+@end enumerate
+
+@subsection Global Properties
+
+@subsection Format
+
+Global properties are specified with the simple format:
+@itemize
+@item name1: value1
+@item name2: "value which may contain spaces"
+@item name3: #88F
+@end itemize
+
+In this example, name3 is assigned a color value.
+
+
+@subsection Global Property List
+
+@multitable @columnfractions 0.3 0.6
+@item title-text @tab Specifies the text to display at the top center of the screen as a title.
+@item title-font @tab Defines the font used for the title message at the top of the screen.
+@item title-color @tab Defines the color of the title message.
+@item message-font @tab Defines the font used for messages, such as when GRUB is unable to automatically boot an entry.
+@item message-color @tab Defines the color of the message text.
+@item message-bg-color @tab Defines the background color of the message text area.
+@item desktop-image @tab Specifies the image to use as the background.  It will be scaled to fit the screen size.
+@item desktop-color @tab Specifies the color for the background if *desktop-image* is not specified.
+@item terminal-box @tab Specifies the file name pattern for the styled box slices used for the command line terminal window.  For example, ``terminal-box: terminal_*.png'' will use the images ``terminal_c.png`` as the center area, ``terminal_n.png`` as the north (top) edge, ``terminal_nw.png`` as the northwest (upper left) corner, and so on.  If the image for any slice is not found, it will simply be left empty.
+@end multitable
+
+
+@subsection Component Construction
+
+Greater customizability comes is provided by components.  A tree of components
+forms the user interface.  *Containers* are components that can contain other
+components, and there is always a single root component which is an instance
+of a *canvas* container.
+
+Components are created in the theme file by prefixing the type of component
+with a '+' sign:
+
+@verbatim
+   + label { text="GRUB" font="aqui 11" color="#8FF" }
+@end verbatim
+
+properties of a component are specified as "name = value" (whitespace
+surrounding tokens is optional and is ignored) where *value* may be:
+@itemize
+@item a single word (e.g., ``align = center``, ``color = #FF8080``),
+@item a quoted string (e.g., ``text = "Hello, World!"``), or
+@item a tuple (e.g., ``preferred_size = (120, 80)``).
+@end itemize
+
+@subsection Component List
+
+The following is a list of the components and the properties they support.
+
+@itemize
+@item label
+   A label displays a line of text.
+   
+   Properties:
+   @multitable @columnfractions 0.2 0.7
+   @item text @tab The text to display.
+   @item font @tab The font to use for text display.
+   @item color @tab The color of the text.
+   @item align @tab The horizontal alignment of the text within the component. Options are ``left``, ``center``, and ``right``.
+   @end multitable
+
+@item image
+   A component that displays an image.  The image is scaled to fit the
+   component, although the preferred size defaults to the image's original
+   size unless the ``preferred_size`` property is explicitly set.
+
+   Properties:
+
+   @multitable @columnfractions 0.2 0.7
+   @item file @tab The full path to the image file to load.
+   @end multitable
+
+@item progress_bar
+   Displays a horizontally oriented progress bar.  It can be rendered using
+   simple solid filled rectangles, or using a pair of pixmap styled boxes.
+
+   Properties:
+
+   @multitable @columnfractions 0.2 0.7
+   @item fg_color @tab The foreground color for plain solid color rendering.
+   @item bg_color @tab The background color for plain solid color rendering.
+   @item border_color @tab The border color for plain solid color rendering.
+   @item text_color @tab The text color.
+   @item show_text @tab Boolean value indicating whether or not text should be displayed on the progress bar.  If set to *false*, then no text will be displayed on the bar.  If set to any other value, text will be displayed on the bar.
+   @item bar_style @tab The styled box specification for the frame of the progress bar. Example: ``progress_frame_*.png``
+   @item highlight_style @tab The styled box specification for the highlighted region of the progress bar. This box will be used to paint just the highlighted region of the bar, and will be increased in size as the bar nears completion. Example: ``progress_hl_*.png``.
+   @item text @tab The text to display on the progress bar.  If the progress bar's ID is set to ``__timeout__``, then GRUB will updated this property with an informative message as the timeout approaches.
+   @item value @tab The progress bar current value.  Normally not set manually.
+   @item start @tab The progress bar start value.  Normally not set manually.
+   @item end @tab The progress bar end value.  Normally not set manually.
+   @end multitable
+
+@item circular_progress
+   Displays a circular progress indicator.  The appearance of this component
+   is determined by two images:  the *center* image and the *tick* image.  The
+   center image is generally larger and will be drawn in the center of the
+   component.  Around the circumference of a circle within the component, the
+   tick image will be drawn a certain number of times, depending on the
+   properties of the component.
+
+   Properties:
+
+   @multitable @columnfractions 0.3 0.6
+   @item center_bitmap
+      @tab The file name of the image to draw in the center of the component.
+   @item tick_bitmap
+      @tab The file name of the image to draw for the tick marks.
+   @item num_ticks
+      @tab The number of ticks that make up a full circle.
+   @item ticks_disappear
+      @tab Boolean value indicating whether tick marks should progressively appear,
+      or progressively disappear as *value* approaches *end*.  Specify
+      ``true`` or ``false``.
+   @item value
+      @tab The progress indicator current value.  Normally not set manually.
+   @item start
+      @tab The progress indicator start value.  Normally not set manually.
+   @item end
+      @tab The progress indicator end value.  Normally not set manually.
+   @end multitable
+@item boot_menu
+   Displays the GRUB boot menu.  It allows selecting items and executing them.
+
+   Properties:
+
+   @multitable @columnfractions 0.4 0.5
+   @item item_font
+      @tab The font to use for the menu item titles.
+   @item selected_item_font
+      @tab The font to use for the selected menu item, or ``inherit`` (the default)
+      to use ``item_font`` for the selected menu item as well.
+   @item item_color
+      @tab The color to use for the menu item titles.
+   @item selected_item_color
+      @tab The color to use for the selected menu item, or ``inherit`` (the default)
+      to use ``item_color`` for the selected menu item as well.
+   @item icon_width
+      @tab The width of menu item icons.  Icons are scaled to the specified size.
+   @item icon_height
+      @tab The height of menu item icons.
+   @item item_height
+      @tab The height of each menu item in pixels.
+   @item item_padding
+      @tab The amount of space in pixels to leave on each side of the menu item
+      contents.
+   @item item_icon_space
+      @tab The space between an item's icon and the title text, in pixels.
+   @item item_spacing
+      @tab The amount of space to leave between menu items, in pixels.
+   @item menu_pixmap_style
+      @tab The image file pattern for the menu frame styled box.
+      Example:  ``menu_*.png`` (this will use images such as ``menu_c.png``,
+      ``menu_w.png``, `menu_nw.png``, etc.)
+   @item selected_item_pixmap_style
+      @tab The image file pattern for the selected item highlight styled box.
+   @item scrollbar
+      @tab Boolean value indicating whether the scroll bar should be drawn if the
+      frame and thumb styled boxes are configured.
+   @item scrollbar_frame
+      @tab The image file pattern for the entire scroll bar.
+      Example:  ``scrollbar_*.png``
+   @item scrollbar_thumb
+      @tab The image file pattern for the scroll bar thumb (the part of the scroll
+      bar that moves as scrolling occurs).
+      Example:  ``scrollbar_thumb_*.png``
+   @item max_items_shown
+      @tab The maximum number of items to show on the menu.  If there are more than
+      *max_items_shown* items in the menu, the list will scroll to make all
+      items accessible.
+   @end multitable
+
+@item canvas
+   Canvas is a container that allows manual placement of components within it.
+   It does not alter the positions of its child components.  It assigns all
+   child components their preferred sizes.
+
+@item hbox
+   The *hbox* container lays out its children from left to right, giving each
+   one its preferred width.  The height of each child is set to the maximum of
+   the preferred heights of all children.
+   
+@item vbox
+   The *vbox* container lays out its children from top to bottom, giving each
+   one its preferred height.  The width of each child is set to the maximum of
+   the preferred widths of all children.
+@end itemize
+
+
+@subsection Common properties
+
+The following properties are supported by all components:
+@itemize
+
+@item id
+   The identifier for the component.  This can be any arbitrary string.
+   The ID can be used by scripts to refer to various components in the GUI
+   component tree.  Currently, there is one special ID value that GRUB
+   recognizes:
+
+   @multitable @columnfractions 0.2 0.7
+   @item ``__timeout__`` @tab Any component with this ID will have its *text*, *start*, *end*, *value*, and *visible* properties set by GRUB when it is counting down to an automatic boot of the default menu entry.
+   @end multitable
+@end itemize
 
-@node Themes
-@section Graphical menu themes
 
 
 @node Network

From fc157e539c1c7a81725a917e74524da7c362f183 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 5 Sep 2010 20:17:34 +0200
Subject: [PATCH 1546/1628] 	* docs/grub.texi (Theme file format): Replace
 Box_slice_names.png with 	a table. Use @code instead of @verbatim.

---
 ChangeLog      |  5 +++++
 docs/grub.texi | 13 ++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a425f9e84..c71503035 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* docs/grub.texi (Theme file format): Replace Box_slice_names.png with
+	a table. Use @code instead of @verbatim.
+
 2010-09-05  Colin D Bennett  <colin@gibibit.com>
 
 	Gfxmenu documentation.
diff --git a/docs/grub.texi b/docs/grub.texi
index 19f095d02..825e65adf 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1467,10 +1467,11 @@ One of the most important features for customizing the layout is the use of
  *styled boxes*.  A styled box is composed of 9 rectangular (and potentially
 empty) regions, which are used to seamlessly draw the styled box on screen:
 
-@float Figure, The 9 slices that make up a box.  The abbreviation below each name is used to identify the image for that slice.
-@c @image{Box_slice_names,,,,.png}
-@end float
-
+@multitable @columnfractions 0.3 0.3 0.3
+@item Northwest (nw) @tab North (n)  @tab Northeast (ne)
+@item West (w)       @tab Center (c) @tab East (e)
+@item Southwest (sw) @tab South (s)  @tab Southeast (se)
+@end multitable
 
 To support any size of box on screen, the center slice and the slices for the
 top, bottom, and sides are all scaled to the correct size for the component on
@@ -1557,9 +1558,7 @@ of a *canvas* container.
 Components are created in the theme file by prefixing the type of component
 with a '+' sign:
 
-@verbatim
-   + label { text="GRUB" font="aqui 11" color="#8FF" }
-@end verbatim
+@code{   + label @{ text="GRUB" font="aqui 11" color="#8FF" @} }
 
 properties of a component are specified as "name = value" (whitespace
 surrounding tokens is optional and is ignored) where *value* may be:

From d7e06c1f0ba1f1fee3bfc3c97b25dae2ce3a1ee7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 5 Sep 2010 20:33:03 +0200
Subject: [PATCH 1547/1628] 	* docs/grub.texi (Theme file format): Document
 new position format.

---
 ChangeLog      |  4 ++++
 docs/grub.texi | 20 ++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c71503035..04c526d98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* docs/grub.texi (Theme file format): Document new position format.
+
 2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* docs/grub.texi (Theme file format): Replace Box_slice_names.png with
diff --git a/docs/grub.texi b/docs/grub.texi
index 825e65adf..80c6e50db 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1714,9 +1714,21 @@ The following is a list of the components and the properties they support.
 @subsection Common properties
 
 The following properties are supported by all components:
-@itemize
-
-@item id
+@table @samp
+@item left
+     The distance from the left border of container to left border of the object in either of three formats:
+        @multitable @columnfractions 0.2 0.7
+             @item x @tab Value in pixels
+             @item p% @tab Percentage
+             @item p%+x @tab mixture of both
+        @end multitable
+@item top
+      The distance from the left border of container to left border of the object in same format.
+@item width
+      The width of object in same format.
+@item height
+      The height of object in same format.
+@item id 
    The identifier for the component.  This can be any arbitrary string.
    The ID can be used by scripts to refer to various components in the GUI
    component tree.  Currently, there is one special ID value that GRUB
@@ -1725,7 +1737,7 @@ The following properties are supported by all components:
    @multitable @columnfractions 0.2 0.7
    @item ``__timeout__`` @tab Any component with this ID will have its *text*, *start*, *end*, *value*, and *visible* properties set by GRUB when it is counting down to an automatic boot of the default menu entry.
    @end multitable
-@end itemize
+@end table
 
 
 

From d7ee3441ebab34027b78f83f4ff0b0d54e2c169f Mon Sep 17 00:00:00 2001
From: Jo Shields <directhex@apebox.org>
Date: Sun, 5 Sep 2010 22:43:43 +0200
Subject: [PATCH 1548/1628] 	* util/grub.d/30_os-prober.in: Add missing
 classes.

---
 ChangeLog                   | 4 ++++
 util/grub.d/30_os-prober.in | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 04c526d98..fc79d099a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-05  Jo Shields <directhex@apebox.org>
+
+	* util/grub.d/30_os-prober.in: Add missing classes.
+
 2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* docs/grub.texi (Theme file format): Document new position format.
diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
index 76857aeea..728ac2378 100644
--- a/util/grub.d/30_os-prober.in
+++ b/util/grub.d/30_os-prober.in
@@ -40,7 +40,7 @@ fi
 
 osx_entry() {
         cat << EOF
-menuentry "${LONGNAME} (${2}-bit) (on ${DEVICE})" {
+menuentry "${LONGNAME} (${2}-bit) (on ${DEVICE})" --class osx --class darwin --class os {
 EOF
 	save_default_entry | sed -e "s/^/\t/"
 	prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
@@ -105,7 +105,7 @@ for OS in ${OSPROBED} ; do
     chain)
 
       cat << EOF
-menuentry "${LONGNAME} (on ${DEVICE})" {
+menuentry "${LONGNAME} (on ${DEVICE})" --class windows --class os {
 EOF
       save_default_entry | sed -e "s/^/\t/"
       prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"
@@ -147,7 +147,7 @@ EOF
 	fi
 
         cat << EOF
-menuentry "${LLABEL} (on ${DEVICE})" {
+menuentry "${LLABEL} (on ${DEVICE})" --class gnu-linux --class gnu --class os {
 EOF
 	save_default_entry | sed -e "s/^/\t/"
 	if [ -z "${prepare_boot_cache}" ]; then
@@ -174,7 +174,7 @@ EOF
     ;;
     hurd)
       cat << EOF
-menuentry "${LONGNAME} (on ${DEVICE})" {
+menuentry "${LONGNAME} (on ${DEVICE})" --class hurd --class gnu --class os {
 EOF
       save_default_entry | sed -e "s/^/\t/"
       prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/"

From 294f324d8956687230a34c7d8da802b825829a62 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 5 Sep 2010 23:20:13 +0200
Subject: [PATCH 1549/1628] 	* grub-core/disk/lvm.c (grub_lvm_scan_device)
 [GRUB_UTIL]: Output more 	diagnostic info.

---
 ChangeLog            |  5 +++
 grub-core/disk/lvm.c | 94 ++++++++++++++++++++++++++++++++++++++------
 2 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fc79d099a..0f4c54c14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/disk/lvm.c (grub_lvm_scan_device) [GRUB_UTIL]: Output more
+	diagnostic info.
+
 2010-09-05  Jo Shields <directhex@apebox.org>
 
 	* util/grub.d/30_os-prober.in: Add missing classes.
diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
index 71860e853..3981d9811 100644
--- a/grub-core/disk/lvm.c
+++ b/grub-core/disk/lvm.c
@@ -274,6 +274,10 @@ grub_lvm_scan_device (const char *name)
   struct grub_lvm_vg *vg;
   struct grub_lvm_pv *pv;
 
+#ifdef GRUB_UTIL
+  grub_util_info ("scanning %s for LVM", name);
+#endif
+
   disk = grub_disk_open (name);
   if (!disk)
     return 0;
@@ -294,7 +298,12 @@ grub_lvm_scan_device (const char *name)
 
   /* Return if we didn't find a label. */
   if (i == GRUB_LVM_LABEL_SCAN_SECTORS)
-    goto fail;
+    {
+#ifdef GRUB_UTIL
+      grub_util_info ("no LVM signature found\n");
+#endif
+      goto fail;
+    }
 
   pvh = (struct grub_lvm_pv_header *) (buf + grub_le_to_cpu32(lh->offset_xl));
 
@@ -318,6 +327,9 @@ grub_lvm_scan_device (const char *name)
       grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
 		  "we don't support multiple LVM data areas");
 
+#ifdef GRUB_UTIL
+      grub_util_info ("we don't support multiple LVM data areas\n");
+#endif
       goto fail;
     }
 
@@ -344,6 +356,9 @@ grub_lvm_scan_device (const char *name)
     {
       grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
 		  "unknown LVM metadata header");
+#ifdef GRUB_UTIL
+      grub_util_info ("unknown LVM metadata header\n");
+#endif
       goto fail2;
     }
 
@@ -364,7 +379,12 @@ grub_lvm_scan_device (const char *name)
     q++;
 
   if (q == metadatabuf + mda_size)
-    goto fail2;
+    {
+#ifdef GRUB_UTIL
+      grub_util_info ("error parsing metadata\n");
+#endif
+      goto fail2;
+    }
 
   vgname_len = q - p;
   vgname = grub_malloc (vgname_len + 1);
@@ -376,7 +396,12 @@ grub_lvm_scan_device (const char *name)
 
   p = grub_strstr (q, "id = \"");
   if (p == NULL)
-    goto fail3;
+    {
+#ifdef GRUB_UTIL
+      grub_util_info ("couldn't find ID\n");
+#endif
+      goto fail3;
+    }
   p += sizeof ("id = \"") - 1;
   grub_memcpy (vg_id, p, GRUB_LVM_ID_STRLEN);
   vg_id[GRUB_LVM_ID_STRLEN] = '\0';
@@ -399,7 +424,12 @@ grub_lvm_scan_device (const char *name)
 
       vg->extent_size = grub_lvm_getvalue (&p, "extent_size = ");
       if (p == NULL)
-	goto fail4;
+	{
+#ifdef GRUB_UTIL
+	  grub_util_info ("unknown extent size\n");
+#endif
+	  goto fail4;
+	}
 
       vg->lvs = NULL;
       vg->pvs = NULL;
@@ -439,11 +469,21 @@ grub_lvm_scan_device (const char *name)
 
 	      pv->start = grub_lvm_getvalue (&p, "pe_start = ");
 	      if (p == NULL)
-		goto pvs_fail;
+		{
+#ifdef GRUB_UTIL
+		  grub_util_info ("unknown pe_start\n");
+#endif
+		  goto pvs_fail;
+		}
 
 	      p = grub_strchr (p, '}');
 	      if (p == NULL)
-		goto pvs_fail;
+		{
+#ifdef GRUB_UTIL
+		  grub_util_info ("error parsing pe_start\n");
+#endif
+		  goto pvs_fail;
+		}
 	      p++;
 
 	      pv->disk = NULL;
@@ -500,7 +540,12 @@ grub_lvm_scan_device (const char *name)
 
 	      lv->segment_count = grub_lvm_getvalue (&p, "segment_count = ");
 	      if (p == NULL)
-		goto lvs_fail;
+		{
+#ifdef GRUB_UTIL
+		  grub_util_info ("unknown segment_count\n");
+#endif
+		  goto lvs_fail;
+		}
 	      lv->segments = grub_malloc (sizeof (*seg) * lv->segment_count);
 	      seg = lv->segments;
 
@@ -510,14 +555,29 @@ grub_lvm_scan_device (const char *name)
 
 		  p = grub_strstr (p, "segment");
 		  if (p == NULL)
-		    goto lvs_segment_fail;
+		    {
+#ifdef GRUB_UTIL
+		      grub_util_info ("unknown segment\n");
+#endif
+		      goto lvs_segment_fail;
+		    }
 
 		  seg->start_extent = grub_lvm_getvalue (&p, "start_extent = ");
 		  if (p == NULL)
-		    goto lvs_segment_fail;
+		    {
+#ifdef GRUB_UTIL
+		      grub_util_info ("unknown start_extent\n");
+#endif
+		      goto lvs_segment_fail;
+		    }
 		  seg->extent_count = grub_lvm_getvalue (&p, "extent_count = ");
 		  if (p == NULL)
-		    goto lvs_segment_fail;
+		    {
+#ifdef GRUB_UTIL
+		      grub_util_info ("unknown extent_count\n");
+#endif
+		      goto lvs_segment_fail;
+		    }
 
 		  if (grub_lvm_checkvalue (&p, "type = ", "snapshot"))
 		    {
@@ -528,7 +588,12 @@ grub_lvm_scan_device (const char *name)
 
 		  seg->stripe_count = grub_lvm_getvalue (&p, "stripe_count = ");
 		  if (p == NULL)
-		    goto lvs_segment_fail;
+		    {
+#ifdef GRUB_UTIL
+		      grub_util_info ("unknown stripe_count\n");
+#endif
+		      goto lvs_segment_fail;
+		    }
 
 		  lv->size += seg->extent_count * vg->extent_size;
 
@@ -541,7 +606,12 @@ grub_lvm_scan_device (const char *name)
 
 		  p = grub_strstr (p, "stripes = [");
 		  if (p == NULL)
-		    goto lvs_segment_fail2;
+		    {
+#ifdef GRUB_UTIL
+		      grub_util_info ("unknown stripes\n");
+#endif
+		      goto lvs_segment_fail2;
+		    }
 		  p += sizeof("stripes = [") - 1;
 
 		  for (j = 0; j < seg->stripe_count; j++)

From 88b87c9313b452ec104ad46e7f304ec7d247536d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 5 Sep 2010 23:24:57 +0200
Subject: [PATCH 1550/1628] 	* grub-core/kern/emu/main.c (main): Reinit LVM
 and RAID. 	* util/grub-probe.c (main): Likewise. 	*
 util/i386/pc/grub-setup.c (main): Likewise. 	*
 util/sparc64/ieee1275/grub-setup.c (main): Likewise. 	Reported and debugged
 by: alexxy

---
 ChangeLog                          | 8 ++++++++
 grub-core/kern/emu/main.c          | 7 +++++++
 util/grub-probe.c                  | 7 +++++++
 util/i386/pc/grub-setup.c          | 7 +++++++
 util/sparc64/ieee1275/grub-setup.c | 7 +++++++
 5 files changed, 36 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0f4c54c14..03114c54e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/emu/main.c (main): Reinit LVM and RAID.
+	* util/grub-probe.c (main): Likewise.
+	* util/i386/pc/grub-setup.c (main): Likewise.
+	* util/sparc64/ieee1275/grub-setup.c (main): Likewise.
+	Reported and debugged by: alexxy
+
 2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/disk/lvm.c (grub_lvm_scan_device) [GRUB_UTIL]: Output more
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index 9156aa890..8867f6101 100644
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -197,6 +197,13 @@ main (int argc, char *argv[])
 
   grub_init_all ();
 
+  grub_lvm_fini ();
+  grub_mdraid_fini ();
+  grub_raid_fini ();
+  grub_raid_init ();
+  grub_mdraid_init ();
+  grub_lvm_init ();
+
   /* Make sure that there is a root device.  */
   if (! root_dev)
     {
diff --git a/util/grub-probe.c b/util/grub-probe.c
index 62206bf0e..f02d98589 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -422,6 +422,13 @@ main (int argc, char *argv[])
   /* Initialize all modules. */
   grub_init_all ();
 
+  grub_lvm_fini ();
+  grub_mdraid_fini ();
+  grub_raid_fini ();
+  grub_raid_init ();
+  grub_mdraid_init ();
+  grub_lvm_init ();
+
   /* Do it.  */
   if (argument_is_device)
     probe (NULL, argument);
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 642d9d104..ff5aeda40 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -751,6 +751,13 @@ main (int argc, char *argv[])
   /* Initialize all modules. */
   grub_init_all ();
 
+  grub_lvm_fini ();
+  grub_mdraid_fini ();
+  grub_raid_fini ();
+  grub_raid_init ();
+  grub_mdraid_init ();
+  grub_lvm_init ();
+
   dest_dev = get_device_name (argv[optind]);
   if (! dest_dev)
     {
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
index d8481295f..1b1a80911 100644
--- a/util/sparc64/ieee1275/grub-setup.c
+++ b/util/sparc64/ieee1275/grub-setup.c
@@ -614,6 +614,13 @@ main (int argc, char *argv[])
   /* Initialize all modules. */
   grub_init_all ();
 
+  grub_lvm_fini ();
+  grub_mdraid_fini ();
+  grub_raid_fini ();
+  grub_raid_init ();
+  grub_mdraid_init ();
+  grub_lvm_init ();
+
   find_dest_dev (&ginfo, argv);
 
   ginfo.prefix = grub_make_system_path_relative_to_its_root (ginfo.dir ?

From db0f7e3d20e5f25c92e280f6f46b25c599241ec1 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 6 Sep 2010 09:35:35 +0200
Subject: [PATCH 1551/1628] 	Rename CD-ROM to cd on BIOS.

	* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_get_drive): Recognise
	"cd".
	(grub_biosdisk_call_hook): Call with "cd" instead of arbitrary hdX.
---
 ChangeLog                         | 8 ++++++++
 grub-core/disk/i386/pc/biosdisk.c | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 03114c54e..05a3ddf90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Rename CD-ROM to cd on BIOS.
+
+	* grub-core/disk/i386/pc/biosdisk.c (grub_biosdisk_get_drive): Recognise
+	"cd".
+	(grub_biosdisk_call_hook): Call with "cd" instead of arbitrary hdX.
+
 2010-09-05  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/emu/main.c (main): Reinit LVM and RAID.
diff --git a/grub-core/disk/i386/pc/biosdisk.c b/grub-core/disk/i386/pc/biosdisk.c
index 17de0c1a1..9c0209693 100644
--- a/grub-core/disk/i386/pc/biosdisk.c
+++ b/grub-core/disk/i386/pc/biosdisk.c
@@ -248,6 +248,9 @@ grub_biosdisk_get_drive (const char *name)
 {
   unsigned long drive;
 
+  if (name[0] == 'c' && name[1] == 'd' && name[2] == 0 && cd_drive)
+    return cd_drive;
+
   if ((name[0] != 'f' && name[0] != 'h') || name[1] != 'd')
     goto fail;
 
@@ -270,6 +273,9 @@ grub_biosdisk_call_hook (int (*hook) (const char *name), int drive)
 {
   char name[10];
 
+  if (cd_drive && drive == cd_drive)
+    return hook ("cd");
+
   grub_snprintf (name, sizeof (name),
 		 (drive & 0x80) ? "hd%d" : "fd%d", drive & (~0x80));
   return hook (name);

From e175e78d4a974b26e9f1d3e66f97658124d6e373 Mon Sep 17 00:00:00 2001
From: "bvk.groups@gmail.com" <>
Date: Tue, 7 Sep 2010 09:33:29 +0530
Subject: [PATCH 1552/1628] documentation for some grub-script features

---
 docs/grub.texi | 55 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 50 insertions(+), 5 deletions(-)

diff --git a/docs/grub.texi b/docs/grub.texi
index fb0907a59..420f0513a 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1227,8 +1227,10 @@ The @samp{$} character retains its special meaning within double quotes.
 The backslash retains its special meaning only when followed by one of the
 following characters: @samp{$}, @samp{"}, @samp{\}, or newline.  A
 backslash-newline pair is treated as a line continuation (that is, it is
-removed from the input stream and effectively ignored).  A double quote may
-be quoted within double quotes by preceding it with a backslash.
+removed from the input stream and effectively ignored@footnote{Currently a
+backslash-newline pair within a variable name is not handled properly, so
+use this feature with some care.}).  A double quote may be quoted within
+double quotes by preceding it with a backslash.
 
 @heading Variable expansion
 
@@ -1240,11 +1242,15 @@ which could be interpreted as part of the name.
 Normal variable names begin with an alphabetic character, followed by zero
 or more alphanumeric characters.
 
-Positional variable names consist of one or more digits.  These are reserved
-for future expansion.
+Positional variable names consist of one or more digits.  They represent
+parameters passed to function calls, with @samp{$1} representing the first
+parameter, and so on.
 
 The special variable name @samp{?} expands to the exit status of the most
-recently executed command.
+recently executed command.  When positional variable names are active, other
+special variable names @samp{@@}, @samp{*} and @samp{#} are defined and they
+expand to all positional parameters with necessary quoting, positional
+parameters without any quoting, and positional parameter count respectively.
 
 @heading Comments
 
@@ -1305,6 +1311,45 @@ the body.
 @xref{menuentry}.
 @end table
 
+@heading Built-in Commands
+
+Some built-in commands are also provided by GRUB script to help script
+writers perform actions that are otherwise not possible.  For example, these
+include commands to jump out of a loop without fully completing it, etc.
+
+@table @asis
+@item break [@code{n}]
+Exit from within a @code{for}, @code{while}, or @code{until} loop.  If
+@code{n} is specified, break @code{n} levels.  @code{n} must be greater than
+or equal to 1.  If @code{n} is greater than the number of enclosing loops,
+all enclosing loops are exited.  The return value is 0 unless @code{n} is
+not greater than or equal to 1.
+
+@item continue [@code{n}]
+Resume the next iteration of the enclosing @code{for}, @code{while} or
+@code{until} loop.  If @code{n} is specified, resume at the @code{n}th
+enclosing loop.  @code{n} must be greater than or equal to 1.  If @code{n}
+is greater than the number of enclosing loops, the last enclosing loop (the
+@dfn{top-level} loop) is resumed.  The return value is 0 unless @code{n} is
+not greater than or equal to 1.
+
+@item return [@code{n}]
+Causes a function to exit with the return value specified by @code{n}.  If
+@code{n} is omitted, the return status is that of the last command executed
+in the function body.  If used outside a function the return status is
+false.
+
+@item shift [@code{n}]
+The positional parameters from @code{n}+1 @dots{} are renamed to
+@code{$1}@dots.  Parameters represented by the numbers @code{$#} down to
+@code{$#}-@code{n}+1 are unset.  @code{n} must be a non-negative number less
+than or equal to @code{$#}.  If @code{n} is 0, no parameters are changed.
+If @code{n} is not given, it is assumed to be 1.  If @code{n} is greater
+than @code{$#}, the positional parameters are not changed.  The return
+status is greater than zero if @code{n} is greater than @code{$#} or less
+than zero; otherwise 0.
+
+@end table
 
 @node Embedded configuration
 @section Embedding a configuration file into GRUB

From 4d69c7863b7fae9d2cde430b21ecc633ef017eab Mon Sep 17 00:00:00 2001
From: "bvk.groups@gmail.com" <>
Date: Tue, 7 Sep 2010 11:00:37 +0530
Subject: [PATCH 1553/1628] 	* docs/grub.texi (Shell-like scripting): Fix
 @dots to @dots{}.

---
 ChangeLog      | 4 ++++
 docs/grub.texi | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1bc29c327..0f79aaa87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-07  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* docs/grub.texi (Shell-like scripting): Fix @dots to @dots{}.
+
 2010-09-07  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* docs/grub.texi (Shell-like scripting): Documentation for break,
diff --git a/docs/grub.texi b/docs/grub.texi
index 0ca735b0d..af6d42ccb 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1341,7 +1341,7 @@ false.
 
 @item shift [@code{n}]
 The positional parameters from @code{n}+1 @dots{} are renamed to
-@code{$1}@dots.  Parameters represented by the numbers @code{$#} down to
+@code{$1}@dots{}.  Parameters represented by the numbers @code{$#} down to
 @code{$#}-@code{n}+1 are unset.  @code{n} must be a non-negative number less
 than or equal to @code{$#}.  If @code{n} is 0, no parameters are changed.
 If @code{n} is not given, it is assumed to be 1.  If @code{n} is greater

From b61d05ed19c4877bff2faf3103b72c5e034a379a Mon Sep 17 00:00:00 2001
From: "bvk.groups@gmail.com" <>
Date: Tue, 7 Sep 2010 17:16:03 +0530
Subject: [PATCH 1554/1628] 	* grub-core/commands/wildcard.c
 (wildcard_expand): Fix wrong 	grub_free.

---
 ChangeLog                     | 4 ++++
 grub-core/commands/wildcard.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0f79aaa87..279668975 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-07  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	* grub-core/commands/wildcard.c (wildcard_expand): Fix wrong grub_free.
+
 2010-09-07  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* docs/grub.texi (Shell-like scripting): Fix @dots to @dots{}.
diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
index cbe32e0ff..64e2e3a54 100644
--- a/grub-core/commands/wildcard.c
+++ b/grub-core/commands/wildcard.c
@@ -488,7 +488,7 @@ wildcard_expand (const char *s, char ***strs)
 
   for (i = 0; paths && paths[i]; i++)
     grub_free (paths[i]);
-  grub_free (paths[i]);
+  grub_free (paths);
   regfree (&regexp);
   return grub_errno;
 }

From a0b5f6bcb11da5d6383564c1e8fc78201be6f728 Mon Sep 17 00:00:00 2001
From: "bvk.groups@gmail.com" <>
Date: Tue, 7 Sep 2010 21:46:04 +0530
Subject: [PATCH 1555/1628] update grub_errno as per the return value

---
 grub-core/script/execute.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
index b43ec85e1..87dd6581c 100644
--- a/grub-core/script/execute.c
+++ b/grub-core/script/execute.c
@@ -621,7 +621,17 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
     ret = grub_script_function_call (func, argc, args);
 
   if (invert)
-    ret = ! ret;
+    {
+      if (ret == GRUB_ERR_TEST_FAILURE)
+	grub_errno = ret = GRUB_ERR_NONE;
+      else if (ret == GRUB_ERR_NONE)
+	ret = grub_error (GRUB_ERR_TEST_FAILURE, "false");
+      else
+	{
+	  grub_print_error ();
+	  grub_errno = ret = GRUB_ERR_NONE;
+	}
+    }
 
   /* Free arguments.  */
   grub_script_argv_free (&argv);

From 420eae7e6cb7499ed41a3187d6de95854cef6719 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 8 Sep 2010 13:13:15 +0200
Subject: [PATCH 1556/1628] Remove conf/*.mk

---
 .bzrignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.bzrignore b/.bzrignore
index cfdd069fd..411daae47 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -18,7 +18,6 @@ config.log
 config.status
 config.sub
 configure
-conf/*.mk
 *.d
 DISTLIST
 docs/*.info

From 99fd620d5af6c9d3235adfb4210c881d82364400 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 8 Sep 2010 14:29:32 +0200
Subject: [PATCH 1557/1628] 2010-09-08  Robert Millan  <rmh@gnu.org>

	* util/grub-mkconfig.in: Pass `--device ${GRUB_DEVICE}' when
	initializing `GRUB_FS'.
---
 ChangeLog             | 5 +++++
 util/grub-mkconfig.in | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 73db891d4..0e1285c6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-08  Robert Millan  <rmh@gnu.org>
+
+	* util/grub-mkconfig.in: Pass `--device ${GRUB_DEVICE}' when
+	initializing `GRUB_FS'.
+
 2010-09-08  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Not command (!) support to GRUB script.
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 828b54bce..6f1d375a7 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -158,7 +158,7 @@ GRUB_DEVICE_BOOT_UUID="`${grub_probe} --device ${GRUB_DEVICE_BOOT} --target=fs_u
 
 # Filesystem for the device containing our userland.  Used for stuff like
 # choosing Hurd filesystem module.
-GRUB_FS="`${grub_probe} --target=fs / 2> /dev/null || echo unknown`"
+GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`"
 
 if test -f ${sysconfdir}/default/grub ; then
   . ${sysconfdir}/default/grub

From 92f2aef0458cebd1f095ca05fb8f0a70f45417fd Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 8 Sep 2010 14:37:19 +0200
Subject: [PATCH 1558/1628] 2010-09-08  Robert Millan  <rmh@gnu.org>

	* configure.ac: Remove `--enable-grub-fstest' option.
	* Makefile.util.def (grub-fstest): Remove COND_GRUB_FSTEST condition.

	* util/grub-mkconfig_lib.in (is_path_readable_by_grub): Use
	`grub-fstest' instead of `grub-probe' for readability verification.
	* util/grub-probe.c (probe): Remove readability verification kludge.
---
 ChangeLog                 |  9 +++++++++
 Makefile.util.def         |  1 -
 configure.ac              | 19 -------------------
 util/grub-mkconfig_lib.in | 10 ++++++++--
 util/grub-probe.c         | 36 +-----------------------------------
 5 files changed, 18 insertions(+), 57 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e1285c6f..7e2420c64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-08  Robert Millan  <rmh@gnu.org>
+
+	* configure.ac: Remove `--enable-grub-fstest' option.
+	* Makefile.util.def (grub-fstest): Remove COND_GRUB_FSTEST condition.
+
+	* util/grub-mkconfig_lib.in (is_path_readable_by_grub): Use
+	`grub-fstest' instead of `grub-probe' for readability verification.
+	* util/grub-probe.c (probe): Remove readability verification kludge.
+
 2010-09-08  Robert Millan  <rmh@gnu.org>
 
 	* util/grub-mkconfig.in: Pass `--device ${GRUB_DEVICE}' when
diff --git a/Makefile.util.def b/Makefile.util.def
index e0900c73f..c4872c7c3 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -183,7 +183,6 @@ program = {
 
   ldadd = libgrub.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
-  condition = COND_GRUB_FSTEST;
 };
 
 program = {
diff --git a/configure.ac b/configure.ac
index d362f68a5..3a1a6da63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -762,19 +762,6 @@ AC_SUBST([enable_grub_emu_usb])
 AC_SUBST([enable_grub_emu_pci])
 fi
 
-AC_ARG_ENABLE([grub-fstest],
-	      [AS_HELP_STRING([--enable-grub-fstest],
-                             [build and install the `grub-fstest' debugging utility (default=guessed)])])
-if test x"$enable_grub_fstest" = xno ; then
-  grub_fstest_excuse="explicitly disabled"
-fi
-if test x"$grub_fstest_excuse" = x ; then
-enable_grub_fstest=yes
-else
-enable_grub_fstest=no
-fi
-AC_SUBST([enable_grub_fstest])
-
 AC_ARG_ENABLE([grub-mkfont],
 	      [AS_HELP_STRING([--enable-grub-mkfont],
                              [build and install the `grub-mkfont' utility (default=guessed)])])
@@ -905,7 +892,6 @@ AM_CONDITIONAL([COND_GRUB_EMU_SDL], [test x$enable_grub_emu_sdl = xyes])
 AM_CONDITIONAL([COND_GRUB_EMU_PCI], [test x$enable_grub_emu_pci = xyes])
 AM_CONDITIONAL([COND_GRUB_MKFONT], [test x$enable_grub_mkfont = xyes])
 AM_CONDITIONAL([COND_HAVE_FONT_SOURCE], [test x$FONT_SOURCE != x])
-AM_CONDITIONAL([COND_GRUB_FSTEST], [test x$enable_grub_fstest = xyes])
 AM_CONDITIONAL([COND_GRUB_PE2ELF], [test x$TARGET_OBJ2ELF != x])
 AM_CONDITIONAL([COND_APPLE_CC], [test x$TARGET_APPLE_CC = x1])
 AM_CONDITIONAL([COND_ENABLE_EFIEMU], [test x$enable_efiemu = xyes])
@@ -970,11 +956,6 @@ echo efiemu runtime: Yes
 else
 echo efiemu runtime: No "($efiemu_excuse)"
 fi
-if [ x"$grub_fstest_excuse" = x ]; then
-echo grub-fstest: Yes
-else
-echo grub-fstest: No "($grub_fstest_excuse)"
-fi
 if [ x"$grub_mkfont_excuse" = x ]; then
 echo grub-mkfont: Yes
 else
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 9a77d1bdf..c6f79fb49 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -30,6 +30,9 @@ fi
 if test "x$grub_mkrelpath" = x; then
   grub_mkrelpath=${bindir}/`echo grub-mkrelpath | sed ${transform}`
 fi
+if test "x$grub_fstest" = x; then
+  grub_fstest=${bindir}/`echo grub-fstest | sed ${transform}`
+fi
 
 if $(which gettext >/dev/null 2>/dev/null) ; then
   gettext="gettext"
@@ -56,8 +59,11 @@ is_path_readable_by_grub ()
     return 1
   fi
 
-  # abort if file is in a filesystem we can't read
-  if ${grub_probe} -t fs $path > /dev/null 2>&1 ; then : ; else
+  # abort if file read through GRUB doesn't match file read through system
+  # facilities
+  device=$(${grub_probe} --target=device $path)
+  relpath=$(${grub_mkrelpath} $path)
+  if ${grub_fstest} $device cmp $relpath $path > /dev/null 2>&1 ; then : ; else
     return 1
   fi
 
diff --git a/util/grub-probe.c b/util/grub-probe.c
index f02d98589..4ee122713 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -226,43 +226,9 @@ probe (const char *path, char *device_name)
 
   if (print == PRINT_FS)
     {
-      if (path)
-        {
-	  struct stat st;
-
-	  stat (path, &st);
-
-	  if (S_ISREG (st.st_mode))
-	    {
-	      /* Regular file.  Verify that we can read it properly.  */
-
-	      grub_file_t file;
-	      char *rel_path;
-	      grub_util_info ("reading %s via OS facilities", path);
-	      filebuf_via_sys = grub_util_read_image (path);
-
-	      rel_path = grub_make_system_path_relative_to_its_root (path);
-	      grub_path = xasprintf ("(%s)%s", drive_name, rel_path);
-	      free (rel_path);
-	      grub_util_info ("reading %s via GRUB facilities", grub_path);
-	      grub_file_filter_disable_compression ();
-	      file = grub_file_open (grub_path);
-	      if (! file)
-		grub_util_error ("cannot open %s via GRUB facilities", grub_path);
-	      filebuf_via_grub = xmalloc (file->size);
-	      grub_file_read (file, filebuf_via_grub, file->size);
-
-	      grub_util_info ("comparing");
-
-	      if (memcmp (filebuf_via_grub, filebuf_via_sys, file->size))
-		grub_util_error ("files differ");
-	    }
-	}
-
       printf ("%s\n", fs->name);
     }
-
-  if (print == PRINT_FS_UUID)
+  else if (print == PRINT_FS_UUID)
     {
       char *uuid;
       if (! fs->uuid)

From 6fa6d6751dd946e7acbfbe2c01516bdc17854329 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 8 Sep 2010 13:53:47 +0100
Subject: [PATCH 1559/1628] * grub-core/kern/efi/init.c (grub_efi_set_prefix):
 If the prefix starts with "(,", fill the drive containing the loaded image in
 between those two characters, but expect that a full partition specification
 including partition map names will follow.

---
 ChangeLog                 |  7 +++++++
 grub-core/kern/efi/init.c | 29 ++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7e2420c64..0bb728b6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-08  Colin Watson  <cjwatson@ubuntu.com>
+
+	* grub-core/kern/efi/init.c (grub_efi_set_prefix): If the prefix
+	starts with "(,", fill the drive containing the loaded image in
+	between those two characters, but expect that a full partition
+	specification including partition map names will follow.
+
 2010-09-08  Robert Millan  <rmh@gnu.org>
 
 	* configure.ac: Remove `--enable-grub-fstest' option.
diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
index c124aa292..1b0a872b4 100644
--- a/grub-core/kern/efi/init.c
+++ b/grub-core/kern/efi/init.c
@@ -66,10 +66,33 @@ grub_efi_set_prefix (void)
       path = grub_strdup (pptr);
   }
 
-  if (!device || !path)
+  if ((!device || device[0] == ',' || !device[0]) || !path)
     image = grub_efi_get_loaded_image (grub_efi_image_handle);
-  if (image && !device)
-    device = grub_efidisk_get_device_name (image->device_handle);
+  if (image)
+    {
+      if (!device)
+	device = grub_efidisk_get_device_name (image->device_handle);
+      else if (device[0] == ',' || !device[0])
+	{
+	  /* We have a partition, but still need to fill in the drive.  */
+	  char *image_device, *comma, *new_device;
+
+	  image_device = grub_efidisk_get_device_name (image->device_handle);
+	  comma = grub_strchr (image_device, ',');
+	  if (comma)
+	    {
+	      char *drive = grub_strndup (image_device, comma - image_device);
+	      new_device = grub_xasprintf ("%s%s", drive, device);
+	      grub_free (drive);
+	    }
+	  else
+	    new_device = grub_xasprintf ("%s%s", image_device, device);
+
+	  grub_free (image_device);
+	  grub_free (device);
+	  device = new_device;
+	}
+    }
 
   if (image && !path)
     {

From e55e8495e1c2ff55abea99784d91961ab86fb9ad Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 8 Sep 2010 16:15:57 +0200
Subject: [PATCH 1560/1628] 	* grub-core/kern/ieee1275/cmain.c
 (grub_ieee1275_find_options): Set 	GRUB_IEEE1275_FLAG_HAS_CURSORONOFF
 when appropriate. 	* grub-core/term/ieee1275/ofconsole.c
 (grub_ofconsole_setcursor): 	Use terminfo and don't use
 cursor-on/cursor-off unless it's known 	to work. 	*
 include/grub/ieee1275/ieee1275.h (grub_ieee1275_flag): New element 
 GRUB_IEEE1275_FLAG_HAS_CURSORONOFF.

---
 ChangeLog                        | 10 ++++++++++
 grub-core/kern/ieee1275/cmain.c  |  9 +++++++--
 include/grub/ieee1275/ieee1275.h |  3 +++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0bb728b6b..d8818585b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/ieee1275/cmain.c (grub_ieee1275_find_options): Set
+	GRUB_IEEE1275_FLAG_HAS_CURSORONOFF when appropriate.
+	* grub-core/term/ieee1275/ofconsole.c (grub_ofconsole_setcursor):
+	Use terminfo and don't use cursor-on/cursor-off unless it's known
+	to work.
+	* include/grub/ieee1275/ieee1275.h (grub_ieee1275_flag): New element
+	GRUB_IEEE1275_FLAG_HAS_CURSORONOFF.
+
 2010-09-08  Colin Watson  <cjwatson@ubuntu.com>
 
 	* grub-core/kern/efi/init.c (grub_efi_set_prefix): If the prefix
diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
index d3c3a8d88..30eacbbdd 100644
--- a/grub-core/kern/ieee1275/cmain.c
+++ b/grub-core/kern/ieee1275/cmain.c
@@ -138,11 +138,16 @@ grub_ieee1275_find_options (void)
       */
 
       grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_OFDISK_SDCARD_ONLY);
+      grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_HAS_CURSORONOFF);
     }
 
   if (is_qemu)
-    /* OpenFirmware hangs on qemu if one requests any memory below 1.5 MiB.  */
-    grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM);
+    {
+      /* OpenFirmware hangs on qemu if one requests any memory below 1.5 MiB.  */
+      grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM);
+
+      grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_HAS_CURSORONOFF);
+    }
 
   if (! grub_ieee1275_finddevice ("/rom/boot-rom", &bootrom))
     {
diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
index b30909c68..6835b5abc 100644
--- a/include/grub/ieee1275/ieee1275.h
+++ b/include/grub/ieee1275/ieee1275.h
@@ -103,6 +103,9 @@ enum grub_ieee1275_flag
 
   /* OpenFirmware hangs on qemu if one requests any memory below 1.5 MiB.  */
   GRUB_IEEE1275_FLAG_NO_PRE1_5M_CLAIM,
+
+  /* OLPC / XO firmware has the cursor ON/OFF routines.  */
+  GRUB_IEEE1275_FLAG_HAS_CURSORONOFF,
 };
 
 extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);

From d87aedff341566b900a62f3557a086772e01f51b Mon Sep 17 00:00:00 2001
From: Yves Blusseau <blusseau@zetam.org>
Date: Wed, 8 Sep 2010 17:19:27 +0200
Subject: [PATCH 1561/1628] * configure.ac: Define some useful variables.

---
 ChangeLog    |  4 ++++
 configure.ac | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d8818585b..8d87e9182 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-08  Yves Blusseau  <blusseau@zetam.org>
+
+	* configure.ac: Define some useful variables.
+
 2010-09-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/ieee1275/cmain.c (grub_ieee1275_find_options): Set
diff --git a/configure.ac b/configure.ac
index 3a1a6da63..57b9bb3ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,6 +176,19 @@ AC_SUBST(host_kernel)
 AC_SUBST(target_cpu)
 AC_SUBST(platform)
 
+# Define default variables
+case "$host_os" in
+  netbsd* | openbsd*)
+        # Because /boot is used for the boot block in NetBSD and OpenBSD,
+        bootdirname=''      ;;
+  *)    bootdirname='boot'  ;;
+esac
+bootdirname=`echo "$bootdirname" | sed "$program_transform_name"`
+AC_SUBST(bootdirname)
+
+grubdirname=`echo "$PACKAGE" | sed "$program_transform_name"`
+AC_SUBST(grubdirname)
+
 #
 # Checks for build programs.
 #

From b9fe6ea2ead3028b08e166cbe0b4e4f32c914772 Mon Sep 17 00:00:00 2001
From: Yves Blusseau <blusseau@zetam.org>
Date: Wed, 8 Sep 2010 17:21:32 +0200
Subject: [PATCH 1562/1628]     * util/grub-mkconfig.in: Use new variable.

---
 ChangeLog             |  4 ++++
 util/grub-mkconfig.in | 16 +++-------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8d87e9182..38b97ec8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-08  Yves Blusseau  <blusseau@zetam.org>
+
+        * util/grub-mkconfig.in: Use new variable.
+
 2010-09-08  Yves Blusseau  <blusseau@zetam.org>
 
 	* configure.ac: Define some useful variables.
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 6f1d375a7..c3b4c3398 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -38,6 +38,8 @@ self=`basename $0`
 grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
 grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
 
+GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`
+
 # Usage: usage
 # Print the usage.
 usage () {
@@ -93,18 +95,6 @@ done
 
 . ${libdir}/grub/grub-mkconfig_lib
 
-case "$host_os" in
-netbsd* | openbsd*)
-    # Because /boot is used for the boot block in NetBSD and OpenBSD, use /grub
-    # instead of /boot/grub.
-    GRUB_PREFIX=`echo /grub | sed ${transform}`
-    ;;
-*)
-    # Use /boot/grub by default.
-    GRUB_PREFIX=`echo /boot/grub | sed ${transform}`
-    ;;
-esac
-
 if [ "x$EUID" = "x" ] ; then
   EUID=`id -u`
 fi
@@ -200,7 +190,7 @@ for x in ${GRUB_TERMINAL_OUTPUT}; do
 		exit 1
 	    fi
 	else
-	    for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do
+	    for dir in ${pkgdatadir} ${GRUB_PREFIX} /usr/share/grub ; do
 		for basename in unicode unifont ascii; do
 		    path="${dir}/${basename}.pf2"
 		    if is_path_readable_by_grub ${path} > /dev/null ; then

From c0e53ea537b8ae2755426ac9953fec6591705e8e Mon Sep 17 00:00:00 2001
From: Yves Blusseau <blusseau@zetam.org>
Date: Wed, 8 Sep 2010 17:25:29 +0200
Subject: [PATCH 1563/1628] 	Add new --boot-directory option to replace
 --root-directory

	* util/grub-install.in: Add new --boot-directory option
	* util/grub-reboot.in: Likewise.
	* util/grub-set-default.in: Likewise.
---
 ChangeLog                |  8 +++++++
 util/grub-install.in     | 45 ++++++++++++++++++++--------------------
 util/grub-reboot.in      | 36 ++++++++++++++++++--------------
 util/grub-set-default.in | 36 ++++++++++++++++++--------------
 4 files changed, 70 insertions(+), 55 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 38b97ec8d..998385fa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-08  Yves Blusseau  <blusseau@zetam.org>
+
+	Add new --boot-directory option to replace --root-directory
+
+	* util/grub-install.in: Add new --boot-directory option
+	* util/grub-reboot.in: Likewise.
+	* util/grub-set-default.in: Likewise.
+
 2010-09-08  Yves Blusseau  <blusseau@zetam.org>
 
         * util/grub-mkconfig.in: Use new variable.
diff --git a/util/grub-install.in b/util/grub-install.in
index e6521f069..340a616aa 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -41,7 +41,8 @@ grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
 grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
 grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}`
 rootdir=
-grub_prefix=`echo /boot/grub | sed ${transform}`
+bootdir=
+grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`
 modules=
 
 install_device=
@@ -69,8 +70,8 @@ Install GRUB on your drive.
   -h, --help              print this message and exit
   -v, --version           print the version information and exit
   --modules=MODULES       pre-load specified modules MODULES
-  --root-directory=DIR    install GRUB images under the directory DIR
-                          instead of the root directory
+  --boot-directory=DIR    install GRUB images under the directory DIR/@grubdirname@
+                          instead of the $grubdir directory
   --grub-setup=FILE       use FILE as grub-setup
   --grub-mkimage=FILE     use FILE as grub-mkimage
   --grub-mkdevicemap=FILE use FILE as grub-mkdevicemap
@@ -88,11 +89,8 @@ fi
 
 INSTALL_DEVICE can be a GRUB device name or a system device filename.
 
-$self copies GRUB images into /boot/grub (or /grub on NetBSD and
-OpenBSD), and uses grub-setup to install grub into the boot sector.
-
-If the --root-directory option is used, then $self will copy
-images into the operating system installation rooted at that directory.
+$self copies GRUB images into $grubdir, and uses grub-setup
+to install grub into the boot sector.
 
 Report bugs to <bug-grub@gnu.org>.
 EOF
@@ -134,11 +132,17 @@ do
     --font=*)
 	;;
 
+# Accept for compatibility
     --root-directory)
 	rootdir=`argument $option "$@"`; shift;;
     --root-directory=*)
 	rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
 
+    --boot-directory)
+	bootdir=`argument $option "$@"`; shift;;
+    --boot-directory=*)
+	bootdir=`echo "$option" | sed 's/--boot-directory=//'` ;;
+
     --grub-setup)
 	grub_setup=`argument $option "$@"`; shift;;
     --grub-setup=*)
@@ -215,23 +219,18 @@ if test $debug = yes; then
     setup_verbose="--verbose"
 fi
 
-# Initialize these directories here, since ROOTDIR was initialized.
-case "$host_os" in
-netbsd* | openbsd*)
-    # Because /boot is used for the boot block in NetBSD and OpenBSD, use /grub
-    # instead of /boot/grub.
-    grub_prefix=`echo /grub | sed ${transform}`
-    bootdir=${rootdir}
-    ;;
-*)
-    # Use /boot/grub by default.
-    bootdir=${rootdir}/boot
-    ;;
-esac
+if [ -z "$bootdir" ]; then
+    # Default bootdir if bootdir not initialized.
+    bootdir=/@bootdirname@
 
-grubdir=${bootdir}/`echo grub | sed ${transform}`
+    if [ -n "$rootdir" ] ; then
+        # Initialize bootdir if rootdir was initialized.
+        bootdir=${rootdir}/@bootdirname@
+    fi
+fi
+
+grubdir=`echo "${bootdir}/@grubdirname@" | sed 's,//*,/,g'`
 device_map=${grubdir}/device.map
-
 grub_probe="${grub_probe} --device-map=${device_map}"
 
 # Check if GRUB is installed.
diff --git a/util/grub-reboot.in b/util/grub-reboot.in
index e7a41f68f..929cf5202 100644
--- a/util/grub-reboot.in
+++ b/util/grub-reboot.in
@@ -29,6 +29,8 @@ self=`basename $0`
 
 grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}`
 rootdir=
+bootdir=
+grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`
 
 # Usage: usage
 # Print the usage.
@@ -39,8 +41,8 @@ Set the default boot entry for GRUB, for the next boot only.
 
   -h, --help              print this message and exit
   -v, --version           print the version information and exit
-  --root-directory=DIR    expect GRUB images under the directory DIR
-                          instead of the root directory
+  --boot-directory=DIR    expect GRUB images under the directory DIR/@grubdirname@
+                          instead of the $grubdir directory
 
 ENTRY is a number or a menu item title.
 
@@ -73,11 +75,17 @@ do
 	echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
 	exit 0 ;;
 
+# Accept for compatibility
     --root-directory)
 	rootdir=`argument $option "$@"`; shift ;;
     --root-directory=*)
 	rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
 
+    --boot-directory)
+    bootdir=`argument $option "$@"`; shift;;
+    --boot-directory=*)
+    bootdir=`echo "$option" | sed 's/--boot-directory=//'` ;;
+
     -*)
 	echo "Unrecognized option \`$option'" 1>&2
 	usage
@@ -99,21 +107,17 @@ if test "x$entry" = x; then
     exit 1
 fi
 
-# Initialize these directories here, since ROOTDIR was initialized.
-case "$host_os" in
-netbsd* | openbsd*)
-    # Because /boot is used for the boot block in NetBSD and OpenBSD, use /grub
-    # instead of /boot/grub.
-    grub_prefix=`echo /grub | sed ${transform}`
-    bootdir=${rootdir}
-    ;;
-*)
-    # Use /boot/grub by default.
-    bootdir=${rootdir}/boot
-    ;;
-esac
+if [ -z "$bootdir" ]; then
+    # Default bootdir if bootdir not initialized.
+    bootdir=/@bootdirname@
 
-grubdir=${bootdir}/`echo grub | sed ${transform}`
+    if [ -n "$rootdir" ] ; then
+        # Initialize bootdir if rootdir was initialized.
+        bootdir=${rootdir}/@bootdirname@
+    fi
+fi
+
+grubdir=`echo "${bootdir}/@grubdirname@" | sed 's,//*,/,g'`
 
 prev_saved_entry=`$grub_editenv ${grubdir}/grubenv list | sed -n 's/^saved_entry=//p'`
 if [ "$prev_saved_entry" ]; then
diff --git a/util/grub-set-default.in b/util/grub-set-default.in
index 389c504c7..b09727de2 100644
--- a/util/grub-set-default.in
+++ b/util/grub-set-default.in
@@ -29,6 +29,8 @@ self=`basename $0`
 
 grub_editenv=${bindir}/`echo grub-editenv | sed ${transform}`
 rootdir=
+bootdir=
+grubdir=`echo "/@bootdirname@/@grubdirname@" | sed 's,//*,/,g'`
 
 # Usage: usage
 # Print the usage.
@@ -39,8 +41,8 @@ Set the default boot entry for GRUB.
 
   -h, --help              print this message and exit
   -v, --version           print the version information and exit
-  --root-directory=DIR    expect GRUB images under the directory DIR
-                          instead of the root directory
+  --boot-directory=DIR    expect GRUB images under the directory DIR/@grubdirname@
+                          instead of the $grubdir directory
 
 ENTRY is a number or a menu item title.
 
@@ -73,11 +75,17 @@ do
 	echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
 	exit 0 ;;
 
+# Accept for compatibility
     --root-directory)
 	rootdir=`argument $option "$@"`; shift ;;
     --root-directory=*)
 	rootdir=`echo "$option" | sed 's/--root-directory=//'` ;;
 
+    --boot-directory)
+    bootdir=`argument $option "$@"`; shift;;
+    --boot-directory=*)
+    bootdir=`echo "$option" | sed 's/--boot-directory=//'` ;;
+
     -*)
 	echo "Unrecognized option \`$option'" 1>&2
 	usage
@@ -99,21 +107,17 @@ if test "x$entry" = x; then
     exit 1
 fi
 
-# Initialize these directories here, since ROOTDIR was initialized.
-case "$host_os" in
-netbsd* | openbsd*)
-    # Because /boot is used for the boot block in NetBSD and OpenBSD, use /grub
-    # instead of /boot/grub.
-    grub_prefix=`echo /grub | sed ${transform}`
-    bootdir=${rootdir}
-    ;;
-*)
-    # Use /boot/grub by default.
-    bootdir=${rootdir}/boot
-    ;;
-esac
+if [ -z "$bootdir" ]; then
+    # Default bootdir if bootdir not initialized.
+    bootdir=/@bootdirname@
 
-grubdir=${bootdir}/`echo grub | sed ${transform}`
+    if [ -n "$rootdir" ] ; then
+        # Initialize bootdir if rootdir was initialized.
+        bootdir=${rootdir}/@bootdirname@
+    fi
+fi
+
+grubdir=`echo "${bootdir}/@grubdirname@" | sed 's,//*,/,g'`
 
 $grub_editenv ${grubdir}/grubenv unset prev_saved_entry
 $grub_editenv ${grubdir}/grubenv set saved_entry="$entry"

From 5f7a44bf9219d0f5482ddcaf9f322ea6bcefe5cd Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 8 Sep 2010 19:09:07 +0200
Subject: [PATCH 1564/1628] Missing part of r2705

---
 grub-core/term/ieee1275/ofconsole.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/grub-core/term/ieee1275/ofconsole.c b/grub-core/term/ieee1275/ofconsole.c
index 9ec85631b..1e8fbd1ad 100644
--- a/grub-core/term/ieee1275/ofconsole.c
+++ b/grub-core/term/ieee1275/ofconsole.c
@@ -117,9 +117,14 @@ grub_ofconsole_getwh (struct grub_term_output *term __attribute__ ((unused)))
 }
 
 static void
-grub_ofconsole_setcursor (struct grub_term_output *term __attribute__ ((unused)),
+grub_ofconsole_setcursor (struct grub_term_output *term,
 			  int on)
 {
+  grub_terminfo_setcursor (term, on);
+
+  if (!grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_HAS_CURSORONOFF))
+    return;
+
   /* Understood by the Open Firmware flavour in OLPC.  */
   if (on)
     grub_ieee1275_interpret ("cursor-on", 0);

From b4a0c9154b05f59036920a9fc666ad0556ec7a73 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 8 Sep 2010 19:13:48 +0200
Subject: [PATCH 1565/1628] 	Split minix.mod into minix.mod and minix2.mod.

	* Makefile.util.def (libgrub.a): Add grub-core/fs/minix2.c.
	* grub-core/Makefile.core.def (minix2): New module.
	* grub-core/fs/minix.c: Use definitions instead of runtime version
	checking.
	* grub-core/fs/minix2.c: New file.
---
 Makefile.util.def           |   1 +
 grub-core/Makefile.core.def |   5 ++
 grub-core/fs/minix.c        | 145 +++++++++++++++---------------------
 grub-core/fs/minix2.c       |   2 +
 4 files changed, 69 insertions(+), 84 deletions(-)
 create mode 100644 grub-core/fs/minix2.c

diff --git a/Makefile.util.def b/Makefile.util.def
index c4872c7c3..05c4404a2 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -52,6 +52,7 @@ library = {
   common = grub-core/fs/iso9660.c;
   common = grub-core/fs/jfs.c;
   common = grub-core/fs/minix.c;
+  common = grub-core/fs/minix2.c;
   common = grub-core/fs/nilfs2.c;
   common = grub-core/fs/ntfs.c;
   common = grub-core/fs/ntfscomp.c;
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 59d99a326..04525bbab 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -880,6 +880,11 @@ module = {
   common = fs/minix.c;
 };
 
+module = {
+  name = minix2;
+  common = fs/minix2.c;
+};
+
 module = {
   name = nilfs2;
   common = fs/nilfs2.c;
diff --git a/grub-core/fs/minix.c b/grub-core/fs/minix.c
index a856e38c4..aa5b9a0c9 100644
--- a/grub-core/fs/minix.c
+++ b/grub-core/fs/minix.c
@@ -25,10 +25,13 @@
 #include <grub/dl.h>
 #include <grub/types.h>
 
+#ifdef MODE_MINIX2
+#define GRUB_MINIX_MAGIC	0x2468
+#define GRUB_MINIX_MAGIC_30	0x2478
+#else
 #define GRUB_MINIX_MAGIC	0x137F
-#define GRUB_MINIX2_MAGIC	0x2468
 #define GRUB_MINIX_MAGIC_30	0x138F
-#define GRUB_MINIX2_MAGIC_30	0x2478
+#endif
 #define GRUB_MINIX_BSIZE	1024U
 #define GRUB_MINIX_LOG2_BSIZE	1
 #define GRUB_MINIX_ROOT_INODE	1
@@ -38,20 +41,25 @@
 #define GRUB_MINIX_IFDIR	0040000U
 #define GRUB_MINIX_IFLNK	0120000U
 
-#define GRUB_MINIX_INODE(data,field) (data->version == 1 ? \
-                           data->inode.  field : data->inode2.  field)
-#define GRUB_MINIX_INODE_ENDIAN(data,field,bits1,bits2) (data->version == 1 ?	\
-                        grub_le_to_cpu##bits1 (data->inode.field) :		\
-                        grub_le_to_cpu##bits2 (data->inode2.field))
-#define GRUB_MINIX_INODE_SIZE(data) GRUB_MINIX_INODE_ENDIAN (data,size,16,32)
-#define GRUB_MINIX_INODE_MODE(data) GRUB_MINIX_INODE_ENDIAN (data,mode,16,16)
-#define GRUB_MINIX_INODE_DIR_ZONES(data,blk) GRUB_MINIX_INODE_ENDIAN		\
-                                               (data,dir_zones[blk],16,32)
-#define GRUB_MINIX_INODE_INDIR_ZONE(data)				\
-                        GRUB_MINIX_INODE_ENDIAN (data,indir_zone,16,32)
-#define GRUB_MINIX_INODE_DINDIR_ZONE(data)					\
-                        GRUB_MINIX_INODE_ENDIAN (data,double_indir_zone,16,32)
-#define GRUB_MINIX_INODE_BLKSZ(data) (data->version == 1 ? 2 : 4)
+#ifdef MODE_MINIX2
+typedef grub_uint32_t grub_minix_uintn_t;
+#define grub_minix_le_to_cpu_n grub_le_to_cpu32
+#else
+typedef grub_uint16_t grub_minix_uintn_t;
+#define grub_minix_le_to_cpu_n grub_le_to_cpu16
+#endif
+
+#define GRUB_MINIX_INODE_BLKSZ(data) sizeof (grub_minix_uintn_t)
+
+#define GRUB_MINIX_INODE_SIZE(data) (grub_minix_le_to_cpu_n (data->inode.size))
+#define GRUB_MINIX_INODE_MODE(data) (grub_le_to_cpu16 (data->inode.mode))
+#define GRUB_MINIX_INODE_DIR_ZONES(data,blk) (grub_minix_le_to_cpu_n   \
+					      (data->inode.dir_zones[blk]))
+#define GRUB_MINIX_INODE_INDIR_ZONE(data)  (grub_minix_le_to_cpu_n \
+					    (data->inode.indir_zone))
+#define GRUB_MINIX_INODE_DINDIR_ZONE(data) (grub_minix_le_to_cpu_n \
+					    (data->inode.double_indir_zone))
+
 #define GRUB_MINIX_LOG2_ZONESZ	(GRUB_MINIX_LOG2_BSIZE				\
 				 + grub_le_to_cpu16 (sblock->log2_zone_size))
 #define GRUB_MINIX_ZONESZ	(GRUB_MINIX_BSIZE 				\
@@ -69,6 +77,7 @@ struct grub_minix_sblock
   grub_uint16_t magic;
 };
 
+#ifndef MODE_MINIX2
 struct grub_minix_inode
 {
   grub_uint16_t mode;
@@ -82,7 +91,9 @@ struct grub_minix_inode
   grub_uint16_t double_indir_zone;
 };
 
-struct grub_minix2_inode
+#else
+
+struct grub_minix_inode
 {
   grub_uint16_t mode;
   grub_uint16_t nlinks;
@@ -99,16 +110,16 @@ struct grub_minix2_inode
 
 };
 
+#endif
+
 /* Information about a "mounted" minix filesystem.  */
 struct grub_minix_data
 {
   struct grub_minix_sblock sblock;
   struct grub_minix_inode inode;
-  struct grub_minix2_inode inode2;
   int ino;
   int linknest;
   grub_disk_t disk;
-  int version;
   int filename_size;
 };
 
@@ -128,24 +139,12 @@ grub_minix_get_file_block (struct grub_minix_data *data, unsigned int blk)
   /* Read the block pointer in ZONE, on the offset NUM.  */
   int grub_get_indir (int zone, int num)
     {
-      if (data->version == 1)
-	{
-	  grub_uint16_t indir16;
-	  grub_disk_read (data->disk,
-			  zone << GRUB_MINIX_LOG2_ZONESZ,
-			  sizeof (grub_uint16_t) * num,
-			  sizeof (grub_uint16_t), (char *) &indir16);
-	  return grub_le_to_cpu16 (indir16);
-	}
-      else
-	{
-	  grub_uint32_t indir32;
-	  grub_disk_read (data->disk,
-			  zone << GRUB_MINIX_LOG2_ZONESZ,
-			  sizeof (grub_uint32_t) * num,
-			  sizeof (grub_uint32_t), (char *) &indir32);
-	  return grub_le_to_cpu32 (indir32);
-	}
+      grub_minix_uintn_t indirn;
+      grub_disk_read (data->disk,
+		      zone << GRUB_MINIX_LOG2_ZONESZ,
+		      sizeof (grub_minix_uintn_t) * num,
+		      sizeof (grub_minix_uintn_t), (char *) &indirn);
+      return grub_minix_le_to_cpu_n (indirn);
     }
 
   /* Direct block.  */
@@ -259,27 +258,13 @@ grub_minix_read_inode (struct grub_minix_data *data, int ino)
 	    + grub_le_to_cpu16 (sblock->zone_bmap_size))
 	   << GRUB_MINIX_LOG2_BSIZE);
 
-  if (data->version == 1)
-    {
-      block += ino / (GRUB_DISK_SECTOR_SIZE / sizeof (struct grub_minix_inode));
-      int offs = (ino % (GRUB_DISK_SECTOR_SIZE
-			 / sizeof (struct grub_minix_inode))
-		  * sizeof (struct grub_minix_inode));
-
-      grub_disk_read (data->disk, block, offs,
-		      sizeof (struct grub_minix_inode), &data->inode);
-    }
-  else
-    {
-      block += ino / (GRUB_DISK_SECTOR_SIZE
-		      / sizeof (struct grub_minix2_inode));
-      int offs = (ino
-		  % (GRUB_DISK_SECTOR_SIZE / sizeof (struct grub_minix2_inode))
-		  * sizeof (struct grub_minix2_inode));
-
-      grub_disk_read (data->disk, block, offs,
-		      sizeof (struct grub_minix2_inode),&data->inode2);
-    }
+  block += ino / (GRUB_DISK_SECTOR_SIZE / sizeof (struct grub_minix_inode));
+  int offs = (ino % (GRUB_DISK_SECTOR_SIZE
+		     / sizeof (struct grub_minix_inode))
+	      * sizeof (struct grub_minix_inode));
+  
+  grub_disk_read (data->disk, block, offs,
+		  sizeof (struct grub_minix_inode), &data->inode);
 
   return GRUB_ERR_NONE;
 }
@@ -424,25 +409,9 @@ grub_minix_mount (grub_disk_t disk)
     goto fail;
 
   if (grub_le_to_cpu16 (data->sblock.magic) == GRUB_MINIX_MAGIC)
-    {
-      data->version = 1;
-      data->filename_size = 14;
-    }
-  else if (grub_le_to_cpu16 (data->sblock.magic) == GRUB_MINIX2_MAGIC)
-    {
-      data->version = 2;
-      data->filename_size = 14;
-    }
+    data->filename_size = 14;
   else if (grub_le_to_cpu16 (data->sblock.magic) == GRUB_MINIX_MAGIC_30)
-    {
-      data->version = 1;
-      data->filename_size = 30;
-    }
-  else if (grub_le_to_cpu16 (data->sblock.magic) == GRUB_MINIX2_MAGIC_30)
-    {
-      data->version = 2;
-      data->filename_size = 30;
-    }
+    data->filename_size = 30;
   else
     goto fail;
 
@@ -453,7 +422,11 @@ grub_minix_mount (grub_disk_t disk)
 
  fail:
   grub_free (data);
+#ifdef MODE_MINIX2
+  grub_error (GRUB_ERR_BAD_FS, "not a minix2 filesystem");
+#else
   grub_error (GRUB_ERR_BAD_FS, "not a minix filesystem");
+#endif
   return 0;
 }
 
@@ -583,32 +556,36 @@ grub_minix_close (grub_file_t file)
 }
 
 
-static grub_err_t
-grub_minix_label (grub_device_t device __attribute ((unused)),
-		char **label __attribute ((unused)))
-{
-  return GRUB_ERR_NONE;
-}
-
 
 static struct grub_fs grub_minix_fs =
   {
+#ifdef MODE_MINIX2
+    .name = "minix2",
+#else
     .name = "minix",
+#endif
     .dir = grub_minix_dir,
     .open = grub_minix_open,
     .read = grub_minix_read,
     .close = grub_minix_close,
-    .label = grub_minix_label,
     .next = 0
   };
 
+#ifdef MODE_MINIX2
+GRUB_MOD_INIT(minix2)
+#else
 GRUB_MOD_INIT(minix)
+#endif
 {
   grub_fs_register (&grub_minix_fs);
   my_mod = mod;
 }
 
+#ifdef MODE_MINIX2
+GRUB_MOD_FINI(minix2)
+#else
 GRUB_MOD_FINI(minix)
+#endif
 {
   grub_fs_unregister (&grub_minix_fs);
 }
diff --git a/grub-core/fs/minix2.c b/grub-core/fs/minix2.c
new file mode 100644
index 000000000..0fcd4b139
--- /dev/null
+++ b/grub-core/fs/minix2.c
@@ -0,0 +1,2 @@
+#define MODE_MINIX2 1
+#include "minix.c"

From 27f21a8bb614d70b0db45d123a98bafa932098a5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 8 Sep 2010 21:01:20 +0200
Subject: [PATCH 1566/1628] Add forgotten commit part

---
 ChangeLog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 998385fa2..09fa2e60b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Split minix.mod into minix.mod and minix2.mod.
+
+	* Makefile.util.def (libgrub.a): Add grub-core/fs/minix2.c.
+	* grub-core/Makefile.core.def (minix2): New module.
+	* grub-core/fs/minix.c: Use definitions instead of runtime version
+	checking.
+	* grub-core/fs/minix2.c: New file.
+
 2010-09-08  Yves Blusseau  <blusseau@zetam.org>
 
 	Add new --boot-directory option to replace --root-directory

From 6b8e78aee3538c8e44721c2697673652b8986c97 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Wed, 8 Sep 2010 23:35:53 +0200
Subject: [PATCH 1567/1628] 2010-09-08  Robert Millan  <rmh@gnu.org>

	* util/grub-mkconfig_lib.in (is_path_readable_by_grub): Improve
	with (optional) parameters to specify device and relative path.
	* util/grub-install.in: Use is_path_readable_by_grub() to
	verify readability of a few critical files.
	* util/grub-mkconfig.in: Use is_path_readable_by_grub() to
	verify readability of grub.cfg.new.
---
 ChangeLog                 |  9 +++++++++
 util/grub-install.in      | 13 ++++++++++---
 util/grub-mkconfig.in     |  6 ++++++
 util/grub-mkconfig_lib.in | 11 +++++++++--
 4 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 09fa2e60b..ae534fa7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-08  Robert Millan  <rmh@gnu.org>
+
+	* util/grub-mkconfig_lib.in (is_path_readable_by_grub): Improve
+	with (optional) parameters to specify device and relative path.
+	* util/grub-install.in: Use is_path_readable_by_grub() to
+	verify readability of a few critical files.
+	* util/grub-mkconfig.in: Use is_path_readable_by_grub() to
+	verify readability of grub.cfg.new.
+
 2010-09-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Split minix.mod into minix.mod and minix2.mod.
diff --git a/util/grub-install.in b/util/grub-install.in
index 340a616aa..4de5dbc4a 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Install GRUB on your drive.
-# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009  Free Software Foundation, Inc.
+# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010  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
@@ -327,8 +327,7 @@ if test "x$fs_module" = x -a "x$modules" = x; then
 fi
 
 # Then the partition map module.  In order to support partition-less media,
-# this command is allowed to fail (--target=fs already grants us that the
-# filesystem will be accessible).
+# this command is allowed to fail.
 partmap_module=
 for x in `$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`; do
    partmap_module="$partmap_module part_$x";
@@ -402,6 +401,14 @@ case "${target_cpu}-${platform}" in
     *) mkimage_target=i386-coreboot;
 esac
 
+# Verify readability of a few critical files
+for file in grubenv core.${imgext} normal.mod ; do
+    if is_path_readable_by_grub ${grubdir}/${file} ${grub_device} ${relative_grubdir}/${file} ; then : ; else
+        echo "GRUB is unable to read ${grubdir}/${file}" >&2
+        exit 1
+    fi
+done
+
 if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then
     $grub_mkimage ${config_opt} -O ${mkimage_target} --output=${grubdir}/core.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index c3b4c3398..f0f134b3d 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -303,6 +303,12 @@ for i in ${grub_mkconfig_dir}/* ; do
   esac
 done
 
+# Verify readability of ${grub_cfg}.new
+if is_path_readable_by_grub ${grub_cfg}.new ; then : ; else
+  echo "GRUB is unable to read ${grubdir}/${file}" >&2
+  exit 1   
+fi
+
 if test "x${grub_cfg}" != "x" ; then
   # none of the children aborted with error, install the new grub.cfg
   mv -f ${grub_cfg}.new ${grub_cfg}
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index c6f79fb49..6d4f9f3bb 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -53,16 +53,23 @@ make_system_path_relative_to_its_root ()
 is_path_readable_by_grub ()
 {
   path=$1
+  device=$2
+  relpath=$3
 
   # abort if path doesn't exist
   if test -e $path ; then : ;else
     return 1
   fi
 
+  if [ "${device}" = "" ] ; then
+    device=$(${grub_probe} --target=device $path)
+  fi
+  if [ "${relpath}" = "" ] ; then
+    relpath=$(${grub_mkrelpath} $path)
+  fi
+
   # abort if file read through GRUB doesn't match file read through system
   # facilities
-  device=$(${grub_probe} --target=device $path)
-  relpath=$(${grub_mkrelpath} $path)
   if ${grub_fstest} $device cmp $relpath $path > /dev/null 2>&1 ; then : ; else
     return 1
   fi

From 4dfbc57428c2639b388fb1b08409dbd158b7f2de Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Thu, 9 Sep 2010 01:12:10 +0200
Subject: [PATCH 1568/1628] 2010-09-09  Robert Millan  <rmh@gnu.org>

	Basic Btrfs support (detection and UUID).

	* grub-core/fs/btrfs.c: New file.
	* Makefile.util.def (library): Register btrfs.c.
	* grub-core/Makefile.core.def: Likewise.
---
 ChangeLog                   |   8 +++
 Makefile.util.def           |   1 +
 grub-core/Makefile.core.def |   5 ++
 grub-core/fs/btrfs.c        | 132 ++++++++++++++++++++++++++++++++++++
 4 files changed, 146 insertions(+)
 create mode 100644 grub-core/fs/btrfs.c

diff --git a/ChangeLog b/ChangeLog
index ae534fa7f..0593c7731 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-09  Robert Millan  <rmh@gnu.org>
+
+	Basic Btrfs support (detection and UUID).
+
+	* grub-core/fs/btrfs.c: New file.
+	* Makefile.util.def (library): Register btrfs.c.
+	* grub-core/Makefile.core.def: Likewise.
+
 2010-09-08  Robert Millan  <rmh@gnu.org>
 
 	* util/grub-mkconfig_lib.in (is_path_readable_by_grub): Improve
diff --git a/Makefile.util.def b/Makefile.util.def
index 05c4404a2..413c7eed8 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -43,6 +43,7 @@ library = {
   common = grub-core/fs/afs.c;
   common = grub-core/fs/befs_be.c;
   common = grub-core/fs/befs.c;
+  common = grub-core/fs/btrfs.c;
   common = grub-core/fs/cpio.c;
   common = grub-core/fs/ext2.c;
   common = grub-core/fs/fat.c;
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 04525bbab..000ccaa2a 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -835,6 +835,11 @@ module = {
   common = fs/befs_be.c;
 };
 
+module = {
+  name = btrfs;
+  common = fs/btrfs.c;
+};
+
 module = {
   name = cpio;
   common = fs/cpio.c;
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
new file mode 100644
index 000000000..a50bae000
--- /dev/null
+++ b/grub-core/fs/btrfs.c
@@ -0,0 +1,132 @@
+/* btrfs.c - B-tree file system.  */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010  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/err.h>
+#include <grub/file.h>
+#include <grub/mm.h>
+#include <grub/misc.h>
+#include <grub/disk.h>
+#include <grub/dl.h>
+#include <grub/types.h>
+
+#define BTRFS_SIGNATURE "_BHRfS_M"
+
+struct btrfs_superblock
+{ 
+  grub_uint8_t dummy1[32];
+  grub_uint16_t uuid[8];
+  grub_uint8_t dummy2[16];
+  grub_uint8_t signature[sizeof (BTRFS_SIGNATURE) - 1];
+} __attribute__ ((packed));
+
+struct grub_btrfs_data
+{
+  struct btrfs_superblock sblock;
+};
+
+static struct grub_btrfs_data *
+grub_btrfs_mount (grub_disk_t disk)
+{
+  struct grub_btrfs_data *data = grub_malloc (sizeof (*data));
+  if (! data)
+    return NULL;
+
+  if (grub_disk_read (disk, 128, 0, sizeof (data->sblock),
+		      &data->sblock) != GRUB_ERR_NONE)
+    goto fail;
+
+  if (grub_strncmp ((char *) data->sblock.signature, BTRFS_SIGNATURE, sizeof (BTRFS_SIGNATURE) - 1))
+    {
+      grub_error (GRUB_ERR_BAD_FS, "not a Btrfs filesystem");
+      goto fail;
+    }
+
+  return data;
+
+ fail:
+  grub_free (data);
+  return NULL;
+}
+
+static grub_err_t
+grub_btrfs_open (struct grub_file *file __attribute__ ((unused)),
+		 const char *name __attribute__ ((unused)))
+{
+  return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "only detection is supported for Btrfs");
+}
+
+static grub_err_t
+grub_btrfs_dir (grub_device_t device,
+                const char *path __attribute__ ((unused)),
+                int (*hook) (const char *filename,
+                             const struct grub_dirhook_info *info)
+                __attribute__ ((unused)))
+{
+  struct grub_btrfs_data *data = grub_btrfs_mount (device->disk);
+  if (grub_errno)
+    return grub_errno;
+
+  grub_free (data);
+
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_btrfs_uuid (grub_device_t device, char **uuid)
+{
+  struct grub_btrfs_data *data;
+
+  *uuid = NULL;
+
+  data = grub_btrfs_mount (device->disk);
+  if (! data)
+    return grub_errno;
+
+  *uuid = grub_xasprintf ("%04x%04x-%04x-%04x-%04x-%04x%04x%04x",
+			  grub_be_to_cpu16 (data->sblock.uuid[0]),
+			  grub_be_to_cpu16 (data->sblock.uuid[1]),
+			  grub_be_to_cpu16 (data->sblock.uuid[2]),
+			  grub_be_to_cpu16 (data->sblock.uuid[3]),
+			  grub_be_to_cpu16 (data->sblock.uuid[4]),
+			  grub_be_to_cpu16 (data->sblock.uuid[5]),
+			  grub_be_to_cpu16 (data->sblock.uuid[6]),
+			  grub_be_to_cpu16 (data->sblock.uuid[7]));
+
+  grub_free (data);
+
+  return grub_errno;
+}
+
+static struct grub_fs grub_btrfs_fs =
+  {
+    .name = "btrfs",
+    .dir = grub_btrfs_dir,
+    .open = grub_btrfs_open,
+    .uuid = grub_btrfs_uuid,
+  };
+
+GRUB_MOD_INIT(btrfs)
+{
+  grub_fs_register (&grub_btrfs_fs);
+}
+
+GRUB_MOD_FINI(btrfs)
+{
+  grub_fs_unregister (&grub_btrfs_fs);
+}

From 7bf45fdd318944cfcbb75a359e58d8658fddef14 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Thu, 9 Sep 2010 01:16:05 +0200
Subject: [PATCH 1569/1628] 2010-09-09  Robert Millan  <rmh@gnu.org>

	* util/grub-probe.c (probe): Fix a pair of unhandled error
	conditions.
---
 ChangeLog         | 5 +++++
 util/grub-probe.c | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0593c7731..b0354a4fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-09  Robert Millan  <rmh@gnu.org>
+
+	* util/grub-probe.c (probe): Fix a pair of unhandled error
+	conditions.
+
 2010-09-09  Robert Millan  <rmh@gnu.org>
 
 	Basic Btrfs support (detection and UUID).
diff --git a/util/grub-probe.c b/util/grub-probe.c
index 4ee122713..9f8a443c8 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -234,7 +234,8 @@ probe (const char *path, char *device_name)
       if (! fs->uuid)
 	grub_util_error ("%s does not support UUIDs", fs->name);
 
-      fs->uuid (dev, &uuid);
+      if (fs->uuid (dev, &uuid) != GRUB_ERR_NONE)
+	grub_util_error ("%s", grub_errmsg);
 
       printf ("%s\n", uuid);
     }
@@ -244,7 +245,8 @@ probe (const char *path, char *device_name)
       if (! fs->label)
 	grub_util_error ("%s does not support labels", fs->name);
 
-      fs->label (dev, &label);
+      if (fs->label (dev, &label) != GRUB_ERR_NONE)
+	grub_util_error ("%s", grub_errmsg);
 
       printf ("%s\n", label);
     }

From 56672f4a8bff852ba92a5e95b331c74521d98b5e Mon Sep 17 00:00:00 2001
From: "bvk.groups@gmail.com" <>
Date: Thu, 9 Sep 2010 21:10:17 +0530
Subject: [PATCH 1570/1628] added new partmaps test

---
 Makefile.util.def     |   6 +
 tests/partmap_test.in | 259 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 265 insertions(+)
 create mode 100644 tests/partmap_test.in

diff --git a/Makefile.util.def b/Makefile.util.def
index 413c7eed8..b9901ad66 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -538,6 +538,12 @@ script = {
   common = tests/grub_script_not.in;
 };
 
+script = {
+  testcase;
+  name = partmap_test;
+  common = tests/partmap_test.in;
+};
+
 program = {
   testcase;
   name = example_unit_test;
diff --git a/tests/partmap_test.in b/tests/partmap_test.in
new file mode 100644
index 000000000..80b38e58b
--- /dev/null
+++ b/tests/partmap_test.in
@@ -0,0 +1,259 @@
+#! /bin/sh -e
+
+parted=/sbin/parted
+grubshell=@builddir@/grub-shell
+
+create_disk_image () {
+    name=$1
+    size=$2
+    qemu-img create ${name} ${size} >/dev/null
+}
+
+check_output () {
+    outfile=$1
+    shift
+
+    for disk in $@; do
+	if ! grep "($disk)" ${outfile} >/dev/null
+	then
+	    echo "($disk): disk/partiton not found"
+	    exit 1
+	fi
+    done
+}
+
+list_parts () {
+    mod=$1;
+    shift;
+    imgfile=$1
+    shift
+    outfile=$1
+    shift
+
+    echo ls | ${grubshell} --boot=cd --qemu-opts="-hda ${imgfile}" \
+	--modules=$mod | tr -d "\n\r" > ${outfile}
+    cat ${outfile}
+    echo
+}
+
+imgfile=`mktemp`
+outfile=`mktemp`
+
+#
+# MSDOS partition types
+#
+
+echo "Checking MSDOS partition types..."
+
+# 0 primary
+create_disk_image ${imgfile} 64M
+${parted} -a none -s ${imgfile} mklabel msdos
+list_parts part_msdos ${imgfile} ${outfile}
+check_output ${outfile} hd0
+
+# 1 primary
+create_disk_image ${imgfile} 64M
+${parted} -a none -s ${imgfile} mklabel msdos mkpart primary 0 10M 
+list_parts part_msdos ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,msdos1
+
+# 2 primary
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel msdos mkpart primary 0 10M mkpart primary 10M 20M
+list_parts part_msdos ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,msdos1 hd0,msdos2
+
+# 3 primary
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel msdos mkpart primary 0 10M mkpart primary 10M 20M mkpart primary 20M 30M
+list_parts part_msdos ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,msdos1 hd0,msdos2 hd0,msdos3
+
+# 4 primary
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel msdos mkpart primary 0 10M mkpart primary 10M 20M mkpart primary 20M 30M mkpart primary 30M 40M
+list_parts part_msdos ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,msdos1 hd0,msdos2 hd0,msdos3 hd0,msdos4
+
+# 1 primary, 1 extended
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel msdos mkpart primary 0 10M mkpart primary 10M 20M mkpart extended 20M 100%
+list_parts part_msdos ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,msdos1
+
+# 1 primary, 1 extended, 1 logical
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel msdos mkpart primary 0 10M mkpart primary 10M 20M mkpart extended 20M 100% mkpart logical 20M 30M
+list_parts part_msdos ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,msdos1 hd0,msdos5
+
+# 1 primary, 1 extended, 2 logical
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel msdos mkpart primary 0 10M mkpart primary 10M 20M mkpart extended 20M 100% mkpart logical 20M 30M mkpart logical 30M 40M
+list_parts part_msdos ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,msdos1 hd0,msdos5 hd0,msdos6
+
+# 1 primary, 1 extended, 3 logical
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel msdos mkpart primary 0 10M mkpart primary 10M 20M mkpart extended 20M 100% mkpart logical 20M 30M mkpart logical 30M 40M mkpart logical 40M 50M
+list_parts part_msdos ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,msdos1 hd0,msdos5 hd0,msdos6 hd0,msdos7
+
+# 1 primary, 1 extended, 4 logical
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel msdos mkpart primary 0 10M mkpart primary 10M 20M mkpart extended 20M 100% mkpart logical 20M 30M mkpart logical 30M 40M mkpart logical 40M 50M mkpart logical 50M 60M
+list_parts part_msdos ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,msdos1 hd0,msdos5 hd0,msdos6 hd0,msdos7 hd0,msdos8
+
+
+#
+# GPT partition types
+#
+
+echo "Checking GPT partition types..."
+
+# 0 parts
+create_disk_image ${imgfile} 64M
+${parted} -a none -s ${imgfile} mklabel gpt
+list_parts part_gpt ${imgfile} ${outfile}
+check_output ${outfile} hd0
+
+# 1 parts
+create_disk_image ${imgfile} 64M
+${parted} -a none -s ${imgfile} mklabel gpt mkpart 1 0 10M 
+list_parts part_gpt ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,gpt1
+
+# 2 parts
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel gpt mkpart 1 0 10M mkpart 2 10M 20M
+list_parts part_gpt ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,gpt1 hd0,gpt2
+
+# 3 parts
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel gpt mkpart 1 0 10M mkpart 2 10M 20M mkpart 3 20M 30M
+list_parts part_gpt ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,gpt1 hd0,gpt2 hd0,gpt3
+
+# 4 parts
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel gpt mkpart 1 0 10M mkpart 2 10M 20M mkpart 4 20M 30M mkpart 5 30M 40M
+list_parts part_gpt ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,gpt1 hd0,gpt2 hd0,gpt3 hd0,gpt4
+
+# 5 parts
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel gpt mkpart 1 0 10M mkpart 2 10M 20M mkpart 3 20M 30M mkpart 4 30M 40M mkpart 5 40M 50M
+list_parts part_gpt ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,gpt1 hd0,gpt2 hd0,gpt3 hd0,gpt4 hd0,gpt5
+
+# 6 parts
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel gpt mkpart 1 0 10M mkpart 2 10M 20M mkpart 3 20M 30M mkpart 4 30M 40M mkpart 5 40M 50M mkpart 6 50M 60M
+list_parts part_gpt ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,gpt1 hd0,gpt2 hd0,gpt3 hd0,gpt4 hd0,gpt5 hd0,gpt6
+
+
+#
+# SUN partition types
+#
+# It seems partition #3 is reserved for whole disk by parted.
+#
+
+echo "Checking SUN partition types..."
+
+# 0 parts
+create_disk_image ${imgfile} 64M
+${parted} -a none -s ${imgfile} mklabel sun
+list_parts part_sun ${imgfile} ${outfile}
+check_output ${outfile} hd0
+
+# 1 parts
+create_disk_image ${imgfile} 64M
+${parted} -a none -s ${imgfile} mklabel sun mkpart 0 10M 
+list_parts part_sun ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,sun1
+
+# 2 parts
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel sun mkpart 0 10M mkpart 10M 20M
+list_parts part_sun ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,sun1 hd0,sun2
+
+# 3 parts
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel sun mkpart 0 10M mkpart 10M 20M mkpart 20M 30M
+list_parts part_sun ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,sun1 hd0,sun2 hd0,sun4
+
+# 4 parts
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel sun mkpart 0 10M mkpart 10M 20M mkpart 20M 30M mkpart 30M 40M
+list_parts part_sun ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,sun1 hd0,sun2 hd0,sun4 hd0,sun5
+
+# 5 parts
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel sun mkpart 0 10M mkpart 10M 20M mkpart 20M 30M mkpart 30M 40M mkpart 40M 50M
+list_parts part_sun ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,sun1 hd0,sun2 hd0,sun4 hd0,sun5 hd0,sun6
+
+# 6 parts
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel sun mkpart 0 10M mkpart 10M 20M mkpart 20M 30M mkpart 30M 40M mkpart 40M 50M mkpart 50M 60M
+list_parts part_sun ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,sun1 hd0,sun2 hd0,sun4 hd0,sun5 hd0,sun6 hd0,sun7
+
+
+#
+# Apple partition types
+#
+# Partition table itself is part of some partition, so there is always
+# a partition by default.  But I don't understand why GRUB displays
+# two partitions by default :-(
+#
+
+echo "Checking APPLE partition types..."
+
+# 0 parts
+create_disk_image ${imgfile} 64M
+${parted} -a none -s ${imgfile} mklabel mac
+list_parts part_apple ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,apple1 hd0,apple2
+
+# 1 parts
+create_disk_image ${imgfile} 64M
+${parted} -a none -s ${imgfile} mklabel mac mkpart a 1M 10M
+list_parts part_apple ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,apple1 hd0,apple2 hd0,apple3
+
+# 2 parts
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel mac mkpart a 1M 10M mkpart b 10M 20M
+list_parts part_apple ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,apple1 hd0,apple2 hd0,apple3 hd0,apple4
+
+# 3 parts
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel mac mkpart a 1M 10M mkpart b 10M 20M mkpart c 20M 30M
+list_parts part_apple ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,apple1 hd0,apple2 hd0,apple4 hd0,apple5
+
+# 4 parts
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel mac mkpart a 1M 10M mkpart b 10M 20M mkpart c 20M 30M mkpart d 30M 40M
+list_parts part_apple ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,apple1 hd0,apple2 hd0,apple4 hd0,apple5 hd0,apple6
+
+# 5 parts
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel mac mkpart a 1M 10M mkpart b 10M 20M mkpart c 20M 30M mkpart d 30M 40M mkpart e 40M 50M
+list_parts part_apple ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,apple1 hd0,apple2 hd0,apple4 hd0,apple5 hd0,apple6 hd0,apple7
+
+# 6 parts
+create_disk_image ${imgfile} 128M
+${parted} -a none -s ${imgfile} mklabel mac mkpart a 1M 10M mkpart b 10M 20M mkpart c 20M 30M mkpart d 30M 40M mkpart e 40M 50M mkpart f 50M 60M
+list_parts part_apple ${imgfile} ${outfile}
+check_output ${outfile} hd0 hd0,apple1 hd0,apple2 hd0,apple4 hd0,apple5 hd0,apple6 hd0,apple7 hd0,apple8

From b6a690eeb8567f4841e3518a41932086d556fc43 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 9 Sep 2010 17:17:45 +0100
Subject: [PATCH 1571/1628] * Makefile.util.def (libgrub.a): Move
 grub-core/kern/emu/hostfs.c and grub-core/disk/host.c to ... (grub-fstest):
 ... here.  Having the host disk implementation present confuses grub-probe
 and other utility programs. * util/grub-mkconfig.in: Only verify readability
 of grub.cfg.new when writing to a file, not when writing to stdout.

---
 ChangeLog             | 10 ++++++++++
 Makefile.util.def     |  4 ++--
 util/grub-mkconfig.in |  8 +++++---
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cd53ca445..a51619eef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-09  Colin Watson  <cjwatson@ubuntu.com>
+
+	* Makefile.util.def (libgrub.a): Move grub-core/kern/emu/hostfs.c
+	and grub-core/disk/host.c to ...
+	(grub-fstest): ... here.  Having the host disk implementation
+	present confuses grub-probe and other utility programs.
+
+	* util/grub-mkconfig.in: Only verify readability of grub.cfg.new
+	when writing to a file, not when writing to stdout.
+
 2010-09-09  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	* tests/partmap_test.in: New test for partitions.
diff --git a/Makefile.util.def b/Makefile.util.def
index b9901ad66..5ef33c5db 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -23,7 +23,6 @@ library = {
   common = grub-core/kern/misc.c;
   common = grub-core/kern/emu/mm.c;
   common = grub-core/kern/emu/misc.c;
-  common = grub-core/kern/emu/hostfs.c;
   common = grub-core/kern/emu/getroot.c;
   common = grub-core/kern/emu/hostdisk.c;
 
@@ -31,7 +30,6 @@ library = {
   common = grub-core/commands/extcmd.c;
   common = grub-core/commands/ls.c;
   common = grub-core/disk/dmraid_nvidia.c;
-  common = grub-core/disk/host.c;
   common = grub-core/disk/loopback.c;
   common = grub-core/disk/lvm.c;
   common = grub-core/disk/mdraid_linux.c;
@@ -182,6 +180,8 @@ program = {
   name = grub-fstest;
   mansection = 1;
   common = util/grub-fstest.c;
+  common = grub-core/kern/emu/hostfs.c;
+  common = grub-core/disk/host.c;
 
   ldadd = libgrub.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index f0f134b3d..fa84c63d1 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -304,9 +304,11 @@ for i in ${grub_mkconfig_dir}/* ; do
 done
 
 # Verify readability of ${grub_cfg}.new
-if is_path_readable_by_grub ${grub_cfg}.new ; then : ; else
-  echo "GRUB is unable to read ${grubdir}/${file}" >&2
-  exit 1   
+if test "x${grub_cfg}" != "x"; then
+  if is_path_readable_by_grub ${grub_cfg}.new ; then : ; else
+    echo "GRUB is unable to read ${grubdir}/${file}" >&2
+    exit 1   
+  fi
 fi
 
 if test "x${grub_cfg}" != "x" ; then

From 66d4bea5ccec6a33eea9e9d95af597a8b6499401 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Fri, 10 Sep 2010 13:35:23 +0200
Subject: [PATCH 1572/1628] 2010-09-10  Robert Millan  <rmh@gnu.org>

	* util/grub.d/10_kfreebsd.in: Fix ${kfreebsd_device} initialization
	on ZFS.  Now non-main filesystems are supported as / too.
---
 ChangeLog                  | 5 +++++
 util/grub.d/10_kfreebsd.in | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a51619eef..fb6b19bef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-10  Robert Millan  <rmh@gnu.org>
+
+	* util/grub.d/10_kfreebsd.in: Fix ${kfreebsd_device} initialization
+	on ZFS.  Now non-main filesystems are supported as / too.
+
 2010-09-09  Colin Watson  <cjwatson@ubuntu.com>
 
 	* Makefile.util.def (libgrub.a): Move grub-core/kern/emu/hostfs.c
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index 40ac240c7..e39423999 100644
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -138,7 +138,12 @@ while [ "x$list" != "x" ] ; do
   esac
 
   case ${GRUB_FS} in
-    zfs)		kfreebsd_device=$(grub-probe -t fs_label --device ${GRUB_DEVICE}) ;;
+    zfs)
+			# zpool name
+			kfreebsd_device=$(grub-probe -t fs_label --device ${GRUB_DEVICE})
+			# filesystem name (empty string for the main filesystem)
+			kfreebsd_device="${kfreebsd_device}$(grub-mkrelpath / | sed -e "s,/*@$,,")"
+    ;;
     *)			kfreebsd_device=${GRUB_DEVICE} ;;
   esac
 

From fb90b54648993ce72f91d7557f0c4e4f6b635511 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Fri, 10 Sep 2010 14:02:54 +0200
Subject: [PATCH 1573/1628] 2010-09-10  Robert Millan  <rmh@gnu.org>

	* configure.ac: Check for `struct statfs.f_fstypename' and
	`struct statfs.f_mntfromname'.

	* grub-core/kern/emu/misc.c (grub_find_zpool_from_dir): Conditionalize
	kFreeBSD-specific code.
---
 ChangeLog                 |  8 ++++++++
 configure.ac              |  8 ++++++++
 grub-core/kern/emu/misc.c | 20 ++++++++++++++------
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fb6b19bef..f2b1e9dcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-10  Robert Millan  <rmh@gnu.org>
+
+	* configure.ac: Check for `struct statfs.f_fstypename' and
+	`struct statfs.f_mntfromname'.
+
+	* grub-core/kern/emu/misc.c (grub_find_zpool_from_dir): Conditionalize
+	kFreeBSD-specific code.
+
 2010-09-10  Robert Millan  <rmh@gnu.org>
 
 	* util/grub.d/10_kfreebsd.in: Fix ${kfreebsd_device} initialization
diff --git a/configure.ac b/configure.ac
index 57b9bb3ac..ec1ea8d88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,6 +280,14 @@ fi
 AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf)
 AC_CHECK_HEADERS(libzfs.h libnvpair.h sys/param.h sys/mount.h)
 
+AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[$ac_includes_default
+#include <sys/param.h>
+#include <sys/mount.h>])
+
+AC_CHECK_MEMBERS([struct statfs.f_mntfromname],,,[$ac_includes_default
+#include <sys/param.h>
+#include <sys/mount.h>])
+
 # For opendisk() and getrawpartition() on NetBSD.
 # Used in util/deviceiter.c and in util/hostdisk.c.
 AC_CHECK_HEADER([util.h], [
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
index 82f579616..db89f0ece 100644
--- a/grub-core/kern/emu/misc.c
+++ b/grub-core/kern/emu/misc.c
@@ -282,18 +282,26 @@ grub_get_libzfs_handle (void)
 void
 grub_find_zpool_from_dir (const char *dir, char **poolname, char **poolfs)
 {
-  struct statfs mnt;
   char *slash;
 
   *poolname = *poolfs = NULL;
 
-  if (statfs (dir, &mnt) != 0)
-    return;
+#if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME) && defined(HAVE_STRUCT_STATFS_F_MNTFROMNAME)
+  /* FreeBSD and GNU/kFreeBSD.  */
+  {
+    struct statfs mnt;
 
-  if (strcmp (mnt.f_fstypename, "zfs") != 0)
-    return;
+    if (statfs (dir, &mnt) != 0)
+      return;
 
-  *poolname = xstrdup (mnt.f_mntfromname);
+    if (strcmp (mnt.f_fstypename, "zfs") != 0)
+      return;
+
+    *poolname = xstrdup (mnt.f_mntfromname);
+  }
+#else
+  return;
+#endif
 
   slash = strchr (*poolname, '/');
   if (slash)

From 905f7773e596bf110ec8f3dd81e9436289d08b2a Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 10 Sep 2010 13:20:21 +0100
Subject: [PATCH 1574/1628] grub-fstest needs the host and hostfs modules while
 other utilities actively require those modules to be absent, so grub-fstest
 needs its own initialisation and finalisation code. * Makefile.am
 (grub_fstest.pp): New target. (grub_fstest_init.lst): Likewise.
 (grub_fstest_init.c): Likewise. * Makefile.util.def (grub-fstest): Add
 grub_fstest_init.c.

---
 ChangeLog         | 11 +++++++++++
 Makefile.am       | 14 ++++++++++++++
 Makefile.util.def |  1 +
 3 files changed, 26 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f2b1e9dcd..c5d0760a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-10  Colin Watson  <cjwatson@ubuntu.com>
+
+	grub-fstest needs the host and hostfs modules while other utilities
+	actively require those modules to be absent, so grub-fstest needs
+	its own initialisation and finalisation code.
+
+	* Makefile.am (grub_fstest.pp): New target.
+	(grub_fstest_init.lst): Likewise.
+	(grub_fstest_init.c): Likewise.
+	* Makefile.util.def (grub-fstest): Add grub_fstest_init.c.
+
 2010-09-10  Robert Millan  <rmh@gnu.org>
 
 	* configure.ac: Check for `struct statfs.f_fstypename' and
diff --git a/Makefile.am b/Makefile.am
index 1cf2297bd..e0f2f013f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,6 +44,20 @@ libgrub_a_init.c: libgrub_a_init.lst $(top_srcdir)/geninit.sh
 	sh $(top_srcdir)/geninit.sh `cat $<` > $@ || (rm -f $@; exit 1)
 CLEANFILES += libgrub_a_init.c
 
+# For grub-fstest
+grub_fstest.pp: $(grub_fstest_SOURCES)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(grub_fstest_CPPFLAGS) $(CPPFLAGS) \
+	  -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1)
+CLEANFILES += grub_fstest.pp
+
+grub_fstest_init.lst: libgrub.pp grub_fstest.pp
+	cat $^ | grep '@MARKER@' | sed 's/@MARKER@\(.*\)@/\1/g' | sort -u > $@ || (rm -f $@; exit 1)
+CLEANFILES += grub_fstest_init.lst
+
+grub_fstest_init.c: grub_fstest_init.lst $(top_srcdir)/geninit.sh
+	sh $(top_srcdir)/geninit.sh `cat $<` > $@ || (rm -f $@; exit 1)
+CLEANFILES += grub_fstest_init.c
+
 if COND_GRUB_MKFONT
 if COND_HAVE_FONT_SOURCE
 grubdata_DATA = unicode.pf2 ascii.pf2 ascii.h widthspec.h
diff --git a/Makefile.util.def b/Makefile.util.def
index 5ef33c5db..5d4724b8f 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -179,6 +179,7 @@ program = {
 program = {
   name = grub-fstest;
   mansection = 1;
+  common_nodist = grub_fstest_init.c;
   common = util/grub-fstest.c;
   common = grub-core/kern/emu/hostfs.c;
   common = grub-core/disk/host.c;

From c38fe9f48e9b9fadf390ce310821f16bc9944a6c Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Fri, 10 Sep 2010 14:32:28 +0200
Subject: [PATCH 1575/1628] 2010-09-10  Robert Millan  <rmh@gnu.org>

	Solaris support in grub_find_zpool_from_dir().  Thanks
	Seth Goldberg for referring to getextmntent() facility.

	* configure.ac: Check for getextmntent(), `sys/mnttab.h' and
	`sys/mkdev.h'.
	* grub-core/kern/emu/misc.c [HAVE_SYS_MNTTAB_H]: Include
	`<sys/mnttab.h>'.
	[HAVE_SYS_MKDEV_H]: Include `<sys/mkdev.h>'.
	[HAVE_GETEXTMNTENT] (grub_find_zpool_from_dir): Add getextmntent()
	method for finding zpool name.
---
 ChangeLog                 | 13 +++++++++++++
 configure.ac              |  4 ++--
 grub-core/kern/emu/misc.c | 39 +++++++++++++++++++++++++++++++++++++--
 3 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c5d0760a6..1abd19556 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-10  Robert Millan  <rmh@gnu.org>
+
+	Solaris support in grub_find_zpool_from_dir().  Thanks
+	Seth Goldberg for referring to getextmntent() facility.
+
+	* configure.ac: Check for getextmntent(), `sys/mnttab.h' and
+	`sys/mkdev.h'.
+	* grub-core/kern/emu/misc.c [HAVE_SYS_MNTTAB_H]: Include
+	`<sys/mnttab.h>'.
+	[HAVE_SYS_MKDEV_H]: Include `<sys/mkdev.h>'.
+	[HAVE_GETEXTMNTENT] (grub_find_zpool_from_dir): Add getextmntent()
+	method for finding zpool name.
+
 2010-09-10  Colin Watson  <cjwatson@ubuntu.com>
 
 	grub-fstest needs the host and hostfs modules while other utilities
diff --git a/configure.ac b/configure.ac
index ec1ea8d88..d50dfe6dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -277,8 +277,8 @@ else
 fi
 
 # Check for functions and headers.
-AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf)
-AC_CHECK_HEADERS(libzfs.h libnvpair.h sys/param.h sys/mount.h)
+AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf getextmntent)
+AC_CHECK_HEADERS(libzfs.h libnvpair.h sys/param.h sys/mount.h sys/mnttab.h sys/mkdev.h)
 
 AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[$ac_includes_default
 #include <sys/param.h>
diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
index db89f0ece..c710777ea 100644
--- a/grub-core/kern/emu/misc.c
+++ b/grub-core/kern/emu/misc.c
@@ -61,6 +61,15 @@
 # include <sys/mount.h>
 #endif
 
+#ifdef HAVE_SYS_MNTTAB_H
+# include <stdio.h> /* Needed by sys/mnttab.h.  */
+# include <sys/mnttab.h>
+#endif
+
+#ifdef HAVE_SYS_MKDEV_H
+# include <sys/mkdev.h> /* makedev */
+#endif
+
 int verbosity;
 
 void
@@ -299,10 +308,36 @@ grub_find_zpool_from_dir (const char *dir, char **poolname, char **poolfs)
 
     *poolname = xstrdup (mnt.f_mntfromname);
   }
-#else
-  return;
+#elif defined(HAVE_GETEXTMNTENT)
+  /* Solaris.  */
+  {
+    struct stat st;
+    struct extmnttab mnt;
+
+    if (stat (dir, &st) != 0)
+      return;
+
+    FILE *mnttab = fopen ("/etc/mnttab", "r");
+    if (! mnttab)
+      return;
+
+    while (getextmntent (mnttab, &mnt, sizeof (mnt)) == 0)
+      {
+	if (makedev (mnt.mnt_major, mnt.mnt_minor) == st.st_dev
+	    && !strcmp (mnt.mnt_fstype, "zfs"))
+	  {
+	    *poolname = xstrdup (mnt.mnt_special);
+	    break;
+	  }
+      }
+
+    fclose (mnttab);
+  }
 #endif
 
+  if (! *poolname)
+    return;
+
   slash = strchr (*poolname, '/');
   if (slash)
     {

From c452fa66dd9ebb75142dc4afed8371ca11511bd2 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 10 Sep 2010 13:47:16 +0100
Subject: [PATCH 1576/1628] * util/grub-install.in: ${imgext} won't be defined
 here until the install branch is merged.  For the meantime, only verify
 core.img on i386-pc and sparc64-ieee1275 platforms.

---
 ChangeLog            | 6 ++++++
 util/grub-install.in | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1abd19556..3a7a75e20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-10  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-install.in: ${imgext} won't be defined here until the
+	install branch is merged.  For the meantime, only verify core.img on
+	i386-pc and sparc64-ieee1275 platforms.
+
 2010-09-10  Robert Millan  <rmh@gnu.org>
 
 	Solaris support in grub_find_zpool_from_dir().  Thanks
diff --git a/util/grub-install.in b/util/grub-install.in
index 4de5dbc4a..c30f900db 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -402,7 +402,14 @@ case "${target_cpu}-${platform}" in
 esac
 
 # Verify readability of a few critical files
-for file in grubenv core.${imgext} normal.mod ; do
+# verify_files is a temporary workaround; drop this once the install branch
+# is merged.
+verify_files=grubenv
+if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ]; then
+    verify_files="$verify_files core.img"
+fi
+verify_files="$verify_files normal.mod"
+for file in $verify_files ; do
     if is_path_readable_by_grub ${grubdir}/${file} ${grub_device} ${relative_grubdir}/${file} ; then : ; else
         echo "GRUB is unable to read ${grubdir}/${file}" >&2
         exit 1

From 90367e043da1a9328eaf1edecf2809db41c8ebc5 Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Fri, 10 Sep 2010 15:11:54 +0200
Subject: [PATCH 1577/1628] 2010-09-10  Robert Millan  <rmh@gnu.org>

	* util/grub.d/10_hurd.in: Add misc readability checks.
	* util/grub.d/10_kfreebsd.in: Likewise.
	* util/grub.d/10_linux.in: Likewise.
---
 ChangeLog                  |  6 ++++++
 util/grub.d/10_hurd.in     |  8 ++++++++
 util/grub.d/10_kfreebsd.in | 17 +++++++++++++++--
 util/grub.d/10_linux.in    |  9 +++++++++
 4 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a7a75e20..9f6c66e81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-10  Robert Millan  <rmh@gnu.org>
+
+	* util/grub.d/10_hurd.in: Add misc readability checks.
+	* util/grub.d/10_kfreebsd.in: Likewise.
+	* util/grub.d/10_linux.in: Likewise.
+
 2010-09-10  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-install.in: ${imgext} won't be defined here until the
diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index 350eb30a8..d8cc7aea4 100644
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -41,6 +41,14 @@ for i in /boot/gnumach* ; do
     basename=`basename $i`
     dirname=`dirname $i`
     rel_dirname=`make_system_path_relative_to_its_root $dirname`
+
+    if ! is_path_readable_by_grub ${dirname}/${basename} \
+        ${GRUB_DEVICE_BOOT} \
+        ${rel_dirname}/${basename} ; then
+      echo "${dirname}/${basename} is not readable by GRUB" >&2
+      exit 1
+    fi
+
     echo "Found GNU Mach: $i" >&2
     kernels="${kernels} ${rel_dirname}/${basename}"
     at_least_one=true
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index e39423999..bf1632bd6 100644
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -44,7 +44,7 @@ load_kfreebsd_module ()
   mod="$1"
   allow_fail="$2"
 
-  if ! test -e "${module_dir}/${mod}.ko" ; then
+  if ! is_path_readable_by_grub "${module_dir}/${mod}.ko" ; then
     if [ "${allow_fail}" = "true" ] ; then
       # Return silently
       return
@@ -77,6 +77,13 @@ kfreebsd_entry ()
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi
 
+  if ! is_path_readable_by_grub ${dirname}/${basename} \
+      ${GRUB_DEVICE_BOOT} \
+      ${rel_dirname}/${basename} ; then
+    echo "${dirname}/${basename} is not readable by GRUB" >&2
+    exit 1
+  fi
+
   printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
 	echo			'$(printf "$(gettext_quoted "Loading kernel of FreeBSD %s ...")" ${version})'
@@ -95,7 +102,13 @@ EOF
     zfs)
       load_kfreebsd_module opensolaris false
 
-      ls "${dirname}/zfs/zpool.cache" > /dev/null
+      if ! is_path_readable_by_grub ${dirname}/zfs/zpool.cache \
+          ${GRUB_DEVICE_BOOT} \
+          ${rel_dirname}/zfs/zpool.cache ; then
+        echo "${dirname}/zfs/zpool.cache is not readable by GRUB" >&2
+        exit 1
+      fi
+
       printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
 	kfreebsd_module		${rel_dirname}/zfs/zpool.cache type=/boot/zfs/zpool.cache
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 14b85c7f1..765a7fab6 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -83,6 +83,15 @@ EOF
 EOF
   fi
 
+  for i in ${basename} ${initrd} ; do
+    if ! is_path_readable_by_grub ${dirname}/${i} \
+        ${GRUB_DEVICE_BOOT} \
+        ${rel_dirname}/${i} ; then
+      echo "${dirname}/${i} is not readable by GRUB" >&2
+      exit 1
+    fi
+  done
+
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi

From 5ed7d816b406f191a8f787dbac888ab0d69729ca Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 10 Sep 2010 23:15:56 +0100
Subject: [PATCH 1578/1628] * util/grub-install.in: Don't try to verify
 core.img until after running grub-mkimage to create it.

---
 ChangeLog            |  5 +++++
 util/grub-install.in | 16 ++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9f6c66e81..8b5a2b99c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-10  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-install.in: Don't try to verify core.img until after
+	running grub-mkimage to create it.
+
 2010-09-10  Robert Millan  <rmh@gnu.org>
 
 	* util/grub.d/10_hurd.in: Add misc readability checks.
diff --git a/util/grub-install.in b/util/grub-install.in
index c30f900db..3ac7f677f 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -402,14 +402,7 @@ case "${target_cpu}-${platform}" in
 esac
 
 # Verify readability of a few critical files
-# verify_files is a temporary workaround; drop this once the install branch
-# is merged.
-verify_files=grubenv
-if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ]; then
-    verify_files="$verify_files core.img"
-fi
-verify_files="$verify_files normal.mod"
-for file in $verify_files ; do
+for file in grubenv normal.mod ; do
     if is_path_readable_by_grub ${grubdir}/${file} ${grub_device} ${relative_grubdir}/${file} ; then : ; else
         echo "GRUB is unable to read ${grubdir}/${file}" >&2
         exit 1
@@ -419,6 +412,13 @@ done
 if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then
     $grub_mkimage ${config_opt} -O ${mkimage_target} --output=${grubdir}/core.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 
+    # This is a temporary workaround; it can be merged back into the check
+    # above once the install branch is merged.
+    if is_path_readable_by_grub ${grubdir}/core.img ${grub_device} ${relative_grubdir}/core.img ; then : ; else
+        echo "GRUB is unable to read ${grubdir}/core.img" >&2
+        exit 1
+    fi
+
     # Now perform the installation.
     $grub_setup ${setup_verbose} ${setup_force} --directory=${grubdir} --device-map=${device_map} \
         ${install_device} || exit 1

From 050abaeaa80014f4ea847ef5dea4b445014a0ded Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 11 Sep 2010 16:58:06 +0200
Subject: [PATCH 1579/1628] 	Fix emu on mipsel.

	* conf/Makefile.common (CFLAGS_PLATFORM): Add -mflush-func
	=grub_cpu_flush_cache on all mips and not only yeeloong.
	* configure.ac (COND_mips): New conditional.
	* grub-core/Makefile.am (KERNEL_HEADER_FILES): Add libgcc on all
	platforms.
	* grub-core/kern/emu/cache.S (__mips__): Use _flush_cache.
	* grub-core/kern/emu/full.c (grub_arch_dl_init_linker)
	[GRUB_LINKER_HAVE_INIT]: New function.
	(grub_emu_post_init): Likewise.
	* grub-core/kern/emu/lite.c (grub_emu_post_init): Likewise.
	* grub-core/kern/emu/main.c: Use grub_emu_post_init.
	* include/grub/cache.h (_mips): Include mips/cache.h.
	* include/grub/disk.h [GRUB_UTIL || GRUB_MACHINE_EMU]: Add missing
	LVM and RAID prototypes.
	* include/grub/emu/misc.h (grub_emu_post_init): New proto.
	* include/grub/mips/time.h (grub_cpu_idle) [GRUB_MACHINE_EMU]: New
	function.
---
 ChangeLog                  | 22 ++++++++++++++++++++++
 conf/Makefile.common       | 17 +++++++++++------
 configure.ac               |  1 +
 grub-core/Makefile.am      |  4 +---
 grub-core/kern/emu/cache.S | 15 ++++++++++++++-
 grub-core/kern/emu/full.c  | 19 +++++++++++++++++++
 grub-core/kern/emu/lite.c  |  5 +++++
 grub-core/kern/emu/main.c  |  7 +------
 include/grub/cache.h       |  4 ++++
 include/grub/disk.h        |  9 +++++++++
 include/grub/emu/misc.h    |  1 +
 include/grub/mips/time.h   |  6 ++++++
 12 files changed, 94 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b5a2b99c..e80ccad9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2010-09-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Fix emu on mipsel.
+
+	* conf/Makefile.common (CFLAGS_PLATFORM): Add -mflush-func
+	=grub_cpu_flush_cache on all mips and not only yeeloong.
+	* configure.ac (COND_mips): New conditional.
+	* grub-core/Makefile.am (KERNEL_HEADER_FILES): Add libgcc on all
+	platforms.
+	* grub-core/kern/emu/cache.S (__mips__): Use _flush_cache.
+	* grub-core/kern/emu/full.c (grub_arch_dl_init_linker)
+	[GRUB_LINKER_HAVE_INIT]: New function.
+	(grub_emu_post_init): Likewise.
+	* grub-core/kern/emu/lite.c (grub_emu_post_init): Likewise.
+	* grub-core/kern/emu/main.c: Use grub_emu_post_init.
+	* include/grub/cache.h (_mips): Include mips/cache.h.
+	* include/grub/disk.h [GRUB_UTIL || GRUB_MACHINE_EMU]: Add missing
+	LVM and RAID prototypes.
+	* include/grub/emu/misc.h (grub_emu_post_init): New proto.
+	* include/grub/mips/time.h (grub_cpu_idle) [GRUB_MACHINE_EMU]: New
+	function.
+
 2010-09-10  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-install.in: Don't try to verify core.img until after
diff --git a/conf/Makefile.common b/conf/Makefile.common
index fca0f67ae..afa57b986 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -1,8 +1,10 @@
 # -*- makefile -*-
 
+CFLAGS_PLATFORM=
+
 # Platform specific options
 if COND_i386_pc
-  CFLAGS_PLATFORM = -mrtd -mregparm=3
+  CFLAGS_PLATFORM += -mrtd -mregparm=3
 endif
 if COND_i386_efi
   LDFLAGS_PLATFORM = -melf_i386
@@ -11,21 +13,24 @@ if COND_x86_64_efi
   LDFLAGS_PLATFORM = -melf_x86_64
 endif
 if COND_i386_qemu
-  CFLAGS_PLATFORM = -mrtd -mregparm=3
+  CFLAGS_PLATFORM += -mrtd -mregparm=3
 endif
 if COND_i386_coreboot
-  CFLAGS_PLATFORM = -mrtd -mregparm=3
+  CFLAGS_PLATFORM += -mrtd -mregparm=3
 endif
 if COND_i386_ieee1275
-  CFLAGS_PLATFORM = -mrtd -mregparm=3
+  CFLAGS_PLATFORM += -mrtd -mregparm=3
 endif
 if COND_mips_yeeloong
-  CFLAGS_PLATFORM = -march=mips3 -mexplicit-relocs -mflush-func=grub_cpu_flush_cache
+  CFLAGS_PLATFORM += -march=mips3 -mexplicit-relocs
   CPPFLAGS_PLATFORM = -DUSE_ASCII_FAILBACK
   CCASFLAGS_PLATFORM = -march=mips3
 endif
+if COND_mips
+  CFLAGS_PLATFORM += -mflush-func=grub_cpu_flush_cache
+endif
 if COND_sparc64_ieee1275
-  CFLAGS_PLATFORM = -mno-app-regs
+  CFLAGS_PLATFORM += -mno-app-regs
   LDFLAGS_PLATFORM = -melf64_sparc -mno-relax
 endif
 
diff --git a/configure.ac b/configure.ac
index d50dfe6dd..9578f6518 100644
--- a/configure.ac
+++ b/configure.ac
@@ -900,6 +900,7 @@ AM_CONDITIONAL([COND_mips_yeeloong], [test x$target_cpu = xmips -a x$platform =
 AM_CONDITIONAL([COND_mips_qemu_mips], [test x$target_cpu = xmips -a x$platform = xqemu_mips])
 AM_CONDITIONAL([COND_sparc64_ieee1275], [test x$target_cpu = xsparc64 -a x$platform = xieee1275])
 AM_CONDITIONAL([COND_powerpc_ieee1275], [test x$target_cpu = xpowerpc -a x$platform = xieee1275])
+AM_CONDITIONAL([COND_mips], [test x$target_cpu = xmips])
 
 AM_CONDITIONAL([COND_HOST_HURD], [test x$host_kernel = xhurd])
 AM_CONDITIONAL([COND_HOST_LINUX], [test x$host_kernel = xlinux])
diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 5d13d0313..7fa00b744 100644
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -74,6 +74,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm_private.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
 
 if COND_i386_pc
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
@@ -132,7 +133,6 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap_scale.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cs5536.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pci.h
 KERNEL_HEADER_FILES += $(top_builddir)/include/grub/serial.h
@@ -140,11 +140,9 @@ endif
 
 if COND_powerpc_ieee1275
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
 endif
 
 if COND_sparc64_ieee1275
-KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sparc64/ieee1275/ieee1275.h
 endif
diff --git a/grub-core/kern/emu/cache.S b/grub-core/kern/emu/cache.S
index 90a5b5396..abd81c910 100644
--- a/grub-core/kern/emu/cache.S
+++ b/grub-core/kern/emu/cache.S
@@ -7,7 +7,20 @@
 #elif defined(__sparc__)
 #include "../sparc64/cache.S"
 #elif defined(__mips__)
-#include "../mips/cache.S"
+/* On MIPS we must go through standard functions.  */
+#include <grub/symbol.h>
+
+FUNCTION (grub_cpu_flush_cache)
+FUNCTION (grub_arch_sync_caches)
+	.set nomacro
+	.set noreorder
+	lui $t0, %hi(_flush_cache)
+	addui $t0, $t0, %lo(_flush_cache)
+	move $a3, $zero
+	jr $t0
+	 nop
+	.set reorder
+	.set macro
 #elif defined(__powerpc__)
 #include "../powerpc/cache.S"
 #else
diff --git a/grub-core/kern/emu/full.c b/grub-core/kern/emu/full.c
index 0bd33337f..a5801db2f 100644
--- a/grub-core/kern/emu/full.c
+++ b/grub-core/kern/emu/full.c
@@ -22,6 +22,7 @@
 #include <grub/kernel.h>
 #include <grub/misc.h>
 #include <grub/emu/misc.h>
+#include <grub/disk.h>
 
 void
 grub_register_exported_symbols (void)
@@ -48,3 +49,21 @@ grub_emu_init (void)
 {
   grub_no_autoload = 1;
 }
+
+#ifdef GRUB_LINKER_HAVE_INIT
+void
+grub_arch_dl_init_linker (void)
+{
+}
+#endif
+
+void
+grub_emu_post_init (void)
+{
+  grub_lvm_fini ();
+  grub_mdraid_fini ();
+  grub_raid_fini ();
+  grub_raid_init ();
+  grub_mdraid_init ();
+  grub_lvm_init ();
+}
diff --git a/grub-core/kern/emu/lite.c b/grub-core/kern/emu/lite.c
index 9b3728717..32e12a079 100644
--- a/grub-core/kern/emu/lite.c
+++ b/grub-core/kern/emu/lite.c
@@ -38,3 +38,8 @@ grub_emu_init (void)
 {
   return;
 }
+
+void
+grub_emu_post_init (void)
+{
+}
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index 8867f6101..23b8516f1 100644
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -197,12 +197,7 @@ main (int argc, char *argv[])
 
   grub_init_all ();
 
-  grub_lvm_fini ();
-  grub_mdraid_fini ();
-  grub_raid_fini ();
-  grub_raid_init ();
-  grub_mdraid_init ();
-  grub_lvm_init ();
+  grub_emu_post_init ();
 
   /* Make sure that there is a root device.  */
   if (! root_dev)
diff --git a/include/grub/cache.h b/include/grub/cache.h
index 27e44f0a2..4f913f5c8 100644
--- a/include/grub/cache.h
+++ b/include/grub/cache.h
@@ -23,6 +23,10 @@
 #include <grub/symbol.h>
 #include <grub/types.h>
 
+#ifdef _mips
+#include <grub/mips/cache.h>
+#endif
+
 #if defined (__i386__) || defined (__x86_64__)
 static inline void
 grub_arch_sync_caches (void *address __attribute__ ((unused)),
diff --git a/include/grub/disk.h b/include/grub/disk.h
index e7f807e0e..b41f89b38 100644
--- a/include/grub/disk.h
+++ b/include/grub/disk.h
@@ -177,4 +177,13 @@ struct grub_disk_ata_pass_through_parms
 extern grub_err_t (* EXPORT_VAR(grub_disk_ata_pass_through)) (grub_disk_t,
 		   struct grub_disk_ata_pass_through_parms *);
 
+#if defined (GRUB_UTIL) || defined (GRUB_MACHINE_EMU)
+void grub_lvm_init (void);
+void grub_mdraid_init (void);
+void grub_raid_init (void);
+void grub_lvm_fini (void);
+void grub_mdraid_fini (void);
+void grub_raid_fini (void);
+#endif
+
 #endif /* ! GRUB_DISK_HEADER */
diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
index e9038c916..972bc4efc 100644
--- a/include/grub/emu/misc.h
+++ b/include/grub/emu/misc.h
@@ -45,6 +45,7 @@ extern const char *program_name;
 void grub_emu_init (void);
 void grub_init_all (void);
 void grub_fini_all (void);
+void grub_emu_post_init (void);
 
 void grub_find_zpool_from_dir (const char *dir,
 			       char **poolname, char **poolfs);
diff --git a/include/grub/mips/time.h b/include/grub/mips/time.h
index e69de29bb..b143a48e0 100644
--- a/include/grub/mips/time.h
+++ b/include/grub/mips/time.h
@@ -0,0 +1,6 @@
+#ifdef GRUB_MACHINE_EMU
+static inline void
+grub_cpu_idle(void)
+{
+}
+#endif

From 25761e13eed9fa02ee56c088dbeffa450b6b4326 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Sat, 11 Sep 2010 17:21:48 +0200
Subject: [PATCH 1580/1628] 	* util/grub-install.in (grub_partition): New
 variable. 	Set prefix_drive on EFI and PC to (,$grub_partition) as last
 resort. 	* util/i386/pc/grub-setup.c (setup): Don't touch prefix. 
 Fixes a bug reported by Yves Blusseau.

---
 ChangeLog                 |  8 ++++++++
 util/grub-install.in      |  4 ++++
 util/i386/pc/grub-setup.c | 19 -------------------
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e80ccad9e..02cbb91cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-11  Vladimir Serbinenko  <phcoder@gmail.com>
+2010-09-11  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-install.in (grub_partition): New variable.
+	Set prefix_drive on EFI and PC to (,$grub_partition) as last resort.
+	* util/i386/pc/grub-setup.c (setup): Don't touch prefix.
+	Fixes a bug reported by Yves Blusseau.
+
 2010-09-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix emu on mipsel.
diff --git a/util/grub-install.in b/util/grub-install.in
index 3ac7f677f..ef1778b2a 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -367,6 +367,7 @@ if [ "x${devabstraction_module}" = "x" ] ; then
     grub_drive="`$grub_probe --target=drive --device ${grub_device}`" || exit 1
 
     # Strip partition number
+    grub_partition="`echo ${grub_drive} | sed -e 's/^[^,]*,//; s/)$//'`"
     grub_drive="`echo ${grub_drive} | sed -e s/,[a-z0-9,]*//g`"
     if [ "$disk_module" = ata ] ; then
         # generic method (used on coreboot and ata mod)
@@ -389,6 +390,9 @@ if [ "x${devabstraction_module}" = "x" ] ; then
 	echo 'set prefix=($root)'"${relative_grubdir}" >> ${grubdir}/load.cfg
 	config_opt="-c ${grubdir}/load.cfg "
         modules="$modules search_fs_uuid"
+    elif [ "x$platform" = xefi ] || [ "x$platform" = xpc ]; then
+        # we need to hardcode the partition number in the core image's prefix.
+        prefix_drive="(,$grub_partition)"
     fi
 else
     prefix_drive=`$grub_probe --target=drive --device ${grub_device}` || exit 1
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index ff5aeda40..987e2d05a 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -81,8 +81,6 @@ setup (const char *dir,
   struct grub_boot_blocklist *first_block, *block;
   grub_int32_t *install_dos_part, *install_bsd_part;
   grub_int32_t dos_part, bsd_part;
-  char *install_prefix;
-  char *prefix = NULL;
   char *tmp_img;
   int i;
   grub_disk_addr_t first_sector;
@@ -214,8 +212,6 @@ setup (const char *dir,
 				       + GRUB_KERNEL_MACHINE_INSTALL_DOS_PART);
   install_bsd_part = (grub_int32_t *) (core_img + GRUB_DISK_SECTOR_SIZE
 				       + GRUB_KERNEL_MACHINE_INSTALL_BSD_PART);
-  install_prefix = (char *) (core_img + GRUB_DISK_SECTOR_SIZE +
-			     GRUB_KERNEL_MACHINE_PREFIX);
 
   /* Open the root device and the destination device.  */
   root_dev = grub_device_open (root);
@@ -291,16 +287,6 @@ setup (const char *dir,
 	      dos_part = root_dev->disk->partition->number;
  	      bsd_part = -1;
  	    }
-
-	  if (install_prefix[0] != '(')
-	    {
-	      char *root_part_name;
-
-	      root_part_name =
-		grub_partition_get_name (root_dev->disk->partition);
-	      prefix = xasprintf ("(,%s)%s", root_part_name, install_prefix);
-	      free (root_part_name);
-	    }
 	}
       else
 	dos_part = bsd_part = -1;
@@ -389,8 +375,6 @@ setup (const char *dir,
 
   *install_dos_part = grub_cpu_to_le32 (dos_part);
   *install_bsd_part = grub_cpu_to_le32 (bsd_part);
-  if (prefix)
-    strcpy (install_prefix, prefix);
 
   /* The first blocklist contains the whole sectors.  */
   first_block->start = grub_cpu_to_le64 (embed_region.start + 1);
@@ -553,8 +537,6 @@ unable_to_embed:
 
   *install_dos_part = grub_cpu_to_le32 (dos_part);
   *install_bsd_part = grub_cpu_to_le32 (bsd_part);
-  if (prefix)
-    strcpy (install_prefix, prefix);
 
   /* Write the first two sectors of the core image onto the disk.  */
   grub_util_info ("opening the core image `%s'", core_path);
@@ -574,7 +556,6 @@ unable_to_embed:
   /* Sync is a Good Thing.  */
   sync ();
 
-  free (prefix);
   free (core_path);
   free (core_img);
   free (boot_img);

From 1aa4fe882236d4f14a38dd00c514365b70e3363c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sat, 11 Sep 2010 17:41:56 +0200
Subject: [PATCH 1581/1628] 	Implement loading palette on ieee1275_fb.

	* grub-core/video/ieee1275.c (stdout_ihandle): New variable.
	(have_setcolors): Likewise.
	(grub_video_ieee1275_init): Fill stdout_ihandle and have_setcolors.
	(grub_video_ieee1275_setup): Use grub_video_ieee1275_set_palette.
	(grub_video_ieee1275_set_palette): Implement.
---
 ChangeLog                  | 10 ++++++++++
 grub-core/video/ieee1275.c | 38 +++++++++++++++++++++++++-------------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 02cbb91cf..57b11981f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Implement loading palette on ieee1275_fb.
+
+	* grub-core/video/ieee1275.c (stdout_ihandle): New variable.
+	(have_setcolors): Likewise.
+	(grub_video_ieee1275_init): Fill stdout_ihandle and have_setcolors.
+	(grub_video_ieee1275_setup): Use grub_video_ieee1275_set_palette.
+	(grub_video_ieee1275_set_palette): Implement.
+
 2010-09-11  Vladimir Serbinenko  <phcoder@gmail.com>
 2010-09-11  Colin Watson  <cjwatson@ubuntu.com>
 
diff --git a/grub-core/video/ieee1275.c b/grub-core/video/ieee1275.c
index 9c9477c2b..501ba7c2f 100644
--- a/grub-core/video/ieee1275.c
+++ b/grub-core/video/ieee1275.c
@@ -32,6 +32,8 @@
 static unsigned old_width, old_height;
 static int restore_needed;
 static char *display;
+static grub_ieee1275_ihandle_t stdout_ihandle;
+static int have_setcolors = 0;
 
 static struct
 {
@@ -72,7 +74,17 @@ find_display (void)
 static grub_err_t
 grub_video_ieee1275_init (void)
 {
+  grub_ssize_t actual;
+
   grub_memset (&framebuffer, 0, sizeof(framebuffer));
+
+  if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_CANNOT_SET_COLORS)
+      && !grub_ieee1275_get_integer_property (grub_ieee1275_chosen,
+					      "stdout", &stdout_ihandle,
+					      sizeof (stdout_ihandle), &actual)
+      && actual == sizeof (stdout_ihandle))
+    have_setcolors = 1;
+
   return grub_video_fb_init ();
 }
 
@@ -169,9 +181,6 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height,
   /* For some reason sparc64 uses 32-bit pointer too.  */
   framebuffer.ptr = (void *) (grub_addr_t) address;
 
-  grub_video_ieee1275_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
-				   grub_video_fbstd_colors);
-
   grub_dprintf ("video", "IEEE1275: initialising FB @ %p %dx%dx%d\n",
 		framebuffer.ptr, framebuffer.mode_info.width,
 		framebuffer.mode_info.height, framebuffer.mode_info.bpp);
@@ -192,15 +201,10 @@ grub_video_ieee1275_setup (unsigned int width, unsigned int height,
       grub_dprintf ("video", "IEEE1275: Couldn't set FB target\n");
       return err;
     }
-  
-  err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
-				   grub_video_fbstd_colors);
 
-  if (err)
-    grub_dprintf ("video", "IEEE1275: Couldn't set palette\n");
-  else
-    grub_dprintf ("video", "IEEE1275: Success\n");
-  
+  grub_video_ieee1275_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS,
+				   grub_video_fbstd_colors);
+    
   return err;
 }
 
@@ -243,9 +247,17 @@ grub_video_ieee1275_set_palette (unsigned int start, unsigned int count,
   if (err)
     return err;
 
-  grub_video_fb_get_palette (0, 256, fb_palette_data);
+  grub_video_fb_get_palette (0, ARRAY_SIZE (fb_palette_data), fb_palette_data);
 
-  /* TODO. */
+  /* Set colors.  */
+  if (have_setcolors)
+    {
+      unsigned col;
+      for (col = 0; col < ARRAY_SIZE (fb_palette_data); col++)
+	grub_ieee1275_set_color (stdout_ihandle, col, fb_palette_data[col].r,
+				 fb_palette_data[col].g,
+				 fb_palette_data[col].b);
+    }
 
   return GRUB_ERR_NONE;
 }

From 3c70f225b2d7d4da2c1333c582a54fcb253ff359 Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon@janc.net.pl>
Date: Sat, 11 Sep 2010 20:08:37 +0200
Subject: [PATCH 1582/1628] 	* grub-core/commands/lsacpi.c
 (grub_cmd_lsacpi): Fix prototype.

---
 ChangeLog                   | 4 ++++
 grub-core/commands/lsacpi.c | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b2164f905..330656cc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-11  Szymon Janc <szymon@janc.net.pl>
+
+	* grub-core/commands/lsacpi.c (grub_cmd_lsacpi): Fix prototype.
+
 2010-09-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Shutdown using ACPI.
diff --git a/grub-core/commands/lsacpi.c b/grub-core/commands/lsacpi.c
index d20b80fed..149de6b79 100644
--- a/grub-core/commands/lsacpi.c
+++ b/grub-core/commands/lsacpi.c
@@ -196,10 +196,11 @@ static const struct grub_arg_option options[] = {
 };
 
 static grub_err_t
-grub_cmd_lsacpi (struct grub_extcmd *cmd, int argc __attribute__ ((unused)),
+grub_cmd_lsacpi (struct grub_extcmd_context *ctxt,
+		 int argc __attribute__ ((unused)),
 		 char **args __attribute__ ((unused)))
 {
-  if (!cmd->state[1].set)
+  if (!ctxt->state[1].set)
     {
       struct grub_acpi_rsdp_v10 *rsdp1 = grub_acpi_get_rsdpv1 ();
       if (!rsdp1)
@@ -212,7 +213,7 @@ grub_cmd_lsacpi (struct grub_extcmd *cmd, int argc __attribute__ ((unused)),
 	}
     }
 
-  if (!cmd->state[0].set)
+  if (!ctxt->state[0].set)
     {
       struct grub_acpi_rsdp_v20 *rsdp2 = grub_acpi_get_rsdpv2 ();
       if (!rsdp2)

From d2467d2361cef8465b4483d1756fb9831b0b12b4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 12 Sep 2010 01:45:58 +0200
Subject: [PATCH 1583/1628] Add Hercules, Planar and YUV to videoinfo (not
 tested)

---
 grub-core/commands/videoinfo.c | 15 +++++++++++++-
 grub-core/video/i386/pc/vbe.c  | 36 ++++++++++++++++++++++++++++++----
 include/grub/video.h           |  4 ++++
 3 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/grub-core/commands/videoinfo.c b/grub-core/commands/videoinfo.c
index febb56aba..9ee3f1af5 100644
--- a/grub-core/commands/videoinfo.c
+++ b/grub-core/commands/videoinfo.c
@@ -34,6 +34,8 @@ hook (const struct grub_video_mode_info *info)
     grub_printf ("  0x%03x ", info->mode_number);
   grub_printf ("%4d x %4d x %2d  ", info->width, info->height, info->bpp);
 
+  if (info->mode_type & GRUB_VIDEO_MODE_TYPE_PURE_TEXT)
+    grub_printf ("Text-only ");
   /* Show mask and position details for direct color modes.  */
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_RGB)
     grub_printf ("Direct, mask: %d/%d/%d/%d  pos: %d/%d/%d/%d",
@@ -46,7 +48,18 @@ hook (const struct grub_video_mode_info *info)
 		 info->blue_field_pos,
 		 info->reserved_field_pos);
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_INDEX_COLOR)
-    grub_printf ("Packed");
+    grub_printf ("Packed ");
+  if (info->mode_type & GRUB_VIDEO_MODE_TYPE_YUV)
+    grub_printf ("YUV ");
+  if (info->mode_type & GRUB_VIDEO_MODE_TYPE_PLANAR)
+    grub_printf ("Planar ");
+  if (info->mode_type & GRUB_VIDEO_MODE_TYPE_HERCULES)
+    grub_printf ("Hercules ");
+  if (info->mode_type & GRUB_VIDEO_MODE_TYPE_1BIT_BITMAP)
+    grub_printf ("Monochrome ");
+  if (info->mode_type & GRUB_VIDEO_MODE_TYPE_UNKNOWN)
+    grub_printf ("Unknown ");
+
   grub_printf ("\n");
 
   return 0;
diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c
index 1d2a9ac76..be266d238 100644
--- a/grub-core/video/i386/pc/vbe.c
+++ b/grub-core/video/i386/pc/vbe.c
@@ -555,14 +555,39 @@ vbe2videoinfo (grub_uint32_t mode,
 
   mode_info->width = vbeinfo->x_resolution;
   mode_info->height = vbeinfo->y_resolution;
+  mode_info->mode_type = 0;
   switch (vbeinfo->memory_model)
     {
-    case GRUB_VBE_MEMORY_MODEL_PACKED_PIXEL:
-      mode_info->mode_type = GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
+    case GRUB_VBE_MEMORY_MODEL_TEXT:
+      mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_PURE_TEXT;
       break;
-	  
+
+      /* CGA is basically 4-bit packed pixel.  */
+    case GRUB_VBE_MEMORY_MODEL_CGA:
+    case GRUB_VBE_MEMORY_MODEL_PACKED_PIXEL:
+      mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
+      break;
+
+    case GRUB_VBE_MEMORY_MODEL_HERCULES:
+      mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_HERCULES
+	| GRUB_VIDEO_MODE_TYPE_1BIT_BITMAP;
+      break;
+
+      /* Non chain 4 is a special case of planar.  */
+    case GRUB_VBE_MEMORY_MODEL_NONCHAIN4_256:
+    case GRUB_VBE_MEMORY_MODEL_PLANAR:
+      mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_PLANAR;
+      break;
+
+    case GRUB_VBE_MEMORY_MODEL_YUV:
+      mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_YUV;
+      break;
+      
     case GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR:
-      mode_info->mode_type = GRUB_VIDEO_MODE_TYPE_RGB;
+      mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_RGB;
+      break;
+    default:
+      mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_UNKNOWN;
       break;
     }
 
@@ -585,6 +610,9 @@ vbe2videoinfo (grub_uint32_t mode,
     case 8:
       mode_info->bytes_per_pixel = 1;
       break;  
+    case 4:
+      mode_info->bytes_per_pixel = 0;
+      break;  
     }
 
   if (controller_info.version >= 0x300)
diff --git a/include/grub/video.h b/include/grub/video.h
index 1c1bf16ab..6381efe64 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -38,6 +38,10 @@ struct grub_video_bitmap;
 /* If following is set render target contains currenly displayed image
    after swapping buffers (otherwise it contains previously displayed image).
  */
+#define GRUB_VIDEO_MODE_TYPE_YUV                0x00000800
+#define GRUB_VIDEO_MODE_TYPE_PLANAR             0x00000400
+#define GRUB_VIDEO_MODE_TYPE_HERCULES           0x00000200
+#define GRUB_VIDEO_MODE_TYPE_UNKNOWN            0x00000100
 #define GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP	0x00000080
 #define GRUB_VIDEO_MODE_TYPE_PURE_TEXT		0x00000040
 #define GRUB_VIDEO_MODE_TYPE_ALPHA		0x00000020

From 4dd58a6edd36d933c690bcb6f538afb684de489b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 12 Sep 2010 02:09:09 +0200
Subject: [PATCH 1584/1628] Change video_mode_type to an enum, fix collisions
 and add a bit more info

---
 grub-core/commands/videoinfo.c |  4 +++
 grub-core/video/i386/pc/vbe.c  |  5 +++-
 include/grub/video.h           | 51 +++++++++++++++++++++-------------
 3 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/grub-core/commands/videoinfo.c b/grub-core/commands/videoinfo.c
index 9ee3f1af5..15f677e14 100644
--- a/grub-core/commands/videoinfo.c
+++ b/grub-core/commands/videoinfo.c
@@ -55,6 +55,10 @@ hook (const struct grub_video_mode_info *info)
     grub_printf ("Planar ");
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_HERCULES)
     grub_printf ("Hercules ");
+  if (info->mode_type & GRUB_VIDEO_MODE_TYPE_CGA)
+    grub_printf ("CGA ");
+  if (info->mode_type & GRUB_VIDEO_MODE_TYPE_NONCHAIN4)
+    grub_printf ("Non-chain 4 ");
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_1BIT_BITMAP)
     grub_printf ("Monochrome ");
   if (info->mode_type & GRUB_VIDEO_MODE_TYPE_UNKNOWN)
diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c
index be266d238..4bb46e4cd 100644
--- a/grub-core/video/i386/pc/vbe.c
+++ b/grub-core/video/i386/pc/vbe.c
@@ -564,6 +564,7 @@ vbe2videoinfo (grub_uint32_t mode,
 
       /* CGA is basically 4-bit packed pixel.  */
     case GRUB_VBE_MEMORY_MODEL_CGA:
+      mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_CGA;
     case GRUB_VBE_MEMORY_MODEL_PACKED_PIXEL:
       mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
       break;
@@ -575,8 +576,10 @@ vbe2videoinfo (grub_uint32_t mode,
 
       /* Non chain 4 is a special case of planar.  */
     case GRUB_VBE_MEMORY_MODEL_NONCHAIN4_256:
+      mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_NONCHAIN4;
     case GRUB_VBE_MEMORY_MODEL_PLANAR:
-      mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_PLANAR;
+      mode_info->mode_type |= GRUB_VIDEO_MODE_TYPE_PLANAR
+	| GRUB_VIDEO_MODE_TYPE_INDEX_COLOR;
       break;
 
     case GRUB_VBE_MEMORY_MODEL_YUV:
diff --git a/include/grub/video.h b/include/grub/video.h
index 6381efe64..5350d87eb 100644
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -38,24 +38,33 @@ struct grub_video_bitmap;
 /* If following is set render target contains currenly displayed image
    after swapping buffers (otherwise it contains previously displayed image).
  */
-#define GRUB_VIDEO_MODE_TYPE_YUV                0x00000800
-#define GRUB_VIDEO_MODE_TYPE_PLANAR             0x00000400
-#define GRUB_VIDEO_MODE_TYPE_HERCULES           0x00000200
-#define GRUB_VIDEO_MODE_TYPE_UNKNOWN            0x00000100
-#define GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP	0x00000080
-#define GRUB_VIDEO_MODE_TYPE_PURE_TEXT		0x00000040
-#define GRUB_VIDEO_MODE_TYPE_ALPHA		0x00000020
-#define GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED	0x00000010
-#define GRUB_VIDEO_MODE_TYPE_1BIT_BITMAP	0x00000004
-#define GRUB_VIDEO_MODE_TYPE_INDEX_COLOR	0x00000002
-#define GRUB_VIDEO_MODE_TYPE_RGB		0x00000001
+typedef enum grub_video_mode_type
+  {
+    GRUB_VIDEO_MODE_TYPE_RGB              = 0x00000001,
+    GRUB_VIDEO_MODE_TYPE_INDEX_COLOR      = 0x00000002,
+    GRUB_VIDEO_MODE_TYPE_1BIT_BITMAP      = 0x00000004,
+    GRUB_VIDEO_MODE_TYPE_YUV              = 0x00000008,
 
-/* Defines used to mask flags.  */
-#define GRUB_VIDEO_MODE_TYPE_COLOR_MASK		0x0000000F
+    /* Defines used to mask flags.  */
+    GRUB_VIDEO_MODE_TYPE_COLOR_MASK       = 0x0000000F,
 
-/* Defines used to specify requested bit depth.  */
-#define GRUB_VIDEO_MODE_TYPE_DEPTH_MASK		0x0000ff00
-#define GRUB_VIDEO_MODE_TYPE_DEPTH_POS		8
+    GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED  = 0x00000010,
+    GRUB_VIDEO_MODE_TYPE_ALPHA            = 0x00000020,
+    GRUB_VIDEO_MODE_TYPE_PURE_TEXT        = 0x00000040,
+    GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP    = 0x00000080,
+    GRUB_VIDEO_MODE_TYPE_OPERATIONAL_MASK = 0x000000F0,
+
+    /* Defines used to specify requested bit depth.  */
+    GRUB_VIDEO_MODE_TYPE_DEPTH_MASK       = 0x0000FF00,
+#define GRUB_VIDEO_MODE_TYPE_DEPTH_POS	  8
+
+    GRUB_VIDEO_MODE_TYPE_UNKNOWN          = 0x00010000,
+    GRUB_VIDEO_MODE_TYPE_HERCULES         = 0x00020000,
+    GRUB_VIDEO_MODE_TYPE_PLANAR           = 0x00040000,
+    GRUB_VIDEO_MODE_TYPE_NONCHAIN4        = 0x00080000,
+    GRUB_VIDEO_MODE_TYPE_CGA              = 0x00100000,
+    GRUB_VIDEO_MODE_TYPE_INFO_MASK        = 0x00FF0000,
+  } grub_video_mode_type_t;
 
 /* The basic render target representing the whole display.  This always
    renders to the back buffer when double-buffering is in use.  */
@@ -107,7 +116,7 @@ struct grub_video_mode_info
 
   /* Mode type bitmask.  Contains information like is it Index color or
      RGB mode.  */
-  unsigned int mode_type;
+  grub_video_mode_type_t mode_type;
 
   /* Bits per pixel.  */
   unsigned int bpp;
@@ -232,7 +241,8 @@ struct grub_video_adapter
   grub_err_t (*fini) (void);
 
   grub_err_t (*setup) (unsigned int width,  unsigned int height,
-                       unsigned int mode_type, unsigned int mode_mask);
+                       grub_video_mode_type_t mode_type,
+		       grub_video_mode_type_t mode_mask);
 
   grub_err_t (*get_info) (struct grub_video_mode_info *mode_info);
 
@@ -409,8 +419,9 @@ grub_err_t EXPORT_FUNC (grub_video_set_mode) (const char *modestring,
 					      unsigned int modevalue);
 
 static inline int
-grub_video_check_mode_flag (unsigned int flags, unsigned int mask,
-			    unsigned int flag, int def)
+grub_video_check_mode_flag (grub_video_mode_type_t flags,
+			    grub_video_mode_type_t mask,
+			    grub_video_mode_type_t flag, int def)
 {
   return (flag & mask) ? !! (flags & flag) : def;
 }

From b062152c2ae490fa41938b23cc288c1aff4da2a2 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 12 Sep 2010 02:18:14 +0200
Subject: [PATCH 1585/1628] Allow specifying video mode

---
 grub-core/commands/videotest.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/grub-core/commands/videotest.c b/grub-core/commands/videotest.c
index 22bd648d0..435ac2937 100644
--- a/grub-core/commands/videotest.c
+++ b/grub-core/commands/videotest.c
@@ -26,11 +26,11 @@
 #include <grub/command.h>
 #include <grub/i18n.h>
 #include <grub/gfxmenu_view.h>
+#include <grub/env.h>
 
 static grub_err_t
 grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),
-                    int argc __attribute__ ((unused)),
-                    char **args __attribute__ ((unused)))
+                    int argc, char **args)
 {
   grub_err_t err;
   grub_video_color_t color;
@@ -41,13 +41,20 @@ grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),
   int i;
   struct grub_video_render_target *text_layer;
   grub_video_color_t palette[16];
+  const char *mode = NULL;
 
 #ifdef GRUB_MACHINE_PCBIOS
   if (grub_strcmp (cmd->name, "vbetest") == 0)
     grub_dl_load ("vbe");
 #endif
 
-  err = grub_video_set_mode ("auto", GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
+  mode = grub_env_get ("gfxmode");
+  if (argc)
+    mode = args[0];
+  if (!mode)
+    mode = "auto";
+
+  err = grub_video_set_mode (mode, GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
   if (err)
     return err;
 
@@ -192,7 +199,8 @@ static grub_command_t cmd_vbe;
 GRUB_MOD_INIT(videotest)
 {
   cmd = grub_register_command ("videotest", grub_cmd_videotest,
-			       0, N_("Test video subsystem."));
+			       "[WxH]",
+			       N_("Test video subsystem in mode WxH."));
 #ifdef GRUB_MACHINE_PCBIOS
   cmd_vbe = grub_register_command ("vbetest", grub_cmd_videotest,
 			       0, N_("Test video subsystem."));

From 788f1f3a85e3b369124cc698f7979b73819a656b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 12 Sep 2010 13:50:24 +0200
Subject: [PATCH 1586/1628] 	* grub-core/lib/xzembed/xz_dec_stream.c
 (xz_dec_reset): Preserve context 	pointer.

---
 ChangeLog                             |  5 +++++
 grub-core/lib/xzembed/xz_dec_stream.c | 11 +++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 330656cc3..f82f12467 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/xzembed/xz_dec_stream.c (xz_dec_reset): Preserve context
+	pointer.
+
 2010-09-11  Szymon Janc <szymon@janc.net.pl>
 
 	* grub-core/commands/lsacpi.c (grub_cmd_lsacpi): Fix prototype.
diff --git a/grub-core/lib/xzembed/xz_dec_stream.c b/grub-core/lib/xzembed/xz_dec_stream.c
index 642492483..ff26f5119 100644
--- a/grub-core/lib/xzembed/xz_dec_stream.c
+++ b/grub-core/lib/xzembed/xz_dec_stream.c
@@ -830,8 +830,15 @@ void xz_dec_reset(struct xz_dec *s)
 	s->allow_buf_error = false;
 	s->pos = 0;
 
-	memzero(&s->block, sizeof(s->block));
-	memzero(&s->index, sizeof(s->index));
+	{
+		uint8_t *t;
+		t = s->block.hash.crc32_context;
+		memzero(&s->block, sizeof(s->block));
+		s->block.hash.crc32_context = t;
+		t = s->index.hash.crc32_context;
+		memzero(&s->index, sizeof(s->index));
+		s->index.hash.crc32_context = t;
+	}
 	s->temp.pos = 0;
 	s->temp.size = STREAM_HEADER_SIZE;
 

From faca6bec3b87b5973998ed44bbc42e7273e491ab Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 12 Sep 2010 13:53:12 +0200
Subject: [PATCH 1587/1628] 	* grub-core/commands/menuentry.c
 (append_menu_entry): Don't rely on 	args ending with NULL.

---
 ChangeLog                      | 7 ++++++-
 grub-core/commands/menuentry.c | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f82f12467..79fd79556 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2010-09-11  Vladimir Serbinenko  <phcoder@gmail.com>
+2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/menuentry.c (append_menu_entry): Don't rely on
+	args ending with NULL.
+
+2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/lib/xzembed/xz_dec_stream.c (xz_dec_reset): Preserve context
 	pointer.
diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
index fc1ae71c7..c28c6ef6f 100644
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -128,7 +128,7 @@ append_menu_entry (int argc, const char **args, char **classes,
   if (! menu_args)
     goto fail;
 
-  for (i = 0; args[i]; i++)
+  for (i = 0; i < argc; i++)
     {
       menu_args[i] = grub_strdup (args[i]);
       if (! menu_args[i])

From 4870900f8fa000335070852a917c85c68aae664a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 12 Sep 2010 13:55:52 +0200
Subject: [PATCH 1588/1628] 	* grub-core/kern/emu/main.c (main): Call
 hostfs_init only after init_all.

---
 ChangeLog                 | 4 ++++
 grub-core/kern/emu/main.c | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 79fd79556..436c0980b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/emu/main.c (main): Call hostfs_init only after init_all.
+
 2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/commands/menuentry.c (append_menu_entry): Don't rely on
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
index 23b8516f1..c575beb4b 100644
--- a/grub-core/kern/emu/main.c
+++ b/grub-core/kern/emu/main.c
@@ -190,13 +190,14 @@ main (int argc, char *argv[])
   grub_emu_init ();
   grub_console_init ();
   grub_host_init ();
-  grub_hostfs_init ();
 
   /* XXX: This is a bit unportable.  */
   grub_util_biosdisk_init (dev_map);
 
   grub_init_all ();
 
+  grub_hostfs_init ();
+
   grub_emu_post_init ();
 
   /* Make sure that there is a root device.  */

From 768ec2e2adef102e74e1739b8ffdacf50ab57552 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 12 Sep 2010 14:00:44 +0200
Subject: [PATCH 1589/1628] 	* grub-core/kern/misc.c (grub_vprintf): Use
 va_copy when necessary. 	(grub_xvasprintf): Likewise.

---
 ChangeLog             | 5 +++++
 grub-core/kern/misc.c | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 436c0980b..46f430bdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/misc.c (grub_vprintf): Use va_copy when necessary.
+	(grub_xvasprintf): Likewise.
+
 2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/emu/main.c (main): Call hostfs_init only after init_all.
diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
index 0bfa08992..6e0eaf6a4 100644
--- a/grub-core/kern/misc.c
+++ b/grub-core/kern/misc.c
@@ -196,6 +196,8 @@ grub_vprintf (const char *fmt, va_list args)
   grub_size_t s;
   static char buf[PREALLOC_SIZE + 1];
   char *curbuf = buf;
+  va_list ap2;
+  va_copy (ap2, args);
 
   s = grub_vsnprintf_real (buf, PREALLOC_SIZE, fmt, args);
   if (s > PREALLOC_SIZE)
@@ -210,7 +212,7 @@ grub_vprintf (const char *fmt, va_list args)
 	  buf[PREALLOC_SIZE] = 0;
 	}
       else
-	s = grub_vsnprintf_real (curbuf, s, fmt, args);
+	s = grub_vsnprintf_real (curbuf, s, fmt, ap2);
     }
 
   grub_xputs (curbuf);
@@ -947,11 +949,13 @@ grub_xvasprintf (const char *fmt, va_list ap)
 
   while (1)
     {
+      va_list ap2;
+      va_copy (ap2, ap);
       ret = grub_malloc (as + 1);
       if (!ret)
 	return NULL;
 
-      s = grub_vsnprintf_real (ret, as, fmt, ap);
+      s = grub_vsnprintf_real (ret, as, fmt, ap2);
       if (s <= as)
 	return ret;
 

From 84fb3b3d73b4a1d594cb750033930db640da084a Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 12 Sep 2010 20:12:16 +0200
Subject: [PATCH 1590/1628] 	* grub-core/commands/ls.c (grub_cmd_ls):
 Accept multiple files.

---
 ChangeLog               | 4 ++++
 grub-core/commands/ls.c | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 46f430bdc..72959e665 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/ls.c (grub_cmd_ls): Accept multiple files.
+
 2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/misc.c (grub_vprintf): Use va_copy when necessary.
diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c
index 02915bac4..ed8afd4ae 100644
--- a/grub-core/commands/ls.c
+++ b/grub-core/commands/ls.c
@@ -253,12 +253,14 @@ static grub_err_t
 grub_cmd_ls (grub_extcmd_context_t ctxt, int argc, char **args)
 {
   struct grub_arg_list *state = ctxt->state;
+  int i;
 
   if (argc == 0)
     grub_ls_list_devices (state[0].set);
   else
-    grub_ls_list_files (args[0], state[0].set, state[2].set,
-			state[1].set);
+    for (i = 0; i < argc; i++)
+      grub_ls_list_files (args[i], state[0].set, state[2].set,
+			  state[1].set);
 
   return 0;
 }

From d8a84076eaa7c0cbc27644760bddf3054832ae53 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 12 Sep 2010 20:15:30 +0200
Subject: [PATCH 1591/1628] 	* grub-core/commands/wildcard.c (make_regex):
 Escape brackets.

---
 ChangeLog                     | 4 ++++
 grub-core/commands/wildcard.c | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 72959e665..2eaee5571 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/wildcard.c (make_regex): Escape brackets.
+
 2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/commands/ls.c (grub_cmd_ls): Accept multiple files.
diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
index 64e2e3a54..6eab333b3 100644
--- a/grub-core/commands/wildcard.c
+++ b/grub-core/commands/wildcard.c
@@ -137,8 +137,10 @@ make_regex (const char *start, const char *end, regex_t *regexp)
 	  break;
 
 	case '.':
+	case '(':
+	case ')':
 	  buffer[i++] = '\\';
-	  buffer[i++] = '.';
+	  buffer[i++] = ch;
 	  break;
 
 	case '*':
@@ -152,6 +154,7 @@ make_regex (const char *start, const char *end, regex_t *regexp)
     }
   buffer[i++] = '$';
   buffer[i] = '\0';
+  grub_dprintf ("expand", "Regexp is %s\n", buffer);
 
   if (regcomp (regexp, buffer, RE_SYNTAX_GNU_AWK))
     {
@@ -224,6 +227,7 @@ match_devices (const regex_t *regexp, int noparts)
     grub_dprintf ("expand", "matching: %s\n", buffer);
     if (regexec (regexp, buffer, 0, 0, 0))
       {
+	grub_dprintf ("expand", "not matched\n");
 	grub_free (buffer);
 	return 0;
       }

From 2fc8ccb97fbfae43301a36b17d48c7560f18e537 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 12 Sep 2010 20:18:50 +0200
Subject: [PATCH 1592/1628] 	* grub-core/normal/misc.c
 (grub_normal_print_device_info): Show 	partition size and offset.

---
 ChangeLog               |  5 +++++
 grub-core/normal/misc.c | 11 +++++++++++
 2 files changed, 16 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2eaee5571..7d957c5cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/misc.c (grub_normal_print_device_info): Show
+	partition size and offset.
+
 2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/commands/wildcard.c (make_regex): Escape brackets.
diff --git a/grub-core/normal/misc.c b/grub-core/normal/misc.c
index 2b84b1c82..ad408074b 100644
--- a/grub-core/normal/misc.c
+++ b/grub-core/normal/misc.c
@@ -26,6 +26,7 @@
 #include <grub/datetime.h>
 #include <grub/term.h>
 #include <grub/i18n.h>
+#include <grub/partition.h>
 
 /* Print the information on the device NAME.  */
 grub_err_t
@@ -112,6 +113,16 @@ grub_normal_print_device_info (const char *name)
       else
 	grub_printf ("%s", _("Partition table"));
 
+      if (dev->disk->partition)
+	grub_printf (_(" - Partition start at %u"),
+		     grub_partition_get_start (dev->disk->partition));
+      if (grub_disk_get_size (dev->disk) == GRUB_DISK_SIZE_UNKNOWN)
+	grub_printf (_(" - Total size unknown"),
+		     grub_disk_get_size (dev->disk));
+      else
+	grub_printf (_(" - Total size %u sectors"),
+		     grub_disk_get_size (dev->disk));
+
       grub_device_close (dev);
     }
 

From d547dc281c2a383917ce473860a8de04e29886b7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 12 Sep 2010 22:05:27 +0200
Subject: [PATCH 1593/1628] 	* grub-core/normal/term.c
 (put_glyphs_terminal): Correct sign. 	(print_backlog): set backlog_ucs4 and
 backlog_glyphs. 	Reported by: Yves Blusseau.

---
 ChangeLog               | 6 ++++++
 grub-core/normal/term.c | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7d957c5cf..3e8ccf4eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/term.c (put_glyphs_terminal): Correct sign.
+	(print_backlog): set backlog_ucs4 and backlog_glyphs.
+	Reported by: Yves Blusseau.
+
 2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/normal/misc.c (grub_normal_print_device_info): Show
diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c
index b55c0f06a..760900e86 100644
--- a/grub-core/normal/term.c
+++ b/grub-core/normal/term.c
@@ -657,7 +657,7 @@ put_glyphs_terminal (const struct grub_unicode_glyph *visual,
 	      >= (grub_ssize_t) grub_term_height (term) - 2)
 	    {
 	      state->backlog_glyphs = visual_ptr + 1;
-	      state->backlog_len = visual_len - (visual - visual_ptr) - 1;
+	      state->backlog_len = visual_len - (visual_ptr - visual) - 1;
 	      return 1;
 	    }
 
@@ -688,6 +688,7 @@ print_backlog (struct grub_term_output *term,
 	  grub_free (state->free);
 	  state->free = NULL;
 	  state->backlog_len = 0;
+	  state->backlog_ucs4 = 0;
 	}
       return ret;
     }
@@ -703,6 +704,7 @@ print_backlog (struct grub_term_output *term,
 	  grub_free (state->free);
 	  state->free = NULL;
 	  state->backlog_len = 0;
+	  state->backlog_glyphs = 0;
 	}
       return ret;
     }

From b23ffd70eb42ef0a42ef30be6eada058f0bb8d47 Mon Sep 17 00:00:00 2001
From: Yves Blusseau <blusseau@zetam.org>
Date: Mon, 13 Sep 2010 10:29:18 +0200
Subject: [PATCH 1594/1628]     Bash completion script for util commands

    * Makefile.am:  Add util/bash-completion.d directory
    * configure.ac: Likewise.
    * util/bash-completion.d/Makefile.am: New file.
    * util/bash-completion.d/grub-completion.bash.in: Likewise.
---
 ChangeLog                                     |   9 +
 Makefile.am                                   |   2 +-
 configure.ac                                  |   1 +
 util/bash-completion.d/Makefile.am            |  13 +
 .../bash-completion.d/grub-completion.bash.in | 467 ++++++++++++++++++
 5 files changed, 491 insertions(+), 1 deletion(-)
 create mode 100644 util/bash-completion.d/Makefile.am
 create mode 100644 util/bash-completion.d/grub-completion.bash.in

diff --git a/ChangeLog b/ChangeLog
index 3e8ccf4eb..53cf3501c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-13  Yves Blusseau  <blusseau@zetam.org>
+
+	Bash completion script for util commands
+
+	* Makefile.am:  Add util/bash-completion.d directory
+	* configure.ac: Likewise.
+	* util/bash-completion.d/Makefile.am: New file.
+	* util/bash-completion.d/grub-completion.bash.in: Likewise.
+
 2010-09-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/normal/term.c (put_glyphs_terminal): Correct sign.
diff --git a/Makefile.am b/Makefile.am
index e0f2f013f..93d1e37fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 DEPDIR = .deps-util
-SUBDIRS = . grub-core po docs
+SUBDIRS = . grub-core po docs util/bash-completion.d
 
 include $(top_srcdir)/conf/Makefile.common
 include $(top_srcdir)/conf/Makefile.extra-dist
diff --git a/configure.ac b/configure.ac
index 9578f6518..e3116ee7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -939,6 +939,7 @@ AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([grub-core/Makefile])
 AC_CONFIG_FILES([po/Makefile])
 AC_CONFIG_FILES([docs/Makefile])
+AC_CONFIG_FILES([util/bash-completion.d/Makefile])
 AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
 
 AC_OUTPUT
diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am
new file mode 100644
index 000000000..58171988d
--- /dev/null
+++ b/util/bash-completion.d/Makefile.am
@@ -0,0 +1,13 @@
+
+bash_completion_source = grub-completion.bash.in
+bash_completion_script = grub
+
+EXTRA_DIST = $(bash_completion_source)
+
+CLEANFILES = $(bash_completion_script)
+
+bashcompletiondir = $(sysconfdir)/bash_completion.d
+bashcompletion_DATA = $(bash_completion_script)
+
+$(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status
+	$(top_builddir)/config.status --file=$@:$<
diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in
new file mode 100644
index 000000000..abba0df78
--- /dev/null
+++ b/util/bash-completion.d/grub-completion.bash.in
@@ -0,0 +1,467 @@
+#
+# Bash completion for grub
+#
+# Copyright (C) 2010  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/>.
+# bash completion for grub
+
+__grub_dir() {
+    local i c=1 boot_dir
+
+    for (( c=1; c <= ${#COMP_WORDS[@]}; c++ )); do
+        i="${COMP_WORDS[c]}"
+        case "$i" in
+            --boot-directory)
+                c=$((++c))
+                i="${COMP_WORDS[c]}"
+                boot_dir="${i##*=}";
+                break
+                ;;
+        esac
+    done
+    boot_dir=${boot_dir-/@bootdirname@}
+    echo "${boot_dir%/}/@grubdirname@"
+}
+
+
+# This function generates completion reply with compgen
+# - arg: accepts 1, 2, 3, or 4 arguments
+#        $1 wordlist separate by space, tab or newline
+#        $2 (optional) prefix to add
+#        $3 (optional) current word to complete
+#        $4 (optional) suffix to add
+__grubcomp () {
+    local cur="${COMP_WORDS[COMP_CWORD]}"
+    if [ $# -gt 2 ]; then
+        cur="$3"
+    fi
+    case "$cur" in
+    --*=)
+        COMPREPLY=()
+        ;;
+    *)
+        local IFS=' '$'\t'$'\n'
+        COMPREPLY=($(compgen -P "${2-}" -W "${1-}" -S "${4-}" -- "$cur"))
+        ;;
+    esac
+}
+
+# Function that return long options from the help
+# - arg: $1 (optional) command to get the long options from
+__grub_get_options_from_help () {
+     local prog
+
+     if [ $# -ge 1 ]; then
+         prog="$1"
+     else
+         prog="${COMP_WORDS[0]}"
+     fi
+
+     local i IFS=" "$'\t'$'\n'
+     for i in $($prog --help)
+     do
+        case $i in
+             --*) echo "${i%=*}";;
+         esac
+     done
+}
+
+__grub_get_last_option () {
+    local i
+    for (( i=$COMP_CWORD-1; i > 0; i-- )); do
+        if [[ "${COMP_WORDS[i]}" == -* ]]; then
+            echo "${COMP_WORDS[i]}"
+            break;
+        fi
+    done
+}
+
+__grub_list_menuentries () {
+    local cur="${COMP_WORDS[COMP_CWORD]}"
+    local config_file=$(__grub_dir)/grub.cfg
+
+    if [ -f "$config_file" ];then
+        local IFS=$'\n'
+        COMPREPLY=( $(compgen \
+            -W "$( awk -F "[\"']" '/menuentry/ { print $2 }' $config_file )" \
+            -- "$cur" )) #'# Help emacs syntax highlighting
+    fi
+}
+
+__grub_list_modules () {
+    local grub_dir=$(__grub_dir)
+    local IFS=$'\n'
+    COMPREPLY=( $( compgen -f -X '!*/*.mod' -- "${grub_dir}/$cur" | {
+         while read -r tmp; do
+             [ -n $tmp ] && {
+                 tmp=${tmp##*/}
+                 printf '%s\n' ${tmp%.mod}
+             }
+         done
+         }
+        ))
+}
+
+#
+# grub-set-default & grub-reboot
+#
+_grub_set_entry () {
+    local cur prev split=false
+
+    COMPREPLY=()
+    cur=`_get_cword`
+    prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    _split_longopt && split=true
+
+    case "$prev" in
+        --boot-directory)
+            _filedir -d
+            return
+            ;;
+    esac
+
+    $split && return 0
+
+    if [[ "$cur" == -* ]]; then
+        __grubcomp "$(__grub_get_options_from_help)"
+    else
+        # Default complete with a menuentry
+        __grub_list_menuentries
+    fi
+}
+
+__grub_set_default_program=$( echo grub-set-default | sed "@program_transform_name@" )
+have ${__grub_set_default_program} && \
+    complete -F _grub_set_entry -o filenames ${__grub_set_default_program}
+unset __grub_set_default_program
+
+__grub_reboot_program=$( echo grub-reboot | sed "@program_transform_name@" )
+have ${__grub_reboot_program} && \
+ complete -F _grub_set_entry -o filenames ${__grub_reboot_program}
+unset __grub_reboot_program
+
+
+#
+# grub-editenv
+#
+_grub_editenv () {
+    local cur prev
+
+    COMPREPLY=()
+    cur=`_get_cword`
+    prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    case "$prev" in
+        create|list|set|unset)
+            COMPREPLY=( "" )
+            return
+            ;;
+    esac
+
+    __grubcomp "$(__grub_get_options_from_help)
+                create list set unset"
+}
+
+__grub_editenv_program=$( echo grub-editenv | sed "@program_transform_name@" )
+have ${__grub_editenv_program} && \
+ complete -F _grub_editenv -o filenames ${__grub_editenv_program}
+unset __grub_editenv_program
+
+
+#
+# grub-mkconfig
+#
+_grub_mkconfig () {
+    local cur prev
+
+    COMPREPLY=()
+    cur=`_get_cword`
+
+    if [[ "$cur" == -* ]]; then
+        __grubcomp "$(__grub_get_options_from_help)"
+    else
+        _filedir
+    fi
+}
+__grub_mkconfig_program=$( echo grub-mkconfig | sed "@program_transform_name@" )
+have ${__grub_mkconfig_program} && \
+ complete -F _grub_mkconfig -o filenames ${__grub_mkconfig_program}
+unset __grub_mkconfig_program
+
+
+#
+# grub-setup
+#
+_grub_setup () {
+    local cur prev split=false
+
+    COMPREPLY=()
+    cur=`_get_cword`
+    prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    _split_longopt && split=true
+
+    case "$prev" in
+        -d|--directory)
+            _filedir -d
+            return
+            ;;
+    esac
+
+    $split && return 0
+
+    if [[ "$cur" == -* ]]; then
+        __grubcomp "$(__grub_get_options_from_help)"
+    else
+        # Default complete with a filename
+        _filedir
+    fi
+}
+__grub_setup_program=$( echo grub-setup | sed "@program_transform_name@" )
+have ${__grub_setup_program} && \
+ complete -F _grub_setup -o filenames ${__grub_setup_program}
+unset __grub_setup_program
+
+
+#
+# grub-install
+#
+_grub_install () {
+    local cur prev last split=false
+
+    COMPREPLY=()
+    cur=`_get_cword`
+    prev=${COMP_WORDS[COMP_CWORD-1]}
+    last=$(__grub_get_last_option)
+
+    _split_longopt && split=true
+
+    case "$prev" in
+        --boot-directory)
+            _filedir -d
+            return
+            ;;
+        --disk-module)
+            __grubcomp "biosdisk ata"
+            return
+            ;;
+    esac
+
+    $split && return 0
+
+    if [[ "$cur" == -* ]]; then
+        __grubcomp "$(__grub_get_options_from_help)"
+    else
+        case "$last" in
+            --modules)
+                __grub_list_modules
+                return
+                ;;
+        esac
+
+        # Default complete with a filename
+        _filedir
+    fi
+}
+__grub_install_program=$( echo grub-install | sed "@program_transform_name@" )
+have ${__grub_install_program} && \
+ complete -F _grub_install -o filenames ${__grub_install_program}
+unset __grub_install_program
+
+
+#
+# grub-mkfont
+#
+_grub_mkfont () {
+    local cur
+
+    COMPREPLY=()
+    cur=`_get_cword`
+
+    if [[ "$cur" == -* ]]; then
+        __grubcomp "$(__grub_get_options_from_help)"
+    else
+        # Default complete with a filename
+        _filedir
+    fi
+}
+__grub_mkfont_program=$( echo grub-mkfont | sed "@program_transform_name@" )
+have ${__grub_mkfont_program} && \
+ complete -F _grub_mkfont -o filenames ${__grub_mkfont_program}
+unset __grub_mkfont_program
+
+
+#
+# grub-mkrescue
+#
+_grub_mkrescue () {
+    local cur prev last
+
+    COMPREPLY=()
+    cur=`_get_cword`
+    prev=${COMP_WORDS[COMP_CWORD-1]}
+    last=$(__grub_get_last_option)
+
+    if [[ "$cur" == -* ]]; then
+        __grubcomp "$(__grub_get_options_from_help)"
+    else
+        case "$last" in
+            --modules)
+                __grub_list_modules
+                return
+                ;;
+        esac
+
+        # Default complete with a filename
+        _filedir
+    fi
+}
+__grub_mkrescue_program=$( echo grub-mkrescue | sed "@program_transform_name@" )
+have ${__grub_mkrescue_program} && \
+ complete -F _grub_mkrescue -o filenames ${__grub_mkrescue_program}
+unset __grub_mkrescue_program
+
+
+#
+# grub-mkimage
+#
+_grub_mkimage () {
+    local cur prev split=false
+
+    COMPREPLY=()
+    cur=`_get_cword`
+    prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    _split_longopt && split=true
+
+    case "$prev" in
+        -d|--directory|-p|--prefix)
+            _filedir -d
+            return
+            ;;
+        -O|--format)
+            # Get available format from help
+            local prog=${COMP_WORDS[0]}
+            __grubcomp "$($prog --help | \
+                        awk -F ":" '/available formats/ { print $2 }' | \
+                        sed 's/, / /g')"
+            return
+            ;;
+    esac
+
+    $split && return 0
+
+    if [[ "$cur" == -* ]]; then
+        __grubcomp "$(__grub_get_options_from_help)"
+    else
+        # Default complete with a filename
+        _filedir
+    fi
+}
+__grub_mkimage_program=$( echo grub-mkimage | sed "@program_transform_name@" )
+have ${__grub_mkimage_program} && \
+ complete -F _grub_mkimage -o filenames ${__grub_mkimage_program}
+unset __grub_mkimage_program
+
+
+#
+# grub-mkpasswd-pbkdf2
+#
+_grub_mkpasswd-pbkdf2 () {
+    local cur
+
+    COMPREPLY=()
+    cur=`_get_cword`
+
+    if [[ "$cur" == -* ]]; then
+        __grubcomp "$(__grub_get_options_from_help)"
+    else
+        # Default complete with a filename
+        _filedir
+    fi
+}
+__grub_mkpasswd_pbkdf2_program=$( echo grub-mkpasswd-pbkdf2 | sed "@program_transform_name@" )
+have ${__grub_mkpasswd_pbkdf2_program} && \
+ complete -F _grub_mkpasswd-pbkdf2 -o filenames ${__grub_mkpasswd_pbkdf2_program}
+unset __grub_mkpasswd_pbkdf2_program
+
+
+#
+# grub-probe
+#
+_grub_probe () {
+    local cur prev split=false
+
+    COMPREPLY=()
+    cur=`_get_cword`
+    prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    _split_longopt && split=true
+
+    case "$prev" in
+        -t|--target)
+            # Get target type from help
+            local prog=${COMP_WORDS[0]}
+            __grubcomp "$($prog --help | \
+                        awk -F "[()]" '/--target=/ { print $2 }' | \
+                        sed 's/|/ /g')"
+            return
+            ;;
+    esac
+
+    $split && return 0
+
+    if [[ "$cur" == -* ]]; then
+        __grubcomp "$(__grub_get_options_from_help)"
+    else
+        # Default complete with a filename
+        _filedir
+    fi
+}
+__grub_probe_program=$( echo grub-probe | sed "@program_transform_name@" )
+have ${__grub_probe_program} && \
+ complete -F _grub_probe -o filenames ${__grub_probe_program}
+unset __grub_probe_program
+
+
+#
+# grub-script-check
+#
+_grub_script-check () {
+    local cur
+
+    COMPREPLY=()
+    cur=`_get_cword`
+
+    if [[ "$cur" == -* ]]; then
+        __grubcomp "$(__grub_get_options_from_help)"
+    else
+        # Default complete with a filename
+        _filedir
+    fi
+}
+__grub_script_check_program=$( echo grub-script-check | sed "@program_transform_name@" )
+have ${__grub_script_check_program} && \
+ complete -F _grub_script-check -o filenames ${__grub_script_check_program}
+
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh

From 53d4ca1afcb194cf67426e9c423476497d393c80 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 13 Sep 2010 11:48:01 +0200
Subject: [PATCH 1595/1628] Change from direct arguments to --hint

---
 grub-core/commands/search_wrap.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c
index 14028bec7..68497fa0d 100644
--- a/grub-core/commands/search_wrap.c
+++ b/grub-core/commands/search_wrap.c
@@ -37,6 +37,8 @@ static const struct grub_arg_option options[] =
     {"set",		's', GRUB_ARG_OPTION_OPTIONAL,
      N_("Set a variable to the first device found."), "VAR", ARG_TYPE_STRING},
     {"no-floppy",	'n', 0, N_("Do not probe any floppy drive."), 0, 0},
+    {"hint",	        'h', GRUB_ARG_OPTION_REPEATABLE,
+     N_("First try the device HINT"), N_("HINT"), ARG_TYPE_STRING},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -47,6 +49,7 @@ enum options
     SEARCH_FS_UUID,
     SEARCH_SET,
     SEARCH_NO_FLOPPY,
+    SEARCH_HINT
  };
 
 static grub_err_t
@@ -54,6 +57,11 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)
 {
   struct grub_arg_list *state = ctxt->state;
   const char *var = 0;
+  int nhints = 0;
+
+  if (state[SEARCH_HINT].set)
+    while (state[SEARCH_HINT].args[nhints])
+      nhints++;
 
   if (argc == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "no argument specified");
@@ -63,13 +71,13 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)
 
   if (state[SEARCH_LABEL].set)
     grub_search_label (args[0], var, state[SEARCH_NO_FLOPPY].set, 
-		       (const char **) (args + 1), argc - 1);
+		       (const char **) state[SEARCH_HINT].args, nhints);
   else if (state[SEARCH_FS_UUID].set)
     grub_search_fs_uuid (args[0], var, state[SEARCH_NO_FLOPPY].set,
-			 (const char **) (args + 1), argc - 1);
+			 (const char **) state[SEARCH_HINT].args, nhints);
   else if (state[SEARCH_FILE].set)
     grub_search_fs_file (args[0], var, state[SEARCH_NO_FLOPPY].set, 
-			 (const char **) (args + 1), argc - 1);
+			 (const char **) state[SEARCH_HINT].args, nhints);
   else
     return grub_error (GRUB_ERR_INVALID_COMMAND, "unspecified search type");
 
@@ -83,7 +91,8 @@ GRUB_MOD_INIT(search)
   cmd =
     grub_register_extcmd ("search", grub_cmd_search,
 			  GRUB_COMMAND_FLAG_BOTH,
-			  N_("[-f|-l|-u|-s|-n] NAME [HINTS]"),
+			  N_("[-f|-l|-u|-s|-n] [--hint HINT [--hint HINT] ...]"
+			     " NAME"),
 			  N_("Search devices by file, filesystem label"
 			     " or filesystem UUID."
 			     " If --set is specified, the first device found is"

From 1f1dd48a1748e8bff5b5d7cb293d30468d403ed7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 13 Sep 2010 12:16:22 +0200
Subject: [PATCH 1596/1628] support subpartition hints

---
 grub-core/commands/search.c      | 64 ++++++++++++++++++++++++++++++--
 grub-core/commands/search_wrap.c |  9 +++--
 include/grub/search.h            |  6 +--
 3 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/grub-core/commands/search.c b/grub-core/commands/search.c
index 9b693e76f..f265f86d6 100644
--- a/grub-core/commands/search.c
+++ b/grub-core/commands/search.c
@@ -28,10 +28,12 @@
 #include <grub/command.h>
 #include <grub/search.h>
 #include <grub/i18n.h>
+#include <grub/disk.h>
+#include <grub/partition.h>
 
 void
 FUNC_NAME (const char *key, const char *var, int no_floppy,
-	   const char **hints, unsigned nhints)
+	   char **hints, unsigned nhints)
 {
   int count = 0;
   grub_fs_autoload_hook_t saved_autoload;
@@ -115,13 +117,67 @@ FUNC_NAME (const char *key, const char *var, int no_floppy,
     return (found && var);
   }
 
+  auto int part_hook (grub_disk_t disk, const grub_partition_t partition);
+  int part_hook (grub_disk_t disk, const grub_partition_t partition)
+  {
+    char *partition_name, *devname;
+    int ret;
+
+    partition_name = grub_partition_get_name (partition);
+    if (! partition_name)
+      return 1;
+
+    devname = grub_xasprintf ("%s,%s", disk->name, partition_name);
+    grub_free (partition_name);
+    if (!devname)
+      return 1;
+    ret = iterate_device (devname);
+    grub_free (devname);    
+
+    return ret;
+  }
+
   auto void try (void);
   void try (void)    
   {
     unsigned i;
     for (i = 0; i < nhints; i++)
-      if (iterate_device (hints[i]))
-	return;
+      {
+	char *end;
+	if (!hints[i][0])
+	  continue;
+	end = hints[i] + grub_strlen (hints[i]) - 1;
+	if (*end == ',')
+	  *end = 0;
+	if (iterate_device (hints[i]))
+	  {
+	    if (!*end)
+	      *end = ',';
+	    return;
+	  }
+	if (!*end)
+	  {
+	    grub_device_t dev;
+	    int ret;
+	    dev = grub_device_open (hints[i]);
+	    if (!dev)
+	      {
+		*end = ',';
+		continue;
+	      }
+	    if (!dev->disk)
+	      {
+		grub_device_close (dev);
+		*end = ',';
+		continue;
+	      }
+	    ret = grub_partition_iterate (dev->disk, part_hook);
+	    *end = ',';
+	    grub_device_close (dev);
+	    if (ret)
+	      return;
+	  }
+      }
     grub_device_iterate (iterate_device);
   }
 
@@ -153,7 +209,7 @@ grub_cmd_do_search (grub_command_t cmd __attribute__ ((unused)), int argc,
   if (argc == 0)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "no argument specified");
 
-  FUNC_NAME (args[0], argc == 1 ? 0 : args[1], 0, (const char **) (args + 2),
+  FUNC_NAME (args[0], argc == 1 ? 0 : args[1], 0, (args + 2),
 	     argc > 2 ? argc - 2 : 0);
 
   return grub_errno;
diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c
index 68497fa0d..61eb78203 100644
--- a/grub-core/commands/search_wrap.c
+++ b/grub-core/commands/search_wrap.c
@@ -38,7 +38,8 @@ static const struct grub_arg_option options[] =
      N_("Set a variable to the first device found."), "VAR", ARG_TYPE_STRING},
     {"no-floppy",	'n', 0, N_("Do not probe any floppy drive."), 0, 0},
     {"hint",	        'h', GRUB_ARG_OPTION_REPEATABLE,
-     N_("First try the device HINT"), N_("HINT"), ARG_TYPE_STRING},
+     N_("First try the device HINT. If HINT ends in comma, "
+	"also try subpartitions"), N_("HINT"), ARG_TYPE_STRING},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -71,13 +72,13 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)
 
   if (state[SEARCH_LABEL].set)
     grub_search_label (args[0], var, state[SEARCH_NO_FLOPPY].set, 
-		       (const char **) state[SEARCH_HINT].args, nhints);
+		       state[SEARCH_HINT].args, nhints);
   else if (state[SEARCH_FS_UUID].set)
     grub_search_fs_uuid (args[0], var, state[SEARCH_NO_FLOPPY].set,
-			 (const char **) state[SEARCH_HINT].args, nhints);
+			 state[SEARCH_HINT].args, nhints);
   else if (state[SEARCH_FILE].set)
     grub_search_fs_file (args[0], var, state[SEARCH_NO_FLOPPY].set, 
-			 (const char **) state[SEARCH_HINT].args, nhints);
+			 state[SEARCH_HINT].args, nhints);
   else
     return grub_error (GRUB_ERR_INVALID_COMMAND, "unspecified search type");
 
diff --git a/include/grub/search.h b/include/grub/search.h
index 3c56f0305..d80347df3 100644
--- a/include/grub/search.h
+++ b/include/grub/search.h
@@ -20,10 +20,10 @@
 #define GRUB_SEARCH_HEADER 1
 
 void grub_search_fs_file (const char *key, const char *var, int no_floppy,
-			  const char **hints, unsigned nhints);
+			  char **hints, unsigned nhints);
 void grub_search_fs_uuid (const char *key, const char *var, int no_floppy,
-			  const char **hints, unsigned nhints);
+			  char **hints, unsigned nhints);
 void grub_search_label (const char *key, const char *var, int no_floppy,
-			const char **hints, unsigned nhints);
+			char **hints, unsigned nhints);
 
 #endif

From 0fd75223cca283694ffec2f74b2635604e1a3d5d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 13 Sep 2010 12:17:22 +0200
Subject: [PATCH 1597/1628] Add missing ChangeLog

---
 ChangeLog.hints | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 ChangeLog.hints

diff --git a/ChangeLog.hints b/ChangeLog.hints
new file mode 100644
index 000000000..16ae1cc90
--- /dev/null
+++ b/ChangeLog.hints
@@ -0,0 +1,6 @@
+2009-12-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Search hints support.
+
+	* commands/search.c (FUNC_NAME): New arguments hints and nhints.
+	All users updated.

From cf9827de73597be19869a6cdab1153baeb9af797 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 13 Sep 2010 13:09:58 +0200
Subject: [PATCH 1598/1628] 	Support explicit user claim that a device is
 BIOS-visible.

	* grub-core/kern/emu/getroot.c (grub_util_get_dev_abstraction):
	Return GRUB_DEV_ABSTRACTION_NONE if device is in device.map.
	* grub-core/kern/emu/hostdisk.c
	(convert_system_partition_to_system_disk): Support mdX.
	(find_system_device): New parameter add. All users updated.
	(grub_util_biosdisk_is_present): New function.
	* include/grub/emu/hostdisk.h (grub_util_biosdisk_is_present): New
	proto.
---
 ChangeLog                     | 13 +++++++++++++
 grub-core/kern/emu/getroot.c  |  4 ++++
 grub-core/kern/emu/hostdisk.c | 28 ++++++++++++++++++++++++++--
 include/grub/emu/hostdisk.h   |  1 +
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c0b77d906..f6678af06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Support explicit user claim that a device is BIOS-visible.
+
+	* grub-core/kern/emu/getroot.c (grub_util_get_dev_abstraction):
+	Return GRUB_DEV_ABSTRACTION_NONE if device is in device.map.
+	* grub-core/kern/emu/hostdisk.c
+	(convert_system_partition_to_system_disk): Support mdX.
+	(find_system_device): New parameter add. All users updated.
+	(grub_util_biosdisk_is_present): New function.
+	* include/grub/emu/hostdisk.h (grub_util_biosdisk_is_present): New
+	proto.
+
 2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Search hints support.
diff --git a/grub-core/kern/emu/getroot.c b/grub-core/kern/emu/getroot.c
index c0a10d22b..32dcb49ca 100644
--- a/grub-core/kern/emu/getroot.c
+++ b/grub-core/kern/emu/getroot.c
@@ -572,6 +572,10 @@ int
 grub_util_get_dev_abstraction (const char *os_dev __attribute__((unused)))
 {
 #ifdef __linux__
+  /* User explicitly claims that this drive is visible by BIOS.  */
+  if (grub_util_biosdisk_is_present (os_dev))
+    return GRUB_DEV_ABSTRACTION_NONE;
+
   /* Check for LVM.  */
   if (!strncmp (os_dev, "/dev/mapper/", 12)
       && ! grub_util_is_dmraid (os_dev)
diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
index 2cdf449e2..1eb6cb9d8 100644
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -1117,6 +1117,16 @@ convert_system_partition_to_system_disk (const char *os_dev, struct stat *st)
 	  return path;
 	}
 
+      if (strncmp ("md", p, 2) == 0
+	  && p[2] >= '0' && p[2] <= '9')
+	{
+	  char *ptr = p + 2;
+	  while (*ptr >= '0' && *ptr <= '9')
+	    ptr++;
+	  *ptr = 0;
+	  return path;
+	}
+
       /* If this is an IDE, SCSI or Virtio disk.  */
       if (strncmp ("vdisk", p, 5) == 0
 	  && p[5] >= 'a' && p[5] <= 'z')
@@ -1334,7 +1344,7 @@ device_is_wholedisk (const char *os_dev)
 #endif /* defined(__NetBSD__) */
 
 static int
-find_system_device (const char *os_dev, struct stat *st)
+find_system_device (const char *os_dev, struct stat *st, int add)
 {
   unsigned int i;
   char *os_disk;
@@ -1352,6 +1362,9 @@ find_system_device (const char *os_dev, struct stat *st)
 	return i;
       }
 
+  if (!add)
+    return -1;
+
   if (i == ARRAY_SIZE (map))
     grub_util_error (_("device count exceeds limit"));
 
@@ -1361,6 +1374,17 @@ find_system_device (const char *os_dev, struct stat *st)
   return i;
 }
 
+int
+grub_util_biosdisk_is_present (const char *os_dev)
+{
+  struct stat st;
+
+  if (stat (os_dev, &st) < 0)
+    return 0;
+
+  return find_system_device (os_dev, &st, 0) != -1;
+}
+
 char *
 grub_util_biosdisk_get_grub_dev (const char *os_dev)
 {
@@ -1373,7 +1397,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
       return 0;
     }
 
-  drive = find_system_device (os_dev, &st);
+  drive = find_system_device (os_dev, &st, 1);
   if (drive < 0)
     {
       grub_error (GRUB_ERR_UNKNOWN_DEVICE,
diff --git a/include/grub/emu/hostdisk.h b/include/grub/emu/hostdisk.h
index 246046ee0..5873aa440 100644
--- a/include/grub/emu/hostdisk.h
+++ b/include/grub/emu/hostdisk.h
@@ -26,5 +26,6 @@ void grub_util_biosdisk_init (const char *dev_map);
 void grub_util_biosdisk_fini (void);
 char *grub_util_biosdisk_get_grub_dev (const char *os_dev);
 const char *grub_util_biosdisk_get_osdev (grub_disk_t disk);
+int grub_util_biosdisk_is_present (const char *name);
 
 #endif /* ! GRUB_BIOSDISK_MACHINE_UTIL_HEADER */

From f452b0404823d6b338ccc08bb2f355f4d9955080 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 13 Sep 2010 14:26:55 +0200
Subject: [PATCH 1599/1628] 	* grub-core/normal/completion.c
 (complete_file): Handle device 	containing slash. 	Fix based on
 patch by Doug Nazar.

---
 ChangeLog                     | 6 ++++++
 grub-core/normal/completion.c | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 4a6fefc15..8a51142a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/completion.c (complete_file): Handle device
+	containing slash.
+	Fix based on patch by Doug Nazar.
+
 2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	grub-mknetdir script.
diff --git a/grub-core/normal/completion.c b/grub-core/normal/completion.c
index 1b51dab3a..a1e86adb0 100644
--- a/grub-core/normal/completion.c
+++ b/grub-core/normal/completion.c
@@ -247,7 +247,8 @@ complete_file (void)
       goto fail;
     }
 
-  dir = grub_strchr (current_word, '/');
+  dir = grub_strchr (current_word + (device ? 2 + grub_strlen (device) : 0),
+		     '/');
   last_dir = grub_strrchr (current_word, '/');
   if (dir)
     {

From fb53b340aab6f2d3b4a9093080f8230fb37c6131 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 13 Sep 2010 16:49:50 +0200
Subject: [PATCH 1600/1628] 	Fix sparc64.

	* configure.ac (GRUB_KERNEL_MACHINE_LINK_ADDR): Removed.
	* grub-core/Makefile.core.def (kernel): Make ldflags just use the
	right address. Add sparc64_ieee1275_ldflags.
	* grub-core/loader/sparc64/ieee1275/linux.c: Remove leftover include.
	* util/grub-mkimagexx.c (locate_sections): Correct grub_host_to_target32
	to grub_host_to_target_addr
	(load_image): Likewise.
---
 ChangeLog                                 | 12 ++++++++++++
 configure.ac                              | 12 ------------
 grub-core/Makefile.core.def               | 16 ++++++++--------
 grub-core/loader/sparc64/ieee1275/linux.c |  1 -
 util/grub-mkimagexx.c                     |  8 ++++----
 5 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8a51142a9..96e2ebcf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Fix sparc64.
+
+	* configure.ac (GRUB_KERNEL_MACHINE_LINK_ADDR): Removed.
+	* grub-core/Makefile.core.def (kernel): Make ldflags just use the
+	right address. Add sparc64_ieee1275_ldflags.
+	* grub-core/loader/sparc64/ieee1275/linux.c: Remove leftover include.
+	* util/grub-mkimagexx.c (locate_sections): Correct grub_host_to_target32
+	to grub_host_to_target_addr
+	(load_image): Likewise.
+
 2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/normal/completion.c (complete_file): Handle device
diff --git a/configure.ac b/configure.ac
index e3116ee7e..e519fdd1a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -867,20 +867,8 @@ pkglibrootdir='$(libdir)'/`echo $PACKAGE | sed "$program_transform_name"`
 AC_SUBST(pkglibrootdir)
 
 AC_SUBST([FONT_SOURCE])
-AS_IF([test x$target_cpu = xi386 -a x$platform = xpc],
-	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
-AS_IF([test x$target_cpu = xi386 -a x$platform = xcoreboot],
-	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
-AS_IF([test x$target_cpu = xi386 -a x$platform = xmultiboot],
-	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x8200)])
-AS_IF([test x$target_cpu = xmips -a x$platform = xyeeloong],
-	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x80200000)])
-AS_IF([test x$target_cpu = xpowerpc -a x$platform = xieee1275],
-	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x200000)])
 AS_IF([test x$target_cpu = xi386 -a x$platform = xqemu],
 	    [AC_SUBST([GRUB_BOOT_MACHINE_LINK_ADDR], 0xffe00)])
-AS_IF([test x$target_cpu = xi386 -a x$platform = xieee1275],
-	    [AC_SUBST([GRUB_KERNEL_MACHINE_LINK_ADDR], 0x10000)])
 AS_IF([test x$TARGET_APPLE_CC = x1],
 	    [AC_SUBST([USE_APPLE_CC_FIXES], yes)])
 
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 9100c6033..902ab48a8 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -10,20 +10,20 @@ kernel = {
   x86_efi_stripflags       = '--strip-unneeded -K start -R .note -R .comment';
 
   i386_pc_ldflags          = '$(TARGET_IMG_LDFLAGS)';
-  i386_pc_ldflags          = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  i386_pc_ldflags          = '$(TARGET_IMG_BASE_LDOPT),0x8200';
 
   i386_qemu_ldflags        = '$(TARGET_IMG_LDFLAGS)';
-  i386_qemu_ldflags        = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  i386_qemu_ldflags        = '$(TARGET_IMG_BASE_LDOPT),0x8200';
 
-  i386_coreboot_ldflags    = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
-  i386_multiboot_ldflags   = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
-  i386_ieee1275_ldflags    = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
-  mips_yeeloong_ldflags    = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
-  powerpc_ieee1275_ldflags = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+  i386_coreboot_ldflags    = '-Wl,-Ttext=0x8200';
+  i386_multiboot_ldflags   = '-Wl,-Ttext=0x8200';
+  i386_ieee1275_ldflags    = '-Wl,-Ttext=0x10000';
+  mips_yeeloong_ldflags    = '-Wl,-Ttext,0x80200000';
+  powerpc_ieee1275_ldflags = '-Wl,-Ttext,0x200000';
+  sparc64_ieee1275_ldflags = '-Wl,-Ttext,0x4400';
 
   mips_yeeloong_cppflags = '-DUSE_ASCII_FAILBACK';
   i386_qemu_cppflags     = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
-  i386_qemu_ccasflags    = '-DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
   emu_cflags = '$(CFLAGS_GNULIB)';
   emu_cppflags = '$(CPPFLAGS_GNULIB)';
 
diff --git a/grub-core/loader/sparc64/ieee1275/linux.c b/grub-core/loader/sparc64/ieee1275/linux.c
index 177a6976e..010353dc5 100644
--- a/grub-core/loader/sparc64/ieee1275/linux.c
+++ b/grub-core/loader/sparc64/ieee1275/linux.c
@@ -24,7 +24,6 @@
 #include <grub/mm.h>
 #include <grub/misc.h>
 #include <grub/ieee1275/ieee1275.h>
-#include <grub/gzio.h>
 #include <grub/command.h>
 #include <grub/i18n.h>
 
diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
index 4a257e329..ce51f2fbc 100644
--- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c
@@ -555,7 +555,7 @@ SUFFIX (locate_sections) (Elf_Shdr *sections, Elf_Half section_entsize,
        i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
     if (SUFFIX (is_text_section) (s, image_target))
       {
-	Elf_Word align = grub_host_to_target32 (s->sh_addralign);
+	Elf_Word align = grub_host_to_target_addr (s->sh_addralign);
 	const char *name = strtab + grub_host_to_target32 (s->sh_name);
 	if (align)
 	  current_address = ALIGN_UP (current_address + image_target->vaddr_offset,
@@ -577,7 +577,7 @@ SUFFIX (locate_sections) (Elf_Shdr *sections, Elf_Half section_entsize,
        i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
     if (SUFFIX (is_data_section) (s, image_target))
       {
-	Elf_Word align = grub_host_to_target32 (s->sh_addralign);
+	Elf_Word align = grub_host_to_target_addr (s->sh_addralign);
 	const char *name = strtab + grub_host_to_target32 (s->sh_name);
 
 	if (align)
@@ -641,7 +641,7 @@ SUFFIX (load_image) (const char *kernel_path, grub_size_t *exec_size,
   /* Relocate sections then symbols in the virtual address space.  */
   s = (Elf_Shdr *) ((char *) sections
 		      + grub_host_to_target16 (e->e_shstrndx) * section_entsize);
-  strtab = (char *) e + grub_host_to_target32 (s->sh_offset);
+  strtab = (char *) e + grub_host_to_target_addr (s->sh_offset);
 
   section_addresses = SUFFIX (locate_sections) (sections, section_entsize,
 						num_sections, strtab,
@@ -662,7 +662,7 @@ SUFFIX (load_image) (const char *kernel_path, grub_size_t *exec_size,
 	   i++, s = (Elf_Shdr *) ((char *) s + section_entsize))
 	if (grub_target_to_host32 (s->sh_type) == SHT_NOBITS)
 	  {
-	    Elf_Word align = grub_host_to_target32 (s->sh_addralign);
+	    Elf_Word align = grub_host_to_target_addr (s->sh_addralign);
 	    const char *name = strtab + grub_host_to_target32 (s->sh_name);
 
 	    if (align)

From b2a30ac5e46131c647d660d6c67ff7e60e4db178 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 13 Sep 2010 19:17:29 +0200
Subject: [PATCH 1601/1628] 	Filter devaliases and never open same device
 twice.

	* grub-core/disk/ieee1275/ofdisk.c (last_devpath): New variable.
	(last_ihandle): Likewise.
	(ofdisk_hash_ent): New member shortest.
	(ofdisk_hash_add): Add canonical path too.
	(scan): New function.
	(grub_ofdisk_iterate): Iterate over hashed entries.
	(compute_dev_path): Don't add :0.
	(grub_ofdisk_open): Don't really open the disk.
	(grub_ofdisk_close): Avoid closing unrelated disk.
	(grub_ofdisk_read): Implement reopen logic.
	* grub-core/kern/ieee1275/openfw.c (grub_ieee1275_canonicalise_devname):
	New function.
	* include/grub/ieee1275/ieee1275.h (grub_ieee1275_canonicalise_devname):
	New proto.
---
 ChangeLog                        |  19 +++
 grub-core/disk/ieee1275/ofdisk.c | 248 ++++++++++++++++++++-----------
 grub-core/kern/ieee1275/openfw.c |  44 ++++++
 include/grub/ieee1275/ieee1275.h |   2 +
 4 files changed, 227 insertions(+), 86 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 96e2ebcf8..8751b8daf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Filter devaliases and never open same device twice.
+
+	* grub-core/disk/ieee1275/ofdisk.c (last_devpath): New variable.
+	(last_ihandle): Likewise.
+	(ofdisk_hash_ent): New member shortest.
+	(ofdisk_hash_add): Add canonical path too.
+	(scan): New function.
+	(grub_ofdisk_iterate): Iterate over hashed entries.
+	(compute_dev_path): Don't add :0.
+	(grub_ofdisk_open): Don't really open the disk.
+	(grub_ofdisk_close): Avoid closing unrelated disk.
+	(grub_ofdisk_read): Implement reopen logic.
+	* grub-core/kern/ieee1275/openfw.c (grub_ieee1275_canonicalise_devname):
+	New function.
+	* include/grub/ieee1275/ieee1275.h (grub_ieee1275_canonicalise_devname):
+	New proto.
+
 2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix sparc64.
diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
index d0d9e894f..3d9976257 100644
--- a/grub-core/disk/ieee1275/ofdisk.c
+++ b/grub-core/disk/ieee1275/ofdisk.c
@@ -23,9 +23,15 @@
 #include <grub/ieee1275/ieee1275.h>
 #include <grub/ieee1275/ofdisk.h>
 
+static char *last_devpath;
+static grub_ieee1275_ihandle_t last_ihandle;
+
 struct ofdisk_hash_ent
 {
   char *devpath;
+  /* Pointer to shortest available name on nodes representing canonical names,
+     otherwise NULL.  */
+  const char *shortest;
   struct ofdisk_hash_ent *next;
 };
 
@@ -59,60 +65,125 @@ static struct ofdisk_hash_ent *
 ofdisk_hash_add (char *devpath)
 {
   struct ofdisk_hash_ent **head = &ofdisk_hash[ofdisk_hash_fn(devpath)];
-  struct ofdisk_hash_ent *p = grub_malloc(sizeof (*p));
+  struct ofdisk_hash_ent *p, *pcan;
+  char *curcan;
 
-  if (p)
+  p = grub_malloc(sizeof (*p));
+  if (!p)
+    return NULL;
+
+  p->devpath = devpath;
+  p->next = *head;
+  p->shortest = 0;
+  *head = p;
+
+  curcan = grub_ieee1275_canonicalise_devname (devpath);
+  if (!curcan)
     {
-      p->devpath = devpath;
-      p->next = *head;
-      *head = p;
+      grub_errno = GRUB_ERR_NONE;
+      return p;
     }
+
+  pcan = ofdisk_hash_find (curcan);
+  if (!pcan)
+    pcan = ofdisk_hash_add (curcan);
+  else
+    grub_free (curcan);
+
+  if (!pcan)
+    grub_errno = GRUB_ERR_NONE;
+  else
+    {
+      if (!pcan->shortest
+	  || grub_strlen (pcan->shortest) > grub_strlen (devpath))
+	pcan->shortest = devpath;
+    }
+
   return p;
 }
 
-static int
-grub_ofdisk_iterate (int (*hook) (const char *name))
+static void
+scan (void)
 {
   auto int dev_iterate (struct grub_ieee1275_devalias *alias);
 
   int dev_iterate (struct grub_ieee1275_devalias *alias)
     {
-      int ret = 0;
+      struct ofdisk_hash_ent *op;
+
+      grub_dprintf ("disk", "device name = %s type = %s\n", alias->name,
+		    alias->type);
+
+      if (grub_strcmp (alias->type, "block") != 0)
+	return 0;
 
       grub_dprintf ("disk", "disk name = %s\n", alias->name);
 
-      if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_OFDISK_SDCARD_ONLY))
+      op = ofdisk_hash_find (alias->path);
+      if (!op)
 	{
-	  grub_ieee1275_phandle_t dev;
-	  char tmp[8];
-
-	  if (grub_ieee1275_finddevice (alias->path, &dev))
+	  char *name = grub_strdup (alias->name);
+	  if (!name)
 	    {
-	      grub_dprintf ("disk", "finddevice (%s) failed\n", alias->path);
-	      return 0;
-	    }
-
-	  if (grub_ieee1275_get_property (dev, "iconname", tmp,
-					  sizeof tmp, 0))
-	    {
-	      grub_dprintf ("disk", "get iconname failed\n");
-	      return 0;
-	    }
-
-	  if (grub_strcmp (tmp, "sdmmc"))
-	    {
-	      grub_dprintf ("disk", "device is not an SD card\n");
+	      grub_errno = GRUB_ERR_NONE;
 	      return 0;
 	    }
+	  op = ofdisk_hash_add (name);
 	}
-
-      if (! grub_strcmp (alias->type, "block") &&
-	  grub_strncmp (alias->name, "cdrom", 5))
-	ret = hook (alias->name);
-      return ret;
+      return 0;
     }
 
-  return grub_devalias_iterate (dev_iterate);
+  grub_devalias_iterate (dev_iterate);
+  grub_ieee1275_devices_iterate (dev_iterate);
+}
+
+static int
+grub_ofdisk_iterate (int (*hook) (const char *name))
+{
+  unsigned i;
+  scan ();
+  
+  for (i = 0; i < ARRAY_SIZE (ofdisk_hash); i++)
+    {
+      static struct ofdisk_hash_ent *ent;
+      for (ent = ofdisk_hash[i]; ent; ent = ent->next)
+	{
+	  if (!ent->shortest)
+	    continue;
+	  if (grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_OFDISK_SDCARD_ONLY))
+	    {
+	      grub_ieee1275_phandle_t dev;
+	      char tmp[8];
+
+	      if (grub_ieee1275_finddevice (ent->devpath, &dev))
+		{
+		  grub_dprintf ("disk", "finddevice (%s) failed\n",
+				ent->devpath);
+		  continue;
+		}
+
+	      if (grub_ieee1275_get_property (dev, "iconname", tmp,
+					      sizeof tmp, 0))
+		{
+		  grub_dprintf ("disk", "get iconname failed\n");
+		  continue;
+		}
+
+	      if (grub_strcmp (tmp, "sdmmc") != 0)
+		{
+		  grub_dprintf ("disk", "device is not an SD card\n");
+		  continue;
+		}
+	    }
+
+	  if (grub_strncmp (ent->shortest, "cdrom", 5) == 0)
+	    continue;
+
+	  if (hook (ent->shortest))
+	    return 1;
+	}
+    }	  
+  return 0;
 }
 
 static char *
@@ -137,11 +208,6 @@ compute_dev_path (const char *name)
 	*p++ = c;
     }
 
-  if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_NO_PARTITION_0))
-    {
-      *p++ = ':';
-      *p++ = '0';
-    }
   *p++ = '\0';
 
   return devpath;
@@ -151,8 +217,6 @@ static grub_err_t
 grub_ofdisk_open (const char *name, grub_disk_t disk)
 {
   grub_ieee1275_phandle_t dev;
-  grub_ieee1275_ihandle_t dev_ihandle = 0;
-  struct ofdisk_hash_ent *op;
   char *devpath;
   /* XXX: This should be large enough for any possible case.  */
   char prop[64];
@@ -162,69 +226,52 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
   if (! devpath)
     return grub_errno;
 
-  op = ofdisk_hash_find (devpath);
-  if (!op)
-    op = ofdisk_hash_add (devpath);
+  grub_dprintf ("disk", "Opening `%s'.\n", devpath);
 
-  grub_free (devpath);
-  if (!op)
-    return grub_errno;
-
-  grub_dprintf ("disk", "Opening `%s'.\n", op->devpath);
-
-  if (grub_ieee1275_finddevice (op->devpath, &dev))
-    {
-      grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't read device properties");
-      goto fail;
-    }
+  if (grub_ieee1275_finddevice (devpath, &dev))
+    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't read device properties");
 
   if (grub_ieee1275_get_property (dev, "device_type", prop, sizeof (prop),
 				  &actual))
-    {
-      grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't read the device type");
-      goto fail;
-    }
+    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't read the device type");
 
   if (grub_strcmp (prop, "block"))
-    {
-      grub_error (GRUB_ERR_BAD_DEVICE, "not a block device");
-      goto fail;
-    }
-
-  grub_ieee1275_open (op->devpath, &dev_ihandle);
-  if (! dev_ihandle)
-    {
-      grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
-      goto fail;
-    }
-
-  grub_dprintf ("disk", "Opened `%s' as handle %p.\n", op->devpath,
-		(void *) (unsigned long) dev_ihandle);
+    return grub_error (GRUB_ERR_BAD_DEVICE, "not a block device");
 
   /* XXX: There is no property to read the number of blocks.  There
      should be a property `#blocks', but it is not there.  Perhaps it
      is possible to use seek for this.  */
   disk->total_sectors = GRUB_DISK_SIZE_UNKNOWN;
 
-  disk->id = (unsigned long) op;
+  {
+    struct ofdisk_hash_ent *op;
+    op = ofdisk_hash_find (devpath);
+    if (!op)
+      op = ofdisk_hash_add (devpath);
+    else
+      grub_free (devpath);
+    if (!op)
+      return grub_errno;
+    disk->id = (unsigned long) op;
+    disk->data = op->devpath;
+  }
 
   /* XXX: Read this, somehow.  */
   disk->has_partitions = 1;
-  disk->data = (void *) (unsigned long) dev_ihandle;
   return 0;
-
- fail:
-  if (dev_ihandle)
-    grub_ieee1275_close (dev_ihandle);
-  return grub_errno;
 }
 
 static void
 grub_ofdisk_close (grub_disk_t disk)
 {
-  grub_dprintf ("disk", "Closing handle %p.\n",
-		(void *) disk->data);
-  grub_ieee1275_close ((grub_ieee1275_ihandle_t) (unsigned long) disk->data);
+  if (disk->data == last_devpath)
+    {
+      if (last_ihandle)
+	grub_ieee1275_close (last_ihandle);
+      last_ihandle = 0;
+      last_devpath = NULL;
+    }
+  disk->data = 0;
 }
 
 static grub_err_t
@@ -234,16 +281,40 @@ grub_ofdisk_read (grub_disk_t disk, grub_disk_addr_t sector,
   grub_ssize_t status, actual;
   unsigned long long pos;
 
+  if (disk->data != last_devpath)
+    {
+      if (last_ihandle)
+	grub_ieee1275_close (last_ihandle);
+      last_ihandle = 0;
+      last_devpath = NULL;
+
+      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;      
+    }
+
   pos = sector * 512UL;
 
-  grub_ieee1275_seek ((grub_ieee1275_ihandle_t) (unsigned long) disk->data,
-		      pos, &status);
+  grub_ieee1275_seek (last_ihandle, pos, &status);
   if (status < 0)
     return grub_error (GRUB_ERR_READ_ERROR,
 		       "seek error, can't seek block %llu",
 		       (long long) sector);
-  grub_ieee1275_read ((grub_ieee1275_ihandle_t) (unsigned long) disk->data,
-		      buf, size * 512UL, &actual);
+  grub_ieee1275_read (last_ihandle, buf, size * 512UL, &actual);
   if (actual != (grub_ssize_t) (size * 512UL))
     return grub_error (GRUB_ERR_READ_ERROR, "read error on block: %llu",
 		       (long long) sector);
@@ -281,5 +352,10 @@ grub_ofdisk_init (void)
 void
 grub_ofdisk_fini (void)
 {
+  if (last_ihandle)
+    grub_ieee1275_close (last_ihandle);
+  last_ihandle = 0;
+  last_devpath = NULL;
+
   grub_disk_dev_unregister (&grub_ofdisk_dev);
 }
diff --git a/grub-core/kern/ieee1275/openfw.c b/grub-core/kern/ieee1275/openfw.c
index fcd43f617..f5dc8efb1 100644
--- a/grub-core/kern/ieee1275/openfw.c
+++ b/grub-core/kern/ieee1275/openfw.c
@@ -423,3 +423,47 @@ grub_reboot (void)
   for (;;) ;
 }
 #endif
+
+/* Resolve aliases.  */
+char *
+grub_ieee1275_canonicalise_devname (const char *path)
+{
+  struct canon_args
+  {
+    struct grub_ieee1275_common_hdr common;
+    grub_ieee1275_cell_t path;
+    grub_ieee1275_cell_t buf;
+    grub_ieee1275_cell_t inlen;
+    grub_ieee1275_cell_t outlen;
+  }
+  args;
+  char *buf = NULL;
+  grub_size_t bufsize = 64;
+  int i;
+
+  for (i = 0; i < 2; i++)
+    {
+      grub_free (buf);
+
+      buf = grub_malloc (bufsize);
+      if (!buf)
+	return NULL;
+
+      INIT_IEEE1275_COMMON (&args.common, "canon", 3, 1);
+      args.path = (grub_ieee1275_cell_t) path;
+      args.buf = (grub_ieee1275_cell_t) buf;
+      args.inlen = (grub_ieee1275_cell_t) (bufsize - 1);
+
+      if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
+	return 0;
+      if (args.outlen > bufsize - 1)
+	{
+	  bufsize = args.outlen + 2;
+	  continue;
+	}
+      return buf;
+    }
+  /* Shouldn't reach here.  */
+  grub_free (buf);
+  return NULL;
+}
diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
index 6835b5abc..2592dd348 100644
--- a/include/grub/ieee1275/ieee1275.h
+++ b/include/grub/ieee1275/ieee1275.h
@@ -190,4 +190,6 @@ int EXPORT_FUNC(grub_ieee1275_devices_iterate) (int (*hook)
 						(struct grub_ieee1275_devalias *
 						 alias));
 
+char *EXPORT_FUNC(grub_ieee1275_canonicalise_devname) (const char *path);
+
 #endif /* ! GRUB_IEEE1275_HEADER */

From 54ac3cd189cc3f4c19ad28beca715bbf059ab614 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 13 Sep 2010 20:10:41 +0200
Subject: [PATCH 1602/1628] 	* grub-core/video/efi_gop.c: Fix over-80-chars
 line. 	* grub-core/video/efi_uga.c: Likewise.

---
 ChangeLog                 | 5 +++++
 grub-core/video/efi_gop.c | 3 ++-
 grub-core/video/efi_uga.c | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8751b8daf..58fbf36cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/video/efi_gop.c: Fix over-80-chars line.
+	* grub-core/video/efi_uga.c: Likewise.
+
 2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Filter devaliases and never open same device twice.
diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c
index cb04667eb..f02dc9cb6 100644
--- a/grub-core/video/efi_gop.c
+++ b/grub-core/video/efi_gop.c
@@ -220,7 +220,8 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info))
 
 static grub_err_t
 grub_video_gop_setup (unsigned int width, unsigned int height,
-		      unsigned int mode_type, unsigned int mode_mask __attribute__ ((unused)))
+		      unsigned int mode_type,
+		      unsigned int mode_mask __attribute__ ((unused)))
 {
   unsigned int depth;
   struct grub_efi_gop_mode_info *info = NULL;
diff --git a/grub-core/video/efi_uga.c b/grub-core/video/efi_uga.c
index 6352d4342..a8f70edea 100644
--- a/grub-core/video/efi_uga.c
+++ b/grub-core/video/efi_uga.c
@@ -198,7 +198,8 @@ grub_video_uga_fini (void)
 
 static grub_err_t
 grub_video_uga_setup (unsigned int width, unsigned int height,
-		      unsigned int mode_type, unsigned int mode_mask __attribute__ ((unused)))
+		      unsigned int mode_type,
+		      unsigned int mode_mask __attribute__ ((unused)))
 {
   unsigned int depth;
   int found = 0;

From 0575c7c3eccef42e03b21633d5647387a6596e73 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 13 Sep 2010 20:16:51 +0200
Subject: [PATCH 1603/1628] 	* grub-core/commands/iorw.c (grub_cmd_read):
 Declare buf in smallest 	context.

---
 ChangeLog                 | 5 +++++
 grub-core/commands/iorw.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 58fbf36cc..8b959c0f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/iorw.c (grub_cmd_read): Declare buf in smallest
+	context.
+
 2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/video/efi_gop.c: Fix over-80-chars line.
diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
index bd0183794..5157ebd4c 100644
--- a/grub-core/commands/iorw.c
+++ b/grub-core/commands/iorw.c
@@ -40,7 +40,6 @@ grub_cmd_read (grub_extcmd_context_t ctxt, int argc, char **argv)
 {
   grub_target_addr_t addr;
   grub_uint32_t value = 0;
-  char buf[sizeof ("XXXXXXXX")];
 
   if (argc != 1)
     return grub_error (GRUB_ERR_BAD_ARGUMENT, "Invalid number of arguments");
@@ -63,6 +62,7 @@ grub_cmd_read (grub_extcmd_context_t ctxt, int argc, char **argv)
 
   if (ctxt->state[0].set)
     {
+      char buf[sizeof ("XXXXXXXX")];
       grub_snprintf (buf, sizeof (buf), "%x", value);
       grub_env_set (ctxt->state[0].arg, buf);
     }

From 2419f17a09037635044ef7f2eea7ae2089c81be5 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 13 Sep 2010 20:29:15 +0200
Subject: [PATCH 1604/1628] 	Enable acpi shutdown on all ACPI platforms.

	* grub-core/Makefile.core.def (halt): Inlude commands/acpihalt.c
	on coreboo, multiboot and EFI.
	* grub-core/commands/acpihalt.c (get_sleep_type): Add missing casts.
	(grub_acpi_halt): Likewise.
	* grub-core/commands/i386/pc/halt.c (grub_halt): Call grub_acpi_halt.
	(grub_cmd_halt): Don't call grub_acpi_halt directly.
	* grub-core/lib/efi/halt.c (grub_halt): Call grub_acpi_halt.
	* grub-core/lib/i386/halt.c (grub_halt)
	[GRUB_MACHINE_COREBOOT || GRUB_MACHINE_MULTIBOOT]: Likewise.
---
 ChangeLog                         | 14 ++++++++++++++
 grub-core/Makefile.core.def       |  3 +++
 grub-core/commands/acpihalt.c     | 12 ++++++------
 grub-core/commands/i386/pc/halt.c |  4 ++--
 grub-core/lib/efi/halt.c          |  2 ++
 grub-core/lib/i386/halt.c         |  5 +++++
 6 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b959c0f4..555ed7711 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Enable acpi shutdown on all ACPI platforms.
+
+	* grub-core/Makefile.core.def (halt): Inlude commands/acpihalt.c
+	on coreboo, multiboot and EFI.
+	* grub-core/commands/acpihalt.c (get_sleep_type): Add missing casts.
+	(grub_acpi_halt): Likewise.
+	* grub-core/commands/i386/pc/halt.c (grub_halt): Call grub_acpi_halt.
+	(grub_cmd_halt): Don't call grub_acpi_halt directly.
+	* grub-core/lib/efi/halt.c (grub_halt): Call grub_acpi_halt.
+	* grub-core/lib/i386/halt.c (grub_halt)
+	[GRUB_MACHINE_COREBOOT || GRUB_MACHINE_MULTIBOOT]: Likewise.
+
 2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/commands/iorw.c (grub_cmd_read): Declare buf in smallest
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 902ab48a8..05890d248 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -521,6 +521,9 @@ module = {
   nopc = commands/halt.c;
   i386_pc = commands/i386/pc/halt.c;
   i386_pc = commands/acpihalt.c;
+  i386_coreboot = commands/acpihalt.c;
+  i386_multiboot = commands/acpihalt.c;
+  x86_efi = commands/acpihalt.c;
   i386_multiboot = lib/i386/halt.c;
   i386_coreboot = lib/i386/halt.c;
   i386_qemu = lib/i386/halt.c;
diff --git a/grub-core/commands/acpihalt.c b/grub-core/commands/acpihalt.c
index 2ba15468b..0cd32f389 100644
--- a/grub-core/commands/acpihalt.c
+++ b/grub-core/commands/acpihalt.c
@@ -144,8 +144,8 @@ get_sleep_type (grub_uint8_t *table, grub_uint8_t *end)
     {
       int add;
       prev = ptr;
-      grub_dprintf ("acpi", "Opcode %x\n", *ptr);
-      grub_dprintf ("acpi", "Tell %x\n", ptr - table);
+      grub_dprintf ("acpi", "Opcode 0x%x\n", *ptr);
+      grub_dprintf ("acpi", "Tell %x\n", (unsigned) (ptr - table));
       switch (*ptr)
 	{
 	case GRUB_ACPI_OPCODE_EXTOP:
@@ -225,19 +225,19 @@ grub_acpi_halt (void)
   if (!rsdp1)
     return;
 
-  rsdt = (struct grub_acpi_table_header *) rsdp1->rsdt_addr;
+  rsdt = (struct grub_acpi_table_header *) (grub_addr_t) rsdp1->rsdt_addr;
   for (entry_ptr = (grub_uint32_t *) (rsdt + 1);
        entry_ptr < (grub_uint32_t *) (((grub_uint8_t *) rsdt)
 				      + rsdt->length);
        entry_ptr++)
     {
-      if (grub_memcmp ((void *)*entry_ptr, "FACP", 4) == 0)
+      if (grub_memcmp ((void *) (grub_addr_t) *entry_ptr, "FACP", 4) == 0)
 	{
 	  grub_uint32_t port;
 	  struct grub_acpi_fadt *fadt
-	    = ((struct grub_acpi_fadt *) *entry_ptr);
+	    = ((struct grub_acpi_fadt *) (grub_addr_t) *entry_ptr);
 	  struct grub_acpi_table_header *dsdt
-	    = (struct grub_acpi_table_header *) fadt->dsdt_addr;
+	    = (struct grub_acpi_table_header *) (grub_addr_t) fadt->dsdt_addr;
 	  int sleep_type = -1;
 
 	  port = fadt->pm1a;
diff --git a/grub-core/commands/i386/pc/halt.c b/grub-core/commands/i386/pc/halt.c
index 8afae8eb7..44a88bb05 100644
--- a/grub-core/commands/i386/pc/halt.c
+++ b/grub-core/commands/i386/pc/halt.c
@@ -47,6 +47,8 @@ grub_halt (int no_apm)
 {
   struct grub_bios_int_registers regs;
 
+  grub_acpi_halt ();
+
   if (no_apm)
     stop ();
 
@@ -102,8 +104,6 @@ grub_cmd_halt (grub_extcmd_context_t ctxt,
   struct grub_arg_list *state = ctxt->state;
   int no_apm = 0;
 
-  grub_acpi_halt ();
-
   if (state[0].set)
     no_apm = 1;
   grub_halt (no_apm);
diff --git a/grub-core/lib/efi/halt.c b/grub-core/lib/efi/halt.c
index ed3e1e1c0..c19536897 100644
--- a/grub-core/lib/efi/halt.c
+++ b/grub-core/lib/efi/halt.c
@@ -22,11 +22,13 @@
 #include <grub/misc.h>
 #include <grub/mm.h>
 #include <grub/kernel.h>
+#include <grub/acpi.h>
 
 void
 grub_halt (void)
 {
   grub_machine_fini ();
+  grub_acpi_halt ();
   efi_call_4 (grub_efi_system_table->runtime_services->reset_system,
               GRUB_EFI_RESET_SHUTDOWN, GRUB_EFI_SUCCESS, 0, NULL);
 
diff --git a/grub-core/lib/i386/halt.c b/grub-core/lib/i386/halt.c
index 74e0c7301..15c4ba0d6 100644
--- a/grub-core/lib/i386/halt.c
+++ b/grub-core/lib/i386/halt.c
@@ -18,6 +18,7 @@
 
 #include <grub/cpu/io.h>
 #include <grub/misc.h>
+#include <grub/acpi.h>
 
 const char bochs_shutdown[] = "Shutdown";
 
@@ -40,6 +41,10 @@ grub_halt (void)
 {
   unsigned int i;
 
+#if defined (GRUB_MACHINE_COREBOOT) || defined (GRUB_MACHINE_MULTIBOOT)
+  grub_acpi_halt ();
+#endif
+
   /* Disable interrupts.  */
   __asm__ __volatile__ ("cli");
 

From 3352800b992c9ad152cb6a1fc1d9c053c87ccbca Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 13 Sep 2010 22:18:03 +0200
Subject: [PATCH 1605/1628] 	Remove readability checks (too many false
 negatives).

	* util/grub-install.in: Remove readability checks.
	* util/grub-mkconfig.in: Likewise.
	* util/grub.d/10_hurd.in: Likewise.
	* util/grub.d/10_kfreebsd.in: Likewise.
	* util/grub.d/10_linux.in: Likewise.
	* util/grub-mkconfig_lib.in (is_path_readable_by_grub): Revert to old
	way.
---
 ChangeLog                  | 12 ++++++++++++
 util/grub-install.in       | 20 +++-----------------
 util/grub-mkconfig.in      |  8 --------
 util/grub-mkconfig_lib.in  | 17 ++---------------
 util/grub.d/10_hurd.in     |  8 --------
 util/grub.d/10_kfreebsd.in | 17 ++---------------
 util/grub.d/10_linux.in    |  9 ---------
 7 files changed, 19 insertions(+), 72 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 555ed7711..10ba63029 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Remove readability checks (too many false negatives).
+
+	* util/grub-install.in: Remove readability checks.
+	* util/grub-mkconfig.in: Likewise.
+	* util/grub.d/10_hurd.in: Likewise.
+	* util/grub.d/10_kfreebsd.in: Likewise.
+	* util/grub.d/10_linux.in: Likewise.
+	* util/grub-mkconfig_lib.in (is_path_readable_by_grub): Revert to old
+	way.
+
 2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Enable acpi shutdown on all ACPI platforms.
diff --git a/util/grub-install.in b/util/grub-install.in
index ef1778b2a..92271a15a 100644
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Install GRUB on your drive.
-# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010  Free Software Foundation, Inc.
+# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009  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
@@ -327,7 +327,8 @@ if test "x$fs_module" = x -a "x$modules" = x; then
 fi
 
 # Then the partition map module.  In order to support partition-less media,
-# this command is allowed to fail.
+# this command is allowed to fail (--target=fs already grants us that the
+# filesystem will be accessible).
 partmap_module=
 for x in `$grub_probe --target=partmap --device ${grub_device} 2> /dev/null`; do
    partmap_module="$partmap_module part_$x";
@@ -405,24 +406,9 @@ case "${target_cpu}-${platform}" in
     *) mkimage_target=i386-coreboot;
 esac
 
-# Verify readability of a few critical files
-for file in grubenv normal.mod ; do
-    if is_path_readable_by_grub ${grubdir}/${file} ${grub_device} ${relative_grubdir}/${file} ; then : ; else
-        echo "GRUB is unable to read ${grubdir}/${file}" >&2
-        exit 1
-    fi
-done
-
 if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] ; then
     $grub_mkimage ${config_opt} -O ${mkimage_target} --output=${grubdir}/core.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 
-    # This is a temporary workaround; it can be merged back into the check
-    # above once the install branch is merged.
-    if is_path_readable_by_grub ${grubdir}/core.img ${grub_device} ${relative_grubdir}/core.img ; then : ; else
-        echo "GRUB is unable to read ${grubdir}/core.img" >&2
-        exit 1
-    fi
-
     # Now perform the installation.
     $grub_setup ${setup_verbose} ${setup_force} --directory=${grubdir} --device-map=${device_map} \
         ${install_device} || exit 1
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index fa84c63d1..c3b4c3398 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -303,14 +303,6 @@ for i in ${grub_mkconfig_dir}/* ; do
   esac
 done
 
-# Verify readability of ${grub_cfg}.new
-if test "x${grub_cfg}" != "x"; then
-  if is_path_readable_by_grub ${grub_cfg}.new ; then : ; else
-    echo "GRUB is unable to read ${grubdir}/${file}" >&2
-    exit 1   
-  fi
-fi
-
 if test "x${grub_cfg}" != "x" ; then
   # none of the children aborted with error, install the new grub.cfg
   mv -f ${grub_cfg}.new ${grub_cfg}
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 6d4f9f3bb..9a77d1bdf 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -30,9 +30,6 @@ fi
 if test "x$grub_mkrelpath" = x; then
   grub_mkrelpath=${bindir}/`echo grub-mkrelpath | sed ${transform}`
 fi
-if test "x$grub_fstest" = x; then
-  grub_fstest=${bindir}/`echo grub-fstest | sed ${transform}`
-fi
 
 if $(which gettext >/dev/null 2>/dev/null) ; then
   gettext="gettext"
@@ -53,24 +50,14 @@ make_system_path_relative_to_its_root ()
 is_path_readable_by_grub ()
 {
   path=$1
-  device=$2
-  relpath=$3
 
   # abort if path doesn't exist
   if test -e $path ; then : ;else
     return 1
   fi
 
-  if [ "${device}" = "" ] ; then
-    device=$(${grub_probe} --target=device $path)
-  fi
-  if [ "${relpath}" = "" ] ; then
-    relpath=$(${grub_mkrelpath} $path)
-  fi
-
-  # abort if file read through GRUB doesn't match file read through system
-  # facilities
-  if ${grub_fstest} $device cmp $relpath $path > /dev/null 2>&1 ; then : ; else
+  # abort if file is in a filesystem we can't read
+  if ${grub_probe} -t fs $path > /dev/null 2>&1 ; then : ; else
     return 1
   fi
 
diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index d8cc7aea4..350eb30a8 100644
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -41,14 +41,6 @@ for i in /boot/gnumach* ; do
     basename=`basename $i`
     dirname=`dirname $i`
     rel_dirname=`make_system_path_relative_to_its_root $dirname`
-
-    if ! is_path_readable_by_grub ${dirname}/${basename} \
-        ${GRUB_DEVICE_BOOT} \
-        ${rel_dirname}/${basename} ; then
-      echo "${dirname}/${basename} is not readable by GRUB" >&2
-      exit 1
-    fi
-
     echo "Found GNU Mach: $i" >&2
     kernels="${kernels} ${rel_dirname}/${basename}"
     at_least_one=true
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index bf1632bd6..e39423999 100644
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -44,7 +44,7 @@ load_kfreebsd_module ()
   mod="$1"
   allow_fail="$2"
 
-  if ! is_path_readable_by_grub "${module_dir}/${mod}.ko" ; then
+  if ! test -e "${module_dir}/${mod}.ko" ; then
     if [ "${allow_fail}" = "true" ] ; then
       # Return silently
       return
@@ -77,13 +77,6 @@ kfreebsd_entry ()
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi
 
-  if ! is_path_readable_by_grub ${dirname}/${basename} \
-      ${GRUB_DEVICE_BOOT} \
-      ${rel_dirname}/${basename} ; then
-    echo "${dirname}/${basename} is not readable by GRUB" >&2
-    exit 1
-  fi
-
   printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
 	echo			'$(printf "$(gettext_quoted "Loading kernel of FreeBSD %s ...")" ${version})'
@@ -102,13 +95,7 @@ EOF
     zfs)
       load_kfreebsd_module opensolaris false
 
-      if ! is_path_readable_by_grub ${dirname}/zfs/zpool.cache \
-          ${GRUB_DEVICE_BOOT} \
-          ${rel_dirname}/zfs/zpool.cache ; then
-        echo "${dirname}/zfs/zpool.cache is not readable by GRUB" >&2
-        exit 1
-      fi
-
+      ls "${dirname}/zfs/zpool.cache" > /dev/null
       printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
 	kfreebsd_module		${rel_dirname}/zfs/zpool.cache type=/boot/zfs/zpool.cache
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 765a7fab6..14b85c7f1 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -83,15 +83,6 @@ EOF
 EOF
   fi
 
-  for i in ${basename} ${initrd} ; do
-    if ! is_path_readable_by_grub ${dirname}/${i} \
-        ${GRUB_DEVICE_BOOT} \
-        ${rel_dirname}/${i} ; then
-      echo "${dirname}/${i} is not readable by GRUB" >&2
-      exit 1
-    fi
-  done
-
   if [ -z "${prepare_boot_cache}" ]; then
     prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   fi

From 94564f81a822111ab1f96fbe063ded55f7f77da0 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 13 Sep 2010 23:59:22 +0200
Subject: [PATCH 1606/1628] 	* include/grub/disk.h (grub_disk): Remove
 has_partitions. 	All users updated. 	* disk/loopback.c
 (grub_loopback): Remove has_partitions. 	All users updated. 
 (options): Remove partitions. All users updated. 	* util/grub-fstest.c
 (fstest): Don't pass "-p" to loopback. 	* util/i386/pc/grub-setup.c
 (setup): copy partition table only when 	actual partition table is
 found.

---
 ChangeLog                         | 11 +++++++++++
 grub-core/disk/ata.c              |  1 -
 grub-core/disk/efi/efidisk.c      |  4 ----
 grub-core/disk/host.c             |  1 -
 grub-core/disk/i386/pc/biosdisk.c |  1 -
 grub-core/disk/ieee1275/nand.c    |  1 -
 grub-core/disk/ieee1275/ofdisk.c  |  2 --
 grub-core/disk/loopback.c         |  9 ---------
 grub-core/disk/lvm.c              |  9 +++++++--
 grub-core/disk/memdisk.c          |  1 -
 grub-core/disk/raid.c             |  1 -
 grub-core/disk/scsi.c             |  6 ------
 grub-core/fs/i386/pc/pxe.c        |  1 -
 grub-core/kern/device.c           |  2 +-
 grub-core/kern/disk.c             |  6 ------
 grub-core/kern/emu/hostdisk.c     |  1 -
 grub-core/normal/completion.c     | 17 +++++++++++++----
 grub-core/normal/misc.c           |  4 +---
 include/grub/disk.h               |  3 ---
 util/grub-fstest.c                | 17 ++++++++---------
 util/i386/pc/grub-setup.c         | 22 ++++++++--------------
 21 files changed, 49 insertions(+), 71 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 10ba63029..6e29c939e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/disk.h (grub_disk): Remove has_partitions.
+	All users updated.
+	* disk/loopback.c (grub_loopback): Remove has_partitions.
+	All users updated.
+	(options): Remove partitions. All users updated.
+	* util/grub-fstest.c (fstest): Don't pass "-p" to loopback.
+	* util/i386/pc/grub-setup.c (setup): copy partition table only when
+	actual partition table is found.
+
 2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Remove readability checks (too many false negatives).
diff --git a/grub-core/disk/ata.c b/grub-core/disk/ata.c
index cfd58a6d5..fe677e2a0 100644
--- a/grub-core/disk/ata.c
+++ b/grub-core/disk/ata.c
@@ -723,7 +723,6 @@ grub_ata_open (const char *name, grub_disk_t disk)
 
   disk->id = (unsigned long) dev;
 
-  disk->has_partitions = 1;
   disk->data = dev;
 
   return 0;
diff --git a/grub-core/disk/efi/efidisk.c b/grub-core/disk/efi/efidisk.c
index f9c6f3153..7aec1efe8 100644
--- a/grub-core/disk/efi/efidisk.c
+++ b/grub-core/disk/efi/efidisk.c
@@ -514,16 +514,12 @@ grub_efidisk_open (const char *name, struct grub_disk *disk)
   switch (name[0])
     {
     case 'f':
-      disk->has_partitions = 0;
       d = get_device (fd_devices, num);
       break;
     case 'c':
-      /* FIXME: a CDROM should have partitions, but not implemented yet.  */
-      disk->has_partitions = 0;
       d = get_device (cd_devices, num);
       break;
     case 'h':
-      disk->has_partitions = 1;
       d = get_device (hd_devices, num);
       break;
     default:
diff --git a/grub-core/disk/host.c b/grub-core/disk/host.c
index c4f3e7150..c51966293 100644
--- a/grub-core/disk/host.c
+++ b/grub-core/disk/host.c
@@ -43,7 +43,6 @@ grub_host_open (const char *name, grub_disk_t disk)
   disk->total_sectors = 0;
   disk->id = (unsigned long) "host";
 
-  disk->has_partitions = 0;
   disk->data = 0;
 
   return GRUB_ERR_NONE;
diff --git a/grub-core/disk/i386/pc/biosdisk.c b/grub-core/disk/i386/pc/biosdisk.c
index 9c0209693..f69626455 100644
--- a/grub-core/disk/i386/pc/biosdisk.c
+++ b/grub-core/disk/i386/pc/biosdisk.c
@@ -327,7 +327,6 @@ grub_biosdisk_open (const char *name, grub_disk_t disk)
   if (drive < 0)
     return grub_errno;
 
-  disk->has_partitions = 1;
   disk->id = drive;
 
   data = (struct grub_biosdisk_data *) grub_zalloc (sizeof (*data));
diff --git a/grub-core/disk/ieee1275/nand.c b/grub-core/disk/ieee1275/nand.c
index df2ee81f3..a2c717cdb 100644
--- a/grub-core/disk/ieee1275/nand.c
+++ b/grub-core/disk/ieee1275/nand.c
@@ -113,7 +113,6 @@ grub_nand_open (const char *name, grub_disk_t disk)
 
   disk->id = dev_ihandle;
 
-  disk->has_partitions = 0;
   disk->data = data;
 
   return 0;
diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
index 3d9976257..85c34609e 100644
--- a/grub-core/disk/ieee1275/ofdisk.c
+++ b/grub-core/disk/ieee1275/ofdisk.c
@@ -256,8 +256,6 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
     disk->data = op->devpath;
   }
 
-  /* XXX: Read this, somehow.  */
-  disk->has_partitions = 1;
   return 0;
 }
 
diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c
index 878369e5f..c8ee52580 100644
--- a/grub-core/disk/loopback.c
+++ b/grub-core/disk/loopback.c
@@ -29,7 +29,6 @@ struct grub_loopback
 {
   char *devname;
   grub_file_t file;
-  int has_partitions;
   struct grub_loopback *next;
 };
 
@@ -38,7 +37,6 @@ static struct grub_loopback *loopback_list;
 static const struct grub_arg_option options[] =
   {
     {"delete", 'd', 0, N_("Delete the loopback device entry."), 0, 0},
-    {"partitions", 'p', 0, N_("Simulate a hard drive with partitions."), 0, 0},
     {0, 0, 0, 0, 0, 0}
   };
 
@@ -106,9 +104,6 @@ grub_cmd_loopback (grub_extcmd_context_t ctxt, int argc, char **args)
       grub_file_close (newdev->file);
       newdev->file = file;
 
-      /* Set has_partitions when `--partitions' was used.  */
-      newdev->has_partitions = state[1].set;
-
       return 0;
     }
 
@@ -126,9 +121,6 @@ grub_cmd_loopback (grub_extcmd_context_t ctxt, int argc, char **args)
 
   newdev->file = file;
 
-  /* Set has_partitions when `--partitions' was used.  */
-  newdev->has_partitions = state[1].set;
-
   /* Add the new entry to the list.  */
   newdev->next = loopback_list;
   loopback_list = newdev;
@@ -174,7 +166,6 @@ grub_loopback_open (const char *name, grub_disk_t disk)
     disk->total_sectors = GRUB_DISK_SIZE_UNKNOWN;
   disk->id = (unsigned long) dev;
 
-  disk->has_partitions = dev->has_partitions;
   disk->data = dev->file;
 
   return 0;
diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
index 3981d9811..94cf9a1aa 100644
--- a/grub-core/disk/lvm.c
+++ b/grub-core/disk/lvm.c
@@ -150,7 +150,6 @@ grub_lvm_open (const char *name, grub_disk_t disk)
   if (! lv)
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "unknown LVM device %s", name);
 
-  disk->has_partitions = 0;
   disk->id = lv->number;
   disk->data = lv;
   disk->total_sectors = lv->size;
@@ -280,7 +279,11 @@ grub_lvm_scan_device (const char *name)
 
   disk = grub_disk_open (name);
   if (!disk)
-    return 0;
+    {
+      if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
+	grub_errno = GRUB_ERR_NONE;
+      return 0;
+    }
 
   /* Search for label. */
   for (i = 0; i < GRUB_LVM_LABEL_SCAN_SECTORS; i++)
@@ -725,6 +728,8 @@ grub_lvm_scan_device (const char *name)
   grub_free (metadatabuf);
  fail:
   grub_disk_close (disk);
+  if (grub_errno == GRUB_ERR_OUT_OF_RANGE)
+    grub_errno = GRUB_ERR_NONE;
   return 0;
 }
 
diff --git a/grub-core/disk/memdisk.c b/grub-core/disk/memdisk.c
index 2e8885020..e00280dd7 100644
--- a/grub-core/disk/memdisk.c
+++ b/grub-core/disk/memdisk.c
@@ -41,7 +41,6 @@ grub_memdisk_open (const char *name, grub_disk_t disk)
 
   disk->total_sectors = memdisk_size / GRUB_DISK_SECTOR_SIZE;
   disk->id = (unsigned long) "mdsk";
-  disk->has_partitions = 0;
 
   return GRUB_ERR_NONE;
 }
diff --git a/grub-core/disk/raid.c b/grub-core/disk/raid.c
index 51a4b00e2..2fd6aa9de 100644
--- a/grub-core/disk/raid.c
+++ b/grub-core/disk/raid.c
@@ -126,7 +126,6 @@ grub_raid_open (const char *name, grub_disk_t disk)
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "unknown RAID device %s",
                        name);
 
-  disk->has_partitions = 1;
   disk->id = array->number;
   disk->data = array;
 
diff --git a/grub-core/disk/scsi.c b/grub-core/disk/scsi.c
index 60192bef5..902ab12c3 100644
--- a/grub-core/disk/scsi.c
+++ b/grub-core/disk/scsi.c
@@ -431,12 +431,6 @@ grub_scsi_open (const char *name, grub_disk_t disk)
 			     "unknown SCSI device");
 	}
 
-      if (scsi->devtype == grub_scsi_devtype_cdrom)
-	disk->has_partitions = 0;
-      else
-	disk->has_partitions = 1;
-
-
       /* According to USB MS tests specification, issue Test Unit Ready
        * until OK */
       maxtime = grub_get_time_ms () + 5000; /* It is safer value */
diff --git a/grub-core/fs/i386/pc/pxe.c b/grub-core/fs/i386/pc/pxe.c
index baaff0ffc..cbb3c7d87 100644
--- a/grub-core/fs/i386/pc/pxe.c
+++ b/grub-core/fs/i386/pc/pxe.c
@@ -176,7 +176,6 @@ grub_pxe_open (const char *name, grub_disk_t disk)
   disk->total_sectors = 0;
   disk->id = (unsigned long) data;
 
-  disk->has_partitions = 0;
   disk->data = data;
 
   return GRUB_ERR_NONE;
diff --git a/grub-core/kern/device.c b/grub-core/kern/device.c
index 4273fedfe..9554ca76a 100644
--- a/grub-core/kern/device.c
+++ b/grub-core/kern/device.c
@@ -103,7 +103,7 @@ grub_device_iterate (int (*hook) (const char *name))
 	  return 0;
 	}
 
-      if (dev->disk && dev->disk->has_partitions)
+      if (dev->disk)
 	{
 	  struct part_ent *p;
 	  int ret = 0;
diff --git a/grub-core/kern/disk.c b/grub-core/kern/disk.c
index ccd5f200f..7cf29ae7c 100644
--- a/grub-core/kern/disk.c
+++ b/grub-core/kern/disk.c
@@ -281,12 +281,6 @@ grub_disk_open (const char *name)
       goto fail;
     }
 
-  if (p && ! disk->has_partitions)
-    {
-      grub_error (GRUB_ERR_BAD_DEVICE, "no partition on this disk");
-      goto fail;
-    }
-
   disk->dev = dev;
 
   if (p)
diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
index 1eb6cb9d8..142e93fe2 100644
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -221,7 +221,6 @@ grub_util_biosdisk_open (const char *name, grub_disk_t disk)
     return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
 		       "no mapping exists for `%s'", name);
 
-  disk->has_partitions = 1;
   disk->id = drive;
   disk->data = data = xmalloc (sizeof (struct grub_util_biosdisk_data));
   data->dev = NULL;
diff --git a/grub-core/normal/completion.c b/grub-core/normal/completion.c
index a1e86adb0..f19919d1d 100644
--- a/grub-core/normal/completion.c
+++ b/grub-core/normal/completion.c
@@ -160,14 +160,23 @@ iterate_dev (const char *devname)
 
   if (dev)
     {
-      if (dev->disk && dev->disk->has_partitions)
+      char tmp[grub_strlen (devname) + sizeof (",")];
+
+      grub_memcpy (tmp, devname, grub_strlen (devname));
+
+      if (grub_strcmp (devname, current_word) == 0)
 	{
-	  if (add_completion (devname, ",", GRUB_COMPLETION_TYPE_DEVICE))
+	  if (add_completion (devname, ")", GRUB_COMPLETION_TYPE_PARTITION))
 	    return 1;
+
+	  if (dev->disk)
+	    if (grub_partition_iterate (dev->disk, iterate_partition))
+	      return 1;
 	}
       else
 	{
-	  if (add_completion (devname, ")", GRUB_COMPLETION_TYPE_DEVICE))
+	  grub_memcpy (tmp + grub_strlen (devname), "", sizeof (""));
+	  if (add_completion (tmp, "", GRUB_COMPLETION_TYPE_DEVICE))
 	    return 1;
 	}
     }
@@ -200,7 +209,7 @@ complete_device (void)
 
       if (dev)
 	{
-	  if (dev->disk && dev->disk->has_partitions)
+	  if (dev->disk)
 	    {
 	      if (grub_partition_iterate (dev->disk, iterate_partition))
 		{
diff --git a/grub-core/normal/misc.c b/grub-core/normal/misc.c
index ad408074b..d81b6d26f 100644
--- a/grub-core/normal/misc.c
+++ b/grub-core/normal/misc.c
@@ -108,10 +108,8 @@ grub_normal_print_device_info (const char *name)
 	      grub_errno = GRUB_ERR_NONE;
 	    }
 	}
-      else if (! dev->disk->has_partitions || dev->disk->partition)
-	grub_printf ("%s", _("Unknown filesystem"));
       else
-	grub_printf ("%s", _("Partition table"));
+	grub_printf ("%s", _("Not a known filesystem"));
 
       if (dev->disk->partition)
 	grub_printf (_(" - Partition start at %u"),
diff --git a/include/grub/disk.h b/include/grub/disk.h
index b41f89b38..e3a0160c4 100644
--- a/include/grub/disk.h
+++ b/include/grub/disk.h
@@ -99,9 +99,6 @@ struct grub_disk
   /* The total number of sectors.  */
   grub_uint64_t total_sectors;
 
-  /* If partitions can be stored.  */
-  int has_partitions;
-
   /* The id used by the disk cache manager.  */
   unsigned long id;
 
diff --git a/util/grub-fstest.c b/util/grub-fstest.c
index 3935ce08b..eb7981d3a 100644
--- a/util/grub-fstest.c
+++ b/util/grub-fstest.c
@@ -259,13 +259,11 @@ fstest (char **images, int num_disks, int cmd, int n, char **args)
 {
   char *host_file;
   char *loop_name;
-  char *argv[3];
   int i;
 
-  argv[0] = "-p";
-
   for (i = 0; i < num_disks; i++)
     {
+      char *argv[2];
       loop_name = grub_xasprintf ("loop%d", i);
       if (!loop_name)
 	grub_util_error (grub_errmsg);
@@ -274,10 +272,10 @@ fstest (char **images, int num_disks, int cmd, int n, char **args)
       if (!host_file)
 	grub_util_error (grub_errmsg);
 
-      argv[1] = loop_name;
-      argv[2] = host_file;
+      argv[0] = loop_name;
+      argv[1] = host_file;
 
-      if (execute_command ("loopback", 3, argv))
+      if (execute_command ("loopback", 2, argv))
         grub_util_error ("loopback command fails");
 
       grub_free (loop_name);
@@ -312,15 +310,16 @@ fstest (char **images, int num_disks, int cmd, int n, char **args)
       execute_command ("blocklist", n, args);
       grub_printf ("\n");
     }
-
-  argv[0] = "-d";
-
+    
   for (i = 0; i < num_disks; i++)
     {
+      char *argv[2];
+
       loop_name = grub_xasprintf ("loop%d", i);
       if (!loop_name)
 	grub_util_error (grub_errmsg);
 
+      argv[0] = "-d";      
       argv[1] = loop_name;
 
       execute_command ("loopback", 2, argv);
diff --git a/util/i386/pc/grub-setup.c b/util/i386/pc/grub-setup.c
index 987e2d05a..b9abfb0c6 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/i386/pc/grub-setup.c
@@ -252,14 +252,6 @@ setup (const char *dir,
 	  tmp_img + GRUB_BOOT_MACHINE_BPB_START,
 	  GRUB_BOOT_MACHINE_BPB_END - GRUB_BOOT_MACHINE_BPB_START);
 
-  /* Copy the possible partition table.  */
-  if (dest_dev->disk->has_partitions)
-    memcpy (boot_img + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC,
-	    tmp_img + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC,
-	    GRUB_BOOT_MACHINE_PART_END - GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC);
-
-  free (tmp_img);
-
   /* If DEST_DRIVE is a hard disk, enable the workaround, which is
      for buggy BIOSes which don't pass boot drive correctly. Instead,
      they pass 0x00 or 0x01 even when booted from 0x80.  */
@@ -300,12 +292,6 @@ setup (const char *dir,
   grub_util_info ("dos partition is %d, bsd partition is %d",
 		  dos_part, bsd_part);
 
-  if (! dest_dev->disk->has_partitions)
-    {
-      grub_util_warn (_("Attempting to install GRUB to a partitionless disk.  This is a BAD idea."));
-      goto unable_to_embed;
-    }
-
   if (dest_dev->disk->partition)
     {
       grub_util_warn (_("Attempting to install GRUB to a partition instead of the MBR.  This is a BAD idea."));
@@ -345,6 +331,14 @@ setup (const char *dir,
       goto unable_to_embed;
     }
 
+  /* Copy the partition table.  */
+  if (dest_partmap)
+    memcpy (boot_img + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC,
+	    tmp_img + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC,
+	    GRUB_BOOT_MACHINE_PART_END - GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC);
+
+  free (tmp_img);
+
   if (strcmp (dest_partmap, "msdos") == 0)
     grub_partition_iterate (dest_dev->disk, find_usable_region_msdos);
   else if (strcmp (dest_partmap, "gpt") == 0)

From 608e43b102999e3db863bcb1a24f1ac4c426714f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 14 Sep 2010 00:08:07 +0200
Subject: [PATCH 1607/1628] 	Disable usbserial on grub-emu since our libusb
 code isn't good enough 	yet.

	* grub-core/Makefile.core.def (usbserial_common): Disable on emu.
	(usbserial_pl2303): Likewise.
	(usbserial_ftdi): Likewise.
---
 ChangeLog                   | 9 +++++++++
 grub-core/Makefile.core.def | 6 ------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6e29c939e..3a6905800 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Disable usbserial on grub-emu since our libusb code isn't good enough
+	yet.
+
+	* grub-core/Makefile.core.def (usbserial_common): Disable on emu.
+	(usbserial_pl2303): Likewise.
+	(usbserial_ftdi): Likewise.
+
 2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/disk.h (grub_disk): Remove has_partitions.
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 05890d248..54ffdccf2 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -319,25 +319,19 @@ module = {
 module = {
   name = usbserial_common;
   common = bus/usb/serial/common.c;
-  enable = emu;
   enable = usb;
-  emu_condition = COND_GRUB_EMU_USB;
 };
 
 module = {
   name = usbserial_pl2303;
   common = bus/usb/serial/pl2303.c;
-  enable = emu;
   enable = usb;
-  emu_condition = COND_GRUB_EMU_USB;
 };
 
 module = {
   name = usbserial_ftdi;
   common = bus/usb/serial/ftdi.c;
-  enable = emu;
   enable = usb;
-  emu_condition = COND_GRUB_EMU_USB;
 };
 
 module = {

From 62a747cb00cfd78eb3ccf7f35d43b58a8b0fc89e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 14 Sep 2010 00:21:52 +0200
Subject: [PATCH 1608/1628] 	* configure.ac: Disable emu-usb by default to
 prevent inadvertent 	device takeover.

---
 ChangeLog    | 5 +++++
 configure.ac | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a6905800..574c849d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Disable emu-usb by default to prevent inadvertent
+	device takeover.
+
 2010-09-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Disable usbserial on grub-emu since our libusb code isn't good enough
diff --git a/configure.ac b/configure.ac
index e519fdd1a..10723987b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -698,8 +698,8 @@ if test x"$missing_ncurses" = xtrue ; then
   AC_MSG_ERROR([grub-emu can't be compiled without ncurses])
 fi
 
-if test x"$enable_grub_emu_usb" = xno ; then
-  grub_emu_usb_excuse="explicitly disabled"
+if test x"$enable_grub_emu_usb" != xyes ; then
+   grub_emu_usb_excuse="not enabled"
 fi
 
 if test x"$enable_grub_emu_pci" = xyes ; then

From a5dbb1f10daf2de825d5dab16e6cacc4b2dee8e7 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 14 Sep 2010 00:49:02 +0200
Subject: [PATCH 1609/1628] 	Create euro.pf2 which supports most European
 languages.

	* Makefile.am (grubdata_DATA): Add euro.pf2.
	(euro.pf2): New target.
	(CLEANFILES): Add euro.pf2.
---
 ChangeLog   | 8 ++++++++
 Makefile.am | 6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 574c849d9..c3d7a6f0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Create euro.pf2 which supports most European languages.
+
+	* Makefile.am (grubdata_DATA): Add euro.pf2.
+	(euro.pf2): New target.
+	(CLEANFILES): Add euro.pf2.
+
 2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Disable emu-usb by default to prevent inadvertent
diff --git a/Makefile.am b/Makefile.am
index 93d1e37fd..9ef8feaac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,7 +60,7 @@ CLEANFILES += grub_fstest_init.c
 
 if COND_GRUB_MKFONT
 if COND_HAVE_FONT_SOURCE
-grubdata_DATA = unicode.pf2 ascii.pf2 ascii.h widthspec.h
+grubdata_DATA = unicode.pf2 ascii.pf2 euro.pf2 ascii.h widthspec.h
 endif
 endif
 
@@ -76,6 +76,10 @@ ascii.pf2: $(FONT_SOURCE) grub-mkfont
 	$(builddir)/grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x7f,$(UNICODE_ARROWS),$(UNICODE_LINES)
 CLEANFILES += ascii.pf2
 
+euro.pf2: $(FONT_SOURCE) grub-mkfont
+	$(builddir)/grub-mkfont -o $@ $(FONT_SOURCE) -r 0x0-0x4ff,0x1e00-0x1fff,$(UNICODE_ARROWS),$(UNICODE_LINES)
+CLEANFILES += euro.pf2
+
 ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
 	$(builddir)/grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE)
 CLEANFILES += ascii.bitmaps

From 275433e64227ad96921e5de8f72169a1403df29f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 14 Sep 2010 01:08:24 +0200
Subject: [PATCH 1610/1628] 	Don't export grub_gate_a20.

	* grub-core/kern/i386/pc/init.c: Remove leftovers.
	* grub-core/kern/i386/pc/startup.S (FUNCTION(grub_gate_a20)): Rename
	to ...
	(grub_gate_a20): ... this. All users updated.
	* include/grub/i386/pc/init.h: Removed. All users updated.
---
 ChangeLog                              | 10 +++++++++
 grub-core/kern/i386/pc/init.c          |  7 +-----
 grub-core/kern/i386/pc/mmap.c          |  3 +--
 grub-core/kern/i386/pc/startup.S       |  6 +++---
 grub-core/loader/i386/pc/chainloader.c |  2 +-
 grub-core/loader/i386/pc/linux.c       |  1 -
 include/grub/i386/pc/init.h            | 30 --------------------------
 7 files changed, 16 insertions(+), 43 deletions(-)
 delete mode 100644 include/grub/i386/pc/init.h

diff --git a/ChangeLog b/ChangeLog
index c3d7a6f0d..e622b6da5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Don't export grub_gate_a20.
+
+	* grub-core/kern/i386/pc/init.c: Remove leftovers.
+	* grub-core/kern/i386/pc/startup.S (FUNCTION(grub_gate_a20)): Rename
+	to ...
+	(grub_gate_a20): ... this. All users updated.
+	* include/grub/i386/pc/init.h: Removed. All users updated.
+
 2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Create euro.pf2 which supports most European languages.
diff --git a/grub-core/kern/i386/pc/init.c b/grub-core/kern/i386/pc/init.c
index 57e33569e..fc247a0d0 100644
--- a/grub-core/kern/i386/pc/init.c
+++ b/grub-core/kern/i386/pc/init.c
@@ -19,7 +19,7 @@
 #include <grub/kernel.h>
 #include <grub/mm.h>
 #include <grub/machine/boot.h>
-#include <grub/machine/init.h>
+#include <grub/i386/floppy.h>
 #include <grub/machine/memory.h>
 #include <grub/machine/console.h>
 #include <grub/machine/kernel.h>
@@ -171,11 +171,6 @@ grub_machine_init (void)
   if (grub_lower_mem < GRUB_MEMORY_MACHINE_RESERVED_END)
     grub_fatal ("too small memory");
 
-#if 0
-  /* Turn on Gate A20 to access >1MB.  */
-  grub_gate_a20 (1);
-#endif
-
 /* FIXME: This prevents loader/i386/linux.c from using low memory.  When our
    heap implements support for requesting a chunk in low memory, this should
    no longer be a problem.  */
diff --git a/grub-core/kern/i386/pc/mmap.c b/grub-core/kern/i386/pc/mmap.c
index b174bc441..dba69bbcb 100644
--- a/grub-core/kern/i386/pc/mmap.c
+++ b/grub-core/kern/i386/pc/mmap.c
@@ -16,9 +16,8 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <grub/machine/init.h>
-#include <grub/machine/int.h>
 #include <grub/machine/memory.h>
+#include <grub/machine/int.h>
 #include <grub/err.h>
 #include <grub/types.h>
 #include <grub/misc.h>
diff --git a/grub-core/kern/i386/pc/startup.S b/grub-core/kern/i386/pc/startup.S
index 9b53deeb2..2a78bc76f 100644
--- a/grub-core/kern/i386/pc/startup.S
+++ b/grub-core/kern/i386/pc/startup.S
@@ -202,7 +202,7 @@ LOCAL (codestart):
 	.code32
 
 	incl	%eax
-	call	EXT_C(grub_gate_a20)
+	call	grub_gate_a20
 
 #ifdef ENABLE_LZMA
 	movl	$GRUB_MEMORY_MACHINE_DECOMPRESSION_ADDR, %edi
@@ -292,7 +292,7 @@ VARIABLE(grub_boot_drive)
  * It also eats any keystrokes in the keyboard buffer.  :-(
  */
 
-FUNCTION(grub_gate_a20)
+grub_gate_a20:	
 	movl	%eax, %edx
 
 gate_a20_test_current_state:
@@ -478,7 +478,7 @@ FUNCTION(grub_chainloader_real_boot)
 
 	/* Turn off Gate A20 */
 	xorl	%eax, %eax
-	call	EXT_C(grub_gate_a20)
+	call	grub_gate_a20
 
 	/* set up to pass boot drive */
 	popl	%edx
diff --git a/grub-core/loader/i386/pc/chainloader.c b/grub-core/loader/i386/pc/chainloader.c
index e76f84f08..0ae94eaf8 100644
--- a/grub-core/loader/i386/pc/chainloader.c
+++ b/grub-core/loader/i386/pc/chainloader.c
@@ -26,13 +26,13 @@
 #include <grub/disk.h>
 #include <grub/misc.h>
 #include <grub/types.h>
-#include <grub/machine/init.h>
 #include <grub/partition.h>
 #include <grub/machine/memory.h>
 #include <grub/dl.h>
 #include <grub/command.h>
 #include <grub/msdos_partition.h>
 #include <grub/machine/biosnum.h>
+#include <grub/cpu/floppy.h>
 #include <grub/i18n.h>
 #include <grub/video.h>
 #include <grub/mm.h>
diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
index 2f5dfec70..8e9a1b630 100644
--- a/grub-core/loader/i386/pc/linux.c
+++ b/grub-core/loader/i386/pc/linux.c
@@ -25,7 +25,6 @@
 #include <grub/disk.h>
 #include <grub/misc.h>
 #include <grub/types.h>
-#include <grub/machine/init.h>
 #include <grub/machine/memory.h>
 #include <grub/dl.h>
 #include <grub/cpu/linux.h>
diff --git a/include/grub/i386/pc/init.h b/include/grub/i386/pc/init.h
deleted file mode 100644
index 4005a1772..000000000
--- a/include/grub/i386/pc/init.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2002,2004,2005,2007,2008  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/>.
- */
-
-#ifndef GRUB_INIT_MACHINE_HEADER
-#define GRUB_INIT_MACHINE_HEADER	1
-
-#include <grub/types.h>
-#include <grub/symbol.h>
-#include <grub/machine/memory.h>
-#include <grub/cpu/floppy.h>
-
-/* Turn on/off Gate A20.  */
-void grub_gate_a20 (int on);
-
-#endif /* ! GRUB_INIT_MACHINE_HEADER */

From b71c3faedb3aad10e9a422310a9f90551c028230 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 14 Sep 2010 20:59:00 +0200
Subject: [PATCH 1611/1628] 	* grub-core/kern/sparc64/ieee1275/crt0.S:
 Align stack.

---
 ChangeLog                              | 4 ++++
 grub-core/kern/sparc64/ieee1275/crt0.S | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e622b6da5..907a489de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/sparc64/ieee1275/crt0.S: Align stack.
+
 2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Don't export grub_gate_a20.
diff --git a/grub-core/kern/sparc64/ieee1275/crt0.S b/grub-core/kern/sparc64/ieee1275/crt0.S
index f178f5d3c..cebdca2b6 100644
--- a/grub-core/kern/sparc64/ieee1275/crt0.S
+++ b/grub-core/kern/sparc64/ieee1275/crt0.S
@@ -61,9 +61,11 @@ codestart:
 	/* Save ieee1275 stack for future use by booter.  */
 	mov     %o6, %o1
 	/* Our future stack.  */
-	sethi	%hi(GRUB_KERNEL_MACHINE_STACK_SIZE - 2047), %o5
-	or	%o5, %lo(GRUB_KERNEL_MACHINE_STACK_SIZE - 2047), %o5
+	sethi	%hi(GRUB_KERNEL_MACHINE_STACK_SIZE), %o5
+	or	%o5, %lo(GRUB_KERNEL_MACHINE_STACK_SIZE), %o5
 	add     %o3, %o5, %o6
+	and     %o6, ~0xff, %o6
+	sub     %o6, 2047, %o6
 	
 	sub	%o2, 4, %o2
 	sub	%o3, 4, %o3

From 3c3b5040cdf52b7c04be95a49ada241006d453ef Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 14 Sep 2010 21:04:08 +0200
Subject: [PATCH 1612/1628] 	* util/grub-mkconfig_lib.in
 (prepare_grub_to_access_device): Add 	explicit root argument to set to
 prevent UUID to be interpreted as 	argument to set.

---
 ChangeLog                 | 6 ++++++
 util/grub-mkconfig_lib.in | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 907a489de..f300c84ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Add
+	explicit root argument to set to prevent UUID to be interpreted as
+	argument to set.
+
 2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/sparc64/ieee1275/crt0.S: Align stack.
diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
index 9a77d1bdf..41359975e 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -119,7 +119,7 @@ prepare_grub_to_access_device ()
   # otherwise set root as per value in device.map.
   echo "set root='`${grub_probe} --device ${device} --target=drive`'"
   if fs_uuid="`${grub_probe} --device ${device} --target=fs_uuid 2> /dev/null`" ; then
-    echo "search --no-floppy --fs-uuid --set ${fs_uuid}"
+    echo "search --no-floppy --fs-uuid --set=root ${fs_uuid}"
   fi
 }
 

From d2ea45514111f866432b8acabdabd1277ee19f98 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 14 Sep 2010 21:07:39 +0200
Subject: [PATCH 1613/1628] 	* grub-core/partmap/sun.c
 (sun_partition_map_iterate): Don't needlesly 	allocate p.

---
 ChangeLog                            |   5 +
 Makefile.util.def                    |   9 +-
 grub-core/fs/ext2.c                  |  19 +-
 grub-core/partmap/sun.c              |  35 +-
 include/grub/sparc64/ieee1275/boot.h |   9 +
 util/{i386/pc => }/grub-setup.c      | 690 ++++++++++++++++-----------
 util/sparc64/ieee1275/grub-setup.c   | 644 -------------------------
 7 files changed, 450 insertions(+), 961 deletions(-)
 rename util/{i386/pc => }/grub-setup.c (60%)
 delete mode 100644 util/sparc64/ieee1275/grub-setup.c

diff --git a/ChangeLog b/ChangeLog
index f300c84ab..d3e7c31c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/partmap/sun.c (sun_partition_map_iterate): Don't needlesly
+	allocate p.
+
 2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkconfig_lib.in (prepare_grub_to_access_device): Add
diff --git a/Makefile.util.def b/Makefile.util.def
index 4bbcd2b07..f56eab339 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
@@ -232,14 +232,11 @@ program = {
   name = grub-setup;
   installdir = sbin;
   mansection = 8;
-  i386_pc = util/i386/pc/grub-setup.c;
-  i386_pc = util/raid.c;
-  i386_pc = util/lvm.c;
+  common = util/grub-setup.c;
+  common = util/raid.c;
+  common = util/lvm.c;
 
   sparc64_ieee1275 = util/ieee1275/ofpath.c;
-  sparc64_ieee1275 = util/sparc64/ieee1275/grub-setup.c;
-  sparc64_ieee1275 = util/raid.c;
-  sparc64_ieee1275 = util/lvm.c;
 
   ldadd = libgrub.a;
   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
index f2fec828a..dfc75c625 100644
--- a/grub-core/fs/ext2.c
+++ b/grub-core/fs/ext2.c
@@ -728,22 +728,27 @@ grub_ext2_open (struct grub_file *file, const char *name)
 {
   struct grub_ext2_data *data;
   struct grub_fshelp_node *fdiro = 0;
+  grub_err_t err;
 
   grub_dl_ref (my_mod);
 
   data = grub_ext2_mount (file->device->disk);
   if (! data)
-    goto fail;
+    {
+      err = grub_errno;
+      goto fail;
+    }
 
-  grub_fshelp_find_file (name, &data->diropen, &fdiro, grub_ext2_iterate_dir,
-			 grub_ext2_read_symlink, GRUB_FSHELP_REG);
-  if (grub_errno)
+  err = grub_fshelp_find_file (name, &data->diropen, &fdiro,
+			       grub_ext2_iterate_dir,
+			       grub_ext2_read_symlink, GRUB_FSHELP_REG);
+  if (err)
     goto fail;
 
   if (! fdiro->inode_read)
     {
-      grub_ext2_read_inode (data, fdiro->ino, &fdiro->inode);
-      if (grub_errno)
+      err = grub_ext2_read_inode (data, fdiro->ino, &fdiro->inode);
+      if (err)
 	goto fail;
     }
 
@@ -763,7 +768,7 @@ grub_ext2_open (struct grub_file *file, const char *name)
 
   grub_dl_unref (my_mod);
 
-  return grub_errno;
+  return err;
 }
 
 static grub_err_t
diff --git a/grub-core/partmap/sun.c b/grub-core/partmap/sun.c
index 7a7eaef27..7af95c939 100644
--- a/grub-core/partmap/sun.c
+++ b/grub-core/partmap/sun.c
@@ -87,36 +87,23 @@ sun_partition_map_iterate (grub_disk_t disk,
                            int (*hook) (grub_disk_t disk,
 					const grub_partition_t partition))
 {
-  grub_partition_t p;
+  struct grub_partition p;
   struct grub_sun_block block;
   int partnum;
   grub_err_t err;
 
-  p = (grub_partition_t) grub_zalloc (sizeof (struct grub_partition));
-  if (! p)
-    return grub_errno;
-
-  p->partmap = &grub_sun_partition_map;
+  p.partmap = &grub_sun_partition_map;
   err = grub_disk_read (disk, 0, 0, sizeof (struct grub_sun_block),
 			&block);
   if (err)
-    {
-      grub_free (p);
-      return err;
-    }
+    return err;
 
   if (GRUB_PARTMAP_SUN_MAGIC != grub_be_to_cpu16 (block.magic))
-    {
-      grub_free (p);
-      return grub_error (GRUB_ERR_BAD_PART_TABLE, "not a sun partition table");
-    }
+    return grub_error (GRUB_ERR_BAD_PART_TABLE, "not a sun partition table");
 
   if (! grub_sun_is_valid (&block))
-    {
-      grub_free (p);      
       return grub_error (GRUB_ERR_BAD_PART_TABLE, "invalid checksum");
-    }
-
+  
   /* Maybe another error value would be better, because partition
      table _is_ recognized but invalid.  */
   for (partnum = 0; partnum < GRUB_PARTMAP_SUN_MAX_PARTS; partnum++)
@@ -128,20 +115,18 @@ sun_partition_map_iterate (grub_disk_t disk,
 	continue;
 
       desc = &block.partitions[partnum];
-      p->start = ((grub_uint64_t) grub_be_to_cpu32 (desc->start_cylinder)
+      p.start = ((grub_uint64_t) grub_be_to_cpu32 (desc->start_cylinder)
 		  * grub_be_to_cpu16 (block.ntrks)
 		  * grub_be_to_cpu16 (block.nsect));
-      p->len = grub_be_to_cpu32 (desc->num_sectors);
-      p->number = p->index = partnum;
-      if (p->len)
+      p.len = grub_be_to_cpu32 (desc->num_sectors);
+      p.number = p.index = partnum;
+      if (p.len)
 	{
-	  if (hook (disk, p))
+	  if (hook (disk, &p))
 	    partnum = GRUB_PARTMAP_SUN_MAX_PARTS;
 	}
     }
 
-  grub_free (p);
-
   return grub_errno;
 }
 
diff --git a/include/grub/sparc64/ieee1275/boot.h b/include/grub/sparc64/ieee1275/boot.h
index bd0a7bf3c..112d19bc7 100644
--- a/include/grub/sparc64/ieee1275/boot.h
+++ b/include/grub/sparc64/ieee1275/boot.h
@@ -52,4 +52,13 @@
 
 #define GRUB_BOOT_MACHINE_KERNEL_ADDR 0x4200
 
+#ifndef ASM_FILE
+/* This is the blocklist used in the diskboot image.  */
+struct grub_boot_blocklist
+{
+  grub_uint64_t start;
+  grub_uint32_t len;
+} __attribute__ ((packed));
+#endif
+
 #endif /* ! BOOT_MACHINE_HEADER */
diff --git a/util/i386/pc/grub-setup.c b/util/grub-setup.c
similarity index 60%
rename from util/i386/pc/grub-setup.c
rename to util/grub-setup.c
index b9abfb0c6..55d740f09 100644
--- a/util/i386/pc/grub-setup.c
+++ b/util/grub-setup.c
@@ -36,9 +36,9 @@
 #include <grub/i18n.h>
 #include <grub/util/raid.h>
 #include <grub/util/lvm.h>
-#include <grub/emu/getroot.h>
-
-static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT;
+#ifdef GRUB_MACHINE_IEEE1275
+#include <grub/util/ofpath.h>
+#endif
 
 #include <stdio.h>
 #include <unistd.h>
@@ -48,59 +48,312 @@ static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_P
 #include <sys/stat.h>
 #include <dirent.h>
 #include <assert.h>
+#include <grub/emu/getroot.h>
 #include "progname.h"
 
 #define _GNU_SOURCE	1
 #include <getopt.h>
 
+/* On SPARC this program fills in various fields inside of the 'boot' and 'core'
+ * image files.
+ *
+ * The 'boot' image needs to know the OBP path name of the root
+ * device.  It also needs to know the initial block number of
+ * 'core' (which is 'diskboot' concatenated with 'kernel' and
+ * all the modules, this is created by grub-mkimage).  This resulting
+ * 'boot' image is 512 bytes in size and is placed in the second block
+ * of a partition.
+ *
+ * The initial 'diskboot' block acts as a loader for the actual GRUB
+ * kernel.  It contains the loading code and then a block list.
+ *
+ * The block list of 'core' starts at the end of the 'diskboot' image
+ * and works it's way backwards towards the end of the code of 'diskboot'.
+ *
+ * We patch up the images with the necessary values and write out the
+ * result.
+ */
+
+#ifdef GRUB_MACHINE_PCBIOS
+static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT;
+#endif
+
 #define DEFAULT_BOOT_FILE	"boot.img"
 #define DEFAULT_CORE_FILE	"core.img"
 
+#ifdef GRUB_MACHINE_SPARC64
+#define grub_target_to_host16(x)	grub_be_to_cpu16(x)
+#define grub_target_to_host32(x)	grub_be_to_cpu32(x)
+#define grub_target_to_host64(x)	grub_be_to_cpu64(x)
+#define grub_host_to_target16(x)	grub_cpu_to_be16(x)
+#define grub_host_to_target32(x)	grub_cpu_to_be32(x)
+#define grub_host_to_target64(x)	grub_cpu_to_be64(x)
+#elif defined (GRUB_MACHINE_PCBIOS)
 #define grub_target_to_host16(x)	grub_le_to_cpu16(x)
 #define grub_target_to_host32(x)	grub_le_to_cpu32(x)
 #define grub_target_to_host64(x)	grub_le_to_cpu64(x)
 #define grub_host_to_target16(x)	grub_cpu_to_le16(x)
 #define grub_host_to_target32(x)	grub_cpu_to_le32(x)
 #define grub_host_to_target64(x)	grub_cpu_to_le64(x)
+#else
+#error Complete this
+#endif
+
+static void
+write_rootdev (char *core_img, grub_device_t root_dev,
+	       char *boot_img, grub_uint64_t first_sector)
+{
+#ifdef GRUB_MACHINE_PCBIOS
+  {
+    grub_int32_t *install_dos_part, *install_bsd_part;
+    grub_int32_t dos_part, bsd_part;
+    grub_uint8_t *boot_drive;
+    grub_disk_addr_t *kernel_sector;
+    boot_drive = (grub_uint8_t *) (boot_img + GRUB_BOOT_MACHINE_BOOT_DRIVE);
+    kernel_sector = (grub_disk_addr_t *) (boot_img
+					  + GRUB_BOOT_MACHINE_KERNEL_SECTOR);
+
+
+    install_dos_part = (grub_int32_t *) (core_img + GRUB_DISK_SECTOR_SIZE
+					 + GRUB_KERNEL_MACHINE_INSTALL_DOS_PART);
+    install_bsd_part = (grub_int32_t *) (core_img + GRUB_DISK_SECTOR_SIZE
+					 + GRUB_KERNEL_MACHINE_INSTALL_BSD_PART);
+
+    /* If we hardcoded drive as part of prefix, we don't want to
+       override the current setting.  */
+    if (*install_dos_part != -2)
+      {
+	/* Embed information about the installed location.  */
+	if (root_dev->disk->partition)
+	  {
+	    if (root_dev->disk->partition->parent)
+	      {
+		if (root_dev->disk->partition->parent->parent)
+		  grub_util_error ("Installing on doubly nested partitions is "
+				   "not supported");
+		dos_part = root_dev->disk->partition->parent->number;
+		bsd_part = root_dev->disk->partition->number;
+	      }
+	    else
+	      {
+		dos_part = root_dev->disk->partition->number;
+		bsd_part = -1;
+	      }
+	  }
+	else
+	  dos_part = bsd_part = -1;
+      }
+    else
+      {
+	dos_part = grub_le_to_cpu32 (*install_dos_part);
+	bsd_part = grub_le_to_cpu32 (*install_bsd_part);
+      }
+
+    grub_util_info ("dos partition is %d, bsd partition is %d",
+		    dos_part, bsd_part);
+
+    *install_dos_part = grub_cpu_to_le32 (dos_part);
+    *install_bsd_part = grub_cpu_to_le32 (bsd_part);
+
+    /* FIXME: can this be skipped?  */
+    *boot_drive = 0xFF;
+
+    *kernel_sector = grub_cpu_to_le64 (first_sector);
+  }
+#endif
+#ifdef GRUB_MACHINE_IEEE1275
+  {
+    grub_disk_addr_t *kernel_byte;
+    kernel_byte = (grub_disk_addr_t *) (boot_img
+					+ GRUB_BOOT_AOUT_HEADER_SIZE
+					+ GRUB_BOOT_MACHINE_KERNEL_BYTE);
+    *kernel_byte = grub_cpu_to_be64 (first_sector << GRUB_DISK_SECTOR_BITS);
+  }
+#endif
+}
+
+#ifdef GRUB_MACHINE_IEEE1275
+#define BOOT_SECTOR 1
+#else
+#define BOOT_SECTOR 0
+#endif
 
 static void
 setup (const char *dir,
        const char *boot_file, const char *core_file,
-       const char *root, const char *dest, int must_embed, int force, int fs_probe)
+       const char *root, const char *dest, int must_embed, int force,
+       int fs_probe)
 {
   char *boot_path, *core_path, *core_path_dev, *core_path_dev_full;
   char *boot_img, *core_img;
   size_t boot_size, core_size;
   grub_uint16_t core_sectors;
   grub_device_t root_dev, dest_dev;
-  const char *dest_partmap;
-  int multiple_partmaps;
-  grub_uint8_t *boot_drive;
-  grub_disk_addr_t *kernel_sector;
-  grub_uint16_t *boot_drive_check;
   struct grub_boot_blocklist *first_block, *block;
-  grub_int32_t *install_dos_part, *install_bsd_part;
-  grub_int32_t dos_part, bsd_part;
   char *tmp_img;
   int i;
   grub_disk_addr_t first_sector;
+#ifdef GRUB_MACHINE_PCBIOS
   grub_uint16_t current_segment
     = GRUB_BOOT_MACHINE_KERNEL_SEG + (GRUB_DISK_SECTOR_SIZE >> 4);
+#endif
   grub_uint16_t last_length = GRUB_DISK_SECTOR_SIZE;
   grub_file_t file;
   FILE *fp;
   struct { grub_uint64_t start; grub_uint64_t end; } embed_region;
   embed_region.start = embed_region.end = ~0UL;
 
-  auto void NESTED_FUNC_ATTR save_first_sector (grub_disk_addr_t sector, unsigned offset,
-			       unsigned length);
-  auto void NESTED_FUNC_ATTR save_blocklists (grub_disk_addr_t sector, unsigned offset,
-			     unsigned length);
+  auto void NESTED_FUNC_ATTR save_first_sector (grub_disk_addr_t sector,
+						unsigned offset,
+						unsigned length);
+  auto void NESTED_FUNC_ATTR save_blocklists (grub_disk_addr_t sector,
+					      unsigned offset,
+					      unsigned length);
 
-  auto int NESTED_FUNC_ATTR find_usable_region_msdos (grub_disk_t disk,
-						      const grub_partition_t p);
-  int NESTED_FUNC_ATTR find_usable_region_msdos (grub_disk_t disk __attribute__ ((unused)),
-						 const grub_partition_t p)
+  void NESTED_FUNC_ATTR save_first_sector (grub_disk_addr_t sector,
+					   unsigned offset,
+					   unsigned length)
+    {
+      grub_util_info ("the first sector is <%llu,%u,%u>",
+		      sector, offset, length);
+
+      if (offset != 0 || length != GRUB_DISK_SECTOR_SIZE)
+	grub_util_error (_("the first sector of the core file is not sector-aligned"));
+
+      first_sector = sector;
+    }
+
+  void NESTED_FUNC_ATTR save_blocklists (grub_disk_addr_t sector,
+					 unsigned offset,
+					 unsigned length)
+    {
+      struct grub_boot_blocklist *prev = block + 1;
+
+      grub_util_info ("saving <%llu,%u,%u>", sector, offset, length);
+
+      if (offset != 0 || last_length != GRUB_DISK_SECTOR_SIZE)
+	grub_util_error (_("non-sector-aligned data is found in the core file"));
+
+      if (block != first_block
+	  && (grub_target_to_host64 (prev->start)
+	      + grub_target_to_host16 (prev->len)) == sector)
+	prev->len = grub_host_to_target16 (grub_target_to_host16 (prev->len) + 1);
+      else
+	{
+	  block->start = grub_host_to_target64 (sector);
+	  block->len = grub_host_to_target16 (1);
+#ifdef GRUB_MACHINE_PCBIOS
+	  block->segment = grub_host_to_target16 (current_segment);
+#endif
+
+	  block--;
+	  if (block->len)
+	    grub_util_error (_("the sectors of the core file are too fragmented"));
+	}
+
+      last_length = length;
+#ifdef GRUB_MACHINE_PCBIOS
+      current_segment += GRUB_DISK_SECTOR_SIZE >> 4;
+#endif
+    }
+
+  /* Read the boot image by the OS service.  */
+  boot_path = grub_util_get_path (dir, boot_file);
+  boot_size = grub_util_get_image_size (boot_path);
+  if (boot_size != GRUB_DISK_SECTOR_SIZE)
+    grub_util_error (_("the size of `%s' is not %u"),
+		     boot_path, GRUB_DISK_SECTOR_SIZE);
+  boot_img = grub_util_read_image (boot_path);
+  free (boot_path);
+
+  core_path = grub_util_get_path (dir, core_file);
+  core_size = grub_util_get_image_size (core_path);
+  core_sectors = ((core_size + GRUB_DISK_SECTOR_SIZE - 1)
+		  >> GRUB_DISK_SECTOR_BITS);
+  if (core_size < GRUB_DISK_SECTOR_SIZE)
+    grub_util_error (_("the size of `%s' is too small"), core_path);
+#ifdef GRUB_MACHINE_PCBIOS
+  if (core_size > 0xFFFF * GRUB_DISK_SECTOR_SIZE)
+    grub_util_error (_("the size of `%s' is too large"), core_path);
+#endif
+
+  core_img = grub_util_read_image (core_path);
+
+  /* Have FIRST_BLOCK to point to the first blocklist.  */
+  first_block = (struct grub_boot_blocklist *) (core_img
+						+ GRUB_DISK_SECTOR_SIZE
+						- sizeof (*block));
+
+  grub_util_info ("root is `%s', dest is `%s'", root, dest);
+
+  /* Open the root device and the destination device.  */
+  grub_util_info ("Opening root");
+  root_dev = grub_device_open (root);
+  if (! root_dev)
+    grub_util_error ("%s", grub_errmsg);
+
+  grub_util_info ("Opening dest");
+  dest_dev = grub_device_open (dest);
+  if (! dest_dev)
+    grub_util_error ("%s", grub_errmsg);
+
+  grub_util_info ("setting the root device to `%s'", root);
+  if (grub_env_set ("root", root) != GRUB_ERR_NONE)
+    grub_util_error ("%s", grub_errmsg);
+
+#ifdef GRUB_MACHINE_PCBIOS
+  /* Read the original sector from the disk.  */
+  tmp_img = xmalloc (GRUB_DISK_SECTOR_SIZE);
+  if (grub_disk_read (dest_dev->disk, 0, 0, GRUB_DISK_SECTOR_SIZE, tmp_img))
+    grub_util_error ("%s", grub_errmsg);
+#endif
+
+#ifdef GRUB_MACHINE_PCBIOS
+  if (dest_dev->disk->partition && fs_probe)
+    {
+      grub_fs_t fs;
+      fs = grub_fs_probe (dest_dev);
+      if (! fs)
+	grub_util_error (_("unable to identify a filesystem in %s; safety check can't be performed"),
+			 dest_dev->disk->name);
+
+      if (! fs->reserved_first_sector)
+	grub_util_error (_("%s appears to contain a %s filesystem which isn't known to "
+			   "reserve space for DOS-style boot.  Installing GRUB there could "
+			   "result in FILESYSTEM DESTRUCTION if valuable data is overwritten "
+			   "by grub-setup (--skip-fs-probe disables this "
+			   "check, use at your own risk)"), dest_dev->disk->name, fs->name);
+    }
+#endif
+
+#ifdef GRUB_MACHINE_PCBIOS
+  {
+    grub_uint16_t *boot_drive_check;
+    boot_drive_check = (grub_uint16_t *) (boot_img
+					  + GRUB_BOOT_MACHINE_DRIVE_CHECK);
+    /* Copy the possible DOS BPB.  */
+    memcpy (boot_img + GRUB_BOOT_MACHINE_BPB_START,
+	    tmp_img + GRUB_BOOT_MACHINE_BPB_START,
+	    GRUB_BOOT_MACHINE_BPB_END - GRUB_BOOT_MACHINE_BPB_START);
+
+    /* If DEST_DRIVE is a hard disk, enable the workaround, which is
+       for buggy BIOSes which don't pass boot drive correctly. Instead,
+       they pass 0x00 or 0x01 even when booted from 0x80.  */
+    if (dest_dev->disk->id & 0x80)
+    /* Replace the jmp (2 bytes) with double nop's.  */
+      *boot_drive_check = 0x9090;
+  }
+#endif
+
+#ifdef GRUB_MACHINE_PCBIOS
+  {
+    const char *dest_partmap;
+    int multiple_partmaps;
+
+    auto int NESTED_FUNC_ATTR find_usable_region_msdos (grub_disk_t disk,
+							const grub_partition_t p);
+    int NESTED_FUNC_ATTR find_usable_region_msdos (grub_disk_t disk __attribute__ ((unused)),
+						   const grub_partition_t p)
     {
       /* There's always an embed region, and it starts right after the MBR.  */
       embed_region.start = 1;
@@ -111,10 +364,10 @@ setup (const char *dir,
       return 0;
     }
 
-  auto int NESTED_FUNC_ATTR find_usable_region_gpt (grub_disk_t disk,
-						    const grub_partition_t p);
-  int NESTED_FUNC_ATTR find_usable_region_gpt (grub_disk_t disk __attribute__ ((unused)),
-					       const grub_partition_t p)
+    auto int NESTED_FUNC_ATTR find_usable_region_gpt (grub_disk_t disk,
+						      const grub_partition_t p);
+    int NESTED_FUNC_ATTR find_usable_region_gpt (grub_disk_t disk __attribute__ ((unused)),
+						 const grub_partition_t p)
     {
       struct grub_gpt_partentry gptdata;
 
@@ -134,176 +387,18 @@ setup (const char *dir,
       return 0;
     }
 
-  void NESTED_FUNC_ATTR save_first_sector (grub_disk_addr_t sector, unsigned offset,
-			  unsigned length)
-    {
-      grub_util_info ("the first sector is <%llu,%u,%u>",
-		      sector, offset, length);
+    if (dest_dev->disk->partition)
+      {
+	grub_util_warn (_("Attempting to install GRUB to a partition instead of the MBR.  This is a BAD idea."));
+	goto unable_to_embed;
+      }
 
-      if (offset != 0 || length != GRUB_DISK_SECTOR_SIZE)
-	grub_util_error (_("the first sector of the core file is not sector-aligned"));
-
-      first_sector = sector;
-    }
-
-  void NESTED_FUNC_ATTR save_blocklists (grub_disk_addr_t sector, unsigned offset,
-			unsigned length)
-    {
-      struct grub_boot_blocklist *prev = block + 1;
-
-      grub_util_info ("saving <%llu,%u,%u> with the segment 0x%x",
-		      sector, offset, length, (unsigned) current_segment);
-
-      if (offset != 0 || last_length != GRUB_DISK_SECTOR_SIZE)
-	grub_util_error (_("non-sector-aligned data is found in the core file"));
-
-      if (block != first_block
-	  && (grub_le_to_cpu64 (prev->start)
-	      + grub_le_to_cpu16 (prev->len)) == sector)
-	prev->len = grub_cpu_to_le16 (grub_le_to_cpu16 (prev->len) + 1);
-      else
-	{
-	  block->start = grub_cpu_to_le64 (sector);
-	  block->len = grub_cpu_to_le16 (1);
-	  block->segment = grub_cpu_to_le16 (current_segment);
-
-	  block--;
-	  if (block->len)
-	    grub_util_error (_("the sectors of the core file are too fragmented"));
-	}
-
-      last_length = length;
-      current_segment += GRUB_DISK_SECTOR_SIZE >> 4;
-    }
-
-  /* Read the boot image by the OS service.  */
-  boot_path = grub_util_get_path (dir, boot_file);
-  boot_size = grub_util_get_image_size (boot_path);
-  if (boot_size != GRUB_DISK_SECTOR_SIZE)
-    grub_util_error (_("the size of `%s' is not %u"),
-		     boot_path, GRUB_DISK_SECTOR_SIZE);
-  boot_img = grub_util_read_image (boot_path);
-  free (boot_path);
-
-  /* Set the addresses of variables in the boot image.  */
-  boot_drive = (grub_uint8_t *) (boot_img + GRUB_BOOT_MACHINE_BOOT_DRIVE);
-  kernel_sector = (grub_disk_addr_t *) (boot_img
-				     + GRUB_BOOT_MACHINE_KERNEL_SECTOR);
-  boot_drive_check = (grub_uint16_t *) (boot_img
-					+ GRUB_BOOT_MACHINE_DRIVE_CHECK);
-
-  core_path = grub_util_get_path (dir, core_file);
-  core_size = grub_util_get_image_size (core_path);
-  core_sectors = ((core_size + GRUB_DISK_SECTOR_SIZE - 1)
-		  >> GRUB_DISK_SECTOR_BITS);
-  if (core_size < GRUB_DISK_SECTOR_SIZE)
-    grub_util_error (_("the size of `%s' is too small"), core_path);
-  else if (core_size > 0xFFFF * GRUB_DISK_SECTOR_SIZE)
-    grub_util_error (_("the size of `%s' is too large"), core_path);
-
-  core_img = grub_util_read_image (core_path);
-
-  /* Have FIRST_BLOCK to point to the first blocklist.  */
-  first_block = (struct grub_boot_blocklist *) (core_img
-						+ GRUB_DISK_SECTOR_SIZE
-						- sizeof (*block));
-
-  install_dos_part = (grub_int32_t *) (core_img + GRUB_DISK_SECTOR_SIZE
-				       + GRUB_KERNEL_MACHINE_INSTALL_DOS_PART);
-  install_bsd_part = (grub_int32_t *) (core_img + GRUB_DISK_SECTOR_SIZE
-				       + GRUB_KERNEL_MACHINE_INSTALL_BSD_PART);
-
-  /* Open the root device and the destination device.  */
-  root_dev = grub_device_open (root);
-  if (! root_dev)
-    grub_util_error ("%s", grub_errmsg);
-
-  dest_dev = grub_device_open (dest);
-  if (! dest_dev)
-    grub_util_error ("%s", grub_errmsg);
-
-  grub_util_info ("setting the root device to `%s'", root);
-  if (grub_env_set ("root", root) != GRUB_ERR_NONE)
-    grub_util_error ("%s", grub_errmsg);
-
-  /* Read the original sector from the disk.  */
-  tmp_img = xmalloc (GRUB_DISK_SECTOR_SIZE);
-  if (grub_disk_read (dest_dev->disk, 0, 0, GRUB_DISK_SECTOR_SIZE, tmp_img))
-    grub_util_error ("%s", grub_errmsg);
-
-  if (dest_dev->disk->partition && fs_probe)
-    {
-      grub_fs_t fs;
-      fs = grub_fs_probe (dest_dev);
-      if (! fs)
-	grub_util_error (_("unable to identify a filesystem in %s; safety check can't be performed"),
-			 dest_dev->disk->name);
-
-      if (! fs->reserved_first_sector)
-	grub_util_error (_("%s appears to contain a %s filesystem which isn't known to "
-			   "reserve space for DOS-style boot.  Installing GRUB there could "
-			   "result in FILESYSTEM DESTRUCTION if valuable data is overwritten "
-			   "by grub-setup (--skip-fs-probe disables this "
-			   "check, use at your own risk)"), dest_dev->disk->name, fs->name);
-    }
-
-  /* Copy the possible DOS BPB.  */
-  memcpy (boot_img + GRUB_BOOT_MACHINE_BPB_START,
-	  tmp_img + GRUB_BOOT_MACHINE_BPB_START,
-	  GRUB_BOOT_MACHINE_BPB_END - GRUB_BOOT_MACHINE_BPB_START);
-
-  /* If DEST_DRIVE is a hard disk, enable the workaround, which is
-     for buggy BIOSes which don't pass boot drive correctly. Instead,
-     they pass 0x00 or 0x01 even when booted from 0x80.  */
-  if (dest_dev->disk->id & 0x80)
-    /* Replace the jmp (2 bytes) with double nop's.  */
-    *boot_drive_check = 0x9090;
-
-  /* If we hardcoded drive as part of prefix, we don't want to
-     override the current setting.  */
-  if (*install_dos_part != -2)
-    {
-      /* Embed information about the installed location.  */
-      if (root_dev->disk->partition)
-	{
-	  if (root_dev->disk->partition->parent)
- 	    {
-	      if (root_dev->disk->partition->parent->parent)
-		grub_util_error ("Installing on doubly nested partitions is "
-				 "not supported");
-	      dos_part = root_dev->disk->partition->parent->number;
-	      bsd_part = root_dev->disk->partition->number;
- 	    }
-	  else
- 	    {
-	      dos_part = root_dev->disk->partition->number;
- 	      bsd_part = -1;
- 	    }
-	}
-      else
-	dos_part = bsd_part = -1;
-    }
-  else
-    {
-      dos_part = grub_le_to_cpu32 (*install_dos_part);
-      bsd_part = grub_le_to_cpu32 (*install_bsd_part);
-    }
-
-  grub_util_info ("dos partition is %d, bsd partition is %d",
-		  dos_part, bsd_part);
-
-  if (dest_dev->disk->partition)
-    {
-      grub_util_warn (_("Attempting to install GRUB to a partition instead of the MBR.  This is a BAD idea."));
-      goto unable_to_embed;
-    }
-
-  /* Unlike root_dev, with dest_dev we're interested in the partition map even
-     if dest_dev itself is a whole disk.  */
-  auto int NESTED_FUNC_ATTR identify_partmap (grub_disk_t disk,
-					      const grub_partition_t p);
-  int NESTED_FUNC_ATTR identify_partmap (grub_disk_t disk __attribute__ ((unused)),
-					 const grub_partition_t p)
+    /* Unlike root_dev, with dest_dev we're interested in the partition map even
+       if dest_dev itself is a whole disk.  */
+    auto int NESTED_FUNC_ATTR identify_partmap (grub_disk_t disk,
+						const grub_partition_t p);
+    int NESTED_FUNC_ATTR identify_partmap (grub_disk_t disk __attribute__ ((unused)),
+					   const grub_partition_t p)
     {
       if (p->parent)
 	return 0;
@@ -316,89 +411,85 @@ setup (const char *dir,
 	}
       return 0;
     }
-  dest_partmap = 0;
-  multiple_partmaps = 0;
-  grub_partition_iterate (dest_dev->disk, identify_partmap);
+    dest_partmap = 0;
+    multiple_partmaps = 0;
+    grub_partition_iterate (dest_dev->disk, identify_partmap);
 
-  if (! dest_partmap)
-    {
-      grub_util_warn (_("Attempting to install GRUB to a partitionless disk.  This is a BAD idea."));
-      goto unable_to_embed;
-    }
-  if (multiple_partmaps)
-    {
-      grub_util_warn (_("Attempting to install GRUB to a disk with multiple partition labels.  This is not supported yet."));
-      goto unable_to_embed;
-    }
+    if (! dest_partmap)
+      {
+	grub_util_warn (_("Attempting to install GRUB to a partitionless disk.  This is a BAD idea."));
+	goto unable_to_embed;
+      }
+    if (multiple_partmaps)
+      {
+	grub_util_warn (_("Attempting to install GRUB to a disk with multiple partition labels.  This is not supported yet."));
+	goto unable_to_embed;
+      }
 
-  /* Copy the partition table.  */
-  if (dest_partmap)
-    memcpy (boot_img + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC,
-	    tmp_img + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC,
-	    GRUB_BOOT_MACHINE_PART_END - GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC);
+    /* Copy the partition table.  */
+    if (dest_partmap)
+      memcpy (boot_img + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC,
+	      tmp_img + GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC,
+	      GRUB_BOOT_MACHINE_PART_END - GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC);
 
-  free (tmp_img);
+    free (tmp_img);
 
-  if (strcmp (dest_partmap, "msdos") == 0)
-    grub_partition_iterate (dest_dev->disk, find_usable_region_msdos);
-  else if (strcmp (dest_partmap, "gpt") == 0)
-    grub_partition_iterate (dest_dev->disk, find_usable_region_gpt);
-  else
-    grub_util_error (_("No DOS-style partitions found"));
+    if (strcmp (dest_partmap, "msdos") == 0)
+      grub_partition_iterate (dest_dev->disk, find_usable_region_msdos);
+    else if (strcmp (dest_partmap, "gpt") == 0)
+      grub_partition_iterate (dest_dev->disk, find_usable_region_gpt);
+    else
+      grub_util_error (_("No DOS-style partitions found"));
 
-  if (embed_region.end <= embed_region.start)
-    {
-      if (! strcmp (dest_partmap, "msdos"))
-	grub_util_warn (_("This msdos-style partition label has no post-MBR gap; embedding won't be possible!"));
-      else
-	grub_util_warn (_("This GPT partition label has no BIOS Boot Partition; embedding won't be possible!"));
-      goto unable_to_embed;
-    }
+    if (embed_region.end <= embed_region.start)
+      {
+	if (! strcmp (dest_partmap, "msdos"))
+	  grub_util_warn (_("This msdos-style partition label has no post-MBR gap; embedding won't be possible!"));
+	else
+	  grub_util_warn (_("This GPT partition label has no BIOS Boot Partition; embedding won't be possible!"));
+	goto unable_to_embed;
+      }
 
-  if ((unsigned long) core_sectors > embed_region.end - embed_region.start)
-    {
-      if (core_sectors > 62)
-	grub_util_warn (_("Your core.img is unusually large.  It won't fit in the embedding area."));
-      else /* embed_region.end - embed_region.start < 62 */
-	grub_util_warn (_("Your embedding area is unusually small.  core.img won't fit in it."));
-      goto unable_to_embed;
-    }
+    if ((unsigned long) core_sectors > embed_region.end - embed_region.start)
+      {
+	if (core_sectors > 62)
+	  grub_util_warn (_("Your core.img is unusually large.  It won't fit in the embedding area."));
+	else /* embed_region.end - embed_region.start < 62 */
+	  grub_util_warn (_("Your embedding area is unusually small.  core.img won't fit in it."));
+	goto unable_to_embed;
+      }
 
+    write_rootdev (core_img, root_dev,
+		   boot_img, embed_region.start);
 
-  grub_util_info ("the core image will be embedded at sector 0x%llx", embed_region.start);
+    grub_util_info ("the core image will be embedded at sector 0x%llx", embed_region.start);
 
-  *install_dos_part = grub_cpu_to_le32 (dos_part);
-  *install_bsd_part = grub_cpu_to_le32 (bsd_part);
+    /* The first blocklist contains the whole sectors.  */
+    first_block->start = grub_cpu_to_le64 (embed_region.start + 1);
 
-  /* The first blocklist contains the whole sectors.  */
-  first_block->start = grub_cpu_to_le64 (embed_region.start + 1);
+    /* These are filled elsewhere.  Verify them just in case.  */
+    assert (first_block->len == grub_host_to_target16 (core_sectors - 1));
+    assert (first_block->segment == grub_host_to_target16 (GRUB_BOOT_MACHINE_KERNEL_SEG
+							   + (GRUB_DISK_SECTOR_SIZE >> 4)));
 
-  /* These are filled elsewhere.  Verify them just in case.  */
-  assert (first_block->len == grub_host_to_target16 (core_sectors - 1));
-  assert (first_block->segment == grub_host_to_target16 (GRUB_BOOT_MACHINE_KERNEL_SEG
-						    + (GRUB_DISK_SECTOR_SIZE >> 4)));
+    /* Make sure that the second blocklist is a terminator.  */
+    block = first_block - 1;
+    block->start = 0;
+    block->len = 0;
+    block->segment = 0;
 
-  /* Make sure that the second blocklist is a terminator.  */
-  block = first_block - 1;
-  block->start = 0;
-  block->len = 0;
-  block->segment = 0;
+    /* Write the core image onto the disk.  */
+    if (grub_disk_write (dest_dev->disk, embed_region.start, 0, core_size, core_img))
+      grub_util_error ("%s", grub_errmsg);
 
-  /* Write the core image onto the disk.  */
-  if (grub_disk_write (dest_dev->disk, embed_region.start, 0, core_size, core_img))
-    grub_util_error ("%s", grub_errmsg);
+    /* Write the boot image onto the disk.  */
+    if (grub_disk_write (dest_dev->disk, 0, 0, GRUB_DISK_SECTOR_SIZE,
+			 boot_img))
+      grub_util_error ("%s", grub_errmsg);
 
-  /* FIXME: can this be skipped?  */
-  *boot_drive = 0xFF;
-
-  *kernel_sector = grub_cpu_to_le64 (embed_region.start);
-
-  /* Write the boot image onto the disk.  */
-  if (grub_disk_write (dest_dev->disk, 0, 0, GRUB_DISK_SECTOR_SIZE,
-		       boot_img))
-    grub_util_error ("%s", grub_errmsg);
-
-  goto finish;
+    goto finish;
+  }
+#endif
 
 unable_to_embed:
 
@@ -412,6 +503,9 @@ unable_to_embed:
   if (! force)
     grub_util_error (_("if you really want blocklists, use --force"));
 
+  /* The core image must be put on a filesystem unfortunately.  */
+  grub_util_info ("will leave the core image on the filesystem");
+
   /* Make sure that GRUB reads the identical image as the OS.  */
   tmp_img = xmalloc (core_size);
   core_path_dev_full = grub_util_get_path (dir, core_file);
@@ -494,7 +588,9 @@ unable_to_embed:
     {
       block->start = 0;
       block->len = 0;
+#ifdef GRUB_MACHINE_PCBIOS
       block->segment = 0;
+#endif
 
       block--;
 
@@ -519,18 +615,39 @@ unable_to_embed:
       != (grub_ssize_t) core_size - GRUB_DISK_SECTOR_SIZE)
     grub_util_error (_("failed to read the rest sectors of the core image"));
 
+#ifdef GRUB_MACHINE_IEEE1275
+  {
+    char *boot_devpath;
+    boot_devpath = (char *) (boot_img
+			     + GRUB_BOOT_AOUT_HEADER_SIZE
+			     + GRUB_BOOT_MACHINE_BOOT_DEVPATH);
+    if (file->device->disk->id != dest_dev->disk->id)
+      {
+	const char *dest_ofpath;
+	dest_ofpath
+	  = grub_util_devname_to_ofpath (grub_util_biosdisk_get_osdev (file->device->disk));
+	grub_util_info ("dest_ofpath is `%s'", dest_ofpath);
+	strncpy (boot_devpath, dest_ofpath, GRUB_BOOT_MACHINE_BOOT_DEVPATH_END
+		 - GRUB_BOOT_MACHINE_BOOT_DEVPATH - 1);
+	boot_devpath[GRUB_BOOT_MACHINE_BOOT_DEVPATH_END
+		   - GRUB_BOOT_MACHINE_BOOT_DEVPATH - 1] = 0;
+      }
+    else
+      {
+	grub_util_info ("non cross-disk install");
+	memset (boot_devpath, 0, GRUB_BOOT_MACHINE_BOOT_DEVPATH_END
+		- GRUB_BOOT_MACHINE_BOOT_DEVPATH);
+      }
+    grub_util_info ("boot device path %s", boot_devpath);
+  }
+#endif
+
   grub_file_close (file);
 
   free (core_path_dev);
   free (tmp_img);
 
-  *kernel_sector = grub_cpu_to_le64 (first_sector);
-
-  /* FIXME: can this be skipped?  */
-  *boot_drive = 0xFF;
-
-  *install_dos_part = grub_cpu_to_le32 (dos_part);
-  *install_bsd_part = grub_cpu_to_le32 (bsd_part);
+  write_rootdev (core_img, root_dev, boot_img, first_sector);
 
   /* Write the first two sectors of the core image onto the disk.  */
   grub_util_info ("opening the core image `%s'", core_path);
@@ -542,7 +659,8 @@ unable_to_embed:
   fclose (fp);
 
   /* Write the boot image onto the disk.  */
-  if (grub_disk_write (dest_dev->disk, 0, 0, GRUB_DISK_SECTOR_SIZE, boot_img))
+  if (grub_disk_write (dest_dev->disk, BOOT_SECTOR,
+		       0, GRUB_DISK_SECTOR_SIZE, boot_img))
     grub_util_error ("%s", grub_errmsg);
 
  finish:
@@ -621,14 +739,18 @@ get_device_name (char *dev)
 int
 main (int argc, char *argv[])
 {
-  char *boot_file = 0;
-  char *core_file = 0;
-  char *dir = 0;
-  char *dev_map = 0;
-  char *root_dev = 0;
-  char *dest_dev;
+  char *boot_file = NULL;
+  char *core_file = NULL;
+  char *dir = NULL;
+  char *dev_map = NULL;
+  char *root_dev = NULL;
+  char *dest_dev = NULL;
   int must_embed = 0, force = 0, fs_probe = 1;
 
+#ifdef GRUB_MACHINE_IEEE1275
+  force = 1;
+#endif
+
   set_program_name (argv[0]);
 
   grub_util_init_nls ();
@@ -743,10 +865,15 @@ main (int argc, char *argv[])
 	  fprintf (stderr, _("Invalid device `%s'.\n"), argv[optind]);
 	  usage (1);
 	}
+      grub_util_info ("transformed OS device `%s' into GRUB device `%s'",
+		      argv[optind], dest_dev);
     }
   else
-    /* For simplicity.  */
-    dest_dev = xstrdup (dest_dev);
+    {
+      /* For simplicity.  */
+      dest_dev = xstrdup (dest_dev);
+      grub_util_info ("Using `%s' as GRUB device", dest_dev);
+    }
 
   if (root_dev)
     {
@@ -761,13 +888,18 @@ main (int argc, char *argv[])
     }
   else
     {
-      root_dev = grub_util_get_grub_dev (grub_guess_root_device (dir ? : DEFAULT_DIRECTORY));
+      char *root_device = grub_guess_root_device (dir ? : DEFAULT_DIRECTORY);
+
+      root_dev = grub_util_get_grub_dev (root_device);
       if (! root_dev)
 	{
 	  grub_util_info ("guessing the root device failed, because of `%s'",
 			  grub_errmsg);
 	  grub_util_error (_("cannot guess the root device. Specify the option `--root-device'"));
 	}
+      grub_util_info ("guessed root device `%s' and root_dev `%s' from "
+		      "dir `%s'", root_device, root_dev,
+		      dir ? : DEFAULT_DIRECTORY);
     }
 
 #ifdef __linux__
@@ -799,7 +931,7 @@ main (int argc, char *argv[])
     }
   else
 #endif
-  /* Do the real work.  */
+    /* Do the real work.  */
     setup (dir ? : DEFAULT_DIRECTORY,
 	   boot_file ? : DEFAULT_BOOT_FILE,
 	   core_file ? : DEFAULT_CORE_FILE,
diff --git a/util/sparc64/ieee1275/grub-setup.c b/util/sparc64/ieee1275/grub-setup.c
deleted file mode 100644
index 1b1a80911..000000000
--- a/util/sparc64/ieee1275/grub-setup.c
+++ /dev/null
@@ -1,644 +0,0 @@
-/* grub-setup.c - make GRUB usable */
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010  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 <config.h>
-#include <grub/types.h>
-#include <grub/emu/misc.h>
-#include <grub/util/misc.h>
-#include <grub/device.h>
-#include <grub/i18n.h>
-#include <grub/disk.h>
-#include <grub/file.h>
-#include <grub/fs.h>
-#include <grub/partition.h>
-#include <grub/msdos_partition.h>
-#include <grub/gpt_partition.h>
-#include <grub/env.h>
-#include <grub/emu/hostdisk.h>
-#include <grub/machine/boot.h>
-#include <grub/machine/kernel.h>
-#include <grub/term.h>
-#include <grub/util/raid.h>
-#include <grub/util/lvm.h>
-#include <grub/util/ofpath.h>
-
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <grub/emu/getroot.h>
-
-#define _GNU_SOURCE	1
-#include <getopt.h>
-
-#include "progname.h"
-
-/* This program fills in various fields inside of the 'boot' and 'core'
- * image files.
- *
- * The 'boot' image needs to know the OBP path name of the root
- * device.  It also needs to know the initial block number of
- * 'core' (which is 'diskboot' concatenated with 'kernel' and
- * all the modules, this is created by grub-mkimage).  This resulting
- * 'boot' image is 512 bytes in size and is placed in the second block
- * of a partition.
- *
- * The initial 'diskboot' block acts as a loader for the actual GRUB
- * kernel.  It contains the loading code and then a block list.
- *
- * The block list of 'core' starts at the end of the 'diskboot' image
- * and works it's way backwards towards the end of the code of 'diskboot'.
- *
- * We patch up the images with the necessary values and write out the
- * result.
- */
-
-#define DEFAULT_BOOT_FILE	"boot.img"
-#define DEFAULT_CORE_FILE	"core.img"
-
-#define grub_target_to_host16(x)	grub_be_to_cpu16(x)
-#define grub_target_to_host32(x)	grub_be_to_cpu32(x)
-#define grub_target_to_host64(x)	grub_be_to_cpu64(x)
-#define grub_host_to_target16(x)	grub_cpu_to_be16(x)
-#define grub_host_to_target32(x)	grub_cpu_to_be32(x)
-#define grub_host_to_target64(x)	grub_cpu_to_be64(x)
-
-/* This is the blocklist used in the diskboot image.  */
-struct boot_blocklist
-{
-  grub_uint64_t start;
-  grub_uint32_t len;
-} __attribute__ ((packed));
-
-static void
-setup (const char *prefix, const char *dir,
-       const char *boot_file, const char *core_file,
-       const char *root, const char *dest)
-{
-  char *boot_path, *core_path;
-  char *boot_img, *core_img;
-  size_t boot_size, core_size;
-  grub_uint16_t core_sectors;
-  grub_device_t root_dev, dest_dev;
-  char *boot_devpath;
-  grub_disk_addr_t *kernel_byte;
-  struct boot_blocklist *first_block, *block;
-  char *tmp_img;
-  int i;
-  grub_disk_addr_t first_sector;
-  grub_uint16_t last_length = GRUB_DISK_SECTOR_SIZE;
-  grub_file_t file;
-  FILE *fp;
-  struct { grub_uint64_t start; grub_uint64_t end; } embed_region;
-  embed_region.start = embed_region.end = ~0UL;
-
-  auto void NESTED_FUNC_ATTR save_first_sector (grub_disk_addr_t sector,
-						unsigned int offset,
-						unsigned int length);
-  auto void NESTED_FUNC_ATTR save_blocklists (grub_disk_addr_t sector,
-					      unsigned int offset,
-					      unsigned int length);
-
-  void NESTED_FUNC_ATTR save_first_sector (grub_disk_addr_t sector,
-					   unsigned int offset,
-					   unsigned int length)
-    {
-      grub_util_info ("first sector is <%llu,%u,%u>", sector, offset, length);
-
-      if (offset != 0 || length != GRUB_DISK_SECTOR_SIZE)
-	grub_util_error ("the first sector of the core file "
-			 "is not sector-aligned");
-
-      first_sector = sector;
-    }
-
-  void NESTED_FUNC_ATTR save_blocklists (grub_disk_addr_t sector,
-					 unsigned int offset,
-					 unsigned int length)
-    {
-      struct boot_blocklist *prev = block + 1;
-
-      grub_util_info ("saving <%llu,%u,%u>", sector, offset, length);
-
-      if (offset != 0 || last_length != GRUB_DISK_SECTOR_SIZE)
-	grub_util_error ("non-sector-aligned data is found in the core file");
-
-      if (block != first_block
-	  && (grub_be_to_cpu64 (prev->start)
-	      + grub_be_to_cpu16 (prev->len)) == sector)
-	prev->len = grub_cpu_to_be16 (grub_be_to_cpu16 (prev->len) + 1);
-      else
-	{
-	  block->start = grub_cpu_to_be64 (sector);
-	  block->len = grub_cpu_to_be16 (1);
-
-	  block--;
-	  if (block->len)
-	    grub_util_error ("the sectors of the core file are too fragmented");
-	}
-
-      last_length = length;
-    }
-
-  /* Read the boot image by the OS service.  */
-  boot_path = grub_util_get_path (dir, boot_file);
-  boot_size = grub_util_get_image_size (boot_path);
-  if (boot_size != GRUB_DISK_SECTOR_SIZE)
-    grub_util_error ("the size of `%s' is not %d",
-		     boot_path, GRUB_DISK_SECTOR_SIZE);
-  boot_img = grub_util_read_image (boot_path);
-  free (boot_path);
-
-  /* Set the addresses of variables in the boot image.  */
-  boot_devpath = (char *) (boot_img
-			   + GRUB_BOOT_AOUT_HEADER_SIZE
-			   + GRUB_BOOT_MACHINE_BOOT_DEVPATH);
-  kernel_byte = (grub_disk_addr_t *) (boot_img
-				      + GRUB_BOOT_AOUT_HEADER_SIZE
-				      + GRUB_BOOT_MACHINE_KERNEL_BYTE);
-
-  core_path = grub_util_get_path (dir, core_file);
-  core_size = grub_util_get_image_size (core_path);
-  core_sectors = ((core_size + GRUB_DISK_SECTOR_SIZE - 1)
-		  >> GRUB_DISK_SECTOR_BITS);
-  if (core_size < GRUB_DISK_SECTOR_SIZE)
-    grub_util_error ("the size of `%s' is too small", core_path);
-
-  core_img = grub_util_read_image (core_path);
-  free (core_path);
-
-  /* Have FIRST_BLOCK to point to the first blocklist.  */
-  first_block = (struct boot_blocklist *) (core_img
-					   + GRUB_DISK_SECTOR_SIZE
-					   - sizeof (*block));
-
-  grub_util_info ("root is `%s', dest is `%s'", root, dest);
-
-  /* Open the root device and the destination device.  */
-  grub_util_info ("Opening root");
-  root_dev = grub_device_open (root);
-  if (! root_dev)
-    grub_util_error ("%s", grub_errmsg);
-
-  grub_util_info ("Opening dest");
-  dest_dev = grub_device_open (dest);
-  if (! dest_dev)
-    grub_util_error ("%s", grub_errmsg);
-
-  grub_util_info ("setting the root device to `%s'", root);
-  if (grub_env_set ("root", root) != GRUB_ERR_NONE)
-    grub_util_error ("%s", grub_errmsg);
-
-  /* The core image must be put on a filesystem unfortunately.  */
-  grub_util_info ("will leave the core image on the filesystem");
-
-  /* Make sure that GRUB reads the identical image as the OS.  */
-  tmp_img = xmalloc (core_size);
-  core_path = grub_util_get_path (prefix, core_file);
-
-  /* It is a Good Thing to sync two times.  */
-  sync ();
-  sync ();
-
-#define MAX_TRIES	5
-
-  for (i = 0; i < MAX_TRIES; i++)
-    {
-      grub_util_info ("attempting to read the core image `%s' from GRUB%s",
-		      core_path, (i == 0) ? "" : " again");
-
-      grub_disk_cache_invalidate_all ();
-
-      grub_file_filter_disable_compression ();
-      file = grub_file_open (core_path);
-      if (file)
-	{
-	  if (grub_file_size (file) != core_size)
-	    grub_util_info ("succeeded in opening the core image but the size is different (%d != %d)",
-			    (int) grub_file_size (file), (int) core_size);
-	  else if (grub_file_read (file, tmp_img, core_size)
-		   != (grub_ssize_t) core_size)
-	    grub_util_info ("succeeded in opening the core image but cannot read %d bytes",
-			    (int) core_size);
-	  else if (memcmp (core_img, tmp_img, core_size) != 0)
-	    {
-#if 0
-	      FILE *dump;
-	      FILE *dump2;
-
-	      dump = fopen ("dump.img", "wb");
-	      if (dump)
-		{
-		  fwrite (tmp_img, 1, core_size, dump);
-		  fclose (dump);
-		}
-
-	      dump2 = fopen ("dump2.img", "wb");
-	      if (dump2)
-		{
-		  fwrite (core_img, 1, core_size, dump2);
-		  fclose (dump2);
-		}
-
-#endif
-	      grub_util_info ("succeeded in opening the core image but the data is different");
-	    }
-	  else
-	    {
-	      grub_file_close (file);
-	      break;
-	    }
-
-	  grub_file_close (file);
-	}
-      else
-	grub_util_info ("couldn't open the core image");
-
-      if (grub_errno)
-	grub_util_info ("error message = %s", grub_errmsg);
-
-      grub_errno = GRUB_ERR_NONE;
-      sync ();
-      sleep (1);
-    }
-
-  if (i == MAX_TRIES)
-    grub_util_error ("cannot read `%s' correctly", core_path);
-
-  /* Clean out the blocklists.  */
-  block = first_block;
-  while (block->len)
-    {
-      block->start = 0;
-      block->len = 0;
-
-      block--;
-
-      if ((char *) block <= core_img)
-	grub_util_error ("no terminator in the core image");
-    }
-
-  /* Now read the core image to determine where the sectors are.  */
-  grub_file_filter_disable_compression ();
-  file = grub_file_open (core_path);
-  if (! file)
-    grub_util_error ("%s", grub_errmsg);
-
-  file->read_hook = save_first_sector;
-  if (grub_file_read (file, tmp_img, GRUB_DISK_SECTOR_SIZE)
-      != GRUB_DISK_SECTOR_SIZE)
-    grub_util_error ("failed to read the first sector of the core image");
-
-  block = first_block;
-  file->read_hook = save_blocklists;
-  if (grub_file_read (file, tmp_img, core_size - GRUB_DISK_SECTOR_SIZE)
-      != (grub_ssize_t) core_size - GRUB_DISK_SECTOR_SIZE)
-    grub_util_error ("failed to read the rest sectors of the core image");
-
-  if (file->device->disk->id != dest_dev->disk->id)
-    {
-      const char *dest_ofpath;
-      dest_ofpath
-	= grub_util_devname_to_ofpath (grub_util_biosdisk_get_osdev (file->device->disk));
-      grub_util_info ("dest_ofpath is `%s'", dest_ofpath);
-      strncpy (boot_devpath, dest_ofpath, GRUB_BOOT_MACHINE_BOOT_DEVPATH_END
-	       - GRUB_BOOT_MACHINE_BOOT_DEVPATH - 1);
-      boot_devpath[GRUB_BOOT_MACHINE_BOOT_DEVPATH_END
-		   - GRUB_BOOT_MACHINE_BOOT_DEVPATH - 1] = 0;
-    }
-  else
-    {
-      grub_util_info ("non cross-disk install");
-      memset (boot_devpath, 0, GRUB_BOOT_MACHINE_BOOT_DEVPATH_END
-	      - GRUB_BOOT_MACHINE_BOOT_DEVPATH);
-    }
-
-  grub_file_close (file);
-
-  free (core_path);
-  free (tmp_img);
-
-  *kernel_byte = grub_cpu_to_be64 (first_sector << GRUB_DISK_SECTOR_BITS);
-
-  grub_util_info ("boot device path %s, prefix is %s, dest is %s",
-		  boot_devpath, prefix, dest);
-
-  /* Write the first two sectors of the core image onto the disk.  */
-  core_path = grub_util_get_path (dir, core_file);
-  grub_util_info ("opening the core image `%s'", core_path);
-  fp = fopen (core_path, "r+b");
-  if (! fp)
-    grub_util_error ("cannot open `%s'", core_path);
-
-  grub_util_write_image (core_img, GRUB_DISK_SECTOR_SIZE, fp);
-  fclose (fp);
-  free (core_path);
-
-  /* Write the boot image onto the disk.  */
-  if (grub_disk_write (dest_dev->disk, 1, 0, GRUB_DISK_SECTOR_SIZE, boot_img))
-    grub_util_error ("%s", grub_errmsg);
-
-  /* Sync is a Good Thing.  */
-  sync ();
-
-  free (core_img);
-  free (boot_img);
-  grub_device_close (dest_dev);
-  grub_device_close (root_dev);
-}
-
-static struct option options[] =
-  {
-    {"boot-image", required_argument, 0, 'b'},
-    {"core-image", required_argument, 0, 'c'},
-    {"directory", required_argument, 0, 'd'},
-    {"device-map", required_argument, 0, 'm'},
-    {"root-device", required_argument, 0, 'r'},
-    {"help", no_argument, 0, 'h'},
-    {"version", no_argument, 0, 'V'},
-    {"verbose", no_argument, 0, 'v'},
-    {0, 0, 0, 0}
-  };
-
-static void
-usage (int status)
-{
-  if (status)
-    fprintf (stderr, "Try `%s --help' for more information.\n", program_name);
-  else
-    printf ("\
-Usage: %s [OPTION]... DEVICE\n\
-\n\
-Set up images to boot from DEVICE.\n\
-DEVICE must be a GRUB device (e.g. `(hd0,1)').\n\
-\n\
-You should not normally run %s directly.  Use grub-install instead.\n\
-\n\
-  -b, --boot-image=FILE   use FILE as the boot image [default=%s]\n\
-  -c, --core-image=FILE   use FILE as the core image [default=%s]\n\
-  -d, --directory=DIR     use GRUB files in the directory DIR [default=%s]\n\
-  -m, --device-map=FILE   use FILE as the device map [default=%s]\n\
-  -r, --root-device=DEV   use DEV as the root device [default=guessed]\n\
-  -h, --help              display this message and exit\n\
-  -V, --version           print version information and exit\n\
-  -v, --verbose           print verbose messages\n\
-\n\
-Report bugs to <%s>.\n\
-", program_name, program_name,
-	    DEFAULT_BOOT_FILE, DEFAULT_CORE_FILE, DEFAULT_DIRECTORY,
-	    DEFAULT_DEVICE_MAP, PACKAGE_BUGREPORT);
-
-  exit (status);
-}
-
-struct grub_setup_info
-{
-  char *boot_file;
-  char *core_file;
-  char *dir;
-  char *dev_map;
-  char *root_dev;
-  char *prefix;
-  char *dest_dev;
-};
-
-static void
-init_info (struct grub_setup_info *gp)
-{
-  gp->boot_file = NULL;
-  gp->core_file = NULL;
-  gp->dir = NULL;
-  gp->dev_map = NULL;
-  gp->root_dev = NULL;
-  gp->prefix = NULL;
-  gp->dest_dev = NULL;
-}
-
-static int
-parse_options (struct grub_setup_info *gp, int argc, char *argv[])
-{
-  while (1)
-    {
-      int c = getopt_long (argc, argv, "b:c:d:m:r:hVv", options, 0);
-
-      if (c == -1)
-	break;
-      else
-	switch (c)
-	  {
-	  case 'b':
-	    if (gp->boot_file)
-	      free (gp->boot_file);
-
-	    gp->boot_file = xstrdup (optarg);
-	    break;
-
-	  case 'c':
-	    if (gp->core_file)
-	      free (gp->core_file);
-
-	    gp->core_file = xstrdup (optarg);
-	    break;
-
-	  case 'd':
-	    if (gp->dir)
-	      free (gp->dir);
-
-	    gp->dir = xstrdup (optarg);
-	    break;
-
-	  case 'm':
-	    if (gp->dev_map)
-	      free (gp->dev_map);
-
-	    gp->dev_map = xstrdup (optarg);
-	    break;
-
-	  case 'r':
-	    if (gp->root_dev)
-	      free (gp->root_dev);
-
-	    gp->root_dev = xstrdup (optarg);
-	    break;
-
-	  case 'h':
-	    usage (0);
-	    break;
-
-	  case 'V':
-	    printf ("%s (%s) %s\n", program_name, PACKAGE_NAME, PACKAGE_VERSION);
-	    return 0;
-
-	  case 'v':
-	    verbosity++;
-	    break;
-
-	  default:
-	    usage (1);
-	    break;
-	  }
-    }
-
-  if (verbosity > 1)
-    grub_env_set ("debug", "all");
-
-  if (optind >= argc)
-    {
-      fprintf (stderr, "No device is specified.\n");
-      usage (1);
-    }
-
-  if (optind + 1 != argc)
-    {
-      fprintf (stderr, "Unknown extra argument `%s'.\n", argv[optind + 1]);
-      usage (1);
-    }
-  return 1;
-}
-
-static char *
-get_device_name (char *dev)
-{
-  size_t len = strlen (dev);
-
-  if (dev[0] != '(' || dev[len - 1] != ')')
-    return 0;
-
-  dev[len - 1] = '\0';
-  return dev + 1;
-}
-
-static void
-find_dest_dev (struct grub_setup_info *gp, char *argv[])
-{
-  gp->dest_dev = get_device_name (argv[optind]);
-  if (! gp->dest_dev)
-    {
-      /* Possibly, the user specified an OS device file.  */
-      gp->dest_dev = grub_util_get_grub_dev (argv[optind]);
-      if (! gp->dest_dev)
-	{
-	  fprintf (stderr, "Invalid device `%s'.\n", argv[optind]);
-	  usage (1);
-	}
-      grub_util_info ("transformed OS device `%s' into GRUB device `%s'",
-		      argv[optind], gp->dest_dev);
-    }
-  else
-    {
-      /* For simplicity.  */
-      gp->dest_dev = xstrdup (gp->dest_dev);
-      grub_util_info ("Using `%s' as GRUB device", gp->dest_dev);
-    }
-}
-
-static void
-check_root_dev (struct grub_setup_info *gp)
-{
-  if (gp->root_dev)
-    {
-      char *tmp = get_device_name (gp->root_dev);
-
-      if (! tmp)
-	grub_util_error ("invalid root device `%s'", gp->root_dev);
-
-      tmp = xstrdup (tmp);
-      free (gp->root_dev);
-      gp->root_dev = tmp;
-    }
-  else
-    {
-      char *dir = gp->dir ? gp->dir : DEFAULT_DIRECTORY;
-      char *root_device = grub_guess_root_device (dir);
-
-      gp->root_dev = grub_util_get_grub_dev (root_device);
-      if (! gp->root_dev)
-	{
-	  grub_util_info ("guessing the root device failed, because of `%s'",
-			  grub_errmsg);
-	  grub_util_error ("cannot guess the root device. "
-			   "Specify the option `--root-device'");
-	}
-      grub_util_info ("guessed root device `%s' and root_dev `%s' from "
-		      "dir `%s'", root_device, gp->root_dev, dir);
-    }
-}
-
-static void
-free_memory (struct grub_setup_info *gp)
-{
-  free (gp->boot_file);
-  free (gp->core_file);
-  free (gp->dir);
-  free (gp->dev_map);
-  free (gp->root_dev);
-  free (gp->prefix);
-  free (gp->dest_dev);
-}
-
-int
-main (int argc, char *argv[])
-{
-  struct grub_setup_info ginfo;
-
-  set_program_name (argv[0]);
-
-  grub_util_init_nls ();
-
-  init_info (&ginfo);
-  if (!parse_options (&ginfo, argc, argv))
-    return 0;
-
-  /* Initialize the emulated biosdisk driver.  */
-  grub_util_biosdisk_init (ginfo.dev_map ? ginfo.dev_map : DEFAULT_DEVICE_MAP);
-
-  /* Initialize all modules. */
-  grub_init_all ();
-
-  grub_lvm_fini ();
-  grub_mdraid_fini ();
-  grub_raid_fini ();
-  grub_raid_init ();
-  grub_mdraid_init ();
-  grub_lvm_init ();
-
-  find_dest_dev (&ginfo, argv);
-
-  ginfo.prefix = grub_make_system_path_relative_to_its_root (ginfo.dir ?
-							     : DEFAULT_DIRECTORY);
-
-  check_root_dev (&ginfo);
-
-  /* Do the real work.  */
-  setup (ginfo.prefix,
-	 ginfo.dir ? ginfo.dir : DEFAULT_DIRECTORY,
-	 ginfo.boot_file ? ginfo.boot_file : DEFAULT_BOOT_FILE,
-	 ginfo.core_file ? ginfo.core_file : DEFAULT_CORE_FILE,
-	 ginfo.root_dev, ginfo.dest_dev);
-
-  /* Free resources.  */
-  grub_fini_all ();
-
-  free_memory (&ginfo);
-
-  return 0;
-}

From 6c1a338ca5ff2685320f06022cd1bbad547e7423 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 14 Sep 2010 21:15:35 +0200
Subject: [PATCH 1614/1628] 	* util/i386/pc/grub-setup.c: Merge this ... 
 * util/sparc64/ieee1275/grub-setup.c:  ... and this ... 	*
 util/grub-setup.c: ... into this. 	* include/grub/sparc64/ieee1275/boot.h
 (grub_boot_blocklist) [ASM_FILE]: 	New struct. 	* grub-core/fs/ext2.c
 (grub_ext2_open): Use return error value when 	possible.

---
 ChangeLog | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d3e7c31c0..68ada05ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/i386/pc/grub-setup.c: Merge this ...
+	* util/sparc64/ieee1275/grub-setup.c:  ... and this ...
+	* util/grub-setup.c: ... into this.
+	* include/grub/sparc64/ieee1275/boot.h (grub_boot_blocklist) [ASM_FILE]:
+	New struct.
+
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/ext2.c (grub_ext2_open): Use return error value when
+	possible.
+
 2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/partmap/sun.c (sun_partition_map_iterate): Don't needlesly

From 58db070de1b123274790d32489b39161acc93175 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 14 Sep 2010 21:18:57 +0200
Subject: [PATCH 1615/1628] Remove now empty util/i386/pc


From 545b752f881be2cb5aff919a439de7e53f1eff9e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 14 Sep 2010 22:21:35 +0200
Subject: [PATCH 1616/1628] 	Remove deprecated root command.

	* grub-core/commands/minicmd.c (grub_mini_cmd_root): Removed. All users
	updated.
---
 ChangeLog                    |  7 +++++++
 grub-core/commands/minicmd.c | 40 +-----------------------------------
 2 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68ada05ec..5e3d86177 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Remove deprecated root command.
+
+	* grub-core/commands/minicmd.c (grub_mini_cmd_root): Removed. All users
+	updated.
+
 2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/i386/pc/grub-setup.c: Merge this ...
diff --git a/grub-core/commands/minicmd.c b/grub-core/commands/minicmd.c
index 3d5f59719..5cf109fde 100644
--- a/grub-core/commands/minicmd.c
+++ b/grub-core/commands/minicmd.c
@@ -108,40 +108,6 @@ grub_rescue_cmd_info (void)
 }
 #endif
 
-/* root [DEVICE] */
-static grub_err_t
-grub_mini_cmd_root (struct grub_command *cmd __attribute__ ((unused)),
-		    int argc, char *argv[])
-{
-  grub_device_t dev;
-  grub_fs_t fs;
-
-  if (argc > 0)
-    {
-      char *device_name = grub_file_get_device_name (argv[0]);
-      if (! device_name)
-	return grub_errno;
-
-      grub_env_set ("root", device_name);
-      grub_free (device_name);
-    }
-
-  dev = grub_device_open (0);
-  if (! dev)
-    return grub_errno;
-
-  fs = grub_fs_probe (dev);
-  if (grub_errno == GRUB_ERR_UNKNOWN_FS)
-    grub_errno = GRUB_ERR_NONE;
-
-  grub_printf ("(%s): Filesystem is %s.\n",
-	       grub_env_get ("root"), fs ? fs->name : "unknown");
-
-  grub_device_close (dev);
-
-  return 0;
-}
-
 /* dump ADDRESS [SIZE] */
 static grub_err_t
 grub_mini_cmd_dump (struct grub_command *cmd __attribute__ ((unused)),
@@ -226,7 +192,7 @@ grub_mini_cmd_exit (struct grub_command *cmd __attribute__ ((unused)),
   return 0;
 }
 
-static grub_command_t cmd_cat, cmd_help, cmd_root;
+static grub_command_t cmd_cat, cmd_help;
 static grub_command_t cmd_dump, cmd_rmmod, cmd_lsmod, cmd_exit;
 
 GRUB_MOD_INIT(minicmd)
@@ -237,9 +203,6 @@ GRUB_MOD_INIT(minicmd)
   cmd_help =
     grub_register_command ("help", grub_mini_cmd_help,
 			   0, N_("Show this message."));
-  cmd_root =
-    grub_register_command ("root", grub_mini_cmd_root,
-			   N_("[DEVICE]"), N_("Set the root device."));
   cmd_dump =
     grub_register_command ("dump", grub_mini_cmd_dump,
 			   N_("ADDR"), N_("Dump memory."));
@@ -258,7 +221,6 @@ GRUB_MOD_FINI(minicmd)
 {
   grub_unregister_command (cmd_cat);
   grub_unregister_command (cmd_help);
-  grub_unregister_command (cmd_root);
   grub_unregister_command (cmd_dump);
   grub_unregister_command (cmd_rmmod);
   grub_unregister_command (cmd_lsmod);

From 5fe7620a4e9622566166f894f3451801d6c3aba2 Mon Sep 17 00:00:00 2001
From: Seth Goldberg <seth.goldberg@oracle.com>
Date: Tue, 14 Sep 2010 22:32:33 +0200
Subject: [PATCH 1617/1628] 	Fix solaris compilation.

	* grub-core/Makefile.core.def (kernel): Include gnulib/error.c on emu.
	(grub-emu): Add LIBZFS and LIBNVPAIR to ldadd.
	(grub-emu-list): Likewise.
---
 ChangeLog                   | 8 ++++++++
 grub-core/Makefile.core.def | 5 +++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5e3d86177..8b8f7db26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-14  Seth Goldberg <seth.goldberg@oracle.com>
+
+	Fix solaris compilation.
+
+	* grub-core/Makefile.core.def (kernel): Include gnulib/error.c on emu.
+	(grub-emu): Add LIBZFS and LIBNVPAIR to ldadd.
+	(grub-emu-list): Likewise.
+
 2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Remove deprecated root command.
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 54ffdccf2..2fca91430 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -150,6 +150,7 @@ kernel = {
 
   emu = disk/host.c;
   emu = gnulib/progname.c;
+  emu = gnulib/error.c;
   emu = kern/emu/console.c;
   emu = kern/emu/getroot.c;
   emu = kern/emu/hostdisk.c;
@@ -187,7 +188,7 @@ program = {
 
   ldadd = 'kernel.img$(EXEEXT)';
   ldadd = '$(MODULE_FILES)';
-  ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)';
+  ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
 
   enable = emu;
 };
@@ -200,7 +201,7 @@ program = {
   emu_nodist = symlist.c;
 
   ldadd = 'kernel.img$(EXEEXT)';
-  ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)';
+  ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
 
   enable = emu;
 };

From ed80f7d586ad4608828a346052505a82459fda20 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 14 Sep 2010 23:06:01 +0200
Subject: [PATCH 1618/1628] 	* include/grub/command.h
 (GRUB_COMMAND_FLAG_CMDLINE): Removed. All 	users updated. 
 (GRUB_COMMAND_FLAG_MENU): Likewise. 	(GRUB_COMMAND_FLAG_BOTH): Likewise. 
 (GRUB_COMMAND_FLAG_TITLE): Removed. 	(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
 	(GRUB_COMMAND_FLAG_EXTCMD): Moved into enum. 
 (GRUB_COMMAND_FLAG_DYNCMD): Likewise. 	(GRUB_COMMAND_FLAG_BLOCKS): Likewise. 
 (grub_command_flags_t): New enum. All users updated.

---
 ChangeLog                             | 13 +++++++++++++
 grub-core/commands/acpi.c             |  3 +--
 grub-core/commands/cat.c              |  2 +-
 grub-core/commands/echo.c             |  2 +-
 grub-core/commands/extcmd.c           |  4 ++--
 grub-core/commands/hashsum.c          | 12 ++++--------
 grub-core/commands/hdparm.c           |  3 +--
 grub-core/commands/help.c             |  6 ++----
 grub-core/commands/hexdump.c          |  3 +--
 grub-core/commands/i386/cpuid.c       |  2 +-
 grub-core/commands/i386/pc/drivemap.c |  3 +--
 grub-core/commands/i386/pc/halt.c     |  3 +--
 grub-core/commands/i386/pc/sendkey.c  |  3 +--
 grub-core/commands/iorw.c             |  6 +++---
 grub-core/commands/keystatus.c        |  3 +--
 grub-core/commands/loadenv.c          | 11 +++--------
 grub-core/commands/ls.c               |  2 +-
 grub-core/commands/lsacpi.c           |  3 +--
 grub-core/commands/lspci.c            |  4 ++--
 grub-core/commands/memrw.c            |  6 +++---
 grub-core/commands/menuentry.c        |  2 +-
 grub-core/commands/probe.c            |  3 +--
 grub-core/commands/regexp.c           |  3 +--
 grub-core/commands/search_wrap.c      |  3 +--
 grub-core/commands/setpci.c           |  2 +-
 grub-core/commands/sleep.c            |  2 +-
 grub-core/disk/loopback.c             |  3 +--
 grub-core/hello/hello.c               |  4 ++--
 grub-core/kern/command.c              |  2 +-
 grub-core/loader/i386/bsd.c           |  9 +++------
 grub-core/loader/xnu.c                |  3 +--
 grub-core/normal/completion.c         |  7 ++-----
 grub-core/normal/dyncmd.c             |  1 -
 grub-core/term/gfxterm.c              |  3 +--
 grub-core/term/serial.c               |  3 +--
 grub-core/tests/lib/functional_test.c |  3 +--
 grub-core/tests/test_blockarg.c       |  2 +-
 include/grub/command.h                | 27 ++++++++++-----------------
 include/grub/extcmd.h                 |  4 ++--
 39 files changed, 76 insertions(+), 104 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b8f7db26..4bb294fab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/command.h (GRUB_COMMAND_FLAG_CMDLINE): Removed. All
+	users updated.
+	(GRUB_COMMAND_FLAG_MENU): Likewise.
+	(GRUB_COMMAND_FLAG_BOTH): Likewise.
+	(GRUB_COMMAND_FLAG_TITLE): Removed.
+	(GRUB_COMMAND_FLAG_NO_ECHO): Likewise.
+	(GRUB_COMMAND_FLAG_EXTCMD): Moved into enum.
+	(GRUB_COMMAND_FLAG_DYNCMD): Likewise.
+	(GRUB_COMMAND_FLAG_BLOCKS): Likewise.
+	(grub_command_flags_t): New enum. All users updated.
+
 2010-09-14  Seth Goldberg <seth.goldberg@oracle.com>
 
 	Fix solaris compilation.
diff --git a/grub-core/commands/acpi.c b/grub-core/commands/acpi.c
index 9d5e93495..931b2e39d 100644
--- a/grub-core/commands/acpi.c
+++ b/grub-core/commands/acpi.c
@@ -758,8 +758,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(acpi)
 {
-  cmd = grub_register_extcmd ("acpi", grub_cmd_acpi,
-			      GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("acpi", grub_cmd_acpi, 0,
 			      N_("[-1|-2] [--exclude=TABLE1,TABLE2|"
 			      "--load-only=table1,table2] FILE1"
 			      " [FILE2] [...]"),
diff --git a/grub-core/commands/cat.c b/grub-core/commands/cat.c
index 68ca83c5d..f3d08e960 100644
--- a/grub-core/commands/cat.c
+++ b/grub-core/commands/cat.c
@@ -91,7 +91,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(cat)
 {
-  cmd = grub_register_extcmd ("cat", grub_cmd_cat, GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("cat", grub_cmd_cat, 0,
 			      N_("FILE"), N_("Show the contents of a file."),
 			      options);
 }
diff --git a/grub-core/commands/echo.c b/grub-core/commands/echo.c
index 6bc00eae8..6d69bc3f0 100644
--- a/grub-core/commands/echo.c
+++ b/grub-core/commands/echo.c
@@ -113,7 +113,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(echo)
 {
-  cmd = grub_register_extcmd ("echo", grub_cmd_echo, GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("echo", grub_cmd_echo, 0,
 			      N_("[-e|-n] STRING"), N_("Display a line of text."),
 			      options);
 }
diff --git a/grub-core/commands/extcmd.c b/grub-core/commands/extcmd.c
index 44a4b6cfd..e9274fbab 100644
--- a/grub-core/commands/extcmd.c
+++ b/grub-core/commands/extcmd.c
@@ -66,7 +66,7 @@ grub_extcmd_dispatch (struct grub_command *cmd, int argc, char **args)
 
 grub_extcmd_t
 grub_register_extcmd_prio (const char *name, grub_extcmd_func_t func,
-			   unsigned flags, const char *summary,
+			   grub_command_flags_t flags, const char *summary,
 			   const char *description,
 			   const struct grub_arg_option *parser,
 			   int prio)
@@ -99,7 +99,7 @@ grub_register_extcmd_prio (const char *name, grub_extcmd_func_t func,
 
 grub_extcmd_t
 grub_register_extcmd (const char *name, grub_extcmd_func_t func,
-		      unsigned flags, const char *summary,
+		      grub_command_flags_t flags, const char *summary,
 		      const char *description,
 		      const struct grub_arg_option *parser)
 {
diff --git a/grub-core/commands/hashsum.c b/grub-core/commands/hashsum.c
index 6f65b4ab3..e926c0435 100644
--- a/grub-core/commands/hashsum.c
+++ b/grub-core/commands/hashsum.c
@@ -252,26 +252,22 @@ static grub_extcmd_t cmd, cmd_md5, cmd_sha256, cmd_sha512;
 
 GRUB_MOD_INIT(hashsum)
 {
-  cmd = grub_register_extcmd ("hashsum", grub_cmd_hashsum,
-			      GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("hashsum", grub_cmd_hashsum, 0,
 			      "hashsum -h HASH [-c FILE [-p PREFIX]] "
 			      "[FILE1 [FILE2 ...]]",
 			      "Compute or check hash checksum.",
 			      options);
-  cmd_md5 = grub_register_extcmd ("md5sum", grub_cmd_hashsum,
-				  GRUB_COMMAND_FLAG_BOTH,
+  cmd_md5 = grub_register_extcmd ("md5sum", grub_cmd_hashsum, 0,
 				  N_("[-c FILE [-p PREFIX]] "
 				     "[FILE1 [FILE2 ...]]"),
 				  N_("Compute or check hash checksum."),
 				  options);
-  cmd_sha256 = grub_register_extcmd ("sha256sum", grub_cmd_hashsum,
-				     GRUB_COMMAND_FLAG_BOTH,
+  cmd_sha256 = grub_register_extcmd ("sha256sum", grub_cmd_hashsum, 0,
 				     N_("[-c FILE [-p PREFIX]] "
 					"[FILE1 [FILE2 ...]]"),
 				     "Compute or check hash checksum.",
 				     options);
-  cmd_sha512 = grub_register_extcmd ("sha512sum", grub_cmd_hashsum,
-				     GRUB_COMMAND_FLAG_BOTH,
+  cmd_sha512 = grub_register_extcmd ("sha512sum", grub_cmd_hashsum, 0,
 				     N_("[-c FILE [-p PREFIX]] "
 					"[FILE1 [FILE2 ...]]"),
 				     N_("Compute or check hash checksum."),
diff --git a/grub-core/commands/hdparm.c b/grub-core/commands/hdparm.c
index 54724077d..b6ab78755 100644
--- a/grub-core/commands/hdparm.c
+++ b/grub-core/commands/hdparm.c
@@ -409,8 +409,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(hdparm)
 {
-  cmd = grub_register_extcmd ("hdparm", grub_cmd_hdparm,
-			      GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("hdparm", grub_cmd_hdparm, 0,
 			      N_("[OPTIONS] DISK"),
 			      N_("Get/set ATA disk parameters."), options);
 }
diff --git a/grub-core/commands/help.c b/grub-core/commands/help.c
index 1ca46aa7e..ff6d7ed2e 100644
--- a/grub-core/commands/help.c
+++ b/grub-core/commands/help.c
@@ -38,8 +38,7 @@ grub_cmd_help (grub_extcmd_context_t ctxt __attribute__ ((unused)), int argc,
       grub_command_t cmd;
       FOR_COMMANDS(cmd)
       {
-	if ((cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE) &&
-	    (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE))
+	if ((cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE))
 	  {
 	    struct grub_term_output *term;
 	    const char *summary_translated = _(cmd->summary);
@@ -131,8 +130,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(help)
 {
-  cmd = grub_register_extcmd ("help", grub_cmd_help,
-			      GRUB_COMMAND_FLAG_CMDLINE,
+  cmd = grub_register_extcmd ("help", grub_cmd_help, 0,
 			      N_("[PATTERN ...]"),
 			      N_("Show a help message."), 0);
 }
diff --git a/grub-core/commands/hexdump.c b/grub-core/commands/hexdump.c
index 08a94eb64..629f2a069 100644
--- a/grub-core/commands/hexdump.c
+++ b/grub-core/commands/hexdump.c
@@ -119,8 +119,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT (hexdump)
 {
-  cmd = grub_register_extcmd ("hexdump", grub_cmd_hexdump,
-			      GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("hexdump", grub_cmd_hexdump, 0,
 			      N_("[OPTIONS] FILE_OR_DEVICE"),
 			      N_("Dump the contents of a file or memory."),
 			      options);
diff --git a/grub-core/commands/i386/cpuid.c b/grub-core/commands/i386/cpuid.c
index 412b284d0..f5f0f15a8 100644
--- a/grub-core/commands/i386/cpuid.c
+++ b/grub-core/commands/i386/cpuid.c
@@ -88,7 +88,7 @@ GRUB_MOD_INIT(cpuid)
 done:
 #endif
 
-  cmd = grub_register_extcmd ("cpuid", grub_cmd_cpuid, GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("cpuid", grub_cmd_cpuid, 0,
 			      "[-l]", N_("Check for CPU features."), options);
 }
 
diff --git a/grub-core/commands/i386/pc/drivemap.c b/grub-core/commands/i386/pc/drivemap.c
index 7ecfe7454..d4871de52 100644
--- a/grub-core/commands/i386/pc/drivemap.c
+++ b/grub-core/commands/i386/pc/drivemap.c
@@ -401,8 +401,7 @@ GRUB_MOD_INIT (drivemap)
 {
   grub_get_root_biosnumber_saved = grub_get_root_biosnumber;
   grub_get_root_biosnumber = grub_get_root_biosnumber_drivemap;
-  cmd = grub_register_extcmd ("drivemap", grub_cmd_drivemap,
-			      GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("drivemap", grub_cmd_drivemap, 0,
 			      N_("-l | -r | [-s] grubdev osdisk."),
 			      N_("Manage the BIOS drive mappings."),
 			      options);
diff --git a/grub-core/commands/i386/pc/halt.c b/grub-core/commands/i386/pc/halt.c
index 44a88bb05..81eb6a1bb 100644
--- a/grub-core/commands/i386/pc/halt.c
+++ b/grub-core/commands/i386/pc/halt.c
@@ -114,8 +114,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(halt)
 {
-  cmd = grub_register_extcmd ("halt", grub_cmd_halt, GRUB_COMMAND_FLAG_BOTH,
-			      "[-n]",
+  cmd = grub_register_extcmd ("halt", grub_cmd_halt, 0, "[-n]",
 			      N_("Halt the system, if possible using APM."),
 			      options);
 }
diff --git a/grub-core/commands/i386/pc/sendkey.c b/grub-core/commands/i386/pc/sendkey.c
index 1f506b3cd..c777ea60a 100644
--- a/grub-core/commands/i386/pc/sendkey.c
+++ b/grub-core/commands/i386/pc/sendkey.c
@@ -366,8 +366,7 @@ static void *preboot_hook;
 
 GRUB_MOD_INIT (sendkey)
 {
-  cmd = grub_register_extcmd ("sendkey", grub_cmd_sendkey, 
-			      GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("sendkey", grub_cmd_sendkey, 0,
 			      "sendkey [KEYSTROKE1] [KEYSTROKE2] ...",
 			      "Emulate a keystroke", options);
 
diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
index 5157ebd4c..20d203e92 100644
--- a/grub-core/commands/iorw.c
+++ b/grub-core/commands/iorw.c
@@ -117,13 +117,13 @@ grub_cmd_write (grub_command_t cmd, int argc, char **argv)
 GRUB_MOD_INIT(memrw)
 {
   cmd_read_byte =
-    grub_register_extcmd ("inb", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
+    grub_register_extcmd ("inb", grub_cmd_read, 0,
 			  N_("PORT"), N_("Read byte from PORT."), options);
   cmd_read_word =
-    grub_register_extcmd ("inw", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
+    grub_register_extcmd ("inw", grub_cmd_read, 0,
 			  N_("PORT"), N_("Read word from PORT."), options);
   cmd_read_dword =
-    grub_register_extcmd ("inl", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
+    grub_register_extcmd ("inl", grub_cmd_read, 0,
 			  N_("PORT"), N_("Read dword from PORT."), options);
   cmd_write_byte =
     grub_register_command ("outb", grub_cmd_write,
diff --git a/grub-core/commands/keystatus.c b/grub-core/commands/keystatus.c
index c83c00560..64e5a08d7 100644
--- a/grub-core/commands/keystatus.c
+++ b/grub-core/commands/keystatus.c
@@ -80,8 +80,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(keystatus)
 {
-  cmd = grub_register_extcmd ("keystatus", grub_cmd_keystatus,
-			      GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("keystatus", grub_cmd_keystatus, 0,
 			      N_("[--shift] [--ctrl] [--alt]"),
 			      N_("Check key modifier status."),
 			      options);
diff --git a/grub-core/commands/loadenv.c b/grub-core/commands/loadenv.c
index 9a1873ba9..38b3a84c6 100644
--- a/grub-core/commands/loadenv.c
+++ b/grub-core/commands/loadenv.c
@@ -375,20 +375,15 @@ static grub_extcmd_t cmd_load, cmd_list, cmd_save;
 GRUB_MOD_INIT(loadenv)
 {
   cmd_load =
-    grub_register_extcmd ("load_env", grub_cmd_load_env,
-			  GRUB_COMMAND_FLAG_BOTH,
-			  N_("[-f FILE]"),
+    grub_register_extcmd ("load_env", grub_cmd_load_env, 0, N_("[-f FILE]"),
 			  N_("Load variables from environment block file."),
 			  options);
   cmd_list =
-    grub_register_extcmd ("list_env", grub_cmd_list_env,
-			  GRUB_COMMAND_FLAG_BOTH,
-			  N_("[-f FILE]"),
+    grub_register_extcmd ("list_env", grub_cmd_list_env, 0, N_("[-f FILE]"),
 			  N_("List variables from environment block file."),
 			  options);
   cmd_save =
-    grub_register_extcmd ("save_env", grub_cmd_save_env,
-			  GRUB_COMMAND_FLAG_BOTH,
+    grub_register_extcmd ("save_env", grub_cmd_save_env, 0,
 			  N_("[-f FILE] variable_name [...]"),
 			  N_("Save variables to environment block file."),
 			  options);
diff --git a/grub-core/commands/ls.c b/grub-core/commands/ls.c
index ed8afd4ae..3bd6607be 100644
--- a/grub-core/commands/ls.c
+++ b/grub-core/commands/ls.c
@@ -269,7 +269,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(ls)
 {
-  cmd = grub_register_extcmd ("ls", grub_cmd_ls, GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("ls", grub_cmd_ls, 0,
 			      N_("[-l|-h|-a] [FILE]"),
 			      N_("List devices and files."), options);
 }
diff --git a/grub-core/commands/lsacpi.c b/grub-core/commands/lsacpi.c
index 149de6b79..64b559665 100644
--- a/grub-core/commands/lsacpi.c
+++ b/grub-core/commands/lsacpi.c
@@ -238,8 +238,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(lsapi)
 {
-  cmd = grub_register_extcmd ("lsacpi", grub_cmd_lsacpi, GRUB_COMMAND_FLAG_BOTH,
-			      N_("[-1|-2]"),
+  cmd = grub_register_extcmd ("lsacpi", grub_cmd_lsacpi, 0, N_("[-1|-2]"),
 			      N_("Show ACPI information."), options);
 }
 
diff --git a/grub-core/commands/lspci.c b/grub-core/commands/lspci.c
index bc52e060a..fd2d4eaf2 100644
--- a/grub-core/commands/lspci.c
+++ b/grub-core/commands/lspci.c
@@ -224,8 +224,8 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(lspci)
 {
-  cmd = grub_register_extcmd ("lspci", grub_cmd_lspci, GRUB_COMMAND_FLAG_BOTH,
-			      "[-i]", N_("List PCI devices."), options);
+  cmd = grub_register_extcmd ("lspci", grub_cmd_lspci, 0, "[-i]",
+			      N_("List PCI devices."), options);
 }
 
 GRUB_MOD_FINI(lspci)
diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c
index d28f45ec1..28aac7d81 100644
--- a/grub-core/commands/memrw.c
+++ b/grub-core/commands/memrw.c
@@ -119,13 +119,13 @@ grub_cmd_write (grub_command_t cmd, int argc, char **argv)
 GRUB_MOD_INIT(memrw)
 {
   cmd_read_byte =
-    grub_register_extcmd ("read_byte", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
+    grub_register_extcmd ("read_byte", grub_cmd_read, 0,
 			  N_("ADDR"), N_("Read byte from ADDR."), options);
   cmd_read_word =
-    grub_register_extcmd ("read_word", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
+    grub_register_extcmd ("read_word", grub_cmd_read, 0,
 			  N_("ADDR"), N_("Read word from ADDR."), options);
   cmd_read_dword =
-    grub_register_extcmd ("read_dword", grub_cmd_read, GRUB_COMMAND_FLAG_BOTH,
+    grub_register_extcmd ("read_dword", grub_cmd_read, 0,
 			  N_("ADDR"), N_("Read dword from ADDR."), options);
   cmd_write_byte =
     grub_register_command ("write_byte", grub_cmd_write,
diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
index c28c6ef6f..9c4139d7d 100644
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -274,7 +274,7 @@ void
 grub_menu_init (void)
 {
   cmd = grub_register_extcmd ("menuentry", grub_cmd_menuentry,
-			      GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_BLOCKS,
+			      GRUB_COMMAND_FLAG_BLOCKS,
 			      N_("BLOCK"), N_("Define a menuentry."), options);
 }
 
diff --git a/grub-core/commands/probe.c b/grub-core/commands/probe.c
index f3941e029..abe84895d 100644
--- a/grub-core/commands/probe.c
+++ b/grub-core/commands/probe.c
@@ -150,8 +150,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT (probe)
 {
-  cmd = grub_register_extcmd ("probe", grub_cmd_probe, GRUB_COMMAND_FLAG_BOTH,
-			      N_("[DEVICE]"),
+  cmd = grub_register_extcmd ("probe", grub_cmd_probe, 0, N_("[DEVICE]"),
 			      N_("Retrieve device info."), options);
 }
 
diff --git a/grub-core/commands/regexp.c b/grub-core/commands/regexp.c
index 4329483af..f27a147af 100644
--- a/grub-core/commands/regexp.c
+++ b/grub-core/commands/regexp.c
@@ -136,8 +136,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(regexp)
 {
-  cmd = grub_register_extcmd ("regexp", grub_cmd_regexp,
-			      GRUB_COMMAND_FLAG_BOTH, N_("REGEXP STRING"),
+  cmd = grub_register_extcmd ("regexp", grub_cmd_regexp, 0, N_("REGEXP STRING"),
 			      N_("Test if REGEXP matches STRING."), options);
 
   /* Setup GRUB script wildcard translator.  */
diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c
index 61eb78203..402421f65 100644
--- a/grub-core/commands/search_wrap.c
+++ b/grub-core/commands/search_wrap.c
@@ -90,8 +90,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(search)
 {
   cmd =
-    grub_register_extcmd ("search", grub_cmd_search,
-			  GRUB_COMMAND_FLAG_BOTH,
+    grub_register_extcmd ("search", grub_cmd_search, 0,
 			  N_("[-f|-l|-u|-s|-n] [--hint HINT [--hint HINT] ...]"
 			     " NAME"),
 			  N_("Search devices by file, filesystem label"
diff --git a/grub-core/commands/setpci.c b/grub-core/commands/setpci.c
index 5e947cd7d..7b194ed17 100644
--- a/grub-core/commands/setpci.c
+++ b/grub-core/commands/setpci.c
@@ -329,7 +329,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(setpci)
 {
-  cmd = grub_register_extcmd ("setpci", grub_cmd_setpci, GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("setpci", grub_cmd_setpci, 0,
 			      N_("[-s POSITION] [-d DEVICE] [-v VAR] "
 				 "[REGISTER][=VALUE[:MASK]]"),
 			      N_("Manipulate PCI devices."), options);
diff --git a/grub-core/commands/sleep.c b/grub-core/commands/sleep.c
index ee0875cf7..da9937548 100644
--- a/grub-core/commands/sleep.c
+++ b/grub-core/commands/sleep.c
@@ -101,7 +101,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(sleep)
 {
-  cmd = grub_register_extcmd ("sleep", grub_cmd_sleep, GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("sleep", grub_cmd_sleep, 0,
 			      N_("NUMBER_OF_SECONDS"),
 			      N_("Wait for a specified number of seconds."),
 			      options);
diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c
index c8ee52580..ae4cb9a9c 100644
--- a/grub-core/disk/loopback.c
+++ b/grub-core/disk/loopback.c
@@ -221,8 +221,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(loopback)
 {
-  cmd = grub_register_extcmd ("loopback", grub_cmd_loopback,
-			      GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("loopback", grub_cmd_loopback, 0,
 			      N_("[-d|-p] DEVICENAME FILE."),
 			      N_("Make a device of a file."), options);
   grub_disk_dev_register (&grub_loopback_dev);
diff --git a/grub-core/hello/hello.c b/grub-core/hello/hello.c
index 183ee7798..77c4c96b1 100644
--- a/grub-core/hello/hello.c
+++ b/grub-core/hello/hello.c
@@ -39,8 +39,8 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(hello)
 {
-  cmd = grub_register_extcmd ("hello", grub_cmd_hello, GRUB_COMMAND_FLAG_BOTH,
-			      0, N_("Say \"Hello World\"."), 0);
+  cmd = grub_register_extcmd ("hello", grub_cmd_hello, 0, 0,
+			      N_("Say \"Hello World\"."), 0);
 }
 
 GRUB_MOD_FINI(hello)
diff --git a/grub-core/kern/command.c b/grub-core/kern/command.c
index 477240d57..7f353b653 100644
--- a/grub-core/kern/command.c
+++ b/grub-core/kern/command.c
@@ -40,7 +40,7 @@ grub_register_command_prio (const char *name,
   cmd->summary = (summary) ? summary : "";
   cmd->description = description;
 
-  cmd->flags = GRUB_COMMAND_FLAG_BOTH;
+  cmd->flags = 0;
   cmd->prio = prio;
 
   grub_prio_list_insert (GRUB_AS_PRIO_LIST_P (&grub_command_list),
diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
index 2e92bc42f..16dfc731c 100644
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -1942,16 +1942,13 @@ GRUB_MOD_INIT (bsd)
   /* Net and OpenBSD kernels are often compressed.  */
   grub_dl_load ("gzio");
 
-  cmd_freebsd = grub_register_extcmd ("kfreebsd", grub_cmd_freebsd,
-				      GRUB_COMMAND_FLAG_BOTH,
+  cmd_freebsd = grub_register_extcmd ("kfreebsd", grub_cmd_freebsd, 0,
 				      N_("FILE"), N_("Load kernel of FreeBSD."),
 				      freebsd_opts);
-  cmd_openbsd = grub_register_extcmd ("kopenbsd", grub_cmd_openbsd,
-				      GRUB_COMMAND_FLAG_BOTH,
+  cmd_openbsd = grub_register_extcmd ("kopenbsd", grub_cmd_openbsd, 0,
 				      N_("FILE"), N_("Load kernel of OpenBSD."),
 				      openbsd_opts);
-  cmd_netbsd = grub_register_extcmd ("knetbsd", grub_cmd_netbsd,
-				     GRUB_COMMAND_FLAG_BOTH,
+  cmd_netbsd = grub_register_extcmd ("knetbsd", grub_cmd_netbsd,  0,
 				     N_("FILE"), N_("Load kernel of NetBSD."),
 				     netbsd_opts);
   cmd_freebsd_loadenv =
diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
index ece65611a..d0b32dc6f 100644
--- a/grub-core/loader/xnu.c
+++ b/grub-core/loader/xnu.c
@@ -1434,8 +1434,7 @@ GRUB_MOD_INIT(xnu)
 				       "Load XNU ramdisk. "
 				       "It will be seen as md0.");
   cmd_splash = grub_register_extcmd ("xnu_splash",
-				     grub_cmd_xnu_splash,
-				     GRUB_COMMAND_FLAG_BOTH, 0,
+				     grub_cmd_xnu_splash, 0, 0,
 				     N_("Load a splash image for XNU."),
 				     xnu_splash_cmd_options);
 
diff --git a/grub-core/normal/completion.c b/grub-core/normal/completion.c
index f19919d1d..197cb1145 100644
--- a/grub-core/normal/completion.c
+++ b/grub-core/normal/completion.c
@@ -429,11 +429,8 @@ grub_normal_do_completion (char *buf, int *restore,
       {
 	if (cmd->prio & GRUB_PRIO_LIST_FLAG_ACTIVE)
 	  {
-	    if (cmd->flags & GRUB_COMMAND_FLAG_CMDLINE)
-	      {
-		if (add_completion (cmd->name, " ", GRUB_COMPLETION_TYPE_COMMAND))
-		  goto fail;
-	      }
+	    if (add_completion (cmd->name, " ", GRUB_COMPLETION_TYPE_COMMAND))
+	      goto fail;
 	  }
       }
     }
diff --git a/grub-core/normal/dyncmd.c b/grub-core/normal/dyncmd.c
index 3519253f6..ed98855eb 100644
--- a/grub-core/normal/dyncmd.c
+++ b/grub-core/normal/dyncmd.c
@@ -155,7 +155,6 @@ read_command_list (const char *prefix)
 						   grub_dyncmd_dispatcher,
 						   GRUB_COMMAND_FLAG_BLOCKS
 						   | GRUB_COMMAND_FLAG_EXTCMD
-						   | GRUB_COMMAND_FLAG_CMDLINE
 						   | GRUB_COMMAND_FLAG_DYNCMD,
 						   0, N_("not loaded"), 0,
 						   prio);
diff --git a/grub-core/term/gfxterm.c b/grub-core/term/gfxterm.c
index 3616eb453..9a10d47b0 100644
--- a/grub-core/term/gfxterm.c
+++ b/grub-core/term/gfxterm.c
@@ -1207,8 +1207,7 @@ GRUB_MOD_INIT(gfxterm)
   grub_term_register_output ("gfxterm", &grub_video_term);
   background_image_cmd_handle =
     grub_register_extcmd ("background_image",
-                          grub_gfxterm_background_image_cmd,
-                          GRUB_COMMAND_FLAG_BOTH,
+                          grub_gfxterm_background_image_cmd, 0,
                           N_("[-m (stretch|normal)] FILE"),
                           N_("Load background image for active terminal."),
                           background_image_cmd_options);
diff --git a/grub-core/term/serial.c b/grub-core/term/serial.c
index 394fc1576..6c8a87225 100644
--- a/grub-core/term/serial.c
+++ b/grub-core/term/serial.c
@@ -341,8 +341,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(serial)
 {
-  cmd = grub_register_extcmd ("serial", grub_cmd_serial,
-			      GRUB_COMMAND_FLAG_BOTH,
+  cmd = grub_register_extcmd ("serial", grub_cmd_serial, 0,
 			      N_("[OPTIONS...]"),
 			      N_("Configure serial port."), options);
 #ifndef GRUB_MACHINE_EMU
diff --git a/grub-core/tests/lib/functional_test.c b/grub-core/tests/lib/functional_test.c
index 82bf372c0..521f4ad22 100644
--- a/grub-core/tests/lib/functional_test.c
+++ b/grub-core/tests/lib/functional_test.c
@@ -37,8 +37,7 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT (functional_test)
 {
-  cmd = grub_register_extcmd ("functional_test", grub_functional_test,
-			      GRUB_COMMAND_FLAG_CMDLINE, 0,
+  cmd = grub_register_extcmd ("functional_test", grub_functional_test, 0, 0,
 			      "Run all functional tests.", 0);
 }
 
diff --git a/grub-core/tests/test_blockarg.c b/grub-core/tests/test_blockarg.c
index bb6f3c3f0..41460fb7e 100644
--- a/grub-core/tests/test_blockarg.c
+++ b/grub-core/tests/test_blockarg.c
@@ -40,7 +40,7 @@ static grub_extcmd_t cmd;
 GRUB_MOD_INIT(test_blockarg)
 {
   cmd = grub_register_extcmd ("test_blockarg", test_blockarg,
-			      GRUB_COMMAND_FLAG_BOTH | GRUB_COMMAND_FLAG_BLOCKS,
+			      GRUB_COMMAND_FLAG_BLOCKS,
 			      N_("BLOCK"),
 			      N_("Print and execute block argument."), 0);
 }
diff --git a/include/grub/command.h b/include/grub/command.h
index 599b99437..31b639548 100644
--- a/include/grub/command.h
+++ b/include/grub/command.h
@@ -23,22 +23,15 @@
 #include <grub/err.h>
 #include <grub/list.h>
 
-/* Can be run in the command-line.  */
-#define GRUB_COMMAND_FLAG_CMDLINE	0x1
-/* Can be run in the menu.  */
-#define GRUB_COMMAND_FLAG_MENU		0x2
-/* Can be run in both interfaces.  */
-#define GRUB_COMMAND_FLAG_BOTH		0x3
-/* Only for the command title.  */
-#define GRUB_COMMAND_FLAG_TITLE		0x4
-/* Don't print the command on booting.  */
-#define GRUB_COMMAND_FLAG_NO_ECHO	0x8
-/* This is an extended command.  */
-#define GRUB_COMMAND_FLAG_EXTCMD	0x10
-/* This is an dynamic command.  */
-#define GRUB_COMMAND_FLAG_DYNCMD	0x20
-/* This command accepts block arguments.  */
-#define GRUB_COMMAND_FLAG_BLOCKS	0x40
+typedef enum grub_command_flags
+  {
+    /* This is an extended command.  */
+    GRUB_COMMAND_FLAG_EXTCMD = 0x10,
+    /* This is an dynamic command.  */
+    GRUB_COMMAND_FLAG_DYNCMD = 0x20,
+    /* This command accepts block arguments.  */
+    GRUB_COMMAND_FLAG_BLOCKS = 0x40
+  } grub_command_flags_t;
 
 struct grub_command;
 
@@ -61,7 +54,7 @@ struct grub_command
   grub_command_func_t func;
 
   /* The flags.  */
-  unsigned flags;
+  grub_command_flags_t flags;
 
   /* The summary of the command usage.  */
   const char *summary;
diff --git a/include/grub/extcmd.h b/include/grub/extcmd.h
index 773e47854..c34a1df66 100644
--- a/include/grub/extcmd.h
+++ b/include/grub/extcmd.h
@@ -57,14 +57,14 @@ typedef struct grub_extcmd_context *grub_extcmd_context_t;
 
 grub_extcmd_t grub_register_extcmd (const char *name,
 				    grub_extcmd_func_t func,
-				    unsigned flags,
+				    grub_command_flags_t flags,
 				    const char *summary,
 				    const char *description,
 				    const struct grub_arg_option *parser);
 
 grub_extcmd_t grub_register_extcmd_prio (const char *name,
 					 grub_extcmd_func_t func,
-					 unsigned flags,
+					 grub_command_flags_t flags,
 					 const char *summary,
 					 const char *description,
 					 const struct grub_arg_option *parser,

From 79c4eeb919217a21c52e8693a4ea0e570701dc0b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 14 Sep 2010 23:30:06 +0200
Subject: [PATCH 1619/1628] 	Fix incorrect echo options handling. 
 Reported by: Yves Blusseau.

	* include/grub/command.h (grub_command_flags_t): New flags
	GRUB_COMMAND_ACCEPT_DASH and GRUB_COMMAND_OPTIONS_AT_START.
	* grub-core/lib/arg.c (grub_arg_parse): Handle new flags.
	* grub-core/commands/echo.c (GRUB_MOD_INIT): Use new flags.
---
 ChangeLog                 | 10 ++++++++++
 grub-core/commands/echo.c |  4 +++-
 grub-core/lib/arg.c       | 36 ++++++++++++++++++++++++++++++------
 include/grub/command.h    |  6 +++++-
 4 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4bb294fab..0ec383b3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Fix incorrect echo options handling.
+	Reported by: Yves Blusseau.
+
+	* include/grub/command.h (grub_command_flags_t): New flags
+	GRUB_COMMAND_ACCEPT_DASH and GRUB_COMMAND_OPTIONS_AT_START.
+	* grub-core/lib/arg.c (grub_arg_parse): Handle new flags.
+	* grub-core/commands/echo.c (GRUB_MOD_INIT): Use new flags.
+
 2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/command.h (GRUB_COMMAND_FLAG_CMDLINE): Removed. All
diff --git a/grub-core/commands/echo.c b/grub-core/commands/echo.c
index 6d69bc3f0..13bc1c3fd 100644
--- a/grub-core/commands/echo.c
+++ b/grub-core/commands/echo.c
@@ -113,7 +113,9 @@ static grub_extcmd_t cmd;
 
 GRUB_MOD_INIT(echo)
 {
-  cmd = grub_register_extcmd ("echo", grub_cmd_echo, 0,
+  cmd = grub_register_extcmd ("echo", grub_cmd_echo,
+			      GRUB_COMMAND_ACCEPT_DASH
+			      | GRUB_COMMAND_OPTIONS_AT_START,
 			      N_("[-e|-n] STRING"), N_("Display a line of text."),
 			      options);
 }
diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c
index f3352520b..f487de7ad 100644
--- a/grub-core/lib/arg.c
+++ b/grub-core/lib/arg.c
@@ -231,7 +231,6 @@ grub_arg_parse (grub_extcmd_t cmd, int argc, char **argv,
 {
   int curarg;
   int arglen;
-  int complete = 0;
   char **argl = 0;
   int num = 0;
   auto grub_err_t add_arg (char *s);
@@ -258,7 +257,8 @@ grub_arg_parse (grub_extcmd_t cmd, int argc, char **argv,
       char *option = 0;
 
       /* No option is used.  */
-      if (arg[0] != '-' || grub_strlen (arg) == 1)
+      if ((num && GRUB_COMMAND_OPTIONS_AT_START)
+	  || arg[0] != '-' || grub_strlen (arg) == 1)
 	{
 	  if (add_arg (arg) != 0)
 	    goto fail;
@@ -269,11 +269,28 @@ grub_arg_parse (grub_extcmd_t cmd, int argc, char **argv,
       /* One or more short options.  */
       if (arg[1] != '-')
 	{
-	  char *curshort = arg + 1;
+	  char *curshort;
+
+	  if (cmd->cmd->flags & GRUB_COMMAND_ACCEPT_DASH)
+	    {
+	      for (curshort = arg + 1; *curshort; curshort++)
+		if (!find_short (cmd->options, *curshort))
+		  break;
+	    
+	      if (*curshort)
+		{
+		  if (add_arg (arg) != 0)
+		    goto fail;
+		  continue;
+		}
+	    }
+
+	  curshort = arg + 1;
 
 	  while (1)
 	    {
 	      opt = find_short (cmd->options, *curshort);
+
 	      if (! opt)
 		{
 		  grub_error (GRUB_ERR_BAD_ARGUMENT,
@@ -330,6 +347,14 @@ grub_arg_parse (grub_extcmd_t cmd, int argc, char **argv,
 	  }
 
 	  opt = find_long (cmd->options, arg + 2, arglen);
+
+	  if (!opt && (cmd->cmd->flags & GRUB_COMMAND_ACCEPT_DASH))
+	    {
+	      if (add_arg (arg) != 0)
+		goto fail;
+	      continue;
+	    }
+
 	  if (! opt)
 	    {
 	      grub_error (GRUB_ERR_BAD_ARGUMENT, "unknown argument `%s'", arg);
@@ -398,13 +423,12 @@ grub_arg_parse (grub_extcmd_t cmd, int argc, char **argv,
 	}
     }
 
-  complete = 1;
-
   *args = argl;
   *argnum = num;
+  return 1;
 
  fail:
-  return complete;
+  return 0;
 }
 
 struct grub_arg_list*
diff --git a/include/grub/command.h b/include/grub/command.h
index 31b639548..3b7bf0a10 100644
--- a/include/grub/command.h
+++ b/include/grub/command.h
@@ -30,7 +30,11 @@ typedef enum grub_command_flags
     /* This is an dynamic command.  */
     GRUB_COMMAND_FLAG_DYNCMD = 0x20,
     /* This command accepts block arguments.  */
-    GRUB_COMMAND_FLAG_BLOCKS = 0x40
+    GRUB_COMMAND_FLAG_BLOCKS = 0x40,
+    /* This command accepts unknown arguments as direct parameters.  */
+    GRUB_COMMAND_ACCEPT_DASH = 0x80,
+    /* This command accepts only options preceding direct arguments.  */
+    GRUB_COMMAND_OPTIONS_AT_START = 0x100,
   } grub_command_flags_t;
 
 struct grub_command;

From dd521a4afb805c995108c1aba844c47b8c50e7d0 Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon@janc.net.pl>
Date: Wed, 15 Sep 2010 00:13:09 +0200
Subject: [PATCH 1620/1628] 	* grub-core/lib/xzembed/xz_dec_stream.c
 (xz_dec_end): Fix memory leak.

---
 ChangeLog                             | 4 ++++
 grub-core/lib/xzembed/xz_dec_stream.c | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0ec383b3a..0b043ccd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-15  Szymon Janc <szymon@janc.net.pl>
+
+	* grub-core/lib/xzembed/xz_dec_stream.c (xz_dec_end): Fix memory leak.
+
 2010-09-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Fix incorrect echo options handling.
diff --git a/grub-core/lib/xzembed/xz_dec_stream.c b/grub-core/lib/xzembed/xz_dec_stream.c
index ff26f5119..071ca8deb 100644
--- a/grub-core/lib/xzembed/xz_dec_stream.c
+++ b/grub-core/lib/xzembed/xz_dec_stream.c
@@ -853,6 +853,10 @@ void xz_dec_end(struct xz_dec *s)
 {
 	if (s != NULL) {
 		xz_dec_lzma2_end(s->lzma2);
+		kfree(s->index.hash.crc32_context);
+		kfree(s->block.hash.crc32_context);
+		kfree(s->crc32_context);
+
 #ifdef XZ_DEC_BCJ
 		xz_dec_bcj_end(s->bcj);
 #endif

From 014f47b74fa375f313ef3b91a8047ccf8f2f7531 Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon@janc.net.pl>
Date: Wed, 15 Sep 2010 00:39:49 +0200
Subject: [PATCH 1621/1628] 	* grub-core/lib/xzembed/xz_dec_stream.c
 (dec_main): Fix index and block 	CRC calculations and validity checks. 
 * grub-core/lib/xzembed/xz_dec_stream.c (dec_index): Fix index CRC 
 calculations.

---
 ChangeLog                             |  7 +++++++
 grub-core/lib/xzembed/xz_dec_stream.c | 17 ++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0b043ccd5..0a85dbbcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-15  Szymon Janc <szymon@janc.net.pl>
+
+	* grub-core/lib/xzembed/xz_dec_stream.c (dec_main): Fix index and block
+	CRC calculations and validity checks.
+	* grub-core/lib/xzembed/xz_dec_stream.c (dec_index): Fix index CRC
+	calculations.
+
 2010-09-15  Szymon Janc <szymon@janc.net.pl>
 
 	* grub-core/lib/xzembed/xz_dec_stream.c (xz_dec_end): Fix memory leak.
diff --git a/grub-core/lib/xzembed/xz_dec_stream.c b/grub-core/lib/xzembed/xz_dec_stream.c
index 071ca8deb..273041edb 100644
--- a/grub-core/lib/xzembed/xz_dec_stream.c
+++ b/grub-core/lib/xzembed/xz_dec_stream.c
@@ -270,7 +270,7 @@ static enum xz_ret dec_block(struct xz_dec *s, struct xz_buf *b)
 		s->block.hash.uncompressed += s->block.uncompressed;
 
 		GRUB_MD_CRC32->write(s->block.hash.crc32_context,
-				(const uint8_t *)&s->block.hash, sizeof(s->block.hash));
+				(const uint8_t *)&s->block.hash, 2 * sizeof(vli_type));
 
 		++s->block.count;
 	}
@@ -329,8 +329,7 @@ static enum xz_ret dec_index(struct xz_dec *s, struct xz_buf *b)
 			s->index.hash.uncompressed += s->vli;
 
 			GRUB_MD_CRC32->write(s->index.hash.crc32_context,
-					(const uint8_t *)&s->index.hash,
-					sizeof(s->index.hash));
+					(const uint8_t *)&s->index.hash, 2 * sizeof(vli_type));
 
 			--s->index.count;
 			s->index.sequence = SEQ_INDEX_UNPADDED;
@@ -671,8 +670,17 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b)
 			index_update(s, b);
 
 			/* Compare the hashes to validate the Index field. */
-			if (! memeq(&s->block.hash, &s->index.hash, sizeof(s->block.hash)))
+			GRUB_MD_CRC32->final(s->block.hash.crc32_context);
+			GRUB_MD_CRC32->final(s->index.hash.crc32_context);
+			uint32_t block_crc = *(uint32_t*)GRUB_MD_CRC32->read(s->block.hash.crc32_context);
+			uint32_t index_crc = *(uint32_t*)GRUB_MD_CRC32->read(s->index.hash.crc32_context);
+
+			if (s->block.hash.unpadded != s->index.hash.unpadded
+			    || s->block.hash.uncompressed != s->index.hash.uncompressed
+			    || block_crc != index_crc)
+			{
 				return XZ_DATA_ERROR;
+			}
 
 			s->sequence = SEQ_INDEX_CRC32;
 
@@ -856,7 +864,6 @@ void xz_dec_end(struct xz_dec *s)
 		kfree(s->index.hash.crc32_context);
 		kfree(s->block.hash.crc32_context);
 		kfree(s->crc32_context);
-
 #ifdef XZ_DEC_BCJ
 		xz_dec_bcj_end(s->bcj);
 #endif

From 5dcdf93ad6771ef6bf61c73072efe3d0f5878d3e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 15 Sep 2010 11:31:02 +0200
Subject: [PATCH 1622/1628] 	* grub-core/gnulib/error.c: Resynced. 	*
 grub-core/gnulib/getopt.c: Likewise. 	* grub-core/gnulib/getopt_int.h:
 Likewise. 	* grub-core/gnulib/regex.h: Likewise. 	*
 grub-core/gnulib/regex_internal.c: Likewise. 	*
 grub-core/gnulib/regex_internal.h: Likewise.

---
 ChangeLog                         |  9 ++++
 grub-core/gnulib/error.c          | 32 +++++++++++++-
 grub-core/gnulib/getopt.c         | 39 ++++++++++-------
 grub-core/gnulib/getopt_int.h     | 69 ++++++++++++++++---------------
 grub-core/gnulib/regex.h          | 20 ++++-----
 grub-core/gnulib/regex_internal.c |  4 +-
 grub-core/gnulib/regex_internal.h |  2 +
 7 files changed, 113 insertions(+), 62 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0a85dbbcc..5dfe4b7bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/gnulib/error.c: Resynced.
+	* grub-core/gnulib/getopt.c: Likewise.
+	* grub-core/gnulib/getopt_int.h: Likewise.
+	* grub-core/gnulib/regex.h: Likewise.
+	* grub-core/gnulib/regex_internal.c: Likewise.
+	* grub-core/gnulib/regex_internal.h: Likewise.
+
 2010-09-15  Szymon Janc <szymon@janc.net.pl>
 
 	* grub-core/lib/xzembed/xz_dec_stream.c (dec_main): Fix index and block
diff --git a/grub-core/gnulib/error.c b/grub-core/gnulib/error.c
index c79e8d42c..ed9dba0d2 100644
--- a/grub-core/gnulib/error.c
+++ b/grub-core/gnulib/error.c
@@ -88,6 +88,15 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
 # include <fcntl.h>
 # include <unistd.h>
 
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+/* Get declarations of the Win32 API functions.  */
+#  define WIN32_LEAN_AND_MEAN
+#  include <windows.h>
+# endif
+
+/* The gnulib override of fcntl is not needed in this file.  */
+# undef fcntl
+
 # if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P
 #  ifndef HAVE_DECL_STRERROR_R
 "this configure-time declaration test was not run"
@@ -104,10 +113,29 @@ extern char *program_name;
 # endif /* HAVE_STRERROR_R || defined strerror_r */
 #endif  /* not _LIBC */
 
+#if !_LIBC
+/* Return non-zero if FD is open.  */
+static inline int
+is_open (int fd)
+{
+# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+  /* On Win32: The initial state of unassigned standard file descriptors is
+     that they are open but point to an INVALID_HANDLE_VALUE.  There is no
+     fcntl, and the gnulib replacement fcntl does not support F_GETFL.  */
+  return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
+# else
+#  ifndef F_GETFL
+#   error Please port fcntl to your platform
+#  endif
+  return 0 <= fcntl (fd, F_GETFL);
+# endif
+}
+#endif
+
 static inline void
 flush_stdout (void)
 {
-#if !_LIBC && defined F_GETFL
+#if !_LIBC
   int stdout_fd;
 
 # if GNULIB_FREOPEN_SAFER
@@ -124,7 +152,7 @@ flush_stdout (void)
   /* POSIX states that fflush (stdout) after fclose is unspecified; it
      is safe in glibc, but not on all other platforms.  fflush (NULL)
      is always defined, but too draconian.  */
-  if (0 <= stdout_fd && 0 <= fcntl (stdout_fd, F_GETFL))
+  if (0 <= stdout_fd && is_open (stdout_fd))
 #endif
     fflush (stdout);
 }
diff --git a/grub-core/gnulib/getopt.c b/grub-core/gnulib/getopt.c
index aaabc8d19..3791f1293 100644
--- a/grub-core/gnulib/getopt.c
+++ b/grub-core/gnulib/getopt.c
@@ -348,8 +348,6 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
                     int long_only, struct _getopt_data *d, int posixly_correct)
 {
   int print_errors = d->opterr;
-  if (optstring[0] == ':')
-    print_errors = 0;
 
   if (argc < 1)
     return -1;
@@ -364,6 +362,10 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
                                       posixly_correct);
       d->__initialized = 1;
     }
+  else if (optstring[0] == '-' || optstring[0] == '+')
+    optstring++;
+  if (optstring[0] == ':')
+    print_errors = 0;
 
   /* Test whether ARGV[optind] points to a non-option argument.
      Either it does not have option syntax, or there is an environment flag
@@ -633,8 +635,8 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
                       char *buf;
 
                       if (__asprintf (&buf, _("\
-%s: option '%s' requires an argument\n"),
-                                      argv[0], argv[d->optind - 1]) >= 0)
+%s: option '--%s' requires an argument\n"),
+                                      argv[0], pfound->name) >= 0)
                         {
                           _IO_flockfile (stderr);
 
@@ -651,8 +653,8 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
                         }
 #else
                       fprintf (stderr,
-                               _("%s: option '%s' requires an argument\n"),
-                               argv[0], argv[d->optind - 1]);
+                               _("%s: option '--%s' requires an argument\n"),
+                               argv[0], pfound->name);
 #endif
                     }
                   d->__nextchar += strlen (d->__nextchar);
@@ -736,13 +738,13 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
 
   {
     char c = *d->__nextchar++;
-    char *temp = strchr (optstring, c);
+    const char *temp = strchr (optstring, c);
 
     /* Increment `optind' when we start to process its last character.  */
     if (*d->__nextchar == '\0')
       ++d->optind;
 
-    if (temp == NULL || c == ':')
+    if (temp == NULL || c == ':' || c == ';')
       {
         if (print_errors)
           {
@@ -864,7 +866,10 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
                   pfound = p;
                   indfound = option_index;
                 }
-              else
+              else if (long_only
+                       || pfound->has_arg != p->has_arg
+                       || pfound->flag != p->flag
+                       || pfound->val != p->val)
                 /* Second or later nonexact match found.  */
                 ambig = 1;
             }
@@ -876,7 +881,7 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
                 char *buf;
 
                 if (__asprintf (&buf, _("%s: option '-W %s' is ambiguous\n"),
-                                argv[0], argv[d->optind]) >= 0)
+                                argv[0], d->optarg) >= 0)
                   {
                     _IO_flockfile (stderr);
 
@@ -892,7 +897,7 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
                   }
 #else
                 fprintf (stderr, _("%s: option '-W %s' is ambiguous\n"),
-                         argv[0], argv[d->optind]);
+                         argv[0], d->optarg);
 #endif
               }
             d->__nextchar += strlen (d->__nextchar);
@@ -955,8 +960,8 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
                         char *buf;
 
                         if (__asprintf (&buf, _("\
-%s: option '%s' requires an argument\n"),
-                                        argv[0], argv[d->optind - 1]) >= 0)
+%s: option '-W %s' requires an argument\n"),
+                                        argv[0], pfound->name) >= 0)
                           {
                             _IO_flockfile (stderr);
 
@@ -972,15 +977,17 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
                             free (buf);
                           }
 #else
-                        fprintf (stderr,
-                                 _("%s: option '%s' requires an argument\n"),
-                                 argv[0], argv[d->optind - 1]);
+                        fprintf (stderr, _("\
+%s: option '-W %s' requires an argument\n"),
+                                 argv[0], pfound->name);
 #endif
                       }
                     d->__nextchar += strlen (d->__nextchar);
                     return optstring[0] == ':' ? ':' : '?';
                   }
               }
+            else
+              d->optarg = NULL;
             d->__nextchar += strlen (d->__nextchar);
             if (longind != NULL)
               *longind = option_index;
diff --git a/grub-core/gnulib/getopt_int.h b/grub-core/gnulib/getopt_int.h
index 169def5b2..980b7507f 100644
--- a/grub-core/gnulib/getopt_int.h
+++ b/grub-core/gnulib/getopt_int.h
@@ -30,6 +30,40 @@ extern int _getopt_internal (int ___argc, char **___argv,
 /* Reentrant versions which can handle parsing multiple argument
    vectors at the same time.  */
 
+/* Describe how to deal with options that follow non-option ARGV-elements.
+
+   If the caller did not specify anything,
+   the default is REQUIRE_ORDER if the environment variable
+   POSIXLY_CORRECT is defined, PERMUTE otherwise.
+
+   REQUIRE_ORDER means don't recognize them as options;
+   stop option processing when the first non-option is seen.
+   This is what Unix does.
+   This mode of operation is selected by either setting the environment
+   variable POSIXLY_CORRECT, or using `+' as the first character
+   of the list of option characters, or by calling getopt.
+
+   PERMUTE is the default.  We permute the contents of ARGV as we
+   scan, so that eventually all the non-options are at the end.
+   This allows options to be given in any order, even with programs
+   that were not written to expect this.
+
+   RETURN_IN_ORDER is an option available to programs that were
+   written to expect options and other ARGV-elements in any order
+   and that care about the ordering of the two.  We describe each
+   non-option ARGV-element as if it were the argument of an option
+   with character code 1.  Using `-' as the first character of the
+   list of option characters selects this mode of operation.
+
+   The special argument `--' forces an end of option-scanning regardless
+   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
+   `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
+
+enum __ord
+  {
+    REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
+  };
+
 /* Data type for reentrant functions.  */
 struct _getopt_data
 {
@@ -54,39 +88,8 @@ struct _getopt_data
      by advancing to the next ARGV-element.  */
   char *__nextchar;
 
-  /* Describe how to deal with options that follow non-option ARGV-elements.
-
-     If the caller did not specify anything,
-     the default is REQUIRE_ORDER if the environment variable
-     POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
-     REQUIRE_ORDER means don't recognize them as options;
-     stop option processing when the first non-option is seen.
-     This is what Unix does.
-     This mode of operation is selected by either setting the environment
-     variable POSIXLY_CORRECT, or using `+' as the first character
-     of the list of option characters, or by calling getopt.
-
-     PERMUTE is the default.  We permute the contents of ARGV as we
-     scan, so that eventually all the non-options are at the end.
-     This allows options to be given in any order, even with programs
-     that were not written to expect this.
-
-     RETURN_IN_ORDER is an option available to programs that were
-     written to expect options and other ARGV-elements in any order
-     and that care about the ordering of the two.  We describe each
-     non-option ARGV-element as if it were the argument of an option
-     with character code 1.  Using `-' as the first character of the
-     list of option characters selects this mode of operation.
-
-     The special argument `--' forces an end of option-scanning regardless
-     of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
-     `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
-
-  enum
-    {
-      REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-    } __ordering;
+  /* See __ord above.  */
+  enum __ord __ordering;
 
   /* If the POSIXLY_CORRECT environment variable is set
      or getopt was called.  */
diff --git a/grub-core/gnulib/regex.h b/grub-core/gnulib/regex.h
index 594d5e6aa..89a8143d4 100644
--- a/grub-core/gnulib/regex.h
+++ b/grub-core/gnulib/regex.h
@@ -114,10 +114,10 @@ typedef unsigned long int reg_syntax_t;
 /* If this bit is set, then ^ and $ are always anchors (outside bracket
      expressions, of course).
    If this bit is not set, then it depends:
-        ^  is an anchor if it is at the beginning of a regular
-           expression or after an open-group or an alternation operator;
-        $  is an anchor if it is at the end of a regular expression, or
-           before a close-group or an alternation operator.
+	^  is an anchor if it is at the beginning of a regular
+	   expression or after an open-group or an alternation operator;
+	$  is an anchor if it is at the end of a regular expression, or
+	   before a close-group or an alternation operator.
 
    This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
    POSIX draft 11.2 says that * etc. in leading positions is undefined.
@@ -219,8 +219,8 @@ typedef unsigned long int reg_syntax_t;
    whether ^ should be special.  */
 # define RE_CARET_ANCHORS_HERE (RE_ICASE << 1)
 
-/* If this bit is set, then \{ cannot be first in an bre or
-   immediately after an alternation or begin-group operator.  */
+/* If this bit is set, then \{ cannot be first in a regex or
+   immediately after an alternation, open-group or \} operator.  */
 # define RE_CONTEXT_INVALID_DUP (RE_CARET_ANCHORS_HERE << 1)
 
 /* If this bit is set, then no_sub will be set to 1 during
@@ -495,8 +495,8 @@ struct re_pattern_buffer
 #endif
   unsigned int _REG_RE_NAME (regs_allocated) : 2;
 
-  /* Set to zero when `regex_compile' compiles a pattern; set to one
-     by `re_compile_fastmap' if it updates the fastmap.  */
+  /* Set to zero when `re_compile_pattern' compiles a pattern; set to
+     one by `re_compile_fastmap' if it updates the fastmap.  */
   unsigned int _REG_RE_NAME (fastmap_accurate) : 1;
 
   /* If set, `re_match_2' does not return information about
@@ -610,8 +610,8 @@ extern regoff_t re_match_2 (struct re_pattern_buffer *__buffer,
    register data.
 
    Unless this function is called, the first search or match using
-   PATTERN_BUFFER will allocate its own register data, without
-   freeing the old data.  */
+   BUFFER will allocate its own register data, without freeing the old
+   data.  */
 extern void re_set_registers (struct re_pattern_buffer *__buffer,
 			      struct re_registers *__regs,
 			      __re_size_t __num_regs,
diff --git a/grub-core/gnulib/regex_internal.c b/grub-core/gnulib/regex_internal.c
index 378b767d8..787a3a627 100644
--- a/grub-core/gnulib/regex_internal.c
+++ b/grub-core/gnulib/regex_internal.c
@@ -733,15 +733,17 @@ re_string_reconstruct (re_string_t *pstr, Idx idx, int eflags)
 			  mbstate_t cur_state;
 			  wchar_t wc2;
 			  Idx mlen = raw + pstr->len - p;
-			  unsigned char buf[6];
 			  size_t mbclen;
 
+#if 0 /* dead code: buf is set but never used */
+			  unsigned char buf[6];
 			  if (BE (pstr->trans != NULL, 0))
 			    {
 			      int i = mlen < 6 ? mlen : 6;
 			      while (--i >= 0)
 				buf[i] = pstr->trans[p[i]];
 			    }
+#endif
 			  /* XXX Don't use mbrtowc, we know which conversion
 			     to use (UTF-8 -> UCS4).  */
 			  memset (&cur_state, 0, sizeof (cur_state));
diff --git a/grub-core/gnulib/regex_internal.h b/grub-core/gnulib/regex_internal.h
index e1b4c61b3..dc94e2cbc 100644
--- a/grub-core/gnulib/regex_internal.h
+++ b/grub-core/gnulib/regex_internal.h
@@ -467,6 +467,8 @@ static unsigned int re_string_context_at (const re_string_t *input, Idx idx,
 # else
 /* alloca is implemented with malloc, so just use malloc.  */
 #  define __libc_use_alloca(n) 0
+#  undef alloca
+#  define alloca(n) malloc (n)
 # endif
 #endif
 

From 2e04a0068595e6623e175164e762875003f17a9b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 15 Sep 2010 11:34:29 +0200
Subject: [PATCH 1623/1628] 	* grub-core/gnulib/basename-lgpl.c: Imported. 
 * grub-core/gnulib/basename.c: Likewise. 	*
 grub-core/gnulib/dirname-lgpl.c: Likewise. 	* grub-core/gnulib/dirname.c:
 Likewise. 	* grub-core/gnulib/dirname.h: Likewise. 	*
 grub-core/gnulib/stripslash.c: Likewise.

---
 ChangeLog                        |  9 ++++
 grub-core/gnulib/basename-lgpl.c | 75 ++++++++++++++++++++++++++++
 grub-core/gnulib/basename.c      | 58 +++++++++++++++++++++
 grub-core/gnulib/dirname-lgpl.c  | 86 ++++++++++++++++++++++++++++++++
 grub-core/gnulib/dirname.c       | 38 ++++++++++++++
 grub-core/gnulib/dirname.h       | 74 +++++++++++++++++++++++++++
 grub-core/gnulib/stripslash.c    | 45 +++++++++++++++++
 7 files changed, 385 insertions(+)
 create mode 100644 grub-core/gnulib/basename-lgpl.c
 create mode 100644 grub-core/gnulib/basename.c
 create mode 100644 grub-core/gnulib/dirname-lgpl.c
 create mode 100644 grub-core/gnulib/dirname.c
 create mode 100644 grub-core/gnulib/dirname.h
 create mode 100644 grub-core/gnulib/stripslash.c

diff --git a/ChangeLog b/ChangeLog
index 5dfe4b7bd..c525fe369 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/gnulib/basename-lgpl.c: Imported.
+	* grub-core/gnulib/basename.c: Likewise.
+	* grub-core/gnulib/dirname-lgpl.c: Likewise.
+	* grub-core/gnulib/dirname.c: Likewise.
+	* grub-core/gnulib/dirname.h: Likewise.
+	* grub-core/gnulib/stripslash.c: Likewise.
+
 2010-09-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/gnulib/error.c: Resynced.
diff --git a/grub-core/gnulib/basename-lgpl.c b/grub-core/gnulib/basename-lgpl.c
new file mode 100644
index 000000000..a35ff01c2
--- /dev/null
+++ b/grub-core/gnulib/basename-lgpl.c
@@ -0,0 +1,75 @@
+/* basename.c -- return the last element in a file name
+
+   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2010 Free Software
+   Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "dirname.h"
+
+#include <string.h>
+
+/* Return the address of the last file name component of NAME.  If
+   NAME has no relative file name components because it is a file
+   system root, return the empty string.  */
+
+char *
+last_component (char const *name)
+{
+  char const *base = name + FILE_SYSTEM_PREFIX_LEN (name);
+  char const *p;
+  bool saw_slash = false;
+
+  while (ISSLASH (*base))
+    base++;
+
+  for (p = base; *p; p++)
+    {
+      if (ISSLASH (*p))
+        saw_slash = true;
+      else if (saw_slash)
+        {
+          base = p;
+          saw_slash = false;
+        }
+    }
+
+  return (char *) base;
+}
+
+/* Return the length of the basename NAME.  Typically NAME is the
+   value returned by base_name or last_component.  Act like strlen
+   (NAME), except omit all trailing slashes.  */
+
+size_t
+base_len (char const *name)
+{
+  size_t len;
+  size_t prefix_len = FILE_SYSTEM_PREFIX_LEN (name);
+
+  for (len = strlen (name);  1 < len && ISSLASH (name[len - 1]);  len--)
+    continue;
+
+  if (DOUBLE_SLASH_IS_DISTINCT_ROOT && len == 1
+      && ISSLASH (name[0]) && ISSLASH (name[1]) && ! name[2])
+    return 2;
+
+  if (FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE && prefix_len
+      && len == prefix_len && ISSLASH (name[prefix_len]))
+    return prefix_len + 1;
+
+  return len;
+}
diff --git a/grub-core/gnulib/basename.c b/grub-core/gnulib/basename.c
new file mode 100644
index 000000000..24da93ac4
--- /dev/null
+++ b/grub-core/gnulib/basename.c
@@ -0,0 +1,58 @@
+/* basename.c -- return the last element in a file name
+
+   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2010 Free Software
+   Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "dirname.h"
+
+#include <string.h>
+#include "xalloc.h"
+#include "xstrndup.h"
+
+char *
+base_name (char const *name)
+{
+  char const *base = last_component (name);
+  size_t length;
+
+  /* If there is no last component, then name is a file system root or the
+     empty string.  */
+  if (! *base)
+    return xstrndup (name, base_len (name));
+
+  /* Collapse a sequence of trailing slashes into one.  */
+  length = base_len (base);
+  if (ISSLASH (base[length]))
+    length++;
+
+  /* On systems with drive letters, `a/b:c' must return `./b:c' rather
+     than `b:c' to avoid confusion with a drive letter.  On systems
+     with pure POSIX semantics, this is not an issue.  */
+  if (FILE_SYSTEM_PREFIX_LEN (base))
+    {
+      char *p = xmalloc (length + 3);
+      p[0] = '.';
+      p[1] = '/';
+      memcpy (p + 2, base, length);
+      p[length + 2] = '\0';
+      return p;
+    }
+
+  /* Finally, copy the basename.  */
+  return xstrndup (base, length);
+}
diff --git a/grub-core/gnulib/dirname-lgpl.c b/grub-core/gnulib/dirname-lgpl.c
new file mode 100644
index 000000000..d4506e060
--- /dev/null
+++ b/grub-core/gnulib/dirname-lgpl.c
@@ -0,0 +1,86 @@
+/* dirname.c -- return all but the last element in a file name
+
+   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2010 Free Software
+   Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "dirname.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+/* Return the length of the prefix of FILE that will be used by
+   dir_name.  If FILE is in the working directory, this returns zero
+   even though `dir_name (FILE)' will return ".".  Works properly even
+   if there are trailing slashes (by effectively ignoring them).  */
+
+size_t
+dir_len (char const *file)
+{
+  size_t prefix_length = FILE_SYSTEM_PREFIX_LEN (file);
+  size_t length;
+
+  /* Advance prefix_length beyond important leading slashes.  */
+  prefix_length += (prefix_length != 0
+                    ? (FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
+                       && ISSLASH (file[prefix_length]))
+                    : (ISSLASH (file[0])
+                       ? ((DOUBLE_SLASH_IS_DISTINCT_ROOT
+                           && ISSLASH (file[1]) && ! ISSLASH (file[2])
+                           ? 2 : 1))
+                       : 0));
+
+  /* Strip the basename and any redundant slashes before it.  */
+  for (length = last_component (file) - file;
+       prefix_length < length; length--)
+    if (! ISSLASH (file[length - 1]))
+      break;
+  return length;
+}
+
+
+/* In general, we can't use the builtin `dirname' function if available,
+   since it has different meanings in different environments.
+   In some environments the builtin `dirname' modifies its argument.
+
+   Return the leading directories part of FILE, allocated with malloc.
+   Works properly even if there are trailing slashes (by effectively
+   ignoring them).  Return NULL on failure.
+
+   If lstat (FILE) would succeed, then { chdir (dir_name (FILE));
+   lstat (base_name (FILE)); } will access the same file.  Likewise,
+   if the sequence { chdir (dir_name (FILE));
+   rename (base_name (FILE), "foo"); } succeeds, you have renamed FILE
+   to "foo" in the same directory FILE was in.  */
+
+char *
+mdir_name (char const *file)
+{
+  size_t length = dir_len (file);
+  bool append_dot = (length == 0
+                     || (FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
+                         && length == FILE_SYSTEM_PREFIX_LEN (file)
+                         && file[2] != '\0' && ! ISSLASH (file[2])));
+  char *dir = malloc (length + append_dot + 1);
+  if (!dir)
+    return NULL;
+  memcpy (dir, file, length);
+  if (append_dot)
+    dir[length++] = '.';
+  dir[length] = '\0';
+  return dir;
+}
diff --git a/grub-core/gnulib/dirname.c b/grub-core/gnulib/dirname.c
new file mode 100644
index 000000000..953a9acc3
--- /dev/null
+++ b/grub-core/gnulib/dirname.c
@@ -0,0 +1,38 @@
+/* dirname.c -- return all but the last element in a file name
+
+   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2010 Free Software
+   Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "dirname.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include "xalloc.h"
+
+/* Just like mdir_name (dirname-lgpl.c), except, rather than
+   returning NULL upon malloc failure, here, we report the
+   "memory exhausted" condition and exit.  */
+
+char *
+dir_name (char const *file)
+{
+  char *result = mdir_name (file);
+  if (!result)
+    xalloc_die ();
+  return result;
+}
diff --git a/grub-core/gnulib/dirname.h b/grub-core/gnulib/dirname.h
new file mode 100644
index 000000000..fb19508f7
--- /dev/null
+++ b/grub-core/gnulib/dirname.h
@@ -0,0 +1,74 @@
+/*  Take file names apart into directory and base names.
+
+    Copyright (C) 1998, 2001, 2003-2006, 2009-2010 Free Software Foundation,
+    Inc.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef DIRNAME_H_
+# define DIRNAME_H_ 1
+
+# include <stdbool.h>
+# include <stddef.h>
+
+# ifndef DIRECTORY_SEPARATOR
+#  define DIRECTORY_SEPARATOR '/'
+# endif
+
+# ifndef ISSLASH
+#  define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
+# endif
+
+# ifndef FILE_SYSTEM_PREFIX_LEN
+#  if FILE_SYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
+    /* This internal macro assumes ASCII, but all hosts that support drive
+       letters use ASCII.  */
+#   define _IS_DRIVE_LETTER(c) (((unsigned int) (c) | ('a' - 'A')) - 'a' \
+                                <= 'z' - 'a')
+#   define FILE_SYSTEM_PREFIX_LEN(Filename) \
+           (_IS_DRIVE_LETTER ((Filename)[0]) && (Filename)[1] == ':' ? 2 : 0)
+#  else
+#   define FILE_SYSTEM_PREFIX_LEN(Filename) 0
+#  endif
+# endif
+
+# ifndef FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
+#  define FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE 0
+# endif
+
+# ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT
+#  define DOUBLE_SLASH_IS_DISTINCT_ROOT 0
+# endif
+
+# if FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE
+#  define IS_ABSOLUTE_FILE_NAME(F) ISSLASH ((F)[FILE_SYSTEM_PREFIX_LEN (F)])
+# else
+#  define IS_ABSOLUTE_FILE_NAME(F) \
+          (ISSLASH ((F)[0]) || 0 < FILE_SYSTEM_PREFIX_LEN (F))
+# endif
+# define IS_RELATIVE_FILE_NAME(F) (! IS_ABSOLUTE_FILE_NAME (F))
+
+# if GNULIB_DIRNAME
+char *base_name (char const *file);
+char *dir_name (char const *file);
+# endif
+
+char *mdir_name (char const *file);
+size_t base_len (char const *file);
+size_t dir_len (char const *file);
+char *last_component (char const *file);
+
+bool strip_trailing_slashes (char *file);
+
+#endif /* not DIRNAME_H_ */
diff --git a/grub-core/gnulib/stripslash.c b/grub-core/gnulib/stripslash.c
new file mode 100644
index 000000000..3a5996fd9
--- /dev/null
+++ b/grub-core/gnulib/stripslash.c
@@ -0,0 +1,45 @@
+/* stripslash.c -- remove redundant trailing slashes from a file name
+
+   Copyright (C) 1990, 2001, 2003-2006, 2009-2010 Free Software Foundation,
+   Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "dirname.h"
+
+/* Remove trailing slashes from FILE.  Return true if a trailing slash
+   was removed.  This is useful when using file name completion from a
+   shell that adds a "/" after directory names (such as tcsh and
+   bash), because on symlinks to directories, several system calls
+   have different semantics according to whether a trailing slash is
+   present.  */
+
+bool
+strip_trailing_slashes (char *file)
+{
+  char *base = last_component (file);
+  char *base_lim;
+  bool had_slash;
+
+  /* last_component returns "" for file system roots, but we need to turn
+     `///' into `/'.  */
+  if (! *base)
+    base = file;
+  base_lim = base + base_len (base);
+  had_slash = (*base_lim != '\0');
+  *base_lim = '\0';
+  return had_slash;
+}

From 2b94e3ff6e3f116256ed74b0552dd2a19eb91f48 Mon Sep 17 00:00:00 2001
From: Yves Blusseau <blusseau@zetam.org>
Date: Wed, 15 Sep 2010 11:46:16 +0200
Subject: [PATCH 1624/1628]     Add function to get completions from usage.

    * util/bash-completion.d/grub-completion.bash.in: Add function to get
    completions from usage. Use LC_ALL=C to get options properly.
---
 ChangeLog                                     |  7 +++++
 ChangeLog.completion-usage                    |  4 +++
 .../bash-completion.d/grub-completion.bash.in | 30 ++++++++++++++++---
 3 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 ChangeLog.completion-usage

diff --git a/ChangeLog b/ChangeLog
index c525fe369..1113b8157 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-15  Yves Blusseau  <blusseau@zetam.org>
+
+	Add function to get completions from usage.
+
+	* util/bash-completion.d/grub-completion.bash.in: Add function to get
+	completions from usage. Use LC_ALL=C to get options properly.
+
 2010-09-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/gnulib/basename-lgpl.c: Imported.
diff --git a/ChangeLog.completion-usage b/ChangeLog.completion-usage
new file mode 100644
index 000000000..eee7b018f
--- /dev/null
+++ b/ChangeLog.completion-usage
@@ -0,0 +1,4 @@
+2010-09-15  Yves Blusseau  <blusseau@zetam.org>
+
+	* util/bash-completion.d/grub-completion.bash.in: Add function to get
+	completions from usage.
diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in
index abba0df78..65cbb80ee 100644
--- a/util/bash-completion.d/grub-completion.bash.in
+++ b/util/bash-completion.d/grub-completion.bash.in
@@ -58,7 +58,7 @@ __grubcomp () {
     esac
 }
 
-# Function that return long options from the help
+# Function that return long options from the help of the command
 # - arg: $1 (optional) command to get the long options from
 __grub_get_options_from_help () {
      local prog
@@ -70,7 +70,7 @@ __grub_get_options_from_help () {
      fi
 
      local i IFS=" "$'\t'$'\n'
-     for i in $($prog --help)
+     for i in $(LC_ALL=C $prog --help)
      do
         case $i in
              --*) echo "${i%=*}";;
@@ -78,6 +78,28 @@ __grub_get_options_from_help () {
      done
 }
 
+# Function that return long options from the usage of the command
+# - arg: $1 (optional) command to get the long options from
+__grub_get_options_from_usage () {
+     local prog
+
+     if [ $# -ge 1 ]; then
+         prog="$1"
+     else
+         prog="${COMP_WORDS[0]}"
+     fi
+
+     local i IFS=" "$'\t'$'\n'
+     for i in $(LC_ALL=C $prog --usage)
+     do
+        case $i in
+            \[--*\]) i=${i#[}           # Remove leading [
+                     echo ${i%%?(=*)]}  # Remove optional value and trailing ]
+                     ;;
+         esac
+     done
+}
+
 __grub_get_last_option () {
     local i
     for (( i=$COMP_CWORD-1; i > 0; i-- )); do
@@ -355,7 +377,7 @@ _grub_mkimage () {
         -O|--format)
             # Get available format from help
             local prog=${COMP_WORDS[0]}
-            __grubcomp "$($prog --help | \
+            __grubcomp "$(LC_ALL=C $prog --help | \
                         awk -F ":" '/available formats/ { print $2 }' | \
                         sed 's/, / /g')"
             return
@@ -415,7 +437,7 @@ _grub_probe () {
         -t|--target)
             # Get target type from help
             local prog=${COMP_WORDS[0]}
-            __grubcomp "$($prog --help | \
+            __grubcomp "$(LC_ALL=C $prog --help | \
                         awk -F "[()]" '/--target=/ { print $2 }' | \
                         sed 's/|/ /g')"
             return

From f00478b7196526bfd3370c3d3acf8fdff7e92b78 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 15 Sep 2010 15:30:43 +0200
Subject: [PATCH 1625/1628] 	* grub-core/kern/emu/hostdisk.c
 (grub_util_biosdisk_is_floppy): New 	function. 	*
 include/grub/emu/hostdisk.h (grub_util_biosdisk_is_floppy): New proto. 
 * util/grub-setup.c (setup): Use grub_util_biosdisk_is_floppy.

---
 ChangeLog                     |  7 +++++++
 grub-core/kern/emu/hostdisk.c | 26 ++++++++++++++++++++++++++
 include/grub/emu/hostdisk.h   |  1 +
 util/grub-setup.c             |  4 ++--
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1113b8157..b3f3c0e51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_is_floppy): New
+	function.
+	* include/grub/emu/hostdisk.h (grub_util_biosdisk_is_floppy): New proto.
+	* util/grub-setup.c (setup): Use grub_util_biosdisk_is_floppy.
+
 2010-09-15  Yves Blusseau  <blusseau@zetam.org>
 
 	Add function to get completions from usage.
diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
index 142e93fe2..edf8dc219 100644
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -1575,3 +1575,29 @@ grub_util_biosdisk_get_osdev (grub_disk_t disk)
 {
   return map[disk->id].device;
 }
+
+int
+grub_util_biosdisk_is_floppy (grub_disk_t disk)
+{
+  struct stat st;
+  int fd;
+
+  fd = open (map[disk->id].device, O_RDONLY);
+  /* Shouldn't happen.  */
+  if (fd == -1)
+    return 0;
+
+  /* Shouldn't happen either.  */
+  if (fstat (fd, &st) < 0)
+    return 0;
+
+#if defined(__NetBSD__)
+  if (major(st.st_rdev) == RAW_FLOPPY_MAJOR)
+    return 1;
+#endif
+
+  if (major(st.st_rdev) == FLOPPY_MAJOR)
+    return 1;
+
+  return 0;
+}
diff --git a/include/grub/emu/hostdisk.h b/include/grub/emu/hostdisk.h
index 5873aa440..d8cc02e14 100644
--- a/include/grub/emu/hostdisk.h
+++ b/include/grub/emu/hostdisk.h
@@ -27,5 +27,6 @@ void grub_util_biosdisk_fini (void);
 char *grub_util_biosdisk_get_grub_dev (const char *os_dev);
 const char *grub_util_biosdisk_get_osdev (grub_disk_t disk);
 int grub_util_biosdisk_is_present (const char *name);
+int grub_util_biosdisk_is_floppy (grub_disk_t disk);
 
 #endif /* ! GRUB_BIOSDISK_MACHINE_UTIL_HEADER */
diff --git a/util/grub-setup.c b/util/grub-setup.c
index 55d740f09..a95f9b9d5 100644
--- a/util/grub-setup.c
+++ b/util/grub-setup.c
@@ -339,8 +339,8 @@ setup (const char *dir,
     /* If DEST_DRIVE is a hard disk, enable the workaround, which is
        for buggy BIOSes which don't pass boot drive correctly. Instead,
        they pass 0x00 or 0x01 even when booted from 0x80.  */
-    if (dest_dev->disk->id & 0x80)
-    /* Replace the jmp (2 bytes) with double nop's.  */
+    if (!grub_util_biosdisk_is_floppy (dest_dev->disk))
+      /* Replace the jmp (2 bytes) with double nop's.  */
       *boot_drive_check = 0x9090;
   }
 #endif

From e9fc4da271612c22fb98d104ea872ef848a95b5d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 15 Sep 2010 16:14:38 +0200
Subject: [PATCH 1626/1628] Remove accidently merged file

---
 ChangeLog.completion-usage | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 ChangeLog.completion-usage

diff --git a/ChangeLog.completion-usage b/ChangeLog.completion-usage
deleted file mode 100644
index eee7b018f..000000000
--- a/ChangeLog.completion-usage
+++ /dev/null
@@ -1,4 +0,0 @@
-2010-09-15  Yves Blusseau  <blusseau@zetam.org>
-
-	* util/bash-completion.d/grub-completion.bash.in: Add function to get
-	completions from usage.

From e50fca4a4c7ec7597456a5e2e0d166c20c719ecc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 15 Sep 2010 21:36:57 +0200
Subject: [PATCH 1627/1628] 	Move embedding routines to partmap sources
 files.

	* grub-core/partmap/gpt.c (grub_gpt_partition_type_bios_boot)
	[GRUB_UTIL]: New variable.
	(gpt_partition_map_iterate): Set part.parent.
	(gpt_partition_map_embed) [GRUB_UTIL]: New function.
	(grub_gpt_partition_map) [GRUB_UTIL]: Set .embed.
	* grub-core/partmap/msdos.c (pc_partition_map_embed) [GRUB_UTIL]:
	New function.
	(grub_msdos_partition_map) [GRUB_UTIL]: Set .embed.
	* include/grub/partition.h (grub_embed_type_t) [GRUB_UTIL]: New type.
	(grub_partition_map) [GRUB_UTIL]: New field embed.
	* util/grub-setup.c (grub_gpt_partition_type_bios_boot): Removed.
	(setup): Use ->embed.
---
 ChangeLog                 |  17 ++++
 grub-core/partmap/gpt.c   |  66 +++++++++++++
 grub-core/partmap/msdos.c | 116 ++++++++++++++++++++++
 include/grub/partition.h  |  12 +++
 util/grub-setup.c         | 196 ++++++++++++++++----------------------
 5 files changed, 295 insertions(+), 112 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b3f3c0e51..0c092d0b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2010-09-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Move embedding routines to partmap sources files.
+
+	* grub-core/partmap/gpt.c (grub_gpt_partition_type_bios_boot)
+	[GRUB_UTIL]: New variable.
+	(gpt_partition_map_iterate): Set part.parent.
+	(gpt_partition_map_embed) [GRUB_UTIL]: New function.
+	(grub_gpt_partition_map) [GRUB_UTIL]: Set .embed.
+	* grub-core/partmap/msdos.c (pc_partition_map_embed) [GRUB_UTIL]:
+	New function.
+	(grub_msdos_partition_map) [GRUB_UTIL]: Set .embed.
+	* include/grub/partition.h (grub_embed_type_t) [GRUB_UTIL]: New type.
+	(grub_partition_map) [GRUB_UTIL]: New field embed.
+	* util/grub-setup.c (grub_gpt_partition_type_bios_boot): Removed.
+	(setup): Use ->embed.
+
 2010-09-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_is_floppy): New
diff --git a/grub-core/partmap/gpt.c b/grub-core/partmap/gpt.c
index 0dd670cce..c9393d932 100644
--- a/grub-core/partmap/gpt.c
+++ b/grub-core/partmap/gpt.c
@@ -32,6 +32,10 @@ static grub_uint8_t grub_gpt_magic[8] =
 
 static const grub_gpt_part_type_t grub_gpt_partition_type_empty = GRUB_GPT_PARTITION_TYPE_EMPTY;
 
+#ifdef GRUB_UTIL
+static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT;
+#endif
+
 /* 512 << 7 = 65536 byte sectors.  */
 #define MAX_SECTOR_LOG 7
 
@@ -97,6 +101,7 @@ gpt_partition_map_iterate (grub_disk_t disk,
 	  part.number = i;
 	  part.index = last_offset;
 	  part.partmap = &grub_gpt_partition_map;
+	  part.parent = disk->partition;
 
 	  grub_dprintf ("gpt", "GPT entry %d: start=%lld, length=%lld\n", i,
 			(unsigned long long) part.start,
@@ -117,12 +122,73 @@ gpt_partition_map_iterate (grub_disk_t disk,
   return GRUB_ERR_NONE;
 }
 
+#ifdef GRUB_UTIL
+static grub_err_t
+gpt_partition_map_embed (struct grub_disk *disk, unsigned int nsectors,
+			 grub_embed_type_t embed_type,
+			 grub_disk_addr_t *sectors)
+{
+  grub_disk_addr_t start = 0, len = 0;
+  unsigned i;
+  grub_err_t err;
+
+  auto int NESTED_FUNC_ATTR find_usable_region (grub_disk_t disk,
+						const grub_partition_t p);
+  int NESTED_FUNC_ATTR find_usable_region (grub_disk_t disk __attribute__ ((unused)),
+					   const grub_partition_t p)
+  {
+    struct grub_gpt_partentry gptdata;
+
+    disk->partition = p->parent;
+    if (grub_disk_read (disk, p->offset, p->index,
+			sizeof (gptdata), &gptdata))
+      return 0;
+
+    /* If there's an embed region, it is in a dedicated partition.  */
+    if (! grub_memcmp (&gptdata.type, &grub_gpt_partition_type_bios_boot, 16))
+      {
+	start = p->start;
+	len = p->len;
+	return 1;
+      }
+
+      return 0;
+    }
+
+  if (embed_type != GRUB_EMBED_PCBIOS)
+    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+		       "GPT curently supports only PC-BIOS embedding");
+
+  err = gpt_partition_map_iterate (disk, find_usable_region);
+  if (err)
+    return err;
+
+  if (len == 0)
+    return grub_error (GRUB_ERR_FILE_NOT_FOUND,
+		       "This GPT partition label has no BIOS Boot Partition;"
+		       " embedding won't be possible!");
+
+  if (len < nsectors)
+    return grub_error (GRUB_ERR_OUT_OF_RANGE,
+		       "Your BIOS Boot Partition is too small;"
+		       " embedding won't be possible!");
+
+  for (i = 0; i < nsectors; i++)
+    sectors[i] = start + i;
+
+  return GRUB_ERR_NONE;
+}
+#endif
+
 
 /* Partition map type.  */
 static struct grub_partition_map grub_gpt_partition_map =
   {
     .name = "gpt",
     .iterate = gpt_partition_map_iterate,
+#ifdef GRUB_UTIL
+    .embed = gpt_partition_map_embed
+#endif
   };
 
 GRUB_MOD_INIT(part_gpt)
diff --git a/grub-core/partmap/msdos.c b/grub-core/partmap/msdos.c
index 3898d09fa..7dab4aa0f 100644
--- a/grub-core/partmap/msdos.c
+++ b/grub-core/partmap/msdos.c
@@ -133,12 +133,128 @@ pc_partition_map_iterate (grub_disk_t disk,
   return grub_errno;
 }
 
+#ifdef GRUB_UTIL
+static grub_err_t
+pc_partition_map_embed (struct grub_disk *disk, unsigned int nsectors,
+			grub_embed_type_t embed_type,
+			grub_disk_addr_t *sectors)
+{
+  grub_disk_addr_t end = ~0ULL;
+  struct grub_msdos_partition_mbr mbr;
+  int labeln = 0;
+  /* Any value different than `p.offset' will satisfy the check during
+     first loop.  */
+  grub_disk_addr_t lastaddr = 1;
+  grub_disk_addr_t ext_offset = 0;
+  grub_disk_addr_t offset = 0;
+
+  if (embed_type != GRUB_EMBED_PCBIOS)
+    return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+		       "PC-style partitions curently support "
+		       "only PC-BIOS embedding");
+
+  if (disk->partition)
+    return grub_error (GRUB_ERR_OUT_OF_RANGE,
+		       "Embedding on MSDOS subpartition isn't supported");
+
+  while (1)
+    {
+      int i;
+      struct grub_msdos_partition_entry *e;
+      grub_err_t err;
+
+      /* Read the MBR.  */
+      err = grub_disk_read (disk, offset, 0, sizeof (mbr), &mbr);
+      if (err)
+	return err;
+
+      /* This is our loop-detection algorithm. It works the following way:
+	 It saves last position which was a power of two. Then it compares the
+	 saved value with a current one. This way it's guaranteed that the loop
+	 will be broken by at most third walk.
+       */
+      if (labeln && lastaddr == offset)
+	return grub_error (GRUB_ERR_BAD_PART_TABLE, "loop detected");
+
+      labeln++;
+      if ((labeln & (labeln - 1)) == 0)
+	lastaddr = offset;
+
+      /* Check if it is valid.  */
+      if (mbr.signature != grub_cpu_to_le16 (GRUB_PC_PARTITION_SIGNATURE))
+	return grub_error (GRUB_ERR_BAD_PART_TABLE, "no signature");
+
+      for (i = 0; i < 4; i++)
+	if (mbr.entries[i].flag & 0x7f)
+	  return grub_error (GRUB_ERR_BAD_PART_TABLE, "bad boot flag");
+
+      /* Analyze DOS partitions.  */
+      for (i = 0; i < 4; i++)
+	{
+	  e = mbr.entries + i;
+
+	  if (!grub_msdos_partition_is_empty (e->type)
+	      && end > offset + grub_le_to_cpu32 (e->start))
+	    end = offset + grub_le_to_cpu32 (e->start);
+
+	  /* If this is a GPT partition, this MBR is just a dummy.  */
+	  if (e->type == GRUB_PC_PARTITION_TYPE_GPT_DISK && i == 0)
+	    return grub_error (GRUB_ERR_BAD_PART_TABLE, "dummy mbr");
+	}
+
+      /* Find an extended partition.  */
+      for (i = 0; i < 4; i++)
+	{
+	  e = mbr.entries + i;
+
+	  if (grub_msdos_partition_is_extended (e->type))
+	    {
+	      offset = ext_offset + grub_le_to_cpu32 (e->start);
+	      if (! ext_offset)
+		ext_offset = offset;
+
+	      break;
+	    }
+	}
+
+      /* If no extended partition, the end.  */
+      if (i == 4)
+	break;
+    }
+
+  if (end >= nsectors + 1)
+    {
+      int i;
+      for (i = 0; i < nsectors; i++)
+	sectors[i] = 1 + i;
+      return GRUB_ERR_NONE;
+    }
+
+  if (end <= 1)
+    return grub_error (GRUB_ERR_FILE_NOT_FOUND,
+		       "This msdos-style partition label has no "
+		       "post-MBR gap; embedding won't be possible!");
+
+  if (nsectors > 62)
+    return grub_error (GRUB_ERR_OUT_OF_RANGE,
+		       "Your core.img is unusually large.  "
+		       "It won't fit in the embedding area.");
+
+  return grub_error (GRUB_ERR_OUT_OF_RANGE,
+		     "Your embedding area is unusually small.  "
+		     "core.img won't fit in it.");
+}
+#endif
+
 
 /* Partition map type.  */
 static struct grub_partition_map grub_msdos_partition_map =
   {
     .name = "msdos",
     .iterate = pc_partition_map_iterate,
+#ifdef GRUB_UTIL
+    .embed = pc_partition_map_embed
+#endif
   };
 
 GRUB_MOD_INIT(part_msdos)
diff --git a/include/grub/partition.h b/include/grub/partition.h
index 20705c527..a29a3440d 100644
--- a/include/grub/partition.h
+++ b/include/grub/partition.h
@@ -26,6 +26,13 @@ struct grub_disk;
 
 typedef struct grub_partition *grub_partition_t;
 
+#ifdef GRUB_UTIL
+typedef enum
+{
+  GRUB_EMBED_PCBIOS
+} grub_embed_type_t;
+#endif
+
 /* Partition map type.  */
 struct grub_partition_map
 {
@@ -39,6 +46,11 @@ struct grub_partition_map
   grub_err_t (*iterate) (struct grub_disk *disk,
 			 int (*hook) (struct grub_disk *disk,
 				      const grub_partition_t partition));
+#ifdef GRUB_UTIL
+  /* Determine sectors available for embedding.  */
+  grub_err_t (*embed) (struct grub_disk *disk, unsigned int nsectors,
+		       grub_embed_type_t embed_type, grub_disk_addr_t *sectors);
+#endif
 };
 typedef struct grub_partition_map *grub_partition_map_t;
 
diff --git a/util/grub-setup.c b/util/grub-setup.c
index a95f9b9d5..c9ab5cfdb 100644
--- a/util/grub-setup.c
+++ b/util/grub-setup.c
@@ -26,8 +26,6 @@
 #include <grub/file.h>
 #include <grub/fs.h>
 #include <grub/partition.h>
-#include <grub/msdos_partition.h>
-#include <grub/gpt_partition.h>
 #include <grub/env.h>
 #include <grub/emu/hostdisk.h>
 #include <grub/machine/boot.h>
@@ -74,10 +72,6 @@
  * result.
  */
 
-#ifdef GRUB_MACHINE_PCBIOS
-static const grub_gpt_part_type_t grub_gpt_partition_type_bios_boot = GRUB_GPT_PARTITION_TYPE_BIOS_BOOT;
-#endif
-
 #define DEFAULT_BOOT_FILE	"boot.img"
 #define DEFAULT_CORE_FILE	"core.img"
 
@@ -200,8 +194,6 @@ setup (const char *dir,
   grub_uint16_t last_length = GRUB_DISK_SECTOR_SIZE;
   grub_file_t file;
   FILE *fp;
-  struct { grub_uint64_t start; grub_uint64_t end; } embed_region;
-  embed_region.start = embed_region.end = ~0UL;
 
   auto void NESTED_FUNC_ATTR save_first_sector (grub_disk_addr_t sector,
 						unsigned offset,
@@ -283,7 +275,6 @@ setup (const char *dir,
   first_block = (struct grub_boot_blocklist *) (core_img
 						+ GRUB_DISK_SECTOR_SIZE
 						- sizeof (*block));
-
   grub_util_info ("root is `%s', dest is `%s'", root, dest);
 
   /* Open the root device and the destination device.  */
@@ -308,24 +299,6 @@ setup (const char *dir,
     grub_util_error ("%s", grub_errmsg);
 #endif
 
-#ifdef GRUB_MACHINE_PCBIOS
-  if (dest_dev->disk->partition && fs_probe)
-    {
-      grub_fs_t fs;
-      fs = grub_fs_probe (dest_dev);
-      if (! fs)
-	grub_util_error (_("unable to identify a filesystem in %s; safety check can't be performed"),
-			 dest_dev->disk->name);
-
-      if (! fs->reserved_first_sector)
-	grub_util_error (_("%s appears to contain a %s filesystem which isn't known to "
-			   "reserve space for DOS-style boot.  Installing GRUB there could "
-			   "result in FILESYSTEM DESTRUCTION if valuable data is overwritten "
-			   "by grub-setup (--skip-fs-probe disables this "
-			   "check, use at your own risk)"), dest_dev->disk->name, fs->name);
-    }
-#endif
-
 #ifdef GRUB_MACHINE_PCBIOS
   {
     grub_uint16_t *boot_drive_check;
@@ -345,53 +318,27 @@ setup (const char *dir,
   }
 #endif
 
+  /* Clean out the blocklists.  */
+  block = first_block;
+  while (block->len)
+    {
+      grub_memset (block, 0, sizeof (block));
+
+      block--;
+
+      if ((char *) block <= core_img)
+	grub_util_error ("No terminator in the core image");
+    }
+
 #ifdef GRUB_MACHINE_PCBIOS
   {
-    const char *dest_partmap;
-    int multiple_partmaps;
-
-    auto int NESTED_FUNC_ATTR find_usable_region_msdos (grub_disk_t disk,
-							const grub_partition_t p);
-    int NESTED_FUNC_ATTR find_usable_region_msdos (grub_disk_t disk __attribute__ ((unused)),
-						   const grub_partition_t p)
-    {
-      /* There's always an embed region, and it starts right after the MBR.  */
-      embed_region.start = 1;
-
-      if (embed_region.end > grub_partition_get_start (p))
-	embed_region.end = grub_partition_get_start (p);
-
-      return 0;
-    }
-
-    auto int NESTED_FUNC_ATTR find_usable_region_gpt (grub_disk_t disk,
-						      const grub_partition_t p);
-    int NESTED_FUNC_ATTR find_usable_region_gpt (grub_disk_t disk __attribute__ ((unused)),
-						 const grub_partition_t p)
-    {
-      struct grub_gpt_partentry gptdata;
-
-      disk->partition = p->parent;
-      if (grub_disk_read (disk, p->offset, p->index,
-			  sizeof (gptdata), &gptdata))
-	return 0;
-
-      /* If there's an embed region, it is in a dedicated partition.  */
-      if (! memcmp (&gptdata.type, &grub_gpt_partition_type_bios_boot, 16))
-	{
-	  embed_region.start = grub_partition_get_start (p);
-	  embed_region.end = grub_partition_get_start (p) + grub_partition_get_len (p);
-
-	  return 1;
-	}
-      return 0;
-    }
-
-    if (dest_dev->disk->partition)
-      {
-	grub_util_warn (_("Attempting to install GRUB to a partition instead of the MBR.  This is a BAD idea."));
-	goto unable_to_embed;
-      }
+    grub_partition_map_t dest_partmap = NULL;
+    grub_partition_map_t container = dest_dev->disk->partition;
+    int multiple_partmaps = 0;
+    grub_err_t err;
+    grub_disk_addr_t sectors[core_sectors];
+    int i;
+    grub_fs_t fs;
 
     /* Unlike root_dev, with dest_dev we're interested in the partition map even
        if dest_dev itself is a whole disk.  */
@@ -400,29 +347,60 @@ setup (const char *dir,
     int NESTED_FUNC_ATTR identify_partmap (grub_disk_t disk __attribute__ ((unused)),
 					   const grub_partition_t p)
     {
-      if (p->parent)
+      if (p->parent != container)
 	return 0;
       if (dest_partmap == NULL)
-	dest_partmap = p->partmap->name;
-      else if (strcmp (dest_partmap, p->partmap->name) != 0)
 	{
-	  multiple_partmaps = 1;
-	  return 1;
+	  dest_partmap = p->partmap;
+	  return 0;
 	}
-      return 0;
+      if (dest_partmap == p->partmap)
+	return 0;
+      multiple_partmaps = 1;
+      return 1;
     }
-    dest_partmap = 0;
-    multiple_partmaps = 0;
+
     grub_partition_iterate (dest_dev->disk, identify_partmap);
 
+    fs = grub_fs_probe (dest_dev);
+    if (!fs)
+      grub_errno = GRUB_ERR_NONE;
+
+#ifdef GRUB_MACHINE_PCBIOS
+    if (fs_probe)
+      {
+	if (!fs && !dest_partmap)
+	  grub_util_error (_("unable to identify a filesystem in %s; safety check can't be performed"),
+			   dest_dev->disk->name);
+	if (fs && !fs->reserved_first_sector)
+	  grub_util_error (_("%s appears to contain a %s filesystem which isn't known to "
+			     "reserve space for DOS-style boot.  Installing GRUB there could "
+			     "result in FILESYSTEM DESTRUCTION if valuable data is overwritten "
+			     "by grub-setup (--skip-fs-probe disables this "
+			     "check, use at your own risk)"), dest_dev->disk->name, fs->name);
+
+	if (dest_partmap && strcmp (dest_partmap->name, "msdos") != 0
+	    && strcmp (dest_partmap->name, "gpt") != 0
+	    && strcmp (dest_partmap->name, "bsd") != 0
+	    && strcmp (dest_partmap->name, "netbsd") != 0
+	    && strcmp (dest_partmap->name, "openbsd") != 0
+	    && strcmp (dest_partmap->name, "sunpc") != 0)
+	  grub_util_error (_("%s appears to contain a %s partition map which isn't known to "
+			     "reserve space for DOS-style boot.  Installing GRUB there could "
+			     "result in FILESYSTEM DESTRUCTION if valuable data is overwritten "
+			     "by grub-setup (--skip-fs-probe disables this "
+			     "check, use at your own risk)"), dest_dev->disk->name, dest_partmap->name);
+      }
+#endif
+
     if (! dest_partmap)
       {
 	grub_util_warn (_("Attempting to install GRUB to a partitionless disk.  This is a BAD idea."));
 	goto unable_to_embed;
       }
-    if (multiple_partmaps)
+    if (multiple_partmaps || fs)
       {
-	grub_util_warn (_("Attempting to install GRUB to a disk with multiple partition labels.  This is not supported yet."));
+	grub_util_warn (_("Attempting to install GRUB to a disk with multiple partition labels or both partition label and filesystem.  This is not supported yet."));
 	goto unable_to_embed;
       }
 
@@ -433,44 +411,33 @@ setup (const char *dir,
 	      GRUB_BOOT_MACHINE_PART_END - GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC);
 
     free (tmp_img);
-
-    if (strcmp (dest_partmap, "msdos") == 0)
-      grub_partition_iterate (dest_dev->disk, find_usable_region_msdos);
-    else if (strcmp (dest_partmap, "gpt") == 0)
-      grub_partition_iterate (dest_dev->disk, find_usable_region_gpt);
-    else
-      grub_util_error (_("No DOS-style partitions found"));
-
-    if (embed_region.end <= embed_region.start)
+    
+    if (!dest_partmap->embed)
       {
-	if (! strcmp (dest_partmap, "msdos"))
-	  grub_util_warn (_("This msdos-style partition label has no post-MBR gap; embedding won't be possible!"));
-	else
-	  grub_util_warn (_("This GPT partition label has no BIOS Boot Partition; embedding won't be possible!"));
+	grub_util_warn ("Partition style '%s' doesn't support embeding",
+			dest_partmap->name);
 	goto unable_to_embed;
       }
 
-    if ((unsigned long) core_sectors > embed_region.end - embed_region.start)
+    err = dest_partmap->embed (dest_dev->disk, core_sectors,
+			       GRUB_EMBED_PCBIOS, sectors);
+    
+    if (err)
       {
-	if (core_sectors > 62)
-	  grub_util_warn (_("Your core.img is unusually large.  It won't fit in the embedding area."));
-	else /* embed_region.end - embed_region.start < 62 */
-	  grub_util_warn (_("Your embedding area is unusually small.  core.img won't fit in it."));
+	grub_util_warn ("%s", grub_errmsg);
+	grub_errno = GRUB_ERR_NONE;
 	goto unable_to_embed;
       }
 
-    write_rootdev (core_img, root_dev,
-		   boot_img, embed_region.start);
+    save_first_sector (sectors[0] + grub_partition_get_start (container),
+		       0, GRUB_DISK_SECTOR_SIZE);
 
-    grub_util_info ("the core image will be embedded at sector 0x%llx", embed_region.start);
+    block = first_block;
+    for (i = 1; i < core_sectors; i++)
+      save_blocklists (sectors[i] + grub_partition_get_start (container),
+		       0, GRUB_DISK_SECTOR_SIZE);
 
-    /* The first blocklist contains the whole sectors.  */
-    first_block->start = grub_cpu_to_le64 (embed_region.start + 1);
-
-    /* These are filled elsewhere.  Verify them just in case.  */
-    assert (first_block->len == grub_host_to_target16 (core_sectors - 1));
-    assert (first_block->segment == grub_host_to_target16 (GRUB_BOOT_MACHINE_KERNEL_SEG
-							   + (GRUB_DISK_SECTOR_SIZE >> 4)));
+    write_rootdev (core_img, root_dev, boot_img, first_sector);
 
     /* Make sure that the second blocklist is a terminator.  */
     block = first_block - 1;
@@ -479,8 +446,13 @@ setup (const char *dir,
     block->segment = 0;
 
     /* Write the core image onto the disk.  */
-    if (grub_disk_write (dest_dev->disk, embed_region.start, 0, core_size, core_img))
-      grub_util_error ("%s", grub_errmsg);
+    for (i = 0; i < core_sectors; i++)
+      grub_disk_write (dest_dev->disk, sectors[i], 0,
+		       (core_size - i * GRUB_DISK_SECTOR_SIZE
+			< GRUB_DISK_SECTOR_SIZE) ? core_size
+		       - i * GRUB_DISK_SECTOR_SIZE
+		       : GRUB_DISK_SECTOR_SIZE,
+		       core_img + i * GRUB_DISK_SECTOR_SIZE);
 
     /* Write the boot image onto the disk.  */
     if (grub_disk_write (dest_dev->disk, 0, 0, GRUB_DISK_SECTOR_SIZE,

From 35139e8a5556a6fb6c79686e6545b80a7370bd4c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 15 Sep 2010 21:48:24 +0200
Subject: [PATCH 1628/1628] 	* grub-core/commands/parttool.c
 (grub_cmd_parttool): Fix a variable 	misusage. 	Reported by: J. Nick
 Terry

---
 ChangeLog                     | 6 ++++++
 grub-core/commands/parttool.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0c092d0b9..0b3d7627c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/parttool.c (grub_cmd_parttool): Fix a variable
+	misusage.
+	Reported by: J. Nick Terry
+
 2010-09-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Move embedding routines to partmap sources files.
diff --git a/grub-core/commands/parttool.c b/grub-core/commands/parttool.c
index f2a62e581..31e768553 100644
--- a/grub-core/commands/parttool.c
+++ b/grub-core/commands/parttool.c
@@ -275,7 +275,7 @@ grub_cmd_parttool (grub_command_t cmd __attribute__ ((unused)),
 	  if (! parsed[j])
 	    {
 	      for (curarg = ptool->args; curarg->name; curarg++)
-		if (grub_strncmp (curarg->name, args[i],
+		if (grub_strncmp (curarg->name, args[j],
 				   grub_strlen (curarg->name)) == 0
 		    && ((curarg->type == GRUB_PARTTOOL_ARG_BOOL
 			 && (args[j][grub_strlen (curarg->name)] == '+'